Fix incompatibility with IC2, and VanillaFoodPantry, cache ModelBlockDefinitions

Author: Runemoro

src/main/java/org/dimdev/utils/IdentityPair.java

@@ -0,0 +1,23 @@
+package org.dimdev.utils;
+
+public class IdentityPair<L, R> {
+    public final L left;
+    public final R right;
+
+    public IdentityPair(L left, R right) {
+        this.left = left;
+        this.right = right;
+    }
+
+    @Override
+    public boolean equals(Object other) {
+        return other instanceof IdentityPair &&
+               ((IdentityPair) other).left == left &&
+               ((IdentityPair) other).right == right;
+    }
+
+    @Override
+    public int hashCode() {
+        return System.identityHashCode(left) + System.identityHashCode(right) * 31;
+    }
+}

src/main/java/org/dimdev/utils/LeftIdentityPair.java

@@ -0,0 +1,25 @@
+package org.dimdev.utils;
+
+import java.util.Objects;
+
+public class LeftIdentityPair<L, R> {
+    public final L left;
+    public final R right;
+
+    public LeftIdentityPair(L left, R right) {
+        this.left = left;
+        this.right = right;
+    }
+
+    @Override
+    public boolean equals(Object other) {
+        return other instanceof LeftIdentityPair &&
+               ((LeftIdentityPair) other).left == left &&
+               Objects.equals(((LeftIdentityPair) other).right, right);
+    }
+
+    @Override
+    public int hashCode() {
+        return System.identityHashCode(left) + Objects.hashCode(right) * 31;
+    }
+}

src/main/java/org/dimdev/vanillafix/blockstates/NumericalBlockState.java

@@ -21,8 +21,7 @@
 import net.minecraft.world.World;
 import net.minecraftforge.fml.relauncher.Side;
 import net.minecraftforge.fml.relauncher.SideOnly;
-import org.apache.commons.lang3.tuple.ImmutablePair;
-import org.apache.commons.lang3.tuple.Pair;
+import org.dimdev.utils.LeftIdentityPair;
 
 import javax.annotation.Nullable;
 import java.util.*;
