diff --git a/buildSrc/src/main/kotlin/com/dfsek/terra/DependencyConfig.kt b/buildSrc/src/main/kotlin/com/dfsek/terra/DependencyConfig.kt index 712cf512d..c659676e6 100644 --- a/buildSrc/src/main/kotlin/com/dfsek/terra/DependencyConfig.kt +++ b/buildSrc/src/main/kotlin/com/dfsek/terra/DependencyConfig.kt @@ -41,8 +41,8 @@ fun Project.configureDependencies() { if (project(":common:addons").subprojects.contains(this)) { // If this is an addon project, depend on the API. dependencies { - "compileOnly"(project(":common:api:core")) - "testImplementation"(project(":common:api:core")) + "compileOnly"(project(":common:api")) + "testImplementation"(project(":common:api")) } } } \ No newline at end of file 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 94c0b8984..fd72813d3 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 @@ -11,7 +11,7 @@ import com.dfsek.terra.api.addon.annotations.Author; import com.dfsek.terra.api.addon.annotations.Version; import com.dfsek.terra.api.event.events.config.pack.ConfigPackPreLoadEvent; import com.dfsek.terra.api.event.functional.FunctionalEventHandler; -import com.dfsek.terra.api.injection.annotations.Inject; +import com.dfsek.terra.api.inject.annotations.Inject; import com.dfsek.terra.api.registry.CheckedRegistry; import com.dfsek.terra.api.util.reflection.TypeKey; import com.dfsek.terra.api.world.biome.TerraBiome; diff --git a/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/BiomeHolderImpl.java b/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/BiomeHolderImpl.java index ac1fa6be5..b00939095 100644 --- a/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/BiomeHolderImpl.java +++ b/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/BiomeHolderImpl.java @@ -4,7 +4,7 @@ import com.dfsek.terra.addons.biome.pipeline.api.BiomeExpander; import com.dfsek.terra.addons.biome.pipeline.api.BiomeHolder; import com.dfsek.terra.addons.biome.pipeline.api.BiomeMutator; import com.dfsek.terra.addons.biome.pipeline.source.BiomeSource; -import com.dfsek.terra.api.vector.Vector2; +import com.dfsek.terra.api.util.vector.Vector2; import com.dfsek.terra.api.world.biome.TerraBiome; diff --git a/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/BiomePipeline.java b/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/BiomePipeline.java index 122767773..215c95cfb 100644 --- a/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/BiomePipeline.java +++ b/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/BiomePipeline.java @@ -6,7 +6,7 @@ import java.util.List; import com.dfsek.terra.addons.biome.pipeline.api.BiomeHolder; import com.dfsek.terra.addons.biome.pipeline.api.Stage; import com.dfsek.terra.addons.biome.pipeline.source.BiomeSource; -import com.dfsek.terra.api.vector.Vector2; +import com.dfsek.terra.api.util.vector.Vector2; public class BiomePipeline { diff --git a/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/BiomePipelineAddon.java b/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/BiomePipelineAddon.java index b7ecae266..a09e0f3cb 100644 --- a/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/BiomePipelineAddon.java +++ b/common/addons/biome-provider-pipeline/src/main/java/com/dfsek/terra/addons/biome/pipeline/BiomePipelineAddon.java @@ -21,7 +21,7 @@ import com.dfsek.terra.api.addon.annotations.Author; import com.dfsek.terra.api.addon.annotations.Version; import com.dfsek.terra.api.event.events.config.pack.ConfigPackPreLoadEvent; import com.dfsek.terra.api.event.functional.FunctionalEventHandler; -import com.dfsek.terra.api.injection.annotations.Inject; +import com.dfsek.terra.api.inject.annotations.Inject; import com.dfsek.terra.api.registry.CheckedRegistry; import com.dfsek.terra.api.util.reflection.TypeKey; import com.dfsek.terra.api.world.biome.generation.BiomeProvider; diff --git a/common/addons/biome-provider-single/src/main/java/com/dfsek/terra/addons/biome/single/SingleBiomeProviderAddon.java b/common/addons/biome-provider-single/src/main/java/com/dfsek/terra/addons/biome/single/SingleBiomeProviderAddon.java index 3f63b811a..0db8bce20 100644 --- a/common/addons/biome-provider-single/src/main/java/com/dfsek/terra/addons/biome/single/SingleBiomeProviderAddon.java +++ b/common/addons/biome-provider-single/src/main/java/com/dfsek/terra/addons/biome/single/SingleBiomeProviderAddon.java @@ -11,7 +11,7 @@ import com.dfsek.terra.api.addon.annotations.Author; import com.dfsek.terra.api.addon.annotations.Version; import com.dfsek.terra.api.event.events.config.pack.ConfigPackPreLoadEvent; import com.dfsek.terra.api.event.functional.FunctionalEventHandler; -import com.dfsek.terra.api.injection.annotations.Inject; +import com.dfsek.terra.api.inject.annotations.Inject; import com.dfsek.terra.api.registry.CheckedRegistry; import com.dfsek.terra.api.util.reflection.TypeKey; import com.dfsek.terra.api.world.biome.generation.BiomeProvider; diff --git a/common/addons/chunk-generator-noise-3d/src/main/java/com/dfsek/terra/addons/chunkgenerator/NoiseChunkGenerator3DAddon.java b/common/addons/chunk-generator-noise-3d/src/main/java/com/dfsek/terra/addons/chunkgenerator/NoiseChunkGenerator3DAddon.java index 1ad12108f..408eb84f2 100644 --- a/common/addons/chunk-generator-noise-3d/src/main/java/com/dfsek/terra/addons/chunkgenerator/NoiseChunkGenerator3DAddon.java +++ b/common/addons/chunk-generator-noise-3d/src/main/java/com/dfsek/terra/addons/chunkgenerator/NoiseChunkGenerator3DAddon.java @@ -13,7 +13,7 @@ import com.dfsek.terra.api.addon.annotations.Version; import com.dfsek.terra.api.event.events.config.ConfigurationLoadEvent; import com.dfsek.terra.api.event.events.config.pack.ConfigPackPreLoadEvent; import com.dfsek.terra.api.event.functional.FunctionalEventHandler; -import com.dfsek.terra.api.injection.annotations.Inject; +import com.dfsek.terra.api.inject.annotations.Inject; import com.dfsek.terra.api.world.biome.TerraBiome; import com.dfsek.terra.api.world.generator.ChunkGeneratorProvider; diff --git a/common/addons/chunk-generator-noise-3d/src/main/java/com/dfsek/terra/addons/chunkgenerator/PaletteUtil.java b/common/addons/chunk-generator-noise-3d/src/main/java/com/dfsek/terra/addons/chunkgenerator/PaletteUtil.java index aa295094a..b7901d716 100644 --- a/common/addons/chunk-generator-noise-3d/src/main/java/com/dfsek/terra/addons/chunkgenerator/PaletteUtil.java +++ b/common/addons/chunk-generator-noise-3d/src/main/java/com/dfsek/terra/addons/chunkgenerator/PaletteUtil.java @@ -5,7 +5,7 @@ import com.dfsek.terra.addons.chunkgenerator.palette.SlantHolder; import com.dfsek.terra.api.util.MathUtil; import com.dfsek.terra.api.world.biome.GenerationSettings; import com.dfsek.terra.api.world.generator.Palette; -import com.dfsek.terra.api.world.generator.Sampler; +import com.dfsek.terra.api.util.math.Sampler; public final class PaletteUtil { diff --git a/common/addons/chunk-generator-noise-3d/src/main/java/com/dfsek/terra/addons/chunkgenerator/generation/generators/NoiseChunkGenerator3D.java b/common/addons/chunk-generator-noise-3d/src/main/java/com/dfsek/terra/addons/chunkgenerator/generation/generators/NoiseChunkGenerator3D.java index d8bf28a08..599fe39be 100644 --- a/common/addons/chunk-generator-noise-3d/src/main/java/com/dfsek/terra/addons/chunkgenerator/generation/generators/NoiseChunkGenerator3D.java +++ b/common/addons/chunk-generator-noise-3d/src/main/java/com/dfsek/terra/addons/chunkgenerator/generation/generators/NoiseChunkGenerator3D.java @@ -18,7 +18,7 @@ import com.dfsek.terra.api.block.state.properties.base.Properties; import com.dfsek.terra.api.block.state.properties.enums.Direction; import com.dfsek.terra.api.config.ConfigPack; import com.dfsek.terra.api.profiler.ProfileFrame; -import com.dfsek.terra.api.vector.Vector3; +import com.dfsek.terra.api.util.vector.Vector3; import com.dfsek.terra.api.world.BiomeGrid; import com.dfsek.terra.api.world.World; import com.dfsek.terra.api.world.biome.GenerationSettings; @@ -28,7 +28,7 @@ import com.dfsek.terra.api.world.generator.ChunkData; import com.dfsek.terra.api.world.generator.ChunkGenerator; import com.dfsek.terra.api.world.generator.GenerationStage; import com.dfsek.terra.api.world.generator.Palette; -import com.dfsek.terra.api.world.generator.Sampler; +import com.dfsek.terra.api.util.math.Sampler; public class NoiseChunkGenerator3D implements ChunkGenerator { diff --git a/common/addons/chunk-generator-noise-3d/src/main/java/com/dfsek/terra/addons/chunkgenerator/generation/math/interpolation/ChunkInterpolator2D.java b/common/addons/chunk-generator-noise-3d/src/main/java/com/dfsek/terra/addons/chunkgenerator/generation/math/interpolation/ChunkInterpolator2D.java index 8773732df..fb02692fd 100644 --- a/common/addons/chunk-generator-noise-3d/src/main/java/com/dfsek/terra/addons/chunkgenerator/generation/math/interpolation/ChunkInterpolator2D.java +++ b/common/addons/chunk-generator-noise-3d/src/main/java/com/dfsek/terra/addons/chunkgenerator/generation/math/interpolation/ChunkInterpolator2D.java @@ -7,7 +7,7 @@ import java.util.Map; import java.util.function.BiFunction; import com.dfsek.terra.api.util.mutable.MutableInteger; -import com.dfsek.terra.api.vector.Vector3; +import com.dfsek.terra.api.util.vector.Vector3; import com.dfsek.terra.api.world.World; import com.dfsek.terra.api.world.biome.GenerationSettings; import com.dfsek.terra.api.world.biome.generation.BiomeProvider; diff --git a/common/addons/chunk-generator-noise-3d/src/main/java/com/dfsek/terra/addons/chunkgenerator/generation/math/interpolation/ChunkInterpolator3D.java b/common/addons/chunk-generator-noise-3d/src/main/java/com/dfsek/terra/addons/chunkgenerator/generation/math/interpolation/ChunkInterpolator3D.java index 909500d09..87c96f5f6 100644 --- a/common/addons/chunk-generator-noise-3d/src/main/java/com/dfsek/terra/addons/chunkgenerator/generation/math/interpolation/ChunkInterpolator3D.java +++ b/common/addons/chunk-generator-noise-3d/src/main/java/com/dfsek/terra/addons/chunkgenerator/generation/math/interpolation/ChunkInterpolator3D.java @@ -7,7 +7,7 @@ import java.util.Map; import java.util.function.BiFunction; import com.dfsek.terra.api.util.mutable.MutableInteger; -import com.dfsek.terra.api.vector.Vector3; +import com.dfsek.terra.api.util.vector.Vector3; import com.dfsek.terra.api.world.World; import com.dfsek.terra.api.world.biome.GenerationSettings; import com.dfsek.terra.api.world.biome.generation.BiomeProvider; diff --git a/common/addons/chunk-generator-noise-3d/src/main/java/com/dfsek/terra/addons/chunkgenerator/generation/math/samplers/Sampler3D.java b/common/addons/chunk-generator-noise-3d/src/main/java/com/dfsek/terra/addons/chunkgenerator/generation/math/samplers/Sampler3D.java index 1b7136b4b..96c497f23 100644 --- a/common/addons/chunk-generator-noise-3d/src/main/java/com/dfsek/terra/addons/chunkgenerator/generation/math/samplers/Sampler3D.java +++ b/common/addons/chunk-generator-noise-3d/src/main/java/com/dfsek/terra/addons/chunkgenerator/generation/math/samplers/Sampler3D.java @@ -6,7 +6,7 @@ import com.dfsek.terra.addons.chunkgenerator.generation.math.interpolation.Chunk import com.dfsek.terra.addons.chunkgenerator.generation.math.interpolation.ElevationInterpolator; import com.dfsek.terra.api.world.World; import com.dfsek.terra.api.world.biome.generation.BiomeProvider; -import com.dfsek.terra.api.world.generator.Sampler; +import com.dfsek.terra.api.util.math.Sampler; public class Sampler3D implements Sampler { diff --git a/common/addons/config-biome/src/main/java/com/dfsek/terra/addons/biome/BiomeAddon.java b/common/addons/config-biome/src/main/java/com/dfsek/terra/addons/biome/BiomeAddon.java index ac7a72943..65ba69f3f 100644 --- a/common/addons/config-biome/src/main/java/com/dfsek/terra/addons/biome/BiomeAddon.java +++ b/common/addons/config-biome/src/main/java/com/dfsek/terra/addons/biome/BiomeAddon.java @@ -9,7 +9,7 @@ import com.dfsek.terra.api.addon.annotations.Author; import com.dfsek.terra.api.addon.annotations.Version; import com.dfsek.terra.api.event.events.config.pack.ConfigPackPreLoadEvent; import com.dfsek.terra.api.event.functional.FunctionalEventHandler; -import com.dfsek.terra.api.injection.annotations.Inject; +import com.dfsek.terra.api.inject.annotations.Inject; @Addon("config-biome") diff --git a/common/addons/config-biome/src/main/java/com/dfsek/terra/addons/biome/command/biome/AsyncBiomeFinder.java b/common/addons/config-biome/src/main/java/com/dfsek/terra/addons/biome/command/biome/AsyncBiomeFinder.java index 22c41ac88..caeb9a4af 100644 --- a/common/addons/config-biome/src/main/java/com/dfsek/terra/addons/biome/command/biome/AsyncBiomeFinder.java +++ b/common/addons/config-biome/src/main/java/com/dfsek/terra/addons/biome/command/biome/AsyncBiomeFinder.java @@ -5,7 +5,7 @@ import org.jetbrains.annotations.NotNull; import java.util.function.Consumer; import com.dfsek.terra.api.TerraPlugin; -import com.dfsek.terra.api.vector.Vector3; +import com.dfsek.terra.api.util.vector.Vector3; import com.dfsek.terra.api.world.World; import com.dfsek.terra.api.world.biome.TerraBiome; import com.dfsek.terra.api.world.biome.generation.BiomeProvider; diff --git a/common/addons/config-biome/src/main/java/com/dfsek/terra/addons/biome/command/biome/BiomeCommand.java b/common/addons/config-biome/src/main/java/com/dfsek/terra/addons/biome/command/biome/BiomeCommand.java index ee9dc3cd4..f7552502b 100644 --- a/common/addons/config-biome/src/main/java/com/dfsek/terra/addons/biome/command/biome/BiomeCommand.java +++ b/common/addons/config-biome/src/main/java/com/dfsek/terra/addons/biome/command/biome/BiomeCommand.java @@ -9,7 +9,7 @@ import com.dfsek.terra.api.command.annotation.type.PlayerCommand; import com.dfsek.terra.api.command.annotation.type.WorldCommand; import com.dfsek.terra.api.entity.CommandSender; import com.dfsek.terra.api.entity.Player; -import com.dfsek.terra.api.injection.annotations.Inject; +import com.dfsek.terra.api.inject.annotations.Inject; import com.dfsek.terra.api.world.biome.generation.BiomeProvider; diff --git a/common/addons/config-biome/src/main/java/com/dfsek/terra/addons/biome/command/biome/BiomeLocateCommand.java b/common/addons/config-biome/src/main/java/com/dfsek/terra/addons/biome/command/biome/BiomeLocateCommand.java index 79ecb290a..1efd1cde8 100644 --- a/common/addons/config-biome/src/main/java/com/dfsek/terra/addons/biome/command/biome/BiomeLocateCommand.java +++ b/common/addons/config-biome/src/main/java/com/dfsek/terra/addons/biome/command/biome/BiomeLocateCommand.java @@ -16,8 +16,8 @@ import com.dfsek.terra.api.command.annotation.type.WorldCommand; import com.dfsek.terra.api.command.arg.IntegerArgumentParser; import com.dfsek.terra.api.entity.CommandSender; import com.dfsek.terra.api.entity.Player; -import com.dfsek.terra.api.injection.annotations.Inject; -import com.dfsek.terra.api.vector.Vector3; +import com.dfsek.terra.api.inject.annotations.Inject; +import com.dfsek.terra.api.util.vector.Vector3; import com.dfsek.terra.api.world.biome.TerraBiome; diff --git a/common/addons/config-biome/src/main/java/com/dfsek/terra/addons/biome/command/biome/arg/BiomeArgumentParser.java b/common/addons/config-biome/src/main/java/com/dfsek/terra/addons/biome/command/biome/arg/BiomeArgumentParser.java index 9370ce76d..555ec7e0b 100644 --- a/common/addons/config-biome/src/main/java/com/dfsek/terra/addons/biome/command/biome/arg/BiomeArgumentParser.java +++ b/common/addons/config-biome/src/main/java/com/dfsek/terra/addons/biome/command/biome/arg/BiomeArgumentParser.java @@ -4,7 +4,7 @@ import com.dfsek.terra.api.TerraPlugin; import com.dfsek.terra.api.command.arg.ArgumentParser; import com.dfsek.terra.api.entity.CommandSender; import com.dfsek.terra.api.entity.Player; -import com.dfsek.terra.api.injection.annotations.Inject; +import com.dfsek.terra.api.inject.annotations.Inject; import com.dfsek.terra.api.world.biome.TerraBiome; diff --git a/common/addons/config-biome/src/main/java/com/dfsek/terra/addons/biome/command/biome/tab/BiomeTabCompleter.java b/common/addons/config-biome/src/main/java/com/dfsek/terra/addons/biome/command/biome/tab/BiomeTabCompleter.java index e1ceb9f58..ccae24da1 100644 --- a/common/addons/config-biome/src/main/java/com/dfsek/terra/addons/biome/command/biome/tab/BiomeTabCompleter.java +++ b/common/addons/config-biome/src/main/java/com/dfsek/terra/addons/biome/command/biome/tab/BiomeTabCompleter.java @@ -7,7 +7,7 @@ import com.dfsek.terra.api.TerraPlugin; import com.dfsek.terra.api.command.tab.TabCompleter; import com.dfsek.terra.api.entity.CommandSender; import com.dfsek.terra.api.entity.Player; -import com.dfsek.terra.api.injection.annotations.Inject; +import com.dfsek.terra.api.inject.annotations.Inject; import com.dfsek.terra.api.world.biome.TerraBiome; diff --git a/common/addons/config-carver/src/main/java/com/dfsek/terra/addons/carver/CarverCache.java b/common/addons/config-carver/src/main/java/com/dfsek/terra/addons/carver/CarverCache.java index 5b9794c90..41a6e1808 100644 --- a/common/addons/config-carver/src/main/java/com/dfsek/terra/addons/carver/CarverCache.java +++ b/common/addons/config-carver/src/main/java/com/dfsek/terra/addons/carver/CarverCache.java @@ -14,7 +14,7 @@ import com.dfsek.terra.addons.carver.carving.Worm; import com.dfsek.terra.api.TerraPlugin; import com.dfsek.terra.api.util.MathUtil; import com.dfsek.terra.api.util.PopulationUtil; -import com.dfsek.terra.api.vector.Vector3; +import com.dfsek.terra.api.util.vector.Vector3; import com.dfsek.terra.api.world.World; import com.dfsek.terra.api.world.biome.TerraBiome; import com.dfsek.terra.api.world.biome.generation.BiomeProvider; diff --git a/common/addons/config-carver/src/main/java/com/dfsek/terra/addons/carver/CavePopulator.java b/common/addons/config-carver/src/main/java/com/dfsek/terra/addons/carver/CavePopulator.java index 8380421ac..ea0998923 100644 --- a/common/addons/config-carver/src/main/java/com/dfsek/terra/addons/carver/CavePopulator.java +++ b/common/addons/config-carver/src/main/java/com/dfsek/terra/addons/carver/CavePopulator.java @@ -12,7 +12,7 @@ import com.dfsek.terra.api.block.state.BlockState; import com.dfsek.terra.api.config.WorldConfig; import com.dfsek.terra.api.profiler.ProfileFrame; import com.dfsek.terra.api.util.PopulationUtil; -import com.dfsek.terra.api.vector.Vector3; +import com.dfsek.terra.api.util.vector.Vector3; import com.dfsek.terra.api.world.Chunk; import com.dfsek.terra.api.world.World; import com.dfsek.terra.api.world.generator.Chunkified; diff --git a/common/addons/config-carver/src/main/java/com/dfsek/terra/addons/carver/UserDefinedCarver.java b/common/addons/config-carver/src/main/java/com/dfsek/terra/addons/carver/UserDefinedCarver.java index 6d62b4fa7..961c8b79c 100644 --- a/common/addons/config-carver/src/main/java/com/dfsek/terra/addons/carver/UserDefinedCarver.java +++ b/common/addons/config-carver/src/main/java/com/dfsek/terra/addons/carver/UserDefinedCarver.java @@ -17,7 +17,7 @@ import com.dfsek.terra.addons.carver.carving.Worm; import com.dfsek.terra.api.TerraPlugin; import com.dfsek.terra.api.util.ConstantRange; import com.dfsek.terra.api.util.Range; -import com.dfsek.terra.api.vector.Vector3; +import com.dfsek.terra.api.util.vector.Vector3; import com.dfsek.terra.api.world.World; diff --git a/common/addons/config-carver/src/main/java/com/dfsek/terra/addons/carver/carving/Carver.java b/common/addons/config-carver/src/main/java/com/dfsek/terra/addons/carver/carving/Carver.java index 15f4687c2..0eb0e3e02 100644 --- a/common/addons/config-carver/src/main/java/com/dfsek/terra/addons/carver/carving/Carver.java +++ b/common/addons/config-carver/src/main/java/com/dfsek/terra/addons/carver/carving/Carver.java @@ -5,7 +5,7 @@ import net.jafama.FastMath; import java.util.Random; import java.util.function.BiConsumer; -import com.dfsek.terra.api.vector.Vector3; +import com.dfsek.terra.api.util.vector.Vector3; import com.dfsek.terra.api.world.World; diff --git a/common/addons/config-carver/src/main/java/com/dfsek/terra/addons/carver/carving/Worm.java b/common/addons/config-carver/src/main/java/com/dfsek/terra/addons/carver/carving/Worm.java index 727bce285..fb064a46b 100644 --- a/common/addons/config-carver/src/main/java/com/dfsek/terra/addons/carver/carving/Worm.java +++ b/common/addons/config-carver/src/main/java/com/dfsek/terra/addons/carver/carving/Worm.java @@ -5,7 +5,7 @@ import net.jafama.FastMath; import java.util.Random; import java.util.function.BiConsumer; -import com.dfsek.terra.api.vector.Vector3; +import com.dfsek.terra.api.util.vector.Vector3; import com.dfsek.terra.api.world.World; diff --git a/common/addons/config-distributors/src/main/java/com/dfsek/terra/addons/feature/distributor/DistributorAddon.java b/common/addons/config-distributors/src/main/java/com/dfsek/terra/addons/feature/distributor/DistributorAddon.java index 6c4538fb8..020d53bd9 100644 --- a/common/addons/config-distributors/src/main/java/com/dfsek/terra/addons/feature/distributor/DistributorAddon.java +++ b/common/addons/config-distributors/src/main/java/com/dfsek/terra/addons/feature/distributor/DistributorAddon.java @@ -17,7 +17,7 @@ import com.dfsek.terra.api.addon.annotations.Author; import com.dfsek.terra.api.addon.annotations.Version; import com.dfsek.terra.api.event.events.config.pack.ConfigPackPreLoadEvent; import com.dfsek.terra.api.event.functional.FunctionalEventHandler; -import com.dfsek.terra.api.injection.annotations.Inject; +import com.dfsek.terra.api.inject.annotations.Inject; import com.dfsek.terra.api.registry.CheckedRegistry; import com.dfsek.terra.api.structure.feature.Distributor; import com.dfsek.terra.api.util.reflection.TypeKey; diff --git a/common/addons/config-feature/src/main/java/com/dfsek/terra/addons/feature/FeatureAddon.java b/common/addons/config-feature/src/main/java/com/dfsek/terra/addons/feature/FeatureAddon.java index 14dabb750..4fd10a62d 100644 --- a/common/addons/config-feature/src/main/java/com/dfsek/terra/addons/feature/FeatureAddon.java +++ b/common/addons/config-feature/src/main/java/com/dfsek/terra/addons/feature/FeatureAddon.java @@ -7,7 +7,7 @@ import com.dfsek.terra.api.addon.annotations.Author; import com.dfsek.terra.api.addon.annotations.Version; import com.dfsek.terra.api.event.events.config.pack.ConfigPackPreLoadEvent; import com.dfsek.terra.api.event.functional.FunctionalEventHandler; -import com.dfsek.terra.api.injection.annotations.Inject; +import com.dfsek.terra.api.inject.annotations.Inject; @Addon("config-feature") diff --git a/common/addons/config-flora/src/main/java/com/dfsek/terra/addons/flora/FloraAddon.java b/common/addons/config-flora/src/main/java/com/dfsek/terra/addons/flora/FloraAddon.java index 8048e6595..a5a4453ff 100644 --- a/common/addons/config-flora/src/main/java/com/dfsek/terra/addons/flora/FloraAddon.java +++ b/common/addons/config-flora/src/main/java/com/dfsek/terra/addons/flora/FloraAddon.java @@ -9,7 +9,7 @@ import com.dfsek.terra.api.addon.annotations.Author; import com.dfsek.terra.api.addon.annotations.Version; import com.dfsek.terra.api.event.events.config.pack.ConfigPackPreLoadEvent; import com.dfsek.terra.api.event.functional.FunctionalEventHandler; -import com.dfsek.terra.api.injection.annotations.Inject; +import com.dfsek.terra.api.inject.annotations.Inject; @Addon("config-flora") 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 214181848..c9942f055 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 @@ -16,7 +16,7 @@ import com.dfsek.terra.api.structure.buffer.Buffer; import com.dfsek.terra.api.structure.rotation.Rotation; import com.dfsek.terra.api.util.collection.MaterialSet; import com.dfsek.terra.api.util.collection.ProbabilityCollection; -import com.dfsek.terra.api.vector.Vector3; +import com.dfsek.terra.api.util.vector.Vector3; import com.dfsek.terra.api.world.Chunk; import com.dfsek.terra.api.world.World; diff --git a/common/addons/config-locators/src/main/java/com/dfsek/terra/addons/feature/locator/LocatorAddon.java b/common/addons/config-locators/src/main/java/com/dfsek/terra/addons/feature/locator/LocatorAddon.java index 9e8458c63..4a0c369ed 100644 --- a/common/addons/config-locators/src/main/java/com/dfsek/terra/addons/feature/locator/LocatorAddon.java +++ b/common/addons/config-locators/src/main/java/com/dfsek/terra/addons/feature/locator/LocatorAddon.java @@ -25,7 +25,7 @@ import com.dfsek.terra.api.addon.annotations.Author; import com.dfsek.terra.api.addon.annotations.Version; import com.dfsek.terra.api.event.events.config.pack.ConfigPackPreLoadEvent; import com.dfsek.terra.api.event.functional.FunctionalEventHandler; -import com.dfsek.terra.api.injection.annotations.Inject; +import com.dfsek.terra.api.inject.annotations.Inject; import com.dfsek.terra.api.registry.CheckedRegistry; import com.dfsek.terra.api.structure.feature.Locator; import com.dfsek.terra.api.util.reflection.TypeKey; 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 0b39cc1dd..1c17165d7 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 @@ -37,7 +37,7 @@ import com.dfsek.terra.api.addon.annotations.Author; import com.dfsek.terra.api.addon.annotations.Version; import com.dfsek.terra.api.event.events.config.pack.ConfigPackPreLoadEvent; import com.dfsek.terra.api.event.functional.FunctionalEventHandler; -import com.dfsek.terra.api.injection.annotations.Inject; +import com.dfsek.terra.api.inject.annotations.Inject; import com.dfsek.terra.api.noise.NoiseSampler; import com.dfsek.terra.api.registry.CheckedRegistry; import com.dfsek.terra.api.util.reflection.TypeKey; diff --git a/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/samplers/noise/CellularSampler.java b/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/samplers/noise/CellularSampler.java index 5f8de8bde..6ac6520c7 100644 --- a/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/samplers/noise/CellularSampler.java +++ b/common/addons/config-noise-function/src/main/java/com/dfsek/terra/addons/noise/samplers/noise/CellularSampler.java @@ -2,8 +2,8 @@ package com.dfsek.terra.addons.noise.samplers.noise; import com.dfsek.terra.addons.noise.samplers.noise.simplex.OpenSimplex2Sampler; import com.dfsek.terra.api.noise.NoiseSampler; -import com.dfsek.terra.api.vector.Vector2; -import com.dfsek.terra.api.vector.Vector3; +import com.dfsek.terra.api.util.vector.Vector2; +import com.dfsek.terra.api.util.vector.Vector3; /** diff --git a/common/addons/config-ore/src/main/java/com/dfsek/terra/addons/ore/OreAddon.java b/common/addons/config-ore/src/main/java/com/dfsek/terra/addons/ore/OreAddon.java index 47d55dc34..069c3bbfb 100644 --- a/common/addons/config-ore/src/main/java/com/dfsek/terra/addons/ore/OreAddon.java +++ b/common/addons/config-ore/src/main/java/com/dfsek/terra/addons/ore/OreAddon.java @@ -7,7 +7,7 @@ import com.dfsek.terra.api.addon.annotations.Author; import com.dfsek.terra.api.addon.annotations.Version; import com.dfsek.terra.api.event.events.config.pack.ConfigPackPreLoadEvent; import com.dfsek.terra.api.event.functional.FunctionalEventHandler; -import com.dfsek.terra.api.injection.annotations.Inject; +import com.dfsek.terra.api.inject.annotations.Inject; import com.dfsek.terra.api.world.generator.GenerationStageProvider; diff --git a/common/addons/config-ore/src/main/java/com/dfsek/terra/addons/ore/ores/Ore.java b/common/addons/config-ore/src/main/java/com/dfsek/terra/addons/ore/ores/Ore.java index 60f83afb0..fe318a12f 100644 --- a/common/addons/config-ore/src/main/java/com/dfsek/terra/addons/ore/ores/Ore.java +++ b/common/addons/config-ore/src/main/java/com/dfsek/terra/addons/ore/ores/Ore.java @@ -7,7 +7,7 @@ import com.dfsek.terra.api.TerraPlugin; 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.terra.api.vector.Vector3; +import com.dfsek.terra.api.util.vector.Vector3; import com.dfsek.terra.api.world.Chunk; 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 bdaba124e..c672e134c 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 @@ -10,7 +10,7 @@ import com.dfsek.terra.api.block.BlockType; import com.dfsek.terra.api.block.state.BlockState; import com.dfsek.terra.api.util.Range; import com.dfsek.terra.api.util.collection.MaterialSet; -import com.dfsek.terra.api.vector.Vector3; +import com.dfsek.terra.api.util.vector.Vector3; import com.dfsek.terra.api.world.Chunk; diff --git a/common/addons/config-palette/src/main/java/com/dfsek/terra/addons/palette/PaletteAddon.java b/common/addons/config-palette/src/main/java/com/dfsek/terra/addons/palette/PaletteAddon.java index acfcb5df9..013664a28 100644 --- a/common/addons/config-palette/src/main/java/com/dfsek/terra/addons/palette/PaletteAddon.java +++ b/common/addons/config-palette/src/main/java/com/dfsek/terra/addons/palette/PaletteAddon.java @@ -9,7 +9,7 @@ import com.dfsek.terra.api.addon.annotations.Author; import com.dfsek.terra.api.addon.annotations.Version; import com.dfsek.terra.api.event.events.config.pack.ConfigPackPreLoadEvent; import com.dfsek.terra.api.event.functional.FunctionalEventHandler; -import com.dfsek.terra.api.injection.annotations.Inject; +import com.dfsek.terra.api.inject.annotations.Inject; @Addon("config-palette") diff --git a/common/addons/config-structure/src/main/java/com/dfsek/terra/addons/structure/StructureAddon.java b/common/addons/config-structure/src/main/java/com/dfsek/terra/addons/structure/StructureAddon.java index 90e4ff4de..6e8dc11b4 100644 --- a/common/addons/config-structure/src/main/java/com/dfsek/terra/addons/structure/StructureAddon.java +++ b/common/addons/config-structure/src/main/java/com/dfsek/terra/addons/structure/StructureAddon.java @@ -7,7 +7,7 @@ import com.dfsek.terra.api.addon.annotations.Author; import com.dfsek.terra.api.addon.annotations.Version; import com.dfsek.terra.api.event.events.config.pack.ConfigPackPreLoadEvent; import com.dfsek.terra.api.event.functional.FunctionalEventHandler; -import com.dfsek.terra.api.injection.annotations.Inject; +import com.dfsek.terra.api.inject.annotations.Inject; import com.dfsek.terra.api.structure.configured.ConfiguredStructure; diff --git a/common/addons/config-structure/src/main/java/com/dfsek/terra/addons/structure/StructurePopulator.java b/common/addons/config-structure/src/main/java/com/dfsek/terra/addons/structure/StructurePopulator.java index 20a4a8e1d..fd0ad5a32 100644 --- a/common/addons/config-structure/src/main/java/com/dfsek/terra/addons/structure/StructurePopulator.java +++ b/common/addons/config-structure/src/main/java/com/dfsek/terra/addons/structure/StructurePopulator.java @@ -11,7 +11,7 @@ import com.dfsek.terra.api.profiler.ProfileFrame; import com.dfsek.terra.api.structure.configured.ConfiguredStructure; import com.dfsek.terra.api.structure.rotation.Rotation; import com.dfsek.terra.api.util.PopulationUtil; -import com.dfsek.terra.api.vector.Vector3; +import com.dfsek.terra.api.util.vector.Vector3; import com.dfsek.terra.api.world.Chunk; import com.dfsek.terra.api.world.World; import com.dfsek.terra.api.world.biome.generation.BiomeProvider; diff --git a/common/addons/config-structure/src/main/java/com/dfsek/terra/addons/structure/command/AsyncStructureFinder.java b/common/addons/config-structure/src/main/java/com/dfsek/terra/addons/structure/command/AsyncStructureFinder.java index c3109c635..06ac7d7d4 100644 --- a/common/addons/config-structure/src/main/java/com/dfsek/terra/addons/structure/command/AsyncStructureFinder.java +++ b/common/addons/config-structure/src/main/java/com/dfsek/terra/addons/structure/command/AsyncStructureFinder.java @@ -6,7 +6,7 @@ import java.util.function.Consumer; import com.dfsek.terra.api.TerraPlugin; import com.dfsek.terra.api.structure.configured.ConfiguredStructure; -import com.dfsek.terra.api.vector.Vector3; +import com.dfsek.terra.api.util.vector.Vector3; import com.dfsek.terra.api.world.World; import com.dfsek.terra.api.world.biome.generation.BiomeProvider; diff --git a/common/addons/config-structure/src/main/java/com/dfsek/terra/addons/structure/command/structure/StructureExportCommand.java b/common/addons/config-structure/src/main/java/com/dfsek/terra/addons/structure/command/structure/StructureExportCommand.java index a40627ae1..7cba37dba 100644 --- a/common/addons/config-structure/src/main/java/com/dfsek/terra/addons/structure/command/structure/StructureExportCommand.java +++ b/common/addons/config-structure/src/main/java/com/dfsek/terra/addons/structure/command/structure/StructureExportCommand.java @@ -21,9 +21,9 @@ import com.dfsek.terra.api.command.annotation.type.PlayerCommand; import com.dfsek.terra.api.command.annotation.type.WorldCommand; import com.dfsek.terra.api.entity.CommandSender; import com.dfsek.terra.api.entity.Player; -import com.dfsek.terra.api.injection.annotations.Inject; +import com.dfsek.terra.api.inject.annotations.Inject; import com.dfsek.terra.api.util.generic.pair.Pair; -import com.dfsek.terra.api.vector.Vector3; +import com.dfsek.terra.api.util.vector.Vector3; @PlayerCommand diff --git a/common/addons/config-structure/src/main/java/com/dfsek/terra/addons/structure/command/structure/StructureLoadCommand.java b/common/addons/config-structure/src/main/java/com/dfsek/terra/addons/structure/command/structure/StructureLoadCommand.java index 7122119a1..657929563 100644 --- a/common/addons/config-structure/src/main/java/com/dfsek/terra/addons/structure/command/structure/StructureLoadCommand.java +++ b/common/addons/config-structure/src/main/java/com/dfsek/terra/addons/structure/command/structure/StructureLoadCommand.java @@ -19,7 +19,7 @@ import com.dfsek.terra.api.command.annotation.type.WorldCommand; import com.dfsek.terra.api.command.arg.IntegerArgumentParser; import com.dfsek.terra.api.entity.CommandSender; import com.dfsek.terra.api.entity.Player; -import com.dfsek.terra.api.injection.annotations.Inject; +import com.dfsek.terra.api.inject.annotations.Inject; import com.dfsek.terra.api.structure.Structure; import com.dfsek.terra.api.structure.rotation.Rotation; diff --git a/common/addons/config-structure/src/main/java/com/dfsek/terra/addons/structure/command/structure/StructureLocateCommand.java b/common/addons/config-structure/src/main/java/com/dfsek/terra/addons/structure/command/structure/StructureLocateCommand.java index f07fd2143..1266d403a 100644 --- a/common/addons/config-structure/src/main/java/com/dfsek/terra/addons/structure/command/structure/StructureLocateCommand.java +++ b/common/addons/config-structure/src/main/java/com/dfsek/terra/addons/structure/command/structure/StructureLocateCommand.java @@ -17,9 +17,9 @@ import com.dfsek.terra.api.command.annotation.type.WorldCommand; import com.dfsek.terra.api.command.arg.IntegerArgumentParser; import com.dfsek.terra.api.entity.CommandSender; import com.dfsek.terra.api.entity.Player; -import com.dfsek.terra.api.injection.annotations.Inject; +import com.dfsek.terra.api.inject.annotations.Inject; import com.dfsek.terra.api.structure.configured.ConfiguredStructure; -import com.dfsek.terra.api.vector.Vector3; +import com.dfsek.terra.api.util.vector.Vector3; @PlayerCommand diff --git a/common/addons/config-structure/src/main/java/com/dfsek/terra/addons/structure/command/structure/argument/ScriptArgumentParser.java b/common/addons/config-structure/src/main/java/com/dfsek/terra/addons/structure/command/structure/argument/ScriptArgumentParser.java index 94f2366c9..173b0e649 100644 --- a/common/addons/config-structure/src/main/java/com/dfsek/terra/addons/structure/command/structure/argument/ScriptArgumentParser.java +++ b/common/addons/config-structure/src/main/java/com/dfsek/terra/addons/structure/command/structure/argument/ScriptArgumentParser.java @@ -4,7 +4,7 @@ import com.dfsek.terra.api.TerraPlugin; import com.dfsek.terra.api.command.arg.ArgumentParser; import com.dfsek.terra.api.entity.CommandSender; import com.dfsek.terra.api.entity.Player; -import com.dfsek.terra.api.injection.annotations.Inject; +import com.dfsek.terra.api.inject.annotations.Inject; import com.dfsek.terra.api.structure.Structure; diff --git a/common/addons/config-structure/src/main/java/com/dfsek/terra/addons/structure/command/structure/argument/StructureArgumentParser.java b/common/addons/config-structure/src/main/java/com/dfsek/terra/addons/structure/command/structure/argument/StructureArgumentParser.java index 030fcc718..3ae7f7b79 100644 --- a/common/addons/config-structure/src/main/java/com/dfsek/terra/addons/structure/command/structure/argument/StructureArgumentParser.java +++ b/common/addons/config-structure/src/main/java/com/dfsek/terra/addons/structure/command/structure/argument/StructureArgumentParser.java @@ -4,7 +4,7 @@ import com.dfsek.terra.api.TerraPlugin; import com.dfsek.terra.api.command.arg.ArgumentParser; import com.dfsek.terra.api.entity.CommandSender; import com.dfsek.terra.api.entity.Player; -import com.dfsek.terra.api.injection.annotations.Inject; +import com.dfsek.terra.api.inject.annotations.Inject; import com.dfsek.terra.api.structure.configured.ConfiguredStructure; diff --git a/common/addons/config-structure/src/main/java/com/dfsek/terra/addons/structure/command/structure/completer/ScriptCompleter.java b/common/addons/config-structure/src/main/java/com/dfsek/terra/addons/structure/command/structure/completer/ScriptCompleter.java index 0152d409b..0759bcb75 100644 --- a/common/addons/config-structure/src/main/java/com/dfsek/terra/addons/structure/command/structure/completer/ScriptCompleter.java +++ b/common/addons/config-structure/src/main/java/com/dfsek/terra/addons/structure/command/structure/completer/ScriptCompleter.java @@ -7,7 +7,7 @@ import com.dfsek.terra.api.TerraPlugin; import com.dfsek.terra.api.command.tab.TabCompleter; import com.dfsek.terra.api.entity.CommandSender; import com.dfsek.terra.api.entity.Player; -import com.dfsek.terra.api.injection.annotations.Inject; +import com.dfsek.terra.api.inject.annotations.Inject; import com.dfsek.terra.api.structure.Structure; diff --git a/common/addons/config-structure/src/main/java/com/dfsek/terra/addons/structure/command/structure/completer/StructureCompleter.java b/common/addons/config-structure/src/main/java/com/dfsek/terra/addons/structure/command/structure/completer/StructureCompleter.java index 4daaa8d88..d19347a6a 100644 --- a/common/addons/config-structure/src/main/java/com/dfsek/terra/addons/structure/command/structure/completer/StructureCompleter.java +++ b/common/addons/config-structure/src/main/java/com/dfsek/terra/addons/structure/command/structure/completer/StructureCompleter.java @@ -7,7 +7,7 @@ import com.dfsek.terra.api.TerraPlugin; import com.dfsek.terra.api.command.tab.TabCompleter; import com.dfsek.terra.api.entity.CommandSender; import com.dfsek.terra.api.entity.Player; -import com.dfsek.terra.api.injection.annotations.Inject; +import com.dfsek.terra.api.inject.annotations.Inject; import com.dfsek.terra.api.structure.configured.ConfiguredStructure; diff --git a/common/addons/generation-stage-feature/src/main/java/com/dfsek/terra/addons/generation/feature/FeatureGenerationAddon.java b/common/addons/generation-stage-feature/src/main/java/com/dfsek/terra/addons/generation/feature/FeatureGenerationAddon.java index 5cbec0467..9513f32a5 100644 --- a/common/addons/generation-stage-feature/src/main/java/com/dfsek/terra/addons/generation/feature/FeatureGenerationAddon.java +++ b/common/addons/generation-stage-feature/src/main/java/com/dfsek/terra/addons/generation/feature/FeatureGenerationAddon.java @@ -9,7 +9,7 @@ import com.dfsek.terra.api.addon.annotations.Version; import com.dfsek.terra.api.event.events.config.ConfigurationLoadEvent; import com.dfsek.terra.api.event.events.config.pack.ConfigPackPreLoadEvent; import com.dfsek.terra.api.event.functional.FunctionalEventHandler; -import com.dfsek.terra.api.injection.annotations.Inject; +import com.dfsek.terra.api.inject.annotations.Inject; import com.dfsek.terra.api.world.biome.TerraBiome; import com.dfsek.terra.api.world.generator.GenerationStageProvider; 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 58814f7fd..9c2c54433 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 @@ -5,7 +5,7 @@ import com.dfsek.terra.api.TerraPlugin; import com.dfsek.terra.api.profiler.ProfileFrame; import com.dfsek.terra.api.structure.rotation.Rotation; import com.dfsek.terra.api.util.PopulationUtil; -import com.dfsek.terra.api.vector.Vector3; +import com.dfsek.terra.api.util.vector.Vector3; import com.dfsek.terra.api.world.Chunk; import com.dfsek.terra.api.world.World; import com.dfsek.terra.api.world.generator.GenerationStage; diff --git a/common/addons/language-yaml/src/main/java/com/dfsek/terra/addons/yaml/YamlAddon.java b/common/addons/language-yaml/src/main/java/com/dfsek/terra/addons/yaml/YamlAddon.java index 7b832a86d..cf7c277a6 100644 --- a/common/addons/language-yaml/src/main/java/com/dfsek/terra/addons/yaml/YamlAddon.java +++ b/common/addons/language-yaml/src/main/java/com/dfsek/terra/addons/yaml/YamlAddon.java @@ -11,7 +11,7 @@ import com.dfsek.terra.api.addon.annotations.Author; import com.dfsek.terra.api.addon.annotations.Version; import com.dfsek.terra.api.event.events.config.ConfigurationDiscoveryEvent; import com.dfsek.terra.api.event.functional.FunctionalEventHandler; -import com.dfsek.terra.api.injection.annotations.Inject; +import com.dfsek.terra.api.inject.annotations.Inject; @Addon("language-yaml") diff --git a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/TerraScriptAddon.java b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/TerraScriptAddon.java index 6857c2bf0..b56ba6c77 100644 --- a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/TerraScriptAddon.java +++ b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/TerraScriptAddon.java @@ -14,7 +14,7 @@ import com.dfsek.terra.api.addon.annotations.Author; import com.dfsek.terra.api.addon.annotations.Version; import com.dfsek.terra.api.event.events.config.pack.ConfigPackPreLoadEvent; import com.dfsek.terra.api.event.functional.FunctionalEventHandler; -import com.dfsek.terra.api.injection.annotations.Inject; +import com.dfsek.terra.api.inject.annotations.Inject; import com.dfsek.terra.api.registry.CheckedRegistry; import com.dfsek.terra.api.structure.LootTable; import com.dfsek.terra.api.structure.Structure; diff --git a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/buffer/Cell.java b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/buffer/Cell.java index 53f7b939a..35b37fbc9 100644 --- a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/buffer/Cell.java +++ b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/buffer/Cell.java @@ -4,7 +4,7 @@ import java.util.ArrayList; import java.util.List; import com.dfsek.terra.api.structure.buffer.BufferedItem; -import com.dfsek.terra.api.vector.Vector3; +import com.dfsek.terra.api.util.vector.Vector3; import com.dfsek.terra.api.world.World; diff --git a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/buffer/DirectBuffer.java b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/buffer/DirectBuffer.java index b586c1792..784ad6a46 100644 --- a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/buffer/DirectBuffer.java +++ b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/buffer/DirectBuffer.java @@ -5,7 +5,7 @@ import java.util.Map; import com.dfsek.terra.api.structure.buffer.Buffer; import com.dfsek.terra.api.structure.buffer.BufferedItem; -import com.dfsek.terra.api.vector.Vector3; +import com.dfsek.terra.api.util.vector.Vector3; import com.dfsek.terra.api.world.Chunk; import com.dfsek.terra.api.world.World; diff --git a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/buffer/IntermediateBuffer.java b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/buffer/IntermediateBuffer.java index 9c29f55de..3c2af58c6 100644 --- a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/buffer/IntermediateBuffer.java +++ b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/buffer/IntermediateBuffer.java @@ -2,7 +2,7 @@ package com.dfsek.terra.addons.terrascript.buffer; import com.dfsek.terra.api.structure.buffer.Buffer; import com.dfsek.terra.api.structure.buffer.BufferedItem; -import com.dfsek.terra.api.vector.Vector3; +import com.dfsek.terra.api.util.vector.Vector3; import com.dfsek.terra.api.world.Chunk; import com.dfsek.terra.api.world.World; diff --git a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/buffer/StructureBuffer.java b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/buffer/StructureBuffer.java index 5c26ab61c..d21a160b5 100644 --- a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/buffer/StructureBuffer.java +++ b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/buffer/StructureBuffer.java @@ -7,7 +7,7 @@ import java.util.Map; import com.dfsek.terra.api.structure.buffer.Buffer; import com.dfsek.terra.api.structure.buffer.BufferedItem; -import com.dfsek.terra.api.vector.Vector3; +import com.dfsek.terra.api.util.vector.Vector3; import com.dfsek.terra.api.world.Chunk; import com.dfsek.terra.api.world.World; diff --git a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/buffer/items/BufferedBlock.java b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/buffer/items/BufferedBlock.java index c88be8222..acc57f0c7 100644 --- a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/buffer/items/BufferedBlock.java +++ b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/buffer/items/BufferedBlock.java @@ -7,7 +7,7 @@ import com.dfsek.terra.api.TerraPlugin; import com.dfsek.terra.api.block.state.BlockState; import com.dfsek.terra.api.block.state.properties.base.Properties; import com.dfsek.terra.api.structure.buffer.BufferedItem; -import com.dfsek.terra.api.vector.Vector3; +import com.dfsek.terra.api.util.vector.Vector3; import com.dfsek.terra.api.world.World; diff --git a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/buffer/items/BufferedEntity.java b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/buffer/items/BufferedEntity.java index 685503fb4..71fcedeab 100644 --- a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/buffer/items/BufferedEntity.java +++ b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/buffer/items/BufferedEntity.java @@ -5,7 +5,7 @@ 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.terra.api.structure.buffer.BufferedItem; -import com.dfsek.terra.api.vector.Vector3; +import com.dfsek.terra.api.util.vector.Vector3; import com.dfsek.terra.api.world.World; diff --git a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/buffer/items/BufferedLootApplication.java b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/buffer/items/BufferedLootApplication.java index 0d102d693..6616c1159 100644 --- a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/buffer/items/BufferedLootApplication.java +++ b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/buffer/items/BufferedLootApplication.java @@ -12,7 +12,7 @@ import com.dfsek.terra.api.block.entity.Container; import com.dfsek.terra.api.event.events.world.generation.LootPopulateEvent; import com.dfsek.terra.api.structure.LootTable; import com.dfsek.terra.api.structure.buffer.BufferedItem; -import com.dfsek.terra.api.vector.Vector3; +import com.dfsek.terra.api.util.vector.Vector3; import com.dfsek.terra.api.world.World; diff --git a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/buffer/items/BufferedPulledBlock.java b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/buffer/items/BufferedPulledBlock.java index 880061df3..5ce6982b5 100644 --- a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/buffer/items/BufferedPulledBlock.java +++ b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/buffer/items/BufferedPulledBlock.java @@ -2,7 +2,7 @@ package com.dfsek.terra.addons.terrascript.buffer.items; import com.dfsek.terra.api.block.state.BlockState; import com.dfsek.terra.api.structure.buffer.BufferedItem; -import com.dfsek.terra.api.vector.Vector3; +import com.dfsek.terra.api.util.vector.Vector3; import com.dfsek.terra.api.world.World; diff --git a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/buffer/items/BufferedStateManipulator.java b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/buffer/items/BufferedStateManipulator.java index dadc7177a..ad5456ac0 100644 --- a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/buffer/items/BufferedStateManipulator.java +++ b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/buffer/items/BufferedStateManipulator.java @@ -6,7 +6,7 @@ import org.slf4j.LoggerFactory; import com.dfsek.terra.api.TerraPlugin; import com.dfsek.terra.api.block.entity.BlockEntity; import com.dfsek.terra.api.structure.buffer.BufferedItem; -import com.dfsek.terra.api.vector.Vector3; +import com.dfsek.terra.api.util.vector.Vector3; import com.dfsek.terra.api.world.World; 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 6d99bfbc0..1432e936e 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 @@ -45,7 +45,7 @@ import com.dfsek.terra.api.structure.LootTable; import com.dfsek.terra.api.structure.Structure; import com.dfsek.terra.api.structure.buffer.Buffer; import com.dfsek.terra.api.structure.rotation.Rotation; -import com.dfsek.terra.api.vector.Vector3; +import com.dfsek.terra.api.util.vector.Vector3; import com.dfsek.terra.api.world.Chunk; import com.dfsek.terra.api.world.World; 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 a550c3210..2dbc8c403 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 @@ -12,8 +12,8 @@ import com.dfsek.terra.addons.terrascript.script.TerraImplementationArguments; import com.dfsek.terra.addons.terrascript.tokenizer.Position; import com.dfsek.terra.api.TerraPlugin; import com.dfsek.terra.api.util.RotationUtil; -import com.dfsek.terra.api.vector.Vector2; -import com.dfsek.terra.api.vector.Vector3; +import com.dfsek.terra.api.util.vector.Vector2; +import com.dfsek.terra.api.util.vector.Vector3; import com.dfsek.terra.api.world.biome.generation.BiomeProvider; 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 46cfbb2ab..98ea50446 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 @@ -16,8 +16,8 @@ import com.dfsek.terra.addons.terrascript.tokenizer.Position; import com.dfsek.terra.api.TerraPlugin; import com.dfsek.terra.api.block.state.BlockState; import com.dfsek.terra.api.util.RotationUtil; -import com.dfsek.terra.api.vector.Vector2; -import com.dfsek.terra.api.vector.Vector3; +import com.dfsek.terra.api.util.vector.Vector2; +import com.dfsek.terra.api.util.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 ea3901a47..2b60afbd5 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 @@ -11,8 +11,8 @@ import com.dfsek.terra.addons.terrascript.parser.lang.variables.Variable; import com.dfsek.terra.addons.terrascript.script.TerraImplementationArguments; import com.dfsek.terra.addons.terrascript.tokenizer.Position; import com.dfsek.terra.api.util.RotationUtil; -import com.dfsek.terra.api.vector.Vector2; -import com.dfsek.terra.api.vector.Vector3; +import com.dfsek.terra.api.util.vector.Vector2; +import com.dfsek.terra.api.util.vector.Vector3; public class CheckBlockFunction implements Function { diff --git a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/functions/CheckFunction.java b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/functions/CheckFunction.java index 127a2854a..fbb4da5f8 100644 --- a/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/functions/CheckFunction.java +++ b/common/addons/structure-terrascript-loader/src/main/java/com/dfsek/terra/addons/terrascript/script/functions/CheckFunction.java @@ -12,8 +12,8 @@ import com.dfsek.terra.addons.terrascript.script.TerraImplementationArguments; import com.dfsek.terra.addons.terrascript.tokenizer.Position; import com.dfsek.terra.api.TerraPlugin; import com.dfsek.terra.api.util.RotationUtil; -import com.dfsek.terra.api.vector.Vector2; -import com.dfsek.terra.api.vector.Vector3; +import com.dfsek.terra.api.util.vector.Vector2; +import com.dfsek.terra.api.util.vector.Vector3; import com.dfsek.terra.api.world.World; import com.dfsek.terra.api.world.generator.SamplerCache; 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 4b516afbe..b552be9d1 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 @@ -14,8 +14,8 @@ import com.dfsek.terra.addons.terrascript.tokenizer.Position; import com.dfsek.terra.api.TerraPlugin; import com.dfsek.terra.api.entity.EntityType; import com.dfsek.terra.api.util.RotationUtil; -import com.dfsek.terra.api.vector.Vector2; -import com.dfsek.terra.api.vector.Vector3; +import com.dfsek.terra.api.util.vector.Vector2; +import com.dfsek.terra.api.util.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 09c55002f..2f1fa4a6c 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 @@ -11,8 +11,8 @@ import com.dfsek.terra.addons.terrascript.parser.lang.variables.Variable; import com.dfsek.terra.addons.terrascript.script.TerraImplementationArguments; import com.dfsek.terra.addons.terrascript.tokenizer.Position; import com.dfsek.terra.api.util.RotationUtil; -import com.dfsek.terra.api.vector.Vector2; -import com.dfsek.terra.api.vector.Vector3; +import com.dfsek.terra.api.util.vector.Vector2; +import com.dfsek.terra.api.util.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 9f4d5a5b6..94aa26a37 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 @@ -18,8 +18,8 @@ import com.dfsek.terra.api.TerraPlugin; import com.dfsek.terra.api.registry.Registry; import com.dfsek.terra.api.structure.LootTable; import com.dfsek.terra.api.util.RotationUtil; -import com.dfsek.terra.api.vector.Vector2; -import com.dfsek.terra.api.vector.Vector3; +import com.dfsek.terra.api.util.vector.Vector2; +import com.dfsek.terra.api.util.vector.Vector3; public class LootFunction implements Function { 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 1ed53f48b..bb2f86962 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 @@ -16,8 +16,8 @@ import com.dfsek.terra.addons.terrascript.tokenizer.Position; import com.dfsek.terra.api.TerraPlugin; import com.dfsek.terra.api.block.state.BlockState; import com.dfsek.terra.api.util.RotationUtil; -import com.dfsek.terra.api.vector.Vector2; -import com.dfsek.terra.api.vector.Vector3; +import com.dfsek.terra.api.util.vector.Vector2; +import com.dfsek.terra.api.util.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 9ff19038c..803da7bfd 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 @@ -11,8 +11,8 @@ import com.dfsek.terra.addons.terrascript.parser.lang.variables.Variable; import com.dfsek.terra.addons.terrascript.script.TerraImplementationArguments; import com.dfsek.terra.addons.terrascript.tokenizer.Position; import com.dfsek.terra.api.util.RotationUtil; -import com.dfsek.terra.api.vector.Vector2; -import com.dfsek.terra.api.vector.Vector3; +import com.dfsek.terra.api.util.vector.Vector2; +import com.dfsek.terra.api.util.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 53c53dd71..c395a55b5 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 @@ -13,8 +13,8 @@ import com.dfsek.terra.addons.terrascript.script.TerraImplementationArguments; import com.dfsek.terra.addons.terrascript.tokenizer.Position; import com.dfsek.terra.api.TerraPlugin; import com.dfsek.terra.api.util.RotationUtil; -import com.dfsek.terra.api.vector.Vector2; -import com.dfsek.terra.api.vector.Vector3; +import com.dfsek.terra.api.util.vector.Vector2; +import com.dfsek.terra.api.util.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 fff3136f0..c0defae58 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 @@ -19,8 +19,8 @@ import com.dfsek.terra.api.registry.Registry; import com.dfsek.terra.api.structure.Structure; import com.dfsek.terra.api.structure.rotation.Rotation; import com.dfsek.terra.api.util.RotationUtil; -import com.dfsek.terra.api.vector.Vector2; -import com.dfsek.terra.api.vector.Vector3; +import com.dfsek.terra.api.util.vector.Vector2; +import com.dfsek.terra.api.util.vector.Vector3; public class StructureFunction implements Function { diff --git a/common/api/build.gradle.kts b/common/api/build.gradle.kts new file mode 100644 index 000000000..35de7c414 --- /dev/null +++ b/common/api/build.gradle.kts @@ -0,0 +1,10 @@ +afterEvaluate { + subprojects.forEach { + if(it != project) { + println("Project: ${it.name}") + dependencies { + "shadedApi"(it) + } + } + } +} \ No newline at end of file diff --git a/common/api/config/build.gradle.kts b/common/api/config/build.gradle.kts new file mode 100644 index 000000000..6466b8025 --- /dev/null +++ b/common/api/config/build.gradle.kts @@ -0,0 +1,10 @@ +dependencies { + "shadedApi"(project(":common:api:core")) + + "shadedApi"("com.dfsek:Paralithic:0.5.0") + + "shadedApi"("com.dfsek.tectonic:common:2.1.2") + + "shadedApi"("net.jafama:jafama:2.3.2") +} + diff --git a/common/api/core/build.gradle.kts b/common/api/core/build.gradle.kts index 0c2b6a52d..68195f286 100644 --- a/common/api/core/build.gradle.kts +++ b/common/api/core/build.gradle.kts @@ -1,5 +1,6 @@ dependencies { "shadedApi"(project(":common:api:util")) + "shadedApi"(project(":common:api:noise")) "shadedApi"("com.dfsek:Paralithic:0.5.0") diff --git a/common/api/core/src/main/java/com/dfsek/terra/api/TerraPlugin.java b/common/api/core/src/main/java/com/dfsek/terra/api/TerraPlugin.java index 482a99d04..3418e39b1 100644 --- a/common/api/core/src/main/java/com/dfsek/terra/api/TerraPlugin.java +++ b/common/api/core/src/main/java/com/dfsek/terra/api/TerraPlugin.java @@ -13,6 +13,7 @@ import com.dfsek.terra.api.profiler.Profiler; import com.dfsek.terra.api.registry.CheckedRegistry; import com.dfsek.terra.api.registry.Registry; import com.dfsek.terra.api.tectonic.LoaderRegistrar; +import com.dfsek.terra.api.util.Logger; /** diff --git a/common/api/core/src/main/java/com/dfsek/terra/api/block/entity/BlockEntity.java b/common/api/core/src/main/java/com/dfsek/terra/api/block/entity/BlockEntity.java index 89a3cd610..78dede271 100644 --- a/common/api/core/src/main/java/com/dfsek/terra/api/block/entity/BlockEntity.java +++ b/common/api/core/src/main/java/com/dfsek/terra/api/block/entity/BlockEntity.java @@ -2,7 +2,7 @@ package com.dfsek.terra.api.block.entity; import com.dfsek.terra.api.Handle; import com.dfsek.terra.api.block.state.BlockState; -import com.dfsek.terra.api.vector.Vector3; +import com.dfsek.terra.api.util.vector.Vector3; public interface BlockEntity extends Handle { diff --git a/common/api/core/src/main/java/com/dfsek/terra/api/config/AbstractableTemplate.java b/common/api/core/src/main/java/com/dfsek/terra/api/config/AbstractableTemplate.java index 7683bb06b..62a276527 100644 --- a/common/api/core/src/main/java/com/dfsek/terra/api/config/AbstractableTemplate.java +++ b/common/api/core/src/main/java/com/dfsek/terra/api/config/AbstractableTemplate.java @@ -2,7 +2,7 @@ package com.dfsek.terra.api.config; import com.dfsek.tectonic.config.ConfigTemplate; -import com.dfsek.terra.api.StringIdentifiable; +import com.dfsek.terra.api.util.StringIdentifiable; public interface AbstractableTemplate extends ConfigTemplate, StringIdentifiable { diff --git a/common/api/core/src/main/java/com/dfsek/terra/api/config/ConfigPack.java b/common/api/core/src/main/java/com/dfsek/terra/api/config/ConfigPack.java index d92c9cfe9..63dd322ac 100644 --- a/common/api/core/src/main/java/com/dfsek/terra/api/config/ConfigPack.java +++ b/common/api/core/src/main/java/com/dfsek/terra/api/config/ConfigPack.java @@ -5,7 +5,7 @@ import java.util.List; import java.util.Map; import java.util.Set; -import com.dfsek.terra.api.StringIdentifiable; +import com.dfsek.terra.api.util.StringIdentifiable; import com.dfsek.terra.api.addon.TerraAddon; import com.dfsek.terra.api.registry.CheckedRegistry; import com.dfsek.terra.api.registry.meta.RegistryFactory; diff --git a/common/api/core/src/main/java/com/dfsek/terra/api/config/WorldConfig.java b/common/api/core/src/main/java/com/dfsek/terra/api/config/WorldConfig.java index 590dee335..9750c6940 100644 --- a/common/api/core/src/main/java/com/dfsek/terra/api/config/WorldConfig.java +++ b/common/api/core/src/main/java/com/dfsek/terra/api/config/WorldConfig.java @@ -2,7 +2,7 @@ package com.dfsek.terra.api.config; import java.util.Map; -import com.dfsek.terra.api.StringIdentifiable; +import com.dfsek.terra.api.util.StringIdentifiable; import com.dfsek.terra.api.registry.Registry; import com.dfsek.terra.api.world.World; import com.dfsek.terra.api.world.biome.generation.BiomeProvider; diff --git a/common/api/core/src/main/java/com/dfsek/terra/api/entity/Entity.java b/common/api/core/src/main/java/com/dfsek/terra/api/entity/Entity.java index 63e0a701d..7d20ba2ae 100644 --- a/common/api/core/src/main/java/com/dfsek/terra/api/entity/Entity.java +++ b/common/api/core/src/main/java/com/dfsek/terra/api/entity/Entity.java @@ -1,6 +1,6 @@ package com.dfsek.terra.api.entity; -import com.dfsek.terra.api.vector.Vector3; +import com.dfsek.terra.api.util.vector.Vector3; import com.dfsek.terra.api.world.World; diff --git a/common/api/core/src/main/java/com/dfsek/terra/api/event/events/world/generation/LootPopulateEvent.java b/common/api/core/src/main/java/com/dfsek/terra/api/event/events/world/generation/LootPopulateEvent.java index 092538a6c..e23aae20c 100644 --- a/common/api/core/src/main/java/com/dfsek/terra/api/event/events/world/generation/LootPopulateEvent.java +++ b/common/api/core/src/main/java/com/dfsek/terra/api/event/events/world/generation/LootPopulateEvent.java @@ -8,7 +8,7 @@ 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.terra.api.vector.Vector3; +import com.dfsek.terra.api.util.vector.Vector3; /** diff --git a/common/api/core/src/main/java/com/dfsek/terra/api/handle/WorldHandle.java b/common/api/core/src/main/java/com/dfsek/terra/api/handle/WorldHandle.java index ec99d0dc1..3ae571247 100644 --- a/common/api/core/src/main/java/com/dfsek/terra/api/handle/WorldHandle.java +++ b/common/api/core/src/main/java/com/dfsek/terra/api/handle/WorldHandle.java @@ -5,7 +5,7 @@ import com.dfsek.terra.api.block.state.BlockState; import com.dfsek.terra.api.entity.EntityType; import com.dfsek.terra.api.entity.Player; import com.dfsek.terra.api.util.generic.pair.Pair; -import com.dfsek.terra.api.vector.Vector3; +import com.dfsek.terra.api.util.vector.Vector3; /** diff --git a/common/api/core/src/main/java/com/dfsek/terra/api/inventory/BlockInventoryHolder.java b/common/api/core/src/main/java/com/dfsek/terra/api/inventory/BlockInventoryHolder.java index 7e1c28f60..76b21f55b 100644 --- a/common/api/core/src/main/java/com/dfsek/terra/api/inventory/BlockInventoryHolder.java +++ b/common/api/core/src/main/java/com/dfsek/terra/api/inventory/BlockInventoryHolder.java @@ -1,6 +1,6 @@ package com.dfsek.terra.api.inventory; -import com.dfsek.terra.api.vector.Vector3; +import com.dfsek.terra.api.util.vector.Vector3; public interface BlockInventoryHolder extends InventoryHolder { diff --git a/common/api/core/src/main/java/com/dfsek/terra/api/structure/Structure.java b/common/api/core/src/main/java/com/dfsek/terra/api/structure/Structure.java index 09e74442f..18df500bd 100644 --- a/common/api/core/src/main/java/com/dfsek/terra/api/structure/Structure.java +++ b/common/api/core/src/main/java/com/dfsek/terra/api/structure/Structure.java @@ -2,10 +2,10 @@ package com.dfsek.terra.api.structure; import java.util.Random; -import com.dfsek.terra.api.StringIdentifiable; +import com.dfsek.terra.api.util.StringIdentifiable; import com.dfsek.terra.api.structure.buffer.Buffer; import com.dfsek.terra.api.structure.rotation.Rotation; -import com.dfsek.terra.api.vector.Vector3; +import com.dfsek.terra.api.util.vector.Vector3; import com.dfsek.terra.api.world.Chunk; import com.dfsek.terra.api.world.World; diff --git a/common/api/core/src/main/java/com/dfsek/terra/api/structure/StructureSpawn.java b/common/api/core/src/main/java/com/dfsek/terra/api/structure/StructureSpawn.java index 8bcb6514a..c9be4cc25 100644 --- a/common/api/core/src/main/java/com/dfsek/terra/api/structure/StructureSpawn.java +++ b/common/api/core/src/main/java/com/dfsek/terra/api/structure/StructureSpawn.java @@ -1,6 +1,6 @@ package com.dfsek.terra.api.structure; -import com.dfsek.terra.api.vector.Vector3; +import com.dfsek.terra.api.util.vector.Vector3; public interface StructureSpawn { diff --git a/common/api/core/src/main/java/com/dfsek/terra/api/structure/buffer/Buffer.java b/common/api/core/src/main/java/com/dfsek/terra/api/structure/buffer/Buffer.java index bd2191136..f3e8dbd77 100644 --- a/common/api/core/src/main/java/com/dfsek/terra/api/structure/buffer/Buffer.java +++ b/common/api/core/src/main/java/com/dfsek/terra/api/structure/buffer/Buffer.java @@ -1,6 +1,6 @@ package com.dfsek.terra.api.structure.buffer; -import com.dfsek.terra.api.vector.Vector3; +import com.dfsek.terra.api.util.vector.Vector3; import com.dfsek.terra.api.world.Chunk; import com.dfsek.terra.api.world.World; diff --git a/common/api/core/src/main/java/com/dfsek/terra/api/structure/buffer/BufferedItem.java b/common/api/core/src/main/java/com/dfsek/terra/api/structure/buffer/BufferedItem.java index 5e9a4a316..a833184aa 100644 --- a/common/api/core/src/main/java/com/dfsek/terra/api/structure/buffer/BufferedItem.java +++ b/common/api/core/src/main/java/com/dfsek/terra/api/structure/buffer/BufferedItem.java @@ -1,6 +1,6 @@ package com.dfsek.terra.api.structure.buffer; -import com.dfsek.terra.api.vector.Vector3; +import com.dfsek.terra.api.util.vector.Vector3; import com.dfsek.terra.api.world.World; diff --git a/common/api/core/src/main/java/com/dfsek/terra/api/structure/configured/ConfiguredStructure.java b/common/api/core/src/main/java/com/dfsek/terra/api/structure/configured/ConfiguredStructure.java index 0da6c2d46..28ecbd83c 100644 --- a/common/api/core/src/main/java/com/dfsek/terra/api/structure/configured/ConfiguredStructure.java +++ b/common/api/core/src/main/java/com/dfsek/terra/api/structure/configured/ConfiguredStructure.java @@ -1,6 +1,6 @@ package com.dfsek.terra.api.structure.configured; -import com.dfsek.terra.api.StringIdentifiable; +import com.dfsek.terra.api.util.StringIdentifiable; import com.dfsek.terra.api.structure.Structure; import com.dfsek.terra.api.structure.StructureSpawn; import com.dfsek.terra.api.util.Range; diff --git a/common/api/core/src/main/java/com/dfsek/terra/api/util/RotationUtil.java b/common/api/core/src/main/java/com/dfsek/terra/api/util/RotationUtil.java index afe09124f..2e10ed31b 100644 --- a/common/api/core/src/main/java/com/dfsek/terra/api/util/RotationUtil.java +++ b/common/api/core/src/main/java/com/dfsek/terra/api/util/RotationUtil.java @@ -9,7 +9,7 @@ import com.dfsek.terra.api.block.state.properties.enums.RailShape; import com.dfsek.terra.api.block.state.properties.enums.RedstoneConnection; import com.dfsek.terra.api.block.state.properties.enums.WallHeight; import com.dfsek.terra.api.structure.rotation.Rotation; -import com.dfsek.terra.api.vector.Vector2; +import com.dfsek.terra.api.util.vector.Vector2; public final class RotationUtil { diff --git a/common/api/core/src/main/java/com/dfsek/terra/api/world/Flora.java b/common/api/core/src/main/java/com/dfsek/terra/api/world/Flora.java index f4521dffc..525011425 100644 --- a/common/api/core/src/main/java/com/dfsek/terra/api/world/Flora.java +++ b/common/api/core/src/main/java/com/dfsek/terra/api/world/Flora.java @@ -3,7 +3,7 @@ package com.dfsek.terra.api.world; import java.util.List; import com.dfsek.terra.api.util.Range; -import com.dfsek.terra.api.vector.Vector3; +import com.dfsek.terra.api.util.vector.Vector3; public interface Flora { diff --git a/common/api/core/src/main/java/com/dfsek/terra/api/world/Tree.java b/common/api/core/src/main/java/com/dfsek/terra/api/world/Tree.java index 3b395ab50..e3f0cd4b4 100644 --- a/common/api/core/src/main/java/com/dfsek/terra/api/world/Tree.java +++ b/common/api/core/src/main/java/com/dfsek/terra/api/world/Tree.java @@ -5,7 +5,7 @@ import java.util.Random; import java.util.Set; import com.dfsek.terra.api.block.BlockType; -import com.dfsek.terra.api.vector.Vector3; +import com.dfsek.terra.api.util.vector.Vector3; public interface Tree { diff --git a/common/api/core/src/main/java/com/dfsek/terra/api/world/World.java b/common/api/core/src/main/java/com/dfsek/terra/api/world/World.java index 4b8eb9f4a..3e1fc6c44 100644 --- a/common/api/core/src/main/java/com/dfsek/terra/api/world/World.java +++ b/common/api/core/src/main/java/com/dfsek/terra/api/world/World.java @@ -6,7 +6,7 @@ import com.dfsek.terra.api.block.state.BlockState; import com.dfsek.terra.api.config.WorldConfig; import com.dfsek.terra.api.entity.Entity; import com.dfsek.terra.api.entity.EntityType; -import com.dfsek.terra.api.vector.Vector3; +import com.dfsek.terra.api.util.vector.Vector3; import com.dfsek.terra.api.world.biome.generation.BiomeProvider; import com.dfsek.terra.api.world.generator.ChunkGenerator; diff --git a/common/api/core/src/main/java/com/dfsek/terra/api/world/biome/generation/BiomeProvider.java b/common/api/core/src/main/java/com/dfsek/terra/api/world/biome/generation/BiomeProvider.java index 47b7fa625..fa55acea6 100644 --- a/common/api/core/src/main/java/com/dfsek/terra/api/world/biome/generation/BiomeProvider.java +++ b/common/api/core/src/main/java/com/dfsek/terra/api/world/biome/generation/BiomeProvider.java @@ -1,7 +1,7 @@ package com.dfsek.terra.api.world.biome.generation; -import com.dfsek.terra.api.vector.Vector2; -import com.dfsek.terra.api.vector.Vector3; +import com.dfsek.terra.api.util.vector.Vector2; +import com.dfsek.terra.api.util.vector.Vector3; import com.dfsek.terra.api.world.biome.TerraBiome; diff --git a/common/api/core/src/main/java/com/dfsek/terra/api/world/generator/ChunkGenerator.java b/common/api/core/src/main/java/com/dfsek/terra/api/world/generator/ChunkGenerator.java index 848fe3ecc..080dcd726 100644 --- a/common/api/core/src/main/java/com/dfsek/terra/api/world/generator/ChunkGenerator.java +++ b/common/api/core/src/main/java/com/dfsek/terra/api/world/generator/ChunkGenerator.java @@ -1,5 +1,6 @@ package com.dfsek.terra.api.world.generator; +import com.dfsek.terra.api.util.math.Sampler; import org.jetbrains.annotations.NotNull; import java.util.List; @@ -8,7 +9,7 @@ import java.util.Random; import com.dfsek.terra.api.TerraPlugin; import com.dfsek.terra.api.block.state.BlockState; import com.dfsek.terra.api.config.ConfigPack; -import com.dfsek.terra.api.vector.Vector3; +import com.dfsek.terra.api.util.vector.Vector3; import com.dfsek.terra.api.world.BiomeGrid; import com.dfsek.terra.api.world.World; import com.dfsek.terra.api.world.biome.generation.BiomeProvider; diff --git a/common/api/core/src/main/java/com/dfsek/terra/api/world/generator/SamplerCache.java b/common/api/core/src/main/java/com/dfsek/terra/api/world/generator/SamplerCache.java index be3f658ba..d8ab56f85 100644 --- a/common/api/core/src/main/java/com/dfsek/terra/api/world/generator/SamplerCache.java +++ b/common/api/core/src/main/java/com/dfsek/terra/api/world/generator/SamplerCache.java @@ -1,5 +1,7 @@ package com.dfsek.terra.api.world.generator; +import com.dfsek.terra.api.util.math.Sampler; + public interface SamplerCache { Sampler get(int x, int z); diff --git a/common/api/inject/README.md b/common/api/inject/README.md new file mode 100644 index 000000000..1f8d4e927 --- /dev/null +++ b/common/api/inject/README.md @@ -0,0 +1,3 @@ +# Dependency Injection + +A simple annotation-based dependency injection framework \ No newline at end of file diff --git a/common/api/inject/build.gradle.kts b/common/api/inject/build.gradle.kts new file mode 100644 index 000000000..20ed8a808 --- /dev/null +++ b/common/api/inject/build.gradle.kts @@ -0,0 +1,10 @@ +dependencies { + "shadedApi"(project(":common:api:util")) + + "shadedApi"("com.dfsek:Paralithic:0.5.0") + + "shadedApi"("com.dfsek.tectonic:common:2.1.2") + + "shadedApi"("net.jafama:jafama:2.3.2") +} + diff --git a/common/api/core/src/main/java/com/dfsek/terra/api/injection/Injector.java b/common/api/inject/src/main/java/com/dfsek/terra/api/inject/Injector.java similarity index 88% rename from common/api/core/src/main/java/com/dfsek/terra/api/injection/Injector.java rename to common/api/inject/src/main/java/com/dfsek/terra/api/inject/Injector.java index 3e622fa07..78ea1b23d 100644 --- a/common/api/core/src/main/java/com/dfsek/terra/api/injection/Injector.java +++ b/common/api/inject/src/main/java/com/dfsek/terra/api/inject/Injector.java @@ -1,7 +1,7 @@ -package com.dfsek.terra.api.injection; +package com.dfsek.terra.api.inject; -import com.dfsek.terra.api.injection.annotations.Inject; -import com.dfsek.terra.api.injection.exception.InjectionException; +import com.dfsek.terra.api.inject.annotations.Inject; +import com.dfsek.terra.api.inject.exception.InjectionException; /** diff --git a/common/api/core/src/main/java/com/dfsek/terra/api/injection/annotations/Inject.java b/common/api/inject/src/main/java/com/dfsek/terra/api/inject/annotations/Inject.java similarity index 86% rename from common/api/core/src/main/java/com/dfsek/terra/api/injection/annotations/Inject.java rename to common/api/inject/src/main/java/com/dfsek/terra/api/inject/annotations/Inject.java index d7a6c87a6..dc9c0a3d3 100644 --- a/common/api/core/src/main/java/com/dfsek/terra/api/injection/annotations/Inject.java +++ b/common/api/inject/src/main/java/com/dfsek/terra/api/inject/annotations/Inject.java @@ -1,4 +1,4 @@ -package com.dfsek.terra.api.injection.annotations; +package com.dfsek.terra.api.inject.annotations; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/common/api/core/src/main/java/com/dfsek/terra/api/injection/exception/InjectionException.java b/common/api/inject/src/main/java/com/dfsek/terra/api/inject/exception/InjectionException.java similarity index 70% rename from common/api/core/src/main/java/com/dfsek/terra/api/injection/exception/InjectionException.java rename to common/api/inject/src/main/java/com/dfsek/terra/api/inject/exception/InjectionException.java index 7c7a9784f..ec6f1ed15 100644 --- a/common/api/core/src/main/java/com/dfsek/terra/api/injection/exception/InjectionException.java +++ b/common/api/inject/src/main/java/com/dfsek/terra/api/inject/exception/InjectionException.java @@ -1,12 +1,12 @@ -package com.dfsek.terra.api.injection.exception; +package com.dfsek.terra.api.inject.exception; -import com.dfsek.terra.api.injection.Injector; +import com.dfsek.terra.api.inject.Injector; /** * Thrown when dynamic dependency injection cannot be completed by an {@link Injector}. */ -public class InjectionException extends Exception { +public class InjectionException extends RuntimeException { private static final long serialVersionUID = -6929631447064215387L; public InjectionException(String message) { diff --git a/common/api/noise/build.gradle.kts b/common/api/noise/build.gradle.kts new file mode 100644 index 000000000..20ed8a808 --- /dev/null +++ b/common/api/noise/build.gradle.kts @@ -0,0 +1,10 @@ +dependencies { + "shadedApi"(project(":common:api:util")) + + "shadedApi"("com.dfsek:Paralithic:0.5.0") + + "shadedApi"("com.dfsek.tectonic:common:2.1.2") + + "shadedApi"("net.jafama:jafama:2.3.2") +} + diff --git a/common/api/core/src/main/java/com/dfsek/terra/api/noise/NoiseSampler.java b/common/api/noise/src/main/java/com/dfsek/terra/api/noise/NoiseSampler.java similarity index 90% rename from common/api/core/src/main/java/com/dfsek/terra/api/noise/NoiseSampler.java rename to common/api/noise/src/main/java/com/dfsek/terra/api/noise/NoiseSampler.java index d12349d45..974f7a01b 100644 --- a/common/api/core/src/main/java/com/dfsek/terra/api/noise/NoiseSampler.java +++ b/common/api/noise/src/main/java/com/dfsek/terra/api/noise/NoiseSampler.java @@ -1,8 +1,8 @@ package com.dfsek.terra.api.noise; -import com.dfsek.terra.api.vector.Vector2; -import com.dfsek.terra.api.vector.Vector3; +import com.dfsek.terra.api.util.vector.Vector2; +import com.dfsek.terra.api.util.vector.Vector3; public interface NoiseSampler { diff --git a/common/api/util/build.gradle.kts b/common/api/util/build.gradle.kts index 0c41fcb1e..077bac486 100644 --- a/common/api/util/build.gradle.kts +++ b/common/api/util/build.gradle.kts @@ -1,3 +1,4 @@ dependencies { + "shadedApi"("net.jafama:jafama:2.3.2") } diff --git a/common/api/core/src/main/java/com/dfsek/terra/api/util/MathUtil.java b/common/api/util/src/main/java/com/dfsek/terra/api/util/MathUtil.java similarity index 99% rename from common/api/core/src/main/java/com/dfsek/terra/api/util/MathUtil.java rename to common/api/util/src/main/java/com/dfsek/terra/api/util/MathUtil.java index 80304b1de..64b3d8b6b 100644 --- a/common/api/core/src/main/java/com/dfsek/terra/api/util/MathUtil.java +++ b/common/api/util/src/main/java/com/dfsek/terra/api/util/MathUtil.java @@ -4,7 +4,7 @@ import net.jafama.FastMath; import java.util.List; -import com.dfsek.terra.api.world.generator.Sampler; +import com.dfsek.terra.api.util.math.Sampler; /** diff --git a/common/api/core/src/main/java/com/dfsek/terra/api/StringIdentifiable.java b/common/api/util/src/main/java/com/dfsek/terra/api/util/StringIdentifiable.java similarity index 64% rename from common/api/core/src/main/java/com/dfsek/terra/api/StringIdentifiable.java rename to common/api/util/src/main/java/com/dfsek/terra/api/util/StringIdentifiable.java index ff1209b0f..1d1af1abc 100644 --- a/common/api/core/src/main/java/com/dfsek/terra/api/StringIdentifiable.java +++ b/common/api/util/src/main/java/com/dfsek/terra/api/util/StringIdentifiable.java @@ -1,4 +1,4 @@ -package com.dfsek.terra.api; +package com.dfsek.terra.api.util; public interface StringIdentifiable { String getID(); diff --git a/common/api/core/src/main/java/com/dfsek/terra/api/world/generator/Sampler.java b/common/api/util/src/main/java/com/dfsek/terra/api/util/math/Sampler.java similarity index 88% rename from common/api/core/src/main/java/com/dfsek/terra/api/world/generator/Sampler.java rename to common/api/util/src/main/java/com/dfsek/terra/api/util/math/Sampler.java index 4566cd52b..242c706d4 100644 --- a/common/api/core/src/main/java/com/dfsek/terra/api/world/generator/Sampler.java +++ b/common/api/util/src/main/java/com/dfsek/terra/api/util/math/Sampler.java @@ -1,4 +1,4 @@ -package com.dfsek.terra.api.world.generator; +package com.dfsek.terra.api.util.math; @FunctionalInterface public interface Sampler { diff --git a/common/api/core/src/main/java/com/dfsek/terra/api/vector/Vector2.java b/common/api/util/src/main/java/com/dfsek/terra/api/util/vector/Vector2.java similarity index 99% rename from common/api/core/src/main/java/com/dfsek/terra/api/vector/Vector2.java rename to common/api/util/src/main/java/com/dfsek/terra/api/util/vector/Vector2.java index 677b9d0b8..db1eed6a7 100644 --- a/common/api/core/src/main/java/com/dfsek/terra/api/vector/Vector2.java +++ b/common/api/util/src/main/java/com/dfsek/terra/api/util/vector/Vector2.java @@ -1,4 +1,4 @@ -package com.dfsek.terra.api.vector; +package com.dfsek.terra.api.util.vector; import net.jafama.FastMath; diff --git a/common/api/core/src/main/java/com/dfsek/terra/api/vector/Vector3.java b/common/api/util/src/main/java/com/dfsek/terra/api/util/vector/Vector3.java similarity index 99% rename from common/api/core/src/main/java/com/dfsek/terra/api/vector/Vector3.java rename to common/api/util/src/main/java/com/dfsek/terra/api/util/vector/Vector3.java index 9ecd1b1d1..a5a0a53d5 100644 --- a/common/api/core/src/main/java/com/dfsek/terra/api/vector/Vector3.java +++ b/common/api/util/src/main/java/com/dfsek/terra/api/util/vector/Vector3.java @@ -1,4 +1,4 @@ -package com.dfsek.terra.api.vector; +package com.dfsek.terra.api.util.vector; import net.jafama.FastMath; import org.jetbrains.annotations.NotNull; diff --git a/common/implementation/build.gradle.kts b/common/implementation/build.gradle.kts index 6173da7e3..f815b8c68 100644 --- a/common/implementation/build.gradle.kts +++ b/common/implementation/build.gradle.kts @@ -1,6 +1,5 @@ dependencies { - "shadedApi"(project(":common:api:core")) - "shadedApi"(project(":common:loader:config")) + "shadedApi"(project(":common:api")) "shadedApi"(project(":common:loader:addon")) "shadedApi"("org.apache.commons:commons-rng-core:1.3") diff --git a/common/implementation/src/main/java/com/dfsek/terra/commands/AddonsCommand.java b/common/implementation/src/main/java/com/dfsek/terra/commands/AddonsCommand.java index 98e8875e7..53b1053af 100644 --- a/common/implementation/src/main/java/com/dfsek/terra/commands/AddonsCommand.java +++ b/common/implementation/src/main/java/com/dfsek/terra/commands/AddonsCommand.java @@ -4,7 +4,7 @@ import com.dfsek.terra.api.TerraPlugin; import com.dfsek.terra.api.command.CommandTemplate; import com.dfsek.terra.api.command.annotation.Command; import com.dfsek.terra.api.entity.CommandSender; -import com.dfsek.terra.api.injection.annotations.Inject; +import com.dfsek.terra.api.inject.annotations.Inject; @Command( diff --git a/common/implementation/src/main/java/com/dfsek/terra/commands/GetBlockCommand.java b/common/implementation/src/main/java/com/dfsek/terra/commands/GetBlockCommand.java index 9901a1db6..ac2b671fb 100644 --- a/common/implementation/src/main/java/com/dfsek/terra/commands/GetBlockCommand.java +++ b/common/implementation/src/main/java/com/dfsek/terra/commands/GetBlockCommand.java @@ -8,7 +8,7 @@ import com.dfsek.terra.api.command.annotation.type.PlayerCommand; import com.dfsek.terra.api.command.annotation.type.WorldCommand; import com.dfsek.terra.api.entity.CommandSender; import com.dfsek.terra.api.entity.Player; -import com.dfsek.terra.api.injection.annotations.Inject; +import com.dfsek.terra.api.inject.annotations.Inject; @WorldCommand diff --git a/common/implementation/src/main/java/com/dfsek/terra/commands/PacksCommand.java b/common/implementation/src/main/java/com/dfsek/terra/commands/PacksCommand.java index 89179f9f7..0e7a77f9d 100644 --- a/common/implementation/src/main/java/com/dfsek/terra/commands/PacksCommand.java +++ b/common/implementation/src/main/java/com/dfsek/terra/commands/PacksCommand.java @@ -5,7 +5,7 @@ import com.dfsek.terra.api.command.CommandTemplate; import com.dfsek.terra.api.command.annotation.Command; import com.dfsek.terra.api.config.ConfigPack; import com.dfsek.terra.api.entity.CommandSender; -import com.dfsek.terra.api.injection.annotations.Inject; +import com.dfsek.terra.api.inject.annotations.Inject; import com.dfsek.terra.api.registry.CheckedRegistry; import com.dfsek.terra.config.lang.LangUtil; diff --git a/common/implementation/src/main/java/com/dfsek/terra/commands/ReloadCommand.java b/common/implementation/src/main/java/com/dfsek/terra/commands/ReloadCommand.java index a4a351e6f..e58ef0e94 100644 --- a/common/implementation/src/main/java/com/dfsek/terra/commands/ReloadCommand.java +++ b/common/implementation/src/main/java/com/dfsek/terra/commands/ReloadCommand.java @@ -7,7 +7,7 @@ import com.dfsek.terra.api.TerraPlugin; import com.dfsek.terra.api.command.CommandTemplate; import com.dfsek.terra.api.command.annotation.Command; import com.dfsek.terra.api.entity.CommandSender; -import com.dfsek.terra.api.injection.annotations.Inject; +import com.dfsek.terra.api.inject.annotations.Inject; import com.dfsek.terra.config.lang.LangUtil; diff --git a/common/implementation/src/main/java/com/dfsek/terra/commands/TerraCommandManager.java b/common/implementation/src/main/java/com/dfsek/terra/commands/TerraCommandManager.java index 25dd87823..1d3cd6125 100644 --- a/common/implementation/src/main/java/com/dfsek/terra/commands/TerraCommandManager.java +++ b/common/implementation/src/main/java/com/dfsek/terra/commands/TerraCommandManager.java @@ -33,7 +33,7 @@ import com.dfsek.terra.api.command.exception.SwitchFormatException; import com.dfsek.terra.api.command.tab.TabCompleter; import com.dfsek.terra.api.entity.CommandSender; import com.dfsek.terra.api.entity.Player; -import com.dfsek.terra.api.injection.exception.InjectionException; +import com.dfsek.terra.api.inject.exception.InjectionException; import com.dfsek.terra.api.util.reflection.ReflectionUtil; import com.dfsek.terra.inject.InjectorImpl; diff --git a/common/implementation/src/main/java/com/dfsek/terra/commands/VersionCommand.java b/common/implementation/src/main/java/com/dfsek/terra/commands/VersionCommand.java index fa93809f7..f4b486936 100644 --- a/common/implementation/src/main/java/com/dfsek/terra/commands/VersionCommand.java +++ b/common/implementation/src/main/java/com/dfsek/terra/commands/VersionCommand.java @@ -4,7 +4,7 @@ import com.dfsek.terra.api.TerraPlugin; import com.dfsek.terra.api.command.CommandTemplate; import com.dfsek.terra.api.command.annotation.Command; import com.dfsek.terra.api.entity.CommandSender; -import com.dfsek.terra.api.injection.annotations.Inject; +import com.dfsek.terra.api.inject.annotations.Inject; import com.dfsek.terra.config.lang.LangUtil; diff --git a/common/implementation/src/main/java/com/dfsek/terra/commands/profiler/ProfileQueryCommand.java b/common/implementation/src/main/java/com/dfsek/terra/commands/profiler/ProfileQueryCommand.java index f95ef7e53..87bb3d9d4 100644 --- a/common/implementation/src/main/java/com/dfsek/terra/commands/profiler/ProfileQueryCommand.java +++ b/common/implementation/src/main/java/com/dfsek/terra/commands/profiler/ProfileQueryCommand.java @@ -8,7 +8,7 @@ import com.dfsek.terra.api.command.CommandTemplate; import com.dfsek.terra.api.command.annotation.Command; import com.dfsek.terra.api.command.annotation.type.DebugCommand; import com.dfsek.terra.api.entity.CommandSender; -import com.dfsek.terra.api.injection.annotations.Inject; +import com.dfsek.terra.api.inject.annotations.Inject; @Command diff --git a/common/implementation/src/main/java/com/dfsek/terra/commands/profiler/ProfileResetCommand.java b/common/implementation/src/main/java/com/dfsek/terra/commands/profiler/ProfileResetCommand.java index d9b1012ac..7be7a834e 100644 --- a/common/implementation/src/main/java/com/dfsek/terra/commands/profiler/ProfileResetCommand.java +++ b/common/implementation/src/main/java/com/dfsek/terra/commands/profiler/ProfileResetCommand.java @@ -5,7 +5,7 @@ import com.dfsek.terra.api.command.CommandTemplate; import com.dfsek.terra.api.command.annotation.Command; import com.dfsek.terra.api.command.annotation.type.DebugCommand; import com.dfsek.terra.api.entity.CommandSender; -import com.dfsek.terra.api.injection.annotations.Inject; +import com.dfsek.terra.api.inject.annotations.Inject; @Command diff --git a/common/implementation/src/main/java/com/dfsek/terra/commands/profiler/ProfileStartCommand.java b/common/implementation/src/main/java/com/dfsek/terra/commands/profiler/ProfileStartCommand.java index dff7b1da7..4d1b6568d 100644 --- a/common/implementation/src/main/java/com/dfsek/terra/commands/profiler/ProfileStartCommand.java +++ b/common/implementation/src/main/java/com/dfsek/terra/commands/profiler/ProfileStartCommand.java @@ -5,7 +5,7 @@ import com.dfsek.terra.api.command.CommandTemplate; import com.dfsek.terra.api.command.annotation.Command; import com.dfsek.terra.api.command.annotation.type.DebugCommand; import com.dfsek.terra.api.entity.CommandSender; -import com.dfsek.terra.api.injection.annotations.Inject; +import com.dfsek.terra.api.inject.annotations.Inject; @Command diff --git a/common/implementation/src/main/java/com/dfsek/terra/commands/profiler/ProfileStopCommand.java b/common/implementation/src/main/java/com/dfsek/terra/commands/profiler/ProfileStopCommand.java index 7cfb78b02..f2e1d9074 100644 --- a/common/implementation/src/main/java/com/dfsek/terra/commands/profiler/ProfileStopCommand.java +++ b/common/implementation/src/main/java/com/dfsek/terra/commands/profiler/ProfileStopCommand.java @@ -5,7 +5,7 @@ import com.dfsek.terra.api.command.CommandTemplate; import com.dfsek.terra.api.command.annotation.Command; import com.dfsek.terra.api.command.annotation.type.DebugCommand; import com.dfsek.terra.api.entity.CommandSender; -import com.dfsek.terra.api.injection.annotations.Inject; +import com.dfsek.terra.api.inject.annotations.Inject; @Command diff --git a/common/implementation/src/main/java/com/dfsek/terra/config/dummy/DummyWorld.java b/common/implementation/src/main/java/com/dfsek/terra/config/dummy/DummyWorld.java index 6aaa0976e..ee589f5fb 100644 --- a/common/implementation/src/main/java/com/dfsek/terra/config/dummy/DummyWorld.java +++ b/common/implementation/src/main/java/com/dfsek/terra/config/dummy/DummyWorld.java @@ -5,7 +5,7 @@ import com.dfsek.terra.api.block.state.BlockState; import com.dfsek.terra.api.config.WorldConfig; import com.dfsek.terra.api.entity.Entity; import com.dfsek.terra.api.entity.EntityType; -import com.dfsek.terra.api.vector.Vector3; +import com.dfsek.terra.api.util.vector.Vector3; import com.dfsek.terra.api.world.Chunk; import com.dfsek.terra.api.world.World; import com.dfsek.terra.api.world.biome.generation.BiomeProvider; diff --git a/common/implementation/src/main/java/com/dfsek/terra/inject/InjectorImpl.java b/common/implementation/src/main/java/com/dfsek/terra/inject/InjectorImpl.java index 8bb2e4fd6..f6ccb6e07 100644 --- a/common/implementation/src/main/java/com/dfsek/terra/inject/InjectorImpl.java +++ b/common/implementation/src/main/java/com/dfsek/terra/inject/InjectorImpl.java @@ -5,9 +5,9 @@ import java.lang.reflect.Modifier; import java.util.HashSet; import java.util.Set; -import com.dfsek.terra.api.injection.Injector; -import com.dfsek.terra.api.injection.annotations.Inject; -import com.dfsek.terra.api.injection.exception.InjectionException; +import com.dfsek.terra.api.inject.Injector; +import com.dfsek.terra.api.inject.annotations.Inject; +import com.dfsek.terra.api.inject.exception.InjectionException; import com.dfsek.terra.api.util.reflection.ReflectionUtil; diff --git a/common/implementation/src/main/java/com/dfsek/terra/math/GridSpawn.java b/common/implementation/src/main/java/com/dfsek/terra/math/GridSpawn.java index 8d2be0992..f1b870b1e 100644 --- a/common/implementation/src/main/java/com/dfsek/terra/math/GridSpawn.java +++ b/common/implementation/src/main/java/com/dfsek/terra/math/GridSpawn.java @@ -5,7 +5,7 @@ import java.util.List; import java.util.Random; import com.dfsek.terra.api.util.PopulationUtil; -import com.dfsek.terra.api.vector.Vector3; +import com.dfsek.terra.api.util.vector.Vector3; import com.dfsek.terra.util.FastRandom; diff --git a/common/implementation/src/main/java/com/dfsek/terra/registry/master/AddonRegistry.java b/common/implementation/src/main/java/com/dfsek/terra/registry/master/AddonRegistry.java index 0f13bb637..1b685b505 100644 --- a/common/implementation/src/main/java/com/dfsek/terra/registry/master/AddonRegistry.java +++ b/common/implementation/src/main/java/com/dfsek/terra/registry/master/AddonRegistry.java @@ -15,8 +15,8 @@ import com.dfsek.terra.addon.PreLoadAddon; import com.dfsek.terra.addon.exception.AddonLoadException; import com.dfsek.terra.api.TerraPlugin; import com.dfsek.terra.api.addon.TerraAddon; +import com.dfsek.terra.api.inject.exception.InjectionException; import com.dfsek.terra.api.injection.Injector; -import com.dfsek.terra.api.injection.exception.InjectionException; import com.dfsek.terra.api.registry.exception.DuplicateEntryException; import com.dfsek.terra.inject.InjectorImpl; import com.dfsek.terra.registry.OpenRegistryImpl; diff --git a/common/implementation/src/main/java/com/dfsek/terra/world/SamplerCacheImpl.java b/common/implementation/src/main/java/com/dfsek/terra/world/SamplerCacheImpl.java index 6ba0a0d7e..115ea3d0c 100644 --- a/common/implementation/src/main/java/com/dfsek/terra/world/SamplerCacheImpl.java +++ b/common/implementation/src/main/java/com/dfsek/terra/world/SamplerCacheImpl.java @@ -9,7 +9,7 @@ import org.jetbrains.annotations.NotNull; import com.dfsek.terra.api.TerraPlugin; import com.dfsek.terra.api.util.MathUtil; import com.dfsek.terra.api.world.World; -import com.dfsek.terra.api.world.generator.Sampler; +import com.dfsek.terra.api.util.math.Sampler; public class SamplerCacheImpl implements com.dfsek.terra.api.world.generator.SamplerCache { diff --git a/common/loader/addon/build.gradle.kts b/common/loader/addon/build.gradle.kts index f2cb9058c..e4239d784 100644 --- a/common/loader/addon/build.gradle.kts +++ b/common/loader/addon/build.gradle.kts @@ -1,3 +1,3 @@ dependencies { - "shadedApi"(project(":common:api:core")) + "shadedApi"(project(":common:api")) } diff --git a/common/loader/config/build.gradle.kts b/common/loader/config/build.gradle.kts deleted file mode 100644 index f2cb9058c..000000000 --- a/common/loader/config/build.gradle.kts +++ /dev/null @@ -1,3 +0,0 @@ -dependencies { - "shadedApi"(project(":common:api:core")) -} diff --git a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/BukkitEntity.java b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/BukkitEntity.java index 605e69993..7f2890192 100644 --- a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/BukkitEntity.java +++ b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/BukkitEntity.java @@ -3,7 +3,7 @@ package com.dfsek.terra.bukkit; import org.bukkit.Location; import com.dfsek.terra.api.entity.Entity; -import com.dfsek.terra.api.vector.Vector3; +import com.dfsek.terra.api.util.vector.Vector3; import com.dfsek.terra.api.world.World; import com.dfsek.terra.bukkit.world.BukkitAdapter; diff --git a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/BukkitPlayer.java b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/BukkitPlayer.java index bf37cba5a..0f516fd20 100644 --- a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/BukkitPlayer.java +++ b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/BukkitPlayer.java @@ -3,7 +3,7 @@ package com.dfsek.terra.bukkit; import org.bukkit.Location; import com.dfsek.terra.api.entity.Player; -import com.dfsek.terra.api.vector.Vector3; +import com.dfsek.terra.api.util.vector.Vector3; import com.dfsek.terra.api.world.World; import com.dfsek.terra.bukkit.world.BukkitAdapter; diff --git a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/handles/BukkitWorldHandle.java b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/handles/BukkitWorldHandle.java index ce48768e8..c4c6917e6 100644 --- a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/handles/BukkitWorldHandle.java +++ b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/handles/BukkitWorldHandle.java @@ -12,7 +12,7 @@ import com.dfsek.terra.api.entity.EntityType; import com.dfsek.terra.api.entity.Player; import com.dfsek.terra.api.handle.WorldHandle; import com.dfsek.terra.api.util.generic.pair.Pair; -import com.dfsek.terra.api.vector.Vector3; +import com.dfsek.terra.api.util.vector.Vector3; import com.dfsek.terra.bukkit.structure.WorldEditUtil; import com.dfsek.terra.bukkit.world.BukkitAdapter; import com.dfsek.terra.bukkit.world.block.data.BukkitBlockState; diff --git a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/listeners/CommonListener.java b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/listeners/CommonListener.java index 103339184..a51ef9d61 100644 --- a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/listeners/CommonListener.java +++ b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/listeners/CommonListener.java @@ -11,7 +11,7 @@ import org.bukkit.event.world.StructureGrowEvent; import com.dfsek.terra.api.TerraPlugin; import com.dfsek.terra.api.config.WorldConfig; -import com.dfsek.terra.api.vector.Vector3; +import com.dfsek.terra.api.util.vector.Vector3; import com.dfsek.terra.api.world.Tree; import com.dfsek.terra.api.world.World; import com.dfsek.terra.bukkit.world.BukkitAdapter; diff --git a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/world/BukkitAdapter.java b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/world/BukkitAdapter.java index f2f61d7b6..f9fb0f64e 100644 --- a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/world/BukkitAdapter.java +++ b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/world/BukkitAdapter.java @@ -17,7 +17,7 @@ import com.dfsek.terra.api.block.state.properties.enums.RedstoneConnection; import com.dfsek.terra.api.entity.CommandSender; import com.dfsek.terra.api.inventory.ItemStack; import com.dfsek.terra.api.inventory.item.Enchantment; -import com.dfsek.terra.api.vector.Vector3; +import com.dfsek.terra.api.util.vector.Vector3; import com.dfsek.terra.api.world.Chunk; import com.dfsek.terra.api.world.World; import com.dfsek.terra.bukkit.BukkitCommandSender; diff --git a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/world/BukkitTree.java b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/world/BukkitTree.java index 9f9b46afd..6758f1d85 100644 --- a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/world/BukkitTree.java +++ b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/world/BukkitTree.java @@ -9,7 +9,7 @@ import com.dfsek.terra.api.TerraPlugin; import com.dfsek.terra.api.handle.WorldHandle; import com.dfsek.terra.api.profiler.ProfileFrame; import com.dfsek.terra.api.util.collection.MaterialSet; -import com.dfsek.terra.api.vector.Vector3; +import com.dfsek.terra.api.util.vector.Vector3; import com.dfsek.terra.api.world.Tree; import com.dfsek.terra.api.world.World; diff --git a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/world/BukkitWorld.java b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/world/BukkitWorld.java index 5adbe2d42..69512869b 100644 --- a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/world/BukkitWorld.java +++ b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/world/BukkitWorld.java @@ -8,7 +8,7 @@ import com.dfsek.terra.api.block.state.BlockState; import com.dfsek.terra.api.config.WorldConfig; import com.dfsek.terra.api.entity.Entity; import com.dfsek.terra.api.entity.EntityType; -import com.dfsek.terra.api.vector.Vector3; +import com.dfsek.terra.api.util.vector.Vector3; import com.dfsek.terra.api.world.Chunk; import com.dfsek.terra.api.world.World; import com.dfsek.terra.api.world.biome.generation.BiomeProvider; diff --git a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/world/block/state/BukkitBlockEntity.java b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/world/block/state/BukkitBlockEntity.java index 8524d3a00..05e7b0c3e 100644 --- a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/world/block/state/BukkitBlockEntity.java +++ b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/world/block/state/BukkitBlockEntity.java @@ -6,7 +6,7 @@ import org.bukkit.block.Sign; import com.dfsek.terra.api.block.entity.BlockEntity; import com.dfsek.terra.api.block.state.BlockState; -import com.dfsek.terra.api.vector.Vector3; +import com.dfsek.terra.api.util.vector.Vector3; import com.dfsek.terra.bukkit.world.BukkitAdapter; import com.dfsek.terra.bukkit.world.block.data.BukkitBlockState; diff --git a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/handle/FabricWorldHandle.java b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/handle/FabricWorldHandle.java index 401bb795c..6d84de06c 100644 --- a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/handle/FabricWorldHandle.java +++ b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/handle/FabricWorldHandle.java @@ -14,7 +14,7 @@ import com.dfsek.terra.api.entity.EntityType; import com.dfsek.terra.api.entity.Player; import com.dfsek.terra.api.handle.WorldHandle; import com.dfsek.terra.api.util.generic.pair.Pair; -import com.dfsek.terra.api.vector.Vector3; +import com.dfsek.terra.api.util.vector.Vector3; import com.dfsek.terra.fabric.block.FabricBlockState; import com.dfsek.terra.fabric.util.FabricAdapter; import com.dfsek.terra.fabric.util.WorldEditUtil; diff --git a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/mixin/implementations/ConfiguredFeatureMixin.java b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/mixin/implementations/ConfiguredFeatureMixin.java index a50074e4e..5d781edc0 100644 --- a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/mixin/implementations/ConfiguredFeatureMixin.java +++ b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/mixin/implementations/ConfiguredFeatureMixin.java @@ -18,7 +18,7 @@ import java.util.Set; import com.dfsek.terra.api.block.BlockType; import com.dfsek.terra.api.profiler.ProfileFrame; import com.dfsek.terra.api.util.collection.MaterialSet; -import com.dfsek.terra.api.vector.Vector3; +import com.dfsek.terra.api.util.vector.Vector3; import com.dfsek.terra.api.world.Tree; import com.dfsek.terra.api.world.World; import com.dfsek.terra.fabric.FabricEntryPoint; diff --git a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/mixin/implementations/entity/EntityMixin.java b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/mixin/implementations/entity/EntityMixin.java index c27719b84..865a0802d 100644 --- a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/mixin/implementations/entity/EntityMixin.java +++ b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/mixin/implementations/entity/EntityMixin.java @@ -12,7 +12,7 @@ import org.spongepowered.asm.mixin.Shadow; import java.util.UUID; -import com.dfsek.terra.api.vector.Vector3; +import com.dfsek.terra.api.util.vector.Vector3; import com.dfsek.terra.api.world.World; import com.dfsek.terra.fabric.util.FabricAdapter; diff --git a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/mixin/implementations/world/ChunkRegionMixin.java b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/mixin/implementations/world/ChunkRegionMixin.java index f7da37cea..0a0bf443c 100644 --- a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/mixin/implementations/world/ChunkRegionMixin.java +++ b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/mixin/implementations/world/ChunkRegionMixin.java @@ -26,7 +26,7 @@ import com.dfsek.terra.api.block.state.BlockState; import com.dfsek.terra.api.config.WorldConfig; import com.dfsek.terra.api.entity.Entity; import com.dfsek.terra.api.entity.EntityType; -import com.dfsek.terra.api.vector.Vector3; +import com.dfsek.terra.api.util.vector.Vector3; import com.dfsek.terra.api.world.Chunk; import com.dfsek.terra.api.world.World; import com.dfsek.terra.api.world.biome.generation.BiomeProvider; diff --git a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/mixin/implementations/world/ServerWorldMixin.java b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/mixin/implementations/world/ServerWorldMixin.java index 0fcd2187e..5d892e787 100644 --- a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/mixin/implementations/world/ServerWorldMixin.java +++ b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/mixin/implementations/world/ServerWorldMixin.java @@ -30,7 +30,7 @@ import com.dfsek.terra.api.block.state.BlockState; import com.dfsek.terra.api.config.WorldConfig; import com.dfsek.terra.api.entity.Entity; import com.dfsek.terra.api.entity.EntityType; -import com.dfsek.terra.api.vector.Vector3; +import com.dfsek.terra.api.util.vector.Vector3; import com.dfsek.terra.api.world.Chunk; import com.dfsek.terra.api.world.World; import com.dfsek.terra.api.world.biome.generation.BiomeProvider; diff --git a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/util/FabricAdapter.java b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/util/FabricAdapter.java index da1f132c8..5b3e689ef 100644 --- a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/util/FabricAdapter.java +++ b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/util/FabricAdapter.java @@ -12,7 +12,7 @@ import com.dfsek.terra.api.block.state.properties.enums.Half; import com.dfsek.terra.api.block.state.properties.enums.RailShape; import com.dfsek.terra.api.block.state.properties.enums.RedstoneConnection; import com.dfsek.terra.api.block.state.properties.enums.WallHeight; -import com.dfsek.terra.api.vector.Vector3; +import com.dfsek.terra.api.util.vector.Vector3; import com.dfsek.terra.fabric.block.FabricBlockState; diff --git a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/util/WorldEditUtil.java b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/util/WorldEditUtil.java index 88fdd73f3..770b93f8a 100644 --- a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/util/WorldEditUtil.java +++ b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/util/WorldEditUtil.java @@ -9,7 +9,7 @@ import net.minecraft.world.World; import com.dfsek.terra.api.entity.Player; import com.dfsek.terra.api.util.generic.pair.Pair; -import com.dfsek.terra.api.vector.Vector3; +import com.dfsek.terra.api.util.vector.Vector3; public final class WorldEditUtil { diff --git a/platforms/sponge/src/main/java/com/dfsek/terra/sponge/handle/SpongeWorldHandle.java b/platforms/sponge/src/main/java/com/dfsek/terra/sponge/handle/SpongeWorldHandle.java index 80dd0618b..19df58535 100644 --- a/platforms/sponge/src/main/java/com/dfsek/terra/sponge/handle/SpongeWorldHandle.java +++ b/platforms/sponge/src/main/java/com/dfsek/terra/sponge/handle/SpongeWorldHandle.java @@ -7,7 +7,7 @@ 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.api.util.generic.Lazy; -import com.dfsek.terra.api.vector.Vector3; +import com.dfsek.terra.api.util.vector.Vector3; import com.dfsek.terra.sponge.block.SpongeBlockState; diff --git a/settings.gradle.kts b/settings.gradle.kts index 4a7b3993d..3b73c0752 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -2,7 +2,6 @@ rootProject.name = "Terra" include("common:implementation") -include("common:loader:config") include("common:loader:addon") fun includeImmediateChildren(dir: File, type: String) {