diff --git a/src/main/java/ru/betterend/registry/EndBlocks.java b/src/main/java/ru/betterend/registry/EndBlocks.java index 7c81a00f..5472f7d3 100644 --- a/src/main/java/ru/betterend/registry/EndBlocks.java +++ b/src/main/java/ru/betterend/registry/EndBlocks.java @@ -142,6 +142,7 @@ public class EndBlocks { public static final Block CAVE_GRASS = registerBlock("cave_grass", new BlockTerrainPlant(CAVE_MOSS)); public static final Block CRYSTAL_GRASS = registerBlock("crystal_grass", new BlockTerrainPlant(CRYSTAL_MOSS)); public static final Block SHADOW_PLANT = registerBlock("shadow_plant", new BlockTerrainPlant(SHADOW_GRASS)); + public static final Block BUSHY_GRASS = registerBlock("bushy_grass", new BlockTerrainPlant(PINK_MOSS)); public static final Block BLUE_VINE_SEED = registerBlock("blue_vine_seed", new BlockBlueVineSeed()); public static final Block BLUE_VINE = registerBlockNI("blue_vine", new BlockBlueVine()); diff --git a/src/main/java/ru/betterend/registry/EndFeatures.java b/src/main/java/ru/betterend/registry/EndFeatures.java index 9457c51a..7c1925c1 100644 --- a/src/main/java/ru/betterend/registry/EndFeatures.java +++ b/src/main/java/ru/betterend/registry/EndFeatures.java @@ -58,6 +58,7 @@ public class EndFeatures { public static final EndFeature MURKWEED = new EndFeature("murkweed", new SinglePlantFeature(EndBlocks.MURKWEED, 3), 2); 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, 6, false), 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 1fc74dcc..fe2254c1 100644 --- a/src/main/java/ru/betterend/world/biome/BlossomingSpires.java +++ b/src/main/java/ru/betterend/world/biome/BlossomingSpires.java @@ -16,6 +16,7 @@ public class BlossomingSpires extends EndBiome { .addFeature(EndFeatures.TENANEA) .addFeature(EndFeatures.TENANEA_BUSH) .addFeature(EndFeatures.BULB_VINE) + .addFeature(EndFeatures.BUSHY_GRASS) .addFeature(EndFeatures.TWISTED_MOSS) .addFeature(EndFeatures.TWISTED_MOSS_WOOD) .addMobSpawn(EntityType.ENDERMAN, 50, 1, 4)); diff --git a/src/main/resources/assets/betterend/blockstates/bushy_grass.json b/src/main/resources/assets/betterend/blockstates/bushy_grass.json new file mode 100644 index 00000000..5ec2c27e --- /dev/null +++ b/src/main/resources/assets/betterend/blockstates/bushy_grass.json @@ -0,0 +1,10 @@ +{ + "variants": { + "": [ + { "model": "betterend:block/bushy_grass_01" }, + { "model": "betterend:block/bushy_grass_02" }, + { "model": "betterend:block/bushy_grass_03" }, + { "model": "betterend:block/bushy_grass_04" } + ] + } +} diff --git a/src/main/resources/assets/betterend/lang/en_us.json b/src/main/resources/assets/betterend/lang/en_us.json index cb3b133c..391c2a89 100644 --- a/src/main/resources/assets/betterend/lang/en_us.json +++ b/src/main/resources/assets/betterend/lang/en_us.json @@ -360,5 +360,7 @@ "block.betterend.bulb_lantern_purple": "Purple Bulb Lantern", "block.betterend.bulb_lantern_red": "Red Bulb Lantern", "block.betterend.bulb_lantern_white": "White Bulb Lantern", - "block.betterend.bulb_lantern_yellow": "Yellow Bulb Lantern" + "block.betterend.bulb_lantern_yellow": "Yellow Bulb Lantern", + + "block.betterend.bushy_grass": "Bushy Grass" } \ 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 fc6ca788..0af1f84f 100644 --- a/src/main/resources/assets/betterend/lang/ru_ru.json +++ b/src/main/resources/assets/betterend/lang/ru_ru.json @@ -362,5 +362,7 @@ "block.betterend.bulb_lantern_purple": "Пурпурный луковичный фонарь", "block.betterend.bulb_lantern_red": "Красный луковичный фонарь", "block.betterend.bulb_lantern_white": "Белый луковичный фонарь", - "block.betterend.bulb_lantern_yellow": "Жёлтый луковичный фонарь" + "block.betterend.bulb_lantern_yellow": "Жёлтый луковичный фонарь", + + "block.betterend.bushy_grass": "Густая трава" } \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/bushy_grass_01.json b/src/main/resources/assets/betterend/models/block/bushy_grass_01.json new file mode 100644 index 00000000..f306dc6d --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/bushy_grass_01.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cross", + "textures": { + "cross": "betterend:block/bushy_grass_1" + } +} diff --git a/src/main/resources/assets/betterend/models/block/bushy_grass_02.json b/src/main/resources/assets/betterend/models/block/bushy_grass_02.json new file mode 100644 index 00000000..c9030aa4 --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/bushy_grass_02.json @@ -0,0 +1,6 @@ +{ + "parent": "betterend:block/crop_block", + "textures": { + "texture": "betterend:block/bushy_grass_2" + } +} diff --git a/src/main/resources/assets/betterend/models/block/bushy_grass_03.json b/src/main/resources/assets/betterend/models/block/bushy_grass_03.json new file mode 100644 index 00000000..1fda0f2c --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/bushy_grass_03.json @@ -0,0 +1,6 @@ +{ + "parent": "betterend:block/cross_inverted", + "textures": { + "cross": "betterend:block/bushy_grass_1" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/bushy_grass_04.json b/src/main/resources/assets/betterend/models/block/bushy_grass_04.json new file mode 100644 index 00000000..be730e67 --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/bushy_grass_04.json @@ -0,0 +1,6 @@ +{ + "parent": "betterend:block/crop_block_inverted", + "textures": { + "texture": "betterend:block/bushy_grass_2" + } +} diff --git a/src/main/resources/assets/betterend/models/item/bushy_grass.json b/src/main/resources/assets/betterend/models/item/bushy_grass.json new file mode 100644 index 00000000..27879c7d --- /dev/null +++ b/src/main/resources/assets/betterend/models/item/bushy_grass.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "betterend:block/bushy_grass_2" + } +} diff --git a/src/main/resources/assets/betterend/textures/block/bushy_grass_1.png b/src/main/resources/assets/betterend/textures/block/bushy_grass_1.png new file mode 100644 index 00000000..08b7e35e Binary files /dev/null and b/src/main/resources/assets/betterend/textures/block/bushy_grass_1.png differ diff --git a/src/main/resources/assets/betterend/textures/block/bushy_grass_2.png b/src/main/resources/assets/betterend/textures/block/bushy_grass_2.png new file mode 100644 index 00000000..68f23c30 Binary files /dev/null and b/src/main/resources/assets/betterend/textures/block/bushy_grass_2.png differ