fix resource loading (fixes colormaps)

mist475 · Dec 17, 2023 · b5d69ad · b5d69ad
1 parent db709c2
commit b5d69ad
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 26 deletions.
diff --git a/src/main/java/com/prupe/mcpatcher/mal/biome/ColorMap.java b/src/main/java/com/prupe/mcpatcher/mal/biome/ColorMap.java
@@ -11,7 +11,6 @@
 import net.minecraft.util.ResourceLocation;
 import net.minecraft.world.IBlockAccess;
 import net.minecraft.world.biome.BiomeGenBase;
-import net.minecraft.world.biome.BiomeGenSwamp;
 
 import com.prupe.mcpatcher.Config;
 import com.prupe.mcpatcher.MCLogger;
@@ -225,9 +224,6 @@ public String toString() {
     public final int getColorMultiplier(IBlockAccess blockAccess, int i, int j, int k) {
         // TODO: implement this neatly
         BiomeGenBase base = BiomeAPI.getBiomeGenAt(blockAccess, i, j, k);
-        if (base instanceof BiomeGenSwamp || base.biomeID == BiomeGenBase.roofedForest.biomeID) {
-            return base.getBiomeGrassColor(i, j, k);
-        }
 
         computeXY(base, i, j, k, xy);
         return getRGB(xy[0], xy[1]);

diff --git a/src/main/java/com/prupe/mcpatcher/mal/resource/TexturePackAPI.java b/src/main/java/com/prupe/mcpatcher/mal/resource/TexturePackAPI.java
@@ -5,6 +5,7 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
@@ -28,6 +29,8 @@
 import net.minecraft.client.resources.SimpleReloadableResourceManager;
 import net.minecraft.util.ResourceLocation;
 
+import org.apache.commons.io.IOUtils;
+
 import com.prupe.mcpatcher.MCLogger;
 import com.prupe.mcpatcher.MCPatcherUtils;
 
@@ -115,30 +118,13 @@ public static boolean hasCustomResource(ResourceLocation resource) {
         InputStream jar = null;
         InputStream pack = null;
         try {
-            String path = ASSETS + resource.getResourceDomain() + "/" + resource.getResourcePath();
             pack = getInputStream(resource);
-            if (pack == null) {
+            jar = Minecraft.getMinecraft().mcDefaultResourcePack.getInputStream(resource);
+
+            if (pack == null || jar == null) {
                 return false;
             }
-            jar = Minecraft.class.getResourceAsStream(path);
-            if (jar == null) {
-                return true;
-            }
-            byte[] buffer1 = new byte[4096];
-            byte[] buffer2 = new byte[4096];
-            int read1;
-            int read2;
-            while ((read1 = pack.read(buffer1)) > 0) {
-                read2 = jar.read(buffer2);
-                if (read1 != read2) {
-                    return true;
-                }
-                for (int i = 0; i < read1; i++) {
-                    if (buffer1[i] != buffer2[i]) {
-                        return true;
-                    }
-                }
-            }
+            return !Arrays.equals(IOUtils.toByteArray(jar), IOUtils.toByteArray(pack));
         } catch (IOException e) {
             e.printStackTrace();
         } finally {
@@ -338,7 +324,7 @@ public static void flushUnusedTextures() {
                 unloadTexture(resource);
             }
         }
-    };
+    }
 
     private static IResourceManager getResourceManager() {
         return Minecraft.getMinecraft()