Skip to content

Update to MC 1.21.1 #4118

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ImMorpheus merged 1 commit into from
Aug 12, 2024
+14 −6
Merged

Update to MC 1.21.1 #4118

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
8 changes: 8 additions & 0 deletions gradle/verification-metadata.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1016,6 +1016,14 @@
<sha256 value="4a89e1b0acc21121252fa630e9faa6ed6855f353bb46ab08e38bdadf8be2597a" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="com.mojang" name="brigadier" version="1.3.10">
<artifact name="brigadier-1.3.10.jar">
<sha256 value="c8ee4136e474ac7723ca2b432ec8d1a2bc88ef7d1ec57c314ba9e33cdc83dd75" origin="Generated by Gradle"/>
</artifact>
<artifact name="brigadier-1.3.10.pom">
<sha256 value="39bf2bf7d278987faa42f698ba22f7ae65a12c77fa428ca5d23ccc7779563f9d" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="com.mojang" name="datafixerupper" version="6.0.8">
<artifact name="datafixerupper-6.0.8.jar">
<sha256 value="6e38e9fc5404be7e45189aa14ca6058bc85df20d6760a212b6d48e666abf0fef" origin="Generated by Gradle"/>
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/org/spongepowered/common/command/selector/SpongeSelectorFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/org/spongepowered/common/command/selector/SpongeSelectorType.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -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;
}
Expand Down