Fix merge issues, MCP remap

GregTechCE · Apr 14, 2021 · 6355e85 · 6355e85
1 parent 4433326
commit 6355e85
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/main/java/gregtech/common/asm/GTCETransformer.java b/src/main/java/gregtech/common/asm/GTCETransformer.java
@@ -35,7 +35,7 @@ public byte[] transform(String name, String transformedName, byte[] basicClass)
             classReader.accept(new TargetClassVisitor(classWriter, JEIVisitor.TARGET_METHOD, JEIVisitor::new), 0);
             return classWriter.toByteArray();
         }
-        if (internalName.equals(SafeFormatOldLoadVisitor.TARGET_CLASS_NAME)) {
+        if (internalName.equals(SaveFormatOldLoadVisitor.TARGET_CLASS_NAME)) {
             ClassReader classReader = new ClassReader(basicClass);
             ClassWriter classWriter = new ClassWriter(ClassWriter.COMPUTE_FRAMES | ClassWriter.COMPUTE_MAXS);
             classReader.accept(new TargetClassVisitor(classWriter, SaveFormatOldLoadVisitor.TARGET_METHOD, SaveFormatOldLoadVisitor::new), 0);

diff --git a/src/main/java/gregtech/common/datafix/fixes/Fix1MetaBlockIdSystem.java b/src/main/java/gregtech/common/datafix/fixes/Fix1MetaBlockIdSystem.java
@@ -52,7 +52,7 @@ public NBTTagCompound fixTagCompound(NBTTagCompound compound) {
     @SubscribeEvent
     public void onMissingBlockMappings(RegistryEvent.MissingMappings<Block> event) {
         for (RegistryEvent.MissingMappings.Mapping<Block> mapping : event.getMappings()) {
-            String regName = mapping.key.getResourcePath();
+            String regName = mapping.key.getPath();
             if (regName.startsWith(MetaBlockIdFixHelper.COMP_NAME_PREF)
                     || regName.startsWith(MetaBlockIdFixHelper.SURF_ROCK_NAME_PREF)) {
                 mapping.ignore();
@@ -63,7 +63,7 @@ public void onMissingBlockMappings(RegistryEvent.MissingMappings<Block> event) {
     @SubscribeEvent
     public void onMissingItemMappings(RegistryEvent.MissingMappings<Item> event) {
         for (RegistryEvent.MissingMappings.Mapping<Item> mapping : event.getMappings()) {
-            String regName = mapping.key.getResourcePath();
+            String regName = mapping.key.getPath();
             if (regName.startsWith(MetaBlockIdFixHelper.COMP_NAME_PREF)
                     || regName.startsWith(MetaBlockIdFixHelper.SURF_ROCK_NAME_PREF)) {
                 mapping.ignore();