Prevent legacy material support from being initiated (#4697)

JRoy · web-flow · commit 63cbf7e2da45 · 2022-02-13T15:33:51.000-05:00
diff --git a/Essentials/src/main/java/com/earth2me/essentials/MetaItemStack.java b/Essentials/src/main/java/com/earth2me/essentials/MetaItemStack.java
@@ -210,7 +210,7 @@ public void addStringMeta(final CommandSource sender, final boolean allowUnsafe,
             final boolean value = split.length <= 1 || Boolean.parseBoolean(split[1]);
             setUnbreakable(ess, stack, value);
         } else if (split.length > 1 && (split[0].equalsIgnoreCase("player") || split[0].equalsIgnoreCase("owner")) && hasMetaPermission(sender, "head", false, true, ess)) {
-            if (MaterialUtil.isPlayerHead(stack.getType(), stack.getDurability())) {
+            if (MaterialUtil.isPlayerHead(stack)) {
                 final String owner = split[1];
                 setSkullOwner(ess, stack, owner);
             } else {
diff --git a/Essentials/src/main/java/com/earth2me/essentials/Trade.java b/Essentials/src/main/java/com/earth2me/essentials/Trade.java
@@ -3,6 +3,7 @@
 import com.earth2me.essentials.craftbukkit.InventoryWorkaround;
 import com.earth2me.essentials.craftbukkit.SetExpFix;
 import com.earth2me.essentials.utils.NumberUtil;
+import com.earth2me.essentials.utils.VersionUtil;
 import net.ess3.api.IEssentials;
 import net.ess3.api.IUser;
 import net.ess3.api.MaxMoneyException;
@@ -95,8 +96,10 @@ public static void log(final String type, final String subtype, final String eve
         } else {
             if (charge.getItemStack() != null) {
                 sb.append(charge.getItemStack().getAmount()).append(",");
-                sb.append(charge.getItemStack().getType().toString()).append(",");
-                sb.append(charge.getItemStack().getDurability());
+                sb.append(charge.getItemStack().getType()).append(",");
+                if (VersionUtil.PRE_FLATTENING) {
+                    sb.append(charge.getItemStack().getDurability());
+                }
             }
             if (charge.getMoney() != null) {
                 sb.append(charge.getMoney()).append(",");
@@ -119,8 +122,10 @@ public static void log(final String type, final String subtype, final String eve
         } else {
             if (pay.getItemStack() != null) {
                 sb.append(pay.getItemStack().getAmount()).append(",");
-                sb.append(pay.getItemStack().getType().toString()).append(",");
-                sb.append(pay.getItemStack().getDurability());
+                sb.append(pay.getItemStack().getType()).append(",");
+                if (VersionUtil.PRE_FLATTENING) {
+                    sb.append(pay.getItemStack().getDurability());
+                }
             }
             if (pay.getMoney() != null) {
                 sb.append(pay.getMoney()).append(",");
diff --git a/Essentials/src/main/java/com/earth2me/essentials/User.java b/Essentials/src/main/java/com/earth2me/essentials/User.java
@@ -319,7 +319,7 @@ public Boolean canSpawnItem(final Material material) {
             if (isAuthorized("essentials.itemspawn.item-all") || isAuthorized("essentials.itemspawn.item-" + name))
                 return true;
 
-            if (VersionUtil.getServerBukkitVersion().isLowerThan(VersionUtil.v1_13_0_R01)) {
+            if (VersionUtil.PRE_FLATTENING) {
                 final int id = material.getId();
                 if (isAuthorized("essentials.itemspawn.item-" + id)) return true;
             }
diff --git a/Essentials/src/main/java/com/earth2me/essentials/Worth.java b/Essentials/src/main/java/com/earth2me/essentials/Worth.java
@@ -30,13 +30,15 @@ public Worth(final File dataFolder) {
      * @return The price from the config.
      */
     public BigDecimal getPrice(final IEssentials ess, final ItemStack itemStack) {
-        BigDecimal result;
+        BigDecimal result = BigDecimal.ONE.negate();
 
         final String itemname = itemStack.getType().toString().toLowerCase(Locale.ENGLISH).replace("_", "");
 
-        // Check for matches with data value from stack
-        // Note that we always default to BigDecimal.ONE.negate(), equivalent to -1
-        result = config.getBigDecimal("worth." + itemname + "." + itemStack.getDurability(), BigDecimal.ONE.negate());
+        if (VersionUtil.PRE_FLATTENING) {
+            // Check for matches with data value from stack
+            // Note that we always default to BigDecimal.ONE.negate(), equivalent to -1
+            result = config.getBigDecimal("worth." + itemname + "." + itemStack.getDurability(), BigDecimal.ONE.negate());
+        }
 
         // Check for matches with data value 0
         if (result.signum() < 0) {
@@ -140,7 +142,7 @@ public void setPrice(final IEssentials ess, final ItemStack itemStack, final dou
         String path = "worth." + itemStack.getType().toString().toLowerCase(Locale.ENGLISH).replace("_", "");
 
         // Spigot 1.13+ throws an exception if a 1.13+ plugin even *attempts* to do set data.
-        if (VersionUtil.getServerBukkitVersion().isLowerThan(VersionUtil.v1_13_0_R01) && itemStack.getType().getData() == null) {
+        if (VersionUtil.PRE_FLATTENING && itemStack.getType().getData() == null) {
             // Bukkit-bug: getDurability still contains the correct value, while getData().getData() is 0.
             path = path + "." + itemStack.getDurability();
         }
diff --git a/Essentials/src/main/java/com/earth2me/essentials/commands/Commandclearinventory.java b/Essentials/src/main/java/com/earth2me/essentials/commands/Commandclearinventory.java
@@ -130,7 +130,7 @@ protected void clearHandler(final CommandSource sender, final Player player, fin
         } else {
             for (final Item item : items) {
                 final ItemStack stack = new ItemStack(item.getMaterial());
-                if (VersionUtil.getServerBukkitVersion().isLowerThan(VersionUtil.v1_13_0_R01)) {
+                if (VersionUtil.PRE_FLATTENING) {
                     stack.setDurability(item.getData());
                 }
                 // amount -1 means all items will be cleared
diff --git a/Essentials/src/main/java/com/earth2me/essentials/commands/Commandcondense.java b/Essentials/src/main/java/com/earth2me/essentials/commands/Commandcondense.java
@@ -4,6 +4,7 @@
 import com.earth2me.essentials.Trade;
 import com.earth2me.essentials.Trade.OverflowType;
 import com.earth2me.essentials.User;
+import com.earth2me.essentials.utils.VersionUtil;
 import net.ess3.api.MaxMoneyException;
 import org.bukkit.Material;
 import org.bukkit.Server;
@@ -161,8 +162,7 @@ private Collection<ItemStack> getStackOnRecipeMatch(final Recipe recipe, final I
                 iter.remove();
                 continue;
             }
-
-            if (inputSlot.getDurability() == Short.MAX_VALUE) {
+            if (VersionUtil.PRE_FLATTENING && inputSlot.getDurability() == Short.MAX_VALUE) {
                 inputSlot.setDurability((short) 0);
             }
             if (!inputSlot.isSimilar(stack)) {
diff --git a/Essentials/src/main/java/com/earth2me/essentials/commands/Commandgive.java b/Essentials/src/main/java/com/earth2me/essentials/commands/Commandgive.java
@@ -5,6 +5,7 @@
 import com.earth2me.essentials.User;
 import com.earth2me.essentials.craftbukkit.InventoryWorkaround;
 import com.earth2me.essentials.utils.NumberUtil;
+import com.earth2me.essentials.utils.VersionUtil;
 import com.google.common.collect.Lists;
 import org.bukkit.Material;
 import org.bukkit.Server;
@@ -37,7 +38,7 @@ public void run(final Server server, final CommandSource sender, final String co
         }
 
         try {
-            if (args.length > 3 && NumberUtil.isInt(args[2]) && NumberUtil.isInt(args[3])) {
+            if (args.length > 3 && VersionUtil.PRE_FLATTENING && NumberUtil.isInt(args[2]) && NumberUtil.isInt(args[3])) {
                 stack.setAmount(Integer.parseInt(args[2]));
                 stack.setDurability(Short.parseShort(args[3]));
             } else if (args.length > 2 && Integer.parseInt(args[2]) > 0) {
diff --git a/Essentials/src/main/java/com/earth2me/essentials/commands/Commanditemdb.java b/Essentials/src/main/java/com/earth2me/essentials/commands/Commanditemdb.java
@@ -1,6 +1,7 @@
 package com.earth2me.essentials.commands;
 
 import com.earth2me.essentials.CommandSource;
+import com.earth2me.essentials.utils.MaterialUtil;
 import com.earth2me.essentials.utils.StringUtil;
 import com.earth2me.essentials.utils.VersionUtil;
 import org.bukkit.Material;
@@ -36,7 +37,7 @@ protected void run(final Server server, final CommandSource sender, final String
 
         String itemId = "none";
 
-        if (VersionUtil.getServerBukkitVersion().isLowerThan(VersionUtil.v1_13_0_R01)) {
+        if (VersionUtil.PRE_FLATTENING) {
             itemId = itemStack.getType().getId() + ":" + itemStack.getDurability();
         }
 
@@ -49,7 +50,7 @@ protected void run(final Server server, final CommandSource sender, final String
 
         if (itemHeld && itemStack.getType() != Material.AIR) {
             final int maxuses = itemStack.getType().getMaxDurability();
-            final int durability = (maxuses + 1) - itemStack.getDurability();
+            final int durability = (maxuses + 1) - MaterialUtil.getDamage(itemStack);
             if (maxuses != 0) {
                 sender.sendMessage(tl("durability", Integer.toString(durability)));
             }
diff --git a/Essentials/src/main/java/com/earth2me/essentials/commands/Commandrecipe.java b/Essentials/src/main/java/com/earth2me/essentials/commands/Commandrecipe.java
@@ -117,7 +117,7 @@ public void shapedRecipe(final CommandSource sender, final ShapedRecipe recipe,
                     if (item == null) {
                         continue;
                     }
-                    if (item.getDurability() == Short.MAX_VALUE) {
+                    if (VersionUtil.PRE_FLATTENING && item.getDurability() == Short.MAX_VALUE) {
                         item.setDurability((short) 0);
                     }
                     view.getTopInventory().setItem(j * 3 + k + 1, item);
@@ -159,7 +159,7 @@ public void shapelessRecipe(final CommandSource sender, final ShapelessRecipe re
             final InventoryView view = user.getBase().openWorkbench(null, true);
             for (int i = 0; i < ingredients.size(); i++) {
                 final ItemStack item = ingredients.get(i);
-                if (item.getDurability() == Short.MAX_VALUE) {
+                if (VersionUtil.PRE_FLATTENING && item.getDurability() == Short.MAX_VALUE) {
                     item.setDurability((short) 0);
                 }
                 view.setItem(i + 1, item);
diff --git a/Essentials/src/main/java/com/earth2me/essentials/commands/Commandrepair.java b/Essentials/src/main/java/com/earth2me/essentials/commands/Commandrepair.java
@@ -3,6 +3,7 @@
 import com.earth2me.essentials.ChargeException;
 import com.earth2me.essentials.Trade;
 import com.earth2me.essentials.User;
+import com.earth2me.essentials.utils.MaterialUtil;
 import com.earth2me.essentials.utils.StringUtil;
 import com.earth2me.essentials.utils.VersionUtil;
 import com.google.common.collect.Lists;
@@ -39,7 +40,7 @@ public void run(final Server server, final User user, final String commandLabel,
 
     public void repairHand(final User user) throws Exception {
         final ItemStack item = user.getItemInHand();
-        if (item == null || item.getType().isBlock() || item.getDurability() == 0) {
+        if (item == null || item.getType().isBlock() || MaterialUtil.getDamage(item) == 0) {
             throw new Exception(tl("repairInvalidType"));
         }
 
@@ -81,16 +82,16 @@ private void repairItem(final ItemStack item) throws Exception {
             throw new Exception(tl("repairInvalidType"));
         }
 
-        if (item.getDurability() == 0) {
+        if (MaterialUtil.getDamage(item) == 0) {
             throw new Exception(tl("repairAlreadyFixed"));
         }
 
-        item.setDurability((short) 0);
+        MaterialUtil.setDamage(item, 0);
     }
 
-    private void repairItems(final ItemStack[] items, final IUser user, final List<String> repaired) throws Exception {
+    private void repairItems(final ItemStack[] items, final IUser user, final List<String> repaired) {
         for (final ItemStack item : items) {
-            if (item == null || item.getType().isBlock() || item.getDurability() == 0) {
+            if (item == null || item.getType().isBlock() || MaterialUtil.getDamage(item) == 0) {
                 continue;
             }
 
@@ -123,7 +124,7 @@ private void repairItems(final ItemStack[] items, final IUser user, final List<S
 
     private Trade getCharge(final Material material) {
         final String itemName = material.toString().toLowerCase(Locale.ENGLISH);
-        if (VersionUtil.getServerBukkitVersion().isLowerThan(VersionUtil.v1_13_0_R01)) {
+        if (VersionUtil.PRE_FLATTENING) {
             final int itemId = material.getId();
             return new Trade("repair-" + itemName.replace('_', '-'), new Trade("repair-" + itemId, new Trade("repair-item", ess), ess), ess);
         } else {
diff --git a/Essentials/src/main/java/com/earth2me/essentials/commands/Commandrest.java b/Essentials/src/main/java/com/earth2me/essentials/commands/Commandrest.java
@@ -19,7 +19,7 @@ public Commandrest() {
 
     @Override
     public void run(final Server server, final CommandSource sender, final String commandLabel, final String[] args) throws Exception {
-        if (VersionUtil.getServerBukkitVersion().isLowerThan(VersionUtil.v1_13_0_R01)) {
+        if (VersionUtil.PRE_FLATTENING) {
             sender.sendMessage(tl("unsupportedFeature"));
             return;
         }
diff --git a/Essentials/src/main/java/com/earth2me/essentials/commands/Commandskull.java b/Essentials/src/main/java/com/earth2me/essentials/commands/Commandskull.java
@@ -42,7 +42,7 @@ protected void run(final Server server, final User user, final String commandLab
         final SkullMeta metaSkull;
         boolean spawn = false;
 
-        if (itemSkull != null && MaterialUtil.isPlayerHead(itemSkull.getType(), itemSkull.getDurability())) {
+        if (itemSkull != null && MaterialUtil.isPlayerHead(itemSkull)) {
             metaSkull = (SkullMeta) itemSkull.getItemMeta();
         } else if (user.isAuthorized("essentials.skull.spawn")) {
             itemSkull = new ItemStack(SKULL_ITEM, 1, (byte) 3);
diff --git a/Essentials/src/main/java/com/earth2me/essentials/commands/Commandworth.java b/Essentials/src/main/java/com/earth2me/essentials/commands/Commandworth.java
@@ -2,6 +2,7 @@
 
 import com.earth2me.essentials.CommandSource;
 import com.earth2me.essentials.User;
+import com.earth2me.essentials.utils.MaterialUtil;
 import com.earth2me.essentials.utils.NumberUtil;
 import com.google.common.collect.Lists;
 import org.bukkit.Server;
@@ -87,7 +88,7 @@ private BigDecimal itemWorth(final CommandSource sender, final User user, final
         }
 
         final BigDecimal result = worth.multiply(BigDecimal.valueOf(amount));
-        sender.sendMessage(is.getDurability() != 0 ? tl("worthMeta", is.getType().toString().toLowerCase(Locale.ENGLISH).replace("_", ""), is.getDurability(), NumberUtil.displayCurrency(result, ess), amount, NumberUtil.displayCurrency(worth, ess)) : tl("worth", is.getType().toString().toLowerCase(Locale.ENGLISH).replace("_", ""), NumberUtil.displayCurrency(result, ess), amount, NumberUtil.displayCurrency(worth, ess)));
+        sender.sendMessage(MaterialUtil.getDamage(is) != 0 ? tl("worthMeta", is.getType().toString().toLowerCase(Locale.ENGLISH).replace("_", ""), MaterialUtil.getDamage(is), NumberUtil.displayCurrency(result, ess), amount, NumberUtil.displayCurrency(worth, ess)) : tl("worth", is.getType().toString().toLowerCase(Locale.ENGLISH).replace("_", ""), NumberUtil.displayCurrency(result, ess), amount, NumberUtil.displayCurrency(worth, ess)));
         return result;
     }
 
diff --git a/Essentials/src/main/java/com/earth2me/essentials/items/AbstractItemDb.java b/Essentials/src/main/java/com/earth2me/essentials/items/AbstractItemDb.java
@@ -23,6 +23,7 @@
 import org.bukkit.inventory.meta.FireworkMeta;
 import org.bukkit.inventory.meta.ItemMeta;
 import org.bukkit.inventory.meta.LeatherArmorMeta;
+import org.bukkit.inventory.meta.PotionMeta;
 import org.bukkit.inventory.meta.SkullMeta;
 import org.bukkit.plugin.Plugin;
 import org.bukkit.potion.Potion;
@@ -279,12 +280,22 @@ public String serialize(final ItemStack is, final boolean useResolvers) {
                 serializeEffectMeta(sb, fireworkEffectMeta.getEffect());
             }
         } else if (MaterialUtil.isPotion(material)) {
-            final Potion potion = Potion.fromDamage(is.getDurability());
-            for (final PotionEffect e : potion.getEffects()) {
+            final boolean splash;
+            final Collection<PotionEffect> effects;
+            if (VersionUtil.PRE_FLATTENING) {
+                final Potion potion = Potion.fromDamage(is.getDurability());
+                splash = potion.isSplash();
+                effects = potion.getEffects();
+            } else {
+                splash = is.getType() == Material.SPLASH_POTION;
+                effects = ((PotionMeta) is.getItemMeta()).getCustomEffects();
+            }
+
+            for (final PotionEffect e : effects) {
                 // long but needs to be effect:speed power:2 duration:120 in that order.
-                sb.append("splash:").append(potion.isSplash()).append(" ").append("effect:").append(e.getType().getName().toLowerCase()).append(" ").append("power:").append(e.getAmplifier()).append(" ").append("duration:").append(e.getDuration() / 20).append(" ");
+                sb.append("splash:").append(splash).append(" ").append("effect:").append(e.getType().getName().toLowerCase()).append(" ").append("power:").append(e.getAmplifier()).append(" ").append("duration:").append(e.getDuration() / 20).append(" ");
             }
-        } else if (MaterialUtil.isPlayerHead(material, is.getData().getData())) {
+        } else if (MaterialUtil.isPlayerHead(is)) {
             // item stack with meta
             final SkullMeta skullMeta = (SkullMeta) is.getItemMeta();
             if (skullMeta != null && skullMeta.hasOwner()) {
diff --git a/Essentials/src/main/java/com/earth2me/essentials/signs/SignTrade.java b/Essentials/src/main/java/com/earth2me/essentials/signs/SignTrade.java
@@ -5,6 +5,7 @@
 import com.earth2me.essentials.Trade.OverflowType;
 import com.earth2me.essentials.Trade.TradeType;
 import com.earth2me.essentials.User;
+import com.earth2me.essentials.utils.MaterialUtil;
 import com.earth2me.essentials.utils.NumberUtil;
 import net.ess3.api.IEssentials;
 import net.ess3.api.MaxMoneyException;
@@ -83,7 +84,7 @@ protected boolean onSignInteract(final ISign sign, final User player, final Stri
 
     private Trade rechargeSign(final ISign sign, final IEssentials ess, final User player) throws SignException, ChargeException {
         final Trade trade = getTrade(sign, 2, AmountType.COST, false, true, ess);
-        if (trade.getItemStack() != null && player.getBase().getItemInHand() != null && trade.getItemStack().getType() == player.getBase().getItemInHand().getType() && trade.getItemStack().getDurability() == player.getBase().getItemInHand().getDurability() && trade.getItemStack().getEnchantments().equals(player.getBase().getItemInHand().getEnchantments())) {
+        if (trade.getItemStack() != null && player.getBase().getItemInHand() != null && trade.getItemStack().getType() == player.getBase().getItemInHand().getType() && MaterialUtil.getDamage(trade.getItemStack()) == MaterialUtil.getDamage(player.getBase().getItemInHand()) && trade.getItemStack().getEnchantments().equals(player.getBase().getItemInHand().getEnchantments())) {
             final int amount = trade.getItemStack().getAmount();
             if (player.getBase().getInventory().containsAtLeast(trade.getItemStack(), amount)) {
                 final ItemStack stack = player.getBase().getItemInHand().clone();
diff --git a/Essentials/src/main/java/com/earth2me/essentials/utils/MaterialUtil.java b/Essentials/src/main/java/com/earth2me/essentials/utils/MaterialUtil.java
diff --git a/Essentials/src/main/java/com/earth2me/essentials/utils/VersionUtil.java b/Essentials/src/main/java/com/earth2me/essentials/utils/VersionUtil.java
diff --git a/EssentialsAntiBuild/src/main/java/com/earth2me/essentials/antibuild/EssentialsAntiBuildListener.java b/EssentialsAntiBuild/src/main/java/com/earth2me/essentials/antibuild/EssentialsAntiBuildListener.java

Original file line number	Diff line number	Diff line change
`@@ -319,7 +319,7 @@ public Boolean canSpawnItem(final Material material) {`
`319`	`319`	`if (isAuthorized("essentials.itemspawn.item-all") \|\| isAuthorized("essentials.itemspawn.item-" + name))`
`320`	`320`	`return true;`
`321`	`321`
`322`		`- if (VersionUtil.getServerBukkitVersion().isLowerThan(VersionUtil.v1_13_0_R01)) {`
	`322`	`+ if (VersionUtil.PRE_FLATTENING) {`
`323`	`323`	`final int id = material.getId();`
`324`	`324`	`if (isAuthorized("essentials.itemspawn.item-" + id)) return true;`
`325`	`325`	`}`
Original file line number	Diff line number	Diff line change
`@@ -130,7 +130,7 @@ protected void clearHandler(final CommandSource sender, final Player player, fin`
`130`	`130`	`} else {`
`131`	`131`	`for (final Item item : items) {`
`132`	`132`	`final ItemStack stack = new ItemStack(item.getMaterial());`
`133`		`- if (VersionUtil.getServerBukkitVersion().isLowerThan(VersionUtil.v1_13_0_R01)) {`
	`133`	`+ if (VersionUtil.PRE_FLATTENING) {`
`134`	`134`	`stack.setDurability(item.getData());`
`135`	`135`	`}`
`136`	`136`	`// amount -1 means all items will be cleared`
Original file line number	Diff line number	Diff line change
`@@ -117,7 +117,7 @@ public void shapedRecipe(final CommandSource sender, final ShapedRecipe recipe,`
`117`	`117`	`if (item == null) {`
`118`	`118`	`continue;`
`119`	`119`	`}`
`120`		`- if (item.getDurability() == Short.MAX_VALUE) {`
	`120`	`+ if (VersionUtil.PRE_FLATTENING && item.getDurability() == Short.MAX_VALUE) {`
`121`	`121`	`item.setDurability((short) 0);`
`122`	`122`	`}`
`123`	`123`	`view.getTopInventory().setItem(j * 3 + k + 1, item);`
`@@ -159,7 +159,7 @@ public void shapelessRecipe(final CommandSource sender, final ShapelessRecipe re`
`159`	`159`	`final InventoryView view = user.getBase().openWorkbench(null, true);`
`160`	`160`	`for (int i = 0; i < ingredients.size(); i++) {`
`161`	`161`	`final ItemStack item = ingredients.get(i);`
`162`		`- if (item.getDurability() == Short.MAX_VALUE) {`
	`162`	`+ if (VersionUtil.PRE_FLATTENING && item.getDurability() == Short.MAX_VALUE) {`
`163`	`163`	`item.setDurability((short) 0);`
`164`	`164`	`}`
`165`	`165`	`view.setItem(i + 1, item);`