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 718dc30..0000000 Binary files a/src/main/resources/assets/hollow/textures/block/echoing_pot_side.png and /dev/null differ 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 5570851..0000000 Binary files a/src/main/resources/assets/hollow/textures/block/echoing_pot_side_2.png and /dev/null differ diff --git a/src/main/resources/assets/hollow/textures/block/echoing_pot_side_3.png b/src/main/resources/assets/hollow/textures/block/echoing_pot_side_3.png deleted file mode 100644 index 13e0471..0000000 Binary files a/src/main/resources/assets/hollow/textures/block/echoing_pot_side_3.png and /dev/null differ 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 af79f2b..0000000 Binary files a/src/main/resources/assets/hollow/textures/block/echoing_pot_top.png and /dev/null differ diff --git a/src/main/resources/assets/hollow/textures/block/stone_chest_double.png b/src/main/resources/assets/hollow/textures/block/stone_chest_double.png deleted file mode 100644 index c95458c..0000000 Binary files a/src/main/resources/assets/hollow/textures/block/stone_chest_double.png and /dev/null differ 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 ba5ce17..0000000 Binary files a/src/main/resources/assets/hollow/textures/block/stone_chest_lid_double.png and /dev/null differ