From a84a7fcced9b6abb86924c4d50fdde155059295b Mon Sep 17 00:00:00 2001 From: Simplicitee Date: Mon, 4 Feb 2019 23:37:13 -0500 Subject: [PATCH] BentoBox removal, dependency update --- pom.xml | 12 -- .../projectkorra/GeneralMethods.java | 162 +++++++++++------- .../configuration/ConfigManager.java | 7 +- src/plugin.yml | 2 +- 4 files changed, 104 insertions(+), 79 deletions(-) diff --git a/pom.xml b/pom.xml index 57a2bbdf..5ef2b46e 100644 --- a/pom.xml +++ b/pom.xml @@ -26,11 +26,6 @@ spigot-repo https://hub.spigotmc.org/nexus/content/repositories/snapshots/ - - - codemc-repo - https://repo.codemc.org/repository/maven-public/ - @@ -127,13 +122,6 @@ 7.0.0-SNAPSHOT provided - - - world.bentobox - bentobox - LATEST - provided - br.net.fabiozumbi12 diff --git a/src/com/projectkorra/projectkorra/GeneralMethods.java b/src/com/projectkorra/projectkorra/GeneralMethods.java index 7df5abbc..f55507cb 100644 --- a/src/com/projectkorra/projectkorra/GeneralMethods.java +++ b/src/com/projectkorra/projectkorra/GeneralMethods.java @@ -1,8 +1,63 @@ package com.projectkorra.projectkorra; -import br.net.fabiozumbi12.RedProtect.Bukkit.API.RedProtectAPI; -import br.net.fabiozumbi12.RedProtect.Bukkit.RedProtect; -import br.net.fabiozumbi12.RedProtect.Bukkit.Region; +import java.io.BufferedReader; +import java.io.BufferedWriter; +import java.io.DataInputStream; +import java.io.DataOutputStream; +import java.io.File; +import java.io.FileInputStream; +import java.io.FileOutputStream; +import java.io.FileWriter; +import java.io.IOException; +import java.io.InputStreamReader; +import java.io.OutputStreamWriter; +import java.io.PrintWriter; +import java.lang.reflect.Field; +import java.lang.reflect.Method; +import java.sql.ResultSet; +import java.sql.SQLException; +import java.text.DateFormat; +import java.text.SimpleDateFormat; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; +import java.util.Collections; +import java.util.Date; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.UUID; +import java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.CopyOnWriteArrayList; + +import org.bukkit.Bukkit; +import org.bukkit.ChatColor; +import org.bukkit.Color; +import org.bukkit.GameMode; +import org.bukkit.Location; +import org.bukkit.Material; +import org.bukkit.World; +import org.bukkit.block.Block; +import org.bukkit.block.BlockFace; +import org.bukkit.block.BlockState; +import org.bukkit.block.data.BlockData; +import org.bukkit.block.data.Levelled; +import org.bukkit.command.CommandSender; +import org.bukkit.entity.Entity; +import org.bukkit.entity.EntityType; +import org.bukkit.entity.FallingBlock; +import org.bukkit.entity.LivingEntity; +import org.bukkit.entity.Player; +import org.bukkit.entity.TNTPrimed; +import org.bukkit.inventory.ItemStack; +import org.bukkit.plugin.Plugin; +import org.bukkit.plugin.PluginManager; +import org.bukkit.plugin.java.JavaPlugin; +import org.bukkit.scheduler.BukkitRunnable; +import org.bukkit.util.Vector; + import com.bekvon.bukkit.residence.Residence; import com.bekvon.bukkit.residence.api.ResidenceInterface; import com.bekvon.bukkit.residence.protection.ClaimedResidence; @@ -21,16 +76,37 @@ import com.griefcraft.model.Protection; import com.palmergames.bukkit.towny.Towny; import com.palmergames.bukkit.towny.TownyMessaging; import com.palmergames.bukkit.towny.TownySettings; -import com.palmergames.bukkit.towny.object.*; +import com.palmergames.bukkit.towny.object.Coord; +import com.palmergames.bukkit.towny.object.PlayerCache; import com.palmergames.bukkit.towny.object.PlayerCache.TownBlockStatus; +import com.palmergames.bukkit.towny.object.TownyPermission; +import com.palmergames.bukkit.towny.object.TownyUniverse; +import com.palmergames.bukkit.towny.object.TownyWorld; +import com.palmergames.bukkit.towny.object.WorldCoord; import com.palmergames.bukkit.towny.utils.PlayerCacheUtil; import com.palmergames.bukkit.towny.war.flagwar.TownyWar; import com.palmergames.bukkit.towny.war.flagwar.TownyWarConfig; import com.projectkorra.projectkorra.Element.SubElement; -import com.projectkorra.projectkorra.ability.*; -import com.projectkorra.projectkorra.ability.util.*; +import com.projectkorra.projectkorra.ability.Ability; +import com.projectkorra.projectkorra.ability.AddonAbility; +import com.projectkorra.projectkorra.ability.CoreAbility; +import com.projectkorra.projectkorra.ability.EarthAbility; +import com.projectkorra.projectkorra.ability.ElementalAbility; +import com.projectkorra.projectkorra.ability.FireAbility; +import com.projectkorra.projectkorra.ability.PassiveAbility; +import com.projectkorra.projectkorra.ability.WaterAbility; +import com.projectkorra.projectkorra.ability.util.Collision; +import com.projectkorra.projectkorra.ability.util.CollisionInitializer; +import com.projectkorra.projectkorra.ability.util.CollisionManager; +import com.projectkorra.projectkorra.ability.util.ComboManager; import com.projectkorra.projectkorra.ability.util.ComboManager.AbilityInformation; -import com.projectkorra.projectkorra.airbending.*; +import com.projectkorra.projectkorra.ability.util.MultiAbilityManager; +import com.projectkorra.projectkorra.ability.util.PassiveManager; +import com.projectkorra.projectkorra.airbending.AirBlast; +import com.projectkorra.projectkorra.airbending.AirShield; +import com.projectkorra.projectkorra.airbending.AirSpout; +import com.projectkorra.projectkorra.airbending.AirSuction; +import com.projectkorra.projectkorra.airbending.AirSwipe; import com.projectkorra.projectkorra.configuration.ConfigManager; import com.projectkorra.projectkorra.earthbending.EarthBlast; import com.projectkorra.projectkorra.earthbending.passive.EarthPassive; @@ -42,8 +118,16 @@ import com.projectkorra.projectkorra.firebending.FireShield; import com.projectkorra.projectkorra.firebending.combustion.Combustion; import com.projectkorra.projectkorra.object.Preset; import com.projectkorra.projectkorra.storage.DBConnection; -import com.projectkorra.projectkorra.util.*; +import com.projectkorra.projectkorra.util.ActionBar; +import com.projectkorra.projectkorra.util.BlockCacheElement; +import com.projectkorra.projectkorra.util.ColoredParticle; +import com.projectkorra.projectkorra.util.MovementHandler; +import com.projectkorra.projectkorra.util.ParticleEffect; +import com.projectkorra.projectkorra.util.ReflectionHandler; import com.projectkorra.projectkorra.util.ReflectionHandler.PackageType; +import com.projectkorra.projectkorra.util.TempArmor; +import com.projectkorra.projectkorra.util.TempArmorStand; +import com.projectkorra.projectkorra.util.TempBlock; import com.projectkorra.projectkorra.waterbending.WaterManipulation; import com.projectkorra.projectkorra.waterbending.WaterSpout; import com.sk89q.worldedit.bukkit.BukkitAdapter; @@ -55,6 +139,10 @@ import com.songoda.kingdoms.constants.land.Land; import com.songoda.kingdoms.constants.land.SimpleChunkLocation; import com.songoda.kingdoms.constants.player.KingdomPlayer; import com.songoda.kingdoms.manager.game.GameManagement; + +import br.net.fabiozumbi12.RedProtect.Bukkit.RedProtect; +import br.net.fabiozumbi12.RedProtect.Bukkit.Region; +import br.net.fabiozumbi12.RedProtect.Bukkit.API.RedProtectAPI; import me.markeh.factionsframework.entities.FPlayer; import me.markeh.factionsframework.entities.FPlayers; import me.markeh.factionsframework.entities.Faction; @@ -66,34 +154,6 @@ import net.md_5.bungee.api.chat.ClickEvent; import net.md_5.bungee.api.chat.ComponentBuilder; import net.md_5.bungee.api.chat.HoverEvent; import net.md_5.bungee.api.chat.TextComponent; -import org.bukkit.*; -import org.bukkit.block.Block; -import org.bukkit.block.BlockFace; -import org.bukkit.block.BlockState; -import org.bukkit.block.data.BlockData; -import org.bukkit.block.data.Levelled; -import org.bukkit.command.CommandSender; -import org.bukkit.entity.*; -import org.bukkit.inventory.ItemStack; -import org.bukkit.plugin.Plugin; -import org.bukkit.plugin.PluginManager; -import org.bukkit.plugin.java.JavaPlugin; -import org.bukkit.scheduler.BukkitRunnable; -import org.bukkit.util.Vector; -import world.bentobox.bentobox.BentoBox; -import world.bentobox.bentobox.api.user.User; -import world.bentobox.bentobox.database.objects.Island; - -import java.io.*; -import java.lang.reflect.Field; -import java.lang.reflect.Method; -import java.sql.ResultSet; -import java.sql.SQLException; -import java.text.DateFormat; -import java.text.SimpleDateFormat; -import java.util.*; -import java.util.concurrent.ConcurrentHashMap; -import java.util.concurrent.CopyOnWriteArrayList; public class GeneralMethods { @@ -1363,10 +1423,9 @@ public class GeneralMethods { final boolean respectGriefPrevention = ConfigManager.defaultConfig.get().getBoolean("Properties.RegionProtection.RespectGriefPrevention"); final boolean respectLWC = ConfigManager.defaultConfig.get().getBoolean("Properties.RegionProtection.RespectLWC"); final boolean respectResidence = ConfigManager.defaultConfig.get().getBoolean("Properties.RegionProtection.Residence.Respect"); - final boolean respectKingdoms = ConfigManager.defaultConfig.get().getBoolean("Properties.RegionProtection.Kingdoms"); - final boolean respectPlotSquared = ConfigManager.defaultConfig.get().getBoolean("Properties.RegionProtection.PlotSquared"); - final boolean respectRedProtect = ConfigManager.defaultConfig.get().getBoolean("Properties.RegionProtection.RedProtect"); - final boolean respectBentoBox = ConfigManager.defaultConfig.get().getBoolean("Properties.RegionProtection.BentoBox"); + final boolean respectKingdoms = ConfigManager.defaultConfig.get().getBoolean("Properties.RegionProtection.RespectKingdoms"); + final boolean respectPlotSquared = ConfigManager.defaultConfig.get().getBoolean("Properties.RegionProtection.RespectPlotSquared"); + final boolean respectRedProtect = ConfigManager.defaultConfig.get().getBoolean("Properties.RegionProtection.RespectRedProtect"); boolean isIgnite = false; boolean isExplosive = false; @@ -1389,7 +1448,7 @@ public class GeneralMethods { final Plugin wgp = pm.getPlugin("WorldGuard"); //final Plugin psp = pm.getPlugin("PreciousStones"); - final Plugin facsfw = pm.getPlugin("FactionsFramework "); + final Plugin facsfw = pm.getPlugin("FactionsFramework"); final Plugin twnp = pm.getPlugin("Towny"); final Plugin gpp = pm.getPlugin("GriefPrevention"); final Plugin lwc = pm.getPlugin("LWC"); @@ -1397,7 +1456,6 @@ public class GeneralMethods { final Plugin kingdoms = pm.getPlugin("Kingdoms"); final Plugin plotsquared = pm.getPlugin("PlotSquared"); final Plugin redprotect = pm.getPlugin("RedProtect"); - final Plugin bentobox = pm.getPlugin("BentoBox"); for (final Location location : new Location[] { loc, player.getLocation() }) { final World world = location.getWorld(); @@ -1592,26 +1650,6 @@ public class GeneralMethods { return true; } } - - if (bentobox != null && respectBentoBox) { - BentoBox bentoBoxPlugin = BentoBox.getInstance(); - if (bentoBoxPlugin.getIWM().inWorld(loc)) { - Optional island = bentoBoxPlugin.getIslands().getProtectedIslandAt(loc); - if (!(player.isOp() || player.hasPermission(bentoBoxPlugin.getIWM().getPermissionPrefix(loc.getWorld()) + ".mod.bypass.BREAK_BLOCKS.everywhere"))){ - if (island.isPresent()) { - if (!island.get().isAllowed(User.getInstance(player), bentoBoxPlugin.getFlagsManager().getFlagByID("BREAK_BLOCKS"))) { - return true; - } - if (!(player.hasPermission(bentoBoxPlugin.getIWM().getPermissionPrefix(loc.getWorld()) + ".mod.bypass.BREAK_BLOCKS.island"))) { - return true; - } - } - if (!bentoBoxPlugin.getFlagsManager().getFlagByID("BREAK_BLOCKS").isSetForWorld(loc.getWorld())) { - return true; - } - } - } - } } return false; } diff --git a/src/com/projectkorra/projectkorra/configuration/ConfigManager.java b/src/com/projectkorra/projectkorra/configuration/ConfigManager.java index f8021040..25278eb7 100644 --- a/src/com/projectkorra/projectkorra/configuration/ConfigManager.java +++ b/src/com/projectkorra/projectkorra/configuration/ConfigManager.java @@ -566,10 +566,9 @@ public class ConfigManager { config.addDefault("Properties.RegionProtection.RespectLWC", true); config.addDefault("Properties.RegionProtection.Residence.Flag", "bending"); config.addDefault("Properties.RegionProtection.Residence.Respect", true); - config.addDefault("Properties.RegionProtection.Kingdoms", true); - config.addDefault("Properties.RegionProtection.PlotSquared", true); - config.addDefault("Properties.RegionProtection.RedProtect", true); - config.addDefault("Properties.RegionProtection.BentoBox", true); + config.addDefault("Properties.RegionProtection.RespectKingdoms", true); + config.addDefault("Properties.RegionProtection.RespectPlotSquared", true); + config.addDefault("Properties.RegionProtection.RespectRedProtect", true); config.addDefault("Properties.RegionProtection.CacheBlockTime", 5000); config.addDefault("Properties.Air.CanBendWithWeapons", false); diff --git a/src/plugin.yml b/src/plugin.yml index df48764c..f8eebf03 100644 --- a/src/plugin.yml +++ b/src/plugin.yml @@ -3,7 +3,7 @@ author: ProjectKorra api-version: 1.13 version: ${project.version} main: com.projectkorra.projectkorra.ProjectKorra -softdepend: [PreciousStones, WorldGuard, WorldEdit, Factions, MassiveCore, GriefPrevention, Towny, NoCheatPlus, LWC, Residence, Kingdoms] +softdepend: [PreciousStones, WorldGuard, WorldEdit, FactionsFramework, GriefPrevention, Towny, NoCheatPlus, LWC, Residence, Kingdoms, PlotSquared, RedProtect] commands: projectkorra: aliases: [b,bending,mtla,tla,korra,pk,bend]