From 6e4f26b66ed4a4cbc2280f63bb2f8b906555baa1 Mon Sep 17 00:00:00 2001 From: Marcel Konrad Date: Sun, 24 May 2020 20:26:28 +0200 Subject: [PATCH] Renamed CoordinateType to EnumType --- .../builder/impl/BuilderSpawnpoint.java | 8 ++++---- .../worldhandler/builder/types/Coordinate.java | 18 +++++++++--------- .../builder/types/CoordinateDouble.java | 4 ++-- .../builder/types/CoordinateInt.java | 4 ++-- .../gui/content/impl/ContentContainers.java | 4 ++-- 5 files changed, 19 insertions(+), 19 deletions(-) diff --git a/src/main/java/exopandora/worldhandler/builder/impl/BuilderSpawnpoint.java b/src/main/java/exopandora/worldhandler/builder/impl/BuilderSpawnpoint.java index 80971c5..42b378f 100644 --- a/src/main/java/exopandora/worldhandler/builder/impl/BuilderSpawnpoint.java +++ b/src/main/java/exopandora/worldhandler/builder/impl/BuilderSpawnpoint.java @@ -2,7 +2,7 @@ package exopandora.worldhandler.builder.impl; import exopandora.worldhandler.builder.CommandBuilder; import exopandora.worldhandler.builder.CommandSyntax; -import exopandora.worldhandler.builder.types.Coordinate.CoordinateType; +import exopandora.worldhandler.builder.types.Coordinate.EnumType; import exopandora.worldhandler.builder.types.CoordinateInt; import exopandora.worldhandler.builder.types.ArgumentType; import net.minecraftforge.api.distmarker.Dist; @@ -13,9 +13,9 @@ public class BuilderSpawnpoint extends CommandBuilder { public BuilderSpawnpoint() { - this.setX(new CoordinateInt(CoordinateType.GLOBAL)); - this.setY(new CoordinateInt(CoordinateType.GLOBAL)); - this.setZ(new CoordinateInt(CoordinateType.GLOBAL)); + this.setX(new CoordinateInt(EnumType.GLOBAL)); + this.setY(new CoordinateInt(EnumType.GLOBAL)); + this.setZ(new CoordinateInt(EnumType.GLOBAL)); } @Override diff --git a/src/main/java/exopandora/worldhandler/builder/types/Coordinate.java b/src/main/java/exopandora/worldhandler/builder/types/Coordinate.java index 557bed2..b185214 100644 --- a/src/main/java/exopandora/worldhandler/builder/types/Coordinate.java +++ b/src/main/java/exopandora/worldhandler/builder/types/Coordinate.java @@ -11,14 +11,14 @@ import net.minecraftforge.api.distmarker.OnlyIn; public abstract class Coordinate implements ICoordinate { protected T value; - protected CoordinateType type; + protected EnumType type; public Coordinate(T value) { - this(value, CoordinateType.ABSOLUTE); + this(value, EnumType.ABSOLUTE); } - public Coordinate(T value, CoordinateType type) + public Coordinate(T value, EnumType type) { this.value = value; this.type = type; @@ -34,12 +34,12 @@ public abstract class Coordinate implements ICoordinate return this.value; } - public void setType(CoordinateType type) + public void setType(EnumType type) { this.type = type; } - public CoordinateType getType() + public EnumType getType() { return this.type; } @@ -53,7 +53,7 @@ public abstract class Coordinate implements ICoordinate @Nullable public static > U parse(U coordiante, String input, Function parser) { - for(CoordinateType type : CoordinateType.values()) + for(EnumType type : EnumType.values()) { if(!type.prefix.isEmpty() && input.startsWith(type.prefix)) { @@ -66,14 +66,14 @@ public abstract class Coordinate implements ICoordinate } } - coordiante.setType(CoordinateType.ABSOLUTE); + coordiante.setType(EnumType.ABSOLUTE); coordiante.setValue(parser.apply(input)); return coordiante; } @OnlyIn(Dist.CLIENT) - public static enum CoordinateType + public static enum EnumType { ABSOLUTE(""), GLOBAL("~"), @@ -81,7 +81,7 @@ public abstract class Coordinate implements ICoordinate private final String prefix; - private CoordinateType(String prefix) + private EnumType(String prefix) { this.prefix = prefix; } diff --git a/src/main/java/exopandora/worldhandler/builder/types/CoordinateDouble.java b/src/main/java/exopandora/worldhandler/builder/types/CoordinateDouble.java index e274243..a3a7c1f 100644 --- a/src/main/java/exopandora/worldhandler/builder/types/CoordinateDouble.java +++ b/src/main/java/exopandora/worldhandler/builder/types/CoordinateDouble.java @@ -16,12 +16,12 @@ public class CoordinateDouble extends Coordinate super(value); } - public CoordinateDouble(CoordinateType type) + public CoordinateDouble(EnumType type) { super(0.0, type); } - public CoordinateDouble(Double value, CoordinateType type) + public CoordinateDouble(Double value, EnumType type) { super(value, type); } diff --git a/src/main/java/exopandora/worldhandler/builder/types/CoordinateInt.java b/src/main/java/exopandora/worldhandler/builder/types/CoordinateInt.java index c16c9bb..681330a 100644 --- a/src/main/java/exopandora/worldhandler/builder/types/CoordinateInt.java +++ b/src/main/java/exopandora/worldhandler/builder/types/CoordinateInt.java @@ -16,12 +16,12 @@ public class CoordinateInt extends Coordinate super(value); } - public CoordinateInt(CoordinateType type) + public CoordinateInt(EnumType type) { super(0, type); } - public CoordinateInt(Integer value, CoordinateType type) + public CoordinateInt(Integer value, EnumType type) { super(value, type); } diff --git a/src/main/java/exopandora/worldhandler/gui/content/impl/ContentContainers.java b/src/main/java/exopandora/worldhandler/gui/content/impl/ContentContainers.java index 3da6d0f..820cd7c 100644 --- a/src/main/java/exopandora/worldhandler/gui/content/impl/ContentContainers.java +++ b/src/main/java/exopandora/worldhandler/gui/content/impl/ContentContainers.java @@ -2,7 +2,7 @@ package exopandora.worldhandler.gui.content.impl; import exopandora.worldhandler.builder.impl.BuilderGive; import exopandora.worldhandler.builder.impl.BuilderSetBlock; -import exopandora.worldhandler.builder.types.Coordinate.CoordinateType; +import exopandora.worldhandler.builder.types.Coordinate.EnumType; import exopandora.worldhandler.builder.types.CoordinateInt; import exopandora.worldhandler.config.Config; import exopandora.worldhandler.gui.button.GuiButtonBase; @@ -73,7 +73,7 @@ public class ContentContainers extends Content if(block != null) { - CommandHelper.sendCommand(new BuilderSetBlock(new CoordinateInt(cx, CoordinateType.GLOBAL), new CoordinateInt(yOffset, CoordinateType.GLOBAL), new CoordinateInt(cz, CoordinateType.GLOBAL), block.getRegistryName(), Config.getSettings().getBlockPlacingMode())); + CommandHelper.sendCommand(new BuilderSetBlock(new CoordinateInt(cx, EnumType.GLOBAL), new CoordinateInt(yOffset, EnumType.GLOBAL), new CoordinateInt(cz, EnumType.GLOBAL), block.getRegistryName(), Config.getSettings().getBlockPlacingMode())); } } }