✨ last decoration blocks

Signed-off-by: LocusAzzurro <[email protected]>
LocusAzzurro · Jul 29, 2023 · fc6f016 · fc6f016
1 parent 36a4f39
commit fc6f016
Show file tree

Hide file tree

Showing 21 changed files with 951 additions and 2 deletions.
diff --git a/src/generated/resources/.cache/cache b/src/generated/resources/.cache/cache
@@ -76,6 +76,7 @@ fd69d00634ae271291dc1cf1a48780ae16546e15 assets/ultramarine/blockstates/brownish
 3693199159b86875078b1232b10c118a3374d8b6 assets/ultramarine/blockstates/brush_and_inkstone.json
 2b871703542814a8f38edddae08c9d50fd7cf541 assets/ultramarine/blockstates/brush_tools.json
 750a669bd45c5f1060849d58def2a48fc6406f39 assets/ultramarine/blockstates/cabbage_basket.json
+4340bfe3896a8824fac4e44fa459c6c3bbf395eb assets/ultramarine/blockstates/carriage.json
 fe88dba8d0efaf5f07049cf4f33fbdec7e08b3b5 assets/ultramarine/blockstates/carved_red_pillar.json
 f3e85a59ce80312d9b84da73c9e30a48e7f5f374 assets/ultramarine/blockstates/carved_red_pillar_base.json
 fa8237c3d5738a33c75565dd3fa47cdd5a697934 assets/ultramarine/blockstates/carved_red_pillar_head.json
@@ -308,6 +309,7 @@ a5b12a5c2488a512bf9092ddf7d5249119aaec48 assets/ultramarine/blockstates/stone_pe
 33fd381403b711e4fc72ba2bd0274d2a946ad4b0 assets/ultramarine/blockstates/tall_blue_and_white_porcelain_pot.json
 766254ede690f1f742abb0a106e42afe90a2660f assets/ultramarine/blockstates/tall_royal_rosewood_window.json
 8bb10c8de1fe531b73894a2b6a14ace6a467f5fd assets/ultramarine/blockstates/tall_wooden_queti_edge.json
+afe7227a6638ba646063c3082e1da8894052e9f6 assets/ultramarine/blockstates/teahouse_flag.json
 1bb31bc592f9f1756072d46ff8609614d9613c2a assets/ultramarine/blockstates/terracotta_flowerpot.json
 953d9428657bdaca0dd4ab9c1b303dbc00cbb61b assets/ultramarine/blockstates/terracotta_pot.json
 bb20ab70f0f7213d789dd7184b0afb2b60fadbab assets/ultramarine/blockstates/thick_carved_queti.json
@@ -330,6 +332,7 @@ b66c252d8eb3ca732e2547df094d5382b531717a assets/ultramarine/blockstates/white_sk
 6f5aad7deb01f9c52147c815a4ed692b201fa2d0 assets/ultramarine/blockstates/wine_pot.json
 dedd81b698439455174cf46762a93f554192a135 assets/ultramarine/blockstates/wooden_crate.json
 9d5fcc26046ae6dc7ae09740d67df8b16cb33350 assets/ultramarine/blockstates/wooden_gualuo.json
+bdbd09331909d44c41e2f4f3c6296d75b1aa5dcc assets/ultramarine/blockstates/wooden_poles.json
 a085e8def223fb7f5007d4edc3798c4ca6fe060f assets/ultramarine/blockstates/wooden_queti.json
 e8072fcfe238acc6cb2df48c4fdb765875d7c410 assets/ultramarine/blockstates/wooden_queti_edge.json
 8ed7e276ebb25f447b088bc293392ef86e4e1d62 assets/ultramarine/blockstates/wooden_stool.json
@@ -688,6 +691,7 @@ d937d9e7eb374a0253890e264bc3a9341070a81a assets/ultramarine/models/item/brownish
 7812016bdfab2be092246722ecffafdd00c6827c assets/ultramarine/models/item/brush_and_inkstone.json
 a754bf9e1e6afed0ef51ddc021d9f431cc20758b assets/ultramarine/models/item/brush_tools.json
 4d576d1629ec0d63189935b2d0c9a2546c20600b assets/ultramarine/models/item/cabbage_basket.json
