diff --git a/common/addons/api-terrascript/src/main/java/com/dfsek/terra/addons/terrascript/api/FunctionBuilder.java b/common/addons/api-terrascript/src/main/java/com/dfsek/terra/addons/terrascript/api/FunctionBuilder.java index 82411417e..5f4afad79 100644 --- a/common/addons/api-terrascript/src/main/java/com/dfsek/terra/addons/terrascript/api/FunctionBuilder.java +++ b/common/addons/api-terrascript/src/main/java/com/dfsek/terra/addons/terrascript/api/FunctionBuilder.java @@ -1,5 +1,6 @@ package com.dfsek.terra.addons.terrascript.api; +import com.dfsek.terra.addons.terrascript.api.exception.ParseException; import com.dfsek.terra.addons.terrascript.api.lang.Returnable; import java.util.List; diff --git a/common/addons/api-terrascript/src/main/java/com/dfsek/terra/addons/terrascript/api/ParseException.java b/common/addons/api-terrascript/src/main/java/com/dfsek/terra/addons/terrascript/api/exception/ParseException.java similarity index 92% rename from common/addons/api-terrascript/src/main/java/com/dfsek/terra/addons/terrascript/api/ParseException.java rename to common/addons/api-terrascript/src/main/java/com/dfsek/terra/addons/terrascript/api/exception/ParseException.java index c706e58d3..ebfef7606 100644 --- a/common/addons/api-terrascript/src/main/java/com/dfsek/terra/addons/terrascript/api/ParseException.java +++ b/common/addons/api-terrascript/src/main/java/com/dfsek/terra/addons/terrascript/api/exception/ParseException.java @@ -1,4 +1,4 @@ -package com.dfsek.terra.addons.terrascript.api; +package com.dfsek.terra.addons.terrascript.api.exception; import com.dfsek.terra.addons.terrascript.api.Position; diff --git a/common/addons/biome-provider-image/src/main/java/com/dfsek/terra/addons/biome/image/ImageBiomeProviderAddon.java b/common/addons/biome-provider-image/src/main/java/com/dfsek/terra/addons/biome/image/ImageBiomeProviderAddon.java index 566abff80..84920b3ad 100644 --- a/common/addons/biome-provider-image/src/main/java/com/dfsek/terra/addons/biome/image/ImageBiomeProviderAddon.java +++ b/common/addons/biome-provider-image/src/main/java/com/dfsek/terra/addons/biome/image/ImageBiomeProviderAddon.java @@ -20,7 +20,8 @@ import java.util.function.Supplier; @Author("Terra") @Version("1.0.0") public class ImageBiomeProviderAddon extends TerraAddon { - public static final TypeKey>> PROVIDER_REGISTRY_KEY = new TypeKey<>() {}; + public static final TypeKey>> PROVIDER_REGISTRY_KEY = new TypeKey<>() { + }; @Inject private TerraPlugin main; diff --git a/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/BiomeHolderImpl.java b/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/BiomeHolderImpl.java index 3044cd1b9..d3f164ddb 100644 --- a/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/BiomeHolderImpl.java +++ b/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/BiomeHolderImpl.java @@ -3,9 +3,9 @@ package com.dfsek.terra.addons.biome.pipeline; import com.dfsek.terra.addons.biome.pipeline.api.BiomeExpander; import com.dfsek.terra.addons.biome.pipeline.api.BiomeHolder; import com.dfsek.terra.addons.biome.pipeline.api.BiomeMutator; +import com.dfsek.terra.addons.biome.pipeline.source.BiomeSource; import com.dfsek.terra.api.vector.Vector2; import com.dfsek.terra.api.world.biome.TerraBiome; -import com.dfsek.terra.addons.biome.pipeline.source.BiomeSource; public class BiomeHolderImpl implements BiomeHolder { private final Vector2 origin; diff --git a/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/BiomePipeline.java b/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/BiomePipeline.java index d5266bb15..9481161ea 100644 --- a/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/BiomePipeline.java +++ b/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/BiomePipeline.java @@ -2,8 +2,8 @@ package com.dfsek.terra.addons.biome.pipeline; import com.dfsek.terra.addons.biome.pipeline.api.BiomeHolder; import com.dfsek.terra.addons.biome.pipeline.api.Stage; -import com.dfsek.terra.api.vector.Vector2; import com.dfsek.terra.addons.biome.pipeline.source.BiomeSource; +import com.dfsek.terra.api.vector.Vector2; import java.util.ArrayList; import java.util.List; diff --git a/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/BiomePipelineAddon.java b/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/BiomePipelineAddon.java index 539723a67..d5511eaca 100644 --- a/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/BiomePipelineAddon.java +++ b/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/BiomePipelineAddon.java @@ -3,7 +3,6 @@ package com.dfsek.terra.addons.biome.pipeline; import com.dfsek.tectonic.loading.object.ObjectTemplate; import com.dfsek.terra.addons.biome.pipeline.api.Stage; import com.dfsek.terra.addons.biome.pipeline.config.BiomePipelineTemplate; -import com.dfsek.terra.addons.biome.pipeline.config.BiomeProviderLoader; import com.dfsek.terra.addons.biome.pipeline.config.NoiseSourceTemplate; import com.dfsek.terra.addons.biome.pipeline.config.stage.expander.ExpanderStageTemplate; import com.dfsek.terra.addons.biome.pipeline.config.stage.mutator.BorderListMutatorTemplate; @@ -11,6 +10,7 @@ import com.dfsek.terra.addons.biome.pipeline.config.stage.mutator.BorderMutatorT import com.dfsek.terra.addons.biome.pipeline.config.stage.mutator.ReplaceListMutatorTemplate; import com.dfsek.terra.addons.biome.pipeline.config.stage.mutator.ReplaceMutatorTemplate; import com.dfsek.terra.addons.biome.pipeline.config.stage.mutator.SmoothMutatorTemplate; +import com.dfsek.terra.addons.biome.pipeline.source.BiomeSource; import com.dfsek.terra.api.TerraPlugin; import com.dfsek.terra.api.addon.TerraAddon; import com.dfsek.terra.api.addon.annotations.Addon; @@ -22,7 +22,6 @@ import com.dfsek.terra.api.injection.annotations.Inject; import com.dfsek.terra.api.registry.CheckedRegistry; import com.dfsek.terra.api.util.reflection.TypeKey; import com.dfsek.terra.api.world.biome.generation.BiomeProvider; -import com.dfsek.terra.addons.biome.pipeline.source.BiomeSource; import java.util.function.Supplier; @@ -31,10 +30,13 @@ import java.util.function.Supplier; @Version("1.0.0") public class BiomePipelineAddon extends TerraAddon { - public static final TypeKey>> SOURCE_REGISTRY_KEY = new TypeKey<>() {}; + public static final TypeKey>> SOURCE_REGISTRY_KEY = new TypeKey<>() { + }; - public static final TypeKey>> STAGE_REGISTRY_KEY = new TypeKey<>() {}; - public static final TypeKey>> PROVIDER_REGISTRY_KEY = new TypeKey<>() {}; + public static final TypeKey>> STAGE_REGISTRY_KEY = new TypeKey<>() { + }; + public static final TypeKey>> PROVIDER_REGISTRY_KEY = new TypeKey<>() { + }; @Inject private TerraPlugin main; diff --git a/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/api/BiomeHolder.java b/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/api/BiomeHolder.java index 1d57ba616..75b25b93c 100644 --- a/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/api/BiomeHolder.java +++ b/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/api/BiomeHolder.java @@ -1,7 +1,7 @@ package com.dfsek.terra.addons.biome.pipeline.api; -import com.dfsek.terra.api.world.biome.TerraBiome; import com.dfsek.terra.addons.biome.pipeline.source.BiomeSource; +import com.dfsek.terra.api.world.biome.TerraBiome; public interface BiomeHolder { BiomeHolder expand(BiomeExpander expander, long seed); 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 bc35d9a01..7e1c394c6 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 @@ -5,10 +5,10 @@ import com.dfsek.tectonic.annotations.Value; import com.dfsek.terra.addons.biome.pipeline.BiomePipeline; import com.dfsek.terra.addons.biome.pipeline.BiomePipelineProvider; import com.dfsek.terra.addons.biome.pipeline.api.Stage; +import com.dfsek.terra.addons.biome.pipeline.source.BiomeSource; import com.dfsek.terra.api.TerraPlugin; import com.dfsek.terra.api.config.meta.Meta; import com.dfsek.terra.api.world.biome.generation.BiomeProvider; -import com.dfsek.terra.addons.biome.pipeline.source.BiomeSource; import java.util.List; diff --git a/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/config/NoiseSourceTemplate.java b/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/config/NoiseSourceTemplate.java index 042253fe6..666aee493 100644 --- a/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/config/NoiseSourceTemplate.java +++ b/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/config/NoiseSourceTemplate.java @@ -1,12 +1,12 @@ package com.dfsek.terra.addons.biome.pipeline.config; import com.dfsek.tectonic.annotations.Value; +import com.dfsek.terra.addons.biome.pipeline.source.BiomeSource; import com.dfsek.terra.addons.biome.pipeline.source.NoiseSource; import com.dfsek.terra.api.config.meta.Meta; import com.dfsek.terra.api.noise.NoiseSampler; import com.dfsek.terra.api.util.collection.ProbabilityCollection; import com.dfsek.terra.api.world.biome.TerraBiome; -import com.dfsek.terra.addons.biome.pipeline.source.BiomeSource; public class NoiseSourceTemplate extends SourceTemplate { @Value("noise") diff --git a/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/config/SourceTemplate.java b/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/config/SourceTemplate.java index c9a41e949..87151e3c4 100644 --- a/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/config/SourceTemplate.java +++ b/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/config/SourceTemplate.java @@ -3,6 +3,6 @@ package com.dfsek.terra.addons.biome.pipeline.config; import com.dfsek.tectonic.loading.object.ObjectTemplate; import com.dfsek.terra.addons.biome.pipeline.source.BiomeSource; -public abstract class SourceTemplate implements ObjectTemplate{ +public abstract class SourceTemplate implements ObjectTemplate { } diff --git a/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/config/stage/StageTemplate.java b/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/config/stage/StageTemplate.java index 4aba4990f..b7451b871 100644 --- a/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/config/stage/StageTemplate.java +++ b/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/config/stage/StageTemplate.java @@ -2,9 +2,7 @@ package com.dfsek.terra.addons.biome.pipeline.config.stage; import com.dfsek.tectonic.annotations.Value; import com.dfsek.tectonic.loading.object.ObjectTemplate; -import com.dfsek.terra.addons.biome.pipeline.api.BiomeMutator; import com.dfsek.terra.addons.biome.pipeline.api.Stage; -import com.dfsek.terra.addons.biome.pipeline.stages.MutatorStage; import com.dfsek.terra.api.config.meta.Meta; import com.dfsek.terra.api.noise.NoiseSampler; diff --git a/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/config/stage/mutator/BorderMutatorTemplate.java b/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/config/stage/mutator/BorderMutatorTemplate.java index 786b54dc8..73c808bdc 100644 --- a/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/config/stage/mutator/BorderMutatorTemplate.java +++ b/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/config/stage/mutator/BorderMutatorTemplate.java @@ -1,7 +1,6 @@ package com.dfsek.terra.addons.biome.pipeline.config.stage.mutator; import com.dfsek.tectonic.annotations.Value; -import com.dfsek.terra.addons.biome.pipeline.api.BiomeMutator; import com.dfsek.terra.addons.biome.pipeline.api.Stage; import com.dfsek.terra.addons.biome.pipeline.config.stage.StageTemplate; import com.dfsek.terra.addons.biome.pipeline.mutator.BorderMutator; diff --git a/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/config/stage/mutator/ReplaceListMutatorTemplate.java b/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/config/stage/mutator/ReplaceListMutatorTemplate.java index bdd22ade9..aff7cc764 100644 --- a/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/config/stage/mutator/ReplaceListMutatorTemplate.java +++ b/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/config/stage/mutator/ReplaceListMutatorTemplate.java @@ -1,7 +1,6 @@ package com.dfsek.terra.addons.biome.pipeline.config.stage.mutator; import com.dfsek.tectonic.annotations.Value; -import com.dfsek.terra.addons.biome.pipeline.api.BiomeMutator; import com.dfsek.terra.addons.biome.pipeline.api.Stage; import com.dfsek.terra.addons.biome.pipeline.config.stage.StageTemplate; import com.dfsek.terra.addons.biome.pipeline.mutator.ReplaceListMutator; diff --git a/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/config/stage/mutator/ReplaceMutatorTemplate.java b/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/config/stage/mutator/ReplaceMutatorTemplate.java index ea59bd3d8..a206927d1 100644 --- a/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/config/stage/mutator/ReplaceMutatorTemplate.java +++ b/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/config/stage/mutator/ReplaceMutatorTemplate.java @@ -1,7 +1,6 @@ package com.dfsek.terra.addons.biome.pipeline.config.stage.mutator; import com.dfsek.tectonic.annotations.Value; -import com.dfsek.terra.addons.biome.pipeline.api.BiomeMutator; import com.dfsek.terra.addons.biome.pipeline.api.Stage; import com.dfsek.terra.addons.biome.pipeline.config.stage.StageTemplate; import com.dfsek.terra.addons.biome.pipeline.mutator.ReplaceMutator; diff --git a/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/config/stage/mutator/SmoothMutatorTemplate.java b/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/config/stage/mutator/SmoothMutatorTemplate.java index 77e23c100..5edaf6f24 100644 --- a/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/config/stage/mutator/SmoothMutatorTemplate.java +++ b/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/config/stage/mutator/SmoothMutatorTemplate.java @@ -1,6 +1,5 @@ package com.dfsek.terra.addons.biome.pipeline.config.stage.mutator; -import com.dfsek.terra.addons.biome.pipeline.api.BiomeMutator; import com.dfsek.terra.addons.biome.pipeline.api.Stage; import com.dfsek.terra.addons.biome.pipeline.config.stage.StageTemplate; import com.dfsek.terra.addons.biome.pipeline.mutator.SmoothMutator; diff --git a/common/addons/biome-provider-single/src/main/java/com/dfsek/terra/addons/biome/single/SingleBiomeProviderAddon.java b/common/addons/biome-provider-single/src/main/java/com/dfsek/terra/addons/biome/single/SingleBiomeProviderAddon.java index 704a20d28..8f6d0d10a 100644 --- a/common/addons/biome-provider-single/src/main/java/com/dfsek/terra/addons/biome/single/SingleBiomeProviderAddon.java +++ b/common/addons/biome-provider-single/src/main/java/com/dfsek/terra/addons/biome/single/SingleBiomeProviderAddon.java @@ -19,7 +19,8 @@ import java.util.function.Supplier; @Author("Terra") @Version("1.0.0") public class SingleBiomeProviderAddon extends TerraAddon { - public static final TypeKey>> PROVIDER_REGISTRY_KEY = new TypeKey<>() {}; + public static final TypeKey>> PROVIDER_REGISTRY_KEY = new TypeKey<>() { + }; @Inject private TerraPlugin main; diff --git a/common/addons/chunk-generator-noise-3d/src/main/java/com/dfsek/terra/addons/chunkgenerator/generation/generators/NoiseChunkGenerator3D.java b/common/addons/chunk-generator-noise-3d/src/main/java/com/dfsek/terra/addons/chunkgenerator/generation/generators/NoiseChunkGenerator3D.java index fe9ea7d8e..bee647474 100644 --- a/common/addons/chunk-generator-noise-3d/src/main/java/com/dfsek/terra/addons/chunkgenerator/generation/generators/NoiseChunkGenerator3D.java +++ b/common/addons/chunk-generator-noise-3d/src/main/java/com/dfsek/terra/addons/chunkgenerator/generation/generators/NoiseChunkGenerator3D.java @@ -16,10 +16,10 @@ import com.dfsek.terra.api.world.biome.GenerationSettings; import com.dfsek.terra.api.world.biome.TerraBiome; import com.dfsek.terra.api.world.biome.generation.BiomeProvider; import com.dfsek.terra.api.world.generator.ChunkData; -import com.dfsek.terra.api.world.generator.Palette; -import com.dfsek.terra.api.world.generator.Sampler; import com.dfsek.terra.api.world.generator.ChunkGenerator; import com.dfsek.terra.api.world.generator.GenerationStage; +import com.dfsek.terra.api.world.generator.Palette; +import com.dfsek.terra.api.world.generator.Sampler; import net.jafama.FastMath; import org.jetbrains.annotations.NotNull; @@ -118,7 +118,7 @@ public class NoiseChunkGenerator3D implements ChunkGenerator { justSet = false; paletteLevel = 0; - } else { + } else { justSet = false; paletteLevel = 0; diff --git a/common/addons/config-biome/src/main/java/com/dfsek/terra/addons/biome/BiomeConfigType.java b/common/addons/config-biome/src/main/java/com/dfsek/terra/addons/biome/BiomeConfigType.java index d6cdb8416..cfa4070cc 100644 --- a/common/addons/config-biome/src/main/java/com/dfsek/terra/addons/biome/BiomeConfigType.java +++ b/common/addons/config-biome/src/main/java/com/dfsek/terra/addons/biome/BiomeConfigType.java @@ -13,10 +13,10 @@ import com.dfsek.terra.api.world.biome.TerraBiome; import java.util.function.Supplier; public class BiomeConfigType implements ConfigType { + public static final TypeKey BIOME_TYPE_TOKEN = new TypeKey<>() { + }; private final BiomeFactory factory; - public static final TypeKey BIOME_TYPE_TOKEN = new TypeKey<>() {}; - public BiomeConfigType(ConfigPack pack) { this.factory = new BiomeFactory(pack); } diff --git a/common/addons/config-biome/src/main/java/com/dfsek/terra/addons/biome/holder/PaletteHolderLoader.java b/common/addons/config-biome/src/main/java/com/dfsek/terra/addons/biome/holder/PaletteHolderLoader.java index 332c0bb44..a91b8cbb5 100644 --- a/common/addons/config-biome/src/main/java/com/dfsek/terra/addons/biome/holder/PaletteHolderLoader.java +++ b/common/addons/config-biome/src/main/java/com/dfsek/terra/addons/biome/holder/PaletteHolderLoader.java @@ -6,7 +6,6 @@ import com.dfsek.tectonic.loading.TypeLoader; import com.dfsek.terra.api.world.generator.Palette; import java.lang.reflect.AnnotatedType; -import java.lang.reflect.Type; import java.util.List; import java.util.Map; diff --git a/common/addons/config-distributors/src/main/java/com/dfsek/terra/addons/feature/distributor/DistributorAddon.java b/common/addons/config-distributors/src/main/java/com/dfsek/terra/addons/feature/distributor/DistributorAddon.java index 07fb8295c..7193926ef 100644 --- a/common/addons/config-distributors/src/main/java/com/dfsek/terra/addons/feature/distributor/DistributorAddon.java +++ b/common/addons/config-distributors/src/main/java/com/dfsek/terra/addons/feature/distributor/DistributorAddon.java @@ -25,7 +25,8 @@ import java.util.function.Supplier; @Version("1.0.0") @Author("Terra") public class DistributorAddon extends TerraAddon { - public static final TypeKey>> DISTRIBUTOR_TOKEN = new TypeKey<>() {}; + public static final TypeKey>> DISTRIBUTOR_TOKEN = new TypeKey<>() { + }; @Inject private TerraPlugin main; diff --git a/common/addons/config-distributors/src/main/java/com/dfsek/terra/addons/feature/distributor/distributors/NoiseDistributor.java b/common/addons/config-distributors/src/main/java/com/dfsek/terra/addons/feature/distributor/distributors/NoiseDistributor.java index 876beb2aa..263eb6732 100644 --- a/common/addons/config-distributors/src/main/java/com/dfsek/terra/addons/feature/distributor/distributors/NoiseDistributor.java +++ b/common/addons/config-distributors/src/main/java/com/dfsek/terra/addons/feature/distributor/distributors/NoiseDistributor.java @@ -7,6 +7,7 @@ public class NoiseDistributor implements Distributor { private final NoiseSampler sampler; private final double threshold; + public NoiseDistributor(NoiseSampler sampler, double threshold) { this.sampler = sampler; this.threshold = threshold; diff --git a/common/addons/config-feature/src/main/java/com/dfsek/terra/addons/feature/FeatureConfigType.java b/common/addons/config-feature/src/main/java/com/dfsek/terra/addons/feature/FeatureConfigType.java index 7a02bd640..9948ee67d 100644 --- a/common/addons/config-feature/src/main/java/com/dfsek/terra/addons/feature/FeatureConfigType.java +++ b/common/addons/config-feature/src/main/java/com/dfsek/terra/addons/feature/FeatureConfigType.java @@ -11,7 +11,8 @@ import com.dfsek.terra.api.util.reflection.TypeKey; import java.util.function.Supplier; public class FeatureConfigType implements ConfigType { - public static final TypeKey FEATURE_TYPE_KEY = new TypeKey<>() {}; + public static final TypeKey FEATURE_TYPE_KEY = new TypeKey<>() { + }; private final FeatureFactory factory = new FeatureFactory(); diff --git a/common/addons/config-feature/src/main/java/com/dfsek/terra/addons/feature/FeatureTemplate.java b/common/addons/config-feature/src/main/java/com/dfsek/terra/addons/feature/FeatureTemplate.java index 7deaaa2fc..a7da29d68 100644 --- a/common/addons/config-feature/src/main/java/com/dfsek/terra/addons/feature/FeatureTemplate.java +++ b/common/addons/config-feature/src/main/java/com/dfsek/terra/addons/feature/FeatureTemplate.java @@ -2,7 +2,6 @@ package com.dfsek.terra.addons.feature; import com.dfsek.tectonic.annotations.Final; import com.dfsek.tectonic.annotations.Value; -import com.dfsek.tectonic.config.ConfigTemplate; import com.dfsek.terra.api.config.AbstractableTemplate; import com.dfsek.terra.api.config.meta.Meta; import com.dfsek.terra.api.noise.NoiseSampler; diff --git a/common/addons/config-flora/src/main/java/com/dfsek/terra/addons/flora/FloraConfigType.java b/common/addons/config-flora/src/main/java/com/dfsek/terra/addons/flora/FloraConfigType.java index c17a604ba..fa3399833 100644 --- a/common/addons/config-flora/src/main/java/com/dfsek/terra/addons/flora/FloraConfigType.java +++ b/common/addons/config-flora/src/main/java/com/dfsek/terra/addons/flora/FloraConfigType.java @@ -11,10 +11,10 @@ import com.dfsek.terra.api.world.Flora; import java.util.function.Supplier; public class FloraConfigType implements ConfigType { + public static final TypeKey FLORA_TYPE_TOKEN = new TypeKey<>() { + }; private final FloraFactory factory = new FloraFactory(); - public static final TypeKey FLORA_TYPE_TOKEN = new TypeKey<>(){}; - @Override public FloraTemplate getTemplate(ConfigPack pack, TerraPlugin main) { return new FloraTemplate(); diff --git a/common/addons/config-flora/src/main/java/com/dfsek/terra/addons/flora/flora/gen/TerraFlora.java b/common/addons/config-flora/src/main/java/com/dfsek/terra/addons/flora/flora/gen/TerraFlora.java index 6563f09ef..d6c621369 100644 --- a/common/addons/config-flora/src/main/java/com/dfsek/terra/addons/flora/flora/gen/TerraFlora.java +++ b/common/addons/config-flora/src/main/java/com/dfsek/terra/addons/flora/flora/gen/TerraFlora.java @@ -1,6 +1,5 @@ package com.dfsek.terra.addons.flora.flora.gen; -import com.dfsek.terra.addons.flora.flora.gen.BlockLayer; import com.dfsek.terra.api.TerraPlugin; import com.dfsek.terra.api.block.state.BlockState; import com.dfsek.terra.api.block.state.properties.base.Properties; @@ -102,7 +101,7 @@ public class TerraFlora implements Flora { } private ProbabilityCollection getStateCollection(int layer) { - return layers.get(FastMath.max(FastMath.min(layer, layers.size()-1), 0)); + return layers.get(FastMath.max(FastMath.min(layer, layers.size() - 1), 0)); } @Override diff --git a/common/addons/config-locators/src/main/java/com/dfsek/terra/addons/feature/locator/LocatorAddon.java b/common/addons/config-locators/src/main/java/com/dfsek/terra/addons/feature/locator/LocatorAddon.java index 46a9f62e4..9a7bba05a 100644 --- a/common/addons/config-locators/src/main/java/com/dfsek/terra/addons/feature/locator/LocatorAddon.java +++ b/common/addons/config-locators/src/main/java/com/dfsek/terra/addons/feature/locator/LocatorAddon.java @@ -34,8 +34,10 @@ import java.util.function.Supplier; @Author("Terra") public class LocatorAddon extends TerraAddon { - public static final TypeKey>> LOCATOR_TOKEN = new TypeKey<>() {}; - public static final TypeKey>> PATTERN_TOKEN = new TypeKey<>() {}; + public static final TypeKey>> LOCATOR_TOKEN = new TypeKey<>() { + }; + public static final TypeKey>> PATTERN_TOKEN = new TypeKey<>() { + }; @Inject private TerraPlugin main; diff --git a/common/addons/config-locators/src/main/java/com/dfsek/terra/addons/feature/locator/config/AndLocatorTemplate.java b/common/addons/config-locators/src/main/java/com/dfsek/terra/addons/feature/locator/config/AndLocatorTemplate.java index a26486370..fb88c5d23 100644 --- a/common/addons/config-locators/src/main/java/com/dfsek/terra/addons/feature/locator/config/AndLocatorTemplate.java +++ b/common/addons/config-locators/src/main/java/com/dfsek/terra/addons/feature/locator/config/AndLocatorTemplate.java @@ -4,7 +4,6 @@ import com.dfsek.tectonic.annotations.Value; import com.dfsek.tectonic.config.ValidatedConfigTemplate; import com.dfsek.tectonic.exception.ValidationException; import com.dfsek.tectonic.loading.object.ObjectTemplate; -import com.dfsek.terra.addons.feature.locator.patterns.Pattern; import com.dfsek.terra.api.config.meta.Meta; import com.dfsek.terra.api.structure.feature.Locator; diff --git a/common/addons/config-locators/src/main/java/com/dfsek/terra/addons/feature/locator/config/RandomLocatorTemplate.java b/common/addons/config-locators/src/main/java/com/dfsek/terra/addons/feature/locator/config/RandomLocatorTemplate.java index 543ce5ca8..e29070fca 100644 --- a/common/addons/config-locators/src/main/java/com/dfsek/terra/addons/feature/locator/config/RandomLocatorTemplate.java +++ b/common/addons/config-locators/src/main/java/com/dfsek/terra/addons/feature/locator/config/RandomLocatorTemplate.java @@ -3,7 +3,6 @@ package com.dfsek.terra.addons.feature.locator.config; import com.dfsek.tectonic.annotations.Value; import com.dfsek.tectonic.loading.object.ObjectTemplate; import com.dfsek.terra.addons.feature.locator.locators.RandomLocator; -import com.dfsek.terra.addons.feature.locator.locators.SurfaceLocator; import com.dfsek.terra.api.config.meta.Meta; import com.dfsek.terra.api.structure.feature.Locator; import com.dfsek.terra.api.util.Range; diff --git a/common/addons/config-locators/src/main/java/com/dfsek/terra/addons/feature/locator/config/pattern/AirMatchPatternTemplate.java b/common/addons/config-locators/src/main/java/com/dfsek/terra/addons/feature/locator/config/pattern/AirMatchPatternTemplate.java index d54e4c49c..49c22c56c 100644 --- a/common/addons/config-locators/src/main/java/com/dfsek/terra/addons/feature/locator/config/pattern/AirMatchPatternTemplate.java +++ b/common/addons/config-locators/src/main/java/com/dfsek/terra/addons/feature/locator/config/pattern/AirMatchPatternTemplate.java @@ -2,8 +2,8 @@ package com.dfsek.terra.addons.feature.locator.config.pattern; import com.dfsek.tectonic.annotations.Value; import com.dfsek.tectonic.loading.object.ObjectTemplate; -import com.dfsek.terra.addons.feature.locator.patterns.Pattern; import com.dfsek.terra.addons.feature.locator.patterns.MatchPattern; +import com.dfsek.terra.addons.feature.locator.patterns.Pattern; import com.dfsek.terra.api.block.state.BlockState; import com.dfsek.terra.api.config.meta.Meta; import com.dfsek.terra.api.util.Range; diff --git a/common/addons/config-locators/src/main/java/com/dfsek/terra/addons/feature/locator/config/pattern/BlockSetMatchPatternTemplate.java b/common/addons/config-locators/src/main/java/com/dfsek/terra/addons/feature/locator/config/pattern/BlockSetMatchPatternTemplate.java index 83c9e429d..8df2b6725 100644 --- a/common/addons/config-locators/src/main/java/com/dfsek/terra/addons/feature/locator/config/pattern/BlockSetMatchPatternTemplate.java +++ b/common/addons/config-locators/src/main/java/com/dfsek/terra/addons/feature/locator/config/pattern/BlockSetMatchPatternTemplate.java @@ -2,8 +2,8 @@ package com.dfsek.terra.addons.feature.locator.config.pattern; import com.dfsek.tectonic.annotations.Value; import com.dfsek.tectonic.loading.object.ObjectTemplate; -import com.dfsek.terra.addons.feature.locator.patterns.Pattern; import com.dfsek.terra.addons.feature.locator.patterns.MatchPattern; +import com.dfsek.terra.addons.feature.locator.patterns.Pattern; import com.dfsek.terra.api.config.meta.Meta; import com.dfsek.terra.api.util.Range; import com.dfsek.terra.api.util.collection.MaterialSet; diff --git a/common/addons/config-locators/src/main/java/com/dfsek/terra/addons/feature/locator/config/pattern/SingleBlockMatchPatternTemplate.java b/common/addons/config-locators/src/main/java/com/dfsek/terra/addons/feature/locator/config/pattern/SingleBlockMatchPatternTemplate.java index 2a40ce285..4ce27e976 100644 --- a/common/addons/config-locators/src/main/java/com/dfsek/terra/addons/feature/locator/config/pattern/SingleBlockMatchPatternTemplate.java +++ b/common/addons/config-locators/src/main/java/com/dfsek/terra/addons/feature/locator/config/pattern/SingleBlockMatchPatternTemplate.java @@ -2,8 +2,8 @@ package com.dfsek.terra.addons.feature.locator.config.pattern; import com.dfsek.tectonic.annotations.Value; import com.dfsek.tectonic.loading.object.ObjectTemplate; -import com.dfsek.terra.addons.feature.locator.patterns.Pattern; import com.dfsek.terra.addons.feature.locator.patterns.MatchPattern; +import com.dfsek.terra.addons.feature.locator.patterns.Pattern; import com.dfsek.terra.api.block.state.BlockState; import com.dfsek.terra.api.config.meta.Meta; import com.dfsek.terra.api.util.Range; diff --git a/common/addons/config-locators/src/main/java/com/dfsek/terra/addons/feature/locator/config/pattern/SolidMatchPatternTemplate.java b/common/addons/config-locators/src/main/java/com/dfsek/terra/addons/feature/locator/config/pattern/SolidMatchPatternTemplate.java index 800def8ef..33492749a 100644 --- a/common/addons/config-locators/src/main/java/com/dfsek/terra/addons/feature/locator/config/pattern/SolidMatchPatternTemplate.java +++ b/common/addons/config-locators/src/main/java/com/dfsek/terra/addons/feature/locator/config/pattern/SolidMatchPatternTemplate.java @@ -2,8 +2,8 @@ package com.dfsek.terra.addons.feature.locator.config.pattern; import com.dfsek.tectonic.annotations.Value; import com.dfsek.tectonic.loading.object.ObjectTemplate; -import com.dfsek.terra.addons.feature.locator.patterns.Pattern; import com.dfsek.terra.addons.feature.locator.patterns.MatchPattern; +import com.dfsek.terra.addons.feature.locator.patterns.Pattern; import com.dfsek.terra.api.util.Range; public class SolidMatchPatternTemplate implements ObjectTemplate { diff --git a/common/addons/config-locators/src/main/java/com/dfsek/terra/addons/feature/locator/locators/PatternLocator.java b/common/addons/config-locators/src/main/java/com/dfsek/terra/addons/feature/locator/locators/PatternLocator.java index 64dcc7bbb..fc1f018a5 100644 --- a/common/addons/config-locators/src/main/java/com/dfsek/terra/addons/feature/locator/locators/PatternLocator.java +++ b/common/addons/config-locators/src/main/java/com/dfsek/terra/addons/feature/locator/locators/PatternLocator.java @@ -6,9 +6,6 @@ import com.dfsek.terra.api.structure.feature.Locator; import com.dfsek.terra.api.util.Range; import com.dfsek.terra.api.world.Column; -import java.util.ArrayList; -import java.util.List; - public class PatternLocator implements Locator { private final Pattern pattern; private final Range search; diff --git a/common/addons/config-locators/src/main/java/com/dfsek/terra/addons/feature/locator/locators/RandomLocator.java b/common/addons/config-locators/src/main/java/com/dfsek/terra/addons/feature/locator/locators/RandomLocator.java index 7dd0672b2..86d0f961f 100644 --- a/common/addons/config-locators/src/main/java/com/dfsek/terra/addons/feature/locator/locators/RandomLocator.java +++ b/common/addons/config-locators/src/main/java/com/dfsek/terra/addons/feature/locator/locators/RandomLocator.java @@ -5,8 +5,6 @@ import com.dfsek.terra.api.structure.feature.Locator; import com.dfsek.terra.api.util.Range; import com.dfsek.terra.api.world.Column; -import java.util.ArrayList; -import java.util.List; import java.util.Random; public class RandomLocator implements Locator { diff --git a/common/addons/config-locators/src/main/java/com/dfsek/terra/addons/feature/locator/locators/SurfaceLocator.java b/common/addons/config-locators/src/main/java/com/dfsek/terra/addons/feature/locator/locators/SurfaceLocator.java index 85da18385..e4c51d637 100644 --- a/common/addons/config-locators/src/main/java/com/dfsek/terra/addons/feature/locator/locators/SurfaceLocator.java +++ b/common/addons/config-locators/src/main/java/com/dfsek/terra/addons/feature/locator/locators/SurfaceLocator.java @@ -7,8 +7,6 @@ import com.dfsek.terra.api.structure.feature.Locator; import com.dfsek.terra.api.util.Range; import com.dfsek.terra.api.world.Column; -import java.util.Collections; - public class SurfaceLocator implements Locator { private final Range search; @@ -23,7 +21,7 @@ public class SurfaceLocator implements Locator { public BinaryColumn getSuitableCoordinates(Column column) { BinaryColumn location = new BinaryColumn(column.getMinY(), column.getMaxY()); for(int y : search) { - if(column.getBlock(y).matches(air) && !column.getBlock(y-1).matches(air)) { + if(column.getBlock(y).matches(air) && !column.getBlock(y - 1).matches(air)) { location.set(y); return location; } diff --git a/common/addons/config-locators/src/main/java/com/dfsek/terra/addons/feature/locator/patterns/MatchPattern.java b/common/addons/config-locators/src/main/java/com/dfsek/terra/addons/feature/locator/patterns/MatchPattern.java index da85e8605..022353521 100644 --- a/common/addons/config-locators/src/main/java/com/dfsek/terra/addons/feature/locator/patterns/MatchPattern.java +++ b/common/addons/config-locators/src/main/java/com/dfsek/terra/addons/feature/locator/patterns/MatchPattern.java @@ -1,6 +1,5 @@ package com.dfsek.terra.addons.feature.locator.patterns; -import com.dfsek.terra.addons.feature.locator.patterns.Pattern; import com.dfsek.terra.api.block.state.BlockState; import com.dfsek.terra.api.util.Range; import com.dfsek.terra.api.world.Column; diff --git a/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/NoiseAddon.java b/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/NoiseAddon.java index ae0656575..692cd1ca8 100644 --- a/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/NoiseAddon.java +++ b/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/NoiseAddon.java @@ -45,11 +45,11 @@ import java.util.function.Supplier; @Author("Terra") @Version("1.0.0") public class NoiseAddon extends TerraAddon { + public static final TypeKey>> NOISE_SAMPLER_TOKEN = new TypeKey<>() { + }; @Inject private TerraPlugin plugin; - public static final TypeKey>> NOISE_SAMPLER_TOKEN = new TypeKey<>() {}; - @Override public void initialize() { plugin.getEventManager() diff --git a/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/config/templates/noise/NoiseTemplate.java b/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/config/templates/noise/NoiseTemplate.java index d5807cd8a..2925d42c5 100644 --- a/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/config/templates/noise/NoiseTemplate.java +++ b/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/config/templates/noise/NoiseTemplate.java @@ -5,7 +5,6 @@ import com.dfsek.tectonic.annotations.Value; import com.dfsek.terra.addons.noise.config.templates.SamplerTemplate; import com.dfsek.terra.addons.noise.samplers.noise.NoiseFunction; import com.dfsek.terra.api.config.meta.Meta; -import com.dfsek.terra.api.noise.NoiseSampler; @SuppressWarnings({"unused", "FieldMayBeFinal"}) public abstract class NoiseTemplate extends SamplerTemplate { diff --git a/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/config/templates/noise/SimpleNoiseTemplate.java b/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/config/templates/noise/SimpleNoiseTemplate.java index 915b06dcc..dc752f1a8 100644 --- a/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/config/templates/noise/SimpleNoiseTemplate.java +++ b/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/config/templates/noise/SimpleNoiseTemplate.java @@ -3,7 +3,6 @@ package com.dfsek.terra.addons.noise.config.templates.noise; import com.dfsek.terra.addons.noise.samplers.noise.NoiseFunction; import com.dfsek.terra.api.noise.NoiseSampler; -import java.util.function.Function; import java.util.function.Supplier; public class SimpleNoiseTemplate extends NoiseTemplate { diff --git a/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/paralithic/noise/NoiseFunction2.java b/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/paralithic/noise/NoiseFunction2.java index f12c1576e..b08571055 100644 --- a/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/paralithic/noise/NoiseFunction2.java +++ b/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/paralithic/noise/NoiseFunction2.java @@ -2,7 +2,6 @@ package com.dfsek.terra.addons.noise.paralithic.noise; import com.dfsek.paralithic.functions.dynamic.Context; import com.dfsek.paralithic.functions.dynamic.DynamicFunction; -import com.dfsek.terra.addons.noise.util.HashMapDoubleDouble; import com.dfsek.terra.api.noise.NoiseSampler; diff --git a/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/samplers/noise/NoiseFunction.java b/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/samplers/noise/NoiseFunction.java index c5b20abe6..ae726586e 100644 --- a/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/samplers/noise/NoiseFunction.java +++ b/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/samplers/noise/NoiseFunction.java @@ -23,10 +23,6 @@ public abstract class NoiseFunction implements NoiseSampler { protected long salt; - public void setSalt(long salt) { - this.salt = salt; - } - public NoiseFunction() { this.salt = 0; } @@ -119,6 +115,10 @@ public abstract class NoiseFunction implements NoiseSampler { return sinLookup((int) ((a + Math.PI / 2) * precision + 0.5f)); } + public void setSalt(long salt) { + this.salt = salt; + } + public double getFrequency() { return frequency; } diff --git a/common/addons/config-ore/src/main/java/com/dfsek/terra/addons/ore/OreConfigType.java b/common/addons/config-ore/src/main/java/com/dfsek/terra/addons/ore/OreConfigType.java index 36ffa5785..7b26cf816 100644 --- a/common/addons/config-ore/src/main/java/com/dfsek/terra/addons/ore/OreConfigType.java +++ b/common/addons/config-ore/src/main/java/com/dfsek/terra/addons/ore/OreConfigType.java @@ -11,8 +11,9 @@ import com.dfsek.terra.api.util.reflection.TypeKey; import java.util.function.Supplier; public class OreConfigType implements ConfigType { + public static final TypeKey ORE_TYPE_TOKEN = new TypeKey<>() { + }; private final OreFactory factory = new OreFactory(); - public static final TypeKey ORE_TYPE_TOKEN = new TypeKey<>(){}; @Override public OreTemplate getTemplate(ConfigPack pack, TerraPlugin main) { diff --git a/common/addons/config-palette/src/main/java/com/dfsek/terra/addons/palette/PaletteConfigType.java b/common/addons/config-palette/src/main/java/com/dfsek/terra/addons/palette/PaletteConfigType.java index 97d4c81fa..227c6b363 100644 --- a/common/addons/config-palette/src/main/java/com/dfsek/terra/addons/palette/PaletteConfigType.java +++ b/common/addons/config-palette/src/main/java/com/dfsek/terra/addons/palette/PaletteConfigType.java @@ -14,11 +14,11 @@ import com.dfsek.terra.api.world.generator.Palette; import java.util.function.Supplier; public class PaletteConfigType implements ConfigType { + public static final TypeKey PALETTE_TYPE_TOKEN = new TypeKey<>() { + }; private final PaletteFactory factory = new PaletteFactory(); private final TerraPlugin main; - public static final TypeKey PALETTE_TYPE_TOKEN = new TypeKey<>(){}; - public PaletteConfigType(TerraPlugin main) { this.main = main; } diff --git a/common/addons/config-palette/src/main/java/com/dfsek/terra/addons/palette/palette/NoisePalette.java b/common/addons/config-palette/src/main/java/com/dfsek/terra/addons/palette/palette/NoisePalette.java index 24e1bac68..117e7b640 100644 --- a/common/addons/config-palette/src/main/java/com/dfsek/terra/addons/palette/palette/NoisePalette.java +++ b/common/addons/config-palette/src/main/java/com/dfsek/terra/addons/palette/palette/NoisePalette.java @@ -10,7 +10,7 @@ public class NoisePalette extends PaletteImpl { public NoisePalette(NoiseSampler sampler) { this.sampler = sampler; - } + } @Override public BlockState get(int layer, double x, double y, double z, long seed) { diff --git a/common/addons/config-palette/src/main/java/com/dfsek/terra/addons/palette/palette/PaletteImpl.java b/common/addons/config-palette/src/main/java/com/dfsek/terra/addons/palette/palette/PaletteImpl.java index e11462958..f485fc3ea 100644 --- a/common/addons/config-palette/src/main/java/com/dfsek/terra/addons/palette/palette/PaletteImpl.java +++ b/common/addons/config-palette/src/main/java/com/dfsek/terra/addons/palette/palette/PaletteImpl.java @@ -7,7 +7,6 @@ import com.dfsek.terra.api.world.generator.Palette; import java.util.ArrayList; import java.util.List; -import java.util.Random; /** * A class representation of a "slice" of the world. diff --git a/common/addons/config-structure/src/main/java/com/dfsek/terra/addons/structure/TerraStructure.java b/common/addons/config-structure/src/main/java/com/dfsek/terra/addons/structure/TerraStructure.java index 79b37e7fa..d7991b0dc 100644 --- a/common/addons/config-structure/src/main/java/com/dfsek/terra/addons/structure/TerraStructure.java +++ b/common/addons/config-structure/src/main/java/com/dfsek/terra/addons/structure/TerraStructure.java @@ -1,8 +1,8 @@ package com.dfsek.terra.addons.structure; -import com.dfsek.terra.api.structure.configured.ConfiguredStructure; import com.dfsek.terra.api.structure.Structure; import com.dfsek.terra.api.structure.StructureSpawn; +import com.dfsek.terra.api.structure.configured.ConfiguredStructure; import com.dfsek.terra.api.util.Range; import com.dfsek.terra.api.util.collection.ProbabilityCollection; diff --git a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/TerraScriptAddon.java b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/TerraScriptAddon.java index 4f6665584..738580e4d 100644 --- a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/TerraScriptAddon.java +++ b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/TerraScriptAddon.java @@ -1,7 +1,7 @@ package com.dfsek.terra.addons.terrascript; import com.dfsek.tectonic.exception.LoadException; -import com.dfsek.terra.addons.terrascript.api.ParseException; +import com.dfsek.terra.addons.terrascript.api.exception.ParseException; import com.dfsek.terra.addons.terrascript.script.StructureScript; import com.dfsek.terra.api.TerraPlugin; import com.dfsek.terra.api.addon.TerraAddon; diff --git a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/Parser.java b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/Parser.java index e2d80c23e..ccf09a819 100644 --- a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/Parser.java +++ b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/Parser.java @@ -1,16 +1,17 @@ package com.dfsek.terra.addons.terrascript.parser; -import com.dfsek.terra.addons.terrascript.api.ParseException; -import com.dfsek.terra.addons.terrascript.parser.lang.Block; +import com.dfsek.terra.addons.terrascript.api.Function; +import com.dfsek.terra.addons.terrascript.api.FunctionBuilder; +import com.dfsek.terra.addons.terrascript.api.Position; +import com.dfsek.terra.addons.terrascript.api.exception.ParseException; import com.dfsek.terra.addons.terrascript.api.lang.Item; -import com.dfsek.terra.addons.terrascript.parser.lang.Keyword; import com.dfsek.terra.addons.terrascript.api.lang.Returnable; +import com.dfsek.terra.addons.terrascript.parser.lang.Block; +import com.dfsek.terra.addons.terrascript.parser.lang.Keyword; import com.dfsek.terra.addons.terrascript.parser.lang.constants.BooleanConstant; import com.dfsek.terra.addons.terrascript.parser.lang.constants.ConstantExpression; 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.api.Function; -import com.dfsek.terra.addons.terrascript.api.FunctionBuilder; import com.dfsek.terra.addons.terrascript.parser.lang.keywords.flow.BreakKeyword; import com.dfsek.terra.addons.terrascript.parser.lang.keywords.flow.ContinueKeyword; import com.dfsek.terra.addons.terrascript.parser.lang.keywords.flow.FailKeyword; @@ -38,7 +39,6 @@ import com.dfsek.terra.addons.terrascript.parser.lang.operations.statements.NotE import com.dfsek.terra.addons.terrascript.parser.lang.variables.Assignment; import com.dfsek.terra.addons.terrascript.parser.lang.variables.Declaration; import com.dfsek.terra.addons.terrascript.parser.lang.variables.Getter; -import com.dfsek.terra.addons.terrascript.api.Position; import com.dfsek.terra.addons.terrascript.tokenizer.Token; import com.dfsek.terra.addons.terrascript.tokenizer.Tokenizer; diff --git a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/ParserUtil.java b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/ParserUtil.java index e8b3afdd4..7acaeca8e 100644 --- a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/ParserUtil.java +++ b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/ParserUtil.java @@ -1,6 +1,6 @@ package com.dfsek.terra.addons.terrascript.parser; -import com.dfsek.terra.addons.terrascript.api.ParseException; +import com.dfsek.terra.addons.terrascript.api.exception.ParseException; import com.dfsek.terra.addons.terrascript.api.lang.Returnable; import com.dfsek.terra.addons.terrascript.tokenizer.Token; diff --git a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/Block.java b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/Block.java index 08f651035..a924e7c07 100644 --- a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/Block.java +++ b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/Block.java @@ -1,9 +1,9 @@ package com.dfsek.terra.addons.terrascript.parser.lang; import com.dfsek.terra.addons.terrascript.api.ImplementationArguments; +import com.dfsek.terra.addons.terrascript.api.Position; import com.dfsek.terra.addons.terrascript.api.lang.Item; import com.dfsek.terra.addons.terrascript.api.lang.Variable; -import com.dfsek.terra.addons.terrascript.api.Position; import java.util.HashMap; import java.util.List; diff --git a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/constants/ConstantExpression.java b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/constants/ConstantExpression.java index 05f9b06d5..ed6cb408e 100644 --- a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/constants/ConstantExpression.java +++ b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/constants/ConstantExpression.java @@ -1,9 +1,9 @@ package com.dfsek.terra.addons.terrascript.parser.lang.constants; import com.dfsek.terra.addons.terrascript.api.ImplementationArguments; +import com.dfsek.terra.addons.terrascript.api.Position; import com.dfsek.terra.addons.terrascript.api.lang.Returnable; import com.dfsek.terra.addons.terrascript.api.lang.Variable; -import com.dfsek.terra.addons.terrascript.api.Position; import java.util.Map; diff --git a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/constants/NumericConstant.java b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/constants/NumericConstant.java index a502b4e90..ed3963183 100644 --- a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/constants/NumericConstant.java +++ b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/constants/NumericConstant.java @@ -1,7 +1,7 @@ package com.dfsek.terra.addons.terrascript.parser.lang.constants; -import com.dfsek.terra.addons.terrascript.api.lang.Returnable; import com.dfsek.terra.addons.terrascript.api.Position; +import com.dfsek.terra.addons.terrascript.api.lang.Returnable; public class NumericConstant extends ConstantExpression { public NumericConstant(Number constant, Position position) { diff --git a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/constants/StringConstant.java b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/constants/StringConstant.java index acb941e4a..878e3d328 100644 --- a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/constants/StringConstant.java +++ b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/constants/StringConstant.java @@ -1,7 +1,7 @@ package com.dfsek.terra.addons.terrascript.parser.lang.constants; -import com.dfsek.terra.addons.terrascript.api.lang.Returnable; import com.dfsek.terra.addons.terrascript.api.Position; +import com.dfsek.terra.addons.terrascript.api.lang.Returnable; public class StringConstant extends ConstantExpression { public StringConstant(String constant, Position position) { diff --git a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/functions/def/FunctionBlock.java b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/functions/def/FunctionBlock.java index 35f2a4a22..1bc24c5e3 100644 --- a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/functions/def/FunctionBlock.java +++ b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/functions/def/FunctionBlock.java @@ -1,10 +1,10 @@ package com.dfsek.terra.addons.terrascript.parser.lang.functions.def; -import com.dfsek.terra.addons.terrascript.parser.lang.Block; import com.dfsek.terra.addons.terrascript.api.ImplementationArguments; +import com.dfsek.terra.addons.terrascript.api.Position; import com.dfsek.terra.addons.terrascript.api.lang.Item; import com.dfsek.terra.addons.terrascript.api.lang.Variable; -import com.dfsek.terra.addons.terrascript.api.Position; +import com.dfsek.terra.addons.terrascript.parser.lang.Block; import java.util.HashMap; import java.util.List; diff --git a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/keywords/flow/BreakKeyword.java b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/keywords/flow/BreakKeyword.java index d3860c85a..d22b81334 100644 --- a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/keywords/flow/BreakKeyword.java +++ b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/keywords/flow/BreakKeyword.java @@ -1,10 +1,10 @@ package com.dfsek.terra.addons.terrascript.parser.lang.keywords.flow; -import com.dfsek.terra.addons.terrascript.parser.lang.Block; import com.dfsek.terra.addons.terrascript.api.ImplementationArguments; -import com.dfsek.terra.addons.terrascript.parser.lang.Keyword; -import com.dfsek.terra.addons.terrascript.api.lang.Variable; import com.dfsek.terra.addons.terrascript.api.Position; +import com.dfsek.terra.addons.terrascript.api.lang.Variable; +import com.dfsek.terra.addons.terrascript.parser.lang.Block; +import com.dfsek.terra.addons.terrascript.parser.lang.Keyword; import java.util.Map; diff --git a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/keywords/flow/ContinueKeyword.java b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/keywords/flow/ContinueKeyword.java index 877d99acd..9d232b0ab 100644 --- a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/keywords/flow/ContinueKeyword.java +++ b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/keywords/flow/ContinueKeyword.java @@ -1,10 +1,10 @@ package com.dfsek.terra.addons.terrascript.parser.lang.keywords.flow; -import com.dfsek.terra.addons.terrascript.parser.lang.Block; import com.dfsek.terra.addons.terrascript.api.ImplementationArguments; -import com.dfsek.terra.addons.terrascript.parser.lang.Keyword; -import com.dfsek.terra.addons.terrascript.api.lang.Variable; import com.dfsek.terra.addons.terrascript.api.Position; +import com.dfsek.terra.addons.terrascript.api.lang.Variable; +import com.dfsek.terra.addons.terrascript.parser.lang.Block; +import com.dfsek.terra.addons.terrascript.parser.lang.Keyword; import java.util.Map; diff --git a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/keywords/flow/FailKeyword.java b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/keywords/flow/FailKeyword.java index 5fd1c810c..65c732a7a 100644 --- a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/keywords/flow/FailKeyword.java +++ b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/keywords/flow/FailKeyword.java @@ -1,10 +1,10 @@ package com.dfsek.terra.addons.terrascript.parser.lang.keywords.flow; -import com.dfsek.terra.addons.terrascript.parser.lang.Block; import com.dfsek.terra.addons.terrascript.api.ImplementationArguments; -import com.dfsek.terra.addons.terrascript.parser.lang.Keyword; -import com.dfsek.terra.addons.terrascript.api.lang.Variable; import com.dfsek.terra.addons.terrascript.api.Position; +import com.dfsek.terra.addons.terrascript.api.lang.Variable; +import com.dfsek.terra.addons.terrascript.parser.lang.Block; +import com.dfsek.terra.addons.terrascript.parser.lang.Keyword; import java.util.Map; diff --git a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/keywords/flow/ReturnKeyword.java b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/keywords/flow/ReturnKeyword.java index c57549481..ae9d160c4 100644 --- a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/keywords/flow/ReturnKeyword.java +++ b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/keywords/flow/ReturnKeyword.java @@ -1,10 +1,10 @@ package com.dfsek.terra.addons.terrascript.parser.lang.keywords.flow; -import com.dfsek.terra.addons.terrascript.parser.lang.Block; import com.dfsek.terra.addons.terrascript.api.ImplementationArguments; -import com.dfsek.terra.addons.terrascript.parser.lang.Keyword; -import com.dfsek.terra.addons.terrascript.api.lang.Variable; import com.dfsek.terra.addons.terrascript.api.Position; +import com.dfsek.terra.addons.terrascript.api.lang.Variable; +import com.dfsek.terra.addons.terrascript.parser.lang.Block; +import com.dfsek.terra.addons.terrascript.parser.lang.Keyword; import java.util.Map; diff --git a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/keywords/looplike/ForKeyword.java b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/keywords/looplike/ForKeyword.java index d7280d222..8bd27ffbf 100644 --- a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/keywords/looplike/ForKeyword.java +++ b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/keywords/looplike/ForKeyword.java @@ -1,12 +1,12 @@ package com.dfsek.terra.addons.terrascript.parser.lang.keywords.looplike; -import com.dfsek.terra.addons.terrascript.parser.lang.Block; import com.dfsek.terra.addons.terrascript.api.ImplementationArguments; +import com.dfsek.terra.addons.terrascript.api.Position; import com.dfsek.terra.addons.terrascript.api.lang.Item; -import com.dfsek.terra.addons.terrascript.parser.lang.Keyword; import com.dfsek.terra.addons.terrascript.api.lang.Returnable; import com.dfsek.terra.addons.terrascript.api.lang.Variable; -import com.dfsek.terra.addons.terrascript.api.Position; +import com.dfsek.terra.addons.terrascript.parser.lang.Block; +import com.dfsek.terra.addons.terrascript.parser.lang.Keyword; import java.util.Map; diff --git a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/keywords/looplike/IfKeyword.java b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/keywords/looplike/IfKeyword.java index 5042b0907..6844b0102 100644 --- a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/keywords/looplike/IfKeyword.java +++ b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/keywords/looplike/IfKeyword.java @@ -1,11 +1,11 @@ package com.dfsek.terra.addons.terrascript.parser.lang.keywords.looplike; -import com.dfsek.terra.addons.terrascript.parser.lang.Block; import com.dfsek.terra.addons.terrascript.api.ImplementationArguments; -import com.dfsek.terra.addons.terrascript.parser.lang.Keyword; +import com.dfsek.terra.addons.terrascript.api.Position; import com.dfsek.terra.addons.terrascript.api.lang.Returnable; import com.dfsek.terra.addons.terrascript.api.lang.Variable; -import com.dfsek.terra.addons.terrascript.api.Position; +import com.dfsek.terra.addons.terrascript.parser.lang.Block; +import com.dfsek.terra.addons.terrascript.parser.lang.Keyword; import org.jetbrains.annotations.Nullable; import java.util.List; diff --git a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/keywords/looplike/WhileKeyword.java b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/keywords/looplike/WhileKeyword.java index 0f3379cc6..470964964 100644 --- a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/keywords/looplike/WhileKeyword.java +++ b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/keywords/looplike/WhileKeyword.java @@ -1,11 +1,11 @@ package com.dfsek.terra.addons.terrascript.parser.lang.keywords.looplike; -import com.dfsek.terra.addons.terrascript.parser.lang.Block; import com.dfsek.terra.addons.terrascript.api.ImplementationArguments; -import com.dfsek.terra.addons.terrascript.parser.lang.Keyword; +import com.dfsek.terra.addons.terrascript.api.Position; import com.dfsek.terra.addons.terrascript.api.lang.Returnable; import com.dfsek.terra.addons.terrascript.api.lang.Variable; -import com.dfsek.terra.addons.terrascript.api.Position; +import com.dfsek.terra.addons.terrascript.parser.lang.Block; +import com.dfsek.terra.addons.terrascript.parser.lang.Keyword; import java.util.Map; 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 4f45eed02..3f2a1c5b8 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 @@ -1,9 +1,9 @@ package com.dfsek.terra.addons.terrascript.parser.lang.operations; import com.dfsek.terra.addons.terrascript.api.ImplementationArguments; +import com.dfsek.terra.addons.terrascript.api.Position; import com.dfsek.terra.addons.terrascript.api.lang.Returnable; import com.dfsek.terra.addons.terrascript.api.lang.Variable; -import com.dfsek.terra.addons.terrascript.api.Position; import java.util.Map; 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 4558ad879..83ff0cf72 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 @@ -1,7 +1,7 @@ package com.dfsek.terra.addons.terrascript.parser.lang.operations; -import com.dfsek.terra.addons.terrascript.api.lang.Returnable; import com.dfsek.terra.addons.terrascript.api.Position; +import com.dfsek.terra.addons.terrascript.api.lang.Returnable; 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/BooleanNotOperation.java b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/operations/BooleanNotOperation.java index bdde2fd4a..a90915233 100644 --- a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/operations/BooleanNotOperation.java +++ b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/operations/BooleanNotOperation.java @@ -1,7 +1,7 @@ package com.dfsek.terra.addons.terrascript.parser.lang.operations; -import com.dfsek.terra.addons.terrascript.api.lang.Returnable; import com.dfsek.terra.addons.terrascript.api.Position; +import com.dfsek.terra.addons.terrascript.api.lang.Returnable; public class BooleanNotOperation extends UnaryOperation { public BooleanNotOperation(Returnable input, Position position) { 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 9fcdd0142..03980c404 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 @@ -1,7 +1,7 @@ package com.dfsek.terra.addons.terrascript.parser.lang.operations; -import com.dfsek.terra.addons.terrascript.api.lang.Returnable; import com.dfsek.terra.addons.terrascript.api.Position; +import com.dfsek.terra.addons.terrascript.api.lang.Returnable; 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 50727261e..c496a8dd4 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 @@ -1,7 +1,7 @@ package com.dfsek.terra.addons.terrascript.parser.lang.operations; -import com.dfsek.terra.addons.terrascript.api.lang.Returnable; import com.dfsek.terra.addons.terrascript.api.Position; +import com.dfsek.terra.addons.terrascript.api.lang.Returnable; 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 ddb66753b..109107d3c 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 @@ -1,7 +1,7 @@ package com.dfsek.terra.addons.terrascript.parser.lang.operations; -import com.dfsek.terra.addons.terrascript.api.lang.Returnable; import com.dfsek.terra.addons.terrascript.api.Position; +import com.dfsek.terra.addons.terrascript.api.lang.Returnable; 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 9f5fe1e91..e4bf0f8db 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 @@ -1,7 +1,7 @@ package com.dfsek.terra.addons.terrascript.parser.lang.operations; -import com.dfsek.terra.addons.terrascript.api.lang.Returnable; import com.dfsek.terra.addons.terrascript.api.Position; +import com.dfsek.terra.addons.terrascript.api.lang.Returnable; 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 28a760c98..24fcb5d51 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 @@ -1,7 +1,7 @@ package com.dfsek.terra.addons.terrascript.parser.lang.operations; -import com.dfsek.terra.addons.terrascript.api.lang.Returnable; import com.dfsek.terra.addons.terrascript.api.Position; +import com.dfsek.terra.addons.terrascript.api.lang.Returnable; 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/NegationOperation.java b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/operations/NegationOperation.java index 285dfda11..07a1ffd24 100644 --- a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/operations/NegationOperation.java +++ b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/operations/NegationOperation.java @@ -1,7 +1,7 @@ package com.dfsek.terra.addons.terrascript.parser.lang.operations; -import com.dfsek.terra.addons.terrascript.api.lang.Returnable; import com.dfsek.terra.addons.terrascript.api.Position; +import com.dfsek.terra.addons.terrascript.api.lang.Returnable; public class NegationOperation extends UnaryOperation { public NegationOperation(Returnable input, 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 9740606e0..b420e13b6 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 @@ -1,7 +1,7 @@ package com.dfsek.terra.addons.terrascript.parser.lang.operations; -import com.dfsek.terra.addons.terrascript.api.lang.Returnable; import com.dfsek.terra.addons.terrascript.api.Position; +import com.dfsek.terra.addons.terrascript.api.lang.Returnable; 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 32dc1c0f6..af687e3a3 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 @@ -1,7 +1,7 @@ package com.dfsek.terra.addons.terrascript.parser.lang.operations; -import com.dfsek.terra.addons.terrascript.api.lang.Returnable; import com.dfsek.terra.addons.terrascript.api.Position; +import com.dfsek.terra.addons.terrascript.api.lang.Returnable; 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/UnaryOperation.java b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/operations/UnaryOperation.java index c66138693..9105c8155 100644 --- a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/operations/UnaryOperation.java +++ b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/operations/UnaryOperation.java @@ -1,9 +1,9 @@ package com.dfsek.terra.addons.terrascript.parser.lang.operations; import com.dfsek.terra.addons.terrascript.api.ImplementationArguments; +import com.dfsek.terra.addons.terrascript.api.Position; import com.dfsek.terra.addons.terrascript.api.lang.Returnable; import com.dfsek.terra.addons.terrascript.api.lang.Variable; -import com.dfsek.terra.addons.terrascript.api.Position; import java.util.Map; 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 b3df670dc..686e21a70 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 @@ -1,8 +1,8 @@ package com.dfsek.terra.addons.terrascript.parser.lang.operations.statements; +import com.dfsek.terra.addons.terrascript.api.Position; import com.dfsek.terra.addons.terrascript.api.lang.Returnable; import com.dfsek.terra.addons.terrascript.parser.lang.operations.BinaryOperation; -import com.dfsek.terra.addons.terrascript.api.Position; import net.jafama.FastMath; public class EqualsStatement extends BinaryOperation { 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 4d37033bf..a26b4a8c4 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 @@ -1,8 +1,8 @@ package com.dfsek.terra.addons.terrascript.parser.lang.operations.statements; +import com.dfsek.terra.addons.terrascript.api.Position; import com.dfsek.terra.addons.terrascript.api.lang.Returnable; import com.dfsek.terra.addons.terrascript.parser.lang.operations.BinaryOperation; -import com.dfsek.terra.addons.terrascript.api.Position; 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 56dc6a96f..f450b56c7 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 @@ -1,8 +1,8 @@ package com.dfsek.terra.addons.terrascript.parser.lang.operations.statements; +import com.dfsek.terra.addons.terrascript.api.Position; import com.dfsek.terra.addons.terrascript.api.lang.Returnable; import com.dfsek.terra.addons.terrascript.parser.lang.operations.BinaryOperation; -import com.dfsek.terra.addons.terrascript.api.Position; 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 6c25992b0..ca93ff04a 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 @@ -1,8 +1,8 @@ package com.dfsek.terra.addons.terrascript.parser.lang.operations.statements; +import com.dfsek.terra.addons.terrascript.api.Position; import com.dfsek.terra.addons.terrascript.api.lang.Returnable; import com.dfsek.terra.addons.terrascript.parser.lang.operations.BinaryOperation; -import com.dfsek.terra.addons.terrascript.api.Position; 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 e49212e32..7c10b63de 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 @@ -1,8 +1,8 @@ package com.dfsek.terra.addons.terrascript.parser.lang.operations.statements; +import com.dfsek.terra.addons.terrascript.api.Position; import com.dfsek.terra.addons.terrascript.api.lang.Returnable; import com.dfsek.terra.addons.terrascript.parser.lang.operations.BinaryOperation; -import com.dfsek.terra.addons.terrascript.api.Position; 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 d238f4a70..c7dbfb1d4 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 @@ -1,8 +1,8 @@ package com.dfsek.terra.addons.terrascript.parser.lang.operations.statements; +import com.dfsek.terra.addons.terrascript.api.Position; import com.dfsek.terra.addons.terrascript.api.lang.Returnable; import com.dfsek.terra.addons.terrascript.parser.lang.operations.BinaryOperation; -import com.dfsek.terra.addons.terrascript.api.Position; public class NotEqualsStatement extends BinaryOperation { public NotEqualsStatement(Returnable left, Returnable right, Position position) { diff --git a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/variables/Assignment.java b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/variables/Assignment.java index 11ddbacc4..b49d44c98 100644 --- a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/variables/Assignment.java +++ b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/variables/Assignment.java @@ -1,9 +1,9 @@ package com.dfsek.terra.addons.terrascript.parser.lang.variables; import com.dfsek.terra.addons.terrascript.api.ImplementationArguments; +import com.dfsek.terra.addons.terrascript.api.Position; import com.dfsek.terra.addons.terrascript.api.lang.Item; import com.dfsek.terra.addons.terrascript.api.lang.Returnable; -import com.dfsek.terra.addons.terrascript.api.Position; import com.dfsek.terra.addons.terrascript.api.lang.Variable; import java.util.Map; diff --git a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/variables/BooleanVariable.java b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/variables/BooleanVariable.java index 4bf7f64f9..b325d821d 100644 --- a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/variables/BooleanVariable.java +++ b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/variables/BooleanVariable.java @@ -1,7 +1,7 @@ package com.dfsek.terra.addons.terrascript.parser.lang.variables; -import com.dfsek.terra.addons.terrascript.api.lang.Returnable; import com.dfsek.terra.addons.terrascript.api.Position; +import com.dfsek.terra.addons.terrascript.api.lang.Returnable; import com.dfsek.terra.addons.terrascript.api.lang.Variable; public class BooleanVariable implements Variable { diff --git a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/variables/Declaration.java b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/variables/Declaration.java index 647a7afa4..f08304224 100644 --- a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/variables/Declaration.java +++ b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/variables/Declaration.java @@ -1,9 +1,9 @@ package com.dfsek.terra.addons.terrascript.parser.lang.variables; import com.dfsek.terra.addons.terrascript.api.ImplementationArguments; +import com.dfsek.terra.addons.terrascript.api.Position; import com.dfsek.terra.addons.terrascript.api.lang.Item; import com.dfsek.terra.addons.terrascript.api.lang.Returnable; -import com.dfsek.terra.addons.terrascript.api.Position; import com.dfsek.terra.addons.terrascript.api.lang.Variable; import java.util.Map; diff --git a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/variables/Getter.java b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/variables/Getter.java index 4d7b8b8a9..8804a2972 100644 --- a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/variables/Getter.java +++ b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/variables/Getter.java @@ -1,8 +1,8 @@ package com.dfsek.terra.addons.terrascript.parser.lang.variables; import com.dfsek.terra.addons.terrascript.api.ImplementationArguments; -import com.dfsek.terra.addons.terrascript.api.lang.Returnable; import com.dfsek.terra.addons.terrascript.api.Position; +import com.dfsek.terra.addons.terrascript.api.lang.Returnable; import com.dfsek.terra.addons.terrascript.api.lang.Variable; import java.util.Map; diff --git a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/variables/NumberVariable.java b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/variables/NumberVariable.java index 985d71b15..74a39b665 100644 --- a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/variables/NumberVariable.java +++ b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/variables/NumberVariable.java @@ -1,7 +1,7 @@ package com.dfsek.terra.addons.terrascript.parser.lang.variables; -import com.dfsek.terra.addons.terrascript.api.lang.Returnable; import com.dfsek.terra.addons.terrascript.api.Position; +import com.dfsek.terra.addons.terrascript.api.lang.Returnable; import com.dfsek.terra.addons.terrascript.api.lang.Variable; public class NumberVariable implements Variable { diff --git a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/variables/StringVariable.java b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/variables/StringVariable.java index cdefd79dc..48d3720d7 100644 --- a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/variables/StringVariable.java +++ b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/lang/variables/StringVariable.java @@ -1,7 +1,7 @@ package com.dfsek.terra.addons.terrascript.parser.lang.variables; -import com.dfsek.terra.addons.terrascript.api.lang.Returnable; import com.dfsek.terra.addons.terrascript.api.Position; +import com.dfsek.terra.addons.terrascript.api.lang.Returnable; import com.dfsek.terra.addons.terrascript.api.lang.Variable; public class StringVariable implements Variable { diff --git a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/StructureScript.java b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/StructureScript.java index 4e8085df9..08dd34cfe 100644 --- a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/StructureScript.java +++ b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/StructureScript.java @@ -1,12 +1,12 @@ package com.dfsek.terra.addons.terrascript.script; +import com.dfsek.terra.addons.terrascript.api.FunctionBuilder; +import com.dfsek.terra.addons.terrascript.api.exception.ParseException; +import com.dfsek.terra.addons.terrascript.api.lang.Returnable; import com.dfsek.terra.addons.terrascript.buffer.DirectBuffer; import com.dfsek.terra.addons.terrascript.buffer.StructureBuffer; import com.dfsek.terra.addons.terrascript.parser.Parser; -import com.dfsek.terra.addons.terrascript.api.ParseException; import com.dfsek.terra.addons.terrascript.parser.lang.Block; -import com.dfsek.terra.addons.terrascript.api.lang.Returnable; -import com.dfsek.terra.addons.terrascript.api.FunctionBuilder; import com.dfsek.terra.addons.terrascript.script.builders.BinaryNumberFunctionBuilder; import com.dfsek.terra.addons.terrascript.script.builders.BiomeFunctionBuilder; import com.dfsek.terra.addons.terrascript.script.builders.BlockFunctionBuilder; diff --git a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/builders/BinaryNumberFunctionBuilder.java b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/builders/BinaryNumberFunctionBuilder.java index bee8117e1..a584a635b 100644 --- a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/builders/BinaryNumberFunctionBuilder.java +++ b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/builders/BinaryNumberFunctionBuilder.java @@ -1,11 +1,11 @@ package com.dfsek.terra.addons.terrascript.script.builders; -import com.dfsek.terra.addons.terrascript.api.ImplementationArguments; -import com.dfsek.terra.addons.terrascript.api.lang.Returnable; import com.dfsek.terra.addons.terrascript.api.Function; import com.dfsek.terra.addons.terrascript.api.FunctionBuilder; -import com.dfsek.terra.addons.terrascript.api.lang.Variable; +import com.dfsek.terra.addons.terrascript.api.ImplementationArguments; import com.dfsek.terra.addons.terrascript.api.Position; +import com.dfsek.terra.addons.terrascript.api.lang.Returnable; +import com.dfsek.terra.addons.terrascript.api.lang.Variable; import java.util.List; import java.util.Map; diff --git a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/builders/BiomeFunctionBuilder.java b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/builders/BiomeFunctionBuilder.java index 096f40966..b7b814e73 100644 --- a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/builders/BiomeFunctionBuilder.java +++ b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/builders/BiomeFunctionBuilder.java @@ -1,9 +1,9 @@ package com.dfsek.terra.addons.terrascript.script.builders; -import com.dfsek.terra.addons.terrascript.api.lang.Returnable; import com.dfsek.terra.addons.terrascript.api.FunctionBuilder; -import com.dfsek.terra.addons.terrascript.script.functions.BiomeFunction; import com.dfsek.terra.addons.terrascript.api.Position; +import com.dfsek.terra.addons.terrascript.api.lang.Returnable; +import com.dfsek.terra.addons.terrascript.script.functions.BiomeFunction; import com.dfsek.terra.api.TerraPlugin; import java.util.List; diff --git a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/builders/BlockFunctionBuilder.java b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/builders/BlockFunctionBuilder.java index 312bc3e8a..bf8f14fa8 100644 --- a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/builders/BlockFunctionBuilder.java +++ b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/builders/BlockFunctionBuilder.java @@ -1,12 +1,12 @@ package com.dfsek.terra.addons.terrascript.script.builders; -import com.dfsek.terra.addons.terrascript.api.ParseException; +import com.dfsek.terra.addons.terrascript.api.FunctionBuilder; +import com.dfsek.terra.addons.terrascript.api.Position; +import com.dfsek.terra.addons.terrascript.api.exception.ParseException; import com.dfsek.terra.addons.terrascript.api.lang.Returnable; import com.dfsek.terra.addons.terrascript.parser.lang.constants.BooleanConstant; import com.dfsek.terra.addons.terrascript.parser.lang.constants.StringConstant; -import com.dfsek.terra.addons.terrascript.api.FunctionBuilder; import com.dfsek.terra.addons.terrascript.script.functions.BlockFunction; -import com.dfsek.terra.addons.terrascript.api.Position; import com.dfsek.terra.api.TerraPlugin; import java.util.List; diff --git a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/builders/CheckBlockFunctionBuilder.java b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/builders/CheckBlockFunctionBuilder.java index aefb1ee52..f5cc5f751 100644 --- a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/builders/CheckBlockFunctionBuilder.java +++ b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/builders/CheckBlockFunctionBuilder.java @@ -1,9 +1,9 @@ package com.dfsek.terra.addons.terrascript.script.builders; -import com.dfsek.terra.addons.terrascript.api.lang.Returnable; import com.dfsek.terra.addons.terrascript.api.FunctionBuilder; -import com.dfsek.terra.addons.terrascript.script.functions.CheckBlockFunction; import com.dfsek.terra.addons.terrascript.api.Position; +import com.dfsek.terra.addons.terrascript.api.lang.Returnable; +import com.dfsek.terra.addons.terrascript.script.functions.CheckBlockFunction; import java.util.List; diff --git a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/builders/CheckFunctionBuilder.java b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/builders/CheckFunctionBuilder.java index ca2adedaf..cb199ac6e 100644 --- a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/builders/CheckFunctionBuilder.java +++ b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/builders/CheckFunctionBuilder.java @@ -1,10 +1,10 @@ package com.dfsek.terra.addons.terrascript.script.builders; -import com.dfsek.terra.addons.terrascript.api.ParseException; -import com.dfsek.terra.addons.terrascript.api.lang.Returnable; import com.dfsek.terra.addons.terrascript.api.FunctionBuilder; -import com.dfsek.terra.addons.terrascript.script.functions.CheckFunction; import com.dfsek.terra.addons.terrascript.api.Position; +import com.dfsek.terra.addons.terrascript.api.exception.ParseException; +import com.dfsek.terra.addons.terrascript.api.lang.Returnable; +import com.dfsek.terra.addons.terrascript.script.functions.CheckFunction; import com.dfsek.terra.api.TerraPlugin; import java.util.List; diff --git a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/builders/EntityFunctionBuilder.java b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/builders/EntityFunctionBuilder.java index 2a9177c2f..e5d2a4353 100644 --- a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/builders/EntityFunctionBuilder.java +++ b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/builders/EntityFunctionBuilder.java @@ -1,10 +1,10 @@ package com.dfsek.terra.addons.terrascript.script.builders; -import com.dfsek.terra.addons.terrascript.api.ParseException; -import com.dfsek.terra.addons.terrascript.api.lang.Returnable; import com.dfsek.terra.addons.terrascript.api.FunctionBuilder; -import com.dfsek.terra.addons.terrascript.script.functions.EntityFunction; import com.dfsek.terra.addons.terrascript.api.Position; +import com.dfsek.terra.addons.terrascript.api.exception.ParseException; +import com.dfsek.terra.addons.terrascript.api.lang.Returnable; +import com.dfsek.terra.addons.terrascript.script.functions.EntityFunction; import com.dfsek.terra.api.TerraPlugin; import java.util.List; diff --git a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/builders/GetMarkFunctionBuilder.java b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/builders/GetMarkFunctionBuilder.java index af3e5a550..128094676 100644 --- a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/builders/GetMarkFunctionBuilder.java +++ b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/builders/GetMarkFunctionBuilder.java @@ -1,9 +1,9 @@ package com.dfsek.terra.addons.terrascript.script.builders; -import com.dfsek.terra.addons.terrascript.api.lang.Returnable; import com.dfsek.terra.addons.terrascript.api.FunctionBuilder; -import com.dfsek.terra.addons.terrascript.script.functions.GetMarkFunction; import com.dfsek.terra.addons.terrascript.api.Position; +import com.dfsek.terra.addons.terrascript.api.lang.Returnable; +import com.dfsek.terra.addons.terrascript.script.functions.GetMarkFunction; import java.util.List; diff --git a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/builders/LootFunctionBuilder.java b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/builders/LootFunctionBuilder.java index b7ca27303..e4f354e31 100644 --- a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/builders/LootFunctionBuilder.java +++ b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/builders/LootFunctionBuilder.java @@ -1,10 +1,10 @@ package com.dfsek.terra.addons.terrascript.script.builders; -import com.dfsek.terra.addons.terrascript.api.lang.Returnable; import com.dfsek.terra.addons.terrascript.api.FunctionBuilder; +import com.dfsek.terra.addons.terrascript.api.Position; +import com.dfsek.terra.addons.terrascript.api.lang.Returnable; import com.dfsek.terra.addons.terrascript.script.StructureScript; import com.dfsek.terra.addons.terrascript.script.functions.LootFunction; -import com.dfsek.terra.addons.terrascript.api.Position; import com.dfsek.terra.api.TerraPlugin; import com.dfsek.terra.api.registry.Registry; import com.dfsek.terra.api.structure.LootTable; diff --git a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/builders/PullFunctionBuilder.java b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/builders/PullFunctionBuilder.java index a16f78df8..2c65dd9bf 100644 --- a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/builders/PullFunctionBuilder.java +++ b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/builders/PullFunctionBuilder.java @@ -1,10 +1,10 @@ package com.dfsek.terra.addons.terrascript.script.builders; -import com.dfsek.terra.addons.terrascript.api.ParseException; -import com.dfsek.terra.addons.terrascript.api.lang.Returnable; import com.dfsek.terra.addons.terrascript.api.FunctionBuilder; -import com.dfsek.terra.addons.terrascript.script.functions.PullFunction; import com.dfsek.terra.addons.terrascript.api.Position; +import com.dfsek.terra.addons.terrascript.api.exception.ParseException; +import com.dfsek.terra.addons.terrascript.api.lang.Returnable; +import com.dfsek.terra.addons.terrascript.script.functions.PullFunction; import com.dfsek.terra.api.TerraPlugin; import java.util.List; diff --git a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/builders/RandomFunctionBuilder.java b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/builders/RandomFunctionBuilder.java index a7584faab..fc52a9292 100644 --- a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/builders/RandomFunctionBuilder.java +++ b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/builders/RandomFunctionBuilder.java @@ -1,10 +1,10 @@ package com.dfsek.terra.addons.terrascript.script.builders; -import com.dfsek.terra.addons.terrascript.api.ParseException; -import com.dfsek.terra.addons.terrascript.api.lang.Returnable; import com.dfsek.terra.addons.terrascript.api.FunctionBuilder; -import com.dfsek.terra.addons.terrascript.script.functions.RandomFunction; import com.dfsek.terra.addons.terrascript.api.Position; +import com.dfsek.terra.addons.terrascript.api.exception.ParseException; +import com.dfsek.terra.addons.terrascript.api.lang.Returnable; +import com.dfsek.terra.addons.terrascript.script.functions.RandomFunction; import java.util.List; diff --git a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/builders/RecursionsFunctionBuilder.java b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/builders/RecursionsFunctionBuilder.java index da630cc16..c4ad509fe 100644 --- a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/builders/RecursionsFunctionBuilder.java +++ b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/builders/RecursionsFunctionBuilder.java @@ -1,10 +1,10 @@ package com.dfsek.terra.addons.terrascript.script.builders; -import com.dfsek.terra.addons.terrascript.api.ParseException; -import com.dfsek.terra.addons.terrascript.api.lang.Returnable; import com.dfsek.terra.addons.terrascript.api.FunctionBuilder; -import com.dfsek.terra.addons.terrascript.script.functions.RecursionsFunction; import com.dfsek.terra.addons.terrascript.api.Position; +import com.dfsek.terra.addons.terrascript.api.exception.ParseException; +import com.dfsek.terra.addons.terrascript.api.lang.Returnable; +import com.dfsek.terra.addons.terrascript.script.functions.RecursionsFunction; import java.util.List; diff --git a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/builders/SetMarkFunctionBuilder.java b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/builders/SetMarkFunctionBuilder.java index 788e56bde..c8abd46df 100644 --- a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/builders/SetMarkFunctionBuilder.java +++ b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/builders/SetMarkFunctionBuilder.java @@ -1,10 +1,10 @@ package com.dfsek.terra.addons.terrascript.script.builders; -import com.dfsek.terra.addons.terrascript.api.ParseException; -import com.dfsek.terra.addons.terrascript.api.lang.Returnable; import com.dfsek.terra.addons.terrascript.api.FunctionBuilder; -import com.dfsek.terra.addons.terrascript.script.functions.SetMarkFunction; import com.dfsek.terra.addons.terrascript.api.Position; +import com.dfsek.terra.addons.terrascript.api.exception.ParseException; +import com.dfsek.terra.addons.terrascript.api.lang.Returnable; +import com.dfsek.terra.addons.terrascript.script.functions.SetMarkFunction; import java.util.List; diff --git a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/builders/StateFunctionBuilder.java b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/builders/StateFunctionBuilder.java index 3c04b3382..d69c1fc3a 100644 --- a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/builders/StateFunctionBuilder.java +++ b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/builders/StateFunctionBuilder.java @@ -1,10 +1,10 @@ package com.dfsek.terra.addons.terrascript.script.builders; -import com.dfsek.terra.addons.terrascript.api.ParseException; -import com.dfsek.terra.addons.terrascript.api.lang.Returnable; import com.dfsek.terra.addons.terrascript.api.FunctionBuilder; -import com.dfsek.terra.addons.terrascript.script.functions.StateFunction; import com.dfsek.terra.addons.terrascript.api.Position; +import com.dfsek.terra.addons.terrascript.api.exception.ParseException; +import com.dfsek.terra.addons.terrascript.api.lang.Returnable; +import com.dfsek.terra.addons.terrascript.script.functions.StateFunction; import com.dfsek.terra.api.TerraPlugin; import java.util.List; diff --git a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/builders/StructureFunctionBuilder.java b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/builders/StructureFunctionBuilder.java index bbf85f75a..db90bd9a2 100644 --- a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/builders/StructureFunctionBuilder.java +++ b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/builders/StructureFunctionBuilder.java @@ -1,10 +1,10 @@ package com.dfsek.terra.addons.terrascript.script.builders; -import com.dfsek.terra.addons.terrascript.api.ParseException; -import com.dfsek.terra.addons.terrascript.api.lang.Returnable; import com.dfsek.terra.addons.terrascript.api.FunctionBuilder; -import com.dfsek.terra.addons.terrascript.script.functions.StructureFunction; import com.dfsek.terra.addons.terrascript.api.Position; +import com.dfsek.terra.addons.terrascript.api.exception.ParseException; +import com.dfsek.terra.addons.terrascript.api.lang.Returnable; +import com.dfsek.terra.addons.terrascript.script.functions.StructureFunction; import com.dfsek.terra.api.TerraPlugin; import com.dfsek.terra.api.registry.Registry; import com.dfsek.terra.api.structure.Structure; diff --git a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/builders/UnaryBooleanFunctionBuilder.java b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/builders/UnaryBooleanFunctionBuilder.java index 13f6182d2..ebdf37733 100644 --- a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/builders/UnaryBooleanFunctionBuilder.java +++ b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/builders/UnaryBooleanFunctionBuilder.java @@ -1,12 +1,12 @@ package com.dfsek.terra.addons.terrascript.script.builders; -import com.dfsek.terra.addons.terrascript.api.ImplementationArguments; -import com.dfsek.terra.addons.terrascript.api.lang.Returnable; import com.dfsek.terra.addons.terrascript.api.Function; import com.dfsek.terra.addons.terrascript.api.FunctionBuilder; +import com.dfsek.terra.addons.terrascript.api.ImplementationArguments; +import com.dfsek.terra.addons.terrascript.api.Position; +import com.dfsek.terra.addons.terrascript.api.lang.Returnable; import com.dfsek.terra.addons.terrascript.api.lang.Variable; import com.dfsek.terra.addons.terrascript.script.TerraImplementationArguments; -import com.dfsek.terra.addons.terrascript.api.Position; import java.util.List; import java.util.Map; diff --git a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/builders/UnaryNumberFunctionBuilder.java b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/builders/UnaryNumberFunctionBuilder.java index 887472994..76510b0b6 100644 --- a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/builders/UnaryNumberFunctionBuilder.java +++ b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/builders/UnaryNumberFunctionBuilder.java @@ -1,11 +1,11 @@ package com.dfsek.terra.addons.terrascript.script.builders; -import com.dfsek.terra.addons.terrascript.api.ImplementationArguments; -import com.dfsek.terra.addons.terrascript.api.lang.Returnable; import com.dfsek.terra.addons.terrascript.api.Function; import com.dfsek.terra.addons.terrascript.api.FunctionBuilder; -import com.dfsek.terra.addons.terrascript.api.lang.Variable; +import com.dfsek.terra.addons.terrascript.api.ImplementationArguments; import com.dfsek.terra.addons.terrascript.api.Position; +import com.dfsek.terra.addons.terrascript.api.lang.Returnable; +import com.dfsek.terra.addons.terrascript.api.lang.Variable; import java.util.List; import java.util.Map; diff --git a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/builders/UnaryStringFunctionBuilder.java b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/builders/UnaryStringFunctionBuilder.java index fc7e6faee..174ab6dec 100644 --- a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/builders/UnaryStringFunctionBuilder.java +++ b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/builders/UnaryStringFunctionBuilder.java @@ -1,11 +1,11 @@ package com.dfsek.terra.addons.terrascript.script.builders; -import com.dfsek.terra.addons.terrascript.api.ImplementationArguments; -import com.dfsek.terra.addons.terrascript.api.lang.Returnable; import com.dfsek.terra.addons.terrascript.api.Function; import com.dfsek.terra.addons.terrascript.api.FunctionBuilder; -import com.dfsek.terra.addons.terrascript.api.lang.Variable; +import com.dfsek.terra.addons.terrascript.api.ImplementationArguments; import com.dfsek.terra.addons.terrascript.api.Position; +import com.dfsek.terra.addons.terrascript.api.lang.Returnable; +import com.dfsek.terra.addons.terrascript.api.lang.Variable; import java.util.List; import java.util.Map; diff --git a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/builders/ZeroArgFunctionBuilder.java b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/builders/ZeroArgFunctionBuilder.java index 64922754c..36e718205 100644 --- a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/builders/ZeroArgFunctionBuilder.java +++ b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/builders/ZeroArgFunctionBuilder.java @@ -1,12 +1,12 @@ package com.dfsek.terra.addons.terrascript.script.builders; -import com.dfsek.terra.addons.terrascript.api.ImplementationArguments; -import com.dfsek.terra.addons.terrascript.api.lang.Returnable; import com.dfsek.terra.addons.terrascript.api.Function; import com.dfsek.terra.addons.terrascript.api.FunctionBuilder; +import com.dfsek.terra.addons.terrascript.api.ImplementationArguments; +import com.dfsek.terra.addons.terrascript.api.Position; +import com.dfsek.terra.addons.terrascript.api.lang.Returnable; import com.dfsek.terra.addons.terrascript.api.lang.Variable; import com.dfsek.terra.addons.terrascript.script.TerraImplementationArguments; -import com.dfsek.terra.addons.terrascript.api.Position; import java.util.List; import java.util.Map; diff --git a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/functions/BiomeFunction.java b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/functions/BiomeFunction.java index 277b7d36b..39bed1e39 100644 --- a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/functions/BiomeFunction.java +++ b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/functions/BiomeFunction.java @@ -1,11 +1,11 @@ package com.dfsek.terra.addons.terrascript.script.functions; -import com.dfsek.terra.addons.terrascript.api.ImplementationArguments; -import com.dfsek.terra.addons.terrascript.api.lang.Returnable; import com.dfsek.terra.addons.terrascript.api.Function; +import com.dfsek.terra.addons.terrascript.api.ImplementationArguments; +import com.dfsek.terra.addons.terrascript.api.Position; +import com.dfsek.terra.addons.terrascript.api.lang.Returnable; import com.dfsek.terra.addons.terrascript.api.lang.Variable; import com.dfsek.terra.addons.terrascript.script.TerraImplementationArguments; -import com.dfsek.terra.addons.terrascript.api.Position; import com.dfsek.terra.api.TerraPlugin; import com.dfsek.terra.api.util.RotationUtil; import com.dfsek.terra.api.vector.Vector2; diff --git a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/functions/BlockFunction.java b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/functions/BlockFunction.java index 36d48535e..23bb67fc8 100644 --- a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/functions/BlockFunction.java +++ b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/functions/BlockFunction.java @@ -1,13 +1,13 @@ package com.dfsek.terra.addons.terrascript.script.functions; -import com.dfsek.terra.addons.terrascript.buffer.items.BufferedBlock; -import com.dfsek.terra.addons.terrascript.api.ImplementationArguments; -import com.dfsek.terra.addons.terrascript.api.lang.Returnable; -import com.dfsek.terra.addons.terrascript.parser.lang.constants.StringConstant; import com.dfsek.terra.addons.terrascript.api.Function; -import com.dfsek.terra.addons.terrascript.api.lang.Variable; -import com.dfsek.terra.addons.terrascript.script.TerraImplementationArguments; +import com.dfsek.terra.addons.terrascript.api.ImplementationArguments; import com.dfsek.terra.addons.terrascript.api.Position; +import com.dfsek.terra.addons.terrascript.api.lang.Returnable; +import com.dfsek.terra.addons.terrascript.api.lang.Variable; +import com.dfsek.terra.addons.terrascript.buffer.items.BufferedBlock; +import com.dfsek.terra.addons.terrascript.parser.lang.constants.StringConstant; +import com.dfsek.terra.addons.terrascript.script.TerraImplementationArguments; import com.dfsek.terra.api.TerraPlugin; import com.dfsek.terra.api.block.state.BlockState; import com.dfsek.terra.api.util.RotationUtil; @@ -20,10 +20,9 @@ import java.util.Map; public class BlockFunction implements Function { protected final Returnable x, y, z; - - private final Map data = new HashMap<>(); protected final Returnable blockData; protected final TerraPlugin main; + private final Map data = new HashMap<>(); private final Returnable overwrite; private final Position position; @@ -70,6 +69,7 @@ public class BlockFunction implements Function { public static class Constant extends BlockFunction { private final BlockState state; + public Constant(Returnable x, Returnable y, Returnable z, StringConstant blockData, Returnable overwrite, TerraPlugin main, Position position) { super(x, y, z, blockData, overwrite, main, position); this.state = main.getWorldHandle().createBlockData(blockData.getConstant()); diff --git a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/functions/CheckBlockFunction.java b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/functions/CheckBlockFunction.java index 43fd7bf0a..351d4b3a6 100644 --- a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/functions/CheckBlockFunction.java +++ b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/functions/CheckBlockFunction.java @@ -1,11 +1,11 @@ package com.dfsek.terra.addons.terrascript.script.functions; -import com.dfsek.terra.addons.terrascript.api.ImplementationArguments; -import com.dfsek.terra.addons.terrascript.api.lang.Returnable; import com.dfsek.terra.addons.terrascript.api.Function; +import com.dfsek.terra.addons.terrascript.api.ImplementationArguments; +import com.dfsek.terra.addons.terrascript.api.Position; +import com.dfsek.terra.addons.terrascript.api.lang.Returnable; import com.dfsek.terra.addons.terrascript.api.lang.Variable; import com.dfsek.terra.addons.terrascript.script.TerraImplementationArguments; -import com.dfsek.terra.addons.terrascript.api.Position; import com.dfsek.terra.api.util.RotationUtil; import com.dfsek.terra.api.vector.Vector2; import com.dfsek.terra.api.vector.Vector3; diff --git a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/functions/CheckFunction.java b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/functions/CheckFunction.java index ed38c99b6..d613969bb 100644 --- a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/functions/CheckFunction.java +++ b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/functions/CheckFunction.java @@ -1,11 +1,11 @@ package com.dfsek.terra.addons.terrascript.script.functions; -import com.dfsek.terra.addons.terrascript.api.ImplementationArguments; -import com.dfsek.terra.addons.terrascript.api.lang.Returnable; import com.dfsek.terra.addons.terrascript.api.Function; +import com.dfsek.terra.addons.terrascript.api.ImplementationArguments; +import com.dfsek.terra.addons.terrascript.api.Position; +import com.dfsek.terra.addons.terrascript.api.lang.Returnable; import com.dfsek.terra.addons.terrascript.api.lang.Variable; import com.dfsek.terra.addons.terrascript.script.TerraImplementationArguments; -import com.dfsek.terra.addons.terrascript.api.Position; import com.dfsek.terra.api.TerraPlugin; import com.dfsek.terra.api.util.RotationUtil; import com.dfsek.terra.api.vector.Vector2; @@ -57,7 +57,8 @@ public class CheckFunction implements Function { //BiomeProvider provider = tw.getBiomeProvider(); //TerraBiome b = provider.getBiome(vector.getBlockX(), vector.getBlockZ()); - /*if(vector.getY() > c.getSeaLevel())*/ return "AIR"; // Above sea level + /*if(vector.getY() > c.getSeaLevel())*/ + return "AIR"; // Above sea level //return "OCEAN"; // Below sea level } 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 3b2b5ba49..b42109621 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 @@ -1,14 +1,14 @@ package com.dfsek.terra.addons.terrascript.script.functions; -import com.dfsek.terra.addons.terrascript.buffer.items.BufferedEntity; -import com.dfsek.terra.addons.terrascript.api.ParseException; -import com.dfsek.terra.addons.terrascript.api.ImplementationArguments; -import com.dfsek.terra.addons.terrascript.api.lang.Returnable; -import com.dfsek.terra.addons.terrascript.parser.lang.constants.ConstantExpression; import com.dfsek.terra.addons.terrascript.api.Function; -import com.dfsek.terra.addons.terrascript.api.lang.Variable; -import com.dfsek.terra.addons.terrascript.script.TerraImplementationArguments; +import com.dfsek.terra.addons.terrascript.api.ImplementationArguments; import com.dfsek.terra.addons.terrascript.api.Position; +import com.dfsek.terra.addons.terrascript.api.exception.ParseException; +import com.dfsek.terra.addons.terrascript.api.lang.Returnable; +import com.dfsek.terra.addons.terrascript.api.lang.Variable; +import com.dfsek.terra.addons.terrascript.buffer.items.BufferedEntity; +import com.dfsek.terra.addons.terrascript.parser.lang.constants.ConstantExpression; +import com.dfsek.terra.addons.terrascript.script.TerraImplementationArguments; import com.dfsek.terra.api.TerraPlugin; import com.dfsek.terra.api.entity.EntityType; import com.dfsek.terra.api.util.RotationUtil; 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 9d138b78d..967ce7c88 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 @@ -1,11 +1,11 @@ package com.dfsek.terra.addons.terrascript.script.functions; -import com.dfsek.terra.addons.terrascript.api.ImplementationArguments; -import com.dfsek.terra.addons.terrascript.api.lang.Returnable; import com.dfsek.terra.addons.terrascript.api.Function; +import com.dfsek.terra.addons.terrascript.api.ImplementationArguments; +import com.dfsek.terra.addons.terrascript.api.Position; +import com.dfsek.terra.addons.terrascript.api.lang.Returnable; import com.dfsek.terra.addons.terrascript.api.lang.Variable; import com.dfsek.terra.addons.terrascript.script.TerraImplementationArguments; -import com.dfsek.terra.addons.terrascript.api.Position; import com.dfsek.terra.api.util.RotationUtil; import com.dfsek.terra.api.vector.Vector2; import com.dfsek.terra.api.vector.Vector3; diff --git a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/functions/LootFunction.java b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/functions/LootFunction.java index 1477f9a31..c7d7bdb35 100644 --- a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/functions/LootFunction.java +++ b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/functions/LootFunction.java @@ -1,13 +1,13 @@ package com.dfsek.terra.addons.terrascript.script.functions; -import com.dfsek.terra.addons.terrascript.buffer.items.BufferedLootApplication; -import com.dfsek.terra.addons.terrascript.api.ImplementationArguments; -import com.dfsek.terra.addons.terrascript.api.lang.Returnable; import com.dfsek.terra.addons.terrascript.api.Function; +import com.dfsek.terra.addons.terrascript.api.ImplementationArguments; +import com.dfsek.terra.addons.terrascript.api.Position; +import com.dfsek.terra.addons.terrascript.api.lang.Returnable; import com.dfsek.terra.addons.terrascript.api.lang.Variable; +import com.dfsek.terra.addons.terrascript.buffer.items.BufferedLootApplication; import com.dfsek.terra.addons.terrascript.script.StructureScript; import com.dfsek.terra.addons.terrascript.script.TerraImplementationArguments; -import com.dfsek.terra.addons.terrascript.api.Position; import com.dfsek.terra.api.TerraPlugin; import com.dfsek.terra.api.registry.Registry; import com.dfsek.terra.api.structure.LootTable; diff --git a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/functions/PullFunction.java b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/functions/PullFunction.java index 1c1ec641d..eace8de3b 100644 --- a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/functions/PullFunction.java +++ b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/functions/PullFunction.java @@ -1,14 +1,14 @@ package com.dfsek.terra.addons.terrascript.script.functions; -import com.dfsek.terra.addons.terrascript.buffer.items.BufferedPulledBlock; -import com.dfsek.terra.addons.terrascript.api.ParseException; -import com.dfsek.terra.addons.terrascript.api.ImplementationArguments; -import com.dfsek.terra.addons.terrascript.api.lang.Returnable; -import com.dfsek.terra.addons.terrascript.parser.lang.constants.ConstantExpression; import com.dfsek.terra.addons.terrascript.api.Function; -import com.dfsek.terra.addons.terrascript.api.lang.Variable; -import com.dfsek.terra.addons.terrascript.script.TerraImplementationArguments; +import com.dfsek.terra.addons.terrascript.api.ImplementationArguments; import com.dfsek.terra.addons.terrascript.api.Position; +import com.dfsek.terra.addons.terrascript.api.exception.ParseException; +import com.dfsek.terra.addons.terrascript.api.lang.Returnable; +import com.dfsek.terra.addons.terrascript.api.lang.Variable; +import com.dfsek.terra.addons.terrascript.buffer.items.BufferedPulledBlock; +import com.dfsek.terra.addons.terrascript.parser.lang.constants.ConstantExpression; +import com.dfsek.terra.addons.terrascript.script.TerraImplementationArguments; import com.dfsek.terra.api.TerraPlugin; import com.dfsek.terra.api.block.state.BlockState; import com.dfsek.terra.api.util.RotationUtil; diff --git a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/functions/RandomFunction.java b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/functions/RandomFunction.java index b6259c0a6..e2d754c6d 100644 --- a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/functions/RandomFunction.java +++ b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/functions/RandomFunction.java @@ -1,11 +1,11 @@ package com.dfsek.terra.addons.terrascript.script.functions; -import com.dfsek.terra.addons.terrascript.api.ImplementationArguments; -import com.dfsek.terra.addons.terrascript.api.lang.Returnable; import com.dfsek.terra.addons.terrascript.api.Function; +import com.dfsek.terra.addons.terrascript.api.ImplementationArguments; +import com.dfsek.terra.addons.terrascript.api.Position; +import com.dfsek.terra.addons.terrascript.api.lang.Returnable; import com.dfsek.terra.addons.terrascript.api.lang.Variable; import com.dfsek.terra.addons.terrascript.script.TerraImplementationArguments; -import com.dfsek.terra.addons.terrascript.api.Position; import java.util.Map; diff --git a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/functions/RecursionsFunction.java b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/functions/RecursionsFunction.java index 549390fe2..5819350e3 100644 --- a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/functions/RecursionsFunction.java +++ b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/functions/RecursionsFunction.java @@ -1,10 +1,10 @@ package com.dfsek.terra.addons.terrascript.script.functions; -import com.dfsek.terra.addons.terrascript.api.ImplementationArguments; import com.dfsek.terra.addons.terrascript.api.Function; +import com.dfsek.terra.addons.terrascript.api.ImplementationArguments; +import com.dfsek.terra.addons.terrascript.api.Position; import com.dfsek.terra.addons.terrascript.api.lang.Variable; import com.dfsek.terra.addons.terrascript.script.TerraImplementationArguments; -import com.dfsek.terra.addons.terrascript.api.Position; import java.util.Map; 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 7322f84e2..3ab0c0d06 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 @@ -1,11 +1,11 @@ package com.dfsek.terra.addons.terrascript.script.functions; -import com.dfsek.terra.addons.terrascript.api.ImplementationArguments; -import com.dfsek.terra.addons.terrascript.api.lang.Returnable; import com.dfsek.terra.addons.terrascript.api.Function; +import com.dfsek.terra.addons.terrascript.api.ImplementationArguments; +import com.dfsek.terra.addons.terrascript.api.Position; +import com.dfsek.terra.addons.terrascript.api.lang.Returnable; import com.dfsek.terra.addons.terrascript.api.lang.Variable; import com.dfsek.terra.addons.terrascript.script.TerraImplementationArguments; -import com.dfsek.terra.addons.terrascript.api.Position; import com.dfsek.terra.api.util.RotationUtil; import com.dfsek.terra.api.vector.Vector2; import com.dfsek.terra.api.vector.Vector3; 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 95e2ecb21..8ac1f2666 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 @@ -1,12 +1,12 @@ package com.dfsek.terra.addons.terrascript.script.functions; -import com.dfsek.terra.addons.terrascript.buffer.items.BufferedStateManipulator; -import com.dfsek.terra.addons.terrascript.api.ImplementationArguments; -import com.dfsek.terra.addons.terrascript.api.lang.Returnable; import com.dfsek.terra.addons.terrascript.api.Function; -import com.dfsek.terra.addons.terrascript.api.lang.Variable; -import com.dfsek.terra.addons.terrascript.script.TerraImplementationArguments; +import com.dfsek.terra.addons.terrascript.api.ImplementationArguments; import com.dfsek.terra.addons.terrascript.api.Position; +import com.dfsek.terra.addons.terrascript.api.lang.Returnable; +import com.dfsek.terra.addons.terrascript.api.lang.Variable; +import com.dfsek.terra.addons.terrascript.buffer.items.BufferedStateManipulator; +import com.dfsek.terra.addons.terrascript.script.TerraImplementationArguments; import com.dfsek.terra.api.TerraPlugin; import com.dfsek.terra.api.util.RotationUtil; import com.dfsek.terra.api.vector.Vector2; 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 266ba103c..2e660c20c 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 @@ -1,12 +1,12 @@ package com.dfsek.terra.addons.terrascript.script.functions; -import com.dfsek.terra.addons.terrascript.buffer.IntermediateBuffer; -import com.dfsek.terra.addons.terrascript.api.ImplementationArguments; -import com.dfsek.terra.addons.terrascript.api.lang.Returnable; import com.dfsek.terra.addons.terrascript.api.Function; -import com.dfsek.terra.addons.terrascript.api.lang.Variable; -import com.dfsek.terra.addons.terrascript.script.TerraImplementationArguments; +import com.dfsek.terra.addons.terrascript.api.ImplementationArguments; import com.dfsek.terra.addons.terrascript.api.Position; +import com.dfsek.terra.addons.terrascript.api.lang.Returnable; +import com.dfsek.terra.addons.terrascript.api.lang.Variable; +import com.dfsek.terra.addons.terrascript.buffer.IntermediateBuffer; +import com.dfsek.terra.addons.terrascript.script.TerraImplementationArguments; import com.dfsek.terra.api.TerraPlugin; import com.dfsek.terra.api.registry.Registry; import com.dfsek.terra.api.structure.Structure; diff --git a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/tokenizer/Tokenizer.java b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/tokenizer/Tokenizer.java index b562d0edc..702a22387 100644 --- a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/tokenizer/Tokenizer.java +++ b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/tokenizer/Tokenizer.java @@ -1,7 +1,7 @@ package com.dfsek.terra.addons.terrascript.tokenizer; import com.dfsek.terra.addons.terrascript.api.Position; -import com.dfsek.terra.addons.terrascript.api.ParseException; +import com.dfsek.terra.addons.terrascript.api.exception.ParseException; import com.dfsek.terra.addons.terrascript.tokenizer.exceptions.EOFException; import com.dfsek.terra.addons.terrascript.tokenizer.exceptions.FormatException; import com.dfsek.terra.addons.terrascript.tokenizer.exceptions.TokenizerException; diff --git a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/tokenizer/exceptions/TokenizerException.java b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/tokenizer/exceptions/TokenizerException.java index 756261f7a..da7067c4a 100644 --- a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/tokenizer/exceptions/TokenizerException.java +++ b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/tokenizer/exceptions/TokenizerException.java @@ -1,7 +1,7 @@ package com.dfsek.terra.addons.terrascript.tokenizer.exceptions; -import com.dfsek.terra.addons.terrascript.api.ParseException; import com.dfsek.terra.addons.terrascript.api.Position; +import com.dfsek.terra.addons.terrascript.api.exception.ParseException; public abstract class TokenizerException extends ParseException { diff --git a/common/addons/structure-terrascript-loader/src/test/java/structure/ParserTest.java b/common/addons/structure-terrascript-loader/src/test/java/structure/ParserTest.java index 80d4a982d..5dfbcbea4 100644 --- a/common/addons/structure-terrascript-loader/src/test/java/structure/ParserTest.java +++ b/common/addons/structure-terrascript-loader/src/test/java/structure/ParserTest.java @@ -1,15 +1,15 @@ package structure; -import com.dfsek.terra.addons.terrascript.parser.Parser; -import com.dfsek.terra.addons.terrascript.api.ParseException; -import com.dfsek.terra.addons.terrascript.parser.lang.Block; -import com.dfsek.terra.addons.terrascript.api.ImplementationArguments; -import com.dfsek.terra.addons.terrascript.api.lang.Returnable; import com.dfsek.terra.addons.terrascript.api.Function; import com.dfsek.terra.addons.terrascript.api.FunctionBuilder; -import com.dfsek.terra.addons.terrascript.api.lang.Variable; +import com.dfsek.terra.addons.terrascript.api.ImplementationArguments; import com.dfsek.terra.addons.terrascript.api.Position; +import com.dfsek.terra.addons.terrascript.api.exception.ParseException; +import com.dfsek.terra.addons.terrascript.api.lang.Returnable; +import com.dfsek.terra.addons.terrascript.api.lang.Variable; +import com.dfsek.terra.addons.terrascript.parser.Parser; +import com.dfsek.terra.addons.terrascript.parser.lang.Block; import org.apache.commons.io.IOUtils; import org.junit.jupiter.api.Test; diff --git a/common/api/src/main/java/com/dfsek/terra/api/config/ConfigPack.java b/common/api/src/main/java/com/dfsek/terra/api/config/ConfigPack.java index 5d48db654..67b804a4f 100644 --- a/common/api/src/main/java/com/dfsek/terra/api/config/ConfigPack.java +++ b/common/api/src/main/java/com/dfsek/terra/api/config/ConfigPack.java @@ -22,6 +22,7 @@ public interface ConfigPack extends LoaderRegistrar, LoaderHolder, RegistryHolde BiomeProvider getBiomeProviderBuilder(); CheckedRegistry getOrCreateRegistry(Type clazz); + default CheckedRegistry getOrCreateRegistry(Class clazz) { return getOrCreateRegistry((Type) clazz); } diff --git a/common/api/src/main/java/com/dfsek/terra/api/event/EventManager.java b/common/api/src/main/java/com/dfsek/terra/api/event/EventManager.java index 7707971d2..59fb58dd1 100644 --- a/common/api/src/main/java/com/dfsek/terra/api/event/EventManager.java +++ b/common/api/src/main/java/com/dfsek/terra/api/event/EventManager.java @@ -1,8 +1,6 @@ package com.dfsek.terra.api.event; import com.dfsek.terra.api.event.events.Event; -import com.dfsek.terra.api.event.functional.EventContext; -import com.dfsek.terra.api.util.reflection.TypeKey; /** * Manages event registration and triggering. diff --git a/common/api/src/main/java/com/dfsek/terra/api/event/events/config/ConfigurationDiscoveryEvent.java b/common/api/src/main/java/com/dfsek/terra/api/event/events/config/ConfigurationDiscoveryEvent.java index d1ecb3fcf..76a466292 100644 --- a/common/api/src/main/java/com/dfsek/terra/api/event/events/config/ConfigurationDiscoveryEvent.java +++ b/common/api/src/main/java/com/dfsek/terra/api/event/events/config/ConfigurationDiscoveryEvent.java @@ -7,7 +7,6 @@ import com.dfsek.terra.api.event.events.FailThroughEvent; import com.dfsek.terra.api.event.events.PackEvent; import java.util.function.BiConsumer; -import java.util.function.Consumer; /** * Fired when a pack is searched for {@link Configuration}s. diff --git a/common/api/src/main/java/com/dfsek/terra/api/event/functional/EventContext.java b/common/api/src/main/java/com/dfsek/terra/api/event/functional/EventContext.java index 444c9d8c6..fecba7647 100644 --- a/common/api/src/main/java/com/dfsek/terra/api/event/functional/EventContext.java +++ b/common/api/src/main/java/com/dfsek/terra/api/event/functional/EventContext.java @@ -1,6 +1,5 @@ package com.dfsek.terra.api.event.functional; -import com.dfsek.terra.api.event.EventManager; import com.dfsek.terra.api.event.events.Event; import java.util.function.Consumer; diff --git a/common/api/src/main/java/com/dfsek/terra/api/properties/Context.java b/common/api/src/main/java/com/dfsek/terra/api/properties/Context.java index e9d76a6e8..3c45acbe6 100644 --- a/common/api/src/main/java/com/dfsek/terra/api/properties/Context.java +++ b/common/api/src/main/java/com/dfsek/terra/api/properties/Context.java @@ -14,7 +14,8 @@ public class Context { } public Context put(Properties properties) { - if(map.containsKey(properties.getClass())) throw new IllegalArgumentException("Property for class " + properties.getClass().getCanonicalName() + " already registered."); + if(map.containsKey(properties.getClass())) + throw new IllegalArgumentException("Property for class " + properties.getClass().getCanonicalName() + " already registered."); map.put(properties.getClass(), properties); return this; } 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 e2d5ad655..15da88ffd 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 @@ -9,7 +9,7 @@ public class BinaryColumn { public BinaryColumn(int minY, int maxY) { this.minY = minY; if(maxY <= minY) throw new IllegalArgumentException("Max y must be greater than min y"); - this.data = new boolean[maxY-minY]; + this.data = new boolean[maxY - minY]; } public void set(int y) { diff --git a/common/api/src/main/java/com/dfsek/terra/api/util/reflection/ReflectionUtil.java b/common/api/src/main/java/com/dfsek/terra/api/util/reflection/ReflectionUtil.java index b7f558a7a..add424309 100644 --- a/common/api/src/main/java/com/dfsek/terra/api/util/reflection/ReflectionUtil.java +++ b/common/api/src/main/java/com/dfsek/terra/api/util/reflection/ReflectionUtil.java @@ -41,18 +41,18 @@ public final class ReflectionUtil { } public static Class getRawType(Type type) { - if (type instanceof Class) { + if(type instanceof Class) { return (Class) type; - } else if (type instanceof ParameterizedType) { + } else if(type instanceof ParameterizedType) { ParameterizedType parameterizedType = (ParameterizedType) type; Type rawType = parameterizedType.getRawType(); return (Class) rawType; - } else if (type instanceof GenericArrayType) { - Type componentType = ((GenericArrayType)type).getGenericComponentType(); + } else if(type instanceof GenericArrayType) { + Type componentType = ((GenericArrayType) type).getGenericComponentType(); return Array.newInstance(getRawType(componentType), 0).getClass(); - } else if (type instanceof TypeVariable) { + } else if(type instanceof TypeVariable) { return Object.class; - } else if (type instanceof WildcardType) { + } else if(type instanceof WildcardType) { return getRawType(((WildcardType) type).getUpperBounds()[0]); } else { String className = type == null ? "null" : type.getClass().getName(); diff --git a/common/api/src/main/java/com/dfsek/terra/api/util/reflection/TypeKey.java b/common/api/src/main/java/com/dfsek/terra/api/util/reflection/TypeKey.java index 0bcc630e6..36709004a 100644 --- a/common/api/src/main/java/com/dfsek/terra/api/util/reflection/TypeKey.java +++ b/common/api/src/main/java/com/dfsek/terra/api/util/reflection/TypeKey.java @@ -1,6 +1,12 @@ package com.dfsek.terra.api.util.reflection; -import java.lang.reflect.*; +import java.lang.reflect.AnnotatedParameterizedType; +import java.lang.reflect.AnnotatedType; +import java.lang.reflect.GenericArrayType; +import java.lang.reflect.ParameterizedType; +import java.lang.reflect.Type; +import java.lang.reflect.TypeVariable; +import java.lang.reflect.WildcardType; import java.util.Arrays; import java.util.Objects; @@ -38,40 +44,6 @@ public class TypeKey { return parameterized.getAnnotatedActualTypeArguments()[0]; } - /** - * Returns the raw (non-generic) type for this type. - */ - public final Class getRawType() { - return rawType; - } - - /** - * Gets underlying {@code Type} instance. - */ - public final Type getType() { - return type; - } - - public AnnotatedType getAnnotatedType() { - return annotatedType; - } - - @Override - public final int hashCode() { - return this.hashCode; - } - - @Override - public final boolean equals(Object o) { - return o instanceof TypeKey - && equals(type, ((TypeKey) o).type); - } - - @Override - public final String toString() { - return ReflectionUtil.typeToString(type); - } - public static boolean equals(Type a, Type b) { if(a == b) { return true; @@ -116,5 +88,39 @@ public class TypeKey { return false; } } + + /** + * Returns the raw (non-generic) type for this type. + */ + public final Class getRawType() { + return rawType; + } + + /** + * Gets underlying {@code Type} instance. + */ + public final Type getType() { + return type; + } + + public AnnotatedType getAnnotatedType() { + return annotatedType; + } + + @Override + public final int hashCode() { + return this.hashCode; + } + + @Override + public final boolean equals(Object o) { + return o instanceof TypeKey + && equals(type, ((TypeKey) o).type); + } + + @Override + public final String toString() { + return ReflectionUtil.typeToString(type); + } } diff --git a/common/implementation/src/main/java/com/dfsek/terra/AbstractTerraPlugin.java b/common/implementation/src/main/java/com/dfsek/terra/AbstractTerraPlugin.java index f41e0720a..aa95d69bb 100644 --- a/common/implementation/src/main/java/com/dfsek/terra/AbstractTerraPlugin.java +++ b/common/implementation/src/main/java/com/dfsek/terra/AbstractTerraPlugin.java @@ -43,11 +43,11 @@ import java.util.Optional; /** * Skeleton implementation of {@link TerraPlugin} - * + *

* Implementations must invoke {@link #load()} in their constructors. */ public abstract class AbstractTerraPlugin implements TerraPlugin { - private final Lazy debugLogger = Lazy.lazy(() -> new DebugLogger(logger())); + private static final MutableBoolean LOADED = new MutableBoolean(false); private final EventManager eventManager = new EventManagerImpl(this); private final ConfigRegistry configRegistry = new ConfigRegistry(); @@ -65,9 +65,7 @@ public abstract class AbstractTerraPlugin implements TerraPlugin { private final AddonRegistry addonRegistry = new AddonRegistry(this); private final Lazy logger = Lazy.lazy(() -> createLogger()); - - private static final MutableBoolean LOADED = new MutableBoolean(false); - + private final Lazy debugLogger = Lazy.lazy(() -> new DebugLogger(logger())); protected void load() { if(LOADED.get()) { diff --git a/common/implementation/src/main/java/com/dfsek/terra/InternalAddon.java b/common/implementation/src/main/java/com/dfsek/terra/InternalAddon.java index 2e70023a0..82a5a4ce9 100644 --- a/common/implementation/src/main/java/com/dfsek/terra/InternalAddon.java +++ b/common/implementation/src/main/java/com/dfsek/terra/InternalAddon.java @@ -1,6 +1,5 @@ package com.dfsek.terra; -import com.dfsek.terra.api.TerraPlugin; import com.dfsek.terra.api.addon.TerraAddon; import com.dfsek.terra.api.addon.annotations.Addon; import com.dfsek.terra.api.addon.annotations.Author; diff --git a/common/implementation/src/main/java/com/dfsek/terra/config/PluginConfigImpl.java b/common/implementation/src/main/java/com/dfsek/terra/config/PluginConfigImpl.java index 817f3ee12..e61168070 100644 --- a/common/implementation/src/main/java/com/dfsek/terra/config/PluginConfigImpl.java +++ b/common/implementation/src/main/java/com/dfsek/terra/config/PluginConfigImpl.java @@ -8,20 +8,12 @@ import com.dfsek.tectonic.loading.ConfigLoader; import com.dfsek.tectonic.yaml.YamlConfiguration; import com.dfsek.terra.api.Logger; import com.dfsek.terra.api.TerraPlugin; -import org.apache.commons.io.IOUtils; -import org.yaml.snakeyaml.Yaml; import java.io.File; import java.io.FileInputStream; -import java.io.FileOutputStream; import java.io.IOException; -import java.io.InputStream; -import java.io.OutputStream; import java.io.UncheckedIOException; -import java.nio.charset.StandardCharsets; import java.time.Duration; -import java.util.List; -import java.util.Map; @SuppressWarnings("FieldMayBeFinal") public class PluginConfigImpl implements ConfigTemplate, com.dfsek.terra.api.config.PluginConfig { diff --git a/common/implementation/src/main/java/com/dfsek/terra/config/loaders/GenericTemplateSupplierLoader.java b/common/implementation/src/main/java/com/dfsek/terra/config/loaders/GenericTemplateSupplierLoader.java index f21a560ba..3c87211d5 100644 --- a/common/implementation/src/main/java/com/dfsek/terra/config/loaders/GenericTemplateSupplierLoader.java +++ b/common/implementation/src/main/java/com/dfsek/terra/config/loaders/GenericTemplateSupplierLoader.java @@ -6,7 +6,6 @@ import com.dfsek.tectonic.exception.LoadException; import com.dfsek.tectonic.loading.ConfigLoader; import com.dfsek.tectonic.loading.TypeLoader; import com.dfsek.tectonic.loading.object.ObjectTemplate; -import com.dfsek.terra.api.noise.NoiseSampler; import com.dfsek.terra.api.registry.Registry; import java.lang.reflect.AnnotatedType; diff --git a/common/implementation/src/main/java/com/dfsek/terra/config/loaders/LinkedHashMapLoader.java b/common/implementation/src/main/java/com/dfsek/terra/config/loaders/LinkedHashMapLoader.java index bfee3f438..54ea213b8 100644 --- a/common/implementation/src/main/java/com/dfsek/terra/config/loaders/LinkedHashMapLoader.java +++ b/common/implementation/src/main/java/com/dfsek/terra/config/loaders/LinkedHashMapLoader.java @@ -6,8 +6,6 @@ import com.dfsek.tectonic.loading.TypeLoader; import java.lang.reflect.AnnotatedParameterizedType; import java.lang.reflect.AnnotatedType; -import java.lang.reflect.ParameterizedType; -import java.lang.reflect.Type; import java.util.LinkedHashMap; import java.util.Map; diff --git a/common/implementation/src/main/java/com/dfsek/terra/config/loaders/MaterialSetLoader.java b/common/implementation/src/main/java/com/dfsek/terra/config/loaders/MaterialSetLoader.java index 67bb00628..2f0ac49a5 100644 --- a/common/implementation/src/main/java/com/dfsek/terra/config/loaders/MaterialSetLoader.java +++ b/common/implementation/src/main/java/com/dfsek/terra/config/loaders/MaterialSetLoader.java @@ -7,7 +7,6 @@ import com.dfsek.terra.api.block.BlockType; import com.dfsek.terra.api.util.collection.MaterialSet; import java.lang.reflect.AnnotatedType; -import java.lang.reflect.Type; import java.util.List; @SuppressWarnings("unchecked") diff --git a/common/implementation/src/main/java/com/dfsek/terra/config/loaders/ProbabilityCollectionLoader.java b/common/implementation/src/main/java/com/dfsek/terra/config/loaders/ProbabilityCollectionLoader.java index 741c9d730..15c69a526 100644 --- a/common/implementation/src/main/java/com/dfsek/terra/config/loaders/ProbabilityCollectionLoader.java +++ b/common/implementation/src/main/java/com/dfsek/terra/config/loaders/ProbabilityCollectionLoader.java @@ -7,8 +7,6 @@ import com.dfsek.terra.api.util.collection.ProbabilityCollection; import java.lang.reflect.AnnotatedParameterizedType; import java.lang.reflect.AnnotatedType; -import java.lang.reflect.ParameterizedType; -import java.lang.reflect.Type; import java.util.List; import java.util.Map; 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 a55d934b3..7f153f857 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 @@ -7,7 +7,6 @@ import com.dfsek.terra.api.util.ConstantRange; import com.dfsek.terra.api.util.Range; import java.lang.reflect.AnnotatedType; -import java.lang.reflect.Type; import java.util.Map; @SuppressWarnings("unchecked") @@ -19,7 +18,7 @@ public class RangeLoader implements TypeLoader { return new ConstantRange(map.get("min"), map.get("max")); } else { int h = configLoader.loadType(Integer.class, o); - return new ConstantRange(h, h+1); + return new ConstantRange(h, h + 1); } } } diff --git a/common/implementation/src/main/java/com/dfsek/terra/config/loaders/config/BufferedImageLoader.java b/common/implementation/src/main/java/com/dfsek/terra/config/loaders/config/BufferedImageLoader.java index f50dc395f..ef47bbb01 100644 --- a/common/implementation/src/main/java/com/dfsek/terra/config/loaders/config/BufferedImageLoader.java +++ b/common/implementation/src/main/java/com/dfsek/terra/config/loaders/config/BufferedImageLoader.java @@ -9,7 +9,6 @@ import javax.imageio.ImageIO; import java.awt.image.BufferedImage; import java.io.IOException; import java.lang.reflect.AnnotatedType; -import java.lang.reflect.Type; public class BufferedImageLoader implements TypeLoader { private final Loader files; diff --git a/common/implementation/src/main/java/com/dfsek/terra/config/loaders/config/GridSpawnLoader.java b/common/implementation/src/main/java/com/dfsek/terra/config/loaders/config/GridSpawnLoader.java index d316718bb..20d447e1a 100644 --- a/common/implementation/src/main/java/com/dfsek/terra/config/loaders/config/GridSpawnLoader.java +++ b/common/implementation/src/main/java/com/dfsek/terra/config/loaders/config/GridSpawnLoader.java @@ -6,7 +6,6 @@ import com.dfsek.terra.api.structure.StructureSpawn; import com.dfsek.terra.math.GridSpawn; import java.lang.reflect.AnnotatedType; -import java.lang.reflect.Type; import java.util.Map; @SuppressWarnings("unchecked") diff --git a/common/implementation/src/main/java/com/dfsek/terra/config/pack/ConfigPackTemplate.java b/common/implementation/src/main/java/com/dfsek/terra/config/pack/ConfigPackTemplate.java index 1cbf72a77..6b3883b42 100644 --- a/common/implementation/src/main/java/com/dfsek/terra/config/pack/ConfigPackTemplate.java +++ b/common/implementation/src/main/java/com/dfsek/terra/config/pack/ConfigPackTemplate.java @@ -8,7 +8,6 @@ import com.dfsek.terra.api.world.generator.ChunkGeneratorProvider; import com.dfsek.terra.api.world.generator.GenerationStageProvider; import java.util.HashMap; -import java.util.LinkedHashMap; import java.util.List; import java.util.Map; diff --git a/common/implementation/src/main/java/com/dfsek/terra/config/preprocessor/MetaMapPreprocessor.java b/common/implementation/src/main/java/com/dfsek/terra/config/preprocessor/MetaMapPreprocessor.java index 25a635127..bc02b0ed7 100644 --- a/common/implementation/src/main/java/com/dfsek/terra/config/preprocessor/MetaMapPreprocessor.java +++ b/common/implementation/src/main/java/com/dfsek/terra/config/preprocessor/MetaMapPreprocessor.java @@ -10,17 +10,18 @@ import org.jetbrains.annotations.NotNull; import java.lang.reflect.AnnotatedType; import java.lang.reflect.ParameterizedType; -import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; public class MetaMapPreprocessor extends MetaPreprocessor { + private static final TypeKey> STRING_LIST = new TypeKey<>() { + }; + public MetaMapPreprocessor(Map configs) { super(configs); } - private static final TypeKey> STRING_LIST = new TypeKey<>() {}; @SuppressWarnings("unchecked") @Override public @NotNull Result process(AnnotatedType t, T c, ConfigLoader loader, Meta annotation) { diff --git a/common/implementation/src/main/java/com/dfsek/terra/config/preprocessor/MetaNumberPreprocessor.java b/common/implementation/src/main/java/com/dfsek/terra/config/preprocessor/MetaNumberPreprocessor.java index ec3ae73f5..48629fee2 100644 --- a/common/implementation/src/main/java/com/dfsek/terra/config/preprocessor/MetaNumberPreprocessor.java +++ b/common/implementation/src/main/java/com/dfsek/terra/config/preprocessor/MetaNumberPreprocessor.java @@ -6,22 +6,30 @@ import com.dfsek.tectonic.config.Configuration; import com.dfsek.tectonic.exception.LoadException; import com.dfsek.tectonic.loading.ConfigLoader; import com.dfsek.tectonic.preprocessor.Result; -import com.dfsek.tectonic.util.ReflectionUtil; import com.dfsek.terra.api.config.meta.Meta; import com.dfsek.terra.api.util.reflection.TypeKey; import org.jetbrains.annotations.NotNull; import java.lang.reflect.AnnotatedType; -import java.util.Arrays; import java.util.Map; public class MetaNumberPreprocessor extends MetaPreprocessor { - public static final TypeKey META_STRING_KEY = new TypeKey<@Meta String>() {}; + public static final TypeKey META_STRING_KEY = new TypeKey<@Meta String>() { + }; public MetaNumberPreprocessor(Map configs) { super(configs); } + private static boolean isNumber(Class clazz) { + return Number.class.isAssignableFrom(clazz) + || byte.class.equals(clazz) + || int.class.equals(clazz) + || long.class.equals(clazz) + || float.class.equals(clazz) + || double.class.equals(clazz); + } + @SuppressWarnings("unchecked") @Override public @NotNull Result process(AnnotatedType t, T c, ConfigLoader loader, Meta annotation) { @@ -35,13 +43,4 @@ public class MetaNumberPreprocessor extends MetaPreprocessor { } return Result.noOp(); } - - private static boolean isNumber(Class clazz) { - return Number.class.isAssignableFrom(clazz) - || byte.class.equals(clazz) - || int.class.equals(clazz) - || long.class.equals(clazz) - || float.class.equals(clazz) - || double.class.equals(clazz); - } } diff --git a/common/implementation/src/main/java/com/dfsek/terra/config/preprocessor/MetaStringPreprocessor.java b/common/implementation/src/main/java/com/dfsek/terra/config/preprocessor/MetaStringPreprocessor.java index c941b8649..875738548 100644 --- a/common/implementation/src/main/java/com/dfsek/terra/config/preprocessor/MetaStringPreprocessor.java +++ b/common/implementation/src/main/java/com/dfsek/terra/config/preprocessor/MetaStringPreprocessor.java @@ -6,7 +6,6 @@ import com.dfsek.tectonic.loading.ConfigLoader; import com.dfsek.tectonic.preprocessor.Result; import com.dfsek.terra.api.config.meta.Meta; import org.apache.commons.text.StringSubstitutor; -import org.apache.commons.text.lookup.StringLookup; import org.jetbrains.annotations.NotNull; import java.lang.reflect.AnnotatedType; diff --git a/common/implementation/src/main/java/com/dfsek/terra/event/EventContextImpl.java b/common/implementation/src/main/java/com/dfsek/terra/event/EventContextImpl.java index bfb929f29..ff4c29419 100644 --- a/common/implementation/src/main/java/com/dfsek/terra/event/EventContextImpl.java +++ b/common/implementation/src/main/java/com/dfsek/terra/event/EventContextImpl.java @@ -14,16 +14,13 @@ import java.util.function.Consumer; public class EventContextImpl implements EventContext, Comparable> { private final List> actions = new ArrayList<>(); + private final TerraAddon addon; + private final Type eventType; + private final FunctionalEventHandlerImpl parent; private int priority; private boolean failThrough = false; private boolean global = false; - private final TerraAddon addon; - - private final Type eventType; - - private final FunctionalEventHandlerImpl parent; - public EventContextImpl(TerraAddon addon, Type eventType, FunctionalEventHandlerImpl parent) { this.addon = addon; this.eventType = eventType; diff --git a/common/implementation/src/main/java/com/dfsek/terra/registry/CheckedRegistryImpl.java b/common/implementation/src/main/java/com/dfsek/terra/registry/CheckedRegistryImpl.java index 2df4d2b38..ce0f2aa5c 100644 --- a/common/implementation/src/main/java/com/dfsek/terra/registry/CheckedRegistryImpl.java +++ b/common/implementation/src/main/java/com/dfsek/terra/registry/CheckedRegistryImpl.java @@ -7,7 +7,6 @@ import com.dfsek.terra.api.registry.OpenRegistry; import com.dfsek.terra.api.registry.exception.DuplicateEntryException; import java.lang.reflect.AnnotatedType; -import java.lang.reflect.Type; import java.util.Collection; import java.util.Set; import java.util.function.BiConsumer; diff --git a/common/implementation/src/main/java/com/dfsek/terra/registry/LockedRegistryImpl.java b/common/implementation/src/main/java/com/dfsek/terra/registry/LockedRegistryImpl.java index 76f6cf955..92d0e8f94 100644 --- a/common/implementation/src/main/java/com/dfsek/terra/registry/LockedRegistryImpl.java +++ b/common/implementation/src/main/java/com/dfsek/terra/registry/LockedRegistryImpl.java @@ -5,7 +5,6 @@ import com.dfsek.tectonic.loading.ConfigLoader; import com.dfsek.terra.api.registry.Registry; import java.lang.reflect.AnnotatedType; -import java.lang.reflect.Type; import java.util.Collection; import java.util.Set; import java.util.function.BiConsumer; diff --git a/common/implementation/src/main/java/com/dfsek/terra/registry/OpenRegistryImpl.java b/common/implementation/src/main/java/com/dfsek/terra/registry/OpenRegistryImpl.java index 9c2608057..951cc7920 100644 --- a/common/implementation/src/main/java/com/dfsek/terra/registry/OpenRegistryImpl.java +++ b/common/implementation/src/main/java/com/dfsek/terra/registry/OpenRegistryImpl.java @@ -40,7 +40,7 @@ public class OpenRegistryImpl implements OpenRegistry { objects.keySet().forEach(key -> keys.append(key + ", ")); if(obj == null) - throw new LoadException("No such " + type.getType().getTypeName() + " matching \"" + o + "\" was found in this registry. Registry contains items: " + keys.substring(0, keys.length()-2) + "]"); + throw new LoadException("No such " + type.getType().getTypeName() + " matching \"" + o + "\" was found in this registry. Registry contains items: " + keys.substring(0, keys.length() - 2) + "]"); return obj; } diff --git a/common/implementation/src/main/java/com/dfsek/terra/registry/master/AddonRegistry.java b/common/implementation/src/main/java/com/dfsek/terra/registry/master/AddonRegistry.java index 93553c396..6ddf1c6e4 100644 --- a/common/implementation/src/main/java/com/dfsek/terra/registry/master/AddonRegistry.java +++ b/common/implementation/src/main/java/com/dfsek/terra/registry/master/AddonRegistry.java @@ -50,6 +50,7 @@ public class AddonRegistry extends OpenRegistryImpl { public boolean loadAll() { return loadAll(TerraPlugin.class.getClassLoader()); } + public boolean loadAll(ClassLoader parent) { InjectorImpl pluginInjector = new InjectorImpl<>(main); pluginInjector.addExplicitTarget(TerraPlugin.class); diff --git a/common/implementation/src/test/java/MetaTest.java b/common/implementation/src/test/java/MetaTest.java index 6d48edaed..661f6e7f9 100644 --- a/common/implementation/src/test/java/MetaTest.java +++ b/common/implementation/src/test/java/MetaTest.java @@ -37,11 +37,6 @@ public class MetaTest { loader.load(new MetaListConfig(), meta).list.forEach(System.out::println); } - private static final class MetaListConfig implements ConfigTemplate { - @Value("list") - private @Meta List<@Meta String> list; - } - @Test public void testMetaMap() { Configuration meta = new YamlConfiguration(MetaTest.class.getResourceAsStream("/meta.yml"), "meta.yml"); @@ -63,11 +58,6 @@ public class MetaTest { loader.load(new MetaMapConfig(), meta).map.forEach((k, v) -> System.out.println(k + ": " + v)); } - private static final class MetaMapConfig implements ConfigTemplate { - @Value("map") - private @Meta Map<@Meta String, @Meta String> map; - } - @Test public void testMetaString() { Configuration meta = new YamlConfiguration(MetaTest.class.getResourceAsStream("/meta.yml"), "meta.yml"); @@ -90,11 +80,6 @@ public class MetaTest { System.out.println(loader.load(new MetaStringConfig(), meta).string); } - private static final class MetaStringConfig implements ConfigTemplate { - @Value("string") - private @Meta String string; - } - @Test public void testMetaNumber() { Configuration meta = new YamlConfiguration(MetaTest.class.getResourceAsStream("/meta.yml"), "meta.yml"); @@ -117,6 +102,21 @@ public class MetaTest { System.out.println("double: " + loader.load(new MetaNumberConfig(), meta).aDouble); } + private static final class MetaListConfig implements ConfigTemplate { + @Value("list") + private @Meta List<@Meta String> list; + } + + private static final class MetaMapConfig implements ConfigTemplate { + @Value("map") + private @Meta Map<@Meta String, @Meta String> map; + } + + private static final class MetaStringConfig implements ConfigTemplate { + @Value("string") + private @Meta String string; + } + private static final class MetaNumberConfig implements ConfigTemplate { @Value("int") private @Meta int integer; diff --git a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/TerraPluginImpl.java b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/TerraPluginImpl.java index 7456de828..623f16451 100644 --- a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/TerraPluginImpl.java +++ b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/TerraPluginImpl.java @@ -22,10 +22,8 @@ import java.util.Optional; public class TerraPluginImpl extends AbstractTerraPlugin { private final ItemHandle itemHandle = new BukkitItemHandle(); - - private WorldHandle handle = new BukkitWorldHandle(); - private final TerraBukkitPlugin plugin; + private WorldHandle handle = new BukkitWorldHandle(); public TerraPluginImpl(TerraBukkitPlugin plugin) { this.plugin = plugin; diff --git a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/generator/BukkitChunkGeneratorWrapper.java b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/generator/BukkitChunkGeneratorWrapper.java index dc21682ac..fd5dff34b 100644 --- a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/generator/BukkitChunkGeneratorWrapper.java +++ b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/generator/BukkitChunkGeneratorWrapper.java @@ -3,12 +3,11 @@ package com.dfsek.terra.bukkit.generator; import com.dfsek.terra.api.TerraPlugin; import com.dfsek.terra.api.config.WorldConfig; import com.dfsek.terra.api.world.Chunk; -import com.dfsek.terra.api.world.generator.GeneratorWrapper; import com.dfsek.terra.api.world.generator.ChunkGenerator; +import com.dfsek.terra.api.world.generator.GeneratorWrapper; import com.dfsek.terra.bukkit.population.PopulationManager; import com.dfsek.terra.bukkit.world.BukkitAdapter; import com.dfsek.terra.bukkit.world.BukkitBiomeGrid; -import com.dfsek.terra.bukkit.world.BukkitWorld; import org.bukkit.World; import org.bukkit.generator.BlockPopulator; import org.jetbrains.annotations.NotNull; diff --git a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/generator/BukkitPopulatorWrapper.java b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/generator/BukkitPopulatorWrapper.java index 6ab0626c1..261ca5424 100644 --- a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/generator/BukkitPopulatorWrapper.java +++ b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/generator/BukkitPopulatorWrapper.java @@ -1,7 +1,7 @@ package com.dfsek.terra.bukkit.generator; -import com.dfsek.terra.api.world.generator.Chunkified; import com.dfsek.terra.api.world.generator.ChunkGenerator; +import com.dfsek.terra.api.world.generator.Chunkified; import com.dfsek.terra.bukkit.world.BukkitAdapter; import org.bukkit.Chunk; import org.bukkit.World; 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 d37316b6f..cf08313df 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 @@ -4,9 +4,8 @@ import com.dfsek.terra.api.TerraPlugin; import com.dfsek.terra.api.profiler.ProfileFrame; import com.dfsek.terra.api.world.Chunk; import com.dfsek.terra.api.world.World; -import com.dfsek.terra.api.world.generator.Chunkified; import com.dfsek.terra.api.world.generator.ChunkGenerator; -import com.dfsek.terra.bukkit.TerraBukkitPlugin; +import com.dfsek.terra.api.world.generator.Chunkified; import com.dfsek.terra.bukkit.TerraPluginImpl; import com.dfsek.terra.bukkit.world.BukkitAdapter; import com.dfsek.terra.bukkit.world.BukkitWorld; 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 bae905fee..4586fac77 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 @@ -15,11 +15,13 @@ import net.minecraft.world.gen.feature.DefaultFeatureConfig; import net.minecraft.world.gen.feature.FeatureConfig; public class FabricEntryPoint implements ModInitializer { - private static final TerraPluginImpl TERRA_PLUGIN = new TerraPluginImpl(); - public static final PopulatorFeature POPULATOR_FEATURE = new PopulatorFeature(DefaultFeatureConfig.CODEC); public static final ConfiguredFeature POPULATOR_CONFIGURED_FEATURE = POPULATOR_FEATURE.configure(FeatureConfig.DEFAULT).decorate(Decorator.NOPE.configure(NopeDecoratorConfig.INSTANCE)); + private static final TerraPluginImpl TERRA_PLUGIN = new TerraPluginImpl(); + public static TerraPluginImpl getTerraPlugin() { + return TERRA_PLUGIN; + } @Override public void onInitialize() { @@ -31,8 +33,4 @@ public class FabricEntryPoint implements ModInitializer { Registry.register(Registry.CHUNK_GENERATOR, new Identifier("terra:terra"), FabricChunkGeneratorWrapper.CODEC); Registry.register(Registry.BIOME_SOURCE, new Identifier("terra:terra"), TerraBiomeSource.CODEC); } - - public static TerraPluginImpl getTerraPlugin() { - return TERRA_PLUGIN; - } } diff --git a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/TerraPluginImpl.java b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/TerraPluginImpl.java index 0521c7edb..82b3ba91c 100644 --- a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/TerraPluginImpl.java +++ b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/TerraPluginImpl.java @@ -26,6 +26,10 @@ public class TerraPluginImpl extends AbstractTerraPlugin { private final WorldHandle worldHandle = new FabricWorldHandle(); private final Lazy dataFolder = Lazy.lazy(() -> new File(FabricLoader.getInstance().getConfigDir().toFile(), "Terra")); + public TerraPluginImpl() { + load(); + } + @Override public WorldHandle getWorldHandle() { return worldHandle; @@ -36,10 +40,6 @@ public class TerraPluginImpl extends AbstractTerraPlugin { return Optional.of(new FabricAddon(this)); } - public TerraPluginImpl() { - load(); - } - @Override protected Logger createLogger() { final org.apache.logging.log4j.Logger log4jLogger = LogManager.getLogger(); diff --git a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/generation/FabricChunkGeneratorWrapper.java b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/generation/FabricChunkGeneratorWrapper.java index 2c84efe8d..ad56b5035 100644 --- a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/generation/FabricChunkGeneratorWrapper.java +++ b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/generation/FabricChunkGeneratorWrapper.java @@ -3,9 +3,9 @@ package com.dfsek.terra.fabric.generation; import com.dfsek.terra.api.config.ConfigPack; import com.dfsek.terra.api.world.World; import com.dfsek.terra.api.world.generator.ChunkData; +import com.dfsek.terra.api.world.generator.ChunkGenerator; import com.dfsek.terra.api.world.generator.Chunkified; import com.dfsek.terra.api.world.generator.GeneratorWrapper; -import com.dfsek.terra.api.world.generator.ChunkGenerator; import com.dfsek.terra.fabric.FabricEntryPoint; import com.dfsek.terra.fabric.block.FabricBlockState; import com.dfsek.terra.fabric.mixin.StructureAccessorAccessor; 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 b66f64603..9748dc47f 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 @@ -43,13 +43,13 @@ import java.util.concurrent.Executor; @Implements(@Interface(iface = World.class, prefix = "terra$", remap = Interface.Remap.NONE)) public abstract class ServerWorldMixin { private WorldConfig config; - @Shadow - public abstract long getSeed(); - @Shadow @Final private ServerChunkManager chunkManager; + @Shadow + public abstract long getSeed(); + @Inject(at = @At("RETURN"), method = "(Lnet/minecraft/server/MinecraftServer;Ljava/util/concurrent/Executor;Lnet/minecraft/world/level/storage/LevelStorage$Session;Lnet/minecraft/world/level/ServerWorldProperties;Lnet/minecraft/util/registry/RegistryKey;Lnet/minecraft/world/dimension/DimensionType;Lnet/minecraft/server/WorldGenerationProgressListener;Lnet/minecraft/world/gen/chunk/ChunkGenerator;ZJLjava/util/List;Z)V") public void injectConstructor(MinecraftServer server, Executor workerExecutor, LevelStorage.Session session, ServerWorldProperties properties, RegistryKey worldKey, DimensionType dimensionType, WorldGenerationProgressListener worldGenerationProgressListener, net.minecraft.world.gen.chunk.ChunkGenerator chunkGenerator, boolean debugWorld, long seed, List spawners, boolean shouldTickTime, CallbackInfo ci) { if(chunkGenerator instanceof FabricChunkGeneratorWrapper) { 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 e979808f1..e7e293059 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 @@ -1,7 +1,7 @@ package com.dfsek.terra.fabric.mixin.lifecycle.client; -import com.dfsek.terra.fabric.FabricEntryPoint; 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 net.minecraft.client.MinecraftClient; 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 f75e62710..7c27220b9 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 @@ -1,7 +1,7 @@ package com.dfsek.terra.fabric.mixin.lifecycle.server; -import com.dfsek.terra.fabric.FabricEntryPoint; import com.dfsek.terra.api.event.events.platform.PlatformInitializationEvent; +import com.dfsek.terra.fabric.FabricEntryPoint; import net.minecraft.server.Main; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; diff --git a/platforms/region/src/main/java/com/dfsek/terra/platform/DirectChunkData.java b/platforms/region/src/main/java/com/dfsek/terra/platform/DirectChunkData.java index f037b4ac8..b3dea2560 100644 --- a/platforms/region/src/main/java/com/dfsek/terra/platform/DirectChunkData.java +++ b/platforms/region/src/main/java/com/dfsek/terra/platform/DirectChunkData.java @@ -36,7 +36,8 @@ public class DirectChunkData implements ChunkData, com.dfsek.terra.api.world.Chu } @Override - public @NotNull BlockState getBlock(int x, int y, int z) { + public @NotNull + BlockState getBlock(int x, int y, int z) { CompoundTag tag = delegate.getBlockStateAt(x, y, z); if(tag == null) return new State("minecraft:air"); return new State(tag.getString("Name")); diff --git a/platforms/sponge/src/main/java/com/dfsek/terra/sponge/TerraPluginImpl.java b/platforms/sponge/src/main/java/com/dfsek/terra/sponge/TerraPluginImpl.java index 695479217..c9cb241af 100644 --- a/platforms/sponge/src/main/java/com/dfsek/terra/sponge/TerraPluginImpl.java +++ b/platforms/sponge/src/main/java/com/dfsek/terra/sponge/TerraPluginImpl.java @@ -13,6 +13,7 @@ import java.io.File; public class TerraPluginImpl extends AbstractTerraPlugin { private final TerraSpongePlugin plugin; private final SpongeWorldHandle worldHandle = new SpongeWorldHandle(); + public TerraPluginImpl(TerraSpongePlugin plugin) { this.plugin = plugin; load(); 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 5758553e8..b74f8e4a5 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 @@ -9,6 +9,7 @@ import org.spongepowered.plugin.jvm.Plugin; public class TerraSpongePlugin { private final PluginContainer plugin; private final TerraPluginImpl terraPlugin; + @Inject public TerraSpongePlugin(PluginContainer plugin, Game game) { this.plugin = plugin;