Merge pull request #9 from CrazyDev05/Pixeldev

Sync with Master

core/build.gradle

@@ -47,19 +47,20 @@ compileJava {
  */
 dependencies {
     // Provided or Classpath
-    implementation 'org.spigotmc:spigot-api:1.20.1-R0.1-SNAPSHOT'
-    implementation 'org.apache.logging.log4j:log4j-api:2.19.0'
-    implementation 'org.apache.logging.log4j:log4j-core:2.19.0'
-    implementation 'commons-lang:commons-lang:2.6'
-    implementation 'com.github.oshi:oshi-core:5.8.5'
+    compileOnly 'org.spigotmc:spigot-api:1.20.1-R0.1-SNAPSHOT'
+    compileOnly 'org.apache.logging.log4j:log4j-api:2.19.0'
+    compileOnly 'org.apache.logging.log4j:log4j-core:2.19.0'
+    compileOnly 'commons-io:commons-io:2.13.0'
+    compileOnly 'commons-lang:commons-lang:2.6'
+    compileOnly 'com.github.oshi:oshi-core:5.8.5'
     compileOnly 'org.lz4:lz4-java:1.8.0'
 
     // Third Party Integrations
-    implementation 'com.ticxo.playeranimator:PlayerAnimator:R1.2.7'
-    implementation 'com.github.oraxen:oraxen:1.158.0'
-    implementation 'com.github.LoneDev6:api-itemsadder:3.4.1-r4'
-    implementation 'com.github.PlaceholderAPI:placeholderapi:2.11.3'
-    implementation 'com.github.Ssomar-Developement:SCore:4.23.10.8'
+    compileOnly 'com.ticxo.playeranimator:PlayerAnimator:R1.2.7'
+    compileOnly 'com.github.oraxen:oraxen:1.158.0'
+    compileOnly 'com.github.LoneDev6:api-itemsadder:3.4.1-r4'
+    compileOnly 'com.github.PlaceholderAPI:placeholderapi:2.11.3'
+    compileOnly 'com.github.Ssomar-Developement:SCore:4.23.10.8'
     //implementation files('libs/CustomItems.jar')
 }
 
@@ -81,6 +82,4 @@ processResources {
                 'apiversion': apiVersion.toString()
         )
     }
-}
-
-tasks.compileJava.dependsOn(delombok)
+}

core/src/main/java/com/volmit/iris/Iris.java

