Merge pull request #5 from alkcorp/master

sync fork

27 files changed, 2117 insertions, 1032 deletions

diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/enums/GregtechItemList.java b/src/Java/gtPlusPlus/xmod/gregtech/api/enums/GregtechItemList.java
index 933ec227ba..7c395392a3 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/api/enums/GregtechItemList.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/api/enums/GregtechItemList.java
@@ -39,6 +39,9 @@ public enum GregtechItemList implements GregtechItemContainer {
 	Emitter_ULV,
 	Sensor_ULV,
 
+	//Recipe Circuit
+	Circuit_BioRecipeSelector,
+	
 	//Circuits
 	Old_Circuit_Primitive, Old_Circuit_Basic, Old_Circuit_Good,
 	Old_Circuit_Advanced, Old_Circuit_Data, Old_Circuit_Elite,
@@ -102,6 +105,7 @@ public enum GregtechItemList implements GregtechItemContainer {
 	Carbyne_Sheet_Finished,
 	
 	//End Game Laser Engraver Lens
+	Laser_Lens_WoodsGlass,
 	Laser_Lens_Special,
 	
 	//Bombs
@@ -109,6 +113,9 @@ public enum GregtechItemList implements GregtechItemContainer {
 	Bomb_Cast_Set, Bomb_Cast_Broken,
 	Bomb_Cast_Mold,
 	
+	// Pellet Mold
+	Pellet_Mold,
+	
 	//Charged Items for Tree Farms
 	Farm_Processor_EV, 
 	Farm_Processor_IV,
@@ -224,7 +231,12 @@ public enum GregtechItemList implements GregtechItemContainer {
 	//Fish Pond
 	Industrial_FishingPond,
 	Casing_FishPond,  
-
+	
+	//Algae
+	AlgaeFarm_Controller,
+	
+	//Chemical Plant
+	ChemicalPlant_Controller,
 
 	//GT4 autoCrafter
 	GT4_Multi_Crafter, 
@@ -318,6 +330,9 @@ public enum GregtechItemList implements GregtechItemContainer {
 	Casing_Vacuum_Furnace,
 	Controller_Vacuum_Furnace,
 
+	// Large Rocket Engine
+	Casing_RocketEngine,
+	Controller_RocketEngine,
 
 
 	//----------------------------------------------------------------------------
@@ -336,6 +351,9 @@ public enum GregtechItemList implements GregtechItemContainer {
 	//XL Turbine Rotor Hatch
 	Hatch_Turbine_Rotor,
 	
+	//Standard Turbine Rotor Hatch
+	Hatch_Input_TurbineHousing,
+	
 	//Control Core
 	Hatch_Control_Core,
 
@@ -471,6 +489,10 @@ public enum GregtechItemList implements GregtechItemContainer {
 	Machine_ZPM_Component_Maker,
 	Machine_UV_Component_Maker,
 	
+	// Fluid Reactor
+	FluidReactor_LV, FluidReactor_HV,
+	FluidReactor_IV, FluidReactor_ZPM,
+	
 	//Breakers
 	BreakerBox_ULV, BreakerBox_LV, BreakerBox_MV,
 	BreakerBox_HV, BreakerBox_EV, BreakerBox_IV,
@@ -594,7 +616,7 @@ public enum GregtechItemList implements GregtechItemContainer {
 	FakeMachineCasingPlate_MV, FakeMachineCasingPlate_HV,
 	FakeMachineCasingPlate_EV, FakeMachineCasingPlate_IV,
 	FakeMachineCasingPlate_LuV, FakeMachineCasingPlate_ZPM,
-	FakeMachineCasingPlate_UV, FakeMachineCasingPlate_MAX,
+	FakeMachineCasingPlate_UV, FakeMachineCasingPlate_MAX, 
 	
 
 	//----------------------------------------------------------------------------
@@ -607,7 +629,6 @@ public enum GregtechItemList implements GregtechItemContainer {
 	private ItemStack mStack;
 	private boolean mHasNotBeenSet = true;
 
-	public static Fluid sOilExtraHeavy, sOilHeavy, sOilMedium, sOilLight, sNaturalGas;
 
 	@Override
 	public GregtechItemList set(final Item aItem) {
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_Cyclotron.java b/src/Java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_Cyclotron.java
index 921871cebe..6d0eb6b14c 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_Cyclotron.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_Cyclotron.java
@@ -1,232 +1,37 @@
 package gtPlusPlus.xmod.gregtech.api.gui;
 
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
 import gregtech.api.gui.GT_ContainerMetaTile_Machine;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
-import gregtech.api.util.GT_LanguageManager;
-import java.util.Iterator;
-import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.entity.player.InventoryPlayer;
-import net.minecraft.inventory.ICrafting;
 
+/**
+ * NEVER INCLUDE THIS FILE IN YOUR MOD!!!
+ * <p/>
+ * The Container I use for all my Basic Machines
+ */
 public class CONTAINER_Cyclotron extends GT_ContainerMetaTile_Machine {
-	
-	public int mActive = 0;
-	public int mMaxProgressTime = 0;
-	public int mProgressTime = 0;
-	public long mEnergy = 0;
-	public int mSteam = 0;
-	public int mSteamStorage = 0;
-	public int mStorage = 0;
-	public int mOutput = 0;
-	public int mInput = 0;
-	public int mID = 0;
-	public int mDisplayErrorCode = 0;
-	private int oActive = 0;
-	private int oMaxProgressTime = 0;
-	private int oProgressTime = 0;
-	private long oEnergy = 0;
-	private int oSteam = 0;
-	private int oSteamStorage = 0;
-	private int oStorage = 0;
-	private int oOutput = 0;
-	private int oInput = 0;
-	private int oID = 0;
-	private int oDisplayErrorCode = 0;
-	private int mTimer = 0;
 
-	public CONTAINER_Cyclotron(InventoryPlayer aInventoryPlayer, IGregTechTileEntity aTileEntity) {
-		super(aInventoryPlayer, aTileEntity);
-		this.mTileEntity = aTileEntity;
-		if (this.mTileEntity != null && this.mTileEntity.getMetaTileEntity() != null) {
-			this.addSlots(aInventoryPlayer);
-			if (this.doesBindPlayerInventory()) {
-				this.bindPlayerInventory(aInventoryPlayer);
-			}
-
-			this.detectAndSendChanges();
-		} else {
-			aInventoryPlayer.player.openContainer = aInventoryPlayer.player.inventoryContainer;
-		}
+	public CONTAINER_Cyclotron(final InventoryPlayer aInventoryPlayer, final IGregTechTileEntity aTileEntity) {
 
-	}
-
-	public CONTAINER_Cyclotron(InventoryPlayer aInventoryPlayer, IGregTechTileEntity aTileEntity,
-			boolean doesBindInventory) {
 		super(aInventoryPlayer, aTileEntity);
-		this.mTileEntity = aTileEntity;
-		if (this.mTileEntity != null && this.mTileEntity.getMetaTileEntity() != null) {
-			this.addSlots(aInventoryPlayer);
-			if (this.doesBindPlayerInventory() && doesBindInventory) {
-				this.bindPlayerInventory(aInventoryPlayer);
-			}
-
-			this.detectAndSendChanges();
-		} else {
-			aInventoryPlayer.player.openContainer = aInventoryPlayer.player.inventoryContainer;
-		}
-
 	}
 
-	public void detectAndSendChanges() {
-		super.detectAndSendChanges();
-		if (!this.mTileEntity.isClientSide() && this.mTileEntity.getMetaTileEntity() != null) {
-			this.mStorage = (int) Math.min(2147483647L, this.mTileEntity.getEUCapacity());
-			this.mEnergy = this.mTileEntity.getStoredEU();
-			this.mSteamStorage = (int) Math.min(2147483647L, this.mTileEntity.getSteamCapacity());
-			this.mSteam = (int) Math.min(2147483647L, this.mTileEntity.getStoredSteam());
-			this.mOutput = (int) Math.min(2147483647L, this.mTileEntity.getOutputVoltage());
-			this.mInput = (int) Math.min(2147483647L, this.mTileEntity.getInputVoltage());
-			this.mDisplayErrorCode = this.mTileEntity.getErrorDisplayID();
-			this.mProgressTime = this.mTileEntity.getProgress();
-			this.mMaxProgressTime = this.mTileEntity.getMaxProgress();
-			this.mActive = this.mTileEntity.isActive() ? 1 : 0;
-			++this.mTimer;
-			Iterator var2 = this.crafters.iterator();
-
-			while (true) {
-				ICrafting var1;
-				do {
-					if (!var2.hasNext()) {
-						this.oID = this.mID;
-						this.oSteam = this.mSteam;
-						this.oInput = this.mInput;
-						this.oActive = this.mActive;
-						this.oOutput = this.mOutput;
-						this.oEnergy = this.mEnergy;
-						this.oStorage = this.mStorage;
-						this.oSteamStorage = this.mSteamStorage;
-						this.oProgressTime = this.mProgressTime;
-						this.oMaxProgressTime = this.mMaxProgressTime;
-						this.oDisplayErrorCode = this.mDisplayErrorCode;
-						return;
-					}
-
-					var1 = (ICrafting) var2.next();
-					if (this.mTimer % 500 == 10 || this.oEnergy != this.mEnergy) {
-						
-						int uEnergy = (int) Math.min(2147483647L, this.mTileEntity.getStoredEU());
-						
-						var1.sendProgressBarUpdate(this, 0, uEnergy & '￿');
-						var1.sendProgressBarUpdate(this, 1, uEnergy >>> 16);
-					}
-
-					if (this.mTimer % 500 == 10 || this.oStorage != this.mStorage) {
-						var1.sendProgressBarUpdate(this, 2, this.mStorage & '￿');
-						var1.sendProgressBarUpdate(this, 3, this.mStorage >>> 16);
-					}
-
-					if (this.mTimer % 500 == 10 || this.oOutput != this.mOutput) {
-						var1.sendProgressBarUpdate(this, 4, this.mOutput);
-					}
-
-					if (this.mTimer % 500 == 10 || this.oInput != this.mInput) {
-						var1.sendProgressBarUpdate(this, 5, this.mInput);
-					}
-
-					if (this.mTimer % 500 == 10 || this.oDisplayErrorCode != this.mDisplayErrorCode) {
-						var1.sendProgressBarUpdate(this, 6, this.mDisplayErrorCode);
-					}
-
-					if (this.mTimer % 500 == 10 || this.oProgressTime != this.mProgressTime) {
-						var1.sendProgressBarUpdate(this, 11, this.mProgressTime & '￿');
-						var1.sendProgressBarUpdate(this, 12, this.mProgressTime >>> 16);
-					}
-
-					if (this.mTimer % 500 == 10 || this.oMaxProgressTime != this.mMaxProgressTime) {
-						var1.sendProgressBarUpdate(this, 13, this.mMaxProgressTime & '￿');
-						var1.sendProgressBarUpdate(this, 14, this.mMaxProgressTime >>> 16);
-					}
-
-					if (this.mTimer % 500 == 10 || this.oID != this.mID) {
-						var1.sendProgressBarUpdate(this, 15, this.mID);
-					}
-
-					if (this.mTimer % 500 == 10 || this.oActive != this.mActive) {
-						var1.sendProgressBarUpdate(this, 16, this.mActive);
-					}
-
-					if (this.mTimer % 500 == 10 || this.oSteam != this.mSteam) {
-						var1.sendProgressBarUpdate(this, 17, this.mSteam & '￿');
-						var1.sendProgressBarUpdate(this, 18, this.mSteam >>> 16);
-					}
-				} while (this.mTimer % 500 != 10 && this.oSteamStorage == this.mSteamStorage);
-
-				var1.sendProgressBarUpdate(this, 19, this.mSteamStorage & '￿');
-				var1.sendProgressBarUpdate(this, 20, this.mSteamStorage >>> 16);
-			}
-		}
+	public CONTAINER_Cyclotron(final InventoryPlayer aInventoryPlayer, final IGregTechTileEntity aTileEntity, final boolean bindInventory) {
+		super(aInventoryPlayer, aTileEntity, bindInventory);
 	}
 
-	@SideOnly(Side.CLIENT)
-	public void updateProgressBar(int par1, int par2) {
-		super.updateProgressBar(par1, par2);
-		switch (par1) {
-			case 0 :
-				this.mEnergy = this.mEnergy & -65536 | par2;
-				break;
-			case 1 :
-				this.mEnergy = this.mEnergy & '￿' | par2 << 16;
-				break;
-			case 2 :
-				this.mStorage = this.mStorage & -65536 | par2;
-				break;
-			case 3 :
-				this.mStorage = this.mStorage & '￿' | par2 << 16;
-				break;
-			case 4 :
-				this.mOutput = par2;
-				break;
-			case 5 :
-				this.mInput = par2;
-				break;
-			case 6 :
-				this.mDisplayErrorCode = par2;
-			case 7 :
-			case 8 :
-			case 9 :
-			case 10 :
-			default :
-				break;
-			case 11 :
-				this.mProgressTime = this.mProgressTime & -65536 | par2;
-				break;
-			case 12 :
-				this.mProgressTime = this.mProgressTime & '￿' | par2 << 16;
-				break;
-			case 13 :
-				this.mMaxProgressTime = this.mMaxProgressTime & -65536 | par2;
-				break;
-			case 14 :
-				this.mMaxProgressTime = this.mMaxProgressTime & '￿' | par2 << 16;
-				break;
-			case 15 :
-				this.mID = par2;
-				break;
-			case 16 :
-				this.mActive = par2;
-				break;
-			case 17 :
-				this.mSteam = this.mSteam & -65536 | par2;
-				break;
-			case 18 :
-				this.mSteam = this.mSteam & '￿' | par2 << 16;
-				break;
-			case 19 :
-				this.mSteamStorage = this.mSteamStorage & -65536 | par2;
-				break;
-			case 20 :
-				this.mSteamStorage = this.mSteamStorage & '￿' | par2 << 16;
-		}
-
+	@Override
+	public void addSlots(final InventoryPlayer aInventoryPlayer) {
+		//this.addSlotToContainer(new Slot(this.mTileEntity, 1, 154, 42));
 	}
 
-	public boolean canInteractWith(EntityPlayer player) {
-		return this.mTileEntity.isUseableByPlayer(player);
+	@Override
+	public int getSlotCount() {
+		return 0;
 	}
 
-	public String trans(String aKey, String aEnglish) {
-		return GT_LanguageManager.addStringLocalization("Interaction_DESCRIPTION_Index_" + aKey, aEnglish, false);
+	@Override
+	public int getShiftClickSlotCount() {
+		return 0;
 	}
-}        
\ No newline at end of file
+}
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_MultiMachine.java b/src/Java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_MultiMachine.java
index bdf19454ce..88b9661c95 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_MultiMachine.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_MultiMachine.java
@@ -1,9 +1,22 @@
 package gtPlusPlus.xmod.gregtech.api.gui;
 
-import net.minecraft.entity.player.InventoryPlayer;
+import java.lang.reflect.Field;
+import java.util.ArrayList;
+import java.util.List;
 
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
 import gregtech.api.gui.GT_ContainerMetaTile_Machine;
+import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
+import gregtech.api.util.GT_Recipe;
+import gtPlusPlus.api.objects.Logger;
+import gtPlusPlus.core.util.math.MathUtils;
+import gtPlusPlus.core.util.reflect.ReflectionUtils;
+import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GregtechMeta_MultiBlockBase;
+import net.minecraft.entity.player.InventoryPlayer;
+import net.minecraft.inventory.Container;
+import net.minecraft.inventory.ICrafting;
 
 /**
  * NEVER INCLUDE THIS FILE IN YOUR MOD!!!
@@ -11,6 +24,14 @@ import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
  * The Container I use for all my Basic Machines
  */
 public class CONTAINER_MultiMachine extends GT_ContainerMetaTile_Machine {
+
+	public String[] mTileDescription;
+	private String[] oTileDescription;
+	
+	private GregtechMeta_MultiBlockBase mMCTEI;
+	private boolean mControllerSet = false;
+
+
 	public CONTAINER_MultiMachine(final InventoryPlayer aInventoryPlayer, final IGregTechTileEntity aTileEntity) {
 		super(aInventoryPlayer, aTileEntity);
 	}
@@ -18,20 +39,245 @@ public class CONTAINER_MultiMachine extends GT_ContainerMetaTile_Machine {
 	public CONTAINER_MultiMachine(final InventoryPlayer aInventoryPlayer, final IGregTechTileEntity aTileEntity, final boolean bindInventory) {
 		super(aInventoryPlayer, aTileEntity, bindInventory);
 	}
-}
+	
+	public static void setControllerInstance(CONTAINER_MultiMachine aContainer, IGregTechTileEntity aTile) {		
+		if (aTile == null) {
+			return;
+		}
+		final IMetaTileEntity aMetaTileEntity = aTile.getMetaTileEntity();
+		if (aMetaTileEntity == null) {
+			return;
+		}
+		if (aMetaTileEntity instanceof GregtechMeta_MultiBlockBase) {
+			aContainer.mMCTEI = (GregtechMeta_MultiBlockBase) aMetaTileEntity;
+		}		
+	}
+
+	public int aTotalTickTime = 0;
+	public int aMaxParallel = 0;
+	public int aPollutionTick = 0;
+	public int aMaxInputVoltage = 0;
+	public int aInputTier = 0;
+	public int aOutputTier = 0;
+	public int aRecipeDuration = 0;
+	public int aRecipeEU = 0;
+	public int aRecipeSpecial = 0;	
+	public int aPollutionReduction = 0;
+	public int aStoredEnergy = 0;
+	public int aMaxEnergy = 0;
+	public int aEfficiency = 0;
+
+	private int oTotalTickTime = 0;
+	private int oMaxParallel = 0;
+	private int oPollutionTick = 0;
+	private int oMaxInputVoltage = 0;
+	private int oInputTier = 0;
+	private int oOutputTier = 0;
+	private int oRecipeDuration = 0;
+	private int oRecipeEU = 0;
+	private int oRecipeSpecial = 0;	
+	private int oPollutionReduction = 0;
+	private int oStoredEnergy = 0;
+	private int oMaxEnergy = 0;
+	private int oEfficiency = 0;
+
+	private static Field timer;
+	//private static Field crafters;
+
+	@Override
+	public final void detectAndSendChanges() {
+		super.detectAndSendChanges();
+		if (this.mTileEntity.isClientSide() || this.mTileEntity.getMetaTileEntity() == null) {
+			return;
+		}
+		if (!mControllerSet) {
+			setControllerInstance(this, this.mTileEntity);
+		}		
+		mControllerSet = (mMCTEI != null);		
+		if (timer == null) {
+			timer = ReflectionUtils.getField(getClass(), "mTimer");
+		}
+		if (crafters == null) {
+			//crafters = ReflectionUtils.getField(getClass(), "crafters");
+		}
+		if (timer != null && crafters != null && mControllerSet) {
+			//Logger.INFO("Trying to update clientside GUI data");
+			try {
+				//Logger.INFO("0");		
+				int aTimer = (int) ReflectionUtils.getFieldValue(timer, this);				
+				
+				//List crafters1List = (List) crafters1;
+				List<ICrafting> crafters2 = new ArrayList<ICrafting>();
+				//Logger.INFO("1");		
+				for (Object o : crafters) {
+					if (o instanceof ICrafting) {
+						crafters2.add((ICrafting) o);
+					}
+				}
+				//Logger.INFO("2");		
+				if (!crafters2.isEmpty()) {
+					//Logger.INFO("3");		
+					handleInitialFieldSetting();
+
+					try {
+						//Logger.INFO("4");		
+						for (final ICrafting var3 : crafters2) {
+							handleCraftingEvent(aTimer, var3);
+						}
+						//Logger.INFO("5");		
+						handleInternalFieldSetting();
+						//Logger.INFO("6");		
+					} catch (Throwable t) {
 
-/*@Override
-    public void addSlots(InventoryPlayer aInventoryPlayer) {
-        addSlotToContainer(new Slot(mTileEntity, 1, 152, 5));
-    }
-
-    @Override
-    public int getSlotCount() {
-        return 1;
-    }
-
-    @Override
-    public int getShiftClickSlotCount() {
-        return 0;
-    }
-}*/
+					}
+				}
+			} catch (Throwable t) {
+				t.printStackTrace();
+			}
+		}
+		else {
+			Logger.INFO("Failed.");			
+		}
+	}
+
+	public void handleInitialFieldSetting() {
+		this.aTotalTickTime = MathUtils.balance((int) mMCTEI.getTotalRuntimeInTicks(), Integer.MIN_VALUE, Integer.MAX_VALUE);
+		this.aMaxParallel = mMCTEI.getMaxParallelRecipes();
+		this.aPollutionTick = mMCTEI.getPollutionPerTick(null);
+		this.aMaxInputVoltage = MathUtils.balance((int) mMCTEI.getMaxInputVoltage(), Integer.MIN_VALUE, Integer.MAX_VALUE);
+		this.aInputTier = MathUtils.balance((int) mMCTEI.getInputTier(), Integer.MIN_VALUE, Integer.MAX_VALUE);
+		this.aOutputTier = MathUtils.balance((int) mMCTEI.getOutputTier(), Integer.MIN_VALUE, Integer.MAX_VALUE);		
+		if (mMCTEI.mLastRecipe != null) {
+			GT_Recipe aRecipe = mMCTEI.mLastRecipe;
+			this.aRecipeDuration = MathUtils.balance(aRecipe.mDuration, Integer.MIN_VALUE, Integer.MAX_VALUE);
+			this.aRecipeEU = MathUtils.balance(aRecipe.mEUt, Integer.MIN_VALUE, Integer.MAX_VALUE);
+			this.aRecipeSpecial = MathUtils.balance(aRecipe.mSpecialValue, Integer.MIN_VALUE, Integer.MAX_VALUE);			
+		}		
+		this.aPollutionReduction = mMCTEI.getPollutionReductionForAllMufflers();
+		
+		this.aStoredEnergy = MathUtils.balance((int) mMCTEI.getStoredEnergyInAllEnergyHatches(), Integer.MIN_VALUE, Integer.MAX_VALUE);
+		this.aMaxEnergy = MathUtils.balance((int) mMCTEI.getMaxEnergyStorageOfAllEnergyHatches(), Integer.MIN_VALUE, Integer.MAX_VALUE);
+		this.aEfficiency = MathUtils.balance(mMCTEI.mEfficiency, Integer.MIN_VALUE, Integer.MAX_VALUE);		
+	}
+
+	public void handleCraftingEvent(int aTimer, ICrafting aCrafter) {
+		int aID = 750;
+		if (aTimer % 500 == 10 || this.oTotalTickTime != this.aTotalTickTime) {
+			aCrafter.sendProgressBarUpdate((Container) this, aID++, this.aTotalTickTime);
+		}
+		if (aTimer % 500 == 10 || this.oMaxParallel != this.aMaxParallel) {
+			aCrafter.sendProgressBarUpdate((Container) this, aID++, this.aMaxParallel);
+		}
+		if (aTimer % 500 == 10 || this.oPollutionTick != this.aPollutionTick) {
+			aCrafter.sendProgressBarUpdate((Container) this, aID++, this.aPollutionTick);
+		}
+		if (aTimer % 500 == 10 || this.oMaxInputVoltage != this.aMaxInputVoltage) {
+			aCrafter.sendProgressBarUpdate((Container) this, aID++, this.aMaxInputVoltage);
+		}
+		if (aTimer % 500 == 10 || this.oInputTier != this.aInputTier) {
+			aCrafter.sendProgressBarUpdate((Container) this, aID++, this.aInputTier);
+		}
+		if (aTimer % 500 == 10 || this.oOutputTier != this.aOutputTier) {
+			aCrafter.sendProgressBarUpdate((Container) this, aID++, this.aOutputTier);
+		}
+		if (aTimer % 500 == 10 || this.oRecipeDuration != this.aRecipeDuration) {
+			aCrafter.sendProgressBarUpdate((Container) this, aID++, this.aRecipeDuration);
+		}
+		if (aTimer % 500 == 10 || this.oRecipeEU != this.aRecipeEU) {
+			aCrafter.sendProgressBarUpdate((Container) this, aID++, this.aRecipeEU);
+		}
+		if (aTimer % 500 == 10 || this.oRecipeSpecial != this.aRecipeSpecial) {
+			aCrafter.sendProgressBarUpdate((Container) this, aID++, this.aRecipeSpecial);
+		}
+		if (aTimer % 500 == 10 || this.oPollutionReduction != this.aPollutionReduction) {
+			aCrafter.sendProgressBarUpdate((Container) this, aID++, this.aPollutionReduction);
+		}
+		if (aTimer % 500 == 10 || this.oStoredEnergy != this.aStoredEnergy) {
+			aCrafter.sendProgressBarUpdate((Container) this, aID++, this.aStoredEnergy);
+		}
+		if (aTimer % 500 == 10 || this.oMaxEnergy != this.aMaxEnergy) {
+			aCrafter.sendProgressBarUpdate((Container) this, aID++, this.aMaxEnergy);
+		}
+		if (aTimer % 500 == 10 || this.oEfficiency != this.aEfficiency) {
+			aCrafter.sendProgressBarUpdate((Container) this, aID++, this.aEfficiency);
+		}
+	}
+
+	public void handleInternalFieldSetting() {
+		this.oTotalTickTime = this.aTotalTickTime;
+		this.oMaxParallel = this.aMaxParallel;
+		this.oPollutionTick = this.aPollutionTick;
+		this.oMaxInputVoltage = this.aMaxInputVoltage;
+		this.oInputTier = this.aInputTier;
+		this.oOutputTier = this.aOutputTier;
+		this.oRecipeDuration = this.aRecipeDuration;
+		this.oRecipeEU = this.aRecipeEU;
+		this.oRecipeSpecial = this.aRecipeSpecial;
+		this.oPollutionReduction = this.aPollutionReduction;
+		this.oStoredEnergy = this.aStoredEnergy;
+		this.oMaxEnergy = this.aMaxEnergy;
+		this.oEfficiency = this.aEfficiency;
+	}
+
+	@SideOnly(Side.CLIENT)
+	@Override
+	public void updateProgressBar(final int par1, final int par2) {
+		super.updateProgressBar(par1, par2);		
+		int shiftedSwitch = par1 - 750;		
+		switch (shiftedSwitch) {
+		case 0: {
+			this.aTotalTickTime = par2;
+			break;
+		}
+		case 1: {
+			this.aMaxParallel = par2;
+			break;
+		}
+		case 2: {
+			this.aPollutionTick = par2;
+			break;
+		}
+		case 3: {
+			this.aMaxInputVoltage = par2;
+			break;
+		}
+		case 4: {
+			this.aInputTier = par2;
+			break;
+		}
+		case 5: {
+			this.aOutputTier = par2;
+			break;
+		}
+		case 6: {
+			this.aRecipeDuration = par2;
+			break;
+		}
+		case 7: {
+			this.aRecipeEU = par2;
+			break;
+		}
+		case 8: {
+			this.aRecipeSpecial = par2;
+			break;
+		}
+		case 9: {
+			this.aPollutionReduction = par2;
+			break;
+		}
+		case 10: {
+			this.aStoredEnergy = par2;
+			break;
+		}
+		case 11: {
+			this.aMaxEnergy = par2;
+			break;
+		}
+		case 12: {
+			this.aEfficiency = par2;
+			break;
+		}
+		}
+	}
+
+}
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_MultiMachine_NoPlayerInventory.java b/src/Java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_MultiMachine_NoPlayerInventory.java
new file mode 100644
index 0000000000..2d63a13d60
--- /dev/null
+++ b/src/Java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_MultiMachine_NoPlayerInventory.java
@@ -0,0 +1,27 @@
+package gtPlusPlus.xmod.gregtech.api.gui;
+
+import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.InventoryPlayer;
+import net.minecraft.item.ItemStack;
+
+public class CONTAINER_MultiMachine_NoPlayerInventory extends CONTAINER_MultiMachine {
+
+	public CONTAINER_MultiMachine_NoPlayerInventory(final InventoryPlayer aInventoryPlayer, final IGregTechTileEntity aTileEntity) {
+		super(aInventoryPlayer, aTileEntity);
+	}
+
+	public CONTAINER_MultiMachine_NoPlayerInventory(final InventoryPlayer aInventoryPlayer, final IGregTechTileEntity aTileEntity, final boolean bindInventory) {
+		super(aInventoryPlayer, aTileEntity, bindInventory);
+	}
+    
+    public boolean doesBindPlayerInventory() {
+        return false;
+    }
+
+    @Override
+    public ItemStack slotClick(final int aSlotIndex, final int aMouseclick, final int aShifthold, final EntityPlayer aPlayer) {
+    	return null;
+    }
+	
+}
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/gui/GUI_Cyclotron.java b/src/Java/gtPlusPlus/xmod/gregtech/api/gui/GUI_Cyclotron.java
new file mode 100644
index 0000000000..0be44fa616
--- /dev/null
+++ b/src/Java/gtPlusPlus/xmod/gregtech/api/gui/GUI_Cyclotron.java
@@ -0,0 +1,44 @@
+package gtPlusPlus.xmod.gregtech.api.gui;
+
+import gregtech.api.gui.GT_Container_MultiMachine;
+import gregtech.api.gui.GT_GUIContainerMetaTile_Machine;
+import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
+import net.minecraft.entity.player.InventoryPlayer;
+
+public class GUI_Cyclotron extends GT_GUIContainerMetaTile_Machine
+{
+    public final String mNEI;
+    public final String mName;
+    
+    public GUI_Cyclotron(final InventoryPlayer aInventoryPlayer, final IGregTechTileEntity aTileEntity, final String aName, final String aNEI) {
+        super(new GT_Container_MultiMachine(aInventoryPlayer, aTileEntity, false), "gregtech:textures/gui/multimachines/" + "FusionComputer.png");
+        this.mName = aName;
+        this.mNEI = aNEI;
+    }
+    
+    @Override
+    protected void drawGuiContainerForegroundLayer(final int par1, final int par2) {
+        this.fontRendererObj.drawString(this.mName, 8, -10, 16448255);
+        if (this.mContainer != null) {
+            if ((((GT_Container_MultiMachine)this.mContainer).mDisplayErrorCode & 0x40) != 0x0) {
+                this.fontRendererObj.drawString("Incomplete Structure.", 10, 8, 16448255);
+            }
+            if (((GT_Container_MultiMachine)this.mContainer).mDisplayErrorCode == 0) {
+                if (((GT_Container_MultiMachine)this.mContainer).mActive == 0) {
+                    this.fontRendererObj.drawString("Hit with Soft Hammer to (re-)start the Machine if it doesn't start.", -70, 170, 16448255);
+