From 98ae7fc129fff87e4793a002b922b617f3d69827 Mon Sep 17 00:00:00 2001 From: ImMorpheus Date: Thu, 8 Aug 2024 22:27:37 +0200 Subject: [PATCH] Update to MC 1.21.1 --- gradle.properties | 4 ++-- gradle/verification-metadata.xml | 8 ++++++++ .../common/command/selector/SpongeSelectorFactory.java | 4 ++-- .../common/command/selector/SpongeSelectorType.java | 4 ++-- 4 files changed, 14 insertions(+), 6 deletions(-) diff --git a/gradle.properties b/gradle.properties index b624ba50c6c..db84133290e 100644 --- a/gradle.properties +++ b/gradle.properties @@ -12,10 +12,10 @@ mixinConfigs=mixins.sponge.accessors.json,mixins.sponge.api.json,mixins.sponge.c mixins.sponge.tracker.json,mixins.sponge.ipforward.json,mixins.sponge.optimization.json superClassChanges=common.superclasschange -minecraftVersion=1.21 +minecraftVersion=1.21.1 recommendedVersion=0-SNAPSHOT org.gradle.dependency.verification.console=verbose org.gradle.jvmargs=-Xss4m org.gradle.parallel=true -org.gradle.caching=false +org.gradle.caching=false \ No newline at end of file diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml index 5604a29250b..694a1c87a51 100644 --- a/gradle/verification-metadata.xml +++ b/gradle/verification-metadata.xml @@ -1016,6 +1016,14 @@ + + + + + + + + diff --git a/src/main/java/org/spongepowered/common/command/selector/SpongeSelectorFactory.java b/src/main/java/org/spongepowered/common/command/selector/SpongeSelectorFactory.java index 1783e622e56..83d9a6363f0 100644 --- a/src/main/java/org/spongepowered/common/command/selector/SpongeSelectorFactory.java +++ b/src/main/java/org/spongepowered/common/command/selector/SpongeSelectorFactory.java @@ -32,13 +32,13 @@ public final class SpongeSelectorFactory implements Selector.Factory { public static Selector.Builder createBuilder() { - return (Selector.Builder) new EntitySelectorParser(new StringReader("")); + return (Selector.Builder) new EntitySelectorParser(new StringReader(""), true); } @Override public @NonNull Selector parse(final @NonNull String string) throws IllegalArgumentException { try { - return (Selector) new EntitySelectorParser(new StringReader(string)).parse(); + return (Selector) new EntitySelectorParser(new StringReader(string), true).parse(); } catch (final Exception ex) { throw new IllegalArgumentException(ex.getMessage(), ex); } diff --git a/src/main/java/org/spongepowered/common/command/selector/SpongeSelectorType.java b/src/main/java/org/spongepowered/common/command/selector/SpongeSelectorType.java index 1a0a6d2798c..b641c335672 100644 --- a/src/main/java/org/spongepowered/common/command/selector/SpongeSelectorType.java +++ b/src/main/java/org/spongepowered/common/command/selector/SpongeSelectorType.java @@ -40,7 +40,7 @@ public final class SpongeSelectorType implements SelectorType { public SpongeSelectorType(final String selectorToken) { this.selectorToken = selectorToken; try { - this.selector = (Selector) new EntitySelectorParser(new StringReader(this.selectorToken)).parse(); + this.selector = (Selector) new EntitySelectorParser(new StringReader(this.selectorToken), true).parse(); } catch (final CommandSyntaxException exception) { // This should never happen, if it does, it's a bug in our code. throw new RuntimeException(exception); @@ -60,7 +60,7 @@ public SpongeSelectorType(final String selectorToken) { @SuppressWarnings("ConstantConditions") @Override public final Selector.@NonNull Builder toBuilder() { - final EntitySelectorParser parser = new EntitySelectorParser(new StringReader(this.selectorToken)); + final EntitySelectorParser parser = new EntitySelectorParser(new StringReader(this.selectorToken), true); ((EntitySelectorParserAccessor) parser).invoker$parseSelector(); return (Selector.Builder) parser; }