From 1aeeb158fde0a4a30dd9dfe803cec5737c473163 Mon Sep 17 00:00:00 2001 From: paulevsGitch Date: Fri, 25 Dec 2020 18:52:50 +0300 Subject: [PATCH] Jungle fern --- .../java/ru/betterend/registry/EndBlocks.java | 1 + .../ru/betterend/registry/EndFeatures.java | 1 + .../world/biome/BiomeUmbrellaJungle.java | 1 + .../betterend/blockstates/jungle_fern.json | 8 ++ .../assets/betterend/lang/en_us.json | 3 +- .../assets/betterend/lang/ru_ru.json | 3 +- .../materialmaps/block/jungle_fern.json | 18 +++ .../betterend/models/block/jungle_fern.json | 129 ++++++++++++++++++ .../textures/block/jungle_fern_leaf.png | Bin 0 -> 1681 bytes .../textures/block/jungle_fern_middle.png | Bin 0 -> 1842 bytes .../textures/block/jungle_fern_spore.png | Bin 0 -> 1552 bytes 11 files changed, 162 insertions(+), 2 deletions(-) create mode 100644 src/main/resources/assets/betterend/blockstates/jungle_fern.json create mode 100644 src/main/resources/assets/betterend/materialmaps/block/jungle_fern.json create mode 100644 src/main/resources/assets/betterend/models/block/jungle_fern.json create mode 100644 src/main/resources/assets/betterend/textures/block/jungle_fern_leaf.png create mode 100644 src/main/resources/assets/betterend/textures/block/jungle_fern_middle.png create mode 100644 src/main/resources/assets/betterend/textures/block/jungle_fern_spore.png diff --git a/src/main/java/ru/betterend/registry/EndBlocks.java b/src/main/java/ru/betterend/registry/EndBlocks.java index 2347774a..7548fd3a 100644 --- a/src/main/java/ru/betterend/registry/EndBlocks.java +++ b/src/main/java/ru/betterend/registry/EndBlocks.java @@ -245,6 +245,7 @@ public class EndBlocks { public static final Block TWISTED_MOSS = registerBlock("twisted_moss", new BlockWallPlant()); public static final Block TUBE_WORM = registerBlock("tube_worm", new BlockUnderwaterWallPlant()); public static final Block BULB_MOSS = registerBlock("bulb_moss", new BlockWallPlant(12)); + public static final Block JUNGLE_FERN = registerBlock("jungle_fern", new BlockWallPlant()); // Crops // public static final Block SHADOW_BERRY = registerBlock("shadow_berry", new BlockShadowBerry()); diff --git a/src/main/java/ru/betterend/registry/EndFeatures.java b/src/main/java/ru/betterend/registry/EndFeatures.java index 35d64f26..8bf0f4ec 100644 --- a/src/main/java/ru/betterend/registry/EndFeatures.java +++ b/src/main/java/ru/betterend/registry/EndFeatures.java @@ -107,6 +107,7 @@ public class EndFeatures { public static final EndFeature BULB_MOSS_WOOD = new EndFeature("bulb_moss_wood", new WallPlantOnLogFeature(EndBlocks.BULB_MOSS, 6), 15); public static final EndFeature SMALL_JELLYSHROOM_WALL = new EndFeature("small_jellyshroom_wall", new WallPlantFeature(EndBlocks.SMALL_JELLYSHROOM, 4), 4); public static final EndFeature SMALL_JELLYSHROOM_WOOD = new EndFeature("small_jellyshroom_wood", new WallPlantOnLogFeature(EndBlocks.SMALL_JELLYSHROOM, 4), 8); + public static final EndFeature JUNGLE_FERN_WOOD = new EndFeature("jungle_fern_wood", new WallPlantOnLogFeature(EndBlocks.JUNGLE_FERN, 4), 8); // Water // public static final EndFeature BUBBLE_CORAL = new EndFeature("bubble_coral", new UnderwaterPlantFeature(EndBlocks.BUBBLE_CORAL, 6), 10); diff --git a/src/main/java/ru/betterend/world/biome/BiomeUmbrellaJungle.java b/src/main/java/ru/betterend/world/biome/BiomeUmbrellaJungle.java index 9506418f..f9153373 100644 --- a/src/main/java/ru/betterend/world/biome/BiomeUmbrellaJungle.java +++ b/src/main/java/ru/betterend/world/biome/BiomeUmbrellaJungle.java @@ -18,6 +18,7 @@ public class BiomeUmbrellaJungle extends EndBiome { .addFeature(EndFeatures.JUNGLE_GRASS) .addFeature(EndFeatures.CYAN_MOSS) .addFeature(EndFeatures.CYAN_MOSS_WOOD) + .addFeature(EndFeatures.JUNGLE_FERN_WOOD) .addFeature(EndFeatures.SMALL_JELLYSHROOM_WALL) .addFeature(EndFeatures.SMALL_JELLYSHROOM_WOOD) .addFeature(EndFeatures.SMALL_JELLYSHROOM_CEIL) diff --git a/src/main/resources/assets/betterend/blockstates/jungle_fern.json b/src/main/resources/assets/betterend/blockstates/jungle_fern.json new file mode 100644 index 00000000..2abe9492 --- /dev/null +++ b/src/main/resources/assets/betterend/blockstates/jungle_fern.json @@ -0,0 +1,8 @@ +{ + "variants": { + "facing=north": { "model": "betterend:block/jungle_fern", "y": 180 }, + "facing=south": { "model": "betterend:block/jungle_fern" }, + "facing=east": { "model": "betterend:block/jungle_fern", "y": 270 }, + "facing=west": { "model": "betterend:block/jungle_fern", "y": 90 } + } +} diff --git a/src/main/resources/assets/betterend/lang/en_us.json b/src/main/resources/assets/betterend/lang/en_us.json index e3165444..2547499b 100644 --- a/src/main/resources/assets/betterend/lang/en_us.json +++ b/src/main/resources/assets/betterend/lang/en_us.json @@ -522,5 +522,6 @@ "block.betterend.twisted_umbrella_moss_tall": "Twisted Umbrella Moss Tall", "block.betterend.umbrella_tree_cluster": "Umbrella Tree Cluster", "block.betterend.umbrella_tree_cluster_empty": "Empty Umbrella Tree Cluster", - "block.betterend.jungle_vine": "Jungle Vine" + "block.betterend.jungle_vine": "Jungle Vine", + "block.betterend.jungle_fern": "Jungle Fern" } diff --git a/src/main/resources/assets/betterend/lang/ru_ru.json b/src/main/resources/assets/betterend/lang/ru_ru.json index 0b007db6..3dcb9835 100644 --- a/src/main/resources/assets/betterend/lang/ru_ru.json +++ b/src/main/resources/assets/betterend/lang/ru_ru.json @@ -524,5 +524,6 @@ "block.betterend.twisted_umbrella_moss_tall": "Высокий закрученный зонтичный мох", "block.betterend.umbrella_tree_cluster": "Кластер зонтичного дерева", "block.betterend.umbrella_tree_cluster_empty": "Пустой кластер хонтичного дерева", - "block.betterend.jungle_vine": "Лоза джунглей" + "block.betterend.jungle_vine": "Лоза джунглей", + "block.betterend.jungle_fern": "Папоротник джунглей" } \ No newline at end of file diff --git a/src/main/resources/assets/betterend/materialmaps/block/jungle_fern.json b/src/main/resources/assets/betterend/materialmaps/block/jungle_fern.json new file mode 100644 index 00000000..6c554732 --- /dev/null +++ b/src/main/resources/assets/betterend/materialmaps/block/jungle_fern.json @@ -0,0 +1,18 @@ +{ + "defaultMap": { + "spriteMap": [ + { + "sprite": "betterend:block/jungle_fern_leaf", + "material": "betterend:waving_wall" + }, + { + "sprite": "betterend:block/jungle_fern_middle", + "material": "betterend:waving_wall" + }, + { + "sprite": "betterend:block/jungle_fern_spore", + "material": "betterend:waving_small" + } + ] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/jungle_fern.json b/src/main/resources/assets/betterend/models/block/jungle_fern.json new file mode 100644 index 00000000..5410c746 --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/jungle_fern.json @@ -0,0 +1,129 @@ +{ + "__comment": "Designed by Paulevs with Cubik Studio - https://cubik.studio", + "textures": { + "particle": "betterend:block/jungle_fern_leaf", + "texture": "betterend:block/jungle_fern_leaf", + "spore": "betterend:block/jungle_fern_spore", + "texture1": "betterend:block/jungle_fern_middle" + }, + "elements": [ + { + "__comment": "PlaneY3", + "from": [ 0, 8, 0 ], + "to": [ 16, 8.001, 8 ], + "rotation": { "origin": [ 0, 8, 0 ], "axis": "x", "angle": -22.5 }, + "shade": false, + "faces": { + "down": { "uv": [ 16, 8, 0, 16 ], "texture": "#texture" }, + "up": { "uv": [ 16, 16, 0, 8 ], "texture": "#texture" } + } + }, + { + "__comment": "PlaneY6", + "from": [ 8, 7.875, -7 ], + "to": [ 16, 7.876, 9 ], + "rotation": { "origin": [ 8, 7.875, -7 ], "axis": "z", "angle": 22.5 }, + "shade": false, + "faces": { + "down": { "uv": [ 16, 8, 0, 16 ], "texture": "#texture", "rotation": 90 }, + "up": { "uv": [ 0, 8, 16, 16 ], "texture": "#texture", "rotation": 90 } + } + }, + { + "__comment": "PlaneY6", + "from": [ 0, 7.874, -7 ], + "to": [ 8, 7.875, 9 ], + "rotation": { "origin": [ 8, 7.875, -7 ], "axis": "z", "angle": -22.5 }, + "shade": false, + "faces": { + "down": { "uv": [ 16, 16, 0, 8 ], "texture": "#texture", "rotation": 90 }, + "up": { "uv": [ 0, 16, 16, 8 ], "texture": "#texture", "rotation": 90 } + } + }, + { + "__comment": "PlaneY8", + "from": [ 0, 11, 7.375 ], + "to": [ 16, 11.001, 15.375 ], + "shade": false, + "faces": { + "down": { "uv": [ 16, 0, 0, 8 ], "texture": "#texture" }, + "up": { "uv": [ 16, 8, 0, 0 ], "texture": "#texture" } + } + }, + { + "__comment": "PlaneY9", + "from": [ 15.25, 10.875, -7 ], + "to": [ 23.25, 10.876, 9 ], + "shade": false, + "faces": { + "down": { "uv": [ 16, 0, 0, 8 ], "texture": "#texture", "rotation": 90 }, + "up": { "uv": [ 0, 0, 16, 8 ], "texture": "#texture", "rotation": 90 } + } + }, + { + "__comment": "PlaneY9", + "from": [ -7.25, 10.875, -7 ], + "to": [ 0.75, 10.876, 9 ], + "shade": false, + "faces": { + "down": { "uv": [ 0, 8, 16, 0 ], "texture": "#texture", "rotation": 90 }, + "up": { "uv": [ 0, 8, 16, 0 ], "texture": "#texture", "rotation": 90 } + } + }, + { + "__comment": "PlaneX11", + "from": [ 8, -5, 0 ], + "to": [ 8.001, 11, 16 ], + "rotation": { "origin": [ 8, -5, 0 ], "axis": "y", "angle": 45 }, + "shade": false, + "faces": { + "west": { "uv": [ 16, 0, 0, 16 ], "texture": "#spore" }, + "east": { "uv": [ 0, 0, 16, 16 ], "texture": "#spore" } + } + }, + { + "__comment": "PlaneX11", + "from": [ 8, -5, 0 ], + "to": [ 8.001, 11, 16 ], + "rotation": { "origin": [ 8, -5, 0 ], "axis": "y", "angle": -45 }, + "shade": false, + "faces": { + "west": { "uv": [ 16, 0, 0, 16 ], "texture": "#spore" }, + "east": { "uv": [ 0, 0, 16, 16 ], "texture": "#spore" } + } + }, + { + "__comment": "PlaneY9", + "from": [ 8.5, 8, -10 ], + "to": [ 24.5, 8.001, 6 ], + "rotation": { "origin": [ 24.5, 8, 6 ], "axis": "y", "angle": 45 }, + "shade": false, + "faces": { + "down": { "uv": [ 0, 16, 16, 0 ], "texture": "#texture", "rotation": 180 }, + "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture", "rotation": 180 } + } + }, + { + "__comment": "PlaneY9", + "from": [ -13.0001, 7.625, 1.5 ], + "to": [ 2.9999, 7.626, 17.5 ], + "rotation": { "origin": [ 3, 7.625, 17.5 ], "axis": "y", "angle": -45 }, + "shade": false, + "faces": { + "down": { "uv": [ 0, 16, 16, 0 ], "texture": "#texture", "rotation": 180 }, + "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture", "rotation": 180 } + } + }, + { + "__comment": "PlaneZ12", + "from": [ 0, 8, 0.5 ], + "to": [ 16, 24, 0.501 ], + "rotation": { "origin": [ 0, 8, 0.5 ], "axis": "x", "angle": 22.5 }, + "shade": false, + "faces": { + "north": { "uv": [ 16, 0, 0, 16 ], "texture": "#texture1" }, + "south": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture1" } + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/textures/block/jungle_fern_leaf.png b/src/main/resources/assets/betterend/textures/block/jungle_fern_leaf.png new file mode 100644 index 0000000000000000000000000000000000000000..52a1e00a992598bf182e4ed438c69116e3866948 GIT binary patch literal 1681 zcmbVNe{2&~9KXqcv23uJ7`74gJaD0b>;353t~ZV`dSmV2#@wnDRI=OMTYIke!@C>p z788xzVpJAl76Kv@O$i!Z9BKlxiHkan$bu$HfeUvUI{8dHdEbU4bC^ zm*r5{3iDeTQB$0Pq_qQQLeU`_LDttMbV2L{7TOLXvdUtqv2hHQB^KN6=1E@ngQy(n zF+giiQ%LOT6nzp_y8&IFU?714ECEd@G1X)eESBbF;M)F7U}zd*b+TBUEf5X!&8S~9 z0P1#naFME_QLoQQc}O2!wGO38%1e-5f^y*`#gHDxVz z&JaXA9(TrFPR)oAl+WiQNSdH&93pVDTeXA)u9~Z|3>+{;L)I->Q&F2yXxF+d7K573 zo1o}9TGhrqW-5tOQ7GN=&q)D8jaoQcCyi66%Q1n{T#gODYl-DG= zqx-MWYKHbOZt4ao%o<6sgntD~BGaK6iU4hv6(Ir$U5#L9&XbH^i)jWF47GEmwcvRs zsG63biXh0b7&O}{%Mw%Va(M+WN#h#*X20qP>qTmL1a2&g|{SL3`X#GkE9pIukESvYJ5_A=Lp;3n6} zfC}4}0sBV}tU8s6spmnTq!M!CzuYJMa|JFo91y!=p-L@)xF?D6}mq(7h z8Av`hm5Mqp6l~bozwzJ%=Q(iTRL>7ZML$*6?0EU){u=Y#q;E_-WF9$vu6}Tkn8uUm z%Lb6Cw)jvgIsHN-?MKk3e;XP3I&~rW^LLB!m3_bJ#>1=kZ$XEW&)?m<{A|+@ch8mb zimRi0U->+o>~EP|eXVlN`|6`l_RY-hd;bHa@;PgidG8zW46!Z354!s=#mf#2Zz(O9 z8C%&ZoSvSYDZDNJonyUA?&#dr_;FF*=%$gf>PriL2|66hj*cUb&%J1b&gOsOrhNS$ zopG05{dD2ZZ+rLbJ$zcbMQ{&H`c<`mUwz*tvVnt+*8G9+LuqcO4xbt({%8Y;L%qug3mq1nZl) J*Eh92@dw#AI&1&{ literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/betterend/textures/block/jungle_fern_middle.png b/src/main/resources/assets/betterend/textures/block/jungle_fern_middle.png new file mode 100644 index 0000000000000000000000000000000000000000..0731ac0012d04df4fd054d0664a78ed17d2fcd2e GIT binary patch literal 1842 zcmbVNTWs4@7TtIb z#M%>bYQP#u?%_pE@jyvSBTrG$F`6JcBSjsGL&zf2C@ZT1_3P}16e&vrwa=eqlX?{8 z1va`rz0tH!+EGl``?r+G|Ta9fcJ*U>Oo;|hLqv^V!Nxp@RLC0 zEKBDZrcfw&3SN(9WEn0T4l^uZ0H85~Hb+$p7HQRNuQ9}sDH^hF$(l;qj4-VYTLOiZ zE`^}zbz0S|rU@sEDMFp$Jggm31t^JioIY&iE6yd6L3yMg)iN=bt7G+?W@%Fr(?Pzp9Y9MH7MoQE2 zwLHLeV?pKTEV>QDjO7o77{4H0+!|g4g4uC$ooUQkL_T+Jj*UYlbR%F zM*j;9@gU4|;2J3I8VOqPf5DQ-XEZ~BIA&RaS;XjSmLlt!dNA5t)`=x zmGql%p$~l{J7&`bF4f* zyKwaUU#AZ@FFpvGPxn2)B>{GgKYFqpeB@Q|>_XhTzj;U7*|nr|=f(2Jmj(@I`_vZ% zxbVx|6Q`ONF26W^@PVHr-;7K_@}pxX|Jk;^vC#4z@dx32+7WN-ZEydo<&yq)@j{cc zBN%bM=G=7R*!(TK-*K=%y}s`D&o`G8^1dr`>Fj*rM@YQqe#3pSq0~kuN{yCta8e)I z==_sgd}elH?<)tp&bhwdGvg>vD{FR4w$4nQA>O?ld0~G1&}~yc+;R3(()qz-k8gCh zmO9rDuAz=Mmdd-%HOQGGx55ee(3VN>)@heRZjdK_8yCi(ntsc%?#Q?2-+%LpVE@$; M-953l?-_jZUt|qh`v3p{ literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/betterend/textures/block/jungle_fern_spore.png b/src/main/resources/assets/betterend/textures/block/jungle_fern_spore.png new file mode 100644 index 0000000000000000000000000000000000000000..114400bd8a43978337ca89b05612ad78bab7193a GIT binary patch literal 1552 zcmbVMTWB0r7@nBY*20#8q$HK#I5FB%XXmoF%pqflJJDUpq#<4G_Q9C5GiP^)%*>h0 zob7HxrKO-$urH!m3o45EQ1DvtrP_cik|J2B54I2?Pud5uN)QSv>zTa_t;Aag&YatK zzW@HeFgx>PY}dYB48z3oIc<*4d&04EJN-Yf*@ASs*UKFZ7-shu;plti;O_ewX4|G! zD3YQ+4GiqWp@~Z<-f%pMW|;Abh6jyBMA#ClSgy+5ytvA-mZ@?_Qo5*nSyZ)hD?U2B zGE*>C77fMZCLUwQ8-Nlxh(NaC*lqwCD%a)(bR8ZG9NUJFMU|Tj1+qnbmd#=xv8i~P zH>9M@W|X*;78N=9C@YInMi4WCl;A}Ph-r{e*zU(sX}(zobJ`PKS#+mzRYE)<2=#hB zUQfiaUlAllQ3O#IWSOT3K3H}MZ18R{(qqt2VEC3tEbOu&BP`(>Q8}t<#{|cVXx*Ue zCh9Pu0X;#Ai=jzvplL)nujbor;ie%V8#%}&0mVuY)~jNIgDUgf6o0o1j+9?95J z7srW21Z3(MHKXg0Ezv+< zV8WCoJ_AvPS4znwuRufMQ>An|Ey+qMku3M#YuKoT!R@^_|L6NdzD0`*+IP(pmRy(> zAZGaG8hQ3BOp2&=JUittw}+jqBBZVyh|LAZ?i5Zy$b47s#@`Ls`MU%D_%dt5WGO%}$! zGJbEhCi+KDE>#EFf!BX~Q_l^4-TL(>zPWnnnZbGcjVq_WWy~|8zIy4|zRlN;7KhGW zzqWLdd3WfYU#?%h{Njz$#QdiV8{b_0(q%q6cVfJ8`a9;i_2*k_=SGj;*9!KpHDlX` zp4uFF`K|Ap=8sV1Z|y0Hi|-Aup9G(1V<&3s10Np0!3|IMFTC`@>ZRuSKJBJ;>*v-V zpFMId#^g^`&)!2~Vn5uwLHa&Ev$k*N!w=c>?19m@cWi82nPztU@cDz6pMG^9?AiIL L8SVYY7f$^Nnd|+0 literal 0 HcmV?d00001