diff --git a/src/main/java/ru/betterend/blocks/BlockMengerSponge.java b/src/main/java/ru/betterend/blocks/BlockMengerSponge.java index 9acd5ea0..9e15206d 100644 --- a/src/main/java/ru/betterend/blocks/BlockMengerSponge.java +++ b/src/main/java/ru/betterend/blocks/BlockMengerSponge.java @@ -20,9 +20,11 @@ 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.client.render.ERenderLayer; +import ru.betterend.interfaces.IRenderTypeable; import ru.betterend.registry.EndBlocks; -public class BlockMengerSponge extends BlockBase { +public class BlockMengerSponge extends BlockBase implements IRenderTypeable { public BlockMengerSponge() { super(FabricBlockSettings.copyOf(Blocks.SPONGE)); } @@ -93,4 +95,9 @@ public class BlockMengerSponge extends BlockBase { return i > 0; } + + @Override + public ERenderLayer getRenderLayer() { + return ERenderLayer.CUTOUT; + } } diff --git a/src/main/java/ru/betterend/blocks/BlockMengerSpongeWet.java b/src/main/java/ru/betterend/blocks/BlockMengerSpongeWet.java index e0abcdba..02a49983 100644 --- a/src/main/java/ru/betterend/blocks/BlockMengerSpongeWet.java +++ b/src/main/java/ru/betterend/blocks/BlockMengerSpongeWet.java @@ -15,9 +15,11 @@ 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.client.render.ERenderLayer; +import ru.betterend.interfaces.IRenderTypeable; import ru.betterend.registry.EndBlocks; -public class BlockMengerSpongeWet extends BlockBase { +public class BlockMengerSpongeWet extends BlockBase implements IRenderTypeable { public BlockMengerSpongeWet() { super(FabricBlockSettings.copyOf(Blocks.WET_SPONGE)); } @@ -73,4 +75,9 @@ public class BlockMengerSpongeWet extends BlockBase { } } } + + @Override + public ERenderLayer getRenderLayer() { + return ERenderLayer.CUTOUT; + } } diff --git a/src/main/java/ru/betterend/registry/EndBlocks.java b/src/main/java/ru/betterend/registry/EndBlocks.java index 4e650a54..f4a29ce3 100644 --- a/src/main/java/ru/betterend/registry/EndBlocks.java +++ b/src/main/java/ru/betterend/registry/EndBlocks.java @@ -172,6 +172,8 @@ public class EndBlocks { public static final Block CHARNIA_RED = registerBlock("charnia_red", new BlockCharnia()); public static final Block CHARNIA_PURPLE = registerBlock("charnia_purple", new BlockCharnia()); public static final Block CHARNIA_ORANGE = registerBlock("charnia_orange", new BlockCharnia()); + public static final Block CHARNIA_LIGHT_BLUE = registerBlock("charnia_light_blue", new BlockCharnia()); + public static final Block CHARNIA_CYAN = registerBlock("charnia_cyan", new BlockCharnia()); public static final Block END_LILY = registerBlockNI("end_lily", new BlockEndLily()); public static final Block END_LILY_SEED = registerBlock("end_lily_seed", new BlockEndLilySeed()); diff --git a/src/main/resources/assets/betterend/blockstates/charnia_cyan.json b/src/main/resources/assets/betterend/blockstates/charnia_cyan.json new file mode 100644 index 00000000..e1b935ba --- /dev/null +++ b/src/main/resources/assets/betterend/blockstates/charnia_cyan.json @@ -0,0 +1,10 @@ +{ + "variants": { + "": [ + { "model": "betterend:block/charnia_cyan" }, + { "model": "betterend:block/charnia_cyan", "y": 90 }, + { "model": "betterend:block/charnia_cyan", "y": 180 }, + { "model": "betterend:block/charnia_cyan", "y": 270 } + ] + } +} diff --git a/src/main/resources/assets/betterend/blockstates/charnia_light_blue.json b/src/main/resources/assets/betterend/blockstates/charnia_light_blue.json new file mode 100644 index 00000000..5c75233d --- /dev/null +++ b/src/main/resources/assets/betterend/blockstates/charnia_light_blue.json @@ -0,0 +1,10 @@ +{ + "variants": { + "": [ + { "model": "betterend:block/charnia_light_blue" }, + { "model": "betterend:block/charnia_light_blue", "y": 90 }, + { "model": "betterend:block/charnia_light_blue", "y": 180 }, + { "model": "betterend:block/charnia_light_blue", "y": 270 } + ] + } +} diff --git a/src/main/resources/assets/betterend/blockstates/menger_sponge.json b/src/main/resources/assets/betterend/blockstates/menger_sponge.json new file mode 100644 index 00000000..cce57c42 --- /dev/null +++ b/src/main/resources/assets/betterend/blockstates/menger_sponge.json @@ -0,0 +1,5 @@ +{ + "variants": { + "": { "model": "betterend:block/menger_sponge" } + } +} diff --git a/src/main/resources/assets/betterend/blockstates/menger_sponge_wet.json b/src/main/resources/assets/betterend/blockstates/menger_sponge_wet.json new file mode 100644 index 00000000..79f8229f --- /dev/null +++ b/src/main/resources/assets/betterend/blockstates/menger_sponge_wet.json @@ -0,0 +1,5 @@ +{ + "variants": { + "": { "model": "betterend:block/menger_sponge_wet" } + } +} diff --git a/src/main/resources/assets/betterend/materialmaps/block/charnia_cyan.json b/src/main/resources/assets/betterend/materialmaps/block/charnia_cyan.json new file mode 100644 index 00000000..352de84b --- /dev/null +++ b/src/main/resources/assets/betterend/materialmaps/block/charnia_cyan.json @@ -0,0 +1,3 @@ +{ + "defaultMaterial": "betterend:waving_floor" +} diff --git a/src/main/resources/assets/betterend/materialmaps/block/charnia_light_blue.json b/src/main/resources/assets/betterend/materialmaps/block/charnia_light_blue.json new file mode 100644 index 00000000..352de84b --- /dev/null +++ b/src/main/resources/assets/betterend/materialmaps/block/charnia_light_blue.json @@ -0,0 +1,3 @@ +{ + "defaultMaterial": "betterend:waving_floor" +} diff --git a/src/main/resources/assets/betterend/models/block/charnia_cyan.json b/src/main/resources/assets/betterend/models/block/charnia_cyan.json new file mode 100644 index 00000000..61a10f96 --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/charnia_cyan.json @@ -0,0 +1,6 @@ +{ + "parent": "betterend:block/charnia", + "textures": { + "texture": "betterend:block/charnia_cyan" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/charnia_light_blue.json b/src/main/resources/assets/betterend/models/block/charnia_light_blue.json new file mode 100644 index 00000000..d80fab60 --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/charnia_light_blue.json @@ -0,0 +1,6 @@ +{ + "parent": "betterend:block/charnia", + "textures": { + "texture": "betterend:block/charnia_light_blue" + } +} \ 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 new file mode 100644 index 00000000..edb27d88 --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/menger_sponge.json @@ -0,0 +1,150 @@ +{ + "__comment": "Designed by Paulevs with Cubik Studio - https://cubik.studio", + "parent": "block/block", + "textures": { + "particle": "betterend:block/menger_sponge", + "texture": "betterend:block/menger_sponge" + }, + "elements": [ + { + "__comment": "Box1", + "from": [ 0, 0, 0 ], + "to": [ 5, 5, 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" } + } + }, + { + "__comment": "Box1", + "from": [ 11, 0, 0 ], + "to": [ 16, 5, 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" } + } + }, + { + "__comment": "Box1", + "from": [ 5, 0, 0 ], + "to": [ 11, 5, 5 ], + "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" } + } + }, + { + "__comment": "Box1", + "from": [ 5, 0, 11 ], + "to": [ 11, 5, 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" } + } + }, + { + "__comment": "Box1", + "from": [ 5, 11, 11 ], + "to": [ 11, 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" } + } + }, + { + "__comment": "Box1", + "from": [ 0, 11, 0 ], + "to": [ 5, 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" } + } + }, + { + "__comment": "Box1", + "from": [ 11, 11, 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" } + } + }, + { + "__comment": "Box1", + "from": [ 5, 11, 0 ], + "to": [ 11, 16, 5 ], + "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" } + } + }, + { + "__comment": "Box1", + "from": [ 0, 5, 0 ], + "to": [ 5, 11, 5 ], + "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" } + } + }, + { + "__comment": "Box1", + "from": [ 11, 5, 0 ], + "to": [ 16, 11, 5 ], + "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" } + } + }, + { + "__comment": "Box1", + "from": [ 11, 5, 11 ], + "to": [ 16, 11, 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" } + } + }, + { + "__comment": "Box1", + "from": [ 0, 5, 11 ], + "to": [ 5, 11, 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" } + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/menger_sponge_wet.json b/src/main/resources/assets/betterend/models/block/menger_sponge_wet.json new file mode 100644 index 00000000..d973a9a0 --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/menger_sponge_wet.json @@ -0,0 +1,7 @@ +{ + "parent": "betterend:block/menger_sponge", + "textures": { + "particle": "betterend:block/menger_sponge_wet", + "texture": "betterend:block/menger_sponge_wet" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/textures/block/charnia_cyan.png b/src/main/resources/assets/betterend/textures/block/charnia_cyan.png new file mode 100644 index 00000000..21201c96 Binary files /dev/null and b/src/main/resources/assets/betterend/textures/block/charnia_cyan.png differ diff --git a/src/main/resources/assets/betterend/textures/block/charnia_light_blue.png b/src/main/resources/assets/betterend/textures/block/charnia_light_blue.png new file mode 100644 index 00000000..03aff5f1 Binary files /dev/null and b/src/main/resources/assets/betterend/textures/block/charnia_light_blue.png differ