Merge branch 'unstable_BLOOD' into reMerge

# Conflicts:
# build.properties
# src/main/java/gregtech/GT_Mod.java
# src/main/java/gregtech/api/enums/Textures.java
# src/main/java/gregtech/api/gui/GT_GUIContainer_MultiMachine.java
# src/main/java/gregtech/api/interfaces/tileentity/IEnergyConnected.java
# src/main/java/gregtech/api/items/GT_MetaGenerated_Tool.java
# src/main/java/gregtech/api/metatileentity/BaseMetaTileEntity.java
# src/main/java/gregtech/api/metatileentity/MetaPipeEntity.java
# src/main/java/gregtech/api/metatileentity/MetaTileEntity.java
# src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicMachine.java
# src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Maintenance.java
# src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Muffler.java
# src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_MultiBlockBase.java
# src/main/java/gregtech/api/objects/GT_UO_DimensionList.java
# src/main/java/gregtech/api/util/GT_Utility.java
# src/main/java/gregtech/common/GT_Client.java
# src/main/java/gregtech/common/GT_Pollution.java
# src/main/java/gregtech/common/GT_Proxy.java
# src/main/java/gregtech/common/GT_UndergroundOil.java
# src/main/java/gregtech/common/GT_Worldgenerator.java
# src/main/java/gregtech/common/blocks/GT_Block_Machines.java
# src/main/java/gregtech/common/blocks/GT_Material_Casings.java
# src/main/java/gregtech/common/covers/GT_Cover_Arm.java
# src/main/java/gregtech/common/covers/GT_Cover_ControlsWork.java
# src/main/java/gregtech/common/covers/GT_Cover_Conveyor.java
# src/main/java/gregtech/common/covers/GT_Cover_DoesWork.java
# src/main/java/gregtech/common/covers/GT_Cover_Drain.java
# src/main/java/gregtech/common/covers/GT_Cover_EUMeter.java
# src/main/java/gregtech/common/covers/GT_Cover_EnergyOnly.java
# src/main/java/gregtech/common/covers/GT_Cover_PlayerDetector.java
# src/main/java/gregtech/common/covers/GT_Cover_Pump.java
# src/main/java/gregtech/common/covers/GT_Cover_RedstoneConductor.java
# src/main/java/gregtech/common/covers/GT_Cover_RedstoneReceiverInternal.java
# src/main/java/gregtech/common/covers/GT_Cover_RedstoneSignalizer.java
# src/main/java/gregtech/common/covers/GT_Cover_RedstoneWirelessBase.java
# src/main/java/gregtech/common/covers/GT_Cover_Shutter.java
# src/main/java/gregtech/common/covers/GT_Cover_Vent.java
# src/main/java/gregtech/common/gui/GT_Container_ChestBuffer.java
# src/main/java/gregtech/common/gui/GT_Container_Filter.java
# src/main/java/gregtech/common/gui/GT_Container_SuperBuffer.java
# src/main/java/gregtech/common/gui/GT_Container_TypeFilter.java
# src/main/java/gregtech/common/items/behaviors/Behaviour_None.java
# src/main/java/gregtech/common/items/behaviors/Behaviour_Prospecting.java
# src/main/java/gregtech/common/tileentities/boilers/GT_MetaTileEntity_Boiler_Steel.java
# src/main/java/gregtech/common/tileentities/generators/GT_MetaTileEntity_LightningRod.java
# src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_MicrowaveEnergyTransmitter.java
# src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Teleporter.java
# src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_BronzeBlastFurnace.java
# src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_Charcoal_Pit.java
# src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_DistillationTower.java
# src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeBoiler.java
# src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeBoiler_Bronze.java
# src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeBoiler_Steel.java
# src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeBoiler_TungstenSteel.java
# src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OilDrill.java
# src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ProcessingArray.java
# src/main/java/gregtech/loaders/load/GT_FuelLoader.java
# src/main/java/gregtech/loaders/misc/GT_CoverLoader.java
# src/main/java/gregtech/loaders/oreprocessing/ProcessingPlate.java
# src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java
# src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java
# src/main/java/gregtech/nei/GT_NEI_DefaultHandler.java

1 files changed, 27 insertions, 26 deletions

diff --git a/src/main/java/gregtech/nei/GT_NEI_DefaultHandler.java b/src/main/java/gregtech/nei/GT_NEI_DefaultHandler.java
index 42d6eaa516..db7f5eca49 100644
--- a/src/main/java/gregtech/nei/GT_NEI_DefaultHandler.java
+++ b/src/main/java/gregtech/nei/GT_NEI_DefaultHandler.java
@@ -29,9 +29,7 @@ import net.minecraftforge.fluids.FluidStack;
 import org.lwjgl.opengl.GL11;

 

 import java.awt.*;

-import java.util.ArrayList;

-import java.util.Collections;

-import java.util.Iterator;

+import java.util.*;

 import java.util.List;

 

 public class GT_NEI_DefaultHandler

@@ -182,7 +180,7 @@ public class GT_NEI_DefaultHandler
                     if ((!(tStack instanceof FixedPositionedStack)) || (((FixedPositionedStack) tStack).mChance <= 0) || (((FixedPositionedStack) tStack).mChance == 10000)) {

                         break;

                     }

-                    currenttip.add("Chance: " + ((FixedPositionedStack) tStack).mChance / 100 + "." + (((FixedPositionedStack) tStack).mChance % 100 < 10 ? "0" + ((FixedPositionedStack) tStack).mChance % 100 : Integer.valueOf(((FixedPositionedStack) tStack).mChance % 100)) + "%");

