diff --git a/common/src/generated/resources/assets/createdeco/blockstates/gold_coinstack.json b/common/src/generated/resources/assets/createdeco/blockstates/gold_coinstack.json new file mode 100644 index 000000000..fb8308a7c --- /dev/null +++ b/common/src/generated/resources/assets/createdeco/blockstates/gold_coinstack.json @@ -0,0 +1,52 @@ +{ + "variants": { + "layers=1,waterlogged=false": { + "model": "createdeco:block/gold_coinstack_1" + }, + "layers=1,waterlogged=true": { + "model": "createdeco:block/gold_coinstack_1" + }, + "layers=2,waterlogged=false": { + "model": "createdeco:block/gold_coinstack_2" + }, + "layers=2,waterlogged=true": { + "model": "createdeco:block/gold_coinstack_2" + }, + "layers=3,waterlogged=false": { + "model": "createdeco:block/gold_coinstack_3" + }, + "layers=3,waterlogged=true": { + "model": "createdeco:block/gold_coinstack_3" + }, + "layers=4,waterlogged=false": { + "model": "createdeco:block/gold_coinstack_4" + }, + "layers=4,waterlogged=true": { + "model": "createdeco:block/gold_coinstack_4" + }, + "layers=5,waterlogged=false": { + "model": "createdeco:block/gold_coinstack_5" + }, + "layers=5,waterlogged=true": { + "model": "createdeco:block/gold_coinstack_5" + }, + "layers=6,waterlogged=false": { + "model": "createdeco:block/gold_coinstack_6" + }, + "layers=6,waterlogged=true": { + "model": "createdeco:block/gold_coinstack_6" + }, + "layers=7,waterlogged=false": { + "model": "createdeco:block/gold_coinstack_7" + }, + "layers=7,waterlogged=true": { + "model": "createdeco:block/gold_coinstack_7" + }, + "layers=8,waterlogged=false": { + "model": "createdeco:block/gold_coinstack_8" + }, + "layers=8,waterlogged=true": { + "model": "createdeco:block/gold_coinstack_8" + } + } +} \ No newline at end of file diff --git a/common/src/generated/resources/assets/createdeco/blockstates/netherite_coinstack.json b/common/src/generated/resources/assets/createdeco/blockstates/netherite_coinstack.json new file mode 100644 index 000000000..9f28870c5 --- /dev/null +++ b/common/src/generated/resources/assets/createdeco/blockstates/netherite_coinstack.json @@ -0,0 +1,52 @@ +{ + "variants": { + "layers=1,waterlogged=false": { + "model": "createdeco:block/netherite_coinstack_1" + }, + "layers=1,waterlogged=true": { + "model": "createdeco:block/netherite_coinstack_1" + }, + "layers=2,waterlogged=false": { + "model": "createdeco:block/netherite_coinstack_2" + }, + "layers=2,waterlogged=true": { + "model": "createdeco:block/netherite_coinstack_2" + }, + "layers=3,waterlogged=false": { + "model": "createdeco:block/netherite_coinstack_3" + }, + "layers=3,waterlogged=true": { + "model": "createdeco:block/netherite_coinstack_3" + }, + "layers=4,waterlogged=false": { + "model": "createdeco:block/netherite_coinstack_4" + }, + "layers=4,waterlogged=true": { + "model": "createdeco:block/netherite_coinstack_4" + }, + "layers=5,waterlogged=false": { + "model": "createdeco:block/netherite_coinstack_5" + }, + "layers=5,waterlogged=true": { + "model": "createdeco:block/netherite_coinstack_5" + }, + "layers=6,waterlogged=false": { + "model": "createdeco:block/netherite_coinstack_6" + }, + "layers=6,waterlogged=true": { + "model": "createdeco:block/netherite_coinstack_6" + }, + "layers=7,waterlogged=false": { + "model": "createdeco:block/netherite_coinstack_7" + }, + "layers=7,waterlogged=true": { + "model": "createdeco:block/netherite_coinstack_7" + }, + "layers=8,waterlogged=false": { + "model": "createdeco:block/netherite_coinstack_8" + }, + "layers=8,waterlogged=true": { + "model": "createdeco:block/netherite_coinstack_8" + } + } +} \ No newline at end of file diff --git a/common/src/generated/resources/assets/createdeco/lang/en_ud.json b/common/src/generated/resources/assets/createdeco/lang/en_ud.json index d34eabf1e..3af08e390 100644 --- a/common/src/generated/resources/assets/createdeco/lang/en_ud.json +++ b/common/src/generated/resources/assets/createdeco/lang/en_ud.json @@ -110,6 +110,7 @@ "block.createdeco.dusk_brick_slab": "qɐןS ʞɔıɹᗺ ʞsnᗡ", "block.createdeco.dusk_brick_stairs": "sɹıɐʇS ʞɔıɹᗺ ʞsnᗡ", "block.createdeco.dusk_bricks": "sʞɔıɹᗺ ʞsnᗡ", + "block.createdeco.gold_coinstack": "ʞɔoןᗺ ʞɔɐʇS uıoƆpןo⅁", "block.createdeco.gray_placard": "pɹɐɔɐןԀ ʎɐɹ⅁", "block.createdeco.gray_shipping_container": "ɹǝuıɐʇuoƆ buıddıɥS ʎɐɹ⅁", "block.createdeco.green_andesite_lamp": "dɯɐꞀ ǝbɐƆ ǝʇısǝpuⱯ uǝǝɹ⅁", @@ -210,6 +211,7 @@ "block.createdeco.mossy_verdant_brick_slab": "qɐןS ʞɔıɹᗺ ʇuɐpɹǝΛ ʎssoW", "block.createdeco.mossy_verdant_brick_stairs": "sɹıɐʇS ʞɔıɹᗺ ʇuɐpɹǝΛ ʎssoW", "block.createdeco.mossy_verdant_bricks": "sʞɔıɹᗺ ʇuɐpɹǝΛ ʎssoW", + "block.createdeco.netherite_coinstack": "ʞɔoןᗺ ʞɔɐʇS uıoƆǝʇıɹǝɥʇǝN", "block.createdeco.orange_placard": "pɹɐɔɐןԀ ǝbuɐɹO", "block.createdeco.orange_shipping_container": "ɹǝuıɐʇuoƆ buıddıɥS ǝbuɐɹO", "block.createdeco.pearl_brick_slab": "qɐןS ʞɔıɹᗺ ןɹɐǝԀ", diff --git a/common/src/generated/resources/assets/createdeco/lang/en_us.json b/common/src/generated/resources/assets/createdeco/lang/en_us.json index 1a9f643ca..f159d23db 100644 --- a/common/src/generated/resources/assets/createdeco/lang/en_us.json +++ b/common/src/generated/resources/assets/createdeco/lang/en_us.json @@ -110,6 +110,7 @@ "block.createdeco.dusk_brick_slab": "Dusk Brick Slab", "block.createdeco.dusk_brick_stairs": "Dusk Brick Stairs", "block.createdeco.dusk_bricks": "Dusk Bricks", + "block.createdeco.gold_coinstack": "GoldCoin Stack Block", "block.createdeco.gray_placard": "Gray Placard", "block.createdeco.gray_shipping_container": "Gray Shipping Container", "block.createdeco.green_andesite_lamp": "Green Andesite Cage Lamp", @@ -210,6 +211,7 @@ "block.createdeco.mossy_verdant_brick_slab": "Mossy Verdant Brick Slab", "block.createdeco.mossy_verdant_brick_stairs": "Mossy Verdant Brick Stairs", "block.createdeco.mossy_verdant_bricks": "Mossy Verdant Bricks", + "block.createdeco.netherite_coinstack": "NetheriteCoin Stack Block", "block.createdeco.orange_placard": "Orange Placard", "block.createdeco.orange_shipping_container": "Orange Shipping Container", "block.createdeco.pearl_brick_slab": "Pearl Brick Slab", diff --git a/common/src/generated/resources/assets/createdeco/models/block/gold_coinstack_1.json b/common/src/generated/resources/assets/createdeco/models/block/gold_coinstack_1.json new file mode 100644 index 000000000..a12ee46f9 --- /dev/null +++ b/common/src/generated/resources/assets/createdeco/models/block/gold_coinstack_1.json @@ -0,0 +1,8 @@ +{ + "parent": "createdeco:block/layers_bottom_top_1", + "textures": { + "bottom": "createdeco:block/gold_coinstack_bottom", + "side": "createdeco:block/gold_coinstack_side", + "top": "createdeco:block/gold_coinstack_top" + } +} \ No newline at end of file diff --git a/common/src/generated/resources/assets/createdeco/models/block/gold_coinstack_2.json b/common/src/generated/resources/assets/createdeco/models/block/gold_coinstack_2.json new file mode 100644 index 000000000..c57239c35 --- /dev/null +++ b/common/src/generated/resources/assets/createdeco/models/block/gold_coinstack_2.json @@ -0,0 +1,8 @@ +{ + "parent": "createdeco:block/layers_bottom_top_2", + "textures": { + "bottom": "createdeco:block/gold_coinstack_bottom", + "side": "createdeco:block/gold_coinstack_side", + "top": "createdeco:block/gold_coinstack_top" + } +} \ No newline at end of file diff --git a/common/src/generated/resources/assets/createdeco/models/block/gold_coinstack_3.json b/common/src/generated/resources/assets/createdeco/models/block/gold_coinstack_3.json new file mode 100644 index 000000000..88739cabd --- /dev/null +++ b/common/src/generated/resources/assets/createdeco/models/block/gold_coinstack_3.json @@ -0,0 +1,8 @@ +{ + "parent": "createdeco:block/layers_bottom_top_3", + "textures": { + "bottom": "createdeco:block/gold_coinstack_bottom", + "side": "createdeco:block/gold_coinstack_side", + "top": "createdeco:block/gold_coinstack_top" + } +} \ No newline at end of file diff --git a/common/src/generated/resources/assets/createdeco/models/block/gold_coinstack_4.json b/common/src/generated/resources/assets/createdeco/models/block/gold_coinstack_4.json new file mode 100644 index 000000000..c090df9cc --- /dev/null +++ b/common/src/generated/resources/assets/createdeco/models/block/gold_coinstack_4.json @@ -0,0 +1,8 @@ +{ + "parent": "createdeco:block/layers_bottom_top_4", + "textures": { + "bottom": "createdeco:block/gold_coinstack_bottom", + "side": "createdeco:block/gold_coinstack_side", + "top": "createdeco:block/gold_coinstack_top" + } +} \ No newline at end of file diff --git a/common/src/generated/resources/assets/createdeco/models/block/gold_coinstack_5.json b/common/src/generated/resources/assets/createdeco/models/block/gold_coinstack_5.json new file mode 100644 index 000000000..d1235f22e --- /dev/null +++ b/common/src/generated/resources/assets/createdeco/models/block/gold_coinstack_5.json @@ -0,0 +1,8 @@ +{ + "parent": "createdeco:block/layers_bottom_top_5", + "textures": { + "bottom": "createdeco:block/gold_coinstack_bottom", + "side": "createdeco:block/gold_coinstack_side", + "top": "createdeco:block/gold_coinstack_top" + } +} \ No newline at end of file diff --git a/common/src/generated/resources/assets/createdeco/models/block/gold_coinstack_6.json b/common/src/generated/resources/assets/createdeco/models/block/gold_coinstack_6.json new file mode 100644 index 000000000..e5945291b --- /dev/null +++ b/common/src/generated/resources/assets/createdeco/models/block/gold_coinstack_6.json @@ -0,0 +1,8 @@ +{ + "parent": "createdeco:block/layers_bottom_top_6", + "textures": { + "bottom": "createdeco:block/gold_coinstack_bottom", + "side": "createdeco:block/gold_coinstack_side", + "top": "createdeco:block/gold_coinstack_top" + } +} \ No newline at end of file diff --git a/common/src/generated/resources/assets/createdeco/models/block/gold_coinstack_7.json b/common/src/generated/resources/assets/createdeco/models/block/gold_coinstack_7.json new file mode 100644 index 000000000..7ce10bce9 --- /dev/null +++ b/common/src/generated/resources/assets/createdeco/models/block/gold_coinstack_7.json @@ -0,0 +1,8 @@ +{ + "parent": "createdeco:block/layers_bottom_top_7", + "textures": { + "bottom": "createdeco:block/gold_coinstack_bottom", + "side": "createdeco:block/gold_coinstack_side", + "top": "createdeco:block/gold_coinstack_top" + } +} \ No newline at end of file diff --git a/common/src/generated/resources/assets/createdeco/models/block/gold_coinstack_8.json b/common/src/generated/resources/assets/createdeco/models/block/gold_coinstack_8.json new file mode 100644 index 000000000..27a65db0b --- /dev/null +++ b/common/src/generated/resources/assets/createdeco/models/block/gold_coinstack_8.json @@ -0,0 +1,8 @@ +{ + "parent": "createdeco:block/layers_bottom_top_8", + "textures": { + "bottom": "createdeco:block/gold_coinstack_bottom", + "side": "createdeco:block/gold_coinstack_side", + "top": "createdeco:block/gold_coinstack_top" + } +} \ No newline at end of file diff --git a/common/src/generated/resources/assets/createdeco/models/block/netherite_coinstack_1.json b/common/src/generated/resources/assets/createdeco/models/block/netherite_coinstack_1.json new file mode 100644 index 000000000..d0afe26d6 --- /dev/null +++ b/common/src/generated/resources/assets/createdeco/models/block/netherite_coinstack_1.json @@ -0,0 +1,8 @@ +{ + "parent": "createdeco:block/layers_bottom_top_1", + "textures": { + "bottom": "createdeco:block/netherite_coinstack_bottom", + "side": "createdeco:block/netherite_coinstack_side", + "top": "createdeco:block/netherite_coinstack_top" + } +} \ No newline at end of file diff --git a/common/src/generated/resources/assets/createdeco/models/block/netherite_coinstack_2.json b/common/src/generated/resources/assets/createdeco/models/block/netherite_coinstack_2.json new file mode 100644 index 000000000..57c061530 --- /dev/null +++ b/common/src/generated/resources/assets/createdeco/models/block/netherite_coinstack_2.json @@ -0,0 +1,8 @@ +{ + "parent": "createdeco:block/layers_bottom_top_2", + "textures": { + "bottom": "createdeco:block/netherite_coinstack_bottom", + "side": "createdeco:block/netherite_coinstack_side", + "top": "createdeco:block/netherite_coinstack_top" + } +} \ No newline at end of file diff --git a/common/src/generated/resources/assets/createdeco/models/block/netherite_coinstack_3.json b/common/src/generated/resources/assets/createdeco/models/block/netherite_coinstack_3.json new file mode 100644 index 000000000..51bdfa594 --- /dev/null +++ b/common/src/generated/resources/assets/createdeco/models/block/netherite_coinstack_3.json @@ -0,0 +1,8 @@ +{ + "parent": "createdeco:block/layers_bottom_top_3", + "textures": { + "bottom": "createdeco:block/netherite_coinstack_bottom", + "side": "createdeco:block/netherite_coinstack_side", + "top": "createdeco:block/netherite_coinstack_top" + } +} \ No newline at end of file diff --git a/common/src/generated/resources/assets/createdeco/models/block/netherite_coinstack_4.json b/common/src/generated/resources/assets/createdeco/models/block/netherite_coinstack_4.json new file mode 100644 index 000000000..74f3639f2 --- /dev/null +++ b/common/src/generated/resources/assets/createdeco/models/block/netherite_coinstack_4.json @@ -0,0 +1,8 @@ +{ + "parent": "createdeco:block/layers_bottom_top_4", + "textures": { + "bottom": "createdeco:block/netherite_coinstack_bottom", + "side": "createdeco:block/netherite_coinstack_side", + "top": "createdeco:block/netherite_coinstack_top" + } +} \ No newline at end of file diff --git a/common/src/generated/resources/assets/createdeco/models/block/netherite_coinstack_5.json b/common/src/generated/resources/assets/createdeco/models/block/netherite_coinstack_5.json new file mode 100644 index 000000000..6af266c22 --- /dev/null +++ b/common/src/generated/resources/assets/createdeco/models/block/netherite_coinstack_5.json @@ -0,0 +1,8 @@ +{ + "parent": "createdeco:block/layers_bottom_top_5", + "textures": { + "bottom": "createdeco:block/netherite_coinstack_bottom", + "side": "createdeco:block/netherite_coinstack_side", + "top": "createdeco:block/netherite_coinstack_top" + } +} \ No newline at end of file diff --git a/common/src/generated/resources/assets/createdeco/models/block/netherite_coinstack_6.json b/common/src/generated/resources/assets/createdeco/models/block/netherite_coinstack_6.json new file mode 100644 index 000000000..13fd59d4b --- /dev/null +++ b/common/src/generated/resources/assets/createdeco/models/block/netherite_coinstack_6.json @@ -0,0 +1,8 @@ +{ + "parent": "createdeco:block/layers_bottom_top_6", + "textures": { + "bottom": "createdeco:block/netherite_coinstack_bottom", + "side": "createdeco:block/netherite_coinstack_side", + "top": "createdeco:block/netherite_coinstack_top" + } +} \ No newline at end of file diff --git a/common/src/generated/resources/assets/createdeco/models/block/netherite_coinstack_7.json b/common/src/generated/resources/assets/createdeco/models/block/netherite_coinstack_7.json new file mode 100644 index 000000000..ee53eeabb --- /dev/null +++ b/common/src/generated/resources/assets/createdeco/models/block/netherite_coinstack_7.json @@ -0,0 +1,8 @@ +{ + "parent": "createdeco:block/layers_bottom_top_7", + "textures": { + "bottom": "createdeco:block/netherite_coinstack_bottom", + "side": "createdeco:block/netherite_coinstack_side", + "top": "createdeco:block/netherite_coinstack_top" + } +} \ No newline at end of file diff --git a/common/src/generated/resources/assets/createdeco/models/block/netherite_coinstack_8.json b/common/src/generated/resources/assets/createdeco/models/block/netherite_coinstack_8.json new file mode 100644 index 000000000..3a370d77e --- /dev/null +++ b/common/src/generated/resources/assets/createdeco/models/block/netherite_coinstack_8.json @@ -0,0 +1,8 @@ +{ + "parent": "createdeco:block/layers_bottom_top_8", + "textures": { + "bottom": "createdeco:block/netherite_coinstack_bottom", + "side": "createdeco:block/netherite_coinstack_side", + "top": "createdeco:block/netherite_coinstack_top" + } +} \ No newline at end of file diff --git a/common/src/generated/resources/data/createdeco/loot_tables/blocks/gold_coinstack.json b/common/src/generated/resources/data/createdeco/loot_tables/blocks/gold_coinstack.json new file mode 100644 index 000000000..44c87be51 --- /dev/null +++ b/common/src/generated/resources/data/createdeco/loot_tables/blocks/gold_coinstack.json @@ -0,0 +1,172 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "block": "createdeco:gold_coinstack", + "condition": "minecraft:block_state_property", + "properties": { + "layers": "1" + } + } + ], + "functions": [ + { + "add": false, + "count": 1.0, + "function": "minecraft:set_count" + } + ], + "name": "createdeco:gold_coinstack" + }, + { + "type": "minecraft:item", + "conditions": [ + { + "block": "createdeco:gold_coinstack", + "condition": "minecraft:block_state_property", + "properties": { + "layers": "2" + } + } + ], + "functions": [ + { + "add": false, + "count": 2.0, + "function": "minecraft:set_count" + } + ], + "name": "createdeco:gold_coinstack" + }, + { + "type": "minecraft:item", + "conditions": [ + { + "block": "createdeco:gold_coinstack", + "condition": "minecraft:block_state_property", + "properties": { + "layers": "3" + } + } + ], + "functions": [ + { + "add": false, + "count": 3.0, + "function": "minecraft:set_count" + } + ], + "name": "createdeco:gold_coinstack" + }, + { + "type": "minecraft:item", + "conditions": [ + { + "block": "createdeco:gold_coinstack", + "condition": "minecraft:block_state_property", + "properties": { + "layers": "4" + } + } + ], + "functions": [ + { + "add": false, + "count": 4.0, + "function": "minecraft:set_count" + } + ], + "name": "createdeco:gold_coinstack" + }, + { + "type": "minecraft:item", + "conditions": [ + { + "block": "createdeco:gold_coinstack", + "condition": "minecraft:block_state_property", + "properties": { + "layers": "5" + } + } + ], + "functions": [ + { + "add": false, + "count": 5.0, + "function": "minecraft:set_count" + } + ], + "name": "createdeco:gold_coinstack" + }, + { + "type": "minecraft:item", + "conditions": [ + { + "block": "createdeco:gold_coinstack", + "condition": "minecraft:block_state_property", + "properties": { + "layers": "6" + } + } + ], + "functions": [ + { + "add": false, + "count": 6.0, + "function": "minecraft:set_count" + } + ], + "name": "createdeco:gold_coinstack" + }, + { + "type": "minecraft:item", + "conditions": [ + { + "block": "createdeco:gold_coinstack", + "condition": "minecraft:block_state_property", + "properties": { + "layers": "7" + } + } + ], + "functions": [ + { + "add": false, + "count": 7.0, + "function": "minecraft:set_count" + } + ], + "name": "createdeco:gold_coinstack" + }, + { + "type": "minecraft:item", + "conditions": [ + { + "block": "createdeco:gold_coinstack", + "condition": "minecraft:block_state_property", + "properties": { + "layers": "8" + } + } + ], + "functions": [ + { + "add": false, + "count": 8.0, + "function": "minecraft:set_count" + } + ], + "name": "createdeco:gold_coinstack" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "createdeco:blocks/gold_coinstack" +} \ No newline at end of file diff --git a/common/src/generated/resources/data/createdeco/loot_tables/blocks/netherite_coinstack.json b/common/src/generated/resources/data/createdeco/loot_tables/blocks/netherite_coinstack.json new file mode 100644 index 000000000..9ae3f85db --- /dev/null +++ b/common/src/generated/resources/data/createdeco/loot_tables/blocks/netherite_coinstack.json @@ -0,0 +1,172 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "block": "createdeco:netherite_coinstack", + "condition": "minecraft:block_state_property", + "properties": { + "layers": "1" + } + } + ], + "functions": [ + { + "add": false, + "count": 1.0, + "function": "minecraft:set_count" + } + ], + "name": "createdeco:netherite_coinstack" + }, + { + "type": "minecraft:item", + "conditions": [ + { + "block": "createdeco:netherite_coinstack", + "condition": "minecraft:block_state_property", + "properties": { + "layers": "2" + } + } + ], + "functions": [ + { + "add": false, + "count": 2.0, + "function": "minecraft:set_count" + } + ], + "name": "createdeco:netherite_coinstack" + }, + { + "type": "minecraft:item", + "conditions": [ + { + "block": "createdeco:netherite_coinstack", + "condition": "minecraft:block_state_property", + "properties": { + "layers": "3" + } + } + ], + "functions": [ + { + "add": false, + "count": 3.0, + "function": "minecraft:set_count" + } + ], + "name": "createdeco:netherite_coinstack" + }, + { + "type": "minecraft:item", + "conditions": [ + { + "block": "createdeco:netherite_coinstack", + "condition": "minecraft:block_state_property", + "properties": { + "layers": "4" + } + } + ], + "functions": [ + { + "add": false, + "count": 4.0, + "function": "minecraft:set_count" + } + ], + "name": "createdeco:netherite_coinstack" + }, + { + "type": "minecraft:item", + "conditions": [ + { + "block": "createdeco:netherite_coinstack", + "condition": "minecraft:block_state_property", + "properties": { + "layers": "5" + } + } + ], + "functions": [ + { + "add": false, + "count": 5.0, + "function": "minecraft:set_count" + } + ], + "name": "createdeco:netherite_coinstack" + }, + { + "type": "minecraft:item", + "conditions": [ + { + "block": "createdeco:netherite_coinstack", + "condition": "minecraft:block_state_property", + "properties": { + "layers": "6" + } + } + ], + "functions": [ + { + "add": false, + "count": 6.0, + "function": "minecraft:set_count" + } + ], + "name": "createdeco:netherite_coinstack" + }, + { + "type": "minecraft:item", + "conditions": [ + { + "block": "createdeco:netherite_coinstack", + "condition": "minecraft:block_state_property", + "properties": { + "layers": "7" + } + } + ], + "functions": [ + { + "add": false, + "count": 7.0, + "function": "minecraft:set_count" + } + ], + "name": "createdeco:netherite_coinstack" + }, + { + "type": "minecraft:item", + "conditions": [ + { + "block": "createdeco:netherite_coinstack", + "condition": "minecraft:block_state_property", + "properties": { + "layers": "8" + } + } + ], + "functions": [ + { + "add": false, + "count": 8.0, + "function": "minecraft:set_count" + } + ], + "name": "createdeco:netherite_coinstack" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "createdeco:blocks/netherite_coinstack" +} \ No newline at end of file diff --git a/common/src/generated/resources/data/createdeco/tags/blocks/internal/colorless_glass_panes.json b/common/src/generated/resources/data/createdeco/tags/blocks/internal/colorless_glass_panes.json deleted file mode 100644 index 2fdc415a5..000000000 --- a/common/src/generated/resources/data/createdeco/tags/blocks/internal/colorless_glass_panes.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "replace": false, - "values": [ - "createdeco:andesite_window_pane", - "createdeco:copper_window_pane", - "createdeco:iron_window_pane", - "createdeco:industrial_iron_window_pane", - "createdeco:brass_window_pane", - "createdeco:zinc_window_pane" - ] -} \ No newline at end of file diff --git a/common/src/generated/resources/data/createdeco/tags/items/internal/colorless_glass_panes.json b/common/src/generated/resources/data/createdeco/tags/items/internal/colorless_glass_panes.json deleted file mode 100644 index 2fdc415a5..000000000 --- a/common/src/generated/resources/data/createdeco/tags/items/internal/colorless_glass_panes.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "replace": false, - "values": [ - "createdeco:andesite_window_pane", - "createdeco:copper_window_pane", - "createdeco:iron_window_pane", - "createdeco:industrial_iron_window_pane", - "createdeco:brass_window_pane", - "createdeco:zinc_window_pane" - ] -} \ No newline at end of file diff --git a/common/src/generated/resources/data/minecraft/tags/blocks/mineable/pickaxe.json b/common/src/generated/resources/data/minecraft/tags/blocks/mineable/pickaxe.json index 77dd36566..ea0fabecb 100644 --- a/common/src/generated/resources/data/minecraft/tags/blocks/mineable/pickaxe.json +++ b/common/src/generated/resources/data/minecraft/tags/blocks/mineable/pickaxe.json @@ -113,6 +113,42 @@ "createdeco:long_red_brick_slab", "createdeco:cracked_red_brick_slab", "createdeco:mossy_red_brick_slab", + "createdeco:verdant_bricks", + "createdeco:short_verdant_bricks", + "createdeco:tiled_verdant_bricks", + "createdeco:long_verdant_bricks", + "createdeco:cracked_verdant_bricks", + "createdeco:mossy_verdant_bricks", + "createdeco:verdant_brick_stairs", + "createdeco:short_verdant_brick_stairs", + "createdeco:tiled_verdant_brick_stairs", + "createdeco:long_verdant_brick_stairs", + "createdeco:cracked_verdant_brick_stairs", + "createdeco:mossy_verdant_brick_stairs", + "createdeco:verdant_brick_slab", + "createdeco:short_verdant_brick_slab", + "createdeco:tiled_verdant_brick_slab", + "createdeco:long_verdant_brick_slab", + "createdeco:cracked_verdant_brick_slab", + "createdeco:mossy_verdant_brick_slab", + "createdeco:dean_bricks", + "createdeco:short_dean_bricks", + "createdeco:tiled_dean_bricks", + "createdeco:long_dean_bricks", + "createdeco:cracked_dean_bricks", + "createdeco:mossy_dean_bricks", + "createdeco:dean_brick_stairs", + "createdeco:short_dean_brick_stairs", + "createdeco:tiled_dean_brick_stairs", + "createdeco:long_dean_brick_stairs", + "createdeco:cracked_dean_brick_stairs", + "createdeco:mossy_dean_brick_stairs", + "createdeco:dean_brick_slab", + "createdeco:short_dean_brick_slab", + "createdeco:tiled_dean_brick_slab", + "createdeco:long_dean_brick_slab", + "createdeco:cracked_dean_brick_slab", + "createdeco:mossy_dean_brick_slab", "createdeco:dusk_bricks", "createdeco:short_dusk_bricks", "createdeco:tiled_dusk_bricks", @@ -131,24 +167,6 @@ "createdeco:long_dusk_brick_slab", "createdeco:cracked_dusk_brick_slab", "createdeco:mossy_dusk_brick_slab", - "createdeco:umber_bricks", - "createdeco:short_umber_bricks", - "createdeco:tiled_umber_bricks", - "createdeco:long_umber_bricks", - "createdeco:cracked_umber_bricks", - "createdeco:mossy_umber_bricks", - "createdeco:umber_brick_stairs", - "createdeco:short_umber_brick_stairs", - "createdeco:tiled_umber_brick_stairs", - "createdeco:long_umber_brick_stairs", - "createdeco:cracked_umber_brick_stairs", - "createdeco:mossy_umber_brick_stairs", - "createdeco:umber_brick_slab", - "createdeco:short_umber_brick_slab", - "createdeco:tiled_umber_brick_slab", - "createdeco:long_umber_brick_slab", - "createdeco:cracked_umber_brick_slab", - "createdeco:mossy_umber_brick_slab", "createdeco:scarlet_bricks", "createdeco:short_scarlet_bricks", "createdeco:tiled_scarlet_bricks", @@ -167,42 +185,24 @@ "createdeco:long_scarlet_brick_slab", "createdeco:cracked_scarlet_brick_slab", "createdeco:mossy_scarlet_brick_slab", - "createdeco:dean_bricks", - "createdeco:short_dean_bricks", - "createdeco:tiled_dean_bricks", - "createdeco:long_dean_bricks", - "createdeco:cracked_dean_bricks", - "createdeco:mossy_dean_bricks", - "createdeco:dean_brick_stairs", - "createdeco:short_dean_brick_stairs", - "createdeco:tiled_dean_brick_stairs", - "createdeco:long_dean_brick_stairs", - "createdeco:cracked_dean_brick_stairs", - "createdeco:mossy_dean_brick_stairs", - "createdeco:dean_brick_slab", - "createdeco:short_dean_brick_slab", - "createdeco:tiled_dean_brick_slab", - "createdeco:long_dean_brick_slab", - "createdeco:cracked_dean_brick_slab", - "createdeco:mossy_dean_brick_slab", - "createdeco:verdant_bricks", - "createdeco:short_verdant_bricks", - "createdeco:tiled_verdant_bricks", - "createdeco:long_verdant_bricks", - "createdeco:cracked_verdant_bricks", - "createdeco:mossy_verdant_bricks", - "createdeco:verdant_brick_stairs", - "createdeco:short_verdant_brick_stairs", - "createdeco:tiled_verdant_brick_stairs", - "createdeco:long_verdant_brick_stairs", - "createdeco:cracked_verdant_brick_stairs", - "createdeco:mossy_verdant_brick_stairs", - "createdeco:verdant_brick_slab", - "createdeco:short_verdant_brick_slab", - "createdeco:tiled_verdant_brick_slab", - "createdeco:long_verdant_brick_slab", - "createdeco:cracked_verdant_brick_slab", - "createdeco:mossy_verdant_brick_slab", + "createdeco:pearl_bricks", + "createdeco:short_pearl_bricks", + "createdeco:tiled_pearl_bricks", + "createdeco:long_pearl_bricks", + "createdeco:cracked_pearl_bricks", + "createdeco:mossy_pearl_bricks", + "createdeco:pearl_brick_stairs", + "createdeco:short_pearl_brick_stairs", + "createdeco:tiled_pearl_brick_stairs", + "createdeco:long_pearl_brick_stairs", + "createdeco:cracked_pearl_brick_stairs", + "createdeco:mossy_pearl_brick_stairs", + "createdeco:pearl_brick_slab", + "createdeco:short_pearl_brick_slab", + "createdeco:tiled_pearl_brick_slab", + "createdeco:long_pearl_brick_slab", + "createdeco:cracked_pearl_brick_slab", + "createdeco:mossy_pearl_brick_slab", "createdeco:blue_bricks", "createdeco:short_blue_bricks", "createdeco:tiled_blue_bricks", @@ -221,23 +221,23 @@ "createdeco:long_blue_brick_slab", "createdeco:cracked_blue_brick_slab", "createdeco:mossy_blue_brick_slab", - "createdeco:pearl_bricks", - "createdeco:short_pearl_bricks", - "createdeco:tiled_pearl_bricks", - "createdeco:long_pearl_bricks", - "createdeco:cracked_pearl_bricks", - "createdeco:mossy_pearl_bricks", - "createdeco:pearl_brick_stairs", - "createdeco:short_pearl_brick_stairs", - "createdeco:tiled_pearl_brick_stairs", - "createdeco:long_pearl_brick_stairs", - "createdeco:cracked_pearl_brick_stairs", - "createdeco:mossy_pearl_brick_stairs", - "createdeco:pearl_brick_slab", - "createdeco:short_pearl_brick_slab", - "createdeco:tiled_pearl_brick_slab", - "createdeco:long_pearl_brick_slab", - "createdeco:cracked_pearl_brick_slab", - "createdeco:mossy_pearl_brick_slab" + "createdeco:umber_bricks", + "createdeco:short_umber_bricks", + "createdeco:tiled_umber_bricks", + "createdeco:long_umber_bricks", + "createdeco:cracked_umber_bricks", + "createdeco:mossy_umber_bricks", + "createdeco:umber_brick_stairs", + "createdeco:short_umber_brick_stairs", + "createdeco:tiled_umber_brick_stairs", + "createdeco:long_umber_brick_stairs", + "createdeco:cracked_umber_brick_stairs", + "createdeco:mossy_umber_brick_stairs", + "createdeco:umber_brick_slab", + "createdeco:short_umber_brick_slab", + "createdeco:tiled_umber_brick_slab", + "createdeco:long_umber_brick_slab", + "createdeco:cracked_umber_brick_slab", + "createdeco:mossy_umber_brick_slab" ] } \ No newline at end of file diff --git a/common/src/main/java/com/github/talrey/createdeco/BlockRegistry.java b/common/src/main/java/com/github/talrey/createdeco/BlockRegistry.java index 1467b7876..0bcf8eb87 100644 --- a/common/src/main/java/com/github/talrey/createdeco/BlockRegistry.java +++ b/common/src/main/java/com/github/talrey/createdeco/BlockRegistry.java @@ -108,7 +108,7 @@ public static void init() { registerShippingContainers(); registerDecals(); registerPlacards(); - ItemRegistry.METAL_TYPES.forEach(BlockRegistry::registerCoins); + ItemRegistry.COIN_METALS.forEach(BlockRegistry::registerCoins); // Bricks registration CreateDecoMod.REGISTRATE.defaultCreativeTab(CreativeTabs.BRICKS_KEY); @@ -226,13 +226,13 @@ private static void registerSheetMetal (String metal, Function get BRASS_WINDOW = Windows.metalWindowBlock("Brass"), ZINC_WINDOW = Windows.metalWindowBlock("Zinc"); -// public static final BlockEntry -// ANDESITE_WINDOW_PANE = Windows.metalWindowPane("Andesite", ANDESITE_WINDOW), -// COPPER_WINDOW_PANE = Windows.metalWindowPane("Copper", COPPER_WINDOW), -// IRON_WINDOW_PANE = Windows.metalWindowPane("Iron", IRON_WINDOW), -// INDUSTRIAL_IRON_WINDOW_PANE = Windows.metalWindowPane("Industrial Iron", INDUSTRIAL_IRON_WINDOW), -// BRASS_WINDOW_PANE = Windows.metalWindowPane("Brass", BRASS_WINDOW), -// ZINC_WINDOW_PANE = Windows.metalWindowPane("Zinc", ZINC_WINDOW); + public static final BlockEntry + ANDESITE_WINDOW_PANE = Windows.metalWindowPane("Andesite", ANDESITE_WINDOW), + COPPER_WINDOW_PANE = Windows.metalWindowPane("Copper", COPPER_WINDOW), + IRON_WINDOW_PANE = Windows.metalWindowPane("Iron", IRON_WINDOW), + INDUSTRIAL_IRON_WINDOW_PANE = Windows.metalWindowPane("Industrial Iron", INDUSTRIAL_IRON_WINDOW), + BRASS_WINDOW_PANE = Windows.metalWindowPane("Brass", BRASS_WINDOW), + ZINC_WINDOW_PANE = Windows.metalWindowPane("Zinc", ZINC_WINDOW); private static void registerDoors (String metal, Function getter) { if (metal.equals("Iron") || metal.equals("Gold") || metal.equals("Netherite")) { diff --git a/common/src/main/java/com/github/talrey/createdeco/ItemRegistry.java b/common/src/main/java/com/github/talrey/createdeco/ItemRegistry.java index b5a07e100..899e74ef6 100644 --- a/common/src/main/java/com/github/talrey/createdeco/ItemRegistry.java +++ b/common/src/main/java/com/github/talrey/createdeco/ItemRegistry.java @@ -42,10 +42,15 @@ public static void init () { METAL_TYPES.put("Brass", (str) -> AllItems.BRASS_INGOT.get()); METAL_TYPES.put("Iron", (str) -> Items.IRON_INGOT); METAL_TYPES.put("Industrial Iron", (str) -> INDUSTRIAL_IRON_INGOT.get()); + + COIN_METALS.put("Zinc", (str) -> AllItems.ZINC_INGOT.get()); + COIN_METALS.put("Copper", (str) -> Items.COPPER_INGOT); + COIN_METALS.put("Brass", (str) -> AllItems.BRASS_INGOT.get()); + COIN_METALS.put("Iron", (str) -> Items.IRON_INGOT); + COIN_METALS.put("Industrial Iron", (str) -> INDUSTRIAL_IRON_INGOT.get()); COIN_METALS.put("Gold", (str) -> Items.GOLD_INGOT); COIN_METALS.put("Netherite", (str) -> Items.NETHERITE_INGOT); - METAL_TYPES.forEach(ItemRegistry::registerCoins); COIN_METALS.forEach(ItemRegistry::registerCoins); } diff --git a/common/src/main/java/com/github/talrey/createdeco/api/CDTags.java b/common/src/main/java/com/github/talrey/createdeco/api/CDTags.java index 64c24cfcf..b32b6a795 100644 --- a/common/src/main/java/com/github/talrey/createdeco/api/CDTags.java +++ b/common/src/main/java/com/github/talrey/createdeco/api/CDTags.java @@ -27,10 +27,6 @@ private enum Form { ); public static final LoaderTag GLASS_ITEM = LoaderTag.same(Registries.ITEM, "colorless_glass"); - public static final LoaderTag GLASS_PANE_ITEM = LoaderTag.same(Registries.ITEM, "colorless_glass_panes"); - - public static final LoaderTag GLASS = LoaderTag.same(Registries.BLOCK, "colorless_glass"); - public static final LoaderTag GLASS_PANE = LoaderTag.same(Registries.BLOCK, "colorless_glass_panes"); static { init(); diff --git a/common/src/main/java/com/github/talrey/createdeco/api/Windows.java b/common/src/main/java/com/github/talrey/createdeco/api/Windows.java index 8b9c01db9..17678afbe 100644 --- a/common/src/main/java/com/github/talrey/createdeco/api/Windows.java +++ b/common/src/main/java/com/github/talrey/createdeco/api/Windows.java @@ -144,10 +144,8 @@ private static BlockEntry glassPane(String name, S .define('#', parent.get()) .unlockedBy("has_ingredient", RegistrateRecipeProvider.has(parent.get())) .save(p::accept)) - .tag(CDTags.GLASS_PANE.tag) .loot((t, g) -> t.dropWhenSilkTouch(g)) .item() - .tag(CDTags.GLASS_PANE_ITEM.tag) .model((c, p) -> p.withExistingParent(c.getName(), CreateDecoMod.id("item/pane")) .texture("pane", sideTexture) .texture("edge", topTexture)) diff --git a/common/src/main/resources/data/createdeco/tags/items/internal/colorless_glass.json b/common/src/main/resources/data/createdeco/tags/items/internal/colorless_glass.json index 41c35c322..a75f1a038 100644 --- a/common/src/main/resources/data/createdeco/tags/items/internal/colorless_glass.json +++ b/common/src/main/resources/data/createdeco/tags/items/internal/colorless_glass.json @@ -1,6 +1,10 @@ { "replace": false, "values": [ - "minecraft:glass" + "minecraft:glass", + "create:tiled_glass", + "create:framed_glass", + "create:horizontal_framed_glass", + "create:vertical_framed_glass" ] } \ No newline at end of file diff --git a/common/src/main/resources/data/createdeco/tags/items/internal/colorless_glass_panes.json b/common/src/main/resources/data/createdeco/tags/items/internal/colorless_glass_panes.json deleted file mode 100644 index a0638aace..000000000 --- a/common/src/main/resources/data/createdeco/tags/items/internal/colorless_glass_panes.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "minecraft:glass_pane" - ] -} \ No newline at end of file