Reorganized gui and render classes into own subpackages. (Client and Common)

buildcraft_client/buildcraft/energy/GuiHandler.java

@@ -3,6 +3,8 @@ package buildcraft.energy;
 import cpw.mods.fml.common.network.IGuiHandler;
 import buildcraft.core.GuiIds;
 import buildcraft.energy.TileEngine;
+import buildcraft.energy.gui.GuiCombustionEngine;
+import buildcraft.energy.gui.GuiSteamEngine;
 import net.minecraft.src.EntityPlayer;
 import net.minecraft.src.TileEntity;
 import net.minecraft.src.World;

buildcraft_client/buildcraft/factory/GuiHandler.java

@@ -5,6 +5,9 @@ import buildcraft.core.GuiIds;
 import buildcraft.factory.TileAutoWorkbench;
 import buildcraft.factory.TileHopper;
 import buildcraft.factory.TileRefinery;
+import buildcraft.factory.gui.GuiAutoCrafting;
+import buildcraft.factory.gui.GuiHopper;
+import buildcraft.factory.gui.GuiRefinery;
 import net.minecraft.src.EntityPlayer;
 import net.minecraft.src.TileEntity;
 import net.minecraft.src.World;

buildcraft_client/buildcraft/mod_BuildCraftCore.java

@@ -39,12 +39,12 @@ import buildcraft.core.EntityEnergyLaser;
 import buildcraft.core.EntityLaser;
 import buildcraft.core.EntityRobot;
 import buildcraft.core.IInventoryRenderer;
-import buildcraft.core.RenderEnergyLaser;
-import buildcraft.core.RenderEntityBlock;
-import buildcraft.core.RenderLaser;
-import buildcraft.core.RenderRobot;
 import buildcraft.core.Utils;
 import buildcraft.core.network.PacketHandler;
+import buildcraft.core.render.RenderEnergyLaser;
+import buildcraft.core.render.RenderEntityBlock;
+import buildcraft.core.render.RenderLaser;
+import buildcraft.core.render.RenderRobot;
 import buildcraft.core.utils.Localization;
 
 @Mod(name="BuildCraft", version=DefaultProps.VERSION, useMetadata = false, modid = "BC|CORE")

buildcraft_client/buildcraft/mod_BuildCraftEnergy.java

@@ -21,11 +21,11 @@ import cpw.mods.fml.common.network.NetworkMod;
 import buildcraft.BuildCraftEnergy;
 import buildcraft.core.DefaultProps;
 import buildcraft.core.network.PacketHandler;
-import buildcraft.energy.RenderEngine;
-import buildcraft.energy.TextureFuelFX;
-import buildcraft.energy.TextureOilFX;
-import buildcraft.energy.TextureOilFlowFX;
 import buildcraft.energy.TileEngine;
+import buildcraft.energy.render.RenderEngine;
+import buildcraft.energy.render.TextureFuelFX;
+import buildcraft.energy.render.TextureOilFX;
+import buildcraft.energy.render.TextureOilFlowFX;
 import buildcraft.mod_BuildCraftCore.EntityRenderIndex;
 
 import net.minecraft.src.ModLoader;

buildcraft_client/buildcraft/mod_BuildCraftFactory.java

@@ -21,16 +21,16 @@ import cpw.mods.fml.common.network.NetworkMod;
 
 import buildcraft.BuildCraftFactory;
 import buildcraft.core.DefaultProps;
-import buildcraft.core.RenderVoid;
+import buildcraft.core.render.RenderVoid;
 import buildcraft.factory.EntityMechanicalArm;
-import buildcraft.factory.GuiAutoCrafting;
-import buildcraft.factory.RenderHopper;
-import buildcraft.factory.RenderRefinery;
-import buildcraft.factory.RenderTank;
 import buildcraft.factory.TileHopper;
 import buildcraft.factory.TileRefinery;
 import buildcraft.factory.TileTank;
+import buildcraft.factory.gui.GuiAutoCrafting;
 import buildcraft.factory.network.PacketHandlerFactory;
+import buildcraft.factory.render.RenderHopper;
+import buildcraft.factory.render.RenderRefinery;
+import buildcraft.factory.render.RenderTank;
 import buildcraft.mod_BuildCraftCore.EntityRenderIndex;
 
 import net.minecraft.src.ModLoader;

buildcraft_client/buildcraft/mod_BuildCraftTransport.java

@@ -19,13 +19,13 @@ import cpw.mods.fml.common.network.NetworkMod;
 import cpw.mods.fml.common.network.NetworkRegistry;
 import buildcraft.BuildCraftTransport;
 import buildcraft.core.DefaultProps;
-import buildcraft.transport.FacadeItemRenderer;
 import buildcraft.transport.GuiHandler;
 import buildcraft.transport.IPipeRenderState;
-import buildcraft.transport.PipeItemRenderer;
-import buildcraft.transport.PipeWorldRenderer;
-import buildcraft.transport.RenderPipe;
 import buildcraft.transport.network.PacketHandlerTransport;
+import buildcraft.transport.render.FacadeItemRenderer;
+import buildcraft.transport.render.PipeItemRenderer;
+import buildcraft.transport.render.PipeWorldRenderer;
+import buildcraft.transport.render.RenderPipe;
 import net.minecraft.src.Block;
 import net.minecraft.src.IBlockAccess;
 import net.minecraft.src.ModLoader;

buildcraft_client/buildcraft/silicon/GuiHandler.java

@@ -3,6 +3,7 @@ package buildcraft.silicon;
 import cpw.mods.fml.common.network.IGuiHandler;
 import buildcraft.core.GuiIds;
 import buildcraft.factory.TileAssemblyTable;
