diff --git a/src/main/java/ru/betterend/registry/FeatureRegistry.java b/src/main/java/ru/betterend/registry/FeatureRegistry.java index f15f6583..5b23d807 100644 --- a/src/main/java/ru/betterend/registry/FeatureRegistry.java +++ b/src/main/java/ru/betterend/registry/FeatureRegistry.java @@ -19,7 +19,7 @@ import ru.betterend.world.features.EndLotusLeafFeature; import ru.betterend.world.features.MossyGlowshroomFeature; import ru.betterend.world.features.PythadendronBushFeature; import ru.betterend.world.features.PythadendronTreeFeature; -import ru.betterend.world.features.RoundCave; +import ru.betterend.world.features.RoundCaveFeature; import ru.betterend.world.features.SinglePlantFeature; import ru.betterend.world.features.UnderwaterPlantFeature; import ru.betterend.world.features.VineFeature; @@ -51,8 +51,8 @@ public class FeatureRegistry { // Features // public static final EndFeature END_LAKE = EndFeature.makeLakeFeature("end_lake", new EndLakeFeature(), 4); public static final EndFeature END_LAKE_RARE = EndFeature.makeLakeFeature("end_lake_rare", new EndLakeFeature(), 40); - public static final EndFeature ROUND_CAVE = EndFeature.makeRawGenFeature("round_cave", new RoundCave(), 2); - public static final EndFeature ROUND_CAVE_RARE = EndFeature.makeRawGenFeature("round_cave_rare", new RoundCave(), 25); + public static final EndFeature ROUND_CAVE = EndFeature.makeRawGenFeature("round_cave", new RoundCaveFeature(), 2); + public static final EndFeature ROUND_CAVE_RARE = EndFeature.makeRawGenFeature("round_cave_rare", new RoundCaveFeature(), 25); // Ores // public static final EndFeature ENDER_ORE = EndFeature.makeOreFeature("ender_ore", BlockRegistry.ENDER_ORE, 6, 3, 0, 4, 96); diff --git a/src/main/java/ru/betterend/world/features/RoundCave.java b/src/main/java/ru/betterend/world/features/RoundCaveFeature.java similarity index 93% rename from src/main/java/ru/betterend/world/features/RoundCave.java rename to src/main/java/ru/betterend/world/features/RoundCaveFeature.java index 2d1a1712..8c8b8ec2 100644 --- a/src/main/java/ru/betterend/world/features/RoundCave.java +++ b/src/main/java/ru/betterend/world/features/RoundCaveFeature.java @@ -29,7 +29,7 @@ import ru.betterend.util.sdf.operator.SDFTranslate; import ru.betterend.util.sdf.primitive.SDFHexPrism; import ru.betterend.util.sdf.primitive.SDFSphere; -public class RoundCave extends DefaultFeature { +public class RoundCaveFeature extends DefaultFeature { @Override public boolean generate(StructureWorldAccess world, ChunkGenerator chunkGenerator, Random random, BlockPos pos, DefaultFeatureConfig config) { int radius = MHelper.randRange(10, 30, random); @@ -126,7 +126,10 @@ public class RoundCave extends DefaultFeature { float vz = (float) Math.sin(angleY); prism = new SDFRotation().setRotation(new Vector3f(vx, 0, vz), random.nextFloat()).setSource(prism); prism.setReplaceFunction((state) -> { - return state.getMaterial().isReplaceable() || state.isIn(BlockTagRegistry.GEN_TERRAIN); + return state.getMaterial().isReplaceable() + || state.isIn(BlockTagRegistry.GEN_TERRAIN) + || state.getMaterial().equals(Material.PLANT) + || state.getMaterial().equals(Material.LEAVES); }); prism.fillRecursive(world, pos); BlocksHelper.setWithoutUpdate(world, pos, BlockRegistry.AURORA_CRYSTAL); diff --git a/src/main/resources/assets/betterend/textures/block/end_lotus_barrel_bottom.png b/src/main/resources/assets/betterend/textures/block/end_lotus_barrel_bottom.png new file mode 100644 index 00000000..108d0627 Binary files /dev/null and b/src/main/resources/assets/betterend/textures/block/end_lotus_barrel_bottom.png differ diff --git a/src/main/resources/assets/betterend/textures/block/end_lotus_barrel_side.png b/src/main/resources/assets/betterend/textures/block/end_lotus_barrel_side.png new file mode 100644 index 00000000..a1554d86 Binary files /dev/null and b/src/main/resources/assets/betterend/textures/block/end_lotus_barrel_side.png differ diff --git a/src/main/resources/assets/betterend/textures/block/end_lotus_barrel_top.png b/src/main/resources/assets/betterend/textures/block/end_lotus_barrel_top.png new file mode 100644 index 00000000..f2345985 Binary files /dev/null and b/src/main/resources/assets/betterend/textures/block/end_lotus_barrel_top.png differ diff --git a/src/main/resources/assets/betterend/textures/block/end_lotus_barrel_top_open.png b/src/main/resources/assets/betterend/textures/block/end_lotus_barrel_top_open.png new file mode 100644 index 00000000..75393a5b Binary files /dev/null and b/src/main/resources/assets/betterend/textures/block/end_lotus_barrel_top_open.png differ diff --git a/src/main/resources/assets/betterend/textures/block/end_lotus_crafting_table_bottom.png b/src/main/resources/assets/betterend/textures/block/end_lotus_crafting_table_bottom.png new file mode 100644 index 00000000..1f8f3526 Binary files /dev/null and b/src/main/resources/assets/betterend/textures/block/end_lotus_crafting_table_bottom.png differ diff --git a/src/main/resources/assets/betterend/textures/block/end_lotus_crafting_table_front.png b/src/main/resources/assets/betterend/textures/block/end_lotus_crafting_table_front.png new file mode 100644 index 00000000..87bbf4e7 Binary files /dev/null and b/src/main/resources/assets/betterend/textures/block/end_lotus_crafting_table_front.png differ diff --git a/src/main/resources/assets/betterend/textures/block/end_lotus_crafting_table_side.png b/src/main/resources/assets/betterend/textures/block/end_lotus_crafting_table_side.png new file mode 100644 index 00000000..519d069d Binary files /dev/null and b/src/main/resources/assets/betterend/textures/block/end_lotus_crafting_table_side.png differ diff --git a/src/main/resources/assets/betterend/textures/block/end_lotus_crafting_table_top.png b/src/main/resources/assets/betterend/textures/block/end_lotus_crafting_table_top.png new file mode 100644 index 00000000..d3278495 Binary files /dev/null and b/src/main/resources/assets/betterend/textures/block/end_lotus_crafting_table_top.png differ diff --git a/src/main/resources/assets/betterend/textures/block/end_lotus_planks.png b/src/main/resources/assets/betterend/textures/block/end_lotus_planks.png index 584650b4..d0ed2582 100644 Binary files a/src/main/resources/assets/betterend/textures/block/end_lotus_planks.png and b/src/main/resources/assets/betterend/textures/block/end_lotus_planks.png differ diff --git a/src/main/resources/assets/betterend/textures/entity/chest/end_lotus_chest.png b/src/main/resources/assets/betterend/textures/entity/chest/end_lotus_chest.png new file mode 100644 index 00000000..b97702d5 Binary files /dev/null and b/src/main/resources/assets/betterend/textures/entity/chest/end_lotus_chest.png differ diff --git a/src/main/resources/assets/betterend/textures/entity/chest/end_lotus_chest_left.png b/src/main/resources/assets/betterend/textures/entity/chest/end_lotus_chest_left.png new file mode 100644 index 00000000..988a6f0e Binary files /dev/null and b/src/main/resources/assets/betterend/textures/entity/chest/end_lotus_chest_left.png differ diff --git a/src/main/resources/assets/betterend/textures/entity/chest/end_lotus_chest_right.png b/src/main/resources/assets/betterend/textures/entity/chest/end_lotus_chest_right.png new file mode 100644 index 00000000..e5a24969 Binary files /dev/null and b/src/main/resources/assets/betterend/textures/entity/chest/end_lotus_chest_right.png differ diff --git a/src/main/resources/assets/betterend/textures/entity/sign/end_lotus_sign.png b/src/main/resources/assets/betterend/textures/entity/sign/end_lotus_sign.png new file mode 100644 index 00000000..ad84b7a3 Binary files /dev/null and b/src/main/resources/assets/betterend/textures/entity/sign/end_lotus_sign.png differ diff --git a/src/main/resources/assets/betterend/textures/item/end_lotus_sign.png b/src/main/resources/assets/betterend/textures/item/end_lotus_sign.png new file mode 100644 index 00000000..1dfb6eae Binary files /dev/null and b/src/main/resources/assets/betterend/textures/item/end_lotus_sign.png differ