Add command to toggle pvp

Author: djytw

uSkyBlock-Core/src/main/java/us/talabrek/ultimateskyblock/challenge/Challenge.java

@@ -25,7 +25,7 @@
 public class Challenge {
     public static final Pattern REQ_PATTERN = Pattern.compile("(?<itemstack>(?<type>[0-9A-Z_]+)(:(?<subtype>[0-9]+))?(?<meta>\\{.*\\})?):(?<amount>[0-9]+)(;(?<op>[+\\-*\\^])(?<inc>[0-9]+))?");
     public static final int MAX_DETAILS = 11;
-    public static final int MAX_LINE = 30;
+    public static final int MAX_LINE = 20;
 
     public enum Type {
         PLAYER, ISLAND, ISLAND_LEVEL;
@@ -159,7 +159,10 @@ public ItemStack getDisplayItem(ChallengeCompletion completion, boolean withCurr
         ItemStack currentChallengeItem = getDisplayItem();
         ItemMeta meta = currentChallengeItem.getItemMeta();
         List<String> lores = new ArrayList<>();
-        lores.addAll(prefix(wordWrap(getDescription(), MAX_LINE), "\u00a77"));
+        for(String str : getDescription().split("\\\\n")) {
+            lores.add("\u00a77"+str);
+        }
+        //lores.addAll(prefix(wordWrap(getDescription(), MAX_LINE), "\u00a77"));
         Reward reward = getReward();
         if (completion.getTimesCompleted() > 0 && isRepeatable()) {
             currentChallengeItem.setAmount(completion.getTimesCompleted() < currentChallengeItem.getMaxStackSize() ? completion.getTimesCompleted() : currentChallengeItem.getMaxStackSize());

uSkyBlock-Core/src/main/java/us/talabrek/ultimateskyblock/command/IslandCommand.java

@@ -77,6 +77,7 @@ public IslandCommand(uSkyBlock plugin, SkyBlockMenu menu) {
         add(new PermCommand(plugin));
         add(new GreetingCommand(plugin));
         add(new Farewellcommand(plugin));
+        add(new TogglePvpCommand(plugin));
     }
 
     @Override

uSkyBlock-Core/src/main/java/us/talabrek/ultimateskyblock/command/island/TogglePvpCommand.java

@@ -0,0 +1,43 @@
+package us.talabrek.ultimateskyblock.command.island;
+
+import com.sk89q.worldguard.protection.flags.Flags;
+import com.sk89q.worldguard.protection.flags.StateFlag;
+import com.sk89q.worldguard.protection.managers.RegionManager;
+import com.sk89q.worldguard.protection.regions.ProtectedRegion;
+import dk.lockfuglsang.minecraft.command.AbstractCommand;
+import org.bukkit.World;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+import us.talabrek.ultimateskyblock.api.IslandInfo;
+import us.talabrek.ultimateskyblock.handler.WorldGuardHandler;
+import us.talabrek.ultimateskyblock.uSkyBlock;
+
+import java.util.Map;
+
+import static dk.lockfuglsang.minecraft.po.I18nUtil.marktr;
+import static dk.lockfuglsang.minecraft.po.I18nUtil.tr;
+
+public class TogglePvpCommand extends AbstractCommand  {
+    private final uSkyBlock plugin;
+
+    public TogglePvpCommand(uSkyBlock plugin) {
+        super("togglepvp", "usb.island.create", marktr("Toggle PVP (allow/deny) of your island"));
+        this.plugin = plugin;
+    }
+
+    @Override
+    public boolean execute(CommandSender sender, String alias, Map<String, Object> data, String... args) {
+        Player player = (Player)sender;
+        IslandInfo islandInfo = uSkyBlock.getInstance().getIslandInfo(player);
+        ProtectedRegion rg = WorldGuardHandler.getIslandRegion(islandInfo.getName()+"island");
+        if(rg.getFlag(Flags.PVP)!=null&&rg.getFlag(Flags.PVP).toString()=="ALLOW"){
+            rg.setFlag(Flags.PVP,null);
+            player.sendMessage(tr("\u00a7bPVP is now denied on your island!"));
+        }else{
+            rg.setFlag(Flags.PVP,StateFlag.State.ALLOW);
+            player.sendMessage(tr("\u00a7bPVP is now allowed on your island!"));
+            player.sendMessage(tr("\u00a7bPlease be careful that in order to protect visitors, you can't attack them. But they can harm island members."));
+        }
+        return true;
+    }
+}

uSkyBlock-Core/src/main/java/us/talabrek/ultimateskyblock/handler/WorldGuardHandler.java

@@ -7,13 +7,15 @@
 import com.sk89q.worldguard.domains.DefaultDomain;
 import com.sk89q.worldguard.internal.platform.WorldGuardPlatform;
 import com.sk89q.worldguard.protection.ApplicableRegionSet;
+import com.sk89q.worldguard.protection.flags.Flag;
 import com.sk89q.worldguard.protection.flags.Flags;
 import com.sk89q.worldguard.protection.flags.StateFlag;
 import com.sk89q.worldguard.protection.managers.RegionManager;
 import com.sk89q.worldguard.protection.regions.GlobalProtectedRegion;
 import com.sk89q.worldguard.protection.regions.ProtectedCuboidRegion;
 import com.sk89q.worldguard.protection.regions.ProtectedRegion;
 import dk.lockfuglsang.minecraft.po.I18nUtil;
+import org.bukkit.Bukkit;
 import org.bukkit.Location;
 import org.bukkit.World;
 import org.bukkit.command.CommandSender;
@@ -212,7 +214,11 @@ public static void islandUnlock(final CommandSender sender, final String islandN
             LogUtil.log(Level.SEVERE, "ERROR: Failed to unlock " + islandName + "'s Island (" + sender.getName() + ")", ex);
         }
     }
-
+    public static ProtectedRegion getIslandRegion(String regionName){
+        RegionManager regionManager = getRegionManager(Bukkit.getWorld(Settings.general_worldName));
+        ProtectedRegion rg = regionManager.getRegion(regionName);
+        return rg;
+    }
     public static BlockVector3 getProtectionVectorLeft(final Location island) {
         return BlockVector3.at(island.getX() + Settings.island_radius - 1, 255.0, island.getZ() + Settings.island_radius - 1);
     }
@@ -247,18 +253,6 @@ public static ProtectedRegion getIslandRegionAt(Location location) {
         }
         return null;
     }
-    public static boolean isPVPAllowed(Location location){
-        RegionManager regionManager = getRegionManager(location.getWorld());
-        if (regionManager == null) {
-            return false;
-        }
-        Iterable<ProtectedRegion> applicableRegions = regionManager.getApplicableRegions(toVector(location));
-        for (ProtectedRegion region : applicableRegions) {
-            String id = region.getId().toLowerCase();
-            System.out.println("region: "+id);
-        }
-        return false;
-    }
     private static BlockVector3 toVector(Location location) {
         return BlockVector3.at(location.getBlockX(), location.getBlockY(), location.getBlockZ());
     }

uSkyBlock-Core/src/main/java/us/talabrek/ultimateskyblock/menu/SkyBlockMenu.java

@@ -778,8 +778,8 @@ private Inventory createMainMenu(Player player) {
 
         menuItem = new ItemStack(Material.IRON_SWORD, 1);
         meta4 = menuItem.getItemMeta();
-        meta4.setDisplayName(tr("\u00a7a\u00a7lAllow pvp"));
-        addLore(lores, "\u00a7f", tr("allow/deny pvp"));
+        meta4.setDisplayName(tr("\u00a7a\u00a7lToggle PVP"));
+        addLore(lores, "\u00a7f", tr("Click to toggle PVP deny/allow state on your island."));
         meta4.setLore(lores);
         menuItem.setItemMeta(meta4);
         menu.setItem(47,menuItem);
@@ -979,6 +979,9 @@ private void onClickMainMenu(InventoryClickEvent event, ItemStack currentItem, P
         } else if (currentItem.getType() == Material.LIGHT_GRAY_BED) {
             p.closeInventory();
             p.performCommand("sethome");
+        } else if (currentItem.getType() == Material.IRON_SWORD) {
+            p.closeInventory();
+            p.performCommand("island togglepvp");
         } else if (currentItem.getType() == Material.PAINTING) {
             p.closeInventory();
             p.performCommand("island top");