From ee529a5973526f833406c200d49b50a5c3d800ed Mon Sep 17 00:00:00 2001 From: dfsek Date: Thu, 10 Dec 2020 21:39:31 -0700 Subject: [PATCH] refactor --- .../java/com/dfsek/terra/api/gaea/tree/TreeType.java | 2 +- .../dfsek/terra/api/gaea/tree/fractal/FractalTree.java | 2 +- .../java/com/dfsek/terra/api/gaea/world/FloraType.java | 2 +- .../{ => implementations}/bukkit/BukkitBiomeGrid.java | 4 ++-- .../api/{ => implementations}/bukkit/BukkitChunk.java | 4 ++-- .../api/{ => implementations}/bukkit/BukkitWorld.java | 6 +++--- .../bukkit/BukkitWorldHandle.java | 10 +++++----- .../bukkit/TerraBukkitPlugin.java | 4 ++-- .../bukkit/generator/BukkitChunkGenerator.java | 8 ++++---- .../bukkit/generator/BukkitChunkGeneratorWrapper.java | 6 +++--- .../bukkit/generator/BukkitPopulator.java | 6 +++--- .../bukkit/world/BukkitBiome.java | 2 +- .../bukkit/world/block/BukkitBlock.java | 6 +++--- .../bukkit/world/block/BukkitBlockData.java | 2 +- .../bukkit/world/block/BukkitMaterialData.java | 2 +- .../bukkit/world/block/data/BukkitEnumAdapter.java | 2 +- .../bukkit/world/block/data/BukkitStairs.java | 4 ++-- .../bukkit/world/block/data/BukkitWaterlogged.java | 4 ++-- .../java/com/dfsek/terra/async/AsyncBiomeFinder.java | 2 +- .../java/com/dfsek/terra/async/AsyncFeatureFinder.java | 2 +- .../com/dfsek/terra/async/AsyncStructureFinder.java | 4 ++-- .../java/com/dfsek/terra/command/PacksCommand.java | 2 +- .../java/com/dfsek/terra/command/ReloadCommand.java | 2 +- .../dfsek/terra/command/biome/BiomeInfoCommand.java | 4 ++-- .../com/dfsek/terra/command/profile/QueryCommand.java | 4 ++-- .../com/dfsek/terra/command/profile/ResetCommand.java | 4 ++-- .../com/dfsek/terra/command/profile/StartCommand.java | 4 ++-- .../com/dfsek/terra/command/profile/StopCommand.java | 4 ++-- .../java/com/dfsek/terra/config/base/PluginConfig.java | 2 +- .../java/com/dfsek/terra/config/lang/LangUtil.java | 2 +- .../dfsek/terra/config/templates/FloraTemplate.java | 2 +- .../java/com/dfsek/terra/debug/gui/DebugFrame.java | 2 +- src/main/java/com/dfsek/terra/debug/gui/DebugGUI.java | 2 +- .../dfsek/terra/generation/TerraChunkGenerator.java | 2 +- .../dfsek/terra/generation/items/tree/TerraTree.java | 2 +- src/main/java/com/dfsek/terra/image/ImageLoader.java | 2 +- .../com/dfsek/terra/image/WorldImageGenerator.java | 2 +- .../java/com/dfsek/terra/listeners/EventListener.java | 2 +- .../java/com/dfsek/terra/listeners/SpigotListener.java | 2 +- .../java/com/dfsek/terra/population/CavePopulator.java | 2 +- .../com/dfsek/terra/population/FloraPopulator.java | 2 +- .../java/com/dfsek/terra/population/OrePopulator.java | 2 +- .../com/dfsek/terra/population/StructurePopulator.java | 2 +- .../java/com/dfsek/terra/population/TreePopulator.java | 2 +- .../java/com/dfsek/terra/registry/ConfigRegistry.java | 2 +- .../java/com/dfsek/terra/registry/PaletteRegistry.java | 2 +- src/main/java/com/dfsek/terra/structure/Structure.java | 2 +- .../terra/structure/StructureSpawnRequirement.java | 2 +- .../java/com/dfsek/terra/structure/spawn/AirSpawn.java | 2 +- .../com/dfsek/terra/structure/spawn/LandSpawn.java | 2 +- .../com/dfsek/terra/structure/spawn/OceanSpawn.java | 2 +- .../com/dfsek/terra/structure/spawn/Requirement.java | 2 +- src/main/resources/plugin.yml | 2 +- 53 files changed, 79 insertions(+), 79 deletions(-) rename src/main/java/com/dfsek/terra/api/{ => implementations}/bukkit/BukkitBiomeGrid.java (89%) rename src/main/java/com/dfsek/terra/api/{ => implementations}/bukkit/BukkitChunk.java (86%) rename src/main/java/com/dfsek/terra/api/{ => implementations}/bukkit/BukkitWorld.java (91%) rename src/main/java/com/dfsek/terra/api/{ => implementations}/bukkit/BukkitWorldHandle.java (77%) rename src/main/java/com/dfsek/terra/api/{ => implementations}/bukkit/TerraBukkitPlugin.java (97%) rename src/main/java/com/dfsek/terra/api/{ => implementations}/bukkit/generator/BukkitChunkGenerator.java (90%) rename src/main/java/com/dfsek/terra/api/{ => implementations}/bukkit/generator/BukkitChunkGeneratorWrapper.java (83%) rename src/main/java/com/dfsek/terra/api/{ => implementations}/bukkit/generator/BukkitPopulator.java (79%) rename src/main/java/com/dfsek/terra/api/{ => implementations}/bukkit/world/BukkitBiome.java (84%) rename src/main/java/com/dfsek/terra/api/{ => implementations}/bukkit/world/block/BukkitBlock.java (89%) rename src/main/java/com/dfsek/terra/api/{ => implementations}/bukkit/world/block/BukkitBlockData.java (93%) rename src/main/java/com/dfsek/terra/api/{ => implementations}/bukkit/world/block/BukkitMaterialData.java (93%) rename src/main/java/com/dfsek/terra/api/{ => implementations}/bukkit/world/block/data/BukkitEnumAdapter.java (98%) rename src/main/java/com/dfsek/terra/api/{ => implementations}/bukkit/world/block/data/BukkitStairs.java (90%) rename src/main/java/com/dfsek/terra/api/{ => implementations}/bukkit/world/block/data/BukkitWaterlogged.java (77%) diff --git a/src/main/java/com/dfsek/terra/api/gaea/tree/TreeType.java b/src/main/java/com/dfsek/terra/api/gaea/tree/TreeType.java index e83b99747..d19c5b14b 100644 --- a/src/main/java/com/dfsek/terra/api/gaea/tree/TreeType.java +++ b/src/main/java/com/dfsek/terra/api/gaea/tree/TreeType.java @@ -1,9 +1,9 @@ package com.dfsek.terra.api.gaea.tree; -import com.dfsek.terra.api.bukkit.world.block.BukkitMaterialData; import com.dfsek.terra.api.gaea.tree.fractal.FractalTree; import com.dfsek.terra.api.generic.world.block.MaterialData; import com.dfsek.terra.api.generic.world.vector.Location; +import com.dfsek.terra.api.implementations.bukkit.world.block.BukkitMaterialData; import com.google.common.collect.Sets; import org.bukkit.Material; diff --git a/src/main/java/com/dfsek/terra/api/gaea/tree/fractal/FractalTree.java b/src/main/java/com/dfsek/terra/api/gaea/tree/fractal/FractalTree.java index 274afa51a..4bd4409db 100644 --- a/src/main/java/com/dfsek/terra/api/gaea/tree/fractal/FractalTree.java +++ b/src/main/java/com/dfsek/terra/api/gaea/tree/fractal/FractalTree.java @@ -1,10 +1,10 @@ package com.dfsek.terra.api.gaea.tree.fractal; -import com.dfsek.terra.api.bukkit.world.block.BukkitBlockData; import com.dfsek.terra.api.gaea.util.GlueList; import com.dfsek.terra.api.generic.world.block.BlockData; import com.dfsek.terra.api.generic.world.block.MaterialData; import com.dfsek.terra.api.generic.world.vector.Location; +import com.dfsek.terra.api.implementations.bukkit.world.block.BukkitBlockData; import org.bukkit.Material; import org.bukkit.entity.Entity; import org.bukkit.util.Consumer; diff --git a/src/main/java/com/dfsek/terra/api/gaea/world/FloraType.java b/src/main/java/com/dfsek/terra/api/gaea/world/FloraType.java index d59730594..f13ed9f02 100644 --- a/src/main/java/com/dfsek/terra/api/gaea/world/FloraType.java +++ b/src/main/java/com/dfsek/terra/api/gaea/world/FloraType.java @@ -1,6 +1,5 @@ package com.dfsek.terra.api.gaea.world; -import com.dfsek.terra.api.bukkit.world.block.BukkitBlockData; import com.dfsek.terra.api.gaea.math.Range; import com.dfsek.terra.api.gaea.util.GlueList; import com.dfsek.terra.api.generic.world.Chunk; @@ -8,6 +7,7 @@ import com.dfsek.terra.api.generic.world.block.Block; import com.dfsek.terra.api.generic.world.block.BlockData; import com.dfsek.terra.api.generic.world.block.BlockFace; import com.dfsek.terra.api.generic.world.vector.Location; +import com.dfsek.terra.api.implementations.bukkit.world.block.BukkitBlockData; import com.google.common.collect.Sets; import org.bukkit.Bukkit; import org.bukkit.Material; diff --git a/src/main/java/com/dfsek/terra/api/bukkit/BukkitBiomeGrid.java b/src/main/java/com/dfsek/terra/api/implementations/bukkit/BukkitBiomeGrid.java similarity index 89% rename from src/main/java/com/dfsek/terra/api/bukkit/BukkitBiomeGrid.java rename to src/main/java/com/dfsek/terra/api/implementations/bukkit/BukkitBiomeGrid.java index 58f79ad7a..7f637ec62 100644 --- a/src/main/java/com/dfsek/terra/api/bukkit/BukkitBiomeGrid.java +++ b/src/main/java/com/dfsek/terra/api/implementations/bukkit/BukkitBiomeGrid.java @@ -1,8 +1,8 @@ -package com.dfsek.terra.api.bukkit; +package com.dfsek.terra.api.implementations.bukkit; -import com.dfsek.terra.api.bukkit.world.BukkitBiome; import com.dfsek.terra.api.generic.world.Biome; import com.dfsek.terra.api.generic.world.BiomeGrid; +import com.dfsek.terra.api.implementations.bukkit.world.BukkitBiome; import org.bukkit.generator.ChunkGenerator; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/com/dfsek/terra/api/bukkit/BukkitChunk.java b/src/main/java/com/dfsek/terra/api/implementations/bukkit/BukkitChunk.java similarity index 86% rename from src/main/java/com/dfsek/terra/api/bukkit/BukkitChunk.java rename to src/main/java/com/dfsek/terra/api/implementations/bukkit/BukkitChunk.java index 7d5bd7b84..94a9f8f61 100644 --- a/src/main/java/com/dfsek/terra/api/bukkit/BukkitChunk.java +++ b/src/main/java/com/dfsek/terra/api/implementations/bukkit/BukkitChunk.java @@ -1,9 +1,9 @@ -package com.dfsek.terra.api.bukkit; +package com.dfsek.terra.api.implementations.bukkit; -import com.dfsek.terra.api.bukkit.world.block.BukkitBlock; import com.dfsek.terra.api.generic.world.Chunk; import com.dfsek.terra.api.generic.world.World; import com.dfsek.terra.api.generic.world.block.Block; +import com.dfsek.terra.api.implementations.bukkit.world.block.BukkitBlock; public class BukkitChunk implements Chunk { private final org.bukkit.Chunk delegate; diff --git a/src/main/java/com/dfsek/terra/api/bukkit/BukkitWorld.java b/src/main/java/com/dfsek/terra/api/implementations/bukkit/BukkitWorld.java similarity index 91% rename from src/main/java/com/dfsek/terra/api/bukkit/BukkitWorld.java rename to src/main/java/com/dfsek/terra/api/implementations/bukkit/BukkitWorld.java index 79af467ab..9a9fd0b55 100644 --- a/src/main/java/com/dfsek/terra/api/bukkit/BukkitWorld.java +++ b/src/main/java/com/dfsek/terra/api/implementations/bukkit/BukkitWorld.java @@ -1,12 +1,12 @@ -package com.dfsek.terra.api.bukkit; +package com.dfsek.terra.api.implementations.bukkit; -import com.dfsek.terra.api.bukkit.generator.BukkitChunkGenerator; -import com.dfsek.terra.api.bukkit.world.block.BukkitBlock; import com.dfsek.terra.api.generic.generator.ChunkGenerator; import com.dfsek.terra.api.generic.world.Chunk; import com.dfsek.terra.api.generic.world.World; import com.dfsek.terra.api.generic.world.block.Block; import com.dfsek.terra.api.generic.world.vector.Location; +import com.dfsek.terra.api.implementations.bukkit.generator.BukkitChunkGenerator; +import com.dfsek.terra.api.implementations.bukkit.world.block.BukkitBlock; import org.bukkit.TreeType; import org.bukkit.entity.Entity; import org.bukkit.util.Consumer; diff --git a/src/main/java/com/dfsek/terra/api/bukkit/BukkitWorldHandle.java b/src/main/java/com/dfsek/terra/api/implementations/bukkit/BukkitWorldHandle.java similarity index 77% rename from src/main/java/com/dfsek/terra/api/bukkit/BukkitWorldHandle.java rename to src/main/java/com/dfsek/terra/api/implementations/bukkit/BukkitWorldHandle.java index b8c2ec442..f0285167b 100644 --- a/src/main/java/com/dfsek/terra/api/bukkit/BukkitWorldHandle.java +++ b/src/main/java/com/dfsek/terra/api/implementations/bukkit/BukkitWorldHandle.java @@ -1,14 +1,14 @@ -package com.dfsek.terra.api.bukkit; +package com.dfsek.terra.api.implementations.bukkit; -import com.dfsek.terra.api.bukkit.world.block.BukkitBlockData; -import com.dfsek.terra.api.bukkit.world.block.BukkitMaterialData; -import com.dfsek.terra.api.bukkit.world.block.data.BukkitStairs; -import com.dfsek.terra.api.bukkit.world.block.data.BukkitWaterlogged; import com.dfsek.terra.api.generic.world.WorldHandle; import com.dfsek.terra.api.generic.world.block.Block; import com.dfsek.terra.api.generic.world.block.BlockData; import com.dfsek.terra.api.generic.world.block.MaterialData; import com.dfsek.terra.api.generic.world.block.data.Waterlogged; +import com.dfsek.terra.api.implementations.bukkit.world.block.BukkitBlockData; +import com.dfsek.terra.api.implementations.bukkit.world.block.BukkitMaterialData; +import com.dfsek.terra.api.implementations.bukkit.world.block.data.BukkitStairs; +import com.dfsek.terra.api.implementations.bukkit.world.block.data.BukkitWaterlogged; import org.bukkit.Bukkit; import org.bukkit.Material; import org.bukkit.block.data.type.Stairs; diff --git a/src/main/java/com/dfsek/terra/api/bukkit/TerraBukkitPlugin.java b/src/main/java/com/dfsek/terra/api/implementations/bukkit/TerraBukkitPlugin.java similarity index 97% rename from src/main/java/com/dfsek/terra/api/bukkit/TerraBukkitPlugin.java rename to src/main/java/com/dfsek/terra/api/implementations/bukkit/TerraBukkitPlugin.java index b2c55729f..52a9495d9 100644 --- a/src/main/java/com/dfsek/terra/api/bukkit/TerraBukkitPlugin.java +++ b/src/main/java/com/dfsek/terra/api/implementations/bukkit/TerraBukkitPlugin.java @@ -1,13 +1,13 @@ -package com.dfsek.terra.api.bukkit; +package com.dfsek.terra.api.implementations.bukkit; import com.dfsek.tectonic.loading.TypeRegistry; import com.dfsek.terra.TerraWorld; -import com.dfsek.terra.api.bukkit.generator.BukkitChunkGeneratorWrapper; import com.dfsek.terra.api.gaea.GaeaPlugin; import com.dfsek.terra.api.gaea.lang.Language; import com.dfsek.terra.api.generic.TerraPlugin; import com.dfsek.terra.api.generic.world.World; import com.dfsek.terra.api.generic.world.WorldHandle; +import com.dfsek.terra.api.implementations.bukkit.generator.BukkitChunkGeneratorWrapper; import com.dfsek.terra.command.TerraCommand; import com.dfsek.terra.command.structure.LocateCommand; import com.dfsek.terra.config.base.ConfigPack; diff --git a/src/main/java/com/dfsek/terra/api/bukkit/generator/BukkitChunkGenerator.java b/src/main/java/com/dfsek/terra/api/implementations/bukkit/generator/BukkitChunkGenerator.java similarity index 90% rename from src/main/java/com/dfsek/terra/api/bukkit/generator/BukkitChunkGenerator.java rename to src/main/java/com/dfsek/terra/api/implementations/bukkit/generator/BukkitChunkGenerator.java index 8e6e847d9..83a4f1a26 100644 --- a/src/main/java/com/dfsek/terra/api/bukkit/generator/BukkitChunkGenerator.java +++ b/src/main/java/com/dfsek/terra/api/implementations/bukkit/generator/BukkitChunkGenerator.java @@ -1,12 +1,12 @@ -package com.dfsek.terra.api.bukkit.generator; +package com.dfsek.terra.api.implementations.bukkit.generator; -import com.dfsek.terra.api.bukkit.BukkitBiomeGrid; -import com.dfsek.terra.api.bukkit.BukkitWorld; -import com.dfsek.terra.api.bukkit.world.block.BukkitBlockData; import com.dfsek.terra.api.generic.generator.BlockPopulator; import com.dfsek.terra.api.generic.world.BiomeGrid; import com.dfsek.terra.api.generic.world.World; import com.dfsek.terra.api.generic.world.block.BlockData; +import com.dfsek.terra.api.implementations.bukkit.BukkitBiomeGrid; +import com.dfsek.terra.api.implementations.bukkit.BukkitWorld; +import com.dfsek.terra.api.implementations.bukkit.world.block.BukkitBlockData; import org.bukkit.generator.ChunkGenerator; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/com/dfsek/terra/api/bukkit/generator/BukkitChunkGeneratorWrapper.java b/src/main/java/com/dfsek/terra/api/implementations/bukkit/generator/BukkitChunkGeneratorWrapper.java similarity index 83% rename from src/main/java/com/dfsek/terra/api/bukkit/generator/BukkitChunkGeneratorWrapper.java rename to src/main/java/com/dfsek/terra/api/implementations/bukkit/generator/BukkitChunkGeneratorWrapper.java index 2574cf96d..f3d7d470e 100644 --- a/src/main/java/com/dfsek/terra/api/bukkit/generator/BukkitChunkGeneratorWrapper.java +++ b/src/main/java/com/dfsek/terra/api/implementations/bukkit/generator/BukkitChunkGeneratorWrapper.java @@ -1,8 +1,8 @@ -package com.dfsek.terra.api.bukkit.generator; +package com.dfsek.terra.api.implementations.bukkit.generator; -import com.dfsek.terra.api.bukkit.BukkitBiomeGrid; -import com.dfsek.terra.api.bukkit.BukkitWorld; import com.dfsek.terra.api.generic.generator.TerraChunkGenerator; +import com.dfsek.terra.api.implementations.bukkit.BukkitBiomeGrid; +import com.dfsek.terra.api.implementations.bukkit.BukkitWorld; import org.bukkit.World; import org.bukkit.generator.ChunkGenerator; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/com/dfsek/terra/api/bukkit/generator/BukkitPopulator.java b/src/main/java/com/dfsek/terra/api/implementations/bukkit/generator/BukkitPopulator.java similarity index 79% rename from src/main/java/com/dfsek/terra/api/bukkit/generator/BukkitPopulator.java rename to src/main/java/com/dfsek/terra/api/implementations/bukkit/generator/BukkitPopulator.java index 85a218c1e..2562f0f62 100644 --- a/src/main/java/com/dfsek/terra/api/bukkit/generator/BukkitPopulator.java +++ b/src/main/java/com/dfsek/terra/api/implementations/bukkit/generator/BukkitPopulator.java @@ -1,10 +1,10 @@ -package com.dfsek.terra.api.bukkit.generator; +package com.dfsek.terra.api.implementations.bukkit.generator; -import com.dfsek.terra.api.bukkit.BukkitChunk; -import com.dfsek.terra.api.bukkit.BukkitWorld; import com.dfsek.terra.api.generic.generator.BlockPopulator; import com.dfsek.terra.api.generic.world.Chunk; import com.dfsek.terra.api.generic.world.World; +import com.dfsek.terra.api.implementations.bukkit.BukkitChunk; +import com.dfsek.terra.api.implementations.bukkit.BukkitWorld; import java.util.Random; diff --git a/src/main/java/com/dfsek/terra/api/bukkit/world/BukkitBiome.java b/src/main/java/com/dfsek/terra/api/implementations/bukkit/world/BukkitBiome.java similarity index 84% rename from src/main/java/com/dfsek/terra/api/bukkit/world/BukkitBiome.java rename to src/main/java/com/dfsek/terra/api/implementations/bukkit/world/BukkitBiome.java index e7b44fb0e..600e18be9 100644 --- a/src/main/java/com/dfsek/terra/api/bukkit/world/BukkitBiome.java +++ b/src/main/java/com/dfsek/terra/api/implementations/bukkit/world/BukkitBiome.java @@ -1,4 +1,4 @@ -package com.dfsek.terra.api.bukkit.world; +package com.dfsek.terra.api.implementations.bukkit.world; import com.dfsek.terra.api.generic.world.Biome; diff --git a/src/main/java/com/dfsek/terra/api/bukkit/world/block/BukkitBlock.java b/src/main/java/com/dfsek/terra/api/implementations/bukkit/world/block/BukkitBlock.java similarity index 89% rename from src/main/java/com/dfsek/terra/api/bukkit/world/block/BukkitBlock.java rename to src/main/java/com/dfsek/terra/api/implementations/bukkit/world/block/BukkitBlock.java index 3985e2945..4cf0129f0 100644 --- a/src/main/java/com/dfsek/terra/api/bukkit/world/block/BukkitBlock.java +++ b/src/main/java/com/dfsek/terra/api/implementations/bukkit/world/block/BukkitBlock.java @@ -1,12 +1,12 @@ -package com.dfsek.terra.api.bukkit.world.block; +package com.dfsek.terra.api.implementations.bukkit.world.block; -import com.dfsek.terra.api.bukkit.BukkitWorld; -import com.dfsek.terra.api.bukkit.world.block.data.BukkitEnumAdapter; import com.dfsek.terra.api.generic.world.block.Block; import com.dfsek.terra.api.generic.world.block.BlockData; import com.dfsek.terra.api.generic.world.block.BlockFace; import com.dfsek.terra.api.generic.world.block.MaterialData; import com.dfsek.terra.api.generic.world.vector.Location; +import com.dfsek.terra.api.implementations.bukkit.BukkitWorld; +import com.dfsek.terra.api.implementations.bukkit.world.block.data.BukkitEnumAdapter; public class BukkitBlock implements Block { private final org.bukkit.block.Block delegate; diff --git a/src/main/java/com/dfsek/terra/api/bukkit/world/block/BukkitBlockData.java b/src/main/java/com/dfsek/terra/api/implementations/bukkit/world/block/BukkitBlockData.java similarity index 93% rename from src/main/java/com/dfsek/terra/api/bukkit/world/block/BukkitBlockData.java rename to src/main/java/com/dfsek/terra/api/implementations/bukkit/world/block/BukkitBlockData.java index 98d6e54c7..a4760521b 100644 --- a/src/main/java/com/dfsek/terra/api/bukkit/world/block/BukkitBlockData.java +++ b/src/main/java/com/dfsek/terra/api/implementations/bukkit/world/block/BukkitBlockData.java @@ -1,4 +1,4 @@ -package com.dfsek.terra.api.bukkit.world.block; +package com.dfsek.terra.api.implementations.bukkit.world.block; import com.dfsek.terra.api.generic.world.block.BlockData; import com.dfsek.terra.api.generic.world.block.MaterialData; diff --git a/src/main/java/com/dfsek/terra/api/bukkit/world/block/BukkitMaterialData.java b/src/main/java/com/dfsek/terra/api/implementations/bukkit/world/block/BukkitMaterialData.java similarity index 93% rename from src/main/java/com/dfsek/terra/api/bukkit/world/block/BukkitMaterialData.java rename to src/main/java/com/dfsek/terra/api/implementations/bukkit/world/block/BukkitMaterialData.java index 14c17e7c6..af4717ea4 100644 --- a/src/main/java/com/dfsek/terra/api/bukkit/world/block/BukkitMaterialData.java +++ b/src/main/java/com/dfsek/terra/api/implementations/bukkit/world/block/BukkitMaterialData.java @@ -1,4 +1,4 @@ -package com.dfsek.terra.api.bukkit.world.block; +package com.dfsek.terra.api.implementations.bukkit.world.block; import com.dfsek.terra.api.generic.world.block.BlockData; import com.dfsek.terra.api.generic.world.block.MaterialData; diff --git a/src/main/java/com/dfsek/terra/api/bukkit/world/block/data/BukkitEnumAdapter.java b/src/main/java/com/dfsek/terra/api/implementations/bukkit/world/block/data/BukkitEnumAdapter.java similarity index 98% rename from src/main/java/com/dfsek/terra/api/bukkit/world/block/data/BukkitEnumAdapter.java rename to src/main/java/com/dfsek/terra/api/implementations/bukkit/world/block/data/BukkitEnumAdapter.java index 8410578b3..550c3def7 100644 --- a/src/main/java/com/dfsek/terra/api/bukkit/world/block/data/BukkitEnumAdapter.java +++ b/src/main/java/com/dfsek/terra/api/implementations/bukkit/world/block/data/BukkitEnumAdapter.java @@ -1,4 +1,4 @@ -package com.dfsek.terra.api.bukkit.world.block.data; +package com.dfsek.terra.api.implementations.bukkit.world.block.data; import com.dfsek.terra.api.generic.world.block.BlockFace; import com.dfsek.terra.api.generic.world.block.data.Bisected; diff --git a/src/main/java/com/dfsek/terra/api/bukkit/world/block/data/BukkitStairs.java b/src/main/java/com/dfsek/terra/api/implementations/bukkit/world/block/data/BukkitStairs.java similarity index 90% rename from src/main/java/com/dfsek/terra/api/bukkit/world/block/data/BukkitStairs.java rename to src/main/java/com/dfsek/terra/api/implementations/bukkit/world/block/data/BukkitStairs.java index 27ed177ea..b09142ce8 100644 --- a/src/main/java/com/dfsek/terra/api/bukkit/world/block/data/BukkitStairs.java +++ b/src/main/java/com/dfsek/terra/api/implementations/bukkit/world/block/data/BukkitStairs.java @@ -1,8 +1,8 @@ -package com.dfsek.terra.api.bukkit.world.block.data; +package com.dfsek.terra.api.implementations.bukkit.world.block.data; -import com.dfsek.terra.api.bukkit.world.block.BukkitBlockData; import com.dfsek.terra.api.generic.world.block.BlockFace; import com.dfsek.terra.api.generic.world.block.data.Stairs; +import com.dfsek.terra.api.implementations.bukkit.world.block.BukkitBlockData; import org.bukkit.block.data.BlockData; public class BukkitStairs extends BukkitBlockData implements Stairs { diff --git a/src/main/java/com/dfsek/terra/api/bukkit/world/block/data/BukkitWaterlogged.java b/src/main/java/com/dfsek/terra/api/implementations/bukkit/world/block/data/BukkitWaterlogged.java similarity index 77% rename from src/main/java/com/dfsek/terra/api/bukkit/world/block/data/BukkitWaterlogged.java rename to src/main/java/com/dfsek/terra/api/implementations/bukkit/world/block/data/BukkitWaterlogged.java index 25ee1cc80..076c89e4b 100644 --- a/src/main/java/com/dfsek/terra/api/bukkit/world/block/data/BukkitWaterlogged.java +++ b/src/main/java/com/dfsek/terra/api/implementations/bukkit/world/block/data/BukkitWaterlogged.java @@ -1,7 +1,7 @@ -package com.dfsek.terra.api.bukkit.world.block.data; +package com.dfsek.terra.api.implementations.bukkit.world.block.data; -import com.dfsek.terra.api.bukkit.world.block.BukkitBlockData; import com.dfsek.terra.api.generic.world.block.data.Waterlogged; +import com.dfsek.terra.api.implementations.bukkit.world.block.BukkitBlockData; import org.bukkit.block.data.BlockData; public class BukkitWaterlogged extends BukkitBlockData implements Waterlogged { diff --git a/src/main/java/com/dfsek/terra/async/AsyncBiomeFinder.java b/src/main/java/com/dfsek/terra/async/AsyncBiomeFinder.java index cf286d2b7..4a0652583 100644 --- a/src/main/java/com/dfsek/terra/async/AsyncBiomeFinder.java +++ b/src/main/java/com/dfsek/terra/async/AsyncBiomeFinder.java @@ -1,9 +1,9 @@ package com.dfsek.terra.async; -import com.dfsek.terra.api.bukkit.TerraBukkitPlugin; import com.dfsek.terra.api.gaea.biome.Biome; import com.dfsek.terra.api.gaea.generation.GenerationPhase; import com.dfsek.terra.api.generic.world.vector.Vector3; +import com.dfsek.terra.api.implementations.bukkit.TerraBukkitPlugin; import com.dfsek.terra.biome.grid.master.TerraBiomeGrid; import org.bukkit.Location; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/com/dfsek/terra/async/AsyncFeatureFinder.java b/src/main/java/com/dfsek/terra/async/AsyncFeatureFinder.java index e4b287ea8..aca7eccda 100644 --- a/src/main/java/com/dfsek/terra/async/AsyncFeatureFinder.java +++ b/src/main/java/com/dfsek/terra/async/AsyncFeatureFinder.java @@ -1,7 +1,7 @@ package com.dfsek.terra.async; -import com.dfsek.terra.api.bukkit.TerraBukkitPlugin; import com.dfsek.terra.api.generic.world.vector.Vector3; +import com.dfsek.terra.api.implementations.bukkit.TerraBukkitPlugin; import com.dfsek.terra.biome.grid.master.TerraBiomeGrid; import org.bukkit.Bukkit; import org.bukkit.Location; diff --git a/src/main/java/com/dfsek/terra/async/AsyncStructureFinder.java b/src/main/java/com/dfsek/terra/async/AsyncStructureFinder.java index 06941f71e..ef2f3afbc 100644 --- a/src/main/java/com/dfsek/terra/async/AsyncStructureFinder.java +++ b/src/main/java/com/dfsek/terra/async/AsyncStructureFinder.java @@ -1,9 +1,9 @@ package com.dfsek.terra.async; -import com.dfsek.terra.api.bukkit.BukkitWorld; -import com.dfsek.terra.api.bukkit.TerraBukkitPlugin; import com.dfsek.terra.api.gaea.util.FastRandom; import com.dfsek.terra.api.generic.world.vector.Vector3; +import com.dfsek.terra.api.implementations.bukkit.BukkitWorld; +import com.dfsek.terra.api.implementations.bukkit.TerraBukkitPlugin; import com.dfsek.terra.biome.UserDefinedBiome; import com.dfsek.terra.biome.grid.master.TerraBiomeGrid; import com.dfsek.terra.generation.items.TerraStructure; diff --git a/src/main/java/com/dfsek/terra/command/PacksCommand.java b/src/main/java/com/dfsek/terra/command/PacksCommand.java index 4a41ff6ed..0d514ada6 100644 --- a/src/main/java/com/dfsek/terra/command/PacksCommand.java +++ b/src/main/java/com/dfsek/terra/command/PacksCommand.java @@ -1,7 +1,7 @@ package com.dfsek.terra.command; -import com.dfsek.terra.api.bukkit.TerraBukkitPlugin; import com.dfsek.terra.api.gaea.command.Command; +import com.dfsek.terra.api.implementations.bukkit.TerraBukkitPlugin; import com.dfsek.terra.config.base.ConfigPackTemplate; import com.dfsek.terra.config.lang.LangUtil; import com.dfsek.terra.registry.ConfigRegistry; diff --git a/src/main/java/com/dfsek/terra/command/ReloadCommand.java b/src/main/java/com/dfsek/terra/command/ReloadCommand.java index 58a59fe09..e62ded0c1 100644 --- a/src/main/java/com/dfsek/terra/command/ReloadCommand.java +++ b/src/main/java/com/dfsek/terra/command/ReloadCommand.java @@ -1,8 +1,8 @@ package com.dfsek.terra.command; -import com.dfsek.terra.api.bukkit.TerraBukkitPlugin; import com.dfsek.terra.api.gaea.command.Command; import com.dfsek.terra.api.gaea.command.DebugCommand; +import com.dfsek.terra.api.implementations.bukkit.TerraBukkitPlugin; import com.dfsek.terra.config.lang.LangUtil; import org.bukkit.command.CommandSender; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/com/dfsek/terra/command/biome/BiomeInfoCommand.java b/src/main/java/com/dfsek/terra/command/biome/BiomeInfoCommand.java index 4f5c00324..a50676604 100644 --- a/src/main/java/com/dfsek/terra/command/biome/BiomeInfoCommand.java +++ b/src/main/java/com/dfsek/terra/command/biome/BiomeInfoCommand.java @@ -1,8 +1,8 @@ package com.dfsek.terra.command.biome; -import com.dfsek.terra.api.bukkit.BukkitWorld; -import com.dfsek.terra.api.bukkit.TerraBukkitPlugin; import com.dfsek.terra.api.gaea.command.WorldCommand; +import com.dfsek.terra.api.implementations.bukkit.BukkitWorld; +import com.dfsek.terra.api.implementations.bukkit.TerraBukkitPlugin; import com.dfsek.terra.biome.UserDefinedBiome; import com.dfsek.terra.carving.UserDefinedCarver; import com.dfsek.terra.config.base.ConfigPack; diff --git a/src/main/java/com/dfsek/terra/command/profile/QueryCommand.java b/src/main/java/com/dfsek/terra/command/profile/QueryCommand.java index 1802c8777..053341579 100644 --- a/src/main/java/com/dfsek/terra/command/profile/QueryCommand.java +++ b/src/main/java/com/dfsek/terra/command/profile/QueryCommand.java @@ -1,9 +1,9 @@ package com.dfsek.terra.command.profile; -import com.dfsek.terra.api.bukkit.BukkitWorld; -import com.dfsek.terra.api.bukkit.TerraBukkitPlugin; import com.dfsek.terra.api.gaea.command.WorldCommand; import com.dfsek.terra.api.gaea.profiler.WorldProfiler; +import com.dfsek.terra.api.implementations.bukkit.BukkitWorld; +import com.dfsek.terra.api.implementations.bukkit.TerraBukkitPlugin; import org.bukkit.World; import org.bukkit.command.Command; import org.bukkit.command.CommandSender; diff --git a/src/main/java/com/dfsek/terra/command/profile/ResetCommand.java b/src/main/java/com/dfsek/terra/command/profile/ResetCommand.java index 2efefdb23..18e73db79 100644 --- a/src/main/java/com/dfsek/terra/command/profile/ResetCommand.java +++ b/src/main/java/com/dfsek/terra/command/profile/ResetCommand.java @@ -1,9 +1,9 @@ package com.dfsek.terra.command.profile; -import com.dfsek.terra.api.bukkit.BukkitWorld; -import com.dfsek.terra.api.bukkit.TerraBukkitPlugin; import com.dfsek.terra.api.gaea.command.WorldCommand; import com.dfsek.terra.api.gaea.profiler.WorldProfiler; +import com.dfsek.terra.api.implementations.bukkit.BukkitWorld; +import com.dfsek.terra.api.implementations.bukkit.TerraBukkitPlugin; import com.dfsek.terra.config.lang.LangUtil; import org.bukkit.World; import org.bukkit.command.Command; diff --git a/src/main/java/com/dfsek/terra/command/profile/StartCommand.java b/src/main/java/com/dfsek/terra/command/profile/StartCommand.java index 16bf4a813..3ea69a242 100644 --- a/src/main/java/com/dfsek/terra/command/profile/StartCommand.java +++ b/src/main/java/com/dfsek/terra/command/profile/StartCommand.java @@ -1,9 +1,9 @@ package com.dfsek.terra.command.profile; -import com.dfsek.terra.api.bukkit.BukkitWorld; -import com.dfsek.terra.api.bukkit.TerraBukkitPlugin; import com.dfsek.terra.api.gaea.command.WorldCommand; import com.dfsek.terra.api.gaea.profiler.WorldProfiler; +import com.dfsek.terra.api.implementations.bukkit.BukkitWorld; +import com.dfsek.terra.api.implementations.bukkit.TerraBukkitPlugin; import com.dfsek.terra.config.lang.LangUtil; import org.bukkit.World; import org.bukkit.command.Command; diff --git a/src/main/java/com/dfsek/terra/command/profile/StopCommand.java b/src/main/java/com/dfsek/terra/command/profile/StopCommand.java index de4b0564a..0a9ccf7b9 100644 --- a/src/main/java/com/dfsek/terra/command/profile/StopCommand.java +++ b/src/main/java/com/dfsek/terra/command/profile/StopCommand.java @@ -1,9 +1,9 @@ package com.dfsek.terra.command.profile; -import com.dfsek.terra.api.bukkit.BukkitWorld; -import com.dfsek.terra.api.bukkit.TerraBukkitPlugin; import com.dfsek.terra.api.gaea.command.WorldCommand; import com.dfsek.terra.api.gaea.profiler.WorldProfiler; +import com.dfsek.terra.api.implementations.bukkit.BukkitWorld; +import com.dfsek.terra.api.implementations.bukkit.TerraBukkitPlugin; import com.dfsek.terra.config.lang.LangUtil; import org.bukkit.World; import org.bukkit.command.Command; diff --git a/src/main/java/com/dfsek/terra/config/base/PluginConfig.java b/src/main/java/com/dfsek/terra/config/base/PluginConfig.java index 8962987b8..8e1ad77fe 100644 --- a/src/main/java/com/dfsek/terra/config/base/PluginConfig.java +++ b/src/main/java/com/dfsek/terra/config/base/PluginConfig.java @@ -5,9 +5,9 @@ import com.dfsek.tectonic.annotations.Value; import com.dfsek.tectonic.config.ConfigTemplate; import com.dfsek.tectonic.exception.ConfigException; import com.dfsek.tectonic.loading.ConfigLoader; -import com.dfsek.terra.api.bukkit.TerraBukkitPlugin; import com.dfsek.terra.api.gaea.GaeaPlugin; import com.dfsek.terra.api.gaea.util.JarUtil; +import com.dfsek.terra.api.implementations.bukkit.TerraBukkitPlugin; import com.dfsek.terra.debug.Debug; import java.io.File; diff --git a/src/main/java/com/dfsek/terra/config/lang/LangUtil.java b/src/main/java/com/dfsek/terra/config/lang/LangUtil.java index 9455de92d..9c372aad0 100644 --- a/src/main/java/com/dfsek/terra/config/lang/LangUtil.java +++ b/src/main/java/com/dfsek/terra/config/lang/LangUtil.java @@ -1,7 +1,7 @@ package com.dfsek.terra.config.lang; -import com.dfsek.terra.api.bukkit.TerraBukkitPlugin; import com.dfsek.terra.api.gaea.lang.Language; +import com.dfsek.terra.api.implementations.bukkit.TerraBukkitPlugin; import com.dfsek.terra.debug.Debug; import org.bukkit.command.CommandSender; import org.bukkit.configuration.InvalidConfigurationException; diff --git a/src/main/java/com/dfsek/terra/config/templates/FloraTemplate.java b/src/main/java/com/dfsek/terra/config/templates/FloraTemplate.java index 16cdaec88..125b51e7e 100644 --- a/src/main/java/com/dfsek/terra/config/templates/FloraTemplate.java +++ b/src/main/java/com/dfsek/terra/config/templates/FloraTemplate.java @@ -3,7 +3,7 @@ package com.dfsek.terra.config.templates; import com.dfsek.tectonic.annotations.Abstractable; import com.dfsek.tectonic.annotations.Default; import com.dfsek.tectonic.annotations.Value; -import com.dfsek.terra.api.bukkit.world.block.BukkitMaterialData; +import com.dfsek.terra.api.implementations.bukkit.world.block.BukkitMaterialData; import com.dfsek.terra.biome.palette.PaletteLayer; import com.dfsek.terra.generation.items.flora.TerraFlora; import com.dfsek.terra.util.MaterialSet; diff --git a/src/main/java/com/dfsek/terra/debug/gui/DebugFrame.java b/src/main/java/com/dfsek/terra/debug/gui/DebugFrame.java index 90cd937e1..3e3cdf559 100644 --- a/src/main/java/com/dfsek/terra/debug/gui/DebugFrame.java +++ b/src/main/java/com/dfsek/terra/debug/gui/DebugFrame.java @@ -1,6 +1,6 @@ package com.dfsek.terra.debug.gui; -import com.dfsek.terra.api.bukkit.TerraBukkitPlugin; +import com.dfsek.terra.api.implementations.bukkit.TerraBukkitPlugin; import javax.swing.*; import java.awt.*; diff --git a/src/main/java/com/dfsek/terra/debug/gui/DebugGUI.java b/src/main/java/com/dfsek/terra/debug/gui/DebugGUI.java index 3dfcf2a0b..994ffac9d 100644 --- a/src/main/java/com/dfsek/terra/debug/gui/DebugGUI.java +++ b/src/main/java/com/dfsek/terra/debug/gui/DebugGUI.java @@ -1,6 +1,6 @@ package com.dfsek.terra.debug.gui; -import com.dfsek.terra.api.bukkit.TerraBukkitPlugin; +import com.dfsek.terra.api.implementations.bukkit.TerraBukkitPlugin; import javax.swing.*; import java.awt.*; diff --git a/src/main/java/com/dfsek/terra/generation/TerraChunkGenerator.java b/src/main/java/com/dfsek/terra/generation/TerraChunkGenerator.java index e4c0e9de4..b22620085 100644 --- a/src/main/java/com/dfsek/terra/generation/TerraChunkGenerator.java +++ b/src/main/java/com/dfsek/terra/generation/TerraChunkGenerator.java @@ -1,7 +1,6 @@ package com.dfsek.terra.generation; import com.dfsek.terra.TerraWorld; -import com.dfsek.terra.api.bukkit.TerraBukkitPlugin; import com.dfsek.terra.api.gaea.biome.Biome; import com.dfsek.terra.api.gaea.generation.GenerationPhase; import com.dfsek.terra.api.gaea.math.ChunkInterpolator3; @@ -15,6 +14,7 @@ import com.dfsek.terra.api.generic.world.Chunk; import com.dfsek.terra.api.generic.world.World; import com.dfsek.terra.api.generic.world.block.BlockData; import com.dfsek.terra.api.generic.world.vector.Vector3; +import com.dfsek.terra.api.implementations.bukkit.TerraBukkitPlugin; import com.dfsek.terra.biome.UserDefinedBiome; import com.dfsek.terra.config.base.ConfigPack; import com.dfsek.terra.config.lang.LangUtil; diff --git a/src/main/java/com/dfsek/terra/generation/items/tree/TerraTree.java b/src/main/java/com/dfsek/terra/generation/items/tree/TerraTree.java index c84a1897c..f865b5d74 100644 --- a/src/main/java/com/dfsek/terra/generation/items/tree/TerraTree.java +++ b/src/main/java/com/dfsek/terra/generation/items/tree/TerraTree.java @@ -1,10 +1,10 @@ package com.dfsek.terra.generation.items.tree; -import com.dfsek.terra.api.bukkit.TerraBukkitPlugin; import com.dfsek.terra.api.gaea.math.ProbabilityCollection; import com.dfsek.terra.api.gaea.tree.Tree; import com.dfsek.terra.api.generic.world.vector.Location; import com.dfsek.terra.api.generic.world.vector.Vector2; +import com.dfsek.terra.api.implementations.bukkit.TerraBukkitPlugin; import com.dfsek.terra.structure.Rotation; import com.dfsek.terra.structure.Structure; import com.dfsek.terra.structure.StructureContainedBlock; diff --git a/src/main/java/com/dfsek/terra/image/ImageLoader.java b/src/main/java/com/dfsek/terra/image/ImageLoader.java index b2fd9d39f..9328cc351 100644 --- a/src/main/java/com/dfsek/terra/image/ImageLoader.java +++ b/src/main/java/com/dfsek/terra/image/ImageLoader.java @@ -1,8 +1,8 @@ package com.dfsek.terra.image; -import com.dfsek.terra.api.bukkit.TerraBukkitPlugin; import com.dfsek.terra.api.gaea.biome.NormalizationUtil; import com.dfsek.terra.api.generic.world.World; +import com.dfsek.terra.api.implementations.bukkit.TerraBukkitPlugin; import com.dfsek.terra.biome.BiomeZone; import com.dfsek.terra.biome.grid.master.TerraBiomeGrid; import com.dfsek.terra.debug.gui.DebugGUI; diff --git a/src/main/java/com/dfsek/terra/image/WorldImageGenerator.java b/src/main/java/com/dfsek/terra/image/WorldImageGenerator.java index b81ef9864..9fb3364bc 100644 --- a/src/main/java/com/dfsek/terra/image/WorldImageGenerator.java +++ b/src/main/java/com/dfsek/terra/image/WorldImageGenerator.java @@ -1,9 +1,9 @@ package com.dfsek.terra.image; import com.dfsek.terra.TerraWorld; -import com.dfsek.terra.api.bukkit.TerraBukkitPlugin; import com.dfsek.terra.api.gaea.biome.NormalizationUtil; import com.dfsek.terra.api.generic.world.World; +import com.dfsek.terra.api.implementations.bukkit.TerraBukkitPlugin; import com.dfsek.terra.biome.grid.master.TerraBiomeGrid; import javax.imageio.ImageIO; diff --git a/src/main/java/com/dfsek/terra/listeners/EventListener.java b/src/main/java/com/dfsek/terra/listeners/EventListener.java index f00280038..d5b6a5a77 100644 --- a/src/main/java/com/dfsek/terra/listeners/EventListener.java +++ b/src/main/java/com/dfsek/terra/listeners/EventListener.java @@ -1,6 +1,6 @@ package com.dfsek.terra.listeners; -import com.dfsek.terra.api.bukkit.TerraBukkitPlugin; +import com.dfsek.terra.api.implementations.bukkit.TerraBukkitPlugin; import org.bukkit.event.EventHandler; import org.bukkit.event.Listener; import org.bukkit.event.world.StructureGrowEvent; diff --git a/src/main/java/com/dfsek/terra/listeners/SpigotListener.java b/src/main/java/com/dfsek/terra/listeners/SpigotListener.java index 7ec8f2e5c..526c5ddd8 100644 --- a/src/main/java/com/dfsek/terra/listeners/SpigotListener.java +++ b/src/main/java/com/dfsek/terra/listeners/SpigotListener.java @@ -1,6 +1,6 @@ package com.dfsek.terra.listeners; -import com.dfsek.terra.api.bukkit.TerraBukkitPlugin; +import com.dfsek.terra.api.implementations.bukkit.TerraBukkitPlugin; import org.bukkit.event.Listener; /** diff --git a/src/main/java/com/dfsek/terra/population/CavePopulator.java b/src/main/java/com/dfsek/terra/population/CavePopulator.java index 531bfa233..b923652ac 100644 --- a/src/main/java/com/dfsek/terra/population/CavePopulator.java +++ b/src/main/java/com/dfsek/terra/population/CavePopulator.java @@ -1,11 +1,11 @@ package com.dfsek.terra.population; -import com.dfsek.terra.api.bukkit.TerraBukkitPlugin; import com.dfsek.terra.api.generic.generator.TerraBlockPopulator; import com.dfsek.terra.api.generic.world.Chunk; import com.dfsek.terra.api.generic.world.World; import com.dfsek.terra.api.generic.world.block.BlockData; import com.dfsek.terra.api.generic.world.block.MaterialData; +import com.dfsek.terra.api.implementations.bukkit.TerraBukkitPlugin; import org.jetbrains.annotations.NotNull; import java.util.HashMap; diff --git a/src/main/java/com/dfsek/terra/population/FloraPopulator.java b/src/main/java/com/dfsek/terra/population/FloraPopulator.java index c4983771e..2251a3a86 100644 --- a/src/main/java/com/dfsek/terra/population/FloraPopulator.java +++ b/src/main/java/com/dfsek/terra/population/FloraPopulator.java @@ -1,13 +1,13 @@ package com.dfsek.terra.population; import com.dfsek.terra.TerraWorld; -import com.dfsek.terra.api.bukkit.TerraBukkitPlugin; import com.dfsek.terra.api.gaea.generation.GenerationPhase; import com.dfsek.terra.api.gaea.profiler.ProfileFuture; import com.dfsek.terra.api.generic.generator.TerraBlockPopulator; import com.dfsek.terra.api.generic.world.Chunk; import com.dfsek.terra.api.generic.world.World; import com.dfsek.terra.api.generic.world.vector.Vector2; +import com.dfsek.terra.api.implementations.bukkit.TerraBukkitPlugin; import com.dfsek.terra.biome.UserDefinedBiome; import com.dfsek.terra.biome.grid.master.TerraBiomeGrid; import com.dfsek.terra.generation.items.flora.FloraLayer; diff --git a/src/main/java/com/dfsek/terra/population/OrePopulator.java b/src/main/java/com/dfsek/terra/population/OrePopulator.java index 448179abf..a33c857d7 100644 --- a/src/main/java/com/dfsek/terra/population/OrePopulator.java +++ b/src/main/java/com/dfsek/terra/population/OrePopulator.java @@ -1,7 +1,6 @@ package com.dfsek.terra.population; import com.dfsek.terra.TerraWorld; -import com.dfsek.terra.api.bukkit.TerraBukkitPlugin; import com.dfsek.terra.api.gaea.biome.Biome; import com.dfsek.terra.api.gaea.generation.GenerationPhase; import com.dfsek.terra.api.gaea.math.MathUtil; @@ -11,6 +10,7 @@ import com.dfsek.terra.api.generic.generator.TerraBlockPopulator; import com.dfsek.terra.api.generic.world.Chunk; import com.dfsek.terra.api.generic.world.World; import com.dfsek.terra.api.generic.world.vector.Vector3; +import com.dfsek.terra.api.implementations.bukkit.TerraBukkitPlugin; import com.dfsek.terra.biome.UserDefinedBiome; import com.dfsek.terra.config.templates.BiomeTemplate; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/com/dfsek/terra/population/StructurePopulator.java b/src/main/java/com/dfsek/terra/population/StructurePopulator.java index 59774fd36..faef5ace5 100644 --- a/src/main/java/com/dfsek/terra/population/StructurePopulator.java +++ b/src/main/java/com/dfsek/terra/population/StructurePopulator.java @@ -1,9 +1,9 @@ package com.dfsek.terra.population; -import com.dfsek.terra.api.bukkit.TerraBukkitPlugin; import com.dfsek.terra.api.generic.generator.TerraBlockPopulator; import com.dfsek.terra.api.generic.world.Chunk; import com.dfsek.terra.api.generic.world.World; +import com.dfsek.terra.api.implementations.bukkit.TerraBukkitPlugin; import org.jetbrains.annotations.NotNull; import java.util.Random; diff --git a/src/main/java/com/dfsek/terra/population/TreePopulator.java b/src/main/java/com/dfsek/terra/population/TreePopulator.java index 66899a162..3125338fc 100644 --- a/src/main/java/com/dfsek/terra/population/TreePopulator.java +++ b/src/main/java/com/dfsek/terra/population/TreePopulator.java @@ -1,13 +1,13 @@ package com.dfsek.terra.population; import com.dfsek.terra.TerraWorld; -import com.dfsek.terra.api.bukkit.TerraBukkitPlugin; import com.dfsek.terra.api.gaea.generation.GenerationPhase; import com.dfsek.terra.api.gaea.profiler.ProfileFuture; import com.dfsek.terra.api.generic.generator.TerraBlockPopulator; import com.dfsek.terra.api.generic.world.Chunk; import com.dfsek.terra.api.generic.world.World; import com.dfsek.terra.api.generic.world.vector.Vector2; +import com.dfsek.terra.api.implementations.bukkit.TerraBukkitPlugin; import com.dfsek.terra.biome.UserDefinedBiome; import com.dfsek.terra.biome.grid.master.TerraBiomeGrid; import com.dfsek.terra.generation.items.tree.TreeLayer; diff --git a/src/main/java/com/dfsek/terra/registry/ConfigRegistry.java b/src/main/java/com/dfsek/terra/registry/ConfigRegistry.java index 820674e7c..acb56beb4 100644 --- a/src/main/java/com/dfsek/terra/registry/ConfigRegistry.java +++ b/src/main/java/com/dfsek/terra/registry/ConfigRegistry.java @@ -1,7 +1,7 @@ package com.dfsek.terra.registry; import com.dfsek.tectonic.exception.ConfigException; -import com.dfsek.terra.api.bukkit.TerraBukkitPlugin; +import com.dfsek.terra.api.implementations.bukkit.TerraBukkitPlugin; import com.dfsek.terra.config.base.ConfigPack; import com.dfsek.terra.debug.Debug; diff --git a/src/main/java/com/dfsek/terra/registry/PaletteRegistry.java b/src/main/java/com/dfsek/terra/registry/PaletteRegistry.java index 074a0d3b4..52e43aaeb 100644 --- a/src/main/java/com/dfsek/terra/registry/PaletteRegistry.java +++ b/src/main/java/com/dfsek/terra/registry/PaletteRegistry.java @@ -1,8 +1,8 @@ package com.dfsek.terra.registry; -import com.dfsek.terra.api.bukkit.world.block.BukkitBlockData; import com.dfsek.terra.api.gaea.world.palette.Palette; import com.dfsek.terra.api.generic.world.block.BlockData; +import com.dfsek.terra.api.implementations.bukkit.world.block.BukkitBlockData; import com.dfsek.terra.biome.palette.SinglePalette; import org.bukkit.Bukkit; diff --git a/src/main/java/com/dfsek/terra/structure/Structure.java b/src/main/java/com/dfsek/terra/structure/Structure.java index 876473a48..7c7e0dac7 100644 --- a/src/main/java/com/dfsek/terra/structure/Structure.java +++ b/src/main/java/com/dfsek/terra/structure/Structure.java @@ -1,10 +1,10 @@ package com.dfsek.terra.structure; -import com.dfsek.terra.api.bukkit.TerraBukkitPlugin; import com.dfsek.terra.api.gaea.math.Range; import com.dfsek.terra.api.generic.world.WorldHandle; import com.dfsek.terra.api.generic.world.vector.Location; import com.dfsek.terra.api.generic.world.vector.Vector2; +import com.dfsek.terra.api.implementations.bukkit.TerraBukkitPlugin; import com.dfsek.terra.debug.Debug; import net.jafama.FastMath; import org.bukkit.Chunk; diff --git a/src/main/java/com/dfsek/terra/structure/StructureSpawnRequirement.java b/src/main/java/com/dfsek/terra/structure/StructureSpawnRequirement.java index 5cc2c496f..fd46c53f3 100644 --- a/src/main/java/com/dfsek/terra/structure/StructureSpawnRequirement.java +++ b/src/main/java/com/dfsek/terra/structure/StructureSpawnRequirement.java @@ -1,7 +1,7 @@ package com.dfsek.terra.structure; -import com.dfsek.terra.api.bukkit.TerraBukkitPlugin; import com.dfsek.terra.api.generic.world.World; +import com.dfsek.terra.api.implementations.bukkit.TerraBukkitPlugin; import com.dfsek.terra.structure.spawn.AirSpawn; import com.dfsek.terra.structure.spawn.BlankSpawn; import com.dfsek.terra.structure.spawn.LandSpawn; diff --git a/src/main/java/com/dfsek/terra/structure/spawn/AirSpawn.java b/src/main/java/com/dfsek/terra/structure/spawn/AirSpawn.java index c21512609..6aaf48b97 100644 --- a/src/main/java/com/dfsek/terra/structure/spawn/AirSpawn.java +++ b/src/main/java/com/dfsek/terra/structure/spawn/AirSpawn.java @@ -1,9 +1,9 @@ package com.dfsek.terra.structure.spawn; import com.dfsek.terra.TerraWorld; -import com.dfsek.terra.api.bukkit.TerraBukkitPlugin; import com.dfsek.terra.api.gaea.generation.GenerationPhase; import com.dfsek.terra.api.generic.world.World; +import com.dfsek.terra.api.implementations.bukkit.TerraBukkitPlugin; import com.dfsek.terra.biome.UserDefinedBiome; import com.dfsek.terra.config.templates.BiomeTemplate; import com.dfsek.terra.generation.config.WorldGenerator; diff --git a/src/main/java/com/dfsek/terra/structure/spawn/LandSpawn.java b/src/main/java/com/dfsek/terra/structure/spawn/LandSpawn.java index f12f8509d..bf891470f 100644 --- a/src/main/java/com/dfsek/terra/structure/spawn/LandSpawn.java +++ b/src/main/java/com/dfsek/terra/structure/spawn/LandSpawn.java @@ -1,9 +1,9 @@ package com.dfsek.terra.structure.spawn; import com.dfsek.terra.TerraWorld; -import com.dfsek.terra.api.bukkit.TerraBukkitPlugin; import com.dfsek.terra.api.gaea.generation.GenerationPhase; import com.dfsek.terra.api.generic.world.World; +import com.dfsek.terra.api.implementations.bukkit.TerraBukkitPlugin; import com.dfsek.terra.biome.UserDefinedBiome; import com.dfsek.terra.generation.config.WorldGenerator; diff --git a/src/main/java/com/dfsek/terra/structure/spawn/OceanSpawn.java b/src/main/java/com/dfsek/terra/structure/spawn/OceanSpawn.java index 27f6622a6..ba71262d0 100644 --- a/src/main/java/com/dfsek/terra/structure/spawn/OceanSpawn.java +++ b/src/main/java/com/dfsek/terra/structure/spawn/OceanSpawn.java @@ -1,9 +1,9 @@ package com.dfsek.terra.structure.spawn; import com.dfsek.terra.TerraWorld; -import com.dfsek.terra.api.bukkit.TerraBukkitPlugin; import com.dfsek.terra.api.gaea.generation.GenerationPhase; import com.dfsek.terra.api.generic.world.World; +import com.dfsek.terra.api.implementations.bukkit.TerraBukkitPlugin; import com.dfsek.terra.biome.UserDefinedBiome; import com.dfsek.terra.config.templates.BiomeTemplate; import com.dfsek.terra.generation.config.WorldGenerator; diff --git a/src/main/java/com/dfsek/terra/structure/spawn/Requirement.java b/src/main/java/com/dfsek/terra/structure/spawn/Requirement.java index a0ac0113f..124f4a340 100644 --- a/src/main/java/com/dfsek/terra/structure/spawn/Requirement.java +++ b/src/main/java/com/dfsek/terra/structure/spawn/Requirement.java @@ -1,7 +1,7 @@ package com.dfsek.terra.structure.spawn; -import com.dfsek.terra.api.bukkit.TerraBukkitPlugin; import com.dfsek.terra.api.generic.world.World; +import com.dfsek.terra.api.implementations.bukkit.TerraBukkitPlugin; public abstract class Requirement { protected final World world; diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml index 6df5bf4a9..b6edcf3a1 100644 --- a/src/main/resources/plugin.yml +++ b/src/main/resources/plugin.yml @@ -1,5 +1,5 @@ name: "Terra" -main: "com.dfsek.terra.api.bukkit.TerraBukkitPlugin" +main: "com.dfsek.terra.api.implementations.bukkit.TerraBukkitPlugin" version: "@VERSION@" load: "STARTUP" api-version: "1.16"