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 bdcdcb25..583471a2 100644 Binary files a/src/main/resources/assets/betterend/textures/block/menger_sponge.png and b/src/main/resources/assets/betterend/textures/block/menger_sponge.png differ diff --git a/src/main/resources/assets/betterend/textures/block/menger_sponge_wet.png b/src/main/resources/assets/betterend/textures/block/menger_sponge_wet.png index e02162db..ae10c5e3 100644 Binary files a/src/main/resources/assets/betterend/textures/block/menger_sponge_wet.png and b/src/main/resources/assets/betterend/textures/block/menger_sponge_wet.png differ 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 00000000..87497e27 Binary files /dev/null and b/src/main/resources/assets/betterend/textures/item/charnia_cyan.png differ 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 00000000..2e3abb2f Binary files /dev/null and b/src/main/resources/assets/betterend/textures/item/charnia_light_blue.png differ 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 00000000..239f4d22 Binary files /dev/null and b/src/main/resources/assets/betterend/textures/item/charnia_orange.png differ 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 00000000..770d7343 Binary files /dev/null and b/src/main/resources/assets/betterend/textures/item/charnia_purple.png differ 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 00000000..83e6321d Binary files /dev/null and b/src/main/resources/assets/betterend/textures/item/charnia_red.png differ