diff --git a/.gitignore b/.gitignore index 5c1cf006..b3fac7e9 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,5 @@ target/ *.project *.classpath *.prefs +*.iml +.idea \ No newline at end of file diff --git a/src/autosaveworld/features/purge/plugins/wg/RegionDeleteTask.java b/src/autosaveworld/features/purge/plugins/wg/RegionDeleteTask.java index 64d75b09..67e5d4c0 100644 --- a/src/autosaveworld/features/purge/plugins/wg/RegionDeleteTask.java +++ b/src/autosaveworld/features/purge/plugins/wg/RegionDeleteTask.java @@ -17,9 +17,10 @@ package autosaveworld.features.purge.plugins.wg; +import com.sk89q.worldedit.bukkit.BukkitAdapter; +import com.sk89q.worldguard.WorldGuard; import org.bukkit.World; -import com.sk89q.worldguard.bukkit.WGBukkit; import com.sk89q.worldguard.protection.managers.RegionManager; import com.sk89q.worldguard.protection.regions.ProtectedRegion; @@ -43,7 +44,7 @@ public boolean doNotQueue() { @Override public void performTask() { - RegionManager rm = WGBukkit.getRegionManager(world); + RegionManager rm = WorldGuard.getInstance().getPlatform().getRegionContainer().get(BukkitAdapter.adapt(world)); MessageLogger.debug("Deleting region " + region.getId()); rm.removeRegion(region.getId()); } diff --git a/src/autosaveworld/features/purge/plugins/wg/RegionRegenTask.java b/src/autosaveworld/features/purge/plugins/wg/RegionRegenTask.java index a5456933..5a8682f5 100644 --- a/src/autosaveworld/features/purge/plugins/wg/RegionRegenTask.java +++ b/src/autosaveworld/features/purge/plugins/wg/RegionRegenTask.java @@ -17,9 +17,10 @@ package autosaveworld.features.purge.plugins.wg; +import com.sk89q.worldedit.bukkit.BukkitAdapter; +import com.sk89q.worldguard.WorldGuard; import org.bukkit.World; -import com.sk89q.worldguard.bukkit.WGBukkit; import com.sk89q.worldguard.protection.managers.RegionManager; import com.sk89q.worldguard.protection.regions.ProtectedRegion; @@ -46,7 +47,7 @@ public boolean doNotQueue() { @Override public void performTask() { - RegionManager rm = WGBukkit.getRegionManager(world); + RegionManager rm = WorldGuard.getInstance().getPlatform().getRegionContainer().get(BukkitAdapter.adapt(world)); if (!(noregenoverlap && (rm.getApplicableRegions(region).size() > 1))) { MessageLogger.debug("Regenerating region " + region.getId()); WorldEditRegeneration.get().regenerateRegion(world, region.getMinimumPoint(), region.getMaximumPoint()); diff --git a/src/autosaveworld/features/purge/plugins/wg/WGPurge.java b/src/autosaveworld/features/purge/plugins/wg/WGPurge.java index dcaa2ca7..b985362d 100644 --- a/src/autosaveworld/features/purge/plugins/wg/WGPurge.java +++ b/src/autosaveworld/features/purge/plugins/wg/WGPurge.java @@ -20,10 +20,11 @@ import java.util.ArrayList; import java.util.UUID; +import com.sk89q.worldedit.bukkit.BukkitAdapter; +import com.sk89q.worldguard.WorldGuard; import org.bukkit.Bukkit; import org.bukkit.World; -import com.sk89q.worldguard.bukkit.WGBukkit; import com.sk89q.worldguard.domains.DefaultDomain; import com.sk89q.worldguard.protection.managers.RegionManager; import com.sk89q.worldguard.protection.regions.ProtectedRegion; @@ -45,7 +46,7 @@ public void doPurge() { try (TaskExecutor queue = new TaskExecutor(30)) { for (World w : Bukkit.getWorlds()) { MessageLogger.debug("Checking WG protections in world " + w.getName()); - RegionManager regionmanager = WGBukkit.getRegionManager(w); + RegionManager regionmanager = WorldGuard.getInstance().getPlatform().getRegionContainer().get(BukkitAdapter.adapt(w)); ArrayList regions = new ArrayList(regionmanager.getRegions().values()); for (ProtectedRegion rg : regions) { MessageLogger.debug("Checking region " + rg.getId()); diff --git a/src/autosaveworld/features/purge/weregen/BukkitAPIWorldEditRegeneration.java b/src/autosaveworld/features/purge/weregen/BukkitAPIWorldEditRegeneration.java index 6e3b656a..1340f002 100644 --- a/src/autosaveworld/features/purge/weregen/BukkitAPIWorldEditRegeneration.java +++ b/src/autosaveworld/features/purge/weregen/BukkitAPIWorldEditRegeneration.java @@ -20,18 +20,19 @@ import java.util.Iterator; import java.util.LinkedList; +import com.sk89q.worldedit.WorldEdit; +import com.sk89q.worldedit.blocks.Blocks; +import com.sk89q.worldedit.world.block.BaseBlock; +import com.sk89q.worldedit.world.block.BlockTypes; import org.bukkit.Material; import org.bukkit.World; import com.sk89q.worldedit.EditSession; import com.sk89q.worldedit.Vector; import com.sk89q.worldedit.Vector2D; -import com.sk89q.worldedit.blocks.BaseBlock; -import com.sk89q.worldedit.blocks.BlockType; import com.sk89q.worldedit.bukkit.BukkitWorld; import com.sk89q.worldedit.regions.CuboidRegion; import com.sk89q.worldedit.regions.Region; -import com.sk89q.worldguard.bukkit.BukkitUtil; import autosaveworld.core.logging.MessageLogger; import autosaveworld.features.purge.weregen.UtilClasses.BlockToPlaceBack; @@ -39,15 +40,14 @@ import autosaveworld.features.purge.weregen.WorldEditRegeneration.WorldEditRegenrationInterface; import autosaveworld.utils.BukkitUtils; -//TODO: Migrate to new WorldEdit API public class BukkitAPIWorldEditRegeneration implements WorldEditRegenrationInterface { private ItemSpawnListener itemremover = new ItemSpawnListener(); @Override public void regenerateRegion(World world, org.bukkit.util.Vector minpoint, org.bukkit.util.Vector maxpoint) { - Vector minbpoint = BukkitUtil.toVector(minpoint); - Vector maxbpoint = BukkitUtil.toVector(maxpoint); + Vector minbpoint = new Vector(minpoint.getX(), minpoint.getY(), minpoint.getZ()); + Vector maxbpoint = new Vector(maxpoint.getX(), maxpoint.getY(), maxpoint.getZ()); regenerateRegion(world, minbpoint, maxbpoint); } @@ -55,7 +55,7 @@ public void regenerateRegion(World world, org.bukkit.util.Vector minpoint, org.b @SuppressWarnings("deprecation") public void regenerateRegion(World world, Vector minpoint, Vector maxpoint) { BukkitWorld bw = new BukkitWorld(world); - EditSession es = new EditSession(bw, Integer.MAX_VALUE); + EditSession es = WorldEdit.getInstance().getEditSessionFactory().getEditSession(bw, Integer.MAX_VALUE); es.setFastMode(true); int maxy = bw.getMaxY() + 1; Region region = new CuboidRegion(bw, minpoint, maxpoint); @@ -72,7 +72,7 @@ public void regenerateRegion(World world, Vector minpoint, Vector maxpoint) { for (int z = 0; z < 16; ++z) { Vector pt = min.add(x, y, z); if (!region.contains(pt)) { - placeBackQueue.add(new BlockToPlaceBack(pt, es.getBlock(pt))); + placeBackQueue.add(new BlockToPlaceBack(pt, es.getBlock(pt).toBaseBlock())); } } } @@ -104,21 +104,22 @@ public void regenerateRegion(World world, Vector minpoint, Vector maxpoint) { new PlaceBackStage(new PlaceBackStage.PlaceBackCheck() { @Override public boolean shouldPlaceBack(BaseBlock block) { - return !BlockType.shouldPlaceLast(block.getId()) && !BlockType.shouldPlaceFinal(block.getId()); + //Blocks.shouldPlaceLast(block.getBlockType()) + return !Blocks.shouldPlaceLast(block.getBlockType()) && !Blocks.shouldPlaceFinal(block.getBlockType()); } }), // last stage place back new PlaceBackStage(new PlaceBackStage.PlaceBackCheck() { @Override public boolean shouldPlaceBack(BaseBlock block) { - return BlockType.shouldPlaceLast(block.getId()); + return Blocks.shouldPlaceLast(block.getBlockType()); } }), // final stage place back new PlaceBackStage(new PlaceBackStage.PlaceBackCheck() { @Override public boolean shouldPlaceBack(BaseBlock block) { - return BlockType.shouldPlaceFinal(block.getId()); + return Blocks.shouldPlaceFinal(block.getBlockType()); } }) }; @@ -146,7 +147,7 @@ public void processBlockPlaceBack(World world, EditSession es, LinkedList