Upstream/ShopChest-Updated
1
0
Fork 0
mirror of https://github.com/Flowsqy/ShopChest.git synced 2024-12-02 02:03:23 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge DaniFoldi fork (see his repo for the full list of changes)

Browse Source
This commit is contained in:
Flowsqy 2022-04-13 20:09:34 +02:00
commit 77f3e10e2a
25 changed files with 925 additions and 569 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -10,3 +10,5 @@ target/
.factorypath .factorypath
/.vscode/ /.vscode/
*.DS_Store

10
plugin/pom.xml
View File

@ -68,10 +68,6 @@
<groupId>org.codemc.worldguardwrapper</groupId> <groupId>org.codemc.worldguardwrapper</groupId>
<artifactId>worldguardwrapper</artifactId> <artifactId>worldguardwrapper</artifactId>
</dependency> </dependency>
<dependency>
<groupId>org.bstats</groupId>
<artifactId>bstats-bukkit</artifactId>
</dependency>
<dependency> <dependency>
<groupId>com.zaxxer</groupId> <groupId>com.zaxxer</groupId>
<artifactId>HikariCP</artifactId> <artifactId>HikariCP</artifactId>
@ -83,6 +79,12 @@
<dependency> <dependency>
<groupId>org.inventivetalent</groupId> <groupId>org.inventivetalent</groupId>
<artifactId>reflectionhelper</artifactId> <artifactId>reflectionhelper</artifactId>
<exclusions>
<exclusion>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
</exclusion>
</exclusions>
</dependency> </dependency>
<dependency> <dependency>
<groupId>de.epiceric</groupId> <groupId>de.epiceric</groupId>

136
plugin/src/main/java/de/epiceric/shopchest/ShopChest.java
View File

@ -1,29 +1,33 @@
package de.epiceric.shopchest; package de.epiceric.shopchest;
import java.io.File;
import java.io.FileWriter;
import java.io.IOException;
import java.io.PrintWriter;
import java.text.SimpleDateFormat;
import java.util.Calendar;
import java.util.HashMap;
import java.util.Map;
import java.util.UUID;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.LinkedBlockingQueue;
import java.util.concurrent.ThreadPoolExecutor;
import java.util.concurrent.TimeUnit;
import java.util.stream.Stream;
import com.palmergames.bukkit.towny.Towny; import com.palmergames.bukkit.towny.Towny;
import com.plotsquared.core.PlotSquared;
import com.wasteofplastic.askyblock.ASkyBlock; 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.language.LanguageUtils;
import de.epiceric.shopchest.listeners.BentoBoxListener;
import de.epiceric.shopchest.listeners.WorldGuardListener;
import de.epiceric.shopchest.listeners.*;
import de.epiceric.shopchest.nms.Platform; import de.epiceric.shopchest.nms.Platform;
import de.epiceric.shopchest.nms.reflection.PlatformImpl; import de.epiceric.shopchest.nms.reflection.PlatformImpl;
import de.epiceric.shopchest.nms.reflection.ShopChestDebug; import de.epiceric.shopchest.nms.reflection.ShopChestDebug;
import org.bstats.bukkit.Metrics; import de.epiceric.shopchest.sql.Database;
import org.bstats.charts.AdvancedPie; import de.epiceric.shopchest.sql.MySQL;
import org.bstats.charts.SimplePie; 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 net.milkbowl.vault.economy.Economy;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.Chunk; import org.bukkit.Chunk;
import org.bukkit.World; import org.bukkit.World;
@ -33,53 +37,24 @@ import org.bukkit.plugin.RegisteredServiceProvider;
import org.bukkit.plugin.java.JavaPlugin; import org.bukkit.plugin.java.JavaPlugin;
import org.bukkit.scheduler.BukkitRunnable; import org.bukkit.scheduler.BukkitRunnable;
import org.codemc.worldguardwrapper.WorldGuardWrapper; import org.codemc.worldguardwrapper.WorldGuardWrapper;
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.ASkyBlockListener;
import de.epiceric.shopchest.external.listeners.GriefPreventionListener;
import de.epiceric.shopchest.external.listeners.IslandWorldListener;
import de.epiceric.shopchest.external.listeners.PlotSquaredListener;
import de.epiceric.shopchest.external.listeners.TownyListener;
import de.epiceric.shopchest.external.listeners.USkyBlockListener;
import de.epiceric.shopchest.language.LanguageUtils;
import de.epiceric.shopchest.listeners.AreaShopListener;
import de.epiceric.shopchest.listeners.BentoBoxListener;
import de.epiceric.shopchest.listeners.BlockExplodeListener;
import de.epiceric.shopchest.listeners.ChestProtectListener;
import de.epiceric.shopchest.listeners.CreativeModeListener;
import de.epiceric.shopchest.listeners.NotifyPlayerOnJoinListener;
import de.epiceric.shopchest.listeners.ShopInteractListener;
import de.epiceric.shopchest.listeners.ShopItemListener;
import de.epiceric.shopchest.listeners.ShopUpdateListener;
import de.epiceric.shopchest.listeners.WorldGuardListener;
import de.epiceric.shopchest.shop.Shop;
import de.epiceric.shopchest.shop.Shop.ShopType;
import de.epiceric.shopchest.sql.Database;
import de.epiceric.shopchest.sql.MySQL;
import de.epiceric.shopchest.sql.SQLite;
import de.epiceric.shopchest.utils.Callback;
import de.epiceric.shopchest.utils.ClickType;
import de.epiceric.shopchest.utils.Permissions;
import de.epiceric.shopchest.utils.ShopUpdater;
import de.epiceric.shopchest.utils.ShopUtils;
import de.epiceric.shopchest.utils.UpdateChecker;
import de.epiceric.shopchest.utils.UpdateChecker.UpdateCheckerResult;
import de.epiceric.shopchest.utils.Utils;
import fr.xephi.authme.AuthMe;
import me.ryanhamshire.GriefPrevention.GriefPrevention;
import me.wiefferink.areashop.AreaShop;
import net.milkbowl.vault.economy.Economy;
import pl.islandworld.IslandWorld; import pl.islandworld.IslandWorld;
import us.talabrek.ultimateskyblock.api.uSkyBlockAPI; import us.talabrek.ultimateskyblock.api.uSkyBlockAPI;
import world.bentobox.bentobox.BentoBox; import world.bentobox.bentobox.BentoBox;
import java.io.File;
import java.io.FileWriter;
import java.io.IOException;
import java.io.PrintWriter;
import java.text.SimpleDateFormat;
import java.util.Calendar;
import java.util.Map;
import java.util.UUID;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.LinkedBlockingQueue;
import java.util.concurrent.ThreadPoolExecutor;
import java.util.concurrent.TimeUnit;
import java.util.stream.Stream;
public class ShopChest extends JavaPlugin { public class ShopChest extends JavaPlugin {
private static ShopChest instance; private static ShopChest instance;
@ -235,7 +210,6 @@ public class ShopChest extends JavaPlugin {
5L, TimeUnit.SECONDS, new LinkedBlockingQueue<>()); 5L, TimeUnit.SECONDS, new LinkedBlockingQueue<>());
loadExternalPlugins(); loadExternalPlugins();
loadMetrics();
initDatabase(); initDatabase();
checkForUpdates(); checkForUpdates();
registerListeners(); registerListeners();
@ -361,30 +335,6 @@ public class ShopChest extends JavaPlugin {
} }
} }
private void loadMetrics() {
debug("Initializing Metrics...");
Metrics metrics = new Metrics(this, 1726);
metrics.addCustomChart(new SimplePie("creative_setting", () -> Config.creativeSelectItem ? "Enabled" : "Disabled"));
metrics.addCustomChart(new SimplePie("database_type", () -> Config.databaseType.toString()));
metrics.addCustomChart(new AdvancedPie("shop_type", () -> {
int normal = 0;
int admin = 0;
for (Shop shop : shopUtils.getShops()) {
if (shop.getShopType() == ShopType.NORMAL) normal++;
else if (shop.getShopType() == ShopType.ADMIN) admin++;
}
Map<String, Integer> result = new HashMap<>();
result.put("Admin", admin);
result.put("Normal", normal);
return result;
}));
}
private void initDatabase() { private void initDatabase() {
if (Config.databaseType == Database.DatabaseType.SQLite) { if (Config.databaseType == Database.DatabaseType.SQLite) {
debug("Using database type: SQLite"); debug("Using database type: SQLite");
@ -395,13 +345,10 @@ public class ShopChest extends JavaPlugin {
getLogger().info("Using MySQL"); getLogger().info("Using MySQL");
database = new MySQL(this); database = new MySQL(this);
if (Config.databaseMySqlPingInterval > 0) { if (Config.databaseMySqlPingInterval > 0) {
Bukkit.getScheduler().runTaskTimer(this, new Runnable() { Bukkit.getScheduler().runTaskTimer(this, () -> {
@Override
public void run() {
if (database instanceof MySQL) { if (database instanceof MySQL) {
((MySQL) database).ping(); ((MySQL) database).ping();
} }
}
}, Config.databaseMySqlPingInterval * 20L, Config.databaseMySqlPingInterval * 20L); }, Config.databaseMySqlPingInterval * 20L, Config.databaseMySqlPingInterval * 20L);
} }
} }
@ -484,8 +431,11 @@ public class ShopChest extends JavaPlugin {
getServer().getPluginManager().registerEvents(new GriefPreventionListener(this), this); getServer().getPluginManager().registerEvents(new GriefPreventionListener(this), this);
if (hasIslandWorld()) if (hasIslandWorld())
getServer().getPluginManager().registerEvents(new IslandWorldListener(this), this); getServer().getPluginManager().registerEvents(new IslandWorldListener(this), this);
if (hasPlotSquared()) if (hasPlotSquared()) {
getServer().getPluginManager().registerEvents(new PlotSquaredListener(this), this); PlotSquaredListener psListener = new PlotSquaredListener(this);
getServer().getPluginManager().registerEvents(psListener, this);
PlotSquared.get().getEventDispatcher().registerListener(psListener);
}
if (hasTowny()) if (hasTowny())
getServer().getPluginManager().registerEvents(new TownyListener(this), this); getServer().getPluginManager().registerEvents(new TownyListener(this), this);
if (hasUSkyBlock()) if (hasUSkyBlock())

11
plugin/src/main/java/de/epiceric/shopchest/command/ShopCommand.java
View File

@ -155,6 +155,17 @@ public class ShopCommand {
} }
}); });
addSubCommand(new ShopSubCommand("value", true, executor, tabCompleter) {
@Override
public String getHelpMessage(CommandSender sender) {
if (sender.hasPermission(Permissions.CONFIG)) {
return LanguageUtils.getMessage(Message.COMMAND_DESC_VALUE, cmdReplacement);
} else {
return "";
}
}
});
register(); register();
commandCreated = true; commandCreated = true;
} }

65
plugin/src/main/java/de/epiceric/shopchest/command/ShopCommandExecutor.java
View File

