From a8c0223c3e0a88f9523843ece25a5c6ca91d7d05 Mon Sep 17 00:00:00 2001 From: CallMeEchoCodes Date: Mon, 16 Dec 2024 19:23:01 +1100 Subject: [PATCH] chore: final cleanup! --- .../spiritstudios/hollow/HollowClient.java | 18 +- .../datagen/ClientBlockMetatagProvider.java | 8 +- .../hollow/blockstates/blue_wildflower.json | 160 ------------------ .../hollow/blockstates/pink_wildflower.json | 160 ------------------ .../hollow/blockstates/purple_wildflower.json | 160 ------------------ .../hollow/blockstates/white_wildflower.json | 160 ------------------ .../models/block/blue_wildflower_1.json | 7 - .../models/block/blue_wildflower_2.json | 7 - .../models/block/blue_wildflower_3.json | 7 - .../models/block/blue_wildflower_4.json | 7 - .../models/block/pink_wildflower_1.json | 7 - .../models/block/pink_wildflower_2.json | 7 - .../models/block/pink_wildflower_3.json | 7 - .../models/block/pink_wildflower_4.json | 7 - .../models/block/purple_wildflower_1.json | 7 - .../models/block/purple_wildflower_2.json | 7 - .../models/block/purple_wildflower_3.json | 7 - .../models/block/purple_wildflower_4.json | 7 - .../models/block/white_wildflower_1.json | 7 - .../models/block/white_wildflower_2.json | 7 - .../models/block/white_wildflower_3.json | 7 - .../models/block/white_wildflower_4.json | 7 - .../hollow/models/item/blue_wildflower.json | 6 - .../hollow/models/item/pink_wildflower.json | 6 - .../hollow/models/item/purple_wildflower.json | 6 - .../hollow/models/item/white_wildflower.json | 6 - .../minecraft/block/render_layer.json | 6 +- .../loot_table/blocks/blue_wildflower.json | 76 --------- .../loot_table/blocks/pink_wildflower.json | 76 --------- .../loot_table/blocks/purple_wildflower.json | 76 --------- .../loot_table/blocks/white_wildflower.json | 76 --------- .../hollow/HollowItemGroupAdditions.java | 14 +- .../hollow/block/StoneChestBlock.java | 2 +- .../block/entity/EchoingPotBlockEntity.java | 56 +----- .../block/entity/StoneChestBlockEntity.java | 8 +- .../hollow/datagen/LootTableProvider.java | 8 +- .../hollow/datagen/ModelProvider.java | 8 +- .../hollow/registry/HollowBlocks.java | 46 ++--- .../textures/block/echoing_pot_side.png | Bin 207 -> 0 bytes .../textures/block/echoing_pot_side_2.png | Bin 267 -> 0 bytes .../textures/block/echoing_pot_side_3.png | Bin 249 -> 0 bytes .../hollow/textures/block/echoing_pot_top.png | Bin 256 -> 0 bytes .../textures/block/stone_chest_double.png | Bin 4407 -> 0 bytes .../textures/block/stone_chest_lid_double.png | Bin 1342 -> 0 bytes 44 files changed, 65 insertions(+), 1189 deletions(-) delete mode 100644 src/main/generated/assets/hollow/blockstates/blue_wildflower.json delete mode 100644 src/main/generated/assets/hollow/blockstates/pink_wildflower.json delete mode 100644 src/main/generated/assets/hollow/blockstates/purple_wildflower.json delete mode 100644 src/main/generated/assets/hollow/blockstates/white_wildflower.json delete mode 100644 src/main/generated/assets/hollow/models/block/blue_wildflower_1.json delete mode 100644 src/main/generated/assets/hollow/models/block/blue_wildflower_2.json delete mode 100644 src/main/generated/assets/hollow/models/block/blue_wildflower_3.json delete mode 100644 src/main/generated/assets/hollow/models/block/blue_wildflower_4.json delete mode 100644 src/main/generated/assets/hollow/models/block/pink_wildflower_1.json delete mode 100644 src/main/generated/assets/hollow/models/block/pink_wildflower_2.json delete mode 100644 src/main/generated/assets/hollow/models/block/pink_wildflower_3.json delete mode 100644 src/main/generated/assets/hollow/models/block/pink_wildflower_4.json delete mode 100644 src/main/generated/assets/hollow/models/block/purple_wildflower_1.json delete mode 100644 src/main/generated/assets/hollow/models/block/purple_wildflower_2.json delete mode 100644 src/main/generated/assets/hollow/models/block/purple_wildflower_3.json delete mode 100644 src/main/generated/assets/hollow/models/block/purple_wildflower_4.json delete mode 100644 src/main/generated/assets/hollow/models/block/white_wildflower_1.json delete mode 100644 src/main/generated/assets/hollow/models/block/white_wildflower_2.json delete mode 100644 src/main/generated/assets/hollow/models/block/white_wildflower_3.json delete mode 100644 src/main/generated/assets/hollow/models/block/white_wildflower_4.json delete mode 100644 src/main/generated/assets/hollow/models/item/blue_wildflower.json delete mode 100644 src/main/generated/assets/hollow/models/item/pink_wildflower.json delete mode 100644 src/main/generated/assets/hollow/models/item/purple_wildflower.json delete mode 100644 src/main/generated/assets/hollow/models/item/white_wildflower.json delete mode 100644 src/main/generated/data/hollow/loot_table/blocks/blue_wildflower.json delete mode 100644 src/main/generated/data/hollow/loot_table/blocks/pink_wildflower.json delete mode 100644 src/main/generated/data/hollow/loot_table/blocks/purple_wildflower.json delete mode 100644 src/main/generated/data/hollow/loot_table/blocks/white_wildflower.json delete mode 100644 src/main/resources/assets/hollow/textures/block/echoing_pot_side.png delete mode 100644 src/main/resources/assets/hollow/textures/block/echoing_pot_side_2.png delete mode 100644 src/main/resources/assets/hollow/textures/block/echoing_pot_side_3.png delete mode 100644 src/main/resources/assets/hollow/textures/block/echoing_pot_top.png delete mode 100644 src/main/resources/assets/hollow/textures/block/stone_chest_double.png delete mode 100644 src/main/resources/assets/hollow/textures/block/stone_chest_lid_double.png diff --git a/src/client/java/dev/spiritstudios/hollow/HollowClient.java b/src/client/java/dev/spiritstudios/hollow/HollowClient.java index 3df6c2a..7657730 100644 --- a/src/client/java/dev/spiritstudios/hollow/HollowClient.java +++ b/src/client/java/dev/spiritstudios/hollow/HollowClient.java @@ -51,15 +51,15 @@ public void onInitializeClient() { ); - ColorProviderRegistry.BLOCK.register((state, world, pos, tintIndex) -> - tintIndex != 0 ? - world != null && pos != null ? BiomeColors.getGrassColor(world, pos) : GrassColors.getDefaultColor() : - -1, - HollowBlocks.BLUE_WILDFLOWER, - HollowBlocks.WHITE_WILDFLOWER, - HollowBlocks.PURPLE_WILDFLOWER, - HollowBlocks.PINK_WILDFLOWER - ); +// ColorProviderRegistry.BLOCK.register((state, world, pos, tintIndex) -> +// tintIndex != 0 ? +// world != null && pos != null ? BiomeColors.getGrassColor(world, pos) : GrassColors.getDefaultColor() : +// -1, +// HollowBlocks.BLUE_WILDFLOWER, +// HollowBlocks.WHITE_WILDFLOWER, +// HollowBlocks.PURPLE_WILDFLOWER, +// HollowBlocks.PINK_WILDFLOWER +// ); // endregion // region Block Entity Renderers diff --git a/src/client/java/dev/spiritstudios/hollow/datagen/ClientBlockMetatagProvider.java b/src/client/java/dev/spiritstudios/hollow/datagen/ClientBlockMetatagProvider.java index 661509c..94d86a9 100644 --- a/src/client/java/dev/spiritstudios/hollow/datagen/ClientBlockMetatagProvider.java +++ b/src/client/java/dev/spiritstudios/hollow/datagen/ClientBlockMetatagProvider.java @@ -29,10 +29,10 @@ protected void configure(Consumer> provider, RegistryWr ).forEach(pair -> renderLayer.put(pair.value(), BlockRenderLayer.CUTOUT_MIPPED)); - renderLayer.put(HollowBlocks.BLUE_WILDFLOWER, BlockRenderLayer.CUTOUT); - renderLayer.put(HollowBlocks.WHITE_WILDFLOWER, BlockRenderLayer.CUTOUT); - renderLayer.put(HollowBlocks.PURPLE_WILDFLOWER, BlockRenderLayer.CUTOUT); - renderLayer.put(HollowBlocks.PINK_WILDFLOWER, BlockRenderLayer.CUTOUT); +// renderLayer.put(HollowBlocks.BLUE_WILDFLOWER, BlockRenderLayer.CUTOUT); +// renderLayer.put(HollowBlocks.WHITE_WILDFLOWER, BlockRenderLayer.CUTOUT); +// renderLayer.put(HollowBlocks.PURPLE_WILDFLOWER, BlockRenderLayer.CUTOUT); +// renderLayer.put(HollowBlocks.PINK_WILDFLOWER, BlockRenderLayer.CUTOUT); renderLayer.put(HollowBlocks.PAEONIA, BlockRenderLayer.CUTOUT); renderLayer.put(HollowBlocks.POTTED_PAEONIA, BlockRenderLayer.CUTOUT); renderLayer.put(HollowBlocks.ROOTED_ORCHID, BlockRenderLayer.CUTOUT); diff --git a/src/main/generated/assets/hollow/blockstates/blue_wildflower.json b/src/main/generated/assets/hollow/blockstates/blue_wildflower.json deleted file mode 100644 index ed780b8..0000000 --- a/src/main/generated/assets/hollow/blockstates/blue_wildflower.json +++ /dev/null @@ -1,160 +0,0 @@ -{ - "multipart": [ - { - "apply": { - "model": "hollow:block/blue_wildflower_1" - }, - "when": { - "facing": "north", - "flower_amount": "1|2|3|4" - } - }, - { - "apply": { - "model": "hollow:block/blue_wildflower_1", - "y": 90 - }, - "when": { - "facing": "east", - "flower_amount": "1|2|3|4" - } - }, - { - "apply": { - "model": "hollow:block/blue_wildflower_1", - "y": 180 - }, - "when": { - "facing": "south", - "flower_amount": "1|2|3|4" - } - }, - { - "apply": { - "model": "hollow:block/blue_wildflower_1", - "y": 270 - }, - "when": { - "facing": "west", - "flower_amount": "1|2|3|4" - } - }, - { - "apply": { - "model": "hollow:block/blue_wildflower_2" - }, - "when": { - "facing": "north", - "flower_amount": "2|3|4" - } - }, - { - "apply": { - "model": "hollow:block/blue_wildflower_2", - "y": 90 - }, - "when": { - "facing": "east", - "flower_amount": "2|3|4" - } - }, - { - "apply": { - "model": "hollow:block/blue_wildflower_2", - "y": 180 - }, - "when": { - "facing": "south", - "flower_amount": "2|3|4" - } - }, - { - "apply": { - "model": "hollow:block/blue_wildflower_2", - "y": 270 - }, - "when": { - "facing": "west", - "flower_amount": "2|3|4" - } - }, - { - "apply": { - "model": "hollow:block/blue_wildflower_3" - }, - "when": { - "facing": "north", - "flower_amount": "3|4" - } - }, - { - "apply": { - "model": "hollow:block/blue_wildflower_3", - "y": 90 - }, - "when": { - "facing": "east", - "flower_amount": "3|4" - } - }, - { - "apply": { - "model": "hollow:block/blue_wildflower_3", - "y": 180 - }, - "when": { - "facing": "south", - "flower_amount": "3|4" - } - }, - { - "apply": { - "model": "hollow:block/blue_wildflower_3", - "y": 270 - }, - "when": { - "facing": "west", - "flower_amount": "3|4" - } - }, - { - "apply": { - "model": "hollow:block/blue_wildflower_4" - }, - "when": { - "facing": "north", - "flower_amount": "4" - } - }, - { - "apply": { - "model": "hollow:block/blue_wildflower_4", - "y": 90 - }, - "when": { - "facing": "east", - "flower_amount": "4" - } - }, - { - "apply": { - "model": "hollow:block/blue_wildflower_4", - "y": 180 - }, - "when": { - "facing": "south", - "flower_amount": "4" - } - }, - { - "apply": { - "model": "hollow:block/blue_wildflower_4", - "y": 270 - }, - "when": { - "facing": "west", - "flower_amount": "4" - } - } - ] -} \ No newline at end of file diff --git a/src/main/generated/assets/hollow/blockstates/pink_wildflower.json b/src/main/generated/assets/hollow/blockstates/pink_wildflower.json deleted file mode 100644 index 32e65bd..0000000 --- a/src/main/generated/assets/hollow/blockstates/pink_wildflower.json +++ /dev/null @@ -1,160 +0,0 @@ -{ - "multipart": [ - { - "apply": { - "model": "hollow:block/pink_wildflower_1" - }, - "when": { - "facing": "north", - "flower_amount": "1|2|3|4" - } - }, - { - "apply": { - "model": "hollow:block/pink_wildflower_1", - "y": 90 - }, - "when": { - "facing": "east", - "flower_amount": "1|2|3|4" - } - }, - { - "apply": { - "model": "hollow:block/pink_wildflower_1", - "y": 180 - }, - "when": { - "facing": "south", - "flower_amount": "1|2|3|4" - } - }, - { - "apply": { - "model": "hollow:block/pink_wildflower_1", - "y": 270 - }, - "when": { - "facing": "west", - "flower_amount": "1|2|3|4" - } - }, - { - "apply": { - "model": "hollow:block/pink_wildflower_2" - }, - "when": { - "facing": "north", - "flower_amount": "2|3|4" - } - }, - { - "apply": { - "model": "hollow:block/pink_wildflower_2", - "y": 90 - }, - "when": { - "facing": "east", - "flower_amount": "2|3|4" - } - }, - { - "apply": { - "model": "hollow:block/pink_wildflower_2", - "y": 180 - }, - "when": { - "facing": "south", - "flower_amount": "2|3|4" - } - }, - { - "apply": { - "model": "hollow:block/pink_wildflower_2", - "y": 270 - }, - "when": { - "facing": "west", - "flower_amount": "2|3|4" - } - }, - { - "apply": { - "model": "hollow:block/pink_wildflower_3" - }, - "when": { - "facing": "north", - "flower_amount": "3|4" - } - }, - { - "apply": { - "model": "hollow:block/pink_wildflower_3", - "y": 90 - }, - "when": { - "facing": "east", - "flower_amount": "3|4" - } - }, - { - "apply": { - "model": "hollow:block/pink_wildflower_3", - "y": 180 - }, - "when": { - "facing": "south", - "flower_amount": "3|4" - } - }, - { - "apply": { - "model": "hollow:block/pink_wildflower_3", - "y": 270 - }, - "when": { - "facing": "west", - "flower_amount": "3|4" - } - }, - { - "apply": { - "model": "hollow:block/pink_wildflower_4" - }, - "when": { - "facing": "north", - "flower_amount": "4" - } - }, - { - "apply": { - "model": "hollow:block/pink_wildflower_4", - "y": 90 - }, - "when": { - "facing": "east", - "flower_amount": "4" - } - }, - { - "apply": { - "model": "hollow:block/pink_wildflower_4", - "y": 180 - }, - "when": { - "facing": "south", - "flower_amount": "4" - } - }, - { - "apply": { - "model": "hollow:block/pink_wildflower_4", - "y": 270 - }, - "when": { - "facing": "west", - "flower_amount": "4" - } - } - ] -} \ No newline at end of file diff --git a/src/main/generated/assets/hollow/blockstates/purple_wildflower.json b/src/main/generated/assets/hollow/blockstates/purple_wildflower.json deleted file mode 100644 index 0222cfe..0000000 --- a/src/main/generated/assets/hollow/blockstates/purple_wildflower.json +++ /dev/null @@ -1,160 +0,0 @@ -{ - "multipart": [ - { - "apply": { - "model": "hollow:block/purple_wildflower_1" - }, - "when": { - "facing": "north", - "flower_amount": "1|2|3|4" - } - }, - { - "apply": { - "model": "hollow:block/purple_wildflower_1", - "y": 90 - }, - "when": { - "facing": "east", - "flower_amount": "1|2|3|4" - } - }, - { - "apply": { - "model": "hollow:block/purple_wildflower_1", - "y": 180 - }, - "when": { - "facing": "south", - "flower_amount": "1|2|3|4" - } - }, - { - "apply": { - "model": "hollow:block/purple_wildflower_1", - "y": 270 - }, - "when": { - "facing": "west", - "flower_amount": "1|2|3|4" - } - }, - { - "apply": { - "model": "hollow:block/purple_wildflower_2" - }, - "when": { - "facing": "north", - "flower_amount": "2|3|4" - } - }, - { - "apply": { - "model": "hollow:block/purple_wildflower_2", - "y": 90 - }, - "when": { - "facing": "east", - "flower_amount": "2|3|4" - } - }, - { - "apply": { - "model": "hollow:block/purple_wildflower_2", - "y": 180 - }, - "when": { - "facing": "south", - "flower_amount": "2|3|4" - } - }, - { - "apply": { - "model": "hollow:block/purple_wildflower_2", - "y": 270 - }, - "when": { - "facing": "west", - "flower_amount": "2|3|4" - } - }, - { - "apply": { - "model": "hollow:block/purple_wildflower_3" - }, - "when": { - "facing": "north", - "flower_amount": "3|4" - } - }, - { - "apply": { - "model": "hollow:block/purple_wildflower_3", - "y": 90 - }, - "when": { - "facing": "east", - "flower_amount": "3|4" - } - }, - { - "apply": { - "model": "hollow:block/purple_wildflower_3", - "y": 180 - }, - "when": { - "facing": "south", - "flower_amount": "3|4" - } - }, - { - "apply": { - "model": "hollow:block/purple_wildflower_3", - "y": 270 - }, - "when": { - "facing": "west", - "flower_amount": "3|4" - } - }, - { - "apply": { - "model": "hollow:block/purple_wildflower_4" - }, - "when": { - "facing": "north", - "flower_amount": "4" - } - }, - { - "apply": { - "model": "hollow:block/purple_wildflower_4", - "y": 90 - }, - "when": { - "facing": "east", - "flower_amount": "4" - } - }, - { - "apply": { - "model": "hollow:block/purple_wildflower_4", - "y": 180 - }, - "when": { - "facing": "south", - "flower_amount": "4" - } - }, - { - "apply": { - "model": "hollow:block/purple_wildflower_4", - "y": 270 - }, - "when": { - "facing": "west", - "flower_amount": "4" - } - } - ] -} \ No newline at end of file diff --git a/src/main/generated/assets/hollow/blockstates/white_wildflower.json b/src/main/generated/assets/hollow/blockstates/white_wildflower.json deleted file mode 100644 index 938c45d..0000000 --- a/src/main/generated/assets/hollow/blockstates/white_wildflower.json +++ /dev/null @@ -1,160 +0,0 @@ -{ - "multipart": [ - { - "apply": { - "model": "hollow:block/white_wildflower_1" - }, - "when": { - "facing": "north", - "flower_amount": "1|2|3|4" - } - }, - { - "apply": { - "model": "hollow:block/white_wildflower_1", - "y": 90 - }, - "when": { - "facing": "east", - "flower_amount": "1|2|3|4" - } - }, - { - "apply": { - "model": "hollow:block/white_wildflower_1", - "y": 180 - }, - "when": { - "facing": "south", - "flower_amount": "1|2|3|4" - } - }, - { - "apply": { - "model": "hollow:block/white_wildflower_1", - "y": 270 - }, - "when": { - "facing": "west", - "flower_amount": "1|2|3|4" - } - }, - { - "apply": { - "model": "hollow:block/white_wildflower_2" - }, - "when": { - "facing": "north", - "flower_amount": "2|3|4" - } - }, - { - "apply": { - "model": "hollow:block/white_wildflower_2", - "y": 90 - }, - "when": { - "facing": "east", - "flower_amount": "2|3|4" - } - }, - { - "apply": { - "model": "hollow:block/white_wildflower_2", - "y": 180 - }, - "when": { - "facing": "south", - "flower_amount": "2|3|4" - } - }, - { - "apply": { - "model": "hollow:block/white_wildflower_2", - "y": 270 - }, - "when": { - "facing": "west", - "flower_amount": "2|3|4" - } - }, - { - "apply": { - "model": "hollow:block/white_wildflower_3" - }, - "when": { - "facing": "north", - "flower_amount": "3|4" - } - }, - { - "apply": { - "model": "hollow:block/white_wildflower_3", - "y": 90 - }, - "when": { - "facing": "east", - "flower_amount": "3|4" - } - }, - { - "apply": { - "model": "hollow:block/white_wildflower_3", - "y": 180 - }, - "when": { - "facing": "south", - "flower_amount": "3|4" - } - }, - { - "apply": { - "model": "hollow:block/white_wildflower_3", - "y": 270 - }, - "when": { - "facing": "west", - "flower_amount": "3|4" - } - }, - { - "apply": { - "model": "hollow:block/white_wildflower_4" - }, - "when": { - "facing": "north", - "flower_amount": "4" - } - }, - { - "apply": { - "model": "hollow:block/white_wildflower_4", - "y": 90 - }, - "when": { - "facing": "east", - "flower_amount": "4" - } - }, - { - "apply": { - "model": "hollow:block/white_wildflower_4", - "y": 180 - }, - "when": { - "facing": "south", - "flower_amount": "4" - } - }, - { - "apply": { - "model": "hollow:block/white_wildflower_4", - "y": 270 - }, - "when": { - "facing": "west", - "flower_amount": "4" - } - } - ] -} \ No newline at end of file diff --git a/src/main/generated/assets/hollow/models/block/blue_wildflower_1.json b/src/main/generated/assets/hollow/models/block/blue_wildflower_1.json deleted file mode 100644 index 6ec6cb1..0000000 --- a/src/main/generated/assets/hollow/models/block/blue_wildflower_1.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:block/flowerbed_1", - "textures": { - "flowerbed": "hollow:block/blue_wildflower", - "stem": "minecraft:block/pink_petals_stem" - } -} \ No newline at end of file diff --git a/src/main/generated/assets/hollow/models/block/blue_wildflower_2.json b/src/main/generated/assets/hollow/models/block/blue_wildflower_2.json deleted file mode 100644 index 81405be..0000000 --- a/src/main/generated/assets/hollow/models/block/blue_wildflower_2.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:block/flowerbed_2", - "textures": { - "flowerbed": "hollow:block/blue_wildflower", - "stem": "minecraft:block/pink_petals_stem" - } -} \ No newline at end of file diff --git a/src/main/generated/assets/hollow/models/block/blue_wildflower_3.json b/src/main/generated/assets/hollow/models/block/blue_wildflower_3.json deleted file mode 100644 index 35b8748..0000000 --- a/src/main/generated/assets/hollow/models/block/blue_wildflower_3.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:block/flowerbed_3", - "textures": { - "flowerbed": "hollow:block/blue_wildflower", - "stem": "minecraft:block/pink_petals_stem" - } -} \ No newline at end of file diff --git a/src/main/generated/assets/hollow/models/block/blue_wildflower_4.json b/src/main/generated/assets/hollow/models/block/blue_wildflower_4.json deleted file mode 100644 index e85fcd7..0000000 --- a/src/main/generated/assets/hollow/models/block/blue_wildflower_4.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:block/flowerbed_4", - "textures": { - "flowerbed": "hollow:block/blue_wildflower", - "stem": "minecraft:block/pink_petals_stem" - } -} \ No newline at end of file diff --git a/src/main/generated/assets/hollow/models/block/pink_wildflower_1.json b/src/main/generated/assets/hollow/models/block/pink_wildflower_1.json deleted file mode 100644 index 0fbbd27..0000000 --- a/src/main/generated/assets/hollow/models/block/pink_wildflower_1.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:block/flowerbed_1", - "textures": { - "flowerbed": "hollow:block/pink_wildflower", - "stem": "minecraft:block/pink_petals_stem" - } -} \ No newline at end of file diff --git a/src/main/generated/assets/hollow/models/block/pink_wildflower_2.json b/src/main/generated/assets/hollow/models/block/pink_wildflower_2.json deleted file mode 100644 index f1f63f0..0000000 --- a/src/main/generated/assets/hollow/models/block/pink_wildflower_2.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:block/flowerbed_2", - "textures": { - "flowerbed": "hollow:block/pink_wildflower", - "stem": "minecraft:block/pink_petals_stem" - } -} \ No newline at end of file diff --git a/src/main/generated/assets/hollow/models/block/pink_wildflower_3.json b/src/main/generated/assets/hollow/models/block/pink_wildflower_3.json deleted file mode 100644 index dfa4a1a..0000000 --- a/src/main/generated/assets/hollow/models/block/pink_wildflower_3.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:block/flowerbed_3", - "textures": { - "flowerbed": "hollow:block/pink_wildflower", - "stem": "minecraft:block/pink_petals_stem" - } -} \ No newline at end of file diff --git a/src/main/generated/assets/hollow/models/block/pink_wildflower_4.json b/src/main/generated/assets/hollow/models/block/pink_wildflower_4.json deleted file mode 100644 index c3f0510..0000000 --- a/src/main/generated/assets/hollow/models/block/pink_wildflower_4.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:block/flowerbed_4", - "textures": { - "flowerbed": "hollow:block/pink_wildflower", - "stem": "minecraft:block/pink_petals_stem" - } -} \ No newline at end of file diff --git a/src/main/generated/assets/hollow/models/block/purple_wildflower_1.json b/src/main/generated/assets/hollow/models/block/purple_wildflower_1.json deleted file mode 100644 index 1fe0d02..0000000 --- a/src/main/generated/assets/hollow/models/block/purple_wildflower_1.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:block/flowerbed_1", - "textures": { - "flowerbed": "hollow:block/purple_wildflower", - "stem": "minecraft:block/pink_petals_stem" - } -} \ No newline at end of file diff --git a/src/main/generated/assets/hollow/models/block/purple_wildflower_2.json b/src/main/generated/assets/hollow/models/block/purple_wildflower_2.json deleted file mode 100644 index 7e39e82..0000000 --- a/src/main/generated/assets/hollow/models/block/purple_wildflower_2.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:block/flowerbed_2", - "textures": { - "flowerbed": "hollow:block/purple_wildflower", - "stem": "minecraft:block/pink_petals_stem" - } -} \ No newline at end of file diff --git a/src/main/generated/assets/hollow/models/block/purple_wildflower_3.json b/src/main/generated/assets/hollow/models/block/purple_wildflower_3.json deleted file mode 100644 index d383e84..0000000 --- a/src/main/generated/assets/hollow/models/block/purple_wildflower_3.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:block/flowerbed_3", - "textures": { - "flowerbed": "hollow:block/purple_wildflower", - "stem": "minecraft:block/pink_petals_stem" - } -} \ No newline at end of file diff --git a/src/main/generated/assets/hollow/models/block/purple_wildflower_4.json b/src/main/generated/assets/hollow/models/block/purple_wildflower_4.json deleted file mode 100644 index 92cc233..0000000 --- a/src/main/generated/assets/hollow/models/block/purple_wildflower_4.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:block/flowerbed_4", - "textures": { - "flowerbed": "hollow:block/purple_wildflower", - "stem": "minecraft:block/pink_petals_stem" - } -} \ No newline at end of file diff --git a/src/main/generated/assets/hollow/models/block/white_wildflower_1.json b/src/main/generated/assets/hollow/models/block/white_wildflower_1.json deleted file mode 100644 index 12f65fa..0000000 --- a/src/main/generated/assets/hollow/models/block/white_wildflower_1.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:block/flowerbed_1", - "textures": { - "flowerbed": "hollow:block/white_wildflower", - "stem": "minecraft:block/pink_petals_stem" - } -} \ No newline at end of file diff --git a/src/main/generated/assets/hollow/models/block/white_wildflower_2.json b/src/main/generated/assets/hollow/models/block/white_wildflower_2.json deleted file mode 100644 index 47637d2..0000000 --- a/src/main/generated/assets/hollow/models/block/white_wildflower_2.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:block/flowerbed_2", - "textures": { - "flowerbed": "hollow:block/white_wildflower", - "stem": "minecraft:block/pink_petals_stem" - } -} \ No newline at end of file diff --git a/src/main/generated/assets/hollow/models/block/white_wildflower_3.json b/src/main/generated/assets/hollow/models/block/white_wildflower_3.json deleted file mode 100644 index 49a6e91..0000000 --- a/src/main/generated/assets/hollow/models/block/white_wildflower_3.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:block/flowerbed_3", - "textures": { - "flowerbed": "hollow:block/white_wildflower", - "stem": "minecraft:block/pink_petals_stem" - } -} \ No newline at end of file diff --git a/src/main/generated/assets/hollow/models/block/white_wildflower_4.json b/src/main/generated/assets/hollow/models/block/white_wildflower_4.json deleted file mode 100644 index 0ae27f6..0000000 --- a/src/main/generated/assets/hollow/models/block/white_wildflower_4.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:block/flowerbed_4", - "textures": { - "flowerbed": "hollow:block/white_wildflower", - "stem": "minecraft:block/pink_petals_stem" - } -} \ No newline at end of file diff --git a/src/main/generated/assets/hollow/models/item/blue_wildflower.json b/src/main/generated/assets/hollow/models/item/blue_wildflower.json deleted file mode 100644 index 4694514..0000000 --- a/src/main/generated/assets/hollow/models/item/blue_wildflower.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "hollow:item/blue_wildflower" - } -} \ No newline at end of file diff --git a/src/main/generated/assets/hollow/models/item/pink_wildflower.json b/src/main/generated/assets/hollow/models/item/pink_wildflower.json deleted file mode 100644 index d61827e..0000000 --- a/src/main/generated/assets/hollow/models/item/pink_wildflower.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "hollow:item/pink_wildflower" - } -} \ No newline at end of file diff --git a/src/main/generated/assets/hollow/models/item/purple_wildflower.json b/src/main/generated/assets/hollow/models/item/purple_wildflower.json deleted file mode 100644 index e0d0795..0000000 --- a/src/main/generated/assets/hollow/models/item/purple_wildflower.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "hollow:item/purple_wildflower" - } -} \ No newline at end of file diff --git a/src/main/generated/assets/hollow/models/item/white_wildflower.json b/src/main/generated/assets/hollow/models/item/white_wildflower.json deleted file mode 100644 index 23e0540..0000000 --- a/src/main/generated/assets/hollow/models/item/white_wildflower.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "hollow:item/white_wildflower" - } -} \ No newline at end of file diff --git a/src/main/generated/assets/specter/metatags/minecraft/block/render_layer.json b/src/main/generated/assets/specter/metatags/minecraft/block/render_layer.json index 8085b6c..4a7ed5f 100644 --- a/src/main/generated/assets/specter/metatags/minecraft/block/render_layer.json +++ b/src/main/generated/assets/specter/metatags/minecraft/block/render_layer.json @@ -2,7 +2,6 @@ "values": { "hollow:acacia_hollow_log": "cutout_mipped", "hollow:birch_hollow_log": "cutout_mipped", - "hollow:blue_wildflower": "cutout", "hollow:campion": "cutout", "hollow:cattail": "cutout", "hollow:cattail_stem": "cutout", @@ -17,11 +16,9 @@ "hollow:mangrove_hollow_log": "cutout_mipped", "hollow:oak_hollow_log": "cutout_mipped", "hollow:paeonia": "cutout", - "hollow:pink_wildflower": "cutout", "hollow:polypore": "cutout", "hollow:potted_paeonia": "cutout", "hollow:potted_rooted_orchid": "cutout", - "hollow:purple_wildflower": "cutout", "hollow:rooted_orchid": "cutout", "hollow:spruce_hollow_log": "cutout_mipped", "hollow:stripped_acacia_hollow_log": "cutout_mipped", @@ -35,7 +32,6 @@ "hollow:stripped_spruce_hollow_log": "cutout_mipped", "hollow:stripped_warped_hollow_stem": "cutout_mipped", "hollow:twig": "cutout", - "hollow:warped_hollow_stem": "cutout_mipped", - "hollow:white_wildflower": "cutout" + "hollow:warped_hollow_stem": "cutout_mipped" } } \ No newline at end of file diff --git a/src/main/generated/data/hollow/loot_table/blocks/blue_wildflower.json b/src/main/generated/data/hollow/loot_table/blocks/blue_wildflower.json deleted file mode 100644 index 3d0faa3..0000000 --- a/src/main/generated/data/hollow/loot_table/blocks/blue_wildflower.json +++ /dev/null @@ -1,76 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "bonus_rolls": 0.0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "add": false, - "conditions": [ - { - "block": "hollow:blue_wildflower", - "condition": "minecraft:block_state_property", - "properties": { - "flower_amount": "1" - } - } - ], - "count": 1.0, - "function": "minecraft:set_count" - }, - { - "add": false, - "conditions": [ - { - "block": "hollow:blue_wildflower", - "condition": "minecraft:block_state_property", - "properties": { - "flower_amount": "2" - } - } - ], - "count": 2.0, - "function": "minecraft:set_count" - }, - { - "add": false, - "conditions": [ - { - "block": "hollow:blue_wildflower", - "condition": "minecraft:block_state_property", - "properties": { - "flower_amount": "3" - } - } - ], - "count": 3.0, - "function": "minecraft:set_count" - }, - { - "add": false, - "conditions": [ - { - "block": "hollow:blue_wildflower", - "condition": "minecraft:block_state_property", - "properties": { - "flower_amount": "4" - } - } - ], - "count": 4.0, - "function": "minecraft:set_count" - }, - { - "function": "minecraft:explosion_decay" - } - ], - "name": "hollow:blue_wildflower" - } - ], - "rolls": 1.0 - } - ] -} \ No newline at end of file diff --git a/src/main/generated/data/hollow/loot_table/blocks/pink_wildflower.json b/src/main/generated/data/hollow/loot_table/blocks/pink_wildflower.json deleted file mode 100644 index c803343..0000000 --- a/src/main/generated/data/hollow/loot_table/blocks/pink_wildflower.json +++ /dev/null @@ -1,76 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "bonus_rolls": 0.0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "add": false, - "conditions": [ - { - "block": "hollow:pink_wildflower", - "condition": "minecraft:block_state_property", - "properties": { - "flower_amount": "1" - } - } - ], - "count": 1.0, - "function": "minecraft:set_count" - }, - { - "add": false, - "conditions": [ - { - "block": "hollow:pink_wildflower", - "condition": "minecraft:block_state_property", - "properties": { - "flower_amount": "2" - } - } - ], - "count": 2.0, - "function": "minecraft:set_count" - }, - { - "add": false, - "conditions": [ - { - "block": "hollow:pink_wildflower", - "condition": "minecraft:block_state_property", - "properties": { - "flower_amount": "3" - } - } - ], - "count": 3.0, - "function": "minecraft:set_count" - }, - { - "add": false, - "conditions": [ - { - "block": "hollow:pink_wildflower", - "condition": "minecraft:block_state_property", - "properties": { - "flower_amount": "4" - } - } - ], - "count": 4.0, - "function": "minecraft:set_count" - }, - { - "function": "minecraft:explosion_decay" - } - ], - "name": "hollow:pink_wildflower" - } - ], - "rolls": 1.0 - } - ] -} \ No newline at end of file diff --git a/src/main/generated/data/hollow/loot_table/blocks/purple_wildflower.json b/src/main/generated/data/hollow/loot_table/blocks/purple_wildflower.json deleted file mode 100644 index 65e5359..0000000 --- a/src/main/generated/data/hollow/loot_table/blocks/purple_wildflower.json +++ /dev/null @@ -1,76 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "bonus_rolls": 0.0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "add": false, - "conditions": [ - { - "block": "hollow:purple_wildflower", - "condition": "minecraft:block_state_property", - "properties": { - "flower_amount": "1" - } - } - ], - "count": 1.0, - "function": "minecraft:set_count" - }, - { - "add": false, - "conditions": [ - { - "block": "hollow:purple_wildflower", - "condition": "minecraft:block_state_property", - "properties": { - "flower_amount": "2" - } - } - ], - "count": 2.0, - "function": "minecraft:set_count" - }, - { - "add": false, - "conditions": [ - { - "block": "hollow:purple_wildflower", - "condition": "minecraft:block_state_property", - "properties": { - "flower_amount": "3" - } - } - ], - "count": 3.0, - "function": "minecraft:set_count" - }, - { - "add": false, - "conditions": [ - { - "block": "hollow:purple_wildflower", - "condition": "minecraft:block_state_property", - "properties": { - "flower_amount": "4" - } - } - ], - "count": 4.0, - "function": "minecraft:set_count" - }, - { - "function": "minecraft:explosion_decay" - } - ], - "name": "hollow:purple_wildflower" - } - ], - "rolls": 1.0 - } - ] -} \ No newline at end of file diff --git a/src/main/generated/data/hollow/loot_table/blocks/white_wildflower.json b/src/main/generated/data/hollow/loot_table/blocks/white_wildflower.json deleted file mode 100644 index 7f99bca..0000000 --- a/src/main/generated/data/hollow/loot_table/blocks/white_wildflower.json +++ /dev/null @@ -1,76 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "bonus_rolls": 0.0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "add": false, - "conditions": [ - { - "block": "hollow:white_wildflower", - "condition": "minecraft:block_state_property", - "properties": { - "flower_amount": "1" - } - } - ], - "count": 1.0, - "function": "minecraft:set_count" - }, - { - "add": false, - "conditions": [ - { - "block": "hollow:white_wildflower", - "condition": "minecraft:block_state_property", - "properties": { - "flower_amount": "2" - } - } - ], - "count": 2.0, - "function": "minecraft:set_count" - }, - { - "add": false, - "conditions": [ - { - "block": "hollow:white_wildflower", - "condition": "minecraft:block_state_property", - "properties": { - "flower_amount": "3" - } - } - ], - "count": 3.0, - "function": "minecraft:set_count" - }, - { - "add": false, - "conditions": [ - { - "block": "hollow:white_wildflower", - "condition": "minecraft:block_state_property", - "properties": { - "flower_amount": "4" - } - } - ], - "count": 4.0, - "function": "minecraft:set_count" - }, - { - "function": "minecraft:explosion_decay" - } - ], - "name": "hollow:white_wildflower" - } - ], - "rolls": 1.0 - } - ] -} \ No newline at end of file diff --git a/src/main/java/dev/spiritstudios/hollow/HollowItemGroupAdditions.java b/src/main/java/dev/spiritstudios/hollow/HollowItemGroupAdditions.java index e23f505..2a81641 100644 --- a/src/main/java/dev/spiritstudios/hollow/HollowItemGroupAdditions.java +++ b/src/main/java/dev/spiritstudios/hollow/HollowItemGroupAdditions.java @@ -28,13 +28,13 @@ public static void init() { baseToHollow.forEach(helper::addAfter); - helper.addAfter( - Items.PINK_PETALS, - HollowBlocks.PINK_WILDFLOWER, - HollowBlocks.PURPLE_WILDFLOWER, - HollowBlocks.BLUE_WILDFLOWER, - HollowBlocks.WHITE_WILDFLOWER - ); +// helper.addAfter( +// Items.PINK_PETALS, +// HollowBlocks.PINK_WILDFLOWER, +// HollowBlocks.PURPLE_WILDFLOWER, +// HollowBlocks.BLUE_WILDFLOWER, +// HollowBlocks.WHITE_WILDFLOWER +// ); helper.addAfter(Items.ALLIUM, HollowBlocks.PAEONIA); helper.addAfter(Items.BLUE_ORCHID, HollowBlocks.ROOTED_ORCHID); helper.addAfter(Items.PEONY, HollowBlocks.CAMPION); diff --git a/src/main/java/dev/spiritstudios/hollow/block/StoneChestBlock.java b/src/main/java/dev/spiritstudios/hollow/block/StoneChestBlock.java index 26ebabf..ff89991 100644 --- a/src/main/java/dev/spiritstudios/hollow/block/StoneChestBlock.java +++ b/src/main/java/dev/spiritstudios/hollow/block/StoneChestBlock.java @@ -163,7 +163,7 @@ && getFacing(neighborState) == direction.getOpposite()) { @Override protected ItemActionResult onUseWithItem(ItemStack stack, BlockState state, World world, BlockPos pos, PlayerEntity player, Hand hand, BlockHitResult hit) { - if (world.isClient) return ItemActionResult.SUCCESS; + if (world.isClient) return ItemActionResult.PASS_TO_DEFAULT_BLOCK_INTERACTION; StoneChestBlockEntity blockEntity = (StoneChestBlockEntity) world.getBlockEntity(pos); return Objects.requireNonNull(blockEntity).use(player, hand, hit.getSide()); diff --git a/src/main/java/dev/spiritstudios/hollow/block/entity/EchoingPotBlockEntity.java b/src/main/java/dev/spiritstudios/hollow/block/entity/EchoingPotBlockEntity.java index 410ed17..6459d9e 100644 --- a/src/main/java/dev/spiritstudios/hollow/block/entity/EchoingPotBlockEntity.java +++ b/src/main/java/dev/spiritstudios/hollow/block/entity/EchoingPotBlockEntity.java @@ -39,62 +39,22 @@ public EchoingPotBlockEntity(BlockPos pos, BlockState state) { } public static void tick(World world, BlockPos pos, BlockState state, EchoingPotBlockEntity blockEntity) { - if (blockEntity.activeTime <= 0) return; - if (!world.isClient) { - blockEntity.activeTime--; - blockEntity.markDirty(); - world.updateListeners(pos, state, state, Block.NOTIFY_LISTENERS); - - List wardens = world.getEntitiesByClass( - WardenEntity.class, - Box.from(pos.toCenterPos()).expand(16), - warden -> true - ); - - wardens.forEach(warden -> { - WardenAngerManager angerManager = warden.getAngerManager(); - - Optional target = angerManager.getPrimeSuspect(); - if (target.isEmpty()) return; - - angerManager.removeSuspect(target.get()); - }); - } else { - Random random = world.getRandom(); - for (int i = 0; i < 2; ++i) { - float x = 2.0F * random.nextFloat() - 1.0F; - float y = 2.0F * random.nextFloat() - 1.0F; - float z = 2.0F * random.nextFloat() - 1.0F; - world.addParticle( - ParticleTypes.SCULK_SOUL, - (double) pos.getX() + 0.5 + (x * 0.25), - (double) pos.getY() + 1, - (double) pos.getZ() + 0.5 + (z * 0.25), - (x * 0.0075F), - (y * 0.075F), - (z * 0.0075F) - ); - } - - if (world.random.nextInt(5) == 0) - world.playSoundAtBlockCenter(pos, SoundEvents.PARTICLE_SOUL_ESCAPE.value(), SoundCategory.BLOCKS, 0.5F, 1.0F, false); - } } public void use(PlayerEntity player, Hand hand) { - if (!player.getStackInHand(hand).isOf(Items.ECHO_SHARD) || activeTime > 0) { +// if (!player.getStackInHand(hand).isOf(Items.ECHO_SHARD) || activeTime > 0) { wobble(DecoratedPotBlockEntity.WobbleType.NEGATIVE); player.getWorld().playSound(null, pos, SoundEvents.BLOCK_DECORATED_POT_INSERT_FAIL, SoundCategory.BLOCKS, 1.0F, 1.0F); player.getWorld().emitGameEvent(player, GameEvent.BLOCK_CHANGE, pos); return; - } - - activeTime += 300; - player.getStackInHand(hand).decrement(1); - wobble(DecoratedPotBlockEntity.WobbleType.POSITIVE); - player.getWorld().emitGameEvent(player, GameEvent.BLOCK_CHANGE, pos); - player.getWorld().playSound(null, pos, SoundEvents.BLOCK_DECORATED_POT_INSERT, SoundCategory.BLOCKS, 1.0F, 1.0F); +// } +// +// activeTime += 300; +// player.getStackInHand(hand).decrement(1); +// wobble(DecoratedPotBlockEntity.WobbleType.POSITIVE); +// player.getWorld().emitGameEvent(player, GameEvent.BLOCK_CHANGE, pos); +// player.getWorld().playSound(null, pos, SoundEvents.BLOCK_DECORATED_POT_INSERT, SoundCategory.BLOCKS, 1.0F, 1.0F); } public void wobble(DecoratedPotBlockEntity.WobbleType wobbleType) { diff --git a/src/main/java/dev/spiritstudios/hollow/block/entity/StoneChestBlockEntity.java b/src/main/java/dev/spiritstudios/hollow/block/entity/StoneChestBlockEntity.java index 38439ea..90e3f4b 100644 --- a/src/main/java/dev/spiritstudios/hollow/block/entity/StoneChestBlockEntity.java +++ b/src/main/java/dev/spiritstudios/hollow/block/entity/StoneChestBlockEntity.java @@ -81,11 +81,11 @@ public void aboveBroken() { } public ItemActionResult use(PlayerEntity player, Hand hand, Direction side) { - if (world == null) return ItemActionResult.SKIP_DEFAULT_BLOCK_INTERACTION; + if (world == null) return ItemActionResult.PASS_TO_DEFAULT_BLOCK_INTERACTION; if (player.getStackInHand(hand).isEmpty() || player.getStackInHand(hand).isOf(HollowBlocks.STONE_CHEST_LID.asItem()) && side.equals(Direction.UP)) - return ItemActionResult.SKIP_DEFAULT_BLOCK_INTERACTION; + return ItemActionResult.PASS_TO_DEFAULT_BLOCK_INTERACTION; - if (!world.isAir(pos.up())) return ItemActionResult.SKIP_DEFAULT_BLOCK_INTERACTION; + if (!world.isAir(pos.up())) return ItemActionResult.PASS_TO_DEFAULT_BLOCK_INTERACTION; int slot = -1; @@ -96,7 +96,7 @@ public ItemActionResult use(PlayerEntity player, Hand hand, Direction side) { } } - if (slot == -1) return ItemActionResult.SKIP_DEFAULT_BLOCK_INTERACTION; + if (slot == -1) return ItemActionResult.FAIL; setStack(slot, player.getStackInHand(hand)); player.setStackInHand(hand, ItemStack.EMPTY); diff --git a/src/main/java/dev/spiritstudios/hollow/datagen/LootTableProvider.java b/src/main/java/dev/spiritstudios/hollow/datagen/LootTableProvider.java index a2d63fd..40c5a38 100644 --- a/src/main/java/dev/spiritstudios/hollow/datagen/LootTableProvider.java +++ b/src/main/java/dev/spiritstudios/hollow/datagen/LootTableProvider.java @@ -41,10 +41,10 @@ public void generate() { this.addDrop(HollowBlocks.LOTUS_LILYPAD); this.addDrop(HollowBlocks.GIANT_LILYPAD); this.addDrop(HollowBlocks.CAMPION, block -> this.dropsWithProperty(block, TallPlantBlock.HALF, DoubleBlockHalf.LOWER)); - this.addDrop(HollowBlocks.PURPLE_WILDFLOWER, this.flowerbedDrops(HollowBlocks.PURPLE_WILDFLOWER)); - this.addDrop(HollowBlocks.WHITE_WILDFLOWER, this.flowerbedDrops(HollowBlocks.WHITE_WILDFLOWER)); - this.addDrop(HollowBlocks.BLUE_WILDFLOWER, this.flowerbedDrops(HollowBlocks.BLUE_WILDFLOWER)); - this.addDrop(HollowBlocks.PINK_WILDFLOWER, this.flowerbedDrops(HollowBlocks.PINK_WILDFLOWER)); +// this.addDrop(HollowBlocks.PURPLE_WILDFLOWER, this.flowerbedDrops(HollowBlocks.PURPLE_WILDFLOWER)); +// this.addDrop(HollowBlocks.WHITE_WILDFLOWER, this.flowerbedDrops(HollowBlocks.WHITE_WILDFLOWER)); +// this.addDrop(HollowBlocks.BLUE_WILDFLOWER, this.flowerbedDrops(HollowBlocks.BLUE_WILDFLOWER)); +// this.addDrop(HollowBlocks.PINK_WILDFLOWER, this.flowerbedDrops(HollowBlocks.PINK_WILDFLOWER)); this.addDrop(HollowBlocks.PAEONIA); this.addPottedPlantDrops(HollowBlocks.POTTED_PAEONIA); diff --git a/src/main/java/dev/spiritstudios/hollow/datagen/ModelProvider.java b/src/main/java/dev/spiritstudios/hollow/datagen/ModelProvider.java index 112158d..5202cc5 100644 --- a/src/main/java/dev/spiritstudios/hollow/datagen/ModelProvider.java +++ b/src/main/java/dev/spiritstudios/hollow/datagen/ModelProvider.java @@ -89,10 +89,10 @@ public void generateBlockStateModels(BlockStateModelGenerator generator) { generator.registerItemModel(HollowBlocks.FIREFLY_JAR.asItem()); generator.registerStateWithModelReference(HollowBlocks.FIREFLY_JAR, HollowBlocks.JAR); - registerFlowerbed(generator, HollowBlocks.PINK_WILDFLOWER); - registerFlowerbed(generator, HollowBlocks.BLUE_WILDFLOWER); - registerFlowerbed(generator, HollowBlocks.WHITE_WILDFLOWER); - registerFlowerbed(generator, HollowBlocks.PURPLE_WILDFLOWER); +// registerFlowerbed(generator, HollowBlocks.PINK_WILDFLOWER); +// registerFlowerbed(generator, HollowBlocks.BLUE_WILDFLOWER); +// registerFlowerbed(generator, HollowBlocks.WHITE_WILDFLOWER); +// registerFlowerbed(generator, HollowBlocks.PURPLE_WILDFLOWER); } @Override diff --git a/src/main/java/dev/spiritstudios/hollow/registry/HollowBlocks.java b/src/main/java/dev/spiritstudios/hollow/registry/HollowBlocks.java index abe14d7..f226ae2 100644 --- a/src/main/java/dev/spiritstudios/hollow/registry/HollowBlocks.java +++ b/src/main/java/dev/spiritstudios/hollow/registry/HollowBlocks.java @@ -180,29 +180,29 @@ public final class HollowBlocks { public static final Block POTTED_ROOTED_ORCHID = Blocks.createFlowerPotBlock(ROOTED_ORCHID); // region Wildflowers - public static final Block PINK_WILDFLOWER = new FlowerbedBlock(AbstractBlock.Settings.create() - .mapColor(MapColor.PINK) - .noCollision() - .sounds(BlockSoundGroup.PINK_PETALS) - .pistonBehavior(PistonBehavior.DESTROY)); - - public static final Block BLUE_WILDFLOWER = new FlowerbedBlock(AbstractBlock.Settings.create() - .mapColor(MapColor.TERRACOTTA_BLUE) - .noCollision() - .sounds(BlockSoundGroup.PINK_PETALS) - .pistonBehavior(PistonBehavior.DESTROY)); - - public static final Block PURPLE_WILDFLOWER = new FlowerbedBlock(AbstractBlock.Settings.create() - .mapColor(MapColor.PURPLE) - .noCollision() - .sounds(BlockSoundGroup.PINK_PETALS) - .pistonBehavior(PistonBehavior.DESTROY)); - - public static final Block WHITE_WILDFLOWER = new FlowerbedBlock(AbstractBlock.Settings.create() - .mapColor(MapColor.WHITE_GRAY) - .noCollision() - .sounds(BlockSoundGroup.PINK_PETALS) - .pistonBehavior(PistonBehavior.DESTROY)); +// public static final Block PINK_WILDFLOWER = new FlowerbedBlock(AbstractBlock.Settings.create() +// .mapColor(MapColor.PINK) +// .noCollision() +// .sounds(BlockSoundGroup.PINK_PETALS) +// .pistonBehavior(PistonBehavior.DESTROY)); +// +// public static final Block BLUE_WILDFLOWER = new FlowerbedBlock(AbstractBlock.Settings.create() +// .mapColor(MapColor.TERRACOTTA_BLUE) +// .noCollision() +// .sounds(BlockSoundGroup.PINK_PETALS) +// .pistonBehavior(PistonBehavior.DESTROY)); +// +// public static final Block PURPLE_WILDFLOWER = new FlowerbedBlock(AbstractBlock.Settings.create() +// .mapColor(MapColor.PURPLE) +// .noCollision() +// .sounds(BlockSoundGroup.PINK_PETALS) +// .pistonBehavior(PistonBehavior.DESTROY)); +// +// public static final Block WHITE_WILDFLOWER = new FlowerbedBlock(AbstractBlock.Settings.create() +// .mapColor(MapColor.WHITE_GRAY) +// .noCollision() +// .sounds(BlockSoundGroup.PINK_PETALS) +// .pistonBehavior(PistonBehavior.DESTROY)); // endregion public static final class Tags { diff --git a/src/main/resources/assets/hollow/textures/block/echoing_pot_side.png b/src/main/resources/assets/hollow/textures/block/echoing_pot_side.png deleted file mode 100644 index 718dc30adfc2a32cf1b296fca5656932e9cd9a2a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 207 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPE^4e$wZ&CAP+h=}m^@pp7|v@kc< z)zwu|QE6Hqc^0Uk)YHW=q~ez7$%DMj20W}6@;5is3p_v7_hP3*1Vd@-CdbWnvpF+X zmDeyV+01#UW`d#ikux6}dCU!GnP@co+zFju^5n4LG}HBh)-&eDRGCiRzdoztmRr2R z7tML^xSC@QES+`g*c5q%%h$@Uv9&PpUjDi2ebqJjmW{&OZaH3l1ats{r>mdKI;Vst E09e*fUH||9 diff --git a/src/main/resources/assets/hollow/textures/block/echoing_pot_side_2.png b/src/main/resources/assets/hollow/textures/block/echoing_pot_side_2.png deleted file mode 100644 index 55708519fcaa54a446bc231d22934acf37808d4a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 267 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPF4L0a3E<3GdG-x8b~ zulksF|DUsIg%`udO;us=v*|zT@Z?gf93%@4w0~O{aZH%*a{7K%yEAV@LQ)sAdgTe~DWM4f>6%mi diff --git a/src/main/resources/assets/hollow/textures/block/echoing_pot_top.png b/src/main/resources/assets/hollow/textures/block/echoing_pot_top.png deleted file mode 100644 index af79f2ba7a66ff4fa4b10bb415ac6a2b9a3c5cc4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 256 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 F{Wm%$#JB(e diff --git a/src/main/resources/assets/hollow/textures/block/stone_chest_lid_double.png b/src/main/resources/assets/hollow/textures/block/stone_chest_lid_double.png deleted file mode 100644 index ba5ce172859afbc7b404965211be75c15dc494a0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1342 zcmV-E1;P4>P)Px(_(?=TRCt{2Sv_wfHxPXewjrf$PV3b*O77B~)v9&jf8o}D$-lyFfaDjr$pPw& z1rorxv#lnUcU?r*vb+@9As$CmfcRFi3cf}XN$qmJ-pr6k7Z(@b0Khp1!Rlr6Js%nX zfHB6;8)LA1diL|H7l(XkqHAPao-b-L}#3x@o*HpH5CNzyE@PwO+9RV65G&=@hNs(>F4C zXw3Su0gwgRRryo@-xz~6DG#0XynxPOI-UCG<#~?fav5xHbo_oZN1>GGIe!2AxjzN0 z+ZF?B1MS8_fUP7J7B1lRA|$U3l+`pa#$Y@i1AylW5ZA0;9LnQ&!5(B>ht_v1KyMNh zXRH(n6&8jqBUqE`vH%))U%z_qD2gKB0%Hsw?!N?k5T%yKC;dp?Aw$IC;uXePFh|6Q zO*8l|ft_;!fw9sTiv^4^C`Kc%6nQ^{4>|?)?g5&F*7PZsWRDP~NUG%VU92ttVN(0? zr=I~zwK6VTz|S9#$3YnMssK$?Y(=po&&S+bKO;7$y(3l+ET5h|CvY7g^Q#w!-+uk2 zw;BKdGVT7_oyGc0Y|d>+YWegW&Cf!TS{eHHd_MQy7t10#3}>@hpR#Whz#EIP|5}9x z&y~mT@NmDe5_<+KjcW(a<)S>9mpKkcDDutoynh9N2r6a`U3rN+b2ebX0`4GXXhnV) z8q8)hANK%!9iY8X##XCU{|bPycsE8c)i5se{E=tF}S|I4r0A|`fE!`5BJ6^@9gZXe+8f`FZrcf+gzE6 zHMkOF78m40gR(56Zo7I3mF1j+q5QAYvM6OQAy8Ens;csviNzl}OE6}$8S>$V$#)@E zD6xkz2XGjaWeIel!L9W^!eFZshbz)5*zJI~-eA6a_#^j49*rNwfS$s{-&Da$fiyR&ebU=K-fK|q3BhOSlJFR{#m$af(+eGa&*s5&Gr_(3+K zkDNt-q9}s&Ch2jtTKSf?u4{kdBVGd)9`cNVwY{J1e-Atd#H=R5$+$i_l2e@+4@AS^ z0PBFG^Yim>pzAQG<0`4kxe?iQ>k~WM=W8}zcX@ev7^N_F^!EZ0i0}3E0j2yFt8)tt zQmD-DqpN!@vZ|`K&fY<;$`>Q;`tRUw5CG=$dC(~`A?m|WPK$?v;A)I{K(o8P7?EQv z5zNPUU3-Pf|3Midb{F}U$Uc1h2)u#=q*tF#r$E;mKwWhSI4q=oxVgF6t6&KU2?+@a z2?+@a2?+@a2?+@a2?+@a2?+@a2?+@a2?>IK0K!RgO|ix