Merge pull request #21 from anatawa12/use-accesstransformer

Use accesstransformer
fixrtm · Apr 17, 2020 · ca2d77b · ca2d77b
2 parents 8fd8424 + 90bc1c2
commit ca2d77b
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 9 deletions.
diff --git a/build.gradle b/build.gradle
@@ -127,7 +127,9 @@ jar {
 
     manifest {
         attributes("FMLCorePlugin" : "com.anatawa12.fixRtm.asm.FixRtmCorePlugin",
-        "FMLCorePluginContainsFMLMod": "*")
+                "FMLCorePluginContainsFMLMod": "*",
+                'FMLAT': 'fix-rtm_at.cfg',
+        )
     }
 }
 

diff --git a/makePatch.gradle b/makePatch.gradle
@@ -56,6 +56,8 @@ task makeFixrtmJar(type: Jar) {
 
     manifest {
         attributes("FMLCorePlugin" : "com.anatawa12.fixRtm.asm.FixRtmCorePlugin",
-                "FMLCorePluginContainsFMLMod": "*")
+                "FMLCorePluginContainsFMLMod": "*",
+                'FMLAT': 'fix-rtm_at.cfg',
+        )
     }
 }
diff --git a/src/main/java/com/anatawa12/fixRtm/FixRtm.kt b/src/main/java/com/anatawa12/fixRtm/FixRtm.kt
@@ -65,13 +65,7 @@ object FixRtm {
     @SubscribeEvent
     fun registerModel(e: ModelRegistryEvent) {
         ClientRegistry.registerTileEntity(TestTileEntity::class.java, "test", TestSPRenderer)
-        try {
-            @Suppress("UNCHECKED_CAST")
-            (Minecraft::class.java.getDeclaredField("field_110449_ao").apply { isAccessible = true }.get(Minecraft.getMinecraft()) as MutableList<IResourcePack>).add(ButtonResourcePack)
-        } catch (ex: NoSuchFieldException) {
-            @Suppress("UNCHECKED_CAST")
-            (Minecraft::class.java.getDeclaredField("defaultResourcePacks").apply { isAccessible = true }.get(Minecraft.getMinecraft()) as MutableList<IResourcePack>).add(ButtonResourcePack)
-        }
+        Minecraft.getMinecraft().defaultResourcePacks.add(ButtonResourcePack)
         DummyModelObject.init()
     }
 

diff --git a/src/main/resources/META-INF/fix-rtm_at.cfg b/src/main/resources/META-INF/fix-rtm_at.cfg
@@ -0,0 +1 @@
+public net.minecraft.client.Minecraft field_110449_ao