diff --git a/buildSrc/src/main/kotlin/DistributionConfig.kt b/buildSrc/src/main/kotlin/DistributionConfig.kt index 65d295aba..27479b809 100644 --- a/buildSrc/src/main/kotlin/DistributionConfig.kt +++ b/buildSrc/src/main/kotlin/DistributionConfig.kt @@ -52,7 +52,8 @@ fun Project.configureDistribution() { val defaultPackUrl = URL("https://github.com/PolyhedralDev/TerraOverworldConfig/releases/download/" + Versions.Terra.overworldConfig + "/default.zip") downloadPack(defaultPackUrl, project) - } catch (_:Exception) {} + } catch (_: Exception) { + } } } diff --git a/common/addons/biome-provider-extrusion/src/main/java/com/dfsek/terra/addons/biome/extrusion/config/extrusions/SamplerExtrusionTemplate.java b/common/addons/biome-provider-extrusion/src/main/java/com/dfsek/terra/addons/biome/extrusion/config/extrusions/SamplerExtrusionTemplate.java index cb1a8ee14..866596c2e 100644 --- a/common/addons/biome-provider-extrusion/src/main/java/com/dfsek/terra/addons/biome/extrusion/config/extrusions/SamplerExtrusionTemplate.java +++ b/common/addons/biome-provider-extrusion/src/main/java/com/dfsek/terra/addons/biome/extrusion/config/extrusions/SamplerExtrusionTemplate.java @@ -1,11 +1,11 @@ package com.dfsek.terra.addons.biome.extrusion.config.extrusions; +import com.dfsek.seismic.type.sampler.Sampler; import com.dfsek.tectonic.api.config.template.annotations.Value; import com.dfsek.tectonic.api.config.template.object.ObjectTemplate; import com.dfsek.terra.addons.biome.extrusion.api.Extrusion; import com.dfsek.terra.api.config.meta.Meta; -import com.dfsek.seismic.type.sampler.Sampler; import com.dfsek.terra.api.util.range.Range; diff --git a/common/addons/biome-provider-extrusion/src/main/java/com/dfsek/terra/addons/biome/extrusion/extrusions/ReplaceExtrusion.java b/common/addons/biome-provider-extrusion/src/main/java/com/dfsek/terra/addons/biome/extrusion/extrusions/ReplaceExtrusion.java index b67e033c8..0e062977d 100644 --- a/common/addons/biome-provider-extrusion/src/main/java/com/dfsek/terra/addons/biome/extrusion/extrusions/ReplaceExtrusion.java +++ b/common/addons/biome-provider-extrusion/src/main/java/com/dfsek/terra/addons/biome/extrusion/extrusions/ReplaceExtrusion.java @@ -1,5 +1,7 @@ package com.dfsek.terra.addons.biome.extrusion.extrusions; +import com.dfsek.seismic.type.sampler.Sampler; + import java.util.Collection; import java.util.function.Predicate; import java.util.stream.Collectors; @@ -7,9 +9,8 @@ import java.util.stream.Collectors; import com.dfsek.terra.addons.biome.extrusion.api.Extrusion; import com.dfsek.terra.addons.biome.extrusion.api.ReplaceableBiome; import com.dfsek.terra.addons.biome.query.api.BiomeQueries; -import com.dfsek.seismic.type.sampler.Sampler; -import com.dfsek.terra.api.util.range.Range; import com.dfsek.terra.api.util.collection.ProbabilityCollection; +import com.dfsek.terra.api.util.range.Range; import com.dfsek.terra.api.world.biome.Biome; diff --git a/common/addons/biome-provider-extrusion/src/main/java/com/dfsek/terra/addons/biome/extrusion/extrusions/SetExtrusion.java b/common/addons/biome-provider-extrusion/src/main/java/com/dfsek/terra/addons/biome/extrusion/extrusions/SetExtrusion.java index ee0a63191..53aeda03f 100644 --- a/common/addons/biome-provider-extrusion/src/main/java/com/dfsek/terra/addons/biome/extrusion/extrusions/SetExtrusion.java +++ b/common/addons/biome-provider-extrusion/src/main/java/com/dfsek/terra/addons/biome/extrusion/extrusions/SetExtrusion.java @@ -1,14 +1,15 @@ package com.dfsek.terra.addons.biome.extrusion.extrusions; +import com.dfsek.seismic.type.sampler.Sampler; + import java.util.Collection; import java.util.function.Predicate; import java.util.stream.Collectors; import com.dfsek.terra.addons.biome.extrusion.api.Extrusion; import com.dfsek.terra.addons.biome.extrusion.api.ReplaceableBiome; -import com.dfsek.seismic.type.sampler.Sampler; -import com.dfsek.terra.api.util.range.Range; import com.dfsek.terra.api.util.collection.ProbabilityCollection; +import com.dfsek.terra.api.util.range.Range; import com.dfsek.terra.api.world.biome.Biome; diff --git a/common/addons/biome-provider-image/src/main/java/com/dfsek/terra/addons/biome/image/ImageBiomeProviderAddon.java b/common/addons/biome-provider-image/src/main/java/com/dfsek/terra/addons/biome/image/ImageBiomeProviderAddon.java index f87628ec8..ba0e05ebf 100644 --- a/common/addons/biome-provider-image/src/main/java/com/dfsek/terra/addons/biome/image/ImageBiomeProviderAddon.java +++ b/common/addons/biome-provider-image/src/main/java/com/dfsek/terra/addons/biome/image/ImageBiomeProviderAddon.java @@ -9,6 +9,8 @@ package com.dfsek.terra.addons.biome.image; import com.dfsek.tectonic.api.config.template.object.ObjectTemplate; +import java.util.function.Supplier; + import com.dfsek.terra.addons.biome.image.config.ImageProviderTemplate; import com.dfsek.terra.addons.biome.image.config.converter.ClosestBiomeColorConverterTemplate; import com.dfsek.terra.addons.biome.image.config.converter.ExactBiomeColorConverterTemplate; @@ -27,8 +29,6 @@ import com.dfsek.terra.api.util.reflection.TypeKey; import com.dfsek.terra.api.world.biome.Biome; import com.dfsek.terra.api.world.biome.generation.BiomeProvider; -import java.util.function.Supplier; - public class ImageBiomeProviderAddon implements AddonInitializer { public static final TypeKey>> PROVIDER_REGISTRY_KEY = new TypeKey<>() { diff --git a/common/addons/biome-provider-image/src/main/java/com/dfsek/terra/addons/biome/image/config/converter/mapping/DefinedBiomeColorMappingTemplate.java b/common/addons/biome-provider-image/src/main/java/com/dfsek/terra/addons/biome/image/config/converter/mapping/DefinedBiomeColorMappingTemplate.java index 17864a01f..c76cfb6d0 100644 --- a/common/addons/biome-provider-image/src/main/java/com/dfsek/terra/addons/biome/image/config/converter/mapping/DefinedBiomeColorMappingTemplate.java +++ b/common/addons/biome-provider-image/src/main/java/com/dfsek/terra/addons/biome/image/config/converter/mapping/DefinedBiomeColorMappingTemplate.java @@ -3,13 +3,13 @@ package com.dfsek.terra.addons.biome.image.config.converter.mapping; import com.dfsek.tectonic.api.config.template.annotations.Value; import com.dfsek.tectonic.api.config.template.object.ObjectTemplate; -import java.util.Map; - import com.dfsek.terra.addons.image.config.ColorLoader.ColorString; import com.dfsek.terra.addons.image.converter.mapping.ColorMapping; import com.dfsek.terra.addons.image.util.MapUtil; import com.dfsek.terra.api.world.biome.Biome; +import java.util.Map; + public class DefinedBiomeColorMappingTemplate implements ObjectTemplate> { diff --git a/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/PipelineBiomeProvider.java b/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/PipelineBiomeProvider.java index c045c905a..d2e6f762b 100644 --- a/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/PipelineBiomeProvider.java +++ b/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/PipelineBiomeProvider.java @@ -7,8 +7,7 @@ package com.dfsek.terra.addons.biome.pipeline; -import com.dfsek.terra.api.util.cache.SeededVector2Key; - +import com.dfsek.seismic.type.sampler.Sampler; import com.github.benmanes.caffeine.cache.Caffeine; import com.github.benmanes.caffeine.cache.LoadingCache; @@ -22,9 +21,9 @@ import com.dfsek.terra.addons.biome.pipeline.api.BiomeChunk; import com.dfsek.terra.addons.biome.pipeline.api.Pipeline; import com.dfsek.terra.addons.biome.pipeline.api.Stage; import com.dfsek.terra.addons.biome.pipeline.api.biome.PipelineBiome; -import com.dfsek.seismic.type.sampler.Sampler; import com.dfsek.terra.api.registry.key.StringIdentifiable; import com.dfsek.terra.api.util.Column; +import com.dfsek.terra.api.util.cache.SeededVector2Key; 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/api/Pipeline.java b/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/api/Pipeline.java index 2eae6cd6a..35474f495 100644 --- a/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/api/Pipeline.java +++ b/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/api/Pipeline.java @@ -1,9 +1,9 @@ package com.dfsek.terra.addons.biome.pipeline.api; -import com.dfsek.terra.api.util.cache.SeededVector2Key; - import java.util.List; +import com.dfsek.terra.api.util.cache.SeededVector2Key; + public interface Pipeline { BiomeChunk generateChunk(SeededVector2Key worldCoordinates); 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 575487d8c..e78c3137a 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 @@ -7,6 +7,7 @@ package com.dfsek.terra.addons.biome.pipeline.config; +import com.dfsek.seismic.type.sampler.Sampler; import com.dfsek.tectonic.api.config.template.annotations.Default; import com.dfsek.tectonic.api.config.template.annotations.Description; import com.dfsek.tectonic.api.config.template.annotations.Value; @@ -19,7 +20,6 @@ import com.dfsek.terra.addons.biome.pipeline.api.Source; import com.dfsek.terra.addons.biome.pipeline.api.Stage; import com.dfsek.terra.addons.biome.pipeline.pipeline.PipelineImpl; import com.dfsek.terra.api.config.meta.Meta; -import com.dfsek.seismic.type.sampler.Sampler; 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/config/source/SamplerSourceTemplate.java b/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/config/source/SamplerSourceTemplate.java index 348e24d86..ac3ad01dc 100644 --- a/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/config/source/SamplerSourceTemplate.java +++ b/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/config/source/SamplerSourceTemplate.java @@ -7,6 +7,7 @@ package com.dfsek.terra.addons.biome.pipeline.config.source; +import com.dfsek.seismic.type.sampler.Sampler; import com.dfsek.tectonic.api.config.template.annotations.Description; import com.dfsek.tectonic.api.config.template.annotations.Value; @@ -14,7 +15,6 @@ import com.dfsek.terra.addons.biome.pipeline.api.Source; import com.dfsek.terra.addons.biome.pipeline.api.biome.PipelineBiome; import com.dfsek.terra.addons.biome.pipeline.source.SamplerSource; import com.dfsek.terra.api.config.meta.Meta; -import com.dfsek.seismic.type.sampler.Sampler; import com.dfsek.terra.api.util.collection.ProbabilityCollection; diff --git a/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/config/stage/StageTemplate.java b/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/config/stage/StageTemplate.java index 973f9bb5f..13906de82 100644 --- a/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/config/stage/StageTemplate.java +++ b/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/config/stage/StageTemplate.java @@ -7,13 +7,13 @@ package com.dfsek.terra.addons.biome.pipeline.config.stage; +import com.dfsek.seismic.type.sampler.Sampler; import com.dfsek.tectonic.api.config.template.annotations.Description; import com.dfsek.tectonic.api.config.template.annotations.Value; import com.dfsek.tectonic.api.config.template.object.ObjectTemplate; import com.dfsek.terra.addons.biome.pipeline.api.Stage; import com.dfsek.terra.api.config.meta.Meta; -import com.dfsek.seismic.type.sampler.Sampler; public abstract class StageTemplate implements ObjectTemplate { diff --git a/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/pipeline/PipelineImpl.java b/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/pipeline/PipelineImpl.java index 6b0977ca9..025dd4c9e 100644 --- a/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/pipeline/PipelineImpl.java +++ b/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/pipeline/PipelineImpl.java @@ -1,7 +1,5 @@ package com.dfsek.terra.addons.biome.pipeline.pipeline; -import com.dfsek.terra.api.util.cache.SeededVector2Key; - import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -12,6 +10,7 @@ import com.dfsek.terra.addons.biome.pipeline.api.Expander; import com.dfsek.terra.addons.biome.pipeline.api.Pipeline; import com.dfsek.terra.addons.biome.pipeline.api.Source; import com.dfsek.terra.addons.biome.pipeline.api.Stage; +import com.dfsek.terra.api.util.cache.SeededVector2Key; public class PipelineImpl implements Pipeline { diff --git a/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/source/SamplerSource.java b/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/source/SamplerSource.java index ca2982fd7..31e5a0243 100644 --- a/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/source/SamplerSource.java +++ b/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/source/SamplerSource.java @@ -7,9 +7,10 @@ package com.dfsek.terra.addons.biome.pipeline.source; +import com.dfsek.seismic.type.sampler.Sampler; + import com.dfsek.terra.addons.biome.pipeline.api.Source; import com.dfsek.terra.addons.biome.pipeline.api.biome.PipelineBiome; -import com.dfsek.seismic.type.sampler.Sampler; import com.dfsek.terra.api.util.collection.ProbabilityCollection; diff --git a/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/stage/expander/FractalExpander.java b/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/stage/expander/FractalExpander.java index a60f09f87..8c2a73182 100644 --- a/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/stage/expander/FractalExpander.java +++ b/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/stage/expander/FractalExpander.java @@ -1,9 +1,10 @@ package com.dfsek.terra.addons.biome.pipeline.stage.expander; +import com.dfsek.seismic.type.sampler.Sampler; + import com.dfsek.terra.addons.biome.pipeline.api.Expander; import com.dfsek.terra.addons.biome.pipeline.api.biome.PipelineBiome; import com.dfsek.terra.addons.biome.pipeline.pipeline.BiomeChunkImpl; -import com.dfsek.seismic.type.sampler.Sampler; public class FractalExpander implements Expander { diff --git a/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/stage/mutators/BorderListStage.java b/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/stage/mutators/BorderListStage.java index 9beaa7ec7..dd4e64e5d 100644 --- a/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/stage/mutators/BorderListStage.java +++ b/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/stage/mutators/BorderListStage.java @@ -7,6 +7,9 @@ package com.dfsek.terra.addons.biome.pipeline.stage.mutators; +import com.dfsek.seismic.type.sampler.Sampler; +import com.dfsek.seismic.type.vector.Vector2Int; + import java.util.ArrayList; import java.util.HashSet; import java.util.List; @@ -14,12 +17,9 @@ import java.util.Map; import java.util.Set; import java.util.function.Predicate; -import com.dfsek.seismic.type.vector.Vector2Int; - import com.dfsek.terra.addons.biome.pipeline.api.Stage; import com.dfsek.terra.addons.biome.pipeline.api.biome.PipelineBiome; import com.dfsek.terra.addons.biome.pipeline.pipeline.BiomeChunkImpl; -import com.dfsek.seismic.type.sampler.Sampler; import com.dfsek.terra.api.util.collection.ProbabilityCollection; diff --git a/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/stage/mutators/BorderStage.java b/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/stage/mutators/BorderStage.java index f41918f3e..339fdb366 100644 --- a/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/stage/mutators/BorderStage.java +++ b/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/stage/mutators/BorderStage.java @@ -7,6 +7,9 @@ package com.dfsek.terra.addons.biome.pipeline.stage.mutators; +import com.dfsek.seismic.type.sampler.Sampler; +import com.dfsek.seismic.type.vector.Vector2Int; + import java.util.ArrayList; import java.util.HashSet; import java.util.List; @@ -16,9 +19,7 @@ import java.util.function.Predicate; import com.dfsek.terra.addons.biome.pipeline.api.Stage; import com.dfsek.terra.addons.biome.pipeline.api.biome.PipelineBiome; import com.dfsek.terra.addons.biome.pipeline.pipeline.BiomeChunkImpl; -import com.dfsek.seismic.type.sampler.Sampler; import com.dfsek.terra.api.util.collection.ProbabilityCollection; -import com.dfsek.seismic.type.vector.Vector2Int; public class BorderStage implements Stage { diff --git a/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/stage/mutators/ReplaceListStage.java b/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/stage/mutators/ReplaceListStage.java index 1c634c950..ca4f0db09 100644 --- a/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/stage/mutators/ReplaceListStage.java +++ b/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/stage/mutators/ReplaceListStage.java @@ -7,6 +7,8 @@ package com.dfsek.terra.addons.biome.pipeline.stage.mutators; +import com.dfsek.seismic.type.sampler.Sampler; + import java.util.HashSet; import java.util.Map; import java.util.Set; @@ -15,7 +17,6 @@ import java.util.stream.Stream; import com.dfsek.terra.addons.biome.pipeline.api.Stage; import com.dfsek.terra.addons.biome.pipeline.api.biome.PipelineBiome; import com.dfsek.terra.addons.biome.pipeline.pipeline.BiomeChunkImpl; -import com.dfsek.seismic.type.sampler.Sampler; import com.dfsek.terra.api.util.collection.ProbabilityCollection; diff --git a/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/stage/mutators/ReplaceStage.java b/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/stage/mutators/ReplaceStage.java index 1f4e4222a..2c7ab9bf9 100644 --- a/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/stage/mutators/ReplaceStage.java +++ b/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/stage/mutators/ReplaceStage.java @@ -7,6 +7,8 @@ package com.dfsek.terra.addons.biome.pipeline.stage.mutators; +import com.dfsek.seismic.type.sampler.Sampler; + import java.util.HashSet; import java.util.Set; import java.util.stream.Stream; @@ -14,7 +16,6 @@ import java.util.stream.Stream; import com.dfsek.terra.addons.biome.pipeline.api.Stage; import com.dfsek.terra.addons.biome.pipeline.api.biome.PipelineBiome; import com.dfsek.terra.addons.biome.pipeline.pipeline.BiomeChunkImpl; -import com.dfsek.seismic.type.sampler.Sampler; import com.dfsek.terra.api.util.collection.ProbabilityCollection; diff --git a/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/stage/mutators/SmoothStage.java b/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/stage/mutators/SmoothStage.java index 6c111ecdb..cbb757ba7 100644 --- a/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/stage/mutators/SmoothStage.java +++ b/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/stage/mutators/SmoothStage.java @@ -7,12 +7,13 @@ package com.dfsek.terra.addons.biome.pipeline.stage.mutators; +import com.dfsek.seismic.type.sampler.Sampler; + import java.util.Objects; import com.dfsek.terra.addons.biome.pipeline.api.Stage; import com.dfsek.terra.addons.biome.pipeline.api.biome.PipelineBiome; import com.dfsek.terra.addons.biome.pipeline.pipeline.BiomeChunkImpl; -import com.dfsek.seismic.type.sampler.Sampler; public class SmoothStage implements Stage { 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 ce55469b0..609a912b7 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 @@ -1,11 +1,11 @@ package com.dfsek.terra.addons.chunkgenerator.config.noise; +import com.dfsek.seismic.type.sampler.Sampler; 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.object.ObjectTemplate; import com.dfsek.terra.api.config.meta.Meta; -import com.dfsek.seismic.type.sampler.Sampler; public class BiomeNoiseConfigTemplate implements ObjectTemplate { diff --git a/common/addons/chunk-generator-noise-3d/src/main/java/com/dfsek/terra/addons/chunkgenerator/config/noise/BiomeNoiseProperties.java b/common/addons/chunk-generator-noise-3d/src/main/java/com/dfsek/terra/addons/chunkgenerator/config/noise/BiomeNoiseProperties.java index e58978be0..d4c8aa00e 100644 --- a/common/addons/chunk-generator-noise-3d/src/main/java/com/dfsek/terra/addons/chunkgenerator/config/noise/BiomeNoiseProperties.java +++ b/common/addons/chunk-generator-noise-3d/src/main/java/com/dfsek/terra/addons/chunkgenerator/config/noise/BiomeNoiseProperties.java @@ -1,6 +1,7 @@ package com.dfsek.terra.addons.chunkgenerator.config.noise; import com.dfsek.seismic.type.sampler.Sampler; + import com.dfsek.terra.api.properties.Properties; diff --git a/common/addons/chunk-generator-noise-3d/src/main/java/com/dfsek/terra/addons/chunkgenerator/generation/math/SlantCalculationMethod.java b/common/addons/chunk-generator-noise-3d/src/main/java/com/dfsek/terra/addons/chunkgenerator/generation/math/SlantCalculationMethod.java index d7cf84133..de524764f 100644 --- a/common/addons/chunk-generator-noise-3d/src/main/java/com/dfsek/terra/addons/chunkgenerator/generation/math/SlantCalculationMethod.java +++ b/common/addons/chunk-generator-noise-3d/src/main/java/com/dfsek/terra/addons/chunkgenerator/generation/math/SlantCalculationMethod.java @@ -1,8 +1,9 @@ package com.dfsek.terra.addons.chunkgenerator.generation.math; -import com.dfsek.terra.addons.chunkgenerator.generation.math.samplers.Sampler3D; import com.dfsek.seismic.type.vector.Vector3; +import com.dfsek.terra.addons.chunkgenerator.generation.math.samplers.Sampler3D; + public enum SlantCalculationMethod { DotProduct { diff --git a/common/addons/chunk-generator-noise-3d/src/main/java/com/dfsek/terra/addons/chunkgenerator/generation/math/interpolation/Interpolator.java b/common/addons/chunk-generator-noise-3d/src/main/java/com/dfsek/terra/addons/chunkgenerator/generation/math/interpolation/Interpolator.java index 13f421389..62fc2d836 100644 --- a/common/addons/chunk-generator-noise-3d/src/main/java/com/dfsek/terra/addons/chunkgenerator/generation/math/interpolation/Interpolator.java +++ b/common/addons/chunk-generator-noise-3d/src/main/java/com/dfsek/terra/addons/chunkgenerator/generation/math/interpolation/Interpolator.java @@ -33,6 +33,7 @@ public class Interpolator { } //TODO this system is not very good, replace it wholesale + /** * 2D Bilinear interpolation between 4 points on a unit square. * diff --git a/common/addons/config-distributors/src/main/java/com/dfsek/terra/addons/feature/distributor/config/SamplerDistributorTemplate.java b/common/addons/config-distributors/src/main/java/com/dfsek/terra/addons/feature/distributor/config/SamplerDistributorTemplate.java index be6fa7c6f..4ceb145ed 100644 --- a/common/addons/config-distributors/src/main/java/com/dfsek/terra/addons/feature/distributor/config/SamplerDistributorTemplate.java +++ b/common/addons/config-distributors/src/main/java/com/dfsek/terra/addons/feature/distributor/config/SamplerDistributorTemplate.java @@ -7,13 +7,13 @@ package com.dfsek.terra.addons.feature.distributor.config; +import com.dfsek.seismic.type.sampler.Sampler; 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.object.ObjectTemplate; import com.dfsek.terra.addons.feature.distributor.distributors.SamplerDistributor; import com.dfsek.terra.api.config.meta.Meta; -import com.dfsek.seismic.type.sampler.Sampler; import com.dfsek.terra.api.structure.feature.Distributor; diff --git a/common/addons/config-distributors/src/main/java/com/dfsek/terra/addons/feature/distributor/distributors/PaddedGridDistributor.java b/common/addons/config-distributors/src/main/java/com/dfsek/terra/addons/feature/distributor/distributors/PaddedGridDistributor.java index d7b0b6fb0..48d67b3da 100644 --- a/common/addons/config-distributors/src/main/java/com/dfsek/terra/addons/feature/distributor/distributors/PaddedGridDistributor.java +++ b/common/addons/config-distributors/src/main/java/com/dfsek/terra/addons/feature/distributor/distributors/PaddedGridDistributor.java @@ -1,12 +1,11 @@ package com.dfsek.terra.addons.feature.distributor.distributors; +import com.dfsek.seismic.algorithms.hashing.HashingFunctions; +import com.dfsek.seismic.math.integer.IntegerFunctions; + import java.util.random.RandomGenerator; import java.util.random.RandomGeneratorFactory; -import com.dfsek.seismic.algorithms.hashing.HashingFunctions; - -import com.dfsek.seismic.math.integer.IntegerFunctions; - import com.dfsek.terra.api.structure.feature.Distributor; diff --git a/common/addons/config-distributors/src/main/java/com/dfsek/terra/addons/feature/distributor/distributors/SamplerDistributor.java b/common/addons/config-distributors/src/main/java/com/dfsek/terra/addons/feature/distributor/distributors/SamplerDistributor.java index 51bea61b3..01ad25b29 100644 --- a/common/addons/config-distributors/src/main/java/com/dfsek/terra/addons/feature/distributor/distributors/SamplerDistributor.java +++ b/common/addons/config-distributors/src/main/java/com/dfsek/terra/addons/feature/distributor/distributors/SamplerDistributor.java @@ -8,6 +8,7 @@ package com.dfsek.terra.addons.feature.distributor.distributors; import com.dfsek.seismic.type.sampler.Sampler; + import com.dfsek.terra.api.structure.feature.Distributor; diff --git a/common/addons/config-feature/src/main/java/com/dfsek/terra/addons/feature/ConfiguredFeature.java b/common/addons/config-feature/src/main/java/com/dfsek/terra/addons/feature/ConfiguredFeature.java index 1cc985996..6ff703652 100644 --- a/common/addons/config-feature/src/main/java/com/dfsek/terra/addons/feature/ConfiguredFeature.java +++ b/common/addons/config-feature/src/main/java/com/dfsek/terra/addons/feature/ConfiguredFeature.java @@ -8,6 +8,7 @@ package com.dfsek.terra.addons.feature; import com.dfsek.seismic.type.sampler.Sampler; + import com.dfsek.terra.api.structure.Structure; import com.dfsek.terra.api.structure.feature.Distributor; import com.dfsek.terra.api.structure.feature.Feature; diff --git a/common/addons/config-feature/src/main/java/com/dfsek/terra/addons/feature/FeatureTemplate.java b/common/addons/config-feature/src/main/java/com/dfsek/terra/addons/feature/FeatureTemplate.java index 791c0fc46..68e125bda 100644 --- a/common/addons/config-feature/src/main/java/com/dfsek/terra/addons/feature/FeatureTemplate.java +++ b/common/addons/config-feature/src/main/java/com/dfsek/terra/addons/feature/FeatureTemplate.java @@ -7,12 +7,12 @@ package com.dfsek.terra.addons.feature; +import com.dfsek.seismic.type.sampler.Sampler; import com.dfsek.tectonic.api.config.template.annotations.Final; import com.dfsek.tectonic.api.config.template.annotations.Value; import com.dfsek.terra.api.config.AbstractableTemplate; import com.dfsek.terra.api.config.meta.Meta; -import com.dfsek.seismic.type.sampler.Sampler; import com.dfsek.terra.api.structure.Structure; import com.dfsek.terra.api.structure.feature.Distributor; import com.dfsek.terra.api.structure.feature.Locator; diff --git a/common/addons/config-flora/src/main/java/com/dfsek/terra/addons/flora/FloraTemplate.java b/common/addons/config-flora/src/main/java/com/dfsek/terra/addons/flora/FloraTemplate.java index a5dbfa78a..6be89444e 100644 --- a/common/addons/config-flora/src/main/java/com/dfsek/terra/addons/flora/FloraTemplate.java +++ b/common/addons/config-flora/src/main/java/com/dfsek/terra/addons/flora/FloraTemplate.java @@ -7,6 +7,7 @@ package com.dfsek.terra.addons.flora; +import com.dfsek.seismic.type.sampler.Sampler; import com.dfsek.tectonic.api.config.template.annotations.Default; import com.dfsek.tectonic.api.config.template.annotations.Final; import com.dfsek.tectonic.api.config.template.annotations.Value; @@ -16,7 +17,6 @@ import java.util.List; import com.dfsek.terra.addons.flora.flora.gen.BlockLayer; import com.dfsek.terra.api.config.AbstractableTemplate; import com.dfsek.terra.api.config.meta.Meta; -import com.dfsek.seismic.type.sampler.Sampler; import com.dfsek.terra.api.util.collection.MaterialSet; 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 7e8e5ee3c..26c8fbd26 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,21 +7,21 @@ package com.dfsek.terra.addons.flora.flora.gen; +import com.dfsek.seismic.type.Rotation; +import com.dfsek.seismic.type.sampler.Sampler; +import com.dfsek.seismic.type.vector.Vector3Int; + import java.util.ArrayList; import java.util.EnumSet; import java.util.List; import java.util.random.RandomGenerator; import java.util.random.RandomGeneratorFactory; -import com.dfsek.seismic.type.Rotation; - import com.dfsek.terra.api.block.state.BlockState; import com.dfsek.terra.api.block.state.properties.enums.Direction; -import com.dfsek.seismic.type.sampler.Sampler; import com.dfsek.terra.api.structure.Structure; import com.dfsek.terra.api.util.collection.MaterialSet; import com.dfsek.terra.api.util.collection.ProbabilityCollection; -import com.dfsek.seismic.type.vector.Vector3Int; import com.dfsek.terra.api.world.WritableWorld; diff --git a/common/addons/config-locators/src/main/java/com/dfsek/terra/addons/feature/locator/config/Sampler3DLocatorTemplate.java b/common/addons/config-locators/src/main/java/com/dfsek/terra/addons/feature/locator/config/Sampler3DLocatorTemplate.java index 0382985a9..1598c969a 100644 --- a/common/addons/config-locators/src/main/java/com/dfsek/terra/addons/feature/locator/config/Sampler3DLocatorTemplate.java +++ b/common/addons/config-locators/src/main/java/com/dfsek/terra/addons/feature/locator/config/Sampler3DLocatorTemplate.java @@ -7,12 +7,12 @@ package com.dfsek.terra.addons.feature.locator.config; +import com.dfsek.seismic.type.sampler.Sampler; import com.dfsek.tectonic.api.config.template.annotations.Value; import com.dfsek.tectonic.api.config.template.object.ObjectTemplate; import com.dfsek.terra.addons.feature.locator.locators.Sampler3DLocator; import com.dfsek.terra.api.config.meta.Meta; -import com.dfsek.seismic.type.sampler.Sampler; import com.dfsek.terra.api.structure.feature.Locator; diff --git a/common/addons/config-locators/src/main/java/com/dfsek/terra/addons/feature/locator/config/SamplerLocatorTemplate.java b/common/addons/config-locators/src/main/java/com/dfsek/terra/addons/feature/locator/config/SamplerLocatorTemplate.java index f2915f234..1e4adc33a 100644 --- a/common/addons/config-locators/src/main/java/com/dfsek/terra/addons/feature/locator/config/SamplerLocatorTemplate.java +++ b/common/addons/config-locators/src/main/java/com/dfsek/terra/addons/feature/locator/config/SamplerLocatorTemplate.java @@ -7,6 +7,7 @@ package com.dfsek.terra.addons.feature.locator.config; +import com.dfsek.seismic.type.sampler.Sampler; import com.dfsek.tectonic.api.config.template.annotations.Value; import com.dfsek.tectonic.api.config.template.object.ObjectTemplate; @@ -14,7 +15,6 @@ import java.util.List; import com.dfsek.terra.addons.feature.locator.locators.SamplerLocator; import com.dfsek.terra.api.config.meta.Meta; -import com.dfsek.seismic.type.sampler.Sampler; import com.dfsek.terra.api.structure.feature.Locator; diff --git a/common/addons/config-locators/src/main/java/com/dfsek/terra/addons/feature/locator/config/pattern/BlockSetMatchPatternTemplate.java b/common/addons/config-locators/src/main/java/com/dfsek/terra/addons/feature/locator/config/pattern/BlockSetMatchPatternTemplate.java index 1bca74dc8..08116ae0c 100644 --- a/common/addons/config-locators/src/main/java/com/dfsek/terra/addons/feature/locator/config/pattern/BlockSetMatchPatternTemplate.java +++ b/common/addons/config-locators/src/main/java/com/dfsek/terra/addons/feature/locator/config/pattern/BlockSetMatchPatternTemplate.java @@ -13,8 +13,8 @@ import com.dfsek.tectonic.api.config.template.object.ObjectTemplate; import com.dfsek.terra.addons.feature.locator.patterns.MatchPattern; import com.dfsek.terra.addons.feature.locator.patterns.Pattern; import com.dfsek.terra.api.config.meta.Meta; -import com.dfsek.terra.api.util.range.Range; import com.dfsek.terra.api.util.collection.MaterialSet; +import com.dfsek.terra.api.util.range.Range; public class BlockSetMatchPatternTemplate implements ObjectTemplate { diff --git a/common/addons/config-locators/src/main/java/com/dfsek/terra/addons/feature/locator/locators/Sampler3DLocator.java b/common/addons/config-locators/src/main/java/com/dfsek/terra/addons/feature/locator/locators/Sampler3DLocator.java index b419853d4..baa4f9f81 100644 --- a/common/addons/config-locators/src/main/java/com/dfsek/terra/addons/feature/locator/locators/Sampler3DLocator.java +++ b/common/addons/config-locators/src/main/java/com/dfsek/terra/addons/feature/locator/locators/Sampler3DLocator.java @@ -8,6 +8,7 @@ package com.dfsek.terra.addons.feature.locator.locators; import com.dfsek.seismic.type.sampler.Sampler; + import com.dfsek.terra.api.structure.feature.BinaryColumn; import com.dfsek.terra.api.structure.feature.Locator; import com.dfsek.terra.api.world.chunk.generation.util.Column; diff --git a/common/addons/config-locators/src/main/java/com/dfsek/terra/addons/feature/locator/locators/SamplerLocator.java b/common/addons/config-locators/src/main/java/com/dfsek/terra/addons/feature/locator/locators/SamplerLocator.java index 5423e25f4..5508c4e99 100644 --- a/common/addons/config-locators/src/main/java/com/dfsek/terra/addons/feature/locator/locators/SamplerLocator.java +++ b/common/addons/config-locators/src/main/java/com/dfsek/terra/addons/feature/locator/locators/SamplerLocator.java @@ -7,9 +7,10 @@ package com.dfsek.terra.addons.feature.locator.locators; +import com.dfsek.seismic.type.sampler.Sampler; + import java.util.List; -import com.dfsek.seismic.type.sampler.Sampler; import com.dfsek.terra.api.structure.feature.BinaryColumn; import com.dfsek.terra.api.structure.feature.Locator; import com.dfsek.terra.api.world.chunk.generation.util.Column; diff --git a/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/NoiseAddon.java b/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/NoiseAddon.java index 19da4e2af..313483acd 100644 --- a/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/NoiseAddon.java +++ b/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/NoiseAddon.java @@ -8,9 +8,26 @@ package com.dfsek.terra.addons.noise; import com.dfsek.paralithic.eval.parser.Parser.ParseOptions; +import com.dfsek.seismic.algorithms.sampler.arithmetic.AdditionSampler; +import com.dfsek.seismic.algorithms.sampler.arithmetic.DivisionSampler; +import com.dfsek.seismic.algorithms.sampler.arithmetic.MaxSampler; +import com.dfsek.seismic.algorithms.sampler.arithmetic.MinSampler; +import com.dfsek.seismic.algorithms.sampler.arithmetic.MultiplicationSampler; +import com.dfsek.seismic.algorithms.sampler.arithmetic.SubtractionSampler; import com.dfsek.seismic.algorithms.sampler.noise.CellularSampler; +import com.dfsek.seismic.algorithms.sampler.noise.random.GaussianNoiseSampler; +import com.dfsek.seismic.algorithms.sampler.noise.random.PositiveWhiteNoiseSampler; +import com.dfsek.seismic.algorithms.sampler.noise.random.WhiteNoiseSampler; +import com.dfsek.seismic.algorithms.sampler.noise.simplex.OpenSimplex2SSampler; +import com.dfsek.seismic.algorithms.sampler.noise.simplex.OpenSimplex2Sampler; +import com.dfsek.seismic.algorithms.sampler.noise.simplex.PerlinSampler; +import com.dfsek.seismic.algorithms.sampler.noise.simplex.SimplexSampler; +import com.dfsek.seismic.algorithms.sampler.noise.value.ValueCubicSampler; +import com.dfsek.seismic.algorithms.sampler.noise.value.ValueSampler; import com.dfsek.seismic.type.CubicSpline; import com.dfsek.seismic.type.DistanceFunction; +import com.dfsek.seismic.type.sampler.DerivativeSampler; +import com.dfsek.seismic.type.sampler.Sampler; import com.dfsek.tectonic.api.config.template.object.ObjectTemplate; import java.util.LinkedHashMap; @@ -52,17 +69,9 @@ 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.seismic.type.sampler.DerivativeSampler; -import com.dfsek.seismic.type.sampler.Sampler; import com.dfsek.terra.api.registry.CheckedRegistry; import com.dfsek.terra.api.util.reflection.TypeKey; -import com.dfsek.seismic.algorithms.sampler.noise.*; -import com.dfsek.seismic.algorithms.sampler.noise.simplex.*; -import com.dfsek.seismic.algorithms.sampler.noise.fractal.*; -import com.dfsek.seismic.algorithms.sampler.noise.random.*; -import com.dfsek.seismic.algorithms.sampler.noise.value.*; -import com.dfsek.seismic.algorithms.sampler.normalizer.*; -import com.dfsek.seismic.algorithms.sampler.arithmetic.*; + public class NoiseAddon implements AddonInitializer { public static final TypeKey>> NOISE_SAMPLER_TOKEN = new TypeKey<>() { @@ -147,7 +156,8 @@ public class NoiseAddon implements AddonInitializer { Map packSamplers = new LinkedHashMap<>(); Map packFunctions = new LinkedHashMap<>(); - noiseRegistry.register(addon.key("EXPRESSION"), () -> new ExpressionFunctionTemplate(packSamplers, packFunctions, expressionParseOptions)); + noiseRegistry.register(addon.key("EXPRESSION"), + () -> new ExpressionFunctionTemplate(packSamplers, packFunctions, expressionParseOptions)); noiseRegistry.register(addon.key("EXPRESSION_NORMALIZER"), () -> new ExpressionNormalizerTemplate(packSamplers, packFunctions, expressionParseOptions)); diff --git a/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/config/CubicSplinePointTemplate.java b/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/config/CubicSplinePointTemplate.java index 0b609ff96..34c598f6b 100644 --- a/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/config/CubicSplinePointTemplate.java +++ b/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/config/CubicSplinePointTemplate.java @@ -4,9 +4,9 @@ import com.dfsek.seismic.type.CubicSpline.Point; import com.dfsek.tectonic.api.config.template.annotations.Value; import com.dfsek.tectonic.api.config.template.object.ObjectTemplate; - import com.dfsek.terra.api.config.meta.Meta; + public class CubicSplinePointTemplate implements ObjectTemplate { @Value("from") diff --git a/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/config/DimensionApplicableSampler.java b/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/config/DimensionApplicableSampler.java index 38b474b3f..6a3a1d39e 100644 --- a/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/config/DimensionApplicableSampler.java +++ b/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/config/DimensionApplicableSampler.java @@ -7,11 +7,11 @@ package com.dfsek.terra.addons.noise.config; +import com.dfsek.seismic.type.sampler.Sampler; import com.dfsek.tectonic.api.config.template.annotations.Value; import com.dfsek.tectonic.api.config.template.object.ObjectTemplate; import com.dfsek.terra.api.config.meta.Meta; -import com.dfsek.seismic.type.sampler.Sampler; public class DimensionApplicableSampler implements ObjectTemplate { diff --git a/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/config/sampler/CacheSampler.java b/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/config/sampler/CacheSampler.java index 52c7a6ea3..fb2c4090b 100644 --- a/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/config/sampler/CacheSampler.java +++ b/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/config/sampler/CacheSampler.java @@ -1,18 +1,16 @@ package com.dfsek.terra.addons.noise.config.sampler; import com.dfsek.seismic.type.sampler.Sampler; - -import com.dfsek.terra.api.util.cache.DoubleSeededVector2Key; -import com.dfsek.terra.api.util.cache.DoubleSeededVector3Key; -import com.dfsek.terra.api.util.generic.pair.Pair; - -import com.dfsek.terra.api.util.generic.pair.Pair.Mutable; - import com.github.benmanes.caffeine.cache.Caffeine; import com.github.benmanes.caffeine.cache.LoadingCache; import com.github.benmanes.caffeine.cache.Scheduler; import org.jetbrains.annotations.ApiStatus.Experimental; +import com.dfsek.terra.api.util.cache.DoubleSeededVector2Key; +import com.dfsek.terra.api.util.cache.DoubleSeededVector3Key; +import com.dfsek.terra.api.util.generic.pair.Pair; +import com.dfsek.terra.api.util.generic.pair.Pair.Mutable; + import static com.dfsek.terra.api.util.cache.CacheUtils.CACHE_EXECUTOR; @@ -25,7 +23,7 @@ public class CacheSampler implements Sampler { public CacheSampler(Sampler sampler, int dimensions) { this.sampler = sampler; - if (dimensions == 2) { + if(dimensions == 2) { this.cache2D = ThreadLocal.withInitial(() -> { LoadingCache cache = Caffeine .newBuilder() diff --git a/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/config/templates/BinaryArithmeticTemplate.java b/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/config/templates/BinaryArithmeticTemplate.java index a1ff9438d..c7fd71d01 100644 --- a/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/config/templates/BinaryArithmeticTemplate.java +++ b/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/config/templates/BinaryArithmeticTemplate.java @@ -1,12 +1,12 @@ package com.dfsek.terra.addons.noise.config.templates; import com.dfsek.seismic.algorithms.sampler.arithmetic.BinaryArithmeticSampler; +import com.dfsek.seismic.type.sampler.Sampler; import com.dfsek.tectonic.api.config.template.annotations.Value; import java.util.function.BiFunction; import com.dfsek.terra.api.config.meta.Meta; -import com.dfsek.seismic.type.sampler.Sampler; public class BinaryArithmeticTemplate extends SamplerTemplate { diff --git a/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/config/templates/CacheSamplerTemplate.java b/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/config/templates/CacheSamplerTemplate.java index 9af1a6462..f94af9484 100644 --- a/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/config/templates/CacheSamplerTemplate.java +++ b/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/config/templates/CacheSamplerTemplate.java @@ -1,14 +1,12 @@ package com.dfsek.terra.addons.noise.config.templates; +import com.dfsek.seismic.type.sampler.Sampler; import com.dfsek.tectonic.api.config.template.annotations.Default; import com.dfsek.tectonic.api.config.template.annotations.Value; - -import com.dfsek.seismic.type.sampler.Sampler; +import org.jetbrains.annotations.ApiStatus.Experimental; import com.dfsek.terra.addons.noise.config.sampler.CacheSampler; -import org.jetbrains.annotations.ApiStatus.Experimental; - @Experimental public class CacheSamplerTemplate extends SamplerTemplate { diff --git a/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/config/templates/DerivativeSamplerTemplate.java b/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/config/templates/DerivativeSamplerTemplate.java index e322d59a3..c3367de8e 100644 --- a/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/config/templates/DerivativeSamplerTemplate.java +++ b/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/config/templates/DerivativeSamplerTemplate.java @@ -1,11 +1,10 @@ package com.dfsek.terra.addons.noise.config.templates; import com.dfsek.seismic.type.sampler.DerivativeSampler; +import com.dfsek.seismic.type.sampler.Sampler; import com.dfsek.tectonic.api.config.template.annotations.Value; import com.dfsek.tectonic.api.exception.ValidationException; -import com.dfsek.seismic.type.sampler.Sampler; - public class DerivativeSamplerTemplate extends SamplerTemplate { diff --git a/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/config/templates/DomainWarpTemplate.java b/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/config/templates/DomainWarpTemplate.java index f1d1ed93c..067a928a9 100644 --- a/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/config/templates/DomainWarpTemplate.java +++ b/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/config/templates/DomainWarpTemplate.java @@ -8,11 +8,11 @@ package com.dfsek.terra.addons.noise.config.templates; import com.dfsek.seismic.algorithms.sampler.DomainWarpedSampler; +import com.dfsek.seismic.type.sampler.Sampler; import com.dfsek.tectonic.api.config.template.annotations.Default; import com.dfsek.tectonic.api.config.template.annotations.Value; import com.dfsek.terra.api.config.meta.Meta; -import com.dfsek.seismic.type.sampler.Sampler; @SuppressWarnings({ "unused", "FieldMayBeFinal" }) diff --git a/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/config/templates/FunctionTemplate.java b/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/config/templates/FunctionTemplate.java index 12abfa99c..578f211a9 100644 --- a/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/config/templates/FunctionTemplate.java +++ b/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/config/templates/FunctionTemplate.java @@ -12,12 +12,12 @@ 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.object.ObjectTemplate; -import com.dfsek.terra.api.config.meta.Meta; - import java.util.LinkedHashMap; import java.util.List; import java.util.Objects; +import com.dfsek.terra.api.config.meta.Meta; + @SuppressWarnings("unused") public class FunctionTemplate implements ObjectTemplate { diff --git a/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/config/templates/KernelTemplate.java b/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/config/templates/KernelTemplate.java index 407313b66..380ec97d4 100644 --- a/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/config/templates/KernelTemplate.java +++ b/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/config/templates/KernelTemplate.java @@ -8,6 +8,7 @@ package com.dfsek.terra.addons.noise.config.templates; import com.dfsek.seismic.algorithms.sampler.KernelSampler; +import com.dfsek.seismic.type.sampler.Sampler; import com.dfsek.tectonic.api.config.template.annotations.Default; import com.dfsek.tectonic.api.config.template.annotations.Value; import com.dfsek.tectonic.api.exception.ValidationException; @@ -15,7 +16,6 @@ import com.dfsek.tectonic.api.exception.ValidationException; import java.util.List; import com.dfsek.terra.api.config.meta.Meta; -import com.dfsek.seismic.type.sampler.Sampler; @SuppressWarnings({ "unused", "FieldMayBeFinal" }) diff --git a/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/config/templates/LinearHeightmapSamplerTemplate.java b/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/config/templates/LinearHeightmapSamplerTemplate.java index 744c3cb46..8bc0f057e 100644 --- a/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/config/templates/LinearHeightmapSamplerTemplate.java +++ b/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/config/templates/LinearHeightmapSamplerTemplate.java @@ -1,11 +1,11 @@ package com.dfsek.terra.addons.noise.config.templates; import com.dfsek.seismic.algorithms.sampler.LinearHeightmapSampler; +import com.dfsek.seismic.type.sampler.Sampler; import com.dfsek.tectonic.api.config.template.annotations.Default; import com.dfsek.tectonic.api.config.template.annotations.Value; import com.dfsek.terra.api.config.meta.Meta; -import com.dfsek.seismic.type.sampler.Sampler; @SuppressWarnings("FieldMayBeFinal") diff --git a/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/config/templates/SamplerTemplate.java b/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/config/templates/SamplerTemplate.java index 07dd2f5be..db2600348 100644 --- a/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/config/templates/SamplerTemplate.java +++ b/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/config/templates/SamplerTemplate.java @@ -7,6 +7,7 @@ package com.dfsek.terra.addons.noise.config.templates; +import com.dfsek.seismic.type.sampler.Sampler; import com.dfsek.tectonic.api.config.template.ValidatedConfigTemplate; import com.dfsek.tectonic.api.config.template.annotations.Default; import com.dfsek.tectonic.api.config.template.annotations.Value; @@ -14,7 +15,6 @@ import com.dfsek.tectonic.api.config.template.object.ObjectTemplate; import com.dfsek.tectonic.api.exception.ValidationException; import com.dfsek.terra.api.config.meta.Meta; -import com.dfsek.seismic.type.sampler.Sampler; @SuppressWarnings("FieldMayBeFinal") diff --git a/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/config/templates/TranslateSamplerTemplate.java b/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/config/templates/TranslateSamplerTemplate.java index 1a73a21b2..6d4a448db 100644 --- a/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/config/templates/TranslateSamplerTemplate.java +++ b/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/config/templates/TranslateSamplerTemplate.java @@ -1,11 +1,11 @@ package com.dfsek.terra.addons.noise.config.templates; import com.dfsek.seismic.algorithms.sampler.TranslateSampler; +import com.dfsek.seismic.type.sampler.Sampler; import com.dfsek.tectonic.api.config.template.annotations.Default; import com.dfsek.tectonic.api.config.template.annotations.Value; import com.dfsek.terra.api.config.meta.Meta; -import com.dfsek.seismic.type.sampler.Sampler; public class TranslateSamplerTemplate extends SamplerTemplate { diff --git a/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/config/templates/noise/CellularNoiseTemplate.java b/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/config/templates/noise/CellularNoiseTemplate.java index 9c4aa142d..89ff13a94 100644 --- a/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/config/templates/noise/CellularNoiseTemplate.java +++ b/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/config/templates/noise/CellularNoiseTemplate.java @@ -10,12 +10,11 @@ package com.dfsek.terra.addons.noise.config.templates.noise; import com.dfsek.seismic.algorithms.sampler.noise.CellularSampler; import com.dfsek.seismic.algorithms.sampler.noise.simplex.OpenSimplex2Sampler; import com.dfsek.seismic.type.DistanceFunction; +import com.dfsek.seismic.type.sampler.Sampler; import com.dfsek.tectonic.api.config.template.annotations.Default; import com.dfsek.tectonic.api.config.template.annotations.Value; - import com.dfsek.terra.api.config.meta.Meta; -import com.dfsek.seismic.type.sampler.Sampler; @SuppressWarnings("FieldMayBeFinal") diff --git a/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/config/templates/noise/ConstantNoiseTemplate.java b/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/config/templates/noise/ConstantNoiseTemplate.java index 49922b07d..de23bca7c 100644 --- a/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/config/templates/noise/ConstantNoiseTemplate.java +++ b/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/config/templates/noise/ConstantNoiseTemplate.java @@ -8,12 +8,12 @@ package com.dfsek.terra.addons.noise.config.templates.noise; import com.dfsek.seismic.algorithms.sampler.noise.ConstantSampler; +import com.dfsek.seismic.type.sampler.Sampler; import com.dfsek.tectonic.api.config.template.annotations.Default; import com.dfsek.tectonic.api.config.template.annotations.Value; import com.dfsek.terra.addons.noise.config.templates.SamplerTemplate; import com.dfsek.terra.api.config.meta.Meta; -import com.dfsek.seismic.type.sampler.Sampler; @SuppressWarnings("FieldMayBeFinal") diff --git a/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/config/templates/noise/DistanceSamplerTemplate.java b/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/config/templates/noise/DistanceSamplerTemplate.java index 997661313..4692dca9b 100644 --- a/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/config/templates/noise/DistanceSamplerTemplate.java +++ b/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/config/templates/noise/DistanceSamplerTemplate.java @@ -6,7 +6,6 @@ import com.dfsek.tectonic.api.config.template.annotations.Default; import com.dfsek.tectonic.api.config.template.annotations.Value; import com.dfsek.terra.addons.noise.config.templates.SamplerTemplate; - import com.dfsek.terra.api.config.meta.Meta; diff --git a/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/config/templates/noise/ExpressionFunctionTemplate.java b/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/config/templates/noise/ExpressionFunctionTemplate.java index 273511467..c20db2d54 100644 --- a/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/config/templates/noise/ExpressionFunctionTemplate.java +++ b/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/config/templates/noise/ExpressionFunctionTemplate.java @@ -10,6 +10,7 @@ package com.dfsek.terra.addons.noise.config.templates.noise; import com.dfsek.paralithic.eval.parser.Parser.ParseOptions; import com.dfsek.paralithic.eval.tokenizer.ParseException; import com.dfsek.paralithic.sampler.noise.ExpressionNoiseFunction; +import com.dfsek.seismic.type.sampler.Sampler; import com.dfsek.tectonic.api.config.template.annotations.Default; import com.dfsek.tectonic.api.config.template.annotations.Value; @@ -21,7 +22,6 @@ import com.dfsek.terra.addons.noise.config.DimensionApplicableSampler; import com.dfsek.terra.addons.noise.config.templates.FunctionTemplate; import com.dfsek.terra.addons.noise.config.templates.SamplerTemplate; import com.dfsek.terra.api.config.meta.Meta; -import com.dfsek.seismic.type.sampler.Sampler; import static com.dfsek.terra.addons.noise.paralithic.FunctionUtil.convertFunctionsAndSamplers; @@ -58,7 +58,8 @@ public class ExpressionFunctionTemplate extends SamplerTemplate(globalSamplers); mergedSamplers.putAll(samplers); try { - return new ExpressionNoiseFunction(convertFunctionsAndSamplers(mergedFunctions, mergedSamplers), expression, vars, parseOptions); + return new ExpressionNoiseFunction(convertFunctionsAndSamplers(mergedFunctions, mergedSamplers), expression, vars, + parseOptions); } catch(ParseException e) { throw new RuntimeException("Failed to parse expression.", e); } diff --git a/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/config/templates/noise/GaborNoiseTemplate.java b/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/config/templates/noise/GaborNoiseTemplate.java index 2347f76b7..5b1b19699 100644 --- a/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/config/templates/noise/GaborNoiseTemplate.java +++ b/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/config/templates/noise/GaborNoiseTemplate.java @@ -8,12 +8,11 @@ package com.dfsek.terra.addons.noise.config.templates.noise; import com.dfsek.seismic.algorithms.sampler.noise.GaborSampler; +import com.dfsek.seismic.type.sampler.Sampler; import com.dfsek.tectonic.api.config.template.annotations.Default; import com.dfsek.tectonic.api.config.template.annotations.Value; - import com.dfsek.terra.api.config.meta.Meta; -import com.dfsek.seismic.type.sampler.Sampler; @SuppressWarnings("FieldMayBeFinal") diff --git a/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/config/templates/noise/PseudoErosionTemplate.java b/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/config/templates/noise/PseudoErosionTemplate.java index 6cbc4a6b6..f8f90fa40 100644 --- a/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/config/templates/noise/PseudoErosionTemplate.java +++ b/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/config/templates/noise/PseudoErosionTemplate.java @@ -2,11 +2,11 @@ package com.dfsek.terra.addons.noise.config.templates.noise; import com.dfsek.seismic.algorithms.sampler.noise.PseudoErosionSampler; import com.dfsek.seismic.algorithms.sampler.noise.simplex.OpenSimplex2Sampler; +import com.dfsek.seismic.type.sampler.DerivativeSampler; import com.dfsek.tectonic.api.config.template.annotations.Default; import com.dfsek.tectonic.api.config.template.annotations.Value; import com.dfsek.terra.api.config.meta.Meta; -import com.dfsek.seismic.type.sampler.DerivativeSampler; public class PseudoErosionTemplate extends NoiseTemplate { diff --git a/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/config/templates/noise/SimpleNoiseTemplate.java b/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/config/templates/noise/SimpleNoiseTemplate.java index d93569aa8..8a6f4c52f 100644 --- a/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/config/templates/noise/SimpleNoiseTemplate.java +++ b/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/config/templates/noise/SimpleNoiseTemplate.java @@ -7,11 +7,11 @@ package com.dfsek.terra.addons.noise.config.templates.noise; -import java.util.function.Supplier; - import com.dfsek.seismic.algorithms.sampler.noise.NoiseFunction; import com.dfsek.seismic.type.sampler.Sampler; +import java.util.function.Supplier; + public class SimpleNoiseTemplate extends NoiseTemplate { private final Supplier samplerSupplier; diff --git a/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/config/templates/noise/fractal/FractalTemplate.java b/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/config/templates/noise/fractal/FractalTemplate.java index 02587ebe4..9314cd42a 100644 --- a/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/config/templates/noise/fractal/FractalTemplate.java +++ b/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/config/templates/noise/fractal/FractalTemplate.java @@ -8,12 +8,12 @@ package com.dfsek.terra.addons.noise.config.templates.noise.fractal; import com.dfsek.seismic.algorithms.sampler.noise.fractal.FractalNoiseFunction; +import com.dfsek.seismic.type.sampler.Sampler; import com.dfsek.tectonic.api.config.template.annotations.Default; import com.dfsek.tectonic.api.config.template.annotations.Value; import com.dfsek.terra.addons.noise.config.templates.SamplerTemplate; import com.dfsek.terra.api.config.meta.Meta; -import com.dfsek.seismic.type.sampler.Sampler; public abstract class FractalTemplate extends SamplerTemplate { diff --git a/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/config/templates/noise/fractal/PingPongTemplate.java b/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/config/templates/noise/fractal/PingPongTemplate.java index 3913d0930..87e06cd91 100644 --- a/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/config/templates/noise/fractal/PingPongTemplate.java +++ b/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/config/templates/noise/fractal/PingPongTemplate.java @@ -8,11 +8,11 @@ package com.dfsek.terra.addons.noise.config.templates.noise.fractal; import com.dfsek.seismic.algorithms.sampler.noise.fractal.PingPongSampler; +import com.dfsek.seismic.type.sampler.Sampler; import com.dfsek.tectonic.api.config.template.annotations.Default; import com.dfsek.tectonic.api.config.template.annotations.Value; import com.dfsek.terra.api.config.meta.Meta; -import com.dfsek.seismic.type.sampler.Sampler; @SuppressWarnings({ "unused", "FieldMayBeFinal" }) diff --git a/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/config/templates/normalizer/ClampNormalizerTemplate.java b/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/config/templates/normalizer/ClampNormalizerTemplate.java index 91d764909..a6b0658d9 100644 --- a/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/config/templates/normalizer/ClampNormalizerTemplate.java +++ b/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/config/templates/normalizer/ClampNormalizerTemplate.java @@ -8,10 +8,10 @@ package com.dfsek.terra.addons.noise.config.templates.normalizer; import com.dfsek.seismic.algorithms.sampler.normalizer.ClampNormalizer; +import com.dfsek.seismic.type.sampler.Sampler; import com.dfsek.tectonic.api.config.template.annotations.Value; import com.dfsek.terra.api.config.meta.Meta; -import com.dfsek.seismic.type.sampler.Sampler; @SuppressWarnings({ "unused", "FieldMayBeFinal" }) diff --git a/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/config/templates/normalizer/CubicSplineNormalizerTemplate.java b/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/config/templates/normalizer/CubicSplineNormalizerTemplate.java index 3ff448bc2..2174b0ee0 100644 --- a/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/config/templates/normalizer/CubicSplineNormalizerTemplate.java +++ b/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/config/templates/normalizer/CubicSplineNormalizerTemplate.java @@ -4,13 +4,13 @@ package com.dfsek.terra.addons.noise.config.templates.normalizer; import com.dfsek.seismic.algorithms.sampler.normalizer.CubicSplineNormalizer; import com.dfsek.seismic.type.CubicSpline; import com.dfsek.seismic.type.CubicSpline.Point; +import com.dfsek.seismic.type.sampler.Sampler; import com.dfsek.tectonic.api.config.template.annotations.Value; import java.util.List; -import com.dfsek.terra.addons.noise.config.templates.SamplerTemplate; import com.dfsek.terra.api.config.meta.Meta; -import com.dfsek.seismic.type.sampler.Sampler; + public class CubicSplineNormalizerTemplate extends NormalizerTemplate { diff --git a/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/config/templates/normalizer/ExpressionNormalizerTemplate.java b/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/config/templates/normalizer/ExpressionNormalizerTemplate.java index a5f06fad8..f71ebd870 100644 --- a/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/config/templates/normalizer/ExpressionNormalizerTemplate.java +++ b/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/config/templates/normalizer/ExpressionNormalizerTemplate.java @@ -9,6 +9,8 @@ package com.dfsek.terra.addons.noise.config.templates.normalizer; import com.dfsek.paralithic.eval.parser.Parser.ParseOptions; import com.dfsek.paralithic.eval.tokenizer.ParseException; +import com.dfsek.paralithic.sampler.normalizer.ExpressionNormalizer; +import com.dfsek.seismic.type.sampler.Sampler; import com.dfsek.tectonic.api.config.template.annotations.Default; import com.dfsek.tectonic.api.config.template.annotations.Value; @@ -19,8 +21,6 @@ import java.util.Map; import com.dfsek.terra.addons.noise.config.DimensionApplicableSampler; import com.dfsek.terra.addons.noise.config.templates.FunctionTemplate; import com.dfsek.terra.api.config.meta.Meta; -import com.dfsek.seismic.type.sampler.Sampler; -import com.dfsek.paralithic.sampler.normalizer.ExpressionNormalizer; import static com.dfsek.terra.addons.noise.paralithic.FunctionUtil.convertFunctionsAndSamplers; @@ -62,7 +62,8 @@ public class ExpressionNormalizerTemplate extends NormalizerTemplate(globalSamplers); mergedSamplers.putAll(samplers); try { - return new ExpressionNormalizer(function, convertFunctionsAndSamplers(mergedFunctions, mergedSamplers), expression, vars, parseOptions); + return new ExpressionNormalizer(function, convertFunctionsAndSamplers(mergedFunctions, mergedSamplers), expression, vars, + parseOptions); } catch(ParseException e) { throw new RuntimeException("Failed to parse expression.", e); } diff --git a/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/config/templates/normalizer/LinearMapNormalizerTemplate.java b/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/config/templates/normalizer/LinearMapNormalizerTemplate.java index c335c914b..064efbcee 100644 --- a/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/config/templates/normalizer/LinearMapNormalizerTemplate.java +++ b/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/config/templates/normalizer/LinearMapNormalizerTemplate.java @@ -1,11 +1,11 @@ package com.dfsek.terra.addons.noise.config.templates.normalizer; import com.dfsek.seismic.algorithms.sampler.normalizer.LinearMapNormalizer; +import com.dfsek.seismic.type.sampler.Sampler; import com.dfsek.tectonic.api.config.template.annotations.Default; import com.dfsek.tectonic.api.config.template.annotations.Value; import com.dfsek.terra.api.config.meta.Meta; -import com.dfsek.seismic.type.sampler.Sampler; public class LinearMapNormalizerTemplate extends NormalizerTemplate { diff --git a/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/config/templates/normalizer/LinearNormalizerTemplate.java b/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/config/templates/normalizer/LinearNormalizerTemplate.java index b12e7f3ba..384180b64 100644 --- a/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/config/templates/normalizer/LinearNormalizerTemplate.java +++ b/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/config/templates/normalizer/LinearNormalizerTemplate.java @@ -8,10 +8,10 @@ package com.dfsek.terra.addons.noise.config.templates.normalizer; import com.dfsek.seismic.algorithms.sampler.normalizer.LinearNormalizer; +import com.dfsek.seismic.type.sampler.Sampler; import com.dfsek.tectonic.api.config.template.annotations.Value; import com.dfsek.terra.api.config.meta.Meta; -import com.dfsek.seismic.type.sampler.Sampler; @SuppressWarnings({ "unused", "FieldMayBeFinal" }) diff --git a/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/config/templates/normalizer/NormalNormalizerTemplate.java b/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/config/templates/normalizer/NormalNormalizerTemplate.java index 839d8993e..e3024d98b 100644 --- a/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/config/templates/normalizer/NormalNormalizerTemplate.java +++ b/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/config/templates/normalizer/NormalNormalizerTemplate.java @@ -8,11 +8,11 @@ package com.dfsek.terra.addons.noise.config.templates.normalizer; import com.dfsek.seismic.algorithms.sampler.normalizer.NormalNormalizer; +import com.dfsek.seismic.type.sampler.Sampler; import com.dfsek.tectonic.api.config.template.annotations.Default; import com.dfsek.tectonic.api.config.template.annotations.Value; import com.dfsek.terra.api.config.meta.Meta; -import com.dfsek.seismic.type.sampler.Sampler; @SuppressWarnings({ "unused", "FieldMayBeFinal" }) diff --git a/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/config/templates/normalizer/NormalizerTemplate.java b/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/config/templates/normalizer/NormalizerTemplate.java index e3ffcab68..6bc1376b5 100644 --- a/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/config/templates/normalizer/NormalizerTemplate.java +++ b/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/config/templates/normalizer/NormalizerTemplate.java @@ -8,11 +8,11 @@ package com.dfsek.terra.addons.noise.config.templates.normalizer; import com.dfsek.seismic.algorithms.sampler.normalizer.Normalizer; +import com.dfsek.seismic.type.sampler.Sampler; import com.dfsek.tectonic.api.config.template.annotations.Value; import com.dfsek.terra.addons.noise.config.templates.SamplerTemplate; import com.dfsek.terra.api.config.meta.Meta; -import com.dfsek.seismic.type.sampler.Sampler; public abstract class NormalizerTemplate extends SamplerTemplate { diff --git a/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/config/templates/normalizer/PosterizationNormalizerTemplate.java b/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/config/templates/normalizer/PosterizationNormalizerTemplate.java index 1be8b7c01..253229ff1 100644 --- a/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/config/templates/normalizer/PosterizationNormalizerTemplate.java +++ b/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/config/templates/normalizer/PosterizationNormalizerTemplate.java @@ -8,10 +8,10 @@ package com.dfsek.terra.addons.noise.config.templates.normalizer; import com.dfsek.seismic.algorithms.sampler.normalizer.PosterizationNormalizer; +import com.dfsek.seismic.type.sampler.Sampler; import com.dfsek.tectonic.api.config.template.annotations.Value; import com.dfsek.terra.api.config.meta.Meta; -import com.dfsek.seismic.type.sampler.Sampler; @SuppressWarnings({ "unused", "FieldMayBeFinal" }) diff --git a/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/config/templates/normalizer/ScaleNormalizerTemplate.java b/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/config/templates/normalizer/ScaleNormalizerTemplate.java index 506190201..af851f44a 100644 --- a/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/config/templates/normalizer/ScaleNormalizerTemplate.java +++ b/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/config/templates/normalizer/ScaleNormalizerTemplate.java @@ -1,10 +1,10 @@ package com.dfsek.terra.addons.noise.config.templates.normalizer; import com.dfsek.seismic.algorithms.sampler.normalizer.ScaleNormalizer; +import com.dfsek.seismic.type.sampler.Sampler; import com.dfsek.tectonic.api.config.template.annotations.Value; import com.dfsek.terra.api.config.meta.Meta; -import com.dfsek.seismic.type.sampler.Sampler; public class ScaleNormalizerTemplate extends NormalizerTemplate { diff --git a/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/paralithic/FunctionUtil.java b/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/paralithic/FunctionUtil.java index 4e6451193..f9754793e 100644 --- a/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/paralithic/FunctionUtil.java +++ b/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/paralithic/FunctionUtil.java @@ -2,17 +2,14 @@ package com.dfsek.terra.addons.noise.paralithic; import com.dfsek.paralithic.eval.tokenizer.ParseException; import com.dfsek.paralithic.functions.Function; +import com.dfsek.paralithic.functions.dynamic.noise.NoiseFunction2; +import com.dfsek.paralithic.functions.dynamic.noise.NoiseFunction3; +import com.dfsek.paralithic.functions.dynamic.noise.SaltedNoiseFunction2; +import com.dfsek.paralithic.functions.dynamic.noise.SaltedNoiseFunction3; import java.util.HashMap; import java.util.Map; -import com.dfsek.paralithic.functions.dynamic.noise.NoiseFunction2; - -import com.dfsek.paralithic.functions.dynamic.noise.NoiseFunction3; -import com.dfsek.paralithic.functions.dynamic.noise.SaltedNoiseFunction2; - -import com.dfsek.paralithic.functions.dynamic.noise.SaltedNoiseFunction3; - import com.dfsek.terra.addons.noise.config.DimensionApplicableSampler; import com.dfsek.terra.addons.noise.config.templates.FunctionTemplate; diff --git a/common/addons/config-number-predicate/build.gradle.kts b/common/addons/config-number-predicate/build.gradle.kts index b76b64160..3f69abb4a 100644 --- a/common/addons/config-number-predicate/build.gradle.kts +++ b/common/addons/config-number-predicate/build.gradle.kts @@ -1,5 +1,3 @@ -import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar - version = version("1.0.0") dependencies { diff --git a/common/addons/config-number-predicate/src/main/java/com/dfsek/terra/addons/numberpredicate/NumberPredicateAddon.java b/common/addons/config-number-predicate/src/main/java/com/dfsek/terra/addons/numberpredicate/NumberPredicateAddon.java index fa8d84575..66594e7bd 100644 --- a/common/addons/config-number-predicate/src/main/java/com/dfsek/terra/addons/numberpredicate/NumberPredicateAddon.java +++ b/common/addons/config-number-predicate/src/main/java/com/dfsek/terra/addons/numberpredicate/NumberPredicateAddon.java @@ -30,7 +30,8 @@ public class NumberPredicateAddon implements AddonInitializer { plugin.getEventManager() .getHandler(FunctionalEventHandler.class) .register(addon, ConfigPackPreLoadEvent.class) - .then(event -> event.getPack().applyLoader(DoublePredicate.class, new DoublePredicateLoader(event.getPack().getExpressionParseOptions()))) + .then(event -> event.getPack() + .applyLoader(DoublePredicate.class, new DoublePredicateLoader(event.getPack().getExpressionParseOptions()))) .priority(50) .failThrough(); } 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 84ff59543..ebe909948 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,19 +7,19 @@ package com.dfsek.terra.addons.ore.ores; -import java.util.BitSet; -import java.util.Map; -import java.util.random.RandomGenerator; - import com.dfsek.seismic.math.numericanalysis.interpolation.InterpolationFunctions; import com.dfsek.seismic.math.trigonometry.TrigonometryFunctions; import com.dfsek.seismic.type.Rotation; +import com.dfsek.seismic.type.vector.Vector3Int; + +import java.util.BitSet; +import java.util.Map; +import java.util.random.RandomGenerator; import com.dfsek.terra.api.block.BlockType; import com.dfsek.terra.api.block.state.BlockState; import com.dfsek.terra.api.structure.Structure; import com.dfsek.terra.api.util.collection.MaterialSet; -import com.dfsek.seismic.type.vector.Vector3Int; import com.dfsek.terra.api.world.WritableWorld; import static com.dfsek.terra.addons.ore.utils.VanillaOreUtils.shouldPlace; diff --git a/common/addons/config-ore/src/main/java/com/dfsek/terra/addons/ore/ores/VanillaScatteredOre.java b/common/addons/config-ore/src/main/java/com/dfsek/terra/addons/ore/ores/VanillaScatteredOre.java index aad282294..708450a35 100644 --- a/common/addons/config-ore/src/main/java/com/dfsek/terra/addons/ore/ores/VanillaScatteredOre.java +++ b/common/addons/config-ore/src/main/java/com/dfsek/terra/addons/ore/ores/VanillaScatteredOre.java @@ -1,14 +1,14 @@ package com.dfsek.terra.addons.ore.ores; +import com.dfsek.seismic.type.Rotation; +import com.dfsek.seismic.type.vector.Vector3Int; + import java.util.Map; import java.util.random.RandomGenerator; -import com.dfsek.seismic.type.Rotation; - import com.dfsek.terra.api.block.BlockType; import com.dfsek.terra.api.block.state.BlockState; import com.dfsek.terra.api.util.collection.MaterialSet; -import com.dfsek.seismic.type.vector.Vector3Int; import com.dfsek.terra.api.world.WritableWorld; import static com.dfsek.terra.addons.ore.utils.VanillaOreUtils.shouldPlace; diff --git a/common/addons/config-palette/src/main/java/com/dfsek/terra/addons/palette/PaletteTemplate.java b/common/addons/config-palette/src/main/java/com/dfsek/terra/addons/palette/PaletteTemplate.java index 5f0a03b0c..72cdc4d24 100644 --- a/common/addons/config-palette/src/main/java/com/dfsek/terra/addons/palette/PaletteTemplate.java +++ b/common/addons/config-palette/src/main/java/com/dfsek/terra/addons/palette/PaletteTemplate.java @@ -7,6 +7,7 @@ package com.dfsek.terra.addons.palette; +import com.dfsek.seismic.type.sampler.Sampler; import com.dfsek.tectonic.api.config.template.annotations.Default; import com.dfsek.tectonic.api.config.template.annotations.Final; import com.dfsek.tectonic.api.config.template.annotations.Value; @@ -16,7 +17,6 @@ import java.util.List; import com.dfsek.terra.addons.palette.palette.PaletteLayerHolder; import com.dfsek.terra.api.config.AbstractableTemplate; import com.dfsek.terra.api.config.meta.Meta; -import com.dfsek.seismic.type.sampler.Sampler; @SuppressWarnings({ "FieldMayBeFinal", "unused" }) 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 d70c14e92..6b5364ad5 100644 --- a/common/addons/config-palette/src/main/java/com/dfsek/terra/addons/palette/palette/PaletteImpl.java +++ b/common/addons/config-palette/src/main/java/com/dfsek/terra/addons/palette/palette/PaletteImpl.java @@ -7,14 +7,16 @@ package com.dfsek.terra.addons.palette.palette; +import com.dfsek.seismic.type.sampler.Sampler; + import java.util.ArrayList; import java.util.List; import com.dfsek.terra.api.block.state.BlockState; -import com.dfsek.seismic.type.sampler.Sampler; import com.dfsek.terra.api.util.collection.ProbabilityCollection; import com.dfsek.terra.api.world.chunk.generation.util.Palette; + /** * A class representation of a "slice" of the world. * Used to get a section of blocks, based on the depth at which they are found. @@ -25,12 +27,12 @@ public class PaletteImpl implements Palette { public PaletteImpl(List layers, Sampler defaultSampler) { List layerArray = new ArrayList<>(); - for (PaletteLayerHolder holder : layers) { + for(PaletteLayerHolder holder : layers) { PaletteLayer layer; ProbabilityCollection materials = holder.getLayer(); Sampler sampler = holder.getSampler() == null ? defaultSampler : holder.getSampler(); layer = new PaletteLayer(materials, sampler); - for (int i = 0; i < holder.getSize(); i++) + for(int i = 0; i < holder.getSize(); i++) layerArray.add(layer); } diff --git a/common/addons/config-palette/src/main/java/com/dfsek/terra/addons/palette/palette/PaletteLayerHolder.java b/common/addons/config-palette/src/main/java/com/dfsek/terra/addons/palette/palette/PaletteLayerHolder.java index 33fb7e012..02f4b01e4 100644 --- a/common/addons/config-palette/src/main/java/com/dfsek/terra/addons/palette/palette/PaletteLayerHolder.java +++ b/common/addons/config-palette/src/main/java/com/dfsek/terra/addons/palette/palette/PaletteLayerHolder.java @@ -7,10 +7,10 @@ package com.dfsek.terra.addons.palette.palette; +import com.dfsek.seismic.type.sampler.Sampler; import org.jetbrains.annotations.NotNull; import com.dfsek.terra.api.block.state.BlockState; -import com.dfsek.seismic.type.sampler.Sampler; import com.dfsek.terra.api.util.collection.ProbabilityCollection; diff --git a/common/addons/config-palette/src/main/java/com/dfsek/terra/addons/palette/palette/PaletteLayerLoader.java b/common/addons/config-palette/src/main/java/com/dfsek/terra/addons/palette/palette/PaletteLayerLoader.java index a21885a92..be3a2f875 100644 --- a/common/addons/config-palette/src/main/java/com/dfsek/terra/addons/palette/palette/PaletteLayerLoader.java +++ b/common/addons/config-palette/src/main/java/com/dfsek/terra/addons/palette/palette/PaletteLayerLoader.java @@ -7,13 +7,13 @@ package com.dfsek.terra.addons.palette.palette; +import com.dfsek.seismic.type.sampler.Sampler; 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.object.ObjectTemplate; import com.dfsek.terra.api.block.state.BlockState; import com.dfsek.terra.api.config.meta.Meta; -import com.dfsek.seismic.type.sampler.Sampler; import com.dfsek.terra.api.util.collection.ProbabilityCollection; diff --git a/common/addons/config-structure/src/main/java/com/dfsek/terra/addons/structure/StructureTemplate.java b/common/addons/config-structure/src/main/java/com/dfsek/terra/addons/structure/StructureTemplate.java index d9d0fa175..2e8680d5e 100644 --- a/common/addons/config-structure/src/main/java/com/dfsek/terra/addons/structure/StructureTemplate.java +++ b/common/addons/config-structure/src/main/java/com/dfsek/terra/addons/structure/StructureTemplate.java @@ -14,8 +14,8 @@ import com.dfsek.terra.api.config.AbstractableTemplate; import com.dfsek.terra.api.config.meta.Meta; import com.dfsek.terra.api.structure.Structure; import com.dfsek.terra.api.structure.StructureSpawn; -import com.dfsek.terra.api.util.range.Range; import com.dfsek.terra.api.util.collection.ProbabilityCollection; +import com.dfsek.terra.api.util.range.Range; @SuppressWarnings({ "unused", "FieldMayBeFinal" }) diff --git a/common/addons/config-structure/src/main/java/com/dfsek/terra/addons/structure/TerraStructure.java b/common/addons/config-structure/src/main/java/com/dfsek/terra/addons/structure/TerraStructure.java index 9b99f5b4a..741583cf4 100644 --- a/common/addons/config-structure/src/main/java/com/dfsek/terra/addons/structure/TerraStructure.java +++ b/common/addons/config-structure/src/main/java/com/dfsek/terra/addons/structure/TerraStructure.java @@ -10,8 +10,8 @@ package com.dfsek.terra.addons.structure; import com.dfsek.terra.api.structure.Structure; import com.dfsek.terra.api.structure.StructureSpawn; import com.dfsek.terra.api.structure.configured.ConfiguredStructure; -import com.dfsek.terra.api.util.range.Range; import com.dfsek.terra.api.util.collection.ProbabilityCollection; +import com.dfsek.terra.api.util.range.Range; public class TerraStructure implements ConfiguredStructure { diff --git a/common/addons/generation-stage-feature/src/main/java/com/dfsek/terra/addons/generation/feature/FeatureGenerationStage.java b/common/addons/generation-stage-feature/src/main/java/com/dfsek/terra/addons/generation/feature/FeatureGenerationStage.java index 5d948418c..38880e351 100644 --- a/common/addons/generation-stage-feature/src/main/java/com/dfsek/terra/addons/generation/feature/FeatureGenerationStage.java +++ b/common/addons/generation-stage-feature/src/main/java/com/dfsek/terra/addons/generation/feature/FeatureGenerationStage.java @@ -7,18 +7,18 @@ package com.dfsek.terra.addons.generation.feature; +import com.dfsek.seismic.type.Rotation; +import com.dfsek.seismic.type.sampler.Sampler; +import com.dfsek.seismic.type.vector.Vector3Int; + import java.util.Collections; import java.util.random.RandomGenerator; import java.util.random.RandomGeneratorFactory; -import com.dfsek.seismic.type.Rotation; - import com.dfsek.terra.addons.generation.feature.config.BiomeFeatures; import com.dfsek.terra.api.Platform; -import com.dfsek.seismic.type.sampler.Sampler; import com.dfsek.terra.api.properties.PropertyKey; import com.dfsek.terra.api.registry.key.StringIdentifiable; -import com.dfsek.seismic.type.vector.Vector3Int; import com.dfsek.terra.api.world.WritableWorld; import com.dfsek.terra.api.world.chunk.generation.ProtoWorld; import com.dfsek.terra.api.world.chunk.generation.stage.GenerationStage; 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 0e788d585..bb8cb4854 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 @@ -1,5 +1,6 @@ package com.dfsek.terra.addons.generation.feature.config; +import com.dfsek.seismic.type.sampler.Sampler; import com.dfsek.tectonic.api.config.template.ValidatedConfigTemplate; import com.dfsek.tectonic.api.config.template.annotations.Default; import com.dfsek.tectonic.api.config.template.annotations.Value; @@ -8,7 +9,6 @@ import com.dfsek.tectonic.api.exception.ValidationException; import com.dfsek.terra.addons.generation.feature.FeatureGenerationStage; import com.dfsek.terra.api.Platform; -import com.dfsek.seismic.type.sampler.Sampler; import com.dfsek.terra.api.properties.PropertyKey; import com.dfsek.terra.api.world.chunk.generation.stage.GenerationStage; diff --git a/common/addons/library-image/src/main/java/com/dfsek/terra/addons/image/ImageLibraryAddon.java b/common/addons/library-image/src/main/java/com/dfsek/terra/addons/image/ImageLibraryAddon.java index 43a7a3221..25888e086 100644 --- a/common/addons/library-image/src/main/java/com/dfsek/terra/addons/image/ImageLibraryAddon.java +++ b/common/addons/library-image/src/main/java/com/dfsek/terra/addons/image/ImageLibraryAddon.java @@ -1,5 +1,6 @@ package com.dfsek.terra.addons.image; +import com.dfsek.seismic.type.sampler.Sampler; import com.dfsek.tectonic.api.config.template.object.ObjectTemplate; import java.util.function.Supplier; @@ -26,7 +27,6 @@ import com.dfsek.terra.api.config.ConfigPack; 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.seismic.type.sampler.Sampler; import com.dfsek.terra.api.registry.CheckedRegistry; import com.dfsek.terra.api.util.reflection.TypeKey; diff --git a/common/addons/library-image/src/main/java/com/dfsek/terra/addons/image/config/image/ImageCache.java b/common/addons/library-image/src/main/java/com/dfsek/terra/addons/image/config/image/ImageCache.java index 10611b1d8..7ad72a009 100644 --- a/common/addons/library-image/src/main/java/com/dfsek/terra/addons/image/config/image/ImageCache.java +++ b/common/addons/library-image/src/main/java/com/dfsek/terra/addons/image/config/image/ImageCache.java @@ -2,6 +2,7 @@ package com.dfsek.terra.addons.image.config.image; import com.github.benmanes.caffeine.cache.Caffeine; import com.github.benmanes.caffeine.cache.LoadingCache; +import com.github.benmanes.caffeine.cache.Scheduler; import javax.imageio.ImageIO; import java.io.IOException; @@ -18,8 +19,6 @@ import com.dfsek.terra.api.config.ConfigPack; import com.dfsek.terra.api.properties.Properties; import com.dfsek.terra.api.util.generic.Lazy; -import com.github.benmanes.caffeine.cache.Scheduler; - import static com.dfsek.terra.api.util.cache.CacheUtils.CACHE_EXECUTOR; diff --git a/common/addons/library-image/src/main/java/com/dfsek/terra/addons/image/config/image/ImageTemplate.java b/common/addons/library-image/src/main/java/com/dfsek/terra/addons/image/config/image/ImageTemplate.java index ad9fdb6e4..0ef7ee751 100644 --- a/common/addons/library-image/src/main/java/com/dfsek/terra/addons/image/config/image/ImageTemplate.java +++ b/common/addons/library-image/src/main/java/com/dfsek/terra/addons/image/config/image/ImageTemplate.java @@ -3,11 +3,11 @@ package com.dfsek.terra.addons.image.config.image; import com.dfsek.tectonic.api.config.template.annotations.Value; import com.dfsek.tectonic.api.config.template.object.ObjectTemplate; +import java.io.IOException; + import com.dfsek.terra.addons.image.image.Image; import com.dfsek.terra.api.config.ConfigPack; -import java.io.IOException; - public class ImageTemplate implements ObjectTemplate { diff --git a/common/addons/library-image/src/main/java/com/dfsek/terra/addons/image/config/sampler/ChannelSamplerTemplate.java b/common/addons/library-image/src/main/java/com/dfsek/terra/addons/image/config/sampler/ChannelSamplerTemplate.java index 6f163db55..594c609ef 100644 --- a/common/addons/library-image/src/main/java/com/dfsek/terra/addons/image/config/sampler/ChannelSamplerTemplate.java +++ b/common/addons/library-image/src/main/java/com/dfsek/terra/addons/image/config/sampler/ChannelSamplerTemplate.java @@ -1,5 +1,6 @@ package com.dfsek.terra.addons.image.config.sampler; +import com.dfsek.seismic.type.sampler.Sampler; 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.object.ObjectTemplate; @@ -7,7 +8,6 @@ import com.dfsek.tectonic.api.config.template.object.ObjectTemplate; import com.dfsek.terra.addons.image.colorsampler.ColorSampler; import com.dfsek.terra.addons.image.sampler.ChannelSampler; import com.dfsek.terra.addons.image.util.ColorUtil.Channel; -import com.dfsek.seismic.type.sampler.Sampler; public class ChannelSamplerTemplate implements ObjectTemplate { diff --git a/common/addons/library-image/src/main/java/com/dfsek/terra/addons/image/config/sampler/DistanceTransformSamplerTemplate.java b/common/addons/library-image/src/main/java/com/dfsek/terra/addons/image/config/sampler/DistanceTransformSamplerTemplate.java index 3eea5b9d9..49e9fa35f 100644 --- a/common/addons/library-image/src/main/java/com/dfsek/terra/addons/image/config/sampler/DistanceTransformSamplerTemplate.java +++ b/common/addons/library-image/src/main/java/com/dfsek/terra/addons/image/config/sampler/DistanceTransformSamplerTemplate.java @@ -1,5 +1,6 @@ package com.dfsek.terra.addons.image.config.sampler; +import com.dfsek.seismic.type.sampler.Sampler; 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.object.ObjectTemplate; @@ -9,7 +10,6 @@ import com.dfsek.terra.addons.image.operator.DistanceTransform; import com.dfsek.terra.addons.image.operator.DistanceTransform.CostFunction; import com.dfsek.terra.addons.image.operator.DistanceTransform.Normalization; import com.dfsek.terra.addons.image.util.ColorUtil.Channel; -import com.dfsek.seismic.type.sampler.Sampler; public class DistanceTransformSamplerTemplate implements ObjectTemplate { diff --git a/common/addons/library-image/src/main/java/com/dfsek/terra/addons/image/operator/DistanceTransform.java b/common/addons/library-image/src/main/java/com/dfsek/terra/addons/image/operator/DistanceTransform.java index f9818c80f..e1a2f2234 100644 --- a/common/addons/library-image/src/main/java/com/dfsek/terra/addons/image/operator/DistanceTransform.java +++ b/common/addons/library-image/src/main/java/com/dfsek/terra/addons/image/operator/DistanceTransform.java @@ -1,9 +1,10 @@ package com.dfsek.terra.addons.image.operator; +import com.dfsek.seismic.type.sampler.Sampler; + import com.dfsek.terra.addons.image.image.Image; import com.dfsek.terra.addons.image.util.ColorUtil; import com.dfsek.terra.addons.image.util.ColorUtil.Channel; -import com.dfsek.seismic.type.sampler.Sampler; import static com.dfsek.terra.addons.image.util.MathUtil.lerp; diff --git a/common/addons/library-image/src/main/java/com/dfsek/terra/addons/image/sampler/ChannelSampler.java b/common/addons/library-image/src/main/java/com/dfsek/terra/addons/image/sampler/ChannelSampler.java index 7c01e52eb..e0e020dc8 100644 --- a/common/addons/library-image/src/main/java/com/dfsek/terra/addons/image/sampler/ChannelSampler.java +++ b/common/addons/library-image/src/main/java/com/dfsek/terra/addons/image/sampler/ChannelSampler.java @@ -1,9 +1,10 @@ package com.dfsek.terra.addons.image.sampler; +import com.dfsek.seismic.type.sampler.Sampler; + import com.dfsek.terra.addons.image.colorsampler.ColorSampler; import com.dfsek.terra.addons.image.util.ColorUtil; import com.dfsek.terra.addons.image.util.ColorUtil.Channel; -import com.dfsek.seismic.type.sampler.Sampler; import static com.dfsek.terra.addons.image.util.MathUtil.lerp; diff --git a/common/addons/structure-block-shortcut/src/main/java/com/dfsek/terra/addons/palette/shortcut/block/SingletonStructure.java b/common/addons/structure-block-shortcut/src/main/java/com/dfsek/terra/addons/palette/shortcut/block/SingletonStructure.java index 3d728b97d..cd371ea55 100644 --- a/common/addons/structure-block-shortcut/src/main/java/com/dfsek/terra/addons/palette/shortcut/block/SingletonStructure.java +++ b/common/addons/structure-block-shortcut/src/main/java/com/dfsek/terra/addons/palette/shortcut/block/SingletonStructure.java @@ -1,12 +1,12 @@ package com.dfsek.terra.addons.palette.shortcut.block; +import com.dfsek.seismic.type.Rotation; +import com.dfsek.seismic.type.vector.Vector3Int; + import java.util.random.RandomGenerator; -import com.dfsek.seismic.type.Rotation; - import com.dfsek.terra.api.block.state.BlockState; import com.dfsek.terra.api.structure.Structure; -import com.dfsek.seismic.type.vector.Vector3Int; import com.dfsek.terra.api.world.WritableWorld; diff --git a/common/addons/structure-mutator/src/main/java/com/dfsek/terra/addons/structure/mutator/MutatedStructure.java b/common/addons/structure-mutator/src/main/java/com/dfsek/terra/addons/structure/mutator/MutatedStructure.java index 6c482249b..eb8657a2f 100644 --- a/common/addons/structure-mutator/src/main/java/com/dfsek/terra/addons/structure/mutator/MutatedStructure.java +++ b/common/addons/structure-mutator/src/main/java/com/dfsek/terra/addons/structure/mutator/MutatedStructure.java @@ -1,13 +1,13 @@ package com.dfsek.terra.addons.structure.mutator; -import java.util.random.RandomGenerator; - import com.dfsek.seismic.type.Rotation; +import com.dfsek.seismic.type.vector.Vector3Int; + +import java.util.random.RandomGenerator; import com.dfsek.terra.api.registry.key.Keyed; import com.dfsek.terra.api.registry.key.RegistryKey; import com.dfsek.terra.api.structure.Structure; -import com.dfsek.seismic.type.vector.Vector3Int; import com.dfsek.terra.api.world.WritableWorld; import com.dfsek.terra.api.world.util.ReadInterceptor; import com.dfsek.terra.api.world.util.WriteInterceptor; diff --git a/common/addons/structure-sponge-loader/build.gradle.kts b/common/addons/structure-sponge-loader/build.gradle.kts index 20c002866..31e74764b 100644 --- a/common/addons/structure-sponge-loader/build.gradle.kts +++ b/common/addons/structure-sponge-loader/build.gradle.kts @@ -1,5 +1,3 @@ -import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar - version = version("1.0.0") dependencies { diff --git a/common/addons/structure-sponge-loader/src/main/java/com/dfsek/terra/addons/sponge/SpongeSchematicAddon.java b/common/addons/structure-sponge-loader/src/main/java/com/dfsek/terra/addons/sponge/SpongeSchematicAddon.java index 2444f0d40..a5fe2d98b 100644 --- a/common/addons/structure-sponge-loader/src/main/java/com/dfsek/terra/addons/sponge/SpongeSchematicAddon.java +++ b/common/addons/structure-sponge-loader/src/main/java/com/dfsek/terra/addons/sponge/SpongeSchematicAddon.java @@ -7,6 +7,7 @@ package com.dfsek.terra.addons.sponge; +import com.dfsek.seismic.type.vector.Vector3Int; import net.querz.nbt.io.NBTDeserializer; import net.querz.nbt.tag.ByteArrayTag; import net.querz.nbt.tag.CompoundTag; @@ -31,7 +32,6 @@ import com.dfsek.terra.api.inject.annotations.Inject; import com.dfsek.terra.api.registry.CheckedRegistry; import com.dfsek.terra.api.structure.Structure; import com.dfsek.terra.api.util.FileUtil; -import com.dfsek.seismic.type.vector.Vector3Int; public class SpongeSchematicAddon implements AddonInitializer { 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 9dae8e27b..4a4b7b2b0 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,16 +7,16 @@ package com.dfsek.terra.addons.sponge; -import java.util.random.RandomGenerator; - import com.dfsek.seismic.type.Rotation; +import com.dfsek.seismic.type.vector.Vector2Int; +import com.dfsek.seismic.type.vector.Vector3Int; + +import java.util.random.RandomGenerator; import com.dfsek.terra.api.block.state.BlockState; import com.dfsek.terra.api.registry.key.Keyed; import com.dfsek.terra.api.registry.key.RegistryKey; import com.dfsek.terra.api.structure.Structure; -import com.dfsek.seismic.type.vector.Vector2Int; -import com.dfsek.seismic.type.vector.Vector3Int; import com.dfsek.terra.api.world.WritableWorld; diff --git a/common/addons/structure-terrascript-loader/build.gradle.kts b/common/addons/structure-terrascript-loader/build.gradle.kts index 24e3a20e9..265114f64 100644 --- a/common/addons/structure-terrascript-loader/build.gradle.kts +++ b/common/addons/structure-terrascript-loader/build.gradle.kts @@ -1,5 +1,3 @@ -import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar - version = version("1.2.0") dependencies { 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 3600fb4e2..faf55f4b8 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 @@ -10,6 +10,7 @@ package com.dfsek.terra.addons.terrascript.script; import com.dfsek.seismic.math.algebra.AlgebraFunctions; import com.dfsek.seismic.math.trigonometry.TrigonometryFunctions; import com.dfsek.seismic.type.Rotation; +import com.dfsek.seismic.type.vector.Vector3Int; import org.apache.commons.io.IOUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -46,7 +47,6 @@ import com.dfsek.terra.api.registry.key.Keyed; import com.dfsek.terra.api.registry.key.RegistryKey; import com.dfsek.terra.api.structure.LootTable; import com.dfsek.terra.api.structure.Structure; -import com.dfsek.seismic.type.vector.Vector3Int; import com.dfsek.terra.api.world.WritableWorld; diff --git a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/TerraImplementationArguments.java b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/TerraImplementationArguments.java index 74c4a6a5e..70181222f 100644 --- a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/TerraImplementationArguments.java +++ b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/TerraImplementationArguments.java @@ -7,15 +7,15 @@ package com.dfsek.terra.addons.terrascript.script; +import com.dfsek.seismic.type.Rotation; +import com.dfsek.seismic.type.vector.Vector3; +import com.dfsek.seismic.type.vector.Vector3Int; + import java.util.HashMap; import java.util.Map; import java.util.random.RandomGenerator; -import com.dfsek.seismic.type.Rotation; - import com.dfsek.terra.addons.terrascript.parser.lang.ImplementationArguments; -import com.dfsek.seismic.type.vector.Vector3; -import com.dfsek.seismic.type.vector.Vector3Int; import com.dfsek.terra.api.world.WritableWorld; diff --git a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/functions/BiomeFunction.java b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/functions/BiomeFunction.java index 14cb8b381..90171d4e3 100644 --- a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/functions/BiomeFunction.java +++ b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/functions/BiomeFunction.java @@ -8,6 +8,7 @@ package com.dfsek.terra.addons.terrascript.script.functions; import com.dfsek.seismic.type.vector.Vector2; +import com.dfsek.seismic.type.vector.Vector3; import com.dfsek.terra.addons.terrascript.parser.lang.ImplementationArguments; import com.dfsek.terra.addons.terrascript.parser.lang.Returnable; @@ -15,7 +16,6 @@ import com.dfsek.terra.addons.terrascript.parser.lang.Scope; import com.dfsek.terra.addons.terrascript.parser.lang.functions.Function; import com.dfsek.terra.addons.terrascript.script.TerraImplementationArguments; import com.dfsek.terra.addons.terrascript.tokenizer.Position; -import com.dfsek.seismic.type.vector.Vector3; import com.dfsek.terra.api.world.biome.generation.BiomeProvider; @@ -37,8 +37,7 @@ public class BiomeFunction implements Function { TerraImplementationArguments arguments = (TerraImplementationArguments) implementationArguments; Vector2 xz = Vector2.Mutable.of(x.apply(implementationArguments, scope).doubleValue(), - z.apply(implementationArguments, scope).doubleValue()).rotate(arguments.getRotation()); - + z.apply(implementationArguments, scope).doubleValue()).rotate(arguments.getRotation()); BiomeProvider grid = arguments.getWorld().getBiomeProvider(); diff --git a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/functions/BlockFunction.java b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/functions/BlockFunction.java index fb8ffa22e..e1e4db321 100644 --- a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/functions/BlockFunction.java +++ b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/functions/BlockFunction.java @@ -7,6 +7,8 @@ package com.dfsek.terra.addons.terrascript.script.functions; +import com.dfsek.seismic.type.vector.Vector2; +import com.dfsek.seismic.type.vector.Vector3; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -22,8 +24,6 @@ import com.dfsek.terra.addons.terrascript.script.TerraImplementationArguments; import com.dfsek.terra.addons.terrascript.tokenizer.Position; import com.dfsek.terra.api.Platform; import com.dfsek.terra.api.block.state.BlockState; -import com.dfsek.seismic.type.vector.Vector2; -import com.dfsek.seismic.type.vector.Vector3; public class BlockFunction implements Function { diff --git a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/functions/CheckBlockFunction.java b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/functions/CheckBlockFunction.java index fd3465c45..f1efea1f8 100644 --- a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/functions/CheckBlockFunction.java +++ b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/functions/CheckBlockFunction.java @@ -7,14 +7,15 @@ package com.dfsek.terra.addons.terrascript.script.functions; +import com.dfsek.seismic.type.vector.Vector2; +import com.dfsek.seismic.type.vector.Vector3; + import com.dfsek.terra.addons.terrascript.parser.lang.ImplementationArguments; import com.dfsek.terra.addons.terrascript.parser.lang.Returnable; import com.dfsek.terra.addons.terrascript.parser.lang.Scope; import com.dfsek.terra.addons.terrascript.parser.lang.functions.Function; import com.dfsek.terra.addons.terrascript.script.TerraImplementationArguments; import com.dfsek.terra.addons.terrascript.tokenizer.Position; -import com.dfsek.seismic.type.vector.Vector2; -import com.dfsek.seismic.type.vector.Vector3; public class CheckBlockFunction implements Function { @@ -34,7 +35,7 @@ public class CheckBlockFunction implements Function { TerraImplementationArguments arguments = (TerraImplementationArguments) implementationArguments; Vector2 xz = Vector2.Mutable.of(x.apply(implementationArguments, scope).doubleValue(), - z.apply(implementationArguments, scope).doubleValue()).rotate(arguments.getRotation()); + z.apply(implementationArguments, scope).doubleValue()).rotate(arguments.getRotation()); String data = arguments.getWorld() diff --git a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/functions/EntityFunction.java b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/functions/EntityFunction.java index d1b664019..1eee2ad48 100644 --- a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/functions/EntityFunction.java +++ b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/functions/EntityFunction.java @@ -7,6 +7,9 @@ package com.dfsek.terra.addons.terrascript.script.functions; +import com.dfsek.seismic.type.vector.Vector2; +import com.dfsek.seismic.type.vector.Vector3; + import com.dfsek.terra.addons.terrascript.parser.exceptions.ParseException; import com.dfsek.terra.addons.terrascript.parser.lang.ImplementationArguments; import com.dfsek.terra.addons.terrascript.parser.lang.Returnable; @@ -19,8 +22,6 @@ import com.dfsek.terra.api.Platform; import com.dfsek.terra.api.entity.Entity; import com.dfsek.terra.api.entity.EntityType; import com.dfsek.terra.api.event.events.world.generation.EntitySpawnEvent; -import com.dfsek.seismic.type.vector.Vector2; -import com.dfsek.seismic.type.vector.Vector3; public class EntityFunction implements Function { diff --git a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/functions/GetMarkFunction.java b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/functions/GetMarkFunction.java index b98dda159..5191f5dd9 100644 --- a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/functions/GetMarkFunction.java +++ b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/functions/GetMarkFunction.java @@ -7,14 +7,15 @@ package com.dfsek.terra.addons.terrascript.script.functions; +import com.dfsek.seismic.type.vector.Vector2; +import com.dfsek.seismic.type.vector.Vector3; + import com.dfsek.terra.addons.terrascript.parser.lang.ImplementationArguments; import com.dfsek.terra.addons.terrascript.parser.lang.Returnable; import com.dfsek.terra.addons.terrascript.parser.lang.Scope; import com.dfsek.terra.addons.terrascript.parser.lang.functions.Function; import com.dfsek.terra.addons.terrascript.script.TerraImplementationArguments; import com.dfsek.terra.addons.terrascript.tokenizer.Position; -import com.dfsek.seismic.type.vector.Vector2; -import com.dfsek.seismic.type.vector.Vector3; public class GetMarkFunction implements Function { 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 5fcc8e46b..bd479c4da 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 @@ -7,6 +7,8 @@ package com.dfsek.terra.addons.terrascript.script.functions; +import com.dfsek.seismic.type.vector.Vector2; +import com.dfsek.seismic.type.vector.Vector3; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -27,8 +29,6 @@ import com.dfsek.terra.api.event.events.world.generation.LootPopulateEvent; import com.dfsek.terra.api.registry.Registry; import com.dfsek.terra.api.registry.key.RegistryKey; import com.dfsek.terra.api.structure.LootTable; -import com.dfsek.seismic.type.vector.Vector2; -import com.dfsek.seismic.type.vector.Vector3; public class LootFunction implements Function { @@ -56,7 +56,7 @@ public class LootFunction implements Function { public Void apply(ImplementationArguments implementationArguments, Scope scope) { TerraImplementationArguments arguments = (TerraImplementationArguments) implementationArguments; Vector2 xz = Vector2.Mutable.of(x.apply(implementationArguments, scope).doubleValue(), - z.apply(implementationArguments, scope).doubleValue()).rotate(arguments.getRotation()); + z.apply(implementationArguments, scope).doubleValue()).rotate(arguments.getRotation()); String id = data.apply(implementationArguments, scope); diff --git a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/functions/PullFunction.java b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/functions/PullFunction.java index b6cbd2bde..c88b313b8 100644 --- a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/functions/PullFunction.java +++ b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/functions/PullFunction.java @@ -7,6 +7,9 @@ package com.dfsek.terra.addons.terrascript.script.functions; +import com.dfsek.seismic.type.vector.Vector2; +import com.dfsek.seismic.type.vector.Vector3; + import com.dfsek.terra.addons.terrascript.parser.exceptions.ParseException; import com.dfsek.terra.addons.terrascript.parser.lang.ImplementationArguments; import com.dfsek.terra.addons.terrascript.parser.lang.Returnable; @@ -17,8 +20,6 @@ import com.dfsek.terra.addons.terrascript.script.TerraImplementationArguments; import com.dfsek.terra.addons.terrascript.tokenizer.Position; import com.dfsek.terra.api.Platform; import com.dfsek.terra.api.block.state.BlockState; -import com.dfsek.seismic.type.vector.Vector2; -import com.dfsek.seismic.type.vector.Vector3; public class PullFunction implements Function { diff --git a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/functions/SetMarkFunction.java b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/functions/SetMarkFunction.java index 905ff23ae..3fdf98efb 100644 --- a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/functions/SetMarkFunction.java +++ b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/functions/SetMarkFunction.java @@ -7,14 +7,15 @@ package com.dfsek.terra.addons.terrascript.script.functions; +import com.dfsek.seismic.type.vector.Vector2; +import com.dfsek.seismic.type.vector.Vector3; + import com.dfsek.terra.addons.terrascript.parser.lang.ImplementationArguments; import com.dfsek.terra.addons.terrascript.parser.lang.Returnable; import com.dfsek.terra.addons.terrascript.parser.lang.Scope; import com.dfsek.terra.addons.terrascript.parser.lang.functions.Function; import com.dfsek.terra.addons.terrascript.script.TerraImplementationArguments; import com.dfsek.terra.addons.terrascript.tokenizer.Position; -import com.dfsek.seismic.type.vector.Vector2; -import com.dfsek.seismic.type.vector.Vector3; public class SetMarkFunction implements Function { diff --git a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/functions/StateFunction.java b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/functions/StateFunction.java index fbc9dfced..a93ecf0f0 100644 --- a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/functions/StateFunction.java +++ b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/functions/StateFunction.java @@ -7,6 +7,8 @@ package com.dfsek.terra.addons.terrascript.script.functions; +import com.dfsek.seismic.type.vector.Vector2; +import com.dfsek.seismic.type.vector.Vector3; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -17,8 +19,6 @@ import com.dfsek.terra.addons.terrascript.parser.lang.functions.Function; import com.dfsek.terra.addons.terrascript.script.TerraImplementationArguments; import com.dfsek.terra.addons.terrascript.tokenizer.Position; import com.dfsek.terra.api.block.entity.BlockEntity; -import com.dfsek.seismic.type.vector.Vector2; -import com.dfsek.seismic.type.vector.Vector3; public class StateFunction implements Function { 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 c62efde0a..4d0f0c01d 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,7 @@ package com.dfsek.terra.addons.terrascript.script.functions; import com.dfsek.seismic.type.Rotation; +import com.dfsek.seismic.type.vector.Vector2; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -23,7 +24,6 @@ import com.dfsek.terra.addons.terrascript.tokenizer.Position; import com.dfsek.terra.api.Platform; import com.dfsek.terra.api.registry.Registry; import com.dfsek.terra.api.structure.Structure; -import com.dfsek.seismic.type.vector.Vector2; public class StructureFunction implements Function { diff --git a/common/addons/structure-terrascript-loader/src/test/resources/test.tesf b/common/addons/structure-terrascript-loader/src/test/resources/test.tesf index 8bcce7177..50d5bef3a 100644 --- a/common/addons/structure-terrascript-loader/src/test/resources/test.tesf +++ b/common/addons/structure-terrascript-loader/src/test/resources/test.tesf @@ -1,84 +1,84 @@ -bool thing1 = 2 > (2+2) || false; +bool thing1 = 2 > (2 +2) || false; -if(2 > 2 || 3 + 4 <= 2 && 4 + 5 > 2 / 3) { +if (2 > 2 || 3 +4 <= 2 && 4 +5 > 2 / 3) { test("ok", 2); } -test("minecraft:green_w" + "ool", (2 * (3+1) * (2 * (1+1)))); +test("minecraft:green_w" +"ool", (2 * (3 +1) * (2 * (1 +1)))); // num testVar = 3.4; bool boolean = true; str stringVar = "hello!"; -num precedence = 3 + 2 * 2 + 3; -test("precedence: " + precedence, 2); -num precedence2 = 3 * 2 + 2 * 3; -test("precedence 2: " + precedence2, 2); +num precedence = 3 +2 * 2 +3; +test("precedence: " +precedence, 2); +num precedence2 = 3 * 2 +2 * 3; +test("precedence 2: " +precedence2, 2); bool iftest = false; bool truetest = false; num iterator = 0; -num thing = 4 - 2-2+2-2+2; -test("4 - 2 = " + thing, 2); +num thing = 4 -2 -2 +2 -2 +2; +test("4 - 2 = " +thing, 2); thing = -2; -test("-2 = " + thing, 2); +test("-2 = " +thing, 2); thing = -thing; -test("--2 = " + thing, 2); +test("--2 = " +thing, 2); -for(num i = 0; i < 5; i = i + 1) { - test("i = " + i, iterator); - if(i > 1 + 1) { +for (num i = 0; i < 5; i = i +1) { + test("i = " +i, iterator); + if (i > 1 +1) { test("more than 2", iterator); continue; } } -for(num i = 0; i < 5; i = i + 1) { - test("i = " + i, iterator); +for (num i = 0; i < 5; i = i +1) { + test("i = " +i, iterator); } -for(num j = 0; j < 5; j = j + 1) test("single statement j = " + j, iterator); +for (num j = 0; j < 5; j = j +1) test("single statement j = " +j, iterator); -if(4 + 2 == 2 + 4) { - test("new thing " + 2, iterator); +if (4 +2 == 2 +4) { + test("new thing " +2, iterator); } -while(iterator < 5) { - test("always, even after " + 2, iterator); - iterator = iterator + 1; - if(iterator > 2) { +while (iterator < 5) { + test("always, even after " +2, iterator); + iterator = iterator +1; + if (iterator > 2) { continue; } - test("not after " + 2, iterator); + test("not after " +2, iterator); } -if(true) test("single statement" + 2, iterator); -else if(true) test("another single statement" + 2, iterator); +if (true) test("single statement" +2, iterator); +else if (true) test("another single statement" +2, iterator); -if(true) { - test("true!" + 2, iterator); +if (true) { + test("true!" +2, iterator); } else { - test("false!" + 2, iterator); - } - -if(false) { - test("true!" + 2, iterator); -} else { - test("false!" + 2, iterator); + test("false!" +2, iterator); } -if(false) { - test("true again!" + 2, iterator); -} else if(true == true) { - test("false again!" + 2, iterator); +if (false) { + test("true!" +2, iterator); } else { - test("not logged!" + 2, iterator); + test("false!" +2, iterator); +} + +if (false) { + test("true again!" +2, iterator); +} else if (true == true) { + test("false again!" +2, iterator); +} else { + test("not logged!" +2, iterator); } @@ -87,11 +87,11 @@ if(false) { /* fsdfsd -*/ +* / test("fdsgdf" + 2, 1 + testVar); -if(true && !(boolean && false) && true) { - num scopedVar = 2; - test("if statement" + 2 + stringVar, 1 + testVar + scopedVar); +if (true && !(boolean && false) && true) { +num scopedVar = 2; +test("if statement" + 2 +stringVar, 1 + testVar + scopedVar); } \ No newline at end of file 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 0e9972fc0..119b073e6 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,6 +7,9 @@ package com.dfsek.terra.addon.terrascript.check; +import com.dfsek.seismic.type.vector.Vector2; +import com.dfsek.seismic.type.vector.Vector3; + import com.dfsek.terra.addons.chunkgenerator.generation.NoiseChunkGenerator3D; import com.dfsek.terra.addons.chunkgenerator.generation.math.samplers.SamplerProvider; import com.dfsek.terra.addons.terrascript.parser.lang.ImplementationArguments; @@ -15,8 +18,6 @@ import com.dfsek.terra.addons.terrascript.parser.lang.Scope; import com.dfsek.terra.addons.terrascript.parser.lang.functions.Function; import com.dfsek.terra.addons.terrascript.script.TerraImplementationArguments; import com.dfsek.terra.addons.terrascript.tokenizer.Position; -import com.dfsek.seismic.type.vector.Vector2; -import com.dfsek.seismic.type.vector.Vector3; import com.dfsek.terra.api.world.World; import com.dfsek.terra.api.world.WritableWorld; diff --git a/common/addons/terrascript-function-sampler/src/main/java/com/dfsek/terra/addons/terrascript/sampler/ConstantSamplerFunction.java b/common/addons/terrascript-function-sampler/src/main/java/com/dfsek/terra/addons/terrascript/sampler/ConstantSamplerFunction.java index 1cdbe0f07..a25cf6d0b 100644 --- a/common/addons/terrascript-function-sampler/src/main/java/com/dfsek/terra/addons/terrascript/sampler/ConstantSamplerFunction.java +++ b/common/addons/terrascript-function-sampler/src/main/java/com/dfsek/terra/addons/terrascript/sampler/ConstantSamplerFunction.java @@ -1,12 +1,13 @@ package com.dfsek.terra.addons.terrascript.sampler; +import com.dfsek.seismic.type.sampler.Sampler; + import com.dfsek.terra.addons.terrascript.parser.lang.ImplementationArguments; import com.dfsek.terra.addons.terrascript.parser.lang.Returnable; import com.dfsek.terra.addons.terrascript.parser.lang.Scope; import com.dfsek.terra.addons.terrascript.parser.lang.functions.Function; import com.dfsek.terra.addons.terrascript.script.TerraImplementationArguments; import com.dfsek.terra.addons.terrascript.tokenizer.Position; -import com.dfsek.seismic.type.sampler.Sampler; public class ConstantSamplerFunction implements Function { diff --git a/common/addons/terrascript-function-sampler/src/main/java/com/dfsek/terra/addons/terrascript/sampler/SamplerFunction.java b/common/addons/terrascript-function-sampler/src/main/java/com/dfsek/terra/addons/terrascript/sampler/SamplerFunction.java index c813fc13c..4f52962eb 100644 --- a/common/addons/terrascript-function-sampler/src/main/java/com/dfsek/terra/addons/terrascript/sampler/SamplerFunction.java +++ b/common/addons/terrascript-function-sampler/src/main/java/com/dfsek/terra/addons/terrascript/sampler/SamplerFunction.java @@ -1,5 +1,7 @@ package com.dfsek.terra.addons.terrascript.sampler; +import com.dfsek.seismic.type.sampler.Sampler; + import java.util.function.Supplier; import com.dfsek.terra.addons.terrascript.parser.lang.ImplementationArguments; @@ -8,7 +10,6 @@ import com.dfsek.terra.addons.terrascript.parser.lang.Scope; import com.dfsek.terra.addons.terrascript.parser.lang.functions.Function; import com.dfsek.terra.addons.terrascript.script.TerraImplementationArguments; import com.dfsek.terra.addons.terrascript.tokenizer.Position; -import com.dfsek.seismic.type.sampler.Sampler; public class SamplerFunction implements Function { diff --git a/common/api/src/main/java/com/dfsek/terra/api/config/ConfigPack.java b/common/api/src/main/java/com/dfsek/terra/api/config/ConfigPack.java index 1d616d4d9..a9fd6982b 100644 --- a/common/api/src/main/java/com/dfsek/terra/api/config/ConfigPack.java +++ b/common/api/src/main/java/com/dfsek/terra/api/config/ConfigPack.java @@ -9,13 +9,12 @@ package com.dfsek.terra.api.config; import ca.solostudios.strata.version.Version; import ca.solostudios.strata.version.VersionRange; +import com.dfsek.paralithic.eval.parser.Parser.ParseOptions; import java.nio.file.Path; import java.util.List; import java.util.Map; -import com.dfsek.paralithic.eval.parser.Parser.ParseOptions; - import com.dfsek.terra.api.addon.BaseAddon; import com.dfsek.terra.api.properties.PropertyHolder; import com.dfsek.terra.api.registry.key.Keyed; diff --git a/common/api/src/main/java/com/dfsek/terra/api/entity/Entity.java b/common/api/src/main/java/com/dfsek/terra/api/entity/Entity.java index b5e77f2b4..1489856d1 100644 --- a/common/api/src/main/java/com/dfsek/terra/api/entity/Entity.java +++ b/common/api/src/main/java/com/dfsek/terra/api/entity/Entity.java @@ -7,8 +7,9 @@ package com.dfsek.terra.api.entity; -import com.dfsek.terra.api.Handle; import com.dfsek.seismic.type.vector.Vector3; + +import com.dfsek.terra.api.Handle; import com.dfsek.terra.api.world.ServerWorld; diff --git a/common/api/src/main/java/com/dfsek/terra/api/event/events/world/generation/LootPopulateEvent.java b/common/api/src/main/java/com/dfsek/terra/api/event/events/world/generation/LootPopulateEvent.java index 5a5fb2b54..43f2cf582 100644 --- a/common/api/src/main/java/com/dfsek/terra/api/event/events/world/generation/LootPopulateEvent.java +++ b/common/api/src/main/java/com/dfsek/terra/api/event/events/world/generation/LootPopulateEvent.java @@ -7,6 +7,7 @@ package com.dfsek.terra.api.event.events.world.generation; +import com.dfsek.seismic.type.vector.Vector3; import org.jetbrains.annotations.NotNull; import com.dfsek.terra.api.block.entity.Container; @@ -15,7 +16,6 @@ import com.dfsek.terra.api.event.events.AbstractCancellable; import com.dfsek.terra.api.event.events.PackEvent; import com.dfsek.terra.api.structure.LootTable; import com.dfsek.terra.api.structure.Structure; -import com.dfsek.seismic.type.vector.Vector3; /** diff --git a/common/api/src/main/java/com/dfsek/terra/api/handle/ItemHandle.java b/common/api/src/main/java/com/dfsek/terra/api/handle/ItemHandle.java index 918195a40..e0993919b 100644 --- a/common/api/src/main/java/com/dfsek/terra/api/handle/ItemHandle.java +++ b/common/api/src/main/java/com/dfsek/terra/api/handle/ItemHandle.java @@ -7,11 +7,11 @@ package com.dfsek.terra.api.handle; -import java.util.Set; - import com.dfsek.terra.api.inventory.Item; import com.dfsek.terra.api.inventory.item.Enchantment; +import java.util.Set; + public interface ItemHandle { diff --git a/common/api/src/main/java/com/dfsek/terra/api/structure/LootTable.java b/common/api/src/main/java/com/dfsek/terra/api/structure/LootTable.java index 4d9325f05..f5090c051 100644 --- a/common/api/src/main/java/com/dfsek/terra/api/structure/LootTable.java +++ b/common/api/src/main/java/com/dfsek/terra/api/structure/LootTable.java @@ -7,14 +7,14 @@ package com.dfsek.terra.api.structure; +import com.dfsek.terra.api.inventory.Inventory; +import com.dfsek.terra.api.inventory.ItemStack; + import org.jetbrains.annotations.ApiStatus.Experimental; import java.util.List; import java.util.random.RandomGenerator; -import com.dfsek.terra.api.inventory.Inventory; -import com.dfsek.terra.api.inventory.ItemStack; - @Experimental public interface LootTable { diff --git a/common/api/src/main/java/com/dfsek/terra/api/structure/Structure.java b/common/api/src/main/java/com/dfsek/terra/api/structure/Structure.java index 59f1efba6..699db6c54 100644 --- a/common/api/src/main/java/com/dfsek/terra/api/structure/Structure.java +++ b/common/api/src/main/java/com/dfsek/terra/api/structure/Structure.java @@ -7,10 +7,11 @@ package com.dfsek.terra.api.structure; -import java.util.random.RandomGenerator; - import com.dfsek.seismic.type.Rotation; import com.dfsek.seismic.type.vector.Vector3Int; + +import java.util.random.RandomGenerator; + import com.dfsek.terra.api.world.WritableWorld; diff --git a/common/api/src/main/java/com/dfsek/terra/api/structure/StructureSpawn.java b/common/api/src/main/java/com/dfsek/terra/api/structure/StructureSpawn.java index 11d1ba001..939957d4e 100644 --- a/common/api/src/main/java/com/dfsek/terra/api/structure/StructureSpawn.java +++ b/common/api/src/main/java/com/dfsek/terra/api/structure/StructureSpawn.java @@ -7,9 +7,8 @@ package com.dfsek.terra.api.structure; -import org.jetbrains.annotations.ApiStatus.Experimental; - import com.dfsek.seismic.type.vector.Vector3; +import org.jetbrains.annotations.ApiStatus.Experimental; @Experimental diff --git a/common/api/src/main/java/com/dfsek/terra/api/structure/configured/ConfiguredStructure.java b/common/api/src/main/java/com/dfsek/terra/api/structure/configured/ConfiguredStructure.java index aa48f641d..ca5988484 100644 --- a/common/api/src/main/java/com/dfsek/terra/api/structure/configured/ConfiguredStructure.java +++ b/common/api/src/main/java/com/dfsek/terra/api/structure/configured/ConfiguredStructure.java @@ -12,8 +12,8 @@ import org.jetbrains.annotations.ApiStatus.Experimental; import com.dfsek.terra.api.registry.key.StringIdentifiable; import com.dfsek.terra.api.structure.Structure; import com.dfsek.terra.api.structure.StructureSpawn; -import com.dfsek.terra.api.util.range.Range; import com.dfsek.terra.api.util.collection.ProbabilityCollection; +import com.dfsek.terra.api.util.range.Range; @Experimental diff --git a/common/api/src/main/java/com/dfsek/terra/api/structure/feature/BinaryColumn.java b/common/api/src/main/java/com/dfsek/terra/api/structure/feature/BinaryColumn.java index 9e4afc43a..535dce508 100644 --- a/common/api/src/main/java/com/dfsek/terra/api/structure/feature/BinaryColumn.java +++ b/common/api/src/main/java/com/dfsek/terra/api/structure/feature/BinaryColumn.java @@ -10,9 +10,9 @@ package com.dfsek.terra.api.structure.feature; import java.util.function.BooleanSupplier; import java.util.function.IntConsumer; -import com.dfsek.terra.api.util.range.Range; import com.dfsek.terra.api.util.function.IntToBooleanFunction; import com.dfsek.terra.api.util.generic.Lazy; +import com.dfsek.terra.api.util.range.Range; /** diff --git a/common/api/src/main/java/com/dfsek/terra/api/util/cache/SeededVector2Key.java b/common/api/src/main/java/com/dfsek/terra/api/util/cache/SeededVector2Key.java index 2023867a6..3c674554b 100644 --- a/common/api/src/main/java/com/dfsek/terra/api/util/cache/SeededVector2Key.java +++ b/common/api/src/main/java/com/dfsek/terra/api/util/cache/SeededVector2Key.java @@ -1,37 +1,35 @@ package com.dfsek.terra.api.util.cache; - - public class SeededVector2Key { - public int x; - public int z; - public long seed; + public int x; + public int z; + public long seed; - public SeededVector2Key(int x, int z, long seed) { - this.x = x; - this.z = z; - this.seed = seed; - } - - public void set(int x, int z, long seed) { - this.x = x; - this.z = z; - this.seed = seed; - } - - @Override - public boolean equals(Object obj) { - if(obj instanceof SeededVector2Key that) { - return this.z == that.z && this.x == that.x && this.seed == that.seed; - } - return false; - } - - @Override - public int hashCode() { - int code = x; - code = 31 * code + z; - return 31 * code + (Long.hashCode(seed)); - } + public SeededVector2Key(int x, int z, long seed) { + this.x = x; + this.z = z; + this.seed = seed; } + + public void set(int x, int z, long seed) { + this.x = x; + this.z = z; + this.seed = seed; + } + + @Override + public boolean equals(Object obj) { + if(obj instanceof SeededVector2Key that) { + return this.z == that.z && this.x == that.x && this.seed == that.seed; + } + return false; + } + + @Override + public int hashCode() { + int code = x; + code = 31 * code + z; + return 31 * code + (Long.hashCode(seed)); + } +} diff --git a/common/api/src/main/java/com/dfsek/terra/api/util/cache/SeededVector3Key.java b/common/api/src/main/java/com/dfsek/terra/api/util/cache/SeededVector3Key.java index 90af87b32..8286413f0 100644 --- a/common/api/src/main/java/com/dfsek/terra/api/util/cache/SeededVector3Key.java +++ b/common/api/src/main/java/com/dfsek/terra/api/util/cache/SeededVector3Key.java @@ -1,7 +1,6 @@ package com.dfsek.terra.api.util.cache; - public class SeededVector3Key { public int x; public int y; diff --git a/common/api/src/main/java/com/dfsek/terra/api/util/collection/ProbabilityCollection.java b/common/api/src/main/java/com/dfsek/terra/api/util/collection/ProbabilityCollection.java index aea2ec113..4e71247b4 100644 --- a/common/api/src/main/java/com/dfsek/terra/api/util/collection/ProbabilityCollection.java +++ b/common/api/src/main/java/com/dfsek/terra/api/util/collection/ProbabilityCollection.java @@ -9,6 +9,8 @@ package com.dfsek.terra.api.util.collection; import com.dfsek.seismic.math.normalization.NormalizationFunctions; import com.dfsek.seismic.type.sampler.Sampler; +import com.dfsek.seismic.type.vector.Vector3; +import com.dfsek.seismic.type.vector.Vector3Int; import org.jetbrains.annotations.NotNull; import java.util.Collection; @@ -22,8 +24,6 @@ import java.util.function.Function; import java.util.random.RandomGenerator; import com.dfsek.terra.api.util.mutable.MutableInteger; -import com.dfsek.seismic.type.vector.Vector3; -import com.dfsek.seismic.type.vector.Vector3Int; public class ProbabilityCollection implements Collection { @@ -57,14 +57,16 @@ public class ProbabilityCollection implements Collection { @SuppressWarnings("unchecked") public E get(Sampler n, Vector3Int vector3Int, long seed) { if(array.length == 0) return null; - return (E) array[(int) NormalizationFunctions.normalizeIndex(n.getSample(seed, vector3Int.getX(), vector3Int.getY(), vector3Int.getZ()), + return (E) array[(int) NormalizationFunctions.normalizeIndex( + n.getSample(seed, vector3Int.getX(), vector3Int.getY(), vector3Int.getZ()), array.length)]; } @SuppressWarnings("unchecked") public E get(Sampler n, Vector3 vector3Int, long seed) { if(array.length == 0) return null; - return (E) array[(int) NormalizationFunctions.normalizeIndex(n.getSample(seed, vector3Int.getX(), vector3Int.getY(), vector3Int.getZ()), + return (E) array[(int) NormalizationFunctions.normalizeIndex( + n.getSample(seed, vector3Int.getX(), vector3Int.getY(), vector3Int.getZ()), array.length)]; } diff --git a/common/api/src/main/java/com/dfsek/terra/api/world/BufferedWorld.java b/common/api/src/main/java/com/dfsek/terra/api/world/BufferedWorld.java index 7f4647c95..7d98af75f 100644 --- a/common/api/src/main/java/com/dfsek/terra/api/world/BufferedWorld.java +++ b/common/api/src/main/java/com/dfsek/terra/api/world/BufferedWorld.java @@ -1,5 +1,7 @@ package com.dfsek.terra.api.world; +import com.dfsek.seismic.type.vector.Vector3Int; + import java.util.Objects; import com.dfsek.terra.api.block.entity.BlockEntity; @@ -7,7 +9,6 @@ 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.seismic.type.vector.Vector3Int; import com.dfsek.terra.api.world.biome.generation.BiomeProvider; import com.dfsek.terra.api.world.chunk.generation.ChunkGenerator; import com.dfsek.terra.api.world.util.Interceptors; diff --git a/common/api/src/main/java/com/dfsek/terra/api/world/ReadableWorld.java b/common/api/src/main/java/com/dfsek/terra/api/world/ReadableWorld.java index 8d5fe4437..b22f6bfa8 100644 --- a/common/api/src/main/java/com/dfsek/terra/api/world/ReadableWorld.java +++ b/common/api/src/main/java/com/dfsek/terra/api/world/ReadableWorld.java @@ -1,9 +1,10 @@ package com.dfsek.terra.api.world; +import com.dfsek.seismic.type.vector.Vector3; +import com.dfsek.seismic.type.vector.Vector3Int; + import com.dfsek.terra.api.block.entity.BlockEntity; import com.dfsek.terra.api.block.state.BlockState; -import com.dfsek.seismic.type.vector.Vector3; -import com.dfsek.seismic.type.vector.Vector3Int; /** diff --git a/common/api/src/main/java/com/dfsek/terra/api/world/ServerWorld.java b/common/api/src/main/java/com/dfsek/terra/api/world/ServerWorld.java index 54510d34a..4d0c100c4 100644 --- a/common/api/src/main/java/com/dfsek/terra/api/world/ServerWorld.java +++ b/common/api/src/main/java/com/dfsek/terra/api/world/ServerWorld.java @@ -8,6 +8,7 @@ package com.dfsek.terra.api.world; import com.dfsek.seismic.type.vector.Vector3; + import com.dfsek.terra.api.world.chunk.Chunk; diff --git a/common/api/src/main/java/com/dfsek/terra/api/world/WritableWorld.java b/common/api/src/main/java/com/dfsek/terra/api/world/WritableWorld.java index 31b991a7e..ce83d7ac0 100644 --- a/common/api/src/main/java/com/dfsek/terra/api/world/WritableWorld.java +++ b/common/api/src/main/java/com/dfsek/terra/api/world/WritableWorld.java @@ -1,10 +1,11 @@ package com.dfsek.terra.api.world; +import com.dfsek.seismic.type.vector.Vector3; +import com.dfsek.seismic.type.vector.Vector3Int; + import com.dfsek.terra.api.block.state.BlockState; import com.dfsek.terra.api.entity.Entity; import com.dfsek.terra.api.entity.EntityType; -import com.dfsek.seismic.type.vector.Vector3; -import com.dfsek.seismic.type.vector.Vector3Int; import com.dfsek.terra.api.world.chunk.generation.util.Column; diff --git a/common/api/src/main/java/com/dfsek/terra/api/world/biome/generation/BiomeProvider.java b/common/api/src/main/java/com/dfsek/terra/api/world/biome/generation/BiomeProvider.java index b911ff84e..eedaaa491 100644 --- a/common/api/src/main/java/com/dfsek/terra/api/world/biome/generation/BiomeProvider.java +++ b/common/api/src/main/java/com/dfsek/terra/api/world/biome/generation/BiomeProvider.java @@ -7,17 +7,16 @@ package com.dfsek.terra.api.world.biome.generation; -import com.dfsek.terra.api.Platform; - +import com.dfsek.seismic.type.vector.Vector3; +import com.dfsek.seismic.type.vector.Vector3Int; import org.jetbrains.annotations.Contract; import java.util.Optional; import java.util.stream.Stream; import java.util.stream.StreamSupport; +import com.dfsek.terra.api.Platform; import com.dfsek.terra.api.util.Column; -import com.dfsek.seismic.type.vector.Vector3; -import com.dfsek.seismic.type.vector.Vector3Int; import com.dfsek.terra.api.world.biome.Biome; import com.dfsek.terra.api.world.info.WorldProperties; diff --git a/common/api/src/main/java/com/dfsek/terra/api/world/biome/generation/CachingBiomeProvider.java b/common/api/src/main/java/com/dfsek/terra/api/world/biome/generation/CachingBiomeProvider.java index 3e42ff1d1..c11775fab 100644 --- a/common/api/src/main/java/com/dfsek/terra/api/world/biome/generation/CachingBiomeProvider.java +++ b/common/api/src/main/java/com/dfsek/terra/api/world/biome/generation/CachingBiomeProvider.java @@ -1,11 +1,5 @@ package com.dfsek.terra.api.world.biome.generation; -import com.dfsek.terra.api.util.cache.SeededVector2Key; -import com.dfsek.terra.api.util.cache.SeededVector3Key; -import com.dfsek.terra.api.util.generic.pair.Pair; - -import com.dfsek.terra.api.util.generic.pair.Pair.Mutable; - import com.github.benmanes.caffeine.cache.Caffeine; import com.github.benmanes.caffeine.cache.LoadingCache; import com.github.benmanes.caffeine.cache.Scheduler; @@ -13,6 +7,10 @@ import com.github.benmanes.caffeine.cache.Scheduler; import java.util.Optional; import com.dfsek.terra.api.Handle; +import com.dfsek.terra.api.util.cache.SeededVector2Key; +import com.dfsek.terra.api.util.cache.SeededVector3Key; +import com.dfsek.terra.api.util.generic.pair.Pair; +import com.dfsek.terra.api.util.generic.pair.Pair.Mutable; import com.dfsek.terra.api.world.biome.Biome; import static com.dfsek.terra.api.util.cache.CacheUtils.CACHE_EXECUTOR; @@ -56,7 +54,6 @@ public class CachingBiomeProvider implements BiomeProvider, Handle { }); - } private Optional sampleBiome(SeededVector2Key vec) { diff --git a/common/api/src/main/java/com/dfsek/terra/api/world/chunk/generation/ChunkGenerator.java b/common/api/src/main/java/com/dfsek/terra/api/world/chunk/generation/ChunkGenerator.java index 3609e9c7b..b86ffd5fe 100644 --- a/common/api/src/main/java/com/dfsek/terra/api/world/chunk/generation/ChunkGenerator.java +++ b/common/api/src/main/java/com/dfsek/terra/api/world/chunk/generation/ChunkGenerator.java @@ -7,11 +7,11 @@ package com.dfsek.terra.api.world.chunk.generation; +import com.dfsek.seismic.type.vector.Vector3; +import com.dfsek.seismic.type.vector.Vector3Int; import org.jetbrains.annotations.NotNull; import com.dfsek.terra.api.block.state.BlockState; -import com.dfsek.seismic.type.vector.Vector3; -import com.dfsek.seismic.type.vector.Vector3Int; import com.dfsek.terra.api.world.biome.generation.BiomeProvider; import com.dfsek.terra.api.world.chunk.generation.util.Palette; import com.dfsek.terra.api.world.info.WorldProperties; 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 704ea94a6..cf966c3f4 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 @@ -88,24 +88,57 @@ public abstract class AbstractPlatform implements Platform { private static final Logger logger = LoggerFactory.getLogger(AbstractPlatform.class); private static final MutableBoolean LOADED = new MutableBoolean(false); + private static final String moonrise = "Moonrise"; private final EventManager eventManager = new EventManagerImpl(); private final ConfigRegistry configRegistry = new ConfigRegistry(); private final MetaConfigRegistry metaConfigRegistry = new MetaConfigRegistry(); - private final CheckedRegistry checkedConfigRegistry = new CheckedRegistryImpl<>(configRegistry); - private final CheckedRegistry checkedMetaConfigRegistry = new CheckedRegistryImpl<>(metaConfigRegistry); - private final Profiler profiler = new ProfilerImpl(); - private final GenericLoaders loaders = new GenericLoaders(this); - private final PluginConfigImpl config = new PluginConfigImpl(); - private final CheckedRegistry addonRegistry = new CheckedRegistryImpl<>(new OpenRegistryImpl<>(TypeKey.of(BaseAddon.class))); - private final Registry lockedAddonRegistry = new LockedRegistryImpl<>(addonRegistry); + public static int getGenerationThreadsWithReflection(String className, String fieldName, String project) { + try { + Class aClass = Class.forName(className); + int threads = aClass.getField(fieldName).getInt(null); + logger.info("{} found, setting {} generation threads.", project, threads); + return threads; + } catch(ClassNotFoundException e) { + logger.info("{} not found.", project); + } catch(NoSuchFieldException e) { + logger.warn("{} found, but {} field not found this probably means {0} has changed its code and " + + "Terra has not updated to reflect that.", project, fieldName); + } catch(IllegalAccessException e) { + logger.error("Failed to access {} field in {}, assuming 1 generation thread.", fieldName, project, e); + } + return 0; + + } + + public static int getMoonriseGenerationThreadsWithReflection() { + try { + Class prioritisedThreadPoolClazz = Class.forName("ca.spottedleaf.concurrentutil.executor.thread.PrioritisedThreadPool"); + Method getCoreThreadsMethod = prioritisedThreadPoolClazz.getDeclaredMethod("getCoreThreads"); + getCoreThreadsMethod.setAccessible(true); + Class moonriseCommonClazz = Class.forName("ca.spottedleaf.moonrise.common.util.MoonriseCommon"); + Object pool = moonriseCommonClazz.getDeclaredField("WORKER_POOL").get(null); + int threads = ((Thread[]) getCoreThreadsMethod.invoke(pool)).length; + logger.info("{} found, setting {} generation threads.", moonrise, threads); + return threads; + } catch(ClassNotFoundException e) { + logger.info("{} not found.", moonrise); + } catch(NoSuchMethodException | NoSuchFieldException e) { + logger.warn("{} found, but field/method not found this probably means {0} has changed its code and " + + "Terra has not updated to reflect that.", moonrise); + } catch(IllegalAccessException | InvocationTargetException e) { + logger.error("Failed to access thread values in {}, assuming 1 generation thread.", moonrise, e); + } + return 0; + } + public ConfigRegistry getRawConfigRegistry() { return configRegistry; } @@ -356,46 +389,6 @@ public abstract class AbstractPlatform implements Platform { } } - public static int getGenerationThreadsWithReflection(String className, String fieldName, String project) { - try { - Class aClass = Class.forName(className); - int threads = aClass.getField(fieldName).getInt(null); - logger.info("{} found, setting {} generation threads.", project, threads); - return threads; - } catch(ClassNotFoundException e) { - logger.info("{} not found.", project); - } catch(NoSuchFieldException e) { - logger.warn("{} found, but {} field not found this probably means {0} has changed its code and " + - "Terra has not updated to reflect that.", project, fieldName); - } catch(IllegalAccessException e) { - logger.error("Failed to access {} field in {}, assuming 1 generation thread.", fieldName, project, e); - } - return 0; - - } - - private static final String moonrise = "Moonrise"; - public static int getMoonriseGenerationThreadsWithReflection() { - try { - Class prioritisedThreadPoolClazz = Class.forName("ca.spottedleaf.concurrentutil.executor.thread.PrioritisedThreadPool"); - Method getCoreThreadsMethod = prioritisedThreadPoolClazz.getDeclaredMethod("getCoreThreads"); - getCoreThreadsMethod.setAccessible(true); - Class moonriseCommonClazz = Class.forName("ca.spottedleaf.moonrise.common.util.MoonriseCommon"); - Object pool = moonriseCommonClazz.getDeclaredField("WORKER_POOL").get(null); - int threads = ((Thread[]) getCoreThreadsMethod.invoke(pool)).length; - logger.info("{} found, setting {} generation threads.", moonrise, threads); - return threads; - } catch (ClassNotFoundException e) { - logger.info("{} not found.", moonrise); - } catch (NoSuchMethodException | NoSuchFieldException e) { - logger.warn("{} found, but field/method not found this probably means {0} has changed its code and " + - "Terra has not updated to reflect that.", moonrise); - } catch (IllegalAccessException | InvocationTargetException e) { - logger.error("Failed to access thread values in {}, assuming 1 generation thread.", moonrise, e); - } - return 0; - } - @Override public void register(TypeRegistry registry) { loaders.register(registry); diff --git a/common/implementation/base/src/main/java/com/dfsek/terra/config/GenericLoaders.java b/common/implementation/base/src/main/java/com/dfsek/terra/config/GenericLoaders.java index 16177be56..bdb243e71 100644 --- a/common/implementation/base/src/main/java/com/dfsek/terra/config/GenericLoaders.java +++ b/common/implementation/base/src/main/java/com/dfsek/terra/config/GenericLoaders.java @@ -29,9 +29,9 @@ import com.dfsek.terra.api.addon.BaseAddon; import com.dfsek.terra.api.block.BlockType; import com.dfsek.terra.api.block.state.BlockState; import com.dfsek.terra.api.tectonic.LoaderRegistrar; -import com.dfsek.terra.api.util.range.Range; import com.dfsek.terra.api.util.collection.MaterialSet; import com.dfsek.terra.api.util.collection.ProbabilityCollection; +import com.dfsek.terra.api.util.range.Range; import com.dfsek.terra.config.loaders.ExpressionParserOptionsTemplate; import com.dfsek.terra.config.loaders.LinkedHashMapLoader; import com.dfsek.terra.config.loaders.MaterialSetLoader; diff --git a/common/implementation/base/src/main/java/com/dfsek/terra/config/loaders/ExpressionParserOptionsTemplate.java b/common/implementation/base/src/main/java/com/dfsek/terra/config/loaders/ExpressionParserOptionsTemplate.java index caa74e402..0f81383e3 100644 --- a/common/implementation/base/src/main/java/com/dfsek/terra/config/loaders/ExpressionParserOptionsTemplate.java +++ b/common/implementation/base/src/main/java/com/dfsek/terra/config/loaders/ExpressionParserOptionsTemplate.java @@ -13,7 +13,7 @@ public class ExpressionParserOptionsTemplate implements ObjectTemplate map = (Map) o; - if (map.size() == 1) { + if(map.size() == 1) { Object onlyKey = map.keySet().iterator().next(); return new ProbabilityCollection.Singleton<>(configLoader.loadType(generic, onlyKey, depthTracker)); } diff --git a/common/implementation/base/src/test/java/profiler/ProfilerTest.java b/common/implementation/base/src/test/java/profiler/ProfilerTest.java index 6c3ae486e..36989790a 100644 --- a/common/implementation/base/src/test/java/profiler/ProfilerTest.java +++ b/common/implementation/base/src/test/java/profiler/ProfilerTest.java @@ -17,11 +17,11 @@ package profiler; -import org.junit.jupiter.api.Test; - import com.dfsek.terra.api.profiler.Profiler; import com.dfsek.terra.profiler.ProfilerImpl; +import org.junit.jupiter.api.Test; + public class ProfilerTest { private static final Profiler PROFILER = new ProfilerImpl(); diff --git a/common/implementation/base/src/test/java/registry/RegistryTest.java b/common/implementation/base/src/test/java/registry/RegistryTest.java index 01612bd7e..4ea1326fe 100644 --- a/common/implementation/base/src/test/java/registry/RegistryTest.java +++ b/common/implementation/base/src/test/java/registry/RegistryTest.java @@ -17,6 +17,8 @@ package registry; +import org.junit.jupiter.api.Test; + import com.dfsek.terra.api.registry.CheckedRegistry; import com.dfsek.terra.api.registry.OpenRegistry; import com.dfsek.terra.api.registry.exception.DuplicateEntryException; @@ -25,10 +27,7 @@ import com.dfsek.terra.api.util.reflection.TypeKey; import com.dfsek.terra.registry.CheckedRegistryImpl; import com.dfsek.terra.registry.OpenRegistryImpl; -import org.junit.jupiter.api.Test; - -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.fail; +import static org.junit.jupiter.api.Assertions.*; public class RegistryTest { diff --git a/platforms/allay/src/main/java/com/dfsek/terra/allay/AllayPlatform.java b/platforms/allay/src/main/java/com/dfsek/terra/allay/AllayPlatform.java index a09b6a9e2..280331581 100644 --- a/platforms/allay/src/main/java/com/dfsek/terra/allay/AllayPlatform.java +++ b/platforms/allay/src/main/java/com/dfsek/terra/allay/AllayPlatform.java @@ -21,6 +21,7 @@ import com.dfsek.terra.api.handle.ItemHandle; import com.dfsek.terra.api.handle.WorldHandle; import com.dfsek.terra.api.world.biome.PlatformBiome; + /** * @author daoge_cmd */ diff --git a/platforms/allay/src/main/java/com/dfsek/terra/allay/JeBlockState.java b/platforms/allay/src/main/java/com/dfsek/terra/allay/JeBlockState.java index 60583f22c..29abefe47 100644 --- a/platforms/allay/src/main/java/com/dfsek/terra/allay/JeBlockState.java +++ b/platforms/allay/src/main/java/com/dfsek/terra/allay/JeBlockState.java @@ -14,20 +14,12 @@ public class JeBlockState { protected final TreeMap properties; protected int hash = Integer.MAX_VALUE; - public static JeBlockState fromString(String data) { - return new JeBlockState(data); - } - - public static JeBlockState create(String identifier, TreeMap properties) { - return new JeBlockState(identifier, properties); - } - private JeBlockState(String data) { String[] strings = data.replace("[", ",").replace("]", ",").replace(" ", "").split(","); this.identifier = strings[0]; this.properties = new TreeMap<>(); - if (strings.length > 1) { - for (int i = 1; i < strings.length; i++) { + if(strings.length > 1) { + for(int i = 1; i < strings.length; i++) { final String tmp = strings[i]; final int index = tmp.indexOf("="); properties.put(tmp.substring(0, index), tmp.substring(index + 1)); @@ -36,6 +28,19 @@ public class JeBlockState { completeMissingProperties(); } + private JeBlockState(String identifier, TreeMap properties) { + this.identifier = identifier; + this.properties = properties; + } + + public static JeBlockState fromString(String data) { + return new JeBlockState(data); + } + + public static JeBlockState create(String identifier, TreeMap properties) { + return new JeBlockState(identifier, properties); + } + public String getPropertyValue(String key) { return properties.get(key); } @@ -49,24 +54,19 @@ public class JeBlockState { entry -> properties.put(entry.getKey(), entry.getValue())); } - private JeBlockState(String identifier, TreeMap properties) { - this.identifier = identifier; - this.properties = properties; - } - public String toString(boolean includeProperties) { if(!includeProperties) return identifier; StringBuilder builder = new StringBuilder(identifier).append(";"); properties.forEach((k, v) -> builder.append(k).append("=").append(v).append(";")); String str = builder.toString(); - if (hash == Integer.MAX_VALUE) { + if(hash == Integer.MAX_VALUE) { hash = HashUtils.fnv1a_32(str.getBytes()); } return str; } public int getHash() { - if (hash == Integer.MAX_VALUE) { + if(hash == Integer.MAX_VALUE) { hash = HashUtils.fnv1a_32(toString(true).getBytes()); } return hash; diff --git a/platforms/allay/src/main/java/com/dfsek/terra/allay/Mapping.java b/platforms/allay/src/main/java/com/dfsek/terra/allay/Mapping.java index 222f6f53f..bb2132590 100644 --- a/platforms/allay/src/main/java/com/dfsek/terra/allay/Mapping.java +++ b/platforms/allay/src/main/java/com/dfsek/terra/allay/Mapping.java @@ -104,7 +104,8 @@ public final class Mapping { return false; } - Map mappings = from(stream, new TypeToken<>() {}); + Map mappings = from(stream, new TypeToken<>() { + }); mappings.forEach((javaId, mapping) -> JE_BIOME_ID_TO_BE.put(javaId, mapping.bedrockId())); } catch(IOException e) { TerraAllayPlugin.INSTANCE.getPluginLogger().error("Failed to load biomes mapping", e); @@ -120,7 +121,8 @@ public final class Mapping { return false; } - Map mappings = from(stream, new TypeToken<>() {}); + Map mappings = from(stream, new TypeToken<>() { + }); mappings.forEach((javaId, mapping) -> { ItemType itemType = ItemTypeSafeGetter .name(mapping.bedrockId()) @@ -142,7 +144,8 @@ public final class Mapping { return false; } - Map> root = from(stream, new TypeToken<>() {}); + Map> root = from(stream, new TypeToken<>() { + }); List mappings = root.get("mappings"); mappings.forEach(mapping -> { JeBlockState jeState = createJeBlockState(mapping.javaState()); @@ -164,7 +167,8 @@ public final class Mapping { return false; } - Map> states = from(stream, new TypeToken<>() {}); + Map> states = from(stream, new TypeToken<>() { + }); JE_BLOCK_DEFAULT_PROPERTIES.putAll(states); } catch(IOException e) { throw new RuntimeException(e); diff --git a/platforms/allay/src/main/java/com/dfsek/terra/allay/TerraAllayPlugin.java b/platforms/allay/src/main/java/com/dfsek/terra/allay/TerraAllayPlugin.java index d6f5f1d14..d2e5a16a6 100644 --- a/platforms/allay/src/main/java/com/dfsek/terra/allay/TerraAllayPlugin.java +++ b/platforms/allay/src/main/java/com/dfsek/terra/allay/TerraAllayPlugin.java @@ -70,6 +70,7 @@ public class TerraAllayPlugin extends Plugin { @EventHandler private void onWorldUnload(WorldUnloadEvent event) { - AllayPlatform.GENERATOR_WRAPPERS.removeIf(wrapper -> wrapper.getAllayWorldGenerator().getDimension().getWorld() == event.getWorld()); + AllayPlatform.GENERATOR_WRAPPERS.removeIf( + wrapper -> wrapper.getAllayWorldGenerator().getDimension().getWorld() == event.getWorld()); } } diff --git a/platforms/allay/src/main/java/com/dfsek/terra/allay/delegate/AllayBiome.java b/platforms/allay/src/main/java/com/dfsek/terra/allay/delegate/AllayBiome.java index d9607fcb7..84be41ce5 100644 --- a/platforms/allay/src/main/java/com/dfsek/terra/allay/delegate/AllayBiome.java +++ b/platforms/allay/src/main/java/com/dfsek/terra/allay/delegate/AllayBiome.java @@ -4,6 +4,7 @@ import org.allaymc.api.world.biome.BiomeType; import com.dfsek.terra.api.world.biome.PlatformBiome; + /** * @author daoge_cmd */ diff --git a/platforms/allay/src/main/java/com/dfsek/terra/allay/delegate/AllayBlockState.java b/platforms/allay/src/main/java/com/dfsek/terra/allay/delegate/AllayBlockState.java index be8988400..29f0c3825 100644 --- a/platforms/allay/src/main/java/com/dfsek/terra/allay/delegate/AllayBlockState.java +++ b/platforms/allay/src/main/java/com/dfsek/terra/allay/delegate/AllayBlockState.java @@ -7,6 +7,7 @@ import com.dfsek.terra.allay.JeBlockState; import com.dfsek.terra.api.block.BlockType; import com.dfsek.terra.api.block.state.properties.Property; + /** * @author daoge_cmd */ @@ -68,7 +69,7 @@ public final class AllayBlockState implements com.dfsek.terra.api.block.state.Bl public BlockState allayBlockState() { return allayBlockState; } - public boolean containsWater() { return containsWater; } + public boolean containsWater() { return containsWater; } public JeBlockState jeBlockState() { return jeBlockState; } } diff --git a/platforms/allay/src/main/java/com/dfsek/terra/allay/delegate/AllayBlockType.java b/platforms/allay/src/main/java/com/dfsek/terra/allay/delegate/AllayBlockType.java index 901f04ee3..dc6811735 100644 --- a/platforms/allay/src/main/java/com/dfsek/terra/allay/delegate/AllayBlockType.java +++ b/platforms/allay/src/main/java/com/dfsek/terra/allay/delegate/AllayBlockType.java @@ -6,6 +6,7 @@ import org.allaymc.api.block.type.BlockType; import com.dfsek.terra.allay.Mapping; import com.dfsek.terra.api.block.state.BlockState; + /** * @author daoge_cmd */ diff --git a/platforms/allay/src/main/java/com/dfsek/terra/allay/delegate/AllayChunk.java b/platforms/allay/src/main/java/com/dfsek/terra/allay/delegate/AllayChunk.java index c67ed2d88..e7ebec7fb 100644 --- a/platforms/allay/src/main/java/com/dfsek/terra/allay/delegate/AllayChunk.java +++ b/platforms/allay/src/main/java/com/dfsek/terra/allay/delegate/AllayChunk.java @@ -10,18 +10,20 @@ import com.dfsek.terra.allay.Mapping; import com.dfsek.terra.api.block.state.BlockState; import com.dfsek.terra.api.world.ServerWorld; + /** * @author daoge_cmd */ public record AllayChunk(ServerWorld world, Chunk allayChunk) implements com.dfsek.terra.api.world.chunk.Chunk { - private static final org.allaymc.api.block.type.BlockState WATER = BlockTypes.WATER.ofState(BlockPropertyTypes.LIQUID_DEPTH.createValue(0)); + private static final org.allaymc.api.block.type.BlockState WATER = BlockTypes.WATER.ofState( + BlockPropertyTypes.LIQUID_DEPTH.createValue(0)); @Override public void setBlock(int x, int y, int z, BlockState data, boolean physics) { AllayBlockState allayBlockState = (AllayBlockState) data; allayChunk.setBlockState(x, y, z, allayBlockState.allayBlockState()); - if (allayBlockState.containsWater() || allayChunk.getBlockState(x, y, z).getBlockType().hasBlockTag(BlockTags.WATER)) { + if(allayBlockState.containsWater() || allayChunk.getBlockState(x, y, z).getBlockType().hasBlockTag(BlockTags.WATER)) { allayChunk.setBlockState(x, y, z, WATER, 1); } } diff --git a/platforms/allay/src/main/java/com/dfsek/terra/allay/delegate/AllayEnchantment.java b/platforms/allay/src/main/java/com/dfsek/terra/allay/delegate/AllayEnchantment.java index b41fa7b75..0bae9a9a1 100644 --- a/platforms/allay/src/main/java/com/dfsek/terra/allay/delegate/AllayEnchantment.java +++ b/platforms/allay/src/main/java/com/dfsek/terra/allay/delegate/AllayEnchantment.java @@ -6,18 +6,19 @@ import com.dfsek.terra.allay.Mapping; import com.dfsek.terra.api.inventory.ItemStack; import com.dfsek.terra.api.inventory.item.Enchantment; + /** * @author daoge_cmd */ public record AllayEnchantment(EnchantmentType allayEnchantment) implements Enchantment { @Override public boolean canEnchantItem(ItemStack itemStack) { - return ((AllayItemStack)itemStack).allayItemStack().checkEnchantmentCompatibility(allayEnchantment); + return ((AllayItemStack) itemStack).allayItemStack().checkEnchantmentCompatibility(allayEnchantment); } @Override public boolean conflictsWith(Enchantment other) { - return ((AllayEnchantment)other).allayEnchantment.isIncompatibleWith(allayEnchantment); + return ((AllayEnchantment) other).allayEnchantment.isIncompatibleWith(allayEnchantment); } @Override diff --git a/platforms/allay/src/main/java/com/dfsek/terra/allay/delegate/AllayFakeEntity.java b/platforms/allay/src/main/java/com/dfsek/terra/allay/delegate/AllayFakeEntity.java index fc792270c..7ac5cc113 100644 --- a/platforms/allay/src/main/java/com/dfsek/terra/allay/delegate/AllayFakeEntity.java +++ b/platforms/allay/src/main/java/com/dfsek/terra/allay/delegate/AllayFakeEntity.java @@ -1,9 +1,11 @@ package com.dfsek.terra.allay.delegate; -import com.dfsek.terra.api.entity.Entity; import com.dfsek.seismic.type.vector.Vector3; + +import com.dfsek.terra.api.entity.Entity; import com.dfsek.terra.api.world.ServerWorld; + /** * NOTICE: Entity is not supported currently, and this is a fake implementation. * diff --git a/platforms/allay/src/main/java/com/dfsek/terra/allay/delegate/AllayItemMeta.java b/platforms/allay/src/main/java/com/dfsek/terra/allay/delegate/AllayItemMeta.java index 857f0af6d..38a2257c7 100644 --- a/platforms/allay/src/main/java/com/dfsek/terra/allay/delegate/AllayItemMeta.java +++ b/platforms/allay/src/main/java/com/dfsek/terra/allay/delegate/AllayItemMeta.java @@ -10,6 +10,7 @@ import java.util.Map; import com.dfsek.terra.api.inventory.item.Enchantment; import com.dfsek.terra.api.inventory.item.ItemMeta; + /** * @author daoge_cmd */ @@ -23,7 +24,7 @@ public record AllayItemMeta(ItemStack allayItemStack) implements ItemMeta { @Override public Map getEnchantments() { Map results = new HashMap<>(); - for (EnchantmentInstance allayEnchantmentInstance : allayItemStack.getEnchantments()) { + for(EnchantmentInstance allayEnchantmentInstance : allayItemStack.getEnchantments()) { results.put(new AllayEnchantment(allayEnchantmentInstance.getType()), allayEnchantmentInstance.getLevel()); } return results; diff --git a/platforms/allay/src/main/java/com/dfsek/terra/allay/delegate/AllayItemStack.java b/platforms/allay/src/main/java/com/dfsek/terra/allay/delegate/AllayItemStack.java index bf7e59479..18df86224 100644 --- a/platforms/allay/src/main/java/com/dfsek/terra/allay/delegate/AllayItemStack.java +++ b/platforms/allay/src/main/java/com/dfsek/terra/allay/delegate/AllayItemStack.java @@ -6,10 +6,11 @@ import org.allaymc.api.item.enchantment.EnchantmentInstance; import com.dfsek.terra.api.inventory.Item; import com.dfsek.terra.api.inventory.item.ItemMeta; + /** * @author daoge_cmd */ -public record AllayItemStack(ItemStack allayItemStack) implements com.dfsek.terra.api.inventory.ItemStack{ +public record AllayItemStack(ItemStack allayItemStack) implements com.dfsek.terra.api.inventory.ItemStack { @Override public int getAmount() { return allayItemStack.getCount(); @@ -34,7 +35,7 @@ public record AllayItemStack(ItemStack allayItemStack) implements com.dfsek.terr public void setItemMeta(ItemMeta meta) { ItemStack targetItem = ((AllayItemMeta) meta).allayItemStack(); allayItemStack.removeAllEnchantments(); - for (EnchantmentInstance enchantment : targetItem.getEnchantments()) { + for(EnchantmentInstance enchantment : targetItem.getEnchantments()) { allayItemStack.addEnchantment(enchantment.getType(), enchantment.getLevel()); } allayItemStack.setLore(targetItem.getLore()); diff --git a/platforms/allay/src/main/java/com/dfsek/terra/allay/delegate/AllayProtoChunk.java b/platforms/allay/src/main/java/com/dfsek/terra/allay/delegate/AllayProtoChunk.java index 5b67727fb..9b587febc 100644 --- a/platforms/allay/src/main/java/com/dfsek/terra/allay/delegate/AllayProtoChunk.java +++ b/platforms/allay/src/main/java/com/dfsek/terra/allay/delegate/AllayProtoChunk.java @@ -10,12 +10,14 @@ import com.dfsek.terra.allay.Mapping; import com.dfsek.terra.api.block.state.BlockState; import com.dfsek.terra.api.world.chunk.generation.ProtoChunk; + /** * @author daoge_cmd */ public record AllayProtoChunk(UnsafeChunk allayChunk) implements ProtoChunk { - private static final org.allaymc.api.block.type.BlockState WATER = BlockTypes.WATER.ofState(BlockPropertyTypes.LIQUID_DEPTH.createValue(0)); + private static final org.allaymc.api.block.type.BlockState WATER = BlockTypes.WATER.ofState( + BlockPropertyTypes.LIQUID_DEPTH.createValue(0)); @Override public int getMaxHeight() { diff --git a/platforms/allay/src/main/java/com/dfsek/terra/allay/delegate/AllayProtoWorld.java b/platforms/allay/src/main/java/com/dfsek/terra/allay/delegate/AllayProtoWorld.java index 82ecb2839..2b6dd59aa 100644 --- a/platforms/allay/src/main/java/com/dfsek/terra/allay/delegate/AllayProtoWorld.java +++ b/platforms/allay/src/main/java/com/dfsek/terra/allay/delegate/AllayProtoWorld.java @@ -1,5 +1,6 @@ package com.dfsek.terra.allay.delegate; +import com.dfsek.seismic.type.vector.Vector3; import org.allaymc.api.block.property.type.BlockPropertyTypes; import org.allaymc.api.block.tag.BlockTags; import org.allaymc.api.block.type.BlockTypes; @@ -11,18 +12,19 @@ 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.seismic.type.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; + /** * @author daoge_cmd */ public record AllayProtoWorld(AllayServerWorld allayServerWorld, OtherChunkAccessibleContext context) implements ProtoWorld { - private static final org.allaymc.api.block.type.BlockState WATER = BlockTypes.WATER.ofState(BlockPropertyTypes.LIQUID_DEPTH.createValue(0)); + private static final org.allaymc.api.block.type.BlockState WATER = BlockTypes.WATER.ofState( + BlockPropertyTypes.LIQUID_DEPTH.createValue(0)); @Override public int centerChunkX() { diff --git a/platforms/allay/src/main/java/com/dfsek/terra/allay/delegate/AllayServerWorld.java b/platforms/allay/src/main/java/com/dfsek/terra/allay/delegate/AllayServerWorld.java index 3a24422b0..5225c3e5e 100644 --- a/platforms/allay/src/main/java/com/dfsek/terra/allay/delegate/AllayServerWorld.java +++ b/platforms/allay/src/main/java/com/dfsek/terra/allay/delegate/AllayServerWorld.java @@ -1,5 +1,6 @@ package com.dfsek.terra.allay.delegate; +import com.dfsek.seismic.type.vector.Vector3; import org.allaymc.api.world.Dimension; import com.dfsek.terra.allay.Mapping; @@ -9,12 +10,12 @@ 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.seismic.type.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.Chunk; import com.dfsek.terra.api.world.chunk.generation.ChunkGenerator; + /** * @author daoge_cmd */ diff --git a/platforms/allay/src/main/java/com/dfsek/terra/allay/generator/AllayGeneratorWrapper.java b/platforms/allay/src/main/java/com/dfsek/terra/allay/generator/AllayGeneratorWrapper.java index 20422b831..b1382b1cb 100644 --- a/platforms/allay/src/main/java/com/dfsek/terra/allay/generator/AllayGeneratorWrapper.java +++ b/platforms/allay/src/main/java/com/dfsek/terra/allay/generator/AllayGeneratorWrapper.java @@ -24,6 +24,7 @@ import com.dfsek.terra.api.world.chunk.generation.stage.GenerationStage; import com.dfsek.terra.api.world.chunk.generation.util.GeneratorWrapper; import com.dfsek.terra.api.world.info.WorldProperties; + /** * @author daoge_cmd */ @@ -86,6 +87,18 @@ public class AllayGeneratorWrapper implements GeneratorWrapper { .build(); } + protected static ConfigPack getConfigPack(String packName) { + Optional byId = TerraAllayPlugin.PLATFORM.getConfigRegistry().getByID(packName); + return byId.orElseGet( + () -> TerraAllayPlugin.PLATFORM.getConfigRegistry().getByID(packName.toUpperCase(Locale.ENGLISH)) + .orElseThrow(() -> new IllegalArgumentException("Cant find terra config pack named " + packName)) + ); + } + + protected static ChunkGenerator createGenerator(ConfigPack configPack) { + return configPack.getGeneratorProvider().newInstance(configPack); + } + @Override public ChunkGenerator getHandle() { return chunkGenerator; @@ -112,6 +125,7 @@ public class AllayGeneratorWrapper implements GeneratorWrapper { return this.allayWorldGenerator; } + protected class AllayNoiser implements Noiser { @Override @@ -145,6 +159,7 @@ public class AllayGeneratorWrapper implements GeneratorWrapper { } } + protected class AllayPopulator implements Populator { @Override @@ -165,16 +180,4 @@ public class AllayGeneratorWrapper implements GeneratorWrapper { return "TERRA_POPULATOR"; } } - - protected static ConfigPack getConfigPack(String packName) { - Optional byId = TerraAllayPlugin.PLATFORM.getConfigRegistry().getByID(packName); - return byId.orElseGet( - () -> TerraAllayPlugin.PLATFORM.getConfigRegistry().getByID(packName.toUpperCase(Locale.ENGLISH)) - .orElseThrow(() -> new IllegalArgumentException("Cant find terra config pack named " + packName)) - ); - } - - protected static ChunkGenerator createGenerator(ConfigPack configPack) { - return configPack.getGeneratorProvider().newInstance(configPack); - } } diff --git a/platforms/allay/src/main/java/com/dfsek/terra/allay/handle/AllayItemHandle.java b/platforms/allay/src/main/java/com/dfsek/terra/allay/handle/AllayItemHandle.java index f85f001bb..21a4baa54 100644 --- a/platforms/allay/src/main/java/com/dfsek/terra/allay/handle/AllayItemHandle.java +++ b/platforms/allay/src/main/java/com/dfsek/terra/allay/handle/AllayItemHandle.java @@ -13,6 +13,7 @@ import com.dfsek.terra.api.handle.ItemHandle; import com.dfsek.terra.api.inventory.Item; import com.dfsek.terra.api.inventory.item.Enchantment; + /** * @author daoge_cmd */ diff --git a/platforms/allay/src/main/java/com/dfsek/terra/allay/handle/AllayWorldHandle.java b/platforms/allay/src/main/java/com/dfsek/terra/allay/handle/AllayWorldHandle.java index 37e84425f..fd4d643bc 100644 --- a/platforms/allay/src/main/java/com/dfsek/terra/allay/handle/AllayWorldHandle.java +++ b/platforms/allay/src/main/java/com/dfsek/terra/allay/handle/AllayWorldHandle.java @@ -9,6 +9,7 @@ import com.dfsek.terra.api.block.state.BlockState; import com.dfsek.terra.api.entity.EntityType; import com.dfsek.terra.api.handle.WorldHandle; + /** * @author daoge_cmd */ @@ -29,6 +30,7 @@ public class AllayWorldHandle implements WorldHandle { public @NotNull EntityType getEntity(@NotNull String id) { return new EntityType() { private final Object fakeEntityType = new Object(); + @Override public Object getHandle() { return fakeEntityType; diff --git a/platforms/bukkit/common/src/main/java/com/dfsek/terra/bukkit/BukkitEntity.java b/platforms/bukkit/common/src/main/java/com/dfsek/terra/bukkit/BukkitEntity.java index 5306bc3e3..7303e09fc 100644 --- a/platforms/bukkit/common/src/main/java/com/dfsek/terra/bukkit/BukkitEntity.java +++ b/platforms/bukkit/common/src/main/java/com/dfsek/terra/bukkit/BukkitEntity.java @@ -17,11 +17,11 @@ package com.dfsek.terra.bukkit; +import com.dfsek.seismic.type.vector.Vector3; import io.papermc.lib.PaperLib; import org.bukkit.Location; import com.dfsek.terra.api.entity.Entity; -import com.dfsek.seismic.type.vector.Vector3; import com.dfsek.terra.api.world.ServerWorld; import com.dfsek.terra.bukkit.world.BukkitAdapter; diff --git a/platforms/bukkit/common/src/main/java/com/dfsek/terra/bukkit/BukkitPlayer.java b/platforms/bukkit/common/src/main/java/com/dfsek/terra/bukkit/BukkitPlayer.java index 2b90e73d8..cdcd1efd7 100644 --- a/platforms/bukkit/common/src/main/java/com/dfsek/terra/bukkit/BukkitPlayer.java +++ b/platforms/bukkit/common/src/main/java/com/dfsek/terra/bukkit/BukkitPlayer.java @@ -17,11 +17,11 @@ package com.dfsek.terra.bukkit; +import com.dfsek.seismic.type.vector.Vector3; import io.papermc.lib.PaperLib; import org.bukkit.Location; import com.dfsek.terra.api.entity.Player; -import com.dfsek.seismic.type.vector.Vector3; import com.dfsek.terra.api.world.ServerWorld; import com.dfsek.terra.bukkit.world.BukkitAdapter; diff --git a/platforms/bukkit/common/src/main/java/com/dfsek/terra/bukkit/PlatformImpl.java b/platforms/bukkit/common/src/main/java/com/dfsek/terra/bukkit/PlatformImpl.java index 08be0766b..876585f5f 100644 --- a/platforms/bukkit/common/src/main/java/com/dfsek/terra/bukkit/PlatformImpl.java +++ b/platforms/bukkit/common/src/main/java/com/dfsek/terra/bukkit/PlatformImpl.java @@ -20,9 +20,6 @@ package com.dfsek.terra.bukkit; import com.dfsek.tectonic.api.TypeRegistry; import com.dfsek.tectonic.api.depth.DepthTracker; import com.dfsek.tectonic.api.exception.LoadException; - -import com.dfsek.terra.bukkit.nms.Initializer; - import org.bukkit.Bukkit; import org.bukkit.entity.EntityType; import org.jetbrains.annotations.NotNull; @@ -42,6 +39,7 @@ import com.dfsek.terra.api.world.biome.PlatformBiome; import com.dfsek.terra.bukkit.generator.BukkitChunkGeneratorWrapper; import com.dfsek.terra.bukkit.handles.BukkitItemHandle; import com.dfsek.terra.bukkit.handles.BukkitWorldHandle; +import com.dfsek.terra.bukkit.nms.Initializer; import com.dfsek.terra.bukkit.world.BukkitPlatformBiome; @@ -58,7 +56,7 @@ public class PlatformImpl extends AbstractPlatform { public PlatformImpl(TerraBukkitPlugin plugin) { generationThreads = getMoonriseGenerationThreadsWithReflection(); - if (generationThreads == 0) { + if(generationThreads == 0) { generationThreads = 1; } this.plugin = plugin; diff --git a/platforms/bukkit/common/src/main/java/com/dfsek/terra/bukkit/hooks/MultiverseGeneratorPluginHook.java b/platforms/bukkit/common/src/main/java/com/dfsek/terra/bukkit/hooks/MultiverseGeneratorPluginHook.java index a4a81d7f8..e0bba8e9d 100644 --- a/platforms/bukkit/common/src/main/java/com/dfsek/terra/bukkit/hooks/MultiverseGeneratorPluginHook.java +++ b/platforms/bukkit/common/src/main/java/com/dfsek/terra/bukkit/hooks/MultiverseGeneratorPluginHook.java @@ -1,14 +1,15 @@ package com.dfsek.terra.bukkit.hooks; -import com.dfsek.terra.api.Platform; -import com.dfsek.terra.api.registry.key.Keyed; - import org.mvplugins.multiverse.core.world.generators.GeneratorPlugin; import org.mvplugins.multiverse.external.jetbrains.annotations.NotNull; import org.mvplugins.multiverse.external.jetbrains.annotations.Nullable; import java.util.Collection; +import com.dfsek.terra.api.Platform; +import com.dfsek.terra.api.registry.key.Keyed; + + public final class MultiverseGeneratorPluginHook implements GeneratorPlugin { private final Platform platform; diff --git a/platforms/bukkit/common/src/main/java/com/dfsek/terra/bukkit/listeners/CommonListener.java b/platforms/bukkit/common/src/main/java/com/dfsek/terra/bukkit/listeners/CommonListener.java index 522a6aa2a..8551fc2c0 100644 --- a/platforms/bukkit/common/src/main/java/com/dfsek/terra/bukkit/listeners/CommonListener.java +++ b/platforms/bukkit/common/src/main/java/com/dfsek/terra/bukkit/listeners/CommonListener.java @@ -17,9 +17,6 @@ package com.dfsek.terra.bukkit.listeners; -import com.dfsek.terra.api.Platform; -import com.dfsek.terra.bukkit.hooks.MultiverseGeneratorPluginHook; - import org.bukkit.event.EventHandler; import org.bukkit.event.Listener; import org.bukkit.event.server.PluginEnableEvent; @@ -27,6 +24,9 @@ import org.mvplugins.multiverse.core.MultiverseCoreApi; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import com.dfsek.terra.api.Platform; +import com.dfsek.terra.bukkit.hooks.MultiverseGeneratorPluginHook; + /** * Listener for events on all implementations. diff --git a/platforms/bukkit/common/src/main/java/com/dfsek/terra/bukkit/nms/Initializer.java b/platforms/bukkit/common/src/main/java/com/dfsek/terra/bukkit/nms/Initializer.java index 923c73df0..9d2eae560 100644 --- a/platforms/bukkit/common/src/main/java/com/dfsek/terra/bukkit/nms/Initializer.java +++ b/platforms/bukkit/common/src/main/java/com/dfsek/terra/bukkit/nms/Initializer.java @@ -1,10 +1,9 @@ package com.dfsek.terra.bukkit.nms; -import com.dfsek.terra.bukkit.BukkitAddon; - import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import com.dfsek.terra.bukkit.BukkitAddon; import com.dfsek.terra.bukkit.PlatformImpl; import com.dfsek.terra.bukkit.util.VersionUtil; @@ -54,7 +53,7 @@ public interface Initializer { private static Initializer constructInitializer() { try { String packageVersion = NMS; - if (NMS.equals("v1_21_5")) { + if(NMS.equals("v1_21_5")) { packageVersion = "v1_21_6"; } diff --git a/platforms/bukkit/common/src/main/java/com/dfsek/terra/bukkit/world/BukkitAdapter.java b/platforms/bukkit/common/src/main/java/com/dfsek/terra/bukkit/world/BukkitAdapter.java index fcc244504..ef7d2c535 100644 --- a/platforms/bukkit/common/src/main/java/com/dfsek/terra/bukkit/world/BukkitAdapter.java +++ b/platforms/bukkit/common/src/main/java/com/dfsek/terra/bukkit/world/BukkitAdapter.java @@ -18,6 +18,7 @@ package com.dfsek.terra.bukkit.world; +import com.dfsek.seismic.type.vector.Vector3; import org.bukkit.Location; import org.bukkit.Material; import org.bukkit.entity.Player; @@ -34,7 +35,6 @@ import com.dfsek.terra.api.command.CommandSender; import com.dfsek.terra.api.entity.Entity; import com.dfsek.terra.api.inventory.ItemStack; import com.dfsek.terra.api.inventory.item.Enchantment; -import com.dfsek.seismic.type.vector.Vector3; import com.dfsek.terra.api.world.ServerWorld; import com.dfsek.terra.api.world.chunk.Chunk; import com.dfsek.terra.api.world.info.WorldProperties; diff --git a/platforms/bukkit/common/src/main/java/com/dfsek/terra/bukkit/world/block/BukkitBlockTypeAndItem.java b/platforms/bukkit/common/src/main/java/com/dfsek/terra/bukkit/world/block/BukkitBlockTypeAndItem.java index 6d442343b..38a9735ad 100644 --- a/platforms/bukkit/common/src/main/java/com/dfsek/terra/bukkit/world/block/BukkitBlockTypeAndItem.java +++ b/platforms/bukkit/common/src/main/java/com/dfsek/terra/bukkit/world/block/BukkitBlockTypeAndItem.java @@ -17,14 +17,14 @@ package com.dfsek.terra.bukkit.world.block; -import org.bukkit.Material; - import com.dfsek.terra.api.block.BlockType; import com.dfsek.terra.api.block.state.BlockState; import com.dfsek.terra.api.inventory.Item; import com.dfsek.terra.api.inventory.ItemStack; import com.dfsek.terra.bukkit.world.BukkitAdapter; +import org.bukkit.Material; + public class BukkitBlockTypeAndItem implements BlockType, Item { private final Material delegate; diff --git a/platforms/bukkit/common/src/main/java/com/dfsek/terra/bukkit/world/block/state/BukkitBlockEntity.java b/platforms/bukkit/common/src/main/java/com/dfsek/terra/bukkit/world/block/state/BukkitBlockEntity.java index 080b57146..56bd045fc 100644 --- a/platforms/bukkit/common/src/main/java/com/dfsek/terra/bukkit/world/block/state/BukkitBlockEntity.java +++ b/platforms/bukkit/common/src/main/java/com/dfsek/terra/bukkit/world/block/state/BukkitBlockEntity.java @@ -17,13 +17,13 @@ package com.dfsek.terra.bukkit.world.block.state; +import com.dfsek.seismic.type.vector.Vector3; import org.bukkit.block.Container; import org.bukkit.block.CreatureSpawner; import org.bukkit.block.Sign; import com.dfsek.terra.api.block.entity.BlockEntity; import com.dfsek.terra.api.block.state.BlockState; -import com.dfsek.seismic.type.vector.Vector3; import com.dfsek.terra.bukkit.world.BukkitAdapter; import com.dfsek.terra.bukkit.world.block.data.BukkitBlockState; diff --git a/platforms/bukkit/nms/v1_21_6/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_6/AwfulBukkitHacks.java b/platforms/bukkit/nms/v1_21_6/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_6/AwfulBukkitHacks.java index 980194f92..30973af29 100644 --- a/platforms/bukkit/nms/v1_21_6/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_6/AwfulBukkitHacks.java +++ b/platforms/bukkit/nms/v1_21_6/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_6/AwfulBukkitHacks.java @@ -1,7 +1,5 @@ package com.dfsek.terra.bukkit.nms.v1_21_6; -import com.dfsek.terra.bukkit.nms.v1_21_6.config.VanillaBiomeProperties; - import net.minecraft.core.Holder; import net.minecraft.core.Holder.Reference; import net.minecraft.core.HolderSet; @@ -25,6 +23,7 @@ import java.util.Map; import java.util.Set; import java.util.stream.Collectors; +import com.dfsek.terra.bukkit.nms.v1_21_6.config.VanillaBiomeProperties; import com.dfsek.terra.bukkit.world.BukkitPlatformBiome; import com.dfsek.terra.registry.master.ConfigRegistry; @@ -52,7 +51,8 @@ public class AwfulBukkitHacks { VanillaBiomeProperties vanillaBiomeProperties = biome.getContext().get(VanillaBiomeProperties.class); - Biome platform = NMSBiomeInjector.createBiome(biomeRegistry.get(vanillaMinecraftKey).orElseThrow().value(), vanillaBiomeProperties); + Biome platform = NMSBiomeInjector.createBiome(biomeRegistry.get(vanillaMinecraftKey).orElseThrow().value(), + vanillaBiomeProperties); ResourceKey delegateKey = ResourceKey.create( Registries.BIOME, @@ -112,39 +112,42 @@ public class AwfulBukkitHacks { Map, List>> map = new IdentityHashMap<>(); Reflection.MAPPED_REGISTRY.getByKey(registry).values().forEach(entry -> map.put(entry, new ArrayList<>())); tagEntries.forEach((tag, entries) -> { - for (Holder holder : entries) { -// if (!holder.canSerializeIn(registry.asLookup())) { -// throw new IllegalStateException("Can't create named set " + tag + " containing value " + holder + " from outside registry " + this); -// } + for(Holder holder : entries) { + // if (!holder.canSerializeIn(registry.asLookup())) { + // throw new IllegalStateException("Can't create named set " + tag + " containing value " + holder + " + // from outside registry " + this); + // } - if (!(holder instanceof Holder.Reference reference)) { + if(!(holder instanceof Holder.Reference reference)) { throw new IllegalStateException("Found direct holder " + holder + " value in tag " + tag); } map.get(reference).add(tag); } }); -// Set> set = Sets.difference(registry.tags.keySet(), tagEntries.keySet()); -// if (!set.isEmpty()) { -// LOGGER.warn( -// "Not all defined tags for registry {} are present in data pack: {}", -// registry.key(), -// set.stream().map(tag -> tag.location().toString()).sorted().collect(Collectors.joining(", ")) -// ); -// } + // Set> set = Sets.difference(registry.tags.keySet(), tagEntries.keySet()); + // if (!set.isEmpty()) { + // LOGGER.warn( + // "Not all defined tags for registry {} are present in data pack: {}", + // registry.key(), + // set.stream().map(tag -> tag.location().toString()).sorted().collect(Collectors.joining(", ")) + // ); + // } Map, HolderSet.Named> map2 = new IdentityHashMap<>(registry.getTags().collect(Collectors.toMap( Named::key, (named) -> named ))); - tagEntries.forEach((tag, entries) -> Reflection.HOLDER_SET.invokeBind(map2.computeIfAbsent(tag, key -> Reflection.MAPPED_REGISTRY.invokeCreateTag(registry, key)), entries)); + tagEntries.forEach((tag, entries) -> Reflection.HOLDER_SET.invokeBind( + map2.computeIfAbsent(tag, key -> Reflection.MAPPED_REGISTRY.invokeCreateTag(registry, key)), entries)); map.forEach(Reflection.HOLDER_REFERENCE::invokeBindTags); Reflection.MAPPED_REGISTRY.setAllTags(registry, Reflection.MAPPED_REGISTRY_TAG_SET.invokeFromMap(map2)); } private static void resetTags(MappedRegistry registry) { registry.getTags().forEach(entryList -> Reflection.HOLDER_SET.invokeBind(entryList, List.of())); - Reflection.MAPPED_REGISTRY.getByKey(registry).values().forEach(entry -> Reflection.HOLDER_REFERENCE.invokeBindTags(entry, Set.of())); + Reflection.MAPPED_REGISTRY.getByKey(registry).values().forEach( + entry -> Reflection.HOLDER_REFERENCE.invokeBindTags(entry, Set.of())); } } diff --git a/platforms/bukkit/nms/v1_21_6/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_6/NMSBiomeInjector.java b/platforms/bukkit/nms/v1_21_6/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_6/NMSBiomeInjector.java index dd2f2790b..a4bb5c1dc 100644 --- a/platforms/bukkit/nms/v1_21_6/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_6/NMSBiomeInjector.java +++ b/platforms/bukkit/nms/v1_21_6/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_6/NMSBiomeInjector.java @@ -33,7 +33,8 @@ public class NMSBiomeInjector { .waterColor(Objects.requireNonNullElse(vanillaBiomeProperties.getWaterColor(), vanilla.getWaterColor())) .waterFogColor(Objects.requireNonNullElse(vanillaBiomeProperties.getWaterFogColor(), vanilla.getWaterFogColor())) .skyColor(Objects.requireNonNullElse(vanillaBiomeProperties.getSkyColor(), vanilla.getSkyColor())) - .grassColorModifier(Objects.requireNonNullElse(vanillaBiomeProperties.getGrassColorModifier(), vanilla.getSpecialEffects().getGrassColorModifier())) + .grassColorModifier(Objects.requireNonNullElse(vanillaBiomeProperties.getGrassColorModifier(), + vanilla.getSpecialEffects().getGrassColorModifier())) .backgroundMusicVolume(Objects.requireNonNullElse(vanillaBiomeProperties.getMusicVolume(), vanilla.getBackgroundMusicVolume())); if(vanillaBiomeProperties.getGrassColor() == null) { @@ -84,7 +85,8 @@ public class NMSBiomeInjector { builder.downfall(Objects.requireNonNullElse(vanillaBiomeProperties.getDownfall(), vanilla.climateSettings.downfall())); - builder.temperatureAdjustment(Objects.requireNonNullElse(vanillaBiomeProperties.getTemperatureModifier(), vanilla.climateSettings.temperatureModifier())); + builder.temperatureAdjustment( + Objects.requireNonNullElse(vanillaBiomeProperties.getTemperatureModifier(), vanilla.climateSettings.temperatureModifier())); builder.mobSpawnSettings(Objects.requireNonNullElse(vanillaBiomeProperties.getSpawnSettings(), vanilla.getMobSettings())); diff --git a/platforms/bukkit/nms/v1_21_6/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_6/NMSInitializer.java b/platforms/bukkit/nms/v1_21_6/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_6/NMSInitializer.java index cdf8a0902..80515cf7c 100644 --- a/platforms/bukkit/nms/v1_21_6/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_6/NMSInitializer.java +++ b/platforms/bukkit/nms/v1_21_6/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_6/NMSInitializer.java @@ -1,9 +1,8 @@ package com.dfsek.terra.bukkit.nms.v1_21_6; -import com.dfsek.terra.bukkit.BukkitAddon; - import org.bukkit.Bukkit; +import com.dfsek.terra.bukkit.BukkitAddon; import com.dfsek.terra.bukkit.PlatformImpl; import com.dfsek.terra.bukkit.nms.Initializer; diff --git a/platforms/bukkit/nms/v1_21_6/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_6/Reflection.java b/platforms/bukkit/nms/v1_21_6/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_6/Reflection.java index e7a93da04..b565476c5 100644 --- a/platforms/bukkit/nms/v1_21_6/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_6/Reflection.java +++ b/platforms/bukkit/nms/v1_21_6/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_6/Reflection.java @@ -68,6 +68,7 @@ public class Reflection { HolderSet.Named invokeCreateTag(MappedRegistry instance, TagKey tag); } + @Proxies(className = "net.minecraft.core.MappedRegistry$TagSet") public interface MappedRegistryTagSetProxy { @MethodName("fromMap") @@ -92,6 +93,7 @@ public class Reflection { void invokeBindTags(Reference instance, Collection> tags); } + @Proxies(ChunkMap.class) public interface ChunkMapProxy { @FieldGetter("worldGenContext") @@ -101,12 +103,14 @@ public class Reflection { void setWorldGenContext(ChunkMap instance, WorldGenContext worldGenContext); } + @Proxies(Holder.Reference.class) public interface HolderReferenceProxy { @MethodName("bindTags") void invokeBindTags(Holder.Reference instance, Collection> tags); } + @Proxies(HolderSet.Named.class) public interface HolderSetNamedProxy { @MethodName("bind") @@ -116,6 +120,7 @@ public class Reflection { List> invokeContents(HolderSet.Named instance); } + @Proxies(Biome.class) public interface BiomeProxy { @MethodName("getGrassColorFromTexture") diff --git a/platforms/bukkit/nms/v1_21_6/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_6/config/BiomeAdditionsSoundTemplate.java b/platforms/bukkit/nms/v1_21_6/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_6/config/BiomeAdditionsSoundTemplate.java index e328bf9b0..c1c44615a 100644 --- a/platforms/bukkit/nms/v1_21_6/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_6/config/BiomeAdditionsSoundTemplate.java +++ b/platforms/bukkit/nms/v1_21_6/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_6/config/BiomeAdditionsSoundTemplate.java @@ -12,11 +12,11 @@ public class BiomeAdditionsSoundTemplate implements ObjectTemplate> { @Value("id") @Default private ResourceLocation id = null; - + @Override public EntityType get() { return BuiltInRegistries.ENTITY_TYPE.get(id).orElseThrow().value(); diff --git a/platforms/bukkit/nms/v1_21_6/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_6/config/MusicSoundTemplate.java b/platforms/bukkit/nms/v1_21_6/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_6/config/MusicSoundTemplate.java index e55b47783..e54a6d671 100644 --- a/platforms/bukkit/nms/v1_21_6/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_6/config/MusicSoundTemplate.java +++ b/platforms/bukkit/nms/v1_21_6/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_6/config/MusicSoundTemplate.java @@ -12,19 +12,19 @@ public class MusicSoundTemplate implements ObjectTemplate { @Value("sound") @Default private SoundEvent sound = null; - + @Value("min-delay") @Default private Integer minDelay = null; - + @Value("max-delay") @Default private Integer maxDelay = null; - + @Value("replace-current-music") @Default private Boolean replaceCurrentMusic = null; - + @Override public Music get() { if(sound == null || minDelay == null || maxDelay == null || replaceCurrentMusic == null) { diff --git a/platforms/bukkit/nms/v1_21_6/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_6/config/SoundEventTemplate.java b/platforms/bukkit/nms/v1_21_6/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_6/config/SoundEventTemplate.java index 9598d5913..96dd5ae4b 100644 --- a/platforms/bukkit/nms/v1_21_6/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_6/config/SoundEventTemplate.java +++ b/platforms/bukkit/nms/v1_21_6/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_6/config/SoundEventTemplate.java @@ -11,11 +11,11 @@ public class SoundEventTemplate implements ObjectTemplate { @Value("id") @Default private ResourceLocation id = null; - + @Value("distance-to-travel") @Default private Float distanceToTravel = null; - + @Override public SoundEvent get() { if(id == null) { diff --git a/platforms/bukkit/nms/v1_21_6/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_6/config/SpawnCostConfig.java b/platforms/bukkit/nms/v1_21_6/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_6/config/SpawnCostConfig.java index 0f98b1529..4c6b2002d 100644 --- a/platforms/bukkit/nms/v1_21_6/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_6/config/SpawnCostConfig.java +++ b/platforms/bukkit/nms/v1_21_6/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_6/config/SpawnCostConfig.java @@ -10,27 +10,27 @@ public class SpawnCostConfig implements ObjectTemplate { @Value("type") @Default private EntityType type = null; - + @Value("mass") @Default private Double mass = null; - + @Value("gravity") @Default private Double gravity = null; - + public EntityType getType() { return type; } - + public Double getMass() { return mass; } - + public Double getGravity() { return gravity; } - + @Override public SpawnCostConfig get() { return this; diff --git a/platforms/bukkit/nms/v1_21_6/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_6/config/SpawnEntryConfig.java b/platforms/bukkit/nms/v1_21_6/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_6/config/SpawnEntryConfig.java index a78b809d2..467cd3188 100644 --- a/platforms/bukkit/nms/v1_21_6/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_6/config/SpawnEntryConfig.java +++ b/platforms/bukkit/nms/v1_21_6/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_6/config/SpawnEntryConfig.java @@ -11,15 +11,15 @@ public class SpawnEntryConfig implements ObjectTemplate { @Value("type") @Default private EntityType type = null; - + @Value("weight") @Default private Integer weight = null; - + @Value("min-group-size") @Default private Integer minGroupSize = null; - + @Value("max-group-size") @Default private Integer maxGroupSize = null; @@ -31,7 +31,7 @@ public class SpawnEntryConfig implements ObjectTemplate { public SpawnerData getSpawnerData() { return new SpawnerData(type, minGroupSize, maxGroupSize); } - + @Override public SpawnEntryConfig get() { return this; diff --git a/platforms/bukkit/nms/v1_21_6/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_6/config/SpawnSettingsTemplate.java b/platforms/bukkit/nms/v1_21_6/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_6/config/SpawnSettingsTemplate.java index 850f80075..386dba7cf 100644 --- a/platforms/bukkit/nms/v1_21_6/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_6/config/SpawnSettingsTemplate.java +++ b/platforms/bukkit/nms/v1_21_6/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_6/config/SpawnSettingsTemplate.java @@ -3,12 +3,13 @@ package com.dfsek.terra.bukkit.nms.v1_21_6.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.object.ObjectTemplate; -import java.util.List; import net.minecraft.world.entity.MobCategory; import net.minecraft.world.level.biome.MobSpawnSettings; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import java.util.List; + public class SpawnSettingsTemplate implements ObjectTemplate { @@ -18,15 +19,15 @@ public class SpawnSettingsTemplate implements ObjectTemplate { @Value("spawns") @Default private List spawns = null; - + @Value("costs") @Default private List costs = null; - + @Value("probability") @Default private Float probability = null; - + @Override public MobSpawnSettings get() { MobSpawnSettings.Builder builder = new MobSpawnSettings.Builder(); @@ -42,7 +43,7 @@ public class SpawnSettingsTemplate implements ObjectTemplate { if(probability != null) { builder.creatureGenerationProbability(probability); } - + return builder.build(); } } diff --git a/platforms/bukkit/nms/v1_21_6/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_6/config/SpawnTypeConfig.java b/platforms/bukkit/nms/v1_21_6/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_6/config/SpawnTypeConfig.java index ce865d1d6..45f698c40 100644 --- a/platforms/bukkit/nms/v1_21_6/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_6/config/SpawnTypeConfig.java +++ b/platforms/bukkit/nms/v1_21_6/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_6/config/SpawnTypeConfig.java @@ -3,9 +3,10 @@ package com.dfsek.terra.bukkit.nms.v1_21_6.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.object.ObjectTemplate; -import java.util.List; import net.minecraft.world.entity.MobCategory; +import java.util.List; + public class SpawnTypeConfig implements ObjectTemplate { @Value("group") diff --git a/platforms/bukkit/nms/v1_21_6/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_6/config/VanillaBiomeProperties.java b/platforms/bukkit/nms/v1_21_6/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_6/config/VanillaBiomeProperties.java index 8eec35bf1..530779dbc 100644 --- a/platforms/bukkit/nms/v1_21_6/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_6/config/VanillaBiomeProperties.java +++ b/platforms/bukkit/nms/v1_21_6/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_6/config/VanillaBiomeProperties.java @@ -3,9 +3,6 @@ package com.dfsek.terra.bukkit.nms.v1_21_6.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.terra.api.properties.Properties; - import net.minecraft.sounds.Music; import net.minecraft.sounds.SoundEvent; import net.minecraft.world.entity.npc.VillagerType; @@ -16,6 +13,8 @@ import net.minecraft.world.level.biome.Biome.TemperatureModifier; import net.minecraft.world.level.biome.BiomeSpecialEffects.GrassColorModifier; import net.minecraft.world.level.biome.MobSpawnSettings; +import com.dfsek.terra.api.properties.Properties; + public class VanillaBiomeProperties implements ConfigTemplate, Properties { @Value("colors.grass") diff --git a/platforms/bukkit/nms/v1_21_6/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_6/config/VillagerTypeTemplate.java b/platforms/bukkit/nms/v1_21_6/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_6/config/VillagerTypeTemplate.java index e38aebb5c..b354bb933 100644 --- a/platforms/bukkit/nms/v1_21_6/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_6/config/VillagerTypeTemplate.java +++ b/platforms/bukkit/nms/v1_21_6/src/main/java/com/dfsek/terra/bukkit/nms/v1_21_6/config/VillagerTypeTemplate.java @@ -12,7 +12,7 @@ public class VillagerTypeTemplate implements ObjectTemplate { @Value("id") @Default private ResourceLocation id = null; - + @Override public VillagerType get() { return BuiltInRegistries.VILLAGER_TYPE.get(id).orElseThrow().value(); diff --git a/platforms/cli/src/main/java/com/dfsek/terra/cli/TerraCLI.java b/platforms/cli/src/main/java/com/dfsek/terra/cli/TerraCLI.java index 363a54dbc..c271f98cf 100644 --- a/platforms/cli/src/main/java/com/dfsek/terra/cli/TerraCLI.java +++ b/platforms/cli/src/main/java/com/dfsek/terra/cli/TerraCLI.java @@ -1,44 +1,48 @@ package com.dfsek.terra.cli; +import com.dfsek.seismic.type.vector.Vector2Int; import net.querz.mca.MCAUtil; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import picocli.CommandLine; +import picocli.CommandLine.Command; +import picocli.CommandLine.Option; import java.io.IOException; import java.util.concurrent.Callable; import com.dfsek.terra.api.config.ConfigPack; import com.dfsek.terra.api.event.events.platform.PlatformInitializationEvent; -import com.dfsek.seismic.type.vector.Vector2Int; import com.dfsek.terra.cli.world.CLIWorld; -import picocli.CommandLine; -import picocli.CommandLine.Command; -import picocli.CommandLine.Option; - //TODO auto pull in version @Command(name = "TerraCLI", mixinStandardHelpOptions = true, version = "6.6.0", description = "Generates a Terra World and saves it in minecraft region format.") public final class TerraCLI implements Callable { - @Option(names = { "-s", "--size"}, description = "Number of regions to generate.") + @Option(names = { "-s", "--size" }, description = "Number of regions to generate.") private int size = 2; - @Option(names = { "-p", "--pack"}, description = "Config pack to use.") + @Option(names = { "-p", "--pack" }, description = "Config pack to use.") private String pack = "OVERWORLD"; - @Option(names = { "--seed"}, description = "Seed for world generation.") + @Option(names = { "--seed" }, description = "Seed for world generation.") private long seed = 0; - @Option(names = { "--max-height"}, description = "Maximum height of the world.") + @Option(names = { "--max-height" }, description = "Maximum height of the world.") private int maxHeight = 320; - @Option(names = { "--min-height"}, description = "Minimum height of the world.") + @Option(names = { "--min-height" }, description = "Minimum height of the world.") private int minHeight = -64; - @Option(names = { "--no-save"}, description = "Don't save the world to disk.") + @Option(names = { "--no-save" }, description = "Don't save the world to disk.") private boolean noSave = false; + public static void main(String... args) { + int exitCode = new CommandLine(new TerraCLI()).execute(args); + System.exit(exitCode); + } + @Override public Integer call() { Logger LOGGER = LoggerFactory.getLogger(TerraCLI.class); @@ -70,9 +74,4 @@ public final class TerraCLI implements Callable { LOGGER.info("Done."); return 0; } - - public static void main(String... args) { - int exitCode = new CommandLine(new TerraCLI()).execute(args); - System.exit(exitCode); - } } diff --git a/platforms/cli/src/main/java/com/dfsek/terra/cli/world/CLIWorld.java b/platforms/cli/src/main/java/com/dfsek/terra/cli/world/CLIWorld.java index 4c01a8f0e..5fdf266ad 100644 --- a/platforms/cli/src/main/java/com/dfsek/terra/cli/world/CLIWorld.java +++ b/platforms/cli/src/main/java/com/dfsek/terra/cli/world/CLIWorld.java @@ -1,5 +1,7 @@ package com.dfsek.terra.cli.world; +import com.dfsek.seismic.type.vector.Vector2Int; +import com.dfsek.seismic.type.vector.Vector3; import com.google.common.collect.Streams; import net.querz.mca.MCAFile; import org.slf4j.Logger; @@ -22,8 +24,6 @@ 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.generic.pair.Pair; -import com.dfsek.seismic.type.vector.Vector2Int; -import com.dfsek.seismic.type.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; @@ -87,7 +87,7 @@ public class CLIWorld implements ServerWorld, NBTSerializable new ArrayList<>()).add( + com.dfsek.terra.mod.util.BiomeUtil.TERRA_BIOME_MAP.computeIfAbsent(vanilla.getKey().orElseThrow().getValue(), + i -> new ArrayList<>()).add( identifier); } } diff --git a/platforms/minestom/example/src/main/java/com/dfsek/terra/minestom/TerraMinestomExample.java b/platforms/minestom/example/src/main/java/com/dfsek/terra/minestom/TerraMinestomExample.java index 2da66d2c9..69bcb1680 100644 --- a/platforms/minestom/example/src/main/java/com/dfsek/terra/minestom/TerraMinestomExample.java +++ b/platforms/minestom/example/src/main/java/com/dfsek/terra/minestom/TerraMinestomExample.java @@ -6,7 +6,6 @@ import net.minestom.server.command.builder.Command; import net.minestom.server.coordinate.Pos; import net.minestom.server.entity.GameMode; import net.minestom.server.event.player.AsyncPlayerConfigurationEvent; -import net.minestom.server.event.player.PlayerDisconnectEvent; import net.minestom.server.event.player.PlayerSpawnEvent; import net.minestom.server.instance.Instance; import net.minestom.server.instance.LightingChunk; @@ -22,9 +21,20 @@ import com.dfsek.terra.minestom.world.TerraMinestomWorld; public class TerraMinestomExample { private static final Logger logger = LoggerFactory.getLogger(TerraMinestomExample.class); private final MinecraftServer server = MinecraftServer.init(); + private final TerraMinestomPlatform platform = new TerraMinestomPlatform(); private Instance instance; private TerraMinestomWorld world; - private final TerraMinestomPlatform platform = new TerraMinestomPlatform(); + + public static void main(String[] args) { + TerraMinestomExample example = new TerraMinestomExample(); + example.createNewInstance(); + example.attachTerra(); + example.preloadWorldAndMeasure(); + example.addScheduler(); + example.addListeners(); + example.addCommands(); + example.bind(); + } public void createNewInstance() { instance = MinecraftServer.getInstanceManager().createInstanceContainer(); @@ -104,16 +114,6 @@ public class TerraMinestomExample { server.start("localhost", 25565); } - public static void main(String[] args) { - TerraMinestomExample example = new TerraMinestomExample(); - example.createNewInstance(); - example.attachTerra(); - example.preloadWorldAndMeasure(); - example.addScheduler(); - example.addListeners(); - example.addCommands(); - example.bind(); - } public class RegenerateCommand extends Command { public RegenerateCommand() { diff --git a/platforms/minestom/src/main/java/com/dfsek/terra/minestom/MinestomAdapter.java b/platforms/minestom/src/main/java/com/dfsek/terra/minestom/MinestomAdapter.java index 27c70b253..54d74ec10 100644 --- a/platforms/minestom/src/main/java/com/dfsek/terra/minestom/MinestomAdapter.java +++ b/platforms/minestom/src/main/java/com/dfsek/terra/minestom/MinestomAdapter.java @@ -1,7 +1,6 @@ package com.dfsek.terra.minestom; import com.dfsek.seismic.type.vector.Vector3; - import net.minestom.server.coordinate.Point; import net.minestom.server.coordinate.Pos; diff --git a/platforms/minestom/src/main/java/com/dfsek/terra/minestom/TerraMinestomPlatform.java b/platforms/minestom/src/main/java/com/dfsek/terra/minestom/TerraMinestomPlatform.java index 527eb85be..c1c59076c 100644 --- a/platforms/minestom/src/main/java/com/dfsek/terra/minestom/TerraMinestomPlatform.java +++ b/platforms/minestom/src/main/java/com/dfsek/terra/minestom/TerraMinestomPlatform.java @@ -2,30 +2,6 @@ package com.dfsek.terra.minestom; import com.dfsek.tectonic.api.TypeRegistry; import com.dfsek.tectonic.api.loader.type.TypeLoader; - -import com.dfsek.terra.AbstractPlatform; -import com.dfsek.terra.api.addon.BaseAddon; -import com.dfsek.terra.api.block.state.BlockState; -import com.dfsek.terra.api.entity.EntityType; -import com.dfsek.terra.api.event.events.platform.PlatformInitializationEvent; -import com.dfsek.terra.api.handle.ItemHandle; -import com.dfsek.terra.api.handle.WorldHandle; -import com.dfsek.terra.api.world.biome.PlatformBiome; -import com.dfsek.terra.minestom.addon.MinestomAddon; -import com.dfsek.terra.minestom.config.BiomeAdditionsSoundTemplate; -import com.dfsek.terra.minestom.config.BiomeParticleConfigTemplate; -import com.dfsek.terra.minestom.biome.MinestomBiomeLoader; -import com.dfsek.terra.minestom.config.KeyLoader; -import com.dfsek.terra.minestom.config.BiomeMoodSoundTemplate; -import com.dfsek.terra.minestom.config.RGBLikeLoader; -import com.dfsek.terra.minestom.config.SoundEventTemplate; -import com.dfsek.terra.minestom.entity.MinestomEntityType; -import com.dfsek.terra.minestom.item.MinestomItemHandle; -import com.dfsek.terra.minestom.world.MinestomChunkGeneratorWrapper; -import com.dfsek.terra.minestom.world.MinestomWorldHandle; - -import com.dfsek.terra.minestom.api.TerraMinestomWorldBuilder; - import net.kyori.adventure.key.Key; import net.kyori.adventure.util.RGBLike; import net.minestom.server.MinecraftServer; @@ -40,6 +16,28 @@ import java.io.File; import java.util.ArrayList; import java.util.List; +import com.dfsek.terra.AbstractPlatform; +import com.dfsek.terra.api.addon.BaseAddon; +import com.dfsek.terra.api.block.state.BlockState; +import com.dfsek.terra.api.entity.EntityType; +import com.dfsek.terra.api.event.events.platform.PlatformInitializationEvent; +import com.dfsek.terra.api.handle.ItemHandle; +import com.dfsek.terra.api.handle.WorldHandle; +import com.dfsek.terra.api.world.biome.PlatformBiome; +import com.dfsek.terra.minestom.addon.MinestomAddon; +import com.dfsek.terra.minestom.api.TerraMinestomWorldBuilder; +import com.dfsek.terra.minestom.biome.MinestomBiomeLoader; +import com.dfsek.terra.minestom.config.BiomeAdditionsSoundTemplate; +import com.dfsek.terra.minestom.config.BiomeMoodSoundTemplate; +import com.dfsek.terra.minestom.config.BiomeParticleConfigTemplate; +import com.dfsek.terra.minestom.config.KeyLoader; +import com.dfsek.terra.minestom.config.RGBLikeLoader; +import com.dfsek.terra.minestom.config.SoundEventTemplate; +import com.dfsek.terra.minestom.entity.MinestomEntityType; +import com.dfsek.terra.minestom.item.MinestomItemHandle; +import com.dfsek.terra.minestom.world.MinestomChunkGeneratorWrapper; +import com.dfsek.terra.minestom.world.MinestomWorldHandle; + public final class TerraMinestomPlatform extends AbstractPlatform { private static final Logger LOGGER = LoggerFactory.getLogger(TerraMinestomPlatform.class); @@ -48,7 +46,8 @@ public final class TerraMinestomPlatform extends AbstractPlatform { private final TypeLoader biomeTypeLoader; private final ArrayList platformAddons = new ArrayList<>(List.of(new MinestomAddon(this))); - public TerraMinestomPlatform(WorldHandle worldHandle, ItemHandle itemHandle, TypeLoader biomeTypeLoader, BaseAddon... extraAddons) { + public TerraMinestomPlatform(WorldHandle worldHandle, ItemHandle itemHandle, TypeLoader biomeTypeLoader, + BaseAddon... extraAddons) { this.worldHandle = worldHandle; this.itemHandle = itemHandle; this.biomeTypeLoader = biomeTypeLoader; @@ -68,8 +67,10 @@ public final class TerraMinestomPlatform extends AbstractPlatform { .registerLoader(PlatformBiome.class, biomeTypeLoader) .registerLoader(RGBLike.class, new RGBLikeLoader()) .registerLoader(Key.class, new KeyLoader()) - .registerLoader(EntityType.class, (TypeLoader) (annotatedType, o, configLoader, depthTracker) -> new MinestomEntityType((String) o)) - .registerLoader(BlockState.class, (TypeLoader) (annotatedType, o, configLoader, depthTracker) -> worldHandle.createBlockState((String) o)) + .registerLoader(EntityType.class, + (TypeLoader) (annotatedType, o, configLoader, depthTracker) -> new MinestomEntityType((String) o)) + .registerLoader(BlockState.class, + (TypeLoader) (annotatedType, o, configLoader, depthTracker) -> worldHandle.createBlockState((String) o)) .registerLoader(BiomeEffects.Particle.class, BiomeParticleConfigTemplate::new) .registerLoader(BiomeEffects.MoodSound.class, BiomeMoodSoundTemplate::new) .registerLoader(BiomeEffects.AdditionsSound.class, BiomeAdditionsSoundTemplate::new) diff --git a/platforms/minestom/src/main/java/com/dfsek/terra/minestom/addon/MinestomAddon.java b/platforms/minestom/src/main/java/com/dfsek/terra/minestom/addon/MinestomAddon.java index 4d4adc4b8..1dc3bc0cc 100644 --- a/platforms/minestom/src/main/java/com/dfsek/terra/minestom/addon/MinestomAddon.java +++ b/platforms/minestom/src/main/java/com/dfsek/terra/minestom/addon/MinestomAddon.java @@ -2,20 +2,16 @@ package com.dfsek.terra.minestom.addon; import ca.solostudios.strata.Versions; import ca.solostudios.strata.version.Version; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import com.dfsek.terra.api.addon.BaseAddon; - import com.dfsek.terra.api.event.events.config.ConfigurationLoadEvent; import com.dfsek.terra.api.event.functional.FunctionalEventHandler; import com.dfsek.terra.api.world.biome.Biome; - import com.dfsek.terra.minestom.TerraMinestomPlatform; - import com.dfsek.terra.minestom.config.VanillaBiomeProperties; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - public class MinestomAddon implements BaseAddon { private static final Version VERSION = Versions.getVersion(1, 0, 0); diff --git a/platforms/minestom/src/main/java/com/dfsek/terra/minestom/api/BlockEntityFactory.java b/platforms/minestom/src/main/java/com/dfsek/terra/minestom/api/BlockEntityFactory.java index 6ea403ddf..83746ff55 100644 --- a/platforms/minestom/src/main/java/com/dfsek/terra/minestom/api/BlockEntityFactory.java +++ b/platforms/minestom/src/main/java/com/dfsek/terra/minestom/api/BlockEntityFactory.java @@ -1,10 +1,10 @@ package com.dfsek.terra.minestom.api; -import com.dfsek.terra.api.block.entity.BlockEntity; - import net.minestom.server.coordinate.BlockVec; import org.jetbrains.annotations.Nullable; +import com.dfsek.terra.api.block.entity.BlockEntity; + /** * Represents a factory interface for creating instances of BlockEntity diff --git a/platforms/minestom/src/main/java/com/dfsek/terra/minestom/api/TerraMinestomWorldBuilder.java b/platforms/minestom/src/main/java/com/dfsek/terra/minestom/api/TerraMinestomWorldBuilder.java index 30a04a172..7652a2473 100644 --- a/platforms/minestom/src/main/java/com/dfsek/terra/minestom/api/TerraMinestomWorldBuilder.java +++ b/platforms/minestom/src/main/java/com/dfsek/terra/minestom/api/TerraMinestomWorldBuilder.java @@ -1,20 +1,18 @@ package com.dfsek.terra.minestom.api; -import com.dfsek.terra.api.config.ConfigPack; - -import com.dfsek.terra.api.registry.CheckedRegistry; - -import com.dfsek.terra.minestom.TerraMinestomPlatform; -import com.dfsek.terra.minestom.biome.MinestomUserDefinedBiomeFactory; -import com.dfsek.terra.minestom.block.DefaultBlockEntityFactory; -import com.dfsek.terra.minestom.entity.DefaultEntityFactory; - -import com.dfsek.terra.minestom.world.TerraMinestomWorld; import net.minestom.server.instance.Instance; import java.util.Random; import java.util.function.Function; +import com.dfsek.terra.api.config.ConfigPack; +import com.dfsek.terra.api.registry.CheckedRegistry; +import com.dfsek.terra.minestom.TerraMinestomPlatform; +import com.dfsek.terra.minestom.biome.MinestomUserDefinedBiomeFactory; +import com.dfsek.terra.minestom.block.DefaultBlockEntityFactory; +import com.dfsek.terra.minestom.entity.DefaultEntityFactory; +import com.dfsek.terra.minestom.world.TerraMinestomWorld; + public class TerraMinestomWorldBuilder { private final TerraMinestomPlatform platform; diff --git a/platforms/minestom/src/main/java/com/dfsek/terra/minestom/biome/MinestomBiome.java b/platforms/minestom/src/main/java/com/dfsek/terra/minestom/biome/MinestomBiome.java index 54be04180..eb4a121a1 100644 --- a/platforms/minestom/src/main/java/com/dfsek/terra/minestom/biome/MinestomBiome.java +++ b/platforms/minestom/src/main/java/com/dfsek/terra/minestom/biome/MinestomBiome.java @@ -1,10 +1,10 @@ package com.dfsek.terra.minestom.biome; -import com.dfsek.terra.api.world.biome.PlatformBiome; - import net.minestom.server.registry.RegistryKey; import net.minestom.server.world.biome.Biome; +import com.dfsek.terra.api.world.biome.PlatformBiome; + public class MinestomBiome implements PlatformBiome { private final RegistryKey biome; diff --git a/platforms/minestom/src/main/java/com/dfsek/terra/minestom/biome/MinestomBiomeLoader.java b/platforms/minestom/src/main/java/com/dfsek/terra/minestom/biome/MinestomBiomeLoader.java index e82e3ec10..21e4645b4 100644 --- a/platforms/minestom/src/main/java/com/dfsek/terra/minestom/biome/MinestomBiomeLoader.java +++ b/platforms/minestom/src/main/java/com/dfsek/terra/minestom/biome/MinestomBiomeLoader.java @@ -4,9 +4,6 @@ import com.dfsek.tectonic.api.depth.DepthTracker; import com.dfsek.tectonic.api.exception.LoadException; import com.dfsek.tectonic.api.loader.ConfigLoader; import com.dfsek.tectonic.api.loader.type.TypeLoader; - -import com.dfsek.terra.api.world.biome.PlatformBiome; - import net.kyori.adventure.key.Key; import net.minestom.server.registry.RegistryKey; import org.intellij.lang.annotations.Subst; @@ -14,6 +11,9 @@ import org.jetbrains.annotations.NotNull; import java.lang.reflect.AnnotatedType; +import com.dfsek.terra.api.world.biome.PlatformBiome; + + public class MinestomBiomeLoader implements TypeLoader { @Override public PlatformBiome load(@NotNull AnnotatedType annotatedType, @NotNull Object o, @NotNull ConfigLoader configLoader, diff --git a/platforms/minestom/src/main/java/com/dfsek/terra/minestom/biome/MinestomUserDefinedBiomeFactory.java b/platforms/minestom/src/main/java/com/dfsek/terra/minestom/biome/MinestomUserDefinedBiomeFactory.java index 2ef3d9044..644350d49 100644 --- a/platforms/minestom/src/main/java/com/dfsek/terra/minestom/biome/MinestomUserDefinedBiomeFactory.java +++ b/platforms/minestom/src/main/java/com/dfsek/terra/minestom/biome/MinestomUserDefinedBiomeFactory.java @@ -1,9 +1,5 @@ package com.dfsek.terra.minestom.biome; -import com.dfsek.terra.api.config.ConfigPack; -import com.dfsek.terra.minestom.api.BiomeFactory; -import com.dfsek.terra.minestom.config.VanillaBiomeProperties; - import net.kyori.adventure.key.Key; import net.minestom.server.MinecraftServer; import net.minestom.server.color.Color; @@ -17,11 +13,25 @@ import org.jetbrains.annotations.NotNull; import java.util.Locale; import java.util.Objects; +import com.dfsek.terra.api.config.ConfigPack; +import com.dfsek.terra.minestom.api.BiomeFactory; +import com.dfsek.terra.minestom.config.VanillaBiomeProperties; + public class MinestomUserDefinedBiomeFactory implements BiomeFactory { private final DynamicRegistry biomeRegistry = MinecraftServer.getBiomeRegistry(); private final @NotNull Biome plainsBiome = Objects.requireNonNull(biomeRegistry.get(Key.key("minecraft:plains"))); + private static T mergeNullable(T first, T second) { + if(first == null) return second; + return first; + } + + @Subst("value") + protected static String createBiomeID(ConfigPack pack, String biomeId) { + return pack.getID().toLowerCase() + "/" + biomeId.toLowerCase(Locale.ROOT); + } + @Override public UserDefinedBiome create(ConfigPack pack, com.dfsek.terra.api.world.biome.Biome source) { VanillaBiomeProperties properties = source.getContext().get(VanillaBiomeProperties.class); @@ -46,7 +56,7 @@ public class MinestomUserDefinedBiomeFactory implements BiomeFactory { .music(parentEffects.music()) .musicVolume(parentEffects.musicVolume()); - if (effectsBuilder.build().equals(BiomeEffects.PLAINS_EFFECTS)) { + if(effectsBuilder.build().equals(BiomeEffects.PLAINS_EFFECTS)) { effectsBuilder.fogColor(new Color(0xC0D8FE)); // circumvent a minestom bug } @@ -61,14 +71,4 @@ public class MinestomUserDefinedBiomeFactory implements BiomeFactory { RegistryKey registryKey = MinecraftServer.getBiomeRegistry().register(key, target); return new UserDefinedBiome(key, registryKey, source.getID(), target); } - - private static T mergeNullable(T first, T second) { - if (first == null) return second; - return first; - } - - @Subst("value") - protected static String createBiomeID(ConfigPack pack, String biomeId) { - return pack.getID().toLowerCase() + "/" + biomeId.toLowerCase(Locale.ROOT); - } } diff --git a/platforms/minestom/src/main/java/com/dfsek/terra/minestom/biome/MinestomUserDefinedBiomePool.java b/platforms/minestom/src/main/java/com/dfsek/terra/minestom/biome/MinestomUserDefinedBiomePool.java index 138d98887..f5aee7fb8 100644 --- a/platforms/minestom/src/main/java/com/dfsek/terra/minestom/biome/MinestomUserDefinedBiomePool.java +++ b/platforms/minestom/src/main/java/com/dfsek/terra/minestom/biome/MinestomUserDefinedBiomePool.java @@ -1,11 +1,11 @@ package com.dfsek.terra.minestom.biome; +import java.util.HashMap; + import com.dfsek.terra.api.config.ConfigPack; import com.dfsek.terra.api.world.biome.Biome; import com.dfsek.terra.minestom.api.BiomeFactory; -import java.util.HashMap; - public class MinestomUserDefinedBiomePool { private final HashMap biomes = new HashMap<>(); diff --git a/platforms/minestom/src/main/java/com/dfsek/terra/minestom/block/DefaultBlockEntityFactory.java b/platforms/minestom/src/main/java/com/dfsek/terra/minestom/block/DefaultBlockEntityFactory.java index 28712a4c0..a816ba441 100644 --- a/platforms/minestom/src/main/java/com/dfsek/terra/minestom/block/DefaultBlockEntityFactory.java +++ b/platforms/minestom/src/main/java/com/dfsek/terra/minestom/block/DefaultBlockEntityFactory.java @@ -1,11 +1,11 @@ package com.dfsek.terra.minestom.block; -import com.dfsek.terra.api.block.entity.BlockEntity; -import com.dfsek.terra.minestom.api.BlockEntityFactory; - import net.minestom.server.coordinate.BlockVec; import net.minestom.server.instance.Instance; +import com.dfsek.terra.api.block.entity.BlockEntity; +import com.dfsek.terra.minestom.api.BlockEntityFactory; + public class DefaultBlockEntityFactory implements BlockEntityFactory { private final Instance instance; diff --git a/platforms/minestom/src/main/java/com/dfsek/terra/minestom/block/MinestomBlockEntity.java b/platforms/minestom/src/main/java/com/dfsek/terra/minestom/block/MinestomBlockEntity.java index e96caf0d9..059bcf7f4 100644 --- a/platforms/minestom/src/main/java/com/dfsek/terra/minestom/block/MinestomBlockEntity.java +++ b/platforms/minestom/src/main/java/com/dfsek/terra/minestom/block/MinestomBlockEntity.java @@ -1,15 +1,13 @@ package com.dfsek.terra.minestom.block; import com.dfsek.seismic.type.vector.Vector3; - -import com.dfsek.terra.api.block.entity.BlockEntity; - -import com.dfsek.terra.api.block.state.BlockState; - import net.minestom.server.coordinate.BlockVec; import net.minestom.server.instance.Instance; import net.minestom.server.instance.block.Block; +import com.dfsek.terra.api.block.entity.BlockEntity; +import com.dfsek.terra.api.block.state.BlockState; + public class MinestomBlockEntity implements BlockEntity { private final Instance instance; diff --git a/platforms/minestom/src/main/java/com/dfsek/terra/minestom/block/MinestomBlockState.java b/platforms/minestom/src/main/java/com/dfsek/terra/minestom/block/MinestomBlockState.java index d26470dae..f0a97590d 100644 --- a/platforms/minestom/src/main/java/com/dfsek/terra/minestom/block/MinestomBlockState.java +++ b/platforms/minestom/src/main/java/com/dfsek/terra/minestom/block/MinestomBlockState.java @@ -1,15 +1,15 @@ package com.dfsek.terra.minestom.block; -import com.dfsek.terra.api.block.BlockType; -import com.dfsek.terra.api.block.state.BlockState; -import com.dfsek.terra.api.block.state.properties.Property; - import net.minestom.server.instance.block.Block; import java.util.HashMap; import java.util.Objects; import java.util.stream.Collectors; +import com.dfsek.terra.api.block.BlockType; +import com.dfsek.terra.api.block.state.BlockState; +import com.dfsek.terra.api.block.state.properties.Property; + public class MinestomBlockState implements BlockState { private final Block block; diff --git a/platforms/minestom/src/main/java/com/dfsek/terra/minestom/block/MinestomBlockType.java b/platforms/minestom/src/main/java/com/dfsek/terra/minestom/block/MinestomBlockType.java index 803f13bc3..e8602306f 100644 --- a/platforms/minestom/src/main/java/com/dfsek/terra/minestom/block/MinestomBlockType.java +++ b/platforms/minestom/src/main/java/com/dfsek/terra/minestom/block/MinestomBlockType.java @@ -1,10 +1,10 @@ package com.dfsek.terra.minestom.block; +import net.minestom.server.instance.block.Block; + import com.dfsek.terra.api.block.BlockType; import com.dfsek.terra.api.block.state.BlockState; -import net.minestom.server.instance.block.Block; - public class MinestomBlockType implements BlockType { private final Block block; diff --git a/platforms/minestom/src/main/java/com/dfsek/terra/minestom/chunk/CachedChunk.java b/platforms/minestom/src/main/java/com/dfsek/terra/minestom/chunk/CachedChunk.java index c56336b20..5c0f030e4 100644 --- a/platforms/minestom/src/main/java/com/dfsek/terra/minestom/chunk/CachedChunk.java +++ b/platforms/minestom/src/main/java/com/dfsek/terra/minestom/chunk/CachedChunk.java @@ -1,23 +1,16 @@ package com.dfsek.terra.minestom.chunk; -import com.dfsek.terra.api.block.state.BlockState; - -import com.dfsek.terra.api.util.Column; -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.ProtoChunk; -import com.dfsek.terra.minestom.biome.MinestomBiome; -import com.dfsek.terra.minestom.block.MinestomBlockState; - -import net.minestom.server.coordinate.Point; import net.minestom.server.instance.block.Block; -import net.minestom.server.instance.generator.GenerationUnit; import net.minestom.server.instance.generator.UnitModifier; import org.jetbrains.annotations.NotNull; import java.util.Arrays; +import com.dfsek.terra.api.block.state.BlockState; +import com.dfsek.terra.api.world.chunk.generation.ProtoChunk; +import com.dfsek.terra.minestom.block.MinestomBlockState; + public class CachedChunk implements ProtoChunk { private final int minHeight; diff --git a/platforms/minestom/src/main/java/com/dfsek/terra/minestom/chunk/GeneratedChunkCache.java b/platforms/minestom/src/main/java/com/dfsek/terra/minestom/chunk/GeneratedChunkCache.java index 38064b86f..a84477fef 100644 --- a/platforms/minestom/src/main/java/com/dfsek/terra/minestom/chunk/GeneratedChunkCache.java +++ b/platforms/minestom/src/main/java/com/dfsek/terra/minestom/chunk/GeneratedChunkCache.java @@ -1,11 +1,5 @@ package com.dfsek.terra.minestom.chunk; -import com.dfsek.terra.api.util.generic.pair.Pair; - -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.github.benmanes.caffeine.cache.Caffeine; import com.github.benmanes.caffeine.cache.LoadingCache; import com.github.benmanes.caffeine.cache.stats.CacheStats; @@ -13,6 +7,11 @@ import net.minestom.server.world.DimensionType; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import com.dfsek.terra.api.util.generic.pair.Pair; +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; + public class GeneratedChunkCache { private static final Logger log = LoggerFactory.getLogger(GeneratedChunkCache.class); diff --git a/platforms/minestom/src/main/java/com/dfsek/terra/minestom/chunk/TerraMinestomChunk.java b/platforms/minestom/src/main/java/com/dfsek/terra/minestom/chunk/TerraMinestomChunk.java index fdcf01aa7..4056f9bf9 100644 --- a/platforms/minestom/src/main/java/com/dfsek/terra/minestom/chunk/TerraMinestomChunk.java +++ b/platforms/minestom/src/main/java/com/dfsek/terra/minestom/chunk/TerraMinestomChunk.java @@ -1,18 +1,17 @@ package com.dfsek.terra.minestom.chunk; -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.minestom.block.MinestomBlockState; - import net.minestom.server.instance.block.Block; import org.jetbrains.annotations.NotNull; +import com.dfsek.terra.api.block.state.BlockState; +import com.dfsek.terra.api.world.ServerWorld; +import com.dfsek.terra.api.world.chunk.Chunk; +import com.dfsek.terra.minestom.block.MinestomBlockState; + public class TerraMinestomChunk implements Chunk { - private net.minestom.server.instance.Chunk delegate; private final ServerWorld world; + private net.minestom.server.instance.Chunk delegate; public TerraMinestomChunk(net.minestom.server.instance.Chunk delegate, ServerWorld world) { this.delegate = delegate; diff --git a/platforms/minestom/src/main/java/com/dfsek/terra/minestom/config/KeyLoader.java b/platforms/minestom/src/main/java/com/dfsek/terra/minestom/config/KeyLoader.java index 406e64674..64329307a 100644 --- a/platforms/minestom/src/main/java/com/dfsek/terra/minestom/config/KeyLoader.java +++ b/platforms/minestom/src/main/java/com/dfsek/terra/minestom/config/KeyLoader.java @@ -20,7 +20,7 @@ public class KeyLoader implements TypeLoader { @NotNull ConfigLoader configLoader, DepthTracker depthTracker ) throws LoadException { - if(!(o instanceof @Subst("a:o") String stringKey)) { + if(!(o instanceof @Subst("a:o")String stringKey)) { throw new LoadException("Value is not a String", depthTracker); } try { diff --git a/platforms/minestom/src/main/java/com/dfsek/terra/minestom/config/RGBLikeLoader.java b/platforms/minestom/src/main/java/com/dfsek/terra/minestom/config/RGBLikeLoader.java index de998edb5..b89507d1f 100644 --- a/platforms/minestom/src/main/java/com/dfsek/terra/minestom/config/RGBLikeLoader.java +++ b/platforms/minestom/src/main/java/com/dfsek/terra/minestom/config/RGBLikeLoader.java @@ -4,8 +4,6 @@ import com.dfsek.tectonic.api.depth.DepthTracker; import com.dfsek.tectonic.api.exception.LoadException; import com.dfsek.tectonic.api.loader.ConfigLoader; import com.dfsek.tectonic.api.loader.type.TypeLoader; -import net.kyori.adventure.key.InvalidKeyException; -import net.kyori.adventure.key.Key; import net.kyori.adventure.util.RGBLike; import net.minestom.server.color.Color; import org.intellij.lang.annotations.Subst; @@ -22,7 +20,7 @@ public class RGBLikeLoader implements TypeLoader { @NotNull ConfigLoader configLoader, DepthTracker depthTracker ) throws LoadException { - if(!(o instanceof @Subst("a:o") Integer value)) { + if(!(o instanceof @Subst("a:o")Integer value)) { throw new LoadException("Value is not an integer", depthTracker); } return new Color(value); diff --git a/platforms/minestom/src/main/java/com/dfsek/terra/minestom/config/VanillaBiomeProperties.java b/platforms/minestom/src/main/java/com/dfsek/terra/minestom/config/VanillaBiomeProperties.java index ea82cd7e2..14b91b5c1 100644 --- a/platforms/minestom/src/main/java/com/dfsek/terra/minestom/config/VanillaBiomeProperties.java +++ b/platforms/minestom/src/main/java/com/dfsek/terra/minestom/config/VanillaBiomeProperties.java @@ -3,15 +3,14 @@ package com.dfsek.terra.minestom.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.terra.api.properties.Properties; - import net.kyori.adventure.util.RGBLike; import net.minestom.server.sound.SoundEvent; import net.minestom.server.world.biome.Biome.TemperatureModifier; import net.minestom.server.world.biome.BiomeEffects; import net.minestom.server.world.biome.BiomeEffects.GrassColorModifier; +import com.dfsek.terra.api.properties.Properties; + public class VanillaBiomeProperties implements ConfigTemplate, Properties { @Value("colors.grass") @@ -74,9 +73,9 @@ public class VanillaBiomeProperties implements ConfigTemplate, Properties { @Default private BiomeEffects.AdditionsSound additionsSound = null; -// @Value("sound.music") -// @Default -// private MusicSound music = null; + // @Value("sound.music") + // @Default + // private MusicSound music = null; public RGBLike getGrassColor() { return grassColor; diff --git a/platforms/minestom/src/main/java/com/dfsek/terra/minestom/entity/DefaultEntityFactory.java b/platforms/minestom/src/main/java/com/dfsek/terra/minestom/entity/DefaultEntityFactory.java index 23226fc99..c25e86cf5 100644 --- a/platforms/minestom/src/main/java/com/dfsek/terra/minestom/entity/DefaultEntityFactory.java +++ b/platforms/minestom/src/main/java/com/dfsek/terra/minestom/entity/DefaultEntityFactory.java @@ -1,10 +1,10 @@ package com.dfsek.terra.minestom.entity; -import com.dfsek.terra.minestom.api.EntityFactory; - import net.minestom.server.entity.Entity; import net.minestom.server.entity.EntityType; +import com.dfsek.terra.minestom.api.EntityFactory; + public class DefaultEntityFactory implements EntityFactory { @Override diff --git a/platforms/minestom/src/main/java/com/dfsek/terra/minestom/entity/DeferredMinestomEntity.java b/platforms/minestom/src/main/java/com/dfsek/terra/minestom/entity/DeferredMinestomEntity.java index 43179f730..965ab2050 100644 --- a/platforms/minestom/src/main/java/com/dfsek/terra/minestom/entity/DeferredMinestomEntity.java +++ b/platforms/minestom/src/main/java/com/dfsek/terra/minestom/entity/DeferredMinestomEntity.java @@ -1,13 +1,13 @@ package com.dfsek.terra.minestom.entity; +import com.dfsek.seismic.type.vector.Vector3; +import net.minestom.server.coordinate.Pos; + import com.dfsek.terra.api.entity.Entity; import com.dfsek.terra.api.entity.EntityType; -import com.dfsek.seismic.type.vector.Vector3; import com.dfsek.terra.api.world.ServerWorld; import com.dfsek.terra.minestom.world.TerraMinestomWorld; -import net.minestom.server.coordinate.Pos; - public class DeferredMinestomEntity implements Entity { private final EntityType type; diff --git a/platforms/minestom/src/main/java/com/dfsek/terra/minestom/entity/MinestomEntity.java b/platforms/minestom/src/main/java/com/dfsek/terra/minestom/entity/MinestomEntity.java index 055d16153..0818b19fa 100644 --- a/platforms/minestom/src/main/java/com/dfsek/terra/minestom/entity/MinestomEntity.java +++ b/platforms/minestom/src/main/java/com/dfsek/terra/minestom/entity/MinestomEntity.java @@ -1,16 +1,15 @@ package com.dfsek.terra.minestom.entity; -import com.dfsek.terra.api.entity.EntityType; import com.dfsek.seismic.type.vector.Vector3; -import com.dfsek.terra.api.world.ServerWorld; - -import com.dfsek.terra.minestom.MinestomAdapter; -import com.dfsek.terra.minestom.world.TerraMinestomWorld; - import net.minestom.server.coordinate.Pos; import net.minestom.server.entity.Entity; import net.minestom.server.instance.Instance; +import com.dfsek.terra.api.entity.EntityType; +import com.dfsek.terra.api.world.ServerWorld; +import com.dfsek.terra.minestom.MinestomAdapter; +import com.dfsek.terra.minestom.world.TerraMinestomWorld; + public class MinestomEntity implements com.dfsek.terra.api.entity.Entity { private final Entity delegate; @@ -21,6 +20,13 @@ public class MinestomEntity implements com.dfsek.terra.api.entity.Entity { this.world = world; } + public static MinestomEntity spawn(double x, double y, double z, EntityType type, TerraMinestomWorld world) { + Instance instance = world.getHandle(); + Entity entity = world.getEntityFactory().createEntity(((MinestomEntityType) type).getHandle()); + entity.setInstance(instance, new Pos(x, y, z)); + return new MinestomEntity(entity, world); + } + @Override public Vector3 position() { return MinestomAdapter.adapt(delegate.getPosition()); @@ -45,11 +51,4 @@ public class MinestomEntity implements com.dfsek.terra.api.entity.Entity { public Object getHandle() { return delegate; } - - public static MinestomEntity spawn(double x, double y, double z, EntityType type, TerraMinestomWorld world) { - Instance instance = world.getHandle(); - Entity entity = world.getEntityFactory().createEntity(((MinestomEntityType) type).getHandle()); - entity.setInstance(instance, new Pos(x, y, z)); - return new MinestomEntity(entity, world); - } } diff --git a/platforms/minestom/src/main/java/com/dfsek/terra/minestom/entity/MinestomEntityType.java b/platforms/minestom/src/main/java/com/dfsek/terra/minestom/entity/MinestomEntityType.java index 825fde33e..1efa1cbd5 100644 --- a/platforms/minestom/src/main/java/com/dfsek/terra/minestom/entity/MinestomEntityType.java +++ b/platforms/minestom/src/main/java/com/dfsek/terra/minestom/entity/MinestomEntityType.java @@ -2,6 +2,7 @@ package com.dfsek.terra.minestom.entity; import net.minestom.server.entity.EntityType; + public class MinestomEntityType implements com.dfsek.terra.api.entity.EntityType { private final EntityType delegate; diff --git a/platforms/minestom/src/main/java/com/dfsek/terra/minestom/item/MinestomEnchantment.java b/platforms/minestom/src/main/java/com/dfsek/terra/minestom/item/MinestomEnchantment.java index 75c0006f9..26ab94cac 100644 --- a/platforms/minestom/src/main/java/com/dfsek/terra/minestom/item/MinestomEnchantment.java +++ b/platforms/minestom/src/main/java/com/dfsek/terra/minestom/item/MinestomEnchantment.java @@ -1,8 +1,5 @@ package com.dfsek.terra.minestom.item; -import com.dfsek.terra.api.inventory.ItemStack; -import com.dfsek.terra.api.inventory.item.Enchantment; - import net.kyori.adventure.key.Key; import net.minestom.server.MinecraftServer; import net.minestom.server.item.Material; @@ -11,6 +8,9 @@ import net.minestom.server.registry.RegistryKey; import java.util.Objects; +import com.dfsek.terra.api.inventory.ItemStack; +import com.dfsek.terra.api.inventory.item.Enchantment; + public class MinestomEnchantment implements Enchantment { private final net.minestom.server.item.enchant.Enchantment delegate; @@ -43,7 +43,7 @@ public class MinestomEnchantment implements Enchantment { DynamicRegistry registry = MinecraftServer.getEnchantmentRegistry(); RegistryKey otherKey = registry.getKey(otherDelegate); return delegate.exclusiveSet().contains(otherKey); - } catch (Exception e) { + } catch(Exception e) { // If the key approach fails, fall back to a more basic implementation String otherId = ((MinestomEnchantment) other).id; return otherId.equals(this.id); diff --git a/platforms/minestom/src/main/java/com/dfsek/terra/minestom/item/MinestomItemHandle.java b/platforms/minestom/src/main/java/com/dfsek/terra/minestom/item/MinestomItemHandle.java index c31983ed3..dddc4c738 100644 --- a/platforms/minestom/src/main/java/com/dfsek/terra/minestom/item/MinestomItemHandle.java +++ b/platforms/minestom/src/main/java/com/dfsek/terra/minestom/item/MinestomItemHandle.java @@ -1,14 +1,14 @@ package com.dfsek.terra.minestom.item; -import com.dfsek.terra.api.handle.ItemHandle; -import com.dfsek.terra.api.inventory.Item; -import com.dfsek.terra.api.inventory.item.Enchantment; - import net.minestom.server.MinecraftServer; import java.util.Set; import java.util.stream.Collectors; +import com.dfsek.terra.api.handle.ItemHandle; +import com.dfsek.terra.api.inventory.Item; +import com.dfsek.terra.api.inventory.item.Enchantment; + public class MinestomItemHandle implements ItemHandle { @Override diff --git a/platforms/minestom/src/main/java/com/dfsek/terra/minestom/item/MinestomItemMeta.java b/platforms/minestom/src/main/java/com/dfsek/terra/minestom/item/MinestomItemMeta.java index 861a9549c..c239527ef 100644 --- a/platforms/minestom/src/main/java/com/dfsek/terra/minestom/item/MinestomItemMeta.java +++ b/platforms/minestom/src/main/java/com/dfsek/terra/minestom/item/MinestomItemMeta.java @@ -1,11 +1,11 @@ package com.dfsek.terra.minestom.item; -import com.dfsek.terra.api.inventory.item.Enchantment; -import com.dfsek.terra.api.inventory.item.ItemMeta; - import java.util.HashMap; import java.util.Map; +import com.dfsek.terra.api.inventory.item.Enchantment; +import com.dfsek.terra.api.inventory.item.ItemMeta; + public class MinestomItemMeta implements ItemMeta { private final HashMap enchantments; diff --git a/platforms/minestom/src/main/java/com/dfsek/terra/minestom/item/MinestomItemStack.java b/platforms/minestom/src/main/java/com/dfsek/terra/minestom/item/MinestomItemStack.java index 1d90e4896..04256c4c0 100644 --- a/platforms/minestom/src/main/java/com/dfsek/terra/minestom/item/MinestomItemStack.java +++ b/platforms/minestom/src/main/java/com/dfsek/terra/minestom/item/MinestomItemStack.java @@ -1,10 +1,5 @@ package com.dfsek.terra.minestom.item; -import com.dfsek.terra.api.inventory.Item; - -import com.dfsek.terra.api.inventory.item.Enchantment; -import com.dfsek.terra.api.inventory.item.ItemMeta; - import net.minestom.server.MinecraftServer; import net.minestom.server.component.DataComponents; import net.minestom.server.item.ItemStack; @@ -16,6 +11,10 @@ import org.jetbrains.annotations.NotNull; import java.util.HashMap; import java.util.Objects; +import com.dfsek.terra.api.inventory.Item; +import com.dfsek.terra.api.inventory.item.Enchantment; +import com.dfsek.terra.api.inventory.item.ItemMeta; + public class MinestomItemStack implements com.dfsek.terra.api.inventory.ItemStack { private ItemStack base; diff --git a/platforms/minestom/src/main/java/com/dfsek/terra/minestom/item/MinestomMaterial.java b/platforms/minestom/src/main/java/com/dfsek/terra/minestom/item/MinestomMaterial.java index 77aa8777d..805fd3f6a 100644 --- a/platforms/minestom/src/main/java/com/dfsek/terra/minestom/item/MinestomMaterial.java +++ b/platforms/minestom/src/main/java/com/dfsek/terra/minestom/item/MinestomMaterial.java @@ -1,9 +1,10 @@ package com.dfsek.terra.minestom.item; +import net.minestom.server.item.Material; + import com.dfsek.terra.api.inventory.Item; import com.dfsek.terra.api.inventory.ItemStack; -import net.minestom.server.item.Material; public class MinestomMaterial implements Item { private final Material delegate; diff --git a/platforms/minestom/src/main/java/com/dfsek/terra/minestom/world/MinestomChunkGeneratorWrapper.java b/platforms/minestom/src/main/java/com/dfsek/terra/minestom/world/MinestomChunkGeneratorWrapper.java index 418f5de0c..4f20d6ec2 100644 --- a/platforms/minestom/src/main/java/com/dfsek/terra/minestom/world/MinestomChunkGeneratorWrapper.java +++ b/platforms/minestom/src/main/java/com/dfsek/terra/minestom/world/MinestomChunkGeneratorWrapper.java @@ -1,10 +1,15 @@ package com.dfsek.terra.minestom.world; +import net.minestom.server.coordinate.Point; +import net.minestom.server.instance.generator.GenerationUnit; +import net.minestom.server.instance.generator.Generator; +import net.minestom.server.instance.generator.UnitModifier; +import org.jetbrains.annotations.NotNull; + import com.dfsek.terra.api.Platform; import com.dfsek.terra.api.config.ConfigPack; 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.stage.GenerationStage; import com.dfsek.terra.api.world.chunk.generation.util.GeneratorWrapper; import com.dfsek.terra.minestom.biome.MinestomUserDefinedBiomePool; @@ -12,23 +17,15 @@ import com.dfsek.terra.minestom.biome.UserDefinedBiome; import com.dfsek.terra.minestom.chunk.CachedChunk; import com.dfsek.terra.minestom.chunk.GeneratedChunkCache; -import net.minestom.server.MinecraftServer; -import net.minestom.server.coordinate.Point; -import net.minestom.server.entity.Player; -import net.minestom.server.instance.generator.GenerationUnit; -import net.minestom.server.instance.generator.Generator; -import net.minestom.server.instance.generator.UnitModifier; -import org.jetbrains.annotations.NotNull; - public class MinestomChunkGeneratorWrapper implements Generator, GeneratorWrapper { private final GeneratedChunkCache cache; - private ChunkGenerator generator; private final TerraMinestomWorld world; private final BiomeProvider biomeProvider; private final boolean doFineGrainedBiomes; - private ConfigPack pack; private final MinestomUserDefinedBiomePool biomePool; + private ChunkGenerator generator; + private ConfigPack pack; public MinestomChunkGeneratorWrapper( Platform platform, diff --git a/platforms/minestom/src/main/java/com/dfsek/terra/minestom/world/MinestomProtoWorld.java b/platforms/minestom/src/main/java/com/dfsek/terra/minestom/world/MinestomProtoWorld.java index e29cc5d76..44afc9353 100644 --- a/platforms/minestom/src/main/java/com/dfsek/terra/minestom/world/MinestomProtoWorld.java +++ b/platforms/minestom/src/main/java/com/dfsek/terra/minestom/world/MinestomProtoWorld.java @@ -1,28 +1,21 @@ package com.dfsek.terra.minestom.world; +import net.minestom.server.instance.block.Block; +import net.minestom.server.instance.block.Block.Setter; + 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.generic.pair.Pair; 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.minestom.chunk.CachedChunk; import com.dfsek.terra.minestom.chunk.GeneratedChunkCache; - import com.dfsek.terra.minestom.entity.DeferredMinestomEntity; -import net.minestom.server.instance.block.Block; -import net.minestom.server.instance.block.Block.Setter; - -import java.lang.ref.WeakReference; -import java.util.HashMap; -import java.util.HashSet; -import java.util.WeakHashMap; - public class MinestomProtoWorld implements ProtoWorld { private final GeneratedChunkCache cache; diff --git a/platforms/minestom/src/main/java/com/dfsek/terra/minestom/world/MinestomWorldHandle.java b/platforms/minestom/src/main/java/com/dfsek/terra/minestom/world/MinestomWorldHandle.java index 98429ab6d..777850952 100644 --- a/platforms/minestom/src/main/java/com/dfsek/terra/minestom/world/MinestomWorldHandle.java +++ b/platforms/minestom/src/main/java/com/dfsek/terra/minestom/world/MinestomWorldHandle.java @@ -1,15 +1,14 @@ package com.dfsek.terra.minestom.world; +import net.minestom.server.instance.block.Block; +import org.jetbrains.annotations.NotNull; + import com.dfsek.terra.api.block.state.BlockState; import com.dfsek.terra.api.entity.EntityType; import com.dfsek.terra.api.handle.WorldHandle; - import com.dfsek.terra.minestom.block.MinestomBlockState; import com.dfsek.terra.minestom.entity.MinestomEntityType; -import net.minestom.server.instance.block.Block; -import org.jetbrains.annotations.NotNull; - public class MinestomWorldHandle implements WorldHandle { private static final MinestomBlockState AIR = new MinestomBlockState(Block.AIR); diff --git a/platforms/minestom/src/main/java/com/dfsek/terra/minestom/world/TerraMinestomWorld.java b/platforms/minestom/src/main/java/com/dfsek/terra/minestom/world/TerraMinestomWorld.java index df38b5dd2..9e1529d90 100644 --- a/platforms/minestom/src/main/java/com/dfsek/terra/minestom/world/TerraMinestomWorld.java +++ b/platforms/minestom/src/main/java/com/dfsek/terra/minestom/world/TerraMinestomWorld.java @@ -1,27 +1,5 @@ package com.dfsek.terra.minestom.world; -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.biome.generation.BiomeProvider; -import com.dfsek.terra.api.world.chunk.Chunk; - -import com.dfsek.terra.api.world.chunk.generation.ChunkGenerator; - -import com.dfsek.terra.api.world.info.WorldProperties; - -import com.dfsek.terra.minestom.TerraMinestomPlatform; -import com.dfsek.terra.minestom.api.BlockEntityFactory; -import com.dfsek.terra.minestom.api.EntityFactory; -import com.dfsek.terra.minestom.api.BiomeFactory; -import com.dfsek.terra.minestom.biome.MinestomUserDefinedBiomeFactory; -import com.dfsek.terra.minestom.biome.MinestomUserDefinedBiomePool; -import com.dfsek.terra.minestom.block.MinestomBlockState; -import com.dfsek.terra.minestom.entity.MinestomEntity; - import net.minestom.server.MinecraftServer; import net.minestom.server.coordinate.BlockVec; import net.minestom.server.coordinate.Point; @@ -31,6 +9,24 @@ import net.minestom.server.world.DimensionType; import java.util.function.Consumer; +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.biome.generation.BiomeProvider; +import com.dfsek.terra.api.world.chunk.Chunk; +import com.dfsek.terra.api.world.chunk.generation.ChunkGenerator; +import com.dfsek.terra.api.world.info.WorldProperties; +import com.dfsek.terra.minestom.TerraMinestomPlatform; +import com.dfsek.terra.minestom.api.BiomeFactory; +import com.dfsek.terra.minestom.api.BlockEntityFactory; +import com.dfsek.terra.minestom.api.EntityFactory; +import com.dfsek.terra.minestom.biome.MinestomUserDefinedBiomePool; +import com.dfsek.terra.minestom.block.MinestomBlockState; +import com.dfsek.terra.minestom.entity.MinestomEntity; + public final class TerraMinestomWorld implements ServerWorld, WorldProperties { private final Instance instance; diff --git a/platforms/mixin-common/src/main/java/com/dfsek/terra/mod/ModPlatform.java b/platforms/mixin-common/src/main/java/com/dfsek/terra/mod/ModPlatform.java index e44230f61..8e27b67ff 100644 --- a/platforms/mixin-common/src/main/java/com/dfsek/terra/mod/ModPlatform.java +++ b/platforms/mixin-common/src/main/java/com/dfsek/terra/mod/ModPlatform.java @@ -67,7 +67,7 @@ public abstract class ModPlatform extends AbstractPlatform { }); getRawConfigRegistry() .forEach(pack -> { - PresetUtil.createDefault(pack, this, configPacksInMetaPack.contains(pack.getID())).apply(registerFunction); + PresetUtil.createDefault(pack, this, configPacksInMetaPack.contains(pack.getID())).apply(registerFunction); }); } diff --git a/platforms/mixin-common/src/main/java/com/dfsek/terra/mod/config/SpawnEntryConfig.java b/platforms/mixin-common/src/main/java/com/dfsek/terra/mod/config/SpawnEntryConfig.java index acc6b1784..79eebc357 100644 --- a/platforms/mixin-common/src/main/java/com/dfsek/terra/mod/config/SpawnEntryConfig.java +++ b/platforms/mixin-common/src/main/java/com/dfsek/terra/mod/config/SpawnEntryConfig.java @@ -8,6 +8,7 @@ import net.minecraft.world.biome.SpawnSettings.SpawnEntry; import com.dfsek.terra.api.util.range.Range; + public class SpawnEntryConfig implements ObjectTemplate { @Value("type") @Default diff --git a/platforms/mixin-common/src/main/java/com/dfsek/terra/mod/config/VillagerTypeTemplate.java b/platforms/mixin-common/src/main/java/com/dfsek/terra/mod/config/VillagerTypeTemplate.java index 66a8951f2..14ac01df9 100644 --- a/platforms/mixin-common/src/main/java/com/dfsek/terra/mod/config/VillagerTypeTemplate.java +++ b/platforms/mixin-common/src/main/java/com/dfsek/terra/mod/config/VillagerTypeTemplate.java @@ -3,7 +3,6 @@ package com.dfsek.terra.mod.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.object.ObjectTemplate; -import net.minecraft.registry.Registries; import net.minecraft.registry.RegistryKey; import net.minecraft.registry.RegistryKeys; import net.minecraft.util.Identifier; diff --git a/platforms/mixin-common/src/main/java/com/dfsek/terra/mod/generation/TerraBiomeSource.java b/platforms/mixin-common/src/main/java/com/dfsek/terra/mod/generation/TerraBiomeSource.java index 97be6fc49..1d5910082 100644 --- a/platforms/mixin-common/src/main/java/com/dfsek/terra/mod/generation/TerraBiomeSource.java +++ b/platforms/mixin-common/src/main/java/com/dfsek/terra/mod/generation/TerraBiomeSource.java @@ -21,7 +21,6 @@ import com.mojang.serialization.MapCodec; import net.minecraft.registry.entry.RegistryEntry; import net.minecraft.world.biome.Biome; import net.minecraft.world.biome.source.BiomeSource; -import net.minecraft.world.biome.source.util.MultiNoiseUtil; import net.minecraft.world.biome.source.util.MultiNoiseUtil.MultiNoiseSampler; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/platforms/mixin-common/src/main/java/com/dfsek/terra/mod/mixin/generalize/ServerWorldMixin.java b/platforms/mixin-common/src/main/java/com/dfsek/terra/mod/mixin/generalize/ServerWorldMixin.java index b22b3c49f..364f6fbb6 100644 --- a/platforms/mixin-common/src/main/java/com/dfsek/terra/mod/mixin/generalize/ServerWorldMixin.java +++ b/platforms/mixin-common/src/main/java/com/dfsek/terra/mod/mixin/generalize/ServerWorldMixin.java @@ -1,21 +1,14 @@ package com.dfsek.terra.mod.mixin.generalize; -import net.minecraft.registry.DynamicRegistryManager; -import net.minecraft.registry.Registry; import net.minecraft.registry.RegistryKey; -import net.minecraft.registry.RegistryKeys; import net.minecraft.registry.entry.RegistryEntry; import net.minecraft.server.MinecraftServer; import net.minecraft.server.WorldGenerationProgressListener; import net.minecraft.server.world.ServerWorld; import net.minecraft.util.math.random.RandomSequencesState; -import net.minecraft.util.profiler.Profiler; -import net.minecraft.village.raid.RaidManager; -import net.minecraft.world.MutableWorldProperties; import net.minecraft.world.World; import net.minecraft.world.dimension.DimensionOptions; -import net.minecraft.world.dimension.DimensionType; import net.minecraft.world.dimension.DimensionTypes; import net.minecraft.world.level.ServerWorldProperties; import net.minecraft.world.level.storage.LevelStorage; @@ -27,13 +20,16 @@ import org.spongepowered.asm.mixin.injection.Redirect; import java.util.List; import java.util.concurrent.Executor; -import java.util.function.Supplier; @Mixin(ServerWorld.class) public abstract class ServerWorldMixin extends World { - public ServerWorldMixin(MinecraftServer server, Executor workerExecutor, LevelStorage.Session session, ServerWorldProperties properties, RegistryKey worldKey, DimensionOptions dimensionOptions, WorldGenerationProgressListener worldGenerationProgressListener, boolean debugWorld, long seed, List spawners, boolean shouldTickTime, @Nullable RandomSequencesState randomSequencesState) { - super(properties, worldKey, server.getRegistryManager(), dimensionOptions.dimensionTypeEntry(), false, debugWorld, seed, server.getMaxChainedNeighborUpdates()); + public ServerWorldMixin(MinecraftServer server, Executor workerExecutor, LevelStorage.Session session, ServerWorldProperties properties, + RegistryKey worldKey, DimensionOptions dimensionOptions, + WorldGenerationProgressListener worldGenerationProgressListener, boolean debugWorld, long seed, + List spawners, boolean shouldTickTime, @Nullable RandomSequencesState randomSequencesState) { + super(properties, worldKey, server.getRegistryManager(), dimensionOptions.dimensionTypeEntry(), false, debugWorld, seed, + server.getMaxChainedNeighborUpdates()); } @Redirect(method = "", diff --git a/platforms/mixin-common/src/main/java/com/dfsek/terra/mod/mixin/implementations/terra/block/entity/MobSpawnerBlockEntityMixin.java b/platforms/mixin-common/src/main/java/com/dfsek/terra/mod/mixin/implementations/terra/block/entity/MobSpawnerBlockEntityMixin.java index 10271cf33..002759eb4 100644 --- a/platforms/mixin-common/src/main/java/com/dfsek/terra/mod/mixin/implementations/terra/block/entity/MobSpawnerBlockEntityMixin.java +++ b/platforms/mixin-common/src/main/java/com/dfsek/terra/mod/mixin/implementations/terra/block/entity/MobSpawnerBlockEntityMixin.java @@ -55,7 +55,8 @@ public abstract class MobSpawnerBlockEntityMixin extends BlockEntity { public EntityType terra$getSpawnedType() { return (EntityType) Registries.ENTITY_TYPE.getEntry( - Identifier.tryParse(((MobSpawnerLogicAccessor) getLogic()).getSpawnEntry().getNbt().getString("id").orElseThrow())).orElseThrow(); + Identifier.tryParse(((MobSpawnerLogicAccessor) getLogic()).getSpawnEntry().getNbt().getString("id").orElseThrow())) + .orElseThrow(); } public void terra$setSpawnedType(@NotNull EntityType creatureType) { diff --git a/platforms/mixin-common/src/main/java/com/dfsek/terra/mod/mixin/implementations/terra/chunk/WorldChunkMixin.java b/platforms/mixin-common/src/main/java/com/dfsek/terra/mod/mixin/implementations/terra/chunk/WorldChunkMixin.java index 53317b7f5..4e92d76b2 100644 --- a/platforms/mixin-common/src/main/java/com/dfsek/terra/mod/mixin/implementations/terra/chunk/WorldChunkMixin.java +++ b/platforms/mixin-common/src/main/java/com/dfsek/terra/mod/mixin/implementations/terra/chunk/WorldChunkMixin.java @@ -18,7 +18,6 @@ package com.dfsek.terra.mod.mixin.implementations.terra.chunk; import net.minecraft.util.math.BlockPos; -import net.minecraft.world.chunk.Chunk.TickSchedulers; import net.minecraft.world.chunk.WorldChunk; import net.minecraft.world.tick.OrderedTick; import org.jetbrains.annotations.NotNull; diff --git a/platforms/mixin-common/src/main/java/com/dfsek/terra/mod/mixin/implementations/terra/entity/EntityMixin.java b/platforms/mixin-common/src/main/java/com/dfsek/terra/mod/mixin/implementations/terra/entity/EntityMixin.java index dfe6d8d96..7bc47dc62 100644 --- a/platforms/mixin-common/src/main/java/com/dfsek/terra/mod/mixin/implementations/terra/entity/EntityMixin.java +++ b/platforms/mixin-common/src/main/java/com/dfsek/terra/mod/mixin/implementations/terra/entity/EntityMixin.java @@ -17,6 +17,7 @@ package com.dfsek.terra.mod.mixin.implementations.terra.entity; +import com.dfsek.seismic.type.vector.Vector3; import net.minecraft.entity.Entity; import net.minecraft.util.math.BlockPos; import org.spongepowered.asm.mixin.Implements; @@ -24,7 +25,6 @@ import org.spongepowered.asm.mixin.Interface; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Shadow; -import com.dfsek.seismic.type.vector.Vector3; import com.dfsek.terra.api.world.ServerWorld; import com.dfsek.terra.mod.util.MinecraftAdapter; diff --git a/platforms/mixin-common/src/main/java/com/dfsek/terra/mod/mixin/lifecycle/DataPackContentsMixin.java b/platforms/mixin-common/src/main/java/com/dfsek/terra/mod/mixin/lifecycle/DataPackContentsMixin.java index 0fa4006cc..ee7864d3b 100644 --- a/platforms/mixin-common/src/main/java/com/dfsek/terra/mod/mixin/lifecycle/DataPackContentsMixin.java +++ b/platforms/mixin-common/src/main/java/com/dfsek/terra/mod/mixin/lifecycle/DataPackContentsMixin.java @@ -17,17 +17,15 @@ import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Shadow; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; -import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; - -import com.dfsek.terra.mod.util.MinecraftUtil; -import com.dfsek.terra.mod.util.TagUtil; - import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; import java.util.List; import java.util.concurrent.CompletableFuture; import java.util.concurrent.Executor; +import com.dfsek.terra.mod.util.MinecraftUtil; +import com.dfsek.terra.mod.util.TagUtil; + @Mixin(DataPackContents.class) public class DataPackContentsMixin { @@ -38,7 +36,11 @@ public class DataPackContentsMixin { /* * #refresh populates all tags in the registries */ - @Inject(method = "reload(Lnet/minecraft/resource/ResourceManager;Lnet/minecraft/registry/CombinedDynamicRegistries;Ljava/util/List;Lnet/minecraft/resource/featuretoggle/FeatureSet;Lnet/minecraft/server/command/CommandManager$RegistrationEnvironment;ILjava/util/concurrent/Executor;Ljava/util/concurrent/Executor;)Ljava/util/concurrent/CompletableFuture;", at = @At("RETURN")) + @Inject(method = "reload(Lnet/minecraft/resource/ResourceManager;Lnet/minecraft/registry/CombinedDynamicRegistries;Ljava/util/List;" + + "Lnet/minecraft/resource/featuretoggle/FeatureSet;" + + "Lnet/minecraft/server/command/CommandManager$RegistrationEnvironment;ILjava/util/concurrent/Executor;" + + "Ljava/util/concurrent/Executor;)Ljava/util/concurrent/CompletableFuture;", + at = @At("RETURN")) private static void injectReload(ResourceManager resourceManager, CombinedDynamicRegistries dynamicRegistries, List> pendingTagLoads, FeatureSet enabledFeatures, diff --git a/platforms/mixin-common/src/main/java/com/dfsek/terra/mod/util/BiomeUtil.java b/platforms/mixin-common/src/main/java/com/dfsek/terra/mod/util/BiomeUtil.java index b3ee4c774..fc8304d09 100644 --- a/platforms/mixin-common/src/main/java/com/dfsek/terra/mod/util/BiomeUtil.java +++ b/platforms/mixin-common/src/main/java/com/dfsek/terra/mod/util/BiomeUtil.java @@ -5,6 +5,7 @@ import net.minecraft.util.Identifier; import net.minecraft.world.biome.Biome; import net.minecraft.world.biome.Biome.Builder; import net.minecraft.world.biome.BiomeEffects; +import net.minecraft.world.biome.GenerationSettings; import java.util.HashMap; import java.util.List; @@ -15,9 +16,6 @@ import java.util.Objects; import com.dfsek.terra.api.config.ConfigPack; import com.dfsek.terra.mod.config.VanillaBiomeProperties; import com.dfsek.terra.mod.mixin.access.BiomeAccessor; -import com.dfsek.terra.mod.mixin.invoke.BiomeInvoker; - -import net.minecraft.world.biome.GenerationSettings; public class BiomeUtil { diff --git a/platforms/mixin-common/src/main/java/com/dfsek/terra/mod/util/DimensionUtil.java b/platforms/mixin-common/src/main/java/com/dfsek/terra/mod/util/DimensionUtil.java index 1bccff4e5..2704d5f59 100644 --- a/platforms/mixin-common/src/main/java/com/dfsek/terra/mod/util/DimensionUtil.java +++ b/platforms/mixin-common/src/main/java/com/dfsek/terra/mod/util/DimensionUtil.java @@ -51,7 +51,9 @@ public class DimensionUtil { : TagKey.of(RegistryKeys.BLOCK, vanillaWorldProperties.getInfiniburn()), vanillaWorldProperties.getEffects() == null ? defaultDimension.effects() : vanillaWorldProperties.getEffects(), vanillaWorldProperties.getAmbientLight() == null ? defaultDimension.ambientLight() : vanillaWorldProperties.getAmbientLight(), - vanillaWorldProperties.getCloudHeight() == null ? defaultDimension.cloudHeight() : vanillaWorldProperties.getCloudHeight().describeConstable(), + vanillaWorldProperties.getCloudHeight() == null + ? defaultDimension.cloudHeight() + : vanillaWorldProperties.getCloudHeight().describeConstable(), monsterSettings ); } diff --git a/platforms/mixin-common/src/main/java/com/dfsek/terra/mod/util/MinecraftAdapter.java b/platforms/mixin-common/src/main/java/com/dfsek/terra/mod/util/MinecraftAdapter.java index 24ab38971..cb6f5c52c 100644 --- a/platforms/mixin-common/src/main/java/com/dfsek/terra/mod/util/MinecraftAdapter.java +++ b/platforms/mixin-common/src/main/java/com/dfsek/terra/mod/util/MinecraftAdapter.java @@ -17,13 +17,13 @@ package com.dfsek.terra.mod.util; +import com.dfsek.seismic.type.vector.Vector3; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.random.Random; import net.minecraft.world.HeightLimitView; import java.util.random.RandomGenerator; -import com.dfsek.seismic.type.vector.Vector3; import com.dfsek.terra.api.world.info.WorldProperties; diff --git a/platforms/mixin-common/src/main/java/com/dfsek/terra/mod/util/MinecraftUtil.java b/platforms/mixin-common/src/main/java/com/dfsek/terra/mod/util/MinecraftUtil.java index cef3c33c5..822e7cd89 100644 --- a/platforms/mixin-common/src/main/java/com/dfsek/terra/mod/util/MinecraftUtil.java +++ b/platforms/mixin-common/src/main/java/com/dfsek/terra/mod/util/MinecraftUtil.java @@ -43,7 +43,7 @@ public final class MinecraftUtil { public static Optional> getEntry(Registry registry, Identifier identifier) { return registry.getOptionalValue(identifier) - .flatMap(id -> Optional.ofNullable(registry.getEntry(id))); + .flatMap(id -> Optional.ofNullable(registry.getEntry(id))); } public static BlockEntity createState(WorldAccess worldAccess, BlockPos pos) { @@ -79,8 +79,8 @@ public final class MinecraftUtil { } private static void registerFlora(com.dfsek.terra.api.world.biome.Biome biome, ConfigPack pack, - com.dfsek.terra.api.registry.key.RegistryKey id, - Registry biomeRegistry) { + com.dfsek.terra.api.registry.key.RegistryKey id, + Registry biomeRegistry) { RegistryKey vanillaKey = ((ProtoPlatformBiome) biome.getPlatformBiome()).get(biomeRegistry); biomeRegistry.getOptionalValue(vanillaKey) .ifPresentOrElse(vanillaBiome -> { diff --git a/platforms/mixin-common/src/main/java/com/dfsek/terra/mod/util/PresetUtil.java b/platforms/mixin-common/src/main/java/com/dfsek/terra/mod/util/PresetUtil.java index f18c93632..0b5b5401f 100644 --- a/platforms/mixin-common/src/main/java/com/dfsek/terra/mod/util/PresetUtil.java +++ b/platforms/mixin-common/src/main/java/com/dfsek/terra/mod/util/PresetUtil.java @@ -27,8 +27,8 @@ import java.util.Locale; import com.dfsek.terra.api.config.ConfigPack; import com.dfsek.terra.api.config.MetaPack; -import com.dfsek.terra.api.util.range.ConstantRange; import com.dfsek.terra.api.util.generic.pair.Pair; +import com.dfsek.terra.api.util.range.ConstantRange; import com.dfsek.terra.mod.ModPlatform; import com.dfsek.terra.mod.config.VanillaWorldProperties; import com.dfsek.terra.mod.generation.GenerationSettings; @@ -146,13 +146,15 @@ public class PresetUtil { Registry multiNoiseBiomeSourceParameterLists, Registry biomeRegistry, HashMap, DimensionOptions> map) { if(!map.containsKey(DimensionOptions.OVERWORLD)) { - RegistryEntry overworldDimensionType = dimensionTypeRegistry.getEntry(dimensionTypeRegistry.get(DimensionTypes.OVERWORLD)); + RegistryEntry overworldDimensionType = dimensionTypeRegistry.getEntry( + dimensionTypeRegistry.get(DimensionTypes.OVERWORLD)); RegistryEntry overworldChunkBiomeReference = multiNoiseBiomeSourceParameterLists.getEntry(multiNoiseBiomeSourceParameterLists.get( MultiNoiseBiomeSourceParameterLists.OVERWORLD)); - RegistryEntry overworldChunkGeneratorSettings = chunkGeneratorSettingsRegistry.getEntry(chunkGeneratorSettingsRegistry.get( + RegistryEntry overworldChunkGeneratorSettings = chunkGeneratorSettingsRegistry.getEntry( + chunkGeneratorSettingsRegistry.get( ChunkGeneratorSettings.OVERWORLD)); @@ -161,13 +163,15 @@ public class PresetUtil { map.put(DimensionOptions.OVERWORLD, overworldDimensionOptions); } if(!map.containsKey(DimensionOptions.NETHER)) { - RegistryEntry netherDimensionType = dimensionTypeRegistry.getEntry(dimensionTypeRegistry.get(DimensionTypes.THE_NETHER)); + RegistryEntry netherDimensionType = dimensionTypeRegistry.getEntry( + dimensionTypeRegistry.get(DimensionTypes.THE_NETHER)); RegistryEntry netherChunkBiomeReference = multiNoiseBiomeSourceParameterLists.getEntry(multiNoiseBiomeSourceParameterLists.get( MultiNoiseBiomeSourceParameterLists.NETHER)); - RegistryEntry netherChunkGeneratorSettings = chunkGeneratorSettingsRegistry.getEntry(chunkGeneratorSettingsRegistry.get( + RegistryEntry netherChunkGeneratorSettings = chunkGeneratorSettingsRegistry.getEntry( + chunkGeneratorSettingsRegistry.get( ChunkGeneratorSettings.NETHER)); DimensionOptions overworldDimensionOptions = new DimensionOptions(netherDimensionType, @@ -175,9 +179,11 @@ public class PresetUtil { map.put(DimensionOptions.NETHER, overworldDimensionOptions); } if(!map.containsKey(DimensionOptions.END)) { - RegistryEntry endDimensionType = dimensionTypeRegistry.getEntry(dimensionTypeRegistry.get(DimensionTypes.THE_END)); + RegistryEntry endDimensionType = dimensionTypeRegistry.getEntry( + dimensionTypeRegistry.get(DimensionTypes.THE_END)); - RegistryEntry endChunkGeneratorSettings = chunkGeneratorSettingsRegistry.getEntry(chunkGeneratorSettingsRegistry.get( + RegistryEntry endChunkGeneratorSettings = chunkGeneratorSettingsRegistry.getEntry( + chunkGeneratorSettingsRegistry.get( ChunkGeneratorSettings.END)); diff --git a/platforms/mixin-lifecycle/src/main/java/com/dfsek/terra/lifecycle/LifecyclePlatform.java b/platforms/mixin-lifecycle/src/main/java/com/dfsek/terra/lifecycle/LifecyclePlatform.java index be5af0133..9fc1ab71d 100644 --- a/platforms/mixin-lifecycle/src/main/java/com/dfsek/terra/lifecycle/LifecyclePlatform.java +++ b/platforms/mixin-lifecycle/src/main/java/com/dfsek/terra/lifecycle/LifecyclePlatform.java @@ -3,9 +3,6 @@ package com.dfsek.terra.lifecycle; import ca.solostudios.strata.Versions; import ca.solostudios.strata.parser.tokenizer.ParseException; import ca.solostudios.strata.version.Version; - -import com.dfsek.terra.api.util.reflection.ReflectionUtil; - import net.minecraft.MinecraftVersion; import net.minecraft.enchantment.Enchantment; import net.minecraft.registry.DynamicRegistryManager; @@ -45,10 +42,12 @@ public abstract class LifecyclePlatform extends ModPlatform { private int generationThreads; public LifecyclePlatform() { - generationThreads = getGenerationThreadsWithReflection("com.ishland.c2me.base.common.GlobalExecutors", "GLOBAL_EXECUTOR_PARALLELISM", "C2ME"); - if (generationThreads == 0) { + generationThreads = getGenerationThreadsWithReflection("com.ishland.c2me.base.common.GlobalExecutors", + "GLOBAL_EXECUTOR_PARALLELISM", "C2ME"); + if(generationThreads == 0) { generationThreads = getMoonriseGenerationThreadsWithReflection(); - } if (generationThreads == 0) { + } + if(generationThreads == 0) { generationThreads = 1; } CommonPlatform.initialize(this); diff --git a/platforms/mixin-lifecycle/src/main/java/com/dfsek/terra/lifecycle/mixin/NoiseConfigMixin.java b/platforms/mixin-lifecycle/src/main/java/com/dfsek/terra/lifecycle/mixin/NoiseConfigMixin.java index 47fe9a9ca..8e9c02086 100644 --- a/platforms/mixin-lifecycle/src/main/java/com/dfsek/terra/lifecycle/mixin/NoiseConfigMixin.java +++ b/platforms/mixin-lifecycle/src/main/java/com/dfsek/terra/lifecycle/mixin/NoiseConfigMixin.java @@ -1,5 +1,7 @@ package com.dfsek.terra.lifecycle.mixin; +import com.dfsek.terra.mod.util.SeedHack; + import net.minecraft.registry.RegistryEntryLookup; import net.minecraft.util.math.noise.DoublePerlinNoiseSampler; import net.minecraft.world.biome.source.util.MultiNoiseUtil.MultiNoiseSampler; @@ -12,8 +14,6 @@ import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; -import com.dfsek.terra.mod.util.SeedHack; - /** * Hack to map noise sampler to seeds diff --git a/platforms/mixin-lifecycle/src/main/java/com/dfsek/terra/lifecycle/mixin/lifecycle/MinecraftServerMixin.java b/platforms/mixin-lifecycle/src/main/java/com/dfsek/terra/lifecycle/mixin/lifecycle/MinecraftServerMixin.java index e52b0fdab..25ac340d0 100644 --- a/platforms/mixin-lifecycle/src/main/java/com/dfsek/terra/lifecycle/mixin/lifecycle/MinecraftServerMixin.java +++ b/platforms/mixin-lifecycle/src/main/java/com/dfsek/terra/lifecycle/mixin/lifecycle/MinecraftServerMixin.java @@ -1,8 +1,5 @@ package com.dfsek.terra.lifecycle.mixin.lifecycle; -import com.dfsek.terra.mod.CommonPlatform; -import com.dfsek.terra.mod.ModPlatform; - import com.mojang.datafixers.DataFixer; import net.minecraft.resource.ResourcePackManager; import net.minecraft.server.MinecraftServer; diff --git a/platforms/mixin-lifecycle/src/main/java/com/dfsek/terra/lifecycle/mixin/lifecycle/RegistryLoaderMixin.java b/platforms/mixin-lifecycle/src/main/java/com/dfsek/terra/lifecycle/mixin/lifecycle/RegistryLoaderMixin.java index 625aa3e88..d0a50afea 100644 --- a/platforms/mixin-lifecycle/src/main/java/com/dfsek/terra/lifecycle/mixin/lifecycle/RegistryLoaderMixin.java +++ b/platforms/mixin-lifecycle/src/main/java/com/dfsek/terra/lifecycle/mixin/lifecycle/RegistryLoaderMixin.java @@ -1,16 +1,15 @@ package com.dfsek.terra.lifecycle.mixin.lifecycle; -import com.dfsek.terra.mod.CommonPlatform; -import com.dfsek.terra.mod.ModPlatform; - +import com.llamalad7.mixinextras.sugar.Local; import net.minecraft.enchantment.Enchantment; +import net.minecraft.registry.DynamicRegistryManager; import net.minecraft.registry.MutableRegistry; import net.minecraft.registry.Registry; import net.minecraft.registry.RegistryKey; import net.minecraft.registry.RegistryKeys; import net.minecraft.registry.RegistryLoader; -import net.minecraft.registry.RegistryLoader.Loader; import net.minecraft.registry.RegistryWrapper; +import net.minecraft.resource.ResourceManager; import net.minecraft.world.biome.Biome; import net.minecraft.world.biome.source.MultiNoiseBiomeSourceParameterList; import net.minecraft.world.dimension.DimensionType; @@ -24,57 +23,50 @@ import org.spongepowered.asm.mixin.Unique; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Coerce; import org.spongepowered.asm.mixin.injection.Inject; -import org.spongepowered.asm.mixin.injection.Redirect; - -import com.llamalad7.mixinextras.sugar.Local; -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.Unique; -import org.spongepowered.asm.mixin.injection.At; -import org.spongepowered.asm.mixin.injection.Coerce; -import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; -import net.minecraft.registry.DynamicRegistryManager; -import net.minecraft.registry.RegistryKeys; -import net.minecraft.registry.RegistryLoader; -import net.minecraft.registry.RegistryWrapper; -import net.minecraft.resource.ResourceManager; - import java.util.List; import java.util.Optional; import java.util.concurrent.atomic.AtomicBoolean; -import java.util.function.Consumer; import com.dfsek.terra.lifecycle.LifecyclePlatform; import com.dfsek.terra.lifecycle.util.LifecycleUtil; import com.dfsek.terra.lifecycle.util.RegistryHack; +import com.dfsek.terra.mod.CommonPlatform; +import com.dfsek.terra.mod.ModPlatform; @Mixin(RegistryLoader.class) public class RegistryLoaderMixin { + @Unique + private static final AtomicBoolean LOADING_DYNAMIC_REGISTRIES = new AtomicBoolean(false); @Shadow @Final private static Logger LOGGER; - @Unique - private static final AtomicBoolean LOADING_DYNAMIC_REGISTRIES = new AtomicBoolean(false); - - @Inject(method = "loadFromResource(Lnet/minecraft/resource/ResourceManager;Ljava/util/List;Ljava/util/List;)Lnet/minecraft/registry/DynamicRegistryManager$Immutable;", at = @At("HEAD")) - private static void loadFromResources(ResourceManager resourceManager, List> registries, List> entries, CallbackInfoReturnable cir) { + @Inject(method = "loadFromResource(Lnet/minecraft/resource/ResourceManager;Ljava/util/List;Ljava/util/List;)" + + "Lnet/minecraft/registry/DynamicRegistryManager$Immutable;", + at = @At("HEAD")) + private static void loadFromResources(ResourceManager resourceManager, List> registries, + List> entries, + CallbackInfoReturnable cir) { LOADING_DYNAMIC_REGISTRIES.set(entries.stream().anyMatch(entry -> entry.key() == RegistryKeys.BIOME)); } @Inject( - method = "load(Lnet/minecraft/registry/RegistryLoader$RegistryLoadable;Ljava/util/List;Ljava/util/List;)Lnet/minecraft/registry/DynamicRegistryManager$Immutable;", + method = "load(Lnet/minecraft/registry/RegistryLoader$RegistryLoadable;Ljava/util/List;Ljava/util/List;)" + + "Lnet/minecraft/registry/DynamicRegistryManager$Immutable;", at = @At( value = "INVOKE", target = "Ljava/util/List;forEach(Ljava/util/function/Consumer;)V", ordinal = 1 ) ) - private static void beforeFreeze(@Coerce Object loadable, List> wrappers, List> entries, CallbackInfoReturnable cir, @Local(ordinal = 2) List> registriesList) { - if (LOADING_DYNAMIC_REGISTRIES.getAndSet(false)) { + private static void beforeFreeze(@Coerce Object loadable, List> wrappers, List> entries, + CallbackInfoReturnable cir, + @Local(ordinal = 2) List> registriesList) { + if(LOADING_DYNAMIC_REGISTRIES.getAndSet(false)) { ModPlatform platform = CommonPlatform.get(); platform.getRawConfigRegistry().clear(); MutableRegistry biomes = extractRegistry(registriesList, RegistryKeys.BIOME).orElseThrow(); diff --git a/platforms/mixin-lifecycle/src/main/java/com/dfsek/terra/lifecycle/mixin/lifecycle/SaveLoadingMixin.java b/platforms/mixin-lifecycle/src/main/java/com/dfsek/terra/lifecycle/mixin/lifecycle/SaveLoadingMixin.java index 98aa4d27f..a7bf93453 100644 --- a/platforms/mixin-lifecycle/src/main/java/com/dfsek/terra/lifecycle/mixin/lifecycle/SaveLoadingMixin.java +++ b/platforms/mixin-lifecycle/src/main/java/com/dfsek/terra/lifecycle/mixin/lifecycle/SaveLoadingMixin.java @@ -19,10 +19,14 @@ public class SaveLoadingMixin { "Ljava/util/concurrent/CompletableFuture;", at = @At( value = "INVOKE", - target = "Lnet/minecraft/server/DataPackContents;reload(Lnet/minecraft/resource/ResourceManager;Lnet/minecraft/registry/CombinedDynamicRegistries;Ljava/util/List;Lnet/minecraft/resource/featuretoggle/FeatureSet;Lnet/minecraft/server/command/CommandManager$RegistrationEnvironment;ILjava/util/concurrent/Executor;Ljava/util/concurrent/Executor;)Ljava/util/concurrent/CompletableFuture;"), + target = "Lnet/minecraft/server/DataPackContents;reload(Lnet/minecraft/resource/ResourceManager;" + + "Lnet/minecraft/registry/CombinedDynamicRegistries;Ljava/util/List;Lnet/minecraft/resource/featuretoggle/FeatureSet;" + + "Lnet/minecraft/server/command/CommandManager$RegistrationEnvironment;ILjava/util/concurrent/Executor;" + + "Ljava/util/concurrent/Executor;)Ljava/util/concurrent/CompletableFuture;"), index = 1 ) - private static CombinedDynamicRegistries grabManager(CombinedDynamicRegistries dynamicRegistries) { + private static CombinedDynamicRegistries grabManager( + CombinedDynamicRegistries dynamicRegistries) { MinecraftUtil.registerFlora(dynamicRegistries.getCombinedRegistryManager().getOrThrow(RegistryKeys.BIOME)); return dynamicRegistries; } diff --git a/platforms/mixin-lifecycle/src/main/java/com/dfsek/terra/lifecycle/util/LifecycleBiomeUtil.java b/platforms/mixin-lifecycle/src/main/java/com/dfsek/terra/lifecycle/util/LifecycleBiomeUtil.java index 27fb08f27..f9fcd0f72 100644 --- a/platforms/mixin-lifecycle/src/main/java/com/dfsek/terra/lifecycle/util/LifecycleBiomeUtil.java +++ b/platforms/mixin-lifecycle/src/main/java/com/dfsek/terra/lifecycle/util/LifecycleBiomeUtil.java @@ -1,7 +1,5 @@ package com.dfsek.terra.lifecycle.util; -import com.dfsek.terra.mod.util.BiomeUtil; - import net.minecraft.registry.Registry; import net.minecraft.registry.RegistryKey; import net.minecraft.registry.RegistryKeys; @@ -21,6 +19,7 @@ import com.dfsek.terra.mod.config.PreLoadCompatibilityOptions; import com.dfsek.terra.mod.config.ProtoPlatformBiome; import com.dfsek.terra.mod.config.VanillaBiomeProperties; import com.dfsek.terra.mod.mixin.access.VillagerTypeAccessor; +import com.dfsek.terra.mod.util.BiomeUtil; import com.dfsek.terra.mod.util.MinecraftUtil; @@ -51,7 +50,7 @@ public final class LifecycleBiomeUtil { Registry registry) { RegistryKey vanilla = ((ProtoPlatformBiome) biome.getPlatformBiome()).get(registry); - if (vanilla == null) { + if(vanilla == null) { logger.error(""" Failed to get Vanilla Biome Regiestry key! Terra Biome ID: {} @@ -65,9 +64,9 @@ public final class LifecycleBiomeUtil { net.minecraft.world.biome.Biome vanilaBiome = registry.get(vanilla); - if (vanilaBiome == null) { + if(vanilaBiome == null) { String vanillaBiomeName; - if (vanilla != null ) { + if(vanilla != null) { vanillaBiomeName = vanilla.getValue().toString(); } else { vanillaBiomeName = "NULL"; @@ -94,7 +93,8 @@ public final class LifecycleBiomeUtil { minecraftBiome)); } - Map, RegistryKey> villagerMap = VillagerTypeAccessor.getBiomeTypeToIdMap(); + Map, RegistryKey> villagerMap = + VillagerTypeAccessor.getBiomeTypeToIdMap(); villagerMap.put(RegistryKey.of(RegistryKeys.BIOME, identifier), Objects.requireNonNullElse(vanillaBiomeProperties.getVillagerType(), diff --git a/platforms/mixin-lifecycle/src/main/resources/terra.lifecycle.mixins.json b/platforms/mixin-lifecycle/src/main/resources/terra.lifecycle.mixins.json index 26e9f9006..29f4f61a6 100644 --- a/platforms/mixin-lifecycle/src/main/resources/terra.lifecycle.mixins.json +++ b/platforms/mixin-lifecycle/src/main/resources/terra.lifecycle.mixins.json @@ -1,21 +1,21 @@ { - "required": true, - "minVersion": "0.8", - "package": "com.dfsek.terra.lifecycle.mixin", - "compatibilityLevel": "JAVA_21", - "mixins": [ - "NoiseConfigMixin", - "RegistryEntryReferenceInvoker", - "RegistryMixin", - "SimpleRegistryMixin", - "lifecycle.MinecraftServerMixin", - "lifecycle.RegistryLoaderMixin", - "lifecycle.SaveLoadingMixin" - ], - "server": [ - ], - "injectors": { - "defaultRequire": 1 - }, - "refmap": "terra.lifecycle.refmap.json" + "required": true, + "minVersion": "0.8", + "package": "com.dfsek.terra.lifecycle.mixin", + "compatibilityLevel": "JAVA_21", + "mixins": [ + "NoiseConfigMixin", + "RegistryEntryReferenceInvoker", + "RegistryMixin", + "SimpleRegistryMixin", + "lifecycle.MinecraftServerMixin", + "lifecycle.RegistryLoaderMixin", + "lifecycle.SaveLoadingMixin" + ], + "server": [ + ], + "injectors": { + "defaultRequire": 1 + }, + "refmap": "terra.lifecycle.refmap.json" } \ No newline at end of file