+fafc49d5aa5fe1a0acf433e2e1f1ae0cbfd861a4 assets/ultramarine/models/item/carriage.json
 a05dac8cf6dad155bcc3ebdf2c46fddcdbb6ec34 assets/ultramarine/models/item/carved_red_pillar.json
 375b9657455b41c6153296d47917d370cc00cf1d assets/ultramarine/models/item/carved_red_pillar_base.json
 cea5a281f3c0f11898508ce1ea5800896299b093 assets/ultramarine/models/item/carved_red_pillar_head.json
@@ -956,6 +960,7 @@ fc85c47150cb80ef723fe8bd906bab0eb68cfd4f assets/ultramarine/models/item/sundial.
 239446a8fc77181163bbdfdde99ec0d8faddc3ae assets/ultramarine/models/item/tall_blue_and_white_porcelain_pot.json
 578ecb67a152600c303c587b1387763a4bfbe473 assets/ultramarine/models/item/tall_royal_rosewood_window.json
 75d1769661ee4bdb41a4bc7bdd74816f75ff1144 assets/ultramarine/models/item/tall_wooden_queti_edge.json
+ece71e261e420def1c1729781d211c131d6fbf20 assets/ultramarine/models/item/teahouse_flag.json
 d6abf67de51d6749cba6f12e342a936126f83974 assets/ultramarine/models/item/terracotta_flowerpot.json
 26331e786073ed4355a78c18a0f9728c1f06d2e3 assets/ultramarine/models/item/terracotta_pot.json
 288c3edb5d4540f58347798cb41d41642f316ebb assets/ultramarine/models/item/thick_carved_queti.json
@@ -981,6 +986,7 @@ fc02586cd5f6edee1e1285adf33ffc2b7b9793b3 assets/ultramarine/models/item/wine_pot
 504a0da0a3900b82cca529412c107f55a7c6e22a assets/ultramarine/models/item/wooden_gualuo.json
 4b59b8ee2366195f218810e9afb6f79d936f392d assets/ultramarine/models/item/wooden_hammer.json
 a76777943a3b7345d7b3b0785109a4ea399fd8a2 assets/ultramarine/models/item/wooden_parts.json
+b67815e2b51d6d6d1b4c1cffd07cacb5bd66f267 assets/ultramarine/models/item/wooden_poles.json
 599bc830990c08ac72f6c11056076cc0c0d9c14a assets/ultramarine/models/item/wooden_queti.json
 a716289e7f27586ad14c188bf326b4f3305b0c5a assets/ultramarine/models/item/wooden_queti_edge.json
 54efd79edcf78ccf9239a1250f59a1962b7caf61 assets/ultramarine/models/item/wooden_stool.json
@@ -1002,7 +1008,7 @@ e48e56ce7a08d5506893c975360626e425e808ea assets/ultramarine/models/item/yellow_s
 67c3f3456e93f5361242cd02c815ee09b5824823 data/minecraft/advancements/recipes/decorations/white_candle.json
 645284c5035f3bb0e95477cf7f70b5a9a5d5ac32 data/minecraft/recipes/white_candle.json
 bb3cff8ef2b03825fc5bbeffb336436d70edcaa4 data/minecraft/tags/blocks/fences.json
-283f51d92ffcd3b0ba084b6d8e03bc0b28282f4e data/minecraft/tags/blocks/mineable/axe.json
+28155bedd910a58dd0f1ce13e8c81603c7567a4f data/minecraft/tags/blocks/mineable/axe.json
 133ea1a4ce05c3a4696a95395d626b3e0d5e861e data/minecraft/tags/blocks/mineable/hoe.json
 2fa6af250add335a7b1ed07804549e2d9d12a577 data/minecraft/tags/blocks/mineable/pickaxe.json
 17545dd0c9613eb0477c89b2b64307a497bc1d58 data/minecraft/tags/blocks/needs_iron_tool.json
