From 3647125badee3ad4e81aaa197acfa7c4a39b885c Mon Sep 17 00:00:00 2001 From: paulevsGitch Date: Sat, 12 Dec 2020 13:50:40 +0300 Subject: [PATCH] Bulb moss --- .../java/ru/betterend/registry/EndBlocks.java | 1 + .../ru/betterend/registry/EndFeatures.java | 2 + .../betterend/world/biome/BiomeAmberLand.java | 2 + .../betterend/blockstates/bulb_moss.json | 24 +++++ .../assets/betterend/lang/en_us.json | 4 +- .../assets/betterend/lang/ru_ru.json | 4 +- .../materialmaps/block/bubble_coral.json | 3 - .../materialmaps/block/bulb_moss.json | 14 +++ .../materialmaps/particle/amber_sphere.json | 3 + .../betterend/models/block/bulb_moss_01.json | 98 ++++++++++++++++++ .../betterend/models/block/bulb_moss_02.json | 65 ++++++++++++ .../betterend/models/block/bulb_moss_03.json | 65 ++++++++++++ .../betterend/models/item/bulb_moss.json | 6 ++ .../textures/block/bulb_moss_bulbs.png | Bin 0 -> 2134 bytes .../textures/block/bulb_moss_leaves.png | Bin 0 -> 1912 bytes 15 files changed, 286 insertions(+), 5 deletions(-) create mode 100644 src/main/resources/assets/betterend/blockstates/bulb_moss.json delete mode 100644 src/main/resources/assets/betterend/materialmaps/block/bubble_coral.json create mode 100644 src/main/resources/assets/betterend/materialmaps/block/bulb_moss.json create mode 100644 src/main/resources/assets/betterend/materialmaps/particle/amber_sphere.json create mode 100644 src/main/resources/assets/betterend/models/block/bulb_moss_01.json create mode 100644 src/main/resources/assets/betterend/models/block/bulb_moss_02.json create mode 100644 src/main/resources/assets/betterend/models/block/bulb_moss_03.json create mode 100644 src/main/resources/assets/betterend/models/item/bulb_moss.json create mode 100644 src/main/resources/assets/betterend/textures/block/bulb_moss_bulbs.png create mode 100644 src/main/resources/assets/betterend/textures/block/bulb_moss_leaves.png diff --git a/src/main/java/ru/betterend/registry/EndBlocks.java b/src/main/java/ru/betterend/registry/EndBlocks.java index a8143166..6c12fc69 100644 --- a/src/main/java/ru/betterend/registry/EndBlocks.java +++ b/src/main/java/ru/betterend/registry/EndBlocks.java @@ -220,6 +220,7 @@ public class EndBlocks { public static final Block CYAN_MOSS = registerBlock("cyan_moss", new BlockWallPlant()); 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)); // 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 6f66bfca..c1ce19b9 100644 --- a/src/main/java/ru/betterend/registry/EndFeatures.java +++ b/src/main/java/ru/betterend/registry/EndFeatures.java @@ -90,6 +90,8 @@ public class EndFeatures { 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); + public static final EndFeature BULB_MOSS = new EndFeature("bulb_moss", new WallPlantFeature(EndBlocks.BULB_MOSS, 6), 1); + public static final EndFeature BULB_MOSS_WOOD = new EndFeature("bulb_moss_wood", new WallPlantOnLogFeature(EndBlocks.BULB_MOSS, 6), 15); // 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/BiomeAmberLand.java b/src/main/java/ru/betterend/world/biome/BiomeAmberLand.java index b9a99982..c8aed8fd 100644 --- a/src/main/java/ru/betterend/world/biome/BiomeAmberLand.java +++ b/src/main/java/ru/betterend/world/biome/BiomeAmberLand.java @@ -23,6 +23,8 @@ public class BiomeAmberLand extends EndBiome { .addFeature(EndFeatures.LANCELEAF) .addFeature(EndFeatures.GLOW_PILLAR) .addFeature(EndFeatures.AMBER_GRASS) + .addFeature(EndFeatures.BULB_MOSS) + .addFeature(EndFeatures.BULB_MOSS_WOOD) .addFeature(EndFeatures.CHARNIA_ORANGE) .addFeature(EndFeatures.CHARNIA_RED) .addStructureFeature(ConfiguredStructureFeatures.END_CITY) diff --git a/src/main/resources/assets/betterend/blockstates/bulb_moss.json b/src/main/resources/assets/betterend/blockstates/bulb_moss.json new file mode 100644 index 00000000..67499145 --- /dev/null +++ b/src/main/resources/assets/betterend/blockstates/bulb_moss.json @@ -0,0 +1,24 @@ +{ + "variants": { + "facing=north": [ + { "model": "betterend:block/bulb_moss_01", "y": 180 }, + { "model": "betterend:block/bulb_moss_02", "y": 180 }, + { "model": "betterend:block/bulb_moss_03", "y": 180 } + ], + "facing=south": [ + { "model": "betterend:block/bulb_moss_01" }, + { "model": "betterend:block/bulb_moss_02" }, + { "model": "betterend:block/bulb_moss_03" } + ], + "facing=east": [ + { "model": "betterend:block/bulb_moss_01", "y": 270 }, + { "model": "betterend:block/bulb_moss_02", "y": 270 }, + { "model": "betterend:block/bulb_moss_03", "y": 270 } + ], + "facing=west": [ + { "model": "betterend:block/bulb_moss_01", "y": 90 }, + { "model": "betterend:block/bulb_moss_02", "y": 90 }, + { "model": "betterend:block/bulb_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 6ef9b512..8529fc57 100644 --- a/src/main/resources/assets/betterend/lang/en_us.json +++ b/src/main/resources/assets/betterend/lang/en_us.json @@ -468,5 +468,7 @@ "block.betterend.ancient_emerald_ice": "Ancient Emerald Ice", "block.betterend.dense_emerald_ice": "Dense Emerald Ice", "block.betterend.dense_snow": "Dense Snow", - "block.betterend.emerald_ice": "Emerald Ice" + "block.betterend.emerald_ice": "Emerald Ice", + + "block.betterend.bulb_moss": "Bulb 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 0f96a6c0..ed2dc814 100644 --- a/src/main/resources/assets/betterend/lang/ru_ru.json +++ b/src/main/resources/assets/betterend/lang/ru_ru.json @@ -470,5 +470,7 @@ "block.betterend.ancient_emerald_ice": "Древний изумрудный лёд", "block.betterend.dense_emerald_ice": "Плотный изумрудный лёд", "block.betterend.dense_snow": "Плотный снег", - "block.betterend.emerald_ice": "Изумрудный лёд" + "block.betterend.emerald_ice": "Изумрудный лёд", + + "block.betterend.bulb_moss": "Луковичный мох" } \ No newline at end of file diff --git a/src/main/resources/assets/betterend/materialmaps/block/bubble_coral.json b/src/main/resources/assets/betterend/materialmaps/block/bubble_coral.json deleted file mode 100644 index 3201413f..00000000 --- a/src/main/resources/assets/betterend/materialmaps/block/bubble_coral.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "defaultMaterial": "betterend:noao" -} diff --git a/src/main/resources/assets/betterend/materialmaps/block/bulb_moss.json b/src/main/resources/assets/betterend/materialmaps/block/bulb_moss.json new file mode 100644 index 00000000..fdf0f57b --- /dev/null +++ b/src/main/resources/assets/betterend/materialmaps/block/bulb_moss.json @@ -0,0 +1,14 @@ +{ + "defaultMap": { + "spriteMap": [ + { + "sprite": "betterend:block/bulb_moss_bulbs", + "material": "betterend:waving_wall_glow_inc" + }, + { + "sprite": "betterend:block/bulb_moss_leaves", + "material": "betterend:waving_wall" + } + ] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/materialmaps/particle/amber_sphere.json b/src/main/resources/assets/betterend/materialmaps/particle/amber_sphere.json new file mode 100644 index 00000000..ab909d8e --- /dev/null +++ b/src/main/resources/assets/betterend/materialmaps/particle/amber_sphere.json @@ -0,0 +1,3 @@ +{ + "material": "canvas:emissive_no_diffuse" +} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/bulb_moss_01.json b/src/main/resources/assets/betterend/models/block/bulb_moss_01.json new file mode 100644 index 00000000..a13eb857 --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/bulb_moss_01.json @@ -0,0 +1,98 @@ +{ + "__comment": "Designed by Paulevs with Cubik Studio - https://cubik.studio", + "textures": { + "texture": "betterend:block/bulb_moss_leaves", + "texture2": "betterend:block/bulb_moss_bulbs", + "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/bulb_moss_02.json b/src/main/resources/assets/betterend/models/block/bulb_moss_02.json new file mode 100644 index 00000000..80958710 --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/bulb_moss_02.json @@ -0,0 +1,65 @@ +{ + "__comment": "Designed by Paulevs with Cubik Studio - https://cubik.studio", + "textures": { + "texture": "betterend:block/bulb_moss_leaves", + "texture2": "betterend:block/bulb_moss_bulbs", + "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/bulb_moss_03.json b/src/main/resources/assets/betterend/models/block/bulb_moss_03.json new file mode 100644 index 00000000..c03b42cc --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/bulb_moss_03.json @@ -0,0 +1,65 @@ +{ + "__comment": "Designed by Paulevs with Cubik Studio - https://cubik.studio", + "textures": { + "texture": "betterend:block/bulb_moss_leaves", + "texture2": "betterend:block/bulb_moss_bulbs", + "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/models/item/bulb_moss.json b/src/main/resources/assets/betterend/models/item/bulb_moss.json new file mode 100644 index 00000000..a34872c2 --- /dev/null +++ b/src/main/resources/assets/betterend/models/item/bulb_moss.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "betterend:block/bulb_moss_leaves" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/textures/block/bulb_moss_bulbs.png b/src/main/resources/assets/betterend/textures/block/bulb_moss_bulbs.png new file mode 100644 index 0000000000000000000000000000000000000000..ffeb5e0aa094d31ce55d4cd894e6a9409c4de0df GIT binary patch literal 2134 zcmbVNd2AF_99|BIKpHC)1r!*kp-1fO96Ni=*lp={OS{M}rEH;yro5SXyE}GwXPKF@ z+Zr(nO(3YKr~wg!RE$K?ND)N9QvX0jN;oPC4NWmcf+845Jk#Kty*MmL++=p%%zW?r zzTffQTUG0;&KWa#jLBrm@zl8M&^_0jU8`X!%T0yIniVq zrO5sUy}>)17nO(^NQwZ>iAW5gO{UWFL=1>cP{#xql%r1k(wC9yuuK~8oaew zrJ_R2YPJy~%`%vsGt)MTW7ramp=div*-6?$P&7~3cngQ6e>hT8r2t>&o|)D{Pfk3f z>oJ}rt|XsIbsMzgAncSByPl$tZu3_^Tb9k}ZyS4QA9t?r zsl$&S;Jz$5v;TQo8}@bUT%YuIb>Hai-GhfZ$56+Y|9z$Y;(Bey)o+jZb5?veVkdrn z^*U`uQ+V3G-wQV#KJ)4QtCviAa&Uan)~`;#zI*;EPy0Jt$Gz8qZRjc-UvMAR-T0B! zx3Rd!RWfODd;g_b!9(p`jac{D**UK+>s-6Ly{z^X->hvvk7JhKJG$q>pRHoU{ttdU zHa)LQuh{YV+G>ev8F=D1(09)5E7p2Pjy$1HvF6w=`_~i@b$hnu_m6tZyxNv47c@?G zt|>adcV}V8$5oqGlAfaZZ3{1)aU2-j_sF=ZGpDW>Hw<)*JlQe9*WXjW_GsRsqc0^o z4tBJ%^}}DjOg=qg!j`sOd!KFnB>%JN_iX<|X4|TN+IVov$rDH1!|z>J^WxOf!S7wW tVE?c0O1*7ITobpRUg;?Gjs2l_+M-a``^PVqEiz7iPnFO8p=AnV?aitG8jfmr*1lW{kpF<+{le%9Lerra0!fUYCqn)t9RGdw%i@_ z53>){P5eWdnFuk8m@Lsvmn9|&k<2Vxj0uh`M3*o%kpwl$GKrIjI^Q10$&gLrCB43F zpZ9s5-$#Ev)*Ngo-mrNCf*{3>eqRebmsrR8eE45Edy9vs0?ohIK#;yt2yY(iE<8=)=@5G}w^J9QD%C!x(PRx}z{rvu(p^^mH@ z7Yo(AXc?`mvkK!zx3$TNq^68Vm+S#P-UJ?uCTS9B4)uAwS$7Eat z0$ihFn7kr_MxO_RVcTR`;@pzU9(IRm+#vu4cRB4M&N|sJ9(D?}gCrS-6u{zspDK1* z#kKY?^tq&pkmDa!-Y$qPmmuJFm*Bveu${$u(xL?_g=p3bh~GMZ@% zju)+V_h6z`XCPtO+wuzeSe0^ie<}(f>0OGypl+yPGsWw`8-cl7O@9%0@^A3TySraq zH5Y6xbN}yt{GaZ#$q}Qx5&>|65||YaVa=L_(h$q5mU*^hE-k|0u(OuADGM)ha~dd+ zT8C43qH1jtLGl8PK5xkV`L)*J;5~avJgGg-LnW2t{+^4c#>Xzs;WvL-SNfr|Wxlba zqVQOE>CVCKvdR|hlZZ>Q}>l#-)?^V_DtKQiVGvpHOOne?ma)f_5SY$ zAK!R(_{YJCE2lya2Y)-6=zabqGE=P`D9HEyRq@5f<5T4?4J6TG?@j+y;hxXd&y}xf zD_FauK=RIhR5axLKIuOZt2|Or(^Q!6D8A4`d7nCbyy$eg?5&6Py*R60{`peT^yoW; P^=)jd5BkpReDd($nmK}m literal 0 HcmV?d00001