Skip to content

Fix SOE from ResourceKey#compareTo #4238

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
merged 3 commits into from
Oct 25, 2025
Merged

Fix SOE from ResourceKey#compareTo #4238

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
871ab40
fix ResourceKey#compareTo SOE
MrHell228 Oct 6, 2025
aebf720
overwrite ResourceLocation#compareTo to use adventure comparator
MrHell228 Oct 6, 2025
1e6e161
overwrite synthetic ResourceLocation#compareTo(Object)
MrHell228 Oct 23, 2025
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
14 changes: 10 additions & 4 deletions ...ava/org/spongepowered/common/mixin/api/minecraft/resources/ResourceLocationMixin_API.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
import org.spongepowered.asm.mixin.Interface;
import org.spongepowered.asm.mixin.Interface.Remap;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Overwrite;
import org.spongepowered.asm.mixin.Shadow;

@Mixin(ResourceLocation.class)
Expand All @@ -45,15 +46,20 @@ public abstract class ResourceLocationMixin_API {
@Shadow public abstract String shadow$getPath();
// @formatter:on

/**
* @author MrHell228 - October 6th, 2025
* @reason Delegate synthetic method to #compareTo(Key) to avoid CCE in case Key is not a ResourceLocation
*/
@Overwrite
public int compareTo(final Object obj) {
return ((Key) this).compareTo((Key) obj);
}

public String adventure$namespace() {
return this.shadow$getNamespace();
}

public String adventure$value() {
return this.shadow$getPath();
}

public int adventure$compareTo(Key o) {
return -o.compareTo((Key) this);
}
}