diff options
author | Glease <4586901+Glease@users.noreply.github.com> | 2022-04-22 19:44:35 +0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-04-22 13:44:35 +0200 |
commit | a9c1e527b09c7bf7fe8f1e458d3f211f78d55d7d (patch) | |
tree | e9e2897f09e59708397254b80f809731b68a449c /src/main/java/gregtech/common/tileentities/generators | |
parent | 9809f0abb47a2c4628ab4a3b8157c6dcd34255bf (diff) | |
download | GT5-Unofficial-a9c1e527b09c7bf7fe8f1e458d3f211f78d55d7d.tar.gz GT5-Unofficial-a9c1e527b09c7bf7fe8f1e458d3f211f78d55d7d.tar.bz2 GT5-Unofficial-a9c1e527b09c7bf7fe8f1e458d3f211f78d55d7d.zip |
Address some warnings found by static code analysis (#1028)
* Address some warning found by static code analysis
* Improve variables naming by redoing logic
Diffstat (limited to 'src/main/java/gregtech/common/tileentities/generators')
-rw-r--r-- | src/main/java/gregtech/common/tileentities/generators/GT_MetaTileEntity_MagicalEnergyAbsorber.java | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/main/java/gregtech/common/tileentities/generators/GT_MetaTileEntity_MagicalEnergyAbsorber.java b/src/main/java/gregtech/common/tileentities/generators/GT_MetaTileEntity_MagicalEnergyAbsorber.java index f6288f1e92..6cbc0a4cc4 100644 --- a/src/main/java/gregtech/common/tileentities/generators/GT_MetaTileEntity_MagicalEnergyAbsorber.java +++ b/src/main/java/gregtech/common/tileentities/generators/GT_MetaTileEntity_MagicalEnergyAbsorber.java @@ -388,21 +388,21 @@ public class GT_MetaTileEntity_MagicalEnergyAbsorber extends GT_MetaTileEntity_B if ((Integer) e.getKey() < Enchantment.enchantmentsList.length) { Enchantment tEnchantment = Enchantment.enchantmentsList[(Integer) e.getKey()]; Integer tLevel = (Integer) e.getValue(); - tEU += 1000000 * tLevel / (tEnchantment.getMaxLevel() * tEnchantment.getWeight()); + tEU += 1000000L * tLevel / tEnchantment.getMaxLevel() / tEnchantment.getWeight(); } } - if (isDisenchantableItem(tStack)) { + + ItemStack tOutputStack = GT_Utility.copyAmount(1L, tStack); + if (isDisenchantableItem(tOutputStack)) { tEU = tEU * getEfficiency() / 100; + EnchantmentHelper.setEnchantments(new HashMap<>(), tOutputStack); + } else if (isEnchantedBook(tOutputStack)) { + tOutputStack = new ItemStack(Items.book, 1); } // Only consume input if can store EU and push output if ((getBaseMetaTileEntity().getStoredEU() + tEU) < getBaseMetaTileEntity().getEUCapacity() - && getBaseMetaTileEntity().addStackToSlot(getOutputSlot(), tStack)) { - if (isDisenchantableItem(tStack)) { - EnchantmentHelper.setEnchantments(new HashMap(), tStack); - } else if (isEnchantedBook(tStack)) { - tStack = new ItemStack(Items.book, 1); - } + && getBaseMetaTileEntity().addStackToSlot(getOutputSlot(), tOutputStack)) { decrStackSize(getInputSlot(), 1); } else { tEU = 0; |