% Tweaked default Multiblock GUI for those without a slot. (Many will still be broken)

$ Fixed weirdly encoded symbol within CONTAINER_Cyclotron.java, which didn't tend to play nice for some users.
$ Fixed Cyclotron GUI bug. Closes #473

11 files changed, 263 insertions, 250 deletions

diff --git a/src/Java/gtPlusPlus/xmod/gregtech/HANDLER_GT.java b/src/Java/gtPlusPlus/xmod/gregtech/HANDLER_GT.java
index 7acd76882e..0143c9096f 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/HANDLER_GT.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/HANDLER_GT.java
@@ -40,7 +40,7 @@ import gtPlusPlus.xmod.gregtech.common.StaticFields59;
 import gtPlusPlus.xmod.gregtech.common.blocks.fluid.GregtechFluidHandler;
 import gtPlusPlus.xmod.gregtech.common.items.MetaGeneratedGregtechTools;
 import gtPlusPlus.xmod.gregtech.loaders.Gregtech_Blocks;
-import gtPlusPlus.xmod.gregtech.loaders.ProcessingAngelGrinder;
+import gtPlusPlus.xmod.gregtech.loaders.ProcessingAngleGrinder;
 import gtPlusPlus.xmod.gregtech.loaders.ProcessingElectricButcherKnife;
 import gtPlusPlus.xmod.gregtech.loaders.ProcessingElectricLighter;
 import gtPlusPlus.xmod.gregtech.loaders.ProcessingElectricSnips;
