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
dbf809ea5b
ShopChest/src/main/java/de/epiceric/shopchest/listeners/ShopInteractListener.java

814 lines
41 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
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;
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.config.Regex;
Added Events for new API Javadoc will be added later
2016-07-05 18:41:31 +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.ShopRemoveEvent;
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;
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;
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.utils.ClickType;
import de.epiceric.shopchest.utils.ShopUtils;
import de.epiceric.shopchest.utils.Utils;
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;
import net.milkbowl.vault.permission.Permission;
First Commit
2015-09-02 13:06:48 +02:00
import org.bukkit.Bukkit;
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;
import org.bukkit.enchantments.Enchantment;
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;
import org.bukkit.event.player.PlayerInteractEvent;
import org.bukkit.inventory.Inventory;
import org.bukkit.inventory.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
import org.bukkit.inventory.PlayerInventory;
Fixed Bugs & Added Hologram Format Configuration
2015-09-13 13:13:04 +02:00
import org.bukkit.inventory.meta.EnchantmentStorageMeta;
Now displays if a potion is extended
2016-08-05 22:16:14 +02:00
import org.bukkit.inventory.meta.PotionMeta;
import org.bukkit.potion.Potion;
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 Permission perm;
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;
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.perm = plugin.getPermission();
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();
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
}
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();
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())) {
if (e.isCancelled() && !perm.has(p, "shopchest.create.protected")) {
p.sendMessage(LanguageUtils.getMessage(LocalizedMessage.Message.NO_PERMISSION_CREATE_PROTECTED));
ClickType.removePlayerClickType(p);
plugin.debug(p.getName() + " is not allowed to create a shop on the selected chest");
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
}
}
}
}
}
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
@EventHandler
public void onPlayerInteract(PlayerInteractEvent e) {
Block b = e.getClickedBlock();
Player p = e.getPlayer();
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)) {
if (e.getAction() == Action.RIGHT_CLICK_BLOCK) {
if (ClickType.getPlayerClickType(p) != null) {
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
if (shop.getVendor().getUniqueId().equals(p.getUniqueId()) || perm.has(p, "shopchest.removeOther")) {
remove(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.NO_PERMISSION_REMOVE_OTHERS));
Added a few debug messages
2016-08-05 12:46:41 +02:00
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;
}
} else {
ShopUtils no longer contains static methods
2016-07-13 15:03:54 +02:00
if (shopUtils.isShop(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
e.setCancelled(true);
ShopUtils no longer contains static methods
2016-07-13 15:03:54 +02:00
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
if (p.isSneaking()) {
if (!shop.getVendor().getUniqueId().equals(p.getUniqueId())) {
if (perm.has(p, "shopchest.openOther")) {
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());
p.sendMessage(LanguageUtils.getMessage(LocalizedMessage.Message.OPENED_SHOP, new LocalizedMessage.ReplacedRegex(Regex.VENDOR, vendorName)));
plugin.debug(p.getName() + " is opening " + vendorName + "'s shop (#" + 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
e.setCancelled(false);
} 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.NO_PERMISSION_OPEN_OTHERS));
Added a few debug messages
2016-08-05 12:46:41 +02:00
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
}
} else {
e.setCancelled(false);
}
} else {
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
if (shop.getShopType() == ShopType.ADMIN || !shop.getVendor().getUniqueId().equals(p.getUniqueId())) {
Added a few debug messages
2016-08-05 12:46:41 +02:00
plugin.debug(p.getName() + " wants to buy");
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
if (shop.getBuyPrice() > 0) {
if (perm.has(p, "shopchest.buy")) {
if (shop.getShopType() == ShopType.ADMIN) {
buy(p, shop);
} else {
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) b.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
if (Utils.getAmount(c.getInventory(), shop.getProduct()) >= shop.getProduct().getAmount()) {
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
buy(p, shop);
} 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
if (config.auto_calculate_item_amount && Utils.getAmount(c.getInventory(), shop.getProduct()) > 0) {
buy(p, shop);
} else {
p.sendMessage(LanguageUtils.getMessage(LocalizedMessage.Message.OUT_OF_STOCK));
plugin.debug("Shop is out of stock");
}
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 {
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.NO_PERMISSION_BUY));
Added a few debug messages
2016-08-05 12:46:41 +02:00
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 {
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.BUYING_DISABLED));
Added a few debug messages
2016-08-05 12:46:41 +02:00
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
}
} else {
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
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
}
}
}
}
} else if (e.getAction() == Action.LEFT_CLICK_BLOCK) {
ShopUtils no longer contains static methods
2016-07-13 15:03:54 +02:00
if (shopUtils.isShop(b.getLocation())) {
Remove a shop by breaking its chest I'm gonna close #8 with this.
2016-08-10 13:00:51 +02:00
if (p.isSneaking())
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
e.setCancelled(true);
ShopUtils no longer contains static methods
2016-07-13 15:03:54 +02:00
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
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
if ((shop.getShopType() == ShopType.ADMIN) || (!shop.getVendor().getUniqueId().equals(p.getUniqueId()))) {
Added a few debug messages
2016-08-05 12:46:41 +02:00
plugin.debug(p.getName() + " wants to sell");
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
if (shop.getSellPrice() > 0) {
if (perm.has(p, "shopchest.sell")) {
if (Utils.getAmount(p.getInventory(), shop.getProduct()) >= shop.getProduct().getAmount()) {
sell(p, 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 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 (config.auto_calculate_item_amount && Utils.getAmount(p.getInventory(), shop.getProduct()) > 0) {
sell(p, shop);
} else {
p.sendMessage(LanguageUtils.getMessage(LocalizedMessage.Message.NOT_ENOUGH_ITEMS));
plugin.debug(p.getName() + " doesn't have enough items");
}
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 {
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.NO_PERMISSION_SELL));
Added a few debug messages
2016-08-05 12:46:41 +02:00
plugin.debug(p.getName() + " is not permitted to sell");
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 {
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.SELLING_DISABLED));
Added a few debug messages
2016-08-05 12:46:41 +02:00
plugin.debug("Selling 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
}
} else {
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
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
}
}
}
}
} else {
Fixed issues with ItemMeta (Mostly issues with books) Fixes #30
2016-11-12 15:03:19 +01:00
ClickType.removePlayerClickType(p);
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
*/
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 create(Player executor, Location location, ItemStack product, double buyPrice, double sellPrice, 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
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
int id = database.getNextFreeID();
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
double creationPrice = (shopType == ShopType.NORMAL) ? config.shop_creation_price_normal : config.shop_creation_price_admin;
Added Events for new API Javadoc will be added later
2016-07-05 18:41:31 +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
ShopCreateEvent event = new ShopCreateEvent(executor, Shop.createImaginaryShop(executor, product, location, buyPrice, sellPrice,shopType), creationPrice);
Added Events for new API Javadoc will be added later
2016-07-05 18:41:31 +02:00
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("Create event cancelled (#" + id + ")");
return;
}
Creation price should only be withdrawn if the shop is created successfully
2016-07-01 14:33:13 +02:00
EconomyResponse r = plugin.getEconomy().withdrawPlayer(executor, creationPrice);
if (!r.transactionSuccess()) {
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("Economy transaction failed: " + r.errorMessage);
Creation price should only be withdrawn if the shop is created successfully
2016-07-01 14:33:13 +02:00
executor.sendMessage(LanguageUtils.getMessage(LocalizedMessage.Message.ERROR_OCCURRED, new LocalizedMessage.ReplacedRegex(Regex.ERROR, r.errorMessage)));
return;
}
Check database connection before accessing it This hopefully fixes #7
2016-07-01 14:28:31 +02:00
Shop shop = new Shop(id, plugin, executor, product, location, buyPrice, sellPrice, shopType);
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 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("Shop created (#" + id + ")");
ShopUtils no longer contains static methods
2016-07-13 15:03:54 +02:00
shopUtils.addShop(shop, true);
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_CREATED));
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
Show shop item and hologram on creation
2016-10-12 18:30:51 +02:00
for (Player p : location.getWorld().getPlayers()) {
Changed/Fixed hologram appearing I didn't like the look of the performance saving, as the hologram would appear at a lower distance then it would disappear
2016-11-12 15:43:56 +01:00
if (p.getLocation().distanceSquared(location) <= Math.pow(config.maximal_distance, 2)) {
Fix NPEs caused by non-existent Shop Items
2016-11-12 15:17:13 +01:00
if (shop.getHologram() != null) {
shop.getHologram().showPlayer(p);
}
Show shop item and hologram on creation
2016-10-12 18:30:51 +02:00
}
Changed/Fixed hologram appearing I didn't like the look of the performance saving, as the hologram would appear at a lower distance then it would disappear
2016-11-12 15:43:56 +01:00
if (p.getLocation().distanceSquared(location) <= Math.pow(config.maximal_item_distance, 2)) {
Fix NPEs caused by non-existent Shop Items
2016-11-12 15:17:13 +01:00
if (shop.getItem() != null) {
shop.getItem().setVisible(p, true);
}
Show shop item and hologram on creation
2016-10-12 18:30:51 +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
/**
* 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) {
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 removing 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 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 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;
}
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
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());
String vendor = LanguageUtils.getMessage(LocalizedMessage.Message.SHOP_INFO_VENDOR, new LocalizedMessage.ReplacedRegex(Regex.VENDOR, vendorName));
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 product = LanguageUtils.getMessage(LocalizedMessage.Message.SHOP_INFO_PRODUCT, new LocalizedMessage.ReplacedRegex(Regex.AMOUNT, String.valueOf(shop.getProduct().getAmount())),
new LocalizedMessage.ReplacedRegex(Regex.ITEM_NAME, LanguageUtils.getItemName(shop.getProduct())));
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 = "";
String musicDiscName = LanguageUtils.getMusicDiscName(type);
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);
String price = LanguageUtils.getMessage(LocalizedMessage.Message.SHOP_INFO_PRICE, new LocalizedMessage.ReplacedRegex(Regex.BUY_PRICE, (shop.getBuyPrice() > 0 ? String.valueOf(shop.getBuyPrice()) : disabled)),
new LocalizedMessage.ReplacedRegex(Regex.SELL_PRICE, (shop.getSellPrice() > 0 ? String.valueOf(shop.getSellPrice()) : disabled)));
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 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, new LocalizedMessage.ReplacedRegex(Regex.AMOUNT, String.valueOf(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
Now displays if a potion is extended
2016-08-05 22:16:14 +02:00
boolean potionExtended = 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
Map<Enchantment, Integer> enchantmentMap;
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) {
Fixed Potion Shops on 1.8.x
2016-07-30 17:40:19 +02:00
if (type == Material.TIPPED_ARROW || type == Material.LINGERING_POTION || type == Material.SPLASH_POTION) {
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
potionEffectString = LanguageUtils.getPotionEffectName(shop.getProduct());
Now displays if a potion is extended
2016-08-05 22:16:14 +02:00
PotionMeta potionMeta = (PotionMeta) shop.getProduct().getItemMeta();
potionExtended = potionMeta.getBasePotionData().isExtended();
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 (potionEffectString == null)
potionEffectString = LanguageUtils.getMessage(LocalizedMessage.Message.SHOP_INFO_NONE);
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
}
}
Fixed Potion Shops on 1.8.x
2016-07-30 17:40:19 +02:00
if (type == Material.POTION) {
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
potionEffectString = LanguageUtils.getPotionEffectName(shop.getProduct());
Now displays if a potion is extended
2016-08-05 22:16:14 +02:00
if (Utils.getMajorVersion() < 9) {
Potion potion = Potion.fromItemStack(shop.getProduct());
potionExtended = potion.hasExtendedDuration();
} else {
PotionMeta potionMeta = (PotionMeta) shop.getProduct().getItemMeta();
potionExtended = potionMeta.getBasePotionData().isExtended();
}
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 (potionEffectString == null)
potionEffectString = LanguageUtils.getMessage(LocalizedMessage.Message.SHOP_INFO_NONE);
}
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 (shop.getProduct().getItemMeta() instanceof EnchantmentStorageMeta) {
EnchantmentStorageMeta esm = (EnchantmentStorageMeta) shop.getProduct().getItemMeta();
enchantmentMap = esm.getStoredEnchants();
} else {
enchantmentMap = shop.getProduct().getEnchantments();
}
Enchantment[] enchantments = enchantmentMap.keySet().toArray(new Enchantment[enchantmentMap.size()]);
for (int i = 0; i < enchantments.length; i++) {
Enchantment enchantment = enchantments[i];
if (i == enchantments.length - 1) {
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
enchantmentString += LanguageUtils.getEnchantmentName(enchantment, enchantmentMap.get(enchantment));
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
enchantmentString += LanguageUtils.getEnchantmentName(enchantment, enchantmentMap.get(enchantment)) + ", ";
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(" ");
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(vendor);
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(product);
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 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 (enchantmentString.length() > 0)
executor.sendMessage(LanguageUtils.getMessage(LocalizedMessage.Message.SHOP_INFO_ENCHANTMENTS, new LocalizedMessage.ReplacedRegex(Regex.ENCHANTMENT, enchantmentString)));
if (potionEffectString.length() > 0)
Now displays if a potion is extended
2016-08-05 22:16:14 +02:00
executor.sendMessage(LanguageUtils.getMessage(LocalizedMessage.Message.SHOP_INFO_POTION_EFFECT, new LocalizedMessage.ReplacedRegex(Regex.POTION_EFFECT, potionEffectString),
new LocalizedMessage.ReplacedRegex(Regex.EXTENDED, (potionExtended ? LanguageUtils.getMessage(LocalizedMessage.Message.SHOP_INFO_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
if (musicDiscName.length() > 0)
executor.sendMessage(LanguageUtils.getMessage(LocalizedMessage.Message.SHOP_INFO_MUSIC_TITLE, new LocalizedMessage.ReplacedRegex(Regex.MUSIC_TITLE, musicDiscName)));
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(price);
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
*/
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 buy(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 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
if (econ.getBalance(executor) >= shop.getBuyPrice() || config.auto_calculate_item_amount) {
int amountForMoney = (int) (shop.getProduct().getAmount() / shop.getBuyPrice() * econ.getBalance(executor));
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
Fixed admin shops
2016-08-17 13:14:35 +02:00
if (amountForChestItems == 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.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());
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
Fixed admin shops
2016-08-17 13:14:35 +02:00
if (freeSpace == 0 && config.auto_calculate_item_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
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
}
Fixed admin shops
2016-08-17 13:14:35 +02:00
int newAmount = product.getAmount();
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);
}
if (newAmount > product.getAmount()) newAmount = product.getAmount();
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
Fixed admin shops
2016-08-17 13:14:35 +02:00
double newPrice = (shop.getBuyPrice() / product.getAmount()) * 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
if (freeSpace >= product.getAmount() || (config.auto_calculate_item_amount && freeSpace >= newAmount)) {
plugin.debug(executor.getName() + " has enough inventory space for " + freeSpace + " items (#" + shop.getID() + ")");
ItemStack newProduct = new ItemStack(product);
newProduct.setAmount(newAmount);
EconomyResponse r = econ.withdrawPlayer(executor, 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()) {
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
EconomyResponse r2 = (shop.getShopType() != ShopType.ADMIN) ? econ.depositPlayer(shop.getVendor(), newPrice) : 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 != 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()) {
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
econ.depositPlayer(executor, newPrice);
econ.withdrawPlayer(shop.getVendor(), 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;
}
Added economy log in database file Closes #19
2016-08-18 13:30:14 +02:00
database.logEconomy(executor, newProduct, shop.getVendor(), shop.getShopType(), shop.getLocation(), newPrice, ShopBuySellEvent.Type.BUY);
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());
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.BUY_SUCCESS, new LocalizedMessage.ReplacedRegex(Regex.AMOUNT, String.valueOf(newAmount)),
new LocalizedMessage.ReplacedRegex(Regex.ITEM_NAME, LanguageUtils.getItemName(product)), new LocalizedMessage.ReplacedRegex(Regex.BUY_PRICE, String.valueOf(newPrice)),
Display UUID when a vendor's name is not found
2016-08-19 12:48:11 +02:00
new LocalizedMessage.ReplacedRegex(Regex.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() + ")");
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 (shop.getVendor().isOnline()) {
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
shop.getVendor().getPlayer().sendMessage(LanguageUtils.getMessage(LocalizedMessage.Message.SOMEONE_BOUGHT, new LocalizedMessage.ReplacedRegex(Regex.AMOUNT, String.valueOf(newAmount)),
new LocalizedMessage.ReplacedRegex(Regex.ITEM_NAME, LanguageUtils.getItemName(product)), new LocalizedMessage.ReplacedRegex(Regex.BUY_PRICE, String.valueOf(newPrice)),
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
new LocalizedMessage.ReplacedRegex(Regex.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() + ")");
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.ERROR_OCCURRED, new LocalizedMessage.ReplacedRegex(Regex.ERROR, r2.errorMessage)));
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
econ.depositPlayer(executor, 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()) {
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
econ.depositPlayer(executor, 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;
}
Added economy log in database file Closes #19
2016-08-18 13:30:14 +02:00
database.logEconomy(executor, newProduct, shop.getVendor(), shop.getShopType(), shop.getLocation(), newPrice, ShopBuySellEvent.Type.BUY);
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();
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.BUY_SUCESS_ADMIN, new LocalizedMessage.ReplacedRegex(Regex.AMOUNT, String.valueOf(newAmount)),
new LocalizedMessage.ReplacedRegex(Regex.ITEM_NAME, LanguageUtils.getItemName(product)), new LocalizedMessage.ReplacedRegex(Regex.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() + ")");
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.ERROR_OCCURRED, new LocalizedMessage.ReplacedRegex(Regex.ERROR, r.errorMessage)));
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
*/
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 sell(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 selling (#" + 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
if (econ.getBalance(shop.getVendor()) >= shop.getSellPrice() || shop.getShopType() == ShopType.ADMIN || config.auto_calculate_item_amount) {
int amountForMoney = (int) (shop.getProduct().getAmount() / shop.getSellPrice() * econ.getBalance(shop.getVendor()));
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());
if (amountForItemCount == 0 && config.auto_calculate_item_amount) {
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());
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);
int amountForChestSpace = (freeSpace >= product.getAmount() ? product.getAmount() : freeSpace);
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
Fixed admin shops
2016-08-17 13:14:35 +02:00
if (amountForChestSpace == 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.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
Fixed admin shops
2016-08-17 13:14:35 +02:00
int newAmount = product.getAmount();
if (config.auto_calculate_item_amount) {
if (shop.getShopType() == ShopType.ADMIN)
newAmount = amountForItemCount;
else
newAmount = Math.min(Math.min(amountForMoney, amountForItemCount), amountForChestSpace);
}
if (newAmount > product.getAmount()) newAmount = product.getAmount();
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
Fixed admin shops
2016-08-17 13:14:35 +02:00
double newPrice = (shop.getSellPrice() / product.getAmount()) * 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
if (freeSpace >= product.getAmount() || (config.auto_calculate_item_amount && freeSpace >= newAmount)) {
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
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
EconomyResponse r = econ.depositPlayer(executor, 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()) {
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
EconomyResponse r2 = (shop.getShopType() != ShopType.ADMIN) ? econ.withdrawPlayer(shop.getVendor(), newPrice) : null;
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()) {
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
econ.withdrawPlayer(executor, newPrice);
econ.depositPlayer(shop.getVendor(), 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;
}
Added economy log in database file Closes #19
2016-08-18 13:30:14 +02:00
database.logEconomy(executor, newProduct, shop.getVendor(), shop.getShopType(), shop.getLocation(), newPrice, ShopBuySellEvent.Type.SELL);
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());
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.SELL_SUCESS, new LocalizedMessage.ReplacedRegex(Regex.AMOUNT, String.valueOf(newAmount)),
new LocalizedMessage.ReplacedRegex(Regex.ITEM_NAME, LanguageUtils.getItemName(product)), new LocalizedMessage.ReplacedRegex(Regex.SELL_PRICE, String.valueOf(newPrice)),
Display UUID when a vendor's name is not found
2016-08-19 12:48:11 +02:00
new LocalizedMessage.ReplacedRegex(Regex.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() + ")");
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 (shop.getVendor().isOnline()) {
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
shop.getVendor().getPlayer().sendMessage(LanguageUtils.getMessage(LocalizedMessage.Message.SOMEONE_SOLD, new LocalizedMessage.ReplacedRegex(Regex.AMOUNT, String.valueOf(newAmount)),
new LocalizedMessage.ReplacedRegex(Regex.ITEM_NAME, LanguageUtils.getItemName(product)), new LocalizedMessage.ReplacedRegex(Regex.SELL_PRICE, String.valueOf(newPrice)),
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
new LocalizedMessage.ReplacedRegex(Regex.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() + ")");
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.ERROR_OCCURRED, new LocalizedMessage.ReplacedRegex(Regex.ERROR, r2.errorMessage)));
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
econ.withdrawPlayer(executor, 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()) {
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
econ.withdrawPlayer(executor, 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;
}
Added economy log in database file Closes #19
2016-08-18 13:30:14 +02:00
database.logEconomy(executor, newProduct, shop.getVendor(), shop.getShopType(), shop.getLocation(), newPrice, ShopBuySellEvent.Type.SELL);
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();
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.SELL_SUCESS_ADMIN, new LocalizedMessage.ReplacedRegex(Regex.AMOUNT, String.valueOf(newAmount)),
new LocalizedMessage.ReplacedRegex(Regex.ITEM_NAME, LanguageUtils.getItemName(product)), new LocalizedMessage.ReplacedRegex(Regex.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() + ")");
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.ERROR_OCCURRED, new LocalizedMessage.ReplacedRegex(Regex.ERROR, r.errorMessage)));
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);
if (item != null) {
Fixed issues with ItemMeta (Mostly issues with books) Fixes #30
2016-11-12 15:03:19 +01:00
if (Utils.isItemSimilar(item, itemStack, false)) {
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);
if (item != null) {
Fixed issues with ItemMeta (Mostly issues with books) Fixes #30
2016-11-12 15:03:19 +01:00
if (Utils.isItemSimilar(item, itemStack, false)) {
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