@@ -1212,6 +1218,7 @@ ce1d13f0ef66b425ad476a5eb52fd3a1d3c0068f data/ultramarine/loot_tables/blocks/bro
 31c534a8d21626896d791dd3fcbfd60f691370b0 data/ultramarine/loot_tables/blocks/brush_and_inkstone.json
 c1d4f2c15a276843b47f3d860875f16bb638f628 data/ultramarine/loot_tables/blocks/brush_tools.json
 50d6bbc78b6dc90fbab7ff336b251afe47e0e0ab data/ultramarine/loot_tables/blocks/cabbage_basket.json
+33ddb398cc2ad5532a2d8b9bb25664c4dff5afa3 data/ultramarine/loot_tables/blocks/carriage.json
 e8dc516932fefa81d10bb2b483984a889b55d6e4 data/ultramarine/loot_tables/blocks/carved_red_pillar.json
 4ca12e7cd0edc7abcbbc14b2b69fa8dc6bc1eb34 data/ultramarine/loot_tables/blocks/carved_red_pillar_base.json
 35ee86c49c93b1c408668714301eb4b87fb06d59 data/ultramarine/loot_tables/blocks/carved_red_pillar_head.json
@@ -1426,6 +1433,7 @@ d6627cdb0478d351c3b1e90992eab1e2ea61d579 data/ultramarine/loot_tables/blocks/str
 52137742969fa49aff04fdb15dcce8f45075c4ef data/ultramarine/loot_tables/blocks/tall_blue_and_white_porcelain_pot.json
 b83a4049be4a806f7770621c5867257acb2e5d8c data/ultramarine/loot_tables/blocks/tall_royal_rosewood_window.json
 5b735b89edd186eabe46127fdb98222dfe60f64e data/ultramarine/loot_tables/blocks/tall_wooden_queti_edge.json
+f8200e4e5737212c8b199097932e9b441ac3998c data/ultramarine/loot_tables/blocks/teahouse_flag.json
 47fd2deb527d1f2933611463482d8f5ae83094b8 data/ultramarine/loot_tables/blocks/terracotta_flowerpot.json
 4b459ce5f136da0becff2bbe35916bdb3d24e5ae data/ultramarine/loot_tables/blocks/terracotta_pot.json
 e5f94cb9b92281903f3080d27133d61e976edefb data/ultramarine/loot_tables/blocks/thick_carved_queti.json
@@ -1448,6 +1456,7 @@ a6bec953a4b043cadd1b292e2dd5eb17fde8ed65 data/ultramarine/loot_tables/blocks/whi
 4cd659e1c0375848a336ae6879eda315d0f43cc6 data/ultramarine/loot_tables/blocks/wine_pot.json
 ebfdc12d19eb9ee8ea6f96ff884c78def322a3dc data/ultramarine/loot_tables/blocks/wooden_crate.json
 30ab137acd5d1ea4147a2bdc99ce2d640d7b13fd data/ultramarine/loot_tables/blocks/wooden_gualuo.json
+5dedace08317b958fc379e305c0a71ed56ad3830 data/ultramarine/loot_tables/blocks/wooden_poles.json
 678fd322bf1bf336996e266ed1233048b1d4a427 data/ultramarine/loot_tables/blocks/wooden_queti.json
 5c28ce8e7d25d3d21ff829704e5b66f0bdb09166 data/ultramarine/loot_tables/blocks/wooden_queti_edge.json
 e787ef2d745ae0268ace85ea2453ff0b6f2aad68 data/ultramarine/loot_tables/blocks/wooden_stool.json

