Refactoring like a champion.

39 files changed, 502 insertions, 82 deletions

diff --git a/src/Java/miscutil/core/block/ModBlocks.java b/src/Java/miscutil/core/block/ModBlocks.java
index b2abe86b7d..a2466d4bba 100644
--- a/src/Java/miscutil/core/block/ModBlocks.java
+++ b/src/Java/miscutil/core/block/ModBlocks.java
@@ -3,7 +3,7 @@ package miscutil.core.block;
 import miscutil.core.block.antigrief.TowerDevice;
 import miscutil.core.creativetabs.AddToCreativeTab;
 import miscutil.core.util.Utils;
-import miscutil.gregtech.metatileentity.implementations.GregtechMetaCasingBlocks;
+import miscutil.gregtech.api.metatileentity.implementations.GregtechMetaCasingBlocks;
 import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;
 import cpw.mods.fml.common.registry.GameRegistry;
diff --git a/src/Java/miscutil/core/common/CommonProxy.java b/src/Java/miscutil/core/common/CommonProxy.java
index b40d682f73..0b1ebe0bfa 100644
--- a/src/Java/miscutil/core/common/CommonProxy.java
+++ b/src/Java/miscutil/core/common/CommonProxy.java
@@ -19,7 +19,7 @@ import miscutil.core.lib.CORE;
 import miscutil.core.lib.LoadedMods;
 import miscutil.core.tileentities.ModTileEntities;
 import miscutil.core.util.Utils;
-import miscutil.gregtech.init.InitGregtech;
+import miscutil.gregtech.api.init.InitGregtech;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraftforge.oredict.OreDictionary;
diff --git a/src/Java/miscutil/core/handler/UnbreakableBlockManager.java b/src/Java/miscutil/core/handler/UnbreakableBlockManager.java
index 62193d4b5c..b15f5bb561 100644
--- a/src/Java/miscutil/core/handler/UnbreakableBlockManager.java
+++ b/src/Java/miscutil/core/handler/UnbreakableBlockManager.java
@@ -5,7 +5,7 @@ import gregtech.api.metatileentity.BaseMetaPipeEntity;
 import gregtech.api.metatileentity.BaseMetaTileEntity;
 import gregtech.api.metatileentity.BaseTileEntity;
 import miscutil.core.util.Utils;
-import miscutil.gregtech.metatileentity.implementations.GregtechMetaSafeBlock;
+import miscutil.gregtech.api.metatileentity.implementations.GregtechMetaSafeBlock;
 import net.minecraft.block.Block;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.world.World;
diff --git a/src/Java/miscutil/core/handler/XEventHandler.java b/src/Java/miscutil/core/handler/XEventHandler.java
index b52547149d..4aa3154cee 100644
--- a/src/Java/miscutil/core/handler/XEventHandler.java
+++ b/src/Java/miscutil/core/handler/XEventHandler.java
@@ -5,7 +5,7 @@ import gregtech.api.metatileentity.BaseMetaPipeEntity;
 import gregtech.api.metatileentity.BaseMetaTileEntity;
 import gregtech.api.metatileentity.BaseTileEntity;
 import miscutil.core.util.Utils;
-import miscutil.gregtech.metatileentity.implementations.base.GregtechMetaSafeBlockBase;
+import miscutil.gregtech.api.metatileentity.implementations.base.GregtechMetaSafeBlockBase;
 import net.minecraft.block.Block;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.tileentity.TileEntity;
diff --git a/src/Java/miscutil/core/handler/registration/RECIPES_Machines.java b/src/Java/miscutil/core/handler/registration/RECIPES_Machines.java
index d2108b7d7b..ecf7739ea7 100644
--- a/src/Java/miscutil/core/handler/registration/RECIPES_Machines.java
+++ b/src/Java/miscutil/core/handler/registration/RECIPES_Machines.java
@@ -3,7 +3,7 @@ package miscutil.core.handler.registration;
 import gregtech.api.enums.ItemList;
 import miscutil.core.util.ItemUtils;
 import miscutil.core.util.Utils;
