Fixed upgrade desync (for real, this time)

pedroksl · Dec 3, 2024 · 5e283ad · 5e283ad
1 parent a888b4c
commit 5e283ad
Show file tree

Hide file tree

Showing 4 changed files with 144 additions and 150 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -14,7 +14,7 @@ loader_version_range=[4,)
 mod_id=advanced_ae
 mod_name=Advanced AE
 mod_license=LGPL-3.0
-mod_version=1.1.7-1.21.1
+mod_version=1.1.8-1.21.1
 mod_group_id=net.pedroksl.advanced_ae
 mod_authors=Pedroksl
 mod_description=An AE2 addon that adds a lot of utilities and quality of life.

diff --git a/src/main/java/net/pedroksl/advanced_ae/common/items/armors/IUpgradeableItem.java b/src/main/java/net/pedroksl/advanced_ae/common/items/armors/IUpgradeableItem.java
@@ -22,7 +22,15 @@
 public interface IUpgradeableItem extends IGridLinkedItem {
     List<UpgradeType> getPossibleUpgrades();
 
-    List<UpgradeType> getAppliedUpgrades(ItemStack stack);
+    default List<UpgradeType> getAppliedUpgrades(ItemStack stack) {
+        var appliedUpgrades = new ArrayList<UpgradeType>();
+        for (var upgrade : getPossibleUpgrades()) {
+            if (hasUpgrade(stack, upgrade)) {
+                appliedUpgrades.add(upgrade);
+            }
+        }
+        return appliedUpgrades;
+    }
 
     default List<UpgradeType> getPassiveUpgrades(ItemStack itemStack) {
         List<UpgradeType> abilityList = new ArrayList<>();

diff --git a/src/main/java/net/pedroksl/advanced_ae/common/items/armors/QuantumArmorBase.java b/src/main/java/net/pedroksl/advanced_ae/common/items/armors/QuantumArmorBase.java
@@ -60,7 +60,6 @@ public class QuantumArmorBase extends PoweredItem implements GeoItem, IMenuItem,
     private final AnimatableInstanceCache cache = GeckoLibUtil.createInstanceCache(this);
 
     protected final List<UpgradeType> possibleUpgrades = new ArrayList<>();
-    private List<UpgradeType> appliedUpgrades;
 
     protected static final String MENU_TYPE = "aae$menutype";
 
@@ -134,19 +133,6 @@ public List<UpgradeType> getPossibleUpgrades() {
         return possibleUpgrades;
     }
 
-    @Override
-    public List<UpgradeType> getAppliedUpgrades(ItemStack stack) {
-        if (appliedUpgrades == null) {
-            appliedUpgrades = new ArrayList<>();
-            for (var upgrade : possibleUpgrades) {
-                if (hasUpgrade(stack, upgrade)) {
-                    appliedUpgrades.add(upgrade);
-                }
-            }
-        }
-        return appliedUpgrades;
-    }
-
     protected boolean checkPreconditions(ItemStack item) {
         return !item.isEmpty() && item.getItem() == this;
     }