From a9d2d52c1e84ee2cf23e6eca39cbb3103b27e060 Mon Sep 17 00:00:00 2001
From: CocoTheOwner <sjoerdvdgoor02@gmail.com>
Date: Mon, 16 Aug 2021 11:57:34 +0200
Subject: [PATCH] Move context handlers to separate folder because of
 jarscanner issue

---
 .../com/volmit/iris/util/decree/DecreeContextHandler.java     | 2 +-
 .../decree/{handlers => }/context/BiomeContextHandler.java    | 3 +--
 .../{handlers => }/context/DimensionContextHandler.java       | 4 +---
 .../decree/{handlers => }/context/RegionContextHandler.java   | 3 +--
 .../decree/{handlers => }/context/WorldContextHandler.java    | 2 +-
 5 files changed, 5 insertions(+), 9 deletions(-)
 rename src/main/java/com/volmit/iris/util/decree/{handlers => }/context/BiomeContextHandler.java (86%)
 rename src/main/java/com/volmit/iris/util/decree/{handlers => }/context/DimensionContextHandler.java (87%)
 rename src/main/java/com/volmit/iris/util/decree/{handlers => }/context/RegionContextHandler.java (87%)
 rename src/main/java/com/volmit/iris/util/decree/{handlers => }/context/WorldContextHandler.java (87%)

diff --git a/src/main/java/com/volmit/iris/util/decree/DecreeContextHandler.java b/src/main/java/com/volmit/iris/util/decree/DecreeContextHandler.java
index 139a9ceca..db325eabc 100644
--- a/src/main/java/com/volmit/iris/util/decree/DecreeContextHandler.java
+++ b/src/main/java/com/volmit/iris/util/decree/DecreeContextHandler.java
@@ -12,7 +12,7 @@ public interface DecreeContextHandler<T> {
 
         try
         {
-            Iris.initialize("com.volmit.iris.util.decree.handlers.context").forEach((i)
+            Iris.initialize("com.volmit.iris.util.decree.context").forEach((i)
                     -> contextHandlers.put(((DecreeContextHandler<?>)i).getType(), (DecreeContextHandler<?>)i));
         }
 
diff --git a/src/main/java/com/volmit/iris/util/decree/handlers/context/BiomeContextHandler.java b/src/main/java/com/volmit/iris/util/decree/context/BiomeContextHandler.java
similarity index 86%
rename from src/main/java/com/volmit/iris/util/decree/handlers/context/BiomeContextHandler.java
rename to src/main/java/com/volmit/iris/util/decree/context/BiomeContextHandler.java
index 0009627dd..d8c2012ae 100644
--- a/src/main/java/com/volmit/iris/util/decree/handlers/context/BiomeContextHandler.java
+++ b/src/main/java/com/volmit/iris/util/decree/context/BiomeContextHandler.java
@@ -1,8 +1,7 @@
-package com.volmit.iris.util.decree.handlers.context;
+package com.volmit.iris.util.decree.context;
 
 import com.volmit.iris.core.tools.IrisToolbelt;
 import com.volmit.iris.engine.object.biome.IrisBiome;
-import com.volmit.iris.engine.object.dimensional.IrisDimension;
 import com.volmit.iris.util.decree.DecreeContextHandler;
 import com.volmit.iris.util.plugin.VolmitSender;
 
diff --git a/src/main/java/com/volmit/iris/util/decree/handlers/context/DimensionContextHandler.java b/src/main/java/com/volmit/iris/util/decree/context/DimensionContextHandler.java
similarity index 87%
rename from src/main/java/com/volmit/iris/util/decree/handlers/context/DimensionContextHandler.java
rename to src/main/java/com/volmit/iris/util/decree/context/DimensionContextHandler.java
index 6c9f54ee5..90025baad 100644
--- a/src/main/java/com/volmit/iris/util/decree/handlers/context/DimensionContextHandler.java
+++ b/src/main/java/com/volmit/iris/util/decree/context/DimensionContextHandler.java
@@ -1,11 +1,9 @@
-package com.volmit.iris.util.decree.handlers.context;
+package com.volmit.iris.util.decree.context;
 
-import com.volmit.iris.Iris;
 import com.volmit.iris.core.tools.IrisToolbelt;
 import com.volmit.iris.engine.object.dimensional.IrisDimension;
 import com.volmit.iris.util.decree.DecreeContextHandler;
 import com.volmit.iris.util.plugin.VolmitSender;
-import org.bukkit.World;
 
 public class DimensionContextHandler implements DecreeContextHandler<IrisDimension> {
     public Class<IrisDimension> getType(){return IrisDimension.class;}
diff --git a/src/main/java/com/volmit/iris/util/decree/handlers/context/RegionContextHandler.java b/src/main/java/com/volmit/iris/util/decree/context/RegionContextHandler.java
similarity index 87%
rename from src/main/java/com/volmit/iris/util/decree/handlers/context/RegionContextHandler.java
rename to src/main/java/com/volmit/iris/util/decree/context/RegionContextHandler.java
index dbd34af1b..ab10a7096 100644
--- a/src/main/java/com/volmit/iris/util/decree/handlers/context/RegionContextHandler.java
+++ b/src/main/java/com/volmit/iris/util/decree/context/RegionContextHandler.java
@@ -1,7 +1,6 @@
-package com.volmit.iris.util.decree.handlers.context;
+package com.volmit.iris.util.decree.context;
 
 import com.volmit.iris.core.tools.IrisToolbelt;
-import com.volmit.iris.engine.object.biome.IrisBiome;
 import com.volmit.iris.engine.object.regional.IrisRegion;
 import com.volmit.iris.util.decree.DecreeContextHandler;
 import com.volmit.iris.util.plugin.VolmitSender;
diff --git a/src/main/java/com/volmit/iris/util/decree/handlers/context/WorldContextHandler.java b/src/main/java/com/volmit/iris/util/decree/context/WorldContextHandler.java
similarity index 87%
rename from src/main/java/com/volmit/iris/util/decree/handlers/context/WorldContextHandler.java
rename to src/main/java/com/volmit/iris/util/decree/context/WorldContextHandler.java
index 509e63cce..44880df15 100644
--- a/src/main/java/com/volmit/iris/util/decree/handlers/context/WorldContextHandler.java
+++ b/src/main/java/com/volmit/iris/util/decree/context/WorldContextHandler.java
@@ -1,4 +1,4 @@
-package com.volmit.iris.util.decree.handlers.context;
+package com.volmit.iris.util.decree.context;
 
 import com.volmit.iris.util.decree.DecreeContextHandler;
 import com.volmit.iris.util.plugin.VolmitSender;