From e59af33124d7ae9442752d0a226aa0ae87c3f673 Mon Sep 17 00:00:00 2001 From: paulevsGitch Date: Thu, 26 Nov 2020 21:59:56 +0300 Subject: [PATCH] Twisted moss --- .../java/ru/betterend/registry/EndBlocks.java | 1 + .../ru/betterend/registry/EndFeatures.java | 2 ++ .../world/biome/BlossomingSpires.java | 2 ++ .../betterend/blockstates/twisted_moss.json | 24 ++++++++++++++++++ .../assets/betterend/lang/en_us.json | 4 ++- .../assets/betterend/lang/ru_ru.json | 4 ++- .../materialmaps/block/twisted_moss.json | 3 +++ .../models/block/twisted_moss_01.json | 6 +++++ .../models/block/twisted_moss_02.json | 6 +++++ .../models/block/twisted_moss_03.json | 6 +++++ .../betterend/models/item/twisted_moss.json | 6 +++++ .../betterend/textures/block/twisted_moss.png | Bin 0 -> 2416 bytes 12 files changed, 62 insertions(+), 2 deletions(-) create mode 100644 src/main/resources/assets/betterend/blockstates/twisted_moss.json create mode 100644 src/main/resources/assets/betterend/materialmaps/block/twisted_moss.json create mode 100644 src/main/resources/assets/betterend/models/block/twisted_moss_01.json create mode 100644 src/main/resources/assets/betterend/models/block/twisted_moss_02.json create mode 100644 src/main/resources/assets/betterend/models/block/twisted_moss_03.json create mode 100644 src/main/resources/assets/betterend/models/item/twisted_moss.json create mode 100644 src/main/resources/assets/betterend/textures/block/twisted_moss.png diff --git a/src/main/java/ru/betterend/registry/EndBlocks.java b/src/main/java/ru/betterend/registry/EndBlocks.java index 83440470..f96b546f 100644 --- a/src/main/java/ru/betterend/registry/EndBlocks.java +++ b/src/main/java/ru/betterend/registry/EndBlocks.java @@ -156,6 +156,7 @@ public class EndBlocks { public static final Block PURPLE_POLYPORE = registerBlock("purple_polypore", new BlockWallMushroom(13)); public static final Block TAIL_MOSS = registerBlock("tail_moss", new BlockWallPlant()); public static final Block CYAN_MOSS = registerBlock("cyan_moss", new BlockWallPlant()); + public static final Block TWISTED_MOSS = registerBlock("twisted_moss", 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 083adf7f..5532afc7 100644 --- a/src/main/java/ru/betterend/registry/EndFeatures.java +++ b/src/main/java/ru/betterend/registry/EndFeatures.java @@ -70,6 +70,8 @@ public class EndFeatures { public static final EndFeature CYAN_MOSS = new EndFeature("cyan_moss", new WallPlantFeature(EndBlocks.CYAN_MOSS, 3), 15); public static final EndFeature TAIL_MOSS_WOOD = new EndFeature("tail_moss_wood", new WallPlantOnLogFeature(EndBlocks.TAIL_MOSS, 4), 25); public static final EndFeature CYAN_MOSS_WOOD = new EndFeature("cyan_moss_wood", new WallPlantOnLogFeature(EndBlocks.CYAN_MOSS, 4), 25); + public static final EndFeature TWISTED_MOSS = new EndFeature("twisted_moss", new WallPlantFeature(EndBlocks.TWISTED_MOSS, 6), 15); + public static final EndFeature TWISTED_MOSS_WOOD = new EndFeature("twisted_moss_wood", new WallPlantOnLogFeature(EndBlocks.TWISTED_MOSS, 6), 25); // Water // public static final EndFeature BUBBLE_CORAL = new EndFeature("bubble_coral", new UnderwaterPlantFeature(EndBlocks.BUBBLE_CORAL, 10), 10); diff --git a/src/main/java/ru/betterend/world/biome/BlossomingSpires.java b/src/main/java/ru/betterend/world/biome/BlossomingSpires.java index 829b1701..c15c7451 100644 --- a/src/main/java/ru/betterend/world/biome/BlossomingSpires.java +++ b/src/main/java/ru/betterend/world/biome/BlossomingSpires.java @@ -15,6 +15,8 @@ public class BlossomingSpires extends EndBiome { .addFeature(EndFeatures.FLOATING_SPIRE) .addFeature(EndFeatures.TENANEA) .addFeature(EndFeatures.TENANEA_BUSH) + .addFeature(EndFeatures.TWISTED_MOSS) + .addFeature(EndFeatures.TWISTED_MOSS_WOOD) .addMobSpawn(EntityType.ENDERMAN, 50, 1, 4)); } } diff --git a/src/main/resources/assets/betterend/blockstates/twisted_moss.json b/src/main/resources/assets/betterend/blockstates/twisted_moss.json new file mode 100644 index 00000000..27980d36 --- /dev/null +++ b/src/main/resources/assets/betterend/blockstates/twisted_moss.json @@ -0,0 +1,24 @@ +{ + "variants": { + "facing=north": [ + { "model": "betterend:block/twisted_moss_01", "y": 180 }, + { "model": "betterend:block/twisted_moss_02", "y": 180 }, + { "model": "betterend:block/twisted_moss_03", "y": 180 } + ], + "facing=south": [ + { "model": "betterend:block/twisted_moss_01" }, + { "model": "betterend:block/twisted_moss_02" }, + { "model": "betterend:block/twisted_moss_03" } + ], + "facing=east": [ + { "model": "betterend:block/twisted_moss_01", "y": 270 }, + { "model": "betterend:block/twisted_moss_02", "y": 270 }, + { "model": "betterend:block/twisted_moss_03", "y": 270 } + ], + "facing=west": [ + { "model": "betterend:block/twisted_moss_01", "y": 90 }, + { "model": "betterend:block/twisted_moss_02", "y": 90 }, + { "model": "betterend:block/twisted_moss_03", "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 4e93a053..970c0059 100644 --- a/src/main/resources/assets/betterend/lang/en_us.json +++ b/src/main/resources/assets/betterend/lang/en_us.json @@ -336,5 +336,7 @@ "block.betterend.tenanea_outer_leaves": "Tenanea Outer Leaves", "block.betterend.pink_moss": "Pink Moss", - "block.betterend.pink_moss_path": "Pink Moss Path" + "block.betterend.pink_moss_path": "Pink Moss Path", + + "block.betterend.twisted_moss": "Twisted Moss" } \ 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 ebcd4606..a3087c9d 100644 --- a/src/main/resources/assets/betterend/lang/ru_ru.json +++ b/src/main/resources/assets/betterend/lang/ru_ru.json @@ -338,5 +338,7 @@ "block.betterend.tenanea_outer_leaves": "Внешние листья тенанеи", "block.betterend.pink_moss": "Розовый мох", - "block.betterend.pink_moss_path": "Тропа из розового мха" + "block.betterend.pink_moss_path": "Тропа из розового мха", + + "block.betterend.twisted_moss": "Закрученный мох" } \ No newline at end of file diff --git a/src/main/resources/assets/betterend/materialmaps/block/twisted_moss.json b/src/main/resources/assets/betterend/materialmaps/block/twisted_moss.json new file mode 100644 index 00000000..45210670 --- /dev/null +++ b/src/main/resources/assets/betterend/materialmaps/block/twisted_moss.json @@ -0,0 +1,3 @@ +{ + "defaultMaterial": "betterend:waving_wall" +} 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 new file mode 100644 index 00000000..a355eeee --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/twisted_moss_01.json @@ -0,0 +1,6 @@ +{ + "parent": "betterend:block/wall_moss_01", + "textures": { + "texture": "betterend:block/twisted_moss" + } +} 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 new file mode 100644 index 00000000..61967777 --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/twisted_moss_02.json @@ -0,0 +1,6 @@ +{ + "parent": "betterend:block/wall_moss_02", + "textures": { + "texture": "betterend:block/twisted_moss" + } +} 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 new file mode 100644 index 00000000..9bbae714 --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/twisted_moss_03.json @@ -0,0 +1,6 @@ +{ + "parent": "betterend:block/wall_moss_03", + "textures": { + "texture": "betterend:block/twisted_moss" + } +} diff --git a/src/main/resources/assets/betterend/models/item/twisted_moss.json b/src/main/resources/assets/betterend/models/item/twisted_moss.json new file mode 100644 index 00000000..780a045f --- /dev/null +++ b/src/main/resources/assets/betterend/models/item/twisted_moss.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "betterend:block/twisted_moss" + } +} diff --git a/src/main/resources/assets/betterend/textures/block/twisted_moss.png b/src/main/resources/assets/betterend/textures/block/twisted_moss.png new file mode 100644 index 0000000000000000000000000000000000000000..161928b7ea4f2c58566ec5cb12eadd758d889360 GIT binary patch literal 2416 zcmb_eeQXnD81Evo$wV+HASCQ^1cbr$K6|~M>tI_4D_O_Bkf{uKd-q;@TiYwW8|_Gd zZ77I}As9Xfh=7Wqk_e)Rhzlwr;@A|G#QniCBLo(Q7^6|d_xc5xF$uBB^*;K0f6woE zp5JqCSC^N~96Dso5R1h!)Lr7LMCak=ku?~7=UlxG(CNN#$rHN8l0CvaGAvuRj<#4b zm#Wn@MvbRbl(e7~$eI^gW5F;&TP%6gVqqZFLj&_dpBi%FKOZ@UW2)@L=h{4!CtL*m zYRQratXfi5EiI{+95OyFAIpo0h#&|JfW?A=kS@lYc$`;6*XCmq$Knv9-ia5O0kIlS zIaZ`aAZD}jghX=;W_MU=o^mkURE(i$J4x9|nk6V&qa z+;13RktCzhs5Q!3wTO?T9S#RcF(ktf2tnwLAp^vSkUl=e;DWjoQNxC+g)oy5c(n$@ zi6fz4=zh248R}^89Kt!X)LOe$CHNl zOB)QP(YjH*7%58T)-PJGZVW@R66#t*M1sYOQN-~nVPU^!Xu4m!O&;l=)7gZ@q6h?r z7OB>>K&nyYDHg1#$ZU*&O`5BQWG$*sHUlNsKo>Be6K5!fB50am_-ck0IbO6eQz%xX zs07r5tRMpe^ar-lBF)|c)?`&_{7`Z%(Cu>K zNUBv;WswIGWn(EDLD^)P-~|p4K!PmcrGP>!HrB>6Y-+trlN!t>n(GsOmNf}+q)R7y zW!lR+fSnK=4m)A@asnaH0wiSCYg0G}0K9`vvCWRCXrw^kW>!;`j2IQbFp?nfgd$Kp zK|zio91_bB6ffIlo9tyJR=}|vaf`Ho7V&5@syS;KI&LhnMAcFE8j~YZ1s5f+0xA~w zk_aTz?oM1X`wV3~`B?3zPIsm#K^yf$L^?q86EIy$br?zkvHujD0KW0+L+AC^p1#b(t9clAsa-{j(P1VH`=N*HoIK~)xw(Ib&r)C zFMnudyIR#+QlImrnw{$}zBgL?bob+fGBYd6+dgeO5g7I8sIEEl&Q>fMzPk+1>h9UI zVPxB(x-B0CUwLMt^S6l{rhMITq-Xo}>+L5_9v!thYuSOmoW9JaeQT=TuWjYH;>oXf z9_`xZ@0ophL48we_`<43mb%ZBFDJ+Jp4)h~ZQHX~2EE!o#32UiivF75ZvJ~*;Ns>$ zM$PG8e=NCw&d1k&_})GpzcQn@#Zo)&z4I5|`tow^tb6hXt!k5*id`LN#&+&>m2DjH z=C_A()+#SDl_Lw=8;ADg=NJAluemD==ogPw=C1qh(u%rw_tv*yYbPyhI)46>j!k>E zwT;j!JqON}KDTq>f;S5HKQQ)-cS@JNoU{9d-S=$zY|+*&>inI20oS@}`ogu{S4NAc znZv!-&o^e5R|`Fj+w(>?$%j`?eQDN&=KXVbtgpzp*y7rdn|akYCH7%#$FZretv~f} z->~1m348W7cZF7bfL;2jd1m&Xb;mnT=FTt8>D=|p;Pa<~dBb`;O6A&2W_h&kdA@br dzRh19Bp;mLeb70bsx$u+xr@tOZx=3X`3D{#G{yh` literal 0 HcmV?d00001