twin/paper-mc
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-08-01 04:32:11 -07:00
Code Issues Packages Projects Releases Wiki Activity

Fix reobf mappings regression in GameRules.Type (#12437)

Browse Source 
The recent commit 121a7bf4eb added
the interface FeatureElement to the GameRules.Type class to expose the
stored feature flags of gamerules.
This however messed with the reobf mappings spigot uses, as the now
overridden method requiredFeatures needs to be mapped to the same
obfuscated name as FeatureElement#requiredFeatures.

To avoid having this in the mappings patch, the commit removes the
inheritance again and instead exposes a wrapper method.
This commit is contained in:
Bjarne Koll
2025-04-14 17:05:01 +02:00
committed by GitHub
parent 7d5695d774
commit de410d13ef
2 changed files with 16 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
paper-server/patches/sources/net/minecraft/world/level/GameRules.java.patch
View File

@@ -225,12 +225,8 @@
final String id;
private final GameRules.Category category;
@@ -572,10 +_,10 @@
}
}
- public static class Type<T extends GameRules.Value<T>> {
+ public static class Type<T extends GameRules.Value<T>> implements net.minecraft.world.flag.FeatureElement { // Paper - FeatureDependant for GameRule
@@ -575,7 +_,7 @@
public static class Type<T extends GameRules.Value<T>> {
final Supplier<ArgumentType<?>> argument;
private final Function<GameRules.Type<T>, T> constructor;
- final BiConsumer<MinecraftServer, T> callback;
@@ -247,6 +243,19 @@
GameRules.VisitorCaller<T> visitorCaller,
Class<T> valueClass,
FeatureFlagSet requiredFeatures
@@ -611,6 +_,12 @@
public FeatureFlagSet requiredFeatures() {
return this.requiredFeatures;
}
+ // Paper start - expose FeatureElement wrapper for GameRules.Type.
+ // Chosen over simply adding this to the inheritance to avoid reobf issues with spigot...
+ public net.minecraft.world.flag.FeatureElement asFeatureElement() {
+ return net.minecraft.world.level.GameRules.Type.this::requiredFeatures;
+ }
+ // Paper end - expose FeatureElement wrapper for GameRules.Type.
}
public abstract static class Value<T extends GameRules.Value<T>> {
@@ -620,16 +_,16 @@
this.type = type;
}

2
paper-server/src/main/java/io/papermc/paper/world/flag/PaperFeatureFlagProviderImpl.java
View File

@@ -52,7 +52,7 @@ public class PaperFeatureFlagProviderImpl implements FeatureFlagProvider {
} else if (dependant instanceof final PotionType potionType) {
return CraftPotionType.bukkitToMinecraft(potionType);
} else if (dependant instanceof final GameRule<?> gameRule) {
return getGameRuleType(gameRule.getName());
return getGameRuleType(gameRule.getName()).asFeatureElement();
} else {
throw new IllegalArgumentException(dependant + " is not a valid feature dependant");
}