diff --git a/src/main/java/ru/betterend/integration/byg/OldBulbisTreeFeature.java b/src/main/java/ru/betterend/integration/byg/OldBulbisTreeFeature.java index 3fb5fc5f..e45c511f 100644 --- a/src/main/java/ru/betterend/integration/byg/OldBulbisTreeFeature.java +++ b/src/main/java/ru/betterend/integration/byg/OldBulbisTreeFeature.java @@ -115,7 +115,6 @@ public class OldBulbisTreeFeature extends DefaultFeature { sphere = new SDFTranslate().setTranslate(0, offsetY, 0).setSource(sphere); int leafCount = (int) (radius * 0.5F) + 2; - System.out.println("Origin " + pos); for (int i = 0; i < 4; i++) { float angle = (float) i / 4 * MHelper.PI2; List spline = SplineHelper.copySpline(LEAF); diff --git a/src/main/java/ru/betterend/registry/EndBlocks.java b/src/main/java/ru/betterend/registry/EndBlocks.java index 714062d3..1c7f1cf6 100644 --- a/src/main/java/ru/betterend/registry/EndBlocks.java +++ b/src/main/java/ru/betterend/registry/EndBlocks.java @@ -194,6 +194,7 @@ public class EndBlocks { public static final Block AMBER_GRASS = registerBlock("amber_grass", new BlockTerrainPlant(AMBER_MOSS)); public static final Block TWISTED_UMBRELLA_MOSS = registerBlock("twisted_umbrella_moss", new BlockTwistedUmbrellaMoss()); public static final Block TWISTED_UMBRELLA_MOSS_TALL = registerBlock("twisted_umbrella_moss_tall", new BlockTwistedUmbrellaMossTall()); + public static final Block JUNGLE_GRASS = registerBlock("jungle_grass", new BlockTerrainPlant(JUNGLE_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 744daf5a..a0ca0513 100644 --- a/src/main/java/ru/betterend/registry/EndFeatures.java +++ b/src/main/java/ru/betterend/registry/EndFeatures.java @@ -80,6 +80,7 @@ public class EndFeatures { public static final EndFeature LANCELEAF = new EndFeature("lanceleaf", new LanceleafFeature(), 3); public static final EndFeature GLOW_PILLAR = new EndFeature("glow_pillar", new GlowPillarFeature(), 1); public static final EndFeature TWISTED_UMBRELLA_MOSS = new EndFeature("twisted_umbrella_moss", new DoublePlantFeature(EndBlocks.TWISTED_UMBRELLA_MOSS, EndBlocks.TWISTED_UMBRELLA_MOSS_TALL, 6), 5); + public static final EndFeature JUNGLE_GRASS = new EndFeature("jungle_grass", new CavePlantFeature(EndBlocks.JUNGLE_GRASS, 7), 8); // 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/BiomeUmbrellaJungle.java b/src/main/java/ru/betterend/world/biome/BiomeUmbrellaJungle.java index 9e000fc5..0c931926 100644 --- a/src/main/java/ru/betterend/world/biome/BiomeUmbrellaJungle.java +++ b/src/main/java/ru/betterend/world/biome/BiomeUmbrellaJungle.java @@ -13,6 +13,7 @@ public class BiomeUmbrellaJungle extends EndBiome { .setSurface(EndBlocks.JUNGLE_MOSS) .addFeature(EndFeatures.UMBRELLA_TREE) .addFeature(EndFeatures.TWISTED_UMBRELLA_MOSS) + .addFeature(EndFeatures.JUNGLE_GRASS) .addFeature(EndFeatures.END_LAKE)); } } \ No newline at end of file diff --git a/src/main/java/ru/betterend/world/features/trees/UmbrellaTreeFeature.java b/src/main/java/ru/betterend/world/features/trees/UmbrellaTreeFeature.java index bc137eb7..d86d9109 100644 --- a/src/main/java/ru/betterend/world/features/trees/UmbrellaTreeFeature.java +++ b/src/main/java/ru/betterend/world/features/trees/UmbrellaTreeFeature.java @@ -180,11 +180,6 @@ public class UmbrellaTreeFeature extends DefaultFeature { int length = MHelper.floor(MHelper.randRange(1F, 5F, random) * scale + 0.5F); for (int i = 0; i < length; i++) { mut.setY(MHelper.floor(py - i)); - //mut.setX(MHelper.floor(px)); - //mut.setZ(MHelper.floor(pz)); - /*if (world.isAir(mut)) { - BlocksHelper.setWithoutUpdate(world, mut, fruit); - }*/ double radius = (1 - (double) i / length) * 0.5; for (int j = 0; j < 2; j++) { mut.setX(MHelper.floor(random.nextGaussian() * radius + px + 0.5)); diff --git a/src/main/resources/assets/betterend/blockstates/jungle_grass.json b/src/main/resources/assets/betterend/blockstates/jungle_grass.json new file mode 100644 index 00000000..df61d348 --- /dev/null +++ b/src/main/resources/assets/betterend/blockstates/jungle_grass.json @@ -0,0 +1,10 @@ +{ + "variants": { + "": [ + { "model": "betterend:block/jungle_grass_01" }, + { "model": "betterend:block/jungle_grass_02" }, + { "model": "betterend:block/jungle_grass_03" }, + { "model": "betterend:block/jungle_grass_04" } + ] + } +} diff --git a/src/main/resources/assets/betterend/models/block/jungle_grass_01.json b/src/main/resources/assets/betterend/models/block/jungle_grass_01.json new file mode 100644 index 00000000..f3dd5f0e --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/jungle_grass_01.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cross", + "textures": { + "cross": "betterend:block/jungle_grass" + } +} diff --git a/src/main/resources/assets/betterend/models/block/jungle_grass_02.json b/src/main/resources/assets/betterend/models/block/jungle_grass_02.json new file mode 100644 index 00000000..4d9754ee --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/jungle_grass_02.json @@ -0,0 +1,6 @@ +{ + "parent": "betterend:block/crop_block", + "textures": { + "texture": "betterend:block/jungle_grass" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/jungle_grass_03.json b/src/main/resources/assets/betterend/models/block/jungle_grass_03.json new file mode 100644 index 00000000..23e76255 --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/jungle_grass_03.json @@ -0,0 +1,6 @@ +{ + "parent": "betterend:block/cross_inverted", + "textures": { + "cross": "betterend:block/jungle_grass" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/jungle_grass_04.json b/src/main/resources/assets/betterend/models/block/jungle_grass_04.json new file mode 100644 index 00000000..75bdec30 --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/jungle_grass_04.json @@ -0,0 +1,6 @@ +{ + "parent": "betterend:block/crop_block_inverted", + "textures": { + "texture": "betterend:block/jungle_grass" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/item/jungle_grass.json b/src/main/resources/assets/betterend/models/item/jungle_grass.json new file mode 100644 index 00000000..0ea9f6c3 --- /dev/null +++ b/src/main/resources/assets/betterend/models/item/jungle_grass.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "betterend:block/jungle_grass" + } +} diff --git a/src/main/resources/assets/betterend/textures/block/jungle_grass.png b/src/main/resources/assets/betterend/textures/block/jungle_grass.png new file mode 100644 index 00000000..56a394f1 Binary files /dev/null and b/src/main/resources/assets/betterend/textures/block/jungle_grass.png differ