diff options
Diffstat (limited to 'src/Java')
| -rw-r--r-- | src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/chemplant/GregtechMTE_ChemicalPlant.java | 31 |
1 files changed, 12 insertions, 19 deletions
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/chemplant/GregtechMTE_ChemicalPlant.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/chemplant/GregtechMTE_ChemicalPlant.java index 4a2747a3db..bb22297b28 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/chemplant/GregtechMTE_ChemicalPlant.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/chemplant/GregtechMTE_ChemicalPlant.java @@ -105,7 +105,7 @@ public class GregtechMTE_ChemicalPlant extends GregtechMeta_MultiBlockBase { tt.addMachineType(getMachineType()) .addInfo("Controller Block for the Chemical Plant") .addInfo("Heavy Industry, now right at your doorstep!") - .addInfo("Please read to user manual for more information on construction & usage") + .addInfo("Please read the user manual for more information on construction and usage") .addSeparator() .addController("Bottom Center") .addStructureHint("Catalyst Housing", 1) @@ -591,7 +591,7 @@ public class GregtechMTE_ChemicalPlant extends GregtechMeta_MultiBlockBase { return false; } - // checks if it has a catalyst with enough durability + // checks if it has a catalyst ItemStack tCatalystRecipe = findCatalyst(aItemInputs); boolean aDoesRecipeNeedCatalyst = false; for (ItemStack aInputItem : tRecipe.mInputs) { @@ -606,7 +606,7 @@ public class GregtechMTE_ChemicalPlant extends GregtechMeta_MultiBlockBase { return false; } if (mCatalystBuses.size() != 1) { - log("does not have correct number of catalyst hatchs. (Required 1, found "+mCatalystBuses.size()+")"); + log("does not have correct number of catalyst hatches. (Required 1, found "+mCatalystBuses.size()+")"); return false; } } @@ -627,16 +627,16 @@ public class GregtechMTE_ChemicalPlant extends GregtechMeta_MultiBlockBase { return false; } - // checks if it has enough catalyst durabilety + // checks if it has enough catalyst durability ArrayList<ItemStack>tCatalysts = null; - int tMaxParrallelCatalyst = aMaxParallelRecipes; + int tMaxParallelCatalyst = aMaxParallelRecipes; if (tCatalystRecipe != null) { tCatalysts = new ArrayList<ItemStack>(); - tMaxParrallelCatalyst = getCatalysts(aItemInputs, tCatalystRecipe, aMaxParallelRecipes, tCatalysts); - log("Can process "+tMaxParrallelCatalyst+" recipes. If less than "+aMaxParallelRecipes+", catalyst does not have enough durability."); + tMaxParallelCatalyst = getCatalysts(aItemInputs, tCatalystRecipe, aMaxParallelRecipes, tCatalysts); + log("Can process "+tMaxParallelCatalyst+" recipes. If less than "+aMaxParallelRecipes+", catalyst does not have enough durability."); } - if (tMaxParrallelCatalyst == 0) { + if (tMaxParallelCatalyst == 0) { log("found not enough catalysts"); return false; } @@ -650,13 +650,13 @@ public class GregtechMTE_ChemicalPlant extends GregtechMeta_MultiBlockBase { int parallelRecipes = 0; log("parallelRecipes: "+parallelRecipes); - log("aMaxParallelRecipes: "+tMaxParrallelCatalyst); + log("aMaxParallelRecipes: "+tMaxParallelCatalyst); log("tTotalEUt: "+tTotalEUt); log("tVoltage: "+tVoltage); log("tEnergy: "+tEnergy); log("tRecipeEUt: "+tRecipeEUt); // Count recipes to do in parallel, consuming input items and fluids and considering input voltage limits - for (; parallelRecipes < tMaxParrallelCatalyst && tTotalEUt < (tEnergy - tRecipeEUt); parallelRecipes++) { + for (; parallelRecipes < tMaxParallelCatalyst && tTotalEUt < (tEnergy - tRecipeEUt); parallelRecipes++) { if (!tRecipe.isRecipeInputEqual(true, aFluidInputs, aItemInputs)) { log("Broke at "+parallelRecipes+"."); break; @@ -928,14 +928,14 @@ public class GregtechMTE_ChemicalPlant extends GregtechMeta_MultiBlockBase { } private int getCatalysts(ItemStack[] aItemInputs, ItemStack aRecipeCatalyst, int aMaxParrallel, ArrayList<ItemStack> aOutPut) { - int allowedParrallel = 0; + int allowedParallel = 0; for (final ItemStack aInput : aItemInputs) { if (aRecipeCatalyst.isItemEqual(aInput)) { int aDurabilityRemaining = getMaxCatalystDurability() - getDamage(aInput); return Math.min(aMaxParrallel, aDurabilityRemaining); } } - return allowedParrallel; + return allowedParallel; } private ItemStack findCatalyst(ItemStack[] aItemInputs) { @@ -971,9 +971,6 @@ public class GregtechMTE_ChemicalPlant extends GregtechMeta_MultiBlockBase { log("not consuming catalyst"); } } - - - } private int getDamage(ItemStack aStack) { @@ -984,8 +981,6 @@ public class GregtechMTE_ChemicalPlant extends GregtechMeta_MultiBlockBase { ItemGenericChemBase.setCatalystDamage(aStack, aAmount); } - - @SideOnly(Side.CLIENT) private final int getCasingTierOnClientSide() { @@ -1018,7 +1013,6 @@ public class GregtechMTE_ChemicalPlant extends GregtechMeta_MultiBlockBase { t.printStackTrace(); return 0; } - } /* @@ -1036,5 +1030,4 @@ public class GregtechMTE_ChemicalPlant extends GregtechMeta_MultiBlockBase { } return tItems; } - } |