Pass type of what we remap

Author: Doridian

core/src/main/java/de/bluecolored/bluemap/core/resources/pack/ResourcePool.java

@@ -40,12 +40,15 @@ public class ResourcePool<T> {
     private final Map<Key, T> pool = new HashMap<>();
     private final Map<Key, ResourcePath<T>> paths = new HashMap<>();
     private final ResourcePoolMapper mapper;
+    private final Class<T> clazz;
 
     public ResourcePool() {
+        this.clazz = null;
         this.mapper = null;
     }
 
-    public ResourcePool(ResourcePoolMapper mapper) {
+    public ResourcePool(Class<T> clazz, ResourcePoolMapper mapper) {
+        this.clazz = clazz;
         this.mapper = mapper;
     }
 
@@ -80,7 +83,7 @@ public Collection<T> values() {
 
     public boolean contains(Key path) {
         if (mapper != null) {
-            path = mapper.remapResource(path);
+            path = mapper.remapResource(clazz, path);
         }
         return paths.containsKey(path);
     }
@@ -101,7 +104,7 @@ public synchronized void remove(Key path) {
 
     public @Nullable ResourcePath<T> getPath(Key path) {
         if (mapper != null) {
-            path = mapper.remapResource(path);
+            path = mapper.remapResource(clazz, path);
         }
         return paths.get(path);
     }

core/src/main/java/de/bluecolored/bluemap/core/resources/pack/ResourcePoolMapper.java

@@ -2,6 +2,8 @@
 
 import de.bluecolored.bluemap.core.util.Key;
 
+import java.lang.reflect.Type;
+
 public interface ResourcePoolMapper {
-    Key remapResource(Key src);
+    Key remapResource(Type type, Key src);
 }

core/src/main/java/de/bluecolored/bluemap/core/resources/pack/resourcepack/ResourcePack.java

@@ -54,6 +54,7 @@
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStream;
+import java.lang.reflect.Type;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.HashMap;
@@ -95,12 +96,12 @@ public interface Extension<T extends ResourcePackExtension> extends Keyed {
     public ResourcePack(PackVersion packVersion) {
         super(packVersion);
 
-        this.atlases = new ResourcePool<>(this);
-        this.blockStates = new ResourcePool<>(this);
-        this.entityStates = new ResourcePool<>(this);
-        this.models = new ResourcePool<>(this);
-        this.textures = new ResourcePool<>(this);
-        this.colormaps = new ResourcePool<>(this);
+        this.atlases = new ResourcePool<>(Atlas.class, this);
+        this.blockStates = new ResourcePool<>(BlockState.class, this);
+        this.entityStates = new ResourcePool<>(EntityState.class, this);
+        this.models = new ResourcePool<>(Model.class, this);
+        this.textures = new ResourcePool<>(Texture.class, this);
+        this.colormaps = new ResourcePool<>(BufferedImage.class, this);
 
         this.colorCalculatorFactory = new BlockColorCalculatorFactory();
         this.blockPropertiesConfig = new BlockPropertiesConfig();
@@ -117,9 +118,9 @@ public ResourcePack(PackVersion packVersion) {
     }
 
     @Override
-    public Key remapResource(Key src) {
+    public Key remapResource(Type type, Key src) {
         for (ResourcePackExtension extension : extensions.values()) {
-            src = extension.remapResource(src);
+            src = extension.remapResource(type, src);
         }
         return src;
     }

core/src/main/java/de/bluecolored/bluemap/core/resources/pack/resourcepack/ResourcePackExtension.java

@@ -27,6 +27,7 @@
 import de.bluecolored.bluemap.core.resources.pack.PackExtension;
 import de.bluecolored.bluemap.core.util.Key;
 
+import java.lang.reflect.Type;
 import java.util.Set;
 
 public interface ResourcePackExtension extends PackExtension {
@@ -35,7 +36,7 @@ default Set<Key> collectUsedTextureKeys() {
         return Set.of();
     }
 
-    default Key remapResource(Key src) {
+    default Key remapResource(Type type, Key src) {
         return src;
     }
 }