diff --git a/pom.xml b/pom.xml
index bc862a2..cbac236 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
4.0.0
org.maxgamer
QuickShop
- 0.9.38
+ 1.13-0.9.39-beta
@@ -61,19 +61,19 @@
org.bukkit
bukkit
- 1.9.4-R0.1-SNAPSHOT
+ 1.13-R0.1-SNAPSHOT
jar
provided
com.sk89q
worldguard
- 6.0.0-SNAPSHOT
+ 6.1.1-SNAPSHOT
net.milkbowl.vault
VaultAPI
- 1.5
+ 1.6
provided
@@ -83,48 +83,6 @@
system
${basedir}/lib/HeroChat.jar
-
- org.bukkit.craftbukkit.v1_7_R3
- craftbukkit
- v1_7_R3
- system
- ${basedir}/lib/craftbukkit-1.7.9-R0.2.jar
-
-
- org.bukkit.craftbukkit.v1_8_R3
- craftbukkit
- v1_8_R3
- system
- ${basedir}/lib/craftbukkit-1.8.8-R0.1.jar
-
-
- org.bukkit.craftbukkit.v1_9_R2
- craftbukkit
- v1_9_R2
- system
- ${basedir}/lib/craftbukkit-1.9.4-R0.1-SNAPSHOT-latest.jar
-
-
- org.bukkit.craftbukkit.v1_10_R1
- spigot
- v1_10_R1
- system
- ${basedir}/lib/spigot-1.10.2-R0.1-SNAPSHOT-latest.jar
-
-
- org.bukkit.craftbukkit.v1_11_R1
- spigot
- v1_11_R1
- system
- ${basedir}/lib/spigot-1.11.jar
-
-
- org.bukkit.craftbukkit.v1_12_R1
- spigot
- v1_12_R1
- system
- ${basedir}/lib/spigot-1.12-SNAPSHOT.jar
-
org.maxgamer.quickshop
diff --git a/src/main/java/org/maxgamer/quickshop/Command/QS.java b/src/main/java/org/maxgamer/quickshop/Command/QS.java
index 2dc2be0..a810fc8 100644
--- a/src/main/java/org/maxgamer/quickshop/Command/QS.java
+++ b/src/main/java/org/maxgamer/quickshop/Command/QS.java
@@ -307,7 +307,7 @@ private void create(CommandSender sender, String[] args) {
p.sendMessage(MsgUtil.getMessage("no-double-chests"));
return;
}
- if (Util.isBlacklisted(item.getType()) && !p.hasPermission("quickshop.bypass." + item.getTypeId())) {
+ if (Util.isBlacklisted(item.getType()) && !p.hasPermission("quickshop.bypass." + item.getType().name())) {
p.sendMessage(MsgUtil.getMessage("blacklisted-item"));
return;
}
diff --git a/src/main/java/org/maxgamer/quickshop/Listeners/PlayerListener.java b/src/main/java/org/maxgamer/quickshop/Listeners/PlayerListener.java
index ae5f579..259a9ef 100644
--- a/src/main/java/org/maxgamer/quickshop/Listeners/PlayerListener.java
+++ b/src/main/java/org/maxgamer/quickshop/Listeners/PlayerListener.java
@@ -120,7 +120,7 @@ else if (!e.isCancelled() && shop == null && item != null && item.getType() != M
p.sendMessage(MsgUtil.getMessage("no-double-chests"));
return;
}
- if (Util.isBlacklisted(item.getType()) && !p.hasPermission("quickshop.bypass." + item.getTypeId())) {
+ if (Util.isBlacklisted(item.getType()) && !p.hasPermission("quickshop.bypass." + item.getType().name())) {
p.sendMessage(MsgUtil.getMessage("blacklisted-item"));
return;
}
diff --git a/src/main/java/org/maxgamer/quickshop/QuickShop.java b/src/main/java/org/maxgamer/quickshop/QuickShop.java
index d5ba7b5..5f08b93 100644
--- a/src/main/java/org/maxgamer/quickshop/QuickShop.java
+++ b/src/main/java/org/maxgamer/quickshop/QuickShop.java
@@ -133,7 +133,7 @@ public int getShopLimit(Player p) {
}
public void onEnable() {
- NMS.init();
+ //NMS.init();
instance = this;
saveDefaultConfig(); // Creates the config folder and copies config.yml
diff --git a/src/main/java/org/maxgamer/quickshop/Shop/ContainerShop.java b/src/main/java/org/maxgamer/quickshop/Shop/ContainerShop.java
index 0e68676..c8589f9 100644
--- a/src/main/java/org/maxgamer/quickshop/Shop/ContainerShop.java
+++ b/src/main/java/org/maxgamer/quickshop/Shop/ContainerShop.java
@@ -593,7 +593,7 @@ public boolean isValid() {
}
private void checkDisplay() {
- if (plugin.display == false)
+ /*if (plugin.display == false)
return;
if (getLocation().getWorld() == null)
return; // not loaded
@@ -626,7 +626,7 @@ private void checkDisplay() {
} else if (item.getLocation().distanceSquared(dispLoc) > 1) {
item.teleport(dispLoc, TeleportCause.PLUGIN);
}
- }
+ }*/
}
public boolean checkDisplayMoved() {
diff --git a/src/main/java/org/maxgamer/quickshop/Shop/DisplayItem.java b/src/main/java/org/maxgamer/quickshop/Shop/DisplayItem.java
index 3093004..7eec413 100644
--- a/src/main/java/org/maxgamer/quickshop/Shop/DisplayItem.java
+++ b/src/main/java/org/maxgamer/quickshop/Shop/DisplayItem.java
@@ -37,7 +37,7 @@ public DisplayItem(Shop shop, ItemStack iStack) {
* Spawns the dummy item on top of the shop.
*/
public void spawn() {
- if (shop.getLocation().getWorld() == null)
+ /*if (shop.getLocation().getWorld() == null)
return;
Location dispLoc = this.getDisplayLocation();
this.item = shop.getLocation().getWorld().dropItem(dispLoc, this.iStack);
@@ -50,7 +50,7 @@ public void spawn() {
} catch (Exception e) {
e.printStackTrace();
System.out.println("QuickShop version mismatch! This version of QuickShop is incompatible with this version of bukkit! Try update?");
- }
+ }*/
}
/**
@@ -98,10 +98,10 @@ public boolean removeDupe() {
* Removes the display item.
*/
public void remove() {
- if (this.item == null)
+ /*if (this.item == null)
return;
this.item.remove();
- this.item = null;
+ this.item = null;*/
}
/**
diff --git a/src/main/java/org/maxgamer/quickshop/Shop/ShopManager.java b/src/main/java/org/maxgamer/quickshop/Shop/ShopManager.java
index 48b340a..6d300ba 100644
--- a/src/main/java/org/maxgamer/quickshop/Shop/ShopManager.java
+++ b/src/main/java/org/maxgamer/quickshop/Shop/ShopManager.java
@@ -375,34 +375,6 @@ public void run() {
sign.setFacingDirection(bf);
bs.update(true);
shop.setSignText();
- /*
- * Block b = shop.getLocation().getBlock();
- * ItemFrame iFrame = (ItemFrame)
- * b.getWorld().spawnEntity(b.getLocation(),
- * EntityType.ITEM_FRAME);
- *
- * BlockFace[] faces = new
- * BlockFace[]{BlockFace.NORTH, BlockFace.EAST,
- * BlockFace.SOUTH, BlockFace.WEST}; for(BlockFace
- * face : faces){ if(face == bf) continue; //This is
- * the sign's location iFrame.setFacingDirection(bf,
- * true); //iFrame.setItem(shop.getItem());
- * ItemStack iStack = shop.getItem().clone();
- * iStack.setAmount(0); iFrame.setItem(iStack); /*
- * Field handleField =
- * iFrame.getClass().getField("entity");
- * handleField.setAccessible(true); Object handle =
- * handleField.get(iFrame);
- *
- * ItemStack bukkitStack = shop.getItem();
- *
- * Field itemStackHandle =
- *
- * Method setItemStack =
- * handle.getClass().getMethod("a", Object.class);
- * setItemStack.
- */
- // }
}
if (shop instanceof ContainerShop) {
ContainerShop cs = (ContainerShop) shop;
diff --git a/src/main/java/org/maxgamer/quickshop/Util/CustomPotionsName.java b/src/main/java/org/maxgamer/quickshop/Util/CustomPotionsName.java
index daa3b3c..b95531e 100644
--- a/src/main/java/org/maxgamer/quickshop/Util/CustomPotionsName.java
+++ b/src/main/java/org/maxgamer/quickshop/Util/CustomPotionsName.java
@@ -14,7 +14,7 @@ public class CustomPotionsName {
private static String[] signFormat, shopInfoFormat;
private CustomPotionsName() {}
-
+ /*
public static String getSignName(ItemStack potionItemStack) {
GenericPotionData potion = NMS.getPotionData(potionItemStack);
if (potion==null) {
@@ -125,7 +125,7 @@ public static String getEffects(ItemStack potionItemStack) {
return sb.toString();
}
-
+ */
public static class Names {
private String sign, full;
diff --git a/src/main/java/org/maxgamer/quickshop/Util/MsgUtil.java b/src/main/java/org/maxgamer/quickshop/Util/MsgUtil.java
index 9f7e811..426d6a3 100644
--- a/src/main/java/org/maxgamer/quickshop/Util/MsgUtil.java
+++ b/src/main/java/org/maxgamer/quickshop/Util/MsgUtil.java
@@ -139,12 +139,12 @@ public static void sendShopInfo(Player p, Shop shop) {
p.sendMessage(ChatColor.DARK_PURPLE + "| " + MsgUtil.getMessage("menu.shop-information"));
p.sendMessage(ChatColor.DARK_PURPLE + "| " + MsgUtil.getMessage("menu.owner", shop.ownerName()));
p.sendMessage(ChatColor.DARK_PURPLE + "| " + MsgUtil.getMessage("menu.item", shop.getDataName()));
- if (NMS.isPotion(items.getType())) {
+ /*if (NMS.isPotion(items.getType())) {
String effects = CustomPotionsName.getEffects(items);
if (!effects.isEmpty()) {
p.sendMessage(ChatColor.DARK_PURPLE + "| " + MsgUtil.getMessage("menu.effects", effects));
}
- }
+ }*/
if (Util.isTool(items.getType())) {
p.sendMessage(ChatColor.DARK_PURPLE + "| " + MsgUtil.getMessage("menu.damage-percent-remaining", Util.getToolPercentage(items)));
}
diff --git a/src/main/java/org/maxgamer/quickshop/Util/NMS.java b/src/main/java/org/maxgamer/quickshop/Util/NMS.java
index 1dc7aef..4b0ac4a 100644
--- a/src/main/java/org/maxgamer/quickshop/Util/NMS.java
+++ b/src/main/java/org/maxgamer/quickshop/Util/NMS.java
@@ -1,5 +1,5 @@
package org.maxgamer.quickshop.Util;
-
+/*
import java.io.BufferedInputStream;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
@@ -27,10 +27,10 @@
import org.maxgamer.quickshop.QuickShop;
import org.maxgamer.quickshop.Util.CustomPotionsName.GenericPotionData;
import org.maxgamer.quickshop.Util.CustomPotionsName.GenericPotionData.Category;
-
-@SuppressWarnings("deprecation")
+*/
+//@SuppressWarnings("deprecation")
public class NMS {
- private static ArrayList nmsDependencies = new ArrayList();
+ /*private static ArrayList nmsDependencies = new ArrayList();
private static int nextId = 0;
private static NMSDependent nms;
@@ -573,7 +573,7 @@ public static boolean isPotion(Material material) {
public static GenericPotionData getPotionData(ItemStack potion) {
return nms.getPotionData(potion);
- }
+ }*/
/*private static void protect(Item item) {
try {
@@ -607,7 +607,7 @@ public static GenericPotionData getPotionData(ItemStack potion) {
e.printStackTrace();
}
}*/
-
+ /*
private static abstract class NMSDependent {
private String version;
@@ -632,5 +632,5 @@ public byte[] getNBTBytes(org.bukkit.inventory.ItemStack paramItemStack) {
public org.bukkit.inventory.ItemStack getItemStack(byte[] paramArrayOfByte) {
throw new UnsupportedOperationException();
}
- }
+ }*/
}
diff --git a/src/main/java/org/maxgamer/quickshop/Util/Util.java b/src/main/java/org/maxgamer/quickshop/Util/Util.java
index e7e931f..0933fa1 100644
--- a/src/main/java/org/maxgamer/quickshop/Util/Util.java
+++ b/src/main/java/org/maxgamer/quickshop/Util/Util.java
@@ -55,7 +55,7 @@ public static void initialize() {
Material mat = Material.getMaterial(s.toUpperCase());
if (mat == null) {
try {
- mat = Material.getMaterial(Integer.parseInt(s));
+ mat = Material.matchMaterial(s);
} catch (NumberFormatException e) {
}
}
@@ -73,11 +73,11 @@ public static void initialize() {
tools.add(Material.CHAINMAIL_CHESTPLATE);
tools.add(Material.CHAINMAIL_HELMET);
tools.add(Material.CHAINMAIL_LEGGINGS);
- tools.add(Material.WOOD_AXE);
+ /*tools.add(Material.WOOD_AXE);
tools.add(Material.WOOD_HOE);
tools.add(Material.WOOD_PICKAXE);
tools.add(Material.WOOD_SPADE);
- tools.add(Material.WOOD_SWORD);
+ tools.add(Material.WOOD_SWORD);*/
tools.add(Material.LEATHER_BOOTS);
tools.add(Material.LEATHER_CHESTPLATE);
tools.add(Material.LEATHER_HELMET);
@@ -85,7 +85,7 @@ public static void initialize() {
tools.add(Material.DIAMOND_AXE);
tools.add(Material.DIAMOND_HOE);
tools.add(Material.DIAMOND_PICKAXE);
- tools.add(Material.DIAMOND_SPADE);
+ //tools.add(Material.DIAMOND_SPADE);
tools.add(Material.DIAMOND_SWORD);
tools.add(Material.DIAMOND_BOOTS);
tools.add(Material.DIAMOND_CHESTPLATE);
@@ -94,9 +94,9 @@ public static void initialize() {
tools.add(Material.STONE_AXE);
tools.add(Material.STONE_HOE);
tools.add(Material.STONE_PICKAXE);
- tools.add(Material.STONE_SPADE);
+ //tools.add(Material.STONE_SPADE);
tools.add(Material.STONE_SWORD);
- tools.add(Material.GOLD_AXE);
+ /*tools.add(Material.GOLD_AXE);
tools.add(Material.GOLD_HOE);
tools.add(Material.GOLD_PICKAXE);
tools.add(Material.GOLD_SPADE);
@@ -104,11 +104,11 @@ public static void initialize() {
tools.add(Material.GOLD_BOOTS);
tools.add(Material.GOLD_CHESTPLATE);
tools.add(Material.GOLD_HELMET);
- tools.add(Material.GOLD_LEGGINGS);
+ tools.add(Material.GOLD_LEGGINGS);*/
tools.add(Material.IRON_AXE);
tools.add(Material.IRON_HOE);
tools.add(Material.IRON_PICKAXE);
- tools.add(Material.IRON_SPADE);
+ //tools.add(Material.IRON_SPADE);
tools.add(Material.IRON_SWORD);
tools.add(Material.IRON_BOOTS);
tools.add(Material.IRON_CHESTPLATE);
@@ -118,7 +118,7 @@ public static void initialize() {
for (String s : configBlacklist) {
Material mat = Material.getMaterial(s.toUpperCase());
if (mat == null) {
- mat = Material.getMaterial(Integer.parseInt(s));
+ mat = Material.matchMaterial(s);
if (mat == null) {
plugin.getLogger().info(s + " is not a valid material. Check your spelling or ID");
continue;
@@ -128,87 +128,87 @@ public static void initialize() {
}
// ToDo: add extras to config file
- addTransparentBlock(Material.AIR);
- /* Misc */
- addTransparentBlock(Material.CAKE_BLOCK);
- /* Redstone Material */
- addTransparentBlock(Material.REDSTONE_WIRE);
- /* Redstone Torches */
- addTransparentBlock(Material.REDSTONE_TORCH_OFF);
- addTransparentBlock(Material.REDSTONE_TORCH_ON);
- /* Diodes (Repeaters) */
- addTransparentBlock(Material.DIODE_BLOCK_OFF);
- addTransparentBlock(Material.DIODE_BLOCK_ON);
- /* Power Sources */
- addTransparentBlock(Material.DETECTOR_RAIL);
- addTransparentBlock(Material.LEVER);
- addTransparentBlock(Material.STONE_BUTTON);
- addTransparentBlock(Material.WOOD_BUTTON);
- addTransparentBlock(Material.STONE_PLATE);
- addTransparentBlock(Material.WOOD_PLATE);
- /* Nature Material */
- addTransparentBlock(Material.RED_MUSHROOM);
- addTransparentBlock(Material.BROWN_MUSHROOM);
- addTransparentBlock(Material.RED_ROSE);
- addTransparentBlock(Material.YELLOW_FLOWER);
- addTransparentBlock(Material.FLOWER_POT);
- /* Greens */
- addTransparentBlock(Material.LONG_GRASS);
- addTransparentBlock(Material.VINE);
- addTransparentBlock(Material.WATER_LILY);
- /* Seedy things */
- addTransparentBlock(Material.MELON_STEM);
- addTransparentBlock(Material.PUMPKIN_STEM);
- addTransparentBlock(Material.CROPS);
- addTransparentBlock(Material.NETHER_WARTS);
- /* Semi-nature */
- addTransparentBlock(Material.SNOW);
- addTransparentBlock(Material.FIRE);
- addTransparentBlock(Material.WEB);
- addTransparentBlock(Material.TRIPWIRE);
- addTransparentBlock(Material.TRIPWIRE_HOOK);
- /* Stairs */
- addTransparentBlock(Material.COBBLESTONE_STAIRS);
- addTransparentBlock(Material.BRICK_STAIRS);
- addTransparentBlock(Material.SANDSTONE_STAIRS);
- addTransparentBlock(Material.NETHER_BRICK_STAIRS);
- addTransparentBlock(Material.SMOOTH_STAIRS);
- /* Wood Stairs */
- addTransparentBlock(Material.BIRCH_WOOD_STAIRS);
- addTransparentBlock(Material.WOOD_STAIRS);
- addTransparentBlock(Material.JUNGLE_WOOD_STAIRS);
- addTransparentBlock(Material.SPRUCE_WOOD_STAIRS);
- /* Lava & Water */
- addTransparentBlock(Material.LAVA);
- addTransparentBlock(Material.STATIONARY_LAVA);
- addTransparentBlock(Material.WATER);
- addTransparentBlock(Material.STATIONARY_WATER);
- /* Saplings and bushes */
- addTransparentBlock(Material.SAPLING);
- addTransparentBlock(Material.DEAD_BUSH);
- /* Construction Material */
- /* Fences */
- addTransparentBlock(Material.FENCE);
- addTransparentBlock(Material.FENCE_GATE);
- addTransparentBlock(Material.IRON_FENCE);
- addTransparentBlock(Material.NETHER_FENCE);
- /* Ladders, Signs */
- addTransparentBlock(Material.LADDER);
- addTransparentBlock(Material.SIGN_POST);
- addTransparentBlock(Material.WALL_SIGN);
- /* Bed */
- addTransparentBlock(Material.BED_BLOCK);
- /* Pistons */
- addTransparentBlock(Material.PISTON_EXTENSION);
- addTransparentBlock(Material.PISTON_MOVING_PIECE);
- addTransparentBlock(Material.RAILS);
- /* Torch & Trapdoor */
- addTransparentBlock(Material.TORCH);
- addTransparentBlock(Material.TRAP_DOOR);
- /* New */
- addTransparentBlock(Material.BREWING_STAND);
- addTransparentBlock(Material.WOODEN_DOOR);
- addTransparentBlock(Material.WOOD_STEP);
+ //addTransparentBlock(Material.AIR);
+ ///* Misc */
+ //addTransparentBlock(Material.CAKE_BLOCK);
+ ///* Redstone Material */
+ //addTransparentBlock(Material.REDSTONE_WIRE);
+ ///* Redstone Torches */
+ //addTransparentBlock(Material.REDSTONE_TORCH_OFF);
+ //addTransparentBlock(Material.REDSTONE_TORCH_ON);
+ ///* Diodes (Repeaters) */
+ //addTransparentBlock(Material.DIODE_BLOCK_OFF);
+ //addTransparentBlock(Material.DIODE_BLOCK_ON);
+ ///* Power Sources */
+ //addTransparentBlock(Material.DETECTOR_RAIL);
+ //addTransparentBlock(Material.LEVER);
+ //addTransparentBlock(Material.STONE_BUTTON);
+ //addTransparentBlock(Material.WOOD_BUTTON);
+ //addTransparentBlock(Material.STONE_PLATE);
+ //addTransparentBlock(Material.WOOD_PLATE);
+ ///* Nature Material */
+ //addTransparentBlock(Material.RED_MUSHROOM);
+ //addTransparentBlock(Material.BROWN_MUSHROOM);
+ //addTransparentBlock(Material.RED_ROSE);
+ //addTransparentBlock(Material.YELLOW_FLOWER);
+ //addTransparentBlock(Material.FLOWER_POT);
+ ///* Greens */
+ //addTransparentBlock(Material.LONG_GRASS);
+ //addTransparentBlock(Material.VINE);
+ //addTransparentBlock(Material.WATER_LILY);
+ ///* Seedy things */
+ //addTransparentBlock(Material.MELON_STEM);
+ //addTransparentBlock(Material.PUMPKIN_STEM);
+ //addTransparentBlock(Material.CROPS);
+ //addTransparentBlock(Material.NETHER_WARTS);
+ ///* Semi-nature */
+ //addTransparentBlock(Material.SNOW);
+ //addTransparentBlock(Material.FIRE);
+ //addTransparentBlock(Material.WEB);
+ //addTransparentBlock(Material.TRIPWIRE);
+ //addTransparentBlock(Material.TRIPWIRE_HOOK);
+ ///* Stairs */
+ //addTransparentBlock(Material.COBBLESTONE_STAIRS);
+ //addTransparentBlock(Material.BRICK_STAIRS);
+ //addTransparentBlock(Material.SANDSTONE_STAIRS);
+ //addTransparentBlock(Material.NETHER_BRICK_STAIRS);
+ //addTransparentBlock(Material.SMOOTH_STAIRS);
+ ///* Wood Stairs */
+ //addTransparentBlock(Material.BIRCH_WOOD_STAIRS);
+ //addTransparentBlock(Material.WOOD_STAIRS);
+ //addTransparentBlock(Material.JUNGLE_WOOD_STAIRS);
+ //addTransparentBlock(Material.SPRUCE_WOOD_STAIRS);
+ ///* Lava & Water */
+ //addTransparentBlock(Material.LAVA);
+ //addTransparentBlock(Material.STATIONARY_LAVA);
+ //addTransparentBlock(Material.WATER);
+ //addTransparentBlock(Material.STATIONARY_WATER);
+ ///* Saplings and bushes */
+ //addTransparentBlock(Material.SAPLING);
+ //addTransparentBlock(Material.DEAD_BUSH);
+ ///* Construction Material */
+ ///* Fences */
+ //addTransparentBlock(Material.FENCE);
+ //addTransparentBlock(Material.FENCE_GATE);
+ //addTransparentBlock(Material.IRON_FENCE);
+ //addTransparentBlock(Material.NETHER_FENCE);
+ ///* Ladders, Signs */
+ //addTransparentBlock(Material.LADDER);
+ //addTransparentBlock(Material.SIGN_POST);
+ //addTransparentBlock(Material.WALL_SIGN);
+ ///* Bed */
+ //addTransparentBlock(Material.BED_BLOCK);
+ ///* Pistons */
+ //addTransparentBlock(Material.PISTON_EXTENSION);
+ //addTransparentBlock(Material.PISTON_MOVING_PIECE);
+ //addTransparentBlock(Material.RAILS);
+ ///* Torch & Trapdoor */
+ //addTransparentBlock(Material.TORCH);
+ //addTransparentBlock(Material.TRAP_DOOR);
+ ///* New */
+ //addTransparentBlock(Material.BREWING_STAND);
+ //addTransparentBlock(Material.WOODEN_DOOR);
+ //addTransparentBlock(Material.WOOD_STEP);
for (String s : plugin.getConfig().getStringList("price-restriction")) {
String[] sp = s.split(";");
@@ -242,7 +242,7 @@ public static Entry getPriceRestriction(Material material) {
return restrictedPrices.get(material);
}
- public static boolean isTransparent(Material m) {
+ /*public static boolean isTransparent(Material m) {
boolean trans = transparent.contains(m);
return trans;
}
@@ -253,7 +253,7 @@ public static void addTransparentBlock(Material m) {
}
if (!m.isBlock())
System.out.println(m + " is not a block!");
- }
+ }*/
public static void parseColours(YamlConfiguration config) {
Set keys = config.getKeys(true);
@@ -359,7 +359,7 @@ public static boolean isOtherShopWithinHopperReach(Block b, Player p) {
* item).
* @return A new itemstack, with the properties given in the string
*/
- public static ItemStack makeItem(String itemString) {
+ /*public static ItemStack makeItem(String itemString) {
String[] itemInfo = itemString.split(":");
ItemStack item = new ItemStack(Material.getMaterial(itemInfo[0]));
MaterialData data = new MaterialData(Integer.parseInt(itemInfo[1]));
@@ -379,7 +379,7 @@ public static ItemStack makeItem(String itemString) {
}
}
return item;
- }
+ }*/
public static String serialize(ItemStack iStack) {
YamlConfiguration cfg = new YamlConfiguration();
@@ -403,9 +403,9 @@ public static ItemStack deserialize(String config) throws InvalidConfigurationEx
* @return The human readable item name.
*/
public static String getName(ItemStack itemStack) {
- if (NMS.isPotion(itemStack.getType())) {
+ /*if (NMS.isPotion(itemStack.getType())) {
return CustomPotionsName.getFullName(itemStack);
- }
+ }*/
CustomItemName customItemName = QuickShop.instance.getCustomItemNames(itemStack);
if (customItemName!=null) {
@@ -440,9 +440,9 @@ public static String prettifyText(String ugly) {
// Let's make very long names shorter for our sign
public static String getNameForSign(ItemStack itemStack) {
- if (NMS.isPotion(itemStack.getType())) {
+ /*if (NMS.isPotion(itemStack.getType())) {
return CustomPotionsName.getSignName(itemStack);
- }
+ }*/
ItemStack is = itemStack.clone();
is.setAmount(1);
diff --git a/src/main/resources/config.yml b/src/main/resources/config.yml
index 761f4d6..fbe8317 100644
--- a/src/main/resources/config.yml
+++ b/src/main/resources/config.yml
@@ -70,7 +70,7 @@ shop:
sneak-to-trade: false
#Should we automatically create the sign for the chest?
- auto-sign: true
+ auto-sign: false
#If a player owns an unlimited shop, should they receive the cash from it or not?
#If you buy from YOUR unlimited shop, you will NEVER be charged $$, regardless of this setting
diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml
index 972adcb..61ac756 100644
--- a/src/main/resources/plugin.yml
+++ b/src/main/resources/plugin.yml
@@ -6,6 +6,8 @@ authors: [Netherfoam, Timtower, KaiNoMood]
description: Economy Shops plugin
softdepend: [Herochat, Vault, Essentials, OpenInv]
+api-version: 1.13
+
commands:
qs:
description: QuickShop command