diff --git a/src/main/java/com/volmit/iris/Iris.java b/src/main/java/com/volmit/iris/Iris.java index a71057b80..243615f99 100644 --- a/src/main/java/com/volmit/iris/Iris.java +++ b/src/main/java/com/volmit/iris/Iris.java @@ -18,19 +18,19 @@ package com.volmit.iris; -import com.volmit.iris.manager.*; -import com.volmit.iris.manager.command.CommandIris; -import com.volmit.iris.manager.command.PermissionIris; -import com.volmit.iris.manager.command.world.CommandLocate; -import com.volmit.iris.manager.link.BKLink; -import com.volmit.iris.manager.link.CitizensLink; -import com.volmit.iris.manager.link.MultiverseCoreLink; -import com.volmit.iris.manager.link.MythicMobsLink; -import com.volmit.iris.nms.INMS; -import com.volmit.iris.object.IrisCompat; -import com.volmit.iris.object.IrisDimension; -import com.volmit.iris.scaffold.IrisWorlds; -import com.volmit.iris.scaffold.engine.EngineCompositeGenerator; +import com.volmit.iris.core.*; +import com.volmit.iris.core.command.CommandIris; +import com.volmit.iris.core.command.PermissionIris; +import com.volmit.iris.core.command.world.CommandLocate; +import com.volmit.iris.core.link.BKLink; +import com.volmit.iris.core.link.CitizensLink; +import com.volmit.iris.core.link.MultiverseCoreLink; +import com.volmit.iris.core.link.MythicMobsLink; +import com.volmit.iris.core.nms.INMS; +import com.volmit.iris.engine.object.IrisCompat; +import com.volmit.iris.engine.object.IrisDimension; +import com.volmit.iris.engine.IrisWorlds; +import com.volmit.iris.engine.framework.EngineCompositeGenerator; import com.volmit.iris.util.*; import io.papermc.lib.PaperLib; import org.bukkit.Bukkit; diff --git a/src/main/java/com/volmit/iris/manager/ConversionManager.java b/src/main/java/com/volmit/iris/core/ConversionManager.java similarity index 96% rename from src/main/java/com/volmit/iris/manager/ConversionManager.java rename to src/main/java/com/volmit/iris/core/ConversionManager.java index 2db59b34f..b32952db2 100644 --- a/src/main/java/com/volmit/iris/manager/ConversionManager.java +++ b/src/main/java/com/volmit/iris/core/ConversionManager.java @@ -16,17 +16,17 @@ * along with this program. If not, see . */ -package com.volmit.iris.manager; +package com.volmit.iris.core; import com.google.gson.Gson; import com.volmit.iris.Iris; -import com.volmit.iris.object.*; -import com.volmit.iris.pregen.DirectWorldWriter; -import com.volmit.iris.scaffold.data.nbt.io.NBTUtil; -import com.volmit.iris.scaffold.data.nbt.io.NamedTag; -import com.volmit.iris.scaffold.data.nbt.tag.CompoundTag; -import com.volmit.iris.scaffold.data.nbt.tag.IntTag; -import com.volmit.iris.scaffold.data.nbt.tag.ListTag; +import com.volmit.iris.engine.object.*; +import com.volmit.iris.engine.data.DirectWorldWriter; +import com.volmit.iris.engine.data.nbt.io.NBTUtil; +import com.volmit.iris.engine.data.nbt.io.NamedTag; +import com.volmit.iris.engine.data.nbt.tag.CompoundTag; +import com.volmit.iris.engine.data.nbt.tag.IntTag; +import com.volmit.iris.engine.data.nbt.tag.ListTag; import com.volmit.iris.util.*; import org.bukkit.Bukkit; import org.bukkit.Material; diff --git a/src/main/java/com/volmit/iris/manager/EditManager.java b/src/main/java/com/volmit/iris/core/EditManager.java similarity index 93% rename from src/main/java/com/volmit/iris/manager/EditManager.java rename to src/main/java/com/volmit/iris/core/EditManager.java index e55815174..c536f36fa 100644 --- a/src/main/java/com/volmit/iris/manager/EditManager.java +++ b/src/main/java/com/volmit/iris/core/EditManager.java @@ -16,13 +16,12 @@ * along with this program. If not, see . */ -package com.volmit.iris.manager; +package com.volmit.iris.core; import com.volmit.iris.Iris; -import com.volmit.iris.IrisSettings; -import com.volmit.iris.manager.edit.BlockEditor; -import com.volmit.iris.manager.edit.BukkitBlockEditor; -import com.volmit.iris.manager.edit.WEBlockEditor; +import com.volmit.iris.core.edit.BlockEditor; +import com.volmit.iris.core.edit.BukkitBlockEditor; +import com.volmit.iris.core.edit.WEBlockEditor; import com.volmit.iris.util.KMap; import com.volmit.iris.util.M; import io.papermc.lib.PaperLib; diff --git a/src/main/java/com/volmit/iris/manager/IrisBoardManager.java b/src/main/java/com/volmit/iris/core/IrisBoardManager.java similarity index 96% rename from src/main/java/com/volmit/iris/manager/IrisBoardManager.java rename to src/main/java/com/volmit/iris/core/IrisBoardManager.java index 2c42115ec..d2cacb2c7 100644 --- a/src/main/java/com/volmit/iris/manager/IrisBoardManager.java +++ b/src/main/java/com/volmit/iris/core/IrisBoardManager.java @@ -16,12 +16,12 @@ * along with this program. If not, see . */ -package com.volmit.iris.manager; +package com.volmit.iris.core; import com.volmit.iris.Iris; -import com.volmit.iris.scaffold.IrisWorlds; -import com.volmit.iris.scaffold.engine.Engine; -import com.volmit.iris.scaffold.engine.IrisAccess; +import com.volmit.iris.engine.IrisWorlds; +import com.volmit.iris.engine.framework.Engine; +import com.volmit.iris.engine.framework.IrisAccess; import com.volmit.iris.util.*; import org.bukkit.World; import org.bukkit.entity.Player; diff --git a/src/main/java/com/volmit/iris/manager/IrisDataManager.java b/src/main/java/com/volmit/iris/core/IrisDataManager.java similarity index 99% rename from src/main/java/com/volmit/iris/manager/IrisDataManager.java rename to src/main/java/com/volmit/iris/core/IrisDataManager.java index 169556bd8..b0f15949a 100644 --- a/src/main/java/com/volmit/iris/manager/IrisDataManager.java +++ b/src/main/java/com/volmit/iris/core/IrisDataManager.java @@ -16,10 +16,10 @@ * along with this program. If not, see . */ -package com.volmit.iris.manager; +package com.volmit.iris.core; import com.volmit.iris.Iris; -import com.volmit.iris.object.*; +import com.volmit.iris.engine.object.*; import com.volmit.iris.util.ObjectResourceLoader; import com.volmit.iris.util.RNG; import com.volmit.iris.util.ResourceLoader; diff --git a/src/main/java/com/volmit/iris/manager/IrisProject.java b/src/main/java/com/volmit/iris/core/IrisProject.java similarity index 98% rename from src/main/java/com/volmit/iris/manager/IrisProject.java rename to src/main/java/com/volmit/iris/core/IrisProject.java index 152be8a59..450ee2194 100644 --- a/src/main/java/com/volmit/iris/manager/IrisProject.java +++ b/src/main/java/com/volmit/iris/core/IrisProject.java @@ -16,18 +16,17 @@ * along with this program. If not, see . */ -package com.volmit.iris.manager; +package com.volmit.iris.core; import com.google.gson.Gson; import com.volmit.iris.Iris; -import com.volmit.iris.IrisSettings; -import com.volmit.iris.manager.report.Report; -import com.volmit.iris.manager.report.ReportType; -import com.volmit.iris.nms.INMS; -import com.volmit.iris.object.*; -import com.volmit.iris.scaffold.IrisWorldCreator; -import com.volmit.iris.scaffold.engine.Engine; -import com.volmit.iris.scaffold.engine.IrisAccess; +import com.volmit.iris.core.report.Report; +import com.volmit.iris.core.report.ReportType; +import com.volmit.iris.core.nms.INMS; +import com.volmit.iris.engine.object.*; +import com.volmit.iris.engine.IrisWorldCreator; +import com.volmit.iris.engine.framework.Engine; +import com.volmit.iris.engine.framework.IrisAccess; import com.volmit.iris.util.*; import lombok.Data; import net.md_5.bungee.api.ChatMessageType; diff --git a/src/main/java/com/volmit/iris/IrisSettings.java b/src/main/java/com/volmit/iris/core/IrisSettings.java similarity index 99% rename from src/main/java/com/volmit/iris/IrisSettings.java rename to src/main/java/com/volmit/iris/core/IrisSettings.java index b8cbfa48d..50a299045 100644 --- a/src/main/java/com/volmit/iris/IrisSettings.java +++ b/src/main/java/com/volmit/iris/core/IrisSettings.java @@ -16,9 +16,10 @@ * along with this program. If not, see . */ -package com.volmit.iris; +package com.volmit.iris.core; import com.google.gson.Gson; +import com.volmit.iris.Iris; import com.volmit.iris.util.*; import lombok.Data; diff --git a/src/main/java/com/volmit/iris/manager/ProjectManager.java b/src/main/java/com/volmit/iris/core/ProjectManager.java similarity index 98% rename from src/main/java/com/volmit/iris/manager/ProjectManager.java rename to src/main/java/com/volmit/iris/core/ProjectManager.java index 0297c6464..38d6cb80e 100644 --- a/src/main/java/com/volmit/iris/manager/ProjectManager.java +++ b/src/main/java/com/volmit/iris/core/ProjectManager.java @@ -16,14 +16,13 @@ * along with this program. If not, see . */ -package com.volmit.iris.manager; +package com.volmit.iris.core; import com.google.gson.Gson; import com.google.gson.JsonSyntaxException; import com.volmit.iris.Iris; -import com.volmit.iris.IrisSettings; -import com.volmit.iris.object.IrisDimension; -import com.volmit.iris.scaffold.cache.AtomicCache; +import com.volmit.iris.engine.object.IrisDimension; +import com.volmit.iris.engine.cache.AtomicCache; import com.volmit.iris.util.*; import lombok.Data; import org.zeroturnaround.zip.ZipUtil; diff --git a/src/main/java/com/volmit/iris/manager/SchemaBuilder.java b/src/main/java/com/volmit/iris/core/SchemaBuilder.java similarity index 99% rename from src/main/java/com/volmit/iris/manager/SchemaBuilder.java rename to src/main/java/com/volmit/iris/core/SchemaBuilder.java index 8887994c3..2d1e269d7 100644 --- a/src/main/java/com/volmit/iris/manager/SchemaBuilder.java +++ b/src/main/java/com/volmit/iris/core/SchemaBuilder.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.manager; +package com.volmit.iris.core; import com.volmit.iris.Iris; import com.volmit.iris.util.*; diff --git a/src/main/java/com/volmit/iris/manager/WandManager.java b/src/main/java/com/volmit/iris/core/WandManager.java similarity index 98% rename from src/main/java/com/volmit/iris/manager/WandManager.java rename to src/main/java/com/volmit/iris/core/WandManager.java index 3c82f6c0c..4afe29fd0 100644 --- a/src/main/java/com/volmit/iris/manager/WandManager.java +++ b/src/main/java/com/volmit/iris/core/WandManager.java @@ -16,11 +16,11 @@ * along with this program. If not, see . */ -package com.volmit.iris.manager; +package com.volmit.iris.core; import com.volmit.iris.Iris; -import com.volmit.iris.manager.edit.DustRevealer; -import com.volmit.iris.object.IrisObject; +import com.volmit.iris.core.edit.DustRevealer; +import com.volmit.iris.engine.object.IrisObject; import com.volmit.iris.util.*; import org.bukkit.*; import org.bukkit.block.Block; diff --git a/src/main/java/com/volmit/iris/manager/command/CommandIris.java b/src/main/java/com/volmit/iris/core/command/CommandIris.java similarity index 86% rename from src/main/java/com/volmit/iris/manager/command/CommandIris.java rename to src/main/java/com/volmit/iris/core/command/CommandIris.java index 02bd9c00e..822b22986 100644 --- a/src/main/java/com/volmit/iris/manager/command/CommandIris.java +++ b/src/main/java/com/volmit/iris/core/command/CommandIris.java @@ -16,14 +16,14 @@ * along with this program. If not, see . */ -package com.volmit.iris.manager.command; +package com.volmit.iris.core.command; import com.volmit.iris.Iris; -import com.volmit.iris.manager.command.jigsaw.CommandIrisJigsaw; -import com.volmit.iris.manager.command.object.CommandIrisObject; -import com.volmit.iris.manager.command.studio.CommandIrisStudio; -import com.volmit.iris.manager.command.what.CommandIrisWhat; -import com.volmit.iris.manager.command.world.*; +import com.volmit.iris.core.command.jigsaw.CommandIrisJigsaw; +import com.volmit.iris.core.command.object.CommandIrisObject; +import com.volmit.iris.core.command.studio.CommandIrisStudio; +import com.volmit.iris.core.command.what.CommandIrisWhat; +import com.volmit.iris.core.command.world.*; import com.volmit.iris.util.Command; import com.volmit.iris.util.KList; import com.volmit.iris.util.MortarCommand; diff --git a/src/main/java/com/volmit/iris/manager/command/CommandIrisDownload.java b/src/main/java/com/volmit/iris/core/command/CommandIrisDownload.java similarity index 97% rename from src/main/java/com/volmit/iris/manager/command/CommandIrisDownload.java rename to src/main/java/com/volmit/iris/core/command/CommandIrisDownload.java index bdecd724b..cfa27342e 100644 --- a/src/main/java/com/volmit/iris/manager/command/CommandIrisDownload.java +++ b/src/main/java/com/volmit/iris/core/command/CommandIrisDownload.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.manager.command; +package com.volmit.iris.core.command; import com.volmit.iris.Iris; import com.volmit.iris.util.*; diff --git a/src/main/java/com/volmit/iris/manager/command/CommandIrisMetrics.java b/src/main/java/com/volmit/iris/core/command/CommandIrisMetrics.java similarity index 94% rename from src/main/java/com/volmit/iris/manager/command/CommandIrisMetrics.java rename to src/main/java/com/volmit/iris/core/command/CommandIrisMetrics.java index dead98f7a..272d0b9ed 100644 --- a/src/main/java/com/volmit/iris/manager/command/CommandIrisMetrics.java +++ b/src/main/java/com/volmit/iris/core/command/CommandIrisMetrics.java @@ -16,11 +16,11 @@ * along with this program. If not, see . */ -package com.volmit.iris.manager.command; +package com.volmit.iris.core.command; import com.volmit.iris.Iris; -import com.volmit.iris.scaffold.IrisWorlds; -import com.volmit.iris.scaffold.engine.IrisAccess; +import com.volmit.iris.engine.IrisWorlds; +import com.volmit.iris.engine.framework.IrisAccess; import com.volmit.iris.util.KList; import com.volmit.iris.util.MortarCommand; import com.volmit.iris.util.MortarSender; diff --git a/src/main/java/com/volmit/iris/manager/command/CommandIrisReload.java b/src/main/java/com/volmit/iris/core/command/CommandIrisReload.java similarity index 97% rename from src/main/java/com/volmit/iris/manager/command/CommandIrisReload.java rename to src/main/java/com/volmit/iris/core/command/CommandIrisReload.java index 64f4b4589..6e60302c0 100644 --- a/src/main/java/com/volmit/iris/manager/command/CommandIrisReload.java +++ b/src/main/java/com/volmit/iris/core/command/CommandIrisReload.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.manager.command; +package com.volmit.iris.core.command; import com.volmit.iris.Iris; import com.volmit.iris.IrisSettings; diff --git a/src/main/java/com/volmit/iris/manager/command/CommandIrisUpdateProject.java b/src/main/java/com/volmit/iris/core/command/CommandIrisUpdateProject.java similarity index 97% rename from src/main/java/com/volmit/iris/manager/command/CommandIrisUpdateProject.java rename to src/main/java/com/volmit/iris/core/command/CommandIrisUpdateProject.java index ed0f450e0..62c5632fa 100644 --- a/src/main/java/com/volmit/iris/manager/command/CommandIrisUpdateProject.java +++ b/src/main/java/com/volmit/iris/core/command/CommandIrisUpdateProject.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.manager.command; +package com.volmit.iris.core.command; import com.volmit.iris.Iris; import com.volmit.iris.util.*; diff --git a/src/main/java/com/volmit/iris/manager/command/PermissionIris.java b/src/main/java/com/volmit/iris/core/command/PermissionIris.java similarity index 96% rename from src/main/java/com/volmit/iris/manager/command/PermissionIris.java rename to src/main/java/com/volmit/iris/core/command/PermissionIris.java index c0065c85e..37f4b454b 100644 --- a/src/main/java/com/volmit/iris/manager/command/PermissionIris.java +++ b/src/main/java/com/volmit/iris/core/command/PermissionIris.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.manager.command; +package com.volmit.iris.core.command; import com.volmit.iris.util.MortarPermission; import com.volmit.iris.util.Permission; diff --git a/src/main/java/com/volmit/iris/manager/command/PermissionIrisStudio.java b/src/main/java/com/volmit/iris/core/command/PermissionIrisStudio.java similarity index 96% rename from src/main/java/com/volmit/iris/manager/command/PermissionIrisStudio.java rename to src/main/java/com/volmit/iris/core/command/PermissionIrisStudio.java index 232218e7b..5aa51298a 100644 --- a/src/main/java/com/volmit/iris/manager/command/PermissionIrisStudio.java +++ b/src/main/java/com/volmit/iris/core/command/PermissionIrisStudio.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.manager.command; +package com.volmit.iris.core.command; import com.volmit.iris.util.MortarPermission; diff --git a/src/main/java/com/volmit/iris/manager/command/jigsaw/CommandIrisJigsaw.java b/src/main/java/com/volmit/iris/core/command/jigsaw/CommandIrisJigsaw.java similarity index 97% rename from src/main/java/com/volmit/iris/manager/command/jigsaw/CommandIrisJigsaw.java rename to src/main/java/com/volmit/iris/core/command/jigsaw/CommandIrisJigsaw.java index 7de096185..efb4f209a 100644 --- a/src/main/java/com/volmit/iris/manager/command/jigsaw/CommandIrisJigsaw.java +++ b/src/main/java/com/volmit/iris/core/command/jigsaw/CommandIrisJigsaw.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.manager.command.jigsaw; +package com.volmit.iris.core.command.jigsaw; import com.volmit.iris.Iris; import com.volmit.iris.IrisSettings; diff --git a/src/main/java/com/volmit/iris/manager/command/jigsaw/CommandIrisJigsawEdit.java b/src/main/java/com/volmit/iris/core/command/jigsaw/CommandIrisJigsawEdit.java similarity index 94% rename from src/main/java/com/volmit/iris/manager/command/jigsaw/CommandIrisJigsawEdit.java rename to src/main/java/com/volmit/iris/core/command/jigsaw/CommandIrisJigsawEdit.java index 352d51e96..2ca0740db 100644 --- a/src/main/java/com/volmit/iris/manager/command/jigsaw/CommandIrisJigsawEdit.java +++ b/src/main/java/com/volmit/iris/core/command/jigsaw/CommandIrisJigsawEdit.java @@ -16,12 +16,12 @@ * along with this program. If not, see . */ -package com.volmit.iris.manager.command.jigsaw; +package com.volmit.iris.core.command.jigsaw; import com.volmit.iris.Iris; import com.volmit.iris.IrisSettings; -import com.volmit.iris.manager.IrisDataManager; -import com.volmit.iris.manager.edit.JigsawEditor; +import com.volmit.iris.core.IrisDataManager; +import com.volmit.iris.core.edit.JigsawEditor; import com.volmit.iris.object.IrisJigsawPiece; import com.volmit.iris.util.KList; import com.volmit.iris.util.MortarCommand; diff --git a/src/main/java/com/volmit/iris/manager/command/jigsaw/CommandIrisJigsawExit.java b/src/main/java/com/volmit/iris/core/command/jigsaw/CommandIrisJigsawExit.java similarity index 95% rename from src/main/java/com/volmit/iris/manager/command/jigsaw/CommandIrisJigsawExit.java rename to src/main/java/com/volmit/iris/core/command/jigsaw/CommandIrisJigsawExit.java index 20aac2247..4bdeafe7b 100644 --- a/src/main/java/com/volmit/iris/manager/command/jigsaw/CommandIrisJigsawExit.java +++ b/src/main/java/com/volmit/iris/core/command/jigsaw/CommandIrisJigsawExit.java @@ -16,11 +16,11 @@ * along with this program. If not, see . */ -package com.volmit.iris.manager.command.jigsaw; +package com.volmit.iris.core.command.jigsaw; import com.volmit.iris.Iris; import com.volmit.iris.IrisSettings; -import com.volmit.iris.manager.edit.JigsawEditor; +import com.volmit.iris.core.edit.JigsawEditor; import com.volmit.iris.util.KList; import com.volmit.iris.util.MortarCommand; import com.volmit.iris.util.MortarSender; diff --git a/src/main/java/com/volmit/iris/manager/command/jigsaw/CommandIrisJigsawNew.java b/src/main/java/com/volmit/iris/core/command/jigsaw/CommandIrisJigsawNew.java similarity index 94% rename from src/main/java/com/volmit/iris/manager/command/jigsaw/CommandIrisJigsawNew.java rename to src/main/java/com/volmit/iris/core/command/jigsaw/CommandIrisJigsawNew.java index dff3ba497..f3510b335 100644 --- a/src/main/java/com/volmit/iris/manager/command/jigsaw/CommandIrisJigsawNew.java +++ b/src/main/java/com/volmit/iris/core/command/jigsaw/CommandIrisJigsawNew.java @@ -16,12 +16,12 @@ * along with this program. If not, see . */ -package com.volmit.iris.manager.command.jigsaw; +package com.volmit.iris.core.command.jigsaw; import com.volmit.iris.Iris; import com.volmit.iris.IrisSettings; -import com.volmit.iris.manager.IrisDataManager; -import com.volmit.iris.manager.edit.JigsawEditor; +import com.volmit.iris.core.IrisDataManager; +import com.volmit.iris.core.edit.JigsawEditor; import com.volmit.iris.object.IrisObject; import com.volmit.iris.util.KList; import com.volmit.iris.util.MortarCommand; diff --git a/src/main/java/com/volmit/iris/manager/command/jigsaw/CommandIrisJigsawPlace.java b/src/main/java/com/volmit/iris/core/command/jigsaw/CommandIrisJigsawPlace.java similarity index 94% rename from src/main/java/com/volmit/iris/manager/command/jigsaw/CommandIrisJigsawPlace.java rename to src/main/java/com/volmit/iris/core/command/jigsaw/CommandIrisJigsawPlace.java index f6c736ddf..36b531970 100644 --- a/src/main/java/com/volmit/iris/manager/command/jigsaw/CommandIrisJigsawPlace.java +++ b/src/main/java/com/volmit/iris/core/command/jigsaw/CommandIrisJigsawPlace.java @@ -16,14 +16,14 @@ * along with this program. If not, see . */ -package com.volmit.iris.manager.command.jigsaw; +package com.volmit.iris.core.command.jigsaw; import com.volmit.iris.Iris; import com.volmit.iris.IrisSettings; -import com.volmit.iris.manager.IrisDataManager; +import com.volmit.iris.core.IrisDataManager; import com.volmit.iris.object.IrisJigsawStructure; import com.volmit.iris.object.IrisPosition; -import com.volmit.iris.scaffold.jigsaw.PlannedStructure; +import com.volmit.iris.engine.jigsaw.PlannedStructure; import com.volmit.iris.util.*; public class CommandIrisJigsawPlace extends MortarCommand { diff --git a/src/main/java/com/volmit/iris/manager/command/jigsaw/CommandIrisJigsawSave.java b/src/main/java/com/volmit/iris/core/command/jigsaw/CommandIrisJigsawSave.java similarity index 95% rename from src/main/java/com/volmit/iris/manager/command/jigsaw/CommandIrisJigsawSave.java rename to src/main/java/com/volmit/iris/core/command/jigsaw/CommandIrisJigsawSave.java index b9e744b1e..392b51e3b 100644 --- a/src/main/java/com/volmit/iris/manager/command/jigsaw/CommandIrisJigsawSave.java +++ b/src/main/java/com/volmit/iris/core/command/jigsaw/CommandIrisJigsawSave.java @@ -16,11 +16,11 @@ * along with this program. If not, see . */ -package com.volmit.iris.manager.command.jigsaw; +package com.volmit.iris.core.command.jigsaw; import com.volmit.iris.Iris; import com.volmit.iris.IrisSettings; -import com.volmit.iris.manager.edit.JigsawEditor; +import com.volmit.iris.core.edit.JigsawEditor; import com.volmit.iris.util.KList; import com.volmit.iris.util.MortarCommand; import com.volmit.iris.util.MortarSender; diff --git a/src/main/java/com/volmit/iris/manager/command/object/CommandIrisObject.java b/src/main/java/com/volmit/iris/core/command/object/CommandIrisObject.java similarity index 98% rename from src/main/java/com/volmit/iris/manager/command/object/CommandIrisObject.java rename to src/main/java/com/volmit/iris/core/command/object/CommandIrisObject.java index 251f7596c..7692b5b87 100644 --- a/src/main/java/com/volmit/iris/manager/command/object/CommandIrisObject.java +++ b/src/main/java/com/volmit/iris/core/command/object/CommandIrisObject.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.manager.command.object; +package com.volmit.iris.core.command.object; import com.volmit.iris.Iris; import com.volmit.iris.IrisSettings; diff --git a/src/main/java/com/volmit/iris/manager/command/object/CommandIrisObjectContract.java b/src/main/java/com/volmit/iris/core/command/object/CommandIrisObjectContract.java similarity index 96% rename from src/main/java/com/volmit/iris/manager/command/object/CommandIrisObjectContract.java rename to src/main/java/com/volmit/iris/core/command/object/CommandIrisObjectContract.java index adc8ea7e8..5b21caa68 100644 --- a/src/main/java/com/volmit/iris/manager/command/object/CommandIrisObjectContract.java +++ b/src/main/java/com/volmit/iris/core/command/object/CommandIrisObjectContract.java @@ -16,11 +16,11 @@ * along with this program. If not, see . */ -package com.volmit.iris.manager.command.object; +package com.volmit.iris.core.command.object; import com.volmit.iris.Iris; import com.volmit.iris.IrisSettings; -import com.volmit.iris.manager.WandManager; +import com.volmit.iris.core.WandManager; import com.volmit.iris.util.*; import org.bukkit.Location; import org.bukkit.Sound; diff --git a/src/main/java/com/volmit/iris/manager/command/object/CommandIrisObjectDust.java b/src/main/java/com/volmit/iris/core/command/object/CommandIrisObjectDust.java similarity index 95% rename from src/main/java/com/volmit/iris/manager/command/object/CommandIrisObjectDust.java rename to src/main/java/com/volmit/iris/core/command/object/CommandIrisObjectDust.java index 7b7942084..afaedaf61 100644 --- a/src/main/java/com/volmit/iris/manager/command/object/CommandIrisObjectDust.java +++ b/src/main/java/com/volmit/iris/core/command/object/CommandIrisObjectDust.java @@ -16,11 +16,11 @@ * along with this program. If not, see . */ -package com.volmit.iris.manager.command.object; +package com.volmit.iris.core.command.object; import com.volmit.iris.Iris; import com.volmit.iris.IrisSettings; -import com.volmit.iris.manager.WandManager; +import com.volmit.iris.core.WandManager; import com.volmit.iris.util.KList; import com.volmit.iris.util.MortarCommand; import com.volmit.iris.util.MortarSender; diff --git a/src/main/java/com/volmit/iris/manager/command/object/CommandIrisObjectExpand.java b/src/main/java/com/volmit/iris/core/command/object/CommandIrisObjectExpand.java similarity index 96% rename from src/main/java/com/volmit/iris/manager/command/object/CommandIrisObjectExpand.java rename to src/main/java/com/volmit/iris/core/command/object/CommandIrisObjectExpand.java index 89b429168..3363309ae 100644 --- a/src/main/java/com/volmit/iris/manager/command/object/CommandIrisObjectExpand.java +++ b/src/main/java/com/volmit/iris/core/command/object/CommandIrisObjectExpand.java @@ -16,11 +16,11 @@ * along with this program. If not, see . */ -package com.volmit.iris.manager.command.object; +package com.volmit.iris.core.command.object; import com.volmit.iris.Iris; import com.volmit.iris.IrisSettings; -import com.volmit.iris.manager.WandManager; +import com.volmit.iris.core.WandManager; import com.volmit.iris.util.*; import org.bukkit.Location; import org.bukkit.Sound; diff --git a/src/main/java/com/volmit/iris/manager/command/object/CommandIrisObjectP1.java b/src/main/java/com/volmit/iris/core/command/object/CommandIrisObjectP1.java similarity index 96% rename from src/main/java/com/volmit/iris/manager/command/object/CommandIrisObjectP1.java rename to src/main/java/com/volmit/iris/core/command/object/CommandIrisObjectP1.java index 9a4b71845..9fb008dd3 100644 --- a/src/main/java/com/volmit/iris/manager/command/object/CommandIrisObjectP1.java +++ b/src/main/java/com/volmit/iris/core/command/object/CommandIrisObjectP1.java @@ -16,11 +16,11 @@ * along with this program. If not, see . */ -package com.volmit.iris.manager.command.object; +package com.volmit.iris.core.command.object; import com.volmit.iris.Iris; import com.volmit.iris.IrisSettings; -import com.volmit.iris.manager.WandManager; +import com.volmit.iris.core.WandManager; import com.volmit.iris.util.KList; import com.volmit.iris.util.MortarCommand; import com.volmit.iris.util.MortarSender; diff --git a/src/main/java/com/volmit/iris/manager/command/object/CommandIrisObjectP2.java b/src/main/java/com/volmit/iris/core/command/object/CommandIrisObjectP2.java similarity index 96% rename from src/main/java/com/volmit/iris/manager/command/object/CommandIrisObjectP2.java rename to src/main/java/com/volmit/iris/core/command/object/CommandIrisObjectP2.java index 3750c55cb..5e7b38eab 100644 --- a/src/main/java/com/volmit/iris/manager/command/object/CommandIrisObjectP2.java +++ b/src/main/java/com/volmit/iris/core/command/object/CommandIrisObjectP2.java @@ -16,11 +16,11 @@ * along with this program. If not, see . */ -package com.volmit.iris.manager.command.object; +package com.volmit.iris.core.command.object; import com.volmit.iris.Iris; import com.volmit.iris.IrisSettings; -import com.volmit.iris.manager.WandManager; +import com.volmit.iris.core.WandManager; import com.volmit.iris.util.KList; import com.volmit.iris.util.MortarCommand; import com.volmit.iris.util.MortarSender; diff --git a/src/main/java/com/volmit/iris/manager/command/object/CommandIrisObjectPaste.java b/src/main/java/com/volmit/iris/core/command/object/CommandIrisObjectPaste.java similarity index 95% rename from src/main/java/com/volmit/iris/manager/command/object/CommandIrisObjectPaste.java rename to src/main/java/com/volmit/iris/core/command/object/CommandIrisObjectPaste.java index 3c5f32fac..735c5900d 100644 --- a/src/main/java/com/volmit/iris/manager/command/object/CommandIrisObjectPaste.java +++ b/src/main/java/com/volmit/iris/core/command/object/CommandIrisObjectPaste.java @@ -16,13 +16,13 @@ * along with this program. If not, see . */ -package com.volmit.iris.manager.command.object; +package com.volmit.iris.core.command.object; import com.volmit.iris.Iris; import com.volmit.iris.IrisSettings; -import com.volmit.iris.manager.IrisDataManager; -import com.volmit.iris.manager.ProjectManager; -import com.volmit.iris.manager.WandManager; +import com.volmit.iris.core.IrisDataManager; +import com.volmit.iris.core.ProjectManager; +import com.volmit.iris.core.WandManager; import com.volmit.iris.object.IrisObject; import com.volmit.iris.util.KList; import com.volmit.iris.util.MortarCommand; diff --git a/src/main/java/com/volmit/iris/manager/command/object/CommandIrisObjectSave.java b/src/main/java/com/volmit/iris/core/command/object/CommandIrisObjectSave.java similarity index 97% rename from src/main/java/com/volmit/iris/manager/command/object/CommandIrisObjectSave.java rename to src/main/java/com/volmit/iris/core/command/object/CommandIrisObjectSave.java index e31de69d4..35a4ae1ae 100644 --- a/src/main/java/com/volmit/iris/manager/command/object/CommandIrisObjectSave.java +++ b/src/main/java/com/volmit/iris/core/command/object/CommandIrisObjectSave.java @@ -16,11 +16,11 @@ * along with this program. If not, see . */ -package com.volmit.iris.manager.command.object; +package com.volmit.iris.core.command.object; import com.volmit.iris.Iris; import com.volmit.iris.IrisSettings; -import com.volmit.iris.manager.WandManager; +import com.volmit.iris.core.WandManager; import com.volmit.iris.object.IrisObject; import com.volmit.iris.util.KList; import com.volmit.iris.util.MortarCommand; diff --git a/src/main/java/com/volmit/iris/manager/command/object/CommandIrisObjectShift.java b/src/main/java/com/volmit/iris/core/command/object/CommandIrisObjectShift.java similarity index 96% rename from src/main/java/com/volmit/iris/manager/command/object/CommandIrisObjectShift.java rename to src/main/java/com/volmit/iris/core/command/object/CommandIrisObjectShift.java index 07f53aaa0..a299cdf98 100644 --- a/src/main/java/com/volmit/iris/manager/command/object/CommandIrisObjectShift.java +++ b/src/main/java/com/volmit/iris/core/command/object/CommandIrisObjectShift.java @@ -16,11 +16,11 @@ * along with this program. If not, see . */ -package com.volmit.iris.manager.command.object; +package com.volmit.iris.core.command.object; import com.volmit.iris.Iris; import com.volmit.iris.IrisSettings; -import com.volmit.iris.manager.WandManager; +import com.volmit.iris.core.WandManager; import com.volmit.iris.util.*; import org.bukkit.Location; import org.bukkit.Sound; diff --git a/src/main/java/com/volmit/iris/manager/command/object/CommandIrisObjectWand.java b/src/main/java/com/volmit/iris/core/command/object/CommandIrisObjectWand.java similarity index 95% rename from src/main/java/com/volmit/iris/manager/command/object/CommandIrisObjectWand.java rename to src/main/java/com/volmit/iris/core/command/object/CommandIrisObjectWand.java index 1afc5450b..13c67734f 100644 --- a/src/main/java/com/volmit/iris/manager/command/object/CommandIrisObjectWand.java +++ b/src/main/java/com/volmit/iris/core/command/object/CommandIrisObjectWand.java @@ -16,11 +16,11 @@ * along with this program. If not, see . */ -package com.volmit.iris.manager.command.object; +package com.volmit.iris.core.command.object; import com.volmit.iris.Iris; import com.volmit.iris.IrisSettings; -import com.volmit.iris.manager.WandManager; +import com.volmit.iris.core.WandManager; import com.volmit.iris.util.KList; import com.volmit.iris.util.MortarCommand; import com.volmit.iris.util.MortarSender; diff --git a/src/main/java/com/volmit/iris/manager/command/object/CommandIrisObjectXAY.java b/src/main/java/com/volmit/iris/core/command/object/CommandIrisObjectXAY.java similarity index 97% rename from src/main/java/com/volmit/iris/manager/command/object/CommandIrisObjectXAY.java rename to src/main/java/com/volmit/iris/core/command/object/CommandIrisObjectXAY.java index 87129e8d8..f90843d66 100644 --- a/src/main/java/com/volmit/iris/manager/command/object/CommandIrisObjectXAY.java +++ b/src/main/java/com/volmit/iris/core/command/object/CommandIrisObjectXAY.java @@ -16,11 +16,11 @@ * along with this program. If not, see . */ -package com.volmit.iris.manager.command.object; +package com.volmit.iris.core.command.object; import com.volmit.iris.Iris; import com.volmit.iris.IrisSettings; -import com.volmit.iris.manager.WandManager; +import com.volmit.iris.core.WandManager; import com.volmit.iris.util.Cuboid; import com.volmit.iris.util.Cuboid.CuboidDirection; import com.volmit.iris.util.KList; diff --git a/src/main/java/com/volmit/iris/manager/command/object/CommandIrisObjectXPY.java b/src/main/java/com/volmit/iris/core/command/object/CommandIrisObjectXPY.java similarity index 97% rename from src/main/java/com/volmit/iris/manager/command/object/CommandIrisObjectXPY.java rename to src/main/java/com/volmit/iris/core/command/object/CommandIrisObjectXPY.java index db19986ec..17031fa9f 100644 --- a/src/main/java/com/volmit/iris/manager/command/object/CommandIrisObjectXPY.java +++ b/src/main/java/com/volmit/iris/core/command/object/CommandIrisObjectXPY.java @@ -16,11 +16,11 @@ * along with this program. If not, see . */ -package com.volmit.iris.manager.command.object; +package com.volmit.iris.core.command.object; import com.volmit.iris.Iris; import com.volmit.iris.IrisSettings; -import com.volmit.iris.manager.WandManager; +import com.volmit.iris.core.WandManager; import com.volmit.iris.util.Cuboid; import com.volmit.iris.util.Cuboid.CuboidDirection; import com.volmit.iris.util.KList; diff --git a/src/main/java/com/volmit/iris/manager/command/studio/CommandIrisStudio.java b/src/main/java/com/volmit/iris/core/command/studio/CommandIrisStudio.java similarity index 98% rename from src/main/java/com/volmit/iris/manager/command/studio/CommandIrisStudio.java rename to src/main/java/com/volmit/iris/core/command/studio/CommandIrisStudio.java index 24fb9f79a..ae7ca4faf 100644 --- a/src/main/java/com/volmit/iris/manager/command/studio/CommandIrisStudio.java +++ b/src/main/java/com/volmit/iris/core/command/studio/CommandIrisStudio.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.manager.command.studio; +package com.volmit.iris.core.command.studio; import com.volmit.iris.Iris; import com.volmit.iris.IrisSettings; diff --git a/src/main/java/com/volmit/iris/manager/command/studio/CommandIrisStudioBeautify.java b/src/main/java/com/volmit/iris/core/command/studio/CommandIrisStudioBeautify.java similarity index 98% rename from src/main/java/com/volmit/iris/manager/command/studio/CommandIrisStudioBeautify.java rename to src/main/java/com/volmit/iris/core/command/studio/CommandIrisStudioBeautify.java index c3a719d96..c2da73ac1 100644 --- a/src/main/java/com/volmit/iris/manager/command/studio/CommandIrisStudioBeautify.java +++ b/src/main/java/com/volmit/iris/core/command/studio/CommandIrisStudioBeautify.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.manager.command.studio; +package com.volmit.iris.core.command.studio; import com.volmit.iris.Iris; import com.volmit.iris.IrisSettings; diff --git a/src/main/java/com/volmit/iris/manager/command/studio/CommandIrisStudioClose.java b/src/main/java/com/volmit/iris/core/command/studio/CommandIrisStudioClose.java similarity index 98% rename from src/main/java/com/volmit/iris/manager/command/studio/CommandIrisStudioClose.java rename to src/main/java/com/volmit/iris/core/command/studio/CommandIrisStudioClose.java index de2054e00..a67e8fb1f 100644 --- a/src/main/java/com/volmit/iris/manager/command/studio/CommandIrisStudioClose.java +++ b/src/main/java/com/volmit/iris/core/command/studio/CommandIrisStudioClose.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.manager.command.studio; +package com.volmit.iris.core.command.studio; import com.volmit.iris.Iris; import com.volmit.iris.IrisSettings; diff --git a/src/main/java/com/volmit/iris/manager/command/studio/CommandIrisStudioConvert.java b/src/main/java/com/volmit/iris/core/command/studio/CommandIrisStudioConvert.java similarity index 97% rename from src/main/java/com/volmit/iris/manager/command/studio/CommandIrisStudioConvert.java rename to src/main/java/com/volmit/iris/core/command/studio/CommandIrisStudioConvert.java index 0ed3977df..26ec4d68f 100644 --- a/src/main/java/com/volmit/iris/manager/command/studio/CommandIrisStudioConvert.java +++ b/src/main/java/com/volmit/iris/core/command/studio/CommandIrisStudioConvert.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.manager.command.studio; +package com.volmit.iris.core.command.studio; import com.volmit.iris.Iris; import com.volmit.iris.IrisSettings; diff --git a/src/main/java/com/volmit/iris/manager/command/studio/CommandIrisStudioCreate.java b/src/main/java/com/volmit/iris/core/command/studio/CommandIrisStudioCreate.java similarity index 98% rename from src/main/java/com/volmit/iris/manager/command/studio/CommandIrisStudioCreate.java rename to src/main/java/com/volmit/iris/core/command/studio/CommandIrisStudioCreate.java index b51132ce3..7be9261d3 100644 --- a/src/main/java/com/volmit/iris/manager/command/studio/CommandIrisStudioCreate.java +++ b/src/main/java/com/volmit/iris/core/command/studio/CommandIrisStudioCreate.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.manager.command.studio; +package com.volmit.iris.core.command.studio; import com.volmit.iris.Iris; import com.volmit.iris.IrisSettings; diff --git a/src/main/java/com/volmit/iris/manager/command/studio/CommandIrisStudioEditBiome.java b/src/main/java/com/volmit/iris/core/command/studio/CommandIrisStudioEditBiome.java similarity index 98% rename from src/main/java/com/volmit/iris/manager/command/studio/CommandIrisStudioEditBiome.java rename to src/main/java/com/volmit/iris/core/command/studio/CommandIrisStudioEditBiome.java index 6cf5d8ffd..c53e21716 100644 --- a/src/main/java/com/volmit/iris/manager/command/studio/CommandIrisStudioEditBiome.java +++ b/src/main/java/com/volmit/iris/core/command/studio/CommandIrisStudioEditBiome.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.manager.command.studio; +package com.volmit.iris.core.command.studio; import com.volmit.iris.Iris; import com.volmit.iris.IrisSettings; diff --git a/src/main/java/com/volmit/iris/manager/command/studio/CommandIrisStudioExplorer.java b/src/main/java/com/volmit/iris/core/command/studio/CommandIrisStudioExplorer.java similarity index 95% rename from src/main/java/com/volmit/iris/manager/command/studio/CommandIrisStudioExplorer.java rename to src/main/java/com/volmit/iris/core/command/studio/CommandIrisStudioExplorer.java index 14318b49e..07b100ef6 100644 --- a/src/main/java/com/volmit/iris/manager/command/studio/CommandIrisStudioExplorer.java +++ b/src/main/java/com/volmit/iris/core/command/studio/CommandIrisStudioExplorer.java @@ -16,11 +16,11 @@ * along with this program. If not, see . */ -package com.volmit.iris.manager.command.studio; +package com.volmit.iris.core.command.studio; import com.volmit.iris.Iris; import com.volmit.iris.IrisSettings; -import com.volmit.iris.manager.gui.NoiseExplorer; +import com.volmit.iris.gui.NoiseExplorer; import com.volmit.iris.util.Command; import com.volmit.iris.util.KList; import com.volmit.iris.util.MortarCommand; diff --git a/src/main/java/com/volmit/iris/manager/command/studio/CommandIrisStudioExplorerGenerator.java b/src/main/java/com/volmit/iris/core/command/studio/CommandIrisStudioExplorerGenerator.java similarity index 95% rename from src/main/java/com/volmit/iris/manager/command/studio/CommandIrisStudioExplorerGenerator.java rename to src/main/java/com/volmit/iris/core/command/studio/CommandIrisStudioExplorerGenerator.java index a561dcaa1..70acb42dd 100644 --- a/src/main/java/com/volmit/iris/manager/command/studio/CommandIrisStudioExplorerGenerator.java +++ b/src/main/java/com/volmit/iris/core/command/studio/CommandIrisStudioExplorerGenerator.java @@ -16,12 +16,12 @@ * along with this program. If not, see . */ -package com.volmit.iris.manager.command.studio; +package com.volmit.iris.core.command.studio; import com.volmit.iris.Iris; import com.volmit.iris.IrisSettings; -import com.volmit.iris.manager.IrisDataManager; -import com.volmit.iris.manager.gui.NoiseExplorer; +import com.volmit.iris.core.IrisDataManager; +import com.volmit.iris.gui.NoiseExplorer; import com.volmit.iris.object.IrisGenerator; import com.volmit.iris.util.KList; import com.volmit.iris.util.MortarCommand; diff --git a/src/main/java/com/volmit/iris/manager/command/studio/CommandIrisStudioGoto.java b/src/main/java/com/volmit/iris/core/command/studio/CommandIrisStudioGoto.java similarity index 95% rename from src/main/java/com/volmit/iris/manager/command/studio/CommandIrisStudioGoto.java rename to src/main/java/com/volmit/iris/core/command/studio/CommandIrisStudioGoto.java index 2fdd04213..2e5e56b7d 100644 --- a/src/main/java/com/volmit/iris/manager/command/studio/CommandIrisStudioGoto.java +++ b/src/main/java/com/volmit/iris/core/command/studio/CommandIrisStudioGoto.java @@ -16,15 +16,14 @@ * along with this program. If not, see . */ -package com.volmit.iris.manager.command.studio; +package com.volmit.iris.core.command.studio; import com.volmit.iris.Iris; -import com.volmit.iris.manager.IrisDataManager; +import com.volmit.iris.core.IrisDataManager; import com.volmit.iris.object.IrisBiome; -import com.volmit.iris.object.IrisObject; import com.volmit.iris.object.IrisRegion; -import com.volmit.iris.scaffold.IrisWorlds; -import com.volmit.iris.scaffold.engine.IrisAccess; +import com.volmit.iris.engine.IrisWorlds; +import com.volmit.iris.engine.framework.IrisAccess; import com.volmit.iris.util.*; import org.bukkit.Location; import org.bukkit.World; diff --git a/src/main/java/com/volmit/iris/manager/command/studio/CommandIrisStudioHotload.java b/src/main/java/com/volmit/iris/core/command/studio/CommandIrisStudioHotload.java similarity index 96% rename from src/main/java/com/volmit/iris/manager/command/studio/CommandIrisStudioHotload.java rename to src/main/java/com/volmit/iris/core/command/studio/CommandIrisStudioHotload.java index ca8d3510e..f4cf2b995 100644 --- a/src/main/java/com/volmit/iris/manager/command/studio/CommandIrisStudioHotload.java +++ b/src/main/java/com/volmit/iris/core/command/studio/CommandIrisStudioHotload.java @@ -16,11 +16,11 @@ * along with this program. If not, see . */ -package com.volmit.iris.manager.command.studio; +package com.volmit.iris.core.command.studio; import com.volmit.iris.Iris; import com.volmit.iris.IrisSettings; -import com.volmit.iris.scaffold.IrisWorlds; +import com.volmit.iris.engine.IrisWorlds; import com.volmit.iris.util.KList; import com.volmit.iris.util.MortarCommand; import com.volmit.iris.util.MortarSender; diff --git a/src/main/java/com/volmit/iris/manager/command/studio/CommandIrisStudioLoot.java b/src/main/java/com/volmit/iris/core/command/studio/CommandIrisStudioLoot.java similarity index 96% rename from src/main/java/com/volmit/iris/manager/command/studio/CommandIrisStudioLoot.java rename to src/main/java/com/volmit/iris/core/command/studio/CommandIrisStudioLoot.java index 8fce44204..8fb00a3b1 100644 --- a/src/main/java/com/volmit/iris/manager/command/studio/CommandIrisStudioLoot.java +++ b/src/main/java/com/volmit/iris/core/command/studio/CommandIrisStudioLoot.java @@ -16,14 +16,14 @@ * along with this program. If not, see . */ -package com.volmit.iris.manager.command.studio; +package com.volmit.iris.core.command.studio; import com.volmit.iris.Iris; import com.volmit.iris.IrisSettings; import com.volmit.iris.object.InventorySlotType; import com.volmit.iris.object.IrisLootTable; -import com.volmit.iris.scaffold.IrisWorlds; -import com.volmit.iris.scaffold.engine.IrisAccess; +import com.volmit.iris.engine.IrisWorlds; +import com.volmit.iris.engine.framework.IrisAccess; import com.volmit.iris.util.*; import org.bukkit.Bukkit; import org.bukkit.entity.Player; diff --git a/src/main/java/com/volmit/iris/manager/command/studio/CommandIrisStudioMap.java b/src/main/java/com/volmit/iris/core/command/studio/CommandIrisStudioMap.java similarity index 80% rename from src/main/java/com/volmit/iris/manager/command/studio/CommandIrisStudioMap.java rename to src/main/java/com/volmit/iris/core/command/studio/CommandIrisStudioMap.java index 152350528..66b7bb6d1 100644 --- a/src/main/java/com/volmit/iris/manager/command/studio/CommandIrisStudioMap.java +++ b/src/main/java/com/volmit/iris/core/command/studio/CommandIrisStudioMap.java @@ -16,27 +16,17 @@ * along with this program. If not, see . */ -package com.volmit.iris.manager.command.studio; +package com.volmit.iris.core.command.studio; import com.volmit.iris.Iris; import com.volmit.iris.IrisSettings; -import com.volmit.iris.generator.IrisComplex; -import com.volmit.iris.generator.IrisEngine; -import com.volmit.iris.manager.IrisDataManager; -import com.volmit.iris.manager.gui.IrisVision; -import com.volmit.iris.map.MapVision; -import com.volmit.iris.object.IrisDimension; -import com.volmit.iris.scaffold.IrisWorlds; -import com.volmit.iris.scaffold.engine.Engine; -import com.volmit.iris.scaffold.engine.IrisAccess; -import com.volmit.iris.util.FakeEngine; -import com.volmit.iris.util.FakeWorld; +import com.volmit.iris.gui.IrisVision; +import com.volmit.iris.engine.IrisWorlds; +import com.volmit.iris.engine.framework.Engine; +import com.volmit.iris.engine.framework.IrisAccess; import com.volmit.iris.util.KList; import com.volmit.iris.util.MortarCommand; import com.volmit.iris.util.MortarSender; -import org.bukkit.World; - -import java.io.File; public class CommandIrisStudioMap extends MortarCommand { diff --git a/src/main/java/com/volmit/iris/manager/command/studio/CommandIrisStudioOpen.java b/src/main/java/com/volmit/iris/core/command/studio/CommandIrisStudioOpen.java similarity index 97% rename from src/main/java/com/volmit/iris/manager/command/studio/CommandIrisStudioOpen.java rename to src/main/java/com/volmit/iris/core/command/studio/CommandIrisStudioOpen.java index a3e4b597c..1b1d06678 100644 --- a/src/main/java/com/volmit/iris/manager/command/studio/CommandIrisStudioOpen.java +++ b/src/main/java/com/volmit/iris/core/command/studio/CommandIrisStudioOpen.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.manager.command.studio; +package com.volmit.iris.core.command.studio; import com.volmit.iris.Iris; import com.volmit.iris.IrisSettings; diff --git a/src/main/java/com/volmit/iris/manager/command/studio/CommandIrisStudioPackage.java b/src/main/java/com/volmit/iris/core/command/studio/CommandIrisStudioPackage.java similarity index 97% rename from src/main/java/com/volmit/iris/manager/command/studio/CommandIrisStudioPackage.java rename to src/main/java/com/volmit/iris/core/command/studio/CommandIrisStudioPackage.java index 6f372d270..c42ef0553 100644 --- a/src/main/java/com/volmit/iris/manager/command/studio/CommandIrisStudioPackage.java +++ b/src/main/java/com/volmit/iris/core/command/studio/CommandIrisStudioPackage.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.manager.command.studio; +package com.volmit.iris.core.command.studio; import com.volmit.iris.Iris; import com.volmit.iris.IrisSettings; diff --git a/src/main/java/com/volmit/iris/manager/command/studio/CommandIrisStudioProfile.java b/src/main/java/com/volmit/iris/core/command/studio/CommandIrisStudioProfile.java similarity index 97% rename from src/main/java/com/volmit/iris/manager/command/studio/CommandIrisStudioProfile.java rename to src/main/java/com/volmit/iris/core/command/studio/CommandIrisStudioProfile.java index fe0964dc3..31fc49f35 100644 --- a/src/main/java/com/volmit/iris/manager/command/studio/CommandIrisStudioProfile.java +++ b/src/main/java/com/volmit/iris/core/command/studio/CommandIrisStudioProfile.java @@ -16,13 +16,13 @@ * along with this program. If not, see . */ -package com.volmit.iris.manager.command.studio; +package com.volmit.iris.core.command.studio; import com.volmit.iris.Iris; import com.volmit.iris.IrisSettings; -import com.volmit.iris.generator.noise.CNG; -import com.volmit.iris.manager.IrisDataManager; -import com.volmit.iris.manager.IrisProject; +import com.volmit.iris.engine.noise.CNG; +import com.volmit.iris.core.IrisDataManager; +import com.volmit.iris.core.IrisProject; import com.volmit.iris.object.*; import com.volmit.iris.util.*; diff --git a/src/main/java/com/volmit/iris/manager/command/studio/CommandIrisStudioSummon.java b/src/main/java/com/volmit/iris/core/command/studio/CommandIrisStudioSummon.java similarity index 93% rename from src/main/java/com/volmit/iris/manager/command/studio/CommandIrisStudioSummon.java rename to src/main/java/com/volmit/iris/core/command/studio/CommandIrisStudioSummon.java index 7fcad75fb..870e33017 100644 --- a/src/main/java/com/volmit/iris/manager/command/studio/CommandIrisStudioSummon.java +++ b/src/main/java/com/volmit/iris/core/command/studio/CommandIrisStudioSummon.java @@ -16,14 +16,14 @@ * along with this program. If not, see . */ -package com.volmit.iris.manager.command.studio; +package com.volmit.iris.core.command.studio; import com.volmit.iris.Iris; import com.volmit.iris.IrisSettings; import com.volmit.iris.object.IrisEntity; -import com.volmit.iris.scaffold.IrisWorlds; -import com.volmit.iris.scaffold.engine.Engine; -import com.volmit.iris.scaffold.engine.IrisAccess; +import com.volmit.iris.engine.IrisWorlds; +import com.volmit.iris.engine.framework.Engine; +import com.volmit.iris.engine.framework.IrisAccess; import com.volmit.iris.util.KList; import com.volmit.iris.util.MortarCommand; import com.volmit.iris.util.MortarSender; diff --git a/src/main/java/com/volmit/iris/manager/command/studio/CommandIrisStudioTPStudio.java b/src/main/java/com/volmit/iris/core/command/studio/CommandIrisStudioTPStudio.java similarity index 98% rename from src/main/java/com/volmit/iris/manager/command/studio/CommandIrisStudioTPStudio.java rename to src/main/java/com/volmit/iris/core/command/studio/CommandIrisStudioTPStudio.java index 4e8632c57..012c741f6 100644 --- a/src/main/java/com/volmit/iris/manager/command/studio/CommandIrisStudioTPStudio.java +++ b/src/main/java/com/volmit/iris/core/command/studio/CommandIrisStudioTPStudio.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.manager.command.studio; +package com.volmit.iris.core.command.studio; import com.volmit.iris.Iris; import com.volmit.iris.IrisSettings; diff --git a/src/main/java/com/volmit/iris/manager/command/studio/CommandIrisStudioUpdate.java b/src/main/java/com/volmit/iris/core/command/studio/CommandIrisStudioUpdate.java similarity index 95% rename from src/main/java/com/volmit/iris/manager/command/studio/CommandIrisStudioUpdate.java rename to src/main/java/com/volmit/iris/core/command/studio/CommandIrisStudioUpdate.java index 4b72bbc13..a85f75f36 100644 --- a/src/main/java/com/volmit/iris/manager/command/studio/CommandIrisStudioUpdate.java +++ b/src/main/java/com/volmit/iris/core/command/studio/CommandIrisStudioUpdate.java @@ -16,11 +16,11 @@ * along with this program. If not, see . */ -package com.volmit.iris.manager.command.studio; +package com.volmit.iris.core.command.studio; import com.volmit.iris.Iris; import com.volmit.iris.IrisSettings; -import com.volmit.iris.manager.IrisProject; +import com.volmit.iris.core.IrisProject; import com.volmit.iris.util.KList; import com.volmit.iris.util.MortarCommand; import com.volmit.iris.util.MortarSender; diff --git a/src/main/java/com/volmit/iris/manager/command/what/CommandIrisWhat.java b/src/main/java/com/volmit/iris/core/command/what/CommandIrisWhat.java similarity index 97% rename from src/main/java/com/volmit/iris/manager/command/what/CommandIrisWhat.java rename to src/main/java/com/volmit/iris/core/command/what/CommandIrisWhat.java index 9bdb8e6cc..6842e9280 100644 --- a/src/main/java/com/volmit/iris/manager/command/what/CommandIrisWhat.java +++ b/src/main/java/com/volmit/iris/core/command/what/CommandIrisWhat.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.manager.command.what; +package com.volmit.iris.core.command.what; import com.volmit.iris.Iris; import com.volmit.iris.util.Command; diff --git a/src/main/java/com/volmit/iris/manager/command/what/CommandIrisWhatBiome.java b/src/main/java/com/volmit/iris/core/command/what/CommandIrisWhatBiome.java similarity index 95% rename from src/main/java/com/volmit/iris/manager/command/what/CommandIrisWhatBiome.java rename to src/main/java/com/volmit/iris/core/command/what/CommandIrisWhatBiome.java index 8b15e39ce..516cdf6c3 100644 --- a/src/main/java/com/volmit/iris/manager/command/what/CommandIrisWhatBiome.java +++ b/src/main/java/com/volmit/iris/core/command/what/CommandIrisWhatBiome.java @@ -16,13 +16,13 @@ * along with this program. If not, see . */ -package com.volmit.iris.manager.command.what; +package com.volmit.iris.core.command.what; import com.volmit.iris.Iris; import com.volmit.iris.nms.INMS; import com.volmit.iris.object.IrisBiome; -import com.volmit.iris.scaffold.IrisWorlds; -import com.volmit.iris.scaffold.engine.IrisAccess; +import com.volmit.iris.engine.IrisWorlds; +import com.volmit.iris.engine.framework.IrisAccess; import com.volmit.iris.util.KList; import com.volmit.iris.util.MortarCommand; import com.volmit.iris.util.MortarSender; diff --git a/src/main/java/com/volmit/iris/manager/command/what/CommandIrisWhatBlock.java b/src/main/java/com/volmit/iris/core/command/what/CommandIrisWhatBlock.java similarity index 98% rename from src/main/java/com/volmit/iris/manager/command/what/CommandIrisWhatBlock.java rename to src/main/java/com/volmit/iris/core/command/what/CommandIrisWhatBlock.java index 1ba8ed2bb..ea56f35da 100644 --- a/src/main/java/com/volmit/iris/manager/command/what/CommandIrisWhatBlock.java +++ b/src/main/java/com/volmit/iris/core/command/what/CommandIrisWhatBlock.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.manager.command.what; +package com.volmit.iris.core.command.what; import com.volmit.iris.Iris; import com.volmit.iris.util.*; diff --git a/src/main/java/com/volmit/iris/manager/command/what/CommandIrisWhatHand.java b/src/main/java/com/volmit/iris/core/command/what/CommandIrisWhatHand.java similarity index 98% rename from src/main/java/com/volmit/iris/manager/command/what/CommandIrisWhatHand.java rename to src/main/java/com/volmit/iris/core/command/what/CommandIrisWhatHand.java index 42b25c3e8..4040584bd 100644 --- a/src/main/java/com/volmit/iris/manager/command/what/CommandIrisWhatHand.java +++ b/src/main/java/com/volmit/iris/core/command/what/CommandIrisWhatHand.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.manager.command.what; +package com.volmit.iris.core.command.what; import com.volmit.iris.Iris; import com.volmit.iris.util.C; diff --git a/src/main/java/com/volmit/iris/manager/command/what/CommandIrisWhatObjects.java b/src/main/java/com/volmit/iris/core/command/what/CommandIrisWhatObjects.java similarity index 98% rename from src/main/java/com/volmit/iris/manager/command/what/CommandIrisWhatObjects.java rename to src/main/java/com/volmit/iris/core/command/what/CommandIrisWhatObjects.java index f885ff711..34b3cbb95 100644 --- a/src/main/java/com/volmit/iris/manager/command/what/CommandIrisWhatObjects.java +++ b/src/main/java/com/volmit/iris/core/command/what/CommandIrisWhatObjects.java @@ -16,14 +16,14 @@ * along with this program. If not, see . */ -package com.volmit.iris.manager.command.what; +package com.volmit.iris.core.command.what; import com.volmit.iris.Iris; import com.volmit.iris.object.IrisBiome; import com.volmit.iris.object.IrisObject; import com.volmit.iris.object.IrisObjectPlacement; -import com.volmit.iris.scaffold.IrisWorlds; -import com.volmit.iris.scaffold.engine.IrisAccess; +import com.volmit.iris.engine.IrisWorlds; +import com.volmit.iris.engine.framework.IrisAccess; import com.volmit.iris.util.*; import io.papermc.lib.PaperLib; import org.bukkit.*; diff --git a/src/main/java/com/volmit/iris/manager/command/world/CommandIrisCreate.java b/src/main/java/com/volmit/iris/core/command/world/CommandIrisCreate.java similarity index 97% rename from src/main/java/com/volmit/iris/manager/command/world/CommandIrisCreate.java rename to src/main/java/com/volmit/iris/core/command/world/CommandIrisCreate.java index 0517c7fa1..4a59c0a50 100644 --- a/src/main/java/com/volmit/iris/manager/command/world/CommandIrisCreate.java +++ b/src/main/java/com/volmit/iris/core/command/world/CommandIrisCreate.java @@ -16,17 +16,17 @@ * along with this program. If not, see . */ -package com.volmit.iris.manager.command.world; +package com.volmit.iris.core.command.world; import com.volmit.iris.Iris; import com.volmit.iris.IrisSettings; -import com.volmit.iris.manager.IrisDataManager; -import com.volmit.iris.manager.link.MultiverseCoreLink; +import com.volmit.iris.core.IrisDataManager; +import com.volmit.iris.core.link.MultiverseCoreLink; import com.volmit.iris.nms.INMS; import com.volmit.iris.object.IrisDimension; -import com.volmit.iris.pregen.Pregenerator; -import com.volmit.iris.scaffold.IrisWorldCreator; -import com.volmit.iris.scaffold.engine.IrisAccess; +import com.volmit.iris.gui.Pregenerator; +import com.volmit.iris.engine.IrisWorldCreator; +import com.volmit.iris.engine.framework.IrisAccess; import com.volmit.iris.util.*; import org.bukkit.Bukkit; import org.bukkit.World; diff --git a/src/main/java/com/volmit/iris/manager/command/world/CommandIrisFix.java b/src/main/java/com/volmit/iris/core/command/world/CommandIrisFix.java similarity index 95% rename from src/main/java/com/volmit/iris/manager/command/world/CommandIrisFix.java rename to src/main/java/com/volmit/iris/core/command/world/CommandIrisFix.java index bdebed4c7..664871ae3 100644 --- a/src/main/java/com/volmit/iris/manager/command/world/CommandIrisFix.java +++ b/src/main/java/com/volmit/iris/core/command/world/CommandIrisFix.java @@ -16,11 +16,11 @@ * along with this program. If not, see . */ -package com.volmit.iris.manager.command.world; +package com.volmit.iris.core.command.world; import com.volmit.iris.Iris; -import com.volmit.iris.scaffold.IrisWorlds; -import com.volmit.iris.scaffold.engine.IrisAccess; +import com.volmit.iris.engine.IrisWorlds; +import com.volmit.iris.engine.framework.IrisAccess; import com.volmit.iris.util.*; import java.util.concurrent.atomic.AtomicInteger; diff --git a/src/main/java/com/volmit/iris/manager/command/world/CommandIrisPregen.java b/src/main/java/com/volmit/iris/core/command/world/CommandIrisPregen.java similarity index 98% rename from src/main/java/com/volmit/iris/manager/command/world/CommandIrisPregen.java rename to src/main/java/com/volmit/iris/core/command/world/CommandIrisPregen.java index 913005fd2..f0f3710f8 100644 --- a/src/main/java/com/volmit/iris/manager/command/world/CommandIrisPregen.java +++ b/src/main/java/com/volmit/iris/core/command/world/CommandIrisPregen.java @@ -16,10 +16,10 @@ * along with this program. If not, see . */ -package com.volmit.iris.manager.command.world; +package com.volmit.iris.core.command.world; import com.volmit.iris.Iris; -import com.volmit.iris.pregen.Pregenerator; +import com.volmit.iris.gui.Pregenerator; import com.volmit.iris.util.KList; import com.volmit.iris.util.MortarCommand; import com.volmit.iris.util.MortarSender; diff --git a/src/main/java/com/volmit/iris/manager/command/world/CommandIrisRegen.java b/src/main/java/com/volmit/iris/core/command/world/CommandIrisRegen.java similarity index 98% rename from src/main/java/com/volmit/iris/manager/command/world/CommandIrisRegen.java rename to src/main/java/com/volmit/iris/core/command/world/CommandIrisRegen.java index ed19ca3af..ccdff08e4 100644 --- a/src/main/java/com/volmit/iris/manager/command/world/CommandIrisRegen.java +++ b/src/main/java/com/volmit/iris/core/command/world/CommandIrisRegen.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.manager.command.world; +package com.volmit.iris.core.command.world; import com.volmit.iris.Iris; import com.volmit.iris.util.KList; diff --git a/src/main/java/com/volmit/iris/manager/command/world/CommandIrisUpdateWorld.java b/src/main/java/com/volmit/iris/core/command/world/CommandIrisUpdateWorld.java similarity index 97% rename from src/main/java/com/volmit/iris/manager/command/world/CommandIrisUpdateWorld.java rename to src/main/java/com/volmit/iris/core/command/world/CommandIrisUpdateWorld.java index 22808dccc..9229053bd 100644 --- a/src/main/java/com/volmit/iris/manager/command/world/CommandIrisUpdateWorld.java +++ b/src/main/java/com/volmit/iris/core/command/world/CommandIrisUpdateWorld.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.manager.command.world; +package com.volmit.iris.core.command.world; import com.volmit.iris.Iris; import com.volmit.iris.util.*; diff --git a/src/main/java/com/volmit/iris/manager/command/world/CommandLocate.java b/src/main/java/com/volmit/iris/core/command/world/CommandLocate.java similarity index 96% rename from src/main/java/com/volmit/iris/manager/command/world/CommandLocate.java rename to src/main/java/com/volmit/iris/core/command/world/CommandLocate.java index 800cc34c4..218762c60 100644 --- a/src/main/java/com/volmit/iris/manager/command/world/CommandLocate.java +++ b/src/main/java/com/volmit/iris/core/command/world/CommandLocate.java @@ -16,10 +16,10 @@ * along with this program. If not, see . */ -package com.volmit.iris.manager.command.world; +package com.volmit.iris.core.command.world; import com.volmit.iris.Iris; -import com.volmit.iris.scaffold.IrisWorlds; +import com.volmit.iris.engine.IrisWorlds; import com.volmit.iris.util.KList; import com.volmit.iris.util.MortarCommand; import com.volmit.iris.util.MortarSender; diff --git a/src/main/java/com/volmit/iris/manager/edit/BlockEditor.java b/src/main/java/com/volmit/iris/core/edit/BlockEditor.java similarity index 97% rename from src/main/java/com/volmit/iris/manager/edit/BlockEditor.java rename to src/main/java/com/volmit/iris/core/edit/BlockEditor.java index 6a61874a3..6190c1f71 100644 --- a/src/main/java/com/volmit/iris/manager/edit/BlockEditor.java +++ b/src/main/java/com/volmit/iris/core/edit/BlockEditor.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.manager.edit; +package com.volmit.iris.core.edit; import org.bukkit.block.Biome; import org.bukkit.block.data.BlockData; diff --git a/src/main/java/com/volmit/iris/manager/edit/BlockSignal.java b/src/main/java/com/volmit/iris/core/edit/BlockSignal.java similarity index 97% rename from src/main/java/com/volmit/iris/manager/edit/BlockSignal.java rename to src/main/java/com/volmit/iris/core/edit/BlockSignal.java index b7139034d..64ce87d9e 100644 --- a/src/main/java/com/volmit/iris/manager/edit/BlockSignal.java +++ b/src/main/java/com/volmit/iris/core/edit/BlockSignal.java @@ -16,9 +16,9 @@ * along with this program. If not, see . */ -package com.volmit.iris.manager.edit; +package com.volmit.iris.core.edit; -import com.volmit.iris.scaffold.parallel.MultiBurst; +import com.volmit.iris.engine.parallel.MultiBurst; import com.volmit.iris.util.J; import com.volmit.iris.util.SR; import org.bukkit.Location; diff --git a/src/main/java/com/volmit/iris/manager/edit/BukkitBlockEditor.java b/src/main/java/com/volmit/iris/core/edit/BukkitBlockEditor.java similarity index 98% rename from src/main/java/com/volmit/iris/manager/edit/BukkitBlockEditor.java rename to src/main/java/com/volmit/iris/core/edit/BukkitBlockEditor.java index 792eda3e6..61b2fa7fd 100644 --- a/src/main/java/com/volmit/iris/manager/edit/BukkitBlockEditor.java +++ b/src/main/java/com/volmit/iris/core/edit/BukkitBlockEditor.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.manager.edit; +package com.volmit.iris.core.edit; import com.volmit.iris.util.M; import org.bukkit.World; diff --git a/src/main/java/com/volmit/iris/manager/edit/DustRevealer.java b/src/main/java/com/volmit/iris/core/edit/DustRevealer.java similarity index 96% rename from src/main/java/com/volmit/iris/manager/edit/DustRevealer.java rename to src/main/java/com/volmit/iris/core/edit/DustRevealer.java index 79f08cbff..caf1ab291 100644 --- a/src/main/java/com/volmit/iris/manager/edit/DustRevealer.java +++ b/src/main/java/com/volmit/iris/core/edit/DustRevealer.java @@ -16,12 +16,12 @@ * along with this program. If not, see . */ -package com.volmit.iris.manager.edit; +package com.volmit.iris.core.edit; import com.volmit.iris.Iris; -import com.volmit.iris.scaffold.IrisWorlds; -import com.volmit.iris.scaffold.engine.IrisAccess; -import com.volmit.iris.scaffold.parallax.ParallaxAccess; +import com.volmit.iris.engine.IrisWorlds; +import com.volmit.iris.engine.framework.IrisAccess; +import com.volmit.iris.engine.parallax.ParallaxAccess; import com.volmit.iris.util.*; import lombok.Data; import org.bukkit.World; diff --git a/src/main/java/com/volmit/iris/manager/edit/JigsawEditor.java b/src/main/java/com/volmit/iris/core/edit/JigsawEditor.java similarity index 99% rename from src/main/java/com/volmit/iris/manager/edit/JigsawEditor.java rename to src/main/java/com/volmit/iris/core/edit/JigsawEditor.java index 0e3188223..d1b85c0c9 100644 --- a/src/main/java/com/volmit/iris/manager/edit/JigsawEditor.java +++ b/src/main/java/com/volmit/iris/core/edit/JigsawEditor.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.manager.edit; +package com.volmit.iris.core.edit; import com.google.gson.Gson; import com.volmit.iris.Iris; diff --git a/src/main/java/com/volmit/iris/manager/edit/WEBlockEditor.java b/src/main/java/com/volmit/iris/core/edit/WEBlockEditor.java similarity index 98% rename from src/main/java/com/volmit/iris/manager/edit/WEBlockEditor.java rename to src/main/java/com/volmit/iris/core/edit/WEBlockEditor.java index ca1b1cd8a..1269042af 100644 --- a/src/main/java/com/volmit/iris/manager/edit/WEBlockEditor.java +++ b/src/main/java/com/volmit/iris/core/edit/WEBlockEditor.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.manager.edit; +package com.volmit.iris.core.edit; import com.sk89q.worldedit.EditSession; import com.sk89q.worldedit.WorldEdit; diff --git a/src/main/java/com/volmit/iris/manager/gui/IrisRenderer.java b/src/main/java/com/volmit/iris/core/gui/IrisRenderer.java similarity index 96% rename from src/main/java/com/volmit/iris/manager/gui/IrisRenderer.java rename to src/main/java/com/volmit/iris/core/gui/IrisRenderer.java index 3afd5ce86..7ec1f5662 100644 --- a/src/main/java/com/volmit/iris/manager/gui/IrisRenderer.java +++ b/src/main/java/com/volmit/iris/core/gui/IrisRenderer.java @@ -16,10 +16,9 @@ * along with this program. If not, see . */ -package com.volmit.iris.manager.gui; +package com.volmit.iris.gui; -import com.volmit.iris.map.RenderType; -import com.volmit.iris.scaffold.engine.Engine; +import com.volmit.iris.engine.framework.Engine; import com.volmit.iris.util.IrisInterpolation; import org.bukkit.Material; diff --git a/src/main/java/com/volmit/iris/manager/gui/IrisVision.java b/src/main/java/com/volmit/iris/core/gui/IrisVision.java similarity index 98% rename from src/main/java/com/volmit/iris/manager/gui/IrisVision.java rename to src/main/java/com/volmit/iris/core/gui/IrisVision.java index 101358cd8..175ff3cb9 100644 --- a/src/main/java/com/volmit/iris/manager/gui/IrisVision.java +++ b/src/main/java/com/volmit/iris/core/gui/IrisVision.java @@ -16,25 +16,20 @@ * along with this program. If not, see . */ -package com.volmit.iris.manager.gui; +package com.volmit.iris.gui; import com.volmit.iris.Iris; -import com.volmit.iris.generator.IrisComplex; -import com.volmit.iris.generator.IrisEngine; -import com.volmit.iris.map.RenderType; +import com.volmit.iris.engine.IrisComplex; import com.volmit.iris.object.IrisBiome; import com.volmit.iris.object.IrisRegion; -import com.volmit.iris.object.IrisRegistrant; -import com.volmit.iris.scaffold.engine.Engine; -import com.volmit.iris.scaffold.engine.IrisAccess; -import com.volmit.iris.scaffold.parallel.MultiBurst; +import com.volmit.iris.engine.framework.Engine; +import com.volmit.iris.engine.framework.IrisAccess; import com.volmit.iris.util.*; import org.bukkit.Location; import org.bukkit.World; import org.bukkit.attribute.Attribute; import org.bukkit.entity.LivingEntity; import org.bukkit.entity.Player; -import org.bukkit.entity.Zombie; import javax.imageio.ImageIO; import javax.swing.*; diff --git a/src/main/java/com/volmit/iris/manager/gui/NoiseExplorer.java b/src/main/java/com/volmit/iris/core/gui/NoiseExplorer.java similarity index 99% rename from src/main/java/com/volmit/iris/manager/gui/NoiseExplorer.java rename to src/main/java/com/volmit/iris/core/gui/NoiseExplorer.java index 3852de665..9a319f6d9 100644 --- a/src/main/java/com/volmit/iris/manager/gui/NoiseExplorer.java +++ b/src/main/java/com/volmit/iris/core/gui/NoiseExplorer.java @@ -16,10 +16,10 @@ * along with this program. If not, see . */ -package com.volmit.iris.manager.gui; +package com.volmit.iris.gui; import com.volmit.iris.Iris; -import com.volmit.iris.generator.noise.CNG; +import com.volmit.iris.engine.noise.CNG; import com.volmit.iris.object.NoiseStyle; import com.volmit.iris.util.*; diff --git a/src/main/java/com/volmit/iris/pregen/Pregenerator.java b/src/main/java/com/volmit/iris/core/gui/Pregenerator.java similarity index 98% rename from src/main/java/com/volmit/iris/pregen/Pregenerator.java rename to src/main/java/com/volmit/iris/core/gui/Pregenerator.java index 3265a74fd..da6bcada2 100644 --- a/src/main/java/com/volmit/iris/pregen/Pregenerator.java +++ b/src/main/java/com/volmit/iris/core/gui/Pregenerator.java @@ -16,20 +16,20 @@ * along with this program. If not, see . */ -package com.volmit.iris.pregen; +package com.volmit.iris.gui; import com.volmit.iris.Iris; import com.volmit.iris.IrisSettings; -import com.volmit.iris.scaffold.IrisWorlds; -import com.volmit.iris.scaffold.engine.IrisAccess; -import com.volmit.iris.scaffold.parallel.BurstExecutor; -import com.volmit.iris.scaffold.parallel.MultiBurst; +import com.volmit.iris.engine.IrisWorlds; +import com.volmit.iris.engine.data.DirectWorldWriter; +import com.volmit.iris.engine.framework.IrisAccess; +import com.volmit.iris.engine.parallel.BurstExecutor; +import com.volmit.iris.engine.parallel.MultiBurst; import com.volmit.iris.util.*; import io.papermc.lib.PaperLib; import lombok.Data; import org.bukkit.Bukkit; import org.bukkit.Chunk; -import org.bukkit.Material; import org.bukkit.World; import org.bukkit.event.Listener; @@ -45,8 +45,6 @@ import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.Paths; import java.util.Comparator; -import java.util.concurrent.CompletableFuture; -import java.util.concurrent.ExecutionException; import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicLong; diff --git a/src/main/java/com/volmit/iris/core/gui/RenderType.java b/src/main/java/com/volmit/iris/core/gui/RenderType.java new file mode 100644 index 000000000..0ae395b83 --- /dev/null +++ b/src/main/java/com/volmit/iris/core/gui/RenderType.java @@ -0,0 +1,23 @@ +/* + * Iris is a World Generator for Minecraft Bukkit Servers + * Copyright (c) 2021 Arcane Arts (Volmit Software) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.volmit.iris.gui; + +public enum RenderType { + BIOME, BIOME_LAND, BIOME_SEA, REGION, CAVE_LAND, HEIGHT, OBJECT_LOAD, DECORATOR_LOAD, LAYER_LOAD +} diff --git a/src/main/java/com/volmit/iris/manager/gui/Renderer.java b/src/main/java/com/volmit/iris/core/gui/Renderer.java similarity index 95% rename from src/main/java/com/volmit/iris/manager/gui/Renderer.java rename to src/main/java/com/volmit/iris/core/gui/Renderer.java index 252e8e62c..d22b08f02 100644 --- a/src/main/java/com/volmit/iris/manager/gui/Renderer.java +++ b/src/main/java/com/volmit/iris/core/gui/Renderer.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.manager.gui; +package com.volmit.iris.gui; import java.awt.*; diff --git a/src/main/java/com/volmit/iris/manager/gui/TileRender.java b/src/main/java/com/volmit/iris/core/gui/TileRender.java similarity index 96% rename from src/main/java/com/volmit/iris/manager/gui/TileRender.java rename to src/main/java/com/volmit/iris/core/gui/TileRender.java index e8da8bb4b..4ccef3a76 100644 --- a/src/main/java/com/volmit/iris/manager/gui/TileRender.java +++ b/src/main/java/com/volmit/iris/core/gui/TileRender.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.manager.gui; +package com.volmit.iris.gui; import lombok.Builder; import lombok.Data; diff --git a/src/main/java/com/volmit/iris/manager/link/BKLink.java b/src/main/java/com/volmit/iris/core/link/BKLink.java similarity index 97% rename from src/main/java/com/volmit/iris/manager/link/BKLink.java rename to src/main/java/com/volmit/iris/core/link/BKLink.java index aec8a9d6a..49fc20515 100644 --- a/src/main/java/com/volmit/iris/manager/link/BKLink.java +++ b/src/main/java/com/volmit/iris/core/link/BKLink.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.manager.link; +package com.volmit.iris.core.link; import org.bukkit.Bukkit; import org.bukkit.Material; diff --git a/src/main/java/com/volmit/iris/manager/link/CitizensLink.java b/src/main/java/com/volmit/iris/core/link/CitizensLink.java similarity index 96% rename from src/main/java/com/volmit/iris/manager/link/CitizensLink.java rename to src/main/java/com/volmit/iris/core/link/CitizensLink.java index fcbeaed31..e912c2deb 100644 --- a/src/main/java/com/volmit/iris/manager/link/CitizensLink.java +++ b/src/main/java/com/volmit/iris/core/link/CitizensLink.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.manager.link; +package com.volmit.iris.core.link; import org.bukkit.Bukkit; import org.bukkit.plugin.Plugin; diff --git a/src/main/java/com/volmit/iris/manager/link/MultiverseCoreLink.java b/src/main/java/com/volmit/iris/core/link/MultiverseCoreLink.java similarity index 99% rename from src/main/java/com/volmit/iris/manager/link/MultiverseCoreLink.java rename to src/main/java/com/volmit/iris/core/link/MultiverseCoreLink.java index 377c428b1..95b220cca 100644 --- a/src/main/java/com/volmit/iris/manager/link/MultiverseCoreLink.java +++ b/src/main/java/com/volmit/iris/core/link/MultiverseCoreLink.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.manager.link; +package com.volmit.iris.core.link; import com.volmit.iris.Iris; import com.volmit.iris.object.IrisDimension; diff --git a/src/main/java/com/volmit/iris/manager/link/MythicMobsLink.java b/src/main/java/com/volmit/iris/core/link/MythicMobsLink.java similarity index 98% rename from src/main/java/com/volmit/iris/manager/link/MythicMobsLink.java rename to src/main/java/com/volmit/iris/core/link/MythicMobsLink.java index 4f80ad9b7..5badd20fc 100644 --- a/src/main/java/com/volmit/iris/manager/link/MythicMobsLink.java +++ b/src/main/java/com/volmit/iris/core/link/MythicMobsLink.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.manager.link; +package com.volmit.iris.core.link; import com.volmit.iris.util.KList; import io.lumine.xikage.mythicmobs.MythicMobs; diff --git a/src/main/java/com/volmit/iris/nms/BiomeBaseInjector.java b/src/main/java/com/volmit/iris/core/nms/BiomeBaseInjector.java similarity index 100% rename from src/main/java/com/volmit/iris/nms/BiomeBaseInjector.java rename to src/main/java/com/volmit/iris/core/nms/BiomeBaseInjector.java diff --git a/src/main/java/com/volmit/iris/nms/INMS.java b/src/main/java/com/volmit/iris/core/nms/INMS.java similarity index 100% rename from src/main/java/com/volmit/iris/nms/INMS.java rename to src/main/java/com/volmit/iris/core/nms/INMS.java diff --git a/src/main/java/com/volmit/iris/nms/INMSBinding.java b/src/main/java/com/volmit/iris/core/nms/INMSBinding.java similarity index 100% rename from src/main/java/com/volmit/iris/nms/INMSBinding.java rename to src/main/java/com/volmit/iris/core/nms/INMSBinding.java diff --git a/src/main/java/com/volmit/iris/nms/v17_1/NMSBinding17_1.java b/src/main/java/com/volmit/iris/core/nms/v17_1/NMSBinding17_1.java similarity index 100% rename from src/main/java/com/volmit/iris/nms/v17_1/NMSBinding17_1.java rename to src/main/java/com/volmit/iris/core/nms/v17_1/NMSBinding17_1.java diff --git a/src/main/java/com/volmit/iris/nms/v1X/NMSBinding1X.java b/src/main/java/com/volmit/iris/core/nms/v1X/NMSBinding1X.java similarity index 100% rename from src/main/java/com/volmit/iris/nms/v1X/NMSBinding1X.java rename to src/main/java/com/volmit/iris/core/nms/v1X/NMSBinding1X.java diff --git a/src/main/java/com/volmit/iris/manager/report/Report.java b/src/main/java/com/volmit/iris/core/report/Report.java similarity index 96% rename from src/main/java/com/volmit/iris/manager/report/Report.java rename to src/main/java/com/volmit/iris/core/report/Report.java index e9a894cf6..c2394af08 100644 --- a/src/main/java/com/volmit/iris/manager/report/Report.java +++ b/src/main/java/com/volmit/iris/core/report/Report.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.manager.report; +package com.volmit.iris.core.report; import lombok.Builder; diff --git a/src/main/java/com/volmit/iris/manager/report/ReportType.java b/src/main/java/com/volmit/iris/core/report/ReportType.java similarity index 95% rename from src/main/java/com/volmit/iris/manager/report/ReportType.java rename to src/main/java/com/volmit/iris/core/report/ReportType.java index 6264a01ed..6020dec7b 100644 --- a/src/main/java/com/volmit/iris/manager/report/ReportType.java +++ b/src/main/java/com/volmit/iris/core/report/ReportType.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.manager.report; +package com.volmit.iris.core.report; public enum ReportType { ERROR, diff --git a/src/main/java/com/volmit/iris/generator/IrisComplex.java b/src/main/java/com/volmit/iris/engine/IrisComplex.java similarity index 96% rename from src/main/java/com/volmit/iris/generator/IrisComplex.java rename to src/main/java/com/volmit/iris/engine/IrisComplex.java index 0cb68431b..6cc981db8 100644 --- a/src/main/java/com/volmit/iris/generator/IrisComplex.java +++ b/src/main/java/com/volmit/iris/engine/IrisComplex.java @@ -16,20 +16,20 @@ * along with this program. If not, see . */ -package com.volmit.iris.generator; +package com.volmit.iris.engine; import com.google.common.util.concurrent.AtomicDouble; import com.volmit.iris.Iris; -import com.volmit.iris.IrisSettings; -import com.volmit.iris.generator.actuator.IrisTerrainActuator; -import com.volmit.iris.generator.modifier.IrisCaveModifier; -import com.volmit.iris.generator.noise.CNG; -import com.volmit.iris.manager.IrisDataManager; -import com.volmit.iris.object.*; -import com.volmit.iris.scaffold.data.DataProvider; -import com.volmit.iris.scaffold.engine.Engine; -import com.volmit.iris.scaffold.stream.ProceduralStream; -import com.volmit.iris.scaffold.stream.interpolation.Interpolated; +import com.volmit.iris.core.IrisSettings; +import com.volmit.iris.engine.actuator.IrisTerrainActuator; +import com.volmit.iris.engine.modifier.IrisCaveModifier; +import com.volmit.iris.engine.noise.CNG; +import com.volmit.iris.core.IrisDataManager; +import com.volmit.iris.engine.object.*; +import com.volmit.iris.engine.data.DataProvider; +import com.volmit.iris.engine.framework.Engine; +import com.volmit.iris.engine.stream.ProceduralStream; +import com.volmit.iris.engine.stream.interpolation.Interpolated; import com.volmit.iris.util.CaveResult; import com.volmit.iris.util.KList; import com.volmit.iris.util.M; diff --git a/src/main/java/com/volmit/iris/generator/IrisEngine.java b/src/main/java/com/volmit/iris/engine/IrisEngine.java similarity index 97% rename from src/main/java/com/volmit/iris/generator/IrisEngine.java rename to src/main/java/com/volmit/iris/engine/IrisEngine.java index 2baf610d1..0296a77b8 100644 --- a/src/main/java/com/volmit/iris/generator/IrisEngine.java +++ b/src/main/java/com/volmit/iris/engine/IrisEngine.java @@ -16,12 +16,12 @@ * along with this program. If not, see . */ -package com.volmit.iris.generator; +package com.volmit.iris.engine; import com.volmit.iris.Iris; -import com.volmit.iris.object.*; -import com.volmit.iris.scaffold.engine.*; -import com.volmit.iris.scaffold.hunk.Hunk; +import com.volmit.iris.engine.object.*; +import com.volmit.iris.engine.framework.*; +import com.volmit.iris.engine.hunk.Hunk; import com.volmit.iris.util.J; import com.volmit.iris.util.PrecisionStopwatch; import com.volmit.iris.util.RNG; diff --git a/src/main/java/com/volmit/iris/generator/IrisEngineCompound.java b/src/main/java/com/volmit/iris/engine/IrisEngineCompound.java similarity index 94% rename from src/main/java/com/volmit/iris/generator/IrisEngineCompound.java rename to src/main/java/com/volmit/iris/engine/IrisEngineCompound.java index 9dca2a6d3..faf41a06b 100644 --- a/src/main/java/com/volmit/iris/generator/IrisEngineCompound.java +++ b/src/main/java/com/volmit/iris/engine/IrisEngineCompound.java @@ -16,19 +16,19 @@ * along with this program. If not, see . */ -package com.volmit.iris.generator; +package com.volmit.iris.engine; import com.volmit.iris.Iris; -import com.volmit.iris.manager.IrisDataManager; -import com.volmit.iris.object.IrisDimension; -import com.volmit.iris.object.IrisDimensionIndex; -import com.volmit.iris.object.IrisPosition; -import com.volmit.iris.scaffold.engine.Engine; -import com.volmit.iris.scaffold.engine.EngineCompound; -import com.volmit.iris.scaffold.engine.EngineData; -import com.volmit.iris.scaffold.engine.EngineTarget; -import com.volmit.iris.scaffold.hunk.Hunk; -import com.volmit.iris.scaffold.parallel.MultiBurst; +import com.volmit.iris.core.IrisDataManager; +import com.volmit.iris.engine.object.IrisDimension; +import com.volmit.iris.engine.object.IrisDimensionIndex; +import com.volmit.iris.engine.object.IrisPosition; +import com.volmit.iris.engine.framework.Engine; +import com.volmit.iris.engine.framework.EngineCompound; +import com.volmit.iris.engine.framework.EngineData; +import com.volmit.iris.engine.framework.EngineTarget; +import com.volmit.iris.engine.hunk.Hunk; +import com.volmit.iris.engine.parallel.MultiBurst; import com.volmit.iris.util.*; import lombok.Getter; import lombok.Setter; diff --git a/src/main/java/com/volmit/iris/generator/IrisEngineEffects.java b/src/main/java/com/volmit/iris/engine/IrisEngineEffects.java similarity index 91% rename from src/main/java/com/volmit/iris/generator/IrisEngineEffects.java rename to src/main/java/com/volmit/iris/engine/IrisEngineEffects.java index acb00b242..fbe253ffe 100644 --- a/src/main/java/com/volmit/iris/generator/IrisEngineEffects.java +++ b/src/main/java/com/volmit/iris/engine/IrisEngineEffects.java @@ -16,12 +16,12 @@ * along with this program. If not, see . */ -package com.volmit.iris.generator; +package com.volmit.iris.engine; -import com.volmit.iris.scaffold.engine.Engine; -import com.volmit.iris.scaffold.engine.EngineAssignedComponent; -import com.volmit.iris.scaffold.engine.EngineEffects; -import com.volmit.iris.scaffold.engine.EnginePlayer; +import com.volmit.iris.engine.framework.Engine; +import com.volmit.iris.engine.framework.EngineAssignedComponent; +import com.volmit.iris.engine.framework.EngineEffects; +import com.volmit.iris.engine.framework.EnginePlayer; import com.volmit.iris.util.KMap; import com.volmit.iris.util.M; import com.volmit.iris.util.PrecisionStopwatch; diff --git a/src/main/java/com/volmit/iris/generator/IrisEngineFramework.java b/src/main/java/com/volmit/iris/engine/IrisEngineFramework.java similarity index 86% rename from src/main/java/com/volmit/iris/generator/IrisEngineFramework.java rename to src/main/java/com/volmit/iris/engine/IrisEngineFramework.java index 2704c2b76..9cef9d56e 100644 --- a/src/main/java/com/volmit/iris/generator/IrisEngineFramework.java +++ b/src/main/java/com/volmit/iris/engine/IrisEngineFramework.java @@ -16,18 +16,18 @@ * along with this program. If not, see . */ -package com.volmit.iris.generator; +package com.volmit.iris.engine; import com.volmit.iris.Iris; -import com.volmit.iris.IrisSettings; -import com.volmit.iris.generator.actuator.IrisBiomeActuator; -import com.volmit.iris.generator.actuator.IrisDecorantActuator; -import com.volmit.iris.generator.actuator.IrisTerrainActuator; -import com.volmit.iris.generator.modifier.IrisCaveModifier; -import com.volmit.iris.generator.modifier.IrisDepositModifier; -import com.volmit.iris.generator.modifier.IrisPostModifier; -import com.volmit.iris.generator.modifier.IrisRavineModifier; -import com.volmit.iris.scaffold.engine.*; +import com.volmit.iris.core.IrisSettings; +import com.volmit.iris.engine.actuator.IrisBiomeActuator; +import com.volmit.iris.engine.actuator.IrisDecorantActuator; +import com.volmit.iris.engine.actuator.IrisTerrainActuator; +import com.volmit.iris.engine.modifier.IrisCaveModifier; +import com.volmit.iris.engine.modifier.IrisDepositModifier; +import com.volmit.iris.engine.modifier.IrisPostModifier; +import com.volmit.iris.engine.modifier.IrisRavineModifier; +import com.volmit.iris.engine.framework.*; import com.volmit.iris.util.ChronoLatch; import lombok.Getter; import org.bukkit.block.Biome; diff --git a/src/main/java/com/volmit/iris/generator/IrisEngineParallax.java b/src/main/java/com/volmit/iris/engine/IrisEngineParallax.java similarity index 88% rename from src/main/java/com/volmit/iris/generator/IrisEngineParallax.java rename to src/main/java/com/volmit/iris/engine/IrisEngineParallax.java index 5a534d733..f5ce791ca 100644 --- a/src/main/java/com/volmit/iris/generator/IrisEngineParallax.java +++ b/src/main/java/com/volmit/iris/engine/IrisEngineParallax.java @@ -16,10 +16,10 @@ * along with this program. If not, see . */ -package com.volmit.iris.generator; +package com.volmit.iris.engine; -import com.volmit.iris.scaffold.engine.Engine; -import com.volmit.iris.scaffold.engine.EngineParallaxManager; +import com.volmit.iris.engine.framework.Engine; +import com.volmit.iris.engine.framework.EngineParallaxManager; import lombok.Getter; public class IrisEngineParallax implements EngineParallaxManager { diff --git a/src/main/java/com/volmit/iris/scaffold/IrisWorldCreator.java b/src/main/java/com/volmit/iris/engine/IrisWorldCreator.java similarity index 93% rename from src/main/java/com/volmit/iris/scaffold/IrisWorldCreator.java rename to src/main/java/com/volmit/iris/engine/IrisWorldCreator.java index 98fd0258a..33ea84304 100644 --- a/src/main/java/com/volmit/iris/scaffold/IrisWorldCreator.java +++ b/src/main/java/com/volmit/iris/engine/IrisWorldCreator.java @@ -16,11 +16,11 @@ * along with this program. If not, see . */ -package com.volmit.iris.scaffold; +package com.volmit.iris.engine; -import com.volmit.iris.manager.IrisDataManager; -import com.volmit.iris.object.IrisDimension; -import com.volmit.iris.scaffold.engine.EngineCompositeGenerator; +import com.volmit.iris.core.IrisDataManager; +import com.volmit.iris.engine.object.IrisDimension; +import com.volmit.iris.engine.framework.EngineCompositeGenerator; import com.volmit.iris.util.FakeWorld; import org.bukkit.World; import org.bukkit.WorldCreator; diff --git a/src/main/java/com/volmit/iris/generator/IrisWorldManager.java b/src/main/java/com/volmit/iris/engine/IrisWorldManager.java similarity index 94% rename from src/main/java/com/volmit/iris/generator/IrisWorldManager.java rename to src/main/java/com/volmit/iris/engine/IrisWorldManager.java index 6272db6f5..e6ee2f9c1 100644 --- a/src/main/java/com/volmit/iris/generator/IrisWorldManager.java +++ b/src/main/java/com/volmit/iris/engine/IrisWorldManager.java @@ -16,14 +16,14 @@ * along with this program. If not, see . */ -package com.volmit.iris.generator; +package com.volmit.iris.engine; import com.volmit.iris.Iris; -import com.volmit.iris.IrisSettings; -import com.volmit.iris.object.*; -import com.volmit.iris.scaffold.cache.Cache; -import com.volmit.iris.scaffold.engine.Engine; -import com.volmit.iris.scaffold.engine.EngineAssignedWorldManager; +import com.volmit.iris.core.IrisSettings; +import com.volmit.iris.engine.object.*; +import com.volmit.iris.engine.cache.Cache; +import com.volmit.iris.engine.framework.Engine; +import com.volmit.iris.engine.framework.EngineAssignedWorldManager; import com.volmit.iris.util.J; import com.volmit.iris.util.KList; import com.volmit.iris.util.RNG; diff --git a/src/main/java/com/volmit/iris/scaffold/IrisWorlds.java b/src/main/java/com/volmit/iris/engine/IrisWorlds.java similarity index 94% rename from src/main/java/com/volmit/iris/scaffold/IrisWorlds.java rename to src/main/java/com/volmit/iris/engine/IrisWorlds.java index 1b538b53b..92a619fd1 100644 --- a/src/main/java/com/volmit/iris/scaffold/IrisWorlds.java +++ b/src/main/java/com/volmit/iris/engine/IrisWorlds.java @@ -16,11 +16,11 @@ * along with this program. If not, see . */ -package com.volmit.iris.scaffold; +package com.volmit.iris.engine; import com.volmit.iris.Iris; -import com.volmit.iris.scaffold.engine.IrisAccess; -import com.volmit.iris.scaffold.engine.IrisAccessProvider; +import com.volmit.iris.engine.framework.IrisAccess; +import com.volmit.iris.engine.framework.IrisAccessProvider; import com.volmit.iris.util.KMap; import com.volmit.iris.util.MortarSender; import org.bukkit.Bukkit; diff --git a/src/main/java/com/volmit/iris/generator/actuator/IrisBiomeActuator.java b/src/main/java/com/volmit/iris/engine/actuator/IrisBiomeActuator.java similarity index 91% rename from src/main/java/com/volmit/iris/generator/actuator/IrisBiomeActuator.java rename to src/main/java/com/volmit/iris/engine/actuator/IrisBiomeActuator.java index d99433ce5..9c6775817 100644 --- a/src/main/java/com/volmit/iris/generator/actuator/IrisBiomeActuator.java +++ b/src/main/java/com/volmit/iris/engine/actuator/IrisBiomeActuator.java @@ -22,12 +22,10 @@ import com.volmit.iris.Iris; import com.volmit.iris.nms.INMS; import com.volmit.iris.object.IrisBiome; import com.volmit.iris.object.IrisBiomeCustom; -import com.volmit.iris.scaffold.engine.Engine; -import com.volmit.iris.scaffold.engine.EngineAssignedActuator; -import com.volmit.iris.scaffold.hunk.Hunk; -import com.volmit.iris.scaffold.hunk.view.BiomeGridHunkView; -import com.volmit.iris.scaffold.parallel.BurstExecutor; -import com.volmit.iris.scaffold.parallel.MultiBurst; +import com.volmit.iris.engine.framework.Engine; +import com.volmit.iris.engine.framework.EngineAssignedActuator; +import com.volmit.iris.engine.hunk.Hunk; +import com.volmit.iris.engine.hunk.view.BiomeGridHunkView; import com.volmit.iris.util.PrecisionStopwatch; import com.volmit.iris.util.RNG; import com.volmit.iris.util.TerrainChunk; diff --git a/src/main/java/com/volmit/iris/generator/actuator/IrisDecorantActuator.java b/src/main/java/com/volmit/iris/engine/actuator/IrisDecorantActuator.java similarity index 96% rename from src/main/java/com/volmit/iris/generator/actuator/IrisDecorantActuator.java rename to src/main/java/com/volmit/iris/engine/actuator/IrisDecorantActuator.java index 7261744ce..d11bef089 100644 --- a/src/main/java/com/volmit/iris/generator/actuator/IrisDecorantActuator.java +++ b/src/main/java/com/volmit/iris/engine/actuator/IrisDecorantActuator.java @@ -20,10 +20,10 @@ package com.volmit.iris.generator.actuator; import com.volmit.iris.generator.decorator.*; import com.volmit.iris.object.IrisBiome; -import com.volmit.iris.scaffold.engine.Engine; -import com.volmit.iris.scaffold.engine.EngineAssignedActuator; -import com.volmit.iris.scaffold.engine.EngineDecorator; -import com.volmit.iris.scaffold.hunk.Hunk; +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.hunk.Hunk; import com.volmit.iris.util.PrecisionStopwatch; import com.volmit.iris.util.RNG; import lombok.Getter; diff --git a/src/main/java/com/volmit/iris/generator/actuator/IrisTerrainActuator.java b/src/main/java/com/volmit/iris/engine/actuator/IrisTerrainActuator.java similarity index 96% rename from src/main/java/com/volmit/iris/generator/actuator/IrisTerrainActuator.java rename to src/main/java/com/volmit/iris/engine/actuator/IrisTerrainActuator.java index 883757f24..68ed61e9e 100644 --- a/src/main/java/com/volmit/iris/generator/actuator/IrisTerrainActuator.java +++ b/src/main/java/com/volmit/iris/engine/actuator/IrisTerrainActuator.java @@ -19,9 +19,9 @@ package com.volmit.iris.generator.actuator; import com.volmit.iris.object.IrisBiome; -import com.volmit.iris.scaffold.engine.Engine; -import com.volmit.iris.scaffold.engine.EngineAssignedActuator; -import com.volmit.iris.scaffold.hunk.Hunk; +import com.volmit.iris.engine.framework.Engine; +import com.volmit.iris.engine.framework.EngineAssignedActuator; +import com.volmit.iris.engine.hunk.Hunk; import com.volmit.iris.util.KList; import com.volmit.iris.util.PrecisionStopwatch; import com.volmit.iris.util.RNG; diff --git a/src/main/java/com/volmit/iris/scaffold/cache/AtomicCache.java b/src/main/java/com/volmit/iris/engine/cache/AtomicCache.java similarity index 98% rename from src/main/java/com/volmit/iris/scaffold/cache/AtomicCache.java rename to src/main/java/com/volmit/iris/engine/cache/AtomicCache.java index abf0b2f0e..452b96276 100644 --- a/src/main/java/com/volmit/iris/scaffold/cache/AtomicCache.java +++ b/src/main/java/com/volmit/iris/engine/cache/AtomicCache.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.scaffold.cache; +package com.volmit.iris.engine.cache; import com.volmit.iris.util.IrisLock; import com.volmit.iris.util.M; diff --git a/src/main/java/com/volmit/iris/scaffold/cache/Cache.java b/src/main/java/com/volmit/iris/engine/cache/Cache.java similarity index 96% rename from src/main/java/com/volmit/iris/scaffold/cache/Cache.java rename to src/main/java/com/volmit/iris/engine/cache/Cache.java index a04a36df6..b8218da7f 100644 --- a/src/main/java/com/volmit/iris/scaffold/cache/Cache.java +++ b/src/main/java/com/volmit/iris/engine/cache/Cache.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.scaffold.cache; +package com.volmit.iris.engine.cache; import org.bukkit.Chunk; diff --git a/src/main/java/com/volmit/iris/scaffold/cache/Multicache.java b/src/main/java/com/volmit/iris/engine/cache/Multicache.java similarity index 95% rename from src/main/java/com/volmit/iris/scaffold/cache/Multicache.java rename to src/main/java/com/volmit/iris/engine/cache/Multicache.java index b2540fb66..98a574997 100644 --- a/src/main/java/com/volmit/iris/scaffold/cache/Multicache.java +++ b/src/main/java/com/volmit/iris/engine/cache/Multicache.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.scaffold.cache; +package com.volmit.iris.engine.cache; public interface Multicache { Cache getCache(int id); diff --git a/src/main/java/com/volmit/iris/scaffold/data/DataPalette.java b/src/main/java/com/volmit/iris/engine/data/DataPalette.java similarity index 98% rename from src/main/java/com/volmit/iris/scaffold/data/DataPalette.java rename to src/main/java/com/volmit/iris/engine/data/DataPalette.java index 28a3a00b0..88126e472 100644 --- a/src/main/java/com/volmit/iris/scaffold/data/DataPalette.java +++ b/src/main/java/com/volmit/iris/engine/data/DataPalette.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.scaffold.data; +package com.volmit.iris.engine.data; import com.volmit.iris.util.KList; diff --git a/src/main/java/com/volmit/iris/scaffold/data/DataProvider.java b/src/main/java/com/volmit/iris/engine/data/DataProvider.java similarity index 95% rename from src/main/java/com/volmit/iris/scaffold/data/DataProvider.java rename to src/main/java/com/volmit/iris/engine/data/DataProvider.java index ad8bcf816..455d97c76 100644 --- a/src/main/java/com/volmit/iris/scaffold/data/DataProvider.java +++ b/src/main/java/com/volmit/iris/engine/data/DataProvider.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.scaffold.data; +package com.volmit.iris.engine.data; import com.volmit.iris.manager.IrisDataManager; diff --git a/src/main/java/com/volmit/iris/pregen/DirectWorldWriter.java b/src/main/java/com/volmit/iris/engine/data/DirectWorldWriter.java similarity index 93% rename from src/main/java/com/volmit/iris/pregen/DirectWorldWriter.java rename to src/main/java/com/volmit/iris/engine/data/DirectWorldWriter.java index 9fa8c618e..25e28bd69 100644 --- a/src/main/java/com/volmit/iris/pregen/DirectWorldWriter.java +++ b/src/main/java/com/volmit/iris/engine/data/DirectWorldWriter.java @@ -16,19 +16,19 @@ * along with this program. If not, see . */ -package com.volmit.iris.pregen; +package com.volmit.iris.engine.data; import com.volmit.iris.Iris; import com.volmit.iris.nms.INMS; -import com.volmit.iris.scaffold.cache.Cache; -import com.volmit.iris.scaffold.data.mca.Chunk; -import com.volmit.iris.scaffold.data.mca.MCAFile; -import com.volmit.iris.scaffold.data.mca.MCAUtil; -import com.volmit.iris.scaffold.data.mca.Section; -import com.volmit.iris.scaffold.data.nbt.tag.CompoundTag; -import com.volmit.iris.scaffold.data.nbt.tag.StringTag; -import com.volmit.iris.scaffold.parallel.BurstExecutor; -import com.volmit.iris.scaffold.parallel.MultiBurst; +import com.volmit.iris.engine.cache.Cache; +import com.volmit.iris.engine.data.mca.Chunk; +import com.volmit.iris.engine.data.mca.MCAFile; +import com.volmit.iris.engine.data.mca.MCAUtil; +import com.volmit.iris.engine.data.mca.Section; +import com.volmit.iris.engine.data.nbt.tag.CompoundTag; +import com.volmit.iris.engine.data.nbt.tag.StringTag; +import com.volmit.iris.engine.parallel.BurstExecutor; +import com.volmit.iris.engine.parallel.MultiBurst; import com.volmit.iris.util.B; import com.volmit.iris.util.KList; import com.volmit.iris.util.KMap; diff --git a/src/main/java/com/volmit/iris/scaffold/data/IOAdapter.java b/src/main/java/com/volmit/iris/engine/data/IOAdapter.java similarity index 96% rename from src/main/java/com/volmit/iris/scaffold/data/IOAdapter.java rename to src/main/java/com/volmit/iris/engine/data/IOAdapter.java index e7f223262..2e0ac1064 100644 --- a/src/main/java/com/volmit/iris/scaffold/data/IOAdapter.java +++ b/src/main/java/com/volmit/iris/engine/data/IOAdapter.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.scaffold.data; +package com.volmit.iris.engine.data; import java.io.DataInputStream; import java.io.DataOutputStream; diff --git a/src/main/java/com/volmit/iris/scaffold/data/io/Deserializer.java b/src/main/java/com/volmit/iris/engine/data/io/Deserializer.java similarity index 97% rename from src/main/java/com/volmit/iris/scaffold/data/io/Deserializer.java rename to src/main/java/com/volmit/iris/engine/data/io/Deserializer.java index c8a398285..40bae9763 100644 --- a/src/main/java/com/volmit/iris/scaffold/data/io/Deserializer.java +++ b/src/main/java/com/volmit/iris/engine/data/io/Deserializer.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.scaffold.data.io; +package com.volmit.iris.engine.data.io; import java.io.*; import java.net.URL; diff --git a/src/main/java/com/volmit/iris/scaffold/data/io/ExceptionBiFunction.java b/src/main/java/com/volmit/iris/engine/data/io/ExceptionBiFunction.java similarity index 95% rename from src/main/java/com/volmit/iris/scaffold/data/io/ExceptionBiFunction.java rename to src/main/java/com/volmit/iris/engine/data/io/ExceptionBiFunction.java index 980ce601c..e13754bd1 100644 --- a/src/main/java/com/volmit/iris/scaffold/data/io/ExceptionBiFunction.java +++ b/src/main/java/com/volmit/iris/engine/data/io/ExceptionBiFunction.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.scaffold.data.io; +package com.volmit.iris.engine.data.io; @FunctionalInterface public interface ExceptionBiFunction { diff --git a/src/main/java/com/volmit/iris/scaffold/data/io/ExceptionTriConsumer.java b/src/main/java/com/volmit/iris/engine/data/io/ExceptionTriConsumer.java similarity index 95% rename from src/main/java/com/volmit/iris/scaffold/data/io/ExceptionTriConsumer.java rename to src/main/java/com/volmit/iris/engine/data/io/ExceptionTriConsumer.java index 34d1aa9ec..64a7e0848 100644 --- a/src/main/java/com/volmit/iris/scaffold/data/io/ExceptionTriConsumer.java +++ b/src/main/java/com/volmit/iris/engine/data/io/ExceptionTriConsumer.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.scaffold.data.io; +package com.volmit.iris.engine.data.io; @FunctionalInterface public interface ExceptionTriConsumer { diff --git a/src/main/java/com/volmit/iris/scaffold/data/io/MaxDepthIO.java b/src/main/java/com/volmit/iris/engine/data/io/MaxDepthIO.java similarity index 96% rename from src/main/java/com/volmit/iris/scaffold/data/io/MaxDepthIO.java rename to src/main/java/com/volmit/iris/engine/data/io/MaxDepthIO.java index 9fcf1802d..2146275d4 100644 --- a/src/main/java/com/volmit/iris/scaffold/data/io/MaxDepthIO.java +++ b/src/main/java/com/volmit/iris/engine/data/io/MaxDepthIO.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.scaffold.data.io; +package com.volmit.iris.engine.data.io; public interface MaxDepthIO { diff --git a/src/main/java/com/volmit/iris/scaffold/data/io/MaxDepthReachedException.java b/src/main/java/com/volmit/iris/engine/data/io/MaxDepthReachedException.java similarity index 96% rename from src/main/java/com/volmit/iris/scaffold/data/io/MaxDepthReachedException.java rename to src/main/java/com/volmit/iris/engine/data/io/MaxDepthReachedException.java index a12b1bb28..bcd38ca59 100644 --- a/src/main/java/com/volmit/iris/scaffold/data/io/MaxDepthReachedException.java +++ b/src/main/java/com/volmit/iris/engine/data/io/MaxDepthReachedException.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.scaffold.data.io; +package com.volmit.iris.engine.data.io; /** * Exception indicating that the maximum (de-)serialization depth has been reached. diff --git a/src/main/java/com/volmit/iris/scaffold/data/io/Serializer.java b/src/main/java/com/volmit/iris/engine/data/io/Serializer.java similarity index 96% rename from src/main/java/com/volmit/iris/scaffold/data/io/Serializer.java rename to src/main/java/com/volmit/iris/engine/data/io/Serializer.java index 807695058..e140d6298 100644 --- a/src/main/java/com/volmit/iris/scaffold/data/io/Serializer.java +++ b/src/main/java/com/volmit/iris/engine/data/io/Serializer.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.scaffold.data.io; +package com.volmit.iris.engine.data.io; import java.io.*; diff --git a/src/main/java/com/volmit/iris/scaffold/data/io/StringDeserializer.java b/src/main/java/com/volmit/iris/engine/data/io/StringDeserializer.java similarity index 97% rename from src/main/java/com/volmit/iris/scaffold/data/io/StringDeserializer.java rename to src/main/java/com/volmit/iris/engine/data/io/StringDeserializer.java index c9167a6bd..065e6e3e1 100644 --- a/src/main/java/com/volmit/iris/scaffold/data/io/StringDeserializer.java +++ b/src/main/java/com/volmit/iris/engine/data/io/StringDeserializer.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.scaffold.data.io; +package com.volmit.iris.engine.data.io; import java.io.*; diff --git a/src/main/java/com/volmit/iris/scaffold/data/io/StringSerializer.java b/src/main/java/com/volmit/iris/engine/data/io/StringSerializer.java similarity index 97% rename from src/main/java/com/volmit/iris/scaffold/data/io/StringSerializer.java rename to src/main/java/com/volmit/iris/engine/data/io/StringSerializer.java index 5e2ca5e50..389c64e29 100644 --- a/src/main/java/com/volmit/iris/scaffold/data/io/StringSerializer.java +++ b/src/main/java/com/volmit/iris/engine/data/io/StringSerializer.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.scaffold.data.io; +package com.volmit.iris.engine.data.io; import java.io.*; diff --git a/src/main/java/com/volmit/iris/scaffold/data/mca/Chunk.java b/src/main/java/com/volmit/iris/engine/data/mca/Chunk.java similarity index 98% rename from src/main/java/com/volmit/iris/scaffold/data/mca/Chunk.java rename to src/main/java/com/volmit/iris/engine/data/mca/Chunk.java index e9ea20ca9..060a169a7 100644 --- a/src/main/java/com/volmit/iris/scaffold/data/mca/Chunk.java +++ b/src/main/java/com/volmit/iris/engine/data/mca/Chunk.java @@ -16,18 +16,18 @@ * along with this program. If not, see . */ -package com.volmit.iris.scaffold.data.mca; +package com.volmit.iris.engine.data.mca; -import com.volmit.iris.scaffold.data.nbt.io.NBTDeserializer; -import com.volmit.iris.scaffold.data.nbt.io.NBTSerializer; -import com.volmit.iris.scaffold.data.nbt.io.NamedTag; -import com.volmit.iris.scaffold.data.nbt.tag.CompoundTag; -import com.volmit.iris.scaffold.data.nbt.tag.ListTag; +import com.volmit.iris.engine.data.nbt.io.NBTDeserializer; +import com.volmit.iris.engine.data.nbt.io.NBTSerializer; +import com.volmit.iris.engine.data.nbt.io.NamedTag; +import com.volmit.iris.engine.data.nbt.tag.CompoundTag; +import com.volmit.iris.engine.data.nbt.tag.ListTag; import java.io.*; import java.util.Arrays; -import static com.volmit.iris.scaffold.data.mca.LoadFlags.*; +import static com.volmit.iris.engine.data.mca.LoadFlags.*; public class Chunk { diff --git a/src/main/java/com/volmit/iris/scaffold/data/mca/CompressionType.java b/src/main/java/com/volmit/iris/engine/data/mca/CompressionType.java similarity index 98% rename from src/main/java/com/volmit/iris/scaffold/data/mca/CompressionType.java rename to src/main/java/com/volmit/iris/engine/data/mca/CompressionType.java index 3707548d8..f4017c645 100644 --- a/src/main/java/com/volmit/iris/scaffold/data/mca/CompressionType.java +++ b/src/main/java/com/volmit/iris/engine/data/mca/CompressionType.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.scaffold.data.mca; +package com.volmit.iris.engine.data.mca; import java.io.IOException; import java.io.InputStream; diff --git a/src/main/java/com/volmit/iris/scaffold/data/mca/ExceptionFunction.java b/src/main/java/com/volmit/iris/engine/data/mca/ExceptionFunction.java similarity index 95% rename from src/main/java/com/volmit/iris/scaffold/data/mca/ExceptionFunction.java rename to src/main/java/com/volmit/iris/engine/data/mca/ExceptionFunction.java index 91ab587a4..151134a71 100644 --- a/src/main/java/com/volmit/iris/scaffold/data/mca/ExceptionFunction.java +++ b/src/main/java/com/volmit/iris/engine/data/mca/ExceptionFunction.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.scaffold.data.mca; +package com.volmit.iris.engine.data.mca; @FunctionalInterface public interface ExceptionFunction { diff --git a/src/main/java/com/volmit/iris/scaffold/data/mca/LoadFlags.java b/src/main/java/com/volmit/iris/engine/data/mca/LoadFlags.java similarity index 97% rename from src/main/java/com/volmit/iris/scaffold/data/mca/LoadFlags.java rename to src/main/java/com/volmit/iris/engine/data/mca/LoadFlags.java index d73ef54c1..cf40b3948 100644 --- a/src/main/java/com/volmit/iris/scaffold/data/mca/LoadFlags.java +++ b/src/main/java/com/volmit/iris/engine/data/mca/LoadFlags.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.scaffold.data.mca; +package com.volmit.iris.engine.data.mca; public class LoadFlags { diff --git a/src/main/java/com/volmit/iris/scaffold/data/mca/MCAFile.java b/src/main/java/com/volmit/iris/engine/data/mca/MCAFile.java similarity index 99% rename from src/main/java/com/volmit/iris/scaffold/data/mca/MCAFile.java rename to src/main/java/com/volmit/iris/engine/data/mca/MCAFile.java index f4b11cad6..be77a3bce 100644 --- a/src/main/java/com/volmit/iris/scaffold/data/mca/MCAFile.java +++ b/src/main/java/com/volmit/iris/engine/data/mca/MCAFile.java @@ -16,9 +16,9 @@ * along with this program. If not, see . */ -package com.volmit.iris.scaffold.data.mca; +package com.volmit.iris.engine.data.mca; -import com.volmit.iris.scaffold.data.nbt.tag.CompoundTag; +import com.volmit.iris.engine.data.nbt.tag.CompoundTag; import java.io.IOException; import java.io.RandomAccessFile; diff --git a/src/main/java/com/volmit/iris/scaffold/data/mca/MCAUtil.java b/src/main/java/com/volmit/iris/engine/data/mca/MCAUtil.java similarity index 99% rename from src/main/java/com/volmit/iris/scaffold/data/mca/MCAUtil.java rename to src/main/java/com/volmit/iris/engine/data/mca/MCAUtil.java index 5330c8025..e438cae10 100644 --- a/src/main/java/com/volmit/iris/scaffold/data/mca/MCAUtil.java +++ b/src/main/java/com/volmit/iris/engine/data/mca/MCAUtil.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.scaffold.data.mca; +package com.volmit.iris.engine.data.mca; import java.io.File; import java.io.IOException; diff --git a/src/main/java/com/volmit/iris/scaffold/data/mca/Section.java b/src/main/java/com/volmit/iris/engine/data/mca/Section.java similarity index 98% rename from src/main/java/com/volmit/iris/scaffold/data/mca/Section.java rename to src/main/java/com/volmit/iris/engine/data/mca/Section.java index 3be1540d7..44349b853 100644 --- a/src/main/java/com/volmit/iris/scaffold/data/mca/Section.java +++ b/src/main/java/com/volmit/iris/engine/data/mca/Section.java @@ -16,13 +16,13 @@ * along with this program. If not, see . */ -package com.volmit.iris.scaffold.data.mca; +package com.volmit.iris.engine.data.mca; import com.volmit.iris.Iris; -import com.volmit.iris.scaffold.data.nbt.tag.ByteArrayTag; -import com.volmit.iris.scaffold.data.nbt.tag.CompoundTag; -import com.volmit.iris.scaffold.data.nbt.tag.ListTag; -import com.volmit.iris.scaffold.data.nbt.tag.LongArrayTag; +import com.volmit.iris.engine.data.nbt.tag.ByteArrayTag; +import com.volmit.iris.engine.data.nbt.tag.CompoundTag; +import com.volmit.iris.engine.data.nbt.tag.ListTag; +import com.volmit.iris.engine.data.nbt.tag.LongArrayTag; import com.volmit.iris.util.KMap; import java.util.ArrayList; diff --git a/src/main/java/com/volmit/iris/scaffold/data/nbt/io/NBTDeserializer.java b/src/main/java/com/volmit/iris/engine/data/nbt/io/NBTDeserializer.java similarity index 90% rename from src/main/java/com/volmit/iris/scaffold/data/nbt/io/NBTDeserializer.java rename to src/main/java/com/volmit/iris/engine/data/nbt/io/NBTDeserializer.java index 1e58af87f..2e04a48b5 100644 --- a/src/main/java/com/volmit/iris/scaffold/data/nbt/io/NBTDeserializer.java +++ b/src/main/java/com/volmit/iris/engine/data/nbt/io/NBTDeserializer.java @@ -16,10 +16,10 @@ * along with this program. If not, see . */ -package com.volmit.iris.scaffold.data.nbt.io; +package com.volmit.iris.engine.data.nbt.io; -import com.volmit.iris.scaffold.data.io.Deserializer; -import com.volmit.iris.scaffold.data.nbt.tag.Tag; +import com.volmit.iris.engine.data.io.Deserializer; +import com.volmit.iris.engine.data.nbt.tag.Tag; import java.io.IOException; import java.io.InputStream; diff --git a/src/main/java/com/volmit/iris/scaffold/data/nbt/io/NBTInputStream.java b/src/main/java/com/volmit/iris/engine/data/nbt/io/NBTInputStream.java similarity index 96% rename from src/main/java/com/volmit/iris/scaffold/data/nbt/io/NBTInputStream.java rename to src/main/java/com/volmit/iris/engine/data/nbt/io/NBTInputStream.java index c7da2b884..06e51df97 100644 --- a/src/main/java/com/volmit/iris/scaffold/data/nbt/io/NBTInputStream.java +++ b/src/main/java/com/volmit/iris/engine/data/nbt/io/NBTInputStream.java @@ -16,11 +16,11 @@ * along with this program. If not, see . */ -package com.volmit.iris.scaffold.data.nbt.io; +package com.volmit.iris.engine.data.nbt.io; -import com.volmit.iris.scaffold.data.io.ExceptionBiFunction; -import com.volmit.iris.scaffold.data.io.MaxDepthIO; -import com.volmit.iris.scaffold.data.nbt.tag.*; +import com.volmit.iris.engine.data.io.ExceptionBiFunction; +import com.volmit.iris.engine.data.io.MaxDepthIO; +import com.volmit.iris.engine.data.nbt.tag.*; import java.io.DataInputStream; import java.io.IOException; diff --git a/src/main/java/com/volmit/iris/scaffold/data/nbt/io/NBTOutputStream.java b/src/main/java/com/volmit/iris/engine/data/nbt/io/NBTOutputStream.java similarity index 96% rename from src/main/java/com/volmit/iris/scaffold/data/nbt/io/NBTOutputStream.java rename to src/main/java/com/volmit/iris/engine/data/nbt/io/NBTOutputStream.java index 62ad2eb7a..da8de1673 100644 --- a/src/main/java/com/volmit/iris/scaffold/data/nbt/io/NBTOutputStream.java +++ b/src/main/java/com/volmit/iris/engine/data/nbt/io/NBTOutputStream.java @@ -16,11 +16,11 @@ * along with this program. If not, see . */ -package com.volmit.iris.scaffold.data.nbt.io; +package com.volmit.iris.engine.data.nbt.io; -import com.volmit.iris.scaffold.data.io.ExceptionTriConsumer; -import com.volmit.iris.scaffold.data.io.MaxDepthIO; -import com.volmit.iris.scaffold.data.nbt.tag.*; +import com.volmit.iris.engine.data.io.ExceptionTriConsumer; +import com.volmit.iris.engine.data.io.MaxDepthIO; +import com.volmit.iris.engine.data.nbt.tag.*; import java.io.DataOutputStream; import java.io.IOException; diff --git a/src/main/java/com/volmit/iris/scaffold/data/nbt/io/NBTSerializer.java b/src/main/java/com/volmit/iris/engine/data/nbt/io/NBTSerializer.java similarity index 91% rename from src/main/java/com/volmit/iris/scaffold/data/nbt/io/NBTSerializer.java rename to src/main/java/com/volmit/iris/engine/data/nbt/io/NBTSerializer.java index 2bbf7c2d2..fb336e0f2 100644 --- a/src/main/java/com/volmit/iris/scaffold/data/nbt/io/NBTSerializer.java +++ b/src/main/java/com/volmit/iris/engine/data/nbt/io/NBTSerializer.java @@ -16,10 +16,10 @@ * along with this program. If not, see . */ -package com.volmit.iris.scaffold.data.nbt.io; +package com.volmit.iris.engine.data.nbt.io; -import com.volmit.iris.scaffold.data.io.Serializer; -import com.volmit.iris.scaffold.data.nbt.tag.Tag; +import com.volmit.iris.engine.data.io.Serializer; +import com.volmit.iris.engine.data.nbt.tag.Tag; import java.io.IOException; import java.io.OutputStream; diff --git a/src/main/java/com/volmit/iris/scaffold/data/nbt/io/NBTUtil.java b/src/main/java/com/volmit/iris/engine/data/nbt/io/NBTUtil.java similarity index 97% rename from src/main/java/com/volmit/iris/scaffold/data/nbt/io/NBTUtil.java rename to src/main/java/com/volmit/iris/engine/data/nbt/io/NBTUtil.java index 5dc47cd80..1cd70167c 100644 --- a/src/main/java/com/volmit/iris/scaffold/data/nbt/io/NBTUtil.java +++ b/src/main/java/com/volmit/iris/engine/data/nbt/io/NBTUtil.java @@ -16,9 +16,9 @@ * along with this program. If not, see . */ -package com.volmit.iris.scaffold.data.nbt.io; +package com.volmit.iris.engine.data.nbt.io; -import com.volmit.iris.scaffold.data.nbt.tag.Tag; +import com.volmit.iris.engine.data.nbt.tag.Tag; import java.io.*; import java.util.zip.GZIPInputStream; diff --git a/src/main/java/com/volmit/iris/scaffold/data/nbt/io/NamedTag.java b/src/main/java/com/volmit/iris/engine/data/nbt/io/NamedTag.java similarity index 92% rename from src/main/java/com/volmit/iris/scaffold/data/nbt/io/NamedTag.java rename to src/main/java/com/volmit/iris/engine/data/nbt/io/NamedTag.java index f85052817..57cfd0b25 100644 --- a/src/main/java/com/volmit/iris/scaffold/data/nbt/io/NamedTag.java +++ b/src/main/java/com/volmit/iris/engine/data/nbt/io/NamedTag.java @@ -16,9 +16,9 @@ * along with this program. If not, see . */ -package com.volmit.iris.scaffold.data.nbt.io; +package com.volmit.iris.engine.data.nbt.io; -import com.volmit.iris.scaffold.data.nbt.tag.Tag; +import com.volmit.iris.engine.data.nbt.tag.Tag; public class NamedTag { diff --git a/src/main/java/com/volmit/iris/scaffold/data/nbt/io/ParseException.java b/src/main/java/com/volmit/iris/engine/data/nbt/io/ParseException.java similarity index 96% rename from src/main/java/com/volmit/iris/scaffold/data/nbt/io/ParseException.java rename to src/main/java/com/volmit/iris/engine/data/nbt/io/ParseException.java index 3478ba7f9..f42a0e685 100644 --- a/src/main/java/com/volmit/iris/scaffold/data/nbt/io/ParseException.java +++ b/src/main/java/com/volmit/iris/engine/data/nbt/io/ParseException.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.scaffold.data.nbt.io; +package com.volmit.iris.engine.data.nbt.io; import java.io.IOException; diff --git a/src/main/java/com/volmit/iris/scaffold/data/nbt/io/SNBTDeserializer.java b/src/main/java/com/volmit/iris/engine/data/nbt/io/SNBTDeserializer.java similarity index 90% rename from src/main/java/com/volmit/iris/scaffold/data/nbt/io/SNBTDeserializer.java rename to src/main/java/com/volmit/iris/engine/data/nbt/io/SNBTDeserializer.java index e8b84bd96..4037d4d95 100644 --- a/src/main/java/com/volmit/iris/scaffold/data/nbt/io/SNBTDeserializer.java +++ b/src/main/java/com/volmit/iris/engine/data/nbt/io/SNBTDeserializer.java @@ -16,10 +16,10 @@ * along with this program. If not, see . */ -package com.volmit.iris.scaffold.data.nbt.io; +package com.volmit.iris.engine.data.nbt.io; -import com.volmit.iris.scaffold.data.io.StringDeserializer; -import com.volmit.iris.scaffold.data.nbt.tag.Tag; +import com.volmit.iris.engine.data.io.StringDeserializer; +import com.volmit.iris.engine.data.nbt.tag.Tag; import java.io.BufferedReader; import java.io.IOException; diff --git a/src/main/java/com/volmit/iris/scaffold/data/nbt/io/SNBTParser.java b/src/main/java/com/volmit/iris/engine/data/nbt/io/SNBTParser.java similarity index 98% rename from src/main/java/com/volmit/iris/scaffold/data/nbt/io/SNBTParser.java rename to src/main/java/com/volmit/iris/engine/data/nbt/io/SNBTParser.java index c83f51bf2..f2681721b 100644 --- a/src/main/java/com/volmit/iris/scaffold/data/nbt/io/SNBTParser.java +++ b/src/main/java/com/volmit/iris/engine/data/nbt/io/SNBTParser.java @@ -16,11 +16,11 @@ * along with this program. If not, see . */ -package com.volmit.iris.scaffold.data.nbt.io; +package com.volmit.iris.engine.data.nbt.io; import com.volmit.iris.Iris; -import com.volmit.iris.scaffold.data.io.MaxDepthIO; -import com.volmit.iris.scaffold.data.nbt.tag.*; +import com.volmit.iris.engine.data.io.MaxDepthIO; +import com.volmit.iris.engine.data.nbt.tag.*; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/com/volmit/iris/scaffold/data/nbt/io/SNBTSerializer.java b/src/main/java/com/volmit/iris/engine/data/nbt/io/SNBTSerializer.java similarity index 88% rename from src/main/java/com/volmit/iris/scaffold/data/nbt/io/SNBTSerializer.java rename to src/main/java/com/volmit/iris/engine/data/nbt/io/SNBTSerializer.java index 31b724ff7..f284e6473 100644 --- a/src/main/java/com/volmit/iris/scaffold/data/nbt/io/SNBTSerializer.java +++ b/src/main/java/com/volmit/iris/engine/data/nbt/io/SNBTSerializer.java @@ -16,10 +16,10 @@ * along with this program. If not, see . */ -package com.volmit.iris.scaffold.data.nbt.io; +package com.volmit.iris.engine.data.nbt.io; -import com.volmit.iris.scaffold.data.io.StringSerializer; -import com.volmit.iris.scaffold.data.nbt.tag.Tag; +import com.volmit.iris.engine.data.io.StringSerializer; +import com.volmit.iris.engine.data.nbt.tag.Tag; import java.io.IOException; import java.io.Writer; diff --git a/src/main/java/com/volmit/iris/scaffold/data/nbt/io/SNBTUtil.java b/src/main/java/com/volmit/iris/engine/data/nbt/io/SNBTUtil.java similarity index 91% rename from src/main/java/com/volmit/iris/scaffold/data/nbt/io/SNBTUtil.java rename to src/main/java/com/volmit/iris/engine/data/nbt/io/SNBTUtil.java index e47836912..151ee5aac 100644 --- a/src/main/java/com/volmit/iris/scaffold/data/nbt/io/SNBTUtil.java +++ b/src/main/java/com/volmit/iris/engine/data/nbt/io/SNBTUtil.java @@ -16,9 +16,9 @@ * along with this program. If not, see . */ -package com.volmit.iris.scaffold.data.nbt.io; +package com.volmit.iris.engine.data.nbt.io; -import com.volmit.iris.scaffold.data.nbt.tag.Tag; +import com.volmit.iris.engine.data.nbt.tag.Tag; import java.io.IOException; diff --git a/src/main/java/com/volmit/iris/scaffold/data/nbt/io/SNBTWriter.java b/src/main/java/com/volmit/iris/engine/data/nbt/io/SNBTWriter.java similarity index 97% rename from src/main/java/com/volmit/iris/scaffold/data/nbt/io/SNBTWriter.java rename to src/main/java/com/volmit/iris/engine/data/nbt/io/SNBTWriter.java index c3a2de04d..636b2a15e 100644 --- a/src/main/java/com/volmit/iris/scaffold/data/nbt/io/SNBTWriter.java +++ b/src/main/java/com/volmit/iris/engine/data/nbt/io/SNBTWriter.java @@ -16,10 +16,10 @@ * along with this program. If not, see . */ -package com.volmit.iris.scaffold.data.nbt.io; +package com.volmit.iris.engine.data.nbt.io; -import com.volmit.iris.scaffold.data.io.MaxDepthIO; -import com.volmit.iris.scaffold.data.nbt.tag.*; +import com.volmit.iris.engine.data.io.MaxDepthIO; +import com.volmit.iris.engine.data.nbt.tag.*; import java.io.IOException; import java.io.Writer; diff --git a/src/main/java/com/volmit/iris/scaffold/data/nbt/io/StringPointer.java b/src/main/java/com/volmit/iris/engine/data/nbt/io/StringPointer.java similarity index 98% rename from src/main/java/com/volmit/iris/scaffold/data/nbt/io/StringPointer.java rename to src/main/java/com/volmit/iris/engine/data/nbt/io/StringPointer.java index adfd33f73..599984479 100644 --- a/src/main/java/com/volmit/iris/scaffold/data/nbt/io/StringPointer.java +++ b/src/main/java/com/volmit/iris/engine/data/nbt/io/StringPointer.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.scaffold.data.nbt.io; +package com.volmit.iris.engine.data.nbt.io; public class StringPointer { diff --git a/src/main/java/com/volmit/iris/scaffold/data/nbt/tag/ArrayTag.java b/src/main/java/com/volmit/iris/engine/data/nbt/tag/ArrayTag.java similarity index 97% rename from src/main/java/com/volmit/iris/scaffold/data/nbt/tag/ArrayTag.java rename to src/main/java/com/volmit/iris/engine/data/nbt/tag/ArrayTag.java index 84a48565b..455c97549 100644 --- a/src/main/java/com/volmit/iris/scaffold/data/nbt/tag/ArrayTag.java +++ b/src/main/java/com/volmit/iris/engine/data/nbt/tag/ArrayTag.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.scaffold.data.nbt.tag; +package com.volmit.iris.engine.data.nbt.tag; import java.lang.reflect.Array; diff --git a/src/main/java/com/volmit/iris/scaffold/data/nbt/tag/ByteArrayTag.java b/src/main/java/com/volmit/iris/engine/data/nbt/tag/ByteArrayTag.java similarity index 97% rename from src/main/java/com/volmit/iris/scaffold/data/nbt/tag/ByteArrayTag.java rename to src/main/java/com/volmit/iris/engine/data/nbt/tag/ByteArrayTag.java index c3e6e979b..992ee0637 100644 --- a/src/main/java/com/volmit/iris/scaffold/data/nbt/tag/ByteArrayTag.java +++ b/src/main/java/com/volmit/iris/engine/data/nbt/tag/ByteArrayTag.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.scaffold.data.nbt.tag; +package com.volmit.iris.engine.data.nbt.tag; import java.util.Arrays; diff --git a/src/main/java/com/volmit/iris/scaffold/data/nbt/tag/ByteTag.java b/src/main/java/com/volmit/iris/engine/data/nbt/tag/ByteTag.java similarity index 97% rename from src/main/java/com/volmit/iris/scaffold/data/nbt/tag/ByteTag.java rename to src/main/java/com/volmit/iris/engine/data/nbt/tag/ByteTag.java index 0fcb91c25..24deab199 100644 --- a/src/main/java/com/volmit/iris/scaffold/data/nbt/tag/ByteTag.java +++ b/src/main/java/com/volmit/iris/engine/data/nbt/tag/ByteTag.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.scaffold.data.nbt.tag; +package com.volmit.iris.engine.data.nbt.tag; public class ByteTag extends NumberTag implements Comparable { diff --git a/src/main/java/com/volmit/iris/scaffold/data/nbt/tag/CompoundTag.java b/src/main/java/com/volmit/iris/engine/data/nbt/tag/CompoundTag.java similarity index 98% rename from src/main/java/com/volmit/iris/scaffold/data/nbt/tag/CompoundTag.java rename to src/main/java/com/volmit/iris/engine/data/nbt/tag/CompoundTag.java index 7bc880947..004c72ceb 100644 --- a/src/main/java/com/volmit/iris/scaffold/data/nbt/tag/CompoundTag.java +++ b/src/main/java/com/volmit/iris/engine/data/nbt/tag/CompoundTag.java @@ -16,9 +16,9 @@ * along with this program. If not, see . */ -package com.volmit.iris.scaffold.data.nbt.tag; +package com.volmit.iris.engine.data.nbt.tag; -import com.volmit.iris.scaffold.data.io.MaxDepthIO; +import com.volmit.iris.engine.data.io.MaxDepthIO; import com.volmit.iris.util.KMap; import java.util.*; diff --git a/src/main/java/com/volmit/iris/scaffold/data/nbt/tag/DoubleTag.java b/src/main/java/com/volmit/iris/engine/data/nbt/tag/DoubleTag.java similarity index 97% rename from src/main/java/com/volmit/iris/scaffold/data/nbt/tag/DoubleTag.java rename to src/main/java/com/volmit/iris/engine/data/nbt/tag/DoubleTag.java index d2d73b72d..a29026ef2 100644 --- a/src/main/java/com/volmit/iris/scaffold/data/nbt/tag/DoubleTag.java +++ b/src/main/java/com/volmit/iris/engine/data/nbt/tag/DoubleTag.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.scaffold.data.nbt.tag; +package com.volmit.iris.engine.data.nbt.tag; public class DoubleTag extends NumberTag implements Comparable { diff --git a/src/main/java/com/volmit/iris/scaffold/data/nbt/tag/EndTag.java b/src/main/java/com/volmit/iris/engine/data/nbt/tag/EndTag.java similarity index 96% rename from src/main/java/com/volmit/iris/scaffold/data/nbt/tag/EndTag.java rename to src/main/java/com/volmit/iris/engine/data/nbt/tag/EndTag.java index d89bfe4b8..7c9796d9c 100644 --- a/src/main/java/com/volmit/iris/scaffold/data/nbt/tag/EndTag.java +++ b/src/main/java/com/volmit/iris/engine/data/nbt/tag/EndTag.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.scaffold.data.nbt.tag; +package com.volmit.iris.engine.data.nbt.tag; public final class EndTag extends Tag { diff --git a/src/main/java/com/volmit/iris/scaffold/data/nbt/tag/FloatTag.java b/src/main/java/com/volmit/iris/engine/data/nbt/tag/FloatTag.java similarity index 97% rename from src/main/java/com/volmit/iris/scaffold/data/nbt/tag/FloatTag.java rename to src/main/java/com/volmit/iris/engine/data/nbt/tag/FloatTag.java index fca970a43..3ef1a3e3c 100644 --- a/src/main/java/com/volmit/iris/scaffold/data/nbt/tag/FloatTag.java +++ b/src/main/java/com/volmit/iris/engine/data/nbt/tag/FloatTag.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.scaffold.data.nbt.tag; +package com.volmit.iris.engine.data.nbt.tag; public class FloatTag extends NumberTag implements Comparable { diff --git a/src/main/java/com/volmit/iris/scaffold/data/nbt/tag/IntArrayTag.java b/src/main/java/com/volmit/iris/engine/data/nbt/tag/IntArrayTag.java similarity index 97% rename from src/main/java/com/volmit/iris/scaffold/data/nbt/tag/IntArrayTag.java rename to src/main/java/com/volmit/iris/engine/data/nbt/tag/IntArrayTag.java index ab84c8561..73c2aa166 100644 --- a/src/main/java/com/volmit/iris/scaffold/data/nbt/tag/IntArrayTag.java +++ b/src/main/java/com/volmit/iris/engine/data/nbt/tag/IntArrayTag.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.scaffold.data.nbt.tag; +package com.volmit.iris.engine.data.nbt.tag; import java.util.Arrays; diff --git a/src/main/java/com/volmit/iris/scaffold/data/nbt/tag/IntTag.java b/src/main/java/com/volmit/iris/engine/data/nbt/tag/IntTag.java similarity index 97% rename from src/main/java/com/volmit/iris/scaffold/data/nbt/tag/IntTag.java rename to src/main/java/com/volmit/iris/engine/data/nbt/tag/IntTag.java index 906e66beb..c5d5bb9b8 100644 --- a/src/main/java/com/volmit/iris/scaffold/data/nbt/tag/IntTag.java +++ b/src/main/java/com/volmit/iris/engine/data/nbt/tag/IntTag.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.scaffold.data.nbt.tag; +package com.volmit.iris.engine.data.nbt.tag; public class IntTag extends NumberTag implements Comparable { diff --git a/src/main/java/com/volmit/iris/scaffold/data/nbt/tag/ListTag.java b/src/main/java/com/volmit/iris/engine/data/nbt/tag/ListTag.java similarity index 99% rename from src/main/java/com/volmit/iris/scaffold/data/nbt/tag/ListTag.java rename to src/main/java/com/volmit/iris/engine/data/nbt/tag/ListTag.java index e7c65dbe4..40566c61d 100644 --- a/src/main/java/com/volmit/iris/scaffold/data/nbt/tag/ListTag.java +++ b/src/main/java/com/volmit/iris/engine/data/nbt/tag/ListTag.java @@ -16,9 +16,9 @@ * along with this program. If not, see . */ -package com.volmit.iris.scaffold.data.nbt.tag; +package com.volmit.iris.engine.data.nbt.tag; -import com.volmit.iris.scaffold.data.io.MaxDepthIO; +import com.volmit.iris.engine.data.io.MaxDepthIO; import com.volmit.iris.util.KList; import java.util.*; diff --git a/src/main/java/com/volmit/iris/scaffold/data/nbt/tag/LongArrayTag.java b/src/main/java/com/volmit/iris/engine/data/nbt/tag/LongArrayTag.java similarity index 97% rename from src/main/java/com/volmit/iris/scaffold/data/nbt/tag/LongArrayTag.java rename to src/main/java/com/volmit/iris/engine/data/nbt/tag/LongArrayTag.java index 6ac91bb45..fe9b60f5f 100644 --- a/src/main/java/com/volmit/iris/scaffold/data/nbt/tag/LongArrayTag.java +++ b/src/main/java/com/volmit/iris/engine/data/nbt/tag/LongArrayTag.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.scaffold.data.nbt.tag; +package com.volmit.iris.engine.data.nbt.tag; import java.util.Arrays; diff --git a/src/main/java/com/volmit/iris/scaffold/data/nbt/tag/LongTag.java b/src/main/java/com/volmit/iris/engine/data/nbt/tag/LongTag.java similarity index 97% rename from src/main/java/com/volmit/iris/scaffold/data/nbt/tag/LongTag.java rename to src/main/java/com/volmit/iris/engine/data/nbt/tag/LongTag.java index b52b62ab0..003026d7d 100644 --- a/src/main/java/com/volmit/iris/scaffold/data/nbt/tag/LongTag.java +++ b/src/main/java/com/volmit/iris/engine/data/nbt/tag/LongTag.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.scaffold.data.nbt.tag; +package com.volmit.iris.engine.data.nbt.tag; public class LongTag extends NumberTag implements Comparable { diff --git a/src/main/java/com/volmit/iris/scaffold/data/nbt/tag/NonNullEntrySet.java b/src/main/java/com/volmit/iris/engine/data/nbt/tag/NonNullEntrySet.java similarity index 98% rename from src/main/java/com/volmit/iris/scaffold/data/nbt/tag/NonNullEntrySet.java rename to src/main/java/com/volmit/iris/engine/data/nbt/tag/NonNullEntrySet.java index 9ae678749..89f65a3f3 100644 --- a/src/main/java/com/volmit/iris/scaffold/data/nbt/tag/NonNullEntrySet.java +++ b/src/main/java/com/volmit/iris/engine/data/nbt/tag/NonNullEntrySet.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.scaffold.data.nbt.tag; +package com.volmit.iris.engine.data.nbt.tag; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/com/volmit/iris/scaffold/data/nbt/tag/NumberTag.java b/src/main/java/com/volmit/iris/engine/data/nbt/tag/NumberTag.java similarity index 96% rename from src/main/java/com/volmit/iris/scaffold/data/nbt/tag/NumberTag.java rename to src/main/java/com/volmit/iris/engine/data/nbt/tag/NumberTag.java index 32e37b62e..4c8ca15f5 100644 --- a/src/main/java/com/volmit/iris/scaffold/data/nbt/tag/NumberTag.java +++ b/src/main/java/com/volmit/iris/engine/data/nbt/tag/NumberTag.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.scaffold.data.nbt.tag; +package com.volmit.iris.engine.data.nbt.tag; public abstract class NumberTag> extends Tag { diff --git a/src/main/java/com/volmit/iris/scaffold/data/nbt/tag/ShortTag.java b/src/main/java/com/volmit/iris/engine/data/nbt/tag/ShortTag.java similarity index 97% rename from src/main/java/com/volmit/iris/scaffold/data/nbt/tag/ShortTag.java rename to src/main/java/com/volmit/iris/engine/data/nbt/tag/ShortTag.java index 75a701597..e021bb084 100644 --- a/src/main/java/com/volmit/iris/scaffold/data/nbt/tag/ShortTag.java +++ b/src/main/java/com/volmit/iris/engine/data/nbt/tag/ShortTag.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.scaffold.data.nbt.tag; +package com.volmit.iris.engine.data.nbt.tag; public class ShortTag extends NumberTag implements Comparable { diff --git a/src/main/java/com/volmit/iris/scaffold/data/nbt/tag/StringTag.java b/src/main/java/com/volmit/iris/engine/data/nbt/tag/StringTag.java similarity index 97% rename from src/main/java/com/volmit/iris/scaffold/data/nbt/tag/StringTag.java rename to src/main/java/com/volmit/iris/engine/data/nbt/tag/StringTag.java index c00acc02b..060b2495f 100644 --- a/src/main/java/com/volmit/iris/scaffold/data/nbt/tag/StringTag.java +++ b/src/main/java/com/volmit/iris/engine/data/nbt/tag/StringTag.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.scaffold.data.nbt.tag; +package com.volmit.iris.engine.data.nbt.tag; public class StringTag extends Tag implements Comparable { diff --git a/src/main/java/com/volmit/iris/scaffold/data/nbt/tag/Tag.java b/src/main/java/com/volmit/iris/engine/data/nbt/tag/Tag.java similarity index 98% rename from src/main/java/com/volmit/iris/scaffold/data/nbt/tag/Tag.java rename to src/main/java/com/volmit/iris/engine/data/nbt/tag/Tag.java index 709c7ac6e..f1f92ae46 100644 --- a/src/main/java/com/volmit/iris/scaffold/data/nbt/tag/Tag.java +++ b/src/main/java/com/volmit/iris/engine/data/nbt/tag/Tag.java @@ -16,9 +16,9 @@ * along with this program. If not, see . */ -package com.volmit.iris.scaffold.data.nbt.tag; +package com.volmit.iris.engine.data.nbt.tag; -import com.volmit.iris.scaffold.data.io.MaxDepthReachedException; +import com.volmit.iris.engine.data.io.MaxDepthReachedException; import java.util.Collections; import java.util.HashMap; diff --git a/src/main/java/com/volmit/iris/generator/decorator/IrisCeilingDecorator.java b/src/main/java/com/volmit/iris/engine/decorator/IrisCeilingDecorator.java similarity index 94% rename from src/main/java/com/volmit/iris/generator/decorator/IrisCeilingDecorator.java rename to src/main/java/com/volmit/iris/engine/decorator/IrisCeilingDecorator.java index 0bc379273..2bd6ac00b 100644 --- a/src/main/java/com/volmit/iris/generator/decorator/IrisCeilingDecorator.java +++ b/src/main/java/com/volmit/iris/engine/decorator/IrisCeilingDecorator.java @@ -21,9 +21,9 @@ package com.volmit.iris.generator.decorator; import com.volmit.iris.object.DecorationPart; import com.volmit.iris.object.IrisBiome; import com.volmit.iris.object.IrisDecorator; -import com.volmit.iris.scaffold.cache.Cache; -import com.volmit.iris.scaffold.engine.Engine; -import com.volmit.iris.scaffold.hunk.Hunk; +import com.volmit.iris.engine.cache.Cache; +import com.volmit.iris.engine.framework.Engine; +import com.volmit.iris.engine.hunk.Hunk; import org.bukkit.block.data.BlockData; public class IrisCeilingDecorator extends IrisEngineDecorator { diff --git a/src/main/java/com/volmit/iris/generator/decorator/IrisEngineDecorator.java b/src/main/java/com/volmit/iris/engine/decorator/IrisEngineDecorator.java similarity index 91% rename from src/main/java/com/volmit/iris/generator/decorator/IrisEngineDecorator.java rename to src/main/java/com/volmit/iris/engine/decorator/IrisEngineDecorator.java index 6ffdc0304..01f3474bd 100644 --- a/src/main/java/com/volmit/iris/generator/decorator/IrisEngineDecorator.java +++ b/src/main/java/com/volmit/iris/engine/decorator/IrisEngineDecorator.java @@ -22,10 +22,10 @@ import com.volmit.iris.Iris; import com.volmit.iris.object.DecorationPart; import com.volmit.iris.object.IrisBiome; import com.volmit.iris.object.IrisDecorator; -import com.volmit.iris.scaffold.cache.Cache; -import com.volmit.iris.scaffold.engine.Engine; -import com.volmit.iris.scaffold.engine.EngineAssignedComponent; -import com.volmit.iris.scaffold.engine.EngineDecorator; +import com.volmit.iris.engine.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.util.KList; import com.volmit.iris.util.RNG; import lombok.Getter; diff --git a/src/main/java/com/volmit/iris/generator/decorator/IrisSeaFloorDecorator.java b/src/main/java/com/volmit/iris/engine/decorator/IrisSeaFloorDecorator.java similarity index 95% rename from src/main/java/com/volmit/iris/generator/decorator/IrisSeaFloorDecorator.java rename to src/main/java/com/volmit/iris/engine/decorator/IrisSeaFloorDecorator.java index 214e45204..c35cc2138 100644 --- a/src/main/java/com/volmit/iris/generator/decorator/IrisSeaFloorDecorator.java +++ b/src/main/java/com/volmit/iris/engine/decorator/IrisSeaFloorDecorator.java @@ -21,9 +21,9 @@ package com.volmit.iris.generator.decorator; import com.volmit.iris.object.DecorationPart; import com.volmit.iris.object.IrisBiome; import com.volmit.iris.object.IrisDecorator; -import com.volmit.iris.scaffold.cache.Cache; -import com.volmit.iris.scaffold.engine.Engine; -import com.volmit.iris.scaffold.hunk.Hunk; +import com.volmit.iris.engine.cache.Cache; +import com.volmit.iris.engine.framework.Engine; +import com.volmit.iris.engine.hunk.Hunk; import org.bukkit.block.data.BlockData; public class IrisSeaFloorDecorator extends IrisEngineDecorator { diff --git a/src/main/java/com/volmit/iris/generator/decorator/IrisSeaSurfaceDecorator.java b/src/main/java/com/volmit/iris/engine/decorator/IrisSeaSurfaceDecorator.java similarity index 94% rename from src/main/java/com/volmit/iris/generator/decorator/IrisSeaSurfaceDecorator.java rename to src/main/java/com/volmit/iris/engine/decorator/IrisSeaSurfaceDecorator.java index 91b346ebb..ebc9a8645 100644 --- a/src/main/java/com/volmit/iris/generator/decorator/IrisSeaSurfaceDecorator.java +++ b/src/main/java/com/volmit/iris/engine/decorator/IrisSeaSurfaceDecorator.java @@ -21,9 +21,9 @@ package com.volmit.iris.generator.decorator; import com.volmit.iris.object.DecorationPart; import com.volmit.iris.object.IrisBiome; import com.volmit.iris.object.IrisDecorator; -import com.volmit.iris.scaffold.cache.Cache; -import com.volmit.iris.scaffold.engine.Engine; -import com.volmit.iris.scaffold.hunk.Hunk; +import com.volmit.iris.engine.cache.Cache; +import com.volmit.iris.engine.framework.Engine; +import com.volmit.iris.engine.hunk.Hunk; import org.bukkit.block.data.BlockData; public class IrisSeaSurfaceDecorator extends IrisEngineDecorator { diff --git a/src/main/java/com/volmit/iris/generator/decorator/IrisShoreLineDecorator.java b/src/main/java/com/volmit/iris/engine/decorator/IrisShoreLineDecorator.java similarity index 95% rename from src/main/java/com/volmit/iris/generator/decorator/IrisShoreLineDecorator.java rename to src/main/java/com/volmit/iris/engine/decorator/IrisShoreLineDecorator.java index af1125dff..337e500a1 100644 --- a/src/main/java/com/volmit/iris/generator/decorator/IrisShoreLineDecorator.java +++ b/src/main/java/com/volmit/iris/engine/decorator/IrisShoreLineDecorator.java @@ -21,9 +21,9 @@ package com.volmit.iris.generator.decorator; import com.volmit.iris.object.DecorationPart; import com.volmit.iris.object.IrisBiome; import com.volmit.iris.object.IrisDecorator; -import com.volmit.iris.scaffold.cache.Cache; -import com.volmit.iris.scaffold.engine.Engine; -import com.volmit.iris.scaffold.hunk.Hunk; +import com.volmit.iris.engine.cache.Cache; +import com.volmit.iris.engine.framework.Engine; +import com.volmit.iris.engine.hunk.Hunk; import org.bukkit.block.data.BlockData; public class IrisShoreLineDecorator extends IrisEngineDecorator { diff --git a/src/main/java/com/volmit/iris/generator/decorator/IrisSurfaceDecorator.java b/src/main/java/com/volmit/iris/engine/decorator/IrisSurfaceDecorator.java similarity index 96% rename from src/main/java/com/volmit/iris/generator/decorator/IrisSurfaceDecorator.java rename to src/main/java/com/volmit/iris/engine/decorator/IrisSurfaceDecorator.java index e5be3cd79..d879c25e2 100644 --- a/src/main/java/com/volmit/iris/generator/decorator/IrisSurfaceDecorator.java +++ b/src/main/java/com/volmit/iris/engine/decorator/IrisSurfaceDecorator.java @@ -23,9 +23,9 @@ import com.volmit.iris.object.DecorationPart; import com.volmit.iris.object.InferredType; import com.volmit.iris.object.IrisBiome; import com.volmit.iris.object.IrisDecorator; -import com.volmit.iris.scaffold.cache.Cache; -import com.volmit.iris.scaffold.engine.Engine; -import com.volmit.iris.scaffold.hunk.Hunk; +import com.volmit.iris.engine.cache.Cache; +import com.volmit.iris.engine.framework.Engine; +import com.volmit.iris.engine.hunk.Hunk; import org.bukkit.block.data.Bisected; import org.bukkit.block.data.BlockData; diff --git a/src/main/java/com/volmit/iris/scaffold/engine/BlockUpdater.java b/src/main/java/com/volmit/iris/engine/framework/BlockUpdater.java similarity index 96% rename from src/main/java/com/volmit/iris/scaffold/engine/BlockUpdater.java rename to src/main/java/com/volmit/iris/engine/framework/BlockUpdater.java index 444c4461f..58e21f90a 100644 --- a/src/main/java/com/volmit/iris/scaffold/engine/BlockUpdater.java +++ b/src/main/java/com/volmit/iris/engine/framework/BlockUpdater.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.scaffold.engine; +package com.volmit.iris.engine.framework; import com.volmit.iris.util.RNG; import org.bukkit.Chunk; diff --git a/src/main/java/com/volmit/iris/scaffold/engine/Engine.java b/src/main/java/com/volmit/iris/engine/framework/Engine.java similarity index 96% rename from src/main/java/com/volmit/iris/scaffold/engine/Engine.java rename to src/main/java/com/volmit/iris/engine/framework/Engine.java index 295a6df8f..80508c1b2 100644 --- a/src/main/java/com/volmit/iris/scaffold/engine/Engine.java +++ b/src/main/java/com/volmit/iris/engine/framework/Engine.java @@ -16,18 +16,18 @@ * along with this program. If not, see . */ -package com.volmit.iris.scaffold.engine; +package com.volmit.iris.engine.framework; import com.volmit.iris.Iris; import com.volmit.iris.manager.IrisDataManager; -import com.volmit.iris.manager.gui.Renderer; -import com.volmit.iris.map.RenderType; +import com.volmit.iris.gui.Renderer; +import com.volmit.iris.gui.RenderType; import com.volmit.iris.object.*; -import com.volmit.iris.scaffold.cache.Cache; -import com.volmit.iris.scaffold.data.DataProvider; -import com.volmit.iris.scaffold.hunk.Hunk; -import com.volmit.iris.scaffold.parallax.ParallaxAccess; -import com.volmit.iris.scaffold.parallel.MultiBurst; +import com.volmit.iris.engine.cache.Cache; +import com.volmit.iris.engine.data.DataProvider; +import com.volmit.iris.engine.hunk.Hunk; +import com.volmit.iris.engine.parallax.ParallaxAccess; +import com.volmit.iris.engine.parallel.MultiBurst; import com.volmit.iris.util.*; import org.bukkit.Chunk; import org.bukkit.Location; diff --git a/src/main/java/com/volmit/iris/scaffold/engine/EngineActuator.java b/src/main/java/com/volmit/iris/engine/framework/EngineActuator.java similarity index 91% rename from src/main/java/com/volmit/iris/scaffold/engine/EngineActuator.java rename to src/main/java/com/volmit/iris/engine/framework/EngineActuator.java index f369ce9f5..242f151b9 100644 --- a/src/main/java/com/volmit/iris/scaffold/engine/EngineActuator.java +++ b/src/main/java/com/volmit/iris/engine/framework/EngineActuator.java @@ -16,9 +16,9 @@ * along with this program. If not, see . */ -package com.volmit.iris.scaffold.engine; +package com.volmit.iris.engine.framework; -import com.volmit.iris.scaffold.hunk.Hunk; +import com.volmit.iris.engine.hunk.Hunk; public interface EngineActuator extends EngineComponent { void actuate(int x, int z, Hunk output); diff --git a/src/main/java/com/volmit/iris/scaffold/engine/EngineAssignedActuator.java b/src/main/java/com/volmit/iris/engine/framework/EngineAssignedActuator.java similarity index 93% rename from src/main/java/com/volmit/iris/scaffold/engine/EngineAssignedActuator.java rename to src/main/java/com/volmit/iris/engine/framework/EngineAssignedActuator.java index a91cc4665..9496ea1c6 100644 --- a/src/main/java/com/volmit/iris/scaffold/engine/EngineAssignedActuator.java +++ b/src/main/java/com/volmit/iris/engine/framework/EngineAssignedActuator.java @@ -16,9 +16,9 @@ * along with this program. If not, see . */ -package com.volmit.iris.scaffold.engine; +package com.volmit.iris.engine.framework; -import com.volmit.iris.scaffold.hunk.Hunk; +import com.volmit.iris.engine.hunk.Hunk; public abstract class EngineAssignedActuator extends EngineAssignedComponent implements EngineActuator { public EngineAssignedActuator(Engine engine, String name) { diff --git a/src/main/java/com/volmit/iris/scaffold/engine/EngineAssignedBiModifier.java b/src/main/java/com/volmit/iris/engine/framework/EngineAssignedBiModifier.java similarity index 93% rename from src/main/java/com/volmit/iris/scaffold/engine/EngineAssignedBiModifier.java rename to src/main/java/com/volmit/iris/engine/framework/EngineAssignedBiModifier.java index a15036674..021b6cebc 100644 --- a/src/main/java/com/volmit/iris/scaffold/engine/EngineAssignedBiModifier.java +++ b/src/main/java/com/volmit/iris/engine/framework/EngineAssignedBiModifier.java @@ -16,9 +16,9 @@ * along with this program. If not, see . */ -package com.volmit.iris.scaffold.engine; +package com.volmit.iris.engine.framework; -import com.volmit.iris.scaffold.hunk.Hunk; +import com.volmit.iris.engine.hunk.Hunk; public abstract class EngineAssignedBiModifier extends EngineAssignedComponent implements EngineBiModifier { public EngineAssignedBiModifier(Engine engine, String name) { diff --git a/src/main/java/com/volmit/iris/scaffold/engine/EngineAssignedComponent.java b/src/main/java/com/volmit/iris/engine/framework/EngineAssignedComponent.java similarity index 96% rename from src/main/java/com/volmit/iris/scaffold/engine/EngineAssignedComponent.java rename to src/main/java/com/volmit/iris/engine/framework/EngineAssignedComponent.java index cfbd83cc3..cec22c71e 100644 --- a/src/main/java/com/volmit/iris/scaffold/engine/EngineAssignedComponent.java +++ b/src/main/java/com/volmit/iris/engine/framework/EngineAssignedComponent.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.scaffold.engine; +package com.volmit.iris.engine.framework; import com.volmit.iris.util.RollingSequence; import lombok.Data; diff --git a/src/main/java/com/volmit/iris/scaffold/engine/EngineAssignedModifier.java b/src/main/java/com/volmit/iris/engine/framework/EngineAssignedModifier.java similarity index 93% rename from src/main/java/com/volmit/iris/scaffold/engine/EngineAssignedModifier.java rename to src/main/java/com/volmit/iris/engine/framework/EngineAssignedModifier.java index 494cca7a1..b242d710e 100644 --- a/src/main/java/com/volmit/iris/scaffold/engine/EngineAssignedModifier.java +++ b/src/main/java/com/volmit/iris/engine/framework/EngineAssignedModifier.java @@ -16,9 +16,9 @@ * along with this program. If not, see . */ -package com.volmit.iris.scaffold.engine; +package com.volmit.iris.engine.framework; -import com.volmit.iris.scaffold.hunk.Hunk; +import com.volmit.iris.engine.hunk.Hunk; public abstract class EngineAssignedModifier extends EngineAssignedComponent implements EngineModifier { public EngineAssignedModifier(Engine engine, String name) { diff --git a/src/main/java/com/volmit/iris/scaffold/engine/EngineAssignedWorldManager.java b/src/main/java/com/volmit/iris/engine/framework/EngineAssignedWorldManager.java similarity index 98% rename from src/main/java/com/volmit/iris/scaffold/engine/EngineAssignedWorldManager.java rename to src/main/java/com/volmit/iris/engine/framework/EngineAssignedWorldManager.java index 40f96d556..ebd0794f4 100644 --- a/src/main/java/com/volmit/iris/scaffold/engine/EngineAssignedWorldManager.java +++ b/src/main/java/com/volmit/iris/engine/framework/EngineAssignedWorldManager.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.scaffold.engine; +package com.volmit.iris.engine.framework; import com.volmit.iris.Iris; import org.bukkit.Bukkit; diff --git a/src/main/java/com/volmit/iris/scaffold/engine/EngineBiModifier.java b/src/main/java/com/volmit/iris/engine/framework/EngineBiModifier.java similarity index 91% rename from src/main/java/com/volmit/iris/scaffold/engine/EngineBiModifier.java rename to src/main/java/com/volmit/iris/engine/framework/EngineBiModifier.java index bcb41e96b..c1b81dc71 100644 --- a/src/main/java/com/volmit/iris/scaffold/engine/EngineBiModifier.java +++ b/src/main/java/com/volmit/iris/engine/framework/EngineBiModifier.java @@ -16,9 +16,9 @@ * along with this program. If not, see . */ -package com.volmit.iris.scaffold.engine; +package com.volmit.iris.engine.framework; -import com.volmit.iris.scaffold.hunk.Hunk; +import com.volmit.iris.engine.hunk.Hunk; public interface EngineBiModifier extends EngineComponent { void modify(int x, int z, Hunk a, Hunk b); diff --git a/src/main/java/com/volmit/iris/scaffold/engine/EngineComponent.java b/src/main/java/com/volmit/iris/engine/framework/EngineComponent.java similarity index 95% rename from src/main/java/com/volmit/iris/scaffold/engine/EngineComponent.java rename to src/main/java/com/volmit/iris/engine/framework/EngineComponent.java index ac7e1fdfa..2848beeec 100644 --- a/src/main/java/com/volmit/iris/scaffold/engine/EngineComponent.java +++ b/src/main/java/com/volmit/iris/engine/framework/EngineComponent.java @@ -16,13 +16,13 @@ * along with this program. If not, see . */ -package com.volmit.iris.scaffold.engine; +package com.volmit.iris.engine.framework; import com.volmit.iris.Iris; import com.volmit.iris.generator.IrisComplex; import com.volmit.iris.manager.IrisDataManager; import com.volmit.iris.object.IrisDimension; -import com.volmit.iris.scaffold.parallax.ParallaxAccess; +import com.volmit.iris.engine.parallax.ParallaxAccess; import com.volmit.iris.util.RollingSequence; import org.bukkit.event.Listener; diff --git a/src/main/java/com/volmit/iris/scaffold/engine/EngineCompositeGenerator.java b/src/main/java/com/volmit/iris/engine/framework/EngineCompositeGenerator.java similarity index 98% rename from src/main/java/com/volmit/iris/scaffold/engine/EngineCompositeGenerator.java rename to src/main/java/com/volmit/iris/engine/framework/EngineCompositeGenerator.java index 97a3ab8dd..7630abe7d 100644 --- a/src/main/java/com/volmit/iris/scaffold/engine/EngineCompositeGenerator.java +++ b/src/main/java/com/volmit/iris/engine/framework/EngineCompositeGenerator.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.scaffold.engine; +package com.volmit.iris.engine.framework; import com.volmit.iris.Iris; import com.volmit.iris.IrisSettings; @@ -27,12 +27,12 @@ import com.volmit.iris.nms.INMS; import com.volmit.iris.object.IrisBiome; import com.volmit.iris.object.IrisDimension; import com.volmit.iris.object.IrisPosition; -import com.volmit.iris.pregen.DirectWorldWriter; -import com.volmit.iris.scaffold.IrisWorlds; -import com.volmit.iris.scaffold.cache.Cache; -import com.volmit.iris.scaffold.hunk.Hunk; -import com.volmit.iris.scaffold.parallel.BurstExecutor; -import com.volmit.iris.scaffold.parallel.MultiBurst; +import com.volmit.iris.engine.data.DirectWorldWriter; +import com.volmit.iris.engine.IrisWorlds; +import com.volmit.iris.engine.cache.Cache; +import com.volmit.iris.engine.hunk.Hunk; +import com.volmit.iris.engine.parallel.BurstExecutor; +import com.volmit.iris.engine.parallel.MultiBurst; import com.volmit.iris.util.*; import io.netty.util.internal.ConcurrentSet; import io.papermc.lib.PaperLib; @@ -464,7 +464,7 @@ public class EngineCompositeGenerator extends ChunkGenerator implements IrisAcce public void directWriteChunk(World w, int x, int z, DirectWorldWriter writer) { int ox = x << 4; int oz = z << 4; - com.volmit.iris.scaffold.data.mca.Chunk cc = writer.getChunk(x, z); + com.volmit.iris.engine.data.mca.Chunk cc = writer.getChunk(x, z); BiomeBaseInjector injector = (xx, yy, zz, biomeBase) -> cc.setBiomeAt(ox + xx, yy, oz + zz, INMS.get().getTrueBiomeBaseId(biomeBase)); //noinspection deprecation generateChunkRawData(w, x, z, new TerrainChunk() { diff --git a/src/main/java/com/volmit/iris/scaffold/engine/EngineCompound.java b/src/main/java/com/volmit/iris/engine/framework/EngineCompound.java similarity index 95% rename from src/main/java/com/volmit/iris/scaffold/engine/EngineCompound.java rename to src/main/java/com/volmit/iris/engine/framework/EngineCompound.java index 51c125a46..ed332cf7c 100644 --- a/src/main/java/com/volmit/iris/scaffold/engine/EngineCompound.java +++ b/src/main/java/com/volmit/iris/engine/framework/EngineCompound.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.scaffold.engine; +package com.volmit.iris.engine.framework; import com.volmit.iris.Iris; import com.volmit.iris.generator.actuator.IrisTerrainActuator; @@ -24,9 +24,9 @@ import com.volmit.iris.manager.IrisDataManager; import com.volmit.iris.object.IrisBiome; import com.volmit.iris.object.IrisDimension; import com.volmit.iris.object.IrisPosition; -import com.volmit.iris.scaffold.data.DataProvider; -import com.volmit.iris.scaffold.hunk.Hunk; -import com.volmit.iris.scaffold.parallel.MultiBurst; +import com.volmit.iris.engine.data.DataProvider; +import com.volmit.iris.engine.hunk.Hunk; +import com.volmit.iris.engine.parallel.MultiBurst; import com.volmit.iris.util.KList; import com.volmit.iris.util.KMap; import org.bukkit.World; diff --git a/src/main/java/com/volmit/iris/scaffold/engine/EngineData.java b/src/main/java/com/volmit/iris/engine/framework/EngineData.java similarity index 97% rename from src/main/java/com/volmit/iris/scaffold/engine/EngineData.java rename to src/main/java/com/volmit/iris/engine/framework/EngineData.java index abaf0ffc7..36e6cdaaf 100644 --- a/src/main/java/com/volmit/iris/scaffold/engine/EngineData.java +++ b/src/main/java/com/volmit/iris/engine/framework/EngineData.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.scaffold.engine; +package com.volmit.iris.engine.framework; import com.google.gson.Gson; import com.volmit.iris.Iris; diff --git a/src/main/java/com/volmit/iris/scaffold/engine/EngineDecorator.java b/src/main/java/com/volmit/iris/engine/framework/EngineDecorator.java similarity index 95% rename from src/main/java/com/volmit/iris/scaffold/engine/EngineDecorator.java rename to src/main/java/com/volmit/iris/engine/framework/EngineDecorator.java index 4caeb70b0..2a694ec17 100644 --- a/src/main/java/com/volmit/iris/scaffold/engine/EngineDecorator.java +++ b/src/main/java/com/volmit/iris/engine/framework/EngineDecorator.java @@ -16,10 +16,10 @@ * along with this program. If not, see . */ -package com.volmit.iris.scaffold.engine; +package com.volmit.iris.engine.framework; import com.volmit.iris.object.IrisBiome; -import com.volmit.iris.scaffold.hunk.Hunk; +import com.volmit.iris.engine.hunk.Hunk; import com.volmit.iris.util.B; import org.bukkit.block.data.BlockData; diff --git a/src/main/java/com/volmit/iris/scaffold/engine/EngineEffects.java b/src/main/java/com/volmit/iris/engine/framework/EngineEffects.java similarity index 95% rename from src/main/java/com/volmit/iris/scaffold/engine/EngineEffects.java rename to src/main/java/com/volmit/iris/engine/framework/EngineEffects.java index 4577413f7..d02515a51 100644 --- a/src/main/java/com/volmit/iris/scaffold/engine/EngineEffects.java +++ b/src/main/java/com/volmit/iris/engine/framework/EngineEffects.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.scaffold.engine; +package com.volmit.iris.engine.framework; public interface EngineEffects extends EngineComponent { void updatePlayerMap(); diff --git a/src/main/java/com/volmit/iris/scaffold/engine/EngineFramework.java b/src/main/java/com/volmit/iris/engine/framework/EngineFramework.java similarity index 94% rename from src/main/java/com/volmit/iris/scaffold/engine/EngineFramework.java rename to src/main/java/com/volmit/iris/engine/framework/EngineFramework.java index fc2303fd2..93681988f 100644 --- a/src/main/java/com/volmit/iris/scaffold/engine/EngineFramework.java +++ b/src/main/java/com/volmit/iris/engine/framework/EngineFramework.java @@ -16,11 +16,11 @@ * along with this program. If not, see . */ -package com.volmit.iris.scaffold.engine; +package com.volmit.iris.engine.framework; import com.volmit.iris.generator.IrisComplex; import com.volmit.iris.manager.IrisDataManager; -import com.volmit.iris.scaffold.data.DataProvider; +import com.volmit.iris.engine.data.DataProvider; import org.bukkit.block.Biome; import org.bukkit.block.data.BlockData; diff --git a/src/main/java/com/volmit/iris/scaffold/engine/EngineMetrics.java b/src/main/java/com/volmit/iris/engine/framework/EngineMetrics.java similarity index 98% rename from src/main/java/com/volmit/iris/scaffold/engine/EngineMetrics.java rename to src/main/java/com/volmit/iris/engine/framework/EngineMetrics.java index 592a8cffa..4bad43181 100644 --- a/src/main/java/com/volmit/iris/scaffold/engine/EngineMetrics.java +++ b/src/main/java/com/volmit/iris/engine/framework/EngineMetrics.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.scaffold.engine; +package com.volmit.iris.engine.framework; import com.volmit.iris.util.AtomicRollingSequence; import com.volmit.iris.util.KMap; diff --git a/src/main/java/com/volmit/iris/scaffold/engine/EngineModifier.java b/src/main/java/com/volmit/iris/engine/framework/EngineModifier.java similarity index 91% rename from src/main/java/com/volmit/iris/scaffold/engine/EngineModifier.java rename to src/main/java/com/volmit/iris/engine/framework/EngineModifier.java index fc5b9851d..257f3f2ae 100644 --- a/src/main/java/com/volmit/iris/scaffold/engine/EngineModifier.java +++ b/src/main/java/com/volmit/iris/engine/framework/EngineModifier.java @@ -16,9 +16,9 @@ * along with this program. If not, see . */ -package com.volmit.iris.scaffold.engine; +package com.volmit.iris.engine.framework; -import com.volmit.iris.scaffold.hunk.Hunk; +import com.volmit.iris.engine.hunk.Hunk; public interface EngineModifier extends EngineComponent { void modify(int x, int z, Hunk t); diff --git a/src/main/java/com/volmit/iris/scaffold/engine/EngineParallaxManager.java b/src/main/java/com/volmit/iris/engine/framework/EngineParallaxManager.java similarity index 98% rename from src/main/java/com/volmit/iris/scaffold/engine/EngineParallaxManager.java rename to src/main/java/com/volmit/iris/engine/framework/EngineParallaxManager.java index 50ad09da5..e5bc45544 100644 --- a/src/main/java/com/volmit/iris/scaffold/engine/EngineParallaxManager.java +++ b/src/main/java/com/volmit/iris/engine/framework/EngineParallaxManager.java @@ -16,21 +16,21 @@ * along with this program. If not, see . */ -package com.volmit.iris.scaffold.engine; +package com.volmit.iris.engine.framework; import com.volmit.iris.Iris; import com.volmit.iris.generator.IrisComplex; import com.volmit.iris.manager.IrisDataManager; import com.volmit.iris.object.*; import com.volmit.iris.object.tile.TileData; -import com.volmit.iris.scaffold.cache.Cache; -import com.volmit.iris.scaffold.data.DataProvider; -import com.volmit.iris.scaffold.hunk.Hunk; -import com.volmit.iris.scaffold.jigsaw.PlannedStructure; -import com.volmit.iris.scaffold.parallax.ParallaxAccess; -import com.volmit.iris.scaffold.parallax.ParallaxChunkMeta; -import com.volmit.iris.scaffold.parallel.BurstExecutor; -import com.volmit.iris.scaffold.parallel.MultiBurst; +import com.volmit.iris.engine.cache.Cache; +import com.volmit.iris.engine.data.DataProvider; +import com.volmit.iris.engine.hunk.Hunk; +import com.volmit.iris.engine.jigsaw.PlannedStructure; +import com.volmit.iris.engine.parallax.ParallaxAccess; +import com.volmit.iris.engine.parallax.ParallaxChunkMeta; +import com.volmit.iris.engine.parallel.BurstExecutor; +import com.volmit.iris.engine.parallel.MultiBurst; import com.volmit.iris.util.*; import org.bukkit.Chunk; import org.bukkit.ChunkSnapshot; diff --git a/src/main/java/com/volmit/iris/scaffold/engine/EnginePlayer.java b/src/main/java/com/volmit/iris/engine/framework/EnginePlayer.java similarity index 98% rename from src/main/java/com/volmit/iris/scaffold/engine/EnginePlayer.java rename to src/main/java/com/volmit/iris/engine/framework/EnginePlayer.java index 049514bff..2863872d8 100644 --- a/src/main/java/com/volmit/iris/scaffold/engine/EnginePlayer.java +++ b/src/main/java/com/volmit/iris/engine/framework/EnginePlayer.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.scaffold.engine; +package com.volmit.iris.engine.framework; import com.volmit.iris.Iris; import com.volmit.iris.object.IrisBiome; diff --git a/src/main/java/com/volmit/iris/scaffold/engine/EngineTarget.java b/src/main/java/com/volmit/iris/engine/framework/EngineTarget.java similarity index 92% rename from src/main/java/com/volmit/iris/scaffold/engine/EngineTarget.java rename to src/main/java/com/volmit/iris/engine/framework/EngineTarget.java index 23de7fb3b..f261c0c46 100644 --- a/src/main/java/com/volmit/iris/scaffold/engine/EngineTarget.java +++ b/src/main/java/com/volmit/iris/engine/framework/EngineTarget.java @@ -16,12 +16,12 @@ * along with this program. If not, see . */ -package com.volmit.iris.scaffold.engine; +package com.volmit.iris.engine.framework; import com.volmit.iris.manager.IrisDataManager; import com.volmit.iris.object.IrisDimension; -import com.volmit.iris.scaffold.parallax.ParallaxWorld; -import com.volmit.iris.scaffold.parallel.MultiBurst; +import com.volmit.iris.engine.parallax.ParallaxWorld; +import com.volmit.iris.engine.parallel.MultiBurst; import lombok.Data; import org.bukkit.World; diff --git a/src/main/java/com/volmit/iris/scaffold/engine/EngineWorldManager.java b/src/main/java/com/volmit/iris/engine/framework/EngineWorldManager.java similarity index 96% rename from src/main/java/com/volmit/iris/scaffold/engine/EngineWorldManager.java rename to src/main/java/com/volmit/iris/engine/framework/EngineWorldManager.java index afa88d372..c39cf6f5f 100644 --- a/src/main/java/com/volmit/iris/scaffold/engine/EngineWorldManager.java +++ b/src/main/java/com/volmit/iris/engine/framework/EngineWorldManager.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.scaffold.engine; +package com.volmit.iris.engine.framework; import org.bukkit.Chunk; import org.bukkit.event.block.BlockBreakEvent; diff --git a/src/main/java/com/volmit/iris/scaffold/engine/Fallible.java b/src/main/java/com/volmit/iris/engine/framework/Fallible.java similarity index 96% rename from src/main/java/com/volmit/iris/scaffold/engine/Fallible.java rename to src/main/java/com/volmit/iris/engine/framework/Fallible.java index 634746b44..352640156 100644 --- a/src/main/java/com/volmit/iris/scaffold/engine/Fallible.java +++ b/src/main/java/com/volmit/iris/engine/framework/Fallible.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.scaffold.engine; +package com.volmit.iris.engine.framework; import com.volmit.iris.Iris; diff --git a/src/main/java/com/volmit/iris/scaffold/engine/GeneratorAccess.java b/src/main/java/com/volmit/iris/engine/framework/GeneratorAccess.java similarity index 92% rename from src/main/java/com/volmit/iris/scaffold/engine/GeneratorAccess.java rename to src/main/java/com/volmit/iris/engine/framework/GeneratorAccess.java index 4ed7bc429..a80bd3053 100644 --- a/src/main/java/com/volmit/iris/scaffold/engine/GeneratorAccess.java +++ b/src/main/java/com/volmit/iris/engine/framework/GeneratorAccess.java @@ -16,15 +16,15 @@ * along with this program. If not, see . */ -package com.volmit.iris.scaffold.engine; +package com.volmit.iris.engine.framework; import com.volmit.iris.manager.IrisDataManager; -import com.volmit.iris.manager.gui.Renderer; +import com.volmit.iris.gui.Renderer; import com.volmit.iris.object.IrisBiome; import com.volmit.iris.object.IrisObjectPlacement; import com.volmit.iris.object.IrisRegion; -import com.volmit.iris.scaffold.data.DataProvider; -import com.volmit.iris.scaffold.parallax.ParallaxAccess; +import com.volmit.iris.engine.data.DataProvider; +import com.volmit.iris.engine.parallax.ParallaxAccess; public interface GeneratorAccess extends DataProvider, Renderer { IrisRegion getRegion(int x, int z); diff --git a/src/main/java/com/volmit/iris/scaffold/engine/Hotloadable.java b/src/main/java/com/volmit/iris/engine/framework/Hotloadable.java similarity index 95% rename from src/main/java/com/volmit/iris/scaffold/engine/Hotloadable.java rename to src/main/java/com/volmit/iris/engine/framework/Hotloadable.java index 1d78e2bc7..3ed2ae5d6 100644 --- a/src/main/java/com/volmit/iris/scaffold/engine/Hotloadable.java +++ b/src/main/java/com/volmit/iris/engine/framework/Hotloadable.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.scaffold.engine; +package com.volmit.iris.engine.framework; public interface Hotloadable { void hotload(); diff --git a/src/main/java/com/volmit/iris/scaffold/engine/IrisAccess.java b/src/main/java/com/volmit/iris/engine/framework/IrisAccess.java similarity index 97% rename from src/main/java/com/volmit/iris/scaffold/engine/IrisAccess.java rename to src/main/java/com/volmit/iris/engine/framework/IrisAccess.java index 414faafba..050095a79 100644 --- a/src/main/java/com/volmit/iris/scaffold/engine/IrisAccess.java +++ b/src/main/java/com/volmit/iris/engine/framework/IrisAccess.java @@ -16,15 +16,15 @@ * along with this program. If not, see . */ -package com.volmit.iris.scaffold.engine; +package com.volmit.iris.engine.framework; import com.volmit.iris.Iris; import com.volmit.iris.manager.IrisDataManager; import com.volmit.iris.object.IrisBiome; import com.volmit.iris.object.IrisRegion; -import com.volmit.iris.pregen.DirectWorldWriter; -import com.volmit.iris.scaffold.data.DataProvider; -import com.volmit.iris.scaffold.parallel.MultiBurst; +import com.volmit.iris.engine.data.DirectWorldWriter; +import com.volmit.iris.engine.data.DataProvider; +import com.volmit.iris.engine.parallel.MultiBurst; import com.volmit.iris.util.*; import org.bukkit.Chunk; import org.bukkit.Location; diff --git a/src/main/java/com/volmit/iris/scaffold/engine/IrisAccessProvider.java b/src/main/java/com/volmit/iris/engine/framework/IrisAccessProvider.java similarity index 95% rename from src/main/java/com/volmit/iris/scaffold/engine/IrisAccessProvider.java rename to src/main/java/com/volmit/iris/engine/framework/IrisAccessProvider.java index 71a1f7055..0a1897911 100644 --- a/src/main/java/com/volmit/iris/scaffold/engine/IrisAccessProvider.java +++ b/src/main/java/com/volmit/iris/engine/framework/IrisAccessProvider.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.scaffold.engine; +package com.volmit.iris.engine.framework; public interface IrisAccessProvider { IrisAccess getAccess(); diff --git a/src/main/java/com/volmit/iris/scaffold/engine/LootProvider.java b/src/main/java/com/volmit/iris/engine/framework/LootProvider.java similarity index 97% rename from src/main/java/com/volmit/iris/scaffold/engine/LootProvider.java rename to src/main/java/com/volmit/iris/engine/framework/LootProvider.java index 13b70652c..d013b3cac 100644 --- a/src/main/java/com/volmit/iris/scaffold/engine/LootProvider.java +++ b/src/main/java/com/volmit/iris/engine/framework/LootProvider.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.scaffold.engine; +package com.volmit.iris.engine.framework; import com.volmit.iris.object.InventorySlotType; import com.volmit.iris.object.IrisLootReference; diff --git a/src/main/java/com/volmit/iris/scaffold/engine/PlacedObject.java b/src/main/java/com/volmit/iris/engine/framework/PlacedObject.java similarity index 96% rename from src/main/java/com/volmit/iris/scaffold/engine/PlacedObject.java rename to src/main/java/com/volmit/iris/engine/framework/PlacedObject.java index e2c8d74d1..297920eb4 100644 --- a/src/main/java/com/volmit/iris/scaffold/engine/PlacedObject.java +++ b/src/main/java/com/volmit/iris/engine/framework/PlacedObject.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.scaffold.engine; +package com.volmit.iris.engine.framework; import com.volmit.iris.object.IrisObject; import com.volmit.iris.object.IrisObjectPlacement; diff --git a/src/main/java/com/volmit/iris/scaffold/engine/PregeneratedData.java b/src/main/java/com/volmit/iris/engine/framework/PregeneratedData.java similarity index 96% rename from src/main/java/com/volmit/iris/scaffold/engine/PregeneratedData.java rename to src/main/java/com/volmit/iris/engine/framework/PregeneratedData.java index 29330f9bb..859de3aaa 100644 --- a/src/main/java/com/volmit/iris/scaffold/engine/PregeneratedData.java +++ b/src/main/java/com/volmit/iris/engine/framework/PregeneratedData.java @@ -16,9 +16,9 @@ * along with this program. If not, see . */ -package com.volmit.iris.scaffold.engine; +package com.volmit.iris.engine.framework; -import com.volmit.iris.scaffold.hunk.Hunk; +import com.volmit.iris.engine.hunk.Hunk; import com.volmit.iris.util.B; import com.volmit.iris.util.TerrainChunk; import lombok.Data; diff --git a/src/main/java/com/volmit/iris/scaffold/hunk/Hunk.java b/src/main/java/com/volmit/iris/engine/hunk/Hunk.java similarity index 99% rename from src/main/java/com/volmit/iris/scaffold/hunk/Hunk.java rename to src/main/java/com/volmit/iris/engine/hunk/Hunk.java index d8361064b..f2460efb5 100644 --- a/src/main/java/com/volmit/iris/scaffold/hunk/Hunk.java +++ b/src/main/java/com/volmit/iris/engine/hunk/Hunk.java @@ -16,13 +16,13 @@ * along with this program. If not, see . */ -package com.volmit.iris.scaffold.hunk; +package com.volmit.iris.engine.hunk; -import com.volmit.iris.scaffold.hunk.io.HunkIOAdapter; -import com.volmit.iris.scaffold.hunk.storage.*; -import com.volmit.iris.scaffold.hunk.view.*; -import com.volmit.iris.scaffold.parallel.BurstExecutor; -import com.volmit.iris.scaffold.parallel.MultiBurst; +import com.volmit.iris.engine.hunk.io.HunkIOAdapter; +import com.volmit.iris.engine.hunk.storage.*; +import com.volmit.iris.engine.hunk.view.*; +import com.volmit.iris.engine.parallel.BurstExecutor; +import com.volmit.iris.engine.parallel.MultiBurst; import com.volmit.iris.util.*; import org.bukkit.Chunk; import org.bukkit.block.Biome; diff --git a/src/main/java/com/volmit/iris/scaffold/hunk/HunkFace.java b/src/main/java/com/volmit/iris/engine/hunk/HunkFace.java similarity index 95% rename from src/main/java/com/volmit/iris/scaffold/hunk/HunkFace.java rename to src/main/java/com/volmit/iris/engine/hunk/HunkFace.java index e15d0c0d4..618af5360 100644 --- a/src/main/java/com/volmit/iris/scaffold/hunk/HunkFace.java +++ b/src/main/java/com/volmit/iris/engine/hunk/HunkFace.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.scaffold.hunk; +package com.volmit.iris.engine.hunk; public enum HunkFace { TOP, diff --git a/src/main/java/com/volmit/iris/scaffold/hunk/io/BasicHunkIOAdapter.java b/src/main/java/com/volmit/iris/engine/hunk/io/BasicHunkIOAdapter.java similarity index 97% rename from src/main/java/com/volmit/iris/scaffold/hunk/io/BasicHunkIOAdapter.java rename to src/main/java/com/volmit/iris/engine/hunk/io/BasicHunkIOAdapter.java index 0718e0fce..1b914526f 100644 --- a/src/main/java/com/volmit/iris/scaffold/hunk/io/BasicHunkIOAdapter.java +++ b/src/main/java/com/volmit/iris/engine/hunk/io/BasicHunkIOAdapter.java @@ -16,10 +16,10 @@ * along with this program. If not, see . */ -package com.volmit.iris.scaffold.hunk.io; +package com.volmit.iris.engine.hunk.io; import com.volmit.iris.Iris; -import com.volmit.iris.scaffold.hunk.Hunk; +import com.volmit.iris.engine.hunk.Hunk; import com.volmit.iris.util.Function3; import java.io.*; diff --git a/src/main/java/com/volmit/iris/scaffold/hunk/io/BlockDataHunkIOAdapter.java b/src/main/java/com/volmit/iris/engine/hunk/io/BlockDataHunkIOAdapter.java similarity index 96% rename from src/main/java/com/volmit/iris/scaffold/hunk/io/BlockDataHunkIOAdapter.java rename to src/main/java/com/volmit/iris/engine/hunk/io/BlockDataHunkIOAdapter.java index 801f34824..8dc2e5ac0 100644 --- a/src/main/java/com/volmit/iris/scaffold/hunk/io/BlockDataHunkIOAdapter.java +++ b/src/main/java/com/volmit/iris/engine/hunk/io/BlockDataHunkIOAdapter.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.scaffold.hunk.io; +package com.volmit.iris.engine.hunk.io; import com.volmit.iris.util.B; import org.bukkit.block.data.BlockData; diff --git a/src/main/java/com/volmit/iris/scaffold/hunk/io/BooleanHunkIOAdapter.java b/src/main/java/com/volmit/iris/engine/hunk/io/BooleanHunkIOAdapter.java similarity index 96% rename from src/main/java/com/volmit/iris/scaffold/hunk/io/BooleanHunkIOAdapter.java rename to src/main/java/com/volmit/iris/engine/hunk/io/BooleanHunkIOAdapter.java index 25c3f94fc..ee7b7e97e 100644 --- a/src/main/java/com/volmit/iris/scaffold/hunk/io/BooleanHunkIOAdapter.java +++ b/src/main/java/com/volmit/iris/engine/hunk/io/BooleanHunkIOAdapter.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.scaffold.hunk.io; +package com.volmit.iris.engine.hunk.io; import java.io.DataInputStream; import java.io.DataOutputStream; diff --git a/src/main/java/com/volmit/iris/scaffold/hunk/io/HunkIOAdapter.java b/src/main/java/com/volmit/iris/engine/hunk/io/HunkIOAdapter.java similarity index 94% rename from src/main/java/com/volmit/iris/scaffold/hunk/io/HunkIOAdapter.java rename to src/main/java/com/volmit/iris/engine/hunk/io/HunkIOAdapter.java index db9d8d588..b34673bc2 100644 --- a/src/main/java/com/volmit/iris/scaffold/hunk/io/HunkIOAdapter.java +++ b/src/main/java/com/volmit/iris/engine/hunk/io/HunkIOAdapter.java @@ -16,10 +16,10 @@ * along with this program. If not, see . */ -package com.volmit.iris.scaffold.hunk.io; +package com.volmit.iris.engine.hunk.io; -import com.volmit.iris.scaffold.data.IOAdapter; -import com.volmit.iris.scaffold.hunk.Hunk; +import com.volmit.iris.engine.data.IOAdapter; +import com.volmit.iris.engine.hunk.Hunk; import com.volmit.iris.util.ByteArrayTag; import com.volmit.iris.util.CustomOutputStream; import com.volmit.iris.util.Function3; diff --git a/src/main/java/com/volmit/iris/scaffold/hunk/io/HunkRegion.java b/src/main/java/com/volmit/iris/engine/hunk/io/HunkRegion.java similarity index 98% rename from src/main/java/com/volmit/iris/scaffold/hunk/io/HunkRegion.java rename to src/main/java/com/volmit/iris/engine/hunk/io/HunkRegion.java index dbabb6a6b..dfc34025a 100644 --- a/src/main/java/com/volmit/iris/scaffold/hunk/io/HunkRegion.java +++ b/src/main/java/com/volmit/iris/engine/hunk/io/HunkRegion.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.scaffold.hunk.io; +package com.volmit.iris.engine.hunk.io; import com.volmit.iris.Iris; import com.volmit.iris.util.*; diff --git a/src/main/java/com/volmit/iris/scaffold/hunk/io/HunkRegionSlice.java b/src/main/java/com/volmit/iris/engine/hunk/io/HunkRegionSlice.java similarity index 97% rename from src/main/java/com/volmit/iris/scaffold/hunk/io/HunkRegionSlice.java rename to src/main/java/com/volmit/iris/engine/hunk/io/HunkRegionSlice.java index 1bfdcd096..a97bd817e 100644 --- a/src/main/java/com/volmit/iris/scaffold/hunk/io/HunkRegionSlice.java +++ b/src/main/java/com/volmit/iris/engine/hunk/io/HunkRegionSlice.java @@ -16,14 +16,14 @@ * along with this program. If not, see . */ -package com.volmit.iris.scaffold.hunk.io; +package com.volmit.iris.engine.hunk.io; import com.volmit.iris.Iris; import com.volmit.iris.object.tile.TileData; -import com.volmit.iris.scaffold.hunk.Hunk; -import com.volmit.iris.scaffold.parallel.BurstExecutor; -import com.volmit.iris.scaffold.parallel.GridLock; -import com.volmit.iris.scaffold.parallel.MultiBurst; +import com.volmit.iris.engine.hunk.Hunk; +import com.volmit.iris.engine.parallel.BurstExecutor; +import com.volmit.iris.engine.parallel.GridLock; +import com.volmit.iris.engine.parallel.MultiBurst; import com.volmit.iris.util.*; import org.bukkit.block.TileState; import org.bukkit.block.data.BlockData; diff --git a/src/main/java/com/volmit/iris/scaffold/hunk/io/PaletteHunkIOAdapter.java b/src/main/java/com/volmit/iris/engine/hunk/io/PaletteHunkIOAdapter.java similarity index 96% rename from src/main/java/com/volmit/iris/scaffold/hunk/io/PaletteHunkIOAdapter.java rename to src/main/java/com/volmit/iris/engine/hunk/io/PaletteHunkIOAdapter.java index e0bf5a7d8..b55d1f933 100644 --- a/src/main/java/com/volmit/iris/scaffold/hunk/io/PaletteHunkIOAdapter.java +++ b/src/main/java/com/volmit/iris/engine/hunk/io/PaletteHunkIOAdapter.java @@ -16,11 +16,11 @@ * along with this program. If not, see . */ -package com.volmit.iris.scaffold.hunk.io; +package com.volmit.iris.engine.hunk.io; import com.volmit.iris.Iris; -import com.volmit.iris.scaffold.data.DataPalette; -import com.volmit.iris.scaffold.hunk.Hunk; +import com.volmit.iris.engine.data.DataPalette; +import com.volmit.iris.engine.hunk.Hunk; import com.volmit.iris.util.Function3; import java.io.*; diff --git a/src/main/java/com/volmit/iris/scaffold/hunk/io/StringHunkIOAdapter.java b/src/main/java/com/volmit/iris/engine/hunk/io/StringHunkIOAdapter.java similarity index 96% rename from src/main/java/com/volmit/iris/scaffold/hunk/io/StringHunkIOAdapter.java rename to src/main/java/com/volmit/iris/engine/hunk/io/StringHunkIOAdapter.java index ec6f5960b..915a4f810 100644 --- a/src/main/java/com/volmit/iris/scaffold/hunk/io/StringHunkIOAdapter.java +++ b/src/main/java/com/volmit/iris/engine/hunk/io/StringHunkIOAdapter.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.scaffold.hunk.io; +package com.volmit.iris.engine.hunk.io; import java.io.DataInputStream; import java.io.DataOutputStream; diff --git a/src/main/java/com/volmit/iris/scaffold/hunk/io/TileDataHunkIOAdapter.java b/src/main/java/com/volmit/iris/engine/hunk/io/TileDataHunkIOAdapter.java similarity index 97% rename from src/main/java/com/volmit/iris/scaffold/hunk/io/TileDataHunkIOAdapter.java rename to src/main/java/com/volmit/iris/engine/hunk/io/TileDataHunkIOAdapter.java index e2311c111..1ef762952 100644 --- a/src/main/java/com/volmit/iris/scaffold/hunk/io/TileDataHunkIOAdapter.java +++ b/src/main/java/com/volmit/iris/engine/hunk/io/TileDataHunkIOAdapter.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.scaffold.hunk.io; +package com.volmit.iris.engine.hunk.io; import com.volmit.iris.Iris; import com.volmit.iris.object.tile.TileData; diff --git a/src/main/java/com/volmit/iris/scaffold/hunk/storage/ArrayHunk.java b/src/main/java/com/volmit/iris/engine/hunk/storage/ArrayHunk.java similarity index 94% rename from src/main/java/com/volmit/iris/scaffold/hunk/storage/ArrayHunk.java rename to src/main/java/com/volmit/iris/engine/hunk/storage/ArrayHunk.java index c9dbc6596..8e93c481a 100644 --- a/src/main/java/com/volmit/iris/scaffold/hunk/storage/ArrayHunk.java +++ b/src/main/java/com/volmit/iris/engine/hunk/storage/ArrayHunk.java @@ -16,9 +16,9 @@ * along with this program. If not, see . */ -package com.volmit.iris.scaffold.hunk.storage; +package com.volmit.iris.engine.hunk.storage; -import com.volmit.iris.scaffold.hunk.Hunk; +import com.volmit.iris.engine.hunk.Hunk; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/src/main/java/com/volmit/iris/scaffold/hunk/storage/AtomicDoubleHunk.java b/src/main/java/com/volmit/iris/engine/hunk/storage/AtomicDoubleHunk.java similarity index 94% rename from src/main/java/com/volmit/iris/scaffold/hunk/storage/AtomicDoubleHunk.java rename to src/main/java/com/volmit/iris/engine/hunk/storage/AtomicDoubleHunk.java index a15e269b9..2abb0761c 100644 --- a/src/main/java/com/volmit/iris/scaffold/hunk/storage/AtomicDoubleHunk.java +++ b/src/main/java/com/volmit/iris/engine/hunk/storage/AtomicDoubleHunk.java @@ -16,10 +16,10 @@ * along with this program. If not, see . */ -package com.volmit.iris.scaffold.hunk.storage; +package com.volmit.iris.engine.hunk.storage; import com.google.common.util.concurrent.AtomicDoubleArray; -import com.volmit.iris.scaffold.hunk.Hunk; +import com.volmit.iris.engine.hunk.Hunk; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/src/main/java/com/volmit/iris/scaffold/hunk/storage/AtomicHunk.java b/src/main/java/com/volmit/iris/engine/hunk/storage/AtomicHunk.java similarity index 94% rename from src/main/java/com/volmit/iris/scaffold/hunk/storage/AtomicHunk.java rename to src/main/java/com/volmit/iris/engine/hunk/storage/AtomicHunk.java index 796becf28..9e1277e16 100644 --- a/src/main/java/com/volmit/iris/scaffold/hunk/storage/AtomicHunk.java +++ b/src/main/java/com/volmit/iris/engine/hunk/storage/AtomicHunk.java @@ -16,9 +16,9 @@ * along with this program. If not, see . */ -package com.volmit.iris.scaffold.hunk.storage; +package com.volmit.iris.engine.hunk.storage; -import com.volmit.iris.scaffold.hunk.Hunk; +import com.volmit.iris.engine.hunk.Hunk; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/src/main/java/com/volmit/iris/scaffold/hunk/storage/AtomicIntegerHunk.java b/src/main/java/com/volmit/iris/engine/hunk/storage/AtomicIntegerHunk.java similarity index 94% rename from src/main/java/com/volmit/iris/scaffold/hunk/storage/AtomicIntegerHunk.java rename to src/main/java/com/volmit/iris/engine/hunk/storage/AtomicIntegerHunk.java index 747824de3..da7575f13 100644 --- a/src/main/java/com/volmit/iris/scaffold/hunk/storage/AtomicIntegerHunk.java +++ b/src/main/java/com/volmit/iris/engine/hunk/storage/AtomicIntegerHunk.java @@ -16,9 +16,9 @@ * along with this program. If not, see . */ -package com.volmit.iris.scaffold.hunk.storage; +package com.volmit.iris.engine.hunk.storage; -import com.volmit.iris.scaffold.hunk.Hunk; +import com.volmit.iris.engine.hunk.Hunk; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/src/main/java/com/volmit/iris/scaffold/hunk/storage/AtomicLongHunk.java b/src/main/java/com/volmit/iris/engine/hunk/storage/AtomicLongHunk.java similarity index 94% rename from src/main/java/com/volmit/iris/scaffold/hunk/storage/AtomicLongHunk.java rename to src/main/java/com/volmit/iris/engine/hunk/storage/AtomicLongHunk.java index d1eafe184..573d87400 100644 --- a/src/main/java/com/volmit/iris/scaffold/hunk/storage/AtomicLongHunk.java +++ b/src/main/java/com/volmit/iris/engine/hunk/storage/AtomicLongHunk.java @@ -16,9 +16,9 @@ * along with this program. If not, see . */ -package com.volmit.iris.scaffold.hunk.storage; +package com.volmit.iris.engine.hunk.storage; -import com.volmit.iris.scaffold.hunk.Hunk; +import com.volmit.iris.engine.hunk.Hunk; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/src/main/java/com/volmit/iris/scaffold/hunk/storage/MappedHunk.java b/src/main/java/com/volmit/iris/engine/hunk/storage/MappedHunk.java similarity index 96% rename from src/main/java/com/volmit/iris/scaffold/hunk/storage/MappedHunk.java rename to src/main/java/com/volmit/iris/engine/hunk/storage/MappedHunk.java index 6a6d6d6bf..81faef19f 100644 --- a/src/main/java/com/volmit/iris/scaffold/hunk/storage/MappedHunk.java +++ b/src/main/java/com/volmit/iris/engine/hunk/storage/MappedHunk.java @@ -16,9 +16,9 @@ * along with this program. If not, see . */ -package com.volmit.iris.scaffold.hunk.storage; +package com.volmit.iris.engine.hunk.storage; -import com.volmit.iris.scaffold.hunk.Hunk; +import com.volmit.iris.engine.hunk.Hunk; import com.volmit.iris.util.Consumer4; import com.volmit.iris.util.KMap; import lombok.Data; diff --git a/src/main/java/com/volmit/iris/scaffold/hunk/storage/StorageHunk.java b/src/main/java/com/volmit/iris/engine/hunk/storage/StorageHunk.java similarity index 93% rename from src/main/java/com/volmit/iris/scaffold/hunk/storage/StorageHunk.java rename to src/main/java/com/volmit/iris/engine/hunk/storage/StorageHunk.java index 0923ca814..fd04473d2 100644 --- a/src/main/java/com/volmit/iris/scaffold/hunk/storage/StorageHunk.java +++ b/src/main/java/com/volmit/iris/engine/hunk/storage/StorageHunk.java @@ -16,9 +16,9 @@ * along with this program. If not, see . */ -package com.volmit.iris.scaffold.hunk.storage; +package com.volmit.iris.engine.hunk.storage; -import com.volmit.iris.scaffold.hunk.Hunk; +import com.volmit.iris.engine.hunk.Hunk; import lombok.Data; @Data diff --git a/src/main/java/com/volmit/iris/scaffold/hunk/storage/SynchronizedArrayHunk.java b/src/main/java/com/volmit/iris/engine/hunk/storage/SynchronizedArrayHunk.java similarity index 95% rename from src/main/java/com/volmit/iris/scaffold/hunk/storage/SynchronizedArrayHunk.java rename to src/main/java/com/volmit/iris/engine/hunk/storage/SynchronizedArrayHunk.java index 2ff7aa2c3..3d6cc5187 100644 --- a/src/main/java/com/volmit/iris/scaffold/hunk/storage/SynchronizedArrayHunk.java +++ b/src/main/java/com/volmit/iris/engine/hunk/storage/SynchronizedArrayHunk.java @@ -16,9 +16,9 @@ * along with this program. If not, see . */ -package com.volmit.iris.scaffold.hunk.storage; +package com.volmit.iris.engine.hunk.storage; -import com.volmit.iris.scaffold.hunk.Hunk; +import com.volmit.iris.engine.hunk.Hunk; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/src/main/java/com/volmit/iris/scaffold/hunk/view/BiomeGridHunkView.java b/src/main/java/com/volmit/iris/engine/hunk/view/BiomeGridHunkView.java similarity index 95% rename from src/main/java/com/volmit/iris/scaffold/hunk/view/BiomeGridHunkView.java rename to src/main/java/com/volmit/iris/engine/hunk/view/BiomeGridHunkView.java index 1862360af..67782b9b1 100644 --- a/src/main/java/com/volmit/iris/scaffold/hunk/view/BiomeGridHunkView.java +++ b/src/main/java/com/volmit/iris/engine/hunk/view/BiomeGridHunkView.java @@ -16,10 +16,10 @@ * along with this program. If not, see . */ -package com.volmit.iris.scaffold.hunk.view; +package com.volmit.iris.engine.hunk.view; import com.volmit.iris.nms.INMS; -import com.volmit.iris.scaffold.hunk.Hunk; +import com.volmit.iris.engine.hunk.Hunk; import com.volmit.iris.util.LinkedTerrainChunk; import lombok.Getter; import org.bukkit.block.Biome; diff --git a/src/main/java/com/volmit/iris/scaffold/hunk/view/ChunkBiomeHunkView.java b/src/main/java/com/volmit/iris/engine/hunk/view/ChunkBiomeHunkView.java similarity index 95% rename from src/main/java/com/volmit/iris/scaffold/hunk/view/ChunkBiomeHunkView.java rename to src/main/java/com/volmit/iris/engine/hunk/view/ChunkBiomeHunkView.java index 7389d4d31..a770b4be5 100644 --- a/src/main/java/com/volmit/iris/scaffold/hunk/view/ChunkBiomeHunkView.java +++ b/src/main/java/com/volmit/iris/engine/hunk/view/ChunkBiomeHunkView.java @@ -16,10 +16,10 @@ * along with this program. If not, see . */ -package com.volmit.iris.scaffold.hunk.view; +package com.volmit.iris.engine.hunk.view; import com.volmit.iris.Iris; -import com.volmit.iris.scaffold.hunk.Hunk; +import com.volmit.iris.engine.hunk.Hunk; import org.bukkit.Chunk; import org.bukkit.block.Biome; diff --git a/src/main/java/com/volmit/iris/scaffold/hunk/view/ChunkDataHunkView.java b/src/main/java/com/volmit/iris/engine/hunk/view/ChunkDataHunkView.java similarity index 95% rename from src/main/java/com/volmit/iris/scaffold/hunk/view/ChunkDataHunkView.java rename to src/main/java/com/volmit/iris/engine/hunk/view/ChunkDataHunkView.java index b3d10c16c..6911a956d 100644 --- a/src/main/java/com/volmit/iris/scaffold/hunk/view/ChunkDataHunkView.java +++ b/src/main/java/com/volmit/iris/engine/hunk/view/ChunkDataHunkView.java @@ -16,9 +16,9 @@ * along with this program. If not, see . */ -package com.volmit.iris.scaffold.hunk.view; +package com.volmit.iris.engine.hunk.view; -import com.volmit.iris.scaffold.hunk.Hunk; +import com.volmit.iris.engine.hunk.Hunk; import org.bukkit.block.data.BlockData; import org.bukkit.generator.ChunkGenerator.ChunkData; diff --git a/src/main/java/com/volmit/iris/scaffold/hunk/view/ChunkHunkView.java b/src/main/java/com/volmit/iris/engine/hunk/view/ChunkHunkView.java similarity index 95% rename from src/main/java/com/volmit/iris/scaffold/hunk/view/ChunkHunkView.java rename to src/main/java/com/volmit/iris/engine/hunk/view/ChunkHunkView.java index fb5499901..3f1a99462 100644 --- a/src/main/java/com/volmit/iris/scaffold/hunk/view/ChunkHunkView.java +++ b/src/main/java/com/volmit/iris/engine/hunk/view/ChunkHunkView.java @@ -16,10 +16,10 @@ * along with this program. If not, see . */ -package com.volmit.iris.scaffold.hunk.view; +package com.volmit.iris.engine.hunk.view; import com.volmit.iris.Iris; -import com.volmit.iris.scaffold.hunk.Hunk; +import com.volmit.iris.engine.hunk.Hunk; import org.bukkit.Chunk; import org.bukkit.block.data.BlockData; diff --git a/src/main/java/com/volmit/iris/scaffold/hunk/view/DriftHunkView.java b/src/main/java/com/volmit/iris/engine/hunk/view/DriftHunkView.java similarity index 95% rename from src/main/java/com/volmit/iris/scaffold/hunk/view/DriftHunkView.java rename to src/main/java/com/volmit/iris/engine/hunk/view/DriftHunkView.java index c3844ce09..4833f9af9 100644 --- a/src/main/java/com/volmit/iris/scaffold/hunk/view/DriftHunkView.java +++ b/src/main/java/com/volmit/iris/engine/hunk/view/DriftHunkView.java @@ -16,9 +16,9 @@ * along with this program. If not, see . */ -package com.volmit.iris.scaffold.hunk.view; +package com.volmit.iris.engine.hunk.view; -import com.volmit.iris.scaffold.hunk.Hunk; +import com.volmit.iris.engine.hunk.Hunk; @SuppressWarnings("ClassCanBeRecord") public class DriftHunkView implements Hunk { diff --git a/src/main/java/com/volmit/iris/scaffold/hunk/view/FringedHunkView.java b/src/main/java/com/volmit/iris/engine/hunk/view/FringedHunkView.java similarity index 94% rename from src/main/java/com/volmit/iris/scaffold/hunk/view/FringedHunkView.java rename to src/main/java/com/volmit/iris/engine/hunk/view/FringedHunkView.java index 1946550e5..399188993 100644 --- a/src/main/java/com/volmit/iris/scaffold/hunk/view/FringedHunkView.java +++ b/src/main/java/com/volmit/iris/engine/hunk/view/FringedHunkView.java @@ -16,9 +16,9 @@ * along with this program. If not, see . */ -package com.volmit.iris.scaffold.hunk.view; +package com.volmit.iris.engine.hunk.view; -import com.volmit.iris.scaffold.hunk.Hunk; +import com.volmit.iris.engine.hunk.Hunk; @SuppressWarnings("ClassCanBeRecord") public class FringedHunkView implements Hunk { diff --git a/src/main/java/com/volmit/iris/scaffold/hunk/view/HunkView.java b/src/main/java/com/volmit/iris/engine/hunk/view/HunkView.java similarity index 95% rename from src/main/java/com/volmit/iris/scaffold/hunk/view/HunkView.java rename to src/main/java/com/volmit/iris/engine/hunk/view/HunkView.java index acd62e55f..56c1cecae 100644 --- a/src/main/java/com/volmit/iris/scaffold/hunk/view/HunkView.java +++ b/src/main/java/com/volmit/iris/engine/hunk/view/HunkView.java @@ -16,9 +16,9 @@ * along with this program. If not, see . */ -package com.volmit.iris.scaffold.hunk.view; +package com.volmit.iris.engine.hunk.view; -import com.volmit.iris.scaffold.hunk.Hunk; +import com.volmit.iris.engine.hunk.Hunk; public class HunkView implements Hunk { private final int ox; diff --git a/src/main/java/com/volmit/iris/scaffold/hunk/view/InvertedHunkView.java b/src/main/java/com/volmit/iris/engine/hunk/view/InvertedHunkView.java similarity index 94% rename from src/main/java/com/volmit/iris/scaffold/hunk/view/InvertedHunkView.java rename to src/main/java/com/volmit/iris/engine/hunk/view/InvertedHunkView.java index e272f4181..7037b0b17 100644 --- a/src/main/java/com/volmit/iris/scaffold/hunk/view/InvertedHunkView.java +++ b/src/main/java/com/volmit/iris/engine/hunk/view/InvertedHunkView.java @@ -16,9 +16,9 @@ * along with this program. If not, see . */ -package com.volmit.iris.scaffold.hunk.view; +package com.volmit.iris.engine.hunk.view; -import com.volmit.iris.scaffold.hunk.Hunk; +import com.volmit.iris.engine.hunk.Hunk; @SuppressWarnings("ClassCanBeRecord") public class InvertedHunkView implements Hunk { diff --git a/src/main/java/com/volmit/iris/scaffold/hunk/view/ListeningHunk.java b/src/main/java/com/volmit/iris/engine/hunk/view/ListeningHunk.java similarity index 95% rename from src/main/java/com/volmit/iris/scaffold/hunk/view/ListeningHunk.java rename to src/main/java/com/volmit/iris/engine/hunk/view/ListeningHunk.java index 2378c6ec4..00d29350b 100644 --- a/src/main/java/com/volmit/iris/scaffold/hunk/view/ListeningHunk.java +++ b/src/main/java/com/volmit/iris/engine/hunk/view/ListeningHunk.java @@ -16,9 +16,9 @@ * along with this program. If not, see . */ -package com.volmit.iris.scaffold.hunk.view; +package com.volmit.iris.engine.hunk.view; -import com.volmit.iris.scaffold.hunk.Hunk; +import com.volmit.iris.engine.hunk.Hunk; import com.volmit.iris.util.Consumer4; @SuppressWarnings("ClassCanBeRecord") diff --git a/src/main/java/com/volmit/iris/scaffold/hunk/view/ReadOnlyHunk.java b/src/main/java/com/volmit/iris/engine/hunk/view/ReadOnlyHunk.java similarity index 95% rename from src/main/java/com/volmit/iris/scaffold/hunk/view/ReadOnlyHunk.java rename to src/main/java/com/volmit/iris/engine/hunk/view/ReadOnlyHunk.java index c136ee08b..e3f2370bb 100644 --- a/src/main/java/com/volmit/iris/scaffold/hunk/view/ReadOnlyHunk.java +++ b/src/main/java/com/volmit/iris/engine/hunk/view/ReadOnlyHunk.java @@ -16,9 +16,9 @@ * along with this program. If not, see . */ -package com.volmit.iris.scaffold.hunk.view; +package com.volmit.iris.engine.hunk.view; -import com.volmit.iris.scaffold.hunk.Hunk; +import com.volmit.iris.engine.hunk.Hunk; @SuppressWarnings("ClassCanBeRecord") public class ReadOnlyHunk implements Hunk { diff --git a/src/main/java/com/volmit/iris/scaffold/hunk/view/RotatedXHunkView.java b/src/main/java/com/volmit/iris/engine/hunk/view/RotatedXHunkView.java similarity index 96% rename from src/main/java/com/volmit/iris/scaffold/hunk/view/RotatedXHunkView.java rename to src/main/java/com/volmit/iris/engine/hunk/view/RotatedXHunkView.java index abe5e1de1..1322457bf 100644 --- a/src/main/java/com/volmit/iris/scaffold/hunk/view/RotatedXHunkView.java +++ b/src/main/java/com/volmit/iris/engine/hunk/view/RotatedXHunkView.java @@ -16,9 +16,9 @@ * along with this program. If not, see . */ -package com.volmit.iris.scaffold.hunk.view; +package com.volmit.iris.engine.hunk.view; -import com.volmit.iris.scaffold.hunk.Hunk; +import com.volmit.iris.engine.hunk.Hunk; public class RotatedXHunkView implements Hunk { private final Hunk src; diff --git a/src/main/java/com/volmit/iris/scaffold/hunk/view/RotatedYHunkView.java b/src/main/java/com/volmit/iris/engine/hunk/view/RotatedYHunkView.java similarity index 96% rename from src/main/java/com/volmit/iris/scaffold/hunk/view/RotatedYHunkView.java rename to src/main/java/com/volmit/iris/engine/hunk/view/RotatedYHunkView.java index 6bdf5be26..9c6f102c9 100644 --- a/src/main/java/com/volmit/iris/scaffold/hunk/view/RotatedYHunkView.java +++ b/src/main/java/com/volmit/iris/engine/hunk/view/RotatedYHunkView.java @@ -16,9 +16,9 @@ * along with this program. If not, see . */ -package com.volmit.iris.scaffold.hunk.view; +package com.volmit.iris.engine.hunk.view; -import com.volmit.iris.scaffold.hunk.Hunk; +import com.volmit.iris.engine.hunk.Hunk; public class RotatedYHunkView implements Hunk { private final Hunk src; diff --git a/src/main/java/com/volmit/iris/scaffold/hunk/view/RotatedZHunkView.java b/src/main/java/com/volmit/iris/engine/hunk/view/RotatedZHunkView.java similarity index 96% rename from src/main/java/com/volmit/iris/scaffold/hunk/view/RotatedZHunkView.java rename to src/main/java/com/volmit/iris/engine/hunk/view/RotatedZHunkView.java index 7bfb957ce..e19ce21e8 100644 --- a/src/main/java/com/volmit/iris/scaffold/hunk/view/RotatedZHunkView.java +++ b/src/main/java/com/volmit/iris/engine/hunk/view/RotatedZHunkView.java @@ -16,9 +16,9 @@ * along with this program. If not, see . */ -package com.volmit.iris.scaffold.hunk.view; +package com.volmit.iris.engine.hunk.view; -import com.volmit.iris.scaffold.hunk.Hunk; +import com.volmit.iris.engine.hunk.Hunk; public class RotatedZHunkView implements Hunk { private final Hunk src; diff --git a/src/main/java/com/volmit/iris/scaffold/hunk/view/SynchronizedHunkView.java b/src/main/java/com/volmit/iris/engine/hunk/view/SynchronizedHunkView.java similarity index 94% rename from src/main/java/com/volmit/iris/scaffold/hunk/view/SynchronizedHunkView.java rename to src/main/java/com/volmit/iris/engine/hunk/view/SynchronizedHunkView.java index ae989a33a..98f7a7d12 100644 --- a/src/main/java/com/volmit/iris/scaffold/hunk/view/SynchronizedHunkView.java +++ b/src/main/java/com/volmit/iris/engine/hunk/view/SynchronizedHunkView.java @@ -16,9 +16,9 @@ * along with this program. If not, see . */ -package com.volmit.iris.scaffold.hunk.view; +package com.volmit.iris.engine.hunk.view; -import com.volmit.iris.scaffold.hunk.Hunk; +import com.volmit.iris.engine.hunk.Hunk; @SuppressWarnings("ClassCanBeRecord") public class SynchronizedHunkView implements Hunk { diff --git a/src/main/java/com/volmit/iris/scaffold/hunk/view/WriteTrackHunk.java b/src/main/java/com/volmit/iris/engine/hunk/view/WriteTrackHunk.java similarity index 95% rename from src/main/java/com/volmit/iris/scaffold/hunk/view/WriteTrackHunk.java rename to src/main/java/com/volmit/iris/engine/hunk/view/WriteTrackHunk.java index 3f990738b..97fd86584 100644 --- a/src/main/java/com/volmit/iris/scaffold/hunk/view/WriteTrackHunk.java +++ b/src/main/java/com/volmit/iris/engine/hunk/view/WriteTrackHunk.java @@ -16,9 +16,9 @@ * along with this program. If not, see . */ -package com.volmit.iris.scaffold.hunk.view; +package com.volmit.iris.engine.hunk.view; -import com.volmit.iris.scaffold.hunk.Hunk; +import com.volmit.iris.engine.hunk.Hunk; import java.util.concurrent.atomic.AtomicBoolean; diff --git a/src/main/java/com/volmit/iris/scaffold/jigsaw/PlannedPiece.java b/src/main/java/com/volmit/iris/engine/jigsaw/PlannedPiece.java similarity index 95% rename from src/main/java/com/volmit/iris/scaffold/jigsaw/PlannedPiece.java rename to src/main/java/com/volmit/iris/engine/jigsaw/PlannedPiece.java index a1931a6b9..89c065336 100644 --- a/src/main/java/com/volmit/iris/scaffold/jigsaw/PlannedPiece.java +++ b/src/main/java/com/volmit/iris/engine/jigsaw/PlannedPiece.java @@ -16,14 +16,14 @@ * along with this program. If not, see . */ -package com.volmit.iris.scaffold.jigsaw; +package com.volmit.iris.engine.jigsaw; -import com.volmit.iris.manager.IrisDataManager; -import com.volmit.iris.object.*; -import com.volmit.iris.object.tile.TileData; -import com.volmit.iris.scaffold.IrisWorlds; -import com.volmit.iris.scaffold.engine.Engine; -import com.volmit.iris.scaffold.engine.IrisAccess; +import com.volmit.iris.core.IrisDataManager; +import com.volmit.iris.engine.object.*; +import com.volmit.iris.engine.object.tile.TileData; +import com.volmit.iris.engine.IrisWorlds; +import com.volmit.iris.engine.framework.Engine; +import com.volmit.iris.engine.framework.IrisAccess; import com.volmit.iris.util.*; import lombok.Data; import org.bukkit.Material; diff --git a/src/main/java/com/volmit/iris/scaffold/jigsaw/PlannedStructure.java b/src/main/java/com/volmit/iris/engine/jigsaw/PlannedStructure.java similarity index 97% rename from src/main/java/com/volmit/iris/scaffold/jigsaw/PlannedStructure.java rename to src/main/java/com/volmit/iris/engine/jigsaw/PlannedStructure.java index 21eb48e53..9cfdb289f 100644 --- a/src/main/java/com/volmit/iris/scaffold/jigsaw/PlannedStructure.java +++ b/src/main/java/com/volmit/iris/engine/jigsaw/PlannedStructure.java @@ -16,15 +16,15 @@ * along with this program. If not, see . */ -package com.volmit.iris.scaffold.jigsaw; +package com.volmit.iris.engine.jigsaw; import com.volmit.iris.Iris; -import com.volmit.iris.manager.IrisDataManager; -import com.volmit.iris.object.*; -import com.volmit.iris.scaffold.IrisWorlds; -import com.volmit.iris.scaffold.engine.EngineParallaxManager; -import com.volmit.iris.scaffold.engine.IrisAccess; -import com.volmit.iris.scaffold.parallax.ParallaxChunkMeta; +import com.volmit.iris.core.IrisDataManager; +import com.volmit.iris.engine.object.*; +import com.volmit.iris.engine.IrisWorlds; +import com.volmit.iris.engine.framework.EngineParallaxManager; +import com.volmit.iris.engine.framework.IrisAccess; +import com.volmit.iris.engine.parallax.ParallaxChunkMeta; import com.volmit.iris.util.IObjectPlacer; import com.volmit.iris.util.KList; import com.volmit.iris.util.KMap; diff --git a/src/main/java/com/volmit/iris/scaffold/lighting/BlockFaceSetSection.java b/src/main/java/com/volmit/iris/engine/lighting/BlockFaceSetSection.java similarity index 96% rename from src/main/java/com/volmit/iris/scaffold/lighting/BlockFaceSetSection.java rename to src/main/java/com/volmit/iris/engine/lighting/BlockFaceSetSection.java index 713d98393..968021996 100644 --- a/src/main/java/com/volmit/iris/scaffold/lighting/BlockFaceSetSection.java +++ b/src/main/java/com/volmit/iris/engine/lighting/BlockFaceSetSection.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.scaffold.lighting; +package com.volmit.iris.engine.lighting; import com.bergerkiller.bukkit.common.collections.BlockFaceSet; diff --git a/src/main/java/com/volmit/iris/scaffold/lighting/FlatRegionInfo.java b/src/main/java/com/volmit/iris/engine/lighting/FlatRegionInfo.java similarity index 99% rename from src/main/java/com/volmit/iris/scaffold/lighting/FlatRegionInfo.java rename to src/main/java/com/volmit/iris/engine/lighting/FlatRegionInfo.java index d184eb076..40f093265 100644 --- a/src/main/java/com/volmit/iris/scaffold/lighting/FlatRegionInfo.java +++ b/src/main/java/com/volmit/iris/engine/lighting/FlatRegionInfo.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.scaffold.lighting; +package com.volmit.iris.engine.lighting; import com.bergerkiller.bukkit.common.utils.WorldUtil; import org.bukkit.World; diff --git a/src/main/java/com/volmit/iris/scaffold/lighting/FlatRegionInfoMap.java b/src/main/java/com/volmit/iris/engine/lighting/FlatRegionInfoMap.java similarity index 99% rename from src/main/java/com/volmit/iris/scaffold/lighting/FlatRegionInfoMap.java rename to src/main/java/com/volmit/iris/engine/lighting/FlatRegionInfoMap.java index b676594dd..79cca5998 100644 --- a/src/main/java/com/volmit/iris/scaffold/lighting/FlatRegionInfoMap.java +++ b/src/main/java/com/volmit/iris/engine/lighting/FlatRegionInfoMap.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.scaffold.lighting; +package com.volmit.iris.engine.lighting; import com.bergerkiller.bukkit.common.bases.IntVector3; import com.bergerkiller.bukkit.common.utils.MathUtil; diff --git a/src/main/java/com/volmit/iris/scaffold/lighting/LightingAutoClean.java b/src/main/java/com/volmit/iris/engine/lighting/LightingAutoClean.java similarity index 99% rename from src/main/java/com/volmit/iris/scaffold/lighting/LightingAutoClean.java rename to src/main/java/com/volmit/iris/engine/lighting/LightingAutoClean.java index 18a9e4693..6a76663f0 100644 --- a/src/main/java/com/volmit/iris/scaffold/lighting/LightingAutoClean.java +++ b/src/main/java/com/volmit/iris/engine/lighting/LightingAutoClean.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.scaffold.lighting; +package com.volmit.iris.engine.lighting; import com.bergerkiller.bukkit.common.Task; import com.bergerkiller.bukkit.common.utils.WorldUtil; diff --git a/src/main/java/com/volmit/iris/scaffold/lighting/LightingCategory.java b/src/main/java/com/volmit/iris/engine/lighting/LightingCategory.java similarity index 99% rename from src/main/java/com/volmit/iris/scaffold/lighting/LightingCategory.java rename to src/main/java/com/volmit/iris/engine/lighting/LightingCategory.java index 732c11e93..52db28d5e 100644 --- a/src/main/java/com/volmit/iris/scaffold/lighting/LightingCategory.java +++ b/src/main/java/com/volmit/iris/engine/lighting/LightingCategory.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.scaffold.lighting; +package com.volmit.iris.engine.lighting; import com.bergerkiller.bukkit.common.collections.BlockFaceSet; diff --git a/src/main/java/com/volmit/iris/scaffold/lighting/LightingChunk.java b/src/main/java/com/volmit/iris/engine/lighting/LightingChunk.java similarity index 99% rename from src/main/java/com/volmit/iris/scaffold/lighting/LightingChunk.java rename to src/main/java/com/volmit/iris/engine/lighting/LightingChunk.java index 1cb557442..dfe5e002a 100644 --- a/src/main/java/com/volmit/iris/scaffold/lighting/LightingChunk.java +++ b/src/main/java/com/volmit/iris/engine/lighting/LightingChunk.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.scaffold.lighting; +package com.volmit.iris.engine.lighting; import com.bergerkiller.bukkit.common.bases.IntVector2; import com.bergerkiller.bukkit.common.chunk.ForcedChunk; diff --git a/src/main/java/com/volmit/iris/scaffold/lighting/LightingChunkNeighboring.java b/src/main/java/com/volmit/iris/engine/lighting/LightingChunkNeighboring.java similarity index 98% rename from src/main/java/com/volmit/iris/scaffold/lighting/LightingChunkNeighboring.java rename to src/main/java/com/volmit/iris/engine/lighting/LightingChunkNeighboring.java index 04b7374fa..8029cbdfb 100644 --- a/src/main/java/com/volmit/iris/scaffold/lighting/LightingChunkNeighboring.java +++ b/src/main/java/com/volmit/iris/engine/lighting/LightingChunkNeighboring.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.scaffold.lighting; +package com.volmit.iris.engine.lighting; /** * Keeps track of the 4 x/z neighbors of chunks diff --git a/src/main/java/com/volmit/iris/scaffold/lighting/LightingCube.java b/src/main/java/com/volmit/iris/engine/lighting/LightingCube.java similarity index 99% rename from src/main/java/com/volmit/iris/scaffold/lighting/LightingCube.java rename to src/main/java/com/volmit/iris/engine/lighting/LightingCube.java index 3c332e7c6..26502bce6 100644 --- a/src/main/java/com/volmit/iris/scaffold/lighting/LightingCube.java +++ b/src/main/java/com/volmit/iris/engine/lighting/LightingCube.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.scaffold.lighting; +package com.volmit.iris.engine.lighting; import com.bergerkiller.bukkit.common.collections.BlockFaceSet; import com.bergerkiller.bukkit.common.utils.WorldUtil; diff --git a/src/main/java/com/volmit/iris/scaffold/lighting/LightingCubeNeighboring.java b/src/main/java/com/volmit/iris/engine/lighting/LightingCubeNeighboring.java similarity index 98% rename from src/main/java/com/volmit/iris/scaffold/lighting/LightingCubeNeighboring.java rename to src/main/java/com/volmit/iris/engine/lighting/LightingCubeNeighboring.java index 9f5809801..e40603228 100644 --- a/src/main/java/com/volmit/iris/scaffold/lighting/LightingCubeNeighboring.java +++ b/src/main/java/com/volmit/iris/engine/lighting/LightingCubeNeighboring.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.scaffold.lighting; +package com.volmit.iris.engine.lighting; /** * Keeps track of the 6 x/y/z neighbors of cubes diff --git a/src/main/java/com/volmit/iris/scaffold/lighting/LightingForcedChunkCache.java b/src/main/java/com/volmit/iris/engine/lighting/LightingForcedChunkCache.java similarity index 98% rename from src/main/java/com/volmit/iris/scaffold/lighting/LightingForcedChunkCache.java rename to src/main/java/com/volmit/iris/engine/lighting/LightingForcedChunkCache.java index d3866b252..436ef2fe9 100644 --- a/src/main/java/com/volmit/iris/scaffold/lighting/LightingForcedChunkCache.java +++ b/src/main/java/com/volmit/iris/engine/lighting/LightingForcedChunkCache.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.scaffold.lighting; +package com.volmit.iris.engine.lighting; import com.bergerkiller.bukkit.common.chunk.ForcedChunk; import com.bergerkiller.bukkit.common.utils.WorldUtil; diff --git a/src/main/java/com/volmit/iris/scaffold/lighting/LightingService.java b/src/main/java/com/volmit/iris/engine/lighting/LightingService.java similarity index 99% rename from src/main/java/com/volmit/iris/scaffold/lighting/LightingService.java rename to src/main/java/com/volmit/iris/engine/lighting/LightingService.java index d0029c831..0198808a3 100644 --- a/src/main/java/com/volmit/iris/scaffold/lighting/LightingService.java +++ b/src/main/java/com/volmit/iris/engine/lighting/LightingService.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.scaffold.lighting; +package com.volmit.iris.engine.lighting; import com.bergerkiller.bukkit.common.AsyncTask; import com.bergerkiller.bukkit.common.bases.IntVector2; diff --git a/src/main/java/com/volmit/iris/scaffold/lighting/LightingTask.java b/src/main/java/com/volmit/iris/engine/lighting/LightingTask.java similarity index 97% rename from src/main/java/com/volmit/iris/scaffold/lighting/LightingTask.java rename to src/main/java/com/volmit/iris/engine/lighting/LightingTask.java index c5f4731d4..9f66ab324 100644 --- a/src/main/java/com/volmit/iris/scaffold/lighting/LightingTask.java +++ b/src/main/java/com/volmit/iris/engine/lighting/LightingTask.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.scaffold.lighting; +package com.volmit.iris.engine.lighting; import org.bukkit.World; diff --git a/src/main/java/com/volmit/iris/scaffold/lighting/LightingTaskBatch.java b/src/main/java/com/volmit/iris/engine/lighting/LightingTaskBatch.java similarity index 99% rename from src/main/java/com/volmit/iris/scaffold/lighting/LightingTaskBatch.java rename to src/main/java/com/volmit/iris/engine/lighting/LightingTaskBatch.java index 3a03ab17e..5fe22b083 100644 --- a/src/main/java/com/volmit/iris/scaffold/lighting/LightingTaskBatch.java +++ b/src/main/java/com/volmit/iris/engine/lighting/LightingTaskBatch.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.scaffold.lighting; +package com.volmit.iris.engine.lighting; import com.bergerkiller.bukkit.common.bases.IntVector2; import com.bergerkiller.bukkit.common.utils.CommonUtil; diff --git a/src/main/java/com/volmit/iris/scaffold/lighting/LightingTaskWorld.java b/src/main/java/com/volmit/iris/engine/lighting/LightingTaskWorld.java similarity index 99% rename from src/main/java/com/volmit/iris/scaffold/lighting/LightingTaskWorld.java rename to src/main/java/com/volmit/iris/engine/lighting/LightingTaskWorld.java index e306caaa7..e3ba807e1 100644 --- a/src/main/java/com/volmit/iris/scaffold/lighting/LightingTaskWorld.java +++ b/src/main/java/com/volmit/iris/engine/lighting/LightingTaskWorld.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.scaffold.lighting; +package com.volmit.iris.engine.lighting; import com.bergerkiller.bukkit.common.utils.CommonUtil; import com.bergerkiller.bukkit.common.wrappers.LongHashSet; diff --git a/src/main/java/com/volmit/iris/scaffold/lighting/LightingUtil.java b/src/main/java/com/volmit/iris/engine/lighting/LightingUtil.java similarity index 97% rename from src/main/java/com/volmit/iris/scaffold/lighting/LightingUtil.java rename to src/main/java/com/volmit/iris/engine/lighting/LightingUtil.java index 469f2815a..c1d854e71 100644 --- a/src/main/java/com/volmit/iris/scaffold/lighting/LightingUtil.java +++ b/src/main/java/com/volmit/iris/engine/lighting/LightingUtil.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.scaffold.lighting; +package com.volmit.iris.engine.lighting; import com.bergerkiller.bukkit.common.utils.MathUtil; diff --git a/src/main/java/com/volmit/iris/scaffold/lighting/TimeDurationFormat.java b/src/main/java/com/volmit/iris/engine/lighting/TimeDurationFormat.java similarity index 97% rename from src/main/java/com/volmit/iris/scaffold/lighting/TimeDurationFormat.java rename to src/main/java/com/volmit/iris/engine/lighting/TimeDurationFormat.java index 925e0da50..4df8f23d3 100644 --- a/src/main/java/com/volmit/iris/scaffold/lighting/TimeDurationFormat.java +++ b/src/main/java/com/volmit/iris/engine/lighting/TimeDurationFormat.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.scaffold.lighting; +package com.volmit.iris.engine.lighting; import java.text.SimpleDateFormat; import java.util.Date; diff --git a/src/main/java/com/volmit/iris/generator/modifier/IrisCaveModifier.java b/src/main/java/com/volmit/iris/engine/modifier/IrisCaveModifier.java similarity index 96% rename from src/main/java/com/volmit/iris/generator/modifier/IrisCaveModifier.java rename to src/main/java/com/volmit/iris/engine/modifier/IrisCaveModifier.java index 676bf86c3..ecce2f1e4 100644 --- a/src/main/java/com/volmit/iris/generator/modifier/IrisCaveModifier.java +++ b/src/main/java/com/volmit/iris/engine/modifier/IrisCaveModifier.java @@ -16,14 +16,14 @@ * along with this program. If not, see . */ -package com.volmit.iris.generator.modifier; +package com.volmit.iris.engine.modifier; -import com.volmit.iris.generator.noise.FastNoiseDouble; -import com.volmit.iris.object.IrisBiome; -import com.volmit.iris.object.IrisCaveLayer; -import com.volmit.iris.scaffold.engine.Engine; -import com.volmit.iris.scaffold.engine.EngineAssignedModifier; -import com.volmit.iris.scaffold.hunk.Hunk; +import com.volmit.iris.engine.noise.FastNoiseDouble; +import com.volmit.iris.engine.object.IrisBiome; +import com.volmit.iris.engine.object.IrisCaveLayer; +import com.volmit.iris.engine.framework.Engine; +import com.volmit.iris.engine.framework.EngineAssignedModifier; +import com.volmit.iris.engine.hunk.Hunk; import com.volmit.iris.util.*; import org.bukkit.Material; import org.bukkit.block.data.BlockData; diff --git a/src/main/java/com/volmit/iris/generator/modifier/IrisDepositModifier.java b/src/main/java/com/volmit/iris/engine/modifier/IrisDepositModifier.java similarity index 92% rename from src/main/java/com/volmit/iris/generator/modifier/IrisDepositModifier.java rename to src/main/java/com/volmit/iris/engine/modifier/IrisDepositModifier.java index 4977bbd4d..e156570c5 100644 --- a/src/main/java/com/volmit/iris/generator/modifier/IrisDepositModifier.java +++ b/src/main/java/com/volmit/iris/engine/modifier/IrisDepositModifier.java @@ -16,15 +16,15 @@ * along with this program. If not, see . */ -package com.volmit.iris.generator.modifier; +package com.volmit.iris.engine.modifier; -import com.volmit.iris.object.IrisBiome; -import com.volmit.iris.object.IrisDepositGenerator; -import com.volmit.iris.object.IrisObject; -import com.volmit.iris.object.IrisRegion; -import com.volmit.iris.scaffold.engine.Engine; -import com.volmit.iris.scaffold.engine.EngineAssignedModifier; -import com.volmit.iris.scaffold.hunk.Hunk; +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.engine.framework.Engine; +import com.volmit.iris.engine.framework.EngineAssignedModifier; +import com.volmit.iris.engine.hunk.Hunk; import com.volmit.iris.util.HeightMap; import com.volmit.iris.util.PrecisionStopwatch; import com.volmit.iris.util.RNG; diff --git a/src/main/java/com/volmit/iris/generator/modifier/IrisPostModifier.java b/src/main/java/com/volmit/iris/engine/modifier/IrisPostModifier.java similarity index 98% rename from src/main/java/com/volmit/iris/generator/modifier/IrisPostModifier.java rename to src/main/java/com/volmit/iris/engine/modifier/IrisPostModifier.java index b54c29aa3..5d0402ee1 100644 --- a/src/main/java/com/volmit/iris/generator/modifier/IrisPostModifier.java +++ b/src/main/java/com/volmit/iris/engine/modifier/IrisPostModifier.java @@ -16,15 +16,15 @@ * along with this program. If not, see . */ -package com.volmit.iris.generator.modifier; +package com.volmit.iris.engine.modifier; import com.volmit.iris.Iris; -import com.volmit.iris.object.IrisBiome; -import com.volmit.iris.scaffold.engine.Engine; -import com.volmit.iris.scaffold.engine.EngineAssignedModifier; -import com.volmit.iris.scaffold.hunk.Hunk; -import com.volmit.iris.scaffold.parallel.BurstExecutor; -import com.volmit.iris.scaffold.parallel.MultiBurst; +import com.volmit.iris.engine.object.IrisBiome; +import com.volmit.iris.engine.framework.Engine; +import com.volmit.iris.engine.framework.EngineAssignedModifier; +import com.volmit.iris.engine.hunk.Hunk; +import com.volmit.iris.engine.parallel.BurstExecutor; +import com.volmit.iris.engine.parallel.MultiBurst; import com.volmit.iris.util.B; import com.volmit.iris.util.CaveResult; import com.volmit.iris.util.PrecisionStopwatch; diff --git a/src/main/java/com/volmit/iris/generator/modifier/IrisRavineModifier.java b/src/main/java/com/volmit/iris/engine/modifier/IrisRavineModifier.java similarity index 97% rename from src/main/java/com/volmit/iris/generator/modifier/IrisRavineModifier.java rename to src/main/java/com/volmit/iris/engine/modifier/IrisRavineModifier.java index 9ebe280d3..7d64f063d 100644 --- a/src/main/java/com/volmit/iris/generator/modifier/IrisRavineModifier.java +++ b/src/main/java/com/volmit/iris/engine/modifier/IrisRavineModifier.java @@ -16,13 +16,13 @@ * along with this program. If not, see . */ -package com.volmit.iris.generator.modifier; +package com.volmit.iris.engine.modifier; -import com.volmit.iris.generator.noise.CNG; -import com.volmit.iris.object.NoiseStyle; -import com.volmit.iris.scaffold.engine.Engine; -import com.volmit.iris.scaffold.engine.EngineAssignedModifier; -import com.volmit.iris.scaffold.hunk.Hunk; +import com.volmit.iris.engine.noise.CNG; +import com.volmit.iris.engine.object.NoiseStyle; +import com.volmit.iris.engine.framework.Engine; +import com.volmit.iris.engine.framework.EngineAssignedModifier; +import com.volmit.iris.engine.hunk.Hunk; import com.volmit.iris.util.*; import org.bukkit.Material; import org.bukkit.block.data.BlockData; diff --git a/src/main/java/com/volmit/iris/generator/noise/CNG.java b/src/main/java/com/volmit/iris/engine/noise/CNG.java similarity index 98% rename from src/main/java/com/volmit/iris/generator/noise/CNG.java rename to src/main/java/com/volmit/iris/engine/noise/CNG.java index 20ff723cd..04994a603 100644 --- a/src/main/java/com/volmit/iris/generator/noise/CNG.java +++ b/src/main/java/com/volmit/iris/engine/noise/CNG.java @@ -16,12 +16,12 @@ * along with this program. If not, see . */ -package com.volmit.iris.generator.noise; +package com.volmit.iris.engine.noise; import com.volmit.iris.Iris; -import com.volmit.iris.scaffold.stream.ProceduralStream; -import com.volmit.iris.scaffold.stream.arithmetic.FittedStream; -import com.volmit.iris.scaffold.stream.sources.CNGStream; +import com.volmit.iris.engine.stream.ProceduralStream; +import com.volmit.iris.engine.stream.arithmetic.FittedStream; +import com.volmit.iris.engine.stream.sources.CNGStream; import com.volmit.iris.util.*; import lombok.Data; diff --git a/src/main/java/com/volmit/iris/generator/noise/CNGFactory.java b/src/main/java/com/volmit/iris/engine/noise/CNGFactory.java similarity index 95% rename from src/main/java/com/volmit/iris/generator/noise/CNGFactory.java rename to src/main/java/com/volmit/iris/engine/noise/CNGFactory.java index a4394d65a..299dcd45d 100644 --- a/src/main/java/com/volmit/iris/generator/noise/CNGFactory.java +++ b/src/main/java/com/volmit/iris/engine/noise/CNGFactory.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.generator.noise; +package com.volmit.iris.engine.noise; import com.volmit.iris.util.RNG; diff --git a/src/main/java/com/volmit/iris/generator/noise/CellGenerator.java b/src/main/java/com/volmit/iris/engine/noise/CellGenerator.java similarity index 100% rename from src/main/java/com/volmit/iris/generator/noise/CellGenerator.java rename to src/main/java/com/volmit/iris/engine/noise/CellGenerator.java diff --git a/src/main/java/com/volmit/iris/generator/noise/CellHeightNoise.java b/src/main/java/com/volmit/iris/engine/noise/CellHeightNoise.java similarity index 100% rename from src/main/java/com/volmit/iris/generator/noise/CellHeightNoise.java rename to src/main/java/com/volmit/iris/engine/noise/CellHeightNoise.java diff --git a/src/main/java/com/volmit/iris/generator/noise/CellularNoise.java b/src/main/java/com/volmit/iris/engine/noise/CellularNoise.java similarity index 100% rename from src/main/java/com/volmit/iris/generator/noise/CellularNoise.java rename to src/main/java/com/volmit/iris/engine/noise/CellularNoise.java diff --git a/src/main/java/com/volmit/iris/generator/noise/CubicNoise.java b/src/main/java/com/volmit/iris/engine/noise/CubicNoise.java similarity index 97% rename from src/main/java/com/volmit/iris/generator/noise/CubicNoise.java rename to src/main/java/com/volmit/iris/engine/noise/CubicNoise.java index 1936c743b..b7591121b 100644 --- a/src/main/java/com/volmit/iris/generator/noise/CubicNoise.java +++ b/src/main/java/com/volmit/iris/engine/noise/CubicNoise.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.generator.noise; +package com.volmit.iris.engine.noise; import com.volmit.iris.util.RNG; diff --git a/src/main/java/com/volmit/iris/generator/noise/FastNoise.java b/src/main/java/com/volmit/iris/engine/noise/FastNoise.java similarity index 99% rename from src/main/java/com/volmit/iris/generator/noise/FastNoise.java rename to src/main/java/com/volmit/iris/engine/noise/FastNoise.java index fc445510c..cdd91f7b3 100644 --- a/src/main/java/com/volmit/iris/generator/noise/FastNoise.java +++ b/src/main/java/com/volmit/iris/engine/noise/FastNoise.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.generator.noise; +package com.volmit.iris.engine.noise; import com.volmit.iris.util.Vector2f; import com.volmit.iris.util.Vector3f; diff --git a/src/main/java/com/volmit/iris/generator/noise/FastNoiseDouble.java b/src/main/java/com/volmit/iris/engine/noise/FastNoiseDouble.java similarity index 99% rename from src/main/java/com/volmit/iris/generator/noise/FastNoiseDouble.java rename to src/main/java/com/volmit/iris/engine/noise/FastNoiseDouble.java index 932edf732..5a6f23dae 100644 --- a/src/main/java/com/volmit/iris/generator/noise/FastNoiseDouble.java +++ b/src/main/java/com/volmit/iris/engine/noise/FastNoiseDouble.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.volmit.iris.generator.noise; +package com.volmit.iris.engine.noise; import com.volmit.iris.util.Vector2f; import com.volmit.iris.util.Vector3f; diff --git a/src/main/java/com/volmit/iris/generator/noise/FlatNoise.java b/src/main/java/com/volmit/iris/engine/noise/FlatNoise.java similarity index 96% rename from src/main/java/com/volmit/iris/generator/noise/FlatNoise.java rename to src/main/java/com/volmit/iris/engine/noise/FlatNoise.java index 8c2944106..4aceb1aec 100644 --- a/src/main/java/com/volmit/iris/generator/noise/FlatNoise.java +++ b/src/main/java/com/volmit/iris/engine/noise/FlatNoise.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.generator.noise; +package com.volmit.iris.engine.noise; public class FlatNoise implements NoiseGenerator { public FlatNoise(long seed) { diff --git a/src/main/java/com/volmit/iris/generator/noise/FractalBillowPerlinNoise.java b/src/main/java/com/volmit/iris/engine/noise/FractalBillowPerlinNoise.java similarity index 93% rename from src/main/java/com/volmit/iris/generator/noise/FractalBillowPerlinNoise.java rename to src/main/java/com/volmit/iris/engine/noise/FractalBillowPerlinNoise.java index 104253f51..4fc526411 100644 --- a/src/main/java/com/volmit/iris/generator/noise/FractalBillowPerlinNoise.java +++ b/src/main/java/com/volmit/iris/engine/noise/FractalBillowPerlinNoise.java @@ -16,9 +16,9 @@ * along with this program. If not, see . */ -package com.volmit.iris.generator.noise; +package com.volmit.iris.engine.noise; -import com.volmit.iris.generator.noise.FastNoiseDouble.FractalType; +import com.volmit.iris.engine.noise.FastNoiseDouble.FractalType; import com.volmit.iris.util.RNG; public class FractalBillowPerlinNoise implements NoiseGenerator, OctaveNoise { diff --git a/src/main/java/com/volmit/iris/generator/noise/FractalBillowSimplexNoise.java b/src/main/java/com/volmit/iris/engine/noise/FractalBillowSimplexNoise.java similarity index 93% rename from src/main/java/com/volmit/iris/generator/noise/FractalBillowSimplexNoise.java rename to src/main/java/com/volmit/iris/engine/noise/FractalBillowSimplexNoise.java index e5b54553d..a92626b79 100644 --- a/src/main/java/com/volmit/iris/generator/noise/FractalBillowSimplexNoise.java +++ b/src/main/java/com/volmit/iris/engine/noise/FractalBillowSimplexNoise.java @@ -16,9 +16,9 @@ * along with this program. If not, see . */ -package com.volmit.iris.generator.noise; +package com.volmit.iris.engine.noise; -import com.volmit.iris.generator.noise.FastNoiseDouble.FractalType; +import com.volmit.iris.engine.noise.FastNoiseDouble.FractalType; import com.volmit.iris.util.RNG; public class FractalBillowSimplexNoise implements NoiseGenerator, OctaveNoise { diff --git a/src/main/java/com/volmit/iris/generator/noise/FractalCubicNoise.java b/src/main/java/com/volmit/iris/engine/noise/FractalCubicNoise.java similarity index 93% rename from src/main/java/com/volmit/iris/generator/noise/FractalCubicNoise.java rename to src/main/java/com/volmit/iris/engine/noise/FractalCubicNoise.java index ed0abff2f..31381f818 100644 --- a/src/main/java/com/volmit/iris/generator/noise/FractalCubicNoise.java +++ b/src/main/java/com/volmit/iris/engine/noise/FractalCubicNoise.java @@ -16,9 +16,9 @@ * along with this program. If not, see . */ -package com.volmit.iris.generator.noise; +package com.volmit.iris.engine.noise; -import com.volmit.iris.generator.noise.FastNoiseDouble.FractalType; +import com.volmit.iris.engine.noise.FastNoiseDouble.FractalType; import com.volmit.iris.util.RNG; public class FractalCubicNoise implements NoiseGenerator { diff --git a/src/main/java/com/volmit/iris/generator/noise/FractalFBMSimplexNoise.java b/src/main/java/com/volmit/iris/engine/noise/FractalFBMSimplexNoise.java similarity index 93% rename from src/main/java/com/volmit/iris/generator/noise/FractalFBMSimplexNoise.java rename to src/main/java/com/volmit/iris/engine/noise/FractalFBMSimplexNoise.java index b6d6d9e52..b04ed19d7 100644 --- a/src/main/java/com/volmit/iris/generator/noise/FractalFBMSimplexNoise.java +++ b/src/main/java/com/volmit/iris/engine/noise/FractalFBMSimplexNoise.java @@ -16,9 +16,9 @@ * along with this program. If not, see . */ -package com.volmit.iris.generator.noise; +package com.volmit.iris.engine.noise; -import com.volmit.iris.generator.noise.FastNoiseDouble.FractalType; +import com.volmit.iris.engine.noise.FastNoiseDouble.FractalType; import com.volmit.iris.util.RNG; public class FractalFBMSimplexNoise implements NoiseGenerator, OctaveNoise { diff --git a/src/main/java/com/volmit/iris/generator/noise/FractalRigidMultiSimplexNoise.java b/src/main/java/com/volmit/iris/engine/noise/FractalRigidMultiSimplexNoise.java similarity index 93% rename from src/main/java/com/volmit/iris/generator/noise/FractalRigidMultiSimplexNoise.java rename to src/main/java/com/volmit/iris/engine/noise/FractalRigidMultiSimplexNoise.java index df5fed649..1bc190da5 100644 --- a/src/main/java/com/volmit/iris/generator/noise/FractalRigidMultiSimplexNoise.java +++ b/src/main/java/com/volmit/iris/engine/noise/FractalRigidMultiSimplexNoise.java @@ -16,9 +16,9 @@ * along with this program. If not, see . */ -package com.volmit.iris.generator.noise; +package com.volmit.iris.engine.noise; -import com.volmit.iris.generator.noise.FastNoiseDouble.FractalType; +import com.volmit.iris.engine.noise.FastNoiseDouble.FractalType; import com.volmit.iris.util.RNG; public class FractalRigidMultiSimplexNoise implements NoiseGenerator, OctaveNoise { diff --git a/src/main/java/com/volmit/iris/generator/noise/GlobNoise.java b/src/main/java/com/volmit/iris/engine/noise/GlobNoise.java similarity index 97% rename from src/main/java/com/volmit/iris/generator/noise/GlobNoise.java rename to src/main/java/com/volmit/iris/engine/noise/GlobNoise.java index d51b33dbe..a4aa476f2 100644 --- a/src/main/java/com/volmit/iris/generator/noise/GlobNoise.java +++ b/src/main/java/com/volmit/iris/engine/noise/GlobNoise.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.generator.noise; +package com.volmit.iris.engine.noise; import com.volmit.iris.util.RNG; diff --git a/src/main/java/com/volmit/iris/generator/noise/NoiseFactory.java b/src/main/java/com/volmit/iris/engine/noise/NoiseFactory.java similarity index 95% rename from src/main/java/com/volmit/iris/generator/noise/NoiseFactory.java rename to src/main/java/com/volmit/iris/engine/noise/NoiseFactory.java index 22a50d96d..bc666413e 100644 --- a/src/main/java/com/volmit/iris/generator/noise/NoiseFactory.java +++ b/src/main/java/com/volmit/iris/engine/noise/NoiseFactory.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.generator.noise; +package com.volmit.iris.engine.noise; @FunctionalInterface public interface NoiseFactory { diff --git a/src/main/java/com/volmit/iris/generator/noise/NoiseGenerator.java b/src/main/java/com/volmit/iris/engine/noise/NoiseGenerator.java similarity index 95% rename from src/main/java/com/volmit/iris/generator/noise/NoiseGenerator.java rename to src/main/java/com/volmit/iris/engine/noise/NoiseGenerator.java index 2269bb0bb..b2147c8f4 100644 --- a/src/main/java/com/volmit/iris/generator/noise/NoiseGenerator.java +++ b/src/main/java/com/volmit/iris/engine/noise/NoiseGenerator.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.generator.noise; +package com.volmit.iris.engine.noise; public interface NoiseGenerator { double noise(double x); diff --git a/src/main/java/com/volmit/iris/generator/noise/NoiseType.java b/src/main/java/com/volmit/iris/engine/noise/NoiseType.java similarity index 97% rename from src/main/java/com/volmit/iris/generator/noise/NoiseType.java rename to src/main/java/com/volmit/iris/engine/noise/NoiseType.java index 9ad1c4fdd..d36a3c776 100644 --- a/src/main/java/com/volmit/iris/generator/noise/NoiseType.java +++ b/src/main/java/com/volmit/iris/engine/noise/NoiseType.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.generator.noise; +package com.volmit.iris.engine.noise; public enum NoiseType { WHITE(WhiteNoise::new), diff --git a/src/main/java/com/volmit/iris/generator/noise/OctaveNoise.java b/src/main/java/com/volmit/iris/engine/noise/OctaveNoise.java similarity index 95% rename from src/main/java/com/volmit/iris/generator/noise/OctaveNoise.java rename to src/main/java/com/volmit/iris/engine/noise/OctaveNoise.java index 5af655c76..9f937ee4b 100644 --- a/src/main/java/com/volmit/iris/generator/noise/OctaveNoise.java +++ b/src/main/java/com/volmit/iris/engine/noise/OctaveNoise.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.generator.noise; +package com.volmit.iris.engine.noise; public interface OctaveNoise { void setOctaves(int o); diff --git a/src/main/java/com/volmit/iris/generator/noise/PerlinNoise.java b/src/main/java/com/volmit/iris/engine/noise/PerlinNoise.java similarity index 98% rename from src/main/java/com/volmit/iris/generator/noise/PerlinNoise.java rename to src/main/java/com/volmit/iris/engine/noise/PerlinNoise.java index 97fd1f69f..5c239c705 100644 --- a/src/main/java/com/volmit/iris/generator/noise/PerlinNoise.java +++ b/src/main/java/com/volmit/iris/engine/noise/PerlinNoise.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.generator.noise; +package com.volmit.iris.engine.noise; import com.volmit.iris.util.RNG; diff --git a/src/main/java/com/volmit/iris/generator/noise/RarityCellGenerator.java b/src/main/java/com/volmit/iris/engine/noise/RarityCellGenerator.java similarity index 98% rename from src/main/java/com/volmit/iris/generator/noise/RarityCellGenerator.java rename to src/main/java/com/volmit/iris/engine/noise/RarityCellGenerator.java index d4ba1084b..99c94b5a1 100644 --- a/src/main/java/com/volmit/iris/generator/noise/RarityCellGenerator.java +++ b/src/main/java/com/volmit/iris/engine/noise/RarityCellGenerator.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.generator.noise; +package com.volmit.iris.engine.noise; import com.volmit.iris.util.IRare; import com.volmit.iris.util.KList; diff --git a/src/main/java/com/volmit/iris/generator/noise/SimplexNoise.java b/src/main/java/com/volmit/iris/engine/noise/SimplexNoise.java similarity index 98% rename from src/main/java/com/volmit/iris/generator/noise/SimplexNoise.java rename to src/main/java/com/volmit/iris/engine/noise/SimplexNoise.java index e1ee1d1cd..74eacbc11 100644 --- a/src/main/java/com/volmit/iris/generator/noise/SimplexNoise.java +++ b/src/main/java/com/volmit/iris/engine/noise/SimplexNoise.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.generator.noise; +package com.volmit.iris.engine.noise; import com.volmit.iris.util.RNG; diff --git a/src/main/java/com/volmit/iris/generator/noise/VascularNoise.java b/src/main/java/com/volmit/iris/engine/noise/VascularNoise.java similarity index 97% rename from src/main/java/com/volmit/iris/generator/noise/VascularNoise.java rename to src/main/java/com/volmit/iris/engine/noise/VascularNoise.java index e069e44d0..54ecf56e5 100644 --- a/src/main/java/com/volmit/iris/generator/noise/VascularNoise.java +++ b/src/main/java/com/volmit/iris/engine/noise/VascularNoise.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.generator.noise; +package com.volmit.iris.engine.noise; import com.volmit.iris.util.M; import com.volmit.iris.util.RNG; diff --git a/src/main/java/com/volmit/iris/generator/noise/WhiteNoise.java b/src/main/java/com/volmit/iris/engine/noise/WhiteNoise.java similarity index 97% rename from src/main/java/com/volmit/iris/generator/noise/WhiteNoise.java rename to src/main/java/com/volmit/iris/engine/noise/WhiteNoise.java index 67689f77b..005ee76b6 100644 --- a/src/main/java/com/volmit/iris/generator/noise/WhiteNoise.java +++ b/src/main/java/com/volmit/iris/engine/noise/WhiteNoise.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.generator.noise; +package com.volmit.iris.engine.noise; import com.volmit.iris.util.RNG; diff --git a/src/main/java/com/volmit/iris/object/CarvingMode.java b/src/main/java/com/volmit/iris/engine/object/CarvingMode.java similarity index 97% rename from src/main/java/com/volmit/iris/object/CarvingMode.java rename to src/main/java/com/volmit/iris/engine/object/CarvingMode.java index 443d21311..1da9b79b0 100644 --- a/src/main/java/com/volmit/iris/object/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.object; +package com.volmit.iris.engine.object; import com.volmit.iris.util.Desc; diff --git a/src/main/java/com/volmit/iris/object/DecorationPart.java b/src/main/java/com/volmit/iris/engine/object/DecorationPart.java similarity index 97% rename from src/main/java/com/volmit/iris/object/DecorationPart.java rename to src/main/java/com/volmit/iris/engine/object/DecorationPart.java index 96c6037ab..e0df89cb3 100644 --- a/src/main/java/com/volmit/iris/object/DecorationPart.java +++ b/src/main/java/com/volmit/iris/engine/object/DecorationPart.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.object; +package com.volmit.iris.engine.object; import com.volmit.iris.util.Desc; diff --git a/src/main/java/com/volmit/iris/object/FontStyle.java b/src/main/java/com/volmit/iris/engine/object/FontStyle.java similarity index 96% rename from src/main/java/com/volmit/iris/object/FontStyle.java rename to src/main/java/com/volmit/iris/engine/object/FontStyle.java index f278c74a5..eef5ef5ce 100644 --- a/src/main/java/com/volmit/iris/object/FontStyle.java +++ b/src/main/java/com/volmit/iris/engine/object/FontStyle.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.object; +package com.volmit.iris.engine.object; import com.volmit.iris.util.Desc; diff --git a/src/main/java/com/volmit/iris/object/InferredType.java b/src/main/java/com/volmit/iris/engine/object/InferredType.java similarity index 97% rename from src/main/java/com/volmit/iris/object/InferredType.java rename to src/main/java/com/volmit/iris/engine/object/InferredType.java index 5ba2be767..2346e3393 100644 --- a/src/main/java/com/volmit/iris/object/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.object; +package com.volmit.iris.engine.object; import com.volmit.iris.util.Desc; diff --git a/src/main/java/com/volmit/iris/object/InterpolationMethod.java b/src/main/java/com/volmit/iris/engine/object/InterpolationMethod.java similarity index 99% rename from src/main/java/com/volmit/iris/object/InterpolationMethod.java rename to src/main/java/com/volmit/iris/engine/object/InterpolationMethod.java index b9bf58911..8e791e3a1 100644 --- a/src/main/java/com/volmit/iris/object/InterpolationMethod.java +++ b/src/main/java/com/volmit/iris/engine/object/InterpolationMethod.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.object; +package com.volmit.iris.engine.object; import com.volmit.iris.util.Desc; diff --git a/src/main/java/com/volmit/iris/object/InventorySlotType.java b/src/main/java/com/volmit/iris/engine/object/InventorySlotType.java similarity index 97% rename from src/main/java/com/volmit/iris/object/InventorySlotType.java rename to src/main/java/com/volmit/iris/engine/object/InventorySlotType.java index 8bdcc64f2..2ec30c676 100644 --- a/src/main/java/com/volmit/iris/object/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.object; +package com.volmit.iris.engine.object; import com.volmit.iris.util.Desc; diff --git a/src/main/java/com/volmit/iris/object/IrisAttributeModifier.java b/src/main/java/com/volmit/iris/engine/object/IrisAttributeModifier.java similarity index 98% rename from src/main/java/com/volmit/iris/object/IrisAttributeModifier.java rename to src/main/java/com/volmit/iris/engine/object/IrisAttributeModifier.java index 0bbb40a46..1b1ac7619 100644 --- a/src/main/java/com/volmit/iris/object/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.object; +package com.volmit.iris.engine.object; import com.volmit.iris.util.*; import lombok.AllArgsConstructor; diff --git a/src/main/java/com/volmit/iris/object/IrisAxisRotationClamp.java b/src/main/java/com/volmit/iris/engine/object/IrisAxisRotationClamp.java similarity index 98% rename from src/main/java/com/volmit/iris/object/IrisAxisRotationClamp.java rename to src/main/java/com/volmit/iris/engine/object/IrisAxisRotationClamp.java index eb5c181a4..33aad0409 100644 --- a/src/main/java/com/volmit/iris/object/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.object; +package com.volmit.iris.engine.object; import com.volmit.iris.util.*; import lombok.AllArgsConstructor; diff --git a/src/main/java/com/volmit/iris/object/IrisBiome.java b/src/main/java/com/volmit/iris/engine/object/IrisBiome.java similarity index 98% rename from src/main/java/com/volmit/iris/object/IrisBiome.java rename to src/main/java/com/volmit/iris/engine/object/IrisBiome.java index de510867b..cbce828f8 100644 --- a/src/main/java/com/volmit/iris/object/IrisBiome.java +++ b/src/main/java/com/volmit/iris/engine/object/IrisBiome.java @@ -16,18 +16,17 @@ * along with this program. If not, see . */ -package com.volmit.iris.object; +package com.volmit.iris.engine.object; import com.volmit.iris.Iris; -import com.volmit.iris.generator.IrisComplex; -import com.volmit.iris.generator.IrisEngine; -import com.volmit.iris.generator.noise.CNG; -import com.volmit.iris.manager.IrisDataManager; -import com.volmit.iris.map.RenderType; -import com.volmit.iris.scaffold.cache.AtomicCache; -import com.volmit.iris.scaffold.data.DataProvider; -import com.volmit.iris.scaffold.engine.Engine; -import com.volmit.iris.scaffold.engine.IrisAccess; +import com.volmit.iris.engine.IrisComplex; +import com.volmit.iris.engine.noise.CNG; +import com.volmit.iris.core.IrisDataManager; +import com.volmit.iris.core.gui.RenderType; +import com.volmit.iris.engine.cache.AtomicCache; +import com.volmit.iris.engine.data.DataProvider; +import com.volmit.iris.engine.framework.Engine; +import com.volmit.iris.engine.framework.IrisAccess; import com.volmit.iris.util.*; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/src/main/java/com/volmit/iris/object/IrisBiomeCustom.java b/src/main/java/com/volmit/iris/engine/object/IrisBiomeCustom.java similarity index 99% rename from src/main/java/com/volmit/iris/object/IrisBiomeCustom.java rename to src/main/java/com/volmit/iris/engine/object/IrisBiomeCustom.java index 8f72b2fa3..36186adf4 100644 --- a/src/main/java/com/volmit/iris/object/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.object; +package com.volmit.iris.engine.object; import com.volmit.iris.Iris; import com.volmit.iris.util.*; diff --git a/src/main/java/com/volmit/iris/object/IrisBiomeCustomCategory.java b/src/main/java/com/volmit/iris/engine/object/IrisBiomeCustomCategory.java similarity index 96% rename from src/main/java/com/volmit/iris/object/IrisBiomeCustomCategory.java rename to src/main/java/com/volmit/iris/engine/object/IrisBiomeCustomCategory.java index f578a8ea5..15b80d413 100644 --- a/src/main/java/com/volmit/iris/object/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.object; +package com.volmit.iris.engine.object; import com.volmit.iris.util.Desc; diff --git a/src/main/java/com/volmit/iris/object/IrisBiomeCustomParticle.java b/src/main/java/com/volmit/iris/engine/object/IrisBiomeCustomParticle.java similarity index 94% rename from src/main/java/com/volmit/iris/object/IrisBiomeCustomParticle.java rename to src/main/java/com/volmit/iris/engine/object/IrisBiomeCustomParticle.java index 1e5ad9f48..9d30bc0e2 100644 --- a/src/main/java/com/volmit/iris/object/IrisBiomeCustomParticle.java +++ b/src/main/java/com/volmit/iris/engine/object/IrisBiomeCustomParticle.java @@ -16,9 +16,8 @@ * along with this program. If not, see . */ -package com.volmit.iris.object; +package com.volmit.iris.engine.object; -import com.volmit.iris.Iris; import com.volmit.iris.util.*; import lombok.AllArgsConstructor; import lombok.Data; @@ -26,8 +25,6 @@ import lombok.NoArgsConstructor; import lombok.experimental.Accessors; import org.bukkit.Particle; -import java.awt.*; - @Accessors(chain = true) @NoArgsConstructor @AllArgsConstructor diff --git a/src/main/java/com/volmit/iris/object/IrisBiomeCustomPrecipType.java b/src/main/java/com/volmit/iris/engine/object/IrisBiomeCustomPrecipType.java similarity index 96% rename from src/main/java/com/volmit/iris/object/IrisBiomeCustomPrecipType.java rename to src/main/java/com/volmit/iris/engine/object/IrisBiomeCustomPrecipType.java index 105ddf112..f10717bf1 100644 --- a/src/main/java/com/volmit/iris/object/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.object; +package com.volmit.iris.engine.object; import com.volmit.iris.util.Desc; diff --git a/src/main/java/com/volmit/iris/object/IrisBiomeCustomSpawn.java b/src/main/java/com/volmit/iris/engine/object/IrisBiomeCustomSpawn.java similarity index 97% rename from src/main/java/com/volmit/iris/object/IrisBiomeCustomSpawn.java rename to src/main/java/com/volmit/iris/engine/object/IrisBiomeCustomSpawn.java index 4d68ec4b8..1632dc090 100644 --- a/src/main/java/com/volmit/iris/object/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.object; +package com.volmit.iris.engine.object; import com.volmit.iris.util.Desc; import com.volmit.iris.util.MaxNumber; diff --git a/src/main/java/com/volmit/iris/object/IrisBiomeCustomSpawnType.java b/src/main/java/com/volmit/iris/engine/object/IrisBiomeCustomSpawnType.java similarity index 96% rename from src/main/java/com/volmit/iris/object/IrisBiomeCustomSpawnType.java rename to src/main/java/com/volmit/iris/engine/object/IrisBiomeCustomSpawnType.java index 2d5586644..e1a8a0d6a 100644 --- a/src/main/java/com/volmit/iris/object/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.object; +package com.volmit.iris.engine.object; import com.volmit.iris.util.Desc; diff --git a/src/main/java/com/volmit/iris/object/IrisBiomeGeneratorLink.java b/src/main/java/com/volmit/iris/engine/object/IrisBiomeGeneratorLink.java similarity index 94% rename from src/main/java/com/volmit/iris/object/IrisBiomeGeneratorLink.java rename to src/main/java/com/volmit/iris/engine/object/IrisBiomeGeneratorLink.java index 32626c5be..7fa037a1b 100644 --- a/src/main/java/com/volmit/iris/object/IrisBiomeGeneratorLink.java +++ b/src/main/java/com/volmit/iris/engine/object/IrisBiomeGeneratorLink.java @@ -16,10 +16,10 @@ * along with this program. If not, see . */ -package com.volmit.iris.object; +package com.volmit.iris.engine.object; -import com.volmit.iris.scaffold.cache.AtomicCache; -import com.volmit.iris.scaffold.data.DataProvider; +import com.volmit.iris.engine.cache.AtomicCache; +import com.volmit.iris.engine.data.DataProvider; import com.volmit.iris.util.*; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/src/main/java/com/volmit/iris/object/IrisBiomeMutation.java b/src/main/java/com/volmit/iris/engine/object/IrisBiomeMutation.java similarity index 96% rename from src/main/java/com/volmit/iris/object/IrisBiomeMutation.java rename to src/main/java/com/volmit/iris/engine/object/IrisBiomeMutation.java index b45fb536d..2c480d187 100644 --- a/src/main/java/com/volmit/iris/object/IrisBiomeMutation.java +++ b/src/main/java/com/volmit/iris/engine/object/IrisBiomeMutation.java @@ -16,10 +16,10 @@ * along with this program. If not, see . */ -package com.volmit.iris.object; +package com.volmit.iris.engine.object; -import com.volmit.iris.scaffold.cache.AtomicCache; -import com.volmit.iris.scaffold.data.DataProvider; +import com.volmit.iris.engine.cache.AtomicCache; +import com.volmit.iris.engine.data.DataProvider; import com.volmit.iris.util.*; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/src/main/java/com/volmit/iris/object/IrisBiomePaletteLayer.java b/src/main/java/com/volmit/iris/engine/object/IrisBiomePaletteLayer.java similarity index 95% rename from src/main/java/com/volmit/iris/object/IrisBiomePaletteLayer.java rename to src/main/java/com/volmit/iris/engine/object/IrisBiomePaletteLayer.java index f6278efe5..15be39f5d 100644 --- a/src/main/java/com/volmit/iris/object/IrisBiomePaletteLayer.java +++ b/src/main/java/com/volmit/iris/engine/object/IrisBiomePaletteLayer.java @@ -16,11 +16,11 @@ * along with this program. If not, see . */ -package com.volmit.iris.object; +package com.volmit.iris.engine.object; -import com.volmit.iris.generator.noise.CNG; -import com.volmit.iris.manager.IrisDataManager; -import com.volmit.iris.scaffold.cache.AtomicCache; +import com.volmit.iris.engine.noise.CNG; +import com.volmit.iris.core.IrisDataManager; +import com.volmit.iris.engine.cache.AtomicCache; import com.volmit.iris.util.*; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/src/main/java/com/volmit/iris/object/IrisBlockData.java b/src/main/java/com/volmit/iris/engine/object/IrisBlockData.java similarity index 97% rename from src/main/java/com/volmit/iris/object/IrisBlockData.java rename to src/main/java/com/volmit/iris/engine/object/IrisBlockData.java index 02f0be411..8e4cd3c5f 100644 --- a/src/main/java/com/volmit/iris/object/IrisBlockData.java +++ b/src/main/java/com/volmit/iris/engine/object/IrisBlockData.java @@ -16,11 +16,11 @@ * along with this program. If not, see . */ -package com.volmit.iris.object; +package com.volmit.iris.engine.object; import com.volmit.iris.Iris; -import com.volmit.iris.manager.IrisDataManager; -import com.volmit.iris.scaffold.cache.AtomicCache; +import com.volmit.iris.core.IrisDataManager; +import com.volmit.iris.engine.cache.AtomicCache; import com.volmit.iris.util.*; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/src/main/java/com/volmit/iris/object/IrisBlockDrops.java b/src/main/java/com/volmit/iris/engine/object/IrisBlockDrops.java similarity index 95% rename from src/main/java/com/volmit/iris/object/IrisBlockDrops.java rename to src/main/java/com/volmit/iris/engine/object/IrisBlockDrops.java index fee02ac61..296ef3897 100644 --- a/src/main/java/com/volmit/iris/object/IrisBlockDrops.java +++ b/src/main/java/com/volmit/iris/engine/object/IrisBlockDrops.java @@ -16,10 +16,10 @@ * along with this program. If not, see . */ -package com.volmit.iris.object; +package com.volmit.iris.engine.object; -import com.volmit.iris.manager.IrisDataManager; -import com.volmit.iris.scaffold.cache.AtomicCache; +import com.volmit.iris.core.IrisDataManager; +import com.volmit.iris.engine.cache.AtomicCache; import com.volmit.iris.util.*; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/src/main/java/com/volmit/iris/object/IrisCarveLayer.java b/src/main/java/com/volmit/iris/engine/object/IrisCarveLayer.java similarity index 96% rename from src/main/java/com/volmit/iris/object/IrisCarveLayer.java rename to src/main/java/com/volmit/iris/engine/object/IrisCarveLayer.java index 835418e43..bb072aa03 100644 --- a/src/main/java/com/volmit/iris/object/IrisCarveLayer.java +++ b/src/main/java/com/volmit/iris/engine/object/IrisCarveLayer.java @@ -16,10 +16,10 @@ * along with this program. If not, see . */ -package com.volmit.iris.object; +package com.volmit.iris.engine.object; -import com.volmit.iris.generator.noise.CNG; -import com.volmit.iris.scaffold.cache.AtomicCache; +import com.volmit.iris.engine.noise.CNG; +import com.volmit.iris.engine.cache.AtomicCache; import com.volmit.iris.util.*; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/src/main/java/com/volmit/iris/object/IrisCaveFluid.java b/src/main/java/com/volmit/iris/engine/object/IrisCaveFluid.java similarity index 94% rename from src/main/java/com/volmit/iris/object/IrisCaveFluid.java rename to src/main/java/com/volmit/iris/engine/object/IrisCaveFluid.java index da24d72f8..89f2ef141 100644 --- a/src/main/java/com/volmit/iris/object/IrisCaveFluid.java +++ b/src/main/java/com/volmit/iris/engine/object/IrisCaveFluid.java @@ -16,10 +16,10 @@ * along with this program. If not, see . */ -package com.volmit.iris.object; +package com.volmit.iris.engine.object; -import com.volmit.iris.manager.IrisDataManager; -import com.volmit.iris.scaffold.cache.AtomicCache; +import com.volmit.iris.core.IrisDataManager; +import com.volmit.iris.engine.cache.AtomicCache; import com.volmit.iris.util.*; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/src/main/java/com/volmit/iris/object/IrisCaveLayer.java b/src/main/java/com/volmit/iris/engine/object/IrisCaveLayer.java similarity index 98% rename from src/main/java/com/volmit/iris/object/IrisCaveLayer.java rename to src/main/java/com/volmit/iris/engine/object/IrisCaveLayer.java index dd1be56d8..ea1c19fb3 100644 --- a/src/main/java/com/volmit/iris/object/IrisCaveLayer.java +++ b/src/main/java/com/volmit/iris/engine/object/IrisCaveLayer.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.object; +package com.volmit.iris.engine.object; import com.volmit.iris.util.Desc; import com.volmit.iris.util.MinNumber; diff --git a/src/main/java/com/volmit/iris/object/IrisColor.java b/src/main/java/com/volmit/iris/engine/object/IrisColor.java similarity index 97% rename from src/main/java/com/volmit/iris/object/IrisColor.java rename to src/main/java/com/volmit/iris/engine/object/IrisColor.java index 4b48d72ce..0a3259f32 100644 --- a/src/main/java/com/volmit/iris/object/IrisColor.java +++ b/src/main/java/com/volmit/iris/engine/object/IrisColor.java @@ -16,10 +16,10 @@ * along with this program. If not, see . */ -package com.volmit.iris.object; +package com.volmit.iris.engine.object; import com.volmit.iris.Iris; -import com.volmit.iris.scaffold.cache.AtomicCache; +import com.volmit.iris.engine.cache.AtomicCache; import com.volmit.iris.util.Desc; import com.volmit.iris.util.MaxNumber; import com.volmit.iris.util.MinNumber; diff --git a/src/main/java/com/volmit/iris/object/IrisCompat.java b/src/main/java/com/volmit/iris/engine/object/IrisCompat.java similarity index 99% rename from src/main/java/com/volmit/iris/object/IrisCompat.java rename to src/main/java/com/volmit/iris/engine/object/IrisCompat.java index 2fa9da256..31992beb7 100644 --- a/src/main/java/com/volmit/iris/object/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.object; +package com.volmit.iris.engine.object; import com.google.gson.Gson; import com.google.gson.JsonSyntaxException; diff --git a/src/main/java/com/volmit/iris/object/IrisCompatabilityBlockFilter.java b/src/main/java/com/volmit/iris/engine/object/IrisCompatabilityBlockFilter.java similarity index 96% rename from src/main/java/com/volmit/iris/object/IrisCompatabilityBlockFilter.java rename to src/main/java/com/volmit/iris/engine/object/IrisCompatabilityBlockFilter.java index 2da2d9c38..12274840b 100644 --- a/src/main/java/com/volmit/iris/object/IrisCompatabilityBlockFilter.java +++ b/src/main/java/com/volmit/iris/engine/object/IrisCompatabilityBlockFilter.java @@ -16,10 +16,10 @@ * along with this program. If not, see . */ -package com.volmit.iris.object; +package com.volmit.iris.engine.object; import com.volmit.iris.Iris; -import com.volmit.iris.scaffold.cache.AtomicCache; +import com.volmit.iris.engine.cache.AtomicCache; import com.volmit.iris.util.B; import com.volmit.iris.util.Desc; import com.volmit.iris.util.Required; diff --git a/src/main/java/com/volmit/iris/object/IrisCompatabilityItemFilter.java b/src/main/java/com/volmit/iris/engine/object/IrisCompatabilityItemFilter.java similarity index 96% rename from src/main/java/com/volmit/iris/object/IrisCompatabilityItemFilter.java rename to src/main/java/com/volmit/iris/engine/object/IrisCompatabilityItemFilter.java index 93011b4cd..5c47f274e 100644 --- a/src/main/java/com/volmit/iris/object/IrisCompatabilityItemFilter.java +++ b/src/main/java/com/volmit/iris/engine/object/IrisCompatabilityItemFilter.java @@ -16,10 +16,10 @@ * along with this program. If not, see . */ -package com.volmit.iris.object; +package com.volmit.iris.engine.object; import com.volmit.iris.Iris; -import com.volmit.iris.scaffold.cache.AtomicCache; +import com.volmit.iris.engine.cache.AtomicCache; import com.volmit.iris.util.B; import com.volmit.iris.util.Desc; import com.volmit.iris.util.Required; diff --git a/src/main/java/com/volmit/iris/object/IrisDecorator.java b/src/main/java/com/volmit/iris/engine/object/IrisDecorator.java similarity index 97% rename from src/main/java/com/volmit/iris/object/IrisDecorator.java rename to src/main/java/com/volmit/iris/engine/object/IrisDecorator.java index 27bc2054b..2d8760271 100644 --- a/src/main/java/com/volmit/iris/object/IrisDecorator.java +++ b/src/main/java/com/volmit/iris/engine/object/IrisDecorator.java @@ -16,12 +16,12 @@ * along with this program. If not, see . */ -package com.volmit.iris.object; +package com.volmit.iris.engine.object; import com.volmit.iris.Iris; -import com.volmit.iris.generator.noise.CNG; -import com.volmit.iris.manager.IrisDataManager; -import com.volmit.iris.scaffold.cache.AtomicCache; +import com.volmit.iris.engine.noise.CNG; +import com.volmit.iris.core.IrisDataManager; +import com.volmit.iris.engine.cache.AtomicCache; import com.volmit.iris.util.*; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/src/main/java/com/volmit/iris/object/IrisDepositGenerator.java b/src/main/java/com/volmit/iris/engine/object/IrisDepositGenerator.java similarity index 97% rename from src/main/java/com/volmit/iris/object/IrisDepositGenerator.java rename to src/main/java/com/volmit/iris/engine/object/IrisDepositGenerator.java index 8ade96569..0b4692c91 100644 --- a/src/main/java/com/volmit/iris/object/IrisDepositGenerator.java +++ b/src/main/java/com/volmit/iris/engine/object/IrisDepositGenerator.java @@ -16,10 +16,10 @@ * along with this program. If not, see . */ -package com.volmit.iris.object; +package com.volmit.iris.engine.object; -import com.volmit.iris.manager.IrisDataManager; -import com.volmit.iris.scaffold.cache.AtomicCache; +import com.volmit.iris.core.IrisDataManager; +import com.volmit.iris.engine.cache.AtomicCache; import com.volmit.iris.util.*; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/src/main/java/com/volmit/iris/object/IrisDimension.java b/src/main/java/com/volmit/iris/engine/object/IrisDimension.java similarity index 98% rename from src/main/java/com/volmit/iris/object/IrisDimension.java rename to src/main/java/com/volmit/iris/engine/object/IrisDimension.java index 5b03b5f43..cefff2d21 100644 --- a/src/main/java/com/volmit/iris/object/IrisDimension.java +++ b/src/main/java/com/volmit/iris/engine/object/IrisDimension.java @@ -16,13 +16,13 @@ * along with this program. If not, see . */ -package com.volmit.iris.object; +package com.volmit.iris.engine.object; import com.volmit.iris.Iris; -import com.volmit.iris.generator.noise.CNG; -import com.volmit.iris.manager.IrisDataManager; -import com.volmit.iris.scaffold.cache.AtomicCache; -import com.volmit.iris.scaffold.data.DataProvider; +import com.volmit.iris.engine.noise.CNG; +import com.volmit.iris.core.IrisDataManager; +import com.volmit.iris.engine.cache.AtomicCache; +import com.volmit.iris.engine.data.DataProvider; import com.volmit.iris.util.*; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/src/main/java/com/volmit/iris/object/IrisDimensionIndex.java b/src/main/java/com/volmit/iris/engine/object/IrisDimensionIndex.java similarity index 98% rename from src/main/java/com/volmit/iris/object/IrisDimensionIndex.java rename to src/main/java/com/volmit/iris/engine/object/IrisDimensionIndex.java index ea1bc6ce6..dc4e70a2d 100644 --- a/src/main/java/com/volmit/iris/object/IrisDimensionIndex.java +++ b/src/main/java/com/volmit/iris/engine/object/IrisDimensionIndex.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.object; +package com.volmit.iris.engine.object; import com.volmit.iris.util.Desc; import com.volmit.iris.util.MinNumber; diff --git a/src/main/java/com/volmit/iris/object/IrisDirection.java b/src/main/java/com/volmit/iris/engine/object/IrisDirection.java similarity index 99% rename from src/main/java/com/volmit/iris/object/IrisDirection.java rename to src/main/java/com/volmit/iris/engine/object/IrisDirection.java index eb96dd101..4269d315f 100644 --- a/src/main/java/com/volmit/iris/object/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.object; +package com.volmit.iris.engine.object; import com.volmit.iris.util.Cuboid.CuboidDirection; import com.volmit.iris.util.*; diff --git a/src/main/java/com/volmit/iris/object/IrisEffect.java b/src/main/java/com/volmit/iris/engine/object/IrisEffect.java similarity index 98% rename from src/main/java/com/volmit/iris/object/IrisEffect.java rename to src/main/java/com/volmit/iris/engine/object/IrisEffect.java index 6394e9f5b..a4e4ff35a 100644 --- a/src/main/java/com/volmit/iris/object/IrisEffect.java +++ b/src/main/java/com/volmit/iris/engine/object/IrisEffect.java @@ -16,11 +16,11 @@ * along with this program. If not, see . */ -package com.volmit.iris.object; +package com.volmit.iris.engine.object; import com.volmit.iris.Iris; -import com.volmit.iris.scaffold.cache.AtomicCache; -import com.volmit.iris.scaffold.engine.GeneratorAccess; +import com.volmit.iris.engine.cache.AtomicCache; +import com.volmit.iris.engine.framework.GeneratorAccess; import com.volmit.iris.util.*; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/src/main/java/com/volmit/iris/object/IrisEnchantment.java b/src/main/java/com/volmit/iris/engine/object/IrisEnchantment.java similarity index 98% rename from src/main/java/com/volmit/iris/object/IrisEnchantment.java rename to src/main/java/com/volmit/iris/engine/object/IrisEnchantment.java index 672ebf61b..e87c70efb 100644 --- a/src/main/java/com/volmit/iris/object/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.object; +package com.volmit.iris.engine.object; import com.volmit.iris.Iris; import com.volmit.iris.util.*; diff --git a/src/main/java/com/volmit/iris/object/IrisEntity.java b/src/main/java/com/volmit/iris/engine/object/IrisEntity.java similarity index 99% rename from src/main/java/com/volmit/iris/object/IrisEntity.java rename to src/main/java/com/volmit/iris/engine/object/IrisEntity.java index 1e3840149..2d3a4630f 100644 --- a/src/main/java/com/volmit/iris/object/IrisEntity.java +++ b/src/main/java/com/volmit/iris/engine/object/IrisEntity.java @@ -16,10 +16,10 @@ * along with this program. If not, see . */ -package com.volmit.iris.object; +package com.volmit.iris.engine.object; import com.volmit.iris.Iris; -import com.volmit.iris.scaffold.engine.Engine; +import com.volmit.iris.engine.framework.Engine; import com.volmit.iris.util.*; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/src/main/java/com/volmit/iris/object/IrisEntityInitialSpawn.java b/src/main/java/com/volmit/iris/engine/object/IrisEntityInitialSpawn.java similarity index 95% rename from src/main/java/com/volmit/iris/object/IrisEntityInitialSpawn.java rename to src/main/java/com/volmit/iris/engine/object/IrisEntityInitialSpawn.java index a8269c635..ee98770da 100644 --- a/src/main/java/com/volmit/iris/object/IrisEntityInitialSpawn.java +++ b/src/main/java/com/volmit/iris/engine/object/IrisEntityInitialSpawn.java @@ -16,10 +16,10 @@ * along with this program. If not, see . */ -package com.volmit.iris.object; +package com.volmit.iris.engine.object; -import com.volmit.iris.scaffold.cache.AtomicCache; -import com.volmit.iris.scaffold.engine.Engine; +import com.volmit.iris.engine.cache.AtomicCache; +import com.volmit.iris.engine.framework.Engine; import com.volmit.iris.util.*; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/src/main/java/com/volmit/iris/object/IrisEntitySpawnOverride.java b/src/main/java/com/volmit/iris/engine/object/IrisEntitySpawnOverride.java similarity index 95% rename from src/main/java/com/volmit/iris/object/IrisEntitySpawnOverride.java rename to src/main/java/com/volmit/iris/engine/object/IrisEntitySpawnOverride.java index f9dca3a19..e53626900 100644 --- a/src/main/java/com/volmit/iris/object/IrisEntitySpawnOverride.java +++ b/src/main/java/com/volmit/iris/engine/object/IrisEntitySpawnOverride.java @@ -16,10 +16,10 @@ * along with this program. If not, see . */ -package com.volmit.iris.object; +package com.volmit.iris.engine.object; -import com.volmit.iris.scaffold.cache.AtomicCache; -import com.volmit.iris.scaffold.engine.Engine; +import com.volmit.iris.engine.cache.AtomicCache; +import com.volmit.iris.engine.framework.Engine; import com.volmit.iris.util.*; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/src/main/java/com/volmit/iris/object/IrisFeature.java b/src/main/java/com/volmit/iris/engine/object/IrisFeature.java similarity index 97% rename from src/main/java/com/volmit/iris/object/IrisFeature.java rename to src/main/java/com/volmit/iris/engine/object/IrisFeature.java index a3c78cfb3..3bd8f6977 100644 --- a/src/main/java/com/volmit/iris/object/IrisFeature.java +++ b/src/main/java/com/volmit/iris/engine/object/IrisFeature.java @@ -16,10 +16,10 @@ * along with this program. If not, see . */ -package com.volmit.iris.object; +package com.volmit.iris.engine.object; import com.google.gson.Gson; -import com.volmit.iris.scaffold.cache.AtomicCache; +import com.volmit.iris.engine.cache.AtomicCache; import com.volmit.iris.util.*; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/src/main/java/com/volmit/iris/object/IrisFeaturePositional.java b/src/main/java/com/volmit/iris/engine/object/IrisFeaturePositional.java similarity index 98% rename from src/main/java/com/volmit/iris/object/IrisFeaturePositional.java rename to src/main/java/com/volmit/iris/engine/object/IrisFeaturePositional.java index b27163a65..78ed396c4 100644 --- a/src/main/java/com/volmit/iris/object/IrisFeaturePositional.java +++ b/src/main/java/com/volmit/iris/engine/object/IrisFeaturePositional.java @@ -16,10 +16,10 @@ * along with this program. If not, see . */ -package com.volmit.iris.object; +package com.volmit.iris.engine.object; import com.google.gson.Gson; -import com.volmit.iris.scaffold.cache.AtomicCache; +import com.volmit.iris.engine.cache.AtomicCache; import com.volmit.iris.util.*; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/src/main/java/com/volmit/iris/object/IrisFeaturePotential.java b/src/main/java/com/volmit/iris/engine/object/IrisFeaturePotential.java similarity index 97% rename from src/main/java/com/volmit/iris/object/IrisFeaturePotential.java rename to src/main/java/com/volmit/iris/engine/object/IrisFeaturePotential.java index e43dbe3d0..552900560 100644 --- a/src/main/java/com/volmit/iris/object/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.object; +package com.volmit.iris.engine.object; import com.volmit.iris.util.Desc; import com.volmit.iris.util.MinNumber; diff --git a/src/main/java/com/volmit/iris/object/IrisGenerator.java b/src/main/java/com/volmit/iris/engine/object/IrisGenerator.java similarity index 98% rename from src/main/java/com/volmit/iris/object/IrisGenerator.java rename to src/main/java/com/volmit/iris/engine/object/IrisGenerator.java index d9eee3459..925958ace 100644 --- a/src/main/java/com/volmit/iris/object/IrisGenerator.java +++ b/src/main/java/com/volmit/iris/engine/object/IrisGenerator.java @@ -16,11 +16,11 @@ * along with this program. If not, see . */ -package com.volmit.iris.object; +package com.volmit.iris.engine.object; import com.volmit.iris.Iris; -import com.volmit.iris.generator.noise.CellGenerator; -import com.volmit.iris.scaffold.cache.AtomicCache; +import com.volmit.iris.engine.noise.CellGenerator; +import com.volmit.iris.engine.cache.AtomicCache; import com.volmit.iris.util.*; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/src/main/java/com/volmit/iris/object/IrisGeneratorStyle.java b/src/main/java/com/volmit/iris/engine/object/IrisGeneratorStyle.java similarity index 95% rename from src/main/java/com/volmit/iris/object/IrisGeneratorStyle.java rename to src/main/java/com/volmit/iris/engine/object/IrisGeneratorStyle.java index 02c1dc9c4..c735a1656 100644 --- a/src/main/java/com/volmit/iris/object/IrisGeneratorStyle.java +++ b/src/main/java/com/volmit/iris/engine/object/IrisGeneratorStyle.java @@ -16,10 +16,10 @@ * along with this program. If not, see . */ -package com.volmit.iris.object; +package com.volmit.iris.engine.object; -import com.volmit.iris.generator.noise.CNG; -import com.volmit.iris.scaffold.cache.AtomicCache; +import com.volmit.iris.engine.noise.CNG; +import com.volmit.iris.engine.cache.AtomicCache; import com.volmit.iris.util.*; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/src/main/java/com/volmit/iris/object/IrisInterpolator.java b/src/main/java/com/volmit/iris/engine/object/IrisInterpolator.java similarity index 97% rename from src/main/java/com/volmit/iris/object/IrisInterpolator.java rename to src/main/java/com/volmit/iris/engine/object/IrisInterpolator.java index 2d01f63b1..22bc50cb4 100644 --- a/src/main/java/com/volmit/iris/object/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.object; +package com.volmit.iris.engine.object; import com.volmit.iris.util.*; import lombok.AllArgsConstructor; diff --git a/src/main/java/com/volmit/iris/object/IrisJigsawPiece.java b/src/main/java/com/volmit/iris/engine/object/IrisJigsawPiece.java similarity index 97% rename from src/main/java/com/volmit/iris/object/IrisJigsawPiece.java rename to src/main/java/com/volmit/iris/engine/object/IrisJigsawPiece.java index ee50f1f75..ae211b4d2 100644 --- a/src/main/java/com/volmit/iris/object/IrisJigsawPiece.java +++ b/src/main/java/com/volmit/iris/engine/object/IrisJigsawPiece.java @@ -16,10 +16,10 @@ * along with this program. If not, see . */ -package com.volmit.iris.object; +package com.volmit.iris.engine.object; import com.volmit.iris.Iris; -import com.volmit.iris.scaffold.cache.AtomicCache; +import com.volmit.iris.engine.cache.AtomicCache; import com.volmit.iris.util.*; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/src/main/java/com/volmit/iris/object/IrisJigsawPieceConnector.java b/src/main/java/com/volmit/iris/engine/object/IrisJigsawPieceConnector.java similarity index 99% rename from src/main/java/com/volmit/iris/object/IrisJigsawPieceConnector.java rename to src/main/java/com/volmit/iris/engine/object/IrisJigsawPieceConnector.java index a43348edd..35f3a6de7 100644 --- a/src/main/java/com/volmit/iris/object/IrisJigsawPieceConnector.java +++ b/src/main/java/com/volmit/iris/engine/object/IrisJigsawPieceConnector.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.object; +package com.volmit.iris.engine.object; import com.volmit.iris.util.*; import lombok.AllArgsConstructor; diff --git a/src/main/java/com/volmit/iris/object/IrisJigsawPlacement.java b/src/main/java/com/volmit/iris/engine/object/IrisJigsawPlacement.java similarity index 97% rename from src/main/java/com/volmit/iris/object/IrisJigsawPlacement.java rename to src/main/java/com/volmit/iris/engine/object/IrisJigsawPlacement.java index 69de0c108..305bab2db 100644 --- a/src/main/java/com/volmit/iris/object/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.object; +package com.volmit.iris.engine.object; import com.volmit.iris.util.Desc; import com.volmit.iris.util.MinNumber; diff --git a/src/main/java/com/volmit/iris/object/IrisJigsawPool.java b/src/main/java/com/volmit/iris/engine/object/IrisJigsawPool.java similarity index 97% rename from src/main/java/com/volmit/iris/object/IrisJigsawPool.java rename to src/main/java/com/volmit/iris/engine/object/IrisJigsawPool.java index 39eee924b..7ba8c1f1d 100644 --- a/src/main/java/com/volmit/iris/object/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.object; +package com.volmit.iris.engine.object; import com.volmit.iris.util.*; import lombok.AllArgsConstructor; diff --git a/src/main/java/com/volmit/iris/object/IrisJigsawStructure.java b/src/main/java/com/volmit/iris/engine/object/IrisJigsawStructure.java similarity index 98% rename from src/main/java/com/volmit/iris/object/IrisJigsawStructure.java rename to src/main/java/com/volmit/iris/engine/object/IrisJigsawStructure.java index 4f70f3d20..18f71eec3 100644 --- a/src/main/java/com/volmit/iris/object/IrisJigsawStructure.java +++ b/src/main/java/com/volmit/iris/engine/object/IrisJigsawStructure.java @@ -16,10 +16,10 @@ * along with this program. If not, see . */ -package com.volmit.iris.object; +package com.volmit.iris.engine.object; import com.volmit.iris.Iris; -import com.volmit.iris.scaffold.cache.AtomicCache; +import com.volmit.iris.engine.cache.AtomicCache; import com.volmit.iris.util.*; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/src/main/java/com/volmit/iris/object/IrisJigsawStructurePlacement.java b/src/main/java/com/volmit/iris/engine/object/IrisJigsawStructurePlacement.java similarity index 97% rename from src/main/java/com/volmit/iris/object/IrisJigsawStructurePlacement.java rename to src/main/java/com/volmit/iris/engine/object/IrisJigsawStructurePlacement.java index 819457c95..8709a30c0 100644 --- a/src/main/java/com/volmit/iris/object/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.object; +package com.volmit.iris.engine.object; import com.volmit.iris.util.Desc; import com.volmit.iris.util.RegistryListJigsaw; diff --git a/src/main/java/com/volmit/iris/object/IrisLoot.java b/src/main/java/com/volmit/iris/engine/object/IrisLoot.java similarity index 98% rename from src/main/java/com/volmit/iris/object/IrisLoot.java rename to src/main/java/com/volmit/iris/engine/object/IrisLoot.java index 73b2bd091..4ad9c121c 100644 --- a/src/main/java/com/volmit/iris/object/IrisLoot.java +++ b/src/main/java/com/volmit/iris/engine/object/IrisLoot.java @@ -16,11 +16,11 @@ * along with this program. If not, see . */ -package com.volmit.iris.object; +package com.volmit.iris.engine.object; import com.volmit.iris.Iris; -import com.volmit.iris.generator.noise.CNG; -import com.volmit.iris.scaffold.cache.AtomicCache; +import com.volmit.iris.engine.noise.CNG; +import com.volmit.iris.engine.cache.AtomicCache; import com.volmit.iris.util.*; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/src/main/java/com/volmit/iris/object/IrisLootReference.java b/src/main/java/com/volmit/iris/engine/object/IrisLootReference.java similarity index 93% rename from src/main/java/com/volmit/iris/object/IrisLootReference.java rename to src/main/java/com/volmit/iris/engine/object/IrisLootReference.java index cf5b156fc..f2414b2e3 100644 --- a/src/main/java/com/volmit/iris/object/IrisLootReference.java +++ b/src/main/java/com/volmit/iris/engine/object/IrisLootReference.java @@ -16,10 +16,10 @@ * along with this program. If not, see . */ -package com.volmit.iris.object; +package com.volmit.iris.engine.object; -import com.volmit.iris.scaffold.cache.AtomicCache; -import com.volmit.iris.scaffold.data.DataProvider; +import com.volmit.iris.engine.cache.AtomicCache; +import com.volmit.iris.engine.data.DataProvider; import com.volmit.iris.util.*; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/src/main/java/com/volmit/iris/object/IrisLootTable.java b/src/main/java/com/volmit/iris/engine/object/IrisLootTable.java similarity index 98% rename from src/main/java/com/volmit/iris/object/IrisLootTable.java rename to src/main/java/com/volmit/iris/engine/object/IrisLootTable.java index ced2acb21..0bfdaefb5 100644 --- a/src/main/java/com/volmit/iris/object/IrisLootTable.java +++ b/src/main/java/com/volmit/iris/engine/object/IrisLootTable.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.object; +package com.volmit.iris.engine.object; import com.volmit.iris.util.*; import lombok.AllArgsConstructor; diff --git a/src/main/java/com/volmit/iris/object/IrisMaterialPalette.java b/src/main/java/com/volmit/iris/engine/object/IrisMaterialPalette.java similarity index 95% rename from src/main/java/com/volmit/iris/object/IrisMaterialPalette.java rename to src/main/java/com/volmit/iris/engine/object/IrisMaterialPalette.java index e984a4e2a..04224b1a0 100644 --- a/src/main/java/com/volmit/iris/object/IrisMaterialPalette.java +++ b/src/main/java/com/volmit/iris/engine/object/IrisMaterialPalette.java @@ -16,11 +16,11 @@ * along with this program. If not, see . */ -package com.volmit.iris.object; +package com.volmit.iris.engine.object; -import com.volmit.iris.generator.noise.CNG; -import com.volmit.iris.manager.IrisDataManager; -import com.volmit.iris.scaffold.cache.AtomicCache; +import com.volmit.iris.engine.noise.CNG; +import com.volmit.iris.core.IrisDataManager; +import com.volmit.iris.engine.cache.AtomicCache; import com.volmit.iris.util.*; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/src/main/java/com/volmit/iris/object/IrisNoiseGenerator.java b/src/main/java/com/volmit/iris/engine/object/IrisNoiseGenerator.java similarity index 97% rename from src/main/java/com/volmit/iris/object/IrisNoiseGenerator.java rename to src/main/java/com/volmit/iris/engine/object/IrisNoiseGenerator.java index 79a09c79b..59ac3656b 100644 --- a/src/main/java/com/volmit/iris/object/IrisNoiseGenerator.java +++ b/src/main/java/com/volmit/iris/engine/object/IrisNoiseGenerator.java @@ -16,10 +16,10 @@ * along with this program. If not, see . */ -package com.volmit.iris.object; +package com.volmit.iris.engine.object; -import com.volmit.iris.generator.noise.CNG; -import com.volmit.iris.scaffold.cache.AtomicCache; +import com.volmit.iris.engine.noise.CNG; +import com.volmit.iris.engine.cache.AtomicCache; import com.volmit.iris.util.*; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/src/main/java/com/volmit/iris/object/IrisObject.java b/src/main/java/com/volmit/iris/engine/object/IrisObject.java similarity index 99% rename from src/main/java/com/volmit/iris/object/IrisObject.java rename to src/main/java/com/volmit/iris/engine/object/IrisObject.java index 0bafad982..ded1dd271 100644 --- a/src/main/java/com/volmit/iris/object/IrisObject.java +++ b/src/main/java/com/volmit/iris/engine/object/IrisObject.java @@ -16,12 +16,12 @@ * along with this program. If not, see . */ -package com.volmit.iris.object; +package com.volmit.iris.engine.object; import com.volmit.iris.Iris; -import com.volmit.iris.manager.IrisDataManager; -import com.volmit.iris.object.tile.TileData; -import com.volmit.iris.scaffold.cache.AtomicCache; +import com.volmit.iris.core.IrisDataManager; +import com.volmit.iris.engine.object.tile.TileData; +import com.volmit.iris.engine.cache.AtomicCache; import com.volmit.iris.util.*; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/src/main/java/com/volmit/iris/object/IrisObjectLimit.java b/src/main/java/com/volmit/iris/engine/object/IrisObjectLimit.java similarity index 97% rename from src/main/java/com/volmit/iris/object/IrisObjectLimit.java rename to src/main/java/com/volmit/iris/engine/object/IrisObjectLimit.java index e32d59ee3..3d8059b0f 100644 --- a/src/main/java/com/volmit/iris/object/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.object; +package com.volmit.iris.engine.object; import com.volmit.iris.util.Desc; import com.volmit.iris.util.MaxNumber; diff --git a/src/main/java/com/volmit/iris/object/IrisObjectLoot.java b/src/main/java/com/volmit/iris/engine/object/IrisObjectLoot.java similarity index 94% rename from src/main/java/com/volmit/iris/object/IrisObjectLoot.java rename to src/main/java/com/volmit/iris/engine/object/IrisObjectLoot.java index 183d05c88..793263763 100644 --- a/src/main/java/com/volmit/iris/object/IrisObjectLoot.java +++ b/src/main/java/com/volmit/iris/engine/object/IrisObjectLoot.java @@ -16,10 +16,10 @@ * along with this program. If not, see . */ -package com.volmit.iris.object; +package com.volmit.iris.engine.object; -import com.volmit.iris.manager.IrisDataManager; -import com.volmit.iris.scaffold.cache.AtomicCache; +import com.volmit.iris.core.IrisDataManager; +import com.volmit.iris.engine.cache.AtomicCache; import com.volmit.iris.util.*; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/src/main/java/com/volmit/iris/object/IrisObjectPlacement.java b/src/main/java/com/volmit/iris/engine/object/IrisObjectPlacement.java similarity index 97% rename from src/main/java/com/volmit/iris/object/IrisObjectPlacement.java rename to src/main/java/com/volmit/iris/engine/object/IrisObjectPlacement.java index a379d541c..fa8d6a73b 100644 --- a/src/main/java/com/volmit/iris/object/IrisObjectPlacement.java +++ b/src/main/java/com/volmit/iris/engine/object/IrisObjectPlacement.java @@ -16,13 +16,13 @@ * along with this program. If not, see . */ -package com.volmit.iris.object; +package com.volmit.iris.engine.object; import com.volmit.iris.Iris; -import com.volmit.iris.generator.noise.CNG; -import com.volmit.iris.manager.IrisDataManager; -import com.volmit.iris.scaffold.cache.AtomicCache; -import com.volmit.iris.scaffold.data.DataProvider; +import com.volmit.iris.engine.noise.CNG; +import com.volmit.iris.core.IrisDataManager; +import com.volmit.iris.engine.cache.AtomicCache; +import com.volmit.iris.engine.data.DataProvider; import com.volmit.iris.util.*; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/src/main/java/com/volmit/iris/object/IrisObjectPlacementScaleInterpolator.java b/src/main/java/com/volmit/iris/engine/object/IrisObjectPlacementScaleInterpolator.java similarity index 97% rename from src/main/java/com/volmit/iris/object/IrisObjectPlacementScaleInterpolator.java rename to src/main/java/com/volmit/iris/engine/object/IrisObjectPlacementScaleInterpolator.java index 8c7f33547..08cc7384f 100644 --- a/src/main/java/com/volmit/iris/object/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.object; +package com.volmit.iris.engine.object; import com.volmit.iris.util.Desc; diff --git a/src/main/java/com/volmit/iris/object/IrisObjectReplace.java b/src/main/java/com/volmit/iris/engine/object/IrisObjectReplace.java similarity index 93% rename from src/main/java/com/volmit/iris/object/IrisObjectReplace.java rename to src/main/java/com/volmit/iris/engine/object/IrisObjectReplace.java index f718a2a3e..d50d7e78a 100644 --- a/src/main/java/com/volmit/iris/object/IrisObjectReplace.java +++ b/src/main/java/com/volmit/iris/engine/object/IrisObjectReplace.java @@ -16,11 +16,11 @@ * along with this program. If not, see . */ -package com.volmit.iris.object; +package com.volmit.iris.engine.object; -import com.volmit.iris.generator.noise.CNG; -import com.volmit.iris.manager.IrisDataManager; -import com.volmit.iris.scaffold.cache.AtomicCache; +import com.volmit.iris.engine.noise.CNG; +import com.volmit.iris.core.IrisDataManager; +import com.volmit.iris.engine.cache.AtomicCache; import com.volmit.iris.util.*; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/src/main/java/com/volmit/iris/object/IrisObjectRotation.java b/src/main/java/com/volmit/iris/engine/object/IrisObjectRotation.java similarity index 99% rename from src/main/java/com/volmit/iris/object/IrisObjectRotation.java rename to src/main/java/com/volmit/iris/engine/object/IrisObjectRotation.java index c95534000..808dd4ca4 100644 --- a/src/main/java/com/volmit/iris/object/IrisObjectRotation.java +++ b/src/main/java/com/volmit/iris/engine/object/IrisObjectRotation.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.object; +package com.volmit.iris.engine.object; import com.volmit.iris.Iris; import com.volmit.iris.util.Desc; diff --git a/src/main/java/com/volmit/iris/object/IrisObjectScale.java b/src/main/java/com/volmit/iris/engine/object/IrisObjectScale.java similarity index 98% rename from src/main/java/com/volmit/iris/object/IrisObjectScale.java rename to src/main/java/com/volmit/iris/engine/object/IrisObjectScale.java index a1fdff6e6..f504053d1 100644 --- a/src/main/java/com/volmit/iris/object/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.object; +package com.volmit.iris.engine.object; import com.googlecode.concurrentlinkedhashmap.ConcurrentLinkedHashMap; import com.volmit.iris.util.*; diff --git a/src/main/java/com/volmit/iris/object/IrisObjectTranslate.java b/src/main/java/com/volmit/iris/engine/object/IrisObjectTranslate.java similarity index 98% rename from src/main/java/com/volmit/iris/object/IrisObjectTranslate.java rename to src/main/java/com/volmit/iris/engine/object/IrisObjectTranslate.java index f4e2fff80..12eb9c85d 100644 --- a/src/main/java/com/volmit/iris/object/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.object; +package com.volmit.iris.engine.object; import com.volmit.iris.util.Desc; import com.volmit.iris.util.MaxNumber; diff --git a/src/main/java/com/volmit/iris/object/IrisPosition.java b/src/main/java/com/volmit/iris/engine/object/IrisPosition.java similarity index 98% rename from src/main/java/com/volmit/iris/object/IrisPosition.java rename to src/main/java/com/volmit/iris/engine/object/IrisPosition.java index 01f69a136..cb48a4176 100644 --- a/src/main/java/com/volmit/iris/object/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.object; +package com.volmit.iris.engine.object; import com.volmit.iris.util.Desc; import lombok.AllArgsConstructor; diff --git a/src/main/java/com/volmit/iris/object/IrisPosition2D.java b/src/main/java/com/volmit/iris/engine/object/IrisPosition2D.java similarity index 96% rename from src/main/java/com/volmit/iris/object/IrisPosition2D.java rename to src/main/java/com/volmit/iris/engine/object/IrisPosition2D.java index 02fc05ef4..cb217ea30 100644 --- a/src/main/java/com/volmit/iris/object/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.object; +package com.volmit.iris.engine.object; import com.volmit.iris.util.Desc; import lombok.AllArgsConstructor; diff --git a/src/main/java/com/volmit/iris/object/IrisPotionEffect.java b/src/main/java/com/volmit/iris/engine/object/IrisPotionEffect.java similarity index 97% rename from src/main/java/com/volmit/iris/object/IrisPotionEffect.java rename to src/main/java/com/volmit/iris/engine/object/IrisPotionEffect.java index 45a4ce39b..9ca90b5cf 100644 --- a/src/main/java/com/volmit/iris/object/IrisPotionEffect.java +++ b/src/main/java/com/volmit/iris/engine/object/IrisPotionEffect.java @@ -16,10 +16,10 @@ * along with this program. If not, see . */ -package com.volmit.iris.object; +package com.volmit.iris.engine.object; import com.volmit.iris.Iris; -import com.volmit.iris.scaffold.cache.AtomicCache; +import com.volmit.iris.engine.cache.AtomicCache; import com.volmit.iris.util.Desc; import com.volmit.iris.util.MaxNumber; import com.volmit.iris.util.MinNumber; diff --git a/src/main/java/com/volmit/iris/object/IrisRange.java b/src/main/java/com/volmit/iris/engine/object/IrisRange.java similarity index 97% rename from src/main/java/com/volmit/iris/object/IrisRange.java rename to src/main/java/com/volmit/iris/engine/object/IrisRange.java index 2deb107e8..a26bd3317 100644 --- a/src/main/java/com/volmit/iris/object/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.object; +package com.volmit.iris.engine.object; import com.volmit.iris.util.Desc; import com.volmit.iris.util.RNG; diff --git a/src/main/java/com/volmit/iris/object/IrisRareObject.java b/src/main/java/com/volmit/iris/engine/object/IrisRareObject.java similarity index 97% rename from src/main/java/com/volmit/iris/object/IrisRareObject.java rename to src/main/java/com/volmit/iris/engine/object/IrisRareObject.java index 27ad7dad5..6064a99dc 100644 --- a/src/main/java/com/volmit/iris/object/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.object; +package com.volmit.iris.engine.object; import com.volmit.iris.util.Desc; import com.volmit.iris.util.MinNumber; diff --git a/src/main/java/com/volmit/iris/object/IrisRegion.java b/src/main/java/com/volmit/iris/engine/object/IrisRegion.java similarity index 98% rename from src/main/java/com/volmit/iris/object/IrisRegion.java rename to src/main/java/com/volmit/iris/engine/object/IrisRegion.java index 17e4ce392..5531b8a33 100644 --- a/src/main/java/com/volmit/iris/object/IrisRegion.java +++ b/src/main/java/com/volmit/iris/engine/object/IrisRegion.java @@ -16,14 +16,14 @@ * along with this program. If not, see . */ -package com.volmit.iris.object; +package com.volmit.iris.engine.object; import com.volmit.iris.Iris; -import com.volmit.iris.generator.noise.CNG; -import com.volmit.iris.manager.IrisDataManager; -import com.volmit.iris.map.RenderType; -import com.volmit.iris.scaffold.cache.AtomicCache; -import com.volmit.iris.scaffold.data.DataProvider; +import com.volmit.iris.engine.noise.CNG; +import com.volmit.iris.core.IrisDataManager; +import com.volmit.iris.core.gui.RenderType; +import com.volmit.iris.engine.cache.AtomicCache; +import com.volmit.iris.engine.data.DataProvider; import com.volmit.iris.util.*; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/src/main/java/com/volmit/iris/object/IrisRegionRidge.java b/src/main/java/com/volmit/iris/engine/object/IrisRegionRidge.java similarity index 96% rename from src/main/java/com/volmit/iris/object/IrisRegionRidge.java rename to src/main/java/com/volmit/iris/engine/object/IrisRegionRidge.java index 58791df44..d3c190f29 100644 --- a/src/main/java/com/volmit/iris/object/IrisRegionRidge.java +++ b/src/main/java/com/volmit/iris/engine/object/IrisRegionRidge.java @@ -16,10 +16,10 @@ * along with this program. If not, see . */ -package com.volmit.iris.object; +package com.volmit.iris.engine.object; -import com.volmit.iris.generator.noise.CellGenerator; -import com.volmit.iris.scaffold.cache.AtomicCache; +import com.volmit.iris.engine.noise.CellGenerator; +import com.volmit.iris.engine.cache.AtomicCache; import com.volmit.iris.util.*; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/src/main/java/com/volmit/iris/object/IrisRegionSpot.java b/src/main/java/com/volmit/iris/engine/object/IrisRegionSpot.java similarity index 95% rename from src/main/java/com/volmit/iris/object/IrisRegionSpot.java rename to src/main/java/com/volmit/iris/engine/object/IrisRegionSpot.java index ceef60133..42eb82a80 100644 --- a/src/main/java/com/volmit/iris/object/IrisRegionSpot.java +++ b/src/main/java/com/volmit/iris/engine/object/IrisRegionSpot.java @@ -16,10 +16,10 @@ * along with this program. If not, see . */ -package com.volmit.iris.object; +package com.volmit.iris.engine.object; -import com.volmit.iris.generator.noise.CellGenerator; -import com.volmit.iris.scaffold.cache.AtomicCache; +import com.volmit.iris.engine.noise.CellGenerator; +import com.volmit.iris.engine.cache.AtomicCache; import com.volmit.iris.util.*; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/src/main/java/com/volmit/iris/object/IrisRegistrant.java b/src/main/java/com/volmit/iris/engine/object/IrisRegistrant.java similarity index 93% rename from src/main/java/com/volmit/iris/object/IrisRegistrant.java rename to src/main/java/com/volmit/iris/engine/object/IrisRegistrant.java index 91c792d8e..2c20fe966 100644 --- a/src/main/java/com/volmit/iris/object/IrisRegistrant.java +++ b/src/main/java/com/volmit/iris/engine/object/IrisRegistrant.java @@ -16,10 +16,10 @@ * along with this program. If not, see . */ -package com.volmit.iris.object; +package com.volmit.iris.engine.object; import com.volmit.iris.Iris; -import com.volmit.iris.manager.IrisDataManager; +import com.volmit.iris.core.IrisDataManager; import lombok.Data; import java.awt.*; diff --git a/src/main/java/com/volmit/iris/object/IrisShapedGeneratorStyle.java b/src/main/java/com/volmit/iris/engine/object/IrisShapedGeneratorStyle.java similarity index 98% rename from src/main/java/com/volmit/iris/object/IrisShapedGeneratorStyle.java rename to src/main/java/com/volmit/iris/engine/object/IrisShapedGeneratorStyle.java index fb6f4029a..a253778e4 100644 --- a/src/main/java/com/volmit/iris/object/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.object; +package com.volmit.iris.engine.object; import com.volmit.iris.util.*; import lombok.AllArgsConstructor; diff --git a/src/main/java/com/volmit/iris/object/IrisSlopeClip.java b/src/main/java/com/volmit/iris/engine/object/IrisSlopeClip.java similarity index 97% rename from src/main/java/com/volmit/iris/object/IrisSlopeClip.java rename to src/main/java/com/volmit/iris/engine/object/IrisSlopeClip.java index 779b26737..4112a0971 100644 --- a/src/main/java/com/volmit/iris/object/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.object; +package com.volmit.iris.engine.object; import com.volmit.iris.util.Desc; import com.volmit.iris.util.MaxNumber; diff --git a/src/main/java/com/volmit/iris/object/LootMode.java b/src/main/java/com/volmit/iris/engine/object/LootMode.java similarity index 97% rename from src/main/java/com/volmit/iris/object/LootMode.java rename to src/main/java/com/volmit/iris/engine/object/LootMode.java index 66fa156fc..c6a273454 100644 --- a/src/main/java/com/volmit/iris/object/LootMode.java +++ b/src/main/java/com/volmit/iris/engine/object/LootMode.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.object; +package com.volmit.iris.engine.object; import com.volmit.iris.util.Desc; diff --git a/src/main/java/com/volmit/iris/object/NoiseStyle.java b/src/main/java/com/volmit/iris/engine/object/NoiseStyle.java similarity index 98% rename from src/main/java/com/volmit/iris/object/NoiseStyle.java rename to src/main/java/com/volmit/iris/engine/object/NoiseStyle.java index 09aad03c1..8c459f69c 100644 --- a/src/main/java/com/volmit/iris/object/NoiseStyle.java +++ b/src/main/java/com/volmit/iris/engine/object/NoiseStyle.java @@ -16,12 +16,12 @@ * along with this program. If not, see . */ -package com.volmit.iris.object; +package com.volmit.iris.engine.object; -import com.volmit.iris.generator.noise.CNG; -import com.volmit.iris.generator.noise.CNGFactory; -import com.volmit.iris.generator.noise.NoiseType; -import com.volmit.iris.scaffold.stream.ProceduralStream; +import com.volmit.iris.engine.noise.CNG; +import com.volmit.iris.engine.noise.CNGFactory; +import com.volmit.iris.engine.noise.NoiseType; +import com.volmit.iris.engine.stream.ProceduralStream; import com.volmit.iris.util.Desc; import com.volmit.iris.util.RNG; diff --git a/src/main/java/com/volmit/iris/object/ObjectPlaceMode.java b/src/main/java/com/volmit/iris/engine/object/ObjectPlaceMode.java similarity index 98% rename from src/main/java/com/volmit/iris/object/ObjectPlaceMode.java rename to src/main/java/com/volmit/iris/engine/object/ObjectPlaceMode.java index a58579035..b0dc3a83f 100644 --- a/src/main/java/com/volmit/iris/object/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.object; +package com.volmit.iris.engine.object; import com.volmit.iris.util.Desc; diff --git a/src/main/java/com/volmit/iris/object/tile/TileBanner.java b/src/main/java/com/volmit/iris/engine/object/tile/TileBanner.java similarity index 96% rename from src/main/java/com/volmit/iris/object/tile/TileBanner.java rename to src/main/java/com/volmit/iris/engine/object/tile/TileBanner.java index 1893d16e6..6bcb3354c 100644 --- a/src/main/java/com/volmit/iris/object/tile/TileBanner.java +++ b/src/main/java/com/volmit/iris/engine/object/tile/TileBanner.java @@ -16,10 +16,10 @@ * along with this program. If not, see . */ -package com.volmit.iris.object.tile; +package com.volmit.iris.engine.object.tile; -import com.volmit.iris.scaffold.data.nbt.tag.CompoundTag; -import com.volmit.iris.scaffold.data.nbt.tag.ListTag; +import com.volmit.iris.engine.data.nbt.tag.CompoundTag; +import com.volmit.iris.engine.data.nbt.tag.ListTag; import lombok.Data; import org.bukkit.DyeColor; import org.bukkit.Material; diff --git a/src/main/java/com/volmit/iris/object/tile/TileData.java b/src/main/java/com/volmit/iris/engine/object/tile/TileData.java similarity index 97% rename from src/main/java/com/volmit/iris/object/tile/TileData.java rename to src/main/java/com/volmit/iris/engine/object/tile/TileData.java index 09aef270b..2d88920e4 100644 --- a/src/main/java/com/volmit/iris/object/tile/TileData.java +++ b/src/main/java/com/volmit/iris/engine/object/tile/TileData.java @@ -16,10 +16,10 @@ * along with this program. If not, see . */ -package com.volmit.iris.object.tile; +package com.volmit.iris.engine.object.tile; import com.volmit.iris.Iris; -import com.volmit.iris.scaffold.data.nbt.tag.CompoundTag; +import com.volmit.iris.engine.data.nbt.tag.CompoundTag; import com.volmit.iris.util.KList; import org.bukkit.block.Block; import org.bukkit.block.BlockState; diff --git a/src/main/java/com/volmit/iris/object/tile/TileSign.java b/src/main/java/com/volmit/iris/engine/object/tile/TileSign.java similarity index 96% rename from src/main/java/com/volmit/iris/object/tile/TileSign.java rename to src/main/java/com/volmit/iris/engine/object/tile/TileSign.java index 8d94dcd95..c5c260c9a 100644 --- a/src/main/java/com/volmit/iris/object/tile/TileSign.java +++ b/src/main/java/com/volmit/iris/engine/object/tile/TileSign.java @@ -16,9 +16,9 @@ * along with this program. If not, see . */ -package com.volmit.iris.object.tile; +package com.volmit.iris.engine.object.tile; -import com.volmit.iris.scaffold.data.nbt.tag.CompoundTag; +import com.volmit.iris.engine.data.nbt.tag.CompoundTag; import lombok.Data; import org.bukkit.DyeColor; import org.bukkit.block.Sign; diff --git a/src/main/java/com/volmit/iris/object/tile/TileSpawner.java b/src/main/java/com/volmit/iris/engine/object/tile/TileSpawner.java similarity index 94% rename from src/main/java/com/volmit/iris/object/tile/TileSpawner.java rename to src/main/java/com/volmit/iris/engine/object/tile/TileSpawner.java index d64dd5e8d..cc94516fc 100644 --- a/src/main/java/com/volmit/iris/object/tile/TileSpawner.java +++ b/src/main/java/com/volmit/iris/engine/object/tile/TileSpawner.java @@ -16,10 +16,10 @@ * along with this program. If not, see . */ -package com.volmit.iris.object.tile; +package com.volmit.iris.engine.object.tile; -import com.volmit.iris.scaffold.data.nbt.tag.CompoundTag; -import com.volmit.iris.scaffold.data.nbt.tag.ListTag; +import com.volmit.iris.engine.data.nbt.tag.CompoundTag; +import com.volmit.iris.engine.data.nbt.tag.ListTag; import lombok.Data; import org.bukkit.Material; import org.bukkit.block.CreatureSpawner; diff --git a/src/main/java/com/volmit/iris/scaffold/parallax/ParallaxAccess.java b/src/main/java/com/volmit/iris/engine/parallax/ParallaxAccess.java similarity index 97% rename from src/main/java/com/volmit/iris/scaffold/parallax/ParallaxAccess.java rename to src/main/java/com/volmit/iris/engine/parallax/ParallaxAccess.java index fff50ba15..a6fe64847 100644 --- a/src/main/java/com/volmit/iris/scaffold/parallax/ParallaxAccess.java +++ b/src/main/java/com/volmit/iris/engine/parallax/ParallaxAccess.java @@ -16,10 +16,10 @@ * along with this program. If not, see . */ -package com.volmit.iris.scaffold.parallax; +package com.volmit.iris.engine.parallax; -import com.volmit.iris.object.tile.TileData; -import com.volmit.iris.scaffold.hunk.Hunk; +import com.volmit.iris.engine.object.tile.TileData; +import com.volmit.iris.engine.hunk.Hunk; import org.bukkit.block.TileState; import org.bukkit.block.data.BlockData; diff --git a/src/main/java/com/volmit/iris/scaffold/parallax/ParallaxChunkMeta.java b/src/main/java/com/volmit/iris/engine/parallax/ParallaxChunkMeta.java similarity index 90% rename from src/main/java/com/volmit/iris/scaffold/parallax/ParallaxChunkMeta.java rename to src/main/java/com/volmit/iris/engine/parallax/ParallaxChunkMeta.java index 3377362cc..01900df85 100644 --- a/src/main/java/com/volmit/iris/scaffold/parallax/ParallaxChunkMeta.java +++ b/src/main/java/com/volmit/iris/engine/parallax/ParallaxChunkMeta.java @@ -16,12 +16,12 @@ * along with this program. If not, see . */ -package com.volmit.iris.scaffold.parallax; +package com.volmit.iris.engine.parallax; import com.google.gson.Gson; -import com.volmit.iris.object.IrisFeaturePositional; -import com.volmit.iris.scaffold.hunk.io.HunkIOAdapter; -import com.volmit.iris.scaffold.hunk.io.PaletteHunkIOAdapter; +import com.volmit.iris.engine.object.IrisFeaturePositional; +import com.volmit.iris.engine.hunk.io.HunkIOAdapter; +import com.volmit.iris.engine.hunk.io.PaletteHunkIOAdapter; import com.volmit.iris.util.CompoundTag; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/src/main/java/com/volmit/iris/scaffold/parallax/ParallaxRegion.java b/src/main/java/com/volmit/iris/engine/parallax/ParallaxRegion.java similarity index 94% rename from src/main/java/com/volmit/iris/scaffold/parallax/ParallaxRegion.java rename to src/main/java/com/volmit/iris/engine/parallax/ParallaxRegion.java index 616052544..017ebb9ed 100644 --- a/src/main/java/com/volmit/iris/scaffold/parallax/ParallaxRegion.java +++ b/src/main/java/com/volmit/iris/engine/parallax/ParallaxRegion.java @@ -16,15 +16,15 @@ * along with this program. If not, see . */ -package com.volmit.iris.scaffold.parallax; +package com.volmit.iris.engine.parallax; import com.volmit.iris.Iris; -import com.volmit.iris.object.tile.TileData; -import com.volmit.iris.scaffold.hunk.Hunk; -import com.volmit.iris.scaffold.hunk.io.HunkIOAdapter; -import com.volmit.iris.scaffold.hunk.io.HunkRegion; -import com.volmit.iris.scaffold.hunk.io.HunkRegionSlice; -import com.volmit.iris.scaffold.parallel.GridLock; +import com.volmit.iris.engine.object.tile.TileData; +import com.volmit.iris.engine.hunk.Hunk; +import com.volmit.iris.engine.hunk.io.HunkIOAdapter; +import com.volmit.iris.engine.hunk.io.HunkRegion; +import com.volmit.iris.engine.hunk.io.HunkRegionSlice; +import com.volmit.iris.engine.parallel.GridLock; import com.volmit.iris.util.ByteArrayTag; import com.volmit.iris.util.CompoundTag; import com.volmit.iris.util.M; diff --git a/src/main/java/com/volmit/iris/scaffold/parallax/ParallaxWorld.java b/src/main/java/com/volmit/iris/engine/parallax/ParallaxWorld.java similarity index 97% rename from src/main/java/com/volmit/iris/scaffold/parallax/ParallaxWorld.java rename to src/main/java/com/volmit/iris/engine/parallax/ParallaxWorld.java index b00d90db3..5b391bf89 100644 --- a/src/main/java/com/volmit/iris/scaffold/parallax/ParallaxWorld.java +++ b/src/main/java/com/volmit/iris/engine/parallax/ParallaxWorld.java @@ -16,12 +16,12 @@ * along with this program. If not, see . */ -package com.volmit.iris.scaffold.parallax; +package com.volmit.iris.engine.parallax; import com.volmit.iris.Iris; -import com.volmit.iris.IrisSettings; -import com.volmit.iris.object.tile.TileData; -import com.volmit.iris.scaffold.hunk.Hunk; +import com.volmit.iris.core.IrisSettings; +import com.volmit.iris.engine.object.tile.TileData; +import com.volmit.iris.engine.hunk.Hunk; import com.volmit.iris.util.J; import com.volmit.iris.util.KList; import com.volmit.iris.util.KMap; diff --git a/src/main/java/com/volmit/iris/scaffold/parallel/BurstExecutor.java b/src/main/java/com/volmit/iris/engine/parallel/BurstExecutor.java similarity index 98% rename from src/main/java/com/volmit/iris/scaffold/parallel/BurstExecutor.java rename to src/main/java/com/volmit/iris/engine/parallel/BurstExecutor.java index a93728dea..ce9c139cf 100644 --- a/src/main/java/com/volmit/iris/scaffold/parallel/BurstExecutor.java +++ b/src/main/java/com/volmit/iris/engine/parallel/BurstExecutor.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.scaffold.parallel; +package com.volmit.iris.engine.parallel; import com.volmit.iris.Iris; import com.volmit.iris.util.KList; diff --git a/src/main/java/com/volmit/iris/scaffold/parallel/BurstedHunk.java b/src/main/java/com/volmit/iris/engine/parallel/BurstedHunk.java similarity index 91% rename from src/main/java/com/volmit/iris/scaffold/parallel/BurstedHunk.java rename to src/main/java/com/volmit/iris/engine/parallel/BurstedHunk.java index 7f6b401fa..06c449beb 100644 --- a/src/main/java/com/volmit/iris/scaffold/parallel/BurstedHunk.java +++ b/src/main/java/com/volmit/iris/engine/parallel/BurstedHunk.java @@ -16,9 +16,9 @@ * along with this program. If not, see . */ -package com.volmit.iris.scaffold.parallel; +package com.volmit.iris.engine.parallel; -import com.volmit.iris.scaffold.hunk.Hunk; +import com.volmit.iris.engine.hunk.Hunk; public interface BurstedHunk extends Hunk { int getOffsetX(); diff --git a/src/main/java/com/volmit/iris/scaffold/parallel/GridLock.java b/src/main/java/com/volmit/iris/engine/parallel/GridLock.java similarity index 96% rename from src/main/java/com/volmit/iris/scaffold/parallel/GridLock.java rename to src/main/java/com/volmit/iris/engine/parallel/GridLock.java index 22f6a3727..70b3595d4 100644 --- a/src/main/java/com/volmit/iris/scaffold/parallel/GridLock.java +++ b/src/main/java/com/volmit/iris/engine/parallel/GridLock.java @@ -16,10 +16,10 @@ * along with this program. If not, see . */ -package com.volmit.iris.scaffold.parallel; +package com.volmit.iris.engine.parallel; import com.volmit.iris.Iris; -import com.volmit.iris.scaffold.hunk.Hunk; +import com.volmit.iris.engine.hunk.Hunk; import com.volmit.iris.util.IORunnable; import com.volmit.iris.util.NastyRunnable; diff --git a/src/main/java/com/volmit/iris/scaffold/parallel/MultiBurst.java b/src/main/java/com/volmit/iris/engine/parallel/MultiBurst.java similarity index 98% rename from src/main/java/com/volmit/iris/scaffold/parallel/MultiBurst.java rename to src/main/java/com/volmit/iris/engine/parallel/MultiBurst.java index 6a93bcd29..8afbd70e6 100644 --- a/src/main/java/com/volmit/iris/scaffold/parallel/MultiBurst.java +++ b/src/main/java/com/volmit/iris/engine/parallel/MultiBurst.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.scaffold.parallel; +package com.volmit.iris.engine.parallel; import com.volmit.iris.Iris; import com.volmit.iris.util.KList; diff --git a/src/main/java/com/volmit/iris/scaffold/stream/ArraySignificance.java b/src/main/java/com/volmit/iris/engine/stream/ArraySignificance.java similarity index 98% rename from src/main/java/com/volmit/iris/scaffold/stream/ArraySignificance.java rename to src/main/java/com/volmit/iris/engine/stream/ArraySignificance.java index c9b69eda4..d625a6909 100644 --- a/src/main/java/com/volmit/iris/scaffold/stream/ArraySignificance.java +++ b/src/main/java/com/volmit/iris/engine/stream/ArraySignificance.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.scaffold.stream; +package com.volmit.iris.engine.stream; import com.volmit.iris.util.KList; diff --git a/src/main/java/com/volmit/iris/scaffold/stream/BasicLayer.java b/src/main/java/com/volmit/iris/engine/stream/BasicLayer.java similarity index 96% rename from src/main/java/com/volmit/iris/scaffold/stream/BasicLayer.java rename to src/main/java/com/volmit/iris/engine/stream/BasicLayer.java index 6d9441a7a..238af145e 100644 --- a/src/main/java/com/volmit/iris/scaffold/stream/BasicLayer.java +++ b/src/main/java/com/volmit/iris/engine/stream/BasicLayer.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.scaffold.stream; +package com.volmit.iris.engine.stream; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/src/main/java/com/volmit/iris/scaffold/stream/BasicStream.java b/src/main/java/com/volmit/iris/engine/stream/BasicStream.java similarity index 97% rename from src/main/java/com/volmit/iris/scaffold/stream/BasicStream.java rename to src/main/java/com/volmit/iris/engine/stream/BasicStream.java index 3ed8e420f..a28ae4d3d 100644 --- a/src/main/java/com/volmit/iris/scaffold/stream/BasicStream.java +++ b/src/main/java/com/volmit/iris/engine/stream/BasicStream.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.scaffold.stream; +package com.volmit.iris.engine.stream; public abstract class BasicStream extends BasicLayer implements ProceduralStream { private final ProceduralStream source; diff --git a/src/main/java/com/volmit/iris/scaffold/stream/ProceduralLayer.java b/src/main/java/com/volmit/iris/engine/stream/ProceduralLayer.java similarity index 95% rename from src/main/java/com/volmit/iris/scaffold/stream/ProceduralLayer.java rename to src/main/java/com/volmit/iris/engine/stream/ProceduralLayer.java index 918ed1aea..fcdc36d9e 100644 --- a/src/main/java/com/volmit/iris/scaffold/stream/ProceduralLayer.java +++ b/src/main/java/com/volmit/iris/engine/stream/ProceduralLayer.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.scaffold.stream; +package com.volmit.iris.engine.stream; public interface ProceduralLayer { long getSeed(); diff --git a/src/main/java/com/volmit/iris/scaffold/stream/ProceduralStream.java b/src/main/java/com/volmit/iris/engine/stream/ProceduralStream.java similarity index 97% rename from src/main/java/com/volmit/iris/scaffold/stream/ProceduralStream.java rename to src/main/java/com/volmit/iris/engine/stream/ProceduralStream.java index 2034df11f..029f6c5a6 100644 --- a/src/main/java/com/volmit/iris/scaffold/stream/ProceduralStream.java +++ b/src/main/java/com/volmit/iris/engine/stream/ProceduralStream.java @@ -16,15 +16,15 @@ * along with this program. If not, see . */ -package com.volmit.iris.scaffold.stream; +package com.volmit.iris.engine.stream; import com.volmit.iris.Iris; -import com.volmit.iris.scaffold.hunk.Hunk; -import com.volmit.iris.scaffold.stream.arithmetic.*; -import com.volmit.iris.scaffold.stream.convert.*; -import com.volmit.iris.scaffold.stream.interpolation.Interpolated; -import com.volmit.iris.scaffold.stream.sources.FunctionStream; -import com.volmit.iris.scaffold.stream.utility.*; +import com.volmit.iris.engine.hunk.Hunk; +import com.volmit.iris.engine.stream.arithmetic.*; +import com.volmit.iris.engine.stream.convert.*; +import com.volmit.iris.engine.stream.interpolation.Interpolated; +import com.volmit.iris.engine.stream.sources.FunctionStream; +import com.volmit.iris.engine.stream.utility.*; import com.volmit.iris.util.*; import java.util.List; diff --git a/src/main/java/com/volmit/iris/scaffold/stream/Significance.java b/src/main/java/com/volmit/iris/engine/stream/Significance.java similarity index 95% rename from src/main/java/com/volmit/iris/scaffold/stream/Significance.java rename to src/main/java/com/volmit/iris/engine/stream/Significance.java index 8d625b073..d681c857e 100644 --- a/src/main/java/com/volmit/iris/scaffold/stream/Significance.java +++ b/src/main/java/com/volmit/iris/engine/stream/Significance.java @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -package com.volmit.iris.scaffold.stream; +package com.volmit.iris.engine.stream; import com.volmit.iris.util.KList; diff --git a/src/main/java/com/volmit/iris/scaffold/stream/arithmetic/AddingStream.java b/src/main/java/com/volmit/iris/engine/stream/arithmetic/AddingStream.java similarity index 92% rename from src/main/java/com/volmit/iris/scaffold/stream/arithmetic/AddingStream.java rename to src/main/java/com/volmit/iris/engine/stream/arithmetic/AddingStream.java index 6ea437fea..e67baf965 100644 --- a/src/main/java/com/volmit/iris/scaffold/stream/arithmetic/AddingStream.java +++ b/src/main/java/com/volmit/iris/engine/stream/arithmetic/AddingStream.java @@ -16,10 +16,10 @@ * along with this program. If not, see . */ -package com.volmit.iris.scaffold.stream.arithmetic; +package com.volmit.iris.engine.stream.arithmetic; -import com.volmit.iris.scaffold.stream.BasicStream; -import com.volmit.iris.scaffold.stream.ProceduralStream; +import com.volmit.iris.engine.stream.BasicStream; +import com.volmit.iris.engine.stream.ProceduralStream; import com.volmit.iris.util.Function2; import com.volmit.iris.util.Function3; diff --git a/src/main/java/com/volmit/iris/scaffold/stream/arithmetic/ClampedStream.java b/src/main/java/com/volmit/iris/engine/stream/arithmetic/ClampedStream.java similarity index 91% rename from src/main/java/com/volmit/iris/scaffold/stream/arithmetic/ClampedStream.java rename to src/main/java/com/volmit/iris/engine/stream/arithmetic/ClampedStream.java index 1d38adacd..246cfa832 100644 --- a/src/main/java/com/volmit/iris/scaffold/stream/arithmetic/ClampedStream.java +++ b/src/main/java/com/volmit/iris/engine/stream/arithmetic/ClampedStream.java @@ -16,10 +16,10 @@ * along with this program. If not, see . */ -package com.volmit.iris.scaffold.stream.arithmetic; +package com.volmit.iris.engine.stream.arithmetic; -import com.volmit.iris.scaffold.stream.BasicStream; -import com.volmit.iris.scaffold.stream.ProceduralStream; +import com.volmit.iris.engine.stream.BasicStream; +import com.volmit.iris.engine.stream.ProceduralStream; public class ClampedStream extends BasicStream implements ProceduralStream { private final double min; diff --git a/src/main/java/com/volmit/iris/scaffold/stream/arithmetic/CoordinateBitShiftLeftStream.java b/src/main/java/com/volmit/iris/engine/stream/arithmetic/CoordinateBitShiftLeftStream.java similarity index 90% rename from src/main/java/com/volmit/iris/scaffold/stream/arithmetic/CoordinateBitShiftLeftStream.java rename to src/main/java/com/volmit/iris/engine/stream/arithmetic/CoordinateBitShiftLeftStream.java index 1a8fca0b1..21c451865 100644 --- a/src/main/java/com/volmit/iris/scaffold/stream/arithmetic/CoordinateBitShiftLeftStream.java +++ b/src/main/java/com/volmit/iris/engine/stream/arithmetic/CoordinateBitShiftLeftStream.java @@ -16,10 +16,10 @@ * along with this program. If not, see . */ -package com.volmit.iris.scaffold.stream.arithmetic; +package com.volmit.iris.engine.stream.arithmetic; -import com.volmit.iris.scaffold.stream.BasicStream; -import com.volmit.iris.scaffold.stream.ProceduralStream; +import com.volmit.iris.engine.stream.BasicStream; +import com.volmit.iris.engine.stream.ProceduralStream; public class CoordinateBitShiftLeftStream extends BasicStream implements ProceduralStream { private final int amount; diff --git a/src/main/java/com/volmit/iris/scaffold/stream/arithmetic/CoordinateBitShiftRightStream.java b/src/main/java/com/volmit/iris/engine/stream/arithmetic/CoordinateBitShiftRightStream.java similarity index 90% rename from src/main/java/com/volmit/iris/scaffold/stream/arithmetic/CoordinateBitShiftRightStream.java rename to src/main/java/com/volmit/iris/engine/stream/arithmetic/CoordinateBitShiftRightStream.java index 29ea125dc..e4821a947 100644 --- a/src/main/java/com/volmit/iris/scaffold/stream/arithmetic/CoordinateBitShiftRightStream.java +++ b/src/main/java/com/volmit/iris/engine/stream/arithmetic/CoordinateBitShiftRightStream.java @@ -16,10 +16,10 @@ * along with this program. If not, see . */ -package com.volmit.iris.scaffold.stream.arithmetic; +package com.volmit.iris.engine.stream.arithmetic; -import com.volmit.iris.scaffold.stream.BasicStream; -import com.volmit.iris.scaffold.stream.ProceduralStream; +import com.volmit.iris.engine.stream.BasicStream; +import com.volmit.iris.engine.stream.ProceduralStream; public class CoordinateBitShiftRightStream extends BasicStream implements ProceduralStream { private final int amount; diff --git a/src/main/java/com/volmit/iris/scaffold/stream/arithmetic/DividingStream.java b/src/main/java/com/volmit/iris/engine/stream/arithmetic/DividingStream.java similarity index 92% rename from src/main/java/com/volmit/iris/scaffold/stream/arithmetic/DividingStream.java rename to src/main/java/com/volmit/iris/engine/stream/arithmetic/DividingStream.java index 5847698ea..c78de4147 100644 --- a/src/main/java/com/volmit/iris/scaffold/stream/arithmetic/DividingStream.java +++ b/src/main/java/com/volmit/iris/engine/stream/arithmetic/DividingStream.java @@ -16,10 +16,10 @@ * along with this program. If not, see . */ -package com.volmit.iris.scaffold.stream.arithmetic; +package com.volmit.iris.engine.stream.arithmetic; -import com.volmit.iris.scaffold.stream.BasicStream; -import com.volmit.iris.scaffold.stream.ProceduralStream; +import com.volmit.iris.engine.stream.BasicStream; +import com.volmit.iris.engine.stream.ProceduralStream; import com.volmit.iris.util.Function2; import com.volmit.iris.util.Function3; diff --git a/src/main/java/com/volmit/iris/scaffold/stream/arithmetic/FittedStream.java b/src/main/java/com/volmit/iris/engine/stream/arithmetic/FittedStream.java similarity index 92% rename from src/main/java/com/volmit/iris/scaffold/stream/arithmetic/FittedStream.java rename to src/main/java/com/volmit/iris/engine/stream/arithmetic/FittedStream.java index d2014c3ab..601949102 100644 --- a/src/main/java/com/volmit/iris/scaffold/stream/arithmetic/FittedStream.java +++ b/src/main/java/com/volmit/iris/engine/stream/arithmetic/FittedStream.java @@ -16,10 +16,10 @@ * along with this program. If not, see . */ -package com.volmit.iris.scaffold.stream.arithmetic; +package com.volmit.iris.engine.stream.arithmetic; -import com.volmit.iris.scaffold.stream.BasicStream; -import com.volmit.iris.scaffold.stream.ProceduralStream; +import com.volmit.iris.engine.stream.BasicStream; +import com.volmit.iris.engine.stream.ProceduralStream; public class FittedStream extends BasicStream implements ProceduralStream { private final double min; diff --git a/src/main/java/com/volmit/iris/scaffold/stream/arithmetic/MaxingStream.java b/src/main/java/com/volmit/iris/engine/stream/arithmetic/MaxingStream.java similarity index 92% rename from src/main/java/com/volmit/iris/scaffold/stream/arithmetic/MaxingStream.java rename to src/main/java/com/volmit/iris/engine/stream/arithmetic/MaxingStream.java index 6269492f9..e9eda3462 100644 --- a/src/main/java/com/volmit/iris/scaffold/stream/arithmetic/MaxingStream.java +++ b/src/main/java/com/volmit/iris/engine/stream/arithmetic/MaxingStream.java @@ -16,10 +16,10 @@ * along with this program. If not, see . */ -package com.volmit.iris.scaffold.stream.arithmetic; +package com.volmit.iris.engine.stream.arithmetic; -import com.volmit.iris.scaffold.stream.BasicStream; -import com.volmit.iris.scaffold.stream.ProceduralStream; +import com.volmit.iris.engine.stream.BasicStream; +import com.volmit.iris.engine.stream.ProceduralStream; import com.volmit.iris.util.Function2; import com.volmit.iris.util.Function3; diff --git a/src/main/java/com/volmit/iris/scaffold/stream/arithmetic/MinningStream.java b/src/main/java/com/volmit/iris/engine/stream/arithmetic/MinningStream.java similarity index 92% rename from src/main/java/com/volmit/iris/scaffold/stream/arithmetic/MinningStream.java rename to src/main/java/com/volmit/iris/engine/stream/arithmetic/MinningStream.java index 4b741e802..71574fe98 100644 --- a/src/main/java/com/volmit/iris/scaffold/stream/arithmetic/MinningStream.java +++ b/src/main/java/com/volmit/iris/engine/stream/arithmetic/MinningStream.java @@ -16,10 +16,10 @@ * along with this program. If not, see . */ -package com.volmit.iris.scaffold.stream.arithmetic; +package com.volmit.iris.engine.stream.arithmetic; -import com.volmit.iris.scaffold.stream.BasicStream; -import com.volmit.iris.scaffold.stream.ProceduralStream; +import com.volmit.iris.engine.stream.BasicStream; +import com.volmit.iris.engine.stream.ProceduralStream; import com.volmit.iris.util.Function2; import com.volmit.iris.util.Function3; diff --git a/src/main/java/com/volmit/iris/scaffold/stream/arithmetic/ModuloStream.java b/src/main/java/com/volmit/iris/engine/stream/arithmetic/ModuloStream.java similarity index 92% rename from src/main/java/com/volmit/iris/scaffold/stream/arithmetic/ModuloStream.java rename to src/main/java/com/volmit/iris/engine/stream/arithmetic/ModuloStream.java index 93895d48c..5803168aa 100644 --- a/src/main/java/com/volmit/iris/scaffold/stream/arithmetic/ModuloStream.java +++ b/src/main/java/com/volmit/iris/engine/stream/arithmetic/ModuloStream.java @@ -16,10 +16,10 @@ * along with this program. If not, see . */ -package com.volmit.iris.scaffold.stream.arithmetic; +package com.volmit.iris.engine.stream.arithmetic; -import com.volmit.iris.scaffold.stream.BasicStream; -import com.volmit.iris.scaffold.stream.ProceduralStream; +import com.volmit.iris.engine.stream.BasicStream; +import com.volmit.iris.engine.stream.ProceduralStream; import com.volmit.iris.util.Function2; import com.volmit.iris.util.Function3; diff --git a/src/main/java/com/volmit/iris/scaffold/stream/arithmetic/MultiplyingStream.java b/src/main/java/com/volmit/iris/engine/stream/arithmetic/MultiplyingStream.java similarity index 92% rename from src/main/java/com/volmit/iris/scaffold/stream/arithmetic/MultiplyingStream.java rename to src/main/java/com/volmit/iris/engine/stream/arithmetic/MultiplyingStream.java index db2a4b79f..63076921a 100644 --- a/src/main/java/com/volmit/iris/scaffold/stream/arithmetic/MultiplyingStream.java +++ b/src/main/java/com/volmit/iris/engine/stream/arithmetic/MultiplyingStream.java @@ -16,10 +16,10 @@ * along with this program. If not, see . */ -package com.volmit.iris.scaffold.stream.arithmetic; +package com.volmit.iris.engine.stream.arithmetic; -import com.volmit.iris.scaffold.stream.BasicStream; -import com.volmit.iris.scaffold.stream.ProceduralStream; +import com.volmit.iris.engine.stream.BasicStream; +import com.volmit.iris.engine.stream.ProceduralStream; import com.volmit.iris.util.Function2; import com.volmit.iris.util.Function3; diff --git a/src/main/java/com/volmit/iris/scaffold/stream/arithmetic/OffsetStream.java b/src/main/java/com/volmit/iris/engine/stream/arithmetic/OffsetStream.java similarity index 90% rename from src/main/java/com/volmit/iris/scaffold/stream/arithmetic/OffsetStream.java rename to src/main/java/com/volmit/iris/engine/stream/arithmetic/OffsetStream.java index 712b5ff56..86a35f967 100644 --- a/src/main/java/com/volmit/iris/scaffold/stream/arithmetic/OffsetStream.java +++ b/src/main/java/com/volmit/iris/engine/stream/arithmetic/OffsetStream.java @@ -16,10 +16,10 @@ * along with this program. If not, see . */ -package com.volmit.iris.scaffold.stream.arithmetic; +package com.volmit.iris.engine.stream.arithmetic; -import com.volmit.iris.scaffold.stream.BasicStream; -import com.volmit.iris.scaffold.stream.ProceduralStream; +import com.volmit.iris.engine.stream.BasicStream; +import com.volmit.iris.engine.stream.ProceduralStream; public class OffsetStream extends BasicStream implements ProceduralStream { private final double ox; diff --git a/src/main/java/com/volmit/iris/scaffold/stream/arithmetic/RadialStream.java b/src/main/java/com/volmit/iris/engine/stream/arithmetic/RadialStream.java similarity index 91% rename from src/main/java/com/volmit/iris/scaffold/stream/arithmetic/RadialStream.java rename to src/main/java/com/volmit/iris/engine/stream/arithmetic/RadialStream.java index dfa5f6570..50dbcd0cb 100644 --- a/src/main/java/com/volmit/iris/scaffold/stream/arithmetic/RadialStream.java +++ b/src/main/java/com/volmit/iris/engine/stream/arithmetic/RadialStream.java @@ -16,10 +16,10 @@ * along with this program. If not, see . */ -package com.volmit.iris.scaffold.stream.arithmetic; +package com.volmit.iris.engine.stream.arithmetic; -import com.volmit.iris.scaffold.stream.BasicStream; -import com.volmit.iris.scaffold.stream.ProceduralStream; +import com.volmit.iris.engine.stream.BasicStream; +import com.volmit.iris.engine.stream.ProceduralStream; public class RadialStream extends BasicStream implements ProceduralStream { private final double scale; diff --git a/src/main/java/com/volmit/iris/scaffold/stream/arithmetic/RoundingDoubleStream.java b/src/main/java/com/volmit/iris/engine/stream/arithmetic/RoundingDoubleStream.java similarity index 90% rename from src/main/java/com/volmit/iris/scaffold/stream/arithmetic/RoundingDoubleStream.java rename to src/main/java/com/volmit/iris/engine/stream/arithmetic/RoundingDoubleStream.java index 5fde57af2..b92719326 100644 --- a/src/main/java/com/volmit/iris/scaffold/stream/arithmetic/RoundingDoubleStream.java +++ b/src/main/java/com/volmit/iris/engine/stream/arithmetic/RoundingDoubleStream.java @@ -16,10 +16,10 @@ * along with this program. If not, see . */ -package com.volmit.iris.scaffold.stream.arithmetic; +package com.volmit.iris.engine.stream.arithmetic; -import com.volmit.iris.scaffold.stream.BasicStream; -import com.volmit.iris.scaffold.stream.ProceduralStream; +import com.volmit.iris.engine.stream.BasicStream; +import com.volmit.iris.engine.stream.ProceduralStream; public class RoundingDoubleStream extends BasicStream { private final ProceduralStream stream; diff --git a/src/main/java/com/volmit/iris/scaffold/stream/arithmetic/SlopeStream.java b/src/main/java/com/volmit/iris/engine/stream/arithmetic/SlopeStream.java similarity index 92% rename from src/main/java/com/volmit/iris/scaffold/stream/arithmetic/SlopeStream.java rename to src/main/java/com/volmit/iris/engine/stream/arithmetic/SlopeStream.java index 3081c7b4b..f5b3535d8 100644 --- a/src/main/java/com/volmit/iris/scaffold/stream/arithmetic/SlopeStream.java +++ b/src/main/java/com/volmit/iris/engine/stream/arithmetic/SlopeStream.java @@ -16,10 +16,10 @@ * along with this program. If not, see . */ -package com.volmit.iris.scaffold.stream.arithmetic; +package com.volmit.iris.engine.stream.arithmetic; -import com.volmit.iris.scaffold.stream.BasicStream; -import com.volmit.iris.scaffold.stream.ProceduralStream; +import com.volmit.iris.engine.stream.BasicStream; +import com.volmit.iris.engine.stream.ProceduralStream; public class SlopeStream extends BasicStream { private final int range; diff --git a/src/main/java/com/volmit/iris/scaffold/stream/arithmetic/SubtractingStream.java b/src/main/java/com/volmit/iris/engine/stream/arithmetic/SubtractingStream.java similarity index 92% rename from src/main/java/com/volmit/iris/scaffold/stream/arithmetic/SubtractingStream.java rename to src/main/java/com/volmit/iris/engine/stream/arithmetic/SubtractingStream.java index 0124e92ac..043f3d44f 100644 --- a/src/main/java/com/volmit/iris/scaffold/stream/arithmetic/SubtractingStream.java +++ b/src/main/java/com/volmit/iris/engine/stream/arithmetic/SubtractingStream.java @@ -16,10 +16,10 @@ * along with this program. If not, see . */ -package com.volmit.iris.scaffold.stream.arithmetic; +package com.volmit.iris.engine.stream.arithmetic; -import com.volmit.iris.scaffold.stream.BasicStream; -import com.volmit.iris.scaffold.stream.ProceduralStream; +import com.volmit.iris.engine.stream.BasicStream; +import com.volmit.iris.engine.stream.ProceduralStream; import com.volmit.iris.util.Function2; import com.volmit.iris.util.Function3; diff --git a/src/main/java/com/volmit/iris/scaffold/stream/arithmetic/ZoomStream.java b/src/main/java/com/volmit/iris/engine/stream/arithmetic/ZoomStream.java similarity index 90% rename from src/main/java/com/volmit/iris/scaffold/stream/arithmetic/ZoomStream.java rename to src/main/java/com/volmit/iris/engine/stream/arithmetic/ZoomStream.java index 48d9ca0c9..12842c23b 100644 --- a/src/main/java/com/volmit/iris/scaffold/stream/arithmetic/ZoomStream.java +++ b/src/main/java/com/volmit/iris/engine/stream/arithmetic/ZoomStream.java @@ -16,10 +16,10 @@ * along with this program. If not, see . */ -package com.volmit.iris.scaffold.stream.arithmetic; +package com.volmit.iris.engine.stream.arithmetic; -import com.volmit.iris.scaffold.stream.BasicStream; -import com.volmit.iris.scaffold.stream.ProceduralStream; +import com.volmit.iris.engine.stream.BasicStream; +import com.volmit.iris.engine.stream.ProceduralStream; public class ZoomStream extends BasicStream { private final double ox; diff --git a/src/main/java/com/volmit/iris/scaffold/stream/convert/AwareConversionStream2D.java b/src/main/java/com/volmit/iris/engine/stream/convert/AwareConversionStream2D.java similarity index 91% rename from src/main/java/com/volmit/iris/scaffold/stream/convert/AwareConversionStream2D.java rename to src/main/java/com/volmit/iris/engine/stream/convert/AwareConversionStream2D.java index f763e87eb..87affe69e 100644 --- a/src/main/java/com/volmit/iris/scaffold/stream/convert/AwareConversionStream2D.java +++ b/src/main/java/com/volmit/iris/engine/stream/convert/AwareConversionStream2D.java @@ -16,10 +16,10 @@ * along with this program. If not, see . */ -package com.volmit.iris.scaffold.stream.convert; +package com.volmit.iris.engine.stream.convert; -import com.volmit.iris.scaffold.stream.BasicStream; -import com.volmit.iris.scaffold.stream.ProceduralStream; +import com.volmit.iris.engine.stream.BasicStream; +import com.volmit.iris.engine.stream.ProceduralStream; import com.volmit.iris.util.Function3; public class AwareConversionStream2D extends BasicStream { diff --git a/src/main/java/com/volmit/iris/scaffold/stream/convert/AwareConversionStream3D.java b/src/main/java/com/volmit/iris/engine/stream/convert/AwareConversionStream3D.java similarity index 91% rename from src/main/java/com/volmit/iris/scaffold/stream/convert/AwareConversionStream3D.java rename to src/main/java/com/volmit/iris/engine/stream/convert/AwareConversionStream3D.java index abb4bfdb0..6de047dc4 100644 --- a/src/main/java/com/volmit/iris/scaffold/stream/convert/AwareConversionStream3D.java +++ b/src/main/java/com/volmit/iris/engine/stream/convert/AwareConversionStream3D.java @@ -16,10 +16,10 @@ * along with this program. If not, see . */ -package com.volmit.iris.scaffold.stream.convert; +package com.volmit.iris.engine.stream.convert; -import com.volmit.iris.scaffold.stream.BasicStream; -import com.volmit.iris.scaffold.stream.ProceduralStream; +import com.volmit.iris.engine.stream.BasicStream; +import com.volmit.iris.engine.stream.ProceduralStream; import com.volmit.iris.util.Function4; public class AwareConversionStream3D extends BasicStream { diff --git a/src/main/java/com/volmit/iris/scaffold/stream/convert/CachedConversionStream.java b/src/main/java/com/volmit/iris/engine/stream/convert/CachedConversionStream.java similarity index 92% rename from src/main/java/com/volmit/iris/scaffold/stream/convert/CachedConversionStream.java rename to src/main/java/com/volmit/iris/engine/stream/convert/CachedConversionStream.java index d605c47a0..1ab4e302c 100644 --- a/src/main/java/com/volmit/iris/scaffold/stream/convert/CachedConversionStream.java +++ b/src/main/java/com/volmit/iris/engine/stream/convert/CachedConversionStream.java @@ -16,10 +16,10 @@ * along with this program. If not, see . */ -package com.volmit.iris.scaffold.stream.convert; +package com.volmit.iris.engine.stream.convert; -import com.volmit.iris.scaffold.stream.BasicLayer; -import com.volmit.iris.scaffold.stream.ProceduralStream; +import com.volmit.iris.engine.stream.BasicLayer; +import com.volmit.iris.engine.stream.ProceduralStream; import com.volmit.iris.util.KMap; import java.util.function.Function; diff --git a/src/main/java/com/volmit/iris/scaffold/stream/convert/ConversionStream.java b/src/main/java/com/volmit/iris/engine/stream/convert/ConversionStream.java similarity index 91% rename from src/main/java/com/volmit/iris/scaffold/stream/convert/ConversionStream.java rename to src/main/java/com/volmit/iris/engine/stream/convert/ConversionStream.java index dd6e20fae..fca106faa 100644 --- a/src/main/java/com/volmit/iris/scaffold/stream/convert/ConversionStream.java +++ b/src/main/java/com/volmit/iris/engine/stream/convert/ConversionStream.java @@ -16,10 +16,10 @@ * along with this program. If not, see . */ -package com.volmit.iris.scaffold.stream.convert; +package com.volmit.iris.engine.stream.convert; -import com.volmit.iris.scaffold.stream.BasicLayer; -import com.volmit.iris.scaffold.stream.ProceduralStream; +import com.volmit.iris.engine.stream.BasicLayer; +import com.volmit.iris.engine.stream.ProceduralStream; import java.util.function.Function; diff --git a/src/main/java/com/volmit/iris/scaffold/stream/convert/ForceDoubleStream.java b/src/main/java/com/volmit/iris/engine/stream/convert/ForceDoubleStream.java similarity index 89% rename from src/main/java/com/volmit/iris/scaffold/stream/convert/ForceDoubleStream.java rename to src/main/java/com/volmit/iris/engine/stream/convert/ForceDoubleStream.java index 5fb56893e..0a061afd7 100644 --- a/src/main/java/com/volmit/iris/scaffold/stream/convert/ForceDoubleStream.java +++ b/src/main/java/com/volmit/iris/engine/stream/convert/ForceDoubleStream.java @@ -16,10 +16,10 @@ * along with this program. If not, see . */ -package com.volmit.iris.scaffold.stream.convert; +package com.volmit.iris.engine.stream.convert; -import com.volmit.iris.scaffold.stream.BasicStream; -import com.volmit.iris.scaffold.stream.ProceduralStream; +import com.volmit.iris.engine.stream.BasicStream; +import com.volmit.iris.engine.stream.ProceduralStream; public class ForceDoubleStream extends BasicStream { private ProceduralStream stream; diff --git a/src/main/java/com/volmit/iris/scaffold/stream/convert/RoundingStream.java b/src/main/java/com/volmit/iris/engine/stream/convert/RoundingStream.java similarity index 90% rename from src/main/java/com/volmit/iris/scaffold/stream/convert/RoundingStream.java rename to src/main/java/com/volmit/iris/engine/stream/convert/RoundingStream.java index 739c0eb9b..3c7466861 100644 --- a/src/main/java/com/volmit/iris/scaffold/stream/convert/RoundingStream.java +++ b/src/main/java/com/volmit/iris/engine/stream/convert/RoundingStream.java @@ -16,10 +16,10 @@ * along with this program. If not, see . */ -package com.volmit.iris.scaffold.stream.convert; +package com.volmit.iris.engine.stream.convert; -import com.volmit.iris.scaffold.stream.BasicStream; -import com.volmit.iris.scaffold.stream.ProceduralStream; +import com.volmit.iris.engine.stream.BasicStream; +import com.volmit.iris.engine.stream.ProceduralStream; public class RoundingStream extends BasicStream { private final ProceduralStream stream; diff --git a/src/main/java/com/volmit/iris/scaffold/stream/convert/SelectionStream.java b/src/main/java/com/volmit/iris/engine/stream/convert/SelectionStream.java similarity index 92% rename from src/main/java/com/volmit/iris/scaffold/stream/convert/SelectionStream.java rename to src/main/java/com/volmit/iris/engine/stream/convert/SelectionStream.java index 5495dc872..85003fb7b 100644 --- a/src/main/java/com/volmit/iris/scaffold/stream/convert/SelectionStream.java +++ b/src/main/java/com/volmit/iris/engine/stream/convert/SelectionStream.java @@ -16,10 +16,10 @@ * along with this program. If not, see . */ -package com.volmit.iris.scaffold.stream.convert; +package com.volmit.iris.engine.stream.convert; -import com.volmit.iris.scaffold.stream.BasicStream; -import com.volmit.iris.scaffold.stream.ProceduralStream; +import com.volmit.iris.engine.stream.BasicStream; +import com.volmit.iris.engine.stream.ProceduralStream; import java.util.List; diff --git a/src/main/java/com/volmit/iris/scaffold/stream/convert/SignificanceStream.java b/src/main/java/com/volmit/iris/engine/stream/convert/SignificanceStream.java similarity index 89% rename from src/main/java/com/volmit/iris/scaffold/stream/convert/SignificanceStream.java rename to src/main/java/com/volmit/iris/engine/stream/convert/SignificanceStream.java index 92d5e761b..c2d06fbc9 100644 --- a/src/main/java/com/volmit/iris/scaffold/stream/convert/SignificanceStream.java +++ b/src/main/java/com/volmit/iris/engine/stream/convert/SignificanceStream.java @@ -16,12 +16,12 @@ * along with this program. If not, see . */ -package com.volmit.iris.scaffold.stream.convert; +package com.volmit.iris.engine.stream.convert; -import com.volmit.iris.scaffold.stream.ArraySignificance; -import com.volmit.iris.scaffold.stream.BasicStream; -import com.volmit.iris.scaffold.stream.ProceduralStream; -import com.volmit.iris.scaffold.stream.Significance; +import com.volmit.iris.engine.stream.ArraySignificance; +import com.volmit.iris.engine.stream.BasicStream; +import com.volmit.iris.engine.stream.ProceduralStream; +import com.volmit.iris.engine.stream.Significance; import com.volmit.iris.util.KList; public class SignificanceStream, T> extends BasicStream { diff --git a/src/main/java/com/volmit/iris/scaffold/stream/convert/To3DStream.java b/src/main/java/com/volmit/iris/engine/stream/convert/To3DStream.java similarity index 89% rename from src/main/java/com/volmit/iris/scaffold/stream/convert/To3DStream.java rename to src/main/java/com/volmit/iris/engine/stream/convert/To3DStream.java index 869639b8d..a607117e2 100644 --- a/src/main/java/com/volmit/iris/scaffold/stream/convert/To3DStream.java +++ b/src/main/java/com/volmit/iris/engine/stream/convert/To3DStream.java @@ -16,10 +16,10 @@ * along with this program. If not, see . */ -package com.volmit.iris.scaffold.stream.convert; +package com.volmit.iris.engine.stream.convert; -import com.volmit.iris.scaffold.stream.BasicStream; -import com.volmit.iris.scaffold.stream.ProceduralStream; +import com.volmit.iris.engine.stream.BasicStream; +import com.volmit.iris.engine.stream.ProceduralStream; public class To3DStream extends BasicStream { public To3DStream(ProceduralStream stream) { diff --git a/src/main/java/com/volmit/iris/scaffold/stream/interpolation/BiHermiteStream.java b/src/main/java/com/volmit/iris/engine/stream/interpolation/BiHermiteStream.java similarity index 95% rename from src/main/java/com/volmit/iris/scaffold/stream/interpolation/BiHermiteStream.java rename to src/main/java/com/volmit/iris/engine/stream/interpolation/BiHermiteStream.java index 17838bd5d..b6db7094a 100644 --- a/src/main/java/com/volmit/iris/scaffold/stream/interpolation/BiHermiteStream.java +++ b/src/main/java/com/volmit/iris/engine/stream/interpolation/BiHermiteStream.java @@ -16,10 +16,10 @@ * along with this program. If not, see . */ -package com.volmit.iris.scaffold.stream.interpolation; +package com.volmit.iris.engine.stream.interpolation; -import com.volmit.iris.scaffold.stream.BasicStream; -import com.volmit.iris.scaffold.stream.ProceduralStream; +import com.volmit.iris.engine.stream.BasicStream; +import com.volmit.iris.engine.stream.ProceduralStream; import com.volmit.iris.util.IrisInterpolation; public class BiHermiteStream extends BasicStream implements Interpolator { diff --git a/src/main/java/com/volmit/iris/scaffold/stream/interpolation/BiStarcastStream.java b/src/main/java/com/volmit/iris/engine/stream/interpolation/BiStarcastStream.java similarity index 92% rename from src/main/java/com/volmit/iris/scaffold/stream/interpolation/BiStarcastStream.java rename to src/main/java/com/volmit/iris/engine/stream/interpolation/BiStarcastStream.java index cf49695da..6b2fc74e5 100644 --- a/src/main/java/com/volmit/iris/scaffold/stream/interpolation/BiStarcastStream.java +++ b/src/main/java/com/volmit/iris/engine/stream/interpolation/BiStarcastStream.java @@ -16,10 +16,10 @@ * along with this program. If not, see . */ -package com.volmit.iris.scaffold.stream.interpolation; +package com.volmit.iris.engine.stream.interpolation; -import com.volmit.iris.scaffold.stream.BasicStream; -import com.volmit.iris.scaffold.stream.ProceduralStream; +import com.volmit.iris.engine.stream.BasicStream; +import com.volmit.iris.engine.stream.ProceduralStream; public class BiStarcastStream extends BasicStream implements Interpolator { private final int rad; diff --git a/src/main/java/com/volmit/iris/scaffold/stream/interpolation/BicubicStream.java b/src/main/java/com/volmit/iris/engine/stream/interpolation/BicubicStream.java similarity index 94% rename from src/main/java/com/volmit/iris/scaffold/stream/interpolation/BicubicStream.java rename to src/main/java/com/volmit/iris/engine/stream/interpolation/BicubicStream.java index 415149a04..bdabea1e5 100644 --- a/src/main/java/com/volmit/iris/scaffold/stream/interpolation/BicubicStream.java +++ b/src/main/java/com/volmit/iris/engine/stream/interpolation/BicubicStream.java @@ -16,10 +16,10 @@ * along with this program. If not, see . */ -package com.volmit.iris.scaffold.stream.interpolation; +package com.volmit.iris.engine.stream.interpolation; -import com.volmit.iris.scaffold.stream.BasicStream; -import com.volmit.iris.scaffold.stream.ProceduralStream; +import com.volmit.iris.engine.stream.BasicStream; +import com.volmit.iris.engine.stream.ProceduralStream; import com.volmit.iris.util.IrisInterpolation; public class BicubicStream extends BasicStream implements Interpolator { diff --git a/src/main/java/com/volmit/iris/scaffold/stream/interpolation/BilinearStream.java b/src/main/java/com/volmit/iris/engine/stream/interpolation/BilinearStream.java similarity index 93% rename from src/main/java/com/volmit/iris/scaffold/stream/interpolation/BilinearStream.java rename to src/main/java/com/volmit/iris/engine/stream/interpolation/BilinearStream.java index 2240c6d1e..88aa97de7 100644 --- a/src/main/java/com/volmit/iris/scaffold/stream/interpolation/BilinearStream.java +++ b/src/main/java/com/volmit/iris/engine/stream/interpolation/BilinearStream.java @@ -16,10 +16,10 @@ * along with this program. If not, see . */ -package com.volmit.iris.scaffold.stream.interpolation; +package com.volmit.iris.engine.stream.interpolation; -import com.volmit.iris.scaffold.stream.BasicStream; -import com.volmit.iris.scaffold.stream.ProceduralStream; +import com.volmit.iris.engine.stream.BasicStream; +import com.volmit.iris.engine.stream.ProceduralStream; import com.volmit.iris.util.IrisInterpolation; public class BilinearStream extends BasicStream implements Interpolator { diff --git a/src/main/java/com/volmit/iris/scaffold/stream/interpolation/Interpolated.java b/src/main/java/com/volmit/iris/engine/stream/interpolation/Interpolated.java similarity index 94% rename from src/main/java/com/volmit/iris/scaffold/stream/interpolation/Interpolated.java rename to src/main/java/com/volmit/iris/engine/stream/interpolation/Interpolated.java index 621d46ee9..016941e09 100644 --- a/src/main/java/com/volmit/iris/scaffold/stream/interpolation/Interpolated.java +++ b/src/main/java/com/volmit/iris/engine/stream/interpolation/Interpolated.java @@ -16,9 +16,9 @@ * along with this program. If not, see . */ -package com.volmit.iris.scaffold.stream.interpolation; +package com.volmit.iris.engine.stream.interpolation; -import com.volmit.iris.scaffold.stream.ProceduralStream; +import com.volmit.iris.engine.stream.ProceduralStream; import com.volmit.iris.util.CaveResult; import com.volmit.iris.util.KList; import com.volmit.iris.util.RNG; diff --git a/src/main/java/com/volmit/iris/scaffold/stream/interpolation/InterpolatingStream.java b/src/main/java/com/volmit/iris/engine/stream/interpolation/InterpolatingStream.java similarity index 92% rename from src/main/java/com/volmit/iris/scaffold/stream/interpolation/InterpolatingStream.java rename to src/main/java/com/volmit/iris/engine/stream/interpolation/InterpolatingStream.java index 84952479c..f12b1db92 100644 --- a/src/main/java/com/volmit/iris/scaffold/stream/interpolation/InterpolatingStream.java +++ b/src/main/java/com/volmit/iris/engine/stream/interpolation/InterpolatingStream.java @@ -16,11 +16,11 @@ * along with this program. If not, see . */ -package com.volmit.iris.scaffold.stream.interpolation; +package com.volmit.iris.engine.stream.interpolation; import com.volmit.iris.object.InterpolationMethod; -import com.volmit.iris.scaffold.stream.BasicStream; -import com.volmit.iris.scaffold.stream.ProceduralStream; +import com.volmit.iris.engine.stream.BasicStream; +import com.volmit.iris.engine.stream.ProceduralStream; import com.volmit.iris.util.IrisInterpolation; import com.volmit.iris.util.NoiseProvider; diff --git a/src/main/java/com/volmit/iris/scaffold/stream/interpolation/Interpolator.java b/src/main/java/com/volmit/iris/engine/stream/interpolation/Interpolator.java similarity index 90% rename from src/main/java/com/volmit/iris/scaffold/stream/interpolation/Interpolator.java rename to src/main/java/com/volmit/iris/engine/stream/interpolation/Interpolator.java index b42e96d9b..33b913c72 100644 --- a/src/main/java/com/volmit/iris/scaffold/stream/interpolation/Interpolator.java +++ b/src/main/java/com/volmit/iris/engine/stream/interpolation/Interpolator.java @@ -16,9 +16,9 @@ * along with this program. If not, see . */ -package com.volmit.iris.scaffold.stream.interpolation; +package com.volmit.iris.engine.stream.interpolation; -import com.volmit.iris.scaffold.stream.ProceduralStream; +import com.volmit.iris.engine.stream.ProceduralStream; public interface Interpolator { @SuppressWarnings("unchecked") diff --git a/src/main/java/com/volmit/iris/scaffold/stream/interpolation/InterpolatorFactory.java b/src/main/java/com/volmit/iris/engine/stream/interpolation/InterpolatorFactory.java similarity index 96% rename from src/main/java/com/volmit/iris/scaffold/stream/interpolation/InterpolatorFactory.java rename to src/main/java/com/volmit/iris/engine/stream/interpolation/InterpolatorFactory.java index b1c9e5cfd..1085bf182 100644 --- a/src/main/java/com/volmit/iris/scaffold/stream/interpolation/InterpolatorFactory.java +++ b/src/main/java/com/volmit/iris/engine/stream/interpolation/InterpolatorFactory.java @@ -16,10 +16,10 @@ * along with this program. If not, see . */ -package com.volmit.iris.scaffold.stream.interpolation; +package com.volmit.iris.engine.stream.interpolation; import com.volmit.iris.object.InterpolationMethod; -import com.volmit.iris.scaffold.stream.ProceduralStream; +import com.volmit.iris.engine.stream.ProceduralStream; @SuppressWarnings("ClassCanBeRecord") public class InterpolatorFactory { diff --git a/src/main/java/com/volmit/iris/scaffold/stream/interpolation/TriHermiteStream.java b/src/main/java/com/volmit/iris/engine/stream/interpolation/TriHermiteStream.java similarity index 97% rename from src/main/java/com/volmit/iris/scaffold/stream/interpolation/TriHermiteStream.java rename to src/main/java/com/volmit/iris/engine/stream/interpolation/TriHermiteStream.java index eb2c26767..4adc411e3 100644 --- a/src/main/java/com/volmit/iris/scaffold/stream/interpolation/TriHermiteStream.java +++ b/src/main/java/com/volmit/iris/engine/stream/interpolation/TriHermiteStream.java @@ -16,10 +16,10 @@ * along with this program. If not, see . */ -package com.volmit.iris.scaffold.stream.interpolation; +package com.volmit.iris.engine.stream.interpolation; -import com.volmit.iris.scaffold.stream.BasicStream; -import com.volmit.iris.scaffold.stream.ProceduralStream; +import com.volmit.iris.engine.stream.BasicStream; +import com.volmit.iris.engine.stream.ProceduralStream; import com.volmit.iris.util.IrisInterpolation; public class TriHermiteStream extends BasicStream implements Interpolator { diff --git a/src/main/java/com/volmit/iris/scaffold/stream/interpolation/TriStarcastStream.java b/src/main/java/com/volmit/iris/engine/stream/interpolation/TriStarcastStream.java similarity index 92% rename from src/main/java/com/volmit/iris/scaffold/stream/interpolation/TriStarcastStream.java rename to src/main/java/com/volmit/iris/engine/stream/interpolation/TriStarcastStream.java index 7b1a60bfd..d033ca8b6 100644 --- a/src/main/java/com/volmit/iris/scaffold/stream/interpolation/TriStarcastStream.java +++ b/src/main/java/com/volmit/iris/engine/stream/interpolation/TriStarcastStream.java @@ -16,10 +16,10 @@ * along with this program. If not, see . */ -package com.volmit.iris.scaffold.stream.interpolation; +package com.volmit.iris.engine.stream.interpolation; -import com.volmit.iris.scaffold.stream.BasicStream; -import com.volmit.iris.scaffold.stream.ProceduralStream; +import com.volmit.iris.engine.stream.BasicStream; +import com.volmit.iris.engine.stream.ProceduralStream; public class TriStarcastStream extends BasicStream implements Interpolator { private final int rad; diff --git a/src/main/java/com/volmit/iris/scaffold/stream/interpolation/TricubicStream.java b/src/main/java/com/volmit/iris/engine/stream/interpolation/TricubicStream.java similarity index 97% rename from src/main/java/com/volmit/iris/scaffold/stream/interpolation/TricubicStream.java rename to src/main/java/com/volmit/iris/engine/stream/interpolation/TricubicStream.java index e1a102855..2ec514920 100644 --- a/src/main/java/com/volmit/iris/scaffold/stream/interpolation/TricubicStream.java +++ b/src/main/java/com/volmit/iris/engine/stream/interpolation/TricubicStream.java @@ -16,10 +16,10 @@ * along with this program. If not, see . */ -package com.volmit.iris.scaffold.stream.interpolation; +package com.volmit.iris.engine.stream.interpolation; -import com.volmit.iris.scaffold.stream.BasicStream; -import com.volmit.iris.scaffold.stream.ProceduralStream; +import com.volmit.iris.engine.stream.BasicStream; +import com.volmit.iris.engine.stream.ProceduralStream; import com.volmit.iris.util.IrisInterpolation; public class TricubicStream extends BasicStream implements Interpolator { diff --git a/src/main/java/com/volmit/iris/scaffold/stream/interpolation/TrilinearStream.java b/src/main/java/com/volmit/iris/engine/stream/interpolation/TrilinearStream.java similarity index 94% rename from src/main/java/com/volmit/iris/scaffold/stream/interpolation/TrilinearStream.java rename to src/main/java/com/volmit/iris/engine/stream/interpolation/TrilinearStream.java index c353939cf..71ee3e10a 100644 --- a/src/main/java/com/volmit/iris/scaffold/stream/interpolation/TrilinearStream.java +++ b/src/main/java/com/volmit/iris/engine/stream/interpolation/TrilinearStream.java @@ -16,10 +16,10 @@ * along with this program. If not, see . */ -package com.volmit.iris.scaffold.stream.interpolation; +package com.volmit.iris.engine.stream.interpolation; -import com.volmit.iris.scaffold.stream.BasicStream; -import com.volmit.iris.scaffold.stream.ProceduralStream; +import com.volmit.iris.engine.stream.BasicStream; +import com.volmit.iris.engine.stream.ProceduralStream; import com.volmit.iris.util.IrisInterpolation; public class TrilinearStream extends BasicStream implements Interpolator { diff --git a/src/main/java/com/volmit/iris/scaffold/stream/sources/CNGStream.java b/src/main/java/com/volmit/iris/engine/stream/sources/CNGStream.java similarity index 90% rename from src/main/java/com/volmit/iris/scaffold/stream/sources/CNGStream.java rename to src/main/java/com/volmit/iris/engine/stream/sources/CNGStream.java index 1840ecaa4..9367d4b75 100644 --- a/src/main/java/com/volmit/iris/scaffold/stream/sources/CNGStream.java +++ b/src/main/java/com/volmit/iris/engine/stream/sources/CNGStream.java @@ -16,11 +16,11 @@ * along with this program. If not, see . */ -package com.volmit.iris.scaffold.stream.sources; +package com.volmit.iris.engine.stream.sources; -import com.volmit.iris.generator.noise.CNG; -import com.volmit.iris.scaffold.stream.BasicLayer; -import com.volmit.iris.scaffold.stream.ProceduralStream; +import com.volmit.iris.engine.noise.CNG; +import com.volmit.iris.engine.stream.BasicLayer; +import com.volmit.iris.engine.stream.ProceduralStream; public class CNGStream extends BasicLayer implements ProceduralStream { private final CNG cng; diff --git a/src/main/java/com/volmit/iris/scaffold/stream/sources/FunctionStream.java b/src/main/java/com/volmit/iris/engine/stream/sources/FunctionStream.java similarity index 90% rename from src/main/java/com/volmit/iris/scaffold/stream/sources/FunctionStream.java rename to src/main/java/com/volmit/iris/engine/stream/sources/FunctionStream.java index 9124f3301..974160fdf 100644 --- a/src/main/java/com/volmit/iris/scaffold/stream/sources/FunctionStream.java +++ b/src/main/java/com/volmit/iris/engine/stream/sources/FunctionStream.java @@ -16,10 +16,10 @@ * along with this program. If not, see . */ -package com.volmit.iris.scaffold.stream.sources; +package com.volmit.iris.engine.stream.sources; -import com.volmit.iris.scaffold.stream.BasicStream; -import com.volmit.iris.scaffold.stream.interpolation.Interpolated; +import com.volmit.iris.engine.stream.BasicStream; +import com.volmit.iris.engine.stream.interpolation.Interpolated; import com.volmit.iris.util.Function2; import com.volmit.iris.util.Function3; diff --git a/src/main/java/com/volmit/iris/scaffold/stream/utility/CachedStream2D.java b/src/main/java/com/volmit/iris/engine/stream/utility/CachedStream2D.java similarity index 90% rename from src/main/java/com/volmit/iris/scaffold/stream/utility/CachedStream2D.java rename to src/main/java/com/volmit/iris/engine/stream/utility/CachedStream2D.java index d039fd463..6037c40aa 100644 --- a/src/main/java/com/volmit/iris/scaffold/stream/utility/CachedStream2D.java +++ b/src/main/java/com/volmit/iris/engine/stream/utility/CachedStream2D.java @@ -16,12 +16,12 @@ * along with this program. If not, see . */ -package com.volmit.iris.scaffold.stream.utility; +package com.volmit.iris.engine.stream.utility; import com.googlecode.concurrentlinkedhashmap.ConcurrentLinkedHashMap; -import com.volmit.iris.scaffold.cache.Cache; -import com.volmit.iris.scaffold.stream.BasicStream; -import com.volmit.iris.scaffold.stream.ProceduralStream; +import com.volmit.iris.engine.cache.Cache; +import com.volmit.iris.engine.stream.BasicStream; +import com.volmit.iris.engine.stream.ProceduralStream; public class CachedStream2D extends BasicStream implements ProceduralStream { private final ProceduralStream stream; diff --git a/src/main/java/com/volmit/iris/scaffold/stream/utility/NullSafeStream.java b/src/main/java/com/volmit/iris/engine/stream/utility/NullSafeStream.java similarity index 91% rename from src/main/java/com/volmit/iris/scaffold/stream/utility/NullSafeStream.java rename to src/main/java/com/volmit/iris/engine/stream/utility/NullSafeStream.java index bce365f65..9b6d6b5ed 100644 --- a/src/main/java/com/volmit/iris/scaffold/stream/utility/NullSafeStream.java +++ b/src/main/java/com/volmit/iris/engine/stream/utility/NullSafeStream.java @@ -16,10 +16,10 @@ * along with this program. If not, see . */ -package com.volmit.iris.scaffold.stream.utility; +package com.volmit.iris.engine.stream.utility; -import com.volmit.iris.scaffold.stream.BasicStream; -import com.volmit.iris.scaffold.stream.ProceduralStream; +import com.volmit.iris.engine.stream.BasicStream; +import com.volmit.iris.engine.stream.ProceduralStream; public class NullSafeStream extends BasicStream implements ProceduralStream { private final ProceduralStream stream; diff --git a/src/main/java/com/volmit/iris/scaffold/stream/utility/ProfiledStream.java b/src/main/java/com/volmit/iris/engine/stream/utility/ProfiledStream.java similarity index 96% rename from src/main/java/com/volmit/iris/scaffold/stream/utility/ProfiledStream.java rename to src/main/java/com/volmit/iris/engine/stream/utility/ProfiledStream.java index 79e9b1643..ac4a980b6 100644 --- a/src/main/java/com/volmit/iris/scaffold/stream/utility/ProfiledStream.java +++ b/src/main/java/com/volmit/iris/engine/stream/utility/ProfiledStream.java @@ -16,11 +16,11 @@ * along with this program. If not, see . */ -package com.volmit.iris.scaffold.stream.utility; +package com.volmit.iris.engine.stream.utility; import com.volmit.iris.Iris; -import com.volmit.iris.scaffold.stream.BasicStream; -import com.volmit.iris.scaffold.stream.ProceduralStream; +import com.volmit.iris.engine.stream.BasicStream; +import com.volmit.iris.engine.stream.ProceduralStream; import com.volmit.iris.util.Form; import com.volmit.iris.util.KList; import com.volmit.iris.util.PrecisionStopwatch; diff --git a/src/main/java/com/volmit/iris/scaffold/stream/utility/SemaphoreStream.java b/src/main/java/com/volmit/iris/engine/stream/utility/SemaphoreStream.java similarity index 90% rename from src/main/java/com/volmit/iris/scaffold/stream/utility/SemaphoreStream.java rename to src/main/java/com/volmit/iris/engine/stream/utility/SemaphoreStream.java index 4c3ebf328..982ab008a 100644 --- a/src/main/java/com/volmit/iris/scaffold/stream/utility/SemaphoreStream.java +++ b/src/main/java/com/volmit/iris/engine/stream/utility/SemaphoreStream.java @@ -16,10 +16,10 @@ * along with this program. If not, see . */ -package com.volmit.iris.scaffold.stream.utility; +package com.volmit.iris.engine.stream.utility; -import com.volmit.iris.scaffold.stream.BasicStream; -import com.volmit.iris.scaffold.stream.ProceduralStream; +import com.volmit.iris.engine.stream.BasicStream; +import com.volmit.iris.engine.stream.ProceduralStream; import java.util.concurrent.Semaphore; diff --git a/src/main/java/com/volmit/iris/scaffold/stream/utility/SynchronizedStream.java b/src/main/java/com/volmit/iris/engine/stream/utility/SynchronizedStream.java similarity index 90% rename from src/main/java/com/volmit/iris/scaffold/stream/utility/SynchronizedStream.java rename to src/main/java/com/volmit/iris/engine/stream/utility/SynchronizedStream.java index 31c5ff931..f45d5a0b6 100644 --- a/src/main/java/com/volmit/iris/scaffold/stream/utility/SynchronizedStream.java +++ b/src/main/java/com/volmit/iris/engine/stream/utility/SynchronizedStream.java @@ -16,10 +16,10 @@ * along with this program. If not, see . */ -package com.volmit.iris.scaffold.stream.utility; +package com.volmit.iris.engine.stream.utility; -import com.volmit.iris.scaffold.stream.BasicStream; -import com.volmit.iris.scaffold.stream.ProceduralStream; +import com.volmit.iris.engine.stream.BasicStream; +import com.volmit.iris.engine.stream.ProceduralStream; public class SynchronizedStream extends BasicStream { public SynchronizedStream(ProceduralStream stream) { diff --git a/src/main/java/com/volmit/iris/map/BiomeMap.java b/src/main/java/com/volmit/iris/map/BiomeMap.java deleted file mode 100644 index 694662e2f..000000000 --- a/src/main/java/com/volmit/iris/map/BiomeMap.java +++ /dev/null @@ -1,67 +0,0 @@ -package com.volmit.iris.map; - -import com.google.common.collect.BiMap; -import com.google.common.collect.HashBiMap; -import com.volmit.iris.object.IrisBiome; -import com.volmit.iris.object.IrisDimension; -import com.volmit.iris.object.IrisRegion; - -import java.util.HashSet; -import java.util.List; -import java.util.Set; - -public class BiomeMap { - - private BiMap biomeMap; - private BiMap regionMap; - private IrisDimension dimension; - - private Set activeBiomes = new HashSet<>(); - private Set activeRegions = new HashSet<>(); - - public BiomeMap(IrisDimension dimension) { - this.dimension = dimension; - - List biomes = dimension.getAllAnyBiomes(); - List regions = dimension.getAllAnyRegions(); - - biomeMap = HashBiMap.create(biomes.size()); - regionMap = HashBiMap.create(regions.size()); - - int nextID = 0; - - for (IrisBiome biome : biomes) { - biomeMap.putIfAbsent(biome, nextID); - activeBiomes.add(nextID); - nextID++; - } - - nextID = 0; - - for (IrisRegion region : regions) { - regionMap.putIfAbsent(region, nextID); - activeRegions.add(nextID); - nextID++; - } - } - - public IrisDimension getDimension() { - return dimension; - } - - public IrisBiome getBiome(int id) { - return biomeMap.inverse().get(id); - } - - public int getBiomeId(IrisBiome biome) { - return biomeMap.get(biome); - } - - public IrisRegion getRegion(int id) { - return regionMap.inverse().get(id); - } - - public int getRegionId(IrisRegion region) { - return regionMap.get(region); - } -} diff --git a/src/main/java/com/volmit/iris/map/MapVision.java b/src/main/java/com/volmit/iris/map/MapVision.java deleted file mode 100644 index 514d59262..000000000 --- a/src/main/java/com/volmit/iris/map/MapVision.java +++ /dev/null @@ -1,814 +0,0 @@ -package com.volmit.iris.map; - -import com.volmit.iris.Iris; -import com.volmit.iris.generator.IrisComplex; -import com.volmit.iris.object.IrisBiome; -import com.volmit.iris.object.IrisRegion; -import com.volmit.iris.scaffold.engine.Engine; -import com.volmit.iris.util.*; -import io.netty.util.internal.ConcurrentSet; -import org.jetbrains.annotations.NotNull; - -import javax.annotation.Nullable; -import javax.imageio.ImageIO; -import javax.swing.*; -import javax.swing.event.MouseInputListener; -import java.awt.*; -import java.awt.event.*; -import java.io.File; -import java.io.IOException; -import java.util.Collection; -import java.util.HashSet; -import java.util.Iterator; -import java.util.Set; -import java.util.concurrent.Executors; -import java.util.concurrent.ThreadFactory; -import java.util.concurrent.ThreadPoolExecutor; - -public class MapVision extends JPanel { - - private int threadId = 0; - - private static final int TILE_SIZE = 128; //Tile size in pixels - private static final int TILE_REALITY = 512; //How many blocks a tile is - private static final int TILE_SIZE_R = 7; //The number of bits to shift to get the pixel side - private static final int TILE_REALITY_R = 9; //The number of bits to shift to get the real size - - private static final int DEF_WIDTH = 1440; - private static final int DEF_HEIGHT = 820; - - - private final Engine engine; - private final IrisComplex complex; - private RenderType currentType = RenderType.BIOME; - - private int mouseX; //The current mouse coords - private int mouseY; - private double draggedOffsetX; //The amount the mouse has dragged the map - private double draggedOffsetY; - private int centerTileX; //The center tile in the screen - private int centerTileY; - private int offsetX; //Offset to draw tiles to - private int offsetY; - private int lastTileWidth; - - private boolean help = true; - private boolean helpIgnored = false; - private boolean shift = false; - private boolean alt = false; - - private boolean dirty = true; //Whether to repaint textures - private double scale = 1; - - private final KMap tiles = new KMap<>(); - - private final Set visibleTiles = new ConcurrentSet<>(); //Tiles that are visible on screen - private final Set halfDirtyTiles = new ConcurrentSet<>(); //Tiles that should be drawn next draw - - private short[][] spiral; //See #generateSpiral - // TODO, Why not use spiraler? - - private final Color overlay = new Color(80, 80, 80); - private final Font overlayFont = new Font("Arial", Font.BOLD, 16); - - private final RollingSequence roll = new RollingSequence(50); - - private boolean debug = false; - private final int[] debugBorder = new int[]{-5, -3, 6, 4}; - - private boolean recalculating; - - // IrisComplex is the main class I need for a biome map. You can make one from an Engine object, - // which does need a FakeWorld object in it for the seed - public MapVision(Engine ee) { - this.engine = ee; - this.complex = engine.getFramework().getComplex(); - this.setBackground(Color.BLACK); - this.setVisible(true); - roll.put(1); - generateSpiral(64); - J.a(() -> { - J.sleep(10000); - - if (!helpIgnored && help) { - help = false; - dirty = true; - } - }); - - addMouseWheelListener((mouseWheelEvent) -> { - double oldScale = this.scale; - this.scale = Math.min(4, Math.max(scale + scale * mouseWheelEvent.getWheelRotation() * 0.2, 1)); - double wx = getWidth() / 2; - double hy = getHeight() / 2; - double xScale = (mouseX - wx) / wx; - double yScale = (mouseY - hy) / hy; - - /*if (mouseWheelEvent.getWheelRotation() > 0) { //Only on zoom in, adjust the position to zoom into - this.draggedOffsetX += xScale * (wx) * (oldScale - scale); - this.draggedOffsetY += yScale * (hy) * (oldScale - scale); - }*/ - - dirty = true; - repaint(); - softRecalculate(); - }); - addMouseListener(new MouseInputListener() { - @Override - public void mouseClicked(MouseEvent e) { - if(shift) - { - teleport(); - } - - else if (alt) - { - vscode(); - } - } - - @Override - public void mousePressed(MouseEvent e) { - - } - - @Override - public void mouseReleased(MouseEvent e) { - - } - - @Override - public void mouseEntered(MouseEvent e) { - - } - - @Override - public void mouseExited(MouseEvent e) { - - } - - @Override - public void mouseDragged(MouseEvent e) { - - } - - @Override - public void mouseMoved(MouseEvent e) { - - } - }); - addMouseMotionListener(new MouseMotionListener() { - @Override - public void mouseMoved(MouseEvent e) { - Point cp = e.getPoint(); - mouseX = cp.x; - mouseY = cp.y; - dirty = true; - } - - @Override - public void mouseDragged(MouseEvent e) { - Point cp = e.getPoint(); - draggedOffsetX -= (mouseX - cp.x) / scale; - draggedOffsetY -= (mouseY - cp.y) / scale; - mouseX = cp.x; - mouseY = cp.y; - softRecalculate(); - dirty = true; - } - }); - recalculate(); //Setup - - } - - private void vscode() { - int windowOffsetX = getWidth() / 2; - int windowOffsetY = getHeight() / 2; - int x = (int) ((mouseX - windowOffsetX) - (draggedOffsetX)) << 2; - int y = (int) ((mouseY - windowOffsetY) - (draggedOffsetY)) << 2; - switch (currentType) - { - case BIOME, HEIGHT -> { - try { - File f = complex.getTrueBiomeStream().get(x,y).getLoadFile(); - Desktop.getDesktop().open(f); - } catch (Throwable e) { - Iris.reportError(e); - } - } - case BIOME_LAND -> { - try { - File f = complex.getLandBiomeStream().get(x,y).getLoadFile(); - Desktop.getDesktop().open(f); - } catch (Throwable e) { - Iris.reportError(e); - } - } - case BIOME_SEA -> { - try { - File f = complex.getSeaBiomeStream().get(x,y).getLoadFile(); - Desktop.getDesktop().open(f); - } catch (Throwable e) { - Iris.reportError(e); - } - } - case REGION -> { - try { - File f = complex.getRegionStream().get(x,y).getLoadFile(); - Desktop.getDesktop().open(f); - } catch (Throwable e) { - Iris.reportError(e); - } - } - case CAVE_LAND -> { - try { - File f = complex.getCaveBiomeStream().get(x,y).getLoadFile(); - Desktop.getDesktop().open(f); - } catch (Throwable e) { - Iris.reportError(e); - } - } - } - } - - private void teleport() { - int windowOffsetX = getWidth() / 2; - int windowOffsetY = getHeight() / 2; - int x = (int) ((mouseX - windowOffsetX) - (draggedOffsetX)) << 2; - int y = (int) ((mouseY - windowOffsetY) - (draggedOffsetY)) << 2; - } - - public void redrawAll() { - } - - /** - * Open this GUI - */ - public void open() { - JFrame frame = new JFrame("Iris Map (" + complex.getData().getDataFolder().getName() + ")"); - frame.add(this); - frame.setSize(DEF_WIDTH, DEF_HEIGHT); - frame.setBackground(Color.BLACK); - frame.addComponentListener(new ComponentListener() { - - @Override - public void componentResized(ComponentEvent e) { - dirty = true; - softRecalculate(); - repaint(); - } - - @Override - public void componentMoved(ComponentEvent e) { - dirty = true; - repaint(); - } - - @Override - public void componentShown(ComponentEvent e) { - } - - @Override - public void componentHidden(ComponentEvent e) { - } - }); - frame.addKeyListener(new KeyListener() { - @Override - public void keyTyped(KeyEvent e) { - int currentMode = currentType.ordinal(); - - if (e.getKeyCode() == KeyEvent.VK_M) { - dirty = true; - currentType = RenderType.values()[(currentMode+1) % RenderType.values().length]; - forceRecalculate(); - return; - } - - for(RenderType i : RenderType.values()) - { - if (e.getKeyChar() == String.valueOf(i.ordinal()).charAt(0)) { - if(i.ordinal() != currentMode) - { - dirty = true; - currentType = i; - forceRecalculate(); - return; - } - } - } - - if (e.getKeyCode() == KeyEvent.VK_R) { - dirty = true; - forceRecalculate(); - return; - } - - if (e.getKeyCode() == KeyEvent.VK_EQUALS) { - double oldScale = MapVision.this.scale; - MapVision.this.scale = Math.min(4, Math.max(scale - 0.2, 1)); - double wx = getWidth() / 2; - double hy = getHeight() / 2; - double xScale = (mouseX - wx) / wx; - double yScale = (mouseY - hy) / hy; - dirty = true; - repaint(); - softRecalculate(); - return; - } - if (e.getKeyCode() == KeyEvent.VK_MINUS) { - double oldScale = MapVision.this.scale; - MapVision.this.scale = Math.min(4, Math.max(scale + 0.2, 1)); - double wx = getWidth() / 2; - double hy = getHeight() / 2; - double xScale = (mouseX - wx) / wx; - double yScale = (mouseY - hy) / hy; - dirty = true; - repaint(); - softRecalculate(); - return; - } - } - - @Override - public void keyPressed(KeyEvent e) { - if (e.getKeyCode() == KeyEvent.VK_SHIFT) { - shift = true; - dirty = true; - } else if (e.getKeyCode() == KeyEvent.VK_SEMICOLON) { - dirty = true; - debug = true; - } else if (e.getKeyCode() == KeyEvent.VK_SLASH) { - help = true; - helpIgnored = true; - dirty = true; - }else if (e.getKeyCode() == KeyEvent.VK_ALT) { - alt = true; - dirty = true; - } - } - - @Override - public void keyReleased(KeyEvent e) { - - if (e.getKeyCode() == KeyEvent.VK_SEMICOLON) { - debug = false; - dirty = true; - } else if (e.getKeyCode() == KeyEvent.VK_SHIFT) { - shift = false; - dirty = true; - } else if (e.getKeyCode() == KeyEvent.VK_SLASH) { - help = false; - helpIgnored = true; - dirty = true; - }else if (e.getKeyCode() == KeyEvent.VK_ALT) { - alt = false; - dirty = true; - } - } - }); - File file = Iris.getCached("Iris Icon", "https://raw.githubusercontent.com/VolmitSoftware/Iris/master/icon.png"); - - if (file != null) { - try { - frame.setIconImage(ImageIO.read(file)); - } catch (IOException ignored) { - } - } - - frame.setVisible(true); - frame.requestFocus(); - frame.toFront(); - frame.addFocusListener(new FocusListener() { - - @Override - public void focusGained(FocusEvent e) { - dirty = true; - } - - @Override - public void focusLost(FocusEvent e) { - - } - }); - } - - @Override - public void paint(Graphics gx) { - //super.paint(gx); - PrecisionStopwatch stopwatch = PrecisionStopwatch.start(); - - int windowOffsetX = getWidth() / 2; - int windowOffsetY = getHeight() / 2; - - offsetX = (int) Math.round(draggedOffsetX * scale) + windowOffsetX; - offsetY = (int) Math.round(draggedOffsetY * scale) + windowOffsetY; - - //If we should do a full repaint of the entire frame. Only done when the zoom level changes, etc - if (dirty) { - super.paint(gx); //Clear the frame first - for (Iterator iterator = visibleTiles.iterator(); iterator.hasNext(); ) { - Tile tile = iterator.next(); - drawTile(gx, tile); - } - dirty = false; - } else { - //Loop through all the tiles that haven't been drawn last draw and draw them - //This saves us having to do a FULL redraw when only 1 new tile has been added - for (Iterator iterator = halfDirtyTiles.iterator(); iterator.hasNext(); ) { - Tile tile = iterator.next(); - drawTile(gx, tile); - iterator.remove(); - } - } - - gx.setColor(overlay); - gx.fillRect(getWidth() - 400, 4, 396, 27 + (20 * (shift ? 2 : 1))); - gx.setColor(Color.WHITE); - //int x = (int) (((int) ((mouseX - windowOffsetX)) << 2) + (draggedOffsetX * scale)); - //int y = (int) (((int) ((mouseY - windowOffsetY)) << 2) + (draggedOffsetY * scale)); - int x = (int) ((mouseX - windowOffsetX) - (draggedOffsetX)) << 2; - int y = (int) ((mouseY - windowOffsetY) - (draggedOffsetY)) << 2; - - gx.setFont(overlayFont); - IrisBiome biome = complex.getLandBiomeStream().get(x, y); - int gg = 23; - gx.drawString(biome.getName().toUpperCase() + " [" + x + ", " + y + "]", getWidth() - 400 + 6, gg += 20); - - if (shift) { - IrisRegion region = complex.getRegionStream().get(x, y); - gx.drawString("Region: " + region.getName(), getWidth() - 400 + 6, gg += 20); - } - - - if (help) { - gx.setColor(overlay); - gx.fillRect(10, 10, 470, 25 + (20 * (7 + (RenderType.values().length)))); - gx.setColor(Color.WHITE); - int ggx = 25; - - gx.drawString("/ to show this help screen", 20, ggx += 20); - gx.drawString("R to repaint the screen", 20, ggx += 20); - gx.drawString("+/- to Change Zoom", 20, ggx += 20); - gx.drawString("M to cycle render modes", 20, ggx += 20); - - int ff = 0; - for (RenderType i : RenderType.values()) { - ff++; - gx.drawString(ff + " to view " + Form.capitalizeWords(i.name().toLowerCase().replaceAll("\\Q_\\E", " ")), 20, ggx += 20); - } - - gx.drawString("Shift for additional biome details (at cursor)", 20, ggx += 20); - gx.drawString("Shift + Click to teleport to location", 20, ggx += 20); - gx.drawString("Alt + Click to open biome in VSCode", 20, ggx += 20); - } else if (debug) { - gx.setColor(Color.RED); - int xx = (int) Math.round((debugBorder[0] << TILE_SIZE_R) / scale + offsetX); - int yy = (int) Math.round((debugBorder[1] << TILE_SIZE_R) / scale + offsetY); - int xx2 = (int) Math.round((debugBorder[2] << TILE_SIZE_R) / scale + offsetX); - int yy2 = (int) Math.round((debugBorder[3] << TILE_SIZE_R) / scale + offsetY); - gx.drawRect(xx, yy, xx2, yy2); - gx.drawRect(xx - 1, yy - 1, xx2 + 1, yy2 + 1); - gx.drawRect(xx - 2, yy - 2, xx2 + 2, yy2 + 2); - - - gx.setColor(overlay); - gx.fillRect(10, 10, 220, 200); - gx.setColor(Color.WHITE); - gx.drawString("Center [" + centerTileX + ", " + centerTileY + "]", 20, 25); - gx.drawString((60 / (Math.max(roll.getAverage(), 1))) + " fps", 20, 45); - gx.drawString("Width = " + lastTileWidth, 20, 65); - gx.drawString("Dirty = " + dirty, 20, 85); - gx.drawString("Scale = " + scale, 20, 105); - gx.drawString("Tiles (Visible)" + visibleTiles.size(), 20, 125); - gx.drawString("Tiles (Total) " + tiles.size(), 20, 145); - - x = (int) ((mouseX - windowOffsetX) + (-draggedOffsetX * scale)) >> TILE_SIZE_R; - y = (int) ((mouseY - windowOffsetY) + (-draggedOffsetY * scale)) >> TILE_SIZE_R; - Tile t = getTile((short) x, (short) y); - boolean b1 = t != null; - boolean b2 = b1 && visibleTiles.contains(t); - gx.drawString("Cursor Tile [" + x + ", " + y + "]", 20, 165); - gx.drawString("Tile Details [" + String.valueOf(b1).toUpperCase() + ", " + String.valueOf(b2).toUpperCase() + "]", 20, 185); - - } - - stopwatch.end(); - roll.put(stopwatch.getMillis()); - - /*J.a(() -> - { - J.sleep(1000 / targetFPS); - repaint(); - });*/ - J.a(sleepTask); - } - - public void drawTile(Graphics gx, Tile tile) { - if (gx == null) return; - - int x = (int) Math.floor((tile.getX() << TILE_SIZE_R) / scale + offsetX); - int y = (int) Math.floor((tile.getY() << TILE_SIZE_R) / scale + offsetY); - - int size = (int) (TILE_SIZE / scale); - int off = (int) Math.round((TILE_SIZE % scale)); - gx.drawImage(tile.getImage(), x, y, size + off, size + off, null); - } - - private final Runnable sleepTask = () -> { - double t = Math.max(Math.min(roll.getAverage(), 100), 5); - J.sleep((long) t); - repaint(); - }; - - /** - * Check if we should do a full recalculation of what tiles should be visible - */ - public void softRecalculate() { - short x = (short) (((-draggedOffsetX * scale)) / TILE_SIZE * scale); - short y = (short) (((-draggedOffsetY * scale)) / TILE_SIZE * scale); - int xTiles = (((int) (getWidth() * scale) >> TILE_SIZE_R)) / 2 + 1; - - if (centerTileX != x || centerTileY != y || xTiles != lastTileWidth) { - recalculate(); - } - - centerTileX = x; - centerTileY = y; - } - - public void forceRecalculate() - { - dirty = true; - tiles.clear(); - } - - /** - * Recalculate what tiles should be visible on screen, as well as queue - * new tiles to be created - */ - public void recalculate() { - PrecisionStopwatch stopwatch = PrecisionStopwatch.start(); - - //Clears out the queue of existing tiles to do because we are redoing them anyway - //If we don't do this, the queue gets so clogged that it literally takes up the - //entire CPU with thread locking/unlocking - executorService.getQueue().clear(); - - int W = getWidth(); - int H = getHeight(); - - if (W == 0 || H == 0) { //The window hasn't fully opened yet; assume defaults - W = DEF_WIDTH; - H = DEF_HEIGHT; - } - - short centerTileX = (short) (((-draggedOffsetX * scale)) / TILE_SIZE * scale); - short centerTileY = (short) (((-draggedOffsetY * scale)) / TILE_SIZE * scale); - - //Iris.info("Center is " + centerTileX + ", " + centerTileY); - //Iris.info("Width is " + W + ", " + H); - - int woh = Math.max(W, H); - int newSize = ((int) (woh * scale) >> TILE_SIZE_R) + 1; - int checkSizeX = (((int) (W * scale) >> TILE_SIZE_R)) / 2; - int checkSizeY = (((int) (H * scale) >> TILE_SIZE_R)) / 2; - lastTileWidth = checkSizeX; - generateSpiral(newSize); - - Set toRemove = new HashSet(visibleTiles); //Clone the visible tiles - - if (debug) { //These are the 4 corners of the red line that shows the visibility check region for tiles - debugBorder[0] = -checkSizeX + centerTileX - 1; - debugBorder[1] = -checkSizeY + centerTileY - 1; - debugBorder[2] = checkSizeX + centerTileX; - debugBorder[3] = checkSizeY + centerTileY; - } - - for (short[] coords : spiral) { //Start from the center of the spiral and work outwards to find new tiles to queue - short x = (short) (coords[0] + centerTileX); - short y = (short) (coords[1] + centerTileY); - - //When it goes offscreen, don't queue the tile by continuing - if (x > checkSizeX + centerTileX || x < -checkSizeX + centerTileX - 1) { - continue; - } - if (y > checkSizeY + centerTileY || y < -checkSizeY + centerTileY - 1) { - continue; - } - - int id = getTileId(x, y); - - //If the tile is not already made - if (!tiles.containsKey(id)) { - short[] c = getTileCoords(id); - queue(c[0], c[1]); //Queue for creation - } else { - Tile t = tiles.get(id); - toRemove.remove(t); //Make sure this tile isn't removed - - visibleTiles.add(t); //Make sure it's visible again if it isn't - } - } - - queueForRemoval(toRemove); //Queue all tiles not on screen for removal - - stopwatch.end(); - roll.put(stopwatch.getMillis()); - } - - /** - * Queue a tile for creation - * - * @param tileX X tile coord - * @param tileY Y tile coord - */ - public void queue(short tileX, short tileY) { - //If the tile still exists but just isn't visible - int id = getTileId(tileX, tileY); - if (tiles.containsKey(id)) { - Tile tile = tiles.get(id); - if (visibleTiles.contains(tile)) return; - - visibleTiles.add(tile); - halfDirtyTiles.add(tile); //Re-render it without doing a full repaint - //dirty = true; - return; - } - - //I turned all lambda around here into objects just to see if they would - //show up in timings instead of "$lambda". But they didn't. So it's not - //not my code DIRECTLY. I believe the thing timings show is just to do - //with threads stopping and starting/halting in the thread pool. Don't - //know why or how to fix it, though - - /*executorService.execute(() -> { - Tile tile = new Tile(tileX, tileY); - tile.render(complex, currentType); - tiles.put(getTileId(tileX, tileY), tile); - visibleTiles.add(tile); - dirty = true; - });*/ - executorService.execute(queueTask(tileX, tileY)); - - } - - public Runnable queueTask(short tileX, short tileY) { - return new Runnable() { - @Override - public void run() { - Tile tile = new Tile(tileX, tileY); - tile.render(engine, currentType); - tiles.put(getTileId(tileX, tileY), tile); - visibleTiles.add(tile); - //dirty = true; //Disabled marking as dirty so a redraw of the entire map isn't needed - halfDirtyTiles.add(tile); - } - }; - } - - /** - * Pend tiles for removal from the screen - */ - public void queueForRemoval(Collection tile) { - J.a(() -> { - for (Tile t : tile) { - if (t != null) { - visibleTiles.remove(t); - } - } - }, 20); - - //TODO Change from using the async task system as it may be putting strain on the server from being called so often - - J.a(() -> { //Remove it completely from memory after 5 seconds if it's still not visible - for (Tile t : tile) { - if (t != null && !visibleTiles.contains(t)) { - tiles.remove(t); - } - } - - }, 20 * 6); - } - - /** - * Get a tile based on the X and Z coords of the tile - * - * @param tileX X Coord - * @param tileY Y Coord - * @return - */ - @Nullable - public Tile getTile(short tileX, short tileY) { - return tiles.get(getTileId(tileX, tileY)); - } - - /** - * Get an integer that represents a tile's location - * - * @param tileX X Coord - * @param tileY Y Coord - * @return - */ - public int getTileId(short tileX, short tileY) { - return (tileX << 16) | (tileY & 0xFFFF); - } - - /** - * Converts an integer representing a tiles location back into 2 shorts - * - * @param id The tile integer - * @return - */ - public short[] getTileCoords(int id) { - return new short[]{(short) (id >> 16), (short) id}; - } - - /** - * Generates a 2D array of relative tile locations. This is so we know what order - * to search for new tiles in a nice, spiral way - * - * @param size Size of the array - */ - public void generateSpiral(int size) { - if (size % 2 == 0) size++; - short[][] newSpiral = new short[size * size][2]; - - int x = 0; // current position; x - int y = 0; // current position; y - int d = 0; // current direction; 0=RIGHT, 1=DOWN, 2=LEFT, 3=UP - int s = 1; // chain size - int c = 0; // count - - // starting point - x = ((int) (size / 2.0)) - 1; - y = ((int) (size / 2.0)) - 1; - int offset = (size / 2) - 1; - - for (int k = 1; k <= (size - 1); k++) { - for (int j = 0; j < (k < (size - 1) ? 2 : 3); j++) { - for (int i = 0; i < s; i++) { - short[] coords = {(short) (x - offset), (short) (y - offset)}; - newSpiral[c] = coords; - c++; - //Iris.info("Spiral " + coords[0] + ", " + coords[1]); //Testing - - switch (d) { - case 0: - y = y + 1; - break; - case 1: - x = x + 1; - break; - case 2: - y = y - 1; - break; - case 3: - x = x - 1; - break; - } - } - d = (d + 1) % 4; - } - s = s + 1; - } - - spiral = newSpiral; - } - - /*private final ExecutorService executorService = Executors.newFixedThreadPool(8, r -> { - threadId++; - Thread t = new Thread(r); - t.setName("Iris Map Renderer " + threadId); - t.setPriority(Thread.MIN_PRIORITY); - t.setUncaughtExceptionHandler((et, e) -> - { - Iris.info("Exception encountered in " + et.getName()); - e.printStackTrace(); - }); - - return t; - });*/ - - private final ThreadFactory factory = new ThreadFactory() { - @Override - public Thread newThread(@NotNull Runnable r) { - threadId++; - Thread t = new Thread(r); - t.setName("Iris Map Renderer " + threadId); - t.setPriority(4); - t.setDaemon(true); - t.setUncaughtExceptionHandler((et, e) -> - { - Iris.info("Exception encountered in " + et.getName()); - e.printStackTrace(); - }); - - return t; - } - }; - - //Our thread pool that draws the tiles for us - private final ThreadPoolExecutor executorService = (ThreadPoolExecutor) Executors.newFixedThreadPool(3, factory); - - -} diff --git a/src/main/java/com/volmit/iris/map/RenderType.java b/src/main/java/com/volmit/iris/map/RenderType.java deleted file mode 100644 index 05dd3a83c..000000000 --- a/src/main/java/com/volmit/iris/map/RenderType.java +++ /dev/null @@ -1,5 +0,0 @@ -package com.volmit.iris.map; - -public enum RenderType { - BIOME, BIOME_LAND, BIOME_SEA, REGION, CAVE_LAND, HEIGHT, OBJECT_LOAD, DECORATOR_LOAD, LAYER_LOAD -} diff --git a/src/main/java/com/volmit/iris/map/Tile.java b/src/main/java/com/volmit/iris/map/Tile.java deleted file mode 100644 index 489387213..000000000 --- a/src/main/java/com/volmit/iris/map/Tile.java +++ /dev/null @@ -1,85 +0,0 @@ -package com.volmit.iris.map; - -import com.volmit.iris.generator.IrisComplex; -import com.volmit.iris.object.IrisBiome; -import com.volmit.iris.object.IrisRegion; -import com.volmit.iris.scaffold.engine.Engine; -import com.volmit.iris.scaffold.stream.ProceduralStream; -import lombok.Getter; -import lombok.Setter; - -import java.awt.Color; -import java.awt.image.BufferedImage; -import java.util.Set; -import java.util.function.BiFunction; - -public class Tile { - - @Getter - private short x; - @Getter - private short y; - - @Getter - private BufferedImage image; - - private Set biomes; - private Set regions; - - - - @Getter - @Setter - private boolean dirty; - - @Getter - private boolean rendering; - - public Tile(short x, short y) { - this.x = x; - this.y = y; - } - - public boolean hasBiome(int biome) { - return biomes.contains(biome); - } - - public boolean hasRegion(int region) { - return regions.contains(region); - } - - /** - * Render the tile - * @param type The type of render - * @return True when rendered - */ - public boolean render(Engine engine, RenderType type) { - BufferedImage newImage = new BufferedImage(128, 128, BufferedImage.TYPE_INT_RGB); - BiFunction colorFunction = (integer, integer2) -> Color.black.getRGB(); - - switch (type) { - case BIOME, DECORATOR_LOAD, OBJECT_LOAD, LAYER_LOAD -> colorFunction = (x, z) -> engine.getFramework().getComplex().getTrueBiomeStream().get(x, z).getColor(engine, type).getRGB(); - case BIOME_LAND -> colorFunction = (x, z) -> engine.getFramework().getComplex().getLandBiomeStream().get(x, z).getColor(engine, type).getRGB(); - case BIOME_SEA -> colorFunction = (x, z) -> engine.getFramework().getComplex().getSeaBiomeStream().get(x, z).getColor(engine, type).getRGB(); - case REGION -> colorFunction = (x, z) -> engine.getFramework().getComplex().getRegionStream().get(x, z).getColor(engine.getFramework().getComplex(), type).getRGB(); - case CAVE_LAND -> colorFunction = (x, z) -> engine.getFramework().getComplex().getCaveBiomeStream().get(x, z).getColor(engine, type).getRGB(); - case HEIGHT -> colorFunction = (x, z) -> Color.getHSBColor(engine.getFramework().getComplex().getHeightStream().get(x, z).floatValue(), 100, 100).getRGB(); - } - - for (int i = 0; i < 128; i++) { - for (int j = 0; j < 128; j++) { - newImage.setRGB(i, j, colorFunction.apply(translate(x, i), translate(y, j))); - } - } - image = newImage; - rendering = false; - dirty = false; - return true; - } - - public static int translate(int section, int pixel) { - return (section << 9) | (pixel << 2) | 2; - } - - -} diff --git a/src/main/java/com/volmit/iris/util/AxisAlignedBB.java b/src/main/java/com/volmit/iris/util/AxisAlignedBB.java index 8a8522d6f..de7fcec32 100644 --- a/src/main/java/com/volmit/iris/util/AxisAlignedBB.java +++ b/src/main/java/com/volmit/iris/util/AxisAlignedBB.java @@ -18,7 +18,7 @@ package com.volmit.iris.util; -import com.volmit.iris.object.IrisPosition; +import com.volmit.iris.engine.object.IrisPosition; import org.bukkit.World; import org.bukkit.util.BlockVector; diff --git a/src/main/java/com/volmit/iris/util/BiomeMap.java b/src/main/java/com/volmit/iris/util/BiomeMap.java index a8c73082c..694d1b9ac 100644 --- a/src/main/java/com/volmit/iris/util/BiomeMap.java +++ b/src/main/java/com/volmit/iris/util/BiomeMap.java @@ -18,7 +18,7 @@ package com.volmit.iris.util; -import com.volmit.iris.object.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/FakeEngine.java b/src/main/java/com/volmit/iris/util/FakeEngine.java index 96d26a55c..5c3291bbe 100644 --- a/src/main/java/com/volmit/iris/util/FakeEngine.java +++ b/src/main/java/com/volmit/iris/util/FakeEngine.java @@ -1,17 +1,16 @@ package com.volmit.iris.util; -import com.volmit.iris.generator.IrisEngineFramework; -import com.volmit.iris.manager.IrisDataManager; -import com.volmit.iris.object.*; -import com.volmit.iris.scaffold.engine.Engine; -import com.volmit.iris.scaffold.engine.EngineCompound; -import com.volmit.iris.scaffold.engine.EngineEffects; -import com.volmit.iris.scaffold.engine.EngineFramework; -import com.volmit.iris.scaffold.engine.EngineMetrics; -import com.volmit.iris.scaffold.engine.EngineTarget; -import com.volmit.iris.scaffold.engine.EngineWorldManager; -import com.volmit.iris.scaffold.hunk.Hunk; -import com.volmit.iris.util.FakeWorld; +import com.volmit.iris.engine.IrisEngineFramework; +import com.volmit.iris.core.IrisDataManager; +import com.volmit.iris.engine.object.*; +import com.volmit.iris.engine.framework.Engine; +import com.volmit.iris.engine.framework.EngineCompound; +import com.volmit.iris.engine.framework.EngineEffects; +import com.volmit.iris.engine.framework.EngineFramework; +import com.volmit.iris.engine.framework.EngineMetrics; +import com.volmit.iris.engine.framework.EngineTarget; +import com.volmit.iris.engine.framework.EngineWorldManager; +import com.volmit.iris.engine.hunk.Hunk; import lombok.Getter; import org.bukkit.World; import org.bukkit.block.Biome; diff --git a/src/main/java/com/volmit/iris/util/IObjectPlacer.java b/src/main/java/com/volmit/iris/util/IObjectPlacer.java index 2e15fd206..1972a8683 100644 --- a/src/main/java/com/volmit/iris/util/IObjectPlacer.java +++ b/src/main/java/com/volmit/iris/util/IObjectPlacer.java @@ -18,7 +18,7 @@ package com.volmit.iris.util; -import com.volmit.iris.object.tile.TileData; +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/util/IrisInterpolation.java b/src/main/java/com/volmit/iris/util/IrisInterpolation.java index 6dc9af108..63d40e07a 100644 --- a/src/main/java/com/volmit/iris/util/IrisInterpolation.java +++ b/src/main/java/com/volmit/iris/util/IrisInterpolation.java @@ -19,9 +19,9 @@ package com.volmit.iris.util; import com.google.common.util.concurrent.AtomicDouble; -import com.volmit.iris.generator.noise.CNG; -import com.volmit.iris.object.InterpolationMethod; -import com.volmit.iris.object.NoiseStyle; +import com.volmit.iris.engine.noise.CNG; +import com.volmit.iris.engine.object.InterpolationMethod; +import com.volmit.iris.engine.object.NoiseStyle; public class IrisInterpolation { public static double bezier(double t) { diff --git a/src/main/java/com/volmit/iris/util/LinkedTerrainChunk.java b/src/main/java/com/volmit/iris/util/LinkedTerrainChunk.java index 5e9ea848a..4444db824 100644 --- a/src/main/java/com/volmit/iris/util/LinkedTerrainChunk.java +++ b/src/main/java/com/volmit/iris/util/LinkedTerrainChunk.java @@ -19,8 +19,8 @@ package com.volmit.iris.util; import com.volmit.iris.Iris; -import com.volmit.iris.nms.BiomeBaseInjector; -import com.volmit.iris.nms.INMS; +import com.volmit.iris.core.nms.BiomeBaseInjector; +import com.volmit.iris.core.nms.INMS; import org.bukkit.Bukkit; import org.bukkit.Material; import org.bukkit.block.Biome; diff --git a/src/main/java/com/volmit/iris/util/MortarCommand.java b/src/main/java/com/volmit/iris/util/MortarCommand.java index a94e50d61..d921c203a 100644 --- a/src/main/java/com/volmit/iris/util/MortarCommand.java +++ b/src/main/java/com/volmit/iris/util/MortarCommand.java @@ -19,7 +19,7 @@ package com.volmit.iris.util; import com.volmit.iris.Iris; -import com.volmit.iris.IrisSettings; +import com.volmit.iris.core.IrisSettings; import org.bukkit.Sound; import java.lang.reflect.Field; diff --git a/src/main/java/com/volmit/iris/util/ObjectResourceLoader.java b/src/main/java/com/volmit/iris/util/ObjectResourceLoader.java index a10aa7eea..e7ed86e31 100644 --- a/src/main/java/com/volmit/iris/util/ObjectResourceLoader.java +++ b/src/main/java/com/volmit/iris/util/ObjectResourceLoader.java @@ -19,8 +19,8 @@ package com.volmit.iris.util; import com.volmit.iris.Iris; -import com.volmit.iris.manager.IrisDataManager; -import com.volmit.iris.object.IrisObject; +import com.volmit.iris.core.IrisDataManager; +import com.volmit.iris.engine.object.IrisObject; import java.io.File; import java.util.concurrent.atomic.AtomicInteger; diff --git a/src/main/java/com/volmit/iris/util/ResourceLoader.java b/src/main/java/com/volmit/iris/util/ResourceLoader.java index 71b76140c..8b2ba48e6 100644 --- a/src/main/java/com/volmit/iris/util/ResourceLoader.java +++ b/src/main/java/com/volmit/iris/util/ResourceLoader.java @@ -20,8 +20,8 @@ package com.volmit.iris.util; import com.google.gson.Gson; import com.volmit.iris.Iris; -import com.volmit.iris.manager.IrisDataManager; -import com.volmit.iris.object.IrisRegistrant; +import com.volmit.iris.core.IrisDataManager; +import com.volmit.iris.engine.object.IrisRegistrant; import lombok.Data; import java.io.File; diff --git a/src/main/java/com/volmit/iris/util/SKConversion.java b/src/main/java/com/volmit/iris/util/SKConversion.java index 46b16a3f1..d4ca9ac27 100644 --- a/src/main/java/com/volmit/iris/util/SKConversion.java +++ b/src/main/java/com/volmit/iris/util/SKConversion.java @@ -25,7 +25,7 @@ import com.sk89q.worldedit.extent.clipboard.io.ClipboardFormats; import com.sk89q.worldedit.extent.clipboard.io.ClipboardReader; import com.sk89q.worldedit.math.BlockVector3; import com.volmit.iris.Iris; -import com.volmit.iris.object.IrisObject; +import com.volmit.iris.engine.object.IrisObject; import java.io.File; import java.io.FileInputStream; diff --git a/src/main/java/com/volmit/iris/util/TerrainChunk.java b/src/main/java/com/volmit/iris/util/TerrainChunk.java index 038ccab9d..ad29f792e 100644 --- a/src/main/java/com/volmit/iris/util/TerrainChunk.java +++ b/src/main/java/com/volmit/iris/util/TerrainChunk.java @@ -18,7 +18,7 @@ package com.volmit.iris.util; -import com.volmit.iris.nms.BiomeBaseInjector; +import com.volmit.iris.core.nms.BiomeBaseInjector; import org.bukkit.World; import org.bukkit.block.Biome; import org.bukkit.block.data.BlockData; diff --git a/src/main/java/com/volmit/iris/util/VirtualCommand.java b/src/main/java/com/volmit/iris/util/VirtualCommand.java index cff08f4e6..8abcb62e9 100644 --- a/src/main/java/com/volmit/iris/util/VirtualCommand.java +++ b/src/main/java/com/volmit/iris/util/VirtualCommand.java @@ -19,7 +19,7 @@ package com.volmit.iris.util; import com.volmit.iris.Iris; -import com.volmit.iris.IrisSettings; +import com.volmit.iris.core.IrisSettings; import org.bukkit.Bukkit; import org.bukkit.Sound; import org.bukkit.command.CommandSender;