From bb888380aacc6088f5165e11bab7e4231712978d Mon Sep 17 00:00:00 2001 From: dfsek Date: Wed, 23 Jun 2021 10:05:29 -0700 Subject: [PATCH] more refactors --- .../terra/api}/profiler/ProfileFrame.java | 2 +- .../dfsek/terra/api}/profiler/Profiler.java | 2 +- .../dfsek/terra/api}/profiler/Timings.java | 4 +-- .../terra/api}/structure/buffer/Buffer.java | 3 +- .../api/structure/buffer}/BufferedItem.java | 2 +- .../api/structure/rotation}/Rotation.java | 2 +- .../api/structure/rotation}/RotationUtil.java | 2 +- .../java/com/dfsek/terra/api/util/Range.java | 36 +++++++++++++++++++ .../terra/api/util/generic/either/Either.java | 0 .../api/util/generic/pair/ImmutablePair.java | 0 .../terra/api/util/generic/pair/Pair.java | 0 .../api/util/mutable/MutableBoolean.java | 0 .../terra/api/util/mutable/MutableDouble.java | 0 .../api/util/mutable/MutableInteger.java | 0 .../terra/api/util/mutable/MutableNumber.java | 0 .../api/util/mutable/MutablePrimitive.java | 0 .../terra/api/util/mutable/package-info.java | 0 .../com/dfsek/terra/api/vector/Vector2.java | 2 ++ .../com/dfsek/terra/api/world}/Flora.java | 2 +- .../{Range.java => range/ConstantRange.java} | 29 ++++++++++----- .../structures/script/StructureScript.java | 6 ++-- .../script/TerraImplementationArguments.java | 4 +-- .../functions/AbstractBlockFunction.java | 2 +- .../script/functions/BiomeFunction.java | 2 +- .../script/functions/CheckBlockFunction.java | 2 +- .../script/functions/CheckFunction.java | 2 +- .../script/functions/EntityFunction.java | 2 +- .../script/functions/GetMarkFunction.java | 2 +- .../script/functions/LootFunction.java | 2 +- .../script/functions/PullFunction.java | 2 +- .../script/functions/SetMarkFunction.java | 2 +- .../script/functions/StateFunction.java | 2 +- .../script/functions/StructureFunction.java | 4 +-- .../api/structures/structure/buffer/Cell.java | 2 +- .../structure/buffer/DirectBuffer.java | 3 +- .../structure/buffer/IntermediateBuffer.java | 3 +- .../structure/buffer/StructureBuffer.java | 3 +- .../structure/buffer/items/BufferedBlock.java | 1 + .../buffer/items/BufferedEntity.java | 1 + .../buffer/items/BufferedLootApplication.java | 1 + .../buffer/items/BufferedPulledBlock.java | 1 + .../items/BufferedStateManipulator.java | 1 + .../world/locate/AsyncStructureFinder.java | 2 +- .../terra/carving/UserDefinedCarver.java | 5 +-- .../commands/structure/SpawnCommand.java | 2 +- .../structure/StructureLoadCommand.java | 2 +- .../dfsek/terra/config/GenericLoaders.java | 4 +-- .../terra/config/factories/FloraFactory.java | 2 +- .../terra/config/loaders/RangeLoader.java | 5 +-- .../com/dfsek/terra/config/loaders/Types.java | 2 +- .../loaders/config/FloraLayerLoader.java | 6 ++-- .../loaders/config/OreConfigLoader.java | 7 ++-- .../loaders/config/TreeLayerLoader.java | 4 +-- .../config/templates/CarverTemplate.java | 5 +-- .../terra/config/templates/OreTemplate.java | 2 +- .../config/templates/StructureTemplate.java | 2 +- .../dfsek/terra/profiler/ProfilerImpl.java | 2 ++ .../registry/config/ConfigTypeRegistry.java | 2 +- .../terra/registry/config/FloraRegistry.java | 2 +- .../terra/world/carving/NoiseCarver.java | 2 +- .../generators/DefaultChunkGenerator2D.java | 6 ++-- .../generators/DefaultChunkGenerator3D.java | 6 ++-- .../terra/world/population/CavePopulator.java | 2 +- .../world/population/FloraPopulator.java | 2 +- .../terra/world/population/OrePopulator.java | 2 +- .../world/population/StructurePopulator.java | 4 +-- .../terra/world/population/TreePopulator.java | 2 +- .../population/items/PlaceableLayer.java | 7 ++-- .../population/items/TerraStructure.java | 2 +- .../population/items/flora/BlockFlora.java | 4 +-- .../population/items/flora/ConstantFlora.java | 4 +-- .../population/items/flora/FloraLayer.java | 6 ++-- .../population/items/flora/TerraFlora.java | 4 +-- .../items/ores/DeformedSphereOre.java | 2 +- .../population/items/ores/OreConfig.java | 2 +- .../population/items/ores/VanillaOre.java | 2 +- .../population/items/tree/TerraTree.java | 2 +- .../population/items/tree/TreeLayer.java | 4 +-- .../src/test/java/profiler/ProfilerTest.java | 2 +- .../dfsek/terra/bukkit/TerraBukkitPlugin.java | 2 +- .../bukkit/population/PopulationManager.java | 2 +- .../dfsek/terra/bukkit/world/BukkitTree.java | 2 +- .../dfsek/terra/fabric/TerraFabricPlugin.java | 2 +- .../ConfiguredFeatureMixin.java | 2 +- .../com/dfsek/terra/StandalonePlugin.java | 2 +- .../dfsek/terra/sponge/TerraSpongePlugin.java | 2 +- 86 files changed, 169 insertions(+), 104 deletions(-) rename common/{implementation/src/main/java/com/dfsek/terra => api/src/main/java/com/dfsek/terra/api}/profiler/ProfileFrame.java (86%) rename common/{implementation/src/main/java/com/dfsek/terra => api/src/main/java/com/dfsek/terra/api}/profiler/Profiler.java (96%) rename common/{implementation/src/main/java/com/dfsek/terra => api/src/main/java/com/dfsek/terra/api}/profiler/Timings.java (94%) rename common/{implementation/src/main/java/com/dfsek/terra/api/structures => api/src/main/java/com/dfsek/terra/api}/structure/buffer/Buffer.java (65%) rename common/{implementation/src/main/java/com/dfsek/terra/api/structures/structure/buffer/items => api/src/main/java/com/dfsek/terra/api/structure/buffer}/BufferedItem.java (82%) rename common/{implementation/src/main/java/com/dfsek/terra/api/structures/structure => api/src/main/java/com/dfsek/terra/api/structure/rotation}/Rotation.java (96%) rename common/{implementation/src/main/java/com/dfsek/terra/api/structures/structure => api/src/main/java/com/dfsek/terra/api/structure/rotation}/RotationUtil.java (99%) create mode 100644 common/api/src/main/java/com/dfsek/terra/api/util/Range.java rename common/{implementation => api}/src/main/java/com/dfsek/terra/api/util/generic/either/Either.java (100%) rename common/{implementation => api}/src/main/java/com/dfsek/terra/api/util/generic/pair/ImmutablePair.java (100%) rename common/{implementation => api}/src/main/java/com/dfsek/terra/api/util/generic/pair/Pair.java (100%) rename common/{implementation => api}/src/main/java/com/dfsek/terra/api/util/mutable/MutableBoolean.java (100%) rename common/{implementation => api}/src/main/java/com/dfsek/terra/api/util/mutable/MutableDouble.java (100%) rename common/{implementation => api}/src/main/java/com/dfsek/terra/api/util/mutable/MutableInteger.java (100%) rename common/{implementation => api}/src/main/java/com/dfsek/terra/api/util/mutable/MutableNumber.java (100%) rename common/{implementation => api}/src/main/java/com/dfsek/terra/api/util/mutable/MutablePrimitive.java (100%) rename common/{implementation => api}/src/main/java/com/dfsek/terra/api/util/mutable/package-info.java (100%) rename common/{implementation/src/main/java/com/dfsek/terra/api/world/flora => api/src/main/java/com/dfsek/terra/api/world}/Flora.java (88%) rename common/implementation/src/main/java/com/dfsek/terra/api/math/{Range.java => range/ConstantRange.java} (76%) diff --git a/common/implementation/src/main/java/com/dfsek/terra/profiler/ProfileFrame.java b/common/api/src/main/java/com/dfsek/terra/api/profiler/ProfileFrame.java similarity index 86% rename from common/implementation/src/main/java/com/dfsek/terra/profiler/ProfileFrame.java rename to common/api/src/main/java/com/dfsek/terra/api/profiler/ProfileFrame.java index bf5c64dab..e00ffcecd 100644 --- a/common/implementation/src/main/java/com/dfsek/terra/profiler/ProfileFrame.java +++ b/common/api/src/main/java/com/dfsek/terra/api/profiler/ProfileFrame.java @@ -1,4 +1,4 @@ -package com.dfsek.terra.profiler; +package com.dfsek.terra.api.profiler; public class ProfileFrame implements AutoCloseable { private final Runnable action; diff --git a/common/implementation/src/main/java/com/dfsek/terra/profiler/Profiler.java b/common/api/src/main/java/com/dfsek/terra/api/profiler/Profiler.java similarity index 96% rename from common/implementation/src/main/java/com/dfsek/terra/profiler/Profiler.java rename to common/api/src/main/java/com/dfsek/terra/api/profiler/Profiler.java index 65560ad56..fb76e77ce 100644 --- a/common/implementation/src/main/java/com/dfsek/terra/profiler/Profiler.java +++ b/common/api/src/main/java/com/dfsek/terra/api/profiler/Profiler.java @@ -1,4 +1,4 @@ -package com.dfsek.terra.profiler; +package com.dfsek.terra.api.profiler; import java.util.Map; diff --git a/common/implementation/src/main/java/com/dfsek/terra/profiler/Timings.java b/common/api/src/main/java/com/dfsek/terra/api/profiler/Timings.java similarity index 94% rename from common/implementation/src/main/java/com/dfsek/terra/profiler/Timings.java rename to common/api/src/main/java/com/dfsek/terra/api/profiler/Timings.java index 3875285b3..88f2c05e1 100644 --- a/common/implementation/src/main/java/com/dfsek/terra/profiler/Timings.java +++ b/common/api/src/main/java/com/dfsek/terra/api/profiler/Timings.java @@ -1,4 +1,4 @@ -package com.dfsek.terra.profiler; +package com.dfsek.terra.api.profiler; import java.util.ArrayList; import java.util.Collections; @@ -41,7 +41,7 @@ public class Timings { return subItems.computeIfAbsent(id, s -> new Timings()); } - public String toString(int indent, Timings parent, Set branches) { + private String toString(int indent, Timings parent, Set branches) { StringBuilder builder = new StringBuilder(); builder.append((double) min() / 1000000).append("ms min / ").append(average() / 1000000).append("ms avg / ") diff --git a/common/implementation/src/main/java/com/dfsek/terra/api/structures/structure/buffer/Buffer.java b/common/api/src/main/java/com/dfsek/terra/api/structure/buffer/Buffer.java similarity index 65% rename from common/implementation/src/main/java/com/dfsek/terra/api/structures/structure/buffer/Buffer.java rename to common/api/src/main/java/com/dfsek/terra/api/structure/buffer/Buffer.java index 76366bd1f..4fc0366c0 100644 --- a/common/implementation/src/main/java/com/dfsek/terra/api/structures/structure/buffer/Buffer.java +++ b/common/api/src/main/java/com/dfsek/terra/api/structure/buffer/Buffer.java @@ -1,7 +1,6 @@ -package com.dfsek.terra.api.structures.structure.buffer; +package com.dfsek.terra.api.structure.buffer; import com.dfsek.terra.api.vector.Location; -import com.dfsek.terra.api.structures.structure.buffer.items.BufferedItem; public interface Buffer { Buffer addItem(BufferedItem item, Location location); diff --git a/common/implementation/src/main/java/com/dfsek/terra/api/structures/structure/buffer/items/BufferedItem.java b/common/api/src/main/java/com/dfsek/terra/api/structure/buffer/BufferedItem.java similarity index 82% rename from common/implementation/src/main/java/com/dfsek/terra/api/structures/structure/buffer/items/BufferedItem.java rename to common/api/src/main/java/com/dfsek/terra/api/structure/buffer/BufferedItem.java index 87ed8f65d..27d3ef9ca 100644 --- a/common/implementation/src/main/java/com/dfsek/terra/api/structures/structure/buffer/items/BufferedItem.java +++ b/common/api/src/main/java/com/dfsek/terra/api/structure/buffer/BufferedItem.java @@ -1,4 +1,4 @@ -package com.dfsek.terra.api.structures.structure.buffer.items; +package com.dfsek.terra.api.structure.buffer; import com.dfsek.terra.api.vector.Location; import com.dfsek.terra.api.world.Chunk; diff --git a/common/implementation/src/main/java/com/dfsek/terra/api/structures/structure/Rotation.java b/common/api/src/main/java/com/dfsek/terra/api/structure/rotation/Rotation.java similarity index 96% rename from common/implementation/src/main/java/com/dfsek/terra/api/structures/structure/Rotation.java rename to common/api/src/main/java/com/dfsek/terra/api/structure/rotation/Rotation.java index f81c8f63e..e4091ac49 100644 --- a/common/implementation/src/main/java/com/dfsek/terra/api/structures/structure/Rotation.java +++ b/common/api/src/main/java/com/dfsek/terra/api/structure/rotation/Rotation.java @@ -1,4 +1,4 @@ -package com.dfsek.terra.api.structures.structure; +package com.dfsek.terra.api.structure.rotation; import net.jafama.FastMath; diff --git a/common/implementation/src/main/java/com/dfsek/terra/api/structures/structure/RotationUtil.java b/common/api/src/main/java/com/dfsek/terra/api/structure/rotation/RotationUtil.java similarity index 99% rename from common/implementation/src/main/java/com/dfsek/terra/api/structures/structure/RotationUtil.java rename to common/api/src/main/java/com/dfsek/terra/api/structure/rotation/RotationUtil.java index 7a1c0e33c..25a5f398d 100644 --- a/common/implementation/src/main/java/com/dfsek/terra/api/structures/structure/RotationUtil.java +++ b/common/api/src/main/java/com/dfsek/terra/api/structure/rotation/RotationUtil.java @@ -1,4 +1,4 @@ -package com.dfsek.terra.api.structures.structure; +package com.dfsek.terra.api.structure.rotation; import com.dfsek.terra.api.vector.Vector2; import com.dfsek.terra.api.block.Axis; diff --git a/common/api/src/main/java/com/dfsek/terra/api/util/Range.java b/common/api/src/main/java/com/dfsek/terra/api/util/Range.java new file mode 100644 index 000000000..b7fb7d1ca --- /dev/null +++ b/common/api/src/main/java/com/dfsek/terra/api/util/Range.java @@ -0,0 +1,36 @@ +package com.dfsek.terra.api.util; + +import org.jetbrains.annotations.NotNull; + +import java.util.Iterator; +import java.util.Random; + +public interface Range extends Iterable { + boolean isInRange(int test); + + int getMax(); + + ConstantRange setMax(int max); + + int getMin(); + + ConstantRange setMin(int min); + + int getRange(); + + ConstantRange multiply(int mult); + + ConstantRange reflect(int pt); + + int get(Random r); + + ConstantRange intersects(ConstantRange other); + + ConstantRange add(int add); + + ConstantRange sub(int sub); + + @NotNull + @Override + Iterator iterator(); +} diff --git a/common/implementation/src/main/java/com/dfsek/terra/api/util/generic/either/Either.java b/common/api/src/main/java/com/dfsek/terra/api/util/generic/either/Either.java similarity index 100% rename from common/implementation/src/main/java/com/dfsek/terra/api/util/generic/either/Either.java rename to common/api/src/main/java/com/dfsek/terra/api/util/generic/either/Either.java diff --git a/common/implementation/src/main/java/com/dfsek/terra/api/util/generic/pair/ImmutablePair.java b/common/api/src/main/java/com/dfsek/terra/api/util/generic/pair/ImmutablePair.java similarity index 100% rename from common/implementation/src/main/java/com/dfsek/terra/api/util/generic/pair/ImmutablePair.java rename to common/api/src/main/java/com/dfsek/terra/api/util/generic/pair/ImmutablePair.java diff --git a/common/implementation/src/main/java/com/dfsek/terra/api/util/generic/pair/Pair.java b/common/api/src/main/java/com/dfsek/terra/api/util/generic/pair/Pair.java similarity index 100% rename from common/implementation/src/main/java/com/dfsek/terra/api/util/generic/pair/Pair.java rename to common/api/src/main/java/com/dfsek/terra/api/util/generic/pair/Pair.java diff --git a/common/implementation/src/main/java/com/dfsek/terra/api/util/mutable/MutableBoolean.java b/common/api/src/main/java/com/dfsek/terra/api/util/mutable/MutableBoolean.java similarity index 100% rename from common/implementation/src/main/java/com/dfsek/terra/api/util/mutable/MutableBoolean.java rename to common/api/src/main/java/com/dfsek/terra/api/util/mutable/MutableBoolean.java diff --git a/common/implementation/src/main/java/com/dfsek/terra/api/util/mutable/MutableDouble.java b/common/api/src/main/java/com/dfsek/terra/api/util/mutable/MutableDouble.java similarity index 100% rename from common/implementation/src/main/java/com/dfsek/terra/api/util/mutable/MutableDouble.java rename to common/api/src/main/java/com/dfsek/terra/api/util/mutable/MutableDouble.java diff --git a/common/implementation/src/main/java/com/dfsek/terra/api/util/mutable/MutableInteger.java b/common/api/src/main/java/com/dfsek/terra/api/util/mutable/MutableInteger.java similarity index 100% rename from common/implementation/src/main/java/com/dfsek/terra/api/util/mutable/MutableInteger.java rename to common/api/src/main/java/com/dfsek/terra/api/util/mutable/MutableInteger.java diff --git a/common/implementation/src/main/java/com/dfsek/terra/api/util/mutable/MutableNumber.java b/common/api/src/main/java/com/dfsek/terra/api/util/mutable/MutableNumber.java similarity index 100% rename from common/implementation/src/main/java/com/dfsek/terra/api/util/mutable/MutableNumber.java rename to common/api/src/main/java/com/dfsek/terra/api/util/mutable/MutableNumber.java diff --git a/common/implementation/src/main/java/com/dfsek/terra/api/util/mutable/MutablePrimitive.java b/common/api/src/main/java/com/dfsek/terra/api/util/mutable/MutablePrimitive.java similarity index 100% rename from common/implementation/src/main/java/com/dfsek/terra/api/util/mutable/MutablePrimitive.java rename to common/api/src/main/java/com/dfsek/terra/api/util/mutable/MutablePrimitive.java diff --git a/common/implementation/src/main/java/com/dfsek/terra/api/util/mutable/package-info.java b/common/api/src/main/java/com/dfsek/terra/api/util/mutable/package-info.java similarity index 100% rename from common/implementation/src/main/java/com/dfsek/terra/api/util/mutable/package-info.java rename to common/api/src/main/java/com/dfsek/terra/api/util/mutable/package-info.java diff --git a/common/api/src/main/java/com/dfsek/terra/api/vector/Vector2.java b/common/api/src/main/java/com/dfsek/terra/api/vector/Vector2.java index bfc63ee16..25a725c55 100644 --- a/common/api/src/main/java/com/dfsek/terra/api/vector/Vector2.java +++ b/common/api/src/main/java/com/dfsek/terra/api/vector/Vector2.java @@ -11,6 +11,8 @@ public interface Vector2 extends Cloneable { */ double getX(); + Vector2 clone(); + Vector2 setX(double x); /** diff --git a/common/implementation/src/main/java/com/dfsek/terra/api/world/flora/Flora.java b/common/api/src/main/java/com/dfsek/terra/api/world/Flora.java similarity index 88% rename from common/implementation/src/main/java/com/dfsek/terra/api/world/flora/Flora.java rename to common/api/src/main/java/com/dfsek/terra/api/world/Flora.java index 3abd739c1..44e0f7b87 100644 --- a/common/implementation/src/main/java/com/dfsek/terra/api/world/flora/Flora.java +++ b/common/api/src/main/java/com/dfsek/terra/api/world/Flora.java @@ -1,4 +1,4 @@ -package com.dfsek.terra.api.world.flora; +package com.dfsek.terra.api.world; import com.dfsek.terra.api.math.Range; import com.dfsek.terra.api.vector.Location; diff --git a/common/implementation/src/main/java/com/dfsek/terra/api/math/Range.java b/common/implementation/src/main/java/com/dfsek/terra/api/math/range/ConstantRange.java similarity index 76% rename from common/implementation/src/main/java/com/dfsek/terra/api/math/Range.java rename to common/implementation/src/main/java/com/dfsek/terra/api/math/range/ConstantRange.java index ce8ae477d..bfae45827 100644 --- a/common/implementation/src/main/java/com/dfsek/terra/api/math/Range.java +++ b/common/implementation/src/main/java/com/dfsek/terra/api/math/range/ConstantRange.java @@ -1,75 +1,88 @@ -package com.dfsek.terra.api.math; +package com.dfsek.terra.api.math.range; +import com.dfsek.terra.api.util.Range; import net.jafama.FastMath; import org.jetbrains.annotations.NotNull; import java.util.Iterator; import java.util.Random; -public class Range implements Iterable { +public class ConstantRange implements Range { private int min; private int max; - public Range(int min, int max) { + public ConstantRange(int min, int max) { if(min > max) throw new IllegalArgumentException("Minimum must not be grater than maximum!"); this.max = max; this.min = min; } + @Override public boolean isInRange(int test) { return test >= min && test < max; } + @Override public int getMax() { return max; } + @Override public Range setMax(int max) { this.max = max; return this; } + @Override public int getMin() { return min; } + @Override public Range setMin(int min) { this.min = min; return this; } + @Override public int getRange() { return max - min; } + @Override public Range multiply(int mult) { min *= mult; max *= mult; return this; } + @Override public Range reflect(int pt) { - return new Range(2 * pt - this.getMax(), 2 * pt - this.getMin()); + return new ConstantRange(2 * pt - this.getMax(), 2 * pt - this.getMin()); } + @Override public int get(Random r) { return r.nextInt((max - min) + 1) + min; } - public Range intersects(com.dfsek.terra.api.math.Range other) { + @Override + public Range intersects(Range other) { try { - return new Range(FastMath.max(this.getMin(), other.getMin()), FastMath.min(this.getMax(), other.getMax())); + return new ConstantRange(FastMath.max(this.getMin(), other.getMin()), FastMath.min(this.getMax(), other.getMax())); } catch(IllegalArgumentException e) { return null; } } + @Override public Range add(int add) { this.min += add; this.max += add; return this; } + @Override public Range sub(int sub) { this.min -= sub; this.max -= sub; @@ -88,8 +101,8 @@ public class Range implements Iterable { @Override public boolean equals(Object obj) { - if(!(obj instanceof com.dfsek.terra.api.math.Range)) return false; - Range other = (com.dfsek.terra.api.math.Range) obj; + if(!(obj instanceof ConstantRange)) return false; + Range other = (Range) obj; return other.getMin() == this.getMin() && other.getMax() == this.getMax(); } diff --git a/common/implementation/src/main/java/com/dfsek/terra/api/structures/script/StructureScript.java b/common/implementation/src/main/java/com/dfsek/terra/api/structures/script/StructureScript.java index 7c1381097..b1a376d1a 100644 --- a/common/implementation/src/main/java/com/dfsek/terra/api/structures/script/StructureScript.java +++ b/common/implementation/src/main/java/com/dfsek/terra/api/structures/script/StructureScript.java @@ -28,11 +28,11 @@ import com.dfsek.terra.api.structures.script.builders.UnaryBooleanFunctionBuilde import com.dfsek.terra.api.structures.script.builders.UnaryNumberFunctionBuilder; import com.dfsek.terra.api.structures.script.builders.UnaryStringFunctionBuilder; import com.dfsek.terra.api.structures.script.builders.ZeroArgFunctionBuilder; -import com.dfsek.terra.api.structures.structure.Rotation; -import com.dfsek.terra.api.structures.structure.buffer.Buffer; +import com.dfsek.terra.api.structure.rotation.Rotation; +import com.dfsek.terra.api.structure.buffer.Buffer; import com.dfsek.terra.api.structures.structure.buffer.DirectBuffer; import com.dfsek.terra.api.structures.structure.buffer.StructureBuffer; -import com.dfsek.terra.profiler.ProfileFrame; +import com.dfsek.terra.api.profiler.ProfileFrame; import com.google.common.cache.Cache; import com.google.common.cache.CacheBuilder; import net.jafama.FastMath; diff --git a/common/implementation/src/main/java/com/dfsek/terra/api/structures/script/TerraImplementationArguments.java b/common/implementation/src/main/java/com/dfsek/terra/api/structures/script/TerraImplementationArguments.java index 6d80871ea..c81f73224 100644 --- a/common/implementation/src/main/java/com/dfsek/terra/api/structures/script/TerraImplementationArguments.java +++ b/common/implementation/src/main/java/com/dfsek/terra/api/structures/script/TerraImplementationArguments.java @@ -1,8 +1,8 @@ package com.dfsek.terra.api.structures.script; import com.dfsek.terra.api.structures.parser.lang.ImplementationArguments; -import com.dfsek.terra.api.structures.structure.Rotation; -import com.dfsek.terra.api.structures.structure.buffer.Buffer; +import com.dfsek.terra.api.structure.rotation.Rotation; +import com.dfsek.terra.api.structure.buffer.Buffer; import java.util.Random; diff --git a/common/implementation/src/main/java/com/dfsek/terra/api/structures/script/functions/AbstractBlockFunction.java b/common/implementation/src/main/java/com/dfsek/terra/api/structures/script/functions/AbstractBlockFunction.java index dbb6d8806..292be05f2 100644 --- a/common/implementation/src/main/java/com/dfsek/terra/api/structures/script/functions/AbstractBlockFunction.java +++ b/common/implementation/src/main/java/com/dfsek/terra/api/structures/script/functions/AbstractBlockFunction.java @@ -10,7 +10,7 @@ import com.dfsek.terra.api.structures.parser.lang.Returnable; import com.dfsek.terra.api.structures.parser.lang.functions.Function; import com.dfsek.terra.api.structures.parser.lang.variables.Variable; import com.dfsek.terra.api.structures.script.TerraImplementationArguments; -import com.dfsek.terra.api.structures.structure.RotationUtil; +import com.dfsek.terra.api.structure.rotation.RotationUtil; import com.dfsek.terra.api.structures.structure.buffer.items.BufferedBlock; import com.dfsek.terra.api.structures.tokenizer.Position; import net.jafama.FastMath; diff --git a/common/implementation/src/main/java/com/dfsek/terra/api/structures/script/functions/BiomeFunction.java b/common/implementation/src/main/java/com/dfsek/terra/api/structures/script/functions/BiomeFunction.java index ba459a624..707bd651a 100644 --- a/common/implementation/src/main/java/com/dfsek/terra/api/structures/script/functions/BiomeFunction.java +++ b/common/implementation/src/main/java/com/dfsek/terra/api/structures/script/functions/BiomeFunction.java @@ -9,7 +9,7 @@ import com.dfsek.terra.api.structures.parser.lang.Returnable; import com.dfsek.terra.api.structures.parser.lang.functions.Function; import com.dfsek.terra.api.structures.parser.lang.variables.Variable; import com.dfsek.terra.api.structures.script.TerraImplementationArguments; -import com.dfsek.terra.api.structures.structure.RotationUtil; +import com.dfsek.terra.api.structure.rotation.RotationUtil; import com.dfsek.terra.api.structures.tokenizer.Position; import com.dfsek.terra.api.world.biome.UserDefinedBiome; import com.dfsek.terra.api.world.biome.generation.BiomeProvider; diff --git a/common/implementation/src/main/java/com/dfsek/terra/api/structures/script/functions/CheckBlockFunction.java b/common/implementation/src/main/java/com/dfsek/terra/api/structures/script/functions/CheckBlockFunction.java index eb73a66e3..985544608 100644 --- a/common/implementation/src/main/java/com/dfsek/terra/api/structures/script/functions/CheckBlockFunction.java +++ b/common/implementation/src/main/java/com/dfsek/terra/api/structures/script/functions/CheckBlockFunction.java @@ -8,7 +8,7 @@ import com.dfsek.terra.api.structures.parser.lang.Returnable; import com.dfsek.terra.api.structures.parser.lang.functions.Function; import com.dfsek.terra.api.structures.parser.lang.variables.Variable; import com.dfsek.terra.api.structures.script.TerraImplementationArguments; -import com.dfsek.terra.api.structures.structure.RotationUtil; +import com.dfsek.terra.api.structure.rotation.RotationUtil; import com.dfsek.terra.api.structures.tokenizer.Position; import net.jafama.FastMath; diff --git a/common/implementation/src/main/java/com/dfsek/terra/api/structures/script/functions/CheckFunction.java b/common/implementation/src/main/java/com/dfsek/terra/api/structures/script/functions/CheckFunction.java index 94d873fdf..5612571a8 100644 --- a/common/implementation/src/main/java/com/dfsek/terra/api/structures/script/functions/CheckFunction.java +++ b/common/implementation/src/main/java/com/dfsek/terra/api/structures/script/functions/CheckFunction.java @@ -11,7 +11,7 @@ import com.dfsek.terra.api.structures.parser.lang.Returnable; import com.dfsek.terra.api.structures.parser.lang.functions.Function; import com.dfsek.terra.api.structures.parser.lang.variables.Variable; import com.dfsek.terra.api.structures.script.TerraImplementationArguments; -import com.dfsek.terra.api.structures.structure.RotationUtil; +import com.dfsek.terra.api.structure.rotation.RotationUtil; import com.dfsek.terra.api.structures.tokenizer.Position; import com.dfsek.terra.api.world.biome.UserDefinedBiome; import com.dfsek.terra.api.world.biome.generation.BiomeProvider; diff --git a/common/implementation/src/main/java/com/dfsek/terra/api/structures/script/functions/EntityFunction.java b/common/implementation/src/main/java/com/dfsek/terra/api/structures/script/functions/EntityFunction.java index 4708a45e6..6cc1ac539 100644 --- a/common/implementation/src/main/java/com/dfsek/terra/api/structures/script/functions/EntityFunction.java +++ b/common/implementation/src/main/java/com/dfsek/terra/api/structures/script/functions/EntityFunction.java @@ -12,7 +12,7 @@ import com.dfsek.terra.api.structures.parser.lang.constants.ConstantExpression; import com.dfsek.terra.api.structures.parser.lang.functions.Function; import com.dfsek.terra.api.structures.parser.lang.variables.Variable; import com.dfsek.terra.api.structures.script.TerraImplementationArguments; -import com.dfsek.terra.api.structures.structure.RotationUtil; +import com.dfsek.terra.api.structure.rotation.RotationUtil; import com.dfsek.terra.api.structures.structure.buffer.items.BufferedEntity; import com.dfsek.terra.api.structures.tokenizer.Position; diff --git a/common/implementation/src/main/java/com/dfsek/terra/api/structures/script/functions/GetMarkFunction.java b/common/implementation/src/main/java/com/dfsek/terra/api/structures/script/functions/GetMarkFunction.java index b033b486e..6abb28ebd 100644 --- a/common/implementation/src/main/java/com/dfsek/terra/api/structures/script/functions/GetMarkFunction.java +++ b/common/implementation/src/main/java/com/dfsek/terra/api/structures/script/functions/GetMarkFunction.java @@ -8,7 +8,7 @@ import com.dfsek.terra.api.structures.parser.lang.Returnable; import com.dfsek.terra.api.structures.parser.lang.functions.Function; import com.dfsek.terra.api.structures.parser.lang.variables.Variable; import com.dfsek.terra.api.structures.script.TerraImplementationArguments; -import com.dfsek.terra.api.structures.structure.RotationUtil; +import com.dfsek.terra.api.structure.rotation.RotationUtil; import com.dfsek.terra.api.structures.tokenizer.Position; import net.jafama.FastMath; diff --git a/common/implementation/src/main/java/com/dfsek/terra/api/structures/script/functions/LootFunction.java b/common/implementation/src/main/java/com/dfsek/terra/api/structures/script/functions/LootFunction.java index bf4a9968d..69108c41e 100644 --- a/common/implementation/src/main/java/com/dfsek/terra/api/structures/script/functions/LootFunction.java +++ b/common/implementation/src/main/java/com/dfsek/terra/api/structures/script/functions/LootFunction.java @@ -12,7 +12,7 @@ import com.dfsek.terra.api.structures.parser.lang.functions.Function; import com.dfsek.terra.api.structures.parser.lang.variables.Variable; import com.dfsek.terra.api.structures.script.StructureScript; import com.dfsek.terra.api.structures.script.TerraImplementationArguments; -import com.dfsek.terra.api.structures.structure.RotationUtil; +import com.dfsek.terra.api.structure.rotation.RotationUtil; import com.dfsek.terra.api.structures.structure.buffer.items.BufferedLootApplication; import com.dfsek.terra.api.structures.tokenizer.Position; import net.jafama.FastMath; diff --git a/common/implementation/src/main/java/com/dfsek/terra/api/structures/script/functions/PullFunction.java b/common/implementation/src/main/java/com/dfsek/terra/api/structures/script/functions/PullFunction.java index 528d4ebea..97320d1a1 100644 --- a/common/implementation/src/main/java/com/dfsek/terra/api/structures/script/functions/PullFunction.java +++ b/common/implementation/src/main/java/com/dfsek/terra/api/structures/script/functions/PullFunction.java @@ -12,7 +12,7 @@ import com.dfsek.terra.api.structures.parser.lang.constants.ConstantExpression; import com.dfsek.terra.api.structures.parser.lang.functions.Function; import com.dfsek.terra.api.structures.parser.lang.variables.Variable; import com.dfsek.terra.api.structures.script.TerraImplementationArguments; -import com.dfsek.terra.api.structures.structure.RotationUtil; +import com.dfsek.terra.api.structure.rotation.RotationUtil; import com.dfsek.terra.api.structures.structure.buffer.items.BufferedPulledBlock; import com.dfsek.terra.api.structures.tokenizer.Position; import net.jafama.FastMath; diff --git a/common/implementation/src/main/java/com/dfsek/terra/api/structures/script/functions/SetMarkFunction.java b/common/implementation/src/main/java/com/dfsek/terra/api/structures/script/functions/SetMarkFunction.java index e1e81034c..f37df8c08 100644 --- a/common/implementation/src/main/java/com/dfsek/terra/api/structures/script/functions/SetMarkFunction.java +++ b/common/implementation/src/main/java/com/dfsek/terra/api/structures/script/functions/SetMarkFunction.java @@ -8,7 +8,7 @@ import com.dfsek.terra.api.structures.parser.lang.Returnable; import com.dfsek.terra.api.structures.parser.lang.functions.Function; import com.dfsek.terra.api.structures.parser.lang.variables.Variable; import com.dfsek.terra.api.structures.script.TerraImplementationArguments; -import com.dfsek.terra.api.structures.structure.RotationUtil; +import com.dfsek.terra.api.structure.rotation.RotationUtil; import com.dfsek.terra.api.structures.tokenizer.Position; import net.jafama.FastMath; diff --git a/common/implementation/src/main/java/com/dfsek/terra/api/structures/script/functions/StateFunction.java b/common/implementation/src/main/java/com/dfsek/terra/api/structures/script/functions/StateFunction.java index d2792fe9c..d10129885 100644 --- a/common/implementation/src/main/java/com/dfsek/terra/api/structures/script/functions/StateFunction.java +++ b/common/implementation/src/main/java/com/dfsek/terra/api/structures/script/functions/StateFunction.java @@ -9,7 +9,7 @@ import com.dfsek.terra.api.structures.parser.lang.Returnable; import com.dfsek.terra.api.structures.parser.lang.functions.Function; import com.dfsek.terra.api.structures.parser.lang.variables.Variable; import com.dfsek.terra.api.structures.script.TerraImplementationArguments; -import com.dfsek.terra.api.structures.structure.RotationUtil; +import com.dfsek.terra.api.structure.rotation.RotationUtil; import com.dfsek.terra.api.structures.structure.buffer.items.BufferedStateManipulator; import com.dfsek.terra.api.structures.tokenizer.Position; import net.jafama.FastMath; diff --git a/common/implementation/src/main/java/com/dfsek/terra/api/structures/script/functions/StructureFunction.java b/common/implementation/src/main/java/com/dfsek/terra/api/structures/script/functions/StructureFunction.java index 63b64c399..0b40cc993 100644 --- a/common/implementation/src/main/java/com/dfsek/terra/api/structures/script/functions/StructureFunction.java +++ b/common/implementation/src/main/java/com/dfsek/terra/api/structures/script/functions/StructureFunction.java @@ -12,8 +12,8 @@ import com.dfsek.terra.api.structures.parser.lang.functions.Function; import com.dfsek.terra.api.structures.parser.lang.variables.Variable; import com.dfsek.terra.api.structures.script.StructureScript; import com.dfsek.terra.api.structures.script.TerraImplementationArguments; -import com.dfsek.terra.api.structures.structure.Rotation; -import com.dfsek.terra.api.structures.structure.RotationUtil; +import com.dfsek.terra.api.structure.rotation.Rotation; +import com.dfsek.terra.api.structure.rotation.RotationUtil; import com.dfsek.terra.api.structures.structure.buffer.IntermediateBuffer; import com.dfsek.terra.api.structures.tokenizer.Position; import net.jafama.FastMath; diff --git a/common/implementation/src/main/java/com/dfsek/terra/api/structures/structure/buffer/Cell.java b/common/implementation/src/main/java/com/dfsek/terra/api/structures/structure/buffer/Cell.java index 68205f5ba..de57b35b7 100644 --- a/common/implementation/src/main/java/com/dfsek/terra/api/structures/structure/buffer/Cell.java +++ b/common/implementation/src/main/java/com/dfsek/terra/api/structures/structure/buffer/Cell.java @@ -1,7 +1,7 @@ package com.dfsek.terra.api.structures.structure.buffer; import com.dfsek.terra.api.vector.Location; -import com.dfsek.terra.api.structures.structure.buffer.items.BufferedItem; +import com.dfsek.terra.api.structure.buffer.BufferedItem; import com.dfsek.terra.api.util.GlueList; import java.util.List; diff --git a/common/implementation/src/main/java/com/dfsek/terra/api/structures/structure/buffer/DirectBuffer.java b/common/implementation/src/main/java/com/dfsek/terra/api/structures/structure/buffer/DirectBuffer.java index 94f65b889..4d1d18cc9 100644 --- a/common/implementation/src/main/java/com/dfsek/terra/api/structures/structure/buffer/DirectBuffer.java +++ b/common/implementation/src/main/java/com/dfsek/terra/api/structures/structure/buffer/DirectBuffer.java @@ -1,7 +1,8 @@ package com.dfsek.terra.api.structures.structure.buffer; +import com.dfsek.terra.api.structure.buffer.Buffer; import com.dfsek.terra.api.vector.Location; -import com.dfsek.terra.api.structures.structure.buffer.items.BufferedItem; +import com.dfsek.terra.api.structure.buffer.BufferedItem; import java.util.LinkedHashMap; import java.util.Map; diff --git a/common/implementation/src/main/java/com/dfsek/terra/api/structures/structure/buffer/IntermediateBuffer.java b/common/implementation/src/main/java/com/dfsek/terra/api/structures/structure/buffer/IntermediateBuffer.java index 439d91585..7f990062b 100644 --- a/common/implementation/src/main/java/com/dfsek/terra/api/structures/structure/buffer/IntermediateBuffer.java +++ b/common/implementation/src/main/java/com/dfsek/terra/api/structures/structure/buffer/IntermediateBuffer.java @@ -1,8 +1,9 @@ package com.dfsek.terra.api.structures.structure.buffer; +import com.dfsek.terra.api.structure.buffer.Buffer; import com.dfsek.terra.api.vector.Location; import com.dfsek.terra.api.vector.Vector3; -import com.dfsek.terra.api.structures.structure.buffer.items.BufferedItem; +import com.dfsek.terra.api.structure.buffer.BufferedItem; public class IntermediateBuffer implements Buffer { private final Buffer original; diff --git a/common/implementation/src/main/java/com/dfsek/terra/api/structures/structure/buffer/StructureBuffer.java b/common/implementation/src/main/java/com/dfsek/terra/api/structures/structure/buffer/StructureBuffer.java index ff2d3f9a1..45daa63d1 100644 --- a/common/implementation/src/main/java/com/dfsek/terra/api/structures/structure/buffer/StructureBuffer.java +++ b/common/implementation/src/main/java/com/dfsek/terra/api/structures/structure/buffer/StructureBuffer.java @@ -1,8 +1,9 @@ package com.dfsek.terra.api.structures.structure.buffer; +import com.dfsek.terra.api.structure.buffer.Buffer; import com.dfsek.terra.api.vector.Location; import com.dfsek.terra.api.world.Chunk; -import com.dfsek.terra.api.structures.structure.buffer.items.BufferedItem; +import com.dfsek.terra.api.structure.buffer.BufferedItem; import net.jafama.FastMath; import java.util.LinkedHashMap; diff --git a/common/implementation/src/main/java/com/dfsek/terra/api/structures/structure/buffer/items/BufferedBlock.java b/common/implementation/src/main/java/com/dfsek/terra/api/structures/structure/buffer/items/BufferedBlock.java index b547eca97..dbd5eda25 100644 --- a/common/implementation/src/main/java/com/dfsek/terra/api/structures/structure/buffer/items/BufferedBlock.java +++ b/common/implementation/src/main/java/com/dfsek/terra/api/structures/structure/buffer/items/BufferedBlock.java @@ -1,6 +1,7 @@ package com.dfsek.terra.api.structures.structure.buffer.items; import com.dfsek.terra.api.TerraPlugin; +import com.dfsek.terra.api.structure.buffer.BufferedItem; import com.dfsek.terra.api.vector.Location; import com.dfsek.terra.api.block.Block; import com.dfsek.terra.api.block.BlockData; diff --git a/common/implementation/src/main/java/com/dfsek/terra/api/structures/structure/buffer/items/BufferedEntity.java b/common/implementation/src/main/java/com/dfsek/terra/api/structures/structure/buffer/items/BufferedEntity.java index 22735a5bb..f47b8c6e0 100644 --- a/common/implementation/src/main/java/com/dfsek/terra/api/structures/structure/buffer/items/BufferedEntity.java +++ b/common/implementation/src/main/java/com/dfsek/terra/api/structures/structure/buffer/items/BufferedEntity.java @@ -2,6 +2,7 @@ package com.dfsek.terra.api.structures.structure.buffer.items; import com.dfsek.terra.api.TerraPlugin; import com.dfsek.terra.api.event.events.world.generation.EntitySpawnEvent; +import com.dfsek.terra.api.structure.buffer.BufferedItem; import com.dfsek.terra.api.vector.Location; import com.dfsek.terra.api.entity.Entity; import com.dfsek.terra.api.entity.EntityType; diff --git a/common/implementation/src/main/java/com/dfsek/terra/api/structures/structure/buffer/items/BufferedLootApplication.java b/common/implementation/src/main/java/com/dfsek/terra/api/structures/structure/buffer/items/BufferedLootApplication.java index e1ab11b32..25676451b 100644 --- a/common/implementation/src/main/java/com/dfsek/terra/api/structures/structure/buffer/items/BufferedLootApplication.java +++ b/common/implementation/src/main/java/com/dfsek/terra/api/structures/structure/buffer/items/BufferedLootApplication.java @@ -2,6 +2,7 @@ package com.dfsek.terra.api.structures.structure.buffer.items; import com.dfsek.terra.api.TerraPlugin; import com.dfsek.terra.api.event.events.world.generation.LootPopulateEvent; +import com.dfsek.terra.api.structure.buffer.BufferedItem; import com.dfsek.terra.api.vector.Location; import com.dfsek.terra.api.block.Block; import com.dfsek.terra.api.block.state.BlockState; diff --git a/common/implementation/src/main/java/com/dfsek/terra/api/structures/structure/buffer/items/BufferedPulledBlock.java b/common/implementation/src/main/java/com/dfsek/terra/api/structures/structure/buffer/items/BufferedPulledBlock.java index 9df3b44fb..a6437cca5 100644 --- a/common/implementation/src/main/java/com/dfsek/terra/api/structures/structure/buffer/items/BufferedPulledBlock.java +++ b/common/implementation/src/main/java/com/dfsek/terra/api/structures/structure/buffer/items/BufferedPulledBlock.java @@ -1,5 +1,6 @@ package com.dfsek.terra.api.structures.structure.buffer.items; +import com.dfsek.terra.api.structure.buffer.BufferedItem; import com.dfsek.terra.api.vector.Location; import com.dfsek.terra.api.block.Block; import com.dfsek.terra.api.block.BlockData; diff --git a/common/implementation/src/main/java/com/dfsek/terra/api/structures/structure/buffer/items/BufferedStateManipulator.java b/common/implementation/src/main/java/com/dfsek/terra/api/structures/structure/buffer/items/BufferedStateManipulator.java index ab81b3225..e9cb56151 100644 --- a/common/implementation/src/main/java/com/dfsek/terra/api/structures/structure/buffer/items/BufferedStateManipulator.java +++ b/common/implementation/src/main/java/com/dfsek/terra/api/structures/structure/buffer/items/BufferedStateManipulator.java @@ -1,6 +1,7 @@ package com.dfsek.terra.api.structures.structure.buffer.items; import com.dfsek.terra.api.TerraPlugin; +import com.dfsek.terra.api.structure.buffer.BufferedItem; import com.dfsek.terra.api.vector.Location; import com.dfsek.terra.api.block.state.BlockState; diff --git a/common/implementation/src/main/java/com/dfsek/terra/api/world/locate/AsyncStructureFinder.java b/common/implementation/src/main/java/com/dfsek/terra/api/world/locate/AsyncStructureFinder.java index 8bb5cabe5..14558e0f3 100644 --- a/common/implementation/src/main/java/com/dfsek/terra/api/world/locate/AsyncStructureFinder.java +++ b/common/implementation/src/main/java/com/dfsek/terra/api/world/locate/AsyncStructureFinder.java @@ -4,7 +4,7 @@ import com.dfsek.terra.api.TerraPlugin; import com.dfsek.terra.api.util.MathUtil; import com.dfsek.terra.api.vector.Location; import com.dfsek.terra.api.vector.Vector3; -import com.dfsek.terra.api.structures.structure.Rotation; +import com.dfsek.terra.api.structure.rotation.Rotation; import com.dfsek.terra.api.util.FastRandom; import com.dfsek.terra.api.world.biome.UserDefinedBiome; import com.dfsek.terra.api.world.biome.generation.BiomeProvider; diff --git a/common/implementation/src/main/java/com/dfsek/terra/carving/UserDefinedCarver.java b/common/implementation/src/main/java/com/dfsek/terra/carving/UserDefinedCarver.java index 5610fa151..2022d7f93 100644 --- a/common/implementation/src/main/java/com/dfsek/terra/carving/UserDefinedCarver.java +++ b/common/implementation/src/main/java/com/dfsek/terra/carving/UserDefinedCarver.java @@ -5,10 +5,11 @@ import com.dfsek.paralithic.eval.parser.Parser; import com.dfsek.paralithic.eval.parser.Scope; import com.dfsek.paralithic.eval.tokenizer.ParseException; import com.dfsek.terra.api.TerraPlugin; -import com.dfsek.terra.api.math.Range; +import com.dfsek.terra.api.math.range.ConstantRange; import com.dfsek.terra.api.math.paralithic.defined.UserDefinedFunction; import com.dfsek.terra.api.math.paralithic.noise.NoiseFunction2; import com.dfsek.terra.api.math.paralithic.noise.NoiseFunction3; +import com.dfsek.terra.api.util.Range; import com.dfsek.terra.api.vector.Vector3; import com.dfsek.terra.vector.Vector3Impl; import com.dfsek.terra.api.world.World; @@ -43,7 +44,7 @@ public class UserDefinedCarver extends Carver { private final Map cacheMap = new ConcurrentHashMap<>(); private final TerraPlugin main; private double step = 2; - private Range recalc = new Range(8, 10); + private Range recalc = new ConstantRange(8, 10); private double recalcMagnitude = 3; public UserDefinedCarver(Range height, Range length, double[] start, double[] mutate, List radii, Scope parent, long hash, int topCut, int bottomCut, CarverTemplate config, TerraPlugin main, Map functions, Map definedFunctions) throws ParseException { diff --git a/common/implementation/src/main/java/com/dfsek/terra/commands/structure/SpawnCommand.java b/common/implementation/src/main/java/com/dfsek/terra/commands/structure/SpawnCommand.java index 73e9351b9..f77bde4a4 100644 --- a/common/implementation/src/main/java/com/dfsek/terra/commands/structure/SpawnCommand.java +++ b/common/implementation/src/main/java/com/dfsek/terra/commands/structure/SpawnCommand.java @@ -13,7 +13,7 @@ import com.dfsek.terra.api.entity.Player; import com.dfsek.terra.api.structures.parser.lang.constants.NumericConstant; import com.dfsek.terra.api.structures.script.TerraImplementationArguments; import com.dfsek.terra.api.structures.script.functions.CheckFunction; -import com.dfsek.terra.api.structures.structure.Rotation; +import com.dfsek.terra.api.structure.rotation.Rotation; import com.dfsek.terra.api.structures.structure.buffer.StructureBuffer; import com.dfsek.terra.api.structures.tokenizer.Position; import com.dfsek.terra.api.util.FastRandom; diff --git a/common/implementation/src/main/java/com/dfsek/terra/commands/structure/StructureLoadCommand.java b/common/implementation/src/main/java/com/dfsek/terra/commands/structure/StructureLoadCommand.java index 0ff923ab3..42d51a138 100644 --- a/common/implementation/src/main/java/com/dfsek/terra/commands/structure/StructureLoadCommand.java +++ b/common/implementation/src/main/java/com/dfsek/terra/commands/structure/StructureLoadCommand.java @@ -15,7 +15,7 @@ import com.dfsek.terra.api.injection.annotations.Inject; import com.dfsek.terra.api.entity.CommandSender; import com.dfsek.terra.api.entity.Player; import com.dfsek.terra.api.structures.script.StructureScript; -import com.dfsek.terra.api.structures.structure.Rotation; +import com.dfsek.terra.api.structure.rotation.Rotation; import com.dfsek.terra.api.util.FastRandom; import com.dfsek.terra.commands.structure.argument.ScriptArgumentParser; import com.dfsek.terra.commands.structure.completer.RotationCompleter; diff --git a/common/implementation/src/main/java/com/dfsek/terra/config/GenericLoaders.java b/common/implementation/src/main/java/com/dfsek/terra/config/GenericLoaders.java index d6f891731..083ad7c7a 100644 --- a/common/implementation/src/main/java/com/dfsek/terra/config/GenericLoaders.java +++ b/common/implementation/src/main/java/com/dfsek/terra/config/GenericLoaders.java @@ -5,7 +5,7 @@ import com.dfsek.terra.api.LoaderRegistrar; import com.dfsek.terra.api.TerraPlugin; import com.dfsek.terra.api.addon.TerraAddon; import com.dfsek.terra.api.math.GridSpawn; -import com.dfsek.terra.api.math.Range; +import com.dfsek.terra.api.math.range.ConstantRange; import com.dfsek.terra.api.noise.samplers.ImageSampler; import com.dfsek.terra.api.noise.samplers.noise.CellularSampler; import com.dfsek.terra.api.block.BlockType; @@ -70,7 +70,7 @@ public class GenericLoaders implements LoaderRegistrar { @Override public void register(TypeRegistry registry) { registry.registerLoader(ProbabilityCollectionImpl.class, new ProbabilityCollectionLoader()) - .registerLoader(Range.class, new RangeLoader()) + .registerLoader(ConstantRange.class, new RangeLoader()) .registerLoader(GridSpawn.class, new GridSpawnLoader()) .registerLoader(PaletteHolder.class, new PaletteHolderLoader()) .registerLoader(PaletteLayerHolder.class, new PaletteLayerLoader()) diff --git a/common/implementation/src/main/java/com/dfsek/terra/config/factories/FloraFactory.java b/common/implementation/src/main/java/com/dfsek/terra/config/factories/FloraFactory.java index 0fcb02d78..52537c1d7 100644 --- a/common/implementation/src/main/java/com/dfsek/terra/config/factories/FloraFactory.java +++ b/common/implementation/src/main/java/com/dfsek/terra/config/factories/FloraFactory.java @@ -2,7 +2,7 @@ package com.dfsek.terra.config.factories; import com.dfsek.terra.api.TerraPlugin; import com.dfsek.terra.api.noise.samplers.noise.random.WhiteNoiseSampler; -import com.dfsek.terra.api.world.flora.Flora; +import com.dfsek.terra.api.world.Flora; import com.dfsek.terra.api.world.palette.NoisePalette; import com.dfsek.terra.api.world.palette.Palette; import com.dfsek.terra.api.world.palette.holder.PaletteLayerHolder; diff --git a/common/implementation/src/main/java/com/dfsek/terra/config/loaders/RangeLoader.java b/common/implementation/src/main/java/com/dfsek/terra/config/loaders/RangeLoader.java index 7b0913ba7..7c0f2633b 100644 --- a/common/implementation/src/main/java/com/dfsek/terra/config/loaders/RangeLoader.java +++ b/common/implementation/src/main/java/com/dfsek/terra/config/loaders/RangeLoader.java @@ -3,7 +3,8 @@ package com.dfsek.terra.config.loaders; import com.dfsek.tectonic.exception.LoadException; import com.dfsek.tectonic.loading.ConfigLoader; import com.dfsek.tectonic.loading.TypeLoader; -import com.dfsek.terra.api.math.Range; +import com.dfsek.terra.api.math.range.ConstantRange; +import com.dfsek.terra.api.util.Range; import java.lang.reflect.Type; import java.util.Map; @@ -13,6 +14,6 @@ public class RangeLoader implements TypeLoader { @Override public Range load(Type type, Object o, ConfigLoader configLoader) throws LoadException { Map map = (Map) o; - return new Range(map.get("min"), map.get("max")); + return new ConstantRange(map.get("min"), map.get("max")); } } diff --git a/common/implementation/src/main/java/com/dfsek/terra/config/loaders/Types.java b/common/implementation/src/main/java/com/dfsek/terra/config/loaders/Types.java index ba1c05778..d5571376a 100644 --- a/common/implementation/src/main/java/com/dfsek/terra/config/loaders/Types.java +++ b/common/implementation/src/main/java/com/dfsek/terra/config/loaders/Types.java @@ -4,7 +4,7 @@ import com.dfsek.terra.api.block.BlockData; import com.dfsek.terra.api.world.Tree; import com.dfsek.terra.api.util.collections.ProbabilityCollectionImpl; import com.dfsek.terra.api.world.biome.TerraBiome; -import com.dfsek.terra.api.world.flora.Flora; +import com.dfsek.terra.api.world.Flora; import java.lang.reflect.Type; import java.util.Map; diff --git a/common/implementation/src/main/java/com/dfsek/terra/config/loaders/config/FloraLayerLoader.java b/common/implementation/src/main/java/com/dfsek/terra/config/loaders/config/FloraLayerLoader.java index 837d2cd75..cbf967dd3 100644 --- a/common/implementation/src/main/java/com/dfsek/terra/config/loaders/config/FloraLayerLoader.java +++ b/common/implementation/src/main/java/com/dfsek/terra/config/loaders/config/FloraLayerLoader.java @@ -4,11 +4,11 @@ import com.dfsek.tectonic.exception.ConfigException; import com.dfsek.tectonic.exception.LoadException; import com.dfsek.tectonic.loading.ConfigLoader; import com.dfsek.tectonic.loading.TypeLoader; -import com.dfsek.terra.api.math.Range; +import com.dfsek.terra.api.math.range.ConstantRange; import com.dfsek.terra.api.noise.samplers.noise.random.WhiteNoiseSampler; import com.dfsek.terra.api.util.collections.ProbabilityCollectionImpl; import com.dfsek.terra.api.util.seeded.NoiseSeeded; -import com.dfsek.terra.api.world.flora.Flora; +import com.dfsek.terra.api.world.Flora; import com.dfsek.terra.config.loaders.Types; import com.dfsek.terra.world.population.items.flora.FloraLayer; @@ -21,7 +21,7 @@ public class FloraLayerLoader implements TypeLoader { public FloraLayer load(Type type, Object o, ConfigLoader configLoader) throws LoadException { Map map = (Map) o; double density = ((Number) map.get("density")).doubleValue(); - Range range = configLoader.loadClass(Range.class, map.get("y")); + ConstantRange range = configLoader.loadClass(ConstantRange.class, map.get("y")); if(range == null) throw new LoadException("Flora range unspecified"); ProbabilityCollectionImpl items = (ProbabilityCollectionImpl) configLoader.loadType(Types.FLORA_PROBABILITY_COLLECTION_TYPE, map.get("items")); diff --git a/common/implementation/src/main/java/com/dfsek/terra/config/loaders/config/OreConfigLoader.java b/common/implementation/src/main/java/com/dfsek/terra/config/loaders/config/OreConfigLoader.java index 548da2181..52167ced2 100644 --- a/common/implementation/src/main/java/com/dfsek/terra/config/loaders/config/OreConfigLoader.java +++ b/common/implementation/src/main/java/com/dfsek/terra/config/loaders/config/OreConfigLoader.java @@ -2,7 +2,8 @@ package com.dfsek.terra.config.loaders.config; import com.dfsek.tectonic.loading.ConfigLoader; import com.dfsek.tectonic.loading.TypeLoader; -import com.dfsek.terra.api.math.Range; +import com.dfsek.terra.api.math.range.ConstantRange; +import com.dfsek.terra.api.util.Range; import com.dfsek.terra.world.population.items.ores.OreConfig; import java.lang.reflect.Type; @@ -13,8 +14,8 @@ public class OreConfigLoader implements TypeLoader { @Override public OreConfig load(Type type, Object o, ConfigLoader configLoader) { Map map = (Map) o; - Range amount = new Range(map.get("min"), map.get("max")); - Range height = new Range(map.get("min-height"), map.get("max-height")); + Range amount = new ConstantRange(map.get("min"), map.get("max")); + Range height = new ConstantRange(map.get("min-height"), map.get("max-height")); return new OreConfig(amount, height); } } diff --git a/common/implementation/src/main/java/com/dfsek/terra/config/loaders/config/TreeLayerLoader.java b/common/implementation/src/main/java/com/dfsek/terra/config/loaders/config/TreeLayerLoader.java index 1ed99af7a..ab1ff5bdd 100644 --- a/common/implementation/src/main/java/com/dfsek/terra/config/loaders/config/TreeLayerLoader.java +++ b/common/implementation/src/main/java/com/dfsek/terra/config/loaders/config/TreeLayerLoader.java @@ -3,7 +3,7 @@ package com.dfsek.terra.config.loaders.config; import com.dfsek.tectonic.exception.LoadException; import com.dfsek.tectonic.loading.ConfigLoader; import com.dfsek.tectonic.loading.TypeLoader; -import com.dfsek.terra.api.math.Range; +import com.dfsek.terra.api.math.range.ConstantRange; import com.dfsek.terra.api.noise.samplers.noise.random.WhiteNoiseSampler; import com.dfsek.terra.api.world.Tree; import com.dfsek.terra.api.util.collections.ProbabilityCollectionImpl; @@ -20,7 +20,7 @@ public class TreeLayerLoader implements TypeLoader { public TreeLayer load(Type type, Object o, ConfigLoader configLoader) throws LoadException { Map map = (Map) o; double density = ((Number) map.get("density")).doubleValue(); - Range range = configLoader.loadClass(Range.class, map.get("y")); + ConstantRange range = configLoader.loadClass(ConstantRange.class, map.get("y")); if(range == null) throw new LoadException("Tree range unspecified"); ProbabilityCollectionImpl items = (ProbabilityCollectionImpl) configLoader.loadType(Types.TREE_PROBABILITY_COLLECTION_TYPE, map.get("items")); diff --git a/common/implementation/src/main/java/com/dfsek/terra/config/templates/CarverTemplate.java b/common/implementation/src/main/java/com/dfsek/terra/config/templates/CarverTemplate.java index 001adb36c..5e11d9a32 100644 --- a/common/implementation/src/main/java/com/dfsek/terra/config/templates/CarverTemplate.java +++ b/common/implementation/src/main/java/com/dfsek/terra/config/templates/CarverTemplate.java @@ -3,8 +3,9 @@ package com.dfsek.terra.config.templates; import com.dfsek.tectonic.annotations.Abstractable; import com.dfsek.tectonic.annotations.Default; import com.dfsek.tectonic.annotations.Value; -import com.dfsek.terra.api.math.Range; +import com.dfsek.terra.api.math.range.ConstantRange; import com.dfsek.terra.api.block.BlockType; +import com.dfsek.terra.api.util.Range; import com.dfsek.terra.api.util.collections.MaterialSet; import com.dfsek.terra.carving.CarverPalette; @@ -29,7 +30,7 @@ public class CarverTemplate extends AbstractableTemplate { @Value("recalculate-direction") @Abstractable @Default - private Range recalc = new Range(8, 10); + private Range recalc = new ConstantRange(8, 10); @Value("length") @Abstractable diff --git a/common/implementation/src/main/java/com/dfsek/terra/config/templates/OreTemplate.java b/common/implementation/src/main/java/com/dfsek/terra/config/templates/OreTemplate.java index de58654fc..234c83254 100644 --- a/common/implementation/src/main/java/com/dfsek/terra/config/templates/OreTemplate.java +++ b/common/implementation/src/main/java/com/dfsek/terra/config/templates/OreTemplate.java @@ -3,9 +3,9 @@ package com.dfsek.terra.config.templates; import com.dfsek.tectonic.annotations.Abstractable; import com.dfsek.tectonic.annotations.Default; import com.dfsek.tectonic.annotations.Value; -import com.dfsek.terra.api.math.Range; import com.dfsek.terra.api.block.BlockData; import com.dfsek.terra.api.block.BlockType; +import com.dfsek.terra.api.util.Range; import com.dfsek.terra.api.util.collections.MaterialSet; import com.dfsek.terra.world.population.items.ores.Ore; diff --git a/common/implementation/src/main/java/com/dfsek/terra/config/templates/StructureTemplate.java b/common/implementation/src/main/java/com/dfsek/terra/config/templates/StructureTemplate.java index 0537fcea3..e71ef4583 100644 --- a/common/implementation/src/main/java/com/dfsek/terra/config/templates/StructureTemplate.java +++ b/common/implementation/src/main/java/com/dfsek/terra/config/templates/StructureTemplate.java @@ -5,9 +5,9 @@ import com.dfsek.tectonic.annotations.Default; import com.dfsek.tectonic.annotations.Value; import com.dfsek.tectonic.config.ConfigTemplate; import com.dfsek.terra.api.math.GridSpawn; -import com.dfsek.terra.api.math.Range; import com.dfsek.terra.api.structures.script.StructureScript; import com.dfsek.terra.api.util.GlueList; +import com.dfsek.terra.api.util.Range; import com.dfsek.terra.api.util.collections.ProbabilityCollectionImpl; import java.util.List; diff --git a/common/implementation/src/main/java/com/dfsek/terra/profiler/ProfilerImpl.java b/common/implementation/src/main/java/com/dfsek/terra/profiler/ProfilerImpl.java index f91deecd1..981dfc763 100644 --- a/common/implementation/src/main/java/com/dfsek/terra/profiler/ProfilerImpl.java +++ b/common/implementation/src/main/java/com/dfsek/terra/profiler/ProfilerImpl.java @@ -1,5 +1,7 @@ package com.dfsek.terra.profiler; +import com.dfsek.terra.api.profiler.Profiler; +import com.dfsek.terra.api.profiler.Timings; import com.dfsek.terra.api.util.mutable.MutableInteger; import com.dfsek.terra.profiler.exception.MalformedStackException; diff --git a/common/implementation/src/main/java/com/dfsek/terra/registry/config/ConfigTypeRegistry.java b/common/implementation/src/main/java/com/dfsek/terra/registry/config/ConfigTypeRegistry.java index 2148949f3..a2e53ff84 100644 --- a/common/implementation/src/main/java/com/dfsek/terra/registry/config/ConfigTypeRegistry.java +++ b/common/implementation/src/main/java/com/dfsek/terra/registry/config/ConfigTypeRegistry.java @@ -4,7 +4,7 @@ import com.dfsek.tectonic.config.ConfigTemplate; import com.dfsek.tectonic.exception.LoadException; import com.dfsek.terra.api.TerraPlugin; import com.dfsek.terra.api.world.Tree; -import com.dfsek.terra.api.world.flora.Flora; +import com.dfsek.terra.api.world.Flora; import com.dfsek.terra.api.world.palette.Palette; import com.dfsek.terra.carving.UserDefinedCarver; import com.dfsek.terra.config.builder.BiomeBuilder; diff --git a/common/implementation/src/main/java/com/dfsek/terra/registry/config/FloraRegistry.java b/common/implementation/src/main/java/com/dfsek/terra/registry/config/FloraRegistry.java index 5ae64fabd..e9f162971 100644 --- a/common/implementation/src/main/java/com/dfsek/terra/registry/config/FloraRegistry.java +++ b/common/implementation/src/main/java/com/dfsek/terra/registry/config/FloraRegistry.java @@ -3,7 +3,7 @@ package com.dfsek.terra.registry.config; import com.dfsek.terra.api.TerraPlugin; import com.dfsek.terra.api.block.BlockData; import com.dfsek.terra.api.util.collections.MaterialSet; -import com.dfsek.terra.api.world.flora.Flora; +import com.dfsek.terra.api.world.Flora; import com.dfsek.terra.registry.OpenRegistry; import com.dfsek.terra.world.population.items.flora.ConstantFlora; diff --git a/common/implementation/src/main/java/com/dfsek/terra/world/carving/NoiseCarver.java b/common/implementation/src/main/java/com/dfsek/terra/world/carving/NoiseCarver.java index e3ee142fa..657b2ff13 100644 --- a/common/implementation/src/main/java/com/dfsek/terra/world/carving/NoiseCarver.java +++ b/common/implementation/src/main/java/com/dfsek/terra/world/carving/NoiseCarver.java @@ -1,8 +1,8 @@ package com.dfsek.terra.world.carving; import com.dfsek.terra.api.TerraPlugin; -import com.dfsek.terra.api.math.Range; import com.dfsek.terra.api.block.BlockData; +import com.dfsek.terra.api.util.Range; import com.dfsek.terra.api.world.ChunkAccess; import com.dfsek.terra.api.world.World; import com.dfsek.terra.world.Carver; diff --git a/common/implementation/src/main/java/com/dfsek/terra/world/generation/generators/DefaultChunkGenerator2D.java b/common/implementation/src/main/java/com/dfsek/terra/world/generation/generators/DefaultChunkGenerator2D.java index d2e93ced2..ea1cd3ee7 100644 --- a/common/implementation/src/main/java/com/dfsek/terra/world/generation/generators/DefaultChunkGenerator2D.java +++ b/common/implementation/src/main/java/com/dfsek/terra/world/generation/generators/DefaultChunkGenerator2D.java @@ -1,7 +1,7 @@ package com.dfsek.terra.world.generation.generators; import com.dfsek.terra.api.TerraPlugin; -import com.dfsek.terra.api.math.Range; +import com.dfsek.terra.api.math.range.ConstantRange; import com.dfsek.terra.api.block.BlockData; import com.dfsek.terra.api.world.BiomeGrid; import com.dfsek.terra.api.world.World; @@ -15,7 +15,7 @@ import com.dfsek.terra.api.world.generation.TerraChunkGenerator; import com.dfsek.terra.api.world.palette.Palette; import com.dfsek.terra.config.pack.ConfigPack; import com.dfsek.terra.config.templates.BiomeTemplate; -import com.dfsek.terra.profiler.ProfileFrame; +import com.dfsek.terra.api.profiler.ProfileFrame; import com.dfsek.terra.world.Carver; import com.dfsek.terra.world.TerraWorld; import com.dfsek.terra.world.carving.NoiseCarver; @@ -50,7 +50,7 @@ public class DefaultChunkGenerator2D implements TerraChunkGenerator { blockPopulators.add(new OrePopulator(main)); blockPopulators.add(new TreePopulator(main)); blockPopulators.add(new TreePopulator(main)); - carver = new NoiseCarver(new Range(0, 255), main.getWorldHandle().createBlockData("minecraft:air"), main); + carver = new NoiseCarver(new ConstantRange(0, 255), main.getWorldHandle().createBlockData("minecraft:air"), main); this.cache = cache; } diff --git a/common/implementation/src/main/java/com/dfsek/terra/world/generation/generators/DefaultChunkGenerator3D.java b/common/implementation/src/main/java/com/dfsek/terra/world/generation/generators/DefaultChunkGenerator3D.java index 6902852b9..f77582606 100644 --- a/common/implementation/src/main/java/com/dfsek/terra/world/generation/generators/DefaultChunkGenerator3D.java +++ b/common/implementation/src/main/java/com/dfsek/terra/world/generation/generators/DefaultChunkGenerator3D.java @@ -1,7 +1,7 @@ package com.dfsek.terra.world.generation.generators; import com.dfsek.terra.api.TerraPlugin; -import com.dfsek.terra.api.math.Range; +import com.dfsek.terra.api.math.range.ConstantRange; import com.dfsek.terra.api.vector.Vector3; import com.dfsek.terra.vector.Vector3Impl; import com.dfsek.terra.api.block.BlockData; @@ -24,7 +24,7 @@ import com.dfsek.terra.api.world.palette.Palette; import com.dfsek.terra.api.world.palette.SinglePalette; import com.dfsek.terra.config.pack.ConfigPack; import com.dfsek.terra.config.templates.BiomeTemplate; -import com.dfsek.terra.profiler.ProfileFrame; +import com.dfsek.terra.api.profiler.ProfileFrame; import com.dfsek.terra.world.Carver; import com.dfsek.terra.world.TerraWorld; import com.dfsek.terra.world.carving.NoiseCarver; @@ -61,7 +61,7 @@ public class DefaultChunkGenerator3D implements TerraChunkGenerator { blockPopulators.add(new TreePopulator(main)); blockPopulators.add(new FloraPopulator(main)); - carver = new NoiseCarver(new Range(0, 255), main.getWorldHandle().createBlockData("minecraft:air"), main); + carver = new NoiseCarver(new ConstantRange(0, 255), main.getWorldHandle().createBlockData("minecraft:air"), main); water = main.getWorldHandle().createBlockData("minecraft:water").getBlockType(); blank = new SinglePalette(main.getWorldHandle().createBlockData("minecraft:air")); } diff --git a/common/implementation/src/main/java/com/dfsek/terra/world/population/CavePopulator.java b/common/implementation/src/main/java/com/dfsek/terra/world/population/CavePopulator.java index f68c37b8f..69ac8375e 100644 --- a/common/implementation/src/main/java/com/dfsek/terra/world/population/CavePopulator.java +++ b/common/implementation/src/main/java/com/dfsek/terra/world/population/CavePopulator.java @@ -14,7 +14,7 @@ import com.dfsek.terra.api.world.generation.TerraBlockPopulator; import com.dfsek.terra.carving.UserDefinedCarver; import com.dfsek.terra.config.pack.WorldConfig; import com.dfsek.terra.config.templates.CarverTemplate; -import com.dfsek.terra.profiler.ProfileFrame; +import com.dfsek.terra.api.profiler.ProfileFrame; import com.dfsek.terra.world.TerraWorld; import org.jetbrains.annotations.NotNull; diff --git a/common/implementation/src/main/java/com/dfsek/terra/world/population/FloraPopulator.java b/common/implementation/src/main/java/com/dfsek/terra/world/population/FloraPopulator.java index 976c82247..2550ec8d2 100644 --- a/common/implementation/src/main/java/com/dfsek/terra/world/population/FloraPopulator.java +++ b/common/implementation/src/main/java/com/dfsek/terra/world/population/FloraPopulator.java @@ -9,7 +9,7 @@ import com.dfsek.terra.api.util.world.PopulationUtil; import com.dfsek.terra.api.world.biome.UserDefinedBiome; import com.dfsek.terra.api.world.biome.generation.BiomeProvider; import com.dfsek.terra.api.world.generation.TerraBlockPopulator; -import com.dfsek.terra.profiler.ProfileFrame; +import com.dfsek.terra.api.profiler.ProfileFrame; import com.dfsek.terra.world.TerraWorld; import com.dfsek.terra.world.population.items.flora.FloraLayer; import org.jetbrains.annotations.NotNull; diff --git a/common/implementation/src/main/java/com/dfsek/terra/world/population/OrePopulator.java b/common/implementation/src/main/java/com/dfsek/terra/world/population/OrePopulator.java index 69cb3fc37..c37ff2a2c 100644 --- a/common/implementation/src/main/java/com/dfsek/terra/world/population/OrePopulator.java +++ b/common/implementation/src/main/java/com/dfsek/terra/world/population/OrePopulator.java @@ -10,7 +10,7 @@ import com.dfsek.terra.api.world.biome.TerraBiome; import com.dfsek.terra.api.world.biome.UserDefinedBiome; import com.dfsek.terra.api.world.generation.TerraBlockPopulator; import com.dfsek.terra.config.templates.BiomeTemplate; -import com.dfsek.terra.profiler.ProfileFrame; +import com.dfsek.terra.api.profiler.ProfileFrame; import com.dfsek.terra.world.TerraWorld; import org.jetbrains.annotations.NotNull; diff --git a/common/implementation/src/main/java/com/dfsek/terra/world/population/StructurePopulator.java b/common/implementation/src/main/java/com/dfsek/terra/world/population/StructurePopulator.java index ea8b42361..887146c64 100644 --- a/common/implementation/src/main/java/com/dfsek/terra/world/population/StructurePopulator.java +++ b/common/implementation/src/main/java/com/dfsek/terra/world/population/StructurePopulator.java @@ -5,14 +5,14 @@ import com.dfsek.terra.api.util.MathUtil; import com.dfsek.terra.api.vector.Location; import com.dfsek.terra.api.world.Chunk; import com.dfsek.terra.api.world.World; -import com.dfsek.terra.api.structures.structure.Rotation; +import com.dfsek.terra.api.structure.rotation.Rotation; import com.dfsek.terra.api.util.FastRandom; import com.dfsek.terra.api.world.biome.UserDefinedBiome; import com.dfsek.terra.api.world.biome.generation.BiomeProvider; import com.dfsek.terra.api.world.generation.Chunkified; import com.dfsek.terra.api.world.generation.TerraBlockPopulator; import com.dfsek.terra.config.pack.WorldConfig; -import com.dfsek.terra.profiler.ProfileFrame; +import com.dfsek.terra.api.profiler.ProfileFrame; import com.dfsek.terra.world.TerraWorld; import com.dfsek.terra.world.population.items.TerraStructure; import net.jafama.FastMath; diff --git a/common/implementation/src/main/java/com/dfsek/terra/world/population/TreePopulator.java b/common/implementation/src/main/java/com/dfsek/terra/world/population/TreePopulator.java index 8437809d0..618a02f37 100644 --- a/common/implementation/src/main/java/com/dfsek/terra/world/population/TreePopulator.java +++ b/common/implementation/src/main/java/com/dfsek/terra/world/population/TreePopulator.java @@ -8,7 +8,7 @@ import com.dfsek.terra.api.util.world.PopulationUtil; import com.dfsek.terra.api.world.biome.UserDefinedBiome; import com.dfsek.terra.api.world.biome.generation.BiomeProvider; import com.dfsek.terra.api.world.generation.TerraBlockPopulator; -import com.dfsek.terra.profiler.ProfileFrame; +import com.dfsek.terra.api.profiler.ProfileFrame; import com.dfsek.terra.world.TerraWorld; import com.dfsek.terra.world.population.items.tree.TreeLayer; import net.jafama.FastMath; diff --git a/common/implementation/src/main/java/com/dfsek/terra/world/population/items/PlaceableLayer.java b/common/implementation/src/main/java/com/dfsek/terra/world/population/items/PlaceableLayer.java index 164c01e17..ca3287a57 100644 --- a/common/implementation/src/main/java/com/dfsek/terra/world/population/items/PlaceableLayer.java +++ b/common/implementation/src/main/java/com/dfsek/terra/world/population/items/PlaceableLayer.java @@ -1,18 +1,19 @@ package com.dfsek.terra.world.population.items; -import com.dfsek.terra.api.math.Range; +import com.dfsek.terra.api.math.range.ConstantRange; import com.dfsek.terra.api.noise.NoiseSampler; +import com.dfsek.terra.api.util.Range; import com.dfsek.terra.api.vector.Vector2; import com.dfsek.terra.api.world.Chunk; import com.dfsek.terra.api.util.collections.ProbabilityCollectionImpl; public abstract class PlaceableLayer { protected final double density; - protected final Range level; + protected final ConstantRange level; protected final ProbabilityCollectionImpl layer; protected final NoiseSampler noise; - public PlaceableLayer(double density, Range level, ProbabilityCollectionImpl layer, NoiseSampler noise) { + public PlaceableLayer(double density, ConstantRange level, ProbabilityCollectionImpl layer, NoiseSampler noise) { this.density = density; this.level = level; this.layer = layer; diff --git a/common/implementation/src/main/java/com/dfsek/terra/world/population/items/TerraStructure.java b/common/implementation/src/main/java/com/dfsek/terra/world/population/items/TerraStructure.java index 56980f163..eb6b87f3d 100644 --- a/common/implementation/src/main/java/com/dfsek/terra/world/population/items/TerraStructure.java +++ b/common/implementation/src/main/java/com/dfsek/terra/world/population/items/TerraStructure.java @@ -1,8 +1,8 @@ package com.dfsek.terra.world.population.items; import com.dfsek.terra.api.math.GridSpawn; -import com.dfsek.terra.api.math.Range; import com.dfsek.terra.api.structures.script.StructureScript; +import com.dfsek.terra.api.util.Range; import com.dfsek.terra.api.util.collections.ProbabilityCollectionImpl; import com.dfsek.terra.config.templates.StructureTemplate; diff --git a/common/implementation/src/main/java/com/dfsek/terra/world/population/items/flora/BlockFlora.java b/common/implementation/src/main/java/com/dfsek/terra/world/population/items/flora/BlockFlora.java index 48ad7ab5a..05b4ee9e2 100644 --- a/common/implementation/src/main/java/com/dfsek/terra/world/population/items/flora/BlockFlora.java +++ b/common/implementation/src/main/java/com/dfsek/terra/world/population/items/flora/BlockFlora.java @@ -1,13 +1,13 @@ package com.dfsek.terra.world.population.items.flora; -import com.dfsek.terra.api.math.Range; +import com.dfsek.terra.api.util.Range; import com.dfsek.terra.api.vector.Location; import com.dfsek.terra.api.block.Block; import com.dfsek.terra.api.block.BlockData; import com.dfsek.terra.api.block.BlockFace; import com.dfsek.terra.api.world.Chunk; import com.dfsek.terra.api.util.GlueList; -import com.dfsek.terra.api.world.flora.Flora; +import com.dfsek.terra.api.world.Flora; import java.util.List; diff --git a/common/implementation/src/main/java/com/dfsek/terra/world/population/items/flora/ConstantFlora.java b/common/implementation/src/main/java/com/dfsek/terra/world/population/items/flora/ConstantFlora.java index 771b3588b..b1bee9cda 100644 --- a/common/implementation/src/main/java/com/dfsek/terra/world/population/items/flora/ConstantFlora.java +++ b/common/implementation/src/main/java/com/dfsek/terra/world/population/items/flora/ConstantFlora.java @@ -1,6 +1,6 @@ package com.dfsek.terra.world.population.items.flora; -import com.dfsek.terra.api.math.Range; +import com.dfsek.terra.api.util.Range; import com.dfsek.terra.api.vector.Location; import com.dfsek.terra.api.block.Block; import com.dfsek.terra.api.block.BlockData; @@ -8,7 +8,7 @@ import com.dfsek.terra.api.block.BlockFace; import com.dfsek.terra.api.world.Chunk; import com.dfsek.terra.api.util.GlueList; import com.dfsek.terra.api.util.collections.MaterialSet; -import com.dfsek.terra.api.world.flora.Flora; +import com.dfsek.terra.api.world.Flora; import java.util.List; diff --git a/common/implementation/src/main/java/com/dfsek/terra/world/population/items/flora/FloraLayer.java b/common/implementation/src/main/java/com/dfsek/terra/world/population/items/flora/FloraLayer.java index 8d042f238..ba4db2cfa 100644 --- a/common/implementation/src/main/java/com/dfsek/terra/world/population/items/flora/FloraLayer.java +++ b/common/implementation/src/main/java/com/dfsek/terra/world/population/items/flora/FloraLayer.java @@ -1,16 +1,16 @@ package com.dfsek.terra.world.population.items.flora; -import com.dfsek.terra.api.math.Range; +import com.dfsek.terra.api.math.range.ConstantRange; import com.dfsek.terra.api.noise.NoiseSampler; import com.dfsek.terra.api.vector.Vector2; import com.dfsek.terra.api.world.Chunk; import com.dfsek.terra.api.util.collections.ProbabilityCollectionImpl; -import com.dfsek.terra.api.world.flora.Flora; +import com.dfsek.terra.api.world.Flora; import com.dfsek.terra.world.population.items.PlaceableLayer; public class FloraLayer extends PlaceableLayer { - public FloraLayer(double density, Range level, ProbabilityCollectionImpl layer, NoiseSampler noise) { + public FloraLayer(double density, ConstantRange level, ProbabilityCollectionImpl layer, NoiseSampler noise) { super(density, level, layer, noise); } diff --git a/common/implementation/src/main/java/com/dfsek/terra/world/population/items/flora/TerraFlora.java b/common/implementation/src/main/java/com/dfsek/terra/world/population/items/flora/TerraFlora.java index 0c4fe265e..8dd36a055 100644 --- a/common/implementation/src/main/java/com/dfsek/terra/world/population/items/flora/TerraFlora.java +++ b/common/implementation/src/main/java/com/dfsek/terra/world/population/items/flora/TerraFlora.java @@ -1,7 +1,7 @@ package com.dfsek.terra.world.population.items.flora; import com.dfsek.terra.api.TerraPlugin; -import com.dfsek.terra.api.math.Range; +import com.dfsek.terra.api.util.Range; import com.dfsek.terra.api.vector.Location; import com.dfsek.terra.api.block.Block; import com.dfsek.terra.api.block.BlockData; @@ -14,7 +14,7 @@ import com.dfsek.terra.api.world.Chunk; import com.dfsek.terra.api.util.FastRandom; import com.dfsek.terra.api.util.GlueList; import com.dfsek.terra.api.util.collections.MaterialSet; -import com.dfsek.terra.api.world.flora.Flora; +import com.dfsek.terra.api.world.Flora; import com.dfsek.terra.api.world.palette.Palette; import net.jafama.FastMath; diff --git a/common/implementation/src/main/java/com/dfsek/terra/world/population/items/ores/DeformedSphereOre.java b/common/implementation/src/main/java/com/dfsek/terra/world/population/items/ores/DeformedSphereOre.java index aa5466c0f..c34da3b4e 100644 --- a/common/implementation/src/main/java/com/dfsek/terra/world/population/items/ores/DeformedSphereOre.java +++ b/common/implementation/src/main/java/com/dfsek/terra/world/population/items/ores/DeformedSphereOre.java @@ -1,8 +1,8 @@ package com.dfsek.terra.world.population.items.ores; import com.dfsek.terra.api.TerraPlugin; -import com.dfsek.terra.api.math.Range; import com.dfsek.terra.api.noise.samplers.noise.simplex.OpenSimplex2Sampler; +import com.dfsek.terra.api.util.Range; import com.dfsek.terra.api.vector.Vector3; import com.dfsek.terra.vector.Vector3Impl; import com.dfsek.terra.api.block.Block; diff --git a/common/implementation/src/main/java/com/dfsek/terra/world/population/items/ores/OreConfig.java b/common/implementation/src/main/java/com/dfsek/terra/world/population/items/ores/OreConfig.java index 67048c34d..8b9286dd6 100644 --- a/common/implementation/src/main/java/com/dfsek/terra/world/population/items/ores/OreConfig.java +++ b/common/implementation/src/main/java/com/dfsek/terra/world/population/items/ores/OreConfig.java @@ -1,6 +1,6 @@ package com.dfsek.terra.world.population.items.ores; -import com.dfsek.terra.api.math.Range; +import com.dfsek.terra.api.util.Range; public class OreConfig { private final Range amount; diff --git a/common/implementation/src/main/java/com/dfsek/terra/world/population/items/ores/VanillaOre.java b/common/implementation/src/main/java/com/dfsek/terra/world/population/items/ores/VanillaOre.java index 699590b63..f0422b2f6 100644 --- a/common/implementation/src/main/java/com/dfsek/terra/world/population/items/ores/VanillaOre.java +++ b/common/implementation/src/main/java/com/dfsek/terra/world/population/items/ores/VanillaOre.java @@ -1,7 +1,7 @@ package com.dfsek.terra.world.population.items.ores; import com.dfsek.terra.api.TerraPlugin; -import com.dfsek.terra.api.math.Range; +import com.dfsek.terra.api.util.Range; import com.dfsek.terra.vector.Vector3Impl; import com.dfsek.terra.api.block.Block; import com.dfsek.terra.api.block.BlockData; diff --git a/common/implementation/src/main/java/com/dfsek/terra/world/population/items/tree/TerraTree.java b/common/implementation/src/main/java/com/dfsek/terra/world/population/items/tree/TerraTree.java index 083c4f670..5a6f1e9bc 100644 --- a/common/implementation/src/main/java/com/dfsek/terra/world/population/items/tree/TerraTree.java +++ b/common/implementation/src/main/java/com/dfsek/terra/world/population/items/tree/TerraTree.java @@ -3,7 +3,7 @@ package com.dfsek.terra.world.population.items.tree; import com.dfsek.terra.api.vector.Location; import com.dfsek.terra.api.world.Tree; import com.dfsek.terra.api.structures.script.StructureScript; -import com.dfsek.terra.api.structures.structure.Rotation; +import com.dfsek.terra.api.structure.rotation.Rotation; import com.dfsek.terra.api.util.collections.MaterialSet; import com.dfsek.terra.api.util.collections.ProbabilityCollectionImpl; diff --git a/common/implementation/src/main/java/com/dfsek/terra/world/population/items/tree/TreeLayer.java b/common/implementation/src/main/java/com/dfsek/terra/world/population/items/tree/TreeLayer.java index da19f47ec..853d301a9 100644 --- a/common/implementation/src/main/java/com/dfsek/terra/world/population/items/tree/TreeLayer.java +++ b/common/implementation/src/main/java/com/dfsek/terra/world/population/items/tree/TreeLayer.java @@ -1,6 +1,6 @@ package com.dfsek.terra.world.population.items.tree; -import com.dfsek.terra.api.math.Range; +import com.dfsek.terra.api.math.range.ConstantRange; import com.dfsek.terra.api.noise.NoiseSampler; import com.dfsek.terra.api.vector.Vector2; import com.dfsek.terra.api.block.Block; @@ -13,7 +13,7 @@ import com.dfsek.terra.world.population.items.PlaceableLayer; public class TreeLayer extends PlaceableLayer { - public TreeLayer(double density, Range level, ProbabilityCollectionImpl layer, NoiseSampler noise) { + public TreeLayer(double density, ConstantRange level, ProbabilityCollectionImpl layer, NoiseSampler noise) { super(density, level, layer, noise); } diff --git a/common/implementation/src/test/java/profiler/ProfilerTest.java b/common/implementation/src/test/java/profiler/ProfilerTest.java index b4d97856d..e8853a1e8 100644 --- a/common/implementation/src/test/java/profiler/ProfilerTest.java +++ b/common/implementation/src/test/java/profiler/ProfilerTest.java @@ -1,6 +1,6 @@ package profiler; -import com.dfsek.terra.profiler.Profiler; +import com.dfsek.terra.api.profiler.Profiler; import com.dfsek.terra.profiler.ProfilerImpl; public class ProfilerTest { diff --git a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/TerraBukkitPlugin.java b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/TerraBukkitPlugin.java index 47d3fe4ef..dcda5c306 100644 --- a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/TerraBukkitPlugin.java +++ b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/TerraBukkitPlugin.java @@ -41,7 +41,7 @@ import com.dfsek.terra.config.PluginConfig; import com.dfsek.terra.config.lang.LangUtil; import com.dfsek.terra.config.lang.Language; import com.dfsek.terra.config.pack.ConfigPack; -import com.dfsek.terra.profiler.Profiler; +import com.dfsek.terra.api.profiler.Profiler; import com.dfsek.terra.profiler.ProfilerImpl; import com.dfsek.terra.registry.master.AddonRegistry; import com.dfsek.terra.registry.master.ConfigRegistry; diff --git a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/population/PopulationManager.java b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/population/PopulationManager.java index 233ed8e9e..7f75a374e 100644 --- a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/population/PopulationManager.java +++ b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/population/PopulationManager.java @@ -8,7 +8,7 @@ import com.dfsek.terra.api.world.generation.Chunkified; import com.dfsek.terra.api.world.generation.TerraChunkGenerator; import com.dfsek.terra.bukkit.TerraBukkitPlugin; import com.dfsek.terra.bukkit.world.BukkitAdapter; -import com.dfsek.terra.profiler.ProfileFrame; +import com.dfsek.terra.api.profiler.ProfileFrame; import com.dfsek.terra.bukkit.world.BukkitWorld; import org.bukkit.generator.BlockPopulator; import org.jetbrains.annotations.NotNull; diff --git a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/world/BukkitTree.java b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/world/BukkitTree.java index a32542ac3..eff1a7969 100644 --- a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/world/BukkitTree.java +++ b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/world/BukkitTree.java @@ -5,7 +5,7 @@ import com.dfsek.terra.api.vector.Location; import com.dfsek.terra.api.handle.WorldHandle; import com.dfsek.terra.api.world.Tree; import com.dfsek.terra.api.util.collections.MaterialSet; -import com.dfsek.terra.profiler.ProfileFrame; +import com.dfsek.terra.api.profiler.ProfileFrame; import org.bukkit.TreeType; import java.util.Locale; diff --git a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/TerraFabricPlugin.java b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/TerraFabricPlugin.java index 81af2b609..6e16df083 100644 --- a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/TerraFabricPlugin.java +++ b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/TerraFabricPlugin.java @@ -48,7 +48,7 @@ import com.dfsek.terra.fabric.handle.FabricItemHandle; import com.dfsek.terra.fabric.handle.FabricWorldHandle; import com.dfsek.terra.fabric.util.FabricUtil; import com.dfsek.terra.fabric.util.ProtoBiome; -import com.dfsek.terra.profiler.Profiler; +import com.dfsek.terra.api.profiler.Profiler; import com.dfsek.terra.profiler.ProfilerImpl; import com.dfsek.terra.api.registry.DuplicateEntryException; import com.dfsek.terra.registry.master.AddonRegistry; diff --git a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/mixin/implementations/ConfiguredFeatureMixin.java b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/mixin/implementations/ConfiguredFeatureMixin.java index 0934235e4..f8ea27372 100644 --- a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/mixin/implementations/ConfiguredFeatureMixin.java +++ b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/mixin/implementations/ConfiguredFeatureMixin.java @@ -4,7 +4,7 @@ import com.dfsek.terra.api.vector.Location; import com.dfsek.terra.api.world.Tree; import com.dfsek.terra.api.util.collections.MaterialSet; import com.dfsek.terra.fabric.TerraFabricPlugin; -import com.dfsek.terra.profiler.ProfileFrame; +import com.dfsek.terra.api.profiler.ProfileFrame; import net.minecraft.util.math.BlockPos; import net.minecraft.util.registry.BuiltinRegistries; import net.minecraft.world.StructureWorldAccess; diff --git a/platforms/region/src/main/java/com/dfsek/terra/StandalonePlugin.java b/platforms/region/src/main/java/com/dfsek/terra/StandalonePlugin.java index 917ca45fc..b61ea24a0 100644 --- a/platforms/region/src/main/java/com/dfsek/terra/StandalonePlugin.java +++ b/platforms/region/src/main/java/com/dfsek/terra/StandalonePlugin.java @@ -21,7 +21,7 @@ import com.dfsek.terra.config.lang.Language; import com.dfsek.terra.config.pack.ConfigPack; import com.dfsek.terra.platform.RawBiome; import com.dfsek.terra.platform.RawWorldHandle; -import com.dfsek.terra.profiler.Profiler; +import com.dfsek.terra.api.profiler.Profiler; import com.dfsek.terra.profiler.ProfilerImpl; import com.dfsek.terra.registry.master.AddonRegistry; import com.dfsek.terra.registry.master.ConfigRegistry; diff --git a/platforms/sponge/src/main/java/com/dfsek/terra/sponge/TerraSpongePlugin.java b/platforms/sponge/src/main/java/com/dfsek/terra/sponge/TerraSpongePlugin.java index 7d3adeeec..2fad02b1e 100644 --- a/platforms/sponge/src/main/java/com/dfsek/terra/sponge/TerraSpongePlugin.java +++ b/platforms/sponge/src/main/java/com/dfsek/terra/sponge/TerraSpongePlugin.java @@ -14,7 +14,7 @@ import com.dfsek.terra.api.util.logging.DebugLogger; import com.dfsek.terra.config.PluginConfig; import com.dfsek.terra.config.lang.Language; import com.dfsek.terra.config.pack.ConfigPack; -import com.dfsek.terra.profiler.Profiler; +import com.dfsek.terra.api.profiler.Profiler; import com.dfsek.terra.registry.master.AddonRegistry; import com.dfsek.terra.registry.master.ConfigRegistry; import com.dfsek.terra.sponge.world.SpongeWorldHandle;