+import buildcraft.silicon.gui.GuiAssemblyTable;
 import net.minecraft.src.EntityPlayer;
 import net.minecraft.src.TileEntity;
 import net.minecraft.src.World;

buildcraft_client/buildcraft/silicon/network/PacketHandlerSilicon.java

@@ -10,7 +10,7 @@ import buildcraft.core.network.PacketIds;
 import buildcraft.core.network.PacketUpdate;
 import buildcraft.factory.TileAssemblyTable;
 import buildcraft.factory.TileAssemblyTable.SelectionMessage;
-import buildcraft.silicon.GuiAssemblyTable;
+import buildcraft.silicon.gui.GuiAssemblyTable;
 
 import net.minecraft.src.GuiScreen;
 import net.minecraft.src.ModLoader;

buildcraft_client/buildcraft/transport/GuiHandler.java

@@ -3,6 +3,10 @@ package buildcraft.transport;
 import cpw.mods.fml.common.network.IGuiHandler;
 import buildcraft.core.GuiIds;
 import buildcraft.transport.TileGenericPipe;
+import buildcraft.transport.gui.CraftingDiamondPipe;
+import buildcraft.transport.gui.CraftingGateInterface;
+import buildcraft.transport.gui.GuiDiamondPipe;
+import buildcraft.transport.gui.GuiGateInterface;
 import net.minecraft.src.EntityPlayer;
 import net.minecraft.src.TileEntity;
 import net.minecraft.src.World;

buildcraft_client/buildcraft/transport/TransportProxy.java

@@ -9,6 +9,7 @@
 
 package buildcraft.transport;
 
+import buildcraft.transport.render.TileEntityPickupFX;
 import net.minecraft.src.EntityItem;
 import net.minecraft.src.ModLoader;
 import net.minecraft.src.TileEntity;

buildcraft_client/buildcraft/transport/network/PacketHandlerTransport.java

@@ -10,12 +10,12 @@ import buildcraft.core.network.PacketIds;
 import buildcraft.core.network.PacketNBT;
 import buildcraft.core.network.PacketPipeTransportContent;
 import buildcraft.core.network.PacketUpdate;
-import buildcraft.transport.CraftingGateInterface;
 import buildcraft.transport.PipeLogicDiamond;
 import buildcraft.transport.PipeTransportItems;
 import buildcraft.transport.PipeTransportLiquids;
 import buildcraft.transport.PipeTransportPower;
 import buildcraft.transport.TileGenericPipe;
+import buildcraft.transport.gui.CraftingGateInterface;
 import buildcraft.transport.network.PacketLiquidUpdate;
 import buildcraft.transport.network.PacketPowerUpdate;
 import buildcraft.transport.network.PipeRenderStatePacket;

common/buildcraft/BuildCraftBuilders.java

@@ -52,7 +52,6 @@ import buildcraft.builders.FillerFillWalls;
 import buildcraft.builders.FillerFlattener;
 import buildcraft.builders.FillerRegistry;
 import buildcraft.builders.FillerRemover;
-import buildcraft.builders.GuiHandler;
 import buildcraft.builders.IBuilderHook;
 import buildcraft.builders.ItemBptBluePrint;
 import buildcraft.builders.ItemBptTemplate;
@@ -62,6 +61,7 @@ import buildcraft.builders.TileBuilder;
 import buildcraft.builders.TileFiller;
 import buildcraft.builders.TileMarker;
 import buildcraft.builders.TilePathMarker;
+import buildcraft.builders.gui.GuiHandler;
 import buildcraft.core.BptPlayerIndex;
 import buildcraft.core.BptRootIndex;
 import buildcraft.core.CoreProxy;

common/buildcraft/builders/TileFiller.java

@@ -21,7 +21,6 @@ import buildcraft.api.inventory.ISpecialInventory;
 import buildcraft.api.power.IPowerProvider;
 import buildcraft.api.power.IPowerReceptor;
 import buildcraft.api.power.PowerFramework;
-import buildcraft.api.power.PowerProvider;
 import buildcraft.core.ActionMachineControl;
 import buildcraft.core.Box;
 import buildcraft.core.CoreProxy;
@@ -45,7 +44,7 @@ public class TileFiller extends TileBuildCraft implements ISpecialInventory, IPo
 	public @TileNetworkData
 	boolean done = true;
 
-	IFillerPattern currentPattern;
+	public IFillerPattern currentPattern;
 
 	boolean forceDone = false;
 	private ItemStack contents[];

common/buildcraft/builders/gui/ContainerBlueprintLibrary.java

@@ -7,12 +7,13 @@
  * http://www.mod-buildcraft.com/MMPL-1.0.txt
  */
 
-package buildcraft.builders;
+package buildcraft.builders.gui;
 
 import java.util.LinkedList;
 
+import buildcraft.builders.TileBlueprintLibrary;
 import buildcraft.core.BptBase;
-import buildcraft.core.BuildCraftContainer;
+import buildcraft.core.gui.BuildCraftContainer;
 
 import net.minecraft.src.EntityPlayer;
 import net.minecraft.src.IInventory;

common/buildcraft/builders/gui/CraftingBuilder.java

@@ -7,14 +7,15 @@
  * http://www.mod-buildcraft.com/MMPL-1.0.txt
  */
 
-package buildcraft.builders;
+package buildcraft.builders.gui;
 
-import buildcraft.core.BuildCraftContainer;
+import buildcraft.builders.TileBuilder;
+import buildcraft.core.gui.BuildCraftContainer;
 import net.minecraft.src.EntityPlayer;
 import net.minecraft.src.IInventory;
 import net.minecraft.src.Slot;
 
