From a488ae53c092f2272c5effb98e834cb5987f7fa8 Mon Sep 17 00:00:00 2001 From: BuildTools Date: Sat, 10 Nov 2018 00:22:48 +0100 Subject: [PATCH 1/3] Update to 1.13.x Native --- src/main/java/grokswell/.DS_Store | Bin 0 -> 6148 bytes .../hypermerchant/HyperMerchantPlugin.java | 2 +- .../java/grokswell/hypermerchant/ManageMenu.java | 14 +++++--------- .../grokswell/hypermerchant/MerchantMethods.java | 2 +- .../java/grokswell/hypermerchant/ShopMenu.java | 13 +++++-------- .../java/grokswell/hypermerchant/ShopStock.java | 2 +- .../hypermerchant/ShopTransactions.java | 10 +++++----- src/main/java/grokswell/util/ActiveEnchant.java | 2 +- src/main/java/grokswell/util/Blacklist.java | 1 - src/main/java/grokswell/util/EnchantIcons.java | 8 ++++---- src/main/java/grokswell/util/HyperToBukkit.java | 3 ++- src/main/java/grokswell/util/MenuButtonData.java | 4 ++-- src/main/resources/menubuttons.yml | 10 +++++----- src/main/resources/plugin.yml | 3 ++- 14 files changed, 34 insertions(+), 40 deletions(-) create mode 100644 src/main/java/grokswell/.DS_Store diff --git a/src/main/java/grokswell/.DS_Store b/src/main/java/grokswell/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..4640c962c33aace3ab59dcce0e70cbb6a0ca0bd2 GIT binary patch literal 6148 zcmeHK!A=4(5S;?*5<}!*BFA35aex4NGTE$n@MeP1gBsWsBAdW2Sr!Q*W`9Hf$S?4B zoM{V6P*27fGLuZ-bUM?fuba*m0E9DYmjUtsV4)JGve`MJBX;A_&~c+H)$`jO&)DZ-*jw1Hcj0%&&HV0h7{sn0bfQn;*Oz|K4#!S73fe<8 z&zT!{F;^|r%onE9N~Knmm1=EPl+(k*Qc+eb2eX-F?d_M3PFwxS!}M|X^sIRn_(>|+ zF*t`8G=A9feIp8bVQ`00^BLxujLZNtzznPj1Lk_Ow%24oybWf68TdU0=zfr>gtoy% zqq;hYT8Y0x&9Xv7f|p;HlcsxVIsq0`YXO`L5o(WuiwsFiUZv$8NR z6rol}zf|EMY>nJ91I)lO18LpOQ~f{r{{6q4#64z!8CWX@M5f-TJGdoNTURzmwN|3G qP)R5*(YQ!KLzQBTrBYl#Rf2v=2BK{+(TE-t{t-|#aKjAzDFg3=Iaam+ literal 0 HcmV?d00001 diff --git a/src/main/java/grokswell/hypermerchant/HyperMerchantPlugin.java b/src/main/java/grokswell/hypermerchant/HyperMerchantPlugin.java index f9f62e9..e00df0a 100644 --- a/src/main/java/grokswell/hypermerchant/HyperMerchantPlugin.java +++ b/src/main/java/grokswell/hypermerchant/HyperMerchantPlugin.java @@ -401,7 +401,7 @@ public void onEnable() { } try { - active_enchant = new ActiveEnchant(111); //< this is your custom wrapper (a class that extends an EnchantmentWrapper with the needed stuff and returns + active_enchant = new ActiveEnchant("hypermerchantWrapper"); //< this is your custom wrapper (a class that extends an EnchantmentWrapper with the needed stuff and returns EnchantmentWrapper.registerEnchantment(active_enchant); // status_list; String economy_name; HyperToBukkit hypBuk; @@ -129,7 +126,6 @@ public ManageMenu(String name, int size, HyperMerchantPlugin plgn,CommandSender this.inventory = Bukkit.createInventory(player, size, this.inventory_name); hyplay = hyperAPI.getHyperPlayer(player.getName()); - hc = HMP.hc; economy_name = hyperAPI.getShop(this.shopname).getEconomy(); @@ -208,7 +204,7 @@ public void loadPage() { TradeObject ho = hyperAPI.getHyperObject(item_name, economy_name, hyperAPI.getShop(shopname)); if (ho == null) { stock=0; - stack=new ItemStack(Material.AIR, 1, (short) 0); + stack=new ItemStack(Material.AIR, 1); value=0; cost=0; @@ -237,10 +233,10 @@ public void loadPage() { value = ho.getSellPriceWithTax(1.0, hyplay); cost = ho.getBuyPriceWithTax(1.0); - stack = new ItemStack(Material.POTION, 1, (short) 0); + stack = new ItemStack(Material.POTION); } else { - stack = new ItemStack(Material.AIR, 1, (short) 0); + stack = new ItemStack(Material.AIR, 1); } String buy_dynamic = Utils.formatText(L.II_DYNAMIC, null); @@ -276,7 +272,7 @@ public void loadPage() { ItemStack stack; while (count < size-9) { - stack = new ItemStack(Material.STAINED_GLASS_PANE, 1, DyeColor.SILVER.getWoolData()); + stack = new ItemStack(Material.LIGHT_GRAY_STAINED_GLASS_PANE, 1); this.setOption(count, stack, " ", " "); count++; } @@ -431,7 +427,7 @@ public void itemRefresh(int slot, TradeObject ho) { stack = (new EnchantIcons()).getIcon(ho.getDisplayName(), ho.getEnchantmentLevel()); } else if (ho.getType()==TradeObjectType.EXPERIENCE) { - stack = new ItemStack(Material.POTION, 1, (short) 0); + stack = new ItemStack(Material.POTION, 1); } else { stack = hypBuk.getItemStack(ho.getItemStack(1)); diff --git a/src/main/java/grokswell/hypermerchant/MerchantMethods.java b/src/main/java/grokswell/hypermerchant/MerchantMethods.java index 440b7e9..882c270 100644 --- a/src/main/java/grokswell/hypermerchant/MerchantMethods.java +++ b/src/main/java/grokswell/hypermerchant/MerchantMethods.java @@ -217,7 +217,7 @@ public int Hire(String npcname, String npctype, String shopname, Location locati } if (l.getBlock().getType() != Material.AIR) { - l = utils.getFirstBlockAboveGround(l); + l = Utils.getFirstBlockAboveGround(l); } this_npc = npcReg.createNPC(EntityType.valueOf(npc_type.toUpperCase()), npcname); diff --git a/src/main/java/grokswell/hypermerchant/ShopMenu.java b/src/main/java/grokswell/hypermerchant/ShopMenu.java index 08b6161..f83e668 100644 --- a/src/main/java/grokswell/hypermerchant/ShopMenu.java +++ b/src/main/java/grokswell/hypermerchant/ShopMenu.java @@ -1,7 +1,5 @@ package grokswell.hypermerchant; -import static java.lang.System.out; - import java.util.ArrayList; import java.util.Arrays; import java.util.HashMap; @@ -10,7 +8,6 @@ import net.citizensnpcs.api.npc.NPC; import org.bukkit.Bukkit; -import org.bukkit.DyeColor; import org.bukkit.GameMode; import org.bukkit.ChatColor; import org.bukkit.Material; @@ -184,7 +181,7 @@ public void loadPage() { if (ho == null) { stock=0; - stack=new ItemStack(Material.AIR, 1, (short) 0); + stack=new ItemStack(Material.AIR, 1); value=0; cost=0; @@ -217,10 +214,10 @@ public void loadPage() { value = ho.getSellPriceWithTax(1.0, hp); cost = ho.getBuyPriceWithTax(1.0); - stack = new ItemStack(Material.POTION, 1, (short) 0); + stack = new ItemStack(Material.POTION, 1); } else { - stack = new ItemStack(Material.AIR, 1, (short) 0); + stack = new ItemStack(Material.AIR, 1); } //String status = ""; @@ -247,7 +244,7 @@ public void loadPage() { ItemStack stack; while (count < size-9) { - stack = new ItemStack(Material.STAINED_GLASS_PANE, 1, DyeColor.SILVER.getWoolData()); + stack = new ItemStack(Material.LIGHT_GRAY_STAINED_GLASS_PANE,1); this.setOption(count, stack, " ", " "); count++; } @@ -398,7 +395,7 @@ public void itemRefresh(int slot, TradeObject ho) { stack = (new EnchantIcons()).getIcon(ho.getDisplayName(), ho.getEnchantmentLevel()); } else if (ho.getType()==TradeObjectType.EXPERIENCE) { - stack = new ItemStack(Material.POTION, 1, (short) 0); + stack = new ItemStack(Material.POTION, 1); } else { stack = hypBuk.getItemStack(ho.getItemStack(1)); diff --git a/src/main/java/grokswell/hypermerchant/ShopStock.java b/src/main/java/grokswell/hypermerchant/ShopStock.java index 9eb33fa..b337f35 100644 --- a/src/main/java/grokswell/hypermerchant/ShopStock.java +++ b/src/main/java/grokswell/hypermerchant/ShopStock.java @@ -197,7 +197,7 @@ public ArrayList Sort(Integer sort_by) { } catch (Exception e) { - sender.sendMessage(Utils.formatText(L.G_SHOP_OPEN_FAIL, null)); + sender.sendMessage(Utils.formatText(Language.G_SHOP_OPEN_FAIL, null)); return null; } } diff --git a/src/main/java/grokswell/hypermerchant/ShopTransactions.java b/src/main/java/grokswell/hypermerchant/ShopTransactions.java index f976e62..b9dbf22 100644 --- a/src/main/java/grokswell/hypermerchant/ShopTransactions.java +++ b/src/main/java/grokswell/hypermerchant/ShopTransactions.java @@ -14,7 +14,6 @@ import org.bukkit.enchantments.Enchantment; import org.bukkit.entity.Player; import org.bukkit.inventory.ItemStack; -import org.bukkit.inventory.PlayerInventory; import org.bukkit.inventory.meta.EnchantmentStorageMeta; import regalowl.hyperconomy.api.HEconomyProvider; @@ -29,6 +28,7 @@ import regalowl.hyperconomy.tradeobject.TradeObjectType; import regalowl.hyperconomy.transaction.TransactionResponse; +@SuppressWarnings("deprecation") public class ShopTransactions { ArrayList> pages = new ArrayList>(); int items_count; @@ -122,6 +122,7 @@ public ItemStack SellItem(ItemStack item_stack, String menu_item_name){ } // PLAYER SELLS ENCHANT TO SHOP + public ItemStack SellSingleEnchant(ItemStack item_stack, String enchant) { //out.println("SellSingleEnchant"); HItemStack hi = bukCon.getBukkitCommon().getSerializableItemStack(item_stack); @@ -150,6 +151,7 @@ public ItemStack SellSingleEnchant(ItemStack item_stack, String enchant) { ItemStack stack = new ItemStack(item_stack.clone()); if (keep_enchants.size()>0) { for (TradeObject e : keep_enchants){ + stack.addUnsafeEnchantment(Enchantment.getByName(e.getEnchantment().getEnchantmentName()), e.getEnchantmentLevel()); } } @@ -388,10 +390,8 @@ else if (ho.getType() == TradeObjectType.ITEM) { //PLAYER-MANAGER ADDS SOMETHING TO SHOP public ItemStack AddItemStack(ItemStack item_stack) { //out.println("AddItemStack: "+item_stack); - HItemStack hi = bukCon.getBukkitCommon().getSerializableItemStack(item_stack); - PlayerShop pshop=hyperAPI.getPlayerShop(this.shopname); - HyperEconomy he = hc.getDataManager().getEconomy(pshop.getEconomy()); - TradeObject ho = hyplay.getHyperEconomy().getTradeObject(hi); + + if (item_stack.getType()==Material.ENCHANTED_BOOK) { ItemStack return_item = this.AddEnchantedBook(item_stack); diff --git a/src/main/java/grokswell/util/ActiveEnchant.java b/src/main/java/grokswell/util/ActiveEnchant.java index e40e5b9..1bfc2ac 100644 --- a/src/main/java/grokswell/util/ActiveEnchant.java +++ b/src/main/java/grokswell/util/ActiveEnchant.java @@ -8,7 +8,7 @@ //Thanks to Captain Bern for this class public class ActiveEnchant extends EnchantmentWrapper { - public ActiveEnchant(int id) { + public ActiveEnchant(String id) { super(id); } diff --git a/src/main/java/grokswell/util/Blacklist.java b/src/main/java/grokswell/util/Blacklist.java index e3c9c5a..9c7e9be 100644 --- a/src/main/java/grokswell/util/Blacklist.java +++ b/src/main/java/grokswell/util/Blacklist.java @@ -5,7 +5,6 @@ import java.io.File; import java.io.IOException; -import java.io.InputStream; import java.io.InputStreamReader; import java.util.ArrayList; diff --git a/src/main/java/grokswell/util/EnchantIcons.java b/src/main/java/grokswell/util/EnchantIcons.java index 77e0937..d52b846 100644 --- a/src/main/java/grokswell/util/EnchantIcons.java +++ b/src/main/java/grokswell/util/EnchantIcons.java @@ -24,7 +24,7 @@ else if (ename.contains("thorns")) { } else if (ename.contains("efficiency")) { - stack = new ItemStack(Material.IRON_SPADE); + stack = new ItemStack(Material.IRON_SHOVEL); stack.addEnchantment(Enchantment.DIG_SPEED, elevel); } @@ -39,12 +39,12 @@ else if (ename.contains("respiration")) { } else if (ename.contains("silktouch") ) { - stack = new ItemStack(Material.IRON_SPADE); + stack = new ItemStack(Material.IRON_SHOVEL); stack.addEnchantment(Enchantment.SILK_TOUCH, elevel); } else if (ename.contains("fortune")) { - stack = new ItemStack(Material.IRON_SPADE); + stack = new ItemStack(Material.IRON_SHOVEL); stack.addEnchantment(Enchantment.LOOT_BONUS_BLOCKS, elevel); } @@ -139,7 +139,7 @@ else if (ename.contains("frost_walker")) { } else { - stack = new ItemStack(Material.CARROT_STICK); + stack = new ItemStack(Material.CARROT_ON_A_STICK); stack.addEnchantment(Enchantment.MENDING, 1); } diff --git a/src/main/java/grokswell/util/HyperToBukkit.java b/src/main/java/grokswell/util/HyperToBukkit.java index af20b9a..abcf228 100644 --- a/src/main/java/grokswell/util/HyperToBukkit.java +++ b/src/main/java/grokswell/util/HyperToBukkit.java @@ -8,6 +8,7 @@ import regalowl.hyperconomy.inventory.HItemStack; import regalowl.hyperconomy.minecraft.HLocation; + public class HyperToBukkit { @@ -18,7 +19,7 @@ public Location getLocation(HLocation hl){ public ItemStack getItemStack(HItemStack hi){ Material mat = Material.getMaterial(hi.getMaterial()); - ItemStack stack = new ItemStack(mat, hi.getAmount(), hi.getDurability()); + ItemStack stack = new ItemStack(mat, hi.getAmount()); return stack; } } diff --git a/src/main/java/grokswell/util/MenuButtonData.java b/src/main/java/grokswell/util/MenuButtonData.java index f892d33..a5014cc 100644 --- a/src/main/java/grokswell/util/MenuButtonData.java +++ b/src/main/java/grokswell/util/MenuButtonData.java @@ -5,7 +5,6 @@ import java.io.File; import java.io.IOException; -import java.io.InputStream; import java.io.InputStreamReader; import java.util.Arrays; @@ -16,6 +15,7 @@ import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.meta.ItemMeta; +@SuppressWarnings("deprecation") public class MenuButtonData { private static File dataFolder; private HyperMerchantPlugin plugin; @@ -171,7 +171,7 @@ private void setMenuButtonItemStacks() { help4 = new ItemStack(Material.getMaterial(menuButtonData.getString("help4.material"))); help4.setDurability(Short.parseShort(menuButtonData.getString("help4.data"))); setItemNameAndLore(help4, menuButtonData.getString("help4.name"), ParseLore(menuButtonData.getString("help4.lore"))); - + help5 = new ItemStack(Material.getMaterial(menuButtonData.getString("help5.material"))); help5.setDurability(Short.parseShort(menuButtonData.getString("help5.data"))); setItemNameAndLore(help5, menuButtonData.getString("help5.name"), ParseLore(menuButtonData.getString("help5.lore"))); diff --git a/src/main/resources/menubuttons.yml b/src/main/resources/menubuttons.yml index aa02b0e..9da453f 100644 --- a/src/main/resources/menubuttons.yml +++ b/src/main/resources/menubuttons.yml @@ -1,10 +1,10 @@ first_page: - material: STAINED_GLASS_PANE + material: WHITE_STAINED_GLASS_PANE data: 14 name: First Page lore: Go to the first page. back: - material: STAINED_GLASS_PANE + material: WHITE_STAINED_GLASS_PANE data: 5 name: Back 1 lore: Go back to the previous page. @@ -36,12 +36,12 @@ help5: name: Switch Sorting Mode lore: Left-click switch sorting mode,Right-click toggle zero stock forward: - material: STAINED_GLASS_PANE + material: WHITE_STAINED_GLASS_PANE data: 5 name: Forward 1 lore: Go to the next page. last_page: - material: STAINED_GLASS_PANE + material: WHITE_STAINED_GLASS_PANE data: 14 name: Last page lore: Go to the last page. @@ -56,7 +56,7 @@ sell_price: name: Sell Price lore: How much others pay you:,Click this button and then,click items to change price.,Click something else when finished.,Right click items for dynamic pricing status: - material: REDSTONE_COMPARATOR + material: COMPARATOR data: 0 name: Set Status lore: Click this button and then,Click items to change their status.,Click something else when finished. diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml index 17e404d..844a5cf 100644 --- a/src/main/resources/plugin.yml +++ b/src/main/resources/plugin.yml @@ -1,6 +1,7 @@ name: HyperMerchant main: grokswell.hypermerchant.HyperMerchantPlugin -version: 1.6.2-dev +version: 1.6.4 +api-version: 1.13 description: Inventory menu to be used with HyperConomy shops and NPC trait for Citizens2. author: Grokswell authors: [Grokswell] From 6636dd25b94037a586ddacf9f1c66b30aa2be475 Mon Sep 17 00:00:00 2001 From: BuildTools Date: Sat, 10 Nov 2018 00:23:15 +0100 Subject: [PATCH 2/3] Remove imperfection... --- src/main/java/grokswell/.DS_Store | Bin 6148 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 src/main/java/grokswell/.DS_Store diff --git a/src/main/java/grokswell/.DS_Store b/src/main/java/grokswell/.DS_Store deleted file mode 100644 index 4640c962c33aace3ab59dcce0e70cbb6a0ca0bd2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6148 zcmeHK!A=4(5S;?*5<}!*BFA35aex4NGTE$n@MeP1gBsWsBAdW2Sr!Q*W`9Hf$S?4B zoM{V6P*27fGLuZ-bUM?fuba*m0E9DYmjUtsV4)JGve`MJBX;A_&~c+H)$`jO&)DZ-*jw1Hcj0%&&HV0h7{sn0bfQn;*Oz|K4#!S73fe<8 z&zT!{F;^|r%onE9N~Knmm1=EPl+(k*Qc+eb2eX-F?d_M3PFwxS!}M|X^sIRn_(>|+ zF*t`8G=A9feIp8bVQ`00^BLxujLZNtzznPj1Lk_Ow%24oybWf68TdU0=zfr>gtoy% zqq;hYT8Y0x&9Xv7f|p;HlcsxVIsq0`YXO`L5o(WuiwsFiUZv$8NR z6rol}zf|EMY>nJ91I)lO18LpOQ~f{r{{6q4#64z!8CWX@M5f-TJGdoNTURzmwN|3G qP)R5*(YQ!KLzQBTrBYl#Rf2v=2BK{+(TE-t{t-|#aKjAzDFg3=Iaam+ From a9198655bcbd51df1270ed01dd167eddbd976223 Mon Sep 17 00:00:00 2001 From: "Codename: PurpleBee MST" <39744739+PurpleStormCloud@users.noreply.github.com> Date: Sun, 24 Mar 2019 13:10:22 +0100 Subject: [PATCH 3/3] Update README.md --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 98cab8a..ba5ba0e 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,4 @@ +## Download the latest LifeSupport version from https://github.com/OTGEngineering/OTG-HyperMerchant-LifeSupport/releases HyperMerchant =============