From e4ea8d0b8f8a86ef4a2269d23c22c108be1537c8 Mon Sep 17 00:00:00 2001 From: Zontreck Date: Sun, 3 Mar 2024 19:31:57 -0700 Subject: [PATCH] Add a steel catwalk block --- gradle.properties | 2 +- .../0dd424b1f6e76c7253bc0752a6cda5cc982b6cc2 | 5 ++++- .../59eb3dbb5f86130e09b3c62d89b9525ee01cf52d | 3 ++- .../blockstates/steel_catwalk_block.json | 7 +++++++ .../models/block/steel_catwalk_block.json | 3 +++ .../models/item/steel_catwalk_block.json | 3 +++ .../blocks/steel_catwalk_block.json | 21 +++++++++++++++++++ .../zontreck/essentials/blocks/ModBlocks.java | 2 ++ .../data/ModBlockStatesProvider.java | 1 + .../data/loot/ModBlockLootTablesProvider.java | 2 ++ .../assets/ariasessentials/lang/en_us.json | 1 + .../finalized/steel_railing.json | 2 +- .../tags/blocks/engineersdecor.json | 3 ++- 13 files changed, 50 insertions(+), 5 deletions(-) create mode 100644 src/generated/resources/assets/ariasessentials/blockstates/steel_catwalk_block.json create mode 100644 src/generated/resources/assets/ariasessentials/models/block/steel_catwalk_block.json create mode 100644 src/generated/resources/assets/ariasessentials/models/item/steel_catwalk_block.json create mode 100644 src/generated/resources/data/ariasessentials/loot_tables/blocks/steel_catwalk_block.json diff --git a/gradle.properties b/gradle.properties index b3634a3..8b97dc1 100644 --- a/gradle.properties +++ b/gradle.properties @@ -48,7 +48,7 @@ mod_name=Aria's Essentials # The license of the mod. Review your options at https://choosealicense.com/. All Rights Reserved is the default. mod_license=GPLv3 # The mod version. See https://semver.org/ -mod_version=1201.2.030124.1249 +mod_version=1201.2.030324.1924 # The group ID for the mod. It is only important when publishing as an artifact to a Maven repository. # This should match the base package used for the mod sources. # See https://maven.apache.org/guides/mini/guide-naming-conventions.html diff --git a/src/generated/resources/.cache/0dd424b1f6e76c7253bc0752a6cda5cc982b6cc2 b/src/generated/resources/.cache/0dd424b1f6e76c7253bc0752a6cda5cc982b6cc2 index ed94438..d402ecb 100644 --- a/src/generated/resources/.cache/0dd424b1f6e76c7253bc0752a6cda5cc982b6cc2 +++ b/src/generated/resources/.cache/0dd424b1f6e76c7253bc0752a6cda5cc982b6cc2 @@ -1,4 +1,4 @@ -// 1.20.1 2024-03-01T03:45:28.603217753 Block States: ariasessentials +// 1.20.1 2024-03-03T19:28:53.13671911 Block States: ariasessentials ae2f6cd918bd461be7fb693641eaa5b78410b538 assets/ariasessentials/blockstates/clinker_brick_block.json f48474f63edb825feaa3cc2c990ecd5ed6909c74 assets/ariasessentials/blockstates/clinker_brick_slab.json 5b501afd2a40c586b6811b9784ca2cd1a2dba373 assets/ariasessentials/blockstates/clinker_brick_stained_block.json @@ -24,6 +24,7 @@ c77118430fd41530a7e5f08818e5d1698df53cf3 assets/ariasessentials/blockstates/reba 664e7ab5796d7c23b8a4a492848bc06b835cff5e assets/ariasessentials/blockstates/slag_brick_stairs.json 382757af67826b3dbb22e39e8913ccfa1ca56ff4 assets/ariasessentials/blockstates/slag_brick_wall.json 9f0e79d883d9f9739425dc44988ddd8da3fe93c5 assets/ariasessentials/blockstates/steel_catwalk.json +4a78fdab484a88b61ecf11bb3f9e653d53a636d1 assets/ariasessentials/blockstates/steel_catwalk_block.json 3a8dea86e3b2b9e7b9191bba93df3dffbfc5d07e assets/ariasessentials/blockstates/steel_catwalk_stairs.json 1e4453fea9df0589eaccd1cd09a75f749502820e assets/ariasessentials/blockstates/steel_catwalk_stairs_dr.json 14ade696d1fe4fe095bce21ab5bc6078fd0c924a assets/ariasessentials/blockstates/steel_catwalk_stairs_lr.json @@ -380,6 +381,7 @@ b3009ccc05e55ad4c548d5713bfd38658a46f176 assets/ariasessentials/models/block/sla b656ad419754a28459255d5e4d91a0a61a151edd assets/ariasessentials/models/block/slag_brick_wall_side.json 1625b01a44cf69a25e4d269899145618053bb902 assets/ariasessentials/models/block/slag_brick_wall_side_tall.json 06ace07518ff4721526000e58f59c3f297d383de assets/ariasessentials/models/block/steel_catwalk.json +372b4c83213fe637ab353d8757ed60bac122a5e9 assets/ariasessentials/models/block/steel_catwalk_block.json d9e92a7fdfa6412b166a5ad9c4c8d05e95d5fd6e assets/ariasessentials/models/block/steel_catwalk_stairs.json d0bfb72e9eaff2ca262f67606708df8ff3d263ab assets/ariasessentials/models/block/steel_catwalk_stairs_dr.json e8ea631254037da12604a6a3463dbc55efcee5b1 assets/ariasessentials/models/block/steel_catwalk_stairs_lr.json @@ -414,6 +416,7 @@ ec4fee31849af62f6e8dacff7f2fcc34f2754404 assets/ariasessentials/models/item/slag 6e71f62b2f358995bab7e34e844816aa744582ec assets/ariasessentials/models/item/slag_brick_stairs.json 5ae3417009a2223dbf4ce9c3096a60a8a40c3862 assets/ariasessentials/models/item/slag_brick_wall.json c0646c29442dbaf600a785bb5825a4dfbdb02c4f assets/ariasessentials/models/item/steel_catwalk.json +372b4c83213fe637ab353d8757ed60bac122a5e9 assets/ariasessentials/models/item/steel_catwalk_block.json 8e44857dec3448ef1020e09a6efd04ab60e93da0 assets/ariasessentials/models/item/steel_catwalk_stairs.json c26cd1bdd3bb45dfe18c171cfdd503e7e1de95b2 assets/ariasessentials/models/item/steel_catwalk_stairs_dr.json e4e92018ef47106941e9b8724383d0dbea30475b assets/ariasessentials/models/item/steel_catwalk_stairs_lr.json diff --git a/src/generated/resources/.cache/59eb3dbb5f86130e09b3c62d89b9525ee01cf52d b/src/generated/resources/.cache/59eb3dbb5f86130e09b3c62d89b9525ee01cf52d index bfeff96..08c141f 100644 --- a/src/generated/resources/.cache/59eb3dbb5f86130e09b3c62d89b9525ee01cf52d +++ b/src/generated/resources/.cache/59eb3dbb5f86130e09b3c62d89b9525ee01cf52d @@ -1,4 +1,4 @@ -// 1.20.1 2024-03-01T03:45:28.602551323 Loot Tables +// 1.20.1 2024-03-03T19:28:53.134822461 Loot Tables 2b4a329fcd0a69fdad6c43120bd5de86ad0565af data/ariasessentials/loot_tables/blocks/clinker_brick_block.json 1ec32912180bc6bc4127ed7ddba8be226035858c data/ariasessentials/loot_tables/blocks/clinker_brick_recessed.json 006e62eaf1f971fd385a92b5d6b5477d032c88e3 data/ariasessentials/loot_tables/blocks/clinker_brick_sastor_corner_block.json @@ -27,6 +27,7 @@ a4399cd298680c12050003b4a90e46b12504048d data/ariasessentials/loot_tables/blocks 3b1dd281eaa49d891c4263313723493768c92cda data/ariasessentials/loot_tables/blocks/slag_brick_stairs.json 529f8223ba75cfbb394fe9e4b34b5ab74fc662da data/ariasessentials/loot_tables/blocks/slag_brick_wall.json 5d3aebfbc97fe1ccbac140d2dfe281334529b91f data/ariasessentials/loot_tables/blocks/steel_catwalk.json +a20e219af44834b9df1554cb55a4c41978c10aba data/ariasessentials/loot_tables/blocks/steel_catwalk_block.json 3efdf8a024befe876584ee1062286265a8d0c223 data/ariasessentials/loot_tables/blocks/steel_catwalk_stairs.json 2b29a805c4e554ede394b497539cf5481d2fb092 data/ariasessentials/loot_tables/blocks/steel_catwalk_stairs_dr.json f21d881578dd6d51e10faefa28f31c37c7d1ebcf data/ariasessentials/loot_tables/blocks/steel_catwalk_stairs_lr.json diff --git a/src/generated/resources/assets/ariasessentials/blockstates/steel_catwalk_block.json b/src/generated/resources/assets/ariasessentials/blockstates/steel_catwalk_block.json new file mode 100644 index 0000000..ea65aec --- /dev/null +++ b/src/generated/resources/assets/ariasessentials/blockstates/steel_catwalk_block.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "ariasessentials:block/steel_catwalk_block" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/ariasessentials/models/block/steel_catwalk_block.json b/src/generated/resources/assets/ariasessentials/models/block/steel_catwalk_block.json new file mode 100644 index 0000000..f95cbc4 --- /dev/null +++ b/src/generated/resources/assets/ariasessentials/models/block/steel_catwalk_block.json @@ -0,0 +1,3 @@ +{ + "parent": "ariasessentials:block/steel_catwalk_block" +} \ No newline at end of file diff --git a/src/generated/resources/assets/ariasessentials/models/item/steel_catwalk_block.json b/src/generated/resources/assets/ariasessentials/models/item/steel_catwalk_block.json new file mode 100644 index 0000000..f95cbc4 --- /dev/null +++ b/src/generated/resources/assets/ariasessentials/models/item/steel_catwalk_block.json @@ -0,0 +1,3 @@ +{ + "parent": "ariasessentials:block/steel_catwalk_block" +} \ No newline at end of file diff --git a/src/generated/resources/data/ariasessentials/loot_tables/blocks/steel_catwalk_block.json b/src/generated/resources/data/ariasessentials/loot_tables/blocks/steel_catwalk_block.json new file mode 100644 index 0000000..0a8181c --- /dev/null +++ b/src/generated/resources/data/ariasessentials/loot_tables/blocks/steel_catwalk_block.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "ariasessentials:steel_catwalk_block" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "ariasessentials:blocks/steel_catwalk_block" +} \ No newline at end of file diff --git a/src/main/java/dev/zontreck/essentials/blocks/ModBlocks.java b/src/main/java/dev/zontreck/essentials/blocks/ModBlocks.java index 98b064a..89a7c6d 100644 --- a/src/main/java/dev/zontreck/essentials/blocks/ModBlocks.java +++ b/src/main/java/dev/zontreck/essentials/blocks/ModBlocks.java @@ -317,5 +317,7 @@ public class ModBlocks { private static final VoxelShape STEEL_RAILING_EAST = Block.box(0.25, 0.25, 0.25, 1.25, 16, 15.75); public static final RegistryObject STEEL_RAILING = registerWithItem(BLOCKS.register("steel_railing", ()->new RotatableBlockCustomVoxels(gratingBlock, STEEL_RAILING_NORTH, STEEL_RAILING_SOUTH, STEEL_RAILING_WEST, STEEL_RAILING_EAST)), new Item.Properties()); + public static final RegistryObject STEEL_CATWALK_BLOCK = registerWithItem(BLOCKS.register("steel_catwalk_block", ()-> new Block(gratingBlock)), new Item.Properties()); + } diff --git a/src/main/java/dev/zontreck/essentials/data/ModBlockStatesProvider.java b/src/main/java/dev/zontreck/essentials/data/ModBlockStatesProvider.java index 92293eb..ee4e364 100644 --- a/src/main/java/dev/zontreck/essentials/data/ModBlockStatesProvider.java +++ b/src/main/java/dev/zontreck/essentials/data/ModBlockStatesProvider.java @@ -136,6 +136,7 @@ public class ModBlockStatesProvider extends BlockStateProvider { blockWithExistingModel(ModBlocks.STEEL_CATWALK_STAIRS_RR, "block/engineersdecor/furniture/steel_catwalk_stairs_rr", true); blockWithExistingModel(ModBlocks.STEEL_CATWALK_STAIRS_DR, "block/engineersdecor/furniture/steel_catwalk_stairs_dr", true); + blockWithExistingModel(ModBlocks.STEEL_CATWALK_BLOCK, "block/steel_catwalk_block", false); } diff --git a/src/main/java/dev/zontreck/essentials/data/loot/ModBlockLootTablesProvider.java b/src/main/java/dev/zontreck/essentials/data/loot/ModBlockLootTablesProvider.java index e25e6f0..ba5b868 100644 --- a/src/main/java/dev/zontreck/essentials/data/loot/ModBlockLootTablesProvider.java +++ b/src/main/java/dev/zontreck/essentials/data/loot/ModBlockLootTablesProvider.java @@ -75,6 +75,8 @@ public class ModBlockLootTablesProvider extends BlockLootSubProvider dropSelf(ModBlocks.STEEL_GRATING_TOP.get()); dropSelf(ModBlocks.STEEL_CATWALK_TOP.get()); + dropSelf(ModBlocks.STEEL_CATWALK_BLOCK.get()); + } diff --git a/src/main/resources/assets/ariasessentials/lang/en_us.json b/src/main/resources/assets/ariasessentials/lang/en_us.json index d39f4c1..93a487e 100644 --- a/src/main/resources/assets/ariasessentials/lang/en_us.json +++ b/src/main/resources/assets/ariasessentials/lang/en_us.json @@ -42,6 +42,7 @@ "block.ariasessentials.steel_catwalk_stairs_lr": "Steel Catwalk Left Rail", "block.ariasessentials.steel_catwalk_stairs_rr": "Steel Catwalk Right Rail", "block.ariasessentials.steel_catwalk_stairs_dr": "Steel Catwalk Double Rail", + "block.ariasessentials.steel_catwalk_block": "Steel Catwalk Block", "key.category.ariasessentials": "Aria's Essentials", "key.ariasessentials.autowalk": "Auto Walk" diff --git a/src/main/resources/data/ariasessentials/recipes/engineersdecor/finalized/steel_railing.json b/src/main/resources/data/ariasessentials/recipes/engineersdecor/finalized/steel_railing.json index 28092c4..840784f 100644 --- a/src/main/resources/data/ariasessentials/recipes/engineersdecor/finalized/steel_railing.json +++ b/src/main/resources/data/ariasessentials/recipes/engineersdecor/finalized/steel_railing.json @@ -11,6 +11,6 @@ }, "result": { "item": "ariasessentials:steel_railing", - "count": 1 + "count": 3 } } diff --git a/src/main/resources/data/ariasessentials/tags/blocks/engineersdecor.json b/src/main/resources/data/ariasessentials/tags/blocks/engineersdecor.json index c29da30..0178d56 100644 --- a/src/main/resources/data/ariasessentials/tags/blocks/engineersdecor.json +++ b/src/main/resources/data/ariasessentials/tags/blocks/engineersdecor.json @@ -39,6 +39,7 @@ "ariasessentials:steel_catwalk_stairs_lr", "ariasessentials:steel_catwalk_stairs_rr", "ariasessentials:steel_catwalk_stairs_dr", - "ariasessentials:steel_table" + "ariasessentials:steel_table", + "ariasessentials:steel_catwalk_block" ] } \ No newline at end of file