Improved functionality when mod compat mods are removed

B1n-ry · Feb 28, 2024 · fd6a4ce · fd6a4ce
1 parent c8b94e9
commit fd6a4ce
Showing 1 changed file with 17 additions and 2 deletions.
diff --git a/src/main/java/com/b1n_ry/yigd/components/InventoryComponent.java b/src/main/java/com/b1n_ry/yigd/components/InventoryComponent.java
@@ -325,8 +325,17 @@ public DefaultedList<ItemStack> merge(InventoryComponent mergingComponent, Serve
 
         for (InvModCompat<?> modCompat : InvModCompat.invCompatMods) {
             String modName = modCompat.getModName();
-            CompatComponent<?> compatComponent = this.modInventoryItems.get(modName);
+            if (!mergingComponent.modInventoryItems.containsKey(modName)) continue;
+
             CompatComponent<?> mergingCompatComponent = mergingComponent.modInventoryItems.get(modName);
+            if (!this.modInventoryItems.containsKey(modName)) {
+                for (Pair<ItemStack, DropRule> pair : mergingCompatComponent.getAsStackDropList()) {
+                    ItemStack item = pair.getLeft();
+                    if (!item.isEmpty())
+                        extraItems.add(item);
+                }
+            }
+            CompatComponent<?> compatComponent = this.modInventoryItems.get(modName);
 
             DefaultedList<ItemStack> extraModItems = compatComponent.merge(mergingCompatComponent, merger);
             extraItems.addAll(extraModItems);
@@ -531,7 +540,9 @@ public DefaultedList<ItemStack> applyToPlayer(ServerPlayerEntity player) {
 
         // Set mod inventories
         for (InvModCompat<?> modCompat : InvModCompat.invCompatMods) {
-            DefaultedList<ItemStack> extraModItems = this.modInventoryItems.get(modCompat.getModName()).storeToPlayer(player);
+            String modName = modCompat.getModName();
+            if (!this.modInventoryItems.containsKey(modName)) continue;
+            DefaultedList<ItemStack> extraModItems = this.modInventoryItems.get(modName).storeToPlayer(player);
             extraItems.addAll(extraModItems);
         }
 
@@ -551,6 +562,7 @@ public InventoryComponent filteredInv(Predicate<DropRule> filter) {
         Map<String, CompatComponent<?>> filteredModInventories = new HashMap<>();
         for (InvModCompat<?> compatMod : InvModCompat.invCompatMods) {
             String modName = compatMod.getModName();
+            if (!this.modInventoryItems.containsKey(modName)) continue;
             CompatComponent<?> compatInv = this.modInventoryItems.get(modName);
             CompatComponent<?> filteredCompatInv = compatInv.filterInv(filter);
             filteredModInventories.put(modName, filteredCompatInv);
@@ -584,6 +596,8 @@ public NbtCompound toNbt() {
         NbtCompound modInventoriesNbt = new NbtCompound();
         for (InvModCompat<?> compatMod : InvModCompat.invCompatMods) {
             String modName = compatMod.getModName();
+            if (!this.modInventoryItems.containsKey(modName)) continue;
+
             CompatComponent<?> compatInv = this.modInventoryItems.get(modName);
             modInventoriesNbt.put(modName, compatInv.writeNbt());
         }
@@ -613,6 +627,7 @@ public static InventoryComponent fromNbt(NbtCompound nbt) {
         Map<String, CompatComponent<?>> compatComponents = new HashMap<>();
         for (InvModCompat<?> compatMod : InvModCompat.invCompatMods) {
             String modName = compatMod.getModName();
+            if (!modInventoriesNbt.contains(modName)) continue;
             NbtCompound modNbt = modInventoriesNbt.getCompound(modName);
             compatComponents.put(modName, compatMod.readNbt(modNbt));
         }