update textures

TeamGalena · Jul 28, 2023 · f782d78 · f782d78
1 parent 50865fb
commit f782d78
Show file tree

Hide file tree

Showing 20 changed files with 12 additions and 5 deletions.
diff --git a/src/generated/resources/.cache/4386903e4db1f8c9e2eb0f821fa1ca50b2f74073 b/src/generated/resources/.cache/4386903e4db1f8c9e2eb0f821fa1ca50b2f74073
@@ -1,4 +1,4 @@
-// 1.19.2	2023-07-15T17:15:19.4361045	Copperative Block States
+// 1.19.2	2023-07-28T22:13:20.7790287	Copperative Block States
 438a4135790e3deb954693124d4a4b7d7e461e92 assets/copperative/blockstates/copper_bricks.json
 af2412f680c0e702248592f9616c1b481fa15c28 assets/copperative/blockstates/copper_door.json
 5f8c06ec4a3a98236de6c9f3bdf85e8775a7d6b8 assets/copperative/blockstates/copper_pillar.json
@@ -214,7 +214,7 @@ a5d0a052c99b12574e8c3655cfd48bbdae2d299e assets/copperative/models/block/oxidize
 88a8d55256723cbbd885e58e245c87aed302d484 assets/copperative/models/block/oxidized_sticky_piston_base.json
 186aa943b8f259720ce5c6ba432fd6aabe3d91b1 assets/copperative/models/block/oxidized_toggler.json
 6364781745b34482dd0ccd1027ad47f533b4bdc0 assets/copperative/models/block/oxidized_toggler_on.json
-d4b01e331a7dd0f7ccdbe60bdcceb895d996c8e8 assets/copperative/models/block/patina_block.json
+18a14ceaf50e7f215deb459bf07683a4c7e2e71e assets/copperative/models/block/patina_block.json
 9c287a5344a48bb1b235792f24b82ff59e782b16 assets/copperative/models/block/toggler.json
 600dad5534b87cf797200b82a08d5066c7d37413 assets/copperative/models/block/toggler_on.json
 6a7c16c83f41f3c4679f2eee185004db87753082 assets/copperative/models/block/waxed_copper_bricks.json

diff --git a/src/generated/resources/assets/copperative/models/block/patina_block.json b/src/generated/resources/assets/copperative/models/block/patina_block.json
@@ -1,6 +1,7 @@
 {
-  "parent": "minecraft:block/cube_all",
+  "parent": "minecraft:block/cube_column",
   "textures": {
-    "all": "copperative:block/patina_block"
+    "end": "copperative:block/patina_block_top",
+    "side": "copperative:block/patina_block"
   }
 }
diff --git a/src/main/java/galena/copperative/data/CBlockStates.java b/src/main/java/galena/copperative/data/CBlockStates.java
@@ -28,7 +28,7 @@ private static String unwaxedName(Supplier<? extends Block> block) {
 
     @Override
     protected void registerStatesAndModels() {
-        block(CBlocks.PATINA_BLOCK);
+        staticColumn(CBlocks.PATINA_BLOCK);
         weatheringBlock(CBlocks.COPPER_BRICKS);
         weatheringPillarBlock(CBlocks.COPPER_PILLAR);
         weatheringPillarBlock(CBlocks.COPPER_TILES);

diff --git a/src/main/java/galena/copperative/data/provider/CBlockStateProvider.java b/src/main/java/galena/copperative/data/provider/CBlockStateProvider.java
@@ -533,4 +533,10 @@ public void randomizer(Supplier<? extends Block> block) {
             return ConfiguredModel.builder().modelFile(model).rotationX(rotation.x()).rotationY(rotation.y() + 180).build();
         }, BlockStateProperties.POWER);
     }
+
+    public <B extends Block> void staticColumn(Supplier<B> block) {
+        var name = name(block);
+        var texture = texture(name);
+        simpleBlock(block.get(), models().cubeColumn(name, texture, new ResourceLocation(texture.getNamespace(), texture.getPath() + "_top")));
+    }
 }
diff --git a/src/main/resources/assets/copperative/textures/block/copper_door_bottom.png b/src/main/resources/assets/copperative/textures/block/copper_door_bottom.png
diff --git a/src/main/resources/assets/copperative/textures/block/copper_door_top.png b/src/main/resources/assets/copperative/textures/block/copper_door_top.png
diff --git a/src/main/resources/assets/copperative/textures/block/copper_trapdoor.png b/src/main/resources/assets/copperative/textures/block/copper_trapdoor.png
diff --git a/...main/resources/assets/copperative/textures/block/exposed_copper_door_bottom.png b/...main/resources/assets/copperative/textures/block/exposed_copper_door_bottom.png
diff --git a/src/main/resources/assets/copperative/textures/block/exposed_copper_door_top.png b/src/main/resources/assets/copperative/textures/block/exposed_copper_door_top.png
diff --git a/src/main/resources/assets/copperative/textures/block/exposed_copper_trapdoor.png b/src/main/resources/assets/copperative/textures/block/exposed_copper_trapdoor.png
diff --git a/...ain/resources/assets/copperative/textures/block/oxidized_copper_door_bottom.png b/...ain/resources/assets/copperative/textures/block/oxidized_copper_door_bottom.png
diff --git a/src/main/resources/assets/copperative/textures/block/oxidized_copper_door_top.png b/src/main/resources/assets/copperative/textures/block/oxidized_copper_door_top.png
diff --git a/src/main/resources/assets/copperative/textures/block/oxidized_copper_trapdoor.png b/src/main/resources/assets/copperative/textures/block/oxidized_copper_trapdoor.png
diff --git a/src/main/resources/assets/copperative/textures/block/patina_block.png b/src/main/resources/assets/copperative/textures/block/patina_block.png
diff --git a/src/main/resources/assets/copperative/textures/block/patina_block_top.png b/src/main/resources/assets/copperative/textures/block/patina_block_top.png
diff --git a/...in/resources/assets/copperative/textures/block/weathered_copper_door_bottom.png b/...in/resources/assets/copperative/textures/block/weathered_copper_door_bottom.png
diff --git a/src/main/resources/assets/copperative/textures/block/weathered_copper_door_top.png b/src/main/resources/assets/copperative/textures/block/weathered_copper_door_top.png
diff --git a/src/main/resources/assets/copperative/textures/block/weathered_copper_trapdoor.png b/src/main/resources/assets/copperative/textures/block/weathered_copper_trapdoor.png
diff --git a/src/main/resources/assets/copperative/textures/item/copper_nugget.png b/src/main/resources/assets/copperative/textures/item/copper_nugget.png
diff --git a/src/main/resources/assets/copperative/textures/item/patina.png b/src/main/resources/assets/copperative/textures/item/patina.png