Merge pull request #701 from fixrtm/improve-soundpack-compatiblity

Improve soundpack compatiblity

CHANGELOG-SNAPSHOTS.md

@@ -19,6 +19,7 @@ The changelog for 2.0.23 and earlier is generated by [anatawa12's fork of `auto-
 
 ### Fixed
 - Speaker setting is not saved correctly `#697`
+- Some sound pack broken `#701`
 
 ### Security
 

CHANGELOG.md

@@ -26,6 +26,7 @@ Thanks to prepare-changelog.sh, we have some macros.
 
 ### Fixed
 - Speaker setting is not saved correctly `#697`
+- Some sound pack broken `#701`
 
 ### Security
 

src/main/rtm-patches/jp/ngt/rtm/RTMSound.java.patch

@@ -12,7 +12,7 @@
        SimpleReloadableResourceManager simplereloadableresourcemanager = (SimpleReloadableResourceManager)NGTUtilClient.getMinecraft().getResourceManager();
        Set<String> set = simplereloadableresourcemanager.getResourceDomains();
        List<File> list = new ArrayList<>();
-@@ -53,21 +54,22 @@
+@@ -53,21 +54,20 @@
                 list.add(file2);
                 set.add(file2.getName());
              }
@@ -30,11 +30,8 @@
 -      Map map = getDomainResourceManagers(simplereloadableresourcemanager);
 -
        for(File file3 : list) {
--         RTMResourceManager rtmresourcemanager = new RTMResourceManager(getMetadataSerializer(simplereloadableresourcemanager), file3);
+          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());
        }

src/main/rtm-patches/jp/ngt/rtm/modelpack/RTMResourceManager.java.patch

@@ -1,6 +1,32 @@
 --- a/jp/ngt/rtm/modelpack/RTMResourceManager.java
 +++ b/jp/ngt/rtm/modelpack/RTMResourceManager.java
-@@ -50,22 +50,11 @@
+@@ -21,22 +21,23 @@
+ import net.minecraft.util.ResourceLocation;
+ import net.minecraftforge.fml.relauncher.Side;
+ import net.minecraftforge.fml.relauncher.SideOnly;
+
+ @SideOnly(Side.CLIENT)
+-public final class RTMResourceManager implements IResourceManager {
++public final class RTMResourceManager extends net.minecraft.client.resources.FallbackResourceManager implements IResourceManager {
+    private final Map<ResourceLocation, IResource> resourceCache = new HashMap();
+    private final MetadataSerializer serializer;
+    private final File domain;
+
+    public RTMResourceManager(MetadataSerializer par1, File par2) {
++      super(par1);
+       this.serializer = par1;
+       this.domain = par2;
+    }
+
+    public Set getResourceDomains() {
+-      return null;
++      return java.util.Collections.<String>emptySet();
+    }
+
+    public IResource getResource(ResourceLocation par1) throws IOException {
+       if (this.domain == null) {
+          throw new FileNotFoundException(par1.toString());
+@@ -50,22 +51,11 @@
              if (!s1.isEmpty()) {
                 String s3 = NGTFileLoader.getArchivePath(s, s1);
                 String s2 = par1.getPath();