From 570fcd91948156eab26758257b1479520f8c5ecd Mon Sep 17 00:00:00 2001 From: paulevsGitch Date: Sun, 6 Dec 2020 14:29:46 +0300 Subject: [PATCH] Sponge model, more charnias --- .../betterend/blocks/BlockMengerSponge.java | 9 +- .../blocks/BlockMengerSpongeWet.java | 9 +- .../java/ru/betterend/registry/EndBlocks.java | 2 + .../betterend/blockstates/charnia_cyan.json | 10 ++ .../blockstates/charnia_light_blue.json | 10 ++ .../betterend/blockstates/menger_sponge.json | 5 + .../blockstates/menger_sponge_wet.json | 5 + .../materialmaps/block/charnia_cyan.json | 3 + .../block/charnia_light_blue.json | 3 + .../betterend/models/block/charnia_cyan.json | 6 + .../models/block/charnia_light_blue.json | 6 + .../betterend/models/block/menger_sponge.json | 150 ++++++++++++++++++ .../models/block/menger_sponge_wet.json | 7 + .../betterend/textures/block/charnia_cyan.png | Bin 0 -> 2199 bytes .../textures/block/charnia_light_blue.png | Bin 0 -> 2201 bytes 15 files changed, 223 insertions(+), 2 deletions(-) create mode 100644 src/main/resources/assets/betterend/blockstates/charnia_cyan.json create mode 100644 src/main/resources/assets/betterend/blockstates/charnia_light_blue.json create mode 100644 src/main/resources/assets/betterend/blockstates/menger_sponge.json create mode 100644 src/main/resources/assets/betterend/blockstates/menger_sponge_wet.json create mode 100644 src/main/resources/assets/betterend/materialmaps/block/charnia_cyan.json create mode 100644 src/main/resources/assets/betterend/materialmaps/block/charnia_light_blue.json create mode 100644 src/main/resources/assets/betterend/models/block/charnia_cyan.json create mode 100644 src/main/resources/assets/betterend/models/block/charnia_light_blue.json create mode 100644 src/main/resources/assets/betterend/models/block/menger_sponge.json create mode 100644 src/main/resources/assets/betterend/models/block/menger_sponge_wet.json create mode 100644 src/main/resources/assets/betterend/textures/block/charnia_cyan.png create mode 100644 src/main/resources/assets/betterend/textures/block/charnia_light_blue.png 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 0000000000000000000000000000000000000000..21201c96fa8b6bd425bf6f8eda88b4979c3946c3 GIT binary patch literal 2199 zcmb_e3vAS696waXHe3+ou_2FIkk{+NX|4=TEr^Knjcsbktjr4EF(uJqM}p@48#wDit0eG>~BO7MRuT57!TozIzdP& zo*e^avrBx^>`IB3(b1!jkqH43M1Ub8iAY%0g@gl5@(QqRcH=0Lgcy|$w7@ioO!br^ zPAvuy#%jkTlC~i%Zzb&nZ=;__Yy`>T1dEdtMvwww7bqS{T`05`lLLa+H8y1nemT&P zVMGNSkH_QIIAzshL7e1y9w%(L&4xh)rdO+mn7~whP&3;pdMZsYVR%A};-r-@LrMZ=DUFL(#llJBvV?;$hyc~lA(l*IVU|3eH2l7_ zkw_Y?8%49AN2%EEi`ISBQGk1au2sb(P&5l#9MtYuG^81t9@099BR!msCMq~%Ks25orD&U`HIGMdtGXeo5^%d5 zD0J1TD6$~23`sF8z$8CIU>r-c7|$^*7N7$x%L9f69MeAErAbw05zYB+dX_Z_a->ry z$c)GWI29vk05IB4OBffR8I0mM+0QdJo}%pSY%j(XxTM7J-K?fpGGqjRWuf*17|F;i zX6GS=$OR;f@r!bRqx~dj51_~$yG|{v#XOn}b55CpP6|sXR&-ds>eLb`1Fxl8VFgKQ zNf0Gd?haHk>kMQx)veqoPY>r&8*MxUAn5~&-v-mQfDspCpdbiy`Y`&!JMv!_XFb?^ zf}=SbEzuYy`6UccG==dzC1V^#(Efm3CRjQheFxs(QR5?epGvM264fApJ1CAmdOQ!O z+K#Gm&+7VLsfxigv{J7UJ2rI{i8S#@=pUpZab{_Q6+ol~2Bo-|F1m zRl9KdjSrSM`i);V_w2;ZH<+8X%f4Fpe#T<`So6^X=SGdKSpMVaRon8!=GU|4U%mN6 zt9Q(CDl6;R>c*V|f17fWjZn}EqVE3!eqd)UKTHU>ljNiB*bnTPXOD{VQH^ZJ4BYv5;@UyLXftz#I ztRGOJ^K16)TXcBl;&+EG4UfpFJ-zt$$-I^$p7Z@KEvnCdt6*=#<|QX{2lQ#FJ8rqa ztz5gW+wf^)YER_s*|A~=xxME5ror_EjV*eVd8wg`_fpR@HE$m4?ftcq{;>S2cQxOm zvFU}Hy{A7vS6KY%shx?g-%hBoACjAUrb2h(zYBwf9(3MZF8IEkk@?kx|IL^(HBpS u!zMMI9hQG)FhA3M_??e$FZiZm`#^X6@g*CktsiCnI=G8UT)PV^=Kl>nSMnPG literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..03aff5f1ff9266c6d1bbde5901b986a31bdfa934 GIT binary patch literal 2201 zcmb_eeQeZZ94=89UsEz*oA3vv3=l@I-*;`{hTGl7CfwM@!XQDV*S@zach??m$KB4w zI6lMy2INE3@DU)eX$(YAnV(>Wabbu^27h265+NZ3K_Uu7!hCyoI}sTY;w8PlZJ+n~ zJ-^@YdEd6Bs&Yp5;8BAS1j()__twDkF#8xd0RE5ptw(~VLDBO0CV~tZZXf-Scemst z$bcPc?L2FqZIe0z=Ekmleh5QV#f{Z*KGGNU zfS_8QFuQxy zX(N#g+O$fSKt<`?9*8z;8>4`z0jAzy$e?ryj5w}WSTv|xx*62_$RqPOlTB3g7(lXg zqgL0$y^X5sWkEe2yD>caY@Mnpdd!?;2TIQYUdaM(j3#Lkr)ZpX)>4efaUw$(l8i`_ zDX0%xL6I!!-(XgxIFaW50oD~Y(Dx9(R%~jr%!H#$`#MB#NP-qnTbcvket4DJgs}tF20bi~zV?(E9u%^BO!Nn?rSstLQ-m|h}tz~b~M ztfEOTiIQyF-Hpk1pMiptZe)1xU$(Z+%Rl0KyQDVV7Tte9kg;(A!qNAVZYmwr=P z@^JMe&+;@Yvp6IBWgIXpg9`$q;5CUwpDnGYx%C-bGn`{sUGpd%~2b3-@Dy*ENj&W<+bK9C-QD&aiJ4W3|?Ax>PT5h zRY&mj#2fubE+5{qZ2(Zm&;8@4MGLaW&b~UlZtv5V&adbYL+1BqLe~zgJ)G}hwzq}% zj2SX(*z%qs?8R62ADXcK?L=qYDbMw?mEDz}9=>?4sQcE$tX)4&J$C-4SyH~>m-kPX z;(32IEqi^&Q&pW8`JA5Bh1bQL;)CC={-R)U!QBmomp7fv`r(Q(wlN={+G!Nr9bI?y z&cKcx*@1?ae_dbM5k4?>Lwob-h0D*no}9Fy`Rhfcm+uUXY)!N;E52}G{-qmcc4DEz3r7ZEbcOeA2rT?*`@FMU2oo> xw|zT5x#X>u`4d_-Ve-z8T6=0*CvN)SrSsMO^GDA3s@wi}s3@)U?k!ok^e?l9@4^58 literal 0 HcmV?d00001