close #116 and also whoops i forgor to run datagen in a while

FallingColors · Jun 12, 2022 · 608fd0e · 608fd0e
1 parent 8ef43af
commit 608fd0e
Show file tree

Hide file tree

Showing 13 changed files with 66 additions and 24 deletions.
diff --git a/Common/src/generated/resources/.cache/cache b/Common/src/generated/resources/.cache/cache
@@ -15,8 +15,8 @@ eb9f5185f4ff2aa06a224c164f770fc643a7a16a assets/hexcasting/blockstates/akashic_s
 3da487d531620a0e1a6fe91b98cdcd431c9ce059 assets/hexcasting/blockstates/akashic_stairs.json
 3b6141e92e099e2ba73f31915e5c76ea35c92564 assets/hexcasting/blockstates/akashic_tile.json
 760234cb7550850a909444ac36da0ce1c850e007 assets/hexcasting/blockstates/akashic_trapdoor.json
-31130f9b78b23eba8997d50c96cefc7205cc2c50 assets/hexcasting/blockstates/akashic_wood.json
-17713e2208639f3a39bd36adfb1a1ff0e45a1244 assets/hexcasting/blockstates/akashic_wood_stripped.json
+fa03a20bdc782d185e67318a8e59848b105a132f assets/hexcasting/blockstates/akashic_wood.json
+aa48b39cfdef3477b318eb4429317815bf65ff96 assets/hexcasting/blockstates/akashic_wood_stripped.json
 6467be85f85137aa17be8b03ee96c224839a9e25 assets/hexcasting/blockstates/amethyst_dust_block.json
 1d17548d44b3169d43663d1cbc7699d75ccc8a54 assets/hexcasting/blockstates/amethyst_sconce.json
 aed50918bad8a7b00cd26e45d67eb509a04c9f6c assets/hexcasting/blockstates/amethyst_tiles.json
@@ -92,8 +92,10 @@ a0393acdaf01c78cb226f3f042595b3597f5e887 assets/hexcasting/models/block/akashic_
 ca9e25d900c15888fa6562091f265db0e7cb0866 assets/hexcasting/models/block/akashic_trapdoor_bottom.json
 c4ac5b4b39c0c364a783c22eccb3d71cc911b3e5 assets/hexcasting/models/block/akashic_trapdoor_open.json
 7dd49520e7b38c676a4b91bb4aad88267e01bb81 assets/hexcasting/models/block/akashic_trapdoor_top.json
-ae64faa4b9e60f27d1df999748d3bae5bacc2518 assets/hexcasting/models/block/akashic_wood.json
-db390313c28127d1437d7bb0cd4a0d7d1bb68c68 assets/hexcasting/models/block/akashic_wood_stripped.json
+9af2a2ab7e35245a4e94550059ab1a9807ec8eb0 assets/hexcasting/models/block/akashic_wood.json
+d1bd1cca83c26a9733cf91c0dbbfd25db51912af assets/hexcasting/models/block/akashic_wood_horizontal.json
+8a4bd2a17320dcb8c378b3e8c371f54457b9b5df assets/hexcasting/models/block/akashic_wood_stripped.json
+83b886ce249b03d543881932c5c16617e240935f assets/hexcasting/models/block/akashic_wood_stripped_horizontal.json
 e85c2dfe9a161a97723871ab1ce8c973dcbf23d4 assets/hexcasting/models/block/amethyst_dust_block.json
 df994438c20d9dec9009c9c56de74860a847681b assets/hexcasting/models/block/amethyst_tiles.json
 4e65ad75eeee22fa1d2c899fc86ac8b7b9a43701 assets/hexcasting/models/block/ancient_scroll_paper.json

