Fix texture mapping and rotation on modelblockmodels

Author: mikeprimm

core/src/main/java/org/dynmapblockscan/core/AbstractBlockScanBase.java

@@ -492,9 +492,9 @@ public void registerModelListModel(String blkname, StateRec state, List<BlockEle
         }
         // Get model list model
         ModelBlockModel mod = td.getModelBlockModelRec(blknm, state.keyValuePairs);
-        // Loop over elements
-        int imgidx = 0;
-        int[] cuboididx = new int[6];
+        // Start patch list
+        ArrayList<String> textures = new ArrayList<String>();
+        // Loop over elements        
         for (BlockElement be : elems) {
         	double xrot = 0, yrot = 0, zrot = 0;
         	double[] origin = null;
@@ -516,8 +516,6 @@ else if (be.rotation.axis.equals("z")) {
         	}
             ModelBlock modelem = mod.addModelBlock(be.from, be.to, xrot, yrot, zrot, be.shade, origin,
             		be.modelrot.rotX, be.modelrot.rotY, be.modelrot.rotZ);
-            // Initialize to no texture for each side
-            for (int v = 0; v < cuboididx.length; v++) cuboididx[v] = -1;
             // Loop over the images for the element
             for (Entry<ElementFace, BlockFace> face : be.faces.entrySet()) {
                 ElementFace facing = face.getKey();
@@ -534,18 +532,17 @@ else if (be.rotation.axis.equals("z")) {
                 		rot = SideRotation.DEG270;
                 		break;
                 }
+                int txtidx = -1;
                 if (f.texture != null) {
-                    TextureFile gtf = td.registerTexture(f.texture);
-                    int faceidx = (360-f.rotation);
-                    if (!be.uvlock) {
-                        faceidx = faceidx + f.facerotation;
-                    }
-                    TextureModifier tm = TextureModifier.NONE;
-                    cuboididx[facing.ordinal()] = imgidx;
-                    btr.setPatchTexture(gtf, tm, imgidx);
-                    imgidx++;
+                	txtidx = textures.indexOf(f.texture);	// See if already registered
+                	if (txtidx < 0) {
+                		txtidx = textures.size();
+                        textures.add(f.texture);	// Add to list
+                		TextureFile gtf = td.registerTexture(f.texture);	// Register if needed
+                        btr.setPatchTexture(gtf, TextureModifier.NONE, txtidx);	// And set texture to assigned index
+                	}
                 }
-                modelem.addBlockSide(facing.side, f.uv, rot, cuboididx[facing.ordinal()], f.tintindex);
+                modelem.addBlockSide(facing.side, f.uv, rot, txtidx, f.tintindex);
             }
         }
     }

forge-1.14.4/src/main/java/org/dynmapblockscan/forge_1_14_4/DynmapBlockScanPlugin.java

@@ -235,7 +235,7 @@ public Map<String, String> fromBlockState(net.minecraft.block.BlockState bs) {
 
     public static class OurLog implements BlockScanLog {
         Logger log;
-        public static final String DM = "";
+        public static final String DM = "[DynmapBlockScan] ";
         OurLog() {
             log = LogManager.getLogger("DynmapBlockScan");
         }

forge-1.15.2/src/main/java/org/dynmapblockscan/forge_1_15_2/DynmapBlockScanPlugin.java

@@ -235,7 +235,7 @@ public Map<String, String> fromBlockState(net.minecraft.block.BlockState bs) {
 
     public static class OurLog implements BlockScanLog {
         Logger log;
-        public static final String DM = "";
+        public static final String DM = "[DynmapBlockScan] ";
         OurLog() {
             log = LogManager.getLogger("DynmapBlockScan");
         }

forge-1.16.5/src/main/java/org/dynmapblockscan/forge_1_16_5/DynmapBlockScanPlugin.java

@@ -239,7 +239,7 @@ public Map<String, String> fromBlockState(net.minecraft.block.BlockState bs) {
 
     public static class OurLog implements BlockScanLog {
         Logger log;
-        public static final String DM = "";
+        public static final String DM = "[DynmapBlockScan] ";
         OurLog() {
             log = LogManager.getLogger("DynmapBlockScan");
         }

forge-1.17.1/src/main/java/org/dynmapblockscan/forge_1_17_1/DynmapBlockScanPlugin.java

@@ -241,7 +241,7 @@ public ImmutableMap<String, String> fromBlockState(BlockState bs) {
 
     public static class OurLog implements BlockScanLog {
         Logger log;
-        public static final String DM = "";
+        public static final String DM = "[DynmapBlockScan] ";
         OurLog() {
             log = LogManager.getLogger("DynmapBlockScan");
         }

forge-1.18/src/main/java/org/dynmapblockscan/forge_1_18/DynmapBlockScanPlugin.java

@@ -237,7 +237,7 @@ public Map<String, String> fromBlockState(BlockState bs) {
 
     public static class OurLog implements BlockScanLog {
         Logger log;
-        public static final String DM = "";
+        public static final String DM = "[DynmapBlockScan] ";
         OurLog() {
             log = LogManager.getLogger("DynmapBlockScan");
         }