Add huge mushroom skinning for 1.13

DynmapCore/src/main/java/org/dynmap/hdmap/renderer/MushroomStateRenderer.java

@@ -0,0 +1,54 @@
+package org.dynmap.hdmap.renderer;
+
+import java.util.ArrayList;
+import java.util.BitSet;
+import java.util.Map;
+
+import org.dynmap.renderer.CustomRenderer;
+import org.dynmap.renderer.MapDataContext;
+import org.dynmap.renderer.RenderPatch;
+import org.dynmap.renderer.RenderPatchFactory;
+
+/*
+ * Huge mushroom renderer for v1.13+
+ */
+public class MushroomStateRenderer extends CustomRenderer {
+    private static final int TEXTURE_OUTSIDE = 0;
+    private static final int TEXTURE_INSIDE = 1;
+    
+    // Meshes, indexed by state index (bit5=down, bit4=east, bit3=north, bit2=south, bit1=up, bit0=west)
+    protected RenderPatch[][] meshes = new RenderPatch[64][];
+    
+    @Override
+    public boolean initializeRenderer(RenderPatchFactory rpf, String blkname, BitSet blockdatamask, Map<String,String> custparm) {
+        if(!super.initializeRenderer(rpf, blkname, blockdatamask, custparm))
+            return false;
+        buildPatches(rpf);
+        return true;
+    }
+
+    private void buildPatches(RenderPatchFactory rpf) {
+        int[] faces = new int[6];
+        ArrayList<RenderPatch> list = new ArrayList<RenderPatch>();
+        for (int i = 0; i < 64; i++) {
+            list.clear();
+            faces[0] = ((i & 0x20) == 0) ? TEXTURE_OUTSIDE : TEXTURE_INSIDE;    // Down
+            faces[1] = ((i & 0x02) == 0) ? TEXTURE_OUTSIDE : TEXTURE_INSIDE;    // Up
+            faces[2] = ((i & 0x01) == 0) ? TEXTURE_OUTSIDE : TEXTURE_INSIDE;    // West
+            faces[3] = ((i & 0x10) == 0) ? TEXTURE_OUTSIDE : TEXTURE_INSIDE;    // East
+            faces[4] = ((i & 0x08) == 0) ? TEXTURE_OUTSIDE : TEXTURE_INSIDE;    // North
+            faces[5] = ((i & 0x04) == 0) ? TEXTURE_OUTSIDE : TEXTURE_INSIDE;    // North
+            CustomRenderer.addBox(rpf, list, 0, 1, 0, 1, 0, 1, faces);
+            meshes[i] = list.toArray(new RenderPatch[list.size()]);
+        }
+    }
+    @Override
+    public int getMaximumTextureCount() {
+        return 2;
+    }
+    
+    @Override
+    public RenderPatch[] getRenderPatchList(MapDataContext ctx) {
+        return meshes[ctx.getBlockType().stateIndex];
+    }    
+}

DynmapCore/src/main/resources/models_1.txt

@@ -1367,3 +1367,7 @@ patchblock:id=tube_coral,id=brain_coral,id=bubble_coral,id=fire_coral,id=horn_co
 
 # Conduit
 boxblock:id=conduit,xmin=0.3125,xmax=0.6875,ymin=0.3125,ymax=0.6875,zmin=0.3125,zmax=0.6875
+
+# Red huge mushroom
+# Brown huge mushroom
+customblock:id=red_mushroom_block,id=brown_mushroom_block,class=org.dynmap.hdmap.renderer.MushroomStateRenderer

DynmapCore/src/main/resources/texture_1.txt

@@ -1147,50 +1147,10 @@ block:id=cracked_stone_bricks,allfaces=0:cracked_stone_bricks,stdrot=true
 # Chiseled Stone Bricks
 block:id=chiseled_stone_bricks,allfaces=0:chiseled_stone_bricks,stdrot=true
 
