Allow remapping blockstates and block properties via addons (#759)

* Add abillity for resourcepack-extensions to define blockstate-properties and alter the blockstate id to resource mapping

* Add caching for key-mapping

Author: TBlueF

core/src/main/java/de/bluecolored/bluemap/core/map/hires/block/BlockStateModelRenderer.java

@@ -82,7 +82,7 @@ public void render(BlockNeighborhood block, BlockState blockState, TileModelView
     private void renderModel(BlockNeighborhood block, BlockState blockState, TileModelView tileModel, Color blockColor) {
         int modelStart = tileModel.getStart();
 
-        var stateResource = resourcePack.getBlockStates().get(blockState.getId());
+        var stateResource = resourcePack.getBlockState(blockState);
         if (stateResource == null) return;
 
         float blockColorOpacity = 0;

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

@@ -87,6 +87,8 @@ public interface Extension<T extends ResourcePackExtension> extends Keyed {
 
     @Getter private final BlockColorCalculatorFactory colorCalculatorFactory;
     private final BlockPropertiesConfig blockPropertiesConfig;
+
+    private final LoadingCache<de.bluecolored.bluemap.core.world.BlockState, BlockState> blockStateCache;
     private final LoadingCache<de.bluecolored.bluemap.core.world.BlockState, BlockProperties> blockPropertiesCache;
 
     private final Map<Extension<?>, ResourcePackExtension> extensions;
@@ -104,6 +106,11 @@ public ResourcePack(PackVersion packVersion) {
         this.colorCalculatorFactory = new BlockColorCalculatorFactory();
         this.blockPropertiesConfig = new BlockPropertiesConfig();
 
+        this.blockStateCache = Caffeine.newBuilder()
+                .executor(BlueMap.THREAD_POOL)
+                .maximumSize(10000)
+                .expireAfterAccess(1, TimeUnit.MINUTES)
+                .build(this::loadBlockState);
         this.blockPropertiesCache = Caffeine.newBuilder()
                 .executor(BlueMap.THREAD_POOL)
                 .maximumSize(10000)
@@ -355,15 +362,36 @@ private Atlas getBlocksAtlas() {
         return new Atlas();
     }
 
+    public BlockState getBlockState(de.bluecolored.bluemap.core.world.BlockState blockState) {
+        return blockStateCache.get(blockState);
+    }
+
+    private BlockState loadBlockState(de.bluecolored.bluemap.core.world.BlockState blockState) {
+        Key key = blockState.getId();
+        for (ResourcePackExtension extension : extensions.values()) {
+            key = extension.getBlockStateKey(key);
+        }
+        return blockStates.get(key);
+    }
+
     public BlockProperties getBlockProperties(de.bluecolored.bluemap.core.world.BlockState state) {
         return blockPropertiesCache.get(state);
     }
 
     private BlockProperties loadBlockProperties(de.bluecolored.bluemap.core.world.BlockState state) {
-        BlockProperties.Builder props = blockPropertiesConfig.getBlockProperties(state).toBuilder();
+        BlockProperties.Builder props = BlockProperties.builder();
+
+        // collect properties from extensions
+        for (ResourcePackExtension extension : extensions.values()) {
+            extension.getBlockProperties(state, props);
+        }
+
+        // explicitly configured properties always have priority -> overwrite
+        props.from(blockPropertiesConfig.getBlockProperties(state));
 
+        // calculate culling and occlusion from model if UNDEFINED
         if (props.isOccluding() == Tristate.UNDEFINED || props.isCulling() == Tristate.UNDEFINED) {
-            BlockState resource = blockStates.get(state.getId());
+            BlockState resource = getBlockState(state);
             if (resource != null) {
                 resource.forEach(state,0, 0, 0, variant -> {
                     Model model = variant.getModel().getResource(models::get);

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

@@ -26,6 +26,9 @@
 
 import de.bluecolored.bluemap.core.resources.pack.PackExtension;
 import de.bluecolored.bluemap.core.util.Key;
+import de.bluecolored.bluemap.core.world.BlockProperties;
+import de.bluecolored.bluemap.core.world.BlockState;
+import org.jetbrains.annotations.Nullable;
 
 import java.util.Set;
 
@@ -35,4 +38,10 @@ default Set<Key> collectUsedTextureKeys() {
         return Set.of();
     }
 
+    default Key getBlockStateKey(Key key) {
+        return key;
+    }
+
+    default void getBlockProperties(BlockState blockState, BlockProperties.Builder propertiesBuilder) {}
+
 }