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 00000000..ffeb5e0a Binary files /dev/null and b/src/main/resources/assets/betterend/textures/block/bulb_moss_bulbs.png differ diff --git a/src/main/resources/assets/betterend/textures/block/bulb_moss_leaves.png b/src/main/resources/assets/betterend/textures/block/bulb_moss_leaves.png new file mode 100644 index 00000000..3812f757 Binary files /dev/null and b/src/main/resources/assets/betterend/textures/block/bulb_moss_leaves.png differ