MinecraftMods/BetterEnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Structure class rename

Browse source
This commit is contained in:
paulevsGitch 2021-03-27 18:11:13 +03:00
parent c381260487
commit 8e368bc3ff
10 changed files with 24 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

28
src/main/java/ru/betterend/registry/EndStructures.java
View file

@ -11,13 +11,13 @@ import net.minecraft.world.gen.GenerationStep.Feature;
import net.minecraft.world.gen.feature.ConfiguredStructureFeature; import net.minecraft.world.gen.feature.ConfiguredStructureFeature;
import ru.betterend.BetterEnd; import ru.betterend.BetterEnd;
import ru.betterend.world.structures.EndStructureFeature; import ru.betterend.world.structures.EndStructureFeature;
import ru.betterend.world.structures.features.StructureEternalPortal; import ru.betterend.world.structures.features.EternalPortalStructure;
import ru.betterend.world.structures.features.StructureGiantIceStar; import ru.betterend.world.structures.features.GiantIceStarStructure;
import ru.betterend.world.structures.features.StructureGiantMossyGlowshroom; import ru.betterend.world.structures.features.GiantMossyGlowshroomStructure;
import ru.betterend.world.structures.features.StructureMegaLake; import ru.betterend.world.structures.features.MegaLakeStructure;
import ru.betterend.world.structures.features.StructureMegaLakeSmall; import ru.betterend.world.structures.features.MegaLakeSmallStructure;
import ru.betterend.world.structures.features.StructureMountain; import ru.betterend.world.structures.features.MountainStructure;
import ru.betterend.world.structures.features.StructurePaintedMountain; import ru.betterend.world.structures.features.PaintedMountainStructure;
import ru.betterend.world.structures.piece.CavePiece; import ru.betterend.world.structures.piece.CavePiece;
import ru.betterend.world.structures.piece.CrystalMountainPiece; import ru.betterend.world.structures.piece.CrystalMountainPiece;
import ru.betterend.world.structures.piece.LakePiece; 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 PAINTED_MOUNTAIN_PIECE = register("painted_mountain_piece", PaintedMountainPiece::new);
public static final StructurePieceType NBT_PIECE = register("nbt_piece", NBTPiece::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 GIANT_MOSSY_GLOWSHROOM = new EndStructureFeature("giant_mossy_glowshroom", new GiantMossyGlowshroomStructure(), 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 = new EndStructureFeature("megalake", new MegaLakeStructure(), 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 MEGALAKE_SMALL = new EndStructureFeature("megalake_small", new MegaLakeSmallStructure(), Feature.RAW_GENERATION, 4, 1);
public static final EndStructureFeature MOUNTAIN = new EndStructureFeature("mountain", new StructureMountain(), Feature.RAW_GENERATION, 3, 2); 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 StructurePaintedMountain(), 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 StructureEternalPortal(), Feature.SURFACE_STRUCTURES, 16, 6); 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 StructureGiantIceStar(), Feature.SURFACE_STRUCTURES, 16, 8); public static final EndStructureFeature GIANT_ICE_STAR = new EndStructureFeature("giant_ice_star", new GiantIceStarStructure(), Feature.SURFACE_STRUCTURES, 16, 8);
public static void register() {} public static void register() {}

2
src/main/java/ru/betterend/world/structures/features/StructureEternalPortal.java → src/main/java/ru/betterend/world/structures/features/EternalPortalStructure.java
View file

@ -21,7 +21,7 @@ import ru.betterend.util.MHelper;
import ru.betterend.util.StructureHelper; import ru.betterend.util.StructureHelper;
import ru.betterend.world.structures.piece.NBTPiece; 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 Identifier STRUCTURE_ID = BetterEnd.makeID("portal/eternal_portal");
private static final Structure STRUCTURE = StructureHelper.readStructure(STRUCTURE_ID); private static final Structure STRUCTURE = StructureHelper.readStructure(STRUCTURE_ID);

4
src/main/java/ru/betterend/world/structures/features/StructureFeatureBase.java → src/main/java/ru/betterend/world/structures/features/FeatureBaseStructure.java
View file

@ -14,10 +14,10 @@ import net.minecraft.world.gen.chunk.ChunkGenerator;
import net.minecraft.world.gen.feature.DefaultFeatureConfig; import net.minecraft.world.gen.feature.DefaultFeatureConfig;
import net.minecraft.world.gen.feature.StructureFeature; import net.minecraft.world.gen.feature.StructureFeature;
public abstract class StructureFeatureBase extends StructureFeature<DefaultFeatureConfig> { public abstract class FeatureBaseStructure extends StructureFeature<DefaultFeatureConfig> {
protected static final BlockState AIR = Blocks.AIR.getDefaultState(); protected static final BlockState AIR = Blocks.AIR.getDefaultState();
public StructureFeatureBase() { public FeatureBaseStructure() {
super(DefaultFeatureConfig.CODEC); super(DefaultFeatureConfig.CODEC);
} }

2
src/main/java/ru/betterend/world/structures/features/StructureGiantIceStar.java → src/main/java/ru/betterend/world/structures/features/GiantIceStarStructure.java
View file

@ -24,7 +24,7 @@ import ru.betterend.util.sdf.operator.SDFUnion;
import ru.betterend.util.sdf.primitive.SDFCappedCone; import ru.betterend.util.sdf.primitive.SDFCappedCone;
import ru.betterend.world.structures.piece.VoxelPiece; 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 minSize = 20;
private final float maxSize = 35; private final float maxSize = 35;
private final int minCount = 25; private final int minCount = 25;

2
src/main/java/ru/betterend/world/structures/features/StructureGiantMossyGlowshroom.java → src/main/java/ru/betterend/world/structures/features/GiantMossyGlowshroomStructure.java
View file

@ -28,7 +28,7 @@ import ru.betterend.util.sdf.primitive.SDFCappedCone;
import ru.betterend.util.sdf.primitive.SDFPrimitive; import ru.betterend.util.sdf.primitive.SDFPrimitive;
import ru.betterend.util.sdf.primitive.SDFSphere; import ru.betterend.util.sdf.primitive.SDFSphere;
public class StructureGiantMossyGlowshroom extends SDFStructureFeature { public class GiantMossyGlowshroomStructure extends SDFStructureFeature {
@Override @Override
protected SDF getSDF(BlockPos center, Random random) { protected SDF getSDF(BlockPos center, Random random) {
SDFCappedCone cone1 = new SDFCappedCone().setHeight(2.5F).setRadius1(1.5F).setRadius2(2.5F); SDFCappedCone cone1 = new SDFCappedCone().setHeight(2.5F).setRadius1(1.5F).setRadius2(2.5F);

2
src/main/java/ru/betterend/world/structures/features/StructureMegaLakeSmall.java → src/main/java/ru/betterend/world/structures/features/MegaLakeSmallStructure.java
View file

@ -13,7 +13,7 @@ import net.minecraft.world.gen.feature.StructureFeature;
import ru.betterend.util.MHelper; import ru.betterend.util.MHelper;
import ru.betterend.world.structures.piece.LakePiece; import ru.betterend.world.structures.piece.LakePiece;
public class StructureMegaLakeSmall extends StructureFeatureBase { public class MegaLakeSmallStructure extends FeatureBaseStructure {
@Override @Override
public StructureFeature.StructureStartFactory<DefaultFeatureConfig> getStructureStartFactory() { public StructureFeature.StructureStartFactory<DefaultFeatureConfig> getStructureStartFactory() {
return SDFStructureStart::new; return SDFStructureStart::new;

2
src/main/java/ru/betterend/world/structures/features/StructureMegaLake.java → src/main/java/ru/betterend/world/structures/features/MegaLakeStructure.java
View file

@ -13,7 +13,7 @@ import net.minecraft.world.gen.feature.StructureFeature;
import ru.betterend.util.MHelper; import ru.betterend.util.MHelper;
import ru.betterend.world.structures.piece.LakePiece; import ru.betterend.world.structures.piece.LakePiece;
public class StructureMegaLake extends StructureFeatureBase { public class MegaLakeStructure extends FeatureBaseStructure {
@Override @Override
public StructureFeature.StructureStartFactory<DefaultFeatureConfig> getStructureStartFactory() { public StructureFeature.StructureStartFactory<DefaultFeatureConfig> getStructureStartFactory() {
return SDFStructureStart::new; return SDFStructureStart::new;

2
src/main/java/ru/betterend/world/structures/features/StructureMountain.java → src/main/java/ru/betterend/world/structures/features/MountainStructure.java
View file

@ -13,7 +13,7 @@ import net.minecraft.world.gen.feature.StructureFeature;
import ru.betterend.util.MHelper; import ru.betterend.util.MHelper;
import ru.betterend.world.structures.piece.CrystalMountainPiece; import ru.betterend.world.structures.piece.CrystalMountainPiece;
public class StructureMountain extends StructureFeatureBase { public class MountainStructure extends FeatureBaseStructure {
@Override @Override
public StructureFeature.StructureStartFactory<DefaultFeatureConfig> getStructureStartFactory() { public StructureFeature.StructureStartFactory<DefaultFeatureConfig> getStructureStartFactory() {
return SDFStructureStart::new; return SDFStructureStart::new;

2
src/main/java/ru/betterend/world/structures/features/StructurePaintedMountain.java → src/main/java/ru/betterend/world/structures/features/PaintedMountainStructure.java
View file

@ -16,7 +16,7 @@ import ru.betterend.registry.EndBlocks;
import ru.betterend.util.MHelper; import ru.betterend.util.MHelper;
import ru.betterend.world.structures.piece.PaintedMountainPiece; import ru.betterend.world.structures.piece.PaintedMountainPiece;
public class StructurePaintedMountain extends StructureFeatureBase { public class PaintedMountainStructure extends FeatureBaseStructure {
private static final BlockState[] VARIANTS; private static final BlockState[] VARIANTS;
@Override @Override

2
src/main/java/ru/betterend/world/structures/features/SDFStructureFeature.java
View file

@ -16,7 +16,7 @@ import ru.betterend.util.MHelper;
import ru.betterend.util.sdf.SDF; import ru.betterend.util.sdf.SDF;
import ru.betterend.world.structures.piece.VoxelPiece; 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); protected abstract SDF getSDF(BlockPos pos, Random random);