@ -2,12 +2,19 @@ package de.epiceric.shopchest.command;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collection; import java.util.Collection;
import java.util.HashSet;
import java.util.List; import java.util.List;
import java.util.Set;
import java.util.UUID;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.concurrent.atomic.AtomicReference;
import java.util.stream.Stream; import java.util.stream.Stream;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.Chunk; import org.bukkit.Chunk;
import org.bukkit.GameMode; import org.bukkit.GameMode;
import org.bukkit.Material;
import org.bukkit.OfflinePlayer; import org.bukkit.OfflinePlayer;
import org.bukkit.World; import org.bukkit.World;
import org.bukkit.command.Command; import org.bukkit.command.Command;
@ -133,6 +140,8 @@ class ShopCommandExecutor implements CommandExecutor {
new Replacement(Placeholder.AMOUNT, String.valueOf(shopUtils.getShopAmount(p))))); new Replacement(Placeholder.AMOUNT, String.valueOf(shopUtils.getShopAmount(p)))));
} else if (subCommand.getName().equalsIgnoreCase("open")) { } else if (subCommand.getName().equalsIgnoreCase("open")) {
open(p); open(p);
} else if (subCommand.getName().equalsIgnoreCase("value")) {
value(p);
} else { } else {
return false; return false;
} }
@ -437,6 +446,7 @@ class ShopCommandExecutor implements CommandExecutor {
} }
} }
CompletableFuture.runAsync(() -> {
double creationPrice = (shopType == Shop.ShopType.NORMAL) ?Config.shopCreationPriceNormal :Config.shopCreationPriceAdmin; double creationPrice = (shopType == Shop.ShopType.NORMAL) ?Config.shopCreationPriceNormal :Config.shopCreationPriceAdmin;
if (creationPrice > 0) { if (creationPrice > 0) {
if (plugin.getEconomy().getBalance(p, p.getWorld().getName()) < creationPrice) { if (plugin.getEconomy().getBalance(p, p.getWorld().getName()) < creationPrice) {
@ -448,6 +458,8 @@ class ShopCommandExecutor implements CommandExecutor {
ShopProduct product = new ShopProduct(itemStack, amount); ShopProduct product = new ShopProduct(itemStack, amount);
ShopPreCreateEvent event = new ShopPreCreateEvent(p, new Shop(plugin, p, product, null, buyPrice, sellPrice, shopType)); ShopPreCreateEvent event = new ShopPreCreateEvent(p, new Shop(plugin, p, product, null, buyPrice, sellPrice, shopType));
Bukkit.getScheduler().runTask(plugin, () -> {
Bukkit.getPluginManager().callEvent(event); Bukkit.getPluginManager().callEvent(event);
if (!event.isCancelled()) { if (!event.isCancelled()) {
@ -457,6 +469,8 @@ class ShopCommandExecutor implements CommandExecutor {
} else { } else {
plugin.debug("Shop pre create event cancelled"); plugin.debug("Shop pre create event cancelled");
} }
});
});
} }
/** /**
@ -516,6 +530,57 @@ class ShopCommandExecutor implements CommandExecutor {
ClickType.setPlayerClickType(p, new ClickType(ClickType.EnumClickType.OPEN)); ClickType.setPlayerClickType(p, new ClickType(ClickType.EnumClickType.OPEN));
} }
private void value(final Player p) {
ItemStack item = p.getInventory().getItemInMainHand();
if (item.getType() == Material.AIR || item.getType() == Material.CAVE_AIR || item.getType() == Material.VOID_AIR) {
return;
}
AtomicInteger buyCount = new AtomicInteger();
AtomicInteger sellCount = new AtomicInteger();
AtomicReference<Double> buyPrice = new AtomicReference<>(0d);
AtomicReference<Double> sellPrice = new AtomicReference<>(0d);
Set<UUID> sellers = new HashSet<>();
plugin.getShopUtils().getShops().forEach(shop -> {
if (!shop.hasItem()) {
return;
}
if (sellers.contains(shop.getVendor().getUniqueId())) {
return;
}
if (!Utils.isItemSimilar(shop.getProduct().getItemStack(), item)) {
return;
}
if (shop.getShopType().equals(ShopType.ADMIN)) {
return;
}
sellers.add(shop.getVendor().getUniqueId());
if (shop.getBuyPrice() != 0) {
buyPrice.updateAndGet(v -> v + shop.getBuyPrice() / shop.getProduct().getAmount());
buyCount.getAndIncrement();
}
if (shop.getSellPrice() != 0) {
sellPrice.updateAndGet(v -> v + shop.getSellPrice() / shop.getProduct().getAmount());
sellCount.getAndIncrement();
}
});
if (buyCount.get() == 0) {
p.sendMessage(LanguageUtils.getMessage(Message.VALUE_NO_SHOPS_BUY));
} else {
p.sendMessage(LanguageUtils.getMessage(Message.VALUE_OF_ITEM_BUY, new Replacement(Placeholder.AMOUNT, sellers.size()), new Replacement(Placeholder.BUY_PRICE, buyPrice.get() / (double) buyCount.get())));
}
if (sellCount.get() == 0) {
p.sendMessage(LanguageUtils.getMessage(Message.VALUE_NO_SHOPS_SELL));
} else {
p.sendMessage(LanguageUtils.getMessage(Message.VALUE_OF_ITEM_SELL, new Replacement(Placeholder.AMOUNT, sellers.size()), new Replacement(Placeholder.SELL_PRICE, sellPrice.get() / (double) sellCount.get())));
}
}
private boolean changeConfig(CommandSender sender, String[] args) { private boolean changeConfig(CommandSender sender, String[] args) {
plugin.debug(sender.getName() + " is changing the configuration"); plugin.debug(sender.getName() + " is changing the configuration");

5
plugin/src/main/java/de/epiceric/shopchest/config/Config.java
View File

@ -8,7 +8,9 @@ import java.lang.reflect.InvocationTargetException;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashSet; import java.util.HashSet;
import java.util.List; import java.util.List;
import java.util.Map;
import java.util.Set; import java.util.Set;
import java.util.stream.Collectors;
import org.bukkit.configuration.InvalidConfigurationException; import org.bukkit.configuration.InvalidConfigurationException;
import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.ItemStack;
@ -61,6 +63,8 @@ public class Config {
**/ **/
public static List<String> areashopRemoveShopEvents; public static List<String> areashopRemoveShopEvents;
public static Map<String, Double> shopTaxes;
/** /**
* The hostname used in ShopChest's MySQL database * The hostname used in ShopChest's MySQL database
**/ **/
@ -468,6 +472,7 @@ public class Config {
databaseType = Database.DatabaseType.valueOf(plugin.getConfig().getString("database.type")); databaseType = Database.DatabaseType.valueOf(plugin.getConfig().getString("database.type"));
minimumPrices = (plugin.getConfig().getConfigurationSection("minimum-prices") == null) ? new HashSet<String>() : plugin.getConfig().getConfigurationSection("minimum-prices").getKeys(true); minimumPrices = (plugin.getConfig().getConfigurationSection("minimum-prices") == null) ? new HashSet<String>() : plugin.getConfig().getConfigurationSection("minimum-prices").getKeys(true);
maximumPrices = (plugin.getConfig().getConfigurationSection("maximum-prices") == null) ? new HashSet<String>() : plugin.getConfig().getConfigurationSection("maximum-prices").getKeys(true); maximumPrices = (plugin.getConfig().getConfigurationSection("maximum-prices") == null) ? new HashSet<String>() : plugin.getConfig().getConfigurationSection("maximum-prices").getKeys(true);
shopTaxes = (plugin.getConfig().getConfigurationSection("shop-taxes") == null ? Map.of("default", 0d) : plugin.getConfig().getConfigurationSection("shop-taxes").getKeys(true).stream().collect(Collectors.toMap(i -> i, i -> plugin.getConfig().getConfigurationSection("shop-taxes").getDouble(i))));
allowDecimalsInPrice = plugin.getConfig().getBoolean("allow-decimals-in-price"); allowDecimalsInPrice = plugin.getConfig().getBoolean("allow-decimals-in-price");
allowBrokenItems = plugin.getConfig().getBoolean("allow-broken-items"); allowBrokenItems = plugin.getConfig().getBoolean("allow-broken-items");
autoCalculateItemAmount = (allowDecimalsInPrice && plugin.getConfig().getBoolean("auto-calculate-item-amount")); autoCalculateItemAmount = (allowDecimalsInPrice && plugin.getConfig().getBoolean("auto-calculate-item-amount"));

6
plugin/src/main/java/de/epiceric/shopchest/config/LanguageConfiguration.java
View File

@ -43,10 +43,8 @@ public class LanguageConfiguration extends FileConfiguration {
@Override @Override
public String getString(String path, String def) { public String getString(String path, String def) {
for (String key : values.keySet()) { if (values.containsKey(path)) {
if (key.equals(path)) { return values.get(path);
return values.get(key);
}
} }
values.put(path, def); values.put(path, def);

25
plugin/src/main/java/de/epiceric/shopchest/external/BentoBoxShopFlag.java vendored
View File

@ -8,18 +8,33 @@ import world.bentobox.bentobox.api.flags.Flag;
import world.bentobox.bentobox.managers.RanksManager; import world.bentobox.bentobox.managers.RanksManager;
public class BentoBoxShopFlag { public class BentoBoxShopFlag {
public static final Flag SHOP_FLAG = new Flag.Builder("CREATE_SHOPS", Material.CHEST) public static final Flag SHOP_CHEST_FLAG = new Flag.Builder("CREATE_SHOPS", Material.CHEST)
.type(Flag.Type.PROTECTION)
.mode(Flag.Mode.BASIC)
.defaultRank(RanksManager.TRUSTED_RANK)
.build();
public static final Flag SHOP_TRAPPED_CHEST_FLAG = new Flag.Builder("CREATE_SHOPS", Material.TRAPPED_CHEST)
.type(Flag.Type.PROTECTION)
.mode(Flag.Mode.BASIC)
.defaultRank(RanksManager.TRUSTED_RANK)
.build();
public static final Flag SHOP_SHULKER_BOX_FLAG = new Flag.Builder("CREATE_SHOPS", Material.SHULKER_BOX)
.type(Flag.Type.PROTECTION)
.mode(Flag.Mode.BASIC)
.defaultRank(RanksManager.TRUSTED_RANK)
.build();
public static final Flag SHOP_BARREL_FLAG = new Flag.Builder("CREATE_SHOPS", Material.BARREL)
.type(Flag.Type.PROTECTION) .type(Flag.Type.PROTECTION)
.mode(Flag.Mode.BASIC) .mode(Flag.Mode.BASIC)
.defaultRank(RanksManager.TRUSTED_RANK) .defaultRank(RanksManager.TRUSTED_RANK)
.build(); .build();
public static void register(ShopChest plugin) { public static void register(ShopChest plugin) {
if (BentoBox.getInstance().getFlagsManager().registerFlag(SHOP_FLAG)) { if (BentoBox.getInstance().getFlagsManager().registerFlag(SHOP_CHEST_FLAG) && BentoBox.getInstance().getFlagsManager().registerFlag(SHOP_TRAPPED_CHEST_FLAG) && BentoBox.getInstance().getFlagsManager().registerFlag(SHOP_SHULKER_BOX_FLAG) && BentoBox.getInstance().getFlagsManager().registerFlag(SHOP_BARREL_FLAG)) {
plugin.debug("Registered BentoBox shop flag"); plugin.debug("Registered BentoBox shop flags");
} else { } else {
plugin.getLogger().warning("Failed to register BentoBox shop flag"); plugin.getLogger().warning("Failed to register BentoBox shop flags");
plugin.debug("Failed to register BentoBox shop flag"); plugin.debug("Failed to register BentoBox shop flags");
} }
} }
} }

8
plugin/src/main/java/de/epiceric/shopchest/external/listeners/BentoBoxListener.java vendored
View File

@ -45,8 +45,12 @@ public class BentoBoxListener extends FlagListener {
} }
private boolean handleForLocation(Player player, Location loc, Cancellable e) { private boolean handleForLocation(Player player, Location loc, Cancellable e) {
boolean allowed = checkIsland((Event) e, player, loc, BentoBoxShopFlag.SHOP_FLAG); boolean chest_allowed = checkIsland((Event) e, player, loc, BentoBoxShopFlag.SHOP_CHEST_FLAG);
if (!allowed) { boolean barrel_allowed = checkIsland((Event) e, player, loc, BentoBoxShopFlag.SHOP_BARREL_FLAG);
boolean shulker_allowed = checkIsland((Event) e, player, loc, BentoBoxShopFlag.SHOP_SHULKER_BOX_FLAG);
boolean trapped_chest_allowed = checkIsland((Event) e, player, loc, BentoBoxShopFlag.SHOP_TRAPPED_CHEST_FLAG);
if (!chest_allowed || !barrel_allowed || !shulker_allowed || !trapped_chest_allowed) {
e.setCancelled(true); e.setCancelled(true);
plugin.debug("Cancel Reason: BentoBox"); plugin.debug("Cancel Reason: BentoBox");
return true; return true;

47
plugin/src/main/java/de/epiceric/shopchest/external/listeners/PlotSquaredListener.java vendored
View File

@ -1,24 +1,29 @@
package de.epiceric.shopchest.external.listeners; package de.epiceric.shopchest.external.listeners;
import java.util.Set; import com.google.common.eventbus.Subscribe;
import com.plotsquared.core.events.PlotClearEvent;
import com.plotsquared.core.events.PlotDeleteEvent;
import com.plotsquared.core.location.Location; import com.plotsquared.core.location.Location;
import com.plotsquared.core.plot.Plot; import com.plotsquared.core.plot.Plot;
import com.sk89q.worldedit.math.BlockVector3;
import org.bukkit.entity.Player; import com.sk89q.worldedit.regions.CuboidRegion;
import org.bukkit.event.Cancellable;
import org.bukkit.event.EventHandler;
import org.bukkit.event.EventPriority;
import org.bukkit.event.Listener;
import de.epiceric.shopchest.ShopChest; import de.epiceric.shopchest.ShopChest;
import de.epiceric.shopchest.config.Config; import de.epiceric.shopchest.config.Config;
import de.epiceric.shopchest.event.ShopCreateEvent; import de.epiceric.shopchest.event.ShopCreateEvent;
import de.epiceric.shopchest.event.ShopExtendEvent; import de.epiceric.shopchest.event.ShopExtendEvent;
import de.epiceric.shopchest.external.PlotSquaredOldShopFlag; import de.epiceric.shopchest.external.PlotSquaredOldShopFlag;
import de.epiceric.shopchest.external.PlotSquaredShopFlag; import de.epiceric.shopchest.external.PlotSquaredShopFlag;
import de.epiceric.shopchest.shop.Shop;
import de.epiceric.shopchest.utils.Utils; import de.epiceric.shopchest.utils.Utils;
import org.bukkit.entity.Player;
import org.bukkit.event.Cancellable;
import org.bukkit.event.EventHandler;
import org.bukkit.event.EventPriority;
import org.bukkit.event.Listener;
import java.util.Set;
@SuppressWarnings("UnstableApiUsage")
public class PlotSquaredListener implements Listener { public class PlotSquaredListener implements Listener {
private final ShopChest plugin; private final ShopChest plugin;
@ -46,6 +51,30 @@ public class PlotSquaredListener implements Listener {
handleForLocation(e.getPlayer(), e.getNewChestLocation(), e); handleForLocation(e.getPlayer(), e.getNewChestLocation(), e);
} }
@Subscribe
public void onDeletePlot(PlotDeleteEvent event) {
removeShopsFromPlot(event.getPlot());
}
@Subscribe
public void onClearPlot(PlotClearEvent event) {
removeShopsFromPlot(event.getPlot());
}
private void removeShopsFromPlot(Plot plot) {
Set<CuboidRegion> regions = plot.getRegions();
for (Shop shop: plugin.getShopUtils().getShops()) {
for (CuboidRegion region: regions) {
org.bukkit.Location loc = shop.getLocation();
if (!region.contains(BlockVector3.at(loc.getX(), loc.getY(), loc.getZ()))) {
continue;
}
plugin.getShopUtils().removeShop(shop, true);
}
}
}
// TODO: Outsource shop use external permission // TODO: Outsource shop use external permission
// @EventHandler(priority = EventPriority.LOWEST, ignoreCancelled = true) // @EventHandler(priority = EventPriority.LOWEST, ignoreCancelled = true)

5
plugin/src/main/java/de/epiceric/shopchest/language/LanguageUtils.java
View File

@ -2588,9 +2588,14 @@ public class LanguageUtils {
messages.add(new LocalizedMessage(Message.COMMAND_DESC_LIMITS, langConfig.getString("message.commandDescription.limits", "&a/%COMMAND% limits - View shop limits."))); messages.add(new LocalizedMessage(Message.COMMAND_DESC_LIMITS, langConfig.getString("message.commandDescription.limits", "&a/%COMMAND% limits - View shop limits.")));
messages.add(new LocalizedMessage(Message.COMMAND_DESC_OPEN, langConfig.getString("message.commandDescription.open", "&a/%COMMAND% open - Open a shop."))); messages.add(new LocalizedMessage(Message.COMMAND_DESC_OPEN, langConfig.getString("message.commandDescription.open", "&a/%COMMAND% open - Open a shop.")));
messages.add(new LocalizedMessage(Message.COMMAND_DESC_CONFIG, langConfig.getString("message.commandDescription.config", "&a/%COMMAND% config <set|add|remove> <property> <value> - Change configuration values."))); messages.add(new LocalizedMessage(Message.COMMAND_DESC_CONFIG, langConfig.getString("message.commandDescription.config", "&a/%COMMAND% config <set|add|remove> <property> <value> - Change configuration values.")));
messages.add(new LocalizedMessage(Message.COMMAND_DESC_VALUE, langConfig.getString("message.commandDescription.value", "&a/%COMMAND% value - Get the average price of an item.")));
messages.add(new LocalizedMessage(Message.CHANGED_CONFIG_SET, langConfig.getString("message.config.set", "&6Changed &a%PROPERTY% &6to &a%VALUE%&6."))); messages.add(new LocalizedMessage(Message.CHANGED_CONFIG_SET, langConfig.getString("message.config.set", "&6Changed &a%PROPERTY% &6to &a%VALUE%&6.")));
messages.add(new LocalizedMessage(Message.CHANGED_CONFIG_REMOVED, langConfig.getString("message.config.removed", "&6Removed &a%VALUE% &6from &a%PROPERTY%&6."))); messages.add(new LocalizedMessage(Message.CHANGED_CONFIG_REMOVED, langConfig.getString("message.config.removed", "&6Removed &a%VALUE% &6from &a%PROPERTY%&6.")));
messages.add(new LocalizedMessage(Message.CHANGED_CONFIG_ADDED, langConfig.getString("message.config.added", "&6Added &a%VALUE% &6to &a%PROPERTY%&6."))); messages.add(new LocalizedMessage(Message.CHANGED_CONFIG_ADDED, langConfig.getString("message.config.added", "&6Added &a%VALUE% &6to &a%PROPERTY%&6.")));
messages.add(new LocalizedMessage(Message.VALUE_OF_ITEM_BUY, langConfig.getString("message.valueOfItemBuy", "&6This item can be bought at &a%AMOUNT% &6players for an average price of &a%BUY-PRICE%&6.")));
messages.add(new LocalizedMessage(Message.VALUE_OF_ITEM_SELL, langConfig.getString("message.valueOfItemSell", "&6This item can be sold at &a%AMOUNT% &6players for an average price of &a%SELL-PRICE%&6.")));
messages.add(new LocalizedMessage(Message.VALUE_NO_SHOPS_BUY, langConfig.getString("message.valueNoShopsBuy", "&cNo shops are currently letting you buy this item.")));
messages.add(new LocalizedMessage(Message.VALUE_NO_SHOPS_SELL, langConfig.getString("message.valueNoShopsSell", "&cNo shops are currently letting you sell this item.")));
} }
/** /**

7
plugin/src/main/java/de/epiceric/shopchest/language/Message.java
View File

@ -93,7 +93,12 @@ public enum Message {
COMMAND_DESC_LIMITS, COMMAND_DESC_LIMITS,
COMMAND_DESC_OPEN, COMMAND_DESC_OPEN,
COMMAND_DESC_CONFIG, COMMAND_DESC_CONFIG,
COMMAND_DESC_VALUE,
CHANGED_CONFIG_SET, CHANGED_CONFIG_SET,
CHANGED_CONFIG_REMOVED, CHANGED_CONFIG_REMOVED,
CHANGED_CONFIG_ADDED CHANGED_CONFIG_ADDED,
VALUE_OF_ITEM_BUY,
VALUE_OF_ITEM_SELL,
VALUE_NO_SHOPS_BUY,
VALUE_NO_SHOPS_SELL
} }

4
plugin/src/main/java/de/epiceric/shopchest/listeners/BlockExplodeListener.java
View File

@ -2,7 +2,7 @@ package de.epiceric.shopchest.listeners;
import java.util.ArrayList; import java.util.ArrayList;
import org.bukkit.Material; import de.epiceric.shopchest.utils.ShopUtils;
import org.bukkit.block.Block; import org.bukkit.block.Block;
import org.bukkit.event.EventHandler; import org.bukkit.event.EventHandler;
import org.bukkit.event.Listener; import org.bukkit.event.Listener;
@ -22,7 +22,7 @@ public class BlockExplodeListener implements Listener {
public void onBlockExplode(BlockExplodeEvent e) { public void onBlockExplode(BlockExplodeEvent e) {
ArrayList<Block> bl = new ArrayList<>(e.blockList()); ArrayList<Block> bl = new ArrayList<>(e.blockList());
for (Block b : bl) { for (Block b : bl) {
if (b.getType().equals(Material.CHEST) || b.getType().equals(Material.TRAPPED_CHEST)) { if (ShopUtils.isShopMaterial(b.getType())) {
if (plugin.getShopUtils().isShop(b.getLocation())) e.blockList().remove(b); if (plugin.getShopUtils().isShop(b.getLocation())) e.blockList().remove(b);
} }
} }

51
plugin/src/main/java/de/epiceric/shopchest/listeners/ChestProtectListener.java
View File

@ -1,20 +1,19 @@
package de.epiceric.shopchest.listeners; package de.epiceric.shopchest.listeners;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.concurrent.CompletableFuture;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.Location; import org.bukkit.Location;
import org.bukkit.Material; import org.bukkit.block.*;
import org.bukkit.block.Block;
import org.bukkit.block.BlockFace;
import org.bukkit.block.Chest;
import org.bukkit.block.DoubleChest;
import org.bukkit.block.data.type.Chest.Type; import org.bukkit.block.data.type.Chest.Type;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler; import org.bukkit.event.EventHandler;
import org.bukkit.event.EventPriority; import org.bukkit.event.EventPriority;
import org.bukkit.event.Listener; import org.bukkit.event.Listener;
import org.bukkit.event.block.BlockBreakEvent; import org.bukkit.event.block.BlockBreakEvent;
import org.bukkit.event.block.BlockPistonExtendEvent;
import org.bukkit.event.block.BlockPistonRetractEvent;
import org.bukkit.event.block.BlockPlaceEvent; import org.bukkit.event.block.BlockPlaceEvent;
import org.bukkit.event.entity.EntityExplodeEvent; import org.bukkit.event.entity.EntityExplodeEvent;
import org.bukkit.event.inventory.InventoryMoveItemEvent; import org.bukkit.event.inventory.InventoryMoveItemEvent;
@ -64,6 +63,7 @@ public class ChestProtectListener implements Listener {
} }
}); });
} else { } else {
CompletableFuture.runAsync(() -> {
double creationPrice = shop.getShopType() == ShopType.ADMIN ? Config.shopCreationPriceAdmin : Config.shopCreationPriceNormal; double creationPrice = shop.getShopType() == ShopType.ADMIN ? Config.shopCreationPriceAdmin : Config.shopCreationPriceNormal;
if (creationPrice > 0 && Config.refundShopCreation && p.getUniqueId().equals(shop.getVendor().getUniqueId())) { if (creationPrice > 0 && Config.refundShopCreation && p.getUniqueId().equals(shop.getVendor().getUniqueId())) {
EconomyResponse r = plugin.getEconomy().depositPlayer(p, shop.getLocation().getWorld().getName(), creationPrice); EconomyResponse r = plugin.getEconomy().depositPlayer(p, shop.getLocation().getWorld().getName(), creationPrice);
@ -80,6 +80,7 @@ public class ChestProtectListener implements Listener {
} else { } else {
p.sendMessage(LanguageUtils.getMessage(Message.SHOP_REMOVED)); p.sendMessage(LanguageUtils.getMessage(Message.SHOP_REMOVED));
} }
});
shopUtils.removeShop(shop, true); shopUtils.removeShop(shop, true);
plugin.debug(String.format("%s broke %s's shop (#%d)", p.getName(), shop.getVendor().getName(), shop.getID())); plugin.debug(String.format("%s broke %s's shop (#%d)", p.getName(), shop.getVendor().getName(), shop.getID()));
@ -123,22 +124,44 @@ public class ChestProtectListener implements Listener {
public void onEntityExplode(EntityExplodeEvent e) { public void onEntityExplode(EntityExplodeEvent e) {
ArrayList<Block> bl = new ArrayList<>(e.blockList()); ArrayList<Block> bl = new ArrayList<>(e.blockList());
for (Block b : bl) { for (Block b : bl) {
if (b.getType().equals(Material.CHEST) || b.getType().equals(Material.TRAPPED_CHEST)) { if (ShopUtils.isShopMaterial(b.getType())) {
if (shopUtils.isShop(b.getLocation())) e.blockList().remove(b); if (shopUtils.isShop(b.getLocation())) e.blockList().remove(b);
} }
} }
} }
@EventHandler(ignoreCancelled = true)
public void onPistonExtend(BlockPistonExtendEvent e) {
for (Block b: e.getBlocks()) {
if (ShopUtils.isShopMaterial(b.getType())) {
if (shopUtils.isShop(b.getLocation())) {
e.setCancelled(true);
}
}
}
}
@EventHandler(ignoreCancelled = true)
public void onPistonRetract(BlockPistonRetractEvent e) {
for (Block b: e.getBlocks()) {
if (ShopUtils.isShopMaterial(b.getType())) {
if (shopUtils.isShop(b.getLocation())) {
e.setCancelled(true);
}
}
}
}
@EventHandler(ignoreCancelled = true) @EventHandler(ignoreCancelled = true)
public void onBlockPlace(BlockPlaceEvent e) { public void onBlockPlace(BlockPlaceEvent e) {
final Player p = e.getPlayer(); final Player p = e.getPlayer();
final Block b = e.getBlockPlaced(); final Block b = e.getBlockPlaced();
if (!b.getType().equals(Material.CHEST) && !b.getType().equals(Material.TRAPPED_CHEST)) { if (!ShopUtils.isShopMaterial(b.getType())) {
return; return;
} }
Chest c = (Chest) b.getState(); Container c = (Container) b.getState();
Block b2; Block b2;
// Can't use Utils::getChestLocations since inventory holder // Can't use Utils::getChestLocations since inventory holder
@ -160,9 +183,13 @@ public class ChestProtectListener implements Listener {
b2 = l.getBlock(); b2 = l.getBlock();
} }
} else { } else {
if (!(c instanceof Chest)) {
return;
}
org.bukkit.block.data.type.Chest data = (org.bukkit.block.data.type.Chest) c.getBlockData(); org.bukkit.block.data.type.Chest data = (org.bukkit.block.data.type.Chest) c.getBlockData();
if (data.getType() == Type.SINGLE) { if (data.equals(Type.SINGLE)) {
return; return;
} }
@ -228,7 +255,7 @@ public class ChestProtectListener implements Listener {
@EventHandler(priority = EventPriority.HIGH, ignoreCancelled = true) @EventHandler(priority = EventPriority.HIGH, ignoreCancelled = true)
public void onItemMove(InventoryMoveItemEvent e) { public void onItemMove(InventoryMoveItemEvent e) {
if ((e.getSource().getType().equals(InventoryType.CHEST)) && (!e.getInitiator().getType().equals(InventoryType.PLAYER))) { if ((e.getSource().getType().equals(InventoryType.CHEST) || e.getSource().getType().equals(InventoryType.SHULKER_BOX) || e.getSource().getType().equals(InventoryType.BARREL)) && (!e.getInitiator().getType().equals(InventoryType.PLAYER))) {
if (e.getSource().getHolder() instanceof DoubleChest) { if (e.getSource().getHolder() instanceof DoubleChest) {
DoubleChest dc = (DoubleChest) e.getSource().getHolder(); DoubleChest dc = (DoubleChest) e.getSource().getHolder();
@ -237,8 +264,8 @@ public class ChestProtectListener implements Listener {
if (shopUtils.isShop(r.getLocation()) || shopUtils.isShop(l.getLocation())) e.setCancelled(true); if (shopUtils.isShop(r.getLocation()) || shopUtils.isShop(l.getLocation())) e.setCancelled(true);
} else if (e.getSource().getHolder() instanceof Chest) { } else if (e.getSource().getHolder() instanceof Chest || e.getSource().getHolder() instanceof ShulkerBox || e.getSource().getHolder() instanceof Barrel) {
Chest c = (Chest) e.getSource().getHolder(); Container c = (Container) e.getSource().getHolder();
if (shopUtils.isShop(c.getLocation())) e.setCancelled(true); if (shopUtils.isShop(c.getLocation())) e.setCancelled(true);
} }

192
plugin/src/main/java/de/epiceric/shopchest/listeners/ShopInteractListener.java
View File

@ -3,7 +3,11 @@ package de.epiceric.shopchest.listeners;
import de.epiceric.shopchest.ShopChest; import de.epiceric.shopchest.ShopChest;
import de.epiceric.shopchest.config.Config; import de.epiceric.shopchest.config.Config;
import de.epiceric.shopchest.config.Placeholder; import de.epiceric.shopchest.config.Placeholder;
import de.epiceric.shopchest.event.*; import de.epiceric.shopchest.event.ShopBuySellEvent;
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.PlotSquaredOldShopFlag;
import de.epiceric.shopchest.external.PlotSquaredShopFlag; import de.epiceric.shopchest.external.PlotSquaredShopFlag;
import de.epiceric.shopchest.language.LanguageUtils; import de.epiceric.shopchest.language.LanguageUtils;
@ -13,8 +17,12 @@ import de.epiceric.shopchest.shop.Shop;
import de.epiceric.shopchest.shop.Shop.ShopType; import de.epiceric.shopchest.shop.Shop.ShopType;
import de.epiceric.shopchest.shop.ShopProduct; import de.epiceric.shopchest.shop.ShopProduct;
import de.epiceric.shopchest.sql.Database; import de.epiceric.shopchest.sql.Database;
import de.epiceric.shopchest.utils.*; import de.epiceric.shopchest.utils.ClickType;
import de.epiceric.shopchest.utils.ClickType.CreateClickType; import de.epiceric.shopchest.utils.ClickType.CreateClickType;
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.Economy;
import net.milkbowl.vault.economy.EconomyResponse; import net.milkbowl.vault.economy.EconomyResponse;
@ -22,11 +30,16 @@ import org.bukkit.Bukkit;
import org.bukkit.GameMode; import org.bukkit.GameMode;
import org.bukkit.Location; import org.bukkit.Location;
import org.bukkit.Material; import org.bukkit.Material;
import org.bukkit.block.Barrel;
import org.bukkit.block.Block; import org.bukkit.block.Block;
import org.bukkit.block.BlockFace; import org.bukkit.block.BlockFace;
import org.bukkit.block.BlockState;
import org.bukkit.block.Chest; import org.bukkit.block.Chest;
import org.bukkit.block.Container;
import org.bukkit.block.DoubleChest; import org.bukkit.block.DoubleChest;
import org.bukkit.block.ShulkerBox;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.event.Event;
import org.bukkit.event.EventHandler; import org.bukkit.event.EventHandler;
import org.bukkit.event.EventPriority; import org.bukkit.event.EventPriority;
import org.bukkit.event.Listener; import org.bukkit.event.Listener;
@ -44,9 +57,14 @@ import org.codemc.worldguardwrapper.flag.WrappedState;
import java.io.ByteArrayOutputStream; import java.io.ByteArrayOutputStream;
import java.io.DataOutputStream; import java.io.DataOutputStream;
import java.util.*; import java.util.HashMap;
import java.util.HashSet;
import java.util.Map;
import java.util.Optional;
import java.util.Set;
import java.util.UUID;
import java.util.concurrent.CompletableFuture;
import java.util.function.Consumer; import java.util.function.Consumer;
import java.util.regex.Pattern;
public class ShopInteractListener implements Listener { public class ShopInteractListener implements Listener {
@ -68,17 +86,18 @@ public class ShopInteractListener implements Listener {
Inventory chestInv = e.getInventory(); Inventory chestInv = e.getInventory();
if (!(chestInv.getHolder() instanceof Chest || chestInv.getHolder() instanceof DoubleChest)) { if (!(chestInv.getHolder() instanceof Chest || chestInv.getHolder() instanceof ShulkerBox || chestInv.getHolder() instanceof Barrel || chestInv.getHolder() instanceof DoubleChest)) {
return; return;
} }
Location loc = null; Location loc = null;
if (chestInv.getHolder() instanceof Chest) { if (chestInv.getHolder() instanceof Chest || chestInv.getHolder() instanceof ShulkerBox || chestInv.getHolder() instanceof Barrel) {
loc = ((Chest) chestInv.getHolder()).getLocation(); loc = ((BlockState) chestInv.getHolder()).getLocation();
} else if (chestInv.getHolder() instanceof DoubleChest) { } else if (chestInv.getHolder() instanceof DoubleChest) {
loc = ((DoubleChest) chestInv.getHolder()).getLocation(); loc = ((DoubleChest) chestInv.getHolder()).getLocation();
} }
if (loc == null) return;
final Shop shop = plugin.getShopUtils().getShop(loc); final Shop shop = plugin.getShopUtils().getShop(loc);
if (shop == null) return; if (shop == null) return;
@ -101,7 +120,7 @@ public class ShopInteractListener implements Listener {
if (!(ClickType.getPlayerClickType(p) instanceof CreateClickType)) if (!(ClickType.getPlayerClickType(p) instanceof CreateClickType))
return; return;
if (b.getType() != Material.CHEST && b.getType() != Material.TRAPPED_CHEST) if (!ShopUtils.isShopMaterial(b.getType()))
return; return;
if (ClickType.getPlayerClickType(p).getClickType() != ClickType.EnumClickType.CREATE) if (ClickType.getPlayerClickType(p).getClickType() != ClickType.EnumClickType.CREATE)
@ -110,7 +129,7 @@ public class ShopInteractListener implements Listener {
if (Config.enableAuthMeIntegration && plugin.hasAuthMe() && !AuthMeApi.getInstance().isAuthenticated(p)) if (Config.enableAuthMeIntegration && plugin.hasAuthMe() && !AuthMeApi.getInstance().isAuthenticated(p))
return; return;
if (e.isCancelled() && !p.hasPermission(Permissions.CREATE_PROTECTED)) { if (e.useInteractedBlock() == Event.Result.DENY && !p.hasPermission(Permissions.CREATE_PROTECTED)) {
p.sendMessage(LanguageUtils.getMessage(Message.NO_PERMISSION_CREATE_PROTECTED)); p.sendMessage(LanguageUtils.getMessage(Message.NO_PERMISSION_CREATE_PROTECTED));
plugin.debug(p.getName() + " is not allowed to create a shop on the selected chest"); plugin.debug(p.getName() + " is not allowed to create a shop on the selected chest");
} else if (shopUtils.isShop(b.getLocation())) { } else if (shopUtils.isShop(b.getLocation())) {
@ -146,7 +165,7 @@ public class ShopInteractListener implements Listener {
if (e.getAction() != Action.RIGHT_CLICK_BLOCK && e.getAction() != Action.LEFT_CLICK_BLOCK) if (e.getAction() != Action.RIGHT_CLICK_BLOCK && e.getAction() != Action.LEFT_CLICK_BLOCK)
return; return;
if (b.getType() != Material.CHEST && b.getType() != Material.TRAPPED_CHEST) if (b == null || !ShopUtils.isShopMaterial(b.getType()))
return; return;
ClickType clickType = ClickType.getPlayerClickType(p); ClickType clickType = ClickType.getPlayerClickType(p);
@ -283,7 +302,7 @@ public class ShopInteractListener implements Listener {
} }
} else { } else {
if (externalPluginsAllowed || p.hasPermission(Permissions.BYPASS_EXTERNAL_PLUGIN)) { if (externalPluginsAllowed || p.hasPermission(Permissions.BYPASS_EXTERNAL_PLUGIN)) {
Chest c = (Chest) b.getState(); Container c = (Container) b.getState();
ItemStack itemStack = shop.getProduct().getItemStack(); ItemStack itemStack = shop.getProduct().getItemStack();
int amount = (p.isSneaking() ? itemStack.getMaxStackSize() : shop.getProduct().getAmount()); int amount = (p.isSneaking() ? itemStack.getMaxStackSize() : shop.getProduct().getAmount());
@ -482,8 +501,10 @@ public class ShopInteractListener implements Listener {
return; return;
} }
CompletableFuture.runAsync(() -> {
if (creationPrice > 0) { if (creationPrice > 0) {
EconomyResponse r = plugin.getEconomy().withdrawPlayer(executor, location.getWorld().getName(), creationPrice); EconomyResponse r = econ.withdrawPlayer(executor, location.getWorld().getName(), creationPrice);
if (!r.transactionSuccess()) { if (!r.transactionSuccess()) {
plugin.debug("Economy transaction failed: " + r.errorMessage); plugin.debug("Economy transaction failed: " + r.errorMessage);
executor.sendMessage(LanguageUtils.getMessage(Message.ERROR_OCCURRED, new Replacement(Placeholder.ERROR, r.errorMessage))); executor.sendMessage(LanguageUtils.getMessage(Message.ERROR_OCCURRED, new Replacement(Placeholder.ERROR, r.errorMessage)));
@ -491,6 +512,8 @@ public class ShopInteractListener implements Listener {
} }
} }
Bukkit.getScheduler().runTask(plugin, () -> {
shop.create(true); shop.create(true);
plugin.debug("Shop created"); plugin.debug("Shop created");
@ -498,6 +521,8 @@ public class ShopInteractListener implements Listener {
Message message = shopType == ShopType.ADMIN ? Message.ADMIN_SHOP_CREATED : Message.SHOP_CREATED; Message message = shopType == ShopType.ADMIN ? Message.ADMIN_SHOP_CREATED : Message.SHOP_CREATED;
executor.sendMessage(LanguageUtils.getMessage(message, new Replacement(Placeholder.CREATION_PRICE, creationPrice))); executor.sendMessage(LanguageUtils.getMessage(message, new Replacement(Placeholder.CREATION_PRICE, creationPrice)));
});
}, plugin.getShopCreationThreadPool());
} }
/** /**
@ -525,9 +550,11 @@ public class ShopInteractListener implements Listener {
return; return;
} }
CompletableFuture.runAsync(() -> {
double creationPrice = shop.getShopType() == ShopType.ADMIN ? Config.shopCreationPriceAdmin : Config.shopCreationPriceNormal; double creationPrice = shop.getShopType() == ShopType.ADMIN ? Config.shopCreationPriceAdmin : Config.shopCreationPriceNormal;
if (creationPrice > 0 && Config.refundShopCreation && executor.getUniqueId().equals(shop.getVendor().getUniqueId())) { if (creationPrice > 0 && Config.refundShopCreation && executor.getUniqueId().equals(shop.getVendor().getUniqueId())) {
EconomyResponse r = plugin.getEconomy().depositPlayer(executor, shop.getLocation().getWorld().getName(), creationPrice); EconomyResponse r = econ.depositPlayer(executor, shop.getLocation().getWorld().getName(), creationPrice);
if (!r.transactionSuccess()) { if (!r.transactionSuccess()) {
plugin.debug("Economy transaction failed: " + r.errorMessage); plugin.debug("Economy transaction failed: " + r.errorMessage);
executor.sendMessage(LanguageUtils.getMessage(Message.ERROR_OCCURRED, executor.sendMessage(LanguageUtils.getMessage(Message.ERROR_OCCURRED,
@ -542,8 +569,12 @@ public class ShopInteractListener implements Listener {
executor.sendMessage(LanguageUtils.getMessage(Message.SHOP_REMOVED)); executor.sendMessage(LanguageUtils.getMessage(Message.SHOP_REMOVED));
} }
Bukkit.getScheduler().runTask(plugin, () -> {
shopUtils.removeShop(shop, true); shopUtils.removeShop(shop, true);
plugin.debug("Removed shop (#" + shop.getID() + ")"); plugin.debug("Removed shop (#" + shop.getID() + ")");
});
}, plugin.getShopCreationThreadPool());
} }
/** /**
@ -587,7 +618,7 @@ public class ShopInteractListener implements Listener {
return; return;
} }
Chest c = (Chest) shop.getLocation().getBlock().getState(); Container c = (Container) shop.getLocation().getBlock().getState();
ItemStack itemStack = shop.getProduct().getItemStack(); ItemStack itemStack = shop.getProduct().getItemStack();
int amount = Utils.getAmount(c.getInventory(), itemStack); int amount = Utils.getAmount(c.getInventory(), itemStack);
int space = Utils.getFreeSpaceForItem(c.getInventory(), itemStack); int space = Utils.getFreeSpaceForItem(c.getInventory(), itemStack);
@ -648,12 +679,15 @@ public class ShopInteractListener implements Listener {
String worldName = shop.getLocation().getWorld().getName(); String worldName = shop.getLocation().getWorld().getName();
int finalAmount = amount;
CompletableFuture.runAsync(() -> {
double price = shop.getBuyPrice(); double price = shop.getBuyPrice();
if (stack) price = (price / shop.getProduct().getAmount()) * amount; if (stack) price = (price / shop.getProduct().getAmount()) * finalAmount;
if (econ.getBalance(executor, worldName) >= price || Config.autoCalculateItemAmount) { if (econ.getBalance(executor, worldName) >= price || Config.autoCalculateItemAmount) {
int amountForMoney = (int) (amount / price * econ.getBalance(executor, worldName)); int amountForMoney = (int) (finalAmount / price * econ.getBalance(executor, worldName));
if (amountForMoney == 0 && Config.autoCalculateItemAmount) { if (amountForMoney == 0 && Config.autoCalculateItemAmount) {
executor.sendMessage(LanguageUtils.getMessage(Message.NOT_ENOUGH_MONEY)); executor.sendMessage(LanguageUtils.getMessage(Message.NOT_ENOUGH_MONEY));
@ -662,8 +696,11 @@ public class ShopInteractListener implements Listener {
plugin.debug(executor.getName() + " has enough money for " + amountForMoney + " item(s) (#" + shop.getID() + ")"); plugin.debug(executor.getName() + " has enough money for " + amountForMoney + " item(s) (#" + shop.getID() + ")");
double finalPrice = price;
Bukkit.getScheduler().runTask(plugin, () -> {
Block b = shop.getLocation().getBlock(); Block b = shop.getLocation().getBlock();
Chest c = (Chest) b.getState(); Container c = (Container) b.getState();
int amountForChestItems = Utils.getAmount(c.getInventory(), itemStack); int amountForChestItems = Utils.getAmount(c.getInventory(), itemStack);
@ -673,7 +710,7 @@ public class ShopInteractListener implements Listener {
} }
ItemStack product = new ItemStack(itemStack); ItemStack product = new ItemStack(itemStack);
if (stack) product.setAmount(amount); if (stack) product.setAmount(finalAmount);
Inventory inventory = executor.getInventory(); Inventory inventory = executor.getInventory();
@ -684,7 +721,9 @@ public class ShopInteractListener implements Listener {
return; return;
} }
int newAmount = amount; CompletableFuture.runAsync(() -> {
int newAmount = finalAmount;
if (Config.autoCalculateItemAmount) { if (Config.autoCalculateItemAmount) {
if (shop.getShopType() == ShopType.ADMIN) if (shop.getShopType() == ShopType.ADMIN)
@ -693,10 +732,11 @@ public class ShopInteractListener implements Listener {
newAmount = Math.min(Math.min(amountForMoney, amountForChestItems), freeSpace); newAmount = Math.min(Math.min(amountForMoney, amountForChestItems), freeSpace);
} }
if (newAmount > amount) newAmount = amount; if (newAmount > finalAmount) newAmount = finalAmount;
ShopProduct newProduct = new ShopProduct(product, newAmount); ShopProduct newProduct = new ShopProduct(product, newAmount);
double newPrice = (price / amount) * newAmount; double newPrice = (finalPrice / finalAmount) * newAmount;
double tax = Config.shopTaxes.getOrDefault(itemStack.getType().toString(), Config.shopTaxes.get("default"));
if (freeSpace >= newAmount) { if (freeSpace >= newAmount) {
plugin.debug(executor.getName() + " has enough inventory space for " + freeSpace + " items (#" + shop.getID() + ")"); plugin.debug(executor.getName() + " has enough inventory space for " + freeSpace + " items (#" + shop.getID() + ")");
@ -704,16 +744,19 @@ public class ShopInteractListener implements Listener {
EconomyResponse r = econ.withdrawPlayer(executor, worldName, newPrice); EconomyResponse r = econ.withdrawPlayer(executor, worldName, newPrice);
if (r.transactionSuccess()) { if (r.transactionSuccess()) {
EconomyResponse r2 = (shop.getShopType() != ShopType.ADMIN) ? econ.depositPlayer(shop.getVendor(), worldName, newPrice) : null; EconomyResponse r2 = (shop.getShopType() != ShopType.ADMIN) ? econ.depositPlayer(shop.getVendor(), worldName, newPrice * (100d - tax) / 100d) : null;
if (r2 != null) { if (r2 != null) {
if (r2.transactionSuccess()) { if (r2.transactionSuccess()) {
ShopBuySellEvent event = new ShopBuySellEvent(executor, shop, ShopBuySellEvent.Type.BUY, newAmount, newPrice);
int finalNewAmount = newAmount;
Bukkit.getScheduler().runTask(plugin, () -> {
ShopBuySellEvent event = new ShopBuySellEvent(executor, shop, ShopBuySellEvent.Type.BUY, finalNewAmount, newPrice);
Bukkit.getPluginManager().callEvent(event); Bukkit.getPluginManager().callEvent(event);
if (event.isCancelled()) { if (event.isCancelled()) {
econ.depositPlayer(executor, worldName, newPrice); econ.depositPlayer(executor, worldName, newPrice);
econ.withdrawPlayer(shop.getVendor(), worldName, newPrice); econ.withdrawPlayer(shop.getVendor(), worldName, newPrice * (100d - tax) / 100d);
plugin.debug("Buy event cancelled (#" + shop.getID() + ")"); plugin.debug("Buy event cancelled (#" + shop.getID() + ")");
return; return;
} }
@ -734,35 +777,41 @@ public class ShopInteractListener implements Listener {
}.runTaskLater(plugin, 1L); }.runTaskLater(plugin, 1L);
String vendorName = (shop.getVendor().getName() == null ? shop.getVendor().getUniqueId().toString() : shop.getVendor().getName()); String vendorName = (shop.getVendor().getName() == null ? shop.getVendor().getUniqueId().toString() : shop.getVendor().getName());
executor.sendMessage(LanguageUtils.getMessage(Message.BUY_SUCCESS, new Replacement(Placeholder.AMOUNT, String.valueOf(newAmount)), executor.sendMessage(LanguageUtils.getMessage(Message.BUY_SUCCESS, new Replacement(Placeholder.AMOUNT, String.valueOf(finalNewAmount)),
new Replacement(Placeholder.ITEM_NAME, newProduct.getLocalizedName()), new Replacement(Placeholder.BUY_PRICE, String.valueOf(newPrice)), new Replacement(Placeholder.ITEM_NAME, newProduct.getLocalizedName()), new Replacement(Placeholder.BUY_PRICE, String.valueOf(newPrice)),
new Replacement(Placeholder.VENDOR, vendorName))); new Replacement(Placeholder.VENDOR, vendorName)));
plugin.debug(executor.getName() + " successfully bought (#" + shop.getID() + ")"); plugin.debug(executor.getName() + " successfully bought (#" + shop.getID() + ")");
plugin.getLogger().info(String.format("%s bought %d of %s from %s", executor.getName(), finalNewAmount, newProduct.getItemStack().toString(), vendorName));
if (shop.getVendor().isOnline() && Config.enableVendorMessages) { if (shop.getVendor().isOnline() && Config.enableVendorMessages) {
shop.getVendor().getPlayer().sendMessage(LanguageUtils.getMessage(Message.SOMEONE_BOUGHT, new Replacement(Placeholder.AMOUNT, String.valueOf(newAmount)), shop.getVendor().getPlayer().sendMessage(LanguageUtils.getMessage(Message.SOMEONE_BOUGHT, new Replacement(Placeholder.AMOUNT, String.valueOf(finalNewAmount)),
new Replacement(Placeholder.ITEM_NAME, newProduct.getLocalizedName()), new Replacement(Placeholder.BUY_PRICE, String.valueOf(newPrice)), new Replacement(Placeholder.ITEM_NAME, newProduct.getLocalizedName()), new Replacement(Placeholder.BUY_PRICE, String.valueOf(newPrice)),
new Replacement(Placeholder.PLAYER, executor.getName()))); new Replacement(Placeholder.PLAYER, executor.getName())));
} else if(!shop.getVendor().isOnline() && Config.enableVendorBungeeMessages){ } else if (!shop.getVendor().isOnline() && Config.enableVendorBungeeMessages) {
String message = LanguageUtils.getMessage( Message.SOMEONE_BOUGHT, new Replacement(Placeholder.AMOUNT, String.valueOf(newAmount)), String message = LanguageUtils.getMessage(Message.SOMEONE_BOUGHT, new Replacement(Placeholder.AMOUNT, String.valueOf(finalNewAmount)),
new Replacement(Placeholder.ITEM_NAME, newProduct.getLocalizedName()), new Replacement(Placeholder.BUY_PRICE, String.valueOf(newPrice)), new Replacement(Placeholder.ITEM_NAME, newProduct.getLocalizedName()), new Replacement(Placeholder.BUY_PRICE, String.valueOf(newPrice)),
new Replacement(Placeholder.PLAYER, executor.getName())); new Replacement(Placeholder.PLAYER, executor.getName()));
sendBungeeMessage(shop.getVendor().getName(),message); sendBungeeMessage(shop.getVendor().getName(), message);
} }
});
} else { } else {
CompletableFuture.runAsync(() -> {
plugin.debug("Economy transaction failed (r2): " + r2.errorMessage + " (#" + shop.getID() + ")"); plugin.debug("Economy transaction failed (r2): " + r2.errorMessage + " (#" + shop.getID() + ")");
executor.sendMessage(LanguageUtils.getMessage(Message.ERROR_OCCURRED, new Replacement(Placeholder.ERROR, r2.errorMessage))); executor.sendMessage(LanguageUtils.getMessage(Message.ERROR_OCCURRED, new Replacement(Placeholder.ERROR, r2.errorMessage)));
econ.withdrawPlayer(shop.getVendor(), worldName, newPrice); econ.withdrawPlayer(shop.getVendor(), worldName, newPrice);
econ.depositPlayer(executor, worldName, newPrice); econ.depositPlayer(executor, worldName, newPrice * (100d - tax) / 100d);
}, plugin.getShopCreationThreadPool());
} }
} else { } else {
ShopBuySellEvent event = new ShopBuySellEvent(executor, shop, ShopBuySellEvent.Type.BUY, newAmount, newPrice); int finalNewAmount1 = newAmount;
Bukkit.getScheduler().runTask(plugin, () -> {
ShopBuySellEvent event = new ShopBuySellEvent(executor, shop, ShopBuySellEvent.Type.BUY, finalNewAmount1, newPrice);
Bukkit.getPluginManager().callEvent(event); Bukkit.getPluginManager().callEvent(event);
if (event.isCancelled()) { if (event.isCancelled()) {
econ.depositPlayer(executor, worldName, newPrice); econ.depositPlayer(executor, worldName, newPrice * (100d - tax) / 100d);
plugin.debug("Buy event cancelled (#" + shop.getID() + ")"); plugin.debug("Buy event cancelled (#" + shop.getID() + ")");
return; return;
} }
@ -781,22 +830,29 @@ public class ShopInteractListener implements Listener {
} }
}.runTaskLater(plugin, 1L); }.runTaskLater(plugin, 1L);
executor.sendMessage(LanguageUtils.getMessage(Message.BUY_SUCCESS_ADMIN, new Replacement(Placeholder.AMOUNT, String.valueOf(newAmount)), executor.sendMessage(LanguageUtils.getMessage(Message.BUY_SUCCESS_ADMIN, new Replacement(Placeholder.AMOUNT, String.valueOf(finalNewAmount1)),
new Replacement(Placeholder.ITEM_NAME, newProduct.getLocalizedName()), new Replacement(Placeholder.BUY_PRICE, String.valueOf(newPrice)))); new Replacement(Placeholder.ITEM_NAME, newProduct.getLocalizedName()), new Replacement(Placeholder.BUY_PRICE, String.valueOf(newPrice))));
plugin.debug(executor.getName() + " successfully bought (#" + shop.getID() + ")"); plugin.debug(executor.getName() + " successfully bought (#" + shop.getID() + ")");
plugin.getLogger().info(String.format("%s bought %d of %s from %s", executor.getName(), finalNewAmount1, newProduct.getItemStack().toString(), "ADMIN"));
});
} }
} else { } else {
CompletableFuture.runAsync(() -> {
plugin.debug("Economy transaction failed (r): " + r.errorMessage + " (#" + shop.getID() + ")"); plugin.debug("Economy transaction failed (r): " + r.errorMessage + " (#" + shop.getID() + ")");
executor.sendMessage(LanguageUtils.getMessage(Message.ERROR_OCCURRED, new Replacement(Placeholder.ERROR, r.errorMessage))); executor.sendMessage(LanguageUtils.getMessage(Message.ERROR_OCCURRED, new Replacement(Placeholder.ERROR, r.errorMessage)));
econ.depositPlayer(executor, worldName, newPrice); econ.depositPlayer(executor, worldName, newPrice);
}, plugin.getShopCreationThreadPool());
} }
} else { } else {
executor.sendMessage(LanguageUtils.getMessage(Message.NOT_ENOUGH_INVENTORY_SPACE)); executor.sendMessage(LanguageUtils.getMessage(Message.NOT_ENOUGH_INVENTORY_SPACE));
} }
}, plugin.getShopCreationThreadPool());
});
} else { } else {
executor.sendMessage(LanguageUtils.getMessage(Message.NOT_ENOUGH_MONEY)); executor.sendMessage(LanguageUtils.getMessage(Message.NOT_ENOUGH_MONEY));
} }
}, plugin.getShopCreationThreadPool());
} }
/** /**
@ -816,11 +872,15 @@ public class ShopInteractListener implements Listener {
String worldName = shop.getLocation().getWorld().getName(); String worldName = shop.getLocation().getWorld().getName();
if (shop.getShopType() == ShopType.ADMIN || econ.getBalance(shop.getVendor(), worldName) >= price || Config.autoCalculateItemAmount) { int finalAmount = amount;
double finalPrice = price;
CompletableFuture.runAsync(() -> {
if (shop.getShopType() == ShopType.ADMIN || econ.getBalance(shop.getVendor(), worldName) >= finalPrice || Config.autoCalculateItemAmount) {
int amountForMoney = 1; int amountForMoney = 1;
if (shop.getShopType() != ShopType.ADMIN) { if (shop.getShopType() != ShopType.ADMIN) {
amountForMoney = (int) (amount / price * econ.getBalance(shop.getVendor(), worldName)); amountForMoney = (int) (finalAmount / finalPrice * econ.getBalance(shop.getVendor(), worldName));
} }
plugin.debug("Vendor has enough money for " + amountForMoney + " item(s) (#" + shop.getID() + ")"); plugin.debug("Vendor has enough money for " + amountForMoney + " item(s) (#" + shop.getID() + ")");
@ -830,8 +890,10 @@ public class ShopInteractListener implements Listener {
return; return;
} }
int finalAmountForMoney = amountForMoney;
Bukkit.getScheduler().runTask(plugin, () -> {
Block block = shop.getLocation().getBlock(); Block block = shop.getLocation().getBlock();
Chest chest = (Chest) block.getState(); Container chest = (Container) block.getState();
int amountForItemCount = Utils.getAmount(executor.getInventory(), itemStack); int amountForItemCount = Utils.getAmount(executor.getInventory(), itemStack);
@ -841,7 +903,7 @@ public class ShopInteractListener implements Listener {
} }
ItemStack product = new ItemStack(itemStack); ItemStack product = new ItemStack(itemStack);
if (stack) product.setAmount(amount); if (stack) product.setAmount(finalAmount);
Inventory inventory = chest.getInventory(); Inventory inventory = chest.getInventory();
@ -852,37 +914,44 @@ public class ShopInteractListener implements Listener {
return; return;
} }
int newAmount = amount; int newAmount = finalAmount;
if (Config.autoCalculateItemAmount) { if (Config.autoCalculateItemAmount) {
if (shop.getShopType() == ShopType.ADMIN) if (shop.getShopType() == ShopType.ADMIN)
newAmount = amountForItemCount; newAmount = amountForItemCount;
else else
newAmount = Math.min(Math.min(amountForMoney, amountForItemCount), freeSpace); newAmount = Math.min(Math.min(finalAmountForMoney, amountForItemCount), freeSpace);
} }
if (newAmount > amount) newAmount = amount; if (newAmount > finalAmount) newAmount = finalAmount;
ShopProduct newProduct = new ShopProduct(product, newAmount); ShopProduct newProduct = new ShopProduct(product, newAmount);
double newPrice = (price / amount) * newAmount; double newPrice = (finalPrice / finalAmount) * newAmount;
double tax = plugin.getShopChestConfig().shopTaxes.getOrDefault(itemStack.getType().toString(), plugin.getShopChestConfig().shopTaxes.get("default"));
if (freeSpace >= newAmount || shop.getShopType() == ShopType.ADMIN) { if (freeSpace >= newAmount || shop.getShopType() == ShopType.ADMIN) {
plugin.debug("Chest has enough inventory space for " + freeSpace + " items (#" + shop.getID() + ")"); plugin.debug("Chest has enough inventory space for " + freeSpace + " items (#" + shop.getID() + ")");
EconomyResponse r = econ.depositPlayer(executor, worldName, newPrice); int finalNewAmount = newAmount;
CompletableFuture.runAsync(() -> {
EconomyResponse r = econ.depositPlayer(executor, worldName, newPrice * (100d - tax) / 100d);
if (r.transactionSuccess()) { if (r.transactionSuccess()) {
EconomyResponse r2 = (shop.getShopType() != ShopType.ADMIN) ? econ.withdrawPlayer(shop.getVendor(), worldName, newPrice) : null; EconomyResponse r2 = (shop.getShopType() != ShopType.ADMIN) ? econ.withdrawPlayer(shop.getVendor(), worldName, newPrice) : null;
if (r2 != null) { if (r2 != null) {
if (r2.transactionSuccess()) { if (r2.transactionSuccess()) {
ShopBuySellEvent event = new ShopBuySellEvent(executor, shop, ShopBuySellEvent.Type.SELL, newAmount, newPrice); Bukkit.getScheduler().runTask(plugin, () -> {
ShopBuySellEvent event = new ShopBuySellEvent(executor, shop, ShopBuySellEvent.Type.SELL, finalNewAmount, newPrice);
Bukkit.getPluginManager().callEvent(event); Bukkit.getPluginManager().callEvent(event);
if (event.isCancelled()) { if (event.isCancelled()) {
econ.withdrawPlayer(executor, worldName, newPrice); CompletableFuture.runAsync(() -> {
econ.withdrawPlayer(executor, worldName, newPrice * (100d - tax) / 100d);
econ.depositPlayer(shop.getVendor(), worldName, newPrice); econ.depositPlayer(shop.getVendor(), worldName, newPrice);
plugin.debug("Sell event cancelled (#" + shop.getID() + ")"); plugin.debug("Sell event cancelled (#" + shop.getID() + ")");
}, plugin.getShopCreationThreadPool());
return; return;
} }
@ -902,37 +971,43 @@ public class ShopInteractListener implements Listener {
}.runTaskLater(plugin, 1L); }.runTaskLater(plugin, 1L);
String vendorName = (shop.getVendor().getName() == null ? shop.getVendor().getUniqueId().toString() : shop.getVendor().getName()); String vendorName = (shop.getVendor().getName() == null ? shop.getVendor().getUniqueId().toString() : shop.getVendor().getName());
executor.sendMessage(LanguageUtils.getMessage(Message.SELL_SUCCESS, new Replacement(Placeholder.AMOUNT, String.valueOf(newAmount)), executor.sendMessage(LanguageUtils.getMessage(Message.SELL_SUCCESS, new Replacement(Placeholder.AMOUNT, String.valueOf(finalNewAmount)),
new Replacement(Placeholder.ITEM_NAME, newProduct.getLocalizedName()), new Replacement(Placeholder.SELL_PRICE, String.valueOf(newPrice)), new Replacement(Placeholder.ITEM_NAME, newProduct.getLocalizedName()), new Replacement(Placeholder.SELL_PRICE, String.valueOf(newPrice)),
new Replacement(Placeholder.VENDOR, vendorName))); new Replacement(Placeholder.VENDOR, vendorName)));
plugin.debug(executor.getName() + " successfully sold (#" + shop.getID() + ")"); plugin.debug(executor.getName() + " successfully sold (#" + shop.getID() + ")");
plugin.getLogger().info(String.format("%s sold %d of %s from %s", executor.getName(), finalNewAmount, newProduct.getItemStack().toString(), vendorName));
if (shop.getVendor().isOnline() && Config.enableVendorMessages) { if (shop.getVendor().isOnline() && Config.enableVendorMessages) {
shop.getVendor().getPlayer().sendMessage(LanguageUtils.getMessage(Message.SOMEONE_SOLD, new Replacement(Placeholder.AMOUNT, String.valueOf(newAmount)), shop.getVendor().getPlayer().sendMessage(LanguageUtils.getMessage(Message.SOMEONE_SOLD, new Replacement(Placeholder.AMOUNT, String.valueOf(finalNewAmount)),
new Replacement(Placeholder.ITEM_NAME, newProduct.getLocalizedName()), new Replacement(Placeholder.SELL_PRICE, String.valueOf(newPrice)), new Replacement(Placeholder.ITEM_NAME, newProduct.getLocalizedName()), new Replacement(Placeholder.SELL_PRICE, String.valueOf(newPrice)),
new Replacement(Placeholder.PLAYER, executor.getName()))); new Replacement(Placeholder.PLAYER, executor.getName())));
} else if(!shop.getVendor().isOnline() && Config.enableVendorBungeeMessages){ } else if (!shop.getVendor().isOnline() && Config.enableVendorBungeeMessages) {
String message = LanguageUtils.getMessage( Message.SOMEONE_SOLD, new Replacement(Placeholder.AMOUNT, String.valueOf(newAmount)), String message = LanguageUtils.getMessage(Message.SOMEONE_SOLD, new Replacement(Placeholder.AMOUNT, String.valueOf(finalNewAmount)),
new Replacement(Placeholder.ITEM_NAME, newProduct.getLocalizedName()), new Replacement(Placeholder.SELL_PRICE, String.valueOf(newPrice)), new Replacement(Placeholder.ITEM_NAME, newProduct.getLocalizedName()), new Replacement(Placeholder.SELL_PRICE, String.valueOf(newPrice)),
new Replacement(Placeholder.PLAYER, executor.getName())); new Replacement(Placeholder.PLAYER, executor.getName()));
sendBungeeMessage(shop.getVendor().getName(),message); sendBungeeMessage(shop.getVendor().getName(), message);
} }
});
} else { } else {
CompletableFuture.runAsync(() -> {
plugin.debug("Economy transaction failed (r2): " + r2.errorMessage + " (#" + shop.getID() + ")"); plugin.debug("Economy transaction failed (r2): " + r2.errorMessage + " (#" + shop.getID() + ")");
executor.sendMessage(LanguageUtils.getMessage(Message.ERROR_OCCURRED, new Replacement(Placeholder.ERROR, r2.errorMessage))); executor.sendMessage(LanguageUtils.getMessage(Message.ERROR_OCCURRED, new Replacement(Placeholder.ERROR, r2.errorMessage)));
econ.withdrawPlayer(executor, worldName, newPrice); econ.withdrawPlayer(executor, worldName, newPrice * (100d - tax) / 100d);
econ.depositPlayer(shop.getVendor(), worldName, newPrice); econ.depositPlayer(shop.getVendor(), worldName, newPrice);
}, plugin.getShopCreationThreadPool());
} }
} else { } else {
ShopBuySellEvent event = new ShopBuySellEvent(executor, shop, ShopBuySellEvent.Type.SELL, newAmount, newPrice); ShopBuySellEvent event = new ShopBuySellEvent(executor, shop, ShopBuySellEvent.Type.SELL, finalNewAmount, newPrice);
Bukkit.getPluginManager().callEvent(event); Bukkit.getPluginManager().callEvent(event);
if (event.isCancelled()) { if (event.isCancelled()) {
econ.withdrawPlayer(executor, worldName, newPrice); CompletableFuture.runAsync(() -> {
econ.withdrawPlayer(executor, worldName, newPrice * (100d - tax) / 100d);
plugin.debug("Sell event cancelled (#" + shop.getID() + ")"); plugin.debug("Sell event cancelled (#" + shop.getID() + ")");
}, plugin.getShopCreationThreadPool());
return; return;
} }
@ -950,31 +1025,36 @@ public class ShopInteractListener implements Listener {
} }
}.runTaskLater(plugin, 1L); }.runTaskLater(plugin, 1L);
executor.sendMessage(LanguageUtils.getMessage(Message.SELL_SUCCESS_ADMIN, new Replacement(Placeholder.AMOUNT, String.valueOf(newAmount)), executor.sendMessage(LanguageUtils.getMessage(Message.SELL_SUCCESS_ADMIN, new Replacement(Placeholder.AMOUNT, String.valueOf(finalNewAmount)),
new Replacement(Placeholder.ITEM_NAME, newProduct.getLocalizedName()), new Replacement(Placeholder.SELL_PRICE, String.valueOf(newPrice)))); new Replacement(Placeholder.ITEM_NAME, newProduct.getLocalizedName()), new Replacement(Placeholder.SELL_PRICE, String.valueOf(newPrice))));
plugin.debug(executor.getName() + " successfully sold (#" + shop.getID() + ")"); plugin.debug(executor.getName() + " successfully sold (#" + shop.getID() + ")");
plugin.getLogger().info(String.format("%s bought %d of %s from %s", executor.getName(), finalNewAmount, newProduct.getItemStack().toString(), "ADMIN"));
} }
} else { } else {
CompletableFuture.runAsync(() -> {
plugin.debug("Economy transaction failed (r): " + r.errorMessage + " (#" + shop.getID() + ")"); plugin.debug("Economy transaction failed (r): " + r.errorMessage + " (#" + shop.getID() + ")");
executor.sendMessage(LanguageUtils.getMessage(Message.ERROR_OCCURRED, new Replacement(Placeholder.ERROR, r.errorMessage))); executor.sendMessage(LanguageUtils.getMessage(Message.ERROR_OCCURRED, new Replacement(Placeholder.ERROR, r.errorMessage)));
econ.withdrawPlayer(executor, worldName, newPrice); econ.withdrawPlayer(executor, worldName, newPrice);
}, plugin.getShopCreationThreadPool());
} }
}, plugin.getShopCreationThreadPool());
} else { } else {
executor.sendMessage(LanguageUtils.getMessage(Message.CHEST_NOT_ENOUGH_INVENTORY_SPACE)); executor.sendMessage(LanguageUtils.getMessage(Message.CHEST_NOT_ENOUGH_INVENTORY_SPACE));
} }
});
} else { } else {
executor.sendMessage(LanguageUtils.getMessage(Message.VENDOR_NOT_ENOUGH_MONEY)); executor.sendMessage(LanguageUtils.getMessage(Message.VENDOR_NOT_ENOUGH_MONEY));
} }
}, plugin.getShopCreationThreadPool());
} }
/** /**
* Adds items to an inventory * Adds items to an inventory
* @param inventory The inventory, to which the items will be added * @param inventory The inventory, to which the items will be added
* @param itemStack Items to add * @param product Products to add
* @return Whether all items were added to the inventory * @return Whether all items were added to the inventory
*/ */
private boolean addToInventory(Inventory inventory, ShopProduct product) { private boolean addToInventory(Inventory inventory, ShopProduct product) {
@ -1033,7 +1113,7 @@ public class ShopInteractListener implements Listener {
/** /**
* Removes items to from an inventory * Removes items to from an inventory
* @param inventory The inventory, from which the items will be removed * @param inventory The inventory, from which the items will be removed
* @param itemStack Items to remove * @param product Products to remove
* @return Whether all items were removed from the inventory * @return Whether all items were removed from the inventory
*/ */
private boolean removeFromInventory(Inventory inventory, ShopProduct product) { private boolean removeFromInventory(Inventory inventory, ShopProduct product) {

28
plugin/src/main/java/de/epiceric/shopchest/listeners/ShopItemListener.java
View File

@ -5,6 +5,7 @@ import org.bukkit.Material;
import org.bukkit.block.Block; import org.bukkit.block.Block;
import org.bukkit.block.BlockFace; import org.bukkit.block.BlockFace;
import org.bukkit.block.BlockState; import org.bukkit.block.BlockState;
import org.bukkit.block.ShulkerBox;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler; import org.bukkit.event.EventHandler;
import org.bukkit.event.EventPriority; import org.bukkit.event.EventPriority;
@ -16,6 +17,8 @@ import org.bukkit.event.block.BlockPistonExtendEvent;
import org.bukkit.event.block.BlockPistonRetractEvent; import org.bukkit.event.block.BlockPistonRetractEvent;
import org.bukkit.event.block.BlockPlaceEvent; import org.bukkit.event.block.BlockPlaceEvent;
import org.bukkit.event.block.BlockSpreadEvent; import org.bukkit.event.block.BlockSpreadEvent;
import org.bukkit.event.inventory.InventoryCloseEvent;
import org.bukkit.event.inventory.InventoryType;
import org.bukkit.event.player.PlayerBucketEmptyEvent; import org.bukkit.event.player.PlayerBucketEmptyEvent;
import org.bukkit.event.world.StructureGrowEvent; import org.bukkit.event.world.StructureGrowEvent;
@ -26,9 +29,11 @@ import de.epiceric.shopchest.utils.ShopUtils;
public class ShopItemListener implements Listener { public class ShopItemListener implements Listener {
private ShopUtils shopUtils; private ShopUtils shopUtils;
private final ShopChest plugin;
public ShopItemListener(ShopChest plugin) { public ShopItemListener(ShopChest plugin) {
this.shopUtils = plugin.getShopUtils(); this.shopUtils = plugin.getShopUtils();
this.plugin = plugin;
} }
@EventHandler(priority = EventPriority.HIGH) @EventHandler(priority = EventPriority.HIGH)
@ -60,6 +65,29 @@ public class ShopItemListener implements Listener {
} }
} }
@EventHandler(priority = EventPriority.HIGH)
public void onShulkerClose(InventoryCloseEvent e) {
if (e.getInventory().getType() != InventoryType.SHULKER_BOX) {
return;
}
Block block = e.getPlayer().getTargetBlockExact(7);
if (block == null || !(block.getState() instanceof ShulkerBox)) {
return;
}
if (!shopUtils.isShop(block.getLocation())) {
return;
}
Shop shop = shopUtils.getShop(block.getLocation());
Bukkit.getScheduler().runTaskLaterAsynchronously(plugin, () -> {
Bukkit.getOnlinePlayers().forEach(player -> shop.getItem().resetForPlayer(player));
}, 15);
}
@EventHandler(priority = EventPriority.HIGH) @EventHandler(priority = EventPriority.HIGH)
public void onPistonExtend(BlockPistonExtendEvent e) { public void onPistonExtend(BlockPistonExtendEvent e) {
// If the piston would only move itself // If the piston would only move itself

11
plugin/src/main/java/de/epiceric/shopchest/listeners/ShopUpdateListener.java
View File

@ -5,8 +5,7 @@ import java.util.Set;
import org.bukkit.Chunk; import org.bukkit.Chunk;
import org.bukkit.Location; import org.bukkit.Location;
import org.bukkit.block.Chest; import org.bukkit.block.*;
import org.bukkit.block.DoubleChest;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler; import org.bukkit.event.EventHandler;
import org.bukkit.event.EventPriority; import org.bukkit.event.EventPriority;
@ -37,12 +36,12 @@ public class ShopUpdateListener implements Listener {
Location loc = null; Location loc = null;
if (e.getSource().getHolder() instanceof Chest) { if (e.getSource().getHolder() instanceof Chest || e.getSource().getHolder() instanceof ShulkerBox || e.getSource().getHolder() instanceof Barrel) {
loc = ((Chest) e.getSource().getHolder()).getLocation(); loc = ((BlockState) e.getSource().getHolder()).getLocation();
} else if (e.getSource().getHolder() instanceof DoubleChest) { } else if (e.getSource().getHolder() instanceof DoubleChest) {
loc = ((DoubleChest) e.getSource().getHolder()).getLocation(); loc = ((DoubleChest) e.getSource().getHolder()).getLocation();
} else if (e.getDestination().getHolder() instanceof Chest) { } else if (e.getDestination().getHolder() instanceof Chest || e.getDestination().getHolder() instanceof ShulkerBox || e.getDestination().getHolder() instanceof Barrel) {
loc = ((Chest) e.getDestination().getHolder()).getLocation(); loc = ((BlockState) e.getDestination().getHolder()).getLocation();
} else if (e.getDestination().getHolder() instanceof DoubleChest) { } else if (e.getDestination().getHolder() instanceof DoubleChest) {
loc = ((DoubleChest) e.getDestination().getHolder()).getLocation(); loc = ((DoubleChest) e.getDestination().getHolder()).getLocation();
} }

10
plugin/src/main/java/de/epiceric/shopchest/listeners/WorldGuardListener.java
View File

@ -2,10 +2,10 @@ package de.epiceric.shopchest.listeners;
import java.util.Optional; import java.util.Optional;
import de.epiceric.shopchest.utils.ShopUtils;
import org.bukkit.Location; import org.bukkit.Location;
import org.bukkit.Material; import org.bukkit.Material;
import org.bukkit.block.Block; import org.bukkit.block.*;
import org.bukkit.block.Chest;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.event.Event.Result; import org.bukkit.event.Event.Result;
import org.bukkit.event.EventHandler; import org.bukkit.event.EventHandler;
@ -69,7 +69,7 @@ public class WorldGuardListener implements Listener {
Block block = event.getBlocks().get(0); Block block = event.getBlocks().get(0);
Material type = block.getType(); Material type = block.getType();
if (type == Material.CHEST || type == Material.TRAPPED_CHEST) { if (ShopUtils.isShopMaterial(type)) {
if (isAllowed(player, block.getLocation())) { if (isAllowed(player, block.getLocation())) {
event.setResult(Result.ALLOW); event.setResult(Result.ALLOW);
} }
@ -77,8 +77,8 @@ public class WorldGuardListener implements Listener {
} else if (event.getOriginalEvent() instanceof InventoryOpenEvent) { } else if (event.getOriginalEvent() instanceof InventoryOpenEvent) {
InventoryOpenEvent orig = (InventoryOpenEvent) event.getOriginalEvent(); InventoryOpenEvent orig = (InventoryOpenEvent) event.getOriginalEvent();
if (orig.getInventory().getHolder() instanceof Chest) { if (orig.getInventory().getHolder() instanceof Chest || orig.getInventory().getHolder() instanceof ShulkerBox || orig.getInventory().getHolder() instanceof Barrel) {
if (isAllowed(player, ((Chest) orig.getInventory().getHolder()).getLocation())) { if (isAllowed(player, ((BlockState) orig.getInventory().getHolder()).getLocation())) {
event.setResult(Result.ALLOW); event.setResult(Result.ALLOW);
} }
} }

55
plugin/src/main/java/de/epiceric/shopchest/shop/Shop.java
View File

@ -5,16 +5,15 @@ import java.util.EnumMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import de.epiceric.shopchest.utils.ShopUtils;
import org.bukkit.Location; import org.bukkit.Location;
import org.bukkit.Material; import org.bukkit.Material;
import org.bukkit.OfflinePlayer; import org.bukkit.OfflinePlayer;
import org.bukkit.World; import org.bukkit.World;
import org.bukkit.block.Block; import org.bukkit.block.*;
import org.bukkit.block.BlockFace;
import org.bukkit.block.Chest;
import org.bukkit.block.DoubleChest;
import org.bukkit.block.data.Directional; import org.bukkit.block.data.Directional;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.inventory.BlockInventoryHolder;
import org.bukkit.inventory.Inventory; import org.bukkit.inventory.Inventory;
import org.bukkit.inventory.InventoryHolder; import org.bukkit.inventory.InventoryHolder;
import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.ItemStack;
@ -40,10 +39,10 @@ public class Shop {
private static class PreCreateResult { private static class PreCreateResult {
private final Inventory inventory; private final Inventory inventory;
private final Chest[] chests; private final BlockInventoryHolder[] chests;
private final BlockFace face; private final BlockFace face;
private PreCreateResult(Inventory inventory, Chest[] chests, BlockFace face) { private PreCreateResult(Inventory inventory, BlockInventoryHolder[] chests, BlockFace face) {
this.inventory = inventory; this.inventory = inventory;
this.chests = chests; this.chests = chests;
this.face = face; this.face = face;
@ -113,7 +112,7 @@ public class Shop {
plugin.debug("Creating shop (#" + id + ")"); plugin.debug("Creating shop (#" + id + ")");
Block b = location.getBlock(); Block b = location.getBlock();
if (b.getType() != Material.CHEST && b.getType() != Material.TRAPPED_CHEST) { if (!ShopUtils.isShopMaterial(b.getType())) {
ChestNotFoundException ex = new ChestNotFoundException(String.format("No Chest found in world '%s' at location: %d; %d; %d", ChestNotFoundException ex = new ChestNotFoundException(String.format("No Chest found in world '%s' at location: %d; %d; %d",
b.getWorld().getName(), b.getX(), b.getY(), b.getZ())); b.getWorld().getName(), b.getX(), b.getY(), b.getZ()));
plugin.getShopUtils().removeShop(this, Config.removeShopOnError); plugin.getShopUtils().removeShop(this, Config.removeShopOnError);
@ -176,7 +175,7 @@ public class Shop {
/** /**
* <p>Creates the floating item of the shop</p> * <p>Creates the floating item of the shop</p>
* <b>Call this after {@link #createHologram()}, because it depends on the hologram's location</b> * <b>Call this after {@link #createHologram(PreCreateResult)}, because it depends on the hologram's location</b>
*/ */
private void createItem() { private void createItem() {
plugin.debug("Creating item (#" + id + ")"); plugin.debug("Creating item (#" + id + ")");
@ -198,7 +197,7 @@ public class Shop {
if (ih == null) return null; if (ih == null) return null;
Chest[] chests = new Chest[2]; BlockInventoryHolder[] chests = new BlockInventoryHolder[2];
BlockFace face; BlockFace face;
if (ih instanceof DoubleChest) { if (ih instanceof DoubleChest) {
@ -209,13 +208,23 @@ public class Shop {
chests[0] = r; chests[0] = r;
chests[1] = l; chests[1] = l;
} else { } else {
chests[0] = (Chest) ih; chests[0] = (BlockInventoryHolder) ih;
} }
if (Utils.getMajorVersion() < 13) { if (Utils.getMajorVersion() < 13) {
face = ((org.bukkit.material.Directional) chests[0].getData()).getFacing(); if (chests[0] instanceof Chest) {
Chest chest = (Chest) chests[0];
face = ((org.bukkit.material.Directional) chest.getData()).getFacing();
} else { } else {
face = ((Directional) chests[0].getBlockData()).getFacing(); face = null;
}
} else {
if (chests[0] instanceof Chest) {
Chest chest = (Chest) chests[0];
face = ((Directional) chest.getBlockData()).getFacing();
} else {
face = null;
}
} }
return new PreCreateResult(ih.getInventory(), chests, face); return new PreCreateResult(ih.getInventory(), chests, face);
@ -328,7 +337,7 @@ public class Shop {
return lines.toArray(new String[0]); return lines.toArray(new String[0]);
} }
private Location getHologramLocation(Chest[] chests, BlockFace face) { private Location getHologramLocation(BlockInventoryHolder[] chests, BlockFace face) {
World w = location.getWorld(); World w = location.getWorld();
int x = location.getBlockX(); int x = location.getBlockX();
int y = location.getBlockY(); int y = location.getBlockY();
@ -341,21 +350,21 @@ public class Shop {
if (Config.hologramFixedBottom) deltaY = -0.85; if (Config.hologramFixedBottom) deltaY = -0.85;
if (chests[1] != null) { if (chests[1] != null) {
Chest c1 = Utils.getMajorVersion() >= 13 && (face == BlockFace.NORTH || face == BlockFace.EAST) ? chests[1] : chests[0]; BlockInventoryHolder c1 = Utils.getMajorVersion() >= 13 && (face == BlockFace.NORTH || face == BlockFace.EAST) ? chests[1] : chests[0];
Chest c2 = Utils.getMajorVersion() >= 13 && (face == BlockFace.NORTH || face == BlockFace.EAST) ? chests[0] : chests[1]; BlockInventoryHolder c2 = Utils.getMajorVersion() >= 13 && (face == BlockFace.NORTH || face == BlockFace.EAST) ? chests[0] : chests[1];
if (holoLocation.equals(c1.getLocation())) { if (holoLocation.equals(c1.getBlock().getLocation())) {
if (c1.getX() != c2.getX()) { if (c1.getBlock().getX() != c2.getBlock().getX()) {
holoLocation.add(0, deltaY, 0.5); holoLocation.add(0, deltaY, 0.5);
} else if (c1.getZ() != c2.getZ()) { } else if (c1.getBlock().getZ() != c2.getBlock().getZ()) {
holoLocation.add(0.5, deltaY, 0); holoLocation.add(0.5, deltaY, 0);
} else { } else {
holoLocation.add(0.5, deltaY, 0.5); holoLocation.add(0.5, deltaY, 0.5);
} }
} else { } else {
if (c1.getX() != c2.getX()) { if (c1.getBlock().getX() != c2.getBlock().getX()) {
holoLocation.add(1, deltaY, 0.5); holoLocation.add(1, deltaY, 0.5);
} else if (c1.getZ() != c2.getZ()) { } else if (c1.getBlock().getZ() != c2.getBlock().getZ()) {
holoLocation.add(0.5, deltaY, 1); holoLocation.add(0.5, deltaY, 1);
} else { } else {
holoLocation.add(0.5, deltaY, 0.5); holoLocation.add(0.5, deltaY, 0.5);
@ -472,9 +481,9 @@ public class Shop {
public InventoryHolder getInventoryHolder() { public InventoryHolder getInventoryHolder() {
Block b = getLocation().getBlock(); Block b = getLocation().getBlock();
if (b.getType() == Material.CHEST || b.getType() == Material.TRAPPED_CHEST) { if (ShopUtils.isShopMaterial(b.getType())) {
Chest chest = (Chest) b.getState(); Container container = (Container) b.getState();
return chest.getInventory().getHolder(); return container.getInventory().getHolder();
} }
return null; return null;

4
plugin/src/main/java/de/epiceric/shopchest/sql/MySQL.java
View File

@ -21,7 +21,9 @@ public class MySQL extends Database {
@Override @Override
HikariDataSource getDataSource() { HikariDataSource getDataSource() {
HikariConfig config = new HikariConfig(); HikariConfig config = new HikariConfig();
config.setJdbcUrl(String.format("jdbc:mysql://%s:%d/%s?autoReconnect=true&useSSL=false&serverTimezone=UTC", // TODO Inspect this
// Why mariadb instead of my sql dani ?
config.setJdbcUrl(String.format("jdbc:mariadb://%s:%d/%s",
Config.databaseMySqlHost, Config.databaseMySqlPort, Config.databaseMySqlDatabase)); Config.databaseMySqlHost, Config.databaseMySqlPort, Config.databaseMySqlDatabase));
config.setUsername(Config.databaseMySqlUsername); config.setUsername(Config.databaseMySqlUsername);
config.setPassword(Config.databaseMySqlPassword); config.setPassword(Config.databaseMySqlPassword);

34
plugin/src/main/java/de/epiceric/shopchest/utils/ShopUtils.java
View File

@ -11,10 +11,7 @@ import java.util.UUID;
import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentHashMap;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import org.bukkit.Bukkit; import org.bukkit.*;
import org.bukkit.Chunk;
import org.bukkit.Location;
import org.bukkit.OfflinePlayer;
import org.bukkit.block.Chest; import org.bukkit.block.Chest;
import org.bukkit.block.DoubleChest; import org.bukkit.block.DoubleChest;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
@ -107,7 +104,7 @@ public class ShopUtils {
shopLocation.put(r.getLocation(), shop); shopLocation.put(r.getLocation(), shop);
shopLocation.put(l.getLocation(), shop); shopLocation.put(l.getLocation(), shop);
} else { } else {
plugin.debug("Added shop as single chest. (#" + shop.getID() + ")"); plugin.debug("Added shop as single container. (#" + shop.getID() + ")");
shopLocation.put(shop.getLocation(), shop); shopLocation.put(shop.getLocation(), shop);
} }
@ -320,6 +317,33 @@ public class ShopUtils {
}); });
} }
/*
* Tells if the material given is a shop material
* @param material The material to test
*/
public static boolean isShopMaterial(Material material) {
return material.equals(Material.CHEST) ||
material.equals(Material.TRAPPED_CHEST) ||
material.equals(Material.BARREL) ||
material.equals(Material.SHULKER_BOX) ||
material.equals(Material.BLACK_SHULKER_BOX) ||
material.equals(Material.BLUE_SHULKER_BOX) ||
material.equals(Material.BROWN_SHULKER_BOX) ||
material.equals(Material.CYAN_SHULKER_BOX) ||
material.equals(Material.GRAY_SHULKER_BOX) ||
material.equals(Material.GREEN_SHULKER_BOX) ||
material.equals(Material.LIGHT_BLUE_SHULKER_BOX) ||
material.equals(Material.LIGHT_GRAY_SHULKER_BOX) ||
material.equals(Material.LIME_SHULKER_BOX) ||
material.equals(Material.MAGENTA_SHULKER_BOX) ||
material.equals(Material.ORANGE_SHULKER_BOX) ||
material.equals(Material.PINK_SHULKER_BOX) ||
material.equals(Material.PURPLE_SHULKER_BOX) ||
material.equals(Material.RED_SHULKER_BOX) ||
material.equals(Material.WHITE_SHULKER_BOX) ||
material.equals(Material.YELLOW_SHULKER_BOX);
}
/** /**
* Loads the amount of shops for each player * Loads the amount of shops for each player
* @param callback Callback that returns the amount of shops for each player * @param callback Callback that returns the amount of shops for each player

37
plugin/src/main/java/de/epiceric/shopchest/utils/UpdateChecker.java
View File

@ -1,15 +1,14 @@
package de.epiceric.shopchest.utils; package de.epiceric.shopchest.utils;
import java.io.InputStreamReader;
import java.net.URL;
import java.net.URLConnection;
import com.google.gson.JsonElement; import com.google.gson.JsonElement;
import com.google.gson.JsonObject; import com.google.gson.JsonObject;
import com.google.gson.JsonParser; import com.google.gson.JsonParser;
import de.epiceric.shopchest.ShopChest; import de.epiceric.shopchest.ShopChest;
import java.io.InputStreamReader;
import java.net.URL;
import java.net.URLConnection;
public class UpdateChecker { public class UpdateChecker {
private ShopChest plugin; private ShopChest plugin;
@ -36,7 +35,7 @@ public class UpdateChecker {
conn.setRequestProperty("User-Agent", "ShopChest/UpdateChecker"); conn.setRequestProperty("User-Agent", "ShopChest/UpdateChecker");
InputStreamReader reader = new InputStreamReader(conn.getInputStream()); InputStreamReader reader = new InputStreamReader(conn.getInputStream());
JsonElement element = new JsonParser().parse(reader); JsonElement element = JsonParser.parseReader(reader);
if (element.isJsonArray()) { if (element.isJsonArray()) {
JsonObject result = element.getAsJsonArray().get(0).getAsJsonObject(); JsonObject result = element.getAsJsonArray().get(0).getAsJsonObject();
@ -45,11 +44,11 @@ public class UpdateChecker {
link = "https://www.spigotmc.org/resources/shopchest.11431/download?version=" + id; link = "https://www.spigotmc.org/resources/shopchest.11431/download?version=" + id;
} else { } else {
plugin.debug("Failed to check for updates"); plugin.debug("Failed to check for updates");
plugin.debug("Result: " + element.toString()); plugin.debug("Result: " + element);
return UpdateCheckerResult.ERROR; return UpdateCheckerResult.ERROR;
} }
if (plugin.getDescription().getVersion().equals(version)) { if (compareVersion(version) == 1) {
plugin.debug("No update found"); plugin.debug("No update found");
return UpdateCheckerResult.FALSE; return UpdateCheckerResult.FALSE;
} else { } else {
@ -64,6 +63,28 @@ public class UpdateChecker {
} }
} }
private int compareVersion(String version) {
String[] t = plugin.getDescription().getVersion().split("\\-")[0].split("\\.");
String[] o = version.split("\\-")[0].split("\\.");
int[] t1 = new int[t.length];
int[] o1 = new int[o.length];
for (int i = 0; i < t.length; i++) {
t1[i] = Integer.parseInt(t[i]);
}
for (int i = 0; i < o.length; i++) {
o1[i] = Integer.parseInt(o[i]);
}
final int maxLength = Math.max(t1.length, o1.length);
for (int i = 0; i < maxLength; i++) {
final int left = i < t1.length ? t1[i] : 0;
final int right = i < o1.length ? o1[i] : 0;
if (left != right) {
return left < right ? -1 : 1;
}
}
return 0;
}
/** /**
* @return Latest Version or <b>null</b> if no update is available * @return Latest Version or <b>null</b> if no update is available
*/ */

56
plugin/src/main/java/de/epiceric/shopchest/utils/Utils.java
View File

@ -10,16 +10,21 @@ import de.epiceric.shopchest.shop.Shop;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.Location; import org.bukkit.Location;
import org.bukkit.Material; import org.bukkit.Material;
import org.bukkit.block.Beehive;
import org.bukkit.block.Chest; import org.bukkit.block.Chest;
import org.bukkit.block.DoubleChest; import org.bukkit.block.DoubleChest;
import org.bukkit.block.ShulkerBox;
import org.bukkit.configuration.InvalidConfigurationException; import org.bukkit.configuration.InvalidConfigurationException;
import org.bukkit.configuration.file.YamlConfiguration; import org.bukkit.configuration.file.YamlConfiguration;
import org.bukkit.enchantments.Enchantment;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.inventory.Inventory; import org.bukkit.inventory.Inventory;
import org.bukkit.inventory.InventoryHolder; import org.bukkit.inventory.InventoryHolder;
import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.ItemStack;
import org.bukkit.inventory.PlayerInventory; import org.bukkit.inventory.PlayerInventory;
import org.bukkit.inventory.meta.BlockStateMeta;
import org.bukkit.inventory.meta.BookMeta; import org.bukkit.inventory.meta.BookMeta;
import org.bukkit.inventory.meta.EnchantmentStorageMeta;
import org.bukkit.inventory.meta.ItemMeta; import org.bukkit.inventory.meta.ItemMeta;
import java.nio.charset.StandardCharsets; import java.nio.charset.StandardCharsets;
@ -43,10 +48,7 @@ public class Utils {
ItemMeta itemMeta1 = itemStack1.getItemMeta(); ItemMeta itemMeta1 = itemStack1.getItemMeta();
ItemMeta itemMeta2 = itemStack2.getItemMeta(); ItemMeta itemMeta2 = itemStack2.getItemMeta();
if (itemMeta1 instanceof BookMeta && itemMeta2 instanceof BookMeta) { if (itemMeta1 instanceof BookMeta bookMeta1 && itemMeta2 instanceof BookMeta bookMeta2) {
BookMeta bookMeta1 = (BookMeta) itemStack1.getItemMeta();
BookMeta bookMeta2 = (BookMeta) itemStack2.getItemMeta();
if ((getMajorVersion() == 9 && getRevision() == 1) || getMajorVersion() == 8) { if ((getMajorVersion() == 9 && getRevision() == 1) || getMajorVersion() == 8) {
CustomBookMeta.Generation generation1 = CustomBookMeta.getGeneration(itemStack1); CustomBookMeta.Generation generation1 = CustomBookMeta.getGeneration(itemStack1);
CustomBookMeta.Generation generation2 = CustomBookMeta.getGeneration(itemStack2); CustomBookMeta.Generation generation2 = CustomBookMeta.getGeneration(itemStack2);
@ -65,6 +67,50 @@ public class Utils {
itemStack2 = decode(encode(itemStack2)); itemStack2 = decode(encode(itemStack2));
} }
if (itemMeta1 instanceof BlockStateMeta && itemMeta2 instanceof BlockStateMeta) {
BlockStateMeta blockMeta1 = (BlockStateMeta)itemMeta1;
BlockStateMeta blockMeta2 = (BlockStateMeta)itemMeta2;
if (blockMeta1.getBlockState() instanceof ShulkerBox box1 && blockMeta2.getBlockState() instanceof ShulkerBox box2) {
if (!box1.getInventory().isEmpty() && !box2.getInventory().isEmpty()) {
return false;
}
}
}
if (itemMeta1 instanceof EnchantmentStorageMeta book1 && itemMeta2 instanceof EnchantmentStorageMeta book2) {
if (book1.hasStoredEnchants() != book2.hasStoredEnchants()) {
return false;
}
for (Map.Entry<Enchantment, Integer> enchantment: book1.getStoredEnchants().entrySet()) {
if (!book2.hasStoredEnchant(enchantment.getKey())) {
return false;
}
if (book2.getStoredEnchantLevel(enchantment.getKey()) != enchantment.getValue()) {
return false;
}
}
//Cross-check for set equivalence
for (Map.Entry<Enchantment, Integer> enchantment: book2.getStoredEnchants().entrySet()) {
if (!book1.hasStoredEnchant(enchantment.getKey())) {
return false;
}
if (book1.getStoredEnchantLevel(enchantment.getKey()) != enchantment.getValue()) {
return false;
}
}
return true;
}
if (itemMeta1 instanceof Beehive b1 && itemMeta2 instanceof Beehive b2) {
return b1.getEntityCount() == b2.getEntityCount();
}
return itemStack1.isSimilar(itemStack2); return itemStack1.isSimilar(itemStack2);
} }
@ -212,7 +258,7 @@ public class Utils {
if (Utils.getMajorVersion() < 13) if (Utils.getMajorVersion() < 13)
axes = Arrays.asList("WOOD_AXE", "STONE_AXE", "IRON_AXE", "GOLD_AXE", "DIAMOND_AXE"); axes = Arrays.asList("WOOD_AXE", "STONE_AXE", "IRON_AXE", "GOLD_AXE", "DIAMOND_AXE");
else else
axes = Arrays.asList("WOODEN_AXE", "STONE_AXE", "IRON_AXE", "GOLDEN_AXE", "DIAMOND_AXE"); axes = Arrays.asList("WOODEN_AXE", "STONE_AXE", "IRON_AXE", "GOLDEN_AXE", "DIAMOND_AXE", "NETHERITE_AXE");
ItemStack item = getItemInMainHand(p); ItemStack item = getItemInMainHand(p);
if (item == null || !axes.contains(item.getType().toString())) { if (item == null || !axes.contains(item.getType().toString())) {

5
plugin/src/main/resources/config.yml
View File

@ -147,6 +147,11 @@ shop-creation-price:
# ...an admin shop # ...an admin shop
admin: 0 admin: 0
shop-tax:
default: 0
enchanted_book: 30
# Shop limits are handled with permissions. # Shop limits are handled with permissions.
# A player with permission "shopchest.limit.X" has a limit of X shops, # A player with permission "shopchest.limit.X" has a limit of X shops,
# a player with permission "shopchest.limit.*" does not have a shop limit. # a player with permission "shopchest.limit.*" does not have a shop limit.

52
pom.xml
View File

@ -57,13 +57,20 @@
<project.build.outputEncoding>UTF-8</project.build.outputEncoding> <project.build.outputEncoding>UTF-8</project.build.outputEncoding>
<!-- JDK Version --> <!-- JDK Version -->
<maven.compiler.source>1.8</maven.compiler.source> <maven.compiler.source>17</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target> <maven.compiler.target>17</maven.compiler.target>
<!-- Default Spigot version for nms implementation. Must be overridden --> <!-- Default Spigot version for nms implementation. Must be overridden -->
<spigot.version>defaultVersion</spigot.version> <spigot.version>defaultVersion</spigot.version>
</properties> </properties>
<pluginRepositories>
<pluginRepository>
<id>maven-snapshots</id>
<url>https://repository.apache.org/content/repositories/snapshots/</url>
</pluginRepository>
</pluginRepositories>
<repositories> <repositories>
<!-- Spigot repo (Spigot API) --> <!-- Spigot repo (Spigot API) -->
<repository> <repository>
@ -120,7 +127,7 @@
<dependency> <dependency>
<groupId>com.plotsquared</groupId> <groupId>com.plotsquared</groupId>
<artifactId>PlotSquared-Core</artifactId> <artifactId>PlotSquared-Core</artifactId>
<version>6.5.0</version> <version>6.5.1</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>
@ -271,11 +278,6 @@
<artifactId>worldguardwrapper</artifactId> <artifactId>worldguardwrapper</artifactId>
<version>1.2.0-SNAPSHOT</version> <version>1.2.0-SNAPSHOT</version>
</dependency> </dependency>
<dependency>
<groupId>org.bstats</groupId>
<artifactId>bstats-bukkit</artifactId>
<version>2.2.1</version>
</dependency>
<dependency> <dependency>
<groupId>com.zaxxer</groupId> <groupId>com.zaxxer</groupId>
<artifactId>HikariCP</artifactId> <artifactId>HikariCP</artifactId>
@ -289,7 +291,7 @@
<dependency> <dependency>
<groupId>org.inventivetalent</groupId> <groupId>org.inventivetalent</groupId>
<artifactId>reflectionhelper</artifactId> <artifactId>reflectionhelper</artifactId>
<version>1.18.4-SNAPSHOT</version> <version>1.18.7-SNAPSHOT</version>
</dependency> </dependency>
<!-- Internal nms shaded dependencies --> <!-- Internal nms shaded dependencies -->
@ -332,7 +334,7 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId> <artifactId>maven-shade-plugin</artifactId>
<version>3.2.2</version> <version>3.3.1-SNAPSHOT</version>
<executions> <executions>
<execution> <execution>
<phase>package</phase> <phase>package</phase>
@ -344,10 +346,6 @@
<configuration> <configuration>
<createDependencyReducedPom>false</createDependencyReducedPom> <createDependencyReducedPom>false</createDependencyReducedPom>
<relocations> <relocations>
<relocation>
<pattern>org.bstats</pattern>
<shadedPattern>de.epiceric.shopchest.dependencies.bstats</shadedPattern>
</relocation>
<relocation> <relocation>
<pattern>org.codemc.worldguardwrapper</pattern> <pattern>org.codemc.worldguardwrapper</pattern>
<shadedPattern>de.epiceric.shopchest.dependencies.worldguardwrapper</shadedPattern> <shadedPattern>de.epiceric.shopchest.dependencies.worldguardwrapper</shadedPattern>
@ -364,6 +362,32 @@
<pattern>org.inventivetalent.reflection</pattern> <pattern>org.inventivetalent.reflection</pattern>
<shadedPattern>de.epiceric.shopchest.dependencies.reflectionhelper</shadedPattern> <shadedPattern>de.epiceric.shopchest.dependencies.reflectionhelper</shadedPattern>
</relocation> </relocation>
<!-- TODO Inspect this -->
<!-- Do we really need all of this ? -->
<relocation>
<pattern>com.google.common</pattern>
<shadedPattern>de.epiceric.shopchest.dependencies.google-common</shadedPattern>
</relocation>
<relocation>
<pattern>com.google.errorprone</pattern>
<shadedPattern>de.epiceric.shopchest.dependencies.google-errorprone</shadedPattern>
</relocation>
<relocation>
<pattern>com.google.gson</pattern>
<shadedPattern>de.epiceric.shopchest.dependencies.google-gson</shadedPattern>
</relocation>
<relocation>
<pattern>com.google.j2objc</pattern>
<shadedPattern>de.epiceric.shopchest.dependencies.google-j2objc</shadedPattern>
</relocation>
<relocation>
<pattern>com.google.thirdparty</pattern>
<shadedPattern>de.epiceric.shopchest.dependencies.google-thirdparty</shadedPattern>
</relocation>
<relocation>
<pattern>javax.annotation</pattern>
<shadedPattern>de.epiceric.shopchest.dependencies.javax-annotation</shadedPattern>
</relocation>
</relocations> </relocations>
<filters> <filters>
<filter> <filter>