-#TODO: the data map here is a mess - need to rework for 1.13 mapping (maybe custom renderer)
-# Brown Mushroom Block - inside
-# Red Mushroom Block - inside
-block:id=brown_mushroom_block,id=red_mushroom_block,data=0,allfaces=0:mushroom_block_inside,stdrot=true
-# Brown Mushroom Block - N-E-top cap color
-block:id=brown_mushroom_block,data=1,top=0:brown_mushroom_block,north=0:brown_mushroom_block,east=0:brown_mushroom_block,south=0:mushroom_block_inside,west=0:mushroom_block_inside,bottom=0:mushroom_block_inside,stdrot=true
-# Red Mushroom Block - N-E-top cap color
-block:id=red_mushroom_block,data=1,top=0:red_mushroom_block,north=0:red_mushroom_block,east=0:red_mushroom_block,south=0:mushroom_block_inside,west=0:mushroom_block_inside,bottom=0:mushroom_block_inside,stdrot=true
-# Brown Mushroom Block - E-top cap color
-block:id=brown_mushroom_block,data=2,top=0:brown_mushroom_block,east=0:brown_mushroom_block,north=0:mushroom_block_inside,south=0:mushroom_block_inside,west=0:mushroom_block_inside,bottom=0:mushroom_block_inside,stdrot=true
-# Red Mushroom Block - E-top cap color
-block:id=red_mushroom_block,data=2,top=0:red_mushroom_block,east=0:red_mushroom_block,north=0:mushroom_block_inside,south=0:mushroom_block_inside,west=0:mushroom_block_inside,bottom=0:mushroom_block_inside,stdrot=true
-# Brown Mushroom Block - S-E-top cap color
-block:id=brown_mushroom_block,data=3,top=0:brown_mushroom_block,south=0:brown_mushroom_block,east=0:brown_mushroom_block,north=0:mushroom_block_inside,west=0:mushroom_block_inside,bottom=0:mushroom_block_inside,stdrot=true
-# Red Mushroom Block - S-E-top cap color
-block:id=red_mushroom_block,data=3,top=0:red_mushroom_block,south=0:red_mushroom_block,east=0:red_mushroom_block,north=0:mushroom_block_inside,west=0:mushroom_block_inside,bottom=0:mushroom_block_inside,stdrot=true
-# Brown Mushroom Block - N-top cap color
-block:id=brown_mushroom_block,data=4,top=0:brown_mushroom_block,north=0:brown_mushroom_block,east=0:mushroom_block_inside,south=0:mushroom_block_inside,west=0:mushroom_block_inside,bottom=0:mushroom_block_inside,stdrot=true
-# Red Mushroom Block - N-top cap color
-block:id=red_mushroom_block,data=4,top=0:red_mushroom_block,north=0:red_mushroom_block,east=0:mushroom_block_inside,south=0:mushroom_block_inside,west=0:mushroom_block_inside,bottom=0:mushroom_block_inside,stdrot=true
-# Brown Mushroom Block - top cap color
-block:id=brown_mushroom_block,data=5,top=0:brown_mushroom_block,north=0:mushroom_block_inside,east=0:mushroom_block_inside,south=0:mushroom_block_inside,west=0:mushroom_block_inside,bottom=0:mushroom_block_inside,stdrot=true
-# Red Mushroom Block - top cap color
-block:id=red_mushroom_block,data=5,top=0:red_mushroom_block,north=0:mushroom_block_inside,east=0:mushroom_block_inside,south=0:mushroom_block_inside,west=0:mushroom_block_inside,bottom=0:mushroom_block_inside,stdrot=true
-# Brown Mushroom Block - top-S cap color
-block:id=brown_mushroom_block,data=6,top=0:brown_mushroom_block,south=0:brown_mushroom_block,north=0:mushroom_block_inside,east=0:mushroom_block_inside,west=0:mushroom_block_inside,bottom=0:mushroom_block_inside,stdrot=true
-# Red Mushroom Block - top-S cap color
-block:id=red_mushroom_block,data=6,top=0:red_mushroom_block,south=0:red_mushroom_block,north=0:mushroom_block_inside,east=0:mushroom_block_inside,west=0:mushroom_block_inside,bottom=0:mushroom_block_inside,stdrot=true
-# Brown Mushroom Block - N-W cap color
-block:id=brown_mushroom_block,data=7,top=0:brown_mushroom_block,north=0:brown_mushroom_block,west=0:brown_mushroom_block,south=0:mushroom_block_inside,east=0:mushroom_block_inside,bottom=0:mushroom_block_inside,stdrot=true
-# Red Mushroom Block - N-W cap color
-block:id=red_mushroom_block,data=7,top=0:red_mushroom_block,north=0:red_mushroom_block,west=0:red_mushroom_block,south=0:mushroom_block_inside,east=0:mushroom_block_inside,bottom=0:mushroom_block_inside,stdrot=true
-# Brown Mushroom Block - top-W cap color
-block:id=brown_mushroom_block,data=8,top=0:brown_mushroom_block,west=0:brown_mushroom_block,north=0:mushroom_block_inside,east=0:mushroom_block_inside,south=0:mushroom_block_inside,bottom=0:mushroom_block_inside,stdrot=true
-# Red Mushroom Block - top-W cap color
-block:id=red_mushroom_block,data=8,top=0:red_mushroom_block,west=0:red_mushroom_block,north=0:mushroom_block_inside,east=0:mushroom_block_inside,south=0:mushroom_block_inside,bottom=0:mushroom_block_inside,stdrot=true
-# Brown Mushroom Block - top-S-W cap color
-block:id=brown_mushroom_block,data=9,top=0:brown_mushroom_block,west=0:brown_mushroom_block,south=0:brown_mushroom_block,north=0:mushroom_block_inside,east=0:mushroom_block_inside,bottom=0:mushroom_block_inside,stdrot=true
-# Red Mushroom Block - top-S-W cap color
-block:id=red_mushroom_block,data=9,top=0:red_mushroom_block,west=0:red_mushroom_block,south=0:red_mushroom_block,north=0:mushroom_block_inside,east=0:mushroom_block_inside,bottom=0:mushroom_block_inside,stdrot=true
-# Brown Mushroom Block - all cap TODO: fix mapping
-block:id=brown_mushroom_block,topbottom=0:brown_mushroom_block,allsides=0:brown_mushroom_block,stdrot=true
-# Red Mushroom Block - all cap TODO: :fix mapping
-block:id=red_mushroom_block,topbottom=0:red_mushroom_block,allsides=0:red_mushroom_block,stdrot=true
+# Brown Mushroom Block
+block:id=brown_mushroom_block,patch0=0:brown_mushroom_block,patch1=0:mushroom_block_inside
+# Red Mushroom Block
+block:id=red_mushroom_block,patch0=0:red_mushroom_block,patch1=0:mushroom_block_inside
 
 # Brown Mushroom Block - stem
 # Red Mushroom Block - stem