Merge pull request #796 from VolmitSoftware/Development

**Changelog**

- Fixed a Memory Leak (There might be more, keep reports coming)
 - Fixed Iris wand selections (WE)
 - Added Iris Wand Worldedit compatibility [Make selection using Worldedit, then /Iris object want worldedit (/ir o w we) to then set your selection to a new iris wand]

build.gradle

@@ -24,7 +24,7 @@ plugins {
     id "de.undercouch.download" version "5.0.1"
 }
 
-version '2.1.0-1.18.2' // Needs to be version specific
+version '2.1.2-1.18.2' // Needs to be version specific
 def nmsVersion = "1.18.2"
 def apiVersion = '1.18'
 def spigotJarVersion = '1.18.2-R0.1-SNAPSHOT'
@@ -74,6 +74,7 @@ repositories {
         }
     }
     maven { url "https://dl.cloudsmith.io/public/arcane/archive/maven/" }
+    maven { url "https://maven.enginehub.org/repo/" }
     mavenCentral()
     mavenLocal()
     maven { url "https://jitpack.io"}
@@ -128,6 +129,7 @@ dependencies {
     implementation 'io.th0rgal:oraxen:1.94.0'
     implementation 'org.bukkit:craftbukkit:1.18.2-R0.1-SNAPSHOT:remapped-mojang'
     implementation 'com.github.LoneDev6:api-itemsadder:3.1.0b'
+    implementation 'com.sk89q.worldedit:worldedit-bukkit:7.2.9'
 
     // Shaded
     implementation 'com.dfsek:Paralithic:0.4.0'

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

@@ -244,12 +244,12 @@ public class Iris extends VolmitPlugin implements Listener {
         return f;
     }
 
-    public static void warn(String string) {
-        msg(C.YELLOW + string);
+    public static void warn(String format, Object... objs) {
+        msg(C.YELLOW + String.format(format, objs));
     }
 
-    public static void error(String string) {
-        msg(C.RED + string);
+    public static void error(String format, Object... objs) {
+        msg(C.RED + String.format(format, objs));
     }
 
     public static void debug(String string) {

src/main/java/com/volmit/iris/core/commands/CommandObject.java

@@ -18,7 +18,9 @@
 
 package com.volmit.iris.core.commands;
 
+import com.mojang.datafixers.util.Pair;
 import com.volmit.iris.Iris;
+import com.volmit.iris.core.link.WorldEditLink;
 import com.volmit.iris.core.loader.IrisData;
 import com.volmit.iris.core.service.ObjectSVC;
 import com.volmit.iris.core.service.StudioSVC;
@@ -41,12 +43,7 @@ import com.volmit.iris.util.format.C;
 import com.volmit.iris.util.math.Direction;
 import com.volmit.iris.util.math.RNG;
 import com.volmit.iris.util.scheduling.Queue;
-import org.bukkit.ChatColor;
-import org.bukkit.HeightMap;
-import org.bukkit.Location;
-import org.bukkit.Material;
-import org.bukkit.Sound;
-import org.bukkit.World;
+import org.bukkit.*;
 import org.bukkit.block.Block;
 import org.bukkit.block.BlockState;
 import org.bukkit.block.TileState;
@@ -426,6 +423,24 @@ public class CommandObject implements DecreeExecutor {
         sender().sendMessage("Reverted " + actualReverts + " pastes!");
     }
 
+    @Decree(description = "Gets an object wand and grabs the current WorldEdit selection.", aliases = "we", origin = DecreeOrigin.PLAYER, studio = true)
+    public void we() {
+        if(!Bukkit.getPluginManager().isPluginEnabled("WorldEdit")) {
+            sender().sendMessage(C.RED + "You can't get a WorldEdit selection without WorldEdit, you know.");
+            return;
+        }
+
+        Pair<Location, Location> locs = WorldEditLink.getSelection(sender().player());
+        if(locs.getFirst() == null)
+            sender().sendMessage(C.RED + "You don't have a WorldEdit selection!");
+        else if(locs.getSecond() == null)
+            sender().sendMessage(C.RED + "You need a valid WorldRegion selection in the current world!");
+        else {
+            sender().player().getInventory().addItem(WandSVC.createWand(locs.getFirst(), locs.getSecond()));
+            sender().sendMessage(C.GREEN + "A fresh wand with your current WorldEdit selection on it!");
+        }
+    }
+
     @Decree(description = "Get an object wand", sync = true)
     public void wand() {
         player().getInventory().addItem(WandSVC.createWand());

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

@@ -0,0 +1,32 @@
+package com.volmit.iris.core.link;
+
+import com.mojang.datafixers.util.Pair;
+import com.sk89q.worldedit.IncompleteRegionException;
+import com.sk89q.worldedit.LocalSession;
+import com.sk89q.worldedit.WorldEdit;
+import com.sk89q.worldedit.bukkit.BukkitAdapter;
+import com.sk89q.worldedit.math.BlockVector3;
+import com.sk89q.worldedit.regions.Region;
+import com.sk89q.worldedit.session.MissingSessionException;
+import org.bukkit.Location;
+import org.bukkit.entity.Player;
+
+public class WorldEditLink {
+
+    public static Pair<Location, Location> getSelection(Player p) {
+        LocalSession session = WorldEdit.getInstance().getSessionManager().getIfPresent(BukkitAdapter.adapt(p));
+        try {
+            if(session == null)
+                throw new MissingSessionException();
+            Region r = session.getSelection(BukkitAdapter.adapt(p.getWorld()));
+            BlockVector3 p1 = r.getMinimumPoint();
+            BlockVector3 p2 = r.getMaximumPoint();
+            return new Pair<>(new Location(p.getWorld(), p1.getX(), p1.getY(), p1.getZ()), new Location(p.getWorld(), p2.getX(), p2.getY(), p2.getZ()));
+        } catch(MissingSessionException e) {
+            return new Pair<>(null, new Location(null, 0, 0, 0));
+        } catch(IncompleteRegionException e) {
+            return new Pair<>(new Location(null, 0, 0, 0), null);
+        }
+
+    }
+}

src/main/java/com/volmit/iris/core/nms/v18_2/NMSBinding18_2.java

@@ -416,18 +416,21 @@ public class NMSBinding18_2 implements INMSBinding {
     }
 
     private static Object fieldFor(Class<?> returns, Object in) {
-        for(Field i : in.getClass().getFields()) {
-            if(i.getType().equals(returns)) {
+        return fieldForClass(returns, in.getClass(), in);
+    }
+
+    @SuppressWarnings("unchecked")
+    private static <T> T fieldForClass(Class<T> returnType, Class<?> sourceType, Object in) {
+        for(Field i : sourceType.getFields())
+            if(i.getType().equals(returnType)) {
                 i.setAccessible(true);
                 try {
-                    Iris.info("[NMS] Found " + returns.getSimpleName() + " in " + in.getClass().getSimpleName() + "." + i.getName());
-                    return i.get(in);
+                    Iris.info("[NMS] Found " + returnType.getSimpleName() + " in " + sourceType.getSimpleName() + "." + i.getName());
+                    return (T)i.get(in);
                 } catch(IllegalAccessException e) {
                     e.printStackTrace();
                 }
             }
-        }
-
         return null;
     }
 }

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

@@ -0,0 +1,61 @@
+package com.volmit.iris.core.service;
+
+import com.volmit.iris.util.collection.KList;
+import com.volmit.iris.util.plugin.IrisService;
+import org.apache.logging.log4j.Level;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Marker;
+import org.apache.logging.log4j.core.Filter;
+import org.apache.logging.log4j.core.LogEvent;
+import org.apache.logging.log4j.core.Logger;
+import org.apache.logging.log4j.message.Message;
+
+public class LogFilterSVC implements IrisService, Filter {
+
+    private static final String HEIGHTMAP_MISMATCH = "Ignoring heightmap data for chunk";
+    private static final String RAID_PERSISTENCE = "Could not save data net.minecraft.world.entity.raid.PersistentRaid";
+    private static final String DUPLICATE_ENTITY_UUID = "UUID of added entity already exists";
+
+    private static final KList<String> FILTERS = new KList<>();
+
+    public void onEnable() {
+        FILTERS.add(HEIGHTMAP_MISMATCH, RAID_PERSISTENCE, DUPLICATE_ENTITY_UUID);
+        ((Logger)LogManager.getRootLogger()).addFilter(this);
+    }
+
+    public void initialize() { }
+    public void start() { }
+    public void stop() { }
+    public void onDisable() { }
+    public boolean isStarted() { return true; }
+    public boolean isStopped() { return false; }
+
+    public State getState() {
+        try { return State.STARTED; }
+        catch (Exception var2) { return null; }
+    }
+
+    public Filter.Result getOnMatch() { return Result.NEUTRAL; }
+    public Filter.Result getOnMismatch() { return Result.NEUTRAL; }
+
+    public Result filter(LogEvent event) { return check(event.getMessage().getFormattedMessage()); }
+    public Result filter(Logger logger, Level level, Marker marker, Object msg, Throwable t) { return check(msg.toString()); }
+    public Result filter(Logger logger, Level level, Marker marker, Message msg, Throwable t) { return check(msg.getFormattedMessage()); }
+    public Result filter(Logger logger, Level level, Marker marker, String message, Object... params) { return check(message); }
+    public Result filter(Logger logger, Level level, Marker marker, String message, Object p0) { return check(message); }
+    public Result filter(Logger logger, Level level, Marker marker, String message, Object p0, Object p1) { return check(message); }
+    public Result filter(Logger logger, Level level, Marker marker, String message, Object p0, Object p1, Object p2) { return check(message); }
+    public Result filter(Logger logger, Level level, Marker marker, String message, Object p0, Object p1, Object p2, Object p3) { return check(message); }
+    public Result filter(Logger logger, Level level, Marker marker, String message, Object p0, Object p1, Object p2, Object p3, Object p4) { return check(message); }
+    public Result filter(Logger logger, Level level, Marker marker, String message, Object p0, Object p1, Object p2, Object p3, Object p4, Object p5) { return check(message); }
+    public Result filter(Logger logger, Level level, Marker marker, String message, Object p0, Object p1, Object p2, Object p3, Object p4, Object p5, Object p6) { return check(message); }
+    public Result filter(Logger logger, Level level, Marker marker, String message, Object p0, Object p1, Object p2, Object p3, Object p4, Object p5, Object p6, Object p7) { return check(message); }
+    public Result filter(Logger logger, Level level, Marker marker, String message, Object p0, Object p1, Object p2, Object p3, Object p4, Object p5, Object p6, Object p7, Object p8) { return check(message); }
+    public Result filter(Logger logger, Level level, Marker marker, String message, Object p0, Object p1, Object p2, Object p3, Object p4, Object p5, Object p6, Object p7, Object p8, Object p9) { return check(message); }
+
+    private Result check(String string) {
+        if(FILTERS.stream().anyMatch(string::contains))
+            return Result.DENY;
+        return Result.NEUTRAL;
+    }
+}

src/main/java/com/volmit/iris/core/tools/IrisToolbelt.java

@@ -233,20 +233,17 @@ public class IrisToolbelt {
         return isIrisWorld(i) && access(i).isStudio();
     }
 
-    public static void retainMantleDataForSlice(String className)
-    {
+    public static void retainMantleDataForSlice(String className) {
         toolbeltConfiguration.put("retain.mantle." + className, true);
     }
 
-    public static <T> T getMantleData(World world, int x, int y, int z, Class<T> of)
-    {
+    public static <T> T getMantleData(World world, int x, int y, int z, Class<T> of) {
         PlatformChunkGenerator e = access(world);
         if(e == null) {return null;}
         return e.getEngine().getMantle().getMantle().get(x, y - world.getMinHeight(), z, of);
     }
 
-    public static <T> void  deleteMantleData(World world, int x, int y, int z, Class<T> of)
-    {
+    public static <T> void  deleteMantleData(World world, int x, int y, int z, Class<T> of) {
         PlatformChunkGenerator e = access(world);
         if(e == null) {return;}
         e.getEngine().getMantle().getMantle().remove(x, y - world.getMinHeight(), z, of);

src/main/java/com/volmit/iris/engine/IrisWorldManager.java

@@ -79,7 +79,6 @@ import java.util.stream.Stream;
 public class IrisWorldManager extends EngineAssignedWorldManager {
     private final Looper looper;
     private final int id;
-    private final KMap<Long, Long> chunkCooldowns;
     private final KList<Runnable> updateQueue = new KList<>();
     private final ChronoLatch cl;
     private final ChronoLatch clw;
@@ -99,7 +98,6 @@ public class IrisWorldManager extends EngineAssignedWorldManager {
         ecl = null;
         cln = null;
         clw = null;
-        chunkCooldowns = null;
         looper = null;
         chunkUpdater = null;
         id = -1;
@@ -112,7 +110,6 @@ public class IrisWorldManager extends EngineAssignedWorldManager {
         cl = new ChronoLatch(3000);
         ecl = new ChronoLatch(250);
         clw = new ChronoLatch(1000, true);
-        chunkCooldowns = new KMap<>();
         id = engine.getCacheID();
         energy = 25;
         looper = new Looper() {
@@ -255,14 +252,6 @@ public class IrisWorldManager extends EngineAssignedWorldManager {
             }
         }
 
-        int chunkCooldownSeconds = 60;
-
-        for(Long i : chunkCooldowns.k()) {
-            if(M.ms() - chunkCooldowns.get(i) > TimeUnit.SECONDS.toMillis(chunkCooldownSeconds)) {
-                chunkCooldowns.remove(i);
-            }
-        }
-
         int spawnBuffer = RNG.r.i(2, 12);
 
         Chunk[] cc = getEngine().getWorld().realWorld().getLoadedChunks();
@@ -279,7 +268,6 @@ public class IrisWorldManager extends EngineAssignedWorldManager {
             }
 
             spawnIn(c, false);
-            chunkCooldowns.put(Cache.key(c), M.ms());
         }
 
         energy -= (actuallySpawned / 2D);

src/main/java/com/volmit/iris/engine/object/IrisObject.java

@@ -534,41 +534,47 @@ public class IrisObject extends IrisRegistrant {
             } else if(config.getMode().equals(ObjectPlaceMode.MAX_HEIGHT) || config.getMode().equals(ObjectPlaceMode.STILT)) {
                 BlockVector offset = new BlockVector(config.getTranslate().getX(), config.getTranslate().getY(), config.getTranslate().getZ());
                 BlockVector rotatedDimensions = config.getRotation().rotate(new BlockVector(getW(), getH(), getD()), spinx, spiny, spinz).clone();
-
-                for(int i = x - (rotatedDimensions.getBlockX() / 2) + offset.getBlockX(); i <= x + (rotatedDimensions.getBlockX() / 2) + offset.getBlockX(); i++) {
-                    for(int j = z - (rotatedDimensions.getBlockZ() / 2) + offset.getBlockZ(); j <= z + (rotatedDimensions.getBlockZ() / 2) + offset.getBlockZ(); j++) {
-                        int h = placer.getHighest(i, j, getLoader(), config.isUnderwater()) + rty;
-
-                        if(placer.isCarved(i, h, j) || placer.isCarved(i, h - 1, j) || placer.isCarved(i, h - 2, j) || placer.isCarved(i, h - 3, j)) {
+                int xLength = (rotatedDimensions.getBlockX() / 2) + offset.getBlockX();
+                int minX = Math.min(x - xLength, x + xLength);
+                int maxX = Math.max(x - xLength, x + xLength);
+                int zLength = (rotatedDimensions.getBlockZ() / 2) + offset.getBlockZ();
+                int minZ = Math.min(z - zLength, z + zLength);
+                int maxZ = Math.max(z - zLength, z + zLength);
+                for(int i = minX; i <= maxX; i++) {
+                    for(int ii = minZ; ii <= maxZ; ii++) {
+                        int h = placer.getHighest(i, ii, getLoader(), config.isUnderwater()) + rty;
+                        if(placer.isCarved(i, h, ii) || placer.isCarved(i, h - 1, ii) || placer.isCarved(i, h - 2, ii) || placer.isCarved(i, h - 3, ii)) {
                             bail = true;
                             break;
                         }
-
-                        if(h > y) {
+                        if(h > y)
                             y = h;
-                        }
                     }
                 }
             } else if(config.getMode().equals(ObjectPlaceMode.FAST_MAX_HEIGHT) || config.getMode().equals(ObjectPlaceMode.FAST_STILT)) {
                 BlockVector offset = new BlockVector(config.getTranslate().getX(), config.getTranslate().getY(), config.getTranslate().getZ());
                 BlockVector rotatedDimensions = config.getRotation().rotate(new BlockVector(getW(), getH(), getD()), spinx, spiny, spinz).clone();
-
-                for(int i = x - (rotatedDimensions.getBlockX() / 2) + offset.getBlockX(); i <= x + (rotatedDimensions.getBlockX() / 2) + offset.getBlockX(); i += (rotatedDimensions.getBlockX() / 2) + 1) {
-                    for(int j = z - (rotatedDimensions.getBlockZ() / 2) + offset.getBlockZ(); j <= z + (rotatedDimensions.getBlockZ() / 2) + offset.getBlockZ(); j += (rotatedDimensions.getBlockZ() / 2) + 1) {
-                        int h = placer.getHighest(i, j, getLoader(), config.isUnderwater()) + rty;
-
-                        if(placer.isCarved(i, h, j) || placer.isCarved(i, h - 1, j) || placer.isCarved(i, h - 2, j) || placer.isCarved(i, h - 3, j)) {
+                int xRadius = (rotatedDimensions.getBlockX() / 2);
+                int xLength = xRadius + offset.getBlockX();
+                int minX = Math.min(x - xLength, x + xLength);
+                int maxX = Math.max(x - xLength, x + xLength);
+                int zRadius = (rotatedDimensions.getBlockZ() / 2);
+                int zLength = zRadius + offset.getBlockZ();
+                int minZ = Math.min(z - zLength, z + zLength);
+                int maxZ = Math.max(z - zLength, z + zLength);
+                for(int i = minX; i <= maxX; i += Math.abs(xRadius) + 1) {
+                    for(int ii = minZ; ii <= maxZ; ii += Math.abs(zRadius) + 1) {
+                        int h = placer.getHighest(i, ii, getLoader(), config.isUnderwater()) + rty;
+                        if(placer.isCarved(i, h, ii) || placer.isCarved(i, h - 1, ii) || placer.isCarved(i, h - 2, ii) || placer.isCarved(i, h - 3, ii)) {
                             bail = true;
                             break;
                         }
-
-                        if(h > y) {
+                        if(h > y)
                             y = h;
-                        }
                     }
                 }
             } else if(config.getMode().equals(ObjectPlaceMode.MIN_HEIGHT)) {
-                y = 257;
+                y = rdata.getEngine().getHeight() + 1;
                 BlockVector offset = new BlockVector(config.getTranslate().getX(), config.getTranslate().getY(), config.getTranslate().getZ());
                 BlockVector rotatedDimensions = config.getRotation().rotate(new BlockVector(getW(), getH(), getD()), spinx, spiny, spinz).clone();
 
@@ -745,6 +751,7 @@ public class IrisObject extends IrisRegistrant {
 
                 data = config.getRotation().rotate(data, spinx, spiny, spinz);
                 xx = x + (int) Math.round(i.getX());
+
                 int yy = y + (int) Math.round(i.getY());
                 zz = z + (int) Math.round(i.getZ());
 
@@ -787,7 +794,6 @@ public class IrisObject extends IrisRegistrant {
 
                 if(!data.getMaterial().equals(Material.AIR) && !data.getMaterial().equals(Material.CAVE_AIR)) {
                     placer.set(xx, yy, zz, data);
-
                     if(tile != null) {
                         placer.setTile(xx, yy, zz, tile);
                     }
@@ -852,17 +858,14 @@ public class IrisObject extends IrisRegistrant {
 
                 int yg = placer.getHighest(xx, zz, getLoader(), true);
 
-                if(config.isWaterloggable() && yg <= placer.getFluidHeight() && d instanceof Waterlogged) {
+                if(config.isWaterloggable() && yg <= placer.getFluidHeight() && d instanceof Waterlogged)
                     ((Waterlogged) d).setWaterlogged(true);
-                }
 
-                if(yv >= 0 && config.isBottom()) {
+                if(yv >= 0 && config.isBottom())
                     y += Math.floorDiv(h, 2);
-                }
 
-                for(int j = lowest + y; j > yg - config.getOverStilt() - 1; j--) {
+                for(int j = lowest + y; j > yg - config.getOverStilt() - 1; j--)
                     placer.set(xx, j, zz, d);
-                }
             }
 
             readLock.unlock();

src/main/resources/plugin.yml

@@ -22,4 +22,4 @@ commands:
     aliases: [ ir, irs ]
 api-version: ${apiversion}
 hotload-dependencies: false
-softdepend: [ "Oraxen", "ItemsAdder", "IrisFeller"]
+softdepend: [ "Oraxen", "ItemsAdder", "IrisFeller", "WorldEdit"]