@@ -36,10 +35,10 @@
  */
 @SuppressWarnings("deprecation")
 public class NumericalBlockState extends BlockStateBase {
-    private static final Map<Pair<BlockStateContainer, Integer>, NumericalBlockState> blockStates = new HashMap<>(); // TODO: WeakHashMap?
-    private static final Map<Pair<IProperty<?>, Comparable<?>>, Integer> valueToNumber = new HashMap<>();
-    private static final Map<Pair<IProperty<?>, Integer>, Comparable<?>> numberToValue = new HashMap<>();
-    private static final Map<IProperty<?>, Integer> propertyWidths = new HashMap<>();
+    private static final Map<LeftIdentityPair<BlockStateContainer, Integer>, NumericalBlockState> blockStates = new HashMap<>(); // TODO: WeakHashMap?
+    private static final Map<LeftIdentityPair<IProperty<?>, Comparable<?>>, Integer> valueToNumber = new HashMap<>();
+    private static final Map<LeftIdentityPair<IProperty<?>, Integer>, Comparable<?>> numberToValue = new HashMap<>();
+    private static final Map<IProperty<?>, Integer> propertyWidths = new IdentityHashMap<>();
 
     protected final BlockStateContainer container;
     protected final Block block;
@@ -55,7 +54,7 @@ public static NumericalBlockState get(BlockStateContainer container, int data) {
         // Getting it from a cache is necessary to make sure == between two NumericalBlockStates
         // with the same container and data will work. The cache is shared for all containers
         // to avoid the overhead of many small HashMaps.
-        ImmutablePair<BlockStateContainer, Integer> key = new ImmutablePair<>(container, data);
+        LeftIdentityPair<BlockStateContainer, Integer> key = new LeftIdentityPair<>(container, data);
         NumericalBlockState blockState = blockStates.get(key);
 
         if (blockState == null) {
@@ -72,8 +71,7 @@ public static NumericalBlockState fromPropertyValueMap(BlockStateContainer conta
         int data = 0;
         for (Map.Entry<IProperty<?>, Comparable<?>> entry : map.entrySet()) {
             IProperty<?> property = entry.getKey();
-            //noinspection SuspiciousMethodCalls
-            data |= valueToNumber.get(new ImmutablePair<>(property, entry.getValue())) << offsets.get(property);
+            data |= valueToNumber.get(new LeftIdentityPair<>(property, entry.getValue())) << offsets.get(property);
         }
 
         return get(container, data);
@@ -90,8 +88,8 @@ public static <T extends Comparable<T>> void makePropertyInfo(IProperty<T> prope
         // Fill the 'number -> value' and 'value -> number' maps
         int i = 0;
         for (T value : allowedValues) {
-            numberToValue.put(new ImmutablePair<>(property, i), value);
-            valueToNumber.put(new ImmutablePair<>(property, value), i);
+            numberToValue.put(new LeftIdentityPair<>(property, i), value);
+            valueToNumber.put(new LeftIdentityPair<>(property, value), i);
             i++;
         }
     }
@@ -111,7 +109,7 @@ public <T extends Comparable<T>> T getValue(IProperty<T> property) {
 
         int width = propertyWidths.get(property);
         int number = data >>> offset & 0xFFFFFFFF >>> 32 - width;
-        @SuppressWarnings("SuspiciousMethodCalls") Comparable<?> value = numberToValue.get(new ImmutablePair<>(property, number));
+        Comparable<?> value = numberToValue.get(new LeftIdentityPair<>(property, number));
 
         return property.getValueClass().cast(value);
     }
@@ -124,7 +122,7 @@ public <T extends Comparable<T>, V extends T> IBlockState withProperty(IProperty
             throw new IllegalArgumentException("Cannot set property " + property + " as it does not exist in " + container);
         }
 
-        @SuppressWarnings("SuspiciousMethodCalls") int number = valueToNumber.get(new ImmutablePair<>(property, value));
+        int number = valueToNumber.get(new LeftIdentityPair<>(property, value));
         int width = propertyWidths.get(property);
         int mask = (0xFFFFFFFF >>> offset & 0xFFFFFFFF >>> 32 - width) << offset;
         int newData = data & ~mask | number << offset;

src/main/java/org/dimdev/vanillafix/blockstates/mixins/MixinBlockStateContainer.java

@@ -57,18 +57,28 @@ public ImmutableList<IBlockState> getValidStates() {
 
             for (List<Comparable<?>> list : Cartesian.cartesianProduct(getAllowedValues())) {
                 Map<IProperty<?>, Comparable<?>> propertyValueMap = MapPopulator.createMap(properties.values(), list);
-                IBlockState state = createState(propertyValueMap, unlistedProperties);
+                IBlockState state = createState(ImmutableMap.<IProperty<?>, Comparable<?>>builder().putAll(propertyValueMap).build(), unlistedProperties);
                 states.add(state);
             }
 
-            validStatesCache = states.build(); // TODO: make validStates a WeakRef/SoftRef?
+            validStatesCache = states.build();
         }
 
         return validStatesCache;
     }
 
-    protected IBlockState createState(Map<IProperty<?>, Comparable<?>> properties, @Nullable ImmutableMap<IUnlistedProperty<?>, java.util.Optional<?>> unlistedProperties) {
-        return NumericalBlockState.fromPropertyValueMap((BlockStateContainer) (Object) this, properties);
+    @Overwrite
+    protected BlockStateContainer.StateImplementation createState(Block block, ImmutableMap<IProperty<?>, Comparable<?>> properties, @Nullable ImmutableMap<IUnlistedProperty<?>, Optional<?>> unlistedProperties) {
+        return null;
+    }
+
+    protected IBlockState createState(ImmutableMap<IProperty<?>, Comparable<?>> properties, @Nullable ImmutableMap<IUnlistedProperty<?>, Optional<?>> unlistedProperties) {
+        BlockStateContainer.StateImplementation state = createState(block, properties, unlistedProperties);
+        if (state != null) {
+            return state;
+        } else {
+            return NumericalBlockState.fromPropertyValueMap((BlockStateContainer) (Object) this, properties);
+        }
     }
 
     @Overwrite

src/main/java/org/dimdev/vanillafix/blockstates/mixins/MixinExtendedBlockState.java

@@ -3,14 +3,16 @@
 import com.google.common.collect.ImmutableMap;
 import net.minecraft.block.Block;
 import net.minecraft.block.properties.IProperty;
+import net.minecraft.block.state.BlockStateContainer;
 import net.minecraft.block.state.IBlockState;
 import net.minecraftforge.common.property.ExtendedBlockState;
 import net.minecraftforge.common.property.IUnlistedProperty;
 import org.dimdev.vanillafix.blockstates.NumericalExtendedBlockState;
 import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Overwrite;
 
+import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
-import java.util.Map;
 import java.util.Optional;
 
 @Mixin(ExtendedBlockState.class)
@@ -20,7 +22,13 @@ public MixinExtendedBlockState(Block block, IProperty<?>[] properties, Immutable
     }
 
     @Override
-    protected IBlockState createState(Map<IProperty<?>, Comparable<?>> properties, @Nullable ImmutableMap<IUnlistedProperty<?>, java.util.Optional<?>> unlistedProperties) {
+    @Overwrite
+    protected BlockStateContainer.StateImplementation createState(Block block, ImmutableMap<IProperty<?>, Comparable<?>> properties, @Nullable ImmutableMap<IUnlistedProperty<?>, Optional<?>> unlistedProperties) {
+        return null;
+    }
+
+    @Override
+    protected IBlockState createState(ImmutableMap<IProperty<?>, Comparable<?>> properties, @Nullable ImmutableMap<IUnlistedProperty<?>, Optional<?>> unlistedProperties) {
         IBlockState normalState = super.createState(properties, unlistedProperties);
         if (unlistedProperties == null || unlistedProperties.isEmpty()) {
             return normalState;

src/main/java/org/dimdev/vanillafix/blockstates/mixins/MixinPropertyHelper.java

@@ -44,7 +44,7 @@ public IBakedModel getObject(ModelResourceLocation location) {
         try {
             return loadedBakedModels.get(location, () -> Optional.ofNullable(loadBakedModel(location))).orElse(null);
         } catch (ExecutionException e) {
-            throw new RuntimeException(e);
+            throw new RuntimeException(e.getCause());
         }
     }
 

src/main/java/org/dimdev/vanillafix/dynamicresources/model/DynamicBakedModelProvider.java

@@ -37,7 +37,7 @@ public IModel getObject(ResourceLocation location) {
         try {
             return loadedModels.get(location, () -> Optional.ofNullable(loadModel(location))).orElse(null);
         } catch (ExecutionException e) {
-            throw new RuntimeException(e);
+            throw new RuntimeException(e.getCause());
         }
     }
 

src/main/java/org/dimdev/vanillafix/dynamicresources/model/DynamicModelProvider.java

@@ -1,5 +1,7 @@
 package org.dimdev.vanillafix.dynamicresources.model;
 
+import com.google.common.cache.Cache;
+import com.google.common.cache.CacheBuilder;
 import com.google.common.collect.Lists;
 import net.minecraft.block.Block;
 import net.minecraft.client.Minecraft;
@@ -16,9 +18,18 @@
 import java.io.InputStreamReader;
 import java.nio.charset.StandardCharsets;
 import java.util.List;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.TimeUnit;
 
 public class VariantLoader implements ICustomModelLoader {
     public static final VariantLoader INSTANCE = new VariantLoader();
+    private Cache<ResourceLocation, ModelBlockDefinition> modelBlockDefinitionCache =
+            CacheBuilder.newBuilder()
+                        .expireAfterAccess(2, TimeUnit.MINUTES)
+                        .maximumSize(100)
+                        .concurrencyLevel(8)
+                        .softValues()
+                        .build();
 
     @Override
     public boolean accepts(ResourceLocation modelLocation) {
@@ -28,7 +39,7 @@ public boolean accepts(ResourceLocation modelLocation) {
     @Override
     public IModel loadModel(ResourceLocation modelLocation) throws Exception {
         ModelResourceLocation variant = (ModelResourceLocation) modelLocation;
-        ModelBlockDefinition definition = loadMultiPartModelBlockDefinition(variant);
+        ModelBlockDefinition definition = getModelBlockDefinition(variant);
 
         if (definition.hasVariant(variant.getVariant())) {
             return new WeightedRandomModel(definition.getVariant(variant.getVariant()));
@@ -44,7 +55,16 @@ public IModel loadModel(ResourceLocation modelLocation) throws Exception {
         }
     }
 
-    private ModelBlockDefinition loadMultiPartModelBlockDefinition(ResourceLocation location) {
+    private ModelBlockDefinition getModelBlockDefinition(ResourceLocation location) {
+        ResourceLocation simpleLocation = new ResourceLocation(location.getNamespace(), location.getPath());
+        try {
+            return modelBlockDefinitionCache.get(simpleLocation, () -> loadModelBlockDefinition(simpleLocation));
+        } catch (ExecutionException e) {
+            throw new RuntimeException(e.getCause());
+        }
+    }
+
+    private ModelBlockDefinition loadModelBlockDefinition(ResourceLocation location) {
         ResourceLocation blockstateLocation = new ResourceLocation(location.getNamespace(), "blockstates/" + location.getPath() + ".json");
 
         List<ModelBlockDefinition> list = Lists.newArrayList();

src/main/java/org/dimdev/vanillafix/dynamicresources/model/VariantLoader.java

@@ -8,8 +8,7 @@
   "compatibilityLevel": "JAVA_8",
   "mixins": [
     "MixinBlockStateContainer",
-    "MixinExtendedBlockState",
-    "MixinPropertyHelper"
+    "MixinExtendedBlockState"
   ],
   "client": [
   ],