+ Added Concurrent Set objects to the API.

+ Added Flexible Pair objects to the API.
+ Added logging to ICO formation code.
% Adjusted position of GUI elements in NEI for Chemical Plant recipes.
% Adjusted the recipe for the Lava Filter.
% Adjusted which fluids are returned when requesting tiered fluids from CI. This will inevitably adjust many recipes as a result.
% Adjusted handling of the creative energy buffer.
% Adjusted Achievement handler for Dev Mode.
% Adjusted Tank Capacity on my Chemical Plants.
$ Fixed Output buffer checks on multiblocks, Closes #574.
$ Fixed LuV Super Bus recipes, Closes #575. (ULV super bus recipe is still broken for the time being)
$ Attempted once more to fix Hot Water localization.

3 files changed, 58 insertions, 48 deletions

diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/creative/GregtechMetaCreativeEnergyBuffer.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/creative/GregtechMetaCreativeEnergyBuffer.java
index 1ee27afbf0..2f00600af6 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/creative/GregtechMetaCreativeEnergyBuffer.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/creative/GregtechMetaCreativeEnergyBuffer.java
@@ -22,6 +22,7 @@ import gtPlusPlus.core.lib.CORE;
 import gtPlusPlus.core.util.math.MathUtils;
 import gtPlusPlus.core.util.minecraft.PlayerUtils;
 import gtPlusPlus.core.util.reflect.ReflectionUtils;
+import gtPlusPlus.core.util.sys.KeyboardUtils;
 import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock;
 import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock.CustomIcon;
 import gtPlusPlus.xmod.gregtech.common.tileentities.storage.GregtechMetaEnergyBuffer;
