diff --git a/pom.xml b/pom.xml index dac88ba..cf22865 100644 --- a/pom.xml +++ b/pom.xml @@ -36,7 +36,7 @@ org.apache.maven.plugins maven-compiler-plugin - 3.8.0 + 3.10.1 1.8 1.8 @@ -74,7 +74,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.3.1 + 3.4.0 compile @@ -110,8 +110,8 @@ - sk89q-repo - https://maven.sk89q.com/repo/ + enginehub-maven + https://maven.enginehub.org/repo/ @@ -135,17 +135,13 @@ MMOPlugins - https://mvn.lumine.io/repository/maven-public/ + https://mvn.lumine.io/repository/maven/ Lichtspiele https://nexus.lichtspiele.org/repository/releases/ - - lumine - https://mvn.lumine.io/repository/maven/ - @@ -153,7 +149,7 @@ org.spigotmc spigot-api - 1.18.2-R0.1-SNAPSHOT + 1.19-R0.1-SNAPSHOT provided @@ -170,7 +166,7 @@ org.bstats bstats-bukkit - 2.2.1 + 3.0.0 compile @@ -201,7 +197,7 @@ com.sk89q.worldedit worldedit-bukkit - 7.2.5 + 7.2.11-beta-01 provided @@ -213,7 +209,7 @@ com.sk89q.worldedit worldedit-core - 7.2.5 + 7.2.11-beta-01 provided @@ -239,7 +235,7 @@ com.griefcraft.lwc LWCX - 2.2.6 + 2.2.8 provided @@ -272,7 +268,7 @@ com.github.slimefun Slimefun4 - RC-27 + RC-32 provided + io.lumine MythicLib-dist 1.3.1 @@ -292,28 +289,28 @@ com.acrobot.chestshop chestshop - 3.12 + 3.12.2 provided com.github.TownyAdvanced Towny - 0.97.0.0 + 0.98.3.0 provided com.nisovin.shopkeepers ShopkeepersAPI - 2.12.0 + 2.16.0 provided nl.rutgerkok blocklocker - 1.9.2 + 1.10.4 provided diff --git a/src/com/dre/brewery/BPlayer.java b/src/com/dre/brewery/BPlayer.java index ec97be9..4707443 100644 --- a/src/com/dre/brewery/BPlayer.java +++ b/src/com/dre/brewery/BPlayer.java @@ -11,7 +11,6 @@ import com.dre.brewery.utility.BUtil; import com.dre.brewery.utility.PermissionUtil; import net.md_5.bungee.api.ChatMessageType; import net.md_5.bungee.api.chat.TextComponent; -import org.apache.commons.lang.mutable.MutableInt; import org.bukkit.Location; import org.bukkit.Material; import org.bukkit.OfflinePlayer; @@ -32,7 +31,7 @@ import java.util.*; public class BPlayer { private static Map players = new HashMap<>();// Players uuid and BPlayer - private static Map pTasks = new HashMap<>();// Player and count + private static Map pTasks = new HashMap<>();// Player and count private static int taskId; private static Random pukeRand; @@ -576,21 +575,22 @@ public class BPlayer { if (pTasks.isEmpty()) { taskId = P.p.getServer().getScheduler().scheduleSyncRepeatingTask(P.p, BPlayer::pukeTask, 1L, 1L); } - pTasks.put(player, new MutableInt(event.getCount())); + pTasks.put(player, event.getCount()); } public static void pukeTask() { - for (Iterator> iter = pTasks.entrySet().iterator(); iter.hasNext(); ) { - Map.Entry entry = iter.next(); + for (Iterator> iter = pTasks.entrySet().iterator(); iter.hasNext(); ) { + Map.Entry entry = iter.next(); Player player = entry.getKey(); - MutableInt count = entry.getValue(); + int count = entry.getValue(); if (!player.isValid() || !player.isOnline()) { iter.remove(); } puke(player); - count.decrement(); - if (count.intValue() <= 0) { + if (count <= 1) { iter.remove(); + } else { + entry.setValue(count - 1); } } if (pTasks.isEmpty()) { diff --git a/src/com/dre/brewery/P.java b/src/com/dre/brewery/P.java index ff54b1d..e3495a2 100644 --- a/src/com/dre/brewery/P.java +++ b/src/com/dre/brewery/P.java @@ -39,7 +39,6 @@ import com.dre.brewery.recipe.*; import com.dre.brewery.utility.BUtil; import com.dre.brewery.utility.LegacyUtil; import com.dre.brewery.utility.Stats; -import org.apache.commons.lang.math.NumberUtils; import org.bukkit.Bukkit; import org.bukkit.ChatColor; import org.bukkit.Material; @@ -331,9 +330,39 @@ public class P extends JavaPlugin { } public int parseInt(String string) { - return NumberUtils.toInt(string, 0); + if (string == null) { + return 0; + } + try { + return Integer.parseInt(string); + } catch (NumberFormatException ignored) { + return 0; + } } + public double parseDouble(String string) { + if (string == null) { + return 0; + } + try { + return Double.parseDouble(string); + } catch (NumberFormatException ignored) { + return 0; + } + } + + public float parseFloat(String string) { + if (string == null) { + return 0; + } + try { + return Float.parseFloat(string); + } catch (NumberFormatException ignored) { + return 0; + } + } + + public String color(String msg) { return BUtil.color(msg); } diff --git a/src/com/dre/brewery/api/BreweryApi.java b/src/com/dre/brewery/api/BreweryApi.java index bd58178..1740dae 100644 --- a/src/com/dre/brewery/api/BreweryApi.java +++ b/src/com/dre/brewery/api/BreweryApi.java @@ -7,7 +7,6 @@ import com.dre.brewery.recipe.BCauldronRecipe; import com.dre.brewery.recipe.BRecipe; import com.dre.brewery.Barrel; import com.dre.brewery.Brew; -import org.apache.commons.lang.NotImplementedException; import org.bukkit.block.Block; import org.bukkit.entity.Player; import org.bukkit.inventory.Inventory; @@ -356,7 +355,7 @@ public class BreweryApi { public static void addRecipe(BRecipe recipe, boolean saveForever) { //recipe.setSaveInData(saveForever); if (saveForever) { - throw new NotImplementedException("SaveForever is not implemented yet"); + throw new UnsupportedOperationException("SaveForever is not implemented yet"); } BRecipe.getAddedRecipes().add(recipe); recipe.updateAcceptedLists(); @@ -424,7 +423,7 @@ public class BreweryApi { public static void addCauldronRecipe(BCauldronRecipe recipe, boolean saveForever) { //recipe.setSaveInData(saveForever); if (saveForever) { - throw new NotImplementedException(); + throw new UnsupportedOperationException(); } BCauldronRecipe.getAddedRecipes().add(recipe); recipe.updateAcceptedLists(); diff --git a/src/com/dre/brewery/filedata/BData.java b/src/com/dre/brewery/filedata/BData.java index 383da4f..d9b544d 100644 --- a/src/com/dre/brewery/filedata/BData.java +++ b/src/com/dre/brewery/filedata/BData.java @@ -8,8 +8,6 @@ import com.dre.brewery.recipe.PluginItem; import com.dre.brewery.recipe.SimpleItem; import com.dre.brewery.utility.BUtil; import com.dre.brewery.utility.BoundingBox; -import org.apache.commons.lang.ArrayUtils; -import org.apache.commons.lang.math.NumberUtils; import org.bukkit.Location; import org.bukkit.Material; import org.bukkit.World; @@ -24,6 +22,7 @@ import java.io.File; import java.io.IOException; import java.util.*; import java.util.concurrent.atomic.AtomicInteger; +import java.util.stream.IntStream; public class BData { @@ -363,7 +362,7 @@ public class BData { if (woLength > 1) { System.arraycopy(wo, 0, points, st.length, woLength); } - int[] locs = ArrayUtils.toPrimitive(Arrays.stream(points).map(s -> P.p.parseInt(s)).toArray(Integer[]::new)); + int[] locs = Arrays.stream(points).mapToInt(s -> P.p.parseInt(s)).toArray(); try { box = BoundingBox.fromPoints(locs); } catch (Exception e) { @@ -406,11 +405,11 @@ public class BData { String[] splitted = loc.split("/"); if (splitted.length == 5) { - double x = NumberUtils.toDouble(splitted[0]); - double y = NumberUtils.toDouble(splitted[1]); - double z = NumberUtils.toDouble(splitted[2]); - float pitch = NumberUtils.toFloat(splitted[3]); - float yaw = NumberUtils.toFloat(splitted[4]); + double x = P.p.parseDouble(splitted[0]); + double y = P.p.parseDouble(splitted[1]); + double z = P.p.parseDouble(splitted[2]); + float pitch = P.p.parseFloat(splitted[3]); + float yaw = P.p.parseFloat(splitted[4]); Location location = new Location(world, x, y, z, yaw, pitch); initWakeups.add(new Wakeup(location)); diff --git a/src/com/dre/brewery/filedata/UpdateChecker.java b/src/com/dre/brewery/filedata/UpdateChecker.java index 757c980..73ab0fd 100644 --- a/src/com/dre/brewery/filedata/UpdateChecker.java +++ b/src/com/dre/brewery/filedata/UpdateChecker.java @@ -81,11 +81,8 @@ public class UpdateChecker implements Runnable { // Read the response of the query final BufferedReader reader = new BufferedReader(new InputStreamReader(conn.getInputStream())); - JsonParser parser = new JsonParser(); - - // Parse the array of files from the query's response - JsonArray array = parser.parse(reader).getAsJsonArray(); + JsonArray array = JsonParser.parseReader(reader).getAsJsonArray(); if (array.size() > 0) { // Get the newest file's details diff --git a/src/com/dre/brewery/integration/barrel/TownyBarrel.java b/src/com/dre/brewery/integration/barrel/TownyBarrel.java index d5adb4e..1692790 100644 --- a/src/com/dre/brewery/integration/barrel/TownyBarrel.java +++ b/src/com/dre/brewery/integration/barrel/TownyBarrel.java @@ -6,18 +6,24 @@ import com.dre.brewery.api.events.barrel.BarrelAccessEvent; import com.palmergames.bukkit.towny.TownySettings; import com.palmergames.bukkit.towny.object.TownyPermission; import com.palmergames.bukkit.towny.utils.PlayerCacheUtil; +import org.bukkit.Location; import org.bukkit.Material; public class TownyBarrel { public static boolean checkAccess(BarrelAccessEvent event) { - if (!TownySettings.isSwitchMaterial("BREWERY") && !TownySettings.isSwitchMaterial("BARREL")) { - if (P.use1_14) { + Location barrelLoc = event.getSpigot().getLocation(); + Material mat = P.use1_14 ? Material.BARREL : Material.CHEST; + + try { + if (!TownySettings.isSwitchMaterial(mat, barrelLoc)) { return true; - } else if (!TownySettings.isSwitchMaterial("CHEST")) { + } + } catch (Exception e) { + //noinspection deprecation + if (!TownySettings.isSwitchMaterial("CHEST")) { return true; } } - Material mat = P.use1_14 ? Material.BARREL : Material.CHEST; - return PlayerCacheUtil.getCachePermission(event.getPlayer(), event.getSpigot().getLocation(), mat, TownyPermission.ActionType.SWITCH); + return PlayerCacheUtil.getCachePermission(event.getPlayer(), barrelLoc, mat, TownyPermission.ActionType.SWITCH); } } diff --git a/src/com/dre/brewery/recipe/BRecipe.java b/src/com/dre/brewery/recipe/BRecipe.java index f649dfc..a6da0c5 100644 --- a/src/com/dre/brewery/recipe/BRecipe.java +++ b/src/com/dre/brewery/recipe/BRecipe.java @@ -7,7 +7,6 @@ import com.dre.brewery.filedata.BConfig; import com.dre.brewery.utility.BUtil; import com.dre.brewery.utility.StringParser; import com.dre.brewery.utility.Tuple; -import org.apache.commons.lang.NotImplementedException; import org.bukkit.Color; import org.bukkit.Material; import org.bukkit.configuration.ConfigurationSection; @@ -717,7 +716,7 @@ public class BRecipe { } public void setSaveInData(boolean saveInData) { - throw new NotImplementedException(); + throw new UnsupportedOperationException(); //this.saveInData = saveInData; } diff --git a/src/com/dre/brewery/utility/PermissionUtil.java b/src/com/dre/brewery/utility/PermissionUtil.java index a033e1f..e0a8535 100644 --- a/src/com/dre/brewery/utility/PermissionUtil.java +++ b/src/com/dre/brewery/utility/PermissionUtil.java @@ -1,6 +1,5 @@ package com.dre.brewery.utility; -import org.apache.commons.lang.math.NumberUtils; import org.bukkit.command.CommandSender; import org.bukkit.permissions.Permissible; import org.bukkit.permissions.PermissionAttachmentInfo; @@ -125,10 +124,12 @@ public class PermissionUtil { if (found.isPresent()) { String permission = found.get().getPermission(); int lastDot = permission.lastIndexOf('.'); - int value = NumberUtils.toInt(permission.substring(lastDot + 1), -1); - if (value >= 0) { - return value; - } + try { + int value = Integer.parseInt(permission.substring(lastDot + 1)); + if (value >= 0) { + return value; + } + } catch (NumberFormatException ignored) {} } return -1; }