@@ -727,7 +727,7 @@ public class Iris extends VolmitPlugin implements Listener {
         File ff = new File(w.worldFolder(), "iris/pack");
         if (!ff.exists() || ff.listFiles().length == 0) {
             ff.mkdirs();
-            service(StudioSVC.class).installIntoWorld(sender, dim.getLoadKey(), ff.getParentFile());
+            service(StudioSVC.class).installIntoWorld(sender, dim.getLoadKey(), w.worldFolder());
         }
 
         return new BukkitChunkGenerator(w, false, ff, dim.getLoadKey());

core/src/main/java/com/volmit/iris/core/link/WorldEditLink.java

@@ -1,11 +1,17 @@
 package com.volmit.iris.core.link;
 
 import com.volmit.iris.util.data.Cuboid;
+import org.bukkit.Bukkit;
 import org.bukkit.World;
 import org.bukkit.entity.Player;
 
 public class WorldEditLink {
+    private static Boolean enabled = null;
+
     public static Cuboid getSelection(Player p) {
+        if (!hasWorldEdit())
+            return null;
+
         try {
             Object instance = Class.forName("com.sk89q.worldedit.WorldEdit").getDeclaredMethod("getInstance").invoke(null);
             Object sessionManager = instance.getClass().getDeclaredMethod("getSessionManager").invoke(instance);
@@ -28,4 +34,10 @@ public class WorldEditLink {
         }
         return null;
     }
+
+    public static boolean hasWorldEdit() {
+        if (enabled == null)
+            enabled = Bukkit.getPluginManager().isPluginEnabled("WorldEdit");
+        return enabled;
+    }
 }

core/src/main/java/com/volmit/iris/core/nms/INMSBinding.java

@@ -19,6 +19,7 @@
 package com.volmit.iris.core.nms;
 
 import com.volmit.iris.engine.framework.Engine;
+import com.volmit.iris.util.collection.KList;
 import com.volmit.iris.util.collection.KMap;
 import com.volmit.iris.util.mantle.Mantle;
 import com.volmit.iris.util.nbt.mca.palette.MCABiomeContainer;
@@ -71,6 +72,8 @@ public interface INMSBinding {
 
     Object getBiomeBase(Object registry, Biome biome);
 
+    KList<Biome> getBiomes();
+
     boolean isBukkit();
 
     int getBiomeId(Biome biome);

core/src/main/java/com/volmit/iris/core/nms/v1X/NMSBinding1X.java

@@ -22,6 +22,7 @@ import com.volmit.iris.Iris;
 import com.volmit.iris.core.nms.INMSBinding;
 import com.volmit.iris.core.nms.container.BlockPos;
 import com.volmit.iris.engine.framework.Engine;
+import com.volmit.iris.util.collection.KList;
 import com.volmit.iris.util.collection.KMap;
 import com.volmit.iris.util.mantle.Mantle;
 import com.volmit.iris.util.nbt.mca.palette.MCABiomeContainer;
@@ -163,6 +164,11 @@ public class NMSBinding1X implements INMSBinding {
         return null;
     }
 
+    @Override
+    public KList<Biome> getBiomes() {
+        return new KList<>(Biome.values()).qdel(Biome.CUSTOM);
+    }
+
     @Override
     public boolean isBukkit() {
         return true;

core/src/main/java/com/volmit/iris/core/service/WandSVC.java

@@ -54,6 +54,7 @@ import java.util.Objects;
 
 public class WandSVC implements IrisService {
     private static ItemStack dust;
+    private static ItemStack wand;
 
     public static void pasteSchematic(IrisObject s, Location at) {
         s.place(at);
@@ -226,17 +227,19 @@ public class WandSVC implements IrisService {
             return getCuboidFromItem(p.getInventory().getItemInMainHand());
         }
 
-        Cuboid c = WorldEditLink.getSelection(p);
+        if (IrisSettings.get().getWorld().worldEditWandCUI) {
+            Cuboid c = WorldEditLink.getSelection(p);
 
-        if (c != null) {
-            return new Location[]{c.getLowerNE(), c.getUpperSW()};
+            if (c != null) {
+                return new Location[]{c.getLowerNE(), c.getUpperSW()};
+            }
         }
 
         return null;
     }
 
     public static boolean isHoldingWand(Player p) {
-        return isHoldingIrisWand(p) || WorldEditLink.getSelection(p) != null;
+        return isHoldingIrisWand(p) || (IrisSettings.get().getWorld().worldEditWandCUI && WorldEditLink.getSelection(p) != null);
     }
 
     public static boolean isHoldingIrisWand(Player p) {
@@ -251,7 +254,6 @@ public class WandSVC implements IrisService {
      * @return True if it is
      */
     public static boolean isWand(ItemStack is) {
-        ItemStack wand = createWand();
         if (is.getItemMeta() == null) return false;
         return is.getType().equals(wand.getType()) &&
                 is.getItemMeta().getDisplayName().equals(wand.getItemMeta().getDisplayName()) &&
@@ -261,7 +263,7 @@ public class WandSVC implements IrisService {
 
     @Override
     public void onEnable() {
-        ItemStack wand = createWand();
+        wand = createWand();
         dust = createDust();
 
         J.ar(() -> {

core/src/main/java/com/volmit/iris/engine/platform/DummyBiomeProvider.java

@@ -1,5 +1,6 @@
 package com.volmit.iris.engine.platform;
 
+import com.volmit.iris.core.nms.INMS;
 import com.volmit.iris.util.collection.KList;
 import org.bukkit.block.Biome;
 import org.bukkit.generator.BiomeProvider;
@@ -9,7 +10,7 @@ import org.jetbrains.annotations.NotNull;
 import java.util.List;
 
 public class DummyBiomeProvider extends BiomeProvider {
-    private final List<Biome> ALL = new KList<>(Biome.values()).qdel(Biome.CHERRY_GROVE).qdel(Biome.CUSTOM);
+    private final List<Biome> ALL = INMS.get().getBiomes();
 
     @NotNull
     @Override

core/src/main/resources/plugin.yml

@@ -9,6 +9,7 @@ libraries:
   - com.googlecode.concurrentlinkedhashmap:concurrentlinkedhashmap-lru:1.4.2
   - com.github.ben-manes.caffeine:caffeine:3.0.5
   - org.apache.commons:commons-lang3:3.12.0
+  - commons-io:commons-io:2.13.0
   - io.timeandspace:smoothie-map:2.0.2
   - com.google.guava:guava:31.0.1-jre
   - com.google.code.gson:gson:2.8.9