From 649b1adfddf96a89f446265d3b58ffb8cd10ed73 Mon Sep 17 00:00:00 2001 From: Daniel Mills Date: Mon, 2 Aug 2021 01:12:13 -0400 Subject: [PATCH] Move project related code in their own package --- src/main/java/com/volmit/iris/core/ProjectManager.java | 1 + .../iris/core/command/studio/CommandIrisStudioProfile.java | 2 +- .../iris/core/command/studio/CommandIrisStudioUpdate.java | 2 +- .../java/com/volmit/iris/core/{ => project}/IrisProject.java | 4 +++- .../com/volmit/iris/core/{ => project}/SchemaBuilder.java | 3 ++- 5 files changed, 8 insertions(+), 4 deletions(-) rename src/main/java/com/volmit/iris/core/{ => project}/IrisProject.java (99%) rename src/main/java/com/volmit/iris/core/{ => project}/SchemaBuilder.java (99%) diff --git a/src/main/java/com/volmit/iris/core/ProjectManager.java b/src/main/java/com/volmit/iris/core/ProjectManager.java index 371099b2b..cf4006a95 100644 --- a/src/main/java/com/volmit/iris/core/ProjectManager.java +++ b/src/main/java/com/volmit/iris/core/ProjectManager.java @@ -21,6 +21,7 @@ package com.volmit.iris.core; import com.google.gson.Gson; import com.google.gson.JsonSyntaxException; import com.volmit.iris.Iris; +import com.volmit.iris.core.project.IrisProject; import com.volmit.iris.engine.cache.AtomicCache; import com.volmit.iris.engine.object.IrisDimension; import com.volmit.iris.util.collection.KMap; diff --git a/src/main/java/com/volmit/iris/core/command/studio/CommandIrisStudioProfile.java b/src/main/java/com/volmit/iris/core/command/studio/CommandIrisStudioProfile.java index a312f473f..b80495d4b 100644 --- a/src/main/java/com/volmit/iris/core/command/studio/CommandIrisStudioProfile.java +++ b/src/main/java/com/volmit/iris/core/command/studio/CommandIrisStudioProfile.java @@ -20,7 +20,7 @@ package com.volmit.iris.core.command.studio; import com.volmit.iris.Iris; import com.volmit.iris.core.IrisDataManager; -import com.volmit.iris.core.IrisProject; +import com.volmit.iris.core.project.IrisProject; import com.volmit.iris.core.IrisSettings; import com.volmit.iris.engine.interpolation.InterpolationMethod; import com.volmit.iris.engine.noise.CNG; diff --git a/src/main/java/com/volmit/iris/core/command/studio/CommandIrisStudioUpdate.java b/src/main/java/com/volmit/iris/core/command/studio/CommandIrisStudioUpdate.java index 1b443239e..e8064a6db 100644 --- a/src/main/java/com/volmit/iris/core/command/studio/CommandIrisStudioUpdate.java +++ b/src/main/java/com/volmit/iris/core/command/studio/CommandIrisStudioUpdate.java @@ -19,7 +19,7 @@ package com.volmit.iris.core.command.studio; import com.volmit.iris.Iris; -import com.volmit.iris.core.IrisProject; +import com.volmit.iris.core.project.IrisProject; import com.volmit.iris.core.IrisSettings; import com.volmit.iris.util.collection.KList; import com.volmit.iris.util.plugin.MortarCommand; diff --git a/src/main/java/com/volmit/iris/core/IrisProject.java b/src/main/java/com/volmit/iris/core/project/IrisProject.java similarity index 99% rename from src/main/java/com/volmit/iris/core/IrisProject.java rename to src/main/java/com/volmit/iris/core/project/IrisProject.java index 0e839a3aa..a437963a5 100644 --- a/src/main/java/com/volmit/iris/core/IrisProject.java +++ b/src/main/java/com/volmit/iris/core/project/IrisProject.java @@ -16,10 +16,12 @@ * along with this program. If not, see . */ -package com.volmit.iris.core; +package com.volmit.iris.core.project; import com.google.gson.Gson; import com.volmit.iris.Iris; +import com.volmit.iris.core.IrisDataManager; +import com.volmit.iris.core.IrisSettings; import com.volmit.iris.core.nms.INMS; import com.volmit.iris.core.report.Report; import com.volmit.iris.core.report.ReportType; diff --git a/src/main/java/com/volmit/iris/core/SchemaBuilder.java b/src/main/java/com/volmit/iris/core/project/SchemaBuilder.java similarity index 99% rename from src/main/java/com/volmit/iris/core/SchemaBuilder.java rename to src/main/java/com/volmit/iris/core/project/SchemaBuilder.java index 8af660933..1fca843ea 100644 --- a/src/main/java/com/volmit/iris/core/SchemaBuilder.java +++ b/src/main/java/com/volmit/iris/core/project/SchemaBuilder.java @@ -16,9 +16,10 @@ * along with this program. If not, see . */ -package com.volmit.iris.core; +package com.volmit.iris.core.project; import com.volmit.iris.Iris; +import com.volmit.iris.core.IrisDataManager; import com.volmit.iris.engine.data.B; import com.volmit.iris.engine.object.annotations.*; import com.volmit.iris.util.collection.KList;