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 00000000..161928b7 Binary files /dev/null and b/src/main/resources/assets/betterend/textures/block/twisted_moss.png differ