+ Added Cyber_A and Cyber_B textures.

% Cleaned up GT4Entity_ThermalBoiler.java.
$ GregtechMetaTileEntity_Cyclotron.java now conforms to a proper tile entity.
$ Fixed Cyclotron load declaration.

5 files changed, 201 insertions, 187 deletions

diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/textures/CasingTextureHandler2.java b/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/textures/CasingTextureHandler2.java
index 97b81b65d9..3d8b98fd7f 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/textures/CasingTextureHandler2.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/textures/CasingTextureHandler2.java
@@ -38,7 +38,7 @@ public class CasingTextureHandler2 {
 				return TexturesGtBlock._PlaceHolder.getIcon();
 				//Cyclotron Coil
 			case 9:
-				return TexturesGtBlock.Casing_Machine_Metal_Panel_B.getIcon();
+				return TexturesGtBlock.Overlay_Machine_Cyber_A.getIcon();
 				//Cyclotron External Casing
 			case 10:
 				return TexturesGtBlock.Casing_Material_HastelloyX.getIcon();
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGtBlock.java b/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGtBlock.java
index 2e0687a6a2..d4c4ffcc80 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGtBlock.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGtBlock.java
@@ -2,7 +2,6 @@ package gtPlusPlus.xmod.gregtech.common.blocks.textures;
 
 import gregtech.api.GregTech_API;
 import gregtech.api.interfaces.IIconContainer;
-import gregtech.api.interfaces.ITexture;
 import gtPlusPlus.core.lib.CORE;
 import gtPlusPlus.core.util.Utils;
 import net.minecraft.client.renderer.texture.TextureMap;
@@ -149,6 +148,10 @@ public class TexturesGtBlock {
 	public static final CustomIcon Casing_Machine_Metal_Sheet_A = Internal_Casing_Machine_Metal_Sheet_A;
 	private static final CustomIcon Internal_Casing_Machine_Metal_Sheet_B = new CustomIcon("chrono/MetalSheet2");
 	public static final CustomIcon Casing_Machine_Metal_Sheet_B = Internal_Casing_Machine_Metal_Sheet_B;
+	private static final CustomIcon Internal_Overlay_Machine_Cyber_A = new CustomIcon("chrono/CyberPanel");
+	public static final CustomIcon Overlay_Machine_Cyber_A = Internal_Overlay_Machine_Cyber_A;
+	private static final CustomIcon Internal_Overlay_Machine_Cyber_B = new CustomIcon("chrono/CyberPanel2");
+	public static final CustomIcon Overlay_Machine_Cyber_B = Internal_Overlay_Machine_Cyber_B;
 	
 	//Overlays
 	//Fan Textures
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GT4Entity_ThermalBoiler.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GT4Entity_ThermalBoiler.java
index 5a172f0f43..f245420642 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GT4Entity_ThermalBoiler.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GT4Entity_ThermalBoiler.java
@@ -1,163 +1,179 @@
-package gregtechmod.common.tileentities.machines.multi;
-
-import gregtechmod.api.GregTech_API;
-import gregtechmod.api.enums.GT_Items;
-import gregtechmod.api.interfaces.IGregTechTileEntity;
-import gregtechmod.api.metatileentity.MetaTileEntity;
-import gregtechmod.api.metatileentity.implementations.GT_MetaTileEntity_MultiBlockBase;
-import gregtechmod.api.util.GT_ModHandler;
-import gregtechmod.api.util.GT_Recipe;
-import gregtechmod.api.util.GT_Utility;
+package gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi;
+
+import java.util.Collection;
+
+import gregtech.api.GregTech_API;
+import gregtech.api.enums.ItemList;
+import gregtech.api.interfaces.ITexture;
+import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
+import gregtech.api.metatileentity.MetaTileEntity;
+import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_MultiBlockBase;
+import gregtech.api.util.*;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
 
-public class GT_MetaTileEntity_Multi_ThermalBoiler
-  extends GT_MetaTileEntity_MultiBlockBase
+public class GT4Entity_ThermalBoiler
+extends GT_MetaTileEntity_MultiBlockBase
 {
-  public boolean isFacingValid(byte aFacing)
-  {
-    return aFacing > 1;
-  }
-  
-  public void onRightclick(EntityPlayer aPlayer)
-  {
-    getBaseMetaTileEntity().openGUI(aPlayer, 158, GregTech_API.gregtechmod);
-  }
-  
-  public GT_MetaTileEntity_Multi_ThermalBoiler(int aID, String aName, String aNameRegional)
-  {
-    super(aID, aName, aNameRegional);
-  }
-  
-  public GT_MetaTileEntity_Multi_ThermalBoiler() {}
-  
-  public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity)
-  {
-    return new GT_MetaTileEntity_Multi_ThermalBoiler();
-  }
-  
-  public boolean isCorrectMachinePart(ItemStack aStack)
-  {
-    return true;
-  }
-  
-  public int getDamageToComponent(ItemStack aStack)
-  {
-    return GT_Utility.areStacksEqual(aStack, GT_Items.Component_LavaFilter.getWildcard(1L, new Object[0])) ? 1 : 0;
-  }
-  
-  public boolean checkRecipe(ItemStack aStack)
-  {
-    for (GT_Recipe tRecipe : GT_Recipe.sHotFuels) {
-      if (depleteInput(tRecipe.getRepresentativeInput(0)))
-      {
-        this.mEUt = 400;
-        this.mMaxProgresstime = (tRecipe.mStartEU * 2 / 5);
-        this.mEfficiencyIncrease = (this.mMaxProgresstime * 30);
-        if (tRecipe.getOutput(0) != null) {
-          this.mOutputItems = new ItemStack[] { GT_Utility.copy(new Object[] { tRecipe.getOutput(0) }) };
-        }
-        if (GT_Utility.areStacksEqual(aStack, GT_Items.Component_LavaFilter.getWildcard(1L, new Object[0]))) {
-          if ((tRecipe.getOutput(1) != null) && (getBaseMetaTileEntity().getRandomNumber(1000) < 100)) {
-            this.mOutputItems = new ItemStack[] { GT_Utility.copy(new Object[] { tRecipe.getOutput(1) }) };
-          } else if ((tRecipe.getOutput(2) != null) && (getBaseMetaTileEntity().getRandomNumber(900) < 50)) {
-            this.mOutputItems = new ItemStack[] { GT_Utility.copy(new Object[] { tRecipe.getOutput(2) }) };
-          } else if ((tRecipe.getOutput(3) != null) && (getBaseMetaTileEntity().getRandomNumber(850) < 25)) {
-            this.mOutputItems = new ItemStack[] { GT_Utility.copy(new Object[] { tRecipe.getOutput(3) }) };
-          }
-        }
-        return true;
-      }
-    }
-    return false;
-  }
-  
-  public boolean onRunningTick(ItemStack aStack)
-  {
-    if (this.mEUt > 0)
-    {
-      int tGeneratedEU = (int)(this.mEUt * 2L * this.mEfficiency / 10000L);
-      if ((tGeneratedEU > 0) && (depleteInput(GT_ModHandler.getWater((tGeneratedEU + 160) / 160)))) {
-        addOutput(GT_ModHandler.getSteam(tGeneratedEU));
-      }
-      return true;
-    }
-    return true;
-  }
-  
-  public boolean checkMachine(ItemStack aStack)
-  {
-    byte tSide = getBaseMetaTileEntity().getBackFacing();
-    if (getBaseMetaTileEntity().getAirAtSideAndDistance(getBaseMetaTileEntity().getBackFacing(), 1))
-    {
-      if (((getBaseMetaTileEntity().getBlockAtSideAndDistance(getBaseMetaTileEntity().getBackFacing(), 2) != GregTech_API.sBlockList[0]) || (getBaseMetaTileEntity().getMetaIDAtSideAndDistance(getBaseMetaTileEntity().getBackFacing(), 2) != 14)) && 
-        (!addToMachineList(getBaseMetaTileEntity().getIGregTechTileEntityAtSideAndDistance(getBaseMetaTileEntity().getBackFacing(), 2)))) {
-        return false;
-      }
-      int tX = getBaseMetaTileEntity().getXCoord();int tY = getBaseMetaTileEntity().getYCoord();int tZ = getBaseMetaTileEntity().getZCoord();
-      for (byte i = -1; i < 2; i = (byte)(i + 1)) {
-        for (byte j = -1; j < 2; j = (byte)(j + 1)) {
-          if ((i != 0) || (j != 0)) {
-            for (byte k = 0; k < 3; k = (byte)(k + 1)) {
-              if (((i == 0) || (j == 0)) && (k == 1))
-              {
-                if (getBaseMetaTileEntity().getBlock(tX + (tSide == 5 ? k : tSide < 4 ? i : -k), tY + j, tZ + (tSide < 4 ? -k : tSide == 3 ? k : i)) == GregTech_API.sBlockList[0])
-                {
-                  if (getBaseMetaTileEntity().getMetaID(tX + (tSide == 5 ? k : tSide < 4 ? i : -k), tY + j, tZ + (tSide < 4 ? -k : tSide == 3 ? k : i)) == 14) {}
-                }
-                else if (!addToMachineList(getBaseMetaTileEntity().getIGregTechTileEntity(tX + (tSide == 5 ? k : tSide < 4 ? i : -k), tY + j, tZ + (tSide < 4 ? -k : tSide == 3 ? k : i)))) {
-                  return false;
-                }
-              }
-              else if (getBaseMetaTileEntity().getBlock(tX + (tSide == 5 ? k : tSide < 4 ? i : -k), tY + j, tZ + (tSide < 4 ? -k : tSide == 3 ? k : i)) == GregTech_API.sBlockList[0])
-              {
-                if (getBaseMetaTileEntity().getMetaID(tX + (tSide == 5 ? k : tSide < 4 ? i : -k), tY + j, tZ + (tSide < 4 ? -k : tSide == 3 ? k : i)) == 14) {}
-              }
-              else {
-                return false;
-              }
-            }
-          }
-        }
-      }
-    }
-    else
-    {
-      return false;
-    }
-    return true;
-  }
-  
-  public int getTextureIndex(byte aSide, byte aFacing, boolean aActive, boolean aRedstone)
-  {
-    if (aSide == aFacing) {
-      return aActive ? 84 : 83;
-    }
-    return super.getTextureIndex(aSide, aFacing, aActive, aRedstone);
-  }
-  
-  public boolean explodesOnComponentBreak(ItemStack aStack)
-  {
-    return false;
-  }
-  
-  public int getMaxEfficiency(ItemStack aStack)
-  {
-    return 10000;
-  }
-  
-  public int getPollutionPerTick(ItemStack aStack)
-  {
-    return 0;
-  }
-  
-  public int getAmountOfOutputs()
-  {
-    return 1;
-  }
-  
-  public String getDescription()
-  {
-    return "Converts Heat into Steam";
-  }
+	@Override
+	public boolean isFacingValid(byte aFacing)
+	{
+		return aFacing > 1;
+	}
+
+	public void onRightclick(EntityPlayer aPlayer)
+	{
+		getBaseMetaTileEntity().openGUI(aPlayer, 158);
+	}
+
+	public GT4Entity_ThermalBoiler(int aID, String aName, String aNameRegional)
+	{
+		super(aID, aName, aNameRegional);
+	}
+
+	@Override
+	public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity)
+	{
+		return new GT4Entity_ThermalBoiler(damageFactorLow, mNEI, mNEI);
+	}
+
+	@Override
+	public boolean isCorrectMachinePart(ItemStack aStack)
+	{
+		return true;
+	}
+
+	@Override
+	public int getDamageToComponent(ItemStack aStack)
+	{
+		return GT_Utility.areStacksEqual(aStack, ItemList.Component_LavaFilter.getWildcard(1L, new Object[0])) ? 1 : 0;
+	}
+
+	@Override
+	public boolean checkRecipe(ItemStack aStack)
+	{
+		Collection<GT_Recipe> hotFuels = GT_Recipe.GT_Recipe_Map.sHotFuels.mRecipeList;
+		for (GT_Recipe tRecipe : hotFuels) {
+			if (depleteInput(tRecipe.getRepresentativeInput(0)))
+			{
+				this.mEUt = 400;
+				this.mMaxProgresstime = (tRecipe.mEUt * 2 / 5);
+				this.mEfficiencyIncrease = (this.mMaxProgresstime * 30);
+				if (tRecipe.getOutput(0) != null) {
+					this.mOutputItems = new ItemStack[] { GT_Utility.copy(new Object[] { tRecipe.getOutput(0) }) };
+				}
+				if (GT_Utility.areStacksEqual(aStack, ItemList.Component_LavaFilter.getWildcard(1L, new Object[0]))) {
+					if ((tRecipe.getOutput(1) != null) && (getBaseMetaTileEntity().getRandomNumber(1000) < 100)) {
+						this.mOutputItems = new ItemStack[] { GT_Utility.copy(new Object[] { tRecipe.getOutput(1) }) };
+					} else if ((tRecipe.getOutput(2) != null) && (getBaseMetaTileEntity().getRandomNumber(900) < 50)) {
+						this.mOutputItems = new ItemStack[] { GT_Utility.copy(new Object[] { tRecipe.getOutput(2) }) };
+					} else if ((tRecipe.getOutput(3) != null) && (getBaseMetaTileEntity().getRandomNumber(850) < 25)) {
+						this.mOutputItems = new ItemStack[] { GT_Utility.copy(new Object[] { tRecipe.getOutput(3) }) };
+					}
+				}
+				return true;
+			}
+		}
+		return false;
+	}
+
+	@Override
+	public boolean onRunningTick(ItemStack aStack)
+	{
+		if (this.mEUt > 0)
+		{
+			int tGeneratedEU = (int)(this.mEUt * 2L * this.mEfficiency / 10000L);
+			if ((tGeneratedEU > 0) && (depleteInput(GT_ModHandler.getWater((tGeneratedEU + 160) / 160)))) {
+				addOutput(GT_ModHandler.getSteam(tGeneratedEU));
+			}
+			return true;
+		}
+		return true;
+	}
+
+	public boolean checkMachine(ItemStack aStack)
+	{
+		byte tSide = getBaseMetaTileEntity().getBackFacing();
+		if (getBaseMetaTileEntity().getAirAtSideAndDistance(getBaseMetaTileEntity().getBackFacing(), 1))
+		{
+			int META = 0;
+			if (((getBaseMetaTileEntity().getBlockAtSideAndDistance(getBaseMetaTileEntity().getBackFacing(), 2) != GregTech_API.sBlockCasings1) || (getBaseMetaTileEntity().getMetaIDAtSideAndDistance(getBaseMetaTileEntity().getBackFacing(), 2) != META)) && 
+					(!addToMachineList(getBaseMetaTileEntity().getIGregTechTileEntityAtSideAndDistance(getBaseMetaTileEntity().getBackFacing(), 2), 1))) {
+				return false;
+			}
+			int tX = getBaseMetaTileEntity().getXCoord();int tY = getBaseMetaTileEntity().getYCoord();int tZ = getBaseMetaTileEntity().getZCoord();
+			for (byte i = -1; i < 2; i = (byte)(i + 1)) {
+				for (byte j = -1; j < 2; j = (byte)(j + 1)) {
+					if ((i != 0) || (j != 0)) {
+						for (byte k = 0; k < 3; k = (byte)(k + 1)) {
+							if (((i == 0) || (j == 0)) && (k == 1))
+							{
+								if (getBaseMetaTileEntity().getBlock(tX + (tSide == 5 ? k : tSide < 4 ? i : -k), tY + j, tZ + (tSide < 4 ? -k : tSide == 3 ? k : i)) == GregTech_API.sBlockCasings1)
+								{
+									if (getBaseMetaTileEntity().getMetaID(tX + (tSide == 5 ? k : tSide < 4 ? i : -k), tY + j, tZ + (tSide < 4 ? -k : tSide == 3 ? k : i)) == META) {}
+								}
+								else if (!addToMachineList(getBaseMetaTileEntity().getIGregTechTileEntity(tX + (tSide == 5 ? k : tSide < 4 ? i : -k), tY + j, tZ + (tSide < 4 ? -k : tSide == 3 ? k : i)), 1)) {
+									return false;
+								}
+							}
+							else if (getBaseMetaTileEntity().getBlock(tX + (tSide == 5 ? k : tSide < 4 ? i : -k), tY + j, tZ + (tSide < 4 ? -k : tSide == 3 ? k : i)) == GregTech_API.sBlockCasings1)
+							{
+								if (getBaseMetaTileEntity().getMetaID(tX + (tSide == 5 ? k : tSide < 4 ? i : -k), tY + j, tZ + (tSide < 4 ? -k : tSide == 3 ? k : i)) == META) {}
+							}
+							else {
+								return false;
+							}
+						}
+					}
+				}
+			}
+		}
+		else
+		{
+			return false;
+		}
+		return true;
+	}
+
+	@Override
+	public boolean explodesOnComponentBreak(ItemStack aStack)
+	{
+		return false;
+	}
+
+	@Override
+	public int getMaxEfficiency(ItemStack aStack)
+	{
+		return 10000;
+	}
+
+	@Override
+	public int getPollutionPerTick(ItemStack aStack)
+	{
+		return 0;
+	}
+
+	public int getAmountOfOutputs()
+	{
+		return 1;
+	}
+
+	@Override
+	public String[] getDescription()
+	{
+		return new String[]{"Converts Heat into Steam"};
+	}
+
+
+	@Override
+	public ITexture[] getTexture(IGregTechTileEntity arg0, byte arg1, byte arg2, byte arg3, boolean arg4, boolean arg5) {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	@Override
+	public boolean checkMachine(IGregTechTileEntity arg0, ItemStack arg1) {
+		// TODO Auto-generated method stub
+		return false;
+	}
 }
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntity_Cyclotron.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntity_Cyclotron.java
index 79038bce71..29fc78c012 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntity_Cyclotron.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntity_Cyclotron.java
@@ -1,33 +1,25 @@
-package gregtech.common.tileentities.machines.multi;
+package gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi;
 
-import gregtech.GT_Mod;
 import gregtech.api.enums.Dyes;
-import gregtech.api.enums.GT_Values;
 import gregtech.api.enums.Textures;
 import gregtech.api.gui.GT_Container_MultiMachine;
 import gregtech.api.interfaces.IIconContainer;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.metatileentity.MetaTileEntity;
-import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Energy;
-import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Input;
-import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Output;
 import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_MultiBlockBase;
 import gregtech.api.objects.GT_ItemStack;
 import gregtech.api.objects.GT_RenderedTexture;
 import gregtech.api.util.GT_Recipe;
-import gregtech.api.util.GT_Utility;
-import gregtech.common.gui.GT_GUIContainer_CyclotronReactor;
+import gregtech.common.gui.GT_GUIContainer_FusionReactor;
+import gtPlusPlus.core.block.ModBlocks;
 import net.minecraft.block.Block;
 import net.minecraft.entity.player.InventoryPlayer;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraftforge.common.util.ForgeDirection;
-import net.minecraftforge.fluids.FluidStack;
 
-import java.util.ArrayList;
-
-public abstract class GregtechMetaTileEntity_Cyclotron extends GT_MetaTileEntity_MultiBlockBase {
+public class GregtechMetaTileEntity_Cyclotron extends GT_MetaTileEntity_MultiBlockBase {
 
     public GT_Recipe mLastRecipe;
     public int mEUStore;
@@ -44,7 +36,8 @@ public abstract class GregtechMetaTileEntity_Cyclotron extends GT_MetaTileEntity
         return 6;
     }
 
-    public long maxEUStore() {
+    @Override
+	public long maxEUStore() {
         return (640010000L/4) * (Math.min(16, this.mEnergyHatches.size())) / 16L;
     }
 
@@ -55,15 +48,16 @@ public abstract class GregtechMetaTileEntity_Cyclotron extends GT_MetaTileEntity
 
     @Override
     public Object getClientGUI(int aID, InventoryPlayer aPlayerInventory, IGregTechTileEntity aBaseMetaTileEntity) {
-        return new GT_GUIContainer_CyclotronReactor(aPlayerInventory, aBaseMetaTileEntity, getLocalName(), "CyclotronComputer.png", GT_Recipe.GT_Recipe_Map.sCyclotronRecipes.mNEIName);
+        return new GT_GUIContainer_FusionReactor(aPlayerInventory, aBaseMetaTileEntity, getLocalName(), "CyclotronComputer.png", GT_Recipe.GT_Recipe_Map.sFusionRecipes.mNEIName);
     }
 
     @Override
-    public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
-        return new GregtechMetaTileEntity_Cyclotron(mName);
-    }
+    public MetaTileEntity newMetaEntity(final IGregTechTileEntity aTileEntity) {
+		return new GregtechMetaTileEntity_Cyclotron(this.mName);
+	}
 
-    public boolean allowCoverOnSide(byte aSide, GT_ItemStack aStack) {
+    @Override
+	public boolean allowCoverOnSide(byte aSide, GT_ItemStack aStack) {
         return aSide != getBaseMetaTileEntity().getFrontFacing();
     }
 
@@ -234,15 +228,16 @@ public abstract class GregtechMetaTileEntity_Cyclotron extends GT_MetaTileEntity
         		"All Hatches must be ZPM or better"};
     }
 
-    public ITexture[] getTexture(IGregTechTileEntity aBaseMetaTileEntity, byte aSide, byte aFacing, byte aColorIndex, boolean aActive, boolean aRedstone) {
+    @Override
+	public ITexture[] getTexture(IGregTechTileEntity aBaseMetaTileEntity, byte aSide, byte aFacing, byte aColorIndex, boolean aActive, boolean aRedstone) {
         ITexture[] sTexture;
         if (aSide == aFacing) {
-            sTexture = new ITexture[]{new GT_RenderedTexture(Textures.BlockIcons.MACHINE_CASING_Cyclotron_GLASS, Dyes.getModulation(-1, Dyes._NULL.mRGBa)), new GT_RenderedTexture(getIconOverlay())};
+            sTexture = new ITexture[]{new GT_RenderedTexture(Textures.BlockIcons.MACHINE_CASING_FUSION_GLASS, Dyes.getModulation(-1, Dyes._NULL.mRGBa)), new GT_RenderedTexture(getIconOverlay())};
         } else {
             if (!aActive) {
-                sTexture = new ITexture[]{new GT_RenderedTexture(Textures.BlockIcons.MACHINE_CASING_Cyclotron_GLASS, Dyes.getModulation(-1, Dyes._NULL.mRGBa))};
+                sTexture = new ITexture[]{new GT_RenderedTexture(Textures.BlockIcons.MACHINE_CASING_FUSION_GLASS, Dyes.getModulation(-1, Dyes._NULL.mRGBa))};
             } else {
-                sTexture = new ITexture[]{new GT_RenderedTexture(Textures.BlockIcons.MACHINE_CASING_Cyclotron_GLASS_YELLOW, Dyes.getModulation(-1, Dyes._NULL.mRGBa))};
+                sTexture = new ITexture[]{new GT_RenderedTexture(Textures.BlockIcons.MACHINE_CASING_FUSION_GLASS_YELLOW, Dyes.getModulation(-1, Dyes._NULL.mRGBa))};
             }
         }
         return sTexture;
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechCyclotron.java b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechCyclotron.java
index 94d2446a74..44b10d81cf 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechCyclotron.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechCyclotron.java
@@ -2,19 +2,19 @@ package gtPlusPlus.xmod.gregtech.registration.gregtech;
 
 import gtPlusPlus.core.util.Utils;
 import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
-import gtPlusPlus.xmod.gregtech.common.tileentities.generators.GregtechMetaTileEntity_RTG;
+import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.GregtechMetaTileEntity_Cyclotron;
 
 public class GregtechCyclotron {
 
 	public static void run(){
 		if (gtPlusPlus.core.lib.LoadedMods.Gregtech){
 			Utils.LOG_INFO("Gregtech5u Content | Registering COMET Cyclotron.");
-				run1();
+			run1();
 		}
 	}
 
 	private static void run1(){
-	    GregtechItemList.COMET_Cyclotron.set(new GregtechMetaTileEntity_Cyclotron(801, "cyclotron.tier.single", "COMET - Compact Cyclotron").getStackForm(1L));
-		}
-	
+		GregtechItemList.COMET_Cyclotron.set(new GregtechMetaTileEntity_Cyclotron(801, "cyclotron.tier.single", "COMET - Compact Cyclotron", 6).getStackForm(1L));
+	}
+
 }