Revert "Merge pull request #675 from fixrtm/fix-custom-npcs"

This reverts commit 5ff818a, reversing changes made to 90cff1b.
fixrtm · Jul 17, 2023 · 4e2e55d · 4e2e55d
1 parent 6292f0d
commit 4e2e55d
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 152 deletions.
diff --git a/src/main/java/com/anatawa12/fixRtm/rtm/modelpack/RTMResourcePack.kt b/src/main/java/com/anatawa12/fixRtm/rtm/modelpack/RTMResourcePack.kt
diff --git a/src/main/resources/META-INF/fix-rtm_at.cfg b/src/main/resources/META-INF/fix-rtm_at.cfg
@@ -5,5 +5,3 @@
 public net.minecraft.client.Minecraft field_110449_ao
 public net.minecraft.entity.EntityTracker field_72794_c
 public net.minecraft.client.renderer.EntityRenderer field_78530_s
-public net.minecraft.client.resources.SimpleReloadableResourceManager field_110548_a
-public net.minecraft.client.resources.SimpleReloadableResourceManager field_110547_c
diff --git a/src/main/rtm-patches/jp/ngt/rtm/RTMSound.java.patch b/src/main/rtm-patches/jp/ngt/rtm/RTMSound.java.patch
@@ -1,18 +1,6 @@
 --- a/jp/ngt/rtm/RTMSound.java
 +++ b/jp/ngt/rtm/RTMSound.java
-@@ -36,10 +36,11 @@
-    };
-
-    public static void init() {
-    }
-
-+   @net.minecraftforge.fml.relauncher.SideOnly(net.minecraftforge.fml.relauncher.Side.CLIENT)
-    public static void registerSoundDomains() {
-       NGTLog.debug("[RTMSound] Register sound domains");
-       SimpleReloadableResourceManager simplereloadableresourcemanager = (SimpleReloadableResourceManager)NGTUtilClient.getMinecraft().getResourceManager();
-       Set<String> set = simplereloadableresourcemanager.getResourceDomains();
-       List<File> list = new ArrayList<>();
-@@ -53,21 +54,22 @@
+@@ -53,12 +53,13 @@
                 list.add(file2);
                 set.add(file2.getName());
              }
@@ -27,17 +15,4 @@
           }
        }
 
--      Map map = getDomainResourceManagers(simplereloadableresourcemanager);
--
-       for(File file3 : list) {
--         RTMResourceManager rtmresourcemanager = new RTMResourceManager(getMetadataSerializer(simplereloadableresourcemanager), file3);
--         map.put(file3.getName(), rtmresourcemanager);
-+         net.minecraft.client.resources.FallbackResourceManager rtmresourcemanager =
-+                 new net.minecraft.client.resources.FallbackResourceManager(simplereloadableresourcemanager.rmMetadataSerializer);
-+         rtmresourcemanager.addResourcePack(com.anatawa12.fixRtm.rtm.modelpack.FixRTMResourcePack.createPack(file3.getName(), file3));
-+         simplereloadableresourcemanager.domainResourceManagers.put(file3.getName(), rtmresourcemanager);
-          NGTLog.debug("[RTMSound] Add new domain : " + file3.getName());
-       }
-
-    }
-
+       Map map = getDomainResourceManagers(simplereloadableresourcemanager);