Merge branch 'main' of github.com:Invvk/WorldGuardExtraFlags into main

Author: Invvk

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -82,7 +82,7 @@ body:
       label: Checklist
       description: Make sure you have followed each of the steps outlined here.
       options:
-        - label: I'm using java 16 and running my server in 1.17.1
+        - label: I'm using java 16+ and running my server in 1.17.1+
           required: true
         - label: I am using the newest build from https://github.com/Invvk/WorldGuardExtraFlagsPlugin/releases and the issue still persists.
           required: true

.github/ISSUE_TEMPLATE/config.yml

@@ -1,5 +1,8 @@
 blank_issues_enabled: false
 contact_links:
+  - name: WGEF Wiki
+    url: https://github.com/Invvk/WorldGuardExtraFlags/wiki
+    about: WGEF Wiki page, please view it before asking for help
   - name: VVKs Discord
     url: https://discord.gg/xcFJvXYsnD
     about: Our support Discord, please ask questions and seek support here.

WGEF-Abstraction/src/main/java/io/github/invvk/wgef/abstraction/WGEFUtils.java

@@ -2,6 +2,7 @@
 
 import com.sk89q.worldedit.bukkit.BukkitPlayer;
 import com.sk89q.worldguard.LocalPlayer;
+import com.sk89q.worldguard.protection.ApplicableRegionSet;
 import com.sk89q.worldguard.protection.FlagValueCalculator;
 import com.sk89q.worldguard.protection.flags.Flag;
 import com.sk89q.worldguard.protection.flags.StateFlag;
@@ -40,6 +41,14 @@ public static boolean hasBypass(Player player, World world, ProtectedRegion regi
         return player.hasPermission("worldguard.region.bypass." + world.getName() + "." + region.getId() + "." + flag.getName());
     }
 
+    public static boolean isPartOfRegion(Player bukkitPlayer, ApplicableRegionSet set) {
+        final LocalPlayer player = wrapPlayer(bukkitPlayer);
+        for (ProtectedRegion region: set)
+            if (region.isMember(player) || region.isOwner(player))
+                return true;
+        return false;
+    }
+
     public static StateFlag.State queryState(Player player, World world, Set<ProtectedRegion> regions, StateFlag flag) {
         return WGEFUtils.createFlagValueCalculator(player, world, regions, flag)
                 .queryState(WGEFUtils.wrapPlayer(player), flag);

WGEF-Abstraction/src/main/java/io/github/invvk/wgef/abstraction/flags/WGEFlags.java

@@ -51,4 +51,6 @@ public final class WGEFlags {
 
     public final static StateFlag ITEM_DURABILITY = new StateFlag("item-durability", true);
 
+    public final static StateFlag VILLAGER_TRADE = new StateFlag("villager-trade", true);
+
 }

WGEF-Core/src/main/java/io/github/invvk/wgef/WGPluginManager.java

@@ -70,6 +70,7 @@ public void load() {
         registry.register(WGEFlags.FLY_SPEED);
         registry.register(WGEFlags.NETHER_PORTALS);
         registry.register(WGEFlags.ITEM_DURABILITY);
+        registry.register(WGEFlags.VILLAGER_TRADE);
 
         this.dependency();
     }
@@ -111,7 +112,8 @@ public void enable() {
                 new DeathListener(this.plugin),
                 new NetherPortalListener(this.plugin),
                 new ItemListener(this.plugin),
-                new SpeedListener(this.plugin));
+                new SpeedListener(this.plugin),
+                new VillagerTradeListener(this.plugin));
     }
 
     @Override

WGEF-Core/src/main/java/io/github/invvk/wgef/listeners/VillagerTradeListener.java

@@ -0,0 +1,43 @@
+package io.github.invvk.wgef.listeners;
+
+import com.sk89q.worldguard.protection.ApplicableRegionSet;
+import com.sk89q.worldguard.protection.flags.StateFlag;
+import io.github.invvk.wgef.WGEFPlugin;
+import io.github.invvk.wgef.abstraction.WGEFUtils;
+import io.github.invvk.wgef.abstraction.flags.WGEFlags;
+import org.bukkit.craftbukkit.v1_17_R1.entity.CraftVillager;
+import org.bukkit.entity.Player;
+import org.bukkit.entity.Villager;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.Listener;
+import org.bukkit.event.inventory.InventoryOpenEvent;
+import org.bukkit.event.inventory.InventoryType;
+import org.bukkit.event.player.PlayerInteractAtEntityEvent;
+import org.bukkit.event.player.PlayerInteractEntityEvent;
+import org.bukkit.inventory.InventoryHolder;
+
+public class VillagerTradeListener implements Listener {
+
+    private final WGEFPlugin plugin;
+
+    public VillagerTradeListener(WGEFPlugin plugin) {
+        this.plugin = plugin;
+    }
+
+    @EventHandler
+    public void onInteract(PlayerInteractEntityEvent event) {
+        if (event.getRightClicked() instanceof Villager villager) {
+            final Player player = event.getPlayer();
+            final ApplicableRegionSet set =
+                    plugin.getFork().getRegionContainer().createQuery().getApplicableRegions(villager.getLocation());
+
+            if (WGEFUtils.isPartOfRegion(player, set))
+                return;
+
+            final StateFlag.State state = WGEFUtils.queryState(player, player.getWorld(), set.getRegions(), WGEFlags.VILLAGER_TRADE);
+            if (WGEFUtils.isDeny(state))
+                event.setCancelled(true);
+        }
+    }
+
+}

build.gradle

@@ -47,7 +47,7 @@ subprojects {
     }
 
     dependencies {
-        compileOnly 'org.spigotmc:spigot-api:1.17-R0.1-SNAPSHOT'
+        compileOnly 'org.spigotmc:spigot:1.17-R0.1-SNAPSHOT'
 
         compileOnly 'com.sk89q.worldguard:worldguard-bukkit:7.0.6'