+                    currenttip.add(trans("150","Chance: ") + ((FixedPositionedStack) tStack).mChance / 100 + "." + (((FixedPositionedStack) tStack).mChance % 100 < 10 ? "0" + ((FixedPositionedStack) tStack).mChance % 100 : Integer.valueOf(((FixedPositionedStack) tStack).mChance % 100)) + "%");

                     break;

                 }

             }

@@ -192,7 +190,7 @@ public class GT_NEI_DefaultHandler
                             (tStack.item.stackSize != 0)) {

                         break;

                     }

-                    currenttip.add("Does not get consumed in the process");

+                    currenttip.add(trans("151","Does not get consumed in the process"));

                     break;

                 }

             }

@@ -206,25 +204,24 @@ public class GT_NEI_DefaultHandler
 		String[] recipeDesc = ((CachedDefaultRecipe) this.arecipes.get(aRecipeIndex)).mRecipe.getNeiDesc();

 		if (recipeDesc == null) {

 			if (tEUt != 0) {

-				drawText(10, 73, "Total: " + tDuration * tEUt + " EU", -16777216);

-				drawText(10, 83, "Usage: " + tEUt + " EU/t", -16777216);

+				drawText(10, 73, trans("152","Total: ") + tDuration * tEUt + " EU", -16777216);

+				drawText(10, 83, trans("153","Usage: ") + tEUt + " EU/t", -16777216);

 				if (this.mRecipeMap.mShowVoltageAmperageInNEI) {

-					drawText(10, 93, "Voltage: " + tEUt / this.mRecipeMap.mAmperage + " EU", -16777216);

-					drawText(10, 103, "Amperage: " + this.mRecipeMap.mAmperage, -16777216);

+					drawText(10, 93, trans("154","Voltage: ") + tEUt / this.mRecipeMap.mAmperage + " EU", -16777216);

+					drawText(10, 103, trans("155","Amperage: ") + this.mRecipeMap.mAmperage, -16777216);

 				} else {

-					drawText(10, 93, "Voltage: unspecified", -16777216);

-					drawText(10, 103, "Amperage: unspecified", -16777216);

+					drawText(10, 93, trans("156","Voltage: unspecified"), -16777216);

+					drawText(10, 103, trans("157","Amperage: unspecified"), -16777216);

 				}

 			}

 			if (tDuration > 0) {

-//				drawText(10, 113, "Time: " + (tDuration < 20 ? "< 1" : Integer.valueOf(tDuration / 20)) + " secs", -16777216);

-				drawText(10, 113, String.format("Time: %.2f secs", 0.05 * tDuration), -16777216);

+				drawText(10, 113, trans("158","Time: ")+String.format("%.2f secs", 0.05F * tDuration), -16777216);

 			}

 			int tSpecial = ((CachedDefaultRecipe) this.arecipes.get(aRecipeIndex)).mRecipe.mSpecialValue;

 			if (tSpecial == -100 && GT_Mod.gregtechproxy.mLowGravProcessing) {//IF mSpecialValue == -100 THEN needs Low Gravity

-				drawText(10, 123, "Needs Low Gravity", -16777216);

+				drawText(10, 123, trans("159","Needs Low Gravity"), -16777216);

 			} else if (tSpecial == -200) {//IF mSpecialValue == -200 THEN needs cleanroom

-				drawText(10, 123, "Needs Cleanroom", -16777216);

+				drawText(10, 123, trans("160","Needs Cleanroom"), -16777216);

 			} else if ((GT_Utility.isStringValid(this.mRecipeMap.mNEISpecialValuePre)) || (GT_Utility.isStringValid(this.mRecipeMap.mNEISpecialValuePost))) {

 				drawText(10, 123, this.mRecipeMap.mNEISpecialValuePre + tSpecial * this.mRecipeMap.mNEISpecialValueMultiplier + this.mRecipeMap.mNEISpecialValuePost, -16777216);

 			}

@@ -361,21 +358,21 @@ public class GT_NEI_DefaultHandler
     public class CachedDefaultRecipe

             extends TemplateRecipeHandler.CachedRecipe {

         public final GT_Recipe mRecipe;

-        public final List<PositionedStack> mOutputs;

-        public final List<PositionedStack> mInputs;

+        public final List<PositionedStack> mOutputs = new ArrayList();//Constructor here!

+        public final List<PositionedStack> mInputs = new ArrayList();//Constructor here!

 

         public CachedDefaultRecipe(GT_Recipe aRecipe) {

             super();

             this.mRecipe = aRecipe;

-

-            if (aRecipe.getInputPositionedStacks() != null && aRecipe.getOutputPositionedStacks() != null) {

-            	mInputs = aRecipe.getInputPositionedStacks();

-            	mOutputs = aRecipe.getOutputPositionedStacks();

-            	return;

-            }

-            

-            mOutputs = new ArrayList<PositionedStack>();

-            mInputs = new ArrayList<PositionedStack>();

+			

+            //if (aRecipe.getInputPositionedStacks() != null && aRecipe.getOutputPositionedStacks() != null) {

+            //	mInputs = aRecipe.getInputPositionedStacks();

+            //	mOutputs = aRecipe.getOutputPositionedStacks();

+            //	return;

+            //}

+            //TODO THE code above and below was replaced with constructor above

+            //mOutputs = new ArrayList<PositionedStack>();

+            //mInputs = new ArrayList<PositionedStack>();

             

             int tStartIndex = 0;

             switch (GT_NEI_DefaultHandler.this.mRecipeMap.mUsualInputCount) {

@@ -822,5 +819,9 @@ public class GT_NEI_DefaultHandler
         public List<PositionedStack> getOtherStacks() {

             return this.mOutputs;

         }

+    } 

+    

+    public String trans(String aKey, String aEnglish){

+    	return GT_LanguageManager.addStringLocalization("Interaction_DESCRIPTION_Index_"+aKey, aEnglish, false);

     }

 }