From [GitHub PR 6: [#5] Implement WorldGuard Wrapper](#6)

GitOrigin-RevId: addbb35fd35d36972506c5651df5698d179b529f

Author: RyanHecht

build.gradle

@@ -15,6 +15,7 @@ plugins {
 shadowJar {
     relocate 'cloud.commandframework', 'us.mcparks.showscript.cloud.commandframework'
     relocate 'co.aikar.timings.lib', 'us.mcparks.showscript.aikar.timings.lib'
+    relocate 'org.codemc.worldguardwrapper', 'us.mcparks.showscript.codemc.worldguardwrapper'
 }
 
 sourceSets {
@@ -63,6 +64,11 @@ repositories {
         url = uri('https://repo.aikar.co/nexus/content/groups/aikar/')
     }
 
+    // codemc - worldguardwrapper
+    maven {
+        url = uri('https://repo.codemc.org/repository/maven-public/')
+    }
+
 }
 
 dependencies {
@@ -78,6 +84,7 @@ dependencies {
     implementation "net.kyori:adventure-platform-bukkit:4.3.0"
     implementation "commons-io:commons-io:2.16.1"
     implementation "co.aikar:minecraft-timings:1.0.4"
+    implementation "org.codemc.worldguardwrapper:worldguardwrapper:1.2.1-SNAPSHOT"
 
 }
 

src/us/mcparks/showscript/Main.java

@@ -17,7 +17,7 @@
 
 import co.aikar.timings.lib.MCTiming;
 import co.aikar.timings.lib.TimingManager;
-import com.sk89q.worldguard.bukkit.WorldGuardPlugin;
+import org.codemc.worldguardwrapper.WorldGuardWrapper;
 import net.kyori.adventure.platform.bukkit.BukkitAudiences;
 import us.mcparks.showscript.event.region.RegionListener;
 import us.mcparks.showscript.event.show.ShowStartEvent;
@@ -49,8 +49,8 @@ public class Main extends JavaPlugin implements Listener {
 
   private RegionListener regionListener;
 
-  public static Supplier<List<String>> showFileNames = new AsynchronouslyRefreshingSupplier<>(() -> {
-    File fs = new File(Main.getPlugin(Main.class).getRealDataFolder(), "Shows");
+  public Supplier<List<String>> showFileNames = new AsynchronouslyRefreshingSupplier<>(() -> {
+    File fs = new File(getRealDataFolder(), "Shows");
     if (!fs.exists()) {
       fs.mkdir();
     }
@@ -94,7 +94,8 @@ public void onEnable() {
     // start RegionListener if WorldGuard is present
     Plugin worldGuard = Bukkit.getServer().getPluginManager().getPlugin("WorldGuard");
     if (worldGuard != null) {
-        regionListener = new RegionListener((WorldGuardPlugin) worldGuard);
+        getLogger().info("Using WorldGuardWrapper");
+        regionListener = new RegionListener(WorldGuardWrapper.getInstance());
     } else {
         getLogger().warning("WorldGuard not found. Region Shows will not function.");
     }

src/us/mcparks/showscript/Shows.java

@@ -131,7 +131,7 @@ public List<String> showNames(CommandContext<CommandSender> sender, String input
       return new ArrayList<>();
     }
 
-    return Main.showFileNames.get().stream().filter(s -> s.startsWith(input)).collect(Collectors.toList());
+    return main.showFileNames.get().stream().filter(s -> s.startsWith(input)).collect(Collectors.toList());
   }
 
   @Suggestions("showDirectoryNames")
@@ -140,7 +140,7 @@ public List<String> showDirectories(CommandContext<CommandSender> sender, String
       return new ArrayList<>();
     }
 
-    return Main.showFileNames.get().stream().map(path -> path.lastIndexOf("/") == -1 ? path : path.substring(0, path.lastIndexOf("/"))).distinct().filter(s -> s.startsWith(input)).collect(Collectors.toList());
+    return main.showFileNames.get().stream().map(path -> path.lastIndexOf("/") == -1 ? path : path.substring(0, path.lastIndexOf("/"))).distinct().filter(s -> s.startsWith(input)).collect(Collectors.toList());
   }
 
   public static String getShowNameFromAbsolutePath(String absolutePath) {

src/us/mcparks/showscript/event/region/RegionListener.java

@@ -1,9 +1,8 @@
 package us.mcparks.showscript.event.region;
 
 import com.google.common.collect.Sets;
-import com.sk89q.worldguard.bukkit.WorldGuardPlugin;
-import com.sk89q.worldguard.protection.managers.RegionManager;
-import com.sk89q.worldguard.protection.regions.ProtectedRegion;
+import org.codemc.worldguardwrapper.WorldGuardWrapper;
+import org.codemc.worldguardwrapper.region.IWrappedRegion;
 import us.mcparks.showscript.Main;
 import org.bukkit.Bukkit;
 import org.bukkit.Location;
@@ -18,16 +17,16 @@
 import java.util.stream.Collectors;
 
 public class RegionListener implements Listener {
-    public static Map<Player, Set<ProtectedRegion>> regionMap;
-    private WorldGuardPlugin worldGuard;
+    public static Map<Player, Set<IWrappedRegion>> regionMap;
+    private final WorldGuardWrapper worldGuardWrapper;
 
     // Players in this set won't have their regions updated as long as they're passengers in a vehicle
     private Set<Player> disabledPassengers;
 
-    public RegionListener(WorldGuardPlugin wgp) {
+    public RegionListener(WorldGuardWrapper wgpw) {
         regionMap = new HashMap<>();
         disabledPassengers = new HashSet<>();
-        worldGuard = wgp;
+        worldGuardWrapper = wgpw;
         Bukkit.getPluginManager().registerEvents(this, Main.getPlugin(Main.class));
     }
 
@@ -39,7 +38,7 @@ public Collection<Player> getPlayersInRegion(String regionId) {
     }
 
     public Collection<String> getRegionsForPlayer(Player player) {
-        return regionMap.get(player).stream().map(ProtectedRegion::getId).collect(Collectors.toList());
+        return regionMap.get(player).stream().map(IWrappedRegion::getId).collect(Collectors.toList());
     }
 
     @EventHandler
@@ -88,31 +87,30 @@ public void onVehicleExit(VehicleExitEvent e) {
 
     private synchronized void updateRegions(final Player player, final MovementType movementType,
                                             Location to) {
-        Set<ProtectedRegion> oldRegions;
+        Set<IWrappedRegion> oldRegions;
 
         if (regionMap.get(player) == null) {
             oldRegions = new HashSet<>();
         } else {
             oldRegions = new HashSet<>(regionMap.get(player));
         }
 
-        RegionManager rm = worldGuard.getRegionManager(to.getWorld());
+        Set<IWrappedRegion> applicableRegions = worldGuardWrapper.getRegions(to);
 
-        if (rm != null) {
-            Set<ProtectedRegion> applicableRegions = rm.getApplicableRegions(to).getRegions();
+        if (applicableRegions != null) {
             // System.out.println("------------");
             // for (ProtectedRegion region : oldRegions) {
             // System.out.println("old: " + region.getId());
             // }
             // for (ProtectedRegion region : applicableRegions) {
             // System.out.println("new: " + region.getId());
             // }
-            for (ProtectedRegion region : Sets.difference(applicableRegions, oldRegions)) {
+            for (IWrappedRegion region : Sets.difference(applicableRegions, oldRegions)) {
                 Bukkit.getServer().getPluginManager()
                         .callEvent(new PlayerEnterRegionEvent(player, region.getId()));
             }
 
-            for (ProtectedRegion region : Sets.difference(oldRegions, applicableRegions)) {
+            for (IWrappedRegion region : Sets.difference(oldRegions, applicableRegions)) {
                 Bukkit.getServer().getPluginManager()
                         .callEvent(new PlayerLeaveRegionEvent(player, region.getId()));
             }