aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/common/tileentities/machines/multi
diff options
context:
space:
mode:
authorTechnus <daniel112092@gmail.com>2017-06-17 13:33:57 +0200
committerTechnus <daniel112092@gmail.com>2017-06-17 13:33:57 +0200
commit9fa2024ac18d49a95024775e34cb32a98bd1c1a3 (patch)
tree71f5b80830d6abb7818d7e1c671a5062b87578f0 /src/main/java/gregtech/common/tileentities/machines/multi
parentb6dfcd0d1dd704cea8a3040ad29cf1ed0fdb1a57 (diff)
downloadGT5-Unofficial-9fa2024ac18d49a95024775e34cb32a98bd1c1a3.tar.gz
GT5-Unofficial-9fa2024ac18d49a95024775e34cb32a98bd1c1a3.tar.bz2
GT5-Unofficial-9fa2024ac18d49a95024775e34cb32a98bd1c1a3.zip
Cleaned up to ore processing
Diffstat (limited to 'src/main/java/gregtech/common/tileentities/machines/multi')
-rw-r--r--src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ProcessingArray.java90
1 files changed, 46 insertions, 44 deletions
diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ProcessingArray.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ProcessingArray.java
index d0bbe97632..389ddf4c5b 100644
--- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ProcessingArray.java
+++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ProcessingArray.java
@@ -205,69 +205,69 @@ public class GT_MetaTileEntity_ProcessingArray extends GT_MetaTileEntity_MultiBl
if (map == null) return false;
ArrayList<ItemStack> tInputList = getStoredInputs();
- if (mInventory[1].getUnlocalizedName().endsWith("10")) {
+ if (mInventory[1].getUnlocalizedName().endsWith("10")) {
tTier = 9;
- mMult=2;//u need 4x less machines and they will use 4x less power
- }else if (mInventory[1].getUnlocalizedName().endsWith("11")) {
+ mMult = 2;//u need 4x less machines and they will use 4x less power
+ } else if (mInventory[1].getUnlocalizedName().endsWith("11")) {
tTier = 9;
- mMult=4;//u need 16x less machines and they will use 16x less power
- }else if (mInventory[1].getUnlocalizedName().endsWith("12") ||
- mInventory[1].getUnlocalizedName().endsWith("13") ||
- mInventory[1].getUnlocalizedName().endsWith("14") ||
- mInventory[1].getUnlocalizedName().endsWith("15")) {
+ mMult = 4;//u need 16x less machines and they will use 16x less power
+ } else if (mInventory[1].getUnlocalizedName().endsWith("12") ||
+ mInventory[1].getUnlocalizedName().endsWith("13") ||
+ mInventory[1].getUnlocalizedName().endsWith("14") ||
+ mInventory[1].getUnlocalizedName().endsWith("15")) {
tTier = 9;
- mMult=6;//u need 64x less machines and they will use 64x less power
- }else if (mInventory[1].getUnlocalizedName().endsWith("1")) {
+ mMult = 6;//u need 64x less machines and they will use 64x less power
+ } else if (mInventory[1].getUnlocalizedName().endsWith("1")) {
tTier = 1;
- mMult=0;//*1
- }else if (mInventory[1].getUnlocalizedName().endsWith("2")) {
+ mMult = 0;//*1
+ } else if (mInventory[1].getUnlocalizedName().endsWith("2")) {
tTier = 2;
- mMult=0;//*1
- }else if (mInventory[1].getUnlocalizedName().endsWith("3")) {
+ mMult = 0;//*1
+ } else if (mInventory[1].getUnlocalizedName().endsWith("3")) {
tTier = 3;
- mMult=0;//*1
- }else if (mInventory[1].getUnlocalizedName().endsWith("4")) {
+ mMult = 0;//*1
+ } else if (mInventory[1].getUnlocalizedName().endsWith("4")) {
tTier = 4;
- mMult=0;//*1
- }else if (mInventory[1].getUnlocalizedName().endsWith("5")) {
+ mMult = 0;//*1
+ } else if (mInventory[1].getUnlocalizedName().endsWith("5")) {
tTier = 5;
- mMult=0;//*1
- }else if (mInventory[1].getUnlocalizedName().endsWith("6")) {
+ mMult = 0;//*1
+ } else if (mInventory[1].getUnlocalizedName().endsWith("6")) {
tTier = 6;
- mMult=0;//*1
- }else if (mInventory[1].getUnlocalizedName().endsWith("7")) {
+ mMult = 0;//*1
+ } else if (mInventory[1].getUnlocalizedName().endsWith("7")) {
tTier = 7;
- mMult=0;//*1
- }else if (mInventory[1].getUnlocalizedName().endsWith("8")) {
+ mMult = 0;//*1
+ } else if (mInventory[1].getUnlocalizedName().endsWith("8")) {
tTier = 8;
- mMult=0;//*1
- }else if (mInventory[1].getUnlocalizedName().endsWith("9")) {
+ mMult = 0;//*1
+ } else if (mInventory[1].getUnlocalizedName().endsWith("9")) {
tTier = 9;
- mMult=0;//*1
- }else{
+ mMult = 0;//*1
+ } else {
tTier = 0;
- mMult=0;//*1
+ mMult = 0;//*1
}
-
- if(!mMachine.equals(mInventory[1].getUnlocalizedName()))mLastRecipe=null;
+
+ if (!mMachine.equals(mInventory[1].getUnlocalizedName())) mLastRecipe = null;
mMachine = mInventory[1].getUnlocalizedName();
ItemStack[] tInputs = (ItemStack[]) tInputList.toArray(new ItemStack[tInputList.size()]);
ArrayList<FluidStack> tFluidList = getStoredFluids();
-
- FluidStack[] tFluids = (FluidStack[]) tFluidList.toArray(new FluidStack[tFluidList.size()]);
+
+ FluidStack[] tFluids = (FluidStack[]) tFluidList.toArray(new FluidStack[tFluidList.size()]);
if (tInputList.size() > 0 || tFluids.length > 0) {
GT_Recipe tRecipe = map.findRecipe(getBaseMetaTileEntity(), mLastRecipe, false, gregtech.api.enums.GT_Values.V[tTier], tFluids, tInputs);
if (tRecipe != null) {
if (GT_Mod.gregtechproxy.mLowGravProcessing && tRecipe.mSpecialValue == -100 &&
- !isValidForLowGravity(tRecipe,getBaseMetaTileEntity().getWorld().provider.dimensionId))
+ !isValidForLowGravity(tRecipe, getBaseMetaTileEntity().getWorld().provider.dimensionId))
return false;
mLastRecipe = tRecipe;
this.mEUt = 0;
this.mOutputItems = null;
this.mOutputFluids = null;
- int machines = Math.min(64, mInventory[1].stackSize<<mMult); //Upped max Cap to 64
+ int machines = Math.min(64, mInventory[1].stackSize << mMult); //Upped max Cap to 64
int i = 0;
for (; i < machines; i++) {
if (!tRecipe.isRecipeInputEqual(true, tFluids, tInputs)) {
@@ -284,7 +284,7 @@ public class GT_MetaTileEntity_ProcessingArray extends GT_MetaTileEntity_MultiBl
//In case recipe is too OP for that machine
if (mMaxProgresstime == Integer.MAX_VALUE - 1 && mEUt == Integer.MAX_VALUE - 1)
return false;
- this.mEUt = GT_Utility.safeInt(((long)this.mEUt*i)>>mMult,1);
+ this.mEUt = GT_Utility.safeInt(((long) this.mEUt * i) >> mMult, 1);
if (mEUt == Integer.MAX_VALUE - 1)
return false;
@@ -293,9 +293,10 @@ public class GT_MetaTileEntity_ProcessingArray extends GT_MetaTileEntity_MultiBl
}
ItemStack[] tOut = new ItemStack[tRecipe.mOutputs.length];
for (int h = 0; h < tRecipe.mOutputs.length; h++) {
- if(tRecipe.getOutput(h)!=null){
- tOut[h] = tRecipe.getOutput(h).copy();
- tOut[h].stackSize = 0;}
+ if (tRecipe.getOutput(h) != null) {
+ tOut[h] = tRecipe.getOutput(h).copy();
+ tOut[h].stackSize = 0;
+ }
}
FluidStack tFOut = null;
if (tRecipe.getFluidOutput(0) != null) tFOut = tRecipe.getFluidOutput(0).copy();
@@ -316,11 +317,12 @@ public class GT_MetaTileEntity_ProcessingArray extends GT_MetaTileEntity_MultiBl
List<ItemStack> overStacks = new ArrayList<ItemStack>();
for (int f = 0; f < tOut.length; f++) {
while (tOut[f].getMaxStackSize() < tOut[f].stackSize) {
- if(tOut[f]!=null){
- ItemStack tmp = tOut[f].copy();
- tmp.stackSize = tmp.getMaxStackSize();
- tOut[f].stackSize = tOut[f].stackSize - tOut[f].getMaxStackSize();
- overStacks.add(tmp);}
+ if (tOut[f] != null) {
+ ItemStack tmp = tOut[f].copy();
+ tmp.stackSize = tmp.getMaxStackSize();
+ tOut[f].stackSize = tOut[f].stackSize - tOut[f].getMaxStackSize();
+ overStacks.add(tmp);
+ }
}
}
if (overStacks.size() > 0) {