diff options
3 files changed, 15 insertions, 15 deletions
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialMultiMachine.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialMultiMachine.java index 46e6069db3..8401892e59 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialMultiMachine.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialMultiMachine.java @@ -106,13 +106,13 @@ extends GregtechMeta_MultiBlockBase { @Override public boolean checkRecipe(final ItemStack aStack) { ArrayList<FluidStack> tFluids = getStoredFluids(); - //Logger.INFO("1"); + //Logger.MACHINE_INFO("1"); for (GT_MetaTileEntity_Hatch_InputBus tBus : mInputBusses) { ArrayList<ItemStack> tBusItems = new ArrayList<ItemStack>(); tBus.mRecipeMap = getRecipeMap(); - //Logger.INFO("2"); + //Logger.MACHINE_INFO("2"); if (isValidMetaTileEntity(tBus)) { - //Logger.INFO("3"); + //Logger.MACHINE_INFO("3"); for (int i = tBus.getBaseMetaTileEntity().getSizeInventory() - 1; i >= 0; i--) { if (tBus.getBaseMetaTileEntity().getStackInSlot(i) != null) tBusItems.add(tBus.getBaseMetaTileEntity().getStackInSlot(i)); @@ -123,7 +123,7 @@ extends GregtechMeta_MultiBlockBase { FluidStack[] properArray; properArray = ((tempArray != null && tempArray.length > 0) ? (FluidStack[]) tempArray : new FluidStack[] {}); - //Logger.INFO("4"); + //Logger.MACHINE_INFO("4"); if (checkRecipeGeneric(tBusItems.toArray(new ItemStack[]{}), properArray, (2*GT_Utility.getTier(this.getMaxInputVoltage())), 80, 250, 10000)) return true; } @@ -257,7 +257,7 @@ extends GregtechMeta_MultiBlockBase { ItemStack tCircuit = getCircuit(aItemInputs); int tCircuitID = getCircuitID(tCircuit); - Logger.INFO("Mode: "+tCircuitID); + Logger.MACHINE_INFO("Mode: "+tCircuitID); // Time to Defer to Special Handling if it's in replicator mode. if (tCircuitID == MODE_REPLICATOR) { @@ -288,19 +288,19 @@ extends GregtechMeta_MultiBlockBase { this.mLastRecipeExtended[tCircuitID] = tRecipe; if (tRecipe == null) { - Logger.INFO("BAD RETURN - 1|"+tCircuitID); + Logger.MACHINE_INFO("BAD RETURN - 1|"+tCircuitID); if (aItemInputs.length > 0) { - Logger.INFO("Input Items: "+ItemUtils.getArrayStackNames(aItemInputs)); + Logger.MACHINE_INFO("Input Items: "+ItemUtils.getArrayStackNames(aItemInputs)); } if (aFluidInputs.length > 0) { - Logger.INFO("Input Fluids: "+ItemUtils.getFluidArrayStackNames(aFluidInputs)); + Logger.MACHINE_INFO("Input Fluids: "+ItemUtils.getFluidArrayStackNames(aFluidInputs)); } return false; } if (!this.canBufferOutputs(tRecipe, aMaxParallelRecipes)) { - Logger.INFO("BAD RETURN - 2|"+tCircuitID); + Logger.MACHINE_INFO("BAD RETURN - 2|"+tCircuitID); return false; } @@ -326,7 +326,7 @@ extends GregtechMeta_MultiBlockBase { } if (parallelRecipes == 0) { - Logger.INFO("BAD RETURN - 3|"+tCircuitID); + Logger.MACHINE_INFO("BAD RETURN - 3|"+tCircuitID); return false; } @@ -423,7 +423,7 @@ extends GregtechMeta_MultiBlockBase { // Play sounds (GT++ addition - GT multiblocks play no sounds) startProcess(); - Logger.INFO("GOOD RETURN - 1|"+tCircuitID); + Logger.MACHINE_INFO("GOOD RETURN - 1|"+tCircuitID); return true; } diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialWashPlant.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialWashPlant.java index 68da3f48a9..0fafbde4a7 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialWashPlant.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialWashPlant.java @@ -61,6 +61,7 @@ extends GregtechMeta_MultiBlockBase { "1x Output Bus (Any casing)", "1x Maintenance Hatch (Any casing)", "1x Energy Hatch (Any casing)", + "Wash Plant Casings for the rest", CORE.GT_Tooltip }; diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/storage/GregtechMetaTileEntity_PowerSubStationController.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/storage/GregtechMetaTileEntity_PowerSubStationController.java index d0045280f9..16951cb515 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/storage/GregtechMetaTileEntity_PowerSubStationController.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/storage/GregtechMetaTileEntity_PowerSubStationController.java @@ -1,8 +1,6 @@ package gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.storage; import java.util.ArrayList; -import java.util.concurrent.TimeUnit; - import gregtech.api.metatileentity.MetaTileEntity; import gregtech.api.util.GT_Utility; import net.minecraft.block.Block; @@ -65,8 +63,9 @@ public class GregtechMetaTileEntity_PowerSubStationController extends GregtechMe "Consumes " + this.ENERGY_TAX + "% of the average voltage of all energy type hatches", "Can be built with variable height between " + (CELL_HEIGHT_MIN + 2) + "-" + (CELL_HEIGHT_MAX + 2) + "", "Hatches can be placed nearly anywhere", - "Size(WxHxD): External 5xHx5, Sub-Station Casings, Controller (Bottom, Centre)", - "Size(WxHxD): Internal 3x(H-2)x3, Energy Storage Cells", + "Controller (Bottom, Centre)", + "Size(WxHxD): External 5xHx5, Sub-Station External Casings", + "Size(WxHxD): Internal 3x(H-2)x3, Vanadium Redox Power Cells", "Read '"+BookHandler.ItemBookWritten_MultiPowerStorage.getDisplayName()+"' for more info.", CORE.GT_Tooltip}; } |