PN-89 Failed attempt to fix #239

PowerNukkit · May 10, 2020 · 5bc617a · 5bc617a
1 parent 1f473c9
commit 5bc617a
Show file tree

Hide file tree

Showing 25 changed files with 68 additions and 31 deletions.
diff --git a/src/main/java/cn/nukkit/inventory/AnvilInventory.java b/src/main/java/cn/nukkit/inventory/AnvilInventory.java
@@ -10,8 +10,8 @@
 import lombok.NonNull;
 
 import java.util.Arrays;
+import java.util.HashMap;
 import java.util.Iterator;
-import java.util.LinkedHashMap;
 import java.util.Map;
 import java.util.stream.Stream;
 
@@ -63,7 +63,7 @@ public void updateResult() {
         int repairMaterial = getRepairMaterial(target);
         Item result = target.clone();
         int levelCost = getRepairCost(result) + (sacrifice.isNull() ? 0 : getRepairCost(sacrifice));
-        Map<Integer, Enchantment> enchantmentMap = new LinkedHashMap<>();
+        Map<Integer, Enchantment> enchantmentMap = new HashMap<>();
         for (Enchantment enchantment : target.getEnchantments()) {
             enchantmentMap.put(enchantment.getId(), enchantment);
         }

diff --git a/src/main/java/cn/nukkit/item/Item.java b/src/main/java/cn/nukkit/item/Item.java
@@ -631,37 +631,27 @@ public void addEnchantment(Enchantment... enchantments) {
             tag = this.getNamedTag();
         }
 
-        ListTag<CompoundTag> ench;
-        if (!tag.contains("ench")) {
-            ench = new ListTag<>("ench");
-            tag.putList(ench);
-        } else {
-            ench = tag.getList("ench", CompoundTag.class);
+        Enchantment[] current = getEnchantments();
+        Map<Integer, Enchantment> enchantmentMap = new HashMap<>(current.length + enchantments.length);
+        for (Enchantment enchantment : current) {
+            enchantmentMap.put(enchantment.getId(), enchantment);
         }
 
         for (Enchantment enchantment : enchantments) {
-            boolean found = false;
-
-            for (int k = 0; k < ench.size(); k++) {
-                CompoundTag entry = ench.get(k);
-                if (entry.getShort("id") == enchantment.getId()) {
-                    ench.add(k, new CompoundTag()
-                            .putShort("id", enchantment.getId())
-                            .putShort("lvl", enchantment.getLevel())
-                    );
-                    found = true;
-                    break;
-                }
-            }
-
-            if (!found) {
-                ench.add(new CompoundTag()
-                        .putShort("id", enchantment.getId())
-                        .putShort("lvl", enchantment.getLevel())
-                );
-            }
+            enchantmentMap.put(enchantment.getId(), enchantment);
         }
+
+        SortedSet<Enchantment> updated = new TreeSet<>(enchantmentMap.values());
 
+        ListTag<CompoundTag> ench = new ListTag<>("ench");
+
+        updated.stream()
+                .map(enchantment-> new CompoundTag()
+                        .putShort("id", enchantment.getId())
+                        .putShort("lvl", enchantment.getLevel()))
+                .forEachOrdered(ench::add);
+
+        tag.putList(ench);
         this.setNamedTag(tag);
     }
 

diff --git a/src/main/java/cn/nukkit/item/enchantment/Enchantment.java b/src/main/java/cn/nukkit/item/enchantment/Enchantment.java
@@ -18,6 +18,7 @@
 import cn.nukkit.item.enchantment.trident.EnchantmentTridentImpaling;
 import cn.nukkit.item.enchantment.trident.EnchantmentTridentLoyalty;
 import cn.nukkit.item.enchantment.trident.EnchantmentTridentRiptide;
+import com.google.common.base.Preconditions;
 
 import java.util.ArrayList;
 import java.util.HashSet;
@@ -27,7 +28,7 @@
  * author: MagicDroidX
  * Nukkit Project
  */
-public abstract class Enchantment implements Cloneable {
+public abstract class Enchantment implements Cloneable, Comparable<Enchantment> {
 
     protected static Enchantment[] enchantments;
 
@@ -140,13 +141,17 @@ public static Enchantment[] getEnchantments() {
     protected int level = 1;
 
     protected final String name;
+
+    private int orderBase = Integer.MAX_VALUE;
+    private int orderSub = Integer.MAX_VALUE;
 
     protected Enchantment(int id, String name, int weight, EnchantmentType type) {
         this.id = id;
         this.weight = weight;
         this.type = type;
 
         this.name = name;
+
     }
 
     public int getLevel() {
@@ -234,6 +239,20 @@ public boolean isMajor() {
         return false;
     }
 
+    public int getOrder() {
+        return orderBase * 1000 + orderSub;
+    }
+
+    protected void setOrderBase(int orderBase) {
+        Preconditions.checkArgument(orderBase > Integer.MAX_VALUE / 1000, "orderBase is too big. Max is Integer.MAX_VALUE / 1000");
+        this.orderBase = orderBase;
+    }
+
+    protected void setOrderSub(int orderSub) {
+        Preconditions.checkArgument(orderSub >= 0 && orderSub < 1000, "orderSub must be in range of 0..1000");
+        this.orderSub = orderSub;
+    }
+
     @Override
     protected Enchantment clone() {
         try {
@@ -243,6 +262,13 @@ protected Enchantment clone() {
         }
     }
 
+    @Override
+    public final int compareTo(Enchantment o) {
+        int comp = Integer.compare(getOrder(), getOrder());
+        if (comp != 0) return comp;
+        else return Integer.compare(getId(), o.getId());
+    }
+
     public static final String[] words = {"the", "elder", "scrolls", "klaatu", "berata", "niktu", "xyzzy", "bless", "curse", "light", "darkness", "fire", "air", "earth", "water", "hot", "dry", "cold", "wet", "ignite", "snuff", "embiggen", "twist", "shorten", "stretch", "fiddle", "destroy", "imbue", "galvanize", "enchant", "free", "limited", "range", "of", "towards", "inside", "sphere", "cube", "self", "other", "ball", "mental", "physical", "grow", "shrink", "demon", "elemental", "spirit", "animal", "creature", "beast", "humanoid", "undead", "fresh", "stale"};
 
     public static String getRandomName() {

diff --git a/src/main/java/cn/nukkit/item/enchantment/EnchantmentDurability.java b/src/main/java/cn/nukkit/item/enchantment/EnchantmentDurability.java
@@ -11,6 +11,7 @@
 public class EnchantmentDurability extends Enchantment {
     protected EnchantmentDurability() {
         super(ID_DURABILITY, "durability", 5, EnchantmentType.BREAKABLE);
+        setOrderBase(14000);
     }
 
     @Override

diff --git a/src/main/java/cn/nukkit/item/enchantment/EnchantmentEfficiency.java b/src/main/java/cn/nukkit/item/enchantment/EnchantmentEfficiency.java
@@ -9,6 +9,7 @@
 public class EnchantmentEfficiency extends Enchantment {
     protected EnchantmentEfficiency() {
         super(ID_EFFICIENCY, "digging", 10, EnchantmentType.DIGGER);
+        setOrderBase(16000);
     }
 
     @Override

diff --git a/src/main/java/cn/nukkit/item/enchantment/EnchantmentFireAspect.java b/src/main/java/cn/nukkit/item/enchantment/EnchantmentFireAspect.java
@@ -10,6 +10,7 @@
 public class EnchantmentFireAspect extends Enchantment {
     protected EnchantmentFireAspect() {
         super(ID_FIRE_ASPECT, "fire", 2, EnchantmentType.SWORD);
+        setOrderBase(8000);
     }
 
     @Override

diff --git a/src/main/java/cn/nukkit/item/enchantment/EnchantmentKnockback.java b/src/main/java/cn/nukkit/item/enchantment/EnchantmentKnockback.java
@@ -7,6 +7,7 @@
 public class EnchantmentKnockback extends Enchantment {
     protected EnchantmentKnockback() {
         super(ID_KNOCKBACK, "knockback", 5, EnchantmentType.SWORD);
+        setOrderBase(18000);
     }
 
     @Override

diff --git a/src/main/java/cn/nukkit/item/enchantment/EnchantmentLure.java b/src/main/java/cn/nukkit/item/enchantment/EnchantmentLure.java
@@ -7,6 +7,7 @@
 public class EnchantmentLure extends Enchantment {
     protected EnchantmentLure() {
         super(ID_LURE, "fishingSpeed", 2, EnchantmentType.FISHING_ROD);
+        setOrderBase(20000);
     }
 
     @Override

diff --git a/src/main/java/cn/nukkit/item/enchantment/EnchantmentMending.java b/src/main/java/cn/nukkit/item/enchantment/EnchantmentMending.java
@@ -5,8 +5,8 @@
  */
 public class EnchantmentMending extends Enchantment {
     protected EnchantmentMending() {
-
         super(ID_MENDING, "mending", 2, EnchantmentType.ALL);
+        setOrderBase();
     }
 
     @Override
@@ -26,4 +26,4 @@ public int getMaxEnchantAbility(int level) {
     public boolean isCompatibleWith(Enchantment enchantment) {
         return super.isCompatibleWith(enchantment) && enchantment.id != ID_BOW_INFINITY;
     }
-}
+}
diff --git a/src/main/java/cn/nukkit/item/enchantment/EnchantmentThorns.java b/src/main/java/cn/nukkit/item/enchantment/EnchantmentThorns.java
@@ -15,6 +15,7 @@
 public class EnchantmentThorns extends Enchantment {
     protected EnchantmentThorns() {
         super(ID_THORNS, "thorns", 2, EnchantmentType.ARMOR_TORSO);
+        setOrderBase(6000);
     }
 
     @Override

diff --git a/src/main/java/cn/nukkit/item/enchantment/EnchantmentWaterBreath.java b/src/main/java/cn/nukkit/item/enchantment/EnchantmentWaterBreath.java
@@ -7,6 +7,7 @@
 public class EnchantmentWaterBreath extends Enchantment {
     protected EnchantmentWaterBreath() {
         super(ID_WATER_BREATHING, "oxygen", 2, EnchantmentType.ARMOR_HEAD);
+        setOrderBase(5000);
     }
 
     @Override

diff --git a/src/main/java/cn/nukkit/item/enchantment/EnchantmentWaterWalker.java b/src/main/java/cn/nukkit/item/enchantment/EnchantmentWaterWalker.java
@@ -7,6 +7,7 @@
 public class EnchantmentWaterWalker extends Enchantment {
     protected EnchantmentWaterWalker() {
         super(ID_WATER_WALKER, "waterWalker", 2, EnchantmentType.ARMOR_FEET);
+        setOrderBase(3000);
     }
 
     @Override

diff --git a/src/main/java/cn/nukkit/item/enchantment/EnchantmentWaterWorker.java b/src/main/java/cn/nukkit/item/enchantment/EnchantmentWaterWorker.java
@@ -7,6 +7,7 @@
 public class EnchantmentWaterWorker extends Enchantment {
     protected EnchantmentWaterWorker() {
         super(ID_WATER_WORKER, "waterWorker", 2, EnchantmentType.ARMOR_HEAD);
+        setOrderBase(1000);
     }
 
     @Override

diff --git a/src/main/java/cn/nukkit/item/enchantment/bow/EnchantmentBowFlame.java b/src/main/java/cn/nukkit/item/enchantment/bow/EnchantmentBowFlame.java
@@ -9,6 +9,7 @@
 public class EnchantmentBowFlame extends EnchantmentBow {
     public EnchantmentBowFlame() {
         super(Enchantment.ID_BOW_FLAME, "arrowFire", 2);
+        setOrderBase(9000);
     }
 
     @Override

diff --git a/src/main/java/cn/nukkit/item/enchantment/bow/EnchantmentBowInfinity.java b/src/main/java/cn/nukkit/item/enchantment/bow/EnchantmentBowInfinity.java
@@ -9,6 +9,7 @@
 public class EnchantmentBowInfinity extends EnchantmentBow {
     public EnchantmentBowInfinity() {
         super(Enchantment.ID_BOW_INFINITY, "arrowInfinite", 1);
+        setOrderBase(17000);
     }
 
     @Override

diff --git a/src/main/java/cn/nukkit/item/enchantment/bow/EnchantmentBowKnockback.java b/src/main/java/cn/nukkit/item/enchantment/bow/EnchantmentBowKnockback.java
@@ -9,6 +9,7 @@
 public class EnchantmentBowKnockback extends EnchantmentBow {
     public EnchantmentBowKnockback() {
         super(Enchantment.ID_BOW_KNOCKBACK, "arrowKnockback", 2);
+        setOrderBase(23000);
     }
 
     @Override

diff --git a/src/main/java/cn/nukkit/item/enchantment/bow/EnchantmentBowPower.java b/src/main/java/cn/nukkit/item/enchantment/bow/EnchantmentBowPower.java
@@ -9,6 +9,7 @@
 public class EnchantmentBowPower extends EnchantmentBow {
     public EnchantmentBowPower() {
         super(Enchantment.ID_BOW_POWER, "arrowDamage", 10);
+        setOrderBase(22000);
     }
 
     @Override

diff --git a/src/main/java/cn/nukkit/item/enchantment/damage/EnchantmentDamageArthropods.java b/src/main/java/cn/nukkit/item/enchantment/damage/EnchantmentDamageArthropods.java
@@ -14,6 +14,7 @@ public class EnchantmentDamageArthropods extends EnchantmentDamage {
 
     public EnchantmentDamageArthropods() {
         super(ID_DAMAGE_ARTHROPODS, "arthropods", 5, TYPE.SMITE);
+        setOrderBase(7000);
     }
 
     @Override

diff --git a/src/main/java/cn/nukkit/item/enchantment/loot/EnchantmentLootDigging.java b/src/main/java/cn/nukkit/item/enchantment/loot/EnchantmentLootDigging.java
@@ -10,5 +10,6 @@
 public class EnchantmentLootDigging extends EnchantmentLoot {
     public EnchantmentLootDigging() {
         super(Enchantment.ID_FORTUNE_DIGGING, "lootBonusDigger", 2, EnchantmentType.DIGGER);
+        setOrderBase(10000);
     }
 }
diff --git a/src/main/java/cn/nukkit/item/enchantment/loot/EnchantmentLootFishing.java b/src/main/java/cn/nukkit/item/enchantment/loot/EnchantmentLootFishing.java
@@ -10,5 +10,6 @@
 public class EnchantmentLootFishing extends EnchantmentLoot {
     public EnchantmentLootFishing() {
         super(Enchantment.ID_FORTUNE_FISHING, "lootBonusFishing", 2, EnchantmentType.FISHING_ROD);
+        setOrderBase(13000);
     }
 }
diff --git a/src/main/java/cn/nukkit/item/enchantment/loot/EnchantmentLootWeapon.java b/src/main/java/cn/nukkit/item/enchantment/loot/EnchantmentLootWeapon.java
@@ -10,5 +10,6 @@
 public class EnchantmentLootWeapon extends EnchantmentLoot {
     public EnchantmentLootWeapon() {
         super(Enchantment.ID_LOOTING, "lootBonus", 2, EnchantmentType.SWORD);
+        setOrderBase(12000);
     }
 }
diff --git a/src/main/java/cn/nukkit/item/enchantment/protection/EnchantmentProtectionExplosion.java b/src/main/java/cn/nukkit/item/enchantment/protection/EnchantmentProtectionExplosion.java
@@ -11,6 +11,7 @@ public class EnchantmentProtectionExplosion extends EnchantmentProtection {
 
     public EnchantmentProtectionExplosion() {
         super(ID_PROTECTION_EXPLOSION, "explosion", 2, TYPE.EXPLOSION);
+        setOrderBase(2000);
     }
 
     @Override

diff --git a/src/main/java/cn/nukkit/item/enchantment/trident/EnchantmentTridentChanneling.java b/src/main/java/cn/nukkit/item/enchantment/trident/EnchantmentTridentChanneling.java
@@ -5,6 +5,7 @@
 public class EnchantmentTridentChanneling extends EnchantmentTrident {
     public EnchantmentTridentChanneling() {
         super(Enchantment.ID_TRIDENT_CHANNELING, "channeling", 1);
+        setOrderBase(15000);
     }
 
     @Override

diff --git a/src/main/java/cn/nukkit/item/enchantment/trident/EnchantmentTridentImpaling.java b/src/main/java/cn/nukkit/item/enchantment/trident/EnchantmentTridentImpaling.java
@@ -5,6 +5,7 @@
 public class EnchantmentTridentImpaling extends EnchantmentTrident {
     public EnchantmentTridentImpaling() {
         super(Enchantment.ID_TRIDENT_IMPALING, "impaling", 2);
+        setOrderBase(11000);
     }
 
     @Override

diff --git a/src/main/java/cn/nukkit/item/enchantment/trident/EnchantmentTridentLoyalty.java b/src/main/java/cn/nukkit/item/enchantment/trident/EnchantmentTridentLoyalty.java
@@ -5,6 +5,7 @@
 public class EnchantmentTridentLoyalty extends EnchantmentTrident {
     public EnchantmentTridentLoyalty() {
         super(Enchantment.ID_TRIDENT_LOYALTY, "loyalty", 5);
+        setOrderBase(19000);
     }
 
     @Override