aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/common/tileentities
diff options
context:
space:
mode:
authorMuramasa <haydenkilloh@gmail.com>2016-08-14 08:06:00 +0100
committerMuramasa <haydenkilloh@gmail.com>2016-08-14 08:06:00 +0100
commit7874d1c91fe6c2d39b7623da86224cf2b72439c0 (patch)
tree0d8d7ff27b9e6b70d9cca738c1124ef5ac86cd5e /src/main/java/gregtech/common/tileentities
parent5eb28573897020b2e60415a61e408473772c3c75 (diff)
downloadGT5-Unofficial-7874d1c91fe6c2d39b7623da86224cf2b72439c0.tar.gz
GT5-Unofficial-7874d1c91fe6c2d39b7623da86224cf2b72439c0.tar.bz2
GT5-Unofficial-7874d1c91fe6c2d39b7623da86224cf2b72439c0.zip
Bugfixes 8
Diffstat (limited to 'src/main/java/gregtech/common/tileentities')
-rw-r--r--src/main/java/gregtech/common/tileentities/generators/GT_MetaTileEntity_MagicalEnergyAbsorber.java3
-rw-r--r--src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_FusionComputer.java13
2 files changed, 2 insertions, 14 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 d898647d0b..8e597eaf91 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
@@ -28,6 +28,7 @@ import thaumcraft.api.aspects.IEssentiaContainerItem;
import thaumcraft.api.visnet.VisNetHandler;
import java.util.ArrayList;
+import java.util.Locale;
import static gregtech.api.enums.GT_Values.V;
@@ -163,7 +164,7 @@ public class GT_MetaTileEntity_MagicalEnergyAbsorber extends GT_MetaTileEntity_B
if ((this.mInventory[0] != null) && (this.mInventory[1] == null)) {
if (isThaumcraftLoaded && this.mInventory[0].getItem() instanceof IEssentiaContainerItem) {
AspectList tAspect = ((IEssentiaContainerItem) this.mInventory[0].getItem()).getAspects(this.mInventory[0]);
- TC_Aspects tValue = TC_Aspects.valueOf(tAspect.getAspects()[0].getTag().toUpperCase());
+ TC_Aspects tValue = TC_Aspects.valueOf(tAspect.getAspects()[0].getTag().toUpperCase(Locale.ENGLISH));
int tEU = (tValue.mValue * tAspect.getAmount((Aspect) tValue.mAspect) * 100);
getBaseMetaTileEntity().increaseStoredEnergyUnits(tEU * getEfficiency() / 100, true);
ItemStack tStack = this.mInventory[0].copy();
diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_FusionComputer.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_FusionComputer.java
index 550cea5237..2b4f780e8a 100644
--- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_FusionComputer.java
+++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_FusionComputer.java
@@ -126,19 +126,6 @@ public abstract class GT_MetaTileEntity_FusionComputer extends GT_MetaTileEntity
return false;
}
- //FindBugs
- @Deprecated
- private boolean checkTier(byte tier, ArrayList<GT_MetaTileEntity_Hatch> list) {
- if (list != null) {
- for (int i = 0; i < list.size(); i++) {
- if (list.get(i).mTier < tier) {
- return false;
- }
- }
- }
- return true;
- }
-
private boolean checkCoils(int aX, int aY, int aZ) {
return (isFusionCoil(aX + 6, aY, aZ - 1)) && (isFusionCoil(aX + 6, aY, aZ)) && (isFusionCoil(aX + 6, aY, aZ + 1)) && (isFusionCoil(aX + 5, aY, aZ - 3)) && (isFusionCoil(aX + 5, aY, aZ - 2))
&& (isFusionCoil(aX + 5, aY, aZ + 2)) && (isFusionCoil(aX + 5, aY, aZ + 3)) && (isFusionCoil(aX + 4, aY, aZ - 4)) && (isFusionCoil(aX + 4, aY, aZ + 4))