@@ -107,7 +107,7 @@ public class HANDLER_GT {
 		if (CORE.ConfigSwitches.enableSkookumChoochers){
 			new ProcessingToolHeadChoocher().run();
 		}
-		new ProcessingAngelGrinder().run();
+		new ProcessingAngleGrinder().run();
 		new ProcessingElectricSnips().run();
 		new ProcessingElectricButcherKnife().run();
 		new ProcessingElectricLighter().run();
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..5fccb51e54 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,15 @@
 package gtPlusPlus.xmod.gregtech.api.gui;
 
-import net.minecraft.entity.player.InventoryPlayer;
+import java.lang.reflect.Field;
+import java.util.List;
 
 import gregtech.api.gui.GT_ContainerMetaTile_Machine;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
+import gtPlusPlus.api.objects.data.AutoMap;
+import gtPlusPlus.core.util.reflect.ReflectionUtils;
+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 +17,11 @@ 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;
+
+
 	public CONTAINER_MultiMachine(final InventoryPlayer aInventoryPlayer, final IGregTechTileEntity aTileEntity) {
 		super(aInventoryPlayer, aTileEntity);
 	}
@@ -18,6 +29,42 @@ public class CONTAINER_MultiMachine extends GT_ContainerMetaTile_Machine {
 	public CONTAINER_MultiMachine(final InventoryPlayer aInventoryPlayer, final IGregTechTileEntity aTileEntity, final boolean bindInventory) {
 		super(aInventoryPlayer, aTileEntity, bindInventory);
 	}
+
+
+	@Override
+	public void detectAndSendChanges() {
+		super.detectAndSendChanges();
+		if (this.mTileEntity.isClientSide() || this.mTileEntity.getMetaTileEntity() == null) {
+			return;
+		}
+
+		try {
+			this.mTileDescription = this.mTileEntity.getInfoData();
+
+			Field bTimer = ReflectionUtils.getField(getClass(), "mTimer");
+			Field bCrafters = ReflectionUtils.getField(getClass(), "crafters");
+			int time = bTimer.getInt(this);
+			List crafters = (List) bCrafters.get(this);
+			AutoMap<ICrafting> aCrafting = new AutoMap<ICrafting>();
+			if (crafters != null && !crafters.isEmpty()) {
+				for (Object o : crafters) {
+					aCrafting.put((ICrafting) o);
+				}
+			}
+
+			for (final ICrafting var3 : aCrafting) {
+				if (time % 500 == 10 || this.oTileDescription != this.mTileDescription) {
+					var3.sendProgressBarUpdate((Container)this, 64, 0);
+				}
+			}
+
+			this.oTileDescription = this.mTileDescription;
+		}
+		catch (Throwable t) {
+
+		}
+	}
+
 }
 
 /*@Override
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);
+                }
+                else {
+                    this.fontRendererObj.drawString("Running perfectly.", 10, 170, 16448255);
+                }
+            }            
+        }
+    }
+    
+    @Override
+    protected void drawGuiContainerBackgroundLayer(final float par1, final int par2, final int par3) {
+        super.drawGuiContainerBackgroundLayer(par1, par2, par3);
+        final int x = (this.width - this.xSize) / 2;
+        final int y = (this.height - this.ySize) / 2;
+        this.drawTexturedModalRect(x, y, 0, 0, this.xSize, this.ySize);        
+    }
+}
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/gui/GUI_MultiMachine.java b/src/Java/gtPlusPlus/xmod/gregtech/api/gui/GUI_MultiMachine.java
index 425fe6d01f..8293d5b9f3 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/api/gui/GUI_MultiMachine.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/api/gui/GUI_MultiMachine.java
@@ -1,12 +1,23 @@
 package gtPlusPlus.xmod.gregtech.api.gui;
 
 
-import net.minecraft.entity.player.InventoryPlayer;
+import java.lang.reflect.Field;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
 
+import gregtech.api.enums.Materials;
 import gregtech.api.gui.GT_GUIContainerMetaTile_Machine;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
-
+import gregtech.common.items.GT_MetaGenerated_Tool_01;
 import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.util.minecraft.ItemUtils;
+import gtPlusPlus.core.util.reflect.ReflectionUtils;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.gui.FontRenderer;
+import net.minecraft.client.gui.inventory.GuiContainer;
+import net.minecraft.entity.player.InventoryPlayer;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.ResourceLocation;
 
 /**
  * NEVER INCLUDE THIS FILE IN YOUR MOD!!!
@@ -20,37 +31,113 @@ public class GUI_MultiMachine extends GT_GUIContainerMetaTile_Machine {
 	String mName = "";
 
 	public GUI_MultiMachine(final InventoryPlayer aInventoryPlayer, final IGregTechTileEntity aTileEntity, final String aName, final String aTextureFile) {
-		super(new CONTAINER_MultiMachine(aInventoryPlayer, aTileEntity), CORE.RES_PATH_GUI + (aTextureFile == null ? "MultiblockDisplay" : aTextureFile));
+		super(new CONTAINER_MultiMachine_NoPlayerInventory(aInventoryPlayer, aTileEntity), CORE.RES_PATH_GUI + (aTextureFile == null ? "MultiblockDisplay" : aTextureFile));
 		this.mName = aName;
 	}
 
 	@Override
-	protected void drawGuiContainerForegroundLayer(final int par1, final int par2) {
-		this.fontRendererObj.drawString(this.mName, 10, 8, 16448255);
-
+	protected void drawGuiContainerForegroundLayer(final int par1, final int par2) {		
+		fontRendererObj.drawString(this.mName+"!", 6, 7, 16448255);
 		if (this.mContainer != null) {
-			if ((((CONTAINER_MultiMachine) this.mContainer).mDisplayErrorCode & 1) != 0) {
-				this.fontRendererObj.drawString("Pipe is loose.", 10, 16, 16448255);
-			}
-			if ((((CONTAINER_MultiMachine) this.mContainer).mDisplayErrorCode & 2) != 0) {
-				this.fontRendererObj.drawString("Screws are missing.", 10, 24, 16448255);
-			}
-			if ((((CONTAINER_MultiMachine) this.mContainer).mDisplayErrorCode & 4) != 0) {
-				this.fontRendererObj.drawString("Something is stuck.", 10, 32, 16448255);
-			}
-			if ((((CONTAINER_MultiMachine) this.mContainer).mDisplayErrorCode & 8) != 0) {
-				this.fontRendererObj.drawString("Platings are dented.", 10, 40, 16448255);
-			}
-			if ((((CONTAINER_MultiMachine) this.mContainer).mDisplayErrorCode & 16) != 0) {
-				this.fontRendererObj.drawString("Circuitry burned out.", 10, 48, 16448255);
-			}
-			if ((((CONTAINER_MultiMachine) this.mContainer).mDisplayErrorCode & 32) != 0) {
-				this.fontRendererObj.drawString("That doesn't belong there.", 10, 56, 16448255);
-			}
-			if ((((CONTAINER_MultiMachine) this.mContainer).mDisplayErrorCode & 64) != 0) {
-				this.fontRendererObj.drawString("Incomplete Structure.", 10, 64, 16448255);
+
+			boolean aWrench = (((CONTAINER_MultiMachine) this.mContainer).mDisplayErrorCode & 1) != 0;
+			boolean aScrewdriver = (((CONTAINER_MultiMachine) this.mContainer).mDisplayErrorCode & 2) != 0;
+			boolean aMallet = (((CONTAINER_MultiMachine) this.mContainer).mDisplayErrorCode & 4) != 0;
+			boolean aHammer = (((CONTAINER_MultiMachine) this.mContainer).mDisplayErrorCode & 8) != 0;
+			boolean aSoldering = (((CONTAINER_MultiMachine) this.mContainer).mDisplayErrorCode & 16) != 0;
+			boolean aCrowbar = (((CONTAINER_MultiMachine) this.mContainer).mDisplayErrorCode & 32) != 0;			
+			
+			
+
+			//net.minecraft.client.gui.inventory.GuiContainer.drawItemStack(ItemStack, int, int, String)
+			Method aDrawItemStack = ReflectionUtils.getMethod(GuiContainer.class, "drawItemStack", new Class[] {ItemStack.class, int.class, int.class, String.class});
+			if (aDrawItemStack != null) {
+
+				try {
+					
+					if ((((CONTAINER_MultiMachine) this.mContainer).mDisplayErrorCode & 64) != 0) {
+						this.fontRendererObj.drawString("Incomplete Structure.", 10, 16, 16448255); // Move down 8px
+					}
+					else {
+						Field aStringData = ReflectionUtils.getField(this.mContainer.getClass(), "oTileDescription");
+						if (aStringData != null) {
+							String[] aData = (String[]) aStringData.get(this.mContainer);
+							int aIndex = 0;
+							this.fontRendererObj.drawString(""+aStringData.getType().getSimpleName(), 6, 16+(aIndex++*8), 16448255); // Move down 8px	
+							if (aData != null && aData.length > 0) {
+								for (String s : aData) {
+									this.fontRendererObj.drawString(s, 6, 16+(aIndex++*8), 16448255); // Move down 8px						
+								}
+							}
+							else {
+								this.fontRendererObj.drawString("Unable to get Info Data from Tile Entity | "+(aData != null), 6, 16+(aIndex++*8), 16448255); // Move down 8px							
+							}
+						}
+						else {	
+							this.fontRendererObj.drawString("Unable to get Info Data from Tile Entity | Bad", 6, 16, 16448255); // Move down 8px						
+						
+							
+						}
+						
+					}	
+					
+					
+					
+					
+					
+					
+					
+					//Migrate to static block
+
+					Materials GOOD = Materials.Uranium;
+					Materials BAD = Materials.Plutonium;
+					
+					ItemStack aWrenchStack = GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats(GT_MetaGenerated_Tool_01.WRENCH, 1, (aWrench ? BAD : GOOD), Materials.Tungsten, null);
+					ItemStack aCrowbarStack = GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats(GT_MetaGenerated_Tool_01.CROWBAR, 1, (aCrowbar ? BAD : GOOD), Materials.Tungsten, null);
+					ItemStack aHammerStack = GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats(GT_MetaGenerated_Tool_01.HARDHAMMER, 1, (aHammer ? BAD : GOOD), Materials.Tungsten, null);
+					ItemStack aMalletStack = GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats(GT_MetaGenerated_Tool_01.SOFTHAMMER, 1, (aMallet ? BAD : GOOD), Materials.Tungsten, null);
+					ItemStack aScrewdriverStack = GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats(GT_MetaGenerated_Tool_01.SCREWDRIVER, 1, (aScrewdriver ? BAD : GOOD), Materials.Tungsten, null);
+					ItemStack aSolderingStack = GT_MetaGenerated_Tool_01.INSTANCE.getToolWithStats(GT_MetaGenerated_Tool_01.SOLDERING_IRON_LV, 1, (aSoldering ? BAD : GOOD), Materials.Tungsten, null);
+					
+					ItemStack[] aToolStacks2 = new ItemStack[] {
+							aWrenchStack,
+							aCrowbarStack,
+							aHammerStack,
+							aMalletStack,
+							aScrewdriverStack,
+							aSolderingStack
+					};
+					
+					int aIndex = 0;
+					for (aIndex = 0; aIndex < 6; aIndex++) {
+						
+						int x = 156;
+						int y = 112 - (18*3) + (aIndex * 18);		
+						aDrawItemStack.invoke(this, new Object[] {
+								aToolStacks2[aIndex] != null ? aToolStacks2[aIndex] : ItemUtils.getErrorStack(1, "Bad Times"),
+										x,
+										y,
+								""+(aIndex == 2 ? "H" : aIndex == 3 ? "M" : "") // Stacksize Overlay
+						});			
+						this.fontRendererObj.drawString("", 10, 64, 16448255);		
+					}
+					
+				} catch (IllegalAccessException | IllegalArgumentException | InvocationTargetException e) {
+					e.printStackTrace();
+				}
 			}
 
+
+
+
+
+
+
+
+			//ItemStack aWrenchStack = ItemUtils.getSimpleStack(GregTech_API.sWrenchList., i)
+
+
+
 			if (((CONTAINER_MultiMachine) this.mContainer).mDisplayErrorCode == 0) {
 				if (((CONTAINER_MultiMachine) this.mContainer).mActive == 0) {
 					this.fontRendererObj.drawString("Hit with Soft Hammer", 10, 16, 16448255);
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMeta_MultiBlockBase.java b/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMeta_MultiBlockBase.java
index aefa0da7ba..0d30bfecf2 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMeta_MultiBlockBase.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMeta_MultiBlockBase.java
@@ -51,6 +51,7 @@ import gtPlusPlus.core.util.math.MathUtils;
 import gtPlusPlus.core.util.minecraft.ItemUtils;
 import gtPlusPlus.core.util.reflect.ReflectionUtils;
 import gtPlusPlus.xmod.gregtech.api.gui.CONTAINER_MultiMachine;
+import gtPlusPlus.xmod.gregtech.api.gui.CONTAINER_MultiMachine_NoPlayerInventory;
 import gtPlusPlus.xmod.gregtech.api.gui.GUI_MultiMachine;
 import gtPlusPlus.xmod.gregtech.api.gui.GUI_Multi_Basic_Slotted;
 import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_AirIntake;
@@ -128,7 +129,7 @@ GT_MetaTileEntity_MultiBlockBase {
 			return new GT_Container_MultiMachine(aPlayerInventory,	aBaseMetaTileEntity);			
 		}
 		else {
-			return new CONTAINER_MultiMachine(aPlayerInventory,	aBaseMetaTileEntity);			
+			return new CONTAINER_MultiMachine_NoPlayerInventory(aPlayerInventory,	aBaseMetaTileEntity);			
 		}
 	}
 
@@ -141,7 +142,7 @@ GT_MetaTileEntity_MultiBlockBase {
 	@Override
 	public Object getClientGUI(final int aID, final InventoryPlayer aPlayerInventory, final IGregTechTileEntity aBaseMetaTileEntity) {		
 		String aCustomGUI = getCustomGUIResourceName();
-		aCustomGUI = aCustomGUI != null ? aCustomGUI : "MultiblockDisplay";
+		aCustomGUI = aCustomGUI != null ? aCustomGUI : "MultiblockDisplay_Generic";
 		aCustomGUI = aCustomGUI + ".png";
 		if (hasSlotInGUI()) {
 			if (!requiresVanillaGtGUI()) {
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_Cyclotron.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_Cyclotron.java
index 2c3bf29119..91620eece5 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_Cyclotron.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_Cyclotron.java
@@ -29,6 +29,7 @@ import gtPlusPlus.core.item.chemistry.IonParticles;
 import gtPlusPlus.core.util.math.MathUtils;
 import gtPlusPlus.core.util.minecraft.gregtech.PollutionUtils;
 import gtPlusPlus.xmod.gregtech.api.gui.CONTAINER_Cyclotron;
+import gtPlusPlus.xmod.gregtech.api.gui.GUI_Cyclotron;
 import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GregtechMeta_MultiBlockBase;
 import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock;
 import net.minecraft.block.Block;
@@ -71,18 +72,19 @@ public class GregtechMetaTileEntity_Cyclotron extends GregtechMeta_MultiBlockBas
 
 	@Override
 	public String getCustomGUIResourceName() {
-		return "FusionComputer";
+		return null;
 	}	
 
 	@Override
 	public Object getServerGUI(int aID, InventoryPlayer aPlayerInventory, IGregTechTileEntity aBaseMetaTileEntity) {
-		return new CONTAINER_Cyclotron(aPlayerInventory, aBaseMetaTileEntity);
+		return super.getServerGUI(aID, aPlayerInventory, aBaseMetaTileEntity);
+		//return new CONTAINER_Cyclotron(aPlayerInventory, aBaseMetaTileEntity);
 	}
 
 	@Override
 	public Object getClientGUI(int aID, InventoryPlayer aPlayerInventory, IGregTechTileEntity aBaseMetaTileEntity) {
-		return new GT_GUIContainer_FusionReactor(aPlayerInventory, aBaseMetaTileEntity, getLocalName(), "FusionComputer.png", Recipe_GT.Gregtech_Recipe_Map.sCyclotronRecipes.mNEIName);
-		//return null;
+		return super.getClientGUI(aID, aPlayerInventory, aBaseMetaTileEntity);
+		//return new GUI_Cyclotron(aPlayerInventory, aBaseMetaTileEntity, getLocalName(), Recipe_GT.Gregtech_Recipe_Map.sCyclotronRecipes.mNEIName);
 	}
 
 	@Override
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/loaders/ProcessingAngelGrinder.java b/src/Java/gtPlusPlus/xmod/gregtech/loaders/ProcessingAngleGrinder.java
index 1d20b56551..bf4e9b1390 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/loaders/ProcessingAngelGrinder.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/loaders/ProcessingAngleGrinder.java
@@ -19,8 +19,8 @@ import gtPlusPlus.xmod.gregtech.api.interfaces.internal.Interface_OreRecipeRegis
 import gtPlusPlus.xmod.gregtech.common.items.MetaGeneratedGregtechTools;
 import net.minecraft.item.ItemStack;
 
-public class ProcessingAngelGrinder implements Interface_OreRecipeRegistrator, Runnable {
-	public ProcessingAngelGrinder() {
+public class ProcessingAngleGrinder implements Interface_OreRecipeRegistrator, Runnable {
+	public ProcessingAngleGrinder() {
 		GregtechOrePrefixes.toolAngleGrinder.add(this);
 	}
 
diff --git a/src/resources/assets/miscutils/textures/gui/Cyclotron.png b/src/resources/assets/miscutils/textures/gui/Cyclotron.png
new file mode 100644
index 0000000000..98c374ace8
--- /dev/null
+++ b/src/resources/assets/miscutils/textures/gui/Cyclotron.png
diff --git a/src/resources/assets/miscutils/textures/gui/MultiblockDisplay_Generic.png b/src/resources/assets/miscutils/textures/gui/MultiblockDisplay_Generic.png
new file mode 100644
index 0000000000..c1ed0e5f37
--- /dev/null
+++ b/src/resources/assets/miscutils/textures/gui/MultiblockDisplay_Generic.png