From ee373bbe4b2ad0570e8cd3b4d2a9fbaf17ad20fa Mon Sep 17 00:00:00 2001 From: dfsek Date: Thu, 26 May 2022 19:40:41 -0700 Subject: [PATCH] reformat code --- .../pipeline/api/delegate/SelfDelegate.java | 2 +- .../config/BiomePipelineTemplate.java | 2 +- .../chunkgenerator/palette/SlantHolder.java | 8 +- .../distributors/PaddedGridDistributor.java | 6 +- .../normalizer/PosterizationNormalizer.java | 3 +- .../samplers/noise/GaborNoiseSampler.java | 1 + .../manifest/impl/ManifestAddonLoader.java | 5 +- .../addons/terrascript/parser/lang/Scope.java | 4 +- .../lang/operations/BinaryOperation.java | 4 +- .../lang/operations/BooleanAndOperation.java | 4 +- .../lang/operations/BooleanOrOperation.java | 4 +- .../operations/ConcatenationOperation.java | 4 +- .../lang/operations/DivisionOperation.java | 4 +- .../lang/operations/ModuloOperation.java | 4 +- .../operations/MultiplicationOperation.java | 4 +- .../operations/NumberAdditionOperation.java | 4 +- .../lang/operations/SubtractionOperation.java | 4 +- .../statements/EqualsStatement.java | 4 +- .../GreaterOrEqualsThanStatement.java | 4 +- .../statements/GreaterThanStatement.java | 4 +- .../statements/LessThanOrEqualsStatement.java | 4 +- .../statements/LessThanStatement.java | 4 +- .../statements/NotEqualsStatement.java | 10 +-- .../script/functions/EntityFunction.java | 2 +- .../script/functions/GetMarkFunction.java | 4 +- .../script/functions/SetMarkFunction.java | 4 +- .../script/functions/StateFunction.java | 4 +- .../script/functions/StructureFunction.java | 6 +- .../sampler/SamplerFunctionBuilder.java | 30 ++++---- .../api/structure/feature/BinaryColumn.java | 2 +- .../dfsek/terra/api/util/vector/Vector2.java | 30 ++++---- .../dfsek/terra/api/util/vector/Vector3.java | 76 +++++++++---------- .../terra/api/util/vector/Vector3Int.java | 2 +- .../dfsek/terra/api/world/BufferedWorld.java | 2 +- .../world/chunk/generation/util/Column.java | 8 +- .../com/dfsek/terra/AbstractPlatform.java | 30 ++++---- .../com/dfsek/terra/addon/InternalAddon.java | 2 +- .../MetaListLikePreprocessor.java | 2 +- .../preprocessor/MetaMapPreprocessor.java | 2 +- .../preprocessor/MetaValuePreprocessor.java | 2 +- .../dfsek/terra/profiler/ProfilerImpl.java | 10 +-- .../terra/registry/master/ConfigRegistry.java | 4 +- .../src/test/java/profiler/ProfilerTest.java | 6 +- .../src/test/java/registry/RegistryTest.java | 6 +- .../terra/addon/BootstrapAddonLoader.java | 3 +- .../dfsek/terra/bukkit/TerraBukkitPlugin.java | 2 +- .../terra/bukkit/world/BukkitAdapter.java | 3 +- .../dfsek/terra/bukkit/world/BukkitChunk.java | 4 +- .../terra/bukkit/world/BukkitProtoWorld.java | 5 +- .../dfsek/terra/fabric/FabricEntryPoint.java | 8 +- .../com/dfsek/terra/fabric/PlatformImpl.java | 7 +- .../com/dfsek/terra/fabric/data/Codecs.java | 1 - .../fabric/generation/TerraBiomeSource.java | 12 +-- .../entity/MobSpawnerBlockEntityMixin.java | 14 ++-- .../world/ChunkRegionMixin.java | 3 +- .../world/ServerWorldMixin.java | 9 +-- .../lifecycle/DataPackContentsMixin.java | 1 - .../fabric/mixin/lifecycle/RegistryMixin.java | 1 - .../client/MinecraftClientMixin.java | 10 +-- .../server/GeneratorOptionsMixin.java | 3 +- .../lifecycle/server/ServerMainMixin.java | 14 +--- .../dfsek/terra/fabric/util/FabricUtil.java | 24 +++--- .../terra/fabric/util/ProtoPlatformBiome.java | 1 - 63 files changed, 214 insertions(+), 242 deletions(-) diff --git a/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/api/delegate/SelfDelegate.java b/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/api/delegate/SelfDelegate.java index ad6a4a721..60b744059 100644 --- a/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/api/delegate/SelfDelegate.java +++ b/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/api/delegate/SelfDelegate.java @@ -10,7 +10,7 @@ final class SelfDelegate implements BiomeDelegate { public static final SelfDelegate INSTANCE = new SelfDelegate(); private SelfDelegate() { - + } @Override diff --git a/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/config/BiomePipelineTemplate.java b/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/config/BiomePipelineTemplate.java index 006376cec..e35d621e2 100644 --- a/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/config/BiomePipelineTemplate.java +++ b/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/config/BiomePipelineTemplate.java @@ -28,7 +28,7 @@ public class BiomePipelineTemplate extends BiomeProviderTemplate { @Description(""" The initial size of biome chunks. This value must be at least 2. This is not the final size of biome chunks. Final chunks will be much larger. - + It is recommended to keep biome chunks' final size in the range of [50, 300] to prevent performance issues. To calculate the size of biome chunks, simply take initial-size and for each expand stage, multiply the running value by 2 diff --git a/common/addons/chunk-generator-noise-3d/src/main/java/com/dfsek/terra/addons/chunkgenerator/palette/SlantHolder.java b/common/addons/chunk-generator-noise-3d/src/main/java/com/dfsek/terra/addons/chunkgenerator/palette/SlantHolder.java index 9be159bf9..6ceacee24 100644 --- a/common/addons/chunk-generator-noise-3d/src/main/java/com/dfsek/terra/addons/chunkgenerator/palette/SlantHolder.java +++ b/common/addons/chunk-generator-noise-3d/src/main/java/com/dfsek/terra/addons/chunkgenerator/palette/SlantHolder.java @@ -22,7 +22,7 @@ public class SlantHolder { } public static SlantHolder of(TreeMap layers, double minSlope) { - if(layers.size() == 1){ + if(layers.size() == 1) { Entry firstEntry = layers.firstEntry(); return new Single(firstEntry.getValue(), minSlope); } @@ -42,9 +42,9 @@ public class SlantHolder { } private static final class Single extends SlantHolder { - + private final PaletteHolder layers; - + public Single(PaletteHolder layers, double minSlope) { super(of(minSlope, layers), minSlope); this.layers = layers; @@ -55,7 +55,7 @@ public class SlantHolder { map.put(v, layer); return map; } - + @Override public PaletteHolder getPalette(double slope) { return layers; diff --git a/common/addons/config-distributors/src/main/java/com/dfsek/terra/addons/feature/distributor/distributors/PaddedGridDistributor.java b/common/addons/config-distributors/src/main/java/com/dfsek/terra/addons/feature/distributor/distributors/PaddedGridDistributor.java index 0197a79a9..bb380e034 100644 --- a/common/addons/config-distributors/src/main/java/com/dfsek/terra/addons/feature/distributor/distributors/PaddedGridDistributor.java +++ b/common/addons/config-distributors/src/main/java/com/dfsek/terra/addons/feature/distributor/distributors/PaddedGridDistributor.java @@ -34,12 +34,12 @@ public class PaddedGridDistributor implements Distributor { public boolean matches(int x, int z, long seed) { int cellX = FastMath.floorDiv(x, cellWidth); int cellZ = FastMath.floorDiv(z, cellWidth); - + Random random = new Random((murmur64(MathUtil.squash(cellX, cellZ)) ^ seed) + salt); - + int pointX = random.nextInt(width) + cellX * cellWidth; int pointZ = random.nextInt(width) + cellZ * cellWidth; - + return x == pointX && z == pointZ; } } diff --git a/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/normalizer/PosterizationNormalizer.java b/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/normalizer/PosterizationNormalizer.java index bd781dc81..bdf1c90d9 100644 --- a/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/normalizer/PosterizationNormalizer.java +++ b/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/normalizer/PosterizationNormalizer.java @@ -7,9 +7,10 @@ package com.dfsek.terra.addons.noise.normalizer; +import net.jafama.FastMath; + import com.dfsek.terra.api.noise.NoiseSampler; -import net.jafama.FastMath; public class PosterizationNormalizer extends Normalizer { private final double stepSize; diff --git a/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/samplers/noise/GaborNoiseSampler.java b/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/samplers/noise/GaborNoiseSampler.java index 94c936ff0..816b6f35e 100644 --- a/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/samplers/noise/GaborNoiseSampler.java +++ b/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/samplers/noise/GaborNoiseSampler.java @@ -22,6 +22,7 @@ public class GaborNoiseSampler extends NoiseFunction { private double impulseDensity = (impulsesPerKernel / (Math.PI * kernelRadius * kernelRadius)); private double impulsesPerCell = impulseDensity * kernelRadius * kernelRadius; private double g = FastMath.exp(-impulsesPerCell); + private double omega0 = Math.PI * 0.25; private boolean isotropic = true; diff --git a/common/addons/manifest-addon-loader/src/main/java/com/dfsek/terra/addons/manifest/impl/ManifestAddonLoader.java b/common/addons/manifest-addon-loader/src/main/java/com/dfsek/terra/addons/manifest/impl/ManifestAddonLoader.java index 60ad9451b..00a54a226 100644 --- a/common/addons/manifest-addon-loader/src/main/java/com/dfsek/terra/addons/manifest/impl/ManifestAddonLoader.java +++ b/common/addons/manifest-addon-loader/src/main/java/com/dfsek/terra/addons/manifest/impl/ManifestAddonLoader.java @@ -13,9 +13,6 @@ import ca.solostudios.strata.version.VersionRange; import com.dfsek.tectonic.api.exception.LoadException; import com.dfsek.tectonic.api.loader.ConfigLoader; import com.dfsek.tectonic.yaml.YamlConfiguration; - -import com.dfsek.terra.api.addon.bootstrap.BootstrapAddonClassLoader; - import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -23,7 +20,6 @@ import java.io.IOException; import java.io.UncheckedIOException; import java.lang.reflect.InvocationTargetException; import java.net.MalformedURLException; -import java.net.URL; import java.nio.file.FileVisitOption; import java.nio.file.Files; import java.nio.file.Path; @@ -41,6 +37,7 @@ import com.dfsek.terra.addons.manifest.impl.config.loaders.VersionRangeLoader; import com.dfsek.terra.addons.manifest.impl.exception.AddonException; import com.dfsek.terra.addons.manifest.impl.exception.ManifestException; import com.dfsek.terra.addons.manifest.impl.exception.ManifestNotPresentException; +import com.dfsek.terra.api.addon.bootstrap.BootstrapAddonClassLoader; import com.dfsek.terra.api.addon.bootstrap.BootstrapBaseAddon; diff --git a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/Scope.java b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/Scope.java index c496b0fcf..a511e2db4 100644 --- a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/Scope.java +++ b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/Scope.java @@ -12,7 +12,7 @@ public class Scope { public Variable get(String id) { throw new IllegalStateException("Cannot get variable from null scope: " + id); } - + @Override public void put(String id, Variable variable) { throw new IllegalStateException("Cannot set variable in null scope: " + id); @@ -38,7 +38,7 @@ public class Scope { public void put(String id, Variable variable) { variableMap.put(id, variable); } - + public Scope sub() { return new Scope(this); diff --git a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/operations/BinaryOperation.java b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/operations/BinaryOperation.java index 7091382ad..11a4d74e8 100644 --- a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/operations/BinaryOperation.java +++ b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/operations/BinaryOperation.java @@ -7,13 +7,13 @@ package com.dfsek.terra.addons.terrascript.parser.lang.operations; +import java.util.function.Supplier; + import com.dfsek.terra.addons.terrascript.parser.lang.ImplementationArguments; import com.dfsek.terra.addons.terrascript.parser.lang.Returnable; import com.dfsek.terra.addons.terrascript.parser.lang.Scope; import com.dfsek.terra.addons.terrascript.tokenizer.Position; -import java.util.function.Supplier; - public abstract class BinaryOperation implements Returnable { private final Returnable left; diff --git a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/operations/BooleanAndOperation.java b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/operations/BooleanAndOperation.java index 0082d3096..6018b21d0 100644 --- a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/operations/BooleanAndOperation.java +++ b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/operations/BooleanAndOperation.java @@ -7,11 +7,11 @@ package com.dfsek.terra.addons.terrascript.parser.lang.operations; +import java.util.function.Supplier; + import com.dfsek.terra.addons.terrascript.parser.lang.Returnable; import com.dfsek.terra.addons.terrascript.tokenizer.Position; -import java.util.function.Supplier; - public class BooleanAndOperation extends BinaryOperation { public BooleanAndOperation(Returnable left, Returnable right, Position start) { diff --git a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/operations/BooleanOrOperation.java b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/operations/BooleanOrOperation.java index d2259fbbf..90b11cf86 100644 --- a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/operations/BooleanOrOperation.java +++ b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/operations/BooleanOrOperation.java @@ -7,11 +7,11 @@ package com.dfsek.terra.addons.terrascript.parser.lang.operations; +import java.util.function.Supplier; + import com.dfsek.terra.addons.terrascript.parser.lang.Returnable; import com.dfsek.terra.addons.terrascript.tokenizer.Position; -import java.util.function.Supplier; - public class BooleanOrOperation extends BinaryOperation { public BooleanOrOperation(Returnable left, Returnable right, Position start) { diff --git a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/operations/ConcatenationOperation.java b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/operations/ConcatenationOperation.java index 8abccb5e7..79fd3d103 100644 --- a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/operations/ConcatenationOperation.java +++ b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/operations/ConcatenationOperation.java @@ -7,11 +7,11 @@ package com.dfsek.terra.addons.terrascript.parser.lang.operations; +import java.util.function.Supplier; + import com.dfsek.terra.addons.terrascript.parser.lang.Returnable; import com.dfsek.terra.addons.terrascript.tokenizer.Position; -import java.util.function.Supplier; - public class ConcatenationOperation extends BinaryOperation { public ConcatenationOperation(Returnable left, Returnable right, Position position) { diff --git a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/operations/DivisionOperation.java b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/operations/DivisionOperation.java index 6444cad9d..b6d76c451 100644 --- a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/operations/DivisionOperation.java +++ b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/operations/DivisionOperation.java @@ -7,11 +7,11 @@ package com.dfsek.terra.addons.terrascript.parser.lang.operations; +import java.util.function.Supplier; + import com.dfsek.terra.addons.terrascript.parser.lang.Returnable; import com.dfsek.terra.addons.terrascript.tokenizer.Position; -import java.util.function.Supplier; - public class DivisionOperation extends BinaryOperation { public DivisionOperation(Returnable left, Returnable right, Position position) { diff --git a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/operations/ModuloOperation.java b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/operations/ModuloOperation.java index da778d288..a22439b6d 100644 --- a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/operations/ModuloOperation.java +++ b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/operations/ModuloOperation.java @@ -7,11 +7,11 @@ package com.dfsek.terra.addons.terrascript.parser.lang.operations; +import java.util.function.Supplier; + import com.dfsek.terra.addons.terrascript.parser.lang.Returnable; import com.dfsek.terra.addons.terrascript.tokenizer.Position; -import java.util.function.Supplier; - public class ModuloOperation extends BinaryOperation { public ModuloOperation(Returnable left, Returnable right, Position start) { diff --git a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/operations/MultiplicationOperation.java b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/operations/MultiplicationOperation.java index 6e5ecbbce..232d8ee52 100644 --- a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/operations/MultiplicationOperation.java +++ b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/operations/MultiplicationOperation.java @@ -7,11 +7,11 @@ package com.dfsek.terra.addons.terrascript.parser.lang.operations; +import java.util.function.Supplier; + import com.dfsek.terra.addons.terrascript.parser.lang.Returnable; import com.dfsek.terra.addons.terrascript.tokenizer.Position; -import java.util.function.Supplier; - public class MultiplicationOperation extends BinaryOperation { public MultiplicationOperation(Returnable left, Returnable right, Position position) { diff --git a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/operations/NumberAdditionOperation.java b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/operations/NumberAdditionOperation.java index 68424a183..7baa56df3 100644 --- a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/operations/NumberAdditionOperation.java +++ b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/operations/NumberAdditionOperation.java @@ -7,11 +7,11 @@ package com.dfsek.terra.addons.terrascript.parser.lang.operations; +import java.util.function.Supplier; + import com.dfsek.terra.addons.terrascript.parser.lang.Returnable; import com.dfsek.terra.addons.terrascript.tokenizer.Position; -import java.util.function.Supplier; - public class NumberAdditionOperation extends BinaryOperation { public NumberAdditionOperation(Returnable left, Returnable right, Position position) { diff --git a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/operations/SubtractionOperation.java b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/operations/SubtractionOperation.java index 13c66b054..70e6709b7 100644 --- a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/operations/SubtractionOperation.java +++ b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/operations/SubtractionOperation.java @@ -7,11 +7,11 @@ package com.dfsek.terra.addons.terrascript.parser.lang.operations; +import java.util.function.Supplier; + import com.dfsek.terra.addons.terrascript.parser.lang.Returnable; import com.dfsek.terra.addons.terrascript.tokenizer.Position; -import java.util.function.Supplier; - public class SubtractionOperation extends BinaryOperation { public SubtractionOperation(Returnable left, Returnable right, Position position) { diff --git a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/operations/statements/EqualsStatement.java b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/operations/statements/EqualsStatement.java index cd55b5397..6552a8cc8 100644 --- a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/operations/statements/EqualsStatement.java +++ b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/operations/statements/EqualsStatement.java @@ -9,12 +9,12 @@ package com.dfsek.terra.addons.terrascript.parser.lang.operations.statements; import net.jafama.FastMath; +import java.util.function.Supplier; + import com.dfsek.terra.addons.terrascript.parser.lang.Returnable; import com.dfsek.terra.addons.terrascript.parser.lang.operations.BinaryOperation; import com.dfsek.terra.addons.terrascript.tokenizer.Position; -import java.util.function.Supplier; - import static com.dfsek.terra.api.util.MathUtil.EPSILON; diff --git a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/operations/statements/GreaterOrEqualsThanStatement.java b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/operations/statements/GreaterOrEqualsThanStatement.java index b6ed893ec..2c795b1c9 100644 --- a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/operations/statements/GreaterOrEqualsThanStatement.java +++ b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/operations/statements/GreaterOrEqualsThanStatement.java @@ -7,12 +7,12 @@ package com.dfsek.terra.addons.terrascript.parser.lang.operations.statements; +import java.util.function.Supplier; + import com.dfsek.terra.addons.terrascript.parser.lang.Returnable; import com.dfsek.terra.addons.terrascript.parser.lang.operations.BinaryOperation; import com.dfsek.terra.addons.terrascript.tokenizer.Position; -import java.util.function.Supplier; - public class GreaterOrEqualsThanStatement extends BinaryOperation { public GreaterOrEqualsThanStatement(Returnable left, Returnable right, Position position) { diff --git a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/operations/statements/GreaterThanStatement.java b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/operations/statements/GreaterThanStatement.java index 5cc77a9e5..a6c7d8e52 100644 --- a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/operations/statements/GreaterThanStatement.java +++ b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/operations/statements/GreaterThanStatement.java @@ -7,12 +7,12 @@ package com.dfsek.terra.addons.terrascript.parser.lang.operations.statements; +import java.util.function.Supplier; + import com.dfsek.terra.addons.terrascript.parser.lang.Returnable; import com.dfsek.terra.addons.terrascript.parser.lang.operations.BinaryOperation; import com.dfsek.terra.addons.terrascript.tokenizer.Position; -import java.util.function.Supplier; - public class GreaterThanStatement extends BinaryOperation { public GreaterThanStatement(Returnable left, Returnable right, Position position) { diff --git a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/operations/statements/LessThanOrEqualsStatement.java b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/operations/statements/LessThanOrEqualsStatement.java index 85f4c58d7..d798a6590 100644 --- a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/operations/statements/LessThanOrEqualsStatement.java +++ b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/operations/statements/LessThanOrEqualsStatement.java @@ -7,12 +7,12 @@ package com.dfsek.terra.addons.terrascript.parser.lang.operations.statements; +import java.util.function.Supplier; + import com.dfsek.terra.addons.terrascript.parser.lang.Returnable; import com.dfsek.terra.addons.terrascript.parser.lang.operations.BinaryOperation; import com.dfsek.terra.addons.terrascript.tokenizer.Position; -import java.util.function.Supplier; - public class LessThanOrEqualsStatement extends BinaryOperation { public LessThanOrEqualsStatement(Returnable left, Returnable right, Position position) { diff --git a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/operations/statements/LessThanStatement.java b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/operations/statements/LessThanStatement.java index 1d59d05c2..04bca475c 100644 --- a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/operations/statements/LessThanStatement.java +++ b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/operations/statements/LessThanStatement.java @@ -7,12 +7,12 @@ package com.dfsek.terra.addons.terrascript.parser.lang.operations.statements; +import java.util.function.Supplier; + import com.dfsek.terra.addons.terrascript.parser.lang.Returnable; import com.dfsek.terra.addons.terrascript.parser.lang.operations.BinaryOperation; import com.dfsek.terra.addons.terrascript.tokenizer.Position; -import java.util.function.Supplier; - public class LessThanStatement extends BinaryOperation { public LessThanStatement(Returnable left, Returnable right, Position position) { diff --git a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/operations/statements/NotEqualsStatement.java b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/operations/statements/NotEqualsStatement.java index cb4b8c27d..20fb34fe3 100644 --- a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/operations/statements/NotEqualsStatement.java +++ b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/operations/statements/NotEqualsStatement.java @@ -7,14 +7,14 @@ package com.dfsek.terra.addons.terrascript.parser.lang.operations.statements; -import com.dfsek.terra.addons.terrascript.parser.lang.Returnable; -import com.dfsek.terra.addons.terrascript.parser.lang.operations.BinaryOperation; -import com.dfsek.terra.addons.terrascript.tokenizer.Position; - import net.jafama.FastMath; import java.util.function.Supplier; +import com.dfsek.terra.addons.terrascript.parser.lang.Returnable; +import com.dfsek.terra.addons.terrascript.parser.lang.operations.BinaryOperation; +import com.dfsek.terra.addons.terrascript.tokenizer.Position; + import static com.dfsek.terra.api.util.MathUtil.EPSILON; @@ -30,7 +30,7 @@ public class NotEqualsStatement extends BinaryOperation { if(leftUnwrapped instanceof Number l && rightUnwrapped instanceof Number r) { return FastMath.abs(l.doubleValue() - r.doubleValue()) > EPSILON; } - + return !leftUnwrapped.equals(rightUnwrapped); } diff --git a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/functions/EntityFunction.java b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/functions/EntityFunction.java index 3d5007a00..9fd51ceac 100644 --- a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/functions/EntityFunction.java +++ b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/functions/EntityFunction.java @@ -47,7 +47,7 @@ public class EntityFunction implements Function { TerraImplementationArguments arguments = (TerraImplementationArguments) implementationArguments; Vector2 xz = RotationUtil.rotateVector(Vector2.of(x.apply(implementationArguments, scope).doubleValue(), z.apply(implementationArguments, scope).doubleValue()), arguments.getRotation()); - + Entity entity = arguments.getWorld().spawnEntity(Vector3.of(xz.getX(), y.apply(implementationArguments, scope).doubleValue(), xz.getZ()) .mutable() diff --git a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/functions/GetMarkFunction.java b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/functions/GetMarkFunction.java index 00e1f2ab7..09e735665 100644 --- a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/functions/GetMarkFunction.java +++ b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/functions/GetMarkFunction.java @@ -36,9 +36,9 @@ public class GetMarkFunction implements Function { TerraImplementationArguments arguments = (TerraImplementationArguments) implementationArguments; Vector2 xz = RotationUtil.rotateVector(Vector2.of(x.apply(implementationArguments, scope).doubleValue(), z.apply(implementationArguments, scope).doubleValue()), arguments.getRotation()); - + String mark = arguments.getMark(Vector3.of(FastMath.floorToInt(xz.getX()), FastMath.floorToInt( - y.apply(implementationArguments, scope).doubleValue()), + y.apply(implementationArguments, scope).doubleValue()), FastMath.floorToInt(xz.getZ())) .mutable() .add(arguments.getOrigin()) diff --git a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/functions/SetMarkFunction.java b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/functions/SetMarkFunction.java index 98e4a90d0..43a7436b9 100644 --- a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/functions/SetMarkFunction.java +++ b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/functions/SetMarkFunction.java @@ -38,8 +38,8 @@ public class SetMarkFunction implements Function { TerraImplementationArguments arguments = (TerraImplementationArguments) implementationArguments; Vector2 xz = RotationUtil.rotateVector(Vector2.of(x.apply(implementationArguments, scope).doubleValue(), z.apply(implementationArguments, scope).doubleValue()), arguments.getRotation()); - - + + arguments.setMark(Vector3.of(FastMath.floorToInt(xz.getX()), FastMath.floorToInt( y.apply(implementationArguments, scope).doubleValue()), diff --git a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/functions/StateFunction.java b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/functions/StateFunction.java index 9cd8ed577..6ccbe1a80 100644 --- a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/functions/StateFunction.java +++ b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/functions/StateFunction.java @@ -43,8 +43,8 @@ public class StateFunction implements Function { TerraImplementationArguments arguments = (TerraImplementationArguments) implementationArguments; Vector2 xz = RotationUtil.rotateVector(Vector2.of(x.apply(implementationArguments, scope).doubleValue(), z.apply(implementationArguments, scope).doubleValue()), arguments.getRotation()); - - + + Vector3 origin = Vector3.of(FastMath.roundToInt(xz.getX()), y.apply(implementationArguments, scope).intValue(), FastMath.roundToInt(xz.getZ())).mutable().add(arguments.getOrigin()).immutable(); try { diff --git a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/functions/StructureFunction.java b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/functions/StructureFunction.java index 3a02761ab..51fb47054 100644 --- a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/functions/StructureFunction.java +++ b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/functions/StructureFunction.java @@ -60,11 +60,11 @@ public class StructureFunction implements Function { if(arguments.getRecursions() > platform.getTerraConfig().getMaxRecursion()) throw new RuntimeException("Structure recursion too deep: " + arguments.getRecursions()); - + Vector2 xz = RotationUtil.rotateVector(Vector2.of(x.apply(implementationArguments, scope).doubleValue(), z.apply(implementationArguments, scope).doubleValue()), arguments.getRotation()); - - + + String app = id.apply(implementationArguments, scope); return registry.getByID(app).map(script -> { Rotation rotation1; diff --git a/common/addons/terrascript-function-sampler/src/main/java/com/dfsek/terra/addons/terrascript/sampler/SamplerFunctionBuilder.java b/common/addons/terrascript-function-sampler/src/main/java/com/dfsek/terra/addons/terrascript/sampler/SamplerFunctionBuilder.java index db2ddada7..98ac7fca3 100644 --- a/common/addons/terrascript-function-sampler/src/main/java/com/dfsek/terra/addons/terrascript/sampler/SamplerFunctionBuilder.java +++ b/common/addons/terrascript-function-sampler/src/main/java/com/dfsek/terra/addons/terrascript/sampler/SamplerFunctionBuilder.java @@ -4,8 +4,6 @@ import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.Objects; -import java.util.function.Function; -import java.util.function.Supplier; import com.dfsek.terra.addons.noise.config.DimensionApplicableNoiseSampler; import com.dfsek.terra.addons.terrascript.parser.lang.Returnable; @@ -14,7 +12,6 @@ import com.dfsek.terra.addons.terrascript.parser.lang.constants.NumericConstant; import com.dfsek.terra.addons.terrascript.parser.lang.constants.StringConstant; import com.dfsek.terra.addons.terrascript.parser.lang.functions.FunctionBuilder; import com.dfsek.terra.addons.terrascript.tokenizer.Position; -import com.dfsek.terra.api.noise.NoiseSampler; public class SamplerFunctionBuilder implements FunctionBuilder> { @@ -36,30 +33,36 @@ public class SamplerFunctionBuilder implements FunctionBuilder build(List> argumentList, Position position) { + public com.dfsek.terra.addons.terrascript.parser.lang.functions.Function build(List> argumentList, + Position position) { Returnable arg = (Returnable) argumentList.get(0); if(argumentList.size() == 3) { // 2D if(arg instanceof StringConstant constant) { - return new ConstantSamplerFunction(Objects.requireNonNull(samplers2d.get(constant.getConstant()), "No such 2D noise function " + constant.getConstant()).getSampler(), - (Returnable) argumentList.get(1), - new NumericConstant(0, position), - (Returnable) argumentList.get(2), - true, - position); + return new ConstantSamplerFunction(Objects.requireNonNull(samplers2d.get(constant.getConstant()), + "No such 2D noise function " + constant.getConstant()) + .getSampler(), + (Returnable) argumentList.get(1), + new NumericConstant(0, position), + (Returnable) argumentList.get(2), + true, + position); } else { return new SamplerFunction((Returnable) argumentList.get(0), (Returnable) argumentList.get(1), new NumericConstant(0, position), (Returnable) argumentList.get(2), - s -> Objects.requireNonNull(samplers2d.get(s.get()), "No such 2D noise function " + s.get()).getSampler(), + s -> Objects.requireNonNull(samplers2d.get(s.get()), "No such 2D noise function " + s.get()) + .getSampler(), true, position); } } else { // 3D if(arg instanceof StringConstant constant) { - return new ConstantSamplerFunction(Objects.requireNonNull(samplers3d.get(constant.getConstant()), "No such 2D noise function " + constant.getConstant()).getSampler(), + return new ConstantSamplerFunction(Objects.requireNonNull(samplers3d.get(constant.getConstant()), + "No such 2D noise function " + constant.getConstant()) + .getSampler(), (Returnable) argumentList.get(1), (Returnable) argumentList.get(2), (Returnable) argumentList.get(3), @@ -70,7 +73,8 @@ public class SamplerFunctionBuilder implements FunctionBuilder) argumentList.get(1), (Returnable) argumentList.get(2), (Returnable) argumentList.get(3), - s -> Objects.requireNonNull(samplers2d.get(s.get()), "No such 2D noise function " + s.get()).getSampler(), + s -> Objects.requireNonNull(samplers2d.get(s.get()), "No such 2D noise function " + s.get()) + .getSampler(), true, position); } diff --git a/common/api/src/main/java/com/dfsek/terra/api/structure/feature/BinaryColumn.java b/common/api/src/main/java/com/dfsek/terra/api/structure/feature/BinaryColumn.java index 1c2c578a3..bb985e83a 100644 --- a/common/api/src/main/java/com/dfsek/terra/api/structure/feature/BinaryColumn.java +++ b/common/api/src/main/java/com/dfsek/terra/api/structure/feature/BinaryColumn.java @@ -105,7 +105,7 @@ public class BinaryColumn { int smallMaxY = Math.min(this.maxY, that.maxY); if(bigMinY >= smallMaxY) return getNull(); - + return new BinaryColumn(bigMinY, smallMaxY, y -> this.get(y) && that.get(y)); } diff --git a/common/api/src/main/java/com/dfsek/terra/api/util/vector/Vector2.java b/common/api/src/main/java/com/dfsek/terra/api/util/vector/Vector2.java index 1ac2046f8..5dc1e8f1c 100644 --- a/common/api/src/main/java/com/dfsek/terra/api/util/vector/Vector2.java +++ b/common/api/src/main/java/com/dfsek/terra/api/util/vector/Vector2.java @@ -131,35 +131,35 @@ public class Vector2 { return "(" + x + ", " + z + ")"; } - + public static class Mutable extends Vector2 { - + private Mutable(double x, double z) { super(x, z); } - + public double getX() { return x; } - + public Mutable setX(double x) { this.x = x; return this; } - + public double getZ() { return z; } - + public Mutable setZ(double z) { this.z = z; return this; } - + public Vector2 immutable() { return Vector2.of(x, z); } - + /** * Get the length of this Vector * @@ -168,7 +168,7 @@ public class Vector2 { public double length() { return FastMath.sqrt(lengthSquared()); } - + /** * Get the squared length of this Vector * @@ -177,13 +177,13 @@ public class Vector2 { public double lengthSquared() { return x * x + z * z; } - + public Mutable add(double x, double z) { this.x += x; this.z += z; return this; } - + /** * Multiply X and Z components by a value. * @@ -196,7 +196,7 @@ public class Vector2 { z *= m; return this; } - + /** * Add this vector to another. * @@ -209,7 +209,7 @@ public class Vector2 { z += other.getZ(); return this; } - + /** * Subtract a vector from this vector, * @@ -222,7 +222,7 @@ public class Vector2 { z -= other.getZ(); return this; } - + /** * Normalize this vector to length 1 * @@ -232,7 +232,7 @@ public class Vector2 { divide(length()); return this; } - + /** * Divide X and Z components by a value. * diff --git a/common/api/src/main/java/com/dfsek/terra/api/util/vector/Vector3.java b/common/api/src/main/java/com/dfsek/terra/api/util/vector/Vector3.java index 5b50cd52b..b5c45ca61 100644 --- a/common/api/src/main/java/com/dfsek/terra/api/util/vector/Vector3.java +++ b/common/api/src/main/java/com/dfsek/terra/api/util/vector/Vector3.java @@ -91,7 +91,7 @@ public class Vector3 { public double getY() { return y; } - + public int getBlockX() { return FastMath.floorToInt(x); @@ -155,70 +155,70 @@ public class Vector3 { return "(" + getX() + ", " + getY() + ", " + getZ() + ")"; } - + public static class Mutable extends Vector3 { private Mutable(double x, double y, double z) { super(x, y, z); } - + public static Mutable of(double x, double y, double z) { return new Mutable(x, y, z); } - + public Vector3 immutable() { return Vector3.of(x, y, z); } - + public double getZ() { return z; } - + public Mutable setZ(double z) { this.z = z; return this; } - + public double getX() { return x; } - + public Mutable setX(double x) { this.x = x; return this; } - + public double getY() { return y; } - + public Mutable setY(double y) { this.y = y; return this; } - + public double lengthSquared() { return x * x + y * y + z * z; } - + public double length() { return FastMath.sqrt(lengthSquared()); } - + public double inverseLength() { return FastMath.invSqrtQuick(lengthSquared()); } - + public Mutable normalize() { return this.multiply(this.inverseLength()); } - + public Mutable subtract(int x, int y, int z) { this.x -= x; this.y -= y; this.z -= z; return this; } - + /** * Calculates the dot product of this vector with another. The dot product * is defined as x1*x2+y1*y2+z1*z2. The returned value is a scalar. @@ -230,48 +230,48 @@ public class Vector3 { public double dot(@NotNull Vector3 other) { return x * other.getX() + y * other.getY() + z * other.getZ(); } - + public Mutable subtract(Vector3 end) { x -= end.getX(); y -= end.getY(); z -= end.getZ(); return this; } - + public Mutable multiply(double m) { x *= m; y *= m; z *= m; return this; } - + public Mutable add(double x, double y, double z) { this.x += x; this.y += y; this.z += z; return this; } - + public Mutable add(Vector3 other) { this.x += other.getX(); this.y += other.getY(); this.z += other.getZ(); return this; } - + public Mutable add(Vector3Int other) { this.x += other.getX(); this.y += other.getY(); this.z += other.getZ(); return this; } - + public Mutable add(Vector2 other) { this.x += other.getX(); this.z += other.getZ(); return this; } - + /** * Rotates the vector around a given arbitrary axis in 3 dimensional space. * @@ -297,7 +297,7 @@ public class Vector3 { public Mutable rotateAroundAxis(@NotNull Vector3 axis, double angle) throws IllegalArgumentException { return rotateAroundNonUnitAxis(axis.isNormalized() ? axis : axis.mutable().normalize().immutable(), angle); } - + /** * Rotates the vector around a given arbitrary axis in 3 dimensional space. * @@ -322,11 +322,11 @@ public class Vector3 { public Mutable rotateAroundNonUnitAxis(@NotNull Vector3 axis, double angle) throws IllegalArgumentException { double x = getX(), y = getY(), z = getZ(); double x2 = axis.getX(), y2 = axis.getY(), z2 = axis.getZ(); - + double cosTheta = Math.cos(angle); double sinTheta = Math.sin(angle); double dotProduct = this.dot(axis); - + double xPrime = x2 * dotProduct * (1d - cosTheta) + x * cosTheta + (-z2 * y + y2 * z) * sinTheta; @@ -336,10 +336,10 @@ public class Vector3 { double zPrime = z2 * dotProduct * (1d - cosTheta) + z * cosTheta + (-y2 * x + x2 * y) * sinTheta; - + return setX(xPrime).setY(yPrime).setZ(zPrime); } - + /** * Rotates the vector around the x axis. *

@@ -357,12 +357,12 @@ public class Vector3 { public Mutable rotateAroundX(double angle) { double angleCos = Math.cos(angle); double angleSin = Math.sin(angle); - + double y = angleCos * getY() - angleSin * getZ(); double z = angleSin * getY() + angleCos * getZ(); return setY(y).setZ(z); } - + /** * Rotates the vector around the y axis. *

@@ -380,12 +380,12 @@ public class Vector3 { public Mutable rotateAroundY(double angle) { double angleCos = Math.cos(angle); double angleSin = Math.sin(angle); - + double x = angleCos * getX() + angleSin * getZ(); double z = -angleSin * getX() + angleCos * getZ(); return setX(x).setZ(z); } - + /** * Rotates the vector around the z axis *

@@ -403,30 +403,30 @@ public class Vector3 { public Mutable rotateAroundZ(double angle) { double angleCos = Math.cos(angle); double angleSin = Math.sin(angle); - + double x = angleCos * getX() - angleSin * getY(); double y = angleSin * getX() + angleCos * getY(); return setX(x).setY(y); } - + @Override public int hashCode() { int hash = 13; - + hash = 79 * hash + (int) (Double.doubleToLongBits(this.x) ^ (Double.doubleToLongBits(this.x) >>> 32)); hash = 79 * hash + (int) (Double.doubleToLongBits(this.y) ^ (Double.doubleToLongBits(this.y) >>> 32)); hash = 79 * hash + (int) (Double.doubleToLongBits(this.z) ^ (Double.doubleToLongBits(this.z) >>> 32)); return hash; } - + public int getBlockX() { return FastMath.floorToInt(x); } - + public int getBlockY() { return FastMath.floorToInt(y); } - + public int getBlockZ() { return FastMath.floorToInt(z); } diff --git a/common/api/src/main/java/com/dfsek/terra/api/util/vector/Vector3Int.java b/common/api/src/main/java/com/dfsek/terra/api/util/vector/Vector3Int.java index 842b54950..ad79cec14 100644 --- a/common/api/src/main/java/com/dfsek/terra/api/util/vector/Vector3Int.java +++ b/common/api/src/main/java/com/dfsek/terra/api/util/vector/Vector3Int.java @@ -91,7 +91,7 @@ public class Vector3Int { this.z += z; return this; } - + public Vector3 toVector3() { return Vector3.of(x, y, z); } diff --git a/common/api/src/main/java/com/dfsek/terra/api/world/BufferedWorld.java b/common/api/src/main/java/com/dfsek/terra/api/world/BufferedWorld.java index b9fc16305..aba5d9cfa 100644 --- a/common/api/src/main/java/com/dfsek/terra/api/world/BufferedWorld.java +++ b/common/api/src/main/java/com/dfsek/terra/api/world/BufferedWorld.java @@ -105,7 +105,7 @@ public class BufferedWorld implements WritableWorld { return delegate; } - + public static final class Builder { private final WritableWorld delegate; private ReadInterceptor readInterceptor; diff --git a/common/api/src/main/java/com/dfsek/terra/api/world/chunk/generation/util/Column.java b/common/api/src/main/java/com/dfsek/terra/api/world/chunk/generation/util/Column.java index ac3a49ce4..6defa986b 100644 --- a/common/api/src/main/java/com/dfsek/terra/api/world/chunk/generation/util/Column.java +++ b/common/api/src/main/java/com/dfsek/terra/api/world/chunk/generation/util/Column.java @@ -72,20 +72,20 @@ public class Column { return (Column) world.column(x + offsetX, z + offsetZ); } - + public static class BinaryColumnBuilder { private final boolean[] arr; private final Column column; - + public BinaryColumnBuilder(Column column) { this.column = column; arr = new boolean[column.getMaxY() - column.getMinY()]; } - + public BinaryColumn build() { return new BinaryColumn(column.getMinY(), column.getMaxY(), arr); } - + public BinaryColumnBuilder set(int y) { arr[y - column.getMinY()] = true; return this; diff --git a/common/implementation/base/src/main/java/com/dfsek/terra/AbstractPlatform.java b/common/implementation/base/src/main/java/com/dfsek/terra/AbstractPlatform.java index 654470349..9509f38b9 100644 --- a/common/implementation/base/src/main/java/com/dfsek/terra/AbstractPlatform.java +++ b/common/implementation/base/src/main/java/com/dfsek/terra/AbstractPlatform.java @@ -18,9 +18,6 @@ package com.dfsek.terra; import com.dfsek.tectonic.api.TypeRegistry; - -import com.dfsek.terra.api.addon.bootstrap.BootstrapAddonClassLoader; - import org.apache.commons.io.FileUtils; import org.apache.commons.io.IOUtils; import org.jetbrains.annotations.NotNull; @@ -49,6 +46,7 @@ import com.dfsek.terra.addon.EphemeralAddon; import com.dfsek.terra.addon.InternalAddon; import com.dfsek.terra.api.Platform; import com.dfsek.terra.api.addon.BaseAddon; +import com.dfsek.terra.api.addon.bootstrap.BootstrapAddonClassLoader; import com.dfsek.terra.api.config.ConfigPack; import com.dfsek.terra.api.config.PluginConfig; import com.dfsek.terra.api.event.EventManager; @@ -153,26 +151,26 @@ public abstract class AbstractPlatform implements Platform { protected InternalAddon loadAddons() { List addonList = new ArrayList<>(); - + InternalAddon internalAddon = new InternalAddon(); - + addonList.add(internalAddon); - + platformAddon().forEach(addonList::add); - + BootstrapAddonLoader bootstrapAddonLoader = new BootstrapAddonLoader(); - + Path addonsFolder = getDataFolder().toPath().resolve("addons"); - + Injector platformInjector = new InjectorImpl<>(this); platformInjector.addExplicitTarget(Platform.class); - - BootstrapAddonClassLoader bootstrapAddonClassLoader = new BootstrapAddonClassLoader(new URL[] {}, getClass().getClassLoader()); - + + BootstrapAddonClassLoader bootstrapAddonClassLoader = new BootstrapAddonClassLoader(new URL[]{ }, getClass().getClassLoader()); + bootstrapAddonLoader.loadAddons(addonsFolder, bootstrapAddonClassLoader) .forEach(bootstrapAddon -> { platformInjector.inject(bootstrapAddon); - + bootstrapAddon.loadAddons(addonsFolder, bootstrapAddonClassLoader) .forEach(addonList::add); }); @@ -183,7 +181,7 @@ public abstract class AbstractPlatform implements Platform { builder.append("Loading ") .append(addonList.size()) .append(" Terra addons:"); - + for(BaseAddon addon : addonList) { builder.append("\n ") .append("- ") @@ -191,10 +189,10 @@ public abstract class AbstractPlatform implements Platform { .append("@") .append(addon.getVersion().getFormatted()); } - + logger.info(builder.toString()); } - + DependencySorter sorter = new DependencySorter(); addonList.forEach(sorter::add); sorter.sort().forEach(addon -> { diff --git a/common/implementation/base/src/main/java/com/dfsek/terra/addon/InternalAddon.java b/common/implementation/base/src/main/java/com/dfsek/terra/addon/InternalAddon.java index 0a63af2db..cdd9ac5f2 100644 --- a/common/implementation/base/src/main/java/com/dfsek/terra/addon/InternalAddon.java +++ b/common/implementation/base/src/main/java/com/dfsek/terra/addon/InternalAddon.java @@ -27,7 +27,7 @@ public class InternalAddon implements BaseAddon { private static final Version VERSION = Versions.getVersion(1, 0, 0); public InternalAddon() { - + } @Override diff --git a/common/implementation/base/src/main/java/com/dfsek/terra/config/preprocessor/MetaListLikePreprocessor.java b/common/implementation/base/src/main/java/com/dfsek/terra/config/preprocessor/MetaListLikePreprocessor.java index 810fd1b35..38f754cf7 100644 --- a/common/implementation/base/src/main/java/com/dfsek/terra/config/preprocessor/MetaListLikePreprocessor.java +++ b/common/implementation/base/src/main/java/com/dfsek/terra/config/preprocessor/MetaListLikePreprocessor.java @@ -62,7 +62,7 @@ public class MetaListLikePreprocessor extends MetaPreprocessor { if(!s.startsWith("<< ")) continue; String meta = s.substring(3); - + Pair pair = getMetaValue(meta, depthTracker); Object metaValue = pair.getRight(); diff --git a/common/implementation/base/src/main/java/com/dfsek/terra/config/preprocessor/MetaMapPreprocessor.java b/common/implementation/base/src/main/java/com/dfsek/terra/config/preprocessor/MetaMapPreprocessor.java index 85ca19bf6..f4953ca6e 100644 --- a/common/implementation/base/src/main/java/com/dfsek/terra/config/preprocessor/MetaMapPreprocessor.java +++ b/common/implementation/base/src/main/java/com/dfsek/terra/config/preprocessor/MetaMapPreprocessor.java @@ -67,7 +67,7 @@ public class MetaMapPreprocessor extends MetaPreprocessor { depthTracker); } newMap.putAll((Map) meta); - + String configName; if(pair.getLeft().getName() == null) { configName = "Anonymous Configuration"; diff --git a/common/implementation/base/src/main/java/com/dfsek/terra/config/preprocessor/MetaValuePreprocessor.java b/common/implementation/base/src/main/java/com/dfsek/terra/config/preprocessor/MetaValuePreprocessor.java index 5109324d4..94997ca5b 100644 --- a/common/implementation/base/src/main/java/com/dfsek/terra/config/preprocessor/MetaValuePreprocessor.java +++ b/common/implementation/base/src/main/java/com/dfsek/terra/config/preprocessor/MetaValuePreprocessor.java @@ -44,7 +44,7 @@ public class MetaValuePreprocessor extends MetaPreprocessor { if(value.startsWith("$") // it's a meta value. && !value.startsWith("${")) { // it's not a meta string template. Pair pair = getMetaValue(value.substring(1), depthTracker); - + String configName; if(pair.getLeft().getName() == null) { configName = "Anonymous Configuration"; diff --git a/common/implementation/base/src/main/java/com/dfsek/terra/profiler/ProfilerImpl.java b/common/implementation/base/src/main/java/com/dfsek/terra/profiler/ProfilerImpl.java index d022d31e0..7da799e68 100644 --- a/common/implementation/base/src/main/java/com/dfsek/terra/profiler/ProfilerImpl.java +++ b/common/implementation/base/src/main/java/com/dfsek/terra/profiler/ProfilerImpl.java @@ -68,21 +68,21 @@ public class ProfilerImpl implements Profiler { if(SAFE.get()) { long time = System.nanoTime(); Stack stack = THREAD_STACK.get(); - + Map> timingsMap = TIMINGS.get(); - + if(timingsMap.isEmpty()) { synchronized(accessibleThreadMaps) { accessibleThreadMaps.add(timingsMap); } } - + Frame top = stack.pop(); if(!stack.isEmpty() ? !top.getId().endsWith("." + frame) : !top.getId().equals(frame)) throw new MalformedStackException("Expected " + frame + ", found " + top); - + List timings = timingsMap.computeIfAbsent(top.getId(), id -> new ArrayList<>()); - + timings.add(time - top.getStart()); } if(size.get() == 0) SAFE.set(true); diff --git a/common/implementation/base/src/main/java/com/dfsek/terra/registry/master/ConfigRegistry.java b/common/implementation/base/src/main/java/com/dfsek/terra/registry/master/ConfigRegistry.java index 08f180265..98ab127e1 100644 --- a/common/implementation/base/src/main/java/com/dfsek/terra/registry/master/ConfigRegistry.java +++ b/common/implementation/base/src/main/java/com/dfsek/terra/registry/master/ConfigRegistry.java @@ -38,11 +38,11 @@ import com.dfsek.terra.registry.OpenRegistryImpl; */ public class ConfigRegistry extends OpenRegistryImpl { private static final Logger logger = LoggerFactory.getLogger(ConfigRegistry.class); - + public ConfigRegistry() { super(TypeKey.of(ConfigPack.class)); } - + public void load(File folder, Platform platform) throws ConfigException { ConfigPack pack = new ConfigPackImpl(folder, platform); register(pack.getRegistryKey(), pack); diff --git a/common/implementation/base/src/test/java/profiler/ProfilerTest.java b/common/implementation/base/src/test/java/profiler/ProfilerTest.java index faa496421..1986f4633 100644 --- a/common/implementation/base/src/test/java/profiler/ProfilerTest.java +++ b/common/implementation/base/src/test/java/profiler/ProfilerTest.java @@ -60,11 +60,11 @@ public class ProfilerTest { for(int i = 0; i < 100; i++) { doThing(); } - + for(int i = 0; i < 100; i++) { doThirdOtherThing(); } - + for(int i = 0; i < 100; i++) { doOtherThing(); } @@ -76,7 +76,7 @@ public class ProfilerTest { PROFILER.pop("thing"); PROFILER.push("thing4"); PROFILER.pop("thing4"); - + PROFILER.getTimings().forEach((id, timings) -> System.out.println(id + ": " + timings.toString())); } } diff --git a/common/implementation/base/src/test/java/registry/RegistryTest.java b/common/implementation/base/src/test/java/registry/RegistryTest.java index 3f17a1776..b11e123b6 100644 --- a/common/implementation/base/src/test/java/registry/RegistryTest.java +++ b/common/implementation/base/src/test/java/registry/RegistryTest.java @@ -50,7 +50,7 @@ public class RegistryTest { test.registerChecked(RegistryKey.parse("test:test"), "bazinga2"); fail("Shouldn't be able to re-register with #registerChecked!"); } catch(DuplicateEntryException ignore) { - + } } @@ -66,7 +66,7 @@ public class RegistryTest { test.register(RegistryKey.parse("test:test"), "bazinga2"); fail("Shouldn't be able to re-register in CheckedRegistry!"); } catch(DuplicateEntryException ignore) { - + } } @@ -90,7 +90,7 @@ public class RegistryTest { test.getByID("test"); fail("Shouldn't be able to get with ambiguous ID!"); } catch(IllegalArgumentException ignore) { - + } } } diff --git a/common/implementation/bootstrap-addon-loader/src/main/java/com/dfsek/terra/addon/BootstrapAddonLoader.java b/common/implementation/bootstrap-addon-loader/src/main/java/com/dfsek/terra/addon/BootstrapAddonLoader.java index c35738e44..f3b56cde7 100644 --- a/common/implementation/bootstrap-addon-loader/src/main/java/com/dfsek/terra/addon/BootstrapAddonLoader.java +++ b/common/implementation/bootstrap-addon-loader/src/main/java/com/dfsek/terra/addon/BootstrapAddonLoader.java @@ -19,14 +19,12 @@ package com.dfsek.terra.addon; import ca.solostudios.strata.Versions; import ca.solostudios.strata.version.Version; -import com.dfsek.terra.api.addon.bootstrap.BootstrapAddonClassLoader; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import java.io.IOException; import java.io.UncheckedIOException; import java.lang.reflect.InvocationTargetException; -import java.net.URL; import java.nio.file.FileVisitOption; import java.nio.file.Files; import java.nio.file.Path; @@ -35,6 +33,7 @@ import java.util.stream.Collectors; import java.util.stream.Stream; import com.dfsek.terra.addon.exception.AddonLoadException; +import com.dfsek.terra.api.addon.bootstrap.BootstrapAddonClassLoader; import com.dfsek.terra.api.addon.bootstrap.BootstrapBaseAddon; 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 381d14aa3..19e29e0f9 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 @@ -198,7 +198,7 @@ public class TerraBukkitPlugin extends JavaPlugin { logger.warn(""" You are using Mohist, so we will not give you any support for issues that may arise. Since you enabled the "IKnowMohistCausesLotsOfIssuesButIWillUseItAnyways" flag, we won't disable Terra. But be warned. - + > I felt a great disturbance in the JVM, as if millions of plugins suddenly cried out in stack traces and were suddenly silenced. > I fear something terrible has happened. > - Astrash diff --git a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/world/BukkitAdapter.java b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/world/BukkitAdapter.java index 68f1b2975..e517129f2 100644 --- a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/world/BukkitAdapter.java +++ b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/world/BukkitAdapter.java @@ -18,8 +18,6 @@ package com.dfsek.terra.bukkit.world; -import com.dfsek.terra.api.world.info.WorldProperties; - import org.bukkit.Location; import org.bukkit.Material; import org.bukkit.TreeType; @@ -40,6 +38,7 @@ import com.dfsek.terra.api.inventory.item.Enchantment; import com.dfsek.terra.api.util.vector.Vector3; import com.dfsek.terra.api.world.ServerWorld; import com.dfsek.terra.api.world.chunk.Chunk; +import com.dfsek.terra.api.world.info.WorldProperties; import com.dfsek.terra.bukkit.BukkitCommandSender; import com.dfsek.terra.bukkit.BukkitEntity; import com.dfsek.terra.bukkit.BukkitPlayer; diff --git a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/world/BukkitChunk.java b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/world/BukkitChunk.java index 9eb256fb9..a7ce8c62b 100644 --- a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/world/BukkitChunk.java +++ b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/world/BukkitChunk.java @@ -17,12 +17,12 @@ package com.dfsek.terra.bukkit.world; +import org.jetbrains.annotations.NotNull; + import com.dfsek.terra.api.block.state.BlockState; import com.dfsek.terra.api.world.ServerWorld; import com.dfsek.terra.api.world.chunk.Chunk; -import org.jetbrains.annotations.NotNull; - public class BukkitChunk implements Chunk { private final org.bukkit.Chunk delegate; diff --git a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/world/BukkitProtoWorld.java b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/world/BukkitProtoWorld.java index 6a81bdb7c..579fc4825 100644 --- a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/world/BukkitProtoWorld.java +++ b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/world/BukkitProtoWorld.java @@ -27,11 +27,10 @@ import com.dfsek.terra.bukkit.world.entity.BukkitEntityType; public class BukkitProtoWorld implements ProtoWorld { private static final Logger LOGGER = LoggerFactory.getLogger(BukkitProtoWorld.class); + private static final AtomicBoolean warn = new AtomicBoolean(true); private final LimitedRegion delegate; private final BlockState air; - private static final AtomicBoolean warn = new AtomicBoolean(true); - public BukkitProtoWorld(LimitedRegion delegate, BlockState air) { this.delegate = delegate; this.air = air; @@ -122,7 +121,7 @@ public class BukkitProtoWorld implements ProtoWorld { delegate.getCenterChunkX(), delegate.getCenterChunkZ()); } else { LOGGER.debug("Detected world access at coordinates out of bounds: ({}, {}, {}) accessed for region [{}, {}]", x, y, z, - delegate.getCenterChunkX(), delegate.getCenterChunkZ()); + delegate.getCenterChunkX(), delegate.getCenterChunkZ()); } return Optional.empty(); } diff --git a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/FabricEntryPoint.java b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/FabricEntryPoint.java index b77257753..a6bd9b341 100644 --- a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/FabricEntryPoint.java +++ b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/FabricEntryPoint.java @@ -49,16 +49,16 @@ public class FabricEntryPoint implements ModInitializer { @Override public void onInitialize() { logger.info("Initializing Terra Fabric mod..."); - + FabricServerCommandManager manager = new FabricServerCommandManager<>( CommandExecutionCoordinator.simpleCoordinator(), serverCommandSource -> (CommandSender) serverCommandSource, commandSender -> (ServerCommandSource) commandSender ); - - + + manager.brigadierManager().setNativeNumberSuggestions(false); - + TERRA_PLUGIN.getEventManager().callEvent(new CommandRegistrationEvent(manager)); } } diff --git a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/PlatformImpl.java b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/PlatformImpl.java index fdbdfc4f3..14529aa05 100644 --- a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/PlatformImpl.java +++ b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/PlatformImpl.java @@ -23,15 +23,11 @@ import ca.solostudios.strata.version.Version; import com.dfsek.tectonic.api.TypeRegistry; import com.dfsek.tectonic.api.depth.DepthTracker; import com.dfsek.tectonic.api.exception.LoadException; - -import com.dfsek.terra.fabric.util.FabricUtil; - import net.fabricmc.loader.api.FabricLoader; import net.minecraft.MinecraftVersion; import net.minecraft.server.MinecraftServer; import net.minecraft.util.Identifier; import net.minecraft.util.registry.BuiltinRegistries; -import net.minecraft.util.registry.Registry; import net.minecraft.world.biome.Biome.Category; import net.minecraft.world.biome.Biome.Precipitation; import net.minecraft.world.biome.BiomeEffects.GrassColorModifier; @@ -53,6 +49,7 @@ import com.dfsek.terra.api.world.biome.PlatformBiome; import com.dfsek.terra.fabric.generation.FabricChunkGeneratorWrapper; 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.ProtoPlatformBiome; @@ -76,7 +73,7 @@ public class PlatformImpl extends AbstractPlatform { getTerraConfig().load(this); getRawConfigRegistry().clear(); boolean succeed = getRawConfigRegistry().loadAll(this); - + if(server != null) { server.reloadResources(server.getDataPackManager().getNames()).exceptionally(throwable -> { diff --git a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/data/Codecs.java b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/data/Codecs.java index a7d25c4be..eb0c7782a 100644 --- a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/data/Codecs.java +++ b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/data/Codecs.java @@ -7,7 +7,6 @@ import net.minecraft.structure.StructureSet; import net.minecraft.util.dynamic.RegistryOps; import net.minecraft.util.registry.Registry; import net.minecraft.util.registry.RegistryCodecs; -import net.minecraft.world.biome.Biome; import net.minecraft.world.gen.chunk.ChunkGeneratorSettings; import com.dfsek.terra.api.config.ConfigPack; diff --git a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/generation/TerraBiomeSource.java b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/generation/TerraBiomeSource.java index 01cef581b..de3196cf4 100644 --- a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/generation/TerraBiomeSource.java +++ b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/generation/TerraBiomeSource.java @@ -20,11 +20,11 @@ package com.dfsek.terra.fabric.generation; import com.mojang.serialization.Codec; import net.minecraft.util.registry.Registry; import net.minecraft.util.registry.RegistryEntry; -import net.minecraft.world.biome.Biome; import net.minecraft.world.biome.source.BiomeSource; import net.minecraft.world.biome.source.util.MultiNoiseUtil.MultiNoiseSampler; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; -import java.util.List; import java.util.stream.StreamSupport; import com.dfsek.terra.api.config.ConfigPack; @@ -32,18 +32,14 @@ import com.dfsek.terra.api.world.biome.generation.BiomeProvider; import com.dfsek.terra.fabric.data.Codecs; import com.dfsek.terra.fabric.util.ProtoPlatformBiome; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - public class TerraBiomeSource extends BiomeSource { + private static final Logger LOGGER = LoggerFactory.getLogger(TerraBiomeSource.class); private final Registry biomeRegistry; private final long seed; private ConfigPack pack; - private static final Logger LOGGER = LoggerFactory.getLogger(TerraBiomeSource.class); - public TerraBiomeSource(Registry biomes, long seed, ConfigPack pack) { super(StreamSupport .stream(pack.getBiomeProvider() @@ -73,7 +69,7 @@ public class TerraBiomeSource extends BiomeSource { .getBiomeProvider() .getBiome(biomeX << 2, biomeZ << 2, seed) .getPlatformBiome()) - .getDelegate()); + .getDelegate()); } public BiomeProvider getProvider() { diff --git a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/mixin/implementations/block/entity/MobSpawnerBlockEntityMixin.java b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/mixin/implementations/block/entity/MobSpawnerBlockEntityMixin.java index f85d9cac5..2f0363190 100644 --- a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/mixin/implementations/block/entity/MobSpawnerBlockEntityMixin.java +++ b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/mixin/implementations/block/entity/MobSpawnerBlockEntityMixin.java @@ -62,7 +62,7 @@ public abstract class MobSpawnerBlockEntityMixin extends BlockEntity { } public void terra$setDelay(int delay) { - + } public int terra$getMinSpawnDelay() { @@ -70,7 +70,7 @@ public abstract class MobSpawnerBlockEntityMixin extends BlockEntity { } public void terra$setMinSpawnDelay(int delay) { - + } public int terra$getMaxSpawnDelay() { @@ -78,7 +78,7 @@ public abstract class MobSpawnerBlockEntityMixin extends BlockEntity { } public void terra$setMaxSpawnDelay(int delay) { - + } public int terra$getSpawnCount() { @@ -86,7 +86,7 @@ public abstract class MobSpawnerBlockEntityMixin extends BlockEntity { } public void terra$setSpawnCount(int spawnCount) { - + } public int terra$getMaxNearbyEntities() { @@ -94,7 +94,7 @@ public abstract class MobSpawnerBlockEntityMixin extends BlockEntity { } public void terra$setMaxNearbyEntities(int maxNearbyEntities) { - + } public int terra$getRequiredPlayerRange() { @@ -102,7 +102,7 @@ public abstract class MobSpawnerBlockEntityMixin extends BlockEntity { } public void terra$setRequiredPlayerRange(int requiredPlayerRange) { - + } public int terra$getSpawnRange() { @@ -110,7 +110,7 @@ public abstract class MobSpawnerBlockEntityMixin extends BlockEntity { } public void terra$setSpawnRange(int spawnRange) { - + } public void terra$applyState(String state) { diff --git a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/mixin/implementations/world/ChunkRegionMixin.java b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/mixin/implementations/world/ChunkRegionMixin.java index 1510d1234..796d2c424 100644 --- a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/mixin/implementations/world/ChunkRegionMixin.java +++ b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/mixin/implementations/world/ChunkRegionMixin.java @@ -26,7 +26,6 @@ import net.minecraft.world.chunk.Chunk; import net.minecraft.world.chunk.ChunkStatus; import net.minecraft.world.tick.MultiTickScheduler; import net.minecraft.world.tick.OrderedTick; -import net.minecraft.world.tick.QueryableTickScheduler; import org.spongepowered.asm.mixin.Final; import org.spongepowered.asm.mixin.Implements; import org.spongepowered.asm.mixin.Interface; @@ -69,7 +68,7 @@ public abstract class ChunkRegionMixin { @Shadow @Final private Chunk centerPos; - + @Shadow @Final private MultiTickScheduler fluidTickScheduler; diff --git a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/mixin/implementations/world/ServerWorldMixin.java b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/mixin/implementations/world/ServerWorldMixin.java index b2a14ef93..4273446f6 100644 --- a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/mixin/implementations/world/ServerWorldMixin.java +++ b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/mixin/implementations/world/ServerWorldMixin.java @@ -17,15 +17,12 @@ package com.dfsek.terra.fabric.mixin.implementations.world; -import net.minecraft.server.world.ServerChunkManager; import net.minecraft.util.math.BlockPos; import net.minecraft.world.WorldAccess; -import org.spongepowered.asm.mixin.Final; import org.spongepowered.asm.mixin.Implements; import org.spongepowered.asm.mixin.Interface; import org.spongepowered.asm.mixin.Intrinsic; import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.Shadow; import com.dfsek.terra.api.block.entity.BlockEntity; import com.dfsek.terra.api.block.state.BlockState; @@ -85,7 +82,8 @@ public abstract class ServerWorldMixin { } public ChunkGenerator terra$getGenerator() { - return ((FabricChunkGeneratorWrapper) ((net.minecraft.server.world.ServerWorld) (Object) this).getChunkManager().getChunkGenerator()).getHandle(); + return ((FabricChunkGeneratorWrapper) ((net.minecraft.server.world.ServerWorld) (Object) this).getChunkManager() + .getChunkGenerator()).getHandle(); } public BiomeProvider terra$getBiomeProvider() { @@ -95,7 +93,8 @@ public abstract class ServerWorldMixin { } public ConfigPack terra$getPack() { - net.minecraft.world.gen.chunk.ChunkGenerator generator = (((net.minecraft.server.world.ServerWorld) (Object) this).getChunkManager()).getChunkGenerator(); + net.minecraft.world.gen.chunk.ChunkGenerator generator = + (((net.minecraft.server.world.ServerWorld) (Object) this).getChunkManager()).getChunkGenerator(); if(generator instanceof FabricChunkGeneratorWrapper fabricChunkGeneratorWrapper) { return fabricChunkGeneratorWrapper.getPack(); } diff --git a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/mixin/lifecycle/DataPackContentsMixin.java b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/mixin/lifecycle/DataPackContentsMixin.java index 5dc792523..a5d29e7a0 100644 --- a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/mixin/lifecycle/DataPackContentsMixin.java +++ b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/mixin/lifecycle/DataPackContentsMixin.java @@ -1,7 +1,6 @@ package com.dfsek.terra.fabric.mixin.lifecycle; import net.minecraft.server.DataPackContents; -import net.minecraft.util.registry.BuiltinRegistries; import net.minecraft.util.registry.DynamicRegistryManager; import net.minecraft.util.registry.Registry; import org.spongepowered.asm.mixin.Mixin; diff --git a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/mixin/lifecycle/RegistryMixin.java b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/mixin/lifecycle/RegistryMixin.java index 01bff63ae..0f6ccd532 100644 --- a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/mixin/lifecycle/RegistryMixin.java +++ b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/mixin/lifecycle/RegistryMixin.java @@ -2,7 +2,6 @@ package com.dfsek.terra.fabric.mixin.lifecycle; import net.minecraft.util.registry.Registry; -import net.minecraft.world.gen.chunk.ChunkGenerator; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; diff --git a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/mixin/lifecycle/client/MinecraftClientMixin.java b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/mixin/lifecycle/client/MinecraftClientMixin.java index fd6ac0ad5..a5e692296 100644 --- a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/mixin/lifecycle/client/MinecraftClientMixin.java +++ b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/mixin/lifecycle/client/MinecraftClientMixin.java @@ -17,28 +17,20 @@ package com.dfsek.terra.fabric.mixin.lifecycle.client; -import com.dfsek.terra.fabric.util.FabricUtil; - import net.minecraft.client.MinecraftClient; import net.minecraft.client.RunArgs; import net.minecraft.client.world.GeneratorType; import net.minecraft.text.LiteralText; -import net.minecraft.util.registry.DynamicRegistryManager; -import net.minecraft.util.registry.DynamicRegistryManager.Mutable; -import net.minecraft.util.registry.Registry; -import org.slf4j.Logger; -import org.spongepowered.asm.mixin.Final; import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.Shadow; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; -import org.spongepowered.asm.mixin.injection.Redirect; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; import com.dfsek.terra.api.event.events.platform.PlatformInitializationEvent; import com.dfsek.terra.fabric.FabricEntryPoint; import com.dfsek.terra.fabric.generation.TerraGeneratorType; import com.dfsek.terra.fabric.mixin.access.GeneratorTypeAccessor; +import com.dfsek.terra.fabric.util.FabricUtil; @Mixin(MinecraftClient.class) diff --git a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/mixin/lifecycle/server/GeneratorOptionsMixin.java b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/mixin/lifecycle/server/GeneratorOptionsMixin.java index ad8aa9864..ef2a587f5 100644 --- a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/mixin/lifecycle/server/GeneratorOptionsMixin.java +++ b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/mixin/lifecycle/server/GeneratorOptionsMixin.java @@ -17,8 +17,6 @@ package com.dfsek.terra.fabric.mixin.lifecycle.server; -import com.dfsek.terra.api.registry.CheckedRegistry; - import net.minecraft.server.dedicated.ServerPropertiesHandler; import net.minecraft.structure.StructureSet; import net.minecraft.util.registry.DynamicRegistryManager; @@ -38,6 +36,7 @@ import java.util.Locale; import java.util.Random; import com.dfsek.terra.api.config.ConfigPack; +import com.dfsek.terra.api.registry.CheckedRegistry; import com.dfsek.terra.fabric.FabricEntryPoint; import com.dfsek.terra.fabric.PlatformImpl; import com.dfsek.terra.fabric.generation.FabricChunkGeneratorWrapper; diff --git a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/mixin/lifecycle/server/ServerMainMixin.java b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/mixin/lifecycle/server/ServerMainMixin.java index 133e37798..a974924ba 100644 --- a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/mixin/lifecycle/server/ServerMainMixin.java +++ b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/mixin/lifecycle/server/ServerMainMixin.java @@ -17,30 +17,24 @@ package com.dfsek.terra.fabric.mixin.lifecycle.server; -import com.dfsek.terra.fabric.util.FabricUtil; - import net.minecraft.server.Main; -import net.minecraft.util.registry.DynamicRegistryManager; -import net.minecraft.util.registry.DynamicRegistryManager.Mutable; -import net.minecraft.util.registry.Registry; -import org.slf4j.Logger; -import org.spongepowered.asm.mixin.Final; import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.Shadow; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; -import org.spongepowered.asm.mixin.injection.Redirect; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; import com.dfsek.terra.api.event.events.platform.PlatformInitializationEvent; import com.dfsek.terra.fabric.FabricEntryPoint; +import com.dfsek.terra.fabric.util.FabricUtil; @Mixin(Main.class) public class ServerMainMixin { @Inject(method = "main([Ljava/lang/String;)V", at = @At(value = "INVOKE", - target = "Lnet/minecraft/resource/ResourcePackManager;(Lnet/minecraft/resource/ResourceType;[Lnet/minecraft/resource/ResourcePackProvider;)V") // after registry manager creation + target = "Lnet/minecraft/resource/ResourcePackManager;(Lnet/minecraft/resource/ResourceType;" + + "[Lnet/minecraft/resource/ResourcePackProvider;)V") + // after registry manager creation ) private static void injectConstructor(String[] args, CallbackInfo ci) { FabricEntryPoint.getPlatform().getEventManager().callEvent( diff --git a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/util/FabricUtil.java b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/util/FabricUtil.java index 493427980..862570653 100644 --- a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/util/FabricUtil.java +++ b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/util/FabricUtil.java @@ -42,7 +42,6 @@ import java.util.Locale; import java.util.Map; import java.util.Objects; import java.util.Optional; -import java.util.stream.Stream; import com.dfsek.terra.api.block.entity.BlockEntity; import com.dfsek.terra.api.block.entity.Container; @@ -57,6 +56,8 @@ import com.dfsek.terra.fabric.config.VanillaBiomeProperties; public final class FabricUtil { private static final Logger logger = LoggerFactory.getLogger(FabricUtil.class); + private static final Map> + TERRA_BIOME_MAP = new HashMap<>(); public static String createBiomeID(ConfigPack pack, com.dfsek.terra.api.registry.key.RegistryKey biomeID) { return pack.getID() @@ -71,10 +72,6 @@ public final class FabricUtil { }); } - private static final Map> - TERRA_BIOME_MAP = new HashMap<>(); - - /** * Clones a Vanilla biome and injects Terra data to create a Terra-vanilla biome delegate. * @@ -95,16 +92,21 @@ public final class FabricUtil { Identifier identifier = new Identifier("terra", FabricUtil.createBiomeID(pack, id)); if(registry.containsId(identifier)) { - ((ProtoPlatformBiome) biome.getPlatformBiome()).setDelegate(FabricUtil.getEntry(registry, identifier).orElseThrow().getKey().orElseThrow()); + ((ProtoPlatformBiome) biome.getPlatformBiome()).setDelegate(FabricUtil.getEntry(registry, identifier) + .orElseThrow() + .getKey() + .orElseThrow()); } else { - ((ProtoPlatformBiome) biome.getPlatformBiome()).setDelegate(BuiltinRegistries.add(registry, registerKey(identifier).getValue(), minecraftBiome).getKey().orElseThrow()); + ((ProtoPlatformBiome) biome.getPlatformBiome()).setDelegate(BuiltinRegistries.add(registry, + registerKey(identifier).getValue(), + minecraftBiome).getKey().orElseThrow()); } TERRA_BIOME_MAP.computeIfAbsent(vanilla.getValue(), i -> new ArrayList<>()).add(identifier); } } - private static RegistryKey registerKey(Identifier identifier){ + private static RegistryKey registerKey(Identifier identifier) { return RegistryKey.of(Registry.BIOME_KEY, identifier); } @@ -130,9 +132,9 @@ public final class FabricUtil { tag -> collect .computeIfAbsent(tag, t -> new ArrayList<>()) .add(getEntry(registry, - terra.getKey() - .orElseThrow() - .getValue()).orElseThrow())); + terra.getKey() + .orElseThrow() + .getValue()).orElseThrow())); }, () -> logger.error("No such biome: {}", tb))), diff --git a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/util/ProtoPlatformBiome.java b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/util/ProtoPlatformBiome.java index cf6d0e5b0..b8262893a 100644 --- a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/util/ProtoPlatformBiome.java +++ b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/util/ProtoPlatformBiome.java @@ -19,7 +19,6 @@ package com.dfsek.terra.fabric.util; import net.minecraft.util.Identifier; import net.minecraft.util.registry.Registry; -import net.minecraft.util.registry.RegistryEntry; import net.minecraft.util.registry.RegistryKey; import net.minecraft.world.biome.Biome;