@@ -48,7 +49,7 @@ public class GregtechMetaCreativeEnergyBuffer extends GregtechMetaEnergyBuffer {
 
 	@Override
 	public String[] getDescription() {
-		return new String[] {this.mDescription, "Use Screwdriver to change voltage", EnumChatFormatting.GREEN+"CREATIVE MACHINE"};
+		return new String[] {this.mDescription, "Use Screwdriver to change voltage", "Hold Shift while using Screwdriver to change amperage", EnumChatFormatting.GREEN+"CREATIVE MACHINE"};
 	}
 
 	/*
@@ -177,43 +178,48 @@ public class GregtechMetaCreativeEnergyBuffer extends GregtechMetaEnergyBuffer {
 	}
 
 	@Override
-	public void onScrewdriverRightClick(byte aSide, EntityPlayer aPlayer, float aX, float aY, float aZ) {
-		if (this.mTier < 9) {
-			this.mTier++;
+	public void onScrewdriverRightClick(byte aSide, EntityPlayer aPlayer, float aX, float aY, float aZ) {		
+		if (KeyboardUtils.isShiftKeyDown()) {
+			super.onScrewdriverRightClick(aSide, aPlayer, aX, aY, aZ);			
 		}
 		else {
-			this.mTier = 0;
-		}
-		this.markDirty();
-		try {
-			Field field = ReflectionUtils.getField(this.getClass(), "mTextures");				
-			field.setAccessible(true);
-			Field modifiersField = Field.class.getDeclaredField("modifiers");
-			modifiersField.setAccessible(true);
-			modifiersField.setInt(field, field.getModifiers() & ~Modifier.FINAL);
-			ITexture[][][] V = getTextureSet(null);
-			if (V != null) {
-				Logger.REFLECTION("Got Valid Textures.");	
-				if (this.getBaseMetaTileEntity().isClientSide()) {
-					Logger.REFLECTION("Clientside Call.");	
-					Logger.REFLECTION("Refreshing Textures on buffer.");
-					field.set(this, V);
-					Logger.REFLECTION("Refreshed Textures on buffer.");
+			if (this.mTier < (CORE.GTNH ? GT_Values.V.length : 9)) {
+				this.mTier++;
+			}
+			else {
+				this.mTier = 0;
+			}
+			this.markDirty();
+			try {
+				Field field = ReflectionUtils.getField(this.getClass(), "mTextures");				
+				field.setAccessible(true);
+				Field modifiersField = Field.class.getDeclaredField("modifiers");
+				modifiersField.setAccessible(true);
+				modifiersField.setInt(field, field.getModifiers() & ~Modifier.FINAL);
+				ITexture[][][] V = getTextureSet(null);
+				if (V != null) {
+					Logger.REFLECTION("Got Valid Textures.");	
+					if (this.getBaseMetaTileEntity().isClientSide()) {
+						Logger.REFLECTION("Clientside Call.");	
+						Logger.REFLECTION("Refreshing Textures on buffer.");
+						field.set(this, V);
+						Logger.REFLECTION("Refreshed Textures on buffer.");
+					}
+					else {
+						Logger.REFLECTION("Serverside Call.");	
+					}
 				}
 				else {
-					Logger.REFLECTION("Serverside Call.");	
-				}
+					Logger.REFLECTION("Bad mTextures setter.");				
+				}			
 			}
-			else {
-				Logger.REFLECTION("Bad mTextures setter.");				
-			}			
-		}
-		catch (Throwable t) {
-			//Bad refresh.
-			t.printStackTrace();
-			Logger.REFLECTION("Bad mTextures setter.");
-		}
-		PlayerUtils.messagePlayer(aPlayer, "Now running at "+GT_Values.VOLTAGE_NAMES[this.mTier]+". ["+MathUtils.isNumberEven(this.mTier)+"]");
-		super.onScrewdriverRightClick(aSide, aPlayer, aX, aY, aZ);
+			catch (Throwable t) {
+				//Bad refresh.
+				t.printStackTrace();
+				Logger.REFLECTION("Bad mTextures setter.");
+			}
+			PlayerUtils.messagePlayer(aPlayer, "Now running at "+GT_Values.VOLTAGE_NAMES[this.mTier]+".");
+		}		
+		
 	}
 }
\ No newline at end of file
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntity_ChemicalReactor.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntity_ChemicalReactor.java
index ed312b704d..7717bf6379 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntity_ChemicalReactor.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntity_ChemicalReactor.java
@@ -5,6 +5,7 @@ import static gregtech.api.enums.GT_Values.E;
 import java.util.HashSet;
 import java.util.List;
 
+import cpw.mods.fml.common.registry.LanguageRegistry;
 import gregtech.GT_Mod;
 import gregtech.api.GregTech_API;
 import gregtech.api.interfaces.ITexture;
@@ -22,6 +23,7 @@ import gtPlusPlus.core.lib.CORE;
 import gtPlusPlus.core.slots.SlotChemicalPlantInput;
 import gtPlusPlus.xmod.gregtech.api.gui.fluidreactor.Container_FluidReactor;
 import gtPlusPlus.xmod.gregtech.api.gui.fluidreactor.GUI_FluidReactor;
+import gtPlusPlus.xmod.gregtech.common.Meta_GT_Proxy;
 import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock;
 import net.minecraft.entity.player.InventoryPlayer;
 import net.minecraft.item.ItemStack;
@@ -142,7 +144,7 @@ public class GregtechMetaTileEntity_ChemicalReactor extends GT_MetaTileEntity_Ba
 
 	@Override
 	public int getCapacity() {
-		return 8000 * Math.max(1, this.mTier);
+		return 32000 * Math.max(1, this.mTier) / 4;
 	}
 
 	@Override
@@ -255,7 +257,7 @@ public class GregtechMetaTileEntity_ChemicalReactor extends GT_MetaTileEntity_Ba
 
 	@Override
 	public void onPostTick(IGregTechTileEntity aBaseMetaTileEntity, long aTick) {
-		// Re-implement basic machine logic from the ground up.
+		// Re-implement basic machine logic from the ground up.=
 		
 		if (aBaseMetaTileEntity.isServerSide()) {
 			this.mCharge = aBaseMetaTileEntity.getStoredEU() / 2L > aBaseMetaTileEntity.getEUCapacity() / 3L;
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialCokeOven.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialCokeOven.java
index 611cb4da71..b8517533e6 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialCokeOven.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialCokeOven.java
@@ -55,7 +55,7 @@ extends GregtechMeta_MultiBlockBase {
 				"1x Input Bus",
 				"1x Output Bus",
 				"1x Energy Hatch"
-				};
+		};
 	}
 
 	@Override
@@ -101,7 +101,7 @@ extends GregtechMeta_MultiBlockBase {
 	public boolean checkRecipe(final ItemStack aStack) {
 		return checkRecipeGeneric(getMaxParallelRecipes(), getEuDiscountForParallelism(), 0);
 	}
-	
+
 	@Override
 	public int getMaxParallelRecipes() {
 		return this.mLevel * 12;
@@ -118,19 +118,21 @@ extends GregtechMeta_MultiBlockBase {
 		final int zDir = ForgeDirection.getOrientation(aBaseMetaTileEntity.getBackFacing()).offsetZ;
 		this.mLevel = 0;
 		if (!aBaseMetaTileEntity.getAirOffset(xDir, 1, zDir)) {
+			Logger.INFO("No air? "+xDir+", 1, "+zDir);
 			return false;
 		}
 
 		final byte tUsedMeta = aBaseMetaTileEntity.getMetaIDOffset(xDir + 1, 1, zDir);
 		switch (tUsedMeta) {
-		case 2:
-			this.mLevel = 1;
-			break;
-		case 3:
-			this.mLevel = 2;
-			break;
-		default:
-			return false;
+			case 2:
+				this.mLevel = 1;
+				break;
+			case 3:
+				this.mLevel = 2;
+				break;
+			default:
+				Logger.INFO("Bad Heating Coils.");
+				return false;
 		}
 		for (int i = -1; i < 2; i++) {
 			for (int j = -1; j < 2; j++) {
@@ -140,7 +142,7 @@ extends GregtechMeta_MultiBlockBase {
 						Logger.INFO("Heating Coils missing.");
 						return false;
 					}
-					
+
 					if (!isValidBlockForStructure(tTileEntity2, TAE.GTPP_INDEX(1), true, aBaseMetaTileEntity.getBlockOffset(xDir + i, 2, zDir + j), (int) aBaseMetaTileEntity.getMetaIDOffset(xDir + i, 2, zDir + j), ModBlocks.blockCasingsMisc, 1)) {
 						Logger.INFO("Casings missing from top layer of coke oven.");
 						return false;
@@ -158,7 +160,7 @@ extends GregtechMeta_MultiBlockBase {
 					}
 				}
 			}
-		}
+		}	
 		return true;
 	}