diff --git a/Common/src/generated/resources/assets/hexcasting/blockstates/akashic_wood.json b/Common/src/generated/resources/assets/hexcasting/blockstates/akashic_wood.json
@@ -1,7 +1,16 @@
 {
   "variants": {
-    "": {
+    "axis=x": {
+      "model": "hexcasting:block/akashic_wood_horizontal",
+      "x": 90,
+      "y": 90
+    },
+    "axis=y": {
       "model": "hexcasting:block/akashic_wood"
+    },
+    "axis=z": {
+      "model": "hexcasting:block/akashic_wood_horizontal",
+      "x": 90
     }
   }
 }
diff --git a/Common/src/generated/resources/assets/hexcasting/blockstates/akashic_wood_stripped.json b/Common/src/generated/resources/assets/hexcasting/blockstates/akashic_wood_stripped.json
@@ -1,7 +1,16 @@
 {
   "variants": {
-    "": {
+    "axis=x": {
+      "model": "hexcasting:block/akashic_wood_stripped_horizontal",
+      "x": 90,
+      "y": 90
+    },
+    "axis=y": {
       "model": "hexcasting:block/akashic_wood_stripped"
+    },
+    "axis=z": {
+      "model": "hexcasting:block/akashic_wood_stripped_horizontal",
+      "x": 90
     }
   }
 }
diff --git a/Common/src/generated/resources/assets/hexcasting/models/block/akashic_wood.json b/Common/src/generated/resources/assets/hexcasting/models/block/akashic_wood.json
@@ -1,6 +1,7 @@
 {
-  "parent": "minecraft:block/cube_all",
+  "parent": "minecraft:block/cube_column",
   "textures": {
-    "all": "hexcasting:block/akashic/log"
+    "side": "hexcasting:block/akashic/log",
+    "end": "hexcasting:block/akashic/log"
   }
 }
diff --git a/Common/src/generated/resources/assets/hexcasting/models/block/akashic_wood_horizontal.json b/Common/src/generated/resources/assets/hexcasting/models/block/akashic_wood_horizontal.json
@@ -0,0 +1,7 @@
+{
+  "parent": "minecraft:block/cube_column_horizontal",
+  "textures": {
+    "side": "hexcasting:block/akashic/log",
+    "end": "hexcasting:block/akashic/log"
+  }
+}
diff --git a/Common/src/generated/resources/assets/hexcasting/models/block/akashic_wood_stripped.json b/Common/src/generated/resources/assets/hexcasting/models/block/akashic_wood_stripped.json
@@ -1,6 +1,7 @@
 {
-  "parent": "minecraft:block/cube_all",
+  "parent": "minecraft:block/cube_column",
   "textures": {
-    "all": "hexcasting:block/akashic/log_stripped"
+    "side": "hexcasting:block/akashic/log_stripped",
+    "end": "hexcasting:block/akashic/log_stripped"
   }
 }
diff --git a/.../generated/resources/assets/hexcasting/models/block/akashic_wood_stripped_horizontal.json b/.../generated/resources/assets/hexcasting/models/block/akashic_wood_stripped_horizontal.json
@@ -0,0 +1,7 @@
+{
+  "parent": "minecraft:block/cube_column_horizontal",
+  "textures": {
+    "side": "hexcasting:block/akashic/log_stripped",
+    "end": "hexcasting:block/akashic/log_stripped"
+  }
+}
diff --git a/Common/src/main/java/at/petrak/hexcasting/common/lib/HexBlocks.java b/Common/src/main/java/at/petrak/hexcasting/common/lib/HexBlocks.java
@@ -5,7 +5,9 @@
 import at.petrak.hexcasting.common.blocks.BlockConjured;
 import at.petrak.hexcasting.common.blocks.BlockConjuredLight;
 import at.petrak.hexcasting.common.blocks.BlockFlammable;
-import at.petrak.hexcasting.common.blocks.akashic.*;
+import at.petrak.hexcasting.common.blocks.akashic.BlockAkashicBookshelf;
+import at.petrak.hexcasting.common.blocks.akashic.BlockAkashicFloodfiller;
+import at.petrak.hexcasting.common.blocks.akashic.BlockAkashicRecord;
 import at.petrak.hexcasting.common.blocks.circles.BlockEmptyImpetus;
 import at.petrak.hexcasting.common.blocks.circles.BlockSlate;
 import at.petrak.hexcasting.common.blocks.circles.directrix.BlockEmptyDirectrix;
@@ -167,14 +169,14 @@ private static BlockBehaviour.Properties leaves(MaterialColor color) {
             .strength(1f)
             .lightLevel($ -> 15)));
 
-    public static final BlockAxis AKASHIC_LOG = blockItem("akashic_log",
+    public static final BlockAkashicLog AKASHIC_LOG = blockItem("akashic_log",
         new BlockAkashicLog(akashicWoody()));
-    public static final BlockAxis AKASHIC_LOG_STRIPPED = blockItem("akashic_log_stripped",
+    public static final BlockAkashicLog AKASHIC_LOG_STRIPPED = blockItem("akashic_log_stripped",
+        new BlockAkashicLog(akashicWoody()));
+    public static final BlockAkashicLog AKASHIC_WOOD = blockItem("akashic_wood",
+        new BlockAkashicLog(akashicWoody()));
+    public static final BlockAkashicLog AKASHIC_WOOD_STRIPPED = blockItem("akashic_wood_stripped",
         new BlockAkashicLog(akashicWoody()));
-    public static final Block AKASHIC_WOOD = blockItem("akashic_wood",
-        new BlockFlammable(akashicWoody(), 5, 5));
-    public static final Block AKASHIC_WOOD_STRIPPED = blockItem("akashic_wood_stripped",
-        new BlockFlammable(akashicWoody(), 5, 5));
     public static final Block AKASHIC_PLANKS = blockItem("akashic_planks",
         new BlockFlammable(akashicWoody(), 20, 5));
     public static final Block AKASHIC_PANEL = blockItem("akashic_panel",

diff --git a/Fabric/src/generated/resources/.cache/cache b/Fabric/src/generated/resources/.cache/cache
@@ -116,7 +116,7 @@ f3c6b6917e504e1c3d5d8875f7cce6f311e791d2 data\hexcasting\tags\blocks\akashic_log
 fe60c763bfe0afa0a266b7390edfc62bde8941b7 data\hexcasting\tags\items\phial_base.json
 fa30b1fb1c6fc9e763d5ce0e4dcfd71afcc81de2 data\hexcasting\recipes\pride_colorizer_agender.json
 a639b071a5f4738ddf798fcac041a5002657e146 data\hexcasting\recipes\jeweler_hammer.json
-d1b8725bbfc01e2d9a02ef84c911fef89b3636a9 data\hexcasting\tags\items\wands.json
+3a60e7980813438657c180cc0650a7e96e3c9a65 data\hexcasting\tags\items\wands.json
 6f5c41ab9f87ec1206efaaab8d91adc766bb79fd data\hexcasting\recipes\slate_block_from_slates.json
 b162dffb52838921c3a354d817465a23df64ec00 data\hexcasting\recipes\pride_colorizer_aroace.json
 b8bc2f7ab38646e63376b23f7490a17011908496 data\hexcasting\loot_tables\blocks\akashic_leaves1.json

diff --git a/Forge/src/generated/resources/.cache/cache b/Forge/src/generated/resources/.cache/cache
@@ -221,7 +221,7 @@ b596d96eebb4f7bad5930f4eebc589f292b59c98 data/hexcasting/tags/blocks/akashic_pla
 f3c6b6917e504e1c3d5d8875f7cce6f311e791d2 data/hexcasting/tags/items/akashic_logs.json
 b596d96eebb4f7bad5930f4eebc589f292b59c98 data/hexcasting/tags/items/akashic_planks.json
 fe60c763bfe0afa0a266b7390edfc62bde8941b7 data/hexcasting/tags/items/phial_base.json
-d1b8725bbfc01e2d9a02ef84c911fef89b3636a9 data/hexcasting/tags/items/wands.json
+3a60e7980813438657c180cc0650a7e96e3c9a65 data/hexcasting/tags/items/wands.json
 5f3e3813757d8300acad523d45ac7c4d85728399 data/minecraft/tags/blocks/buttons.json
 1dc89dff5d4fadb95d9b5a2a5a910f63ea4b02bf data/minecraft/tags/blocks/crystal_sound_blocks.json
 556d2e6068965e90c307a435b372ae761cd1c606 data/minecraft/tags/blocks/doors.json

diff --git a/Forge/src/generated/resources/data/hexcasting/tags/items/wands.json b/Forge/src/generated/resources/data/hexcasting/tags/items/wands.json
@@ -1,14 +1,14 @@
 {
   "replace": false,
   "values": [
+    "hexcasting:wand_akashic",
     "hexcasting:wand_oak",
     "hexcasting:wand_spruce",
     "hexcasting:wand_birch",
     "hexcasting:wand_jungle",
     "hexcasting:wand_acacia",
     "hexcasting:wand_dark_oak",
     "hexcasting:wand_crimson",
-    "hexcasting:wand_warped",
-    "hexcasting:wand_akashic"
+    "hexcasting:wand_warped"
   ]
 }
diff --git a/Forge/src/main/java/at/petrak/hexcasting/forge/datagen/xplat/HexBlockStatesAndModels.java b/Forge/src/main/java/at/petrak/hexcasting/forge/datagen/xplat/HexBlockStatesAndModels.java
@@ -191,10 +191,10 @@ protected void registerStatesAndModels() {
         axisBlock(HexBlocks.AKASHIC_LOG, modLoc("block/akashic/log"), modLoc("block/akashic/log_end"));
         axisBlock(HexBlocks.AKASHIC_LOG_STRIPPED, modLoc("block/akashic/log_stripped"),
             modLoc("block/akashic/log_end_stripped"));
+        axisBlock(HexBlocks.AKASHIC_WOOD, modLoc("block/akashic/log"), modLoc("block/akashic/log"));
+        axisBlock(HexBlocks.AKASHIC_WOOD_STRIPPED, modLoc("block/akashic/log_stripped"),
+            modLoc("block/akashic/log_stripped"));
 
-        blockAndItem(HexBlocks.AKASHIC_WOOD, models().cubeAll("akashic_wood", modLoc("block/akashic/log")));
-        blockAndItem(HexBlocks.AKASHIC_WOOD_STRIPPED,
-            models().cubeAll("akashic_wood_stripped", modLoc("block/akashic/log_stripped")));
         blockAndItem(HexBlocks.AKASHIC_PANEL, models().cubeAll("akashic_panel", modLoc("block/akashic/panel")));
         blockAndItem(HexBlocks.AKASHIC_TILE, models().cubeAll("akashic_tile", modLoc("block/akashic/tile")));
 

diff --git a/Forge/src/main/java/at/petrak/hexcasting/forge/datagen/xplat/HexItemModels.java b/Forge/src/main/java/at/petrak/hexcasting/forge/datagen/xplat/HexItemModels.java
@@ -162,6 +162,10 @@ protected void registerModels() {
             new ModelFile.UncheckedModelFile(modLoc("block/akashic_log")));
         getBuilder(HexBlocks.AKASHIC_LOG_STRIPPED.getRegistryName().getPath()).parent(
             new ModelFile.UncheckedModelFile(modLoc("block/akashic_log_stripped")));
+        getBuilder(HexBlocks.AKASHIC_WOOD.getRegistryName().getPath()).parent(
+            new ModelFile.UncheckedModelFile(modLoc("block/akashic_wood")));
+        getBuilder(HexBlocks.AKASHIC_WOOD_STRIPPED.getRegistryName().getPath()).parent(
+            new ModelFile.UncheckedModelFile(modLoc("block/akashic_wood_stripped")));
         getBuilder(HexBlocks.AKASHIC_STAIRS.getRegistryName().getPath()).parent(
             new ModelFile.UncheckedModelFile(modLoc("block/akashic_stairs")));
         getBuilder(HexBlocks.AKASHIC_SLAB.getRegistryName().getPath()).parent(