diff --git a/src/generated/resources/assets/ultramarine/blockstates/carriage.json b/src/generated/resources/assets/ultramarine/blockstates/carriage.json
@@ -0,0 +1,20 @@
+{
+  "variants": {
+    "facing=north": {
+      "model": "ultramarine:block/carriage",
+      "y": 270
+    },
+    "facing=south": {
+      "model": "ultramarine:block/carriage",
+      "y": 90
+    },
+    "facing=west": {
+      "model": "ultramarine:block/carriage",
+      "y": 180
+    },
+    "facing=east": {
+      "model": "ultramarine:block/carriage",
+      "y": 360
+    }
+  }
+}
diff --git a/src/generated/resources/assets/ultramarine/blockstates/teahouse_flag.json b/src/generated/resources/assets/ultramarine/blockstates/teahouse_flag.json
@@ -0,0 +1,19 @@
+{
+  "variants": {
+    "facing=north": {
+      "model": "ultramarine:block/teahouse_flag",
+      "y": 180
+    },
+    "facing=south": {
+      "model": "ultramarine:block/teahouse_flag"
+    },
+    "facing=west": {
+      "model": "ultramarine:block/teahouse_flag",
+      "y": 90
+    },
+    "facing=east": {
+      "model": "ultramarine:block/teahouse_flag",
+      "y": 270
+    }
+  }
+}
diff --git a/src/generated/resources/assets/ultramarine/blockstates/wooden_poles.json b/src/generated/resources/assets/ultramarine/blockstates/wooden_poles.json
@@ -0,0 +1,20 @@
+{
+  "variants": {
+    "facing=north": {
+      "model": "ultramarine:block/wooden_poles",
+      "y": 270
+    },
+    "facing=south": {
+      "model": "ultramarine:block/wooden_poles",
+      "y": 90
+    },
+    "facing=west": {
+      "model": "ultramarine:block/wooden_poles",
+      "y": 180
+    },
+    "facing=east": {
+      "model": "ultramarine:block/wooden_poles",
+      "y": 360
+    }
+  }
+}
diff --git a/src/generated/resources/assets/ultramarine/models/item/carriage.json b/src/generated/resources/assets/ultramarine/models/item/carriage.json
@@ -0,0 +1,3 @@
+{
+  "parent": "ultramarine:block/carriage"
+}
diff --git a/src/generated/resources/assets/ultramarine/models/item/teahouse_flag.json b/src/generated/resources/assets/ultramarine/models/item/teahouse_flag.json
@@ -0,0 +1,3 @@
+{
+  "parent": "ultramarine:block/teahouse_flag"
+}
diff --git a/src/generated/resources/assets/ultramarine/models/item/wooden_poles.json b/src/generated/resources/assets/ultramarine/models/item/wooden_poles.json
@@ -0,0 +1,3 @@
+{
+  "parent": "ultramarine:block/wooden_poles"
+}
diff --git a/src/generated/resources/data/minecraft/tags/blocks/mineable/axe.json b/src/generated/resources/data/minecraft/tags/blocks/mineable/axe.json
@@ -117,6 +117,9 @@
     "ultramarine:bottle_gourd",
     "ultramarine:chessboard",
     "ultramarine:memorial_tablet",
+    "ultramarine:carriage",
+    "ultramarine:wooden_poles",
+    "ultramarine:teahouse_flag",
     "ultramarine:small_wooden_guardian_lion",
     "ultramarine:fruit_box",
     "ultramarine:wooden_crate",

