diff --git a/src/main/java/com/volmit/iris/Iris.java b/src/main/java/com/volmit/iris/Iris.java index 96c74d692..09de9921e 100644 --- a/src/main/java/com/volmit/iris/Iris.java +++ b/src/main/java/com/volmit/iris/Iris.java @@ -26,11 +26,11 @@ import com.volmit.iris.core.link.OraxenLink; import com.volmit.iris.core.loader.IrisData; import com.volmit.iris.core.nms.INMS; import com.volmit.iris.core.service.StudioSVC; -import com.volmit.iris.engine.object.biome.IrisBiome; -import com.volmit.iris.engine.object.biome.IrisBiomeCustom; -import com.volmit.iris.engine.object.common.IrisWorld; -import com.volmit.iris.engine.object.compat.IrisCompat; -import com.volmit.iris.engine.object.dimensional.IrisDimension; +import com.volmit.iris.engine.object.IrisBiome; +import com.volmit.iris.engine.object.IrisBiomeCustom; +import com.volmit.iris.engine.object.IrisWorld; +import com.volmit.iris.engine.object.IrisCompat; +import com.volmit.iris.engine.object.IrisDimension; import com.volmit.iris.engine.platform.BukkitChunkGenerator; import com.volmit.iris.engine.platform.DummyChunkGenerator; import com.volmit.iris.util.collection.KList; diff --git a/src/main/java/com/volmit/iris/core/commands/CommandIris.java b/src/main/java/com/volmit/iris/core/commands/CommandIris.java index 425e252cf..112b451d5 100644 --- a/src/main/java/com/volmit/iris/core/commands/CommandIris.java +++ b/src/main/java/com/volmit/iris/core/commands/CommandIris.java @@ -22,7 +22,7 @@ import com.volmit.iris.Iris; import com.volmit.iris.core.IrisSettings; import com.volmit.iris.core.service.StudioSVC; import com.volmit.iris.core.tools.IrisToolbelt; -import com.volmit.iris.engine.object.dimensional.IrisDimension; +import com.volmit.iris.engine.object.IrisDimension; import com.volmit.iris.util.decree.DecreeExecutor; import com.volmit.iris.util.decree.DecreeOrigin; import com.volmit.iris.util.decree.annotations.Decree; diff --git a/src/main/java/com/volmit/iris/core/commands/CommandObject.java b/src/main/java/com/volmit/iris/core/commands/CommandObject.java index d0da850a3..d5f842d4a 100644 --- a/src/main/java/com/volmit/iris/core/commands/CommandObject.java +++ b/src/main/java/com/volmit/iris/core/commands/CommandObject.java @@ -5,13 +5,13 @@ import com.volmit.iris.core.loader.IrisData; import com.volmit.iris.core.service.ObjectSVC; import com.volmit.iris.core.service.StudioSVC; import com.volmit.iris.core.service.WandSVC; -import com.volmit.iris.engine.object.common.IObjectPlacer; -import com.volmit.iris.engine.object.dimensional.IrisDimension; -import com.volmit.iris.engine.object.objects.IrisObject; -import com.volmit.iris.engine.object.objects.IrisObjectPlacement; -import com.volmit.iris.engine.object.objects.IrisObjectPlacementScaleInterpolator; -import com.volmit.iris.engine.object.objects.IrisObjectRotation; -import com.volmit.iris.engine.object.tile.TileData; +import com.volmit.iris.engine.object.IObjectPlacer; +import com.volmit.iris.engine.object.IrisDimension; +import com.volmit.iris.engine.object.IrisObject; +import com.volmit.iris.engine.object.IrisObjectPlacement; +import com.volmit.iris.engine.object.IrisObjectPlacementScaleInterpolator; +import com.volmit.iris.engine.object.IrisObjectRotation; +import com.volmit.iris.engine.object.TileData; import com.volmit.iris.util.data.Cuboid; import com.volmit.iris.util.decree.DecreeExecutor; import com.volmit.iris.util.decree.DecreeOrigin; diff --git a/src/main/java/com/volmit/iris/core/commands/CommandStudio.java b/src/main/java/com/volmit/iris/core/commands/CommandStudio.java index 91f3e0eca..2ab74fa5c 100644 --- a/src/main/java/com/volmit/iris/core/commands/CommandStudio.java +++ b/src/main/java/com/volmit/iris/core/commands/CommandStudio.java @@ -29,22 +29,22 @@ import com.volmit.iris.core.service.ConversionSVC; import com.volmit.iris.core.service.StudioSVC; import com.volmit.iris.core.tools.IrisToolbelt; import com.volmit.iris.engine.framework.Engine; -import com.volmit.iris.engine.object.basic.IrisPosition; -import com.volmit.iris.engine.object.biome.IrisBiome; -import com.volmit.iris.engine.object.biome.IrisBiomePaletteLayer; -import com.volmit.iris.engine.object.common.IrisScript; -import com.volmit.iris.engine.object.dimensional.IrisDimension; -import com.volmit.iris.engine.object.entity.IrisEntity; -import com.volmit.iris.engine.object.feature.IrisFeaturePositional; -import com.volmit.iris.engine.object.loot.IrisLootTable; -import com.volmit.iris.engine.object.meta.InventorySlotType; -import com.volmit.iris.engine.object.noise.IrisGenerator; -import com.volmit.iris.engine.object.noise.IrisInterpolator; -import com.volmit.iris.engine.object.noise.IrisNoiseGenerator; -import com.volmit.iris.engine.object.noise.NoiseStyle; -import com.volmit.iris.engine.object.objects.IrisObject; -import com.volmit.iris.engine.object.objects.IrisObjectPlacement; -import com.volmit.iris.engine.object.regional.IrisRegion; +import com.volmit.iris.engine.object.IrisPosition; +import com.volmit.iris.engine.object.IrisBiome; +import com.volmit.iris.engine.object.IrisBiomePaletteLayer; +import com.volmit.iris.engine.object.IrisScript; +import com.volmit.iris.engine.object.IrisDimension; +import com.volmit.iris.engine.object.IrisEntity; +import com.volmit.iris.engine.object.IrisFeaturePositional; +import com.volmit.iris.engine.object.IrisLootTable; +import com.volmit.iris.engine.object.InventorySlotType; +import com.volmit.iris.engine.object.IrisGenerator; +import com.volmit.iris.engine.object.IrisInterpolator; +import com.volmit.iris.engine.object.IrisNoiseGenerator; +import com.volmit.iris.engine.object.NoiseStyle; +import com.volmit.iris.engine.object.IrisObject; +import com.volmit.iris.engine.object.IrisObjectPlacement; +import com.volmit.iris.engine.object.IrisRegion; import com.volmit.iris.util.collection.KList; import com.volmit.iris.util.collection.KMap; import com.volmit.iris.util.collection.KSet; diff --git a/src/main/java/com/volmit/iris/core/commands/CommandWhat.java b/src/main/java/com/volmit/iris/core/commands/CommandWhat.java index 8005e72db..b8fce9dc3 100644 --- a/src/main/java/com/volmit/iris/core/commands/CommandWhat.java +++ b/src/main/java/com/volmit/iris/core/commands/CommandWhat.java @@ -4,8 +4,8 @@ import com.google.gson.Gson; import com.volmit.iris.Iris; import com.volmit.iris.core.nms.INMS; import com.volmit.iris.core.tools.IrisToolbelt; -import com.volmit.iris.engine.object.biome.IrisBiome; -import com.volmit.iris.engine.object.feature.IrisFeaturePositional; +import com.volmit.iris.engine.object.IrisBiome; +import com.volmit.iris.engine.object.IrisFeaturePositional; import com.volmit.iris.util.data.B; import com.volmit.iris.util.decree.DecreeExecutor; import com.volmit.iris.util.decree.DecreeOrigin; diff --git a/src/main/java/com/volmit/iris/core/edit/JigsawEditor.java b/src/main/java/com/volmit/iris/core/edit/JigsawEditor.java index 5a38b74c6..b88f01d0e 100644 --- a/src/main/java/com/volmit/iris/core/edit/JigsawEditor.java +++ b/src/main/java/com/volmit/iris/core/edit/JigsawEditor.java @@ -21,11 +21,11 @@ package com.volmit.iris.core.edit; import com.google.gson.Gson; import com.volmit.iris.Iris; import com.volmit.iris.core.service.WandSVC; -import com.volmit.iris.engine.object.basic.IrisPosition; -import com.volmit.iris.engine.object.jigsaw.IrisJigsawPiece; -import com.volmit.iris.engine.object.jigsaw.IrisJigsawPieceConnector; -import com.volmit.iris.engine.object.objects.IrisDirection; -import com.volmit.iris.engine.object.objects.IrisObject; +import com.volmit.iris.engine.object.IrisPosition; +import com.volmit.iris.engine.object.IrisJigsawPiece; +import com.volmit.iris.engine.object.IrisJigsawPieceConnector; +import com.volmit.iris.engine.object.IrisDirection; +import com.volmit.iris.engine.object.IrisObject; import com.volmit.iris.util.collection.KMap; import com.volmit.iris.util.data.Cuboid; import com.volmit.iris.util.io.IO; diff --git a/src/main/java/com/volmit/iris/core/gui/NoiseExplorerGUI.java b/src/main/java/com/volmit/iris/core/gui/NoiseExplorerGUI.java index 66ab5bd39..6969ed1e3 100644 --- a/src/main/java/com/volmit/iris/core/gui/NoiseExplorerGUI.java +++ b/src/main/java/com/volmit/iris/core/gui/NoiseExplorerGUI.java @@ -20,7 +20,7 @@ package com.volmit.iris.core.gui; import com.volmit.iris.Iris; import com.volmit.iris.core.events.IrisEngineHotloadEvent; -import com.volmit.iris.engine.object.noise.NoiseStyle; +import com.volmit.iris.engine.object.NoiseStyle; import com.volmit.iris.util.collection.KList; import com.volmit.iris.util.function.Function2; import com.volmit.iris.util.math.M; diff --git a/src/main/java/com/volmit/iris/core/gui/VisionGUI.java b/src/main/java/com/volmit/iris/core/gui/VisionGUI.java index a416b9930..7c8bfeea3 100644 --- a/src/main/java/com/volmit/iris/core/gui/VisionGUI.java +++ b/src/main/java/com/volmit/iris/core/gui/VisionGUI.java @@ -24,9 +24,9 @@ import com.volmit.iris.core.gui.components.RenderType; import com.volmit.iris.core.tools.IrisToolbelt; import com.volmit.iris.engine.IrisComplex; import com.volmit.iris.engine.framework.Engine; -import com.volmit.iris.engine.object.biome.IrisBiome; -import com.volmit.iris.engine.object.common.IrisWorld; -import com.volmit.iris.engine.object.regional.IrisRegion; +import com.volmit.iris.engine.object.IrisBiome; +import com.volmit.iris.engine.object.IrisWorld; +import com.volmit.iris.engine.object.IrisRegion; import com.volmit.iris.util.collection.KList; import com.volmit.iris.util.collection.KMap; import com.volmit.iris.util.collection.KSet; diff --git a/src/main/java/com/volmit/iris/core/link/MultiverseCoreLink.java b/src/main/java/com/volmit/iris/core/link/MultiverseCoreLink.java index c05fc2ec1..56d3fd900 100644 --- a/src/main/java/com/volmit/iris/core/link/MultiverseCoreLink.java +++ b/src/main/java/com/volmit/iris/core/link/MultiverseCoreLink.java @@ -19,7 +19,7 @@ package com.volmit.iris.core.link; import com.volmit.iris.Iris; -import com.volmit.iris.engine.object.dimensional.IrisDimension; +import com.volmit.iris.engine.object.IrisDimension; import com.volmit.iris.util.collection.KMap; import org.bukkit.Bukkit; import org.bukkit.World; diff --git a/src/main/java/com/volmit/iris/core/loader/IrisData.java b/src/main/java/com/volmit/iris/core/loader/IrisData.java index 0cf8fff7a..a9a326e8d 100644 --- a/src/main/java/com/volmit/iris/core/loader/IrisData.java +++ b/src/main/java/com/volmit/iris/core/loader/IrisData.java @@ -27,23 +27,23 @@ import com.volmit.iris.Iris; import com.volmit.iris.engine.data.cache.AtomicCache; import com.volmit.iris.engine.framework.Engine; import com.volmit.iris.engine.object.annotations.Snippet; -import com.volmit.iris.engine.object.biome.IrisBiome; -import com.volmit.iris.engine.object.block.IrisBlockData; -import com.volmit.iris.engine.object.carving.IrisCave; -import com.volmit.iris.engine.object.carving.IrisRavine; -import com.volmit.iris.engine.object.common.IrisScript; -import com.volmit.iris.engine.object.dimensional.IrisDimension; -import com.volmit.iris.engine.object.entity.IrisEntity; -import com.volmit.iris.engine.object.jigsaw.IrisJigsawPiece; -import com.volmit.iris.engine.object.jigsaw.IrisJigsawPool; -import com.volmit.iris.engine.object.jigsaw.IrisJigsawStructure; -import com.volmit.iris.engine.object.loot.IrisLootTable; -import com.volmit.iris.engine.object.mods.IrisMod; -import com.volmit.iris.engine.object.noise.IrisExpression; -import com.volmit.iris.engine.object.noise.IrisGenerator; -import com.volmit.iris.engine.object.objects.IrisObject; -import com.volmit.iris.engine.object.regional.IrisRegion; -import com.volmit.iris.engine.object.spawners.IrisSpawner; +import com.volmit.iris.engine.object.IrisBiome; +import com.volmit.iris.engine.object.IrisBlockData; +import com.volmit.iris.engine.object.IrisCave; +import com.volmit.iris.engine.object.IrisRavine; +import com.volmit.iris.engine.object.IrisScript; +import com.volmit.iris.engine.object.IrisDimension; +import com.volmit.iris.engine.object.IrisEntity; +import com.volmit.iris.engine.object.IrisJigsawPiece; +import com.volmit.iris.engine.object.IrisJigsawPool; +import com.volmit.iris.engine.object.IrisJigsawStructure; +import com.volmit.iris.engine.object.IrisLootTable; +import com.volmit.iris.engine.object.IrisMod; +import com.volmit.iris.engine.object.IrisExpression; +import com.volmit.iris.engine.object.IrisGenerator; +import com.volmit.iris.engine.object.IrisObject; +import com.volmit.iris.engine.object.IrisRegion; +import com.volmit.iris.engine.object.IrisSpawner; import com.volmit.iris.util.collection.KMap; import com.volmit.iris.util.context.IrisContext; import com.volmit.iris.util.format.C; @@ -55,7 +55,6 @@ import lombok.Data; import java.io.File; import java.io.FileReader; import java.io.IOException; -import java.lang.reflect.Type; import java.util.Objects; import java.util.function.Function; diff --git a/src/main/java/com/volmit/iris/core/loader/IrisRegistrant.java b/src/main/java/com/volmit/iris/core/loader/IrisRegistrant.java index 47078b944..c1bc11337 100644 --- a/src/main/java/com/volmit/iris/core/loader/IrisRegistrant.java +++ b/src/main/java/com/volmit/iris/core/loader/IrisRegistrant.java @@ -23,7 +23,7 @@ import com.volmit.iris.Iris; import com.volmit.iris.engine.object.annotations.ArrayType; import com.volmit.iris.engine.object.annotations.Desc; import com.volmit.iris.engine.object.annotations.RegistryListResource; -import com.volmit.iris.engine.object.common.IrisScript; +import com.volmit.iris.engine.object.IrisScript; import com.volmit.iris.util.collection.KList; import com.volmit.iris.util.json.JSONObject; import com.volmit.iris.util.plugin.VolmitSender; diff --git a/src/main/java/com/volmit/iris/core/loader/ObjectResourceLoader.java b/src/main/java/com/volmit/iris/core/loader/ObjectResourceLoader.java index 92fe42e5c..1fe368b99 100644 --- a/src/main/java/com/volmit/iris/core/loader/ObjectResourceLoader.java +++ b/src/main/java/com/volmit/iris/core/loader/ObjectResourceLoader.java @@ -19,7 +19,7 @@ package com.volmit.iris.core.loader; import com.volmit.iris.Iris; -import com.volmit.iris.engine.object.objects.IrisObject; +import com.volmit.iris.engine.object.IrisObject; import com.volmit.iris.util.collection.KList; import com.volmit.iris.util.collection.KMap; import com.volmit.iris.util.collection.KSet; diff --git a/src/main/java/com/volmit/iris/core/loader/ScriptResourceLoader.java b/src/main/java/com/volmit/iris/core/loader/ScriptResourceLoader.java index 2b1117b9e..252709ea5 100644 --- a/src/main/java/com/volmit/iris/core/loader/ScriptResourceLoader.java +++ b/src/main/java/com/volmit/iris/core/loader/ScriptResourceLoader.java @@ -19,7 +19,7 @@ package com.volmit.iris.core.loader; import com.volmit.iris.Iris; -import com.volmit.iris.engine.object.common.IrisScript; +import com.volmit.iris.engine.object.IrisScript; import com.volmit.iris.util.collection.KList; import com.volmit.iris.util.collection.KSet; import com.volmit.iris.util.io.IO; diff --git a/src/main/java/com/volmit/iris/core/pack/IrisPack.java b/src/main/java/com/volmit/iris/core/pack/IrisPack.java index 797d41f8b..e59ae014a 100644 --- a/src/main/java/com/volmit/iris/core/pack/IrisPack.java +++ b/src/main/java/com/volmit/iris/core/pack/IrisPack.java @@ -22,8 +22,8 @@ import com.volmit.iris.Iris; import com.volmit.iris.core.loader.IrisData; import com.volmit.iris.core.loader.ResourceLoader; import com.volmit.iris.core.service.StudioSVC; -import com.volmit.iris.engine.object.common.IrisWorld; -import com.volmit.iris.engine.object.dimensional.IrisDimension; +import com.volmit.iris.engine.object.IrisWorld; +import com.volmit.iris.engine.object.IrisDimension; import com.volmit.iris.util.collection.KList; import com.volmit.iris.util.exceptions.IrisException; import com.volmit.iris.util.format.Form; diff --git a/src/main/java/com/volmit/iris/core/pregenerator/methods/HeadlessPregenMethod.java b/src/main/java/com/volmit/iris/core/pregenerator/methods/HeadlessPregenMethod.java index 3229ccade..971db5722 100644 --- a/src/main/java/com/volmit/iris/core/pregenerator/methods/HeadlessPregenMethod.java +++ b/src/main/java/com/volmit/iris/core/pregenerator/methods/HeadlessPregenMethod.java @@ -20,7 +20,7 @@ package com.volmit.iris.core.pregenerator.methods; import com.volmit.iris.core.pregenerator.PregenListener; import com.volmit.iris.core.pregenerator.PregeneratorMethod; -import com.volmit.iris.engine.object.common.HeadlessWorld; +import com.volmit.iris.engine.object.HeadlessWorld; import com.volmit.iris.engine.platform.HeadlessGenerator; import lombok.Getter; diff --git a/src/main/java/com/volmit/iris/core/pregenerator/methods/HybridPregenMethod.java b/src/main/java/com/volmit/iris/core/pregenerator/methods/HybridPregenMethod.java index f6e5a6f04..78b8a4b70 100644 --- a/src/main/java/com/volmit/iris/core/pregenerator/methods/HybridPregenMethod.java +++ b/src/main/java/com/volmit/iris/core/pregenerator/methods/HybridPregenMethod.java @@ -23,7 +23,7 @@ import com.volmit.iris.core.IrisSettings; import com.volmit.iris.core.pregenerator.PregenListener; import com.volmit.iris.core.pregenerator.PregeneratorMethod; import com.volmit.iris.core.tools.IrisToolbelt; -import com.volmit.iris.engine.object.common.HeadlessWorld; +import com.volmit.iris.engine.object.HeadlessWorld; import com.volmit.iris.util.math.Position2; import org.bukkit.World; diff --git a/src/main/java/com/volmit/iris/core/pregenerator/methods/SyndicatePregenMethod.java b/src/main/java/com/volmit/iris/core/pregenerator/methods/SyndicatePregenMethod.java index 573fc8496..6b2f30afa 100644 --- a/src/main/java/com/volmit/iris/core/pregenerator/methods/SyndicatePregenMethod.java +++ b/src/main/java/com/volmit/iris/core/pregenerator/methods/SyndicatePregenMethod.java @@ -25,7 +25,7 @@ import com.volmit.iris.core.pregenerator.PregenTask; import com.volmit.iris.core.pregenerator.PregeneratorMethod; import com.volmit.iris.core.pregenerator.syndicate.SyndicateClient; import com.volmit.iris.core.pregenerator.syndicate.command.*; -import com.volmit.iris.engine.object.dimensional.IrisDimension; +import com.volmit.iris.engine.object.IrisDimension; import com.volmit.iris.util.io.IO; import com.volmit.iris.util.scheduling.J; import lombok.Getter; diff --git a/src/main/java/com/volmit/iris/core/pregenerator/syndicate/SyndicateServer.java b/src/main/java/com/volmit/iris/core/pregenerator/syndicate/SyndicateServer.java index 83d60aacc..8a6b84f13 100644 --- a/src/main/java/com/volmit/iris/core/pregenerator/syndicate/SyndicateServer.java +++ b/src/main/java/com/volmit/iris/core/pregenerator/syndicate/SyndicateServer.java @@ -20,7 +20,7 @@ package com.volmit.iris.core.pregenerator.syndicate; import com.volmit.iris.core.pregenerator.PregenListener; import com.volmit.iris.core.pregenerator.syndicate.command.*; -import com.volmit.iris.engine.object.common.HeadlessWorld; +import com.volmit.iris.engine.object.HeadlessWorld; import com.volmit.iris.engine.platform.HeadlessGenerator; import com.volmit.iris.util.io.IO; import com.volmit.iris.util.scheduling.J; diff --git a/src/main/java/com/volmit/iris/core/pregenerator/syndicate/command/SyndicateInstallPack.java b/src/main/java/com/volmit/iris/core/pregenerator/syndicate/command/SyndicateInstallPack.java index e54cca38c..d399ee546 100644 --- a/src/main/java/com/volmit/iris/core/pregenerator/syndicate/command/SyndicateInstallPack.java +++ b/src/main/java/com/volmit/iris/core/pregenerator/syndicate/command/SyndicateInstallPack.java @@ -18,7 +18,7 @@ package com.volmit.iris.core.pregenerator.syndicate.command; -import com.volmit.iris.engine.object.dimensional.IrisDimension; +import com.volmit.iris.engine.object.IrisDimension; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; diff --git a/src/main/java/com/volmit/iris/core/project/IrisProject.java b/src/main/java/com/volmit/iris/core/project/IrisProject.java index 137d273f7..df46c2c34 100644 --- a/src/main/java/com/volmit/iris/core/project/IrisProject.java +++ b/src/main/java/com/volmit/iris/core/project/IrisProject.java @@ -25,22 +25,21 @@ import com.volmit.iris.core.loader.IrisData; import com.volmit.iris.core.loader.IrisRegistrant; import com.volmit.iris.core.loader.ResourceLoader; import com.volmit.iris.core.tools.IrisToolbelt; -import com.volmit.iris.engine.object.biome.IrisBiome; -import com.volmit.iris.engine.object.block.IrisBlockData; -import com.volmit.iris.engine.object.dimensional.IrisDimension; -import com.volmit.iris.engine.object.entity.IrisEntity; -import com.volmit.iris.engine.object.loot.IrisLootTable; -import com.volmit.iris.engine.object.noise.IrisGenerator; -import com.volmit.iris.engine.object.objects.IrisObject; -import com.volmit.iris.engine.object.objects.IrisObjectPlacement; -import com.volmit.iris.engine.object.regional.IrisRegion; -import com.volmit.iris.engine.object.spawners.IrisSpawner; +import com.volmit.iris.engine.object.IrisBiome; +import com.volmit.iris.engine.object.IrisBlockData; +import com.volmit.iris.engine.object.IrisDimension; +import com.volmit.iris.engine.object.IrisEntity; +import com.volmit.iris.engine.object.IrisLootTable; +import com.volmit.iris.engine.object.IrisGenerator; +import com.volmit.iris.engine.object.IrisObject; +import com.volmit.iris.engine.object.IrisObjectPlacement; +import com.volmit.iris.engine.object.IrisRegion; +import com.volmit.iris.engine.object.IrisSpawner; import com.volmit.iris.engine.platform.PlatformChunkGenerator; import com.volmit.iris.util.collection.KList; import com.volmit.iris.util.collection.KMap; import com.volmit.iris.util.collection.KSet; import com.volmit.iris.util.exceptions.IrisException; -import com.volmit.iris.util.format.Form; import com.volmit.iris.util.io.IO; import com.volmit.iris.util.json.JSONArray; import com.volmit.iris.util.json.JSONObject; diff --git a/src/main/java/com/volmit/iris/core/service/BoardSVC.java b/src/main/java/com/volmit/iris/core/service/BoardSVC.java index 9fb7bf550..fc6950b07 100644 --- a/src/main/java/com/volmit/iris/core/service/BoardSVC.java +++ b/src/main/java/com/volmit/iris/core/service/BoardSVC.java @@ -22,7 +22,7 @@ import com.volmit.iris.Iris; import com.volmit.iris.core.loader.IrisData; import com.volmit.iris.core.tools.IrisToolbelt; import com.volmit.iris.engine.framework.Engine; -import com.volmit.iris.engine.object.feature.IrisFeaturePositional; +import com.volmit.iris.engine.object.IrisFeaturePositional; import com.volmit.iris.util.board.BoardProvider; import com.volmit.iris.util.board.BoardSettings; import com.volmit.iris.util.board.ScoreDirection; diff --git a/src/main/java/com/volmit/iris/core/service/ConversionSVC.java b/src/main/java/com/volmit/iris/core/service/ConversionSVC.java index 95c99aa95..68734ba5b 100644 --- a/src/main/java/com/volmit/iris/core/service/ConversionSVC.java +++ b/src/main/java/com/volmit/iris/core/service/ConversionSVC.java @@ -20,12 +20,12 @@ package com.volmit.iris.core.service; import com.google.gson.Gson; import com.volmit.iris.Iris; -import com.volmit.iris.engine.object.basic.IrisPosition; -import com.volmit.iris.engine.object.jigsaw.IrisJigsawPiece; -import com.volmit.iris.engine.object.jigsaw.IrisJigsawPieceConnector; -import com.volmit.iris.engine.object.jigsaw.IrisJigsawPool; -import com.volmit.iris.engine.object.objects.IrisDirection; -import com.volmit.iris.engine.object.objects.IrisObject; +import com.volmit.iris.engine.object.IrisPosition; +import com.volmit.iris.engine.object.IrisJigsawPiece; +import com.volmit.iris.engine.object.IrisJigsawPieceConnector; +import com.volmit.iris.engine.object.IrisJigsawPool; +import com.volmit.iris.engine.object.IrisDirection; +import com.volmit.iris.engine.object.IrisObject; import com.volmit.iris.util.collection.KList; import com.volmit.iris.util.collection.KMap; import com.volmit.iris.util.format.Form; diff --git a/src/main/java/com/volmit/iris/core/service/StudioSVC.java b/src/main/java/com/volmit/iris/core/service/StudioSVC.java index 43fe68ec1..f3db03a1c 100644 --- a/src/main/java/com/volmit/iris/core/service/StudioSVC.java +++ b/src/main/java/com/volmit/iris/core/service/StudioSVC.java @@ -27,7 +27,7 @@ import com.volmit.iris.core.pack.IrisPack; import com.volmit.iris.core.project.IrisProject; import com.volmit.iris.core.tools.IrisToolbelt; import com.volmit.iris.engine.data.cache.AtomicCache; -import com.volmit.iris.engine.object.dimensional.IrisDimension; +import com.volmit.iris.engine.object.IrisDimension; import com.volmit.iris.util.collection.KMap; import com.volmit.iris.util.exceptions.IrisException; import com.volmit.iris.util.format.Form; diff --git a/src/main/java/com/volmit/iris/core/service/TreeSVC.java b/src/main/java/com/volmit/iris/core/service/TreeSVC.java index 5444dde5d..73b0120a5 100644 --- a/src/main/java/com/volmit/iris/core/service/TreeSVC.java +++ b/src/main/java/com/volmit/iris/core/service/TreeSVC.java @@ -21,14 +21,14 @@ package com.volmit.iris.core.service; import com.volmit.iris.Iris; import com.volmit.iris.core.loader.IrisData; import com.volmit.iris.core.tools.IrisToolbelt; -import com.volmit.iris.engine.object.biome.IrisBiome; -import com.volmit.iris.engine.object.common.IObjectPlacer; -import com.volmit.iris.engine.object.objects.IrisObject; -import com.volmit.iris.engine.object.objects.IrisObjectPlacement; -import com.volmit.iris.engine.object.regional.IrisRegion; -import com.volmit.iris.engine.object.tile.TileData; -import com.volmit.iris.engine.object.trees.IrisTreeModes; -import com.volmit.iris.engine.object.trees.IrisTreeSize; +import com.volmit.iris.engine.object.IrisBiome; +import com.volmit.iris.engine.object.IObjectPlacer; +import com.volmit.iris.engine.object.IrisObject; +import com.volmit.iris.engine.object.IrisObjectPlacement; +import com.volmit.iris.engine.object.IrisRegion; +import com.volmit.iris.engine.object.TileData; +import com.volmit.iris.engine.object.IrisTreeModes; +import com.volmit.iris.engine.object.IrisTreeSize; import com.volmit.iris.engine.platform.PlatformChunkGenerator; import com.volmit.iris.util.collection.KList; import com.volmit.iris.util.collection.KMap; diff --git a/src/main/java/com/volmit/iris/core/service/VillageSVC.java b/src/main/java/com/volmit/iris/core/service/VillageSVC.java index a8652bcda..6f31fbe10 100644 --- a/src/main/java/com/volmit/iris/core/service/VillageSVC.java +++ b/src/main/java/com/volmit/iris/core/service/VillageSVC.java @@ -20,8 +20,8 @@ package com.volmit.iris.core.service; import com.volmit.iris.Iris; import com.volmit.iris.core.tools.IrisToolbelt; -import com.volmit.iris.engine.object.villager.IrisVillagerOverride; -import com.volmit.iris.engine.object.villager.IrisVillagerTrade; +import com.volmit.iris.engine.object.IrisVillagerOverride; +import com.volmit.iris.engine.object.IrisVillagerTrade; import com.volmit.iris.util.plugin.IrisService; import org.bukkit.Material; import org.bukkit.event.EventHandler; diff --git a/src/main/java/com/volmit/iris/core/service/WandSVC.java b/src/main/java/com/volmit/iris/core/service/WandSVC.java index 4a94710e2..24c51c3db 100644 --- a/src/main/java/com/volmit/iris/core/service/WandSVC.java +++ b/src/main/java/com/volmit/iris/core/service/WandSVC.java @@ -21,7 +21,7 @@ package com.volmit.iris.core.service; import com.volmit.iris.Iris; import com.volmit.iris.core.edit.DustRevealer; import com.volmit.iris.core.wand.WandSelection; -import com.volmit.iris.engine.object.objects.IrisObject; +import com.volmit.iris.engine.object.IrisObject; import com.volmit.iris.util.collection.KList; import com.volmit.iris.util.data.Cuboid; import com.volmit.iris.util.format.C; diff --git a/src/main/java/com/volmit/iris/core/tools/IrisCreator.java b/src/main/java/com/volmit/iris/core/tools/IrisCreator.java index 8b719972d..ffc4c29d4 100644 --- a/src/main/java/com/volmit/iris/core/tools/IrisCreator.java +++ b/src/main/java/com/volmit/iris/core/tools/IrisCreator.java @@ -23,7 +23,7 @@ import com.volmit.iris.Iris; import com.volmit.iris.core.IrisSettings; import com.volmit.iris.core.pregenerator.PregenTask; import com.volmit.iris.core.service.StudioSVC; -import com.volmit.iris.engine.object.dimensional.IrisDimension; +import com.volmit.iris.engine.object.IrisDimension; import com.volmit.iris.engine.platform.PlatformChunkGenerator; import com.volmit.iris.util.exceptions.IrisException; import com.volmit.iris.util.format.C; diff --git a/src/main/java/com/volmit/iris/core/tools/IrisToolbelt.java b/src/main/java/com/volmit/iris/core/tools/IrisToolbelt.java index 470df5b74..7ec267ae7 100644 --- a/src/main/java/com/volmit/iris/core/tools/IrisToolbelt.java +++ b/src/main/java/com/volmit/iris/core/tools/IrisToolbelt.java @@ -27,7 +27,7 @@ import com.volmit.iris.core.pregenerator.PregeneratorMethod; import com.volmit.iris.core.pregenerator.methods.HeadlessPregenMethod; import com.volmit.iris.core.pregenerator.methods.HybridPregenMethod; import com.volmit.iris.core.service.StudioSVC; -import com.volmit.iris.engine.object.dimensional.IrisDimension; +import com.volmit.iris.engine.object.IrisDimension; import com.volmit.iris.engine.platform.HeadlessGenerator; import com.volmit.iris.engine.platform.PlatformChunkGenerator; import com.volmit.iris.util.plugin.VolmitSender; diff --git a/src/main/java/com/volmit/iris/core/tools/IrisWorldCreator.java b/src/main/java/com/volmit/iris/core/tools/IrisWorldCreator.java index 447cb1ccd..c42b8d15d 100644 --- a/src/main/java/com/volmit/iris/core/tools/IrisWorldCreator.java +++ b/src/main/java/com/volmit/iris/core/tools/IrisWorldCreator.java @@ -19,8 +19,8 @@ package com.volmit.iris.core.tools; import com.volmit.iris.core.loader.IrisData; -import com.volmit.iris.engine.object.common.IrisWorld; -import com.volmit.iris.engine.object.dimensional.IrisDimension; +import com.volmit.iris.engine.object.IrisWorld; +import com.volmit.iris.engine.object.IrisDimension; import com.volmit.iris.engine.platform.BukkitChunkGenerator; import org.bukkit.World; import org.bukkit.WorldCreator; diff --git a/src/main/java/com/volmit/iris/engine/IrisComplex.java b/src/main/java/com/volmit/iris/engine/IrisComplex.java index c78927e6a..889844d2f 100644 --- a/src/main/java/com/volmit/iris/engine/IrisComplex.java +++ b/src/main/java/com/volmit/iris/engine/IrisComplex.java @@ -22,13 +22,13 @@ import com.google.common.util.concurrent.AtomicDouble; import com.volmit.iris.Iris; import com.volmit.iris.core.loader.IrisData; import com.volmit.iris.engine.framework.Engine; -import com.volmit.iris.engine.object.biome.InferredType; -import com.volmit.iris.engine.object.biome.IrisBiome; -import com.volmit.iris.engine.object.decoration.IrisDecorationPart; -import com.volmit.iris.engine.object.decoration.IrisDecorator; -import com.volmit.iris.engine.object.feature.IrisFeaturePositional; -import com.volmit.iris.engine.object.noise.IrisGenerator; -import com.volmit.iris.engine.object.regional.IrisRegion; +import com.volmit.iris.engine.object.InferredType; +import com.volmit.iris.engine.object.IrisBiome; +import com.volmit.iris.engine.object.IrisDecorationPart; +import com.volmit.iris.engine.object.IrisDecorator; +import com.volmit.iris.engine.object.IrisFeaturePositional; +import com.volmit.iris.engine.object.IrisGenerator; +import com.volmit.iris.engine.object.IrisRegion; import com.volmit.iris.util.collection.KList; import com.volmit.iris.util.collection.KMap; import com.volmit.iris.util.data.DataProvider; diff --git a/src/main/java/com/volmit/iris/engine/IrisEngine.java b/src/main/java/com/volmit/iris/engine/IrisEngine.java index 8065d624c..456eec76c 100644 --- a/src/main/java/com/volmit/iris/engine/IrisEngine.java +++ b/src/main/java/com/volmit/iris/engine/IrisEngine.java @@ -34,11 +34,11 @@ import com.volmit.iris.engine.mantle.EngineMantle; import com.volmit.iris.engine.modifier.IrisCarveModifier; import com.volmit.iris.engine.modifier.IrisDepositModifier; import com.volmit.iris.engine.modifier.IrisPostModifier; -import com.volmit.iris.engine.object.biome.IrisBiome; -import com.volmit.iris.engine.object.biome.IrisBiomePaletteLayer; -import com.volmit.iris.engine.object.decoration.IrisDecorator; -import com.volmit.iris.engine.object.engine.IrisEngineData; -import com.volmit.iris.engine.object.objects.IrisObjectPlacement; +import com.volmit.iris.engine.object.IrisBiome; +import com.volmit.iris.engine.object.IrisBiomePaletteLayer; +import com.volmit.iris.engine.object.IrisDecorator; +import com.volmit.iris.engine.object.IrisEngineData; +import com.volmit.iris.engine.object.IrisObjectPlacement; import com.volmit.iris.engine.scripting.EngineExecutionEnvironment; import com.volmit.iris.util.atomics.AtomicRollingSequence; import com.volmit.iris.util.collection.KMap; diff --git a/src/main/java/com/volmit/iris/engine/IrisEngineMantle.java b/src/main/java/com/volmit/iris/engine/IrisEngineMantle.java index dc763178b..808775b69 100644 --- a/src/main/java/com/volmit/iris/engine/IrisEngineMantle.java +++ b/src/main/java/com/volmit/iris/engine/IrisEngineMantle.java @@ -27,14 +27,14 @@ import com.volmit.iris.engine.mantle.components.MantleCarvingComponent; import com.volmit.iris.engine.mantle.components.MantleFeatureComponent; import com.volmit.iris.engine.mantle.components.MantleJigsawComponent; import com.volmit.iris.engine.mantle.components.MantleObjectComponent; -import com.volmit.iris.engine.object.biome.IrisBiome; -import com.volmit.iris.engine.object.deposits.IrisDepositGenerator; -import com.volmit.iris.engine.object.feature.IrisFeaturePotential; -import com.volmit.iris.engine.object.jigsaw.IrisJigsawStructurePlacement; -import com.volmit.iris.engine.object.objects.IrisObject; -import com.volmit.iris.engine.object.objects.IrisObjectPlacement; -import com.volmit.iris.engine.object.objects.IrisObjectScale; -import com.volmit.iris.engine.object.regional.IrisRegion; +import com.volmit.iris.engine.object.IrisBiome; +import com.volmit.iris.engine.object.IrisDepositGenerator; +import com.volmit.iris.engine.object.IrisFeaturePotential; +import com.volmit.iris.engine.object.IrisJigsawStructurePlacement; +import com.volmit.iris.engine.object.IrisObject; +import com.volmit.iris.engine.object.IrisObjectPlacement; +import com.volmit.iris.engine.object.IrisObjectScale; +import com.volmit.iris.engine.object.IrisRegion; import com.volmit.iris.util.collection.KList; import com.volmit.iris.util.collection.KMap; import com.volmit.iris.util.collection.KSet; diff --git a/src/main/java/com/volmit/iris/engine/IrisExecutionEnvironment.java b/src/main/java/com/volmit/iris/engine/IrisExecutionEnvironment.java index be64f4d24..d33fc34f8 100644 --- a/src/main/java/com/volmit/iris/engine/IrisExecutionEnvironment.java +++ b/src/main/java/com/volmit/iris/engine/IrisExecutionEnvironment.java @@ -20,7 +20,7 @@ package com.volmit.iris.engine; import com.volmit.iris.Iris; import com.volmit.iris.engine.framework.Engine; -import com.volmit.iris.engine.object.common.IrisScript; +import com.volmit.iris.engine.object.IrisScript; import com.volmit.iris.engine.scripting.EngineExecutionEnvironment; import com.volmit.iris.engine.scripting.IrisScriptingAPI; import com.volmit.iris.util.format.C; diff --git a/src/main/java/com/volmit/iris/engine/IrisWorldManager.java b/src/main/java/com/volmit/iris/engine/IrisWorldManager.java index 0af3cea33..27f0d1bc9 100644 --- a/src/main/java/com/volmit/iris/engine/IrisWorldManager.java +++ b/src/main/java/com/volmit/iris/engine/IrisWorldManager.java @@ -22,15 +22,15 @@ import com.volmit.iris.Iris; import com.volmit.iris.engine.data.cache.Cache; import com.volmit.iris.engine.framework.Engine; import com.volmit.iris.engine.framework.EngineAssignedWorldManager; -import com.volmit.iris.engine.object.biome.IrisBiome; -import com.volmit.iris.engine.object.block.IrisBlockDrops; -import com.volmit.iris.engine.object.common.IRare; -import com.volmit.iris.engine.object.engine.IrisEngineChunkData; -import com.volmit.iris.engine.object.engine.IrisEngineData; -import com.volmit.iris.engine.object.engine.IrisEngineSpawnerCooldown; -import com.volmit.iris.engine.object.entity.IrisEntitySpawn; -import com.volmit.iris.engine.object.regional.IrisRegion; -import com.volmit.iris.engine.object.spawners.IrisSpawner; +import com.volmit.iris.engine.object.IrisBiome; +import com.volmit.iris.engine.object.IrisBlockDrops; +import com.volmit.iris.engine.object.IRare; +import com.volmit.iris.engine.object.IrisEngineChunkData; +import com.volmit.iris.engine.object.IrisEngineData; +import com.volmit.iris.engine.object.IrisEngineSpawnerCooldown; +import com.volmit.iris.engine.object.IrisEntitySpawn; +import com.volmit.iris.engine.object.IrisRegion; +import com.volmit.iris.engine.object.IrisSpawner; import com.volmit.iris.util.collection.KList; import com.volmit.iris.util.collection.KMap; import com.volmit.iris.util.format.Form; diff --git a/src/main/java/com/volmit/iris/engine/actuator/IrisBiomeActuator.java b/src/main/java/com/volmit/iris/engine/actuator/IrisBiomeActuator.java index 45cd6dc49..ca889e854 100644 --- a/src/main/java/com/volmit/iris/engine/actuator/IrisBiomeActuator.java +++ b/src/main/java/com/volmit/iris/engine/actuator/IrisBiomeActuator.java @@ -23,8 +23,8 @@ import com.volmit.iris.core.nms.INMS; import com.volmit.iris.engine.data.chunk.TerrainChunk; import com.volmit.iris.engine.framework.Engine; import com.volmit.iris.engine.framework.EngineAssignedActuator; -import com.volmit.iris.engine.object.biome.IrisBiome; -import com.volmit.iris.engine.object.biome.IrisBiomeCustom; +import com.volmit.iris.engine.object.IrisBiome; +import com.volmit.iris.engine.object.IrisBiomeCustom; import com.volmit.iris.util.documentation.BlockCoordinates; import com.volmit.iris.util.hunk.Hunk; import com.volmit.iris.util.hunk.view.BiomeGridHunkView; diff --git a/src/main/java/com/volmit/iris/engine/actuator/IrisDecorantActuator.java b/src/main/java/com/volmit/iris/engine/actuator/IrisDecorantActuator.java index 5ebe1d7a8..4c0b7b102 100644 --- a/src/main/java/com/volmit/iris/engine/actuator/IrisDecorantActuator.java +++ b/src/main/java/com/volmit/iris/engine/actuator/IrisDecorantActuator.java @@ -22,7 +22,7 @@ import com.volmit.iris.engine.decorator.*; import com.volmit.iris.engine.framework.Engine; import com.volmit.iris.engine.framework.EngineAssignedActuator; import com.volmit.iris.engine.framework.EngineDecorator; -import com.volmit.iris.engine.object.biome.IrisBiome; +import com.volmit.iris.engine.object.IrisBiome; import com.volmit.iris.util.documentation.BlockCoordinates; import com.volmit.iris.util.hunk.Hunk; import com.volmit.iris.util.math.RNG; diff --git a/src/main/java/com/volmit/iris/engine/actuator/IrisTerrainNormalActuator.java b/src/main/java/com/volmit/iris/engine/actuator/IrisTerrainNormalActuator.java index 8a30af604..38f5d8c09 100644 --- a/src/main/java/com/volmit/iris/engine/actuator/IrisTerrainNormalActuator.java +++ b/src/main/java/com/volmit/iris/engine/actuator/IrisTerrainNormalActuator.java @@ -20,7 +20,7 @@ package com.volmit.iris.engine.actuator; import com.volmit.iris.engine.framework.Engine; import com.volmit.iris.engine.framework.EngineAssignedActuator; -import com.volmit.iris.engine.object.biome.IrisBiome; +import com.volmit.iris.engine.object.IrisBiome; import com.volmit.iris.util.collection.KList; import com.volmit.iris.util.documentation.BlockCoordinates; import com.volmit.iris.util.hunk.Hunk; diff --git a/src/main/java/com/volmit/iris/engine/decorator/IrisCeilingDecorator.java b/src/main/java/com/volmit/iris/engine/decorator/IrisCeilingDecorator.java index c99e1847e..b1a4a27f1 100644 --- a/src/main/java/com/volmit/iris/engine/decorator/IrisCeilingDecorator.java +++ b/src/main/java/com/volmit/iris/engine/decorator/IrisCeilingDecorator.java @@ -20,9 +20,9 @@ package com.volmit.iris.engine.decorator; import com.volmit.iris.engine.data.cache.Cache; import com.volmit.iris.engine.framework.Engine; -import com.volmit.iris.engine.object.biome.IrisBiome; -import com.volmit.iris.engine.object.decoration.IrisDecorationPart; -import com.volmit.iris.engine.object.decoration.IrisDecorator; +import com.volmit.iris.engine.object.IrisBiome; +import com.volmit.iris.engine.object.IrisDecorationPart; +import com.volmit.iris.engine.object.IrisDecorator; import com.volmit.iris.util.documentation.BlockCoordinates; import com.volmit.iris.util.hunk.Hunk; import org.bukkit.Material; diff --git a/src/main/java/com/volmit/iris/engine/decorator/IrisEngineDecorator.java b/src/main/java/com/volmit/iris/engine/decorator/IrisEngineDecorator.java index 0da7bc64d..9ada1f848 100644 --- a/src/main/java/com/volmit/iris/engine/decorator/IrisEngineDecorator.java +++ b/src/main/java/com/volmit/iris/engine/decorator/IrisEngineDecorator.java @@ -23,9 +23,9 @@ import com.volmit.iris.engine.data.cache.Cache; import com.volmit.iris.engine.framework.Engine; import com.volmit.iris.engine.framework.EngineAssignedComponent; import com.volmit.iris.engine.framework.EngineDecorator; -import com.volmit.iris.engine.object.biome.IrisBiome; -import com.volmit.iris.engine.object.decoration.IrisDecorationPart; -import com.volmit.iris.engine.object.decoration.IrisDecorator; +import com.volmit.iris.engine.object.IrisBiome; +import com.volmit.iris.engine.object.IrisDecorationPart; +import com.volmit.iris.engine.object.IrisDecorator; import com.volmit.iris.util.collection.KList; import com.volmit.iris.util.math.RNG; import lombok.Getter; diff --git a/src/main/java/com/volmit/iris/engine/decorator/IrisSeaFloorDecorator.java b/src/main/java/com/volmit/iris/engine/decorator/IrisSeaFloorDecorator.java index e51fee6fc..3962ce30f 100644 --- a/src/main/java/com/volmit/iris/engine/decorator/IrisSeaFloorDecorator.java +++ b/src/main/java/com/volmit/iris/engine/decorator/IrisSeaFloorDecorator.java @@ -20,9 +20,9 @@ package com.volmit.iris.engine.decorator; import com.volmit.iris.engine.data.cache.Cache; import com.volmit.iris.engine.framework.Engine; -import com.volmit.iris.engine.object.biome.IrisBiome; -import com.volmit.iris.engine.object.decoration.IrisDecorationPart; -import com.volmit.iris.engine.object.decoration.IrisDecorator; +import com.volmit.iris.engine.object.IrisBiome; +import com.volmit.iris.engine.object.IrisDecorationPart; +import com.volmit.iris.engine.object.IrisDecorator; import com.volmit.iris.util.documentation.BlockCoordinates; import com.volmit.iris.util.hunk.Hunk; import org.bukkit.block.data.BlockData; diff --git a/src/main/java/com/volmit/iris/engine/decorator/IrisSeaSurfaceDecorator.java b/src/main/java/com/volmit/iris/engine/decorator/IrisSeaSurfaceDecorator.java index 0a4298c2c..fd2006b18 100644 --- a/src/main/java/com/volmit/iris/engine/decorator/IrisSeaSurfaceDecorator.java +++ b/src/main/java/com/volmit/iris/engine/decorator/IrisSeaSurfaceDecorator.java @@ -20,9 +20,9 @@ package com.volmit.iris.engine.decorator; import com.volmit.iris.engine.data.cache.Cache; import com.volmit.iris.engine.framework.Engine; -import com.volmit.iris.engine.object.biome.IrisBiome; -import com.volmit.iris.engine.object.decoration.IrisDecorationPart; -import com.volmit.iris.engine.object.decoration.IrisDecorator; +import com.volmit.iris.engine.object.IrisBiome; +import com.volmit.iris.engine.object.IrisDecorationPart; +import com.volmit.iris.engine.object.IrisDecorator; import com.volmit.iris.util.documentation.BlockCoordinates; import com.volmit.iris.util.hunk.Hunk; import org.bukkit.block.data.BlockData; diff --git a/src/main/java/com/volmit/iris/engine/decorator/IrisShoreLineDecorator.java b/src/main/java/com/volmit/iris/engine/decorator/IrisShoreLineDecorator.java index ac2e946ac..3ad2f1b63 100644 --- a/src/main/java/com/volmit/iris/engine/decorator/IrisShoreLineDecorator.java +++ b/src/main/java/com/volmit/iris/engine/decorator/IrisShoreLineDecorator.java @@ -20,9 +20,9 @@ package com.volmit.iris.engine.decorator; import com.volmit.iris.engine.data.cache.Cache; import com.volmit.iris.engine.framework.Engine; -import com.volmit.iris.engine.object.biome.IrisBiome; -import com.volmit.iris.engine.object.decoration.IrisDecorationPart; -import com.volmit.iris.engine.object.decoration.IrisDecorator; +import com.volmit.iris.engine.object.IrisBiome; +import com.volmit.iris.engine.object.IrisDecorationPart; +import com.volmit.iris.engine.object.IrisDecorator; import com.volmit.iris.util.documentation.BlockCoordinates; import com.volmit.iris.util.hunk.Hunk; import org.bukkit.block.data.BlockData; diff --git a/src/main/java/com/volmit/iris/engine/decorator/IrisSurfaceDecorator.java b/src/main/java/com/volmit/iris/engine/decorator/IrisSurfaceDecorator.java index 60a902c17..0ecee8513 100644 --- a/src/main/java/com/volmit/iris/engine/decorator/IrisSurfaceDecorator.java +++ b/src/main/java/com/volmit/iris/engine/decorator/IrisSurfaceDecorator.java @@ -21,10 +21,10 @@ package com.volmit.iris.engine.decorator; import com.volmit.iris.Iris; import com.volmit.iris.engine.data.cache.Cache; import com.volmit.iris.engine.framework.Engine; -import com.volmit.iris.engine.object.biome.InferredType; -import com.volmit.iris.engine.object.biome.IrisBiome; -import com.volmit.iris.engine.object.decoration.IrisDecorationPart; -import com.volmit.iris.engine.object.decoration.IrisDecorator; +import com.volmit.iris.engine.object.InferredType; +import com.volmit.iris.engine.object.IrisBiome; +import com.volmit.iris.engine.object.IrisDecorationPart; +import com.volmit.iris.engine.object.IrisDecorator; import com.volmit.iris.util.documentation.BlockCoordinates; import com.volmit.iris.util.hunk.Hunk; import org.bukkit.Material; diff --git a/src/main/java/com/volmit/iris/engine/framework/Engine.java b/src/main/java/com/volmit/iris/engine/framework/Engine.java index d09894662..6b70ac1f6 100644 --- a/src/main/java/com/volmit/iris/engine/framework/Engine.java +++ b/src/main/java/com/volmit/iris/engine/framework/Engine.java @@ -26,18 +26,18 @@ import com.volmit.iris.engine.IrisComplex; import com.volmit.iris.engine.data.cache.Cache; import com.volmit.iris.engine.data.chunk.TerrainChunk; import com.volmit.iris.engine.mantle.EngineMantle; -import com.volmit.iris.engine.object.basic.IrisColor; -import com.volmit.iris.engine.object.basic.IrisPosition; -import com.volmit.iris.engine.object.biome.IrisBiome; -import com.volmit.iris.engine.object.common.IrisWorld; -import com.volmit.iris.engine.object.dimensional.IrisDimension; -import com.volmit.iris.engine.object.engine.IrisEngineData; -import com.volmit.iris.engine.object.loot.IrisLootMode; -import com.volmit.iris.engine.object.loot.IrisLootReference; -import com.volmit.iris.engine.object.loot.IrisLootTable; -import com.volmit.iris.engine.object.meta.InventorySlotType; -import com.volmit.iris.engine.object.objects.IrisObjectPlacement; -import com.volmit.iris.engine.object.regional.IrisRegion; +import com.volmit.iris.engine.object.IrisColor; +import com.volmit.iris.engine.object.IrisPosition; +import com.volmit.iris.engine.object.IrisBiome; +import com.volmit.iris.engine.object.IrisWorld; +import com.volmit.iris.engine.object.IrisDimension; +import com.volmit.iris.engine.object.IrisEngineData; +import com.volmit.iris.engine.object.IrisLootMode; +import com.volmit.iris.engine.object.IrisLootReference; +import com.volmit.iris.engine.object.IrisLootTable; +import com.volmit.iris.engine.object.InventorySlotType; +import com.volmit.iris.engine.object.IrisObjectPlacement; +import com.volmit.iris.engine.object.IrisRegion; import com.volmit.iris.engine.scripting.EngineExecutionEnvironment; import com.volmit.iris.util.collection.KList; import com.volmit.iris.util.collection.KMap; diff --git a/src/main/java/com/volmit/iris/engine/framework/EngineComponent.java b/src/main/java/com/volmit/iris/engine/framework/EngineComponent.java index 08a09ab05..ead01825d 100644 --- a/src/main/java/com/volmit/iris/engine/framework/EngineComponent.java +++ b/src/main/java/com/volmit/iris/engine/framework/EngineComponent.java @@ -21,7 +21,7 @@ package com.volmit.iris.engine.framework; import com.volmit.iris.Iris; import com.volmit.iris.core.loader.IrisData; import com.volmit.iris.engine.IrisComplex; -import com.volmit.iris.engine.object.dimensional.IrisDimension; +import com.volmit.iris.engine.object.IrisDimension; import com.volmit.iris.util.math.RollingSequence; import com.volmit.iris.util.parallel.MultiBurst; import org.bukkit.event.Listener; diff --git a/src/main/java/com/volmit/iris/engine/framework/EngineData.java b/src/main/java/com/volmit/iris/engine/framework/EngineData.java index 6954d0c3d..0228616d7 100644 --- a/src/main/java/com/volmit/iris/engine/framework/EngineData.java +++ b/src/main/java/com/volmit/iris/engine/framework/EngineData.java @@ -20,7 +20,7 @@ package com.volmit.iris.engine.framework; import com.google.gson.Gson; import com.volmit.iris.Iris; -import com.volmit.iris.engine.object.basic.IrisPosition; +import com.volmit.iris.engine.object.IrisPosition; import com.volmit.iris.util.io.IO; import lombok.Data; diff --git a/src/main/java/com/volmit/iris/engine/framework/EngineDecorator.java b/src/main/java/com/volmit/iris/engine/framework/EngineDecorator.java index 91528e54c..17154e64d 100644 --- a/src/main/java/com/volmit/iris/engine/framework/EngineDecorator.java +++ b/src/main/java/com/volmit/iris/engine/framework/EngineDecorator.java @@ -18,7 +18,7 @@ package com.volmit.iris.engine.framework; -import com.volmit.iris.engine.object.biome.IrisBiome; +import com.volmit.iris.engine.object.IrisBiome; import com.volmit.iris.util.data.B; import com.volmit.iris.util.documentation.BlockCoordinates; import com.volmit.iris.util.hunk.Hunk; diff --git a/src/main/java/com/volmit/iris/engine/framework/EnginePlayer.java b/src/main/java/com/volmit/iris/engine/framework/EnginePlayer.java index 51202453b..5afa34b33 100644 --- a/src/main/java/com/volmit/iris/engine/framework/EnginePlayer.java +++ b/src/main/java/com/volmit/iris/engine/framework/EnginePlayer.java @@ -19,9 +19,9 @@ package com.volmit.iris.engine.framework; import com.volmit.iris.Iris; -import com.volmit.iris.engine.object.biome.IrisBiome; -import com.volmit.iris.engine.object.meta.IrisEffect; -import com.volmit.iris.engine.object.regional.IrisRegion; +import com.volmit.iris.engine.object.IrisBiome; +import com.volmit.iris.engine.object.IrisEffect; +import com.volmit.iris.engine.object.IrisRegion; import com.volmit.iris.util.math.M; import com.volmit.iris.util.scheduling.J; import lombok.Data; diff --git a/src/main/java/com/volmit/iris/engine/framework/EngineTarget.java b/src/main/java/com/volmit/iris/engine/framework/EngineTarget.java index d6b849787..8665570a1 100644 --- a/src/main/java/com/volmit/iris/engine/framework/EngineTarget.java +++ b/src/main/java/com/volmit/iris/engine/framework/EngineTarget.java @@ -19,8 +19,8 @@ package com.volmit.iris.engine.framework; import com.volmit.iris.core.loader.IrisData; -import com.volmit.iris.engine.object.common.IrisWorld; -import com.volmit.iris.engine.object.dimensional.IrisDimension; +import com.volmit.iris.engine.object.IrisWorld; +import com.volmit.iris.engine.object.IrisDimension; import com.volmit.iris.util.parallel.MultiBurst; import lombok.Data; diff --git a/src/main/java/com/volmit/iris/engine/framework/LootProvider.java b/src/main/java/com/volmit/iris/engine/framework/LootProvider.java index b2a662031..d94a0b0ef 100644 --- a/src/main/java/com/volmit/iris/engine/framework/LootProvider.java +++ b/src/main/java/com/volmit/iris/engine/framework/LootProvider.java @@ -18,9 +18,9 @@ package com.volmit.iris.engine.framework; -import com.volmit.iris.engine.object.loot.IrisLootReference; -import com.volmit.iris.engine.object.loot.IrisLootTable; -import com.volmit.iris.engine.object.meta.InventorySlotType; +import com.volmit.iris.engine.object.IrisLootReference; +import com.volmit.iris.engine.object.IrisLootTable; +import com.volmit.iris.engine.object.InventorySlotType; import com.volmit.iris.util.collection.KList; import com.volmit.iris.util.math.RNG; import org.bukkit.block.Block; diff --git a/src/main/java/com/volmit/iris/engine/framework/PlacedObject.java b/src/main/java/com/volmit/iris/engine/framework/PlacedObject.java index b6c691c3d..f195511bc 100644 --- a/src/main/java/com/volmit/iris/engine/framework/PlacedObject.java +++ b/src/main/java/com/volmit/iris/engine/framework/PlacedObject.java @@ -18,8 +18,8 @@ package com.volmit.iris.engine.framework; -import com.volmit.iris.engine.object.objects.IrisObject; -import com.volmit.iris.engine.object.objects.IrisObjectPlacement; +import com.volmit.iris.engine.object.IrisObject; +import com.volmit.iris.engine.object.IrisObjectPlacement; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/src/main/java/com/volmit/iris/engine/framework/placer/HeightmapObjectPlacer.java b/src/main/java/com/volmit/iris/engine/framework/placer/HeightmapObjectPlacer.java index 78985a463..26b3185f4 100644 --- a/src/main/java/com/volmit/iris/engine/framework/placer/HeightmapObjectPlacer.java +++ b/src/main/java/com/volmit/iris/engine/framework/placer/HeightmapObjectPlacer.java @@ -19,9 +19,9 @@ package com.volmit.iris.engine.framework.placer; import com.volmit.iris.core.loader.IrisData; -import com.volmit.iris.engine.object.common.IObjectPlacer; -import com.volmit.iris.engine.object.objects.IrisObjectPlacement; -import com.volmit.iris.engine.object.tile.TileData; +import com.volmit.iris.engine.object.IObjectPlacer; +import com.volmit.iris.engine.object.IrisObjectPlacement; +import com.volmit.iris.engine.object.TileData; import com.volmit.iris.util.math.RNG; import org.bukkit.block.TileState; import org.bukkit.block.data.BlockData; diff --git a/src/main/java/com/volmit/iris/engine/jigsaw/PlannedPiece.java b/src/main/java/com/volmit/iris/engine/jigsaw/PlannedPiece.java index deedc71d1..ce50af0fc 100644 --- a/src/main/java/com/volmit/iris/engine/jigsaw/PlannedPiece.java +++ b/src/main/java/com/volmit/iris/engine/jigsaw/PlannedPiece.java @@ -21,16 +21,16 @@ package com.volmit.iris.engine.jigsaw; import com.volmit.iris.core.loader.IrisData; import com.volmit.iris.core.tools.IrisToolbelt; import com.volmit.iris.engine.framework.Engine; -import com.volmit.iris.engine.object.basic.IrisPosition; -import com.volmit.iris.engine.object.common.IObjectPlacer; -import com.volmit.iris.engine.object.jigsaw.IrisJigsawPiece; -import com.volmit.iris.engine.object.jigsaw.IrisJigsawPieceConnector; -import com.volmit.iris.engine.object.loot.IrisLootTable; -import com.volmit.iris.engine.object.meta.InventorySlotType; -import com.volmit.iris.engine.object.objects.IrisObject; -import com.volmit.iris.engine.object.objects.IrisObjectRotation; -import com.volmit.iris.engine.object.objects.IrisObjectTranslate; -import com.volmit.iris.engine.object.tile.TileData; +import com.volmit.iris.engine.object.IrisPosition; +import com.volmit.iris.engine.object.IObjectPlacer; +import com.volmit.iris.engine.object.IrisJigsawPiece; +import com.volmit.iris.engine.object.IrisJigsawPieceConnector; +import com.volmit.iris.engine.object.IrisLootTable; +import com.volmit.iris.engine.object.InventorySlotType; +import com.volmit.iris.engine.object.IrisObject; +import com.volmit.iris.engine.object.IrisObjectRotation; +import com.volmit.iris.engine.object.IrisObjectTranslate; +import com.volmit.iris.engine.object.TileData; import com.volmit.iris.engine.platform.PlatformChunkGenerator; import com.volmit.iris.util.collection.KList; import com.volmit.iris.util.math.AxisAlignedBB; diff --git a/src/main/java/com/volmit/iris/engine/jigsaw/PlannedStructure.java b/src/main/java/com/volmit/iris/engine/jigsaw/PlannedStructure.java index 4290072ba..c39146439 100644 --- a/src/main/java/com/volmit/iris/engine/jigsaw/PlannedStructure.java +++ b/src/main/java/com/volmit/iris/engine/jigsaw/PlannedStructure.java @@ -21,14 +21,7 @@ package com.volmit.iris.engine.jigsaw; import com.googlecode.concurrentlinkedhashmap.ConcurrentLinkedHashMap; import com.volmit.iris.Iris; import com.volmit.iris.core.loader.IrisData; -import com.volmit.iris.engine.object.basic.IrisPosition; -import com.volmit.iris.engine.object.common.IObjectPlacer; -import com.volmit.iris.engine.object.feature.IrisFeature; -import com.volmit.iris.engine.object.feature.IrisFeaturePositional; -import com.volmit.iris.engine.object.jigsaw.IrisJigsawPiece; -import com.volmit.iris.engine.object.jigsaw.IrisJigsawPieceConnector; -import com.volmit.iris.engine.object.jigsaw.IrisJigsawStructure; -import com.volmit.iris.engine.object.objects.*; +import com.volmit.iris.engine.object.*; import com.volmit.iris.util.collection.KList; import com.volmit.iris.util.interpolation.InterpolationMethod; import com.volmit.iris.util.mantle.Mantle; diff --git a/src/main/java/com/volmit/iris/engine/mantle/EngineMantle.java b/src/main/java/com/volmit/iris/engine/mantle/EngineMantle.java index 8452f78b5..1dc29a317 100644 --- a/src/main/java/com/volmit/iris/engine/mantle/EngineMantle.java +++ b/src/main/java/com/volmit/iris/engine/mantle/EngineMantle.java @@ -23,10 +23,10 @@ import com.volmit.iris.core.loader.IrisData; import com.volmit.iris.engine.IrisComplex; import com.volmit.iris.engine.framework.Engine; import com.volmit.iris.engine.framework.EngineTarget; -import com.volmit.iris.engine.object.common.IObjectPlacer; -import com.volmit.iris.engine.object.dimensional.IrisDimension; -import com.volmit.iris.engine.object.feature.IrisFeaturePositional; -import com.volmit.iris.engine.object.tile.TileData; +import com.volmit.iris.engine.object.IObjectPlacer; +import com.volmit.iris.engine.object.IrisDimension; +import com.volmit.iris.engine.object.IrisFeaturePositional; +import com.volmit.iris.engine.object.TileData; import com.volmit.iris.util.collection.KList; import com.volmit.iris.util.data.B; import com.volmit.iris.util.documentation.BlockCoordinates; @@ -37,7 +37,6 @@ import com.volmit.iris.util.mantle.MantleChunk; import com.volmit.iris.util.mantle.MantleFlag; import com.volmit.iris.util.matter.Matter; import com.volmit.iris.util.matter.MatterCavern; -import com.volmit.iris.util.matter.slices.CavernMatter; import com.volmit.iris.util.matter.slices.UpdateMatter; import com.volmit.iris.util.parallel.BurstExecutor; import com.volmit.iris.util.parallel.MultiBurst; diff --git a/src/main/java/com/volmit/iris/engine/mantle/MantleComponent.java b/src/main/java/com/volmit/iris/engine/mantle/MantleComponent.java index a78d91880..a4426ee94 100644 --- a/src/main/java/com/volmit/iris/engine/mantle/MantleComponent.java +++ b/src/main/java/com/volmit/iris/engine/mantle/MantleComponent.java @@ -20,7 +20,7 @@ package com.volmit.iris.engine.mantle; import com.volmit.iris.core.loader.IrisData; import com.volmit.iris.engine.IrisComplex; -import com.volmit.iris.engine.object.dimensional.IrisDimension; +import com.volmit.iris.engine.object.IrisDimension; import com.volmit.iris.util.documentation.ChunkCoordinates; import com.volmit.iris.util.mantle.Mantle; import com.volmit.iris.util.mantle.MantleFlag; diff --git a/src/main/java/com/volmit/iris/engine/mantle/MantleWriter.java b/src/main/java/com/volmit/iris/engine/mantle/MantleWriter.java index 0672ac3ee..fa6572389 100644 --- a/src/main/java/com/volmit/iris/engine/mantle/MantleWriter.java +++ b/src/main/java/com/volmit/iris/engine/mantle/MantleWriter.java @@ -22,10 +22,10 @@ import com.google.common.collect.ImmutableList; import com.volmit.iris.Iris; import com.volmit.iris.core.loader.IrisData; import com.volmit.iris.engine.data.cache.Cache; -import com.volmit.iris.engine.object.basic.IrisPosition; -import com.volmit.iris.engine.object.common.IObjectPlacer; -import com.volmit.iris.engine.object.feature.IrisFeaturePositional; -import com.volmit.iris.engine.object.tile.TileData; +import com.volmit.iris.engine.object.IrisPosition; +import com.volmit.iris.engine.object.IObjectPlacer; +import com.volmit.iris.engine.object.IrisFeaturePositional; +import com.volmit.iris.engine.object.TileData; import com.volmit.iris.util.collection.KMap; import com.volmit.iris.util.collection.KSet; import com.volmit.iris.util.function.Function3; diff --git a/src/main/java/com/volmit/iris/engine/mantle/components/MantleCarvingComponent.java b/src/main/java/com/volmit/iris/engine/mantle/components/MantleCarvingComponent.java index 00d11c697..f48e84914 100644 --- a/src/main/java/com/volmit/iris/engine/mantle/components/MantleCarvingComponent.java +++ b/src/main/java/com/volmit/iris/engine/mantle/components/MantleCarvingComponent.java @@ -22,9 +22,9 @@ import com.volmit.iris.engine.data.cache.Cache; import com.volmit.iris.engine.mantle.EngineMantle; import com.volmit.iris.engine.mantle.IrisMantleComponent; import com.volmit.iris.engine.mantle.MantleWriter; -import com.volmit.iris.engine.object.biome.IrisBiome; -import com.volmit.iris.engine.object.carving.IrisCarving; -import com.volmit.iris.engine.object.regional.IrisRegion; +import com.volmit.iris.engine.object.IrisBiome; +import com.volmit.iris.engine.object.IrisCarving; +import com.volmit.iris.engine.object.IrisRegion; import com.volmit.iris.util.documentation.ChunkCoordinates; import com.volmit.iris.util.mantle.MantleFlag; import com.volmit.iris.util.math.RNG; diff --git a/src/main/java/com/volmit/iris/engine/mantle/components/MantleFeatureComponent.java b/src/main/java/com/volmit/iris/engine/mantle/components/MantleFeatureComponent.java index 2902e600e..0ec022f39 100644 --- a/src/main/java/com/volmit/iris/engine/mantle/components/MantleFeatureComponent.java +++ b/src/main/java/com/volmit/iris/engine/mantle/components/MantleFeatureComponent.java @@ -22,10 +22,10 @@ import com.volmit.iris.engine.data.cache.Cache; import com.volmit.iris.engine.mantle.EngineMantle; import com.volmit.iris.engine.mantle.IrisMantleComponent; import com.volmit.iris.engine.mantle.MantleWriter; -import com.volmit.iris.engine.object.biome.IrisBiome; -import com.volmit.iris.engine.object.feature.IrisFeaturePositional; -import com.volmit.iris.engine.object.feature.IrisFeaturePotential; -import com.volmit.iris.engine.object.regional.IrisRegion; +import com.volmit.iris.engine.object.IrisBiome; +import com.volmit.iris.engine.object.IrisFeaturePositional; +import com.volmit.iris.engine.object.IrisFeaturePotential; +import com.volmit.iris.engine.object.IrisRegion; import com.volmit.iris.util.collection.KList; import com.volmit.iris.util.documentation.ChunkCoordinates; import com.volmit.iris.util.mantle.MantleFlag; diff --git a/src/main/java/com/volmit/iris/engine/mantle/components/MantleJigsawComponent.java b/src/main/java/com/volmit/iris/engine/mantle/components/MantleJigsawComponent.java index 7ffe30a96..67e51a29e 100644 --- a/src/main/java/com/volmit/iris/engine/mantle/components/MantleJigsawComponent.java +++ b/src/main/java/com/volmit/iris/engine/mantle/components/MantleJigsawComponent.java @@ -22,13 +22,13 @@ import com.volmit.iris.engine.jigsaw.PlannedStructure; import com.volmit.iris.engine.mantle.EngineMantle; import com.volmit.iris.engine.mantle.IrisMantleComponent; import com.volmit.iris.engine.mantle.MantleWriter; -import com.volmit.iris.engine.object.basic.IrisPosition; -import com.volmit.iris.engine.object.biome.IrisBiome; -import com.volmit.iris.engine.object.feature.IrisFeaturePositional; -import com.volmit.iris.engine.object.jigsaw.IrisJigsawStructure; -import com.volmit.iris.engine.object.jigsaw.IrisJigsawStructurePlacement; -import com.volmit.iris.engine.object.noise.NoiseStyle; -import com.volmit.iris.engine.object.regional.IrisRegion; +import com.volmit.iris.engine.object.IrisPosition; +import com.volmit.iris.engine.object.IrisBiome; +import com.volmit.iris.engine.object.IrisFeaturePositional; +import com.volmit.iris.engine.object.IrisJigsawStructure; +import com.volmit.iris.engine.object.IrisJigsawStructurePlacement; +import com.volmit.iris.engine.object.NoiseStyle; +import com.volmit.iris.engine.object.IrisRegion; import com.volmit.iris.util.documentation.BlockCoordinates; import com.volmit.iris.util.documentation.ChunkCoordinates; import com.volmit.iris.util.mantle.MantleFlag; diff --git a/src/main/java/com/volmit/iris/engine/mantle/components/MantleObjectComponent.java b/src/main/java/com/volmit/iris/engine/mantle/components/MantleObjectComponent.java index ae153f2b2..10b2c22e0 100644 --- a/src/main/java/com/volmit/iris/engine/mantle/components/MantleObjectComponent.java +++ b/src/main/java/com/volmit/iris/engine/mantle/components/MantleObjectComponent.java @@ -23,13 +23,13 @@ import com.volmit.iris.engine.data.cache.Cache; import com.volmit.iris.engine.mantle.EngineMantle; import com.volmit.iris.engine.mantle.IrisMantleComponent; import com.volmit.iris.engine.mantle.MantleWriter; -import com.volmit.iris.engine.object.biome.IrisBiome; -import com.volmit.iris.engine.object.feature.IrisFeature; -import com.volmit.iris.engine.object.feature.IrisFeaturePositional; -import com.volmit.iris.engine.object.feature.IrisFeaturePotential; -import com.volmit.iris.engine.object.objects.IrisObject; -import com.volmit.iris.engine.object.objects.IrisObjectPlacement; -import com.volmit.iris.engine.object.regional.IrisRegion; +import com.volmit.iris.engine.object.IrisBiome; +import com.volmit.iris.engine.object.IrisFeature; +import com.volmit.iris.engine.object.IrisFeaturePositional; +import com.volmit.iris.engine.object.IrisFeaturePotential; +import com.volmit.iris.engine.object.IrisObject; +import com.volmit.iris.engine.object.IrisObjectPlacement; +import com.volmit.iris.engine.object.IrisRegion; import com.volmit.iris.util.documentation.BlockCoordinates; import com.volmit.iris.util.documentation.ChunkCoordinates; import com.volmit.iris.util.mantle.MantleFlag; diff --git a/src/main/java/com/volmit/iris/engine/modifier/IrisCarveModifier.java b/src/main/java/com/volmit/iris/engine/modifier/IrisCarveModifier.java index 95fc1c88c..78c3c1324 100644 --- a/src/main/java/com/volmit/iris/engine/modifier/IrisCarveModifier.java +++ b/src/main/java/com/volmit/iris/engine/modifier/IrisCarveModifier.java @@ -23,11 +23,11 @@ import com.volmit.iris.engine.actuator.IrisDecorantActuator; import com.volmit.iris.engine.data.cache.Cache; import com.volmit.iris.engine.framework.Engine; import com.volmit.iris.engine.framework.EngineAssignedModifier; -import com.volmit.iris.engine.object.basic.IrisPosition; -import com.volmit.iris.engine.object.biome.InferredType; -import com.volmit.iris.engine.object.biome.IrisBiome; -import com.volmit.iris.engine.object.decoration.IrisDecorationPart; -import com.volmit.iris.engine.object.decoration.IrisDecorator; +import com.volmit.iris.engine.object.IrisPosition; +import com.volmit.iris.engine.object.InferredType; +import com.volmit.iris.engine.object.IrisBiome; +import com.volmit.iris.engine.object.IrisDecorationPart; +import com.volmit.iris.engine.object.IrisDecorator; import com.volmit.iris.util.collection.KList; import com.volmit.iris.util.collection.KMap; import com.volmit.iris.util.data.B; @@ -37,14 +37,12 @@ import com.volmit.iris.util.mantle.Mantle; import com.volmit.iris.util.mantle.MantleChunk; import com.volmit.iris.util.math.RNG; import com.volmit.iris.util.matter.MatterCavern; -import com.volmit.iris.util.matter.slices.CavernMatter; import com.volmit.iris.util.scheduling.PrecisionStopwatch; import lombok.Data; import org.bukkit.Material; import org.bukkit.block.data.BlockData; import java.util.Objects; -import java.util.concurrent.atomic.AtomicBoolean; import java.util.function.Supplier; public class IrisCarveModifier extends EngineAssignedModifier { diff --git a/src/main/java/com/volmit/iris/engine/modifier/IrisDepositModifier.java b/src/main/java/com/volmit/iris/engine/modifier/IrisDepositModifier.java index 634a86c02..c8a90e62c 100644 --- a/src/main/java/com/volmit/iris/engine/modifier/IrisDepositModifier.java +++ b/src/main/java/com/volmit/iris/engine/modifier/IrisDepositModifier.java @@ -20,10 +20,10 @@ package com.volmit.iris.engine.modifier; import com.volmit.iris.engine.framework.Engine; import com.volmit.iris.engine.framework.EngineAssignedModifier; -import com.volmit.iris.engine.object.biome.IrisBiome; -import com.volmit.iris.engine.object.deposits.IrisDepositGenerator; -import com.volmit.iris.engine.object.objects.IrisObject; -import com.volmit.iris.engine.object.regional.IrisRegion; +import com.volmit.iris.engine.object.IrisBiome; +import com.volmit.iris.engine.object.IrisDepositGenerator; +import com.volmit.iris.engine.object.IrisObject; +import com.volmit.iris.engine.object.IrisRegion; import com.volmit.iris.util.data.HeightMap; import com.volmit.iris.util.hunk.Hunk; import com.volmit.iris.util.math.RNG; diff --git a/src/main/java/com/volmit/iris/engine/modifier/IrisPostModifier.java b/src/main/java/com/volmit/iris/engine/modifier/IrisPostModifier.java index 2da0288db..04f55e54f 100644 --- a/src/main/java/com/volmit/iris/engine/modifier/IrisPostModifier.java +++ b/src/main/java/com/volmit/iris/engine/modifier/IrisPostModifier.java @@ -20,7 +20,7 @@ package com.volmit.iris.engine.modifier; import com.volmit.iris.engine.framework.Engine; import com.volmit.iris.engine.framework.EngineAssignedModifier; -import com.volmit.iris.engine.object.biome.IrisBiome; +import com.volmit.iris.engine.object.IrisBiome; import com.volmit.iris.util.data.B; import com.volmit.iris.util.hunk.Hunk; import com.volmit.iris.util.math.RNG; diff --git a/src/main/java/com/volmit/iris/engine/object/common/CarveResult.java b/src/main/java/com/volmit/iris/engine/object/CarveResult.java similarity index 96% rename from src/main/java/com/volmit/iris/engine/object/common/CarveResult.java rename to src/main/java/com/volmit/iris/engine/object/CarveResult.java index 742a75483..d8ef62960 100644 --- a/src/main/java/com/volmit/iris/engine/object/common/CarveResult.java +++ b/src/main/java/com/volmit/iris/engine/object/CarveResult.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.engine.object.common; +package com.volmit.iris.engine.object; import lombok.Value; diff --git a/src/main/java/com/volmit/iris/engine/object/noise/CarvingMode.java b/src/main/java/com/volmit/iris/engine/object/CarvingMode.java similarity index 97% rename from src/main/java/com/volmit/iris/engine/object/noise/CarvingMode.java rename to src/main/java/com/volmit/iris/engine/object/CarvingMode.java index dbfacb23e..22cb3248c 100644 --- a/src/main/java/com/volmit/iris/engine/object/noise/CarvingMode.java +++ b/src/main/java/com/volmit/iris/engine/object/CarvingMode.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.engine.object.noise; +package com.volmit.iris.engine.object; import com.volmit.iris.engine.object.annotations.Desc; diff --git a/src/main/java/com/volmit/iris/engine/object/common/CaveResult.java b/src/main/java/com/volmit/iris/engine/object/CaveResult.java similarity index 95% rename from src/main/java/com/volmit/iris/engine/object/common/CaveResult.java rename to src/main/java/com/volmit/iris/engine/object/CaveResult.java index 3b0796d4c..c8536de02 100644 --- a/src/main/java/com/volmit/iris/engine/object/common/CaveResult.java +++ b/src/main/java/com/volmit/iris/engine/object/CaveResult.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.engine.object.common; +package com.volmit.iris.engine.object; import lombok.Data; diff --git a/src/main/java/com/volmit/iris/engine/object/common/HeadlessWorld.java b/src/main/java/com/volmit/iris/engine/object/HeadlessWorld.java similarity index 97% rename from src/main/java/com/volmit/iris/engine/object/common/HeadlessWorld.java rename to src/main/java/com/volmit/iris/engine/object/HeadlessWorld.java index 2dc270534..421a23c91 100644 --- a/src/main/java/com/volmit/iris/engine/object/common/HeadlessWorld.java +++ b/src/main/java/com/volmit/iris/engine/object/HeadlessWorld.java @@ -16,14 +16,13 @@ * along with this program. If not, see . */ -package com.volmit.iris.engine.object.common; +package com.volmit.iris.engine.object; import com.volmit.iris.Iris; import com.volmit.iris.core.loader.IrisData; import com.volmit.iris.core.service.StudioSVC; import com.volmit.iris.core.tools.IrisToolbelt; import com.volmit.iris.engine.framework.Engine; -import com.volmit.iris.engine.object.dimensional.IrisDimension; import com.volmit.iris.engine.platform.BukkitChunkGenerator; import com.volmit.iris.engine.platform.HeadlessGenerator; import com.volmit.iris.util.plugin.VolmitSender; diff --git a/src/main/java/com/volmit/iris/engine/object/common/IObjectPlacer.java b/src/main/java/com/volmit/iris/engine/object/IObjectPlacer.java similarity index 93% rename from src/main/java/com/volmit/iris/engine/object/common/IObjectPlacer.java rename to src/main/java/com/volmit/iris/engine/object/IObjectPlacer.java index 877281f7e..8a8fcf3a6 100644 --- a/src/main/java/com/volmit/iris/engine/object/common/IObjectPlacer.java +++ b/src/main/java/com/volmit/iris/engine/object/IObjectPlacer.java @@ -16,10 +16,9 @@ * along with this program. If not, see . */ -package com.volmit.iris.engine.object.common; +package com.volmit.iris.engine.object; import com.volmit.iris.core.loader.IrisData; -import com.volmit.iris.engine.object.tile.TileData; import org.bukkit.block.TileState; import org.bukkit.block.data.BlockData; diff --git a/src/main/java/com/volmit/iris/engine/object/common/IPostBlockAccess.java b/src/main/java/com/volmit/iris/engine/object/IPostBlockAccess.java similarity index 96% rename from src/main/java/com/volmit/iris/engine/object/common/IPostBlockAccess.java rename to src/main/java/com/volmit/iris/engine/object/IPostBlockAccess.java index a54a72168..ac2a6f5a3 100644 --- a/src/main/java/com/volmit/iris/engine/object/common/IPostBlockAccess.java +++ b/src/main/java/com/volmit/iris/engine/object/IPostBlockAccess.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.engine.object.common; +package com.volmit.iris.engine.object; import com.volmit.iris.util.collection.KList; import org.bukkit.block.data.BlockData; diff --git a/src/main/java/com/volmit/iris/engine/object/common/IRare.java b/src/main/java/com/volmit/iris/engine/object/IRare.java similarity index 95% rename from src/main/java/com/volmit/iris/engine/object/common/IRare.java rename to src/main/java/com/volmit/iris/engine/object/IRare.java index 6d84daf49..3e2f59f7b 100644 --- a/src/main/java/com/volmit/iris/engine/object/common/IRare.java +++ b/src/main/java/com/volmit/iris/engine/object/IRare.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.engine.object.common; +package com.volmit.iris.engine.object; public interface IRare { int getRarity(); diff --git a/src/main/java/com/volmit/iris/engine/object/biome/InferredType.java b/src/main/java/com/volmit/iris/engine/object/InferredType.java similarity index 96% rename from src/main/java/com/volmit/iris/engine/object/biome/InferredType.java rename to src/main/java/com/volmit/iris/engine/object/InferredType.java index 121ca032e..fc1fdbab9 100644 --- a/src/main/java/com/volmit/iris/engine/object/biome/InferredType.java +++ b/src/main/java/com/volmit/iris/engine/object/InferredType.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.engine.object.biome; +package com.volmit.iris.engine.object; import com.volmit.iris.engine.object.annotations.Desc; diff --git a/src/main/java/com/volmit/iris/engine/object/meta/InventorySlotType.java b/src/main/java/com/volmit/iris/engine/object/InventorySlotType.java similarity index 96% rename from src/main/java/com/volmit/iris/engine/object/meta/InventorySlotType.java rename to src/main/java/com/volmit/iris/engine/object/InventorySlotType.java index e5ab587bb..40a7f6bf9 100644 --- a/src/main/java/com/volmit/iris/engine/object/meta/InventorySlotType.java +++ b/src/main/java/com/volmit/iris/engine/object/InventorySlotType.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.engine.object.meta; +package com.volmit.iris.engine.object; import com.volmit.iris.engine.object.annotations.Desc; diff --git a/src/main/java/com/volmit/iris/engine/object/meta/IrisAttributeModifier.java b/src/main/java/com/volmit/iris/engine/object/IrisAttributeModifier.java similarity index 98% rename from src/main/java/com/volmit/iris/engine/object/meta/IrisAttributeModifier.java rename to src/main/java/com/volmit/iris/engine/object/IrisAttributeModifier.java index 55ae0f25b..6cca1edea 100644 --- a/src/main/java/com/volmit/iris/engine/object/meta/IrisAttributeModifier.java +++ b/src/main/java/com/volmit/iris/engine/object/IrisAttributeModifier.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.engine.object.meta; +package com.volmit.iris.engine.object; import com.volmit.iris.engine.object.annotations.Desc; import com.volmit.iris.engine.object.annotations.MaxNumber; diff --git a/src/main/java/com/volmit/iris/engine/object/objects/IrisAxisRotationClamp.java b/src/main/java/com/volmit/iris/engine/object/IrisAxisRotationClamp.java similarity index 98% rename from src/main/java/com/volmit/iris/engine/object/objects/IrisAxisRotationClamp.java rename to src/main/java/com/volmit/iris/engine/object/IrisAxisRotationClamp.java index 80ed6d02c..60f3b4e67 100644 --- a/src/main/java/com/volmit/iris/engine/object/objects/IrisAxisRotationClamp.java +++ b/src/main/java/com/volmit/iris/engine/object/IrisAxisRotationClamp.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.engine.object.objects; +package com.volmit.iris.engine.object; import com.volmit.iris.engine.object.annotations.*; import com.volmit.iris.util.math.M; diff --git a/src/main/java/com/volmit/iris/engine/object/biome/IrisBiome.java b/src/main/java/com/volmit/iris/engine/object/IrisBiome.java similarity index 96% rename from src/main/java/com/volmit/iris/engine/object/biome/IrisBiome.java rename to src/main/java/com/volmit/iris/engine/object/IrisBiome.java index 8106cb1e3..a64167d35 100644 --- a/src/main/java/com/volmit/iris/engine/object/biome/IrisBiome.java +++ b/src/main/java/com/volmit/iris/engine/object/IrisBiome.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.engine.object.biome; +package com.volmit.iris.engine.object; import com.volmit.iris.Iris; import com.volmit.iris.core.gui.components.RenderType; @@ -26,22 +26,6 @@ import com.volmit.iris.engine.IrisComplex; import com.volmit.iris.engine.data.cache.AtomicCache; import com.volmit.iris.engine.framework.Engine; import com.volmit.iris.engine.object.annotations.*; -import com.volmit.iris.engine.object.block.IrisBlockDrops; -import com.volmit.iris.engine.object.carving.IrisCarving; -import com.volmit.iris.engine.object.common.IRare; -import com.volmit.iris.engine.object.decoration.IrisDecorator; -import com.volmit.iris.engine.object.deposits.IrisDepositGenerator; -import com.volmit.iris.engine.object.dimensional.IrisDimension; -import com.volmit.iris.engine.object.feature.IrisFeaturePotential; -import com.volmit.iris.engine.object.jigsaw.IrisJigsawStructurePlacement; -import com.volmit.iris.engine.object.loot.IrisLootReference; -import com.volmit.iris.engine.object.meta.IrisEffect; -import com.volmit.iris.engine.object.noise.IrisGeneratorStyle; -import com.volmit.iris.engine.object.noise.IrisSlopeClip; -import com.volmit.iris.engine.object.noise.NoiseStyle; -import com.volmit.iris.engine.object.objects.IrisObject; -import com.volmit.iris.engine.object.objects.IrisObjectPlacement; -import com.volmit.iris.engine.object.spawners.IrisSpawner; import com.volmit.iris.util.collection.KList; import com.volmit.iris.util.collection.KMap; import com.volmit.iris.util.collection.KSet; diff --git a/src/main/java/com/volmit/iris/engine/object/biome/IrisBiomeCustom.java b/src/main/java/com/volmit/iris/engine/object/IrisBiomeCustom.java similarity index 99% rename from src/main/java/com/volmit/iris/engine/object/biome/IrisBiomeCustom.java rename to src/main/java/com/volmit/iris/engine/object/IrisBiomeCustom.java index 3d800d89e..fb2ecacd6 100644 --- a/src/main/java/com/volmit/iris/engine/object/biome/IrisBiomeCustom.java +++ b/src/main/java/com/volmit/iris/engine/object/IrisBiomeCustom.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.engine.object.biome; +package com.volmit.iris.engine.object; import com.volmit.iris.Iris; import com.volmit.iris.engine.object.annotations.*; diff --git a/src/main/java/com/volmit/iris/engine/object/biome/IrisBiomeCustomCategory.java b/src/main/java/com/volmit/iris/engine/object/IrisBiomeCustomCategory.java similarity index 96% rename from src/main/java/com/volmit/iris/engine/object/biome/IrisBiomeCustomCategory.java rename to src/main/java/com/volmit/iris/engine/object/IrisBiomeCustomCategory.java index c2a820b84..63a2582ec 100644 --- a/src/main/java/com/volmit/iris/engine/object/biome/IrisBiomeCustomCategory.java +++ b/src/main/java/com/volmit/iris/engine/object/IrisBiomeCustomCategory.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.engine.object.biome; +package com.volmit.iris.engine.object; import com.volmit.iris.engine.object.annotations.Desc; diff --git a/src/main/java/com/volmit/iris/engine/object/biome/IrisBiomeCustomParticle.java b/src/main/java/com/volmit/iris/engine/object/IrisBiomeCustomParticle.java similarity index 97% rename from src/main/java/com/volmit/iris/engine/object/biome/IrisBiomeCustomParticle.java rename to src/main/java/com/volmit/iris/engine/object/IrisBiomeCustomParticle.java index 0d727ef45..ead12db8b 100644 --- a/src/main/java/com/volmit/iris/engine/object/biome/IrisBiomeCustomParticle.java +++ b/src/main/java/com/volmit/iris/engine/object/IrisBiomeCustomParticle.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.engine.object.biome; +package com.volmit.iris.engine.object; import com.volmit.iris.engine.object.annotations.Desc; import com.volmit.iris.engine.object.annotations.MaxNumber; diff --git a/src/main/java/com/volmit/iris/engine/object/biome/IrisBiomeCustomPrecipType.java b/src/main/java/com/volmit/iris/engine/object/IrisBiomeCustomPrecipType.java similarity index 95% rename from src/main/java/com/volmit/iris/engine/object/biome/IrisBiomeCustomPrecipType.java rename to src/main/java/com/volmit/iris/engine/object/IrisBiomeCustomPrecipType.java index cb1659d4c..43bc8e835 100644 --- a/src/main/java/com/volmit/iris/engine/object/biome/IrisBiomeCustomPrecipType.java +++ b/src/main/java/com/volmit/iris/engine/object/IrisBiomeCustomPrecipType.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.engine.object.biome; +package com.volmit.iris.engine.object; import com.volmit.iris.engine.object.annotations.Desc; diff --git a/src/main/java/com/volmit/iris/engine/object/biome/IrisBiomeCustomSpawn.java b/src/main/java/com/volmit/iris/engine/object/IrisBiomeCustomSpawn.java similarity index 97% rename from src/main/java/com/volmit/iris/engine/object/biome/IrisBiomeCustomSpawn.java rename to src/main/java/com/volmit/iris/engine/object/IrisBiomeCustomSpawn.java index f36df088f..f98c73f05 100644 --- a/src/main/java/com/volmit/iris/engine/object/biome/IrisBiomeCustomSpawn.java +++ b/src/main/java/com/volmit/iris/engine/object/IrisBiomeCustomSpawn.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.engine.object.biome; +package com.volmit.iris.engine.object; import com.volmit.iris.engine.object.annotations.Desc; import com.volmit.iris.engine.object.annotations.MaxNumber; diff --git a/src/main/java/com/volmit/iris/engine/object/biome/IrisBiomeCustomSpawnType.java b/src/main/java/com/volmit/iris/engine/object/IrisBiomeCustomSpawnType.java similarity index 96% rename from src/main/java/com/volmit/iris/engine/object/biome/IrisBiomeCustomSpawnType.java rename to src/main/java/com/volmit/iris/engine/object/IrisBiomeCustomSpawnType.java index d670884d3..21df61cd4 100644 --- a/src/main/java/com/volmit/iris/engine/object/biome/IrisBiomeCustomSpawnType.java +++ b/src/main/java/com/volmit/iris/engine/object/IrisBiomeCustomSpawnType.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.engine.object.biome; +package com.volmit.iris.engine.object; import com.volmit.iris.engine.object.annotations.Desc; diff --git a/src/main/java/com/volmit/iris/engine/object/biome/IrisBiomeGeneratorLink.java b/src/main/java/com/volmit/iris/engine/object/IrisBiomeGeneratorLink.java similarity index 96% rename from src/main/java/com/volmit/iris/engine/object/biome/IrisBiomeGeneratorLink.java rename to src/main/java/com/volmit/iris/engine/object/IrisBiomeGeneratorLink.java index 0eae19230..1ce3c432f 100644 --- a/src/main/java/com/volmit/iris/engine/object/biome/IrisBiomeGeneratorLink.java +++ b/src/main/java/com/volmit/iris/engine/object/IrisBiomeGeneratorLink.java @@ -16,11 +16,10 @@ * along with this program. If not, see . */ -package com.volmit.iris.engine.object.biome; +package com.volmit.iris.engine.object; import com.volmit.iris.engine.data.cache.AtomicCache; import com.volmit.iris.engine.object.annotations.*; -import com.volmit.iris.engine.object.noise.IrisGenerator; import com.volmit.iris.util.data.DataProvider; import com.volmit.iris.util.interpolation.IrisInterpolation; import lombok.AllArgsConstructor; diff --git a/src/main/java/com/volmit/iris/engine/object/biome/IrisBiomePaletteLayer.java b/src/main/java/com/volmit/iris/engine/object/IrisBiomePaletteLayer.java similarity index 93% rename from src/main/java/com/volmit/iris/engine/object/biome/IrisBiomePaletteLayer.java rename to src/main/java/com/volmit/iris/engine/object/IrisBiomePaletteLayer.java index 44fcf4bb6..c607f9f2d 100644 --- a/src/main/java/com/volmit/iris/engine/object/biome/IrisBiomePaletteLayer.java +++ b/src/main/java/com/volmit/iris/engine/object/IrisBiomePaletteLayer.java @@ -16,15 +16,11 @@ * along with this program. If not, see . */ -package com.volmit.iris.engine.object.biome; +package com.volmit.iris.engine.object; import com.volmit.iris.core.loader.IrisData; import com.volmit.iris.engine.data.cache.AtomicCache; import com.volmit.iris.engine.object.annotations.*; -import com.volmit.iris.engine.object.block.IrisBlockData; -import com.volmit.iris.engine.object.noise.IrisGeneratorStyle; -import com.volmit.iris.engine.object.noise.IrisSlopeClip; -import com.volmit.iris.engine.object.noise.NoiseStyle; import com.volmit.iris.util.collection.KList; import com.volmit.iris.util.math.RNG; import com.volmit.iris.util.noise.CNG; diff --git a/src/main/java/com/volmit/iris/engine/object/block/IrisBlockData.java b/src/main/java/com/volmit/iris/engine/object/IrisBlockData.java similarity index 99% rename from src/main/java/com/volmit/iris/engine/object/block/IrisBlockData.java rename to src/main/java/com/volmit/iris/engine/object/IrisBlockData.java index 9c1bb5477..290a302e5 100644 --- a/src/main/java/com/volmit/iris/engine/object/block/IrisBlockData.java +++ b/src/main/java/com/volmit/iris/engine/object/IrisBlockData.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.engine.object.block; +package com.volmit.iris.engine.object; import com.volmit.iris.Iris; import com.volmit.iris.core.loader.IrisData; diff --git a/src/main/java/com/volmit/iris/engine/object/block/IrisBlockDrops.java b/src/main/java/com/volmit/iris/engine/object/IrisBlockDrops.java similarity index 97% rename from src/main/java/com/volmit/iris/engine/object/block/IrisBlockDrops.java rename to src/main/java/com/volmit/iris/engine/object/IrisBlockDrops.java index 8ad5b7e95..bbbc4a8b5 100644 --- a/src/main/java/com/volmit/iris/engine/object/block/IrisBlockDrops.java +++ b/src/main/java/com/volmit/iris/engine/object/IrisBlockDrops.java @@ -16,14 +16,13 @@ * along with this program. If not, see . */ -package com.volmit.iris.engine.object.block; +package com.volmit.iris.engine.object; import com.volmit.iris.core.loader.IrisData; import com.volmit.iris.engine.data.cache.AtomicCache; import com.volmit.iris.engine.object.annotations.ArrayType; import com.volmit.iris.engine.object.annotations.Desc; import com.volmit.iris.engine.object.annotations.Required; -import com.volmit.iris.engine.object.loot.IrisLoot; import com.volmit.iris.util.collection.KList; import com.volmit.iris.util.math.RNG; import lombok.AllArgsConstructor; diff --git a/src/main/java/com/volmit/iris/engine/object/carving/IrisCarving.java b/src/main/java/com/volmit/iris/engine/object/IrisCarving.java similarity index 98% rename from src/main/java/com/volmit/iris/engine/object/carving/IrisCarving.java rename to src/main/java/com/volmit/iris/engine/object/IrisCarving.java index d6fb29400..fad83906d 100644 --- a/src/main/java/com/volmit/iris/engine/object/carving/IrisCarving.java +++ b/src/main/java/com/volmit/iris/engine/object/IrisCarving.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.engine.object.carving; +package com.volmit.iris.engine.object; import com.volmit.iris.core.loader.IrisData; import com.volmit.iris.engine.framework.Engine; diff --git a/src/main/java/com/volmit/iris/engine/object/carving/IrisCave.java b/src/main/java/com/volmit/iris/engine/object/IrisCave.java similarity index 86% rename from src/main/java/com/volmit/iris/engine/object/carving/IrisCave.java rename to src/main/java/com/volmit/iris/engine/object/IrisCave.java index 6330a7277..a8f1b8ae4 100644 --- a/src/main/java/com/volmit/iris/engine/object/carving/IrisCave.java +++ b/src/main/java/com/volmit/iris/engine/object/IrisCave.java @@ -16,37 +16,24 @@ * along with this program. If not, see . */ -package com.volmit.iris.engine.object.carving; +package com.volmit.iris.engine.object; -import com.volmit.iris.Iris; import com.volmit.iris.core.loader.IrisData; import com.volmit.iris.core.loader.IrisRegistrant; -import com.volmit.iris.engine.data.cache.AtomicCache; import com.volmit.iris.engine.framework.Engine; import com.volmit.iris.engine.mantle.MantleWriter; import com.volmit.iris.engine.object.annotations.Desc; import com.volmit.iris.engine.object.annotations.RegistryListResource; -import com.volmit.iris.engine.object.basic.IrisPosition; -import com.volmit.iris.engine.object.basic.IrisRange; -import com.volmit.iris.engine.object.biome.IrisBiome; -import com.volmit.iris.engine.object.block.IrisBlockData; -import com.volmit.iris.engine.object.noise.IrisWorm; -import com.volmit.iris.engine.object.objects.IrisObjectLimit; import com.volmit.iris.util.collection.KList; -import com.volmit.iris.util.data.B; import com.volmit.iris.util.json.JSONObject; import com.volmit.iris.util.math.RNG; import com.volmit.iris.util.matter.MatterCavern; -import com.volmit.iris.util.matter.slices.CavernMatter; import com.volmit.iris.util.plugin.VolmitSender; import lombok.AllArgsConstructor; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; import lombok.experimental.Accessors; -import org.bukkit.block.data.BlockData; - -import java.util.List; @EqualsAndHashCode(callSuper = true) @Accessors(chain = true) diff --git a/src/main/java/com/volmit/iris/engine/object/carving/IrisCavePlacer.java b/src/main/java/com/volmit/iris/engine/object/IrisCavePlacer.java similarity index 93% rename from src/main/java/com/volmit/iris/engine/object/carving/IrisCavePlacer.java rename to src/main/java/com/volmit/iris/engine/object/IrisCavePlacer.java index a7ff0c3fa..15c0e706e 100644 --- a/src/main/java/com/volmit/iris/engine/object/carving/IrisCavePlacer.java +++ b/src/main/java/com/volmit/iris/engine/object/IrisCavePlacer.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.engine.object.carving; +package com.volmit.iris.engine.object; import com.volmit.iris.Iris; import com.volmit.iris.core.loader.IrisData; @@ -27,10 +27,6 @@ import com.volmit.iris.engine.object.annotations.Desc; import com.volmit.iris.engine.object.annotations.MinNumber; import com.volmit.iris.engine.object.annotations.RegistryListResource; import com.volmit.iris.engine.object.annotations.Required; -import com.volmit.iris.engine.object.common.IRare; -import com.volmit.iris.engine.object.noise.IrisGeneratorStyle; -import com.volmit.iris.engine.object.noise.IrisStyledRange; -import com.volmit.iris.engine.object.noise.NoiseStyle; import com.volmit.iris.util.math.RNG; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/src/main/java/com/volmit/iris/engine/object/basic/IrisColor.java b/src/main/java/com/volmit/iris/engine/object/IrisColor.java similarity index 98% rename from src/main/java/com/volmit/iris/engine/object/basic/IrisColor.java rename to src/main/java/com/volmit/iris/engine/object/IrisColor.java index d998b1a50..36bb12e98 100644 --- a/src/main/java/com/volmit/iris/engine/object/basic/IrisColor.java +++ b/src/main/java/com/volmit/iris/engine/object/IrisColor.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.engine.object.basic; +package com.volmit.iris.engine.object; import com.volmit.iris.Iris; import com.volmit.iris.engine.data.cache.AtomicCache; diff --git a/src/main/java/com/volmit/iris/engine/object/compat/IrisCompat.java b/src/main/java/com/volmit/iris/engine/object/IrisCompat.java similarity index 99% rename from src/main/java/com/volmit/iris/engine/object/compat/IrisCompat.java rename to src/main/java/com/volmit/iris/engine/object/IrisCompat.java index 52c102388..a8197ca1d 100644 --- a/src/main/java/com/volmit/iris/engine/object/compat/IrisCompat.java +++ b/src/main/java/com/volmit/iris/engine/object/IrisCompat.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.engine.object.compat; +package com.volmit.iris.engine.object; import com.google.gson.Gson; import com.volmit.iris.Iris; diff --git a/src/main/java/com/volmit/iris/engine/object/compat/IrisCompatabilityBlockFilter.java b/src/main/java/com/volmit/iris/engine/object/IrisCompatabilityBlockFilter.java similarity index 98% rename from src/main/java/com/volmit/iris/engine/object/compat/IrisCompatabilityBlockFilter.java rename to src/main/java/com/volmit/iris/engine/object/IrisCompatabilityBlockFilter.java index c4249d5eb..06926ee85 100644 --- a/src/main/java/com/volmit/iris/engine/object/compat/IrisCompatabilityBlockFilter.java +++ b/src/main/java/com/volmit/iris/engine/object/IrisCompatabilityBlockFilter.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.engine.object.compat; +package com.volmit.iris.engine.object; import com.volmit.iris.Iris; import com.volmit.iris.engine.data.cache.AtomicCache; diff --git a/src/main/java/com/volmit/iris/engine/object/compat/IrisCompatabilityItemFilter.java b/src/main/java/com/volmit/iris/engine/object/IrisCompatabilityItemFilter.java similarity index 98% rename from src/main/java/com/volmit/iris/engine/object/compat/IrisCompatabilityItemFilter.java rename to src/main/java/com/volmit/iris/engine/object/IrisCompatabilityItemFilter.java index 50de87a6a..4fbd7d789 100644 --- a/src/main/java/com/volmit/iris/engine/object/compat/IrisCompatabilityItemFilter.java +++ b/src/main/java/com/volmit/iris/engine/object/IrisCompatabilityItemFilter.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.engine.object.compat; +package com.volmit.iris.engine.object; import com.volmit.iris.Iris; import com.volmit.iris.engine.data.cache.AtomicCache; diff --git a/src/main/java/com/volmit/iris/engine/object/decoration/IrisDecorationPart.java b/src/main/java/com/volmit/iris/engine/object/IrisDecorationPart.java similarity index 96% rename from src/main/java/com/volmit/iris/engine/object/decoration/IrisDecorationPart.java rename to src/main/java/com/volmit/iris/engine/object/IrisDecorationPart.java index a9547688c..25fba9f01 100644 --- a/src/main/java/com/volmit/iris/engine/object/decoration/IrisDecorationPart.java +++ b/src/main/java/com/volmit/iris/engine/object/IrisDecorationPart.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.engine.object.decoration; +package com.volmit.iris.engine.object; import com.volmit.iris.engine.object.annotations.Desc; diff --git a/src/main/java/com/volmit/iris/engine/object/decoration/IrisDecorator.java b/src/main/java/com/volmit/iris/engine/object/IrisDecorator.java similarity index 97% rename from src/main/java/com/volmit/iris/engine/object/decoration/IrisDecorator.java rename to src/main/java/com/volmit/iris/engine/object/IrisDecorator.java index 92420e544..73ff6e7b3 100644 --- a/src/main/java/com/volmit/iris/engine/object/decoration/IrisDecorator.java +++ b/src/main/java/com/volmit/iris/engine/object/IrisDecorator.java @@ -16,16 +16,12 @@ * along with this program. If not, see . */ -package com.volmit.iris.engine.object.decoration; +package com.volmit.iris.engine.object; import com.volmit.iris.Iris; import com.volmit.iris.core.loader.IrisData; import com.volmit.iris.engine.data.cache.AtomicCache; import com.volmit.iris.engine.object.annotations.*; -import com.volmit.iris.engine.object.biome.IrisBiome; -import com.volmit.iris.engine.object.block.IrisBlockData; -import com.volmit.iris.engine.object.noise.IrisGeneratorStyle; -import com.volmit.iris.engine.object.noise.NoiseStyle; import com.volmit.iris.util.collection.KList; import com.volmit.iris.util.math.RNG; import com.volmit.iris.util.noise.CNG; diff --git a/src/main/java/com/volmit/iris/engine/object/deposits/IrisDepositGenerator.java b/src/main/java/com/volmit/iris/engine/object/IrisDepositGenerator.java similarity index 96% rename from src/main/java/com/volmit/iris/engine/object/deposits/IrisDepositGenerator.java rename to src/main/java/com/volmit/iris/engine/object/IrisDepositGenerator.java index 90e56a125..098cb0878 100644 --- a/src/main/java/com/volmit/iris/engine/object/deposits/IrisDepositGenerator.java +++ b/src/main/java/com/volmit/iris/engine/object/IrisDepositGenerator.java @@ -16,13 +16,11 @@ * along with this program. If not, see . */ -package com.volmit.iris.engine.object.deposits; +package com.volmit.iris.engine.object; import com.volmit.iris.core.loader.IrisData; import com.volmit.iris.engine.data.cache.AtomicCache; import com.volmit.iris.engine.object.annotations.*; -import com.volmit.iris.engine.object.block.IrisBlockData; -import com.volmit.iris.engine.object.objects.IrisObject; import com.volmit.iris.util.collection.KList; import com.volmit.iris.util.math.RNG; import lombok.AllArgsConstructor; diff --git a/src/main/java/com/volmit/iris/engine/object/dimensional/IrisDimension.java b/src/main/java/com/volmit/iris/engine/object/IrisDimension.java similarity index 93% rename from src/main/java/com/volmit/iris/engine/object/dimensional/IrisDimension.java rename to src/main/java/com/volmit/iris/engine/object/IrisDimension.java index 545d705e8..e916609eb 100644 --- a/src/main/java/com/volmit/iris/engine/object/dimensional/IrisDimension.java +++ b/src/main/java/com/volmit/iris/engine/object/IrisDimension.java @@ -16,32 +16,13 @@ * along with this program. If not, see . */ -package com.volmit.iris.engine.object.dimensional; +package com.volmit.iris.engine.object; import com.volmit.iris.Iris; import com.volmit.iris.core.loader.IrisData; import com.volmit.iris.core.loader.IrisRegistrant; import com.volmit.iris.engine.data.cache.AtomicCache; import com.volmit.iris.engine.object.annotations.*; -import com.volmit.iris.engine.object.biome.InferredType; -import com.volmit.iris.engine.object.biome.IrisBiome; -import com.volmit.iris.engine.object.biome.IrisBiomeCustom; -import com.volmit.iris.engine.object.block.IrisBlockDrops; -import com.volmit.iris.engine.object.block.IrisMaterialPalette; -import com.volmit.iris.engine.object.carving.IrisCarving; -import com.volmit.iris.engine.object.deposits.IrisDepositGenerator; -import com.volmit.iris.engine.object.feature.IrisFeaturePositional; -import com.volmit.iris.engine.object.feature.IrisFeaturePotential; -import com.volmit.iris.engine.object.jigsaw.IrisJigsawStructure; -import com.volmit.iris.engine.object.jigsaw.IrisJigsawStructurePlacement; -import com.volmit.iris.engine.object.loot.IrisLootReference; -import com.volmit.iris.engine.object.noise.IrisGeneratorStyle; -import com.volmit.iris.engine.object.noise.IrisShapedGeneratorStyle; -import com.volmit.iris.engine.object.noise.NoiseStyle; -import com.volmit.iris.engine.object.regional.IrisRegion; -import com.volmit.iris.engine.object.spawners.IrisSpawner; -import com.volmit.iris.engine.object.trees.IrisTreeSettings; -import com.volmit.iris.engine.object.villager.IrisVillagerOverride; import com.volmit.iris.util.collection.KList; import com.volmit.iris.util.data.DataProvider; import com.volmit.iris.util.io.IO; diff --git a/src/main/java/com/volmit/iris/engine/object/objects/IrisDirection.java b/src/main/java/com/volmit/iris/engine/object/IrisDirection.java similarity index 99% rename from src/main/java/com/volmit/iris/engine/object/objects/IrisDirection.java rename to src/main/java/com/volmit/iris/engine/object/IrisDirection.java index 26573ab46..d8ec7e9b5 100644 --- a/src/main/java/com/volmit/iris/engine/object/objects/IrisDirection.java +++ b/src/main/java/com/volmit/iris/engine/object/IrisDirection.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.engine.object.objects; +package com.volmit.iris.engine.object; import com.volmit.iris.engine.object.annotations.Desc; import com.volmit.iris.util.collection.GBiset; diff --git a/src/main/java/com/volmit/iris/engine/object/basic/IrisDuration.java b/src/main/java/com/volmit/iris/engine/object/IrisDuration.java similarity index 98% rename from src/main/java/com/volmit/iris/engine/object/basic/IrisDuration.java rename to src/main/java/com/volmit/iris/engine/object/IrisDuration.java index 40f22708d..35812294a 100644 --- a/src/main/java/com/volmit/iris/engine/object/basic/IrisDuration.java +++ b/src/main/java/com/volmit/iris/engine/object/IrisDuration.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.engine.object.basic; +package com.volmit.iris.engine.object; import com.volmit.iris.engine.object.annotations.Desc; import com.volmit.iris.util.format.Form; diff --git a/src/main/java/com/volmit/iris/engine/object/meta/IrisEffect.java b/src/main/java/com/volmit/iris/engine/object/IrisEffect.java similarity index 99% rename from src/main/java/com/volmit/iris/engine/object/meta/IrisEffect.java rename to src/main/java/com/volmit/iris/engine/object/IrisEffect.java index e10177de6..e46420fe5 100644 --- a/src/main/java/com/volmit/iris/engine/object/meta/IrisEffect.java +++ b/src/main/java/com/volmit/iris/engine/object/IrisEffect.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.engine.object.meta; +package com.volmit.iris.engine.object; import com.volmit.iris.Iris; import com.volmit.iris.engine.data.cache.AtomicCache; diff --git a/src/main/java/com/volmit/iris/engine/object/carving/IrisElipsoid.java b/src/main/java/com/volmit/iris/engine/object/IrisElipsoid.java similarity index 89% rename from src/main/java/com/volmit/iris/engine/object/carving/IrisElipsoid.java rename to src/main/java/com/volmit/iris/engine/object/IrisElipsoid.java index ec3454259..bb480afbe 100644 --- a/src/main/java/com/volmit/iris/engine/object/carving/IrisElipsoid.java +++ b/src/main/java/com/volmit/iris/engine/object/IrisElipsoid.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.engine.object.carving; +package com.volmit.iris.engine.object; import com.volmit.iris.engine.data.cache.AtomicCache; import com.volmit.iris.engine.framework.Engine; @@ -25,11 +25,6 @@ import com.volmit.iris.engine.object.annotations.Desc; import com.volmit.iris.engine.object.annotations.MinNumber; import com.volmit.iris.engine.object.annotations.RegistryListResource; import com.volmit.iris.engine.object.annotations.Required; -import com.volmit.iris.engine.object.biome.IrisBiome; -import com.volmit.iris.engine.object.common.IRare; -import com.volmit.iris.engine.object.noise.IrisGeneratorStyle; -import com.volmit.iris.engine.object.noise.IrisStyledRange; -import com.volmit.iris.engine.object.noise.NoiseStyle; import com.volmit.iris.util.math.RNG; import com.volmit.iris.util.matter.MatterCavern; import com.volmit.iris.util.matter.slices.CavernMatter; diff --git a/src/main/java/com/volmit/iris/engine/object/meta/IrisEnchantment.java b/src/main/java/com/volmit/iris/engine/object/IrisEnchantment.java similarity index 98% rename from src/main/java/com/volmit/iris/engine/object/meta/IrisEnchantment.java rename to src/main/java/com/volmit/iris/engine/object/IrisEnchantment.java index ec22322dd..241dd0279 100644 --- a/src/main/java/com/volmit/iris/engine/object/meta/IrisEnchantment.java +++ b/src/main/java/com/volmit/iris/engine/object/IrisEnchantment.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.engine.object.meta; +package com.volmit.iris.engine.object; import com.volmit.iris.Iris; import com.volmit.iris.engine.object.annotations.Desc; diff --git a/src/main/java/com/volmit/iris/engine/object/engine/IrisEngineChunkData.java b/src/main/java/com/volmit/iris/engine/object/IrisEngineChunkData.java similarity index 93% rename from src/main/java/com/volmit/iris/engine/object/engine/IrisEngineChunkData.java rename to src/main/java/com/volmit/iris/engine/object/IrisEngineChunkData.java index 41a13d406..ed62a80a4 100644 --- a/src/main/java/com/volmit/iris/engine/object/engine/IrisEngineChunkData.java +++ b/src/main/java/com/volmit/iris/engine/object/IrisEngineChunkData.java @@ -16,10 +16,9 @@ * along with this program. If not, see . */ -package com.volmit.iris.engine.object.engine; +package com.volmit.iris.engine.object; import com.volmit.iris.engine.framework.Engine; -import com.volmit.iris.engine.object.spawners.IrisSpawner; import com.volmit.iris.util.collection.KList; import lombok.Data; diff --git a/src/main/java/com/volmit/iris/engine/object/engine/IrisEngineData.java b/src/main/java/com/volmit/iris/engine/object/IrisEngineData.java similarity index 95% rename from src/main/java/com/volmit/iris/engine/object/engine/IrisEngineData.java rename to src/main/java/com/volmit/iris/engine/object/IrisEngineData.java index 395b8baa6..3acf21ea4 100644 --- a/src/main/java/com/volmit/iris/engine/object/engine/IrisEngineData.java +++ b/src/main/java/com/volmit/iris/engine/object/IrisEngineData.java @@ -16,11 +16,10 @@ * along with this program. If not, see . */ -package com.volmit.iris.engine.object.engine; +package com.volmit.iris.engine.object; import com.volmit.iris.engine.data.cache.Cache; import com.volmit.iris.engine.framework.Engine; -import com.volmit.iris.engine.object.spawners.IrisSpawner; import com.volmit.iris.util.collection.KList; import lombok.Data; diff --git a/src/main/java/com/volmit/iris/engine/object/engine/IrisEngineSpawnerCooldown.java b/src/main/java/com/volmit/iris/engine/object/IrisEngineSpawnerCooldown.java similarity index 92% rename from src/main/java/com/volmit/iris/engine/object/engine/IrisEngineSpawnerCooldown.java rename to src/main/java/com/volmit/iris/engine/object/IrisEngineSpawnerCooldown.java index 12de56329..1e47506df 100644 --- a/src/main/java/com/volmit/iris/engine/object/engine/IrisEngineSpawnerCooldown.java +++ b/src/main/java/com/volmit/iris/engine/object/IrisEngineSpawnerCooldown.java @@ -16,10 +16,10 @@ * along with this program. If not, see . */ -package com.volmit.iris.engine.object.engine; +package com.volmit.iris.engine.object; import com.volmit.iris.engine.framework.Engine; -import com.volmit.iris.engine.object.basic.IrisRate; +import com.volmit.iris.engine.object.IrisRate; import com.volmit.iris.util.math.M; import lombok.Data; diff --git a/src/main/java/com/volmit/iris/engine/object/engine/IrisEngineStatistics.java b/src/main/java/com/volmit/iris/engine/object/IrisEngineStatistics.java similarity index 95% rename from src/main/java/com/volmit/iris/engine/object/engine/IrisEngineStatistics.java rename to src/main/java/com/volmit/iris/engine/object/IrisEngineStatistics.java index b64f0bca7..62a059712 100644 --- a/src/main/java/com/volmit/iris/engine/object/engine/IrisEngineStatistics.java +++ b/src/main/java/com/volmit/iris/engine/object/IrisEngineStatistics.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.engine.object.engine; +package com.volmit.iris.engine.object; import lombok.Data; diff --git a/src/main/java/com/volmit/iris/engine/object/noise/IrisEngineStreamType.java b/src/main/java/com/volmit/iris/engine/object/IrisEngineStreamType.java similarity index 98% rename from src/main/java/com/volmit/iris/engine/object/noise/IrisEngineStreamType.java rename to src/main/java/com/volmit/iris/engine/object/IrisEngineStreamType.java index 6f88ee4ef..19bdf8230 100644 --- a/src/main/java/com/volmit/iris/engine/object/noise/IrisEngineStreamType.java +++ b/src/main/java/com/volmit/iris/engine/object/IrisEngineStreamType.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.engine.object.noise; +package com.volmit.iris.engine.object; import com.volmit.iris.engine.framework.Engine; import com.volmit.iris.engine.object.annotations.Desc; diff --git a/src/main/java/com/volmit/iris/engine/object/noise/IrisEngineValueType.java b/src/main/java/com/volmit/iris/engine/object/IrisEngineValueType.java similarity index 97% rename from src/main/java/com/volmit/iris/engine/object/noise/IrisEngineValueType.java rename to src/main/java/com/volmit/iris/engine/object/IrisEngineValueType.java index 0e08e336d..99eab57c3 100644 --- a/src/main/java/com/volmit/iris/engine/object/noise/IrisEngineValueType.java +++ b/src/main/java/com/volmit/iris/engine/object/IrisEngineValueType.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.engine.object.noise; +package com.volmit.iris.engine.object; import com.volmit.iris.engine.framework.Engine; import com.volmit.iris.engine.object.annotations.Desc; diff --git a/src/main/java/com/volmit/iris/engine/object/entity/IrisEntity.java b/src/main/java/com/volmit/iris/engine/object/IrisEntity.java similarity index 96% rename from src/main/java/com/volmit/iris/engine/object/entity/IrisEntity.java rename to src/main/java/com/volmit/iris/engine/object/IrisEntity.java index 62380a359..cd76c2cbd 100644 --- a/src/main/java/com/volmit/iris/engine/object/entity/IrisEntity.java +++ b/src/main/java/com/volmit/iris/engine/object/IrisEntity.java @@ -16,20 +16,12 @@ * along with this program. If not, see . */ -package com.volmit.iris.engine.object.entity; +package com.volmit.iris.engine.object; import com.volmit.iris.Iris; import com.volmit.iris.core.loader.IrisRegistrant; import com.volmit.iris.engine.framework.Engine; import com.volmit.iris.engine.object.annotations.*; -import com.volmit.iris.engine.object.common.IrisScript; -import com.volmit.iris.engine.object.loot.IrisLoot; -import com.volmit.iris.engine.object.loot.IrisLootReference; -import com.volmit.iris.engine.object.loot.IrisLootTable; -import com.volmit.iris.engine.object.meta.InventorySlotType; -import com.volmit.iris.engine.object.meta.IrisAttributeModifier; -import com.volmit.iris.engine.object.meta.IrisEffect; -import com.volmit.iris.engine.object.spawners.IrisSurface; import com.volmit.iris.util.collection.KList; import com.volmit.iris.util.format.C; import com.volmit.iris.util.json.JSONObject; diff --git a/src/main/java/com/volmit/iris/engine/object/entity/IrisEntitySpawn.java b/src/main/java/com/volmit/iris/engine/object/IrisEntitySpawn.java similarity index 96% rename from src/main/java/com/volmit/iris/engine/object/entity/IrisEntitySpawn.java rename to src/main/java/com/volmit/iris/engine/object/IrisEntitySpawn.java index 4cad469ef..4b7c0b8f8 100644 --- a/src/main/java/com/volmit/iris/engine/object/entity/IrisEntitySpawn.java +++ b/src/main/java/com/volmit/iris/engine/object/IrisEntitySpawn.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.engine.object.entity; +package com.volmit.iris.engine.object; import com.volmit.iris.Iris; import com.volmit.iris.engine.IrisComplex; @@ -26,9 +26,6 @@ import com.volmit.iris.engine.object.annotations.Desc; import com.volmit.iris.engine.object.annotations.MinNumber; import com.volmit.iris.engine.object.annotations.RegistryListResource; import com.volmit.iris.engine.object.annotations.Required; -import com.volmit.iris.engine.object.biome.IrisBiome; -import com.volmit.iris.engine.object.common.IRare; -import com.volmit.iris.engine.object.spawners.IrisSpawner; import com.volmit.iris.util.collection.KList; import com.volmit.iris.util.format.C; import com.volmit.iris.util.math.RNG; diff --git a/src/main/java/com/volmit/iris/engine/object/entity/IrisEntitySpawnOverride.java b/src/main/java/com/volmit/iris/engine/object/IrisEntitySpawnOverride.java similarity index 98% rename from src/main/java/com/volmit/iris/engine/object/entity/IrisEntitySpawnOverride.java rename to src/main/java/com/volmit/iris/engine/object/IrisEntitySpawnOverride.java index e76fbbf02..dcd9447cc 100644 --- a/src/main/java/com/volmit/iris/engine/object/entity/IrisEntitySpawnOverride.java +++ b/src/main/java/com/volmit/iris/engine/object/IrisEntitySpawnOverride.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.engine.object.entity; +package com.volmit.iris.engine.object; import com.volmit.iris.engine.data.cache.AtomicCache; import com.volmit.iris.engine.framework.Engine; diff --git a/src/main/java/com/volmit/iris/engine/object/noise/IrisExpression.java b/src/main/java/com/volmit/iris/engine/object/IrisExpression.java similarity index 99% rename from src/main/java/com/volmit/iris/engine/object/noise/IrisExpression.java rename to src/main/java/com/volmit/iris/engine/object/IrisExpression.java index f3c1c5ec1..5a94533b4 100644 --- a/src/main/java/com/volmit/iris/engine/object/noise/IrisExpression.java +++ b/src/main/java/com/volmit/iris/engine/object/IrisExpression.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.engine.object.noise; +package com.volmit.iris.engine.object; import com.dfsek.paralithic.Expression; import com.dfsek.paralithic.eval.parser.Parser; diff --git a/src/main/java/com/volmit/iris/engine/object/noise/IrisExpressionLoad.java b/src/main/java/com/volmit/iris/engine/object/IrisExpressionLoad.java similarity index 98% rename from src/main/java/com/volmit/iris/engine/object/noise/IrisExpressionLoad.java rename to src/main/java/com/volmit/iris/engine/object/IrisExpressionLoad.java index 08a3ad9d4..aeb01499e 100644 --- a/src/main/java/com/volmit/iris/engine/object/noise/IrisExpressionLoad.java +++ b/src/main/java/com/volmit/iris/engine/object/IrisExpressionLoad.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.engine.object.noise; +package com.volmit.iris.engine.object; import com.volmit.iris.core.loader.IrisData; import com.volmit.iris.engine.data.cache.AtomicCache; diff --git a/src/main/java/com/volmit/iris/engine/object/feature/IrisFeature.java b/src/main/java/com/volmit/iris/engine/object/IrisFeature.java similarity index 94% rename from src/main/java/com/volmit/iris/engine/object/feature/IrisFeature.java rename to src/main/java/com/volmit/iris/engine/object/IrisFeature.java index 833b1ee73..33dbe492a 100644 --- a/src/main/java/com/volmit/iris/engine/object/feature/IrisFeature.java +++ b/src/main/java/com/volmit/iris/engine/object/IrisFeature.java @@ -16,14 +16,11 @@ * along with this program. If not, see . */ -package com.volmit.iris.engine.object.feature; +package com.volmit.iris.engine.object; import com.google.gson.Gson; import com.volmit.iris.engine.data.cache.AtomicCache; import com.volmit.iris.engine.object.annotations.*; -import com.volmit.iris.engine.object.biome.IrisBiome; -import com.volmit.iris.engine.object.noise.IrisGeneratorStyle; -import com.volmit.iris.engine.object.spawners.IrisSpawner; import com.volmit.iris.util.collection.KList; import com.volmit.iris.util.interpolation.InterpolationMethod; import com.volmit.iris.util.interpolation.IrisInterpolation; diff --git a/src/main/java/com/volmit/iris/engine/object/feature/IrisFeaturePositional.java b/src/main/java/com/volmit/iris/engine/object/IrisFeaturePositional.java similarity index 98% rename from src/main/java/com/volmit/iris/engine/object/feature/IrisFeaturePositional.java rename to src/main/java/com/volmit/iris/engine/object/IrisFeaturePositional.java index fb3310172..1334b66c0 100644 --- a/src/main/java/com/volmit/iris/engine/object/feature/IrisFeaturePositional.java +++ b/src/main/java/com/volmit/iris/engine/object/IrisFeaturePositional.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.engine.object.feature; +package com.volmit.iris.engine.object; import com.google.gson.Gson; import com.volmit.iris.Iris; @@ -24,7 +24,6 @@ import com.volmit.iris.core.loader.IrisData; import com.volmit.iris.engine.data.cache.AtomicCache; import com.volmit.iris.engine.object.annotations.Desc; import com.volmit.iris.engine.object.annotations.Required; -import com.volmit.iris.engine.object.biome.IrisBiome; import com.volmit.iris.util.documentation.BlockCoordinates; import com.volmit.iris.util.function.NoiseProvider; import com.volmit.iris.util.interpolation.IrisInterpolation; diff --git a/src/main/java/com/volmit/iris/engine/object/feature/IrisFeaturePotential.java b/src/main/java/com/volmit/iris/engine/object/IrisFeaturePotential.java similarity index 96% rename from src/main/java/com/volmit/iris/engine/object/feature/IrisFeaturePotential.java rename to src/main/java/com/volmit/iris/engine/object/IrisFeaturePotential.java index 1f381bfa2..9893d16a4 100644 --- a/src/main/java/com/volmit/iris/engine/object/feature/IrisFeaturePotential.java +++ b/src/main/java/com/volmit/iris/engine/object/IrisFeaturePotential.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.engine.object.feature; +package com.volmit.iris.engine.object; import com.volmit.iris.engine.object.annotations.Desc; import com.volmit.iris.engine.object.annotations.MinNumber; diff --git a/src/main/java/com/volmit/iris/engine/object/objects/IrisFontStyle.java b/src/main/java/com/volmit/iris/engine/object/IrisFontStyle.java similarity index 95% rename from src/main/java/com/volmit/iris/engine/object/objects/IrisFontStyle.java rename to src/main/java/com/volmit/iris/engine/object/IrisFontStyle.java index 5a051a4ab..8fa2d3f9d 100644 --- a/src/main/java/com/volmit/iris/engine/object/objects/IrisFontStyle.java +++ b/src/main/java/com/volmit/iris/engine/object/IrisFontStyle.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.engine.object.objects; +package com.volmit.iris.engine.object; import com.volmit.iris.engine.object.annotations.Desc; diff --git a/src/main/java/com/volmit/iris/engine/object/noise/IrisGenerator.java b/src/main/java/com/volmit/iris/engine/object/IrisGenerator.java similarity index 98% rename from src/main/java/com/volmit/iris/engine/object/noise/IrisGenerator.java rename to src/main/java/com/volmit/iris/engine/object/IrisGenerator.java index c250b9de6..ec722b1ee 100644 --- a/src/main/java/com/volmit/iris/engine/object/noise/IrisGenerator.java +++ b/src/main/java/com/volmit/iris/engine/object/IrisGenerator.java @@ -16,13 +16,12 @@ * along with this program. If not, see . */ -package com.volmit.iris.engine.object.noise; +package com.volmit.iris.engine.object; import com.volmit.iris.Iris; import com.volmit.iris.core.loader.IrisRegistrant; import com.volmit.iris.engine.data.cache.AtomicCache; import com.volmit.iris.engine.object.annotations.*; -import com.volmit.iris.engine.object.common.IRare; import com.volmit.iris.util.collection.KList; import com.volmit.iris.util.interpolation.IrisInterpolation; import com.volmit.iris.util.json.JSONObject; diff --git a/src/main/java/com/volmit/iris/engine/object/noise/IrisGeneratorStyle.java b/src/main/java/com/volmit/iris/engine/object/IrisGeneratorStyle.java similarity index 98% rename from src/main/java/com/volmit/iris/engine/object/noise/IrisGeneratorStyle.java rename to src/main/java/com/volmit/iris/engine/object/IrisGeneratorStyle.java index a7a5add3f..7e01bb07d 100644 --- a/src/main/java/com/volmit/iris/engine/object/noise/IrisGeneratorStyle.java +++ b/src/main/java/com/volmit/iris/engine/object/IrisGeneratorStyle.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.engine.object.noise; +package com.volmit.iris.engine.object; import com.volmit.iris.core.loader.IrisData; import com.volmit.iris.engine.data.cache.AtomicCache; diff --git a/src/main/java/com/volmit/iris/engine/object/noise/IrisInterpolator.java b/src/main/java/com/volmit/iris/engine/object/IrisInterpolator.java similarity index 97% rename from src/main/java/com/volmit/iris/engine/object/noise/IrisInterpolator.java rename to src/main/java/com/volmit/iris/engine/object/IrisInterpolator.java index 73bbf1471..0cfd11052 100644 --- a/src/main/java/com/volmit/iris/engine/object/noise/IrisInterpolator.java +++ b/src/main/java/com/volmit/iris/engine/object/IrisInterpolator.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.engine.object.noise; +package com.volmit.iris.engine.object; import com.volmit.iris.engine.object.annotations.Desc; import com.volmit.iris.engine.object.annotations.MaxNumber; diff --git a/src/main/java/com/volmit/iris/engine/object/noise/IrisInterpolator3D.java b/src/main/java/com/volmit/iris/engine/object/IrisInterpolator3D.java similarity index 98% rename from src/main/java/com/volmit/iris/engine/object/noise/IrisInterpolator3D.java rename to src/main/java/com/volmit/iris/engine/object/IrisInterpolator3D.java index 9154cee0b..576b66616 100644 --- a/src/main/java/com/volmit/iris/engine/object/noise/IrisInterpolator3D.java +++ b/src/main/java/com/volmit/iris/engine/object/IrisInterpolator3D.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.engine.object.noise; +package com.volmit.iris.engine.object; import com.volmit.iris.engine.object.annotations.Desc; import com.volmit.iris.engine.object.annotations.MaxNumber; diff --git a/src/main/java/com/volmit/iris/engine/object/jigsaw/IrisJigsawPiece.java b/src/main/java/com/volmit/iris/engine/object/IrisJigsawPiece.java similarity index 94% rename from src/main/java/com/volmit/iris/engine/object/jigsaw/IrisJigsawPiece.java rename to src/main/java/com/volmit/iris/engine/object/IrisJigsawPiece.java index ec7c62e7c..1829f6926 100644 --- a/src/main/java/com/volmit/iris/engine/object/jigsaw/IrisJigsawPiece.java +++ b/src/main/java/com/volmit/iris/engine/object/IrisJigsawPiece.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.engine.object.jigsaw; +package com.volmit.iris.engine.object; import com.volmit.iris.Iris; import com.volmit.iris.core.loader.IrisRegistrant; @@ -25,10 +25,6 @@ import com.volmit.iris.engine.object.annotations.ArrayType; import com.volmit.iris.engine.object.annotations.Desc; import com.volmit.iris.engine.object.annotations.RegistryListResource; import com.volmit.iris.engine.object.annotations.Required; -import com.volmit.iris.engine.object.basic.IrisPosition; -import com.volmit.iris.engine.object.objects.IrisObject; -import com.volmit.iris.engine.object.objects.IrisObjectPlacement; -import com.volmit.iris.engine.object.objects.ObjectPlaceMode; import com.volmit.iris.util.collection.KList; import com.volmit.iris.util.json.JSONObject; import com.volmit.iris.util.plugin.VolmitSender; diff --git a/src/main/java/com/volmit/iris/engine/object/jigsaw/IrisJigsawPieceConnector.java b/src/main/java/com/volmit/iris/engine/object/IrisJigsawPieceConnector.java similarity index 94% rename from src/main/java/com/volmit/iris/engine/object/jigsaw/IrisJigsawPieceConnector.java rename to src/main/java/com/volmit/iris/engine/object/IrisJigsawPieceConnector.java index 05cde512f..667b061a3 100644 --- a/src/main/java/com/volmit/iris/engine/object/jigsaw/IrisJigsawPieceConnector.java +++ b/src/main/java/com/volmit/iris/engine/object/IrisJigsawPieceConnector.java @@ -16,12 +16,9 @@ * along with this program. If not, see . */ -package com.volmit.iris.engine.object.jigsaw; +package com.volmit.iris.engine.object; import com.volmit.iris.engine.object.annotations.*; -import com.volmit.iris.engine.object.basic.IrisPosition; -import com.volmit.iris.engine.object.entity.IrisEntity; -import com.volmit.iris.engine.object.objects.IrisDirection; import com.volmit.iris.util.collection.KList; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/src/main/java/com/volmit/iris/engine/object/jigsaw/IrisJigsawPlacement.java b/src/main/java/com/volmit/iris/engine/object/IrisJigsawPlacement.java similarity index 97% rename from src/main/java/com/volmit/iris/engine/object/jigsaw/IrisJigsawPlacement.java rename to src/main/java/com/volmit/iris/engine/object/IrisJigsawPlacement.java index 97f939098..75ac44c32 100644 --- a/src/main/java/com/volmit/iris/engine/object/jigsaw/IrisJigsawPlacement.java +++ b/src/main/java/com/volmit/iris/engine/object/IrisJigsawPlacement.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.engine.object.jigsaw; +package com.volmit.iris.engine.object; import com.volmit.iris.engine.object.annotations.Desc; import com.volmit.iris.engine.object.annotations.MinNumber; diff --git a/src/main/java/com/volmit/iris/engine/object/jigsaw/IrisJigsawPool.java b/src/main/java/com/volmit/iris/engine/object/IrisJigsawPool.java similarity index 97% rename from src/main/java/com/volmit/iris/engine/object/jigsaw/IrisJigsawPool.java rename to src/main/java/com/volmit/iris/engine/object/IrisJigsawPool.java index 535c76837..164758f76 100644 --- a/src/main/java/com/volmit/iris/engine/object/jigsaw/IrisJigsawPool.java +++ b/src/main/java/com/volmit/iris/engine/object/IrisJigsawPool.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.engine.object.jigsaw; +package com.volmit.iris.engine.object; import com.volmit.iris.core.loader.IrisRegistrant; import com.volmit.iris.engine.object.annotations.ArrayType; diff --git a/src/main/java/com/volmit/iris/engine/object/jigsaw/IrisJigsawStructure.java b/src/main/java/com/volmit/iris/engine/object/IrisJigsawStructure.java similarity index 97% rename from src/main/java/com/volmit/iris/engine/object/jigsaw/IrisJigsawStructure.java rename to src/main/java/com/volmit/iris/engine/object/IrisJigsawStructure.java index 4abf865a1..afc09a072 100644 --- a/src/main/java/com/volmit/iris/engine/object/jigsaw/IrisJigsawStructure.java +++ b/src/main/java/com/volmit/iris/engine/object/IrisJigsawStructure.java @@ -16,14 +16,12 @@ * along with this program. If not, see . */ -package com.volmit.iris.engine.object.jigsaw; +package com.volmit.iris.engine.object; import com.volmit.iris.Iris; import com.volmit.iris.core.loader.IrisRegistrant; import com.volmit.iris.engine.data.cache.AtomicCache; import com.volmit.iris.engine.object.annotations.*; -import com.volmit.iris.engine.object.feature.IrisFeature; -import com.volmit.iris.engine.object.noise.IrisStyledRange; import com.volmit.iris.util.collection.KList; import com.volmit.iris.util.json.JSONObject; import com.volmit.iris.util.plugin.VolmitSender; diff --git a/src/main/java/com/volmit/iris/engine/object/jigsaw/IrisJigsawStructurePlacement.java b/src/main/java/com/volmit/iris/engine/object/IrisJigsawStructurePlacement.java similarity index 97% rename from src/main/java/com/volmit/iris/engine/object/jigsaw/IrisJigsawStructurePlacement.java rename to src/main/java/com/volmit/iris/engine/object/IrisJigsawStructurePlacement.java index a691b3382..50f96dc76 100644 --- a/src/main/java/com/volmit/iris/engine/object/jigsaw/IrisJigsawStructurePlacement.java +++ b/src/main/java/com/volmit/iris/engine/object/IrisJigsawStructurePlacement.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.engine.object.jigsaw; +package com.volmit.iris.engine.object; import com.volmit.iris.engine.object.annotations.Desc; import com.volmit.iris.engine.object.annotations.RegistryListResource; diff --git a/src/main/java/com/volmit/iris/engine/object/loot/IrisLoot.java b/src/main/java/com/volmit/iris/engine/object/IrisLoot.java similarity index 97% rename from src/main/java/com/volmit/iris/engine/object/loot/IrisLoot.java rename to src/main/java/com/volmit/iris/engine/object/IrisLoot.java index 5eea41af5..c1675ed37 100644 --- a/src/main/java/com/volmit/iris/engine/object/loot/IrisLoot.java +++ b/src/main/java/com/volmit/iris/engine/object/IrisLoot.java @@ -16,15 +16,11 @@ * along with this program. If not, see . */ -package com.volmit.iris.engine.object.loot; +package com.volmit.iris.engine.object; import com.volmit.iris.Iris; import com.volmit.iris.engine.data.cache.AtomicCache; import com.volmit.iris.engine.object.annotations.*; -import com.volmit.iris.engine.object.meta.InventorySlotType; -import com.volmit.iris.engine.object.meta.IrisAttributeModifier; -import com.volmit.iris.engine.object.meta.IrisEnchantment; -import com.volmit.iris.engine.object.noise.NoiseStyle; import com.volmit.iris.util.collection.KList; import com.volmit.iris.util.data.B; import com.volmit.iris.util.format.C; diff --git a/src/main/java/com/volmit/iris/engine/object/loot/IrisLootMode.java b/src/main/java/com/volmit/iris/engine/object/IrisLootMode.java similarity index 96% rename from src/main/java/com/volmit/iris/engine/object/loot/IrisLootMode.java rename to src/main/java/com/volmit/iris/engine/object/IrisLootMode.java index 1cbb0b960..b349577a3 100644 --- a/src/main/java/com/volmit/iris/engine/object/loot/IrisLootMode.java +++ b/src/main/java/com/volmit/iris/engine/object/IrisLootMode.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.engine.object.loot; +package com.volmit.iris.engine.object; import com.volmit.iris.engine.object.annotations.Desc; diff --git a/src/main/java/com/volmit/iris/engine/object/loot/IrisLootReference.java b/src/main/java/com/volmit/iris/engine/object/IrisLootReference.java similarity index 98% rename from src/main/java/com/volmit/iris/engine/object/loot/IrisLootReference.java rename to src/main/java/com/volmit/iris/engine/object/IrisLootReference.java index 5c1630ac6..7cbdd5846 100644 --- a/src/main/java/com/volmit/iris/engine/object/loot/IrisLootReference.java +++ b/src/main/java/com/volmit/iris/engine/object/IrisLootReference.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.engine.object.loot; +package com.volmit.iris.engine.object; import com.volmit.iris.engine.data.cache.AtomicCache; import com.volmit.iris.engine.object.annotations.ArrayType; diff --git a/src/main/java/com/volmit/iris/engine/object/loot/IrisLootTable.java b/src/main/java/com/volmit/iris/engine/object/IrisLootTable.java similarity index 96% rename from src/main/java/com/volmit/iris/engine/object/loot/IrisLootTable.java rename to src/main/java/com/volmit/iris/engine/object/IrisLootTable.java index 0cdb3f9da..7fd179c83 100644 --- a/src/main/java/com/volmit/iris/engine/object/loot/IrisLootTable.java +++ b/src/main/java/com/volmit/iris/engine/object/IrisLootTable.java @@ -16,14 +16,13 @@ * along with this program. If not, see . */ -package com.volmit.iris.engine.object.loot; +package com.volmit.iris.engine.object; import com.volmit.iris.core.loader.IrisRegistrant; import com.volmit.iris.engine.object.annotations.ArrayType; import com.volmit.iris.engine.object.annotations.Desc; import com.volmit.iris.engine.object.annotations.MinNumber; import com.volmit.iris.engine.object.annotations.Required; -import com.volmit.iris.engine.object.meta.InventorySlotType; import com.volmit.iris.util.collection.KList; import com.volmit.iris.util.json.JSONObject; import com.volmit.iris.util.math.RNG; diff --git a/src/main/java/com/volmit/iris/engine/object/block/IrisMaterialPalette.java b/src/main/java/com/volmit/iris/engine/object/IrisMaterialPalette.java similarity index 95% rename from src/main/java/com/volmit/iris/engine/object/block/IrisMaterialPalette.java rename to src/main/java/com/volmit/iris/engine/object/IrisMaterialPalette.java index ef140e345..0f0627a94 100644 --- a/src/main/java/com/volmit/iris/engine/object/block/IrisMaterialPalette.java +++ b/src/main/java/com/volmit/iris/engine/object/IrisMaterialPalette.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.engine.object.block; +package com.volmit.iris.engine.object; import com.volmit.iris.core.loader.IrisData; import com.volmit.iris.engine.data.cache.AtomicCache; @@ -24,8 +24,6 @@ import com.volmit.iris.engine.object.annotations.ArrayType; import com.volmit.iris.engine.object.annotations.Desc; import com.volmit.iris.engine.object.annotations.MinNumber; import com.volmit.iris.engine.object.annotations.Required; -import com.volmit.iris.engine.object.noise.IrisGeneratorStyle; -import com.volmit.iris.engine.object.noise.NoiseStyle; import com.volmit.iris.util.collection.KList; import com.volmit.iris.util.math.RNG; import com.volmit.iris.util.noise.CNG; diff --git a/src/main/java/com/volmit/iris/engine/object/mods/IrisMod.java b/src/main/java/com/volmit/iris/engine/object/IrisMod.java similarity index 94% rename from src/main/java/com/volmit/iris/engine/object/mods/IrisMod.java rename to src/main/java/com/volmit/iris/engine/object/IrisMod.java index e04fd0e7f..d8f2724da 100644 --- a/src/main/java/com/volmit/iris/engine/object/mods/IrisMod.java +++ b/src/main/java/com/volmit/iris/engine/object/IrisMod.java @@ -16,14 +16,10 @@ * along with this program. If not, see . */ -package com.volmit.iris.engine.object.mods; +package com.volmit.iris.engine.object; import com.volmit.iris.core.loader.IrisRegistrant; import com.volmit.iris.engine.object.annotations.*; -import com.volmit.iris.engine.object.biome.IrisBiome; -import com.volmit.iris.engine.object.objects.IrisObject; -import com.volmit.iris.engine.object.objects.IrisObjectReplace; -import com.volmit.iris.engine.object.regional.IrisRegion; import com.volmit.iris.util.collection.KList; import com.volmit.iris.util.json.JSONObject; import com.volmit.iris.util.plugin.VolmitSender; diff --git a/src/main/java/com/volmit/iris/engine/object/mods/IrisModBiomeInjector.java b/src/main/java/com/volmit/iris/engine/object/IrisModBiomeInjector.java similarity index 91% rename from src/main/java/com/volmit/iris/engine/object/mods/IrisModBiomeInjector.java rename to src/main/java/com/volmit/iris/engine/object/IrisModBiomeInjector.java index ab3c7e441..bf7d30759 100644 --- a/src/main/java/com/volmit/iris/engine/object/mods/IrisModBiomeInjector.java +++ b/src/main/java/com/volmit/iris/engine/object/IrisModBiomeInjector.java @@ -16,14 +16,12 @@ * along with this program. If not, see . */ -package com.volmit.iris.engine.object.mods; +package com.volmit.iris.engine.object; import com.volmit.iris.engine.object.annotations.ArrayType; import com.volmit.iris.engine.object.annotations.Desc; import com.volmit.iris.engine.object.annotations.RegistryListResource; import com.volmit.iris.engine.object.annotations.Required; -import com.volmit.iris.engine.object.biome.IrisBiome; -import com.volmit.iris.engine.object.regional.IrisRegion; import com.volmit.iris.util.collection.KList; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/src/main/java/com/volmit/iris/engine/object/mods/IrisModBiomeReplacer.java b/src/main/java/com/volmit/iris/engine/object/IrisModBiomeReplacer.java similarity index 94% rename from src/main/java/com/volmit/iris/engine/object/mods/IrisModBiomeReplacer.java rename to src/main/java/com/volmit/iris/engine/object/IrisModBiomeReplacer.java index bca8cc168..f6ac311cc 100644 --- a/src/main/java/com/volmit/iris/engine/object/mods/IrisModBiomeReplacer.java +++ b/src/main/java/com/volmit/iris/engine/object/IrisModBiomeReplacer.java @@ -16,13 +16,13 @@ * along with this program. If not, see . */ -package com.volmit.iris.engine.object.mods; +package com.volmit.iris.engine.object; import com.volmit.iris.engine.object.annotations.ArrayType; import com.volmit.iris.engine.object.annotations.Desc; import com.volmit.iris.engine.object.annotations.RegistryListResource; import com.volmit.iris.engine.object.annotations.Required; -import com.volmit.iris.engine.object.biome.IrisBiome; +import com.volmit.iris.engine.object.IrisBiome; import com.volmit.iris.util.collection.KList; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/src/main/java/com/volmit/iris/engine/object/mods/IrisModNoiseStyleReplacer.java b/src/main/java/com/volmit/iris/engine/object/IrisModNoiseStyleReplacer.java similarity index 89% rename from src/main/java/com/volmit/iris/engine/object/mods/IrisModNoiseStyleReplacer.java rename to src/main/java/com/volmit/iris/engine/object/IrisModNoiseStyleReplacer.java index b1d33d44a..4bbe3156d 100644 --- a/src/main/java/com/volmit/iris/engine/object/mods/IrisModNoiseStyleReplacer.java +++ b/src/main/java/com/volmit/iris/engine/object/IrisModNoiseStyleReplacer.java @@ -16,15 +16,12 @@ * along with this program. If not, see . */ -package com.volmit.iris.engine.object.mods; +package com.volmit.iris.engine.object; import com.volmit.iris.engine.object.annotations.ArrayType; import com.volmit.iris.engine.object.annotations.Desc; import com.volmit.iris.engine.object.annotations.RegistryListResource; import com.volmit.iris.engine.object.annotations.Required; -import com.volmit.iris.engine.object.biome.IrisBiome; -import com.volmit.iris.engine.object.noise.IrisGeneratorStyle; -import com.volmit.iris.engine.object.noise.NoiseStyle; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/src/main/java/com/volmit/iris/engine/object/mods/IrisModObjectPlacementBiomeInjector.java b/src/main/java/com/volmit/iris/engine/object/IrisModObjectPlacementBiomeInjector.java similarity index 90% rename from src/main/java/com/volmit/iris/engine/object/mods/IrisModObjectPlacementBiomeInjector.java rename to src/main/java/com/volmit/iris/engine/object/IrisModObjectPlacementBiomeInjector.java index 7f456d30e..02a3b3727 100644 --- a/src/main/java/com/volmit/iris/engine/object/mods/IrisModObjectPlacementBiomeInjector.java +++ b/src/main/java/com/volmit/iris/engine/object/IrisModObjectPlacementBiomeInjector.java @@ -16,14 +16,12 @@ * along with this program. If not, see . */ -package com.volmit.iris.engine.object.mods; +package com.volmit.iris.engine.object; import com.volmit.iris.engine.object.annotations.ArrayType; import com.volmit.iris.engine.object.annotations.Desc; import com.volmit.iris.engine.object.annotations.RegistryListResource; import com.volmit.iris.engine.object.annotations.Required; -import com.volmit.iris.engine.object.biome.IrisBiome; -import com.volmit.iris.engine.object.objects.IrisObjectPlacement; import com.volmit.iris.util.collection.KList; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/src/main/java/com/volmit/iris/engine/object/mods/IrisModObjectPlacementRegionInjector.java b/src/main/java/com/volmit/iris/engine/object/IrisModObjectPlacementRegionInjector.java similarity index 90% rename from src/main/java/com/volmit/iris/engine/object/mods/IrisModObjectPlacementRegionInjector.java rename to src/main/java/com/volmit/iris/engine/object/IrisModObjectPlacementRegionInjector.java index f9a1c8a72..3d5af5a8f 100644 --- a/src/main/java/com/volmit/iris/engine/object/mods/IrisModObjectPlacementRegionInjector.java +++ b/src/main/java/com/volmit/iris/engine/object/IrisModObjectPlacementRegionInjector.java @@ -16,14 +16,12 @@ * along with this program. If not, see . */ -package com.volmit.iris.engine.object.mods; +package com.volmit.iris.engine.object; import com.volmit.iris.engine.object.annotations.ArrayType; import com.volmit.iris.engine.object.annotations.Desc; import com.volmit.iris.engine.object.annotations.RegistryListResource; import com.volmit.iris.engine.object.annotations.Required; -import com.volmit.iris.engine.object.objects.IrisObjectPlacement; -import com.volmit.iris.engine.object.regional.IrisRegion; import com.volmit.iris.util.collection.KList; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/src/main/java/com/volmit/iris/engine/object/mods/IrisModObjectReplacer.java b/src/main/java/com/volmit/iris/engine/object/IrisModObjectReplacer.java similarity index 91% rename from src/main/java/com/volmit/iris/engine/object/mods/IrisModObjectReplacer.java rename to src/main/java/com/volmit/iris/engine/object/IrisModObjectReplacer.java index eee5ea9c1..f09077280 100644 --- a/src/main/java/com/volmit/iris/engine/object/mods/IrisModObjectReplacer.java +++ b/src/main/java/com/volmit/iris/engine/object/IrisModObjectReplacer.java @@ -16,14 +16,12 @@ * along with this program. If not, see . */ -package com.volmit.iris.engine.object.mods; +package com.volmit.iris.engine.object; import com.volmit.iris.engine.object.annotations.ArrayType; import com.volmit.iris.engine.object.annotations.Desc; import com.volmit.iris.engine.object.annotations.RegistryListResource; import com.volmit.iris.engine.object.annotations.Required; -import com.volmit.iris.engine.object.biome.IrisBiome; -import com.volmit.iris.engine.object.objects.IrisObject; import com.volmit.iris.util.collection.KList; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/src/main/java/com/volmit/iris/engine/object/mods/IrisModRegionReplacer.java b/src/main/java/com/volmit/iris/engine/object/IrisModRegionReplacer.java similarity index 94% rename from src/main/java/com/volmit/iris/engine/object/mods/IrisModRegionReplacer.java rename to src/main/java/com/volmit/iris/engine/object/IrisModRegionReplacer.java index ba4697761..3d8e89378 100644 --- a/src/main/java/com/volmit/iris/engine/object/mods/IrisModRegionReplacer.java +++ b/src/main/java/com/volmit/iris/engine/object/IrisModRegionReplacer.java @@ -16,13 +16,12 @@ * along with this program. If not, see . */ -package com.volmit.iris.engine.object.mods; +package com.volmit.iris.engine.object; import com.volmit.iris.engine.object.annotations.ArrayType; import com.volmit.iris.engine.object.annotations.Desc; import com.volmit.iris.engine.object.annotations.RegistryListResource; import com.volmit.iris.engine.object.annotations.Required; -import com.volmit.iris.engine.object.regional.IrisRegion; import com.volmit.iris.util.collection.KList; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/src/main/java/com/volmit/iris/engine/object/noise/IrisNoiseGenerator.java b/src/main/java/com/volmit/iris/engine/object/IrisNoiseGenerator.java similarity index 99% rename from src/main/java/com/volmit/iris/engine/object/noise/IrisNoiseGenerator.java rename to src/main/java/com/volmit/iris/engine/object/IrisNoiseGenerator.java index 67111be62..08dcebb97 100644 --- a/src/main/java/com/volmit/iris/engine/object/noise/IrisNoiseGenerator.java +++ b/src/main/java/com/volmit/iris/engine/object/IrisNoiseGenerator.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.engine.object.noise; +package com.volmit.iris.engine.object; import com.volmit.iris.core.loader.IrisData; import com.volmit.iris.engine.data.cache.AtomicCache; diff --git a/src/main/java/com/volmit/iris/engine/object/objects/IrisObject.java b/src/main/java/com/volmit/iris/engine/object/IrisObject.java similarity index 99% rename from src/main/java/com/volmit/iris/engine/object/objects/IrisObject.java rename to src/main/java/com/volmit/iris/engine/object/IrisObject.java index ced6ef340..2bc22c6e8 100644 --- a/src/main/java/com/volmit/iris/engine/object/objects/IrisObject.java +++ b/src/main/java/com/volmit/iris/engine/object/IrisObject.java @@ -16,17 +16,13 @@ * along with this program. If not, see . */ -package com.volmit.iris.engine.object.objects; +package com.volmit.iris.engine.object; import com.volmit.iris.Iris; import com.volmit.iris.core.loader.IrisData; import com.volmit.iris.core.loader.IrisRegistrant; import com.volmit.iris.engine.data.cache.AtomicCache; import com.volmit.iris.engine.framework.placer.HeightmapObjectPlacer; -import com.volmit.iris.engine.object.basic.IrisPosition; -import com.volmit.iris.engine.object.common.CarveResult; -import com.volmit.iris.engine.object.common.IObjectPlacer; -import com.volmit.iris.engine.object.tile.TileData; import com.volmit.iris.util.collection.KList; import com.volmit.iris.util.collection.KMap; import com.volmit.iris.util.data.B; diff --git a/src/main/java/com/volmit/iris/engine/object/objects/IrisObjectLimit.java b/src/main/java/com/volmit/iris/engine/object/IrisObjectLimit.java similarity index 97% rename from src/main/java/com/volmit/iris/engine/object/objects/IrisObjectLimit.java rename to src/main/java/com/volmit/iris/engine/object/IrisObjectLimit.java index 7a87789b2..41bb7ac6e 100644 --- a/src/main/java/com/volmit/iris/engine/object/objects/IrisObjectLimit.java +++ b/src/main/java/com/volmit/iris/engine/object/IrisObjectLimit.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.engine.object.objects; +package com.volmit.iris.engine.object; import com.volmit.iris.engine.object.annotations.Desc; import com.volmit.iris.engine.object.annotations.MaxNumber; diff --git a/src/main/java/com/volmit/iris/engine/object/objects/IrisObjectLoot.java b/src/main/java/com/volmit/iris/engine/object/IrisObjectLoot.java similarity index 94% rename from src/main/java/com/volmit/iris/engine/object/objects/IrisObjectLoot.java rename to src/main/java/com/volmit/iris/engine/object/IrisObjectLoot.java index de94e809d..b28d1b1f1 100644 --- a/src/main/java/com/volmit/iris/engine/object/objects/IrisObjectLoot.java +++ b/src/main/java/com/volmit/iris/engine/object/IrisObjectLoot.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.engine.object.objects; +package com.volmit.iris.engine.object; import com.volmit.iris.core.loader.IrisData; import com.volmit.iris.engine.data.cache.AtomicCache; @@ -24,8 +24,8 @@ import com.volmit.iris.engine.object.annotations.ArrayType; import com.volmit.iris.engine.object.annotations.Desc; import com.volmit.iris.engine.object.annotations.RegistryListResource; import com.volmit.iris.engine.object.annotations.Required; -import com.volmit.iris.engine.object.block.IrisBlockData; -import com.volmit.iris.engine.object.loot.IrisLootTable; +import com.volmit.iris.engine.object.IrisBlockData; +import com.volmit.iris.engine.object.IrisLootTable; import com.volmit.iris.util.collection.KList; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/src/main/java/com/volmit/iris/engine/object/objects/IrisObjectPlacement.java b/src/main/java/com/volmit/iris/engine/object/IrisObjectPlacement.java similarity index 95% rename from src/main/java/com/volmit/iris/engine/object/objects/IrisObjectPlacement.java rename to src/main/java/com/volmit/iris/engine/object/IrisObjectPlacement.java index 907d4eb65..28bc3122e 100644 --- a/src/main/java/com/volmit/iris/engine/object/objects/IrisObjectPlacement.java +++ b/src/main/java/com/volmit/iris/engine/object/IrisObjectPlacement.java @@ -16,20 +16,12 @@ * along with this program. If not, see . */ -package com.volmit.iris.engine.object.objects; +package com.volmit.iris.engine.object; import com.volmit.iris.Iris; import com.volmit.iris.core.loader.IrisData; import com.volmit.iris.engine.data.cache.AtomicCache; import com.volmit.iris.engine.object.annotations.*; -import com.volmit.iris.engine.object.feature.IrisFeaturePotential; -import com.volmit.iris.engine.object.loot.IrisLootTable; -import com.volmit.iris.engine.object.noise.CarvingMode; -import com.volmit.iris.engine.object.noise.IrisGeneratorStyle; -import com.volmit.iris.engine.object.noise.IrisNoiseGenerator; -import com.volmit.iris.engine.object.noise.NoiseStyle; -import com.volmit.iris.engine.object.trees.IrisTree; -import com.volmit.iris.engine.object.trees.IrisTreeSize; import com.volmit.iris.util.collection.KList; import com.volmit.iris.util.collection.KMap; import com.volmit.iris.util.data.B; diff --git a/src/main/java/com/volmit/iris/engine/object/objects/IrisObjectPlacementScaleInterpolator.java b/src/main/java/com/volmit/iris/engine/object/IrisObjectPlacementScaleInterpolator.java similarity index 96% rename from src/main/java/com/volmit/iris/engine/object/objects/IrisObjectPlacementScaleInterpolator.java rename to src/main/java/com/volmit/iris/engine/object/IrisObjectPlacementScaleInterpolator.java index 368a75489..9fd987db7 100644 --- a/src/main/java/com/volmit/iris/engine/object/objects/IrisObjectPlacementScaleInterpolator.java +++ b/src/main/java/com/volmit/iris/engine/object/IrisObjectPlacementScaleInterpolator.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.engine.object.objects; +package com.volmit.iris.engine.object; import com.volmit.iris.engine.object.annotations.Desc; diff --git a/src/main/java/com/volmit/iris/engine/object/objects/IrisObjectReplace.java b/src/main/java/com/volmit/iris/engine/object/IrisObjectReplace.java similarity index 94% rename from src/main/java/com/volmit/iris/engine/object/objects/IrisObjectReplace.java rename to src/main/java/com/volmit/iris/engine/object/IrisObjectReplace.java index fc1baf56a..aea73b9b2 100644 --- a/src/main/java/com/volmit/iris/engine/object/objects/IrisObjectReplace.java +++ b/src/main/java/com/volmit/iris/engine/object/IrisObjectReplace.java @@ -16,13 +16,13 @@ * along with this program. If not, see . */ -package com.volmit.iris.engine.object.objects; +package com.volmit.iris.engine.object; import com.volmit.iris.core.loader.IrisData; import com.volmit.iris.engine.data.cache.AtomicCache; import com.volmit.iris.engine.object.annotations.*; -import com.volmit.iris.engine.object.block.IrisBlockData; -import com.volmit.iris.engine.object.block.IrisMaterialPalette; +import com.volmit.iris.engine.object.IrisBlockData; +import com.volmit.iris.engine.object.IrisMaterialPalette; import com.volmit.iris.util.collection.KList; import com.volmit.iris.util.math.RNG; import com.volmit.iris.util.noise.CNG; diff --git a/src/main/java/com/volmit/iris/engine/object/objects/IrisObjectRotation.java b/src/main/java/com/volmit/iris/engine/object/IrisObjectRotation.java similarity index 98% rename from src/main/java/com/volmit/iris/engine/object/objects/IrisObjectRotation.java rename to src/main/java/com/volmit/iris/engine/object/IrisObjectRotation.java index 1361187fe..9711488c1 100644 --- a/src/main/java/com/volmit/iris/engine/object/objects/IrisObjectRotation.java +++ b/src/main/java/com/volmit/iris/engine/object/IrisObjectRotation.java @@ -16,13 +16,10 @@ * along with this program. If not, see . */ -package com.volmit.iris.engine.object.objects; +package com.volmit.iris.engine.object; import com.volmit.iris.Iris; import com.volmit.iris.engine.object.annotations.Desc; -import com.volmit.iris.engine.object.basic.IrisPosition; -import com.volmit.iris.engine.object.jigsaw.IrisJigsawPiece; -import com.volmit.iris.engine.object.jigsaw.IrisJigsawPieceConnector; import com.volmit.iris.util.collection.KList; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/src/main/java/com/volmit/iris/engine/object/objects/IrisObjectScale.java b/src/main/java/com/volmit/iris/engine/object/IrisObjectScale.java similarity index 98% rename from src/main/java/com/volmit/iris/engine/object/objects/IrisObjectScale.java rename to src/main/java/com/volmit/iris/engine/object/IrisObjectScale.java index 90ef390c9..36675e494 100644 --- a/src/main/java/com/volmit/iris/engine/object/objects/IrisObjectScale.java +++ b/src/main/java/com/volmit/iris/engine/object/IrisObjectScale.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.engine.object.objects; +package com.volmit.iris.engine.object; import com.googlecode.concurrentlinkedhashmap.ConcurrentLinkedHashMap; import com.volmit.iris.engine.object.annotations.Desc; diff --git a/src/main/java/com/volmit/iris/engine/object/objects/IrisObjectTranslate.java b/src/main/java/com/volmit/iris/engine/object/IrisObjectTranslate.java similarity index 98% rename from src/main/java/com/volmit/iris/engine/object/objects/IrisObjectTranslate.java rename to src/main/java/com/volmit/iris/engine/object/IrisObjectTranslate.java index ccdd182e2..f37977d66 100644 --- a/src/main/java/com/volmit/iris/engine/object/objects/IrisObjectTranslate.java +++ b/src/main/java/com/volmit/iris/engine/object/IrisObjectTranslate.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.engine.object.objects; +package com.volmit.iris.engine.object; import com.volmit.iris.engine.object.annotations.Desc; import com.volmit.iris.engine.object.annotations.MaxNumber; diff --git a/src/main/java/com/volmit/iris/engine/object/basic/IrisPosition.java b/src/main/java/com/volmit/iris/engine/object/IrisPosition.java similarity index 98% rename from src/main/java/com/volmit/iris/engine/object/basic/IrisPosition.java rename to src/main/java/com/volmit/iris/engine/object/IrisPosition.java index 4b8433753..50abd6765 100644 --- a/src/main/java/com/volmit/iris/engine/object/basic/IrisPosition.java +++ b/src/main/java/com/volmit/iris/engine/object/IrisPosition.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.engine.object.basic; +package com.volmit.iris.engine.object; import com.volmit.iris.engine.object.annotations.Desc; import lombok.AllArgsConstructor; diff --git a/src/main/java/com/volmit/iris/engine/object/basic/IrisPosition2D.java b/src/main/java/com/volmit/iris/engine/object/IrisPosition2D.java similarity index 96% rename from src/main/java/com/volmit/iris/engine/object/basic/IrisPosition2D.java rename to src/main/java/com/volmit/iris/engine/object/IrisPosition2D.java index 7b9b20149..8fbb907e3 100644 --- a/src/main/java/com/volmit/iris/engine/object/basic/IrisPosition2D.java +++ b/src/main/java/com/volmit/iris/engine/object/IrisPosition2D.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.engine.object.basic; +package com.volmit.iris.engine.object; import com.volmit.iris.engine.object.annotations.Desc; import lombok.AllArgsConstructor; diff --git a/src/main/java/com/volmit/iris/engine/object/meta/IrisPotionEffect.java b/src/main/java/com/volmit/iris/engine/object/IrisPotionEffect.java similarity index 98% rename from src/main/java/com/volmit/iris/engine/object/meta/IrisPotionEffect.java rename to src/main/java/com/volmit/iris/engine/object/IrisPotionEffect.java index f78b258f8..44454379e 100644 --- a/src/main/java/com/volmit/iris/engine/object/meta/IrisPotionEffect.java +++ b/src/main/java/com/volmit/iris/engine/object/IrisPotionEffect.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.engine.object.meta; +package com.volmit.iris.engine.object; import com.volmit.iris.Iris; import com.volmit.iris.engine.data.cache.AtomicCache; diff --git a/src/main/java/com/volmit/iris/engine/object/carving/IrisPyramid.java b/src/main/java/com/volmit/iris/engine/object/IrisPyramid.java similarity index 87% rename from src/main/java/com/volmit/iris/engine/object/carving/IrisPyramid.java rename to src/main/java/com/volmit/iris/engine/object/IrisPyramid.java index d7147dec5..f606190e9 100644 --- a/src/main/java/com/volmit/iris/engine/object/carving/IrisPyramid.java +++ b/src/main/java/com/volmit/iris/engine/object/IrisPyramid.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.engine.object.carving; +package com.volmit.iris.engine.object; import com.volmit.iris.engine.data.cache.AtomicCache; import com.volmit.iris.engine.framework.Engine; @@ -25,11 +25,6 @@ import com.volmit.iris.engine.object.annotations.Desc; import com.volmit.iris.engine.object.annotations.MinNumber; import com.volmit.iris.engine.object.annotations.RegistryListResource; import com.volmit.iris.engine.object.annotations.Required; -import com.volmit.iris.engine.object.biome.IrisBiome; -import com.volmit.iris.engine.object.common.IRare; -import com.volmit.iris.engine.object.noise.IrisGeneratorStyle; -import com.volmit.iris.engine.object.noise.IrisStyledRange; -import com.volmit.iris.engine.object.noise.NoiseStyle; import com.volmit.iris.util.math.RNG; import com.volmit.iris.util.matter.MatterCavern; import com.volmit.iris.util.matter.slices.CavernMatter; diff --git a/src/main/java/com/volmit/iris/engine/object/basic/IrisRange.java b/src/main/java/com/volmit/iris/engine/object/IrisRange.java similarity index 96% rename from src/main/java/com/volmit/iris/engine/object/basic/IrisRange.java rename to src/main/java/com/volmit/iris/engine/object/IrisRange.java index e1c962e2b..c2fb2b6e6 100644 --- a/src/main/java/com/volmit/iris/engine/object/basic/IrisRange.java +++ b/src/main/java/com/volmit/iris/engine/object/IrisRange.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.engine.object.basic; +package com.volmit.iris.engine.object; import com.volmit.iris.engine.object.annotations.Desc; import com.volmit.iris.util.math.RNG; diff --git a/src/main/java/com/volmit/iris/engine/object/objects/IrisRareObject.java b/src/main/java/com/volmit/iris/engine/object/IrisRareObject.java similarity index 97% rename from src/main/java/com/volmit/iris/engine/object/objects/IrisRareObject.java rename to src/main/java/com/volmit/iris/engine/object/IrisRareObject.java index ed01c6301..ea4f378da 100644 --- a/src/main/java/com/volmit/iris/engine/object/objects/IrisRareObject.java +++ b/src/main/java/com/volmit/iris/engine/object/IrisRareObject.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.engine.object.objects; +package com.volmit.iris.engine.object; import com.volmit.iris.engine.object.annotations.Desc; import com.volmit.iris.engine.object.annotations.MinNumber; diff --git a/src/main/java/com/volmit/iris/engine/object/basic/IrisRate.java b/src/main/java/com/volmit/iris/engine/object/IrisRate.java similarity index 97% rename from src/main/java/com/volmit/iris/engine/object/basic/IrisRate.java rename to src/main/java/com/volmit/iris/engine/object/IrisRate.java index d7c8f93d1..6a56560ae 100644 --- a/src/main/java/com/volmit/iris/engine/object/basic/IrisRate.java +++ b/src/main/java/com/volmit/iris/engine/object/IrisRate.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.engine.object.basic; +package com.volmit.iris.engine.object; import com.volmit.iris.engine.object.annotations.Desc; import com.volmit.iris.util.format.Form; diff --git a/src/main/java/com/volmit/iris/engine/object/carving/IrisRavine.java b/src/main/java/com/volmit/iris/engine/object/IrisRavine.java similarity index 92% rename from src/main/java/com/volmit/iris/engine/object/carving/IrisRavine.java rename to src/main/java/com/volmit/iris/engine/object/IrisRavine.java index 730c59718..a0d5ccde2 100644 --- a/src/main/java/com/volmit/iris/engine/object/carving/IrisRavine.java +++ b/src/main/java/com/volmit/iris/engine/object/IrisRavine.java @@ -16,29 +16,20 @@ * along with this program. If not, see . */ -package com.volmit.iris.engine.object.carving; +package com.volmit.iris.engine.object; -import com.volmit.iris.Iris; import com.volmit.iris.core.loader.IrisData; import com.volmit.iris.core.loader.IrisRegistrant; -import com.volmit.iris.engine.data.cache.AtomicCache; import com.volmit.iris.engine.framework.Engine; import com.volmit.iris.engine.mantle.MantleWriter; import com.volmit.iris.engine.object.annotations.Desc; import com.volmit.iris.engine.object.annotations.MaxNumber; import com.volmit.iris.engine.object.annotations.MinNumber; import com.volmit.iris.engine.object.annotations.RegistryListResource; -import com.volmit.iris.engine.object.basic.IrisPosition; -import com.volmit.iris.engine.object.basic.IrisRange; -import com.volmit.iris.engine.object.biome.IrisBiome; -import com.volmit.iris.engine.object.noise.IrisShapedGeneratorStyle; -import com.volmit.iris.engine.object.noise.IrisWorm; -import com.volmit.iris.engine.object.noise.NoiseStyle; import com.volmit.iris.util.collection.KList; import com.volmit.iris.util.json.JSONObject; import com.volmit.iris.util.math.RNG; import com.volmit.iris.util.matter.MatterCavern; -import com.volmit.iris.util.matter.slices.CavernMatter; import com.volmit.iris.util.noise.CNG; import com.volmit.iris.util.plugin.VolmitSender; import lombok.AllArgsConstructor; diff --git a/src/main/java/com/volmit/iris/engine/object/carving/IrisRavinePlacer.java b/src/main/java/com/volmit/iris/engine/object/IrisRavinePlacer.java similarity index 97% rename from src/main/java/com/volmit/iris/engine/object/carving/IrisRavinePlacer.java rename to src/main/java/com/volmit/iris/engine/object/IrisRavinePlacer.java index 8e7d4943f..6556e5c5e 100644 --- a/src/main/java/com/volmit/iris/engine/object/carving/IrisRavinePlacer.java +++ b/src/main/java/com/volmit/iris/engine/object/IrisRavinePlacer.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.engine.object.carving; +package com.volmit.iris.engine.object; import com.volmit.iris.Iris; import com.volmit.iris.core.loader.IrisData; @@ -27,7 +27,6 @@ import com.volmit.iris.engine.object.annotations.Desc; import com.volmit.iris.engine.object.annotations.MinNumber; import com.volmit.iris.engine.object.annotations.RegistryListResource; import com.volmit.iris.engine.object.annotations.Required; -import com.volmit.iris.engine.object.common.IRare; import com.volmit.iris.util.math.RNG; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/src/main/java/com/volmit/iris/engine/object/regional/IrisRegion.java b/src/main/java/com/volmit/iris/engine/object/IrisRegion.java similarity index 94% rename from src/main/java/com/volmit/iris/engine/object/regional/IrisRegion.java rename to src/main/java/com/volmit/iris/engine/object/IrisRegion.java index de7660c6a..1d4c163fe 100644 --- a/src/main/java/com/volmit/iris/engine/object/regional/IrisRegion.java +++ b/src/main/java/com/volmit/iris/engine/object/IrisRegion.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.engine.object.regional; +package com.volmit.iris.engine.object; import com.volmit.iris.Iris; import com.volmit.iris.core.gui.components.RenderType; @@ -24,20 +24,6 @@ import com.volmit.iris.core.loader.IrisData; import com.volmit.iris.core.loader.IrisRegistrant; import com.volmit.iris.engine.data.cache.AtomicCache; import com.volmit.iris.engine.object.annotations.*; -import com.volmit.iris.engine.object.biome.InferredType; -import com.volmit.iris.engine.object.biome.IrisBiome; -import com.volmit.iris.engine.object.block.IrisBlockDrops; -import com.volmit.iris.engine.object.carving.IrisCarving; -import com.volmit.iris.engine.object.common.IRare; -import com.volmit.iris.engine.object.deposits.IrisDepositGenerator; -import com.volmit.iris.engine.object.feature.IrisFeaturePotential; -import com.volmit.iris.engine.object.jigsaw.IrisJigsawStructurePlacement; -import com.volmit.iris.engine.object.loot.IrisLootReference; -import com.volmit.iris.engine.object.meta.IrisEffect; -import com.volmit.iris.engine.object.noise.IrisGeneratorStyle; -import com.volmit.iris.engine.object.noise.NoiseStyle; -import com.volmit.iris.engine.object.objects.IrisObjectPlacement; -import com.volmit.iris.engine.object.spawners.IrisSpawner; import com.volmit.iris.util.collection.KList; import com.volmit.iris.util.collection.KMap; import com.volmit.iris.util.collection.KSet; diff --git a/src/main/java/com/volmit/iris/engine/object/common/IrisScript.java b/src/main/java/com/volmit/iris/engine/object/IrisScript.java similarity index 97% rename from src/main/java/com/volmit/iris/engine/object/common/IrisScript.java rename to src/main/java/com/volmit/iris/engine/object/IrisScript.java index ea4947429..b3ca69f5e 100644 --- a/src/main/java/com/volmit/iris/engine/object/common/IrisScript.java +++ b/src/main/java/com/volmit/iris/engine/object/IrisScript.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.engine.object.common; +package com.volmit.iris.engine.object; import com.volmit.iris.core.loader.IrisRegistrant; import com.volmit.iris.util.json.JSONObject; diff --git a/src/main/java/com/volmit/iris/engine/object/noise/IrisShapedGeneratorStyle.java b/src/main/java/com/volmit/iris/engine/object/IrisShapedGeneratorStyle.java similarity index 98% rename from src/main/java/com/volmit/iris/engine/object/noise/IrisShapedGeneratorStyle.java rename to src/main/java/com/volmit/iris/engine/object/IrisShapedGeneratorStyle.java index a61f6ff62..9e6681920 100644 --- a/src/main/java/com/volmit/iris/engine/object/noise/IrisShapedGeneratorStyle.java +++ b/src/main/java/com/volmit/iris/engine/object/IrisShapedGeneratorStyle.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.engine.object.noise; +package com.volmit.iris.engine.object; import com.volmit.iris.core.loader.IrisData; import com.volmit.iris.engine.object.annotations.Desc; diff --git a/src/main/java/com/volmit/iris/engine/object/noise/IrisSlopeClip.java b/src/main/java/com/volmit/iris/engine/object/IrisSlopeClip.java similarity index 97% rename from src/main/java/com/volmit/iris/engine/object/noise/IrisSlopeClip.java rename to src/main/java/com/volmit/iris/engine/object/IrisSlopeClip.java index 72ed57e3c..23851f586 100644 --- a/src/main/java/com/volmit/iris/engine/object/noise/IrisSlopeClip.java +++ b/src/main/java/com/volmit/iris/engine/object/IrisSlopeClip.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.engine.object.noise; +package com.volmit.iris.engine.object; import com.volmit.iris.engine.object.annotations.Desc; import com.volmit.iris.engine.object.annotations.MaxNumber; diff --git a/src/main/java/com/volmit/iris/engine/object/spawners/IrisSpawnGroup.java b/src/main/java/com/volmit/iris/engine/object/IrisSpawnGroup.java similarity index 95% rename from src/main/java/com/volmit/iris/engine/object/spawners/IrisSpawnGroup.java rename to src/main/java/com/volmit/iris/engine/object/IrisSpawnGroup.java index fa5183c95..2317f6a85 100644 --- a/src/main/java/com/volmit/iris/engine/object/spawners/IrisSpawnGroup.java +++ b/src/main/java/com/volmit/iris/engine/object/IrisSpawnGroup.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.engine.object.spawners; +package com.volmit.iris.engine.object; import com.volmit.iris.engine.object.annotations.Desc; diff --git a/src/main/java/com/volmit/iris/engine/object/spawners/IrisSpawner.java b/src/main/java/com/volmit/iris/engine/object/IrisSpawner.java similarity index 90% rename from src/main/java/com/volmit/iris/engine/object/spawners/IrisSpawner.java rename to src/main/java/com/volmit/iris/engine/object/IrisSpawner.java index 999a5b349..b5ae5191f 100644 --- a/src/main/java/com/volmit/iris/engine/object/spawners/IrisSpawner.java +++ b/src/main/java/com/volmit/iris/engine/object/IrisSpawner.java @@ -16,17 +16,11 @@ * along with this program. If not, see . */ -package com.volmit.iris.engine.object.spawners; +package com.volmit.iris.engine.object; import com.volmit.iris.core.loader.IrisRegistrant; import com.volmit.iris.engine.object.annotations.ArrayType; import com.volmit.iris.engine.object.annotations.Desc; -import com.volmit.iris.engine.object.basic.IrisRange; -import com.volmit.iris.engine.object.basic.IrisRate; -import com.volmit.iris.engine.object.basic.IrisTimeBlock; -import com.volmit.iris.engine.object.basic.IrisWeather; -import com.volmit.iris.engine.object.biome.IrisBiome; -import com.volmit.iris.engine.object.entity.IrisEntitySpawn; import com.volmit.iris.util.collection.KList; import com.volmit.iris.util.json.JSONObject; import com.volmit.iris.util.plugin.VolmitSender; diff --git a/src/main/java/com/volmit/iris/engine/object/carving/IrisSphere.java b/src/main/java/com/volmit/iris/engine/object/IrisSphere.java similarity index 87% rename from src/main/java/com/volmit/iris/engine/object/carving/IrisSphere.java rename to src/main/java/com/volmit/iris/engine/object/IrisSphere.java index aff769053..9af6837e5 100644 --- a/src/main/java/com/volmit/iris/engine/object/carving/IrisSphere.java +++ b/src/main/java/com/volmit/iris/engine/object/IrisSphere.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.engine.object.carving; +package com.volmit.iris.engine.object; import com.volmit.iris.engine.data.cache.AtomicCache; import com.volmit.iris.engine.framework.Engine; @@ -25,11 +25,6 @@ import com.volmit.iris.engine.object.annotations.Desc; import com.volmit.iris.engine.object.annotations.MinNumber; import com.volmit.iris.engine.object.annotations.RegistryListResource; import com.volmit.iris.engine.object.annotations.Required; -import com.volmit.iris.engine.object.biome.IrisBiome; -import com.volmit.iris.engine.object.common.IRare; -import com.volmit.iris.engine.object.noise.IrisGeneratorStyle; -import com.volmit.iris.engine.object.noise.IrisStyledRange; -import com.volmit.iris.engine.object.noise.NoiseStyle; import com.volmit.iris.util.math.RNG; import com.volmit.iris.util.matter.MatterCavern; import com.volmit.iris.util.matter.slices.CavernMatter; diff --git a/src/main/java/com/volmit/iris/engine/object/noise/IrisStyledRange.java b/src/main/java/com/volmit/iris/engine/object/IrisStyledRange.java similarity index 97% rename from src/main/java/com/volmit/iris/engine/object/noise/IrisStyledRange.java rename to src/main/java/com/volmit/iris/engine/object/IrisStyledRange.java index f5a33292f..ba913d4b8 100644 --- a/src/main/java/com/volmit/iris/engine/object/noise/IrisStyledRange.java +++ b/src/main/java/com/volmit/iris/engine/object/IrisStyledRange.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.engine.object.noise; +package com.volmit.iris.engine.object; import com.volmit.iris.core.loader.IrisData; import com.volmit.iris.engine.object.annotations.Desc; diff --git a/src/main/java/com/volmit/iris/engine/object/spawners/IrisSurface.java b/src/main/java/com/volmit/iris/engine/object/IrisSurface.java similarity index 98% rename from src/main/java/com/volmit/iris/engine/object/spawners/IrisSurface.java rename to src/main/java/com/volmit/iris/engine/object/IrisSurface.java index b599b20db..d7bbe2bf8 100644 --- a/src/main/java/com/volmit/iris/engine/object/spawners/IrisSurface.java +++ b/src/main/java/com/volmit/iris/engine/object/IrisSurface.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.engine.object.spawners; +package com.volmit.iris.engine.object; import com.volmit.iris.engine.object.annotations.Desc; import org.bukkit.Material; diff --git a/src/main/java/com/volmit/iris/engine/object/basic/IrisTimeBlock.java b/src/main/java/com/volmit/iris/engine/object/IrisTimeBlock.java similarity index 97% rename from src/main/java/com/volmit/iris/engine/object/basic/IrisTimeBlock.java rename to src/main/java/com/volmit/iris/engine/object/IrisTimeBlock.java index 53b926031..56d6c7f85 100644 --- a/src/main/java/com/volmit/iris/engine/object/basic/IrisTimeBlock.java +++ b/src/main/java/com/volmit/iris/engine/object/IrisTimeBlock.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.engine.object.basic; +package com.volmit.iris.engine.object; import com.volmit.iris.engine.object.annotations.Desc; import lombok.Data; diff --git a/src/main/java/com/volmit/iris/engine/object/trees/IrisTree.java b/src/main/java/com/volmit/iris/engine/object/IrisTree.java similarity index 98% rename from src/main/java/com/volmit/iris/engine/object/trees/IrisTree.java rename to src/main/java/com/volmit/iris/engine/object/IrisTree.java index a01e221bf..c2c10dc11 100644 --- a/src/main/java/com/volmit/iris/engine/object/trees/IrisTree.java +++ b/src/main/java/com/volmit/iris/engine/object/IrisTree.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.engine.object.trees; +package com.volmit.iris.engine.object; import com.volmit.iris.engine.object.annotations.ArrayType; import com.volmit.iris.engine.object.annotations.Desc; diff --git a/src/main/java/com/volmit/iris/engine/object/trees/IrisTreeModes.java b/src/main/java/com/volmit/iris/engine/object/IrisTreeModes.java similarity index 96% rename from src/main/java/com/volmit/iris/engine/object/trees/IrisTreeModes.java rename to src/main/java/com/volmit/iris/engine/object/IrisTreeModes.java index b65b3c4c8..90afa5c3e 100644 --- a/src/main/java/com/volmit/iris/engine/object/trees/IrisTreeModes.java +++ b/src/main/java/com/volmit/iris/engine/object/IrisTreeModes.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.engine.object.trees; +package com.volmit.iris.engine.object; import com.volmit.iris.engine.object.annotations.Desc; diff --git a/src/main/java/com/volmit/iris/engine/object/trees/IrisTreeSettings.java b/src/main/java/com/volmit/iris/engine/object/IrisTreeSettings.java similarity index 96% rename from src/main/java/com/volmit/iris/engine/object/trees/IrisTreeSettings.java rename to src/main/java/com/volmit/iris/engine/object/IrisTreeSettings.java index 42f26dc57..e2dd1173a 100644 --- a/src/main/java/com/volmit/iris/engine/object/trees/IrisTreeSettings.java +++ b/src/main/java/com/volmit/iris/engine/object/IrisTreeSettings.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.engine.object.trees; +package com.volmit.iris.engine.object; import com.volmit.iris.engine.object.annotations.Desc; import com.volmit.iris.engine.object.annotations.Required; diff --git a/src/main/java/com/volmit/iris/engine/object/trees/IrisTreeSize.java b/src/main/java/com/volmit/iris/engine/object/IrisTreeSize.java similarity index 97% rename from src/main/java/com/volmit/iris/engine/object/trees/IrisTreeSize.java rename to src/main/java/com/volmit/iris/engine/object/IrisTreeSize.java index d604f8ce2..62bf545d5 100644 --- a/src/main/java/com/volmit/iris/engine/object/trees/IrisTreeSize.java +++ b/src/main/java/com/volmit/iris/engine/object/IrisTreeSize.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.engine.object.trees; +package com.volmit.iris.engine.object; import com.volmit.iris.engine.object.annotations.Desc; import com.volmit.iris.engine.object.annotations.Required; diff --git a/src/main/java/com/volmit/iris/engine/object/villager/IrisVillagerOverride.java b/src/main/java/com/volmit/iris/engine/object/IrisVillagerOverride.java similarity index 98% rename from src/main/java/com/volmit/iris/engine/object/villager/IrisVillagerOverride.java rename to src/main/java/com/volmit/iris/engine/object/IrisVillagerOverride.java index aef3e0d4f..f9e0f0452 100644 --- a/src/main/java/com/volmit/iris/engine/object/villager/IrisVillagerOverride.java +++ b/src/main/java/com/volmit/iris/engine/object/IrisVillagerOverride.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.engine.object.villager; +package com.volmit.iris.engine.object; import com.volmit.iris.engine.object.annotations.ArrayType; import com.volmit.iris.engine.object.annotations.DependsOn; diff --git a/src/main/java/com/volmit/iris/engine/object/villager/IrisVillagerTrade.java b/src/main/java/com/volmit/iris/engine/object/IrisVillagerTrade.java similarity index 98% rename from src/main/java/com/volmit/iris/engine/object/villager/IrisVillagerTrade.java rename to src/main/java/com/volmit/iris/engine/object/IrisVillagerTrade.java index 5e674303e..2954b1db8 100644 --- a/src/main/java/com/volmit/iris/engine/object/villager/IrisVillagerTrade.java +++ b/src/main/java/com/volmit/iris/engine/object/IrisVillagerTrade.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.engine.object.villager; +package com.volmit.iris.engine.object; import com.volmit.iris.Iris; diff --git a/src/main/java/com/volmit/iris/engine/object/basic/IrisWeather.java b/src/main/java/com/volmit/iris/engine/object/IrisWeather.java similarity index 96% rename from src/main/java/com/volmit/iris/engine/object/basic/IrisWeather.java rename to src/main/java/com/volmit/iris/engine/object/IrisWeather.java index 0c2bd8d92..1e1628a5d 100644 --- a/src/main/java/com/volmit/iris/engine/object/basic/IrisWeather.java +++ b/src/main/java/com/volmit/iris/engine/object/IrisWeather.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.engine.object.basic; +package com.volmit.iris.engine.object; import com.volmit.iris.engine.object.annotations.Desc; import org.bukkit.World; diff --git a/src/main/java/com/volmit/iris/engine/object/common/IrisWorld.java b/src/main/java/com/volmit/iris/engine/object/IrisWorld.java similarity index 98% rename from src/main/java/com/volmit/iris/engine/object/common/IrisWorld.java rename to src/main/java/com/volmit/iris/engine/object/IrisWorld.java index ba22dce05..d78fe79d2 100644 --- a/src/main/java/com/volmit/iris/engine/object/common/IrisWorld.java +++ b/src/main/java/com/volmit/iris/engine/object/IrisWorld.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.engine.object.common; +package com.volmit.iris.engine.object; import com.volmit.iris.Iris; import com.volmit.iris.core.tools.IrisToolbelt; diff --git a/src/main/java/com/volmit/iris/engine/object/noise/IrisWorm.java b/src/main/java/com/volmit/iris/engine/object/IrisWorm.java similarity index 96% rename from src/main/java/com/volmit/iris/engine/object/noise/IrisWorm.java rename to src/main/java/com/volmit/iris/engine/object/IrisWorm.java index dfc894d11..e4ece537c 100644 --- a/src/main/java/com/volmit/iris/engine/object/noise/IrisWorm.java +++ b/src/main/java/com/volmit/iris/engine/object/IrisWorm.java @@ -16,13 +16,11 @@ * along with this program. If not, see . */ -package com.volmit.iris.engine.object.noise; +package com.volmit.iris.engine.object; import com.volmit.iris.core.loader.IrisData; import com.volmit.iris.engine.mantle.MantleWriter; import com.volmit.iris.engine.object.annotations.Desc; -import com.volmit.iris.engine.object.basic.IrisPosition; -import com.volmit.iris.engine.object.basic.IrisRange; import com.volmit.iris.util.collection.KList; import com.volmit.iris.util.collection.KSet; import com.volmit.iris.util.math.RNG; diff --git a/src/main/java/com/volmit/iris/engine/object/noise/NoiseStyle.java b/src/main/java/com/volmit/iris/engine/object/NoiseStyle.java similarity index 99% rename from src/main/java/com/volmit/iris/engine/object/noise/NoiseStyle.java rename to src/main/java/com/volmit/iris/engine/object/NoiseStyle.java index 7eebe66c6..52505a2ca 100644 --- a/src/main/java/com/volmit/iris/engine/object/noise/NoiseStyle.java +++ b/src/main/java/com/volmit/iris/engine/object/NoiseStyle.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.engine.object.noise; +package com.volmit.iris.engine.object; import com.volmit.iris.engine.object.annotations.Desc; import com.volmit.iris.util.math.RNG; diff --git a/src/main/java/com/volmit/iris/engine/object/objects/ObjectPlaceMode.java b/src/main/java/com/volmit/iris/engine/object/ObjectPlaceMode.java similarity index 98% rename from src/main/java/com/volmit/iris/engine/object/objects/ObjectPlaceMode.java rename to src/main/java/com/volmit/iris/engine/object/ObjectPlaceMode.java index 60aa55b53..caf2f278e 100644 --- a/src/main/java/com/volmit/iris/engine/object/objects/ObjectPlaceMode.java +++ b/src/main/java/com/volmit/iris/engine/object/ObjectPlaceMode.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.engine.object.objects; +package com.volmit.iris.engine.object; import com.volmit.iris.engine.object.annotations.Desc; diff --git a/src/main/java/com/volmit/iris/engine/object/dimensional/StudioMode.java b/src/main/java/com/volmit/iris/engine/object/StudioMode.java similarity index 97% rename from src/main/java/com/volmit/iris/engine/object/dimensional/StudioMode.java rename to src/main/java/com/volmit/iris/engine/object/StudioMode.java index 39ac3cf00..033552219 100644 --- a/src/main/java/com/volmit/iris/engine/object/dimensional/StudioMode.java +++ b/src/main/java/com/volmit/iris/engine/object/StudioMode.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.engine.object.dimensional; +package com.volmit.iris.engine.object; import com.volmit.iris.engine.object.annotations.Desc; import com.volmit.iris.engine.platform.BukkitChunkGenerator; diff --git a/src/main/java/com/volmit/iris/engine/object/tile/TileBanner.java b/src/main/java/com/volmit/iris/engine/object/TileBanner.java similarity index 98% rename from src/main/java/com/volmit/iris/engine/object/tile/TileBanner.java rename to src/main/java/com/volmit/iris/engine/object/TileBanner.java index 1b5e05ef3..7206bcf54 100644 --- a/src/main/java/com/volmit/iris/engine/object/tile/TileBanner.java +++ b/src/main/java/com/volmit/iris/engine/object/TileBanner.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.engine.object.tile; +package com.volmit.iris.engine.object; import com.volmit.iris.util.nbt.tag.CompoundTag; import com.volmit.iris.util.nbt.tag.ListTag; diff --git a/src/main/java/com/volmit/iris/engine/object/tile/TileData.java b/src/main/java/com/volmit/iris/engine/object/TileData.java similarity index 98% rename from src/main/java/com/volmit/iris/engine/object/tile/TileData.java rename to src/main/java/com/volmit/iris/engine/object/TileData.java index 48fca4570..aa82540a9 100644 --- a/src/main/java/com/volmit/iris/engine/object/tile/TileData.java +++ b/src/main/java/com/volmit/iris/engine/object/TileData.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.engine.object.tile; +package com.volmit.iris.engine.object; import com.volmit.iris.Iris; import com.volmit.iris.util.collection.KList; diff --git a/src/main/java/com/volmit/iris/engine/object/tile/TileSign.java b/src/main/java/com/volmit/iris/engine/object/TileSign.java similarity index 98% rename from src/main/java/com/volmit/iris/engine/object/tile/TileSign.java rename to src/main/java/com/volmit/iris/engine/object/TileSign.java index 65dc8c1f6..fbb1c2ee8 100644 --- a/src/main/java/com/volmit/iris/engine/object/tile/TileSign.java +++ b/src/main/java/com/volmit/iris/engine/object/TileSign.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.engine.object.tile; +package com.volmit.iris.engine.object; import com.volmit.iris.util.nbt.tag.CompoundTag; import lombok.Data; diff --git a/src/main/java/com/volmit/iris/engine/object/tile/TileSpawner.java b/src/main/java/com/volmit/iris/engine/object/TileSpawner.java similarity index 98% rename from src/main/java/com/volmit/iris/engine/object/tile/TileSpawner.java rename to src/main/java/com/volmit/iris/engine/object/TileSpawner.java index 5b7e423f6..7d1839cd2 100644 --- a/src/main/java/com/volmit/iris/engine/object/tile/TileSpawner.java +++ b/src/main/java/com/volmit/iris/engine/object/TileSpawner.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.engine.object.tile; +package com.volmit.iris.engine.object; import com.volmit.iris.util.nbt.tag.CompoundTag; import com.volmit.iris.util.nbt.tag.ListTag; diff --git a/src/main/java/com/volmit/iris/engine/platform/BukkitChunkGenerator.java b/src/main/java/com/volmit/iris/engine/platform/BukkitChunkGenerator.java index 9b908617d..84e196154 100644 --- a/src/main/java/com/volmit/iris/engine/platform/BukkitChunkGenerator.java +++ b/src/main/java/com/volmit/iris/engine/platform/BukkitChunkGenerator.java @@ -26,9 +26,9 @@ import com.volmit.iris.engine.data.chunk.TerrainChunk; import com.volmit.iris.engine.framework.Engine; import com.volmit.iris.engine.framework.EngineTarget; import com.volmit.iris.engine.framework.WrongEngineBroException; -import com.volmit.iris.engine.object.common.IrisWorld; -import com.volmit.iris.engine.object.dimensional.IrisDimension; -import com.volmit.iris.engine.object.dimensional.StudioMode; +import com.volmit.iris.engine.object.IrisWorld; +import com.volmit.iris.engine.object.IrisDimension; +import com.volmit.iris.engine.object.StudioMode; import com.volmit.iris.engine.platform.studio.StudioGenerator; import com.volmit.iris.util.collection.KList; import com.volmit.iris.util.data.IrisBiomeStorage; diff --git a/src/main/java/com/volmit/iris/engine/platform/HeadlessGenerator.java b/src/main/java/com/volmit/iris/engine/platform/HeadlessGenerator.java index e5f13fcb1..6b3a5b470 100644 --- a/src/main/java/com/volmit/iris/engine/platform/HeadlessGenerator.java +++ b/src/main/java/com/volmit/iris/engine/platform/HeadlessGenerator.java @@ -27,7 +27,7 @@ import com.volmit.iris.engine.data.chunk.MCATerrainChunk; import com.volmit.iris.engine.data.chunk.TerrainChunk; import com.volmit.iris.engine.framework.Engine; import com.volmit.iris.engine.framework.EngineTarget; -import com.volmit.iris.engine.object.common.HeadlessWorld; +import com.volmit.iris.engine.object.HeadlessWorld; import com.volmit.iris.util.collection.KList; import com.volmit.iris.util.documentation.ChunkCoordinates; import com.volmit.iris.util.documentation.RegionCoordinates; diff --git a/src/main/java/com/volmit/iris/engine/platform/studio/generators/BiomeBuffetGenerator.java b/src/main/java/com/volmit/iris/engine/platform/studio/generators/BiomeBuffetGenerator.java index 16c591cc6..8efe14c20 100644 --- a/src/main/java/com/volmit/iris/engine/platform/studio/generators/BiomeBuffetGenerator.java +++ b/src/main/java/com/volmit/iris/engine/platform/studio/generators/BiomeBuffetGenerator.java @@ -22,7 +22,7 @@ import com.volmit.iris.engine.data.cache.Cache; import com.volmit.iris.engine.data.chunk.TerrainChunk; import com.volmit.iris.engine.framework.Engine; import com.volmit.iris.engine.framework.WrongEngineBroException; -import com.volmit.iris.engine.object.biome.IrisBiome; +import com.volmit.iris.engine.object.IrisBiome; import com.volmit.iris.engine.platform.studio.EnginedStudioGenerator; import org.bukkit.Material; import org.bukkit.block.data.BlockData; diff --git a/src/main/java/com/volmit/iris/engine/scripting/IrisScriptingAPI.java b/src/main/java/com/volmit/iris/engine/scripting/IrisScriptingAPI.java index d1423fae9..baa8a8bd2 100644 --- a/src/main/java/com/volmit/iris/engine/scripting/IrisScriptingAPI.java +++ b/src/main/java/com/volmit/iris/engine/scripting/IrisScriptingAPI.java @@ -23,9 +23,9 @@ import com.volmit.iris.core.loader.IrisData; import com.volmit.iris.core.loader.IrisRegistrant; import com.volmit.iris.engine.IrisComplex; import com.volmit.iris.engine.framework.Engine; -import com.volmit.iris.engine.object.biome.IrisBiome; -import com.volmit.iris.engine.object.dimensional.IrisDimension; -import com.volmit.iris.engine.object.noise.IrisExpression; +import com.volmit.iris.engine.object.IrisBiome; +import com.volmit.iris.engine.object.IrisDimension; +import com.volmit.iris.engine.object.IrisExpression; import lombok.Data; import org.bukkit.Location; import org.bukkit.entity.Entity; diff --git a/src/main/java/com/volmit/iris/util/data/BiomeMap.java b/src/main/java/com/volmit/iris/util/data/BiomeMap.java index 65339ab06..1e1b51d50 100644 --- a/src/main/java/com/volmit/iris/util/data/BiomeMap.java +++ b/src/main/java/com/volmit/iris/util/data/BiomeMap.java @@ -18,7 +18,7 @@ package com.volmit.iris.util.data; -import com.volmit.iris.engine.object.biome.IrisBiome; +import com.volmit.iris.engine.object.IrisBiome; public class BiomeMap { private final IrisBiome[] height; diff --git a/src/main/java/com/volmit/iris/util/decree/context/BiomeContextHandler.java b/src/main/java/com/volmit/iris/util/decree/context/BiomeContextHandler.java index 7a48953a1..c011c47d2 100644 --- a/src/main/java/com/volmit/iris/util/decree/context/BiomeContextHandler.java +++ b/src/main/java/com/volmit/iris/util/decree/context/BiomeContextHandler.java @@ -19,7 +19,7 @@ package com.volmit.iris.util.decree.context; import com.volmit.iris.core.tools.IrisToolbelt; -import com.volmit.iris.engine.object.biome.IrisBiome; +import com.volmit.iris.engine.object.IrisBiome; import com.volmit.iris.util.decree.DecreeContextHandler; import com.volmit.iris.util.plugin.VolmitSender; diff --git a/src/main/java/com/volmit/iris/util/decree/context/DimensionContextHandler.java b/src/main/java/com/volmit/iris/util/decree/context/DimensionContextHandler.java index fe271f759..6cff3a013 100644 --- a/src/main/java/com/volmit/iris/util/decree/context/DimensionContextHandler.java +++ b/src/main/java/com/volmit/iris/util/decree/context/DimensionContextHandler.java @@ -19,7 +19,7 @@ package com.volmit.iris.util.decree.context; import com.volmit.iris.core.tools.IrisToolbelt; -import com.volmit.iris.engine.object.dimensional.IrisDimension; +import com.volmit.iris.engine.object.IrisDimension; import com.volmit.iris.util.decree.DecreeContextHandler; import com.volmit.iris.util.plugin.VolmitSender; diff --git a/src/main/java/com/volmit/iris/util/decree/context/GeneratorContextHandler.java b/src/main/java/com/volmit/iris/util/decree/context/GeneratorContextHandler.java index e5b520b24..180f85214 100644 --- a/src/main/java/com/volmit/iris/util/decree/context/GeneratorContextHandler.java +++ b/src/main/java/com/volmit/iris/util/decree/context/GeneratorContextHandler.java @@ -20,7 +20,7 @@ package com.volmit.iris.util.decree.context; import com.volmit.iris.core.tools.IrisToolbelt; import com.volmit.iris.engine.framework.Engine; -import com.volmit.iris.engine.object.noise.IrisGenerator; +import com.volmit.iris.engine.object.IrisGenerator; import com.volmit.iris.util.decree.DecreeContextHandler; import com.volmit.iris.util.plugin.VolmitSender; diff --git a/src/main/java/com/volmit/iris/util/decree/context/RegionContextHandler.java b/src/main/java/com/volmit/iris/util/decree/context/RegionContextHandler.java index 97b733f79..a5eb75e00 100644 --- a/src/main/java/com/volmit/iris/util/decree/context/RegionContextHandler.java +++ b/src/main/java/com/volmit/iris/util/decree/context/RegionContextHandler.java @@ -19,7 +19,7 @@ package com.volmit.iris.util.decree.context; import com.volmit.iris.core.tools.IrisToolbelt; -import com.volmit.iris.engine.object.regional.IrisRegion; +import com.volmit.iris.engine.object.IrisRegion; import com.volmit.iris.util.decree.DecreeContextHandler; import com.volmit.iris.util.plugin.VolmitSender; diff --git a/src/main/java/com/volmit/iris/util/decree/handlers/BiomeHandler.java b/src/main/java/com/volmit/iris/util/decree/handlers/BiomeHandler.java index 1f03ae93f..a63a6babc 100644 --- a/src/main/java/com/volmit/iris/util/decree/handlers/BiomeHandler.java +++ b/src/main/java/com/volmit/iris/util/decree/handlers/BiomeHandler.java @@ -20,7 +20,7 @@ package com.volmit.iris.util.decree.handlers; import com.volmit.iris.Iris; import com.volmit.iris.core.loader.IrisData; -import com.volmit.iris.engine.object.biome.IrisBiome; +import com.volmit.iris.engine.object.IrisBiome; import com.volmit.iris.util.collection.KList; import com.volmit.iris.util.collection.KMap; import com.volmit.iris.util.decree.DecreeParameterHandler; diff --git a/src/main/java/com/volmit/iris/util/decree/handlers/DimensionHandler.java b/src/main/java/com/volmit/iris/util/decree/handlers/DimensionHandler.java index 1d93ee01d..95892cbf4 100644 --- a/src/main/java/com/volmit/iris/util/decree/handlers/DimensionHandler.java +++ b/src/main/java/com/volmit/iris/util/decree/handlers/DimensionHandler.java @@ -20,7 +20,7 @@ package com.volmit.iris.util.decree.handlers; import com.volmit.iris.Iris; import com.volmit.iris.core.loader.IrisData; -import com.volmit.iris.engine.object.dimensional.IrisDimension; +import com.volmit.iris.engine.object.IrisDimension; import com.volmit.iris.util.collection.KList; import com.volmit.iris.util.collection.KMap; import com.volmit.iris.util.decree.DecreeParameterHandler; diff --git a/src/main/java/com/volmit/iris/util/decree/handlers/EntityHandler.java b/src/main/java/com/volmit/iris/util/decree/handlers/EntityHandler.java index f28d61f4e..2ef8ded93 100644 --- a/src/main/java/com/volmit/iris/util/decree/handlers/EntityHandler.java +++ b/src/main/java/com/volmit/iris/util/decree/handlers/EntityHandler.java @@ -20,7 +20,7 @@ package com.volmit.iris.util.decree.handlers; import com.volmit.iris.Iris; import com.volmit.iris.core.loader.IrisData; -import com.volmit.iris.engine.object.entity.IrisEntity; +import com.volmit.iris.engine.object.IrisEntity; import com.volmit.iris.util.collection.KList; import com.volmit.iris.util.collection.KMap; import com.volmit.iris.util.decree.DecreeParameterHandler; diff --git a/src/main/java/com/volmit/iris/util/decree/handlers/GeneratorHandler.java b/src/main/java/com/volmit/iris/util/decree/handlers/GeneratorHandler.java index 104809a20..e83213d35 100644 --- a/src/main/java/com/volmit/iris/util/decree/handlers/GeneratorHandler.java +++ b/src/main/java/com/volmit/iris/util/decree/handlers/GeneratorHandler.java @@ -20,7 +20,7 @@ package com.volmit.iris.util.decree.handlers; import com.volmit.iris.Iris; import com.volmit.iris.core.loader.IrisData; -import com.volmit.iris.engine.object.noise.IrisGenerator; +import com.volmit.iris.engine.object.IrisGenerator; import com.volmit.iris.util.collection.KList; import com.volmit.iris.util.collection.KMap; import com.volmit.iris.util.decree.DecreeParameterHandler; diff --git a/src/main/java/com/volmit/iris/util/decree/handlers/RegionHandler.java b/src/main/java/com/volmit/iris/util/decree/handlers/RegionHandler.java index 36e80a83b..dd7fd4446 100644 --- a/src/main/java/com/volmit/iris/util/decree/handlers/RegionHandler.java +++ b/src/main/java/com/volmit/iris/util/decree/handlers/RegionHandler.java @@ -20,7 +20,7 @@ package com.volmit.iris.util.decree.handlers; import com.volmit.iris.Iris; import com.volmit.iris.core.loader.IrisData; -import com.volmit.iris.engine.object.regional.IrisRegion; +import com.volmit.iris.engine.object.IrisRegion; import com.volmit.iris.util.collection.KList; import com.volmit.iris.util.collection.KMap; import com.volmit.iris.util.decree.DecreeParameterHandler; diff --git a/src/main/java/com/volmit/iris/util/decree/handlers/ScriptHandler.java b/src/main/java/com/volmit/iris/util/decree/handlers/ScriptHandler.java index 895fe8e52..b09c6bb5f 100644 --- a/src/main/java/com/volmit/iris/util/decree/handlers/ScriptHandler.java +++ b/src/main/java/com/volmit/iris/util/decree/handlers/ScriptHandler.java @@ -20,7 +20,7 @@ package com.volmit.iris.util.decree.handlers; import com.volmit.iris.Iris; import com.volmit.iris.core.loader.IrisData; -import com.volmit.iris.engine.object.common.IrisScript; +import com.volmit.iris.engine.object.IrisScript; import com.volmit.iris.util.collection.KList; import com.volmit.iris.util.collection.KMap; import com.volmit.iris.util.decree.DecreeParameterHandler; diff --git a/src/main/java/com/volmit/iris/util/hunk/Hunk.java b/src/main/java/com/volmit/iris/util/hunk/Hunk.java index e5b0cff02..de8e6d359 100644 --- a/src/main/java/com/volmit/iris/util/hunk/Hunk.java +++ b/src/main/java/com/volmit/iris/util/hunk/Hunk.java @@ -18,7 +18,7 @@ package com.volmit.iris.util.hunk; -import com.volmit.iris.engine.object.basic.IrisPosition; +import com.volmit.iris.engine.object.IrisPosition; import com.volmit.iris.util.collection.KList; import com.volmit.iris.util.function.*; import com.volmit.iris.util.hunk.storage.*; diff --git a/src/main/java/com/volmit/iris/util/interpolation/IrisInterpolation.java b/src/main/java/com/volmit/iris/util/interpolation/IrisInterpolation.java index eddfb304f..2c581486c 100644 --- a/src/main/java/com/volmit/iris/util/interpolation/IrisInterpolation.java +++ b/src/main/java/com/volmit/iris/util/interpolation/IrisInterpolation.java @@ -19,7 +19,7 @@ package com.volmit.iris.util.interpolation; import com.google.common.util.concurrent.AtomicDouble; -import com.volmit.iris.engine.object.noise.NoiseStyle; +import com.volmit.iris.engine.object.NoiseStyle; import com.volmit.iris.util.function.NoiseProvider; import com.volmit.iris.util.function.NoiseProvider3; import com.volmit.iris.util.hunk.Hunk; diff --git a/src/main/java/com/volmit/iris/util/mantle/Mantle.java b/src/main/java/com/volmit/iris/util/mantle/Mantle.java index 225ea2f42..bc69b1503 100644 --- a/src/main/java/com/volmit/iris/util/mantle/Mantle.java +++ b/src/main/java/com/volmit/iris/util/mantle/Mantle.java @@ -22,7 +22,7 @@ import com.volmit.iris.Iris; import com.volmit.iris.engine.data.cache.Cache; import com.volmit.iris.engine.mantle.EngineMantle; import com.volmit.iris.engine.mantle.MantleWriter; -import com.volmit.iris.engine.object.feature.IrisFeaturePositional; +import com.volmit.iris.engine.object.IrisFeaturePositional; import com.volmit.iris.util.collection.KMap; import com.volmit.iris.util.collection.KSet; import com.volmit.iris.util.documentation.BlockCoordinates; diff --git a/src/main/java/com/volmit/iris/util/mantle/MantleChunk.java b/src/main/java/com/volmit/iris/util/mantle/MantleChunk.java index 49110f47e..896961e9b 100644 --- a/src/main/java/com/volmit/iris/util/mantle/MantleChunk.java +++ b/src/main/java/com/volmit/iris/util/mantle/MantleChunk.java @@ -18,7 +18,7 @@ package com.volmit.iris.util.mantle; -import com.volmit.iris.engine.object.feature.IrisFeaturePositional; +import com.volmit.iris.engine.object.IrisFeaturePositional; import com.volmit.iris.util.documentation.ChunkCoordinates; import com.volmit.iris.util.function.Consumer4; import com.volmit.iris.util.matter.IrisMatter; diff --git a/src/main/java/com/volmit/iris/util/math/AxisAlignedBB.java b/src/main/java/com/volmit/iris/util/math/AxisAlignedBB.java index 9d46bab81..10603e5ac 100644 --- a/src/main/java/com/volmit/iris/util/math/AxisAlignedBB.java +++ b/src/main/java/com/volmit/iris/util/math/AxisAlignedBB.java @@ -18,7 +18,7 @@ package com.volmit.iris.util.math; -import com.volmit.iris.engine.object.basic.IrisPosition; +import com.volmit.iris.engine.object.IrisPosition; import com.volmit.iris.util.data.Cuboid; import org.bukkit.World; import org.bukkit.util.BlockVector; diff --git a/src/main/java/com/volmit/iris/util/math/Position2.java b/src/main/java/com/volmit/iris/util/math/Position2.java index 4d1b9fc28..279d5076f 100644 --- a/src/main/java/com/volmit/iris/util/math/Position2.java +++ b/src/main/java/com/volmit/iris/util/math/Position2.java @@ -18,7 +18,7 @@ package com.volmit.iris.util.math; -import com.volmit.iris.engine.object.basic.IrisPosition; +import com.volmit.iris.engine.object.IrisPosition; import org.bukkit.util.Vector; public class Position2 { diff --git a/src/main/java/com/volmit/iris/util/matter/Matter.java b/src/main/java/com/volmit/iris/util/matter/Matter.java index fdf7f2a5f..893eaef54 100644 --- a/src/main/java/com/volmit/iris/util/matter/Matter.java +++ b/src/main/java/com/volmit/iris/util/matter/Matter.java @@ -18,7 +18,7 @@ package com.volmit.iris.util.matter; -import com.volmit.iris.engine.object.basic.IrisPosition; +import com.volmit.iris.engine.object.IrisPosition; import com.volmit.iris.util.collection.KSet; import com.volmit.iris.util.data.Varint; import com.volmit.iris.util.hunk.Hunk; diff --git a/src/main/java/com/volmit/iris/util/matter/slices/BiomeMatter.java b/src/main/java/com/volmit/iris/util/matter/slices/BiomeMatter.java index fa176e897..520a0206c 100644 --- a/src/main/java/com/volmit/iris/util/matter/slices/BiomeMatter.java +++ b/src/main/java/com/volmit/iris/util/matter/slices/BiomeMatter.java @@ -18,7 +18,7 @@ package com.volmit.iris.util.matter.slices; -import com.volmit.iris.engine.object.biome.IrisBiome; +import com.volmit.iris.engine.object.IrisBiome; import com.volmit.iris.util.matter.Sliced; @Sliced diff --git a/src/main/java/com/volmit/iris/util/matter/slices/EntityMatter.java b/src/main/java/com/volmit/iris/util/matter/slices/EntityMatter.java index 03ea0a713..78aaa4005 100644 --- a/src/main/java/com/volmit/iris/util/matter/slices/EntityMatter.java +++ b/src/main/java/com/volmit/iris/util/matter/slices/EntityMatter.java @@ -19,7 +19,7 @@ package com.volmit.iris.util.matter.slices; import com.volmit.iris.core.nms.INMS; -import com.volmit.iris.engine.object.basic.IrisPosition; +import com.volmit.iris.engine.object.IrisPosition; import com.volmit.iris.util.collection.KList; import com.volmit.iris.util.collection.KMap; import com.volmit.iris.util.data.Varint; diff --git a/src/main/java/com/volmit/iris/util/matter/slices/SpawnerMatter.java b/src/main/java/com/volmit/iris/util/matter/slices/SpawnerMatter.java index ed05b225f..473b2a847 100644 --- a/src/main/java/com/volmit/iris/util/matter/slices/SpawnerMatter.java +++ b/src/main/java/com/volmit/iris/util/matter/slices/SpawnerMatter.java @@ -18,7 +18,7 @@ package com.volmit.iris.util.matter.slices; -import com.volmit.iris.engine.object.spawners.IrisSpawner; +import com.volmit.iris.engine.object.IrisSpawner; import com.volmit.iris.util.matter.Sliced; @Sliced diff --git a/src/main/java/com/volmit/iris/util/matter/slices/ZoneMatter.java b/src/main/java/com/volmit/iris/util/matter/slices/ZoneMatter.java index 6201b08f1..79cbacbd4 100644 --- a/src/main/java/com/volmit/iris/util/matter/slices/ZoneMatter.java +++ b/src/main/java/com/volmit/iris/util/matter/slices/ZoneMatter.java @@ -18,7 +18,7 @@ package com.volmit.iris.util.matter.slices; -import com.volmit.iris.engine.object.feature.IrisFeaturePositional; +import com.volmit.iris.engine.object.IrisFeaturePositional; import com.volmit.iris.util.matter.Sliced; import java.io.DataInputStream; diff --git a/src/main/java/com/volmit/iris/util/noise/CNG.java b/src/main/java/com/volmit/iris/util/noise/CNG.java index d8a70e8f8..20a657190 100644 --- a/src/main/java/com/volmit/iris/util/noise/CNG.java +++ b/src/main/java/com/volmit/iris/util/noise/CNG.java @@ -19,7 +19,7 @@ package com.volmit.iris.util.noise; import com.volmit.iris.Iris; -import com.volmit.iris.engine.object.common.IRare; +import com.volmit.iris.engine.object.IRare; import com.volmit.iris.util.collection.KList; import com.volmit.iris.util.function.NoiseInjector; import com.volmit.iris.util.interpolation.IrisInterpolation; diff --git a/src/main/java/com/volmit/iris/util/noise/ExpressionNoise.java b/src/main/java/com/volmit/iris/util/noise/ExpressionNoise.java index e7589dc69..da8d37aa4 100644 --- a/src/main/java/com/volmit/iris/util/noise/ExpressionNoise.java +++ b/src/main/java/com/volmit/iris/util/noise/ExpressionNoise.java @@ -18,7 +18,7 @@ package com.volmit.iris.util.noise; -import com.volmit.iris.engine.object.noise.IrisExpression; +import com.volmit.iris.engine.object.IrisExpression; import com.volmit.iris.util.math.RNG; public class ExpressionNoise implements NoiseGenerator { diff --git a/src/main/java/com/volmit/iris/util/noise/RarityCellGenerator.java b/src/main/java/com/volmit/iris/util/noise/RarityCellGenerator.java index 37770ff9a..2f5e85a90 100644 --- a/src/main/java/com/volmit/iris/util/noise/RarityCellGenerator.java +++ b/src/main/java/com/volmit/iris/util/noise/RarityCellGenerator.java @@ -18,7 +18,7 @@ package com.volmit.iris.util.noise; -import com.volmit.iris.engine.object.common.IRare; +import com.volmit.iris.engine.object.IRare; import com.volmit.iris.util.collection.KList; import com.volmit.iris.util.math.RNG; diff --git a/src/main/java/com/volmit/iris/util/stream/ProceduralStream.java b/src/main/java/com/volmit/iris/util/stream/ProceduralStream.java index 3ba8ebb41..ac082a688 100644 --- a/src/main/java/com/volmit/iris/util/stream/ProceduralStream.java +++ b/src/main/java/com/volmit/iris/util/stream/ProceduralStream.java @@ -20,8 +20,8 @@ package com.volmit.iris.util.stream; import com.volmit.iris.Iris; import com.volmit.iris.core.loader.IrisData; -import com.volmit.iris.engine.object.common.IRare; -import com.volmit.iris.engine.object.noise.IrisStyledRange; +import com.volmit.iris.engine.object.IRare; +import com.volmit.iris.engine.object.IrisStyledRange; import com.volmit.iris.util.collection.KList; import com.volmit.iris.util.function.Function2; import com.volmit.iris.util.function.Function3; diff --git a/src/main/java/com/volmit/iris/util/stream/interpolation/Interpolated.java b/src/main/java/com/volmit/iris/util/stream/interpolation/Interpolated.java index 7a50ffcf1..98926a51a 100644 --- a/src/main/java/com/volmit/iris/util/stream/interpolation/Interpolated.java +++ b/src/main/java/com/volmit/iris/util/stream/interpolation/Interpolated.java @@ -18,7 +18,7 @@ package com.volmit.iris.util.stream.interpolation; -import com.volmit.iris.engine.object.common.CaveResult; +import com.volmit.iris.engine.object.CaveResult; import com.volmit.iris.util.collection.KList; import com.volmit.iris.util.math.RNG; import com.volmit.iris.util.stream.ProceduralStream;