From eeb8c506163ab7236ca901a67664f3380db56a92 Mon Sep 17 00:00:00 2001 From: Niklas Widmann Date: Sat, 12 Oct 2024 14:03:21 +0200 Subject: [PATCH 01/11] add sepulcher without logic --- gradle.properties | 2 +- .../002701d48eee4c36b62b24b011e74b0624793d05 | 3 ++- .../4d87f6c700406347abbc935fa7e5d5e893a595b5 | 3 ++- .../oreganized/blockstates/sepulcher.json | 7 +++++++ .../assets/oreganized/lang/en_us.json | 3 ++- .../oreganized/models/item/sepulcher.json | 3 +++ .../loot_tables/blocks/sepulcher.json | 21 +++++++++++++++++++ .../oreganized/client/OreganizedClient.java | 1 + .../galena/oreganized/data/OBlockStates.java | 1 + .../galena/oreganized/data/OItemModels.java | 2 ++ .../galena/oreganized/data/OLootTables.java | 2 ++ .../data/provider/OBlockStateProvider.java | 4 ++++ .../java/galena/oreganized/index/OBlocks.java | 2 ++ .../oreganized/models/block/sepulcher.json | 5 +++-- .../block/sepulcher_being_filled_1.json | 9 ++++---- .../block/sepulcher_being_filled_10.json | 8 +++---- .../block/sepulcher_being_filled_11.json | 8 +++---- .../block/sepulcher_being_filled_12.json | 9 ++++---- .../block/sepulcher_being_filled_13.json | 9 ++++---- .../block/sepulcher_being_filled_2.json | 8 +++---- .../block/sepulcher_being_filled_3.json | 8 +++---- .../block/sepulcher_being_filled_4.json | 8 +++---- .../block/sepulcher_being_filled_5.json | 9 ++++---- .../block/sepulcher_being_filled_6.json | 8 +++---- .../block/sepulcher_being_filled_7.json | 8 +++---- .../block/sepulcher_being_filled_8.json | 8 +++---- .../block/sepulcher_being_filled_9.json | 8 +++---- .../models/block/sepulcher_sealed_1.json | 9 ++++---- .../models/block/sepulcher_sealed_2.json | 9 ++++---- .../models/block/sepulcher_sealed_3.json | 8 +++---- .../models/block/sepulcher_sealed_4.json | 9 ++++---- .../models/block/sepulcher_sealed_5.json | 9 ++++---- 32 files changed, 133 insertions(+), 78 deletions(-) create mode 100644 src/generated/resources/assets/oreganized/blockstates/sepulcher.json create mode 100644 src/generated/resources/assets/oreganized/models/item/sepulcher.json create mode 100644 src/generated/resources/data/oreganized/loot_tables/blocks/sepulcher.json diff --git a/gradle.properties b/gradle.properties index 9aaf3849..dd6e686e 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,5 +1,5 @@ # Project -version=3.1.0 +version=3.2.0 group=galena mod_name=Oreganized mod_author=Xaidee as part of Team Galena diff --git a/src/generated/resources/.cache/002701d48eee4c36b62b24b011e74b0624793d05 b/src/generated/resources/.cache/002701d48eee4c36b62b24b011e74b0624793d05 index 97d96809..4de7658a 100644 --- a/src/generated/resources/.cache/002701d48eee4c36b62b24b011e74b0624793d05 +++ b/src/generated/resources/.cache/002701d48eee4c36b62b24b011e74b0624793d05 @@ -1,4 +1,4 @@ -// 1.20.1 2024-09-11T16:17:06.6440035 oreganized Block States +// 1.20.1 2024-10-11T21:16:46.8848719 oreganized Block States d85b0fb9e5cad1d9c4f22ed192b0fa621ee3373c assets/oreganized/blockstates/black_crystal_glass.json 05bb006ff7f48557fe5c5333bc120f7206052717 assets/oreganized/blockstates/black_crystal_glass_pane.json 5e5002e9c77ee7221425eeacce8834af484db877 assets/oreganized/blockstates/blue_crystal_glass.json @@ -59,6 +59,7 @@ c9cb5c7d3dcf17e64b42b21b3ca32e2f872b32f7 assets/oreganized/blockstates/purple_cr a8b05dbdd23fe1cf5ce82b267a4648b0629fc297 assets/oreganized/blockstates/raw_silver_block.json 5085b50121f91c56256b5f1189c8dc614c340d11 assets/oreganized/blockstates/red_crystal_glass.json 7a46fe801476209d2d5eb40213397140a7a06b8f assets/oreganized/blockstates/red_crystal_glass_pane.json +48e394ec30871f2d62691e7c8683ade4e3eaa17f assets/oreganized/blockstates/sepulcher.json 398fed72da8aa72d33e773d22a7fb5a5292e6fa5 assets/oreganized/blockstates/shrapnel_bomb.json 89f5cc8a105178b0b12f32963a320afc120bf868 assets/oreganized/blockstates/silver_ore.json 870599b8654e91dfb946d3e8afc4d0de08e49f9d assets/oreganized/blockstates/spotted_glance.json diff --git a/src/generated/resources/.cache/4d87f6c700406347abbc935fa7e5d5e893a595b5 b/src/generated/resources/.cache/4d87f6c700406347abbc935fa7e5d5e893a595b5 index b2a55f18..1bccdcdb 100644 --- a/src/generated/resources/.cache/4d87f6c700406347abbc935fa7e5d5e893a595b5 +++ b/src/generated/resources/.cache/4d87f6c700406347abbc935fa7e5d5e893a595b5 @@ -1,4 +1,4 @@ -// 1.20.1 2024-10-11T21:00:01.0555679 oreganized Item Models +// 1.20.1 2024-10-11T21:24:38.3544713 oreganized Item Models 18fcb236eeab67fa16a0014d9af5ba7dd6f9e7c8 assets/oreganized/models/item/black_crystal_glass.json 30bbb36792cb2d3f0a8a399f25238120cdf7e659 assets/oreganized/models/item/black_crystal_glass_pane.json 8dcab59e8c34403761c4aec2c3357b7db80b3f0b assets/oreganized/models/item/blue_crystal_glass.json @@ -126,6 +126,7 @@ f7c411b709a3af883b55ceb15524a116468ee0b4 assets/oreganized/models/item/purple_cr 848e82277b2a6223f4d24e6e8e53fd2769263be0 assets/oreganized/models/item/red_crystal_glass.json 1cbba207d199088dd85850ea56d55d5976e15f3c assets/oreganized/models/item/red_crystal_glass_pane.json 4c384b6c9ca85ea3aa0aca55eea89363d8355bd7 assets/oreganized/models/item/scribe.json +99a55278df5e10175dfe984338a6d6163e2cea24 assets/oreganized/models/item/sepulcher.json 2f15086e7865fc768aa268ec9b3797e818976165 assets/oreganized/models/item/shrapnel_bomb.json 0a859cda7510d7756a43cfdf4bac94b2ed57ddb6 assets/oreganized/models/item/shrapnel_bomb_minecart.json 13ffab906a6704c68eb4fef73382a7b0e0a5d5be assets/oreganized/models/item/silver_ingot.json diff --git a/src/generated/resources/assets/oreganized/blockstates/sepulcher.json b/src/generated/resources/assets/oreganized/blockstates/sepulcher.json new file mode 100644 index 00000000..2d246b7b --- /dev/null +++ b/src/generated/resources/assets/oreganized/blockstates/sepulcher.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "oreganized:block/sepulcher" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/lang/en_us.json b/src/generated/resources/assets/oreganized/lang/en_us.json index 369e816f..af596eb4 100644 --- a/src/generated/resources/assets/oreganized/lang/en_us.json +++ b/src/generated/resources/assets/oreganized/lang/en_us.json @@ -85,6 +85,7 @@ "block.oreganized.raw_silver_block": "Block of Raw Silver", "block.oreganized.red_crystal_glass": "Red Crystal Glass", "block.oreganized.red_crystal_glass_pane": "Red Crystal Glass Pane", + "block.oreganized.sepulcher": "Sepulcher", "block.oreganized.shrapnel_bomb": "Shrapnel Bomb", "block.oreganized.silver_block": "Block of Silver", "block.oreganized.silver_ore": "Silver Ore", @@ -165,4 +166,4 @@ "trim_material.oreganized.lead": "Lead material", "trim_material.oreganized.silver": "Silver material", "upgrade.oreganized.electrum_upgrade": "Electrum Upgrade" -} +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/item/sepulcher.json b/src/generated/resources/assets/oreganized/models/item/sepulcher.json new file mode 100644 index 00000000..9b246e4c --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/item/sepulcher.json @@ -0,0 +1,3 @@ +{ + "parent": "oreganized:block/sepulcher" +} \ No newline at end of file diff --git a/src/generated/resources/data/oreganized/loot_tables/blocks/sepulcher.json b/src/generated/resources/data/oreganized/loot_tables/blocks/sepulcher.json new file mode 100644 index 00000000..182a003b --- /dev/null +++ b/src/generated/resources/data/oreganized/loot_tables/blocks/sepulcher.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "oreganized:sepulcher" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "oreganized:blocks/sepulcher" +} \ No newline at end of file diff --git a/src/main/java/galena/oreganized/client/OreganizedClient.java b/src/main/java/galena/oreganized/client/OreganizedClient.java index 0b9b4751..088412e9 100644 --- a/src/main/java/galena/oreganized/client/OreganizedClient.java +++ b/src/main/java/galena/oreganized/client/OreganizedClient.java @@ -79,6 +79,7 @@ private static void registerBlockRenderers() { render(OBlocks.LEAD_TRAPDOOR, cutout); render(OBlocks.LEAD_BARS, cutout); render(OBlocks.GARGOYLE, cutout); + render(OBlocks.SEPULCHER, cutout); for (int i = 0; OBlocks.CRYSTAL_GLASS.size() > i; i++) { render(OBlocks.CRYSTAL_GLASS.get(i), translucent); diff --git a/src/main/java/galena/oreganized/data/OBlockStates.java b/src/main/java/galena/oreganized/data/OBlockStates.java index 8bb56b9b..5173dd91 100644 --- a/src/main/java/galena/oreganized/data/OBlockStates.java +++ b/src/main/java/galena/oreganized/data/OBlockStates.java @@ -112,6 +112,7 @@ protected void registerStatesAndModels() { simpleBlock(OBlocks.GROOVED_BLUE_ICE); gargoyleBlock(OBlocks.GARGOYLE); + sepulcherBlock(OBlocks.SEPULCHER); } } diff --git a/src/main/java/galena/oreganized/data/OItemModels.java b/src/main/java/galena/oreganized/data/OItemModels.java index fe2dd70f..c2ea2b1e 100644 --- a/src/main/java/galena/oreganized/data/OItemModels.java +++ b/src/main/java/galena/oreganized/data/OItemModels.java @@ -129,6 +129,8 @@ protected void registerModels() { block(OBlocks.GROOVED_PACKED_ICE); block(OBlocks.GROOVED_BLUE_ICE); + block(OBlocks.SEPULCHER); + for (Supplier blocks : OBlocks.WAXED_CONRETE_POWDER) { withExistingParent(blockName(blocks), "minecraft:block/" + blockName(blocks).replace("waxed_", "")); } diff --git a/src/main/java/galena/oreganized/data/OLootTables.java b/src/main/java/galena/oreganized/data/OLootTables.java index 55074762..3d13bfb3 100644 --- a/src/main/java/galena/oreganized/data/OLootTables.java +++ b/src/main/java/galena/oreganized/data/OLootTables.java @@ -127,6 +127,8 @@ protected void generate() { for (Supplier blocks : OBlocks.WAXED_CONRETE_POWDER) { dropSelf(blocks); } + + dropSelf(OBlocks.SEPULCHER); } private void grooved(Supplier block, Block other) { diff --git a/src/main/java/galena/oreganized/data/provider/OBlockStateProvider.java b/src/main/java/galena/oreganized/data/provider/OBlockStateProvider.java index ac848fe4..32a04315 100644 --- a/src/main/java/galena/oreganized/data/provider/OBlockStateProvider.java +++ b/src/main/java/galena/oreganized/data/provider/OBlockStateProvider.java @@ -376,6 +376,10 @@ public void gargoyleBlock(Supplier block) { }); } + public void sepulcherBlock(Supplier block) { + simpleBlock(block.get(), models().getExistingFile(blockTexture(block.get()))); + } + public void crate(Supplier block) { var name = name(block); simpleBlock(block.get(), models().cubeBottomTop( diff --git a/src/main/java/galena/oreganized/index/OBlocks.java b/src/main/java/galena/oreganized/index/OBlocks.java index 985a7569..a940b898 100644 --- a/src/main/java/galena/oreganized/index/OBlocks.java +++ b/src/main/java/galena/oreganized/index/OBlocks.java @@ -198,6 +198,8 @@ private static BlockBehaviour.Properties leadDecoProperties() { new MoltenLeadBlock(OFluids.MOLTEN_LEAD, BlockBehaviour.Properties.copy(Blocks.LAVA).mapColor(MapColor.COLOR_PURPLE))); public static final RegistryObject MOLTEN_LEAD_CAULDRON = HELPER.createBlock("molten_lead_cauldron", () -> new MoltenLeadCauldronBlock(BlockBehaviour.Properties.copy(Blocks.LAVA_CAULDRON).randomTicks())); + public static final RegistryObject SEPULCHER = register("sepulcher", () -> new Block(BlockBehaviour.Properties.copy(Blocks.CAULDRON))); + public static RegistryObject baseRegister(String name, Supplier block, Function, Supplier> item) { RegistryObject register = HELPER.createBlockNoItem(name, block); OItems.HELPER.createItem(name, item.apply(register)); diff --git a/src/main/resources/assets/oreganized/models/block/sepulcher.json b/src/main/resources/assets/oreganized/models/block/sepulcher.json index 0b3eb9ac..a01af8c3 100644 --- a/src/main/resources/assets/oreganized/models/block/sepulcher.json +++ b/src/main/resources/assets/oreganized/models/block/sepulcher.json @@ -1,9 +1,10 @@ { "credit": "Made with Blockbench", + "parent": "block/block", "texture_size": [32, 32], "textures": { - "0": "Sepulcher", - "particle": "Sepulcher" + "0": "oreganized:block/sepulcher", + "particle": "oreganized:block/sepulcher" }, "elements": [ { diff --git a/src/main/resources/assets/oreganized/models/block/sepulcher_being_filled_1.json b/src/main/resources/assets/oreganized/models/block/sepulcher_being_filled_1.json index e810964b..16e54528 100644 --- a/src/main/resources/assets/oreganized/models/block/sepulcher_being_filled_1.json +++ b/src/main/resources/assets/oreganized/models/block/sepulcher_being_filled_1.json @@ -1,11 +1,12 @@ { "credit": "Made with Blockbench", + "parent": "block/block", "texture_size": [32, 32], "textures": { - "0": "Sepulcher", - "1": "sepulcher_empty", - "2": "sepulcher_rot_1", - "particle": "Sepulcher" + "0": "oreganized:block/sepulcher", + "1": "oreganized:block/sepulcher_empty", + "2": "oreganized:block/sepulcher_rot_1", + "particle": "oreganized:block/sepulcher" }, "elements": [ { diff --git a/src/main/resources/assets/oreganized/models/block/sepulcher_being_filled_10.json b/src/main/resources/assets/oreganized/models/block/sepulcher_being_filled_10.json index a330094e..e447c0de 100644 --- a/src/main/resources/assets/oreganized/models/block/sepulcher_being_filled_10.json +++ b/src/main/resources/assets/oreganized/models/block/sepulcher_being_filled_10.json @@ -2,10 +2,10 @@ "credit": "Made with Blockbench", "texture_size": [32, 32], "textures": { - "0": "Sepulcher", - "1": "sepulcher_05", - "2": "sepulcher_rot_1", - "particle": "Sepulcher" + "0": "oreganized:block/sepulcher", + "1": "oreganized:block/sepulcher_05", + "2": "oreganized:block/sepulcher_rot_1", + "particle": "oreganized:block/sepulcher" }, "elements": [ { diff --git a/src/main/resources/assets/oreganized/models/block/sepulcher_being_filled_11.json b/src/main/resources/assets/oreganized/models/block/sepulcher_being_filled_11.json index 16a03555..1b5e3a31 100644 --- a/src/main/resources/assets/oreganized/models/block/sepulcher_being_filled_11.json +++ b/src/main/resources/assets/oreganized/models/block/sepulcher_being_filled_11.json @@ -2,10 +2,10 @@ "credit": "Made with Blockbench", "texture_size": [32, 32], "textures": { - "0": "Sepulcher", - "1": "sepulcher_06", - "2": "sepulcher_rot_1", - "particle": "Sepulcher" + "0": "oreganized:block/sepulcher", + "1": "oreganized:block/sepulcher_06", + "2": "oreganized:block/sepulcher_rot_1", + "particle": "oreganized:block/sepulcher" }, "elements": [ { diff --git a/src/main/resources/assets/oreganized/models/block/sepulcher_being_filled_12.json b/src/main/resources/assets/oreganized/models/block/sepulcher_being_filled_12.json index d6056ebe..e75eeba2 100644 --- a/src/main/resources/assets/oreganized/models/block/sepulcher_being_filled_12.json +++ b/src/main/resources/assets/oreganized/models/block/sepulcher_being_filled_12.json @@ -1,11 +1,12 @@ { "credit": "Made with Blockbench", + "parent": "block/block", "texture_size": [32, 32], "textures": { - "0": "Sepulcher", - "1": "sepulcher_06", - "2": "sepulcher_rot_1", - "particle": "Sepulcher" + "0": "oreganized:block/sepulcher", + "1": "oreganized:block/sepulcher_06", + "2": "oreganized:block/sepulcher_rot_1", + "particle": "oreganized:block/sepulcher" }, "elements": [ { diff --git a/src/main/resources/assets/oreganized/models/block/sepulcher_being_filled_13.json b/src/main/resources/assets/oreganized/models/block/sepulcher_being_filled_13.json index e1325f45..33649b63 100644 --- a/src/main/resources/assets/oreganized/models/block/sepulcher_being_filled_13.json +++ b/src/main/resources/assets/oreganized/models/block/sepulcher_being_filled_13.json @@ -1,11 +1,12 @@ { "credit": "Made with Blockbench", + "parent": "block/block", "texture_size": [32, 32], "textures": { - "0": "Sepulcher", - "1": "sepulcher_07", - "2": "sepulcher_rot_2", - "particle": "Sepulcher" + "0": "oreganized:block/sepulcher", + "1": "oreganized:block/sepulcher_07", + "2": "oreganized:block/sepulcher_rot_2", + "particle": "oreganized:block/sepulcher" }, "elements": [ { diff --git a/src/main/resources/assets/oreganized/models/block/sepulcher_being_filled_2.json b/src/main/resources/assets/oreganized/models/block/sepulcher_being_filled_2.json index 89945565..b8dc9e14 100644 --- a/src/main/resources/assets/oreganized/models/block/sepulcher_being_filled_2.json +++ b/src/main/resources/assets/oreganized/models/block/sepulcher_being_filled_2.json @@ -2,10 +2,10 @@ "credit": "Made with Blockbench", "texture_size": [32, 32], "textures": { - "0": "Sepulcher", - "1": "sepulcher_empty", - "2": "sepulcher_rot_1", - "particle": "Sepulcher" + "0": "oreganized:block/sepulcher", + "1": "oreganized:block/sepulcher_empty", + "2": "oreganized:block/sepulcher_rot_1", + "particle": "oreganized:block/sepulcher" }, "elements": [ { diff --git a/src/main/resources/assets/oreganized/models/block/sepulcher_being_filled_3.json b/src/main/resources/assets/oreganized/models/block/sepulcher_being_filled_3.json index e5ff467a..d0e0a7c6 100644 --- a/src/main/resources/assets/oreganized/models/block/sepulcher_being_filled_3.json +++ b/src/main/resources/assets/oreganized/models/block/sepulcher_being_filled_3.json @@ -2,10 +2,10 @@ "credit": "Made with Blockbench", "texture_size": [32, 32], "textures": { - "0": "Sepulcher", - "1": "sepulcher_empty", - "2": "sepulcher_rot_1", - "particle": "Sepulcher" + "0": "oreganized:block/sepulcher", + "1": "oreganized:block/sepulcher_empty", + "2": "oreganized:block/sepulcher_rot_1", + "particle": "oreganized:block/sepulcher" }, "elements": [ { diff --git a/src/main/resources/assets/oreganized/models/block/sepulcher_being_filled_4.json b/src/main/resources/assets/oreganized/models/block/sepulcher_being_filled_4.json index 71241c18..0fc1373c 100644 --- a/src/main/resources/assets/oreganized/models/block/sepulcher_being_filled_4.json +++ b/src/main/resources/assets/oreganized/models/block/sepulcher_being_filled_4.json @@ -2,10 +2,10 @@ "credit": "Made with Blockbench", "texture_size": [32, 32], "textures": { - "0": "Sepulcher", - "1": "sepulcher_01", - "2": "sepulcher_rot_1", - "particle": "Sepulcher" + "0": "oreganized:block/sepulcher", + "1": "oreganized:block/sepulcher_01", + "2": "oreganized:block/sepulcher_rot_1", + "particle": "oreganized:block/sepulcher" }, "elements": [ { diff --git a/src/main/resources/assets/oreganized/models/block/sepulcher_being_filled_5.json b/src/main/resources/assets/oreganized/models/block/sepulcher_being_filled_5.json index 95065f50..d3099e95 100644 --- a/src/main/resources/assets/oreganized/models/block/sepulcher_being_filled_5.json +++ b/src/main/resources/assets/oreganized/models/block/sepulcher_being_filled_5.json @@ -1,11 +1,12 @@ { "credit": "Made with Blockbench", + "parent": "block/block", "texture_size": [32, 32], "textures": { - "0": "Sepulcher", - "1": "sepulcher_02", - "2": "sepulcher_rot_1", - "particle": "Sepulcher" + "0": "oreganized:block/sepulcher", + "1": "oreganized:block/sepulcher_02", + "2": "oreganized:block/sepulcher_rot_1", + "particle": "oreganized:block/sepulcher" }, "elements": [ { diff --git a/src/main/resources/assets/oreganized/models/block/sepulcher_being_filled_6.json b/src/main/resources/assets/oreganized/models/block/sepulcher_being_filled_6.json index 125a893c..68d29d95 100644 --- a/src/main/resources/assets/oreganized/models/block/sepulcher_being_filled_6.json +++ b/src/main/resources/assets/oreganized/models/block/sepulcher_being_filled_6.json @@ -2,10 +2,10 @@ "credit": "Made with Blockbench", "texture_size": [32, 32], "textures": { - "0": "Sepulcher", - "1": "sepulcher_03", - "2": "sepulcher_rot_1", - "particle": "Sepulcher" + "0": "oreganized:block/sepulcher", + "1": "oreganized:block/sepulcher_03", + "2": "oreganized:block/sepulcher_rot_1", + "particle": "oreganized:block/sepulcher" }, "elements": [ { diff --git a/src/main/resources/assets/oreganized/models/block/sepulcher_being_filled_7.json b/src/main/resources/assets/oreganized/models/block/sepulcher_being_filled_7.json index 784e32d7..8af47361 100644 --- a/src/main/resources/assets/oreganized/models/block/sepulcher_being_filled_7.json +++ b/src/main/resources/assets/oreganized/models/block/sepulcher_being_filled_7.json @@ -2,10 +2,10 @@ "credit": "Made with Blockbench", "texture_size": [32, 32], "textures": { - "0": "Sepulcher", - "1": "sepulcher_03", - "2": "sepulcher_rot_1", - "particle": "Sepulcher" + "0": "oreganized:block/sepulcher", + "1": "oreganized:block/sepulcher_03", + "2": "oreganized:block/sepulcher_rot_1", + "particle": "oreganized:block/sepulcher" }, "elements": [ { diff --git a/src/main/resources/assets/oreganized/models/block/sepulcher_being_filled_8.json b/src/main/resources/assets/oreganized/models/block/sepulcher_being_filled_8.json index 0eca6ffb..c09ef53b 100644 --- a/src/main/resources/assets/oreganized/models/block/sepulcher_being_filled_8.json +++ b/src/main/resources/assets/oreganized/models/block/sepulcher_being_filled_8.json @@ -2,10 +2,10 @@ "credit": "Made with Blockbench", "texture_size": [32, 32], "textures": { - "0": "Sepulcher", - "1": "sepulcher_04", - "2": "sepulcher_rot_1", - "particle": "Sepulcher" + "0": "oreganized:block/sepulcher", + "1": "oreganized:block/sepulcher_04", + "2": "oreganized:block/sepulcher_rot_1", + "particle": "oreganized:block/sepulcher" }, "elements": [ { diff --git a/src/main/resources/assets/oreganized/models/block/sepulcher_being_filled_9.json b/src/main/resources/assets/oreganized/models/block/sepulcher_being_filled_9.json index 610c87da..b7d6535e 100644 --- a/src/main/resources/assets/oreganized/models/block/sepulcher_being_filled_9.json +++ b/src/main/resources/assets/oreganized/models/block/sepulcher_being_filled_9.json @@ -2,10 +2,10 @@ "credit": "Made with Blockbench", "texture_size": [32, 32], "textures": { - "0": "Sepulcher", - "1": "sepulcher_04", - "2": "sepulcher_rot_1", - "particle": "Sepulcher" + "0": "oreganized:block/sepulcher", + "1": "oreganized:block/sepulcher_04", + "2": "oreganized:block/sepulcher_rot_1", + "particle": "oreganized:block/sepulcher" }, "elements": [ { diff --git a/src/main/resources/assets/oreganized/models/block/sepulcher_sealed_1.json b/src/main/resources/assets/oreganized/models/block/sepulcher_sealed_1.json index b835511c..1974fe08 100644 --- a/src/main/resources/assets/oreganized/models/block/sepulcher_sealed_1.json +++ b/src/main/resources/assets/oreganized/models/block/sepulcher_sealed_1.json @@ -1,11 +1,12 @@ { "credit": "Made with Blockbench", + "parent": "block/block", "texture_size": [32, 32], "textures": { - "0": "Sepulcher", - "1": "sepulcher_07", - "2": "sepulcher_rot_1", - "particle": "Sepulcher" + "0": "oreganized:block/sepulcher", + "1": "oreganized:block/sepulcher_07", + "2": "oreganized:block/sepulcher_rot_1", + "particle": "oreganized:block/sepulcher" }, "elements": [ { diff --git a/src/main/resources/assets/oreganized/models/block/sepulcher_sealed_2.json b/src/main/resources/assets/oreganized/models/block/sepulcher_sealed_2.json index 4972f113..fdc8d171 100644 --- a/src/main/resources/assets/oreganized/models/block/sepulcher_sealed_2.json +++ b/src/main/resources/assets/oreganized/models/block/sepulcher_sealed_2.json @@ -1,11 +1,12 @@ { "credit": "Made with Blockbench", + "parent": "block/block", "texture_size": [32, 32], "textures": { - "0": "Sepulcher", - "1": "sepulcher_06", - "2": "sepulcher_rot_2", - "particle": "Sepulcher" + "0": "oreganized:block/sepulcher", + "1": "oreganized:block/sepulcher_06", + "2": "oreganized:block/sepulcher_rot_2", + "particle": "oreganized:block/sepulcher" }, "elements": [ { diff --git a/src/main/resources/assets/oreganized/models/block/sepulcher_sealed_3.json b/src/main/resources/assets/oreganized/models/block/sepulcher_sealed_3.json index f1db21e8..a35f8048 100644 --- a/src/main/resources/assets/oreganized/models/block/sepulcher_sealed_3.json +++ b/src/main/resources/assets/oreganized/models/block/sepulcher_sealed_3.json @@ -2,10 +2,10 @@ "credit": "Made with Blockbench", "texture_size": [32, 32], "textures": { - "0": "Sepulcher", - "1": "sepulcher_05", - "2": "sepulcher_rot_3", - "particle": "Sepulcher" + "0": "oreganized:block/sepulcher", + "1": "oreganized:block/sepulcher_05", + "2": "oreganized:block/sepulcher_rot_3", + "particle": "oreganized:block/sepulcher" }, "elements": [ { diff --git a/src/main/resources/assets/oreganized/models/block/sepulcher_sealed_4.json b/src/main/resources/assets/oreganized/models/block/sepulcher_sealed_4.json index e2c8a4c0..0d5c4cb2 100644 --- a/src/main/resources/assets/oreganized/models/block/sepulcher_sealed_4.json +++ b/src/main/resources/assets/oreganized/models/block/sepulcher_sealed_4.json @@ -1,11 +1,12 @@ { "credit": "Made with Blockbench", + "parent": "block/block", "texture_size": [32, 32], "textures": { - "0": "Sepulcher", - "1": "sepulcher_04", - "2": "sepulcher_rot_4", - "particle": "Sepulcher" + "0": "oreganized:block/sepulcher", + "1": "oreganized:block/sepulcher_04", + "2": "oreganized:block/sepulcher_rot_4", + "particle": "oreganized:block/sepulcher" }, "elements": [ { diff --git a/src/main/resources/assets/oreganized/models/block/sepulcher_sealed_5.json b/src/main/resources/assets/oreganized/models/block/sepulcher_sealed_5.json index fd95564f..2dee6296 100644 --- a/src/main/resources/assets/oreganized/models/block/sepulcher_sealed_5.json +++ b/src/main/resources/assets/oreganized/models/block/sepulcher_sealed_5.json @@ -1,11 +1,12 @@ { "credit": "Made with Blockbench", + "parent": "block/block", "texture_size": [32, 32], "textures": { - "0": "Sepulcher", - "1": "sepulcher_bones", - "2": "sepulcher_rot_5", - "particle": "Sepulcher" + "0": "oreganized:block/sepulcher", + "1": "oreganized:block/sepulcher_bones", + "2": "oreganized:block/sepulcher_rot_5", + "particle": "oreganized:block/sepulcher" }, "elements": [ { From 4219bffa919dd7752ddaff34ac12145743cee21c Mon Sep 17 00:00:00 2001 From: Niklas Widmann Date: Mon, 14 Oct 2024 22:59:10 +0200 Subject: [PATCH 02/11] add vigil candles without functionality --- .../002701d48eee4c36b62b24b011e74b0624793d05 | 155 +++++++++++++++++- .../4d87f6c700406347abbc935fa7e5d5e893a595b5 | 19 ++- .../5bb646c3cee204f41a1b59a2c0d9083b5f7155b0 | 4 +- .../9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e | 68 +++++++- .../blockstates/black_vigil_candle.json | 28 ++++ .../blockstates/blue_vigil_candle.json | 28 ++++ .../blockstates/brown_vigil_candle.json | 28 ++++ .../blockstates/cyan_vigil_candle.json | 28 ++++ .../blockstates/gray_vigil_candle.json | 28 ++++ .../blockstates/green_vigil_candle.json | 28 ++++ .../blockstates/light_blue_vigil_candle.json | 28 ++++ .../blockstates/light_gray_vigil_candle.json | 28 ++++ .../blockstates/lime_vigil_candle.json | 28 ++++ .../blockstates/magenta_vigil_candle.json | 28 ++++ .../blockstates/orange_vigil_candle.json | 28 ++++ .../blockstates/pink_vigil_candle.json | 28 ++++ .../blockstates/purple_vigil_candle.json | 28 ++++ .../blockstates/red_vigil_candle.json | 28 ++++ .../oreganized/blockstates/vigil_candle.json | 28 ++++ .../blockstates/white_vigil_candle.json | 28 ++++ .../blockstates/yellow_vigil_candle.json | 28 ++++ .../assets/oreganized/lang/en_us.json | 17 ++ .../block/black_vigil_candle_double.json | 6 + .../black_vigil_candle_double_ceiling.json | 6 + .../block/black_vigil_candle_quadruple.json | 6 + .../black_vigil_candle_quadruple_ceiling.json | 6 + .../block/black_vigil_candle_single.json | 6 + .../black_vigil_candle_single_ceiling.json | 6 + .../block/black_vigil_candle_triple.json | 6 + .../black_vigil_candle_triple_ceiling.json | 6 + .../block/blue_vigil_candle_double.json | 6 + .../blue_vigil_candle_double_ceiling.json | 6 + .../block/blue_vigil_candle_quadruple.json | 6 + .../blue_vigil_candle_quadruple_ceiling.json | 6 + .../block/blue_vigil_candle_single.json | 6 + .../blue_vigil_candle_single_ceiling.json | 6 + .../block/blue_vigil_candle_triple.json | 6 + .../blue_vigil_candle_triple_ceiling.json | 6 + .../block/brown_vigil_candle_double.json | 6 + .../brown_vigil_candle_double_ceiling.json | 6 + .../block/brown_vigil_candle_quadruple.json | 6 + .../brown_vigil_candle_quadruple_ceiling.json | 6 + .../block/brown_vigil_candle_single.json | 6 + .../brown_vigil_candle_single_ceiling.json | 6 + .../block/brown_vigil_candle_triple.json | 6 + .../brown_vigil_candle_triple_ceiling.json | 6 + .../block/cyan_vigil_candle_double.json | 6 + .../cyan_vigil_candle_double_ceiling.json | 6 + .../block/cyan_vigil_candle_quadruple.json | 6 + .../cyan_vigil_candle_quadruple_ceiling.json | 6 + .../block/cyan_vigil_candle_single.json | 6 + .../cyan_vigil_candle_single_ceiling.json | 6 + .../block/cyan_vigil_candle_triple.json | 6 + .../cyan_vigil_candle_triple_ceiling.json | 6 + .../block/defaultvigil_candle_double.json | 6 + .../defaultvigil_candle_double_ceiling.json | 6 + .../block/defaultvigil_candle_quadruple.json | 6 + ...defaultvigil_candle_quadruple_ceiling.json | 6 + .../block/defaultvigil_candle_single.json | 6 + .../defaultvigil_candle_single_ceiling.json | 6 + .../block/defaultvigil_candle_triple.json | 6 + .../defaultvigil_candle_triple_ceiling.json | 6 + .../block/gray_vigil_candle_double.json | 6 + .../gray_vigil_candle_double_ceiling.json | 6 + .../block/gray_vigil_candle_quadruple.json | 6 + .../gray_vigil_candle_quadruple_ceiling.json | 6 + .../block/gray_vigil_candle_single.json | 6 + .../gray_vigil_candle_single_ceiling.json | 6 + .../block/gray_vigil_candle_triple.json | 6 + .../gray_vigil_candle_triple_ceiling.json | 6 + .../block/green_vigil_candle_double.json | 6 + .../green_vigil_candle_double_ceiling.json | 6 + .../block/green_vigil_candle_quadruple.json | 6 + .../green_vigil_candle_quadruple_ceiling.json | 6 + .../block/green_vigil_candle_single.json | 6 + .../green_vigil_candle_single_ceiling.json | 6 + .../block/green_vigil_candle_triple.json | 6 + .../green_vigil_candle_triple_ceiling.json | 6 + .../block/light_blue_vigil_candle_double.json | 6 + ...ight_blue_vigil_candle_double_ceiling.json | 6 + .../light_blue_vigil_candle_quadruple.json | 6 + ...t_blue_vigil_candle_quadruple_ceiling.json | 6 + .../block/light_blue_vigil_candle_single.json | 6 + ...ight_blue_vigil_candle_single_ceiling.json | 6 + .../block/light_blue_vigil_candle_triple.json | 6 + ...ight_blue_vigil_candle_triple_ceiling.json | 6 + .../block/light_gray_vigil_candle_double.json | 6 + ...ight_gray_vigil_candle_double_ceiling.json | 6 + .../light_gray_vigil_candle_quadruple.json | 6 + ...t_gray_vigil_candle_quadruple_ceiling.json | 6 + .../block/light_gray_vigil_candle_single.json | 6 + ...ight_gray_vigil_candle_single_ceiling.json | 6 + .../block/light_gray_vigil_candle_triple.json | 6 + ...ight_gray_vigil_candle_triple_ceiling.json | 6 + .../block/lime_vigil_candle_double.json | 6 + .../lime_vigil_candle_double_ceiling.json | 6 + .../block/lime_vigil_candle_quadruple.json | 6 + .../lime_vigil_candle_quadruple_ceiling.json | 6 + .../block/lime_vigil_candle_single.json | 6 + .../lime_vigil_candle_single_ceiling.json | 6 + .../block/lime_vigil_candle_triple.json | 6 + .../lime_vigil_candle_triple_ceiling.json | 6 + .../block/magenta_vigil_candle_double.json | 6 + .../magenta_vigil_candle_double_ceiling.json | 6 + .../block/magenta_vigil_candle_quadruple.json | 6 + ...agenta_vigil_candle_quadruple_ceiling.json | 6 + .../block/magenta_vigil_candle_single.json | 6 + .../magenta_vigil_candle_single_ceiling.json | 6 + .../block/magenta_vigil_candle_triple.json | 6 + .../magenta_vigil_candle_triple_ceiling.json | 6 + .../block/orange_vigil_candle_double.json | 6 + .../orange_vigil_candle_double_ceiling.json | 6 + .../block/orange_vigil_candle_quadruple.json | 6 + ...orange_vigil_candle_quadruple_ceiling.json | 6 + .../block/orange_vigil_candle_single.json | 6 + .../orange_vigil_candle_single_ceiling.json | 6 + .../block/orange_vigil_candle_triple.json | 6 + .../orange_vigil_candle_triple_ceiling.json | 6 + .../block/pink_vigil_candle_double.json | 6 + .../pink_vigil_candle_double_ceiling.json | 6 + .../block/pink_vigil_candle_quadruple.json | 6 + .../pink_vigil_candle_quadruple_ceiling.json | 6 + .../block/pink_vigil_candle_single.json | 6 + .../pink_vigil_candle_single_ceiling.json | 6 + .../block/pink_vigil_candle_triple.json | 6 + .../pink_vigil_candle_triple_ceiling.json | 6 + .../block/purple_vigil_candle_double.json | 6 + .../purple_vigil_candle_double_ceiling.json | 6 + .../block/purple_vigil_candle_quadruple.json | 6 + ...purple_vigil_candle_quadruple_ceiling.json | 6 + .../block/purple_vigil_candle_single.json | 6 + .../purple_vigil_candle_single_ceiling.json | 6 + .../block/purple_vigil_candle_triple.json | 6 + .../purple_vigil_candle_triple_ceiling.json | 6 + .../models/block/red_vigil_candle_double.json | 6 + .../red_vigil_candle_double_ceiling.json | 6 + .../block/red_vigil_candle_quadruple.json | 6 + .../red_vigil_candle_quadruple_ceiling.json | 6 + .../models/block/red_vigil_candle_single.json | 6 + .../red_vigil_candle_single_ceiling.json | 6 + .../models/block/red_vigil_candle_triple.json | 6 + .../red_vigil_candle_triple_ceiling.json | 6 + .../block/white_vigil_candle_double.json | 6 + .../white_vigil_candle_double_ceiling.json | 6 + .../block/white_vigil_candle_quadruple.json | 6 + .../white_vigil_candle_quadruple_ceiling.json | 6 + .../block/white_vigil_candle_single.json | 6 + .../white_vigil_candle_single_ceiling.json | 6 + .../block/white_vigil_candle_triple.json | 6 + .../white_vigil_candle_triple_ceiling.json | 6 + .../block/yellow_vigil_candle_double.json | 6 + .../yellow_vigil_candle_double_ceiling.json | 6 + .../block/yellow_vigil_candle_quadruple.json | 6 + ...yellow_vigil_candle_quadruple_ceiling.json | 6 + .../block/yellow_vigil_candle_single.json | 6 + .../yellow_vigil_candle_single_ceiling.json | 6 + .../block/yellow_vigil_candle_triple.json | 6 + .../yellow_vigil_candle_triple_ceiling.json | 6 + .../models/item/black_vigil_candle.json | 6 + .../models/item/blue_vigil_candle.json | 6 + .../models/item/brown_vigil_candle.json | 6 + .../models/item/cyan_vigil_candle.json | 6 + .../models/item/gray_vigil_candle.json | 6 + .../models/item/green_vigil_candle.json | 6 + .../models/item/light_blue_vigil_candle.json | 6 + .../models/item/light_gray_vigil_candle.json | 6 + .../models/item/lime_vigil_candle.json | 6 + .../models/item/magenta_vigil_candle.json | 6 + .../models/item/orange_vigil_candle.json | 6 + .../models/item/pink_vigil_candle.json | 6 + .../models/item/purple_vigil_candle.json | 6 + .../models/item/red_vigil_candle.json | 6 + .../oreganized/models/item/vigil_candle.json | 6 + .../models/item/white_vigil_candle.json | 6 + .../models/item/yellow_vigil_candle.json | 6 + .../tags/blocks/mineable/pickaxe.json | 19 ++- .../building_blocks/black_vigil_candle.json | 33 ++++ .../black_vigil_candle_dyeing.json | 35 ++++ .../building_blocks/blue_vigil_candle.json | 33 ++++ .../blue_vigil_candle_dyeing.json | 35 ++++ .../building_blocks/brown_vigil_candle.json | 33 ++++ .../brown_vigil_candle_dyeing.json | 35 ++++ .../building_blocks/cyan_vigil_candle.json | 33 ++++ .../cyan_vigil_candle_dyeing.json | 35 ++++ .../building_blocks/gray_vigil_candle.json | 33 ++++ .../gray_vigil_candle_dyeing.json | 35 ++++ .../building_blocks/green_vigil_candle.json | 33 ++++ .../green_vigil_candle_dyeing.json | 35 ++++ .../light_blue_vigil_candle.json | 33 ++++ .../light_blue_vigil_candle_dyeing.json | 35 ++++ .../light_gray_vigil_candle.json | 33 ++++ .../light_gray_vigil_candle_dyeing.json | 35 ++++ .../building_blocks/lime_vigil_candle.json | 33 ++++ .../lime_vigil_candle_dyeing.json | 35 ++++ .../building_blocks/magenta_vigil_candle.json | 33 ++++ .../magenta_vigil_candle_dyeing.json | 35 ++++ .../building_blocks/orange_vigil_candle.json | 33 ++++ .../orange_vigil_candle_dyeing.json | 35 ++++ .../building_blocks/pink_vigil_candle.json | 33 ++++ .../pink_vigil_candle_dyeing.json | 35 ++++ .../building_blocks/purple_vigil_candle.json | 33 ++++ .../purple_vigil_candle_dyeing.json | 35 ++++ .../building_blocks/red_vigil_candle.json | 33 ++++ .../red_vigil_candle_dyeing.json | 35 ++++ .../recipes/building_blocks/vigil_candle.json | 33 ++++ .../building_blocks/white_vigil_candle.json | 33 ++++ .../white_vigil_candle_dyeing.json | 35 ++++ .../building_blocks/yellow_vigil_candle.json | 33 ++++ .../yellow_vigil_candle_dyeing.json | 35 ++++ .../blocks/black_vigil_candle.json | 63 +++++++ .../loot_tables/blocks/blue_vigil_candle.json | 63 +++++++ .../blocks/brown_vigil_candle.json | 63 +++++++ .../loot_tables/blocks/cyan_vigil_candle.json | 63 +++++++ .../loot_tables/blocks/gray_vigil_candle.json | 63 +++++++ .../blocks/green_vigil_candle.json | 63 +++++++ .../blocks/light_blue_vigil_candle.json | 63 +++++++ .../blocks/light_gray_vigil_candle.json | 63 +++++++ .../loot_tables/blocks/lime_vigil_candle.json | 63 +++++++ .../blocks/magenta_vigil_candle.json | 63 +++++++ .../blocks/orange_vigil_candle.json | 63 +++++++ .../loot_tables/blocks/pink_vigil_candle.json | 63 +++++++ .../blocks/purple_vigil_candle.json | 63 +++++++ .../loot_tables/blocks/red_vigil_candle.json | 63 +++++++ .../loot_tables/blocks/vigil_candle.json | 63 +++++++ .../blocks/white_vigil_candle.json | 63 +++++++ .../blocks/yellow_vigil_candle.json | 63 +++++++ .../recipes/black_vigil_candle.json | 21 +++ .../recipes/black_vigil_candle_dyeing.json | 16 ++ .../oreganized/recipes/blue_vigil_candle.json | 21 +++ .../recipes/blue_vigil_candle_dyeing.json | 16 ++ .../recipes/brown_vigil_candle.json | 21 +++ .../recipes/brown_vigil_candle_dyeing.json | 16 ++ .../oreganized/recipes/cyan_vigil_candle.json | 21 +++ .../recipes/cyan_vigil_candle_dyeing.json | 16 ++ .../oreganized/recipes/gray_vigil_candle.json | 21 +++ .../recipes/gray_vigil_candle_dyeing.json | 16 ++ .../recipes/green_vigil_candle.json | 21 +++ .../recipes/green_vigil_candle_dyeing.json | 16 ++ .../recipes/light_blue_vigil_candle.json | 21 +++ .../light_blue_vigil_candle_dyeing.json | 16 ++ .../recipes/light_gray_vigil_candle.json | 21 +++ .../light_gray_vigil_candle_dyeing.json | 16 ++ .../oreganized/recipes/lime_vigil_candle.json | 21 +++ .../recipes/lime_vigil_candle_dyeing.json | 16 ++ .../recipes/magenta_vigil_candle.json | 21 +++ .../recipes/magenta_vigil_candle_dyeing.json | 16 ++ .../recipes/orange_vigil_candle.json | 21 +++ .../recipes/orange_vigil_candle_dyeing.json | 16 ++ .../oreganized/recipes/pink_vigil_candle.json | 21 +++ .../recipes/pink_vigil_candle_dyeing.json | 16 ++ .../recipes/purple_vigil_candle.json | 21 +++ .../recipes/purple_vigil_candle_dyeing.json | 16 ++ .../oreganized/recipes/red_vigil_candle.json | 21 +++ .../recipes/red_vigil_candle_dyeing.json | 16 ++ .../data/oreganized/recipes/vigil_candle.json | 21 +++ .../recipes/white_vigil_candle.json | 21 +++ .../recipes/white_vigil_candle_dyeing.json | 16 ++ .../recipes/yellow_vigil_candle.json | 21 +++ .../recipes/yellow_vigil_candle_dyeing.json | 16 ++ .../java/galena/oreganized/Oreganized.java | 2 + .../oreganized/client/OreganizedClient.java | 3 + .../content/block/VigilCandleBlock.java | 102 ++++++++++++ .../galena/oreganized/data/OBlockStates.java | 2 + .../galena/oreganized/data/OBlockTags.java | 8 +- .../galena/oreganized/data/OItemModels.java | 3 + .../galena/oreganized/data/OLootTables.java | 3 + .../java/galena/oreganized/data/ORecipes.java | 18 ++ .../data/provider/OBlockLootProvider.java | 5 + .../data/provider/OBlockStateProvider.java | 37 +++++ .../data/provider/OItemModelProvider.java | 10 +- .../data/provider/ORecipeProvider.java | 11 ++ .../java/galena/oreganized/index/OBlocks.java | 16 ++ .../models/block/vigil_candle_double.json | 3 +- .../block/vigil_candle_double_ceiling.json | 3 +- .../models/block/vigil_candle_quadruple.json | 3 +- .../block/vigil_candle_quadruple_ceiling.json | 3 +- .../models/block/vigil_candle_single.json | 11 +- .../block/vigil_candle_single_ceiling.json | 3 +- .../models/block/vigil_candle_triple.json | 3 +- .../block/vigil_candle_triple_ceiling.json | 3 +- 280 files changed, 4703 insertions(+), 30 deletions(-) create mode 100644 src/generated/resources/assets/oreganized/blockstates/black_vigil_candle.json create mode 100644 src/generated/resources/assets/oreganized/blockstates/blue_vigil_candle.json create mode 100644 src/generated/resources/assets/oreganized/blockstates/brown_vigil_candle.json create mode 100644 src/generated/resources/assets/oreganized/blockstates/cyan_vigil_candle.json create mode 100644 src/generated/resources/assets/oreganized/blockstates/gray_vigil_candle.json create mode 100644 src/generated/resources/assets/oreganized/blockstates/green_vigil_candle.json create mode 100644 src/generated/resources/assets/oreganized/blockstates/light_blue_vigil_candle.json create mode 100644 src/generated/resources/assets/oreganized/blockstates/light_gray_vigil_candle.json create mode 100644 src/generated/resources/assets/oreganized/blockstates/lime_vigil_candle.json create mode 100644 src/generated/resources/assets/oreganized/blockstates/magenta_vigil_candle.json create mode 100644 src/generated/resources/assets/oreganized/blockstates/orange_vigil_candle.json create mode 100644 src/generated/resources/assets/oreganized/blockstates/pink_vigil_candle.json create mode 100644 src/generated/resources/assets/oreganized/blockstates/purple_vigil_candle.json create mode 100644 src/generated/resources/assets/oreganized/blockstates/red_vigil_candle.json create mode 100644 src/generated/resources/assets/oreganized/blockstates/vigil_candle.json create mode 100644 src/generated/resources/assets/oreganized/blockstates/white_vigil_candle.json create mode 100644 src/generated/resources/assets/oreganized/blockstates/yellow_vigil_candle.json create mode 100644 src/generated/resources/assets/oreganized/models/block/black_vigil_candle_double.json create mode 100644 src/generated/resources/assets/oreganized/models/block/black_vigil_candle_double_ceiling.json create mode 100644 src/generated/resources/assets/oreganized/models/block/black_vigil_candle_quadruple.json create mode 100644 src/generated/resources/assets/oreganized/models/block/black_vigil_candle_quadruple_ceiling.json create mode 100644 src/generated/resources/assets/oreganized/models/block/black_vigil_candle_single.json create mode 100644 src/generated/resources/assets/oreganized/models/block/black_vigil_candle_single_ceiling.json create mode 100644 src/generated/resources/assets/oreganized/models/block/black_vigil_candle_triple.json create mode 100644 src/generated/resources/assets/oreganized/models/block/black_vigil_candle_triple_ceiling.json create mode 100644 src/generated/resources/assets/oreganized/models/block/blue_vigil_candle_double.json create mode 100644 src/generated/resources/assets/oreganized/models/block/blue_vigil_candle_double_ceiling.json create mode 100644 src/generated/resources/assets/oreganized/models/block/blue_vigil_candle_quadruple.json create mode 100644 src/generated/resources/assets/oreganized/models/block/blue_vigil_candle_quadruple_ceiling.json create mode 100644 src/generated/resources/assets/oreganized/models/block/blue_vigil_candle_single.json create mode 100644 src/generated/resources/assets/oreganized/models/block/blue_vigil_candle_single_ceiling.json create mode 100644 src/generated/resources/assets/oreganized/models/block/blue_vigil_candle_triple.json create mode 100644 src/generated/resources/assets/oreganized/models/block/blue_vigil_candle_triple_ceiling.json create mode 100644 src/generated/resources/assets/oreganized/models/block/brown_vigil_candle_double.json create mode 100644 src/generated/resources/assets/oreganized/models/block/brown_vigil_candle_double_ceiling.json create mode 100644 src/generated/resources/assets/oreganized/models/block/brown_vigil_candle_quadruple.json create mode 100644 src/generated/resources/assets/oreganized/models/block/brown_vigil_candle_quadruple_ceiling.json create mode 100644 src/generated/resources/assets/oreganized/models/block/brown_vigil_candle_single.json create mode 100644 src/generated/resources/assets/oreganized/models/block/brown_vigil_candle_single_ceiling.json create mode 100644 src/generated/resources/assets/oreganized/models/block/brown_vigil_candle_triple.json create mode 100644 src/generated/resources/assets/oreganized/models/block/brown_vigil_candle_triple_ceiling.json create mode 100644 src/generated/resources/assets/oreganized/models/block/cyan_vigil_candle_double.json create mode 100644 src/generated/resources/assets/oreganized/models/block/cyan_vigil_candle_double_ceiling.json create mode 100644 src/generated/resources/assets/oreganized/models/block/cyan_vigil_candle_quadruple.json create mode 100644 src/generated/resources/assets/oreganized/models/block/cyan_vigil_candle_quadruple_ceiling.json create mode 100644 src/generated/resources/assets/oreganized/models/block/cyan_vigil_candle_single.json create mode 100644 src/generated/resources/assets/oreganized/models/block/cyan_vigil_candle_single_ceiling.json create mode 100644 src/generated/resources/assets/oreganized/models/block/cyan_vigil_candle_triple.json create mode 100644 src/generated/resources/assets/oreganized/models/block/cyan_vigil_candle_triple_ceiling.json create mode 100644 src/generated/resources/assets/oreganized/models/block/defaultvigil_candle_double.json create mode 100644 src/generated/resources/assets/oreganized/models/block/defaultvigil_candle_double_ceiling.json create mode 100644 src/generated/resources/assets/oreganized/models/block/defaultvigil_candle_quadruple.json create mode 100644 src/generated/resources/assets/oreganized/models/block/defaultvigil_candle_quadruple_ceiling.json create mode 100644 src/generated/resources/assets/oreganized/models/block/defaultvigil_candle_single.json create mode 100644 src/generated/resources/assets/oreganized/models/block/defaultvigil_candle_single_ceiling.json create mode 100644 src/generated/resources/assets/oreganized/models/block/defaultvigil_candle_triple.json create mode 100644 src/generated/resources/assets/oreganized/models/block/defaultvigil_candle_triple_ceiling.json create mode 100644 src/generated/resources/assets/oreganized/models/block/gray_vigil_candle_double.json create mode 100644 src/generated/resources/assets/oreganized/models/block/gray_vigil_candle_double_ceiling.json create mode 100644 src/generated/resources/assets/oreganized/models/block/gray_vigil_candle_quadruple.json create mode 100644 src/generated/resources/assets/oreganized/models/block/gray_vigil_candle_quadruple_ceiling.json create mode 100644 src/generated/resources/assets/oreganized/models/block/gray_vigil_candle_single.json create mode 100644 src/generated/resources/assets/oreganized/models/block/gray_vigil_candle_single_ceiling.json create mode 100644 src/generated/resources/assets/oreganized/models/block/gray_vigil_candle_triple.json create mode 100644 src/generated/resources/assets/oreganized/models/block/gray_vigil_candle_triple_ceiling.json create mode 100644 src/generated/resources/assets/oreganized/models/block/green_vigil_candle_double.json create mode 100644 src/generated/resources/assets/oreganized/models/block/green_vigil_candle_double_ceiling.json create mode 100644 src/generated/resources/assets/oreganized/models/block/green_vigil_candle_quadruple.json create mode 100644 src/generated/resources/assets/oreganized/models/block/green_vigil_candle_quadruple_ceiling.json create mode 100644 src/generated/resources/assets/oreganized/models/block/green_vigil_candle_single.json create mode 100644 src/generated/resources/assets/oreganized/models/block/green_vigil_candle_single_ceiling.json create mode 100644 src/generated/resources/assets/oreganized/models/block/green_vigil_candle_triple.json create mode 100644 src/generated/resources/assets/oreganized/models/block/green_vigil_candle_triple_ceiling.json create mode 100644 src/generated/resources/assets/oreganized/models/block/light_blue_vigil_candle_double.json create mode 100644 src/generated/resources/assets/oreganized/models/block/light_blue_vigil_candle_double_ceiling.json create mode 100644 src/generated/resources/assets/oreganized/models/block/light_blue_vigil_candle_quadruple.json create mode 100644 src/generated/resources/assets/oreganized/models/block/light_blue_vigil_candle_quadruple_ceiling.json create mode 100644 src/generated/resources/assets/oreganized/models/block/light_blue_vigil_candle_single.json create mode 100644 src/generated/resources/assets/oreganized/models/block/light_blue_vigil_candle_single_ceiling.json create mode 100644 src/generated/resources/assets/oreganized/models/block/light_blue_vigil_candle_triple.json create mode 100644 src/generated/resources/assets/oreganized/models/block/light_blue_vigil_candle_triple_ceiling.json create mode 100644 src/generated/resources/assets/oreganized/models/block/light_gray_vigil_candle_double.json create mode 100644 src/generated/resources/assets/oreganized/models/block/light_gray_vigil_candle_double_ceiling.json create mode 100644 src/generated/resources/assets/oreganized/models/block/light_gray_vigil_candle_quadruple.json create mode 100644 src/generated/resources/assets/oreganized/models/block/light_gray_vigil_candle_quadruple_ceiling.json create mode 100644 src/generated/resources/assets/oreganized/models/block/light_gray_vigil_candle_single.json create mode 100644 src/generated/resources/assets/oreganized/models/block/light_gray_vigil_candle_single_ceiling.json create mode 100644 src/generated/resources/assets/oreganized/models/block/light_gray_vigil_candle_triple.json create mode 100644 src/generated/resources/assets/oreganized/models/block/light_gray_vigil_candle_triple_ceiling.json create mode 100644 src/generated/resources/assets/oreganized/models/block/lime_vigil_candle_double.json create mode 100644 src/generated/resources/assets/oreganized/models/block/lime_vigil_candle_double_ceiling.json create mode 100644 src/generated/resources/assets/oreganized/models/block/lime_vigil_candle_quadruple.json create mode 100644 src/generated/resources/assets/oreganized/models/block/lime_vigil_candle_quadruple_ceiling.json create mode 100644 src/generated/resources/assets/oreganized/models/block/lime_vigil_candle_single.json create mode 100644 src/generated/resources/assets/oreganized/models/block/lime_vigil_candle_single_ceiling.json create mode 100644 src/generated/resources/assets/oreganized/models/block/lime_vigil_candle_triple.json create mode 100644 src/generated/resources/assets/oreganized/models/block/lime_vigil_candle_triple_ceiling.json create mode 100644 src/generated/resources/assets/oreganized/models/block/magenta_vigil_candle_double.json create mode 100644 src/generated/resources/assets/oreganized/models/block/magenta_vigil_candle_double_ceiling.json create mode 100644 src/generated/resources/assets/oreganized/models/block/magenta_vigil_candle_quadruple.json create mode 100644 src/generated/resources/assets/oreganized/models/block/magenta_vigil_candle_quadruple_ceiling.json create mode 100644 src/generated/resources/assets/oreganized/models/block/magenta_vigil_candle_single.json create mode 100644 src/generated/resources/assets/oreganized/models/block/magenta_vigil_candle_single_ceiling.json create mode 100644 src/generated/resources/assets/oreganized/models/block/magenta_vigil_candle_triple.json create mode 100644 src/generated/resources/assets/oreganized/models/block/magenta_vigil_candle_triple_ceiling.json create mode 100644 src/generated/resources/assets/oreganized/models/block/orange_vigil_candle_double.json create mode 100644 src/generated/resources/assets/oreganized/models/block/orange_vigil_candle_double_ceiling.json create mode 100644 src/generated/resources/assets/oreganized/models/block/orange_vigil_candle_quadruple.json create mode 100644 src/generated/resources/assets/oreganized/models/block/orange_vigil_candle_quadruple_ceiling.json create mode 100644 src/generated/resources/assets/oreganized/models/block/orange_vigil_candle_single.json create mode 100644 src/generated/resources/assets/oreganized/models/block/orange_vigil_candle_single_ceiling.json create mode 100644 src/generated/resources/assets/oreganized/models/block/orange_vigil_candle_triple.json create mode 100644 src/generated/resources/assets/oreganized/models/block/orange_vigil_candle_triple_ceiling.json create mode 100644 src/generated/resources/assets/oreganized/models/block/pink_vigil_candle_double.json create mode 100644 src/generated/resources/assets/oreganized/models/block/pink_vigil_candle_double_ceiling.json create mode 100644 src/generated/resources/assets/oreganized/models/block/pink_vigil_candle_quadruple.json create mode 100644 src/generated/resources/assets/oreganized/models/block/pink_vigil_candle_quadruple_ceiling.json create mode 100644 src/generated/resources/assets/oreganized/models/block/pink_vigil_candle_single.json create mode 100644 src/generated/resources/assets/oreganized/models/block/pink_vigil_candle_single_ceiling.json create mode 100644 src/generated/resources/assets/oreganized/models/block/pink_vigil_candle_triple.json create mode 100644 src/generated/resources/assets/oreganized/models/block/pink_vigil_candle_triple_ceiling.json create mode 100644 src/generated/resources/assets/oreganized/models/block/purple_vigil_candle_double.json create mode 100644 src/generated/resources/assets/oreganized/models/block/purple_vigil_candle_double_ceiling.json create mode 100644 src/generated/resources/assets/oreganized/models/block/purple_vigil_candle_quadruple.json create mode 100644 src/generated/resources/assets/oreganized/models/block/purple_vigil_candle_quadruple_ceiling.json create mode 100644 src/generated/resources/assets/oreganized/models/block/purple_vigil_candle_single.json create mode 100644 src/generated/resources/assets/oreganized/models/block/purple_vigil_candle_single_ceiling.json create mode 100644 src/generated/resources/assets/oreganized/models/block/purple_vigil_candle_triple.json create mode 100644 src/generated/resources/assets/oreganized/models/block/purple_vigil_candle_triple_ceiling.json create mode 100644 src/generated/resources/assets/oreganized/models/block/red_vigil_candle_double.json create mode 100644 src/generated/resources/assets/oreganized/models/block/red_vigil_candle_double_ceiling.json create mode 100644 src/generated/resources/assets/oreganized/models/block/red_vigil_candle_quadruple.json create mode 100644 src/generated/resources/assets/oreganized/models/block/red_vigil_candle_quadruple_ceiling.json create mode 100644 src/generated/resources/assets/oreganized/models/block/red_vigil_candle_single.json create mode 100644 src/generated/resources/assets/oreganized/models/block/red_vigil_candle_single_ceiling.json create mode 100644 src/generated/resources/assets/oreganized/models/block/red_vigil_candle_triple.json create mode 100644 src/generated/resources/assets/oreganized/models/block/red_vigil_candle_triple_ceiling.json create mode 100644 src/generated/resources/assets/oreganized/models/block/white_vigil_candle_double.json create mode 100644 src/generated/resources/assets/oreganized/models/block/white_vigil_candle_double_ceiling.json create mode 100644 src/generated/resources/assets/oreganized/models/block/white_vigil_candle_quadruple.json create mode 100644 src/generated/resources/assets/oreganized/models/block/white_vigil_candle_quadruple_ceiling.json create mode 100644 src/generated/resources/assets/oreganized/models/block/white_vigil_candle_single.json create mode 100644 src/generated/resources/assets/oreganized/models/block/white_vigil_candle_single_ceiling.json create mode 100644 src/generated/resources/assets/oreganized/models/block/white_vigil_candle_triple.json create mode 100644 src/generated/resources/assets/oreganized/models/block/white_vigil_candle_triple_ceiling.json create mode 100644 src/generated/resources/assets/oreganized/models/block/yellow_vigil_candle_double.json create mode 100644 src/generated/resources/assets/oreganized/models/block/yellow_vigil_candle_double_ceiling.json create mode 100644 src/generated/resources/assets/oreganized/models/block/yellow_vigil_candle_quadruple.json create mode 100644 src/generated/resources/assets/oreganized/models/block/yellow_vigil_candle_quadruple_ceiling.json create mode 100644 src/generated/resources/assets/oreganized/models/block/yellow_vigil_candle_single.json create mode 100644 src/generated/resources/assets/oreganized/models/block/yellow_vigil_candle_single_ceiling.json create mode 100644 src/generated/resources/assets/oreganized/models/block/yellow_vigil_candle_triple.json create mode 100644 src/generated/resources/assets/oreganized/models/block/yellow_vigil_candle_triple_ceiling.json create mode 100644 src/generated/resources/assets/oreganized/models/item/black_vigil_candle.json create mode 100644 src/generated/resources/assets/oreganized/models/item/blue_vigil_candle.json create mode 100644 src/generated/resources/assets/oreganized/models/item/brown_vigil_candle.json create mode 100644 src/generated/resources/assets/oreganized/models/item/cyan_vigil_candle.json create mode 100644 src/generated/resources/assets/oreganized/models/item/gray_vigil_candle.json create mode 100644 src/generated/resources/assets/oreganized/models/item/green_vigil_candle.json create mode 100644 src/generated/resources/assets/oreganized/models/item/light_blue_vigil_candle.json create mode 100644 src/generated/resources/assets/oreganized/models/item/light_gray_vigil_candle.json create mode 100644 src/generated/resources/assets/oreganized/models/item/lime_vigil_candle.json create mode 100644 src/generated/resources/assets/oreganized/models/item/magenta_vigil_candle.json create mode 100644 src/generated/resources/assets/oreganized/models/item/orange_vigil_candle.json create mode 100644 src/generated/resources/assets/oreganized/models/item/pink_vigil_candle.json create mode 100644 src/generated/resources/assets/oreganized/models/item/purple_vigil_candle.json create mode 100644 src/generated/resources/assets/oreganized/models/item/red_vigil_candle.json create mode 100644 src/generated/resources/assets/oreganized/models/item/vigil_candle.json create mode 100644 src/generated/resources/assets/oreganized/models/item/white_vigil_candle.json create mode 100644 src/generated/resources/assets/oreganized/models/item/yellow_vigil_candle.json create mode 100644 src/generated/resources/data/oreganized/advancements/recipes/building_blocks/black_vigil_candle.json create mode 100644 src/generated/resources/data/oreganized/advancements/recipes/building_blocks/black_vigil_candle_dyeing.json create mode 100644 src/generated/resources/data/oreganized/advancements/recipes/building_blocks/blue_vigil_candle.json create mode 100644 src/generated/resources/data/oreganized/advancements/recipes/building_blocks/blue_vigil_candle_dyeing.json create mode 100644 src/generated/resources/data/oreganized/advancements/recipes/building_blocks/brown_vigil_candle.json create mode 100644 src/generated/resources/data/oreganized/advancements/recipes/building_blocks/brown_vigil_candle_dyeing.json create mode 100644 src/generated/resources/data/oreganized/advancements/recipes/building_blocks/cyan_vigil_candle.json create mode 100644 src/generated/resources/data/oreganized/advancements/recipes/building_blocks/cyan_vigil_candle_dyeing.json create mode 100644 src/generated/resources/data/oreganized/advancements/recipes/building_blocks/gray_vigil_candle.json create mode 100644 src/generated/resources/data/oreganized/advancements/recipes/building_blocks/gray_vigil_candle_dyeing.json create mode 100644 src/generated/resources/data/oreganized/advancements/recipes/building_blocks/green_vigil_candle.json create mode 100644 src/generated/resources/data/oreganized/advancements/recipes/building_blocks/green_vigil_candle_dyeing.json create mode 100644 src/generated/resources/data/oreganized/advancements/recipes/building_blocks/light_blue_vigil_candle.json create mode 100644 src/generated/resources/data/oreganized/advancements/recipes/building_blocks/light_blue_vigil_candle_dyeing.json create mode 100644 src/generated/resources/data/oreganized/advancements/recipes/building_blocks/light_gray_vigil_candle.json create mode 100644 src/generated/resources/data/oreganized/advancements/recipes/building_blocks/light_gray_vigil_candle_dyeing.json create mode 100644 src/generated/resources/data/oreganized/advancements/recipes/building_blocks/lime_vigil_candle.json create mode 100644 src/generated/resources/data/oreganized/advancements/recipes/building_blocks/lime_vigil_candle_dyeing.json create mode 100644 src/generated/resources/data/oreganized/advancements/recipes/building_blocks/magenta_vigil_candle.json create mode 100644 src/generated/resources/data/oreganized/advancements/recipes/building_blocks/magenta_vigil_candle_dyeing.json create mode 100644 src/generated/resources/data/oreganized/advancements/recipes/building_blocks/orange_vigil_candle.json create mode 100644 src/generated/resources/data/oreganized/advancements/recipes/building_blocks/orange_vigil_candle_dyeing.json create mode 100644 src/generated/resources/data/oreganized/advancements/recipes/building_blocks/pink_vigil_candle.json create mode 100644 src/generated/resources/data/oreganized/advancements/recipes/building_blocks/pink_vigil_candle_dyeing.json create mode 100644 src/generated/resources/data/oreganized/advancements/recipes/building_blocks/purple_vigil_candle.json create mode 100644 src/generated/resources/data/oreganized/advancements/recipes/building_blocks/purple_vigil_candle_dyeing.json create mode 100644 src/generated/resources/data/oreganized/advancements/recipes/building_blocks/red_vigil_candle.json create mode 100644 src/generated/resources/data/oreganized/advancements/recipes/building_blocks/red_vigil_candle_dyeing.json create mode 100644 src/generated/resources/data/oreganized/advancements/recipes/building_blocks/vigil_candle.json create mode 100644 src/generated/resources/data/oreganized/advancements/recipes/building_blocks/white_vigil_candle.json create mode 100644 src/generated/resources/data/oreganized/advancements/recipes/building_blocks/white_vigil_candle_dyeing.json create mode 100644 src/generated/resources/data/oreganized/advancements/recipes/building_blocks/yellow_vigil_candle.json create mode 100644 src/generated/resources/data/oreganized/advancements/recipes/building_blocks/yellow_vigil_candle_dyeing.json create mode 100644 src/generated/resources/data/oreganized/loot_tables/blocks/black_vigil_candle.json create mode 100644 src/generated/resources/data/oreganized/loot_tables/blocks/blue_vigil_candle.json create mode 100644 src/generated/resources/data/oreganized/loot_tables/blocks/brown_vigil_candle.json create mode 100644 src/generated/resources/data/oreganized/loot_tables/blocks/cyan_vigil_candle.json create mode 100644 src/generated/resources/data/oreganized/loot_tables/blocks/gray_vigil_candle.json create mode 100644 src/generated/resources/data/oreganized/loot_tables/blocks/green_vigil_candle.json create mode 100644 src/generated/resources/data/oreganized/loot_tables/blocks/light_blue_vigil_candle.json create mode 100644 src/generated/resources/data/oreganized/loot_tables/blocks/light_gray_vigil_candle.json create mode 100644 src/generated/resources/data/oreganized/loot_tables/blocks/lime_vigil_candle.json create mode 100644 src/generated/resources/data/oreganized/loot_tables/blocks/magenta_vigil_candle.json create mode 100644 src/generated/resources/data/oreganized/loot_tables/blocks/orange_vigil_candle.json create mode 100644 src/generated/resources/data/oreganized/loot_tables/blocks/pink_vigil_candle.json create mode 100644 src/generated/resources/data/oreganized/loot_tables/blocks/purple_vigil_candle.json create mode 100644 src/generated/resources/data/oreganized/loot_tables/blocks/red_vigil_candle.json create mode 100644 src/generated/resources/data/oreganized/loot_tables/blocks/vigil_candle.json create mode 100644 src/generated/resources/data/oreganized/loot_tables/blocks/white_vigil_candle.json create mode 100644 src/generated/resources/data/oreganized/loot_tables/blocks/yellow_vigil_candle.json create mode 100644 src/generated/resources/data/oreganized/recipes/black_vigil_candle.json create mode 100644 src/generated/resources/data/oreganized/recipes/black_vigil_candle_dyeing.json create mode 100644 src/generated/resources/data/oreganized/recipes/blue_vigil_candle.json create mode 100644 src/generated/resources/data/oreganized/recipes/blue_vigil_candle_dyeing.json create mode 100644 src/generated/resources/data/oreganized/recipes/brown_vigil_candle.json create mode 100644 src/generated/resources/data/oreganized/recipes/brown_vigil_candle_dyeing.json create mode 100644 src/generated/resources/data/oreganized/recipes/cyan_vigil_candle.json create mode 100644 src/generated/resources/data/oreganized/recipes/cyan_vigil_candle_dyeing.json create mode 100644 src/generated/resources/data/oreganized/recipes/gray_vigil_candle.json create mode 100644 src/generated/resources/data/oreganized/recipes/gray_vigil_candle_dyeing.json create mode 100644 src/generated/resources/data/oreganized/recipes/green_vigil_candle.json create mode 100644 src/generated/resources/data/oreganized/recipes/green_vigil_candle_dyeing.json create mode 100644 src/generated/resources/data/oreganized/recipes/light_blue_vigil_candle.json create mode 100644 src/generated/resources/data/oreganized/recipes/light_blue_vigil_candle_dyeing.json create mode 100644 src/generated/resources/data/oreganized/recipes/light_gray_vigil_candle.json create mode 100644 src/generated/resources/data/oreganized/recipes/light_gray_vigil_candle_dyeing.json create mode 100644 src/generated/resources/data/oreganized/recipes/lime_vigil_candle.json create mode 100644 src/generated/resources/data/oreganized/recipes/lime_vigil_candle_dyeing.json create mode 100644 src/generated/resources/data/oreganized/recipes/magenta_vigil_candle.json create mode 100644 src/generated/resources/data/oreganized/recipes/magenta_vigil_candle_dyeing.json create mode 100644 src/generated/resources/data/oreganized/recipes/orange_vigil_candle.json create mode 100644 src/generated/resources/data/oreganized/recipes/orange_vigil_candle_dyeing.json create mode 100644 src/generated/resources/data/oreganized/recipes/pink_vigil_candle.json create mode 100644 src/generated/resources/data/oreganized/recipes/pink_vigil_candle_dyeing.json create mode 100644 src/generated/resources/data/oreganized/recipes/purple_vigil_candle.json create mode 100644 src/generated/resources/data/oreganized/recipes/purple_vigil_candle_dyeing.json create mode 100644 src/generated/resources/data/oreganized/recipes/red_vigil_candle.json create mode 100644 src/generated/resources/data/oreganized/recipes/red_vigil_candle_dyeing.json create mode 100644 src/generated/resources/data/oreganized/recipes/vigil_candle.json create mode 100644 src/generated/resources/data/oreganized/recipes/white_vigil_candle.json create mode 100644 src/generated/resources/data/oreganized/recipes/white_vigil_candle_dyeing.json create mode 100644 src/generated/resources/data/oreganized/recipes/yellow_vigil_candle.json create mode 100644 src/generated/resources/data/oreganized/recipes/yellow_vigil_candle_dyeing.json create mode 100644 src/main/java/galena/oreganized/content/block/VigilCandleBlock.java diff --git a/src/generated/resources/.cache/002701d48eee4c36b62b24b011e74b0624793d05 b/src/generated/resources/.cache/002701d48eee4c36b62b24b011e74b0624793d05 index b1920dd2..272fe803 100644 --- a/src/generated/resources/.cache/002701d48eee4c36b62b24b011e74b0624793d05 +++ b/src/generated/resources/.cache/002701d48eee4c36b62b24b011e74b0624793d05 @@ -1,14 +1,18 @@ -// 1.20.1 2024-10-14T09:19:15.8831231 oreganized Block States +// 1.20.1 2024-10-14T22:19:49.9706005 oreganized Block States d85b0fb9e5cad1d9c4f22ed192b0fa621ee3373c assets/oreganized/blockstates/black_crystal_glass.json 05bb006ff7f48557fe5c5333bc120f7206052717 assets/oreganized/blockstates/black_crystal_glass_pane.json +dfd0c1bf50927d51a16ab9bf7c8ab2e2cb083998 assets/oreganized/blockstates/black_vigil_candle.json 5e5002e9c77ee7221425eeacce8834af484db877 assets/oreganized/blockstates/blue_crystal_glass.json 7e852e66ced2113bbad988b38469db326e88495c assets/oreganized/blockstates/blue_crystal_glass_pane.json +56fb90326ebe2d84b9ca372a806ce150c05792a0 assets/oreganized/blockstates/blue_vigil_candle.json 8f4bdde9fa05052630cd12fb4da9889024377adf assets/oreganized/blockstates/brown_crystal_glass.json d59afe9c89ba1e614ce5943fdc8aa3d450585560 assets/oreganized/blockstates/brown_crystal_glass_pane.json +962520caaced7a64c57776c7e246158d2ad43174 assets/oreganized/blockstates/brown_vigil_candle.json 3c5c1979dfdd7174c48384591f2628f19f75fad1 assets/oreganized/blockstates/chiseled_glance.json 40088e383637c88f443a53fbafce9ade2ca40ddd assets/oreganized/blockstates/cut_lead.json 493ed64157b69a2cd174f244e50d75ccec5b7531 assets/oreganized/blockstates/cyan_crystal_glass.json c1a188e052dc339804e5a201559b11fb8b43fec4 assets/oreganized/blockstates/cyan_crystal_glass_pane.json +55339cbe4204b859647ba328efa46585cfc435f2 assets/oreganized/blockstates/cyan_vigil_candle.json 8b7ca6fbce4b9d9e566adde74d2c27386cd1bdf8 assets/oreganized/blockstates/deepslate_lead_ore.json 91256f551a38187fc36c676586147444a26b6ef5 assets/oreganized/blockstates/deepslate_silver_ore.json f0b8760d1a59408e5a3e68a4ad55e45c0601c07b assets/oreganized/blockstates/electrum_block.json @@ -23,8 +27,10 @@ c1e90c9548de4808e0903a7e18f9ff83ca476d28 assets/oreganized/blockstates/gargoyle. d9cf1c07d030b2f6303c81035e0037cb0c7c660e assets/oreganized/blockstates/glance_wall.json 9ea9fa8ac2f43c1effc054ea90d94cd083d1eba9 assets/oreganized/blockstates/gray_crystal_glass.json c72a5228ef929553df57844bee603f560e737100 assets/oreganized/blockstates/gray_crystal_glass_pane.json +0dca05c5d4b481a46b405c98b778477344a1b8ea assets/oreganized/blockstates/gray_vigil_candle.json 8e259fefeef23ef07a4f72a5a22c47b99d65859f assets/oreganized/blockstates/green_crystal_glass.json 0f0f5654a1123c1bfa032e813f1f6cff21ec1dcb assets/oreganized/blockstates/green_crystal_glass_pane.json +e903ff61cb4b1ec9cb1df98a6ccdc6b12e5af0b2 assets/oreganized/blockstates/green_vigil_candle.json 381580fe541332a18ae1a9efa69fb53201b66140 assets/oreganized/blockstates/grooved_blue_ice.json cd524e91f5482d84fea6e9352cdffb3d3ad1ec23 assets/oreganized/blockstates/grooved_ice.json fcaefc29cf8c2a1dc8707623a2148406e2df6df3 assets/oreganized/blockstates/grooved_packed_ice.json @@ -39,30 +45,39 @@ ac3dc34ee50ebc5c1ef49b1d5200bbcce6989806 assets/oreganized/blockstates/lead_bric 39bd9f24578399b63a72fa4938ce7fa061210992 assets/oreganized/blockstates/lead_trapdoor.json 13efbf997fc6c5f35827f6f3404fd41e0ef41e02 assets/oreganized/blockstates/light_blue_crystal_glass.json 2d73359fc7425188d9a469e5b9898322e1d2c457 assets/oreganized/blockstates/light_blue_crystal_glass_pane.json +b7356ff1ab248b4869851fa9d99c2ad0c0eadacc assets/oreganized/blockstates/light_blue_vigil_candle.json 27037bd6b3df11e3e08590d443f0c6eddf2095a2 assets/oreganized/blockstates/light_gray_crystal_glass.json 5e45ef9bf2d6081d6b736933e1b9d1985520297f assets/oreganized/blockstates/light_gray_crystal_glass_pane.json +223123b820571af3281ff6ee54aea835a17171ed assets/oreganized/blockstates/light_gray_vigil_candle.json afb1d4d0ee24999ae3023290f97fdccda3979a19 assets/oreganized/blockstates/lime_crystal_glass.json c716019d58b098ac26affc31be09491e2de296e2 assets/oreganized/blockstates/lime_crystal_glass_pane.json +ae8b9cac3d228652ac72f6deea5dc26503dff7e0 assets/oreganized/blockstates/lime_vigil_candle.json 23860a3cdce3dabc87834f8b22b164a9d12bad71 assets/oreganized/blockstates/magenta_crystal_glass.json b2da99204da7dab9df568e4bc6111eebcb057972 assets/oreganized/blockstates/magenta_crystal_glass_pane.json +d2f695030a291e15e9d20e26f1b0921a8a5e4114 assets/oreganized/blockstates/magenta_vigil_candle.json 10ba525a3b9d3eddc1e79feed3ef2f7e7cfff0b8 assets/oreganized/blockstates/molten_lead_cauldron.json d9536dcff6be202d9b5d821c54ea54391f8ee1de assets/oreganized/blockstates/orange_crystal_glass.json 3468335e1b3d19afd9713cf2171f7f28771ff751 assets/oreganized/blockstates/orange_crystal_glass_pane.json +e8e784cd3ab0f03920fd154fb864db9bc0e7594b assets/oreganized/blockstates/orange_vigil_candle.json ea33f3305a768cacbe05a2cdc8475284c39afcad assets/oreganized/blockstates/pink_crystal_glass.json 9503a106ce6a38698a3e6fce6b975e5d339105df assets/oreganized/blockstates/pink_crystal_glass_pane.json +aaf17187b5beca3c463212ca1ce108b729ae4efa assets/oreganized/blockstates/pink_vigil_candle.json d7cf04a9abcafbdf27a906caaaa71a4ab9db0851 assets/oreganized/blockstates/polished_glance.json e2cfbeacc6cd2556538c830fd063a9a9d2d34f2d assets/oreganized/blockstates/polished_glance_slab.json 57c980c45fd739c9f3c7bfdaa214de57c69bd521 assets/oreganized/blockstates/polished_glance_stairs.json a0d5aab21480fec3d1f2868400975f62e9588fb1 assets/oreganized/blockstates/purple_crystal_glass.json c9cb5c7d3dcf17e64b42b21b3ca32e2f872b32f7 assets/oreganized/blockstates/purple_crystal_glass_pane.json +134e5098f8f1c2e3b7ff90612131e04288647fb7 assets/oreganized/blockstates/purple_vigil_candle.json 7cb5ce8c7b7d4d9f1a7a5d06d4aff60d6b8661a9 assets/oreganized/blockstates/raw_lead_block.json a8b05dbdd23fe1cf5ce82b267a4648b0629fc297 assets/oreganized/blockstates/raw_silver_block.json 5085b50121f91c56256b5f1189c8dc614c340d11 assets/oreganized/blockstates/red_crystal_glass.json 7a46fe801476209d2d5eb40213397140a7a06b8f assets/oreganized/blockstates/red_crystal_glass_pane.json +c03746b3cb60582e017ac4df94d7438f6ee75a00 assets/oreganized/blockstates/red_vigil_candle.json 398fed72da8aa72d33e773d22a7fb5a5292e6fa5 assets/oreganized/blockstates/shrapnel_bomb.json dcdf3b0a7a2bb1bd00f698b3325e8ffadd0bf98c assets/oreganized/blockstates/silver_block.json 89f5cc8a105178b0b12f32963a320afc120bf868 assets/oreganized/blockstates/silver_ore.json 870599b8654e91dfb946d3e8afc4d0de08e49f9d assets/oreganized/blockstates/spotted_glance.json +99608526bc8053659abcddd11ec91c13d443369a assets/oreganized/blockstates/vigil_candle.json 6992b8d448ed847ea9391428732a4f3aaddf258e assets/oreganized/blockstates/waxed_black_concrete_powder.json d3fb359d8a8f03c227be45819904dd16c13e3e00 assets/oreganized/blockstates/waxed_blue_concrete_powder.json 073c781dfa55e697c92eedd2e04f7d6e476298f2 assets/oreganized/blockstates/waxed_brown_concrete_powder.json @@ -82,8 +97,10 @@ afeb2ffdb9361c925ef9322c7303c0de3f4b39ee assets/oreganized/blockstates/waxed_whi 9e4d073c6804904639f89e3af04983dde1720efe assets/oreganized/blockstates/waxed_yellow_concrete_powder.json 0bc2464ae7dc6932baa23098183cf72c05980caa assets/oreganized/blockstates/white_crystal_glass.json 9bdc987f91dc587b97d6834523cac5392b7a0972 assets/oreganized/blockstates/white_crystal_glass_pane.json +d45feb3a92856e2ee2510a9f35587d29cc7bb1c2 assets/oreganized/blockstates/white_vigil_candle.json c4f60492b52fe9b99177f6d8c47338beefb07d55 assets/oreganized/blockstates/yellow_crystal_glass.json 82873093c91346c863155b436c1c549e290de044 assets/oreganized/blockstates/yellow_crystal_glass_pane.json +2d9a6a21d143e10939b7ad5eb31b54e3553cb1a4 assets/oreganized/blockstates/yellow_vigil_candle.json a93c37505ed69e5e1b31c1803aebe021c8f5f28f assets/oreganized/models/block/black_concrete_powder.json b4c9e12da0a5bb4bcde8a94accf272d4ee1fb921 assets/oreganized/models/block/black_crystal_glass.json 7fab60622967f8444f480d47cf889d31c5ba3d2a assets/oreganized/models/block/black_crystal_glass_in.json @@ -109,6 +126,14 @@ f4f6ee7e2a37a51fa0bc870fcf3511c9c8265d54 assets/oreganized/models/block/black_cr 3a2d39aa1c8801c6b49bf5df3e0beecf4bada568 assets/oreganized/models/block/black_crystal_glass_pane_side_out.json 7754dcd2afe856a0041d52d272b8c2970e0e8bbc assets/oreganized/models/block/black_crystal_glass_pane_side_rot.json 33222758f40a3b9aa5438d2da2a81ca007b2480b assets/oreganized/models/block/black_crystal_glass_rot.json +842d32af1476d1b29122e861732829c52ec35d09 assets/oreganized/models/block/black_vigil_candle_double.json +1eb523d23980f062aef5a34252a59c1a6b2b8a80 assets/oreganized/models/block/black_vigil_candle_double_ceiling.json +7e78c467dda277e0f8fc1529967550f8f5321579 assets/oreganized/models/block/black_vigil_candle_quadruple.json +a19821a3bbcb99827732e5383f32349857ee1d8d assets/oreganized/models/block/black_vigil_candle_quadruple_ceiling.json +6d570f156d82a76c16f2d8c190569fb39799b320 assets/oreganized/models/block/black_vigil_candle_single.json +39c478db982761237599e59fb97c5e02882e4cb4 assets/oreganized/models/block/black_vigil_candle_single_ceiling.json +96d3d1a69c1a1ccc698439754144d9f0fc7cd1a5 assets/oreganized/models/block/black_vigil_candle_triple.json +ee323c84d2591d360e6a54b603188fbe6dcf1bcb assets/oreganized/models/block/black_vigil_candle_triple_ceiling.json 476579543338ee34282e824ae1b7f06f2d6fc24c assets/oreganized/models/block/blue_concrete_powder.json d268c1abcaca9de8544f616c43cfe52dcf1ab724 assets/oreganized/models/block/blue_crystal_glass.json 610d5a26dd77499724bb2a23cd79ab0c48994486 assets/oreganized/models/block/blue_crystal_glass_in.json @@ -134,6 +159,14 @@ a2f89ce936bf8a2409a947e3ba1c26a634cce501 assets/oreganized/models/block/blue_cry bdd196da9ed9e727e7dc655ca020b467440d0126 assets/oreganized/models/block/blue_crystal_glass_pane_side_out.json 5c4dd981e3eabb218f1fea37c285d30a2af88206 assets/oreganized/models/block/blue_crystal_glass_pane_side_rot.json 636f4fd7e8311b57d7167bcbbec656bc6eeec034 assets/oreganized/models/block/blue_crystal_glass_rot.json +fa202a3b74d1e76223b878b2ae1faef472b5737c assets/oreganized/models/block/blue_vigil_candle_double.json +13ed0c9a6a8c4f86766566ad7c2e1745a9c7440e assets/oreganized/models/block/blue_vigil_candle_double_ceiling.json +5ada68305834d5e470c29ae949ac61d922746ddf assets/oreganized/models/block/blue_vigil_candle_quadruple.json +3e5e04e8ceed9cc01d914a67d4cb540160557eef assets/oreganized/models/block/blue_vigil_candle_quadruple_ceiling.json +b9604285c20dab8232acc7ab7156e5f694f001d1 assets/oreganized/models/block/blue_vigil_candle_single.json +b0f86aa8e5f54791259c12cfd2a5d41c163d6434 assets/oreganized/models/block/blue_vigil_candle_single_ceiling.json +88c724993a5248e298f678ed53ef4bb247d143b9 assets/oreganized/models/block/blue_vigil_candle_triple.json +61febf388c292dbc8f5eaee75ce124b0cb9f4c92 assets/oreganized/models/block/blue_vigil_candle_triple_ceiling.json 3296354cd0709abe6eb75e1fc39f1c72d0a9d0a7 assets/oreganized/models/block/brown_concrete_powder.json 4154dddb09563c888c73caa346d5a491ff902782 assets/oreganized/models/block/brown_crystal_glass.json 632ce280a6004238bf5ee88445904213ca67c413 assets/oreganized/models/block/brown_crystal_glass_in.json @@ -159,6 +192,14 @@ b5b65411b33249d560ae0af3fb44d1a2ad250522 assets/oreganized/models/block/brown_cr 75b40c8c195db361d79368c56b01f6256d9e1742 assets/oreganized/models/block/brown_crystal_glass_pane_side_out.json 60c7d108ad8de5447835ffcb2069d65db948f34f assets/oreganized/models/block/brown_crystal_glass_pane_side_rot.json 7146bedcc663b9b4151fcbf89e573a2e2f636909 assets/oreganized/models/block/brown_crystal_glass_rot.json +0fdbe8cf74077b375f5c6ebb44e458f588644700 assets/oreganized/models/block/brown_vigil_candle_double.json +d9c2708e407334b52d1a5e4fa73dad6fe08b0a86 assets/oreganized/models/block/brown_vigil_candle_double_ceiling.json +ed6090b000b3c1414b52679a14cb54421fbabfd1 assets/oreganized/models/block/brown_vigil_candle_quadruple.json +055087101af4e8240d8368060aa41eef514da687 assets/oreganized/models/block/brown_vigil_candle_quadruple_ceiling.json +bece6692d03e515eb1b6866b7612b31657caa974 assets/oreganized/models/block/brown_vigil_candle_single.json +57a6037516ab07a8d43142594f7ccc51aa0db632 assets/oreganized/models/block/brown_vigil_candle_single_ceiling.json +d6bb8eb53138bc0091f9e73c3c8990e005b3926b assets/oreganized/models/block/brown_vigil_candle_triple.json +3a20c447376d131b2691256c961da470ce87a6f9 assets/oreganized/models/block/brown_vigil_candle_triple_ceiling.json 4f188c17f6b739d6090b40856dee05dae6b32316 assets/oreganized/models/block/chiseled_glance.json a9aeea1dec59b5c1594205bb9bc7034f30f447f0 assets/oreganized/models/block/cut_lead.json 65035089ce2758727d5b6cbc94c1a51c92ce613d assets/oreganized/models/block/cyan_concrete_powder.json @@ -186,8 +227,24 @@ d2c549cf8fef6f29040f4f69a05e4e64d46963dc assets/oreganized/models/block/cyan_cry 9646ced025e6325906e665a54056f4586e1a759a assets/oreganized/models/block/cyan_crystal_glass_pane_side_out.json e608b753dce2a8b19cb7dbee4045c14c15eecef7 assets/oreganized/models/block/cyan_crystal_glass_pane_side_rot.json 70e7d24a752911b20fe5ba6ab611abf3c358c136 assets/oreganized/models/block/cyan_crystal_glass_rot.json +39e129696cc32b5d812e1cd9a073fa4019b0a63c assets/oreganized/models/block/cyan_vigil_candle_double.json +f597b22780faa2e7039fde378c03b95e7238f336 assets/oreganized/models/block/cyan_vigil_candle_double_ceiling.json +5de76a0b11ecb17851f35677b168eeb230145e89 assets/oreganized/models/block/cyan_vigil_candle_quadruple.json +cb6319a43fa075acf8f1a7607632208e079a4d68 assets/oreganized/models/block/cyan_vigil_candle_quadruple_ceiling.json +0b491fcacf51fee75cda04d2f7f8e136d67b4c26 assets/oreganized/models/block/cyan_vigil_candle_single.json +b4602dfffed116c7ec93bd9db180e2924029b0be assets/oreganized/models/block/cyan_vigil_candle_single_ceiling.json +051b88ba77a8f0708ba38cce5186d09e01fc8e18 assets/oreganized/models/block/cyan_vigil_candle_triple.json +690c75634e1d59a7e75f7dfaae30d3b8c518674f assets/oreganized/models/block/cyan_vigil_candle_triple_ceiling.json 28e5c8efea3bcd11f22ff5d8fc42e027451a8c94 assets/oreganized/models/block/deepslate_lead_ore.json 5f9de10cb0e348003b4ad9fa8bfc1fa9278e3df1 assets/oreganized/models/block/deepslate_silver_ore.json +b57b85aa4859656bbb0e466ea198bddd28dc9857 assets/oreganized/models/block/defaultvigil_candle_double.json +780445ad969863e0aeef46fc4c8de08040b71d3e assets/oreganized/models/block/defaultvigil_candle_double_ceiling.json +1e440df4a73567cc92546655a48e0bf3e3c36346 assets/oreganized/models/block/defaultvigil_candle_quadruple.json +510154bf3b3cc453620ff7e51d79dc5a05498553 assets/oreganized/models/block/defaultvigil_candle_quadruple_ceiling.json +013c7b683388e5251d541a55d2131348f297c072 assets/oreganized/models/block/defaultvigil_candle_single.json +8329555e646a16fbb0a06e6414afd68cc0959aea assets/oreganized/models/block/defaultvigil_candle_single_ceiling.json +8dd3f0a43f55cab31ad58d2290bd904529b2ece7 assets/oreganized/models/block/defaultvigil_candle_triple.json +b51151158e1e0c0a5fc6aba3a3937882765a6118 assets/oreganized/models/block/defaultvigil_candle_triple_ceiling.json 50b31e901f9c3d7db1fde987cfd547999e37cf67 assets/oreganized/models/block/dimmer_lead_bulb.json 70dd1a0c1846410be1610e21f3f6e7458dc530a3 assets/oreganized/models/block/electrum_block.json 9b44bee43c08518c3880b29784895a8ee563d01a assets/oreganized/models/block/glance.json @@ -255,6 +312,14 @@ bb2a21c4cc7db90599b1498cbdc64eb244311589 assets/oreganized/models/block/gray_cry 242a4e280a8ae4aa11b9c78aebb8810c3fe85c99 assets/oreganized/models/block/gray_crystal_glass_pane_side_out.json 70eba566d71f8fa6a7496fe057613ce8d7e4b4a4 assets/oreganized/models/block/gray_crystal_glass_pane_side_rot.json 6a45988e05de5c086a9e8ece8642cf412dd466af assets/oreganized/models/block/gray_crystal_glass_rot.json +312025766b73eb9a1a9ce9323ae6f698649837e6 assets/oreganized/models/block/gray_vigil_candle_double.json +8b17d7f6b9f5c971d90f0058cb6448341968d8aa assets/oreganized/models/block/gray_vigil_candle_double_ceiling.json +f92854375e41fcfffa2b8f72a22a0d86b4c9c032 assets/oreganized/models/block/gray_vigil_candle_quadruple.json +b37bf483433e1631bc7b5e5e790fa701e8013f48 assets/oreganized/models/block/gray_vigil_candle_quadruple_ceiling.json +14b3a634a33fc5add230278e993c89b66996031f assets/oreganized/models/block/gray_vigil_candle_single.json +c5a7c781065991d62db90e101d58119bd2a42656 assets/oreganized/models/block/gray_vigil_candle_single_ceiling.json +90efc3f7e37e52d445599e56da14ff70bfb7061b assets/oreganized/models/block/gray_vigil_candle_triple.json +f2239baa6628a50952a09c015cc75590115be792 assets/oreganized/models/block/gray_vigil_candle_triple_ceiling.json 7d9b9dd458a536627b1e22fe5ecb26ca9cfc8fb2 assets/oreganized/models/block/green_concrete_powder.json 169a2fb6047878118c082d9a710c265c99ec6345 assets/oreganized/models/block/green_crystal_glass.json 707b39ff895f28b54d9ecd784dcee6648e497451 assets/oreganized/models/block/green_crystal_glass_in.json @@ -280,6 +345,14 @@ f06c23bb719390bafdc75bda45d27d754cf5ca88 assets/oreganized/models/block/green_cr 5dea33a075a76c327a95d404e83859280d1678ad assets/oreganized/models/block/green_crystal_glass_pane_side_out.json 526a594c52b1fd25b57124861bb247fd4fc32814 assets/oreganized/models/block/green_crystal_glass_pane_side_rot.json 0771143da48d3d7a50bd6bf5beb62fa778397c48 assets/oreganized/models/block/green_crystal_glass_rot.json +20e0bde7bf3a5ab7623b0842dd9d03c7a76036a9 assets/oreganized/models/block/green_vigil_candle_double.json +6b42741fc8df030598d37b79067cbab3974324b4 assets/oreganized/models/block/green_vigil_candle_double_ceiling.json +438074afd18ccd7d5444427a95b902905ed25881 assets/oreganized/models/block/green_vigil_candle_quadruple.json +4fecf4e3fc890f4e4cbb3433c93836a45f95b501 assets/oreganized/models/block/green_vigil_candle_quadruple_ceiling.json +44c2d253145cb07e1bd1a6ad432a7bdfbe409edb assets/oreganized/models/block/green_vigil_candle_single.json +64dee37713056d3a1dfb5e0e4ec1a22f35920d21 assets/oreganized/models/block/green_vigil_candle_single_ceiling.json +de59254958bddb3e7f04bcae4e2dd3771142fdc9 assets/oreganized/models/block/green_vigil_candle_triple.json +ca04cf5553960ea2c0e0040e943c222248003d39 assets/oreganized/models/block/green_vigil_candle_triple_ceiling.json 6ac43f4b7a86ba2b1a3638637108659d12dfb006 assets/oreganized/models/block/grooved_blue_ice.json ff530b321353ded30d649ead0668faa2bcfe16a9 assets/oreganized/models/block/grooved_ice.json 2a0395c97d8caca1311c8b5181b324c228af84d7 assets/oreganized/models/block/grooved_packed_ice.json @@ -331,6 +404,14 @@ c996f95f0556c4516ae6d962266182bc41d8837c assets/oreganized/models/block/light_bl e63efa9348807c5d087b5efaf057109e22481a65 assets/oreganized/models/block/light_blue_crystal_glass_pane_side_out.json 3f45b2e8f6c4c869af036765bf6b158d7c42d369 assets/oreganized/models/block/light_blue_crystal_glass_pane_side_rot.json bef3c54f567c6ac71aad8184916114f6e6015e77 assets/oreganized/models/block/light_blue_crystal_glass_rot.json +434b4aced0a7e956178994b1c0903df9e385d7ee assets/oreganized/models/block/light_blue_vigil_candle_double.json +2968cf97a5f4896672615801af3d4f1dfd481ec1 assets/oreganized/models/block/light_blue_vigil_candle_double_ceiling.json +9db5b6020d6017aae0a64a67f7c8a3c66251c45b assets/oreganized/models/block/light_blue_vigil_candle_quadruple.json +c40c964b990677f8f6dc8e638d039dc8fbb27000 assets/oreganized/models/block/light_blue_vigil_candle_quadruple_ceiling.json +479c2b971f2787341a655f3207daf7a0588fd6da assets/oreganized/models/block/light_blue_vigil_candle_single.json +51686462226d1a3feace7ed0c04910f90de5319b assets/oreganized/models/block/light_blue_vigil_candle_single_ceiling.json +afb5d7d2e745ed293ae3e117cf127ee029de60a2 assets/oreganized/models/block/light_blue_vigil_candle_triple.json +7a9b0a10a910980c7318c7ee2eed16ad0b9b492d assets/oreganized/models/block/light_blue_vigil_candle_triple_ceiling.json cc3496c0dfc32a694af4f379cfb5f7cc1988e804 assets/oreganized/models/block/light_gray_concrete_powder.json cafbdfb97d41927e293dddebf8892932e0bdbe83 assets/oreganized/models/block/light_gray_crystal_glass.json 6b595a6115f76b8625b80611d861032411e4ba08 assets/oreganized/models/block/light_gray_crystal_glass_in.json @@ -356,6 +437,14 @@ c85f4e300b801bd4e5267a9cc51751fc208eaf09 assets/oreganized/models/block/light_gr 79fa52d765a6545b38f6e4ae6ec5df08efb81825 assets/oreganized/models/block/light_gray_crystal_glass_pane_side_out.json 1c2b35fa2f11c609bd76406d609a258c340915ec assets/oreganized/models/block/light_gray_crystal_glass_pane_side_rot.json 377e4dcda4ac0aea8fb99d05715eefc69c2f38e6 assets/oreganized/models/block/light_gray_crystal_glass_rot.json +16376b1c78cb6181dca4899b0b8def267df13fca assets/oreganized/models/block/light_gray_vigil_candle_double.json +01d2e6c90491d1f72b6d8722978aff814ef081ea assets/oreganized/models/block/light_gray_vigil_candle_double_ceiling.json +9a3d2da2c9231bbcc9078a226cd5d54a22a5c11b assets/oreganized/models/block/light_gray_vigil_candle_quadruple.json +9f85726c9ba1c1ed7632404d52be9531fe03c3bd assets/oreganized/models/block/light_gray_vigil_candle_quadruple_ceiling.json +67dd91856757c8780e85de27ced5656903e952e5 assets/oreganized/models/block/light_gray_vigil_candle_single.json +14d60d2643ca5b55d88170be8a212869e313ee24 assets/oreganized/models/block/light_gray_vigil_candle_single_ceiling.json +7c44c6d0c31303a0847b092b194e695aa3b64b34 assets/oreganized/models/block/light_gray_vigil_candle_triple.json +39f68050d418e6489d070f90c4e307468355da72 assets/oreganized/models/block/light_gray_vigil_candle_triple_ceiling.json b667aed52d30f957bb5b8a674d72678074e1988a assets/oreganized/models/block/lime_concrete_powder.json 84a1cbd347232ebe94e1412ce552f542d0d4c04e assets/oreganized/models/block/lime_crystal_glass.json cab16fecfcf35558e07021a775ec0850e559dc73 assets/oreganized/models/block/lime_crystal_glass_in.json @@ -381,6 +470,14 @@ e48a604d3b2acbbf2df7b18b1dfabfc5add6fd2a assets/oreganized/models/block/lime_cry 2bc5fcbd62541954cbf177ee2cb78b659cd8277c assets/oreganized/models/block/lime_crystal_glass_pane_side_out.json 9fbf48fe5fab3b2e538704f8a529b07f02b8ee35 assets/oreganized/models/block/lime_crystal_glass_pane_side_rot.json 467034c7b1573ec2c06170c287a7d43da218d223 assets/oreganized/models/block/lime_crystal_glass_rot.json +63f9a20454a89828d555d3525c67254bc90cde92 assets/oreganized/models/block/lime_vigil_candle_double.json +daf43038a8c9aa972aadd64b668396a9dbf8cfe4 assets/oreganized/models/block/lime_vigil_candle_double_ceiling.json +92168134c510e5d611a258800532bf123d4b122e assets/oreganized/models/block/lime_vigil_candle_quadruple.json +e756a8cbf170e749176b201737d42c22a2e6a096 assets/oreganized/models/block/lime_vigil_candle_quadruple_ceiling.json +236554b354bd2c4fb6b9c2f357bb951459d3df5c assets/oreganized/models/block/lime_vigil_candle_single.json +86dbf50fb1f1aae203b96dc85f3cd95f7a72c8cf assets/oreganized/models/block/lime_vigil_candle_single_ceiling.json +a4c56d36a18cef42e1e05126453353943ebe2562 assets/oreganized/models/block/lime_vigil_candle_triple.json +a2fda4b5def63301f38042bc481c4516ea2c3fed assets/oreganized/models/block/lime_vigil_candle_triple_ceiling.json dcd8c9192f22a02c035f577021a787b876e57065 assets/oreganized/models/block/magenta_concrete_powder.json 84c88a72b4403008762910054f4f98f4a114defe assets/oreganized/models/block/magenta_crystal_glass.json cc5694ad1eae57281f46d880f32f40fa6e78e318 assets/oreganized/models/block/magenta_crystal_glass_in.json @@ -406,6 +503,14 @@ f61dd79a1da013e1fc0b59cf0991c6e5e97b0694 assets/oreganized/models/block/magenta_ 3c85ff6451d8a472d8e7cae8a2ae7fc2d47ced30 assets/oreganized/models/block/magenta_crystal_glass_pane_side_out.json 23db59d9843ded540b0b71ec72d9a7c1654034c7 assets/oreganized/models/block/magenta_crystal_glass_pane_side_rot.json 64b8bf65885c03ae44e23aee011008ccb67cb60d assets/oreganized/models/block/magenta_crystal_glass_rot.json +b40ea71d12d7ea8190e25256de7b4e89da47a8c0 assets/oreganized/models/block/magenta_vigil_candle_double.json +fcf2361774b7957f18f7a698be11d846f09dcd2c assets/oreganized/models/block/magenta_vigil_candle_double_ceiling.json +7f5c823a11c90f0ae9234cb9d467557ff82afe61 assets/oreganized/models/block/magenta_vigil_candle_quadruple.json +258fe7c2635ddbe633a6e870a65b5e93cf4ea27d assets/oreganized/models/block/magenta_vigil_candle_quadruple_ceiling.json +ddcc6fafaf0ea7fc907d13d757add87a8ef466b9 assets/oreganized/models/block/magenta_vigil_candle_single.json +fabd30145abb7643ff4f0166c48d2d05ef81198a assets/oreganized/models/block/magenta_vigil_candle_single_ceiling.json +ee4ad0de8f3efbc577e24f55ffbe2874a19e39c6 assets/oreganized/models/block/magenta_vigil_candle_triple.json +b88bdc12514a05fee4b73664556ff0d00a64d49b assets/oreganized/models/block/magenta_vigil_candle_triple_ceiling.json d6b67784754f6683734081c363b4f9b72f1f388b assets/oreganized/models/block/molten_lead_cauldron0.json e831cbb457d1314e3c0f5a7706992c90c35337a6 assets/oreganized/models/block/molten_lead_cauldron1.json e831cbb457d1314e3c0f5a7706992c90c35337a6 assets/oreganized/models/block/molten_lead_cauldron2.json @@ -435,6 +540,14 @@ c240eaab024de53c8519d7d728b9924f69789080 assets/oreganized/models/block/orange_c e200aa2575f72bde4fca7be46bfe49bdcf1d272e assets/oreganized/models/block/orange_crystal_glass_pane_side_out.json dfa78dff5c2aaa56105176858237dc27e092990f assets/oreganized/models/block/orange_crystal_glass_pane_side_rot.json 6c85eea8420c50d496cd7b91d90d0002e9b7042b assets/oreganized/models/block/orange_crystal_glass_rot.json +0aadd9133b00114fa0e6f3721021cad6fb17fa1f assets/oreganized/models/block/orange_vigil_candle_double.json +05cee0c922c66b6f17e9f46c0e457b01346d0f0f assets/oreganized/models/block/orange_vigil_candle_double_ceiling.json +40674fea578d604477448647f70cb0f01ed63e66 assets/oreganized/models/block/orange_vigil_candle_quadruple.json +25ec52cffa046a1c8bbaa2ab7b8dbb9c98599cd4 assets/oreganized/models/block/orange_vigil_candle_quadruple_ceiling.json +61d361d939f386bbd8e2c2822960cd2eb571ffd3 assets/oreganized/models/block/orange_vigil_candle_single.json +3a8a40a066ef6a27b7a97a990eac788034e0f64a assets/oreganized/models/block/orange_vigil_candle_single_ceiling.json +6e7da4687d273b35bdd825cd8a0086a2730dd15e assets/oreganized/models/block/orange_vigil_candle_triple.json +3216be395dcb7e8a40cb16491447c8d8eb454a64 assets/oreganized/models/block/orange_vigil_candle_triple_ceiling.json 58f7913ed5ccbeabf87fc3cc4356d05fa9d98f13 assets/oreganized/models/block/pink_concrete_powder.json bd3378b8df075e77ca1b6f6ca1d4144f93b8b367 assets/oreganized/models/block/pink_crystal_glass.json d109817afcdf3118fa3efbd353850e8f55517d64 assets/oreganized/models/block/pink_crystal_glass_in.json @@ -460,6 +573,14 @@ b3caec9f6f245487dc5af89c0daf909585cfb601 assets/oreganized/models/block/pink_cry f13030d6c143a9a06d323ad8442eabd9f0061f3c assets/oreganized/models/block/pink_crystal_glass_pane_side_out.json 966d69e0ac44ef0ec493b281b759c1dbc1c7de61 assets/oreganized/models/block/pink_crystal_glass_pane_side_rot.json 27b1d54dd7f8170d4a78c154a0bfd25ceaea6af9 assets/oreganized/models/block/pink_crystal_glass_rot.json +5251d72ec0a8e9403eb4bce46610541eaa907592 assets/oreganized/models/block/pink_vigil_candle_double.json +943872c2693db2b42b33e1a99788145082cc25a8 assets/oreganized/models/block/pink_vigil_candle_double_ceiling.json +8a3857e9f6a2cfadee78f3c3d77c02bbc7ac9d5a assets/oreganized/models/block/pink_vigil_candle_quadruple.json +f1a01f45f35631bfd3159a69002fed8a55d14326 assets/oreganized/models/block/pink_vigil_candle_quadruple_ceiling.json +35d501a14e6fda578345f82a4d7c2946e869cd91 assets/oreganized/models/block/pink_vigil_candle_single.json +c7083e2c569304740554cee16b9c70c25b9468ec assets/oreganized/models/block/pink_vigil_candle_single_ceiling.json +0d25a8ab0bba1e6199f1a5408b8589866b6244e8 assets/oreganized/models/block/pink_vigil_candle_triple.json +eeb3bd9afaf723fabbcef5cd64992150be90fa7d assets/oreganized/models/block/pink_vigil_candle_triple_ceiling.json 2817146acda72f5ba4cb468563da370757344205 assets/oreganized/models/block/polished_glance.json f18c05c0938bc4511c9a52080d4e21ccf889510b assets/oreganized/models/block/polished_glance_slab.json b0ef458d7e44703460bc3eff2baf7473a814760f assets/oreganized/models/block/polished_glance_slab_top.json @@ -491,6 +612,14 @@ fadb9f8c5f3bea03ab8b147b82d208a0b8efeb92 assets/oreganized/models/block/purple_c caa5c276899506e646402ad82a5a48847fc807a5 assets/oreganized/models/block/purple_crystal_glass_pane_side_out.json a43e30367784b061022e86e51dfd4fcdd81fb44b assets/oreganized/models/block/purple_crystal_glass_pane_side_rot.json f19346ca8fb8c7d4657c5d19666e190d6e39aa0d assets/oreganized/models/block/purple_crystal_glass_rot.json +9ebeab79a858ff18b9a201672c624f3287653cf2 assets/oreganized/models/block/purple_vigil_candle_double.json +0367d893b3e24a3bc10888befdbf4511f954dfa1 assets/oreganized/models/block/purple_vigil_candle_double_ceiling.json +fcca99fbd2c24f5e2c0cfd3e5339218a03516889 assets/oreganized/models/block/purple_vigil_candle_quadruple.json +9be75c169b03ff6a2ccd713a60ffab17b7dadd3c assets/oreganized/models/block/purple_vigil_candle_quadruple_ceiling.json +b478c2485b43c33b22bc8e69493163a4278c8b20 assets/oreganized/models/block/purple_vigil_candle_single.json +623ffadb2a50fe6c8ec60036663550e0bb8e9b54 assets/oreganized/models/block/purple_vigil_candle_single_ceiling.json +22edaf95a3ade377e60e62698bc437ff6145db76 assets/oreganized/models/block/purple_vigil_candle_triple.json +ae929923c67188087ffe2f174fbde028bc8ff773 assets/oreganized/models/block/purple_vigil_candle_triple_ceiling.json 9f8bd8f481fe842bd6d61699c2476c854a3fa677 assets/oreganized/models/block/raw_lead_block.json 717355700c42d3a0433c39bce8dc8b8980590aa4 assets/oreganized/models/block/raw_silver_block.json 1fc924cf9356ef366175d8f7a692e2d629683656 assets/oreganized/models/block/red_concrete_powder.json @@ -536,6 +665,14 @@ d606f62302a9656482f8076d3592122a95ebda2a assets/oreganized/models/block/red_hot_ 5924b1619aa47b9770b9c20e703eb8d120906ca8 assets/oreganized/models/block/red_hot_lead_trapdoor_bottom.json 6056202082cd609584dd6fd4571c8e4b615988a5 assets/oreganized/models/block/red_hot_lead_trapdoor_open.json 1974b68a782c0fcbe8b00eaf5c913341456bcfc3 assets/oreganized/models/block/red_hot_lead_trapdoor_top.json +71439d934dcfba629cdb37deb8075ea97d1e46e3 assets/oreganized/models/block/red_vigil_candle_double.json +ac8f8c425fe6508fbd57b69d55208e7b16372a54 assets/oreganized/models/block/red_vigil_candle_double_ceiling.json +9c0ad9b1b2fafe6d1bebce7c024ea71fb0027956 assets/oreganized/models/block/red_vigil_candle_quadruple.json +c41cab2ffae47d0bd0a3142d76089c4379cd9ed9 assets/oreganized/models/block/red_vigil_candle_quadruple_ceiling.json +09655e6e063d35f1aaa10e9f098d9dbbb81b2d14 assets/oreganized/models/block/red_vigil_candle_single.json +f52d92eac9baa613960cf83707dee758e50a2f20 assets/oreganized/models/block/red_vigil_candle_single_ceiling.json +90c0acdcb495c49c48b5732ca2e5364cae0c4fe5 assets/oreganized/models/block/red_vigil_candle_triple.json +ffaac09a1cb2bb59f917e95b11036aa50507186f assets/oreganized/models/block/red_vigil_candle_triple_ceiling.json 325f19d03a38f249bcceb44770d7af7a5d956821 assets/oreganized/models/block/shrapnel_bomb.json 8b672f8e74c40583b323d948f93266ac9dc51d4e assets/oreganized/models/block/silver_block.json e7ae7144c130a6d2636fe8e2702c99666720d878 assets/oreganized/models/block/silver_ore.json @@ -565,6 +702,14 @@ f1ec7a21ad60a91d4c0935e080f249a76ebb9056 assets/oreganized/models/block/white_cr aa1f6469d6b10f6cff1543f6c11d33e700c6d7f3 assets/oreganized/models/block/white_crystal_glass_pane_side_out.json 582a872df90f0b62fe5dace91efc6465fff70b06 assets/oreganized/models/block/white_crystal_glass_pane_side_rot.json c93d99db2aacfa2035548a055fd9d7d162811a23 assets/oreganized/models/block/white_crystal_glass_rot.json +9d70d384ac31f732744cf3ae47a28b43f5a3e730 assets/oreganized/models/block/white_vigil_candle_double.json +081349756c0413498897f6b27346e381b9502cc1 assets/oreganized/models/block/white_vigil_candle_double_ceiling.json +f9e08d0d6f302ea4ba8ffd2c7a46bf343ef4107b assets/oreganized/models/block/white_vigil_candle_quadruple.json +b152d5e67e17621bfcb228d55153fd8971bfdb4a assets/oreganized/models/block/white_vigil_candle_quadruple_ceiling.json +f8a9e166fa01f7033878818462a5a3b53dbdf20b assets/oreganized/models/block/white_vigil_candle_single.json +c1b1bf6606c5051b0db49f93eaf82c874db8b315 assets/oreganized/models/block/white_vigil_candle_single_ceiling.json +5bff922ea7ca35b44b90ab1bb00b908e9baae376 assets/oreganized/models/block/white_vigil_candle_triple.json +eb8d1fbd181f56018a64d5a11c48760ad3a8f795 assets/oreganized/models/block/white_vigil_candle_triple_ceiling.json 258d5907ef1cf646306b9f0acb50b29f03d35cde assets/oreganized/models/block/yellow_concrete_powder.json c8a10b096058a91665c2493b0790391262523f4c assets/oreganized/models/block/yellow_crystal_glass.json 6376fa01d03a4a3f025743c7d18b577894f89d27 assets/oreganized/models/block/yellow_crystal_glass_in.json @@ -590,3 +735,11 @@ bd4e3e2f6e513ee45511e5f6c4d725a50487ebee assets/oreganized/models/block/yellow_c 031ffbaf3f6780aa90b8dea7297261429ff32399 assets/oreganized/models/block/yellow_crystal_glass_pane_side_out.json 56ec2c12c64b2646536a3056b4ea27cbfc061499 assets/oreganized/models/block/yellow_crystal_glass_pane_side_rot.json 4fb7fdcfac066ff9d10fabb5fe52aabc28e4ac56 assets/oreganized/models/block/yellow_crystal_glass_rot.json +818bcdd17a07d662e4caa9878c134d99a1c5d21e assets/oreganized/models/block/yellow_vigil_candle_double.json +fbf188b7cd2af885f9e0312b74188b5369d94868 assets/oreganized/models/block/yellow_vigil_candle_double_ceiling.json +4c2b478aedb70b75078e59267d86a079a1bfce14 assets/oreganized/models/block/yellow_vigil_candle_quadruple.json +52131dc61ab08a6b63422d60546db64ba61d1ba8 assets/oreganized/models/block/yellow_vigil_candle_quadruple_ceiling.json +0260d7850d77241594d4d176bb95aa4ee3823a47 assets/oreganized/models/block/yellow_vigil_candle_single.json +0639b7fb1d53c41ec090e81b113b62284e735d39 assets/oreganized/models/block/yellow_vigil_candle_single_ceiling.json +afe1c8aa355fcb57c42b710e7a8018c89881d00b assets/oreganized/models/block/yellow_vigil_candle_triple.json +6973b767d153cc1d5820455417028cb56fc69074 assets/oreganized/models/block/yellow_vigil_candle_triple_ceiling.json diff --git a/src/generated/resources/.cache/4d87f6c700406347abbc935fa7e5d5e893a595b5 b/src/generated/resources/.cache/4d87f6c700406347abbc935fa7e5d5e893a595b5 index db2b5b4d..3f0b3e2f 100644 --- a/src/generated/resources/.cache/4d87f6c700406347abbc935fa7e5d5e893a595b5 +++ b/src/generated/resources/.cache/4d87f6c700406347abbc935fa7e5d5e893a595b5 @@ -1,16 +1,20 @@ -// 1.20.1 2024-10-14T09:21:58.7369898 oreganized Item Models +// 1.20.1 2024-10-14T22:19:49.9810347 oreganized Item Models 18fcb236eeab67fa16a0014d9af5ba7dd6f9e7c8 assets/oreganized/models/item/black_crystal_glass.json 30bbb36792cb2d3f0a8a399f25238120cdf7e659 assets/oreganized/models/item/black_crystal_glass_pane.json +e79054a9c107cbd9357eebf3aacbcd7c27955b9b assets/oreganized/models/item/black_vigil_candle.json 8dcab59e8c34403761c4aec2c3357b7db80b3f0b assets/oreganized/models/item/blue_crystal_glass.json dfe6f545297f948beacae59685c3bc29a88b68d1 assets/oreganized/models/item/blue_crystal_glass_pane.json +fce6f4a24293b0fe701a564eb127f4efb3145c35 assets/oreganized/models/item/blue_vigil_candle.json ca77522dcfcf982429256fd99ca0e9f2c195bd73 assets/oreganized/models/item/brown_crystal_glass.json cc365240dd7450add26aeaf5e0e689e985a4e5ad assets/oreganized/models/item/brown_crystal_glass_pane.json +5ad09a7c21c27fa1710fd42e043558b61c872912 assets/oreganized/models/item/brown_vigil_candle.json 87ae9e55b9b93036e2004b186696da47cbc5ca81 assets/oreganized/models/item/bush_hammer.json 9cb46711c71fcec37eae98916aa50acbe76cf96d assets/oreganized/models/item/chiseled_glance.json 0873e5720c3f7d81c4ef7e3f3d333e14a87e6757 assets/oreganized/models/item/crossbow_lead_bolt.json cda1abbd4abc8987ee1a6d4ec093a5824260b4e0 assets/oreganized/models/item/cut_lead.json 1cad99f5b1d9bb26fafe94dd95e758217cb50a78 assets/oreganized/models/item/cyan_crystal_glass.json 522ec2287a524fc138cb3ebd01e3f4c70c43147e assets/oreganized/models/item/cyan_crystal_glass_pane.json +65b5b45fe7dfb09f778546c71a6a3ab35b527035 assets/oreganized/models/item/cyan_vigil_candle.json 20ea18a10ccc6f0cef2ba654ea3358628de49679 assets/oreganized/models/item/deepslate_lead_ore.json f4054bc225dbc8d64c33a9be97e3234c6b6aff70 assets/oreganized/models/item/deepslate_silver_ore.json 90d7ee1955f7b0dafcb1cc8c6e7481f2e798f0b3 assets/oreganized/models/item/electrum_axe.json @@ -82,8 +86,10 @@ bbe691c708914b9faf9bade0d70192b5fe4eaebb assets/oreganized/models/item/glance_st 463bc369e8108315ae8dba8e714e23b22a2bf31b assets/oreganized/models/item/glance_wall.json 9e5901b9c637724066adf0b0cf0a0ea7595643c2 assets/oreganized/models/item/gray_crystal_glass.json 620d7f2b29b528e35dc4bd1ba7caf47fea81e005 assets/oreganized/models/item/gray_crystal_glass_pane.json +6ad0573d3697f9df112a83970807eb1daed52db8 assets/oreganized/models/item/gray_vigil_candle.json be766846cf1dac197488418054a28488724b45db assets/oreganized/models/item/green_crystal_glass.json 0d2774c3473576f2f0e28ec4eaf9c9adaeca3e00 assets/oreganized/models/item/green_crystal_glass_pane.json +da3f4f274a50f655f5e80f10354a247a4930c644 assets/oreganized/models/item/green_vigil_candle.json 980a1d284d8ad09fb8a3cd3f6de11a5150e48a60 assets/oreganized/models/item/grooved_blue_ice.json 0a9bb963b90f719437cc2208e8a61ac1ea12d07d assets/oreganized/models/item/grooved_ice.json 0253c31f06cd51dcace95b3f958e2fa2e98bc954 assets/oreganized/models/item/grooved_packed_ice.json @@ -101,30 +107,38 @@ ddd9abce5fc944daa9bde4f9c7a2bb7ee8ed5c29 assets/oreganized/models/item/lead_ore. 338eacf72084c98a75ac9a508e09c0a0fb4d98b5 assets/oreganized/models/item/lead_trapdoor.json 5108e55f2ba54c678879dc75b16b2929716d9b39 assets/oreganized/models/item/light_blue_crystal_glass.json 2dfe57627afd868c69ac0facf2f3e597b2622365 assets/oreganized/models/item/light_blue_crystal_glass_pane.json +a4d9bd5d6b5c5d657204354938c5943cef9c0cc8 assets/oreganized/models/item/light_blue_vigil_candle.json 4c62fede3aa446ab81dd7ec3a721a797ebf1f4d6 assets/oreganized/models/item/light_gray_crystal_glass.json e5cb92ebff46639ff0dafa4ddf23cf47c7477ad3 assets/oreganized/models/item/light_gray_crystal_glass_pane.json +69055e8409b7e48392ea717cce67879018ad148e assets/oreganized/models/item/light_gray_vigil_candle.json 6dd0cc69548dd92b4ff7415b60f3f655ec00b6fb assets/oreganized/models/item/lime_crystal_glass.json 632ad6e9e36a3b06e53e546073f56426fa9e27a9 assets/oreganized/models/item/lime_crystal_glass_pane.json +3717ab6b7eb4302afe00f044a154e273996911f4 assets/oreganized/models/item/lime_vigil_candle.json 1f00a2ac13d144011fbf0b44f53f3dd4bb904959 assets/oreganized/models/item/magenta_crystal_glass.json 4cbb48e036379c1a25aff26c097e960db03958b7 assets/oreganized/models/item/magenta_crystal_glass_pane.json +7d968bf521ceede2d759246c248cb63dd81476ca assets/oreganized/models/item/magenta_vigil_candle.json ab4ff89f9d171d8a8310df55e33939984a25bef1 assets/oreganized/models/item/molten_lead_bucket.json 2e85dce7d3ffc063559a1bb1eed2f47162c85435 assets/oreganized/models/item/music_disc_structure.json 9ed1cb50f0ab91d42a700c9868717154a383c774 assets/oreganized/models/item/netherite_nugget.json e21f2c763df6c26d8cf26b0a8dc11ddc0ea7d271 assets/oreganized/models/item/orange_crystal_glass.json 8199d736ede58957f7c69b9d0a0572e595644fab assets/oreganized/models/item/orange_crystal_glass_pane.json +e14018c643a1e3941fb1dbb22eea8a37a97e1825 assets/oreganized/models/item/orange_vigil_candle.json ea37ea78afdd8a4fd3648d41b638718cbc02b836 assets/oreganized/models/item/pink_crystal_glass.json 865b6f84533ef70a5be69753a83e761755b28383 assets/oreganized/models/item/pink_crystal_glass_pane.json +c180bd7202c7d1f170131a09ce55231b1fcfcd34 assets/oreganized/models/item/pink_vigil_candle.json 6464df28e19668c9967c89137664e9d59a99d028 assets/oreganized/models/item/polished_glance.json 741c04007f9bcbe8c875bcd92fb87172521585c0 assets/oreganized/models/item/polished_glance_slab.json e0c5c128da027ed46ef1db33499714d71fa5c911 assets/oreganized/models/item/polished_glance_stairs.json cbbc97d973493c32674c1502299822e20e2b9dd9 assets/oreganized/models/item/purple_crystal_glass.json f7c411b709a3af883b55ceb15524a116468ee0b4 assets/oreganized/models/item/purple_crystal_glass_pane.json +b7e86f5c2d080a57b173bb058c8d3300297d30b3 assets/oreganized/models/item/purple_vigil_candle.json 70f7c5e87a33cccc0bc1baeec4aae548a1f63302 assets/oreganized/models/item/raw_lead.json 7bd3f2bb76af55b81590b0840503472f5cb5b2c9 assets/oreganized/models/item/raw_lead_block.json 3feb7012ce5279fcb92fcd9b2278c6c384110a8b assets/oreganized/models/item/raw_silver.json 0eb2d49665d43c865870beb62e13499299fd7174 assets/oreganized/models/item/raw_silver_block.json 848e82277b2a6223f4d24e6e8e53fd2769263be0 assets/oreganized/models/item/red_crystal_glass.json 1cbba207d199088dd85850ea56d55d5976e15f3c assets/oreganized/models/item/red_crystal_glass_pane.json +d7caf3f0da6c4c0b8f979e58178c609462b78d72 assets/oreganized/models/item/red_vigil_candle.json 4c384b6c9ca85ea3aa0aca55eea89363d8355bd7 assets/oreganized/models/item/scribe.json 2f15086e7865fc768aa268ec9b3797e818976165 assets/oreganized/models/item/shrapnel_bomb.json 0a859cda7510d7756a43cfdf4bac94b2ed57ddb6 assets/oreganized/models/item/shrapnel_bomb_minecart.json @@ -133,6 +147,7 @@ c644dd3b1845706977764c51e2bf8845fba82d07 assets/oreganized/models/item/silver_bl 13ed84c2f215331446a11c803af482b22156e938 assets/oreganized/models/item/silver_nugget.json 59197789f826ddb98e6b015bc21089a1e97612bc assets/oreganized/models/item/silver_ore.json 41b68d92ddc0e6a5f8c1ed0f11ff43eaa4bdb30c assets/oreganized/models/item/spotted_glance.json +3f914482c8238343f37ec6f597e1f0cce2ce989a assets/oreganized/models/item/vigil_candle.json 848b3d02253bb84971088f90d231c7f7d229ed86 assets/oreganized/models/item/waxed_black_concrete_powder.json 6abe6033090d16e14079f4b0082bddfb1906fb5c assets/oreganized/models/item/waxed_blue_concrete_powder.json acf39f6e32f8a16f200fe0ba4366d41e0a3d581d assets/oreganized/models/item/waxed_brown_concrete_powder.json @@ -152,5 +167,7 @@ c21fa5382d5bf45ffba5327456e2c4d31e975161 assets/oreganized/models/item/waxed_pur 83db5a91a81de586b19b015a1640cda847e2a31f assets/oreganized/models/item/waxed_yellow_concrete_powder.json b85f64f4ee27a765d5e7df6ddd0a8736a7ff60b5 assets/oreganized/models/item/white_crystal_glass.json 1b016b020d70301e5c110b1374d4d435bf9f0cf6 assets/oreganized/models/item/white_crystal_glass_pane.json +abe997091331ddd57e186a66fbd85faf4bd85ac3 assets/oreganized/models/item/white_vigil_candle.json 97b2171d2047af3ffe2449255eabdecc2de5a958 assets/oreganized/models/item/yellow_crystal_glass.json 628a959a06ec4a440e72a291b17312dd1cc54e4d assets/oreganized/models/item/yellow_crystal_glass_pane.json +2a098c681660ff89b15207d48f8039fb716eacb7 assets/oreganized/models/item/yellow_vigil_candle.json diff --git a/src/generated/resources/.cache/5bb646c3cee204f41a1b59a2c0d9083b5f7155b0 b/src/generated/resources/.cache/5bb646c3cee204f41a1b59a2c0d9083b5f7155b0 index 35319101..e1a99b45 100644 --- a/src/generated/resources/.cache/5bb646c3cee204f41a1b59a2c0d9083b5f7155b0 +++ b/src/generated/resources/.cache/5bb646c3cee204f41a1b59a2c0d9083b5f7155b0 @@ -1,4 +1,4 @@ -// 1.20.1 2024-10-11T21:00:01.0565671 Oreganized Block Tags +// 1.20.1 2024-10-14T21:56:57.8734426 Oreganized Block Tags 7a2d68d81bc5ee59f9a2f4ba68ddb39bfd9c875d data/forge/tags/blocks/glass.json d96b4f83e03abe39a1b97d92b7818c8f6b2e5c68 data/forge/tags/blocks/glass_panes.json d062c23ad5308b7de0b2e86f6531ea724530f898 data/forge/tags/blocks/melts_lead.json @@ -20,7 +20,7 @@ bff6697a058fddfe9e14615bc043fcb2071fd6fc data/forge/tags/blocks/storage_blocks/s 0f64e9b9dc279dd460f6408313b130a37a0c9d86 data/minecraft/tags/blocks/ice.json 7a2d68d81bc5ee59f9a2f4ba68ddb39bfd9c875d data/minecraft/tags/blocks/impermeable.json f7079c32fc948b65cb486bea80e2dc93d13ce577 data/minecraft/tags/blocks/mineable/axe.json -8794e7f7fcf41783b7738503b68f535efa58d511 data/minecraft/tags/blocks/mineable/pickaxe.json +bb012b5952f56da417a3022bb00d105f9a28dc10 data/minecraft/tags/blocks/mineable/pickaxe.json 84a13f81c79f0c05f8f7a8cbf1d3c25129a97179 data/minecraft/tags/blocks/mineable/shovel.json bb86ac7ab19373da790ec5711f473614e4b62d79 data/minecraft/tags/blocks/needs_iron_tool.json dc9cc2dca9fa3a28a0458ec282e3e0fe81999ee1 data/minecraft/tags/blocks/needs_stone_tool.json diff --git a/src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e b/src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e index f61066bb..c6b5f8bf 100644 --- a/src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e +++ b/src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e @@ -1,11 +1,19 @@ -// 1.20.1 2024-10-11T21:00:01.051565 Recipes +// 1.20.1 2024-10-14T22:19:49.9779525 Recipes c27d3499944bf522a573dc8987582db2d7349b41 data/oreganized/advancements/recipes/brewing/poisonous_potato_from_lead.json ee5e42ab2e9ac549022fadf1c2cbf9faebc2c53c data/oreganized/advancements/recipes/building_blocks/black_crystal_glass_pane.json +3c820d9940640deff4179f3b02cc6218a88cd4f9 data/oreganized/advancements/recipes/building_blocks/black_vigil_candle.json +2aeea7fd0c06b38a4e6f75cafc7b605c776cb386 data/oreganized/advancements/recipes/building_blocks/black_vigil_candle_dyeing.json 40700c3f2f5c78c617650fdd16e2ba248967353f data/oreganized/advancements/recipes/building_blocks/blue_crystal_glass_pane.json +3afa8ff228b9bef52253d0f816bd8e324730ce50 data/oreganized/advancements/recipes/building_blocks/blue_vigil_candle.json +7010475a07b130d021b53d46647f8ef59a172c48 data/oreganized/advancements/recipes/building_blocks/blue_vigil_candle_dyeing.json a54c0b8196d1a5179a9b51cb260df9d0c4c26d4e data/oreganized/advancements/recipes/building_blocks/brown_crystal_glass_pane.json +ad566c9bc4c74028180df5929a3cb34323345d5b data/oreganized/advancements/recipes/building_blocks/brown_vigil_candle.json +dab087994daf9d6948e3eec6e875738de6156414 data/oreganized/advancements/recipes/building_blocks/brown_vigil_candle_dyeing.json ed54a44e190b5f65a8b74cd37feaada741e5b294 data/oreganized/advancements/recipes/building_blocks/chiseled_glance.json ec10ea886188f3dfd43c7d11f91e7dd38d7f45a1 data/oreganized/advancements/recipes/building_blocks/cut_lead.json e694c9883f1eae29f6bbaee90d1570b2f2c079d8 data/oreganized/advancements/recipes/building_blocks/cyan_crystal_glass_pane.json +119fe1b189c7554be9915d485e3a109259ca83cb data/oreganized/advancements/recipes/building_blocks/cyan_vigil_candle.json +c04e927962c93d6e86a1546675042787fe105c2d data/oreganized/advancements/recipes/building_blocks/cyan_vigil_candle_dyeing.json 9ffd6cb165ad80ea122b949afe78c01b464da732 data/oreganized/advancements/recipes/building_blocks/electrum_block.json 492899ba8540de9979ce7bcaaa689ee6193196ba data/oreganized/advancements/recipes/building_blocks/electrum_ingot_from_block.json 4f5d89d87a4e6f52d98b4ac10c5762e60b61e8dd data/oreganized/advancements/recipes/building_blocks/electrum_ingot_from_nuggets.json @@ -19,7 +27,11 @@ cd97e0da4ca12f382f0668a766f7d6cc8fd734bd data/oreganized/advancements/recipes/bu 9f9ddabb36f94c84f8095469d75cd125fb3409b4 data/oreganized/advancements/recipes/building_blocks/glance_stairs.json 23ec7c79726af8725709464fbee7772f563c5c49 data/oreganized/advancements/recipes/building_blocks/glance_wall.json 1fdc8740e3cb94baa8de7c16c93a25c7d8ba1163 data/oreganized/advancements/recipes/building_blocks/gray_crystal_glass_pane.json +878efe7ca5c7506082126e226bdfaaf6e550f2d1 data/oreganized/advancements/recipes/building_blocks/gray_vigil_candle.json +004147c9802b21b3d89756a0c727f45d40a8d9ec data/oreganized/advancements/recipes/building_blocks/gray_vigil_candle_dyeing.json cb23709fa45885e26600b4c77044a515d0bec180 data/oreganized/advancements/recipes/building_blocks/green_crystal_glass_pane.json +b47aac9c923aa6032ac0c41037565f215ae51d40 data/oreganized/advancements/recipes/building_blocks/green_vigil_candle.json +cf1cb4eb92f31564b5bbe0eb7873ae4e586580ca data/oreganized/advancements/recipes/building_blocks/green_vigil_candle_dyeing.json 36e6b6e9acc7a2d1e5d06499c08774b428491e64 data/oreganized/advancements/recipes/building_blocks/lead_block.json 6c6208eebd6c66cc8a03b2845bbd227dc4a19cae data/oreganized/advancements/recipes/building_blocks/lead_bolt_crate.json 5ebf44699bc82f68474d6f9b78178750faf6ca24 data/oreganized/advancements/recipes/building_blocks/lead_bolt_from_crate.json @@ -30,20 +42,36 @@ bdf70ecf98bea7edf0acbc6bc4c451564b14348f data/oreganized/advancements/recipes/bu ee9f7cd21489b5c992ab7ffd0565f9b7b99d6e5c data/oreganized/advancements/recipes/building_blocks/lead_nugget.json e912a1a86bbe1928140a874d5677e455ec41c605 data/oreganized/advancements/recipes/building_blocks/lead_pillar.json 5b220eaec9e2e95d66ccd6ac908e63d1d0ef0838 data/oreganized/advancements/recipes/building_blocks/light_blue_crystal_glass_pane.json +17775f7a003f969d955cf7482c0bc90d86f797e1 data/oreganized/advancements/recipes/building_blocks/light_blue_vigil_candle.json +0167f76499217c8c9526c47e923fae24391115e3 data/oreganized/advancements/recipes/building_blocks/light_blue_vigil_candle_dyeing.json 53d78d2afba24d8d765eaf4320f0df84712c23ba data/oreganized/advancements/recipes/building_blocks/light_gray_crystal_glass_pane.json +4f1246e9fb543ead59f87500fc0524e0db140478 data/oreganized/advancements/recipes/building_blocks/light_gray_vigil_candle.json +f2178a3e2d5442c2a4d919f49cda67cdbbd7eccf data/oreganized/advancements/recipes/building_blocks/light_gray_vigil_candle_dyeing.json 0b18fc634f928ee633cfbc07feca8ed8be6dc4cb data/oreganized/advancements/recipes/building_blocks/lime_crystal_glass_pane.json +1c4022cbb9daf037b03a4f3675e32769eb90c5ce data/oreganized/advancements/recipes/building_blocks/lime_vigil_candle.json +23afbbbbb65459c31d6d7c6e631e4fc62e714b91 data/oreganized/advancements/recipes/building_blocks/lime_vigil_candle_dyeing.json 5c9fa11b6c39066dae99ef4f858dc4ef86e8bfe9 data/oreganized/advancements/recipes/building_blocks/magenta_crystal_glass_pane.json +48e673346e94544a72c8bae5c34259f05c71c706 data/oreganized/advancements/recipes/building_blocks/magenta_vigil_candle.json +a547bebc1bc5da0bb6acf7f3a160cbf88e7ea7c9 data/oreganized/advancements/recipes/building_blocks/magenta_vigil_candle_dyeing.json 3a4162c4abd6b335af84e00135f57526e2d7d7c3 data/oreganized/advancements/recipes/building_blocks/netherite_ingot_from_nuggets.json a74a2d29864df211430ec34af6985fab449ce640 data/oreganized/advancements/recipes/building_blocks/netherite_nugget.json 9df9569821fc370e3a410ad7f8d1941dea6eabd6 data/oreganized/advancements/recipes/building_blocks/orange_crystal_glass_pane.json +cc89eb0c23484c58cf9adef6507f40fd630e6f15 data/oreganized/advancements/recipes/building_blocks/orange_vigil_candle.json +51a1427c04df30a8ca50924313e15f5c46f595f5 data/oreganized/advancements/recipes/building_blocks/orange_vigil_candle_dyeing.json cad8dcd275f6e1abd08c2d4e3094cfe33667ecbe data/oreganized/advancements/recipes/building_blocks/pink_crystal_glass_pane.json +5f99655e470e47d6bcbb3a448ee7387a3db26fd2 data/oreganized/advancements/recipes/building_blocks/pink_vigil_candle.json +b1e867d4cc2501e4011d8ac6d47f4c046ac52cfe data/oreganized/advancements/recipes/building_blocks/pink_vigil_candle_dyeing.json 2f6b9fd389ea02e5f06617940e16375db4f7e44d data/oreganized/advancements/recipes/building_blocks/polished_glance.json 510f6f1cf2c0c2e28e907bff4063f1e01c6bd046 data/oreganized/advancements/recipes/building_blocks/purple_crystal_glass_pane.json +e1b62189db2f2a112f4108babb246f335c1241d4 data/oreganized/advancements/recipes/building_blocks/purple_vigil_candle.json +e30267e55655900d146bae60417ebfe47de5f2c3 data/oreganized/advancements/recipes/building_blocks/purple_vigil_candle_dyeing.json cc090c01f50c10d7879d998493bc5c0272700996 data/oreganized/advancements/recipes/building_blocks/raw_lead_block.json c596d51f8126f452e769b3b3cca8ee2304307401 data/oreganized/advancements/recipes/building_blocks/raw_lead_from_block.json c4107a4bc74c40f8183f1dbfc4694edbc9116c3a data/oreganized/advancements/recipes/building_blocks/raw_silver_block.json cd5b728daec67011147d991c1e92a8e45af0fa99 data/oreganized/advancements/recipes/building_blocks/raw_silver_from_block.json 075547176416d4a3ddadab4568b1c6fa8a33622a data/oreganized/advancements/recipes/building_blocks/red_crystal_glass_pane.json +0a29af2439e4c1e46ad0ac7f9b2895d6d4ad0b8a data/oreganized/advancements/recipes/building_blocks/red_vigil_candle.json +1c0921847a6b36f0e10ca8c8b109e39034cee8c8 data/oreganized/advancements/recipes/building_blocks/red_vigil_candle_dyeing.json 9528970be4845861edbecb9d82ded9ae0e75bba8 data/oreganized/advancements/recipes/building_blocks/silver_block.json 12c7921ac3b753a488ea089b147d94c3cb4e209d data/oreganized/advancements/recipes/building_blocks/silver_ingot.json c0826ad7125481ce64ca8eb0abbe230e25282bea data/oreganized/advancements/recipes/building_blocks/silver_ingot_from_block.json @@ -70,8 +98,13 @@ ab878e34895cc94b31ad5f33433d394b3470eb67 data/oreganized/advancements/recipes/bu 58c7343117ba980c730285f51ac4013596fe8fe4 data/oreganized/advancements/recipes/building_blocks/stonecutting/lead_pillar.json 20dd06137eb8a338a5982e6010e52f49b2347d8a data/oreganized/advancements/recipes/building_blocks/stonecutting/lead_pillar_from_cut_lad.json f14efdf82e5565a7f0c8a03bcbde5df9b8af3073 data/oreganized/advancements/recipes/building_blocks/stonecutting/polished_glance.json +fd7f60276add37d325e4e3b6f50859a8d459f1d0 data/oreganized/advancements/recipes/building_blocks/vigil_candle.json a73b76343b9abc9d4c082f831be8daf1b62f762a data/oreganized/advancements/recipes/building_blocks/white_crystal_glass_pane.json +19108a781439e094dcabdb925d07bef3075e9b9b data/oreganized/advancements/recipes/building_blocks/white_vigil_candle.json +2ae5fb22c22d2cd97030d7eaa7337785eec16e4b data/oreganized/advancements/recipes/building_blocks/white_vigil_candle_dyeing.json 8c7873a88da4761a440798323daf006887973daf data/oreganized/advancements/recipes/building_blocks/yellow_crystal_glass_pane.json +1e8285fa841d047227345c876b82f53db0433927 data/oreganized/advancements/recipes/building_blocks/yellow_vigil_candle.json +1e0ca8070ff155a0043a1a999860368cd59c8d0b data/oreganized/advancements/recipes/building_blocks/yellow_vigil_candle_dyeing.json b47ef8f1cecfb7182ed71b4684219ec469d3f2f3 data/oreganized/advancements/recipes/combat/lead_bolt.json 68105c4709bbf9a9c38cfea3aef83d7ae761c56c data/oreganized/advancements/recipes/decorations/black_crystal_glass.json dcb18c1fb204f38642de3c1e3dc39a29c96d3c2a data/oreganized/advancements/recipes/decorations/blue_crystal_glass.json @@ -145,6 +178,8 @@ d8d4342744c72378bf0e7430305569819e8eeef1 data/oreganized/advancements/recipes/re bd88fa660d3a40c321d3288b127cfe99e795cb6f data/oreganized/advancements/recipes/transportation/shrapnel_bomb_minecart.json ee154313df45723058ea98bd9cbc74eeb3e1293f data/oreganized/recipes/black_crystal_glass.json 2da1c73754604da03234ae3e7649348be5838370 data/oreganized/recipes/black_crystal_glass_pane.json +7c00bf187fe04e47eda7685a5d7e2c6db54e7ff1 data/oreganized/recipes/black_vigil_candle.json +7aa6b3302cef32a81a7c9db9e9180910356acfdc data/oreganized/recipes/black_vigil_candle_dyeing.json ce4d670e5c75d72e690fd1d4a95357eee6fc68f7 data/oreganized/recipes/blast_deepslate_lead_ore.json f51b34e44e4f5de9a01cf2de886ff05186f9b5de data/oreganized/recipes/blast_deepslate_silver_ore.json de5a90db4241ab7d50a3fdd9012b8d880123a560 data/oreganized/recipes/blast_lead_ore.json @@ -153,13 +188,19 @@ e44ee55f7ab6df42caecd2dde0963666975e06ef data/oreganized/recipes/blast_raw_silve 849e9f7e29c3c1b6837bb2a6923c7ae803ece639 data/oreganized/recipes/blast_silver_ore.json 7f55a0b31e261d977a597e7005f9984aa55de54f data/oreganized/recipes/blue_crystal_glass.json 87854bacdbf7862b5c7fed3a7c295f87fc7eecf6 data/oreganized/recipes/blue_crystal_glass_pane.json +3ad5f5c16840d814d86e97743db4b7ac78534ffb data/oreganized/recipes/blue_vigil_candle.json +800273eeda90c6c19ff17b15746d3da029577235 data/oreganized/recipes/blue_vigil_candle_dyeing.json 509c4b4713fb5d506d4c2ec7da3c63212e0f13ba data/oreganized/recipes/brown_crystal_glass.json c261b93b8e4cbe7c710f1165c1a554e8f29fb243 data/oreganized/recipes/brown_crystal_glass_pane.json +034d662b493d46058caf53a01d9f703bb4475f42 data/oreganized/recipes/brown_vigil_candle.json +309734e36dee3b141c7bdeff506c51c870cddd32 data/oreganized/recipes/brown_vigil_candle_dyeing.json e5116d96bde067efde6b8c3461019d7d9c122e4a data/oreganized/recipes/bush_hammer.json dbbcb8a0cb8e7821654839c7dcd5718cc0cf3668 data/oreganized/recipes/chiseled_glance.json 80eb26782e0a919bf55d1526a096ef8f459dcfec data/oreganized/recipes/cut_lead.json 827423b22ea9e4fa0629dfc22cfd20d1743ebe84 data/oreganized/recipes/cyan_crystal_glass.json e144c96a82b709098efe48ba362b1952150c41a3 data/oreganized/recipes/cyan_crystal_glass_pane.json +e1c55cea2baf26bc190751c07e51184370720b68 data/oreganized/recipes/cyan_vigil_candle.json +d576f29540740696b63e7a7dd26868a6da8db5d4 data/oreganized/recipes/cyan_vigil_candle_dyeing.json f79dc1125e97eff3392512d9dd0f6e8d3976cadf data/oreganized/recipes/electrum_axe.json 39a453380820864f17724f6aee0e6ec5036a9d81 data/oreganized/recipes/electrum_block.json 036b275950a9d4899856d68fbae81fccea9a509b data/oreganized/recipes/electrum_boots.json @@ -189,8 +230,12 @@ cd75a9311f1b63a61fb34547c17607b26dd7d911 data/oreganized/recipes/glance_brick_sl 57ad76c3c14643c7d28d84dbbd26885ef48c8d9e data/oreganized/recipes/glance_wall.json e1c09f2d1950d7e5186f3a1ebaed0d1d9bc20f2a data/oreganized/recipes/gray_crystal_glass.json 43861aa0170dad9badd8ee37d31616c75a26119a data/oreganized/recipes/gray_crystal_glass_pane.json +c44cc54b769001e679e29f4287123f2c8ed9e47d data/oreganized/recipes/gray_vigil_candle.json +1399d7e70092eaa4f204ae7f7759a9522a92e7e4 data/oreganized/recipes/gray_vigil_candle_dyeing.json 137cc4870829488fe9aac4b7cc3c1d2d961ce636 data/oreganized/recipes/green_crystal_glass.json 716c99397627e656f05017ee28f973380862691f data/oreganized/recipes/green_crystal_glass_pane.json +0345034fc0447e75b08066aa5530ecef3011d2d1 data/oreganized/recipes/green_vigil_candle.json +25afab1f8925d51d81918c56a5788c47caab54b9 data/oreganized/recipes/green_vigil_candle_dyeing.json fa74ed7a7cbf05b56856f395a780c726c7d4b065 data/oreganized/recipes/lead_bars.json 65befcd063025cfae493e0f156e69cad8c397843 data/oreganized/recipes/lead_block.json 887688824467cf6b5d7c699c740feceb46d2b788 data/oreganized/recipes/lead_bolt.json @@ -208,28 +253,44 @@ f9266001d55884e79480a35f2c5d587a7f805040 data/oreganized/recipes/lead_ingot_from 93ad1995e2ee3628ce6e7c21bb3470a52a0c99cd data/oreganized/recipes/lead_trapdoor.json b464404c9d6762093867324221fc9e37e761ef14 data/oreganized/recipes/light_blue_crystal_glass.json f355729ac7d11ce8e7d97fa846ee44d16f0c3ce6 data/oreganized/recipes/light_blue_crystal_glass_pane.json +9e9d073be8cc0c9a11929d83e536c85a13f2cad1 data/oreganized/recipes/light_blue_vigil_candle.json +4a6c0945aaf99039b1553178c085cbc400aa0a63 data/oreganized/recipes/light_blue_vigil_candle_dyeing.json 5b975a3ff07610808a6d27f798c46ca81a28a11c data/oreganized/recipes/light_gray_crystal_glass.json 71b1323e7da06da1be66af6df041a7e7cc421671 data/oreganized/recipes/light_gray_crystal_glass_pane.json +4d9c608a244bb5b6f4d6fe37f4530f9c787f2b65 data/oreganized/recipes/light_gray_vigil_candle.json +baa4ffbc366344d18ff114a082b7d8daa6739cfa data/oreganized/recipes/light_gray_vigil_candle_dyeing.json 04a73c07655513376690673edb4f259b7ee6d002 data/oreganized/recipes/lime_crystal_glass.json 5105fac3be074aa13b81b38a4f4c886bf5499597 data/oreganized/recipes/lime_crystal_glass_pane.json +8d01c61ced5beed4d688ce16ede208aa2f60a772 data/oreganized/recipes/lime_vigil_candle.json +95945ba80063a688fc4676f3fa7745621f1cce70 data/oreganized/recipes/lime_vigil_candle_dyeing.json 2ff62dfa2f73f6f5826112c0b0717332785f7eaa data/oreganized/recipes/magenta_crystal_glass.json ebe46c86e77b1fc839f4015bfe55872a98965463 data/oreganized/recipes/magenta_crystal_glass_pane.json +72998c1a6b25ab3415b39b079e7a3992a04ed3a5 data/oreganized/recipes/magenta_vigil_candle.json +ce51734663fe90c173f87e2058f8a098d4726196 data/oreganized/recipes/magenta_vigil_candle_dyeing.json 48ae5162138d3c5e230540db54451b911f56d077 data/oreganized/recipes/netherite_ingot_from_nuggets.json 48000befd6235c166f1566a60fef9f8177d09db9 data/oreganized/recipes/netherite_nugget.json f4eba4afe1e276abb01928934bd053590a052f62 data/oreganized/recipes/orange_crystal_glass.json 6981700d6a300695de6ad15fa2efc8b073288d0b data/oreganized/recipes/orange_crystal_glass_pane.json +4f8a2e88b42f95becd2cab137b933b3c76e5f57d data/oreganized/recipes/orange_vigil_candle.json +4b332545653797642a4a149a25278f5b0b5834bf data/oreganized/recipes/orange_vigil_candle_dyeing.json 2468369c94e2a07717f71ea3d4e314044d8973c5 data/oreganized/recipes/pink_crystal_glass.json ee97125ec9a428a7b02a932df58d9844f880f5dd data/oreganized/recipes/pink_crystal_glass_pane.json +d1804d5e114b7f068f18d01c0da36501ad20d613 data/oreganized/recipes/pink_vigil_candle.json +c4b28c30fbba1a7d393f38b5b0ba79122d98836d data/oreganized/recipes/pink_vigil_candle_dyeing.json 117664785859b51a04b4430dedfcd060b967f0c6 data/oreganized/recipes/poisonous_potato_from_lead.json fc29aa31634903492522f5039cbd6359cdf4b021 data/oreganized/recipes/polished_glance.json 1c015bbedb951766c631bf91bbc6159f677a5999 data/oreganized/recipes/purple_crystal_glass.json 23bd919785f4a9123893d30d26981039aa1db576 data/oreganized/recipes/purple_crystal_glass_pane.json +3d627bfb34da039de2e8f6e3d2869bdad8581ba4 data/oreganized/recipes/purple_vigil_candle.json +99e2c7135b3d3509304306451e261e4a467c12d2 data/oreganized/recipes/purple_vigil_candle_dyeing.json de027e6a84b7854012960c27c03f18c22de4cc78 data/oreganized/recipes/raw_lead_block.json 3de80928bb85603723e5b6039a9ac5fdacd0b003 data/oreganized/recipes/raw_lead_from_block.json 1c63d1f79916f942b947c1ea0dbf86c67a845ea0 data/oreganized/recipes/raw_silver_block.json 7c161f552218843de6033c84fdbcda9f024de464 data/oreganized/recipes/raw_silver_from_block.json 2deee8e79dab0cc6a48f66589d44f3e2ee6df545 data/oreganized/recipes/red_crystal_glass.json f143419602a22f529db20cea44e5e370e8e4d868 data/oreganized/recipes/red_crystal_glass_pane.json +7b1ea45d203fa88ba577b2289c7bd7cd8f7bc88a data/oreganized/recipes/red_vigil_candle.json +50b836078acf7b537c8a231ab6b9635261a2e4e5 data/oreganized/recipes/red_vigil_candle_dyeing.json 06ea07eed909dbcff647ac8724355430c1817e0e data/oreganized/recipes/scribe.json 194a5e4bfb1acbb98161ddeb6c0af5b21917e508 data/oreganized/recipes/shrapnel_bomb.json cedc682018d184f9f9f384afe3b157e6cbfff4b1 data/oreganized/recipes/shrapnel_bomb_minecart.json @@ -266,6 +327,7 @@ c4bb5be91a0f5d818b5891cdbc61f62c4f337286 data/oreganized/recipes/stonecutting/gl e19433073beac3a542465c7de86da46cb8fbd2e4 data/oreganized/recipes/stonecutting/lead_pillar.json 38a9b7a3ad7d62eb8e455ebaf22775b3e0acfe68 data/oreganized/recipes/stonecutting/lead_pillar_from_cut_lad.json 79444ccacf5f4f853c8081f720dd1bd6de552268 data/oreganized/recipes/stonecutting/polished_glance.json +87e405b6cdf742a9e57fc8f1661670cf11e22e1f data/oreganized/recipes/vigil_candle.json 4acc1b141e985ebf068349d5d87fce8dcac0c23b data/oreganized/recipes/waxed_black_concrete_powder.json ac8c461a02678f5d58a10243d41d160252ee0fa6 data/oreganized/recipes/waxed_blue_concrete_powder.json 5696c4981da26fc6ba8d5041e8cf9a64fb99a7c4 data/oreganized/recipes/waxed_brown_concrete_powder.json @@ -285,5 +347,9 @@ aadd65174c07b919472852a939e8cc545aabb546 data/oreganized/recipes/waxed_spotted_g acfeef33bb3d82dcf786a44453ab479c4a1cb8fc data/oreganized/recipes/waxed_yellow_concrete_powder.json e8a1f8934552db84c94387a4453afdfb9310cd60 data/oreganized/recipes/white_crystal_glass.json 151e9613e18dc4afa2aece6a233b76d85e58775d data/oreganized/recipes/white_crystal_glass_pane.json +f4f24701997cea77b3496b915ca162d2b3d61824 data/oreganized/recipes/white_vigil_candle.json +0ea1afd219ec4ea9c6c4b37067727215150f6afd data/oreganized/recipes/white_vigil_candle_dyeing.json 8dc590323e78a612735614ae31e180b6bff17b66 data/oreganized/recipes/yellow_crystal_glass.json 0298502a7b6edea1824342a4cbc213d80d6fb400 data/oreganized/recipes/yellow_crystal_glass_pane.json +3fa5f8d3d00a64e55e84028417686b50556bd8b8 data/oreganized/recipes/yellow_vigil_candle.json +b802ef528e6abad87054f10238d86e9fbef2d9c5 data/oreganized/recipes/yellow_vigil_candle_dyeing.json diff --git a/src/generated/resources/assets/oreganized/blockstates/black_vigil_candle.json b/src/generated/resources/assets/oreganized/blockstates/black_vigil_candle.json new file mode 100644 index 00000000..c7fd50e1 --- /dev/null +++ b/src/generated/resources/assets/oreganized/blockstates/black_vigil_candle.json @@ -0,0 +1,28 @@ +{ + "variants": { + "candles=1,hanging=false": { + "model": "oreganized:block/black_vigil_candle_single" + }, + "candles=1,hanging=true": { + "model": "oreganized:block/black_vigil_candle_single_ceiling" + }, + "candles=2,hanging=false": { + "model": "oreganized:block/black_vigil_candle_double" + }, + "candles=2,hanging=true": { + "model": "oreganized:block/black_vigil_candle_double_ceiling" + }, + "candles=3,hanging=false": { + "model": "oreganized:block/black_vigil_candle_triple" + }, + "candles=3,hanging=true": { + "model": "oreganized:block/black_vigil_candle_triple_ceiling" + }, + "candles=4,hanging=false": { + "model": "oreganized:block/black_vigil_candle_quadruple" + }, + "candles=4,hanging=true": { + "model": "oreganized:block/black_vigil_candle_quadruple_ceiling" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/blockstates/blue_vigil_candle.json b/src/generated/resources/assets/oreganized/blockstates/blue_vigil_candle.json new file mode 100644 index 00000000..1af85f3c --- /dev/null +++ b/src/generated/resources/assets/oreganized/blockstates/blue_vigil_candle.json @@ -0,0 +1,28 @@ +{ + "variants": { + "candles=1,hanging=false": { + "model": "oreganized:block/blue_vigil_candle_single" + }, + "candles=1,hanging=true": { + "model": "oreganized:block/blue_vigil_candle_single_ceiling" + }, + "candles=2,hanging=false": { + "model": "oreganized:block/blue_vigil_candle_double" + }, + "candles=2,hanging=true": { + "model": "oreganized:block/blue_vigil_candle_double_ceiling" + }, + "candles=3,hanging=false": { + "model": "oreganized:block/blue_vigil_candle_triple" + }, + "candles=3,hanging=true": { + "model": "oreganized:block/blue_vigil_candle_triple_ceiling" + }, + "candles=4,hanging=false": { + "model": "oreganized:block/blue_vigil_candle_quadruple" + }, + "candles=4,hanging=true": { + "model": "oreganized:block/blue_vigil_candle_quadruple_ceiling" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/blockstates/brown_vigil_candle.json b/src/generated/resources/assets/oreganized/blockstates/brown_vigil_candle.json new file mode 100644 index 00000000..5a7553e9 --- /dev/null +++ b/src/generated/resources/assets/oreganized/blockstates/brown_vigil_candle.json @@ -0,0 +1,28 @@ +{ + "variants": { + "candles=1,hanging=false": { + "model": "oreganized:block/brown_vigil_candle_single" + }, + "candles=1,hanging=true": { + "model": "oreganized:block/brown_vigil_candle_single_ceiling" + }, + "candles=2,hanging=false": { + "model": "oreganized:block/brown_vigil_candle_double" + }, + "candles=2,hanging=true": { + "model": "oreganized:block/brown_vigil_candle_double_ceiling" + }, + "candles=3,hanging=false": { + "model": "oreganized:block/brown_vigil_candle_triple" + }, + "candles=3,hanging=true": { + "model": "oreganized:block/brown_vigil_candle_triple_ceiling" + }, + "candles=4,hanging=false": { + "model": "oreganized:block/brown_vigil_candle_quadruple" + }, + "candles=4,hanging=true": { + "model": "oreganized:block/brown_vigil_candle_quadruple_ceiling" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/blockstates/cyan_vigil_candle.json b/src/generated/resources/assets/oreganized/blockstates/cyan_vigil_candle.json new file mode 100644 index 00000000..7ef52294 --- /dev/null +++ b/src/generated/resources/assets/oreganized/blockstates/cyan_vigil_candle.json @@ -0,0 +1,28 @@ +{ + "variants": { + "candles=1,hanging=false": { + "model": "oreganized:block/cyan_vigil_candle_single" + }, + "candles=1,hanging=true": { + "model": "oreganized:block/cyan_vigil_candle_single_ceiling" + }, + "candles=2,hanging=false": { + "model": "oreganized:block/cyan_vigil_candle_double" + }, + "candles=2,hanging=true": { + "model": "oreganized:block/cyan_vigil_candle_double_ceiling" + }, + "candles=3,hanging=false": { + "model": "oreganized:block/cyan_vigil_candle_triple" + }, + "candles=3,hanging=true": { + "model": "oreganized:block/cyan_vigil_candle_triple_ceiling" + }, + "candles=4,hanging=false": { + "model": "oreganized:block/cyan_vigil_candle_quadruple" + }, + "candles=4,hanging=true": { + "model": "oreganized:block/cyan_vigil_candle_quadruple_ceiling" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/blockstates/gray_vigil_candle.json b/src/generated/resources/assets/oreganized/blockstates/gray_vigil_candle.json new file mode 100644 index 00000000..9c438d79 --- /dev/null +++ b/src/generated/resources/assets/oreganized/blockstates/gray_vigil_candle.json @@ -0,0 +1,28 @@ +{ + "variants": { + "candles=1,hanging=false": { + "model": "oreganized:block/gray_vigil_candle_single" + }, + "candles=1,hanging=true": { + "model": "oreganized:block/gray_vigil_candle_single_ceiling" + }, + "candles=2,hanging=false": { + "model": "oreganized:block/gray_vigil_candle_double" + }, + "candles=2,hanging=true": { + "model": "oreganized:block/gray_vigil_candle_double_ceiling" + }, + "candles=3,hanging=false": { + "model": "oreganized:block/gray_vigil_candle_triple" + }, + "candles=3,hanging=true": { + "model": "oreganized:block/gray_vigil_candle_triple_ceiling" + }, + "candles=4,hanging=false": { + "model": "oreganized:block/gray_vigil_candle_quadruple" + }, + "candles=4,hanging=true": { + "model": "oreganized:block/gray_vigil_candle_quadruple_ceiling" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/blockstates/green_vigil_candle.json b/src/generated/resources/assets/oreganized/blockstates/green_vigil_candle.json new file mode 100644 index 00000000..cacdf2d0 --- /dev/null +++ b/src/generated/resources/assets/oreganized/blockstates/green_vigil_candle.json @@ -0,0 +1,28 @@ +{ + "variants": { + "candles=1,hanging=false": { + "model": "oreganized:block/green_vigil_candle_single" + }, + "candles=1,hanging=true": { + "model": "oreganized:block/green_vigil_candle_single_ceiling" + }, + "candles=2,hanging=false": { + "model": "oreganized:block/green_vigil_candle_double" + }, + "candles=2,hanging=true": { + "model": "oreganized:block/green_vigil_candle_double_ceiling" + }, + "candles=3,hanging=false": { + "model": "oreganized:block/green_vigil_candle_triple" + }, + "candles=3,hanging=true": { + "model": "oreganized:block/green_vigil_candle_triple_ceiling" + }, + "candles=4,hanging=false": { + "model": "oreganized:block/green_vigil_candle_quadruple" + }, + "candles=4,hanging=true": { + "model": "oreganized:block/green_vigil_candle_quadruple_ceiling" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/blockstates/light_blue_vigil_candle.json b/src/generated/resources/assets/oreganized/blockstates/light_blue_vigil_candle.json new file mode 100644 index 00000000..3095b47e --- /dev/null +++ b/src/generated/resources/assets/oreganized/blockstates/light_blue_vigil_candle.json @@ -0,0 +1,28 @@ +{ + "variants": { + "candles=1,hanging=false": { + "model": "oreganized:block/light_blue_vigil_candle_single" + }, + "candles=1,hanging=true": { + "model": "oreganized:block/light_blue_vigil_candle_single_ceiling" + }, + "candles=2,hanging=false": { + "model": "oreganized:block/light_blue_vigil_candle_double" + }, + "candles=2,hanging=true": { + "model": "oreganized:block/light_blue_vigil_candle_double_ceiling" + }, + "candles=3,hanging=false": { + "model": "oreganized:block/light_blue_vigil_candle_triple" + }, + "candles=3,hanging=true": { + "model": "oreganized:block/light_blue_vigil_candle_triple_ceiling" + }, + "candles=4,hanging=false": { + "model": "oreganized:block/light_blue_vigil_candle_quadruple" + }, + "candles=4,hanging=true": { + "model": "oreganized:block/light_blue_vigil_candle_quadruple_ceiling" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/blockstates/light_gray_vigil_candle.json b/src/generated/resources/assets/oreganized/blockstates/light_gray_vigil_candle.json new file mode 100644 index 00000000..fc632576 --- /dev/null +++ b/src/generated/resources/assets/oreganized/blockstates/light_gray_vigil_candle.json @@ -0,0 +1,28 @@ +{ + "variants": { + "candles=1,hanging=false": { + "model": "oreganized:block/light_gray_vigil_candle_single" + }, + "candles=1,hanging=true": { + "model": "oreganized:block/light_gray_vigil_candle_single_ceiling" + }, + "candles=2,hanging=false": { + "model": "oreganized:block/light_gray_vigil_candle_double" + }, + "candles=2,hanging=true": { + "model": "oreganized:block/light_gray_vigil_candle_double_ceiling" + }, + "candles=3,hanging=false": { + "model": "oreganized:block/light_gray_vigil_candle_triple" + }, + "candles=3,hanging=true": { + "model": "oreganized:block/light_gray_vigil_candle_triple_ceiling" + }, + "candles=4,hanging=false": { + "model": "oreganized:block/light_gray_vigil_candle_quadruple" + }, + "candles=4,hanging=true": { + "model": "oreganized:block/light_gray_vigil_candle_quadruple_ceiling" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/blockstates/lime_vigil_candle.json b/src/generated/resources/assets/oreganized/blockstates/lime_vigil_candle.json new file mode 100644 index 00000000..43a417fe --- /dev/null +++ b/src/generated/resources/assets/oreganized/blockstates/lime_vigil_candle.json @@ -0,0 +1,28 @@ +{ + "variants": { + "candles=1,hanging=false": { + "model": "oreganized:block/lime_vigil_candle_single" + }, + "candles=1,hanging=true": { + "model": "oreganized:block/lime_vigil_candle_single_ceiling" + }, + "candles=2,hanging=false": { + "model": "oreganized:block/lime_vigil_candle_double" + }, + "candles=2,hanging=true": { + "model": "oreganized:block/lime_vigil_candle_double_ceiling" + }, + "candles=3,hanging=false": { + "model": "oreganized:block/lime_vigil_candle_triple" + }, + "candles=3,hanging=true": { + "model": "oreganized:block/lime_vigil_candle_triple_ceiling" + }, + "candles=4,hanging=false": { + "model": "oreganized:block/lime_vigil_candle_quadruple" + }, + "candles=4,hanging=true": { + "model": "oreganized:block/lime_vigil_candle_quadruple_ceiling" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/blockstates/magenta_vigil_candle.json b/src/generated/resources/assets/oreganized/blockstates/magenta_vigil_candle.json new file mode 100644 index 00000000..26443f34 --- /dev/null +++ b/src/generated/resources/assets/oreganized/blockstates/magenta_vigil_candle.json @@ -0,0 +1,28 @@ +{ + "variants": { + "candles=1,hanging=false": { + "model": "oreganized:block/magenta_vigil_candle_single" + }, + "candles=1,hanging=true": { + "model": "oreganized:block/magenta_vigil_candle_single_ceiling" + }, + "candles=2,hanging=false": { + "model": "oreganized:block/magenta_vigil_candle_double" + }, + "candles=2,hanging=true": { + "model": "oreganized:block/magenta_vigil_candle_double_ceiling" + }, + "candles=3,hanging=false": { + "model": "oreganized:block/magenta_vigil_candle_triple" + }, + "candles=3,hanging=true": { + "model": "oreganized:block/magenta_vigil_candle_triple_ceiling" + }, + "candles=4,hanging=false": { + "model": "oreganized:block/magenta_vigil_candle_quadruple" + }, + "candles=4,hanging=true": { + "model": "oreganized:block/magenta_vigil_candle_quadruple_ceiling" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/blockstates/orange_vigil_candle.json b/src/generated/resources/assets/oreganized/blockstates/orange_vigil_candle.json new file mode 100644 index 00000000..a70d26ff --- /dev/null +++ b/src/generated/resources/assets/oreganized/blockstates/orange_vigil_candle.json @@ -0,0 +1,28 @@ +{ + "variants": { + "candles=1,hanging=false": { + "model": "oreganized:block/orange_vigil_candle_single" + }, + "candles=1,hanging=true": { + "model": "oreganized:block/orange_vigil_candle_single_ceiling" + }, + "candles=2,hanging=false": { + "model": "oreganized:block/orange_vigil_candle_double" + }, + "candles=2,hanging=true": { + "model": "oreganized:block/orange_vigil_candle_double_ceiling" + }, + "candles=3,hanging=false": { + "model": "oreganized:block/orange_vigil_candle_triple" + }, + "candles=3,hanging=true": { + "model": "oreganized:block/orange_vigil_candle_triple_ceiling" + }, + "candles=4,hanging=false": { + "model": "oreganized:block/orange_vigil_candle_quadruple" + }, + "candles=4,hanging=true": { + "model": "oreganized:block/orange_vigil_candle_quadruple_ceiling" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/blockstates/pink_vigil_candle.json b/src/generated/resources/assets/oreganized/blockstates/pink_vigil_candle.json new file mode 100644 index 00000000..bba4a5af --- /dev/null +++ b/src/generated/resources/assets/oreganized/blockstates/pink_vigil_candle.json @@ -0,0 +1,28 @@ +{ + "variants": { + "candles=1,hanging=false": { + "model": "oreganized:block/pink_vigil_candle_single" + }, + "candles=1,hanging=true": { + "model": "oreganized:block/pink_vigil_candle_single_ceiling" + }, + "candles=2,hanging=false": { + "model": "oreganized:block/pink_vigil_candle_double" + }, + "candles=2,hanging=true": { + "model": "oreganized:block/pink_vigil_candle_double_ceiling" + }, + "candles=3,hanging=false": { + "model": "oreganized:block/pink_vigil_candle_triple" + }, + "candles=3,hanging=true": { + "model": "oreganized:block/pink_vigil_candle_triple_ceiling" + }, + "candles=4,hanging=false": { + "model": "oreganized:block/pink_vigil_candle_quadruple" + }, + "candles=4,hanging=true": { + "model": "oreganized:block/pink_vigil_candle_quadruple_ceiling" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/blockstates/purple_vigil_candle.json b/src/generated/resources/assets/oreganized/blockstates/purple_vigil_candle.json new file mode 100644 index 00000000..59fc0483 --- /dev/null +++ b/src/generated/resources/assets/oreganized/blockstates/purple_vigil_candle.json @@ -0,0 +1,28 @@ +{ + "variants": { + "candles=1,hanging=false": { + "model": "oreganized:block/purple_vigil_candle_single" + }, + "candles=1,hanging=true": { + "model": "oreganized:block/purple_vigil_candle_single_ceiling" + }, + "candles=2,hanging=false": { + "model": "oreganized:block/purple_vigil_candle_double" + }, + "candles=2,hanging=true": { + "model": "oreganized:block/purple_vigil_candle_double_ceiling" + }, + "candles=3,hanging=false": { + "model": "oreganized:block/purple_vigil_candle_triple" + }, + "candles=3,hanging=true": { + "model": "oreganized:block/purple_vigil_candle_triple_ceiling" + }, + "candles=4,hanging=false": { + "model": "oreganized:block/purple_vigil_candle_quadruple" + }, + "candles=4,hanging=true": { + "model": "oreganized:block/purple_vigil_candle_quadruple_ceiling" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/blockstates/red_vigil_candle.json b/src/generated/resources/assets/oreganized/blockstates/red_vigil_candle.json new file mode 100644 index 00000000..3cc36743 --- /dev/null +++ b/src/generated/resources/assets/oreganized/blockstates/red_vigil_candle.json @@ -0,0 +1,28 @@ +{ + "variants": { + "candles=1,hanging=false": { + "model": "oreganized:block/red_vigil_candle_single" + }, + "candles=1,hanging=true": { + "model": "oreganized:block/red_vigil_candle_single_ceiling" + }, + "candles=2,hanging=false": { + "model": "oreganized:block/red_vigil_candle_double" + }, + "candles=2,hanging=true": { + "model": "oreganized:block/red_vigil_candle_double_ceiling" + }, + "candles=3,hanging=false": { + "model": "oreganized:block/red_vigil_candle_triple" + }, + "candles=3,hanging=true": { + "model": "oreganized:block/red_vigil_candle_triple_ceiling" + }, + "candles=4,hanging=false": { + "model": "oreganized:block/red_vigil_candle_quadruple" + }, + "candles=4,hanging=true": { + "model": "oreganized:block/red_vigil_candle_quadruple_ceiling" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/blockstates/vigil_candle.json b/src/generated/resources/assets/oreganized/blockstates/vigil_candle.json new file mode 100644 index 00000000..a96cdf92 --- /dev/null +++ b/src/generated/resources/assets/oreganized/blockstates/vigil_candle.json @@ -0,0 +1,28 @@ +{ + "variants": { + "candles=1,hanging=false": { + "model": "oreganized:block/defaultvigil_candle_single" + }, + "candles=1,hanging=true": { + "model": "oreganized:block/defaultvigil_candle_single_ceiling" + }, + "candles=2,hanging=false": { + "model": "oreganized:block/defaultvigil_candle_double" + }, + "candles=2,hanging=true": { + "model": "oreganized:block/defaultvigil_candle_double_ceiling" + }, + "candles=3,hanging=false": { + "model": "oreganized:block/defaultvigil_candle_triple" + }, + "candles=3,hanging=true": { + "model": "oreganized:block/defaultvigil_candle_triple_ceiling" + }, + "candles=4,hanging=false": { + "model": "oreganized:block/defaultvigil_candle_quadruple" + }, + "candles=4,hanging=true": { + "model": "oreganized:block/defaultvigil_candle_quadruple_ceiling" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/blockstates/white_vigil_candle.json b/src/generated/resources/assets/oreganized/blockstates/white_vigil_candle.json new file mode 100644 index 00000000..1f277810 --- /dev/null +++ b/src/generated/resources/assets/oreganized/blockstates/white_vigil_candle.json @@ -0,0 +1,28 @@ +{ + "variants": { + "candles=1,hanging=false": { + "model": "oreganized:block/white_vigil_candle_single" + }, + "candles=1,hanging=true": { + "model": "oreganized:block/white_vigil_candle_single_ceiling" + }, + "candles=2,hanging=false": { + "model": "oreganized:block/white_vigil_candle_double" + }, + "candles=2,hanging=true": { + "model": "oreganized:block/white_vigil_candle_double_ceiling" + }, + "candles=3,hanging=false": { + "model": "oreganized:block/white_vigil_candle_triple" + }, + "candles=3,hanging=true": { + "model": "oreganized:block/white_vigil_candle_triple_ceiling" + }, + "candles=4,hanging=false": { + "model": "oreganized:block/white_vigil_candle_quadruple" + }, + "candles=4,hanging=true": { + "model": "oreganized:block/white_vigil_candle_quadruple_ceiling" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/blockstates/yellow_vigil_candle.json b/src/generated/resources/assets/oreganized/blockstates/yellow_vigil_candle.json new file mode 100644 index 00000000..9351229d --- /dev/null +++ b/src/generated/resources/assets/oreganized/blockstates/yellow_vigil_candle.json @@ -0,0 +1,28 @@ +{ + "variants": { + "candles=1,hanging=false": { + "model": "oreganized:block/yellow_vigil_candle_single" + }, + "candles=1,hanging=true": { + "model": "oreganized:block/yellow_vigil_candle_single_ceiling" + }, + "candles=2,hanging=false": { + "model": "oreganized:block/yellow_vigil_candle_double" + }, + "candles=2,hanging=true": { + "model": "oreganized:block/yellow_vigil_candle_double_ceiling" + }, + "candles=3,hanging=false": { + "model": "oreganized:block/yellow_vigil_candle_triple" + }, + "candles=3,hanging=true": { + "model": "oreganized:block/yellow_vigil_candle_triple_ceiling" + }, + "candles=4,hanging=false": { + "model": "oreganized:block/yellow_vigil_candle_quadruple" + }, + "candles=4,hanging=true": { + "model": "oreganized:block/yellow_vigil_candle_quadruple_ceiling" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/lang/en_us.json b/src/generated/resources/assets/oreganized/lang/en_us.json index 31ede671..6c58dc7f 100644 --- a/src/generated/resources/assets/oreganized/lang/en_us.json +++ b/src/generated/resources/assets/oreganized/lang/en_us.json @@ -26,14 +26,18 @@ "attribute.oreganized.kinetic_damage": "Kinetic Damage", "block.oreganized.black_crystal_glass": "Black Crystal Glass", "block.oreganized.black_crystal_glass_pane": "Black Crystal Glass Pane", + "block.oreganized.black_vigil_candle": "Black Vigil Candle", "block.oreganized.blue_crystal_glass": "Blue Crystal Glass", "block.oreganized.blue_crystal_glass_pane": "Blue Crystal Glass Pane", + "block.oreganized.blue_vigil_candle": "Blue Vigil Candle", "block.oreganized.brown_crystal_glass": "Brown Crystal Glass", "block.oreganized.brown_crystal_glass_pane": "Brown Crystal Glass Pane", + "block.oreganized.brown_vigil_candle": "Brown Vigil Candle", "block.oreganized.chiseled_glance": "Chiseled Glance", "block.oreganized.cut_lead": "Cut Lead", "block.oreganized.cyan_crystal_glass": "Cyan Crystal Glass", "block.oreganized.cyan_crystal_glass_pane": "Cyan Crystal Glass Pane", + "block.oreganized.cyan_vigil_candle": "Cyan Vigil Candle", "block.oreganized.deepslate_lead_ore": "Deepslate Lead Ore", "block.oreganized.deepslate_silver_ore": "Deepslate Silver Ore", "block.oreganized.electrum_block": "Block of Electrum", @@ -48,8 +52,10 @@ "block.oreganized.glance_wall": "Glance Wall", "block.oreganized.gray_crystal_glass": "Gray Crystal Glass", "block.oreganized.gray_crystal_glass_pane": "Gray Crystal Glass Pane", + "block.oreganized.gray_vigil_candle": "Gray Vigil Candle", "block.oreganized.green_crystal_glass": "Green Crystal Glass", "block.oreganized.green_crystal_glass_pane": "Green Crystal Glass Pane", + "block.oreganized.green_vigil_candle": "Green Vigil Candle", "block.oreganized.grooved_blue_ice": "Grooved Blue Ice", "block.oreganized.grooved_ice": "Grooved Ice", "block.oreganized.grooved_packed_ice": "Grooved Packed Ice", @@ -64,31 +70,40 @@ "block.oreganized.lead_trapdoor": "Lead Trapdoor", "block.oreganized.light_blue_crystal_glass": "Light Blue Crystal Glass", "block.oreganized.light_blue_crystal_glass_pane": "Light Blue Crystal Glass Pane", + "block.oreganized.light_blue_vigil_candle": "Light Blue Vigil Candle", "block.oreganized.light_gray_crystal_glass": "Light Gray Crystal Glass", "block.oreganized.light_gray_crystal_glass_pane": "Light Gray Crystal Glass Pane", + "block.oreganized.light_gray_vigil_candle": "Light Gray Vigil Candle", "block.oreganized.lime_crystal_glass": "Lime Crystal Glass", "block.oreganized.lime_crystal_glass_pane": "Lime Crystal Glass Pane", + "block.oreganized.lime_vigil_candle": "Lime Vigil Candle", "block.oreganized.magenta_crystal_glass": "Magenta Crystal Glass", "block.oreganized.magenta_crystal_glass_pane": "Magenta Crystal Glass Pane", + "block.oreganized.magenta_vigil_candle": "Magenta Vigil Candle", "block.oreganized.molten_lead": "Molten Lead", "block.oreganized.molten_lead_cauldron": "Molten Lead Cauldron", "block.oreganized.orange_crystal_glass": "Orange Crystal Glass", "block.oreganized.orange_crystal_glass_pane": "Orange Crystal Glass Pane", + "block.oreganized.orange_vigil_candle": "Orange Vigil Candle", "block.oreganized.pink_crystal_glass": "Pink Crystal Glass", "block.oreganized.pink_crystal_glass_pane": "Pink Crystal Glass Pane", + "block.oreganized.pink_vigil_candle": "Pink Vigil Candle", "block.oreganized.polished_glance": "Polished Glance", "block.oreganized.polished_glance_slab": "Polished Glance Slab", "block.oreganized.polished_glance_stairs": "Polished Glance Stairs", "block.oreganized.purple_crystal_glass": "Purple Crystal Glass", "block.oreganized.purple_crystal_glass_pane": "Purple Crystal Glass Pane", + "block.oreganized.purple_vigil_candle": "Purple Vigil Candle", "block.oreganized.raw_lead_block": "Block of Raw Lead", "block.oreganized.raw_silver_block": "Block of Raw Silver", "block.oreganized.red_crystal_glass": "Red Crystal Glass", "block.oreganized.red_crystal_glass_pane": "Red Crystal Glass Pane", + "block.oreganized.red_vigil_candle": "Red Vigil Candle", "block.oreganized.shrapnel_bomb": "Shrapnel Bomb", "block.oreganized.silver_block": "Block of Silver", "block.oreganized.silver_ore": "Silver Ore", "block.oreganized.spotted_glance": "Spotted Glance", + "block.oreganized.vigil_candle": "Vigil Candle", "block.oreganized.waxed_black_concrete_powder": "Waxed Black Concrete Powder", "block.oreganized.waxed_blue_concrete_powder": "Waxed Blue Concrete Powder", "block.oreganized.waxed_brown_concrete_powder": "Waxed Brown Concrete Powder", @@ -108,8 +123,10 @@ "block.oreganized.waxed_yellow_concrete_powder": "Waxed Yellow Concrete Powder", "block.oreganized.white_crystal_glass": "White Crystal Glass", "block.oreganized.white_crystal_glass_pane": "White Crystal Glass Pane", + "block.oreganized.white_vigil_candle": "White Vigil Candle", "block.oreganized.yellow_crystal_glass": "Yellow Crystal Glass", "block.oreganized.yellow_crystal_glass_pane": "Yellow Crystal Glass Pane", + "block.oreganized.yellow_vigil_candle": "Yellow Vigil Candle", "death.attack.lead_bolt": "%1$s was shot %2$s", "death.attack.lead_bolt.item": "%1$s was shot %2$s using %3$s", "death.attack.molten_lead": "%1$s refused to let go of the soaring hot metal", diff --git a/src/generated/resources/assets/oreganized/models/block/black_vigil_candle_double.json b/src/generated/resources/assets/oreganized/models/block/black_vigil_candle_double.json new file mode 100644 index 00000000..61940637 --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/black_vigil_candle_double.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_double", + "textures": { + "0": "oreganized:block/black_vigil_candle" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/black_vigil_candle_double_ceiling.json b/src/generated/resources/assets/oreganized/models/block/black_vigil_candle_double_ceiling.json new file mode 100644 index 00000000..81f28fcb --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/black_vigil_candle_double_ceiling.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_double_ceiling", + "textures": { + "0": "oreganized:block/black_vigil_candle" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/black_vigil_candle_quadruple.json b/src/generated/resources/assets/oreganized/models/block/black_vigil_candle_quadruple.json new file mode 100644 index 00000000..1b099f71 --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/black_vigil_candle_quadruple.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_quadruple", + "textures": { + "0": "oreganized:block/black_vigil_candle" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/black_vigil_candle_quadruple_ceiling.json b/src/generated/resources/assets/oreganized/models/block/black_vigil_candle_quadruple_ceiling.json new file mode 100644 index 00000000..1d7f9c9f --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/black_vigil_candle_quadruple_ceiling.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_quadruple_ceiling", + "textures": { + "0": "oreganized:block/black_vigil_candle" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/black_vigil_candle_single.json b/src/generated/resources/assets/oreganized/models/block/black_vigil_candle_single.json new file mode 100644 index 00000000..12c00906 --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/black_vigil_candle_single.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_single", + "textures": { + "0": "oreganized:block/black_vigil_candle" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/black_vigil_candle_single_ceiling.json b/src/generated/resources/assets/oreganized/models/block/black_vigil_candle_single_ceiling.json new file mode 100644 index 00000000..6cf50773 --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/black_vigil_candle_single_ceiling.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_single_ceiling", + "textures": { + "0": "oreganized:block/black_vigil_candle" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/black_vigil_candle_triple.json b/src/generated/resources/assets/oreganized/models/block/black_vigil_candle_triple.json new file mode 100644 index 00000000..5ede3c9c --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/black_vigil_candle_triple.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_triple", + "textures": { + "0": "oreganized:block/black_vigil_candle" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/black_vigil_candle_triple_ceiling.json b/src/generated/resources/assets/oreganized/models/block/black_vigil_candle_triple_ceiling.json new file mode 100644 index 00000000..7f769c13 --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/black_vigil_candle_triple_ceiling.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_triple_ceiling", + "textures": { + "0": "oreganized:block/black_vigil_candle" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/blue_vigil_candle_double.json b/src/generated/resources/assets/oreganized/models/block/blue_vigil_candle_double.json new file mode 100644 index 00000000..3f8b65f0 --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/blue_vigil_candle_double.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_double", + "textures": { + "0": "oreganized:block/blue_vigil_candle" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/blue_vigil_candle_double_ceiling.json b/src/generated/resources/assets/oreganized/models/block/blue_vigil_candle_double_ceiling.json new file mode 100644 index 00000000..bb02f998 --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/blue_vigil_candle_double_ceiling.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_double_ceiling", + "textures": { + "0": "oreganized:block/blue_vigil_candle" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/blue_vigil_candle_quadruple.json b/src/generated/resources/assets/oreganized/models/block/blue_vigil_candle_quadruple.json new file mode 100644 index 00000000..7385f915 --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/blue_vigil_candle_quadruple.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_quadruple", + "textures": { + "0": "oreganized:block/blue_vigil_candle" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/blue_vigil_candle_quadruple_ceiling.json b/src/generated/resources/assets/oreganized/models/block/blue_vigil_candle_quadruple_ceiling.json new file mode 100644 index 00000000..964bcbb8 --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/blue_vigil_candle_quadruple_ceiling.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_quadruple_ceiling", + "textures": { + "0": "oreganized:block/blue_vigil_candle" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/blue_vigil_candle_single.json b/src/generated/resources/assets/oreganized/models/block/blue_vigil_candle_single.json new file mode 100644 index 00000000..4a58c36f --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/blue_vigil_candle_single.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_single", + "textures": { + "0": "oreganized:block/blue_vigil_candle" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/blue_vigil_candle_single_ceiling.json b/src/generated/resources/assets/oreganized/models/block/blue_vigil_candle_single_ceiling.json new file mode 100644 index 00000000..acc5405b --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/blue_vigil_candle_single_ceiling.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_single_ceiling", + "textures": { + "0": "oreganized:block/blue_vigil_candle" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/blue_vigil_candle_triple.json b/src/generated/resources/assets/oreganized/models/block/blue_vigil_candle_triple.json new file mode 100644 index 00000000..8d1462a8 --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/blue_vigil_candle_triple.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_triple", + "textures": { + "0": "oreganized:block/blue_vigil_candle" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/blue_vigil_candle_triple_ceiling.json b/src/generated/resources/assets/oreganized/models/block/blue_vigil_candle_triple_ceiling.json new file mode 100644 index 00000000..fbcdc48c --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/blue_vigil_candle_triple_ceiling.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_triple_ceiling", + "textures": { + "0": "oreganized:block/blue_vigil_candle" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/brown_vigil_candle_double.json b/src/generated/resources/assets/oreganized/models/block/brown_vigil_candle_double.json new file mode 100644 index 00000000..2976b8c9 --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/brown_vigil_candle_double.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_double", + "textures": { + "0": "oreganized:block/brown_vigil_candle" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/brown_vigil_candle_double_ceiling.json b/src/generated/resources/assets/oreganized/models/block/brown_vigil_candle_double_ceiling.json new file mode 100644 index 00000000..69215a58 --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/brown_vigil_candle_double_ceiling.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_double_ceiling", + "textures": { + "0": "oreganized:block/brown_vigil_candle" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/brown_vigil_candle_quadruple.json b/src/generated/resources/assets/oreganized/models/block/brown_vigil_candle_quadruple.json new file mode 100644 index 00000000..06749332 --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/brown_vigil_candle_quadruple.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_quadruple", + "textures": { + "0": "oreganized:block/brown_vigil_candle" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/brown_vigil_candle_quadruple_ceiling.json b/src/generated/resources/assets/oreganized/models/block/brown_vigil_candle_quadruple_ceiling.json new file mode 100644 index 00000000..ed1cf4e0 --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/brown_vigil_candle_quadruple_ceiling.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_quadruple_ceiling", + "textures": { + "0": "oreganized:block/brown_vigil_candle" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/brown_vigil_candle_single.json b/src/generated/resources/assets/oreganized/models/block/brown_vigil_candle_single.json new file mode 100644 index 00000000..7a35a102 --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/brown_vigil_candle_single.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_single", + "textures": { + "0": "oreganized:block/brown_vigil_candle" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/brown_vigil_candle_single_ceiling.json b/src/generated/resources/assets/oreganized/models/block/brown_vigil_candle_single_ceiling.json new file mode 100644 index 00000000..ee4326cf --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/brown_vigil_candle_single_ceiling.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_single_ceiling", + "textures": { + "0": "oreganized:block/brown_vigil_candle" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/brown_vigil_candle_triple.json b/src/generated/resources/assets/oreganized/models/block/brown_vigil_candle_triple.json new file mode 100644 index 00000000..bd8e6c04 --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/brown_vigil_candle_triple.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_triple", + "textures": { + "0": "oreganized:block/brown_vigil_candle" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/brown_vigil_candle_triple_ceiling.json b/src/generated/resources/assets/oreganized/models/block/brown_vigil_candle_triple_ceiling.json new file mode 100644 index 00000000..ab6acbdf --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/brown_vigil_candle_triple_ceiling.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_triple_ceiling", + "textures": { + "0": "oreganized:block/brown_vigil_candle" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/cyan_vigil_candle_double.json b/src/generated/resources/assets/oreganized/models/block/cyan_vigil_candle_double.json new file mode 100644 index 00000000..304ec8a4 --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/cyan_vigil_candle_double.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_double", + "textures": { + "0": "oreganized:block/cyan_vigil_candle" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/cyan_vigil_candle_double_ceiling.json b/src/generated/resources/assets/oreganized/models/block/cyan_vigil_candle_double_ceiling.json new file mode 100644 index 00000000..4fefd995 --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/cyan_vigil_candle_double_ceiling.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_double_ceiling", + "textures": { + "0": "oreganized:block/cyan_vigil_candle" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/cyan_vigil_candle_quadruple.json b/src/generated/resources/assets/oreganized/models/block/cyan_vigil_candle_quadruple.json new file mode 100644 index 00000000..017f6977 --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/cyan_vigil_candle_quadruple.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_quadruple", + "textures": { + "0": "oreganized:block/cyan_vigil_candle" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/cyan_vigil_candle_quadruple_ceiling.json b/src/generated/resources/assets/oreganized/models/block/cyan_vigil_candle_quadruple_ceiling.json new file mode 100644 index 00000000..7b6c89c5 --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/cyan_vigil_candle_quadruple_ceiling.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_quadruple_ceiling", + "textures": { + "0": "oreganized:block/cyan_vigil_candle" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/cyan_vigil_candle_single.json b/src/generated/resources/assets/oreganized/models/block/cyan_vigil_candle_single.json new file mode 100644 index 00000000..27ff9345 --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/cyan_vigil_candle_single.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_single", + "textures": { + "0": "oreganized:block/cyan_vigil_candle" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/cyan_vigil_candle_single_ceiling.json b/src/generated/resources/assets/oreganized/models/block/cyan_vigil_candle_single_ceiling.json new file mode 100644 index 00000000..cdcbd532 --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/cyan_vigil_candle_single_ceiling.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_single_ceiling", + "textures": { + "0": "oreganized:block/cyan_vigil_candle" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/cyan_vigil_candle_triple.json b/src/generated/resources/assets/oreganized/models/block/cyan_vigil_candle_triple.json new file mode 100644 index 00000000..830ff392 --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/cyan_vigil_candle_triple.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_triple", + "textures": { + "0": "oreganized:block/cyan_vigil_candle" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/cyan_vigil_candle_triple_ceiling.json b/src/generated/resources/assets/oreganized/models/block/cyan_vigil_candle_triple_ceiling.json new file mode 100644 index 00000000..db9def16 --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/cyan_vigil_candle_triple_ceiling.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_triple_ceiling", + "textures": { + "0": "oreganized:block/cyan_vigil_candle" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/defaultvigil_candle_double.json b/src/generated/resources/assets/oreganized/models/block/defaultvigil_candle_double.json new file mode 100644 index 00000000..9a303233 --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/defaultvigil_candle_double.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_double", + "textures": { + "0": "oreganized:block/vigil_candle" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/defaultvigil_candle_double_ceiling.json b/src/generated/resources/assets/oreganized/models/block/defaultvigil_candle_double_ceiling.json new file mode 100644 index 00000000..05f165dc --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/defaultvigil_candle_double_ceiling.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_double_ceiling", + "textures": { + "0": "oreganized:block/vigil_candle" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/defaultvigil_candle_quadruple.json b/src/generated/resources/assets/oreganized/models/block/defaultvigil_candle_quadruple.json new file mode 100644 index 00000000..5102d834 --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/defaultvigil_candle_quadruple.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_quadruple", + "textures": { + "0": "oreganized:block/vigil_candle" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/defaultvigil_candle_quadruple_ceiling.json b/src/generated/resources/assets/oreganized/models/block/defaultvigil_candle_quadruple_ceiling.json new file mode 100644 index 00000000..791019c8 --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/defaultvigil_candle_quadruple_ceiling.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_quadruple_ceiling", + "textures": { + "0": "oreganized:block/vigil_candle" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/defaultvigil_candle_single.json b/src/generated/resources/assets/oreganized/models/block/defaultvigil_candle_single.json new file mode 100644 index 00000000..7da88b8a --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/defaultvigil_candle_single.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_single", + "textures": { + "0": "oreganized:block/vigil_candle" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/defaultvigil_candle_single_ceiling.json b/src/generated/resources/assets/oreganized/models/block/defaultvigil_candle_single_ceiling.json new file mode 100644 index 00000000..dfbe82ec --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/defaultvigil_candle_single_ceiling.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_single_ceiling", + "textures": { + "0": "oreganized:block/vigil_candle" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/defaultvigil_candle_triple.json b/src/generated/resources/assets/oreganized/models/block/defaultvigil_candle_triple.json new file mode 100644 index 00000000..93990209 --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/defaultvigil_candle_triple.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_triple", + "textures": { + "0": "oreganized:block/vigil_candle" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/defaultvigil_candle_triple_ceiling.json b/src/generated/resources/assets/oreganized/models/block/defaultvigil_candle_triple_ceiling.json new file mode 100644 index 00000000..66428a26 --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/defaultvigil_candle_triple_ceiling.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_triple_ceiling", + "textures": { + "0": "oreganized:block/vigil_candle" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/gray_vigil_candle_double.json b/src/generated/resources/assets/oreganized/models/block/gray_vigil_candle_double.json new file mode 100644 index 00000000..d1fdb25e --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/gray_vigil_candle_double.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_double", + "textures": { + "0": "oreganized:block/gray_vigil_candle" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/gray_vigil_candle_double_ceiling.json b/src/generated/resources/assets/oreganized/models/block/gray_vigil_candle_double_ceiling.json new file mode 100644 index 00000000..de694aa7 --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/gray_vigil_candle_double_ceiling.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_double_ceiling", + "textures": { + "0": "oreganized:block/gray_vigil_candle" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/gray_vigil_candle_quadruple.json b/src/generated/resources/assets/oreganized/models/block/gray_vigil_candle_quadruple.json new file mode 100644 index 00000000..69fdb84b --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/gray_vigil_candle_quadruple.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_quadruple", + "textures": { + "0": "oreganized:block/gray_vigil_candle" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/gray_vigil_candle_quadruple_ceiling.json b/src/generated/resources/assets/oreganized/models/block/gray_vigil_candle_quadruple_ceiling.json new file mode 100644 index 00000000..83c1fdaf --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/gray_vigil_candle_quadruple_ceiling.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_quadruple_ceiling", + "textures": { + "0": "oreganized:block/gray_vigil_candle" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/gray_vigil_candle_single.json b/src/generated/resources/assets/oreganized/models/block/gray_vigil_candle_single.json new file mode 100644 index 00000000..e71b7729 --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/gray_vigil_candle_single.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_single", + "textures": { + "0": "oreganized:block/gray_vigil_candle" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/gray_vigil_candle_single_ceiling.json b/src/generated/resources/assets/oreganized/models/block/gray_vigil_candle_single_ceiling.json new file mode 100644 index 00000000..3e23a70c --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/gray_vigil_candle_single_ceiling.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_single_ceiling", + "textures": { + "0": "oreganized:block/gray_vigil_candle" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/gray_vigil_candle_triple.json b/src/generated/resources/assets/oreganized/models/block/gray_vigil_candle_triple.json new file mode 100644 index 00000000..404be3c8 --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/gray_vigil_candle_triple.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_triple", + "textures": { + "0": "oreganized:block/gray_vigil_candle" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/gray_vigil_candle_triple_ceiling.json b/src/generated/resources/assets/oreganized/models/block/gray_vigil_candle_triple_ceiling.json new file mode 100644 index 00000000..efa45f7e --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/gray_vigil_candle_triple_ceiling.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_triple_ceiling", + "textures": { + "0": "oreganized:block/gray_vigil_candle" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/green_vigil_candle_double.json b/src/generated/resources/assets/oreganized/models/block/green_vigil_candle_double.json new file mode 100644 index 00000000..b76c265a --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/green_vigil_candle_double.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_double", + "textures": { + "0": "oreganized:block/green_vigil_candle" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/green_vigil_candle_double_ceiling.json b/src/generated/resources/assets/oreganized/models/block/green_vigil_candle_double_ceiling.json new file mode 100644 index 00000000..60607361 --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/green_vigil_candle_double_ceiling.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_double_ceiling", + "textures": { + "0": "oreganized:block/green_vigil_candle" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/green_vigil_candle_quadruple.json b/src/generated/resources/assets/oreganized/models/block/green_vigil_candle_quadruple.json new file mode 100644 index 00000000..1a9028bd --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/green_vigil_candle_quadruple.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_quadruple", + "textures": { + "0": "oreganized:block/green_vigil_candle" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/green_vigil_candle_quadruple_ceiling.json b/src/generated/resources/assets/oreganized/models/block/green_vigil_candle_quadruple_ceiling.json new file mode 100644 index 00000000..5bdbb969 --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/green_vigil_candle_quadruple_ceiling.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_quadruple_ceiling", + "textures": { + "0": "oreganized:block/green_vigil_candle" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/green_vigil_candle_single.json b/src/generated/resources/assets/oreganized/models/block/green_vigil_candle_single.json new file mode 100644 index 00000000..817b4f9a --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/green_vigil_candle_single.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_single", + "textures": { + "0": "oreganized:block/green_vigil_candle" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/green_vigil_candle_single_ceiling.json b/src/generated/resources/assets/oreganized/models/block/green_vigil_candle_single_ceiling.json new file mode 100644 index 00000000..2ccf14c1 --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/green_vigil_candle_single_ceiling.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_single_ceiling", + "textures": { + "0": "oreganized:block/green_vigil_candle" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/green_vigil_candle_triple.json b/src/generated/resources/assets/oreganized/models/block/green_vigil_candle_triple.json new file mode 100644 index 00000000..019cc4e3 --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/green_vigil_candle_triple.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_triple", + "textures": { + "0": "oreganized:block/green_vigil_candle" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/green_vigil_candle_triple_ceiling.json b/src/generated/resources/assets/oreganized/models/block/green_vigil_candle_triple_ceiling.json new file mode 100644 index 00000000..ac6479ce --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/green_vigil_candle_triple_ceiling.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_triple_ceiling", + "textures": { + "0": "oreganized:block/green_vigil_candle" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/light_blue_vigil_candle_double.json b/src/generated/resources/assets/oreganized/models/block/light_blue_vigil_candle_double.json new file mode 100644 index 00000000..97671b9f --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/light_blue_vigil_candle_double.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_double", + "textures": { + "0": "oreganized:block/light_blue_vigil_candle" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/light_blue_vigil_candle_double_ceiling.json b/src/generated/resources/assets/oreganized/models/block/light_blue_vigil_candle_double_ceiling.json new file mode 100644 index 00000000..f34f22e2 --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/light_blue_vigil_candle_double_ceiling.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_double_ceiling", + "textures": { + "0": "oreganized:block/light_blue_vigil_candle" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/light_blue_vigil_candle_quadruple.json b/src/generated/resources/assets/oreganized/models/block/light_blue_vigil_candle_quadruple.json new file mode 100644 index 00000000..fa954b02 --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/light_blue_vigil_candle_quadruple.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_quadruple", + "textures": { + "0": "oreganized:block/light_blue_vigil_candle" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/light_blue_vigil_candle_quadruple_ceiling.json b/src/generated/resources/assets/oreganized/models/block/light_blue_vigil_candle_quadruple_ceiling.json new file mode 100644 index 00000000..dceede9e --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/light_blue_vigil_candle_quadruple_ceiling.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_quadruple_ceiling", + "textures": { + "0": "oreganized:block/light_blue_vigil_candle" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/light_blue_vigil_candle_single.json b/src/generated/resources/assets/oreganized/models/block/light_blue_vigil_candle_single.json new file mode 100644 index 00000000..105bd626 --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/light_blue_vigil_candle_single.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_single", + "textures": { + "0": "oreganized:block/light_blue_vigil_candle" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/light_blue_vigil_candle_single_ceiling.json b/src/generated/resources/assets/oreganized/models/block/light_blue_vigil_candle_single_ceiling.json new file mode 100644 index 00000000..fd446a55 --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/light_blue_vigil_candle_single_ceiling.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_single_ceiling", + "textures": { + "0": "oreganized:block/light_blue_vigil_candle" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/light_blue_vigil_candle_triple.json b/src/generated/resources/assets/oreganized/models/block/light_blue_vigil_candle_triple.json new file mode 100644 index 00000000..6bb959ad --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/light_blue_vigil_candle_triple.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_triple", + "textures": { + "0": "oreganized:block/light_blue_vigil_candle" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/light_blue_vigil_candle_triple_ceiling.json b/src/generated/resources/assets/oreganized/models/block/light_blue_vigil_candle_triple_ceiling.json new file mode 100644 index 00000000..08f1e476 --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/light_blue_vigil_candle_triple_ceiling.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_triple_ceiling", + "textures": { + "0": "oreganized:block/light_blue_vigil_candle" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/light_gray_vigil_candle_double.json b/src/generated/resources/assets/oreganized/models/block/light_gray_vigil_candle_double.json new file mode 100644 index 00000000..c5f2b1cb --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/light_gray_vigil_candle_double.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_double", + "textures": { + "0": "oreganized:block/light_gray_vigil_candle" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/light_gray_vigil_candle_double_ceiling.json b/src/generated/resources/assets/oreganized/models/block/light_gray_vigil_candle_double_ceiling.json new file mode 100644 index 00000000..60adc5ed --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/light_gray_vigil_candle_double_ceiling.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_double_ceiling", + "textures": { + "0": "oreganized:block/light_gray_vigil_candle" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/light_gray_vigil_candle_quadruple.json b/src/generated/resources/assets/oreganized/models/block/light_gray_vigil_candle_quadruple.json new file mode 100644 index 00000000..a829d591 --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/light_gray_vigil_candle_quadruple.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_quadruple", + "textures": { + "0": "oreganized:block/light_gray_vigil_candle" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/light_gray_vigil_candle_quadruple_ceiling.json b/src/generated/resources/assets/oreganized/models/block/light_gray_vigil_candle_quadruple_ceiling.json new file mode 100644 index 00000000..54280076 --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/light_gray_vigil_candle_quadruple_ceiling.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_quadruple_ceiling", + "textures": { + "0": "oreganized:block/light_gray_vigil_candle" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/light_gray_vigil_candle_single.json b/src/generated/resources/assets/oreganized/models/block/light_gray_vigil_candle_single.json new file mode 100644 index 00000000..3a6d62cf --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/light_gray_vigil_candle_single.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_single", + "textures": { + "0": "oreganized:block/light_gray_vigil_candle" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/light_gray_vigil_candle_single_ceiling.json b/src/generated/resources/assets/oreganized/models/block/light_gray_vigil_candle_single_ceiling.json new file mode 100644 index 00000000..f332c7ec --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/light_gray_vigil_candle_single_ceiling.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_single_ceiling", + "textures": { + "0": "oreganized:block/light_gray_vigil_candle" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/light_gray_vigil_candle_triple.json b/src/generated/resources/assets/oreganized/models/block/light_gray_vigil_candle_triple.json new file mode 100644 index 00000000..7cb29762 --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/light_gray_vigil_candle_triple.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_triple", + "textures": { + "0": "oreganized:block/light_gray_vigil_candle" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/light_gray_vigil_candle_triple_ceiling.json b/src/generated/resources/assets/oreganized/models/block/light_gray_vigil_candle_triple_ceiling.json new file mode 100644 index 00000000..65386507 --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/light_gray_vigil_candle_triple_ceiling.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_triple_ceiling", + "textures": { + "0": "oreganized:block/light_gray_vigil_candle" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/lime_vigil_candle_double.json b/src/generated/resources/assets/oreganized/models/block/lime_vigil_candle_double.json new file mode 100644 index 00000000..95efe5e3 --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/lime_vigil_candle_double.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_double", + "textures": { + "0": "oreganized:block/lime_vigil_candle" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/lime_vigil_candle_double_ceiling.json b/src/generated/resources/assets/oreganized/models/block/lime_vigil_candle_double_ceiling.json new file mode 100644 index 00000000..10d88498 --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/lime_vigil_candle_double_ceiling.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_double_ceiling", + "textures": { + "0": "oreganized:block/lime_vigil_candle" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/lime_vigil_candle_quadruple.json b/src/generated/resources/assets/oreganized/models/block/lime_vigil_candle_quadruple.json new file mode 100644 index 00000000..bffb518a --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/lime_vigil_candle_quadruple.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_quadruple", + "textures": { + "0": "oreganized:block/lime_vigil_candle" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/lime_vigil_candle_quadruple_ceiling.json b/src/generated/resources/assets/oreganized/models/block/lime_vigil_candle_quadruple_ceiling.json new file mode 100644 index 00000000..75423d7e --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/lime_vigil_candle_quadruple_ceiling.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_quadruple_ceiling", + "textures": { + "0": "oreganized:block/lime_vigil_candle" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/lime_vigil_candle_single.json b/src/generated/resources/assets/oreganized/models/block/lime_vigil_candle_single.json new file mode 100644 index 00000000..26771d23 --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/lime_vigil_candle_single.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_single", + "textures": { + "0": "oreganized:block/lime_vigil_candle" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/lime_vigil_candle_single_ceiling.json b/src/generated/resources/assets/oreganized/models/block/lime_vigil_candle_single_ceiling.json new file mode 100644 index 00000000..e00722de --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/lime_vigil_candle_single_ceiling.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_single_ceiling", + "textures": { + "0": "oreganized:block/lime_vigil_candle" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/lime_vigil_candle_triple.json b/src/generated/resources/assets/oreganized/models/block/lime_vigil_candle_triple.json new file mode 100644 index 00000000..be70b5af --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/lime_vigil_candle_triple.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_triple", + "textures": { + "0": "oreganized:block/lime_vigil_candle" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/lime_vigil_candle_triple_ceiling.json b/src/generated/resources/assets/oreganized/models/block/lime_vigil_candle_triple_ceiling.json new file mode 100644 index 00000000..c5916a85 --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/lime_vigil_candle_triple_ceiling.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_triple_ceiling", + "textures": { + "0": "oreganized:block/lime_vigil_candle" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/magenta_vigil_candle_double.json b/src/generated/resources/assets/oreganized/models/block/magenta_vigil_candle_double.json new file mode 100644 index 00000000..e9da4feb --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/magenta_vigil_candle_double.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_double", + "textures": { + "0": "oreganized:block/magenta_vigil_candle" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/magenta_vigil_candle_double_ceiling.json b/src/generated/resources/assets/oreganized/models/block/magenta_vigil_candle_double_ceiling.json new file mode 100644 index 00000000..34b25467 --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/magenta_vigil_candle_double_ceiling.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_double_ceiling", + "textures": { + "0": "oreganized:block/magenta_vigil_candle" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/magenta_vigil_candle_quadruple.json b/src/generated/resources/assets/oreganized/models/block/magenta_vigil_candle_quadruple.json new file mode 100644 index 00000000..23aec34b --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/magenta_vigil_candle_quadruple.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_quadruple", + "textures": { + "0": "oreganized:block/magenta_vigil_candle" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/magenta_vigil_candle_quadruple_ceiling.json b/src/generated/resources/assets/oreganized/models/block/magenta_vigil_candle_quadruple_ceiling.json new file mode 100644 index 00000000..93d10414 --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/magenta_vigil_candle_quadruple_ceiling.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_quadruple_ceiling", + "textures": { + "0": "oreganized:block/magenta_vigil_candle" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/magenta_vigil_candle_single.json b/src/generated/resources/assets/oreganized/models/block/magenta_vigil_candle_single.json new file mode 100644 index 00000000..11a7f651 --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/magenta_vigil_candle_single.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_single", + "textures": { + "0": "oreganized:block/magenta_vigil_candle" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/magenta_vigil_candle_single_ceiling.json b/src/generated/resources/assets/oreganized/models/block/magenta_vigil_candle_single_ceiling.json new file mode 100644 index 00000000..ec5ad24c --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/magenta_vigil_candle_single_ceiling.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_single_ceiling", + "textures": { + "0": "oreganized:block/magenta_vigil_candle" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/magenta_vigil_candle_triple.json b/src/generated/resources/assets/oreganized/models/block/magenta_vigil_candle_triple.json new file mode 100644 index 00000000..7201888a --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/magenta_vigil_candle_triple.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_triple", + "textures": { + "0": "oreganized:block/magenta_vigil_candle" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/magenta_vigil_candle_triple_ceiling.json b/src/generated/resources/assets/oreganized/models/block/magenta_vigil_candle_triple_ceiling.json new file mode 100644 index 00000000..130d6e81 --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/magenta_vigil_candle_triple_ceiling.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_triple_ceiling", + "textures": { + "0": "oreganized:block/magenta_vigil_candle" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/orange_vigil_candle_double.json b/src/generated/resources/assets/oreganized/models/block/orange_vigil_candle_double.json new file mode 100644 index 00000000..4bcd2340 --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/orange_vigil_candle_double.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_double", + "textures": { + "0": "oreganized:block/orange_vigil_candle" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/orange_vigil_candle_double_ceiling.json b/src/generated/resources/assets/oreganized/models/block/orange_vigil_candle_double_ceiling.json new file mode 100644 index 00000000..46fd1a11 --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/orange_vigil_candle_double_ceiling.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_double_ceiling", + "textures": { + "0": "oreganized:block/orange_vigil_candle" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/orange_vigil_candle_quadruple.json b/src/generated/resources/assets/oreganized/models/block/orange_vigil_candle_quadruple.json new file mode 100644 index 00000000..3639c02d --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/orange_vigil_candle_quadruple.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_quadruple", + "textures": { + "0": "oreganized:block/orange_vigil_candle" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/orange_vigil_candle_quadruple_ceiling.json b/src/generated/resources/assets/oreganized/models/block/orange_vigil_candle_quadruple_ceiling.json new file mode 100644 index 00000000..0aecba3f --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/orange_vigil_candle_quadruple_ceiling.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_quadruple_ceiling", + "textures": { + "0": "oreganized:block/orange_vigil_candle" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/orange_vigil_candle_single.json b/src/generated/resources/assets/oreganized/models/block/orange_vigil_candle_single.json new file mode 100644 index 00000000..c8757d4d --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/orange_vigil_candle_single.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_single", + "textures": { + "0": "oreganized:block/orange_vigil_candle" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/orange_vigil_candle_single_ceiling.json b/src/generated/resources/assets/oreganized/models/block/orange_vigil_candle_single_ceiling.json new file mode 100644 index 00000000..bb761c34 --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/orange_vigil_candle_single_ceiling.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_single_ceiling", + "textures": { + "0": "oreganized:block/orange_vigil_candle" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/orange_vigil_candle_triple.json b/src/generated/resources/assets/oreganized/models/block/orange_vigil_candle_triple.json new file mode 100644 index 00000000..c97fd4d3 --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/orange_vigil_candle_triple.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_triple", + "textures": { + "0": "oreganized:block/orange_vigil_candle" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/orange_vigil_candle_triple_ceiling.json b/src/generated/resources/assets/oreganized/models/block/orange_vigil_candle_triple_ceiling.json new file mode 100644 index 00000000..b8513d1a --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/orange_vigil_candle_triple_ceiling.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_triple_ceiling", + "textures": { + "0": "oreganized:block/orange_vigil_candle" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/pink_vigil_candle_double.json b/src/generated/resources/assets/oreganized/models/block/pink_vigil_candle_double.json new file mode 100644 index 00000000..9427b638 --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/pink_vigil_candle_double.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_double", + "textures": { + "0": "oreganized:block/pink_vigil_candle" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/pink_vigil_candle_double_ceiling.json b/src/generated/resources/assets/oreganized/models/block/pink_vigil_candle_double_ceiling.json new file mode 100644 index 00000000..273bb0fe --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/pink_vigil_candle_double_ceiling.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_double_ceiling", + "textures": { + "0": "oreganized:block/pink_vigil_candle" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/pink_vigil_candle_quadruple.json b/src/generated/resources/assets/oreganized/models/block/pink_vigil_candle_quadruple.json new file mode 100644 index 00000000..08655fbf --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/pink_vigil_candle_quadruple.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_quadruple", + "textures": { + "0": "oreganized:block/pink_vigil_candle" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/pink_vigil_candle_quadruple_ceiling.json b/src/generated/resources/assets/oreganized/models/block/pink_vigil_candle_quadruple_ceiling.json new file mode 100644 index 00000000..3fdbfe74 --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/pink_vigil_candle_quadruple_ceiling.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_quadruple_ceiling", + "textures": { + "0": "oreganized:block/pink_vigil_candle" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/pink_vigil_candle_single.json b/src/generated/resources/assets/oreganized/models/block/pink_vigil_candle_single.json new file mode 100644 index 00000000..a2a2533b --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/pink_vigil_candle_single.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_single", + "textures": { + "0": "oreganized:block/pink_vigil_candle" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/pink_vigil_candle_single_ceiling.json b/src/generated/resources/assets/oreganized/models/block/pink_vigil_candle_single_ceiling.json new file mode 100644 index 00000000..214c150f --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/pink_vigil_candle_single_ceiling.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_single_ceiling", + "textures": { + "0": "oreganized:block/pink_vigil_candle" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/pink_vigil_candle_triple.json b/src/generated/resources/assets/oreganized/models/block/pink_vigil_candle_triple.json new file mode 100644 index 00000000..3f6476e7 --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/pink_vigil_candle_triple.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_triple", + "textures": { + "0": "oreganized:block/pink_vigil_candle" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/pink_vigil_candle_triple_ceiling.json b/src/generated/resources/assets/oreganized/models/block/pink_vigil_candle_triple_ceiling.json new file mode 100644 index 00000000..3841968b --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/pink_vigil_candle_triple_ceiling.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_triple_ceiling", + "textures": { + "0": "oreganized:block/pink_vigil_candle" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/purple_vigil_candle_double.json b/src/generated/resources/assets/oreganized/models/block/purple_vigil_candle_double.json new file mode 100644 index 00000000..337952f6 --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/purple_vigil_candle_double.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_double", + "textures": { + "0": "oreganized:block/purple_vigil_candle" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/purple_vigil_candle_double_ceiling.json b/src/generated/resources/assets/oreganized/models/block/purple_vigil_candle_double_ceiling.json new file mode 100644 index 00000000..5c424d6f --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/purple_vigil_candle_double_ceiling.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_double_ceiling", + "textures": { + "0": "oreganized:block/purple_vigil_candle" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/purple_vigil_candle_quadruple.json b/src/generated/resources/assets/oreganized/models/block/purple_vigil_candle_quadruple.json new file mode 100644 index 00000000..cd06c7a2 --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/purple_vigil_candle_quadruple.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_quadruple", + "textures": { + "0": "oreganized:block/purple_vigil_candle" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/purple_vigil_candle_quadruple_ceiling.json b/src/generated/resources/assets/oreganized/models/block/purple_vigil_candle_quadruple_ceiling.json new file mode 100644 index 00000000..8f24a505 --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/purple_vigil_candle_quadruple_ceiling.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_quadruple_ceiling", + "textures": { + "0": "oreganized:block/purple_vigil_candle" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/purple_vigil_candle_single.json b/src/generated/resources/assets/oreganized/models/block/purple_vigil_candle_single.json new file mode 100644 index 00000000..bc5357b8 --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/purple_vigil_candle_single.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_single", + "textures": { + "0": "oreganized:block/purple_vigil_candle" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/purple_vigil_candle_single_ceiling.json b/src/generated/resources/assets/oreganized/models/block/purple_vigil_candle_single_ceiling.json new file mode 100644 index 00000000..86e77584 --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/purple_vigil_candle_single_ceiling.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_single_ceiling", + "textures": { + "0": "oreganized:block/purple_vigil_candle" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/purple_vigil_candle_triple.json b/src/generated/resources/assets/oreganized/models/block/purple_vigil_candle_triple.json new file mode 100644 index 00000000..11d1b587 --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/purple_vigil_candle_triple.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_triple", + "textures": { + "0": "oreganized:block/purple_vigil_candle" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/purple_vigil_candle_triple_ceiling.json b/src/generated/resources/assets/oreganized/models/block/purple_vigil_candle_triple_ceiling.json new file mode 100644 index 00000000..068e13b2 --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/purple_vigil_candle_triple_ceiling.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_triple_ceiling", + "textures": { + "0": "oreganized:block/purple_vigil_candle" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/red_vigil_candle_double.json b/src/generated/resources/assets/oreganized/models/block/red_vigil_candle_double.json new file mode 100644 index 00000000..494adb1d --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/red_vigil_candle_double.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_double", + "textures": { + "0": "oreganized:block/red_vigil_candle" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/red_vigil_candle_double_ceiling.json b/src/generated/resources/assets/oreganized/models/block/red_vigil_candle_double_ceiling.json new file mode 100644 index 00000000..0761a2cf --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/red_vigil_candle_double_ceiling.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_double_ceiling", + "textures": { + "0": "oreganized:block/red_vigil_candle" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/red_vigil_candle_quadruple.json b/src/generated/resources/assets/oreganized/models/block/red_vigil_candle_quadruple.json new file mode 100644 index 00000000..8a085a3c --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/red_vigil_candle_quadruple.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_quadruple", + "textures": { + "0": "oreganized:block/red_vigil_candle" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/red_vigil_candle_quadruple_ceiling.json b/src/generated/resources/assets/oreganized/models/block/red_vigil_candle_quadruple_ceiling.json new file mode 100644 index 00000000..bff70bff --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/red_vigil_candle_quadruple_ceiling.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_quadruple_ceiling", + "textures": { + "0": "oreganized:block/red_vigil_candle" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/red_vigil_candle_single.json b/src/generated/resources/assets/oreganized/models/block/red_vigil_candle_single.json new file mode 100644 index 00000000..3a033783 --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/red_vigil_candle_single.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_single", + "textures": { + "0": "oreganized:block/red_vigil_candle" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/red_vigil_candle_single_ceiling.json b/src/generated/resources/assets/oreganized/models/block/red_vigil_candle_single_ceiling.json new file mode 100644 index 00000000..356f7a40 --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/red_vigil_candle_single_ceiling.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_single_ceiling", + "textures": { + "0": "oreganized:block/red_vigil_candle" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/red_vigil_candle_triple.json b/src/generated/resources/assets/oreganized/models/block/red_vigil_candle_triple.json new file mode 100644 index 00000000..27a190c4 --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/red_vigil_candle_triple.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_triple", + "textures": { + "0": "oreganized:block/red_vigil_candle" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/red_vigil_candle_triple_ceiling.json b/src/generated/resources/assets/oreganized/models/block/red_vigil_candle_triple_ceiling.json new file mode 100644 index 00000000..8b067110 --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/red_vigil_candle_triple_ceiling.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_triple_ceiling", + "textures": { + "0": "oreganized:block/red_vigil_candle" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/white_vigil_candle_double.json b/src/generated/resources/assets/oreganized/models/block/white_vigil_candle_double.json new file mode 100644 index 00000000..d831c9b2 --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/white_vigil_candle_double.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_double", + "textures": { + "0": "oreganized:block/white_vigil_candle" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/white_vigil_candle_double_ceiling.json b/src/generated/resources/assets/oreganized/models/block/white_vigil_candle_double_ceiling.json new file mode 100644 index 00000000..54182e4d --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/white_vigil_candle_double_ceiling.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_double_ceiling", + "textures": { + "0": "oreganized:block/white_vigil_candle" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/white_vigil_candle_quadruple.json b/src/generated/resources/assets/oreganized/models/block/white_vigil_candle_quadruple.json new file mode 100644 index 00000000..cd9578d0 --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/white_vigil_candle_quadruple.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_quadruple", + "textures": { + "0": "oreganized:block/white_vigil_candle" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/white_vigil_candle_quadruple_ceiling.json b/src/generated/resources/assets/oreganized/models/block/white_vigil_candle_quadruple_ceiling.json new file mode 100644 index 00000000..5f75f8a8 --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/white_vigil_candle_quadruple_ceiling.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_quadruple_ceiling", + "textures": { + "0": "oreganized:block/white_vigil_candle" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/white_vigil_candle_single.json b/src/generated/resources/assets/oreganized/models/block/white_vigil_candle_single.json new file mode 100644 index 00000000..e567e95c --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/white_vigil_candle_single.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_single", + "textures": { + "0": "oreganized:block/white_vigil_candle" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/white_vigil_candle_single_ceiling.json b/src/generated/resources/assets/oreganized/models/block/white_vigil_candle_single_ceiling.json new file mode 100644 index 00000000..27e745f3 --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/white_vigil_candle_single_ceiling.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_single_ceiling", + "textures": { + "0": "oreganized:block/white_vigil_candle" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/white_vigil_candle_triple.json b/src/generated/resources/assets/oreganized/models/block/white_vigil_candle_triple.json new file mode 100644 index 00000000..125b65b0 --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/white_vigil_candle_triple.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_triple", + "textures": { + "0": "oreganized:block/white_vigil_candle" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/white_vigil_candle_triple_ceiling.json b/src/generated/resources/assets/oreganized/models/block/white_vigil_candle_triple_ceiling.json new file mode 100644 index 00000000..d0541677 --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/white_vigil_candle_triple_ceiling.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_triple_ceiling", + "textures": { + "0": "oreganized:block/white_vigil_candle" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/yellow_vigil_candle_double.json b/src/generated/resources/assets/oreganized/models/block/yellow_vigil_candle_double.json new file mode 100644 index 00000000..915dfbd1 --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/yellow_vigil_candle_double.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_double", + "textures": { + "0": "oreganized:block/yellow_vigil_candle" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/yellow_vigil_candle_double_ceiling.json b/src/generated/resources/assets/oreganized/models/block/yellow_vigil_candle_double_ceiling.json new file mode 100644 index 00000000..0cc4de41 --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/yellow_vigil_candle_double_ceiling.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_double_ceiling", + "textures": { + "0": "oreganized:block/yellow_vigil_candle" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/yellow_vigil_candle_quadruple.json b/src/generated/resources/assets/oreganized/models/block/yellow_vigil_candle_quadruple.json new file mode 100644 index 00000000..30aa691f --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/yellow_vigil_candle_quadruple.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_quadruple", + "textures": { + "0": "oreganized:block/yellow_vigil_candle" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/yellow_vigil_candle_quadruple_ceiling.json b/src/generated/resources/assets/oreganized/models/block/yellow_vigil_candle_quadruple_ceiling.json new file mode 100644 index 00000000..468758d9 --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/yellow_vigil_candle_quadruple_ceiling.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_quadruple_ceiling", + "textures": { + "0": "oreganized:block/yellow_vigil_candle" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/yellow_vigil_candle_single.json b/src/generated/resources/assets/oreganized/models/block/yellow_vigil_candle_single.json new file mode 100644 index 00000000..9497cfa7 --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/yellow_vigil_candle_single.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_single", + "textures": { + "0": "oreganized:block/yellow_vigil_candle" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/yellow_vigil_candle_single_ceiling.json b/src/generated/resources/assets/oreganized/models/block/yellow_vigil_candle_single_ceiling.json new file mode 100644 index 00000000..7e1fbbfd --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/yellow_vigil_candle_single_ceiling.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_single_ceiling", + "textures": { + "0": "oreganized:block/yellow_vigil_candle" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/yellow_vigil_candle_triple.json b/src/generated/resources/assets/oreganized/models/block/yellow_vigil_candle_triple.json new file mode 100644 index 00000000..b269fc58 --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/yellow_vigil_candle_triple.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_triple", + "textures": { + "0": "oreganized:block/yellow_vigil_candle" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/yellow_vigil_candle_triple_ceiling.json b/src/generated/resources/assets/oreganized/models/block/yellow_vigil_candle_triple_ceiling.json new file mode 100644 index 00000000..50991b4b --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/yellow_vigil_candle_triple_ceiling.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_triple_ceiling", + "textures": { + "0": "oreganized:block/yellow_vigil_candle" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/item/black_vigil_candle.json b/src/generated/resources/assets/oreganized/models/item/black_vigil_candle.json new file mode 100644 index 00000000..41480345 --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/item/black_vigil_candle.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "oreganized:item/black_vigil_candle" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/item/blue_vigil_candle.json b/src/generated/resources/assets/oreganized/models/item/blue_vigil_candle.json new file mode 100644 index 00000000..d5895de5 --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/item/blue_vigil_candle.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "oreganized:item/blue_vigil_candle" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/item/brown_vigil_candle.json b/src/generated/resources/assets/oreganized/models/item/brown_vigil_candle.json new file mode 100644 index 00000000..e742feba --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/item/brown_vigil_candle.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "oreganized:item/brown_vigil_candle" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/item/cyan_vigil_candle.json b/src/generated/resources/assets/oreganized/models/item/cyan_vigil_candle.json new file mode 100644 index 00000000..33d50c2b --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/item/cyan_vigil_candle.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "oreganized:item/cyan_vigil_candle" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/item/gray_vigil_candle.json b/src/generated/resources/assets/oreganized/models/item/gray_vigil_candle.json new file mode 100644 index 00000000..abe5cb9f --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/item/gray_vigil_candle.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "oreganized:item/gray_vigil_candle" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/item/green_vigil_candle.json b/src/generated/resources/assets/oreganized/models/item/green_vigil_candle.json new file mode 100644 index 00000000..f974dcde --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/item/green_vigil_candle.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "oreganized:item/green_vigil_candle" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/item/light_blue_vigil_candle.json b/src/generated/resources/assets/oreganized/models/item/light_blue_vigil_candle.json new file mode 100644 index 00000000..4ebb6d92 --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/item/light_blue_vigil_candle.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "oreganized:item/light_blue_vigil_candle" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/item/light_gray_vigil_candle.json b/src/generated/resources/assets/oreganized/models/item/light_gray_vigil_candle.json new file mode 100644 index 00000000..12fa4465 --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/item/light_gray_vigil_candle.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "oreganized:item/light_gray_vigil_candle" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/item/lime_vigil_candle.json b/src/generated/resources/assets/oreganized/models/item/lime_vigil_candle.json new file mode 100644 index 00000000..8c67ed5b --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/item/lime_vigil_candle.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "oreganized:item/lime_vigil_candle" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/item/magenta_vigil_candle.json b/src/generated/resources/assets/oreganized/models/item/magenta_vigil_candle.json new file mode 100644 index 00000000..e82926e2 --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/item/magenta_vigil_candle.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "oreganized:item/magenta_vigil_candle" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/item/orange_vigil_candle.json b/src/generated/resources/assets/oreganized/models/item/orange_vigil_candle.json new file mode 100644 index 00000000..56d202f1 --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/item/orange_vigil_candle.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "oreganized:item/orange_vigil_candle" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/item/pink_vigil_candle.json b/src/generated/resources/assets/oreganized/models/item/pink_vigil_candle.json new file mode 100644 index 00000000..3c3ebf90 --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/item/pink_vigil_candle.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "oreganized:item/pink_vigil_candle" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/item/purple_vigil_candle.json b/src/generated/resources/assets/oreganized/models/item/purple_vigil_candle.json new file mode 100644 index 00000000..54f21774 --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/item/purple_vigil_candle.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "oreganized:item/purple_vigil_candle" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/item/red_vigil_candle.json b/src/generated/resources/assets/oreganized/models/item/red_vigil_candle.json new file mode 100644 index 00000000..d87ea083 --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/item/red_vigil_candle.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "oreganized:item/red_vigil_candle" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/item/vigil_candle.json b/src/generated/resources/assets/oreganized/models/item/vigil_candle.json new file mode 100644 index 00000000..49713179 --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/item/vigil_candle.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "oreganized:item/vigil_candle" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/item/white_vigil_candle.json b/src/generated/resources/assets/oreganized/models/item/white_vigil_candle.json new file mode 100644 index 00000000..c42c2968 --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/item/white_vigil_candle.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "oreganized:item/white_vigil_candle" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/item/yellow_vigil_candle.json b/src/generated/resources/assets/oreganized/models/item/yellow_vigil_candle.json new file mode 100644 index 00000000..f5801412 --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/item/yellow_vigil_candle.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "oreganized:item/yellow_vigil_candle" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/tags/blocks/mineable/pickaxe.json b/src/generated/resources/data/minecraft/tags/blocks/mineable/pickaxe.json index 5beaa025..328e4077 100644 --- a/src/generated/resources/data/minecraft/tags/blocks/mineable/pickaxe.json +++ b/src/generated/resources/data/minecraft/tags/blocks/mineable/pickaxe.json @@ -34,6 +34,23 @@ "oreganized:lead_bars", "oreganized:grooved_ice", "oreganized:grooved_packed_ice", - "oreganized:grooved_blue_ice" + "oreganized:grooved_blue_ice", + "oreganized:vigil_candle", + "oreganized:purple_vigil_candle", + "oreganized:gray_vigil_candle", + "oreganized:blue_vigil_candle", + "oreganized:magenta_vigil_candle", + "oreganized:yellow_vigil_candle", + "oreganized:lime_vigil_candle", + "oreganized:orange_vigil_candle", + "oreganized:green_vigil_candle", + "oreganized:light_gray_vigil_candle", + "oreganized:red_vigil_candle", + "oreganized:cyan_vigil_candle", + "oreganized:black_vigil_candle", + "oreganized:white_vigil_candle", + "oreganized:pink_vigil_candle", + "oreganized:light_blue_vigil_candle", + "oreganized:brown_vigil_candle" ] } \ No newline at end of file diff --git a/src/generated/resources/data/oreganized/advancements/recipes/building_blocks/black_vigil_candle.json b/src/generated/resources/data/oreganized/advancements/recipes/building_blocks/black_vigil_candle.json new file mode 100644 index 00000000..891bd16d --- /dev/null +++ b/src/generated/resources/data/oreganized/advancements/recipes/building_blocks/black_vigil_candle.json @@ -0,0 +1,33 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_silver": { + "conditions": { + "items": [ + { + "tag": "forge:ingots/silver" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "oreganized:black_vigil_candle" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_silver", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "oreganized:black_vigil_candle" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/generated/resources/data/oreganized/advancements/recipes/building_blocks/black_vigil_candle_dyeing.json b/src/generated/resources/data/oreganized/advancements/recipes/building_blocks/black_vigil_candle_dyeing.json new file mode 100644 index 00000000..da3e9290 --- /dev/null +++ b/src/generated/resources/data/oreganized/advancements/recipes/building_blocks/black_vigil_candle_dyeing.json @@ -0,0 +1,35 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "oreganized:black_vigil_candle_dyeing" + }, + "trigger": "minecraft:recipe_unlocked" + }, + "has_vigil_candle": { + "conditions": { + "items": [ + { + "items": [ + "oreganized:vigil_candle" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + } + }, + "requirements": [ + [ + "has_vigil_candle", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "oreganized:black_vigil_candle_dyeing" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/generated/resources/data/oreganized/advancements/recipes/building_blocks/blue_vigil_candle.json b/src/generated/resources/data/oreganized/advancements/recipes/building_blocks/blue_vigil_candle.json new file mode 100644 index 00000000..c568ad90 --- /dev/null +++ b/src/generated/resources/data/oreganized/advancements/recipes/building_blocks/blue_vigil_candle.json @@ -0,0 +1,33 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_silver": { + "conditions": { + "items": [ + { + "tag": "forge:ingots/silver" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "oreganized:blue_vigil_candle" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_silver", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "oreganized:blue_vigil_candle" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/generated/resources/data/oreganized/advancements/recipes/building_blocks/blue_vigil_candle_dyeing.json b/src/generated/resources/data/oreganized/advancements/recipes/building_blocks/blue_vigil_candle_dyeing.json new file mode 100644 index 00000000..bb0a6a19 --- /dev/null +++ b/src/generated/resources/data/oreganized/advancements/recipes/building_blocks/blue_vigil_candle_dyeing.json @@ -0,0 +1,35 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "oreganized:blue_vigil_candle_dyeing" + }, + "trigger": "minecraft:recipe_unlocked" + }, + "has_vigil_candle": { + "conditions": { + "items": [ + { + "items": [ + "oreganized:vigil_candle" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + } + }, + "requirements": [ + [ + "has_vigil_candle", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "oreganized:blue_vigil_candle_dyeing" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/generated/resources/data/oreganized/advancements/recipes/building_blocks/brown_vigil_candle.json b/src/generated/resources/data/oreganized/advancements/recipes/building_blocks/brown_vigil_candle.json new file mode 100644 index 00000000..5e93fde9 --- /dev/null +++ b/src/generated/resources/data/oreganized/advancements/recipes/building_blocks/brown_vigil_candle.json @@ -0,0 +1,33 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_silver": { + "conditions": { + "items": [ + { + "tag": "forge:ingots/silver" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "oreganized:brown_vigil_candle" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_silver", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "oreganized:brown_vigil_candle" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/generated/resources/data/oreganized/advancements/recipes/building_blocks/brown_vigil_candle_dyeing.json b/src/generated/resources/data/oreganized/advancements/recipes/building_blocks/brown_vigil_candle_dyeing.json new file mode 100644 index 00000000..0c4faa06 --- /dev/null +++ b/src/generated/resources/data/oreganized/advancements/recipes/building_blocks/brown_vigil_candle_dyeing.json @@ -0,0 +1,35 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "oreganized:brown_vigil_candle_dyeing" + }, + "trigger": "minecraft:recipe_unlocked" + }, + "has_vigil_candle": { + "conditions": { + "items": [ + { + "items": [ + "oreganized:vigil_candle" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + } + }, + "requirements": [ + [ + "has_vigil_candle", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "oreganized:brown_vigil_candle_dyeing" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/generated/resources/data/oreganized/advancements/recipes/building_blocks/cyan_vigil_candle.json b/src/generated/resources/data/oreganized/advancements/recipes/building_blocks/cyan_vigil_candle.json new file mode 100644 index 00000000..9652d968 --- /dev/null +++ b/src/generated/resources/data/oreganized/advancements/recipes/building_blocks/cyan_vigil_candle.json @@ -0,0 +1,33 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_silver": { + "conditions": { + "items": [ + { + "tag": "forge:ingots/silver" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "oreganized:cyan_vigil_candle" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_silver", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "oreganized:cyan_vigil_candle" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/generated/resources/data/oreganized/advancements/recipes/building_blocks/cyan_vigil_candle_dyeing.json b/src/generated/resources/data/oreganized/advancements/recipes/building_blocks/cyan_vigil_candle_dyeing.json new file mode 100644 index 00000000..a77595e3 --- /dev/null +++ b/src/generated/resources/data/oreganized/advancements/recipes/building_blocks/cyan_vigil_candle_dyeing.json @@ -0,0 +1,35 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "oreganized:cyan_vigil_candle_dyeing" + }, + "trigger": "minecraft:recipe_unlocked" + }, + "has_vigil_candle": { + "conditions": { + "items": [ + { + "items": [ + "oreganized:vigil_candle" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + } + }, + "requirements": [ + [ + "has_vigil_candle", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "oreganized:cyan_vigil_candle_dyeing" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/generated/resources/data/oreganized/advancements/recipes/building_blocks/gray_vigil_candle.json b/src/generated/resources/data/oreganized/advancements/recipes/building_blocks/gray_vigil_candle.json new file mode 100644 index 00000000..6eed404d --- /dev/null +++ b/src/generated/resources/data/oreganized/advancements/recipes/building_blocks/gray_vigil_candle.json @@ -0,0 +1,33 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_silver": { + "conditions": { + "items": [ + { + "tag": "forge:ingots/silver" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "oreganized:gray_vigil_candle" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_silver", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "oreganized:gray_vigil_candle" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/generated/resources/data/oreganized/advancements/recipes/building_blocks/gray_vigil_candle_dyeing.json b/src/generated/resources/data/oreganized/advancements/recipes/building_blocks/gray_vigil_candle_dyeing.json new file mode 100644 index 00000000..cca017ce --- /dev/null +++ b/src/generated/resources/data/oreganized/advancements/recipes/building_blocks/gray_vigil_candle_dyeing.json @@ -0,0 +1,35 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "oreganized:gray_vigil_candle_dyeing" + }, + "trigger": "minecraft:recipe_unlocked" + }, + "has_vigil_candle": { + "conditions": { + "items": [ + { + "items": [ + "oreganized:vigil_candle" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + } + }, + "requirements": [ + [ + "has_vigil_candle", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "oreganized:gray_vigil_candle_dyeing" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/generated/resources/data/oreganized/advancements/recipes/building_blocks/green_vigil_candle.json b/src/generated/resources/data/oreganized/advancements/recipes/building_blocks/green_vigil_candle.json new file mode 100644 index 00000000..c40962ce --- /dev/null +++ b/src/generated/resources/data/oreganized/advancements/recipes/building_blocks/green_vigil_candle.json @@ -0,0 +1,33 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_silver": { + "conditions": { + "items": [ + { + "tag": "forge:ingots/silver" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "oreganized:green_vigil_candle" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_silver", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "oreganized:green_vigil_candle" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/generated/resources/data/oreganized/advancements/recipes/building_blocks/green_vigil_candle_dyeing.json b/src/generated/resources/data/oreganized/advancements/recipes/building_blocks/green_vigil_candle_dyeing.json new file mode 100644 index 00000000..a1edf22a --- /dev/null +++ b/src/generated/resources/data/oreganized/advancements/recipes/building_blocks/green_vigil_candle_dyeing.json @@ -0,0 +1,35 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "oreganized:green_vigil_candle_dyeing" + }, + "trigger": "minecraft:recipe_unlocked" + }, + "has_vigil_candle": { + "conditions": { + "items": [ + { + "items": [ + "oreganized:vigil_candle" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + } + }, + "requirements": [ + [ + "has_vigil_candle", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "oreganized:green_vigil_candle_dyeing" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/generated/resources/data/oreganized/advancements/recipes/building_blocks/light_blue_vigil_candle.json b/src/generated/resources/data/oreganized/advancements/recipes/building_blocks/light_blue_vigil_candle.json new file mode 100644 index 00000000..ac64cbf4 --- /dev/null +++ b/src/generated/resources/data/oreganized/advancements/recipes/building_blocks/light_blue_vigil_candle.json @@ -0,0 +1,33 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_silver": { + "conditions": { + "items": [ + { + "tag": "forge:ingots/silver" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "oreganized:light_blue_vigil_candle" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_silver", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "oreganized:light_blue_vigil_candle" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/generated/resources/data/oreganized/advancements/recipes/building_blocks/light_blue_vigil_candle_dyeing.json b/src/generated/resources/data/oreganized/advancements/recipes/building_blocks/light_blue_vigil_candle_dyeing.json new file mode 100644 index 00000000..2576e7c7 --- /dev/null +++ b/src/generated/resources/data/oreganized/advancements/recipes/building_blocks/light_blue_vigil_candle_dyeing.json @@ -0,0 +1,35 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "oreganized:light_blue_vigil_candle_dyeing" + }, + "trigger": "minecraft:recipe_unlocked" + }, + "has_vigil_candle": { + "conditions": { + "items": [ + { + "items": [ + "oreganized:vigil_candle" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + } + }, + "requirements": [ + [ + "has_vigil_candle", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "oreganized:light_blue_vigil_candle_dyeing" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/generated/resources/data/oreganized/advancements/recipes/building_blocks/light_gray_vigil_candle.json b/src/generated/resources/data/oreganized/advancements/recipes/building_blocks/light_gray_vigil_candle.json new file mode 100644 index 00000000..df9516e7 --- /dev/null +++ b/src/generated/resources/data/oreganized/advancements/recipes/building_blocks/light_gray_vigil_candle.json @@ -0,0 +1,33 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_silver": { + "conditions": { + "items": [ + { + "tag": "forge:ingots/silver" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "oreganized:light_gray_vigil_candle" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_silver", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "oreganized:light_gray_vigil_candle" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/generated/resources/data/oreganized/advancements/recipes/building_blocks/light_gray_vigil_candle_dyeing.json b/src/generated/resources/data/oreganized/advancements/recipes/building_blocks/light_gray_vigil_candle_dyeing.json new file mode 100644 index 00000000..e1563d98 --- /dev/null +++ b/src/generated/resources/data/oreganized/advancements/recipes/building_blocks/light_gray_vigil_candle_dyeing.json @@ -0,0 +1,35 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "oreganized:light_gray_vigil_candle_dyeing" + }, + "trigger": "minecraft:recipe_unlocked" + }, + "has_vigil_candle": { + "conditions": { + "items": [ + { + "items": [ + "oreganized:vigil_candle" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + } + }, + "requirements": [ + [ + "has_vigil_candle", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "oreganized:light_gray_vigil_candle_dyeing" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/generated/resources/data/oreganized/advancements/recipes/building_blocks/lime_vigil_candle.json b/src/generated/resources/data/oreganized/advancements/recipes/building_blocks/lime_vigil_candle.json new file mode 100644 index 00000000..71b48b54 --- /dev/null +++ b/src/generated/resources/data/oreganized/advancements/recipes/building_blocks/lime_vigil_candle.json @@ -0,0 +1,33 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_silver": { + "conditions": { + "items": [ + { + "tag": "forge:ingots/silver" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "oreganized:lime_vigil_candle" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_silver", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "oreganized:lime_vigil_candle" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/generated/resources/data/oreganized/advancements/recipes/building_blocks/lime_vigil_candle_dyeing.json b/src/generated/resources/data/oreganized/advancements/recipes/building_blocks/lime_vigil_candle_dyeing.json new file mode 100644 index 00000000..65adbaf4 --- /dev/null +++ b/src/generated/resources/data/oreganized/advancements/recipes/building_blocks/lime_vigil_candle_dyeing.json @@ -0,0 +1,35 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "oreganized:lime_vigil_candle_dyeing" + }, + "trigger": "minecraft:recipe_unlocked" + }, + "has_vigil_candle": { + "conditions": { + "items": [ + { + "items": [ + "oreganized:vigil_candle" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + } + }, + "requirements": [ + [ + "has_vigil_candle", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "oreganized:lime_vigil_candle_dyeing" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/generated/resources/data/oreganized/advancements/recipes/building_blocks/magenta_vigil_candle.json b/src/generated/resources/data/oreganized/advancements/recipes/building_blocks/magenta_vigil_candle.json new file mode 100644 index 00000000..9e053aac --- /dev/null +++ b/src/generated/resources/data/oreganized/advancements/recipes/building_blocks/magenta_vigil_candle.json @@ -0,0 +1,33 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_silver": { + "conditions": { + "items": [ + { + "tag": "forge:ingots/silver" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "oreganized:magenta_vigil_candle" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_silver", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "oreganized:magenta_vigil_candle" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/generated/resources/data/oreganized/advancements/recipes/building_blocks/magenta_vigil_candle_dyeing.json b/src/generated/resources/data/oreganized/advancements/recipes/building_blocks/magenta_vigil_candle_dyeing.json new file mode 100644 index 00000000..07d41244 --- /dev/null +++ b/src/generated/resources/data/oreganized/advancements/recipes/building_blocks/magenta_vigil_candle_dyeing.json @@ -0,0 +1,35 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "oreganized:magenta_vigil_candle_dyeing" + }, + "trigger": "minecraft:recipe_unlocked" + }, + "has_vigil_candle": { + "conditions": { + "items": [ + { + "items": [ + "oreganized:vigil_candle" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + } + }, + "requirements": [ + [ + "has_vigil_candle", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "oreganized:magenta_vigil_candle_dyeing" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/generated/resources/data/oreganized/advancements/recipes/building_blocks/orange_vigil_candle.json b/src/generated/resources/data/oreganized/advancements/recipes/building_blocks/orange_vigil_candle.json new file mode 100644 index 00000000..a83bdfd1 --- /dev/null +++ b/src/generated/resources/data/oreganized/advancements/recipes/building_blocks/orange_vigil_candle.json @@ -0,0 +1,33 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_silver": { + "conditions": { + "items": [ + { + "tag": "forge:ingots/silver" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "oreganized:orange_vigil_candle" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_silver", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "oreganized:orange_vigil_candle" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/generated/resources/data/oreganized/advancements/recipes/building_blocks/orange_vigil_candle_dyeing.json b/src/generated/resources/data/oreganized/advancements/recipes/building_blocks/orange_vigil_candle_dyeing.json new file mode 100644 index 00000000..d887da42 --- /dev/null +++ b/src/generated/resources/data/oreganized/advancements/recipes/building_blocks/orange_vigil_candle_dyeing.json @@ -0,0 +1,35 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "oreganized:orange_vigil_candle_dyeing" + }, + "trigger": "minecraft:recipe_unlocked" + }, + "has_vigil_candle": { + "conditions": { + "items": [ + { + "items": [ + "oreganized:vigil_candle" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + } + }, + "requirements": [ + [ + "has_vigil_candle", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "oreganized:orange_vigil_candle_dyeing" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/generated/resources/data/oreganized/advancements/recipes/building_blocks/pink_vigil_candle.json b/src/generated/resources/data/oreganized/advancements/recipes/building_blocks/pink_vigil_candle.json new file mode 100644 index 00000000..0536cbb5 --- /dev/null +++ b/src/generated/resources/data/oreganized/advancements/recipes/building_blocks/pink_vigil_candle.json @@ -0,0 +1,33 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_silver": { + "conditions": { + "items": [ + { + "tag": "forge:ingots/silver" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "oreganized:pink_vigil_candle" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_silver", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "oreganized:pink_vigil_candle" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/generated/resources/data/oreganized/advancements/recipes/building_blocks/pink_vigil_candle_dyeing.json b/src/generated/resources/data/oreganized/advancements/recipes/building_blocks/pink_vigil_candle_dyeing.json new file mode 100644 index 00000000..a6e303cb --- /dev/null +++ b/src/generated/resources/data/oreganized/advancements/recipes/building_blocks/pink_vigil_candle_dyeing.json @@ -0,0 +1,35 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "oreganized:pink_vigil_candle_dyeing" + }, + "trigger": "minecraft:recipe_unlocked" + }, + "has_vigil_candle": { + "conditions": { + "items": [ + { + "items": [ + "oreganized:vigil_candle" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + } + }, + "requirements": [ + [ + "has_vigil_candle", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "oreganized:pink_vigil_candle_dyeing" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/generated/resources/data/oreganized/advancements/recipes/building_blocks/purple_vigil_candle.json b/src/generated/resources/data/oreganized/advancements/recipes/building_blocks/purple_vigil_candle.json new file mode 100644 index 00000000..df767da2 --- /dev/null +++ b/src/generated/resources/data/oreganized/advancements/recipes/building_blocks/purple_vigil_candle.json @@ -0,0 +1,33 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_silver": { + "conditions": { + "items": [ + { + "tag": "forge:ingots/silver" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "oreganized:purple_vigil_candle" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_silver", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "oreganized:purple_vigil_candle" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/generated/resources/data/oreganized/advancements/recipes/building_blocks/purple_vigil_candle_dyeing.json b/src/generated/resources/data/oreganized/advancements/recipes/building_blocks/purple_vigil_candle_dyeing.json new file mode 100644 index 00000000..6a5e3662 --- /dev/null +++ b/src/generated/resources/data/oreganized/advancements/recipes/building_blocks/purple_vigil_candle_dyeing.json @@ -0,0 +1,35 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "oreganized:purple_vigil_candle_dyeing" + }, + "trigger": "minecraft:recipe_unlocked" + }, + "has_vigil_candle": { + "conditions": { + "items": [ + { + "items": [ + "oreganized:vigil_candle" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + } + }, + "requirements": [ + [ + "has_vigil_candle", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "oreganized:purple_vigil_candle_dyeing" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/generated/resources/data/oreganized/advancements/recipes/building_blocks/red_vigil_candle.json b/src/generated/resources/data/oreganized/advancements/recipes/building_blocks/red_vigil_candle.json new file mode 100644 index 00000000..2881e297 --- /dev/null +++ b/src/generated/resources/data/oreganized/advancements/recipes/building_blocks/red_vigil_candle.json @@ -0,0 +1,33 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_silver": { + "conditions": { + "items": [ + { + "tag": "forge:ingots/silver" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "oreganized:red_vigil_candle" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_silver", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "oreganized:red_vigil_candle" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/generated/resources/data/oreganized/advancements/recipes/building_blocks/red_vigil_candle_dyeing.json b/src/generated/resources/data/oreganized/advancements/recipes/building_blocks/red_vigil_candle_dyeing.json new file mode 100644 index 00000000..7a982aa6 --- /dev/null +++ b/src/generated/resources/data/oreganized/advancements/recipes/building_blocks/red_vigil_candle_dyeing.json @@ -0,0 +1,35 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "oreganized:red_vigil_candle_dyeing" + }, + "trigger": "minecraft:recipe_unlocked" + }, + "has_vigil_candle": { + "conditions": { + "items": [ + { + "items": [ + "oreganized:vigil_candle" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + } + }, + "requirements": [ + [ + "has_vigil_candle", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "oreganized:red_vigil_candle_dyeing" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/generated/resources/data/oreganized/advancements/recipes/building_blocks/vigil_candle.json b/src/generated/resources/data/oreganized/advancements/recipes/building_blocks/vigil_candle.json new file mode 100644 index 00000000..eebaad26 --- /dev/null +++ b/src/generated/resources/data/oreganized/advancements/recipes/building_blocks/vigil_candle.json @@ -0,0 +1,33 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_silver": { + "conditions": { + "items": [ + { + "tag": "forge:ingots/silver" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "oreganized:vigil_candle" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_silver", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "oreganized:vigil_candle" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/generated/resources/data/oreganized/advancements/recipes/building_blocks/white_vigil_candle.json b/src/generated/resources/data/oreganized/advancements/recipes/building_blocks/white_vigil_candle.json new file mode 100644 index 00000000..94446af8 --- /dev/null +++ b/src/generated/resources/data/oreganized/advancements/recipes/building_blocks/white_vigil_candle.json @@ -0,0 +1,33 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_silver": { + "conditions": { + "items": [ + { + "tag": "forge:ingots/silver" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "oreganized:white_vigil_candle" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_silver", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "oreganized:white_vigil_candle" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/generated/resources/data/oreganized/advancements/recipes/building_blocks/white_vigil_candle_dyeing.json b/src/generated/resources/data/oreganized/advancements/recipes/building_blocks/white_vigil_candle_dyeing.json new file mode 100644 index 00000000..b1d084e3 --- /dev/null +++ b/src/generated/resources/data/oreganized/advancements/recipes/building_blocks/white_vigil_candle_dyeing.json @@ -0,0 +1,35 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "oreganized:white_vigil_candle_dyeing" + }, + "trigger": "minecraft:recipe_unlocked" + }, + "has_vigil_candle": { + "conditions": { + "items": [ + { + "items": [ + "oreganized:vigil_candle" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + } + }, + "requirements": [ + [ + "has_vigil_candle", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "oreganized:white_vigil_candle_dyeing" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/generated/resources/data/oreganized/advancements/recipes/building_blocks/yellow_vigil_candle.json b/src/generated/resources/data/oreganized/advancements/recipes/building_blocks/yellow_vigil_candle.json new file mode 100644 index 00000000..d6f52fe8 --- /dev/null +++ b/src/generated/resources/data/oreganized/advancements/recipes/building_blocks/yellow_vigil_candle.json @@ -0,0 +1,33 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_silver": { + "conditions": { + "items": [ + { + "tag": "forge:ingots/silver" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "oreganized:yellow_vigil_candle" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_silver", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "oreganized:yellow_vigil_candle" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/generated/resources/data/oreganized/advancements/recipes/building_blocks/yellow_vigil_candle_dyeing.json b/src/generated/resources/data/oreganized/advancements/recipes/building_blocks/yellow_vigil_candle_dyeing.json new file mode 100644 index 00000000..57a838a1 --- /dev/null +++ b/src/generated/resources/data/oreganized/advancements/recipes/building_blocks/yellow_vigil_candle_dyeing.json @@ -0,0 +1,35 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_the_recipe": { + "conditions": { + "recipe": "oreganized:yellow_vigil_candle_dyeing" + }, + "trigger": "minecraft:recipe_unlocked" + }, + "has_vigil_candle": { + "conditions": { + "items": [ + { + "items": [ + "oreganized:vigil_candle" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + } + }, + "requirements": [ + [ + "has_vigil_candle", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "oreganized:yellow_vigil_candle_dyeing" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/generated/resources/data/oreganized/loot_tables/blocks/black_vigil_candle.json b/src/generated/resources/data/oreganized/loot_tables/blocks/black_vigil_candle.json new file mode 100644 index 00000000..3630030f --- /dev/null +++ b/src/generated/resources/data/oreganized/loot_tables/blocks/black_vigil_candle.json @@ -0,0 +1,63 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "functions": [ + { + "add": false, + "conditions": [ + { + "block": "oreganized:black_vigil_candle", + "condition": "minecraft:block_state_property", + "properties": { + "candles": "2" + } + } + ], + "count": 2.0, + "function": "minecraft:set_count" + }, + { + "add": false, + "conditions": [ + { + "block": "oreganized:black_vigil_candle", + "condition": "minecraft:block_state_property", + "properties": { + "candles": "3" + } + } + ], + "count": 3.0, + "function": "minecraft:set_count" + }, + { + "add": false, + "conditions": [ + { + "block": "oreganized:black_vigil_candle", + "condition": "minecraft:block_state_property", + "properties": { + "candles": "4" + } + } + ], + "count": 4.0, + "function": "minecraft:set_count" + }, + { + "function": "minecraft:explosion_decay" + } + ], + "name": "oreganized:black_vigil_candle" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "oreganized:blocks/black_vigil_candle" +} \ No newline at end of file diff --git a/src/generated/resources/data/oreganized/loot_tables/blocks/blue_vigil_candle.json b/src/generated/resources/data/oreganized/loot_tables/blocks/blue_vigil_candle.json new file mode 100644 index 00000000..bebb049a --- /dev/null +++ b/src/generated/resources/data/oreganized/loot_tables/blocks/blue_vigil_candle.json @@ -0,0 +1,63 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "functions": [ + { + "add": false, + "conditions": [ + { + "block": "oreganized:blue_vigil_candle", + "condition": "minecraft:block_state_property", + "properties": { + "candles": "2" + } + } + ], + "count": 2.0, + "function": "minecraft:set_count" + }, + { + "add": false, + "conditions": [ + { + "block": "oreganized:blue_vigil_candle", + "condition": "minecraft:block_state_property", + "properties": { + "candles": "3" + } + } + ], + "count": 3.0, + "function": "minecraft:set_count" + }, + { + "add": false, + "conditions": [ + { + "block": "oreganized:blue_vigil_candle", + "condition": "minecraft:block_state_property", + "properties": { + "candles": "4" + } + } + ], + "count": 4.0, + "function": "minecraft:set_count" + }, + { + "function": "minecraft:explosion_decay" + } + ], + "name": "oreganized:blue_vigil_candle" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "oreganized:blocks/blue_vigil_candle" +} \ No newline at end of file diff --git a/src/generated/resources/data/oreganized/loot_tables/blocks/brown_vigil_candle.json b/src/generated/resources/data/oreganized/loot_tables/blocks/brown_vigil_candle.json new file mode 100644 index 00000000..a7c1c616 --- /dev/null +++ b/src/generated/resources/data/oreganized/loot_tables/blocks/brown_vigil_candle.json @@ -0,0 +1,63 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "functions": [ + { + "add": false, + "conditions": [ + { + "block": "oreganized:brown_vigil_candle", + "condition": "minecraft:block_state_property", + "properties": { + "candles": "2" + } + } + ], + "count": 2.0, + "function": "minecraft:set_count" + }, + { + "add": false, + "conditions": [ + { + "block": "oreganized:brown_vigil_candle", + "condition": "minecraft:block_state_property", + "properties": { + "candles": "3" + } + } + ], + "count": 3.0, + "function": "minecraft:set_count" + }, + { + "add": false, + "conditions": [ + { + "block": "oreganized:brown_vigil_candle", + "condition": "minecraft:block_state_property", + "properties": { + "candles": "4" + } + } + ], + "count": 4.0, + "function": "minecraft:set_count" + }, + { + "function": "minecraft:explosion_decay" + } + ], + "name": "oreganized:brown_vigil_candle" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "oreganized:blocks/brown_vigil_candle" +} \ No newline at end of file diff --git a/src/generated/resources/data/oreganized/loot_tables/blocks/cyan_vigil_candle.json b/src/generated/resources/data/oreganized/loot_tables/blocks/cyan_vigil_candle.json new file mode 100644 index 00000000..2f72ac1f --- /dev/null +++ b/src/generated/resources/data/oreganized/loot_tables/blocks/cyan_vigil_candle.json @@ -0,0 +1,63 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "functions": [ + { + "add": false, + "conditions": [ + { + "block": "oreganized:cyan_vigil_candle", + "condition": "minecraft:block_state_property", + "properties": { + "candles": "2" + } + } + ], + "count": 2.0, + "function": "minecraft:set_count" + }, + { + "add": false, + "conditions": [ + { + "block": "oreganized:cyan_vigil_candle", + "condition": "minecraft:block_state_property", + "properties": { + "candles": "3" + } + } + ], + "count": 3.0, + "function": "minecraft:set_count" + }, + { + "add": false, + "conditions": [ + { + "block": "oreganized:cyan_vigil_candle", + "condition": "minecraft:block_state_property", + "properties": { + "candles": "4" + } + } + ], + "count": 4.0, + "function": "minecraft:set_count" + }, + { + "function": "minecraft:explosion_decay" + } + ], + "name": "oreganized:cyan_vigil_candle" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "oreganized:blocks/cyan_vigil_candle" +} \ No newline at end of file diff --git a/src/generated/resources/data/oreganized/loot_tables/blocks/gray_vigil_candle.json b/src/generated/resources/data/oreganized/loot_tables/blocks/gray_vigil_candle.json new file mode 100644 index 00000000..e227369e --- /dev/null +++ b/src/generated/resources/data/oreganized/loot_tables/blocks/gray_vigil_candle.json @@ -0,0 +1,63 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "functions": [ + { + "add": false, + "conditions": [ + { + "block": "oreganized:gray_vigil_candle", + "condition": "minecraft:block_state_property", + "properties": { + "candles": "2" + } + } + ], + "count": 2.0, + "function": "minecraft:set_count" + }, + { + "add": false, + "conditions": [ + { + "block": "oreganized:gray_vigil_candle", + "condition": "minecraft:block_state_property", + "properties": { + "candles": "3" + } + } + ], + "count": 3.0, + "function": "minecraft:set_count" + }, + { + "add": false, + "conditions": [ + { + "block": "oreganized:gray_vigil_candle", + "condition": "minecraft:block_state_property", + "properties": { + "candles": "4" + } + } + ], + "count": 4.0, + "function": "minecraft:set_count" + }, + { + "function": "minecraft:explosion_decay" + } + ], + "name": "oreganized:gray_vigil_candle" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "oreganized:blocks/gray_vigil_candle" +} \ No newline at end of file diff --git a/src/generated/resources/data/oreganized/loot_tables/blocks/green_vigil_candle.json b/src/generated/resources/data/oreganized/loot_tables/blocks/green_vigil_candle.json new file mode 100644 index 00000000..d5cbc718 --- /dev/null +++ b/src/generated/resources/data/oreganized/loot_tables/blocks/green_vigil_candle.json @@ -0,0 +1,63 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "functions": [ + { + "add": false, + "conditions": [ + { + "block": "oreganized:green_vigil_candle", + "condition": "minecraft:block_state_property", + "properties": { + "candles": "2" + } + } + ], + "count": 2.0, + "function": "minecraft:set_count" + }, + { + "add": false, + "conditions": [ + { + "block": "oreganized:green_vigil_candle", + "condition": "minecraft:block_state_property", + "properties": { + "candles": "3" + } + } + ], + "count": 3.0, + "function": "minecraft:set_count" + }, + { + "add": false, + "conditions": [ + { + "block": "oreganized:green_vigil_candle", + "condition": "minecraft:block_state_property", + "properties": { + "candles": "4" + } + } + ], + "count": 4.0, + "function": "minecraft:set_count" + }, + { + "function": "minecraft:explosion_decay" + } + ], + "name": "oreganized:green_vigil_candle" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "oreganized:blocks/green_vigil_candle" +} \ No newline at end of file diff --git a/src/generated/resources/data/oreganized/loot_tables/blocks/light_blue_vigil_candle.json b/src/generated/resources/data/oreganized/loot_tables/blocks/light_blue_vigil_candle.json new file mode 100644 index 00000000..3d17fc6d --- /dev/null +++ b/src/generated/resources/data/oreganized/loot_tables/blocks/light_blue_vigil_candle.json @@ -0,0 +1,63 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "functions": [ + { + "add": false, + "conditions": [ + { + "block": "oreganized:light_blue_vigil_candle", + "condition": "minecraft:block_state_property", + "properties": { + "candles": "2" + } + } + ], + "count": 2.0, + "function": "minecraft:set_count" + }, + { + "add": false, + "conditions": [ + { + "block": "oreganized:light_blue_vigil_candle", + "condition": "minecraft:block_state_property", + "properties": { + "candles": "3" + } + } + ], + "count": 3.0, + "function": "minecraft:set_count" + }, + { + "add": false, + "conditions": [ + { + "block": "oreganized:light_blue_vigil_candle", + "condition": "minecraft:block_state_property", + "properties": { + "candles": "4" + } + } + ], + "count": 4.0, + "function": "minecraft:set_count" + }, + { + "function": "minecraft:explosion_decay" + } + ], + "name": "oreganized:light_blue_vigil_candle" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "oreganized:blocks/light_blue_vigil_candle" +} \ No newline at end of file diff --git a/src/generated/resources/data/oreganized/loot_tables/blocks/light_gray_vigil_candle.json b/src/generated/resources/data/oreganized/loot_tables/blocks/light_gray_vigil_candle.json new file mode 100644 index 00000000..042acf0d --- /dev/null +++ b/src/generated/resources/data/oreganized/loot_tables/blocks/light_gray_vigil_candle.json @@ -0,0 +1,63 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "functions": [ + { + "add": false, + "conditions": [ + { + "block": "oreganized:light_gray_vigil_candle", + "condition": "minecraft:block_state_property", + "properties": { + "candles": "2" + } + } + ], + "count": 2.0, + "function": "minecraft:set_count" + }, + { + "add": false, + "conditions": [ + { + "block": "oreganized:light_gray_vigil_candle", + "condition": "minecraft:block_state_property", + "properties": { + "candles": "3" + } + } + ], + "count": 3.0, + "function": "minecraft:set_count" + }, + { + "add": false, + "conditions": [ + { + "block": "oreganized:light_gray_vigil_candle", + "condition": "minecraft:block_state_property", + "properties": { + "candles": "4" + } + } + ], + "count": 4.0, + "function": "minecraft:set_count" + }, + { + "function": "minecraft:explosion_decay" + } + ], + "name": "oreganized:light_gray_vigil_candle" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "oreganized:blocks/light_gray_vigil_candle" +} \ No newline at end of file diff --git a/src/generated/resources/data/oreganized/loot_tables/blocks/lime_vigil_candle.json b/src/generated/resources/data/oreganized/loot_tables/blocks/lime_vigil_candle.json new file mode 100644 index 00000000..8b1bc18d --- /dev/null +++ b/src/generated/resources/data/oreganized/loot_tables/blocks/lime_vigil_candle.json @@ -0,0 +1,63 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "functions": [ + { + "add": false, + "conditions": [ + { + "block": "oreganized:lime_vigil_candle", + "condition": "minecraft:block_state_property", + "properties": { + "candles": "2" + } + } + ], + "count": 2.0, + "function": "minecraft:set_count" + }, + { + "add": false, + "conditions": [ + { + "block": "oreganized:lime_vigil_candle", + "condition": "minecraft:block_state_property", + "properties": { + "candles": "3" + } + } + ], + "count": 3.0, + "function": "minecraft:set_count" + }, + { + "add": false, + "conditions": [ + { + "block": "oreganized:lime_vigil_candle", + "condition": "minecraft:block_state_property", + "properties": { + "candles": "4" + } + } + ], + "count": 4.0, + "function": "minecraft:set_count" + }, + { + "function": "minecraft:explosion_decay" + } + ], + "name": "oreganized:lime_vigil_candle" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "oreganized:blocks/lime_vigil_candle" +} \ No newline at end of file diff --git a/src/generated/resources/data/oreganized/loot_tables/blocks/magenta_vigil_candle.json b/src/generated/resources/data/oreganized/loot_tables/blocks/magenta_vigil_candle.json new file mode 100644 index 00000000..0e1ce7f9 --- /dev/null +++ b/src/generated/resources/data/oreganized/loot_tables/blocks/magenta_vigil_candle.json @@ -0,0 +1,63 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "functions": [ + { + "add": false, + "conditions": [ + { + "block": "oreganized:magenta_vigil_candle", + "condition": "minecraft:block_state_property", + "properties": { + "candles": "2" + } + } + ], + "count": 2.0, + "function": "minecraft:set_count" + }, + { + "add": false, + "conditions": [ + { + "block": "oreganized:magenta_vigil_candle", + "condition": "minecraft:block_state_property", + "properties": { + "candles": "3" + } + } + ], + "count": 3.0, + "function": "minecraft:set_count" + }, + { + "add": false, + "conditions": [ + { + "block": "oreganized:magenta_vigil_candle", + "condition": "minecraft:block_state_property", + "properties": { + "candles": "4" + } + } + ], + "count": 4.0, + "function": "minecraft:set_count" + }, + { + "function": "minecraft:explosion_decay" + } + ], + "name": "oreganized:magenta_vigil_candle" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "oreganized:blocks/magenta_vigil_candle" +} \ No newline at end of file diff --git a/src/generated/resources/data/oreganized/loot_tables/blocks/orange_vigil_candle.json b/src/generated/resources/data/oreganized/loot_tables/blocks/orange_vigil_candle.json new file mode 100644 index 00000000..f884f432 --- /dev/null +++ b/src/generated/resources/data/oreganized/loot_tables/blocks/orange_vigil_candle.json @@ -0,0 +1,63 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "functions": [ + { + "add": false, + "conditions": [ + { + "block": "oreganized:orange_vigil_candle", + "condition": "minecraft:block_state_property", + "properties": { + "candles": "2" + } + } + ], + "count": 2.0, + "function": "minecraft:set_count" + }, + { + "add": false, + "conditions": [ + { + "block": "oreganized:orange_vigil_candle", + "condition": "minecraft:block_state_property", + "properties": { + "candles": "3" + } + } + ], + "count": 3.0, + "function": "minecraft:set_count" + }, + { + "add": false, + "conditions": [ + { + "block": "oreganized:orange_vigil_candle", + "condition": "minecraft:block_state_property", + "properties": { + "candles": "4" + } + } + ], + "count": 4.0, + "function": "minecraft:set_count" + }, + { + "function": "minecraft:explosion_decay" + } + ], + "name": "oreganized:orange_vigil_candle" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "oreganized:blocks/orange_vigil_candle" +} \ No newline at end of file diff --git a/src/generated/resources/data/oreganized/loot_tables/blocks/pink_vigil_candle.json b/src/generated/resources/data/oreganized/loot_tables/blocks/pink_vigil_candle.json new file mode 100644 index 00000000..f7af7691 --- /dev/null +++ b/src/generated/resources/data/oreganized/loot_tables/blocks/pink_vigil_candle.json @@ -0,0 +1,63 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "functions": [ + { + "add": false, + "conditions": [ + { + "block": "oreganized:pink_vigil_candle", + "condition": "minecraft:block_state_property", + "properties": { + "candles": "2" + } + } + ], + "count": 2.0, + "function": "minecraft:set_count" + }, + { + "add": false, + "conditions": [ + { + "block": "oreganized:pink_vigil_candle", + "condition": "minecraft:block_state_property", + "properties": { + "candles": "3" + } + } + ], + "count": 3.0, + "function": "minecraft:set_count" + }, + { + "add": false, + "conditions": [ + { + "block": "oreganized:pink_vigil_candle", + "condition": "minecraft:block_state_property", + "properties": { + "candles": "4" + } + } + ], + "count": 4.0, + "function": "minecraft:set_count" + }, + { + "function": "minecraft:explosion_decay" + } + ], + "name": "oreganized:pink_vigil_candle" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "oreganized:blocks/pink_vigil_candle" +} \ No newline at end of file diff --git a/src/generated/resources/data/oreganized/loot_tables/blocks/purple_vigil_candle.json b/src/generated/resources/data/oreganized/loot_tables/blocks/purple_vigil_candle.json new file mode 100644 index 00000000..8ba40763 --- /dev/null +++ b/src/generated/resources/data/oreganized/loot_tables/blocks/purple_vigil_candle.json @@ -0,0 +1,63 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "functions": [ + { + "add": false, + "conditions": [ + { + "block": "oreganized:purple_vigil_candle", + "condition": "minecraft:block_state_property", + "properties": { + "candles": "2" + } + } + ], + "count": 2.0, + "function": "minecraft:set_count" + }, + { + "add": false, + "conditions": [ + { + "block": "oreganized:purple_vigil_candle", + "condition": "minecraft:block_state_property", + "properties": { + "candles": "3" + } + } + ], + "count": 3.0, + "function": "minecraft:set_count" + }, + { + "add": false, + "conditions": [ + { + "block": "oreganized:purple_vigil_candle", + "condition": "minecraft:block_state_property", + "properties": { + "candles": "4" + } + } + ], + "count": 4.0, + "function": "minecraft:set_count" + }, + { + "function": "minecraft:explosion_decay" + } + ], + "name": "oreganized:purple_vigil_candle" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "oreganized:blocks/purple_vigil_candle" +} \ No newline at end of file diff --git a/src/generated/resources/data/oreganized/loot_tables/blocks/red_vigil_candle.json b/src/generated/resources/data/oreganized/loot_tables/blocks/red_vigil_candle.json new file mode 100644 index 00000000..f2e2c74e --- /dev/null +++ b/src/generated/resources/data/oreganized/loot_tables/blocks/red_vigil_candle.json @@ -0,0 +1,63 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "functions": [ + { + "add": false, + "conditions": [ + { + "block": "oreganized:red_vigil_candle", + "condition": "minecraft:block_state_property", + "properties": { + "candles": "2" + } + } + ], + "count": 2.0, + "function": "minecraft:set_count" + }, + { + "add": false, + "conditions": [ + { + "block": "oreganized:red_vigil_candle", + "condition": "minecraft:block_state_property", + "properties": { + "candles": "3" + } + } + ], + "count": 3.0, + "function": "minecraft:set_count" + }, + { + "add": false, + "conditions": [ + { + "block": "oreganized:red_vigil_candle", + "condition": "minecraft:block_state_property", + "properties": { + "candles": "4" + } + } + ], + "count": 4.0, + "function": "minecraft:set_count" + }, + { + "function": "minecraft:explosion_decay" + } + ], + "name": "oreganized:red_vigil_candle" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "oreganized:blocks/red_vigil_candle" +} \ No newline at end of file diff --git a/src/generated/resources/data/oreganized/loot_tables/blocks/vigil_candle.json b/src/generated/resources/data/oreganized/loot_tables/blocks/vigil_candle.json new file mode 100644 index 00000000..45a48087 --- /dev/null +++ b/src/generated/resources/data/oreganized/loot_tables/blocks/vigil_candle.json @@ -0,0 +1,63 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "functions": [ + { + "add": false, + "conditions": [ + { + "block": "oreganized:vigil_candle", + "condition": "minecraft:block_state_property", + "properties": { + "candles": "2" + } + } + ], + "count": 2.0, + "function": "minecraft:set_count" + }, + { + "add": false, + "conditions": [ + { + "block": "oreganized:vigil_candle", + "condition": "minecraft:block_state_property", + "properties": { + "candles": "3" + } + } + ], + "count": 3.0, + "function": "minecraft:set_count" + }, + { + "add": false, + "conditions": [ + { + "block": "oreganized:vigil_candle", + "condition": "minecraft:block_state_property", + "properties": { + "candles": "4" + } + } + ], + "count": 4.0, + "function": "minecraft:set_count" + }, + { + "function": "minecraft:explosion_decay" + } + ], + "name": "oreganized:vigil_candle" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "oreganized:blocks/vigil_candle" +} \ No newline at end of file diff --git a/src/generated/resources/data/oreganized/loot_tables/blocks/white_vigil_candle.json b/src/generated/resources/data/oreganized/loot_tables/blocks/white_vigil_candle.json new file mode 100644 index 00000000..76622a75 --- /dev/null +++ b/src/generated/resources/data/oreganized/loot_tables/blocks/white_vigil_candle.json @@ -0,0 +1,63 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "functions": [ + { + "add": false, + "conditions": [ + { + "block": "oreganized:white_vigil_candle", + "condition": "minecraft:block_state_property", + "properties": { + "candles": "2" + } + } + ], + "count": 2.0, + "function": "minecraft:set_count" + }, + { + "add": false, + "conditions": [ + { + "block": "oreganized:white_vigil_candle", + "condition": "minecraft:block_state_property", + "properties": { + "candles": "3" + } + } + ], + "count": 3.0, + "function": "minecraft:set_count" + }, + { + "add": false, + "conditions": [ + { + "block": "oreganized:white_vigil_candle", + "condition": "minecraft:block_state_property", + "properties": { + "candles": "4" + } + } + ], + "count": 4.0, + "function": "minecraft:set_count" + }, + { + "function": "minecraft:explosion_decay" + } + ], + "name": "oreganized:white_vigil_candle" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "oreganized:blocks/white_vigil_candle" +} \ No newline at end of file diff --git a/src/generated/resources/data/oreganized/loot_tables/blocks/yellow_vigil_candle.json b/src/generated/resources/data/oreganized/loot_tables/blocks/yellow_vigil_candle.json new file mode 100644 index 00000000..5724926d --- /dev/null +++ b/src/generated/resources/data/oreganized/loot_tables/blocks/yellow_vigil_candle.json @@ -0,0 +1,63 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "functions": [ + { + "add": false, + "conditions": [ + { + "block": "oreganized:yellow_vigil_candle", + "condition": "minecraft:block_state_property", + "properties": { + "candles": "2" + } + } + ], + "count": 2.0, + "function": "minecraft:set_count" + }, + { + "add": false, + "conditions": [ + { + "block": "oreganized:yellow_vigil_candle", + "condition": "minecraft:block_state_property", + "properties": { + "candles": "3" + } + } + ], + "count": 3.0, + "function": "minecraft:set_count" + }, + { + "add": false, + "conditions": [ + { + "block": "oreganized:yellow_vigil_candle", + "condition": "minecraft:block_state_property", + "properties": { + "candles": "4" + } + } + ], + "count": 4.0, + "function": "minecraft:set_count" + }, + { + "function": "minecraft:explosion_decay" + } + ], + "name": "oreganized:yellow_vigil_candle" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "oreganized:blocks/yellow_vigil_candle" +} \ No newline at end of file diff --git a/src/generated/resources/data/oreganized/recipes/black_vigil_candle.json b/src/generated/resources/data/oreganized/recipes/black_vigil_candle.json new file mode 100644 index 00000000..0fbb991a --- /dev/null +++ b/src/generated/resources/data/oreganized/recipes/black_vigil_candle.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "building", + "group": "vigil_candle", + "key": { + "C": { + "item": "minecraft:black_candle" + }, + "S": { + "tag": "forge:ingots/silver" + } + }, + "pattern": [ + "S", + "C" + ], + "result": { + "item": "oreganized:black_vigil_candle" + }, + "show_notification": true +} \ No newline at end of file diff --git a/src/generated/resources/data/oreganized/recipes/black_vigil_candle_dyeing.json b/src/generated/resources/data/oreganized/recipes/black_vigil_candle_dyeing.json new file mode 100644 index 00000000..4a9a1a9a --- /dev/null +++ b/src/generated/resources/data/oreganized/recipes/black_vigil_candle_dyeing.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "building", + "group": "vigil_candle", + "ingredients": [ + { + "item": "oreganized:vigil_candle" + }, + { + "item": "minecraft:black_dye" + } + ], + "result": { + "item": "oreganized:black_vigil_candle" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/oreganized/recipes/blue_vigil_candle.json b/src/generated/resources/data/oreganized/recipes/blue_vigil_candle.json new file mode 100644 index 00000000..540d1f8d --- /dev/null +++ b/src/generated/resources/data/oreganized/recipes/blue_vigil_candle.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "building", + "group": "vigil_candle", + "key": { + "C": { + "item": "minecraft:blue_candle" + }, + "S": { + "tag": "forge:ingots/silver" + } + }, + "pattern": [ + "S", + "C" + ], + "result": { + "item": "oreganized:blue_vigil_candle" + }, + "show_notification": true +} \ No newline at end of file diff --git a/src/generated/resources/data/oreganized/recipes/blue_vigil_candle_dyeing.json b/src/generated/resources/data/oreganized/recipes/blue_vigil_candle_dyeing.json new file mode 100644 index 00000000..be09c30b --- /dev/null +++ b/src/generated/resources/data/oreganized/recipes/blue_vigil_candle_dyeing.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "building", + "group": "vigil_candle", + "ingredients": [ + { + "item": "oreganized:vigil_candle" + }, + { + "item": "minecraft:blue_dye" + } + ], + "result": { + "item": "oreganized:blue_vigil_candle" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/oreganized/recipes/brown_vigil_candle.json b/src/generated/resources/data/oreganized/recipes/brown_vigil_candle.json new file mode 100644 index 00000000..b34fa2a0 --- /dev/null +++ b/src/generated/resources/data/oreganized/recipes/brown_vigil_candle.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "building", + "group": "vigil_candle", + "key": { + "C": { + "item": "minecraft:brown_candle" + }, + "S": { + "tag": "forge:ingots/silver" + } + }, + "pattern": [ + "S", + "C" + ], + "result": { + "item": "oreganized:brown_vigil_candle" + }, + "show_notification": true +} \ No newline at end of file diff --git a/src/generated/resources/data/oreganized/recipes/brown_vigil_candle_dyeing.json b/src/generated/resources/data/oreganized/recipes/brown_vigil_candle_dyeing.json new file mode 100644 index 00000000..11b46328 --- /dev/null +++ b/src/generated/resources/data/oreganized/recipes/brown_vigil_candle_dyeing.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "building", + "group": "vigil_candle", + "ingredients": [ + { + "item": "oreganized:vigil_candle" + }, + { + "item": "minecraft:brown_dye" + } + ], + "result": { + "item": "oreganized:brown_vigil_candle" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/oreganized/recipes/cyan_vigil_candle.json b/src/generated/resources/data/oreganized/recipes/cyan_vigil_candle.json new file mode 100644 index 00000000..851f3368 --- /dev/null +++ b/src/generated/resources/data/oreganized/recipes/cyan_vigil_candle.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "building", + "group": "vigil_candle", + "key": { + "C": { + "item": "minecraft:cyan_candle" + }, + "S": { + "tag": "forge:ingots/silver" + } + }, + "pattern": [ + "S", + "C" + ], + "result": { + "item": "oreganized:cyan_vigil_candle" + }, + "show_notification": true +} \ No newline at end of file diff --git a/src/generated/resources/data/oreganized/recipes/cyan_vigil_candle_dyeing.json b/src/generated/resources/data/oreganized/recipes/cyan_vigil_candle_dyeing.json new file mode 100644 index 00000000..9b90a659 --- /dev/null +++ b/src/generated/resources/data/oreganized/recipes/cyan_vigil_candle_dyeing.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "building", + "group": "vigil_candle", + "ingredients": [ + { + "item": "oreganized:vigil_candle" + }, + { + "item": "minecraft:cyan_dye" + } + ], + "result": { + "item": "oreganized:cyan_vigil_candle" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/oreganized/recipes/gray_vigil_candle.json b/src/generated/resources/data/oreganized/recipes/gray_vigil_candle.json new file mode 100644 index 00000000..c52a29cb --- /dev/null +++ b/src/generated/resources/data/oreganized/recipes/gray_vigil_candle.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "building", + "group": "vigil_candle", + "key": { + "C": { + "item": "minecraft:gray_candle" + }, + "S": { + "tag": "forge:ingots/silver" + } + }, + "pattern": [ + "S", + "C" + ], + "result": { + "item": "oreganized:gray_vigil_candle" + }, + "show_notification": true +} \ No newline at end of file diff --git a/src/generated/resources/data/oreganized/recipes/gray_vigil_candle_dyeing.json b/src/generated/resources/data/oreganized/recipes/gray_vigil_candle_dyeing.json new file mode 100644 index 00000000..fb4053fe --- /dev/null +++ b/src/generated/resources/data/oreganized/recipes/gray_vigil_candle_dyeing.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "building", + "group": "vigil_candle", + "ingredients": [ + { + "item": "oreganized:vigil_candle" + }, + { + "item": "minecraft:gray_dye" + } + ], + "result": { + "item": "oreganized:gray_vigil_candle" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/oreganized/recipes/green_vigil_candle.json b/src/generated/resources/data/oreganized/recipes/green_vigil_candle.json new file mode 100644 index 00000000..226e0fab --- /dev/null +++ b/src/generated/resources/data/oreganized/recipes/green_vigil_candle.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "building", + "group": "vigil_candle", + "key": { + "C": { + "item": "minecraft:green_candle" + }, + "S": { + "tag": "forge:ingots/silver" + } + }, + "pattern": [ + "S", + "C" + ], + "result": { + "item": "oreganized:green_vigil_candle" + }, + "show_notification": true +} \ No newline at end of file diff --git a/src/generated/resources/data/oreganized/recipes/green_vigil_candle_dyeing.json b/src/generated/resources/data/oreganized/recipes/green_vigil_candle_dyeing.json new file mode 100644 index 00000000..91547d70 --- /dev/null +++ b/src/generated/resources/data/oreganized/recipes/green_vigil_candle_dyeing.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "building", + "group": "vigil_candle", + "ingredients": [ + { + "item": "oreganized:vigil_candle" + }, + { + "item": "minecraft:green_dye" + } + ], + "result": { + "item": "oreganized:green_vigil_candle" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/oreganized/recipes/light_blue_vigil_candle.json b/src/generated/resources/data/oreganized/recipes/light_blue_vigil_candle.json new file mode 100644 index 00000000..696c2086 --- /dev/null +++ b/src/generated/resources/data/oreganized/recipes/light_blue_vigil_candle.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "building", + "group": "vigil_candle", + "key": { + "C": { + "item": "minecraft:light_blue_candle" + }, + "S": { + "tag": "forge:ingots/silver" + } + }, + "pattern": [ + "S", + "C" + ], + "result": { + "item": "oreganized:light_blue_vigil_candle" + }, + "show_notification": true +} \ No newline at end of file diff --git a/src/generated/resources/data/oreganized/recipes/light_blue_vigil_candle_dyeing.json b/src/generated/resources/data/oreganized/recipes/light_blue_vigil_candle_dyeing.json new file mode 100644 index 00000000..da39f038 --- /dev/null +++ b/src/generated/resources/data/oreganized/recipes/light_blue_vigil_candle_dyeing.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "building", + "group": "vigil_candle", + "ingredients": [ + { + "item": "oreganized:vigil_candle" + }, + { + "item": "minecraft:light_blue_dye" + } + ], + "result": { + "item": "oreganized:light_blue_vigil_candle" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/oreganized/recipes/light_gray_vigil_candle.json b/src/generated/resources/data/oreganized/recipes/light_gray_vigil_candle.json new file mode 100644 index 00000000..3f30d771 --- /dev/null +++ b/src/generated/resources/data/oreganized/recipes/light_gray_vigil_candle.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "building", + "group": "vigil_candle", + "key": { + "C": { + "item": "minecraft:light_gray_candle" + }, + "S": { + "tag": "forge:ingots/silver" + } + }, + "pattern": [ + "S", + "C" + ], + "result": { + "item": "oreganized:light_gray_vigil_candle" + }, + "show_notification": true +} \ No newline at end of file diff --git a/src/generated/resources/data/oreganized/recipes/light_gray_vigil_candle_dyeing.json b/src/generated/resources/data/oreganized/recipes/light_gray_vigil_candle_dyeing.json new file mode 100644 index 00000000..e42ce43e --- /dev/null +++ b/src/generated/resources/data/oreganized/recipes/light_gray_vigil_candle_dyeing.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "building", + "group": "vigil_candle", + "ingredients": [ + { + "item": "oreganized:vigil_candle" + }, + { + "item": "minecraft:light_gray_dye" + } + ], + "result": { + "item": "oreganized:light_gray_vigil_candle" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/oreganized/recipes/lime_vigil_candle.json b/src/generated/resources/data/oreganized/recipes/lime_vigil_candle.json new file mode 100644 index 00000000..839c737c --- /dev/null +++ b/src/generated/resources/data/oreganized/recipes/lime_vigil_candle.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "building", + "group": "vigil_candle", + "key": { + "C": { + "item": "minecraft:lime_candle" + }, + "S": { + "tag": "forge:ingots/silver" + } + }, + "pattern": [ + "S", + "C" + ], + "result": { + "item": "oreganized:lime_vigil_candle" + }, + "show_notification": true +} \ No newline at end of file diff --git a/src/generated/resources/data/oreganized/recipes/lime_vigil_candle_dyeing.json b/src/generated/resources/data/oreganized/recipes/lime_vigil_candle_dyeing.json new file mode 100644 index 00000000..8eacb4d7 --- /dev/null +++ b/src/generated/resources/data/oreganized/recipes/lime_vigil_candle_dyeing.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "building", + "group": "vigil_candle", + "ingredients": [ + { + "item": "oreganized:vigil_candle" + }, + { + "item": "minecraft:lime_dye" + } + ], + "result": { + "item": "oreganized:lime_vigil_candle" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/oreganized/recipes/magenta_vigil_candle.json b/src/generated/resources/data/oreganized/recipes/magenta_vigil_candle.json new file mode 100644 index 00000000..1ffac8b2 --- /dev/null +++ b/src/generated/resources/data/oreganized/recipes/magenta_vigil_candle.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "building", + "group": "vigil_candle", + "key": { + "C": { + "item": "minecraft:magenta_candle" + }, + "S": { + "tag": "forge:ingots/silver" + } + }, + "pattern": [ + "S", + "C" + ], + "result": { + "item": "oreganized:magenta_vigil_candle" + }, + "show_notification": true +} \ No newline at end of file diff --git a/src/generated/resources/data/oreganized/recipes/magenta_vigil_candle_dyeing.json b/src/generated/resources/data/oreganized/recipes/magenta_vigil_candle_dyeing.json new file mode 100644 index 00000000..c8cfa578 --- /dev/null +++ b/src/generated/resources/data/oreganized/recipes/magenta_vigil_candle_dyeing.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "building", + "group": "vigil_candle", + "ingredients": [ + { + "item": "oreganized:vigil_candle" + }, + { + "item": "minecraft:magenta_dye" + } + ], + "result": { + "item": "oreganized:magenta_vigil_candle" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/oreganized/recipes/orange_vigil_candle.json b/src/generated/resources/data/oreganized/recipes/orange_vigil_candle.json new file mode 100644 index 00000000..d622fd7b --- /dev/null +++ b/src/generated/resources/data/oreganized/recipes/orange_vigil_candle.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "building", + "group": "vigil_candle", + "key": { + "C": { + "item": "minecraft:orange_candle" + }, + "S": { + "tag": "forge:ingots/silver" + } + }, + "pattern": [ + "S", + "C" + ], + "result": { + "item": "oreganized:orange_vigil_candle" + }, + "show_notification": true +} \ No newline at end of file diff --git a/src/generated/resources/data/oreganized/recipes/orange_vigil_candle_dyeing.json b/src/generated/resources/data/oreganized/recipes/orange_vigil_candle_dyeing.json new file mode 100644 index 00000000..3b318450 --- /dev/null +++ b/src/generated/resources/data/oreganized/recipes/orange_vigil_candle_dyeing.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "building", + "group": "vigil_candle", + "ingredients": [ + { + "item": "oreganized:vigil_candle" + }, + { + "item": "minecraft:orange_dye" + } + ], + "result": { + "item": "oreganized:orange_vigil_candle" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/oreganized/recipes/pink_vigil_candle.json b/src/generated/resources/data/oreganized/recipes/pink_vigil_candle.json new file mode 100644 index 00000000..ba0845c7 --- /dev/null +++ b/src/generated/resources/data/oreganized/recipes/pink_vigil_candle.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "building", + "group": "vigil_candle", + "key": { + "C": { + "item": "minecraft:pink_candle" + }, + "S": { + "tag": "forge:ingots/silver" + } + }, + "pattern": [ + "S", + "C" + ], + "result": { + "item": "oreganized:pink_vigil_candle" + }, + "show_notification": true +} \ No newline at end of file diff --git a/src/generated/resources/data/oreganized/recipes/pink_vigil_candle_dyeing.json b/src/generated/resources/data/oreganized/recipes/pink_vigil_candle_dyeing.json new file mode 100644 index 00000000..2cb467b8 --- /dev/null +++ b/src/generated/resources/data/oreganized/recipes/pink_vigil_candle_dyeing.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "building", + "group": "vigil_candle", + "ingredients": [ + { + "item": "oreganized:vigil_candle" + }, + { + "item": "minecraft:pink_dye" + } + ], + "result": { + "item": "oreganized:pink_vigil_candle" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/oreganized/recipes/purple_vigil_candle.json b/src/generated/resources/data/oreganized/recipes/purple_vigil_candle.json new file mode 100644 index 00000000..a8abd4f4 --- /dev/null +++ b/src/generated/resources/data/oreganized/recipes/purple_vigil_candle.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "building", + "group": "vigil_candle", + "key": { + "C": { + "item": "minecraft:purple_candle" + }, + "S": { + "tag": "forge:ingots/silver" + } + }, + "pattern": [ + "S", + "C" + ], + "result": { + "item": "oreganized:purple_vigil_candle" + }, + "show_notification": true +} \ No newline at end of file diff --git a/src/generated/resources/data/oreganized/recipes/purple_vigil_candle_dyeing.json b/src/generated/resources/data/oreganized/recipes/purple_vigil_candle_dyeing.json new file mode 100644 index 00000000..df4de37c --- /dev/null +++ b/src/generated/resources/data/oreganized/recipes/purple_vigil_candle_dyeing.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "building", + "group": "vigil_candle", + "ingredients": [ + { + "item": "oreganized:vigil_candle" + }, + { + "item": "minecraft:purple_dye" + } + ], + "result": { + "item": "oreganized:purple_vigil_candle" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/oreganized/recipes/red_vigil_candle.json b/src/generated/resources/data/oreganized/recipes/red_vigil_candle.json new file mode 100644 index 00000000..2b9e575a --- /dev/null +++ b/src/generated/resources/data/oreganized/recipes/red_vigil_candle.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "building", + "group": "vigil_candle", + "key": { + "C": { + "item": "minecraft:red_candle" + }, + "S": { + "tag": "forge:ingots/silver" + } + }, + "pattern": [ + "S", + "C" + ], + "result": { + "item": "oreganized:red_vigil_candle" + }, + "show_notification": true +} \ No newline at end of file diff --git a/src/generated/resources/data/oreganized/recipes/red_vigil_candle_dyeing.json b/src/generated/resources/data/oreganized/recipes/red_vigil_candle_dyeing.json new file mode 100644 index 00000000..ab11fbea --- /dev/null +++ b/src/generated/resources/data/oreganized/recipes/red_vigil_candle_dyeing.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "building", + "group": "vigil_candle", + "ingredients": [ + { + "item": "oreganized:vigil_candle" + }, + { + "item": "minecraft:red_dye" + } + ], + "result": { + "item": "oreganized:red_vigil_candle" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/oreganized/recipes/vigil_candle.json b/src/generated/resources/data/oreganized/recipes/vigil_candle.json new file mode 100644 index 00000000..190828fc --- /dev/null +++ b/src/generated/resources/data/oreganized/recipes/vigil_candle.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "building", + "group": "vigil_candle", + "key": { + "C": { + "item": "minecraft:candle" + }, + "S": { + "tag": "forge:ingots/silver" + } + }, + "pattern": [ + "S", + "C" + ], + "result": { + "item": "oreganized:vigil_candle" + }, + "show_notification": true +} \ No newline at end of file diff --git a/src/generated/resources/data/oreganized/recipes/white_vigil_candle.json b/src/generated/resources/data/oreganized/recipes/white_vigil_candle.json new file mode 100644 index 00000000..3a71ed96 --- /dev/null +++ b/src/generated/resources/data/oreganized/recipes/white_vigil_candle.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "building", + "group": "vigil_candle", + "key": { + "C": { + "item": "minecraft:white_candle" + }, + "S": { + "tag": "forge:ingots/silver" + } + }, + "pattern": [ + "S", + "C" + ], + "result": { + "item": "oreganized:white_vigil_candle" + }, + "show_notification": true +} \ No newline at end of file diff --git a/src/generated/resources/data/oreganized/recipes/white_vigil_candle_dyeing.json b/src/generated/resources/data/oreganized/recipes/white_vigil_candle_dyeing.json new file mode 100644 index 00000000..94a3b2a2 --- /dev/null +++ b/src/generated/resources/data/oreganized/recipes/white_vigil_candle_dyeing.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "building", + "group": "vigil_candle", + "ingredients": [ + { + "item": "oreganized:vigil_candle" + }, + { + "item": "minecraft:white_dye" + } + ], + "result": { + "item": "oreganized:white_vigil_candle" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/oreganized/recipes/yellow_vigil_candle.json b/src/generated/resources/data/oreganized/recipes/yellow_vigil_candle.json new file mode 100644 index 00000000..d8010b1f --- /dev/null +++ b/src/generated/resources/data/oreganized/recipes/yellow_vigil_candle.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "building", + "group": "vigil_candle", + "key": { + "C": { + "item": "minecraft:yellow_candle" + }, + "S": { + "tag": "forge:ingots/silver" + } + }, + "pattern": [ + "S", + "C" + ], + "result": { + "item": "oreganized:yellow_vigil_candle" + }, + "show_notification": true +} \ No newline at end of file diff --git a/src/generated/resources/data/oreganized/recipes/yellow_vigil_candle_dyeing.json b/src/generated/resources/data/oreganized/recipes/yellow_vigil_candle_dyeing.json new file mode 100644 index 00000000..c515c059 --- /dev/null +++ b/src/generated/resources/data/oreganized/recipes/yellow_vigil_candle_dyeing.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "building", + "group": "vigil_candle", + "ingredients": [ + { + "item": "oreganized:vigil_candle" + }, + { + "item": "minecraft:yellow_dye" + } + ], + "result": { + "item": "oreganized:yellow_vigil_candle" + } +} \ No newline at end of file diff --git a/src/main/java/galena/oreganized/Oreganized.java b/src/main/java/galena/oreganized/Oreganized.java index 8b2b1bb8..73333f65 100644 --- a/src/main/java/galena/oreganized/Oreganized.java +++ b/src/main/java/galena/oreganized/Oreganized.java @@ -326,6 +326,8 @@ public void buildCreativeModeTabContents(BuildCreativeModeTabContentsEvent event } if (tab == CreativeModeTabs.FUNCTIONAL_BLOCKS) { putBefore(entries, Blocks.CHEST, OBlocks.LEAD_BOLT_CRATE); + putAfter(entries, Blocks.LANTERN, OBlocks.VIGIL_CANDLE); + OBlocks.COLORED_VIGIL_CANDLES.forEach((color, block) ->putAfter(entries, OBlocks.VIGIL_CANDLE.get(), block)); } if (tab == CreativeModeTabs.COLORED_BLOCKS) { putBefore(entries, Items.SHULKER_BOX, OBlocks.WHITE_CRYSTAL_GLASS); diff --git a/src/main/java/galena/oreganized/client/OreganizedClient.java b/src/main/java/galena/oreganized/client/OreganizedClient.java index 0b9b4751..3cdacf5f 100644 --- a/src/main/java/galena/oreganized/client/OreganizedClient.java +++ b/src/main/java/galena/oreganized/client/OreganizedClient.java @@ -80,6 +80,9 @@ private static void registerBlockRenderers() { render(OBlocks.LEAD_BARS, cutout); render(OBlocks.GARGOYLE, cutout); + render(OBlocks.VIGIL_CANDLE, cutout); + OBlocks.COLORED_VIGIL_CANDLES.forEach((color, block) -> render(block, cutout)); + for (int i = 0; OBlocks.CRYSTAL_GLASS.size() > i; i++) { render(OBlocks.CRYSTAL_GLASS.get(i), translucent); render(OBlocks.CRYSTAL_GLASS_PANES.get(i), translucent); diff --git a/src/main/java/galena/oreganized/content/block/VigilCandleBlock.java b/src/main/java/galena/oreganized/content/block/VigilCandleBlock.java new file mode 100644 index 00000000..a81a86c0 --- /dev/null +++ b/src/main/java/galena/oreganized/content/block/VigilCandleBlock.java @@ -0,0 +1,102 @@ +package galena.oreganized.content.block; + +import net.minecraft.core.BlockPos; +import net.minecraft.core.Direction; +import net.minecraft.world.item.context.BlockPlaceContext; +import net.minecraft.world.level.BlockGetter; +import net.minecraft.world.level.LevelReader; +import net.minecraft.world.level.block.Block; +import net.minecraft.world.level.block.LanternBlock; +import net.minecraft.world.level.block.state.BlockState; +import net.minecraft.world.level.block.state.StateDefinition; +import net.minecraft.world.phys.shapes.CollisionContext; +import net.minecraft.world.phys.shapes.Shapes; +import net.minecraft.world.phys.shapes.VoxelShape; +import org.jetbrains.annotations.Nullable; + +import java.util.Optional; + +import static net.minecraft.world.level.block.CandleBlock.MAX_CANDLES; +import static net.minecraft.world.level.block.CandleBlock.MIN_CANDLES; +import static net.minecraft.world.level.block.state.properties.BlockStateProperties.CANDLES; + +public class VigilCandleBlock extends LanternBlock { + + private static VoxelShape shape(double x, double y, double z) { + return Block.box(x, y, z, 6 + x, 10 + y, 6 + z); + } + + private static VoxelShape[] createShapes(boolean hanging) { + return new VoxelShape[]{ + shape(5, hanging ? 2 : 0, 5), + Shapes.or( + shape(6 + (hanging ? 0 : 1), hanging ? 2 : 0, 1), + shape(3, 0, 9) + ), + Shapes.or( + shape(1, 0, 2 + (hanging ? 2 : 0)), + shape(9, hanging ? 2 : 0, 1), + shape(7 + (hanging ? 2 : 0), hanging ? 4 : 0, 9) + ), + Shapes.or( + shape(1, hanging ? 4 : 0, 1), + shape(9, 0, 1), + shape(1, 0, 9), + shape(9, hanging ? 2 : 0, 9) + ) + }; + } + + private static final VoxelShape[] SHAPES = createShapes(false); + private static final VoxelShape[] HANGING_SHAPES = createShapes(true); + + public VigilCandleBlock(Properties properties) { + super(properties); + registerDefaultState(defaultBlockState() + .setValue(HANGING, false) + .setValue(WATERLOGGED, false) + .setValue(CANDLES, MIN_CANDLES)); + } + + @Override + protected void createBlockStateDefinition(StateDefinition.Builder builder) { + super.createBlockStateDefinition(builder); + builder.add(CANDLES); + } + + public boolean canBeReplaced(BlockState state, BlockPlaceContext context) { + if (super.canBeReplaced(state, context)) return true; + return !context.isSecondaryUseActive() + && context.getItemInHand().is(asItem()) + && state.getValue(CANDLES) < MAX_CANDLES; + } + + @Override + public VoxelShape getShape(BlockState state, BlockGetter level, BlockPos pos, CollisionContext context) { + var candles = state.getValue(CANDLES); + var handing = state.getValue(HANGING); + var index = candles - 1; + return (handing ? HANGING_SHAPES : SHAPES)[index]; + } + + @Override + public @Nullable BlockState getStateForPlacement(BlockPlaceContext context) { + BlockState previous = context.getLevel().getBlockState(context.getClickedPos()); + var candles = previous.is(this) ? Math.min(previous.getValue(CANDLES) + 1, MAX_CANDLES) : MIN_CANDLES; + return Optional.ofNullable(super.getStateForPlacement(context)) + .map(it -> it.setValue(CANDLES, candles)) + .orElse(null); + } + + public boolean canSurvive(BlockState state, LevelReader level, BlockPos pos) { + Direction support = getConnectedDirection(state).getOpposite(); + var candles = state.getValue(CANDLES); + var supporting = pos.relative(support); + if (candles > 1) { + return Block.isFaceFull(level.getBlockState(supporting).getCollisionShape(level, supporting), support.getOpposite()); + } else { + return Block.canSupportCenter(level, pos.relative(support), support.getOpposite()); + } + } + +} diff --git a/src/main/java/galena/oreganized/data/OBlockStates.java b/src/main/java/galena/oreganized/data/OBlockStates.java index 3d026b83..18379c13 100644 --- a/src/main/java/galena/oreganized/data/OBlockStates.java +++ b/src/main/java/galena/oreganized/data/OBlockStates.java @@ -113,6 +113,8 @@ protected void registerStatesAndModels() { simpleBlock(OBlocks.GROOVED_BLUE_ICE); gargoyleBlock(OBlocks.GARGOYLE); + vigilCandle(OBlocks.VIGIL_CANDLE, null); + OBlocks.COLORED_VIGIL_CANDLES.forEach((color, block) -> vigilCandle(block, color.getSerializedName())); } } diff --git a/src/main/java/galena/oreganized/data/OBlockTags.java b/src/main/java/galena/oreganized/data/OBlockTags.java index 5e36190c..ea7940f8 100644 --- a/src/main/java/galena/oreganized/data/OBlockTags.java +++ b/src/main/java/galena/oreganized/data/OBlockTags.java @@ -95,7 +95,9 @@ protected void addTags(HolderLookup.Provider provider) { /*tag(MINEABLE_WITH_BUSH_HAMMER).add( );*/ - tag(BlockTags.MINEABLE_WITH_PICKAXE).add( + var pickaxeMinable = tag(BlockTags.MINEABLE_WITH_PICKAXE); + + pickaxeMinable.add( OBlocks.LEAD_ORE.get(), OBlocks.DEEPSLATE_LEAD_ORE.get(), OBlocks.RAW_LEAD_BLOCK.get(), @@ -139,6 +141,10 @@ protected void addTags(HolderLookup.Provider provider) { OBlocks.GROOVED_PACKED_ICE.get(), OBlocks.GROOVED_BLUE_ICE.get() ); + + pickaxeMinable.add(OBlocks.VIGIL_CANDLE.get()); + OBlocks.COLORED_VIGIL_CANDLES.forEach((color, block) -> pickaxeMinable.add(block.get())); + tag(BlockTags.MINEABLE_WITH_SHOVEL).add( OBlocks.WAXED_WHITE_CONCRETE_POWDER.get(), OBlocks.WAXED_ORANGE_CONCRETE_POWDER.get(), diff --git a/src/main/java/galena/oreganized/data/OItemModels.java b/src/main/java/galena/oreganized/data/OItemModels.java index d1dcd08e..2003b7fc 100644 --- a/src/main/java/galena/oreganized/data/OItemModels.java +++ b/src/main/java/galena/oreganized/data/OItemModels.java @@ -130,6 +130,9 @@ protected void registerModels() { block(OBlocks.GROOVED_PACKED_ICE); block(OBlocks.GROOVED_BLUE_ICE); + normalItem(OBlocks.VIGIL_CANDLE); + OBlocks.COLORED_VIGIL_CANDLES.forEach((color, block) -> normalItem(block)); + for (Supplier blocks : OBlocks.WAXED_CONRETE_POWDER) { withExistingParent(blockName(blocks), "minecraft:block/" + blockName(blocks).replace("waxed_", "")); } diff --git a/src/main/java/galena/oreganized/data/OLootTables.java b/src/main/java/galena/oreganized/data/OLootTables.java index 55074762..4601e126 100644 --- a/src/main/java/galena/oreganized/data/OLootTables.java +++ b/src/main/java/galena/oreganized/data/OLootTables.java @@ -127,6 +127,9 @@ protected void generate() { for (Supplier blocks : OBlocks.WAXED_CONRETE_POWDER) { dropSelf(blocks); } + + vigilCandle(OBlocks.VIGIL_CANDLE); + OBlocks.COLORED_VIGIL_CANDLES.forEach((color, block) -> vigilCandle(block)); } private void grooved(Supplier block, Block other) { diff --git a/src/main/java/galena/oreganized/data/ORecipes.java b/src/main/java/galena/oreganized/data/ORecipes.java index 11a2349d..29005077 100644 --- a/src/main/java/galena/oreganized/data/ORecipes.java +++ b/src/main/java/galena/oreganized/data/ORecipes.java @@ -6,12 +6,16 @@ import galena.oreganized.index.OBlocks; import galena.oreganized.index.OItems; import galena.oreganized.index.OTags; +import net.minecraft.core.registries.BuiltInRegistries; import net.minecraft.data.PackOutput; import net.minecraft.data.recipes.FinishedRecipe; +import net.minecraft.data.recipes.RecipeBuilder; import net.minecraft.data.recipes.RecipeCategory; import net.minecraft.data.recipes.ShapedRecipeBuilder; import net.minecraft.data.recipes.ShapelessRecipeBuilder; +import net.minecraft.resources.ResourceLocation; import net.minecraft.tags.ItemTags; +import net.minecraft.world.item.DyeItem; import net.minecraft.world.item.Items; import net.minecraft.world.item.crafting.Ingredient; import net.minecraft.world.level.ItemLike; @@ -292,5 +296,19 @@ protected void buildRecipes(Consumer consumer) { .unlockedBy("has_silver", has(OTags.Items.INGOTS_SILVER)) .unlockedBy("has_amethyst", has(Items.AMETHYST_SHARD)) .save(consumer); + + vigilCandle(OBlocks.VIGIL_CANDLE, Blocks.CANDLE).save(consumer); + + OBlocks.COLORED_VIGIL_CANDLES.forEach((color, block) -> { + var candle = BuiltInRegistries.BLOCK.get(new ResourceLocation(color.getSerializedName() + "_candle")); + vigilCandle(block, candle).save(consumer); + + ShapelessRecipeBuilder.shapeless(RecipeCategory.BUILDING_BLOCKS, block.get()) + .requires(OBlocks.VIGIL_CANDLE.get()) + .requires(DyeItem.byColor(color)) + .unlockedBy("has_vigil_candle", has(OBlocks.VIGIL_CANDLE.get())) + .group("vigil_candle") + .save(consumer, RecipeBuilder.getDefaultRecipeId(block.get()).withSuffix("_dyeing")); + }); } } diff --git a/src/main/java/galena/oreganized/data/provider/OBlockLootProvider.java b/src/main/java/galena/oreganized/data/provider/OBlockLootProvider.java index ad60f29e..db527ac7 100644 --- a/src/main/java/galena/oreganized/data/provider/OBlockLootProvider.java +++ b/src/main/java/galena/oreganized/data/provider/OBlockLootProvider.java @@ -60,4 +60,9 @@ public void cauldron(Supplier block) { public void dropNothing(Supplier block) { dropOther(block, Blocks.AIR); } + + public void vigilCandle(Supplier block) { + add(block.get(), createCandleDrops(block.get())); + } + } diff --git a/src/main/java/galena/oreganized/data/provider/OBlockStateProvider.java b/src/main/java/galena/oreganized/data/provider/OBlockStateProvider.java index ac848fe4..763f9374 100644 --- a/src/main/java/galena/oreganized/data/provider/OBlockStateProvider.java +++ b/src/main/java/galena/oreganized/data/provider/OBlockStateProvider.java @@ -33,9 +33,11 @@ import net.minecraftforge.client.model.generators.MultiPartBlockStateBuilder; import net.minecraftforge.common.data.ExistingFileHelper; import net.minecraftforge.registries.ForgeRegistries; +import org.jetbrains.annotations.Nullable; import java.util.Arrays; import java.util.List; +import java.util.Optional; import java.util.function.BiFunction; import java.util.function.Function; import java.util.function.Supplier; @@ -376,6 +378,41 @@ public void gargoyleBlock(Supplier block) { }); } + private String candleSuffix(int amount) { + switch (amount) { + case 1: + return "single"; + case 2: + return "double"; + case 3: + return "triple"; + case 4: + return "quadruple"; + default: + throw new IllegalArgumentException("Illegal candle amount: " + amount); + } + } + + public void vigilCandle(Supplier block, @Nullable String prefix) { + getVariantBuilder(block.get()).forAllStatesExcept(state -> { + var candles = state.getValue(BlockStateProperties.CANDLES); + var hanging = state.getValue(BlockStateProperties.HANGING); + + var hangingSuffix = hanging ? "_ceiling" : ""; + var parent = "vigil_candle_" + candleSuffix(candles) + hangingSuffix; + var optionalPrefix = Optional.ofNullable(prefix).map(it -> it + "_"); + var name = optionalPrefix.orElse("default") + parent; + var texture = BLOCK_FOLDER + "/" + optionalPrefix.orElse("") + "vigil_candle"; + + var model = models().withExistingParent(name, Oreganized.modLoc(parent)) + .texture("0", texture); + + return ConfiguredModel.builder() + .modelFile(model) + .build(); + }, BlockStateProperties.WATERLOGGED); + } + public void crate(Supplier block) { var name = name(block); simpleBlock(block.get(), models().cubeBottomTop( diff --git a/src/main/java/galena/oreganized/data/provider/OItemModelProvider.java b/src/main/java/galena/oreganized/data/provider/OItemModelProvider.java index ac838632..45c95436 100644 --- a/src/main/java/galena/oreganized/data/provider/OItemModelProvider.java +++ b/src/main/java/galena/oreganized/data/provider/OItemModelProvider.java @@ -6,12 +6,14 @@ import net.minecraft.data.PackOutput; import net.minecraft.resources.ResourceLocation; import net.minecraft.world.item.Item; +import net.minecraft.world.level.ItemLike; import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.WallBlock; import net.minecraftforge.client.model.generators.ItemModelBuilder; import net.minecraftforge.common.data.ExistingFileHelper; import net.minecraftforge.registries.ForgeRegistries; +import java.util.Objects; import java.util.function.Supplier; import static galena.oreganized.ModCompat.SHIELD_EXPANSION_ID; @@ -56,9 +58,11 @@ public ItemModelBuilder blockFlatWithItemName(Supplier block, S .texture("layer0", modLoc("item/" + name)); } - public ItemModelBuilder normalItem(Supplier item) { - return withExistingParent(ForgeRegistries.ITEMS.getKey(item.get()).getPath(), mcLoc("item/generated")) - .texture("layer0", modLoc("item/" + ForgeRegistries.ITEMS.getKey(item.get()).getPath())); + public ItemModelBuilder normalItem(Supplier supplier) { + var item = supplier.get().asItem(); + var id = Objects.requireNonNull(ForgeRegistries.ITEMS.getKey(item)); + return withExistingParent(id.getPath(), mcLoc("item/generated")) + .texture("layer0", modLoc("item/" + id.getPath())); } public ItemModelBuilder toolItem(Supplier item) { diff --git a/src/main/java/galena/oreganized/data/provider/ORecipeProvider.java b/src/main/java/galena/oreganized/data/provider/ORecipeProvider.java index d875e129..479c0c83 100644 --- a/src/main/java/galena/oreganized/data/provider/ORecipeProvider.java +++ b/src/main/java/galena/oreganized/data/provider/ORecipeProvider.java @@ -215,4 +215,15 @@ public void makeChiseledStonecutting(Supplier blockOut, Supplie makeChiseled(blockOut, slabIn).save(consumer); stonecutting(blockIn, blockOut.get()).save(consumer, Oreganized.modLoc("stonecutting/" + ForgeRegistries.ITEMS.getKey(blockOut.get().asItem()).getPath())); } + + public ShapedRecipeBuilder vigilCandle(Supplier block, ItemLike candle) { + return ShapedRecipeBuilder.shaped(RecipeCategory.BUILDING_BLOCKS, block.get()) + .define('S', OTags.Items.INGOTS_SILVER) + .define('C', candle) + .pattern("S") + .unlockedBy("has_silver", has(OTags.Items.INGOTS_SILVER)) + .group("vigil_candle") + .pattern("C"); + } + } diff --git a/src/main/java/galena/oreganized/index/OBlocks.java b/src/main/java/galena/oreganized/index/OBlocks.java index af355640..4c3f7c1c 100644 --- a/src/main/java/galena/oreganized/index/OBlocks.java +++ b/src/main/java/galena/oreganized/index/OBlocks.java @@ -18,6 +18,7 @@ import galena.oreganized.content.block.MoltenLeadCauldronBlock; import galena.oreganized.content.block.ShrapnelBombBlock; import galena.oreganized.content.block.SpottedGlanceBlock; +import galena.oreganized.content.block.VigilCandleBlock; import net.minecraft.sounds.SoundEvents; import net.minecraft.world.item.BlockItem; import net.minecraft.world.item.DoubleHighBlockItem; @@ -35,13 +36,17 @@ import net.minecraft.world.level.block.state.BlockBehaviour; import net.minecraft.world.level.block.state.properties.BlockSetType; import net.minecraft.world.level.material.MapColor; +import net.minecraft.world.level.material.PushReaction; import net.minecraftforge.fml.common.Mod; import net.minecraftforge.registries.RegistryObject; +import java.util.Arrays; import java.util.List; +import java.util.Map; import java.util.Objects; import java.util.function.Function; import java.util.function.Supplier; +import java.util.stream.Collectors; @Mod.EventBusSubscriber(modid = Oreganized.MOD_ID, bus = Mod.EventBusSubscriber.Bus.MOD) public class OBlocks { @@ -197,6 +202,17 @@ private static BlockBehaviour.Properties leadDecoProperties() { new MoltenLeadBlock(OFluids.MOLTEN_LEAD, BlockBehaviour.Properties.copy(Blocks.LAVA).mapColor(MapColor.COLOR_PURPLE))); public static final RegistryObject MOLTEN_LEAD_CAULDRON = HELPER.createBlock("molten_lead_cauldron", () -> new MoltenLeadCauldronBlock(BlockBehaviour.Properties.copy(Blocks.LAVA_CAULDRON).randomTicks())); + private static final Supplier VIGIL_CANDLE_PROPERTIES = () -> BlockBehaviour.Properties.of().lightLevel(state -> 10).sound(SoundType.METAL).pushReaction(PushReaction.DESTROY); + public static final RegistryObject VIGIL_CANDLE = register("vigil_candle", () ->new VigilCandleBlock(VIGIL_CANDLE_PROPERTIES.get())); + public static final Map> COLORED_VIGIL_CANDLES = registerColored("vigil_candle", color -> new VigilCandleBlock(VIGIL_CANDLE_PROPERTIES.get().mapColor(color))); + + public static Map> registerColored(String baseName, Function factory) { + return Arrays.stream(DyeColor.values()).collect(Collectors.toMap( + it -> it, + color -> register(color.getSerializedName() + "_" + baseName, () -> factory.apply(color)) + )); + } + public static RegistryObject baseRegister(String name, Supplier block, Function, Supplier> item) { RegistryObject register = HELPER.createBlockNoItem(name, block); OItems.HELPER.createItem(name, item.apply(register)); diff --git a/src/main/resources/assets/oreganized/models/block/vigil_candle_double.json b/src/main/resources/assets/oreganized/models/block/vigil_candle_double.json index d46aad3e..18771d0f 100644 --- a/src/main/resources/assets/oreganized/models/block/vigil_candle_double.json +++ b/src/main/resources/assets/oreganized/models/block/vigil_candle_double.json @@ -1,8 +1,7 @@ { "credit": "Made with Blockbench", "textures": { - "0": "red_vigil_candle", - "particle": "red_vigil_candle" + "particle": "#0" }, "elements": [ { diff --git a/src/main/resources/assets/oreganized/models/block/vigil_candle_double_ceiling.json b/src/main/resources/assets/oreganized/models/block/vigil_candle_double_ceiling.json index c763f981..16786959 100644 --- a/src/main/resources/assets/oreganized/models/block/vigil_candle_double_ceiling.json +++ b/src/main/resources/assets/oreganized/models/block/vigil_candle_double_ceiling.json @@ -1,8 +1,7 @@ { "credit": "Made with Blockbench", "textures": { - "0": "red_vigil_candle", - "particle": "red_vigil_candle" + "particle": "#0" }, "elements": [ { diff --git a/src/main/resources/assets/oreganized/models/block/vigil_candle_quadruple.json b/src/main/resources/assets/oreganized/models/block/vigil_candle_quadruple.json index ea919944..11e4c681 100644 --- a/src/main/resources/assets/oreganized/models/block/vigil_candle_quadruple.json +++ b/src/main/resources/assets/oreganized/models/block/vigil_candle_quadruple.json @@ -1,8 +1,7 @@ { "credit": "Made with Blockbench", "textures": { - "0": "red_vigil_candle", - "particle": "red_vigil_candle" + "particle": "#0" }, "elements": [ { diff --git a/src/main/resources/assets/oreganized/models/block/vigil_candle_quadruple_ceiling.json b/src/main/resources/assets/oreganized/models/block/vigil_candle_quadruple_ceiling.json index 6f1a88de..3e84530e 100644 --- a/src/main/resources/assets/oreganized/models/block/vigil_candle_quadruple_ceiling.json +++ b/src/main/resources/assets/oreganized/models/block/vigil_candle_quadruple_ceiling.json @@ -1,8 +1,7 @@ { "credit": "Made with Blockbench", "textures": { - "0": "red_vigil_candle", - "particle": "red_vigil_candle" + "particle": "#0" }, "elements": [ { diff --git a/src/main/resources/assets/oreganized/models/block/vigil_candle_single.json b/src/main/resources/assets/oreganized/models/block/vigil_candle_single.json index 114d86cc..9a0949c5 100644 --- a/src/main/resources/assets/oreganized/models/block/vigil_candle_single.json +++ b/src/main/resources/assets/oreganized/models/block/vigil_candle_single.json @@ -1,13 +1,12 @@ { "credit": "Made with Blockbench", "textures": { - "0": "red_vigil_candle", - "particle": "red_vigil_candle" + "particle": "#0" }, "elements": [ { - "from": [5, 0, 4], - "to": [11, 10, 10], + "from": [5, 0, 5], + "to": [11, 10, 11], "rotation": {"angle": 0, "axis": "y", "origin": [5, 0, 4]}, "faces": { "north": {"uv": [0, 6, 6, 16], "texture": "#0"}, @@ -19,8 +18,8 @@ } }, { - "from": [8, 10, 5.5], - "to": [8, 13, 8.5], + "from": [8, 10, 6.5], + "to": [8, 13, 9.5], "rotation": {"angle": 0, "axis": "y", "origin": [8, 10, 4.5]}, "faces": { "north": {"uv": [0, 0, 2, 3], "texture": "#0"}, diff --git a/src/main/resources/assets/oreganized/models/block/vigil_candle_single_ceiling.json b/src/main/resources/assets/oreganized/models/block/vigil_candle_single_ceiling.json index d00adfda..e2825b71 100644 --- a/src/main/resources/assets/oreganized/models/block/vigil_candle_single_ceiling.json +++ b/src/main/resources/assets/oreganized/models/block/vigil_candle_single_ceiling.json @@ -1,8 +1,7 @@ { "credit": "Made with Blockbench", "textures": { - "0": "red_vigil_candle", - "particle": "red_vigil_candle" + "particle": "#0" }, "elements": [ { diff --git a/src/main/resources/assets/oreganized/models/block/vigil_candle_triple.json b/src/main/resources/assets/oreganized/models/block/vigil_candle_triple.json index d7de4f25..c75895e0 100644 --- a/src/main/resources/assets/oreganized/models/block/vigil_candle_triple.json +++ b/src/main/resources/assets/oreganized/models/block/vigil_candle_triple.json @@ -1,8 +1,7 @@ { "credit": "Made with Blockbench", "textures": { - "0": "red_vigil_candle", - "particle": "red_vigil_candle" + "particle": "#0" }, "elements": [ { diff --git a/src/main/resources/assets/oreganized/models/block/vigil_candle_triple_ceiling.json b/src/main/resources/assets/oreganized/models/block/vigil_candle_triple_ceiling.json index 374c20f6..3e789dc2 100644 --- a/src/main/resources/assets/oreganized/models/block/vigil_candle_triple_ceiling.json +++ b/src/main/resources/assets/oreganized/models/block/vigil_candle_triple_ceiling.json @@ -1,8 +1,7 @@ { "credit": "Made with Blockbench", "textures": { - "0": "red_vigil_candle", - "particle": "red_vigil_candle" + "particle": "#0" }, "elements": [ { From b64d606a160115f60c34e3004624ab6dde1a425c Mon Sep 17 00:00:00 2001 From: Niklas Widmann Date: Thu, 17 Oct 2024 19:51:04 +0200 Subject: [PATCH 03/11] add lit state to vigil candles --- .../content/block/VigilCandleBlock.java | 38 ++++++++++++++++++- .../java/galena/oreganized/index/OBlocks.java | 3 +- 2 files changed, 39 insertions(+), 2 deletions(-) diff --git a/src/main/java/galena/oreganized/content/block/VigilCandleBlock.java b/src/main/java/galena/oreganized/content/block/VigilCandleBlock.java index a81a86c0..85d3ec25 100644 --- a/src/main/java/galena/oreganized/content/block/VigilCandleBlock.java +++ b/src/main/java/galena/oreganized/content/block/VigilCandleBlock.java @@ -2,13 +2,22 @@ import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; +import net.minecraft.world.InteractionHand; +import net.minecraft.world.InteractionResult; +import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.context.BlockPlaceContext; import net.minecraft.world.level.BlockGetter; +import net.minecraft.world.level.Level; +import net.minecraft.world.level.LevelAccessor; import net.minecraft.world.level.LevelReader; +import net.minecraft.world.level.block.AbstractCandleBlock; import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.LanternBlock; import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.level.block.state.StateDefinition; +import net.minecraft.world.level.material.FluidState; +import net.minecraft.world.level.material.Fluids; +import net.minecraft.world.phys.BlockHitResult; import net.minecraft.world.phys.shapes.CollisionContext; import net.minecraft.world.phys.shapes.Shapes; import net.minecraft.world.phys.shapes.VoxelShape; @@ -16,6 +25,7 @@ import java.util.Optional; +import static net.minecraft.world.level.block.CandleBlock.LIT; import static net.minecraft.world.level.block.CandleBlock.MAX_CANDLES; import static net.minecraft.world.level.block.CandleBlock.MIN_CANDLES; import static net.minecraft.world.level.block.state.properties.BlockStateProperties.CANDLES; @@ -54,6 +64,7 @@ public VigilCandleBlock(Properties properties) { super(properties); registerDefaultState(defaultBlockState() .setValue(HANGING, false) + .setValue(LIT, false) .setValue(WATERLOGGED, false) .setValue(CANDLES, MIN_CANDLES)); } @@ -61,7 +72,7 @@ public VigilCandleBlock(Properties properties) { @Override protected void createBlockStateDefinition(StateDefinition.Builder builder) { super.createBlockStateDefinition(builder); - builder.add(CANDLES); + builder.add(CANDLES, LIT); } public boolean canBeReplaced(BlockState state, BlockPlaceContext context) { @@ -99,4 +110,29 @@ public boolean canSurvive(BlockState state, LevelReader level, BlockPos pos) { } } + public InteractionResult use(BlockState state, Level level, BlockPos pos, Player player, InteractionHand hand, BlockHitResult hit) { + if (player.getAbilities().mayBuild && player.getItemInHand(hand).isEmpty() && state.getValue(LIT)) { + AbstractCandleBlock.extinguish(player, state, level, pos); + return InteractionResult.sidedSuccess(level.isClientSide); + } else { + return InteractionResult.PASS; + } + } + + public boolean placeLiquid(LevelAccessor level, BlockPos pos, BlockState state, FluidState fluid) { + if (!state.getValue(WATERLOGGED) && fluid.getType() == Fluids.WATER) { + BlockState waterlogged = state.setValue(WATERLOGGED, true); + if (state.getValue(LIT)) { + AbstractCandleBlock.extinguish(null, waterlogged, level, pos); + } else { + level.setBlock(pos, waterlogged, 3); + } + + level.scheduleTick(pos, fluid.getType(), fluid.getType().getTickDelay(level)); + return true; + } else { + return false; + } + } + } diff --git a/src/main/java/galena/oreganized/index/OBlocks.java b/src/main/java/galena/oreganized/index/OBlocks.java index 4c3f7c1c..5294fdde 100644 --- a/src/main/java/galena/oreganized/index/OBlocks.java +++ b/src/main/java/galena/oreganized/index/OBlocks.java @@ -26,6 +26,7 @@ import net.minecraft.world.item.Item; import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.Blocks; +import net.minecraft.world.level.block.CandleBlock; import net.minecraft.world.level.block.DropExperienceBlock; import net.minecraft.world.level.block.IceBlock; import net.minecraft.world.level.block.LiquidBlock; @@ -202,7 +203,7 @@ private static BlockBehaviour.Properties leadDecoProperties() { new MoltenLeadBlock(OFluids.MOLTEN_LEAD, BlockBehaviour.Properties.copy(Blocks.LAVA).mapColor(MapColor.COLOR_PURPLE))); public static final RegistryObject MOLTEN_LEAD_CAULDRON = HELPER.createBlock("molten_lead_cauldron", () -> new MoltenLeadCauldronBlock(BlockBehaviour.Properties.copy(Blocks.LAVA_CAULDRON).randomTicks())); - private static final Supplier VIGIL_CANDLE_PROPERTIES = () -> BlockBehaviour.Properties.of().lightLevel(state -> 10).sound(SoundType.METAL).pushReaction(PushReaction.DESTROY); + private static final Supplier VIGIL_CANDLE_PROPERTIES = () -> BlockBehaviour.Properties.of().lightLevel(CandleBlock.LIGHT_EMISSION).sound(SoundType.METAL).pushReaction(PushReaction.DESTROY); public static final RegistryObject VIGIL_CANDLE = register("vigil_candle", () ->new VigilCandleBlock(VIGIL_CANDLE_PROPERTIES.get())); public static final Map> COLORED_VIGIL_CANDLES = registerColored("vigil_candle", color -> new VigilCandleBlock(VIGIL_CANDLE_PROPERTIES.get().mapColor(color))); From edae490e577ab80471af0d217362ac864aecf2ce Mon Sep 17 00:00:00 2001 From: Niklas Widmann Date: Thu, 17 Oct 2024 22:49:46 +0200 Subject: [PATCH 04/11] vigil candle support for amendments & effect removal functionality --- build.gradle | 4 +- gradle.properties | 1 + .../5bb646c3cee204f41a1b59a2c0d9083b5f7155b0 | 6 +- .../data/minecraft/tags/blocks/candles.json | 5 ++ .../tags/blocks/mineable/pickaxe.json | 18 +----- .../oreganized/tags/blocks/vigil_candles.json | 21 +++++++ .../mob_effect/cleared_by_vigil_candle.json | 5 ++ .../java/galena/oreganized/Oreganized.java | 7 +++ .../oreganized/client/OreganizedClient.java | 3 +- .../supplementaries/AmendmentsCompat.java | 56 +++++++++++++++++++ .../content/block/VigilCandleBlock.java | 20 ++++++- .../entity/VigilCandleBlockEntity.java | 37 ++++++++++++ .../galena/oreganized/data/OBlockTags.java | 12 ++-- .../galena/oreganized/data/OItemModels.java | 3 +- .../galena/oreganized/data/OLootTables.java | 3 +- .../oreganized/data/OMobEffectTags.java | 33 +++++++++++ .../data/provider/OBlockStateProvider.java | 3 +- .../oreganized/index/OBlockEntities.java | 4 ++ .../java/galena/oreganized/index/OBlocks.java | 10 +++- .../java/galena/oreganized/index/OTags.java | 13 +++++ 20 files changed, 231 insertions(+), 33 deletions(-) create mode 100644 src/generated/resources/data/minecraft/tags/blocks/candles.json create mode 100644 src/generated/resources/data/oreganized/tags/blocks/vigil_candles.json create mode 100644 src/generated/resources/data/oreganized/tags/mob_effect/cleared_by_vigil_candle.json create mode 100644 src/main/java/galena/oreganized/compat/supplementaries/AmendmentsCompat.java create mode 100644 src/main/java/galena/oreganized/content/entity/VigilCandleBlockEntity.java create mode 100644 src/main/java/galena/oreganized/data/OMobEffectTags.java diff --git a/build.gradle b/build.gradle index 322ccb27..56600c62 100644 --- a/build.gradle +++ b/build.gradle @@ -108,11 +108,13 @@ dependencies { implementation(fg.deobf("maven.modrinth:shield-expansion:${shieldexpansion_version}")) implementation(fg.deobf("maven.modrinth:create:${create_version}")) implementation(fg.deobf("maven.modrinth:supplementaries:${supplementaries_version}")) + implementation(fg.deobf("maven.modrinth:amendments:${amendments_version}")) + implementation(fg.deobf("maven.modrinth:amendments:${amendments_version}")) + implementation(fg.deobf("maven.modrinth:moonlight:${moonlight_lib_version}")) // For dev testing runtimeOnly(fg.deobf("maven.modrinth:scannable:${scannable_version}")) runtimeOnly(fg.deobf("maven.modrinth:architectury-api:${architectury_version}")) - runtimeOnly(fg.deobf("maven.modrinth:moonlight:${moonlight_lib_version}")) /// Utilities for the development environment //runtimeOnly fg.deobf("curse.maven:jade-324717:${jade_version}") diff --git a/gradle.properties b/gradle.properties index 9aaf3849..55253bf7 100644 --- a/gradle.properties +++ b/gradle.properties @@ -30,6 +30,7 @@ nethersdelight_version=MTDQhZd2 shieldexpansion_version=8mpKmudC create_version=ZZW2y7nG supplementaries_version=eMF95dNK +amendments_version=qE7sokDv scannable_version=2FlwUOgm architectury_version=tBWqtdBO moonlight_lib_version=sfzdPwZX \ No newline at end of file diff --git a/src/generated/resources/.cache/5bb646c3cee204f41a1b59a2c0d9083b5f7155b0 b/src/generated/resources/.cache/5bb646c3cee204f41a1b59a2c0d9083b5f7155b0 index e1a99b45..28b7b70d 100644 --- a/src/generated/resources/.cache/5bb646c3cee204f41a1b59a2c0d9083b5f7155b0 +++ b/src/generated/resources/.cache/5bb646c3cee204f41a1b59a2c0d9083b5f7155b0 @@ -1,4 +1,4 @@ -// 1.20.1 2024-10-14T21:56:57.8734426 Oreganized Block Tags +// 1.20.1 2024-10-17T22:46:04.3663948 Oreganized Block Tags 7a2d68d81bc5ee59f9a2f4ba68ddb39bfd9c875d data/forge/tags/blocks/glass.json d96b4f83e03abe39a1b97d92b7818c8f6b2e5c68 data/forge/tags/blocks/glass_panes.json d062c23ad5308b7de0b2e86f6531ea724530f898 data/forge/tags/blocks/melts_lead.json @@ -15,12 +15,13 @@ bb0420ecbadc747d984fcef0fe7fc67586bc3231 data/forge/tags/blocks/storage_blocks/l 05f4708355ed88fe57116020dd93ac53f3098dba data/forge/tags/blocks/storage_blocks/raw_silver.json bff6697a058fddfe9e14615bc043fcb2071fd6fc data/forge/tags/blocks/storage_blocks/silver.json 7a1e2c391ad442cdc57f69ce1737207bc52bfb84 data/minecraft/tags/blocks/beacon_base_blocks.json +b85964d677734db0ac4bbc66f550f073ed0cb5e1 data/minecraft/tags/blocks/candles.json 82c03c405a971b2a7fc3fd43a9fb6c221f463ce0 data/minecraft/tags/blocks/cauldrons.json 503ad75af537d0ffef02ada9fb9afb5f5cd8e83b data/minecraft/tags/blocks/doors.json 0f64e9b9dc279dd460f6408313b130a37a0c9d86 data/minecraft/tags/blocks/ice.json 7a2d68d81bc5ee59f9a2f4ba68ddb39bfd9c875d data/minecraft/tags/blocks/impermeable.json f7079c32fc948b65cb486bea80e2dc93d13ce577 data/minecraft/tags/blocks/mineable/axe.json -bb012b5952f56da417a3022bb00d105f9a28dc10 data/minecraft/tags/blocks/mineable/pickaxe.json +abb8283f25d49e1094364bfc91028dd0f3af9ad6 data/minecraft/tags/blocks/mineable/pickaxe.json 84a13f81c79f0c05f8f7a8cbf1d3c25129a97179 data/minecraft/tags/blocks/mineable/shovel.json bb86ac7ab19373da790ec5711f473614e4b62d79 data/minecraft/tags/blocks/needs_iron_tool.json dc9cc2dca9fa3a28a0458ec282e3e0fe81999ee1 data/minecraft/tags/blocks/needs_stone_tool.json @@ -38,3 +39,4 @@ eaca08d04b1742f418e6bc0964dd32cf16035d88 data/oreganized/tags/blocks/mineable/sc cf3608bd187922aeb48c566c19e8482b0dca34c7 data/oreganized/tags/blocks/prevents_lead_cloud.json 06c2e2e512966767a31df77e646e41c4c39e3dd3 data/oreganized/tags/blocks/silktouch_using_scribe.json 3112fb4a1df2953e2c3572fa47f886bf8e5bd679 data/oreganized/tags/blocks/stone_types/glance.json +cead6b906640efcd90a6dbb5f5e17623f3631b53 data/oreganized/tags/blocks/vigil_candles.json diff --git a/src/generated/resources/data/minecraft/tags/blocks/candles.json b/src/generated/resources/data/minecraft/tags/blocks/candles.json new file mode 100644 index 00000000..6f26ed6e --- /dev/null +++ b/src/generated/resources/data/minecraft/tags/blocks/candles.json @@ -0,0 +1,5 @@ +{ + "values": [ + "#oreganized:vigil_candles" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/tags/blocks/mineable/pickaxe.json b/src/generated/resources/data/minecraft/tags/blocks/mineable/pickaxe.json index 328e4077..eacddb0c 100644 --- a/src/generated/resources/data/minecraft/tags/blocks/mineable/pickaxe.json +++ b/src/generated/resources/data/minecraft/tags/blocks/mineable/pickaxe.json @@ -35,22 +35,6 @@ "oreganized:grooved_ice", "oreganized:grooved_packed_ice", "oreganized:grooved_blue_ice", - "oreganized:vigil_candle", - "oreganized:purple_vigil_candle", - "oreganized:gray_vigil_candle", - "oreganized:blue_vigil_candle", - "oreganized:magenta_vigil_candle", - "oreganized:yellow_vigil_candle", - "oreganized:lime_vigil_candle", - "oreganized:orange_vigil_candle", - "oreganized:green_vigil_candle", - "oreganized:light_gray_vigil_candle", - "oreganized:red_vigil_candle", - "oreganized:cyan_vigil_candle", - "oreganized:black_vigil_candle", - "oreganized:white_vigil_candle", - "oreganized:pink_vigil_candle", - "oreganized:light_blue_vigil_candle", - "oreganized:brown_vigil_candle" + "#oreganized:vigil_candles" ] } \ No newline at end of file diff --git a/src/generated/resources/data/oreganized/tags/blocks/vigil_candles.json b/src/generated/resources/data/oreganized/tags/blocks/vigil_candles.json new file mode 100644 index 00000000..de14c5b9 --- /dev/null +++ b/src/generated/resources/data/oreganized/tags/blocks/vigil_candles.json @@ -0,0 +1,21 @@ +{ + "values": [ + "oreganized:vigil_candle", + "oreganized:light_blue_vigil_candle", + "oreganized:blue_vigil_candle", + "oreganized:orange_vigil_candle", + "oreganized:red_vigil_candle", + "oreganized:purple_vigil_candle", + "oreganized:light_gray_vigil_candle", + "oreganized:green_vigil_candle", + "oreganized:gray_vigil_candle", + "oreganized:magenta_vigil_candle", + "oreganized:white_vigil_candle", + "oreganized:yellow_vigil_candle", + "oreganized:black_vigil_candle", + "oreganized:brown_vigil_candle", + "oreganized:lime_vigil_candle", + "oreganized:cyan_vigil_candle", + "oreganized:pink_vigil_candle" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/oreganized/tags/mob_effect/cleared_by_vigil_candle.json b/src/generated/resources/data/oreganized/tags/mob_effect/cleared_by_vigil_candle.json new file mode 100644 index 00000000..5d24e09d --- /dev/null +++ b/src/generated/resources/data/oreganized/tags/mob_effect/cleared_by_vigil_candle.json @@ -0,0 +1,5 @@ +{ + "values": [ + "minecraft:darkness" + ] +} \ No newline at end of file diff --git a/src/main/java/galena/oreganized/Oreganized.java b/src/main/java/galena/oreganized/Oreganized.java index 73333f65..c2ac1417 100644 --- a/src/main/java/galena/oreganized/Oreganized.java +++ b/src/main/java/galena/oreganized/Oreganized.java @@ -6,6 +6,7 @@ import com.teamabnormals.blueprint.core.util.DataUtil; import com.teamabnormals.blueprint.core.util.registry.RegistryHelper; import galena.oreganized.compat.create.CreateCompat; +import galena.oreganized.compat.supplementaries.AmendmentsCompat; import galena.oreganized.content.block.LeadOreBlock; import galena.oreganized.content.block.MoltenLeadCauldronBlock; import galena.oreganized.content.entity.LeadBoltEntity; @@ -20,6 +21,7 @@ import galena.oreganized.data.OItemTags; import galena.oreganized.data.OLang; import galena.oreganized.data.OLootTables; +import galena.oreganized.data.OMobEffectTags; import galena.oreganized.data.ORecipes; import galena.oreganized.data.ORegistries; import galena.oreganized.data.OSoundDefinitions; @@ -159,6 +161,10 @@ public Oreganized() { CreateCompat.register(); } + if (ModList.get().isLoaded("amendments")) { + AmendmentsCompat.register(); + } + //CompatHandler.register(); //context.registerConfig(ModConfig.Type.COMMON, OreganizedConfig.COMMON_SPEC); @@ -286,6 +292,7 @@ public void gatherData(GatherDataEvent event) { generator.addProvider(server, datapackProvider); generator.addProvider(server, new OBiomeTags(output, lookupProvider, helper)); generator.addProvider(server, new ODamageTags(output, lookupProvider, helper)); + generator.addProvider(server, new OMobEffectTags(output, lookupProvider, helper)); //generator.addProvider(server, new OPaintingVariantTags(output, lookupProvider, helper)); //generator.addProvider(server, new OBiomeModifier.register(event)); diff --git a/src/main/java/galena/oreganized/client/OreganizedClient.java b/src/main/java/galena/oreganized/client/OreganizedClient.java index 3cdacf5f..f2ae3cf3 100644 --- a/src/main/java/galena/oreganized/client/OreganizedClient.java +++ b/src/main/java/galena/oreganized/client/OreganizedClient.java @@ -80,8 +80,7 @@ private static void registerBlockRenderers() { render(OBlocks.LEAD_BARS, cutout); render(OBlocks.GARGOYLE, cutout); - render(OBlocks.VIGIL_CANDLE, cutout); - OBlocks.COLORED_VIGIL_CANDLES.forEach((color, block) -> render(block, cutout)); + OBlocks.vigilCandles().forEach(block -> render(block, cutout)); for (int i = 0; OBlocks.CRYSTAL_GLASS.size() > i; i++) { render(OBlocks.CRYSTAL_GLASS.get(i), translucent); diff --git a/src/main/java/galena/oreganized/compat/supplementaries/AmendmentsCompat.java b/src/main/java/galena/oreganized/compat/supplementaries/AmendmentsCompat.java new file mode 100644 index 00000000..8d328d34 --- /dev/null +++ b/src/main/java/galena/oreganized/compat/supplementaries/AmendmentsCompat.java @@ -0,0 +1,56 @@ +package galena.oreganized.compat.supplementaries; + +import net.mehvahdjukaar.amendments.common.tile.WallLanternBlockTile; +import net.minecraft.sounds.SoundEvents; +import net.minecraft.sounds.SoundSource; +import net.minecraft.world.InteractionResult; +import net.minecraft.world.item.Items; +import net.minecraft.world.level.block.CandleBlock; +import net.minecraft.world.level.block.state.properties.BlockStateProperties; +import net.minecraftforge.common.MinecraftForge; +import net.minecraftforge.event.entity.player.PlayerInteractEvent; + +public class AmendmentsCompat { + + public static void register() { + MinecraftForge.EVENT_BUS.addListener(AmendmentsCompat::onBlockInteract); + } + + private static void onBlockInteract(PlayerInteractEvent.RightClickBlock event) { + var pos = event.getPos(); + var level = event.getLevel(); + var be = level.getBlockEntity(pos); + var held = event.getItemStack(); + var player = event.getEntity(); + + if(!(be instanceof WallLanternBlockTile lantern)) return; + + var state = lantern.getHeldBlock(); + var lit = state.getValue(CandleBlock.LIT); + + InteractionResult result = InteractionResult.PASS; + + if(held.is(Items.FLINT_AND_STEEL) && !lit) { + level.playSound(player, pos, SoundEvents.FLINTANDSTEEL_USE, SoundSource.BLOCKS, 1.0F, level.getRandom().nextFloat() * 0.4F + 0.8F); + lantern.setHeldBlock(state.setValue(BlockStateProperties.LIT, true)); + if (player != null) { + held.hurtAndBreak(1, player, (p_41303_) -> { + p_41303_.broadcastBreakEvent(event.getHand()); + }); + } + + result = InteractionResult.sidedSuccess(level.isClientSide()); + } else if(held.isEmpty() && lit) { + level.playSound(player, pos, SoundEvents.CANDLE_EXTINGUISH, SoundSource.BLOCKS, 1.0F, 1.0F); + lantern.setHeldBlock(state.setValue(BlockStateProperties.LIT, false)); + + result = InteractionResult.sidedSuccess(level.isClientSide()); + } + + if(result != InteractionResult.PASS) { + event.setCancellationResult(result); + event.setCanceled(true); + } + } + +} diff --git a/src/main/java/galena/oreganized/content/block/VigilCandleBlock.java b/src/main/java/galena/oreganized/content/block/VigilCandleBlock.java index 85d3ec25..03d54bcf 100644 --- a/src/main/java/galena/oreganized/content/block/VigilCandleBlock.java +++ b/src/main/java/galena/oreganized/content/block/VigilCandleBlock.java @@ -1,5 +1,7 @@ package galena.oreganized.content.block; +import galena.oreganized.content.entity.VigilCandleBlockEntity; +import galena.oreganized.index.OBlockEntities; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.world.InteractionHand; @@ -12,7 +14,11 @@ import net.minecraft.world.level.LevelReader; import net.minecraft.world.level.block.AbstractCandleBlock; import net.minecraft.world.level.block.Block; +import net.minecraft.world.level.block.EntityBlock; import net.minecraft.world.level.block.LanternBlock; +import net.minecraft.world.level.block.entity.BlockEntity; +import net.minecraft.world.level.block.entity.BlockEntityTicker; +import net.minecraft.world.level.block.entity.BlockEntityType; import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.level.block.state.StateDefinition; import net.minecraft.world.level.material.FluidState; @@ -30,7 +36,7 @@ import static net.minecraft.world.level.block.CandleBlock.MIN_CANDLES; import static net.minecraft.world.level.block.state.properties.BlockStateProperties.CANDLES; -public class VigilCandleBlock extends LanternBlock { +public class VigilCandleBlock extends LanternBlock implements EntityBlock { private static VoxelShape shape(double x, double y, double z) { return Block.box(x, y, z, 6 + x, 10 + y, 6 + z); @@ -135,4 +141,16 @@ public boolean placeLiquid(LevelAccessor level, BlockPos pos, BlockState state, } } + @Override + public @Nullable BlockEntity newBlockEntity(BlockPos pos, BlockState state) { + return new VigilCandleBlockEntity(pos, state); + } + + @SuppressWarnings("unchecked") + @Override + public @Nullable BlockEntityTicker getTicker(Level level, BlockState state, BlockEntityType type) { + if(type != OBlockEntities.VIGIL_CANDLE.get()) return null; + BlockEntityTicker ticker = (l, p, s, be) -> be.tick(l, p, s); + return (BlockEntityTicker) ticker; + } } diff --git a/src/main/java/galena/oreganized/content/entity/VigilCandleBlockEntity.java b/src/main/java/galena/oreganized/content/entity/VigilCandleBlockEntity.java new file mode 100644 index 00000000..11de43d7 --- /dev/null +++ b/src/main/java/galena/oreganized/content/entity/VigilCandleBlockEntity.java @@ -0,0 +1,37 @@ +package galena.oreganized.content.entity; + +import galena.oreganized.index.OBlockEntities; +import galena.oreganized.index.OTags; +import net.minecraft.core.BlockPos; +import net.minecraft.core.registries.Registries; +import net.minecraft.world.entity.LivingEntity; +import net.minecraft.world.level.Level; +import net.minecraft.world.level.block.CandleBlock; +import net.minecraft.world.level.block.entity.BlockEntity; +import net.minecraft.world.level.block.state.BlockState; +import net.minecraft.world.phys.AABB; + +public class VigilCandleBlockEntity extends BlockEntity { + + public VigilCandleBlockEntity(BlockPos pos, BlockState state) { + super(OBlockEntities.VIGIL_CANDLE.get(), pos, state); + } + + public void tick(Level level, BlockPos pos, BlockState state) { + if (level.getGameTime() % 20L != 0) return; + if (!state.getValue(CandleBlock.LIT)) return; + + var range = 3 + state.getValue(CandleBlock.CANDLES); + var entities = level.getEntitiesOfClass(LivingEntity.class, new AABB(pos).inflate(range)); + + var effects = level.registryAccess().registryOrThrow(Registries.MOB_EFFECT); + var shouldClear = effects.getTagOrEmpty(OTags.Effects.VIGIL_CANDLE_CLEARS); + + entities.forEach(entity -> { + shouldClear.forEach(effect -> { + entity.removeEffect(effect.get()); + }); + }); + } + +} diff --git a/src/main/java/galena/oreganized/data/OBlockTags.java b/src/main/java/galena/oreganized/data/OBlockTags.java index ea7940f8..4bcc17a6 100644 --- a/src/main/java/galena/oreganized/data/OBlockTags.java +++ b/src/main/java/galena/oreganized/data/OBlockTags.java @@ -35,6 +35,7 @@ import static galena.oreganized.index.OTags.Blocks.STORAGE_BLOCKS_RAW_LEAD; import static galena.oreganized.index.OTags.Blocks.STORAGE_BLOCKS_RAW_SILVER; import static galena.oreganized.index.OTags.Blocks.STORAGE_BLOCKS_SILVER; +import static galena.oreganized.index.OTags.Blocks.VIGIL_CANDLES; public class OBlockTags extends IntrinsicHolderTagsProvider { @@ -95,9 +96,8 @@ protected void addTags(HolderLookup.Provider provider) { /*tag(MINEABLE_WITH_BUSH_HAMMER).add( );*/ - var pickaxeMinable = tag(BlockTags.MINEABLE_WITH_PICKAXE); - pickaxeMinable.add( + tag(BlockTags.MINEABLE_WITH_PICKAXE).add( OBlocks.LEAD_ORE.get(), OBlocks.DEEPSLATE_LEAD_ORE.get(), OBlocks.RAW_LEAD_BLOCK.get(), @@ -142,8 +142,12 @@ protected void addTags(HolderLookup.Provider provider) { OBlocks.GROOVED_BLUE_ICE.get() ); - pickaxeMinable.add(OBlocks.VIGIL_CANDLE.get()); - OBlocks.COLORED_VIGIL_CANDLES.forEach((color, block) -> pickaxeMinable.add(block.get())); + var vigilCandles = tag(VIGIL_CANDLES); + + OBlocks.vigilCandles().forEach(block -> vigilCandles.add(block.get())); + + tag(BlockTags.CANDLES).addTags(VIGIL_CANDLES); + tag(BlockTags.MINEABLE_WITH_PICKAXE).addTags(VIGIL_CANDLES); tag(BlockTags.MINEABLE_WITH_SHOVEL).add( OBlocks.WAXED_WHITE_CONCRETE_POWDER.get(), diff --git a/src/main/java/galena/oreganized/data/OItemModels.java b/src/main/java/galena/oreganized/data/OItemModels.java index 2003b7fc..2d9998a2 100644 --- a/src/main/java/galena/oreganized/data/OItemModels.java +++ b/src/main/java/galena/oreganized/data/OItemModels.java @@ -130,8 +130,7 @@ protected void registerModels() { block(OBlocks.GROOVED_PACKED_ICE); block(OBlocks.GROOVED_BLUE_ICE); - normalItem(OBlocks.VIGIL_CANDLE); - OBlocks.COLORED_VIGIL_CANDLES.forEach((color, block) -> normalItem(block)); + OBlocks.vigilCandles().forEach(this::normalItem); for (Supplier blocks : OBlocks.WAXED_CONRETE_POWDER) { withExistingParent(blockName(blocks), "minecraft:block/" + blockName(blocks).replace("waxed_", "")); diff --git a/src/main/java/galena/oreganized/data/OLootTables.java b/src/main/java/galena/oreganized/data/OLootTables.java index 4601e126..1a536f5b 100644 --- a/src/main/java/galena/oreganized/data/OLootTables.java +++ b/src/main/java/galena/oreganized/data/OLootTables.java @@ -128,8 +128,7 @@ protected void generate() { dropSelf(blocks); } - vigilCandle(OBlocks.VIGIL_CANDLE); - OBlocks.COLORED_VIGIL_CANDLES.forEach((color, block) -> vigilCandle(block)); + OBlocks.vigilCandles().forEach(this::vigilCandle); } private void grooved(Supplier block, Block other) { diff --git a/src/main/java/galena/oreganized/data/OMobEffectTags.java b/src/main/java/galena/oreganized/data/OMobEffectTags.java new file mode 100644 index 00000000..3c884511 --- /dev/null +++ b/src/main/java/galena/oreganized/data/OMobEffectTags.java @@ -0,0 +1,33 @@ +package galena.oreganized.data; + +import galena.oreganized.Oreganized; +import galena.oreganized.index.OTags; +import net.minecraft.core.HolderLookup; +import net.minecraft.core.registries.Registries; +import net.minecraft.data.PackOutput; +import net.minecraft.data.tags.TagsProvider; +import net.minecraft.resources.ResourceKey; +import net.minecraft.resources.ResourceLocation; +import net.minecraft.world.effect.MobEffect; +import net.minecraftforge.common.data.ExistingFileHelper; +import org.jetbrains.annotations.NotNull; + +import javax.annotation.Nullable; +import java.util.concurrent.CompletableFuture; + +public class OMobEffectTags extends TagsProvider { + + public OMobEffectTags(PackOutput output, CompletableFuture future, @Nullable ExistingFileHelper helper) { + super(output, Registries.MOB_EFFECT, future, Oreganized.MOD_ID, helper); + } + + @Override + public @NotNull String getName() { + return "Oreganized MobEffect Tags"; + } + + @Override + protected void addTags(HolderLookup.Provider provider) { + tag(OTags.Effects.VIGIL_CANDLE_CLEARS).add(ResourceKey.create(Registries.MOB_EFFECT, new ResourceLocation("darkness"))); + } +} diff --git a/src/main/java/galena/oreganized/data/provider/OBlockStateProvider.java b/src/main/java/galena/oreganized/data/provider/OBlockStateProvider.java index 763f9374..d6c39977 100644 --- a/src/main/java/galena/oreganized/data/provider/OBlockStateProvider.java +++ b/src/main/java/galena/oreganized/data/provider/OBlockStateProvider.java @@ -11,6 +11,7 @@ import net.minecraft.core.Direction; import net.minecraft.data.PackOutput; import net.minecraft.resources.ResourceLocation; +import net.minecraft.world.level.block.AbstractCandleBlock; import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.CrossCollisionBlock; import net.minecraft.world.level.block.DoorBlock; @@ -410,7 +411,7 @@ public void vigilCandle(Supplier block, @Nullable String prefix return ConfiguredModel.builder() .modelFile(model) .build(); - }, BlockStateProperties.WATERLOGGED); + }, BlockStateProperties.WATERLOGGED, AbstractCandleBlock.LIT); } public void crate(Supplier block) { diff --git a/src/main/java/galena/oreganized/index/OBlockEntities.java b/src/main/java/galena/oreganized/index/OBlockEntities.java index aca26534..8a1363be 100644 --- a/src/main/java/galena/oreganized/index/OBlockEntities.java +++ b/src/main/java/galena/oreganized/index/OBlockEntities.java @@ -4,11 +4,13 @@ import galena.oreganized.Oreganized; import galena.oreganized.content.block.HeavyDoorBlockEntity; import galena.oreganized.content.entity.GargoyleBlockEntity; +import galena.oreganized.content.entity.VigilCandleBlockEntity; import net.minecraft.world.level.block.entity.BlockEntityType; import net.minecraftforge.fml.common.Mod; import net.minecraftforge.registries.RegistryObject; import java.util.Set; +import java.util.stream.Collectors; @Mod.EventBusSubscriber(modid = Oreganized.MOD_ID, bus = Mod.EventBusSubscriber.Bus.MOD) public class OBlockEntities { @@ -17,4 +19,6 @@ public class OBlockEntities { public static final RegistryObject> GARGOYLE = HELPER.createBlockEntity("gargoyle", GargoyleBlockEntity::new, () -> Set.of(OBlocks.GARGOYLE.get())); public static final RegistryObject> HEAVY_DOOR = HELPER.createBlockEntity("heavy_door", HeavyDoorBlockEntity::new, () -> Set.of(OBlocks.LEAD_DOOR.get(), OBlocks.LEAD_TRAPDOOR.get())); + public static final RegistryObject> VIGIL_CANDLE = HELPER.createBlockEntity("vigil_candle", VigilCandleBlockEntity::new, () -> OBlocks.vigilCandles().map(RegistryObject::get).collect(Collectors.toSet())); + } diff --git a/src/main/java/galena/oreganized/index/OBlocks.java b/src/main/java/galena/oreganized/index/OBlocks.java index 5294fdde..438b8646 100644 --- a/src/main/java/galena/oreganized/index/OBlocks.java +++ b/src/main/java/galena/oreganized/index/OBlocks.java @@ -48,6 +48,7 @@ import java.util.function.Function; import java.util.function.Supplier; import java.util.stream.Collectors; +import java.util.stream.Stream; @Mod.EventBusSubscriber(modid = Oreganized.MOD_ID, bus = Mod.EventBusSubscriber.Bus.MOD) public class OBlocks { @@ -204,9 +205,16 @@ private static BlockBehaviour.Properties leadDecoProperties() { public static final RegistryObject MOLTEN_LEAD_CAULDRON = HELPER.createBlock("molten_lead_cauldron", () -> new MoltenLeadCauldronBlock(BlockBehaviour.Properties.copy(Blocks.LAVA_CAULDRON).randomTicks())); private static final Supplier VIGIL_CANDLE_PROPERTIES = () -> BlockBehaviour.Properties.of().lightLevel(CandleBlock.LIGHT_EMISSION).sound(SoundType.METAL).pushReaction(PushReaction.DESTROY); - public static final RegistryObject VIGIL_CANDLE = register("vigil_candle", () ->new VigilCandleBlock(VIGIL_CANDLE_PROPERTIES.get())); + public static final RegistryObject VIGIL_CANDLE = register("vigil_candle", () -> new VigilCandleBlock(VIGIL_CANDLE_PROPERTIES.get())); public static final Map> COLORED_VIGIL_CANDLES = registerColored("vigil_candle", color -> new VigilCandleBlock(VIGIL_CANDLE_PROPERTIES.get().mapColor(color))); + public static Stream> vigilCandles() { + return Stream.of( + Stream.of(VIGIL_CANDLE), + COLORED_VIGIL_CANDLES.values().stream() + ).flatMap(Function.identity()); + } + public static Map> registerColored(String baseName, Function factory) { return Arrays.stream(DyeColor.values()).collect(Collectors.toMap( it -> it, diff --git a/src/main/java/galena/oreganized/index/OTags.java b/src/main/java/galena/oreganized/index/OTags.java index 54d6e040..e2963eda 100644 --- a/src/main/java/galena/oreganized/index/OTags.java +++ b/src/main/java/galena/oreganized/index/OTags.java @@ -1,8 +1,10 @@ package galena.oreganized.index; import galena.oreganized.Oreganized; +import net.minecraft.core.registries.Registries; import net.minecraft.resources.ResourceLocation; import net.minecraft.tags.*; +import net.minecraft.world.effect.MobEffect; import net.minecraft.world.entity.EntityType; import net.minecraft.world.item.Item; import net.minecraft.world.level.biome.Biome; @@ -93,6 +95,8 @@ public static class Blocks { public static final TagKey PREVENTS_LEAD_CLOUD = tag("prevents_lead_cloud"); public static final TagKey BLOWS_LEAD_CLOUD = tag("blows_lead_cloud"); + public static final TagKey VIGIL_CANDLES = tag("vigil_candles"); + private static TagKey tag(String name) { return BlockTags.create(Oreganized.modLoc(name)); } @@ -132,4 +136,13 @@ private static TagKey tag(String name) { return BiomeTags.create(Oreganized.modLoc(name).toString()); } } + + public static class Effects { + + public static final TagKey VIGIL_CANDLE_CLEARS = tag("cleared_by_vigil_candle"); + + private static TagKey tag(String name) { + return TagKey.create(Registries.MOB_EFFECT, Oreganized.modLoc(name)); + } + } } From 1e7e8fff5b70a8f4e5f055153317d7712591135d Mon Sep 17 00:00:00 2001 From: Niklas Widmann Date: Tue, 22 Oct 2024 20:08:58 +0200 Subject: [PATCH 05/11] add sepulcher filling --- .../galena/oreganized/OreganizedConfig.java | 2 + .../content/block/GargoyleBlock.java | 24 +++--- .../content/block/HeavyDoorBlockEntity.java | 16 +--- .../content/block/LeadDoorBlock.java | 9 +-- .../content/block/LeadTrapdoorBlock.java | 9 +-- .../content/block/SepulcherBlock.java | 76 +++++++++++++++++++ .../content/block/TickingEntityBlock.java | 27 +++++++ .../content/block/VigilCandleBlock.java | 16 ++-- .../content/entity/GargoyleBlockEntity.java | 22 +++--- .../content/entity/SepulcherBlockEntity.java | 40 ++++++++++ .../oreganized/content/entity/Ticking.java | 11 +++ .../entity/VigilCandleBlockEntity.java | 5 +- .../oreganized/index/OBlockEntities.java | 2 + .../java/galena/oreganized/index/OBlocks.java | 3 +- 14 files changed, 200 insertions(+), 62 deletions(-) create mode 100644 src/main/java/galena/oreganized/content/block/SepulcherBlock.java create mode 100644 src/main/java/galena/oreganized/content/block/TickingEntityBlock.java create mode 100644 src/main/java/galena/oreganized/content/entity/SepulcherBlockEntity.java create mode 100644 src/main/java/galena/oreganized/content/entity/Ticking.java diff --git a/src/main/java/galena/oreganized/OreganizedConfig.java b/src/main/java/galena/oreganized/OreganizedConfig.java index 5b31f5b1..fe35c7f7 100644 --- a/src/main/java/galena/oreganized/OreganizedConfig.java +++ b/src/main/java/galena/oreganized/OreganizedConfig.java @@ -20,6 +20,7 @@ public static class Common { public final ConfigValue pillagerSpawnWithBolts; public final ConfigValue scribeSilkTouchStone; public final ConfigValue moltenLeadDelay; + public final ConfigValue sepulcherDuration; private Common(ForgeConfigSpec.Builder builder) { builder.comment("Common"); @@ -30,6 +31,7 @@ private Common(ForgeConfigSpec.Builder builder) { pillagerSpawnWithBolts = builder.comment("Pillagers have a chance to spawn with a lead bolt in their offhand").define("pillagerSpawnWithBolts", true); scribeSilkTouchStone = builder.comment("The scribe is able to silk-touch pickaxe-related blocks").define("scribeSilkTouchStone", true); moltenLeadDelay = builder.comment("Time in ticks molten lead waits until flowing downwards").defineInRange("moltenLeadDelay", 20 * 10, 0, 20 * 100); + sepulcherDuration = builder.comment("Time in ticks the sepulcher takes to turn meat into bones").defineInRange("sepulcherDuration", 20 * 60 * 5, 0, Integer.MAX_VALUE); builder.pop(); } diff --git a/src/main/java/galena/oreganized/content/block/GargoyleBlock.java b/src/main/java/galena/oreganized/content/block/GargoyleBlock.java index e27a2af3..944e2b14 100644 --- a/src/main/java/galena/oreganized/content/block/GargoyleBlock.java +++ b/src/main/java/galena/oreganized/content/block/GargoyleBlock.java @@ -16,10 +16,8 @@ import net.minecraft.world.level.Level; import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.DispenserBlock; -import net.minecraft.world.level.block.EntityBlock; import net.minecraft.world.level.block.HorizontalDirectionalBlock; import net.minecraft.world.level.block.entity.BlockEntity; -import net.minecraft.world.level.block.entity.BlockEntityTicker; import net.minecraft.world.level.block.entity.BlockEntityType; import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.level.block.state.StateDefinition; @@ -35,7 +33,7 @@ import static net.minecraft.world.level.block.state.properties.BlockStateProperties.HORIZONTAL_FACING; -public class GargoyleBlock extends HorizontalDirectionalBlock implements EntityBlock { +public class GargoyleBlock extends HorizontalDirectionalBlock implements TickingEntityBlock { public static final EnumProperty ATTACHMENT = EnumProperty.create("attachment", AttachmentType.class); @@ -45,11 +43,11 @@ public class GargoyleBlock extends HorizontalDirectionalBlock implements EntityB var dispenser = source.getBlockState(); var facing = dispenser.getValue(DispenserBlock.FACING); var targetPos = source.getPos().relative(facing); - var target = source.getLevel().getBlockEntity(targetPos); + var target = source.getLevel().getBlockEntity(targetPos, OBlockEntities.GARGOYLE.get()); - if (target instanceof GargoyleBlockEntity gargoyle) { + target.ifPresent(gargoyle -> { gargoyle.interact(source.getLevel(), targetPos, null, stack, false); - } + }); return stack; }; @@ -78,15 +76,6 @@ public BlockState getStateForPlacement(BlockPlaceContext context) { } } - @Nullable - @Override - public BlockEntityTicker getTicker(Level level, BlockState state, BlockEntityType type) { - if (type != OBlockEntities.GARGOYLE.get()) return null; - BlockEntityTicker ticker = GargoyleBlockEntity::tick; - //noinspection unchecked - return (BlockEntityTicker) ticker; - } - @Override public boolean hasAnalogOutputSignal(BlockState state) { return true; @@ -158,6 +147,11 @@ public String getSerializedName() { } } + @Override + public BlockEntityType getType() { + return OBlockEntities.GARGOYLE.get(); + } + protected VoxelShape getShapeFor(BlockState state) { var facing = state.getValue(FACING); var attachment = state.getValue(ATTACHMENT); diff --git a/src/main/java/galena/oreganized/content/block/HeavyDoorBlockEntity.java b/src/main/java/galena/oreganized/content/block/HeavyDoorBlockEntity.java index ada5d9f3..694a0c76 100644 --- a/src/main/java/galena/oreganized/content/block/HeavyDoorBlockEntity.java +++ b/src/main/java/galena/oreganized/content/block/HeavyDoorBlockEntity.java @@ -1,5 +1,6 @@ package galena.oreganized.content.block; +import galena.oreganized.content.entity.Ticking; import galena.oreganized.index.OBlockEntities; import galena.oreganized.index.OBlocks; import galena.oreganized.index.ODamageSources; @@ -11,8 +12,6 @@ import net.minecraft.world.level.Level; import net.minecraft.world.level.LevelAccessor; import net.minecraft.world.level.block.entity.BlockEntity; -import net.minecraft.world.level.block.entity.BlockEntityTicker; -import net.minecraft.world.level.block.entity.BlockEntityType; import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.level.block.state.properties.BlockSetType; import net.minecraft.world.level.gameevent.GameEvent; @@ -23,7 +22,7 @@ import static galena.oreganized.content.block.LeadDoorBlock.ANIMATED; import static net.minecraft.world.level.block.state.properties.BlockStateProperties.OPEN; -public class HeavyDoorBlockEntity extends BlockEntity { +public class HeavyDoorBlockEntity extends BlockEntity implements Ticking { private int pressure = 0; @@ -41,16 +40,7 @@ public static Optional getAt(LevelAccessor level, BlockPos return Optional.empty(); } - @SuppressWarnings("unchecked") - public static @Nullable BlockEntityTicker getTicker(Level level, BlockState state, BlockEntityType type) { - if (type == OBlockEntities.HEAVY_DOOR.get()) { - BlockEntityTicker ticker = (l, p, s, be) -> be.tick(s, l, p); - return (BlockEntityTicker) ticker; - } - - return null; - } - + @Override public void tick(BlockState state, Level level, BlockPos pos) { if (pressure <= 0) return; diff --git a/src/main/java/galena/oreganized/content/block/LeadDoorBlock.java b/src/main/java/galena/oreganized/content/block/LeadDoorBlock.java index 95722f8d..26dd461b 100644 --- a/src/main/java/galena/oreganized/content/block/LeadDoorBlock.java +++ b/src/main/java/galena/oreganized/content/block/LeadDoorBlock.java @@ -1,5 +1,6 @@ package galena.oreganized.content.block; +import galena.oreganized.index.OBlockEntities; import galena.oreganized.index.OBlocks; import net.minecraft.core.BlockPos; import net.minecraft.server.level.ServerLevel; @@ -13,9 +14,7 @@ import net.minecraft.world.level.Level; import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.DoorBlock; -import net.minecraft.world.level.block.EntityBlock; import net.minecraft.world.level.block.entity.BlockEntity; -import net.minecraft.world.level.block.entity.BlockEntityTicker; import net.minecraft.world.level.block.entity.BlockEntityType; import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.level.block.state.StateDefinition; @@ -24,7 +23,7 @@ import net.minecraft.world.phys.BlockHitResult; import org.jetbrains.annotations.Nullable; -public class LeadDoorBlock extends DoorBlock implements IMeltableBlock, EntityBlock, IHeavyDoor { +public class LeadDoorBlock extends DoorBlock implements IMeltableBlock, TickingEntityBlock, IHeavyDoor { /** * Not fully implemented yet @@ -44,8 +43,8 @@ public LeadDoorBlock(Properties properties) { } @Override - public @Nullable BlockEntityTicker getTicker(Level level, BlockState state, BlockEntityType type) { - return HeavyDoorBlockEntity.getTicker(level, state, type); + public BlockEntityType getType() { + return OBlockEntities.HEAVY_DOOR.get(); } @Override diff --git a/src/main/java/galena/oreganized/content/block/LeadTrapdoorBlock.java b/src/main/java/galena/oreganized/content/block/LeadTrapdoorBlock.java index 894dbcca..712147a5 100644 --- a/src/main/java/galena/oreganized/content/block/LeadTrapdoorBlock.java +++ b/src/main/java/galena/oreganized/content/block/LeadTrapdoorBlock.java @@ -1,5 +1,6 @@ package galena.oreganized.content.block; +import galena.oreganized.index.OBlockEntities; import galena.oreganized.index.OBlocks; import net.minecraft.core.BlockPos; import net.minecraft.server.level.ServerLevel; @@ -11,17 +12,15 @@ import net.minecraft.world.item.context.BlockPlaceContext; import net.minecraft.world.level.Level; import net.minecraft.world.level.block.Block; -import net.minecraft.world.level.block.EntityBlock; import net.minecraft.world.level.block.TrapDoorBlock; import net.minecraft.world.level.block.entity.BlockEntity; -import net.minecraft.world.level.block.entity.BlockEntityTicker; import net.minecraft.world.level.block.entity.BlockEntityType; import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.level.block.state.StateDefinition; import net.minecraft.world.phys.BlockHitResult; import org.jetbrains.annotations.Nullable; -public class LeadTrapdoorBlock extends TrapDoorBlock implements IMeltableBlock, EntityBlock, IHeavyDoor { +public class LeadTrapdoorBlock extends TrapDoorBlock implements IMeltableBlock, TickingEntityBlock, IHeavyDoor { public LeadTrapdoorBlock(Properties properties) { super(properties, OBlocks.LEAD_BLOCK_SET); @@ -33,8 +32,8 @@ public LeadTrapdoorBlock(Properties properties) { } @Override - public @Nullable BlockEntityTicker getTicker(Level level, BlockState state, BlockEntityType type) { - return HeavyDoorBlockEntity.getTicker(level, state, type); + public BlockEntityType getType() { + return OBlockEntities.HEAVY_DOOR.get(); } @Override diff --git a/src/main/java/galena/oreganized/content/block/SepulcherBlock.java b/src/main/java/galena/oreganized/content/block/SepulcherBlock.java new file mode 100644 index 00000000..06745228 --- /dev/null +++ b/src/main/java/galena/oreganized/content/block/SepulcherBlock.java @@ -0,0 +1,76 @@ +package galena.oreganized.content.block; + +import galena.oreganized.content.entity.SepulcherBlockEntity; +import galena.oreganized.index.OBlockEntities; +import net.minecraft.core.BlockPos; +import net.minecraft.sounds.SoundEvents; +import net.minecraft.sounds.SoundSource; +import net.minecraft.world.InteractionHand; +import net.minecraft.world.InteractionResult; +import net.minecraft.world.entity.Entity; +import net.minecraft.world.entity.item.ItemEntity; +import net.minecraft.world.entity.player.Player; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.item.Items; +import net.minecraft.world.level.Level; +import net.minecraft.world.level.block.Block; +import net.minecraft.world.level.block.entity.BlockEntity; +import net.minecraft.world.level.block.entity.BlockEntityType; +import net.minecraft.world.level.block.state.BlockState; +import net.minecraft.world.level.block.state.StateDefinition; +import net.minecraft.world.level.block.state.properties.BlockStateProperties; +import net.minecraft.world.level.block.state.properties.IntegerProperty; +import net.minecraft.world.phys.BlockHitResult; +import net.minecraft.world.phys.Vec3; +import org.jetbrains.annotations.Nullable; + +public class SepulcherBlock extends Block implements TickingEntityBlock { + + public static final int MAX_LEVEL = 8; + public static final int BONES_LEVEL = 8; + public static final IntegerProperty LEVEL = IntegerProperty.create("level", 0, BONES_LEVEL); + + public SepulcherBlock(Properties properties) { + super(properties); + registerDefaultState(defaultBlockState().setValue(LEVEL, 0)); + } + + @Override + protected void createBlockStateDefinition(StateDefinition.Builder builder) { + super.createBlockStateDefinition(builder); + builder.add(BlockStateProperties.LEVEL); + } + + @Override + public InteractionResult use(BlockState state, Level level, BlockPos pos, Player player, InteractionHand hand, BlockHitResult hit) { + var fillLevel = state.getValue(LEVEL); + + if(fillLevel == BONES_LEVEL) { + extractBones(player, state, level, pos); + } + } + + + public static void extractBones(Entity user, BlockState state, Level level, BlockPos pos) { + if (!level.isClientSide) { + Vec3 $$4 = Vec3.atLowerCornerWithOffset(pos, 0.5, 1.01, 0.5).offsetRandom(level.random, 0.7F); + ItemEntity $$5 = new ItemEntity(level, $$4.x(), $$4.y(), $$4.z(), new ItemStack(Items.BONE_MEAL)); + $$5.setDefaultPickUpDelay(); + level.addFreshEntity($$5); + } + + BlockState $$6 = empty(user, state, level, pos); + level.playSound((Player)null, pos, SoundEvents.COMPOSTER_EMPTY, SoundSource.BLOCKS, 1.0F, 1.0F); + return $$6; + } + + @Override + public @Nullable BlockEntity newBlockEntity(BlockPos pos, BlockState state) { + return new SepulcherBlockEntity(pos, state); + } + + @Override + public BlockEntityType getType() { + return OBlockEntities.SEPULCHER.get(); + } +} diff --git a/src/main/java/galena/oreganized/content/block/TickingEntityBlock.java b/src/main/java/galena/oreganized/content/block/TickingEntityBlock.java new file mode 100644 index 00000000..66f0e494 --- /dev/null +++ b/src/main/java/galena/oreganized/content/block/TickingEntityBlock.java @@ -0,0 +1,27 @@ +package galena.oreganized.content.block; + +import galena.oreganized.content.entity.Ticking; +import net.minecraft.world.level.Level; +import net.minecraft.world.level.block.EntityBlock; +import net.minecraft.world.level.block.entity.BlockEntity; +import net.minecraft.world.level.block.entity.BlockEntityTicker; +import net.minecraft.world.level.block.entity.BlockEntityType; +import net.minecraft.world.level.block.state.BlockState; +import org.jetbrains.annotations.Nullable; + +public interface TickingEntityBlock extends EntityBlock { + + BlockEntityType getType(); + + @Override + @Nullable + @SuppressWarnings("unchecked") + default BlockEntityTicker getTicker(Level level, BlockState state, BlockEntityType type) { + if (type == getType()) { + BlockEntityTicker ticker = (l, p, s, be) -> be.tick(s, l, p); + return (BlockEntityTicker) ticker; + } + + return null; + } +} diff --git a/src/main/java/galena/oreganized/content/block/VigilCandleBlock.java b/src/main/java/galena/oreganized/content/block/VigilCandleBlock.java index 03d54bcf..8b6e9b7b 100644 --- a/src/main/java/galena/oreganized/content/block/VigilCandleBlock.java +++ b/src/main/java/galena/oreganized/content/block/VigilCandleBlock.java @@ -14,10 +14,8 @@ import net.minecraft.world.level.LevelReader; import net.minecraft.world.level.block.AbstractCandleBlock; import net.minecraft.world.level.block.Block; -import net.minecraft.world.level.block.EntityBlock; import net.minecraft.world.level.block.LanternBlock; import net.minecraft.world.level.block.entity.BlockEntity; -import net.minecraft.world.level.block.entity.BlockEntityTicker; import net.minecraft.world.level.block.entity.BlockEntityType; import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.level.block.state.StateDefinition; @@ -36,7 +34,7 @@ import static net.minecraft.world.level.block.CandleBlock.MIN_CANDLES; import static net.minecraft.world.level.block.state.properties.BlockStateProperties.CANDLES; -public class VigilCandleBlock extends LanternBlock implements EntityBlock { +public class VigilCandleBlock extends LanternBlock implements TickingEntityBlock { private static VoxelShape shape(double x, double y, double z) { return Block.box(x, y, z, 6 + x, 10 + y, 6 + z); @@ -142,15 +140,13 @@ public boolean placeLiquid(LevelAccessor level, BlockPos pos, BlockState state, } @Override - public @Nullable BlockEntity newBlockEntity(BlockPos pos, BlockState state) { - return new VigilCandleBlockEntity(pos, state); + public BlockEntityType getType() { + return OBlockEntities.VIGIL_CANDLE.get(); } - @SuppressWarnings("unchecked") @Override - public @Nullable BlockEntityTicker getTicker(Level level, BlockState state, BlockEntityType type) { - if(type != OBlockEntities.VIGIL_CANDLE.get()) return null; - BlockEntityTicker ticker = (l, p, s, be) -> be.tick(l, p, s); - return (BlockEntityTicker) ticker; + public @Nullable BlockEntity newBlockEntity(BlockPos pos, BlockState state) { + return new VigilCandleBlockEntity(pos, state); } + } diff --git a/src/main/java/galena/oreganized/content/entity/GargoyleBlockEntity.java b/src/main/java/galena/oreganized/content/entity/GargoyleBlockEntity.java index 4048cc5a..ff926912 100644 --- a/src/main/java/galena/oreganized/content/entity/GargoyleBlockEntity.java +++ b/src/main/java/galena/oreganized/content/entity/GargoyleBlockEntity.java @@ -37,7 +37,7 @@ import java.util.Collection; -public class GargoyleBlockEntity extends BlockEntity { +public class GargoyleBlockEntity extends BlockEntity implements Ticking { private static final int COOLDOWN = 20 * 30; public static final String GROWL_COOLDOWN_TAG = Oreganized.MOD_ID + ":gargoyle_use_cooldown"; @@ -66,16 +66,16 @@ private static Collection getTargets(Level level, BlockPos pos) { return level.getEntitiesOfClass(Mob.class, box, it -> it.getMobType() == MobType.UNDEAD); } - public static void tick(Level level, BlockPos pos, BlockState state, GargoyleBlockEntity be) { - be.growlCooldown--; + public void tick(BlockState state, Level level, BlockPos pos) { + growlCooldown--; - if (be.updateCooldown % 2 == 0 && be.drippingFluid != null) { - GargoyleBlock.dripParticles(state, level, pos, level.random, be.drippingFluid); + if (updateCooldown % 2 == 0 && drippingFluid != null) { + GargoyleBlock.dripParticles(state, level, pos, level.random, drippingFluid); } - if (--be.updateCooldown > 0) return; + if (--updateCooldown > 0) return; - be.updateDripParticles(level, pos, state); + updateDripParticles(level, pos, state); var targets = getTargets(level, pos); var vec = Vec3.atCenterOf(pos); @@ -89,12 +89,12 @@ public static void tick(Level level, BlockPos pos, BlockState state, GargoyleBlo var newOutputSignal = Math.max(14 - (int) closestDistance, 0); - if (newOutputSignal != be.outputSignal) { - be.outputSignal = newOutputSignal; - level.updateNeighbourForOutputSignal(pos, be.getBlockState().getBlock()); + if (newOutputSignal != outputSignal) { + outputSignal = newOutputSignal; + level.updateNeighbourForOutputSignal(pos, getBlockState().getBlock()); } - be.updateCooldown = 10; + updateCooldown = 10; } private void updateDripParticles(Level level, BlockPos pos, BlockState state) { diff --git a/src/main/java/galena/oreganized/content/entity/SepulcherBlockEntity.java b/src/main/java/galena/oreganized/content/entity/SepulcherBlockEntity.java new file mode 100644 index 00000000..358a7bd4 --- /dev/null +++ b/src/main/java/galena/oreganized/content/entity/SepulcherBlockEntity.java @@ -0,0 +1,40 @@ +package galena.oreganized.content.entity; + +import galena.oreganized.content.block.SepulcherBlock; +import galena.oreganized.index.OBlockEntities; +import net.minecraft.core.BlockPos; +import net.minecraft.nbt.CompoundTag; +import net.minecraft.world.level.Level; +import net.minecraft.world.level.block.entity.BlockEntity; +import net.minecraft.world.level.block.state.BlockState; + +public class SepulcherBlockEntity extends BlockEntity implements Ticking { + + private int progress = 0; + + public SepulcherBlockEntity(BlockPos pos, BlockState state) { + super(OBlockEntities.SEPULCHER.get(), pos, state); + } + + @Override + public void tick(BlockState state, Level level, BlockPos pos) { + if (state.getValue(SepulcherBlock.LEVEL) < SepulcherBlock.MAX_LEVEL) return; + + if (--progress > 0) return; + + level.setBlockAndUpdate(pos, state.setValue(SepulcherBlock.LEVEL, SepulcherBlock.BONES_LEVEL)); + } + + @Override + protected void saveAdditional(CompoundTag nbt) { + super.saveAdditional(nbt); + nbt.putInt("progress", progress); + } + + @Override + public void load(CompoundTag nbt) { + super.load(nbt); + progress = nbt.getInt("progress"); + } + +} diff --git a/src/main/java/galena/oreganized/content/entity/Ticking.java b/src/main/java/galena/oreganized/content/entity/Ticking.java new file mode 100644 index 00000000..ad84aece --- /dev/null +++ b/src/main/java/galena/oreganized/content/entity/Ticking.java @@ -0,0 +1,11 @@ +package galena.oreganized.content.entity; + +import net.minecraft.core.BlockPos; +import net.minecraft.world.level.Level; +import net.minecraft.world.level.block.state.BlockState; + +public interface Ticking { + + void tick(BlockState state, Level level, BlockPos pos); + +} diff --git a/src/main/java/galena/oreganized/content/entity/VigilCandleBlockEntity.java b/src/main/java/galena/oreganized/content/entity/VigilCandleBlockEntity.java index 11de43d7..3c28fc3a 100644 --- a/src/main/java/galena/oreganized/content/entity/VigilCandleBlockEntity.java +++ b/src/main/java/galena/oreganized/content/entity/VigilCandleBlockEntity.java @@ -11,13 +11,14 @@ import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.phys.AABB; -public class VigilCandleBlockEntity extends BlockEntity { +public class VigilCandleBlockEntity extends BlockEntity implements Ticking { public VigilCandleBlockEntity(BlockPos pos, BlockState state) { super(OBlockEntities.VIGIL_CANDLE.get(), pos, state); } - public void tick(Level level, BlockPos pos, BlockState state) { + @Override + public void tick(BlockState state, Level level, BlockPos pos) { if (level.getGameTime() % 20L != 0) return; if (!state.getValue(CandleBlock.LIT)) return; diff --git a/src/main/java/galena/oreganized/index/OBlockEntities.java b/src/main/java/galena/oreganized/index/OBlockEntities.java index 8a1363be..9870673f 100644 --- a/src/main/java/galena/oreganized/index/OBlockEntities.java +++ b/src/main/java/galena/oreganized/index/OBlockEntities.java @@ -4,6 +4,7 @@ import galena.oreganized.Oreganized; import galena.oreganized.content.block.HeavyDoorBlockEntity; import galena.oreganized.content.entity.GargoyleBlockEntity; +import galena.oreganized.content.entity.SepulcherBlockEntity; import galena.oreganized.content.entity.VigilCandleBlockEntity; import net.minecraft.world.level.block.entity.BlockEntityType; import net.minecraftforge.fml.common.Mod; @@ -20,5 +21,6 @@ public class OBlockEntities { public static final RegistryObject> HEAVY_DOOR = HELPER.createBlockEntity("heavy_door", HeavyDoorBlockEntity::new, () -> Set.of(OBlocks.LEAD_DOOR.get(), OBlocks.LEAD_TRAPDOOR.get())); public static final RegistryObject> VIGIL_CANDLE = HELPER.createBlockEntity("vigil_candle", VigilCandleBlockEntity::new, () -> OBlocks.vigilCandles().map(RegistryObject::get).collect(Collectors.toSet())); + public static final RegistryObject> SEPULCHER = HELPER.createBlockEntity("sepulcher", SepulcherBlockEntity::new, () -> Set.of(OBlocks.SEPULCHER.get())); } diff --git a/src/main/java/galena/oreganized/index/OBlocks.java b/src/main/java/galena/oreganized/index/OBlocks.java index ca4b6389..1bb35e87 100644 --- a/src/main/java/galena/oreganized/index/OBlocks.java +++ b/src/main/java/galena/oreganized/index/OBlocks.java @@ -16,6 +16,7 @@ import galena.oreganized.content.block.MeltablePillarBlock; import galena.oreganized.content.block.MoltenLeadBlock; import galena.oreganized.content.block.MoltenLeadCauldronBlock; +import galena.oreganized.content.block.SepulcherBlock; import galena.oreganized.content.block.ShrapnelBombBlock; import galena.oreganized.content.block.SpottedGlanceBlock; import galena.oreganized.content.block.VigilCandleBlock; @@ -204,7 +205,7 @@ private static BlockBehaviour.Properties leadDecoProperties() { new MoltenLeadBlock(OFluids.MOLTEN_LEAD, BlockBehaviour.Properties.copy(Blocks.LAVA).mapColor(MapColor.COLOR_PURPLE))); public static final RegistryObject MOLTEN_LEAD_CAULDRON = HELPER.createBlock("molten_lead_cauldron", () -> new MoltenLeadCauldronBlock(BlockBehaviour.Properties.copy(Blocks.LAVA_CAULDRON).randomTicks())); - public static final RegistryObject SEPULCHER = register("sepulcher", () -> new Block(BlockBehaviour.Properties.copy(Blocks.CAULDRON))); + public static final RegistryObject SEPULCHER = register("sepulcher", () -> new SepulcherBlock(BlockBehaviour.Properties.copy(Blocks.CAULDRON))); private static final Supplier VIGIL_CANDLE_PROPERTIES = () -> BlockBehaviour.Properties.of().lightLevel(CandleBlock.LIGHT_EMISSION).sound(SoundType.METAL).pushReaction(PushReaction.DESTROY); public static final RegistryObject VIGIL_CANDLE = register("vigil_candle", () -> new VigilCandleBlock(VIGIL_CANDLE_PROPERTIES.get())); From f23ebf16fd40efb4c27a101a4935577add757b8c Mon Sep 17 00:00:00 2001 From: Niklas Widmann Date: Tue, 22 Oct 2024 22:39:12 +0200 Subject: [PATCH 06/11] working sepulcher --- .../002701d48eee4c36b62b24b011e74b0624793d05 | 16 +++- .../4d87f6c700406347abbc935fa7e5d5e893a595b5 | 3 +- .../5bb646c3cee204f41a1b59a2c0d9083b5f7155b0 | 4 +- .../9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e | 6 +- .../f43e2426f2370abaef549e24a3723585e9b3c47e | 3 +- .../oreganized/blockstates/bone_pile.json | 7 ++ .../oreganized/blockstates/sepulcher.json | 90 ++++++++++++++++++- .../assets/oreganized/lang/en_us.json | 1 + .../oreganized/models/block/bone_pile.json | 6 ++ .../models/block/sepulcher_content_1.json | 40 +++++++++ .../models/block/sepulcher_content_10.json | 40 +++++++++ .../models/block/sepulcher_content_2.json | 40 +++++++++ .../models/block/sepulcher_content_3.json | 40 +++++++++ .../models/block/sepulcher_content_4.json | 40 +++++++++ .../models/block/sepulcher_content_5.json | 40 +++++++++ .../models/block/sepulcher_content_6.json | 40 +++++++++ .../models/block/sepulcher_content_7.json | 40 +++++++++ .../models/block/sepulcher_content_8.json | 40 +++++++++ .../models/block/sepulcher_content_9.json | 40 +++++++++ .../oreganized/models/item/bone_pile.json | 3 + .../recipes/building_blocks/bone.json | 35 ++++++++ .../data/minecraft/recipes/bone.json | 13 +++ .../recipes/building_blocks/bone_pile.json | 35 ++++++++ .../loot_tables/blocks/bone_pile.json | 21 +++++ .../data/oreganized/recipes/bone_pile.json | 18 ++++ .../oreganized/tags/blocks/vigil_candles.json | 26 +++--- .../tags/entity_types/fills_sepulcher.json | 6 ++ .../java/galena/oreganized/Oreganized.java | 4 +- .../content/block/SepulcherBlock.java | 62 +++++++++---- .../content/entity/SepulcherBlockEntity.java | 66 +++++++++++++- .../galena/oreganized/data/OBlockStates.java | 1 + .../galena/oreganized/data/OEntityTags.java | 7 +- .../galena/oreganized/data/OItemModels.java | 1 + .../java/galena/oreganized/data/OLang.java | 1 + .../galena/oreganized/data/OLootTables.java | 1 + .../java/galena/oreganized/data/ORecipes.java | 3 + .../data/provider/OBlockStateProvider.java | 31 ++++++- .../java/galena/oreganized/index/OBlocks.java | 3 +- .../java/galena/oreganized/index/OTags.java | 1 + .../oreganized/world/event/PlayerEvents.java | 9 +- 40 files changed, 825 insertions(+), 58 deletions(-) create mode 100644 src/generated/resources/assets/oreganized/blockstates/bone_pile.json create mode 100644 src/generated/resources/assets/oreganized/models/block/bone_pile.json create mode 100644 src/generated/resources/assets/oreganized/models/block/sepulcher_content_1.json create mode 100644 src/generated/resources/assets/oreganized/models/block/sepulcher_content_10.json create mode 100644 src/generated/resources/assets/oreganized/models/block/sepulcher_content_2.json create mode 100644 src/generated/resources/assets/oreganized/models/block/sepulcher_content_3.json create mode 100644 src/generated/resources/assets/oreganized/models/block/sepulcher_content_4.json create mode 100644 src/generated/resources/assets/oreganized/models/block/sepulcher_content_5.json create mode 100644 src/generated/resources/assets/oreganized/models/block/sepulcher_content_6.json create mode 100644 src/generated/resources/assets/oreganized/models/block/sepulcher_content_7.json create mode 100644 src/generated/resources/assets/oreganized/models/block/sepulcher_content_8.json create mode 100644 src/generated/resources/assets/oreganized/models/block/sepulcher_content_9.json create mode 100644 src/generated/resources/assets/oreganized/models/item/bone_pile.json create mode 100644 src/generated/resources/data/minecraft/advancements/recipes/building_blocks/bone.json create mode 100644 src/generated/resources/data/minecraft/recipes/bone.json create mode 100644 src/generated/resources/data/oreganized/advancements/recipes/building_blocks/bone_pile.json create mode 100644 src/generated/resources/data/oreganized/loot_tables/blocks/bone_pile.json create mode 100644 src/generated/resources/data/oreganized/recipes/bone_pile.json create mode 100644 src/generated/resources/data/oreganized/tags/entity_types/fills_sepulcher.json diff --git a/src/generated/resources/.cache/002701d48eee4c36b62b24b011e74b0624793d05 b/src/generated/resources/.cache/002701d48eee4c36b62b24b011e74b0624793d05 index f65405a9..7e68c1d6 100644 --- a/src/generated/resources/.cache/002701d48eee4c36b62b24b011e74b0624793d05 +++ b/src/generated/resources/.cache/002701d48eee4c36b62b24b011e74b0624793d05 @@ -1,10 +1,11 @@ -// 1.20.1 2024-10-22T19:11:46.8919759 oreganized Block States +// 1.20.1 2024-10-22T21:24:48.3765429 oreganized Block States d85b0fb9e5cad1d9c4f22ed192b0fa621ee3373c assets/oreganized/blockstates/black_crystal_glass.json 05bb006ff7f48557fe5c5333bc120f7206052717 assets/oreganized/blockstates/black_crystal_glass_pane.json dfd0c1bf50927d51a16ab9bf7c8ab2e2cb083998 assets/oreganized/blockstates/black_vigil_candle.json 5e5002e9c77ee7221425eeacce8834af484db877 assets/oreganized/blockstates/blue_crystal_glass.json 7e852e66ced2113bbad988b38469db326e88495c assets/oreganized/blockstates/blue_crystal_glass_pane.json 56fb90326ebe2d84b9ca372a806ce150c05792a0 assets/oreganized/blockstates/blue_vigil_candle.json +954bb81539b55a5fd035c92f6a9ae1a20eebc010 assets/oreganized/blockstates/bone_pile.json 8f4bdde9fa05052630cd12fb4da9889024377adf assets/oreganized/blockstates/brown_crystal_glass.json d59afe9c89ba1e614ce5943fdc8aa3d450585560 assets/oreganized/blockstates/brown_crystal_glass_pane.json 962520caaced7a64c57776c7e246158d2ad43174 assets/oreganized/blockstates/brown_vigil_candle.json @@ -73,7 +74,7 @@ a8b05dbdd23fe1cf5ce82b267a4648b0629fc297 assets/oreganized/blockstates/raw_silve 5085b50121f91c56256b5f1189c8dc614c340d11 assets/oreganized/blockstates/red_crystal_glass.json 7a46fe801476209d2d5eb40213397140a7a06b8f assets/oreganized/blockstates/red_crystal_glass_pane.json c03746b3cb60582e017ac4df94d7438f6ee75a00 assets/oreganized/blockstates/red_vigil_candle.json -48e394ec30871f2d62691e7c8683ade4e3eaa17f assets/oreganized/blockstates/sepulcher.json +fd4d075ac59711e301ea2b3e9a3f05d8f00bb22e assets/oreganized/blockstates/sepulcher.json 398fed72da8aa72d33e773d22a7fb5a5292e6fa5 assets/oreganized/blockstates/shrapnel_bomb.json dcdf3b0a7a2bb1bd00f698b3325e8ffadd0bf98c assets/oreganized/blockstates/silver_block.json 89f5cc8a105178b0b12f32963a320afc120bf868 assets/oreganized/blockstates/silver_ore.json @@ -168,6 +169,7 @@ b9604285c20dab8232acc7ab7156e5f694f001d1 assets/oreganized/models/block/blue_vig b0f86aa8e5f54791259c12cfd2a5d41c163d6434 assets/oreganized/models/block/blue_vigil_candle_single_ceiling.json 88c724993a5248e298f678ed53ef4bb247d143b9 assets/oreganized/models/block/blue_vigil_candle_triple.json 61febf388c292dbc8f5eaee75ce124b0cb9f4c92 assets/oreganized/models/block/blue_vigil_candle_triple_ceiling.json +98c64ea1f285b1ba1c182aac9b4057530dba0d07 assets/oreganized/models/block/bone_pile.json 3296354cd0709abe6eb75e1fc39f1c72d0a9d0a7 assets/oreganized/models/block/brown_concrete_powder.json 4154dddb09563c888c73caa346d5a491ff902782 assets/oreganized/models/block/brown_crystal_glass.json 632ce280a6004238bf5ee88445904213ca67c413 assets/oreganized/models/block/brown_crystal_glass_in.json @@ -674,6 +676,16 @@ c41cab2ffae47d0bd0a3142d76089c4379cd9ed9 assets/oreganized/models/block/red_vigi f52d92eac9baa613960cf83707dee758e50a2f20 assets/oreganized/models/block/red_vigil_candle_single_ceiling.json 90c0acdcb495c49c48b5732ca2e5364cae0c4fe5 assets/oreganized/models/block/red_vigil_candle_triple.json ffaac09a1cb2bb59f917e95b11036aa50507186f assets/oreganized/models/block/red_vigil_candle_triple_ceiling.json +2ba07014e4512b03c9a315602fdf0ba23c983214 assets/oreganized/models/block/sepulcher_content_1.json +efb44cef222935f030bf676fba5609fe13a86175 assets/oreganized/models/block/sepulcher_content_10.json +62fc2cf598ff5f2bed432b39895aacc3ac6ebb0a assets/oreganized/models/block/sepulcher_content_2.json +365ba692539cd9e7fb5c852b8e78417f02e8e721 assets/oreganized/models/block/sepulcher_content_3.json +5c7435b57b551203a1bba51c056b1ce143087413 assets/oreganized/models/block/sepulcher_content_4.json +c1c85baf8a03d9ef5cdd76f040448b62de5d03e7 assets/oreganized/models/block/sepulcher_content_5.json +a997be57a1b9572cd8a74529f2d2c81ae8c88cdb assets/oreganized/models/block/sepulcher_content_6.json +e96303d0f6b53a09f87144a298f3ef4d82a288f5 assets/oreganized/models/block/sepulcher_content_7.json +62a09c08118cdfebbb7bf9536c8c6eb24335c571 assets/oreganized/models/block/sepulcher_content_8.json +d77e201b3446acc9f974a7d94edf3b048f5579c1 assets/oreganized/models/block/sepulcher_content_9.json 325f19d03a38f249bcceb44770d7af7a5d956821 assets/oreganized/models/block/shrapnel_bomb.json 8b672f8e74c40583b323d948f93266ac9dc51d4e assets/oreganized/models/block/silver_block.json e7ae7144c130a6d2636fe8e2702c99666720d878 assets/oreganized/models/block/silver_ore.json diff --git a/src/generated/resources/.cache/4d87f6c700406347abbc935fa7e5d5e893a595b5 b/src/generated/resources/.cache/4d87f6c700406347abbc935fa7e5d5e893a595b5 index 8e0852ae..02795826 100644 --- a/src/generated/resources/.cache/4d87f6c700406347abbc935fa7e5d5e893a595b5 +++ b/src/generated/resources/.cache/4d87f6c700406347abbc935fa7e5d5e893a595b5 @@ -1,10 +1,11 @@ -// 1.20.1 2024-10-22T19:11:46.8979763 oreganized Item Models +// 1.20.1 2024-10-22T21:24:48.3830539 oreganized Item Models 18fcb236eeab67fa16a0014d9af5ba7dd6f9e7c8 assets/oreganized/models/item/black_crystal_glass.json 30bbb36792cb2d3f0a8a399f25238120cdf7e659 assets/oreganized/models/item/black_crystal_glass_pane.json e79054a9c107cbd9357eebf3aacbcd7c27955b9b assets/oreganized/models/item/black_vigil_candle.json 8dcab59e8c34403761c4aec2c3357b7db80b3f0b assets/oreganized/models/item/blue_crystal_glass.json dfe6f545297f948beacae59685c3bc29a88b68d1 assets/oreganized/models/item/blue_crystal_glass_pane.json fce6f4a24293b0fe701a564eb127f4efb3145c35 assets/oreganized/models/item/blue_vigil_candle.json +b7158c4246d64e83d23470e470f46e2afc0999b1 assets/oreganized/models/item/bone_pile.json ca77522dcfcf982429256fd99ca0e9f2c195bd73 assets/oreganized/models/item/brown_crystal_glass.json cc365240dd7450add26aeaf5e0e689e985a4e5ad assets/oreganized/models/item/brown_crystal_glass_pane.json 5ad09a7c21c27fa1710fd42e043558b61c872912 assets/oreganized/models/item/brown_vigil_candle.json diff --git a/src/generated/resources/.cache/5bb646c3cee204f41a1b59a2c0d9083b5f7155b0 b/src/generated/resources/.cache/5bb646c3cee204f41a1b59a2c0d9083b5f7155b0 index b4d0e6ca..87796042 100644 --- a/src/generated/resources/.cache/5bb646c3cee204f41a1b59a2c0d9083b5f7155b0 +++ b/src/generated/resources/.cache/5bb646c3cee204f41a1b59a2c0d9083b5f7155b0 @@ -1,4 +1,4 @@ -// 1.20.1 2024-10-22T19:11:46.8989761 Oreganized Block Tags +// 1.20.1 2024-10-22T21:59:05.9187727 Oreganized Block Tags 7a2d68d81bc5ee59f9a2f4ba68ddb39bfd9c875d data/forge/tags/blocks/glass.json d96b4f83e03abe39a1b97d92b7818c8f6b2e5c68 data/forge/tags/blocks/glass_panes.json d062c23ad5308b7de0b2e86f6531ea724530f898 data/forge/tags/blocks/melts_lead.json @@ -39,4 +39,4 @@ eaca08d04b1742f418e6bc0964dd32cf16035d88 data/oreganized/tags/blocks/mineable/sc cf3608bd187922aeb48c566c19e8482b0dca34c7 data/oreganized/tags/blocks/prevents_lead_cloud.json 06c2e2e512966767a31df77e646e41c4c39e3dd3 data/oreganized/tags/blocks/silktouch_using_scribe.json 3112fb4a1df2953e2c3572fa47f886bf8e5bd679 data/oreganized/tags/blocks/stone_types/glance.json -2c9f30e144e4871c0d4ff7aeab330c5d37062761 data/oreganized/tags/blocks/vigil_candles.json +4c6c2866f43f74cc09dfa18b36047b869a88d10e data/oreganized/tags/blocks/vigil_candles.json diff --git a/src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e b/src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e index c6b5f8bf..07b3f673 100644 --- a/src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e +++ b/src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e @@ -1,4 +1,6 @@ -// 1.20.1 2024-10-14T22:19:49.9779525 Recipes +// 1.20.1 2024-10-22T21:35:16.0293337 Recipes +c1dfd749997c4b830ca484062a948878ea0d34f3 data/minecraft/advancements/recipes/building_blocks/bone.json +a8cdf899ebdba8cace47683d027002ed7064ce5a data/minecraft/recipes/bone.json c27d3499944bf522a573dc8987582db2d7349b41 data/oreganized/advancements/recipes/brewing/poisonous_potato_from_lead.json ee5e42ab2e9ac549022fadf1c2cbf9faebc2c53c data/oreganized/advancements/recipes/building_blocks/black_crystal_glass_pane.json 3c820d9940640deff4179f3b02cc6218a88cd4f9 data/oreganized/advancements/recipes/building_blocks/black_vigil_candle.json @@ -6,6 +8,7 @@ ee5e42ab2e9ac549022fadf1c2cbf9faebc2c53c data/oreganized/advancements/recipes/bu 40700c3f2f5c78c617650fdd16e2ba248967353f data/oreganized/advancements/recipes/building_blocks/blue_crystal_glass_pane.json 3afa8ff228b9bef52253d0f816bd8e324730ce50 data/oreganized/advancements/recipes/building_blocks/blue_vigil_candle.json 7010475a07b130d021b53d46647f8ef59a172c48 data/oreganized/advancements/recipes/building_blocks/blue_vigil_candle_dyeing.json +0f05a751905eb5ce929fafdc1e799b6d5b5711c7 data/oreganized/advancements/recipes/building_blocks/bone_pile.json a54c0b8196d1a5179a9b51cb260df9d0c4c26d4e data/oreganized/advancements/recipes/building_blocks/brown_crystal_glass_pane.json ad566c9bc4c74028180df5929a3cb34323345d5b data/oreganized/advancements/recipes/building_blocks/brown_vigil_candle.json dab087994daf9d6948e3eec6e875738de6156414 data/oreganized/advancements/recipes/building_blocks/brown_vigil_candle_dyeing.json @@ -190,6 +193,7 @@ e44ee55f7ab6df42caecd2dde0963666975e06ef data/oreganized/recipes/blast_raw_silve 87854bacdbf7862b5c7fed3a7c295f87fc7eecf6 data/oreganized/recipes/blue_crystal_glass_pane.json 3ad5f5c16840d814d86e97743db4b7ac78534ffb data/oreganized/recipes/blue_vigil_candle.json 800273eeda90c6c19ff17b15746d3da029577235 data/oreganized/recipes/blue_vigil_candle_dyeing.json +f35f1d5302c5bc10652c4f7b90d707442b490955 data/oreganized/recipes/bone_pile.json 509c4b4713fb5d506d4c2ec7da3c63212e0f13ba data/oreganized/recipes/brown_crystal_glass.json c261b93b8e4cbe7c710f1165c1a554e8f29fb243 data/oreganized/recipes/brown_crystal_glass_pane.json 034d662b493d46058caf53a01d9f703bb4475f42 data/oreganized/recipes/brown_vigil_candle.json diff --git a/src/generated/resources/.cache/f43e2426f2370abaef549e24a3723585e9b3c47e b/src/generated/resources/.cache/f43e2426f2370abaef549e24a3723585e9b3c47e index e72c15b2..5c380370 100644 --- a/src/generated/resources/.cache/f43e2426f2370abaef549e24a3723585e9b3c47e +++ b/src/generated/resources/.cache/f43e2426f2370abaef549e24a3723585e9b3c47e @@ -1,2 +1,3 @@ -// 1.20.1 2023-08-24T20:32:13.551458979 Oreganized Entity Type Tags +// 1.20.1 2024-10-22T21:59:05.9157738 Oreganized Entity Type Tags +c1385b67913015546baa8a0f603b4abda87e1b9d data/oreganized/tags/entity_types/fills_sepulcher.json 29671cfa11d074462c259806e9d60468451e3cdb data/oreganized/tags/entity_types/lighter_than_lead.json diff --git a/src/generated/resources/assets/oreganized/blockstates/bone_pile.json b/src/generated/resources/assets/oreganized/blockstates/bone_pile.json new file mode 100644 index 00000000..81ead659 --- /dev/null +++ b/src/generated/resources/assets/oreganized/blockstates/bone_pile.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "oreganized:block/bone_pile" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/blockstates/sepulcher.json b/src/generated/resources/assets/oreganized/blockstates/sepulcher.json index 2d246b7b..3f3c6342 100644 --- a/src/generated/resources/assets/oreganized/blockstates/sepulcher.json +++ b/src/generated/resources/assets/oreganized/blockstates/sepulcher.json @@ -1,7 +1,89 @@ { - "variants": { - "": { - "model": "oreganized:block/sepulcher" + "multipart": [ + { + "apply": { + "model": "oreganized:block/sepulcher" + } + }, + { + "apply": { + "model": "oreganized:block/sepulcher_content_1" + }, + "when": { + "level": "1" + } + }, + { + "apply": { + "model": "oreganized:block/sepulcher_content_2" + }, + "when": { + "level": "2" + } + }, + { + "apply": { + "model": "oreganized:block/sepulcher_content_3" + }, + "when": { + "level": "3" + } + }, + { + "apply": { + "model": "oreganized:block/sepulcher_content_4" + }, + "when": { + "level": "4" + } + }, + { + "apply": { + "model": "oreganized:block/sepulcher_content_5" + }, + "when": { + "level": "5" + } + }, + { + "apply": { + "model": "oreganized:block/sepulcher_content_6" + }, + "when": { + "level": "6" + } + }, + { + "apply": { + "model": "oreganized:block/sepulcher_content_7" + }, + "when": { + "level": "7" + } + }, + { + "apply": { + "model": "oreganized:block/sepulcher_content_8" + }, + "when": { + "level": "8" + } + }, + { + "apply": { + "model": "oreganized:block/sepulcher_content_9" + }, + "when": { + "level": "9" + } + }, + { + "apply": { + "model": "oreganized:block/sepulcher_content_10" + }, + "when": { + "level": "10" + } } - } + ] } \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/lang/en_us.json b/src/generated/resources/assets/oreganized/lang/en_us.json index 084c61a7..2748c712 100644 --- a/src/generated/resources/assets/oreganized/lang/en_us.json +++ b/src/generated/resources/assets/oreganized/lang/en_us.json @@ -30,6 +30,7 @@ "block.oreganized.blue_crystal_glass": "Blue Crystal Glass", "block.oreganized.blue_crystal_glass_pane": "Blue Crystal Glass Pane", "block.oreganized.blue_vigil_candle": "Blue Vigil Candle", + "block.oreganized.bone_pile": "Pile of Bones", "block.oreganized.brown_crystal_glass": "Brown Crystal Glass", "block.oreganized.brown_crystal_glass_pane": "Brown Crystal Glass Pane", "block.oreganized.brown_vigil_candle": "Brown Vigil Candle", diff --git a/src/generated/resources/assets/oreganized/models/block/bone_pile.json b/src/generated/resources/assets/oreganized/models/block/bone_pile.json new file mode 100644 index 00000000..53468cc8 --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/bone_pile.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "oreganized:block/sepulcher_rot_5" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/sepulcher_content_1.json b/src/generated/resources/assets/oreganized/models/block/sepulcher_content_1.json new file mode 100644 index 00000000..052cdc19 --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/sepulcher_content_1.json @@ -0,0 +1,40 @@ +{ + "elements": [ + { + "faces": { + "down": { + "texture": "#inside" + }, + "east": { + "texture": "#inside" + }, + "north": { + "texture": "#inside" + }, + "south": { + "texture": "#inside" + }, + "up": { + "texture": "#inside" + }, + "west": { + "texture": "#inside" + } + }, + "from": [ + 1, + 0, + 1 + ], + "to": [ + 15, + 5, + 15 + ] + } + ], + "textures": { + "inside": "oreganized:block/sepulcher_rot_1", + "particle": "oreganized:block/sepulcher_rot_1" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/sepulcher_content_10.json b/src/generated/resources/assets/oreganized/models/block/sepulcher_content_10.json new file mode 100644 index 00000000..a8a73ace --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/sepulcher_content_10.json @@ -0,0 +1,40 @@ +{ + "elements": [ + { + "faces": { + "down": { + "texture": "#inside" + }, + "east": { + "texture": "#inside" + }, + "north": { + "texture": "#inside" + }, + "south": { + "texture": "#inside" + }, + "up": { + "texture": "#inside" + }, + "west": { + "texture": "#inside" + } + }, + "from": [ + 1, + 0, + 1 + ], + "to": [ + 15, + 15, + 15 + ] + } + ], + "textures": { + "inside": "oreganized:block/sepulcher_rot_5", + "particle": "oreganized:block/sepulcher_rot_5" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/sepulcher_content_2.json b/src/generated/resources/assets/oreganized/models/block/sepulcher_content_2.json new file mode 100644 index 00000000..ccd87032 --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/sepulcher_content_2.json @@ -0,0 +1,40 @@ +{ + "elements": [ + { + "faces": { + "down": { + "texture": "#inside" + }, + "east": { + "texture": "#inside" + }, + "north": { + "texture": "#inside" + }, + "south": { + "texture": "#inside" + }, + "up": { + "texture": "#inside" + }, + "west": { + "texture": "#inside" + } + }, + "from": [ + 1, + 0, + 1 + ], + "to": [ + 15, + 7, + 15 + ] + } + ], + "textures": { + "inside": "oreganized:block/sepulcher_rot_1", + "particle": "oreganized:block/sepulcher_rot_1" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/sepulcher_content_3.json b/src/generated/resources/assets/oreganized/models/block/sepulcher_content_3.json new file mode 100644 index 00000000..6e2d7f5c --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/sepulcher_content_3.json @@ -0,0 +1,40 @@ +{ + "elements": [ + { + "faces": { + "down": { + "texture": "#inside" + }, + "east": { + "texture": "#inside" + }, + "north": { + "texture": "#inside" + }, + "south": { + "texture": "#inside" + }, + "up": { + "texture": "#inside" + }, + "west": { + "texture": "#inside" + } + }, + "from": [ + 1, + 0, + 1 + ], + "to": [ + 15, + 9, + 15 + ] + } + ], + "textures": { + "inside": "oreganized:block/sepulcher_rot_1", + "particle": "oreganized:block/sepulcher_rot_1" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/sepulcher_content_4.json b/src/generated/resources/assets/oreganized/models/block/sepulcher_content_4.json new file mode 100644 index 00000000..8e23d9d0 --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/sepulcher_content_4.json @@ -0,0 +1,40 @@ +{ + "elements": [ + { + "faces": { + "down": { + "texture": "#inside" + }, + "east": { + "texture": "#inside" + }, + "north": { + "texture": "#inside" + }, + "south": { + "texture": "#inside" + }, + "up": { + "texture": "#inside" + }, + "west": { + "texture": "#inside" + } + }, + "from": [ + 1, + 0, + 1 + ], + "to": [ + 15, + 11, + 15 + ] + } + ], + "textures": { + "inside": "oreganized:block/sepulcher_rot_1", + "particle": "oreganized:block/sepulcher_rot_1" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/sepulcher_content_5.json b/src/generated/resources/assets/oreganized/models/block/sepulcher_content_5.json new file mode 100644 index 00000000..0b062a75 --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/sepulcher_content_5.json @@ -0,0 +1,40 @@ +{ + "elements": [ + { + "faces": { + "down": { + "texture": "#inside" + }, + "east": { + "texture": "#inside" + }, + "north": { + "texture": "#inside" + }, + "south": { + "texture": "#inside" + }, + "up": { + "texture": "#inside" + }, + "west": { + "texture": "#inside" + } + }, + "from": [ + 1, + 0, + 1 + ], + "to": [ + 15, + 13, + 15 + ] + } + ], + "textures": { + "inside": "oreganized:block/sepulcher_rot_1", + "particle": "oreganized:block/sepulcher_rot_1" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/sepulcher_content_6.json b/src/generated/resources/assets/oreganized/models/block/sepulcher_content_6.json new file mode 100644 index 00000000..04614519 --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/sepulcher_content_6.json @@ -0,0 +1,40 @@ +{ + "elements": [ + { + "faces": { + "down": { + "texture": "#inside" + }, + "east": { + "texture": "#inside" + }, + "north": { + "texture": "#inside" + }, + "south": { + "texture": "#inside" + }, + "up": { + "texture": "#inside" + }, + "west": { + "texture": "#inside" + } + }, + "from": [ + 1, + 0, + 1 + ], + "to": [ + 15, + 15, + 15 + ] + } + ], + "textures": { + "inside": "oreganized:block/sepulcher_rot_1", + "particle": "oreganized:block/sepulcher_rot_1" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/sepulcher_content_7.json b/src/generated/resources/assets/oreganized/models/block/sepulcher_content_7.json new file mode 100644 index 00000000..f8c1dae1 --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/sepulcher_content_7.json @@ -0,0 +1,40 @@ +{ + "elements": [ + { + "faces": { + "down": { + "texture": "#inside" + }, + "east": { + "texture": "#inside" + }, + "north": { + "texture": "#inside" + }, + "south": { + "texture": "#inside" + }, + "up": { + "texture": "#inside" + }, + "west": { + "texture": "#inside" + } + }, + "from": [ + 1, + 0, + 1 + ], + "to": [ + 15, + 15, + 15 + ] + } + ], + "textures": { + "inside": "oreganized:block/sepulcher_rot_2", + "particle": "oreganized:block/sepulcher_rot_2" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/sepulcher_content_8.json b/src/generated/resources/assets/oreganized/models/block/sepulcher_content_8.json new file mode 100644 index 00000000..64266e74 --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/sepulcher_content_8.json @@ -0,0 +1,40 @@ +{ + "elements": [ + { + "faces": { + "down": { + "texture": "#inside" + }, + "east": { + "texture": "#inside" + }, + "north": { + "texture": "#inside" + }, + "south": { + "texture": "#inside" + }, + "up": { + "texture": "#inside" + }, + "west": { + "texture": "#inside" + } + }, + "from": [ + 1, + 0, + 1 + ], + "to": [ + 15, + 15, + 15 + ] + } + ], + "textures": { + "inside": "oreganized:block/sepulcher_rot_3", + "particle": "oreganized:block/sepulcher_rot_3" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/sepulcher_content_9.json b/src/generated/resources/assets/oreganized/models/block/sepulcher_content_9.json new file mode 100644 index 00000000..b3366484 --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/sepulcher_content_9.json @@ -0,0 +1,40 @@ +{ + "elements": [ + { + "faces": { + "down": { + "texture": "#inside" + }, + "east": { + "texture": "#inside" + }, + "north": { + "texture": "#inside" + }, + "south": { + "texture": "#inside" + }, + "up": { + "texture": "#inside" + }, + "west": { + "texture": "#inside" + } + }, + "from": [ + 1, + 0, + 1 + ], + "to": [ + 15, + 15, + 15 + ] + } + ], + "textures": { + "inside": "oreganized:block/sepulcher_rot_4", + "particle": "oreganized:block/sepulcher_rot_4" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/item/bone_pile.json b/src/generated/resources/assets/oreganized/models/item/bone_pile.json new file mode 100644 index 00000000..3de20456 --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/item/bone_pile.json @@ -0,0 +1,3 @@ +{ + "parent": "oreganized:block/bone_pile" +} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/advancements/recipes/building_blocks/bone.json b/src/generated/resources/data/minecraft/advancements/recipes/building_blocks/bone.json new file mode 100644 index 00000000..30795b03 --- /dev/null +++ b/src/generated/resources/data/minecraft/advancements/recipes/building_blocks/bone.json @@ -0,0 +1,35 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_bone_pile": { + "conditions": { + "items": [ + { + "items": [ + "oreganized:bone_pile" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "minecraft:bone" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_bone_pile", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "minecraft:bone" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/recipes/bone.json b/src/generated/resources/data/minecraft/recipes/bone.json new file mode 100644 index 00000000..f3bb921a --- /dev/null +++ b/src/generated/resources/data/minecraft/recipes/bone.json @@ -0,0 +1,13 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "building", + "ingredients": [ + { + "item": "oreganized:bone_pile" + } + ], + "result": { + "count": 9, + "item": "minecraft:bone" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/oreganized/advancements/recipes/building_blocks/bone_pile.json b/src/generated/resources/data/oreganized/advancements/recipes/building_blocks/bone_pile.json new file mode 100644 index 00000000..5820e015 --- /dev/null +++ b/src/generated/resources/data/oreganized/advancements/recipes/building_blocks/bone_pile.json @@ -0,0 +1,35 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_bone": { + "conditions": { + "items": [ + { + "items": [ + "minecraft:bone" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "oreganized:bone_pile" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_bone", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "oreganized:bone_pile" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/generated/resources/data/oreganized/loot_tables/blocks/bone_pile.json b/src/generated/resources/data/oreganized/loot_tables/blocks/bone_pile.json new file mode 100644 index 00000000..b0e43854 --- /dev/null +++ b/src/generated/resources/data/oreganized/loot_tables/blocks/bone_pile.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "oreganized:bone_pile" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "oreganized:blocks/bone_pile" +} \ No newline at end of file diff --git a/src/generated/resources/data/oreganized/recipes/bone_pile.json b/src/generated/resources/data/oreganized/recipes/bone_pile.json new file mode 100644 index 00000000..481bfee9 --- /dev/null +++ b/src/generated/resources/data/oreganized/recipes/bone_pile.json @@ -0,0 +1,18 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "building", + "key": { + "A": { + "item": "minecraft:bone" + } + }, + "pattern": [ + "AAA", + "AAA", + "AAA" + ], + "result": { + "item": "oreganized:bone_pile" + }, + "show_notification": true +} \ No newline at end of file diff --git a/src/generated/resources/data/oreganized/tags/blocks/vigil_candles.json b/src/generated/resources/data/oreganized/tags/blocks/vigil_candles.json index 4ec6927b..9edaa531 100644 --- a/src/generated/resources/data/oreganized/tags/blocks/vigil_candles.json +++ b/src/generated/resources/data/oreganized/tags/blocks/vigil_candles.json @@ -1,21 +1,21 @@ { "values": [ "oreganized:vigil_candle", - "oreganized:light_blue_vigil_candle", - "oreganized:pink_vigil_candle", - "oreganized:cyan_vigil_candle", - "oreganized:gray_vigil_candle", - "oreganized:purple_vigil_candle", - "oreganized:white_vigil_candle", - "oreganized:lime_vigil_candle", - "oreganized:green_vigil_candle", - "oreganized:blue_vigil_candle", + "oreganized:yellow_vigil_candle", "oreganized:brown_vigil_candle", "oreganized:magenta_vigil_candle", - "oreganized:light_gray_vigil_candle", - "oreganized:yellow_vigil_candle", - "oreganized:red_vigil_candle", "oreganized:black_vigil_candle", - "oreganized:orange_vigil_candle" + "oreganized:blue_vigil_candle", + "oreganized:cyan_vigil_candle", + "oreganized:red_vigil_candle", + "oreganized:light_gray_vigil_candle", + "oreganized:light_blue_vigil_candle", + "oreganized:orange_vigil_candle", + "oreganized:lime_vigil_candle", + "oreganized:green_vigil_candle", + "oreganized:pink_vigil_candle", + "oreganized:purple_vigil_candle", + "oreganized:gray_vigil_candle", + "oreganized:white_vigil_candle" ] } \ No newline at end of file diff --git a/src/generated/resources/data/oreganized/tags/entity_types/fills_sepulcher.json b/src/generated/resources/data/oreganized/tags/entity_types/fills_sepulcher.json new file mode 100644 index 00000000..d9d71d93 --- /dev/null +++ b/src/generated/resources/data/oreganized/tags/entity_types/fills_sepulcher.json @@ -0,0 +1,6 @@ +{ + "values": [ + "minecraft:player", + "minecraft:villager" + ] +} \ No newline at end of file diff --git a/src/main/java/galena/oreganized/Oreganized.java b/src/main/java/galena/oreganized/Oreganized.java index c2ac1417..5f6c3ed5 100644 --- a/src/main/java/galena/oreganized/Oreganized.java +++ b/src/main/java/galena/oreganized/Oreganized.java @@ -334,7 +334,8 @@ public void buildCreativeModeTabContents(BuildCreativeModeTabContentsEvent event if (tab == CreativeModeTabs.FUNCTIONAL_BLOCKS) { putBefore(entries, Blocks.CHEST, OBlocks.LEAD_BOLT_CRATE); putAfter(entries, Blocks.LANTERN, OBlocks.VIGIL_CANDLE); - OBlocks.COLORED_VIGIL_CANDLES.forEach((color, block) ->putAfter(entries, OBlocks.VIGIL_CANDLE.get(), block)); + OBlocks.COLORED_VIGIL_CANDLES.forEach((color, block) -> putAfter(entries, OBlocks.VIGIL_CANDLE.get(), block)); + putAfter(entries, Blocks.COMPOSTER, OBlocks.SEPULCHER); } if (tab == CreativeModeTabs.COLORED_BLOCKS) { putBefore(entries, Items.SHULKER_BOX, OBlocks.WHITE_CRYSTAL_GLASS); @@ -380,6 +381,7 @@ public void buildCreativeModeTabContents(BuildCreativeModeTabContentsEvent event putAfter(entries, Blocks.ICE, OBlocks.GROOVED_ICE); putAfter(entries, Blocks.PACKED_ICE, OBlocks.GROOVED_PACKED_ICE); putAfter(entries, Blocks.BLUE_ICE, OBlocks.GROOVED_BLUE_ICE); + putAfter(entries, Blocks.BONE_BLOCK, OBlocks.BONE_PILE); } if (tab == CreativeModeTabs.REDSTONE_BLOCKS) { putBefore(entries, Items.NOTE_BLOCK, OBlocks.GARGOYLE); diff --git a/src/main/java/galena/oreganized/content/block/SepulcherBlock.java b/src/main/java/galena/oreganized/content/block/SepulcherBlock.java index 06745228..27f2da17 100644 --- a/src/main/java/galena/oreganized/content/block/SepulcherBlock.java +++ b/src/main/java/galena/oreganized/content/block/SepulcherBlock.java @@ -2,33 +2,36 @@ import galena.oreganized.content.entity.SepulcherBlockEntity; import galena.oreganized.index.OBlockEntities; +import galena.oreganized.index.OBlocks; import net.minecraft.core.BlockPos; import net.minecraft.sounds.SoundEvents; import net.minecraft.sounds.SoundSource; +import net.minecraft.stats.Stats; import net.minecraft.world.InteractionHand; import net.minecraft.world.InteractionResult; import net.minecraft.world.entity.Entity; import net.minecraft.world.entity.item.ItemEntity; import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.ItemStack; -import net.minecraft.world.item.Items; import net.minecraft.world.level.Level; +import net.minecraft.world.level.LevelAccessor; import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.entity.BlockEntity; import net.minecraft.world.level.block.entity.BlockEntityType; import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.level.block.state.StateDefinition; -import net.minecraft.world.level.block.state.properties.BlockStateProperties; import net.minecraft.world.level.block.state.properties.IntegerProperty; +import net.minecraft.world.level.gameevent.GameEvent; import net.minecraft.world.phys.BlockHitResult; import net.minecraft.world.phys.Vec3; import org.jetbrains.annotations.Nullable; public class SepulcherBlock extends Block implements TickingEntityBlock { - public static final int MAX_LEVEL = 8; - public static final int BONES_LEVEL = 8; - public static final IntegerProperty LEVEL = IntegerProperty.create("level", 0, BONES_LEVEL); + public static final int MAX_LEVEL = 6; + public static final int ROT_LEVELS = 4; + public static final int READY = MAX_LEVEL + ROT_LEVELS; + public static final IntegerProperty LEVEL = IntegerProperty.create("level", 0, READY); public SepulcherBlock(Properties properties) { super(properties); @@ -38,30 +41,53 @@ public SepulcherBlock(Properties properties) { @Override protected void createBlockStateDefinition(StateDefinition.Builder builder) { super.createBlockStateDefinition(builder); - builder.add(BlockStateProperties.LEVEL); + builder.add(LEVEL); } @Override public InteractionResult use(BlockState state, Level level, BlockPos pos, Player player, InteractionHand hand, BlockHitResult hit) { - var fillLevel = state.getValue(LEVEL); + int fillLevel = state.getValue(LEVEL); - if(fillLevel == BONES_LEVEL) { - extractBones(player, state, level, pos); + if (fillLevel == READY) { + extract(player, state, level, pos); + return InteractionResult.sidedSuccess(level.isClientSide()); } + + var held = player.getItemInHand(hand); + var food = held.getFoodProperties(null); + + if (fillLevel < MAX_LEVEL && food != null && food.isMeat()) { + insert(player, state, level, pos); + player.awardStat(Stats.ITEM_USED.get(held.getItem())); + if (!player.getAbilities().instabuild) { + held.shrink(1); + } + + return InteractionResult.sidedSuccess(level.isClientSide()); + } + + return InteractionResult.PASS; } + public static void insert(@Nullable Entity user, BlockState state, LevelAccessor level, BlockPos pos) { + var newState = state.setValue(LEVEL, state.getValue(LEVEL) + 1); + level.setBlock(pos, newState, 3); + level.gameEvent(GameEvent.BLOCK_CHANGE, pos, GameEvent.Context.of(user, newState)); + } - public static void extractBones(Entity user, BlockState state, Level level, BlockPos pos) { - if (!level.isClientSide) { - Vec3 $$4 = Vec3.atLowerCornerWithOffset(pos, 0.5, 1.01, 0.5).offsetRandom(level.random, 0.7F); - ItemEntity $$5 = new ItemEntity(level, $$4.x(), $$4.y(), $$4.z(), new ItemStack(Items.BONE_MEAL)); - $$5.setDefaultPickUpDelay(); - level.addFreshEntity($$5); + public static void extract(Entity user, BlockState state, Level level, BlockPos pos) { + if (!level.isClientSide()) { + Vec3 vec = Vec3.atLowerCornerWithOffset(pos, 0.5, 1.01, 0.5).offsetRandom(level.random, 0.7F); + ItemEntity item = new ItemEntity(level, vec.x(), vec.y(), vec.z(), new ItemStack(OBlocks.BONE_PILE.get())); + item.setDefaultPickUpDelay(); + level.addFreshEntity(item); } - BlockState $$6 = empty(user, state, level, pos); - level.playSound((Player)null, pos, SoundEvents.COMPOSTER_EMPTY, SoundSource.BLOCKS, 1.0F, 1.0F); - return $$6; + var empty = state.setValue(LEVEL, 0); + level.setBlockAndUpdate(pos, empty); + level.gameEvent(GameEvent.BLOCK_CHANGE, pos, GameEvent.Context.of(user, empty)); + + level.playSound(null, pos, SoundEvents.COMPOSTER_EMPTY, SoundSource.BLOCKS, 1.0F, 1.0F); } @Override diff --git a/src/main/java/galena/oreganized/content/entity/SepulcherBlockEntity.java b/src/main/java/galena/oreganized/content/entity/SepulcherBlockEntity.java index 358a7bd4..48aa0108 100644 --- a/src/main/java/galena/oreganized/content/entity/SepulcherBlockEntity.java +++ b/src/main/java/galena/oreganized/content/entity/SepulcherBlockEntity.java @@ -1,28 +1,47 @@ package galena.oreganized.content.entity; +import galena.oreganized.OreganizedConfig; import galena.oreganized.content.block.SepulcherBlock; import galena.oreganized.index.OBlockEntities; +import galena.oreganized.index.OTags; import net.minecraft.core.BlockPos; import net.minecraft.nbt.CompoundTag; +import net.minecraft.server.level.ServerLevel; import net.minecraft.world.level.Level; import net.minecraft.world.level.block.entity.BlockEntity; import net.minecraft.world.level.block.state.BlockState; +import net.minecraft.world.level.gameevent.BlockPositionSource; +import net.minecraft.world.level.gameevent.GameEvent; +import net.minecraft.world.level.gameevent.GameEventListener; +import net.minecraft.world.level.gameevent.PositionSource; +import net.minecraft.world.phys.Vec3; -public class SepulcherBlockEntity extends BlockEntity implements Ticking { +public class SepulcherBlockEntity extends BlockEntity implements Ticking, GameEventListener.Holder { + private final DeathListener listener; private int progress = 0; public SepulcherBlockEntity(BlockPos pos, BlockState state) { super(OBlockEntities.SEPULCHER.get(), pos, state); + this.listener = new DeathListener(); + } + + private int progressPerStep() { + return OreganizedConfig.COMMON.sepulcherDuration.get() / SepulcherBlock.ROT_LEVELS; } @Override public void tick(BlockState state, Level level, BlockPos pos) { - if (state.getValue(SepulcherBlock.LEVEL) < SepulcherBlock.MAX_LEVEL) return; + if (level.isClientSide()) return; + + int fillLevel = state.getValue(SepulcherBlock.LEVEL); + if (fillLevel < SepulcherBlock.MAX_LEVEL) return; + if (fillLevel == SepulcherBlock.READY) return; - if (--progress > 0) return; + if (++progress < progressPerStep()) return; - level.setBlockAndUpdate(pos, state.setValue(SepulcherBlock.LEVEL, SepulcherBlock.BONES_LEVEL)); + level.setBlockAndUpdate(pos, state.setValue(SepulcherBlock.LEVEL, fillLevel + 1)); + progress = 0; } @Override @@ -37,4 +56,43 @@ public void load(CompoundTag nbt) { progress = nbt.getInt("progress"); } + @Override + public DeathListener getListener() { + return listener; + } + + public class DeathListener implements GameEventListener { + private final PositionSource listenerSource; + private final int listenerRadius; + + public DeathListener() { + this.listenerSource = new BlockPositionSource(SepulcherBlockEntity.this.getBlockPos()); + this.listenerRadius = GameEvent.ENTITY_DIE.getNotificationRadius(); + } + + public PositionSource getListenerSource() { + return this.listenerSource; + } + + public int getListenerRadius() { + return this.listenerRadius; + } + + public boolean handleGameEvent(ServerLevel level, GameEvent event, GameEvent.Context context, Vec3 vec) { + if (event != GameEvent.ENTITY_DIE) return false; + + var entity = context.sourceEntity(); + if (!entity.getType().is(OTags.Entities.FILLS_SEPULCHER)) return false; + + var state = getBlockState(); + var fillLevel = state.getValue(SepulcherBlock.LEVEL); + + if(fillLevel >= SepulcherBlock.MAX_LEVEL) return false; + + SepulcherBlock.insert(null, state, level, getBlockPos()); + + return true; + } + } + } diff --git a/src/main/java/galena/oreganized/data/OBlockStates.java b/src/main/java/galena/oreganized/data/OBlockStates.java index 4e7e727d..03cb3d8d 100644 --- a/src/main/java/galena/oreganized/data/OBlockStates.java +++ b/src/main/java/galena/oreganized/data/OBlockStates.java @@ -114,6 +114,7 @@ protected void registerStatesAndModels() { gargoyleBlock(OBlocks.GARGOYLE); sepulcherBlock(OBlocks.SEPULCHER); + simpleBlock(OBlocks.BONE_PILE.get(), models().cubeAll(blockTexture(OBlocks.BONE_PILE.get()).getPath(), Oreganized.modLoc("block/sepulcher_rot_5"))); vigilCandle(OBlocks.VIGIL_CANDLE, null); OBlocks.COLORED_VIGIL_CANDLES.forEach((color, block) -> vigilCandle(block, color.getSerializedName())); } diff --git a/src/main/java/galena/oreganized/data/OEntityTags.java b/src/main/java/galena/oreganized/data/OEntityTags.java index c63b8ff9..16384ce5 100644 --- a/src/main/java/galena/oreganized/data/OEntityTags.java +++ b/src/main/java/galena/oreganized/data/OEntityTags.java @@ -3,7 +3,6 @@ import galena.oreganized.Oreganized; import galena.oreganized.index.OTags; import net.minecraft.core.HolderLookup; -import net.minecraft.data.DataGenerator; import net.minecraft.data.PackOutput; import net.minecraft.data.tags.EntityTypeTagsProvider; import net.minecraft.world.entity.EntityType; @@ -28,6 +27,12 @@ protected void addTags(HolderLookup.Provider provider) { // Oreganized tag(OTags.Entities.LIGHTER_THAN_LEAD).add(EntityType.IRON_GOLEM); + tag(OTags.Entities.FILLS_SEPULCHER) + .add(EntityType.PLAYER) + .add(EntityType.ZOMBIE) + .add(EntityType.ZOMBIE_VILLAGER) + .add(EntityType.VILLAGER); + // Vanilla //tag(EntityTypeTags.IMPACT_PROJECTILES).add(OEntityTypes.LEAD_BOLT.get()); } diff --git a/src/main/java/galena/oreganized/data/OItemModels.java b/src/main/java/galena/oreganized/data/OItemModels.java index 96a7753d..18e088e1 100644 --- a/src/main/java/galena/oreganized/data/OItemModels.java +++ b/src/main/java/galena/oreganized/data/OItemModels.java @@ -131,6 +131,7 @@ protected void registerModels() { block(OBlocks.GROOVED_BLUE_ICE); block(OBlocks.SEPULCHER); + block(OBlocks.BONE_PILE); OBlocks.vigilCandles().forEach(this::normalItem); for (Supplier blocks : OBlocks.WAXED_CONRETE_POWDER) { diff --git a/src/main/java/galena/oreganized/data/OLang.java b/src/main/java/galena/oreganized/data/OLang.java index 121eb32a..e09fcf02 100644 --- a/src/main/java/galena/oreganized/data/OLang.java +++ b/src/main/java/galena/oreganized/data/OLang.java @@ -38,6 +38,7 @@ protected void addTranslations() { addBlock(OBlocks.CUT_LEAD, "Cut Lead"); addBlock(OBlocks.ELECTRUM_BLOCK, "Block of Electrum"); addBlock(OBlocks.LEAD_BOLT_CRATE, "Crate of Lead Bolts"); + addBlock(OBlocks.BONE_PILE, "Pile of Bones"); addEffect(OEffects.STUNNING, "Brain Damage"); addPotion(OPotions.STUNNING, "Brain Damage"); diff --git a/src/main/java/galena/oreganized/data/OLootTables.java b/src/main/java/galena/oreganized/data/OLootTables.java index ca0cc561..924885ea 100644 --- a/src/main/java/galena/oreganized/data/OLootTables.java +++ b/src/main/java/galena/oreganized/data/OLootTables.java @@ -129,6 +129,7 @@ protected void generate() { } dropSelf(OBlocks.SEPULCHER); + dropSelf(OBlocks.BONE_PILE); OBlocks.vigilCandles().forEach(this::vigilCandle); } diff --git a/src/main/java/galena/oreganized/data/ORecipes.java b/src/main/java/galena/oreganized/data/ORecipes.java index 29005077..5a638510 100644 --- a/src/main/java/galena/oreganized/data/ORecipes.java +++ b/src/main/java/galena/oreganized/data/ORecipes.java @@ -310,5 +310,8 @@ protected void buildRecipes(Consumer consumer) { .group("vigil_candle") .save(consumer, RecipeBuilder.getDefaultRecipeId(block.get()).withSuffix("_dyeing")); }); + + compact(OBlocks.BONE_PILE.get().asItem(), Items.BONE).save(consumer); + unCompact(Items.BONE, OBlocks.BONE_PILE.get().asItem()).save(consumer); } } diff --git a/src/main/java/galena/oreganized/data/provider/OBlockStateProvider.java b/src/main/java/galena/oreganized/data/provider/OBlockStateProvider.java index f7a735fe..44635ab1 100644 --- a/src/main/java/galena/oreganized/data/provider/OBlockStateProvider.java +++ b/src/main/java/galena/oreganized/data/provider/OBlockStateProvider.java @@ -8,6 +8,7 @@ import galena.oreganized.content.block.IMeltableBlock; import galena.oreganized.content.block.LeadDoorBlock; import galena.oreganized.content.block.MoltenLeadCauldronBlock; +import galena.oreganized.content.block.SepulcherBlock; import net.minecraft.core.Direction; import net.minecraft.data.PackOutput; import net.minecraft.resources.ResourceLocation; @@ -380,9 +381,35 @@ public void gargoyleBlock(Supplier block) { } public void sepulcherBlock(Supplier block) { - simpleBlock(block.get(), models().getExistingFile(blockTexture(block.get()))); + var builder = getMultipartBuilder(block.get()); + + builder.part() + .modelFile(models().getExistingFile(blockTexture(block.get()))) + .addModel(); + + for (int level = 1; level <= SepulcherBlock.READY; level++) { + var inside = level > SepulcherBlock.MAX_LEVEL + ? Oreganized.modLoc("block/sepulcher_rot_" + (level - SepulcherBlock.MAX_LEVEL + 1)) + : Oreganized.modLoc("block/sepulcher_rot_1"); + + var height = level > SepulcherBlock.MAX_LEVEL ? 15 : 3 + 2 * level; + + var model = models().getBuilder("sepulcher_content_" + level) + .texture("particle", inside) + .texture("inside", inside) + .element() + .from(1, 0, 1 ) + .to(15, height, 15) + .textureAll("#inside") + .end(); + + builder.part() + .modelFile(model) + .addModel() + .condition(SepulcherBlock.LEVEL, level); + } } - + private String candleSuffix(int amount) { switch (amount) { case 1: diff --git a/src/main/java/galena/oreganized/index/OBlocks.java b/src/main/java/galena/oreganized/index/OBlocks.java index 1bb35e87..743d7d3d 100644 --- a/src/main/java/galena/oreganized/index/OBlocks.java +++ b/src/main/java/galena/oreganized/index/OBlocks.java @@ -206,7 +206,8 @@ private static BlockBehaviour.Properties leadDecoProperties() { public static final RegistryObject MOLTEN_LEAD_CAULDRON = HELPER.createBlock("molten_lead_cauldron", () -> new MoltenLeadCauldronBlock(BlockBehaviour.Properties.copy(Blocks.LAVA_CAULDRON).randomTicks())); public static final RegistryObject SEPULCHER = register("sepulcher", () -> new SepulcherBlock(BlockBehaviour.Properties.copy(Blocks.CAULDRON))); - + public static final RegistryObject BONE_PILE = register("bone_pile", () -> new SepulcherBlock(BlockBehaviour.Properties.copy(Blocks.BONE_BLOCK))); + private static final Supplier VIGIL_CANDLE_PROPERTIES = () -> BlockBehaviour.Properties.of().lightLevel(CandleBlock.LIGHT_EMISSION).sound(SoundType.METAL).pushReaction(PushReaction.DESTROY); public static final RegistryObject VIGIL_CANDLE = register("vigil_candle", () -> new VigilCandleBlock(VIGIL_CANDLE_PROPERTIES.get())); public static final Map> COLORED_VIGIL_CANDLES = registerColored("vigil_candle", color -> new VigilCandleBlock(VIGIL_CANDLE_PROPERTIES.get().mapColor(color))); diff --git a/src/main/java/galena/oreganized/index/OTags.java b/src/main/java/galena/oreganized/index/OTags.java index e2963eda..d06421ae 100644 --- a/src/main/java/galena/oreganized/index/OTags.java +++ b/src/main/java/galena/oreganized/index/OTags.java @@ -108,6 +108,7 @@ private static TagKey forgeTag(String name) { public static class Entities { public static final TagKey> LIGHTER_THAN_LEAD = tag("lighter_than_lead"); + public static final TagKey> FILLS_SEPULCHER = tag("fills_sepulcher"); private static TagKey> tag(String name) { return EntityTypeTags.create(Oreganized.modLoc(name).toString()); diff --git a/src/main/java/galena/oreganized/world/event/PlayerEvents.java b/src/main/java/galena/oreganized/world/event/PlayerEvents.java index febe2657..2ef4535d 100644 --- a/src/main/java/galena/oreganized/world/event/PlayerEvents.java +++ b/src/main/java/galena/oreganized/world/event/PlayerEvents.java @@ -1,27 +1,22 @@ package galena.oreganized.world.event; import galena.oreganized.Oreganized; -import galena.oreganized.OreganizedConfig; import galena.oreganized.content.block.MoltenLeadCauldronBlock; import galena.oreganized.content.entity.GargoyleBlockEntity; import galena.oreganized.content.item.ScribeItem; import galena.oreganized.index.OAttributes; import galena.oreganized.index.OBlocks; -import galena.oreganized.index.OEffects; -import galena.oreganized.index.OFluids; import galena.oreganized.index.OItems; import galena.oreganized.index.OTags; import net.minecraft.advancements.CriteriaTriggers; import net.minecraft.core.BlockPos; +import net.minecraft.server.level.ServerLevel; import net.minecraft.server.level.ServerPlayer; import net.minecraft.sounds.SoundEvents; import net.minecraft.sounds.SoundSource; import net.minecraft.stats.Stats; import net.minecraft.world.InteractionHand; -import net.minecraft.world.effect.MobEffectInstance; -import net.minecraft.world.effect.MobEffects; import net.minecraft.world.entity.EquipmentSlot; -import net.minecraft.world.entity.LivingEntity; import net.minecraft.world.entity.ai.attributes.AttributeModifier; import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.DiggerItem; @@ -36,7 +31,7 @@ import net.minecraftforge.common.ToolActions; import net.minecraftforge.event.ItemAttributeModifierEvent; import net.minecraftforge.event.TickEvent; -import net.minecraftforge.event.entity.living.LivingEntityUseItemEvent; +import net.minecraftforge.event.entity.living.LivingDeathEvent; import net.minecraftforge.event.entity.player.PlayerInteractEvent; import net.minecraftforge.event.level.BlockEvent; import net.minecraftforge.eventbus.api.EventPriority; From 65d76ef5c1e38c66253437b5c139572f49c78927 Mon Sep 17 00:00:00 2001 From: Niklas Widmann Date: Wed, 23 Oct 2024 00:42:14 +0200 Subject: [PATCH 07/11] rework sepulcher logic --- .../002701d48eee4c36b62b24b011e74b0624793d05 | 16 +- .../5bb646c3cee204f41a1b59a2c0d9083b5f7155b0 | 6 +- .../9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e | 4 +- .../f43e2426f2370abaef549e24a3723585e9b3c47e | 4 +- .../oreganized/blockstates/rotting_flesh.json | 7 + .../oreganized/blockstates/sepulcher.json | 144 +++++++----------- .../assets/oreganized/lang/en_us.json | 1 + .../models/block/rotting_flesh.json | 6 + .../models/block/sepulcher_content_1.json | 40 ----- .../models/block/sepulcher_content_10.json | 40 ----- .../models/block/sepulcher_content_2.json | 40 ----- .../models/block/sepulcher_content_3.json | 40 ----- .../models/block/sepulcher_content_4.json | 40 ----- .../models/block/sepulcher_content_5.json | 40 ----- .../models/block/sepulcher_content_6.json | 40 ----- .../models/block/sepulcher_content_7.json | 40 ----- .../models/block/sepulcher_content_8.json | 40 ----- .../models/block/sepulcher_content_9.json | 40 ----- .../tags/blocks/mineable/pickaxe.json | 2 + .../recipes/decorations/sepulcher.json | 33 ++++ .../loot_tables/blocks/rotting_flesh.json | 21 +++ .../data/oreganized/recipes/sepulcher.json | 18 +++ .../oreganized/tags/blocks/vigil_candles.json | 22 +-- .../tags/entity_types/fills_sepulcher.json | 2 + .../galena/oreganized/OreganizedConfig.java | 2 +- .../content/block/SepulcherBlock.java | 57 +++++-- .../content/entity/SepulcherBlockEntity.java | 121 ++++++++++++++- .../galena/oreganized/data/OBlockStates.java | 1 + .../galena/oreganized/data/OBlockTags.java | 5 +- .../galena/oreganized/data/OLootTables.java | 1 + .../java/galena/oreganized/data/ORecipes.java | 10 +- .../data/provider/OBlockStateProvider.java | 40 ++--- .../java/galena/oreganized/index/OBlocks.java | 3 +- .../oreganized/network/OreganizedNetwork.java | 2 + .../packet/SepulcherConsumesDeathPacket.java | 40 +++++ 35 files changed, 404 insertions(+), 564 deletions(-) create mode 100644 src/generated/resources/assets/oreganized/blockstates/rotting_flesh.json create mode 100644 src/generated/resources/assets/oreganized/models/block/rotting_flesh.json delete mode 100644 src/generated/resources/assets/oreganized/models/block/sepulcher_content_1.json delete mode 100644 src/generated/resources/assets/oreganized/models/block/sepulcher_content_10.json delete mode 100644 src/generated/resources/assets/oreganized/models/block/sepulcher_content_2.json delete mode 100644 src/generated/resources/assets/oreganized/models/block/sepulcher_content_3.json delete mode 100644 src/generated/resources/assets/oreganized/models/block/sepulcher_content_4.json delete mode 100644 src/generated/resources/assets/oreganized/models/block/sepulcher_content_5.json delete mode 100644 src/generated/resources/assets/oreganized/models/block/sepulcher_content_6.json delete mode 100644 src/generated/resources/assets/oreganized/models/block/sepulcher_content_7.json delete mode 100644 src/generated/resources/assets/oreganized/models/block/sepulcher_content_8.json delete mode 100644 src/generated/resources/assets/oreganized/models/block/sepulcher_content_9.json create mode 100644 src/generated/resources/data/oreganized/advancements/recipes/decorations/sepulcher.json create mode 100644 src/generated/resources/data/oreganized/loot_tables/blocks/rotting_flesh.json create mode 100644 src/generated/resources/data/oreganized/recipes/sepulcher.json create mode 100644 src/main/java/galena/oreganized/network/packet/SepulcherConsumesDeathPacket.java diff --git a/src/generated/resources/.cache/002701d48eee4c36b62b24b011e74b0624793d05 b/src/generated/resources/.cache/002701d48eee4c36b62b24b011e74b0624793d05 index 7e68c1d6..f4c99166 100644 --- a/src/generated/resources/.cache/002701d48eee4c36b62b24b011e74b0624793d05 +++ b/src/generated/resources/.cache/002701d48eee4c36b62b24b011e74b0624793d05 @@ -1,4 +1,4 @@ -// 1.20.1 2024-10-22T21:24:48.3765429 oreganized Block States +// 1.20.1 2024-10-23T00:13:26.2607736 oreganized Block States d85b0fb9e5cad1d9c4f22ed192b0fa621ee3373c assets/oreganized/blockstates/black_crystal_glass.json 05bb006ff7f48557fe5c5333bc120f7206052717 assets/oreganized/blockstates/black_crystal_glass_pane.json dfd0c1bf50927d51a16ab9bf7c8ab2e2cb083998 assets/oreganized/blockstates/black_vigil_candle.json @@ -74,7 +74,8 @@ a8b05dbdd23fe1cf5ce82b267a4648b0629fc297 assets/oreganized/blockstates/raw_silve 5085b50121f91c56256b5f1189c8dc614c340d11 assets/oreganized/blockstates/red_crystal_glass.json 7a46fe801476209d2d5eb40213397140a7a06b8f assets/oreganized/blockstates/red_crystal_glass_pane.json c03746b3cb60582e017ac4df94d7438f6ee75a00 assets/oreganized/blockstates/red_vigil_candle.json -fd4d075ac59711e301ea2b3e9a3f05d8f00bb22e assets/oreganized/blockstates/sepulcher.json +561d7cec28194806d6e4a3ae012f548b5d7ec679 assets/oreganized/blockstates/rotting_flesh.json +d977911dbf1e1f35accd414bf349f848f92b8849 assets/oreganized/blockstates/sepulcher.json 398fed72da8aa72d33e773d22a7fb5a5292e6fa5 assets/oreganized/blockstates/shrapnel_bomb.json dcdf3b0a7a2bb1bd00f698b3325e8ffadd0bf98c assets/oreganized/blockstates/silver_block.json 89f5cc8a105178b0b12f32963a320afc120bf868 assets/oreganized/blockstates/silver_ore.json @@ -676,16 +677,7 @@ c41cab2ffae47d0bd0a3142d76089c4379cd9ed9 assets/oreganized/models/block/red_vigi f52d92eac9baa613960cf83707dee758e50a2f20 assets/oreganized/models/block/red_vigil_candle_single_ceiling.json 90c0acdcb495c49c48b5732ca2e5364cae0c4fe5 assets/oreganized/models/block/red_vigil_candle_triple.json ffaac09a1cb2bb59f917e95b11036aa50507186f assets/oreganized/models/block/red_vigil_candle_triple_ceiling.json -2ba07014e4512b03c9a315602fdf0ba23c983214 assets/oreganized/models/block/sepulcher_content_1.json -efb44cef222935f030bf676fba5609fe13a86175 assets/oreganized/models/block/sepulcher_content_10.json -62fc2cf598ff5f2bed432b39895aacc3ac6ebb0a assets/oreganized/models/block/sepulcher_content_2.json -365ba692539cd9e7fb5c852b8e78417f02e8e721 assets/oreganized/models/block/sepulcher_content_3.json -5c7435b57b551203a1bba51c056b1ce143087413 assets/oreganized/models/block/sepulcher_content_4.json -c1c85baf8a03d9ef5cdd76f040448b62de5d03e7 assets/oreganized/models/block/sepulcher_content_5.json -a997be57a1b9572cd8a74529f2d2c81ae8c88cdb assets/oreganized/models/block/sepulcher_content_6.json -e96303d0f6b53a09f87144a298f3ef4d82a288f5 assets/oreganized/models/block/sepulcher_content_7.json -62a09c08118cdfebbb7bf9536c8c6eb24335c571 assets/oreganized/models/block/sepulcher_content_8.json -d77e201b3446acc9f974a7d94edf3b048f5579c1 assets/oreganized/models/block/sepulcher_content_9.json +67db22c53cba6aa2a32ccaa5345d3ea6dd65289a assets/oreganized/models/block/rotting_flesh.json 325f19d03a38f249bcceb44770d7af7a5d956821 assets/oreganized/models/block/shrapnel_bomb.json 8b672f8e74c40583b323d948f93266ac9dc51d4e assets/oreganized/models/block/silver_block.json e7ae7144c130a6d2636fe8e2702c99666720d878 assets/oreganized/models/block/silver_ore.json diff --git a/src/generated/resources/.cache/5bb646c3cee204f41a1b59a2c0d9083b5f7155b0 b/src/generated/resources/.cache/5bb646c3cee204f41a1b59a2c0d9083b5f7155b0 index 87796042..779b76a9 100644 --- a/src/generated/resources/.cache/5bb646c3cee204f41a1b59a2c0d9083b5f7155b0 +++ b/src/generated/resources/.cache/5bb646c3cee204f41a1b59a2c0d9083b5f7155b0 @@ -1,4 +1,4 @@ -// 1.20.1 2024-10-22T21:59:05.9187727 Oreganized Block Tags +// 1.20.1 2024-10-23T00:13:26.2677803 Oreganized Block Tags 7a2d68d81bc5ee59f9a2f4ba68ddb39bfd9c875d data/forge/tags/blocks/glass.json d96b4f83e03abe39a1b97d92b7818c8f6b2e5c68 data/forge/tags/blocks/glass_panes.json d062c23ad5308b7de0b2e86f6531ea724530f898 data/forge/tags/blocks/melts_lead.json @@ -21,7 +21,7 @@ b85964d677734db0ac4bbc66f550f073ed0cb5e1 data/minecraft/tags/blocks/candles.json 0f64e9b9dc279dd460f6408313b130a37a0c9d86 data/minecraft/tags/blocks/ice.json 7a2d68d81bc5ee59f9a2f4ba68ddb39bfd9c875d data/minecraft/tags/blocks/impermeable.json f7079c32fc948b65cb486bea80e2dc93d13ce577 data/minecraft/tags/blocks/mineable/axe.json -abb8283f25d49e1094364bfc91028dd0f3af9ad6 data/minecraft/tags/blocks/mineable/pickaxe.json +c67b7a8b928eab9314c1bf55632789b63a0c62f0 data/minecraft/tags/blocks/mineable/pickaxe.json 84a13f81c79f0c05f8f7a8cbf1d3c25129a97179 data/minecraft/tags/blocks/mineable/shovel.json bb86ac7ab19373da790ec5711f473614e4b62d79 data/minecraft/tags/blocks/needs_iron_tool.json dc9cc2dca9fa3a28a0458ec282e3e0fe81999ee1 data/minecraft/tags/blocks/needs_stone_tool.json @@ -39,4 +39,4 @@ eaca08d04b1742f418e6bc0964dd32cf16035d88 data/oreganized/tags/blocks/mineable/sc cf3608bd187922aeb48c566c19e8482b0dca34c7 data/oreganized/tags/blocks/prevents_lead_cloud.json 06c2e2e512966767a31df77e646e41c4c39e3dd3 data/oreganized/tags/blocks/silktouch_using_scribe.json 3112fb4a1df2953e2c3572fa47f886bf8e5bd679 data/oreganized/tags/blocks/stone_types/glance.json -4c6c2866f43f74cc09dfa18b36047b869a88d10e data/oreganized/tags/blocks/vigil_candles.json +cead6b906640efcd90a6dbb5f5e17623f3631b53 data/oreganized/tags/blocks/vigil_candles.json diff --git a/src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e b/src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e index 07b3f673..beccc180 100644 --- a/src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e +++ b/src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e @@ -1,4 +1,4 @@ -// 1.20.1 2024-10-22T21:35:16.0293337 Recipes +// 1.20.1 2024-10-22T23:35:54.703495 Recipes c1dfd749997c4b830ca484062a948878ea0d34f3 data/minecraft/advancements/recipes/building_blocks/bone.json a8cdf899ebdba8cace47683d027002ed7064ce5a data/minecraft/recipes/bone.json c27d3499944bf522a573dc8987582db2d7349b41 data/oreganized/advancements/recipes/brewing/poisonous_potato_from_lead.json @@ -123,6 +123,7 @@ d67b8fff946ef56ae53ba4718e5556f277799309 data/oreganized/advancements/recipes/de 0b1087608b38dcbdd8e77f856cd9fb469df1e358 data/oreganized/advancements/recipes/decorations/pink_crystal_glass.json 09b30e2267c1e9b9c804283a4e5927f909506768 data/oreganized/advancements/recipes/decorations/purple_crystal_glass.json 31db1a4b63de5199b3389872a24d8cbb463a98a2 data/oreganized/advancements/recipes/decorations/red_crystal_glass.json +2611d52bb502fe3a9cc32972727352f8c8ea2bef data/oreganized/advancements/recipes/decorations/sepulcher.json dbe2cf69f8eb30cff15328377c83ace6be8cb4a3 data/oreganized/advancements/recipes/decorations/waxed_black_concrete_powder.json 4a16c51ac08111b39ddac755d86f12c9f28c9119 data/oreganized/advancements/recipes/decorations/waxed_blue_concrete_powder.json 6b1858a1aee11d96bc6f5c7b4ced8dc5a3c6313e data/oreganized/advancements/recipes/decorations/waxed_brown_concrete_powder.json @@ -296,6 +297,7 @@ f143419602a22f529db20cea44e5e370e8e4d868 data/oreganized/recipes/red_crystal_gla 7b1ea45d203fa88ba577b2289c7bd7cd8f7bc88a data/oreganized/recipes/red_vigil_candle.json 50b836078acf7b537c8a231ab6b9635261a2e4e5 data/oreganized/recipes/red_vigil_candle_dyeing.json 06ea07eed909dbcff647ac8724355430c1817e0e data/oreganized/recipes/scribe.json +d864df7f745ee19a4a400abfad7c508d0637fd30 data/oreganized/recipes/sepulcher.json 194a5e4bfb1acbb98161ddeb6c0af5b21917e508 data/oreganized/recipes/shrapnel_bomb.json cedc682018d184f9f9f384afe3b157e6cbfff4b1 data/oreganized/recipes/shrapnel_bomb_minecart.json 07595b3d623aafa3ef700093ec0449ebafa1ed27 data/oreganized/recipes/silver_block.json diff --git a/src/generated/resources/.cache/f43e2426f2370abaef549e24a3723585e9b3c47e b/src/generated/resources/.cache/f43e2426f2370abaef549e24a3723585e9b3c47e index 5c380370..7e8cab4b 100644 --- a/src/generated/resources/.cache/f43e2426f2370abaef549e24a3723585e9b3c47e +++ b/src/generated/resources/.cache/f43e2426f2370abaef549e24a3723585e9b3c47e @@ -1,3 +1,3 @@ -// 1.20.1 2024-10-22T21:59:05.9157738 Oreganized Entity Type Tags -c1385b67913015546baa8a0f603b4abda87e1b9d data/oreganized/tags/entity_types/fills_sepulcher.json +// 1.20.1 2024-10-22T23:12:34.5305377 Oreganized Entity Type Tags +a35af8d4e9c9c8d45cb7e2335ce6bacc00d45a8d data/oreganized/tags/entity_types/fills_sepulcher.json 29671cfa11d074462c259806e9d60468451e3cdb data/oreganized/tags/entity_types/lighter_than_lead.json diff --git a/src/generated/resources/assets/oreganized/blockstates/rotting_flesh.json b/src/generated/resources/assets/oreganized/blockstates/rotting_flesh.json new file mode 100644 index 00000000..559fe19b --- /dev/null +++ b/src/generated/resources/assets/oreganized/blockstates/rotting_flesh.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "oreganized:block/rotting_flesh" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/blockstates/sepulcher.json b/src/generated/resources/assets/oreganized/blockstates/sepulcher.json index 3f3c6342..c5731bcc 100644 --- a/src/generated/resources/assets/oreganized/blockstates/sepulcher.json +++ b/src/generated/resources/assets/oreganized/blockstates/sepulcher.json @@ -1,89 +1,61 @@ { - "multipart": [ - { - "apply": { - "model": "oreganized:block/sepulcher" - } - }, - { - "apply": { - "model": "oreganized:block/sepulcher_content_1" - }, - "when": { - "level": "1" - } - }, - { - "apply": { - "model": "oreganized:block/sepulcher_content_2" - }, - "when": { - "level": "2" - } - }, - { - "apply": { - "model": "oreganized:block/sepulcher_content_3" - }, - "when": { - "level": "3" - } - }, - { - "apply": { - "model": "oreganized:block/sepulcher_content_4" - }, - "when": { - "level": "4" - } - }, - { - "apply": { - "model": "oreganized:block/sepulcher_content_5" - }, - "when": { - "level": "5" - } - }, - { - "apply": { - "model": "oreganized:block/sepulcher_content_6" - }, - "when": { - "level": "6" - } - }, - { - "apply": { - "model": "oreganized:block/sepulcher_content_7" - }, - "when": { - "level": "7" - } - }, - { - "apply": { - "model": "oreganized:block/sepulcher_content_8" - }, - "when": { - "level": "8" - } - }, - { - "apply": { - "model": "oreganized:block/sepulcher_content_9" - }, - "when": { - "level": "9" - } - }, - { - "apply": { - "model": "oreganized:block/sepulcher_content_10" - }, - "when": { - "level": "10" - } + "variants": { + "level=0": { + "model": "oreganized:block/sepulcher" + }, + "level=1": { + "model": "oreganized:block/sepulcher_being_filled_1" + }, + "level=10": { + "model": "oreganized:block/sepulcher_being_filled_10" + }, + "level=11": { + "model": "oreganized:block/sepulcher_being_filled_11" + }, + "level=12": { + "model": "oreganized:block/sepulcher_being_filled_12" + }, + "level=13": { + "model": "oreganized:block/sepulcher_being_filled_13" + }, + "level=14": { + "model": "oreganized:block/sepulcher_sealed_1" + }, + "level=15": { + "model": "oreganized:block/sepulcher_sealed_2" + }, + "level=16": { + "model": "oreganized:block/sepulcher_sealed_3" + }, + "level=17": { + "model": "oreganized:block/sepulcher_sealed_4" + }, + "level=18": { + "model": "oreganized:block/sepulcher_sealed_5" + }, + "level=2": { + "model": "oreganized:block/sepulcher_being_filled_2" + }, + "level=3": { + "model": "oreganized:block/sepulcher_being_filled_3" + }, + "level=4": { + "model": "oreganized:block/sepulcher_being_filled_4" + }, + "level=5": { + "model": "oreganized:block/sepulcher_being_filled_5" + }, + "level=6": { + "model": "oreganized:block/sepulcher_being_filled_6" + }, + "level=7": { + "model": "oreganized:block/sepulcher_being_filled_7" + }, + "level=8": { + "model": "oreganized:block/sepulcher_being_filled_8" + }, + "level=9": { + "model": "oreganized:block/sepulcher_being_filled_9" } - ] + } } \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/lang/en_us.json b/src/generated/resources/assets/oreganized/lang/en_us.json index 2748c712..f870b06a 100644 --- a/src/generated/resources/assets/oreganized/lang/en_us.json +++ b/src/generated/resources/assets/oreganized/lang/en_us.json @@ -100,6 +100,7 @@ "block.oreganized.red_crystal_glass": "Red Crystal Glass", "block.oreganized.red_crystal_glass_pane": "Red Crystal Glass Pane", "block.oreganized.red_vigil_candle": "Red Vigil Candle", + "block.oreganized.rotting_flesh": "Rotting Flesh", "block.oreganized.sepulcher": "Sepulcher", "block.oreganized.shrapnel_bomb": "Shrapnel Bomb", "block.oreganized.silver_block": "Block of Silver", diff --git a/src/generated/resources/assets/oreganized/models/block/rotting_flesh.json b/src/generated/resources/assets/oreganized/models/block/rotting_flesh.json new file mode 100644 index 00000000..873a28fd --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/rotting_flesh.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "oreganized:block/sepulcher_rot_1" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/sepulcher_content_1.json b/src/generated/resources/assets/oreganized/models/block/sepulcher_content_1.json deleted file mode 100644 index 052cdc19..00000000 --- a/src/generated/resources/assets/oreganized/models/block/sepulcher_content_1.json +++ /dev/null @@ -1,40 +0,0 @@ -{ - "elements": [ - { - "faces": { - "down": { - "texture": "#inside" - }, - "east": { - "texture": "#inside" - }, - "north": { - "texture": "#inside" - }, - "south": { - "texture": "#inside" - }, - "up": { - "texture": "#inside" - }, - "west": { - "texture": "#inside" - } - }, - "from": [ - 1, - 0, - 1 - ], - "to": [ - 15, - 5, - 15 - ] - } - ], - "textures": { - "inside": "oreganized:block/sepulcher_rot_1", - "particle": "oreganized:block/sepulcher_rot_1" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/sepulcher_content_10.json b/src/generated/resources/assets/oreganized/models/block/sepulcher_content_10.json deleted file mode 100644 index a8a73ace..00000000 --- a/src/generated/resources/assets/oreganized/models/block/sepulcher_content_10.json +++ /dev/null @@ -1,40 +0,0 @@ -{ - "elements": [ - { - "faces": { - "down": { - "texture": "#inside" - }, - "east": { - "texture": "#inside" - }, - "north": { - "texture": "#inside" - }, - "south": { - "texture": "#inside" - }, - "up": { - "texture": "#inside" - }, - "west": { - "texture": "#inside" - } - }, - "from": [ - 1, - 0, - 1 - ], - "to": [ - 15, - 15, - 15 - ] - } - ], - "textures": { - "inside": "oreganized:block/sepulcher_rot_5", - "particle": "oreganized:block/sepulcher_rot_5" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/sepulcher_content_2.json b/src/generated/resources/assets/oreganized/models/block/sepulcher_content_2.json deleted file mode 100644 index ccd87032..00000000 --- a/src/generated/resources/assets/oreganized/models/block/sepulcher_content_2.json +++ /dev/null @@ -1,40 +0,0 @@ -{ - "elements": [ - { - "faces": { - "down": { - "texture": "#inside" - }, - "east": { - "texture": "#inside" - }, - "north": { - "texture": "#inside" - }, - "south": { - "texture": "#inside" - }, - "up": { - "texture": "#inside" - }, - "west": { - "texture": "#inside" - } - }, - "from": [ - 1, - 0, - 1 - ], - "to": [ - 15, - 7, - 15 - ] - } - ], - "textures": { - "inside": "oreganized:block/sepulcher_rot_1", - "particle": "oreganized:block/sepulcher_rot_1" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/sepulcher_content_3.json b/src/generated/resources/assets/oreganized/models/block/sepulcher_content_3.json deleted file mode 100644 index 6e2d7f5c..00000000 --- a/src/generated/resources/assets/oreganized/models/block/sepulcher_content_3.json +++ /dev/null @@ -1,40 +0,0 @@ -{ - "elements": [ - { - "faces": { - "down": { - "texture": "#inside" - }, - "east": { - "texture": "#inside" - }, - "north": { - "texture": "#inside" - }, - "south": { - "texture": "#inside" - }, - "up": { - "texture": "#inside" - }, - "west": { - "texture": "#inside" - } - }, - "from": [ - 1, - 0, - 1 - ], - "to": [ - 15, - 9, - 15 - ] - } - ], - "textures": { - "inside": "oreganized:block/sepulcher_rot_1", - "particle": "oreganized:block/sepulcher_rot_1" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/sepulcher_content_4.json b/src/generated/resources/assets/oreganized/models/block/sepulcher_content_4.json deleted file mode 100644 index 8e23d9d0..00000000 --- a/src/generated/resources/assets/oreganized/models/block/sepulcher_content_4.json +++ /dev/null @@ -1,40 +0,0 @@ -{ - "elements": [ - { - "faces": { - "down": { - "texture": "#inside" - }, - "east": { - "texture": "#inside" - }, - "north": { - "texture": "#inside" - }, - "south": { - "texture": "#inside" - }, - "up": { - "texture": "#inside" - }, - "west": { - "texture": "#inside" - } - }, - "from": [ - 1, - 0, - 1 - ], - "to": [ - 15, - 11, - 15 - ] - } - ], - "textures": { - "inside": "oreganized:block/sepulcher_rot_1", - "particle": "oreganized:block/sepulcher_rot_1" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/sepulcher_content_5.json b/src/generated/resources/assets/oreganized/models/block/sepulcher_content_5.json deleted file mode 100644 index 0b062a75..00000000 --- a/src/generated/resources/assets/oreganized/models/block/sepulcher_content_5.json +++ /dev/null @@ -1,40 +0,0 @@ -{ - "elements": [ - { - "faces": { - "down": { - "texture": "#inside" - }, - "east": { - "texture": "#inside" - }, - "north": { - "texture": "#inside" - }, - "south": { - "texture": "#inside" - }, - "up": { - "texture": "#inside" - }, - "west": { - "texture": "#inside" - } - }, - "from": [ - 1, - 0, - 1 - ], - "to": [ - 15, - 13, - 15 - ] - } - ], - "textures": { - "inside": "oreganized:block/sepulcher_rot_1", - "particle": "oreganized:block/sepulcher_rot_1" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/sepulcher_content_6.json b/src/generated/resources/assets/oreganized/models/block/sepulcher_content_6.json deleted file mode 100644 index 04614519..00000000 --- a/src/generated/resources/assets/oreganized/models/block/sepulcher_content_6.json +++ /dev/null @@ -1,40 +0,0 @@ -{ - "elements": [ - { - "faces": { - "down": { - "texture": "#inside" - }, - "east": { - "texture": "#inside" - }, - "north": { - "texture": "#inside" - }, - "south": { - "texture": "#inside" - }, - "up": { - "texture": "#inside" - }, - "west": { - "texture": "#inside" - } - }, - "from": [ - 1, - 0, - 1 - ], - "to": [ - 15, - 15, - 15 - ] - } - ], - "textures": { - "inside": "oreganized:block/sepulcher_rot_1", - "particle": "oreganized:block/sepulcher_rot_1" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/sepulcher_content_7.json b/src/generated/resources/assets/oreganized/models/block/sepulcher_content_7.json deleted file mode 100644 index f8c1dae1..00000000 --- a/src/generated/resources/assets/oreganized/models/block/sepulcher_content_7.json +++ /dev/null @@ -1,40 +0,0 @@ -{ - "elements": [ - { - "faces": { - "down": { - "texture": "#inside" - }, - "east": { - "texture": "#inside" - }, - "north": { - "texture": "#inside" - }, - "south": { - "texture": "#inside" - }, - "up": { - "texture": "#inside" - }, - "west": { - "texture": "#inside" - } - }, - "from": [ - 1, - 0, - 1 - ], - "to": [ - 15, - 15, - 15 - ] - } - ], - "textures": { - "inside": "oreganized:block/sepulcher_rot_2", - "particle": "oreganized:block/sepulcher_rot_2" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/sepulcher_content_8.json b/src/generated/resources/assets/oreganized/models/block/sepulcher_content_8.json deleted file mode 100644 index 64266e74..00000000 --- a/src/generated/resources/assets/oreganized/models/block/sepulcher_content_8.json +++ /dev/null @@ -1,40 +0,0 @@ -{ - "elements": [ - { - "faces": { - "down": { - "texture": "#inside" - }, - "east": { - "texture": "#inside" - }, - "north": { - "texture": "#inside" - }, - "south": { - "texture": "#inside" - }, - "up": { - "texture": "#inside" - }, - "west": { - "texture": "#inside" - } - }, - "from": [ - 1, - 0, - 1 - ], - "to": [ - 15, - 15, - 15 - ] - } - ], - "textures": { - "inside": "oreganized:block/sepulcher_rot_3", - "particle": "oreganized:block/sepulcher_rot_3" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/sepulcher_content_9.json b/src/generated/resources/assets/oreganized/models/block/sepulcher_content_9.json deleted file mode 100644 index b3366484..00000000 --- a/src/generated/resources/assets/oreganized/models/block/sepulcher_content_9.json +++ /dev/null @@ -1,40 +0,0 @@ -{ - "elements": [ - { - "faces": { - "down": { - "texture": "#inside" - }, - "east": { - "texture": "#inside" - }, - "north": { - "texture": "#inside" - }, - "south": { - "texture": "#inside" - }, - "up": { - "texture": "#inside" - }, - "west": { - "texture": "#inside" - } - }, - "from": [ - 1, - 0, - 1 - ], - "to": [ - 15, - 15, - 15 - ] - } - ], - "textures": { - "inside": "oreganized:block/sepulcher_rot_4", - "particle": "oreganized:block/sepulcher_rot_4" - } -} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/tags/blocks/mineable/pickaxe.json b/src/generated/resources/data/minecraft/tags/blocks/mineable/pickaxe.json index eacddb0c..f216d92e 100644 --- a/src/generated/resources/data/minecraft/tags/blocks/mineable/pickaxe.json +++ b/src/generated/resources/data/minecraft/tags/blocks/mineable/pickaxe.json @@ -35,6 +35,8 @@ "oreganized:grooved_ice", "oreganized:grooved_packed_ice", "oreganized:grooved_blue_ice", + "oreganized:sepulcher", + "oreganized:bone_pile", "#oreganized:vigil_candles" ] } \ No newline at end of file diff --git a/src/generated/resources/data/oreganized/advancements/recipes/decorations/sepulcher.json b/src/generated/resources/data/oreganized/advancements/recipes/decorations/sepulcher.json new file mode 100644 index 00000000..551089fb --- /dev/null +++ b/src/generated/resources/data/oreganized/advancements/recipes/decorations/sepulcher.json @@ -0,0 +1,33 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_silver": { + "conditions": { + "items": [ + { + "tag": "forge:ingots/silver" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "oreganized:sepulcher" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_silver", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "oreganized:sepulcher" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/generated/resources/data/oreganized/loot_tables/blocks/rotting_flesh.json b/src/generated/resources/data/oreganized/loot_tables/blocks/rotting_flesh.json new file mode 100644 index 00000000..770c82f0 --- /dev/null +++ b/src/generated/resources/data/oreganized/loot_tables/blocks/rotting_flesh.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "minecraft:air" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "oreganized:blocks/rotting_flesh" +} \ No newline at end of file diff --git a/src/generated/resources/data/oreganized/recipes/sepulcher.json b/src/generated/resources/data/oreganized/recipes/sepulcher.json new file mode 100644 index 00000000..5ea69eb8 --- /dev/null +++ b/src/generated/resources/data/oreganized/recipes/sepulcher.json @@ -0,0 +1,18 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "#": { + "tag": "forge:ingots/silver" + } + }, + "pattern": [ + "# #", + "# #", + "###" + ], + "result": { + "item": "oreganized:sepulcher" + }, + "show_notification": true +} \ No newline at end of file diff --git a/src/generated/resources/data/oreganized/tags/blocks/vigil_candles.json b/src/generated/resources/data/oreganized/tags/blocks/vigil_candles.json index 9edaa531..de14c5b9 100644 --- a/src/generated/resources/data/oreganized/tags/blocks/vigil_candles.json +++ b/src/generated/resources/data/oreganized/tags/blocks/vigil_candles.json @@ -1,21 +1,21 @@ { "values": [ "oreganized:vigil_candle", - "oreganized:yellow_vigil_candle", - "oreganized:brown_vigil_candle", - "oreganized:magenta_vigil_candle", - "oreganized:black_vigil_candle", + "oreganized:light_blue_vigil_candle", "oreganized:blue_vigil_candle", - "oreganized:cyan_vigil_candle", + "oreganized:orange_vigil_candle", "oreganized:red_vigil_candle", + "oreganized:purple_vigil_candle", "oreganized:light_gray_vigil_candle", - "oreganized:light_blue_vigil_candle", - "oreganized:orange_vigil_candle", - "oreganized:lime_vigil_candle", "oreganized:green_vigil_candle", - "oreganized:pink_vigil_candle", - "oreganized:purple_vigil_candle", "oreganized:gray_vigil_candle", - "oreganized:white_vigil_candle" + "oreganized:magenta_vigil_candle", + "oreganized:white_vigil_candle", + "oreganized:yellow_vigil_candle", + "oreganized:black_vigil_candle", + "oreganized:brown_vigil_candle", + "oreganized:lime_vigil_candle", + "oreganized:cyan_vigil_candle", + "oreganized:pink_vigil_candle" ] } \ No newline at end of file diff --git a/src/generated/resources/data/oreganized/tags/entity_types/fills_sepulcher.json b/src/generated/resources/data/oreganized/tags/entity_types/fills_sepulcher.json index d9d71d93..06226245 100644 --- a/src/generated/resources/data/oreganized/tags/entity_types/fills_sepulcher.json +++ b/src/generated/resources/data/oreganized/tags/entity_types/fills_sepulcher.json @@ -1,6 +1,8 @@ { "values": [ "minecraft:player", + "minecraft:zombie", + "minecraft:zombie_villager", "minecraft:villager" ] } \ No newline at end of file diff --git a/src/main/java/galena/oreganized/OreganizedConfig.java b/src/main/java/galena/oreganized/OreganizedConfig.java index fe35c7f7..fc91c335 100644 --- a/src/main/java/galena/oreganized/OreganizedConfig.java +++ b/src/main/java/galena/oreganized/OreganizedConfig.java @@ -31,7 +31,7 @@ private Common(ForgeConfigSpec.Builder builder) { pillagerSpawnWithBolts = builder.comment("Pillagers have a chance to spawn with a lead bolt in their offhand").define("pillagerSpawnWithBolts", true); scribeSilkTouchStone = builder.comment("The scribe is able to silk-touch pickaxe-related blocks").define("scribeSilkTouchStone", true); moltenLeadDelay = builder.comment("Time in ticks molten lead waits until flowing downwards").defineInRange("moltenLeadDelay", 20 * 10, 0, 20 * 100); - sepulcherDuration = builder.comment("Time in ticks the sepulcher takes to turn meat into bones").defineInRange("sepulcherDuration", 20 * 60 * 5, 0, Integer.MAX_VALUE); + sepulcherDuration = builder.comment("Time in ticks the sepulcher takes to turn meat into bones").defineInRange("sepulcherDuration", 20 * 30, 0, Integer.MAX_VALUE); builder.pop(); } diff --git a/src/main/java/galena/oreganized/content/block/SepulcherBlock.java b/src/main/java/galena/oreganized/content/block/SepulcherBlock.java index 27f2da17..273b620a 100644 --- a/src/main/java/galena/oreganized/content/block/SepulcherBlock.java +++ b/src/main/java/galena/oreganized/content/block/SepulcherBlock.java @@ -3,6 +3,7 @@ import galena.oreganized.content.entity.SepulcherBlockEntity; import galena.oreganized.index.OBlockEntities; import galena.oreganized.index.OBlocks; +import net.minecraft.Util; import net.minecraft.core.BlockPos; import net.minecraft.sounds.SoundEvents; import net.minecraft.sounds.SoundSource; @@ -13,6 +14,7 @@ import net.minecraft.world.entity.item.ItemEntity; import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.ItemStack; +import net.minecraft.world.level.BlockGetter; import net.minecraft.world.level.Level; import net.minecraft.world.level.LevelAccessor; import net.minecraft.world.level.block.Block; @@ -24,15 +26,26 @@ import net.minecraft.world.level.gameevent.GameEvent; import net.minecraft.world.phys.BlockHitResult; import net.minecraft.world.phys.Vec3; +import net.minecraft.world.phys.shapes.BooleanOp; +import net.minecraft.world.phys.shapes.CollisionContext; +import net.minecraft.world.phys.shapes.Shapes; +import net.minecraft.world.phys.shapes.VoxelShape; import org.jetbrains.annotations.Nullable; public class SepulcherBlock extends Block implements TickingEntityBlock { - public static final int MAX_LEVEL = 6; - public static final int ROT_LEVELS = 4; - public static final int READY = MAX_LEVEL + ROT_LEVELS; + public static final int MAX_LEVEL = 13; + public static final int SEALED_LEVELS = 5; + public static final int READY = MAX_LEVEL + SEALED_LEVELS; public static final IntegerProperty LEVEL = IntegerProperty.create("level", 0, READY); + private static final VoxelShape OUTER_SHAPE = Shapes.block(); + private static final VoxelShape[] SHAPES = Util.make(new VoxelShape[MAX_LEVEL + 1], shapes -> { + for (int level = 0; level < shapes.length; level++) { + shapes[level] = Shapes.join(OUTER_SHAPE, Block.box(3.0, Math.max(2, 1 + level), 3.0, 13.0, 16.0, 13.0), BooleanOp.ONLY_FIRST); + } + }); + public SepulcherBlock(Properties properties) { super(properties); registerDefaultState(defaultBlockState().setValue(LEVEL, 0)); @@ -54,28 +67,39 @@ public InteractionResult use(BlockState state, Level level, BlockPos pos, Player } var held = player.getItemInHand(hand); - var food = held.getFoodProperties(null); - if (fillLevel < MAX_LEVEL && food != null && food.isMeat()) { - insert(player, state, level, pos); + if (tryInsert(held, player, state, level, pos, false)) { player.awardStat(Stats.ITEM_USED.get(held.getItem())); if (!player.getAbilities().instabuild) { held.shrink(1); } - return InteractionResult.sidedSuccess(level.isClientSide()); } return InteractionResult.PASS; } - public static void insert(@Nullable Entity user, BlockState state, LevelAccessor level, BlockPos pos) { - var newState = state.setValue(LEVEL, state.getValue(LEVEL) + 1); + public static boolean tryInsert(ItemStack stack, @Nullable Player player, BlockState state, Level level, BlockPos pos, boolean simulate) { + int fillLevel = state.getValue(LEVEL); + var food = stack.getFoodProperties(null); + + if (fillLevel < MAX_LEVEL && food != null && food.isMeat()) { + if (!simulate) insert(player, state, level, pos, level.random.nextIntBetweenInclusive(1, 2)); + return true; + } + + return false; + } + + public static void insert(@Nullable Entity user, BlockState state, LevelAccessor level, BlockPos pos, int by) { + var newState = state.setValue(LEVEL, Math.min(READY, state.getValue(LEVEL) + by)); level.setBlock(pos, newState, 3); level.gameEvent(GameEvent.BLOCK_CHANGE, pos, GameEvent.Context.of(user, newState)); + + level.playSound(null, pos, SoundEvents.COMPOSTER_FILL, SoundSource.BLOCKS, 1.0F, 1.0F); } - public static void extract(Entity user, BlockState state, Level level, BlockPos pos) { + public static void extract(@Nullable Entity user, BlockState state, Level level, BlockPos pos) { if (!level.isClientSide()) { Vec3 vec = Vec3.atLowerCornerWithOffset(pos, 0.5, 1.01, 0.5).offsetRandom(level.random, 0.7F); ItemEntity item = new ItemEntity(level, vec.x(), vec.y(), vec.z(), new ItemStack(OBlocks.BONE_PILE.get())); @@ -83,6 +107,10 @@ public static void extract(Entity user, BlockState state, Level level, BlockPos level.addFreshEntity(item); } + clear(user, state, level, pos); + } + + public static void clear(@Nullable Entity user, BlockState state, Level level, BlockPos pos) { var empty = state.setValue(LEVEL, 0); level.setBlockAndUpdate(pos, empty); level.gameEvent(GameEvent.BLOCK_CHANGE, pos, GameEvent.Context.of(user, empty)); @@ -90,6 +118,14 @@ public static void extract(Entity user, BlockState state, Level level, BlockPos level.playSound(null, pos, SoundEvents.COMPOSTER_EMPTY, SoundSource.BLOCKS, 1.0F, 1.0F); } + @Override + public VoxelShape getShape(BlockState state, BlockGetter level, BlockPos pos, CollisionContext context) { + int fillLevel = state.getValue(LEVEL); + if (fillLevel == READY) return SHAPES[0]; + if (fillLevel > MAX_LEVEL) return OUTER_SHAPE; + return SHAPES[fillLevel]; + } + @Override public @Nullable BlockEntity newBlockEntity(BlockPos pos, BlockState state) { return new SepulcherBlockEntity(pos, state); @@ -99,4 +135,5 @@ public static void extract(Entity user, BlockState state, Level level, BlockPos public BlockEntityType getType() { return OBlockEntities.SEPULCHER.get(); } + } diff --git a/src/main/java/galena/oreganized/content/entity/SepulcherBlockEntity.java b/src/main/java/galena/oreganized/content/entity/SepulcherBlockEntity.java index 48aa0108..c3e54170 100644 --- a/src/main/java/galena/oreganized/content/entity/SepulcherBlockEntity.java +++ b/src/main/java/galena/oreganized/content/entity/SepulcherBlockEntity.java @@ -3,10 +3,18 @@ import galena.oreganized.OreganizedConfig; import galena.oreganized.content.block.SepulcherBlock; import galena.oreganized.index.OBlockEntities; +import galena.oreganized.index.OBlocks; import galena.oreganized.index.OTags; +import galena.oreganized.network.OreganizedNetwork; +import galena.oreganized.network.packet.SepulcherConsumesDeathPacket; import net.minecraft.core.BlockPos; +import net.minecraft.core.Direction; +import net.minecraft.core.particles.ParticleTypes; import net.minecraft.nbt.CompoundTag; import net.minecraft.server.level.ServerLevel; +import net.minecraft.world.Container; +import net.minecraft.world.entity.player.Player; +import net.minecraft.world.item.ItemStack; import net.minecraft.world.level.Level; import net.minecraft.world.level.block.entity.BlockEntity; import net.minecraft.world.level.block.state.BlockState; @@ -15,33 +23,48 @@ import net.minecraft.world.level.gameevent.GameEventListener; import net.minecraft.world.level.gameevent.PositionSource; import net.minecraft.world.phys.Vec3; +import net.minecraftforge.common.capabilities.Capability; +import net.minecraftforge.common.capabilities.ForgeCapabilities; +import net.minecraftforge.common.util.LazyOptional; +import net.minecraftforge.items.wrapper.InvWrapper; +import net.minecraftforge.network.PacketDistributor; +import org.jetbrains.annotations.NotNull; -public class SepulcherBlockEntity extends BlockEntity implements Ticking, GameEventListener.Holder { +import java.awt.*; + +public class SepulcherBlockEntity extends BlockEntity implements Ticking, Container, GameEventListener.Holder { private final DeathListener listener; + private LazyOptional itemHandler; private int progress = 0; public SepulcherBlockEntity(BlockPos pos, BlockState state) { super(OBlockEntities.SEPULCHER.get(), pos, state); this.listener = new DeathListener(); + this.itemHandler = createItemHandler(); } - private int progressPerStep() { - return OreganizedConfig.COMMON.sepulcherDuration.get() / SepulcherBlock.ROT_LEVELS; + private int progressNeeded(int fillLevel) { + if (fillLevel == SepulcherBlock.MAX_LEVEL) return 20; + return OreganizedConfig.COMMON.sepulcherDuration.get() / (SepulcherBlock.SEALED_LEVELS - 1); } @Override public void tick(BlockState state, Level level, BlockPos pos) { - if (level.isClientSide()) return; - int fillLevel = state.getValue(SepulcherBlock.LEVEL); if (fillLevel < SepulcherBlock.MAX_LEVEL) return; if (fillLevel == SepulcherBlock.READY) return; - if (++progress < progressPerStep()) return; + if (++progress < progressNeeded(fillLevel)) return; level.setBlockAndUpdate(pos, state.setValue(SepulcherBlock.LEVEL, fillLevel + 1)); progress = 0; + + var effectColor = new Color(8889187); + for (int i = 0; i < 20; i++) { + var vec = Vec3.atBottomCenterOf(pos).add(level.random.nextDouble() - 0.5, 0.8, level.random.nextDouble() - 0.5); + level.addParticle(ParticleTypes.ENTITY_EFFECT, vec.x, vec.y, vec.z, effectColor.getRed() / 255D, effectColor.getGreen() / 255D, effectColor.getBlue() / 255D); + } } @Override @@ -87,12 +110,94 @@ public boolean handleGameEvent(ServerLevel level, GameEvent event, GameEvent.Con var state = getBlockState(); var fillLevel = state.getValue(SepulcherBlock.LEVEL); - if(fillLevel >= SepulcherBlock.MAX_LEVEL) return false; + if (fillLevel >= SepulcherBlock.MAX_LEVEL) return false; + + SepulcherBlock.insert(null, state, level, getBlockPos(), level.random.nextIntBetweenInclusive(3, 4)); - SepulcherBlock.insert(null, state, level, getBlockPos()); + OreganizedNetwork.CHANNEL.send( + PacketDistributor.NEAR.with(PacketDistributor.TargetPoint.p(vec.x, vec.y, vec.z, 16.0, entity.level().dimension())), + new SepulcherConsumesDeathPacket(vec) + ); return true; } } + public void invalidateCaps() { + super.invalidateCaps(); + itemHandler.invalidate(); + } + + public void reviveCaps() { + super.reviveCaps(); + itemHandler = createItemHandler(); + } + + private LazyOptional createItemHandler() { + return LazyOptional.of(() -> new InvWrapper(this)); + } + + @Override + public int getContainerSize() { + return 1; + } + + @Override + public boolean isEmpty() { + var fillLevel = getBlockState().getValue(SepulcherBlock.LEVEL); + return fillLevel < SepulcherBlock.READY; + } + + @Override + public ItemStack getItem(int slot) { + var fillLevel = getBlockState().getValue(SepulcherBlock.LEVEL); + if (fillLevel == SepulcherBlock.READY) return new ItemStack(OBlocks.BONE_PILE.get()); + return ItemStack.EMPTY; + } + + @Override + public ItemStack removeItem(int slot, int count) { + var stack = getItem(slot); + if (!stack.isEmpty()) SepulcherBlock.clear(null, getBlockState(), getLevel(), getBlockPos()); + return stack; + } + + @Override + public ItemStack removeItemNoUpdate(int slot) { + return removeItem(slot, 1); + } + + @Override + public boolean canPlaceItem(int slot, ItemStack stack) { + return SepulcherBlock.tryInsert(stack, null, getBlockState(), getLevel(), getBlockPos(), true); + } + + @Override + public boolean canTakeItem(Container container, int slot, ItemStack stack) { + return getBlockState().getValue(SepulcherBlock.LEVEL) == SepulcherBlock.READY; + } + + @Override + public void setItem(int slot, ItemStack stack) { + SepulcherBlock.tryInsert(stack, null, getBlockState(), getLevel(), getBlockPos(), false); + } + + @Override + public boolean stillValid(Player player) { + return true; + } + + @Override + public void clearContent() { + SepulcherBlock.clear(null, getBlockState(), getLevel(), getBlockPos()); + } + + @Override + public @NotNull LazyOptional getCapability(@NotNull Capability capability, Direction facing) { + if (capability == ForgeCapabilities.ITEM_HANDLER && facing != null && !this.remove) { + return itemHandler.cast(); + } else { + return super.getCapability(capability, facing); + } + } } diff --git a/src/main/java/galena/oreganized/data/OBlockStates.java b/src/main/java/galena/oreganized/data/OBlockStates.java index 03cb3d8d..f34af377 100644 --- a/src/main/java/galena/oreganized/data/OBlockStates.java +++ b/src/main/java/galena/oreganized/data/OBlockStates.java @@ -115,6 +115,7 @@ protected void registerStatesAndModels() { gargoyleBlock(OBlocks.GARGOYLE); sepulcherBlock(OBlocks.SEPULCHER); simpleBlock(OBlocks.BONE_PILE.get(), models().cubeAll(blockTexture(OBlocks.BONE_PILE.get()).getPath(), Oreganized.modLoc("block/sepulcher_rot_5"))); + simpleBlock(OBlocks.ROTTING_FLESH.get(), models().cubeAll(blockTexture(OBlocks.ROTTING_FLESH.get()).getPath(), Oreganized.modLoc("block/sepulcher_rot_1"))); vigilCandle(OBlocks.VIGIL_CANDLE, null); OBlocks.COLORED_VIGIL_CANDLES.forEach((color, block) -> vigilCandle(block, color.getSerializedName())); } diff --git a/src/main/java/galena/oreganized/data/OBlockTags.java b/src/main/java/galena/oreganized/data/OBlockTags.java index 4bcc17a6..1cd48c02 100644 --- a/src/main/java/galena/oreganized/data/OBlockTags.java +++ b/src/main/java/galena/oreganized/data/OBlockTags.java @@ -139,7 +139,10 @@ protected void addTags(HolderLookup.Provider provider) { OBlocks.GROOVED_ICE.get(), OBlocks.GROOVED_PACKED_ICE.get(), - OBlocks.GROOVED_BLUE_ICE.get() + OBlocks.GROOVED_BLUE_ICE.get(), + + OBlocks.SEPULCHER.get(), + OBlocks.BONE_PILE.get() ); var vigilCandles = tag(VIGIL_CANDLES); diff --git a/src/main/java/galena/oreganized/data/OLootTables.java b/src/main/java/galena/oreganized/data/OLootTables.java index 924885ea..6703396b 100644 --- a/src/main/java/galena/oreganized/data/OLootTables.java +++ b/src/main/java/galena/oreganized/data/OLootTables.java @@ -130,6 +130,7 @@ protected void generate() { dropSelf(OBlocks.SEPULCHER); dropSelf(OBlocks.BONE_PILE); + dropNothing(OBlocks.ROTTING_FLESH); OBlocks.vigilCandles().forEach(this::vigilCandle); } diff --git a/src/main/java/galena/oreganized/data/ORecipes.java b/src/main/java/galena/oreganized/data/ORecipes.java index 5a638510..9bda4919 100644 --- a/src/main/java/galena/oreganized/data/ORecipes.java +++ b/src/main/java/galena/oreganized/data/ORecipes.java @@ -253,7 +253,7 @@ protected void buildRecipes(Consumer consumer) { .save(consumer, Oreganized.modLoc("poisonous_potato_from_lead")); compact(OBlocks.LEAD_BOLT_CRATE.get().asItem(), OItems.LEAD_BOLT.get()).save(consumer); - unCompact(OItems.LEAD_BOLT.get(), OBlocks.LEAD_BOLT_CRATE.get().asItem()).save(consumer, Oreganized.modLoc( "lead_bolt_from_crate")); + unCompact(OItems.LEAD_BOLT.get(), OBlocks.LEAD_BOLT_CRATE.get().asItem()).save(consumer, Oreganized.modLoc("lead_bolt_from_crate")); ShapedRecipeBuilder.shaped(RecipeCategory.BUILDING_BLOCKS, OBlocks.LEAD_BULB.get(), 1) .pattern(" I ") @@ -311,6 +311,14 @@ protected void buildRecipes(Consumer consumer) { .save(consumer, RecipeBuilder.getDefaultRecipeId(block.get()).withSuffix("_dyeing")); }); + ShapedRecipeBuilder.shaped(RecipeCategory.DECORATIONS, OBlocks.SEPULCHER.get()) + .pattern("# #") + .pattern("# #") + .pattern("###") + .define('#', OTags.Items.INGOTS_SILVER) + .unlockedBy("has_silver", has(OTags.Items.INGOTS_SILVER)) + .save(consumer); + compact(OBlocks.BONE_PILE.get().asItem(), Items.BONE).save(consumer); unCompact(Items.BONE, OBlocks.BONE_PILE.get().asItem()).save(consumer); } diff --git a/src/main/java/galena/oreganized/data/provider/OBlockStateProvider.java b/src/main/java/galena/oreganized/data/provider/OBlockStateProvider.java index 44635ab1..fd622bab 100644 --- a/src/main/java/galena/oreganized/data/provider/OBlockStateProvider.java +++ b/src/main/java/galena/oreganized/data/provider/OBlockStateProvider.java @@ -380,34 +380,20 @@ public void gargoyleBlock(Supplier block) { }); } - public void sepulcherBlock(Supplier block) { - var builder = getMultipartBuilder(block.get()); - - builder.part() - .modelFile(models().getExistingFile(blockTexture(block.get()))) - .addModel(); - - for (int level = 1; level <= SepulcherBlock.READY; level++) { - var inside = level > SepulcherBlock.MAX_LEVEL - ? Oreganized.modLoc("block/sepulcher_rot_" + (level - SepulcherBlock.MAX_LEVEL + 1)) - : Oreganized.modLoc("block/sepulcher_rot_1"); - - var height = level > SepulcherBlock.MAX_LEVEL ? 15 : 3 + 2 * level; - - var model = models().getBuilder("sepulcher_content_" + level) - .texture("particle", inside) - .texture("inside", inside) - .element() - .from(1, 0, 1 ) - .to(15, height, 15) - .textureAll("#inside") - .end(); + private String sepulcherSuffix(int fillLevel) { + if (fillLevel == 0) return ""; + if (fillLevel > SepulcherBlock.MAX_LEVEL) return "_sealed_" + (fillLevel - SepulcherBlock.MAX_LEVEL); + return "_being_filled_" + fillLevel; + } - builder.part() - .modelFile(model) - .addModel() - .condition(SepulcherBlock.LEVEL, level); - } + public void sepulcherBlock(Supplier block) { + getVariantBuilder(block.get()).forAllStates(state -> { + var fillLevel = state.getValue(SepulcherBlock.LEVEL); + var name = blockTexture(block.get()).withSuffix(sepulcherSuffix(fillLevel)); + return ConfiguredModel.builder() + .modelFile(models().getExistingFile(name)) + .build(); + }); } private String candleSuffix(int amount) { diff --git a/src/main/java/galena/oreganized/index/OBlocks.java b/src/main/java/galena/oreganized/index/OBlocks.java index 743d7d3d..fa28cd77 100644 --- a/src/main/java/galena/oreganized/index/OBlocks.java +++ b/src/main/java/galena/oreganized/index/OBlocks.java @@ -206,7 +206,8 @@ private static BlockBehaviour.Properties leadDecoProperties() { public static final RegistryObject MOLTEN_LEAD_CAULDRON = HELPER.createBlock("molten_lead_cauldron", () -> new MoltenLeadCauldronBlock(BlockBehaviour.Properties.copy(Blocks.LAVA_CAULDRON).randomTicks())); public static final RegistryObject SEPULCHER = register("sepulcher", () -> new SepulcherBlock(BlockBehaviour.Properties.copy(Blocks.CAULDRON))); - public static final RegistryObject BONE_PILE = register("bone_pile", () -> new SepulcherBlock(BlockBehaviour.Properties.copy(Blocks.BONE_BLOCK))); + public static final RegistryObject BONE_PILE = register("bone_pile", () -> new Block(BlockBehaviour.Properties.copy(Blocks.BONE_BLOCK))); + public static final RegistryObject ROTTING_FLESH = HELPER.createBlock("rotting_flesh", () -> new Block(BlockBehaviour.Properties.copy(Blocks.DIRT))); private static final Supplier VIGIL_CANDLE_PROPERTIES = () -> BlockBehaviour.Properties.of().lightLevel(CandleBlock.LIGHT_EMISSION).sound(SoundType.METAL).pushReaction(PushReaction.DESTROY); public static final RegistryObject VIGIL_CANDLE = register("vigil_candle", () -> new VigilCandleBlock(VIGIL_CANDLE_PROPERTIES.get())); diff --git a/src/main/java/galena/oreganized/network/OreganizedNetwork.java b/src/main/java/galena/oreganized/network/OreganizedNetwork.java index b7a2af1a..8a7190a2 100644 --- a/src/main/java/galena/oreganized/network/OreganizedNetwork.java +++ b/src/main/java/galena/oreganized/network/OreganizedNetwork.java @@ -4,6 +4,7 @@ import galena.oreganized.network.packet.DoorPushingPacket; import galena.oreganized.network.packet.GargoyleParticlePacket; import galena.oreganized.network.packet.KineticHitPacket; +import galena.oreganized.network.packet.SepulcherConsumesDeathPacket; import net.minecraftforge.network.NetworkRegistry; import net.minecraftforge.network.simple.SimpleChannel; @@ -22,5 +23,6 @@ public static void register() { CHANNEL.registerMessage(id++, GargoyleParticlePacket.class, GargoyleParticlePacket::write, GargoyleParticlePacket::from, GargoyleParticlePacket::handle); CHANNEL.registerMessage(id++, DoorPushingPacket.class, DoorPushingPacket::write, DoorPushingPacket::from, DoorPushingPacket::handle); CHANNEL.registerMessage(id++, KineticHitPacket.class, KineticHitPacket::write, KineticHitPacket::from, KineticHitPacket::handle); + CHANNEL.registerMessage(id++, SepulcherConsumesDeathPacket.class, SepulcherConsumesDeathPacket::write, SepulcherConsumesDeathPacket::from, SepulcherConsumesDeathPacket::handle); } } diff --git a/src/main/java/galena/oreganized/network/packet/SepulcherConsumesDeathPacket.java b/src/main/java/galena/oreganized/network/packet/SepulcherConsumesDeathPacket.java new file mode 100644 index 00000000..8a1e9685 --- /dev/null +++ b/src/main/java/galena/oreganized/network/packet/SepulcherConsumesDeathPacket.java @@ -0,0 +1,40 @@ +package galena.oreganized.network.packet; + +import galena.oreganized.index.OBlocks; +import net.minecraft.client.Minecraft; +import net.minecraft.client.particle.TerrainParticle; +import net.minecraft.network.FriendlyByteBuf; +import net.minecraft.world.phys.Vec3; +import net.minecraftforge.network.NetworkEvent; + +import java.util.function.Supplier; + +public record SepulcherConsumesDeathPacket(Vec3 at) { + + public void write(FriendlyByteBuf buffer) { + buffer.writeVector3f(at.toVector3f()); + } + + public void handle(Supplier contextSupplier) { + var context = contextSupplier.get(); + context.enqueueWork(() -> { + var level = Minecraft.getInstance().level; + if (level == null) return; + + var particles = Minecraft.getInstance().particleEngine; + var state = OBlocks.ROTTING_FLESH.get().defaultBlockState(); + for (int i = 0; i < 20; i++) { + var vec = at.add(level.random.nextDouble() - 0.5, level.random.nextDouble() * 2, level.random.nextDouble() - 0.5); + particles.add(new TerrainParticle(level, vec.x, vec.y, vec.z, 0.0, 0.0, 0.0, state)); + } + }); + + context.setPacketHandled(true); + } + + public static SepulcherConsumesDeathPacket from(FriendlyByteBuf buffer) { + var at = new Vec3(buffer.readVector3f()); + return new SepulcherConsumesDeathPacket(at); + } + +} From 4b9ae073b201bd41100445ffbef5e93e236dfd1e Mon Sep 17 00:00:00 2001 From: Niklas Widmann Date: Thu, 24 Oct 2024 14:28:05 +0200 Subject: [PATCH 08/11] campfire sepulcher heating and vigil candle fixes --- .../002701d48eee4c36b62b24b011e74b0624793d05 | 172 ++++++++++++++++-- .../5bb646c3cee204f41a1b59a2c0d9083b5f7155b0 | 5 +- .../blockstates/black_vigil_candle.json | 40 +++- .../blockstates/blue_vigil_candle.json | 40 +++- .../blockstates/brown_vigil_candle.json | 40 +++- .../blockstates/cyan_vigil_candle.json | 40 +++- .../blockstates/gray_vigil_candle.json | 40 +++- .../blockstates/green_vigil_candle.json | 40 +++- .../blockstates/light_blue_vigil_candle.json | 40 +++- .../blockstates/light_gray_vigil_candle.json | 40 +++- .../blockstates/lime_vigil_candle.json | 40 +++- .../blockstates/magenta_vigil_candle.json | 40 +++- .../blockstates/orange_vigil_candle.json | 40 +++- .../blockstates/pink_vigil_candle.json | 40 +++- .../blockstates/purple_vigil_candle.json | 40 +++- .../blockstates/red_vigil_candle.json | 40 +++- .../oreganized/blockstates/vigil_candle.json | 40 +++- .../blockstates/white_vigil_candle.json | 40 +++- .../blockstates/yellow_vigil_candle.json | 40 +++- ...black_vigil_candle_double_ceiling_lit.json | 6 + .../block/black_vigil_candle_double_lit.json | 6 + ...ck_vigil_candle_quadruple_ceiling_lit.json | 6 + .../black_vigil_candle_quadruple_lit.json | 6 + ...black_vigil_candle_single_ceiling_lit.json | 6 + .../block/black_vigil_candle_single_lit.json | 6 + ...black_vigil_candle_triple_ceiling_lit.json | 6 + .../block/black_vigil_candle_triple_lit.json | 6 + .../blue_vigil_candle_double_ceiling_lit.json | 6 + .../block/blue_vigil_candle_double_lit.json | 6 + ...ue_vigil_candle_quadruple_ceiling_lit.json | 6 + .../blue_vigil_candle_quadruple_lit.json | 6 + .../blue_vigil_candle_single_ceiling_lit.json | 6 + .../block/blue_vigil_candle_single_lit.json | 6 + .../blue_vigil_candle_triple_ceiling_lit.json | 6 + .../block/blue_vigil_candle_triple_lit.json | 6 + ...brown_vigil_candle_double_ceiling_lit.json | 6 + .../block/brown_vigil_candle_double_lit.json | 6 + ...wn_vigil_candle_quadruple_ceiling_lit.json | 6 + .../brown_vigil_candle_quadruple_lit.json | 6 + ...brown_vigil_candle_single_ceiling_lit.json | 6 + .../block/brown_vigil_candle_single_lit.json | 6 + ...brown_vigil_candle_triple_ceiling_lit.json | 6 + .../block/brown_vigil_candle_triple_lit.json | 6 + .../cyan_vigil_candle_double_ceiling_lit.json | 6 + .../block/cyan_vigil_candle_double_lit.json | 6 + ...an_vigil_candle_quadruple_ceiling_lit.json | 6 + .../cyan_vigil_candle_quadruple_lit.json | 6 + .../cyan_vigil_candle_single_ceiling_lit.json | 6 + .../block/cyan_vigil_candle_single_lit.json | 6 + .../cyan_vigil_candle_triple_ceiling_lit.json | 6 + .../block/cyan_vigil_candle_triple_lit.json | 6 + ...efaultvigil_candle_double_ceiling_lit.json | 6 + .../block/defaultvigil_candle_double_lit.json | 6 + ...ultvigil_candle_quadruple_ceiling_lit.json | 6 + .../defaultvigil_candle_quadruple_lit.json | 6 + ...efaultvigil_candle_single_ceiling_lit.json | 6 + .../block/defaultvigil_candle_single_lit.json | 6 + ...efaultvigil_candle_triple_ceiling_lit.json | 6 + .../block/defaultvigil_candle_triple_lit.json | 6 + .../gray_vigil_candle_double_ceiling_lit.json | 6 + .../block/gray_vigil_candle_double_lit.json | 6 + ...ay_vigil_candle_quadruple_ceiling_lit.json | 6 + .../gray_vigil_candle_quadruple_lit.json | 6 + .../gray_vigil_candle_single_ceiling_lit.json | 6 + .../block/gray_vigil_candle_single_lit.json | 6 + .../gray_vigil_candle_triple_ceiling_lit.json | 6 + .../block/gray_vigil_candle_triple_lit.json | 6 + ...green_vigil_candle_double_ceiling_lit.json | 6 + .../block/green_vigil_candle_double_lit.json | 6 + ...en_vigil_candle_quadruple_ceiling_lit.json | 6 + .../green_vigil_candle_quadruple_lit.json | 6 + ...green_vigil_candle_single_ceiling_lit.json | 6 + .../block/green_vigil_candle_single_lit.json | 6 + ...green_vigil_candle_triple_ceiling_lit.json | 6 + .../block/green_vigil_candle_triple_lit.json | 6 + ..._blue_vigil_candle_double_ceiling_lit.json | 6 + .../light_blue_vigil_candle_double_lit.json | 6 + ...ue_vigil_candle_quadruple_ceiling_lit.json | 6 + ...light_blue_vigil_candle_quadruple_lit.json | 6 + ..._blue_vigil_candle_single_ceiling_lit.json | 6 + .../light_blue_vigil_candle_single_lit.json | 6 + ..._blue_vigil_candle_triple_ceiling_lit.json | 6 + .../light_blue_vigil_candle_triple_lit.json | 6 + ..._gray_vigil_candle_double_ceiling_lit.json | 6 + .../light_gray_vigil_candle_double_lit.json | 6 + ...ay_vigil_candle_quadruple_ceiling_lit.json | 6 + ...light_gray_vigil_candle_quadruple_lit.json | 6 + ..._gray_vigil_candle_single_ceiling_lit.json | 6 + .../light_gray_vigil_candle_single_lit.json | 6 + ..._gray_vigil_candle_triple_ceiling_lit.json | 6 + .../light_gray_vigil_candle_triple_lit.json | 6 + .../lime_vigil_candle_double_ceiling_lit.json | 6 + .../block/lime_vigil_candle_double_lit.json | 6 + ...me_vigil_candle_quadruple_ceiling_lit.json | 6 + .../lime_vigil_candle_quadruple_lit.json | 6 + .../lime_vigil_candle_single_ceiling_lit.json | 6 + .../block/lime_vigil_candle_single_lit.json | 6 + .../lime_vigil_candle_triple_ceiling_lit.json | 6 + .../block/lime_vigil_candle_triple_lit.json | 6 + ...genta_vigil_candle_double_ceiling_lit.json | 6 + .../magenta_vigil_candle_double_lit.json | 6 + ...ta_vigil_candle_quadruple_ceiling_lit.json | 6 + .../magenta_vigil_candle_quadruple_lit.json | 6 + ...genta_vigil_candle_single_ceiling_lit.json | 6 + .../magenta_vigil_candle_single_lit.json | 6 + ...genta_vigil_candle_triple_ceiling_lit.json | 6 + .../magenta_vigil_candle_triple_lit.json | 6 + ...range_vigil_candle_double_ceiling_lit.json | 6 + .../block/orange_vigil_candle_double_lit.json | 6 + ...ge_vigil_candle_quadruple_ceiling_lit.json | 6 + .../orange_vigil_candle_quadruple_lit.json | 6 + ...range_vigil_candle_single_ceiling_lit.json | 6 + .../block/orange_vigil_candle_single_lit.json | 6 + ...range_vigil_candle_triple_ceiling_lit.json | 6 + .../block/orange_vigil_candle_triple_lit.json | 6 + .../pink_vigil_candle_double_ceiling_lit.json | 6 + .../block/pink_vigil_candle_double_lit.json | 6 + ...nk_vigil_candle_quadruple_ceiling_lit.json | 6 + .../pink_vigil_candle_quadruple_lit.json | 6 + .../pink_vigil_candle_single_ceiling_lit.json | 6 + .../block/pink_vigil_candle_single_lit.json | 6 + .../pink_vigil_candle_triple_ceiling_lit.json | 6 + .../block/pink_vigil_candle_triple_lit.json | 6 + ...urple_vigil_candle_double_ceiling_lit.json | 6 + .../block/purple_vigil_candle_double_lit.json | 6 + ...le_vigil_candle_quadruple_ceiling_lit.json | 6 + .../purple_vigil_candle_quadruple_lit.json | 6 + ...urple_vigil_candle_single_ceiling_lit.json | 6 + .../block/purple_vigil_candle_single_lit.json | 6 + ...urple_vigil_candle_triple_ceiling_lit.json | 6 + .../block/purple_vigil_candle_triple_lit.json | 6 + .../red_vigil_candle_double_ceiling_lit.json | 6 + .../block/red_vigil_candle_double_lit.json | 6 + ...ed_vigil_candle_quadruple_ceiling_lit.json | 6 + .../block/red_vigil_candle_quadruple_lit.json | 6 + .../red_vigil_candle_single_ceiling_lit.json | 6 + .../block/red_vigil_candle_single_lit.json | 6 + .../red_vigil_candle_triple_ceiling_lit.json | 6 + .../block/red_vigil_candle_triple_lit.json | 6 + ...white_vigil_candle_double_ceiling_lit.json | 6 + .../block/white_vigil_candle_double_lit.json | 6 + ...te_vigil_candle_quadruple_ceiling_lit.json | 6 + .../white_vigil_candle_quadruple_lit.json | 6 + ...white_vigil_candle_single_ceiling_lit.json | 6 + .../block/white_vigil_candle_single_lit.json | 6 + ...white_vigil_candle_triple_ceiling_lit.json | 6 + .../block/white_vigil_candle_triple_lit.json | 6 + ...ellow_vigil_candle_double_ceiling_lit.json | 6 + .../block/yellow_vigil_candle_double_lit.json | 6 + ...ow_vigil_candle_quadruple_ceiling_lit.json | 6 + .../yellow_vigil_candle_quadruple_lit.json | 6 + ...ellow_vigil_candle_single_ceiling_lit.json | 6 + .../block/yellow_vigil_candle_single_lit.json | 6 + ...ellow_vigil_candle_triple_ceiling_lit.json | 6 + .../block/yellow_vigil_candle_triple_lit.json | 6 + .../oreganized/tags/blocks/heat_source.json | 5 + .../oreganized/tags/blocks/vigil_candles.json | 24 +-- .../content/block/VigilCandleBlock.java | 2 + .../content/entity/SepulcherBlockEntity.java | 30 ++- .../galena/oreganized/data/OBlockTags.java | 3 + .../data/provider/OBlockStateProvider.java | 10 +- .../java/galena/oreganized/index/OTags.java | 1 + .../block/black_vigil_candle_lit.png.mcmeta | 6 + .../block/blue_vigil_candle_lit.png.mcmeta | 6 + .../block/brown_vigil_candle_lit.png.mcmeta | 6 + .../block/cyan_vigil_candle_lit.png.mcmeta | 6 + .../block/gray_vigil_candle_lit.png.mcmeta | 6 + .../block/green_vigil_candle_lit.png.mcmeta | 6 + .../light_blue_vigil_candle_lit.png.mcmeta | 6 + .../light_gray_vigil_candle_lit.png.mcmeta | 6 + .../block/lime_vigil_candle_lit.png.mcmeta | 6 + .../block/magenta_vigil_candle_lit.png.mcmeta | 6 + .../block/orange_vigil_candle_lit.png.mcmeta | 6 + .../block/pink_vigil_candle_lit.png.mcmeta | 6 + .../block/purple_vigil_candle_lit.png.mcmeta | 6 + .../block/red_vigil_candle_lit.png.mcmeta | 6 + .../block/vigil_candle_lit.png.mcmeta | 6 + .../block/white_vigil_candle_lit.png.mcmeta | 6 + .../block/yellow_vigil_candle_lit.png.mcmeta | 6 + 179 files changed, 1676 insertions(+), 174 deletions(-) create mode 100644 src/generated/resources/assets/oreganized/models/block/black_vigil_candle_double_ceiling_lit.json create mode 100644 src/generated/resources/assets/oreganized/models/block/black_vigil_candle_double_lit.json create mode 100644 src/generated/resources/assets/oreganized/models/block/black_vigil_candle_quadruple_ceiling_lit.json create mode 100644 src/generated/resources/assets/oreganized/models/block/black_vigil_candle_quadruple_lit.json create mode 100644 src/generated/resources/assets/oreganized/models/block/black_vigil_candle_single_ceiling_lit.json create mode 100644 src/generated/resources/assets/oreganized/models/block/black_vigil_candle_single_lit.json create mode 100644 src/generated/resources/assets/oreganized/models/block/black_vigil_candle_triple_ceiling_lit.json create mode 100644 src/generated/resources/assets/oreganized/models/block/black_vigil_candle_triple_lit.json create mode 100644 src/generated/resources/assets/oreganized/models/block/blue_vigil_candle_double_ceiling_lit.json create mode 100644 src/generated/resources/assets/oreganized/models/block/blue_vigil_candle_double_lit.json create mode 100644 src/generated/resources/assets/oreganized/models/block/blue_vigil_candle_quadruple_ceiling_lit.json create mode 100644 src/generated/resources/assets/oreganized/models/block/blue_vigil_candle_quadruple_lit.json create mode 100644 src/generated/resources/assets/oreganized/models/block/blue_vigil_candle_single_ceiling_lit.json create mode 100644 src/generated/resources/assets/oreganized/models/block/blue_vigil_candle_single_lit.json create mode 100644 src/generated/resources/assets/oreganized/models/block/blue_vigil_candle_triple_ceiling_lit.json create mode 100644 src/generated/resources/assets/oreganized/models/block/blue_vigil_candle_triple_lit.json create mode 100644 src/generated/resources/assets/oreganized/models/block/brown_vigil_candle_double_ceiling_lit.json create mode 100644 src/generated/resources/assets/oreganized/models/block/brown_vigil_candle_double_lit.json create mode 100644 src/generated/resources/assets/oreganized/models/block/brown_vigil_candle_quadruple_ceiling_lit.json create mode 100644 src/generated/resources/assets/oreganized/models/block/brown_vigil_candle_quadruple_lit.json create mode 100644 src/generated/resources/assets/oreganized/models/block/brown_vigil_candle_single_ceiling_lit.json create mode 100644 src/generated/resources/assets/oreganized/models/block/brown_vigil_candle_single_lit.json create mode 100644 src/generated/resources/assets/oreganized/models/block/brown_vigil_candle_triple_ceiling_lit.json create mode 100644 src/generated/resources/assets/oreganized/models/block/brown_vigil_candle_triple_lit.json create mode 100644 src/generated/resources/assets/oreganized/models/block/cyan_vigil_candle_double_ceiling_lit.json create mode 100644 src/generated/resources/assets/oreganized/models/block/cyan_vigil_candle_double_lit.json create mode 100644 src/generated/resources/assets/oreganized/models/block/cyan_vigil_candle_quadruple_ceiling_lit.json create mode 100644 src/generated/resources/assets/oreganized/models/block/cyan_vigil_candle_quadruple_lit.json create mode 100644 src/generated/resources/assets/oreganized/models/block/cyan_vigil_candle_single_ceiling_lit.json create mode 100644 src/generated/resources/assets/oreganized/models/block/cyan_vigil_candle_single_lit.json create mode 100644 src/generated/resources/assets/oreganized/models/block/cyan_vigil_candle_triple_ceiling_lit.json create mode 100644 src/generated/resources/assets/oreganized/models/block/cyan_vigil_candle_triple_lit.json create mode 100644 src/generated/resources/assets/oreganized/models/block/defaultvigil_candle_double_ceiling_lit.json create mode 100644 src/generated/resources/assets/oreganized/models/block/defaultvigil_candle_double_lit.json create mode 100644 src/generated/resources/assets/oreganized/models/block/defaultvigil_candle_quadruple_ceiling_lit.json create mode 100644 src/generated/resources/assets/oreganized/models/block/defaultvigil_candle_quadruple_lit.json create mode 100644 src/generated/resources/assets/oreganized/models/block/defaultvigil_candle_single_ceiling_lit.json create mode 100644 src/generated/resources/assets/oreganized/models/block/defaultvigil_candle_single_lit.json create mode 100644 src/generated/resources/assets/oreganized/models/block/defaultvigil_candle_triple_ceiling_lit.json create mode 100644 src/generated/resources/assets/oreganized/models/block/defaultvigil_candle_triple_lit.json create mode 100644 src/generated/resources/assets/oreganized/models/block/gray_vigil_candle_double_ceiling_lit.json create mode 100644 src/generated/resources/assets/oreganized/models/block/gray_vigil_candle_double_lit.json create mode 100644 src/generated/resources/assets/oreganized/models/block/gray_vigil_candle_quadruple_ceiling_lit.json create mode 100644 src/generated/resources/assets/oreganized/models/block/gray_vigil_candle_quadruple_lit.json create mode 100644 src/generated/resources/assets/oreganized/models/block/gray_vigil_candle_single_ceiling_lit.json create mode 100644 src/generated/resources/assets/oreganized/models/block/gray_vigil_candle_single_lit.json create mode 100644 src/generated/resources/assets/oreganized/models/block/gray_vigil_candle_triple_ceiling_lit.json create mode 100644 src/generated/resources/assets/oreganized/models/block/gray_vigil_candle_triple_lit.json create mode 100644 src/generated/resources/assets/oreganized/models/block/green_vigil_candle_double_ceiling_lit.json create mode 100644 src/generated/resources/assets/oreganized/models/block/green_vigil_candle_double_lit.json create mode 100644 src/generated/resources/assets/oreganized/models/block/green_vigil_candle_quadruple_ceiling_lit.json create mode 100644 src/generated/resources/assets/oreganized/models/block/green_vigil_candle_quadruple_lit.json create mode 100644 src/generated/resources/assets/oreganized/models/block/green_vigil_candle_single_ceiling_lit.json create mode 100644 src/generated/resources/assets/oreganized/models/block/green_vigil_candle_single_lit.json create mode 100644 src/generated/resources/assets/oreganized/models/block/green_vigil_candle_triple_ceiling_lit.json create mode 100644 src/generated/resources/assets/oreganized/models/block/green_vigil_candle_triple_lit.json create mode 100644 src/generated/resources/assets/oreganized/models/block/light_blue_vigil_candle_double_ceiling_lit.json create mode 100644 src/generated/resources/assets/oreganized/models/block/light_blue_vigil_candle_double_lit.json create mode 100644 src/generated/resources/assets/oreganized/models/block/light_blue_vigil_candle_quadruple_ceiling_lit.json create mode 100644 src/generated/resources/assets/oreganized/models/block/light_blue_vigil_candle_quadruple_lit.json create mode 100644 src/generated/resources/assets/oreganized/models/block/light_blue_vigil_candle_single_ceiling_lit.json create mode 100644 src/generated/resources/assets/oreganized/models/block/light_blue_vigil_candle_single_lit.json create mode 100644 src/generated/resources/assets/oreganized/models/block/light_blue_vigil_candle_triple_ceiling_lit.json create mode 100644 src/generated/resources/assets/oreganized/models/block/light_blue_vigil_candle_triple_lit.json create mode 100644 src/generated/resources/assets/oreganized/models/block/light_gray_vigil_candle_double_ceiling_lit.json create mode 100644 src/generated/resources/assets/oreganized/models/block/light_gray_vigil_candle_double_lit.json create mode 100644 src/generated/resources/assets/oreganized/models/block/light_gray_vigil_candle_quadruple_ceiling_lit.json create mode 100644 src/generated/resources/assets/oreganized/models/block/light_gray_vigil_candle_quadruple_lit.json create mode 100644 src/generated/resources/assets/oreganized/models/block/light_gray_vigil_candle_single_ceiling_lit.json create mode 100644 src/generated/resources/assets/oreganized/models/block/light_gray_vigil_candle_single_lit.json create mode 100644 src/generated/resources/assets/oreganized/models/block/light_gray_vigil_candle_triple_ceiling_lit.json create mode 100644 src/generated/resources/assets/oreganized/models/block/light_gray_vigil_candle_triple_lit.json create mode 100644 src/generated/resources/assets/oreganized/models/block/lime_vigil_candle_double_ceiling_lit.json create mode 100644 src/generated/resources/assets/oreganized/models/block/lime_vigil_candle_double_lit.json create mode 100644 src/generated/resources/assets/oreganized/models/block/lime_vigil_candle_quadruple_ceiling_lit.json create mode 100644 src/generated/resources/assets/oreganized/models/block/lime_vigil_candle_quadruple_lit.json create mode 100644 src/generated/resources/assets/oreganized/models/block/lime_vigil_candle_single_ceiling_lit.json create mode 100644 src/generated/resources/assets/oreganized/models/block/lime_vigil_candle_single_lit.json create mode 100644 src/generated/resources/assets/oreganized/models/block/lime_vigil_candle_triple_ceiling_lit.json create mode 100644 src/generated/resources/assets/oreganized/models/block/lime_vigil_candle_triple_lit.json create mode 100644 src/generated/resources/assets/oreganized/models/block/magenta_vigil_candle_double_ceiling_lit.json create mode 100644 src/generated/resources/assets/oreganized/models/block/magenta_vigil_candle_double_lit.json create mode 100644 src/generated/resources/assets/oreganized/models/block/magenta_vigil_candle_quadruple_ceiling_lit.json create mode 100644 src/generated/resources/assets/oreganized/models/block/magenta_vigil_candle_quadruple_lit.json create mode 100644 src/generated/resources/assets/oreganized/models/block/magenta_vigil_candle_single_ceiling_lit.json create mode 100644 src/generated/resources/assets/oreganized/models/block/magenta_vigil_candle_single_lit.json create mode 100644 src/generated/resources/assets/oreganized/models/block/magenta_vigil_candle_triple_ceiling_lit.json create mode 100644 src/generated/resources/assets/oreganized/models/block/magenta_vigil_candle_triple_lit.json create mode 100644 src/generated/resources/assets/oreganized/models/block/orange_vigil_candle_double_ceiling_lit.json create mode 100644 src/generated/resources/assets/oreganized/models/block/orange_vigil_candle_double_lit.json create mode 100644 src/generated/resources/assets/oreganized/models/block/orange_vigil_candle_quadruple_ceiling_lit.json create mode 100644 src/generated/resources/assets/oreganized/models/block/orange_vigil_candle_quadruple_lit.json create mode 100644 src/generated/resources/assets/oreganized/models/block/orange_vigil_candle_single_ceiling_lit.json create mode 100644 src/generated/resources/assets/oreganized/models/block/orange_vigil_candle_single_lit.json create mode 100644 src/generated/resources/assets/oreganized/models/block/orange_vigil_candle_triple_ceiling_lit.json create mode 100644 src/generated/resources/assets/oreganized/models/block/orange_vigil_candle_triple_lit.json create mode 100644 src/generated/resources/assets/oreganized/models/block/pink_vigil_candle_double_ceiling_lit.json create mode 100644 src/generated/resources/assets/oreganized/models/block/pink_vigil_candle_double_lit.json create mode 100644 src/generated/resources/assets/oreganized/models/block/pink_vigil_candle_quadruple_ceiling_lit.json create mode 100644 src/generated/resources/assets/oreganized/models/block/pink_vigil_candle_quadruple_lit.json create mode 100644 src/generated/resources/assets/oreganized/models/block/pink_vigil_candle_single_ceiling_lit.json create mode 100644 src/generated/resources/assets/oreganized/models/block/pink_vigil_candle_single_lit.json create mode 100644 src/generated/resources/assets/oreganized/models/block/pink_vigil_candle_triple_ceiling_lit.json create mode 100644 src/generated/resources/assets/oreganized/models/block/pink_vigil_candle_triple_lit.json create mode 100644 src/generated/resources/assets/oreganized/models/block/purple_vigil_candle_double_ceiling_lit.json create mode 100644 src/generated/resources/assets/oreganized/models/block/purple_vigil_candle_double_lit.json create mode 100644 src/generated/resources/assets/oreganized/models/block/purple_vigil_candle_quadruple_ceiling_lit.json create mode 100644 src/generated/resources/assets/oreganized/models/block/purple_vigil_candle_quadruple_lit.json create mode 100644 src/generated/resources/assets/oreganized/models/block/purple_vigil_candle_single_ceiling_lit.json create mode 100644 src/generated/resources/assets/oreganized/models/block/purple_vigil_candle_single_lit.json create mode 100644 src/generated/resources/assets/oreganized/models/block/purple_vigil_candle_triple_ceiling_lit.json create mode 100644 src/generated/resources/assets/oreganized/models/block/purple_vigil_candle_triple_lit.json create mode 100644 src/generated/resources/assets/oreganized/models/block/red_vigil_candle_double_ceiling_lit.json create mode 100644 src/generated/resources/assets/oreganized/models/block/red_vigil_candle_double_lit.json create mode 100644 src/generated/resources/assets/oreganized/models/block/red_vigil_candle_quadruple_ceiling_lit.json create mode 100644 src/generated/resources/assets/oreganized/models/block/red_vigil_candle_quadruple_lit.json create mode 100644 src/generated/resources/assets/oreganized/models/block/red_vigil_candle_single_ceiling_lit.json create mode 100644 src/generated/resources/assets/oreganized/models/block/red_vigil_candle_single_lit.json create mode 100644 src/generated/resources/assets/oreganized/models/block/red_vigil_candle_triple_ceiling_lit.json create mode 100644 src/generated/resources/assets/oreganized/models/block/red_vigil_candle_triple_lit.json create mode 100644 src/generated/resources/assets/oreganized/models/block/white_vigil_candle_double_ceiling_lit.json create mode 100644 src/generated/resources/assets/oreganized/models/block/white_vigil_candle_double_lit.json create mode 100644 src/generated/resources/assets/oreganized/models/block/white_vigil_candle_quadruple_ceiling_lit.json create mode 100644 src/generated/resources/assets/oreganized/models/block/white_vigil_candle_quadruple_lit.json create mode 100644 src/generated/resources/assets/oreganized/models/block/white_vigil_candle_single_ceiling_lit.json create mode 100644 src/generated/resources/assets/oreganized/models/block/white_vigil_candle_single_lit.json create mode 100644 src/generated/resources/assets/oreganized/models/block/white_vigil_candle_triple_ceiling_lit.json create mode 100644 src/generated/resources/assets/oreganized/models/block/white_vigil_candle_triple_lit.json create mode 100644 src/generated/resources/assets/oreganized/models/block/yellow_vigil_candle_double_ceiling_lit.json create mode 100644 src/generated/resources/assets/oreganized/models/block/yellow_vigil_candle_double_lit.json create mode 100644 src/generated/resources/assets/oreganized/models/block/yellow_vigil_candle_quadruple_ceiling_lit.json create mode 100644 src/generated/resources/assets/oreganized/models/block/yellow_vigil_candle_quadruple_lit.json create mode 100644 src/generated/resources/assets/oreganized/models/block/yellow_vigil_candle_single_ceiling_lit.json create mode 100644 src/generated/resources/assets/oreganized/models/block/yellow_vigil_candle_single_lit.json create mode 100644 src/generated/resources/assets/oreganized/models/block/yellow_vigil_candle_triple_ceiling_lit.json create mode 100644 src/generated/resources/assets/oreganized/models/block/yellow_vigil_candle_triple_lit.json create mode 100644 src/generated/resources/data/oreganized/tags/blocks/heat_source.json create mode 100644 src/main/resources/assets/oreganized/textures/block/black_vigil_candle_lit.png.mcmeta create mode 100644 src/main/resources/assets/oreganized/textures/block/blue_vigil_candle_lit.png.mcmeta create mode 100644 src/main/resources/assets/oreganized/textures/block/brown_vigil_candle_lit.png.mcmeta create mode 100644 src/main/resources/assets/oreganized/textures/block/cyan_vigil_candle_lit.png.mcmeta create mode 100644 src/main/resources/assets/oreganized/textures/block/gray_vigil_candle_lit.png.mcmeta create mode 100644 src/main/resources/assets/oreganized/textures/block/green_vigil_candle_lit.png.mcmeta create mode 100644 src/main/resources/assets/oreganized/textures/block/light_blue_vigil_candle_lit.png.mcmeta create mode 100644 src/main/resources/assets/oreganized/textures/block/light_gray_vigil_candle_lit.png.mcmeta create mode 100644 src/main/resources/assets/oreganized/textures/block/lime_vigil_candle_lit.png.mcmeta create mode 100644 src/main/resources/assets/oreganized/textures/block/magenta_vigil_candle_lit.png.mcmeta create mode 100644 src/main/resources/assets/oreganized/textures/block/orange_vigil_candle_lit.png.mcmeta create mode 100644 src/main/resources/assets/oreganized/textures/block/pink_vigil_candle_lit.png.mcmeta create mode 100644 src/main/resources/assets/oreganized/textures/block/purple_vigil_candle_lit.png.mcmeta create mode 100644 src/main/resources/assets/oreganized/textures/block/red_vigil_candle_lit.png.mcmeta create mode 100644 src/main/resources/assets/oreganized/textures/block/vigil_candle_lit.png.mcmeta create mode 100644 src/main/resources/assets/oreganized/textures/block/white_vigil_candle_lit.png.mcmeta create mode 100644 src/main/resources/assets/oreganized/textures/block/yellow_vigil_candle_lit.png.mcmeta diff --git a/src/generated/resources/.cache/002701d48eee4c36b62b24b011e74b0624793d05 b/src/generated/resources/.cache/002701d48eee4c36b62b24b011e74b0624793d05 index f4c99166..3c85bcb4 100644 --- a/src/generated/resources/.cache/002701d48eee4c36b62b24b011e74b0624793d05 +++ b/src/generated/resources/.cache/002701d48eee4c36b62b24b011e74b0624793d05 @@ -1,19 +1,19 @@ -// 1.20.1 2024-10-23T00:13:26.2607736 oreganized Block States +// 1.20.1 2024-10-24T14:16:29.4433161 oreganized Block States d85b0fb9e5cad1d9c4f22ed192b0fa621ee3373c assets/oreganized/blockstates/black_crystal_glass.json 05bb006ff7f48557fe5c5333bc120f7206052717 assets/oreganized/blockstates/black_crystal_glass_pane.json -dfd0c1bf50927d51a16ab9bf7c8ab2e2cb083998 assets/oreganized/blockstates/black_vigil_candle.json +5de0c522692198c3b8b01df17d8952035b80c8d9 assets/oreganized/blockstates/black_vigil_candle.json 5e5002e9c77ee7221425eeacce8834af484db877 assets/oreganized/blockstates/blue_crystal_glass.json 7e852e66ced2113bbad988b38469db326e88495c assets/oreganized/blockstates/blue_crystal_glass_pane.json -56fb90326ebe2d84b9ca372a806ce150c05792a0 assets/oreganized/blockstates/blue_vigil_candle.json +28bcb96bd4f55f8e42e0362e6f2f880d7abc24ce assets/oreganized/blockstates/blue_vigil_candle.json 954bb81539b55a5fd035c92f6a9ae1a20eebc010 assets/oreganized/blockstates/bone_pile.json 8f4bdde9fa05052630cd12fb4da9889024377adf assets/oreganized/blockstates/brown_crystal_glass.json d59afe9c89ba1e614ce5943fdc8aa3d450585560 assets/oreganized/blockstates/brown_crystal_glass_pane.json -962520caaced7a64c57776c7e246158d2ad43174 assets/oreganized/blockstates/brown_vigil_candle.json +17e53257c89e754a0e69726cf9311f2c682f3470 assets/oreganized/blockstates/brown_vigil_candle.json 3c5c1979dfdd7174c48384591f2628f19f75fad1 assets/oreganized/blockstates/chiseled_glance.json 40088e383637c88f443a53fbafce9ade2ca40ddd assets/oreganized/blockstates/cut_lead.json 493ed64157b69a2cd174f244e50d75ccec5b7531 assets/oreganized/blockstates/cyan_crystal_glass.json c1a188e052dc339804e5a201559b11fb8b43fec4 assets/oreganized/blockstates/cyan_crystal_glass_pane.json -55339cbe4204b859647ba328efa46585cfc435f2 assets/oreganized/blockstates/cyan_vigil_candle.json +d8fbe11591dde2833c3456a0d584d3a708a4c838 assets/oreganized/blockstates/cyan_vigil_candle.json 8b7ca6fbce4b9d9e566adde74d2c27386cd1bdf8 assets/oreganized/blockstates/deepslate_lead_ore.json 91256f551a38187fc36c676586147444a26b6ef5 assets/oreganized/blockstates/deepslate_silver_ore.json f0b8760d1a59408e5a3e68a4ad55e45c0601c07b assets/oreganized/blockstates/electrum_block.json @@ -28,10 +28,10 @@ c1e90c9548de4808e0903a7e18f9ff83ca476d28 assets/oreganized/blockstates/gargoyle. d9cf1c07d030b2f6303c81035e0037cb0c7c660e assets/oreganized/blockstates/glance_wall.json 9ea9fa8ac2f43c1effc054ea90d94cd083d1eba9 assets/oreganized/blockstates/gray_crystal_glass.json c72a5228ef929553df57844bee603f560e737100 assets/oreganized/blockstates/gray_crystal_glass_pane.json -0dca05c5d4b481a46b405c98b778477344a1b8ea assets/oreganized/blockstates/gray_vigil_candle.json +b4bc2e7b99fe5c04f5f83f7ddf1ab21ab1aff915 assets/oreganized/blockstates/gray_vigil_candle.json 8e259fefeef23ef07a4f72a5a22c47b99d65859f assets/oreganized/blockstates/green_crystal_glass.json 0f0f5654a1123c1bfa032e813f1f6cff21ec1dcb assets/oreganized/blockstates/green_crystal_glass_pane.json -e903ff61cb4b1ec9cb1df98a6ccdc6b12e5af0b2 assets/oreganized/blockstates/green_vigil_candle.json +96673948dc0033e506efa232b0ed211d7c8dd665 assets/oreganized/blockstates/green_vigil_candle.json 381580fe541332a18ae1a9efa69fb53201b66140 assets/oreganized/blockstates/grooved_blue_ice.json cd524e91f5482d84fea6e9352cdffb3d3ad1ec23 assets/oreganized/blockstates/grooved_ice.json fcaefc29cf8c2a1dc8707623a2148406e2df6df3 assets/oreganized/blockstates/grooved_packed_ice.json @@ -46,41 +46,41 @@ ac3dc34ee50ebc5c1ef49b1d5200bbcce6989806 assets/oreganized/blockstates/lead_bric 39bd9f24578399b63a72fa4938ce7fa061210992 assets/oreganized/blockstates/lead_trapdoor.json 13efbf997fc6c5f35827f6f3404fd41e0ef41e02 assets/oreganized/blockstates/light_blue_crystal_glass.json 2d73359fc7425188d9a469e5b9898322e1d2c457 assets/oreganized/blockstates/light_blue_crystal_glass_pane.json -b7356ff1ab248b4869851fa9d99c2ad0c0eadacc assets/oreganized/blockstates/light_blue_vigil_candle.json +af64ea823fe1e280b4904a2a06684374968e0c34 assets/oreganized/blockstates/light_blue_vigil_candle.json 27037bd6b3df11e3e08590d443f0c6eddf2095a2 assets/oreganized/blockstates/light_gray_crystal_glass.json 5e45ef9bf2d6081d6b736933e1b9d1985520297f assets/oreganized/blockstates/light_gray_crystal_glass_pane.json -223123b820571af3281ff6ee54aea835a17171ed assets/oreganized/blockstates/light_gray_vigil_candle.json +3f57cace0b0df538a70e575bc33c877f2c67a88a assets/oreganized/blockstates/light_gray_vigil_candle.json afb1d4d0ee24999ae3023290f97fdccda3979a19 assets/oreganized/blockstates/lime_crystal_glass.json c716019d58b098ac26affc31be09491e2de296e2 assets/oreganized/blockstates/lime_crystal_glass_pane.json -ae8b9cac3d228652ac72f6deea5dc26503dff7e0 assets/oreganized/blockstates/lime_vigil_candle.json +dd68b9a4dbb8e0a02b86c04820693ecaa9f64353 assets/oreganized/blockstates/lime_vigil_candle.json 23860a3cdce3dabc87834f8b22b164a9d12bad71 assets/oreganized/blockstates/magenta_crystal_glass.json b2da99204da7dab9df568e4bc6111eebcb057972 assets/oreganized/blockstates/magenta_crystal_glass_pane.json -d2f695030a291e15e9d20e26f1b0921a8a5e4114 assets/oreganized/blockstates/magenta_vigil_candle.json +c8c5c78cdd60dddba5986175c2f3336b728170c1 assets/oreganized/blockstates/magenta_vigil_candle.json 10ba525a3b9d3eddc1e79feed3ef2f7e7cfff0b8 assets/oreganized/blockstates/molten_lead_cauldron.json d9536dcff6be202d9b5d821c54ea54391f8ee1de assets/oreganized/blockstates/orange_crystal_glass.json 3468335e1b3d19afd9713cf2171f7f28771ff751 assets/oreganized/blockstates/orange_crystal_glass_pane.json -e8e784cd3ab0f03920fd154fb864db9bc0e7594b assets/oreganized/blockstates/orange_vigil_candle.json +a5950e518b6e6fb0ef6fa7400e05cc589ed03d86 assets/oreganized/blockstates/orange_vigil_candle.json ea33f3305a768cacbe05a2cdc8475284c39afcad assets/oreganized/blockstates/pink_crystal_glass.json 9503a106ce6a38698a3e6fce6b975e5d339105df assets/oreganized/blockstates/pink_crystal_glass_pane.json -aaf17187b5beca3c463212ca1ce108b729ae4efa assets/oreganized/blockstates/pink_vigil_candle.json +cafa6de0265b7265a7f55e25f6a598d1593693e0 assets/oreganized/blockstates/pink_vigil_candle.json d7cf04a9abcafbdf27a906caaaa71a4ab9db0851 assets/oreganized/blockstates/polished_glance.json e2cfbeacc6cd2556538c830fd063a9a9d2d34f2d assets/oreganized/blockstates/polished_glance_slab.json 57c980c45fd739c9f3c7bfdaa214de57c69bd521 assets/oreganized/blockstates/polished_glance_stairs.json a0d5aab21480fec3d1f2868400975f62e9588fb1 assets/oreganized/blockstates/purple_crystal_glass.json c9cb5c7d3dcf17e64b42b21b3ca32e2f872b32f7 assets/oreganized/blockstates/purple_crystal_glass_pane.json -134e5098f8f1c2e3b7ff90612131e04288647fb7 assets/oreganized/blockstates/purple_vigil_candle.json +3877cdb7386f42473beae8d7e417300a88fded79 assets/oreganized/blockstates/purple_vigil_candle.json 7cb5ce8c7b7d4d9f1a7a5d06d4aff60d6b8661a9 assets/oreganized/blockstates/raw_lead_block.json a8b05dbdd23fe1cf5ce82b267a4648b0629fc297 assets/oreganized/blockstates/raw_silver_block.json 5085b50121f91c56256b5f1189c8dc614c340d11 assets/oreganized/blockstates/red_crystal_glass.json 7a46fe801476209d2d5eb40213397140a7a06b8f assets/oreganized/blockstates/red_crystal_glass_pane.json -c03746b3cb60582e017ac4df94d7438f6ee75a00 assets/oreganized/blockstates/red_vigil_candle.json +7a3d3bae983b485febd1aa7ec3e53558b21731ad assets/oreganized/blockstates/red_vigil_candle.json 561d7cec28194806d6e4a3ae012f548b5d7ec679 assets/oreganized/blockstates/rotting_flesh.json d977911dbf1e1f35accd414bf349f848f92b8849 assets/oreganized/blockstates/sepulcher.json 398fed72da8aa72d33e773d22a7fb5a5292e6fa5 assets/oreganized/blockstates/shrapnel_bomb.json dcdf3b0a7a2bb1bd00f698b3325e8ffadd0bf98c assets/oreganized/blockstates/silver_block.json 89f5cc8a105178b0b12f32963a320afc120bf868 assets/oreganized/blockstates/silver_ore.json 870599b8654e91dfb946d3e8afc4d0de08e49f9d assets/oreganized/blockstates/spotted_glance.json -99608526bc8053659abcddd11ec91c13d443369a assets/oreganized/blockstates/vigil_candle.json +6a0bb4469710e07620bb1ba40d3e9d8deb3bbd92 assets/oreganized/blockstates/vigil_candle.json 6992b8d448ed847ea9391428732a4f3aaddf258e assets/oreganized/blockstates/waxed_black_concrete_powder.json d3fb359d8a8f03c227be45819904dd16c13e3e00 assets/oreganized/blockstates/waxed_blue_concrete_powder.json 073c781dfa55e697c92eedd2e04f7d6e476298f2 assets/oreganized/blockstates/waxed_brown_concrete_powder.json @@ -100,10 +100,10 @@ afeb2ffdb9361c925ef9322c7303c0de3f4b39ee assets/oreganized/blockstates/waxed_whi 9e4d073c6804904639f89e3af04983dde1720efe assets/oreganized/blockstates/waxed_yellow_concrete_powder.json 0bc2464ae7dc6932baa23098183cf72c05980caa assets/oreganized/blockstates/white_crystal_glass.json 9bdc987f91dc587b97d6834523cac5392b7a0972 assets/oreganized/blockstates/white_crystal_glass_pane.json -d45feb3a92856e2ee2510a9f35587d29cc7bb1c2 assets/oreganized/blockstates/white_vigil_candle.json +2e79a7cb757a46f264b16b4b75c6f5a0527ad334 assets/oreganized/blockstates/white_vigil_candle.json c4f60492b52fe9b99177f6d8c47338beefb07d55 assets/oreganized/blockstates/yellow_crystal_glass.json 82873093c91346c863155b436c1c549e290de044 assets/oreganized/blockstates/yellow_crystal_glass_pane.json -2d9a6a21d143e10939b7ad5eb31b54e3553cb1a4 assets/oreganized/blockstates/yellow_vigil_candle.json +7e1e22d8be12025e372ec0534a0afcdd3df5b79c assets/oreganized/blockstates/yellow_vigil_candle.json a93c37505ed69e5e1b31c1803aebe021c8f5f28f assets/oreganized/models/block/black_concrete_powder.json b4c9e12da0a5bb4bcde8a94accf272d4ee1fb921 assets/oreganized/models/block/black_crystal_glass.json 7fab60622967f8444f480d47cf889d31c5ba3d2a assets/oreganized/models/block/black_crystal_glass_in.json @@ -131,12 +131,20 @@ f4f6ee7e2a37a51fa0bc870fcf3511c9c8265d54 assets/oreganized/models/block/black_cr 33222758f40a3b9aa5438d2da2a81ca007b2480b assets/oreganized/models/block/black_crystal_glass_rot.json 842d32af1476d1b29122e861732829c52ec35d09 assets/oreganized/models/block/black_vigil_candle_double.json 1eb523d23980f062aef5a34252a59c1a6b2b8a80 assets/oreganized/models/block/black_vigil_candle_double_ceiling.json +c65f76ed9f6477a4864bef65d3738995bb379220 assets/oreganized/models/block/black_vigil_candle_double_ceiling_lit.json +3d53df731b300ddea30c072330902f432378d465 assets/oreganized/models/block/black_vigil_candle_double_lit.json 7e78c467dda277e0f8fc1529967550f8f5321579 assets/oreganized/models/block/black_vigil_candle_quadruple.json a19821a3bbcb99827732e5383f32349857ee1d8d assets/oreganized/models/block/black_vigil_candle_quadruple_ceiling.json +85eb7d7c0902883cc802b408ea9289aad94cdd02 assets/oreganized/models/block/black_vigil_candle_quadruple_ceiling_lit.json +c2e56c24d56f7f4bb640249b19f82af5b8f75949 assets/oreganized/models/block/black_vigil_candle_quadruple_lit.json 6d570f156d82a76c16f2d8c190569fb39799b320 assets/oreganized/models/block/black_vigil_candle_single.json 39c478db982761237599e59fb97c5e02882e4cb4 assets/oreganized/models/block/black_vigil_candle_single_ceiling.json +d36b5179c14ca339a6e6c36b8679023a526b01de assets/oreganized/models/block/black_vigil_candle_single_ceiling_lit.json +ef1ac2afcbd63bb38690b009c72ed7c73ab67efd assets/oreganized/models/block/black_vigil_candle_single_lit.json 96d3d1a69c1a1ccc698439754144d9f0fc7cd1a5 assets/oreganized/models/block/black_vigil_candle_triple.json ee323c84d2591d360e6a54b603188fbe6dcf1bcb assets/oreganized/models/block/black_vigil_candle_triple_ceiling.json +d20b32a4ab5e5f95a43b7c82f190bbef3b40c9ac assets/oreganized/models/block/black_vigil_candle_triple_ceiling_lit.json +e13d3fc150d2504f4ea0725062d4b74bee40f767 assets/oreganized/models/block/black_vigil_candle_triple_lit.json 476579543338ee34282e824ae1b7f06f2d6fc24c assets/oreganized/models/block/blue_concrete_powder.json d268c1abcaca9de8544f616c43cfe52dcf1ab724 assets/oreganized/models/block/blue_crystal_glass.json 610d5a26dd77499724bb2a23cd79ab0c48994486 assets/oreganized/models/block/blue_crystal_glass_in.json @@ -164,12 +172,20 @@ bdd196da9ed9e727e7dc655ca020b467440d0126 assets/oreganized/models/block/blue_cry 636f4fd7e8311b57d7167bcbbec656bc6eeec034 assets/oreganized/models/block/blue_crystal_glass_rot.json fa202a3b74d1e76223b878b2ae1faef472b5737c assets/oreganized/models/block/blue_vigil_candle_double.json 13ed0c9a6a8c4f86766566ad7c2e1745a9c7440e assets/oreganized/models/block/blue_vigil_candle_double_ceiling.json +a134f279658d2a39fd24fb5e27d7db6d75e1dd25 assets/oreganized/models/block/blue_vigil_candle_double_ceiling_lit.json +97fe0739b10d39feaa12e9c63dc2db2337e760d9 assets/oreganized/models/block/blue_vigil_candle_double_lit.json 5ada68305834d5e470c29ae949ac61d922746ddf assets/oreganized/models/block/blue_vigil_candle_quadruple.json 3e5e04e8ceed9cc01d914a67d4cb540160557eef assets/oreganized/models/block/blue_vigil_candle_quadruple_ceiling.json +b7d18aeca83c95264de35a101c270aa246246eb0 assets/oreganized/models/block/blue_vigil_candle_quadruple_ceiling_lit.json +78a885d2fd668f152baaeb1c901f4865bf8688c7 assets/oreganized/models/block/blue_vigil_candle_quadruple_lit.json b9604285c20dab8232acc7ab7156e5f694f001d1 assets/oreganized/models/block/blue_vigil_candle_single.json b0f86aa8e5f54791259c12cfd2a5d41c163d6434 assets/oreganized/models/block/blue_vigil_candle_single_ceiling.json +f1c31eac2a732b3ad69526dcc3126855eac4bae0 assets/oreganized/models/block/blue_vigil_candle_single_ceiling_lit.json +fb733abb3258847ce7996d523cab2a01a06b6f24 assets/oreganized/models/block/blue_vigil_candle_single_lit.json 88c724993a5248e298f678ed53ef4bb247d143b9 assets/oreganized/models/block/blue_vigil_candle_triple.json 61febf388c292dbc8f5eaee75ce124b0cb9f4c92 assets/oreganized/models/block/blue_vigil_candle_triple_ceiling.json +ebec47765087796176a58ab2d4e4203cd9977dea assets/oreganized/models/block/blue_vigil_candle_triple_ceiling_lit.json +913e394fcdfec1679ca3ab5b1c327a4a68a4ce85 assets/oreganized/models/block/blue_vigil_candle_triple_lit.json 98c64ea1f285b1ba1c182aac9b4057530dba0d07 assets/oreganized/models/block/bone_pile.json 3296354cd0709abe6eb75e1fc39f1c72d0a9d0a7 assets/oreganized/models/block/brown_concrete_powder.json 4154dddb09563c888c73caa346d5a491ff902782 assets/oreganized/models/block/brown_crystal_glass.json @@ -198,12 +214,20 @@ b5b65411b33249d560ae0af3fb44d1a2ad250522 assets/oreganized/models/block/brown_cr 7146bedcc663b9b4151fcbf89e573a2e2f636909 assets/oreganized/models/block/brown_crystal_glass_rot.json 0fdbe8cf74077b375f5c6ebb44e458f588644700 assets/oreganized/models/block/brown_vigil_candle_double.json d9c2708e407334b52d1a5e4fa73dad6fe08b0a86 assets/oreganized/models/block/brown_vigil_candle_double_ceiling.json +2994b4f8af137daf7df2f8ceed90b0e447076829 assets/oreganized/models/block/brown_vigil_candle_double_ceiling_lit.json +92916cbb0525a22c4a29367d15bc30985b10f61c assets/oreganized/models/block/brown_vigil_candle_double_lit.json ed6090b000b3c1414b52679a14cb54421fbabfd1 assets/oreganized/models/block/brown_vigil_candle_quadruple.json 055087101af4e8240d8368060aa41eef514da687 assets/oreganized/models/block/brown_vigil_candle_quadruple_ceiling.json +c1896459128a0f0481ac52570e24e238cf36ad94 assets/oreganized/models/block/brown_vigil_candle_quadruple_ceiling_lit.json +8a42234eb52dc4b6ff9aa2c12d89ee0651c04bd7 assets/oreganized/models/block/brown_vigil_candle_quadruple_lit.json bece6692d03e515eb1b6866b7612b31657caa974 assets/oreganized/models/block/brown_vigil_candle_single.json 57a6037516ab07a8d43142594f7ccc51aa0db632 assets/oreganized/models/block/brown_vigil_candle_single_ceiling.json +cb09e912da65868c107bbfb9171703782c5d8b8b assets/oreganized/models/block/brown_vigil_candle_single_ceiling_lit.json +6af5e61fb9575d7319955c6e2c7f2b1b4b296974 assets/oreganized/models/block/brown_vigil_candle_single_lit.json d6bb8eb53138bc0091f9e73c3c8990e005b3926b assets/oreganized/models/block/brown_vigil_candle_triple.json 3a20c447376d131b2691256c961da470ce87a6f9 assets/oreganized/models/block/brown_vigil_candle_triple_ceiling.json +d02f1462c0da981e9db0433370305d33fef769fa assets/oreganized/models/block/brown_vigil_candle_triple_ceiling_lit.json +66d2fbfb6ffede8be2d217cb5e169a8e2a0f569d assets/oreganized/models/block/brown_vigil_candle_triple_lit.json 4f188c17f6b739d6090b40856dee05dae6b32316 assets/oreganized/models/block/chiseled_glance.json a9aeea1dec59b5c1594205bb9bc7034f30f447f0 assets/oreganized/models/block/cut_lead.json 65035089ce2758727d5b6cbc94c1a51c92ce613d assets/oreganized/models/block/cyan_concrete_powder.json @@ -233,22 +257,38 @@ e608b753dce2a8b19cb7dbee4045c14c15eecef7 assets/oreganized/models/block/cyan_cry 70e7d24a752911b20fe5ba6ab611abf3c358c136 assets/oreganized/models/block/cyan_crystal_glass_rot.json 39e129696cc32b5d812e1cd9a073fa4019b0a63c assets/oreganized/models/block/cyan_vigil_candle_double.json f597b22780faa2e7039fde378c03b95e7238f336 assets/oreganized/models/block/cyan_vigil_candle_double_ceiling.json +a1836fce56cd2e2ee0481911aa26517fb86d3537 assets/oreganized/models/block/cyan_vigil_candle_double_ceiling_lit.json +4af68a852b6655773c8796356793a2f295a11340 assets/oreganized/models/block/cyan_vigil_candle_double_lit.json 5de76a0b11ecb17851f35677b168eeb230145e89 assets/oreganized/models/block/cyan_vigil_candle_quadruple.json cb6319a43fa075acf8f1a7607632208e079a4d68 assets/oreganized/models/block/cyan_vigil_candle_quadruple_ceiling.json +d9b916d2b4a285aa089bf84adfd6b260310476d9 assets/oreganized/models/block/cyan_vigil_candle_quadruple_ceiling_lit.json +ec433bac878582f2b75b0af0b88999ce70507613 assets/oreganized/models/block/cyan_vigil_candle_quadruple_lit.json 0b491fcacf51fee75cda04d2f7f8e136d67b4c26 assets/oreganized/models/block/cyan_vigil_candle_single.json b4602dfffed116c7ec93bd9db180e2924029b0be assets/oreganized/models/block/cyan_vigil_candle_single_ceiling.json +8b1a970d056ef9e9c1672022c66d5c8ea2ebb9e9 assets/oreganized/models/block/cyan_vigil_candle_single_ceiling_lit.json +05bc8e0af1e5b111e5456671bb91bd57a8c4726c assets/oreganized/models/block/cyan_vigil_candle_single_lit.json 051b88ba77a8f0708ba38cce5186d09e01fc8e18 assets/oreganized/models/block/cyan_vigil_candle_triple.json 690c75634e1d59a7e75f7dfaae30d3b8c518674f assets/oreganized/models/block/cyan_vigil_candle_triple_ceiling.json +600c1c572159ab14a7b260cd57d75295b5c6ab08 assets/oreganized/models/block/cyan_vigil_candle_triple_ceiling_lit.json +ba1e0078bc5cbeb87bc8502cc13455511f9ed076 assets/oreganized/models/block/cyan_vigil_candle_triple_lit.json 28e5c8efea3bcd11f22ff5d8fc42e027451a8c94 assets/oreganized/models/block/deepslate_lead_ore.json 5f9de10cb0e348003b4ad9fa8bfc1fa9278e3df1 assets/oreganized/models/block/deepslate_silver_ore.json b57b85aa4859656bbb0e466ea198bddd28dc9857 assets/oreganized/models/block/defaultvigil_candle_double.json 780445ad969863e0aeef46fc4c8de08040b71d3e assets/oreganized/models/block/defaultvigil_candle_double_ceiling.json +932cde59b3c1a674d353feb790eb2cc64a864921 assets/oreganized/models/block/defaultvigil_candle_double_ceiling_lit.json +9be68354f2dda01c42dc903d3537cdeb9b71ddf4 assets/oreganized/models/block/defaultvigil_candle_double_lit.json 1e440df4a73567cc92546655a48e0bf3e3c36346 assets/oreganized/models/block/defaultvigil_candle_quadruple.json 510154bf3b3cc453620ff7e51d79dc5a05498553 assets/oreganized/models/block/defaultvigil_candle_quadruple_ceiling.json +b756e73c6aaf3593dbb763db2cce24f84afcf746 assets/oreganized/models/block/defaultvigil_candle_quadruple_ceiling_lit.json +f6e85e7d3daf8fb9720a64258c91211fca101ed1 assets/oreganized/models/block/defaultvigil_candle_quadruple_lit.json 013c7b683388e5251d541a55d2131348f297c072 assets/oreganized/models/block/defaultvigil_candle_single.json 8329555e646a16fbb0a06e6414afd68cc0959aea assets/oreganized/models/block/defaultvigil_candle_single_ceiling.json +64b0c7837bb900d6f610d33f701b0bb526e4c816 assets/oreganized/models/block/defaultvigil_candle_single_ceiling_lit.json +b276edd645a5d94e69488cb2ef17dc163786a4c1 assets/oreganized/models/block/defaultvigil_candle_single_lit.json 8dd3f0a43f55cab31ad58d2290bd904529b2ece7 assets/oreganized/models/block/defaultvigil_candle_triple.json b51151158e1e0c0a5fc6aba3a3937882765a6118 assets/oreganized/models/block/defaultvigil_candle_triple_ceiling.json +cc7dea6b418c9ec2843e4338b72bbba4510eab45 assets/oreganized/models/block/defaultvigil_candle_triple_ceiling_lit.json +12bdf9cb76c23f6c8588478f58dc3da4432ee828 assets/oreganized/models/block/defaultvigil_candle_triple_lit.json 50b31e901f9c3d7db1fde987cfd547999e37cf67 assets/oreganized/models/block/dimmer_lead_bulb.json 70dd1a0c1846410be1610e21f3f6e7458dc530a3 assets/oreganized/models/block/electrum_block.json 9b44bee43c08518c3880b29784895a8ee563d01a assets/oreganized/models/block/glance.json @@ -318,12 +358,20 @@ bb2a21c4cc7db90599b1498cbdc64eb244311589 assets/oreganized/models/block/gray_cry 6a45988e05de5c086a9e8ece8642cf412dd466af assets/oreganized/models/block/gray_crystal_glass_rot.json 312025766b73eb9a1a9ce9323ae6f698649837e6 assets/oreganized/models/block/gray_vigil_candle_double.json 8b17d7f6b9f5c971d90f0058cb6448341968d8aa assets/oreganized/models/block/gray_vigil_candle_double_ceiling.json +77ccf395d15353879cb77ccb244c7422fb8e484e assets/oreganized/models/block/gray_vigil_candle_double_ceiling_lit.json +1d0b1f8843026ffdb9afa47699ba4f23ae049351 assets/oreganized/models/block/gray_vigil_candle_double_lit.json f92854375e41fcfffa2b8f72a22a0d86b4c9c032 assets/oreganized/models/block/gray_vigil_candle_quadruple.json b37bf483433e1631bc7b5e5e790fa701e8013f48 assets/oreganized/models/block/gray_vigil_candle_quadruple_ceiling.json +f9404750ab14d96c26edfb86eda3b19a4760e39e assets/oreganized/models/block/gray_vigil_candle_quadruple_ceiling_lit.json +72b7912fba39e009237e235d0017b41b4aa69a2f assets/oreganized/models/block/gray_vigil_candle_quadruple_lit.json 14b3a634a33fc5add230278e993c89b66996031f assets/oreganized/models/block/gray_vigil_candle_single.json c5a7c781065991d62db90e101d58119bd2a42656 assets/oreganized/models/block/gray_vigil_candle_single_ceiling.json +93bf875fd59c8b6a6098bfc814b58b927e712305 assets/oreganized/models/block/gray_vigil_candle_single_ceiling_lit.json +ad91047a3d49ad729b9c9ae8b0eccddaa669558e assets/oreganized/models/block/gray_vigil_candle_single_lit.json 90efc3f7e37e52d445599e56da14ff70bfb7061b assets/oreganized/models/block/gray_vigil_candle_triple.json f2239baa6628a50952a09c015cc75590115be792 assets/oreganized/models/block/gray_vigil_candle_triple_ceiling.json +c4b78b57aabbba5024e2f5184795710ccd6778d4 assets/oreganized/models/block/gray_vigil_candle_triple_ceiling_lit.json +ca003186b83eaa2dc9c5a12d15b99902c58bf105 assets/oreganized/models/block/gray_vigil_candle_triple_lit.json 7d9b9dd458a536627b1e22fe5ecb26ca9cfc8fb2 assets/oreganized/models/block/green_concrete_powder.json 169a2fb6047878118c082d9a710c265c99ec6345 assets/oreganized/models/block/green_crystal_glass.json 707b39ff895f28b54d9ecd784dcee6648e497451 assets/oreganized/models/block/green_crystal_glass_in.json @@ -351,12 +399,20 @@ f06c23bb719390bafdc75bda45d27d754cf5ca88 assets/oreganized/models/block/green_cr 0771143da48d3d7a50bd6bf5beb62fa778397c48 assets/oreganized/models/block/green_crystal_glass_rot.json 20e0bde7bf3a5ab7623b0842dd9d03c7a76036a9 assets/oreganized/models/block/green_vigil_candle_double.json 6b42741fc8df030598d37b79067cbab3974324b4 assets/oreganized/models/block/green_vigil_candle_double_ceiling.json +483beeff04f22a9273d67d016fb7f7101967ecc9 assets/oreganized/models/block/green_vigil_candle_double_ceiling_lit.json +3296655db3ee099776720e4308a3db80b26dca38 assets/oreganized/models/block/green_vigil_candle_double_lit.json 438074afd18ccd7d5444427a95b902905ed25881 assets/oreganized/models/block/green_vigil_candle_quadruple.json 4fecf4e3fc890f4e4cbb3433c93836a45f95b501 assets/oreganized/models/block/green_vigil_candle_quadruple_ceiling.json +2d93d9e723f1ac8f85d893decc34be1f10111b36 assets/oreganized/models/block/green_vigil_candle_quadruple_ceiling_lit.json +eeea091ceaf019aa50835152791c711702bcc5f5 assets/oreganized/models/block/green_vigil_candle_quadruple_lit.json 44c2d253145cb07e1bd1a6ad432a7bdfbe409edb assets/oreganized/models/block/green_vigil_candle_single.json 64dee37713056d3a1dfb5e0e4ec1a22f35920d21 assets/oreganized/models/block/green_vigil_candle_single_ceiling.json +5a5a464a651d053ce544db8545538a444e2bd51a assets/oreganized/models/block/green_vigil_candle_single_ceiling_lit.json +e9b0df9682f82f03fe4963489d95f508658cd203 assets/oreganized/models/block/green_vigil_candle_single_lit.json de59254958bddb3e7f04bcae4e2dd3771142fdc9 assets/oreganized/models/block/green_vigil_candle_triple.json ca04cf5553960ea2c0e0040e943c222248003d39 assets/oreganized/models/block/green_vigil_candle_triple_ceiling.json +db08ff3e53514164469fde7ec71fcd983d0e0a89 assets/oreganized/models/block/green_vigil_candle_triple_ceiling_lit.json +ca60f34d8a70a884984449366f5d329aa9c69c02 assets/oreganized/models/block/green_vigil_candle_triple_lit.json 6ac43f4b7a86ba2b1a3638637108659d12dfb006 assets/oreganized/models/block/grooved_blue_ice.json ff530b321353ded30d649ead0668faa2bcfe16a9 assets/oreganized/models/block/grooved_ice.json 2a0395c97d8caca1311c8b5181b324c228af84d7 assets/oreganized/models/block/grooved_packed_ice.json @@ -410,12 +466,20 @@ e63efa9348807c5d087b5efaf057109e22481a65 assets/oreganized/models/block/light_bl bef3c54f567c6ac71aad8184916114f6e6015e77 assets/oreganized/models/block/light_blue_crystal_glass_rot.json 434b4aced0a7e956178994b1c0903df9e385d7ee assets/oreganized/models/block/light_blue_vigil_candle_double.json 2968cf97a5f4896672615801af3d4f1dfd481ec1 assets/oreganized/models/block/light_blue_vigil_candle_double_ceiling.json +9cac736b31114cc4c44a5ee35e6853552443f243 assets/oreganized/models/block/light_blue_vigil_candle_double_ceiling_lit.json +896f85d55e09acd3bf07b875dd8fbeab225b5d76 assets/oreganized/models/block/light_blue_vigil_candle_double_lit.json 9db5b6020d6017aae0a64a67f7c8a3c66251c45b assets/oreganized/models/block/light_blue_vigil_candle_quadruple.json c40c964b990677f8f6dc8e638d039dc8fbb27000 assets/oreganized/models/block/light_blue_vigil_candle_quadruple_ceiling.json +ad0c12a7af1469057de57d5cc1f82e3ce6b2aa84 assets/oreganized/models/block/light_blue_vigil_candle_quadruple_ceiling_lit.json +247cde2602f85d75dfd512c876ca52e0ef877a17 assets/oreganized/models/block/light_blue_vigil_candle_quadruple_lit.json 479c2b971f2787341a655f3207daf7a0588fd6da assets/oreganized/models/block/light_blue_vigil_candle_single.json 51686462226d1a3feace7ed0c04910f90de5319b assets/oreganized/models/block/light_blue_vigil_candle_single_ceiling.json +7c97492bf2425a8baf831d1989e7252502b1ad64 assets/oreganized/models/block/light_blue_vigil_candle_single_ceiling_lit.json +33251bfdab3a881ba0d9f1a34439b921f057c985 assets/oreganized/models/block/light_blue_vigil_candle_single_lit.json afb5d7d2e745ed293ae3e117cf127ee029de60a2 assets/oreganized/models/block/light_blue_vigil_candle_triple.json 7a9b0a10a910980c7318c7ee2eed16ad0b9b492d assets/oreganized/models/block/light_blue_vigil_candle_triple_ceiling.json +8454b8ba79785a5feecd346b3ea87e428f1c0f39 assets/oreganized/models/block/light_blue_vigil_candle_triple_ceiling_lit.json +8b99ac1b0dcb735432103066e2ad986064f51841 assets/oreganized/models/block/light_blue_vigil_candle_triple_lit.json cc3496c0dfc32a694af4f379cfb5f7cc1988e804 assets/oreganized/models/block/light_gray_concrete_powder.json cafbdfb97d41927e293dddebf8892932e0bdbe83 assets/oreganized/models/block/light_gray_crystal_glass.json 6b595a6115f76b8625b80611d861032411e4ba08 assets/oreganized/models/block/light_gray_crystal_glass_in.json @@ -443,12 +507,20 @@ c85f4e300b801bd4e5267a9cc51751fc208eaf09 assets/oreganized/models/block/light_gr 377e4dcda4ac0aea8fb99d05715eefc69c2f38e6 assets/oreganized/models/block/light_gray_crystal_glass_rot.json 16376b1c78cb6181dca4899b0b8def267df13fca assets/oreganized/models/block/light_gray_vigil_candle_double.json 01d2e6c90491d1f72b6d8722978aff814ef081ea assets/oreganized/models/block/light_gray_vigil_candle_double_ceiling.json +d9d00c30b272b6f8ab41fdb7a6c5ad4fbceea045 assets/oreganized/models/block/light_gray_vigil_candle_double_ceiling_lit.json +81f6ba18f19706b78ebc15b9942841e5142eb47b assets/oreganized/models/block/light_gray_vigil_candle_double_lit.json 9a3d2da2c9231bbcc9078a226cd5d54a22a5c11b assets/oreganized/models/block/light_gray_vigil_candle_quadruple.json 9f85726c9ba1c1ed7632404d52be9531fe03c3bd assets/oreganized/models/block/light_gray_vigil_candle_quadruple_ceiling.json +2d9f8d14e5d24763c15589162290514dc777d27a assets/oreganized/models/block/light_gray_vigil_candle_quadruple_ceiling_lit.json +467ceb04a9eae8358c4d840ad64d31d79b4cf208 assets/oreganized/models/block/light_gray_vigil_candle_quadruple_lit.json 67dd91856757c8780e85de27ced5656903e952e5 assets/oreganized/models/block/light_gray_vigil_candle_single.json 14d60d2643ca5b55d88170be8a212869e313ee24 assets/oreganized/models/block/light_gray_vigil_candle_single_ceiling.json +d4c331542ad6aee6d091369d15f5e93eaed016b3 assets/oreganized/models/block/light_gray_vigil_candle_single_ceiling_lit.json +81429275a913dafcd2f3261597a91176df58e42f assets/oreganized/models/block/light_gray_vigil_candle_single_lit.json 7c44c6d0c31303a0847b092b194e695aa3b64b34 assets/oreganized/models/block/light_gray_vigil_candle_triple.json 39f68050d418e6489d070f90c4e307468355da72 assets/oreganized/models/block/light_gray_vigil_candle_triple_ceiling.json +82e87979ade43906d49b02e0a9f32e37c55e2018 assets/oreganized/models/block/light_gray_vigil_candle_triple_ceiling_lit.json +b534eed57dcd4a91b355a6f50c1c83d1355ebc51 assets/oreganized/models/block/light_gray_vigil_candle_triple_lit.json b667aed52d30f957bb5b8a674d72678074e1988a assets/oreganized/models/block/lime_concrete_powder.json 84a1cbd347232ebe94e1412ce552f542d0d4c04e assets/oreganized/models/block/lime_crystal_glass.json cab16fecfcf35558e07021a775ec0850e559dc73 assets/oreganized/models/block/lime_crystal_glass_in.json @@ -476,12 +548,20 @@ e48a604d3b2acbbf2df7b18b1dfabfc5add6fd2a assets/oreganized/models/block/lime_cry 467034c7b1573ec2c06170c287a7d43da218d223 assets/oreganized/models/block/lime_crystal_glass_rot.json 63f9a20454a89828d555d3525c67254bc90cde92 assets/oreganized/models/block/lime_vigil_candle_double.json daf43038a8c9aa972aadd64b668396a9dbf8cfe4 assets/oreganized/models/block/lime_vigil_candle_double_ceiling.json +6ab609410a53509358d5c508e34363ea9a7e8c76 assets/oreganized/models/block/lime_vigil_candle_double_ceiling_lit.json +b3c58baedfca9a8b2e1fc3399f2555f23f28c9a4 assets/oreganized/models/block/lime_vigil_candle_double_lit.json 92168134c510e5d611a258800532bf123d4b122e assets/oreganized/models/block/lime_vigil_candle_quadruple.json e756a8cbf170e749176b201737d42c22a2e6a096 assets/oreganized/models/block/lime_vigil_candle_quadruple_ceiling.json +c9daaaeea879efb471f082cf7387753b0f1b1cf1 assets/oreganized/models/block/lime_vigil_candle_quadruple_ceiling_lit.json +d99c977c46b9b71f874efc68016522af1ecdc60d assets/oreganized/models/block/lime_vigil_candle_quadruple_lit.json 236554b354bd2c4fb6b9c2f357bb951459d3df5c assets/oreganized/models/block/lime_vigil_candle_single.json 86dbf50fb1f1aae203b96dc85f3cd95f7a72c8cf assets/oreganized/models/block/lime_vigil_candle_single_ceiling.json +5542e7793eddbe7e8073ffc0b278b0c5c449ce30 assets/oreganized/models/block/lime_vigil_candle_single_ceiling_lit.json +fd1e57860ae9992ae366ef790ab29e682c2b97f0 assets/oreganized/models/block/lime_vigil_candle_single_lit.json a4c56d36a18cef42e1e05126453353943ebe2562 assets/oreganized/models/block/lime_vigil_candle_triple.json a2fda4b5def63301f38042bc481c4516ea2c3fed assets/oreganized/models/block/lime_vigil_candle_triple_ceiling.json +9991e48129a6ab7d89e161d07618fbf368d665ad assets/oreganized/models/block/lime_vigil_candle_triple_ceiling_lit.json +a5a43bd426f36abfc1d0af447bd36910ac150c89 assets/oreganized/models/block/lime_vigil_candle_triple_lit.json dcd8c9192f22a02c035f577021a787b876e57065 assets/oreganized/models/block/magenta_concrete_powder.json 84c88a72b4403008762910054f4f98f4a114defe assets/oreganized/models/block/magenta_crystal_glass.json cc5694ad1eae57281f46d880f32f40fa6e78e318 assets/oreganized/models/block/magenta_crystal_glass_in.json @@ -509,12 +589,20 @@ f61dd79a1da013e1fc0b59cf0991c6e5e97b0694 assets/oreganized/models/block/magenta_ 64b8bf65885c03ae44e23aee011008ccb67cb60d assets/oreganized/models/block/magenta_crystal_glass_rot.json b40ea71d12d7ea8190e25256de7b4e89da47a8c0 assets/oreganized/models/block/magenta_vigil_candle_double.json fcf2361774b7957f18f7a698be11d846f09dcd2c assets/oreganized/models/block/magenta_vigil_candle_double_ceiling.json +c14c7a6f0cd26270db121c62f733bf5d8de65c2b assets/oreganized/models/block/magenta_vigil_candle_double_ceiling_lit.json +195ddd247e6b91ec461b994eee62786e0123002c assets/oreganized/models/block/magenta_vigil_candle_double_lit.json 7f5c823a11c90f0ae9234cb9d467557ff82afe61 assets/oreganized/models/block/magenta_vigil_candle_quadruple.json 258fe7c2635ddbe633a6e870a65b5e93cf4ea27d assets/oreganized/models/block/magenta_vigil_candle_quadruple_ceiling.json +f07a5e8ab0ec461fc625d997528bab067e4a2ee1 assets/oreganized/models/block/magenta_vigil_candle_quadruple_ceiling_lit.json +4d930414cf84a759a3bb9b99cfec8f8a5833623c assets/oreganized/models/block/magenta_vigil_candle_quadruple_lit.json ddcc6fafaf0ea7fc907d13d757add87a8ef466b9 assets/oreganized/models/block/magenta_vigil_candle_single.json fabd30145abb7643ff4f0166c48d2d05ef81198a assets/oreganized/models/block/magenta_vigil_candle_single_ceiling.json +78e05072eaec4a385945fdd893ca87733e034f4b assets/oreganized/models/block/magenta_vigil_candle_single_ceiling_lit.json +fb2a09c61a5847e9efbfa439a7e54adc98d0b8ff assets/oreganized/models/block/magenta_vigil_candle_single_lit.json ee4ad0de8f3efbc577e24f55ffbe2874a19e39c6 assets/oreganized/models/block/magenta_vigil_candle_triple.json b88bdc12514a05fee4b73664556ff0d00a64d49b assets/oreganized/models/block/magenta_vigil_candle_triple_ceiling.json +4cd82e45f14632dec4e96df397bc1429a2f7ebb4 assets/oreganized/models/block/magenta_vigil_candle_triple_ceiling_lit.json +179aad55fe75b5c528f0993ce53e93cce55c8b02 assets/oreganized/models/block/magenta_vigil_candle_triple_lit.json d6b67784754f6683734081c363b4f9b72f1f388b assets/oreganized/models/block/molten_lead_cauldron0.json e831cbb457d1314e3c0f5a7706992c90c35337a6 assets/oreganized/models/block/molten_lead_cauldron1.json e831cbb457d1314e3c0f5a7706992c90c35337a6 assets/oreganized/models/block/molten_lead_cauldron2.json @@ -546,12 +634,20 @@ dfa78dff5c2aaa56105176858237dc27e092990f assets/oreganized/models/block/orange_c 6c85eea8420c50d496cd7b91d90d0002e9b7042b assets/oreganized/models/block/orange_crystal_glass_rot.json 0aadd9133b00114fa0e6f3721021cad6fb17fa1f assets/oreganized/models/block/orange_vigil_candle_double.json 05cee0c922c66b6f17e9f46c0e457b01346d0f0f assets/oreganized/models/block/orange_vigil_candle_double_ceiling.json +9e32d59a158e9d934961eb82dc4ad21bd45a1b85 assets/oreganized/models/block/orange_vigil_candle_double_ceiling_lit.json +971813938307bc6c27ca819058701e535a8612dc assets/oreganized/models/block/orange_vigil_candle_double_lit.json 40674fea578d604477448647f70cb0f01ed63e66 assets/oreganized/models/block/orange_vigil_candle_quadruple.json 25ec52cffa046a1c8bbaa2ab7b8dbb9c98599cd4 assets/oreganized/models/block/orange_vigil_candle_quadruple_ceiling.json +52ef11889fe059e009d22ba57c96bb72a229f42c assets/oreganized/models/block/orange_vigil_candle_quadruple_ceiling_lit.json +23b721912ea8aae933f099218f23710b61483b90 assets/oreganized/models/block/orange_vigil_candle_quadruple_lit.json 61d361d939f386bbd8e2c2822960cd2eb571ffd3 assets/oreganized/models/block/orange_vigil_candle_single.json 3a8a40a066ef6a27b7a97a990eac788034e0f64a assets/oreganized/models/block/orange_vigil_candle_single_ceiling.json +8c45e1596aba122698819d2271fd3185a1d4885f assets/oreganized/models/block/orange_vigil_candle_single_ceiling_lit.json +057d94d199c831f17bdbf9b66d7c8794b1c09e81 assets/oreganized/models/block/orange_vigil_candle_single_lit.json 6e7da4687d273b35bdd825cd8a0086a2730dd15e assets/oreganized/models/block/orange_vigil_candle_triple.json 3216be395dcb7e8a40cb16491447c8d8eb454a64 assets/oreganized/models/block/orange_vigil_candle_triple_ceiling.json +fc6d049238e4091882e12acb019a5547306be641 assets/oreganized/models/block/orange_vigil_candle_triple_ceiling_lit.json +6436446aad1063c4bc20377bfffcc8653cabccab assets/oreganized/models/block/orange_vigil_candle_triple_lit.json 58f7913ed5ccbeabf87fc3cc4356d05fa9d98f13 assets/oreganized/models/block/pink_concrete_powder.json bd3378b8df075e77ca1b6f6ca1d4144f93b8b367 assets/oreganized/models/block/pink_crystal_glass.json d109817afcdf3118fa3efbd353850e8f55517d64 assets/oreganized/models/block/pink_crystal_glass_in.json @@ -579,12 +675,20 @@ f13030d6c143a9a06d323ad8442eabd9f0061f3c assets/oreganized/models/block/pink_cry 27b1d54dd7f8170d4a78c154a0bfd25ceaea6af9 assets/oreganized/models/block/pink_crystal_glass_rot.json 5251d72ec0a8e9403eb4bce46610541eaa907592 assets/oreganized/models/block/pink_vigil_candle_double.json 943872c2693db2b42b33e1a99788145082cc25a8 assets/oreganized/models/block/pink_vigil_candle_double_ceiling.json +79a15d4ed3cf7b980cce2bb8ac0b042f81170b8c assets/oreganized/models/block/pink_vigil_candle_double_ceiling_lit.json +1e73baf566e8a726e1cf9e5081c5d4e30c675f14 assets/oreganized/models/block/pink_vigil_candle_double_lit.json 8a3857e9f6a2cfadee78f3c3d77c02bbc7ac9d5a assets/oreganized/models/block/pink_vigil_candle_quadruple.json f1a01f45f35631bfd3159a69002fed8a55d14326 assets/oreganized/models/block/pink_vigil_candle_quadruple_ceiling.json +1d54fd20d8cc98f7123a54abf8708f6a0b1cfaff assets/oreganized/models/block/pink_vigil_candle_quadruple_ceiling_lit.json +eae1532b3911dd7c593fc592cf31a834f7bac69c assets/oreganized/models/block/pink_vigil_candle_quadruple_lit.json 35d501a14e6fda578345f82a4d7c2946e869cd91 assets/oreganized/models/block/pink_vigil_candle_single.json c7083e2c569304740554cee16b9c70c25b9468ec assets/oreganized/models/block/pink_vigil_candle_single_ceiling.json +1f30f95b4b59878dbd9915bad5424cd77020fb28 assets/oreganized/models/block/pink_vigil_candle_single_ceiling_lit.json +509cee19afe027380b67043457826ba900b970de assets/oreganized/models/block/pink_vigil_candle_single_lit.json 0d25a8ab0bba1e6199f1a5408b8589866b6244e8 assets/oreganized/models/block/pink_vigil_candle_triple.json eeb3bd9afaf723fabbcef5cd64992150be90fa7d assets/oreganized/models/block/pink_vigil_candle_triple_ceiling.json +cd98e3e47bd384eec27dd7138c0452919c9874e3 assets/oreganized/models/block/pink_vigil_candle_triple_ceiling_lit.json +2d373dcc1483eea06dc62c363eb7db692dbb3ff0 assets/oreganized/models/block/pink_vigil_candle_triple_lit.json 2817146acda72f5ba4cb468563da370757344205 assets/oreganized/models/block/polished_glance.json f18c05c0938bc4511c9a52080d4e21ccf889510b assets/oreganized/models/block/polished_glance_slab.json b0ef458d7e44703460bc3eff2baf7473a814760f assets/oreganized/models/block/polished_glance_slab_top.json @@ -618,12 +722,20 @@ a43e30367784b061022e86e51dfd4fcdd81fb44b assets/oreganized/models/block/purple_c f19346ca8fb8c7d4657c5d19666e190d6e39aa0d assets/oreganized/models/block/purple_crystal_glass_rot.json 9ebeab79a858ff18b9a201672c624f3287653cf2 assets/oreganized/models/block/purple_vigil_candle_double.json 0367d893b3e24a3bc10888befdbf4511f954dfa1 assets/oreganized/models/block/purple_vigil_candle_double_ceiling.json +f2eb36503f61263f7ce7a08be3987f7f2f34e240 assets/oreganized/models/block/purple_vigil_candle_double_ceiling_lit.json +0e0a7ea01d216a424b701ba38d2350f5fc2c96f5 assets/oreganized/models/block/purple_vigil_candle_double_lit.json fcca99fbd2c24f5e2c0cfd3e5339218a03516889 assets/oreganized/models/block/purple_vigil_candle_quadruple.json 9be75c169b03ff6a2ccd713a60ffab17b7dadd3c assets/oreganized/models/block/purple_vigil_candle_quadruple_ceiling.json +16ef05ba9721b9cf184225021d3886afcd2bf969 assets/oreganized/models/block/purple_vigil_candle_quadruple_ceiling_lit.json +2475dc3fa9859322264ab2eee98d55de9541329e assets/oreganized/models/block/purple_vigil_candle_quadruple_lit.json b478c2485b43c33b22bc8e69493163a4278c8b20 assets/oreganized/models/block/purple_vigil_candle_single.json 623ffadb2a50fe6c8ec60036663550e0bb8e9b54 assets/oreganized/models/block/purple_vigil_candle_single_ceiling.json +573370b7ef78ff1c58baf4106960946e3245f8f4 assets/oreganized/models/block/purple_vigil_candle_single_ceiling_lit.json +a4650f865ded763fdc7d0eb1e3d83a725e73179f assets/oreganized/models/block/purple_vigil_candle_single_lit.json 22edaf95a3ade377e60e62698bc437ff6145db76 assets/oreganized/models/block/purple_vigil_candle_triple.json ae929923c67188087ffe2f174fbde028bc8ff773 assets/oreganized/models/block/purple_vigil_candle_triple_ceiling.json +2b60c71b196dd29da971de94ac5dfbd5ea30a200 assets/oreganized/models/block/purple_vigil_candle_triple_ceiling_lit.json +2fd2c089efbbbfbea0fee5b9ce1e89a4b9a2b83c assets/oreganized/models/block/purple_vigil_candle_triple_lit.json 9f8bd8f481fe842bd6d61699c2476c854a3fa677 assets/oreganized/models/block/raw_lead_block.json 717355700c42d3a0433c39bce8dc8b8980590aa4 assets/oreganized/models/block/raw_silver_block.json 1fc924cf9356ef366175d8f7a692e2d629683656 assets/oreganized/models/block/red_concrete_powder.json @@ -671,12 +783,20 @@ d606f62302a9656482f8076d3592122a95ebda2a assets/oreganized/models/block/red_hot_ 1974b68a782c0fcbe8b00eaf5c913341456bcfc3 assets/oreganized/models/block/red_hot_lead_trapdoor_top.json 71439d934dcfba629cdb37deb8075ea97d1e46e3 assets/oreganized/models/block/red_vigil_candle_double.json ac8f8c425fe6508fbd57b69d55208e7b16372a54 assets/oreganized/models/block/red_vigil_candle_double_ceiling.json +a6f2823b484c45706940bc609bc1af234e9ebd45 assets/oreganized/models/block/red_vigil_candle_double_ceiling_lit.json +e6093559da26c1cd856d61eecf20da2f25d51ab2 assets/oreganized/models/block/red_vigil_candle_double_lit.json 9c0ad9b1b2fafe6d1bebce7c024ea71fb0027956 assets/oreganized/models/block/red_vigil_candle_quadruple.json c41cab2ffae47d0bd0a3142d76089c4379cd9ed9 assets/oreganized/models/block/red_vigil_candle_quadruple_ceiling.json +2caf86740892cf990c2bb918bd1451224820ba5d assets/oreganized/models/block/red_vigil_candle_quadruple_ceiling_lit.json +9baa38a0a168eb65511afdb928ae39a6a354e410 assets/oreganized/models/block/red_vigil_candle_quadruple_lit.json 09655e6e063d35f1aaa10e9f098d9dbbb81b2d14 assets/oreganized/models/block/red_vigil_candle_single.json f52d92eac9baa613960cf83707dee758e50a2f20 assets/oreganized/models/block/red_vigil_candle_single_ceiling.json +d909af984805090804513fd6393dee4e9ac4593f assets/oreganized/models/block/red_vigil_candle_single_ceiling_lit.json +57b229278f468b170f8a710699aa8865110dfe1a assets/oreganized/models/block/red_vigil_candle_single_lit.json 90c0acdcb495c49c48b5732ca2e5364cae0c4fe5 assets/oreganized/models/block/red_vigil_candle_triple.json ffaac09a1cb2bb59f917e95b11036aa50507186f assets/oreganized/models/block/red_vigil_candle_triple_ceiling.json +d93a2e671fde45d2918d741f3ec8a5538c13187a assets/oreganized/models/block/red_vigil_candle_triple_ceiling_lit.json +5c3d4f80f09d3dfe34f7b5ecc3e6bd7193a0dfc7 assets/oreganized/models/block/red_vigil_candle_triple_lit.json 67db22c53cba6aa2a32ccaa5345d3ea6dd65289a assets/oreganized/models/block/rotting_flesh.json 325f19d03a38f249bcceb44770d7af7a5d956821 assets/oreganized/models/block/shrapnel_bomb.json 8b672f8e74c40583b323d948f93266ac9dc51d4e assets/oreganized/models/block/silver_block.json @@ -709,12 +829,20 @@ aa1f6469d6b10f6cff1543f6c11d33e700c6d7f3 assets/oreganized/models/block/white_cr c93d99db2aacfa2035548a055fd9d7d162811a23 assets/oreganized/models/block/white_crystal_glass_rot.json 9d70d384ac31f732744cf3ae47a28b43f5a3e730 assets/oreganized/models/block/white_vigil_candle_double.json 081349756c0413498897f6b27346e381b9502cc1 assets/oreganized/models/block/white_vigil_candle_double_ceiling.json +7d0fa77a17d7eb297a2e6569bc2d05ada2ac545d assets/oreganized/models/block/white_vigil_candle_double_ceiling_lit.json +2a422cd534a5f894933e7324f9d483e9c55b1817 assets/oreganized/models/block/white_vigil_candle_double_lit.json f9e08d0d6f302ea4ba8ffd2c7a46bf343ef4107b assets/oreganized/models/block/white_vigil_candle_quadruple.json b152d5e67e17621bfcb228d55153fd8971bfdb4a assets/oreganized/models/block/white_vigil_candle_quadruple_ceiling.json +273925d84020d7a52c38e91aa27fe47cdf7608ad assets/oreganized/models/block/white_vigil_candle_quadruple_ceiling_lit.json +f3562297c9d6f22ee20f891e91363b28168f1fd1 assets/oreganized/models/block/white_vigil_candle_quadruple_lit.json f8a9e166fa01f7033878818462a5a3b53dbdf20b assets/oreganized/models/block/white_vigil_candle_single.json c1b1bf6606c5051b0db49f93eaf82c874db8b315 assets/oreganized/models/block/white_vigil_candle_single_ceiling.json +63c961a00dd17b0364075029c58c02a164f5491d assets/oreganized/models/block/white_vigil_candle_single_ceiling_lit.json +10216ad29449cf34122c37e4cba31bd4ab47e236 assets/oreganized/models/block/white_vigil_candle_single_lit.json 5bff922ea7ca35b44b90ab1bb00b908e9baae376 assets/oreganized/models/block/white_vigil_candle_triple.json eb8d1fbd181f56018a64d5a11c48760ad3a8f795 assets/oreganized/models/block/white_vigil_candle_triple_ceiling.json +457e0d7e627cf3e031a65bb5aabcc341b6e44371 assets/oreganized/models/block/white_vigil_candle_triple_ceiling_lit.json +09291d28c1038ac3b101b82025b1e736dda07d37 assets/oreganized/models/block/white_vigil_candle_triple_lit.json 258d5907ef1cf646306b9f0acb50b29f03d35cde assets/oreganized/models/block/yellow_concrete_powder.json c8a10b096058a91665c2493b0790391262523f4c assets/oreganized/models/block/yellow_crystal_glass.json 6376fa01d03a4a3f025743c7d18b577894f89d27 assets/oreganized/models/block/yellow_crystal_glass_in.json @@ -742,9 +870,17 @@ bd4e3e2f6e513ee45511e5f6c4d725a50487ebee assets/oreganized/models/block/yellow_c 4fb7fdcfac066ff9d10fabb5fe52aabc28e4ac56 assets/oreganized/models/block/yellow_crystal_glass_rot.json 818bcdd17a07d662e4caa9878c134d99a1c5d21e assets/oreganized/models/block/yellow_vigil_candle_double.json fbf188b7cd2af885f9e0312b74188b5369d94868 assets/oreganized/models/block/yellow_vigil_candle_double_ceiling.json +c10b15d67c32de031c36c82b67af7bbbe8de049b assets/oreganized/models/block/yellow_vigil_candle_double_ceiling_lit.json +22b9c45b743a9f5715bf72bd2b905dfd8b6300c5 assets/oreganized/models/block/yellow_vigil_candle_double_lit.json 4c2b478aedb70b75078e59267d86a079a1bfce14 assets/oreganized/models/block/yellow_vigil_candle_quadruple.json 52131dc61ab08a6b63422d60546db64ba61d1ba8 assets/oreganized/models/block/yellow_vigil_candle_quadruple_ceiling.json +e1c3543a42cc458dd049c6ffc8aabded8777ea7b assets/oreganized/models/block/yellow_vigil_candle_quadruple_ceiling_lit.json +15f72e79a625ac55c29367f373a554b2a53884d4 assets/oreganized/models/block/yellow_vigil_candle_quadruple_lit.json 0260d7850d77241594d4d176bb95aa4ee3823a47 assets/oreganized/models/block/yellow_vigil_candle_single.json 0639b7fb1d53c41ec090e81b113b62284e735d39 assets/oreganized/models/block/yellow_vigil_candle_single_ceiling.json +c05dd1caea949330496d7d5c798dea2eac077c78 assets/oreganized/models/block/yellow_vigil_candle_single_ceiling_lit.json +ace08e0dd10e7e2f32e2cc5168a215346c409366 assets/oreganized/models/block/yellow_vigil_candle_single_lit.json afe1c8aa355fcb57c42b710e7a8018c89881d00b assets/oreganized/models/block/yellow_vigil_candle_triple.json 6973b767d153cc1d5820455417028cb56fc69074 assets/oreganized/models/block/yellow_vigil_candle_triple_ceiling.json +4797ea87fba730952f625f8bd4eb191d2ed158d5 assets/oreganized/models/block/yellow_vigil_candle_triple_ceiling_lit.json +a0c3d66fde77758efed8dd9254b5a1215e0455a8 assets/oreganized/models/block/yellow_vigil_candle_triple_lit.json diff --git a/src/generated/resources/.cache/5bb646c3cee204f41a1b59a2c0d9083b5f7155b0 b/src/generated/resources/.cache/5bb646c3cee204f41a1b59a2c0d9083b5f7155b0 index 779b76a9..f7c051da 100644 --- a/src/generated/resources/.cache/5bb646c3cee204f41a1b59a2c0d9083b5f7155b0 +++ b/src/generated/resources/.cache/5bb646c3cee204f41a1b59a2c0d9083b5f7155b0 @@ -1,4 +1,4 @@ -// 1.20.1 2024-10-23T00:13:26.2677803 Oreganized Block Tags +// 1.20.1 2024-10-24T14:16:29.454834 Oreganized Block Tags 7a2d68d81bc5ee59f9a2f4ba68ddb39bfd9c875d data/forge/tags/blocks/glass.json d96b4f83e03abe39a1b97d92b7818c8f6b2e5c68 data/forge/tags/blocks/glass_panes.json d062c23ad5308b7de0b2e86f6531ea724530f898 data/forge/tags/blocks/melts_lead.json @@ -34,9 +34,10 @@ a4acb3623320f801e89e3451f8b7d9e2246f99d0 data/minecraft/tags/blocks/walls.json 81fb1b18afaa14ae90800b23c32de565d1389bb3 data/oreganized/tags/blocks/crystal_glass.json f1dfddab1e3f2dec1e7ed1c3fbf9f6a7f261cf08 data/oreganized/tags/blocks/crystal_glass_panes.json 6b73bb0ce38222c428d54ee64e82ffa1d96c64d7 data/oreganized/tags/blocks/fire_source.json +b8aa17690b27ed9cdef06ded577fc79991acf1c4 data/oreganized/tags/blocks/heat_source.json eaca08d04b1742f418e6bc0964dd32cf16035d88 data/oreganized/tags/blocks/mineable/scribe.json 0f64e9b9dc279dd460f6408313b130a37a0c9d86 data/oreganized/tags/blocks/no_silktouch_using_scribe.json cf3608bd187922aeb48c566c19e8482b0dca34c7 data/oreganized/tags/blocks/prevents_lead_cloud.json 06c2e2e512966767a31df77e646e41c4c39e3dd3 data/oreganized/tags/blocks/silktouch_using_scribe.json 3112fb4a1df2953e2c3572fa47f886bf8e5bd679 data/oreganized/tags/blocks/stone_types/glance.json -cead6b906640efcd90a6dbb5f5e17623f3631b53 data/oreganized/tags/blocks/vigil_candles.json +8c1c902dd799d9b4f264f795364eb9475867a13f data/oreganized/tags/blocks/vigil_candles.json diff --git a/src/generated/resources/assets/oreganized/blockstates/black_vigil_candle.json b/src/generated/resources/assets/oreganized/blockstates/black_vigil_candle.json index c7fd50e1..c62d19ec 100644 --- a/src/generated/resources/assets/oreganized/blockstates/black_vigil_candle.json +++ b/src/generated/resources/assets/oreganized/blockstates/black_vigil_candle.json @@ -1,28 +1,52 @@ { "variants": { - "candles=1,hanging=false": { + "candles=1,hanging=false,lit=false": { "model": "oreganized:block/black_vigil_candle_single" }, - "candles=1,hanging=true": { + "candles=1,hanging=false,lit=true": { + "model": "oreganized:block/black_vigil_candle_single_lit" + }, + "candles=1,hanging=true,lit=false": { "model": "oreganized:block/black_vigil_candle_single_ceiling" }, - "candles=2,hanging=false": { + "candles=1,hanging=true,lit=true": { + "model": "oreganized:block/black_vigil_candle_single_ceiling_lit" + }, + "candles=2,hanging=false,lit=false": { "model": "oreganized:block/black_vigil_candle_double" }, - "candles=2,hanging=true": { + "candles=2,hanging=false,lit=true": { + "model": "oreganized:block/black_vigil_candle_double_lit" + }, + "candles=2,hanging=true,lit=false": { "model": "oreganized:block/black_vigil_candle_double_ceiling" }, - "candles=3,hanging=false": { + "candles=2,hanging=true,lit=true": { + "model": "oreganized:block/black_vigil_candle_double_ceiling_lit" + }, + "candles=3,hanging=false,lit=false": { "model": "oreganized:block/black_vigil_candle_triple" }, - "candles=3,hanging=true": { + "candles=3,hanging=false,lit=true": { + "model": "oreganized:block/black_vigil_candle_triple_lit" + }, + "candles=3,hanging=true,lit=false": { "model": "oreganized:block/black_vigil_candle_triple_ceiling" }, - "candles=4,hanging=false": { + "candles=3,hanging=true,lit=true": { + "model": "oreganized:block/black_vigil_candle_triple_ceiling_lit" + }, + "candles=4,hanging=false,lit=false": { "model": "oreganized:block/black_vigil_candle_quadruple" }, - "candles=4,hanging=true": { + "candles=4,hanging=false,lit=true": { + "model": "oreganized:block/black_vigil_candle_quadruple_lit" + }, + "candles=4,hanging=true,lit=false": { "model": "oreganized:block/black_vigil_candle_quadruple_ceiling" + }, + "candles=4,hanging=true,lit=true": { + "model": "oreganized:block/black_vigil_candle_quadruple_ceiling_lit" } } } \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/blockstates/blue_vigil_candle.json b/src/generated/resources/assets/oreganized/blockstates/blue_vigil_candle.json index 1af85f3c..55457e45 100644 --- a/src/generated/resources/assets/oreganized/blockstates/blue_vigil_candle.json +++ b/src/generated/resources/assets/oreganized/blockstates/blue_vigil_candle.json @@ -1,28 +1,52 @@ { "variants": { - "candles=1,hanging=false": { + "candles=1,hanging=false,lit=false": { "model": "oreganized:block/blue_vigil_candle_single" }, - "candles=1,hanging=true": { + "candles=1,hanging=false,lit=true": { + "model": "oreganized:block/blue_vigil_candle_single_lit" + }, + "candles=1,hanging=true,lit=false": { "model": "oreganized:block/blue_vigil_candle_single_ceiling" }, - "candles=2,hanging=false": { + "candles=1,hanging=true,lit=true": { + "model": "oreganized:block/blue_vigil_candle_single_ceiling_lit" + }, + "candles=2,hanging=false,lit=false": { "model": "oreganized:block/blue_vigil_candle_double" }, - "candles=2,hanging=true": { + "candles=2,hanging=false,lit=true": { + "model": "oreganized:block/blue_vigil_candle_double_lit" + }, + "candles=2,hanging=true,lit=false": { "model": "oreganized:block/blue_vigil_candle_double_ceiling" }, - "candles=3,hanging=false": { + "candles=2,hanging=true,lit=true": { + "model": "oreganized:block/blue_vigil_candle_double_ceiling_lit" + }, + "candles=3,hanging=false,lit=false": { "model": "oreganized:block/blue_vigil_candle_triple" }, - "candles=3,hanging=true": { + "candles=3,hanging=false,lit=true": { + "model": "oreganized:block/blue_vigil_candle_triple_lit" + }, + "candles=3,hanging=true,lit=false": { "model": "oreganized:block/blue_vigil_candle_triple_ceiling" }, - "candles=4,hanging=false": { + "candles=3,hanging=true,lit=true": { + "model": "oreganized:block/blue_vigil_candle_triple_ceiling_lit" + }, + "candles=4,hanging=false,lit=false": { "model": "oreganized:block/blue_vigil_candle_quadruple" }, - "candles=4,hanging=true": { + "candles=4,hanging=false,lit=true": { + "model": "oreganized:block/blue_vigil_candle_quadruple_lit" + }, + "candles=4,hanging=true,lit=false": { "model": "oreganized:block/blue_vigil_candle_quadruple_ceiling" + }, + "candles=4,hanging=true,lit=true": { + "model": "oreganized:block/blue_vigil_candle_quadruple_ceiling_lit" } } } \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/blockstates/brown_vigil_candle.json b/src/generated/resources/assets/oreganized/blockstates/brown_vigil_candle.json index 5a7553e9..89bd067f 100644 --- a/src/generated/resources/assets/oreganized/blockstates/brown_vigil_candle.json +++ b/src/generated/resources/assets/oreganized/blockstates/brown_vigil_candle.json @@ -1,28 +1,52 @@ { "variants": { - "candles=1,hanging=false": { + "candles=1,hanging=false,lit=false": { "model": "oreganized:block/brown_vigil_candle_single" }, - "candles=1,hanging=true": { + "candles=1,hanging=false,lit=true": { + "model": "oreganized:block/brown_vigil_candle_single_lit" + }, + "candles=1,hanging=true,lit=false": { "model": "oreganized:block/brown_vigil_candle_single_ceiling" }, - "candles=2,hanging=false": { + "candles=1,hanging=true,lit=true": { + "model": "oreganized:block/brown_vigil_candle_single_ceiling_lit" + }, + "candles=2,hanging=false,lit=false": { "model": "oreganized:block/brown_vigil_candle_double" }, - "candles=2,hanging=true": { + "candles=2,hanging=false,lit=true": { + "model": "oreganized:block/brown_vigil_candle_double_lit" + }, + "candles=2,hanging=true,lit=false": { "model": "oreganized:block/brown_vigil_candle_double_ceiling" }, - "candles=3,hanging=false": { + "candles=2,hanging=true,lit=true": { + "model": "oreganized:block/brown_vigil_candle_double_ceiling_lit" + }, + "candles=3,hanging=false,lit=false": { "model": "oreganized:block/brown_vigil_candle_triple" }, - "candles=3,hanging=true": { + "candles=3,hanging=false,lit=true": { + "model": "oreganized:block/brown_vigil_candle_triple_lit" + }, + "candles=3,hanging=true,lit=false": { "model": "oreganized:block/brown_vigil_candle_triple_ceiling" }, - "candles=4,hanging=false": { + "candles=3,hanging=true,lit=true": { + "model": "oreganized:block/brown_vigil_candle_triple_ceiling_lit" + }, + "candles=4,hanging=false,lit=false": { "model": "oreganized:block/brown_vigil_candle_quadruple" }, - "candles=4,hanging=true": { + "candles=4,hanging=false,lit=true": { + "model": "oreganized:block/brown_vigil_candle_quadruple_lit" + }, + "candles=4,hanging=true,lit=false": { "model": "oreganized:block/brown_vigil_candle_quadruple_ceiling" + }, + "candles=4,hanging=true,lit=true": { + "model": "oreganized:block/brown_vigil_candle_quadruple_ceiling_lit" } } } \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/blockstates/cyan_vigil_candle.json b/src/generated/resources/assets/oreganized/blockstates/cyan_vigil_candle.json index 7ef52294..2b39029d 100644 --- a/src/generated/resources/assets/oreganized/blockstates/cyan_vigil_candle.json +++ b/src/generated/resources/assets/oreganized/blockstates/cyan_vigil_candle.json @@ -1,28 +1,52 @@ { "variants": { - "candles=1,hanging=false": { + "candles=1,hanging=false,lit=false": { "model": "oreganized:block/cyan_vigil_candle_single" }, - "candles=1,hanging=true": { + "candles=1,hanging=false,lit=true": { + "model": "oreganized:block/cyan_vigil_candle_single_lit" + }, + "candles=1,hanging=true,lit=false": { "model": "oreganized:block/cyan_vigil_candle_single_ceiling" }, - "candles=2,hanging=false": { + "candles=1,hanging=true,lit=true": { + "model": "oreganized:block/cyan_vigil_candle_single_ceiling_lit" + }, + "candles=2,hanging=false,lit=false": { "model": "oreganized:block/cyan_vigil_candle_double" }, - "candles=2,hanging=true": { + "candles=2,hanging=false,lit=true": { + "model": "oreganized:block/cyan_vigil_candle_double_lit" + }, + "candles=2,hanging=true,lit=false": { "model": "oreganized:block/cyan_vigil_candle_double_ceiling" }, - "candles=3,hanging=false": { + "candles=2,hanging=true,lit=true": { + "model": "oreganized:block/cyan_vigil_candle_double_ceiling_lit" + }, + "candles=3,hanging=false,lit=false": { "model": "oreganized:block/cyan_vigil_candle_triple" }, - "candles=3,hanging=true": { + "candles=3,hanging=false,lit=true": { + "model": "oreganized:block/cyan_vigil_candle_triple_lit" + }, + "candles=3,hanging=true,lit=false": { "model": "oreganized:block/cyan_vigil_candle_triple_ceiling" }, - "candles=4,hanging=false": { + "candles=3,hanging=true,lit=true": { + "model": "oreganized:block/cyan_vigil_candle_triple_ceiling_lit" + }, + "candles=4,hanging=false,lit=false": { "model": "oreganized:block/cyan_vigil_candle_quadruple" }, - "candles=4,hanging=true": { + "candles=4,hanging=false,lit=true": { + "model": "oreganized:block/cyan_vigil_candle_quadruple_lit" + }, + "candles=4,hanging=true,lit=false": { "model": "oreganized:block/cyan_vigil_candle_quadruple_ceiling" + }, + "candles=4,hanging=true,lit=true": { + "model": "oreganized:block/cyan_vigil_candle_quadruple_ceiling_lit" } } } \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/blockstates/gray_vigil_candle.json b/src/generated/resources/assets/oreganized/blockstates/gray_vigil_candle.json index 9c438d79..cede69af 100644 --- a/src/generated/resources/assets/oreganized/blockstates/gray_vigil_candle.json +++ b/src/generated/resources/assets/oreganized/blockstates/gray_vigil_candle.json @@ -1,28 +1,52 @@ { "variants": { - "candles=1,hanging=false": { + "candles=1,hanging=false,lit=false": { "model": "oreganized:block/gray_vigil_candle_single" }, - "candles=1,hanging=true": { + "candles=1,hanging=false,lit=true": { + "model": "oreganized:block/gray_vigil_candle_single_lit" + }, + "candles=1,hanging=true,lit=false": { "model": "oreganized:block/gray_vigil_candle_single_ceiling" }, - "candles=2,hanging=false": { + "candles=1,hanging=true,lit=true": { + "model": "oreganized:block/gray_vigil_candle_single_ceiling_lit" + }, + "candles=2,hanging=false,lit=false": { "model": "oreganized:block/gray_vigil_candle_double" }, - "candles=2,hanging=true": { + "candles=2,hanging=false,lit=true": { + "model": "oreganized:block/gray_vigil_candle_double_lit" + }, + "candles=2,hanging=true,lit=false": { "model": "oreganized:block/gray_vigil_candle_double_ceiling" }, - "candles=3,hanging=false": { + "candles=2,hanging=true,lit=true": { + "model": "oreganized:block/gray_vigil_candle_double_ceiling_lit" + }, + "candles=3,hanging=false,lit=false": { "model": "oreganized:block/gray_vigil_candle_triple" }, - "candles=3,hanging=true": { + "candles=3,hanging=false,lit=true": { + "model": "oreganized:block/gray_vigil_candle_triple_lit" + }, + "candles=3,hanging=true,lit=false": { "model": "oreganized:block/gray_vigil_candle_triple_ceiling" }, - "candles=4,hanging=false": { + "candles=3,hanging=true,lit=true": { + "model": "oreganized:block/gray_vigil_candle_triple_ceiling_lit" + }, + "candles=4,hanging=false,lit=false": { "model": "oreganized:block/gray_vigil_candle_quadruple" }, - "candles=4,hanging=true": { + "candles=4,hanging=false,lit=true": { + "model": "oreganized:block/gray_vigil_candle_quadruple_lit" + }, + "candles=4,hanging=true,lit=false": { "model": "oreganized:block/gray_vigil_candle_quadruple_ceiling" + }, + "candles=4,hanging=true,lit=true": { + "model": "oreganized:block/gray_vigil_candle_quadruple_ceiling_lit" } } } \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/blockstates/green_vigil_candle.json b/src/generated/resources/assets/oreganized/blockstates/green_vigil_candle.json index cacdf2d0..d0ab4307 100644 --- a/src/generated/resources/assets/oreganized/blockstates/green_vigil_candle.json +++ b/src/generated/resources/assets/oreganized/blockstates/green_vigil_candle.json @@ -1,28 +1,52 @@ { "variants": { - "candles=1,hanging=false": { + "candles=1,hanging=false,lit=false": { "model": "oreganized:block/green_vigil_candle_single" }, - "candles=1,hanging=true": { + "candles=1,hanging=false,lit=true": { + "model": "oreganized:block/green_vigil_candle_single_lit" + }, + "candles=1,hanging=true,lit=false": { "model": "oreganized:block/green_vigil_candle_single_ceiling" }, - "candles=2,hanging=false": { + "candles=1,hanging=true,lit=true": { + "model": "oreganized:block/green_vigil_candle_single_ceiling_lit" + }, + "candles=2,hanging=false,lit=false": { "model": "oreganized:block/green_vigil_candle_double" }, - "candles=2,hanging=true": { + "candles=2,hanging=false,lit=true": { + "model": "oreganized:block/green_vigil_candle_double_lit" + }, + "candles=2,hanging=true,lit=false": { "model": "oreganized:block/green_vigil_candle_double_ceiling" }, - "candles=3,hanging=false": { + "candles=2,hanging=true,lit=true": { + "model": "oreganized:block/green_vigil_candle_double_ceiling_lit" + }, + "candles=3,hanging=false,lit=false": { "model": "oreganized:block/green_vigil_candle_triple" }, - "candles=3,hanging=true": { + "candles=3,hanging=false,lit=true": { + "model": "oreganized:block/green_vigil_candle_triple_lit" + }, + "candles=3,hanging=true,lit=false": { "model": "oreganized:block/green_vigil_candle_triple_ceiling" }, - "candles=4,hanging=false": { + "candles=3,hanging=true,lit=true": { + "model": "oreganized:block/green_vigil_candle_triple_ceiling_lit" + }, + "candles=4,hanging=false,lit=false": { "model": "oreganized:block/green_vigil_candle_quadruple" }, - "candles=4,hanging=true": { + "candles=4,hanging=false,lit=true": { + "model": "oreganized:block/green_vigil_candle_quadruple_lit" + }, + "candles=4,hanging=true,lit=false": { "model": "oreganized:block/green_vigil_candle_quadruple_ceiling" + }, + "candles=4,hanging=true,lit=true": { + "model": "oreganized:block/green_vigil_candle_quadruple_ceiling_lit" } } } \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/blockstates/light_blue_vigil_candle.json b/src/generated/resources/assets/oreganized/blockstates/light_blue_vigil_candle.json index 3095b47e..87613976 100644 --- a/src/generated/resources/assets/oreganized/blockstates/light_blue_vigil_candle.json +++ b/src/generated/resources/assets/oreganized/blockstates/light_blue_vigil_candle.json @@ -1,28 +1,52 @@ { "variants": { - "candles=1,hanging=false": { + "candles=1,hanging=false,lit=false": { "model": "oreganized:block/light_blue_vigil_candle_single" }, - "candles=1,hanging=true": { + "candles=1,hanging=false,lit=true": { + "model": "oreganized:block/light_blue_vigil_candle_single_lit" + }, + "candles=1,hanging=true,lit=false": { "model": "oreganized:block/light_blue_vigil_candle_single_ceiling" }, - "candles=2,hanging=false": { + "candles=1,hanging=true,lit=true": { + "model": "oreganized:block/light_blue_vigil_candle_single_ceiling_lit" + }, + "candles=2,hanging=false,lit=false": { "model": "oreganized:block/light_blue_vigil_candle_double" }, - "candles=2,hanging=true": { + "candles=2,hanging=false,lit=true": { + "model": "oreganized:block/light_blue_vigil_candle_double_lit" + }, + "candles=2,hanging=true,lit=false": { "model": "oreganized:block/light_blue_vigil_candle_double_ceiling" }, - "candles=3,hanging=false": { + "candles=2,hanging=true,lit=true": { + "model": "oreganized:block/light_blue_vigil_candle_double_ceiling_lit" + }, + "candles=3,hanging=false,lit=false": { "model": "oreganized:block/light_blue_vigil_candle_triple" }, - "candles=3,hanging=true": { + "candles=3,hanging=false,lit=true": { + "model": "oreganized:block/light_blue_vigil_candle_triple_lit" + }, + "candles=3,hanging=true,lit=false": { "model": "oreganized:block/light_blue_vigil_candle_triple_ceiling" }, - "candles=4,hanging=false": { + "candles=3,hanging=true,lit=true": { + "model": "oreganized:block/light_blue_vigil_candle_triple_ceiling_lit" + }, + "candles=4,hanging=false,lit=false": { "model": "oreganized:block/light_blue_vigil_candle_quadruple" }, - "candles=4,hanging=true": { + "candles=4,hanging=false,lit=true": { + "model": "oreganized:block/light_blue_vigil_candle_quadruple_lit" + }, + "candles=4,hanging=true,lit=false": { "model": "oreganized:block/light_blue_vigil_candle_quadruple_ceiling" + }, + "candles=4,hanging=true,lit=true": { + "model": "oreganized:block/light_blue_vigil_candle_quadruple_ceiling_lit" } } } \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/blockstates/light_gray_vigil_candle.json b/src/generated/resources/assets/oreganized/blockstates/light_gray_vigil_candle.json index fc632576..fe894cb4 100644 --- a/src/generated/resources/assets/oreganized/blockstates/light_gray_vigil_candle.json +++ b/src/generated/resources/assets/oreganized/blockstates/light_gray_vigil_candle.json @@ -1,28 +1,52 @@ { "variants": { - "candles=1,hanging=false": { + "candles=1,hanging=false,lit=false": { "model": "oreganized:block/light_gray_vigil_candle_single" }, - "candles=1,hanging=true": { + "candles=1,hanging=false,lit=true": { + "model": "oreganized:block/light_gray_vigil_candle_single_lit" + }, + "candles=1,hanging=true,lit=false": { "model": "oreganized:block/light_gray_vigil_candle_single_ceiling" }, - "candles=2,hanging=false": { + "candles=1,hanging=true,lit=true": { + "model": "oreganized:block/light_gray_vigil_candle_single_ceiling_lit" + }, + "candles=2,hanging=false,lit=false": { "model": "oreganized:block/light_gray_vigil_candle_double" }, - "candles=2,hanging=true": { + "candles=2,hanging=false,lit=true": { + "model": "oreganized:block/light_gray_vigil_candle_double_lit" + }, + "candles=2,hanging=true,lit=false": { "model": "oreganized:block/light_gray_vigil_candle_double_ceiling" }, - "candles=3,hanging=false": { + "candles=2,hanging=true,lit=true": { + "model": "oreganized:block/light_gray_vigil_candle_double_ceiling_lit" + }, + "candles=3,hanging=false,lit=false": { "model": "oreganized:block/light_gray_vigil_candle_triple" }, - "candles=3,hanging=true": { + "candles=3,hanging=false,lit=true": { + "model": "oreganized:block/light_gray_vigil_candle_triple_lit" + }, + "candles=3,hanging=true,lit=false": { "model": "oreganized:block/light_gray_vigil_candle_triple_ceiling" }, - "candles=4,hanging=false": { + "candles=3,hanging=true,lit=true": { + "model": "oreganized:block/light_gray_vigil_candle_triple_ceiling_lit" + }, + "candles=4,hanging=false,lit=false": { "model": "oreganized:block/light_gray_vigil_candle_quadruple" }, - "candles=4,hanging=true": { + "candles=4,hanging=false,lit=true": { + "model": "oreganized:block/light_gray_vigil_candle_quadruple_lit" + }, + "candles=4,hanging=true,lit=false": { "model": "oreganized:block/light_gray_vigil_candle_quadruple_ceiling" + }, + "candles=4,hanging=true,lit=true": { + "model": "oreganized:block/light_gray_vigil_candle_quadruple_ceiling_lit" } } } \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/blockstates/lime_vigil_candle.json b/src/generated/resources/assets/oreganized/blockstates/lime_vigil_candle.json index 43a417fe..a47be6e1 100644 --- a/src/generated/resources/assets/oreganized/blockstates/lime_vigil_candle.json +++ b/src/generated/resources/assets/oreganized/blockstates/lime_vigil_candle.json @@ -1,28 +1,52 @@ { "variants": { - "candles=1,hanging=false": { + "candles=1,hanging=false,lit=false": { "model": "oreganized:block/lime_vigil_candle_single" }, - "candles=1,hanging=true": { + "candles=1,hanging=false,lit=true": { + "model": "oreganized:block/lime_vigil_candle_single_lit" + }, + "candles=1,hanging=true,lit=false": { "model": "oreganized:block/lime_vigil_candle_single_ceiling" }, - "candles=2,hanging=false": { + "candles=1,hanging=true,lit=true": { + "model": "oreganized:block/lime_vigil_candle_single_ceiling_lit" + }, + "candles=2,hanging=false,lit=false": { "model": "oreganized:block/lime_vigil_candle_double" }, - "candles=2,hanging=true": { + "candles=2,hanging=false,lit=true": { + "model": "oreganized:block/lime_vigil_candle_double_lit" + }, + "candles=2,hanging=true,lit=false": { "model": "oreganized:block/lime_vigil_candle_double_ceiling" }, - "candles=3,hanging=false": { + "candles=2,hanging=true,lit=true": { + "model": "oreganized:block/lime_vigil_candle_double_ceiling_lit" + }, + "candles=3,hanging=false,lit=false": { "model": "oreganized:block/lime_vigil_candle_triple" }, - "candles=3,hanging=true": { + "candles=3,hanging=false,lit=true": { + "model": "oreganized:block/lime_vigil_candle_triple_lit" + }, + "candles=3,hanging=true,lit=false": { "model": "oreganized:block/lime_vigil_candle_triple_ceiling" }, - "candles=4,hanging=false": { + "candles=3,hanging=true,lit=true": { + "model": "oreganized:block/lime_vigil_candle_triple_ceiling_lit" + }, + "candles=4,hanging=false,lit=false": { "model": "oreganized:block/lime_vigil_candle_quadruple" }, - "candles=4,hanging=true": { + "candles=4,hanging=false,lit=true": { + "model": "oreganized:block/lime_vigil_candle_quadruple_lit" + }, + "candles=4,hanging=true,lit=false": { "model": "oreganized:block/lime_vigil_candle_quadruple_ceiling" + }, + "candles=4,hanging=true,lit=true": { + "model": "oreganized:block/lime_vigil_candle_quadruple_ceiling_lit" } } } \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/blockstates/magenta_vigil_candle.json b/src/generated/resources/assets/oreganized/blockstates/magenta_vigil_candle.json index 26443f34..5c7a5064 100644 --- a/src/generated/resources/assets/oreganized/blockstates/magenta_vigil_candle.json +++ b/src/generated/resources/assets/oreganized/blockstates/magenta_vigil_candle.json @@ -1,28 +1,52 @@ { "variants": { - "candles=1,hanging=false": { + "candles=1,hanging=false,lit=false": { "model": "oreganized:block/magenta_vigil_candle_single" }, - "candles=1,hanging=true": { + "candles=1,hanging=false,lit=true": { + "model": "oreganized:block/magenta_vigil_candle_single_lit" + }, + "candles=1,hanging=true,lit=false": { "model": "oreganized:block/magenta_vigil_candle_single_ceiling" }, - "candles=2,hanging=false": { + "candles=1,hanging=true,lit=true": { + "model": "oreganized:block/magenta_vigil_candle_single_ceiling_lit" + }, + "candles=2,hanging=false,lit=false": { "model": "oreganized:block/magenta_vigil_candle_double" }, - "candles=2,hanging=true": { + "candles=2,hanging=false,lit=true": { + "model": "oreganized:block/magenta_vigil_candle_double_lit" + }, + "candles=2,hanging=true,lit=false": { "model": "oreganized:block/magenta_vigil_candle_double_ceiling" }, - "candles=3,hanging=false": { + "candles=2,hanging=true,lit=true": { + "model": "oreganized:block/magenta_vigil_candle_double_ceiling_lit" + }, + "candles=3,hanging=false,lit=false": { "model": "oreganized:block/magenta_vigil_candle_triple" }, - "candles=3,hanging=true": { + "candles=3,hanging=false,lit=true": { + "model": "oreganized:block/magenta_vigil_candle_triple_lit" + }, + "candles=3,hanging=true,lit=false": { "model": "oreganized:block/magenta_vigil_candle_triple_ceiling" }, - "candles=4,hanging=false": { + "candles=3,hanging=true,lit=true": { + "model": "oreganized:block/magenta_vigil_candle_triple_ceiling_lit" + }, + "candles=4,hanging=false,lit=false": { "model": "oreganized:block/magenta_vigil_candle_quadruple" }, - "candles=4,hanging=true": { + "candles=4,hanging=false,lit=true": { + "model": "oreganized:block/magenta_vigil_candle_quadruple_lit" + }, + "candles=4,hanging=true,lit=false": { "model": "oreganized:block/magenta_vigil_candle_quadruple_ceiling" + }, + "candles=4,hanging=true,lit=true": { + "model": "oreganized:block/magenta_vigil_candle_quadruple_ceiling_lit" } } } \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/blockstates/orange_vigil_candle.json b/src/generated/resources/assets/oreganized/blockstates/orange_vigil_candle.json index a70d26ff..50aad872 100644 --- a/src/generated/resources/assets/oreganized/blockstates/orange_vigil_candle.json +++ b/src/generated/resources/assets/oreganized/blockstates/orange_vigil_candle.json @@ -1,28 +1,52 @@ { "variants": { - "candles=1,hanging=false": { + "candles=1,hanging=false,lit=false": { "model": "oreganized:block/orange_vigil_candle_single" }, - "candles=1,hanging=true": { + "candles=1,hanging=false,lit=true": { + "model": "oreganized:block/orange_vigil_candle_single_lit" + }, + "candles=1,hanging=true,lit=false": { "model": "oreganized:block/orange_vigil_candle_single_ceiling" }, - "candles=2,hanging=false": { + "candles=1,hanging=true,lit=true": { + "model": "oreganized:block/orange_vigil_candle_single_ceiling_lit" + }, + "candles=2,hanging=false,lit=false": { "model": "oreganized:block/orange_vigil_candle_double" }, - "candles=2,hanging=true": { + "candles=2,hanging=false,lit=true": { + "model": "oreganized:block/orange_vigil_candle_double_lit" + }, + "candles=2,hanging=true,lit=false": { "model": "oreganized:block/orange_vigil_candle_double_ceiling" }, - "candles=3,hanging=false": { + "candles=2,hanging=true,lit=true": { + "model": "oreganized:block/orange_vigil_candle_double_ceiling_lit" + }, + "candles=3,hanging=false,lit=false": { "model": "oreganized:block/orange_vigil_candle_triple" }, - "candles=3,hanging=true": { + "candles=3,hanging=false,lit=true": { + "model": "oreganized:block/orange_vigil_candle_triple_lit" + }, + "candles=3,hanging=true,lit=false": { "model": "oreganized:block/orange_vigil_candle_triple_ceiling" }, - "candles=4,hanging=false": { + "candles=3,hanging=true,lit=true": { + "model": "oreganized:block/orange_vigil_candle_triple_ceiling_lit" + }, + "candles=4,hanging=false,lit=false": { "model": "oreganized:block/orange_vigil_candle_quadruple" }, - "candles=4,hanging=true": { + "candles=4,hanging=false,lit=true": { + "model": "oreganized:block/orange_vigil_candle_quadruple_lit" + }, + "candles=4,hanging=true,lit=false": { "model": "oreganized:block/orange_vigil_candle_quadruple_ceiling" + }, + "candles=4,hanging=true,lit=true": { + "model": "oreganized:block/orange_vigil_candle_quadruple_ceiling_lit" } } } \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/blockstates/pink_vigil_candle.json b/src/generated/resources/assets/oreganized/blockstates/pink_vigil_candle.json index bba4a5af..e1b55171 100644 --- a/src/generated/resources/assets/oreganized/blockstates/pink_vigil_candle.json +++ b/src/generated/resources/assets/oreganized/blockstates/pink_vigil_candle.json @@ -1,28 +1,52 @@ { "variants": { - "candles=1,hanging=false": { + "candles=1,hanging=false,lit=false": { "model": "oreganized:block/pink_vigil_candle_single" }, - "candles=1,hanging=true": { + "candles=1,hanging=false,lit=true": { + "model": "oreganized:block/pink_vigil_candle_single_lit" + }, + "candles=1,hanging=true,lit=false": { "model": "oreganized:block/pink_vigil_candle_single_ceiling" }, - "candles=2,hanging=false": { + "candles=1,hanging=true,lit=true": { + "model": "oreganized:block/pink_vigil_candle_single_ceiling_lit" + }, + "candles=2,hanging=false,lit=false": { "model": "oreganized:block/pink_vigil_candle_double" }, - "candles=2,hanging=true": { + "candles=2,hanging=false,lit=true": { + "model": "oreganized:block/pink_vigil_candle_double_lit" + }, + "candles=2,hanging=true,lit=false": { "model": "oreganized:block/pink_vigil_candle_double_ceiling" }, - "candles=3,hanging=false": { + "candles=2,hanging=true,lit=true": { + "model": "oreganized:block/pink_vigil_candle_double_ceiling_lit" + }, + "candles=3,hanging=false,lit=false": { "model": "oreganized:block/pink_vigil_candle_triple" }, - "candles=3,hanging=true": { + "candles=3,hanging=false,lit=true": { + "model": "oreganized:block/pink_vigil_candle_triple_lit" + }, + "candles=3,hanging=true,lit=false": { "model": "oreganized:block/pink_vigil_candle_triple_ceiling" }, - "candles=4,hanging=false": { + "candles=3,hanging=true,lit=true": { + "model": "oreganized:block/pink_vigil_candle_triple_ceiling_lit" + }, + "candles=4,hanging=false,lit=false": { "model": "oreganized:block/pink_vigil_candle_quadruple" }, - "candles=4,hanging=true": { + "candles=4,hanging=false,lit=true": { + "model": "oreganized:block/pink_vigil_candle_quadruple_lit" + }, + "candles=4,hanging=true,lit=false": { "model": "oreganized:block/pink_vigil_candle_quadruple_ceiling" + }, + "candles=4,hanging=true,lit=true": { + "model": "oreganized:block/pink_vigil_candle_quadruple_ceiling_lit" } } } \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/blockstates/purple_vigil_candle.json b/src/generated/resources/assets/oreganized/blockstates/purple_vigil_candle.json index 59fc0483..aac1daf4 100644 --- a/src/generated/resources/assets/oreganized/blockstates/purple_vigil_candle.json +++ b/src/generated/resources/assets/oreganized/blockstates/purple_vigil_candle.json @@ -1,28 +1,52 @@ { "variants": { - "candles=1,hanging=false": { + "candles=1,hanging=false,lit=false": { "model": "oreganized:block/purple_vigil_candle_single" }, - "candles=1,hanging=true": { + "candles=1,hanging=false,lit=true": { + "model": "oreganized:block/purple_vigil_candle_single_lit" + }, + "candles=1,hanging=true,lit=false": { "model": "oreganized:block/purple_vigil_candle_single_ceiling" }, - "candles=2,hanging=false": { + "candles=1,hanging=true,lit=true": { + "model": "oreganized:block/purple_vigil_candle_single_ceiling_lit" + }, + "candles=2,hanging=false,lit=false": { "model": "oreganized:block/purple_vigil_candle_double" }, - "candles=2,hanging=true": { + "candles=2,hanging=false,lit=true": { + "model": "oreganized:block/purple_vigil_candle_double_lit" + }, + "candles=2,hanging=true,lit=false": { "model": "oreganized:block/purple_vigil_candle_double_ceiling" }, - "candles=3,hanging=false": { + "candles=2,hanging=true,lit=true": { + "model": "oreganized:block/purple_vigil_candle_double_ceiling_lit" + }, + "candles=3,hanging=false,lit=false": { "model": "oreganized:block/purple_vigil_candle_triple" }, - "candles=3,hanging=true": { + "candles=3,hanging=false,lit=true": { + "model": "oreganized:block/purple_vigil_candle_triple_lit" + }, + "candles=3,hanging=true,lit=false": { "model": "oreganized:block/purple_vigil_candle_triple_ceiling" }, - "candles=4,hanging=false": { + "candles=3,hanging=true,lit=true": { + "model": "oreganized:block/purple_vigil_candle_triple_ceiling_lit" + }, + "candles=4,hanging=false,lit=false": { "model": "oreganized:block/purple_vigil_candle_quadruple" }, - "candles=4,hanging=true": { + "candles=4,hanging=false,lit=true": { + "model": "oreganized:block/purple_vigil_candle_quadruple_lit" + }, + "candles=4,hanging=true,lit=false": { "model": "oreganized:block/purple_vigil_candle_quadruple_ceiling" + }, + "candles=4,hanging=true,lit=true": { + "model": "oreganized:block/purple_vigil_candle_quadruple_ceiling_lit" } } } \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/blockstates/red_vigil_candle.json b/src/generated/resources/assets/oreganized/blockstates/red_vigil_candle.json index 3cc36743..152589d2 100644 --- a/src/generated/resources/assets/oreganized/blockstates/red_vigil_candle.json +++ b/src/generated/resources/assets/oreganized/blockstates/red_vigil_candle.json @@ -1,28 +1,52 @@ { "variants": { - "candles=1,hanging=false": { + "candles=1,hanging=false,lit=false": { "model": "oreganized:block/red_vigil_candle_single" }, - "candles=1,hanging=true": { + "candles=1,hanging=false,lit=true": { + "model": "oreganized:block/red_vigil_candle_single_lit" + }, + "candles=1,hanging=true,lit=false": { "model": "oreganized:block/red_vigil_candle_single_ceiling" }, - "candles=2,hanging=false": { + "candles=1,hanging=true,lit=true": { + "model": "oreganized:block/red_vigil_candle_single_ceiling_lit" + }, + "candles=2,hanging=false,lit=false": { "model": "oreganized:block/red_vigil_candle_double" }, - "candles=2,hanging=true": { + "candles=2,hanging=false,lit=true": { + "model": "oreganized:block/red_vigil_candle_double_lit" + }, + "candles=2,hanging=true,lit=false": { "model": "oreganized:block/red_vigil_candle_double_ceiling" }, - "candles=3,hanging=false": { + "candles=2,hanging=true,lit=true": { + "model": "oreganized:block/red_vigil_candle_double_ceiling_lit" + }, + "candles=3,hanging=false,lit=false": { "model": "oreganized:block/red_vigil_candle_triple" }, - "candles=3,hanging=true": { + "candles=3,hanging=false,lit=true": { + "model": "oreganized:block/red_vigil_candle_triple_lit" + }, + "candles=3,hanging=true,lit=false": { "model": "oreganized:block/red_vigil_candle_triple_ceiling" }, - "candles=4,hanging=false": { + "candles=3,hanging=true,lit=true": { + "model": "oreganized:block/red_vigil_candle_triple_ceiling_lit" + }, + "candles=4,hanging=false,lit=false": { "model": "oreganized:block/red_vigil_candle_quadruple" }, - "candles=4,hanging=true": { + "candles=4,hanging=false,lit=true": { + "model": "oreganized:block/red_vigil_candle_quadruple_lit" + }, + "candles=4,hanging=true,lit=false": { "model": "oreganized:block/red_vigil_candle_quadruple_ceiling" + }, + "candles=4,hanging=true,lit=true": { + "model": "oreganized:block/red_vigil_candle_quadruple_ceiling_lit" } } } \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/blockstates/vigil_candle.json b/src/generated/resources/assets/oreganized/blockstates/vigil_candle.json index a96cdf92..6e907d31 100644 --- a/src/generated/resources/assets/oreganized/blockstates/vigil_candle.json +++ b/src/generated/resources/assets/oreganized/blockstates/vigil_candle.json @@ -1,28 +1,52 @@ { "variants": { - "candles=1,hanging=false": { + "candles=1,hanging=false,lit=false": { "model": "oreganized:block/defaultvigil_candle_single" }, - "candles=1,hanging=true": { + "candles=1,hanging=false,lit=true": { + "model": "oreganized:block/defaultvigil_candle_single_lit" + }, + "candles=1,hanging=true,lit=false": { "model": "oreganized:block/defaultvigil_candle_single_ceiling" }, - "candles=2,hanging=false": { + "candles=1,hanging=true,lit=true": { + "model": "oreganized:block/defaultvigil_candle_single_ceiling_lit" + }, + "candles=2,hanging=false,lit=false": { "model": "oreganized:block/defaultvigil_candle_double" }, - "candles=2,hanging=true": { + "candles=2,hanging=false,lit=true": { + "model": "oreganized:block/defaultvigil_candle_double_lit" + }, + "candles=2,hanging=true,lit=false": { "model": "oreganized:block/defaultvigil_candle_double_ceiling" }, - "candles=3,hanging=false": { + "candles=2,hanging=true,lit=true": { + "model": "oreganized:block/defaultvigil_candle_double_ceiling_lit" + }, + "candles=3,hanging=false,lit=false": { "model": "oreganized:block/defaultvigil_candle_triple" }, - "candles=3,hanging=true": { + "candles=3,hanging=false,lit=true": { + "model": "oreganized:block/defaultvigil_candle_triple_lit" + }, + "candles=3,hanging=true,lit=false": { "model": "oreganized:block/defaultvigil_candle_triple_ceiling" }, - "candles=4,hanging=false": { + "candles=3,hanging=true,lit=true": { + "model": "oreganized:block/defaultvigil_candle_triple_ceiling_lit" + }, + "candles=4,hanging=false,lit=false": { "model": "oreganized:block/defaultvigil_candle_quadruple" }, - "candles=4,hanging=true": { + "candles=4,hanging=false,lit=true": { + "model": "oreganized:block/defaultvigil_candle_quadruple_lit" + }, + "candles=4,hanging=true,lit=false": { "model": "oreganized:block/defaultvigil_candle_quadruple_ceiling" + }, + "candles=4,hanging=true,lit=true": { + "model": "oreganized:block/defaultvigil_candle_quadruple_ceiling_lit" } } } \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/blockstates/white_vigil_candle.json b/src/generated/resources/assets/oreganized/blockstates/white_vigil_candle.json index 1f277810..45b3a042 100644 --- a/src/generated/resources/assets/oreganized/blockstates/white_vigil_candle.json +++ b/src/generated/resources/assets/oreganized/blockstates/white_vigil_candle.json @@ -1,28 +1,52 @@ { "variants": { - "candles=1,hanging=false": { + "candles=1,hanging=false,lit=false": { "model": "oreganized:block/white_vigil_candle_single" }, - "candles=1,hanging=true": { + "candles=1,hanging=false,lit=true": { + "model": "oreganized:block/white_vigil_candle_single_lit" + }, + "candles=1,hanging=true,lit=false": { "model": "oreganized:block/white_vigil_candle_single_ceiling" }, - "candles=2,hanging=false": { + "candles=1,hanging=true,lit=true": { + "model": "oreganized:block/white_vigil_candle_single_ceiling_lit" + }, + "candles=2,hanging=false,lit=false": { "model": "oreganized:block/white_vigil_candle_double" }, - "candles=2,hanging=true": { + "candles=2,hanging=false,lit=true": { + "model": "oreganized:block/white_vigil_candle_double_lit" + }, + "candles=2,hanging=true,lit=false": { "model": "oreganized:block/white_vigil_candle_double_ceiling" }, - "candles=3,hanging=false": { + "candles=2,hanging=true,lit=true": { + "model": "oreganized:block/white_vigil_candle_double_ceiling_lit" + }, + "candles=3,hanging=false,lit=false": { "model": "oreganized:block/white_vigil_candle_triple" }, - "candles=3,hanging=true": { + "candles=3,hanging=false,lit=true": { + "model": "oreganized:block/white_vigil_candle_triple_lit" + }, + "candles=3,hanging=true,lit=false": { "model": "oreganized:block/white_vigil_candle_triple_ceiling" }, - "candles=4,hanging=false": { + "candles=3,hanging=true,lit=true": { + "model": "oreganized:block/white_vigil_candle_triple_ceiling_lit" + }, + "candles=4,hanging=false,lit=false": { "model": "oreganized:block/white_vigil_candle_quadruple" }, - "candles=4,hanging=true": { + "candles=4,hanging=false,lit=true": { + "model": "oreganized:block/white_vigil_candle_quadruple_lit" + }, + "candles=4,hanging=true,lit=false": { "model": "oreganized:block/white_vigil_candle_quadruple_ceiling" + }, + "candles=4,hanging=true,lit=true": { + "model": "oreganized:block/white_vigil_candle_quadruple_ceiling_lit" } } } \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/blockstates/yellow_vigil_candle.json b/src/generated/resources/assets/oreganized/blockstates/yellow_vigil_candle.json index 9351229d..293b0b00 100644 --- a/src/generated/resources/assets/oreganized/blockstates/yellow_vigil_candle.json +++ b/src/generated/resources/assets/oreganized/blockstates/yellow_vigil_candle.json @@ -1,28 +1,52 @@ { "variants": { - "candles=1,hanging=false": { + "candles=1,hanging=false,lit=false": { "model": "oreganized:block/yellow_vigil_candle_single" }, - "candles=1,hanging=true": { + "candles=1,hanging=false,lit=true": { + "model": "oreganized:block/yellow_vigil_candle_single_lit" + }, + "candles=1,hanging=true,lit=false": { "model": "oreganized:block/yellow_vigil_candle_single_ceiling" }, - "candles=2,hanging=false": { + "candles=1,hanging=true,lit=true": { + "model": "oreganized:block/yellow_vigil_candle_single_ceiling_lit" + }, + "candles=2,hanging=false,lit=false": { "model": "oreganized:block/yellow_vigil_candle_double" }, - "candles=2,hanging=true": { + "candles=2,hanging=false,lit=true": { + "model": "oreganized:block/yellow_vigil_candle_double_lit" + }, + "candles=2,hanging=true,lit=false": { "model": "oreganized:block/yellow_vigil_candle_double_ceiling" }, - "candles=3,hanging=false": { + "candles=2,hanging=true,lit=true": { + "model": "oreganized:block/yellow_vigil_candle_double_ceiling_lit" + }, + "candles=3,hanging=false,lit=false": { "model": "oreganized:block/yellow_vigil_candle_triple" }, - "candles=3,hanging=true": { + "candles=3,hanging=false,lit=true": { + "model": "oreganized:block/yellow_vigil_candle_triple_lit" + }, + "candles=3,hanging=true,lit=false": { "model": "oreganized:block/yellow_vigil_candle_triple_ceiling" }, - "candles=4,hanging=false": { + "candles=3,hanging=true,lit=true": { + "model": "oreganized:block/yellow_vigil_candle_triple_ceiling_lit" + }, + "candles=4,hanging=false,lit=false": { "model": "oreganized:block/yellow_vigil_candle_quadruple" }, - "candles=4,hanging=true": { + "candles=4,hanging=false,lit=true": { + "model": "oreganized:block/yellow_vigil_candle_quadruple_lit" + }, + "candles=4,hanging=true,lit=false": { "model": "oreganized:block/yellow_vigil_candle_quadruple_ceiling" + }, + "candles=4,hanging=true,lit=true": { + "model": "oreganized:block/yellow_vigil_candle_quadruple_ceiling_lit" } } } \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/black_vigil_candle_double_ceiling_lit.json b/src/generated/resources/assets/oreganized/models/block/black_vigil_candle_double_ceiling_lit.json new file mode 100644 index 00000000..df602460 --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/black_vigil_candle_double_ceiling_lit.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_double_ceiling", + "textures": { + "0": "oreganized:block/black_vigil_candle_lit" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/black_vigil_candle_double_lit.json b/src/generated/resources/assets/oreganized/models/block/black_vigil_candle_double_lit.json new file mode 100644 index 00000000..fd8443a5 --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/black_vigil_candle_double_lit.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_double", + "textures": { + "0": "oreganized:block/black_vigil_candle_lit" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/black_vigil_candle_quadruple_ceiling_lit.json b/src/generated/resources/assets/oreganized/models/block/black_vigil_candle_quadruple_ceiling_lit.json new file mode 100644 index 00000000..3accefed --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/black_vigil_candle_quadruple_ceiling_lit.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_quadruple_ceiling", + "textures": { + "0": "oreganized:block/black_vigil_candle_lit" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/black_vigil_candle_quadruple_lit.json b/src/generated/resources/assets/oreganized/models/block/black_vigil_candle_quadruple_lit.json new file mode 100644 index 00000000..35608203 --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/black_vigil_candle_quadruple_lit.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_quadruple", + "textures": { + "0": "oreganized:block/black_vigil_candle_lit" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/black_vigil_candle_single_ceiling_lit.json b/src/generated/resources/assets/oreganized/models/block/black_vigil_candle_single_ceiling_lit.json new file mode 100644 index 00000000..7c4737b5 --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/black_vigil_candle_single_ceiling_lit.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_single_ceiling", + "textures": { + "0": "oreganized:block/black_vigil_candle_lit" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/black_vigil_candle_single_lit.json b/src/generated/resources/assets/oreganized/models/block/black_vigil_candle_single_lit.json new file mode 100644 index 00000000..bbbe1523 --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/black_vigil_candle_single_lit.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_single", + "textures": { + "0": "oreganized:block/black_vigil_candle_lit" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/black_vigil_candle_triple_ceiling_lit.json b/src/generated/resources/assets/oreganized/models/block/black_vigil_candle_triple_ceiling_lit.json new file mode 100644 index 00000000..65390389 --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/black_vigil_candle_triple_ceiling_lit.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_triple_ceiling", + "textures": { + "0": "oreganized:block/black_vigil_candle_lit" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/black_vigil_candle_triple_lit.json b/src/generated/resources/assets/oreganized/models/block/black_vigil_candle_triple_lit.json new file mode 100644 index 00000000..25849f9c --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/black_vigil_candle_triple_lit.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_triple", + "textures": { + "0": "oreganized:block/black_vigil_candle_lit" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/blue_vigil_candle_double_ceiling_lit.json b/src/generated/resources/assets/oreganized/models/block/blue_vigil_candle_double_ceiling_lit.json new file mode 100644 index 00000000..39e1e40e --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/blue_vigil_candle_double_ceiling_lit.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_double_ceiling", + "textures": { + "0": "oreganized:block/blue_vigil_candle_lit" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/blue_vigil_candle_double_lit.json b/src/generated/resources/assets/oreganized/models/block/blue_vigil_candle_double_lit.json new file mode 100644 index 00000000..e0caafed --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/blue_vigil_candle_double_lit.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_double", + "textures": { + "0": "oreganized:block/blue_vigil_candle_lit" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/blue_vigil_candle_quadruple_ceiling_lit.json b/src/generated/resources/assets/oreganized/models/block/blue_vigil_candle_quadruple_ceiling_lit.json new file mode 100644 index 00000000..b89a39dd --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/blue_vigil_candle_quadruple_ceiling_lit.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_quadruple_ceiling", + "textures": { + "0": "oreganized:block/blue_vigil_candle_lit" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/blue_vigil_candle_quadruple_lit.json b/src/generated/resources/assets/oreganized/models/block/blue_vigil_candle_quadruple_lit.json new file mode 100644 index 00000000..92667fec --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/blue_vigil_candle_quadruple_lit.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_quadruple", + "textures": { + "0": "oreganized:block/blue_vigil_candle_lit" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/blue_vigil_candle_single_ceiling_lit.json b/src/generated/resources/assets/oreganized/models/block/blue_vigil_candle_single_ceiling_lit.json new file mode 100644 index 00000000..0de7dba7 --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/blue_vigil_candle_single_ceiling_lit.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_single_ceiling", + "textures": { + "0": "oreganized:block/blue_vigil_candle_lit" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/blue_vigil_candle_single_lit.json b/src/generated/resources/assets/oreganized/models/block/blue_vigil_candle_single_lit.json new file mode 100644 index 00000000..f1abec39 --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/blue_vigil_candle_single_lit.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_single", + "textures": { + "0": "oreganized:block/blue_vigil_candle_lit" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/blue_vigil_candle_triple_ceiling_lit.json b/src/generated/resources/assets/oreganized/models/block/blue_vigil_candle_triple_ceiling_lit.json new file mode 100644 index 00000000..c1bf1f9f --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/blue_vigil_candle_triple_ceiling_lit.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_triple_ceiling", + "textures": { + "0": "oreganized:block/blue_vigil_candle_lit" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/blue_vigil_candle_triple_lit.json b/src/generated/resources/assets/oreganized/models/block/blue_vigil_candle_triple_lit.json new file mode 100644 index 00000000..da96db8c --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/blue_vigil_candle_triple_lit.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_triple", + "textures": { + "0": "oreganized:block/blue_vigil_candle_lit" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/brown_vigil_candle_double_ceiling_lit.json b/src/generated/resources/assets/oreganized/models/block/brown_vigil_candle_double_ceiling_lit.json new file mode 100644 index 00000000..7a15560b --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/brown_vigil_candle_double_ceiling_lit.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_double_ceiling", + "textures": { + "0": "oreganized:block/brown_vigil_candle_lit" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/brown_vigil_candle_double_lit.json b/src/generated/resources/assets/oreganized/models/block/brown_vigil_candle_double_lit.json new file mode 100644 index 00000000..ffe951d6 --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/brown_vigil_candle_double_lit.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_double", + "textures": { + "0": "oreganized:block/brown_vigil_candle_lit" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/brown_vigil_candle_quadruple_ceiling_lit.json b/src/generated/resources/assets/oreganized/models/block/brown_vigil_candle_quadruple_ceiling_lit.json new file mode 100644 index 00000000..287c133d --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/brown_vigil_candle_quadruple_ceiling_lit.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_quadruple_ceiling", + "textures": { + "0": "oreganized:block/brown_vigil_candle_lit" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/brown_vigil_candle_quadruple_lit.json b/src/generated/resources/assets/oreganized/models/block/brown_vigil_candle_quadruple_lit.json new file mode 100644 index 00000000..033707a7 --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/brown_vigil_candle_quadruple_lit.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_quadruple", + "textures": { + "0": "oreganized:block/brown_vigil_candle_lit" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/brown_vigil_candle_single_ceiling_lit.json b/src/generated/resources/assets/oreganized/models/block/brown_vigil_candle_single_ceiling_lit.json new file mode 100644 index 00000000..fe899bfc --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/brown_vigil_candle_single_ceiling_lit.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_single_ceiling", + "textures": { + "0": "oreganized:block/brown_vigil_candle_lit" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/brown_vigil_candle_single_lit.json b/src/generated/resources/assets/oreganized/models/block/brown_vigil_candle_single_lit.json new file mode 100644 index 00000000..4d5afcd4 --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/brown_vigil_candle_single_lit.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_single", + "textures": { + "0": "oreganized:block/brown_vigil_candle_lit" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/brown_vigil_candle_triple_ceiling_lit.json b/src/generated/resources/assets/oreganized/models/block/brown_vigil_candle_triple_ceiling_lit.json new file mode 100644 index 00000000..4c397aba --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/brown_vigil_candle_triple_ceiling_lit.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_triple_ceiling", + "textures": { + "0": "oreganized:block/brown_vigil_candle_lit" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/brown_vigil_candle_triple_lit.json b/src/generated/resources/assets/oreganized/models/block/brown_vigil_candle_triple_lit.json new file mode 100644 index 00000000..2b1ea699 --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/brown_vigil_candle_triple_lit.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_triple", + "textures": { + "0": "oreganized:block/brown_vigil_candle_lit" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/cyan_vigil_candle_double_ceiling_lit.json b/src/generated/resources/assets/oreganized/models/block/cyan_vigil_candle_double_ceiling_lit.json new file mode 100644 index 00000000..975cb6b4 --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/cyan_vigil_candle_double_ceiling_lit.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_double_ceiling", + "textures": { + "0": "oreganized:block/cyan_vigil_candle_lit" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/cyan_vigil_candle_double_lit.json b/src/generated/resources/assets/oreganized/models/block/cyan_vigil_candle_double_lit.json new file mode 100644 index 00000000..2022d478 --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/cyan_vigil_candle_double_lit.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_double", + "textures": { + "0": "oreganized:block/cyan_vigil_candle_lit" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/cyan_vigil_candle_quadruple_ceiling_lit.json b/src/generated/resources/assets/oreganized/models/block/cyan_vigil_candle_quadruple_ceiling_lit.json new file mode 100644 index 00000000..50eda84c --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/cyan_vigil_candle_quadruple_ceiling_lit.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_quadruple_ceiling", + "textures": { + "0": "oreganized:block/cyan_vigil_candle_lit" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/cyan_vigil_candle_quadruple_lit.json b/src/generated/resources/assets/oreganized/models/block/cyan_vigil_candle_quadruple_lit.json new file mode 100644 index 00000000..ebafba49 --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/cyan_vigil_candle_quadruple_lit.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_quadruple", + "textures": { + "0": "oreganized:block/cyan_vigil_candle_lit" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/cyan_vigil_candle_single_ceiling_lit.json b/src/generated/resources/assets/oreganized/models/block/cyan_vigil_candle_single_ceiling_lit.json new file mode 100644 index 00000000..775c9df9 --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/cyan_vigil_candle_single_ceiling_lit.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_single_ceiling", + "textures": { + "0": "oreganized:block/cyan_vigil_candle_lit" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/cyan_vigil_candle_single_lit.json b/src/generated/resources/assets/oreganized/models/block/cyan_vigil_candle_single_lit.json new file mode 100644 index 00000000..e3773197 --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/cyan_vigil_candle_single_lit.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_single", + "textures": { + "0": "oreganized:block/cyan_vigil_candle_lit" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/cyan_vigil_candle_triple_ceiling_lit.json b/src/generated/resources/assets/oreganized/models/block/cyan_vigil_candle_triple_ceiling_lit.json new file mode 100644 index 00000000..8f742c63 --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/cyan_vigil_candle_triple_ceiling_lit.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_triple_ceiling", + "textures": { + "0": "oreganized:block/cyan_vigil_candle_lit" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/cyan_vigil_candle_triple_lit.json b/src/generated/resources/assets/oreganized/models/block/cyan_vigil_candle_triple_lit.json new file mode 100644 index 00000000..ac459008 --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/cyan_vigil_candle_triple_lit.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_triple", + "textures": { + "0": "oreganized:block/cyan_vigil_candle_lit" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/defaultvigil_candle_double_ceiling_lit.json b/src/generated/resources/assets/oreganized/models/block/defaultvigil_candle_double_ceiling_lit.json new file mode 100644 index 00000000..84858335 --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/defaultvigil_candle_double_ceiling_lit.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_double_ceiling", + "textures": { + "0": "oreganized:block/vigil_candle_lit" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/defaultvigil_candle_double_lit.json b/src/generated/resources/assets/oreganized/models/block/defaultvigil_candle_double_lit.json new file mode 100644 index 00000000..84820cf4 --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/defaultvigil_candle_double_lit.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_double", + "textures": { + "0": "oreganized:block/vigil_candle_lit" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/defaultvigil_candle_quadruple_ceiling_lit.json b/src/generated/resources/assets/oreganized/models/block/defaultvigil_candle_quadruple_ceiling_lit.json new file mode 100644 index 00000000..59d974ae --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/defaultvigil_candle_quadruple_ceiling_lit.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_quadruple_ceiling", + "textures": { + "0": "oreganized:block/vigil_candle_lit" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/defaultvigil_candle_quadruple_lit.json b/src/generated/resources/assets/oreganized/models/block/defaultvigil_candle_quadruple_lit.json new file mode 100644 index 00000000..e94073f7 --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/defaultvigil_candle_quadruple_lit.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_quadruple", + "textures": { + "0": "oreganized:block/vigil_candle_lit" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/defaultvigil_candle_single_ceiling_lit.json b/src/generated/resources/assets/oreganized/models/block/defaultvigil_candle_single_ceiling_lit.json new file mode 100644 index 00000000..72c431b1 --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/defaultvigil_candle_single_ceiling_lit.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_single_ceiling", + "textures": { + "0": "oreganized:block/vigil_candle_lit" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/defaultvigil_candle_single_lit.json b/src/generated/resources/assets/oreganized/models/block/defaultvigil_candle_single_lit.json new file mode 100644 index 00000000..a4b52ad8 --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/defaultvigil_candle_single_lit.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_single", + "textures": { + "0": "oreganized:block/vigil_candle_lit" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/defaultvigil_candle_triple_ceiling_lit.json b/src/generated/resources/assets/oreganized/models/block/defaultvigil_candle_triple_ceiling_lit.json new file mode 100644 index 00000000..fd1b2e55 --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/defaultvigil_candle_triple_ceiling_lit.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_triple_ceiling", + "textures": { + "0": "oreganized:block/vigil_candle_lit" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/defaultvigil_candle_triple_lit.json b/src/generated/resources/assets/oreganized/models/block/defaultvigil_candle_triple_lit.json new file mode 100644 index 00000000..cb8b50d7 --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/defaultvigil_candle_triple_lit.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_triple", + "textures": { + "0": "oreganized:block/vigil_candle_lit" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/gray_vigil_candle_double_ceiling_lit.json b/src/generated/resources/assets/oreganized/models/block/gray_vigil_candle_double_ceiling_lit.json new file mode 100644 index 00000000..c26ec172 --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/gray_vigil_candle_double_ceiling_lit.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_double_ceiling", + "textures": { + "0": "oreganized:block/gray_vigil_candle_lit" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/gray_vigil_candle_double_lit.json b/src/generated/resources/assets/oreganized/models/block/gray_vigil_candle_double_lit.json new file mode 100644 index 00000000..85ead585 --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/gray_vigil_candle_double_lit.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_double", + "textures": { + "0": "oreganized:block/gray_vigil_candle_lit" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/gray_vigil_candle_quadruple_ceiling_lit.json b/src/generated/resources/assets/oreganized/models/block/gray_vigil_candle_quadruple_ceiling_lit.json new file mode 100644 index 00000000..1f9bb71f --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/gray_vigil_candle_quadruple_ceiling_lit.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_quadruple_ceiling", + "textures": { + "0": "oreganized:block/gray_vigil_candle_lit" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/gray_vigil_candle_quadruple_lit.json b/src/generated/resources/assets/oreganized/models/block/gray_vigil_candle_quadruple_lit.json new file mode 100644 index 00000000..b35c7530 --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/gray_vigil_candle_quadruple_lit.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_quadruple", + "textures": { + "0": "oreganized:block/gray_vigil_candle_lit" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/gray_vigil_candle_single_ceiling_lit.json b/src/generated/resources/assets/oreganized/models/block/gray_vigil_candle_single_ceiling_lit.json new file mode 100644 index 00000000..e6e74962 --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/gray_vigil_candle_single_ceiling_lit.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_single_ceiling", + "textures": { + "0": "oreganized:block/gray_vigil_candle_lit" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/gray_vigil_candle_single_lit.json b/src/generated/resources/assets/oreganized/models/block/gray_vigil_candle_single_lit.json new file mode 100644 index 00000000..adae53e0 --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/gray_vigil_candle_single_lit.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_single", + "textures": { + "0": "oreganized:block/gray_vigil_candle_lit" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/gray_vigil_candle_triple_ceiling_lit.json b/src/generated/resources/assets/oreganized/models/block/gray_vigil_candle_triple_ceiling_lit.json new file mode 100644 index 00000000..fba1957f --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/gray_vigil_candle_triple_ceiling_lit.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_triple_ceiling", + "textures": { + "0": "oreganized:block/gray_vigil_candle_lit" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/gray_vigil_candle_triple_lit.json b/src/generated/resources/assets/oreganized/models/block/gray_vigil_candle_triple_lit.json new file mode 100644 index 00000000..4a645db7 --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/gray_vigil_candle_triple_lit.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_triple", + "textures": { + "0": "oreganized:block/gray_vigil_candle_lit" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/green_vigil_candle_double_ceiling_lit.json b/src/generated/resources/assets/oreganized/models/block/green_vigil_candle_double_ceiling_lit.json new file mode 100644 index 00000000..3cb72317 --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/green_vigil_candle_double_ceiling_lit.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_double_ceiling", + "textures": { + "0": "oreganized:block/green_vigil_candle_lit" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/green_vigil_candle_double_lit.json b/src/generated/resources/assets/oreganized/models/block/green_vigil_candle_double_lit.json new file mode 100644 index 00000000..d0868757 --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/green_vigil_candle_double_lit.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_double", + "textures": { + "0": "oreganized:block/green_vigil_candle_lit" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/green_vigil_candle_quadruple_ceiling_lit.json b/src/generated/resources/assets/oreganized/models/block/green_vigil_candle_quadruple_ceiling_lit.json new file mode 100644 index 00000000..0be8434f --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/green_vigil_candle_quadruple_ceiling_lit.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_quadruple_ceiling", + "textures": { + "0": "oreganized:block/green_vigil_candle_lit" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/green_vigil_candle_quadruple_lit.json b/src/generated/resources/assets/oreganized/models/block/green_vigil_candle_quadruple_lit.json new file mode 100644 index 00000000..7f76343f --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/green_vigil_candle_quadruple_lit.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_quadruple", + "textures": { + "0": "oreganized:block/green_vigil_candle_lit" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/green_vigil_candle_single_ceiling_lit.json b/src/generated/resources/assets/oreganized/models/block/green_vigil_candle_single_ceiling_lit.json new file mode 100644 index 00000000..1621d7ec --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/green_vigil_candle_single_ceiling_lit.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_single_ceiling", + "textures": { + "0": "oreganized:block/green_vigil_candle_lit" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/green_vigil_candle_single_lit.json b/src/generated/resources/assets/oreganized/models/block/green_vigil_candle_single_lit.json new file mode 100644 index 00000000..abc62665 --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/green_vigil_candle_single_lit.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_single", + "textures": { + "0": "oreganized:block/green_vigil_candle_lit" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/green_vigil_candle_triple_ceiling_lit.json b/src/generated/resources/assets/oreganized/models/block/green_vigil_candle_triple_ceiling_lit.json new file mode 100644 index 00000000..e48f5b8d --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/green_vigil_candle_triple_ceiling_lit.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_triple_ceiling", + "textures": { + "0": "oreganized:block/green_vigil_candle_lit" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/green_vigil_candle_triple_lit.json b/src/generated/resources/assets/oreganized/models/block/green_vigil_candle_triple_lit.json new file mode 100644 index 00000000..e06e7be9 --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/green_vigil_candle_triple_lit.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_triple", + "textures": { + "0": "oreganized:block/green_vigil_candle_lit" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/light_blue_vigil_candle_double_ceiling_lit.json b/src/generated/resources/assets/oreganized/models/block/light_blue_vigil_candle_double_ceiling_lit.json new file mode 100644 index 00000000..52a92241 --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/light_blue_vigil_candle_double_ceiling_lit.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_double_ceiling", + "textures": { + "0": "oreganized:block/light_blue_vigil_candle_lit" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/light_blue_vigil_candle_double_lit.json b/src/generated/resources/assets/oreganized/models/block/light_blue_vigil_candle_double_lit.json new file mode 100644 index 00000000..c000ba82 --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/light_blue_vigil_candle_double_lit.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_double", + "textures": { + "0": "oreganized:block/light_blue_vigil_candle_lit" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/light_blue_vigil_candle_quadruple_ceiling_lit.json b/src/generated/resources/assets/oreganized/models/block/light_blue_vigil_candle_quadruple_ceiling_lit.json new file mode 100644 index 00000000..8dc51a8c --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/light_blue_vigil_candle_quadruple_ceiling_lit.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_quadruple_ceiling", + "textures": { + "0": "oreganized:block/light_blue_vigil_candle_lit" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/light_blue_vigil_candle_quadruple_lit.json b/src/generated/resources/assets/oreganized/models/block/light_blue_vigil_candle_quadruple_lit.json new file mode 100644 index 00000000..19d3def8 --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/light_blue_vigil_candle_quadruple_lit.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_quadruple", + "textures": { + "0": "oreganized:block/light_blue_vigil_candle_lit" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/light_blue_vigil_candle_single_ceiling_lit.json b/src/generated/resources/assets/oreganized/models/block/light_blue_vigil_candle_single_ceiling_lit.json new file mode 100644 index 00000000..69f20aed --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/light_blue_vigil_candle_single_ceiling_lit.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_single_ceiling", + "textures": { + "0": "oreganized:block/light_blue_vigil_candle_lit" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/light_blue_vigil_candle_single_lit.json b/src/generated/resources/assets/oreganized/models/block/light_blue_vigil_candle_single_lit.json new file mode 100644 index 00000000..1bd9b8c7 --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/light_blue_vigil_candle_single_lit.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_single", + "textures": { + "0": "oreganized:block/light_blue_vigil_candle_lit" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/light_blue_vigil_candle_triple_ceiling_lit.json b/src/generated/resources/assets/oreganized/models/block/light_blue_vigil_candle_triple_ceiling_lit.json new file mode 100644 index 00000000..c2dd93fd --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/light_blue_vigil_candle_triple_ceiling_lit.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_triple_ceiling", + "textures": { + "0": "oreganized:block/light_blue_vigil_candle_lit" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/light_blue_vigil_candle_triple_lit.json b/src/generated/resources/assets/oreganized/models/block/light_blue_vigil_candle_triple_lit.json new file mode 100644 index 00000000..6d730e2c --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/light_blue_vigil_candle_triple_lit.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_triple", + "textures": { + "0": "oreganized:block/light_blue_vigil_candle_lit" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/light_gray_vigil_candle_double_ceiling_lit.json b/src/generated/resources/assets/oreganized/models/block/light_gray_vigil_candle_double_ceiling_lit.json new file mode 100644 index 00000000..fe6e1d52 --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/light_gray_vigil_candle_double_ceiling_lit.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_double_ceiling", + "textures": { + "0": "oreganized:block/light_gray_vigil_candle_lit" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/light_gray_vigil_candle_double_lit.json b/src/generated/resources/assets/oreganized/models/block/light_gray_vigil_candle_double_lit.json new file mode 100644 index 00000000..50980396 --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/light_gray_vigil_candle_double_lit.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_double", + "textures": { + "0": "oreganized:block/light_gray_vigil_candle_lit" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/light_gray_vigil_candle_quadruple_ceiling_lit.json b/src/generated/resources/assets/oreganized/models/block/light_gray_vigil_candle_quadruple_ceiling_lit.json new file mode 100644 index 00000000..77b8faa7 --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/light_gray_vigil_candle_quadruple_ceiling_lit.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_quadruple_ceiling", + "textures": { + "0": "oreganized:block/light_gray_vigil_candle_lit" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/light_gray_vigil_candle_quadruple_lit.json b/src/generated/resources/assets/oreganized/models/block/light_gray_vigil_candle_quadruple_lit.json new file mode 100644 index 00000000..755204eb --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/light_gray_vigil_candle_quadruple_lit.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_quadruple", + "textures": { + "0": "oreganized:block/light_gray_vigil_candle_lit" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/light_gray_vigil_candle_single_ceiling_lit.json b/src/generated/resources/assets/oreganized/models/block/light_gray_vigil_candle_single_ceiling_lit.json new file mode 100644 index 00000000..104134b2 --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/light_gray_vigil_candle_single_ceiling_lit.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_single_ceiling", + "textures": { + "0": "oreganized:block/light_gray_vigil_candle_lit" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/light_gray_vigil_candle_single_lit.json b/src/generated/resources/assets/oreganized/models/block/light_gray_vigil_candle_single_lit.json new file mode 100644 index 00000000..e194b4d7 --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/light_gray_vigil_candle_single_lit.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_single", + "textures": { + "0": "oreganized:block/light_gray_vigil_candle_lit" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/light_gray_vigil_candle_triple_ceiling_lit.json b/src/generated/resources/assets/oreganized/models/block/light_gray_vigil_candle_triple_ceiling_lit.json new file mode 100644 index 00000000..f364d962 --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/light_gray_vigil_candle_triple_ceiling_lit.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_triple_ceiling", + "textures": { + "0": "oreganized:block/light_gray_vigil_candle_lit" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/light_gray_vigil_candle_triple_lit.json b/src/generated/resources/assets/oreganized/models/block/light_gray_vigil_candle_triple_lit.json new file mode 100644 index 00000000..df43acbb --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/light_gray_vigil_candle_triple_lit.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_triple", + "textures": { + "0": "oreganized:block/light_gray_vigil_candle_lit" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/lime_vigil_candle_double_ceiling_lit.json b/src/generated/resources/assets/oreganized/models/block/lime_vigil_candle_double_ceiling_lit.json new file mode 100644 index 00000000..d58a7044 --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/lime_vigil_candle_double_ceiling_lit.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_double_ceiling", + "textures": { + "0": "oreganized:block/lime_vigil_candle_lit" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/lime_vigil_candle_double_lit.json b/src/generated/resources/assets/oreganized/models/block/lime_vigil_candle_double_lit.json new file mode 100644 index 00000000..4d77bf73 --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/lime_vigil_candle_double_lit.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_double", + "textures": { + "0": "oreganized:block/lime_vigil_candle_lit" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/lime_vigil_candle_quadruple_ceiling_lit.json b/src/generated/resources/assets/oreganized/models/block/lime_vigil_candle_quadruple_ceiling_lit.json new file mode 100644 index 00000000..c1dd054a --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/lime_vigil_candle_quadruple_ceiling_lit.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_quadruple_ceiling", + "textures": { + "0": "oreganized:block/lime_vigil_candle_lit" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/lime_vigil_candle_quadruple_lit.json b/src/generated/resources/assets/oreganized/models/block/lime_vigil_candle_quadruple_lit.json new file mode 100644 index 00000000..d7bcb7de --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/lime_vigil_candle_quadruple_lit.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_quadruple", + "textures": { + "0": "oreganized:block/lime_vigil_candle_lit" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/lime_vigil_candle_single_ceiling_lit.json b/src/generated/resources/assets/oreganized/models/block/lime_vigil_candle_single_ceiling_lit.json new file mode 100644 index 00000000..b15ac455 --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/lime_vigil_candle_single_ceiling_lit.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_single_ceiling", + "textures": { + "0": "oreganized:block/lime_vigil_candle_lit" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/lime_vigil_candle_single_lit.json b/src/generated/resources/assets/oreganized/models/block/lime_vigil_candle_single_lit.json new file mode 100644 index 00000000..62802520 --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/lime_vigil_candle_single_lit.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_single", + "textures": { + "0": "oreganized:block/lime_vigil_candle_lit" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/lime_vigil_candle_triple_ceiling_lit.json b/src/generated/resources/assets/oreganized/models/block/lime_vigil_candle_triple_ceiling_lit.json new file mode 100644 index 00000000..4b024764 --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/lime_vigil_candle_triple_ceiling_lit.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_triple_ceiling", + "textures": { + "0": "oreganized:block/lime_vigil_candle_lit" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/lime_vigil_candle_triple_lit.json b/src/generated/resources/assets/oreganized/models/block/lime_vigil_candle_triple_lit.json new file mode 100644 index 00000000..30d63d4e --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/lime_vigil_candle_triple_lit.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_triple", + "textures": { + "0": "oreganized:block/lime_vigil_candle_lit" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/magenta_vigil_candle_double_ceiling_lit.json b/src/generated/resources/assets/oreganized/models/block/magenta_vigil_candle_double_ceiling_lit.json new file mode 100644 index 00000000..0fb0ddbd --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/magenta_vigil_candle_double_ceiling_lit.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_double_ceiling", + "textures": { + "0": "oreganized:block/magenta_vigil_candle_lit" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/magenta_vigil_candle_double_lit.json b/src/generated/resources/assets/oreganized/models/block/magenta_vigil_candle_double_lit.json new file mode 100644 index 00000000..74cdfb34 --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/magenta_vigil_candle_double_lit.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_double", + "textures": { + "0": "oreganized:block/magenta_vigil_candle_lit" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/magenta_vigil_candle_quadruple_ceiling_lit.json b/src/generated/resources/assets/oreganized/models/block/magenta_vigil_candle_quadruple_ceiling_lit.json new file mode 100644 index 00000000..5274afa6 --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/magenta_vigil_candle_quadruple_ceiling_lit.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_quadruple_ceiling", + "textures": { + "0": "oreganized:block/magenta_vigil_candle_lit" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/magenta_vigil_candle_quadruple_lit.json b/src/generated/resources/assets/oreganized/models/block/magenta_vigil_candle_quadruple_lit.json new file mode 100644 index 00000000..75614c4d --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/magenta_vigil_candle_quadruple_lit.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_quadruple", + "textures": { + "0": "oreganized:block/magenta_vigil_candle_lit" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/magenta_vigil_candle_single_ceiling_lit.json b/src/generated/resources/assets/oreganized/models/block/magenta_vigil_candle_single_ceiling_lit.json new file mode 100644 index 00000000..0af0b6f6 --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/magenta_vigil_candle_single_ceiling_lit.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_single_ceiling", + "textures": { + "0": "oreganized:block/magenta_vigil_candle_lit" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/magenta_vigil_candle_single_lit.json b/src/generated/resources/assets/oreganized/models/block/magenta_vigil_candle_single_lit.json new file mode 100644 index 00000000..285e2269 --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/magenta_vigil_candle_single_lit.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_single", + "textures": { + "0": "oreganized:block/magenta_vigil_candle_lit" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/magenta_vigil_candle_triple_ceiling_lit.json b/src/generated/resources/assets/oreganized/models/block/magenta_vigil_candle_triple_ceiling_lit.json new file mode 100644 index 00000000..fa621699 --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/magenta_vigil_candle_triple_ceiling_lit.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_triple_ceiling", + "textures": { + "0": "oreganized:block/magenta_vigil_candle_lit" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/magenta_vigil_candle_triple_lit.json b/src/generated/resources/assets/oreganized/models/block/magenta_vigil_candle_triple_lit.json new file mode 100644 index 00000000..7c5933d3 --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/magenta_vigil_candle_triple_lit.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_triple", + "textures": { + "0": "oreganized:block/magenta_vigil_candle_lit" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/orange_vigil_candle_double_ceiling_lit.json b/src/generated/resources/assets/oreganized/models/block/orange_vigil_candle_double_ceiling_lit.json new file mode 100644 index 00000000..b55aa7ee --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/orange_vigil_candle_double_ceiling_lit.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_double_ceiling", + "textures": { + "0": "oreganized:block/orange_vigil_candle_lit" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/orange_vigil_candle_double_lit.json b/src/generated/resources/assets/oreganized/models/block/orange_vigil_candle_double_lit.json new file mode 100644 index 00000000..5bbb3b87 --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/orange_vigil_candle_double_lit.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_double", + "textures": { + "0": "oreganized:block/orange_vigil_candle_lit" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/orange_vigil_candle_quadruple_ceiling_lit.json b/src/generated/resources/assets/oreganized/models/block/orange_vigil_candle_quadruple_ceiling_lit.json new file mode 100644 index 00000000..bbf5f04b --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/orange_vigil_candle_quadruple_ceiling_lit.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_quadruple_ceiling", + "textures": { + "0": "oreganized:block/orange_vigil_candle_lit" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/orange_vigil_candle_quadruple_lit.json b/src/generated/resources/assets/oreganized/models/block/orange_vigil_candle_quadruple_lit.json new file mode 100644 index 00000000..afeac59a --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/orange_vigil_candle_quadruple_lit.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_quadruple", + "textures": { + "0": "oreganized:block/orange_vigil_candle_lit" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/orange_vigil_candle_single_ceiling_lit.json b/src/generated/resources/assets/oreganized/models/block/orange_vigil_candle_single_ceiling_lit.json new file mode 100644 index 00000000..39104dcb --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/orange_vigil_candle_single_ceiling_lit.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_single_ceiling", + "textures": { + "0": "oreganized:block/orange_vigil_candle_lit" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/orange_vigil_candle_single_lit.json b/src/generated/resources/assets/oreganized/models/block/orange_vigil_candle_single_lit.json new file mode 100644 index 00000000..e5dc343b --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/orange_vigil_candle_single_lit.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_single", + "textures": { + "0": "oreganized:block/orange_vigil_candle_lit" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/orange_vigil_candle_triple_ceiling_lit.json b/src/generated/resources/assets/oreganized/models/block/orange_vigil_candle_triple_ceiling_lit.json new file mode 100644 index 00000000..9ce90de7 --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/orange_vigil_candle_triple_ceiling_lit.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_triple_ceiling", + "textures": { + "0": "oreganized:block/orange_vigil_candle_lit" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/orange_vigil_candle_triple_lit.json b/src/generated/resources/assets/oreganized/models/block/orange_vigil_candle_triple_lit.json new file mode 100644 index 00000000..ca09d155 --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/orange_vigil_candle_triple_lit.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_triple", + "textures": { + "0": "oreganized:block/orange_vigil_candle_lit" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/pink_vigil_candle_double_ceiling_lit.json b/src/generated/resources/assets/oreganized/models/block/pink_vigil_candle_double_ceiling_lit.json new file mode 100644 index 00000000..eea37bde --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/pink_vigil_candle_double_ceiling_lit.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_double_ceiling", + "textures": { + "0": "oreganized:block/pink_vigil_candle_lit" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/pink_vigil_candle_double_lit.json b/src/generated/resources/assets/oreganized/models/block/pink_vigil_candle_double_lit.json new file mode 100644 index 00000000..6479c3af --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/pink_vigil_candle_double_lit.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_double", + "textures": { + "0": "oreganized:block/pink_vigil_candle_lit" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/pink_vigil_candle_quadruple_ceiling_lit.json b/src/generated/resources/assets/oreganized/models/block/pink_vigil_candle_quadruple_ceiling_lit.json new file mode 100644 index 00000000..e3bb891e --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/pink_vigil_candle_quadruple_ceiling_lit.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_quadruple_ceiling", + "textures": { + "0": "oreganized:block/pink_vigil_candle_lit" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/pink_vigil_candle_quadruple_lit.json b/src/generated/resources/assets/oreganized/models/block/pink_vigil_candle_quadruple_lit.json new file mode 100644 index 00000000..85ae571a --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/pink_vigil_candle_quadruple_lit.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_quadruple", + "textures": { + "0": "oreganized:block/pink_vigil_candle_lit" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/pink_vigil_candle_single_ceiling_lit.json b/src/generated/resources/assets/oreganized/models/block/pink_vigil_candle_single_ceiling_lit.json new file mode 100644 index 00000000..def31ff1 --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/pink_vigil_candle_single_ceiling_lit.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_single_ceiling", + "textures": { + "0": "oreganized:block/pink_vigil_candle_lit" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/pink_vigil_candle_single_lit.json b/src/generated/resources/assets/oreganized/models/block/pink_vigil_candle_single_lit.json new file mode 100644 index 00000000..a06255bf --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/pink_vigil_candle_single_lit.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_single", + "textures": { + "0": "oreganized:block/pink_vigil_candle_lit" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/pink_vigil_candle_triple_ceiling_lit.json b/src/generated/resources/assets/oreganized/models/block/pink_vigil_candle_triple_ceiling_lit.json new file mode 100644 index 00000000..2bff56d0 --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/pink_vigil_candle_triple_ceiling_lit.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_triple_ceiling", + "textures": { + "0": "oreganized:block/pink_vigil_candle_lit" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/pink_vigil_candle_triple_lit.json b/src/generated/resources/assets/oreganized/models/block/pink_vigil_candle_triple_lit.json new file mode 100644 index 00000000..d5dd90f2 --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/pink_vigil_candle_triple_lit.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_triple", + "textures": { + "0": "oreganized:block/pink_vigil_candle_lit" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/purple_vigil_candle_double_ceiling_lit.json b/src/generated/resources/assets/oreganized/models/block/purple_vigil_candle_double_ceiling_lit.json new file mode 100644 index 00000000..11a93748 --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/purple_vigil_candle_double_ceiling_lit.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_double_ceiling", + "textures": { + "0": "oreganized:block/purple_vigil_candle_lit" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/purple_vigil_candle_double_lit.json b/src/generated/resources/assets/oreganized/models/block/purple_vigil_candle_double_lit.json new file mode 100644 index 00000000..41e1f910 --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/purple_vigil_candle_double_lit.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_double", + "textures": { + "0": "oreganized:block/purple_vigil_candle_lit" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/purple_vigil_candle_quadruple_ceiling_lit.json b/src/generated/resources/assets/oreganized/models/block/purple_vigil_candle_quadruple_ceiling_lit.json new file mode 100644 index 00000000..ea39b0e5 --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/purple_vigil_candle_quadruple_ceiling_lit.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_quadruple_ceiling", + "textures": { + "0": "oreganized:block/purple_vigil_candle_lit" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/purple_vigil_candle_quadruple_lit.json b/src/generated/resources/assets/oreganized/models/block/purple_vigil_candle_quadruple_lit.json new file mode 100644 index 00000000..712a0079 --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/purple_vigil_candle_quadruple_lit.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_quadruple", + "textures": { + "0": "oreganized:block/purple_vigil_candle_lit" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/purple_vigil_candle_single_ceiling_lit.json b/src/generated/resources/assets/oreganized/models/block/purple_vigil_candle_single_ceiling_lit.json new file mode 100644 index 00000000..68863749 --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/purple_vigil_candle_single_ceiling_lit.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_single_ceiling", + "textures": { + "0": "oreganized:block/purple_vigil_candle_lit" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/purple_vigil_candle_single_lit.json b/src/generated/resources/assets/oreganized/models/block/purple_vigil_candle_single_lit.json new file mode 100644 index 00000000..c7c7d372 --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/purple_vigil_candle_single_lit.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_single", + "textures": { + "0": "oreganized:block/purple_vigil_candle_lit" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/purple_vigil_candle_triple_ceiling_lit.json b/src/generated/resources/assets/oreganized/models/block/purple_vigil_candle_triple_ceiling_lit.json new file mode 100644 index 00000000..dff3aff3 --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/purple_vigil_candle_triple_ceiling_lit.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_triple_ceiling", + "textures": { + "0": "oreganized:block/purple_vigil_candle_lit" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/purple_vigil_candle_triple_lit.json b/src/generated/resources/assets/oreganized/models/block/purple_vigil_candle_triple_lit.json new file mode 100644 index 00000000..1752798b --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/purple_vigil_candle_triple_lit.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_triple", + "textures": { + "0": "oreganized:block/purple_vigil_candle_lit" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/red_vigil_candle_double_ceiling_lit.json b/src/generated/resources/assets/oreganized/models/block/red_vigil_candle_double_ceiling_lit.json new file mode 100644 index 00000000..2ddd6ce7 --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/red_vigil_candle_double_ceiling_lit.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_double_ceiling", + "textures": { + "0": "oreganized:block/red_vigil_candle_lit" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/red_vigil_candle_double_lit.json b/src/generated/resources/assets/oreganized/models/block/red_vigil_candle_double_lit.json new file mode 100644 index 00000000..851ade06 --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/red_vigil_candle_double_lit.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_double", + "textures": { + "0": "oreganized:block/red_vigil_candle_lit" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/red_vigil_candle_quadruple_ceiling_lit.json b/src/generated/resources/assets/oreganized/models/block/red_vigil_candle_quadruple_ceiling_lit.json new file mode 100644 index 00000000..b5e78168 --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/red_vigil_candle_quadruple_ceiling_lit.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_quadruple_ceiling", + "textures": { + "0": "oreganized:block/red_vigil_candle_lit" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/red_vigil_candle_quadruple_lit.json b/src/generated/resources/assets/oreganized/models/block/red_vigil_candle_quadruple_lit.json new file mode 100644 index 00000000..2c3b77a5 --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/red_vigil_candle_quadruple_lit.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_quadruple", + "textures": { + "0": "oreganized:block/red_vigil_candle_lit" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/red_vigil_candle_single_ceiling_lit.json b/src/generated/resources/assets/oreganized/models/block/red_vigil_candle_single_ceiling_lit.json new file mode 100644 index 00000000..ccbc85be --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/red_vigil_candle_single_ceiling_lit.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_single_ceiling", + "textures": { + "0": "oreganized:block/red_vigil_candle_lit" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/red_vigil_candle_single_lit.json b/src/generated/resources/assets/oreganized/models/block/red_vigil_candle_single_lit.json new file mode 100644 index 00000000..04ae01bd --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/red_vigil_candle_single_lit.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_single", + "textures": { + "0": "oreganized:block/red_vigil_candle_lit" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/red_vigil_candle_triple_ceiling_lit.json b/src/generated/resources/assets/oreganized/models/block/red_vigil_candle_triple_ceiling_lit.json new file mode 100644 index 00000000..ee4a2e80 --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/red_vigil_candle_triple_ceiling_lit.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_triple_ceiling", + "textures": { + "0": "oreganized:block/red_vigil_candle_lit" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/red_vigil_candle_triple_lit.json b/src/generated/resources/assets/oreganized/models/block/red_vigil_candle_triple_lit.json new file mode 100644 index 00000000..a0b3aefa --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/red_vigil_candle_triple_lit.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_triple", + "textures": { + "0": "oreganized:block/red_vigil_candle_lit" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/white_vigil_candle_double_ceiling_lit.json b/src/generated/resources/assets/oreganized/models/block/white_vigil_candle_double_ceiling_lit.json new file mode 100644 index 00000000..8a4425db --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/white_vigil_candle_double_ceiling_lit.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_double_ceiling", + "textures": { + "0": "oreganized:block/white_vigil_candle_lit" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/white_vigil_candle_double_lit.json b/src/generated/resources/assets/oreganized/models/block/white_vigil_candle_double_lit.json new file mode 100644 index 00000000..f8c3bef1 --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/white_vigil_candle_double_lit.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_double", + "textures": { + "0": "oreganized:block/white_vigil_candle_lit" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/white_vigil_candle_quadruple_ceiling_lit.json b/src/generated/resources/assets/oreganized/models/block/white_vigil_candle_quadruple_ceiling_lit.json new file mode 100644 index 00000000..02047481 --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/white_vigil_candle_quadruple_ceiling_lit.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_quadruple_ceiling", + "textures": { + "0": "oreganized:block/white_vigil_candle_lit" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/white_vigil_candle_quadruple_lit.json b/src/generated/resources/assets/oreganized/models/block/white_vigil_candle_quadruple_lit.json new file mode 100644 index 00000000..d6c96106 --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/white_vigil_candle_quadruple_lit.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_quadruple", + "textures": { + "0": "oreganized:block/white_vigil_candle_lit" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/white_vigil_candle_single_ceiling_lit.json b/src/generated/resources/assets/oreganized/models/block/white_vigil_candle_single_ceiling_lit.json new file mode 100644 index 00000000..391c78de --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/white_vigil_candle_single_ceiling_lit.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_single_ceiling", + "textures": { + "0": "oreganized:block/white_vigil_candle_lit" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/white_vigil_candle_single_lit.json b/src/generated/resources/assets/oreganized/models/block/white_vigil_candle_single_lit.json new file mode 100644 index 00000000..8a914c98 --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/white_vigil_candle_single_lit.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_single", + "textures": { + "0": "oreganized:block/white_vigil_candle_lit" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/white_vigil_candle_triple_ceiling_lit.json b/src/generated/resources/assets/oreganized/models/block/white_vigil_candle_triple_ceiling_lit.json new file mode 100644 index 00000000..5f6c49bf --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/white_vigil_candle_triple_ceiling_lit.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_triple_ceiling", + "textures": { + "0": "oreganized:block/white_vigil_candle_lit" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/white_vigil_candle_triple_lit.json b/src/generated/resources/assets/oreganized/models/block/white_vigil_candle_triple_lit.json new file mode 100644 index 00000000..a30b5e67 --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/white_vigil_candle_triple_lit.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_triple", + "textures": { + "0": "oreganized:block/white_vigil_candle_lit" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/yellow_vigil_candle_double_ceiling_lit.json b/src/generated/resources/assets/oreganized/models/block/yellow_vigil_candle_double_ceiling_lit.json new file mode 100644 index 00000000..8a9a6097 --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/yellow_vigil_candle_double_ceiling_lit.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_double_ceiling", + "textures": { + "0": "oreganized:block/yellow_vigil_candle_lit" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/yellow_vigil_candle_double_lit.json b/src/generated/resources/assets/oreganized/models/block/yellow_vigil_candle_double_lit.json new file mode 100644 index 00000000..51bfce19 --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/yellow_vigil_candle_double_lit.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_double", + "textures": { + "0": "oreganized:block/yellow_vigil_candle_lit" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/yellow_vigil_candle_quadruple_ceiling_lit.json b/src/generated/resources/assets/oreganized/models/block/yellow_vigil_candle_quadruple_ceiling_lit.json new file mode 100644 index 00000000..891f7341 --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/yellow_vigil_candle_quadruple_ceiling_lit.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_quadruple_ceiling", + "textures": { + "0": "oreganized:block/yellow_vigil_candle_lit" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/yellow_vigil_candle_quadruple_lit.json b/src/generated/resources/assets/oreganized/models/block/yellow_vigil_candle_quadruple_lit.json new file mode 100644 index 00000000..0f70cccd --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/yellow_vigil_candle_quadruple_lit.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_quadruple", + "textures": { + "0": "oreganized:block/yellow_vigil_candle_lit" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/yellow_vigil_candle_single_ceiling_lit.json b/src/generated/resources/assets/oreganized/models/block/yellow_vigil_candle_single_ceiling_lit.json new file mode 100644 index 00000000..627d3f5c --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/yellow_vigil_candle_single_ceiling_lit.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_single_ceiling", + "textures": { + "0": "oreganized:block/yellow_vigil_candle_lit" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/yellow_vigil_candle_single_lit.json b/src/generated/resources/assets/oreganized/models/block/yellow_vigil_candle_single_lit.json new file mode 100644 index 00000000..66490b24 --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/yellow_vigil_candle_single_lit.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_single", + "textures": { + "0": "oreganized:block/yellow_vigil_candle_lit" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/yellow_vigil_candle_triple_ceiling_lit.json b/src/generated/resources/assets/oreganized/models/block/yellow_vigil_candle_triple_ceiling_lit.json new file mode 100644 index 00000000..14b5ff0b --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/yellow_vigil_candle_triple_ceiling_lit.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_triple_ceiling", + "textures": { + "0": "oreganized:block/yellow_vigil_candle_lit" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/models/block/yellow_vigil_candle_triple_lit.json b/src/generated/resources/assets/oreganized/models/block/yellow_vigil_candle_triple_lit.json new file mode 100644 index 00000000..affed964 --- /dev/null +++ b/src/generated/resources/assets/oreganized/models/block/yellow_vigil_candle_triple_lit.json @@ -0,0 +1,6 @@ +{ + "parent": "oreganized:block/vigil_candle_triple", + "textures": { + "0": "oreganized:block/yellow_vigil_candle_lit" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/oreganized/tags/blocks/heat_source.json b/src/generated/resources/data/oreganized/tags/blocks/heat_source.json new file mode 100644 index 00000000..437877ba --- /dev/null +++ b/src/generated/resources/data/oreganized/tags/blocks/heat_source.json @@ -0,0 +1,5 @@ +{ + "values": [ + "#minecraft:campfires" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/oreganized/tags/blocks/vigil_candles.json b/src/generated/resources/data/oreganized/tags/blocks/vigil_candles.json index de14c5b9..c4c8ee84 100644 --- a/src/generated/resources/data/oreganized/tags/blocks/vigil_candles.json +++ b/src/generated/resources/data/oreganized/tags/blocks/vigil_candles.json @@ -1,21 +1,21 @@ { "values": [ "oreganized:vigil_candle", - "oreganized:light_blue_vigil_candle", - "oreganized:blue_vigil_candle", - "oreganized:orange_vigil_candle", "oreganized:red_vigil_candle", - "oreganized:purple_vigil_candle", + "oreganized:orange_vigil_candle", + "oreganized:cyan_vigil_candle", + "oreganized:brown_vigil_candle", "oreganized:light_gray_vigil_candle", - "oreganized:green_vigil_candle", - "oreganized:gray_vigil_candle", - "oreganized:magenta_vigil_candle", + "oreganized:pink_vigil_candle", + "oreganized:blue_vigil_candle", + "oreganized:lime_vigil_candle", "oreganized:white_vigil_candle", - "oreganized:yellow_vigil_candle", + "oreganized:magenta_vigil_candle", + "oreganized:green_vigil_candle", "oreganized:black_vigil_candle", - "oreganized:brown_vigil_candle", - "oreganized:lime_vigil_candle", - "oreganized:cyan_vigil_candle", - "oreganized:pink_vigil_candle" + "oreganized:purple_vigil_candle", + "oreganized:light_blue_vigil_candle", + "oreganized:gray_vigil_candle", + "oreganized:yellow_vigil_candle" ] } \ No newline at end of file diff --git a/src/main/java/galena/oreganized/content/block/VigilCandleBlock.java b/src/main/java/galena/oreganized/content/block/VigilCandleBlock.java index 8b6e9b7b..f2bd3f52 100644 --- a/src/main/java/galena/oreganized/content/block/VigilCandleBlock.java +++ b/src/main/java/galena/oreganized/content/block/VigilCandleBlock.java @@ -98,8 +98,10 @@ public VoxelShape getShape(BlockState state, BlockGetter level, BlockPos pos, Co public @Nullable BlockState getStateForPlacement(BlockPlaceContext context) { BlockState previous = context.getLevel().getBlockState(context.getClickedPos()); var candles = previous.is(this) ? Math.min(previous.getValue(CANDLES) + 1, MAX_CANDLES) : MIN_CANDLES; + var lit = previous.is(this) && previous.getValue(LIT); return Optional.ofNullable(super.getStateForPlacement(context)) .map(it -> it.setValue(CANDLES, candles)) + .map(it -> it.setValue(LIT, lit)) .orElse(null); } diff --git a/src/main/java/galena/oreganized/content/entity/SepulcherBlockEntity.java b/src/main/java/galena/oreganized/content/entity/SepulcherBlockEntity.java index c3e54170..e8a9528f 100644 --- a/src/main/java/galena/oreganized/content/entity/SepulcherBlockEntity.java +++ b/src/main/java/galena/oreganized/content/entity/SepulcherBlockEntity.java @@ -1,5 +1,6 @@ package galena.oreganized.content.entity; +import galena.oreganized.Oreganized; import galena.oreganized.OreganizedConfig; import galena.oreganized.content.block.SepulcherBlock; import galena.oreganized.index.OBlockEntities; @@ -37,6 +38,7 @@ public class SepulcherBlockEntity extends BlockEntity implements Ticking, Contai private final DeathListener listener; private LazyOptional itemHandler; private int progress = 0; + private boolean heated = false; public SepulcherBlockEntity(BlockPos pos, BlockState state) { super(OBlockEntities.SEPULCHER.get(), pos, state); @@ -55,7 +57,14 @@ public void tick(BlockState state, Level level, BlockPos pos) { if (fillLevel < SepulcherBlock.MAX_LEVEL) return; if (fillLevel == SepulcherBlock.READY) return; - if (++progress < progressNeeded(fillLevel)) return; + if (level.getGameTime() % 20L == 0) { + checkHeatSource(level, pos); + } + + var step = heated ? 3 : 1; + progress += step; + + if (progress < progressNeeded(fillLevel)) return; level.setBlockAndUpdate(pos, state.setValue(SepulcherBlock.LEVEL, fillLevel + 1)); progress = 0; @@ -67,16 +76,24 @@ public void tick(BlockState state, Level level, BlockPos pos) { } } + private void checkHeatSource(Level level, BlockPos pos) { + var below = pos.below(); + var belowState = level.getBlockState(below); + heated = belowState.is(OTags.Blocks.HEAT_SOURCE); + } + @Override protected void saveAdditional(CompoundTag nbt) { super.saveAdditional(nbt); nbt.putInt("progress", progress); + nbt.putBoolean("heated", heated); } @Override public void load(CompoundTag nbt) { super.load(nbt); progress = nbt.getInt("progress"); + heated = nbt.getBoolean("heated"); } @Override @@ -88,9 +105,11 @@ public class DeathListener implements GameEventListener { private final PositionSource listenerSource; private final int listenerRadius; + private static final String TAG_KEY = Oreganized.MOD_ID + ":sepulched"; + public DeathListener() { this.listenerSource = new BlockPositionSource(SepulcherBlockEntity.this.getBlockPos()); - this.listenerRadius = GameEvent.ENTITY_DIE.getNotificationRadius(); + this.listenerRadius = 3; } public PositionSource getListenerSource() { @@ -105,6 +124,11 @@ public boolean handleGameEvent(ServerLevel level, GameEvent event, GameEvent.Con if (event != GameEvent.ENTITY_DIE) return false; var entity = context.sourceEntity(); + if (entity == null) return false; + if (entity.getPersistentData().getBoolean(TAG_KEY)) return false; + + entity.getPersistentData().putBoolean(TAG_KEY, true); + if (!entity.getType().is(OTags.Entities.FILLS_SEPULCHER)) return false; var state = getBlockState(); @@ -119,6 +143,8 @@ public boolean handleGameEvent(ServerLevel level, GameEvent event, GameEvent.Con new SepulcherConsumesDeathPacket(vec) ); + entity.setPos(Vec3.atCenterOf(getBlockPos())); + return true; } } diff --git a/src/main/java/galena/oreganized/data/OBlockTags.java b/src/main/java/galena/oreganized/data/OBlockTags.java index 1cd48c02..9772f9ee 100644 --- a/src/main/java/galena/oreganized/data/OBlockTags.java +++ b/src/main/java/galena/oreganized/data/OBlockTags.java @@ -22,6 +22,7 @@ import static galena.oreganized.index.OTags.Blocks.CRYSTAL_GLASS; import static galena.oreganized.index.OTags.Blocks.CRYSTAL_GLASS_PANES; import static galena.oreganized.index.OTags.Blocks.FIRE_SOURCE; +import static galena.oreganized.index.OTags.Blocks.HEAT_SOURCE; import static galena.oreganized.index.OTags.Blocks.MELTS_LEAD; import static galena.oreganized.index.OTags.Blocks.MINEABLE_WITH_SCRIBE; import static galena.oreganized.index.OTags.Blocks.ORES_LEAD; @@ -152,6 +153,8 @@ protected void addTags(HolderLookup.Provider provider) { tag(BlockTags.CANDLES).addTags(VIGIL_CANDLES); tag(BlockTags.MINEABLE_WITH_PICKAXE).addTags(VIGIL_CANDLES); + tag(HEAT_SOURCE).addTags(BlockTags.CAMPFIRES); + tag(BlockTags.MINEABLE_WITH_SHOVEL).add( OBlocks.WAXED_WHITE_CONCRETE_POWDER.get(), OBlocks.WAXED_ORANGE_CONCRETE_POWDER.get(), diff --git a/src/main/java/galena/oreganized/data/provider/OBlockStateProvider.java b/src/main/java/galena/oreganized/data/provider/OBlockStateProvider.java index fd622bab..04d971c9 100644 --- a/src/main/java/galena/oreganized/data/provider/OBlockStateProvider.java +++ b/src/main/java/galena/oreganized/data/provider/OBlockStateProvider.java @@ -414,13 +414,15 @@ private String candleSuffix(int amount) { public void vigilCandle(Supplier block, @Nullable String prefix) { getVariantBuilder(block.get()).forAllStatesExcept(state -> { var candles = state.getValue(BlockStateProperties.CANDLES); - var hanging = state.getValue(BlockStateProperties.HANGING); + boolean hanging = state.getValue(BlockStateProperties.HANGING); + boolean lit = state.getValue(AbstractCandleBlock.LIT); var hangingSuffix = hanging ? "_ceiling" : ""; var parent = "vigil_candle_" + candleSuffix(candles) + hangingSuffix; var optionalPrefix = Optional.ofNullable(prefix).map(it -> it + "_"); - var name = optionalPrefix.orElse("default") + parent; - var texture = BLOCK_FOLDER + "/" + optionalPrefix.orElse("") + "vigil_candle"; + var litSuffix = lit ? "_lit" : ""; + var name = optionalPrefix.orElse("default") + parent + litSuffix; + var texture = BLOCK_FOLDER + "/" + optionalPrefix.orElse("") + "vigil_candle" + litSuffix; var model = models().withExistingParent(name, Oreganized.modLoc(parent)) .texture("0", texture); @@ -428,7 +430,7 @@ public void vigilCandle(Supplier block, @Nullable String prefix return ConfiguredModel.builder() .modelFile(model) .build(); - }, BlockStateProperties.WATERLOGGED, AbstractCandleBlock.LIT); + }, BlockStateProperties.WATERLOGGED); } public void crate(Supplier block) { diff --git a/src/main/java/galena/oreganized/index/OTags.java b/src/main/java/galena/oreganized/index/OTags.java index d06421ae..27686ba0 100644 --- a/src/main/java/galena/oreganized/index/OTags.java +++ b/src/main/java/galena/oreganized/index/OTags.java @@ -96,6 +96,7 @@ public static class Blocks { public static final TagKey BLOWS_LEAD_CLOUD = tag("blows_lead_cloud"); public static final TagKey VIGIL_CANDLES = tag("vigil_candles"); + public static final TagKey HEAT_SOURCE = tag("heat_source"); private static TagKey tag(String name) { return BlockTags.create(Oreganized.modLoc(name)); diff --git a/src/main/resources/assets/oreganized/textures/block/black_vigil_candle_lit.png.mcmeta b/src/main/resources/assets/oreganized/textures/block/black_vigil_candle_lit.png.mcmeta new file mode 100644 index 00000000..e5ba996b --- /dev/null +++ b/src/main/resources/assets/oreganized/textures/block/black_vigil_candle_lit.png.mcmeta @@ -0,0 +1,6 @@ +{ + "animation": { + "frametime": 10, + "interpolate": true + } +} diff --git a/src/main/resources/assets/oreganized/textures/block/blue_vigil_candle_lit.png.mcmeta b/src/main/resources/assets/oreganized/textures/block/blue_vigil_candle_lit.png.mcmeta new file mode 100644 index 00000000..e5ba996b --- /dev/null +++ b/src/main/resources/assets/oreganized/textures/block/blue_vigil_candle_lit.png.mcmeta @@ -0,0 +1,6 @@ +{ + "animation": { + "frametime": 10, + "interpolate": true + } +} diff --git a/src/main/resources/assets/oreganized/textures/block/brown_vigil_candle_lit.png.mcmeta b/src/main/resources/assets/oreganized/textures/block/brown_vigil_candle_lit.png.mcmeta new file mode 100644 index 00000000..e5ba996b --- /dev/null +++ b/src/main/resources/assets/oreganized/textures/block/brown_vigil_candle_lit.png.mcmeta @@ -0,0 +1,6 @@ +{ + "animation": { + "frametime": 10, + "interpolate": true + } +} diff --git a/src/main/resources/assets/oreganized/textures/block/cyan_vigil_candle_lit.png.mcmeta b/src/main/resources/assets/oreganized/textures/block/cyan_vigil_candle_lit.png.mcmeta new file mode 100644 index 00000000..e5ba996b --- /dev/null +++ b/src/main/resources/assets/oreganized/textures/block/cyan_vigil_candle_lit.png.mcmeta @@ -0,0 +1,6 @@ +{ + "animation": { + "frametime": 10, + "interpolate": true + } +} diff --git a/src/main/resources/assets/oreganized/textures/block/gray_vigil_candle_lit.png.mcmeta b/src/main/resources/assets/oreganized/textures/block/gray_vigil_candle_lit.png.mcmeta new file mode 100644 index 00000000..e5ba996b --- /dev/null +++ b/src/main/resources/assets/oreganized/textures/block/gray_vigil_candle_lit.png.mcmeta @@ -0,0 +1,6 @@ +{ + "animation": { + "frametime": 10, + "interpolate": true + } +} diff --git a/src/main/resources/assets/oreganized/textures/block/green_vigil_candle_lit.png.mcmeta b/src/main/resources/assets/oreganized/textures/block/green_vigil_candle_lit.png.mcmeta new file mode 100644 index 00000000..e5ba996b --- /dev/null +++ b/src/main/resources/assets/oreganized/textures/block/green_vigil_candle_lit.png.mcmeta @@ -0,0 +1,6 @@ +{ + "animation": { + "frametime": 10, + "interpolate": true + } +} diff --git a/src/main/resources/assets/oreganized/textures/block/light_blue_vigil_candle_lit.png.mcmeta b/src/main/resources/assets/oreganized/textures/block/light_blue_vigil_candle_lit.png.mcmeta new file mode 100644 index 00000000..e5ba996b --- /dev/null +++ b/src/main/resources/assets/oreganized/textures/block/light_blue_vigil_candle_lit.png.mcmeta @@ -0,0 +1,6 @@ +{ + "animation": { + "frametime": 10, + "interpolate": true + } +} diff --git a/src/main/resources/assets/oreganized/textures/block/light_gray_vigil_candle_lit.png.mcmeta b/src/main/resources/assets/oreganized/textures/block/light_gray_vigil_candle_lit.png.mcmeta new file mode 100644 index 00000000..e5ba996b --- /dev/null +++ b/src/main/resources/assets/oreganized/textures/block/light_gray_vigil_candle_lit.png.mcmeta @@ -0,0 +1,6 @@ +{ + "animation": { + "frametime": 10, + "interpolate": true + } +} diff --git a/src/main/resources/assets/oreganized/textures/block/lime_vigil_candle_lit.png.mcmeta b/src/main/resources/assets/oreganized/textures/block/lime_vigil_candle_lit.png.mcmeta new file mode 100644 index 00000000..e5ba996b --- /dev/null +++ b/src/main/resources/assets/oreganized/textures/block/lime_vigil_candle_lit.png.mcmeta @@ -0,0 +1,6 @@ +{ + "animation": { + "frametime": 10, + "interpolate": true + } +} diff --git a/src/main/resources/assets/oreganized/textures/block/magenta_vigil_candle_lit.png.mcmeta b/src/main/resources/assets/oreganized/textures/block/magenta_vigil_candle_lit.png.mcmeta new file mode 100644 index 00000000..e5ba996b --- /dev/null +++ b/src/main/resources/assets/oreganized/textures/block/magenta_vigil_candle_lit.png.mcmeta @@ -0,0 +1,6 @@ +{ + "animation": { + "frametime": 10, + "interpolate": true + } +} diff --git a/src/main/resources/assets/oreganized/textures/block/orange_vigil_candle_lit.png.mcmeta b/src/main/resources/assets/oreganized/textures/block/orange_vigil_candle_lit.png.mcmeta new file mode 100644 index 00000000..e5ba996b --- /dev/null +++ b/src/main/resources/assets/oreganized/textures/block/orange_vigil_candle_lit.png.mcmeta @@ -0,0 +1,6 @@ +{ + "animation": { + "frametime": 10, + "interpolate": true + } +} diff --git a/src/main/resources/assets/oreganized/textures/block/pink_vigil_candle_lit.png.mcmeta b/src/main/resources/assets/oreganized/textures/block/pink_vigil_candle_lit.png.mcmeta new file mode 100644 index 00000000..e5ba996b --- /dev/null +++ b/src/main/resources/assets/oreganized/textures/block/pink_vigil_candle_lit.png.mcmeta @@ -0,0 +1,6 @@ +{ + "animation": { + "frametime": 10, + "interpolate": true + } +} diff --git a/src/main/resources/assets/oreganized/textures/block/purple_vigil_candle_lit.png.mcmeta b/src/main/resources/assets/oreganized/textures/block/purple_vigil_candle_lit.png.mcmeta new file mode 100644 index 00000000..e5ba996b --- /dev/null +++ b/src/main/resources/assets/oreganized/textures/block/purple_vigil_candle_lit.png.mcmeta @@ -0,0 +1,6 @@ +{ + "animation": { + "frametime": 10, + "interpolate": true + } +} diff --git a/src/main/resources/assets/oreganized/textures/block/red_vigil_candle_lit.png.mcmeta b/src/main/resources/assets/oreganized/textures/block/red_vigil_candle_lit.png.mcmeta new file mode 100644 index 00000000..e5ba996b --- /dev/null +++ b/src/main/resources/assets/oreganized/textures/block/red_vigil_candle_lit.png.mcmeta @@ -0,0 +1,6 @@ +{ + "animation": { + "frametime": 10, + "interpolate": true + } +} diff --git a/src/main/resources/assets/oreganized/textures/block/vigil_candle_lit.png.mcmeta b/src/main/resources/assets/oreganized/textures/block/vigil_candle_lit.png.mcmeta new file mode 100644 index 00000000..e5ba996b --- /dev/null +++ b/src/main/resources/assets/oreganized/textures/block/vigil_candle_lit.png.mcmeta @@ -0,0 +1,6 @@ +{ + "animation": { + "frametime": 10, + "interpolate": true + } +} diff --git a/src/main/resources/assets/oreganized/textures/block/white_vigil_candle_lit.png.mcmeta b/src/main/resources/assets/oreganized/textures/block/white_vigil_candle_lit.png.mcmeta new file mode 100644 index 00000000..e5ba996b --- /dev/null +++ b/src/main/resources/assets/oreganized/textures/block/white_vigil_candle_lit.png.mcmeta @@ -0,0 +1,6 @@ +{ + "animation": { + "frametime": 10, + "interpolate": true + } +} diff --git a/src/main/resources/assets/oreganized/textures/block/yellow_vigil_candle_lit.png.mcmeta b/src/main/resources/assets/oreganized/textures/block/yellow_vigil_candle_lit.png.mcmeta new file mode 100644 index 00000000..e5ba996b --- /dev/null +++ b/src/main/resources/assets/oreganized/textures/block/yellow_vigil_candle_lit.png.mcmeta @@ -0,0 +1,6 @@ +{ + "animation": { + "frametime": 10, + "interpolate": true + } +} From f3254716672ecc247acb65bdef26fd0b1c65f7ca Mon Sep 17 00:00:00 2001 From: Niklas Widmann Date: Thu, 24 Oct 2024 16:20:47 +0200 Subject: [PATCH 09/11] add particles & sounds for bone pile and sepulcher --- .../002701d48eee4c36b62b24b011e74b0624793d05 | 4 +- .../5bb646c3cee204f41a1b59a2c0d9083b5f7155b0 | 4 +- .../735031f3addf80804addae5e3f53249900116f1e | 4 +- .../oreganized/models/block/bone_pile.json | 5 +- .../resources/assets/oreganized/sounds.json | 140 ++++++++++++++++++ .../loot_tables/blocks/sepulcher.json | 19 +++ .../oreganized/tags/blocks/vigil_candles.json | 20 +-- .../content/block/BonePileBlock.java | 72 +++++++++ .../content/block/SepulcherBlock.java | 8 +- .../content/entity/SepulcherBlockEntity.java | 38 +++-- .../galena/oreganized/data/OBlockStates.java | 2 +- .../galena/oreganized/data/OLootTables.java | 9 +- .../oreganized/data/OSoundDefinitions.java | 78 +++++++++- .../java/galena/oreganized/index/OBlocks.java | 5 +- .../oreganized/index/OParticleTypes.java | 4 + .../galena/oreganized/index/OSoundEvents.java | 18 +++ .../galena/oreganized/index/OSoundTypes.java | 4 +- .../oreganized/network/OreganizedNetwork.java | 2 + .../network/packet/SepulcherRotsPacket.java | 40 +++++ .../oreganized/particles/bone_fragment.json | 9 ++ .../sounds/block/bone_pile_break_0.ogg | Bin 0 -> 6784 bytes .../sounds/block/bone_pile_break_1.ogg | Bin 0 -> 6093 bytes .../sounds/block/bone_pile_break_2.ogg | Bin 0 -> 6713 bytes .../sounds/block/bone_pile_break_3.ogg | Bin 0 -> 6521 bytes .../sounds/block/bone_pile_break_4.ogg | Bin 0 -> 7420 bytes .../sounds/block/bone_pile_step_0.ogg | Bin 0 -> 7802 bytes .../sounds/block/bone_pile_step_1.ogg | Bin 0 -> 6946 bytes .../sounds/block/bone_pile_step_2.ogg | Bin 0 -> 6385 bytes .../sounds/block/bone_pile_step_3.ogg | Bin 0 -> 6938 bytes .../sounds/block/sepulcher_break_0.ogg | Bin 0 -> 11879 bytes .../sounds/block/sepulcher_break_1.ogg | Bin 0 -> 13221 bytes .../sounds/block/sepulcher_break_2.ogg | Bin 0 -> 12650 bytes .../sounds/block/sepulcher_break_3.ogg | Bin 0 -> 10557 bytes .../block/sepulcher_corpse_stuffed_0.ogg | Bin 0 -> 16194 bytes .../block/sepulcher_corpse_stuffed_1.ogg | Bin 0 -> 16959 bytes .../sounds/block/sepulcher_filled_0.ogg | Bin 0 -> 9302 bytes .../sounds/block/sepulcher_filled_1.ogg | Bin 0 -> 9878 bytes .../sounds/block/sepulcher_filled_2.ogg | Bin 0 -> 9875 bytes .../sounds/block/sepulcher_filled_3.ogg | Bin 0 -> 11148 bytes .../sounds/block/sepulcher_harvest_0.ogg | Bin 0 -> 8599 bytes .../sounds/block/sepulcher_harvest_1.ogg | Bin 0 -> 8418 bytes .../sounds/block/sepulcher_harvest_2.ogg | Bin 0 -> 8191 bytes .../sounds/block/sepulcher_rotting_0.ogg | Bin 0 -> 15112 bytes .../sounds/block/sepulcher_rotting_1.ogg | Bin 0 -> 15324 bytes .../sounds/block/sepulcher_rotting_2.ogg | Bin 0 -> 18200 bytes .../sounds/block/sepulcher_rotting_3.ogg | Bin 0 -> 22795 bytes .../sounds/block/sepulcher_sealing.ogg | Bin 0 -> 9064 bytes .../sounds/block/sepulcher_step_0.ogg | Bin 0 -> 8968 bytes .../sounds/block/sepulcher_step_1.ogg | Bin 0 -> 8974 bytes .../sounds/block/sepulcher_step_2.ogg | Bin 0 -> 10460 bytes .../sounds/block/sepulcher_step_3.ogg | Bin 0 -> 9289 bytes .../sounds/block/sepulcher_step_4.ogg | Bin 0 -> 9255 bytes .../sounds/block/sepulcher_unsealing.ogg | Bin 0 -> 7443 bytes .../textures/block/bone_pile_side.png | Bin 0 -> 238 bytes .../textures/particle/bone_fragment_0.png | Bin 0 -> 197 bytes .../textures/particle/bone_fragment_1.png | Bin 0 -> 197 bytes .../textures/particle/bone_fragment_2.png | Bin 0 -> 183 bytes .../textures/particle/bone_fragment_3.png | Bin 0 -> 194 bytes .../textures/particle/bone_fragment_4.png | Bin 0 -> 196 bytes 59 files changed, 446 insertions(+), 39 deletions(-) create mode 100644 src/main/java/galena/oreganized/content/block/BonePileBlock.java create mode 100644 src/main/java/galena/oreganized/network/packet/SepulcherRotsPacket.java create mode 100644 src/main/resources/assets/oreganized/particles/bone_fragment.json create mode 100644 src/main/resources/assets/oreganized/sounds/block/bone_pile_break_0.ogg create mode 100644 src/main/resources/assets/oreganized/sounds/block/bone_pile_break_1.ogg create mode 100644 src/main/resources/assets/oreganized/sounds/block/bone_pile_break_2.ogg create mode 100644 src/main/resources/assets/oreganized/sounds/block/bone_pile_break_3.ogg create mode 100644 src/main/resources/assets/oreganized/sounds/block/bone_pile_break_4.ogg create mode 100644 src/main/resources/assets/oreganized/sounds/block/bone_pile_step_0.ogg create mode 100644 src/main/resources/assets/oreganized/sounds/block/bone_pile_step_1.ogg create mode 100644 src/main/resources/assets/oreganized/sounds/block/bone_pile_step_2.ogg create mode 100644 src/main/resources/assets/oreganized/sounds/block/bone_pile_step_3.ogg create mode 100644 src/main/resources/assets/oreganized/sounds/block/sepulcher_break_0.ogg create mode 100644 src/main/resources/assets/oreganized/sounds/block/sepulcher_break_1.ogg create mode 100644 src/main/resources/assets/oreganized/sounds/block/sepulcher_break_2.ogg create mode 100644 src/main/resources/assets/oreganized/sounds/block/sepulcher_break_3.ogg create mode 100644 src/main/resources/assets/oreganized/sounds/block/sepulcher_corpse_stuffed_0.ogg create mode 100644 src/main/resources/assets/oreganized/sounds/block/sepulcher_corpse_stuffed_1.ogg create mode 100644 src/main/resources/assets/oreganized/sounds/block/sepulcher_filled_0.ogg create mode 100644 src/main/resources/assets/oreganized/sounds/block/sepulcher_filled_1.ogg create mode 100644 src/main/resources/assets/oreganized/sounds/block/sepulcher_filled_2.ogg create mode 100644 src/main/resources/assets/oreganized/sounds/block/sepulcher_filled_3.ogg create mode 100644 src/main/resources/assets/oreganized/sounds/block/sepulcher_harvest_0.ogg create mode 100644 src/main/resources/assets/oreganized/sounds/block/sepulcher_harvest_1.ogg create mode 100644 src/main/resources/assets/oreganized/sounds/block/sepulcher_harvest_2.ogg create mode 100644 src/main/resources/assets/oreganized/sounds/block/sepulcher_rotting_0.ogg create mode 100644 src/main/resources/assets/oreganized/sounds/block/sepulcher_rotting_1.ogg create mode 100644 src/main/resources/assets/oreganized/sounds/block/sepulcher_rotting_2.ogg create mode 100644 src/main/resources/assets/oreganized/sounds/block/sepulcher_rotting_3.ogg create mode 100644 src/main/resources/assets/oreganized/sounds/block/sepulcher_sealing.ogg create mode 100644 src/main/resources/assets/oreganized/sounds/block/sepulcher_step_0.ogg create mode 100644 src/main/resources/assets/oreganized/sounds/block/sepulcher_step_1.ogg create mode 100644 src/main/resources/assets/oreganized/sounds/block/sepulcher_step_2.ogg create mode 100644 src/main/resources/assets/oreganized/sounds/block/sepulcher_step_3.ogg create mode 100644 src/main/resources/assets/oreganized/sounds/block/sepulcher_step_4.ogg create mode 100644 src/main/resources/assets/oreganized/sounds/block/sepulcher_unsealing.ogg create mode 100644 src/main/resources/assets/oreganized/textures/block/bone_pile_side.png create mode 100644 src/main/resources/assets/oreganized/textures/particle/bone_fragment_0.png create mode 100644 src/main/resources/assets/oreganized/textures/particle/bone_fragment_1.png create mode 100644 src/main/resources/assets/oreganized/textures/particle/bone_fragment_2.png create mode 100644 src/main/resources/assets/oreganized/textures/particle/bone_fragment_3.png create mode 100644 src/main/resources/assets/oreganized/textures/particle/bone_fragment_4.png diff --git a/src/generated/resources/.cache/002701d48eee4c36b62b24b011e74b0624793d05 b/src/generated/resources/.cache/002701d48eee4c36b62b24b011e74b0624793d05 index 3c85bcb4..7dec2a19 100644 --- a/src/generated/resources/.cache/002701d48eee4c36b62b24b011e74b0624793d05 +++ b/src/generated/resources/.cache/002701d48eee4c36b62b24b011e74b0624793d05 @@ -1,4 +1,4 @@ -// 1.20.1 2024-10-24T14:16:29.4433161 oreganized Block States +// 1.20.1 2024-10-24T15:02:18.4232762 oreganized Block States d85b0fb9e5cad1d9c4f22ed192b0fa621ee3373c assets/oreganized/blockstates/black_crystal_glass.json 05bb006ff7f48557fe5c5333bc120f7206052717 assets/oreganized/blockstates/black_crystal_glass_pane.json 5de0c522692198c3b8b01df17d8952035b80c8d9 assets/oreganized/blockstates/black_vigil_candle.json @@ -186,7 +186,7 @@ fb733abb3258847ce7996d523cab2a01a06b6f24 assets/oreganized/models/block/blue_vig 61febf388c292dbc8f5eaee75ce124b0cb9f4c92 assets/oreganized/models/block/blue_vigil_candle_triple_ceiling.json ebec47765087796176a58ab2d4e4203cd9977dea assets/oreganized/models/block/blue_vigil_candle_triple_ceiling_lit.json 913e394fcdfec1679ca3ab5b1c327a4a68a4ce85 assets/oreganized/models/block/blue_vigil_candle_triple_lit.json -98c64ea1f285b1ba1c182aac9b4057530dba0d07 assets/oreganized/models/block/bone_pile.json +7f07c6ba4f4ac8276ed2a7531526a4228af36fc6 assets/oreganized/models/block/bone_pile.json 3296354cd0709abe6eb75e1fc39f1c72d0a9d0a7 assets/oreganized/models/block/brown_concrete_powder.json 4154dddb09563c888c73caa346d5a491ff902782 assets/oreganized/models/block/brown_crystal_glass.json 632ce280a6004238bf5ee88445904213ca67c413 assets/oreganized/models/block/brown_crystal_glass_in.json diff --git a/src/generated/resources/.cache/5bb646c3cee204f41a1b59a2c0d9083b5f7155b0 b/src/generated/resources/.cache/5bb646c3cee204f41a1b59a2c0d9083b5f7155b0 index f7c051da..f3fc75bd 100644 --- a/src/generated/resources/.cache/5bb646c3cee204f41a1b59a2c0d9083b5f7155b0 +++ b/src/generated/resources/.cache/5bb646c3cee204f41a1b59a2c0d9083b5f7155b0 @@ -1,4 +1,4 @@ -// 1.20.1 2024-10-24T14:16:29.454834 Oreganized Block Tags +// 1.20.1 2024-10-24T15:33:23.489208 Oreganized Block Tags 7a2d68d81bc5ee59f9a2f4ba68ddb39bfd9c875d data/forge/tags/blocks/glass.json d96b4f83e03abe39a1b97d92b7818c8f6b2e5c68 data/forge/tags/blocks/glass_panes.json d062c23ad5308b7de0b2e86f6531ea724530f898 data/forge/tags/blocks/melts_lead.json @@ -40,4 +40,4 @@ eaca08d04b1742f418e6bc0964dd32cf16035d88 data/oreganized/tags/blocks/mineable/sc cf3608bd187922aeb48c566c19e8482b0dca34c7 data/oreganized/tags/blocks/prevents_lead_cloud.json 06c2e2e512966767a31df77e646e41c4c39e3dd3 data/oreganized/tags/blocks/silktouch_using_scribe.json 3112fb4a1df2953e2c3572fa47f886bf8e5bd679 data/oreganized/tags/blocks/stone_types/glance.json -8c1c902dd799d9b4f264f795364eb9475867a13f data/oreganized/tags/blocks/vigil_candles.json +d83fef2771b28de02bd241459bd9e94b38482fe9 data/oreganized/tags/blocks/vigil_candles.json diff --git a/src/generated/resources/.cache/735031f3addf80804addae5e3f53249900116f1e b/src/generated/resources/.cache/735031f3addf80804addae5e3f53249900116f1e index 044ccd30..d5127027 100644 --- a/src/generated/resources/.cache/735031f3addf80804addae5e3f53249900116f1e +++ b/src/generated/resources/.cache/735031f3addf80804addae5e3f53249900116f1e @@ -1,2 +1,2 @@ -// 1.20.1 2024-08-13T20:16:24.7249289 Sound Definitions -1c624d0138bd1190491dbcf118dbe3556f4f0713 assets/oreganized/sounds.json +// 1.20.1 2024-10-24T14:51:12.3697524 Sound Definitions +f0ce8a86a30c0f36dd7616ac727c2eea030ff058 assets/oreganized/sounds.json diff --git a/src/generated/resources/assets/oreganized/models/block/bone_pile.json b/src/generated/resources/assets/oreganized/models/block/bone_pile.json index 53468cc8..f7815a8b 100644 --- a/src/generated/resources/assets/oreganized/models/block/bone_pile.json +++ b/src/generated/resources/assets/oreganized/models/block/bone_pile.json @@ -1,6 +1,7 @@ { - "parent": "minecraft:block/cube_all", + "parent": "minecraft:block/cube_column", "textures": { - "all": "oreganized:block/sepulcher_rot_5" + "end": "oreganized:block/sepulcher_rot_5", + "side": "oreganized:block/bone_pile_side" } } \ No newline at end of file diff --git a/src/generated/resources/assets/oreganized/sounds.json b/src/generated/resources/assets/oreganized/sounds.json index e7a72c26..a0c4add8 100644 --- a/src/generated/resources/assets/oreganized/sounds.json +++ b/src/generated/resources/assets/oreganized/sounds.json @@ -1,4 +1,51 @@ { + "block.bone_pile.break": { + "sounds": [ + "oreganized:block/bone_pile_break_0", + "oreganized:block/bone_pile_break_1", + "oreganized:block/bone_pile_break_2", + "oreganized:block/bone_pile_break_3", + "oreganized:block/bone_pile_break_4" + ], + "subtitle": "subtitles.block.generic.place" + }, + "block.bone_pile.fall": { + "sounds": [ + "oreganized:block/bone_pile_step_0", + "oreganized:block/bone_pile_step_1", + "oreganized:block/bone_pile_step_2", + "oreganized:block/bone_pile_step_3" + ], + "subtitle": "subtitles.block.generic.place" + }, + "block.bone_pile.hit": { + "sounds": [ + "oreganized:block/bone_pile_step_0", + "oreganized:block/bone_pile_step_1", + "oreganized:block/bone_pile_step_2", + "oreganized:block/bone_pile_step_3" + ], + "subtitle": "subtitles.block.generic.place" + }, + "block.bone_pile.place": { + "sounds": [ + "oreganized:block/bone_pile_break_0", + "oreganized:block/bone_pile_break_1", + "oreganized:block/bone_pile_break_2", + "oreganized:block/bone_pile_break_3", + "oreganized:block/bone_pile_break_4" + ], + "subtitle": "subtitles.block.generic.place" + }, + "block.bone_pile.step": { + "sounds": [ + "oreganized:block/bone_pile_step_0", + "oreganized:block/bone_pile_step_1", + "oreganized:block/bone_pile_step_2", + "oreganized:block/bone_pile_step_3" + ], + "subtitle": "subtitles.block.generic.place" + }, "block.gargoyle.growl": { "sounds": [ "oreganized:block/gargoyle_growl_1", @@ -7,6 +54,99 @@ ], "subtitle": "subtitles.block.gargoyle.growl" }, + "block.sepulcher.break": { + "sounds": [ + "oreganized:block/sepulcher_break_0", + "oreganized:block/sepulcher_break_1", + "oreganized:block/sepulcher_break_2", + "oreganized:block/sepulcher_break_3" + ], + "subtitle": "subtitles.block.generic.place" + }, + "block.sepulcher.corpse_stuffed": { + "sounds": [ + "oreganized:block/sepulcher_corpse_stuffed_0", + "oreganized:block/sepulcher_corpse_stuffed_1" + ], + "subtitle": "subtitles.block.generic.place" + }, + "block.sepulcher.fall": { + "sounds": [ + "oreganized:block/sepulcher_step_0", + "oreganized:block/sepulcher_step_1", + "oreganized:block/sepulcher_step_2", + "oreganized:block/sepulcher_step_3", + "oreganized:block/sepulcher_step_4" + ], + "subtitle": "subtitles.block.generic.place" + }, + "block.sepulcher.filled": { + "sounds": [ + "oreganized:block/sepulcher_filled_0", + "oreganized:block/sepulcher_filled_1", + "oreganized:block/sepulcher_filled_2", + "oreganized:block/sepulcher_filled_3" + ], + "subtitle": "subtitles.block.generic.place" + }, + "block.sepulcher.harvest": { + "sounds": [ + "oreganized:block/sepulcher_harvest_0", + "oreganized:block/sepulcher_harvest_1", + "oreganized:block/sepulcher_harvest_2" + ], + "subtitle": "subtitles.block.generic.place" + }, + "block.sepulcher.hit": { + "sounds": [ + "oreganized:block/sepulcher_step_0", + "oreganized:block/sepulcher_step_1", + "oreganized:block/sepulcher_step_2", + "oreganized:block/sepulcher_step_3", + "oreganized:block/sepulcher_step_4" + ], + "subtitle": "subtitles.block.generic.place" + }, + "block.sepulcher.place": { + "sounds": [ + "oreganized:block/sepulcher_break_0", + "oreganized:block/sepulcher_break_1", + "oreganized:block/sepulcher_break_2", + "oreganized:block/sepulcher_break_3" + ], + "subtitle": "subtitles.block.generic.place" + }, + "block.sepulcher.rotting": { + "sounds": [ + "oreganized:block/sepulcher_rotting_0", + "oreganized:block/sepulcher_rotting_1", + "oreganized:block/sepulcher_rotting_2", + "oreganized:block/sepulcher_rotting_3" + ], + "subtitle": "subtitles.block.generic.place" + }, + "block.sepulcher.sealing": { + "sounds": [ + "oreganized:block/sepulcher_sealing" + ], + "subtitle": "subtitles.block.generic.place" + }, + "block.sepulcher.step": { + "sounds": [ + "oreganized:block/sepulcher_step_0", + "oreganized:block/sepulcher_step_1", + "oreganized:block/sepulcher_step_2", + "oreganized:block/sepulcher_step_3", + "oreganized:block/sepulcher_step_4" + ], + "subtitle": "subtitles.block.generic.place" + }, + "block.sepulcher.unsealing": { + "sounds": [ + "oreganized:block/sepulcher_unsealing" + ], + "subtitle": "subtitles.block.generic.place" + }, "entity.bolt_hit": { "sounds": [ "oreganized:entity/bolt_hit" diff --git a/src/generated/resources/data/oreganized/loot_tables/blocks/sepulcher.json b/src/generated/resources/data/oreganized/loot_tables/blocks/sepulcher.json index 182a003b..4d150352 100644 --- a/src/generated/resources/data/oreganized/loot_tables/blocks/sepulcher.json +++ b/src/generated/resources/data/oreganized/loot_tables/blocks/sepulcher.json @@ -15,6 +15,25 @@ } ], "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, + "conditions": [ + { + "block": "oreganized:sepulcher", + "condition": "minecraft:block_state_property", + "properties": { + "level": "18" + } + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "oreganized:bone_pile" + } + ], + "rolls": 1.0 } ], "random_sequence": "oreganized:blocks/sepulcher" diff --git a/src/generated/resources/data/oreganized/tags/blocks/vigil_candles.json b/src/generated/resources/data/oreganized/tags/blocks/vigil_candles.json index c4c8ee84..1f396b24 100644 --- a/src/generated/resources/data/oreganized/tags/blocks/vigil_candles.json +++ b/src/generated/resources/data/oreganized/tags/blocks/vigil_candles.json @@ -1,21 +1,21 @@ { "values": [ "oreganized:vigil_candle", - "oreganized:red_vigil_candle", - "oreganized:orange_vigil_candle", "oreganized:cyan_vigil_candle", "oreganized:brown_vigil_candle", - "oreganized:light_gray_vigil_candle", + "oreganized:black_vigil_candle", + "oreganized:green_vigil_candle", + "oreganized:lime_vigil_candle", + "oreganized:magenta_vigil_candle", "oreganized:pink_vigil_candle", "oreganized:blue_vigil_candle", - "oreganized:lime_vigil_candle", + "oreganized:light_blue_vigil_candle", + "oreganized:orange_vigil_candle", + "oreganized:yellow_vigil_candle", "oreganized:white_vigil_candle", - "oreganized:magenta_vigil_candle", - "oreganized:green_vigil_candle", - "oreganized:black_vigil_candle", + "oreganized:light_gray_vigil_candle", + "oreganized:red_vigil_candle", "oreganized:purple_vigil_candle", - "oreganized:light_blue_vigil_candle", - "oreganized:gray_vigil_candle", - "oreganized:yellow_vigil_candle" + "oreganized:gray_vigil_candle" ] } \ No newline at end of file diff --git a/src/main/java/galena/oreganized/content/block/BonePileBlock.java b/src/main/java/galena/oreganized/content/block/BonePileBlock.java new file mode 100644 index 00000000..28e5c27b --- /dev/null +++ b/src/main/java/galena/oreganized/content/block/BonePileBlock.java @@ -0,0 +1,72 @@ +package galena.oreganized.content.block; + +import galena.oreganized.index.OParticleTypes; +import galena.oreganized.index.OSoundEvents; +import net.minecraft.client.particle.ParticleEngine; +import net.minecraft.core.BlockPos; +import net.minecraft.server.level.ServerLevel; +import net.minecraft.sounds.SoundSource; +import net.minecraft.world.entity.Entity; +import net.minecraft.world.entity.LivingEntity; +import net.minecraft.world.entity.item.FallingBlockEntity; +import net.minecraft.world.level.Level; +import net.minecraft.world.level.block.FallingBlock; +import net.minecraft.world.level.block.state.BlockState; +import net.minecraft.world.phys.Vec3; +import net.minecraftforge.client.extensions.common.IClientBlockExtensions; + +import java.util.function.Consumer; + +public class BonePileBlock extends FallingBlock { + + public BonePileBlock(Properties properties) { + super(properties); + } + + @Override + public void onLand(Level level, BlockPos pos, BlockState state, BlockState other, FallingBlockEntity entity) { + super.onLand(level, pos, state, other, entity); + if (!entity.isSilent()) level.playSound(null, pos, OSoundEvents.BONE_PILE_FALL.get(), SoundSource.BLOCKS, 1F, 1F); + particles(level, Vec3.atCenterOf(pos), 10); + } + + @Override + public boolean addLandingEffects(BlockState state, ServerLevel level, BlockPos pos, BlockState other, LivingEntity entity, int numberOfParticles) { + particles(level, entity.position(), numberOfParticles / 2); + return true; + } + + @Override + public boolean addRunningEffects(BlockState state, Level level, BlockPos pos, Entity entity) { + var vec = entity.position(); + level.addParticle(OParticleTypes.BONE_FRAGMENT.get(), vec.x, vec.y, vec.z, level.random.nextDouble() - 0.5, level.random.nextDouble() - 0.5, level.random.nextDouble() - 0.5); + return true; + } + + @Override + public void initializeClient(Consumer consumer) { + consumer.accept(new ClientProperties()); + } + + private void particles(Level level, Vec3 vec, int numberOfParticles) { + if (level instanceof ServerLevel serverLevel) { + serverLevel.sendParticles(OParticleTypes.BONE_FRAGMENT.get(), vec.x, vec.y, vec.z, numberOfParticles, level.random.nextDouble() - 0.5, level.random.nextDouble() - 0.5, level.random.nextDouble() - 0.5, 0.0); + } else for (int i = 0; i < numberOfParticles; i++) { + level.addParticle(OParticleTypes.BONE_FRAGMENT.get(), + vec.x + level.random.nextDouble() - 0.5, vec.y + level.random.nextDouble() - 0.5, vec.z + level.random.nextDouble() - 0.5, + level.random.nextDouble() - 0.5, level.random.nextDouble() - 0.5, level.random.nextDouble() - 0.5 + ); + } + } + + public class ClientProperties implements IClientBlockExtensions { + + @Override + public boolean addDestroyEffects(BlockState state, Level level, BlockPos pos, ParticleEngine manager) { + particles(level, Vec3.atCenterOf(pos), 10); + return IClientBlockExtensions.super.addDestroyEffects(state, level, pos, manager); + } + + } + +} diff --git a/src/main/java/galena/oreganized/content/block/SepulcherBlock.java b/src/main/java/galena/oreganized/content/block/SepulcherBlock.java index 273b620a..288a636c 100644 --- a/src/main/java/galena/oreganized/content/block/SepulcherBlock.java +++ b/src/main/java/galena/oreganized/content/block/SepulcherBlock.java @@ -3,9 +3,9 @@ import galena.oreganized.content.entity.SepulcherBlockEntity; import galena.oreganized.index.OBlockEntities; import galena.oreganized.index.OBlocks; +import galena.oreganized.index.OSoundEvents; import net.minecraft.Util; import net.minecraft.core.BlockPos; -import net.minecraft.sounds.SoundEvents; import net.minecraft.sounds.SoundSource; import net.minecraft.stats.Stats; import net.minecraft.world.InteractionHand; @@ -92,11 +92,11 @@ public static boolean tryInsert(ItemStack stack, @Nullable Player player, BlockS } public static void insert(@Nullable Entity user, BlockState state, LevelAccessor level, BlockPos pos, int by) { - var newState = state.setValue(LEVEL, Math.min(READY, state.getValue(LEVEL) + by)); + var newState = state.setValue(LEVEL, Math.min(MAX_LEVEL, state.getValue(LEVEL) + by)); level.setBlock(pos, newState, 3); level.gameEvent(GameEvent.BLOCK_CHANGE, pos, GameEvent.Context.of(user, newState)); - level.playSound(null, pos, SoundEvents.COMPOSTER_FILL, SoundSource.BLOCKS, 1.0F, 1.0F); + level.playSound(null, pos, OSoundEvents.SEPULCHER_FILLED.get(), SoundSource.BLOCKS, 1.0F, 1.0F); } public static void extract(@Nullable Entity user, BlockState state, Level level, BlockPos pos) { @@ -115,7 +115,7 @@ public static void clear(@Nullable Entity user, BlockState state, Level level, B level.setBlockAndUpdate(pos, empty); level.gameEvent(GameEvent.BLOCK_CHANGE, pos, GameEvent.Context.of(user, empty)); - level.playSound(null, pos, SoundEvents.COMPOSTER_EMPTY, SoundSource.BLOCKS, 1.0F, 1.0F); + level.playSound(null, pos, OSoundEvents.SEPULCHER_HARVEST.get(), SoundSource.BLOCKS, 1.0F, 1.0F); } @Override diff --git a/src/main/java/galena/oreganized/content/entity/SepulcherBlockEntity.java b/src/main/java/galena/oreganized/content/entity/SepulcherBlockEntity.java index e8a9528f..4e24dd3f 100644 --- a/src/main/java/galena/oreganized/content/entity/SepulcherBlockEntity.java +++ b/src/main/java/galena/oreganized/content/entity/SepulcherBlockEntity.java @@ -5,15 +5,19 @@ import galena.oreganized.content.block.SepulcherBlock; import galena.oreganized.index.OBlockEntities; import galena.oreganized.index.OBlocks; +import galena.oreganized.index.OSoundEvents; import galena.oreganized.index.OTags; import galena.oreganized.network.OreganizedNetwork; import galena.oreganized.network.packet.SepulcherConsumesDeathPacket; +import galena.oreganized.network.packet.SepulcherRotsPacket; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; -import net.minecraft.core.particles.ParticleTypes; import net.minecraft.nbt.CompoundTag; import net.minecraft.server.level.ServerLevel; +import net.minecraft.sounds.SoundEvent; +import net.minecraft.sounds.SoundSource; import net.minecraft.world.Container; +import net.minecraft.world.entity.Pose; import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.ItemStack; import net.minecraft.world.level.Level; @@ -31,7 +35,7 @@ import net.minecraftforge.network.PacketDistributor; import org.jetbrains.annotations.NotNull; -import java.awt.*; +import java.util.function.Supplier; public class SepulcherBlockEntity extends BlockEntity implements Ticking, Container, GameEventListener.Holder { @@ -66,14 +70,27 @@ public void tick(BlockState state, Level level, BlockPos pos) { if (progress < progressNeeded(fillLevel)) return; - level.setBlockAndUpdate(pos, state.setValue(SepulcherBlock.LEVEL, fillLevel + 1)); + int nextLevel = fillLevel + 1; + level.setBlockAndUpdate(pos, state.setValue(SepulcherBlock.LEVEL, nextLevel)); progress = 0; - var effectColor = new Color(8889187); - for (int i = 0; i < 20; i++) { - var vec = Vec3.atBottomCenterOf(pos).add(level.random.nextDouble() - 0.5, 0.8, level.random.nextDouble() - 0.5); - level.addParticle(ParticleTypes.ENTITY_EFFECT, vec.x, vec.y, vec.z, effectColor.getRed() / 255D, effectColor.getGreen() / 255D, effectColor.getBlue() / 255D); + if (fillLevel == SepulcherBlock.MAX_LEVEL) { + sound(OSoundEvents.SEPULCHER_SEALING); + } else if (nextLevel == SepulcherBlock.READY) { + sound(OSoundEvents.SEPULCHER_UNSEALING); + } else { + sound(OSoundEvents.SEPULCHER_ROTTING); } + + OreganizedNetwork.CHANNEL.send( + PacketDistributor.NEAR.with(PacketDistributor.TargetPoint.p(pos.getX(), pos.getY(), pos.getZ(), 16.0, level.dimension())), + new SepulcherRotsPacket(pos) + ); + } + + private void sound(Supplier sound) { + if (!hasLevel()) return; + level.playSound(null, getBlockPos(), sound.get(), SoundSource.BLOCKS, 1F, 1F); } private void checkHeatSource(Level level, BlockPos pos) { @@ -127,8 +144,6 @@ public boolean handleGameEvent(ServerLevel level, GameEvent event, GameEvent.Con if (entity == null) return false; if (entity.getPersistentData().getBoolean(TAG_KEY)) return false; - entity.getPersistentData().putBoolean(TAG_KEY, true); - if (!entity.getType().is(OTags.Entities.FILLS_SEPULCHER)) return false; var state = getBlockState(); @@ -136,14 +151,19 @@ public boolean handleGameEvent(ServerLevel level, GameEvent event, GameEvent.Con if (fillLevel >= SepulcherBlock.MAX_LEVEL) return false; + entity.getPersistentData().putBoolean(TAG_KEY, true); + SepulcherBlock.insert(null, state, level, getBlockPos(), level.random.nextIntBetweenInclusive(3, 4)); + sound(OSoundEvents.SEPULCHER_CORPSE_STUFFED); + OreganizedNetwork.CHANNEL.send( PacketDistributor.NEAR.with(PacketDistributor.TargetPoint.p(vec.x, vec.y, vec.z, 16.0, entity.level().dimension())), new SepulcherConsumesDeathPacket(vec) ); entity.setPos(Vec3.atCenterOf(getBlockPos())); + if(entity.getPose() == Pose.DYING) entity.setPose(Pose.STANDING); return true; } diff --git a/src/main/java/galena/oreganized/data/OBlockStates.java b/src/main/java/galena/oreganized/data/OBlockStates.java index f34af377..81efa792 100644 --- a/src/main/java/galena/oreganized/data/OBlockStates.java +++ b/src/main/java/galena/oreganized/data/OBlockStates.java @@ -114,7 +114,7 @@ protected void registerStatesAndModels() { gargoyleBlock(OBlocks.GARGOYLE); sepulcherBlock(OBlocks.SEPULCHER); - simpleBlock(OBlocks.BONE_PILE.get(), models().cubeAll(blockTexture(OBlocks.BONE_PILE.get()).getPath(), Oreganized.modLoc("block/sepulcher_rot_5"))); + simpleBlock(OBlocks.BONE_PILE.get(), models().cubeColumn(blockTexture(OBlocks.BONE_PILE.get()).getPath(), Oreganized.modLoc("block/bone_pile_side"), Oreganized.modLoc("block/sepulcher_rot_5"))); simpleBlock(OBlocks.ROTTING_FLESH.get(), models().cubeAll(blockTexture(OBlocks.ROTTING_FLESH.get()).getPath(), Oreganized.modLoc("block/sepulcher_rot_1"))); vigilCandle(OBlocks.VIGIL_CANDLE, null); OBlocks.COLORED_VIGIL_CANDLES.forEach((color, block) -> vigilCandle(block, color.getSerializedName())); diff --git a/src/main/java/galena/oreganized/data/OLootTables.java b/src/main/java/galena/oreganized/data/OLootTables.java index 6703396b..42cdc6b1 100644 --- a/src/main/java/galena/oreganized/data/OLootTables.java +++ b/src/main/java/galena/oreganized/data/OLootTables.java @@ -2,6 +2,7 @@ import galena.oreganized.Oreganized; import galena.oreganized.content.block.IMeltableBlock; +import galena.oreganized.content.block.SepulcherBlock; import galena.oreganized.data.provider.OBlockLootProvider; import galena.oreganized.index.OBlocks; import galena.oreganized.index.OEntityTypes; @@ -128,7 +129,13 @@ protected void generate() { dropSelf(blocks); } - dropSelf(OBlocks.SEPULCHER); + add(OBlocks.SEPULCHER.get(), it -> createSingleItemTable(it) + .withPool(LootPool.lootPool() + .setRolls(ConstantValue.exactly(1.0F)) + .add(LootItem.lootTableItem(OBlocks.BONE_PILE.get())) + .when(LootItemBlockStatePropertyCondition.hasBlockStateProperties(it).setProperties(StatePropertiesPredicate.Builder.properties().hasProperty(SepulcherBlock.LEVEL, SepulcherBlock.READY))) + ) + ); dropSelf(OBlocks.BONE_PILE); dropNothing(OBlocks.ROTTING_FLESH); OBlocks.vigilCandles().forEach(this::vigilCandle); diff --git a/src/main/java/galena/oreganized/data/OSoundDefinitions.java b/src/main/java/galena/oreganized/data/OSoundDefinitions.java index 8cba0600..6f1f0410 100644 --- a/src/main/java/galena/oreganized/data/OSoundDefinitions.java +++ b/src/main/java/galena/oreganized/data/OSoundDefinitions.java @@ -6,6 +6,8 @@ import net.minecraftforge.common.data.ExistingFileHelper; import net.minecraftforge.common.data.SoundDefinitionsProvider; +import java.util.stream.Stream; + public class OSoundDefinitions extends SoundDefinitionsProvider { public OSoundDefinitions(PackOutput output, ExistingFileHelper helper) { @@ -22,11 +24,11 @@ public void registerSounds() { sound("minecraft:random/fuse") ).subtitle("subtitles.entity.shrapnel_bomb.primed")); - add(OSoundEvents.BOLT_HIT, definition().with( + add(OSoundEvents.BOLT_HIT, definition().with( sound(Oreganized.MOD_ID + ":entity/bolt_hit") ).subtitle("subtitles.entity.bolt_hit")); - add(OSoundEvents.BOLT_HIT_ARMOR, definition().with( + add(OSoundEvents.BOLT_HIT_ARMOR, definition().with( sound(Oreganized.MOD_ID + ":entity/bolt_hit_armor") ).subtitle("subtitles.entity.bolt_hit_armor")); @@ -35,5 +37,77 @@ public void registerSounds() { sound(Oreganized.MOD_ID + ":block/gargoyle_growl_2"), sound(Oreganized.MOD_ID + ":block/gargoyle_growl_3") ).subtitle("subtitles.block.gargoyle.growl")); + + Stream.of(OSoundEvents.BONE_PILE_BREAK, OSoundEvents.BONE_PILE_PLACE).forEach(it -> { + add(it, definition().with( + sound(Oreganized.MOD_ID + ":block/bone_pile_break_0"), + sound(Oreganized.MOD_ID + ":block/bone_pile_break_1"), + sound(Oreganized.MOD_ID + ":block/bone_pile_break_2"), + sound(Oreganized.MOD_ID + ":block/bone_pile_break_3"), + sound(Oreganized.MOD_ID + ":block/bone_pile_break_4") + ).subtitle("subtitles.block.generic.place")); + }); + + Stream.of(OSoundEvents.BONE_PILE_HIT, OSoundEvents.BONE_PILE_STEP, OSoundEvents.BONE_PILE_FALL).forEach(it -> { + add(it, definition().with( + sound(Oreganized.MOD_ID + ":block/bone_pile_step_0"), + sound(Oreganized.MOD_ID + ":block/bone_pile_step_1"), + sound(Oreganized.MOD_ID + ":block/bone_pile_step_2"), + sound(Oreganized.MOD_ID + ":block/bone_pile_step_3") + ).subtitle("subtitles.block.generic.place")); + }); + + Stream.of(OSoundEvents.SEPULCHER_BREAK, OSoundEvents.SEPULCHER_PLACE).forEach(it -> { + add(it, definition().with( + sound(Oreganized.MOD_ID + ":block/sepulcher_break_0"), + sound(Oreganized.MOD_ID + ":block/sepulcher_break_1"), + sound(Oreganized.MOD_ID + ":block/sepulcher_break_2"), + sound(Oreganized.MOD_ID + ":block/sepulcher_break_3") + ).subtitle("subtitles.block.generic.place")); + }); + + Stream.of(OSoundEvents.SEPULCHER_HIT, OSoundEvents.SEPULCHER_STEP, OSoundEvents.SEPULCHER_FALL).forEach(it -> { + add(it, definition().with( + sound(Oreganized.MOD_ID + ":block/sepulcher_step_0"), + sound(Oreganized.MOD_ID + ":block/sepulcher_step_1"), + sound(Oreganized.MOD_ID + ":block/sepulcher_step_2"), + sound(Oreganized.MOD_ID + ":block/sepulcher_step_3"), + sound(Oreganized.MOD_ID + ":block/sepulcher_step_4") + ).subtitle("subtitles.block.generic.place")); + }); + + add(OSoundEvents.SEPULCHER_CORPSE_STUFFED, definition().with( + sound(Oreganized.MOD_ID + ":block/sepulcher_corpse_stuffed_0"), + sound(Oreganized.MOD_ID + ":block/sepulcher_corpse_stuffed_1") + ).subtitle("subtitles.block.generic.place")); + + add(OSoundEvents.SEPULCHER_FILLED, definition().with( + sound(Oreganized.MOD_ID + ":block/sepulcher_filled_0"), + sound(Oreganized.MOD_ID + ":block/sepulcher_filled_1"), + sound(Oreganized.MOD_ID + ":block/sepulcher_filled_2"), + sound(Oreganized.MOD_ID + ":block/sepulcher_filled_3") + ).subtitle("subtitles.block.generic.place")); + + add(OSoundEvents.SEPULCHER_ROTTING, definition().with( + sound(Oreganized.MOD_ID + ":block/sepulcher_rotting_0"), + sound(Oreganized.MOD_ID + ":block/sepulcher_rotting_1"), + sound(Oreganized.MOD_ID + ":block/sepulcher_rotting_2"), + sound(Oreganized.MOD_ID + ":block/sepulcher_rotting_3") + ).subtitle("subtitles.block.generic.place")); + + add(OSoundEvents.SEPULCHER_HARVEST, definition().with( + sound(Oreganized.MOD_ID + ":block/sepulcher_harvest_0"), + sound(Oreganized.MOD_ID + ":block/sepulcher_harvest_1"), + sound(Oreganized.MOD_ID + ":block/sepulcher_harvest_2") + ).subtitle("subtitles.block.generic.place")); + + add(OSoundEvents.SEPULCHER_SEALING, definition() + .with(sound(Oreganized.MOD_ID + ":block/sepulcher_sealing")) + .subtitle("subtitles.block.generic.place")); + + add(OSoundEvents.SEPULCHER_UNSEALING, definition() + .with(sound(Oreganized.MOD_ID + ":block/sepulcher_unsealing")) + .subtitle("subtitles.block.generic.place")); } + } \ No newline at end of file diff --git a/src/main/java/galena/oreganized/index/OBlocks.java b/src/main/java/galena/oreganized/index/OBlocks.java index fa28cd77..46eccc51 100644 --- a/src/main/java/galena/oreganized/index/OBlocks.java +++ b/src/main/java/galena/oreganized/index/OBlocks.java @@ -3,6 +3,7 @@ import com.google.common.collect.ImmutableBiMap; import com.teamabnormals.blueprint.core.util.registry.BlockSubRegistryHelper; import galena.oreganized.Oreganized; +import galena.oreganized.content.block.BonePileBlock; import galena.oreganized.content.block.BulbBlock; import galena.oreganized.content.block.CrystalGlassBlock; import galena.oreganized.content.block.CrystalGlassPaneBlock; @@ -205,8 +206,8 @@ private static BlockBehaviour.Properties leadDecoProperties() { new MoltenLeadBlock(OFluids.MOLTEN_LEAD, BlockBehaviour.Properties.copy(Blocks.LAVA).mapColor(MapColor.COLOR_PURPLE))); public static final RegistryObject MOLTEN_LEAD_CAULDRON = HELPER.createBlock("molten_lead_cauldron", () -> new MoltenLeadCauldronBlock(BlockBehaviour.Properties.copy(Blocks.LAVA_CAULDRON).randomTicks())); - public static final RegistryObject SEPULCHER = register("sepulcher", () -> new SepulcherBlock(BlockBehaviour.Properties.copy(Blocks.CAULDRON))); - public static final RegistryObject BONE_PILE = register("bone_pile", () -> new Block(BlockBehaviour.Properties.copy(Blocks.BONE_BLOCK))); + public static final RegistryObject SEPULCHER = register("sepulcher", () -> new SepulcherBlock(BlockBehaviour.Properties.copy(Blocks.CAULDRON).sound(OSoundTypes.SEPULCHER))); + public static final RegistryObject BONE_PILE = register("bone_pile", () -> new BonePileBlock(BlockBehaviour.Properties.copy(Blocks.BONE_BLOCK).sound(OSoundTypes.BONE_PILE).noParticlesOnBreak())); public static final RegistryObject ROTTING_FLESH = HELPER.createBlock("rotting_flesh", () -> new Block(BlockBehaviour.Properties.copy(Blocks.DIRT))); private static final Supplier VIGIL_CANDLE_PROPERTIES = () -> BlockBehaviour.Properties.of().lightLevel(CandleBlock.LIGHT_EMISSION).sound(SoundType.METAL).pushReaction(PushReaction.DESTROY); diff --git a/src/main/java/galena/oreganized/index/OParticleTypes.java b/src/main/java/galena/oreganized/index/OParticleTypes.java index 7dbb89b8..ee37408e 100644 --- a/src/main/java/galena/oreganized/index/OParticleTypes.java +++ b/src/main/java/galena/oreganized/index/OParticleTypes.java @@ -9,6 +9,7 @@ import net.minecraft.client.Minecraft; import net.minecraft.client.particle.ExplodeParticle; import net.minecraft.client.particle.ParticleEngine; +import net.minecraft.client.particle.SplashParticle; import net.minecraft.core.particles.ParticleType; import net.minecraft.core.particles.SimpleParticleType; import net.minecraftforge.api.distmarker.Dist; @@ -32,6 +33,7 @@ public class OParticleTypes { public static final RegistryObject KINETIC_HIT = PARTICLES.register( "kinetic_hit", () -> new SimpleParticleType(true)); public static final RegistryObject LEAD_CLOUD = PARTICLES.register( "lead_cloud", () -> new SimpleParticleType(true)); public static final RegistryObject LEAD_BLOW = PARTICLES.register( "lead_blow", () -> new SimpleParticleType(true)); + public static final RegistryObject BONE_FRAGMENT = PARTICLES.register( "bone_fragment", () -> new SimpleParticleType(true)); @SubscribeEvent @@ -46,5 +48,7 @@ public static void registerParticleFactories(RegisterParticleProvidersEvent even engine.register(KINETIC_HIT.get(), KineticHitParticle.Provider::new); engine.register(LEAD_CLOUD.get(), LeadCloudParticleProvider::new); engine.register(LEAD_BLOW.get(), ExplodeParticle.Provider::new); + engine.register(LEAD_BLOW.get(), ExplodeParticle.Provider::new); + engine.register(BONE_FRAGMENT.get(), SplashParticle.Provider::new); } } diff --git a/src/main/java/galena/oreganized/index/OSoundEvents.java b/src/main/java/galena/oreganized/index/OSoundEvents.java index d80a889a..33d9c9d0 100644 --- a/src/main/java/galena/oreganized/index/OSoundEvents.java +++ b/src/main/java/galena/oreganized/index/OSoundEvents.java @@ -18,4 +18,22 @@ public class OSoundEvents { public static final RegistryObject BOLT_HIT = HELPER.createSoundEvent("entity.bolt_hit"); public static final RegistryObject BOLT_HIT_ARMOR = HELPER.createSoundEvent("entity.bolt_hit_armor"); + + public static final RegistryObject BONE_PILE_BREAK = HELPER.createSoundEvent("block.bone_pile.break"); + public static final RegistryObject BONE_PILE_STEP = HELPER.createSoundEvent("block.bone_pile.step"); + public static final RegistryObject BONE_PILE_FALL = HELPER.createSoundEvent("block.bone_pile.fall"); + public static final RegistryObject BONE_PILE_HIT = HELPER.createSoundEvent("block.bone_pile.hit"); + public static final RegistryObject BONE_PILE_PLACE = HELPER.createSoundEvent("block.bone_pile.place"); + + public static final RegistryObject SEPULCHER_BREAK = HELPER.createSoundEvent("block.sepulcher.break"); + public static final RegistryObject SEPULCHER_STEP = HELPER.createSoundEvent("block.sepulcher.step"); + public static final RegistryObject SEPULCHER_FALL = HELPER.createSoundEvent("block.sepulcher.fall"); + public static final RegistryObject SEPULCHER_HIT = HELPER.createSoundEvent("block.sepulcher.hit"); + public static final RegistryObject SEPULCHER_PLACE = HELPER.createSoundEvent("block.sepulcher.place"); + public static final RegistryObject SEPULCHER_CORPSE_STUFFED = HELPER.createSoundEvent("block.sepulcher.corpse_stuffed"); + public static final RegistryObject SEPULCHER_FILLED = HELPER.createSoundEvent("block.sepulcher.filled"); + public static final RegistryObject SEPULCHER_ROTTING = HELPER.createSoundEvent("block.sepulcher.rotting"); + public static final RegistryObject SEPULCHER_SEALING = HELPER.createSoundEvent("block.sepulcher.sealing"); + public static final RegistryObject SEPULCHER_UNSEALING = HELPER.createSoundEvent("block.sepulcher.unsealing"); + public static final RegistryObject SEPULCHER_HARVEST = HELPER.createSoundEvent("block.sepulcher.harvest"); } diff --git a/src/main/java/galena/oreganized/index/OSoundTypes.java b/src/main/java/galena/oreganized/index/OSoundTypes.java index 86fd2eab..8c24e4cd 100644 --- a/src/main/java/galena/oreganized/index/OSoundTypes.java +++ b/src/main/java/galena/oreganized/index/OSoundTypes.java @@ -1,9 +1,9 @@ package galena.oreganized.index; -import net.minecraft.sounds.SoundEvents; import net.minecraft.world.level.block.SoundType; import net.minecraftforge.common.util.ForgeSoundType; public class OSoundTypes { - public static final SoundType MOLTEN_LEAD = new ForgeSoundType(1.0F, 1.0F, ()-> SoundEvents.BUCKET_FILL_LAVA, ()-> SoundEvents.LAVA_AMBIENT, ()-> SoundEvents.BUCKET_EMPTY_LAVA, ()-> SoundEvents.LAVA_AMBIENT, ()-> SoundEvents.LAVA_POP); + public static final SoundType BONE_PILE = new ForgeSoundType(1.0F, 1.0F, OSoundEvents.BONE_PILE_BREAK, OSoundEvents.BONE_PILE_STEP, OSoundEvents.BONE_PILE_PLACE, OSoundEvents.BONE_PILE_HIT, OSoundEvents.BONE_PILE_FALL); + public static final SoundType SEPULCHER = new ForgeSoundType(1.0F, 1.0F, OSoundEvents.SEPULCHER_BREAK, OSoundEvents.SEPULCHER_STEP, OSoundEvents.SEPULCHER_PLACE, OSoundEvents.SEPULCHER_HIT, OSoundEvents.SEPULCHER_FALL); } diff --git a/src/main/java/galena/oreganized/network/OreganizedNetwork.java b/src/main/java/galena/oreganized/network/OreganizedNetwork.java index 8a7190a2..5e51083a 100644 --- a/src/main/java/galena/oreganized/network/OreganizedNetwork.java +++ b/src/main/java/galena/oreganized/network/OreganizedNetwork.java @@ -5,6 +5,7 @@ import galena.oreganized.network.packet.GargoyleParticlePacket; import galena.oreganized.network.packet.KineticHitPacket; import galena.oreganized.network.packet.SepulcherConsumesDeathPacket; +import galena.oreganized.network.packet.SepulcherRotsPacket; import net.minecraftforge.network.NetworkRegistry; import net.minecraftforge.network.simple.SimpleChannel; @@ -24,5 +25,6 @@ public static void register() { CHANNEL.registerMessage(id++, DoorPushingPacket.class, DoorPushingPacket::write, DoorPushingPacket::from, DoorPushingPacket::handle); CHANNEL.registerMessage(id++, KineticHitPacket.class, KineticHitPacket::write, KineticHitPacket::from, KineticHitPacket::handle); CHANNEL.registerMessage(id++, SepulcherConsumesDeathPacket.class, SepulcherConsumesDeathPacket::write, SepulcherConsumesDeathPacket::from, SepulcherConsumesDeathPacket::handle); + CHANNEL.registerMessage(id++, SepulcherRotsPacket.class, SepulcherRotsPacket::write, SepulcherRotsPacket::from, SepulcherRotsPacket::handle); } } diff --git a/src/main/java/galena/oreganized/network/packet/SepulcherRotsPacket.java b/src/main/java/galena/oreganized/network/packet/SepulcherRotsPacket.java new file mode 100644 index 00000000..e22f36ea --- /dev/null +++ b/src/main/java/galena/oreganized/network/packet/SepulcherRotsPacket.java @@ -0,0 +1,40 @@ +package galena.oreganized.network.packet; + +import net.minecraft.client.Minecraft; +import net.minecraft.core.BlockPos; +import net.minecraft.core.particles.ParticleTypes; +import net.minecraft.network.FriendlyByteBuf; +import net.minecraft.world.phys.Vec3; +import net.minecraftforge.network.NetworkEvent; + +import java.awt.*; +import java.util.function.Supplier; + +public record SepulcherRotsPacket(BlockPos at) { + + public void write(FriendlyByteBuf buffer) { + buffer.writeBlockPos(at); + } + + public void handle(Supplier contextSupplier) { + var context = contextSupplier.get(); + context.enqueueWork(() -> { + var level = Minecraft.getInstance().level; + if (level == null) return; + + var effectColor = new Color(8889187); + for (int i = 0; i < 20; i++) { + var vec = Vec3.atBottomCenterOf(at).add(level.random.nextDouble() - 0.5, 0.8, level.random.nextDouble() - 0.5); + level.addParticle(ParticleTypes.ENTITY_EFFECT, vec.x, vec.y, vec.z, effectColor.getRed() / 255D, effectColor.getGreen() / 255D, effectColor.getBlue() / 255D); + } + }); + + context.setPacketHandled(true); + } + + public static SepulcherRotsPacket from(FriendlyByteBuf buffer) { + var at = buffer.readBlockPos(); + return new SepulcherRotsPacket(at); + } + +} diff --git a/src/main/resources/assets/oreganized/particles/bone_fragment.json b/src/main/resources/assets/oreganized/particles/bone_fragment.json new file mode 100644 index 00000000..8c7b284c --- /dev/null +++ b/src/main/resources/assets/oreganized/particles/bone_fragment.json @@ -0,0 +1,9 @@ +{ + "textures": [ + "oreganized:bone_fragment_0", + "oreganized:bone_fragment_1", + "oreganized:bone_fragment_2", + "oreganized:bone_fragment_3", + "oreganized:bone_fragment_4" + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/oreganized/sounds/block/bone_pile_break_0.ogg b/src/main/resources/assets/oreganized/sounds/block/bone_pile_break_0.ogg new file mode 100644 index 0000000000000000000000000000000000000000..1a864208fdac7af09aeed4ff7526b78ac9cbeffb GIT binary patch literal 6784 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 UC_UVlpX0aWLXh9K?J(%S06EdNuK)l5 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/oreganized/sounds/block/bone_pile_break_1.ogg b/src/main/resources/assets/oreganized/sounds/block/bone_pile_break_1.ogg new file mode 100644 index 0000000000000000000000000000000000000000..8b0105b5e0bbdb673a1ae2e83997aa252f737170 GIT binary patch literal 6093 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 jasAn?S8~qC0hw}i#< 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 FzW^8S&hP*L literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/oreganized/sounds/block/bone_pile_step_1.ogg b/src/main/resources/assets/oreganized/sounds/block/bone_pile_step_1.ogg new file mode 100644 index 0000000000000000000000000000000000000000..3096f38f4bcecf12a5b2f9a4e4c5758bd56be409 GIT binary patch literal 6946 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 KYQo(t=)V9NIt04_ literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/oreganized/sounds/block/bone_pile_step_2.ogg b/src/main/resources/assets/oreganized/sounds/block/bone_pile_step_2.ogg new file mode 100644 index 0000000000000000000000000000000000000000..d2c7096cd7fc05279b7dd0e4335f07ab40814557 GIT binary patch literal 6385 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 X2eUslye8Xu{p3Yi%tl1nhq(L~tYqbm literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/oreganized/sounds/block/bone_pile_step_3.ogg b/src/main/resources/assets/oreganized/sounds/block/bone_pile_step_3.ogg new file mode 100644 index 0000000000000000000000000000000000000000..b410428c3e88da7efa7d2d317b990da228f12a16 GIT binary patch literal 6938 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 m-)~zkzS_%t^Qlct! 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 as_F0{cJ=LMx##czQQBJ=#m53rk^W!N8n5&K literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/oreganized/sounds/block/sepulcher_break_2.ogg b/src/main/resources/assets/oreganized/sounds/block/sepulcher_break_2.ogg new file mode 100644 index 0000000000000000000000000000000000000000..69fb2f87d107c60865cb813f413a481efd9fd19c GIT binary patch literal 12650 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 b8p8)vH^_lU`Jag)S2zSo5C9m77y17eHE8*1 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/oreganized/sounds/block/sepulcher_step_3.ogg b/src/main/resources/assets/oreganized/sounds/block/sepulcher_step_3.ogg new file mode 100644 index 0000000000000000000000000000000000000000..83c304bd0d738711434bca4900b4541f7ad7f2ab GIT binary patch literal 9289 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 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/oreganized/sounds/block/sepulcher_step_4.ogg b/src/main/resources/assets/oreganized/sounds/block/sepulcher_step_4.ogg new file mode 100644 index 0000000000000000000000000000000000000000..e0146d52b8a35c613a7fc16e9ea55067fda63728 GIT binary patch literal 9255 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 O`YBVO1HN|qcllp(YOeSI literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/oreganized/sounds/block/sepulcher_unsealing.ogg b/src/main/resources/assets/oreganized/sounds/block/sepulcher_unsealing.ogg new file mode 100644 index 0000000000000000000000000000000000000000..9ad35bce3a8c3e1fadefa1e1dab88b560d0a52d6 GIT binary patch literal 7443 zcmeHLc~nzLv+pcmK*R(ChKL$4EQ!Db3r^BEEUJ+z z$r-jCQtx-v@Bd!rpk}Aiff`=n+cw+VSUXzV&}bOgUkb12q{uB%(J3xa771mxwkjbh zfgdqDi~?06Q=-Gu_*;@TrSTJ^U2JK#bSoR0mF)_D8^=|)D_5;pVNFw)V3m!8@T8dZ z@R(?q^rR?5*pCfQib{x1*_0Fx$NFu7T+dmK0TgbFPKw%+vWXw%5<(08vtpqnF+2_m zB2u8P3qN&BB2LBQCqdq}=#*5r7#BMmTNB8P+>)3KR~L~GJ*%CnR)<4up+h!_$#ffp z#;hx*EY|=8U;sc)B~U%&sRlwUk>z7JX2iM`KW)hJ!etrRdWCeGrWPB^q^$f9i_G3) z9#9R)V`kumA|}RIXzCJJl5Oq+seDJs$;simz6KcX4}0d z3S*cV2D3KEOwZzMO=cHC=)r_5&~!Y97j`qNh(f9(W~q=wkJ1Ol07xq=L=_g=SYm@V z=mG%C@Wo%w47}7+B=ao#(X)gcRAQ>G)Lp^%`He(ln3cZpx#7zyEI69mNKv3(JP^#pNUFX!pa_pZfYCSc` z&|d~NcYpYO3Z{P|mgIqpAlgnb-%ZlAh}q?=r+t&LGVv;m>7lJ$j`=L$NWj1t=is@X ze>4&K#<_%)>y(qyEDp80s-n=g+w#l}b+c-^=8UeBj!iq(b$M+&*Duj-C@}toj5tJQ$5-GHAvFFpEBX?oDvJt4z6q3`xQfc1TPcwlLC(7)AL*Wpn`f}4HT5lSZ^ z^@iglS&aR|O&Cy+j9;zZZ|ny0ntt-le#>=l=<61^_~P9M=)6AtP~Vk_zV^`rcAZoMu=y9r2tpczr6;%-_GDOuGqN)#rkXLib?p#Qy(G}>Z&^5YZLv~NG?Cz(}`q;O?1p>N0ZT8Uk8~^}x zuGQhY`;5HxOb5AEJU^>JuKS=L?>`mq0lN1B2&@(;Mu1|hpOsaoM5}-t(I0n88mYsb zme+eyW17xhx5*(iZ6xN2eX+Z$$&n)F4J%nM#jJM7pOu4`9f_psb9K2ecsT$oL5wCF zF&ZpkRU-pHF@0XI^ZYvc{Lg)|H_CDyir$0z-2W#xMn9eL#u?VnlR!hSoN=$*RHwMA zSoWakeJE#NczXQf^51RML0fLPUgy8rf`**?{x|&k$BX^{3I4Am0FxK&D7?aq@x%rb zkiP&Vd+L$3O3*h^o~0Vz*^0|_L`gJrK+30i|Ahq^3YY^V5nw|>FFoJnFHs2;NcmWI zfeZ>_iGMyrP@{)#EW)}UF>77nop0iXQ)vA)>hBahnF-181x`Dm^XHlzM9~N!7;`9v zIYH4_AWX&rOHD-pgat_~;6eY-%D)@b1NlghYyk~kt+yP77RlEdK&eKrvp|7>-ausw z)#~b)ei2&*@Zd)RUjQ^a>Mgw&xR=QI5_1umJ>a|!&zDT>IL>c-A7y}@Nmx1JL#Dd`zrWK<*62HthZ{q^w1zp)e4o*uG=zraHi1pr3lrKXDtmnKD;|n zUK$NlJsS_Y0*53#kQleZsl(87GXFBLx-!v=S6}zw0zJV;Pp%NfzQ+W~TCf zu976ZQHbM23&N zEE@Nxh>F^8#-k zFSNl@jpfr8nhG`u%PeRu)(Igh)S?ZWYhgqnW*hFLN8c^Yw7hV7dZYn>SLiuFid+=1 z+JQoxYe|nXRlP46gzRFNl1F1%+QvdL7XzP)ziod#;0d>UVf~OQp&DYuzy?x+8|v;~ z4Ob=otNTBqtYC7c&d~nWXn+qq2k`!@;ks3A?7qM-7*T`(ZueG#oRF%+qR9O*Fal}* z!3FiKe47cf>~?TMN9rx6h4G=G2+QNCx-1H%BOub3BII&8R?UG0oD-ELTu$v^V4+R5 zY$&*(wlkuTO=-LxTwr6cEWx|FX*ljwJs~olYSl=HEbPE+ib}9jjKt0B#4HQ3v>FVK zr*#q@gcQh|B?UHLz8~RQ+6-*~V0$(SxMl5MQA0kaU!=K^*q{d>ZX_(+Byi8bT_NKZ zI>KF{%fg)Shdec9EG|^-9`*MRmjiifs+jxqGlk_)j;ThdK9MN$Y_$~2v5?E~pTC%@ zWnvY@WkGLYpwxP%GMM42c$gC~cpOR&93~e-mnm{Rj+UuVk4vG*@f?gX6hfXqN9%-8 z4{lBs_HY6Y1xDA%0Vc-;rnw={AiPp*;gZ=?B?{&|6=E*M%00_OPLL7Sc<8741dFOt zbhtOGxwlB;=>Bn^CDwa5P%|n*a?yCt<4J1S&o| z=fe>^B7CsB>uT@4FRZM;7`^{!sP9JCIWW?6f49~B+q&;r-u3b4f0dl8Ui>OY@&whl zCDG$+DYv?gpjyc1!l(;Q+}8diw*JV-MhdCP+&-&)0hn~Zq&F3fML>-~&9*rg1}(fi3nQM;!rSUrpY$E{DAOI3>yI?| zC7x=hzqoTg$ztOiX^YEcFf-t`lisKi^>Y==U%L*}edV+a=c@h9If1CxL5II^SX0;@ zwZw-eFyMS2)GlC&T66S4H?zp>^BztkZJz&$L-I~Z}{msziD%g`=i!17Msq6^!)UAir*Bl z8-4$RA|!OjvtHVGW3sLIrZf{P=eL92-jnhe31h2WPoxW&-9qTG?v@8?6S6i zn2lYO7~G~eM^ukoiXaJRqV*^2wDJOSmR%r>iUYA1t=Ep1qn{{E|8=( zF!#`ke;pPeKgDfqbv<(NUsEqTTF%CFaG$>({9cep+x6?fqk{A;JtFzY*dihJdWHR) zx=gbI$E1MLQz`m@aa$x(67{!|I#ypP_7UwXD6TRg(a>n)t-dHJgK*-blbb!bxK3M4 z1-<=G-&*hmbdoe?%YK|IzHzK(EF1Od)Z#{o$pc1?Ce~y80N($kk~Q{ntgd!tqPu)h zqeGj4`WOv%8`fa9M^YpXG){tM8C@7ZW*m1154D$}-`jh}>7eix-pyxfTQG!= zb)Q-qm%d3`{MP=$0H7f?w2ygu9ijOXh(OvS)6%h+#{A~{;CL$Un)pi6dK0!5Ki6)B z>=2UH$>3JMY(Dxi%z6=RNzJ|FgU5_VVg#cvm5PHEh| zLqXG-_dn8|V?OvVDk?gaZm^5A{i}IBN534*y##>USM{iKT6ycPx4Ba%l$b8=W*7GA z1!aS+m!C+BiUOZ2m7EiH^}U96{W^YcGEC|zIt+-!^1oz zM(*BnNYEY}o71O^CxHc>#l_gSX=n7M0EIZvz91}91DK^Pn_2S9H|HW2-FT<B^4Acs#3aax(o`@Z%_vt;JgVB(HS%|zqi42@M~MY6Sx@|iX- zqI*?mn*Cz-vDh_JIY;RtpZ!x`0LF!wMn2n?)SY5>0MU^WUE-w|RmwSppN`v3^P0|m zfUs0}S4ky?^l<|NqPyf;Nl`!xn}=H%AB7OPAp407%D@! zlzu0Bi1?xAq1^gq;Kws(-z761N=l-Cu}bg)&MCOguqc=E)-$1;HBDkyVvri;fE`a65j5wU95TX;L`40xu0IGEZY+qpSOkK ze=41OomsL>a5vy6D*(MdS`RI-8OkTtQ{5_<;@JGfZ0u6B3%6g^pD3dyo-DH;RIvG# z<7+p|?=k%-yql{SekbsYiQ+7iv|Z9P_B~f+m`HhP;B71lM)EvPd`ATK1KEDy?v;%td=8?@dk)yB9Hck(I9ZuHZGRKKeDFwVoSpac zH*34E-FmQlm}94yj|pz|vNdHpbT*Zcr^tG#)(d@3briW<1q@(UuO7hrd6gM!h7FIk z0puF&eqnOmrM62|X+8|>H)D zrykmzBf2vGlhj6UV-jUBEf&?f@sfX5Tnk12&=-ZJ{gqr$yeJKiuDfDySg*sd(5vX3 z1L};!4xgzCoB;}E}{S7z>#wajgr`3uf45xnK-iu{|6BUZVCB3I{q`*@QK z-%64fy{Of*xq>04@8_88gg^K&be9nyF6;V><@zQ(?{vMqOZ6C(p!YR`(Xi`nK7(=k z&Cfbt>}PsVU+hA+=Eg)_W@^Z*J?>Su_%0%5)%BlWncmMk#AR!ICSM!GaMd%%J-KM77(cr~N6b3@La&U^3!#R&z z?UzAg1Z8eSo(0CO{Nc96;N5-!Ab>B=CcLf~ckin5&fCiz<5X`h4{6TuePa^kKlQJ7 zbBXIYc4PA{ZX8bbipYx7KZOa$v49(MI-n_ND}EU___Lcr(@eN|%JYq0QM z#XKpucU#MTWO4A1Qx9%%e$R75)ZJc~xiB*%0YT2hwy-h+Zi95@cYS<09o&Edn9(9Tw5{&N4a57Ts--)a5#T`*(4W8(MZ7Iv=k zlRq_g*_4_TOlN0jS$g3(8bg=d#Wzp$PzyfLQJT literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/oreganized/textures/particle/bone_fragment_0.png b/src/main/resources/assets/oreganized/textures/particle/bone_fragment_0.png new file mode 100644 index 0000000000000000000000000000000000000000..b5db08927f14be4fd23b2a220d7326538f1977f8 GIT binary patch literal 197 zcmeAS@N?(olHy`uVBq!ia0vp^93afW3?x5a^xFxf7>k44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O`212l#}zp4+uzQD6Csr&zmB i{mVZ!n!dIb`^q3y!LWUf!8;kCP6kg`KbLh*2~7aul|IJ+ literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/oreganized/textures/particle/bone_fragment_1.png b/src/main/resources/assets/oreganized/textures/particle/bone_fragment_1.png new file mode 100644 index 0000000000000000000000000000000000000000..33f0bf38130e65d707d6a4494a0521c9be44cbca GIT binary patch literal 197 zcmeAS@N?(olHy`uVBq!ia0vp^93afW3?x5a^xFxf7>k44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O`212l#}zp4+wJ|Np;>`pRECy#y4?chh?hq*zOW{DS`j0mJWYe8E5g&H|6f zVg?4j!ywFfJby(BP*Bg)#W6%8T=&#LK?Va3CdVVM_dj!()P9CfBS5b+?a86lk?a;V i6W+H(iTwQ~P{1JG&#-=8P2X*xP6kg`KbLh*2~7ZFnL#7~ literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/oreganized/textures/particle/bone_fragment_2.png b/src/main/resources/assets/oreganized/textures/particle/bone_fragment_2.png new file mode 100644 index 0000000000000000000000000000000000000000..3b253edbf193d458315425c0b2a4ef5269b7ec78 GIT binary patch literal 183 zcmeAS@N?(olHy`uVBq!ia0vp^93afW1|*O0@9PFqjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1qucK_5>S#}JL+WCh7Nx3@mB=WyP+;=$3&-v5E% zcYR>IERPr?lda^ww)*&c3q6t;)|5SF=iy

k44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O`212l#}zF6t{kw`;|Vr^F;iRh+)ygD<0=!o~;M3sRVF gzCB#OKYp97v@yfp>s6mLf!Y{6UHx3vIVCg!0AfNvN&o-= literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/oreganized/textures/particle/bone_fragment_4.png b/src/main/resources/assets/oreganized/textures/particle/bone_fragment_4.png new file mode 100644 index 0000000000000000000000000000000000000000..84a8a9dd6b45c9b2416f5eb5d5a8300563dc4ff3 GIT binary patch literal 196 zcmeAS@N?(olHy`uVBq!ia0vp^93afW3?x5a^xFxf7>k44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O`212l#}zF6t{kw`;|Vr Date: Fri, 25 Oct 2024 12:04:50 +0200 Subject: [PATCH 10/11] various fixes --- .../client/particle/BoneFragmentParticle.java | 58 +++++++++++++++++++ .../content/block/BonePileBlock.java | 41 ++++++++++--- .../content/block/SepulcherBlock.java | 12 +++- .../content/block/VigilCandleBlock.java | 8 ++- .../content/entity/SepulcherBlockEntity.java | 26 ++++++--- .../java/galena/oreganized/index/OBlocks.java | 5 +- .../oreganized/index/OParticleTypes.java | 4 +- .../galena/oreganized/index/OSoundTypes.java | 2 +- .../galena/oreganized/mixin/EntityMixin.java | 17 +++++- .../oreganized/world/event/PlayerEvents.java | 12 +++- .../resources/META-INF/accesstransformer.cfg | 3 +- .../loot_modifiers/global_loot_modifiers.json | 3 +- .../bone_piles_in_desert_temples.json | 17 ++++++ 13 files changed, 177 insertions(+), 31 deletions(-) create mode 100644 src/main/java/galena/oreganized/client/particle/BoneFragmentParticle.java create mode 100644 src/main/resources/data/oreganized/loot_modifiers/bone_piles_in_desert_temples.json diff --git a/src/main/java/galena/oreganized/client/particle/BoneFragmentParticle.java b/src/main/java/galena/oreganized/client/particle/BoneFragmentParticle.java new file mode 100644 index 00000000..ae49ddce --- /dev/null +++ b/src/main/java/galena/oreganized/client/particle/BoneFragmentParticle.java @@ -0,0 +1,58 @@ +package galena.oreganized.client.particle; + +import net.minecraft.client.multiplayer.ClientLevel; +import net.minecraft.client.particle.Particle; +import net.minecraft.client.particle.ParticleProvider; +import net.minecraft.client.particle.ParticleRenderType; +import net.minecraft.client.particle.SpriteSet; +import net.minecraft.client.particle.TextureSheetParticle; +import net.minecraft.core.particles.SimpleParticleType; + +public class BoneFragmentParticle extends TextureSheetParticle { + + protected BoneFragmentParticle(ClientLevel level, double x, double y, double z, double xd, double yd, double zd) { + super(level, x, y, z); + this.gravity = 0.04F; + this.xd = xd; + this.yd = yd; + this.zd = zd; + } + + @Override + public ParticleRenderType getRenderType() { + return ParticleRenderType.PARTICLE_SHEET_OPAQUE; + } + + @Override + public void tick() { + xo = x; + yo = y; + zo = z; + if (lifetime-- <= 0) { + remove(); + } else { + yd -= gravity; + move(xd, yd, zd); + xd *= 0.9800000190734863; + yd *= 0.9800000190734863; + zd *= 0.9800000190734863; + } + } + + public static class Provider implements ParticleProvider { + private final SpriteSet sprite; + + public Provider(SpriteSet sprites) { + sprite = sprites; + } + + @Override + public Particle createParticle(SimpleParticleType type, ClientLevel level, double x, double y, double z, double xSpeed, double ySpeed, double zSpeed) { + var particle = new BoneFragmentParticle(level, x, y, z, xSpeed, ySpeed, zSpeed); + particle.setLifetime(level.random.nextInt(20, 20 * 4)); + particle.pickSprite(sprite); + return particle; + } + } + +} diff --git a/src/main/java/galena/oreganized/content/block/BonePileBlock.java b/src/main/java/galena/oreganized/content/block/BonePileBlock.java index 28e5c27b..4e4b7958 100644 --- a/src/main/java/galena/oreganized/content/block/BonePileBlock.java +++ b/src/main/java/galena/oreganized/content/block/BonePileBlock.java @@ -9,37 +9,64 @@ import net.minecraft.world.entity.Entity; import net.minecraft.world.entity.LivingEntity; import net.minecraft.world.entity.item.FallingBlockEntity; +import net.minecraft.world.level.BlockGetter; import net.minecraft.world.level.Level; +import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.FallingBlock; import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.phys.Vec3; +import net.minecraft.world.phys.shapes.CollisionContext; +import net.minecraft.world.phys.shapes.EntityCollisionContext; +import net.minecraft.world.phys.shapes.Shapes; +import net.minecraft.world.phys.shapes.VoxelShape; import net.minecraftforge.client.extensions.common.IClientBlockExtensions; import java.util.function.Consumer; public class BonePileBlock extends FallingBlock { + protected static final VoxelShape SHAPE = Block.box(0.0, 0.0, 0.0, 16.0, 13.0, 16.0); + + private static StatePredicate ALWAYS = (s, l, p) -> true; + public BonePileBlock(Properties properties) { - super(properties); + super(properties.isRedstoneConductor(ALWAYS).isSuffocating(ALWAYS).isViewBlocking(ALWAYS).noParticlesOnBreak()); + } + + public VoxelShape getCollisionShape(BlockState state, BlockGetter level, BlockPos pos, CollisionContext context) { + // For particles + if(context instanceof EntityCollisionContext ec && (ec.getEntity() == null || ec.getEntity() instanceof FallingBlockEntity)) return Shapes.block(); + return SHAPE; + } + + public VoxelShape getBlockSupportShape(BlockState state, BlockGetter level, BlockPos pos) { + return Shapes.block(); + } + + public VoxelShape getVisualShape(BlockState state, BlockGetter level, BlockPos pos, CollisionContext context) { + return Shapes.block(); } @Override public void onLand(Level level, BlockPos pos, BlockState state, BlockState other, FallingBlockEntity entity) { super.onLand(level, pos, state, other, entity); - if (!entity.isSilent()) level.playSound(null, pos, OSoundEvents.BONE_PILE_FALL.get(), SoundSource.BLOCKS, 1F, 1F); + if (!entity.isSilent()) + level.playSound(null, pos, OSoundEvents.BONE_PILE_FALL.get(), SoundSource.BLOCKS, 1F, 1F); particles(level, Vec3.atCenterOf(pos), 10); } @Override public boolean addLandingEffects(BlockState state, ServerLevel level, BlockPos pos, BlockState other, LivingEntity entity, int numberOfParticles) { - particles(level, entity.position(), numberOfParticles / 2); + particles(level, entity.position().add(0, 0.2, 0.0), numberOfParticles / 2); return true; } @Override public boolean addRunningEffects(BlockState state, Level level, BlockPos pos, Entity entity) { - var vec = entity.position(); - level.addParticle(OParticleTypes.BONE_FRAGMENT.get(), vec.x, vec.y, vec.z, level.random.nextDouble() - 0.5, level.random.nextDouble() - 0.5, level.random.nextDouble() - 0.5); + var vec = entity.position().add(0, 0.2, 0.0); + var speed = entity.isSprinting() ? 0.5F : 0.2F; + var halfSpeed = speed / 2; + level.addParticle(OParticleTypes.BONE_FRAGMENT.get(), vec.x, vec.y, vec.z, level.random.nextDouble() * speed - halfSpeed, level.random.nextDouble() * speed - halfSpeed, level.random.nextDouble() * speed - halfSpeed); return true; } @@ -50,11 +77,11 @@ public void initializeClient(Consumer consumer) { private void particles(Level level, Vec3 vec, int numberOfParticles) { if (level instanceof ServerLevel serverLevel) { - serverLevel.sendParticles(OParticleTypes.BONE_FRAGMENT.get(), vec.x, vec.y, vec.z, numberOfParticles, level.random.nextDouble() - 0.5, level.random.nextDouble() - 0.5, level.random.nextDouble() - 0.5, 0.0); + serverLevel.sendParticles(OParticleTypes.BONE_FRAGMENT.get(), vec.x, vec.y, vec.z, numberOfParticles, 0.35, 0.35, 0.35, 0.1); } else for (int i = 0; i < numberOfParticles; i++) { level.addParticle(OParticleTypes.BONE_FRAGMENT.get(), vec.x + level.random.nextDouble() - 0.5, vec.y + level.random.nextDouble() - 0.5, vec.z + level.random.nextDouble() - 0.5, - level.random.nextDouble() - 0.5, level.random.nextDouble() - 0.5, level.random.nextDouble() - 0.5 + level.random.nextDouble() * 0.3 - 0.15, level.random.nextDouble() * 0.3 - 0.15, level.random.nextDouble() * 0.3 - 0.15 ); } } diff --git a/src/main/java/galena/oreganized/content/block/SepulcherBlock.java b/src/main/java/galena/oreganized/content/block/SepulcherBlock.java index 288a636c..d869cfc7 100644 --- a/src/main/java/galena/oreganized/content/block/SepulcherBlock.java +++ b/src/main/java/galena/oreganized/content/block/SepulcherBlock.java @@ -6,6 +6,8 @@ import galena.oreganized.index.OSoundEvents; import net.minecraft.Util; import net.minecraft.core.BlockPos; +import net.minecraft.core.particles.ParticleTypes; +import net.minecraft.server.level.ServerLevel; import net.minecraft.sounds.SoundSource; import net.minecraft.stats.Stats; import net.minecraft.world.InteractionHand; @@ -16,7 +18,6 @@ import net.minecraft.world.item.ItemStack; import net.minecraft.world.level.BlockGetter; import net.minecraft.world.level.Level; -import net.minecraft.world.level.LevelAccessor; import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.entity.BlockEntity; import net.minecraft.world.level.block.entity.BlockEntityType; @@ -91,12 +92,17 @@ public static boolean tryInsert(ItemStack stack, @Nullable Player player, BlockS return false; } - public static void insert(@Nullable Entity user, BlockState state, LevelAccessor level, BlockPos pos, int by) { + public static void insert(@Nullable Entity user, BlockState state, Level level, BlockPos pos, int by) { var newState = state.setValue(LEVEL, Math.min(MAX_LEVEL, state.getValue(LEVEL) + by)); level.setBlock(pos, newState, 3); level.gameEvent(GameEvent.BLOCK_CHANGE, pos, GameEvent.Context.of(user, newState)); - level.playSound(null, pos, OSoundEvents.SEPULCHER_FILLED.get(), SoundSource.BLOCKS, 1.0F, 1.0F); + if(level instanceof ServerLevel serverLevel) { + var vec = Vec3.atCenterOf(pos); + serverLevel.sendParticles(ParticleTypes.COMPOSTER, vec.x, vec.y, vec.z, 10, 0.3, 0.3, 0.3, 0.0); + } + + level.playSound(null, pos, OSoundEvents.SEPULCHER_FILLED.get(), SoundSource.BLOCKS, 0.5F, 1.0F); } public static void extract(@Nullable Entity user, BlockState state, Level level, BlockPos pos) { diff --git a/src/main/java/galena/oreganized/content/block/VigilCandleBlock.java b/src/main/java/galena/oreganized/content/block/VigilCandleBlock.java index f2bd3f52..6ee3146a 100644 --- a/src/main/java/galena/oreganized/content/block/VigilCandleBlock.java +++ b/src/main/java/galena/oreganized/content/block/VigilCandleBlock.java @@ -28,6 +28,7 @@ import org.jetbrains.annotations.Nullable; import java.util.Optional; +import java.util.function.ToIntFunction; import static net.minecraft.world.level.block.CandleBlock.LIT; import static net.minecraft.world.level.block.CandleBlock.MAX_CANDLES; @@ -64,6 +65,8 @@ private static VoxelShape[] createShapes(boolean hanging) { private static final VoxelShape[] SHAPES = createShapes(false); private static final VoxelShape[] HANGING_SHAPES = createShapes(true); + public static final ToIntFunction LIGHT_EMISSION = state -> state.getValue(LIT) ? 6 * state.getValue(CANDLES) : 0; + public VigilCandleBlock(Properties properties) { super(properties); registerDefaultState(defaultBlockState() @@ -89,9 +92,10 @@ public boolean canBeReplaced(BlockState state, BlockPlaceContext context) { @Override public VoxelShape getShape(BlockState state, BlockGetter level, BlockPos pos, CollisionContext context) { var candles = state.getValue(CANDLES); - var handing = state.getValue(HANGING); + var hanging = state.getValue(HANGING); var index = candles - 1; - return (handing ? HANGING_SHAPES : SHAPES)[index]; + return createShapes(hanging)[index]; + //return (handing ? HANGING_SHAPES : SHAPES)[index]; } @Override diff --git a/src/main/java/galena/oreganized/content/entity/SepulcherBlockEntity.java b/src/main/java/galena/oreganized/content/entity/SepulcherBlockEntity.java index 4e24dd3f..f395a589 100644 --- a/src/main/java/galena/oreganized/content/entity/SepulcherBlockEntity.java +++ b/src/main/java/galena/oreganized/content/entity/SepulcherBlockEntity.java @@ -17,6 +17,8 @@ import net.minecraft.sounds.SoundEvent; import net.minecraft.sounds.SoundSource; import net.minecraft.world.Container; +import net.minecraft.world.entity.Entity; +import net.minecraft.world.entity.LivingEntity; import net.minecraft.world.entity.Pose; import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.ItemStack; @@ -75,11 +77,11 @@ public void tick(BlockState state, Level level, BlockPos pos) { progress = 0; if (fillLevel == SepulcherBlock.MAX_LEVEL) { - sound(OSoundEvents.SEPULCHER_SEALING); + sound(OSoundEvents.SEPULCHER_SEALING, 1F); } else if (nextLevel == SepulcherBlock.READY) { - sound(OSoundEvents.SEPULCHER_UNSEALING); + sound(OSoundEvents.SEPULCHER_UNSEALING, 1F); } else { - sound(OSoundEvents.SEPULCHER_ROTTING); + sound(OSoundEvents.SEPULCHER_ROTTING, 0.5F); } OreganizedNetwork.CHANNEL.send( @@ -88,9 +90,9 @@ public void tick(BlockState state, Level level, BlockPos pos) { ); } - private void sound(Supplier sound) { + private void sound(Supplier sound, float volume) { if (!hasLevel()) return; - level.playSound(null, getBlockPos(), sound.get(), SoundSource.BLOCKS, 1F, 1F); + level.playSound(null, getBlockPos(), sound.get(), SoundSource.BLOCKS, volume, 1F); } private void checkHeatSource(Level level, BlockPos pos) { @@ -113,6 +115,10 @@ public void load(CompoundTag nbt) { heated = nbt.getBoolean("heated"); } + public static boolean wasConsumerBySepulcher(Entity entity) { + return entity.getPersistentData().getBoolean(DeathListener.TAG_KEY); + } + @Override public DeathListener getListener() { return listener; @@ -142,7 +148,7 @@ public boolean handleGameEvent(ServerLevel level, GameEvent event, GameEvent.Con var entity = context.sourceEntity(); if (entity == null) return false; - if (entity.getPersistentData().getBoolean(TAG_KEY)) return false; + if (wasConsumerBySepulcher(entity)) return false; if (!entity.getType().is(OTags.Entities.FILLS_SEPULCHER)) return false; @@ -153,9 +159,13 @@ public boolean handleGameEvent(ServerLevel level, GameEvent event, GameEvent.Con entity.getPersistentData().putBoolean(TAG_KEY, true); + if (entity instanceof LivingEntity living && !(entity instanceof Player)) { + living.skipDropExperience(); + } + SepulcherBlock.insert(null, state, level, getBlockPos(), level.random.nextIntBetweenInclusive(3, 4)); - sound(OSoundEvents.SEPULCHER_CORPSE_STUFFED); + sound(OSoundEvents.SEPULCHER_CORPSE_STUFFED, 1F); OreganizedNetwork.CHANNEL.send( PacketDistributor.NEAR.with(PacketDistributor.TargetPoint.p(vec.x, vec.y, vec.z, 16.0, entity.level().dimension())), @@ -163,7 +173,7 @@ public boolean handleGameEvent(ServerLevel level, GameEvent event, GameEvent.Con ); entity.setPos(Vec3.atCenterOf(getBlockPos())); - if(entity.getPose() == Pose.DYING) entity.setPose(Pose.STANDING); + if (entity.getPose() == Pose.DYING) entity.setPose(Pose.STANDING); return true; } diff --git a/src/main/java/galena/oreganized/index/OBlocks.java b/src/main/java/galena/oreganized/index/OBlocks.java index 46eccc51..bf9a2c33 100644 --- a/src/main/java/galena/oreganized/index/OBlocks.java +++ b/src/main/java/galena/oreganized/index/OBlocks.java @@ -28,7 +28,6 @@ import net.minecraft.world.item.Item; import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.Blocks; -import net.minecraft.world.level.block.CandleBlock; import net.minecraft.world.level.block.DropExperienceBlock; import net.minecraft.world.level.block.IceBlock; import net.minecraft.world.level.block.LiquidBlock; @@ -207,10 +206,10 @@ private static BlockBehaviour.Properties leadDecoProperties() { public static final RegistryObject MOLTEN_LEAD_CAULDRON = HELPER.createBlock("molten_lead_cauldron", () -> new MoltenLeadCauldronBlock(BlockBehaviour.Properties.copy(Blocks.LAVA_CAULDRON).randomTicks())); public static final RegistryObject SEPULCHER = register("sepulcher", () -> new SepulcherBlock(BlockBehaviour.Properties.copy(Blocks.CAULDRON).sound(OSoundTypes.SEPULCHER))); - public static final RegistryObject BONE_PILE = register("bone_pile", () -> new BonePileBlock(BlockBehaviour.Properties.copy(Blocks.BONE_BLOCK).sound(OSoundTypes.BONE_PILE).noParticlesOnBreak())); + public static final RegistryObject BONE_PILE = register("bone_pile", () -> new BonePileBlock(BlockBehaviour.Properties.copy(Blocks.BONE_BLOCK).sound(OSoundTypes.BONE_PILE).strength(1F))); public static final RegistryObject ROTTING_FLESH = HELPER.createBlock("rotting_flesh", () -> new Block(BlockBehaviour.Properties.copy(Blocks.DIRT))); - private static final Supplier VIGIL_CANDLE_PROPERTIES = () -> BlockBehaviour.Properties.of().lightLevel(CandleBlock.LIGHT_EMISSION).sound(SoundType.METAL).pushReaction(PushReaction.DESTROY); + private static final Supplier VIGIL_CANDLE_PROPERTIES = () -> BlockBehaviour.Properties.of().lightLevel(VigilCandleBlock.LIGHT_EMISSION).sound(SoundType.METAL).pushReaction(PushReaction.DESTROY); public static final RegistryObject VIGIL_CANDLE = register("vigil_candle", () -> new VigilCandleBlock(VIGIL_CANDLE_PROPERTIES.get())); public static final Map> COLORED_VIGIL_CANDLES = registerColored("vigil_candle", color -> new VigilCandleBlock(VIGIL_CANDLE_PROPERTIES.get().mapColor(color))); diff --git a/src/main/java/galena/oreganized/index/OParticleTypes.java b/src/main/java/galena/oreganized/index/OParticleTypes.java index ee37408e..163b6282 100644 --- a/src/main/java/galena/oreganized/index/OParticleTypes.java +++ b/src/main/java/galena/oreganized/index/OParticleTypes.java @@ -1,6 +1,7 @@ package galena.oreganized.index; import galena.oreganized.Oreganized; +import galena.oreganized.client.particle.BoneFragmentParticle; import galena.oreganized.client.particle.CustomDrippingParticle; import galena.oreganized.client.particle.KineticHitParticle; import galena.oreganized.client.particle.LeadCloudParticleProvider; @@ -9,7 +10,6 @@ import net.minecraft.client.Minecraft; import net.minecraft.client.particle.ExplodeParticle; import net.minecraft.client.particle.ParticleEngine; -import net.minecraft.client.particle.SplashParticle; import net.minecraft.core.particles.ParticleType; import net.minecraft.core.particles.SimpleParticleType; import net.minecraftforge.api.distmarker.Dist; @@ -49,6 +49,6 @@ public static void registerParticleFactories(RegisterParticleProvidersEvent even engine.register(LEAD_CLOUD.get(), LeadCloudParticleProvider::new); engine.register(LEAD_BLOW.get(), ExplodeParticle.Provider::new); engine.register(LEAD_BLOW.get(), ExplodeParticle.Provider::new); - engine.register(BONE_FRAGMENT.get(), SplashParticle.Provider::new); + engine.register(BONE_FRAGMENT.get(), BoneFragmentParticle.Provider::new); } } diff --git a/src/main/java/galena/oreganized/index/OSoundTypes.java b/src/main/java/galena/oreganized/index/OSoundTypes.java index 8c24e4cd..0341cb15 100644 --- a/src/main/java/galena/oreganized/index/OSoundTypes.java +++ b/src/main/java/galena/oreganized/index/OSoundTypes.java @@ -4,6 +4,6 @@ import net.minecraftforge.common.util.ForgeSoundType; public class OSoundTypes { - public static final SoundType BONE_PILE = new ForgeSoundType(1.0F, 1.0F, OSoundEvents.BONE_PILE_BREAK, OSoundEvents.BONE_PILE_STEP, OSoundEvents.BONE_PILE_PLACE, OSoundEvents.BONE_PILE_HIT, OSoundEvents.BONE_PILE_FALL); + public static final SoundType BONE_PILE = new ForgeSoundType(1.5F, 1.0F, OSoundEvents.BONE_PILE_BREAK, OSoundEvents.BONE_PILE_STEP, OSoundEvents.BONE_PILE_PLACE, OSoundEvents.BONE_PILE_HIT, OSoundEvents.BONE_PILE_FALL); public static final SoundType SEPULCHER = new ForgeSoundType(1.0F, 1.0F, OSoundEvents.SEPULCHER_BREAK, OSoundEvents.SEPULCHER_STEP, OSoundEvents.SEPULCHER_PLACE, OSoundEvents.SEPULCHER_HIT, OSoundEvents.SEPULCHER_FALL); } diff --git a/src/main/java/galena/oreganized/mixin/EntityMixin.java b/src/main/java/galena/oreganized/mixin/EntityMixin.java index bb0f3883..c5d8a9f0 100644 --- a/src/main/java/galena/oreganized/mixin/EntityMixin.java +++ b/src/main/java/galena/oreganized/mixin/EntityMixin.java @@ -1,5 +1,7 @@ package galena.oreganized.mixin; +import com.llamalad7.mixinextras.injector.ModifyExpressionValue; +import galena.oreganized.index.OBlocks; import galena.oreganized.world.IMotionHolder; import net.minecraft.world.entity.Entity; import org.spongepowered.asm.mixin.Mixin; @@ -9,7 +11,7 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; @Mixin(Entity.class) -public class EntityMixin implements IMotionHolder { +public abstract class EntityMixin implements IMotionHolder { @Unique private double oreganized$Motion = 0.0; @@ -29,4 +31,17 @@ private void updateMotion(CallbackInfo ci) { public double oreganised$getMotion() { return oreganized$Motion; } + + @ModifyExpressionValue( + method = "canSpawnSprintParticle()Z", + at = @At(value = "INVOKE", target = "Lnet/minecraft/world/entity/Entity;isSprinting()Z") + ) + public boolean isSprinting(boolean original) { + var self = (Entity) (Object) this; + return original || ( + self.level().getBlockState(self.getBlockPosBelowThatAffectsMyMovement()).is(OBlocks.BONE_PILE.get()) + && (self.getDeltaMovement().x != 0.0 || self.getDeltaMovement().z != 0.0) + ); + } + } diff --git a/src/main/java/galena/oreganized/world/event/PlayerEvents.java b/src/main/java/galena/oreganized/world/event/PlayerEvents.java index 2ef4535d..dadf9903 100644 --- a/src/main/java/galena/oreganized/world/event/PlayerEvents.java +++ b/src/main/java/galena/oreganized/world/event/PlayerEvents.java @@ -3,6 +3,7 @@ import galena.oreganized.Oreganized; import galena.oreganized.content.block.MoltenLeadCauldronBlock; import galena.oreganized.content.entity.GargoyleBlockEntity; +import galena.oreganized.content.entity.SepulcherBlockEntity; import galena.oreganized.content.item.ScribeItem; import galena.oreganized.index.OAttributes; import galena.oreganized.index.OBlocks; @@ -10,7 +11,6 @@ import galena.oreganized.index.OTags; import net.minecraft.advancements.CriteriaTriggers; import net.minecraft.core.BlockPos; -import net.minecraft.server.level.ServerLevel; import net.minecraft.server.level.ServerPlayer; import net.minecraft.sounds.SoundEvents; import net.minecraft.sounds.SoundSource; @@ -31,7 +31,7 @@ import net.minecraftforge.common.ToolActions; import net.minecraftforge.event.ItemAttributeModifierEvent; import net.minecraftforge.event.TickEvent; -import net.minecraftforge.event.entity.living.LivingDeathEvent; +import net.minecraftforge.event.entity.living.LivingDropsEvent; import net.minecraftforge.event.entity.player.PlayerInteractEvent; import net.minecraftforge.event.level.BlockEvent; import net.minecraftforge.eventbus.api.EventPriority; @@ -147,4 +147,12 @@ public static void onItemAttributes(ItemAttributeModifierEvent event) { } } + @SubscribeEvent + public static void onLivingDrops(LivingDropsEvent event) { + if (event.getEntity() instanceof Player) return; + if (SepulcherBlockEntity.wasConsumerBySepulcher(event.getEntity())) { + event.setCanceled(true); + } + } + } diff --git a/src/main/resources/META-INF/accesstransformer.cfg b/src/main/resources/META-INF/accesstransformer.cfg index 26438df9..79ce37b2 100644 --- a/src/main/resources/META-INF/accesstransformer.cfg +++ b/src/main/resources/META-INF/accesstransformer.cfg @@ -14,4 +14,5 @@ public net.minecraft.client.particle.SingleQuadParticle f_107663_ # quadSize # q public net.minecraft.world.entity.LivingEntity m_6125_()Z # shouldDropLoot public net.minecraft.client.gui.Gui$HeartType protected net.minecraft.world.level.block.DoorBlock m_245755_(Lnet/minecraft/world/entity/Entity;Lnet/minecraft/world/level/Level;Lnet/minecraft/core/BlockPos;Z)V # playSound; -protected net.minecraft.client.particle.CritParticle (Lnet/minecraft/client/multiplayer/ClientLevel;DDDDDD)V # CritParticle \ No newline at end of file +protected net.minecraft.client.particle.CritParticle (Lnet/minecraft/client/multiplayer/ClientLevel;DDDDDD)V # CritParticle +public net.minecraft.world.entity.Entity m_20099_()Lnet/minecraft/core/BlockPos; # getBlockPosBelowThatAffectsMyMovement; \ No newline at end of file diff --git a/src/main/resources/data/forge/loot_modifiers/global_loot_modifiers.json b/src/main/resources/data/forge/loot_modifiers/global_loot_modifiers.json index 97e5978c..1948a8ab 100644 --- a/src/main/resources/data/forge/loot_modifiers/global_loot_modifiers.json +++ b/src/main/resources/data/forge/loot_modifiers/global_loot_modifiers.json @@ -3,6 +3,7 @@ "entries": [ "oreganized:electrum_upgrade_smithing_template", "oreganized:lead_bolts_in_outpost", - "oreganized:scribe_in_ancient_cities" + "oreganized:scribe_in_ancient_cities", + "oreganized:bone_piles_in_desert_temples" ] } \ No newline at end of file diff --git a/src/main/resources/data/oreganized/loot_modifiers/bone_piles_in_desert_temples.json b/src/main/resources/data/oreganized/loot_modifiers/bone_piles_in_desert_temples.json new file mode 100644 index 00000000..1664bfc2 --- /dev/null +++ b/src/main/resources/data/oreganized/loot_modifiers/bone_piles_in_desert_temples.json @@ -0,0 +1,17 @@ +{ + "type": "oreganized:add_item", + "conditions": [ + { + "condition": "forge:loot_table_id", + "loot_table_id": "minecraft:chests/desert_pyramid" + }, + { + "condition": "minecraft:random_chance", + "chance": 0.4 + } + ], + "item": { + "id": "oreganized:bone_pile", + "Count": 2 + } +} \ No newline at end of file From 738ccbbf1a984d28c5e7798fec82e873668b02da Mon Sep 17 00:00:00 2001 From: Niklas Widmann Date: Fri, 25 Oct 2024 12:56:54 +0200 Subject: [PATCH 11/11] combine vigil candle hitboxes --- .../content/block/VigilCandleBlock.java | 22 ++++--------------- 1 file changed, 4 insertions(+), 18 deletions(-) diff --git a/src/main/java/galena/oreganized/content/block/VigilCandleBlock.java b/src/main/java/galena/oreganized/content/block/VigilCandleBlock.java index 6ee3146a..d804b224 100644 --- a/src/main/java/galena/oreganized/content/block/VigilCandleBlock.java +++ b/src/main/java/galena/oreganized/content/block/VigilCandleBlock.java @@ -23,7 +23,6 @@ import net.minecraft.world.level.material.Fluids; import net.minecraft.world.phys.BlockHitResult; import net.minecraft.world.phys.shapes.CollisionContext; -import net.minecraft.world.phys.shapes.Shapes; import net.minecraft.world.phys.shapes.VoxelShape; import org.jetbrains.annotations.Nullable; @@ -44,21 +43,9 @@ private static VoxelShape shape(double x, double y, double z) { private static VoxelShape[] createShapes(boolean hanging) { return new VoxelShape[]{ shape(5, hanging ? 2 : 0, 5), - Shapes.or( - shape(6 + (hanging ? 0 : 1), hanging ? 2 : 0, 1), - shape(3, 0, 9) - ), - Shapes.or( - shape(1, 0, 2 + (hanging ? 2 : 0)), - shape(9, hanging ? 2 : 0, 1), - shape(7 + (hanging ? 2 : 0), hanging ? 4 : 0, 9) - ), - Shapes.or( - shape(1, hanging ? 4 : 0, 1), - shape(9, 0, 1), - shape(1, 0, 9), - shape(9, hanging ? 2 : 0, 9) - ) + Block.box(3, 0, 1, hanging ? 12 : 13, hanging ? 12 : 10, 15), + Block.box(1, 0, 1, 15, hanging ? 14 : 10, 15), + Block.box(1, 0, 1, 15, hanging ? 14 : 10, 15) }; } @@ -94,8 +81,7 @@ public VoxelShape getShape(BlockState state, BlockGetter level, BlockPos pos, Co var candles = state.getValue(CANDLES); var hanging = state.getValue(HANGING); var index = candles - 1; - return createShapes(hanging)[index]; - //return (handing ? HANGING_SHAPES : SHAPES)[index]; + return (hanging ? HANGING_SHAPES : SHAPES)[index]; } @Override

E7|in6AX0^xHE$Ud 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 dbg76U51 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 v*99fT{&)Icm~ziz literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/oreganized/sounds/block/sepulcher_filled_1.ogg b/src/main/resources/assets/oreganized/sounds/block/sepulcher_filled_1.ogg new file mode 100644 index 0000000000000000000000000000000000000000..e2a1f3a2784a3418b6b71da099b51395504056c6 GIT binary patch literal 9878 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 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/oreganized/sounds/block/sepulcher_filled_2.ogg b/src/main/resources/assets/oreganized/sounds/block/sepulcher_filled_2.ogg new file mode 100644 index 0000000000000000000000000000000000000000..b21ee369c57d1dcbb0119bd07dfcf032ac42d447 GIT binary patch literal 9875 zcmeHtX;jn6^5`#s5D+k7GXzw?fFuM=FhoGm5E6tySVF=oBAY@apt1-mPK1CE77+mv zMA?E67G+m(XA#AP9fZLJMi4}2+_zC*2j||I`@a0&Irn{f=k@7yx~r?IyQ`|Jt2=So zwaXong8oYD)a7nUs^S{k<*?PT*vNf>VNnu*6u(3A1ws54*wXh!n2Ut+-$_C#>FKXI zMpXH+?8kp5Iq9FQlmLcPK zg0blaHqpY;lxS&cVM16+K8gT2JRo9MOu()X>zIgOP0$VvhzJf3+2KQ*Aw95CwuTQ7D|9C`vk9O(y>gP)S%X@t1%QP~Uf_kwqsn!A@W6bPblVmNPYYT4T4TXtago_#i88gF-#NP*k>on+Vr9Xb~a!JvKANB1bsGDXaUXwzDA%!3RZ`*A*iIxP*`TD zfIv4YK)n!zptz~s+N*v0xc2P^?d5PK?`04KgMj8s?1dHfS-;umV7znmm-1|y7~j{p zlueh&?IFn3O_9D=O>T)U7=qv>=0cH|P!uYhOU;4{Qfj3jJ_N~tVMw;_R$Fsv57?Zs zR^H@4vTuHf<`OxOA!0CWXSHl9L0VIGNe^Hee58=j#s8O(`6z~RnS7na7R^E*x> zdqB;gEE?PW36 z{S>$qM1kujtFi3=RRpH$rl9uS!JaEgWZ=hxZ~kos;aAR7;vnhm+rIWZw)`7z#Y3BKdWejgL2K>idH;FTZZ{U7<~ z(xo6s2N?U$gn z&|Vxwk(KO7;k04ajCl^mAxA$fXIFfF)v3byQ)h7EB@_rDL6Ib3Wt^}&PFNL}^*l8v z^i+OTb)nIn%Ek8j7ynaUzGUDS2#UsR-G|xA!q8cuvLs!;qC~pdokR?MAHHvp^mB~^ zs@6cDp3y&@#$O76AjR7k)cOXrnJW4tEMtzl@d%4P;?DV>5_5>eR0V>Shq7T%Hp1Q5 zxTjD)9TPanttkmoWG#vs>~XtV+U^jOQ7zliM|0f}2dgnbLYuqB75!L)x=}VYS*@ZV z2&c|cW&!0TLx@7ylRes$Mm)$%l7XOXl2X6biVLI_f3-18X}pUx>4EfL?f>SBGDxDl zwF3DsCSagHtdM`uBwk#S@DHR(1JYJ*z3<*V0vL;i?6>;ISYRNlf&Uxp`mZPZ z{~7$hE&&j{AfABF4qY{LqaKv13hl91!N}*x+>^G?U&c(Tyg`EHgxCy~gb|p3%K`&B zY=(4%kOS!GC#CBB-IW76O2QCyeg)_VMgMyb0gMMET_J*AU~qi{GgXgYp{> znNfSd0Zu4Y{P g&{DAKVzN`VuGw0FA%VK=jl?Xd3=`uBOpZE;SDr}3o>bX24JD`4%0N^pNLv`_ zT{s(mW}UFIy6`6#`T&XP&T+`8j6VZ{rLe+EaU-7j)=F|ju{oUNzrbSg0vO0e4PbLd zVxCGkfDy$D?Ms6Wv6-A0KOJFZSfN-fu3t`bQ3E{v#$t}lrIm$=#Wn3F2&RNxjGwox zWQO7wcT6c9z{$@uA0{Dr(cY-&${7Rw`5};`h3^AWSJnmre@4lP3|#t!0m1SWlu}(I zDZU{DT}M@_x!)le=vE-mJs5!+)j(e~$P(*Ruvl1i0h@u-FVAIhu^a>oTb-*w#p&m< zAZYxEH25UDhW0WbofQzDU?(}Wo%Jfzg6>ATD5XIDU=zC0Q=C6C`2-V)-ewc9U>liPS;eU-@$W7*|1MaP-oKmwM>S&*oGnFY|0tG0UpVH_ zr!C_bEN?mtcwD*uQQ9uPbCU+Pq0mA)u@Wp z1??CotgLY!irRy!7~khu8l?=pq7B67XG4&*%(4y8^(WBNC`7cB%vLRkuS46JO6#QV ziF1`lAl+ei;K|# zd_klL{Q)Mp4MHLZ?gj*hhVO}vJH!{HW@G~g3DQdF5V*POQ)o0&6iO4VrM+tP8XaA| zwHV;Wf4(E=@F5wQpAnVBgUiS)Jru}5UQ6_l z*wEg1V;!DgdXZ$g!Hi5Y!5iU?H;`^zzGQ4fB9rh&L@dF`h-7xV<_3YV!K}BV15Y9n zh*$#yKzwaI;F@tiDCUAz@vVg&`(Lp2^iZbKFjph-s6A`y%v5VtYhAP@vkEtNc{JK` zAhx5fs?~ab9i%ug`EE*CQq2Ip)BU%)*hEihY!bJpO|kiq#Ep7)CdGGAjsXWLBk9D3FfU$7L$yj`GN6| zWXNWlo_tb4SCFkV=9#C*pCQh7&ewkGyDVF8)#T+_rQ(BsT+aj3d6tDPE(Hr zZlX=_pA`sfw%wFbo(^F@%N*-D%y|^YTRdN591OQ0uLVb?E79XZY8aAO_vXrPFGv#$ z>{(AO>AeBdnA8+pS_dNl_mStqeQ^{EsVyH^_=b;+-mbO4Jv8{q+hF{J>7y zWWZz4-*5h1GT-J5nR-0&Vh3KKL9grdF zLZoNRTYcO+MOi0X)=>=7;@5&V3NuI>pE4pVzQi@?cNg~aTy>GREbJ|f^OQ+bTYHF1 z@={q}qZXn->v976Do4Sz7d^Jpy+l^ts6$2Cb~WMykk!*~V=LaOKKkVw;e5?H+iZFe zkZXfbSm3^$>}DD6S&Tck2`wY9=LRD^emPfk>2t)EM|WQ=7}F`!yYmacp|As)jvV;S zpu^%^dSy}yJe7t1T5_o_dqE2Sl;gNQUjDq#f!n^my~e~LISBF~hG%K0cMdeCCUI58 zT5eOV%@2&W2o|tX@@=+??72zgn%RXzo8EL@rc;9++*gS*0Rx!TaT|QPX9Z7dUwdt_ z$@F454ZMslbj~|wEYG_krj(^gvFD21)_BBR)qEeo({i0I&n%b(>)pg{DymFMEmT%Y zX$tb|B9)}Ghwcn*WmK11PRRNc+ntlzY+F#XH)3Wx6g1)3CXfb;c+cT|2J2ITajpy}UiV~M?46!BB`Cc|FRyu6qLC(_(0aaf`^;7v%}kh~w>v3z z(@GE1Noo8}?|k(pA)5nr`KYrqg*qsw&VjN()y|#Wl)99uoh`Z=HKmDZqk~5atfR^7 z>a_gLm${rgxP#!FNUwHycx9xUs8Hj<2uyroCM(N&;n<3E$L3VitG9SGoWhMI2lPg$ zg<95r+A|bae_!L5k!R7rn11=RZY2vjL)D(k;xE(4a$JKz$!(U?&{X8onvtaC6mobk zgrA%m>+oysIKSUN<B7f~uI>FAY+psFroYD|}jv&m*7bWSl(yVZwdYfySvhD`cH; zwN(RfHUXUmdi!?m+Fk0Z+Faba)zQUzQb9E@?Kp&g{MBr||J9GXw;z77la{EW(gdt4 zgWfGRw?uo?_KWITlPi=Ra_XMn@hA&xZ=#s*m=OZ za*+B~uORz%*R_Mxv@&~~Y98#^v{<9gkldWqe>^$(I+fDK$^q6Z;)MAt$$n8FOeN$g zAP;<&SI=nZU&Pw&MDP#i(SES5pRzFw)A^E}5hZ@7BER#hrsxJ-g;J)u%}z}QB0c74 z?2o+Kc6ZHzF)fzkUEpK*0k;;a&~5Umlws`LJN2D}Bl9m$in;pCp&MO2w^Ck1Rx>Y0 z8DAg7b+inAKLcT7-%U8&Jpg>91HXJeblhq0g$a(+vT`>!PKA~KS*@9IK?OUSHlyuk zrMvC-qX`ERuB`bm|6arP)h%#ZR$6-1#bS7#=Q!fb%9nyvgW#<}Dh7MDg|m-`Y9H6x zF6%V6NfbHGTq^74Pk8ox_}T^NP+p5|Tp)#@YlZqGj(dFYc+NwE{9o=#^Aa>U;Y~yWPEq;;#2Em}WH=2qsE)MAnVd!Ii+2^Ys#udr@4aG1RG=-r~BF4!@X4d|wjgPS~pT1~h)@I49;REx}L$<48z9{l#o zgPun&4vl^nKFPvE_^HVla=YkYM}1HDB&19{0Yc^J9bzUvC6KWjw<^r>#Ln7+l!Z!C zbhH>^&(ytIKF7U0lJN9$*okxCg=g<|HFgJhUE}$VfOqJGvy&tFXTlDWr#!03DFt4) zkZ{^FEw`a>RfpDc+ppEf~=h~FzvIIg?insQ>5msbORH+W;$ z0sEJdYo@PRWo9?xBh9@o4lqxp59{f9*dT;ymk4d7!WW8Y_i6`@doja-BNnnJ*|`x6 zGU3fN%WVHd@ktIvq-BV$KvYK;<>a)#ISlV}EH-hqVK>~!^~OFglQO43hkY`2y4_#LaX!n$n4R`m zYyX;UwVkus#!qQi(`hC9J+&~TYcd4MITsX!BJ9dz4L5Q1gy~U%YCVF0@bK_Mq=jrq z(_M+z!fTu4O^R8W_SrXj)!U1(p2Sh+={26$bh1y_qF{_!W=kQ(I$y%2Rjlci4z^mcaoRfX>r}EPs zwyx08M7w^aOcUd%6h&o7%_EK@JF$}~U;pZzJXe_P8B)R<&3&@qe72`u5!?Kf5El3}OkO3wCvG>Me=j>Y`lvG<2ohP~hGRldH59-mXgsml z&O~sI?VlZ?RKp_7e_KmD{+wHYkRHqX+kGI~R%HEUjnDX_ zOOw1-`M!|EkdY#z(EWaElsj}e8_8*PH@8rc>x~Ur#Zr)NlAu-#Ca39@B&9v}b+%~r z$XAX1wcHkHI1SuO6w{|78sHD6w0>b&o~W%aa~QHk^TO$Fw;`*?2@ihheLMB>*Z#+6%(WfZ*4Z*#m;#koNklyLWSgiz37|aVfY;XAX z<8vI(y;wYmJK|6^j_S5kDJyBW7VlaCg5Sw^>!V0lnLkX=8*r(|`}KhbftHn@zEk57 zdWMWhQsI)AF2(~Fb)2QxA-kj7I1kZNFS%R>GVvSOij+E=E(Uiyk|;pL=m~K!Wj$CL z?l?_R?WyX=Yr}enroW$TA5_g=2bhLJCGMg!cyVoOeYV2gbL^p}uuayRc&to4`Bf+g z|8#2F;N%|>dr!RJ8fmK7NhC@iMh!T=l)w1m{UZzYoYgi?H|_OQv>(5mUbFCe%H(_L zEBWlB1t7HJ`#_u_ZcF0!-DL%(_EWW$HMZ3^a=8r45z&Y$W{Ua3mf2o3dbGX1$_PVO z0Wujy-KZK_y`J7apZfJI_dxVy#DRs_gW&MePl$T!H@NY9Ooo~_WpCZYV=Zc^%lNyi%IKMsRdTUGx1|%A_0cj+?nE2X@3gAN7--!JXW^VqX5tE4?)* zvy>o(?_qg<`JOYhurPlkyQyxMn#IP;=yeRouRg>D@>L|Arv?>;IOKbJo1}xlhzh)X zVvCSCiY`OW*bBT=PRb|AIMd*C*u#a`35L-i8688A>HHyHuGgvZ<&~Xb;oa+J#>>T% zt#ygnE)OG)Kl#zltO)j*LZ+*U5Sdw~aq0MR{F~s}9oN#}(GN-mR}-{V@_dDPY=de~ z?qtNJoaKG%kXz+YI;thG{Bd^1UGl-`{he{#sp0p8hHBJt-hscG-#$5OhUmZWFm1v& z{feJO1$lei$3WRQ8AXp_AEOd(tz|&1szHWb-o=-3*v%Q9s5K3XI*N*dNrqfNS`bou>?~zvQWeSH`}pnXUecI}jd!=j^+EzEkc7CzUNs z!)FnmpGS}(vpVl~2%bzGW6Z3;z|z}PcW zD>AR5e?J@={Q_r(XqW8i>*$&uMoo1_ttl& zN&DM;v_i61=}LBALs@FrMCIf>d0C>)=Egt2XQ$cbO#fQ3>)cDjZS(IB%0+q}`1a^V zo3HzA#Wak>`ZE+fx=7;rDwgAmh{;yWoBD&$3QcXe*t;&R4MqaN(5lOkH#a`q6n8D; z*k-+*;F@i2?xR$s&M6AmuxyZh4y`X&nmB&(lf9vWxI#Qn4wLq2`;AsRHbiZae!qIu z*aG?DeY5LJ%9YNIxo&nI3mTlTCheg7CyjvySXMH>r79I2l;J~9)UmfZ-W4=`bG!g$ zM7BX-E;z}^4HOvKaN60qEaQ#M+lcA+)_=Ix()ZD`zwgVDcQyT`SL(eB*lWVDEp}o% zJ)7fC9(HxwLtT1^5WRPiD?D_=Rb>Vc}Vq=ROUu zvAC9N!}-{_8?N-?Uqbn4OYwgTTOyC_?G3=Y{t3o7ffn^tu|-C!9evkW~QJWoWBL@{1^hHfMK zJ61P+3o6=GWcdE{mCmC_UctVs)$m>INS_zVj3i6-6&tx;^Rx#4fk3Xm7U|m&^d)j~ zRaC`TzZ7JF!2Vc!qZC3UwykG19QhG^07 zinr~J+u^4OU>jT*MX9Hwv)B&r!{d`$OeSSmRMnMI&~X3z@&#En9qCgzY z=eh-DvM1dqTc;LCr95%_Ao+dwTZf`nqk#gN`Z^@^YyZmpHIFvFOMZ6rV|#nd@w7?F z%N;CT_u1uZWABe0=CGzBR2(oWMTCs5r#c2Osp0;PO8*b&17q*{4wt87&?NX2dYzl? zpa&;r<=fFLPn1ZSd6%?2hZ>~4t<*%_BzfN&^nCzwF+%*V4;rzgvLp$HG ztBvkJA7YBi26#a#$HsNR04@7EJJ9VO5pnxp45!MtgP4Jm;p3)0lBUu6?oqi$*6`Kp zR(E5lx&PZ}PhIk>wv7=+t0;FU5F6$sV@JnLWi#^T+~1R`&rlsU8Q$#|{TjE?_9Sa& zs(qr@UPlrVQQTV2-)SI}j<{XCFh_UrTMym6&)nJ_n-XDZ^kH;lIJ?9a{9s+BPQblY zpPevJ6NPQ!Fg+(y>|!RBf4lD+9b~fqQJGd$+oRl5(IlV`3cbrK&smj|N+1X1UOfIN z{`K^MhiPe*We#r&vE=VJ$+r6rupziU7LYIyMQDI=F- zzHtuEj2++mJe!BPu1~kX+@W0h;rUh%@n*w1lHa2kr#l~7p%h!cOUuTgerR>;pL5=E ouUGw%To^e1=IpMg-TSYvuf(S$LhSEJxH9N}0nx0ThX4Qo literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/oreganized/sounds/block/sepulcher_filled_3.ogg b/src/main/resources/assets/oreganized/sounds/block/sepulcher_filled_3.ogg new file mode 100644 index 0000000000000000000000000000000000000000..d2b55db2423e4f4ff74c56751ac762ebda23f757 GIT binary patch literal 11148 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%0Ay;;JaT1CL{&0vuEtncKb|m-`;VopVIrW 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 brkdA(kO%x{7u}L%qGUw?ln}t}qxHW4gs(*7 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/oreganized/sounds/block/sepulcher_harvest_1.ogg b/src/main/resources/assets/oreganized/sounds/block/sepulcher_harvest_1.ogg new file mode 100644 index 0000000000000000000000000000000000000000..08bcec8b3677dc28099d2e8aba480f300afe8b65 GIT binary patch literal 8418 zcmeHsXIN89_wNoM9Ssl^5G7zJflvYgsY*f*JrFw5OORevz!D*742XafjmV)S2tkmJ zf?Ws}M2ggiiXaGLr+94K9q^R*e)-?$dGDwD++i|Vvu2f<-tHm{+8R2#ZfHXzZ9OB5 zj;8i{@#Y$c3XBO)4h#=9O^ykX0s9ewF(FZ*3H~vGpss5y$hFzvYy}4ogvNx#Cis&= zOntQd{;oU0kbBSF=m1kjo(DKR!$oXaD{ zfV=~t35nozP4&<^iXbyMHaZTRe^6BDhIHb(IH;ln+D1pmVbG9G8)lVo=I#){3;+;` z(rQ-B#H|#lEY4YGS`OE@e^CZ!FP<)^WAF1wDKS@pQHG=Xs2=anB?4T9lh{Kr3Joi$ zKv6RF%+F9U1u3c_$RlxiP~2aQrC|g(iWS^JnbtNC&3J9_RgPk5=m`aRZ{Ujy<$>!v_Lu zlbgYhy)R9%!h$p4H@pg?Ji=DXQq&9u+C5O>QU2r)mc}!0RU$gQOkIk zz`9-t00@>D(3qYyW&~}Hnj=U#ahV4o0{|cB24n7OVqIYI#Em%G7R~ur^(hLKSyu-! zgbtFzYWS(zyfXajaR8@57N==AyjAhqGYvA4pY{c!|b=+%S+^%T5lG*=jBQyx!vj;*NQImcY~A@d;WO|^ly=Mxpk1i^_oFX zoDO`36dat3fLnps(g-jU1=C3A* zs&GO&;UV%;Svp>=rn(|q=Mk#8cfB!MyxhFmSQOm_HCM0eBDhBDjd<>VZ#YNKXmR)6 zU)M^&BbfyR;dT7rAoe(ZnUGu;uH_&q@={5Huv+y7oN#Vv0Kn<9+<^Fwf9fZ>C*n#j z5@6LB($O1owIn8ojus_*wIA^r%k*14G6~kN$$_3lpS+)&ztl0VLMZC5v*=mAi*VSSFwz4PrLdI3Q^X0_u^pacKMw004+S zXn;K$kaLhw8YXBET{VUYmcy>Z|EV|(VH_kuV1pk zW}}T-cx(GZbf$FcKG~B6F3_|ZL@*88tHJ0;D%Xv;;WA;2bHQp-gv|snc$ol{4tW_T zXV!!Q>pC(3kc$!PH`&sF+48%OaNtEb@nW9v{_g)bUuJ_Cvo9uK{cQwv^wC88qXqXA z=N8lxUd#Zmi3@mo{MY4w_tgOUvJme#`Ij%yk;%aSjdlIkll}h&{$ED`OkSWb!B2n! zOtwi8ph^O9HWCP-e7?uLHbt8pGOF%iAo-!#p)!)T!#`Lczya(KoCer}1N|7P;y*+A z;6ND(YDs2*0}--+|As(`Cm019)bgD2ZCwYdqJ?;s&_7!LrofX~Iu3k*YnO}uJtqTN zCBU59`yfR`A>%u0F?)bQw1ING@@RD9uW_kfTB(P zCgdszxEfGcl{>oztZPs_89exT02ct@?`}jnNLuDINOTn%!gk2S2}YvNrIeEHelg)L zyCQ-PwRFKaoU0J zjDsuDHoq#R6ik*#^eR>p%HfL%_YvhrBxe3*vseqDBPSRrO&m_1;#vSbvKBhloesG< z5R?7jv?>yv#bVWqSUABzn|`Co$LCH}kXWqR4o#>7*Icrn7e9A~thWz!%!r^RKaU~^ zSLJO-lc+Os6dW%K1-L!bBM|k?a$vTfU3NBGEvsRGBC^G-TtS_OtO@|PrK@1B54DvQ z7*JU@f&#-SD=`NNEI5NeKuS^E@M=nx1%yZ>5lTST6bR$glnMy|Fm{|5{A4;u+{Xj( zEdW{Diu=%ZRAj({`wUgY2{iOv$yq#l7EFU|kuu=Ze2!7Dp7IdzT%IA4xt{kF5b$88 z!mh(jfB>R7!CbgOq>2#h(Nd*XDcf!Yfc4-n zJPW}va-nCbjY@%efdi4~*MwTfa-l<;3mXW_2523cQ9fMMLS@?Oz=(jD`Hm)sju#zA zb=EIVGy%XzJ^`SNXS=(#0a8{3g$YsOJ}=FrGjhR{JQRu(R-hCR1i@d$zqY>wU;}RX z?8XspLN#I*4mKb~?p^Qx(-63$|8)P4C=D<d#n^(od{7$0-ut!L(vv<}%r<%!de7Gh0t!9i3jhZ*cma#_)4G=t7o~Fe zx5+k103dE~D7Z<$Jp=9v1|i!J+!dQ~g5_=?Z=F&o$mZ^z_4^M25AxQjT*AU{3W`Tw z&#S3m7yAa?pzVQ+P zP6qh+HZm&i3C_p2{+56b_??7t-x6^7g;ylL?1pfQqS|h)#i>u~>S*L{W0Sp_ni_je zjMev;qIA%fruw?tS|}q^Gt)Kx4}NIaRM=M?vh2&v7WF$fp^S`(g;n$Vro?w|uiSFV5@LRjDw2pb z-UFoaPkwDUafEbhzCkTOtiz?#qLlfgzQ_Ic?n>vP3PQozvqP3++$ zl4yANhQIF)H==O#r(+UXiK2B1+qc5*dHTu25}by&SO;Hy5!kbO@y4QQV`V+-ZRp2} z@?8%cFV3sPtnP?f8C&3WlL;Q0Hp6_qwnuwuH{sFFO}}K>*RI{XAyXXTS$(?gM10Ic z4t*t8toEtZ6B~ZJ@UCkQUteaG<*K2FIsK6*t-j?(FzBZ&?tc9`)~~9enb)OEZO%<* zJ8MQaFD}-af18NZBjG&-?T_<90z{zY6$Y;71w07%7A}iN6iLc(Zc6(*UL{G)Aoz~E z(DF58$}Tk2@kKN!2*Oe5V8q9BnRmX!sZ6O^k&1*%J?`(_wGJbXh3@5XG442o zQf~`#M{I?JOOMs`6otw+5?uA_q=ocryWdAN;}t1^MYPFyYr@WKyFl0ptg3gWxT1?{ zqi|+=WXQ9}D-{@5aY4uf;o;i;KVPFM7e2~K=|*4DJpc6hzW&Hoaj(Y`cYAsnLjW3` znTI#3ZrbD?B`gPDJipWu6hRtzEH4Nc!SwQ8pJ^xQ!ZikFuVLyJ{iJreG22}rj{KgD z1M?^RQHRf|W-OPI{Uqb-o*my#5QXrj%irsdkql6NvIj9-9{PDN>)yv=pYL>NTZ=dK-o@2uuVK5J#rKjV;I+F=?$v@J7+d1EE!W!n9b5z)Bo22^nXIca$vK^Dv z{U(@gw%d2TD9?+J0x-k*#d;4~Rvsws&m(8@968YQsXvFL@c#25o>5{`N6bFsEh7T{ z+wr`pDUPz<*x@hBGamY#SF+40FxuG!!FxiXE%R?oztw33?Gj&(D+yLQTNg`Nu(4(? z;>KFo#{diewO662{KG2l;oU!{E~%VPs1`gBmS6jQW$6OuA}Wk=tAo?%+n(I=@McQO zv9*CU8`Hr(?NYTP?UEKGnvv4zd=$}5=FP8famnQ4Iv-X}UaV_VPe}IJQ?zQzGOgWv zWo_i}hzB+h}RTR zg7^BoC$nH(ILLG_!NY(SQM26}F+R7++G@M1a?7q1z^c!GrWjVx`B%WzicH2B<;h2swO8uGA&Z!Zg8}=RB<=3bFQ6%?m~QZ^rK0e!VWZ zIjmYQ@(bGBYS*XkyE>1;++));9p`WOS~XXnf#p@T%ty~#J}*q(cSYrb*5lEF>w=gm z_F8s!RqS)a=QYzGUnm#%$~~mch2gW%!lSJIK)=qU6SGZ09tm_el9b|;$ktt3cnhl> zY;TM@X;=UjQ_X#B#JAGa-3OyN7A*5WN>N)Gkg40jm1P|=A?b0qbmFRSP~T*-x}60P zQ#G$eqORQU+qpML9!@x7Kpu`hvzz(JBH>M6clE{noOj19cb#lp8UFdjcd=T#y98n~ z#ed6fYg$vhkIVS;kv}guP(4rok`Ej8+>tfZbEy_yDp*zgw6i%m@?;~!{giM%#N@^G zpB1wg+Fu_dSHGB_0gmkE3~CRlOTRtCv3ro9dY=-Y!y`C-CnBnl$lh{_Zey=_%GREE z%1vBS2&z$H&1R?dZ4tJZ47N_!e<9SjoHiGpM-^mGII?<-7K~5j=nL4L)woeKz>Y*_ z=c0ld+@JouMch)qGxw#4`mBOZV(%JY^4fanH1h{4>5Bk7!c$8y;@H6bi#0>W@x#Sc z#@8<=1YD!+X9TWk^A^^yeu9=kq+oK zdWZfz@XP7tSUKgMhx}&XX)VtrkHxfk_i5GZ>S-UYhPy0jKcR+{S&c|X8V8C#ROP9@ z+C_FSJA7e8$2RGusn6o>EhbaV$M^ff_9&hI7;|O&$s96ku=Iwj3(1(pD$}?-*so=N zI47YbE#0!Yga^an|7jPI7hU%&^NZ&i_AEl8DNO8L+Jx}(*vklUkoli7*SNiSo zvm4>@q3)Lc4ETg+w9ouNQZ0Cy^*|yNQ@r&ZSS3y{KO;D{SncdW*7Rue){O9TeZ0d9WNC>=(ZT%`5==|sj^gDH|8OcxSaC7#CDXb z{yFh`WP8cdi{0)qsibjpuYhOMq7-wH;!@u$?+FAw=B ztBJoP^jKX)Cj?JKUMWZv$0(m?1fu&CJQqZ_4S9`T!|dq9Cy7}+l~4hWhX`*odqveg zkF6=GUc3u1N<5OBJYG3j^Wxl5lx)!^=)j$oEA!{8PBR9Duk{9~(yc zdMk}faJ0l^-5jhh`_GbEq5*L)=!GYZuUtSY=H=FjJb6x23PrDltjSq(dXxch^7J}uEc%<{Dc}6{Cr;!p>;u|ma_`;MbtTF$orgW&R zGx7R6Tn<(@-_X2w2PT z6eNrPBbs){&_0ZJrN>Rmv_YQw{CIh4NL&px_4P{SZR3EaFJ>f-vmTVTdaYE(|M+~H z%^z=c@pNu*Up!C)zTvq!ZS;7@MA@|I_G11&w)J%BGmF3Vcl{ZI%|%_nd75r9>R!ox z`KtNtv$nL;$Nf_FZ#h@*m!A?Ha=y&meIyLNjHgze+UceMRlHAjw5*KUBv?qPu!3_8 z*sT$@69i&bg&kCvVl54Ir<;X2>n0`Me0;^krigkfH;t+6%oDlIz=wvz@*F-Yp!gb( z_^*vmi<@c3P{vR@TYt$`X+ckQlIHjvN?Qgc@ngPh2Y;D>RNr|$_h zan7)R@;dV>1Hdzgs(!1QrLX+6q7&UV6Ps62_}$SQhLOWi=`9{Pj?%(Ox$)M>N@Mk8 zzVx;(@IQrr$fot$77p@Y0t$cmTR8dDEga|+npRSx+Sxy8OLd39#xJ@*p)IC)TsQ2*tGYLY)&_eX}y1N<;lg| z!opjt#Y-?fZ(}cvhSu5mnIxkox$eBzaK{N9?M*4xmVTCpiO)UE+lp7ciszHjUPG7d zqUkmD9caTpXRX+3DW|YX4P_WF1DYP7O}lWJKdsX2RAtg${aMGW&wHjP_J1+a`rbF5 zWj5DAG@77==#LHzP0uesK<0c@4udE03g-s^65Ao%-%AiXj^ zbyK3CgpF6M-%c$J@J~}y2<)T4%O{fR6-^5Z^^B&4P>r=UwXqm2O^mhp-Rkwj7)KH%=UuvW=xE>#HJvyBA$OqHB*H;P!B|^LcK~?Wa(3&wVDl9~t!=r_Q zyjW^v6u4YtT`g@zkm(Z^5)Q84JD9pI9mN#~RkT6dS|QrNY3hk4PwTD9(arUpp&)Ngp1uipiJ9D> z4+!4(MTUxLy5OlxH6YWhOk>GD`#DIf~~O3PIl<*Fi3*%lGtJ^(;X9ANh% z|T0GE*{&d}^m{1fCvI9{w=xKaN_;Z&)M7!%*DzqQb^Judq^GRHs&nHxdGtE>ag1DFUYq`-)le>UE! z3Mb%^y{PKaB)nQ}O?ifPAG-A+w=r03XcaRQ)#`@sRd4Jjl0tMxorB)#&oYzS99@GN z+lhD-D~Bk;#ZMl@9w#8eBC5Aed7vs_y@Af3cVmkIWA++5x)=tvc0cJjor3^}WIP3~>*hwAM^&su^pg4v& z<%PI)#7vx{POQYg_($~+?yrWgq2CaeKo*DfOAJOUaMwK>189V zvXQiG|G2!G0_J={v05Eh1b}ixIE7Jlh*5ipQFADBE;T!#Ag`vDsoq<)*mdFUzpER# z0geEGXoN*1!h(n}CxQeQ-9%9ix^j245ayBSz9H=T9tS0jK|r0N*AI<98~^~K51L?o zgK`83B%6q#kT7hbIh#cJcZD#FB}jt63IkaXAPY*uVD2)7(-Gc7f%T<6qQpg3v!$AU zduOj!3cP*4?8zJl=#g5455x2!rg8wK+&D_crNAolebl6gVnon+DFBoSc^NKe(t-vn z7a0J^!fqTe+SG*I^hX~-;6>ZJU;D&BUvO|JM2^1)j|CaPR@HStk0|n)Db{2#`3X zmj~tqnN!YSy5^jRWB|Yc7p5wB(En%UUni6RQh9)IRdB+4&FGiljEDyV6HRoM_+!a6Et96IZOlsH$bITQMKR5=a!Q z?5en8Fj=B8tLj?Ngk>YnBZ^F+r2N6It6KmkvV(!r6n4xjjspMO3UGSpJ`i;=IWXJLC_S5@mfkc-->}J~OhKI|Q567g!mD7UUQK0%N~r8z z1RaJ`MzV&8b@G)&B1(!*#;YMKa)^N_3Y3Vd%@M(=A#;fU@Z>lzc%|3}+{Xj*n}9^k zeVm83tzsq2r(a)1oXF6cEj)|YngP=wE0hfQG@q@^;if!9Jcp-`VsZ1H93mdflx*=R zB)#8Mg_Sb|=0}nMK<1)daeszS$&?E>5dw&2`f%U|k;+4Gy`{>mQnp%mK;45s@yrF? z$br62ZA=Qx3kVd7M+=&ZuBaj9Cfh{_Sy;GU>{Q&olBQEzl{lo$?$>T&dOK+%arJf_1r z9bZ6XswV5V#BUL7Z*wMN|m;9xQ@V3u@BrvXtUl_{`UwnYK} zag&FFK?24M7!{So41F*v#Bf4oWRSu(Em&zh8{6RtSs3MLA=M@RX zO6HD2@v5v!*dK39wUs#>iiiVu3p$D`hpYrMTn(}s>#RngH z`33}sM;|(xNKehk0uM;AYzB^kZ>~raGc#-yTt;?_+}3T|~{RuLKpZBY*W7-aKbRhn~vy=gk%il%~1QHztfW(tGn$FbY&nOD_{7e?a z3?)6+(b*p$BiKD~>6f6)-l^}~-|RFsYBkaA_Dc=utm#nIfC%iS>_0fM@O3e-f8gEI zpT~}=_+R5em$f~n&F%Bin6z=N9d%6G+|TT3w&rm% z{}0>N>FqxaALSkUTqjIE9y@%ZCcl^LxwJ-o7hIlOa}J$mYsmLl`i-6MhhWoRW)~!N zg&Uv&=H?@F=Dp_wj>N|=hSkoFt@*qt0v7Eztd+Fv#Vj7{txEuMZ?(yI=jYG-92`5N zcgHIF7)J4JfYjCkdti}hacKLrMhtz$A=Fir1+!^(T`WIQJ3%O4>L8Fp=CNrtI_)p6 z8ftW!J9N!d7B`IppGV#;bq3fiJx@pvl@z5~HmL4AuR!i}WA2NYz*lrhv8ChAwRC1J zz1x!Ttr@5GqXys{Cc5H&j*H>5~8y-@EN3gw9fh^k(_CH{0{dq;3ONio#Nr9Q|R$Ut(?uj%nQas~wJW%T{E~agu z^{nGd(~nYlzixfr_QNMLaO=^f!+W0o9{-Zia-(j~fIH6tt*wjFBZogZ{yw+E*E(ph zgK+PYtBBgxHHCDZjAf<1UwV657B7-8imA^Wjyv%)DtBgAT@mJ=EyDos}4}U>;yvsakAsx?)SEJ7(xZQxt7T9yF}^U zmDlbh{^ChjO^ww<`{ScY40GfDi*>^oOLf-yVgrit`HuOj#zS+Sooh{YY=D@$@wUWx znP+3yBeTXf=oVkRnPGH2rBmBM=Vxk01FVe6vN-=+dJ@;NXqdiYSG2S zuj$Y$$7FOduexkl$5ePfrvzmEk~B#-3VWJctm7wK!V9^{f7B-<^@cD)3-u)$nLlyG zT?8oMlXIdrm#o%g^2`2G4H8zcKQ6(p+nDCOlTX_#7$JE*CM@3Qo~zv3GG6r4Lel(= z;HbxY!tJUigdf@0=-l;b9PjG7`lX)fx}Uh&a9eAZS8s0>TkTY|8$p5)WOb}$Wu?&N ziILZx8v(G<-|5e*$0jW!RjoX}4vih%o^5^MR3DWbLyoSm6{!wzTpqcJl5*L7Xot;n z9rV+YZ>!0{eamR{?u%7pTb-fD`z(B9-wi}(v3&?_>hM^Hm9R(ASf`bar|@UIQ;w%)7z71QOcWY<+bBJHlkd*I1VzJu@1v_>c=k`^fbxz{hx*#~b5 zI4D^rV{!0ou!2fyq`y!s>4JOrx2g{M5mOGSdw1RRROsG-)>pFvou}m zgzRg=dHedPit9?>%I;8{PWtX0cRp6M%|G$^`ZacAp!@VSmf4PCExFc7uzTr2um6}Ecz^1%}N!wl6ZwiqGyb4T9AO(DPWtFet+ zN18^uV}~AD=hmD~*mK;yvHr{F+(WDz>a`>0FofH&s%zzMA3OG4THaQ1^_i0BgO-Si z#vKKOtYt~UMA0uFos4r!?N!##aUL-x*2qmCd#nkK)=nq8#>^&K7(W8*Pu=OfVYj!n zDdNhT=-SIOXWcrxrqQFc;R>9Ul$+<_>fP9RHhFq~NsN=o)lpj-d1`g`Tfq72J0|xM z>~81BT&``0Go>1%9#Fns8g~e~*7y9^Yl-=Do2+&r8@I_!DV4qVj1)mnrZKe#$6k!j zIqdN^@7V89(YXm>Ec=g3w4C55!o z@8@Z2I}Oa_=fa57#&z+QZ;dj8Zd8)3^K@rs`N-7sXP>6uEi-IARvl>&tL@i& zF5=wjw}rN?@N+9MzYEy4wNKlQL{A}U*Zsce=VHhEe-Xa@{!B#hnmxUAq1rkopyk?< ztQE81m1crZ#bb5bJyQvj?iqf%=^bO=$!v5V9idQv>IKQv;TrPWjwH5X?Y=!n6h&Z9 zYgyFv#S!>r!9>e1qde%ioAK<28e)zXk{wk7jX2|^PxEop?59&dQ;1g-cx`4q-iluO zQMl=%&db&K6^b-eJa&9KI}us5jev2L%%rJ_Antj|;rUE$-1$?a1k=*)9I&ux(>dt* z0WhP6UD@SF+?IDN{r$H_A%!#P*`o>v4~O-&pVVkoj-dBmU$`Q7?DRs;2!&OHPR9Qr zZ(fNTWJ&PLdA?7oSQ>7BZ!z`kSO7}PeCoq<{cD?fl@yESC$AMbN$D831jwc@5Qw=c zU85-tVQaPToX3AR8s9L2ki867sFoDv-)UdnMmvgkX+I)XKk|6+_ATY{x!L97C6@N) z$erR=P0aYX3JYL?>w8Bi#AK}#i9PWwzbBi`7t{QYLwH~7)mLR;*biqA zFZbPf$#mxJZlTIJqk;^ChW7=YI5_rbBHt#*S5f#9LjEH?pQd_I$fUVPUTj=~a+O{( zpwY9X&Efi)&f?TF%^mzNC#qh|I#SvxQtTyS1aM%W!*(N|XyGNF?)`F$WjcmY zRQ*sMd7>0_#HC$ftU~SSpnfs*1s{tFmqrp*718;G<=DsokUTLUc zgu%^#ij99hdr=CF1rZ z@qV_G6R+#S1+j+W)7m~^gv#!lNl+jU*qC>pUUC1+qDj=@E%syg_A1YnUoGAm@D*G7 z?w*~WOC!0SIs!8lS3P-4J`+oYxFGi~>PnTBCDfZgh!%Q&*^H>J{sTb(Xp!+oqg4v*d6}V zBC-{Euzxh>C#9GVuJlIAi?=PfGIq{hosoPU@Lr0N^|qTFTz%{H#Y{!#X}6*G*X$J* zmKln-fcUj}Jrn1<4*`CR`V<$hHQqBaUV#K`*#H0|dp0RN5kU+9-zMF0Q* literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/oreganized/sounds/block/sepulcher_rotting_0.ogg b/src/main/resources/assets/oreganized/sounds/block/sepulcher_rotting_0.ogg new file mode 100644 index 0000000000000000000000000000000000000000..46e6b9ae42c999cb8ebc06c6900b2a092f4ab66d GIT binary patch literal 15112 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 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/oreganized/sounds/block/sepulcher_rotting_2.ogg b/src/main/resources/assets/oreganized/sounds/block/sepulcher_rotting_2.ogg new file mode 100644 index 0000000000000000000000000000000000000000..71e1049c5fd89292ed4753d98fce8fda3016a354 GIT binary patch literal 18200 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 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/oreganized/sounds/block/sepulcher_sealing.ogg b/src/main/resources/assets/oreganized/sounds/block/sepulcher_sealing.ogg new file mode 100644 index 0000000000000000000000000000000000000000..e96dfc645dd1fa63d55c58b557392d3f2468d20a GIT binary patch literal 9064 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 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/oreganized/sounds/block/sepulcher_step_0.ogg b/src/main/resources/assets/oreganized/sounds/block/sepulcher_step_0.ogg new file mode 100644 index 0000000000000000000000000000000000000000..79af8e763307b4f91fffe1c6ccce905232037486 GIT binary patch literal 8968 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 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/oreganized/sounds/block/sepulcher_step_1.ogg b/src/main/resources/assets/oreganized/sounds/block/sepulcher_step_1.ogg new file mode 100644 index 0000000000000000000000000000000000000000..e1819827ccd52e8f0d6b6f450289fae5563d4ea2 GIT binary patch literal 8974 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