Add type checking to dynamic maps to avoid ClassCastException from badly behaved mods

Author: embeddedt

common/src/main/java/org/embeddedt/modernfix/api/helpers/ModelHelpers.java

@@ -47,7 +47,7 @@ public static ImmutableList<BlockState> getBlockStateForLocation(StateDefinition
      * @return a fake map of the top-level models
      */
     public static Map<ResourceLocation, BakedModel> createFakeTopLevelMap(BiFunction<ResourceLocation, ModelState, BakedModel> modelGetter) {
-        return new DynamicMap<>(location -> modelGetter.apply(location, BlockModelRotation.X0_Y0));
+        return new DynamicMap<>(ResourceLocation.class, location -> modelGetter.apply(location, BlockModelRotation.X0_Y0));
     }
 
     /**

common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/dynamic_resources/BlockModelShaperMixin.java

@@ -29,7 +29,7 @@ public class BlockModelShaperMixin {
     @Inject(method = { "<init>", "replaceCache" }, at = @At("RETURN"))
     private void replaceModelMap(CallbackInfo ci) {
         // replace the backing map for mods which will access it
-        this.modelByStateCache = new DynamicOverridableMap<>(state -> modelManager.getModel(ModelLocationCache.get(state)));
+        this.modelByStateCache = new DynamicOverridableMap<>(BlockState.class, state -> modelManager.getModel(ModelLocationCache.get(state)));
         // Clear the cached models on blockstate objects
         for(Block block : BuiltInRegistries.BLOCK) {
             for(BlockState state : block.getStateDefinition().getPossibleStates()) {

common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/dynamic_resources/ModelBakeryMixin.java

@@ -76,7 +76,7 @@ public abstract class ModelBakeryMixin implements IExtendedModelBakery {
 
     @Shadow @Final public static ModelResourceLocation MISSING_MODEL_VARIANT;
 
-    private final Map<ModelResourceLocation, BakedModel> mfix$emulatedBakedRegistry = new DynamicOverridableMap<>(this::loadBakedModelDynamic);
+    private final Map<ModelResourceLocation, BakedModel> mfix$emulatedBakedRegistry = new DynamicOverridableMap<>(ModelResourceLocation.class, this::loadBakedModelDynamic);
 
     @Override
     public UnbakedModel mfix$loadUnbakedModelDynamic(ModelResourceLocation location) {

common/src/main/java/org/embeddedt/modernfix/util/DynamicInt2ObjectMap.java

@@ -13,7 +13,7 @@
 
 public class DynamicInt2ObjectMap<V> extends DynamicMap<Integer, V> implements Int2ObjectMap<V> {
     public DynamicInt2ObjectMap(Function<Integer, V> function) {
-        super(function);
+        super(Integer.class, function);
     }
 
     @Override

common/src/main/java/org/embeddedt/modernfix/util/DynamicMap.java

@@ -11,8 +11,10 @@
 
 public class DynamicMap<K, V> implements Map<K, V> {
     protected final Function<K, V> function;
+    private final Class<K> keyClass;
 
-    public DynamicMap(Function<K, V> function) {
+    public DynamicMap(Class<K> keyClass, Function<K, V> function) {
+        this.keyClass = keyClass;
         this.function = function;
     }
 
@@ -38,6 +40,9 @@ public boolean containsValue(Object o) {
 
     @Override
     public V get(Object o) {
+        if(!keyClass.isInstance(o)) {
+            return null;
+        }
         return function.apply((K)o);
     }
 

common/src/main/java/org/embeddedt/modernfix/util/DynamicOverridableMap.java

@@ -10,8 +10,8 @@
 public class DynamicOverridableMap<K, V> extends DynamicMap<K, V> {
     private final Map<K, V> overrideMap;
 
-    public DynamicOverridableMap(Function<K, V> function) {
-        super(function);
+    public DynamicOverridableMap(Class<K> keyClass, Function<K, V> function) {
+        super(keyClass, function);
         overrideMap = new Object2ObjectOpenHashMap<>();
     }