Upstream/ShopChest
1
0
Fork 0
mirror of https://github.com/EpicEricEE/ShopChest.git synced 2024-06-29 16:14:44 +02:00
Code Issues Projects Releases Wiki Activity
bbd0046ed1
ShopChest/src/main/java/de/epiceric/shopchest/listeners/ShopInteractListener.java

1257 lines
68 KiB
Java
Raw Normal View History

Renamed Listeners and their package
2016-06-28 18:30:48 +02:00
package de.epiceric.shopchest.listeners;
First Commit
2015-09-02 13:06:48 +02:00
Added support for PlotSquared Three new custom flags will be available for every plot to set: - create-shop - use-shop - use-admin-shop These flags can be set to the following values to allow the flag to that group. If you set the group to members, trusted members and owners are also allowed the flag: - owners - trusted - members - everyone - none The default value for the flags will be 'none', so be sure to change it in order to create or use shops! The flag 'create-shop' can be bypassed by granting the permission 'shopchest.create.protected' (which is not recommended), and the other flags can be bypassed by granting the permission 'shopchest.external.bypass'. This closes #87
2017-03-28 14:37:12 +02:00
import com.intellectualcrafters.plot.flag.Flag;
import com.intellectualcrafters.plot.object.Plot;
Improved Towny integration Closes #95
2017-04-17 16:35:43 +02:00
import com.palmergames.bukkit.towny.object.Resident;
import com.palmergames.bukkit.towny.object.Town;
Added towny support - Players can only create shops in shop plots, not in wilderness or normal plots - Added permission "shopchest.extend.protected" - Changed permission "shopchest.extendOther" to "shopchest.extend.other" - When creating a shop on a double chest, both chests must not be protected/in a protected region - To extend a shop into a protected region (e.g. WorldGuard/Towny), you need permission (shopchest.extend.protected) - Added no-permission message for "shopchest.extend.protected"
2016-11-20 14:15:53 +01:00
import com.palmergames.bukkit.towny.object.TownBlock;
import com.palmergames.bukkit.towny.object.TownyUniverse;
Added WorldGuard support Might contain issues, as it's not tested extensively
2016-11-13 13:43:03 +01:00
import com.sk89q.worldguard.bukkit.RegionContainer;
import com.sk89q.worldguard.bukkit.RegionQuery;
import com.sk89q.worldguard.bukkit.WorldGuardPlugin;
import com.sk89q.worldguard.protection.flags.StateFlag;
Added support for ASkyBlock Only members and the owner of an island are allowed to create a shop, but everyone is allowed to use it (if not restricted by other plugins like WorldGuard) Closes #50
2017-04-17 17:07:47 +02:00
import com.wasteofplastic.askyblock.ASkyBlockAPI;
import com.wasteofplastic.askyblock.Island;
Automated code cleanup by IntelliJ IDEA As I Switched from Eclipse to IntelliJ IDEA, I also had to add a few entries to the .gitignore file.
2016-05-28 15:47:57 +02:00
import de.epiceric.shopchest.ShopChest;
Added way to auto calculate item amount You can find an explanation here: - https://www.spigotmc.org/threads/shopchest.87948/page-15#post-1820672 - In the configuration file
2016-08-16 15:06:26 +02:00
import de.epiceric.shopchest.config.Config;
You can now add scripts to the hologram format itself Use curly brackets to add a script to the format. Also, "regex" has been renamed to "placeholder".
2017-05-23 15:18:02 +02:00
import de.epiceric.shopchest.config.Placeholder;
Prevent shop use in creative mode Closes #100
2017-05-25 12:21:51 +02:00
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;
Added support for PlotSquared Three new custom flags will be available for every plot to set: - create-shop - use-shop - use-admin-shop These flags can be set to the following values to allow the flag to that group. If you set the group to members, trusted members and owners are also allowed the flag: - owners - trusted - members - everyone - none The default value for the flags will be 'none', so be sure to change it in order to create or use shops! The flag 'create-shop' can be bypassed by granting the permission 'shopchest.create.protected' (which is not recommended), and the other flags can be bypassed by granting the permission 'shopchest.external.bypass'. This closes #87
2017-03-28 14:37:12 +02:00
import de.epiceric.shopchest.external.PlotSquaredShopFlag;
import de.epiceric.shopchest.external.WorldGuardShopFlag;
Added configurable language for everything and more This can read the default minecraft language files, but in order to translate the messages, you need to add the message section from the en_US.lang. Also, spawn eggs will work now, the title of music discs will be displayed in the info sections and "tipped arrow effect" is now named "potion effect" and is displayed also if the product is a potion, splashed potion or a lingering potion (and of course tipped arrows). The message configuration is no longer found in the config.yml file, but has gone to the .lang file, so you need to reconfigure every message! As the Jsoup library is no longer needed, the filesize of the final jar shrunk quite a bit. Maybe there are some more changes, which I already forgot.
2016-06-22 20:51:19 +02:00
import de.epiceric.shopchest.language.LanguageUtils;
import de.epiceric.shopchest.language.LocalizedMessage;
Added book generation to shop info message
2017-04-16 18:31:50 +02:00
import de.epiceric.shopchest.nms.CustomBookMeta;
Add hologram interaction (configurable)
2016-11-18 17:32:52 +01:00
import de.epiceric.shopchest.nms.Hologram;
Automated code cleanup by IntelliJ IDEA As I Switched from Eclipse to IntelliJ IDEA, I also had to add a few entries to the .gitignore file.
2016-05-28 15:47:57 +02:00
import de.epiceric.shopchest.shop.Shop;
import de.epiceric.shopchest.shop.Shop.ShopType;
Shortened SQLite/Database class The method to get data of the database has changed completely so the uses also had to be changed. The IDE also did some code reformatting, but these are just very small changes.
2016-05-29 15:32:54 +02:00
import de.epiceric.shopchest.sql.Database;
Improved database interaction
2017-02-09 21:51:39 +01:00
import de.epiceric.shopchest.utils.ClickType;
Vastly extended hologram configuration - You can now completely customize every part of the hologram - Added new placeholders "%STOCK%" and "%MAX-STACK%" => Now uses "%STOCK%" instead of "%AMOUNT%" in the in-stock message) - Armor Stands are no longer spawned with NMS and reflection - Hologram texts can dynamically change (e.g. with in-stock info) - Might contain a few issues
2017-05-20 20:10:07 +02:00
import de.epiceric.shopchest.utils.ItemUtils;
Improved database interaction
2017-02-09 21:51:39 +01:00
import de.epiceric.shopchest.utils.Permissions;
import de.epiceric.shopchest.utils.ShopUtils;
import de.epiceric.shopchest.utils.Utils;
Added AuthMe support Closes #64
2017-03-17 14:36:24 +01:00
import fr.xephi.authme.AuthMe;
Improved support for GriefPrevention Now checks if the claim where the shop is located allows container access for the player. If there is no claim, shop creation is allowed (except it has been denied by other plugins)
2017-04-29 14:37:52 +02:00
import me.ryanhamshire.GriefPrevention.Claim;
Automated code cleanup by IntelliJ IDEA As I Switched from Eclipse to IntelliJ IDEA, I also had to add a few entries to the .gitignore file.
2016-05-28 15:47:57 +02:00
import net.milkbowl.vault.economy.Economy;
import net.milkbowl.vault.economy.EconomyResponse;
First Commit
2015-09-02 13:06:48 +02:00
import org.bukkit.Bukkit;
Prevent shop use in creative mode Closes #100
2017-05-25 12:21:51 +02:00
import org.bukkit.GameMode;
First Commit
2015-09-02 13:06:48 +02:00
import org.bukkit.Location;
import org.bukkit.Material;
import org.bukkit.block.Block;
Prevent blocks from being placed or pushed above the chest Fixes #6
2016-07-01 16:13:44 +02:00
import org.bukkit.block.BlockFace;
First Commit
2015-09-02 13:06:48 +02:00
import org.bukkit.block.Chest;
Added towny support - Players can only create shops in shop plots, not in wilderness or normal plots - Added permission "shopchest.extend.protected" - Changed permission "shopchest.extendOther" to "shopchest.extend.other" - When creating a shop on a double chest, both chests must not be protected/in a protected region - To extend a shop into a protected region (e.g. WorldGuard/Towny), you need permission (shopchest.extend.protected) - Added no-permission message for "shopchest.extend.protected"
2016-11-20 14:15:53 +01:00
import org.bukkit.block.DoubleChest;
First Commit
2015-09-02 13:06:48 +02:00
import org.bukkit.enchantments.Enchantment;
Add hologram interaction (configurable)
2016-11-18 17:32:52 +01:00
import org.bukkit.entity.ArmorStand;
import org.bukkit.entity.Entity;
First Commit
2015-09-02 13:06:48 +02:00
import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler;
Changed way of checking if chests are protected If another plugin cancelled the PlayerInteractEvent before ShopChest, the player is not permitted to create a shop on the clicked chest. The dependency of 'Lockette' is no longer needed. It might occur that a plugin, which is not used for protections, cancels the PlayerInteractEvent so a shop cannot be created. This closes #14
2016-08-04 21:12:19 +02:00
import org.bukkit.event.EventPriority;
First Commit
2015-09-02 13:06:48 +02:00
import org.bukkit.event.Listener;
import org.bukkit.event.block.Action;
Add hologram interaction (configurable)
2016-11-18 17:32:52 +01:00
import org.bukkit.event.entity.EntityDamageByEntityEvent;
Vastly extended hologram configuration - You can now completely customize every part of the hologram - Added new placeholders "%STOCK%" and "%MAX-STACK%" => Now uses "%STOCK%" instead of "%AMOUNT%" in the in-stock message) - Armor Stands are no longer spawned with NMS and reflection - Hologram texts can dynamically change (e.g. with in-stock info) - Might contain a few issues
2017-05-20 20:10:07 +02:00
import org.bukkit.event.inventory.InventoryClickEvent;
Prevent armor items from being taken by the hologram
2017-03-17 15:01:11 +01:00
import org.bukkit.event.player.PlayerArmorStandManipulateEvent;
Add hologram interaction (configurable)
2016-11-18 17:32:52 +01:00
import org.bukkit.event.player.PlayerInteractAtEntityEvent;
First Commit
2015-09-02 13:06:48 +02:00
import org.bukkit.event.player.PlayerInteractEvent;
Prevent shop use in creative mode Closes #100
2017-05-25 12:21:51 +02:00
import org.bukkit.inventory.EquipmentSlot;
import org.bukkit.inventory.Inventory;
import org.bukkit.inventory.InventoryHolder;
import org.bukkit.inventory.ItemStack;
import org.bukkit.inventory.PlayerInventory;
Added book generation to shop info message
2017-04-16 18:31:50 +02:00
import org.bukkit.inventory.meta.BookMeta;
Vastly extended hologram configuration - You can now completely customize every part of the hologram - Added new placeholders "%STOCK%" and "%MAX-STACK%" => Now uses "%STOCK%" instead of "%AMOUNT%" in the in-stock message) - Armor Stands are no longer spawned with NMS and reflection - Hologram texts can dynamically change (e.g. with in-stock info) - Might contain a few issues
2017-05-20 20:10:07 +02:00
import org.bukkit.scheduler.BukkitRunnable;
Added support for IslandWorld Only players who can build on the island (owner and members) are allowed to create a shop, but anyone can use it (if not limited by other plugins like WorldGuard)
2017-04-17 18:24:51 +02:00
import pl.islandworld.api.IslandWorldApi;
Added support for uSkyBlock Only the leader pr members of an island can create or expand a shop, but everyone can use them.
2017-04-10 17:25:48 +02:00
import us.talabrek.ultimateskyblock.api.IslandInfo;
Added LWC and Lockette Support
2015-09-04 12:31:19 +02:00
Automated code cleanup by IntelliJ IDEA As I Switched from Eclipse to IntelliJ IDEA, I also had to add a few entries to the .gitignore file.
2016-05-28 15:47:57 +02:00
import java.util.HashMap;
import java.util.Map;
First Commit
2015-09-02 13:06:48 +02:00
Renamed Listeners and their package
2016-06-28 18:30:48 +02:00
public class ShopInteractListener implements Listener {
Automated code cleanup by IntelliJ IDEA As I Switched from Eclipse to IntelliJ IDEA, I also had to add a few entries to the .gitignore file.
2016-05-28 15:47:57 +02:00
private ShopChest plugin;
Added configurable language for everything and more This can read the default minecraft language files, but in order to translate the messages, you need to add the message section from the en_US.lang. Also, spawn eggs will work now, the title of music discs will be displayed in the info sections and "tipped arrow effect" is now named "potion effect" and is displayed also if the product is a potion, splashed potion or a lingering potion (and of course tipped arrows). The message configuration is no longer found in the config.yml file, but has gone to the .lang file, so you need to reconfigure every message! As the Jsoup library is no longer needed, the filesize of the final jar shrunk quite a bit. Maybe there are some more changes, which I already forgot.
2016-06-22 20:51:19 +02:00
private Economy econ;
private Database database;
ShopUtils no longer contains static methods
2016-07-13 15:03:54 +02:00
private ShopUtils shopUtils;
Added way to auto calculate item amount You can find an explanation here: - https://www.spigotmc.org/threads/shopchest.87948/page-15#post-1820672 - In the configuration file
2016-08-16 15:06:26 +02:00
private Config config;
Added WorldGuard support Might contain issues, as it's not tested extensively
2016-11-13 13:43:03 +01:00
private WorldGuardPlugin worldGuard;
Automated code cleanup by IntelliJ IDEA As I Switched from Eclipse to IntelliJ IDEA, I also had to add a few entries to the .gitignore file.
2016-05-28 15:47:57 +02:00
Renamed Listeners and their package
2016-06-28 18:30:48 +02:00
public ShopInteractListener(ShopChest plugin) {
Automated code cleanup by IntelliJ IDEA As I Switched from Eclipse to IntelliJ IDEA, I also had to add a few entries to the .gitignore file.
2016-05-28 15:47:57 +02:00
this.plugin = plugin;
Added configurable language for everything and more This can read the default minecraft language files, but in order to translate the messages, you need to add the message section from the en_US.lang. Also, spawn eggs will work now, the title of music discs will be displayed in the info sections and "tipped arrow effect" is now named "potion effect" and is displayed also if the product is a potion, splashed potion or a lingering potion (and of course tipped arrows). The message configuration is no longer found in the config.yml file, but has gone to the .lang file, so you need to reconfigure every message! As the Jsoup library is no longer needed, the filesize of the final jar shrunk quite a bit. Maybe there are some more changes, which I already forgot.
2016-06-22 20:51:19 +02:00
this.econ = plugin.getEconomy();
this.database = plugin.getShopDatabase();
ShopUtils no longer contains static methods
2016-07-13 15:03:54 +02:00
this.shopUtils = plugin.getShopUtils();
Added way to auto calculate item amount You can find an explanation here: - https://www.spigotmc.org/threads/shopchest.87948/page-15#post-1820672 - In the configuration file
2016-08-16 15:06:26 +02:00
this.config = plugin.getShopChestConfig();
Added WorldGuard support Might contain issues, as it's not tested extensively
2016-11-13 13:43:03 +01:00
this.worldGuard = plugin.getWorldGuard();
Automated code cleanup by IntelliJ IDEA As I Switched from Eclipse to IntelliJ IDEA, I also had to add a few entries to the .gitignore file.
2016-05-28 15:47:57 +02:00
}
Vastly extended hologram configuration - You can now completely customize every part of the hologram - Added new placeholders "%STOCK%" and "%MAX-STACK%" => Now uses "%STOCK%" instead of "%AMOUNT%" in the in-stock message) - Armor Stands are no longer spawned with NMS and reflection - Hologram texts can dynamically change (e.g. with in-stock info) - Might contain a few issues
2017-05-20 20:10:07 +02:00
@EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
public void onInventoryClick(InventoryClickEvent e) {
if (!plugin.getHologramFormat().isDynamic()) return;
Inventory chestInv = e.getInventory();
if (!(e.getInventory().getHolder() instanceof Chest || e.getInventory().getHolder() instanceof DoubleChest)) {
return;
}
Location loc = chestInv.getLocation();
final Shop shop = plugin.getShopUtils().getShop(loc);
if (shop == null) return;
new BukkitRunnable() {
@Override
public void run() {
shop.updateHologramText();
}
}.runTaskLater(plugin, 1L);
}
Prevent armor items from being taken by the hologram
2017-03-17 15:01:11 +01:00
@EventHandler(ignoreCancelled = true)
public void onPlayerManipulateArmorStand(PlayerArmorStandManipulateEvent e) {
// When clicking an armor stand with an armor item, the armor stand will take it.
// As a hologram consists of armor stands, they would also take the item.
ArmorStand armorStand = e.getRightClicked();
if (Hologram.isPartOfHologram(armorStand)) {
e.setCancelled(true);
}
}
Changed way of checking if chests are protected If another plugin cancelled the PlayerInteractEvent before ShopChest, the player is not permitted to create a shop on the clicked chest. The dependency of 'Lockette' is no longer needed. It might occur that a plugin, which is not used for protections, cancels the PlayerInteractEvent so a shop cannot be created. This closes #14
2016-08-04 21:12:19 +02:00
@EventHandler(priority = EventPriority.HIGH)
public void onPlayerInteractCreate(PlayerInteractEvent e) {
Player p = e.getPlayer();
Block b = e.getClickedBlock();
Added AuthMe support Closes #64
2017-03-17 14:36:24 +01:00
if (config.enable_authme_integration && plugin.hasAuthMe() && !AuthMe.getApi().isAuthenticated(p)) return;
Fixed NPE when player clicks in air
2016-08-06 13:32:37 +02:00
if (e.getAction() == Action.RIGHT_CLICK_BLOCK) {
if (b.getType().equals(Material.CHEST) || b.getType().equals(Material.TRAPPED_CHEST)) {
if (e.getAction() == Action.RIGHT_CLICK_BLOCK) {
if (ClickType.getPlayerClickType(p) != null) {
if (ClickType.getPlayerClickType(p).getClickType() == ClickType.EnumClickType.CREATE) {
if (!shopUtils.isShop(b.getLocation())) {
Added WorldGuard support Might contain issues, as it's not tested extensively
2016-11-13 13:43:03 +01:00
Added towny support - Players can only create shops in shop plots, not in wilderness or normal plots - Added permission "shopchest.extend.protected" - Changed permission "shopchest.extendOther" to "shopchest.extend.other" - When creating a shop on a double chest, both chests must not be protected/in a protected region - To extend a shop into a protected region (e.g. WorldGuard/Towny), you need permission (shopchest.extend.protected) - Added no-permission message for "shopchest.extend.protected"
2016-11-20 14:15:53 +01:00
boolean externalPluginsAllowed = true;
Location[] chestLocations = {b.getLocation(), null};
InventoryHolder ih = ((Chest) b.getState()).getInventory().getHolder();
if (ih instanceof DoubleChest) {
DoubleChest dc = (DoubleChest) ih;
chestLocations[0] = ((Chest) dc.getLeftSide()).getLocation();
chestLocations[1] = ((Chest) dc.getRightSide()).getLocation();
}
Added WorldGuard support Might contain issues, as it's not tested extensively
2016-11-13 13:43:03 +01:00
Added debug messages for shop creation (external plugins)
2017-04-19 14:04:57 +02:00
String denyReason = "Event Cancelled";
Added way to disable WorldGuard/Towny integration + Added permission to use shops in WorldGuard regions that deny shop use
2016-11-23 16:05:33 +01:00
if (plugin.hasWorldGuard() && config.enable_worldguard_integration) {
Added debug messages for shop creation (external plugins)
2017-04-19 14:04:57 +02:00
plugin.debug("Checking if WorldGuard allows shop creation...");
Added WorldGuard support Might contain issues, as it's not tested extensively
2016-11-13 13:43:03 +01:00
RegionContainer container = worldGuard.getRegionContainer();
RegionQuery query = container.createQuery();
Added towny support - Players can only create shops in shop plots, not in wilderness or normal plots - Added permission "shopchest.extend.protected" - Changed permission "shopchest.extendOther" to "shopchest.extend.other" - When creating a shop on a double chest, both chests must not be protected/in a protected region - To extend a shop into a protected region (e.g. WorldGuard/Towny), you need permission (shopchest.extend.protected) - Added no-permission message for "shopchest.extend.protected"
2016-11-20 14:15:53 +01:00
for (Location loc : chestLocations) {
if (loc != null) {
Added support for PlotSquared Three new custom flags will be available for every plot to set: - create-shop - use-shop - use-admin-shop These flags can be set to the following values to allow the flag to that group. If you set the group to members, trusted members and owners are also allowed the flag: - owners - trusted - members - everyone - none The default value for the flags will be 'none', so be sure to change it in order to create or use shops! The flag 'create-shop' can be bypassed by granting the permission 'shopchest.create.protected' (which is not recommended), and the other flags can be bypassed by granting the permission 'shopchest.external.bypass'. This closes #87
2017-03-28 14:37:12 +02:00
externalPluginsAllowed &= query.testState(loc, p, WorldGuardShopFlag.CREATE_SHOP);
Added towny support - Players can only create shops in shop plots, not in wilderness or normal plots - Added permission "shopchest.extend.protected" - Changed permission "shopchest.extendOther" to "shopchest.extend.other" - When creating a shop on a double chest, both chests must not be protected/in a protected region - To extend a shop into a protected region (e.g. WorldGuard/Towny), you need permission (shopchest.extend.protected) - Added no-permission message for "shopchest.extend.protected"
2016-11-20 14:15:53 +01:00
}
}
Added debug messages for shop creation (external plugins)
2017-04-19 14:04:57 +02:00
if (!externalPluginsAllowed) denyReason = "WorldGuard";
Added towny support - Players can only create shops in shop plots, not in wilderness or normal plots - Added permission "shopchest.extend.protected" - Changed permission "shopchest.extendOther" to "shopchest.extend.other" - When creating a shop on a double chest, both chests must not be protected/in a protected region - To extend a shop into a protected region (e.g. WorldGuard/Towny), you need permission (shopchest.extend.protected) - Added no-permission message for "shopchest.extend.protected"
2016-11-20 14:15:53 +01:00
}
Added debug messages for shop creation (external plugins)
2017-04-19 14:04:57 +02:00
if (externalPluginsAllowed && plugin.hasTowny() && config.enable_towny_integration) {
plugin.debug("Checking if Towny allows shop creation...");
Added towny support - Players can only create shops in shop plots, not in wilderness or normal plots - Added permission "shopchest.extend.protected" - Changed permission "shopchest.extendOther" to "shopchest.extend.other" - When creating a shop on a double chest, both chests must not be protected/in a protected region - To extend a shop into a protected region (e.g. WorldGuard/Towny), you need permission (shopchest.extend.protected) - Added no-permission message for "shopchest.extend.protected"
2016-11-20 14:15:53 +01:00
for (Location loc : chestLocations) {
if (loc != null) {
TownBlock townBlock = TownyUniverse.getTownBlock(loc);
Improved Towny integration Closes #95
2017-04-17 16:35:43 +02:00
if (townBlock != null) {
Added debug messages for shop creation (external plugins)
2017-04-19 14:04:57 +02:00
plugin.debug("Plot Type is " + townBlock.getType().name());
Improved Towny integration Closes #95
2017-04-17 16:35:43 +02:00
try {
Town town = townBlock.getTown();
Added debug messages for shop creation (external plugins)
2017-04-19 14:04:57 +02:00
boolean residentFound = false;
Improved Towny integration Closes #95
2017-04-17 16:35:43 +02:00
for (Resident resident : town.getResidents()) {
if (resident.getName().equals(p.getName())) {
Added debug messages for shop creation (external plugins)
2017-04-19 14:04:57 +02:00
residentFound = true;
Improved Towny integration Closes #95
2017-04-17 16:35:43 +02:00
if (resident.isMayor()) {
Added debug messages for shop creation (external plugins)
2017-04-19 14:04:57 +02:00
plugin.debug(p.getName() + " is mayor of town");
Improved Towny integration Closes #95
2017-04-17 16:35:43 +02:00
externalPluginsAllowed &= (config.towny_shop_plots_mayor.contains(townBlock.getType().name()));
} else if (resident.isKing()) {
Added debug messages for shop creation (external plugins)
2017-04-19 14:04:57 +02:00
plugin.debug(p.getName() + " is king of town");
Improved Towny integration Closes #95
2017-04-17 16:35:43 +02:00
externalPluginsAllowed &= (config.towny_shop_plots_king.contains(townBlock.getType().name()));
} else {
Added debug messages for shop creation (external plugins)
2017-04-19 14:04:57 +02:00
plugin.debug(p.getName() + " is resident in town");
Improved Towny integration Closes #95
2017-04-17 16:35:43 +02:00
externalPluginsAllowed &= (config.towny_shop_plots_residents.contains(townBlock.getType().name()));
}
Fixed refund if economy transactions fail
2017-06-08 11:31:23 +02:00
break;
Improved Towny integration Closes #95
2017-04-17 16:35:43 +02:00
}
}
Added debug messages for shop creation (external plugins)
2017-04-19 14:04:57 +02:00
if (!residentFound) {
plugin.debug(p.getName() + " is not resident in town");
Fixed refund if economy transactions fail
2017-06-08 11:31:23 +02:00
externalPluginsAllowed = false;
Added debug messages for shop creation (external plugins)
2017-04-19 14:04:57 +02:00
}
Improved Towny integration Closes #95
2017-04-17 16:35:43 +02:00
} catch (Exception ex) {
plugin.debug(ex);
}
}
Added towny support - Players can only create shops in shop plots, not in wilderness or normal plots - Added permission "shopchest.extend.protected" - Changed permission "shopchest.extendOther" to "shopchest.extend.other" - When creating a shop on a double chest, both chests must not be protected/in a protected region - To extend a shop into a protected region (e.g. WorldGuard/Towny), you need permission (shopchest.extend.protected) - Added no-permission message for "shopchest.extend.protected"
2016-11-20 14:15:53 +01:00
}
}
Added debug messages for shop creation (external plugins)
2017-04-19 14:04:57 +02:00
if (!externalPluginsAllowed) denyReason = "Towny";
Added WorldGuard support Might contain issues, as it's not tested extensively
2016-11-13 13:43:03 +01:00
}
Added debug messages for shop creation (external plugins)
2017-04-19 14:04:57 +02:00
if (externalPluginsAllowed && plugin.hasPlotSquared() && config.enable_plotsquared_integration) {
plugin.debug("Checking if PlotSquared allows shop creation...");
Added support for PlotSquared Three new custom flags will be available for every plot to set: - create-shop - use-shop - use-admin-shop These flags can be set to the following values to allow the flag to that group. If you set the group to members, trusted members and owners are also allowed the flag: - owners - trusted - members - everyone - none The default value for the flags will be 'none', so be sure to change it in order to create or use shops! The flag 'create-shop' can be bypassed by granting the permission 'shopchest.create.protected' (which is not recommended), and the other flags can be bypassed by granting the permission 'shopchest.external.bypass'. This closes #87
2017-03-28 14:37:12 +02:00
for (Location loc : chestLocations) {
if (loc != null) {
com.intellectualcrafters.plot.object.Location plotLocation = new com.intellectualcrafters.plot.object.Location(
loc.getWorld().getName(), loc.getBlockX(), loc.getBlockY(), loc.getBlockZ());
Plot plot = plotLocation.getOwnedPlot();
externalPluginsAllowed &= Utils.isFlagAllowedOnPlot(plot, PlotSquaredShopFlag.CREATE_SHOP, p);
}
}
Added debug messages for shop creation (external plugins)
2017-04-19 14:04:57 +02:00
if (!externalPluginsAllowed) denyReason = "PlotSquared";
Added support for uSkyBlock Only the leader pr members of an island can create or expand a shop, but everyone can use them.
2017-04-10 17:25:48 +02:00
}
Added support for PlotSquared Three new custom flags will be available for every plot to set: - create-shop - use-shop - use-admin-shop These flags can be set to the following values to allow the flag to that group. If you set the group to members, trusted members and owners are also allowed the flag: - owners - trusted - members - everyone - none The default value for the flags will be 'none', so be sure to change it in order to create or use shops! The flag 'create-shop' can be bypassed by granting the permission 'shopchest.create.protected' (which is not recommended), and the other flags can be bypassed by granting the permission 'shopchest.external.bypass'. This closes #87
2017-03-28 14:37:12 +02:00
Added debug messages for shop creation (external plugins)
2017-04-19 14:04:57 +02:00
if (externalPluginsAllowed && plugin.hasUSkyBlock() && config.enable_uskyblock_integration) {
plugin.debug("Checking if uSkyBlock allows shop creation...");
Added support for uSkyBlock Only the leader pr members of an island can create or expand a shop, but everyone can use them.
2017-04-10 17:25:48 +02:00
for (Location loc : chestLocations) {
if (loc != null) {
IslandInfo islandInfo = plugin.getUSkyBlock().getIslandInfo(loc);
Fixed NPE when chest is not on an island (ASkyBlock and uSkyBlock)
2017-04-17 18:29:15 +02:00
if (islandInfo != null) {
Added debug messages for shop creation (external plugins)
2017-04-19 14:04:57 +02:00
plugin.debug("Chest is on island of " + islandInfo.getLeader());
Fixed NPE when chest is not on an island (ASkyBlock and uSkyBlock)
2017-04-17 18:29:15 +02:00
externalPluginsAllowed &= islandInfo.getMembers().contains(p.getName()) || islandInfo.getLeader().equals(p.getName());
}
Added support for uSkyBlock Only the leader pr members of an island can create or expand a shop, but everyone can use them.
2017-04-10 17:25:48 +02:00
}
}
Added debug messages for shop creation (external plugins)
2017-04-19 14:04:57 +02:00
if (!externalPluginsAllowed) denyReason = "uSkyBlock";
Added support for PlotSquared Three new custom flags will be available for every plot to set: - create-shop - use-shop - use-admin-shop These flags can be set to the following values to allow the flag to that group. If you set the group to members, trusted members and owners are also allowed the flag: - owners - trusted - members - everyone - none The default value for the flags will be 'none', so be sure to change it in order to create or use shops! The flag 'create-shop' can be bypassed by granting the permission 'shopchest.create.protected' (which is not recommended), and the other flags can be bypassed by granting the permission 'shopchest.external.bypass'. This closes #87
2017-03-28 14:37:12 +02:00
}
Added debug messages for shop creation (external plugins)
2017-04-19 14:04:57 +02:00
if (externalPluginsAllowed && plugin.hasASkyBlock() && config.enable_askyblock_integration) {
plugin.debug("Checking if ASkyBlock allows shop creation...");
Added support for ASkyBlock Only members and the owner of an island are allowed to create a shop, but everyone is allowed to use it (if not restricted by other plugins like WorldGuard) Closes #50
2017-04-17 17:07:47 +02:00
for (Location loc : chestLocations) {
if (loc != null) {
Island island = ASkyBlockAPI.getInstance().getIslandAt(loc);
Fixed NPE when chest is not on an island (ASkyBlock and uSkyBlock)
2017-04-17 18:29:15 +02:00
if (island != null) {
Fixed NPE while creating shop on an unowned ASkyBlock island
2017-06-08 21:57:30 +02:00
if (island.getOwner() == null) {
plugin.debug("Chest is on an unowned island.");
externalPluginsAllowed &= island.getMembers().contains(p.getUniqueId());
} else {
plugin.debug("Chest is on island of " + Bukkit.getOfflinePlayer(island.getOwner()).getName());
externalPluginsAllowed &= island.getMembers().contains(p.getUniqueId()) || island.getOwner().equals(p.getUniqueId());
}
Fixed NPE when chest is not on an island (ASkyBlock and uSkyBlock)
2017-04-17 18:29:15 +02:00
}
Added support for ASkyBlock Only members and the owner of an island are allowed to create a shop, but everyone is allowed to use it (if not restricted by other plugins like WorldGuard) Closes #50
2017-04-17 17:07:47 +02:00
}
}
Added debug messages for shop creation (external plugins)
2017-04-19 14:04:57 +02:00
if (!externalPluginsAllowed) denyReason = "ASkyBlock";
Added support for ASkyBlock Only members and the owner of an island are allowed to create a shop, but everyone is allowed to use it (if not restricted by other plugins like WorldGuard) Closes #50
2017-04-17 17:07:47 +02:00
}
Added debug messages for shop creation (external plugins)
2017-04-19 14:04:57 +02:00
if (externalPluginsAllowed && plugin.hasIslandWorld() && config.enable_islandworld_integration && IslandWorldApi.isInitialized()) {
plugin.debug("Checking if IslandWorld allows shop creation...");
Added support for IslandWorld Only players who can build on the island (owner and members) are allowed to create a shop, but anyone can use it (if not limited by other plugins like WorldGuard)
2017-04-17 18:24:51 +02:00
for (Location loc : chestLocations) {
if (loc != null) {
if (loc.getWorld().getName().equals(IslandWorldApi.getIslandWorld().getName())) {
Added debug messages for shop creation (external plugins)
2017-04-19 14:04:57 +02:00
plugin.debug("Chest is in island world");
Added support for IslandWorld Only players who can build on the island (owner and members) are allowed to create a shop, but anyone can use it (if not limited by other plugins like WorldGuard)
2017-04-17 18:24:51 +02:00
externalPluginsAllowed &= IslandWorldApi.canBuildOnLocation(p, loc, true);
}
}
}
Added debug messages for shop creation (external plugins)
2017-04-19 14:04:57 +02:00
if (!externalPluginsAllowed) denyReason = "IslandWorld";
Added support for IslandWorld Only players who can build on the island (owner and members) are allowed to create a shop, but anyone can use it (if not limited by other plugins like WorldGuard)
2017-04-17 18:24:51 +02:00
}
Added support for GriefPrevention Only players who are allowed to build can create a shop
2017-04-26 17:03:39 +02:00
if (externalPluginsAllowed && plugin.hasGriefPrevention() && config.enable_griefprevention_integration) {
plugin.debug("Checking if GriefPrevention allows shop creation...");
Improved support for GriefPrevention Now checks if the claim where the shop is located allows container access for the player. If there is no claim, shop creation is allowed (except it has been denied by other plugins)
2017-04-29 14:37:52 +02:00
String gpDenyReason = null;
Added support for GriefPrevention Only players who are allowed to build can create a shop
2017-04-26 17:03:39 +02:00
for (Location loc : chestLocations) {
if (loc != null) {
Improved support for GriefPrevention Now checks if the claim where the shop is located allows container access for the player. If there is no claim, shop creation is allowed (except it has been denied by other plugins)
2017-04-29 14:37:52 +02:00
Claim claim = plugin.getGriefPrevention().dataStore.getClaimAt(loc, false, null);
if (claim != null) {
plugin.debug("Checking if claim allows container access");
gpDenyReason = claim.allowContainers(p);
externalPluginsAllowed &= gpDenyReason == null;
}
Added support for GriefPrevention Only players who are allowed to build can create a shop
2017-04-26 17:03:39 +02:00
}
}
if (!externalPluginsAllowed) denyReason = "GriefPrevention (" + gpDenyReason + ")";
}
Added towny support - Players can only create shops in shop plots, not in wilderness or normal plots - Added permission "shopchest.extend.protected" - Changed permission "shopchest.extendOther" to "shopchest.extend.other" - When creating a shop on a double chest, both chests must not be protected/in a protected region - To extend a shop into a protected region (e.g. WorldGuard/Towny), you need permission (shopchest.extend.protected) - Added no-permission message for "shopchest.extend.protected"
2016-11-20 14:15:53 +01:00
if ((e.isCancelled() || !externalPluginsAllowed) && !p.hasPermission(Permissions.CREATE_PROTECTED)) {
Fixed NPE when player clicks in air
2016-08-06 13:32:37 +02:00
p.sendMessage(LanguageUtils.getMessage(LocalizedMessage.Message.NO_PERMISSION_CREATE_PROTECTED));
ClickType.removePlayerClickType(p);
Added debug messages for shop creation (external plugins)
2017-04-19 14:04:57 +02:00
plugin.debug(p.getName() + " is not allowed to create a shop on the selected chest because " + denyReason);
Added WorldGuard support Might contain issues, as it's not tested extensively
2016-11-13 13:43:03 +01:00
e.setCancelled(true);
Fixed NPE when player clicks in air
2016-08-06 13:32:37 +02:00
return;
}
Changed way of checking if chests are protected If another plugin cancelled the PlayerInteractEvent before ShopChest, the player is not permitted to create a shop on the clicked chest. The dependency of 'Lockette' is no longer needed. It might occur that a plugin, which is not used for protections, cancels the PlayerInteractEvent so a shop cannot be created. This closes #14
2016-08-04 21:12:19 +02:00
Fixed NPE when player clicks in air
2016-08-06 13:32:37 +02:00
e.setCancelled(true);
Changed way of checking if chests are protected If another plugin cancelled the PlayerInteractEvent before ShopChest, the player is not permitted to create a shop on the clicked chest. The dependency of 'Lockette' is no longer needed. It might occur that a plugin, which is not used for protections, cancels the PlayerInteractEvent so a shop cannot be created. This closes #14
2016-08-04 21:12:19 +02:00
Fixed NPE when player clicks in air
2016-08-06 13:32:37 +02:00
if (b.getRelative(BlockFace.UP).getType() == Material.AIR) {
ClickType clickType = ClickType.getPlayerClickType(p);
ItemStack product = clickType.getProduct();
double buyPrice = clickType.getBuyPrice();
double sellPrice = clickType.getSellPrice();
ShopType shopType = clickType.getShopType();
Changed way of checking if chests are protected If another plugin cancelled the PlayerInteractEvent before ShopChest, the player is not permitted to create a shop on the clicked chest. The dependency of 'Lockette' is no longer needed. It might occur that a plugin, which is not used for protections, cancels the PlayerInteractEvent so a shop cannot be created. This closes #14
2016-08-04 21:12:19 +02:00
Fixed NPE when player clicks in air
2016-08-06 13:32:37 +02:00
create(p, b.getLocation(), product, buyPrice, sellPrice, shopType);
} else {
p.sendMessage(LanguageUtils.getMessage(LocalizedMessage.Message.CHEST_BLOCKED));
plugin.debug("Chest is blocked");
}
Changed way of checking if chests are protected If another plugin cancelled the PlayerInteractEvent before ShopChest, the player is not permitted to create a shop on the clicked chest. The dependency of 'Lockette' is no longer needed. It might occur that a plugin, which is not used for protections, cancels the PlayerInteractEvent so a shop cannot be created. This closes #14
2016-08-04 21:12:19 +02:00
} else {
Fixed NPE when player clicks in air
2016-08-06 13:32:37 +02:00
e.setCancelled(true);
p.sendMessage(LanguageUtils.getMessage(LocalizedMessage.Message.CHEST_ALREADY_SHOP));
plugin.debug("Chest is already a shop");
Changed way of checking if chests are protected If another plugin cancelled the PlayerInteractEvent before ShopChest, the player is not permitted to create a shop on the clicked chest. The dependency of 'Lockette' is no longer needed. It might occur that a plugin, which is not used for protections, cancels the PlayerInteractEvent so a shop cannot be created. This closes #14
2016-08-04 21:12:19 +02:00
}
Fixed NPE when player clicks in air
2016-08-06 13:32:37 +02:00
ClickType.removePlayerClickType(p);
}
Changed way of checking if chests are protected If another plugin cancelled the PlayerInteractEvent before ShopChest, the player is not permitted to create a shop on the clicked chest. The dependency of 'Lockette' is no longer needed. It might occur that a plugin, which is not used for protections, cancels the PlayerInteractEvent so a shop cannot be created. This closes #14
2016-08-04 21:12:19 +02:00
}
}
}
}
}
Added command "/shop open" to open shops Shift-click no longer works anywhere to open a shop.
2017-03-21 15:03:12 +01:00
private void handleInteractEvent(PlayerInteractEvent e) {
Automated code cleanup by IntelliJ IDEA As I Switched from Eclipse to IntelliJ IDEA, I also had to add a few entries to the .gitignore file.
2016-05-28 15:47:57 +02:00
Block b = e.getClickedBlock();
Player p = e.getPlayer();
Add way to invert mouse buttons Closes #35
2017-01-03 15:35:35 +01:00
boolean inverted = config.invert_mouse_buttons;
Automated code cleanup by IntelliJ IDEA As I Switched from Eclipse to IntelliJ IDEA, I also had to add a few entries to the .gitignore file.
2016-05-28 15:47:57 +02:00
Added shift-click to buy stack Closes #85
2017-03-21 15:40:23 +01:00
if (Utils.getMajorVersion() >= 9) {
if (e.getHand() == EquipmentSlot.OFF_HAND) return;
}
Automated code cleanup by IntelliJ IDEA As I Switched from Eclipse to IntelliJ IDEA, I also had to add a few entries to the .gitignore file.
2016-05-28 15:47:57 +02:00
if (e.getAction() == Action.RIGHT_CLICK_BLOCK || e.getAction() == Action.LEFT_CLICK_BLOCK) {
if (b.getType().equals(Material.CHEST) || b.getType().equals(Material.TRAPPED_CHEST)) {
Add way to invert mouse buttons Closes #35
2017-01-03 15:35:35 +01:00
if (ClickType.getPlayerClickType(p) != null) {
if (e.getAction() == Action.RIGHT_CLICK_BLOCK) {
Automated code cleanup by IntelliJ IDEA As I Switched from Eclipse to IntelliJ IDEA, I also had to add a few entries to the .gitignore file.
2016-05-28 15:47:57 +02:00
switch (ClickType.getPlayerClickType(p).getClickType()) {
case INFO:
e.setCancelled(true);
ShopUtils no longer contains static methods
2016-07-13 15:03:54 +02:00
if (shopUtils.isShop(b.getLocation())) {
Shop shop = shopUtils.getShop(b.getLocation());
Automated code cleanup by IntelliJ IDEA As I Switched from Eclipse to IntelliJ IDEA, I also had to add a few entries to the .gitignore file.
2016-05-28 15:47:57 +02:00
info(p, shop);
} else {
Added configurable language for everything and more This can read the default minecraft language files, but in order to translate the messages, you need to add the message section from the en_US.lang. Also, spawn eggs will work now, the title of music discs will be displayed in the info sections and "tipped arrow effect" is now named "potion effect" and is displayed also if the product is a potion, splashed potion or a lingering potion (and of course tipped arrows). The message configuration is no longer found in the config.yml file, but has gone to the .lang file, so you need to reconfigure every message! As the Jsoup library is no longer needed, the filesize of the final jar shrunk quite a bit. Maybe there are some more changes, which I already forgot.
2016-06-22 20:51:19 +02:00
p.sendMessage(LanguageUtils.getMessage(LocalizedMessage.Message.CHEST_NO_SHOP));
Added a few debug messages
2016-08-05 12:46:41 +02:00
plugin.debug("Chest is not a shop");
Automated code cleanup by IntelliJ IDEA As I Switched from Eclipse to IntelliJ IDEA, I also had to add a few entries to the .gitignore file.
2016-05-28 15:47:57 +02:00
}
ClickType.removePlayerClickType(p);
break;
case REMOVE:
e.setCancelled(true);
ShopUtils no longer contains static methods
2016-07-13 15:03:54 +02:00
if (shopUtils.isShop(b.getLocation())) {
Shop shop = shopUtils.getShop(b.getLocation());
Automated code cleanup by IntelliJ IDEA As I Switched from Eclipse to IntelliJ IDEA, I also had to add a few entries to the .gitignore file.
2016-05-28 15:47:57 +02:00
Only permitted players can remove admin shops + Changed permission "shopchest.removeOther" to "shopchest.remove.other" Closes #36
2017-01-04 14:34:34 +01:00
if (shop.getShopType() == ShopType.ADMIN) {
if (p.hasPermission(Permissions.REMOVE_ADMIN)) {
remove(p, shop);
} else {
p.sendMessage(LanguageUtils.getMessage(LocalizedMessage.Message.NO_PERMISSION_REMOVE_ADMIN));
plugin.debug(p.getName() + " is not permitted to remove an admin shop");
}
Automated code cleanup by IntelliJ IDEA As I Switched from Eclipse to IntelliJ IDEA, I also had to add a few entries to the .gitignore file.
2016-05-28 15:47:57 +02:00
} else {
Only permitted players can remove admin shops + Changed permission "shopchest.removeOther" to "shopchest.remove.other" Closes #36
2017-01-04 14:34:34 +01:00
if (shop.getVendor().getUniqueId().equals(p.getUniqueId()) || p.hasPermission(Permissions.REMOVE_OTHER)) {
remove(p, shop);
} else {
p.sendMessage(LanguageUtils.getMessage(LocalizedMessage.Message.NO_PERMISSION_REMOVE_OTHERS));
plugin.debug(p.getName() + " is not permitted to remove another player's shop");
}
Automated code cleanup by IntelliJ IDEA As I Switched from Eclipse to IntelliJ IDEA, I also had to add a few entries to the .gitignore file.
2016-05-28 15:47:57 +02:00
}
} else {
Added configurable language for everything and more This can read the default minecraft language files, but in order to translate the messages, you need to add the message section from the en_US.lang. Also, spawn eggs will work now, the title of music discs will be displayed in the info sections and "tipped arrow effect" is now named "potion effect" and is displayed also if the product is a potion, splashed potion or a lingering potion (and of course tipped arrows). The message configuration is no longer found in the config.yml file, but has gone to the .lang file, so you need to reconfigure every message! As the Jsoup library is no longer needed, the filesize of the final jar shrunk quite a bit. Maybe there are some more changes, which I already forgot.
2016-06-22 20:51:19 +02:00
p.sendMessage(LanguageUtils.getMessage(LocalizedMessage.Message.CHEST_NO_SHOP));
Added a few debug messages
2016-08-05 12:46:41 +02:00
plugin.debug("Chest is not a shop");
Automated code cleanup by IntelliJ IDEA As I Switched from Eclipse to IntelliJ IDEA, I also had to add a few entries to the .gitignore file.
2016-05-28 15:47:57 +02:00
}
ClickType.removePlayerClickType(p);
break;
Updated events Methods getPlayer() and getShop() don't need to be overridden, as they are now declared in the ShopEvent superclass.
2017-03-21 14:25:49 +01:00
case OPEN:
e.setCancelled(true);
Add way to invert mouse buttons Closes #35
2017-01-03 15:35:35 +01:00
Updated events Methods getPlayer() and getShop() don't need to be overridden, as they are now declared in the ShopEvent superclass.
2017-03-21 14:25:49 +01:00
if (shopUtils.isShop(b.getLocation())) {
Shop shop = shopUtils.getShop(b.getLocation());
if (p.getUniqueId().equals(shop.getVendor().getUniqueId()) || p.hasPermission(Permissions.OPEN_OTHER)) {
Added command "/shop open" to open shops Shift-click no longer works anywhere to open a shop.
2017-03-21 15:03:12 +01:00
open(p, shop, true);
Updated events Methods getPlayer() and getShop() don't need to be overridden, as they are now declared in the ShopEvent superclass.
2017-03-21 14:25:49 +01:00
} else {
p.sendMessage(LanguageUtils.getMessage(LocalizedMessage.Message.NO_PERMISSION_OPEN_OTHERS));
plugin.debug(p.getName() + " is not permitted to open another player's shop");
Automated code cleanup by IntelliJ IDEA As I Switched from Eclipse to IntelliJ IDEA, I also had to add a few entries to the .gitignore file.
2016-05-28 15:47:57 +02:00
}
Updated events Methods getPlayer() and getShop() don't need to be overridden, as they are now declared in the ShopEvent superclass.
2017-03-21 14:25:49 +01:00
} else {
p.sendMessage(LanguageUtils.getMessage(LocalizedMessage.Message.CHEST_NO_SHOP));
plugin.debug("Chest is not a shop");
Automated code cleanup by IntelliJ IDEA As I Switched from Eclipse to IntelliJ IDEA, I also had to add a few entries to the .gitignore file.
2016-05-28 15:47:57 +02:00
}
Added WorldGuard support Might contain issues, as it's not tested extensively
2016-11-13 13:43:03 +01:00
Updated events Methods getPlayer() and getShop() don't need to be overridden, as they are now declared in the ShopEvent superclass.
2017-03-21 14:25:49 +01:00
ClickType.removePlayerClickType(p);
break;
}
}
} else {
Added way to retrieve shop info by clicking it with a specific item Closes #104
2017-06-05 15:02:49 +02:00
Shop shop = shopUtils.getShop(b.getLocation());
if (shop != null) {
Added shift-click to sell stack Only works when a player does not have an axe in one of his hands. If he has, the shop will be broken/removed (if he has permission). Closes #84
2017-03-25 13:45:17 +01:00
if (e.getAction() == Action.LEFT_CLICK_BLOCK && p.isSneaking() && Utils.hasAxeInHand(p)) {
return;
Add way to invert mouse buttons Closes #35
2017-01-03 15:35:35 +01:00
}
Added way to retrieve shop info by clicking it with a specific item Closes #104
2017-06-05 15:02:49 +02:00
ItemStack infoItem = config.shop_info_item;
if (infoItem != null) {
if (e.getAction() == Action.RIGHT_CLICK_BLOCK || e.getAction() == Action.LEFT_CLICK_BLOCK) {
ItemStack item = Utils.getItemInMainHand(p);
if (item == null || !(infoItem.getType() == item.getType() && infoItem.getDurability() == item.getDurability())) {
item = Utils.getItemInMainHand(p);
if (item != null && infoItem.getType() == item.getType() && infoItem.getDurability() == item.getDurability()) {
e.setCancelled(true);
info(p, shop);
return;
}
} else {
e.setCancelled(true);
info(p, shop);
return;
}
}
}
Add way to invert mouse buttons Closes #35
2017-01-03 15:35:35 +01:00
Added command "/shop open" to open shops Shift-click no longer works anywhere to open a shop.
2017-03-21 15:03:12 +01:00
if (e.getAction() == Action.RIGHT_CLICK_BLOCK && p.getUniqueId().equals(shop.getVendor().getUniqueId()) && shop.getShopType() != ShopType.ADMIN) {
return;
}
Prevent shop use in creative mode Closes #100
2017-05-25 12:21:51 +02:00
if (p.getGameMode() == GameMode.CREATIVE) {
e.setCancelled(true);
p.sendMessage(LanguageUtils.getMessage(LocalizedMessage.Message.USE_IN_CREATIVE));
return;
}
Add way to invert mouse buttons Closes #35
2017-01-03 15:35:35 +01:00
if ((e.getAction() == Action.RIGHT_CLICK_BLOCK && !inverted) || (e.getAction() == Action.LEFT_CLICK_BLOCK && inverted)) {
e.setCancelled(true);
if (shop.getShopType() == ShopType.ADMIN || !shop.getVendor().getUniqueId().equals(p.getUniqueId())) {
plugin.debug(p.getName() + " wants to buy");
if (shop.getBuyPrice() > 0) {
if (p.hasPermission(Permissions.BUY)) {
Added support for PlotSquared Three new custom flags will be available for every plot to set: - create-shop - use-shop - use-admin-shop These flags can be set to the following values to allow the flag to that group. If you set the group to members, trusted members and owners are also allowed the flag: - owners - trusted - members - everyone - none The default value for the flags will be 'none', so be sure to change it in order to create or use shops! The flag 'create-shop' can be bypassed by granting the permission 'shopchest.create.protected' (which is not recommended), and the other flags can be bypassed by granting the permission 'shopchest.external.bypass'. This closes #87
2017-03-28 14:37:12 +02:00
boolean externalPluginsAllowed = true;
Add way to invert mouse buttons Closes #35
2017-01-03 15:35:35 +01:00
Added support for PlotSquared Three new custom flags will be available for every plot to set: - create-shop - use-shop - use-admin-shop These flags can be set to the following values to allow the flag to that group. If you set the group to members, trusted members and owners are also allowed the flag: - owners - trusted - members - everyone - none The default value for the flags will be 'none', so be sure to change it in order to create or use shops! The flag 'create-shop' can be bypassed by granting the permission 'shopchest.create.protected' (which is not recommended), and the other flags can be bypassed by granting the permission 'shopchest.external.bypass'. This closes #87
2017-03-28 14:37:12 +02:00
if (plugin.hasPlotSquared() && config.enable_plotsquared_integration) {
com.intellectualcrafters.plot.object.Location plotLocation =
new com.intellectualcrafters.plot.object.Location(b.getWorld().getName(), b.getX(), b.getY(), b.getZ());
Plot plot = plotLocation.getOwnedPlot();
Flag flag = (shop.getShopType() == Shop.ShopType.ADMIN ? PlotSquaredShopFlag.USE_ADMIN_SHOP : PlotSquaredShopFlag.USE_SHOP);
Fixed refund if economy transactions fail
2017-06-08 11:31:23 +02:00
externalPluginsAllowed = Utils.isFlagAllowedOnPlot(plot, flag, p);
Added support for PlotSquared Three new custom flags will be available for every plot to set: - create-shop - use-shop - use-admin-shop These flags can be set to the following values to allow the flag to that group. If you set the group to members, trusted members and owners are also allowed the flag: - owners - trusted - members - everyone - none The default value for the flags will be 'none', so be sure to change it in order to create or use shops! The flag 'create-shop' can be bypassed by granting the permission 'shopchest.create.protected' (which is not recommended), and the other flags can be bypassed by granting the permission 'shopchest.external.bypass'. This closes #87
2017-03-28 14:37:12 +02:00
}
Add way to invert mouse buttons Closes #35
2017-01-03 15:35:35 +01:00
Fixed refund if economy transactions fail
2017-06-08 11:31:23 +02:00
if (externalPluginsAllowed && plugin.hasWorldGuard() && config.enable_worldguard_integration) {
Added support for PlotSquared Three new custom flags will be available for every plot to set: - create-shop - use-shop - use-admin-shop These flags can be set to the following values to allow the flag to that group. If you set the group to members, trusted members and owners are also allowed the flag: - owners - trusted - members - everyone - none The default value for the flags will be 'none', so be sure to change it in order to create or use shops! The flag 'create-shop' can be bypassed by granting the permission 'shopchest.create.protected' (which is not recommended), and the other flags can be bypassed by granting the permission 'shopchest.external.bypass'. This closes #87
2017-03-28 14:37:12 +02:00
StateFlag flag = (shop.getShopType() == ShopType.ADMIN ? WorldGuardShopFlag.USE_ADMIN_SHOP : WorldGuardShopFlag.USE_SHOP);
RegionContainer container = worldGuard.getRegionContainer();
RegionQuery query = container.createQuery();
Fixed refund if economy transactions fail
2017-06-08 11:31:23 +02:00
externalPluginsAllowed = query.testState(b.getLocation(), p, flag);
Added support for PlotSquared Three new custom flags will be available for every plot to set: - create-shop - use-shop - use-admin-shop These flags can be set to the following values to allow the flag to that group. If you set the group to members, trusted members and owners are also allowed the flag: - owners - trusted - members - everyone - none The default value for the flags will be 'none', so be sure to change it in order to create or use shops! The flag 'create-shop' can be bypassed by granting the permission 'shopchest.create.protected' (which is not recommended), and the other flags can be bypassed by granting the permission 'shopchest.external.bypass'. This closes #87
2017-03-28 14:37:12 +02:00
}
if (shop.getShopType() == ShopType.ADMIN) {
if (externalPluginsAllowed || p.hasPermission(Permissions.BYPASS_EXTERNAL_PLUGIN)) {
Added shift-click to buy stack Closes #85
2017-03-21 15:40:23 +01:00
buy(p, shop, p.isSneaking());
Added WorldGuard support Might contain issues, as it's not tested extensively
2016-11-13 13:43:03 +01:00
} else {
Added support for PlotSquared Three new custom flags will be available for every plot to set: - create-shop - use-shop - use-admin-shop These flags can be set to the following values to allow the flag to that group. If you set the group to members, trusted members and owners are also allowed the flag: - owners - trusted - members - everyone - none The default value for the flags will be 'none', so be sure to change it in order to create or use shops! The flag 'create-shop' can be bypassed by granting the permission 'shopchest.create.protected' (which is not recommended), and the other flags can be bypassed by granting the permission 'shopchest.external.bypass'. This closes #87
2017-03-28 14:37:12 +02:00
plugin.debug(p.getName() + " doesn't have external plugin's permission");
p.sendMessage(LanguageUtils.getMessage(LocalizedMessage.Message.NO_PERMISSION_BUY_HERE));
Add way to invert mouse buttons Closes #35
2017-01-03 15:35:35 +01:00
}
} else {
Added support for PlotSquared Three new custom flags will be available for every plot to set: - create-shop - use-shop - use-admin-shop These flags can be set to the following values to allow the flag to that group. If you set the group to members, trusted members and owners are also allowed the flag: - owners - trusted - members - everyone - none The default value for the flags will be 'none', so be sure to change it in order to create or use shops! The flag 'create-shop' can be bypassed by granting the permission 'shopchest.create.protected' (which is not recommended), and the other flags can be bypassed by granting the permission 'shopchest.external.bypass'. This closes #87
2017-03-28 14:37:12 +02:00
if (externalPluginsAllowed || p.hasPermission(Permissions.BYPASS_EXTERNAL_PLUGIN)) {
Add way to invert mouse buttons Closes #35
2017-01-03 15:35:35 +01:00
Chest c = (Chest) b.getState();
Fixed exploit to generate money or items When 'auto-calculate-item-amount' was set to true and the player was sneaking, he could buy something even though the shop didn't have a whole stack in stock, but still get the items, or he could sell something even though he didn't have a stack in his inventory, but still get the money for it. Closes #93
2017-04-10 17:46:00 +02:00
int amount = (p.isSneaking() ? shop.getProduct().getMaxStackSize() : shop.getProduct().getAmount());
if (Utils.getAmount(c.getInventory(), shop.getProduct()) >= amount) {
Added shift-click to buy stack Closes #85
2017-03-21 15:40:23 +01:00
buy(p, shop, p.isSneaking());
Add way to invert mouse buttons Closes #35
2017-01-03 15:35:35 +01:00
} else {
if (config.auto_calculate_item_amount && Utils.getAmount(c.getInventory(), shop.getProduct()) > 0) {
Added shift-click to buy stack Closes #85
2017-03-21 15:40:23 +01:00
buy(p, shop, p.isSneaking());
Added way to auto calculate item amount You can find an explanation here: - https://www.spigotmc.org/threads/shopchest.87948/page-15#post-1820672 - In the configuration file
2016-08-16 15:06:26 +02:00
} else {
Add way to invert mouse buttons Closes #35
2017-01-03 15:35:35 +01:00
p.sendMessage(LanguageUtils.getMessage(LocalizedMessage.Message.OUT_OF_STOCK));
Added vendor information about a sold out shop
2017-01-04 18:46:50 +01:00
if (shop.getVendor().isOnline() && config.enable_vendor_messages) {
shop.getVendor().getPlayer().sendMessage(LanguageUtils.getMessage(LocalizedMessage.Message.VENDOR_OUT_OF_STOCK,
Improved configuration of command description messages + Renamed all occurrences of "regex" to "placeholder"
2017-06-02 14:37:11 +02:00
new LocalizedMessage.ReplacedPlaceholder(Placeholder.AMOUNT, String.valueOf(shop.getProduct().getAmount())),
new LocalizedMessage.ReplacedPlaceholder(Placeholder.ITEM_NAME, LanguageUtils.getItemName(shop.getProduct()))));
Added vendor information about a sold out shop
2017-01-04 18:46:50 +01:00
}
Add way to invert mouse buttons Closes #35
2017-01-03 15:35:35 +01:00
plugin.debug("Shop is out of stock");
Added way to auto calculate item amount You can find an explanation here: - https://www.spigotmc.org/threads/shopchest.87948/page-15#post-1820672 - In the configuration file
2016-08-16 15:06:26 +02:00
}
Automated code cleanup by IntelliJ IDEA As I Switched from Eclipse to IntelliJ IDEA, I also had to add a few entries to the .gitignore file.
2016-05-28 15:47:57 +02:00
}
Add way to invert mouse buttons Closes #35
2017-01-03 15:35:35 +01:00
} else {
Added support for PlotSquared Three new custom flags will be available for every plot to set: - create-shop - use-shop - use-admin-shop These flags can be set to the following values to allow the flag to that group. If you set the group to members, trusted members and owners are also allowed the flag: - owners - trusted - members - everyone - none The default value for the flags will be 'none', so be sure to change it in order to create or use shops! The flag 'create-shop' can be bypassed by granting the permission 'shopchest.create.protected' (which is not recommended), and the other flags can be bypassed by granting the permission 'shopchest.external.bypass'. This closes #87
2017-03-28 14:37:12 +02:00
plugin.debug(p.getName() + " doesn't have external plugin's permission");
p.sendMessage(LanguageUtils.getMessage(LocalizedMessage.Message.NO_PERMISSION_BUY_HERE));
Automated code cleanup by IntelliJ IDEA As I Switched from Eclipse to IntelliJ IDEA, I also had to add a few entries to the .gitignore file.
2016-05-28 15:47:57 +02:00
}
}
} else {
Add way to invert mouse buttons Closes #35
2017-01-03 15:35:35 +01:00
p.sendMessage(LanguageUtils.getMessage(LocalizedMessage.Message.NO_PERMISSION_BUY));
plugin.debug(p.getName() + " is not permitted to buy");
Automated code cleanup by IntelliJ IDEA As I Switched from Eclipse to IntelliJ IDEA, I also had to add a few entries to the .gitignore file.
2016-05-28 15:47:57 +02:00
}
} else {
Add way to invert mouse buttons Closes #35
2017-01-03 15:35:35 +01:00
p.sendMessage(LanguageUtils.getMessage(LocalizedMessage.Message.BUYING_DISABLED));
plugin.debug("Buying is disabled");
Automated code cleanup by IntelliJ IDEA As I Switched from Eclipse to IntelliJ IDEA, I also had to add a few entries to the .gitignore file.
2016-05-28 15:47:57 +02:00
}
}
Add way to invert mouse buttons Closes #35
2017-01-03 15:35:35 +01:00
} else if ((e.getAction() == Action.LEFT_CLICK_BLOCK && !inverted) || (e.getAction() == Action.RIGHT_CLICK_BLOCK && inverted)) {
e.setCancelled(true);
Automated code cleanup by IntelliJ IDEA As I Switched from Eclipse to IntelliJ IDEA, I also had to add a few entries to the .gitignore file.
2016-05-28 15:47:57 +02:00
Add way to invert mouse buttons Closes #35
2017-01-03 15:35:35 +01:00
if ((shop.getShopType() == ShopType.ADMIN) || (!shop.getVendor().getUniqueId().equals(p.getUniqueId()))) {
plugin.debug(p.getName() + " wants to sell");
Automated code cleanup by IntelliJ IDEA As I Switched from Eclipse to IntelliJ IDEA, I also had to add a few entries to the .gitignore file.
2016-05-28 15:47:57 +02:00
Add way to invert mouse buttons Closes #35
2017-01-03 15:35:35 +01:00
if (shop.getSellPrice() > 0) {
if (p.hasPermission(Permissions.SELL)) {
Added support for PlotSquared Three new custom flags will be available for every plot to set: - create-shop - use-shop - use-admin-shop These flags can be set to the following values to allow the flag to that group. If you set the group to members, trusted members and owners are also allowed the flag: - owners - trusted - members - everyone - none The default value for the flags will be 'none', so be sure to change it in order to create or use shops! The flag 'create-shop' can be bypassed by granting the permission 'shopchest.create.protected' (which is not recommended), and the other flags can be bypassed by granting the permission 'shopchest.external.bypass'. This closes #87
2017-03-28 14:37:12 +02:00
boolean externalPluginsAllowed = true;
if (plugin.hasPlotSquared() && config.enable_plotsquared_integration) {
com.intellectualcrafters.plot.object.Location plotLocation =
new com.intellectualcrafters.plot.object.Location(b.getWorld().getName(), b.getX(), b.getY(), b.getZ());
Plot plot = plotLocation.getOwnedPlot();
Flag flag = (shop.getShopType() == Shop.ShopType.ADMIN ? PlotSquaredShopFlag.USE_ADMIN_SHOP : PlotSquaredShopFlag.USE_SHOP);
Fixed refund if economy transactions fail
2017-06-08 11:31:23 +02:00
externalPluginsAllowed = Utils.isFlagAllowedOnPlot(plot, flag, p);
Added support for PlotSquared Three new custom flags will be available for every plot to set: - create-shop - use-shop - use-admin-shop These flags can be set to the following values to allow the flag to that group. If you set the group to members, trusted members and owners are also allowed the flag: - owners - trusted - members - everyone - none The default value for the flags will be 'none', so be sure to change it in order to create or use shops! The flag 'create-shop' can be bypassed by granting the permission 'shopchest.create.protected' (which is not recommended), and the other flags can be bypassed by granting the permission 'shopchest.external.bypass'. This closes #87
2017-03-28 14:37:12 +02:00
}
Added WorldGuard support Might contain issues, as it's not tested extensively
2016-11-13 13:43:03 +01:00
Fixed refund if economy transactions fail
2017-06-08 11:31:23 +02:00
if (externalPluginsAllowed && plugin.hasWorldGuard() && config.enable_worldguard_integration) {
Add way to invert mouse buttons Closes #35
2017-01-03 15:35:35 +01:00
RegionContainer container = worldGuard.getRegionContainer();
RegionQuery query = container.createQuery();
Added WorldGuard support Might contain issues, as it's not tested extensively
2016-11-13 13:43:03 +01:00
Added support for PlotSquared Three new custom flags will be available for every plot to set: - create-shop - use-shop - use-admin-shop These flags can be set to the following values to allow the flag to that group. If you set the group to members, trusted members and owners are also allowed the flag: - owners - trusted - members - everyone - none The default value for the flags will be 'none', so be sure to change it in order to create or use shops! The flag 'create-shop' can be bypassed by granting the permission 'shopchest.create.protected' (which is not recommended), and the other flags can be bypassed by granting the permission 'shopchest.external.bypass'. This closes #87
2017-03-28 14:37:12 +02:00
StateFlag flag = (shop.getShopType() == ShopType.ADMIN ? WorldGuardShopFlag.USE_ADMIN_SHOP : WorldGuardShopFlag.USE_SHOP);
Fixed refund if economy transactions fail
2017-06-08 11:31:23 +02:00
externalPluginsAllowed = query.testState(b.getLocation(), p, flag);
Add way to invert mouse buttons Closes #35
2017-01-03 15:35:35 +01:00
}
Added WorldGuard support Might contain issues, as it's not tested extensively
2016-11-13 13:43:03 +01:00
Added support for PlotSquared Three new custom flags will be available for every plot to set: - create-shop - use-shop - use-admin-shop These flags can be set to the following values to allow the flag to that group. If you set the group to members, trusted members and owners are also allowed the flag: - owners - trusted - members - everyone - none The default value for the flags will be 'none', so be sure to change it in order to create or use shops! The flag 'create-shop' can be bypassed by granting the permission 'shopchest.create.protected' (which is not recommended), and the other flags can be bypassed by granting the permission 'shopchest.external.bypass'. This closes #87
2017-03-28 14:37:12 +02:00
if (externalPluginsAllowed || p.hasPermission(Permissions.BYPASS_EXTERNAL_PLUGIN)) {
Fixed exploit to generate money or items When 'auto-calculate-item-amount' was set to true and the player was sneaking, he could buy something even though the shop didn't have a whole stack in stock, but still get the items, or he could sell something even though he didn't have a stack in his inventory, but still get the money for it. Closes #93
2017-04-10 17:46:00 +02:00
boolean stack = p.isSneaking() && !Utils.hasAxeInHand(p);
int amount = stack ? shop.getProduct().getMaxStackSize() : shop.getProduct().getAmount();
if (Utils.getAmount(p.getInventory(), shop.getProduct()) >= amount) {
sell(p, shop, stack);
Added WorldGuard support Might contain issues, as it's not tested extensively
2016-11-13 13:43:03 +01:00
} else {
Add way to invert mouse buttons Closes #35
2017-01-03 15:35:35 +01:00
if (config.auto_calculate_item_amount && Utils.getAmount(p.getInventory(), shop.getProduct()) > 0) {
Fixed exploit to generate money or items When 'auto-calculate-item-amount' was set to true and the player was sneaking, he could buy something even though the shop didn't have a whole stack in stock, but still get the items, or he could sell something even though he didn't have a stack in his inventory, but still get the money for it. Closes #93
2017-04-10 17:46:00 +02:00
sell(p, shop, stack);
Add way to invert mouse buttons Closes #35
2017-01-03 15:35:35 +01:00
} else {
p.sendMessage(LanguageUtils.getMessage(LocalizedMessage.Message.NOT_ENOUGH_ITEMS));
plugin.debug(p.getName() + " doesn't have enough items");
}
Added WorldGuard support Might contain issues, as it's not tested extensively
2016-11-13 13:43:03 +01:00
}
Add way to invert mouse buttons Closes #35
2017-01-03 15:35:35 +01:00
} else {
Added support for PlotSquared Three new custom flags will be available for every plot to set: - create-shop - use-shop - use-admin-shop These flags can be set to the following values to allow the flag to that group. If you set the group to members, trusted members and owners are also allowed the flag: - owners - trusted - members - everyone - none The default value for the flags will be 'none', so be sure to change it in order to create or use shops! The flag 'create-shop' can be bypassed by granting the permission 'shopchest.create.protected' (which is not recommended), and the other flags can be bypassed by granting the permission 'shopchest.external.bypass'. This closes #87
2017-03-28 14:37:12 +02:00
plugin.debug(p.getName() + " doesn't have external plugin's permission");
p.sendMessage(LanguageUtils.getMessage(LocalizedMessage.Message.NO_PERMISSION_SELL_HERE));
Added way to auto calculate item amount You can find an explanation here: - https://www.spigotmc.org/threads/shopchest.87948/page-15#post-1820672 - In the configuration file
2016-08-16 15:06:26 +02:00
}
Added WorldGuard support Might contain issues, as it's not tested extensively
2016-11-13 13:43:03 +01:00
} else {
Add way to invert mouse buttons Closes #35
2017-01-03 15:35:35 +01:00
p.sendMessage(LanguageUtils.getMessage(LocalizedMessage.Message.NO_PERMISSION_SELL));
plugin.debug(p.getName() + " is not permitted to sell");
Automated code cleanup by IntelliJ IDEA As I Switched from Eclipse to IntelliJ IDEA, I also had to add a few entries to the .gitignore file.
2016-05-28 15:47:57 +02:00
}
Players should be able to open their sell-only shops Also, they should be able to open shops even when they don't have permission to buy something
2016-06-08 16:06:36 +02:00
} else {
Add way to invert mouse buttons Closes #35
2017-01-03 15:35:35 +01:00
p.sendMessage(LanguageUtils.getMessage(LocalizedMessage.Message.SELLING_DISABLED));
plugin.debug("Selling is disabled");
Players should be able to open their sell-only shops Also, they should be able to open shops even when they don't have permission to buy something
2016-06-08 16:06:36 +02:00
}
Automated code cleanup by IntelliJ IDEA As I Switched from Eclipse to IntelliJ IDEA, I also had to add a few entries to the .gitignore file.
2016-05-28 15:47:57 +02:00
} else {
Add way to invert mouse buttons Closes #35
2017-01-03 15:35:35 +01:00
e.setCancelled(false);
Automated code cleanup by IntelliJ IDEA As I Switched from Eclipse to IntelliJ IDEA, I also had to add a few entries to the .gitignore file.
2016-05-28 15:47:57 +02:00
}
}
}
}
}
}
Add hologram interaction (configurable)
2016-11-18 17:32:52 +01:00
}
@EventHandler
public void onPlayerInteract(PlayerInteractEvent e) {
Added AuthMe support Closes #64
2017-03-17 14:36:24 +01:00
if (config.enable_authme_integration && plugin.hasAuthMe() && !AuthMe.getApi().isAuthenticated(e.getPlayer())) return;
Added command "/shop open" to open shops Shift-click no longer works anywhere to open a shop.
2017-03-21 15:03:12 +01:00
handleInteractEvent(e);
Add hologram interaction (configurable)
2016-11-18 17:32:52 +01:00
}
@EventHandler
public void onPlayerInteractAtEntity(PlayerInteractAtEntityEvent e) {
if (!plugin.getShopChestConfig().enable_hologram_interaction) return;
Entity entity = e.getRightClicked();
Player p = e.getPlayer();
Added AuthMe support Closes #64
2017-03-17 14:36:24 +01:00
if (config.enable_authme_integration && plugin.hasAuthMe() && !AuthMe.getApi().isAuthenticated(p)) return;
Add hologram interaction (configurable)
2016-11-18 17:32:52 +01:00
Fix hologram interaction in 1.8.x
2016-11-19 21:34:29 +01:00
if (Utils.getMajorVersion() == 8 || e.getHand() == EquipmentSlot.HAND) {
Add hologram interaction (configurable)
2016-11-18 17:32:52 +01:00
if (entity instanceof ArmorStand) {
ArmorStand armorStand = (ArmorStand) entity;
if (Hologram.isPartOfHologram(armorStand)) {
Hologram hologram = Hologram.getHologram(armorStand);
if (hologram != null) {
Block b = null;
for (Shop shop : plugin.getShopUtils().getShops()) {
Improve performance while updating shops Inspired from the fork of @gonzalociocca but not exactly the same Closes #39
2017-01-04 17:07:00 +01:00
if (shop.getHologram() != null && shop.getHologram().equals(hologram)) {
Add hologram interaction (configurable)
2016-11-18 17:32:52 +01:00
b = shop.getLocation().getBlock();
}
}
if (b != null) {
Fix hologram interaction in 1.8.x
2016-11-19 21:34:29 +01:00
PlayerInteractEvent interactEvent = new PlayerInteractEvent(p, Action.RIGHT_CLICK_BLOCK, Utils.getPreferredItemInHand(p), b, null);
Added command "/shop open" to open shops Shift-click no longer works anywhere to open a shop.
2017-03-21 15:03:12 +01:00
handleInteractEvent(interactEvent);
Add hologram interaction (configurable)
2016-11-18 17:32:52 +01:00
}
}
}
}
}
}
@EventHandler
public void onPlayerDamageEntity(EntityDamageByEntityEvent e) {
if (!plugin.getShopChestConfig().enable_hologram_interaction) return;
Entity entity = e.getEntity();
Entity damager = e.getDamager();
if (!(damager instanceof Player)) return;
Player p = (Player) damager;
Added AuthMe support Closes #64
2017-03-17 14:36:24 +01:00
if (config.enable_authme_integration && plugin.hasAuthMe() && !AuthMe.getApi().isAuthenticated(p)) return;
Add hologram interaction (configurable)
2016-11-18 17:32:52 +01:00
if (entity instanceof ArmorStand) {
ArmorStand armorStand = (ArmorStand) entity;
if (Hologram.isPartOfHologram(armorStand)) {
Hologram hologram = Hologram.getHologram(armorStand);
if (hologram != null) {
Block b = null;
for (Shop shop : plugin.getShopUtils().getShops()) {
Improve performance while updating shops Inspired from the fork of @gonzalociocca but not exactly the same Closes #39
2017-01-04 17:07:00 +01:00
if (shop.getHologram() != null && shop.getHologram().equals(hologram)) {
Add hologram interaction (configurable)
2016-11-18 17:32:52 +01:00
b = shop.getLocation().getBlock();
}
}
Automated code cleanup by IntelliJ IDEA As I Switched from Eclipse to IntelliJ IDEA, I also had to add a few entries to the .gitignore file.
2016-05-28 15:47:57 +02:00
Add hologram interaction (configurable)
2016-11-18 17:32:52 +01:00
if (b != null) {
Fix hologram interaction in 1.8.x
2016-11-19 21:34:29 +01:00
PlayerInteractEvent interactEvent = new PlayerInteractEvent(p, Action.LEFT_CLICK_BLOCK, Utils.getPreferredItemInHand(p), b, null);
Added command "/shop open" to open shops Shift-click no longer works anywhere to open a shop.
2017-03-21 15:03:12 +01:00
handleInteractEvent(interactEvent);
Fix hologram interaction in 1.8.x
2016-11-19 21:34:29 +01:00
e.setCancelled(true);
Add hologram interaction (configurable)
2016-11-18 17:32:52 +01:00
}
}
}
}
Automated code cleanup by IntelliJ IDEA As I Switched from Eclipse to IntelliJ IDEA, I also had to add a few entries to the .gitignore file.
2016-05-28 15:47:57 +02:00
}
Added Javadoc
2016-06-30 21:59:06 +02:00
/**
* Create a new shop
*
* @param executor Player, who executed the command, will receive the message and become the vendor of the shop
* @param location Where the shop will be located
* @param product Product of the Shop
* @param buyPrice Buy price
* @param sellPrice Sell price
* @param shopType Type of the shop
*/
Query and update SQL database asynchronously
2017-02-08 17:02:03 +01:00
private void create(final Player executor, final Location location, final ItemStack product, final double buyPrice, final double sellPrice, final ShopType shopType) {
Added debug log (in file) - Added debug log (configurable) - Added "message.noPermission.create-protected" - A bit code cleanup - Renamed "Commands" to "ShopCommand"
2016-08-03 13:49:31 +02:00
plugin.debug(executor.getName() + " is creating new shop...");
Check database connection before accessing it This hopefully fixes #7
2016-07-01 14:28:31 +02:00
Improved database interaction
2017-02-09 21:51:39 +01:00
double creationPrice = (shopType == ShopType.NORMAL) ? config.shop_creation_price_normal : config.shop_creation_price_admin;
Shop shop = new Shop(plugin, executor, product, location, buyPrice, sellPrice, shopType);
Added Events for new API Javadoc will be added later
2016-07-05 18:41:31 +02:00
Improved database interaction
2017-02-09 21:51:39 +01:00
ShopCreateEvent event = new ShopCreateEvent(executor, shop, creationPrice);
Bukkit.getPluginManager().callEvent(event);
Added Events for new API Javadoc will be added later
2016-07-05 18:41:31 +02:00
Improved database interaction
2017-02-09 21:51:39 +01:00
if (event.isCancelled()) {
plugin.debug("Create event cancelled");
return;
}
Creation price should only be withdrawn if the shop is created successfully
2016-07-01 14:33:13 +02:00
Improved database interaction
2017-02-09 21:51:39 +01:00
EconomyResponse r = plugin.getEconomy().withdrawPlayer(executor, location.getWorld().getName(), creationPrice);
if (!r.transactionSuccess()) {
plugin.debug("Economy transaction failed: " + r.errorMessage);
Added notification for withdrawal of shop creation price
2017-06-05 13:39:01 +02:00
executor.sendMessage(LanguageUtils.getMessage(LocalizedMessage.Message.ERROR_OCCURRED,
new LocalizedMessage.ReplacedPlaceholder(Placeholder.ERROR, r.errorMessage)));
Improved database interaction
2017-02-09 21:51:39 +01:00
return;
}
Automated code cleanup by IntelliJ IDEA As I Switched from Eclipse to IntelliJ IDEA, I also had to add a few entries to the .gitignore file.
2016-05-28 15:47:57 +02:00
Reduced amount of log messages
2017-04-10 20:01:47 +02:00
shop.create(true);
Automated code cleanup by IntelliJ IDEA As I Switched from Eclipse to IntelliJ IDEA, I also had to add a few entries to the .gitignore file.
2016-05-28 15:47:57 +02:00
Improved database interaction
2017-02-09 21:51:39 +01:00
plugin.debug("Shop created");
shopUtils.addShop(shop, true);
Query and update SQL database asynchronously
2017-02-08 17:02:03 +01:00
Added notification for withdrawal of shop creation price
2017-06-05 13:39:01 +02:00
LocalizedMessage.ReplacedPlaceholder placeholder = new LocalizedMessage.ReplacedPlaceholder(
Placeholder.CREATION_PRICE, String.valueOf(creationPrice));
if (shopType == ShopType.ADMIN) {
executor.sendMessage(LanguageUtils.getMessage(LocalizedMessage.Message.ADMIN_SHOP_CREATED, placeholder));
} else {
executor.sendMessage(LanguageUtils.getMessage(LocalizedMessage.Message.SHOP_CREATED, placeholder));
}
Improved database interaction
2017-02-09 21:51:39 +01:00
for (Player p : location.getWorld().getPlayers()) {
if (p.getLocation().distanceSquared(location) <= Math.pow(config.maximal_distance, 2)) {
if (shop.getHologram() != null) {
shop.getHologram().showPlayer(p);
Fix NPEs caused by non-existent Shop Items
2016-11-12 15:17:13 +01:00
}
Show shop item and hologram on creation
2016-10-12 18:30:51 +02:00
}
Improved database interaction
2017-02-09 21:51:39 +01:00
if (p.getLocation().distanceSquared(location) <= Math.pow(config.maximal_item_distance, 2)) {
if (shop.getItem() != null) {
shop.getItem().setVisible(p, true);
}
}
}
Automated code cleanup by IntelliJ IDEA As I Switched from Eclipse to IntelliJ IDEA, I also had to add a few entries to the .gitignore file.
2016-05-28 15:47:57 +02:00
}
Added Javadoc
2016-06-30 21:59:06 +02:00
/**
* Remove a shop
* @param executor Player, who executed the command and will receive the message
* @param shop Shop to be removed
*/
Automated code cleanup by IntelliJ IDEA As I Switched from Eclipse to IntelliJ IDEA, I also had to add a few entries to the .gitignore file.
2016-05-28 15:47:57 +02:00
private void remove(Player executor, Shop shop) {
Fixed NPE while removing a shop when vendor is not online + Added missing javadoc parameter 'message' Fixes #91
2017-03-29 20:05:56 +02:00
plugin.debug(executor.getName() + " is removing " + shop.getVendor().getName() + "'s shop (#" + shop.getID() + ")");
Added Events for new API Javadoc will be added later
2016-07-05 18:41:31 +02:00
ShopRemoveEvent event = new ShopRemoveEvent(executor, shop);
Bukkit.getPluginManager().callEvent(event);
Added debug log (in file) - Added debug log (configurable) - Added "message.noPermission.create-protected" - A bit code cleanup - Renamed "Commands" to "ShopCommand"
2016-08-03 13:49:31 +02:00
if (event.isCancelled()) {
plugin.debug("Remove event cancelled (#" + shop.getID() + ")");
return;
}
Added Events for new API Javadoc will be added later
2016-07-05 18:41:31 +02:00
ShopUtils no longer contains static methods
2016-07-13 15:03:54 +02:00
shopUtils.removeShop(shop, true);
Added debug log (in file) - Added debug log (configurable) - Added "message.noPermission.create-protected" - A bit code cleanup - Renamed "Commands" to "ShopCommand"
2016-08-03 13:49:31 +02:00
plugin.debug("Removed shop (#" + shop.getID() + ")");
Added configurable language for everything and more This can read the default minecraft language files, but in order to translate the messages, you need to add the message section from the en_US.lang. Also, spawn eggs will work now, the title of music discs will be displayed in the info sections and "tipped arrow effect" is now named "potion effect" and is displayed also if the product is a potion, splashed potion or a lingering potion (and of course tipped arrows). The message configuration is no longer found in the config.yml file, but has gone to the .lang file, so you need to reconfigure every message! As the Jsoup library is no longer needed, the filesize of the final jar shrunk quite a bit. Maybe there are some more changes, which I already forgot.
2016-06-22 20:51:19 +02:00
executor.sendMessage(LanguageUtils.getMessage(LocalizedMessage.Message.SHOP_REMOVED));
Automated code cleanup by IntelliJ IDEA As I Switched from Eclipse to IntelliJ IDEA, I also had to add a few entries to the .gitignore file.
2016-05-28 15:47:57 +02:00
}
Added command "/shop open" to open shops Shift-click no longer works anywhere to open a shop.
2017-03-21 15:03:12 +01:00
/**
* Open a shop
* @param executor Player, who executed the command and will receive the message
* @param shop Shop to be opened
Fixed NPE while removing a shop when vendor is not online + Added missing javadoc parameter 'message' Fixes #91
2017-03-29 20:05:56 +02:00
* @param message Whether the player should receive the {@link LocalizedMessage.Message#OPENED_SHOP} message
Added command "/shop open" to open shops Shift-click no longer works anywhere to open a shop.
2017-03-21 15:03:12 +01:00
*/
private void open(Player executor, Shop shop, boolean message) {
plugin.debug(executor.getName() + " is opening " + shop.getVendor().getName() + "'s shop (#" + shop.getID() + ")");
ShopOpenEvent event = new ShopOpenEvent(executor, shop);
Bukkit.getPluginManager().callEvent(event);
if (event.isCancelled()) {
plugin.debug("Open event cancelled (#" + shop.getID() + ")");
return;
}
executor.openInventory(shop.getInventoryHolder().getInventory());
plugin.debug("Opened shop (#" + shop.getID() + ")");
Fixed refund if economy transactions fail
2017-06-08 11:31:23 +02:00
if (message) executor.sendMessage(LanguageUtils.getMessage(LocalizedMessage.Message.OPENED_SHOP,
new LocalizedMessage.ReplacedPlaceholder(Placeholder.VENDOR, shop.getVendor().getName())));
Added command "/shop open" to open shops Shift-click no longer works anywhere to open a shop.
2017-03-21 15:03:12 +01:00
}
Added Javadoc
2016-06-30 21:59:06 +02:00
/**
*
* @param executor Player, who executed the command and will retrieve the information
* @param shop Shop from which the information will be retrieved
*/
Automated code cleanup by IntelliJ IDEA As I Switched from Eclipse to IntelliJ IDEA, I also had to add a few entries to the .gitignore file.
2016-05-28 15:47:57 +02:00
private void info(Player executor, Shop shop) {
Added debug log (in file) - Added debug log (configurable) - Added "message.noPermission.create-protected" - A bit code cleanup - Renamed "Commands" to "ShopCommand"
2016-08-03 13:49:31 +02:00
plugin.debug(executor.getName() + " is retrieving shop info (#" + shop.getID() + ")");
Added Events for new API Javadoc will be added later
2016-07-05 18:41:31 +02:00
ShopInfoEvent event = new ShopInfoEvent(executor, shop);
Bukkit.getPluginManager().callEvent(event);
Added book generation to shop info message
2017-04-16 18:31:50 +02:00
Added debug log (in file) - Added debug log (configurable) - Added "message.noPermission.create-protected" - A bit code cleanup - Renamed "Commands" to "ShopCommand"
2016-08-03 13:49:31 +02:00
if (event.isCancelled()) {
plugin.debug("Info event cancelled (#" + shop.getID() + ")");
return;
}
Added book generation to shop info message
2017-04-16 18:31:50 +02:00
Automated code cleanup by IntelliJ IDEA As I Switched from Eclipse to IntelliJ IDEA, I also had to add a few entries to the .gitignore file.
2016-05-28 15:47:57 +02:00
Chest c = (Chest) shop.getLocation().getBlock().getState();
Improved and simplified buy and sell methods Well, at least I hope I've improved that... This should also fix the bug (what initially was my goal), where the item didn't get removed from the player's inventory after selling it.
2016-05-31 18:07:38 +02:00
int amount = Utils.getAmount(c.getInventory(), shop.getProduct());
Added configurable language for everything and more This can read the default minecraft language files, but in order to translate the messages, you need to add the message section from the en_US.lang. Also, spawn eggs will work now, the title of music discs will be displayed in the info sections and "tipped arrow effect" is now named "potion effect" and is displayed also if the product is a potion, splashed potion or a lingering potion (and of course tipped arrows). The message configuration is no longer found in the config.yml file, but has gone to the .lang file, so you need to reconfigure every message! As the Jsoup library is no longer needed, the filesize of the final jar shrunk quite a bit. Maybe there are some more changes, which I already forgot.
2016-06-22 20:51:19 +02:00
Material type = shop.getProduct().getType();
Automated code cleanup by IntelliJ IDEA As I Switched from Eclipse to IntelliJ IDEA, I also had to add a few entries to the .gitignore file.
2016-05-28 15:47:57 +02:00
Added book generation to shop info message
2017-04-16 18:31:50 +02:00
String vendorName = (shop.getVendor().getName() == null ?
shop.getVendor().getUniqueId().toString() : shop.getVendor().getName());
String vendorString = LanguageUtils.getMessage(LocalizedMessage.Message.SHOP_INFO_VENDOR,
Improved configuration of command description messages + Renamed all occurrences of "regex" to "placeholder"
2017-06-02 14:37:11 +02:00
new LocalizedMessage.ReplacedPlaceholder(Placeholder.VENDOR, vendorName));
Added book generation to shop info message
2017-04-16 18:31:50 +02:00
String productString = LanguageUtils.getMessage(LocalizedMessage.Message.SHOP_INFO_PRODUCT,
Improved configuration of command description messages + Renamed all occurrences of "regex" to "placeholder"
2017-06-02 14:37:11 +02:00
new LocalizedMessage.ReplacedPlaceholder(Placeholder.AMOUNT, String.valueOf(shop.getProduct().getAmount())),
new LocalizedMessage.ReplacedPlaceholder(Placeholder.ITEM_NAME, LanguageUtils.getItemName(shop.getProduct())));
Added book generation to shop info message
2017-04-16 18:31:50 +02:00
Automated code cleanup by IntelliJ IDEA As I Switched from Eclipse to IntelliJ IDEA, I also had to add a few entries to the .gitignore file.
2016-05-28 15:47:57 +02:00
String enchantmentString = "";
Added configurable language for everything and more This can read the default minecraft language files, but in order to translate the messages, you need to add the message section from the en_US.lang. Also, spawn eggs will work now, the title of music discs will be displayed in the info sections and "tipped arrow effect" is now named "potion effect" and is displayed also if the product is a potion, splashed potion or a lingering potion (and of course tipped arrows). The message configuration is no longer found in the config.yml file, but has gone to the .lang file, so you need to reconfigure every message! As the Jsoup library is no longer needed, the filesize of the final jar shrunk quite a bit. Maybe there are some more changes, which I already forgot.
2016-06-22 20:51:19 +02:00
String potionEffectString = "";
Added book generation to shop info message
2017-04-16 18:31:50 +02:00
String bookGenerationString = "";
String musicDiscTitleString = "";
Display "Disabled" instead of 0$ when selling/buying is disabled
2016-09-06 11:43:01 +02:00
String disabled = LanguageUtils.getMessage(LocalizedMessage.Message.SHOP_INFO_DISABLED);
Added book generation to shop info message
2017-04-16 18:31:50 +02:00
String priceString = LanguageUtils.getMessage(LocalizedMessage.Message.SHOP_INFO_PRICE,
Improved configuration of command description messages + Renamed all occurrences of "regex" to "placeholder"
2017-06-02 14:37:11 +02:00
new LocalizedMessage.ReplacedPlaceholder(Placeholder.BUY_PRICE, (shop.getBuyPrice() > 0 ? String.valueOf(shop.getBuyPrice()) : disabled)),
new LocalizedMessage.ReplacedPlaceholder(Placeholder.SELL_PRICE, (shop.getSellPrice() > 0 ? String.valueOf(shop.getSellPrice()) : disabled)));
Added book generation to shop info message
2017-04-16 18:31:50 +02:00
String shopType = LanguageUtils.getMessage(shop.getShopType() == ShopType.NORMAL ?
LocalizedMessage.Message.SHOP_INFO_NORMAL : LocalizedMessage.Message.SHOP_INFO_ADMIN);
String stock = LanguageUtils.getMessage(LocalizedMessage.Message.SHOP_INFO_STOCK,
Improved configuration of command description messages + Renamed all occurrences of "regex" to "placeholder"
2017-06-02 14:37:11 +02:00
new LocalizedMessage.ReplacedPlaceholder(Placeholder.STOCK, String.valueOf(amount)));
Now displays if a potion is extended
2016-08-05 22:16:14 +02:00
Vastly extended hologram configuration - You can now completely customize every part of the hologram - Added new placeholders "%STOCK%" and "%MAX-STACK%" => Now uses "%STOCK%" instead of "%AMOUNT%" in the in-stock message) - Armor Stands are no longer spawned with NMS and reflection - Hologram texts can dynamically change (e.g. with in-stock info) - Might contain a few issues
2017-05-20 20:10:07 +02:00
String potionEffectName = LanguageUtils.getPotionEffectName(shop.getProduct());
Added book generation to shop info message
2017-04-16 18:31:50 +02:00
if (potionEffectName.length() > 0) {
Vastly extended hologram configuration - You can now completely customize every part of the hologram - Added new placeholders "%STOCK%" and "%MAX-STACK%" => Now uses "%STOCK%" instead of "%AMOUNT%" in the in-stock message) - Armor Stands are no longer spawned with NMS and reflection - Hologram texts can dynamically change (e.g. with in-stock info) - Might contain a few issues
2017-05-20 20:10:07 +02:00
boolean potionExtended = ItemUtils.isExtendedPotion(shop.getProduct());
Added book generation to shop info message
2017-04-16 18:31:50 +02:00
String extended = potionExtended ? LanguageUtils.getMessage(LocalizedMessage.Message.SHOP_INFO_EXTENDED) : "";
potionEffectString = LanguageUtils.getMessage(LocalizedMessage.Message.SHOP_INFO_POTION_EFFECT,
Improved configuration of command description messages + Renamed all occurrences of "regex" to "placeholder"
2017-06-02 14:37:11 +02:00
new LocalizedMessage.ReplacedPlaceholder(Placeholder.POTION_EFFECT, potionEffectName),
new LocalizedMessage.ReplacedPlaceholder(Placeholder.EXTENDED, extended));
Added configurable language for everything and more This can read the default minecraft language files, but in order to translate the messages, you need to add the message section from the en_US.lang. Also, spawn eggs will work now, the title of music discs will be displayed in the info sections and "tipped arrow effect" is now named "potion effect" and is displayed also if the product is a potion, splashed potion or a lingering potion (and of course tipped arrows). The message configuration is no longer found in the config.yml file, but has gone to the .lang file, so you need to reconfigure every message! As the Jsoup library is no longer needed, the filesize of the final jar shrunk quite a bit. Maybe there are some more changes, which I already forgot.
2016-06-22 20:51:19 +02:00
}
Added book generation to shop info message
2017-04-16 18:31:50 +02:00
if (type == Material.WRITTEN_BOOK) {
BookMeta meta = (BookMeta) shop.getProduct().getItemMeta();
CustomBookMeta.Generation generation = CustomBookMeta.Generation.TATTERED;
Added configurable language for everything and more This can read the default minecraft language files, but in order to translate the messages, you need to add the message section from the en_US.lang. Also, spawn eggs will work now, the title of music discs will be displayed in the info sections and "tipped arrow effect" is now named "potion effect" and is displayed also if the product is a potion, splashed potion or a lingering potion (and of course tipped arrows). The message configuration is no longer found in the config.yml file, but has gone to the .lang file, so you need to reconfigure every message! As the Jsoup library is no longer needed, the filesize of the final jar shrunk quite a bit. Maybe there are some more changes, which I already forgot.
2016-06-22 20:51:19 +02:00
Added book generation to shop info message
2017-04-16 18:31:50 +02:00
if ((Utils.getMajorVersion() == 9 && Utils.getRevision() == 1) || Utils.getMajorVersion() == 8) {
CustomBookMeta.Generation gen = CustomBookMeta.getGeneration(shop.getProduct());
generation = (gen == null ? CustomBookMeta.Generation.ORIGINAL : gen);
} else if (Utils.getMajorVersion() >= 10) {
if (meta.hasGeneration()) {
generation = CustomBookMeta.Generation.valueOf(meta.getGeneration().toString());
} else {
generation = CustomBookMeta.Generation.ORIGINAL;
}
}
bookGenerationString = LanguageUtils.getMessage(LocalizedMessage.Message.SHOP_INFO_BOOK_GENERATION,
Improved configuration of command description messages + Renamed all occurrences of "regex" to "placeholder"
2017-06-02 14:37:11 +02:00
new LocalizedMessage.ReplacedPlaceholder(Placeholder.GENERATION, LanguageUtils.getBookGenerationName(generation)));
Added book generation to shop info message
2017-04-16 18:31:50 +02:00
}
String musicDiscName = LanguageUtils.getMusicDiscName(type);
if (musicDiscName.length() > 0) {
musicDiscTitleString = LanguageUtils.getMessage(LocalizedMessage.Message.SHOP_INFO_MUSIC_TITLE,
Improved configuration of command description messages + Renamed all occurrences of "regex" to "placeholder"
2017-06-02 14:37:11 +02:00
new LocalizedMessage.ReplacedPlaceholder(Placeholder.MUSIC_TITLE, musicDiscName));
Added book generation to shop info message
2017-04-16 18:31:50 +02:00
}
Vastly extended hologram configuration - You can now completely customize every part of the hologram - Added new placeholders "%STOCK%" and "%MAX-STACK%" => Now uses "%STOCK%" instead of "%AMOUNT%" in the in-stock message) - Armor Stands are no longer spawned with NMS and reflection - Hologram texts can dynamically change (e.g. with in-stock info) - Might contain a few issues
2017-05-20 20:10:07 +02:00
Map<Enchantment, Integer> enchantmentMap = ItemUtils.getEnchantments(shop.getProduct());
String enchantmentList = LanguageUtils.getEnchantmentString(enchantmentMap);
Automated code cleanup by IntelliJ IDEA As I Switched from Eclipse to IntelliJ IDEA, I also had to add a few entries to the .gitignore file.
2016-05-28 15:47:57 +02:00
Added book generation to shop info message
2017-04-16 18:31:50 +02:00
if (enchantmentList.length() > 0) {
enchantmentString = LanguageUtils.getMessage(LocalizedMessage.Message.SHOP_INFO_ENCHANTMENTS,
Improved configuration of command description messages + Renamed all occurrences of "regex" to "placeholder"
2017-06-02 14:37:11 +02:00
new LocalizedMessage.ReplacedPlaceholder(Placeholder.ENCHANTMENT, enchantmentList));
Added book generation to shop info message
2017-04-16 18:31:50 +02:00
}
Automated code cleanup by IntelliJ IDEA As I Switched from Eclipse to IntelliJ IDEA, I also had to add a few entries to the .gitignore file.
2016-05-28 15:47:57 +02:00
executor.sendMessage(" ");
Added book generation to shop info message
2017-04-16 18:31:50 +02:00
if (shop.getShopType() != ShopType.ADMIN) executor.sendMessage(vendorString);
executor.sendMessage(productString);
Hide vendor and in-stock in info message if Admin Shop
2016-06-08 16:08:49 +02:00
if (shop.getShopType() != ShopType.ADMIN) executor.sendMessage(stock);
Added book generation to shop info message
2017-04-16 18:31:50 +02:00
if (enchantmentString.length() > 0) executor.sendMessage(enchantmentString);
if (potionEffectString.length() > 0) executor.sendMessage(potionEffectString);
if (musicDiscTitleString.length() > 0) executor.sendMessage(musicDiscTitleString);
if (bookGenerationString.length() > 0) executor.sendMessage(bookGenerationString);
executor.sendMessage(priceString);
Automated code cleanup by IntelliJ IDEA As I Switched from Eclipse to IntelliJ IDEA, I also had to add a few entries to the .gitignore file.
2016-05-28 15:47:57 +02:00
executor.sendMessage(shopType);
executor.sendMessage(" ");
}
Added Javadoc
2016-06-30 21:59:06 +02:00
/**
* A player buys from a shop
* @param executor Player, who executed the command and will buy the product
* @param shop Shop, from which the player buys
Added shift-click to buy stack Closes #85
2017-03-21 15:40:23 +01:00
* @param stack Whether a whole stack should be bought
Added Javadoc
2016-06-30 21:59:06 +02:00
*/
Added shift-click to buy stack Closes #85
2017-03-21 15:40:23 +01:00
private void buy(Player executor, Shop shop, boolean stack) {
Added debug log (in file) - Added debug log (configurable) - Added "message.noPermission.create-protected" - A bit code cleanup - Renamed "Commands" to "ShopCommand"
2016-08-03 13:49:31 +02:00
plugin.debug(executor.getName() + " is buying (#" + shop.getID() + ")");
Added way to auto calculate item amount You can find an explanation here: - https://www.spigotmc.org/threads/shopchest.87948/page-15#post-1820672 - In the configuration file
2016-08-16 15:06:26 +02:00
Added shift-click to buy stack Closes #85
2017-03-21 15:40:23 +01:00
int amount = shop.getProduct().getAmount();
if (stack) amount = shop.getProduct().getMaxStackSize();
Fixed support for multi-world economy plugins
2017-06-02 14:56:34 +02:00
String worldName = shop.getLocation().getWorld().getName();
Added shift-click to buy stack Closes #85
2017-03-21 15:40:23 +01:00
double price = shop.getBuyPrice();
if (stack) price = (price / shop.getProduct().getAmount()) * amount;
Fixed support for multi-world economy plugins
2017-06-02 14:56:34 +02:00
if (econ.getBalance(executor, worldName) >= price || config.auto_calculate_item_amount) {
Added shift-click to buy stack Closes #85
2017-03-21 15:40:23 +01:00
Fixed support for multi-world economy plugins
2017-06-02 14:56:34 +02:00
int amountForMoney = (int) (amount / price * econ.getBalance(executor, worldName));
Added way to auto calculate item amount You can find an explanation here: - https://www.spigotmc.org/threads/shopchest.87948/page-15#post-1820672 - In the configuration file
2016-08-16 15:06:26 +02:00
if (amountForMoney == 0 && config.auto_calculate_item_amount) {
executor.sendMessage(LanguageUtils.getMessage(LocalizedMessage.Message.NOT_ENOUGH_MONEY));
return;
}
plugin.debug(executor.getName() + " has enough money for " + amountForMoney + " item(s) (#" + shop.getID() + ")");
Automated code cleanup by IntelliJ IDEA As I Switched from Eclipse to IntelliJ IDEA, I also had to add a few entries to the .gitignore file.
2016-05-28 15:47:57 +02:00
Block b = shop.getLocation().getBlock();
Chest c = (Chest) b.getState();
Fixed admin shops
2016-08-17 13:14:35 +02:00
int amountForChestItems = Utils.getAmount(c.getInventory(), shop.getProduct());
Added way to auto calculate item amount You can find an explanation here: - https://www.spigotmc.org/threads/shopchest.87948/page-15#post-1820672 - In the configuration file
2016-08-16 15:06:26 +02:00
Added shift-click to buy stack Closes #85
2017-03-21 15:40:23 +01:00
if (amountForChestItems == 0 && shop.getShopType() != ShopType.ADMIN) {
Added way to auto calculate item amount You can find an explanation here: - https://www.spigotmc.org/threads/shopchest.87948/page-15#post-1820672 - In the configuration file
2016-08-16 15:06:26 +02:00
executor.sendMessage(LanguageUtils.getMessage(LocalizedMessage.Message.OUT_OF_STOCK));
return;
}
Improved and simplified buy and sell methods Well, at least I hope I've improved that... This should also fix the bug (what initially was my goal), where the item didn't get removed from the player's inventory after selling it.
2016-05-31 18:07:38 +02:00
ItemStack product = new ItemStack(shop.getProduct());
Added shift-click to buy stack Closes #85
2017-03-21 15:40:23 +01:00
if (stack) product.setAmount(amount);
Automated code cleanup by IntelliJ IDEA As I Switched from Eclipse to IntelliJ IDEA, I also had to add a few entries to the .gitignore file.
2016-05-28 15:47:57 +02:00
Inventory inventory = executor.getInventory();
Added way to auto calculate item amount You can find an explanation here: - https://www.spigotmc.org/threads/shopchest.87948/page-15#post-1820672 - In the configuration file
2016-08-16 15:06:26 +02:00
int freeSpace = Utils.getFreeSpaceForItem(inventory, product);
Automated code cleanup by IntelliJ IDEA As I Switched from Eclipse to IntelliJ IDEA, I also had to add a few entries to the .gitignore file.
2016-05-28 15:47:57 +02:00
Added shift-click to buy stack Closes #85
2017-03-21 15:40:23 +01:00
if (freeSpace == 0) {
Added way to auto calculate item amount You can find an explanation here: - https://www.spigotmc.org/threads/shopchest.87948/page-15#post-1820672 - In the configuration file
2016-08-16 15:06:26 +02:00
executor.sendMessage(LanguageUtils.getMessage(LocalizedMessage.Message.NOT_ENOUGH_INVENTORY_SPACE));
return;
Automated code cleanup by IntelliJ IDEA As I Switched from Eclipse to IntelliJ IDEA, I also had to add a few entries to the .gitignore file.
2016-05-28 15:47:57 +02:00
}
Added shift-click to buy stack Closes #85
2017-03-21 15:40:23 +01:00
int newAmount = amount;
Fixed admin shops
2016-08-17 13:14:35 +02:00
if (config.auto_calculate_item_amount) {
if (shop.getShopType() == ShopType.ADMIN)
newAmount = Math.min(amountForMoney, freeSpace);
else
newAmount = Math.min(Math.min(amountForMoney, amountForChestItems), freeSpace);
}
Added shift-click to buy stack Closes #85
2017-03-21 15:40:23 +01:00
if (newAmount > amount) newAmount = amount;
Automated code cleanup by IntelliJ IDEA As I Switched from Eclipse to IntelliJ IDEA, I also had to add a few entries to the .gitignore file.
2016-05-28 15:47:57 +02:00
Added shift-click to buy stack Closes #85
2017-03-21 15:40:23 +01:00
double newPrice = (price / amount) * newAmount;
Added way to auto calculate item amount You can find an explanation here: - https://www.spigotmc.org/threads/shopchest.87948/page-15#post-1820672 - In the configuration file
2016-08-16 15:06:26 +02:00
Added shift-click to buy stack Closes #85
2017-03-21 15:40:23 +01:00
if (freeSpace >= newAmount) {
Added way to auto calculate item amount You can find an explanation here: - https://www.spigotmc.org/threads/shopchest.87948/page-15#post-1820672 - In the configuration file
2016-08-16 15:06:26 +02:00
plugin.debug(executor.getName() + " has enough inventory space for " + freeSpace + " items (#" + shop.getID() + ")");
ItemStack newProduct = new ItemStack(product);
newProduct.setAmount(newAmount);
Add support for per-world-economy plugins The money will be withdrawn or deposited on the world of the shop
2016-11-23 16:11:07 +01:00
EconomyResponse r = econ.withdrawPlayer(executor, worldName, newPrice);
Automated code cleanup by IntelliJ IDEA As I Switched from Eclipse to IntelliJ IDEA, I also had to add a few entries to the .gitignore file.
2016-05-28 15:47:57 +02:00
if (r.transactionSuccess()) {
Add support for per-world-economy plugins The money will be withdrawn or deposited on the world of the shop
2016-11-23 16:11:07 +01:00
EconomyResponse r2 = (shop.getShopType() != ShopType.ADMIN) ? econ.depositPlayer(shop.getVendor(), worldName, newPrice) : null;
Slightly improved economy transactions - Only start the second economy transaction after the first one succeeds - Undo the first transaction if the second one fails
2016-09-07 17:00:59 +02:00
Automated code cleanup by IntelliJ IDEA As I Switched from Eclipse to IntelliJ IDEA, I also had to add a few entries to the .gitignore file.
2016-05-28 15:47:57 +02:00
if (r2 != null) {
if (r2.transactionSuccess()) {
Added way to auto calculate item amount You can find an explanation here: - https://www.spigotmc.org/threads/shopchest.87948/page-15#post-1820672 - In the configuration file
2016-08-16 15:06:26 +02:00
ShopBuySellEvent event = new ShopBuySellEvent(executor, shop, ShopBuySellEvent.Type.BUY, newAmount, newPrice);
Added Events for new API Javadoc will be added later
2016-07-05 18:41:31 +02:00
Bukkit.getPluginManager().callEvent(event);
if (event.isCancelled()) {
Fixed support for multi-world economy plugins
2017-06-02 14:56:34 +02:00
econ.depositPlayer(executor, worldName, newPrice);
econ.withdrawPlayer(shop.getVendor(), worldName, newPrice);
Added debug log (in file) - Added debug log (configurable) - Added "message.noPermission.create-protected" - A bit code cleanup - Renamed "Commands" to "ShopCommand"
2016-08-03 13:49:31 +02:00
plugin.debug("Buy event cancelled (#" + shop.getID() + ")");
Added Events for new API Javadoc will be added later
2016-07-05 18:41:31 +02:00
return;
}
Query and update SQL database asynchronously
2017-02-08 17:02:03 +01:00
database.logEconomy(executor, newProduct, shop.getVendor(), shop.getShopType(), shop.getLocation(), newPrice, ShopBuySellEvent.Type.BUY, null);
Added economy log in database file Closes #19
2016-08-18 13:30:14 +02:00
Added way to auto calculate item amount You can find an explanation here: - https://www.spigotmc.org/threads/shopchest.87948/page-15#post-1820672 - In the configuration file
2016-08-16 15:06:26 +02:00
addToInventory(inventory, newProduct);
removeFromInventory(c.getInventory(), newProduct);
Improved and simplified buy and sell methods Well, at least I hope I've improved that... This should also fix the bug (what initially was my goal), where the item didn't get removed from the player's inventory after selling it.
2016-05-31 18:07:38 +02:00
executor.updateInventory();
Display UUID when a vendor's name is not found
2016-08-19 12:48:11 +02:00
String vendorName = (shop.getVendor().getName() == null ? shop.getVendor().getUniqueId().toString() : shop.getVendor().getName());
Improved configuration of command description messages + Renamed all occurrences of "regex" to "placeholder"
2017-06-02 14:37:11 +02:00
executor.sendMessage(LanguageUtils.getMessage(LocalizedMessage.Message.BUY_SUCCESS, new LocalizedMessage.ReplacedPlaceholder(Placeholder.AMOUNT, String.valueOf(newAmount)),
new LocalizedMessage.ReplacedPlaceholder(Placeholder.ITEM_NAME, LanguageUtils.getItemName(product)), new LocalizedMessage.ReplacedPlaceholder(Placeholder.BUY_PRICE, String.valueOf(newPrice)),
new LocalizedMessage.ReplacedPlaceholder(Placeholder.VENDOR, vendorName)));
Improved and simplified buy and sell methods Well, at least I hope I've improved that... This should also fix the bug (what initially was my goal), where the item didn't get removed from the player's inventory after selling it.
2016-05-31 18:07:38 +02:00
Added debug log (in file) - Added debug log (configurable) - Added "message.noPermission.create-protected" - A bit code cleanup - Renamed "Commands" to "ShopCommand"
2016-08-03 13:49:31 +02:00
plugin.debug(executor.getName() + " successfully bought (#" + shop.getID() + ")");
Added way to disable vendor messages (= Messages that a vendor gets after players buy or sell something from/to his shop) Closes #33
2016-11-26 17:23:02 +01:00
if (shop.getVendor().isOnline() && config.enable_vendor_messages) {
Improved configuration of command description messages + Renamed all occurrences of "regex" to "placeholder"
2017-06-02 14:37:11 +02:00
shop.getVendor().getPlayer().sendMessage(LanguageUtils.getMessage(LocalizedMessage.Message.SOMEONE_BOUGHT, new LocalizedMessage.ReplacedPlaceholder(Placeholder.AMOUNT, String.valueOf(newAmount)),
new LocalizedMessage.ReplacedPlaceholder(Placeholder.ITEM_NAME, LanguageUtils.getItemName(product)), new LocalizedMessage.ReplacedPlaceholder(Placeholder.BUY_PRICE, String.valueOf(newPrice)),
new LocalizedMessage.ReplacedPlaceholder(Placeholder.PLAYER, executor.getName())));
Automated code cleanup by IntelliJ IDEA As I Switched from Eclipse to IntelliJ IDEA, I also had to add a few entries to the .gitignore file.
2016-05-28 15:47:57 +02:00
}
Improved and simplified buy and sell methods Well, at least I hope I've improved that... This should also fix the bug (what initially was my goal), where the item didn't get removed from the player's inventory after selling it.
2016-05-31 18:07:38 +02:00
Automated code cleanup by IntelliJ IDEA As I Switched from Eclipse to IntelliJ IDEA, I also had to add a few entries to the .gitignore file.
2016-05-28 15:47:57 +02:00
} else {
Slightly improved economy transactions - Only start the second economy transaction after the first one succeeds - Undo the first transaction if the second one fails
2016-09-07 17:00:59 +02:00
plugin.debug("Economy transaction failed (r2): " + r2.errorMessage + " (#" + shop.getID() + ")");
Improved configuration of command description messages + Renamed all occurrences of "regex" to "placeholder"
2017-06-02 14:37:11 +02:00
executor.sendMessage(LanguageUtils.getMessage(LocalizedMessage.Message.ERROR_OCCURRED, new LocalizedMessage.ReplacedPlaceholder(Placeholder.ERROR, r2.errorMessage)));
Fixed refund if economy transactions fail
2017-06-08 11:31:23 +02:00
econ.withdrawPlayer(shop.getVendor(), worldName, newPrice);
Fixed support for multi-world economy plugins
2017-06-02 14:56:34 +02:00
econ.depositPlayer(executor, worldName, newPrice);
Automated code cleanup by IntelliJ IDEA As I Switched from Eclipse to IntelliJ IDEA, I also had to add a few entries to the .gitignore file.
2016-05-28 15:47:57 +02:00
}
} else {
Added way to auto calculate item amount You can find an explanation here: - https://www.spigotmc.org/threads/shopchest.87948/page-15#post-1820672 - In the configuration file
2016-08-16 15:06:26 +02:00
ShopBuySellEvent event = new ShopBuySellEvent(executor, shop, ShopBuySellEvent.Type.BUY, newAmount, newPrice);
Added Events for new API Javadoc will be added later
2016-07-05 18:41:31 +02:00
Bukkit.getPluginManager().callEvent(event);
if (event.isCancelled()) {
Fixed support for multi-world economy plugins
2017-06-02 14:56:34 +02:00
econ.depositPlayer(executor, worldName, newPrice);
Added debug log (in file) - Added debug log (configurable) - Added "message.noPermission.create-protected" - A bit code cleanup - Renamed "Commands" to "ShopCommand"
2016-08-03 13:49:31 +02:00
plugin.debug("Buy event cancelled (#" + shop.getID() + ")");
Added Events for new API Javadoc will be added later
2016-07-05 18:41:31 +02:00
return;
}
Query and update SQL database asynchronously
2017-02-08 17:02:03 +01:00
database.logEconomy(executor, newProduct, shop.getVendor(), shop.getShopType(), shop.getLocation(), newPrice, ShopBuySellEvent.Type.BUY, null);
Added economy log in database file Closes #19
2016-08-18 13:30:14 +02:00
Added way to auto calculate item amount You can find an explanation here: - https://www.spigotmc.org/threads/shopchest.87948/page-15#post-1820672 - In the configuration file
2016-08-16 15:06:26 +02:00
addToInventory(inventory, newProduct);
Improved and simplified buy and sell methods Well, at least I hope I've improved that... This should also fix the bug (what initially was my goal), where the item didn't get removed from the player's inventory after selling it.
2016-05-31 18:07:38 +02:00
executor.updateInventory();
Fixed typos in message enum names
2017-06-05 15:13:26 +02:00
executor.sendMessage(LanguageUtils.getMessage(LocalizedMessage.Message.BUY_SUCCESS_ADMIN, new LocalizedMessage.ReplacedPlaceholder(Placeholder.AMOUNT, String.valueOf(newAmount)),
Improved configuration of command description messages + Renamed all occurrences of "regex" to "placeholder"
2017-06-02 14:37:11 +02:00
new LocalizedMessage.ReplacedPlaceholder(Placeholder.ITEM_NAME, LanguageUtils.getItemName(product)), new LocalizedMessage.ReplacedPlaceholder(Placeholder.BUY_PRICE, String.valueOf(newPrice))));
Added debug log (in file) - Added debug log (configurable) - Added "message.noPermission.create-protected" - A bit code cleanup - Renamed "Commands" to "ShopCommand"
2016-08-03 13:49:31 +02:00
plugin.debug(executor.getName() + " successfully bought (#" + shop.getID() + ")");
Automated code cleanup by IntelliJ IDEA As I Switched from Eclipse to IntelliJ IDEA, I also had to add a few entries to the .gitignore file.
2016-05-28 15:47:57 +02:00
}
} else {
Slightly improved economy transactions - Only start the second economy transaction after the first one succeeds - Undo the first transaction if the second one fails
2016-09-07 17:00:59 +02:00
plugin.debug("Economy transaction failed (r): " + r.errorMessage + " (#" + shop.getID() + ")");
Improved configuration of command description messages + Renamed all occurrences of "regex" to "placeholder"
2017-06-02 14:37:11 +02:00
executor.sendMessage(LanguageUtils.getMessage(LocalizedMessage.Message.ERROR_OCCURRED, new LocalizedMessage.ReplacedPlaceholder(Placeholder.ERROR, r.errorMessage)));
Fixed refund if economy transactions fail
2017-06-08 11:31:23 +02:00
econ.depositPlayer(executor, worldName, newPrice);
Automated code cleanup by IntelliJ IDEA As I Switched from Eclipse to IntelliJ IDEA, I also had to add a few entries to the .gitignore file.
2016-05-28 15:47:57 +02:00
}
} else {
Added configurable language for everything and more This can read the default minecraft language files, but in order to translate the messages, you need to add the message section from the en_US.lang. Also, spawn eggs will work now, the title of music discs will be displayed in the info sections and "tipped arrow effect" is now named "potion effect" and is displayed also if the product is a potion, splashed potion or a lingering potion (and of course tipped arrows). The message configuration is no longer found in the config.yml file, but has gone to the .lang file, so you need to reconfigure every message! As the Jsoup library is no longer needed, the filesize of the final jar shrunk quite a bit. Maybe there are some more changes, which I already forgot.
2016-06-22 20:51:19 +02:00
executor.sendMessage(LanguageUtils.getMessage(LocalizedMessage.Message.NOT_ENOUGH_INVENTORY_SPACE));
Automated code cleanup by IntelliJ IDEA As I Switched from Eclipse to IntelliJ IDEA, I also had to add a few entries to the .gitignore file.
2016-05-28 15:47:57 +02:00
}
} else {
Added configurable language for everything and more This can read the default minecraft language files, but in order to translate the messages, you need to add the message section from the en_US.lang. Also, spawn eggs will work now, the title of music discs will be displayed in the info sections and "tipped arrow effect" is now named "potion effect" and is displayed also if the product is a potion, splashed potion or a lingering potion (and of course tipped arrows). The message configuration is no longer found in the config.yml file, but has gone to the .lang file, so you need to reconfigure every message! As the Jsoup library is no longer needed, the filesize of the final jar shrunk quite a bit. Maybe there are some more changes, which I already forgot.
2016-06-22 20:51:19 +02:00
executor.sendMessage(LanguageUtils.getMessage(LocalizedMessage.Message.NOT_ENOUGH_MONEY));
Automated code cleanup by IntelliJ IDEA As I Switched from Eclipse to IntelliJ IDEA, I also had to add a few entries to the .gitignore file.
2016-05-28 15:47:57 +02:00
}
}
Added Javadoc
2016-06-30 21:59:06 +02:00
/**
* A player sells to a shop
* @param executor Player, who executed the command and will sell the product
* @param shop Shop, to which the player sells
*/
Added shift-click to sell stack Only works when a player does not have an axe in one of his hands. If he has, the shop will be broken/removed (if he has permission). Closes #84
2017-03-25 13:45:17 +01:00
private void sell(Player executor, Shop shop, boolean stack) {
Added debug log (in file) - Added debug log (configurable) - Added "message.noPermission.create-protected" - A bit code cleanup - Renamed "Commands" to "ShopCommand"
2016-08-03 13:49:31 +02:00
plugin.debug(executor.getName() + " is selling (#" + shop.getID() + ")");
Added shift-click to sell stack Only works when a player does not have an axe in one of his hands. If he has, the shop will be broken/removed (if he has permission). Closes #84
2017-03-25 13:45:17 +01:00
int amount = shop.getProduct().getAmount();
if (stack) amount = shop.getProduct().getMaxStackSize();
double price = shop.getSellPrice();
if (stack) price = (price / shop.getProduct().getAmount()) * amount;
Fixed support for multi-world economy plugins
2017-06-02 14:56:34 +02:00
String worldName = shop.getLocation().getWorld().getName();
if (econ.getBalance(shop.getVendor(), worldName) >= price || shop.getShopType() == ShopType.ADMIN || config.auto_calculate_item_amount) {
int amountForMoney = (int) (amount / price * econ.getBalance(shop.getVendor(), worldName));
Added way to auto calculate item amount You can find an explanation here: - https://www.spigotmc.org/threads/shopchest.87948/page-15#post-1820672 - In the configuration file
2016-08-16 15:06:26 +02:00
plugin.debug("Vendor has enough money for " + amountForMoney + " item(s) (#" + shop.getID() + ")");
Fixed admin shops
2016-08-17 13:14:35 +02:00
if (amountForMoney == 0 && config.auto_calculate_item_amount && shop.getShopType() != ShopType.ADMIN) {
Added way to auto calculate item amount You can find an explanation here: - https://www.spigotmc.org/threads/shopchest.87948/page-15#post-1820672 - In the configuration file
2016-08-16 15:06:26 +02:00
executor.sendMessage(LanguageUtils.getMessage(LocalizedMessage.Message.VENDOR_NOT_ENOUGH_MONEY));
return;
}
Automated code cleanup by IntelliJ IDEA As I Switched from Eclipse to IntelliJ IDEA, I also had to add a few entries to the .gitignore file.
2016-05-28 15:47:57 +02:00
Improved and simplified buy and sell methods Well, at least I hope I've improved that... This should also fix the bug (what initially was my goal), where the item didn't get removed from the player's inventory after selling it.
2016-05-31 18:07:38 +02:00
Block block = shop.getLocation().getBlock();
Chest chest = (Chest) block.getState();
Automated code cleanup by IntelliJ IDEA As I Switched from Eclipse to IntelliJ IDEA, I also had to add a few entries to the .gitignore file.
2016-05-28 15:47:57 +02:00
Added way to auto calculate item amount You can find an explanation here: - https://www.spigotmc.org/threads/shopchest.87948/page-15#post-1820672 - In the configuration file
2016-08-16 15:06:26 +02:00
int amountForItemCount = Utils.getAmount(executor.getInventory(), shop.getProduct());
Added shift-click to sell stack Only works when a player does not have an axe in one of his hands. If he has, the shop will be broken/removed (if he has permission). Closes #84
2017-03-25 13:45:17 +01:00
if (amountForItemCount == 0) {
Added way to auto calculate item amount You can find an explanation here: - https://www.spigotmc.org/threads/shopchest.87948/page-15#post-1820672 - In the configuration file
2016-08-16 15:06:26 +02:00
executor.sendMessage(LanguageUtils.getMessage(LocalizedMessage.Message.NOT_ENOUGH_ITEMS));
return;
}
Improved and simplified buy and sell methods Well, at least I hope I've improved that... This should also fix the bug (what initially was my goal), where the item didn't get removed from the player's inventory after selling it.
2016-05-31 18:07:38 +02:00
ItemStack product = new ItemStack(shop.getProduct());
Added shift-click to sell stack Only works when a player does not have an axe in one of his hands. If he has, the shop will be broken/removed (if he has permission). Closes #84
2017-03-25 13:45:17 +01:00
if (stack) product.setAmount(amount);
Improved and simplified buy and sell methods Well, at least I hope I've improved that... This should also fix the bug (what initially was my goal), where the item didn't get removed from the player's inventory after selling it.
2016-05-31 18:07:38 +02:00
Inventory inventory = chest.getInventory();
Automated code cleanup by IntelliJ IDEA As I Switched from Eclipse to IntelliJ IDEA, I also had to add a few entries to the .gitignore file.
2016-05-28 15:47:57 +02:00
Added way to auto calculate item amount You can find an explanation here: - https://www.spigotmc.org/threads/shopchest.87948/page-15#post-1820672 - In the configuration file
2016-08-16 15:06:26 +02:00
int freeSpace = Utils.getFreeSpaceForItem(inventory, product);
Added shift-click to sell stack Only works when a player does not have an axe in one of his hands. If he has, the shop will be broken/removed (if he has permission). Closes #84
2017-03-25 13:45:17 +01:00
if (freeSpace == 0 && shop.getShopType() != ShopType.ADMIN) {
Added way to auto calculate item amount You can find an explanation here: - https://www.spigotmc.org/threads/shopchest.87948/page-15#post-1820672 - In the configuration file
2016-08-16 15:06:26 +02:00
executor.sendMessage(LanguageUtils.getMessage(LocalizedMessage.Message.CHEST_NOT_ENOUGH_INVENTORY_SPACE));
return;
Improved and simplified buy and sell methods Well, at least I hope I've improved that... This should also fix the bug (what initially was my goal), where the item didn't get removed from the player's inventory after selling it.
2016-05-31 18:07:38 +02:00
}
Automated code cleanup by IntelliJ IDEA As I Switched from Eclipse to IntelliJ IDEA, I also had to add a few entries to the .gitignore file.
2016-05-28 15:47:57 +02:00
Added shift-click to sell stack Only works when a player does not have an axe in one of his hands. If he has, the shop will be broken/removed (if he has permission). Closes #84
2017-03-25 13:45:17 +01:00
int newAmount = amount;
Fixed admin shops
2016-08-17 13:14:35 +02:00
if (config.auto_calculate_item_amount) {
if (shop.getShopType() == ShopType.ADMIN)
newAmount = amountForItemCount;
else
Added shift-click to sell stack Only works when a player does not have an axe in one of his hands. If he has, the shop will be broken/removed (if he has permission). Closes #84
2017-03-25 13:45:17 +01:00
newAmount = Math.min(Math.min(amountForMoney, amountForItemCount), freeSpace);
Fixed admin shops
2016-08-17 13:14:35 +02:00
}
Added shift-click to sell stack Only works when a player does not have an axe in one of his hands. If he has, the shop will be broken/removed (if he has permission). Closes #84
2017-03-25 13:45:17 +01:00
if (newAmount > amount) newAmount = amount;
Added way to auto calculate item amount You can find an explanation here: - https://www.spigotmc.org/threads/shopchest.87948/page-15#post-1820672 - In the configuration file
2016-08-16 15:06:26 +02:00
Added shift-click to sell stack Only works when a player does not have an axe in one of his hands. If he has, the shop will be broken/removed (if he has permission). Closes #84
2017-03-25 13:45:17 +01:00
double newPrice = (price / amount) * newAmount;
Added way to auto calculate item amount You can find an explanation here: - https://www.spigotmc.org/threads/shopchest.87948/page-15#post-1820672 - In the configuration file
2016-08-16 15:06:26 +02:00
Added shift-click to sell stack Only works when a player does not have an axe in one of his hands. If he has, the shop will be broken/removed (if he has permission). Closes #84
2017-03-25 13:45:17 +01:00
if (freeSpace >= newAmount || shop.getShopType() == ShopType.ADMIN) {
Added way to auto calculate item amount You can find an explanation here: - https://www.spigotmc.org/threads/shopchest.87948/page-15#post-1820672 - In the configuration file
2016-08-16 15:06:26 +02:00
plugin.debug("Chest has enough inventory space for " + freeSpace + " items (#" + shop.getID() + ")");
ItemStack newProduct = new ItemStack(product);
newProduct.setAmount(newAmount);
Automated code cleanup by IntelliJ IDEA As I Switched from Eclipse to IntelliJ IDEA, I also had to add a few entries to the .gitignore file.
2016-05-28 15:47:57 +02:00
Add support for per-world-economy plugins The money will be withdrawn or deposited on the world of the shop
2016-11-23 16:11:07 +01:00
EconomyResponse r = econ.depositPlayer(executor, worldName, newPrice);
Automated code cleanup by IntelliJ IDEA As I Switched from Eclipse to IntelliJ IDEA, I also had to add a few entries to the .gitignore file.
2016-05-28 15:47:57 +02:00
Improved and simplified buy and sell methods Well, at least I hope I've improved that... This should also fix the bug (what initially was my goal), where the item didn't get removed from the player's inventory after selling it.
2016-05-31 18:07:38 +02:00
if (r.transactionSuccess()) {
Add support for per-world-economy plugins The money will be withdrawn or deposited on the world of the shop
2016-11-23 16:11:07 +01:00
EconomyResponse r2 = (shop.getShopType() != ShopType.ADMIN) ? econ.withdrawPlayer(shop.getVendor(), worldName, newPrice) : null;
Slightly improved economy transactions - Only start the second economy transaction after the first one succeeds - Undo the first transaction if the second one fails
2016-09-07 17:00:59 +02:00
Improved and simplified buy and sell methods Well, at least I hope I've improved that... This should also fix the bug (what initially was my goal), where the item didn't get removed from the player's inventory after selling it.
2016-05-31 18:07:38 +02:00
if (r2 != null) {
Automated code cleanup by IntelliJ IDEA As I Switched from Eclipse to IntelliJ IDEA, I also had to add a few entries to the .gitignore file.
2016-05-28 15:47:57 +02:00
if (r2.transactionSuccess()) {
Added way to auto calculate item amount You can find an explanation here: - https://www.spigotmc.org/threads/shopchest.87948/page-15#post-1820672 - In the configuration file
2016-08-16 15:06:26 +02:00
ShopBuySellEvent event = new ShopBuySellEvent(executor, shop, ShopBuySellEvent.Type.SELL, newAmount, newPrice);
Added Events for new API Javadoc will be added later
2016-07-05 18:41:31 +02:00
Bukkit.getPluginManager().callEvent(event);
if (event.isCancelled()) {
Fixed support for multi-world economy plugins
2017-06-02 14:56:34 +02:00
econ.withdrawPlayer(executor, worldName, newPrice);
econ.depositPlayer(shop.getVendor(), worldName, newPrice);
Added debug log (in file) - Added debug log (configurable) - Added "message.noPermission.create-protected" - A bit code cleanup - Renamed "Commands" to "ShopCommand"
2016-08-03 13:49:31 +02:00
plugin.debug("Sell event cancelled (#" + shop.getID() + ")");
Added Events for new API Javadoc will be added later
2016-07-05 18:41:31 +02:00
return;
}
Query and update SQL database asynchronously
2017-02-08 17:02:03 +01:00
database.logEconomy(executor, newProduct, shop.getVendor(), shop.getShopType(), shop.getLocation(), newPrice, ShopBuySellEvent.Type.SELL, null);
Added economy log in database file Closes #19
2016-08-18 13:30:14 +02:00
Added way to auto calculate item amount You can find an explanation here: - https://www.spigotmc.org/threads/shopchest.87948/page-15#post-1820672 - In the configuration file
2016-08-16 15:06:26 +02:00
addToInventory(inventory, newProduct);
removeFromInventory(executor.getInventory(), newProduct);
Improved and simplified buy and sell methods Well, at least I hope I've improved that... This should also fix the bug (what initially was my goal), where the item didn't get removed from the player's inventory after selling it.
2016-05-31 18:07:38 +02:00
executor.updateInventory();
Display UUID when a vendor's name is not found
2016-08-19 12:48:11 +02:00
String vendorName = (shop.getVendor().getName() == null ? shop.getVendor().getUniqueId().toString() : shop.getVendor().getName());
Fixed typos in message enum names
2017-06-05 15:13:26 +02:00
executor.sendMessage(LanguageUtils.getMessage(LocalizedMessage.Message.SELL_SUCCESS, new LocalizedMessage.ReplacedPlaceholder(Placeholder.AMOUNT, String.valueOf(newAmount)),
Improved configuration of command description messages + Renamed all occurrences of "regex" to "placeholder"
2017-06-02 14:37:11 +02:00
new LocalizedMessage.ReplacedPlaceholder(Placeholder.ITEM_NAME, LanguageUtils.getItemName(product)), new LocalizedMessage.ReplacedPlaceholder(Placeholder.SELL_PRICE, String.valueOf(newPrice)),
new LocalizedMessage.ReplacedPlaceholder(Placeholder.VENDOR, vendorName)));
Improved and simplified buy and sell methods Well, at least I hope I've improved that... This should also fix the bug (what initially was my goal), where the item didn't get removed from the player's inventory after selling it.
2016-05-31 18:07:38 +02:00
Added debug log (in file) - Added debug log (configurable) - Added "message.noPermission.create-protected" - A bit code cleanup - Renamed "Commands" to "ShopCommand"
2016-08-03 13:49:31 +02:00
plugin.debug(executor.getName() + " successfully sold (#" + shop.getID() + ")");
Added way to disable vendor messages (= Messages that a vendor gets after players buy or sell something from/to his shop) Closes #33
2016-11-26 17:23:02 +01:00
if (shop.getVendor().isOnline() && config.enable_vendor_messages) {
Improved configuration of command description messages + Renamed all occurrences of "regex" to "placeholder"
2017-06-02 14:37:11 +02:00
shop.getVendor().getPlayer().sendMessage(LanguageUtils.getMessage(LocalizedMessage.Message.SOMEONE_SOLD, new LocalizedMessage.ReplacedPlaceholder(Placeholder.AMOUNT, String.valueOf(newAmount)),
new LocalizedMessage.ReplacedPlaceholder(Placeholder.ITEM_NAME, LanguageUtils.getItemName(product)), new LocalizedMessage.ReplacedPlaceholder(Placeholder.SELL_PRICE, String.valueOf(newPrice)),
new LocalizedMessage.ReplacedPlaceholder(Placeholder.PLAYER, executor.getName())));
Improved and simplified buy and sell methods Well, at least I hope I've improved that... This should also fix the bug (what initially was my goal), where the item didn't get removed from the player's inventory after selling it.
2016-05-31 18:07:38 +02:00
}
Automated code cleanup by IntelliJ IDEA As I Switched from Eclipse to IntelliJ IDEA, I also had to add a few entries to the .gitignore file.
2016-05-28 15:47:57 +02:00
} else {
Slightly improved economy transactions - Only start the second economy transaction after the first one succeeds - Undo the first transaction if the second one fails
2016-09-07 17:00:59 +02:00
plugin.debug("Economy transaction failed (r2): " + r2.errorMessage + " (#" + shop.getID() + ")");
Improved configuration of command description messages + Renamed all occurrences of "regex" to "placeholder"
2017-06-02 14:37:11 +02:00
executor.sendMessage(LanguageUtils.getMessage(LocalizedMessage.Message.ERROR_OCCURRED, new LocalizedMessage.ReplacedPlaceholder(Placeholder.ERROR, r2.errorMessage)));
Fixed support for multi-world economy plugins
2017-06-02 14:56:34 +02:00
econ.withdrawPlayer(executor, worldName, newPrice);
Fixed refund if economy transactions fail
2017-06-08 11:31:23 +02:00
econ.depositPlayer(shop.getVendor(), worldName, newPrice);
Automated code cleanup by IntelliJ IDEA As I Switched from Eclipse to IntelliJ IDEA, I also had to add a few entries to the .gitignore file.
2016-05-28 15:47:57 +02:00
}
Improved and simplified buy and sell methods Well, at least I hope I've improved that... This should also fix the bug (what initially was my goal), where the item didn't get removed from the player's inventory after selling it.
2016-05-31 18:07:38 +02:00
Automated code cleanup by IntelliJ IDEA As I Switched from Eclipse to IntelliJ IDEA, I also had to add a few entries to the .gitignore file.
2016-05-28 15:47:57 +02:00
} else {
Added way to auto calculate item amount You can find an explanation here: - https://www.spigotmc.org/threads/shopchest.87948/page-15#post-1820672 - In the configuration file
2016-08-16 15:06:26 +02:00
ShopBuySellEvent event = new ShopBuySellEvent(executor, shop, ShopBuySellEvent.Type.SELL, newAmount, newPrice);
Added Events for new API Javadoc will be added later
2016-07-05 18:41:31 +02:00
Bukkit.getPluginManager().callEvent(event);
if (event.isCancelled()) {
Fixed support for multi-world economy plugins
2017-06-02 14:56:34 +02:00
econ.withdrawPlayer(executor, worldName, newPrice);
Added debug log (in file) - Added debug log (configurable) - Added "message.noPermission.create-protected" - A bit code cleanup - Renamed "Commands" to "ShopCommand"
2016-08-03 13:49:31 +02:00
plugin.debug("Sell event cancelled (#" + shop.getID() + ")");
Added Events for new API Javadoc will be added later
2016-07-05 18:41:31 +02:00
return;
}
Query and update SQL database asynchronously
2017-02-08 17:02:03 +01:00
database.logEconomy(executor, newProduct, shop.getVendor(), shop.getShopType(), shop.getLocation(), newPrice, ShopBuySellEvent.Type.SELL, null);
Added economy log in database file Closes #19
2016-08-18 13:30:14 +02:00
Added way to auto calculate item amount You can find an explanation here: - https://www.spigotmc.org/threads/shopchest.87948/page-15#post-1820672 - In the configuration file
2016-08-16 15:06:26 +02:00
removeFromInventory(executor.getInventory(), newProduct);
Improved and simplified buy and sell methods Well, at least I hope I've improved that... This should also fix the bug (what initially was my goal), where the item didn't get removed from the player's inventory after selling it.
2016-05-31 18:07:38 +02:00
executor.updateInventory();
Fixed typos in message enum names
2017-06-05 15:13:26 +02:00
executor.sendMessage(LanguageUtils.getMessage(LocalizedMessage.Message.SELL_SUCCESS_ADMIN, new LocalizedMessage.ReplacedPlaceholder(Placeholder.AMOUNT, String.valueOf(newAmount)),
Improved configuration of command description messages + Renamed all occurrences of "regex" to "placeholder"
2017-06-02 14:37:11 +02:00
new LocalizedMessage.ReplacedPlaceholder(Placeholder.ITEM_NAME, LanguageUtils.getItemName(product)), new LocalizedMessage.ReplacedPlaceholder(Placeholder.SELL_PRICE, String.valueOf(newPrice))));
Added debug log (in file) - Added debug log (configurable) - Added "message.noPermission.create-protected" - A bit code cleanup - Renamed "Commands" to "ShopCommand"
2016-08-03 13:49:31 +02:00
plugin.debug(executor.getName() + " successfully sold (#" + shop.getID() + ")");
Automated code cleanup by IntelliJ IDEA As I Switched from Eclipse to IntelliJ IDEA, I also had to add a few entries to the .gitignore file.
2016-05-28 15:47:57 +02:00
}
} else {
Slightly improved economy transactions - Only start the second economy transaction after the first one succeeds - Undo the first transaction if the second one fails
2016-09-07 17:00:59 +02:00
plugin.debug("Economy transaction failed (r): " + r.errorMessage + " (#" + shop.getID() + ")");
Improved configuration of command description messages + Renamed all occurrences of "regex" to "placeholder"
2017-06-02 14:37:11 +02:00
executor.sendMessage(LanguageUtils.getMessage(LocalizedMessage.Message.ERROR_OCCURRED, new LocalizedMessage.ReplacedPlaceholder(Placeholder.ERROR, r.errorMessage)));
Fixed refund if economy transactions fail
2017-06-08 11:31:23 +02:00
econ.withdrawPlayer(executor, worldName, newPrice);
Automated code cleanup by IntelliJ IDEA As I Switched from Eclipse to IntelliJ IDEA, I also had to add a few entries to the .gitignore file.
2016-05-28 15:47:57 +02:00
}
} else {
Added configurable language for everything and more This can read the default minecraft language files, but in order to translate the messages, you need to add the message section from the en_US.lang. Also, spawn eggs will work now, the title of music discs will be displayed in the info sections and "tipped arrow effect" is now named "potion effect" and is displayed also if the product is a potion, splashed potion or a lingering potion (and of course tipped arrows). The message configuration is no longer found in the config.yml file, but has gone to the .lang file, so you need to reconfigure every message! As the Jsoup library is no longer needed, the filesize of the final jar shrunk quite a bit. Maybe there are some more changes, which I already forgot.
2016-06-22 20:51:19 +02:00
executor.sendMessage(LanguageUtils.getMessage(LocalizedMessage.Message.CHEST_NOT_ENOUGH_INVENTORY_SPACE));
Automated code cleanup by IntelliJ IDEA As I Switched from Eclipse to IntelliJ IDEA, I also had to add a few entries to the .gitignore file.
2016-05-28 15:47:57 +02:00
}
Improved and simplified buy and sell methods Well, at least I hope I've improved that... This should also fix the bug (what initially was my goal), where the item didn't get removed from the player's inventory after selling it.
2016-05-31 18:07:38 +02:00
} else {
Added configurable language for everything and more This can read the default minecraft language files, but in order to translate the messages, you need to add the message section from the en_US.lang. Also, spawn eggs will work now, the title of music discs will be displayed in the info sections and "tipped arrow effect" is now named "potion effect" and is displayed also if the product is a potion, splashed potion or a lingering potion (and of course tipped arrows). The message configuration is no longer found in the config.yml file, but has gone to the .lang file, so you need to reconfigure every message! As the Jsoup library is no longer needed, the filesize of the final jar shrunk quite a bit. Maybe there are some more changes, which I already forgot.
2016-06-22 20:51:19 +02:00
executor.sendMessage(LanguageUtils.getMessage(LocalizedMessage.Message.VENDOR_NOT_ENOUGH_MONEY));
Improved and simplified buy and sell methods Well, at least I hope I've improved that... This should also fix the bug (what initially was my goal), where the item didn't get removed from the player's inventory after selling it.
2016-05-31 18:07:38 +02:00
}
}
Automated code cleanup by IntelliJ IDEA As I Switched from Eclipse to IntelliJ IDEA, I also had to add a few entries to the .gitignore file.
2016-05-28 15:47:57 +02:00
Added Javadoc
2016-06-30 21:59:06 +02:00
/**
* Adds items to an inventory
* @param inventory The inventory, to which the items will be added
* @param itemStack Items to add
* @return Whether all items were added to the inventory
*/
Improved and simplified buy and sell methods Well, at least I hope I've improved that... This should also fix the bug (what initially was my goal), where the item didn't get removed from the player's inventory after selling it.
2016-05-31 18:07:38 +02:00
private boolean addToInventory(Inventory inventory, ItemStack itemStack) {
Added debug log (in file) - Added debug log (configurable) - Added "message.noPermission.create-protected" - A bit code cleanup - Renamed "Commands" to "ShopCommand"
2016-08-03 13:49:31 +02:00
plugin.debug("Adding items to inventory...");
Improved and simplified buy and sell methods Well, at least I hope I've improved that... This should also fix the bug (what initially was my goal), where the item didn't get removed from the player's inventory after selling it.
2016-05-31 18:07:38 +02:00
HashMap<Integer, ItemStack> inventoryItems = new HashMap<>();
int amount = itemStack.getAmount();
int added = 0;
Automated code cleanup by IntelliJ IDEA As I Switched from Eclipse to IntelliJ IDEA, I also had to add a few entries to the .gitignore file.
2016-05-28 15:47:57 +02:00
Improved and simplified buy and sell methods Well, at least I hope I've improved that... This should also fix the bug (what initially was my goal), where the item didn't get removed from the player's inventory after selling it.
2016-05-31 18:07:38 +02:00
if (inventory instanceof PlayerInventory) {
Added configurable language for everything and more This can read the default minecraft language files, but in order to translate the messages, you need to add the message section from the en_US.lang. Also, spawn eggs will work now, the title of music discs will be displayed in the info sections and "tipped arrow effect" is now named "potion effect" and is displayed also if the product is a potion, splashed potion or a lingering potion (and of course tipped arrows). The message configuration is no longer found in the config.yml file, but has gone to the .lang file, so you need to reconfigure every message! As the Jsoup library is no longer needed, the filesize of the final jar shrunk quite a bit. Maybe there are some more changes, which I already forgot.
2016-06-22 20:51:19 +02:00
if (Utils.getMajorVersion() >= 9) {
Improved and simplified buy and sell methods Well, at least I hope I've improved that... This should also fix the bug (what initially was my goal), where the item didn't get removed from the player's inventory after selling it.
2016-05-31 18:07:38 +02:00
inventoryItems.put(40, inventory.getItem(40));
}
Automated code cleanup by IntelliJ IDEA As I Switched from Eclipse to IntelliJ IDEA, I also had to add a few entries to the .gitignore file.
2016-05-28 15:47:57 +02:00
Improved and simplified buy and sell methods Well, at least I hope I've improved that... This should also fix the bug (what initially was my goal), where the item didn't get removed from the player's inventory after selling it.
2016-05-31 18:07:38 +02:00
for (int i = 0; i < 36; i++) {
inventoryItems.put(i, inventory.getItem(i));
}
Automated code cleanup by IntelliJ IDEA As I Switched from Eclipse to IntelliJ IDEA, I also had to add a few entries to the .gitignore file.
2016-05-28 15:47:57 +02:00
Improved and simplified buy and sell methods Well, at least I hope I've improved that... This should also fix the bug (what initially was my goal), where the item didn't get removed from the player's inventory after selling it.
2016-05-31 18:07:38 +02:00
} else {
for (int i = 0; i < inventory.getSize(); i++) {
inventoryItems.put(i, inventory.getItem(i));
}
}
slotLoop:
for (int slot : inventoryItems.keySet()) {
while (added < amount) {
ItemStack item = inventory.getItem(slot);
Fixed selling to full admin shops and support for lower versions
2016-11-17 17:39:09 +01:00
if (item != null && item.getType() != Material.AIR) {
Hopefully fixed item meta issues for good
2017-01-03 13:06:29 +01:00
if (Utils.isItemSimilar(item, itemStack)) {
Improved and simplified buy and sell methods Well, at least I hope I've improved that... This should also fix the bug (what initially was my goal), where the item didn't get removed from the player's inventory after selling it.
2016-05-31 18:07:38 +02:00
if (item.getAmount() != item.getMaxStackSize()) {
ItemStack newItemStack = new ItemStack(item);
newItemStack.setAmount(item.getAmount() + 1);
inventory.setItem(slot, newItemStack);
added++;
Automated code cleanup by IntelliJ IDEA As I Switched from Eclipse to IntelliJ IDEA, I also had to add a few entries to the .gitignore file.
2016-05-28 15:47:57 +02:00
} else {
Improved and simplified buy and sell methods Well, at least I hope I've improved that... This should also fix the bug (what initially was my goal), where the item didn't get removed from the player's inventory after selling it.
2016-05-31 18:07:38 +02:00
continue slotLoop;
Automated code cleanup by IntelliJ IDEA As I Switched from Eclipse to IntelliJ IDEA, I also had to add a few entries to the .gitignore file.
2016-05-28 15:47:57 +02:00
}
} else {
Improved and simplified buy and sell methods Well, at least I hope I've improved that... This should also fix the bug (what initially was my goal), where the item didn't get removed from the player's inventory after selling it.
2016-05-31 18:07:38 +02:00
continue slotLoop;
Automated code cleanup by IntelliJ IDEA As I Switched from Eclipse to IntelliJ IDEA, I also had to add a few entries to the .gitignore file.
2016-05-28 15:47:57 +02:00
}
Improved and simplified buy and sell methods Well, at least I hope I've improved that... This should also fix the bug (what initially was my goal), where the item didn't get removed from the player's inventory after selling it.
2016-05-31 18:07:38 +02:00
} else {
ItemStack newItemStack = new ItemStack(itemStack);
newItemStack.setAmount(1);
inventory.setItem(slot, newItemStack);
added++;
Automated code cleanup by IntelliJ IDEA As I Switched from Eclipse to IntelliJ IDEA, I also had to add a few entries to the .gitignore file.
2016-05-28 15:47:57 +02:00
}
Improved and simplified buy and sell methods Well, at least I hope I've improved that... This should also fix the bug (what initially was my goal), where the item didn't get removed from the player's inventory after selling it.
2016-05-31 18:07:38 +02:00
}
}
return (added == amount);
}
Added Javadoc
2016-06-30 21:59:06 +02:00
/**
* Removes items to from an inventory
* @param inventory The inventory, from which the items will be removed
* @param itemStack Items to remove
* @return Whether all items were removed from the inventory
*/
Improved and simplified buy and sell methods Well, at least I hope I've improved that... This should also fix the bug (what initially was my goal), where the item didn't get removed from the player's inventory after selling it.
2016-05-31 18:07:38 +02:00
private boolean removeFromInventory(Inventory inventory, ItemStack itemStack) {
Added debug log (in file) - Added debug log (configurable) - Added "message.noPermission.create-protected" - A bit code cleanup - Renamed "Commands" to "ShopCommand"
2016-08-03 13:49:31 +02:00
plugin.debug("Removing items from inventory...");
Improved and simplified buy and sell methods Well, at least I hope I've improved that... This should also fix the bug (what initially was my goal), where the item didn't get removed from the player's inventory after selling it.
2016-05-31 18:07:38 +02:00
HashMap<Integer, ItemStack> inventoryItems = new HashMap<>();
int amount = itemStack.getAmount();
int removed = 0;
if (inventory instanceof PlayerInventory) {
Added configurable language for everything and more This can read the default minecraft language files, but in order to translate the messages, you need to add the message section from the en_US.lang. Also, spawn eggs will work now, the title of music discs will be displayed in the info sections and "tipped arrow effect" is now named "potion effect" and is displayed also if the product is a potion, splashed potion or a lingering potion (and of course tipped arrows). The message configuration is no longer found in the config.yml file, but has gone to the .lang file, so you need to reconfigure every message! As the Jsoup library is no longer needed, the filesize of the final jar shrunk quite a bit. Maybe there are some more changes, which I already forgot.
2016-06-22 20:51:19 +02:00
if (Utils.getMajorVersion() >= 9) {
Improved and simplified buy and sell methods Well, at least I hope I've improved that... This should also fix the bug (what initially was my goal), where the item didn't get removed from the player's inventory after selling it.
2016-05-31 18:07:38 +02:00
inventoryItems.put(40, inventory.getItem(40));
Automated code cleanup by IntelliJ IDEA As I Switched from Eclipse to IntelliJ IDEA, I also had to add a few entries to the .gitignore file.
2016-05-28 15:47:57 +02:00
}
Improved and simplified buy and sell methods Well, at least I hope I've improved that... This should also fix the bug (what initially was my goal), where the item didn't get removed from the player's inventory after selling it.
2016-05-31 18:07:38 +02:00
for (int i = 0; i < 36; i++) {
inventoryItems.put(i, inventory.getItem(i));
}
} else {
for (int i = 0; i < inventory.getSize(); i++) {
inventoryItems.put(i, inventory.getItem(i));
}
Automated code cleanup by IntelliJ IDEA As I Switched from Eclipse to IntelliJ IDEA, I also had to add a few entries to the .gitignore file.
2016-05-28 15:47:57 +02:00
}
Improved and simplified buy and sell methods Well, at least I hope I've improved that... This should also fix the bug (what initially was my goal), where the item didn't get removed from the player's inventory after selling it.
2016-05-31 18:07:38 +02:00
slotLoop:
for (int slot : inventoryItems.keySet()) {
while (removed < amount) {
ItemStack item = inventory.getItem(slot);
Fixed selling to full admin shops and support for lower versions
2016-11-17 17:39:09 +01:00
if (item != null && item.getType() != Material.AIR) {
Hopefully fixed item meta issues for good
2017-01-03 13:06:29 +01:00
if (Utils.isItemSimilar(item, itemStack)) {
Improved and simplified buy and sell methods Well, at least I hope I've improved that... This should also fix the bug (what initially was my goal), where the item didn't get removed from the player's inventory after selling it.
2016-05-31 18:07:38 +02:00
if (item.getAmount() > 0) {
int newAmount = item.getAmount() - 1;
ItemStack newItemStack = new ItemStack(item);
newItemStack.setAmount(newAmount);
if (newAmount == 0)
inventory.setItem(slot, null);
else
inventory.setItem(slot, newItemStack);
removed++;
} else {
continue slotLoop;
}
} else {
continue slotLoop;
}
} else {
continue slotLoop;
}
}
}
return (removed == amount);
Automated code cleanup by IntelliJ IDEA As I Switched from Eclipse to IntelliJ IDEA, I also had to add a few entries to the .gitignore file.
2016-05-28 15:47:57 +02:00
}
First Commit
2015-09-02 13:06:48 +02:00
}
Reference in New Issue Copy Permalink