From 8e368bc3ffbc65f6957daa51c240dd7c75cbdbc4 Mon Sep 17 00:00:00 2001 From: paulevsGitch Date: Sat, 27 Mar 2021 18:11:13 +0300 Subject: [PATCH] Structure class rename --- .../ru/betterend/registry/EndStructures.java | 28 +++++++++---------- ...ortal.java => EternalPortalStructure.java} | 2 +- ...ureBase.java => FeatureBaseStructure.java} | 4 +-- ...ceStar.java => GiantIceStarStructure.java} | 2 +- ...ava => GiantMossyGlowshroomStructure.java} | 2 +- ...Small.java => MegaLakeSmallStructure.java} | 2 +- ...reMegaLake.java => MegaLakeStructure.java} | 2 +- ...reMountain.java => MountainStructure.java} | 2 +- ...ain.java => PaintedMountainStructure.java} | 2 +- .../features/SDFStructureFeature.java | 2 +- 10 files changed, 24 insertions(+), 24 deletions(-) rename src/main/java/ru/betterend/world/structures/features/{StructureEternalPortal.java => EternalPortalStructure.java} (95%) rename src/main/java/ru/betterend/world/structures/features/{StructureFeatureBase.java => FeatureBaseStructure.java} (93%) rename src/main/java/ru/betterend/world/structures/features/{StructureGiantIceStar.java => GiantIceStarStructure.java} (96%) rename src/main/java/ru/betterend/world/structures/features/{StructureGiantMossyGlowshroom.java => GiantMossyGlowshroomStructure.java} (96%) rename src/main/java/ru/betterend/world/structures/features/{StructureMegaLakeSmall.java => MegaLakeSmallStructure.java} (94%) rename src/main/java/ru/betterend/world/structures/features/{StructureMegaLake.java => MegaLakeStructure.java} (94%) rename src/main/java/ru/betterend/world/structures/features/{StructureMountain.java => MountainStructure.java} (94%) rename src/main/java/ru/betterend/world/structures/features/{StructurePaintedMountain.java => PaintedMountainStructure.java} (94%) diff --git a/src/main/java/ru/betterend/registry/EndStructures.java b/src/main/java/ru/betterend/registry/EndStructures.java index a14fd9f3..1c0292a9 100644 --- a/src/main/java/ru/betterend/registry/EndStructures.java +++ b/src/main/java/ru/betterend/registry/EndStructures.java @@ -11,13 +11,13 @@ import net.minecraft.world.gen.GenerationStep.Feature; import net.minecraft.world.gen.feature.ConfiguredStructureFeature; import ru.betterend.BetterEnd; import ru.betterend.world.structures.EndStructureFeature; -import ru.betterend.world.structures.features.StructureEternalPortal; -import ru.betterend.world.structures.features.StructureGiantIceStar; -import ru.betterend.world.structures.features.StructureGiantMossyGlowshroom; -import ru.betterend.world.structures.features.StructureMegaLake; -import ru.betterend.world.structures.features.StructureMegaLakeSmall; -import ru.betterend.world.structures.features.StructureMountain; -import ru.betterend.world.structures.features.StructurePaintedMountain; +import ru.betterend.world.structures.features.EternalPortalStructure; +import ru.betterend.world.structures.features.GiantIceStarStructure; +import ru.betterend.world.structures.features.GiantMossyGlowshroomStructure; +import ru.betterend.world.structures.features.MegaLakeStructure; +import ru.betterend.world.structures.features.MegaLakeSmallStructure; +import ru.betterend.world.structures.features.MountainStructure; +import ru.betterend.world.structures.features.PaintedMountainStructure; import ru.betterend.world.structures.piece.CavePiece; import ru.betterend.world.structures.piece.CrystalMountainPiece; import ru.betterend.world.structures.piece.LakePiece; @@ -33,13 +33,13 @@ public class EndStructures { public static final StructurePieceType PAINTED_MOUNTAIN_PIECE = register("painted_mountain_piece", PaintedMountainPiece::new); public static final StructurePieceType NBT_PIECE = register("nbt_piece", NBTPiece::new); - public static final EndStructureFeature GIANT_MOSSY_GLOWSHROOM = new EndStructureFeature("giant_mossy_glowshroom", new StructureGiantMossyGlowshroom(), Feature.SURFACE_STRUCTURES, 16, 8); - public static final EndStructureFeature MEGALAKE = new EndStructureFeature("megalake", new StructureMegaLake(), Feature.RAW_GENERATION, 4, 1); - public static final EndStructureFeature MEGALAKE_SMALL = new EndStructureFeature("megalake_small", new StructureMegaLakeSmall(), Feature.RAW_GENERATION, 4, 1); - public static final EndStructureFeature MOUNTAIN = new EndStructureFeature("mountain", new StructureMountain(), Feature.RAW_GENERATION, 3, 2); - public static final EndStructureFeature PAINTED_MOUNTAIN = new EndStructureFeature("painted_mountain", new StructurePaintedMountain(), Feature.RAW_GENERATION, 3, 2); - public static final EndStructureFeature ETERNAL_PORTAL = new EndStructureFeature("eternal_portal", new StructureEternalPortal(), Feature.SURFACE_STRUCTURES, 16, 6); - public static final EndStructureFeature GIANT_ICE_STAR = new EndStructureFeature("giant_ice_star", new StructureGiantIceStar(), Feature.SURFACE_STRUCTURES, 16, 8); + public static final EndStructureFeature GIANT_MOSSY_GLOWSHROOM = new EndStructureFeature("giant_mossy_glowshroom", new GiantMossyGlowshroomStructure(), Feature.SURFACE_STRUCTURES, 16, 8); + public static final EndStructureFeature MEGALAKE = new EndStructureFeature("megalake", new MegaLakeStructure(), Feature.RAW_GENERATION, 4, 1); + public static final EndStructureFeature MEGALAKE_SMALL = new EndStructureFeature("megalake_small", new MegaLakeSmallStructure(), Feature.RAW_GENERATION, 4, 1); + public static final EndStructureFeature MOUNTAIN = new EndStructureFeature("mountain", new MountainStructure(), Feature.RAW_GENERATION, 3, 2); + public static final EndStructureFeature PAINTED_MOUNTAIN = new EndStructureFeature("painted_mountain", new PaintedMountainStructure(), Feature.RAW_GENERATION, 3, 2); + public static final EndStructureFeature ETERNAL_PORTAL = new EndStructureFeature("eternal_portal", new EternalPortalStructure(), Feature.SURFACE_STRUCTURES, 16, 6); + public static final EndStructureFeature GIANT_ICE_STAR = new EndStructureFeature("giant_ice_star", new GiantIceStarStructure(), Feature.SURFACE_STRUCTURES, 16, 8); public static void register() {} diff --git a/src/main/java/ru/betterend/world/structures/features/StructureEternalPortal.java b/src/main/java/ru/betterend/world/structures/features/EternalPortalStructure.java similarity index 95% rename from src/main/java/ru/betterend/world/structures/features/StructureEternalPortal.java rename to src/main/java/ru/betterend/world/structures/features/EternalPortalStructure.java index 8d52e33c..3874615e 100644 --- a/src/main/java/ru/betterend/world/structures/features/StructureEternalPortal.java +++ b/src/main/java/ru/betterend/world/structures/features/EternalPortalStructure.java @@ -21,7 +21,7 @@ import ru.betterend.util.MHelper; import ru.betterend.util.StructureHelper; import ru.betterend.world.structures.piece.NBTPiece; -public class StructureEternalPortal extends StructureFeatureBase { +public class EternalPortalStructure extends FeatureBaseStructure { private static final Identifier STRUCTURE_ID = BetterEnd.makeID("portal/eternal_portal"); private static final Structure STRUCTURE = StructureHelper.readStructure(STRUCTURE_ID); diff --git a/src/main/java/ru/betterend/world/structures/features/StructureFeatureBase.java b/src/main/java/ru/betterend/world/structures/features/FeatureBaseStructure.java similarity index 93% rename from src/main/java/ru/betterend/world/structures/features/StructureFeatureBase.java rename to src/main/java/ru/betterend/world/structures/features/FeatureBaseStructure.java index d37fe7af..3be74a16 100644 --- a/src/main/java/ru/betterend/world/structures/features/StructureFeatureBase.java +++ b/src/main/java/ru/betterend/world/structures/features/FeatureBaseStructure.java @@ -14,10 +14,10 @@ import net.minecraft.world.gen.chunk.ChunkGenerator; import net.minecraft.world.gen.feature.DefaultFeatureConfig; import net.minecraft.world.gen.feature.StructureFeature; -public abstract class StructureFeatureBase extends StructureFeature { +public abstract class FeatureBaseStructure extends StructureFeature { protected static final BlockState AIR = Blocks.AIR.getDefaultState(); - public StructureFeatureBase() { + public FeatureBaseStructure() { super(DefaultFeatureConfig.CODEC); } diff --git a/src/main/java/ru/betterend/world/structures/features/StructureGiantIceStar.java b/src/main/java/ru/betterend/world/structures/features/GiantIceStarStructure.java similarity index 96% rename from src/main/java/ru/betterend/world/structures/features/StructureGiantIceStar.java rename to src/main/java/ru/betterend/world/structures/features/GiantIceStarStructure.java index 2aa327df..41c695e4 100644 --- a/src/main/java/ru/betterend/world/structures/features/StructureGiantIceStar.java +++ b/src/main/java/ru/betterend/world/structures/features/GiantIceStarStructure.java @@ -24,7 +24,7 @@ import ru.betterend.util.sdf.operator.SDFUnion; import ru.betterend.util.sdf.primitive.SDFCappedCone; import ru.betterend.world.structures.piece.VoxelPiece; -public class StructureGiantIceStar extends SDFStructureFeature { +public class GiantIceStarStructure extends SDFStructureFeature { private final float minSize = 20; private final float maxSize = 35; private final int minCount = 25; diff --git a/src/main/java/ru/betterend/world/structures/features/StructureGiantMossyGlowshroom.java b/src/main/java/ru/betterend/world/structures/features/GiantMossyGlowshroomStructure.java similarity index 96% rename from src/main/java/ru/betterend/world/structures/features/StructureGiantMossyGlowshroom.java rename to src/main/java/ru/betterend/world/structures/features/GiantMossyGlowshroomStructure.java index fdd7bbeb..11b50168 100644 --- a/src/main/java/ru/betterend/world/structures/features/StructureGiantMossyGlowshroom.java +++ b/src/main/java/ru/betterend/world/structures/features/GiantMossyGlowshroomStructure.java @@ -28,7 +28,7 @@ import ru.betterend.util.sdf.primitive.SDFCappedCone; import ru.betterend.util.sdf.primitive.SDFPrimitive; import ru.betterend.util.sdf.primitive.SDFSphere; -public class StructureGiantMossyGlowshroom extends SDFStructureFeature { +public class GiantMossyGlowshroomStructure extends SDFStructureFeature { @Override protected SDF getSDF(BlockPos center, Random random) { SDFCappedCone cone1 = new SDFCappedCone().setHeight(2.5F).setRadius1(1.5F).setRadius2(2.5F); diff --git a/src/main/java/ru/betterend/world/structures/features/StructureMegaLakeSmall.java b/src/main/java/ru/betterend/world/structures/features/MegaLakeSmallStructure.java similarity index 94% rename from src/main/java/ru/betterend/world/structures/features/StructureMegaLakeSmall.java rename to src/main/java/ru/betterend/world/structures/features/MegaLakeSmallStructure.java index 966e5dc7..344d92e3 100644 --- a/src/main/java/ru/betterend/world/structures/features/StructureMegaLakeSmall.java +++ b/src/main/java/ru/betterend/world/structures/features/MegaLakeSmallStructure.java @@ -13,7 +13,7 @@ import net.minecraft.world.gen.feature.StructureFeature; import ru.betterend.util.MHelper; import ru.betterend.world.structures.piece.LakePiece; -public class StructureMegaLakeSmall extends StructureFeatureBase { +public class MegaLakeSmallStructure extends FeatureBaseStructure { @Override public StructureFeature.StructureStartFactory getStructureStartFactory() { return SDFStructureStart::new; diff --git a/src/main/java/ru/betterend/world/structures/features/StructureMegaLake.java b/src/main/java/ru/betterend/world/structures/features/MegaLakeStructure.java similarity index 94% rename from src/main/java/ru/betterend/world/structures/features/StructureMegaLake.java rename to src/main/java/ru/betterend/world/structures/features/MegaLakeStructure.java index e0f5368e..1ae60a72 100644 --- a/src/main/java/ru/betterend/world/structures/features/StructureMegaLake.java +++ b/src/main/java/ru/betterend/world/structures/features/MegaLakeStructure.java @@ -13,7 +13,7 @@ import net.minecraft.world.gen.feature.StructureFeature; import ru.betterend.util.MHelper; import ru.betterend.world.structures.piece.LakePiece; -public class StructureMegaLake extends StructureFeatureBase { +public class MegaLakeStructure extends FeatureBaseStructure { @Override public StructureFeature.StructureStartFactory getStructureStartFactory() { return SDFStructureStart::new; diff --git a/src/main/java/ru/betterend/world/structures/features/StructureMountain.java b/src/main/java/ru/betterend/world/structures/features/MountainStructure.java similarity index 94% rename from src/main/java/ru/betterend/world/structures/features/StructureMountain.java rename to src/main/java/ru/betterend/world/structures/features/MountainStructure.java index f9ed7476..6efc808c 100644 --- a/src/main/java/ru/betterend/world/structures/features/StructureMountain.java +++ b/src/main/java/ru/betterend/world/structures/features/MountainStructure.java @@ -13,7 +13,7 @@ import net.minecraft.world.gen.feature.StructureFeature; import ru.betterend.util.MHelper; import ru.betterend.world.structures.piece.CrystalMountainPiece; -public class StructureMountain extends StructureFeatureBase { +public class MountainStructure extends FeatureBaseStructure { @Override public StructureFeature.StructureStartFactory getStructureStartFactory() { return SDFStructureStart::new; diff --git a/src/main/java/ru/betterend/world/structures/features/StructurePaintedMountain.java b/src/main/java/ru/betterend/world/structures/features/PaintedMountainStructure.java similarity index 94% rename from src/main/java/ru/betterend/world/structures/features/StructurePaintedMountain.java rename to src/main/java/ru/betterend/world/structures/features/PaintedMountainStructure.java index 0244cfca..07d262a0 100644 --- a/src/main/java/ru/betterend/world/structures/features/StructurePaintedMountain.java +++ b/src/main/java/ru/betterend/world/structures/features/PaintedMountainStructure.java @@ -16,7 +16,7 @@ import ru.betterend.registry.EndBlocks; import ru.betterend.util.MHelper; import ru.betterend.world.structures.piece.PaintedMountainPiece; -public class StructurePaintedMountain extends StructureFeatureBase { +public class PaintedMountainStructure extends FeatureBaseStructure { private static final BlockState[] VARIANTS; @Override diff --git a/src/main/java/ru/betterend/world/structures/features/SDFStructureFeature.java b/src/main/java/ru/betterend/world/structures/features/SDFStructureFeature.java index 42a31a73..21f9edd2 100644 --- a/src/main/java/ru/betterend/world/structures/features/SDFStructureFeature.java +++ b/src/main/java/ru/betterend/world/structures/features/SDFStructureFeature.java @@ -16,7 +16,7 @@ import ru.betterend.util.MHelper; import ru.betterend.util.sdf.SDF; import ru.betterend.world.structures.piece.VoxelPiece; -public abstract class SDFStructureFeature extends StructureFeatureBase { +public abstract class SDFStructureFeature extends FeatureBaseStructure { protected abstract SDF getSDF(BlockPos pos, Random random);