From 0e1cb083f3bc42f5ab6a64f078b7dd7ba1b85c6c Mon Sep 17 00:00:00 2001 From: Midnight <23142346+Midnight145@users.noreply.github.com> Date: Tue, 28 Oct 2025 09:45:13 -0500 Subject: [PATCH] quick refactor --- .../blightbuster/items/ItemPurityFocus.java | 64 ++++++------------- 1 file changed, 19 insertions(+), 45 deletions(-) diff --git a/src/main/java/talonos/blightbuster/items/ItemPurityFocus.java b/src/main/java/talonos/blightbuster/items/ItemPurityFocus.java index d04b8c8..d6946ad 100644 --- a/src/main/java/talonos/blightbuster/items/ItemPurityFocus.java +++ b/src/main/java/talonos/blightbuster/items/ItemPurityFocus.java @@ -208,17 +208,18 @@ public boolean onFocusBlockStartBreak(ItemStack itemstack, int x, int y, int z, private void cleanNode(int x, int y, int z, EntityPlayer player, ItemStack itemstack) { TileEntity tile = player.getEntityWorld() .getTileEntity(x, y, z); - if (tile instanceof TileNode node) { + + if (tile instanceof TileNode node_) { ItemWandCasting wand = (ItemWandCasting) itemstack.getItem(); boolean hasNodeUpgrade = isUpgradedWith(wand.getFocusItem(itemstack), ItemPurityFocus.node); - if (node.getNodeType() == NodeType.TAINTED + if (node_.getNodeType() == NodeType.TAINTED && wand.consumeAllVis(itemstack, player, getNodeVisCost(), true, false)) { if (hasNodeUpgrade) { - node.setNodeType(NodeType.PURE); + node_.setNodeType(NodeType.PURE); } else { - node.setNodeType(NodeType.NORMAL); + node_.setNodeType(NodeType.NORMAL); } - node.markDirty(); + node_.markDirty(); player.worldObj.markBlockForUpdate(x, y, z); PurityFocusFX.node(player, x, y, z); } @@ -347,6 +348,7 @@ public boolean showAxis(ItemStack stack, World world, EntityPlayer player, int s } else return axis == EnumAxis.Z && (dim == 0 || dim == 2); } + @SuppressWarnings("unchecked") @Override public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean par4) { AspectList al = this.getVisCost(stack); @@ -372,7 +374,7 @@ public void addInformation(ItemStack stack, EntityPlayer player, List list, bool this.addFocusInformation(stack, player, list, par4); } - private static void addVis(List list, AspectList al) { + private static void addVis(List list, AspectList al) { if (al.size() < 1) { list.add(" " + StatCollector.translateToLocal("gui.visCost.noCost")); return; @@ -421,62 +423,34 @@ public static AspectList getVacuumVisCost() { } public static void setBlockVisCost(AspectList list) { - for (Aspect a : blockCost.getAspects()) { - blockCost.remove(a); - } - if (list.size() < 1) { - return; - } - for (Aspect a : list.getAspects()) { - blockCost.add(a, list.getAmount(a)); - } + setVisCost(list, blockCost); } public static void setNodeVisCost(AspectList list) { - for (Aspect a : nodeCost.getAspects()) { - nodeCost.remove(a); - } - if (list.size() < 1) { - return; - } - for (Aspect a : list.getAspects()) { - nodeCost.add(a, list.getAmount(a)); - } + setVisCost(list, nodeCost); } public static void setAttackVisCost(AspectList list) { - for (Aspect a : attackCost.getAspects()) { - attackCost.remove(a); - } - if (list.size() < 1) { - return; - } - for (Aspect a : list.getAspects()) { - attackCost.add(a, list.getAmount(a)); - } + setVisCost(list, attackCost); } public static void setHealVisCost(AspectList list) { - for (Aspect a : healCost.getAspects()) { - healCost.remove(a); - } - if (list.size() < 1) { - return; - } - for (Aspect a : list.getAspects()) { - healCost.add(a, list.getAmount(a)); - } + setVisCost(list, healCost); } public static void setVacuumVisCost(AspectList list) { - for (Aspect a : vacuumCost.getAspects()) { - vacuumCost.remove(a); + setVisCost(list, vacuumCost); + } + + private static void setVisCost(AspectList list, AspectList nodeCost) { + for (Aspect a : nodeCost.getAspects()) { + nodeCost.remove(a); } if (list.size() < 1) { return; } for (Aspect a : list.getAspects()) { - vacuumCost.add(a, list.getAmount(a)); + nodeCost.add(a, list.getAmount(a)); } }