From 86a2459b0f8a48b74c6a2cf012b3689f578e2658 Mon Sep 17 00:00:00 2001 From: paulevsGitch Date: Sun, 6 Dec 2020 14:48:50 +0300 Subject: [PATCH] Fixes, sponge model --- .../betterend/blocks/BlockMengerSponge.java | 6 +- .../blocks/BlockMengerSpongeWet.java | 13 +- .../assets/betterend/lang/en_us.json | 8 +- .../assets/betterend/lang/ru_ru.json | 8 +- .../betterend/models/block/menger_sponge.json | 156 +++++++++--------- .../betterend/models/item/charnia_cyan.json | 6 + .../models/item/charnia_light_blue.json | 6 + .../betterend/models/item/charnia_orange.json | 6 + .../betterend/models/item/charnia_purple.json | 6 + .../betterend/models/item/charnia_red.json | 6 + .../textures/block/menger_sponge.png | Bin 2173 -> 396 bytes .../textures/block/menger_sponge_wet.png | Bin 1984 -> 358 bytes .../betterend/textures/item/charnia_cyan.png | Bin 0 -> 2165 bytes .../textures/item/charnia_light_blue.png | Bin 0 -> 2246 bytes .../textures/item/charnia_orange.png | Bin 0 -> 2322 bytes .../textures/item/charnia_purple.png | Bin 0 -> 2398 bytes .../betterend/textures/item/charnia_red.png | Bin 0 -> 1579 bytes 17 files changed, 135 insertions(+), 86 deletions(-) create mode 100644 src/main/resources/assets/betterend/models/item/charnia_cyan.json create mode 100644 src/main/resources/assets/betterend/models/item/charnia_light_blue.json create mode 100644 src/main/resources/assets/betterend/models/item/charnia_orange.json create mode 100644 src/main/resources/assets/betterend/models/item/charnia_purple.json create mode 100644 src/main/resources/assets/betterend/models/item/charnia_red.json create mode 100644 src/main/resources/assets/betterend/textures/item/charnia_cyan.png create mode 100644 src/main/resources/assets/betterend/textures/item/charnia_light_blue.png create mode 100644 src/main/resources/assets/betterend/textures/item/charnia_orange.png create mode 100644 src/main/resources/assets/betterend/textures/item/charnia_purple.png create mode 100644 src/main/resources/assets/betterend/textures/item/charnia_red.png diff --git a/src/main/java/ru/betterend/blocks/BlockMengerSponge.java b/src/main/java/ru/betterend/blocks/BlockMengerSponge.java index 9e15206d..1b8c26e3 100644 --- a/src/main/java/ru/betterend/blocks/BlockMengerSponge.java +++ b/src/main/java/ru/betterend/blocks/BlockMengerSponge.java @@ -19,14 +19,14 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Direction; import net.minecraft.world.World; import net.minecraft.world.WorldAccess; -import ru.betterend.blocks.basis.BlockBase; +import ru.betterend.blocks.basis.BlockBaseNotFull; import ru.betterend.client.render.ERenderLayer; import ru.betterend.interfaces.IRenderTypeable; import ru.betterend.registry.EndBlocks; -public class BlockMengerSponge extends BlockBase implements IRenderTypeable { +public class BlockMengerSponge extends BlockBaseNotFull implements IRenderTypeable { public BlockMengerSponge() { - super(FabricBlockSettings.copyOf(Blocks.SPONGE)); + super(FabricBlockSettings.copyOf(Blocks.SPONGE).nonOpaque()); } @Override diff --git a/src/main/java/ru/betterend/blocks/BlockMengerSpongeWet.java b/src/main/java/ru/betterend/blocks/BlockMengerSpongeWet.java index 02a49983..637ed86c 100644 --- a/src/main/java/ru/betterend/blocks/BlockMengerSpongeWet.java +++ b/src/main/java/ru/betterend/blocks/BlockMengerSpongeWet.java @@ -8,20 +8,22 @@ import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings; import net.minecraft.block.BlockState; import net.minecraft.block.Blocks; import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.fluid.FluidState; +import net.minecraft.fluid.Fluids; import net.minecraft.particle.ParticleTypes; import net.minecraft.sound.SoundCategory; import net.minecraft.sound.SoundEvents; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Direction; import net.minecraft.world.World; -import ru.betterend.blocks.basis.BlockBase; +import ru.betterend.blocks.basis.BlockBaseNotFull; import ru.betterend.client.render.ERenderLayer; import ru.betterend.interfaces.IRenderTypeable; import ru.betterend.registry.EndBlocks; -public class BlockMengerSpongeWet extends BlockBase implements IRenderTypeable { +public class BlockMengerSpongeWet extends BlockBaseNotFull implements IRenderTypeable { public BlockMengerSpongeWet() { - super(FabricBlockSettings.copyOf(Blocks.WET_SPONGE)); + super(FabricBlockSettings.copyOf(Blocks.WET_SPONGE).nonOpaque()); } @Override @@ -80,4 +82,9 @@ public class BlockMengerSpongeWet extends BlockBase implements IRenderTypeable { public ERenderLayer getRenderLayer() { return ERenderLayer.CUTOUT; } + + @Override + public FluidState getFluidState(BlockState state) { + return Fluids.WATER.getStill(false); + } } diff --git a/src/main/resources/assets/betterend/lang/en_us.json b/src/main/resources/assets/betterend/lang/en_us.json index 4856ca98..b7654c59 100644 --- a/src/main/resources/assets/betterend/lang/en_us.json +++ b/src/main/resources/assets/betterend/lang/en_us.json @@ -415,5 +415,11 @@ "block.betterend.menger_sponge": "Menger Sponge", "block.betterend.menger_sponge_wet": "Wet Menger Sponge", - "block.betterend.tube_worm": "Tube Worm" + "block.betterend.tube_worm": "Tube Worm", + + "block.betterend.charnia_cyan": "Cyan Charnia", + "block.betterend.charnia_light_blue": "Light Blue Charnia", + "block.betterend.charnia_orange": "Orange Charnia", + "block.betterend.charnia_purple": "Purple Charnia", + "block.betterend.charnia_red": "Red Charnia" } \ No newline at end of file diff --git a/src/main/resources/assets/betterend/lang/ru_ru.json b/src/main/resources/assets/betterend/lang/ru_ru.json index e4d6755d..4a01a735 100644 --- a/src/main/resources/assets/betterend/lang/ru_ru.json +++ b/src/main/resources/assets/betterend/lang/ru_ru.json @@ -417,5 +417,11 @@ "block.betterend.menger_sponge": "Губка Менгера", "block.betterend.menger_sponge_wet": "Мокрая губка Менгера", - "block.betterend.tube_worm": "Трубчатый червь" + "block.betterend.tube_worm": "Трубчатый червь", + + "block.betterend.charnia_cyan": "Циановая чарния", + "block.betterend.charnia_light_blue": "Голубая чарния", + "block.betterend.charnia_orange": "Оранжевая чарния", + "block.betterend.charnia_purple": "Пурпурная чарния", + "block.betterend.charnia_red": "Красная чарния" } \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/menger_sponge.json b/src/main/resources/assets/betterend/models/block/menger_sponge.json index edb27d88..b77046f6 100644 --- a/src/main/resources/assets/betterend/models/block/menger_sponge.json +++ b/src/main/resources/assets/betterend/models/block/menger_sponge.json @@ -9,141 +9,141 @@ { "__comment": "Box1", "from": [ 0, 0, 0 ], - "to": [ 5, 5, 16 ], + "to": [ 6, 6, 16 ], "faces": { - "down": { "uv": [ 0, 0, 5, 16 ], "texture": "#texture", "cullface": "down" }, - "up": { "uv": [ 0, 0, 5, 16 ], "texture": "#texture" }, - "north": { "uv": [ 11, 11, 16, 16 ], "texture": "#texture", "cullface": "north" }, - "south": { "uv": [ 0, 11, 5, 16 ], "texture": "#texture", "cullface": "south" }, - "west": { "uv": [ 0, 11, 16, 16 ], "texture": "#texture", "cullface": "west" }, - "east": { "uv": [ 0, 11, 16, 16 ], "texture": "#texture" } + "down": { "uv": [ 0, 0, 6, 16 ], "texture": "#texture", "cullface": "down" }, + "up": { "uv": [ 0, 0, 6, 16 ], "texture": "#texture" }, + "north": { "uv": [ 10, 10, 16, 16 ], "texture": "#texture", "cullface": "north" }, + "south": { "uv": [ 0, 10, 6, 16 ], "texture": "#texture", "cullface": "south" }, + "west": { "uv": [ 0, 10, 16, 16 ], "texture": "#texture", "cullface": "west" }, + "east": { "uv": [ 0, 10, 16, 16 ], "texture": "#texture" } } }, { "__comment": "Box1", - "from": [ 11, 0, 0 ], - "to": [ 16, 5, 16 ], + "from": [ 10, 0, 0 ], + "to": [ 16, 6, 16 ], "faces": { - "down": { "uv": [ 11, 0, 16, 16 ], "texture": "#texture", "cullface": "down" }, - "up": { "uv": [ 11, 0, 16, 16 ], "texture": "#texture" }, - "north": { "uv": [ 0, 11, 5, 16 ], "texture": "#texture", "cullface": "north" }, - "south": { "uv": [ 11, 11, 16, 16 ], "texture": "#texture", "cullface": "south" }, - "west": { "uv": [ 0, 11, 16, 16 ], "texture": "#texture" }, - "east": { "uv": [ 0, 11, 16, 16 ], "texture": "#texture", "cullface": "east" } + "down": { "uv": [ 10, 0, 16, 16 ], "texture": "#texture", "cullface": "down" }, + "up": { "uv": [ 10, 0, 16, 16 ], "texture": "#texture" }, + "north": { "uv": [ 0, 10, 6, 16 ], "texture": "#texture", "cullface": "north" }, + "south": { "uv": [ 10, 10, 16, 16 ], "texture": "#texture", "cullface": "south" }, + "west": { "uv": [ 0, 10, 16, 16 ], "texture": "#texture" }, + "east": { "uv": [ 0, 10, 16, 16 ], "texture": "#texture", "cullface": "east" } } }, { "__comment": "Box1", - "from": [ 5, 0, 0 ], - "to": [ 11, 5, 5 ], + "from": [ 6, 0, 0 ], + "to": [ 10, 6, 6 ], "faces": { - "down": { "uv": [ 5, 11, 11, 16 ], "texture": "#texture", "cullface": "down" }, - "up": { "uv": [ 5, 0, 11, 5 ], "texture": "#texture" }, - "north": { "uv": [ 5, 11, 11, 16 ], "texture": "#texture", "cullface": "north" }, - "south": { "uv": [ 5, 11, 11, 16 ], "texture": "#texture" } + "down": { "uv": [ 6, 10, 10, 16 ], "texture": "#texture", "cullface": "down" }, + "up": { "uv": [ 6, 0, 10, 6 ], "texture": "#texture" }, + "north": { "uv": [ 6, 10, 10, 16 ], "texture": "#texture", "cullface": "north" }, + "south": { "uv": [ 6, 10, 10, 16 ], "texture": "#texture" } } }, { "__comment": "Box1", - "from": [ 5, 0, 11 ], - "to": [ 11, 5, 16 ], + "from": [ 6, 0, 10 ], + "to": [ 10, 6, 16 ], "faces": { - "down": { "uv": [ 5, 0, 11, 5 ], "texture": "#texture", "cullface": "down" }, - "up": { "uv": [ 5, 11, 11, 16 ], "texture": "#texture" }, - "north": { "uv": [ 5, 11, 11, 16 ], "texture": "#texture" }, - "south": { "uv": [ 5, 11, 11, 16 ], "texture": "#texture", "cullface": "south" } + "down": { "uv": [ 6, 0, 10, 6 ], "texture": "#texture", "cullface": "down" }, + "up": { "uv": [ 6, 10, 10, 16 ], "texture": "#texture" }, + "north": { "uv": [ 6, 10, 10, 16 ], "texture": "#texture" }, + "south": { "uv": [ 6, 10, 10, 16 ], "texture": "#texture", "cullface": "south" } } }, { "__comment": "Box1", - "from": [ 5, 11, 11 ], - "to": [ 11, 16, 16 ], + "from": [ 6, 10, 10 ], + "to": [ 10, 16, 16 ], "faces": { - "down": { "uv": [ 5, 0, 11, 5 ], "texture": "#texture" }, - "up": { "uv": [ 5, 11, 11, 16 ], "texture": "#texture", "cullface": "up" }, - "north": { "uv": [ 5, 0, 11, 5 ], "texture": "#texture" }, - "south": { "uv": [ 5, 0, 11, 5 ], "texture": "#texture", "cullface": "south" } + "down": { "uv": [ 6, 0, 10, 6 ], "texture": "#texture" }, + "up": { "uv": [ 6, 10, 10, 16 ], "texture": "#texture", "cullface": "up" }, + "north": { "uv": [ 6, 0, 10, 6 ], "texture": "#texture" }, + "south": { "uv": [ 6, 0, 10, 6 ], "texture": "#texture", "cullface": "south" } } }, { "__comment": "Box1", - "from": [ 0, 11, 0 ], - "to": [ 5, 16, 16 ], + "from": [ 0, 10, 0 ], + "to": [ 6, 16, 16 ], "faces": { - "down": { "uv": [ 0, 0, 5, 16 ], "texture": "#texture" }, - "up": { "uv": [ 0, 0, 5, 16 ], "texture": "#texture", "cullface": "up" }, - "north": { "uv": [ 11, 11, 16, 16 ], "texture": "#texture", "cullface": "north" }, - "south": { "uv": [ 0, 11, 5, 16 ], "texture": "#texture", "cullface": "south" }, - "west": { "uv": [ 0, 11, 16, 16 ], "texture": "#texture", "cullface": "west" }, - "east": { "uv": [ 0, 11, 16, 16 ], "texture": "#texture" } + "down": { "uv": [ 0, 0, 6, 16 ], "texture": "#texture" }, + "up": { "uv": [ 0, 0, 6, 16 ], "texture": "#texture", "cullface": "up" }, + "north": { "uv": [ 10, 0, 16, 6 ], "texture": "#texture", "cullface": "north" }, + "south": { "uv": [ 0, 0, 6, 6 ], "texture": "#texture", "cullface": "south" }, + "west": { "uv": [ 0, 0, 16, 6 ], "texture": "#texture", "cullface": "west" }, + "east": { "uv": [ 0, 0, 16, 6 ], "texture": "#texture" } } }, { "__comment": "Box1", - "from": [ 11, 11, 0 ], + "from": [ 10, 10, 0 ], "to": [ 16, 16, 16 ], "faces": { - "down": { "uv": [ 11, 0, 16, 16 ], "texture": "#texture" }, - "up": { "uv": [ 11, 0, 16, 16 ], "texture": "#texture", "cullface": "up" }, - "north": { "uv": [ 0, 11, 5, 16 ], "texture": "#texture", "cullface": "north" }, - "south": { "uv": [ 11, 11, 16, 16 ], "texture": "#texture", "cullface": "south" }, - "west": { "uv": [ 0, 11, 16, 16 ], "texture": "#texture" }, - "east": { "uv": [ 0, 11, 16, 16 ], "texture": "#texture", "cullface": "east" } + "down": { "uv": [ 10, 0, 16, 16 ], "texture": "#texture" }, + "up": { "uv": [ 10, 0, 16, 16 ], "texture": "#texture", "cullface": "up" }, + "north": { "uv": [ 0, 0, 6, 6 ], "texture": "#texture", "cullface": "north" }, + "south": { "uv": [ 10, 0, 16, 6 ], "texture": "#texture", "cullface": "south" }, + "west": { "uv": [ 0, 0, 16, 6 ], "texture": "#texture" }, + "east": { "uv": [ 0, 0, 16, 6 ], "texture": "#texture", "cullface": "east" } } }, { "__comment": "Box1", - "from": [ 5, 11, 0 ], - "to": [ 11, 16, 5 ], + "from": [ 6, 10, 0 ], + "to": [ 10, 16, 6 ], "faces": { - "down": { "uv": [ 5, 11, 11, 16 ], "texture": "#texture" }, - "up": { "uv": [ 5, 0, 11, 5 ], "texture": "#texture", "cullface": "up" }, - "north": { "uv": [ 5, 11, 11, 16 ], "texture": "#texture", "cullface": "north" }, - "south": { "uv": [ 5, 11, 11, 16 ], "texture": "#texture" } + "down": { "uv": [ 6, 10, 10, 16 ], "texture": "#texture" }, + "up": { "uv": [ 6, 0, 10, 6 ], "texture": "#texture", "cullface": "up" }, + "north": { "uv": [ 6, 0, 10, 6 ], "texture": "#texture", "cullface": "north" }, + "south": { "uv": [ 6, 0, 10, 6 ], "texture": "#texture" } } }, { "__comment": "Box1", - "from": [ 0, 5, 0 ], - "to": [ 5, 11, 5 ], + "from": [ 0, 6, 0 ], + "to": [ 6, 10, 6 ], "faces": { - "north": { "uv": [ 11, 5, 16, 11 ], "texture": "#texture", "cullface": "north" }, - "south": { "uv": [ 0, 5, 5, 11 ], "texture": "#texture" }, - "west": { "uv": [ 0, 5, 5, 11 ], "texture": "#texture", "cullface": "west" }, - "east": { "uv": [ 11, 5, 16, 11 ], "texture": "#texture" } + "north": { "uv": [ 10, 6, 16, 10 ], "texture": "#texture", "cullface": "north" }, + "south": { "uv": [ 0, 6, 6, 10 ], "texture": "#texture" }, + "west": { "uv": [ 0, 6, 6, 10 ], "texture": "#texture", "cullface": "west" }, + "east": { "uv": [ 10, 6, 16, 10 ], "texture": "#texture" } } }, { "__comment": "Box1", - "from": [ 11, 5, 0 ], - "to": [ 16, 11, 5 ], + "from": [ 10, 6, 0 ], + "to": [ 16, 10, 6 ], "faces": { - "north": { "uv": [ 0, 5, 5, 11 ], "texture": "#texture", "cullface": "north" }, - "south": { "uv": [ 11, 5, 16, 11 ], "texture": "#texture" }, - "west": { "uv": [ 0, 5, 5, 11 ], "texture": "#texture" }, - "east": { "uv": [ 11, 5, 16, 11 ], "texture": "#texture", "cullface": "east" } + "north": { "uv": [ 0, 6, 6, 10 ], "texture": "#texture", "cullface": "north" }, + "south": { "uv": [ 10, 6, 16, 10 ], "texture": "#texture" }, + "west": { "uv": [ 0, 6, 6, 10 ], "texture": "#texture" }, + "east": { "uv": [ 10, 6, 16, 10 ], "texture": "#texture", "cullface": "east" } } }, { "__comment": "Box1", - "from": [ 11, 5, 11 ], - "to": [ 16, 11, 16 ], + "from": [ 10, 6, 10 ], + "to": [ 16, 10, 16 ], "faces": { - "north": { "uv": [ 0, 5, 5, 11 ], "texture": "#texture" }, - "south": { "uv": [ 11, 5, 16, 11 ], "texture": "#texture", "cullface": "south" }, - "west": { "uv": [ 11, 5, 16, 11 ], "texture": "#texture" }, - "east": { "uv": [ 0, 5, 5, 11 ], "texture": "#texture", "cullface": "east" } + "north": { "uv": [ 0, 6, 6, 10 ], "texture": "#texture" }, + "south": { "uv": [ 10, 6, 16, 10 ], "texture": "#texture", "cullface": "south" }, + "west": { "uv": [ 10, 6, 16, 10 ], "texture": "#texture" }, + "east": { "uv": [ 0, 6, 6, 10 ], "texture": "#texture", "cullface": "east" } } }, { "__comment": "Box1", - "from": [ 0, 5, 11 ], - "to": [ 5, 11, 16 ], + "from": [ 0, 6, 10 ], + "to": [ 6, 10, 16 ], "faces": { - "north": { "uv": [ 11, 5, 16, 11 ], "texture": "#texture" }, - "south": { "uv": [ 0, 5, 5, 11 ], "texture": "#texture", "cullface": "south" }, - "west": { "uv": [ 0, 5, 5, 11 ], "texture": "#texture", "cullface": "west" }, - "east": { "uv": [ 11, 5, 16, 11 ], "texture": "#texture" } + "north": { "uv": [ 10, 6, 16, 10 ], "texture": "#texture" }, + "south": { "uv": [ 0, 6, 6, 10 ], "texture": "#texture", "cullface": "south" }, + "west": { "uv": [ 10, 6, 16, 10 ], "texture": "#texture", "cullface": "west" }, + "east": { "uv": [ 0, 6, 6, 10 ], "texture": "#texture" } } } ] diff --git a/src/main/resources/assets/betterend/models/item/charnia_cyan.json b/src/main/resources/assets/betterend/models/item/charnia_cyan.json new file mode 100644 index 00000000..99511294 --- /dev/null +++ b/src/main/resources/assets/betterend/models/item/charnia_cyan.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "betterend:item/charnia_cyan" + } +} diff --git a/src/main/resources/assets/betterend/models/item/charnia_light_blue.json b/src/main/resources/assets/betterend/models/item/charnia_light_blue.json new file mode 100644 index 00000000..d0a5ddf9 --- /dev/null +++ b/src/main/resources/assets/betterend/models/item/charnia_light_blue.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "betterend:item/charnia_light_blue" + } +} diff --git a/src/main/resources/assets/betterend/models/item/charnia_orange.json b/src/main/resources/assets/betterend/models/item/charnia_orange.json new file mode 100644 index 00000000..4e49108a --- /dev/null +++ b/src/main/resources/assets/betterend/models/item/charnia_orange.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "betterend:item/charnia_orange" + } +} diff --git a/src/main/resources/assets/betterend/models/item/charnia_purple.json b/src/main/resources/assets/betterend/models/item/charnia_purple.json new file mode 100644 index 00000000..2709940e --- /dev/null +++ b/src/main/resources/assets/betterend/models/item/charnia_purple.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "betterend:item/charnia_purple" + } +} diff --git a/src/main/resources/assets/betterend/models/item/charnia_red.json b/src/main/resources/assets/betterend/models/item/charnia_red.json new file mode 100644 index 00000000..e6b3f525 --- /dev/null +++ b/src/main/resources/assets/betterend/models/item/charnia_red.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "betterend:item/charnia_red" + } +} diff --git a/src/main/resources/assets/betterend/textures/block/menger_sponge.png b/src/main/resources/assets/betterend/textures/block/menger_sponge.png index bdcdcb25c614002eee63ac4426a7cfce5678adf3..583471a2c795a2fd55a0c43b3910650721edb75a 100644 GIT binary patch delta 380 zcmV-?0fYYi5R3zm8Gi-<001BJ|6u?C00DDSM?wIu&K&6g000DMK}|sb0I`n?{9y$E z000SaNLh0L01m?d01m?e$8V@)0003YNklQOYiCdJb)qKDiA^tS4K=0B8ZXES2KUC^mOn+sGi@Iu7B!Z-FleZ6xlB)`BC<| z`m_js4Sa*&2Ri_9Ir}yNj(b~+?{963fR@S&66cRA`w9N+wNxHjuvNw2v|p|Mx`2;O z%VJ8iEBIDncz$4!d%i3VZGCYa>U&G;kG{$S_@Et762u;W@_^iiiAo$_-IYC7JU!o9 zp@xYpI7#ME)pb|#>^0H1Dsy5ek}|QL0u%64h*4K(m-$X!(nNoS_#31Vcg9GI+JKZE zPbNsfnCbo6j3OD`8w*|o-b3IN8M4m<_SF?MJkZPPbc@<)s`-iV>V!ICzc%qdRK(Ni a7TFKqI^7DI%@rm90000@B4kf zV}6;c%#8Vg0aF4b5=mfMs=)-GuZd&)OYpw^9h(|H{N1VfyhQR!h&X&CJ3k1QNc_6& zIe9{!F`cAYr<7t?Gmw@z-4HF2%#AN`Q*;3k5HqmaU3&EXiPI=zXY}Y2m60&IlYz~i zTE>CwvWy(Mtbo=rXnY(pw}gZQP9RW7iPPcY$r3#}%uB+#_!>u%VTe$mM-xSZNS-kh zNoF~KsHAF)mMP_kMkkf237uRSi^vI?1}8MQOo0(Hl2DTh9pbrAXpLhmq{%SPV+*eI zs7(;uB#svs7fXv3QkJvgGM!F`6LMTG#~=dZOI-q0g1PvpQ3eCxY0mBz?5qnB87VVc zDCkkBbi@Ux+e_=>Jz;_Y!%HYPE|U_XOQS%e@x@T5(~IVXlp<)wqxYG_d`_tw;3mMc zg&Yl1ihxUq8a2ky-m~sP&N1vML*u{!oDjxCVKT2Nw~ZB8-o`%15AU|u8#kHE0ZL%G z9F}#ACMt831xZd86Qf0DFR{BAwwR9=MS0Eu10?`GDktOwCX-`?I!C4;WlB<^okJ){ zf*64sVJR?_K#dK|GImSpSfEBDndagJ%0+`TgC2#Vq;@+)${0qjVE}#3{(nAtpN%%V;i5>ex!04mWCYOAdwmwP1B5uz~mG~VHSmw!gLxP zfvGe=M*$0EA>@`(wndyBems=pX;x7c0~u+N$gEXiO07i=1u4}SWl<_Ii$<+bFhE0V zHF6YTXwt%RP70Qa-AP#i?si#G_Q2%p_GP^@w_e-hU$I{q6B?N(sr0Ly7~kk; zPSk8&XNs8-1I||a`R!b)45}UcZ1YV+O>Ds%#XswBpGb~xYLix1@^Poq{Ua0iPfMxu ze|Q&s7`E+3>C&Awm#lZn_AG1IqBNe~l^)#FUsXAKUvJ*UO<#O@zkBY&)*MbCWf$Bx z`|pN*^39B}U2lJUYFofS!ynyEeUFdqX;G6?Yvb-7j-BK)wd>WEELjuC+Se69?7k(K z>rI2M4G(6FpB^1NX~#f0UqJuW{<`^+wwdieIUyxEU;rWNIlDtZFu zyZOKQ45jBzPwq%kezn=3{x+jxYgyq>pQcDNk8-}{{ipxl)mc~8b|k$#WY$o_n+>KL zp)-xSDFNq9MB;&rLwCC6J#}sCQ|7l8MgIC|R*Ua?oAY4*`D@56L0hh>8eEV%WJUr* zbo2x=xFP*sQe|QN^0JWn_K4Bxk=7$Wj3EYvKOuTJ%2l0tJZ@b19R}}UWy&@Dh4ye5L)((E;?0hMX}LD%LUH2K*3 z6{18DX8`g+UI0ituT#fCZLWm5gq;NRZpW-PE(O*@IG5%>FU;Y&oOc|WU zm1AErME`_%4o}kPt$?1u30i=Z9)Fo2fj4aydkYFPx&o8OYk)scMZzz1tC+7}nSdxL oGjksrYyMA!Jj8!+-6C1`1O!0M(X$>nZvX%Q07*qoM6N<$f-j(sp#T5? literal 1984 zcmbVN3ry5z96!*ZAPi6t$6Qv&PnL5M-8ZbK#-qp0(-%?BB5qBu1UCQLAKplrCc$8j^u9%fCxe&5&c_x=9w ze?Le|T^JM)86Xmgf($A8bbbyI##CSay|v1$;wOJ5H4=kviO}^ zZ00xyg&>#9C2`3mw4(r$A_xM(GDs!^c?8H7+c~TVw6k+281y8IJ1B;uXgeSqsRR~Gasvt6i({M)t6MmML!_0ok#>&du~ILV_ma`* zh5s$B&E`e3T=Gg@Badx=i)J&684^k-S=#Bq$>f#1#5og+F=m>hSu_0)c6g7y)-b5f zL1G;3$fRlOM4-|pSOA?)2uuPHlTFzP+QrTl1bOa|dW<90Vi_!hL8%OcRhd#bDpjCL zI2M+pFgy-5@~J>z9QI;hnxIU@{|O~<)I>XM81E>`h82(yV=r(^Ga6BYo#ik)P8#%T zF|VqGq6k!Jk}6cB3I}B*L4f&)LIon2LJs0GrObqo%KQWzo4Bv1aiSfm zO!B1v68v!(OPe?s<{&i%yiZ>wzaUfK~9-ry^d?cxH zXVSXhJVkWmr0Kw&S(ty^{0@1?#-mv?`s+Gs54Gp!hOZiZmXrW(OYCk7*Gjf5u6|^> zbTq2p@=4{ugFefNwq09XqnBc+-r<3zQO8Ro?r-uB579I-&YShSw4Kq>2ohA=aWVAe z_}79fxo-^J;jtHT5)-E8Cf%NFEgMD99#myecTvb4{& zDzhgatXK@+T!ot=s!r^zS2dUd-|+kX^8J97R^Z33YxU<{Q-7%R37PiFJUlosc1MKE z7igQ;6y~csZMoiGR*>Gh8LXzRtUdN_#%2O~KP))tqOu~%|MsKx2YbO}CaOH$m^WLr zZ!c1_=OUduc%q>k2;JS{dq8>BkR>X4#$>;#zNVTE^vv!$%|>=xdQP3RjK*ruuN}## zNi;NQHMfS%Q1kZEtA>NxJVSI#OM2-;3;IrV)8%eU=kD20%-V*=`o5>r>grO?Z*6w1 zS+T3UWuIoaYfhuz1>Aq=+M-)uEqTzqZFIE0E%C!e64}fKxN}MSxjrhXt)hJANJG!+ zkB(JN*}uo=7g|e~lh%UfFCMgpEz;Tsh96!jyzBE>&+nZd@3}i>`!+YDMqV3zXnEW@ l>y4SZ$~fP9p=F;AO{vS$Zx5KUagy+lH6*9%4{7sC{{Zfx*XRHM diff --git a/src/main/resources/assets/betterend/textures/item/charnia_cyan.png b/src/main/resources/assets/betterend/textures/item/charnia_cyan.png new file mode 100644 index 0000000000000000000000000000000000000000..87497e27c375d349bc316f01230621f4abe07f1e GIT binary patch literal 2165 zcmcImTWB0r7@ipIB}r*(#Cky-rj{ypcCI@+Gh~~~Zft^`7}ABLpfqRCoZTI=J7+R8 z$!7otp=S10S>F~`tlh(8u(x&wpsh%rdV zu#4z$NMWHMi*!T_2@0=?@-|xJg$Tz-I6-20LFW}+(&*}kA=X?or4Pj)soEmDD3kGh zN9VYFJ|D_UA?&6(LDMvj7dcU634-;eY#$U@+uK}Yh$9cWmg8I4rUOQh#1np$A)Z!3 z$T@Xd+pDIDB#bKnhZ9145Kt0BuWb!f^EK?Sf$ z8L6y-WS&g|2v|*(p{7Zy1Q4p7k7GCy6frno(X)vm;i#uh2N6+C%96-Rrm3)|B8OQm zg~BYaDY6>YG!e>?8rx&8MOq4Em$C+4nS?PJ5!48hG*;EZB5_R?SRg`3wt}ogB8tGP zgy)*w7|vqXz$VGL6bQO3EWOY2NcEsePFJEY?neH5U~+lyHB$zua9Cv_ifF8;$|9?Ql*)=` zP-86&ktWrmZ|MC}HQuE6)#Snqu+xaVK{@8;<5`(%m#N1877rJ^J1bJ-u2myt`RK5`e(d|}Ik*Zt?@*0)l6>h zmHF8niMj8-|7u@b(LK{9p15@Sy${gEbEV%t*1PV-{NB`{MW5#^+jl?x4usq%`gA-SLwp#Vg7ta@xaFDuWJ_L`|#E`H+{S3 f&i@y_0_>_+!xDI}ktCGy2rO#?!~E literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/betterend/textures/item/charnia_light_blue.png b/src/main/resources/assets/betterend/textures/item/charnia_light_blue.png new file mode 100644 index 0000000000000000000000000000000000000000..2e3abb2fd172f52c9c96608d21ecbac7f00c8515 GIT binary patch literal 2246 zcmcImTWB0r7@knONm~*MB5Eskn4nhT?A*>=?KY;_#01?~(m+#G@a#EfcZclG8D}Qh zO`vpbMX5!ML{UrMv?x-l_#joQ%|j`D5d{VD(%L>0^g&wnsSvuJ*;}KeZ78@fJGXDX z|NH;{`{&HTonw!8uivzuyC}?3x>!Kyy>b#zOygep|(11SJwdzEUcBp;Ji-bzX-Z$Co96uS24#lrRtn#b z`9T^GUQZe#Qh>^vc2Y59TLq8ss;rojY)XnI%8DZ!j%M@CpTMF8IOmL~hnun3SxP8G zk?%-Sxm-?`wImJll49GoB&(9DiVPu!vt9%%q8IkI7}6v}f$K*u_4t?(X6ba45}49P z3MIcy>xIoSv4Tkz=u1jcj#H`wF>2%d>7ZB-j*&!)q(r#+VB-=OQkkC zjD}{IqGoO@qQi+hz1js7F&(l z*<#@b2jj+A{MOyBhiN%{I1bc&hNNLcQi3Y0vZ$z{Y)mM?(Nsq_`((|LLb)ZFCz9{w>(Me9XVeQL=piziP6IB0?1*cB%lwGz~?z zOo6{1caRookfE5>T#F4|HSDFMZOCRk`*c2}s= z>J&9-%LT$nZ_@k*ETp-p36U27Y{asVAyf?%+oLTC}%fs*6w@uM0H?ttmoJ} zTkk$`?EKX&d*1!z=v{02Iy=`qYMPU&Z@I+DM74P81krvOp5OGg`55=x+NDHwspqec zzIsiXygxmUtHXQ0**E{)uiNKNUwGrqZi74bF*-Ds KKEC6*{r><9zSy1s literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/betterend/textures/item/charnia_orange.png b/src/main/resources/assets/betterend/textures/item/charnia_orange.png new file mode 100644 index 0000000000000000000000000000000000000000..239f4d22e3ae9cfd3904acacc922ea7ae3f76c52 GIT binary patch literal 2322 zcmcImU2GIp6rN&IDs80%W1v2C97HsDckcY}j9tpo#kRsCfkxm-@7#NLchcRNVP@Lh zHYOH)fv68AgolPijrd@K@L&w6F{Q@%K$Q3*ni!0Y#KfRhQ4@KDHc?d#*Cg_}CH zf#X(x^god3Van3jiiKhydZxt zyO;0x0?KO%9bie7dBaRdIy7bVabAX!Awolx6aXa)>Xu^i^^d?-3rNn|mwB?j7Q0Ic zg(&hZQ7o6siL#RLg1ji1rYS;Mlx4sWARKoiQ~_?dslkw;Ar2fray*xh8IkRcMk#?Q zt%XqXo3w6NPZLX+SV6uhC14y<6-aOs=Z^-(>f!{8v`9lY_T;ZIuEmVrC0fkXa%|VofPy6h*lbjQWYR`JwoTR@2&od$d#fsn&YifD zhK@BG8$d~FNuWcta(; z7V4@htc5EspO-3f!E|ClRUfgD7hg7KExTz>Yw9wC1#A|l6Q`%x9G@M^q=%EQ;9K+a zefMmheD!SW^Ut36^EJio-gKySQthk!eKP%SwE4%@i|W>6?Mm0rN3UO-xysYfr9T_wdFq)}Q&U=h`0w z=f0K6%_oj@ZZGQ(iE#JT3v+$a)Zy_X==$-O=KEf_Iny;uE+6}a9BqC5!BwmN>iF2< s+Rl7kzA^t^es1HG-8-mE-p_Hr?m9J_8GG|`{I6wb=bp^j9nT&82QmioivR!s literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/betterend/textures/item/charnia_purple.png b/src/main/resources/assets/betterend/textures/item/charnia_purple.png new file mode 100644 index 0000000000000000000000000000000000000000..770d7343f1474a8f4e83a040e8e17714a2489210 GIT binary patch literal 2398 zcmcImTWl0n7@k5>5rIIeDbNQd)5t|UJGV1ex-`o!*haS!+Jy2VoH=uLJF+`7&P=;4 z3E1EhiHVUHBH_VEd@w;0c`;rhh|!>E^bJka1Ro5>7!3w5NL>Hf8`YH3khsb0+`jq# z@BjbrpEJjHk36<=`TFG?$E_S5D(r#%>U3My4gVW{trOVY9}ew{Iqrd;bnD_yo?6Rs z%lf^s@npRCgiV8LhPZ*lGSk%%&>S}~I2{stkR`ms%ATJUetze?z>=cuN|n^$aVJgk=RqQY0iRNYck-Y^#c`8CxaQmZT=M2v%@O zLgoc)wxa$E9JpR-=B`ke+NB_>5-5~cC1oatez_5?ShR=zI3Ye|!-cE>QZt_C+7>ZQ zA`=a{SXB|zFh-W)7@%5XhO1hJZZy@x^M!y;rcF$rZ~EB{C~$O2XB$k%hUPekDqu3p z!Y*=T>L5c`9aV$7)GW2tJQ;Z~Qlv7MHC5#TqhrXX!Bh*GmZl&FV;K>JQaF{dZWy{O znTEjMj++lEK~xM}sJWUNx?wDP$cv$SGp!LBWzV#ZDjwhPl1*r8_pCtEJ~LNnUH0aw z)8Z60X=@V&AOj-zqMhAby#_8&nkTJ)gz7c7bmEZ~2JnyR&IE@xLy-?bo*F zb1;pmN8?s!caUBNO=+(6D*>7YQ3OR#*Vhn;mBPC6?; z^TDhUtn0^~`X&S41XqU(xiRxHy;ZLdE`50R#k1W5pWgg?|B>~Z`uBCu;=v<-&AwlH zb>k1+7x3lfTcy=M9qqq*rT!eA#YZpP*mPnYX34R*>(WO(Z?2NBecY#>G2foe?HXTo z=B3TOXOge}+_3NTYv&$Xx^3%yOMAB&As^nq`=u9tg%>Eo_% zyL8^a`QCw<)w$zcH`ZtCxshkD|F$N7d{qCEOUgahmwfQ<;n8}}>2)W1*G}#K`eyyd z7d~In_5GUXuZ?VcWJ`bFk|lqvxae`qD&||?)nEVp%Gyr`P7bNF4|3d=i>I!>^7yrx Q^b2Ts=Sbn~jsr*k0mKFbZ~y=R literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/betterend/textures/item/charnia_red.png b/src/main/resources/assets/betterend/textures/item/charnia_red.png new file mode 100644 index 0000000000000000000000000000000000000000..83e6321d4b0d467e1cc443bf75078ad3a9e709fd GIT binary patch literal 1579 zcmbVMTWB0r7@lA)ZDXX^hpt6&oK}tK-1jy^#$>aTxC@yyBnw?ZinB9kcZbZ(na)hQ zn;^z?wGfCj*cUH-P~Q}cf!e01t%8>d1|O`K?Mp+cKKN9_;)7DVp4rQw5^o(ib8g@H z{`xnM7fj8K z=d`(LP0)$K$MAuwhzKm;t9aEiZBML9M2lBM>)@Cs@D{|MmWWg!5YHi zg{PofqFF%@XojOXjzkF3o3(wlO4{E3E`tm_%{3g~fHod5ss%XXO9axiZGz>5w6@oA z6LJ_`RUMk8n82hKP}f47Gvk^q;krfx6Ij6ZJ%nXLEb@|~gzznCEh|KO{>V|JQOC9| z(Oz!W0rVvB;Ebz*k)ufB{;pz98T!yG!@sd3ybi5##Iy@kAG$dR&2FG3x-57)9Rwzc z_a8EB9ag-D13{fPKvsPq5gfxYB+HRZJjX^wo)cqw3=hR?wo?>S;7Dg>8h9&vL{$qCTq3j}vOp&~$HpytrcGNZ14Q}{;cmk`SoABZ z3sNQI#s88~G}50AsWuyvYEMJ>V6IU)2cmHrztIuuTQ9HHTUt3ukI6~Ebyz8fp{NcOJYZtF?M2K}W zlFVO@oVzRxeYLc$Z*}TYvHtXCw6=C(=lbaAa^mp(FVB6`8(G-V;K%sav7&r%QQCLB znR;gX^Qp5Z_tvp5jkiB}=)m%Wh1j*9hcBKzlizb^iXOUz_5XTv{^sVr>nE5s@b#0z ptM7h*E#1Dlcjf%N@?LMI2V1CXzrFm%Yf{k8vm@j3%J5Uieh1