diff --git a/src/generated/resources/data/ultramarine/loot_tables/blocks/carriage.json b/src/generated/resources/data/ultramarine/loot_tables/blocks/carriage.json
@@ -0,0 +1,16 @@
+{
+  "type": "minecraft:block",
+  "pools": [
+    {
+      "name": "carriage",
+      "rolls": 1.0,
+      "bonus_rolls": 0.0,
+      "entries": [
+        {
+          "type": "minecraft:item",
+          "name": "ultramarine:carriage"
+        }
+      ]
+    }
+  ]
+}
diff --git a/src/generated/resources/data/ultramarine/loot_tables/blocks/teahouse_flag.json b/src/generated/resources/data/ultramarine/loot_tables/blocks/teahouse_flag.json
@@ -0,0 +1,16 @@
+{
+  "type": "minecraft:block",
+  "pools": [
+    {
+      "name": "teahouse_flag",
+      "rolls": 1.0,
+      "bonus_rolls": 0.0,
+      "entries": [
+        {
+          "type": "minecraft:item",
+          "name": "ultramarine:teahouse_flag"
+        }
+      ]
+    }
+  ]
+}
diff --git a/src/generated/resources/data/ultramarine/loot_tables/blocks/wooden_poles.json b/src/generated/resources/data/ultramarine/loot_tables/blocks/wooden_poles.json
@@ -0,0 +1,16 @@
+{
+  "type": "minecraft:block",
+  "pools": [
+    {
+      "name": "wooden_poles",
+      "rolls": 1.0,
+      "bonus_rolls": 0.0,
+      "entries": [
+        {
+          "type": "minecraft:item",
+          "name": "ultramarine:wooden_poles"
+        }
+      ]
+    }
+  ]
+}
diff --git a/src/main/java/com/voxelutopia/ultramarine/client/event/ModClientRenderEventHandler.java b/src/main/java/com/voxelutopia/ultramarine/client/event/ModClientRenderEventHandler.java
@@ -40,6 +40,7 @@ private static void setRenderLayers(FMLClientSetupEvent e) {
             ItemBlockRenderTypes.setRenderLayer(BlockRegistry.ROYAL_CENSER.get(), RenderType.cutout());
             ItemBlockRenderTypes.setRenderLayer(BlockRegistry.JADE_PENDANT.get(), RenderType.cutout());
             ItemBlockRenderTypes.setRenderLayer(BlockRegistry.IMPERIAL_JADE_SEAL.get(), RenderType.cutout());
+            ItemBlockRenderTypes.setRenderLayer(BlockRegistry.TEAHOUSE_FLAG.get(), RenderType.cutout());
             ItemBlockRenderTypes.setRenderLayer(BlockRegistry.PAPER.get(), RenderType.cutout());
             ItemBlockRenderTypes.setRenderLayer(BlockRegistry.LONG_HANGING_PAINTING.get(), RenderType.cutout());
             ItemBlockRenderTypes.setRenderLayer(BlockRegistry.DAMAGED_LANDSCAPE_PAINTING.get(), RenderType.cutout());

diff --git a/src/main/java/com/voxelutopia/ultramarine/data/registry/BlockRegistry.java b/src/main/java/com/voxelutopia/ultramarine/data/registry/BlockRegistry.java
@@ -354,6 +354,12 @@ public class BlockRegistry {
             () -> DecorativeBlock.with(BaseBlockProperty.SILK).shaped(DecorativeBlock.HALF_14).directional().diagonallyPlaceable().noCollision().build());
     public static final RegistryObject<Block> BRONZE_DING = BLOCKS.register("bronze_ding",
             () -> DecorativeBlock.with(BaseBlockProperty.BRONZE).shaped(DecorativeBlock.FULL_BLOCK).placeOffset(Direction.UP).directional().noOcclusion().build());
+    public static final RegistryObject<Block> CARRIAGE = BLOCKS.register("carriage",
+            () -> DecorativeBlock.with(BaseBlockProperty.WOOD).shaped(DecorativeBlock.FULL_BLOCK).directional().noOcclusion().build());
+    public static final RegistryObject<Block> WOODEN_POLES = BLOCKS.register("wooden_poles",
+            () -> DecorativeBlock.with(BaseBlockProperty.WOOD).shaped(DecorativeBlock.FULL_BLOCK).directional().noOcclusion().build());
+    public static final RegistryObject<Block> TEAHOUSE_FLAG = BLOCKS.register("teahouse_flag",
+            () -> DecorativeBlock.with(BaseBlockProperty.WOOD).shaped(DecorativeBlock.FULL_6).placeOffset(Direction.UP).directional().noOcclusion().build());
 
     public static final RegistryObject<Block> LONG_HANGING_PAINTING = BLOCKS.register("long_hanging_painting",
             () -> new WallSideBlock(BaseBlockProperty.PAPER));

diff --git a/src/main/java/com/voxelutopia/ultramarine/data/registry/ItemRegistry.java b/src/main/java/com/voxelutopia/ultramarine/data/registry/ItemRegistry.java
@@ -304,6 +304,9 @@ public class ItemRegistry {
     public static final RegistryObject<Item> CHINESE_HERBS_BAG = fromBlock(BlockRegistry.CHINESE_HERBS_BAG, CreativeTabs.DECORATIONS);
     public static final RegistryObject<Item> BAMBOO_SLIPS = fromBlock(BlockRegistry.BAMBOO_SLIPS, CreativeTabs.DECORATIONS);
     public static final RegistryObject<Item> BRONZE_DING = fromBlock(BlockRegistry.BRONZE_DING, CreativeTabs.DECORATIONS);
+    public static final RegistryObject<Item> CARRIAGE = fromBlock(BlockRegistry.CARRIAGE, CreativeTabs.DECORATIONS);
+    public static final RegistryObject<Item> WOODEN_POLES = fromBlock(BlockRegistry.WOODEN_POLES, CreativeTabs.DECORATIONS);
+    public static final RegistryObject<Item> TEAHOUSE_FLAG = fromBlock(BlockRegistry.TEAHOUSE_FLAG, CreativeTabs.DECORATIONS);
 
 
     public static final RegistryObject<Item> LONG_HANGING_PAINTING = fromBlock(BlockRegistry.LONG_HANGING_PAINTING, CreativeTabs.DECORATIONS);

diff --git a/src/main/java/com/voxelutopia/ultramarine/datagen/ModBlockModelProvider.java b/src/main/java/com/voxelutopia/ultramarine/datagen/ModBlockModelProvider.java
@@ -18,6 +18,7 @@
 import net.minecraftforge.client.model.generators.ConfiguredModel;
 import net.minecraftforge.client.model.generators.ModelFile;
 import net.minecraftforge.common.data.ExistingFileHelper;
+import net.minecraftforge.registries.RegistryObject;
 import org.apache.commons.lang3.tuple.Pair;
 import org.jetbrains.annotations.NotNull;
 
@@ -41,6 +42,10 @@ public class ModBlockModelProvider extends BlockStateProvider {
             Pair.of(Direction.WEST, Direction.NORTH), 270,
             Pair.of(Direction.NORTH, Direction.WEST), 270
     );
+    private final Map<RegistryObject<Block>, Integer> ROTATED_DECO = Map.of(
+            BlockRegistry.CARRIAGE, 90,
+            BlockRegistry.WOODEN_POLES, 90
+    );
 
     public ModBlockModelProvider(DataGenerator generator, ExistingFileHelper existingFileHelper) {
         super(generator, DataGenerators.MOD_ID, existingFileHelper);
@@ -233,7 +238,8 @@ protected void registerStatesAndModels() {
         BlockRegistry.BLOCKS.getEntries().stream().filter(blockRegistryObject -> blockRegistryObject.get() instanceof DecorativeBlock)
                 .forEach(decorativeBlock -> {
                     DecorativeBlock block = (DecorativeBlock) decorativeBlock.get();
-                    if (block instanceof ConsumableDecorativeBlock consumableDecorativeBlock) consumableDecorativeBlock(consumableDecorativeBlock);
+                    if (ROTATED_DECO.containsKey(decorativeBlock)) decorativeBlock(block, ROTATED_DECO.get(decorativeBlock));
+                    else if (block instanceof ConsumableDecorativeBlock consumableDecorativeBlock) consumableDecorativeBlock(consumableDecorativeBlock);
                     else if (block instanceof Censer censer) censer(censer, 0);
                     else if (block instanceof OpeningBlock openingBlock) openingBlock(openingBlock);
                     else decorativeBlock(block);