diff --git a/buildSrc/src/main/kotlin/com/dfsek/terra/CompilationConfig.kt b/buildSrc/src/main/kotlin/com/dfsek/terra/CompilationConfig.kt index b3e39e22a..7639b2f4a 100644 --- a/buildSrc/src/main/kotlin/com/dfsek/terra/CompilationConfig.kt +++ b/buildSrc/src/main/kotlin/com/dfsek/terra/CompilationConfig.kt @@ -1,5 +1,6 @@ package com.dfsek.terra +import org.apache.tools.ant.filters.ReplaceTokens import org.gradle.api.JavaVersion import org.gradle.api.Project import org.gradle.api.plugins.JavaPluginExtension @@ -13,7 +14,6 @@ import org.gradle.kotlin.dsl.getByName import org.gradle.kotlin.dsl.register import org.gradle.kotlin.dsl.withType import org.gradle.language.jvm.tasks.ProcessResources -import org.apache.tools.ant.filters.ReplaceTokens fun Project.configureCompilation() { apply(plugin = "maven-publish") diff --git a/buildSrc/src/main/kotlin/com/dfsek/terra/DistributionConfig.kt b/buildSrc/src/main/kotlin/com/dfsek/terra/DistributionConfig.kt index 2c584516d..ecc9b7774 100644 --- a/buildSrc/src/main/kotlin/com/dfsek/terra/DistributionConfig.kt +++ b/buildSrc/src/main/kotlin/com/dfsek/terra/DistributionConfig.kt @@ -52,12 +52,12 @@ fun Project.configureDistribution() { dest.parentFile.mkdirs() val zip = ZipOutputStream(FileOutputStream(dest)) - + forSubProjects(":common:addons") { val jar = (tasks.named("jar").get() as Jar) println("Packaging addon ${jar.archiveFileName.get()} to ${dest.absolutePath}.") - val boot = if(extra.has("bootstrap") && extra.get("bootstrap") as Boolean) "bootstrap/" else "" + val boot = if (extra.has("bootstrap") && extra.get("bootstrap") as Boolean) "bootstrap/" else "" val entry = ZipEntry("addons/$boot${jar.archiveFileName.get()}") zip.putNextEntry(entry) diff --git a/buildSrc/src/main/kotlin/com/dfsek/terra/Utils.kt b/buildSrc/src/main/kotlin/com/dfsek/terra/Utils.kt index c6c170cd4..eb821eeb9 100644 --- a/buildSrc/src/main/kotlin/com/dfsek/terra/Utils.kt +++ b/buildSrc/src/main/kotlin/com/dfsek/terra/Utils.kt @@ -1,8 +1,8 @@ package com.dfsek.terra +import java.io.ByteArrayOutputStream import org.gradle.api.Action import org.gradle.api.Project -import java.io.ByteArrayOutputStream var isPrerelease = false diff --git a/common/addons/api-addon-loader/src/main/java/com/dfsek/terra/addon/loader/ApiAddonLoader.java b/common/addons/api-addon-loader/src/main/java/com/dfsek/terra/addon/loader/ApiAddonLoader.java index 687c83786..6d65ec9ec 100644 --- a/common/addons/api-addon-loader/src/main/java/com/dfsek/terra/addon/loader/ApiAddonLoader.java +++ b/common/addons/api-addon-loader/src/main/java/com/dfsek/terra/addon/loader/ApiAddonLoader.java @@ -7,18 +7,19 @@ package com.dfsek.terra.addon.loader; -import java.nio.file.Path; -import java.util.Collections; - import ca.solostudios.strata.Versions; import ca.solostudios.strata.version.Version; +import java.nio.file.Path; +import java.util.Collections; + import com.dfsek.terra.api.addon.BaseAddon; import com.dfsek.terra.api.addon.bootstrap.BootstrapBaseAddon; public class ApiAddonLoader implements BootstrapBaseAddon { private static final Version VERSION = Versions.getVersion(1, 0, 0); + @Override public Iterable loadAddons(Path addonsFolder, ClassLoader parent) { return Collections.emptySet(); diff --git a/common/addons/biome-provider-image/src/main/java/com/dfsek/terra/addons/biome/image/ImageBiomeProvider.java b/common/addons/biome-provider-image/src/main/java/com/dfsek/terra/addons/biome/image/ImageBiomeProvider.java index 2d824596a..13d20a1bd 100644 --- a/common/addons/biome-provider-image/src/main/java/com/dfsek/terra/addons/biome/image/ImageBiomeProvider.java +++ b/common/addons/biome-provider-image/src/main/java/com/dfsek/terra/addons/biome/image/ImageBiomeProvider.java @@ -7,7 +7,6 @@ package com.dfsek.terra.addons.biome.image; -import com.dfsek.terra.api.world.biome.Biome; import net.jafama.FastMath; import java.awt.Color; @@ -16,6 +15,7 @@ import java.util.HashMap; import java.util.Map; import java.util.Set; +import com.dfsek.terra.api.world.biome.Biome; import com.dfsek.terra.api.world.biome.generation.BiomeProvider; 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 30946e966..3c99b6524 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 @@ -7,9 +7,9 @@ package com.dfsek.terra.addons.biome.pipeline; +import com.dfsek.terra.addons.biome.pipeline.api.BiomeHolder; import com.dfsek.terra.addons.biome.pipeline.api.delegate.BiomeDelegate; import com.dfsek.terra.addons.biome.pipeline.api.stage.type.BiomeExpander; -import com.dfsek.terra.addons.biome.pipeline.api.BiomeHolder; import com.dfsek.terra.addons.biome.pipeline.api.stage.type.BiomeMutator; import com.dfsek.terra.addons.biome.pipeline.source.BiomeSource; import com.dfsek.terra.api.util.vector.Vector2; diff --git a/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/BiomePipelineProvider.java b/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/BiomePipelineProvider.java index 4d1c8ef76..f9c351b27 100644 --- a/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/BiomePipelineProvider.java +++ b/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/BiomePipelineProvider.java @@ -7,14 +7,6 @@ package com.dfsek.terra.addons.biome.pipeline; -import com.dfsek.terra.addons.biome.pipeline.api.BiomeHolder; -import com.dfsek.terra.addons.biome.pipeline.api.delegate.BiomeDelegate; -import com.dfsek.terra.addons.biome.pipeline.api.stage.Stage; -import com.dfsek.terra.api.noise.NoiseSampler; -import com.dfsek.terra.api.util.StringIdentifiable; -import com.dfsek.terra.api.world.biome.Biome; -import com.dfsek.terra.api.world.biome.generation.BiomeProvider; - import com.google.common.cache.CacheBuilder; import com.google.common.cache.CacheLoader; import com.google.common.cache.LoadingCache; @@ -26,6 +18,14 @@ import java.util.HashSet; import java.util.Set; import java.util.stream.StreamSupport; +import com.dfsek.terra.addons.biome.pipeline.api.BiomeHolder; +import com.dfsek.terra.addons.biome.pipeline.api.delegate.BiomeDelegate; +import com.dfsek.terra.addons.biome.pipeline.api.stage.Stage; +import com.dfsek.terra.api.noise.NoiseSampler; +import com.dfsek.terra.api.util.StringIdentifiable; +import com.dfsek.terra.api.world.biome.Biome; +import com.dfsek.terra.api.world.biome.generation.BiomeProvider; + public class BiomePipelineProvider implements BiomeProvider { private final LoadingCache holderCache; diff --git a/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/api/delegate/BiomeDelegate.java b/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/api/delegate/BiomeDelegate.java index ea38d4ec9..17b7fa36a 100644 --- a/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/api/delegate/BiomeDelegate.java +++ b/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/api/delegate/BiomeDelegate.java @@ -1,24 +1,12 @@ package com.dfsek.terra.addons.biome.pipeline.api.delegate; +import java.util.Set; + import com.dfsek.terra.api.util.StringIdentifiable; import com.dfsek.terra.api.world.biome.Biome; -import java.util.Set; - public interface BiomeDelegate extends StringIdentifiable { - Biome getBiome(); - - Set getTags(); - - default boolean isEphemeral() { - return false; - } - - default boolean isSelf() { - return false; - } - static BiomeDelegate ephemeral(String id) { return new EphemeralBiomeDelegate(id); } @@ -31,5 +19,17 @@ public interface BiomeDelegate extends StringIdentifiable { return SelfDelegate.INSTANCE; } + Biome getBiome(); + + Set getTags(); + + default boolean isEphemeral() { + return false; + } + + default boolean isSelf() { + return false; + } + } diff --git a/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/api/delegate/DelegatedBiome.java b/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/api/delegate/DelegatedBiome.java index c15461f0b..4085f6a43 100644 --- a/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/api/delegate/DelegatedBiome.java +++ b/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/api/delegate/DelegatedBiome.java @@ -1,9 +1,9 @@ package com.dfsek.terra.addons.biome.pipeline.api.delegate; -import com.dfsek.terra.api.world.biome.Biome; - import java.util.Set; +import com.dfsek.terra.api.world.biome.Biome; + final class DelegatedBiome implements BiomeDelegate { private final Biome biome; diff --git a/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/api/delegate/EphemeralBiomeDelegate.java b/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/api/delegate/EphemeralBiomeDelegate.java index 686cdd54f..3075b7bc0 100644 --- a/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/api/delegate/EphemeralBiomeDelegate.java +++ b/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/api/delegate/EphemeralBiomeDelegate.java @@ -1,10 +1,10 @@ package com.dfsek.terra.addons.biome.pipeline.api.delegate; -import com.dfsek.terra.api.world.biome.Biome; - import java.util.Collections; import java.util.Set; +import com.dfsek.terra.api.world.biome.Biome; + final class EphemeralBiomeDelegate implements BiomeDelegate { private final Set tags; diff --git a/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/api/delegate/SelfDelegate.java b/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/api/delegate/SelfDelegate.java index c54af7184..ad6a4a721 100644 --- a/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/api/delegate/SelfDelegate.java +++ b/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/api/delegate/SelfDelegate.java @@ -1,16 +1,18 @@ package com.dfsek.terra.addons.biome.pipeline.api.delegate; -import com.dfsek.terra.api.world.biome.Biome; - import java.util.Collections; import java.util.Set; +import com.dfsek.terra.api.world.biome.Biome; + final class SelfDelegate implements BiomeDelegate { public static final SelfDelegate INSTANCE = new SelfDelegate(); + private SelfDelegate() { } + @Override public Biome getBiome() { throw new UnsupportedOperationException("Cannot get biome from self delegate"); diff --git a/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/api/stage/Stage.java b/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/api/stage/Stage.java index 26ab6e81e..fb4b1007b 100644 --- a/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/api/stage/Stage.java +++ b/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/api/stage/Stage.java @@ -7,8 +7,8 @@ package com.dfsek.terra.addons.biome.pipeline.api.stage; -import com.dfsek.terra.addons.biome.pipeline.api.delegate.BiomeDelegate; import com.dfsek.terra.addons.biome.pipeline.api.BiomeHolder; +import com.dfsek.terra.addons.biome.pipeline.api.delegate.BiomeDelegate; public interface Stage { diff --git a/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/api/stage/type/BiomeMutator.java b/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/api/stage/type/BiomeMutator.java index 2effddbd2..f7cc3b7bd 100644 --- a/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/api/stage/type/BiomeMutator.java +++ b/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/api/stage/type/BiomeMutator.java @@ -7,8 +7,8 @@ package com.dfsek.terra.addons.biome.pipeline.api.stage.type; -import com.dfsek.terra.addons.biome.pipeline.api.delegate.BiomeDelegate; import com.dfsek.terra.addons.biome.pipeline.api.BiomeHolder; +import com.dfsek.terra.addons.biome.pipeline.api.delegate.BiomeDelegate; public interface BiomeMutator { 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 24fb83643..f00142ac0 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 @@ -16,7 +16,6 @@ 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.Stage; import com.dfsek.terra.addons.biome.pipeline.source.BiomeSource; -import com.dfsek.terra.api.Platform; import com.dfsek.terra.api.config.meta.Meta; import com.dfsek.terra.api.world.biome.generation.BiomeProvider; diff --git a/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/mutator/BorderMutator.java b/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/mutator/BorderMutator.java index 08e6257a3..f5217032f 100644 --- a/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/mutator/BorderMutator.java +++ b/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/mutator/BorderMutator.java @@ -7,15 +7,15 @@ package com.dfsek.terra.addons.biome.pipeline.mutator; +import java.util.HashSet; +import java.util.Set; +import java.util.function.Predicate; + import com.dfsek.terra.addons.biome.pipeline.api.delegate.BiomeDelegate; import com.dfsek.terra.addons.biome.pipeline.api.stage.type.BiomeMutator; import com.dfsek.terra.api.noise.NoiseSampler; import com.dfsek.terra.api.util.collection.ProbabilityCollection; -import java.util.HashSet; -import java.util.Set; -import java.util.function.Predicate; - public class BorderMutator implements BiomeMutator { private final String border; @@ -53,13 +53,13 @@ public class BorderMutator implements BiomeMutator { Set biomeSet = new HashSet<>(); biomes.forEach(biomeSet::add); biomeSet.addAll( - replace - .getContents() - .stream() - .filter( - Predicate.not(BiomeDelegate::isSelf) - ) - .toList() + replace + .getContents() + .stream() + .filter( + Predicate.not(BiomeDelegate::isSelf) + ) + .toList() ); return biomeSet; } diff --git a/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/mutator/ReplaceMutator.java b/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/mutator/ReplaceMutator.java index 8412f79ff..cec3e5e9e 100644 --- a/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/mutator/ReplaceMutator.java +++ b/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/mutator/ReplaceMutator.java @@ -7,15 +7,15 @@ package com.dfsek.terra.addons.biome.pipeline.mutator; +import java.util.HashSet; +import java.util.Set; +import java.util.stream.Stream; + import com.dfsek.terra.addons.biome.pipeline.api.delegate.BiomeDelegate; import com.dfsek.terra.addons.biome.pipeline.api.stage.type.BiomeMutator; import com.dfsek.terra.api.noise.NoiseSampler; import com.dfsek.terra.api.util.collection.ProbabilityCollection; -import java.util.HashSet; -import java.util.Set; -import java.util.stream.Stream; - public class ReplaceMutator implements BiomeMutator { private final String replaceableTag; diff --git a/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/stages/ExpanderStage.java b/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/stages/ExpanderStage.java index 5ef1fc8e4..e99c13e6b 100644 --- a/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/stages/ExpanderStage.java +++ b/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/stages/ExpanderStage.java @@ -7,10 +7,10 @@ package com.dfsek.terra.addons.biome.pipeline.stages; -import com.dfsek.terra.addons.biome.pipeline.api.delegate.BiomeDelegate; -import com.dfsek.terra.addons.biome.pipeline.api.stage.type.BiomeExpander; import com.dfsek.terra.addons.biome.pipeline.api.BiomeHolder; +import com.dfsek.terra.addons.biome.pipeline.api.delegate.BiomeDelegate; import com.dfsek.terra.addons.biome.pipeline.api.stage.Stage; +import com.dfsek.terra.addons.biome.pipeline.api.stage.type.BiomeExpander; public class ExpanderStage implements Stage { diff --git a/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/stages/MutatorStage.java b/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/stages/MutatorStage.java index 90467e4cd..8a9a06aae 100644 --- a/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/stages/MutatorStage.java +++ b/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/stages/MutatorStage.java @@ -7,10 +7,10 @@ package com.dfsek.terra.addons.biome.pipeline.stages; -import com.dfsek.terra.addons.biome.pipeline.api.delegate.BiomeDelegate; import com.dfsek.terra.addons.biome.pipeline.api.BiomeHolder; -import com.dfsek.terra.addons.biome.pipeline.api.stage.type.BiomeMutator; +import com.dfsek.terra.addons.biome.pipeline.api.delegate.BiomeDelegate; import com.dfsek.terra.addons.biome.pipeline.api.stage.Stage; +import com.dfsek.terra.addons.biome.pipeline.api.stage.type.BiomeMutator; public class MutatorStage implements Stage { diff --git a/common/addons/biome-provider-single/src/main/java/com/dfsek/terra/addons/biome/single/SingleBiomeProvider.java b/common/addons/biome-provider-single/src/main/java/com/dfsek/terra/addons/biome/single/SingleBiomeProvider.java index fa9f9f0eb..a67007248 100644 --- a/common/addons/biome-provider-single/src/main/java/com/dfsek/terra/addons/biome/single/SingleBiomeProvider.java +++ b/common/addons/biome-provider-single/src/main/java/com/dfsek/terra/addons/biome/single/SingleBiomeProvider.java @@ -7,11 +7,11 @@ package com.dfsek.terra.addons.biome.single; +import java.util.Collections; + import com.dfsek.terra.api.world.biome.Biome; import com.dfsek.terra.api.world.biome.generation.BiomeProvider; -import java.util.Collections; - public class SingleBiomeProvider implements BiomeProvider { private final Biome biome; diff --git a/common/addons/chunk-generator-noise-3d/src/main/java/com/dfsek/terra/addons/chunkgenerator/config/NoiseChunkGeneratorPackConfigTemplate.java b/common/addons/chunk-generator-noise-3d/src/main/java/com/dfsek/terra/addons/chunkgenerator/config/NoiseChunkGeneratorPackConfigTemplate.java index 3ae53e88e..e636ae400 100644 --- a/common/addons/chunk-generator-noise-3d/src/main/java/com/dfsek/terra/addons/chunkgenerator/config/NoiseChunkGeneratorPackConfigTemplate.java +++ b/common/addons/chunk-generator-noise-3d/src/main/java/com/dfsek/terra/addons/chunkgenerator/config/NoiseChunkGeneratorPackConfigTemplate.java @@ -1,9 +1,8 @@ package com.dfsek.terra.addons.chunkgenerator.config; +import com.dfsek.tectonic.api.config.template.ConfigTemplate; import com.dfsek.tectonic.api.config.template.annotations.Default; import com.dfsek.tectonic.api.config.template.annotations.Value; -import com.dfsek.tectonic.api.config.template.ConfigTemplate; -import com.dfsek.tectonic.api.config.template.object.ObjectTemplate; import com.dfsek.terra.api.config.meta.Meta; diff --git a/common/addons/chunk-generator-noise-3d/src/main/java/com/dfsek/terra/addons/chunkgenerator/config/noise/BiomeNoiseConfigTemplate.java b/common/addons/chunk-generator-noise-3d/src/main/java/com/dfsek/terra/addons/chunkgenerator/config/noise/BiomeNoiseConfigTemplate.java index 2ce9e57a0..d3614be80 100644 --- a/common/addons/chunk-generator-noise-3d/src/main/java/com/dfsek/terra/addons/chunkgenerator/config/noise/BiomeNoiseConfigTemplate.java +++ b/common/addons/chunk-generator-noise-3d/src/main/java/com/dfsek/terra/addons/chunkgenerator/config/noise/BiomeNoiseConfigTemplate.java @@ -38,6 +38,7 @@ public class BiomeNoiseConfigTemplate implements ObjectTemplate { @Value("slant") @@ -44,10 +44,10 @@ public class BiomePaletteTemplate implements ObjectTemplate { builder.add(entry.getValue(), entry.getKey()); } } - + TreeMap slantLayers = new TreeMap<>(); double minThreshold = Double.MAX_VALUE; - + for(SlantLayer layer : slant) { double threshold = layer.getThreshold(); if(threshold < minThreshold) minThreshold = threshold; diff --git a/common/addons/chunk-generator-noise-3d/src/main/java/com/dfsek/terra/addons/chunkgenerator/config/palette/SlantLayer.java b/common/addons/chunk-generator-noise-3d/src/main/java/com/dfsek/terra/addons/chunkgenerator/config/palette/SlantLayer.java index f0907431a..d63cbbb46 100644 --- a/common/addons/chunk-generator-noise-3d/src/main/java/com/dfsek/terra/addons/chunkgenerator/config/palette/SlantLayer.java +++ b/common/addons/chunk-generator-noise-3d/src/main/java/com/dfsek/terra/addons/chunkgenerator/config/palette/SlantLayer.java @@ -3,15 +3,15 @@ package com.dfsek.terra.addons.chunkgenerator.config.palette; import com.dfsek.tectonic.api.config.template.annotations.Value; import com.dfsek.tectonic.api.config.template.object.ObjectTemplate; +import java.util.List; +import java.util.Map; +import java.util.Map.Entry; + import com.dfsek.terra.addons.chunkgenerator.palette.PaletteHolder; import com.dfsek.terra.addons.chunkgenerator.palette.PaletteHolderBuilder; import com.dfsek.terra.api.config.meta.Meta; import com.dfsek.terra.api.world.chunk.generation.util.Palette; -import java.util.List; -import java.util.Map; -import java.util.Map.Entry; - public class SlantLayer implements ObjectTemplate { @Value("threshold") diff --git a/common/addons/chunk-generator-noise-3d/src/main/java/com/dfsek/terra/addons/chunkgenerator/generation/NoiseChunkGenerator3D.java b/common/addons/chunk-generator-noise-3d/src/main/java/com/dfsek/terra/addons/chunkgenerator/generation/NoiseChunkGenerator3D.java index d3f56f387..3e7782728 100644 --- a/common/addons/chunk-generator-noise-3d/src/main/java/com/dfsek/terra/addons/chunkgenerator/generation/NoiseChunkGenerator3D.java +++ b/common/addons/chunk-generator-noise-3d/src/main/java/com/dfsek/terra/addons/chunkgenerator/generation/NoiseChunkGenerator3D.java @@ -11,9 +11,6 @@ package com.dfsek.terra.addons.chunkgenerator.generation; import net.jafama.FastMath; import org.jetbrains.annotations.NotNull; -import java.util.ArrayList; -import java.util.List; - import com.dfsek.terra.addons.chunkgenerator.config.palette.PaletteInfo; import com.dfsek.terra.addons.chunkgenerator.generation.math.PaletteUtil; import com.dfsek.terra.addons.chunkgenerator.generation.math.interpolation.LazilyEvaluatedInterpolator; @@ -29,7 +26,6 @@ import com.dfsek.terra.api.world.biome.Biome; import com.dfsek.terra.api.world.biome.generation.BiomeProvider; import com.dfsek.terra.api.world.chunk.generation.ChunkGenerator; import com.dfsek.terra.api.world.chunk.generation.ProtoChunk; -import com.dfsek.terra.api.world.chunk.generation.stage.GenerationStage; import com.dfsek.terra.api.world.chunk.generation.util.Palette; @@ -120,7 +116,7 @@ public class NoiseChunkGenerator3D implements ChunkGenerator { int fdX = FastMath.floorMod(x, 16); int fdZ = FastMath.floorMod(z, 16); - + Palette palette = PaletteUtil.getPalette(fdX, y, fdZ, sampler, paletteInfo); double noise = sampler.sample(fdX, y, fdZ); if(noise > 0) { diff --git a/common/addons/chunk-generator-noise-3d/src/main/java/com/dfsek/terra/addons/chunkgenerator/generation/math/PaletteUtil.java b/common/addons/chunk-generator-noise-3d/src/main/java/com/dfsek/terra/addons/chunkgenerator/generation/math/PaletteUtil.java index cc17c67da..b7173b314 100644 --- a/common/addons/chunk-generator-noise-3d/src/main/java/com/dfsek/terra/addons/chunkgenerator/generation/math/PaletteUtil.java +++ b/common/addons/chunk-generator-noise-3d/src/main/java/com/dfsek/terra/addons/chunkgenerator/generation/math/PaletteUtil.java @@ -7,8 +7,8 @@ package com.dfsek.terra.addons.chunkgenerator.generation.math; -import com.dfsek.terra.addons.chunkgenerator.generation.math.samplers.Sampler3D; import com.dfsek.terra.addons.chunkgenerator.config.palette.PaletteInfo; +import com.dfsek.terra.addons.chunkgenerator.generation.math.samplers.Sampler3D; import com.dfsek.terra.addons.chunkgenerator.palette.SlantHolder; import com.dfsek.terra.api.world.chunk.generation.util.Palette; diff --git a/common/addons/chunk-generator-noise-3d/src/main/java/com/dfsek/terra/addons/chunkgenerator/generation/math/interpolation/ChunkInterpolator.java b/common/addons/chunk-generator-noise-3d/src/main/java/com/dfsek/terra/addons/chunkgenerator/generation/math/interpolation/ChunkInterpolator.java index ced4a1a2e..68c71b830 100644 --- a/common/addons/chunk-generator-noise-3d/src/main/java/com/dfsek/terra/addons/chunkgenerator/generation/math/interpolation/ChunkInterpolator.java +++ b/common/addons/chunk-generator-noise-3d/src/main/java/com/dfsek/terra/addons/chunkgenerator/generation/math/interpolation/ChunkInterpolator.java @@ -111,7 +111,7 @@ public class ChunkInterpolator { BiomeNoiseProperties gen = entry.getKey(); int weight = entry.getValue().get(); double noise = computeNoise(gen, x, y, z); - + n += noise * weight; div += gen.blendWeight() * weight; } diff --git a/common/addons/chunk-generator-noise-3d/src/main/java/com/dfsek/terra/addons/chunkgenerator/generation/math/interpolation/ElevationInterpolator.java b/common/addons/chunk-generator-noise-3d/src/main/java/com/dfsek/terra/addons/chunkgenerator/generation/math/interpolation/ElevationInterpolator.java index 3ab5f5eab..225423241 100644 --- a/common/addons/chunk-generator-noise-3d/src/main/java/com/dfsek/terra/addons/chunkgenerator/generation/math/interpolation/ElevationInterpolator.java +++ b/common/addons/chunk-generator-noise-3d/src/main/java/com/dfsek/terra/addons/chunkgenerator/generation/math/interpolation/ElevationInterpolator.java @@ -23,7 +23,8 @@ public class ElevationInterpolator { // Precompute generators. for(int x = -1 - smooth; x <= 16 + smooth; x++) { for(int z = -1 - smooth; z <= 16 + smooth; z++) { - gens[x + 1 + smooth][z + 1 + smooth] = provider.getBiome(xOrigin + x, zOrigin + z, seed).getContext().get(BiomeNoiseProperties.class); + gens[x + 1 + smooth][z + 1 + smooth] = provider.getBiome(xOrigin + x, zOrigin + z, seed).getContext().get( + BiomeNoiseProperties.class); } } diff --git a/common/addons/chunk-generator-noise-3d/src/main/java/com/dfsek/terra/addons/chunkgenerator/generation/math/interpolation/LazilyEvaluatedInterpolator.java b/common/addons/chunk-generator-noise-3d/src/main/java/com/dfsek/terra/addons/chunkgenerator/generation/math/interpolation/LazilyEvaluatedInterpolator.java index a3ba84fb8..800bea5c3 100644 --- a/common/addons/chunk-generator-noise-3d/src/main/java/com/dfsek/terra/addons/chunkgenerator/generation/math/interpolation/LazilyEvaluatedInterpolator.java +++ b/common/addons/chunk-generator-noise-3d/src/main/java/com/dfsek/terra/addons/chunkgenerator/generation/math/interpolation/LazilyEvaluatedInterpolator.java @@ -1,12 +1,11 @@ package com.dfsek.terra.addons.chunkgenerator.generation.math.interpolation; +import net.jafama.FastMath; + import com.dfsek.terra.addons.chunkgenerator.config.noise.BiomeNoiseProperties; import com.dfsek.terra.api.noise.NoiseSampler; - import com.dfsek.terra.api.world.biome.generation.BiomeProvider; -import net.jafama.FastMath; - import static com.dfsek.terra.addons.chunkgenerator.generation.math.interpolation.Interpolator.lerp; @@ -26,9 +25,10 @@ public class LazilyEvaluatedInterpolator { private final long seed; private final int min; - public LazilyEvaluatedInterpolator(BiomeProvider biomeProvider, int cx, int cz, int max, int min, int horizontalRes, int verticalRes, long seed) { - int hSamples = FastMath.ceilToInt(16.0/horizontalRes); - int vSamples = FastMath.ceilToInt((double) (max-min) / verticalRes); + public LazilyEvaluatedInterpolator(BiomeProvider biomeProvider, int cx, int cz, int max, int min, int horizontalRes, int verticalRes, + long seed) { + int hSamples = FastMath.ceilToInt(16.0 / horizontalRes); + int vSamples = FastMath.ceilToInt((double) (max - min) / verticalRes); samples = new Double[hSamples + 1][vSamples + 1][hSamples + 1]; samplers = new NoiseSampler[hSamples + 1][hSamples + 1]; this.chunkX = cx << 4; @@ -43,8 +43,8 @@ public class LazilyEvaluatedInterpolator { private double sample(int x, int y, int z, int ox, int oy, int oz) { Double sample = samples[x][y][z]; if(sample == null) { - int xi = ox+chunkX; - int zi = oz+chunkZ; + int xi = ox + chunkX; + int zi = oz + chunkZ; NoiseSampler sampler = samplers[x][z]; if(sampler == null) { @@ -71,10 +71,10 @@ public class LazilyEvaluatedInterpolator { } double sample_0_0_1 = sample(xIndex, yIndex, zIndex + 1, x, y, z + horizontalRes); - + double sample_1_0_0 = sample(xIndex + 1, yIndex, zIndex, x + horizontalRes, y, z); double sample_1_0_1 = sample(xIndex + 1, yIndex, zIndex + 1, x + horizontalRes, y, z + horizontalRes); - + double xFrac = (double) (x % horizontalRes) / horizontalRes; double zFrac = (double) (z % horizontalRes) / horizontalRes; double lerp_bottom_0 = lerp(zFrac, sample_0_0_0, sample_0_0_1); @@ -95,10 +95,10 @@ public class LazilyEvaluatedInterpolator { double sample_1_1_0 = sample(xIndex + 1, yIndex + 1, zIndex, x + horizontalRes, y + verticalRes, z); double sample_1_1_1 = sample(xIndex + 1, yIndex + 1, zIndex + 1, x + horizontalRes, y + verticalRes, z + horizontalRes); - + double lerp_top_0 = lerp(zFrac, sample_0_1_0, sample_0_1_1); double lerp_top_1 = lerp(zFrac, sample_1_1_0, sample_1_1_1); - + double lerp_top = lerp(xFrac, lerp_top_0, lerp_top_1); return lerp(yFrac, lerp_bottom, lerp_top); diff --git a/common/addons/chunk-generator-noise-3d/src/main/java/com/dfsek/terra/addons/chunkgenerator/generation/math/samplers/SamplerProvider.java b/common/addons/chunk-generator-noise-3d/src/main/java/com/dfsek/terra/addons/chunkgenerator/generation/math/samplers/SamplerProvider.java index 37a2ed8e6..94625f520 100644 --- a/common/addons/chunk-generator-noise-3d/src/main/java/com/dfsek/terra/addons/chunkgenerator/generation/math/samplers/SamplerProvider.java +++ b/common/addons/chunk-generator-noise-3d/src/main/java/com/dfsek/terra/addons/chunkgenerator/generation/math/samplers/SamplerProvider.java @@ -17,8 +17,6 @@ package com.dfsek.terra.addons.chunkgenerator.generation.math.samplers; -import com.dfsek.terra.api.world.World; - import com.google.common.cache.CacheBuilder; import com.google.common.cache.CacheLoader; import com.google.common.cache.LoadingCache; @@ -28,6 +26,7 @@ import org.jetbrains.annotations.NotNull; import com.dfsek.terra.api.Platform; import com.dfsek.terra.api.util.MathUtil; import com.dfsek.terra.api.util.generic.pair.Pair; +import com.dfsek.terra.api.world.World; import com.dfsek.terra.api.world.biome.generation.BiomeProvider; @@ -35,7 +34,6 @@ public class SamplerProvider { private final LoadingCache, Sampler3D> cache; - public SamplerProvider(Platform platform, BiomeProvider provider, int elevationSmooth) { cache = CacheBuilder.newBuilder().maximumSize(platform.getTerraConfig().getSamplerCache()) .build(new CacheLoader<>() { @@ -45,7 +43,8 @@ public class SamplerProvider { int cx = (int) (key >> 32); int cz = (int) key; World world = pair.getRight(); - return new Sampler3D(cx, cz, world.getSeed(), world.getMinHeight(), world.getMaxHeight(), provider, elevationSmooth); + return new Sampler3D(cx, cz, world.getSeed(), world.getMinHeight(), world.getMaxHeight(), provider, + elevationSmooth); } }); } diff --git a/common/addons/config-biome/src/main/java/com/dfsek/terra/addons/biome/command/biome/AsyncBiomeFinder.java b/common/addons/config-biome/src/main/java/com/dfsek/terra/addons/biome/command/biome/AsyncBiomeFinder.java index 4a5038928..dee9ae6d0 100644 --- a/common/addons/config-biome/src/main/java/com/dfsek/terra/addons/biome/command/biome/AsyncBiomeFinder.java +++ b/common/addons/config-biome/src/main/java/com/dfsek/terra/addons/biome/command/biome/AsyncBiomeFinder.java @@ -7,15 +7,14 @@ package com.dfsek.terra.addons.biome.command.biome; -import com.dfsek.terra.api.world.ServerWorld; - -import com.dfsek.terra.api.world.biome.Biome; import org.jetbrains.annotations.NotNull; import java.util.function.Consumer; import com.dfsek.terra.api.Platform; import com.dfsek.terra.api.util.vector.Vector3; +import com.dfsek.terra.api.world.ServerWorld; +import com.dfsek.terra.api.world.biome.Biome; import com.dfsek.terra.api.world.biome.generation.BiomeProvider; @@ -35,7 +34,8 @@ public class AsyncBiomeFinder implements Runnable { private final Consumer callback; protected int searchSize = 1; - public AsyncBiomeFinder(BiomeProvider provider, Biome target, @NotNull Vector3 origin, ServerWorld world, int startRadius, int maxRadius, + public AsyncBiomeFinder(BiomeProvider provider, Biome target, @NotNull Vector3 origin, ServerWorld world, int startRadius, + int maxRadius, Consumer callback, Platform platform) { this.provider = provider; this.target = target; 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 46e28ffcc..8c241d97d 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 @@ -7,13 +7,10 @@ package com.dfsek.terra.addons.feature; -import java.util.function.Supplier; - import com.dfsek.terra.api.Platform; import com.dfsek.terra.api.config.ConfigFactory; import com.dfsek.terra.api.config.ConfigPack; import com.dfsek.terra.api.config.ConfigType; -import com.dfsek.terra.api.registry.OpenRegistry; import com.dfsek.terra.api.structure.feature.Feature; import com.dfsek.terra.api.util.reflection.TypeKey; 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 937ccdb55..1a2b3085a 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 @@ -7,13 +7,10 @@ package com.dfsek.terra.addons.flora; -import java.util.function.Supplier; - import com.dfsek.terra.api.Platform; import com.dfsek.terra.api.config.ConfigFactory; import com.dfsek.terra.api.config.ConfigPack; import com.dfsek.terra.api.config.ConfigType; -import com.dfsek.terra.api.registry.OpenRegistry; import com.dfsek.terra.api.structure.Structure; import com.dfsek.terra.api.util.reflection.TypeKey; 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 106a097b9..f1f6eb9ce 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 @@ -7,8 +7,6 @@ package com.dfsek.terra.addons.flora.flora.gen; -import com.dfsek.terra.api.world.WritableWorld; - import net.jafama.FastMath; import java.util.ArrayList; @@ -26,6 +24,7 @@ import com.dfsek.terra.api.util.Rotation; import com.dfsek.terra.api.util.collection.MaterialSet; import com.dfsek.terra.api.util.collection.ProbabilityCollection; import com.dfsek.terra.api.util.vector.Vector3; +import com.dfsek.terra.api.world.WritableWorld; import com.dfsek.terra.api.world.chunk.Chunk; diff --git a/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/paralithic/defined/UserDefinedFunction.java b/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/paralithic/defined/UserDefinedFunction.java index 83ee8e7cf..a07fcb5e6 100644 --- a/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/paralithic/defined/UserDefinedFunction.java +++ b/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/paralithic/defined/UserDefinedFunction.java @@ -15,10 +15,10 @@ import com.dfsek.paralithic.functions.dynamic.Context; import com.dfsek.paralithic.functions.dynamic.DynamicFunction; import com.dfsek.paralithic.node.Statefulness; -import com.dfsek.terra.addons.noise.config.templates.FunctionTemplate; - import java.util.Map.Entry; +import com.dfsek.terra.addons.noise.config.templates.FunctionTemplate; + public class UserDefinedFunction implements DynamicFunction { private final Expression expression; @@ -42,7 +42,7 @@ public class UserDefinedFunction implements DynamicFunction { FunctionTemplate nest = entry.getValue(); parser.registerFunction(id, newInstance(nest)); } - + return new UserDefinedFunction(parser.parse(template.getFunction(), functionScope), template.getArgs().size()); } diff --git a/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/samplers/DomainWarpedSampler.java b/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/samplers/DomainWarpedSampler.java index 45357f17b..2ead08442 100644 --- a/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/samplers/DomainWarpedSampler.java +++ b/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/samplers/DomainWarpedSampler.java @@ -24,17 +24,17 @@ public class DomainWarpedSampler implements NoiseSampler { @Override public double noise(long seed, double x, double y) { return function.noise(seed++, - x + warp.noise(seed++, x, y) * amplitude, - y + warp.noise(seed, x, y) * amplitude + x + warp.noise(seed++, x, y) * amplitude, + y + warp.noise(seed, x, y) * amplitude ); } @Override public double noise(long seed, double x, double y, double z) { return function.noise(seed++, - x + warp.noise(seed++, x, y, z) * amplitude, - y + warp.noise(seed++, x, y, z) * amplitude, - z + warp.noise(seed, x, y, z) * amplitude + x + warp.noise(seed++, x, y, z) * amplitude, + y + warp.noise(seed++, x, y, z) * amplitude, + z + warp.noise(seed, x, y, z) * amplitude ); } } diff --git a/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/samplers/noise/GaborNoiseSampler.java b/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/samplers/noise/GaborNoiseSampler.java index 7941c602a..94c936ff0 100644 --- a/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/samplers/noise/GaborNoiseSampler.java +++ b/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/samplers/noise/GaborNoiseSampler.java @@ -18,7 +18,6 @@ public class GaborNoiseSampler extends NoiseFunction { private double a = 0.1; private double f0 = 0.625; private double kernelRadius = (FastMath.sqrt(-FastMath.log(0.05) / Math.PI) / a); - private double impulsesPerKernel = 64d; private double impulseDensity = (impulsesPerKernel / (Math.PI * kernelRadius * kernelRadius)); private double impulsesPerCell = impulseDensity * kernelRadius * kernelRadius; 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 c7ce3e695..2bdc87bdd 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 @@ -7,7 +7,6 @@ package com.dfsek.terra.addons.ore; -import com.dfsek.terra.addons.ore.ores.VanillaOre; import com.dfsek.terra.api.Platform; import com.dfsek.terra.api.config.ConfigFactory; import com.dfsek.terra.api.config.ConfigPack; diff --git a/common/addons/config-ore/src/main/java/com/dfsek/terra/addons/ore/OreTemplate.java b/common/addons/config-ore/src/main/java/com/dfsek/terra/addons/ore/OreTemplate.java index e9977e4a0..1b51d68db 100644 --- a/common/addons/config-ore/src/main/java/com/dfsek/terra/addons/ore/OreTemplate.java +++ b/common/addons/config-ore/src/main/java/com/dfsek/terra/addons/ore/OreTemplate.java @@ -18,7 +18,6 @@ import com.dfsek.terra.api.block.BlockType; import com.dfsek.terra.api.block.state.BlockState; import com.dfsek.terra.api.config.AbstractableTemplate; 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-ore/src/main/java/com/dfsek/terra/addons/ore/ores/VanillaOre.java b/common/addons/config-ore/src/main/java/com/dfsek/terra/addons/ore/ores/VanillaOre.java index ea7710e56..8c3cb1395 100644 --- a/common/addons/config-ore/src/main/java/com/dfsek/terra/addons/ore/ores/VanillaOre.java +++ b/common/addons/config-ore/src/main/java/com/dfsek/terra/addons/ore/ores/VanillaOre.java @@ -7,10 +7,11 @@ package com.dfsek.terra.addons.ore.ores; +import net.jafama.FastMath; + import java.util.Map; import java.util.Random; -import com.dfsek.terra.api.Platform; import com.dfsek.terra.api.block.BlockType; import com.dfsek.terra.api.block.state.BlockState; import com.dfsek.terra.api.structure.Structure; @@ -21,8 +22,6 @@ import com.dfsek.terra.api.util.vector.Vector3; import com.dfsek.terra.api.world.WritableWorld; import com.dfsek.terra.api.world.chunk.Chunk; -import net.jafama.FastMath; - public class VanillaOre implements Structure { @@ -68,36 +67,36 @@ public class VanillaOre implements Structure { int centerX = location.getBlockX(); int centerZ = location.getBlockZ(); int centerY = location.getBlockY(); - - + + float f = random.nextFloat() * (float) Math.PI; - + double d1 = centerX + 8 + FastMath.sin(f) * size / 8.0F; double d2 = centerX + 8 - FastMath.sin(f) * size / 8.0F; double d3 = centerZ + 8 + FastMath.cos(f) * size / 8.0F; double d4 = centerZ + 8 - FastMath.cos(f) * size / 8.0F; - + double d5 = centerY + random.nextInt(3) - 2D; double d6 = centerY + random.nextInt(3) - 2D; - + for(int i = 0; i < size; i++) { float iFactor = (float) i / (float) size; - + double d10 = random.nextDouble() * size / 16.0D; double d11 = (FastMath.sin(Math.PI * iFactor) + 1.0) * d10 + 1.0; double d12 = (FastMath.sin(Math.PI * iFactor) + 1.0) * d10 + 1.0; - + int xStart = FastMath.roundToInt(FastMath.floor(d1 + (d2 - d1) * iFactor - d11 / 2.0D)); int yStart = FastMath.roundToInt(FastMath.floor(d5 + (d6 - d5) * iFactor - d12 / 2.0D)); int zStart = FastMath.roundToInt(FastMath.floor(d3 + (d4 - d3) * iFactor - d11 / 2.0D)); - + int xEnd = FastMath.roundToInt(FastMath.floor(d1 + (d2 - d1) * iFactor + d11 / 2.0D)); int yEnd = FastMath.roundToInt(FastMath.floor(d5 + (d6 - d5) * iFactor + d12 / 2.0D)); int zEnd = FastMath.roundToInt(FastMath.floor(d3 + (d4 - d3) * iFactor + d11 / 2.0D)); - + for(int x = xStart; x <= xEnd; x++) { double d13 = (x + 0.5D - (d1 + (d2 - d1) * iFactor)) / (d11 / 2.0D); - + if(d13 * d13 < 1.0D) { for(int y = yStart; y <= yEnd; y++) { double d14 = (y + 0.5D - (d5 + (d6 - d5) * iFactor)) / (d12 / 2.0D); 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 faed2d804..2d7ec8a2c 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 @@ -27,7 +27,7 @@ public abstract class PaletteImpl implements Palette { * Constructs a blank palette. */ public PaletteImpl() { - + } @Override diff --git a/common/addons/config-structure/src/main/java/com/dfsek/terra/addons/structure/StructureAddon.java b/common/addons/config-structure/src/main/java/com/dfsek/terra/addons/structure/StructureAddon.java index 3ce1264f9..2ddc0b61c 100644 --- a/common/addons/config-structure/src/main/java/com/dfsek/terra/addons/structure/StructureAddon.java +++ b/common/addons/config-structure/src/main/java/com/dfsek/terra/addons/structure/StructureAddon.java @@ -13,7 +13,6 @@ import com.dfsek.terra.api.addon.BaseAddon; import com.dfsek.terra.api.event.events.config.pack.ConfigPackPreLoadEvent; import com.dfsek.terra.api.event.functional.FunctionalEventHandler; import com.dfsek.terra.api.inject.annotations.Inject; -import com.dfsek.terra.api.structure.configured.ConfiguredStructure; public class StructureAddon implements AddonInitializer { diff --git a/common/addons/config-structure/src/main/java/com/dfsek/terra/addons/structure/StructureConfigType.java b/common/addons/config-structure/src/main/java/com/dfsek/terra/addons/structure/StructureConfigType.java index 1545080e8..a6a4c5f7d 100644 --- a/common/addons/config-structure/src/main/java/com/dfsek/terra/addons/structure/StructureConfigType.java +++ b/common/addons/config-structure/src/main/java/com/dfsek/terra/addons/structure/StructureConfigType.java @@ -11,16 +11,14 @@ import com.dfsek.terra.api.Platform; import com.dfsek.terra.api.config.ConfigFactory; import com.dfsek.terra.api.config.ConfigPack; import com.dfsek.terra.api.config.ConfigType; -import com.dfsek.terra.api.registry.OpenRegistry; import com.dfsek.terra.api.structure.configured.ConfiguredStructure; import com.dfsek.terra.api.util.reflection.TypeKey; -import java.util.function.Supplier; - public class StructureConfigType implements ConfigType { + public static final TypeKey CONFIGURED_STRUCTURE_TYPE_KEY = new TypeKey<>() { + }; private final ConfigFactory factory = new StructureFactory(); - public static final TypeKey CONFIGURED_STRUCTURE_TYPE_KEY = new TypeKey<>(){}; @Override public StructureTemplate getTemplate(ConfigPack pack, Platform platform) { diff --git a/common/addons/config-structure/src/main/java/com/dfsek/terra/addons/structure/command/AsyncStructureFinder.java b/common/addons/config-structure/src/main/java/com/dfsek/terra/addons/structure/command/AsyncStructureFinder.java index a2107cbe4..afd98b797 100644 --- a/common/addons/config-structure/src/main/java/com/dfsek/terra/addons/structure/command/AsyncStructureFinder.java +++ b/common/addons/config-structure/src/main/java/com/dfsek/terra/addons/structure/command/AsyncStructureFinder.java @@ -7,8 +7,6 @@ package com.dfsek.terra.addons.structure.command; -import com.dfsek.terra.api.world.ServerWorld; - import org.jetbrains.annotations.NotNull; import java.util.function.Consumer; @@ -16,6 +14,7 @@ import java.util.function.Consumer; import com.dfsek.terra.api.Platform; import com.dfsek.terra.api.structure.configured.ConfiguredStructure; import com.dfsek.terra.api.util.vector.Vector3; +import com.dfsek.terra.api.world.ServerWorld; import com.dfsek.terra.api.world.biome.generation.BiomeProvider; @@ -31,7 +30,8 @@ public class AsyncStructureFinder implements Runnable { private final Consumer callback; protected int searchSize = 1; - public AsyncStructureFinder(BiomeProvider provider, ConfiguredStructure target, @NotNull Vector3 origin, ServerWorld world, int startRadius, + public AsyncStructureFinder(BiomeProvider provider, ConfiguredStructure target, @NotNull Vector3 origin, ServerWorld world, + int startRadius, int maxRadius, Consumer callback, Platform platform) { //setSearchSize(target.getSpawn().getWidth() + 2 * target.getSpawn().getSeparation()); this.provider = provider; diff --git a/common/addons/config-structure/src/main/java/com/dfsek/terra/addons/structure/structures/loot/functions/EnchantFunction.java b/common/addons/config-structure/src/main/java/com/dfsek/terra/addons/structure/structures/loot/functions/EnchantFunction.java index 0e1f54843..6f5b4d62d 100644 --- a/common/addons/config-structure/src/main/java/com/dfsek/terra/addons/structure/structures/loot/functions/EnchantFunction.java +++ b/common/addons/config-structure/src/main/java/com/dfsek/terra/addons/structure/structures/loot/functions/EnchantFunction.java @@ -7,11 +7,6 @@ package com.dfsek.terra.addons.structure.structures.loot.functions; -import com.dfsek.terra.api.Platform; -import com.dfsek.terra.api.inventory.ItemStack; -import com.dfsek.terra.api.inventory.item.Enchantment; -import com.dfsek.terra.api.inventory.item.ItemMeta; - import net.jafama.FastMath; import org.json.simple.JSONArray; import org.slf4j.Logger; @@ -22,15 +17,19 @@ import java.util.Collections; import java.util.List; import java.util.Random; +import com.dfsek.terra.api.Platform; +import com.dfsek.terra.api.inventory.ItemStack; +import com.dfsek.terra.api.inventory.item.Enchantment; +import com.dfsek.terra.api.inventory.item.ItemMeta; + public class EnchantFunction implements LootFunction { + private static final Logger LOGGER = LoggerFactory.getLogger(EnchantFunction.class); private final int min; private final int max; private final JSONArray disabled; private final Platform platform; - private static final Logger LOGGER = LoggerFactory.getLogger(EnchantFunction.class); - public EnchantFunction(int min, int max, JSONArray disabled, Platform platform) { this.max = max; diff --git a/common/addons/generation-stage-feature/src/main/java/com/dfsek/terra/addons/generation/feature/ColumnImpl.java b/common/addons/generation-stage-feature/src/main/java/com/dfsek/terra/addons/generation/feature/ColumnImpl.java index 3870b9b40..da8b0d6e6 100644 --- a/common/addons/generation-stage-feature/src/main/java/com/dfsek/terra/addons/generation/feature/ColumnImpl.java +++ b/common/addons/generation-stage-feature/src/main/java/com/dfsek/terra/addons/generation/feature/ColumnImpl.java @@ -11,8 +11,8 @@ import java.util.function.IntConsumer; import com.dfsek.terra.api.block.state.BlockState; import com.dfsek.terra.api.structure.feature.BinaryColumn; -import com.dfsek.terra.api.world.chunk.generation.util.Column; import com.dfsek.terra.api.world.WritableWorld; +import com.dfsek.terra.api.world.chunk.generation.util.Column; public class ColumnImpl implements Column { diff --git a/common/addons/generation-stage-feature/src/main/java/com/dfsek/terra/addons/generation/feature/FeatureGenerationAddon.java b/common/addons/generation-stage-feature/src/main/java/com/dfsek/terra/addons/generation/feature/FeatureGenerationAddon.java index 4cee3859f..411148638 100644 --- a/common/addons/generation-stage-feature/src/main/java/com/dfsek/terra/addons/generation/feature/FeatureGenerationAddon.java +++ b/common/addons/generation-stage-feature/src/main/java/com/dfsek/terra/addons/generation/feature/FeatureGenerationAddon.java @@ -77,11 +77,11 @@ public class FeatureGenerationAddon implements AddonInitializer { .build()); } }); - + DynamicTemplate template = event.load(templateBuilder.build()); - + Map> features = new HashMap<>(); - + featureGenerationStages.forEach(stage -> features.put(stage, template.get(stage.getID(), List.class))); event.getLoadedObject(Biome.class).getContext().put(new BiomeFeatures(features)); diff --git a/common/addons/generation-stage-feature/src/main/java/com/dfsek/terra/addons/generation/feature/config/FeatureStageTemplate.java b/common/addons/generation-stage-feature/src/main/java/com/dfsek/terra/addons/generation/feature/config/FeatureStageTemplate.java index 7f9bdd835..1663ceed8 100644 --- a/common/addons/generation-stage-feature/src/main/java/com/dfsek/terra/addons/generation/feature/config/FeatureStageTemplate.java +++ b/common/addons/generation-stage-feature/src/main/java/com/dfsek/terra/addons/generation/feature/config/FeatureStageTemplate.java @@ -9,11 +9,10 @@ import com.dfsek.terra.api.world.chunk.generation.stage.GenerationStage; public class FeatureStageTemplate implements ObjectTemplate { + private final Platform platform; @Value("id") private String id; - private final Platform platform; - public FeatureStageTemplate(Platform platform) { this.platform = platform; } diff --git a/common/addons/generation-stage-structure/src/main/java/com/dfsek/terra/addons/generation/structure/StructureGenerationAddon.java b/common/addons/generation-stage-structure/src/main/java/com/dfsek/terra/addons/generation/structure/StructureGenerationAddon.java index c95359f30..56d1f6576 100644 --- a/common/addons/generation-stage-structure/src/main/java/com/dfsek/terra/addons/generation/structure/StructureGenerationAddon.java +++ b/common/addons/generation-stage-structure/src/main/java/com/dfsek/terra/addons/generation/structure/StructureGenerationAddon.java @@ -38,6 +38,6 @@ public class StructureGenerationAddon implements AddonInitializer { } }) .failThrough(); - + } } diff --git a/common/addons/generation-stage-structure/src/main/java/com/dfsek/terra/addons/generation/structure/StructureGenerationStage.java b/common/addons/generation-stage-structure/src/main/java/com/dfsek/terra/addons/generation/structure/StructureGenerationStage.java index 07d9e7128..9c2ac99ab 100644 --- a/common/addons/generation-stage-structure/src/main/java/com/dfsek/terra/addons/generation/structure/StructureGenerationStage.java +++ b/common/addons/generation-stage-structure/src/main/java/com/dfsek/terra/addons/generation/structure/StructureGenerationStage.java @@ -12,6 +12,6 @@ public class StructureGenerationStage implements GenerationStage { @Override public void populate(ProtoWorld world) { - + } } diff --git a/common/addons/generation-stage-structure/src/main/java/com/dfsek/terra/addons/generation/structure/config/BiomeStructures.java b/common/addons/generation-stage-structure/src/main/java/com/dfsek/terra/addons/generation/structure/config/BiomeStructures.java index 838c29ebd..3a3fc4242 100644 --- a/common/addons/generation-stage-structure/src/main/java/com/dfsek/terra/addons/generation/structure/config/BiomeStructures.java +++ b/common/addons/generation-stage-structure/src/main/java/com/dfsek/terra/addons/generation/structure/config/BiomeStructures.java @@ -1,10 +1,10 @@ package com.dfsek.terra.addons.generation.structure.config; +import java.util.List; + import com.dfsek.terra.api.properties.Properties; import com.dfsek.terra.api.structure.configured.ConfiguredStructure; -import java.util.List; - public class BiomeStructures implements Properties { private final List structures; diff --git a/common/addons/generation-stage-structure/src/main/java/com/dfsek/terra/addons/generation/structure/config/BiomeStructuresTemplate.java b/common/addons/generation-stage-structure/src/main/java/com/dfsek/terra/addons/generation/structure/config/BiomeStructuresTemplate.java index c1379b7be..64f65a018 100644 --- a/common/addons/generation-stage-structure/src/main/java/com/dfsek/terra/addons/generation/structure/config/BiomeStructuresTemplate.java +++ b/common/addons/generation-stage-structure/src/main/java/com/dfsek/terra/addons/generation/structure/config/BiomeStructuresTemplate.java @@ -2,16 +2,14 @@ package com.dfsek.terra.addons.generation.structure.config; import com.dfsek.tectonic.api.config.template.annotations.Default; import com.dfsek.tectonic.api.config.template.annotations.Value; -import com.dfsek.tectonic.api.config.template.ConfigTemplate; import com.dfsek.tectonic.api.config.template.object.ObjectTemplate; -import com.dfsek.terra.api.config.meta.Meta; -import com.dfsek.terra.api.structure.configured.ConfiguredStructure; -import com.dfsek.terra.api.structure.feature.Feature; - import java.util.Collections; import java.util.List; +import com.dfsek.terra.api.config.meta.Meta; +import com.dfsek.terra.api.structure.configured.ConfiguredStructure; + public class BiomeStructuresTemplate implements ObjectTemplate { @Value("features") diff --git a/common/addons/language-yaml/src/main/java/com/dfsek/terra/addons/yaml/YamlAddon.java b/common/addons/language-yaml/src/main/java/com/dfsek/terra/addons/yaml/YamlAddon.java index 4dfc03d92..dc5772dc3 100644 --- a/common/addons/language-yaml/src/main/java/com/dfsek/terra/addons/yaml/YamlAddon.java +++ b/common/addons/language-yaml/src/main/java/com/dfsek/terra/addons/yaml/YamlAddon.java @@ -8,6 +8,8 @@ package com.dfsek.terra.addons.yaml; import com.dfsek.tectonic.yaml.YamlConfiguration; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import com.dfsek.terra.addons.manifest.api.AddonInitializer; import com.dfsek.terra.api.Platform; @@ -16,9 +18,6 @@ import com.dfsek.terra.api.event.events.config.ConfigurationDiscoveryEvent; import com.dfsek.terra.api.event.functional.FunctionalEventHandler; import com.dfsek.terra.api.inject.annotations.Inject; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - public class YamlAddon implements AddonInitializer { diff --git a/common/addons/manifest-addon-loader/src/main/java/com/dfsek/terra/addons/manifest/impl/ManifestAddonLoader.java b/common/addons/manifest-addon-loader/src/main/java/com/dfsek/terra/addons/manifest/impl/ManifestAddonLoader.java index ce078a8f4..5d5e36d36 100644 --- a/common/addons/manifest-addon-loader/src/main/java/com/dfsek/terra/addons/manifest/impl/ManifestAddonLoader.java +++ b/common/addons/manifest-addon-loader/src/main/java/com/dfsek/terra/addons/manifest/impl/ManifestAddonLoader.java @@ -13,17 +13,6 @@ import ca.solostudios.strata.version.VersionRange; import com.dfsek.tectonic.api.exception.LoadException; import com.dfsek.tectonic.api.loader.ConfigLoader; import com.dfsek.tectonic.yaml.YamlConfiguration; - -import com.dfsek.terra.addons.manifest.api.AddonInitializer; -import com.dfsek.terra.addons.manifest.impl.config.AddonManifest; -import com.dfsek.terra.addons.manifest.impl.config.WebsiteConfig; -import com.dfsek.terra.addons.manifest.impl.config.loaders.VersionLoader; -import com.dfsek.terra.addons.manifest.impl.config.loaders.VersionRangeLoader; -import com.dfsek.terra.addons.manifest.impl.exception.AddonException; -import com.dfsek.terra.addons.manifest.impl.exception.ManifestException; -import com.dfsek.terra.addons.manifest.impl.exception.ManifestNotPresentException; -import com.dfsek.terra.api.addon.bootstrap.BootstrapBaseAddon; - import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -41,6 +30,16 @@ import java.util.jar.JarFile; import java.util.stream.Collectors; import java.util.stream.Stream; +import com.dfsek.terra.addons.manifest.api.AddonInitializer; +import com.dfsek.terra.addons.manifest.impl.config.AddonManifest; +import com.dfsek.terra.addons.manifest.impl.config.WebsiteConfig; +import com.dfsek.terra.addons.manifest.impl.config.loaders.VersionLoader; +import com.dfsek.terra.addons.manifest.impl.config.loaders.VersionRangeLoader; +import com.dfsek.terra.addons.manifest.impl.exception.AddonException; +import com.dfsek.terra.addons.manifest.impl.exception.ManifestException; +import com.dfsek.terra.addons.manifest.impl.exception.ManifestNotPresentException; +import com.dfsek.terra.api.addon.bootstrap.BootstrapBaseAddon; + public class ManifestAddonLoader implements BootstrapBaseAddon { private static final Logger logger = LoggerFactory.getLogger(ManifestAddonLoader.class); diff --git a/common/addons/manifest-addon-loader/src/main/java/com/dfsek/terra/addons/manifest/impl/config/AddonManifest.java b/common/addons/manifest-addon-loader/src/main/java/com/dfsek/terra/addons/manifest/impl/config/AddonManifest.java index bd07166d1..8f9129f22 100644 --- a/common/addons/manifest-addon-loader/src/main/java/com/dfsek/terra/addons/manifest/impl/config/AddonManifest.java +++ b/common/addons/manifest-addon-loader/src/main/java/com/dfsek/terra/addons/manifest/impl/config/AddonManifest.java @@ -9,9 +9,9 @@ package com.dfsek.terra.addons.manifest.impl.config; import ca.solostudios.strata.version.Version; import ca.solostudios.strata.version.VersionRange; +import com.dfsek.tectonic.api.config.template.ConfigTemplate; import com.dfsek.tectonic.api.config.template.annotations.Default; import com.dfsek.tectonic.api.config.template.annotations.Value; -import com.dfsek.tectonic.api.config.template.ConfigTemplate; import java.util.Collections; import java.util.List; diff --git a/common/addons/structure-sponge-loader/build.gradle.kts b/common/addons/structure-sponge-loader/build.gradle.kts index d0bf5e0d1..b1a1d7526 100644 --- a/common/addons/structure-sponge-loader/build.gradle.kts +++ b/common/addons/structure-sponge-loader/build.gradle.kts @@ -1,5 +1,5 @@ -import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar import com.dfsek.terra.version +import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar version = version("0.1.0") diff --git a/common/addons/structure-sponge-loader/src/main/java/com/dfsek/terra/addons/sponge/SpongeStructure.java b/common/addons/structure-sponge-loader/src/main/java/com/dfsek/terra/addons/sponge/SpongeStructure.java index 582b3dc82..040f381f3 100644 --- a/common/addons/structure-sponge-loader/src/main/java/com/dfsek/terra/addons/sponge/SpongeStructure.java +++ b/common/addons/structure-sponge-loader/src/main/java/com/dfsek/terra/addons/sponge/SpongeStructure.java @@ -7,8 +7,6 @@ package com.dfsek.terra.addons.sponge; -import com.dfsek.terra.api.world.WritableWorld; - import net.jafama.FastMath; import java.util.Random; @@ -21,6 +19,7 @@ import com.dfsek.terra.api.structure.buffer.items.BufferedBlock; import com.dfsek.terra.api.util.Rotation; import com.dfsek.terra.api.util.vector.Vector3; import com.dfsek.terra.api.util.vector.integer.Vector2Int; +import com.dfsek.terra.api.world.WritableWorld; import com.dfsek.terra.api.world.chunk.Chunk; diff --git a/common/addons/structure-terrascript-loader/build.gradle.kts b/common/addons/structure-terrascript-loader/build.gradle.kts index 5cc9ec46f..956562116 100644 --- a/common/addons/structure-terrascript-loader/build.gradle.kts +++ b/common/addons/structure-terrascript-loader/build.gradle.kts @@ -1,5 +1,5 @@ -import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar import com.dfsek.terra.version +import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar version = version("0.1.0") 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 91d825dbd..077778559 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 @@ -9,6 +9,10 @@ package com.dfsek.terra.addons.terrascript; import com.dfsek.tectonic.api.exception.LoadException; +import java.io.InputStream; +import java.lang.reflect.Type; +import java.util.Map; + import com.dfsek.terra.addons.manifest.api.AddonInitializer; import com.dfsek.terra.addons.terrascript.parser.exceptions.ParseException; import com.dfsek.terra.addons.terrascript.parser.lang.functions.FunctionBuilder; @@ -23,10 +27,6 @@ import com.dfsek.terra.api.structure.LootTable; import com.dfsek.terra.api.structure.Structure; import com.dfsek.terra.api.util.StringUtil; -import java.io.InputStream; -import java.lang.reflect.Type; -import java.util.Map; - public class TerraScriptAddon implements AddonInitializer { @Inject diff --git a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/buffer/items/BufferedLootApplication.java b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/buffer/items/BufferedLootApplication.java index 827d82268..ff3e2c164 100644 --- a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/buffer/items/BufferedLootApplication.java +++ b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/buffer/items/BufferedLootApplication.java @@ -7,6 +7,9 @@ package com.dfsek.terra.addons.terrascript.buffer.items; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import java.util.Random; import com.dfsek.terra.addons.terrascript.script.StructureScript; @@ -17,20 +20,15 @@ import com.dfsek.terra.api.event.events.world.generation.LootPopulateEvent; import com.dfsek.terra.api.structure.LootTable; import com.dfsek.terra.api.structure.buffer.BufferedItem; import com.dfsek.terra.api.util.vector.Vector3; - import com.dfsek.terra.api.world.WritableWorld; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - public class BufferedLootApplication implements BufferedItem { + private static final Logger LOGGER = LoggerFactory.getLogger(BufferedLootApplication.class); private final LootTable table; private final Platform platform; private final StructureScript structure; - private static final Logger LOGGER = LoggerFactory.getLogger(BufferedLootApplication.class); - public BufferedLootApplication(LootTable table, Platform platform, StructureScript structure) { this.table = table; this.platform = platform; @@ -45,7 +43,7 @@ public class BufferedLootApplication implements BufferedItem { LOGGER.error("Failed to place loot at {}; block {} is not a container", origin, data); return; } - + LootPopulateEvent event = new LootPopulateEvent(container, table, world.getPack(), structure); platform.getEventManager().callEvent(event); if(event.isCancelled()) return; diff --git a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/buffer/items/BufferedStateManipulator.java b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/buffer/items/BufferedStateManipulator.java index 28be0f299..d7def4216 100644 --- a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/buffer/items/BufferedStateManipulator.java +++ b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/buffer/items/BufferedStateManipulator.java @@ -7,20 +7,18 @@ package com.dfsek.terra.addons.terrascript.buffer.items; -import com.dfsek.terra.api.block.entity.BlockEntity; -import com.dfsek.terra.api.structure.buffer.BufferedItem; -import com.dfsek.terra.api.util.vector.Vector3; - -import com.dfsek.terra.api.world.WritableWorld; - import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import com.dfsek.terra.api.block.entity.BlockEntity; +import com.dfsek.terra.api.structure.buffer.BufferedItem; +import com.dfsek.terra.api.util.vector.Vector3; +import com.dfsek.terra.api.world.WritableWorld; + public class BufferedStateManipulator implements BufferedItem { - private final String data; - private static final Logger LOGGER = LoggerFactory.getLogger(BufferedStateManipulator.class); + private final String data; public BufferedStateManipulator(String state) { this.data = state; diff --git a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/exceptions/ParseException.java b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/exceptions/ParseException.java index 085e7e255..59fdb01ae 100644 --- a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/exceptions/ParseException.java +++ b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/parser/exceptions/ParseException.java @@ -7,10 +7,10 @@ package com.dfsek.terra.addons.terrascript.parser.exceptions; -import com.dfsek.terra.addons.terrascript.tokenizer.Position; - import java.io.Serial; +import com.dfsek.terra.addons.terrascript.tokenizer.Position; + public class ParseException extends RuntimeException { @Serial 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 198b36ed4..342785136 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 @@ -57,13 +57,12 @@ import com.dfsek.terra.api.world.chunk.Chunk; public class StructureScript implements Structure { + private static final Logger LOGGER = LoggerFactory.getLogger(StructureScript.class); private final Block block; private final String id; private final Cache cache; private final Platform platform; - private static final Logger LOGGER = LoggerFactory.getLogger(StructureScript.class); - public StructureScript(InputStream inputStream, String id, Platform platform, Registry registry, Registry lootRegistry, Registry> functionRegistry) { 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 13ca381aa..256a99c02 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 @@ -30,6 +30,7 @@ import com.dfsek.terra.api.util.vector.Vector3; public class LootFunction implements Function { + private static final Logger LOGGER = LoggerFactory.getLogger(LootFunction.class); private final Registry registry; private final Returnable data; private final Returnable x, y, z; @@ -37,8 +38,6 @@ public class LootFunction implements Function { private final Platform platform; private final StructureScript script; - private static final Logger LOGGER = LoggerFactory.getLogger(LootFunction.class); - public LootFunction(Registry registry, Returnable x, Returnable y, Returnable z, Returnable data, Platform platform, Position position, StructureScript script) { this.registry = registry; 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 f816c541a..cc397b03b 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 @@ -8,6 +8,8 @@ package com.dfsek.terra.addons.terrascript.script.functions; import net.jafama.FastMath; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.util.List; import java.util.Map; @@ -27,19 +29,16 @@ import com.dfsek.terra.api.util.RotationUtil; import com.dfsek.terra.api.util.vector.Vector2; import com.dfsek.terra.api.util.vector.Vector3; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - public class StructureFunction implements Function { + private static final Logger LOGGER = LoggerFactory.getLogger(StructureFunction.class); private final Registry registry; private final Returnable id; private final Returnable x, y, z; private final Position position; private final Platform platform; private final List> rotations; - - private static final Logger LOGGER = LoggerFactory.getLogger(StructureFunction.class); + public StructureFunction(Returnable x, Returnable y, Returnable z, Returnable id, List> rotations, Registry registry, Position position, Platform platform) { this.registry = registry; @@ -79,10 +78,10 @@ public class StructureFunction implements Function { LOGGER.warn("Invalid rotation {}", rotString); return null; } - + Vector3 offset = new Vector3(FastMath.roundToInt(xz.getX()), y.apply(implementationArguments, variableMap).doubleValue(), FastMath.roundToInt(xz.getZ())); - + return script.generate(new IntermediateBuffer(arguments.getBuffer(), offset), arguments.getWorld(), arguments.getRandom(), arguments.getRotation().rotate(rotation1), arguments.getRecursions() + 1); }).orElseGet(() -> { diff --git a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/tokenizer/exceptions/EOFException.java b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/tokenizer/exceptions/EOFException.java index 562000620..bd9097946 100644 --- a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/tokenizer/exceptions/EOFException.java +++ b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/tokenizer/exceptions/EOFException.java @@ -7,10 +7,10 @@ package com.dfsek.terra.addons.terrascript.tokenizer.exceptions; -import com.dfsek.terra.addons.terrascript.tokenizer.Position; - import java.io.Serial; +import com.dfsek.terra.addons.terrascript.tokenizer.Position; + public class EOFException extends TokenizerException { diff --git a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/tokenizer/exceptions/FormatException.java b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/tokenizer/exceptions/FormatException.java index b232a1108..067b49b70 100644 --- a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/tokenizer/exceptions/FormatException.java +++ b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/tokenizer/exceptions/FormatException.java @@ -7,10 +7,10 @@ package com.dfsek.terra.addons.terrascript.tokenizer.exceptions; -import com.dfsek.terra.addons.terrascript.tokenizer.Position; - import java.io.Serial; +import com.dfsek.terra.addons.terrascript.tokenizer.Position; + public class FormatException extends 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 36bb5fedc..079f17226 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 @@ -7,11 +7,11 @@ package com.dfsek.terra.addons.terrascript.tokenizer.exceptions; +import java.io.Serial; + import com.dfsek.terra.addons.terrascript.parser.exceptions.ParseException; import com.dfsek.terra.addons.terrascript.tokenizer.Position; -import java.io.Serial; - public abstract class TokenizerException extends ParseException { diff --git a/common/addons/terrascript-function-check-noise-3d/src/main/java/com/dfsek/terra/addon/terrascript/check/CheckFunction.java b/common/addons/terrascript-function-check-noise-3d/src/main/java/com/dfsek/terra/addon/terrascript/check/CheckFunction.java index 9af5aa8f8..214bfc002 100644 --- a/common/addons/terrascript-function-check-noise-3d/src/main/java/com/dfsek/terra/addon/terrascript/check/CheckFunction.java +++ b/common/addons/terrascript-function-check-noise-3d/src/main/java/com/dfsek/terra/addon/terrascript/check/CheckFunction.java @@ -7,8 +7,6 @@ package com.dfsek.terra.addon.terrascript.check; -import com.dfsek.terra.api.world.World; - import net.jafama.FastMath; import java.util.Map; @@ -24,6 +22,7 @@ import com.dfsek.terra.addons.terrascript.tokenizer.Position; import com.dfsek.terra.api.util.RotationUtil; import com.dfsek.terra.api.util.vector.Vector2; import com.dfsek.terra.api.util.vector.Vector3; +import com.dfsek.terra.api.world.World; import com.dfsek.terra.api.world.WritableWorld; diff --git a/common/api/addons/src/main/java/com/dfsek/terra/api/addon/BaseAddon.java b/common/api/addons/src/main/java/com/dfsek/terra/api/addon/BaseAddon.java index 458e58630..0b8ad7844 100644 --- a/common/api/addons/src/main/java/com/dfsek/terra/api/addon/BaseAddon.java +++ b/common/api/addons/src/main/java/com/dfsek/terra/api/addon/BaseAddon.java @@ -10,11 +10,11 @@ package com.dfsek.terra.api.addon; import ca.solostudios.strata.version.Version; import ca.solostudios.strata.version.VersionRange; -import com.dfsek.terra.api.util.StringIdentifiable; - import java.util.Collections; import java.util.Map; +import com.dfsek.terra.api.util.StringIdentifiable; + public interface BaseAddon extends StringIdentifiable { default void initialize() { } diff --git a/common/api/addons/src/main/java/com/dfsek/terra/api/addon/bootstrap/BootstrapBaseAddon.java b/common/api/addons/src/main/java/com/dfsek/terra/api/addon/bootstrap/BootstrapBaseAddon.java index 02ace514d..f47016a4d 100644 --- a/common/api/addons/src/main/java/com/dfsek/terra/api/addon/bootstrap/BootstrapBaseAddon.java +++ b/common/api/addons/src/main/java/com/dfsek/terra/api/addon/bootstrap/BootstrapBaseAddon.java @@ -17,7 +17,7 @@ public interface BootstrapBaseAddon extends BaseAddon { * Load all the relevant addons in the specified path. * * @param addonsFolder Path containing addons. - * @param parent parent class loader + * @param parent parent class loader * * @return Loaded addons */ diff --git a/common/api/build.gradle.kts b/common/api/build.gradle.kts index 0826c7025..0a86b0c7b 100644 --- a/common/api/build.gradle.kts +++ b/common/api/build.gradle.kts @@ -1,6 +1,6 @@ afterEvaluate { subprojects.forEach { - if(it != project) { + if (it != project) { println("Project: ${it.name}") dependencies { shadedApi(it) diff --git a/common/api/core/src/main/java/com/dfsek/terra/api/config/ConfigPack.java b/common/api/core/src/main/java/com/dfsek/terra/api/config/ConfigPack.java index 29c32d90b..eec7d3be2 100644 --- a/common/api/core/src/main/java/com/dfsek/terra/api/config/ConfigPack.java +++ b/common/api/core/src/main/java/com/dfsek/terra/api/config/ConfigPack.java @@ -7,12 +7,12 @@ package com.dfsek.terra.api.config; +import ca.solostudios.strata.version.VersionRange; + import java.lang.reflect.Type; import java.util.List; import java.util.Map; -import ca.solostudios.strata.version.VersionRange; - import com.dfsek.terra.api.addon.BaseAddon; import com.dfsek.terra.api.registry.CheckedRegistry; import com.dfsek.terra.api.registry.meta.RegistryFactory; @@ -21,11 +21,9 @@ import com.dfsek.terra.api.tectonic.LoaderHolder; import com.dfsek.terra.api.tectonic.LoaderRegistrar; import com.dfsek.terra.api.util.StringIdentifiable; import com.dfsek.terra.api.util.reflection.TypeKey; -import com.dfsek.terra.api.world.ServerWorld; import com.dfsek.terra.api.world.biome.generation.BiomeProvider; import com.dfsek.terra.api.world.chunk.generation.stage.GenerationStage; import com.dfsek.terra.api.world.chunk.generation.util.provider.ChunkGeneratorProvider; -import com.dfsek.terra.api.world.chunk.generation.util.provider.GenerationStageProvider; public interface ConfigPack extends LoaderRegistrar, LoaderHolder, RegistryHolder, StringIdentifiable { diff --git a/common/api/core/src/main/java/com/dfsek/terra/api/handle/WorldHandle.java b/common/api/core/src/main/java/com/dfsek/terra/api/handle/WorldHandle.java index a44299f05..cb01ea67c 100644 --- a/common/api/core/src/main/java/com/dfsek/terra/api/handle/WorldHandle.java +++ b/common/api/core/src/main/java/com/dfsek/terra/api/handle/WorldHandle.java @@ -7,14 +7,12 @@ package com.dfsek.terra.api.handle; -import com.dfsek.terra.api.block.entity.BlockEntity; -import com.dfsek.terra.api.block.state.BlockState; -import com.dfsek.terra.api.entity.EntityType; -import com.dfsek.terra.api.util.vector.Vector3; - import org.jetbrains.annotations.Contract; import org.jetbrains.annotations.NotNull; +import com.dfsek.terra.api.block.state.BlockState; +import com.dfsek.terra.api.entity.EntityType; + /** * Interface to be implemented for world manipulation. diff --git a/common/api/core/src/main/java/com/dfsek/terra/api/structure/LootTable.java b/common/api/core/src/main/java/com/dfsek/terra/api/structure/LootTable.java index 51deb2856..162247c82 100644 --- a/common/api/core/src/main/java/com/dfsek/terra/api/structure/LootTable.java +++ b/common/api/core/src/main/java/com/dfsek/terra/api/structure/LootTable.java @@ -7,14 +7,14 @@ package com.dfsek.terra.api.structure; +import org.jetbrains.annotations.ApiStatus.Experimental; + import java.util.List; import java.util.Random; import com.dfsek.terra.api.inventory.Inventory; import com.dfsek.terra.api.inventory.ItemStack; -import org.jetbrains.annotations.ApiStatus.Experimental; - @Experimental public interface LootTable { diff --git a/common/api/core/src/main/java/com/dfsek/terra/api/structure/StructureSpawn.java b/common/api/core/src/main/java/com/dfsek/terra/api/structure/StructureSpawn.java index cfb9a64d4..a06496817 100644 --- a/common/api/core/src/main/java/com/dfsek/terra/api/structure/StructureSpawn.java +++ b/common/api/core/src/main/java/com/dfsek/terra/api/structure/StructureSpawn.java @@ -7,10 +7,10 @@ package com.dfsek.terra.api.structure; -import com.dfsek.terra.api.util.vector.Vector3; - import org.jetbrains.annotations.ApiStatus.Experimental; +import com.dfsek.terra.api.util.vector.Vector3; + @Experimental public interface StructureSpawn { diff --git a/common/api/core/src/main/java/com/dfsek/terra/api/structure/buffer/Buffer.java b/common/api/core/src/main/java/com/dfsek/terra/api/structure/buffer/Buffer.java index 23743628c..ace3b5b8a 100644 --- a/common/api/core/src/main/java/com/dfsek/terra/api/structure/buffer/Buffer.java +++ b/common/api/core/src/main/java/com/dfsek/terra/api/structure/buffer/Buffer.java @@ -7,12 +7,12 @@ package com.dfsek.terra.api.structure.buffer; -import com.dfsek.terra.api.util.vector.Vector3; -import com.dfsek.terra.api.world.chunk.Chunk; -import com.dfsek.terra.api.world.ServerWorld; - import org.jetbrains.annotations.ApiStatus.Experimental; +import com.dfsek.terra.api.util.vector.Vector3; +import com.dfsek.terra.api.world.ServerWorld; +import com.dfsek.terra.api.world.chunk.Chunk; + @Experimental public interface Buffer { diff --git a/common/api/core/src/main/java/com/dfsek/terra/api/structure/buffer/BufferedItem.java b/common/api/core/src/main/java/com/dfsek/terra/api/structure/buffer/BufferedItem.java index 880fa1203..01dee579b 100644 --- a/common/api/core/src/main/java/com/dfsek/terra/api/structure/buffer/BufferedItem.java +++ b/common/api/core/src/main/java/com/dfsek/terra/api/structure/buffer/BufferedItem.java @@ -7,12 +7,11 @@ package com.dfsek.terra.api.structure.buffer; -import com.dfsek.terra.api.util.vector.Vector3; - -import com.dfsek.terra.api.world.WritableWorld; - import org.jetbrains.annotations.ApiStatus.Experimental; +import com.dfsek.terra.api.util.vector.Vector3; +import com.dfsek.terra.api.world.WritableWorld; + @Experimental public interface BufferedItem { diff --git a/common/api/core/src/main/java/com/dfsek/terra/api/structure/buffer/buffers/DirectBuffer.java b/common/api/core/src/main/java/com/dfsek/terra/api/structure/buffer/buffers/DirectBuffer.java index ef8612816..6bf6b4017 100644 --- a/common/api/core/src/main/java/com/dfsek/terra/api/structure/buffer/buffers/DirectBuffer.java +++ b/common/api/core/src/main/java/com/dfsek/terra/api/structure/buffer/buffers/DirectBuffer.java @@ -7,17 +7,17 @@ package com.dfsek.terra.api.structure.buffer.buffers; +import org.jetbrains.annotations.ApiStatus.Experimental; + import java.util.LinkedHashMap; import java.util.Map; import com.dfsek.terra.api.structure.buffer.Buffer; import com.dfsek.terra.api.structure.buffer.BufferedItem; import com.dfsek.terra.api.util.vector.Vector3; +import com.dfsek.terra.api.world.ServerWorld; import com.dfsek.terra.api.world.WritableWorld; import com.dfsek.terra.api.world.chunk.Chunk; -import com.dfsek.terra.api.world.ServerWorld; - -import org.jetbrains.annotations.ApiStatus.Experimental; /** diff --git a/common/api/core/src/main/java/com/dfsek/terra/api/structure/buffer/buffers/StructureBuffer.java b/common/api/core/src/main/java/com/dfsek/terra/api/structure/buffer/buffers/StructureBuffer.java index d49efb9a9..4d4662f0e 100644 --- a/common/api/core/src/main/java/com/dfsek/terra/api/structure/buffer/buffers/StructureBuffer.java +++ b/common/api/core/src/main/java/com/dfsek/terra/api/structure/buffer/buffers/StructureBuffer.java @@ -7,9 +7,8 @@ package com.dfsek.terra.api.structure.buffer.buffers; -import com.dfsek.terra.api.world.ServerWorld; - import net.jafama.FastMath; +import org.jetbrains.annotations.ApiStatus.Experimental; import java.util.LinkedHashMap; import java.util.Map; @@ -18,10 +17,9 @@ import com.dfsek.terra.api.structure.buffer.Buffer; import com.dfsek.terra.api.structure.buffer.BufferedItem; import com.dfsek.terra.api.structure.buffer.items.Cell; import com.dfsek.terra.api.util.vector.Vector3; +import com.dfsek.terra.api.world.ServerWorld; import com.dfsek.terra.api.world.chunk.Chunk; -import org.jetbrains.annotations.ApiStatus.Experimental; - @Experimental public class StructureBuffer implements Buffer { diff --git a/common/api/core/src/main/java/com/dfsek/terra/api/structure/buffer/items/BufferedBlock.java b/common/api/core/src/main/java/com/dfsek/terra/api/structure/buffer/items/BufferedBlock.java index 02f7022d2..fbbbe0488 100644 --- a/common/api/core/src/main/java/com/dfsek/terra/api/structure/buffer/items/BufferedBlock.java +++ b/common/api/core/src/main/java/com/dfsek/terra/api/structure/buffer/items/BufferedBlock.java @@ -7,8 +7,6 @@ package com.dfsek.terra.api.structure.buffer.items; -import com.dfsek.terra.api.world.WritableWorld; - import org.jetbrains.annotations.ApiStatus.Experimental; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -18,6 +16,7 @@ import com.dfsek.terra.api.block.state.BlockState; import com.dfsek.terra.api.block.state.properties.base.Properties; import com.dfsek.terra.api.structure.buffer.BufferedItem; import com.dfsek.terra.api.util.vector.Vector3; +import com.dfsek.terra.api.world.WritableWorld; @Experimental diff --git a/common/api/core/src/main/java/com/dfsek/terra/api/structure/buffer/items/Cell.java b/common/api/core/src/main/java/com/dfsek/terra/api/structure/buffer/items/Cell.java index eead16cb7..e9c08ae5a 100644 --- a/common/api/core/src/main/java/com/dfsek/terra/api/structure/buffer/items/Cell.java +++ b/common/api/core/src/main/java/com/dfsek/terra/api/structure/buffer/items/Cell.java @@ -7,16 +7,15 @@ package com.dfsek.terra.api.structure.buffer.items; +import org.jetbrains.annotations.ApiStatus.Experimental; + import java.util.ArrayList; import java.util.List; import com.dfsek.terra.api.structure.buffer.BufferedItem; import com.dfsek.terra.api.util.vector.Vector3; - import com.dfsek.terra.api.world.WritableWorld; -import org.jetbrains.annotations.ApiStatus.Experimental; - @Experimental public class Cell implements BufferedItem { diff --git a/common/api/core/src/main/java/com/dfsek/terra/api/structure/configured/ConfiguredStructure.java b/common/api/core/src/main/java/com/dfsek/terra/api/structure/configured/ConfiguredStructure.java index 12886d0b1..0efa19d9e 100644 --- a/common/api/core/src/main/java/com/dfsek/terra/api/structure/configured/ConfiguredStructure.java +++ b/common/api/core/src/main/java/com/dfsek/terra/api/structure/configured/ConfiguredStructure.java @@ -7,14 +7,14 @@ package com.dfsek.terra.api.structure.configured; +import org.jetbrains.annotations.ApiStatus.Experimental; + import com.dfsek.terra.api.structure.Structure; import com.dfsek.terra.api.structure.StructureSpawn; import com.dfsek.terra.api.util.Range; import com.dfsek.terra.api.util.StringIdentifiable; import com.dfsek.terra.api.util.collection.ProbabilityCollection; -import org.jetbrains.annotations.ApiStatus.Experimental; - @Experimental public interface ConfiguredStructure extends StringIdentifiable { diff --git a/common/api/core/src/main/java/com/dfsek/terra/api/tectonic/LoaderHolder.java b/common/api/core/src/main/java/com/dfsek/terra/api/tectonic/LoaderHolder.java index d85b55176..b36240864 100644 --- a/common/api/core/src/main/java/com/dfsek/terra/api/tectonic/LoaderHolder.java +++ b/common/api/core/src/main/java/com/dfsek/terra/api/tectonic/LoaderHolder.java @@ -7,8 +7,8 @@ package com.dfsek.terra.api.tectonic; -import com.dfsek.tectonic.api.loader.type.TypeLoader; import com.dfsek.tectonic.api.config.template.object.ObjectTemplate; +import com.dfsek.tectonic.api.loader.type.TypeLoader; import java.lang.reflect.Type; import java.util.function.Supplier; diff --git a/common/api/core/src/main/java/com/dfsek/terra/api/world/chunk/Chunk.java b/common/api/core/src/main/java/com/dfsek/terra/api/world/chunk/Chunk.java index 5c9722690..303ad1e2e 100644 --- a/common/api/core/src/main/java/com/dfsek/terra/api/world/chunk/Chunk.java +++ b/common/api/core/src/main/java/com/dfsek/terra/api/world/chunk/Chunk.java @@ -7,12 +7,11 @@ package com.dfsek.terra.api.world.chunk; -import com.dfsek.terra.api.block.state.BlockState; - -import com.dfsek.terra.api.world.ServerWorld; - import org.jetbrains.annotations.NotNull; +import com.dfsek.terra.api.block.state.BlockState; +import com.dfsek.terra.api.world.ServerWorld; + public interface Chunk extends ChunkAccess { void setBlock(int x, int y, int z, BlockState data, boolean physics); diff --git a/common/api/core/src/main/java/com/dfsek/terra/api/world/chunk/generation/ChunkGenerator.java b/common/api/core/src/main/java/com/dfsek/terra/api/world/chunk/generation/ChunkGenerator.java index da344d969..932b83778 100644 --- a/common/api/core/src/main/java/com/dfsek/terra/api/world/chunk/generation/ChunkGenerator.java +++ b/common/api/core/src/main/java/com/dfsek/terra/api/world/chunk/generation/ChunkGenerator.java @@ -9,14 +9,11 @@ package com.dfsek.terra.api.world.chunk.generation; import org.jetbrains.annotations.NotNull; -import java.util.List; - import com.dfsek.terra.api.block.state.BlockState; import com.dfsek.terra.api.util.vector.Vector3; import com.dfsek.terra.api.util.vector.integer.Vector3Int; import com.dfsek.terra.api.world.ServerWorld; import com.dfsek.terra.api.world.WritableWorld; -import com.dfsek.terra.api.world.chunk.generation.stage.GenerationStage; public interface ChunkGenerator { diff --git a/common/api/core/src/main/java/com/dfsek/terra/api/world/chunk/generation/ProtoWorld.java b/common/api/core/src/main/java/com/dfsek/terra/api/world/chunk/generation/ProtoWorld.java index dc6b4b108..dd484d6fc 100644 --- a/common/api/core/src/main/java/com/dfsek/terra/api/world/chunk/generation/ProtoWorld.java +++ b/common/api/core/src/main/java/com/dfsek/terra/api/world/chunk/generation/ProtoWorld.java @@ -13,6 +13,7 @@ public interface ProtoWorld extends WritableWorld { * Get the world object this ProtoWorld represents * * Do not read from/write to this world! + * * @return The world */ ServerWorld getWorld(); diff --git a/common/api/inject/src/main/java/com/dfsek/terra/api/inject/exception/InjectionException.java b/common/api/inject/src/main/java/com/dfsek/terra/api/inject/exception/InjectionException.java index 0f25b1479..4275d7a5a 100644 --- a/common/api/inject/src/main/java/com/dfsek/terra/api/inject/exception/InjectionException.java +++ b/common/api/inject/src/main/java/com/dfsek/terra/api/inject/exception/InjectionException.java @@ -7,10 +7,10 @@ package com.dfsek.terra.api.inject.exception; -import com.dfsek.terra.api.inject.Injector; - import java.io.Serial; +import com.dfsek.terra.api.inject.Injector; + /** * Thrown when dynamic dependency injection cannot be completed by an {@link Injector}. diff --git a/common/api/registry/src/main/java/com/dfsek/terra/api/registry/CheckedRegistry.java b/common/api/registry/src/main/java/com/dfsek/terra/api/registry/CheckedRegistry.java index b6ef6d53e..eb4da36a7 100644 --- a/common/api/registry/src/main/java/com/dfsek/terra/api/registry/CheckedRegistry.java +++ b/common/api/registry/src/main/java/com/dfsek/terra/api/registry/CheckedRegistry.java @@ -7,10 +7,10 @@ package com.dfsek.terra.api.registry; -import com.dfsek.terra.api.registry.exception.DuplicateEntryException; - import org.jetbrains.annotations.NotNull; +import com.dfsek.terra.api.registry.exception.DuplicateEntryException; + public interface CheckedRegistry extends Registry { /** diff --git a/common/api/registry/src/main/java/com/dfsek/terra/api/registry/OpenRegistry.java b/common/api/registry/src/main/java/com/dfsek/terra/api/registry/OpenRegistry.java index 3420ca89d..10a59dd98 100644 --- a/common/api/registry/src/main/java/com/dfsek/terra/api/registry/OpenRegistry.java +++ b/common/api/registry/src/main/java/com/dfsek/terra/api/registry/OpenRegistry.java @@ -7,10 +7,10 @@ package com.dfsek.terra.api.registry; -import com.dfsek.terra.api.registry.exception.DuplicateEntryException; - import org.jetbrains.annotations.NotNull; +import com.dfsek.terra.api.registry.exception.DuplicateEntryException; + public interface OpenRegistry extends Registry { /** diff --git a/common/api/registry/src/main/java/com/dfsek/terra/api/registry/Registry.java b/common/api/registry/src/main/java/com/dfsek/terra/api/registry/Registry.java index 5ee5dc4ff..26f4f8bb2 100644 --- a/common/api/registry/src/main/java/com/dfsek/terra/api/registry/Registry.java +++ b/common/api/registry/src/main/java/com/dfsek/terra/api/registry/Registry.java @@ -8,9 +8,6 @@ package com.dfsek.terra.api.registry; import com.dfsek.tectonic.api.loader.type.TypeLoader; - -import com.dfsek.terra.api.registry.exception.NoSuchEntryException; - import org.jetbrains.annotations.Contract; import org.jetbrains.annotations.NotNull; diff --git a/common/api/util/src/main/java/com/dfsek/terra/api/util/generic/either/Either.java b/common/api/util/src/main/java/com/dfsek/terra/api/util/generic/either/Either.java index 5dceb1d57..047fb8426 100644 --- a/common/api/util/src/main/java/com/dfsek/terra/api/util/generic/either/Either.java +++ b/common/api/util/src/main/java/com/dfsek/terra/api/util/generic/either/Either.java @@ -80,7 +80,7 @@ public final class Either { @Override public boolean equals(Object obj) { if(!(obj instanceof Either that)) return false; - + return (this.leftPresent && that.leftPresent && Objects.equals(this.left, that.left)) || (!this.leftPresent && !that.leftPresent && Objects.equals(this.right, that.right)); } diff --git a/common/api/util/src/main/java/com/dfsek/terra/api/util/generic/pair/Pair.java b/common/api/util/src/main/java/com/dfsek/terra/api/util/generic/pair/Pair.java index bf6bb13d7..58d1e7353 100644 --- a/common/api/util/src/main/java/com/dfsek/terra/api/util/generic/pair/Pair.java +++ b/common/api/util/src/main/java/com/dfsek/terra/api/util/generic/pair/Pair.java @@ -56,7 +56,7 @@ public final class Pair { @Override public boolean equals(Object obj) { if(!(obj instanceof Pair that)) return false; - + return Objects.equals(this.left, that.left) && Objects.equals(this.right, that.right); } @@ -104,7 +104,7 @@ public final class Pair { @Override public boolean equals(Object obj) { if(!(obj instanceof Mutable that)) return false; - + return Objects.equals(this.left, that.left) && Objects.equals(this.right, that.right); } } diff --git a/common/api/util/src/main/java/com/dfsek/terra/api/util/reflection/TypeKey.java b/common/api/util/src/main/java/com/dfsek/terra/api/util/reflection/TypeKey.java index 5b1ba7493..e73be44d7 100644 --- a/common/api/util/src/main/java/com/dfsek/terra/api/util/reflection/TypeKey.java +++ b/common/api/util/src/main/java/com/dfsek/terra/api/util/reflection/TypeKey.java @@ -42,7 +42,7 @@ public class TypeKey { if(!(b instanceof ParameterizedType pb)) { return false; } - + return Objects.equals(pa.getOwnerType(), pb.getOwnerType()) && pa.getRawType().equals(pb.getRawType()) && Arrays.equals(pa.getActualTypeArguments(), pb.getActualTypeArguments()); @@ -50,13 +50,13 @@ public class TypeKey { if(!(b instanceof GenericArrayType gb)) { return false; } - + return equals(ga.getGenericComponentType(), gb.getGenericComponentType()); } else if(a instanceof WildcardType wa) { if(!(b instanceof WildcardType wb)) { return false; } - + return Arrays.equals(wa.getUpperBounds(), wb.getUpperBounds()) && Arrays.equals(wa.getLowerBounds(), wb.getLowerBounds()); } else if(a instanceof TypeVariable va) { diff --git a/common/api/util/src/main/java/com/dfsek/terra/api/util/vector/integer/Vector2Int.java b/common/api/util/src/main/java/com/dfsek/terra/api/util/vector/integer/Vector2Int.java index 8d2475328..1c4ee7d4b 100644 --- a/common/api/util/src/main/java/com/dfsek/terra/api/util/vector/integer/Vector2Int.java +++ b/common/api/util/src/main/java/com/dfsek/terra/api/util/vector/integer/Vector2Int.java @@ -7,11 +7,10 @@ import com.dfsek.terra.api.util.Rotation; * oh yeah */ public class Vector2Int { - private final int x; - private final int z; - private static final Vector2Int ZERO = new Vector2Int(0, 0); private static final Vector2Int UNIT = new Vector2Int(0, 1); + private final int x; + private final int z; protected Vector2Int(int x, int z) { this.x = x; @@ -62,19 +61,19 @@ public class Vector2Int { this.x = x; this.z = z; } - + public int getZ() { return z; } - - public int getX() { - return x; - } - + public void setZ(int z) { this.z = z; } - + + public int getX() { + return x; + } + public void setX(int x) { this.x = x; } diff --git a/common/api/util/src/main/java/com/dfsek/terra/api/util/vector/integer/Vector3Int.java b/common/api/util/src/main/java/com/dfsek/terra/api/util/vector/integer/Vector3Int.java index 6147c4afa..24ed73225 100644 --- a/common/api/util/src/main/java/com/dfsek/terra/api/util/vector/integer/Vector3Int.java +++ b/common/api/util/src/main/java/com/dfsek/terra/api/util/vector/integer/Vector3Int.java @@ -1,10 +1,9 @@ package com.dfsek.terra.api.util.vector.integer; public class Vector3Int { - private final int x, y, z; - private static final Vector3Int ZERO = new Vector3Int(0, 0, 0); private static final Vector3Int UNIT = new Vector3Int(0, 1, 0); + private final int x, y, z; protected Vector3Int(int x, int y, int z) { this.x = x; @@ -12,6 +11,18 @@ public class Vector3Int { this.z = z; } + public static Vector3Int unit() { + return UNIT; + } + + public static Vector3Int zero() { + return ZERO; + } + + public static Vector3Int of(int x, int y, int z) { + return new Vector3Int(x, y, z); + } + public int getX() { return x; } @@ -28,18 +39,7 @@ public class Vector3Int { return new Mutable(x, y, z); } - public static Vector3Int unit() { - return UNIT; - } - - public static Vector3Int zero() { - return ZERO; - } - - public static Vector3Int of(int x, int y, int z) { - return new Vector3Int(x, y, z); - } - + public static class Mutable { private int x, y, z; @@ -48,31 +48,31 @@ public class Vector3Int { this.y = y; this.z = z; } - - public void setX(int x) { - this.x = x; - } - - public void setY(int y) { - this.y = y; - } - - public void setZ(int z) { - this.z = z; - } - + public int getX() { return x; } - + + public void setX(int x) { + this.x = x; + } + public int getY() { return y; } - + + public void setY(int y) { + this.y = y; + } + public int getZ() { return z; } + public void setZ(int z) { + this.z = z; + } + public Vector3Int immutable() { return Vector3Int.of(x, y, z); } diff --git a/common/implementation/base/src/main/java/com/dfsek/terra/AbstractPlatform.java b/common/implementation/base/src/main/java/com/dfsek/terra/AbstractPlatform.java index 6294db266..c5b340188 100644 --- a/common/implementation/base/src/main/java/com/dfsek/terra/AbstractPlatform.java +++ b/common/implementation/base/src/main/java/com/dfsek/terra/AbstractPlatform.java @@ -18,12 +18,6 @@ package com.dfsek.terra; import com.dfsek.tectonic.api.TypeRegistry; - -import com.dfsek.terra.addon.EphemeralAddon; -import com.dfsek.terra.addon.InternalAddon; - -import com.dfsek.terra.api.util.StringIdentifiable; - import org.apache.commons.io.FileUtils; import org.apache.commons.io.IOUtils; import org.jetbrains.annotations.NotNull; @@ -47,6 +41,8 @@ import java.util.Map; import com.dfsek.terra.addon.BootstrapAddonLoader; import com.dfsek.terra.addon.DependencySorter; +import com.dfsek.terra.addon.EphemeralAddon; +import com.dfsek.terra.addon.InternalAddon; import com.dfsek.terra.api.Platform; import com.dfsek.terra.api.addon.BaseAddon; import com.dfsek.terra.api.command.CommandManager; @@ -61,6 +57,7 @@ import com.dfsek.terra.api.inject.impl.InjectorImpl; import com.dfsek.terra.api.profiler.Profiler; import com.dfsek.terra.api.registry.CheckedRegistry; import com.dfsek.terra.api.registry.Registry; +import com.dfsek.terra.api.util.StringIdentifiable; import com.dfsek.terra.api.util.mutable.MutableBoolean; import com.dfsek.terra.commands.CommandUtil; import com.dfsek.terra.commands.TerraCommandManager; @@ -184,14 +181,14 @@ public abstract class AbstractPlatform implements Platform { BootstrapAddonLoader bootstrapAddonLoader = new BootstrapAddonLoader(); Path addonsFolder = getDataFolder().toPath().resolve("addons"); - + Injector platformInjector = new InjectorImpl<>(this); platformInjector.addExplicitTarget(Platform.class); - + bootstrapAddonLoader.loadAddons(addonsFolder, getClass().getClassLoader()) .forEach(bootstrapAddon -> { platformInjector.inject(bootstrapAddon); - + bootstrapAddon.loadAddons(addonsFolder, getClass().getClassLoader()) .forEach(addonList::add); }); @@ -201,7 +198,7 @@ public abstract class AbstractPlatform implements Platform { builder.append("Loading ") .append(addonList.size()) .append(" Terra addons:"); - + for(BaseAddon addon : addonList) { builder.append("\n ") .append("- ") @@ -209,10 +206,10 @@ public abstract class AbstractPlatform implements Platform { .append("@") .append(addon.getVersion().getFormatted()); } - + logger.info(builder.toString()); } - + DependencySorter sorter = new DependencySorter(); addonList.forEach(sorter::add); sorter.sort().forEach(addon -> { @@ -222,7 +219,7 @@ public abstract class AbstractPlatform implements Platform { addonRegistry.register(addon.getID(), addon); } }); - + eventManager.getHandler(FunctionalEventHandler.class) .register(internalAddon, PlatformInitializationEvent.class) .then(event -> { @@ -231,10 +228,10 @@ public abstract class AbstractPlatform implements Platform { logger.info("Loaded packs."); }) .global(); - - + + logger.info("Terra addons successfully loaded."); - + try { CommandUtil.registerAll(manager); } catch(MalformedCommandException e) { diff --git a/common/implementation/base/src/main/java/com/dfsek/terra/addon/InternalAddon.java b/common/implementation/base/src/main/java/com/dfsek/terra/addon/InternalAddon.java index d802930ce..f5716bbdb 100644 --- a/common/implementation/base/src/main/java/com/dfsek/terra/addon/InternalAddon.java +++ b/common/implementation/base/src/main/java/com/dfsek/terra/addon/InternalAddon.java @@ -25,6 +25,7 @@ import com.dfsek.terra.api.addon.BaseAddon; public class InternalAddon implements BaseAddon { private static final Version VERSION = Versions.getVersion(1, 0, 0); + @Override public String getID() { return "terra"; diff --git a/common/implementation/base/src/main/java/com/dfsek/terra/addon/dependency/CircularDependencyException.java b/common/implementation/base/src/main/java/com/dfsek/terra/addon/dependency/CircularDependencyException.java index ad4e22412..0c646d94f 100644 --- a/common/implementation/base/src/main/java/com/dfsek/terra/addon/dependency/CircularDependencyException.java +++ b/common/implementation/base/src/main/java/com/dfsek/terra/addon/dependency/CircularDependencyException.java @@ -20,7 +20,7 @@ package com.dfsek.terra.addon.dependency; import java.io.Serial; -public class CircularDependencyException extends DependencyException{ +public class CircularDependencyException extends DependencyException { @Serial private static final long serialVersionUID = -6098780459461482651L; diff --git a/common/implementation/base/src/main/java/com/dfsek/terra/addon/dependency/DependencyVersionException.java b/common/implementation/base/src/main/java/com/dfsek/terra/addon/dependency/DependencyVersionException.java index d6bff0b4b..007968451 100644 --- a/common/implementation/base/src/main/java/com/dfsek/terra/addon/dependency/DependencyVersionException.java +++ b/common/implementation/base/src/main/java/com/dfsek/terra/addon/dependency/DependencyVersionException.java @@ -20,7 +20,7 @@ package com.dfsek.terra.addon.dependency; import java.io.Serial; -public class DependencyVersionException extends DependencyException{ +public class DependencyVersionException extends DependencyException { @Serial private static final long serialVersionUID = 3564288935278878135L; diff --git a/common/implementation/base/src/main/java/com/dfsek/terra/commands/CommandUtil.java b/common/implementation/base/src/main/java/com/dfsek/terra/commands/CommandUtil.java index 6a6d8e61c..d6f8a3007 100644 --- a/common/implementation/base/src/main/java/com/dfsek/terra/commands/CommandUtil.java +++ b/common/implementation/base/src/main/java/com/dfsek/terra/commands/CommandUtil.java @@ -27,6 +27,7 @@ import com.dfsek.terra.commands.profiler.ProfileCommand; public final class CommandUtil { private static final Logger logger = LoggerFactory.getLogger(CommandUtil.class); + public static void registerAll(CommandManager manager) throws MalformedCommandException { logger.info("Registering Terra commands..."); manager.register("profile", ProfileCommand.class); diff --git a/common/implementation/base/src/main/java/com/dfsek/terra/commands/profiler/ProfileCommand.java b/common/implementation/base/src/main/java/com/dfsek/terra/commands/profiler/ProfileCommand.java index c5b684dd1..0b33156d4 100644 --- a/common/implementation/base/src/main/java/com/dfsek/terra/commands/profiler/ProfileCommand.java +++ b/common/implementation/base/src/main/java/com/dfsek/terra/commands/profiler/ProfileCommand.java @@ -42,10 +42,10 @@ public class ProfileCommand implements CommandTemplate { @Override public void execute(CommandSender sender) { sender.sendMessage(""" - ---------------Terra/profile---------------" - - "start - Starts the profiler" - - "stop - Stops the profiler" - - "query - Fetches profiler data" - - "reset - Resets profiler data"""); + ---------------Terra/profile---------------" + - "start - Starts the profiler" + - "stop - Stops the profiler" + - "query - Fetches profiler data" + - "reset - Resets profiler data"""); } } diff --git a/common/implementation/base/src/main/java/com/dfsek/terra/config/PluginConfigImpl.java b/common/implementation/base/src/main/java/com/dfsek/terra/config/PluginConfigImpl.java index c31cb1f9c..920127bbf 100644 --- a/common/implementation/base/src/main/java/com/dfsek/terra/config/PluginConfigImpl.java +++ b/common/implementation/base/src/main/java/com/dfsek/terra/config/PluginConfigImpl.java @@ -17,15 +17,12 @@ package com.dfsek.terra.config; +import com.dfsek.tectonic.api.config.template.ConfigTemplate; import com.dfsek.tectonic.api.config.template.annotations.Default; import com.dfsek.tectonic.api.config.template.annotations.Value; -import com.dfsek.tectonic.api.config.template.ConfigTemplate; import com.dfsek.tectonic.api.exception.ConfigException; import com.dfsek.tectonic.api.loader.ConfigLoader; import com.dfsek.tectonic.yaml.YamlConfiguration; - -import com.dfsek.terra.api.config.PluginConfig; - import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -33,9 +30,9 @@ import java.io.File; import java.io.FileInputStream; import java.io.IOException; import java.io.UncheckedIOException; -import java.time.Duration; import com.dfsek.terra.api.Platform; +import com.dfsek.terra.api.config.PluginConfig; @SuppressWarnings("FieldMayBeFinal") @@ -100,6 +97,7 @@ public class PluginConfigImpl implements ConfigTemplate, PluginConfig { public boolean dumpDefaultConfig() { return dumpDefaultData; } + @Override public boolean isDebugCommands() { return debugCommands; diff --git a/common/implementation/base/src/main/java/com/dfsek/terra/config/loaders/RangeLoader.java b/common/implementation/base/src/main/java/com/dfsek/terra/config/loaders/RangeLoader.java index 3ce86f62d..803c8e344 100644 --- a/common/implementation/base/src/main/java/com/dfsek/terra/config/loaders/RangeLoader.java +++ b/common/implementation/base/src/main/java/com/dfsek/terra/config/loaders/RangeLoader.java @@ -20,6 +20,7 @@ package com.dfsek.terra.config.loaders; import com.dfsek.tectonic.api.exception.LoadException; import com.dfsek.tectonic.api.loader.ConfigLoader; import com.dfsek.tectonic.api.loader.type.TypeLoader; +import org.jetbrains.annotations.NotNull; import java.lang.reflect.AnnotatedType; import java.util.Map; @@ -27,8 +28,6 @@ import java.util.Map; import com.dfsek.terra.api.util.ConstantRange; import com.dfsek.terra.api.util.Range; -import org.jetbrains.annotations.NotNull; - @SuppressWarnings("unchecked") public class RangeLoader implements TypeLoader { diff --git a/common/implementation/base/src/main/java/com/dfsek/terra/config/pack/ConfigPackAddonsTemplate.java b/common/implementation/base/src/main/java/com/dfsek/terra/config/pack/ConfigPackAddonsTemplate.java index f62abfa1d..004a961c9 100644 --- a/common/implementation/base/src/main/java/com/dfsek/terra/config/pack/ConfigPackAddonsTemplate.java +++ b/common/implementation/base/src/main/java/com/dfsek/terra/config/pack/ConfigPackAddonsTemplate.java @@ -18,12 +18,11 @@ package com.dfsek.terra.config.pack; import ca.solostudios.strata.version.VersionRange; +import com.dfsek.tectonic.api.config.template.ConfigTemplate; import com.dfsek.tectonic.api.config.template.annotations.Default; import com.dfsek.tectonic.api.config.template.annotations.Value; -import com.dfsek.tectonic.api.config.template.ConfigTemplate; import java.util.HashMap; -import java.util.HashSet; import java.util.Map; import com.dfsek.terra.api.addon.BaseAddon; diff --git a/common/implementation/base/src/main/java/com/dfsek/terra/config/pack/ConfigPackImpl.java b/common/implementation/base/src/main/java/com/dfsek/terra/config/pack/ConfigPackImpl.java index 73a3bac49..00a3b549d 100644 --- a/common/implementation/base/src/main/java/com/dfsek/terra/config/pack/ConfigPackImpl.java +++ b/common/implementation/base/src/main/java/com/dfsek/terra/config/pack/ConfigPackImpl.java @@ -161,7 +161,7 @@ public class ConfigPackImpl implements ConfigPack { ConfigPackAddonsTemplate addonsTemplate = new ConfigPackAddonsTemplate(); selfLoader.load(addonsTemplate, packManifest); this.addons = addonsTemplate.getAddons(); - + Map configurations = discoverConfigurations(); registerMeta(configurations); diff --git a/common/implementation/base/src/main/java/com/dfsek/terra/config/pack/ConfigPackPostTemplate.java b/common/implementation/base/src/main/java/com/dfsek/terra/config/pack/ConfigPackPostTemplate.java index 81664e176..cfa166a40 100644 --- a/common/implementation/base/src/main/java/com/dfsek/terra/config/pack/ConfigPackPostTemplate.java +++ b/common/implementation/base/src/main/java/com/dfsek/terra/config/pack/ConfigPackPostTemplate.java @@ -17,8 +17,8 @@ package com.dfsek.terra.config.pack; -import com.dfsek.tectonic.api.config.template.annotations.Value; import com.dfsek.tectonic.api.config.template.ConfigTemplate; +import com.dfsek.tectonic.api.config.template.annotations.Value; import com.dfsek.terra.api.config.meta.Meta; import com.dfsek.terra.api.world.biome.generation.BiomeProvider; diff --git a/common/implementation/base/src/main/java/com/dfsek/terra/config/pack/ConfigPackTemplate.java b/common/implementation/base/src/main/java/com/dfsek/terra/config/pack/ConfigPackTemplate.java index 6faaaa3cb..476ed6358 100644 --- a/common/implementation/base/src/main/java/com/dfsek/terra/config/pack/ConfigPackTemplate.java +++ b/common/implementation/base/src/main/java/com/dfsek/terra/config/pack/ConfigPackTemplate.java @@ -17,9 +17,9 @@ package com.dfsek.terra.config.pack; +import com.dfsek.tectonic.api.config.template.ConfigTemplate; import com.dfsek.tectonic.api.config.template.annotations.Default; import com.dfsek.tectonic.api.config.template.annotations.Value; -import com.dfsek.tectonic.api.config.template.ConfigTemplate; import java.util.HashMap; import java.util.List; @@ -28,7 +28,6 @@ import java.util.Map; import com.dfsek.terra.api.config.meta.Meta; import com.dfsek.terra.api.world.chunk.generation.stage.GenerationStage; import com.dfsek.terra.api.world.chunk.generation.util.provider.ChunkGeneratorProvider; -import com.dfsek.terra.api.world.chunk.generation.util.provider.GenerationStageProvider; @SuppressWarnings({ "unused", "FieldMayBeFinal" }) diff --git a/common/implementation/base/src/main/java/com/dfsek/terra/config/preprocessor/MetaListLikePreprocessor.java b/common/implementation/base/src/main/java/com/dfsek/terra/config/preprocessor/MetaListLikePreprocessor.java index f91693e65..932ccb912 100644 --- a/common/implementation/base/src/main/java/com/dfsek/terra/config/preprocessor/MetaListLikePreprocessor.java +++ b/common/implementation/base/src/main/java/com/dfsek/terra/config/preprocessor/MetaListLikePreprocessor.java @@ -43,7 +43,7 @@ public class MetaListLikePreprocessor extends MetaPreprocessor { public @NotNull Result process(AnnotatedType t, T c, ConfigLoader loader, Meta annotation) { if(t.getType() instanceof ParameterizedType parameterizedType) { if(parameterizedType.getRawType() instanceof Class baseClass) { // Should always be true but we check anyways - + if((List.class.isAssignableFrom(baseClass) || Set.class.isAssignableFrom(baseClass)) && c instanceof List) { // List or set metaconfig List list = (List) c; diff --git a/common/implementation/base/src/main/java/com/dfsek/terra/config/preprocessor/MetaMapPreprocessor.java b/common/implementation/base/src/main/java/com/dfsek/terra/config/preprocessor/MetaMapPreprocessor.java index 1ee4a14fa..8b4cb5d0a 100644 --- a/common/implementation/base/src/main/java/com/dfsek/terra/config/preprocessor/MetaMapPreprocessor.java +++ b/common/implementation/base/src/main/java/com/dfsek/terra/config/preprocessor/MetaMapPreprocessor.java @@ -46,7 +46,7 @@ public class MetaMapPreprocessor extends MetaPreprocessor { public @NotNull Result process(AnnotatedType t, T c, ConfigLoader loader, Meta annotation) { if(t.getType() instanceof ParameterizedType parameterizedType) { if(parameterizedType.getRawType() instanceof Class baseClass) { // Should always be true but we check anyways - + if(Map.class.isAssignableFrom(baseClass) && c instanceof Map) { // Map metaconfig Map map = (Map) c; diff --git a/common/implementation/base/src/main/java/com/dfsek/terra/config/prototype/ProtoConfig.java b/common/implementation/base/src/main/java/com/dfsek/terra/config/prototype/ProtoConfig.java index de17dbb59..928aaaf72 100644 --- a/common/implementation/base/src/main/java/com/dfsek/terra/config/prototype/ProtoConfig.java +++ b/common/implementation/base/src/main/java/com/dfsek/terra/config/prototype/ProtoConfig.java @@ -17,8 +17,8 @@ package com.dfsek.terra.config.prototype; -import com.dfsek.tectonic.api.config.template.annotations.Value; import com.dfsek.tectonic.api.config.template.ConfigTemplate; +import com.dfsek.tectonic.api.config.template.annotations.Value; import com.dfsek.terra.api.config.ConfigType; diff --git a/common/implementation/base/src/main/java/com/dfsek/terra/registry/CheckedRegistryImpl.java b/common/implementation/base/src/main/java/com/dfsek/terra/registry/CheckedRegistryImpl.java index 96483f0ad..8e2c85d7d 100644 --- a/common/implementation/base/src/main/java/com/dfsek/terra/registry/CheckedRegistryImpl.java +++ b/common/implementation/base/src/main/java/com/dfsek/terra/registry/CheckedRegistryImpl.java @@ -19,6 +19,7 @@ package com.dfsek.terra.registry; import com.dfsek.tectonic.api.exception.LoadException; import com.dfsek.tectonic.api.loader.ConfigLoader; +import org.jetbrains.annotations.NotNull; import java.lang.reflect.AnnotatedType; import java.util.Collection; @@ -30,7 +31,6 @@ import java.util.function.Consumer; import com.dfsek.terra.api.registry.CheckedRegistry; import com.dfsek.terra.api.registry.OpenRegistry; import com.dfsek.terra.api.registry.exception.DuplicateEntryException; -import org.jetbrains.annotations.NotNull; /** diff --git a/common/implementation/base/src/main/java/com/dfsek/terra/registry/LockedRegistryImpl.java b/common/implementation/base/src/main/java/com/dfsek/terra/registry/LockedRegistryImpl.java index 479d20fbc..07cbd7941 100644 --- a/common/implementation/base/src/main/java/com/dfsek/terra/registry/LockedRegistryImpl.java +++ b/common/implementation/base/src/main/java/com/dfsek/terra/registry/LockedRegistryImpl.java @@ -19,6 +19,7 @@ package com.dfsek.terra.registry; import com.dfsek.tectonic.api.exception.LoadException; import com.dfsek.tectonic.api.loader.ConfigLoader; +import org.jetbrains.annotations.NotNull; import java.lang.reflect.AnnotatedType; import java.util.Collection; @@ -29,8 +30,6 @@ import java.util.function.Consumer; import com.dfsek.terra.api.registry.Registry; -import org.jetbrains.annotations.NotNull; - /** * Wrapper for a registry that forbids all write access. diff --git a/common/implementation/base/src/test/java/MetaTest.java b/common/implementation/base/src/test/java/MetaTest.java index d044e2f58..81a90544b 100644 --- a/common/implementation/base/src/test/java/MetaTest.java +++ b/common/implementation/base/src/test/java/MetaTest.java @@ -1,6 +1,6 @@ -import com.dfsek.tectonic.api.config.template.annotations.Value; -import com.dfsek.tectonic.api.config.template.ConfigTemplate; import com.dfsek.tectonic.api.config.Configuration; +import com.dfsek.tectonic.api.config.template.ConfigTemplate; +import com.dfsek.tectonic.api.config.template.annotations.Value; import com.dfsek.tectonic.api.loader.ConfigLoader; import com.dfsek.tectonic.yaml.YamlConfiguration; import org.junit.jupiter.api.Test; diff --git a/common/implementation/base/src/test/java/registry/RegistryTest.java b/common/implementation/base/src/test/java/registry/RegistryTest.java index 7eadfa517..2c630e241 100644 --- a/common/implementation/base/src/test/java/registry/RegistryTest.java +++ b/common/implementation/base/src/test/java/registry/RegistryTest.java @@ -48,7 +48,7 @@ public class RegistryTest { test.registerChecked("test", "bazinga2"); fail("Shouldn't be able to re-register with #registerChecked!"); } catch(DuplicateEntryException ignore) { - + } } @@ -64,7 +64,7 @@ public class RegistryTest { test.register("test", "bazinga2"); fail("Shouldn't be able to re-register in CheckedRegistry!"); } catch(DuplicateEntryException ignore) { - + } } } diff --git a/common/implementation/bootstrap-addon-loader/src/main/java/com/dfsek/terra/addon/BootstrapAddonLoader.java b/common/implementation/bootstrap-addon-loader/src/main/java/com/dfsek/terra/addon/BootstrapAddonLoader.java index 67729765b..15d0199cc 100644 --- a/common/implementation/bootstrap-addon-loader/src/main/java/com/dfsek/terra/addon/BootstrapAddonLoader.java +++ b/common/implementation/bootstrap-addon-loader/src/main/java/com/dfsek/terra/addon/BootstrapAddonLoader.java @@ -40,6 +40,7 @@ import com.dfsek.terra.api.addon.bootstrap.BootstrapBaseAddon; public class BootstrapAddonLoader implements BootstrapBaseAddon> { private static final Logger logger = LoggerFactory.getLogger(BootstrapAddonLoader.class); private static final Version VERSION = Versions.getVersion(1, 0, 0); + public BootstrapAddonLoader() { } private BootstrapBaseAddon loadAddon(Path addonPath, ClassLoader parent) { diff --git a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/PlatformImpl.java b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/PlatformImpl.java index 6928f4844..1618349e4 100644 --- a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/PlatformImpl.java +++ b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/PlatformImpl.java @@ -17,10 +17,11 @@ package com.dfsek.terra.bukkit; -import com.dfsek.tectonic.api.exception.LoadException; import com.dfsek.tectonic.api.TypeRegistry; +import com.dfsek.tectonic.api.exception.LoadException; import org.bukkit.Bukkit; import org.bukkit.entity.EntityType; +import org.jetbrains.annotations.NotNull; import java.io.File; import java.util.Locale; @@ -34,8 +35,6 @@ import com.dfsek.terra.bukkit.handles.BukkitItemHandle; import com.dfsek.terra.bukkit.handles.BukkitWorldHandle; import com.dfsek.terra.bukkit.world.BukkitPlatformBiome; -import org.jetbrains.annotations.NotNull; - public class PlatformImpl extends AbstractPlatform { private final ItemHandle itemHandle = new BukkitItemHandle(); diff --git a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/TerraBukkitPlugin.java b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/TerraBukkitPlugin.java index ce8d95a89..55818a4aa 100644 --- a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/TerraBukkitPlugin.java +++ b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/TerraBukkitPlugin.java @@ -134,7 +134,8 @@ public class TerraBukkitPlugin extends JavaPlugin { @SuppressWarnings({ "deprecation", "AccessOfSystemProperties" }) private boolean doVersionCheck() { - logger.info("Running on Minecraft version {} with server implementation {}.", VersionUtil.getMinecraftVersionInfo(), Bukkit.getServer().getName()); + logger.info("Running on Minecraft version {} with server implementation {}.", VersionUtil.getMinecraftVersionInfo(), + Bukkit.getServer().getName()); if(!VersionUtil.getSpigotVersionInfo().isSpigot()) logger.error("YOU ARE RUNNING A CRAFTBUKKIT OR BUKKIT SERVER. PLEASE UPGRADE TO PAPER."); @@ -204,7 +205,8 @@ public class TerraBukkitPlugin extends JavaPlugin { public @Nullable ChunkGenerator getDefaultWorldGenerator(@NotNull String worldName, String id) { return new BukkitChunkGeneratorWrapper(generatorMap.computeIfAbsent(worldName, name -> { - ConfigPack pack = platform.getConfigRegistry().get(id).orElseThrow(() -> new IllegalArgumentException("No such config pack \"" + id + "\"")); + ConfigPack pack = platform.getConfigRegistry().get(id).orElseThrow( + () -> new IllegalArgumentException("No such config pack \"" + id + "\"")); return pack.getGeneratorProvider().newInstance(pack); }), platform.getRawConfigRegistry().get(id).orElseThrow()); } diff --git a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/generator/BukkitBiomeProvider.java b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/generator/BukkitBiomeProvider.java index e4b4c3528..c1eed4fc8 100644 --- a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/generator/BukkitBiomeProvider.java +++ b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/generator/BukkitBiomeProvider.java @@ -1,7 +1,5 @@ package com.dfsek.terra.bukkit.generator; -import com.dfsek.terra.api.world.biome.Biome; - import org.bukkit.generator.BiomeProvider; import org.bukkit.generator.WorldInfo; import org.jetbrains.annotations.NotNull; @@ -11,6 +9,7 @@ import java.util.stream.Collectors; import java.util.stream.StreamSupport; import com.dfsek.terra.api.Handle; +import com.dfsek.terra.api.world.biome.Biome; public class BukkitBiomeProvider extends BiomeProvider implements Handle { 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 ee5e35eb0..ecc52ecf1 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 @@ -40,12 +40,10 @@ import com.dfsek.terra.bukkit.world.BukkitServerWorld; public class BukkitChunkGeneratorWrapper extends org.bukkit.generator.ChunkGenerator implements GeneratorWrapper { private final ChunkGenerator delegate; - + private final ConfigPack pack; private World world; private ServerWorld terraWorld; - private final ConfigPack pack; - public BukkitChunkGeneratorWrapper(ChunkGenerator delegate, ConfigPack pack) { this.delegate = delegate; this.pack = pack; diff --git a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/handles/BukkitWorldHandle.java b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/handles/BukkitWorldHandle.java index a5ab122ea..6bedd955f 100644 --- a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/handles/BukkitWorldHandle.java +++ b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/handles/BukkitWorldHandle.java @@ -20,6 +20,7 @@ package com.dfsek.terra.bukkit.handles; import com.dfsek.tectonic.api.exception.LoadException; import org.bukkit.Bukkit; import org.bukkit.Material; +import org.jetbrains.annotations.NotNull; import java.util.Locale; @@ -29,8 +30,6 @@ import com.dfsek.terra.api.handle.WorldHandle; import com.dfsek.terra.bukkit.world.block.data.BukkitBlockState; import com.dfsek.terra.bukkit.world.entity.BukkitEntityType; -import org.jetbrains.annotations.NotNull; - public class BukkitWorldHandle implements WorldHandle { private final BlockState air; @@ -51,7 +50,7 @@ public class BukkitWorldHandle implements WorldHandle { } @Override - public @NotNull EntityType getEntity(String id) { + public @NotNull EntityType getEntity(@NotNull String id) { if(!id.startsWith("minecraft:")) throw new LoadException("Invalid entity identifier " + id); return new BukkitEntityType(org.bukkit.entity.EntityType.valueOf(id.toUpperCase(Locale.ROOT).substring(10))); } diff --git a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/listeners/SpigotListener.java b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/listeners/SpigotListener.java index b8e1ee566..796053e82 100644 --- a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/listeners/SpigotListener.java +++ b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/listeners/SpigotListener.java @@ -37,8 +37,8 @@ import com.dfsek.terra.api.Platform; * StructureLocateEvent). */ public class SpigotListener implements Listener { - private final Platform platform; private static final Logger logger = LoggerFactory.getLogger(SpigotListener.class); + private final Platform platform; public SpigotListener(Platform platform) { this.platform = platform; diff --git a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/util/VersionUtil.java b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/util/VersionUtil.java index 57357ac6c..469582bf2 100644 --- a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/util/VersionUtil.java +++ b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/util/VersionUtil.java @@ -59,7 +59,7 @@ public final class VersionUtil { logger.debug("Spigot version info parsed successfully."); } - + public boolean isPaper() { return paper; } @@ -67,7 +67,7 @@ public final class VersionUtil { public boolean isMohist() { return mohist; } - + public boolean isSpigot() { return spigot; } diff --git a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/world/BukkitAdapter.java b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/world/BukkitAdapter.java index 56303fc17..5cc0ef271 100644 --- a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/world/BukkitAdapter.java +++ b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/world/BukkitAdapter.java @@ -18,8 +18,6 @@ package com.dfsek.terra.bukkit.world; -import com.dfsek.terra.api.world.ServerWorld; - import org.bukkit.Location; import org.bukkit.Material; import org.bukkit.TreeType; @@ -37,6 +35,7 @@ import com.dfsek.terra.api.entity.CommandSender; import com.dfsek.terra.api.inventory.ItemStack; import com.dfsek.terra.api.inventory.item.Enchantment; import com.dfsek.terra.api.util.vector.Vector3; +import com.dfsek.terra.api.world.ServerWorld; import com.dfsek.terra.api.world.chunk.Chunk; import com.dfsek.terra.bukkit.BukkitCommandSender; import com.dfsek.terra.bukkit.BukkitEntity; diff --git a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/world/BukkitChunk.java b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/world/BukkitChunk.java index 126cd65db..a7ce8c62b 100644 --- a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/world/BukkitChunk.java +++ b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/world/BukkitChunk.java @@ -17,12 +17,11 @@ package com.dfsek.terra.bukkit.world; -import com.dfsek.terra.api.world.chunk.Chunk; - import org.jetbrains.annotations.NotNull; import com.dfsek.terra.api.block.state.BlockState; import com.dfsek.terra.api.world.ServerWorld; +import com.dfsek.terra.api.world.chunk.Chunk; public class BukkitChunk implements Chunk { diff --git a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/world/BukkitProtoWorld.java b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/world/BukkitProtoWorld.java index 9cdc46acf..da3ad2fcd 100644 --- a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/world/BukkitProtoWorld.java +++ b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/world/BukkitProtoWorld.java @@ -1,12 +1,11 @@ package com.dfsek.terra.bukkit.world; -import com.dfsek.terra.api.config.ConfigPack; - import org.bukkit.Location; import org.bukkit.generator.LimitedRegion; import com.dfsek.terra.api.block.entity.BlockEntity; import com.dfsek.terra.api.block.state.BlockState; +import com.dfsek.terra.api.config.ConfigPack; import com.dfsek.terra.api.entity.Entity; import com.dfsek.terra.api.entity.EntityType; import com.dfsek.terra.api.world.ServerWorld; @@ -67,7 +66,7 @@ public class BukkitProtoWorld implements ProtoWorld { public Entity spawnEntity(double x, double y, double z, EntityType entityType) { return new BukkitEntity( delegate.spawnEntity(new Location(delegate.getWorld(), x, y, z), ((BukkitEntityType) entityType).getHandle())); - + } @Override diff --git a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/world/BukkitServerWorld.java b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/world/BukkitServerWorld.java index 97e181ab7..b1b53f6e2 100644 --- a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/world/BukkitServerWorld.java +++ b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/world/BukkitServerWorld.java @@ -17,22 +17,22 @@ package com.dfsek.terra.bukkit.world; +import org.bukkit.Location; + import com.dfsek.terra.api.block.entity.BlockEntity; import com.dfsek.terra.api.block.state.BlockState; import com.dfsek.terra.api.config.ConfigPack; import com.dfsek.terra.api.entity.Entity; import com.dfsek.terra.api.entity.EntityType; import com.dfsek.terra.api.world.ServerWorld; -import com.dfsek.terra.api.world.chunk.Chunk; import com.dfsek.terra.api.world.biome.generation.BiomeProvider; +import com.dfsek.terra.api.world.chunk.Chunk; import com.dfsek.terra.api.world.chunk.generation.ChunkGenerator; import com.dfsek.terra.bukkit.BukkitEntity; import com.dfsek.terra.bukkit.generator.BukkitChunkGeneratorWrapper; import com.dfsek.terra.bukkit.world.block.state.BukkitBlockEntity; import com.dfsek.terra.bukkit.world.entity.BukkitEntityType; -import org.bukkit.Location; - public class BukkitServerWorld implements ServerWorld { private final org.bukkit.World delegate; diff --git a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/FabricAddon.java b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/FabricAddon.java index 82820e84e..f8c7b9b61 100644 --- a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/FabricAddon.java +++ b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/FabricAddon.java @@ -42,9 +42,8 @@ import com.dfsek.terra.fabric.util.FabricUtil; public final class FabricAddon implements BaseAddon { private static final Version VERSION = Versions.getVersion(1, 0, 0); - private final PlatformImpl terraFabricPlugin; private static final Logger logger = LoggerFactory.getLogger(FabricAddon.class); - + private final PlatformImpl terraFabricPlugin; private final Map> templates = new HashMap<>(); public FabricAddon(PlatformImpl terraFabricPlugin) { diff --git a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/PlatformImpl.java b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/PlatformImpl.java index 3135bfc6d..8abe49a0d 100644 --- a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/PlatformImpl.java +++ b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/PlatformImpl.java @@ -20,11 +20,8 @@ package com.dfsek.terra.fabric; import ca.solostudios.strata.Versions; import ca.solostudios.strata.parser.tokenizer.ParseException; import ca.solostudios.strata.version.Version; -import com.dfsek.tectonic.api.exception.LoadException; import com.dfsek.tectonic.api.TypeRegistry; - -import com.dfsek.terra.api.world.biome.PlatformBiome; - +import com.dfsek.tectonic.api.exception.LoadException; import net.fabricmc.loader.api.FabricLoader; import net.minecraft.MinecraftVersion; import net.minecraft.server.world.ServerWorld; @@ -46,6 +43,7 @@ import com.dfsek.terra.api.addon.BaseAddon; import com.dfsek.terra.api.handle.ItemHandle; import com.dfsek.terra.api.handle.WorldHandle; import com.dfsek.terra.api.util.generic.Lazy; +import com.dfsek.terra.api.world.biome.PlatformBiome; import com.dfsek.terra.fabric.generation.FabricChunkGeneratorWrapper; import com.dfsek.terra.fabric.handle.FabricItemHandle; import com.dfsek.terra.fabric.handle.FabricWorldHandle; diff --git a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/block/FabricBlockState.java b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/block/FabricBlockState.java index 12f93439e..3f512445c 100644 --- a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/block/FabricBlockState.java +++ b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/block/FabricBlockState.java @@ -45,7 +45,7 @@ public class FabricBlockState implements BlockState { PROPERTY_DELEGATES_T2M = Construct.construct(() -> { Map, Pair, Function>> map = new HashMap<>(); map.put(Properties.AXIS, Pair.of(net.minecraft.state.property.Properties.AXIS, - a -> FabricAdapter.adapt((net.minecraft.util.math.Direction.Axis) a))); + a -> FabricAdapter.adapt((net.minecraft.util.math.Direction.Axis) a))); map.put(Properties.NORTH, Pair.of(net.minecraft.state.property.Properties.NORTH, Function.identity())); map.put(Properties.SOUTH, Pair.of(net.minecraft.state.property.Properties.SOUTH, Function.identity())); @@ -53,13 +53,13 @@ public class FabricBlockState implements BlockState { map.put(Properties.WEST, Pair.of(net.minecraft.state.property.Properties.WEST, Function.identity())); map.put(Properties.NORTH_CONNECTION, Pair.of(net.minecraft.state.property.Properties.NORTH_WIRE_CONNECTION, - c -> FabricAdapter.adapt((WireConnection) c))); + c -> FabricAdapter.adapt((WireConnection) c))); map.put(Properties.SOUTH_CONNECTION, Pair.of(net.minecraft.state.property.Properties.SOUTH_WIRE_CONNECTION, - c -> FabricAdapter.adapt((WireConnection) c))); + c -> FabricAdapter.adapt((WireConnection) c))); map.put(Properties.EAST_CONNECTION, Pair.of(net.minecraft.state.property.Properties.EAST_WIRE_CONNECTION, - c -> FabricAdapter.adapt((WireConnection) c))); + c -> FabricAdapter.adapt((WireConnection) c))); map.put(Properties.WEST_CONNECTION, Pair.of(net.minecraft.state.property.Properties.WEST_WIRE_CONNECTION, - c -> FabricAdapter.adapt((WireConnection) c))); + c -> FabricAdapter.adapt((WireConnection) c))); map.put(Properties.NORTH_HEIGHT, diff --git a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/config/PostLoadCompatibilityOptions.java b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/config/PostLoadCompatibilityOptions.java index 8721b5059..8a2804062 100644 --- a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/config/PostLoadCompatibilityOptions.java +++ b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/config/PostLoadCompatibilityOptions.java @@ -17,18 +17,17 @@ package com.dfsek.terra.fabric.config; +import com.dfsek.tectonic.api.config.template.ConfigTemplate; import com.dfsek.tectonic.api.config.template.annotations.Default; import com.dfsek.tectonic.api.config.template.annotations.Value; -import com.dfsek.tectonic.api.config.template.ConfigTemplate; - -import com.dfsek.terra.api.world.biome.Biome; - import net.minecraft.util.Identifier; import java.util.HashMap; import java.util.Map; import java.util.Set; +import com.dfsek.terra.api.world.biome.Biome; + @SuppressWarnings("FieldMayBeFinal") public class PostLoadCompatibilityOptions implements ConfigTemplate { diff --git a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/config/PreLoadCompatibilityOptions.java b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/config/PreLoadCompatibilityOptions.java index 3dbfdfdd7..da8d24f22 100644 --- a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/config/PreLoadCompatibilityOptions.java +++ b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/config/PreLoadCompatibilityOptions.java @@ -17,9 +17,9 @@ package com.dfsek.terra.fabric.config; +import com.dfsek.tectonic.api.config.template.ConfigTemplate; import com.dfsek.tectonic.api.config.template.annotations.Default; import com.dfsek.tectonic.api.config.template.annotations.Value; -import com.dfsek.tectonic.api.config.template.ConfigTemplate; import net.minecraft.util.Identifier; import java.util.HashSet; 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 fbfc8ab06..829623215 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 @@ -66,8 +66,6 @@ import com.dfsek.terra.fabric.mixin.access.StructureAccessorAccessor; public class FabricChunkGeneratorWrapper extends net.minecraft.world.gen.chunk.ChunkGenerator implements GeneratorWrapper { - private static final Logger logger = LoggerFactory.getLogger(FabricChunkGeneratorWrapper.class); - public static final Codec PACK_CODEC = RecordCodecBuilder.create( config -> config.group( Codec.STRING.fieldOf("pack") @@ -79,7 +77,7 @@ public class FabricChunkGeneratorWrapper extends net.minecraft.world.gen.chunk.C () -> new IllegalArgumentException( "No such config pack " + id))))); - + private static final Logger logger = LoggerFactory.getLogger(FabricChunkGeneratorWrapper.class); public static final Codec CODEC = RecordCodecBuilder.create( instance -> instance.group( TerraBiomeSource.CODEC.fieldOf("biome_source") @@ -118,14 +116,6 @@ public class FabricChunkGeneratorWrapper extends net.minecraft.world.gen.chunk.C return new FabricChunkGeneratorWrapper((TerraBiomeSource) this.biomeSource.withSeed(seed), seed, pack); } - public void setPack(ConfigPack pack) { - this.pack = pack; - this.delegate = pack.getGeneratorProvider().newInstance(pack); - biomeSource.setPack(pack); - - logger.debug("Loading world with config pack {}", pack.getID()); - } - @Override public MultiNoiseUtil.MultiNoiseSampler getMultiNoiseSampler() { return (x, y, z) -> new MultiNoiseUtil.NoiseValuePoint(0, 0, 0, 0, 0, 0); @@ -236,7 +226,8 @@ public class FabricChunkGeneratorWrapper extends net.minecraft.world.gen.chunk.C public VerticalBlockSample getColumnSample(int x, int z, HeightLimitView view) { BlockState[] array = new BlockState[view.getHeight()]; for(int y = view.getTopY() - 1; y >= view.getBottomY(); y--) { - array[y - view.getBottomY()] = ((FabricBlockState) ((ServerWorld) world).getGenerator().getBlock((ServerWorld) world, x, y, z)).getHandle(); + array[y - view.getBottomY()] = ((FabricBlockState) ((ServerWorld) world).getGenerator().getBlock((ServerWorld) world, x, y, + z)).getHandle(); } return new VerticalBlockSample(view.getBottomY(), array); } @@ -245,6 +236,14 @@ public class FabricChunkGeneratorWrapper extends net.minecraft.world.gen.chunk.C return pack; } + public void setPack(ConfigPack pack) { + this.pack = pack; + this.delegate = pack.getGeneratorProvider().newInstance(pack); + biomeSource.setPack(pack); + + logger.debug("Loading world with config pack {}", pack.getID()); + } + @Override public void carve(ChunkRegion chunkRegion, long seed, BiomeAccess biomeAccess, StructureAccessor structureAccessor, Chunk chunk, GenerationStep.Carver generationStep) { diff --git a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/generation/TerraBiomeSource.java b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/generation/TerraBiomeSource.java index a08d96751..428c47690 100644 --- a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/generation/TerraBiomeSource.java +++ b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/generation/TerraBiomeSource.java @@ -17,8 +17,6 @@ package com.dfsek.terra.fabric.generation; -import com.dfsek.terra.api.world.biome.Biome; - import com.mojang.serialization.Codec; import com.mojang.serialization.codecs.RecordCodecBuilder; import net.minecraft.util.Identifier; @@ -31,6 +29,7 @@ import java.util.Objects; import java.util.stream.Collectors; import com.dfsek.terra.api.config.ConfigPack; +import com.dfsek.terra.api.world.biome.Biome; import com.dfsek.terra.api.world.biome.generation.BiomeProvider; import com.dfsek.terra.fabric.FabricEntryPoint; import com.dfsek.terra.fabric.util.FabricUtil; diff --git a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/generation/TerraGeneratorType.java b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/generation/TerraGeneratorType.java index fbfeeefc2..3c0dc1d50 100644 --- a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/generation/TerraGeneratorType.java +++ b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/generation/TerraGeneratorType.java @@ -22,10 +22,8 @@ import net.fabricmc.api.Environment; import net.minecraft.client.world.GeneratorType; import net.minecraft.util.registry.DynamicRegistryManager; import net.minecraft.util.registry.Registry; -import net.minecraft.world.biome.Biome; import net.minecraft.world.gen.GeneratorOptions; import net.minecraft.world.gen.chunk.ChunkGenerator; -import net.minecraft.world.gen.chunk.ChunkGeneratorSettings; import com.dfsek.terra.api.config.ConfigPack; import com.dfsek.terra.fabric.FabricEntryPoint; diff --git a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/handle/FabricWorldHandle.java b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/handle/FabricWorldHandle.java index f2eb98dd2..a3bdd523d 100644 --- a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/handle/FabricWorldHandle.java +++ b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/handle/FabricWorldHandle.java @@ -24,14 +24,13 @@ import net.minecraft.block.Blocks; import net.minecraft.command.argument.BlockArgumentParser; import net.minecraft.util.Identifier; import net.minecraft.util.registry.Registry; +import org.jetbrains.annotations.NotNull; import com.dfsek.terra.api.entity.EntityType; import com.dfsek.terra.api.handle.WorldHandle; import com.dfsek.terra.fabric.block.FabricBlockState; import com.dfsek.terra.fabric.util.FabricAdapter; -import org.jetbrains.annotations.NotNull; - public class FabricWorldHandle implements WorldHandle { diff --git a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/mixin/ConfiguredStructureFeaturesMixin.java b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/mixin/ConfiguredStructureFeaturesMixin.java index 78192f894..39c812023 100644 --- a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/mixin/ConfiguredStructureFeaturesMixin.java +++ b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/mixin/ConfiguredStructureFeaturesMixin.java @@ -1,7 +1,5 @@ package com.dfsek.terra.fabric.mixin; -import com.dfsek.terra.fabric.util.FabricUtil; - import net.minecraft.util.registry.RegistryKey; import net.minecraft.world.biome.Biome; import net.minecraft.world.gen.feature.ConfiguredStructureFeature; @@ -14,10 +12,14 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; import java.util.Set; import java.util.function.BiConsumer; +import com.dfsek.terra.fabric.util.FabricUtil; + @Mixin(ConfiguredStructureFeatures.class) public class ConfiguredStructureFeaturesMixin { - @Inject(method = "register(Ljava/util/function/BiConsumer;Lnet/minecraft/world/gen/feature/ConfiguredStructureFeature;Lnet/minecraft/util/registry/RegistryKey;)V", at = @At("HEAD")) + @Inject(method = "register(Ljava/util/function/BiConsumer;Lnet/minecraft/world/gen/feature/ConfiguredStructureFeature;" + + "Lnet/minecraft/util/registry/RegistryKey;)V", + at = @At("HEAD")) private static void addStructuresToTerraBiomes(BiConsumer, RegistryKey> registrar, ConfiguredStructureFeature feature, RegistryKey biome, @@ -27,7 +29,8 @@ public class ConfiguredStructureFeaturesMixin { } } - @Inject(method = "register(Ljava/util/function/BiConsumer;Lnet/minecraft/world/gen/feature/ConfiguredStructureFeature;Ljava/util/Set;)V", + @Inject(method = "register(Ljava/util/function/BiConsumer;Lnet/minecraft/world/gen/feature/ConfiguredStructureFeature;Ljava/util/Set;" + + ")V", at = @At("HEAD")) private static void addStructuresToTerraBiomes(BiConsumer, RegistryKey> registrar, ConfiguredStructureFeature feature, Set> biomes, diff --git a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/mixin/access/MobSpawnerLogicAccessor.java b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/mixin/access/MobSpawnerLogicAccessor.java index 9ba869f29..28cda62be 100644 --- a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/mixin/access/MobSpawnerLogicAccessor.java +++ b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/mixin/access/MobSpawnerLogicAccessor.java @@ -17,14 +17,10 @@ package com.dfsek.terra.fabric.mixin.access; -import net.minecraft.util.Identifier; -import net.minecraft.util.math.BlockPos; import net.minecraft.world.MobSpawnerEntry; import net.minecraft.world.MobSpawnerLogic; -import net.minecraft.world.World; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.gen.Accessor; -import org.spongepowered.asm.mixin.gen.Invoker; @Mixin(MobSpawnerLogic.class) diff --git a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/mixin/implementations/BiomeMixin.java b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/mixin/implementations/BiomeMixin.java index 94ead321e..d25a4b582 100644 --- a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/mixin/implementations/BiomeMixin.java +++ b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/mixin/implementations/BiomeMixin.java @@ -17,14 +17,14 @@ package com.dfsek.terra.fabric.mixin.implementations; -import com.dfsek.terra.api.world.biome.PlatformBiome; - import net.minecraft.world.biome.Biome; import org.spongepowered.asm.mixin.Implements; import org.spongepowered.asm.mixin.Interface; import org.spongepowered.asm.mixin.Intrinsic; import org.spongepowered.asm.mixin.Mixin; +import com.dfsek.terra.api.world.biome.PlatformBiome; + @Mixin(Biome.class) @Implements(@Interface(iface = PlatformBiome.class, prefix = "terra$", remap = Interface.Remap.NONE)) diff --git a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/mixin/implementations/block/state/MobSpawnerBlockEntityMixin.java b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/mixin/implementations/block/state/MobSpawnerBlockEntityMixin.java index de9a0f7c7..4e260f0bf 100644 --- a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/mixin/implementations/block/state/MobSpawnerBlockEntityMixin.java +++ b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/mixin/implementations/block/state/MobSpawnerBlockEntityMixin.java @@ -62,7 +62,7 @@ public abstract class MobSpawnerBlockEntityMixin extends BlockEntity { } public void terra$setDelay(int delay) { - + } public int terra$getMinSpawnDelay() { @@ -70,7 +70,7 @@ public abstract class MobSpawnerBlockEntityMixin extends BlockEntity { } public void terra$setMinSpawnDelay(int delay) { - + } public int terra$getMaxSpawnDelay() { @@ -78,7 +78,7 @@ public abstract class MobSpawnerBlockEntityMixin extends BlockEntity { } public void terra$setMaxSpawnDelay(int delay) { - + } public int terra$getSpawnCount() { @@ -86,7 +86,7 @@ public abstract class MobSpawnerBlockEntityMixin extends BlockEntity { } public void terra$setSpawnCount(int spawnCount) { - + } public int terra$getMaxNearbyEntities() { @@ -94,7 +94,7 @@ public abstract class MobSpawnerBlockEntityMixin extends BlockEntity { } public void terra$setMaxNearbyEntities(int maxNearbyEntities) { - + } public int terra$getRequiredPlayerRange() { @@ -102,7 +102,7 @@ public abstract class MobSpawnerBlockEntityMixin extends BlockEntity { } public void terra$setRequiredPlayerRange(int requiredPlayerRange) { - + } public int terra$getSpawnRange() { @@ -110,7 +110,7 @@ public abstract class MobSpawnerBlockEntityMixin extends BlockEntity { } public void terra$setSpawnRange(int spawnRange) { - + } public void terra$applyState(String state) { diff --git a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/mixin/implementations/chunk/ChunkRegionMixin.java b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/mixin/implementations/chunk/ChunkRegionMixin.java index 929bebc5d..7c1b8fcbd 100644 --- a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/mixin/implementations/chunk/ChunkRegionMixin.java +++ b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/mixin/implementations/chunk/ChunkRegionMixin.java @@ -17,9 +17,6 @@ package com.dfsek.terra.fabric.mixin.implementations.chunk; -import com.dfsek.terra.api.world.ServerWorld; -import com.dfsek.terra.api.world.chunk.Chunk; - import net.minecraft.util.math.BlockPos; import net.minecraft.world.ChunkRegion; import org.jetbrains.annotations.NotNull; @@ -30,6 +27,7 @@ import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Shadow; import com.dfsek.terra.api.block.state.BlockState; +import com.dfsek.terra.api.world.chunk.Chunk; import com.dfsek.terra.fabric.block.FabricBlockState; @@ -48,7 +46,8 @@ public abstract class ChunkRegionMixin { public @NotNull BlockState terraChunk$getBlock(int x, int y, int z) { return new FabricBlockState( - ((ChunkRegion) (Object) this).getBlockState(new BlockPos(x + (centerPos.getPos().x << 4), y, z + (centerPos.getPos().z << 4)))); + ((ChunkRegion) (Object) this).getBlockState( + new BlockPos(x + (centerPos.getPos().x << 4), y, z + (centerPos.getPos().z << 4)))); } public int terraChunk$getX() { diff --git a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/mixin/implementations/chunk/WorldChunkMixin.java b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/mixin/implementations/chunk/WorldChunkMixin.java index c70a891f8..3c69efe74 100644 --- a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/mixin/implementations/chunk/WorldChunkMixin.java +++ b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/mixin/implementations/chunk/WorldChunkMixin.java @@ -17,9 +17,6 @@ package com.dfsek.terra.fabric.mixin.implementations.chunk; -import com.dfsek.terra.api.world.ServerWorld; -import com.dfsek.terra.api.world.chunk.Chunk; - import net.minecraft.util.math.BlockPos; import net.minecraft.world.chunk.WorldChunk; import org.jetbrains.annotations.NotNull; @@ -32,6 +29,8 @@ import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Shadow; import com.dfsek.terra.api.block.state.BlockState; +import com.dfsek.terra.api.world.ServerWorld; +import com.dfsek.terra.api.world.chunk.Chunk; import com.dfsek.terra.fabric.block.FabricBlockState; @@ -54,7 +53,8 @@ public abstract class WorldChunkMixin { } public void terra$setBlock(int x, int y, int z, @NotNull BlockState blockState) { - ((net.minecraft.world.chunk.Chunk) (Object) this).setBlockState(new BlockPos(x, y, z), ((FabricBlockState) blockState).getHandle(), false); + ((net.minecraft.world.chunk.Chunk) (Object) this).setBlockState(new BlockPos(x, y, z), ((FabricBlockState) blockState).getHandle(), + false); } public @NotNull BlockState terra$getBlock(int x, int y, int z) { diff --git a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/mixin/implementations/chunk/data/ProtoChunkMixin.java b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/mixin/implementations/chunk/data/ProtoChunkMixin.java index 19368d03a..642c4749a 100644 --- a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/mixin/implementations/chunk/data/ProtoChunkMixin.java +++ b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/mixin/implementations/chunk/data/ProtoChunkMixin.java @@ -37,7 +37,8 @@ public abstract class ProtoChunkMixin { public abstract net.minecraft.block.BlockState getBlockState(BlockPos pos); public void terra$setBlock(int x, int y, int z, @NotNull BlockState blockState) { - ((net.minecraft.world.chunk.Chunk) (Object) this).setBlockState(new BlockPos(x, y, z), ((FabricBlockState) blockState).getHandle(), false); + ((net.minecraft.world.chunk.Chunk) (Object) this).setBlockState(new BlockPos(x, y, z), ((FabricBlockState) blockState).getHandle(), + false); } public @NotNull BlockState terra$getBlock(int x, int y, int z) { diff --git a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/mixin/implementations/world/ChunkRegionMixin.java b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/mixin/implementations/world/ChunkRegionMixin.java index bb3fd8727..3f82038c5 100644 --- a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/mixin/implementations/world/ChunkRegionMixin.java +++ b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/mixin/implementations/world/ChunkRegionMixin.java @@ -17,9 +17,6 @@ package com.dfsek.terra.fabric.mixin.implementations.world; -import com.dfsek.terra.api.config.ConfigPack; -import com.dfsek.terra.api.world.chunk.generation.ProtoWorld; - import net.minecraft.block.FluidBlock; import net.minecraft.fluid.Fluid; import net.minecraft.util.math.BlockPos; @@ -44,12 +41,14 @@ import java.util.List; import com.dfsek.terra.api.block.entity.BlockEntity; import com.dfsek.terra.api.block.state.BlockState; +import com.dfsek.terra.api.config.ConfigPack; import com.dfsek.terra.api.entity.Entity; import com.dfsek.terra.api.entity.EntityType; import com.dfsek.terra.api.util.vector.Vector3; import com.dfsek.terra.api.world.ServerWorld; import com.dfsek.terra.api.world.biome.generation.BiomeProvider; import com.dfsek.terra.api.world.chunk.generation.ChunkGenerator; +import com.dfsek.terra.api.world.chunk.generation.ProtoWorld; import com.dfsek.terra.fabric.block.FabricBlockState; import com.dfsek.terra.fabric.generation.FabricChunkGeneratorWrapper; import com.dfsek.terra.fabric.generation.TerraBiomeSource; @@ -68,17 +67,17 @@ public abstract class ChunkRegionMixin { @Shadow @Final private long seed; - - @Shadow - public abstract QueryableTickScheduler getFluidTickScheduler(); - @Shadow @Final private Chunk centerPos; + @Shadow + public abstract QueryableTickScheduler getFluidTickScheduler(); + @Inject(at = @At("RETURN"), method = "(Lnet/minecraft/server/world/ServerWorld;Ljava/util/List;Lnet/minecraft/world/chunk/ChunkStatus;I)V") - public void injectConstructor(net.minecraft.server.world.ServerWorld world, List list, ChunkStatus chunkStatus, int i, + public void injectConstructor(net.minecraft.server.world.ServerWorld world, List list, + ChunkStatus chunkStatus, int i, CallbackInfo ci) { this.config = ((ServerWorld) world).getPack(); } @@ -97,8 +96,9 @@ public abstract class ChunkRegionMixin { BlockPos pos = new BlockPos(x, y, z); ((ChunkRegion) (Object) this).setBlockState(pos, ((FabricBlockState) data).getHandle(), physics ? 3 : 1042); if(physics && ((FabricBlockState) data).getHandle().getBlock() instanceof FluidBlock) { - getFluidTickScheduler().scheduleTick(OrderedTick.create(((FluidBlock) ((FabricBlockState) data).getHandle().getBlock()).getFluidState( - ((FabricBlockState) data).getHandle()).getFluid(), pos)); + getFluidTickScheduler().scheduleTick( + OrderedTick.create(((FluidBlock) ((FabricBlockState) data).getHandle().getBlock()).getFluidState( + ((FabricBlockState) data).getHandle()).getFluid(), pos)); } } @@ -160,6 +160,7 @@ public abstract class ChunkRegionMixin { // TODO remove this; we shouldnt need it anymore + /** * We need regions delegating to the same world * to have the same hashcode. This 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 0b0f80ec6..d2feab440 100644 --- a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/mixin/implementations/world/ServerWorldMixin.java +++ b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/mixin/implementations/world/ServerWorldMixin.java @@ -17,8 +17,6 @@ package com.dfsek.terra.fabric.mixin.implementations.world; -import com.dfsek.terra.api.config.ConfigPack; - import net.minecraft.server.MinecraftServer; import net.minecraft.server.WorldGenerationProgressListener; import net.minecraft.server.world.ServerChunkManager; @@ -45,12 +43,13 @@ import java.util.concurrent.Executor; import com.dfsek.terra.api.block.entity.BlockEntity; import com.dfsek.terra.api.block.state.BlockState; +import com.dfsek.terra.api.config.ConfigPack; import com.dfsek.terra.api.entity.Entity; import com.dfsek.terra.api.entity.EntityType; import com.dfsek.terra.api.util.vector.Vector3; -import com.dfsek.terra.api.world.chunk.Chunk; import com.dfsek.terra.api.world.ServerWorld; import com.dfsek.terra.api.world.biome.generation.BiomeProvider; +import com.dfsek.terra.api.world.chunk.Chunk; import com.dfsek.terra.api.world.chunk.generation.ChunkGenerator; import com.dfsek.terra.fabric.block.FabricBlockState; import com.dfsek.terra.fabric.generation.FabricChunkGeneratorWrapper; @@ -86,7 +85,8 @@ public abstract class ServerWorldMixin { } public Entity terra$spawnEntity(Vector3 location, EntityType entityType) { - net.minecraft.entity.Entity entity = ((net.minecraft.entity.EntityType) entityType).create(((net.minecraft.server.world.ServerWorld) (Object) this)); + net.minecraft.entity.Entity entity = ((net.minecraft.entity.EntityType) entityType).create( + ((net.minecraft.server.world.ServerWorld) (Object) this)); entity.setPos(location.getX(), location.getY(), location.getZ()); ((net.minecraft.server.world.ServerWorld) (Object) this).spawnEntity(entity); return (Entity) entity; @@ -94,7 +94,8 @@ public abstract class ServerWorldMixin { public void terra$setBlockData(int x, int y, int z, BlockState data, boolean physics) { BlockPos pos = new BlockPos(x, y, z); - ((net.minecraft.server.world.ServerWorld) (Object) this).setBlockState(pos, ((FabricBlockState) data).getHandle(), physics ? 3 : 1042); + ((net.minecraft.server.world.ServerWorld) (Object) this).setBlockState(pos, ((FabricBlockState) data).getHandle(), + physics ? 3 : 1042); } @Intrinsic @@ -103,7 +104,8 @@ public abstract class ServerWorldMixin { } public int terra$getMaxHeight() { - return (((net.minecraft.server.world.ServerWorld) (Object) this).getBottomY()) + ((net.minecraft.server.world.ServerWorld) (Object) this).getHeight(); + return (((net.minecraft.server.world.ServerWorld) (Object) this).getBottomY()) + + ((net.minecraft.server.world.ServerWorld) (Object) this).getHeight(); } public Chunk terra$getChunkAt(int x, int z) { @@ -127,7 +129,9 @@ public abstract class ServerWorldMixin { } public BiomeProvider terra$getBiomeProvider() { - return ((TerraBiomeSource) ((net.minecraft.server.world.ServerWorld) (Object) this).getChunkManager().getChunkGenerator().getBiomeSource()).getProvider(); + return ((TerraBiomeSource) ((net.minecraft.server.world.ServerWorld) (Object) this).getChunkManager() + .getChunkGenerator() + .getBiomeSource()).getProvider(); } public ConfigPack terra$getPack() { diff --git a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/mixin/lifecycle/server/GeneratorOptionsMixin.java b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/mixin/lifecycle/server/GeneratorOptionsMixin.java index 7d7033553..d9fedc9fb 100644 --- a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/mixin/lifecycle/server/GeneratorOptionsMixin.java +++ b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/mixin/lifecycle/server/GeneratorOptionsMixin.java @@ -78,7 +78,7 @@ public abstract class GeneratorOptionsMixin { l, false); prop = prop.substring(prop.indexOf(":") + 1); - + String finalProp = prop; ConfigPack config = main.getConfigRegistry().get(prop).orElseThrow(() -> new IllegalArgumentException( "No such pack " + finalProp)); diff --git a/platforms/region/src/main/java/com/dfsek/terra/StandalonePlugin.java b/platforms/region/src/main/java/com/dfsek/terra/StandalonePlugin.java index 94f390716..55908641a 100644 --- a/platforms/region/src/main/java/com/dfsek/terra/StandalonePlugin.java +++ b/platforms/region/src/main/java/com/dfsek/terra/StandalonePlugin.java @@ -98,7 +98,7 @@ public class StandalonePlugin implements TerraPlugin { @Override public void saveDefaultConfig() { - + } @Override diff --git a/platforms/sponge/src/main/java/com/dfsek/terra/sponge/PlatformImpl.java b/platforms/sponge/src/main/java/com/dfsek/terra/sponge/PlatformImpl.java index 0d401bf60..c04ad7244 100644 --- a/platforms/sponge/src/main/java/com/dfsek/terra/sponge/PlatformImpl.java +++ b/platforms/sponge/src/main/java/com/dfsek/terra/sponge/PlatformImpl.java @@ -22,7 +22,6 @@ import org.spongepowered.api.Sponge; import java.io.File; - import com.dfsek.terra.AbstractPlatform; import com.dfsek.terra.api.handle.ItemHandle; import com.dfsek.terra.api.handle.WorldHandle;