From 29d8a7e39b071f34823ee13aa20f13d81bcb3a5c Mon Sep 17 00:00:00 2001 From: paulevsGitch Date: Thu, 8 Oct 2020 19:43:54 +0300 Subject: [PATCH] Bubble coral update --- .../ru/betterend/blocks/BlockBubbleCoral.java | 24 ++++ .../blocks/basis/BlockUnderwaterPlant.java | 4 + .../ru/betterend/registry/BlockRegistry.java | 4 +- .../betterend/blockstates/bubble_coral.json | 14 +- .../betterend/models/block/bubble_coral.json | 6 - .../models/block/bubble_coral_1.json | 127 ++++++++++++++++++ .../models/block/bubble_coral_2.json | 98 +++++++++++++- .../models/block/bubble_coral_3.json | 100 ++++++++++++++ .../betterend/models/item/bubble_coral.json | 7 +- .../betterend/textures/block/bubble_coral.png | Bin 19570 -> 2326 bytes 10 files changed, 367 insertions(+), 17 deletions(-) create mode 100644 src/main/java/ru/betterend/blocks/BlockBubbleCoral.java delete mode 100644 src/main/resources/assets/betterend/models/block/bubble_coral.json create mode 100644 src/main/resources/assets/betterend/models/block/bubble_coral_1.json create mode 100644 src/main/resources/assets/betterend/models/block/bubble_coral_3.json diff --git a/src/main/java/ru/betterend/blocks/BlockBubbleCoral.java b/src/main/java/ru/betterend/blocks/BlockBubbleCoral.java new file mode 100644 index 00000000..488f416f --- /dev/null +++ b/src/main/java/ru/betterend/blocks/BlockBubbleCoral.java @@ -0,0 +1,24 @@ +package ru.betterend.blocks; + +import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings; +import net.fabricmc.fabric.api.tool.attribute.v1.FabricToolTags; +import net.minecraft.block.AbstractBlock; +import net.minecraft.block.Material; +import net.minecraft.sound.BlockSoundGroup; +import ru.betterend.blocks.basis.BlockUnderwaterPlant; + +public class BlockBubbleCoral extends BlockUnderwaterPlant { + public BlockBubbleCoral() { + super(FabricBlockSettings.of(Material.UNDERWATER_PLANT) + .breakByTool(FabricToolTags.SHEARS) + .sounds(BlockSoundGroup.CORAL) + .breakByHand(true) + .lightLevel(12) + .noCollision()); + } + + @Override + public AbstractBlock.OffsetType getOffsetType() { + return AbstractBlock.OffsetType.NONE; + } +} diff --git a/src/main/java/ru/betterend/blocks/basis/BlockUnderwaterPlant.java b/src/main/java/ru/betterend/blocks/basis/BlockUnderwaterPlant.java index ff1c1721..3ccfba0c 100644 --- a/src/main/java/ru/betterend/blocks/basis/BlockUnderwaterPlant.java +++ b/src/main/java/ru/betterend/blocks/basis/BlockUnderwaterPlant.java @@ -58,6 +58,10 @@ public class BlockUnderwaterPlant extends BlockBaseNotFull implements IRenderTyp .breakByHand(true) .noCollision()); } + + public BlockUnderwaterPlant(Settings settings) { + super(settings); + } @Override public VoxelShape getOutlineShape(BlockState state, BlockView view, BlockPos pos, ShapeContext ePos) { diff --git a/src/main/java/ru/betterend/registry/BlockRegistry.java b/src/main/java/ru/betterend/registry/BlockRegistry.java index f250e441..108b2334 100644 --- a/src/main/java/ru/betterend/registry/BlockRegistry.java +++ b/src/main/java/ru/betterend/registry/BlockRegistry.java @@ -11,6 +11,7 @@ import ru.betterend.blocks.AuroraCrystalBlock; import ru.betterend.blocks.BlockBlueVine; import ru.betterend.blocks.BlockBlueVineLantern; import ru.betterend.blocks.BlockBlueVineSeed; +import ru.betterend.blocks.BlockBubbleCoral; import ru.betterend.blocks.BlockEndstoneDust; import ru.betterend.blocks.BlockGlowingMoss; import ru.betterend.blocks.BlockMossyGlowshroomCap; @@ -26,7 +27,6 @@ import ru.betterend.blocks.EndStoneSmelter; import ru.betterend.blocks.EnderBlock; import ru.betterend.blocks.TerminiteBlock; import ru.betterend.blocks.basis.BlockGlowingFur; -import ru.betterend.blocks.basis.BlockUnderwaterPlant; import ru.betterend.blocks.basis.BlockVine; import ru.betterend.blocks.complex.WoodenMaterial; import ru.betterend.tab.CreativeTab; @@ -59,7 +59,7 @@ public class BlockRegistry { public static final Block BLUE_VINE_LANTERN = registerBlock("blue_vine_lantern", new BlockBlueVineLantern()); public static final Block BLUE_VINE_FUR = registerBlock("blue_vine_fur", new BlockGlowingFur(BLUE_VINE_SEED, 3)); - public static final Block BUBBLE_CORAL = registerBlock("bubble_coral", new BlockUnderwaterPlant(12)); + public static final Block BUBBLE_CORAL = registerBlock("bubble_coral", new BlockBubbleCoral()); // Vines // public static final Block DENSE_VINE = registerBlock("dense_vine", new BlockVine(15, true)); diff --git a/src/main/resources/assets/betterend/blockstates/bubble_coral.json b/src/main/resources/assets/betterend/blockstates/bubble_coral.json index 55b158b5..d5675a2d 100644 --- a/src/main/resources/assets/betterend/blockstates/bubble_coral.json +++ b/src/main/resources/assets/betterend/blockstates/bubble_coral.json @@ -1,8 +1,18 @@ { "variants": { "": [ - { "model": "betterend:block/bubble_coral" }, - { "model": "betterend:block/bubble_coral_2" } + { "model": "betterend:block/bubble_coral_1" }, + { "model": "betterend:block/bubble_coral_1", "y": 90 }, + { "model": "betterend:block/bubble_coral_1", "y": 180 }, + { "model": "betterend:block/bubble_coral_1", "y": 270 }, + { "model": "betterend:block/bubble_coral_2" }, + { "model": "betterend:block/bubble_coral_2", "y": 90 }, + { "model": "betterend:block/bubble_coral_2", "y": 180 }, + { "model": "betterend:block/bubble_coral_2", "y": 270 }, + { "model": "betterend:block/bubble_coral_3" }, + { "model": "betterend:block/bubble_coral_3", "y": 90 }, + { "model": "betterend:block/bubble_coral_3", "y": 180 }, + { "model": "betterend:block/bubble_coral_3", "y": 270 } ] } } diff --git a/src/main/resources/assets/betterend/models/block/bubble_coral.json b/src/main/resources/assets/betterend/models/block/bubble_coral.json deleted file mode 100644 index 36a1f954..00000000 --- a/src/main/resources/assets/betterend/models/block/bubble_coral.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "betterend:block/crop_block", - "textures": { - "texture": "betterend:block/bubble_coral" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/bubble_coral_1.json b/src/main/resources/assets/betterend/models/block/bubble_coral_1.json new file mode 100644 index 00000000..2ba9ef71 --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/bubble_coral_1.json @@ -0,0 +1,127 @@ +{ + "__comment": "Designed by Paulevs with Cubik Studio - https://cubik.studio", + "parent": "block/block", + "textures": { + "particle": "betterend:block/bubble_coral", + "texture": "betterend:block/bubble_coral" + }, + "elements": [ + { + "__comment": "Box1", + "from": [ 4, 0, 2 ], + "to": [ 9, 10, 7 ], + "faces": { + "down": { "uv": [ 0, 0, 5, 5 ], "texture": "#texture" }, + "up": { "uv": [ 0, 0, 5, 5 ], "texture": "#texture" }, + "north": { "uv": [ 5, 6, 10, 16 ], "texture": "#texture" }, + "south": { "uv": [ 5, 6, 10, 16 ], "texture": "#texture" }, + "west": { "uv": [ 5, 6, 10, 16 ], "texture": "#texture" }, + "east": { "uv": [ 5, 6, 10, 16 ], "texture": "#texture" } + } + }, + { + "__comment": "Box1", + "from": [ 10, 0, 5 ], + "to": [ 14, 7, 9 ], + "faces": { + "down": { "uv": [ 0, 5, 4, 9 ], "texture": "#texture" }, + "up": { "uv": [ 0, 5, 4, 9 ], "texture": "#texture" }, + "north": { "uv": [ 5, 9, 9, 16 ], "texture": "#texture" }, + "south": { "uv": [ 5, 9, 9, 16 ], "texture": "#texture" }, + "west": { "uv": [ 5, 9, 9, 16 ], "texture": "#texture" }, + "east": { "uv": [ 5, 9, 9, 16 ], "texture": "#texture" } + } + }, + { + "__comment": "Box1", + "from": [ 4, 0, 8 ], + "to": [ 9, 8, 13 ], + "faces": { + "down": { "uv": [ 0, 0, 5, 5 ], "texture": "#texture" }, + "up": { "uv": [ 0, 0, 5, 5 ], "texture": "#texture" }, + "north": { "uv": [ 8, 8, 13, 16 ], "texture": "#texture" }, + "south": { "uv": [ 8, 8, 13, 16 ], "texture": "#texture" }, + "west": { "uv": [ 8, 8, 13, 16 ], "texture": "#texture" }, + "east": { "uv": [ 8, 8, 13, 16 ], "texture": "#texture" } + } + }, + { + "__comment": "Box1", + "from": [ 0, 0, 5 ], + "to": [ 3, 5, 8 ], + "faces": { + "down": { "uv": [ 0, 9, 3, 12 ], "texture": "#texture" }, + "up": { "uv": [ 0, 9, 3, 12 ], "texture": "#texture" }, + "north": { "uv": [ 13, 11, 16, 16 ], "texture": "#texture" }, + "south": { "uv": [ 13, 11, 16, 16 ], "texture": "#texture" }, + "west": { "uv": [ 13, 11, 16, 16 ], "texture": "#texture" }, + "east": { "uv": [ 13, 11, 16, 16 ], "texture": "#texture" } + } + }, + { + "__comment": "Box1", + "from": [ 0, 0, 12 ], + "to": [ 3, 5, 15 ], + "faces": { + "down": { "uv": [ 0, 9, 3, 12 ], "texture": "#texture" }, + "up": { "uv": [ 0, 9, 3, 12 ], "texture": "#texture" }, + "north": { "uv": [ 7, 11, 10, 16 ], "texture": "#texture" }, + "south": { "uv": [ 7, 11, 10, 16 ], "texture": "#texture" }, + "west": { "uv": [ 7, 11, 10, 16 ], "texture": "#texture" }, + "east": { "uv": [ 7, 11, 10, 16 ], "texture": "#texture" } + } + }, + { + "__comment": "Box1", + "from": [ 12, 0, 10 ], + "to": [ 15, 5, 13 ], + "faces": { + "down": { "uv": [ 0, 9, 3, 12 ], "texture": "#texture" }, + "up": { "uv": [ 0, 9, 3, 12 ], "texture": "#texture" }, + "north": { "uv": [ 7, 11, 10, 16 ], "texture": "#texture" }, + "south": { "uv": [ 7, 11, 10, 16 ], "texture": "#texture" }, + "west": { "uv": [ 7, 11, 10, 16 ], "texture": "#texture" }, + "east": { "uv": [ 7, 11, 10, 16 ], "texture": "#texture" } + } + }, + { + "__comment": "Box1", + "from": [ 12, 0, 1 ], + "to": [ 14, 4, 3 ], + "faces": { + "down": { "uv": [ 0, 12, 2, 14 ], "texture": "#texture" }, + "up": { "uv": [ 0, 12, 2, 14 ], "texture": "#texture" }, + "north": { "uv": [ 10, 11, 12, 15 ], "texture": "#texture" }, + "south": { "uv": [ 10, 11, 12, 15 ], "texture": "#texture" }, + "west": { "uv": [ 10, 11, 12, 15 ], "texture": "#texture" }, + "east": { "uv": [ 10, 11, 12, 15 ], "texture": "#texture" } + } + }, + { + "__comment": "Box1", + "from": [ 1, 0, 1 ], + "to": [ 3, 4, 3 ], + "faces": { + "down": { "uv": [ 0, 12, 2, 14 ], "texture": "#texture" }, + "up": { "uv": [ 0, 12, 2, 14 ], "texture": "#texture" }, + "north": { "uv": [ 13, 12, 15, 16 ], "texture": "#texture" }, + "south": { "uv": [ 13, 12, 15, 16 ], "texture": "#texture" }, + "west": { "uv": [ 13, 12, 15, 16 ], "texture": "#texture" }, + "east": { "uv": [ 13, 12, 15, 16 ], "texture": "#texture" } + } + }, + { + "__comment": "Box1", + "from": [ 9, 0, 14 ], + "to": [ 11, 4, 16 ], + "faces": { + "down": { "uv": [ 0, 12, 2, 14 ], "texture": "#texture" }, + "up": { "uv": [ 0, 12, 2, 14 ], "texture": "#texture" }, + "north": { "uv": [ 9, 12, 11, 16 ], "texture": "#texture" }, + "south": { "uv": [ 9, 12, 11, 16 ], "texture": "#texture" }, + "west": { "uv": [ 9, 12, 11, 16 ], "texture": "#texture" }, + "east": { "uv": [ 9, 12, 11, 16 ], "texture": "#texture" } + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/bubble_coral_2.json b/src/main/resources/assets/betterend/models/block/bubble_coral_2.json index 1e4483f1..e612d83e 100644 --- a/src/main/resources/assets/betterend/models/block/bubble_coral_2.json +++ b/src/main/resources/assets/betterend/models/block/bubble_coral_2.json @@ -1,6 +1,100 @@ { - "parent": "betterend:block/crop_block_inverted", + "__comment": "Designed by Paulevs with Cubik Studio - https://cubik.studio", "textures": { + "particle": "betterend:block/bubble_coral", "texture": "betterend:block/bubble_coral" - } + }, + "elements": [ + { + "__comment": "Box1", + "from": [ 2, 0, 1 ], + "to": [ 7, 10, 6 ], + "faces": { + "down": { "uv": [ 0, 0, 5, 5 ], "texture": "#texture" }, + "up": { "uv": [ 0, 0, 5, 5 ], "texture": "#texture" }, + "north": { "uv": [ 5, 6, 10, 16 ], "texture": "#texture" }, + "south": { "uv": [ 5, 6, 10, 16 ], "texture": "#texture" }, + "west": { "uv": [ 5, 6, 10, 16 ], "texture": "#texture" }, + "east": { "uv": [ 5, 6, 10, 16 ], "texture": "#texture" } + } + }, + { + "__comment": "Box1", + "from": [ 10, 0, 2 ], + "to": [ 14, 7, 6 ], + "faces": { + "down": { "uv": [ 0, 5, 4, 9 ], "texture": "#texture" }, + "up": { "uv": [ 0, 5, 4, 9 ], "texture": "#texture" }, + "north": { "uv": [ 5, 9, 9, 16 ], "texture": "#texture" }, + "south": { "uv": [ 5, 9, 9, 16 ], "texture": "#texture" }, + "west": { "uv": [ 5, 9, 9, 16 ], "texture": "#texture" }, + "east": { "uv": [ 5, 9, 9, 16 ], "texture": "#texture" } + } + }, + { + "__comment": "Box1", + "from": [ 6, 0, 8 ], + "to": [ 11, 8, 13 ], + "faces": { + "down": { "uv": [ 0, 0, 5, 5 ], "texture": "#texture" }, + "up": { "uv": [ 0, 0, 5, 5 ], "texture": "#texture" }, + "north": { "uv": [ 8, 8, 13, 16 ], "texture": "#texture" }, + "south": { "uv": [ 8, 8, 13, 16 ], "texture": "#texture" }, + "west": { "uv": [ 8, 8, 13, 16 ], "texture": "#texture" }, + "east": { "uv": [ 8, 8, 13, 16 ], "texture": "#texture" } + } + }, + { + "__comment": "Box1", + "from": [ 2, 0, 8 ], + "to": [ 5, 5, 11 ], + "faces": { + "down": { "uv": [ 0, 9, 3, 12 ], "texture": "#texture" }, + "up": { "uv": [ 0, 9, 3, 12 ], "texture": "#texture" }, + "north": { "uv": [ 7, 11, 10, 16 ], "texture": "#texture" }, + "south": { "uv": [ 7, 11, 10, 16 ], "texture": "#texture" }, + "west": { "uv": [ 7, 11, 10, 16 ], "texture": "#texture" }, + "east": { "uv": [ 7, 11, 10, 16 ], "texture": "#texture" } + } + }, + { + "__comment": "Box1", + "from": [ 12, 0, 12 ], + "to": [ 15, 5, 15 ], + "faces": { + "down": { "uv": [ 0, 9, 3, 12 ], "texture": "#texture" }, + "up": { "uv": [ 0, 9, 3, 12 ], "texture": "#texture" }, + "north": { "uv": [ 7, 11, 10, 16 ], "texture": "#texture" }, + "south": { "uv": [ 7, 11, 10, 16 ], "texture": "#texture" }, + "west": { "uv": [ 7, 11, 10, 16 ], "texture": "#texture" }, + "east": { "uv": [ 7, 11, 10, 16 ], "texture": "#texture" } + } + }, + { + "__comment": "Box1", + "from": [ 13, 0, 8 ], + "to": [ 15, 4, 10 ], + "faces": { + "down": { "uv": [ 0, 12, 2, 14 ], "texture": "#texture" }, + "up": { "uv": [ 0, 12, 2, 14 ], "texture": "#texture" }, + "north": { "uv": [ 10, 11, 12, 15 ], "texture": "#texture" }, + "south": { "uv": [ 10, 11, 12, 15 ], "texture": "#texture" }, + "west": { "uv": [ 10, 11, 12, 15 ], "texture": "#texture" }, + "east": { "uv": [ 10, 11, 12, 15 ], "texture": "#texture" } + } + }, + { + "__comment": "Box1", + "from": [ 3, 0, 13 ], + "to": [ 5, 4, 15 ], + "faces": { + "down": { "uv": [ 0, 12, 2, 14 ], "texture": "#texture" }, + "up": { "uv": [ 0, 12, 2, 14 ], "texture": "#texture" }, + "north": { "uv": [ 9, 12, 11, 16 ], "texture": "#texture" }, + "south": { "uv": [ 9, 12, 11, 16 ], "texture": "#texture" }, + "west": { "uv": [ 9, 12, 11, 16 ], "texture": "#texture" }, + "east": { "uv": [ 9, 12, 11, 16 ], "texture": "#texture" } + } + } + ] } \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/bubble_coral_3.json b/src/main/resources/assets/betterend/models/block/bubble_coral_3.json new file mode 100644 index 00000000..ec33fe42 --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/bubble_coral_3.json @@ -0,0 +1,100 @@ +{ + "__comment": "Designed by Paulevs with Cubik Studio - https://cubik.studio", + "textures": { + "particle": "betterend:block/bubble_coral", + "texture": "betterend:block/bubble_coral" + }, + "elements": [ + { + "__comment": "Box1", + "from": [ 3, 0, 1 ], + "to": [ 8, 10, 6 ], + "faces": { + "down": { "uv": [ 0, 0, 5, 5 ], "texture": "#texture" }, + "up": { "uv": [ 0, 0, 5, 5 ], "texture": "#texture" }, + "north": { "uv": [ 5, 6, 10, 16 ], "texture": "#texture" }, + "south": { "uv": [ 5, 6, 10, 16 ], "texture": "#texture" }, + "west": { "uv": [ 5, 6, 10, 16 ], "texture": "#texture" }, + "east": { "uv": [ 5, 6, 10, 16 ], "texture": "#texture" } + } + }, + { + "__comment": "Box1", + "from": [ 10, 0, 11 ], + "to": [ 14, 7, 15 ], + "faces": { + "down": { "uv": [ 0, 5, 4, 9 ], "texture": "#texture" }, + "up": { "uv": [ 0, 5, 4, 9 ], "texture": "#texture" }, + "north": { "uv": [ 5, 9, 9, 16 ], "texture": "#texture" }, + "south": { "uv": [ 5, 9, 9, 16 ], "texture": "#texture" }, + "west": { "uv": [ 5, 9, 9, 16 ], "texture": "#texture" }, + "east": { "uv": [ 5, 9, 9, 16 ], "texture": "#texture" } + } + }, + { + "__comment": "Box1", + "from": [ 3, 0, 8 ], + "to": [ 8, 8, 13 ], + "faces": { + "down": { "uv": [ 0, 0, 5, 5 ], "texture": "#texture" }, + "up": { "uv": [ 0, 0, 5, 5 ], "texture": "#texture" }, + "north": { "uv": [ 8, 8, 13, 16 ], "texture": "#texture" }, + "south": { "uv": [ 8, 8, 13, 16 ], "texture": "#texture" }, + "west": { "uv": [ 8, 8, 13, 16 ], "texture": "#texture" }, + "east": { "uv": [ 8, 8, 13, 16 ], "texture": "#texture" } + } + }, + { + "__comment": "Box1", + "from": [ 11, 0, 1 ], + "to": [ 14, 5, 4 ], + "faces": { + "down": { "uv": [ 0, 9, 3, 12 ], "texture": "#texture" }, + "up": { "uv": [ 0, 9, 3, 12 ], "texture": "#texture" }, + "north": { "uv": [ 7, 11, 10, 16 ], "texture": "#texture" }, + "south": { "uv": [ 7, 11, 10, 16 ], "texture": "#texture" }, + "west": { "uv": [ 7, 11, 10, 16 ], "texture": "#texture" }, + "east": { "uv": [ 7, 11, 10, 16 ], "texture": "#texture" } + } + }, + { + "__comment": "Box1", + "from": [ 1, 0, 14 ], + "to": [ 3, 4, 16 ], + "faces": { + "down": { "uv": [ 0, 12, 2, 14 ], "texture": "#texture" }, + "up": { "uv": [ 0, 12, 2, 14 ], "texture": "#texture" }, + "north": { "uv": [ 10, 11, 12, 15 ], "texture": "#texture" }, + "south": { "uv": [ 10, 11, 12, 15 ], "texture": "#texture" }, + "west": { "uv": [ 10, 11, 12, 15 ], "texture": "#texture" }, + "east": { "uv": [ 10, 11, 12, 15 ], "texture": "#texture" } + } + }, + { + "__comment": "Box1", + "from": [ 0, 0, 4 ], + "to": [ 2, 4, 6 ], + "faces": { + "down": { "uv": [ 0, 12, 2, 14 ], "texture": "#texture" }, + "up": { "uv": [ 0, 12, 2, 14 ], "texture": "#texture" }, + "north": { "uv": [ 13, 12, 15, 16 ], "texture": "#texture" }, + "south": { "uv": [ 13, 12, 15, 16 ], "texture": "#texture" }, + "west": { "uv": [ 13, 12, 15, 16 ], "texture": "#texture" }, + "east": { "uv": [ 13, 12, 15, 16 ], "texture": "#texture" } + } + }, + { + "__comment": "Box1", + "from": [ 9, 0, 5 ], + "to": [ 14, 12, 10 ], + "faces": { + "down": { "uv": [ 0, 0, 5, 5 ], "texture": "#texture" }, + "up": { "uv": [ 0, 0, 5, 5 ], "texture": "#texture" }, + "north": { "uv": [ 6, 4, 11, 16 ], "texture": "#texture" }, + "south": { "uv": [ 6, 4, 11, 16 ], "texture": "#texture" }, + "west": { "uv": [ 6, 4, 11, 16 ], "texture": "#texture" }, + "east": { "uv": [ 6, 4, 11, 16 ], "texture": "#texture" } + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/item/bubble_coral.json b/src/main/resources/assets/betterend/models/item/bubble_coral.json index 2c283b30..6661006a 100644 --- a/src/main/resources/assets/betterend/models/item/bubble_coral.json +++ b/src/main/resources/assets/betterend/models/item/bubble_coral.json @@ -1,6 +1,3 @@ { - "parent": "item/generated", - "textures": { - "layer0": "betterend:block/bubble_coral" - } -} + "parent": "betterend:block/bubble_coral_1" +} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/textures/block/bubble_coral.png b/src/main/resources/assets/betterend/textures/block/bubble_coral.png index 02175a2aa5704706adc6a077a5e111aad3c2a551..e69732a5ca89fbf8181a5efc5dda06df891cc9ad 100644 GIT binary patch literal 2326 zcmcImdsGxv99}J~#Ah!7!KOj8jMsnHql*jH(gLz5>Sg_=I-vm?#?On2wJ6=mEh^$@9-VqGk`iPffe$Dw67+ffG7~hTeY^~utJ^q=^g)y&GdfK*h~zkC zBNkBtNV3*|aU`WfjI@?C5VVd;LUaUa#0eu#>M??32m_<1k?@5=YZC8bGOhQ8ZNZfp z^(ab!!ST}4Qf;YTD@tyhq-h!_bhu83K?Ek3`4u*Z`Q^j`1}l&`NeC!{=topWwm>Xa z%qUda?}9H7q4mq*Fu{P~K{kMsT0(Vc0O)XB9qRK%(6W+N0`h>9qC#Q*Rk@;c&8fU!t`RYb`t zir#@l%^qMuEEY8}Cgje!f}a;l<-1f-;WNO>D!`2D2pxfu1V)&gB+ckZMsK{E&@%+l z4|Tv&;8}$o99ZN9SJ_~o4hLiR%L?n~fZb|Fp(w2&@C={`mM~C8jCaumnBG7cFcS^+ zaVE-S&=Cd$T=nUK=dB`FtVU2h-(R`B$U%-skQe}51$veQ7{M7`m`P6&7;8$_VI~ex z1r%jqO-6cvEkhFE$HRL6&Z?^7A)|`~9Pi>N%*4}r%s@~iMiVT+NEWzw7f-V~&WIvB z$GAkv$HGz(e5@Pb0lynX{!(KRy`tn0c^GrOTF{UkdSMe}n7y*_Cz1sghG$*@>8m@2 z<vsd#L2*>|2UmMde`@f5X07kt-}=%395y?38tJld5$V&w52+>Cg%=0Q z#%VM|&)BWgoTjl+t^54rv*UMlbzGVM;fXU}#(rIqaC+#F=NIHQgVxV4#OCx~`{*?W zThbFqdF|4YAzP{E@+PipTuBLqlTG#&ccdR*MY~6JOup2nO<9}T5I1J5;c_VDQdL2_ z>F(G)l?!jp*%-Yd{)G`$`kdEW|47QeV{QoPIY2fk$d2*@<0$ixhvp=u1y)~o<7oZp zikfd~Ju9c*6Lh|Ox_d3N{v0djb;e(yQd%B&cDCB{>)!|lC)oD%_M{M1OF9~&o~pcW z$75r6pB#E@LCuJH&0l4EqTk!nNz8rZvqRk-yZ62j|9s^uquy;VuP*F4Zh0bh(lQV= z6I&`jTi+6R_=ngdw=D5w{y4vUSK<514%9Z7)4Vax&MAh*6Z77=7#f{hdyMj)ea5?W z#Oj97oT$f`gH0b)p1T;obi>KE*KWrWI&P~O;Y&Sh?(I6fdD)@zJ%;Y|HAxehrae*I zxXoVam}~5r?6%e8+uaFWrzUx+{L@XTxf`4L`R%Rr(?>$5TAH_vd9Lt4EwC5wC&;R} z>0b{UmTlu=lBp>VM2)X|vHI6ZLRMYP>}-1KZ>vAwP?KUBbJ_lZDAuk|*!k{-Lt8o7 z*uW;7KfEdJomEB08}r>6A053XRHkKL+}*mc_5Kdsy+1W!!h<{a#jLM(9izKh;;W$*PzcXee|Kh#t8_BDlb z7WTaQ_=N7?bC+$4|2S^%miYRc^NOm-S!;)_d*u`#-JL48U{=e%#fw+M@#LnV-?bj( a+OE_uo@w^Xs;^Z4T-Nv7j2b{8NbU>Dw9 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 SEh|w_+dyVjG|Q7!5&sV%tp6wg