From b0522b7fe7f7a3e1f0359fbc7bcfeab4e5188479 Mon Sep 17 00:00:00 2001 From: Flowsqy <47575244+Flowsqy@users.noreply.github.com> Date: Sun, 17 Apr 2022 22:07:54 +0200 Subject: [PATCH] Move every external plugins references in a dedicated module --- external/pom.xml | 62 ++++++++++ .../external/flags}/BentoBoxShopFlag.java | 2 +- .../flags}/PlotSquaredOldShopFlag.java | 2 +- .../external/flags}/PlotSquaredShopFlag.java | 2 +- .../external/flags}/WorldGuardShopFlag.java | 2 +- .../external/listeners/ASkyBlockListener.java | 0 .../external/listeners/BentoBoxListener.java | 2 +- .../listeners/GriefPreventionListener.java | 0 .../listeners/IslandWorldListener.java | 0 .../listeners/PlotSquaredListener.java | 4 +- .../external/listeners/TownyListener.java | 0 .../external/listeners/USkyBlockListener.java | 0 .../listeners/WorldGuardListener.java | 0 .../listeners2}/AreaShopListener.java | 2 +- .../listeners2}/BentoBoxListener.java | 2 +- .../listeners2}/WorldGuardListener.java | 0 plugin/pom.xml | 44 ------- .../java/de/epiceric/shopchest/ShopChest.java | 113 ++++++++---------- .../listeners/ShopInteractListener.java | 27 +++-- pom.xml | 10 +- 20 files changed, 150 insertions(+), 124 deletions(-) create mode 100644 external/pom.xml rename {plugin/src/main/java/de/epiceric/shopchest/external => external/src/main/java/de/epiceric/shopchest/external/flags}/BentoBoxShopFlag.java (97%) rename {plugin/src/main/java/de/epiceric/shopchest/external => external/src/main/java/de/epiceric/shopchest/external/flags}/PlotSquaredOldShopFlag.java (98%) rename {plugin/src/main/java/de/epiceric/shopchest/external => external/src/main/java/de/epiceric/shopchest/external/flags}/PlotSquaredShopFlag.java (99%) rename {plugin/src/main/java/de/epiceric/shopchest/external => external/src/main/java/de/epiceric/shopchest/external/flags}/WorldGuardShopFlag.java (96%) rename {plugin => external}/src/main/java/de/epiceric/shopchest/external/listeners/ASkyBlockListener.java (100%) rename {plugin => external}/src/main/java/de/epiceric/shopchest/external/listeners/BentoBoxListener.java (97%) rename {plugin => external}/src/main/java/de/epiceric/shopchest/external/listeners/GriefPreventionListener.java (100%) rename {plugin => external}/src/main/java/de/epiceric/shopchest/external/listeners/IslandWorldListener.java (100%) rename {plugin => external}/src/main/java/de/epiceric/shopchest/external/listeners/PlotSquaredListener.java (97%) rename {plugin => external}/src/main/java/de/epiceric/shopchest/external/listeners/TownyListener.java (100%) rename {plugin => external}/src/main/java/de/epiceric/shopchest/external/listeners/USkyBlockListener.java (100%) rename {plugin => external}/src/main/java/de/epiceric/shopchest/external/listeners/WorldGuardListener.java (100%) rename {plugin/src/main/java/de/epiceric/shopchest/listeners => external/src/main/java/de/epiceric/shopchest/external/listeners2}/AreaShopListener.java (97%) rename {plugin/src/main/java/de/epiceric/shopchest/listeners => external/src/main/java/de/epiceric/shopchest/external/listeners2}/BentoBoxListener.java (98%) rename {plugin/src/main/java/de/epiceric/shopchest/listeners => external/src/main/java/de/epiceric/shopchest/external/listeners2}/WorldGuardListener.java (100%) diff --git a/external/pom.xml b/external/pom.xml new file mode 100644 index 0000000..a4f75fa --- /dev/null +++ b/external/pom.xml @@ -0,0 +1,62 @@ + + + + ShopChest-parent + de.epiceric + 1.14.0-SNAPSHOT + + 4.0.0 + + shopchest-external + 1.0.0 + + + + org.spigotmc + spigot-api + + + fr.xephi + authme + + + com.plotsquared + PlotSquared-Core + + + com.github.rlf.uSkyBlock + uSkyBlock-API + + + com.wasteofplastic + askyblock + + + com.github.TechFortress + GriefPrevention + + + me.wiefferink + areashop + + + world.bentobox + bentobox + + + com.github.IntellectualSites.PlotSquared + Core + + + com.github.TownyAdvanced + Towny + + + pl.gnacik.islandworld + IslandWorld + + + + \ No newline at end of file diff --git a/plugin/src/main/java/de/epiceric/shopchest/external/BentoBoxShopFlag.java b/external/src/main/java/de/epiceric/shopchest/external/flags/BentoBoxShopFlag.java similarity index 97% rename from plugin/src/main/java/de/epiceric/shopchest/external/BentoBoxShopFlag.java rename to external/src/main/java/de/epiceric/shopchest/external/flags/BentoBoxShopFlag.java index 2e0333e..eab1938 100644 --- a/plugin/src/main/java/de/epiceric/shopchest/external/BentoBoxShopFlag.java +++ b/external/src/main/java/de/epiceric/shopchest/external/flags/BentoBoxShopFlag.java @@ -1,4 +1,4 @@ -package de.epiceric.shopchest.external; +package de.epiceric.shopchest.external.flags; import org.bukkit.Material; diff --git a/plugin/src/main/java/de/epiceric/shopchest/external/PlotSquaredOldShopFlag.java b/external/src/main/java/de/epiceric/shopchest/external/flags/PlotSquaredOldShopFlag.java similarity index 98% rename from plugin/src/main/java/de/epiceric/shopchest/external/PlotSquaredOldShopFlag.java rename to external/src/main/java/de/epiceric/shopchest/external/flags/PlotSquaredOldShopFlag.java index 8eb8a27..e12a42e 100644 --- a/plugin/src/main/java/de/epiceric/shopchest/external/PlotSquaredOldShopFlag.java +++ b/external/src/main/java/de/epiceric/shopchest/external/flags/PlotSquaredOldShopFlag.java @@ -1,4 +1,4 @@ -package de.epiceric.shopchest.external; +package de.epiceric.shopchest.external.flags; import com.github.intellectualsites.plotsquared.plot.flag.Flag; import com.github.intellectualsites.plotsquared.plot.flag.Flags; diff --git a/plugin/src/main/java/de/epiceric/shopchest/external/PlotSquaredShopFlag.java b/external/src/main/java/de/epiceric/shopchest/external/flags/PlotSquaredShopFlag.java similarity index 99% rename from plugin/src/main/java/de/epiceric/shopchest/external/PlotSquaredShopFlag.java rename to external/src/main/java/de/epiceric/shopchest/external/flags/PlotSquaredShopFlag.java index 8ecaa86..e755e40 100644 --- a/plugin/src/main/java/de/epiceric/shopchest/external/PlotSquaredShopFlag.java +++ b/external/src/main/java/de/epiceric/shopchest/external/flags/PlotSquaredShopFlag.java @@ -1,4 +1,4 @@ -package de.epiceric.shopchest.external; +package de.epiceric.shopchest.external.flags; import java.util.Arrays; import java.util.Collection; diff --git a/plugin/src/main/java/de/epiceric/shopchest/external/WorldGuardShopFlag.java b/external/src/main/java/de/epiceric/shopchest/external/flags/WorldGuardShopFlag.java similarity index 96% rename from plugin/src/main/java/de/epiceric/shopchest/external/WorldGuardShopFlag.java rename to external/src/main/java/de/epiceric/shopchest/external/flags/WorldGuardShopFlag.java index 266d819..32c2574 100644 --- a/plugin/src/main/java/de/epiceric/shopchest/external/WorldGuardShopFlag.java +++ b/external/src/main/java/de/epiceric/shopchest/external/flags/WorldGuardShopFlag.java @@ -1,4 +1,4 @@ -package de.epiceric.shopchest.external; +package de.epiceric.shopchest.external.flags; import java.util.Optional; diff --git a/plugin/src/main/java/de/epiceric/shopchest/external/listeners/ASkyBlockListener.java b/external/src/main/java/de/epiceric/shopchest/external/listeners/ASkyBlockListener.java similarity index 100% rename from plugin/src/main/java/de/epiceric/shopchest/external/listeners/ASkyBlockListener.java rename to external/src/main/java/de/epiceric/shopchest/external/listeners/ASkyBlockListener.java diff --git a/plugin/src/main/java/de/epiceric/shopchest/external/listeners/BentoBoxListener.java b/external/src/main/java/de/epiceric/shopchest/external/listeners/BentoBoxListener.java similarity index 97% rename from plugin/src/main/java/de/epiceric/shopchest/external/listeners/BentoBoxListener.java rename to external/src/main/java/de/epiceric/shopchest/external/listeners/BentoBoxListener.java index 736bba9..052cf29 100644 --- a/plugin/src/main/java/de/epiceric/shopchest/external/listeners/BentoBoxListener.java +++ b/external/src/main/java/de/epiceric/shopchest/external/listeners/BentoBoxListener.java @@ -13,7 +13,7 @@ import de.epiceric.shopchest.ShopChest; import de.epiceric.shopchest.config.Config; import de.epiceric.shopchest.event.ShopCreateEvent; import de.epiceric.shopchest.event.ShopExtendEvent; -import de.epiceric.shopchest.external.BentoBoxShopFlag; +import de.epiceric.shopchest.external.flags.BentoBoxShopFlag; import de.epiceric.shopchest.utils.Utils; import world.bentobox.bentobox.api.flags.FlagListener; diff --git a/plugin/src/main/java/de/epiceric/shopchest/external/listeners/GriefPreventionListener.java b/external/src/main/java/de/epiceric/shopchest/external/listeners/GriefPreventionListener.java similarity index 100% rename from plugin/src/main/java/de/epiceric/shopchest/external/listeners/GriefPreventionListener.java rename to external/src/main/java/de/epiceric/shopchest/external/listeners/GriefPreventionListener.java diff --git a/plugin/src/main/java/de/epiceric/shopchest/external/listeners/IslandWorldListener.java b/external/src/main/java/de/epiceric/shopchest/external/listeners/IslandWorldListener.java similarity index 100% rename from plugin/src/main/java/de/epiceric/shopchest/external/listeners/IslandWorldListener.java rename to external/src/main/java/de/epiceric/shopchest/external/listeners/IslandWorldListener.java diff --git a/plugin/src/main/java/de/epiceric/shopchest/external/listeners/PlotSquaredListener.java b/external/src/main/java/de/epiceric/shopchest/external/listeners/PlotSquaredListener.java similarity index 97% rename from plugin/src/main/java/de/epiceric/shopchest/external/listeners/PlotSquaredListener.java rename to external/src/main/java/de/epiceric/shopchest/external/listeners/PlotSquaredListener.java index 2b000b0..6ca1b65 100644 --- a/plugin/src/main/java/de/epiceric/shopchest/external/listeners/PlotSquaredListener.java +++ b/external/src/main/java/de/epiceric/shopchest/external/listeners/PlotSquaredListener.java @@ -11,8 +11,8 @@ import de.epiceric.shopchest.ShopChest; import de.epiceric.shopchest.config.Config; import de.epiceric.shopchest.event.ShopCreateEvent; import de.epiceric.shopchest.event.ShopExtendEvent; -import de.epiceric.shopchest.external.PlotSquaredOldShopFlag; -import de.epiceric.shopchest.external.PlotSquaredShopFlag; +import de.epiceric.shopchest.external.flags.PlotSquaredOldShopFlag; +import de.epiceric.shopchest.external.flags.PlotSquaredShopFlag; import de.epiceric.shopchest.shop.Shop; import de.epiceric.shopchest.utils.Utils; import org.bukkit.entity.Player; diff --git a/plugin/src/main/java/de/epiceric/shopchest/external/listeners/TownyListener.java b/external/src/main/java/de/epiceric/shopchest/external/listeners/TownyListener.java similarity index 100% rename from plugin/src/main/java/de/epiceric/shopchest/external/listeners/TownyListener.java rename to external/src/main/java/de/epiceric/shopchest/external/listeners/TownyListener.java diff --git a/plugin/src/main/java/de/epiceric/shopchest/external/listeners/USkyBlockListener.java b/external/src/main/java/de/epiceric/shopchest/external/listeners/USkyBlockListener.java similarity index 100% rename from plugin/src/main/java/de/epiceric/shopchest/external/listeners/USkyBlockListener.java rename to external/src/main/java/de/epiceric/shopchest/external/listeners/USkyBlockListener.java diff --git a/plugin/src/main/java/de/epiceric/shopchest/external/listeners/WorldGuardListener.java b/external/src/main/java/de/epiceric/shopchest/external/listeners/WorldGuardListener.java similarity index 100% rename from plugin/src/main/java/de/epiceric/shopchest/external/listeners/WorldGuardListener.java rename to external/src/main/java/de/epiceric/shopchest/external/listeners/WorldGuardListener.java diff --git a/plugin/src/main/java/de/epiceric/shopchest/listeners/AreaShopListener.java b/external/src/main/java/de/epiceric/shopchest/external/listeners2/AreaShopListener.java similarity index 97% rename from plugin/src/main/java/de/epiceric/shopchest/listeners/AreaShopListener.java rename to external/src/main/java/de/epiceric/shopchest/external/listeners2/AreaShopListener.java index e431b15..276d8cf 100644 --- a/plugin/src/main/java/de/epiceric/shopchest/listeners/AreaShopListener.java +++ b/external/src/main/java/de/epiceric/shopchest/external/listeners2/AreaShopListener.java @@ -1,4 +1,4 @@ -package de.epiceric.shopchest.listeners; +package de.epiceric.shopchest.external.listeners2; import org.bukkit.event.EventHandler; import org.bukkit.event.Listener; diff --git a/plugin/src/main/java/de/epiceric/shopchest/listeners/BentoBoxListener.java b/external/src/main/java/de/epiceric/shopchest/external/listeners2/BentoBoxListener.java similarity index 98% rename from plugin/src/main/java/de/epiceric/shopchest/listeners/BentoBoxListener.java rename to external/src/main/java/de/epiceric/shopchest/external/listeners2/BentoBoxListener.java index 4170250..4b17c70 100644 --- a/plugin/src/main/java/de/epiceric/shopchest/listeners/BentoBoxListener.java +++ b/external/src/main/java/de/epiceric/shopchest/external/listeners2/BentoBoxListener.java @@ -1,4 +1,4 @@ -package de.epiceric.shopchest.listeners; +package de.epiceric.shopchest.external.listeners2; import java.util.Collection; import java.util.UUID; diff --git a/plugin/src/main/java/de/epiceric/shopchest/listeners/WorldGuardListener.java b/external/src/main/java/de/epiceric/shopchest/external/listeners2/WorldGuardListener.java similarity index 100% rename from plugin/src/main/java/de/epiceric/shopchest/listeners/WorldGuardListener.java rename to external/src/main/java/de/epiceric/shopchest/external/listeners2/WorldGuardListener.java diff --git a/plugin/pom.xml b/plugin/pom.xml index eaa7c1a..1d45d6a 100644 --- a/plugin/pom.xml +++ b/plugin/pom.xml @@ -20,54 +20,10 @@ com.github.MilkBowl VaultAPI - - fr.xephi - authme - - - com.plotsquared - PlotSquared-Core - - - com.github.rlf.uSkyBlock - uSkyBlock-API - - - com.wasteofplastic - askyblock - - - com.github.TechFortress - GriefPrevention - - - me.wiefferink - areashop - - - world.bentobox - bentobox - - - com.github.IntellectualSites.PlotSquared - Core - - - com.github.TownyAdvanced - Towny - - - pl.gnacik.islandworld - IslandWorld - org.projectlombok lombok - - org.codemc.worldguardwrapper - worldguardwrapper - com.zaxxer HikariCP diff --git a/plugin/src/main/java/de/epiceric/shopchest/ShopChest.java b/plugin/src/main/java/de/epiceric/shopchest/ShopChest.java index b64d4bd..bdf0869 100644 --- a/plugin/src/main/java/de/epiceric/shopchest/ShopChest.java +++ b/plugin/src/main/java/de/epiceric/shopchest/ShopChest.java @@ -1,20 +1,20 @@ package de.epiceric.shopchest; -import com.palmergames.bukkit.towny.Towny; -import com.plotsquared.core.PlotSquared; -import com.wasteofplastic.askyblock.ASkyBlock; +//import com.palmergames.bukkit.towny.Towny; +//import com.plotsquared.core.PlotSquared; +//import com.wasteofplastic.askyblock.ASkyBlock; import de.epiceric.shopchest.command.ShopCommand; import de.epiceric.shopchest.config.Config; import de.epiceric.shopchest.config.hologram.HologramFormat; import de.epiceric.shopchest.event.ShopInitializedEvent; -import de.epiceric.shopchest.external.BentoBoxShopFlag; -import de.epiceric.shopchest.external.PlotSquaredOldShopFlag; -import de.epiceric.shopchest.external.PlotSquaredShopFlag; -import de.epiceric.shopchest.external.WorldGuardShopFlag; -import de.epiceric.shopchest.external.listeners.*; +//import de.epiceric.shopchest.external.BentoBoxShopFlag; +//import de.epiceric.shopchest.external.PlotSquaredOldShopFlag; +//import de.epiceric.shopchest.external.PlotSquaredShopFlag; +//import de.epiceric.shopchest.external.WorldGuardShopFlag; +//import de.epiceric.shopchest.external.listeners.*; import de.epiceric.shopchest.language.LanguageUtils; -import de.epiceric.shopchest.listeners.BentoBoxListener; -import de.epiceric.shopchest.listeners.WorldGuardListener; +//import de.epiceric.shopchest.external.listeners2.BentoBoxListener; +//import de.epiceric.shopchest.listeners.WorldGuardListener; import de.epiceric.shopchest.listeners.*; import de.epiceric.shopchest.nms.Platform; import de.epiceric.shopchest.nms.reflection.PlatformImpl; @@ -24,22 +24,22 @@ import de.epiceric.shopchest.sql.MySQL; import de.epiceric.shopchest.sql.SQLite; import de.epiceric.shopchest.utils.*; import de.epiceric.shopchest.utils.UpdateChecker.UpdateCheckerResult; -import fr.xephi.authme.AuthMe; -import me.ryanhamshire.GriefPrevention.GriefPrevention; -import me.wiefferink.areashop.AreaShop; +//import fr.xephi.authme.AuthMe; +//import me.ryanhamshire.GriefPrevention.GriefPrevention; +//import me.wiefferink.areashop.AreaShop; import net.milkbowl.vault.economy.Economy; import org.bukkit.Bukkit; import org.bukkit.Chunk; import org.bukkit.World; import org.bukkit.entity.Player; -import org.bukkit.plugin.Plugin; +//import org.bukkit.plugin.Plugin; import org.bukkit.plugin.RegisteredServiceProvider; import org.bukkit.plugin.java.JavaPlugin; import org.bukkit.scheduler.BukkitRunnable; -import org.codemc.worldguardwrapper.WorldGuardWrapper; -import pl.islandworld.IslandWorld; -import us.talabrek.ultimateskyblock.api.uSkyBlockAPI; -import world.bentobox.bentobox.BentoBox; +//import org.codemc.worldguardwrapper.WorldGuardWrapper; +//import pl.islandworld.IslandWorld; +//import us.talabrek.ultimateskyblock.api.uSkyBlockAPI; +//import world.bentobox.bentobox.BentoBox; import java.io.File; import java.io.FileWriter; @@ -70,6 +70,7 @@ public class ShopChest extends JavaPlugin { private String downloadLink = ""; private ShopUtils shopUtils; private FileWriter fw; + /* private Plugin worldGuard; private Towny towny; private AuthMe authMe; @@ -79,6 +80,7 @@ public class ShopChest extends JavaPlugin { private GriefPrevention griefPrevention; private AreaShop areaShop; private BentoBox bentoBox; + */ private ShopUpdater updater; private ExecutorService shopCreationThreadPool; @@ -127,10 +129,13 @@ public class ShopChest extends JavaPlugin { debug("Loading ShopChest version " + getDescription().getVersion()); + // TODO EXTERNAL : Register WorldGuard Flags + + /* worldGuard = Bukkit.getServer().getPluginManager().getPlugin("WorldGuard"); if (worldGuard != null) { WorldGuardShopFlag.register(this); - } + }*/ } @Override @@ -208,12 +213,14 @@ public class ShopChest extends JavaPlugin { shopCommand = new ShopCommand(this); shopCreationThreadPool = new ThreadPoolExecutor(0, 8, 5L, TimeUnit.SECONDS, new LinkedBlockingQueue<>()); - + + // TODO EXTERNAL : Load it the right way + loadExternalPlugins(); initDatabase(); checkForUpdates(); registerListeners(); - registerExternalListeners(); + //registerExternalListeners(); initializeShops(); getServer().getMessenger().registerOutgoingPluginChannel(this, "BungeeCord"); @@ -277,6 +284,9 @@ public class ShopChest extends JavaPlugin { } private void loadExternalPlugins() { + // TODO EXTERNAL : Load Integrations + + /* Plugin townyPlugin = Bukkit.getServer().getPluginManager().getPlugin("Towny"); if (townyPlugin instanceof Towny) { towny = (Towny) townyPlugin; @@ -316,7 +326,11 @@ public class ShopChest extends JavaPlugin { if (bentoBoxPlugin instanceof BentoBox) { bentoBox = (BentoBox) bentoBoxPlugin; } + */ + + // TODO EXTERNAL : Register flags and + /* if (hasWorldGuard()) { WorldGuardWrapper.getInstance().registerEvents(this); } @@ -332,7 +346,7 @@ public class ShopChest extends JavaPlugin { if (hasBentoBox()) { BentoBoxShopFlag.register(this); - } + }*/ } private void initDatabase() { @@ -411,6 +425,9 @@ public class ShopChest extends JavaPlugin { getServer().getPluginManager().registerEvents(new BlockExplodeListener(this), this); } + // TODO EXTERNAL : Register Listeners 1 + + /* if (hasWorldGuard()) { getServer().getPluginManager().registerEvents(new WorldGuardListener(this), this); @@ -421,9 +438,11 @@ public class ShopChest extends JavaPlugin { if (hasBentoBox()) { getServer().getPluginManager().registerEvents(new BentoBoxListener(this), this); - } + }*/ } + // TODO : EXTERNAL : Register Listeners 2 + /* private void registerExternalListeners() { if (hasASkyBlock()) getServer().getPluginManager().registerEvents(new ASkyBlockListener(this), this); @@ -444,7 +463,7 @@ public class ShopChest extends JavaPlugin { getServer().getPluginManager().registerEvents(new de.epiceric.shopchest.external.listeners.WorldGuardListener(this), this); if (hasBentoBox()) getServer().getPluginManager().registerEvents(new de.epiceric.shopchest.external.listeners.BentoBoxListener(this), this); - } + } */ /** * Initializes the shops @@ -552,57 +571,40 @@ public class ShopChest extends JavaPlugin { return updater; } - /** - * @return Whether the plugin 'AreaShop' is enabled - */ + // TODO EXTERNAL Plugins supports + + /* public boolean hasAreaShop() { return Config.enableAreaShopIntegration && areaShop != null && areaShop.isEnabled(); } - /** - * @return Whether the plugin 'GriefPrevention' is enabled - */ + public boolean hasGriefPrevention() { return Config.enableGriefPreventionIntegration && griefPrevention != null && griefPrevention.isEnabled(); } - /** - * @return An instance of {@link GriefPrevention} or {@code null} if GriefPrevention is not enabled - */ + public GriefPrevention getGriefPrevention() { return griefPrevention; } - /** - * @return Whether the plugin 'IslandWorld' is enabled - */ + public boolean hasIslandWorld() { return Config.enableIslandWorldIntegration && islandWorld != null && islandWorld.isEnabled(); } - /** - * @return Whether the plugin 'ASkyBlock' is enabled - */ + public boolean hasASkyBlock() { return Config.enableASkyblockIntegration && aSkyBlock != null && aSkyBlock.isEnabled(); } - /** - * @return Whether the plugin 'uSkyBlock' is enabled - */ public boolean hasUSkyBlock() { return Config.enableUSkyblockIntegration && uSkyBlock != null && uSkyBlock.isEnabled(); } - /** - * @return An instance of {@link uSkyBlockAPI} or {@code null} if uSkyBlock is not enabled - */ public uSkyBlockAPI getUSkyBlock() { return uSkyBlock; } - /** - * @return Whether the plugin 'PlotSquared' is enabled - */ public boolean hasPlotSquared() { if (!Config.enablePlotsquaredIntegration) { return false; @@ -616,32 +618,23 @@ public class ShopChest extends JavaPlugin { return p != null && p.isEnabled(); } - /** - * @return Whether the plugin 'AuthMe' is enabled - */ + public boolean hasAuthMe() { return Config.enableAuthMeIntegration && authMe != null && authMe.isEnabled(); } - /** - * @return Whether the plugin 'Towny' is enabled - */ + public boolean hasTowny() { return Config.enableTownyIntegration && towny != null && towny.isEnabled(); } - /** - * @return Whether the plugin 'WorldGuard' is enabled - */ public boolean hasWorldGuard() { return Config.enableWorldGuardIntegration && worldGuard != null && worldGuard.isEnabled(); } - /** - * @return Whether the plugin 'WorldGuard' is enabled - */ public boolean hasBentoBox() { return Config.enableBentoBoxIntegration && bentoBox != null && bentoBox.isEnabled(); } + */ /** * @return ShopChest's {@link ShopUtils} containing some important methods diff --git a/plugin/src/main/java/de/epiceric/shopchest/listeners/ShopInteractListener.java b/plugin/src/main/java/de/epiceric/shopchest/listeners/ShopInteractListener.java index ea2e49c..185df87 100644 --- a/plugin/src/main/java/de/epiceric/shopchest/listeners/ShopInteractListener.java +++ b/plugin/src/main/java/de/epiceric/shopchest/listeners/ShopInteractListener.java @@ -8,8 +8,8 @@ import de.epiceric.shopchest.event.ShopCreateEvent; import de.epiceric.shopchest.event.ShopInfoEvent; import de.epiceric.shopchest.event.ShopOpenEvent; import de.epiceric.shopchest.event.ShopRemoveEvent; -import de.epiceric.shopchest.external.PlotSquaredOldShopFlag; -import de.epiceric.shopchest.external.PlotSquaredShopFlag; +//import de.epiceric.shopchest.external.PlotSquaredOldShopFlag; +//import de.epiceric.shopchest.external.PlotSquaredShopFlag; import de.epiceric.shopchest.language.LanguageUtils; import de.epiceric.shopchest.language.Message; import de.epiceric.shopchest.language.Replacement; @@ -23,7 +23,7 @@ import de.epiceric.shopchest.utils.ItemUtils; import de.epiceric.shopchest.utils.Permissions; import de.epiceric.shopchest.utils.ShopUtils; import de.epiceric.shopchest.utils.Utils; -import fr.xephi.authme.api.v3.AuthMeApi; +//import fr.xephi.authme.api.v3.AuthMeApi; import net.milkbowl.vault.economy.Economy; import net.milkbowl.vault.economy.EconomyResponse; import org.bukkit.Bukkit; @@ -51,9 +51,9 @@ import org.bukkit.inventory.Inventory; import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.PlayerInventory; import org.bukkit.scheduler.BukkitRunnable; -import org.codemc.worldguardwrapper.WorldGuardWrapper; -import org.codemc.worldguardwrapper.flag.IWrappedFlag; -import org.codemc.worldguardwrapper.flag.WrappedState; +//import org.codemc.worldguardwrapper.WorldGuardWrapper; +//import org.codemc.worldguardwrapper.flag.IWrappedFlag; +//import org.codemc.worldguardwrapper.flag.WrappedState; import java.io.ByteArrayOutputStream; import java.io.DataOutputStream; @@ -126,8 +126,10 @@ public class ShopInteractListener implements Listener { if (ClickType.getPlayerClickType(p).getClickType() != ClickType.EnumClickType.CREATE) return; + // TODO EXTERNAL : Check AUTH + /* if (Config.enableAuthMeIntegration && plugin.hasAuthMe() && !AuthMeApi.getInstance().isAuthenticated(p)) - return; + return;*/ if (e.useInteractedBlock() == Event.Result.DENY && !p.hasPermission(Permissions.CREATE_PROTECTED)) { p.sendMessage(LanguageUtils.getMessage(Message.NO_PERMISSION_CREATE_PROTECTED)); @@ -255,6 +257,8 @@ public class ShopInteractListener implements Listener { // TODO: Outsource shop use external permission boolean externalPluginsAllowed = true; + // TODO EXTERNAL : Check USE + /* if (plugin.hasPlotSquared() && Config.enablePlotsquaredIntegration) { try { Class.forName("com.plotsquared.core.PlotSquared"); @@ -277,7 +281,7 @@ public class ShopInteractListener implements Listener { if (!flag.isPresent()) plugin.debug("WorldGuard flag '" + flagName + "' is not present!"); WrappedState state = flag.map(f -> wgWrapper.queryFlag(p, b.getLocation(), f).orElse(WrappedState.DENY)).orElse(WrappedState.DENY); externalPluginsAllowed = state == WrappedState.ALLOW; - } + }*/ if (shop.getShopType() == ShopType.ADMIN) { if (externalPluginsAllowed || p.hasPermission(Permissions.BYPASS_EXTERNAL_PLUGIN)) { @@ -380,6 +384,8 @@ public class ShopInteractListener implements Listener { // TODO: Outsource shop use external permission boolean externalPluginsAllowed = true; + // TODO EXTERNAL : Check USE + /* if (plugin.hasPlotSquared() && Config.enablePlotsquaredIntegration) { try { Class.forName("com.plotsquared.core.PlotSquared"); @@ -402,7 +408,7 @@ public class ShopInteractListener implements Listener { if (!flag.isPresent()) plugin.debug("WorldGuard flag '" + flagName + "' is not present!"); WrappedState state = flag.map(f -> wgWrapper.queryFlag(p, b.getLocation(), f).orElse(WrappedState.DENY)).orElse(WrappedState.DENY); externalPluginsAllowed = state == WrappedState.ALLOW; - } + }*/ ItemStack itemStack = shop.getProduct().getItemStack(); @@ -467,7 +473,8 @@ public class ShopInteractListener implements Listener { @EventHandler public void onPlayerInteract(PlayerInteractEvent e) { - if (Config.enableAuthMeIntegration && plugin.hasAuthMe() && !AuthMeApi.getInstance().isAuthenticated(e.getPlayer())) return; + // TODO EXTERNAL : Check AUTH + //if (Config.enableAuthMeIntegration && plugin.hasAuthMe() && !AuthMeApi.getInstance().isAuthenticated(e.getPlayer())) return; handleInteractEvent(e); } diff --git a/pom.xml b/pom.xml index 0bbdf1e..d0cb330 100644 --- a/pom.xml +++ b/pom.xml @@ -17,6 +17,7 @@ nms/v1_17_1_R1 nms/v1_18_R1 nms/v1_18_R2 + external ShopChest @@ -294,7 +295,8 @@ 1.18.7-SNAPSHOT - + + de.epiceric shopchest-nms-interface @@ -325,6 +327,12 @@ shopchest-nms-v1_18_R2 1.0.0 + + + de.epiceric + shopchest-external + 1.0.0 +