Fix up some bad 1.21.4 textures

mikeprimm-mirific · mikeprimm-mirific · commit 4c575a4e9332 · 2025-01-14T21:01:38.000-05:00
diff --git a/DynmapCore/src/main/java/org/dynmap/hdmap/HDBlockStateTextureMap.java b/DynmapCore/src/main/java/org/dynmap/hdmap/HDBlockStateTextureMap.java
@@ -80,7 +80,7 @@ public void resizeFaces(int cnt) {
     }
     
     // Add block state to table, with given block IDs and state indexes
-    public void addToTable(Map<DynmapBlockState, BitSet> states) {
+    public void addToTable(Map<DynmapBlockState, BitSet> states, int lineNum) {
         /* Add entries to lookup table */
         for (DynmapBlockState baseblk : states.keySet()) {
             if (baseblk.isNotAir()) {
@@ -98,7 +98,7 @@ public void addToTable(Map<DynmapBlockState, BitSet> states) {
                 }
             }
             else {
-            	Log.warning("Invalid texture block name: " + baseblk.blockName);
+            	Log.warning("Invalid texture block name: " + baseblk.blockName + ((lineNum > 0) ? "(line " + lineNum + ")" : ""));
             }
         }
     }
diff --git a/DynmapCore/src/main/java/org/dynmap/hdmap/TexturePack.java b/DynmapCore/src/main/java/org/dynmap/hdmap/TexturePack.java
@@ -569,7 +569,7 @@ private static void processTextureMaps() {
                 txtids[i] = ti.texture_ids.get(i).intValue();
             }
             HDBlockStateTextureMap map = new HDBlockStateTextureMap(txtids, null, ti.colorMult, ti.custColorMult, ti.blockset, true, null, ti.trans);
-            map.addToTable(ti.states);
+            map.addToTable(ti.states, -1);
         }
     }
     /**
@@ -2146,7 +2146,7 @@ else if(av[0].equals("stdrot")) {
                         if (bsprslt.size() > 0) {
                             Integer colorIndex = (blockColorIdx >= 0)?(blockColorIdx + IMG_CNT):null;
                             HDBlockStateTextureMap map = new HDBlockStateTextureMap(faces, layers, colorMult, custColorMult, blockset, stdrot, colorIndex, trans);
-                            map.addToTable(bsprslt);
+                            map.addToTable(bsprslt, lineNum);
                             cnt++;
                         }
                         else {
diff --git a/DynmapCore/src/main/resources/texture_1.txt b/DynmapCore/src/main/resources/texture_1.txt
@@ -4617,7 +4617,7 @@ block:id=%melon_stem,patch0=0:melon_stem,blockcolor=foliagebiome,transparency=TR
 [1.20.5-]texture:id=vault_front_on,filename=assets/minecraft/textures/block/vault_front_on.png,xcount=1,ycount=1
 [1.20.5-]texture:id=vault_front_ejecting,filename=assets/minecraft/textures/block/vault_front_ejecting.png,xcount=1,ycount=1
 [1.20.5-]texture:id=vault_top_ejecting,filename=assets/minecraft/textures/block/vault_top_ejecting.png,xcount=1,ycount=1
-[1.20.5-]texture:id=minecraft:all,filename=assets/minecraft/textures/all.png,xcount=1,ycount=1
+[1.20.5-]texture:id=heavy_core,filename=assets/minecraft/textures/block/heavy_core.png,xcount=2,ycount=2
 [1.20.5-]block:id=%vault,state=facing:north/ominous:true/vault_state:inactive,patch0=0:vault_side_off_ominous,patch1=0:vault_bottom_ominous,patch2=0:vault_top_ominous,patch3=0:vault_front_off_ominous,transparency=SEMITRANSPARENT,stdrot=true
 [1.20.5-]block:id=%vault,state=facing:north/ominous:true/vault_state:active,patch0=0:vault_side_on_ominous,patch1=0:vault_bottom_ominous,patch2=0:vault_top_ominous,patch3=0:vault_front_on_ominous,transparency=SEMITRANSPARENT,stdrot=true
 [1.20.5-]block:id=%vault,state=facing:north/ominous:true/vault_state:unlocking,patch0=0:vault_side_on_ominous,patch1=0:vault_bottom_ominous,patch2=0:vault_top_ominous,patch3=0:vault_front_ejecting_ominous,transparency=SEMITRANSPARENT,stdrot=true
@@ -4650,7 +4650,7 @@ block:id=%melon_stem,patch0=0:melon_stem,blockcolor=foliagebiome,transparency=TR
 [1.20.5-]block:id=%vault,state=facing:east/ominous:false/vault_state:active,patch0=0:vault_side_on,patch1=0:vault_bottom,patch2=0:vault_top,patch3=0:vault_front_on,transparency=SEMITRANSPARENT,stdrot=true
 [1.20.5-]block:id=%vault,state=facing:east/ominous:false/vault_state:unlocking,patch0=0:vault_side_on,patch1=0:vault_bottom,patch2=0:vault_top,patch3=0:vault_front_ejecting,transparency=SEMITRANSPARENT,stdrot=true
 [1.20.5-]block:id=%vault,state=facing:east/ominous:false/vault_state:ejecting,patch0=0:vault_side_on,patch1=0:vault_bottom,patch2=0:vault_top_ejecting,patch3=0:vault_front_ejecting,transparency=SEMITRANSPARENT,stdrot=true
-[1.20.5-]block:id=%heavy_core,patch0=0:minecraft:all,transparency=SEMITRANSPARENT,stdrot=true
+[1.20.5-]block:id=%heavy_core,patch0=0:heavy_core,patch1=1:heavy_core,patch2=2:heavy_core,transparency=SEMITRANSPARENT,stdrot=true
 
 # 1.21
 [1.21-]texture:id=copper_bulb_lit_powered,filename=assets/minecraft/textures/block/copper_bulb_lit_powered.png,xcount=1,ycount=1
@@ -4984,12 +4984,12 @@ block:id=%melon_stem,patch0=0:melon_stem,blockcolor=foliagebiome,transparency=TR
 [1.21.4-]texture:id=creaking_heart_top,filename=assets/minecraft/textures/block/creaking_heart_top.png,xcount=1,ycount=1
 [1.21.4-]texture:id=creaking_heart_active,filename=assets/minecraft/textures/block/creaking_heart_active.png,xcount=1,ycount=1
 [1.21.4-]texture:id=creaking_heart,filename=assets/minecraft/textures/block/creaking_heart.png,xcount=1,ycount=1
-[1.21.4-]block:id=%creaking_heart,active:false,state=axis:x,patch0=0:creaking_heart_top,patch1=6000:creaking_heart,patch2=6000:creaking_heart,patch3=0:creaking_heart_top,patch4=6000:creaking_heart,patch5=6000:creaking_heart,stdrot=true
-[1.21.4-]block:id=%creaking_heart,active:false,state=axis:y,patch0=0:creaking_heart,patch1=0:creaking_heart_top,patch2=0:creaking_heart,patch3=0:creaking_heart,patch4=0:creaking_heart_top,patch5=0:creaking_heart,stdrot=true
-[1.21.4-]block:id=%creaking_heart,active:false,state=axis:z,patch0=6000:creaking_heart,patch1=0:creaking_heart,patch2=0:creaking_heart_top,patch3=6000:creaking_heart,patch4=0:creaking_heart,patch5=0:creaking_heart_top,stdrot=true
-[1.21.4-]block:id=%creaking_heart_active,active:true,state=axis:x,patch0=0:creaking_heart_top_active,patch1=6000:creaking_heart_active,patch2=6000:creaking_heart_active,patch3=0:creaking_heart_top_active,patch4=6000:creaking_heart_active,patch5=6000:creaking_heart_active,stdrot=true
-[1.21.4-]block:id=%creaking_heart_active,active:true,state=axis:y,patch0=0:creaking_heart_active,patch1=0:creaking_heart_top_active,patch2=0:creaking_heart_active,patch3=0:creaking_heart_active,patch4=0:creaking_heart_top_active,patch5=0:creaking_heart_active,stdrot=true
-[1.21.4-]block:id=%creaking_heart_active,active:true,state=axis:z,patch0=6000:creaking_heart_active,patch1=0:creaking_heart_active,patch2=0:creaking_heart_top_active,patch3=6000:creaking_heart_active,patch4=0:creaking_heart_active,patch5=0:creaking_heart_top_active,stdrot=true
+[1.21.4-]block:id=%creaking_heart,state=axis:x/active:false,patch0=0:creaking_heart_top,patch1=6000:creaking_heart,patch2=6000:creaking_heart,patch3=0:creaking_heart_top,patch4=6000:creaking_heart,patch5=6000:creaking_heart,stdrot=true
+[1.21.4-]block:id=%creaking_heart,state=axis:y/active:false,patch0=0:creaking_heart,patch1=0:creaking_heart_top,patch2=0:creaking_heart,patch3=0:creaking_heart,patch4=0:creaking_heart_top,patch5=0:creaking_heart,stdrot=true
+[1.21.4-]block:id=%creaking_heart,state=axis:z/active:false,patch0=6000:creaking_heart,patch1=0:creaking_heart,patch2=0:creaking_heart_top,patch3=6000:creaking_heart,patch4=0:creaking_heart,patch5=0:creaking_heart_top,stdrot=true
+[1.21.4-]block:id=%creaking_heart,state=axis:x/active:true,patch0=0:creaking_heart_top_active,patch1=6000:creaking_heart_active,patch2=6000:creaking_heart_active,patch3=0:creaking_heart_top_active,patch4=6000:creaking_heart_active,patch5=6000:creaking_heart_active,stdrot=true
+[1.21.4-]block:id=%creaking_heart,state=axis:y/active:true,patch0=0:creaking_heart_active,patch1=0:creaking_heart_top_active,patch2=0:creaking_heart_active,patch3=0:creaking_heart_active,patch4=0:creaking_heart_top_active,patch5=0:creaking_heart_active,stdrot=true
+[1.21.4-]block:id=%creaking_heart,state=axis:z/active:true,patch0=6000:creaking_heart_active,patch1=0:creaking_heart_active,patch2=0:creaking_heart_top_active,patch3=6000:creaking_heart_active,patch4=0:creaking_heart_active,patch5=0:creaking_heart_top_active,stdrot=true
 #All the resin stuff
 [1.21.4-]texture:id=resin_bricks,filename=assets/minecraft/textures/block/resin_bricks.png,xcount=1,ycount=1
 [1.21.4-]texture:id=chiseled_resin_bricks,filename=assets/minecraft/textures/block/chiseled_resin_bricks.png,xcount=1,ycount=1

Original file line number	Diff line number	Diff line change
`@@ -80,7 +80,7 @@ public void resizeFaces(int cnt) {`
`80`	`80`	`}`
`81`	`81`
`82`	`82`	`// Add block state to table, with given block IDs and state indexes`
`83`		`- public void addToTable(Map<DynmapBlockState, BitSet> states) {`
	`83`	`+ public void addToTable(Map<DynmapBlockState, BitSet> states, int lineNum) {`
`84`	`84`	`/* Add entries to lookup table */`
`85`	`85`	`for (DynmapBlockState baseblk : states.keySet()) {`
`86`	`86`	`if (baseblk.isNotAir()) {`
`@@ -98,7 +98,7 @@ public void addToTable(Map<DynmapBlockState, BitSet> states) {`
`98`	`98`	`}`
`99`	`99`	`}`
`100`	`100`	`else {`
`101`		`- Log.warning("Invalid texture block name: " + baseblk.blockName);`
	`101`	`+ Log.warning("Invalid texture block name: " + baseblk.blockName + ((lineNum > 0) ? "(line " + lineNum + ")" : ""));`
`102`	`102`	`}`
`103`	`103`	`}`
`104`	`104`	`}`
Original file line number	Diff line number	Diff line change
`@@ -569,7 +569,7 @@ private static void processTextureMaps() {`
`569`	`569`	`txtids[i] = ti.texture_ids.get(i).intValue();`
`570`	`570`	`}`
`571`	`571`	`HDBlockStateTextureMap map = new HDBlockStateTextureMap(txtids, null, ti.colorMult, ti.custColorMult, ti.blockset, true, null, ti.trans);`
`572`		`- map.addToTable(ti.states);`
	`572`	`+ map.addToTable(ti.states, -1);`
`573`	`573`	`}`
`574`	`574`	`}`
`575`	`575`	`/**`
`@@ -2146,7 +2146,7 @@ else if(av[0].equals("stdrot")) {`
`2146`	`2146`	`if (bsprslt.size() > 0) {`
`2147`	`2147`	`Integer colorIndex = (blockColorIdx >= 0)?(blockColorIdx + IMG_CNT):null;`
`2148`	`2148`	`HDBlockStateTextureMap map = new HDBlockStateTextureMap(faces, layers, colorMult, custColorMult, blockset, stdrot, colorIndex, trans);`
`2149`		`- map.addToTable(bsprslt);`
	`2149`	`+ map.addToTable(bsprslt, lineNum);`
`2150`	`2150`	`cnt++;`
`2151`	`2151`	`}`
`2152`	`2152`	`else {`