From a9174260be22b9e5f970e9c11dab80fff7bb9e83 Mon Sep 17 00:00:00 2001 From: paulevsGitch Date: Wed, 4 Nov 2020 16:24:13 +0300 Subject: [PATCH] Moss fixes --- src/main/java/ru/betterend/registry/EndFeatures.java | 4 +++- .../ru/betterend/world/biome/BiomeChorusForest.java | 1 + .../betterend/world/biome/BiomeFoggyMushroomland.java | 1 + .../ru/betterend/world/biome/BiomeMegalakeGrove.java | 1 + .../ru/betterend/world/biome/BiomeShadowForest.java | 1 + .../betterend/world/features/WallScatterFeature.java | 2 +- src/main/resources/assets/betterend/lang/en_us.json | 5 ++++- src/main/resources/assets/betterend/lang/ru_ru.json | 5 ++++- .../assets/betterend/materialmaps/block/cyan_moss.json | 3 +++ .../assets/betterend/materialmaps/block/tail_moss.json | 3 +++ .../betterend/materials/waving_wall_glow_inc.json | 10 ++++++++++ .../assets/betterend/models/item/cyan_moss.json | 6 ++++++ .../assets/betterend/models/item/tail_moss.json | 6 ++++++ 13 files changed, 44 insertions(+), 4 deletions(-) create mode 100644 src/main/resources/assets/betterend/materialmaps/block/cyan_moss.json create mode 100644 src/main/resources/assets/betterend/materialmaps/block/tail_moss.json create mode 100644 src/main/resources/assets/betterend/materials/waving_wall_glow_inc.json create mode 100644 src/main/resources/assets/betterend/models/item/cyan_moss.json create mode 100644 src/main/resources/assets/betterend/models/item/tail_moss.json diff --git a/src/main/java/ru/betterend/registry/EndFeatures.java b/src/main/java/ru/betterend/registry/EndFeatures.java index d6f34c27..bc5901ff 100644 --- a/src/main/java/ru/betterend/registry/EndFeatures.java +++ b/src/main/java/ru/betterend/registry/EndFeatures.java @@ -27,6 +27,7 @@ import ru.betterend.world.features.RoundCaveFeature; import ru.betterend.world.features.SinglePlantFeature; import ru.betterend.world.features.UnderwaterPlantFeature; import ru.betterend.world.features.VineFeature; +import ru.betterend.world.features.WallPlantFeature; import ru.betterend.world.features.WallPlantOnLogFeature; public class EndFeatures { @@ -59,7 +60,8 @@ public class EndFeatures { // Wall Plants // public static final EndFeature PURPLE_POLYPORE = new EndFeature("purple_polypore", new WallPlantOnLogFeature(EndBlocks.PURPLE_POLYPORE, 3), 5); public static final EndFeature PURPLE_POLYPORE_DENSE = new EndFeature("purple_polypore_dense", new WallPlantOnLogFeature(EndBlocks.PURPLE_POLYPORE, 5), 15); - //public static final EndFeature TAIL_MOSS = new EndFeature("tail_moss", new WallPlantOnLogFeature(EndBlocks.PURPLE_POLYPORE, 3), 5); + public static final EndFeature TAIL_MOSS = new EndFeature("tail_moss", new WallPlantFeature(EndBlocks.TAIL_MOSS, 5), 30); + public static final EndFeature CYAN_MOSS = new EndFeature("cyan_moss", new WallPlantFeature(EndBlocks.CYAN_MOSS, 5), 30); // 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/BiomeChorusForest.java b/src/main/java/ru/betterend/world/biome/BiomeChorusForest.java index f074d821..a657b67f 100644 --- a/src/main/java/ru/betterend/world/biome/BiomeChorusForest.java +++ b/src/main/java/ru/betterend/world/biome/BiomeChorusForest.java @@ -28,6 +28,7 @@ public class BiomeChorusForest extends EndBiome { .addFeature(Feature.VEGETAL_DECORATION, ConfiguredFeatures.CHORUS_PLANT) .addFeature(Feature.VEGETAL_DECORATION, ConfiguredFeatures.CHORUS_PLANT) .addFeature(EndFeatures.CHORUS_GRASS) + .addFeature(EndFeatures.TAIL_MOSS) .addStructureFeature(ConfiguredStructureFeatures.END_CITY) .addMobSpawn(EndEntities.END_SLIME, 5, 1, 2) .addMobSpawn(EntityType.ENDERMAN, 50, 1, 4)); diff --git a/src/main/java/ru/betterend/world/biome/BiomeFoggyMushroomland.java b/src/main/java/ru/betterend/world/biome/BiomeFoggyMushroomland.java index 4e5e7ffc..41ab5163 100644 --- a/src/main/java/ru/betterend/world/biome/BiomeFoggyMushroomland.java +++ b/src/main/java/ru/betterend/world/biome/BiomeFoggyMushroomland.java @@ -28,6 +28,7 @@ public class BiomeFoggyMushroomland extends EndBiome { .addFeature(EndFeatures.UMBRELLA_MOSS) .addFeature(EndFeatures.CREEPING_MOSS) .addFeature(EndFeatures.DENSE_VINE) + .addFeature(EndFeatures.CYAN_MOSS) .addFeature(EndFeatures.END_LILY) .addFeature(EndFeatures.BUBBLE_CORAL) .addStructureFeature(ConfiguredStructureFeatures.END_CITY) diff --git a/src/main/java/ru/betterend/world/biome/BiomeMegalakeGrove.java b/src/main/java/ru/betterend/world/biome/BiomeMegalakeGrove.java index bf0d995f..d0032122 100644 --- a/src/main/java/ru/betterend/world/biome/BiomeMegalakeGrove.java +++ b/src/main/java/ru/betterend/world/biome/BiomeMegalakeGrove.java @@ -31,6 +31,7 @@ public class BiomeMegalakeGrove extends EndBiome { .addFeature(EndFeatures.END_LILY_RARE) .addFeature(EndFeatures.UMBRELLA_MOSS) .addFeature(EndFeatures.CREEPING_MOSS) + .addFeature(EndFeatures.CYAN_MOSS) .addMobSpawn(EndEntities.DRAGONFLY, 20, 1, 3) .addMobSpawn(EndEntities.END_FISH, 20, 3, 8) .addMobSpawn(EntityType.ENDERMAN, 10, 1, 2)); diff --git a/src/main/java/ru/betterend/world/biome/BiomeShadowForest.java b/src/main/java/ru/betterend/world/biome/BiomeShadowForest.java index f0e01393..b9760e2c 100644 --- a/src/main/java/ru/betterend/world/biome/BiomeShadowForest.java +++ b/src/main/java/ru/betterend/world/biome/BiomeShadowForest.java @@ -26,6 +26,7 @@ public class BiomeShadowForest extends EndBiome { .addFeature(EndFeatures.SHADOW_BERRY) .addFeature(EndFeatures.TWISTED_VINE) .addFeature(EndFeatures.PURPLE_POLYPORE) + .addFeature(EndFeatures.TAIL_MOSS) .addStructureFeature(ConfiguredStructureFeatures.END_CITY) .addMobSpawn(EntityType.ENDERMAN, 80, 1, 4) .addMobSpawn(EntityType.PHANTOM, 1, 1, 2)); diff --git a/src/main/java/ru/betterend/world/features/WallScatterFeature.java b/src/main/java/ru/betterend/world/features/WallScatterFeature.java index b7b1dea9..d3bf577f 100644 --- a/src/main/java/ru/betterend/world/features/WallScatterFeature.java +++ b/src/main/java/ru/betterend/world/features/WallScatterFeature.java @@ -37,7 +37,7 @@ public abstract class WallScatterFeature extends DefaultFeature { mut.setY(py + y); for (int z = -radius; z <= radius; z++) { mut.setZ(center.getZ() + z); - if (random.nextInt(8) == 0 && world.isAir(mut)) { + if (random.nextInt(4) == 0 && world.isAir(mut)) { shuffle(random); for (Direction dir: DIR) { if (canGenerate(world, random, mut, dir)) { diff --git a/src/main/resources/assets/betterend/lang/en_us.json b/src/main/resources/assets/betterend/lang/en_us.json index f568d7c1..8d22b644 100644 --- a/src/main/resources/assets/betterend/lang/en_us.json +++ b/src/main/resources/assets/betterend/lang/en_us.json @@ -274,5 +274,8 @@ "block.betterend.shadow_berry": "Shadow Berry Seeds", "item.betterend.shadow_berry_cooked": "Shadow Berry Cooked", "item.betterend.shadow_berry_raw": "Shadow Berry", - "block.betterend.purple_polypore": "Purple Polypore" + "block.betterend.purple_polypore": "Purple Polypore", + + "block.betterend.cyan_moss": "Cyan Moss", + "block.betterend.tail_moss": "Tail 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 66c3a126..e9b70e27 100644 --- a/src/main/resources/assets/betterend/lang/ru_ru.json +++ b/src/main/resources/assets/betterend/lang/ru_ru.json @@ -276,5 +276,8 @@ "block.betterend.shadow_berry": "Семена теневой ягоды", "item.betterend.shadow_berry_cooked": "Приготовленная теневая ягода", "item.betterend.shadow_berry_raw": "Теневая ягода", - "block.betterend.purple_polypore": "Пурпурный трутовик" + "block.betterend.purple_polypore": "Пурпурный трутовик", + + "block.betterend.cyan_moss": "Циановый мох", + "block.betterend.tail_moss": "Хвостовидный мох" } \ No newline at end of file diff --git a/src/main/resources/assets/betterend/materialmaps/block/cyan_moss.json b/src/main/resources/assets/betterend/materialmaps/block/cyan_moss.json new file mode 100644 index 00000000..27167c02 --- /dev/null +++ b/src/main/resources/assets/betterend/materialmaps/block/cyan_moss.json @@ -0,0 +1,3 @@ +{ + "defaultMaterial": "betterend:waving_wall_glow_inc" +} diff --git a/src/main/resources/assets/betterend/materialmaps/block/tail_moss.json b/src/main/resources/assets/betterend/materialmaps/block/tail_moss.json new file mode 100644 index 00000000..8161d329 --- /dev/null +++ b/src/main/resources/assets/betterend/materialmaps/block/tail_moss.json @@ -0,0 +1,3 @@ +{ + "defaultMaterial": "betterend:waving_wall" +} diff --git a/src/main/resources/assets/betterend/materials/waving_wall_glow_inc.json b/src/main/resources/assets/betterend/materials/waving_wall_glow_inc.json new file mode 100644 index 00000000..c5efbb0c --- /dev/null +++ b/src/main/resources/assets/betterend/materials/waving_wall_glow_inc.json @@ -0,0 +1,10 @@ +{ + "layers": [ + { + "vertexSource": "betterend:shaders/material/wall_wave.vert", + "fragmentSource": "betterend:shaders/material/glow_inc.frag", + "disableAo": true, + "disableDiffuse": true + } + ] +} diff --git a/src/main/resources/assets/betterend/models/item/cyan_moss.json b/src/main/resources/assets/betterend/models/item/cyan_moss.json new file mode 100644 index 00000000..a37e5a43 --- /dev/null +++ b/src/main/resources/assets/betterend/models/item/cyan_moss.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "betterend:block/cyan_moss" + } +} diff --git a/src/main/resources/assets/betterend/models/item/tail_moss.json b/src/main/resources/assets/betterend/models/item/tail_moss.json new file mode 100644 index 00000000..103f215f --- /dev/null +++ b/src/main/resources/assets/betterend/models/item/tail_moss.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "betterend:block/tail_moss" + } +}