From d434a1c9153099739bf79902600bc254fd3551dd Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sat, 15 Feb 2020 01:12:11 -0600 Subject: [PATCH] Eliminate awful logic duplication in ManaItemHandler --- .../botania/api/mana/ManaItemHandler.java | 107 +++--------------- .../client/core/handler/HUDHandler.java | 5 +- 2 files changed, 20 insertions(+), 92 deletions(-) diff --git a/src/main/java/vazkii/botania/api/mana/ManaItemHandler.java b/src/main/java/vazkii/botania/api/mana/ManaItemHandler.java index 02e93530e..ec58023b7 100644 --- a/src/main/java/vazkii/botania/api/mana/ManaItemHandler.java +++ b/src/main/java/vazkii/botania/api/mana/ManaItemHandler.java @@ -10,6 +10,7 @@ */ package vazkii.botania.api.mana; +import com.google.common.collect.Iterables; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; import net.minecraftforge.common.MinecraftForge; @@ -18,6 +19,7 @@ import net.minecraftforge.items.IItemHandler; import vazkii.botania.api.BotaniaAPI; import java.util.ArrayList; +import java.util.Collections; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -33,9 +35,9 @@ public final class ManaItemHandler { */ public static List getManaItems(PlayerEntity player) { if (player == null) - return new ArrayList<>(); + return Collections.emptyList(); - List toReturn = new ArrayList(); + List toReturn = new ArrayList<>(); player.getCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY).ifPresent(mainInv -> { int size = mainInv.getSlots(); @@ -57,23 +59,22 @@ public final class ManaItemHandler { * Gets a list containing all mana-holding items in a player's accessories inventory. * @return The list of items */ - public static Map getManaAccesories(PlayerEntity player) { + public static List getManaAccesories(PlayerEntity player) { if (player == null) - return new HashMap(); + return Collections.emptyList(); IItemHandler acc = BotaniaAPI.internalHandler.getAccessoriesInventory(player); if (acc == null) - return new HashMap(); + return Collections.emptyList(); - Map toReturn = new HashMap(); - int size = acc.getSlots(); + List toReturn = new ArrayList<>(acc.getSlots()); - for(int slot = 0; slot < size; slot++) { + for(int slot = 0; slot < acc.getSlots(); slot++) { ItemStack stackInSlot = acc.getStackInSlot(slot); if(!stackInSlot.isEmpty() && stackInSlot.getItem() instanceof IManaItem) { - toReturn.put(slot, stackInSlot); + toReturn.add(stackInSlot); } } @@ -92,26 +93,8 @@ public final class ManaItemHandler { return 0; List items = getManaItems(player); - for (ItemStack stackInSlot : items) { - if(stackInSlot == stack) - continue; - IManaItem manaItem = (IManaItem) stackInSlot.getItem(); - if(manaItem.canExportManaToItem(stackInSlot, stack) && manaItem.getMana(stackInSlot) > 0) { - if(stack.getItem() instanceof IManaItem && !((IManaItem) stack.getItem()).canReceiveManaFromItem(stack, stackInSlot)) - continue; - - int mana = Math.min(manaToGet, manaItem.getMana(stackInSlot)); - - if(remove) - manaItem.addMana(stackInSlot, -mana); - - return mana; - } - } - - Map acc = getManaAccesories(player); - for (Entry entry : acc.entrySet()) { - ItemStack stackInSlot = entry.getValue(); + List acc = getManaAccesories(player); + for (ItemStack stackInSlot : Iterables.concat(items, acc)) { if(stackInSlot == stack) continue; IManaItem manaItem = (IManaItem) stackInSlot.getItem(); @@ -143,24 +126,8 @@ public final class ManaItemHandler { return false; List items = getManaItems(player); - for (ItemStack stackInSlot : items) { - if(stackInSlot == stack) - continue; - IManaItem manaItemSlot = (IManaItem) stackInSlot.getItem(); - if(manaItemSlot.canExportManaToItem(stackInSlot, stack) && manaItemSlot.getMana(stackInSlot) > manaToGet) { - if(stack.getItem() instanceof IManaItem && !((IManaItem) stack.getItem()).canReceiveManaFromItem(stack, stackInSlot)) - continue; - - if(remove) - manaItemSlot.addMana(stackInSlot, -manaToGet); - - return true; - } - } - - Map acc = getManaAccesories(player); - for (Entry entry : acc.entrySet()) { - ItemStack stackInSlot = entry.getValue(); + List acc = getManaAccesories(player); + for (ItemStack stackInSlot : Iterables.concat(items, acc)) { if(stackInSlot == stack) continue; IManaItem manaItemSlot = (IManaItem) stackInSlot.getItem(); @@ -190,30 +157,8 @@ public final class ManaItemHandler { return 0; List items = getManaItems(player); - for (ItemStack stackInSlot : items) { - if(stackInSlot == stack) - continue; - IManaItem manaItemSlot = (IManaItem) stackInSlot.getItem(); - if(manaItemSlot.canReceiveManaFromItem(stackInSlot, stack)) { - if(stack.getItem() instanceof IManaItem && !((IManaItem) stack.getItem()).canExportManaToItem(stack, stackInSlot)) - continue; - - int received; - if(manaItemSlot.getMana(stackInSlot) + manaToSend <= manaItemSlot.getMaxMana(stackInSlot)) - received = manaToSend; - else received = manaToSend - (manaItemSlot.getMana(stackInSlot) + manaToSend - manaItemSlot.getMaxMana(stackInSlot)); - - - if(add) - manaItemSlot.addMana(stackInSlot, manaToSend); - - return received; - } - } - - Map acc = getManaAccesories(player); - for (Entry entry : acc.entrySet()) { - ItemStack stackInSlot = entry.getValue(); + List acc = getManaAccesories(player); + for (ItemStack stackInSlot : Iterables.concat(items, acc)) { if(stackInSlot == stack) continue; IManaItem manaItemSlot = (IManaItem) stackInSlot.getItem(); @@ -249,24 +194,8 @@ public final class ManaItemHandler { return false; List items = getManaItems(player); - for (ItemStack stackInSlot : items) { - if(stackInSlot == stack) - continue; - IManaItem manaItemSlot = (IManaItem) stackInSlot.getItem(); - if(manaItemSlot.getMana(stackInSlot) + manaToSend <= manaItemSlot.getMaxMana(stackInSlot) && manaItemSlot.canReceiveManaFromItem(stackInSlot, stack)) { - if(stack.getItem() instanceof IManaItem && !((IManaItem) stack.getItem()).canExportManaToItem(stack, stackInSlot)) - continue; - - if(add) - manaItemSlot.addMana(stackInSlot, manaToSend); - - return true; - } - } - - Map acc = getManaAccesories(player); - for (Entry entry : acc.entrySet()) { - ItemStack stackInSlot = entry.getValue(); + List acc = getManaAccesories(player); + for (ItemStack stackInSlot : Iterables.concat(items, acc)) { if(stackInSlot == stack) continue; IManaItem manaItemSlot = (IManaItem) stackInSlot.getItem(); diff --git a/src/main/java/vazkii/botania/client/core/handler/HUDHandler.java b/src/main/java/vazkii/botania/client/core/handler/HUDHandler.java index e9fa50c0f..e810444c1 100644 --- a/src/main/java/vazkii/botania/client/core/handler/HUDHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/HUDHandler.java @@ -207,9 +207,8 @@ public final class HUDHandler { creative = true; } - Map acc = ManaItemHandler.getManaAccesories(player); - for (Entry entry : acc.entrySet()) { - ItemStack stack = entry.getValue(); + List acc = ManaItemHandler.getManaAccesories(player); + for (ItemStack stack : acc) { Item item = stack.getItem(); if(!((IManaItem) item).isNoExport(stack)) { totalMana += ((IManaItem) item).getMana(stack);