From 65ffaf0c60d7e24cee1e6755507a63058a1b6ee7 Mon Sep 17 00:00:00 2001 From: paulevsGitch Date: Fri, 27 Nov 2020 16:21:22 +0300 Subject: [PATCH 1/2] Twisted moss enhancements --- .../models/block/twisted_moss_01.json | 100 +++++++++++++++++- .../models/block/twisted_moss_02.json | 67 +++++++++++- .../models/block/twisted_moss_03.json | 67 +++++++++++- .../betterend/textures/block/twisted_moss.png | Bin 339 -> 2115 bytes .../textures/block/twisted_moss_2.png | Bin 0 -> 2092 bytes 5 files changed, 222 insertions(+), 12 deletions(-) create mode 100644 src/main/resources/assets/betterend/textures/block/twisted_moss_2.png diff --git a/src/main/resources/assets/betterend/models/block/twisted_moss_01.json b/src/main/resources/assets/betterend/models/block/twisted_moss_01.json index a355eeee..46ea476b 100644 --- a/src/main/resources/assets/betterend/models/block/twisted_moss_01.json +++ b/src/main/resources/assets/betterend/models/block/twisted_moss_01.json @@ -1,6 +1,98 @@ { - "parent": "betterend:block/wall_moss_01", + "__comment": "Designed by Paulevs with Cubik Studio - https://cubik.studio", "textures": { - "texture": "betterend:block/twisted_moss" - } -} + "texture": "betterend:block/twisted_moss", + "texture2": "betterend:block/twisted_moss_2", + "particle": "#texture" + }, + "elements": [ + { + "__comment": "PlaneY1", + "from": [ 3, 15, 0 ], + "to": [ 19, 15.001, 16 ], + "rotation": { "origin": [ 3, 15, 0 ], "axis": "x", "angle": 45 }, + "shade": false, + "faces": { + "down": { "uv": [ 16, 0, 0, 16 ], "texture": "#texture" }, + "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture", "rotation": 180 } + } + }, + { + "__comment": "PlaneY1", + "from": [ 1, 11, 0 ], + "to": [ 17, 11.001, 16 ], + "rotation": { "origin": [ 1, 11, 0 ], "axis": "x", "angle": 45 }, + "shade": false, + "faces": { + "down": { "uv": [ 16, 0, 0, 16 ], "texture": "#texture2" }, + "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture2", "rotation": 180 } + } + }, + { + "__comment": "PlaneY1", + "from": [ 1, -10, 0 ], + "to": [ 17, 6, 0.001 ], + "rotation": { "origin": [ 1, 6, 0 ], "axis": "x", "angle": -45 }, + "shade": false, + "faces": { + "north": { "uv": [ 0, 16, 16, 0 ], "texture": "#texture2" }, + "south": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture2", "rotation": 180 } + } + }, + { + "__comment": "PlaneY1", + "from": [ -3, 13.5, 0 ], + "to": [ 13, 13.501, 16 ], + "rotation": { "origin": [ -3, 13.5, 0 ], "axis": "x", "angle": 45 }, + "shade": false, + "faces": { + "down": { "uv": [ 16, 0, 0, 16 ], "texture": "#texture" }, + "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture", "rotation": 180 } + } + }, + { + "__comment": "PlaneY1", + "from": [ 1, 1, 0 ], + "to": [ 17, 1.001, 16 ], + "rotation": { "origin": [ 1, 1, 0 ], "axis": "x", "angle": 22.5 }, + "shade": false, + "faces": { + "down": { "uv": [ 16, 0, 0, 16 ], "texture": "#texture2" }, + "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture2", "rotation": 180 } + } + }, + { + "__comment": "PlaneY1", + "from": [ -1, -9, 0 ], + "to": [ 15, 7, 0.001 ], + "rotation": { "origin": [ -1, 7, 0 ], "axis": "x", "angle": -45 }, + "shade": false, + "faces": { + "north": { "uv": [ 0, 16, 16, 0 ], "texture": "#texture2" }, + "south": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture2", "rotation": 180 } + } + }, + { + "__comment": "PlaneY1", + "from": [ -1.5, 16, 0 ], + "to": [ 14.5, 16.001, 16 ], + "rotation": { "origin": [ -1.5, 16, 0 ], "axis": "x", "angle": 45 }, + "shade": false, + "faces": { + "down": { "uv": [ 16, 0, 0, 16 ], "texture": "#texture" }, + "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture", "rotation": 180 } + } + }, + { + "__comment": "PlaneY1", + "from": [ -2, 0.5, 0 ], + "to": [ 14, 0.501, 16 ], + "rotation": { "origin": [ -2, 0.5, 0 ], "axis": "x", "angle": 22.5 }, + "shade": false, + "faces": { + "down": { "uv": [ 16, 0, 0, 16 ], "texture": "#texture2" }, + "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture2", "rotation": 180 } + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/twisted_moss_02.json b/src/main/resources/assets/betterend/models/block/twisted_moss_02.json index 61967777..d25a3c3b 100644 --- a/src/main/resources/assets/betterend/models/block/twisted_moss_02.json +++ b/src/main/resources/assets/betterend/models/block/twisted_moss_02.json @@ -1,6 +1,65 @@ { - "parent": "betterend:block/wall_moss_02", + "__comment": "Designed by Paulevs with Cubik Studio - https://cubik.studio", "textures": { - "texture": "betterend:block/twisted_moss" - } -} + "texture": "betterend:block/twisted_moss", + "texture2": "betterend:block/twisted_moss_2", + "particle": "#texture" + }, + "elements": [ + { + "__comment": "PlaneY1", + "from": [ 3, 15, 0 ], + "to": [ 19, 15.001, 16 ], + "rotation": { "origin": [ 3, 15, 0 ], "axis": "x", "angle": 45 }, + "shade": false, + "faces": { + "down": { "uv": [ 16, 0, 0, 16 ], "texture": "#texture" }, + "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture", "rotation": 180 } + } + }, + { + "__comment": "PlaneY1", + "from": [ 0, -15, 0 ], + "to": [ 16, 1, 0.001 ], + "rotation": { "origin": [ 0, 1, 0 ], "axis": "x", "angle": -22.5 }, + "shade": false, + "faces": { + "north": { "uv": [ 0, 16, 16, 0 ], "texture": "#texture2" }, + "south": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture2", "rotation": 180 } + } + }, + { + "__comment": "PlaneY1", + "from": [ -2, -12, 0 ], + "to": [ 14, 4, 0.001 ], + "rotation": { "origin": [ -2, 4, 0 ], "axis": "x", "angle": -45 }, + "shade": false, + "faces": { + "north": { "uv": [ 0, 16, 16, 0 ], "texture": "#texture2" }, + "south": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture2", "rotation": 180 } + } + }, + { + "__comment": "PlaneY1", + "from": [ 0, -9, 0 ], + "to": [ 16, 7, 0.001 ], + "rotation": { "origin": [ 0, 7, 0 ], "axis": "x", "angle": -45 }, + "shade": false, + "faces": { + "north": { "uv": [ 0, 16, 16, 0 ], "texture": "#texture" }, + "south": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture", "rotation": 180 } + } + }, + { + "__comment": "PlaneY1", + "from": [ 0, -3, 0 ], + "to": [ 16, 13, 0.001 ], + "rotation": { "origin": [ 0, 13, 0 ], "axis": "x", "angle": -22.5 }, + "shade": false, + "faces": { + "north": { "uv": [ 0, 16, 16, 0 ], "texture": "#texture2" }, + "south": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture2", "rotation": 180 } + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/twisted_moss_03.json b/src/main/resources/assets/betterend/models/block/twisted_moss_03.json index 9bbae714..c3add803 100644 --- a/src/main/resources/assets/betterend/models/block/twisted_moss_03.json +++ b/src/main/resources/assets/betterend/models/block/twisted_moss_03.json @@ -1,6 +1,65 @@ { - "parent": "betterend:block/wall_moss_03", + "__comment": "Designed by Paulevs with Cubik Studio - https://cubik.studio", "textures": { - "texture": "betterend:block/twisted_moss" - } -} + "texture": "betterend:block/twisted_moss", + "texture2": "betterend:block/twisted_moss_2", + "particle": "#texture" + }, + "elements": [ + { + "__comment": "PlaneY1", + "from": [ -1, 0, 0 ], + "to": [ 15, 16, 0.001 ], + "rotation": { "origin": [ -1, 16, 0 ], "axis": "x", "angle": -22.5 }, + "shade": false, + "faces": { + "north": { "uv": [ 0, 16, 16, 0 ], "texture": "#texture2" }, + "south": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture2", "rotation": 180 } + } + }, + { + "__comment": "PlaneY1", + "from": [ 2, -3, 0 ], + "to": [ 18, 13, 0.001 ], + "rotation": { "origin": [ 2, 13, 0 ], "axis": "x", "angle": -22.5 }, + "shade": false, + "faces": { + "north": { "uv": [ 0, 16, 16, 0 ], "texture": "#texture" }, + "south": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture", "rotation": 180 } + } + }, + { + "__comment": "PlaneY1", + "from": [ 0, -8, 0 ], + "to": [ 16, 8, 0.001 ], + "rotation": { "origin": [ 0, 8, 0 ], "axis": "x", "angle": -22.5 }, + "shade": false, + "faces": { + "north": { "uv": [ 0, 16, 16, 0 ], "texture": "#texture2" }, + "south": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture2", "rotation": 180 } + } + }, + { + "__comment": "PlaneY1", + "from": [ -3, -12, 0 ], + "to": [ 13, 4, 0.001 ], + "rotation": { "origin": [ -3, 4, 0 ], "axis": "x", "angle": -22.5 }, + "shade": false, + "faces": { + "north": { "uv": [ 0, 16, 16, 0 ], "texture": "#texture" }, + "south": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture", "rotation": 180 } + } + }, + { + "__comment": "PlaneY1", + "from": [ 3, -15, 0 ], + "to": [ 19, 1, 0.001 ], + "rotation": { "origin": [ 3, 1, 0 ], "axis": "x", "angle": -22.5 }, + "shade": false, + "faces": { + "north": { "uv": [ 0, 16, 16, 0 ], "texture": "#texture2" }, + "south": { "uv": [ 0, 0, 16, 16 ], "texture": "#texture2", "rotation": 180 } + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/textures/block/twisted_moss.png b/src/main/resources/assets/betterend/textures/block/twisted_moss.png index 5886be2b0d4bfe09f0c26cfd6066c2e989d77fdb..e1503ae704108c32e1db8c5c444cfbd500e32cae 100644 GIT binary patch literal 2115 zcmbVN4Qvx-7%mJKem3j`-6q101Ll-n@26e69+ai5gAFYVsCFc~W@9ue@ z_j!N5_g>FmyfA+J)8jQ7O?+OiZ5h04)oW}l{7<>2Fz_}`%v~XAG!rJN*C@^Qok<$a zW9_`7KrXPqNV9@Z$8drR=t4dbqBWYiSs{^OOM#5IfQR>6&?|>pQH19#s58S(*u`v6 z!sk{6!1Aia4z{Y4HFIdzJY;T&h6Fw!Gf2qi^-FZff)4W1aIHSZQDhJzms(J(>JTZg z=Ofud03aDUBgT>j3Ne{=q>(UFhIE7?NE1$&a8i#EBuyA;y%~x8Q0Ohdx#?xL1rc9x zXF*G3S)_417!2xydYusP;H24X#t90iC=4PnsnRbqAT715!3rWtYfMG-uG9p@XREhv!1|*?8z=E6#D07AyjYww) z03!u-ZY!g z(*!XDwF?~YuDl0oa*#%v%%C%fyP&XZI7Vjv7tFD=TL}0V7&Grhyyu>~=cOFUgFb1$j0L3d7d%JVzUhZWER1VlcPcXuv4O0I*Du0ksB7-neW{lztF3bcBEVSo1%xrWU3>;jU7;@NtNq~oki}5}( zk9y?PuAp;y3D&DJawwLAvdGHIBZG}VGpyR+7L-*h3ph0Lm>(en4;R4@ZLkDD(g&1# z2qp<`ImiTn)dREjFdc>8Prt-eJXrn1)o(=g|Lwp>R3Aw$Tf+D~0M1MtRpY_c=`vIr z{NAb!zPn=*4a4DhQ+Mb2N$!r+u6K1~$hWVaamIyr+?dwybZ%xlj>Ue5tT{B#HTlR9e`ZrnX^;aoSTO?a}cM{eHU zlJJx^=I7I^m|~afALU9{))$RUcwv8{c5-pC$J0)X`QWm0(J3UQa%O8>bL*uZB`93x{thoo`%->+2i6zO%)+i741}c-?f-{Y-oJi4BVM zOMh}*pHjbwit`j6W;Shp%eC(L&+4X}T7ICXCa)-I=i{c@RV%NzI=9SNIof^v;~h(q zzW<}MuJiLB{#2CiFq@g;J#y|QujDwolg}1~+O#dH@#$}}TYHO|7jCk?v}o<9nZYIV zcapO^o0)B^yJ`vxr^Q-hk{eCIX;er0agIwrV86XDZSN7}o%h?0tht4?fB4m$WhRQBZEQsUM*xGGV8njKPYE~p9$0pnD zjWM@P?b$nat!)@JbKvGTlVY3uwp=`YwEBGS6AKQOCMpf_#f<9~J{_6(qkR4h7F#xN zX=Br#Lj73rZ+&e?QFUnCwub#RN`HHC>6P$bznz$6b6?Hhui$OZ#^uGN6p@z>uYNUQ tg*V(%zMfoQRl2IHzW(I=No(d5P4)N*`QYShbJWj#Ue03M-ucD#{{lHo@wos1 delta 313 zcmV-90mlBr5YqyXBYy!JNklnBtr0kk$R*wEyqTRJJEQA$cYAq9t(v#x*$?#XdvEu~+npI_ z=5F@{f0YQ*VMr8F>S6x`1t|nYSZW;>p#^1NVDy_P5YIE?IJunO?5|EaO{9g{c{B5Q zpYP}U{eIqid)KaBHD}iSvqGWJoR0RyI(nZMTz5~W|BL_hA-&DC+c&tO(CqoaRTp~g zKsXede%MHLd0olJbY$ft5L;;yDdug84uw`U6>W%mh{vQ!)-dDj@UastW8gTuUQU9f z-AcNR_N@--+`2l2w)P+mvrQ|R6-AvAKGUOeSE2X{*?XuGp(&bV`9vM>kSiI1$WtmIV1r+5@$sq0!|P(QAvq{E&)BNJ_MpV0A*;> z!bYb52B?}66kUkvK)Mb}U4x+q{}YUnp0S)fq&XXTm?gYzW?80INxjv|Sq=?M)kRAx zl1aV8bUkPy(vgU>H0_9CU_B}WkkO(s4rd_Zh$;!329U}@C5;7HQN%Qc)%ghv^#;ui z=9hhrEkrr~jVcL5h^7UNPDg1@jY)`06O1{isWJjsR*;;ovaN9py3}B9B5R-uQ${QT z87QL0iCCgMg!04!9!<$e5~d>+3W1?Z9?{zkmv*nevP3$`mdYq+FeO{)5CwLRvnc2@ z!EEKVF-bjcD{^Iip_@?BTQt8M-L*1a0Xn2POKW#K{^D<@--Ug*Rxc?TRg9$}m&qs+ zCqjwPy2c0n`a`@6o}*45dy=Bu~-sn5=fMfZ*T{ZT{x?|X7@ zpZ5ochvug4YwURS+F<9CQ`_LaC%*P)kMiP*54OJqSDk*(Kl|H(X)iQs{fBmqo}GI% z+`jnRo$hD^e0RLKANKyW`RKy~@W&mIg?)RD9T^rr^sm-6&bW&i8*Ln3)b-7@kJE#> zGvVf+2kM?O>sy{_@ktvFV@Y0g&xIfA3p1C`o-w6;eB||pdN9^-?#T0FpZ>9QAa^cu zEnBy2{K_x$htBiXqVEr_{N&Q*vpv(dtb81BCr`~?IOFq;+nhOPwvYU@bZGd*j_~op z__%-dB{4d^ozkd0}2X?<( ZH~-4PH^hUN`-1blqiuEKot90{{R33E!7~5= literal 0 HcmV?d00001 From 0e26dc13140cc74ae3a8b9022c82330cf0602e93 Mon Sep 17 00:00:00 2001 From: paulevsGitch Date: Fri, 27 Nov 2020 16:25:25 +0300 Subject: [PATCH 2/2] More grass --- src/main/java/ru/betterend/registry/EndFeatures.java | 1 + src/main/java/ru/betterend/world/biome/BlossomingSpires.java | 1 + 2 files changed, 2 insertions(+) diff --git a/src/main/java/ru/betterend/registry/EndFeatures.java b/src/main/java/ru/betterend/registry/EndFeatures.java index 84daae2e..fdb26aee 100644 --- a/src/main/java/ru/betterend/registry/EndFeatures.java +++ b/src/main/java/ru/betterend/registry/EndFeatures.java @@ -59,6 +59,7 @@ public class EndFeatures { public static final EndFeature NEEDLEGRASS = new EndFeature("needlegrass", new SinglePlantFeature(EndBlocks.NEEDLEGRASS, 3), 2); public static final EndFeature SHADOW_BERRY = new EndFeature("shadow_berry", new SinglePlantFeature(EndBlocks.SHADOW_BERRY, 2), 1); public static final EndFeature BUSHY_GRASS = new EndFeature("bushy_grass", new SinglePlantFeature(EndBlocks.BUSHY_GRASS, 8, false), 20); + public static final EndFeature BUSHY_GRASS_WG = new EndFeature("bushy_grass_wg", new SinglePlantFeature(EndBlocks.BUSHY_GRASS, 5), 10); // Vines // public static final EndFeature DENSE_VINE = new EndFeature("dense_vine", new VineFeature(EndBlocks.DENSE_VINE, 24), 3); diff --git a/src/main/java/ru/betterend/world/biome/BlossomingSpires.java b/src/main/java/ru/betterend/world/biome/BlossomingSpires.java index fe2254c1..a5a34a9c 100644 --- a/src/main/java/ru/betterend/world/biome/BlossomingSpires.java +++ b/src/main/java/ru/betterend/world/biome/BlossomingSpires.java @@ -17,6 +17,7 @@ public class BlossomingSpires extends EndBiome { .addFeature(EndFeatures.TENANEA_BUSH) .addFeature(EndFeatures.BULB_VINE) .addFeature(EndFeatures.BUSHY_GRASS) + .addFeature(EndFeatures.BUSHY_GRASS_WG) .addFeature(EndFeatures.TWISTED_MOSS) .addFeature(EndFeatures.TWISTED_MOSS_WOOD) .addMobSpawn(EntityType.ENDERMAN, 50, 1, 4));