tilera/Mekanism-tilera-Edition
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity

Screw it, package organization (sorry, that's an API update)

Browse source
This commit is contained in:
Aidan C. Brady 2013-08-26 18:49:32 -04:00
parent 13a47bbc96
commit 6af0b1abd7
257 changed files with 1061 additions and 554 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
common/mekanism/api/IStorageTank.java
View file

@ -1,5 +1,7 @@
package mekanism.api; package mekanism.api;
import mekanism.api.gas.EnumGas;
import mekanism.api.gas.IGasStorage;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
/** /**

1
common/mekanism/api/RecipeHelper.java
View file

@ -2,6 +2,7 @@ package mekanism.api;
import java.lang.reflect.Method; import java.lang.reflect.Method;
import mekanism.api.infuse.InfusionInput;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
/** /**

2
common/mekanism/api/EnergizedItemManager.java → common/mekanism/api/energy/EnergizedItemManager.java
View file

@ -1,4 +1,4 @@
package mekanism.api; package mekanism.api.energy;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;

2
common/mekanism/api/ICableOutputter.java → common/mekanism/api/energy/ICableOutputter.java
View file

@ -1,4 +1,4 @@
package mekanism.api; package mekanism.api.energy;
import net.minecraftforge.common.ForgeDirection; import net.minecraftforge.common.ForgeDirection;

2
common/mekanism/api/IEnergizedItem.java → common/mekanism/api/energy/IEnergizedItem.java
View file

@ -1,4 +1,4 @@
package mekanism.api; package mekanism.api.energy;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;

2
common/mekanism/api/IStrictEnergyAcceptor.java → common/mekanism/api/energy/IStrictEnergyAcceptor.java
View file

@ -1,4 +1,4 @@
package mekanism.api; package mekanism.api.energy;
import net.minecraftforge.common.ForgeDirection; import net.minecraftforge.common.ForgeDirection;

2
common/mekanism/api/IStrictEnergyStorage.java → common/mekanism/api/energy/IStrictEnergyStorage.java
View file

@ -1,4 +1,4 @@
package mekanism.api; package mekanism.api.energy;
/** /**
* Mekanism-specific energy storage for TileEntities, already implemented in IStrictEnergyAcceptor. * Mekanism-specific energy storage for TileEntities, already implemented in IStrictEnergyAcceptor.

2
common/mekanism/api/EnumGas.java → common/mekanism/api/gas/EnumGas.java
View file

@ -1,4 +1,4 @@
package mekanism.api; package mekanism.api.gas;
import net.minecraft.util.Icon; import net.minecraft.util.Icon;
import net.minecraft.util.ResourceLocation; import net.minecraft.util.ResourceLocation;

5
common/mekanism/api/GasNetwork.java → common/mekanism/api/gas/GasNetwork.java
View file

@ -1,4 +1,4 @@
package mekanism.api; package mekanism.api.gas;
import java.util.Arrays; import java.util.Arrays;
import java.util.Collection; import java.util.Collection;
@ -8,6 +8,9 @@ import java.util.Iterator;
import java.util.List; import java.util.List;
import java.util.Set; import java.util.Set;
import mekanism.api.transmitters.DynamicNetwork;
import mekanism.api.transmitters.ITransmitter;
import mekanism.api.transmitters.TransmissionType;
import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntity;
import net.minecraftforge.common.ForgeDirection; import net.minecraftforge.common.ForgeDirection;
import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.common.MinecraftForge;

6
common/mekanism/api/GasTransmission.java → common/mekanism/api/gas/GasTransmission.java
View file

@ -1,7 +1,11 @@
package mekanism.api; package mekanism.api.gas;
import java.util.HashSet; import java.util.HashSet;
import java.util.Set; import java.util.Set;
import mekanism.api.Object3D;
import mekanism.api.transmitters.ITransmitter;
import mekanism.api.transmitters.TransmissionType;
import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntity;
import net.minecraftforge.common.ForgeDirection; import net.minecraftforge.common.ForgeDirection;

2
common/mekanism/api/IGasAcceptor.java → common/mekanism/api/gas/IGasAcceptor.java
View file

@ -1,4 +1,4 @@
package mekanism.api; package mekanism.api.gas;
import net.minecraftforge.common.ForgeDirection; import net.minecraftforge.common.ForgeDirection;

2
common/mekanism/api/IGasStorage.java → common/mekanism/api/gas/IGasStorage.java
View file

@ -1,4 +1,4 @@
package mekanism.api; package mekanism.api.gas;
/** /**
* Implement this if your tile entity can store some form of gas. If you want your item to store gas, implement IStorageTank * Implement this if your tile entity can store some form of gas. If you want your item to store gas, implement IStorageTank

3
common/mekanism/api/IGasTransmitter.java → common/mekanism/api/gas/IGasTransmitter.java
View file

@ -1,5 +1,6 @@
package mekanism.api; package mekanism.api.gas;
import mekanism.api.transmitters.ITransmitter;
import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntity;
public interface IGasTransmitter extends ITransmitter<GasNetwork> public interface IGasTransmitter extends ITransmitter<GasNetwork>

2
common/mekanism/api/ITubeConnection.java → common/mekanism/api/gas/ITubeConnection.java
View file

@ -1,4 +1,4 @@
package mekanism.api; package mekanism.api.gas;
import net.minecraftforge.common.ForgeDirection; import net.minecraftforge.common.ForgeDirection;

2
common/mekanism/api/InfuseObject.java → common/mekanism/api/infuse/InfuseObject.java
View file

@ -1,4 +1,4 @@
package mekanism.api; package mekanism.api.infuse;
/** /**
* InfuseObject - an object associated with an ItemStack that can modify a Metallurgic Infuser's internal infuse. * InfuseObject - an object associated with an ItemStack that can modify a Metallurgic Infuser's internal infuse.

2
common/mekanism/api/InfuseRegistry.java → common/mekanism/api/infuse/InfuseRegistry.java
View file

@ -1,4 +1,4 @@
package mekanism.api; package mekanism.api.infuse;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;

2
common/mekanism/api/InfuseType.java → common/mekanism/api/infuse/InfuseType.java
View file

@ -1,4 +1,4 @@
package mekanism.api; package mekanism.api.infuse;
import net.minecraft.util.ResourceLocation; import net.minecraft.util.ResourceLocation;

2
common/mekanism/api/InfusionInput.java → common/mekanism/api/infuse/InfusionInput.java
View file

@ -1,4 +1,4 @@
package mekanism.api; package mekanism.api.infuse;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;

2
common/mekanism/api/InfusionOutput.java → common/mekanism/api/infuse/InfusionOutput.java
View file

@ -1,4 +1,4 @@
package mekanism.api; package mekanism.api.infuse;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;

3
common/mekanism/api/DynamicNetwork.java → common/mekanism/api/transmitters/DynamicNetwork.java
View file

@ -1,4 +1,4 @@
package mekanism.api; package mekanism.api.transmitters;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
@ -10,6 +10,7 @@ import java.util.Map;
import java.util.NoSuchElementException; import java.util.NoSuchElementException;
import java.util.Set; import java.util.Set;
import mekanism.api.Object3D;
import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.World; import net.minecraft.world.World;
import net.minecraftforge.common.ForgeDirection; import net.minecraftforge.common.ForgeDirection;

2
common/mekanism/api/ITransmitter.java → common/mekanism/api/transmitters/ITransmitter.java
View file

@ -1,4 +1,4 @@
package mekanism.api; package mekanism.api.transmitters;
import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntity;

2
common/mekanism/api/ITransmitterNetwork.java → common/mekanism/api/transmitters/ITransmitterNetwork.java
View file

@ -1,4 +1,4 @@
package mekanism.api; package mekanism.api.transmitters;
import java.util.Set; import java.util.Set;

3
common/mekanism/api/TransmissionType.java → common/mekanism/api/transmitters/TransmissionType.java
View file

@ -1,5 +1,6 @@
package mekanism.api; package mekanism.api.transmitters;
import mekanism.api.gas.IGasTransmitter;
import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntity;
public enum TransmissionType public enum TransmissionType

2
common/mekanism/api/TransmitterNetworkRegistry.java → common/mekanism/api/transmitters/TransmitterNetworkRegistry.java
View file

@ -1,4 +1,4 @@
package mekanism.api; package mekanism.api.transmitters;
import java.util.EnumSet; import java.util.EnumSet;
import java.util.HashSet; import java.util.HashSet;

4
common/mekanism/client/ClientPlayerTickHandler.java
View file

@ -3,10 +3,10 @@ package mekanism.client;
import java.util.EnumSet; import java.util.EnumSet;
import mekanism.api.EnumColor; import mekanism.api.EnumColor;
import mekanism.common.ItemConfigurator;
import mekanism.common.ItemElectricBow;
import mekanism.common.PacketHandler; import mekanism.common.PacketHandler;
import mekanism.common.PacketHandler.Transmission; import mekanism.common.PacketHandler.Transmission;
import mekanism.common.item.ItemConfigurator;
import mekanism.common.item.ItemElectricBow;
import mekanism.common.network.PacketConfiguratorState; import mekanism.common.network.PacketConfiguratorState;
import mekanism.common.network.PacketElectricBowState; import mekanism.common.network.PacketElectricBowState;
import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayer;

101
common/mekanism/client/ClientProxy.java
View file

@ -4,42 +4,83 @@ package mekanism.client;
import java.io.File; import java.io.File;
import java.util.HashMap; import java.util.HashMap;
import mekanism.api.EnumGas; import mekanism.api.gas.EnumGas;
import mekanism.client.gui.GuiCombiner;
import mekanism.client.gui.GuiControlPanel;
import mekanism.client.gui.GuiCredits;
import mekanism.client.gui.GuiCrusher;
import mekanism.client.gui.GuiDynamicTank;
import mekanism.client.gui.GuiElectricChest;
import mekanism.client.gui.GuiElectricPump;
import mekanism.client.gui.GuiEnergizedSmelter;
import mekanism.client.gui.GuiEnergyCube;
import mekanism.client.gui.GuiEnrichmentChamber;
import mekanism.client.gui.GuiFactory;
import mekanism.client.gui.GuiGasTank;
import mekanism.client.gui.GuiMetallurgicInfuser;
import mekanism.client.gui.GuiOsmiumCompressor;
import mekanism.client.gui.GuiPasswordEnter;
import mekanism.client.gui.GuiPasswordModify;
import mekanism.client.gui.GuiPortableTeleporter;
import mekanism.client.gui.GuiPurificationChamber;
import mekanism.client.gui.GuiRobitCrafting;
import mekanism.client.gui.GuiRobitInventory;
import mekanism.client.gui.GuiRobitMain;
import mekanism.client.gui.GuiRobitRepair;
import mekanism.client.gui.GuiRobitSmelting;
import mekanism.client.gui.GuiStopwatch;
import mekanism.client.gui.GuiTeleporter;
import mekanism.client.gui.GuiTheoreticalElementizer;
import mekanism.client.gui.GuiWeatherOrb;
import mekanism.client.render.RenderChargepad;
import mekanism.client.render.RenderConfigurableMachine;
import mekanism.client.render.RenderDynamicTank;
import mekanism.client.render.RenderElectricChest;
import mekanism.client.render.RenderElectricPump;
import mekanism.client.render.RenderLogisticalTransporter;
import mekanism.client.render.RenderMechanicalPipe;
import mekanism.client.render.RenderMetallurgicInfuser;
import mekanism.client.render.RenderObsidianTNT;
import mekanism.client.render.RenderPressurizedTube;
import mekanism.client.render.RenderRobit;
import mekanism.client.render.RenderTheoreticalElementizer;
import mekanism.client.render.RenderTickHandler;
import mekanism.client.render.RenderUniversalCable;
import mekanism.common.CommonProxy; import mekanism.common.CommonProxy;
import mekanism.common.EntityObsidianTNT; import mekanism.common.EntityObsidianTNT;
import mekanism.common.EntityRobit; import mekanism.common.EntityRobit;
import mekanism.common.IElectricChest; import mekanism.common.IElectricChest;
import mekanism.common.InventoryElectricChest;
import mekanism.common.ItemPortableTeleporter;
import mekanism.common.Mekanism; import mekanism.common.Mekanism;
import mekanism.common.MekanismUtils; import mekanism.common.MekanismUtils;
import mekanism.common.MekanismUtils.ResourceType; import mekanism.common.MekanismUtils.ResourceType;
import mekanism.common.TileEntityAdvancedElectricMachine; import mekanism.common.inventory.InventoryElectricChest;
import mekanism.common.TileEntityAdvancedFactory; import mekanism.common.item.ItemPortableTeleporter;
import mekanism.common.TileEntityChargepad; import mekanism.common.tileentity.TileEntityAdvancedElectricMachine;
import mekanism.common.TileEntityCombiner; import mekanism.common.tileentity.TileEntityAdvancedFactory;
import mekanism.common.TileEntityControlPanel; import mekanism.common.tileentity.TileEntityChargepad;
import mekanism.common.TileEntityCrusher; import mekanism.common.tileentity.TileEntityCombiner;
import mekanism.common.TileEntityDynamicTank; import mekanism.common.tileentity.TileEntityControlPanel;
import mekanism.common.TileEntityDynamicValve; import mekanism.common.tileentity.TileEntityCrusher;
import mekanism.common.TileEntityElectricChest; import mekanism.common.tileentity.TileEntityDynamicTank;
import mekanism.common.TileEntityElectricMachine; import mekanism.common.tileentity.TileEntityDynamicValve;
import mekanism.common.TileEntityElectricPump; import mekanism.common.tileentity.TileEntityElectricChest;
import mekanism.common.TileEntityEliteFactory; import mekanism.common.tileentity.TileEntityElectricMachine;
import mekanism.common.TileEntityEnergizedSmelter; import mekanism.common.tileentity.TileEntityElectricPump;
import mekanism.common.TileEntityEnergyCube; import mekanism.common.tileentity.TileEntityEliteFactory;
import mekanism.common.TileEntityEnrichmentChamber; import mekanism.common.tileentity.TileEntityEnergizedSmelter;
import mekanism.common.TileEntityFactory; import mekanism.common.tileentity.TileEntityEnergyCube;
import mekanism.common.TileEntityGasTank; import mekanism.common.tileentity.TileEntityEnrichmentChamber;
import mekanism.common.TileEntityLogisticalTransporter; import mekanism.common.tileentity.TileEntityFactory;
import mekanism.common.TileEntityMechanicalPipe; import mekanism.common.tileentity.TileEntityGasTank;
import mekanism.common.TileEntityMetallurgicInfuser; import mekanism.common.tileentity.TileEntityLogisticalTransporter;
import mekanism.common.TileEntityOsmiumCompressor; import mekanism.common.tileentity.TileEntityMechanicalPipe;
import mekanism.common.TileEntityPressurizedTube; import mekanism.common.tileentity.TileEntityMetallurgicInfuser;
import mekanism.common.TileEntityPurificationChamber; import mekanism.common.tileentity.TileEntityOsmiumCompressor;
import mekanism.common.TileEntityTeleporter; import mekanism.common.tileentity.TileEntityPressurizedTube;
import mekanism.common.TileEntityTheoreticalElementizer; import mekanism.common.tileentity.TileEntityPurificationChamber;
import mekanism.common.TileEntityUniversalCable; import mekanism.common.tileentity.TileEntityTeleporter;
import mekanism.common.tileentity.TileEntityTheoreticalElementizer;
import mekanism.common.tileentity.TileEntityUniversalCable;
import net.minecraft.client.Minecraft; import net.minecraft.client.Minecraft;
import net.minecraft.client.gui.GuiScreen; import net.minecraft.client.gui.GuiScreen;
import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayer;
@ -205,7 +246,7 @@ public class ClientProxy extends CommonProxy
//Register block handlers //Register block handlers
RenderingRegistry.registerBlockHandler(new MachineRenderingHandler()); RenderingRegistry.registerBlockHandler(new MachineRenderingHandler());
RenderingRegistry.registerBlockHandler(new TransmitterRenderer()); RenderingRegistry.registerBlockHandler(new TransmitterRenderingHandler());
RenderingRegistry.registerBlockHandler(new BasicRenderingHandler()); RenderingRegistry.registerBlockHandler(new BasicRenderingHandler());
if(!EnumGas.HYDROGEN.hasTexture()) if(!EnumGas.HYDROGEN.hasTexture())

6
common/mekanism/client/EnergyClientUpdate.java
View file

@ -2,10 +2,10 @@ package mekanism.client;
import java.util.List; import java.util.List;
import mekanism.api.DynamicNetwork.NetworkFinder; import mekanism.api.transmitters.TransmissionType;
import mekanism.api.transmitters.DynamicNetwork.NetworkFinder;
import mekanism.api.Object3D; import mekanism.api.Object3D;
import mekanism.api.TransmissionType; import mekanism.common.tileentity.TileEntityUniversalCable;
import mekanism.common.TileEntityUniversalCable;
import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.World; import net.minecraft.world.World;

6
common/mekanism/client/FluidClientUpdate.java
View file

@ -2,10 +2,10 @@ package mekanism.client;
import java.util.List; import java.util.List;
import mekanism.api.DynamicNetwork.NetworkFinder; import mekanism.api.transmitters.TransmissionType;
import mekanism.api.transmitters.DynamicNetwork.NetworkFinder;
import mekanism.api.Object3D; import mekanism.api.Object3D;
import mekanism.api.TransmissionType; import mekanism.common.tileentity.TileEntityMechanicalPipe;
import mekanism.common.TileEntityMechanicalPipe;
import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.World; import net.minecraft.world.World;
import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidStack;

8
common/mekanism/client/GasClientUpdate.java
View file

@ -2,11 +2,11 @@ package mekanism.client;
import java.util.List; import java.util.List;
import mekanism.api.DynamicNetwork.NetworkFinder; import mekanism.api.gas.EnumGas;
import mekanism.api.EnumGas; import mekanism.api.transmitters.TransmissionType;
import mekanism.api.transmitters.DynamicNetwork.NetworkFinder;
import mekanism.api.Object3D; import mekanism.api.Object3D;
import mekanism.api.TransmissionType; import mekanism.common.tileentity.TileEntityPressurizedTube;
import mekanism.common.TileEntityPressurizedTube;
import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.World; import net.minecraft.world.World;

7
common/mekanism/client/ItemRenderingHandler.java
View file

@ -1,14 +1,15 @@
package mekanism.client; package mekanism.client;
import mekanism.common.BlockMachine.MachineType; import mekanism.client.model.ModelRobit;
import mekanism.common.IElectricChest; import mekanism.common.IElectricChest;
import mekanism.common.IEnergyCube; import mekanism.common.IEnergyCube;
import mekanism.common.ItemBlockMachine;
import mekanism.common.ItemRobit;
import mekanism.common.Mekanism; import mekanism.common.Mekanism;
import mekanism.common.MekanismUtils; import mekanism.common.MekanismUtils;
import mekanism.common.MekanismUtils.ResourceType; import mekanism.common.MekanismUtils.ResourceType;
import mekanism.common.Tier.EnergyCubeTier; import mekanism.common.Tier.EnergyCubeTier;
import mekanism.common.block.BlockMachine.MachineType;
import mekanism.common.item.ItemBlockMachine;
import mekanism.common.item.ItemRobit;
import net.minecraft.block.Block; import net.minecraft.block.Block;
import net.minecraft.client.Minecraft; import net.minecraft.client.Minecraft;
import net.minecraft.client.model.ModelChest; import net.minecraft.client.model.ModelChest;

6
common/mekanism/client/MachineRenderingHandler.java
View file

@ -1,7 +1,11 @@
package mekanism.client; package mekanism.client;
import mekanism.common.BlockMachine.MachineType; import mekanism.client.model.ModelChargepad;
import mekanism.client.model.ModelElectricPump;
import mekanism.client.model.ModelMetallurgicInfuser;
import mekanism.client.model.ModelTheoreticalElementizer;
import mekanism.common.MekanismUtils.ResourceType; import mekanism.common.MekanismUtils.ResourceType;
import mekanism.common.block.BlockMachine.MachineType;
import mekanism.common.Mekanism; import mekanism.common.Mekanism;
import mekanism.common.MekanismUtils; import mekanism.common.MekanismUtils;
import net.minecraft.block.Block; import net.minecraft.block.Block;

2
common/mekanism/client/ThreadClientUpdate.java
View file

@ -8,7 +8,7 @@ import java.net.URL;
import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly; import cpw.mods.fml.relauncher.SideOnly;
import mekanism.client.gui.GuiCredits;
import mekanism.common.Mekanism; import mekanism.common.Mekanism;
/** /**

3
common/mekanism/client/ThreadTankSparkle.java
View file

@ -6,10 +6,9 @@ import java.util.Set;
import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly; import cpw.mods.fml.relauncher.SideOnly;
import mekanism.api.Object3D; import mekanism.api.Object3D;
import mekanism.common.Mekanism; import mekanism.common.Mekanism;
import mekanism.common.TileEntityDynamicTank; import mekanism.common.tileentity.TileEntityDynamicTank;
import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.World; import net.minecraft.world.World;
import net.minecraftforge.common.ForgeDirection; import net.minecraftforge.common.ForgeDirection;

3
common/mekanism/client/TransmitterRenderer.java → common/mekanism/client/TransmitterRenderingHandler.java
View file

@ -1,5 +1,6 @@
package mekanism.client; package mekanism.client;
import mekanism.client.model.ModelTransmitter;
import mekanism.common.MekanismUtils; import mekanism.common.MekanismUtils;
import mekanism.common.MekanismUtils.ResourceType; import mekanism.common.MekanismUtils.ResourceType;
import net.minecraft.block.Block; import net.minecraft.block.Block;
@ -15,7 +16,7 @@ import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly; import cpw.mods.fml.relauncher.SideOnly;
@SideOnly(Side.CLIENT) @SideOnly(Side.CLIENT)
public class TransmitterRenderer implements ISimpleBlockRenderingHandler public class TransmitterRenderingHandler implements ISimpleBlockRenderingHandler
{ {
public ModelTransmitter transmitter = new ModelTransmitter(); public ModelTransmitter transmitter = new ModelTransmitter();

6
common/mekanism/client/GuiAdvancedElectricMachine.java → common/mekanism/client/gui/GuiAdvancedElectricMachine.java
View file

@ -1,7 +1,7 @@
package mekanism.client; package mekanism.client.gui;
import mekanism.common.ContainerAdvancedElectricMachine; import mekanism.common.inventory.container.ContainerAdvancedElectricMachine;
import mekanism.common.TileEntityAdvancedElectricMachine; import mekanism.common.tileentity.TileEntityAdvancedElectricMachine;
import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.entity.player.InventoryPlayer;
import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL11;

4
common/mekanism/client/GuiCombiner.java → common/mekanism/client/gui/GuiCombiner.java
View file

@ -1,8 +1,8 @@
package mekanism.client; package mekanism.client.gui;
import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly; import cpw.mods.fml.relauncher.SideOnly;
import mekanism.common.TileEntityAdvancedElectricMachine; import mekanism.common.tileentity.TileEntityAdvancedElectricMachine;
import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.entity.player.InventoryPlayer;
@SideOnly(Side.CLIENT) @SideOnly(Side.CLIENT)

4
common/mekanism/client/GuiControlPanel.java → common/mekanism/client/gui/GuiControlPanel.java
View file

@ -1,4 +1,4 @@
package mekanism.client; package mekanism.client.gui;
import mekanism.api.EnumColor; import mekanism.api.EnumColor;
import mekanism.api.IAccessibleGui; import mekanism.api.IAccessibleGui;
@ -7,8 +7,8 @@ import mekanism.common.MekanismUtils;
import mekanism.common.PacketHandler; import mekanism.common.PacketHandler;
import mekanism.common.MekanismUtils.ResourceType; import mekanism.common.MekanismUtils.ResourceType;
import mekanism.common.PacketHandler.Transmission; import mekanism.common.PacketHandler.Transmission;
import mekanism.common.TileEntityControlPanel;
import mekanism.common.network.PacketControlPanel; import mekanism.common.network.PacketControlPanel;
import mekanism.common.tileentity.TileEntityControlPanel;
import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiButton;
import net.minecraft.client.gui.GuiScreen; import net.minecraft.client.gui.GuiScreen;
import net.minecraft.client.gui.GuiTextField; import net.minecraft.client.gui.GuiTextField;

3
common/mekanism/client/GuiCredits.java → common/mekanism/client/gui/GuiCredits.java
View file

@ -1,6 +1,7 @@
package mekanism.client; package mekanism.client.gui;
import mekanism.api.EnumColor; import mekanism.api.EnumColor;
import mekanism.client.ThreadClientUpdate;
import mekanism.common.IModule; import mekanism.common.IModule;
import mekanism.common.Mekanism; import mekanism.common.Mekanism;
import mekanism.common.MekanismUtils; import mekanism.common.MekanismUtils;

4
common/mekanism/client/GuiCrusher.java → common/mekanism/client/gui/GuiCrusher.java
View file

@ -1,8 +1,8 @@
package mekanism.client; package mekanism.client.gui;
import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly; import cpw.mods.fml.relauncher.SideOnly;
import mekanism.common.TileEntityElectricMachine; import mekanism.common.tileentity.TileEntityElectricMachine;
import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.entity.player.InventoryPlayer;
@SideOnly(Side.CLIENT) @SideOnly(Side.CLIENT)

7
common/mekanism/client/GuiDynamicTank.java → common/mekanism/client/gui/GuiDynamicTank.java
View file

@ -1,9 +1,10 @@
package mekanism.client; package mekanism.client.gui;
import mekanism.common.ContainerDynamicTank; import mekanism.client.MekanismRenderer;
import mekanism.common.MekanismUtils; import mekanism.common.MekanismUtils;
import mekanism.common.MekanismUtils.ResourceType; import mekanism.common.MekanismUtils.ResourceType;
import mekanism.common.TileEntityDynamicTank; import mekanism.common.inventory.container.ContainerDynamicTank;
import mekanism.common.tileentity.TileEntityDynamicTank;
import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.client.gui.inventory.GuiContainer;
import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.entity.player.InventoryPlayer;
import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidRegistry;

9
common/mekanism/client/GuiElectricChest.java → common/mekanism/client/gui/GuiElectricChest.java
View file

@ -1,18 +1,18 @@
package mekanism.client; package mekanism.client.gui;
import mekanism.api.EnumColor; import mekanism.api.EnumColor;
import mekanism.api.IEnergizedItem;
import mekanism.api.Object3D; import mekanism.api.Object3D;
import mekanism.common.ContainerElectricChest; import mekanism.api.energy.IEnergizedItem;
import mekanism.common.IElectricChest; import mekanism.common.IElectricChest;
import mekanism.common.Mekanism; import mekanism.common.Mekanism;
import mekanism.common.MekanismUtils; import mekanism.common.MekanismUtils;
import mekanism.common.MekanismUtils.ResourceType; import mekanism.common.MekanismUtils.ResourceType;
import mekanism.common.PacketHandler; import mekanism.common.PacketHandler;
import mekanism.common.PacketHandler.Transmission; import mekanism.common.PacketHandler.Transmission;
import mekanism.common.TileEntityElectricChest; import mekanism.common.inventory.container.ContainerElectricChest;
import mekanism.common.network.PacketElectricChest; import mekanism.common.network.PacketElectricChest;
import mekanism.common.network.PacketElectricChest.ElectricChestPacketType; import mekanism.common.network.PacketElectricChest.ElectricChestPacketType;
import mekanism.common.tileentity.TileEntityElectricChest;
import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiButton;
import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.client.gui.inventory.GuiContainer;
import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.entity.player.InventoryPlayer;
@ -23,7 +23,6 @@ import org.lwjgl.opengl.GL11;
import universalelectricity.core.electricity.ElectricityDisplay; import universalelectricity.core.electricity.ElectricityDisplay;
import universalelectricity.core.electricity.ElectricityDisplay.ElectricUnit; import universalelectricity.core.electricity.ElectricityDisplay.ElectricUnit;
import cpw.mods.fml.client.FMLClientHandler; import cpw.mods.fml.client.FMLClientHandler;
import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly; import cpw.mods.fml.relauncher.SideOnly;

6
common/mekanism/client/GuiElectricMachine.java → common/mekanism/client/gui/GuiElectricMachine.java
View file

@ -1,7 +1,7 @@
package mekanism.client; package mekanism.client.gui;
import mekanism.common.ContainerElectricMachine; import mekanism.common.inventory.container.ContainerElectricMachine;
import mekanism.common.TileEntityElectricMachine; import mekanism.common.tileentity.TileEntityElectricMachine;
import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.entity.player.InventoryPlayer;
import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL11;

7
common/mekanism/client/GuiElectricPump.java → common/mekanism/client/gui/GuiElectricPump.java
View file

@ -1,9 +1,10 @@
package mekanism.client; package mekanism.client.gui;
import mekanism.common.ContainerElectricPump; import mekanism.client.MekanismRenderer;
import mekanism.common.MekanismUtils; import mekanism.common.MekanismUtils;
import mekanism.common.MekanismUtils.ResourceType; import mekanism.common.MekanismUtils.ResourceType;
import mekanism.common.TileEntityElectricPump; import mekanism.common.inventory.container.ContainerElectricPump;
import mekanism.common.tileentity.TileEntityElectricPump;
import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.client.gui.inventory.GuiContainer;
import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.entity.player.InventoryPlayer;
import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidRegistry;

2
common/mekanism/client/GuiElement.java → common/mekanism/client/gui/GuiElement.java
View file

@ -1,4 +1,4 @@
package mekanism.client; package mekanism.client.gui;
import java.lang.reflect.Field; import java.lang.reflect.Field;
import java.lang.reflect.Method; import java.lang.reflect.Method;

4
common/mekanism/client/GuiEnergizedSmelter.java → common/mekanism/client/gui/GuiEnergizedSmelter.java
View file

@ -1,8 +1,8 @@
package mekanism.client; package mekanism.client.gui;
import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly; import cpw.mods.fml.relauncher.SideOnly;
import mekanism.common.TileEntityElectricMachine; import mekanism.common.tileentity.TileEntityElectricMachine;
import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.entity.player.InventoryPlayer;
@SideOnly(Side.CLIENT) @SideOnly(Side.CLIENT)

6
common/mekanism/client/GuiEnergyCube.java → common/mekanism/client/gui/GuiEnergyCube.java
View file

@ -1,9 +1,9 @@
package mekanism.client; package mekanism.client.gui;
import mekanism.common.ContainerEnergyCube;
import mekanism.common.MekanismUtils; import mekanism.common.MekanismUtils;
import mekanism.common.MekanismUtils.ResourceType; import mekanism.common.MekanismUtils.ResourceType;
import mekanism.common.TileEntityEnergyCube; import mekanism.common.inventory.container.ContainerEnergyCube;
import mekanism.common.tileentity.TileEntityEnergyCube;
import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.client.gui.inventory.GuiContainer;
import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.entity.player.InventoryPlayer;
import net.minecraft.util.StatCollector; import net.minecraft.util.StatCollector;

4
common/mekanism/client/GuiEnrichmentChamber.java → common/mekanism/client/gui/GuiEnrichmentChamber.java
View file

@ -1,8 +1,8 @@
package mekanism.client; package mekanism.client.gui;
import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly; import cpw.mods.fml.relauncher.SideOnly;
import mekanism.common.TileEntityElectricMachine; import mekanism.common.tileentity.TileEntityElectricMachine;
import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.entity.player.InventoryPlayer;
@SideOnly(Side.CLIENT) @SideOnly(Side.CLIENT)

6
common/mekanism/client/GuiFactory.java → common/mekanism/client/gui/GuiFactory.java
View file

@ -1,9 +1,9 @@
package mekanism.client; package mekanism.client.gui;
import mekanism.common.ContainerFactory;
import mekanism.common.IFactory.RecipeType; import mekanism.common.IFactory.RecipeType;
import mekanism.common.Tier.FactoryTier; import mekanism.common.Tier.FactoryTier;
import mekanism.common.TileEntityFactory; import mekanism.common.inventory.container.ContainerFactory;
import mekanism.common.tileentity.TileEntityFactory;
import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.entity.player.InventoryPlayer;
import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL11;

6
common/mekanism/client/GuiGasTank.java → common/mekanism/client/gui/GuiGasTank.java
View file

@ -1,9 +1,9 @@
package mekanism.client; package mekanism.client.gui;
import mekanism.common.ContainerGasTank;
import mekanism.common.MekanismUtils; import mekanism.common.MekanismUtils;
import mekanism.common.MekanismUtils.ResourceType; import mekanism.common.MekanismUtils.ResourceType;
import mekanism.common.TileEntityGasTank; import mekanism.common.inventory.container.ContainerGasTank;
import mekanism.common.tileentity.TileEntityGasTank;
import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.entity.player.InventoryPlayer;
import net.minecraft.util.StatCollector; import net.minecraft.util.StatCollector;

2
common/mekanism/client/GuiMekanism.java → common/mekanism/client/gui/GuiMekanism.java
View file

@ -1,4 +1,4 @@
package mekanism.client; package mekanism.client.gui;
import java.util.HashSet; import java.util.HashSet;
import java.util.Set; import java.util.Set;

7
common/mekanism/client/GuiMetallurgicInfuser.java → common/mekanism/client/gui/GuiMetallurgicInfuser.java
View file

@ -1,18 +1,19 @@
package mekanism.client; package mekanism.client.gui;
import java.util.ArrayList; import java.util.ArrayList;
import mekanism.api.Object3D; import mekanism.api.Object3D;
import mekanism.common.ContainerMetallurgicInfuser;
import mekanism.common.MekanismUtils; import mekanism.common.MekanismUtils;
import mekanism.common.PacketHandler; import mekanism.common.PacketHandler;
import mekanism.common.MekanismUtils.ResourceType; import mekanism.common.MekanismUtils.ResourceType;
import mekanism.common.PacketHandler.Transmission; import mekanism.common.PacketHandler.Transmission;
import mekanism.common.TileEntityMetallurgicInfuser; import mekanism.common.inventory.container.ContainerMetallurgicInfuser;
import mekanism.common.network.PacketRemoveUpgrade; import mekanism.common.network.PacketRemoveUpgrade;
import mekanism.common.network.PacketTileEntity; import mekanism.common.network.PacketTileEntity;
import mekanism.common.tileentity.TileEntityMetallurgicInfuser;
import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.client.gui.inventory.GuiContainer;
import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.entity.player.InventoryPlayer;
import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL11;
import universalelectricity.core.electricity.ElectricityDisplay; import universalelectricity.core.electricity.ElectricityDisplay;

4
common/mekanism/client/GuiOsmiumCompressor.java → common/mekanism/client/gui/GuiOsmiumCompressor.java
View file

@ -1,8 +1,8 @@
package mekanism.client; package mekanism.client.gui;
import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly; import cpw.mods.fml.relauncher.SideOnly;
import mekanism.common.TileEntityAdvancedElectricMachine; import mekanism.common.tileentity.TileEntityAdvancedElectricMachine;
import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.entity.player.InventoryPlayer;
@SideOnly(Side.CLIENT) @SideOnly(Side.CLIENT)

7
common/mekanism/client/GuiPasswordEnter.java → common/mekanism/client/gui/GuiPasswordEnter.java
View file

@ -1,20 +1,21 @@
package mekanism.client; package mekanism.client.gui;
import mekanism.api.EnumColor; import mekanism.api.EnumColor;
import mekanism.api.IEnergizedItem;
import mekanism.api.Object3D; import mekanism.api.Object3D;
import mekanism.api.energy.IEnergizedItem;
import mekanism.common.IElectricChest; import mekanism.common.IElectricChest;
import mekanism.common.MekanismUtils; import mekanism.common.MekanismUtils;
import mekanism.common.PacketHandler; import mekanism.common.PacketHandler;
import mekanism.common.MekanismUtils.ResourceType; import mekanism.common.MekanismUtils.ResourceType;
import mekanism.common.PacketHandler.Transmission; import mekanism.common.PacketHandler.Transmission;
import mekanism.common.TileEntityElectricChest;
import mekanism.common.network.PacketElectricChest; import mekanism.common.network.PacketElectricChest;
import mekanism.common.network.PacketElectricChest.ElectricChestPacketType; import mekanism.common.network.PacketElectricChest.ElectricChestPacketType;
import mekanism.common.tileentity.TileEntityElectricChest;
import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiButton;
import net.minecraft.client.gui.GuiScreen; import net.minecraft.client.gui.GuiScreen;
import net.minecraft.client.gui.GuiTextField; import net.minecraft.client.gui.GuiTextField;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import org.lwjgl.input.Keyboard; import org.lwjgl.input.Keyboard;
import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL11;

5
common/mekanism/client/GuiPasswordModify.java → common/mekanism/client/gui/GuiPasswordModify.java
View file

@ -1,4 +1,4 @@
package mekanism.client; package mekanism.client.gui;
import mekanism.api.EnumColor; import mekanism.api.EnumColor;
import mekanism.api.Object3D; import mekanism.api.Object3D;
@ -7,13 +7,14 @@ import mekanism.common.MekanismUtils;
import mekanism.common.PacketHandler; import mekanism.common.PacketHandler;
import mekanism.common.MekanismUtils.ResourceType; import mekanism.common.MekanismUtils.ResourceType;
import mekanism.common.PacketHandler.Transmission; import mekanism.common.PacketHandler.Transmission;
import mekanism.common.TileEntityElectricChest;
import mekanism.common.network.PacketElectricChest; import mekanism.common.network.PacketElectricChest;
import mekanism.common.network.PacketElectricChest.ElectricChestPacketType; import mekanism.common.network.PacketElectricChest.ElectricChestPacketType;
import mekanism.common.tileentity.TileEntityElectricChest;
import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiButton;
import net.minecraft.client.gui.GuiScreen; import net.minecraft.client.gui.GuiScreen;
import net.minecraft.client.gui.GuiTextField; import net.minecraft.client.gui.GuiTextField;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import org.lwjgl.input.Keyboard; import org.lwjgl.input.Keyboard;
import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL11;

5
common/mekanism/client/GuiPortableTeleporter.java → common/mekanism/client/gui/GuiPortableTeleporter.java
View file

@ -1,16 +1,17 @@
package mekanism.client; package mekanism.client.gui;
import mekanism.common.ItemPortableTeleporter;
import mekanism.common.MekanismUtils; import mekanism.common.MekanismUtils;
import mekanism.common.PacketHandler; import mekanism.common.PacketHandler;
import mekanism.common.MekanismUtils.ResourceType; import mekanism.common.MekanismUtils.ResourceType;
import mekanism.common.PacketHandler.Transmission; import mekanism.common.PacketHandler.Transmission;
import mekanism.common.item.ItemPortableTeleporter;
import mekanism.common.network.PacketDigitUpdate; import mekanism.common.network.PacketDigitUpdate;
import mekanism.common.network.PacketPortableTeleport; import mekanism.common.network.PacketPortableTeleport;
import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiButton;
import net.minecraft.client.gui.GuiScreen; import net.minecraft.client.gui.GuiScreen;
import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL11;
import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.Side;

4
common/mekanism/client/GuiPurificationChamber.java → common/mekanism/client/gui/GuiPurificationChamber.java
View file

@ -1,8 +1,8 @@
package mekanism.client; package mekanism.client.gui;
import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly; import cpw.mods.fml.relauncher.SideOnly;
import mekanism.common.TileEntityAdvancedElectricMachine; import mekanism.common.tileentity.TileEntityAdvancedElectricMachine;
import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.entity.player.InventoryPlayer;
@SideOnly(Side.CLIENT) @SideOnly(Side.CLIENT)

2
common/mekanism/client/GuiRedstoneControl.java → common/mekanism/client/gui/GuiRedstoneControl.java
View file

@ -1,4 +1,4 @@
package mekanism.client; package mekanism.client.gui;
import java.lang.reflect.Method; import java.lang.reflect.Method;

4
common/mekanism/client/GuiRobitCrafting.java → common/mekanism/client/gui/GuiRobitCrafting.java
View file

@ -1,11 +1,11 @@
package mekanism.client; package mekanism.client.gui;
import mekanism.common.ContainerRobitCrafting;
import mekanism.common.Mekanism; import mekanism.common.Mekanism;
import mekanism.common.MekanismUtils; import mekanism.common.MekanismUtils;
import mekanism.common.PacketHandler; import mekanism.common.PacketHandler;
import mekanism.common.MekanismUtils.ResourceType; import mekanism.common.MekanismUtils.ResourceType;
import mekanism.common.PacketHandler.Transmission; import mekanism.common.PacketHandler.Transmission;
import mekanism.common.inventory.container.ContainerRobitCrafting;
import mekanism.common.network.PacketRobit; import mekanism.common.network.PacketRobit;
import mekanism.common.network.PacketRobit.RobitPacketType; import mekanism.common.network.PacketRobit.RobitPacketType;
import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.client.gui.inventory.GuiContainer;

5
common/mekanism/client/GuiRobitInventory.java → common/mekanism/client/gui/GuiRobitInventory.java
View file

@ -1,16 +1,17 @@
package mekanism.client; package mekanism.client.gui;
import mekanism.common.ContainerRobitInventory;
import mekanism.common.EntityRobit; import mekanism.common.EntityRobit;
import mekanism.common.Mekanism; import mekanism.common.Mekanism;
import mekanism.common.MekanismUtils; import mekanism.common.MekanismUtils;
import mekanism.common.PacketHandler; import mekanism.common.PacketHandler;
import mekanism.common.MekanismUtils.ResourceType; import mekanism.common.MekanismUtils.ResourceType;
import mekanism.common.PacketHandler.Transmission; import mekanism.common.PacketHandler.Transmission;
import mekanism.common.inventory.container.ContainerRobitInventory;
import mekanism.common.network.PacketRobit; import mekanism.common.network.PacketRobit;
import mekanism.common.network.PacketRobit.RobitPacketType; import mekanism.common.network.PacketRobit.RobitPacketType;
import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.client.gui.inventory.GuiContainer;
import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.entity.player.InventoryPlayer;
import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL11;
import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.Side;

5
common/mekanism/client/GuiRobitMain.java → common/mekanism/client/gui/GuiRobitMain.java
View file

@ -1,18 +1,19 @@
package mekanism.client; package mekanism.client.gui;
import mekanism.common.ContainerRobitMain;
import mekanism.common.EntityRobit; import mekanism.common.EntityRobit;
import mekanism.common.Mekanism; import mekanism.common.Mekanism;
import mekanism.common.MekanismUtils; import mekanism.common.MekanismUtils;
import mekanism.common.PacketHandler; import mekanism.common.PacketHandler;
import mekanism.common.MekanismUtils.ResourceType; import mekanism.common.MekanismUtils.ResourceType;
import mekanism.common.PacketHandler.Transmission; import mekanism.common.PacketHandler.Transmission;
import mekanism.common.inventory.container.ContainerRobitMain;
import mekanism.common.network.PacketRobit; import mekanism.common.network.PacketRobit;
import mekanism.common.network.PacketRobit.RobitPacketType; import mekanism.common.network.PacketRobit.RobitPacketType;
import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiButton;
import net.minecraft.client.gui.GuiTextField; import net.minecraft.client.gui.GuiTextField;
import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.client.gui.inventory.GuiContainer;
import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.entity.player.InventoryPlayer;
import org.lwjgl.input.Keyboard; import org.lwjgl.input.Keyboard;
import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL11;

4
common/mekanism/client/GuiRobitRepair.java → common/mekanism/client/gui/GuiRobitRepair.java
View file

@ -1,13 +1,13 @@
package mekanism.client; package mekanism.client.gui;
import java.util.List; import java.util.List;
import mekanism.common.ContainerRobitRepair;
import mekanism.common.Mekanism; import mekanism.common.Mekanism;
import mekanism.common.MekanismUtils; import mekanism.common.MekanismUtils;
import mekanism.common.PacketHandler; import mekanism.common.PacketHandler;
import mekanism.common.MekanismUtils.ResourceType; import mekanism.common.MekanismUtils.ResourceType;
import mekanism.common.PacketHandler.Transmission; import mekanism.common.PacketHandler.Transmission;
import mekanism.common.inventory.container.ContainerRobitRepair;
import mekanism.common.network.PacketRobit; import mekanism.common.network.PacketRobit;
import mekanism.common.network.PacketRobit.RobitPacketType; import mekanism.common.network.PacketRobit.RobitPacketType;
import net.minecraft.client.gui.GuiTextField; import net.minecraft.client.gui.GuiTextField;

5
common/mekanism/client/GuiRobitSmelting.java → common/mekanism/client/gui/GuiRobitSmelting.java
View file

@ -1,16 +1,17 @@
package mekanism.client; package mekanism.client.gui;
import mekanism.common.ContainerRobitSmelting;
import mekanism.common.EntityRobit; import mekanism.common.EntityRobit;
import mekanism.common.Mekanism; import mekanism.common.Mekanism;
import mekanism.common.MekanismUtils; import mekanism.common.MekanismUtils;
import mekanism.common.PacketHandler; import mekanism.common.PacketHandler;
import mekanism.common.MekanismUtils.ResourceType; import mekanism.common.MekanismUtils.ResourceType;
import mekanism.common.PacketHandler.Transmission; import mekanism.common.PacketHandler.Transmission;
import mekanism.common.inventory.container.ContainerRobitSmelting;
import mekanism.common.network.PacketRobit; import mekanism.common.network.PacketRobit;
import mekanism.common.network.PacketRobit.RobitPacketType; import mekanism.common.network.PacketRobit.RobitPacketType;
import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.client.gui.inventory.GuiContainer;
import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.entity.player.InventoryPlayer;
import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL11;
public class GuiRobitSmelting extends GuiContainer public class GuiRobitSmelting extends GuiContainer

2
common/mekanism/client/GuiStopwatch.java → common/mekanism/client/gui/GuiStopwatch.java
View file

@ -1,4 +1,4 @@
package mekanism.client; package mekanism.client.gui;
import mekanism.common.MekanismUtils; import mekanism.common.MekanismUtils;
import mekanism.common.PacketHandler; import mekanism.common.PacketHandler;

8
common/mekanism/client/GuiTeleporter.java → common/mekanism/client/gui/GuiTeleporter.java
View file

@ -1,22 +1,22 @@
package mekanism.client; package mekanism.client.gui;
import java.util.ArrayList; import java.util.ArrayList;
import mekanism.api.Object3D; import mekanism.api.Object3D;
import mekanism.common.ContainerTeleporter;
import mekanism.common.MekanismUtils; import mekanism.common.MekanismUtils;
import mekanism.common.PacketHandler; import mekanism.common.PacketHandler;
import mekanism.common.TileEntityTeleporter;
import mekanism.common.MekanismUtils.ResourceType; import mekanism.common.MekanismUtils.ResourceType;
import mekanism.common.PacketHandler.Transmission; import mekanism.common.PacketHandler.Transmission;
import mekanism.common.inventory.container.ContainerTeleporter;
import mekanism.common.network.PacketTileEntity; import mekanism.common.network.PacketTileEntity;
import mekanism.common.tileentity.TileEntityTeleporter;
import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.client.gui.inventory.GuiContainer;
import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.entity.player.InventoryPlayer;
import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL11;
import universalelectricity.core.electricity.ElectricityDisplay; import universalelectricity.core.electricity.ElectricityDisplay;
import universalelectricity.core.electricity.ElectricityDisplay.ElectricUnit; import universalelectricity.core.electricity.ElectricityDisplay.ElectricUnit;
import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly; import cpw.mods.fml.relauncher.SideOnly;

4
common/mekanism/client/GuiTheoreticalElementizer.java → common/mekanism/client/gui/GuiTheoreticalElementizer.java
View file

@ -1,10 +1,10 @@
package mekanism.client; package mekanism.client.gui;
import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly; import cpw.mods.fml.relauncher.SideOnly;
import mekanism.api.EnumColor; import mekanism.api.EnumColor;
import mekanism.common.MekanismUtils; import mekanism.common.MekanismUtils;
import mekanism.common.TileEntityTheoreticalElementizer; import mekanism.common.tileentity.TileEntityTheoreticalElementizer;
import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.entity.player.InventoryPlayer;
@SideOnly(Side.CLIENT) @SideOnly(Side.CLIENT)

2
common/mekanism/client/GuiUpgradeManagement.java → common/mekanism/client/gui/GuiUpgradeManagement.java
View file

@ -1,4 +1,4 @@
package mekanism.client; package mekanism.client.gui;
import mekanism.api.Object3D; import mekanism.api.Object3D;
import mekanism.common.IUpgradeTile; import mekanism.common.IUpgradeTile;

2
common/mekanism/client/GuiWeatherOrb.java → common/mekanism/client/gui/GuiWeatherOrb.java
View file

@ -1,4 +1,4 @@
package mekanism.client; package mekanism.client.gui;
import mekanism.common.MekanismUtils; import mekanism.common.MekanismUtils;
import mekanism.common.PacketHandler; import mekanism.common.PacketHandler;

2
common/mekanism/client/ModelBoxSelectiveFace.java → common/mekanism/client/model/ModelBoxSelectiveFace.java
View file

@ -1,4 +1,4 @@
package mekanism.client; package mekanism.client.model;
import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly; import cpw.mods.fml.relauncher.SideOnly;

2
common/mekanism/client/ModelChargepad.java → common/mekanism/client/model/ModelChargepad.java
View file

@ -1,4 +1,4 @@
package mekanism.client; package mekanism.client.model;
import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly; import cpw.mods.fml.relauncher.SideOnly;

2
common/mekanism/client/ModelElectricPump.java → common/mekanism/client/model/ModelElectricPump.java
View file

@ -1,4 +1,4 @@
package mekanism.client; package mekanism.client.model;
import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly; import cpw.mods.fml.relauncher.SideOnly;

2
common/mekanism/client/ModelMetallurgicInfuser.java → common/mekanism/client/model/ModelMetallurgicInfuser.java
View file

@ -1,4 +1,4 @@
package mekanism.client; package mekanism.client.model;
import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly; import cpw.mods.fml.relauncher.SideOnly;

4
common/mekanism/client/ModelRendererSelectiveFace.java → common/mekanism/client/model/ModelRendererSelectiveFace.java
View file

@ -1,12 +1,14 @@
package mekanism.client; package mekanism.client.model;
import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly; import cpw.mods.fml.relauncher.SideOnly;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import mekanism.client.MekanismRenderer;
import mekanism.client.MekanismRenderer.BooleanArray; import mekanism.client.MekanismRenderer.BooleanArray;
import mekanism.client.MekanismRenderer.DisplayInteger; import mekanism.client.MekanismRenderer.DisplayInteger;
import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelBase;

4
common/mekanism/client/ModelRobit.java → common/mekanism/client/model/ModelRobit.java
View file

@ -1,10 +1,10 @@
package mekanism.client; package mekanism.client.model;
import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL11;
import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly; import cpw.mods.fml.relauncher.SideOnly;
import mekanism.client.MekanismRenderer;
import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelBase;
import net.minecraft.client.model.ModelRenderer; import net.minecraft.client.model.ModelRenderer;
import net.minecraft.entity.Entity; import net.minecraft.entity.Entity;

2
common/mekanism/client/ModelTheoreticalElementizer.java → common/mekanism/client/model/ModelTheoreticalElementizer.java
View file

@ -1,4 +1,4 @@
package mekanism.client; package mekanism.client.model;
import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly; import cpw.mods.fml.relauncher.SideOnly;

2
common/mekanism/client/ModelTransmitter.java → common/mekanism/client/model/ModelTransmitter.java
View file

@ -1,4 +1,4 @@
package mekanism.client; package mekanism.client.model;
import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelBase;
import net.minecraft.entity.Entity; import net.minecraft.entity.Entity;

2
common/mekanism/nei/AdvancedMachineRecipeHandler.java → common/mekanism/client/nei/AdvancedMachineRecipeHandler.java
View file

@ -1,4 +1,4 @@
package mekanism.nei; package mekanism.client.nei;
import java.awt.Rectangle; import java.awt.Rectangle;
import java.util.Map; import java.util.Map;

5
common/mekanism/nei/CombinerRecipeHandler.java → common/mekanism/client/nei/CombinerRecipeHandler.java
View file

@ -1,11 +1,10 @@
package mekanism.nei; package mekanism.client.nei;
import java.util.Set; import java.util.Set;
import net.minecraft.block.Block; import net.minecraft.block.Block;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import mekanism.client.gui.GuiCombiner;
import mekanism.client.GuiCombiner;
import mekanism.common.RecipeHandler.Recipe; import mekanism.common.RecipeHandler.Recipe;
public class CombinerRecipeHandler extends AdvancedMachineRecipeHandler public class CombinerRecipeHandler extends AdvancedMachineRecipeHandler

4
common/mekanism/nei/CrusherRecipeHandler.java → common/mekanism/client/nei/CrusherRecipeHandler.java
View file

@ -1,8 +1,8 @@
package mekanism.nei; package mekanism.client.nei;
import java.util.Set; import java.util.Set;
import mekanism.client.GuiCrusher; import mekanism.client.gui.GuiCrusher;
import mekanism.common.RecipeHandler.Recipe; import mekanism.common.RecipeHandler.Recipe;
public class CrusherRecipeHandler extends MachineRecipeHandler public class CrusherRecipeHandler extends MachineRecipeHandler

4
common/mekanism/nei/EnrichmentChamberRecipeHandler.java → common/mekanism/client/nei/EnrichmentChamberRecipeHandler.java
View file

@ -1,8 +1,8 @@
package mekanism.nei; package mekanism.client.nei;
import java.util.Set; import java.util.Set;
import mekanism.client.GuiEnrichmentChamber; import mekanism.client.gui.GuiEnrichmentChamber;
import mekanism.common.RecipeHandler.Recipe; import mekanism.common.RecipeHandler.Recipe;
public class EnrichmentChamberRecipeHandler extends MachineRecipeHandler public class EnrichmentChamberRecipeHandler extends MachineRecipeHandler

2
common/mekanism/nei/MachineRecipeHandler.java → common/mekanism/client/nei/MachineRecipeHandler.java
View file

@ -1,4 +1,4 @@
package mekanism.nei; package mekanism.client.nei;
import java.awt.Rectangle; import java.awt.Rectangle;
import java.util.Map; import java.util.Map;

4
common/mekanism/nei/MekanismRecipeHandler.java → common/mekanism/client/nei/MekanismRecipeHandler.java
View file

@ -1,10 +1,10 @@
package mekanism.nei; package mekanism.client.nei;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collection; import java.util.Collection;
import java.util.List; import java.util.List;
import mekanism.api.IEnergizedItem; import mekanism.api.energy.IEnergizedItem;
import mekanism.common.IEnergyCube; import mekanism.common.IEnergyCube;
import mekanism.common.IFactory; import mekanism.common.IFactory;
import mekanism.common.MekanismRecipe; import mekanism.common.MekanismRecipe;

15
common/mekanism/nei/MetallurgicInfuserRecipeHandler.java → common/mekanism/client/nei/MetallurgicInfuserRecipeHandler.java
View file

@ -1,16 +1,16 @@
package mekanism.nei; package mekanism.client.nei;
import java.awt.Rectangle; import java.awt.Rectangle;
import java.util.Map; import java.util.Map;
import java.util.Map.Entry; import java.util.Map.Entry;
import java.util.Set; import java.util.Set;
import mekanism.api.InfuseObject; import mekanism.api.infuse.InfuseObject;
import mekanism.api.InfuseRegistry; import mekanism.api.infuse.InfuseRegistry;
import mekanism.api.InfuseType; import mekanism.api.infuse.InfuseType;
import mekanism.api.InfusionInput; import mekanism.api.infuse.InfusionInput;
import mekanism.api.InfusionOutput; import mekanism.api.infuse.InfusionOutput;
import mekanism.client.GuiMetallurgicInfuser; import mekanism.client.gui.GuiMetallurgicInfuser;
import mekanism.common.RecipeHandler.Recipe; import mekanism.common.RecipeHandler.Recipe;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
@ -19,7 +19,6 @@ import org.lwjgl.opengl.GL11;
import codechicken.nei.NEIServerUtils; import codechicken.nei.NEIServerUtils;
import codechicken.nei.PositionedStack; import codechicken.nei.PositionedStack;
import codechicken.nei.recipe.TemplateRecipeHandler; import codechicken.nei.recipe.TemplateRecipeHandler;
import static codechicken.core.gui.GuiDraw.*; import static codechicken.core.gui.GuiDraw.*;
public class MetallurgicInfuserRecipeHandler extends TemplateRecipeHandler public class MetallurgicInfuserRecipeHandler extends TemplateRecipeHandler

14
common/mekanism/nei/NEIMekanismConfig.java → common/mekanism/client/nei/NEIMekanismConfig.java
View file

@ -1,11 +1,11 @@
package mekanism.nei; package mekanism.client.nei;
import mekanism.client.GuiCombiner; import mekanism.client.gui.GuiCombiner;
import mekanism.client.GuiCrusher; import mekanism.client.gui.GuiCrusher;
import mekanism.client.GuiEnrichmentChamber; import mekanism.client.gui.GuiEnrichmentChamber;
import mekanism.client.GuiMetallurgicInfuser; import mekanism.client.gui.GuiMetallurgicInfuser;
import mekanism.client.GuiOsmiumCompressor; import mekanism.client.gui.GuiOsmiumCompressor;
import mekanism.client.GuiPurificationChamber; import mekanism.client.gui.GuiPurificationChamber;
import mekanism.common.Mekanism; import mekanism.common.Mekanism;
import codechicken.nei.api.API; import codechicken.nei.api.API;
import codechicken.nei.api.IConfigureNEI; import codechicken.nei.api.IConfigureNEI;

5
common/mekanism/nei/OsmiumCompressorRecipeHandler.java → common/mekanism/client/nei/OsmiumCompressorRecipeHandler.java
View file

@ -1,10 +1,9 @@
package mekanism.nei; package mekanism.client.nei;
import java.util.Set; import java.util.Set;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import mekanism.client.gui.GuiOsmiumCompressor;
import mekanism.client.GuiOsmiumCompressor;
import mekanism.common.Mekanism; import mekanism.common.Mekanism;
import mekanism.common.RecipeHandler.Recipe; import mekanism.common.RecipeHandler.Recipe;

4
common/mekanism/nei/PurificationChamberRecipeHandler.java → common/mekanism/client/nei/PurificationChamberRecipeHandler.java
View file

@ -1,8 +1,8 @@
package mekanism.nei; package mekanism.client.nei;
import java.util.Set; import java.util.Set;
import mekanism.client.GuiPurificationChamber; import mekanism.client.gui.GuiPurificationChamber;
import mekanism.common.RecipeHandler.Recipe; import mekanism.common.RecipeHandler.Recipe;
import net.minecraft.item.Item; import net.minecraft.item.Item;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;

6
common/mekanism/client/RenderChargepad.java → common/mekanism/client/render/RenderChargepad.java
View file

@ -1,13 +1,13 @@
package mekanism.client; package mekanism.client.render;
import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL11;
import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly; import cpw.mods.fml.relauncher.SideOnly;
import mekanism.client.model.ModelChargepad;
import mekanism.common.MekanismUtils; import mekanism.common.MekanismUtils;
import mekanism.common.TileEntityChargepad;
import mekanism.common.MekanismUtils.ResourceType; import mekanism.common.MekanismUtils.ResourceType;
import mekanism.common.tileentity.TileEntityChargepad;
import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntity;

5
common/mekanism/client/RenderConfigurableMachine.java → common/mekanism/client/render/RenderConfigurableMachine.java
View file

@ -1,15 +1,16 @@
package mekanism.client; package mekanism.client.render;
import java.util.HashMap; import java.util.HashMap;
import mekanism.api.EnumColor; import mekanism.api.EnumColor;
import mekanism.api.IConfigurable; import mekanism.api.IConfigurable;
import mekanism.api.Object3D; import mekanism.api.Object3D;
import mekanism.client.MekanismRenderer;
import mekanism.client.MekanismRenderer.DisplayInteger; import mekanism.client.MekanismRenderer.DisplayInteger;
import mekanism.client.MekanismRenderer.Model3D; import mekanism.client.MekanismRenderer.Model3D;
import mekanism.common.ItemConfigurator;
import mekanism.common.MekanismUtils; import mekanism.common.MekanismUtils;
import mekanism.common.MekanismUtils.ResourceType; import mekanism.common.MekanismUtils.ResourceType;
import mekanism.common.item.ItemConfigurator;
import net.minecraft.block.Block; import net.minecraft.block.Block;
import net.minecraft.client.Minecraft; import net.minecraft.client.Minecraft;
import net.minecraft.client.renderer.GLAllocation; import net.minecraft.client.renderer.GLAllocation;

5
common/mekanism/client/RenderDynamicTank.java → common/mekanism/client/render/RenderDynamicTank.java
View file

@ -1,13 +1,14 @@
package mekanism.client; package mekanism.client.render;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
import mekanism.api.Object3D; import mekanism.api.Object3D;
import mekanism.client.MekanismRenderer;
import mekanism.client.MekanismRenderer.DisplayInteger; import mekanism.client.MekanismRenderer.DisplayInteger;
import mekanism.client.MekanismRenderer.Model3D; import mekanism.client.MekanismRenderer.Model3D;
import mekanism.common.SynchronizedTankData.ValveData; import mekanism.common.SynchronizedTankData.ValveData;
import mekanism.common.TileEntityDynamicTank; import mekanism.common.tileentity.TileEntityDynamicTank;
import net.minecraft.block.Block; import net.minecraft.block.Block;
import net.minecraft.client.renderer.GLAllocation; import net.minecraft.client.renderer.GLAllocation;
import net.minecraft.client.renderer.tileentity.TileEntityRenderer; import net.minecraft.client.renderer.tileentity.TileEntityRenderer;

4
common/mekanism/client/RenderElectricChest.java → common/mekanism/client/render/RenderElectricChest.java
View file

@ -1,8 +1,8 @@
package mekanism.client; package mekanism.client.render;
import mekanism.common.MekanismUtils; import mekanism.common.MekanismUtils;
import mekanism.common.MekanismUtils.ResourceType; import mekanism.common.MekanismUtils.ResourceType;
import mekanism.common.TileEntityElectricChest; import mekanism.common.tileentity.TileEntityElectricChest;
import net.minecraft.client.model.ModelChest; import net.minecraft.client.model.ModelChest;
import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntity;

6
common/mekanism/client/RenderElectricPump.java → common/mekanism/client/render/RenderElectricPump.java
View file

@ -1,13 +1,13 @@
package mekanism.client; package mekanism.client.render;
import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL11;
import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly; import cpw.mods.fml.relauncher.SideOnly;
import mekanism.client.model.ModelElectricPump;
import mekanism.common.MekanismUtils; import mekanism.common.MekanismUtils;
import mekanism.common.TileEntityElectricPump;
import mekanism.common.MekanismUtils.ResourceType; import mekanism.common.MekanismUtils.ResourceType;
import mekanism.common.tileentity.TileEntityElectricPump;
import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntity;

5
common/mekanism/client/RenderLogisticalTransporter.java → common/mekanism/client/render/RenderLogisticalTransporter.java
View file

@ -1,8 +1,9 @@
package mekanism.client; package mekanism.client.render;
import mekanism.client.model.ModelTransmitter;
import mekanism.common.MekanismUtils; import mekanism.common.MekanismUtils;
import mekanism.common.MekanismUtils.ResourceType; import mekanism.common.MekanismUtils.ResourceType;
import mekanism.common.TileEntityLogisticalTransporter; import mekanism.common.tileentity.TileEntityLogisticalTransporter;
import mekanism.common.TransporterUtils; import mekanism.common.TransporterUtils;
import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntity;

6
common/mekanism/client/RenderMechanicalPipe.java → common/mekanism/client/render/RenderMechanicalPipe.java
View file

@ -1,13 +1,15 @@
package mekanism.client; package mekanism.client.render;
import java.util.HashMap; import java.util.HashMap;
import mekanism.client.MekanismRenderer;
import mekanism.client.MekanismRenderer.DisplayInteger; import mekanism.client.MekanismRenderer.DisplayInteger;
import mekanism.client.MekanismRenderer.Model3D; import mekanism.client.MekanismRenderer.Model3D;
import mekanism.client.model.ModelTransmitter;
import mekanism.common.MekanismUtils; import mekanism.common.MekanismUtils;
import mekanism.common.MekanismUtils.ResourceType; import mekanism.common.MekanismUtils.ResourceType;
import mekanism.common.tileentity.TileEntityMechanicalPipe;
import mekanism.common.PipeUtils; import mekanism.common.PipeUtils;
import mekanism.common.TileEntityMechanicalPipe;
import net.minecraft.block.Block; import net.minecraft.block.Block;
import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntity;

5
common/mekanism/client/RenderMetallurgicInfuser.java → common/mekanism/client/render/RenderMetallurgicInfuser.java
View file

@ -1,8 +1,9 @@
package mekanism.client; package mekanism.client.render;
import mekanism.client.model.ModelMetallurgicInfuser;
import mekanism.common.MekanismUtils; import mekanism.common.MekanismUtils;
import mekanism.common.TileEntityMetallurgicInfuser;
import mekanism.common.MekanismUtils.ResourceType; import mekanism.common.MekanismUtils.ResourceType;
import mekanism.common.tileentity.TileEntityMetallurgicInfuser;
import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntity;

2
common/mekanism/client/RenderObsidianTNT.java → common/mekanism/client/render/RenderObsidianTNT.java
View file

@ -1,4 +1,4 @@
package mekanism.client; package mekanism.client.render;
import mekanism.common.EntityObsidianTNT; import mekanism.common.EntityObsidianTNT;
import mekanism.common.Mekanism; import mekanism.common.Mekanism;

14
common/mekanism/client/RenderPressurizedTube.java → common/mekanism/client/render/RenderPressurizedTube.java
View file

@ -1,19 +1,21 @@
package mekanism.client; package mekanism.client.render;
import java.util.Arrays; import java.util.Arrays;
import java.util.HashMap; import java.util.HashMap;
import mekanism.api.EnumGas;
import mekanism.api.GasTransmission;
import mekanism.api.ITubeConnection;
import mekanism.api.Object3D; import mekanism.api.Object3D;
import mekanism.api.gas.EnumGas;
import mekanism.api.gas.GasTransmission;
import mekanism.api.gas.ITubeConnection;
import mekanism.client.MekanismRenderer;
import mekanism.client.MekanismRenderer.BooleanArray; import mekanism.client.MekanismRenderer.BooleanArray;
import mekanism.client.MekanismRenderer.DisplayInteger; import mekanism.client.MekanismRenderer.DisplayInteger;
import mekanism.client.MekanismRenderer.Model3D; import mekanism.client.MekanismRenderer.Model3D;
import mekanism.client.model.ModelTransmitter;
import mekanism.common.MekanismUtils; import mekanism.common.MekanismUtils;
import mekanism.common.TileEntityGasTank;
import mekanism.common.TileEntityPressurizedTube;
import mekanism.common.MekanismUtils.ResourceType; import mekanism.common.MekanismUtils.ResourceType;
import mekanism.common.tileentity.TileEntityGasTank;
import mekanism.common.tileentity.TileEntityPressurizedTube;
import net.minecraft.block.Block; import net.minecraft.block.Block;
import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntity;

3
common/mekanism/client/RenderRobit.java → common/mekanism/client/render/RenderRobit.java
View file

@ -1,5 +1,6 @@
package mekanism.client; package mekanism.client.render;
import mekanism.client.model.ModelRobit;
import mekanism.common.MekanismUtils; import mekanism.common.MekanismUtils;
import mekanism.common.MekanismUtils.ResourceType; import mekanism.common.MekanismUtils.ResourceType;
import net.minecraft.client.renderer.entity.RenderLiving; import net.minecraft.client.renderer.entity.RenderLiving;

5
common/mekanism/client/RenderTheoreticalElementizer.java → common/mekanism/client/render/RenderTheoreticalElementizer.java
View file

@ -1,8 +1,9 @@
package mekanism.client; package mekanism.client.render;
import mekanism.client.model.ModelTheoreticalElementizer;
import mekanism.common.MekanismUtils; import mekanism.common.MekanismUtils;
import mekanism.common.TileEntityTheoreticalElementizer;
import mekanism.common.MekanismUtils.ResourceType; import mekanism.common.MekanismUtils.ResourceType;
import mekanism.common.tileentity.TileEntityTheoreticalElementizer;
import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntity;

2
common/mekanism/client/RenderTickHandler.java → common/mekanism/client/render/RenderTickHandler.java
View file

@ -1,4 +1,4 @@
package mekanism.client; package mekanism.client.render;
import java.util.EnumSet; import java.util.EnumSet;

6
common/mekanism/client/RenderUniversalCable.java → common/mekanism/client/render/RenderUniversalCable.java
View file

@ -1,16 +1,18 @@
package mekanism.client; package mekanism.client.render;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
import mekanism.client.MekanismRenderer;
import mekanism.client.MekanismRenderer.BooleanArray; import mekanism.client.MekanismRenderer.BooleanArray;
import mekanism.client.MekanismRenderer.DisplayInteger; import mekanism.client.MekanismRenderer.DisplayInteger;
import mekanism.client.MekanismRenderer.Model3D; import mekanism.client.MekanismRenderer.Model3D;
import mekanism.client.model.ModelTransmitter;
import mekanism.common.CableUtils; import mekanism.common.CableUtils;
import mekanism.common.Mekanism; import mekanism.common.Mekanism;
import mekanism.common.MekanismUtils; import mekanism.common.MekanismUtils;
import mekanism.common.TileEntityUniversalCable;
import mekanism.common.MekanismUtils.ResourceType; import mekanism.common.MekanismUtils.ResourceType;
import mekanism.common.tileentity.TileEntityUniversalCable;
import net.minecraft.block.Block; import net.minecraft.block.Block;
import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntity;

8
common/mekanism/common/CableUtils.java
View file

@ -9,11 +9,11 @@ import java.util.Arrays;
import java.util.HashSet; import java.util.HashSet;
import java.util.Set; import java.util.Set;
import mekanism.api.ICableOutputter;
import mekanism.api.IStrictEnergyAcceptor;
import mekanism.api.ITransmitter;
import mekanism.api.Object3D; import mekanism.api.Object3D;
import mekanism.api.TransmissionType; import mekanism.api.energy.ICableOutputter;
import mekanism.api.energy.IStrictEnergyAcceptor;
import mekanism.api.transmitters.ITransmitter;
import mekanism.api.transmitters.TransmissionType;
import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntity;
import net.minecraftforge.common.ForgeDirection; import net.minecraftforge.common.ForgeDirection;
import universalelectricity.core.block.IElectrical; import universalelectricity.core.block.IElectrical;

Some files were not shown because too many files have changed in this diff Show more