-import miscutil.gregtech.enums.GregtechItemList;
+import miscutil.gregtech.api.enums.GregtechItemList;
 import net.minecraft.item.ItemStack;
 
 public class RECIPES_Machines {
@@ -23,7 +23,10 @@ public class RECIPES_Machines {
 	static ItemStack RECIPE_Buffer_ZPM = GregtechItemList.Energy_Buffer_1by1_ZPM.get(1);
 	static ItemStack RECIPE_Buffer_UV = GregtechItemList.Energy_Buffer_1by1_UV.get(1);
 	static ItemStack RECIPE_Buffer_MAX = GregtechItemList.Energy_Buffer_1by1_MAX.get(1);
-	
+	static ItemStack RECIPE_IndustrialCentrifuge = GregtechItemList.Industrial_Centrifuge.get(1);
+	static ItemStack RECIPE_IndustrialCentrifugeCasing = GregtechItemList.Casing_Centrifuge1.get(1);
+	static ItemStack RECIPE_IndustrialCentrifugeCasingVibration = GregtechItemList.Casing_Centrifuge2.get(1);
+
 
 	//Buffer Cores
 	static ItemStack RECIPE_BufferCore_ULV = Utils.getItemStack("miscutils:item.itemBufferCore1", 1);
@@ -100,10 +103,8 @@ public class RECIPES_Machines {
 	//Pipes
 	static String pipeLargeCopper="pipeLargeCopper";
 	static String pipeHugeSteel="pipeHugeSteel";
-
-	//Pumps
-	//gregtech:gt.metaitem.01:32611
-	static ItemStack pump_MV = ItemList.Electric_Pump_MV.get(1);
+	static String pipeHugeStainlessSteel="pipeHugeStainlessSteel";
+	static String pipeHugeTitanium="pipeHugeTitanium";
 
 	//Lava Boiler
 	static ItemStack boiler_Coal = ItemList.Machine_Bronze_Boiler.get(1);
@@ -125,6 +126,52 @@ public class RECIPES_Machines {
 	static String circuitElite = "circuitElite";
 	static String circuitMaster = "circuitMaster";
 	static String circuitUltimate = "circuitUltimate";
+	
+	//Machine Components
+	static ItemStack electricMotor_LV = ItemList.Electric_Motor_LV.get(1);
+	static ItemStack electricMotor_MV = ItemList.Electric_Motor_MV.get(1);
+	static ItemStack electricMotor_HV = ItemList.Electric_Motor_HV.get(1);
+	static ItemStack electricMotor_EV = ItemList.Electric_Motor_EV.get(1);
+	static ItemStack electricMotor_IV = ItemList.Electric_Motor_IV.get(1);
+	static ItemStack electricPump_LV = ItemList.Electric_Pump_LV.get(1);
+	static ItemStack electricPump_MV = ItemList.Electric_Pump_MV.get(1);
+	static ItemStack electricPump_HV = ItemList.Electric_Pump_HV.get(1);
+	static ItemStack electricPump_EV = ItemList.Electric_Pump_EV.get(1);
+	static ItemStack electricPump_IV = ItemList.Electric_Pump_IV.get(1);
+	static ItemStack electricPiston_LV = ItemList.Electric_Piston_LV.get(1);
+	static ItemStack electricPiston_MV = ItemList.Electric_Piston_MV.get(1);
+	static ItemStack electricPiston_HV = ItemList.Electric_Piston_HV.get(1);
+	static ItemStack electricPiston_EV = ItemList.Electric_Piston_EV.get(1);
+	static ItemStack electricPiston_IV = ItemList.Electric_Piston_IV.get(1);
+	static ItemStack robotArm_LV = ItemList.Robot_Arm_LV.get(1);
+	static ItemStack robotArm_MV = ItemList.Robot_Arm_MV.get(1);
+	static ItemStack robotArm_HV = ItemList.Robot_Arm_HV.get(1);
+	static ItemStack robotArm_EV = ItemList.Robot_Arm_EV.get(1);
+	static ItemStack robotArm_IV = ItemList.Robot_Arm_IV.get(1);
+	static ItemStack conveyorModule_LV = ItemList.Conveyor_Module_LV.get(1);
+	static ItemStack conveyorModule_MV = ItemList.Conveyor_Module_MV.get(1);
+	static ItemStack conveyorModule_HV = ItemList.Conveyor_Module_HV.get(1);
+	static ItemStack conveyorModule_EV = ItemList.Conveyor_Module_EV.get(1);
+	static ItemStack conveyorModule_IV = ItemList.Conveyor_Module_IV.get(1);
+	static ItemStack emitter_LV = ItemList.Emitter_LV.get(1);
+	static ItemStack emitter_MV = ItemList.Emitter_MV.get(1);
+	static ItemStack emitter_HV = ItemList.Emitter_HV.get(1);
+	static ItemStack emitter_EV = ItemList.Emitter_EV.get(1);
+	static ItemStack emitter_IV = ItemList.Emitter_IV.get(1);
+	static ItemStack fieldGenerator_LV = ItemList.Field_Generator_LV.get(1);
+	static ItemStack fieldGenerator_MV = ItemList.Field_Generator_MV.get(1);
+	static ItemStack fieldGenerator_HV = ItemList.Field_Generator_HV.get(1);
+	static ItemStack fieldGenerator_EV = ItemList.Field_Generator_EV.get(1);
+	static ItemStack fieldGenerator_IV = ItemList.Field_Generator_IV.get(1);
+	static ItemStack sensor_LV = ItemList.Sensor_LV.get(1);
+	static ItemStack sensor_MV = ItemList.Sensor_MV.get(1);
+	static ItemStack sensor_HV = ItemList.Sensor_HV.get(1);
+	static ItemStack sensor_EV = ItemList.Sensor_EV.get(1);
+	static ItemStack sensor_IV = ItemList.Sensor_IV.get(1);
+	
+	
+	
+	//RobotArm, Conveyor, Emitter, Sensor, Field Generator
 
 
 	public static final void RECIPES_LOAD(){
@@ -263,7 +310,7 @@ public class RECIPES_Machines {
 		//Steam Condenser
 		ItemUtils.recipeBuilder(
 				pipeLargeCopper, pipeHugeSteel, pipeLargeCopper,
-				plateEnergeticAlloy, pump_MV, plateEnergeticAlloy,
+				plateEnergeticAlloy, electricPump_HV, plateEnergeticAlloy,
 				plateEnergeticAlloy, pipeLargeCopper, plateEnergeticAlloy,
 				RECIPE_SteamCondenser);
 
@@ -281,6 +328,23 @@ public class RECIPES_Machines {
 				"plateAnyIron", RECIPES_Tools.craftingToolWrench, "plateAnyIron",
 				RECIPE_IronPlatedBricks);
 
+		
+		
+		
+		//Industrial Centrifuge
+		ItemUtils.recipeBuilder(
+				circuitElite, pipeHugeStainlessSteel, circuitElite,
+				plateTier6, electricPump_EV, plateTier6,
+				plateTier8, machineCasing_EV, plateTier8,
+				RECIPE_IndustrialCentrifuge);
+
+		//Steam Condenser
+		ItemUtils.recipeBuilder(
+				plateTier6, "stickElectrum", plateTier6,
+				plateTier8, "stickElectrum", plateTier8,
+				plateTier6, "stickElectrum", plateTier6,
+				RECIPE_IndustrialCentrifugeCasing);
+
 
 		Utils.LOG_INFO("Done loading recipes for the Various machine blocks.");
 
diff --git a/src/Java/miscutil/gregtech/energy/IC2ElectricItem.java b/src/Java/miscutil/gregtech/api/energy/IC2ElectricItem.java
index 1e8ecd563a..eae47b9910 100644
--- a/src/Java/miscutil/gregtech/energy/IC2ElectricItem.java
+++ b/src/Java/miscutil/gregtech/api/energy/IC2ElectricItem.java
@@ -1,4 +1,4 @@
-package miscutil.gregtech.energy;
+package miscutil.gregtech.api.energy;
 
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
diff --git a/src/Java/miscutil/gregtech/energy/IC2ElectricItemManager.java b/src/Java/miscutil/gregtech/api/energy/IC2ElectricItemManager.java
index 8607d2109b..4b2fcb2fec 100644
--- a/src/Java/miscutil/gregtech/energy/IC2ElectricItemManager.java
+++ b/src/Java/miscutil/gregtech/api/energy/IC2ElectricItemManager.java
@@ -1,4 +1,4 @@
-package miscutil.gregtech.energy;
+package miscutil.gregtech.api.energy;
 
 import net.minecraft.entity.EntityLivingBase;
 import net.minecraft.item.ItemStack;
diff --git a/src/Java/miscutil/gregtech/enums/AddExtraOreDict.java b/src/Java/miscutil/gregtech/api/enums/AddExtraOreDict.java
index 171bdda533..dff0483470 100644
--- a/src/Java/miscutil/gregtech/enums/AddExtraOreDict.java
+++ b/src/Java/miscutil/gregtech/api/enums/AddExtraOreDict.java
@@ -1,4 +1,4 @@
-package miscutil.gregtech.enums;
+package miscutil.gregtech.api.enums;
 
 import gregtech.loaders.preload.GT_Loader_OreDictionary;
 
diff --git a/src/Java/miscutil/gregtech/enums/ExtraOreDictNames.java b/src/Java/miscutil/gregtech/api/enums/ExtraOreDictNames.java
index 192cc898ca..8ca492c9dd 100644
--- a/src/Java/miscutil/gregtech/enums/ExtraOreDictNames.java
+++ b/src/Java/miscutil/gregtech/api/enums/ExtraOreDictNames.java
@@ -1,4 +1,4 @@
-package miscutil.gregtech.enums;
+package miscutil.gregtech.api.enums;
 
 /**
  * 
diff --git a/src/Java/miscutil/gregtech/enums/GregtechItemList.java b/src/Java/miscutil/gregtech/api/enums/GregtechItemList.java
index f64dfda734..1a95d49441 100644
--- a/src/Java/miscutil/gregtech/enums/GregtechItemList.java
+++ b/src/Java/miscutil/gregtech/api/enums/GregtechItemList.java
@@ -1,10 +1,10 @@
-package miscutil.gregtech.enums;
+package miscutil.gregtech.api.enums;
 
 import static gregtech.api.enums.GT_Values.W;
 import gregtech.api.util.GT_ModHandler;
 import gregtech.api.util.GT_OreDictUnificator;
 import gregtech.api.util.GT_Utility;
-import miscutil.gregtech.interfaces.GregtechItemContainer;
+import miscutil.gregtech.api.interfaces.GregtechItemContainer;
 import net.minecraft.block.Block;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
@@ -46,7 +46,10 @@ public enum GregtechItemList implements GregtechItemContainer {
 	Machine_Iron_BlastFurnace, Casing_IronPlatedBricks,
 	
 	//Machine Casings
-	Casing_Shielding;
+	Casing_Shielding, Casing_Centrifuge1, Casing_Centrifuge2,
+	
+	//Large Centrifuge
+	Industrial_Centrifuge;
 
 	public static final GregtechItemList[]
 			DYE_ONLY_ITEMS = {
diff --git a/src/Java/miscutil/gregtech/api/enums/GregtechTextures.java b/src/Java/miscutil/gregtech/api/enums/GregtechTextures.java
new file mode 100644
index 0000000000..40c3cb7f4e
--- /dev/null
+++ b/src/Java/miscutil/gregtech/api/enums/GregtechTextures.java
@@ -0,0 +1,127 @@
+package miscutil.gregtech.api.enums;
+
+import static gregtech.api.enums.GT_Values.RES_PATH_BLOCK;
+import gregtech.api.GregTech_API;
+import gregtech.api.interfaces.IIconContainer;
+import gregtech.api.interfaces.ITexture;
+import net.minecraft.client.renderer.texture.TextureMap;
+import net.minecraft.util.IIcon;
+import net.minecraft.util.ResourceLocation;
+
+public class GregtechTextures {
+    public enum BlockIcons implements IIconContainer, Runnable {	
+
+
+	LARGECENTRIFUGE_TI1, LARGECENTRIFUGE_TI2, LARGECENTRIFUGE_TI3, LARGECENTRIFUGE_TI4, LARGECENTRIFUGE_TI5, 
+	LARGECENTRIFUGE_TI6, LARGECENTRIFUGE_TI7, LARGECENTRIFUGE_TI8, LARGECENTRIFUGE_TI9, 
+	LARGECENTRIFUGE_TI_ACTIVE1, LARGECENTRIFUGE_TI_ACTIVE2, LARGECENTRIFUGE_TI_ACTIVE3, LARGECENTRIFUGE_TI_ACTIVE4, 
+	LARGECENTRIFUGE_TI_ACTIVE5, LARGECENTRIFUGE_TI_ACTIVE6, LARGECENTRIFUGE_TI_ACTIVE7, LARGECENTRIFUGE_TI_ACTIVE8, LARGECENTRIFUGE_TI_ACTIVE9, 
+	
+	LARGECENTRIFUGE_TU1, LARGECENTRIFUGE_TU2, LARGECENTRIFUGE_TU3, LARGECENTRIFUGE_TU4, LARGECENTRIFUGE_TU5, 
+	LARGECENTRIFUGE_TU6, LARGECENTRIFUGE_TU7, LARGECENTRIFUGE_TU8, LARGECENTRIFUGE_TU9, 
+	LARGECENTRIFUGE_TU_ACTIVE1, LARGECENTRIFUGE_TU_ACTIVE2, LARGECENTRIFUGE_TU_ACTIVE3, LARGECENTRIFUGE_TU_ACTIVE4, LARGECENTRIFUGE_TU_ACTIVE5,
+	LARGECENTRIFUGE_TU_ACTIVE6, LARGECENTRIFUGE_TU_ACTIVE7, LARGECENTRIFUGE_TU_ACTIVE8, LARGECENTRIFUGE_TU_ACTIVE9;
+	
+    public static final IIconContainer[]
+    		
+    CENTRIFUGE1 = new IIconContainer[]{
+            LARGECENTRIFUGE_TI1,
+            LARGECENTRIFUGE_TI2,
+            LARGECENTRIFUGE_TI3,
+            LARGECENTRIFUGE_TI4,
+            LARGECENTRIFUGE_TI5,
+            LARGECENTRIFUGE_TI6,
+            LARGECENTRIFUGE_TI7,
+            LARGECENTRIFUGE_TI8,
+            LARGECENTRIFUGE_TI9
+    },
+    CENTRIFUGE_ACTIVE1 = new IIconContainer[]{
+            LARGECENTRIFUGE_TI_ACTIVE1,
+            LARGECENTRIFUGE_TI_ACTIVE2,
+            LARGECENTRIFUGE_TI_ACTIVE3,
+            LARGECENTRIFUGE_TI_ACTIVE4,
+            LARGECENTRIFUGE_TI_ACTIVE5,
+            LARGECENTRIFUGE_TI_ACTIVE6,
+            LARGECENTRIFUGE_TI_ACTIVE7,
+            LARGECENTRIFUGE_TI_ACTIVE8,
+            LARGECENTRIFUGE_TI_ACTIVE9
+    },
+    CENTRIFUGE2 = new IIconContainer[]{
+            LARGECENTRIFUGE_TU1,
+            LARGECENTRIFUGE_TU2,
+            LARGECENTRIFUGE_TU3,
+            LARGECENTRIFUGE_TU4,
+            LARGECENTRIFUGE_TU5,
+            LARGECENTRIFUGE_TU6,
+            LARGECENTRIFUGE_TU7,
+            LARGECENTRIFUGE_TU8,
+            LARGECENTRIFUGE_TU9
+    },
+    CENTRIFUGE_ACTIVE2 = new IIconContainer[]{
+            LARGECENTRIFUGE_TU_ACTIVE1,
+            LARGECENTRIFUGE_TU_ACTIVE2,
+            LARGECENTRIFUGE_TU_ACTIVE3,
+            LARGECENTRIFUGE_TU_ACTIVE4,
+            LARGECENTRIFUGE_TU_ACTIVE5,
+            LARGECENTRIFUGE_TU_ACTIVE6,
+            LARGECENTRIFUGE_TU_ACTIVE7,
+            LARGECENTRIFUGE_TU_ACTIVE8,
+            LARGECENTRIFUGE_TU_ACTIVE9
+    };
+    
+    public static ITexture[]   
+    GT_CASING_BLOCKS = new ITexture[64];
+   
+    protected IIcon mIcon;
+	
+    @Override
+    public IIcon getIcon() {
+        return mIcon;
+    }
+
+    @Override
+    public IIcon getOverlayIcon() {
+        return null;
+    }
+
+    @Override
+    public void run() {
+        mIcon = GregTech_API.sBlockIcons.registerIcon(RES_PATH_BLOCK + "iconsets/" + this);
+    }
+
+    @Override
+    public ResourceLocation getTextureFile() {
+        return TextureMap.locationBlocksTexture;
+    }
+
+    public static class CustomIcon implements IIconContainer, Runnable {
+        protected IIcon mIcon;
+        protected String mIconName;
+
+        public CustomIcon(String aIconName) {
+            mIconName = aIconName;
+            GregTech_API.sGTBlockIconload.add(this);
+        }
+
+        @Override
+        public IIcon getIcon() {
+            return mIcon;
+        }
+
+        @Override
+        public IIcon getOverlayIcon() {
+            return null;
+        }
+
+        @Override
+        public void run() {
+            mIcon = GregTech_API.sBlockIcons.registerIcon(RES_PATH_BLOCK + mIconName);
+        }
+
+        @Override
+        public ResourceLocation getTextureFile() {
+            return TextureMap.locationBlocksTexture;
+        }
+    }
+}}
+
diff --git a/src/Java/miscutil/gregtech/gui/CONTAINER_IronBlastFurnace.java b/src/Java/miscutil/gregtech/api/gui/CONTAINER_IronBlastFurnace.java
index a094f764cc..3015e43f2a 100644
--- a/src/Java/miscutil/gregtech/gui/CONTAINER_IronBlastFurnace.java
+++ b/src/Java/miscutil/gregtech/api/gui/CONTAINER_IronBlastFurnace.java
@@ -1,4 +1,4 @@
-package miscutil.gregtech.gui;
+package miscutil.gregtech.api.gui;
 
 import gregtech.api.gui.GT_ContainerMetaTile_Machine;
 import gregtech.api.gui.GT_Slot_Output;
diff --git a/src/Java/miscutil/gregtech/gui/CONTAINER_SafeBlock.java b/src/Java/miscutil/gregtech/api/gui/CONTAINER_SafeBlock.java
index 4d7b94db0e..a805585a49 100644
--- a/src/Java/miscutil/gregtech/gui/CONTAINER_SafeBlock.java
+++ b/src/Java/miscutil/gregtech/api/gui/CONTAINER_SafeBlock.java
@@ -1,10 +1,10 @@
-package miscutil.gregtech.gui;
+package miscutil.gregtech.api.gui;
 
 import gregtech.api.gui.GT_ContainerMetaTile_Machine;
 import gregtech.api.gui.GT_Slot_Holo;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import miscutil.core.util.PlayerCache;
-import miscutil.gregtech.metatileentity.implementations.GregtechMetaSafeBlock;
+import miscutil.gregtech.api.metatileentity.implementations.GregtechMetaSafeBlock;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.entity.player.InventoryPlayer;
 import net.minecraft.inventory.Slot;
diff --git a/src/Java/miscutil/gregtech/gui/CONTAINER_SteamCondenser.java b/src/Java/miscutil/gregtech/api/gui/CONTAINER_SteamCondenser.java
index 26715d0801..9a283b8de3 100644
--- a/src/Java/miscutil/gregtech/gui/CONTAINER_SteamCondenser.java
+++ b/src/Java/miscutil/gregtech/api/gui/CONTAINER_SteamCondenser.java
@@ -1,11 +1,11 @@
-package miscutil.gregtech.gui;
+package miscutil.gregtech.api.gui;
 
 import gregtech.api.gui.GT_ContainerMetaTile_Machine;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 
 import java.util.Iterator;
 
-import miscutil.gregtech.metatileentity.implementations.base.GregtechMetaBoilerBase;
+import miscutil.gregtech.api.metatileentity.implementations.base.GregtechMetaBoilerBase;
 import net.minecraft.entity.player.InventoryPlayer;
 import net.minecraft.inventory.ICrafting;
 import net.minecraft.inventory.Slot;
diff --git a/src/Java/miscutil/gregtech/gui/GUI_IronBlastFurnace.java b/src/Java/miscutil/gregtech/api/gui/GUI_IronBlastFurnace.java
index 6ed6b3c907..6f8c42cbaa 100644
--- a/src/Java/miscutil/gregtech/gui/GUI_IronBlastFurnace.java
+++ b/src/Java/miscutil/gregtech/api/gui/GUI_IronBlastFurnace.java
@@ -1,4 +1,4 @@
-package miscutil.gregtech.gui;
+package miscutil.gregtech.api.gui;
 
 import gregtech.api.gui.GT_GUIContainerMetaTile_Machine;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
diff --git a/src/Java/miscutil/gregtech/gui/GUI_SafeBlock.java b/src/Java/miscutil/gregtech/api/gui/GUI_SafeBlock.java
index fea5c1bfc1..165e4cb6ea 100644
--- a/src/Java/miscutil/gregtech/gui/GUI_SafeBlock.java
+++ b/src/Java/miscutil/gregtech/api/gui/GUI_SafeBlock.java
@@ -1,4 +1,4 @@
-package miscutil.gregtech.gui;
+package miscutil.gregtech.api.gui;
 
 import gregtech.api.gui.GT_GUIContainerMetaTile_Machine;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
diff --git a/src/Java/miscutil/gregtech/gui/GUI_SteamCondenser.java b/src/Java/miscutil/gregtech/api/gui/GUI_SteamCondenser.java
index 0b57023286..1c125e86fd 100644
--- a/src/Java/miscutil/gregtech/gui/GUI_SteamCondenser.java
+++ b/src/Java/miscutil/gregtech/api/gui/GUI_SteamCondenser.java
@@ -1,4 +1,4 @@
-package miscutil.gregtech.gui;
+package miscutil.gregtech.api.gui;
 
 import gregtech.api.gui.GT_GUIContainerMetaTile_Machine;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
diff --git a/src/Java/miscutil/gregtech/init/InitGregtech.java b/src/Java/miscutil/gregtech/api/init/InitGregtech.java
index a6b6277e9d..1507405f0c 100644
--- a/src/Java/miscutil/gregtech/init/InitGregtech.java
+++ b/src/Java/miscutil/gregtech/api/init/InitGregtech.java
@@ -1,11 +1,11 @@
-package miscutil.gregtech.init;
+package miscutil.gregtech.api.init;
 
 import static miscutil.core.lib.LoadedMods.Gregtech;
 import miscutil.core.util.Utils;
-import miscutil.gregtech.init.machines.GregtechConduits;
-import miscutil.gregtech.init.machines.GregtechEnergyBuffer;
-import miscutil.gregtech.init.machines.GregtechSafeBlock;
-import miscutil.gregtech.init.machines.GregtechSteamCondenser;
+import miscutil.gregtech.api.init.machines.GregtechConduits;
+import miscutil.gregtech.api.init.machines.GregtechEnergyBuffer;
+import miscutil.gregtech.api.init.machines.GregtechSafeBlock;
+import miscutil.gregtech.api.init.machines.GregtechSteamCondenser;
 
 public class InitGregtech {
 
diff --git a/src/Java/miscutil/gregtech/init/machines/GregtechCobbleGenerator.java b/src/Java/miscutil/gregtech/api/init/machines/GregtechCobbleGenerator.java