-class CraftingBuilder extends BuildCraftContainer {
+public class CraftingBuilder extends BuildCraftContainer {
 
 	IInventory playerIInventory;
 	TileBuilder builder;

common/buildcraft/builders/gui/CraftingFiller.java

@@ -7,14 +7,14 @@
  * http://www.mod-buildcraft.com/MMPL-1.0.txt
  */
 
-package buildcraft.builders;
+package buildcraft.builders.gui;
 
-import buildcraft.core.BuildCraftContainer;
+import buildcraft.core.gui.BuildCraftContainer;
 import net.minecraft.src.EntityPlayer;
 import net.minecraft.src.IInventory;
 import net.minecraft.src.Slot;
 
-class CraftingFiller extends BuildCraftContainer {
+public class CraftingFiller extends BuildCraftContainer {
 
 	IInventory playerIInventory;
 	IInventory fillerInventory;

common/buildcraft/builders/gui/CraftingTemplate.java

@@ -7,9 +7,8 @@
  * http://www.mod-buildcraft.com/MMPL-1.0.txt
  */
 
-package buildcraft.builders;
+package buildcraft.builders.gui;
 
-import buildcraft.builders.CraftingTemplateRoot;
 import buildcraft.builders.TileArchitect;
 import net.minecraft.src.ICrafting;
 import net.minecraft.src.IInventory;

common/buildcraft/builders/gui/CraftingTemplateRoot.java

@@ -7,9 +7,10 @@
  * http://www.mod-buildcraft.com/MMPL-1.0.txt
  */
 
-package buildcraft.builders;
+package buildcraft.builders.gui;
 
-import buildcraft.core.BuildCraftContainer;
+import buildcraft.builders.TileArchitect;
+import buildcraft.core.gui.BuildCraftContainer;
 import net.minecraft.src.EntityPlayer;
 import net.minecraft.src.IInventory;
 import net.minecraft.src.Slot;

common/buildcraft/builders/gui/GuiBlueprintLibrary.java

@@ -7,7 +7,7 @@
  * http://www.mod-buildcraft.com/MMPL-1.0.txt
  */
 
-package buildcraft.builders;
+package buildcraft.builders.gui;
 
 import net.minecraft.src.EntityPlayer;
 import net.minecraft.src.GuiButton;
@@ -16,12 +16,11 @@ import net.minecraft.src.ModLoader;
 import org.lwjgl.opengl.GL11;
 
 import buildcraft.BuildCraftBuilders;
-import buildcraft.builders.ContainerBlueprintLibrary;
 import buildcraft.builders.TileBlueprintLibrary;
 import buildcraft.core.BptBase;
 import buildcraft.core.BptPlayerIndex;
 import buildcraft.core.DefaultProps;
-import buildcraft.core.GuiBuildCraft;
+import buildcraft.core.gui.GuiBuildCraft;
 import buildcraft.core.utils.StringUtil;
 
 public class GuiBlueprintLibrary extends GuiBuildCraft {

common/buildcraft/builders/gui/GuiBuilder.java

@@ -7,7 +7,7 @@
  * http://www.mod-buildcraft.com/MMPL-1.0.txt
  */
 
-package buildcraft.builders;
+package buildcraft.builders.gui;
 
 import java.util.Collection;
 
@@ -16,10 +16,9 @@ import net.minecraft.src.ItemStack;
 
 import org.lwjgl.opengl.GL11;
 
-import buildcraft.builders.CraftingBuilder;
 import buildcraft.builders.TileBuilder;
 import buildcraft.core.DefaultProps;
-import buildcraft.core.GuiAdvancedInterface;
+import buildcraft.core.gui.GuiAdvancedInterface;
 import buildcraft.core.utils.StringUtil;
 
 public class GuiBuilder extends GuiAdvancedInterface {

common/buildcraft/builders/gui/GuiFiller.java

@@ -7,16 +7,15 @@
  * http://www.mod-buildcraft.com/MMPL-1.0.txt
  */
 
-package buildcraft.builders;
+package buildcraft.builders.gui;
 
 import net.minecraft.src.IInventory;
 
 import org.lwjgl.opengl.GL11;
 
-import buildcraft.builders.CraftingFiller;
 import buildcraft.builders.TileFiller;
 import buildcraft.core.DefaultProps;
-import buildcraft.core.GuiBuildCraft;
+import buildcraft.core.gui.GuiBuildCraft;
 import buildcraft.core.utils.StringUtil;
 
 public class GuiFiller extends GuiBuildCraft {

common/buildcraft/builders/gui/GuiHandler.java

@@ -1,4 +1,4 @@
-package buildcraft.builders;
+package buildcraft.builders.gui;
 
 import cpw.mods.fml.common.network.IGuiHandler;
 import buildcraft.builders.TileArchitect;

common/buildcraft/builders/gui/GuiTemplate.java

@@ -7,7 +7,7 @@
  * http://www.mod-buildcraft.com/MMPL-1.0.txt
  */
 
-package buildcraft.builders;
+package buildcraft.builders.gui;
 
 import java.util.Date;
 
@@ -18,7 +18,7 @@ import org.lwjgl.opengl.GL11;
 import buildcraft.BuildCraftBuilders;
 import buildcraft.builders.TileArchitect;
 import buildcraft.core.DefaultProps;
-import buildcraft.core.GuiBuildCraft;
+import buildcraft.core.gui.GuiBuildCraft;
 import buildcraft.core.utils.StringUtil;
 
 public class GuiTemplate extends GuiBuildCraft {

common/buildcraft/core/EntityLaser.java

@@ -24,9 +24,9 @@ public class EntityLaser extends Entity implements ISpawnHandler {
 	
 	protected Position head, tail;
 
-	protected double renderSize = 0;
-	protected double angleY = 0;
-	protected double angleZ = 0;
+	public double renderSize = 0;
+	public double angleY = 0;
+	public double angleZ = 0;
 	protected String texture;
 
 	public EntityLaser(World world) {

common/buildcraft/core/gui/BuildCraftContainer.java

@@ -7,10 +7,9 @@
  * http://www.mod-buildcraft.com/MMPL-1.0.txt
  */
 
-package buildcraft.core;
+package buildcraft.core.gui;
 
 import net.minecraft.src.Container;
-import net.minecraft.src.IInventory;
 import net.minecraft.src.ItemStack;
 import net.minecraft.src.Slot;
 

common/buildcraft/core/gui/GuiAdvancedInterface.java

@@ -1,4 +1,4 @@
-package buildcraft.core;
+package buildcraft.core.gui;
 
 import net.minecraft.src.IInventory;
 import net.minecraft.src.ItemStack;
@@ -7,7 +7,6 @@ import net.minecraft.src.RenderHelper;
 
 import org.lwjgl.opengl.GL11;
 
-import buildcraft.core.BuildCraftContainer;
 
 public abstract class GuiAdvancedInterface extends GuiBuildCraft {
 

common/buildcraft/core/gui/GuiBuildCraft.java

@@ -1,4 +1,4 @@
-package buildcraft.core;
+package buildcraft.core.gui;
 
 import java.util.ArrayList;
 
@@ -8,7 +8,6 @@ import net.minecraft.src.TileEntity;
 
 import org.lwjgl.opengl.GL11;
 
-import buildcraft.core.BuildCraftContainer;
 import buildcraft.core.DefaultProps;
 import buildcraft.core.utils.SessionVars;
 

common/buildcraft/core/render/RenderEnergyLaser.java

@@ -7,7 +7,7 @@
  * http://www.mod-buildcraft.com/MMPL-1.0.txt
  */
 
-package buildcraft.core;
+package buildcraft.core.render;
 
 import buildcraft.core.EntityEnergyLaser;
 import buildcraft.core.EntityLaser;

common/buildcraft/core/render/RenderEntityBlock.java

@@ -7,7 +7,7 @@
  * http://www.mod-buildcraft.com/MMPL-1.0.txt
  */
 
-package buildcraft.core;
+package buildcraft.core.render;
 
 import net.minecraft.src.Block;
 import net.minecraft.src.Entity;
@@ -16,7 +16,6 @@ import net.minecraft.src.Render;
 import net.minecraft.src.Tessellator;
 import net.minecraft.src.World;
 import net.minecraftforge.client.ForgeHooksClient;
-import net.minecraftforge.client.MinecraftForgeClient;
 
 import org.lwjgl.opengl.GL11;
 

common/buildcraft/core/render/RenderLaser.java

@@ -1,11 +1,10 @@
-package buildcraft.core;
+package buildcraft.core.render;
 
 import net.minecraft.src.Entity;
 import net.minecraft.src.ModelBase;
 import net.minecraft.src.ModelRenderer;
 import net.minecraft.src.Render;
 import net.minecraftforge.client.ForgeHooksClient;
-import net.minecraftforge.client.MinecraftForgeClient;
 
 import org.lwjgl.opengl.GL11;
 

common/buildcraft/core/render/RenderRobot.java

@@ -1,12 +1,10 @@
-package buildcraft.core;
+package buildcraft.core.render;
 
-import net.minecraft.src.Block;
 import net.minecraft.src.Entity;
 import net.minecraft.src.ModelBase;
 import net.minecraft.src.ModelRenderer;
 import net.minecraft.src.Render;
 import net.minecraftforge.client.ForgeHooksClient;
-import net.minecraftforge.client.MinecraftForgeClient;
 
 import org.lwjgl.opengl.GL11;
 

common/buildcraft/core/render/RenderVoid.java

@@ -7,7 +7,7 @@
  * http://www.mod-buildcraft.com/MMPL-1.0.txt
  */
 
-package buildcraft.core;
+package buildcraft.core.render;
 
 import net.minecraft.src.Entity;
 import net.minecraft.src.Render;

common/buildcraft/core/render/TextureLiquidsFX.java

@@ -7,12 +7,10 @@
  * http://www.mod-buildcraft.com/MMPL-1.0.txt
  */
 
-package buildcraft.core;
+package buildcraft.core.render;
 
-import net.minecraft.src.Block;
 import net.minecraft.src.RenderEngine;
 import net.minecraftforge.client.ForgeHooksClient;
-import net.minecraftforge.client.MinecraftForgeClient;
 import cpw.mods.fml.client.FMLTextureFX;
 
 public class TextureLiquidsFX extends FMLTextureFX {

common/buildcraft/energy/Engine.java

@@ -13,7 +13,7 @@ import buildcraft.api.core.Orientations;
 import buildcraft.api.liquids.LiquidTank;
 import buildcraft.core.CoreProxy;
 import buildcraft.core.network.TileNetworkData;
-import buildcraft.energy.ContainerEngine;
+import buildcraft.energy.gui.ContainerEngine;
 import net.minecraft.src.ICrafting;
 import net.minecraft.src.ItemStack;
 import net.minecraft.src.NBTTagCompound;

common/buildcraft/energy/EngineIron.java

@@ -18,8 +18,7 @@ import buildcraft.api.liquids.LiquidStack;
 import buildcraft.api.liquids.LiquidTank;
 import buildcraft.core.DefaultProps;
 import buildcraft.core.Utils;
-import buildcraft.energy.ContainerEngine;
-import net.minecraft.src.Block;
+import buildcraft.energy.gui.ContainerEngine;
 import net.minecraft.src.ICrafting;
 import net.minecraft.src.ItemStack;
 import net.minecraft.src.NBTTagCompound;
@@ -34,10 +33,10 @@ public class EngineIron extends Engine {
 
 	int burnTime = 0;
 	int liquidQty = 0;
-	int liquidId = 0;
+	public int liquidId = 0;
 
 	int coolantQty = 0;
-	int coolantId = 0;
+	public int coolantId = 0;
 
 	int heat = 0;
 

common/buildcraft/energy/EngineStone.java

@@ -12,7 +12,7 @@ package buildcraft.energy;
 import buildcraft.core.CoreProxy;
 import buildcraft.core.DefaultProps;
 import buildcraft.core.Utils;
-import buildcraft.energy.ContainerEngine;
+import buildcraft.energy.gui.ContainerEngine;
 import cpw.mods.fml.common.FMLCommonHandler;
 import net.minecraft.src.Block;
 import net.minecraft.src.ICrafting;

common/buildcraft/energy/gui/ContainerEngine.java

@@ -7,9 +7,8 @@
  * http://www.mod-buildcraft.com/MMPL-1.0.txt
  */
 
-package buildcraft.energy;
+package buildcraft.energy.gui;
 
-import buildcraft.energy.ContainerEngineRoot;
 import buildcraft.energy.TileEngine;
 import net.minecraft.src.InventoryPlayer;
 

common/buildcraft/energy/gui/ContainerEngineRoot.java

@@ -7,9 +7,11 @@
  * http://www.mod-buildcraft.com/MMPL-1.0.txt
  */
 
-package buildcraft.energy;
+package buildcraft.energy.gui;
 
-import buildcraft.core.BuildCraftContainer;
+import buildcraft.core.gui.BuildCraftContainer;
+import buildcraft.energy.EngineStone;
+import buildcraft.energy.TileEngine;
 import net.minecraft.src.EntityPlayer;
 import net.minecraft.src.InventoryPlayer;
 import net.minecraft.src.Slot;

common/buildcraft/energy/gui/GuiCombustionEngine.java

@@ -7,14 +7,13 @@
  * http://www.mod-buildcraft.com/MMPL-1.0.txt
  */
 
-package buildcraft.energy;
+package buildcraft.energy.gui;
 
 import net.minecraft.src.Block;
 import net.minecraft.src.InventoryPlayer;
 import net.minecraft.src.Item;
 
 import net.minecraftforge.client.ForgeHooksClient;
-import net.minecraftforge.client.MinecraftForgeClient;
 
 import org.lwjgl.opengl.GL11;
 

common/buildcraft/energy/gui/GuiEngine.java

@@ -1,8 +1,8 @@
-package buildcraft.energy;
+package buildcraft.energy.gui;
 
-import buildcraft.core.BuildCraftContainer;
 import buildcraft.core.DefaultProps;
-import buildcraft.core.GuiBuildCraft;
+import buildcraft.core.gui.BuildCraftContainer;
+import buildcraft.core.gui.GuiBuildCraft;
 import buildcraft.core.utils.StringUtil;
 import buildcraft.energy.Engine;
 import buildcraft.energy.TileEngine;

common/buildcraft/energy/gui/GuiSteamEngine.java

@@ -7,7 +7,7 @@
  * http://www.mod-buildcraft.com/MMPL-1.0.txt
  */
 
-package buildcraft.energy;
+package buildcraft.energy.gui;
 
 import net.minecraft.src.InventoryPlayer;
 

common/buildcraft/energy/render/RenderEngine.java

@@ -7,7 +7,7 @@
  * http://www.mod-buildcraft.com/MMPL-1.0.txt
  */
 
-package buildcraft.energy;
+package buildcraft.energy.render;
 
 import net.minecraft.src.ModelBase;
 import net.minecraft.src.ModelRenderer;

common/buildcraft/energy/render/TextureFuelFX.java

@@ -7,10 +7,10 @@
  * http://www.mod-buildcraft.com/MMPL-1.0.txt
  */
 
-package buildcraft.energy;
+package buildcraft.energy.render;
 
 import buildcraft.BuildCraftEnergy;
-import buildcraft.core.TextureLiquidsFX;
+import buildcraft.core.render.TextureLiquidsFX;
 
 
 public class TextureFuelFX extends TextureLiquidsFX {

common/buildcraft/energy/render/TextureOilFX.java

@@ -7,10 +7,10 @@
  * http://www.mod-buildcraft.com/MMPL-1.0.txt
  */
 
-package buildcraft.energy;
+package buildcraft.energy.render;
 
 import buildcraft.BuildCraftEnergy;
-import buildcraft.core.TextureLiquidsFX;
+import buildcraft.core.render.TextureLiquidsFX;
 
 
 public class TextureOilFX extends TextureLiquidsFX {

common/buildcraft/energy/render/TextureOilFlowFX.java

@@ -7,7 +7,7 @@
  * http://www.mod-buildcraft.com/MMPL-1.0.txt
  */
 
-package buildcraft.energy;
+package buildcraft.energy.render;
 
 import net.minecraft.src.RenderEngine;
 

common/buildcraft/factory/gui/ContainerAutoWorkbench.java

@@ -7,10 +7,11 @@
  * http://www.mod-buildcraft.com/MMPL-1.0.txt
  */
 
-package buildcraft.factory;
+package buildcraft.factory.gui;
 
-import buildcraft.core.BuildCraftContainer;
 import buildcraft.core.CoreProxy;
+import buildcraft.core.gui.BuildCraftContainer;
+import buildcraft.factory.TileAutoWorkbench;
 import net.minecraft.src.AchievementList;
 import net.minecraft.src.Block;
 import net.minecraft.src.EntityPlayer;

common/buildcraft/factory/gui/ContainerHopper.java

@@ -1,6 +1,7 @@
-package buildcraft.factory;
+package buildcraft.factory.gui;
 
-import buildcraft.core.BuildCraftContainer;
+import buildcraft.core.gui.BuildCraftContainer;
+import buildcraft.factory.TileHopper;
 import net.minecraft.src.EntityPlayer;
 import net.minecraft.src.IInventory;
 import net.minecraft.src.InventoryPlayer;

common/buildcraft/factory/gui/ContainerRefinery.java

@@ -6,13 +6,14 @@
  * License 1.0, or MMPL. Please check the contents of the license located in
  * http://www.mod-buildcraft.com/MMPL-1.0.txt
  */
-package buildcraft.factory;
+package buildcraft.factory.gui;
 
-import buildcraft.core.BuildCraftContainer;
 import buildcraft.core.CoreProxy;
+import buildcraft.core.gui.BuildCraftContainer;
 import buildcraft.core.network.PacketIds;
 import buildcraft.core.network.PacketPayload;
 import buildcraft.core.network.PacketUpdate;
+import buildcraft.factory.TileRefinery;
 import net.minecraft.src.EntityPlayer;
 import net.minecraft.src.ICrafting;
 import net.minecraft.src.InventoryPlayer;

common/buildcraft/factory/gui/GuiAutoCrafting.java

@@ -7,16 +7,15 @@
  * http://www.mod-buildcraft.com/MMPL-1.0.txt
  */
 
-package buildcraft.factory;
+package buildcraft.factory.gui;
 
 import net.minecraft.src.InventoryPlayer;
 import net.minecraft.src.World;
 
 import org.lwjgl.opengl.GL11;
 
-import buildcraft.core.GuiBuildCraft;
+import buildcraft.core.gui.GuiBuildCraft;
 import buildcraft.core.utils.StringUtil;
-import buildcraft.factory.ContainerAutoWorkbench;
 import buildcraft.factory.TileAutoWorkbench;
 
 public class GuiAutoCrafting extends GuiBuildCraft {

common/buildcraft/factory/gui/GuiHopper.java

@@ -1,4 +1,4 @@
-package buildcraft.factory;
+package buildcraft.factory.gui;
 
 import net.minecraft.src.GuiContainer;
 import net.minecraft.src.InventoryPlayer;
@@ -6,7 +6,6 @@ import net.minecraft.src.InventoryPlayer;
 import org.lwjgl.opengl.GL11;
 
 import buildcraft.core.DefaultProps;
-import buildcraft.factory.ContainerHopper;
 import buildcraft.factory.TileHopper;
 
 public class GuiHopper extends GuiContainer {

common/buildcraft/factory/gui/GuiRefinery.java

@@ -7,7 +7,7 @@
  * http://www.mod-buildcraft.com/MMPL-1.0.txt
  */
 
-package buildcraft.factory;
+package buildcraft.factory.gui;
 
 import net.minecraft.src.InventoryPlayer;
 import net.minecraft.src.ItemStack;
@@ -19,9 +19,8 @@ import buildcraft.api.liquids.LiquidManager;
 import buildcraft.api.liquids.LiquidStack;
 import buildcraft.api.recipes.RefineryRecipe;
 import buildcraft.core.DefaultProps;
-import buildcraft.core.GuiAdvancedInterface;
+import buildcraft.core.gui.GuiAdvancedInterface;
 import buildcraft.core.utils.StringUtil;
-import buildcraft.factory.ContainerRefinery;
 import buildcraft.factory.TileRefinery;
 
 public class GuiRefinery extends GuiAdvancedInterface {

common/buildcraft/factory/render/ModelFrustum.java

@@ -1,4 +1,4 @@
-package buildcraft.factory;
+package buildcraft.factory.render;
 
 import net.minecraft.src.ModelRenderer;
 import net.minecraft.src.PositionTextureVertex;

common/buildcraft/factory/render/RenderHopper.java

@@ -1,4 +1,4 @@
-package buildcraft.factory;
+package buildcraft.factory.render;
 
 import net.minecraft.src.ModelBase;
 import net.minecraft.src.ModelRenderer;
@@ -6,7 +6,6 @@ import net.minecraft.src.Tessellator;
 import net.minecraft.src.TileEntity;
 import net.minecraft.src.TileEntitySpecialRenderer;
 import net.minecraftforge.client.ForgeHooksClient;
-import net.minecraftforge.client.MinecraftForgeClient;
 
 import org.lwjgl.opengl.GL11;
 

common/buildcraft/factory/render/RenderRefinery.java

@@ -7,7 +7,7 @@
  * http://www.mod-buildcraft.com/MMPL-1.0.txt
  */
 
-package buildcraft.factory;
+package buildcraft.factory.render;
 
 import java.util.HashMap;
 
@@ -21,14 +21,13 @@ import net.minecraft.src.TileEntitySpecialRenderer;
 import net.minecraft.src.World;
 
 import net.minecraftforge.client.ForgeHooksClient;
-import net.minecraftforge.client.MinecraftForgeClient;
 
 import org.lwjgl.opengl.GL11;
 
 import buildcraft.core.DefaultProps;
 import buildcraft.core.IInventoryRenderer;
-import buildcraft.core.RenderEntityBlock;
-import buildcraft.core.RenderEntityBlock.BlockInterface;
+import buildcraft.core.render.RenderEntityBlock;
+import buildcraft.core.render.RenderEntityBlock.BlockInterface;
 import buildcraft.factory.TileRefinery;
 
 public class RenderRefinery extends TileEntitySpecialRenderer implements IInventoryRenderer {

common/buildcraft/factory/render/RenderTank.java

@@ -7,7 +7,7 @@
  * http://www.mod-buildcraft.com/MMPL-1.0.txt
  */
 
-package buildcraft.factory;
+package buildcraft.factory.render;
 
 import java.util.HashMap;
 
@@ -19,14 +19,13 @@ import net.minecraft.src.TileEntitySpecialRenderer;
 import net.minecraft.src.World;
 
 import net.minecraftforge.client.ForgeHooksClient;
-import net.minecraftforge.client.MinecraftForgeClient;
 
 import org.lwjgl.opengl.GL11;
 
 import buildcraft.api.liquids.LiquidStack;
-import buildcraft.core.DefaultProps;
-import buildcraft.core.RenderEntityBlock;
-import buildcraft.core.RenderEntityBlock.BlockInterface;
+import buildcraft.core.render.RenderEntityBlock;
+import buildcraft.core.render.RenderEntityBlock.BlockInterface;
+import buildcraft.factory.TileTank;
 
 public class RenderTank extends TileEntitySpecialRenderer {
 

common/buildcraft/silicon/gui/ContainerAssemblyTable.java

@@ -7,9 +7,9 @@
  * http://www.mod-buildcraft.com/MMPL-1.0.txt
  */
 
-package buildcraft.silicon;
+package buildcraft.silicon.gui;
 
-import buildcraft.core.BuildCraftContainer;
+import buildcraft.core.gui.BuildCraftContainer;
 import buildcraft.factory.TileAssemblyTable;
 import net.minecraft.src.EntityPlayer;
 import net.minecraft.src.ICrafting;

common/buildcraft/silicon/gui/GuiAssemblyTable.java

@@ -7,7 +7,7 @@
  * http://www.mod-buildcraft.com/MMPL-1.0.txt
  */
 
-package buildcraft.silicon;
+package buildcraft.silicon.gui;
 
 import java.util.Iterator;
 import java.util.LinkedList;
@@ -20,7 +20,7 @@ import org.lwjgl.opengl.GL11;
 import buildcraft.api.recipes.AssemblyRecipe;
 import buildcraft.core.CoreProxy;
 import buildcraft.core.DefaultProps;
-import buildcraft.core.GuiAdvancedInterface;
+import buildcraft.core.gui.GuiAdvancedInterface;
 import buildcraft.core.network.PacketCoordinates;
 import buildcraft.core.network.PacketIds;
 import buildcraft.core.network.PacketPayload;
@@ -28,7 +28,6 @@ import buildcraft.core.network.PacketUpdate;
 import buildcraft.core.utils.StringUtil;
 import buildcraft.factory.TileAssemblyTable;
 import buildcraft.factory.TileAssemblyTable.SelectionMessage;
-import buildcraft.silicon.ContainerAssemblyTable;
 
 public class GuiAssemblyTable extends GuiAdvancedInterface {
 

common/buildcraft/transport/Pipe.java

@@ -15,7 +15,6 @@ import java.util.Map;
 import java.util.Random;
 
 import buildcraft.BuildCraftTransport;
-import buildcraft.api.core.BuildCraftAPI;
 import buildcraft.api.core.Orientations;
 import buildcraft.api.core.SafeTimeTracker;
 import buildcraft.api.gates.Action;
@@ -28,7 +27,6 @@ import buildcraft.api.gates.Trigger;
 import buildcraft.api.gates.TriggerParameter;
 import buildcraft.api.transport.IPipe;
 import buildcraft.core.ActionRedstoneOutput;
-import buildcraft.core.CoreProxy;
 import buildcraft.core.IDropControlInventory;
 import buildcraft.core.Utils;
 import buildcraft.core.network.IndexInPayload;
@@ -72,9 +70,9 @@ public abstract class Pipe implements IPipe, IDropControlInventory {
 	@SuppressWarnings("rawtypes")
 	private static Map<Class, TilePacketWrapper> networkWrappers = new HashMap<Class, TilePacketWrapper>();
 
-	ITrigger[] activatedTriggers = new Trigger[8];
-	ITriggerParameter[] triggerParameters = new ITriggerParameter[8];
-	IAction[] activatedActions = new Action[8];
+	public ITrigger[] activatedTriggers = new Trigger[8];
+	public ITriggerParameter[] triggerParameters = new ITriggerParameter[8];
+	public IAction[] activatedActions = new Action[8];
 
 	@TileNetworkData(intKind = TileNetworkData.UNSIGNED_BYTE)
 	public boolean broadcastSignal[] = new boolean[] { false, false, false, false };

common/buildcraft/transport/gui/CraftingDiamondPipe.java

@@ -7,14 +7,14 @@
  * http://www.mod-buildcraft.com/MMPL-1.0.txt
  */
 
-package buildcraft.transport;
+package buildcraft.transport.gui;
 
-import buildcraft.core.BuildCraftContainer;
+import buildcraft.core.gui.BuildCraftContainer;
 import net.minecraft.src.EntityPlayer;
 import net.minecraft.src.IInventory;
 import net.minecraft.src.Slot;
 
-class CraftingDiamondPipe extends BuildCraftContainer {
+public class CraftingDiamondPipe extends BuildCraftContainer {
 
 	IInventory playerIInventory;
 	IInventory filterIInventory;

common/buildcraft/transport/gui/CraftingGateInterface.java

@@ -7,27 +7,25 @@
  * http://www.mod-buildcraft.com/MMPL-1.0.txt
  */
 
-package buildcraft.transport;
+package buildcraft.transport.gui;
 
 import java.util.Iterator;
 import java.util.LinkedList;
 
-import buildcraft.api.core.BuildCraftAPI;
 import buildcraft.api.core.Orientations;
 import buildcraft.api.core.Position;
-import buildcraft.api.gates.Action;
 import buildcraft.api.gates.ActionManager;
 import buildcraft.api.gates.IAction;
 import buildcraft.api.gates.ITrigger;
 import buildcraft.api.gates.ITriggerParameter;
-import buildcraft.api.gates.Trigger;
 import buildcraft.api.gates.TriggerParameter;
-import buildcraft.core.BuildCraftContainer;
 import buildcraft.core.CoreProxy;
+import buildcraft.core.gui.BuildCraftContainer;
 import buildcraft.core.network.PacketCoordinates;
 import buildcraft.core.network.PacketIds;
 import buildcraft.core.network.PacketPayload;
 import buildcraft.core.network.PacketUpdate;
+import buildcraft.transport.Pipe;
 
 import net.minecraft.src.Block;
 import net.minecraft.src.EntityPlayer;
@@ -320,6 +318,7 @@ public class CraftingGateInterface extends BuildCraftContainer {
 			break;
 		case OR_4:
 		case AND_4:
+		default:
 			positions = 8;
 			break;
 		}

common/buildcraft/transport/gui/GuiDiamondPipe.java

@@ -7,7 +7,7 @@
  * http://www.mod-buildcraft.com/MMPL-1.0.txt
  */
 
-package buildcraft.transport;
+package buildcraft.transport.gui;
 
 import net.minecraft.src.IInventory;
 import net.minecraft.src.ItemStack;
@@ -16,11 +16,10 @@ import org.lwjgl.opengl.GL11;
 
 import buildcraft.core.CoreProxy;
 import buildcraft.core.DefaultProps;
-import buildcraft.core.GuiAdvancedInterface;
+import buildcraft.core.gui.GuiAdvancedInterface;
 import buildcraft.core.network.PacketIds;
 import buildcraft.core.network.PacketSlotChange;
 import buildcraft.core.utils.StringUtil;
-import buildcraft.transport.CraftingDiamondPipe;
 import buildcraft.transport.PipeLogicDiamond;
 import buildcraft.transport.TileGenericPipe;
 

common/buildcraft/transport/gui/GuiGateInterface.java

@@ -7,7 +7,7 @@
  * http://www.mod-buildcraft.com/MMPL-1.0.txt
  */
 
-package buildcraft.transport;
+package buildcraft.transport.gui;
 
 import java.util.Iterator;
 
@@ -21,9 +21,8 @@ import buildcraft.api.gates.IAction;
 import buildcraft.api.gates.ITrigger;
 import buildcraft.api.gates.ITriggerParameter;
 import buildcraft.api.gates.Trigger;
-import buildcraft.core.GuiAdvancedInterface;
+import buildcraft.core.gui.GuiAdvancedInterface;
 import buildcraft.core.utils.StringUtil;
-import buildcraft.transport.CraftingGateInterface;
 import buildcraft.transport.Pipe;
 import buildcraft.transport.Gate.GateKind;
 

common/buildcraft/transport/render/FacadeItemRenderer.java

@@ -1,4 +1,4 @@
-package buildcraft.transport;
+package buildcraft.transport.render;
 
 import org.lwjgl.opengl.GL11;
 

common/buildcraft/transport/render/PipeItemRenderer.java

@@ -1,4 +1,4 @@
-package buildcraft.transport;
+package buildcraft.transport.render;
 
 import org.lwjgl.opengl.GL11;
 

common/buildcraft/transport/render/PipeWorldRenderer.java

@@ -1,4 +1,4 @@
-package buildcraft.transport;
+package buildcraft.transport.render;
 
 
 import java.util.ArrayList;
@@ -16,6 +16,7 @@ import buildcraft.api.transport.IPipe;
 import buildcraft.api.transport.IPipe.WireColor;
 import buildcraft.core.DefaultProps;
 import buildcraft.core.Utils;
+import buildcraft.transport.IPipeRenderState;
 import buildcraft.transport.PipeRenderState;
 
 import net.minecraft.src.Block;

common/buildcraft/transport/render/RenderPipe.java

@@ -7,7 +7,7 @@
  * http://www.mod-buildcraft.com/MMPL-1.0.txt
  */
 
-package buildcraft.transport;
+package buildcraft.transport.render;
 
 import java.util.HashMap;
 import java.util.Random;
@@ -39,9 +39,9 @@ import buildcraft.api.liquids.ILiquidTank;
 import buildcraft.api.liquids.LiquidStack;
 import buildcraft.api.transport.IPipedItem;
 import buildcraft.core.DefaultProps;
-import buildcraft.core.RenderEntityBlock;
 import buildcraft.core.Utils;
-import buildcraft.core.RenderEntityBlock.BlockInterface;
+import buildcraft.core.render.RenderEntityBlock;
+import buildcraft.core.render.RenderEntityBlock.BlockInterface;
 import buildcraft.transport.EntityData;
 import buildcraft.transport.Pipe;
 import buildcraft.transport.PipeTransportItems;

common/buildcraft/transport/render/TileEntityPickupFX.java

@@ -7,7 +7,7 @@
  * http://www.mod-buildcraft.com/MMPL-1.0.txt
  */
 
-package buildcraft.transport;
+package buildcraft.transport.render;
 
 import net.minecraft.src.Entity;
 import net.minecraft.src.EntityFX;