Fix renaming reflection class names in GameRuleReflectionUtils

Sinytra · Oct 2, 2023 · 22f4bbd · 22f4bbd
1 parent 01e4cb6
commit 22f4bbd
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 8 deletions.
diff --git a/...-rule-api-v1/src/main/java/net/fabricmc/fabric/impl/gamerule/GameRuleReflectionUtils.java b/...-rule-api-v1/src/main/java/net/fabricmc/fabric/impl/gamerule/GameRuleReflectionUtils.java
@@ -16,14 +16,15 @@
 
 package net.fabricmc.fabric.impl.gamerule;
 
-import java.lang.invoke.MethodHandles;
-import java.lang.invoke.VarHandle;
-
 import com.mojang.brigadier.builder.LiteralArgumentBuilder;
-import net.minecraftforge.coremod.api.ASMAPI;
-
+import cpw.mods.modlauncher.api.INameMappingService;
 import net.minecraft.client.gui.screen.world.EditGameRulesScreen;
 import net.minecraft.server.command.ServerCommandSource;
+import net.minecraftforge.coremod.api.ASMAPI;
+import net.minecraftforge.fml.util.ObfuscationReflectionHelper;
+
+import java.lang.invoke.MethodHandles;
+import java.lang.invoke.VarHandle;
 
 // Provides access to instance fields of anonymous classes via reflection
 // as a replacement for Shadow fields due to an ongoing mixin issue https://github.com/SpongePowered/Mixin/issues/560
@@ -33,11 +34,11 @@ public final class GameRuleReflectionUtils {
 
     static {
         try {
-            Class<?> cls = Class.forName("net.minecraft.client.gui.screen.world.EditGameRulesScreen$RuleListWidget$1");
+            Class<?> cls = Class.forName(ObfuscationReflectionHelper.remapName(INameMappingService.Domain.CLASS, "net.minecraft.client.gui.screens.worldselection.EditGameRulesScreen$RuleList$1"));
             MethodHandles.Lookup lookup = MethodHandles.privateLookupIn(cls, MethodHandles.lookup());
             OWN_GAME_RULES_SCREEN = lookup.findVarHandle(cls, ASMAPI.mapField("f_101213_"), EditGameRulesScreen.class);
 
-            Class<?> gameRuleCommandsCls = Class.forName("net.minecraft.server.command.GameRuleCommand$1");
+            Class<?> gameRuleCommandsCls = Class.forName(ObfuscationReflectionHelper.remapName(INameMappingService.Domain.CLASS, "net.minecraft.server.commands.GameRuleCommand$1"));
             MethodHandles.Lookup gameRuleCommandLookup = MethodHandles.privateLookupIn(gameRuleCommandsCls, MethodHandles.lookup());
             OWN_ARGUMENT_BUILDER = gameRuleCommandLookup.findVarHandle(gameRuleCommandsCls, ASMAPI.mapField("f_137760_"), LiteralArgumentBuilder.class);
         } catch (Throwable t) {

diff --git a/gradle.properties b/gradle.properties
@@ -68,5 +68,5 @@ fabric-client-tags-api-v1-version=1.1.1
 loom.platform=forge
 forge_version=1.20.1-47.1.3
 pack_format=15
-forgified_version=1.9.22
+forgified_version=1.9.23
 forge_fabric_loader_version=2.3.4+0.14.21+1.20.1