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

A bit more organizing, nothing API related

Browse source
This commit is contained in:
Aidan C. Brady 2013-08-26 18:57:08 -04:00
parent 6af0b1abd7
commit 86b8499bb5
118 changed files with 273 additions and 234 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -32,27 +32,32 @@ 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.MekanismRenderer;
import mekanism.client.render.RenderTickHandler;
import mekanism.client.render.RenderUniversalCable;
import mekanism.client.render.block.BasicRenderingHandler;
import mekanism.client.render.block.MachineRenderingHandler;
import mekanism.client.render.block.TransmitterRenderingHandler;
import mekanism.client.render.entity.RenderObsidianTNT;
import mekanism.client.render.entity.RenderRobit;
import mekanism.client.render.item.ItemRenderingHandler;
import mekanism.client.render.tileentity.RenderChargepad;
import mekanism.client.render.tileentity.RenderConfigurableMachine;
import mekanism.client.render.tileentity.RenderDynamicTank;
import mekanism.client.render.tileentity.RenderElectricChest;
import mekanism.client.render.tileentity.RenderElectricPump;
import mekanism.client.render.tileentity.RenderLogisticalTransporter;
import mekanism.client.render.tileentity.RenderMechanicalPipe;
import mekanism.client.render.tileentity.RenderMetallurgicInfuser;
import mekanism.client.render.tileentity.RenderPressurizedTube;
import mekanism.client.render.tileentity.RenderTheoreticalElementizer;
import mekanism.client.render.tileentity.RenderUniversalCable;
import mekanism.client.sound.Sound;
import mekanism.client.sound.SoundHandler;
import mekanism.common.CommonProxy;
import mekanism.common.EntityObsidianTNT;
import mekanism.common.EntityRobit;
import mekanism.common.IElectricChest;
import mekanism.common.Mekanism;
import mekanism.common.MekanismUtils;
import mekanism.common.MekanismUtils.ResourceType;
import mekanism.common.inventory.InventoryElectricChest;
import mekanism.common.item.ItemPortableTeleporter;
import mekanism.common.tileentity.TileEntityAdvancedElectricMachine;
@ -81,6 +86,8 @@ import mekanism.common.tileentity.TileEntityPurificationChamber;
import mekanism.common.tileentity.TileEntityTeleporter;
import mekanism.common.tileentity.TileEntityTheoreticalElementizer;
import mekanism.common.tileentity.TileEntityUniversalCable;
import mekanism.common.util.MekanismUtils;
import mekanism.common.util.MekanismUtils.ResourceType;
import net.minecraft.client.Minecraft;
import net.minecraft.client.gui.GuiScreen;
import net.minecraft.entity.player.EntityPlayer;

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

@ -7,7 +7,7 @@ import java.util.List;
import java.util.Map;
import mekanism.common.Mekanism;
import mekanism.common.MekanismUtils;
import mekanism.common.util.MekanismUtils;
import net.minecraft.client.Minecraft;
import net.minecraft.client.entity.AbstractClientPlayer;
import net.minecraft.client.renderer.ThreadDownloadImageData;

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

@ -3,12 +3,12 @@ package mekanism.client.gui;
import mekanism.api.EnumColor;
import mekanism.api.IAccessibleGui;
import mekanism.api.Object3D;
import mekanism.common.MekanismUtils;
import mekanism.common.PacketHandler;
import mekanism.common.MekanismUtils.ResourceType;
import mekanism.common.PacketHandler.Transmission;
import mekanism.common.network.PacketControlPanel;
import mekanism.common.tileentity.TileEntityControlPanel;
import mekanism.common.util.MekanismUtils;
import mekanism.common.util.MekanismUtils.ResourceType;
import net.minecraft.client.gui.GuiButton;
import net.minecraft.client.gui.GuiScreen;
import net.minecraft.client.gui.GuiTextField;

2
common/mekanism/client/gui/GuiCredits.java
View file

@ -4,8 +4,8 @@ import mekanism.api.EnumColor;
import mekanism.client.ThreadClientUpdate;
import mekanism.common.IModule;
import mekanism.common.Mekanism;
import mekanism.common.MekanismUtils;
import mekanism.common.Version;
import mekanism.common.util.MekanismUtils;
import net.minecraft.client.gui.GuiButton;
import net.minecraft.client.gui.GuiScreen;
import cpw.mods.fml.relauncher.Side;

6
common/mekanism/client/gui/GuiDynamicTank.java
View file

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

4
common/mekanism/client/gui/GuiElectricChest.java
View file

@ -5,14 +5,14 @@ import mekanism.api.Object3D;
import mekanism.api.energy.IEnergizedItem;
import mekanism.common.IElectricChest;
import mekanism.common.Mekanism;
import mekanism.common.MekanismUtils;
import mekanism.common.MekanismUtils.ResourceType;
import mekanism.common.PacketHandler;
import mekanism.common.PacketHandler.Transmission;
import mekanism.common.inventory.container.ContainerElectricChest;
import mekanism.common.network.PacketElectricChest;
import mekanism.common.network.PacketElectricChest.ElectricChestPacketType;
import mekanism.common.tileentity.TileEntityElectricChest;
import mekanism.common.util.MekanismUtils;
import mekanism.common.util.MekanismUtils.ResourceType;
import net.minecraft.client.gui.GuiButton;
import net.minecraft.client.gui.inventory.GuiContainer;
import net.minecraft.entity.player.InventoryPlayer;

6
common/mekanism/client/gui/GuiElectricPump.java
View file

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

4
common/mekanism/client/gui/GuiEnergyCube.java
View file

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

4
common/mekanism/client/gui/GuiGasTank.java
View file

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

4
common/mekanism/client/gui/GuiMetallurgicInfuser.java
View file

@ -3,14 +3,14 @@ package mekanism.client.gui;
import java.util.ArrayList;
import mekanism.api.Object3D;
import mekanism.common.MekanismUtils;
import mekanism.common.PacketHandler;
import mekanism.common.MekanismUtils.ResourceType;
import mekanism.common.PacketHandler.Transmission;
import mekanism.common.inventory.container.ContainerMetallurgicInfuser;
import mekanism.common.network.PacketRemoveUpgrade;
import mekanism.common.network.PacketTileEntity;
import mekanism.common.tileentity.TileEntityMetallurgicInfuser;
import mekanism.common.util.MekanismUtils;
import mekanism.common.util.MekanismUtils.ResourceType;
import net.minecraft.client.gui.inventory.GuiContainer;
import net.minecraft.entity.player.InventoryPlayer;

4
common/mekanism/client/gui/GuiPasswordEnter.java
View file

@ -4,13 +4,13 @@ import mekanism.api.EnumColor;
import mekanism.api.Object3D;
import mekanism.api.energy.IEnergizedItem;
import mekanism.common.IElectricChest;
import mekanism.common.MekanismUtils;
import mekanism.common.PacketHandler;
import mekanism.common.MekanismUtils.ResourceType;
import mekanism.common.PacketHandler.Transmission;
import mekanism.common.network.PacketElectricChest;
import mekanism.common.network.PacketElectricChest.ElectricChestPacketType;
import mekanism.common.tileentity.TileEntityElectricChest;
import mekanism.common.util.MekanismUtils;
import mekanism.common.util.MekanismUtils.ResourceType;
import net.minecraft.client.gui.GuiButton;
import net.minecraft.client.gui.GuiScreen;
import net.minecraft.client.gui.GuiTextField;

4
common/mekanism/client/gui/GuiPasswordModify.java
View file

@ -3,13 +3,13 @@ package mekanism.client.gui;
import mekanism.api.EnumColor;
import mekanism.api.Object3D;
import mekanism.common.IElectricChest;
import mekanism.common.MekanismUtils;
import mekanism.common.PacketHandler;
import mekanism.common.MekanismUtils.ResourceType;
import mekanism.common.PacketHandler.Transmission;
import mekanism.common.network.PacketElectricChest;
import mekanism.common.network.PacketElectricChest.ElectricChestPacketType;
import mekanism.common.tileentity.TileEntityElectricChest;
import mekanism.common.util.MekanismUtils;
import mekanism.common.util.MekanismUtils.ResourceType;
import net.minecraft.client.gui.GuiButton;
import net.minecraft.client.gui.GuiScreen;
import net.minecraft.client.gui.GuiTextField;

4
common/mekanism/client/gui/GuiPortableTeleporter.java
View file

@ -1,12 +1,12 @@
package mekanism.client.gui;
import mekanism.common.MekanismUtils;
import mekanism.common.PacketHandler;
import mekanism.common.MekanismUtils.ResourceType;
import mekanism.common.PacketHandler.Transmission;
import mekanism.common.item.ItemPortableTeleporter;
import mekanism.common.network.PacketDigitUpdate;
import mekanism.common.network.PacketPortableTeleport;
import mekanism.common.util.MekanismUtils;
import mekanism.common.util.MekanismUtils.ResourceType;
import net.minecraft.client.gui.GuiButton;
import net.minecraft.client.gui.GuiScreen;
import net.minecraft.entity.player.EntityPlayer;

4
common/mekanism/client/gui/GuiRedstoneControl.java
View file

@ -5,11 +5,11 @@ import java.lang.reflect.Method;
import mekanism.api.Object3D;
import mekanism.common.IRedstoneControl;
import mekanism.common.IRedstoneControl.RedstoneControl;
import mekanism.common.MekanismUtils;
import mekanism.common.MekanismUtils.ResourceType;
import mekanism.common.PacketHandler;
import mekanism.common.PacketHandler.Transmission;
import mekanism.common.network.PacketRedstoneControl;
import mekanism.common.util.MekanismUtils;
import mekanism.common.util.MekanismUtils.ResourceType;
import net.minecraft.client.Minecraft;
import net.minecraft.client.gui.inventory.GuiContainer;
import net.minecraft.tileentity.TileEntity;

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

@ -1,13 +1,13 @@
package mekanism.client.gui;
import mekanism.common.Mekanism;
import mekanism.common.MekanismUtils;
import mekanism.common.PacketHandler;
import mekanism.common.MekanismUtils.ResourceType;
import mekanism.common.PacketHandler.Transmission;
import mekanism.common.inventory.container.ContainerRobitCrafting;
import mekanism.common.network.PacketRobit;
import mekanism.common.network.PacketRobit.RobitPacketType;
import mekanism.common.util.MekanismUtils;
import mekanism.common.util.MekanismUtils.ResourceType;
import net.minecraft.client.gui.inventory.GuiContainer;
import net.minecraft.entity.player.InventoryPlayer;
import net.minecraft.world.World;

4
common/mekanism/client/gui/GuiRobitInventory.java
View file

@ -2,13 +2,13 @@ package mekanism.client.gui;
import mekanism.common.EntityRobit;
import mekanism.common.Mekanism;
import mekanism.common.MekanismUtils;
import mekanism.common.PacketHandler;
import mekanism.common.MekanismUtils.ResourceType;
import mekanism.common.PacketHandler.Transmission;
import mekanism.common.inventory.container.ContainerRobitInventory;
import mekanism.common.network.PacketRobit;
import mekanism.common.network.PacketRobit.RobitPacketType;
import mekanism.common.util.MekanismUtils;
import mekanism.common.util.MekanismUtils.ResourceType;
import net.minecraft.client.gui.inventory.GuiContainer;
import net.minecraft.entity.player.InventoryPlayer;

4
common/mekanism/client/gui/GuiRobitMain.java
View file

@ -2,13 +2,13 @@ package mekanism.client.gui;
import mekanism.common.EntityRobit;
import mekanism.common.Mekanism;
import mekanism.common.MekanismUtils;
import mekanism.common.PacketHandler;
import mekanism.common.MekanismUtils.ResourceType;
import mekanism.common.PacketHandler.Transmission;
import mekanism.common.inventory.container.ContainerRobitMain;
import mekanism.common.network.PacketRobit;
import mekanism.common.network.PacketRobit.RobitPacketType;
import mekanism.common.util.MekanismUtils;
import mekanism.common.util.MekanismUtils.ResourceType;
import net.minecraft.client.gui.GuiButton;
import net.minecraft.client.gui.GuiTextField;
import net.minecraft.client.gui.inventory.GuiContainer;

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

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

4
common/mekanism/client/gui/GuiRobitSmelting.java
View file

@ -2,13 +2,13 @@ package mekanism.client.gui;
import mekanism.common.EntityRobit;
import mekanism.common.Mekanism;
import mekanism.common.MekanismUtils;
import mekanism.common.PacketHandler;
import mekanism.common.MekanismUtils.ResourceType;
import mekanism.common.PacketHandler.Transmission;
import mekanism.common.inventory.container.ContainerRobitSmelting;
import mekanism.common.network.PacketRobit;
import mekanism.common.network.PacketRobit.RobitPacketType;
import mekanism.common.util.MekanismUtils;
import mekanism.common.util.MekanismUtils.ResourceType;
import net.minecraft.client.gui.inventory.GuiContainer;
import net.minecraft.entity.player.InventoryPlayer;

5
common/mekanism/client/gui/GuiStopwatch.java
View file

@ -1,13 +1,14 @@
package mekanism.client.gui;
import mekanism.common.MekanismUtils;
import mekanism.common.PacketHandler;
import mekanism.common.MekanismUtils.ResourceType;
import mekanism.common.PacketHandler.Transmission;
import mekanism.common.network.PacketTime;
import mekanism.common.util.MekanismUtils;
import mekanism.common.util.MekanismUtils.ResourceType;
import net.minecraft.client.gui.GuiButton;
import net.minecraft.client.gui.GuiScreen;
import net.minecraft.entity.player.EntityPlayer;
import org.lwjgl.opengl.GL11;
import cpw.mods.fml.relauncher.Side;

4
common/mekanism/client/gui/GuiTeleporter.java
View file

@ -3,13 +3,13 @@ package mekanism.client.gui;
import java.util.ArrayList;
import mekanism.api.Object3D;
import mekanism.common.MekanismUtils;
import mekanism.common.PacketHandler;
import mekanism.common.MekanismUtils.ResourceType;
import mekanism.common.PacketHandler.Transmission;
import mekanism.common.inventory.container.ContainerTeleporter;
import mekanism.common.network.PacketTileEntity;
import mekanism.common.tileentity.TileEntityTeleporter;
import mekanism.common.util.MekanismUtils;
import mekanism.common.util.MekanismUtils.ResourceType;
import net.minecraft.client.gui.inventory.GuiContainer;
import net.minecraft.entity.player.InventoryPlayer;

2
common/mekanism/client/gui/GuiTheoreticalElementizer.java
View file

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

4
common/mekanism/client/gui/GuiUpgradeManagement.java
View file

@ -2,11 +2,11 @@ package mekanism.client.gui;
import mekanism.api.Object3D;
import mekanism.common.IUpgradeTile;
import mekanism.common.MekanismUtils;
import mekanism.common.MekanismUtils.ResourceType;
import mekanism.common.PacketHandler;
import mekanism.common.PacketHandler.Transmission;
import mekanism.common.network.PacketRemoveUpgrade;
import mekanism.common.util.MekanismUtils;
import mekanism.common.util.MekanismUtils.ResourceType;
import net.minecraft.client.gui.inventory.GuiContainer;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.ResourceLocation;

5
common/mekanism/client/gui/GuiWeatherOrb.java
View file

@ -1,14 +1,15 @@
package mekanism.client.gui;
import mekanism.common.MekanismUtils;
import mekanism.common.PacketHandler;
import mekanism.common.MekanismUtils.ResourceType;
import mekanism.common.PacketHandler.Transmission;
import mekanism.common.network.PacketWeather;
import mekanism.common.network.PacketWeather.WeatherType;
import mekanism.common.util.MekanismUtils;
import mekanism.common.util.MekanismUtils.ResourceType;
import net.minecraft.client.gui.GuiButton;
import net.minecraft.client.gui.GuiScreen;
import net.minecraft.entity.player.EntityPlayer;
import org.lwjgl.opengl.GL11;
import cpw.mods.fml.relauncher.Side;

6
common/mekanism/client/model/ModelRendererSelectiveFace.java
View file

@ -8,9 +8,9 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
import mekanism.client.MekanismRenderer;
import mekanism.client.MekanismRenderer.BooleanArray;
import mekanism.client.MekanismRenderer.DisplayInteger;
import mekanism.client.render.MekanismRenderer;
import mekanism.client.render.MekanismRenderer.BooleanArray;
import mekanism.client.render.MekanismRenderer.DisplayInteger;
import net.minecraft.client.model.ModelBase;
import net.minecraft.client.renderer.Tessellator;

2
common/mekanism/client/model/ModelRobit.java
View file

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

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

@ -1,10 +1,10 @@
package mekanism.client;
package mekanism.client.render;
import java.util.Arrays;
import java.util.List;
import mekanism.common.ISpecialBounds;
import mekanism.common.MekanismUtils;
import mekanism.common.util.MekanismUtils;
import net.minecraft.block.Block;
import net.minecraft.client.Minecraft;
import net.minecraft.client.renderer.GLAllocation;

4
common/mekanism/client/BasicRenderingHandler.java → common/mekanism/client/render/block/BasicRenderingHandler.java
View file

@ -1,5 +1,7 @@
package mekanism.client;
package mekanism.client.render.block;
import mekanism.client.ClientProxy;
import mekanism.client.render.MekanismRenderer;
import mekanism.common.Mekanism;
import net.minecraft.block.Block;
import net.minecraft.client.renderer.RenderBlocks;

8
common/mekanism/client/MachineRenderingHandler.java → common/mekanism/client/render/block/MachineRenderingHandler.java
View file

@ -1,13 +1,15 @@
package mekanism.client;
package mekanism.client.render.block;
import mekanism.client.ClientProxy;
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.client.render.MekanismRenderer;
import mekanism.common.block.BlockMachine.MachineType;
import mekanism.common.util.MekanismUtils;
import mekanism.common.util.MekanismUtils.ResourceType;
import mekanism.common.Mekanism;
import mekanism.common.MekanismUtils;
import net.minecraft.block.Block;
import net.minecraft.client.Minecraft;
import net.minecraft.client.model.ModelChest;

7
common/mekanism/client/TransmitterRenderingHandler.java → common/mekanism/client/render/block/TransmitterRenderingHandler.java
View file

@ -1,8 +1,9 @@
package mekanism.client;
package mekanism.client.render.block;
import mekanism.client.ClientProxy;
import mekanism.client.model.ModelTransmitter;
import mekanism.common.MekanismUtils;
import mekanism.common.MekanismUtils.ResourceType;
import mekanism.common.util.MekanismUtils;
import mekanism.common.util.MekanismUtils.ResourceType;
import net.minecraft.block.Block;
import net.minecraft.client.Minecraft;
import net.minecraft.client.renderer.RenderBlocks;

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

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

6
common/mekanism/client/render/RenderRobit.java → common/mekanism/client/render/entity/RenderRobit.java
View file

@ -1,8 +1,8 @@
package mekanism.client.render;
package mekanism.client.render.entity;
import mekanism.client.model.ModelRobit;
import mekanism.common.MekanismUtils;
import mekanism.common.MekanismUtils.ResourceType;
import mekanism.common.util.MekanismUtils;
import mekanism.common.util.MekanismUtils.ResourceType;
import net.minecraft.client.renderer.entity.RenderLiving;
import net.minecraft.entity.Entity;
import net.minecraft.util.ResourceLocation;

8
common/mekanism/client/ItemRenderingHandler.java → common/mekanism/client/render/item/ItemRenderingHandler.java
View file

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

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

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

12
common/mekanism/client/render/RenderConfigurableMachine.java → common/mekanism/client/render/tileentity/RenderConfigurableMachine.java
View file

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

8
common/mekanism/client/render/RenderDynamicTank.java → common/mekanism/client/render/tileentity/RenderDynamicTank.java
View file

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

6
common/mekanism/client/render/RenderElectricChest.java → common/mekanism/client/render/tileentity/RenderElectricChest.java
View file

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

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

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

8
common/mekanism/client/render/RenderLogisticalTransporter.java → common/mekanism/client/render/tileentity/RenderLogisticalTransporter.java
View file

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

12
common/mekanism/client/render/RenderMechanicalPipe.java → common/mekanism/client/render/tileentity/RenderMechanicalPipe.java
View file

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

6
common/mekanism/client/render/RenderMetallurgicInfuser.java → common/mekanism/client/render/tileentity/RenderMetallurgicInfuser.java
View file

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

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

@ -1,4 +1,4 @@
package mekanism.client.render;
package mekanism.client.render.tileentity;
import java.util.Arrays;
import java.util.HashMap;
@ -7,15 +7,15 @@ 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.DisplayInteger;
import mekanism.client.MekanismRenderer.Model3D;
import mekanism.client.model.ModelTransmitter;
import mekanism.common.MekanismUtils;
import mekanism.common.MekanismUtils.ResourceType;
import mekanism.client.render.MekanismRenderer;
import mekanism.client.render.MekanismRenderer.BooleanArray;
import mekanism.client.render.MekanismRenderer.DisplayInteger;
import mekanism.client.render.MekanismRenderer.Model3D;
import mekanism.common.tileentity.TileEntityGasTank;
import mekanism.common.tileentity.TileEntityPressurizedTube;
import mekanism.common.util.MekanismUtils;
import mekanism.common.util.MekanismUtils.ResourceType;
import net.minecraft.block.Block;
import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
import net.minecraft.tileentity.TileEntity;

6
common/mekanism/client/render/RenderTheoreticalElementizer.java → common/mekanism/client/render/tileentity/RenderTheoreticalElementizer.java
View file

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

16
common/mekanism/client/render/RenderUniversalCable.java → common/mekanism/client/render/tileentity/RenderUniversalCable.java
View file

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

2
common/mekanism/client/IHasSound.java → common/mekanism/client/sound/IHasSound.java
View file

@ -1,4 +1,4 @@
package mekanism.client;
package mekanism.client.sound;
/**
* Implement this if your TileEntity has a specific sound.

2
common/mekanism/client/Sound.java → common/mekanism/client/sound/Sound.java
View file

@ -1,4 +1,4 @@
package mekanism.client;
package mekanism.client.sound;
import java.net.URL;

2
common/mekanism/client/SoundHandler.java → common/mekanism/client/sound/SoundHandler.java
View file

@ -1,4 +1,4 @@
package mekanism.client;
package mekanism.client.sound;
import java.net.URL;
import java.util.ArrayList;

1
common/mekanism/common/CommandMekanism.java
View file

@ -4,6 +4,7 @@ import java.util.Arrays;
import java.util.List;
import mekanism.api.EnumColor;
import mekanism.common.util.MekanismUtils;
import net.minecraft.command.CommandBase;
import net.minecraft.command.ICommandSender;
import net.minecraft.entity.player.EntityPlayer;

1
common/mekanism/common/CommonPlayerTickHandler.java
View file

@ -5,6 +5,7 @@ import java.util.EnumSet;
import mekanism.common.PacketHandler.Transmission;
import mekanism.common.item.ItemPortableTeleporter;
import mekanism.common.network.PacketStatusUpdate;
import mekanism.common.util.MekanismUtils;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import cpw.mods.fml.common.ITickHandler;

1
common/mekanism/common/EnergyNetwork.java
View file

@ -16,6 +16,7 @@ import mekanism.api.energy.IStrictEnergyAcceptor;
import mekanism.api.transmitters.DynamicNetwork;
import mekanism.api.transmitters.ITransmitter;
import mekanism.api.transmitters.TransmissionType;
import mekanism.common.util.CableUtils;
import net.minecraft.tileentity.TileEntity;
import net.minecraftforge.common.ForgeDirection;
import net.minecraftforge.common.MinecraftForge;

1
common/mekanism/common/InventoryNetwork.java
View file

@ -11,6 +11,7 @@ import mekanism.api.Object3D;
import mekanism.api.transmitters.DynamicNetwork;
import mekanism.api.transmitters.ITransmitter;
import mekanism.api.transmitters.TransmissionType;
import mekanism.common.util.TransporterUtils;
import net.minecraft.inventory.IInventory;
import net.minecraft.tileentity.TileEntity;
import net.minecraftforge.common.ForgeDirection;

5
common/mekanism/common/Mekanism.java
View file

@ -16,11 +16,10 @@ import mekanism.api.infuse.InfuseType;
import mekanism.api.infuse.InfusionInput;
import mekanism.api.transmitters.TransmitterNetworkRegistry;
import mekanism.api.Object3D;
import mekanism.client.SoundHandler;
import mekanism.client.sound.SoundHandler;
import mekanism.common.EnergyNetwork.EnergyTransferEvent;
import mekanism.common.FluidNetwork.FluidTransferEvent;
import mekanism.common.IFactory.RecipeType;
import mekanism.common.MekanismUtils.ResourceType;
import mekanism.common.PacketHandler.Transmission;
import mekanism.common.Tier.EnergyCubeTier;
import mekanism.common.Tier.FactoryTier;
@ -75,6 +74,8 @@ import mekanism.common.tileentity.TileEntityControlPanel;
import mekanism.common.tileentity.TileEntityEnergyCube;
import mekanism.common.tileentity.TileEntityGasTank;
import mekanism.common.tileentity.TileEntityTeleporter;
import mekanism.common.util.MekanismUtils;
import mekanism.common.util.MekanismUtils.ResourceType;
import net.minecraft.block.Block;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;

1
common/mekanism/common/MekanismHooks.java
View file

@ -6,6 +6,7 @@ import ic2.api.recipe.Recipes;
import java.util.Map;
import mekanism.common.RecipeHandler.Recipe;
import mekanism.common.util.MekanismUtils;
import net.minecraft.block.Block;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;

1
common/mekanism/common/TankUpdateProtocol.java
View file

@ -7,6 +7,7 @@ import mekanism.api.Object3D;
import mekanism.common.SynchronizedTankData.ValveData;
import mekanism.common.tileentity.TileEntityDynamicTank;
import mekanism.common.tileentity.TileEntityDynamicValve;
import mekanism.common.util.MekanismUtils;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.World;
import net.minecraftforge.common.ForgeDirection;

2
common/mekanism/common/ThreadGetData.java
View file

@ -1,5 +1,7 @@
package mekanism.common;
import mekanism.common.util.MekanismUtils;
/**
* Thread used to retrieve data from the Mekanism server.
* @author AidanBrady

2
common/mekanism/common/block/BlockMachine.java
View file

@ -15,7 +15,6 @@ import mekanism.common.ISpecialBounds;
import mekanism.common.ISustainedInventory;
import mekanism.common.ISustainedTank;
import mekanism.common.Mekanism;
import mekanism.common.MekanismUtils;
import mekanism.common.PacketHandler;
import mekanism.common.Tier;
import mekanism.common.IFactory.RecipeType;
@ -41,6 +40,7 @@ import mekanism.common.tileentity.TileEntityOsmiumCompressor;
import mekanism.common.tileentity.TileEntityPurificationChamber;
import mekanism.common.tileentity.TileEntityTeleporter;
import mekanism.common.tileentity.TileEntityTheoreticalElementizer;
import mekanism.common.util.MekanismUtils;
import net.minecraft.block.Block;
import net.minecraft.block.BlockContainer;
import net.minecraft.block.material.Material;

4
common/mekanism/common/block/BlockTransmitter.java
View file

@ -7,14 +7,14 @@ import mekanism.api.gas.GasTransmission;
import mekanism.api.gas.ITubeConnection;
import mekanism.api.transmitters.ITransmitter;
import mekanism.client.ClientProxy;
import mekanism.common.CableUtils;
import mekanism.common.Mekanism;
import mekanism.common.PipeUtils;
import mekanism.common.TransporterUtils;
import mekanism.common.tileentity.TileEntityLogisticalTransporter;
import mekanism.common.tileentity.TileEntityMechanicalPipe;
import mekanism.common.tileentity.TileEntityPressurizedTube;
import mekanism.common.tileentity.TileEntityUniversalCable;
import mekanism.common.util.CableUtils;
import mekanism.common.util.TransporterUtils;
import net.minecraft.block.Block;
import net.minecraft.block.material.Material;
import net.minecraft.client.renderer.texture.IconRegister;

2
common/mekanism/common/inventory/container/ContainerAdvancedElectricMachine.java
View file

@ -1,7 +1,6 @@
package mekanism.common.inventory.container;
import mekanism.api.IStorageTank;
import mekanism.common.ChargeUtils;
import mekanism.common.Mekanism;
import mekanism.common.RecipeHandler;
import mekanism.common.inventory.slot.SlotEnergy;
@ -11,6 +10,7 @@ import mekanism.common.inventory.slot.SlotEnergy.SlotDischarge;
import mekanism.common.item.ItemMachineUpgrade;
import mekanism.common.tileentity.TileEntityAdvancedElectricMachine;
import mekanism.common.tileentity.TileEntityPurificationChamber;
import mekanism.common.util.ChargeUtils;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.entity.player.InventoryPlayer;
import net.minecraft.inventory.Container;

2
common/mekanism/common/inventory/container/ContainerElectricChest.java
View file

@ -1,11 +1,11 @@
package mekanism.common.inventory.container;
import mekanism.common.ChargeUtils;
import mekanism.common.IElectricChest;
import mekanism.common.inventory.slot.SlotElectricChest;
import mekanism.common.inventory.slot.SlotEnergy;
import mekanism.common.inventory.slot.SlotEnergy.SlotDischarge;
import mekanism.common.tileentity.TileEntityElectricChest;
import mekanism.common.util.ChargeUtils;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.entity.player.InventoryPlayer;
import net.minecraft.inventory.Container;

2
common/mekanism/common/inventory/container/ContainerElectricMachine.java
View file

@ -1,6 +1,5 @@
package mekanism.common.inventory.container;
import mekanism.common.ChargeUtils;
import mekanism.common.RecipeHandler;
import mekanism.common.inventory.slot.SlotEnergy;
import mekanism.common.inventory.slot.SlotMachineUpgrade;
@ -8,6 +7,7 @@ import mekanism.common.inventory.slot.SlotOutput;
import mekanism.common.inventory.slot.SlotEnergy.SlotDischarge;
import mekanism.common.item.ItemMachineUpgrade;
import mekanism.common.tileentity.TileEntityElectricMachine;
import mekanism.common.util.ChargeUtils;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.entity.player.InventoryPlayer;
import net.minecraft.inventory.Container;

2
common/mekanism/common/inventory/container/ContainerElectricPump.java
View file

@ -1,10 +1,10 @@
package mekanism.common.inventory.container;
import mekanism.common.ChargeUtils;
import mekanism.common.inventory.slot.SlotEnergy;
import mekanism.common.inventory.slot.SlotOutput;
import mekanism.common.inventory.slot.SlotEnergy.SlotDischarge;
import mekanism.common.tileentity.TileEntityElectricPump;
import mekanism.common.util.ChargeUtils;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.entity.player.InventoryPlayer;
import net.minecraft.inventory.Container;

2
common/mekanism/common/inventory/container/ContainerEnergyCube.java
View file

@ -1,11 +1,11 @@
package mekanism.common.inventory.container;
import ic2.api.item.IElectricItem;
import mekanism.common.ChargeUtils;
import mekanism.common.inventory.slot.SlotEnergy;
import mekanism.common.inventory.slot.SlotEnergy.SlotCharge;
import mekanism.common.inventory.slot.SlotEnergy.SlotDischarge;
import mekanism.common.tileentity.TileEntityEnergyCube;
import mekanism.common.util.ChargeUtils;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.entity.player.InventoryPlayer;
import net.minecraft.inventory.Container;

2
common/mekanism/common/inventory/container/ContainerFactory.java
View file

@ -1,6 +1,5 @@
package mekanism.common.inventory.container;
import mekanism.common.ChargeUtils;
import mekanism.common.IFactory;
import mekanism.common.Tier;
import mekanism.common.IFactory.RecipeType;
@ -13,6 +12,7 @@ import mekanism.common.inventory.slot.SlotEnergy.SlotDischarge;
import mekanism.common.item.ItemBlockMachine;
import mekanism.common.item.ItemMachineUpgrade;
import mekanism.common.tileentity.TileEntityFactory;
import mekanism.common.util.ChargeUtils;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.entity.player.InventoryPlayer;
import net.minecraft.inventory.Container;

2
common/mekanism/common/inventory/container/ContainerMetallurgicInfuser.java
View file

@ -2,7 +2,6 @@ package mekanism.common.inventory.container;
import mekanism.api.infuse.InfuseRegistry;
import mekanism.api.infuse.InfusionInput;
import mekanism.common.ChargeUtils;
import mekanism.common.RecipeHandler;
import mekanism.common.RecipeHandler.Recipe;
import mekanism.common.inventory.slot.SlotEnergy;
@ -11,6 +10,7 @@ import mekanism.common.inventory.slot.SlotOutput;
import mekanism.common.inventory.slot.SlotEnergy.SlotDischarge;
import mekanism.common.item.ItemMachineUpgrade;
import mekanism.common.tileentity.TileEntityMetallurgicInfuser;
import mekanism.common.util.ChargeUtils;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.entity.player.InventoryPlayer;
import net.minecraft.inventory.Container;

2
common/mekanism/common/inventory/container/ContainerTeleporter.java
View file

@ -1,9 +1,9 @@
package mekanism.common.inventory.container;
import mekanism.common.ChargeUtils;
import mekanism.common.inventory.slot.SlotEnergy;
import mekanism.common.inventory.slot.SlotEnergy.SlotDischarge;
import mekanism.common.tileentity.TileEntityTeleporter;
import mekanism.common.util.ChargeUtils;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.entity.player.InventoryPlayer;
import net.minecraft.inventory.Container;

2
common/mekanism/common/inventory/slot/SlotEnergy.java
View file

@ -1,6 +1,6 @@
package mekanism.common.inventory.slot;
import mekanism.common.ChargeUtils;
import mekanism.common.util.ChargeUtils;
import net.minecraft.inventory.IInventory;
import net.minecraft.inventory.Slot;
import net.minecraft.item.ItemStack;

2
common/mekanism/common/item/ItemBlockMachine.java
View file

@ -12,7 +12,6 @@ import mekanism.common.IFactory;
import mekanism.common.ISustainedInventory;
import mekanism.common.ISustainedTank;
import mekanism.common.Mekanism;
import mekanism.common.MekanismUtils;
import mekanism.common.PacketHandler;
import mekanism.common.IFactory.RecipeType;
import mekanism.common.PacketHandler.Transmission;
@ -24,6 +23,7 @@ import mekanism.common.network.PacketElectricChest.ElectricChestPacketType;
import mekanism.common.tileentity.TileEntityElectricBlock;
import mekanism.common.tileentity.TileEntityElectricChest;
import mekanism.common.tileentity.TileEntityFactory;
import mekanism.common.util.MekanismUtils;
import net.minecraft.block.Block;
import net.minecraft.entity.Entity;
import net.minecraft.entity.item.EntityItem;

2
common/mekanism/common/item/ItemConfigurator.java
View file

@ -8,7 +8,6 @@ import mekanism.api.EnumColor;
import mekanism.api.IConfigurable;
import mekanism.api.Object3D;
import mekanism.api.transmitters.ITransmitter;
import mekanism.common.MekanismUtils;
import mekanism.common.PacketHandler;
import mekanism.common.PacketHandler.Transmission;
import mekanism.common.network.PacketTileEntity;
@ -18,6 +17,7 @@ import mekanism.common.tileentity.TileEntityElectricChest;
import mekanism.common.tileentity.TileEntityElectricPump;
import mekanism.common.tileentity.TileEntityLogisticalTransporter;
import mekanism.common.tileentity.TileEntityMechanicalPipe;
import mekanism.common.util.MekanismUtils;
import net.minecraft.entity.item.EntityItem;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;

2
common/mekanism/common/network/PacketElectricChest.java
View file

@ -6,9 +6,9 @@ import mekanism.api.Object3D;
import mekanism.api.energy.IEnergizedItem;
import mekanism.common.IElectricChest;
import mekanism.common.Mekanism;
import mekanism.common.MekanismUtils;
import mekanism.common.inventory.InventoryElectricChest;
import mekanism.common.tileentity.TileEntityElectricChest;
import mekanism.common.util.MekanismUtils;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.entity.player.EntityPlayerMP;
import net.minecraft.item.ItemStack;

2
common/mekanism/common/network/PacketPortableTeleport.java
View file

@ -3,11 +3,11 @@ package mekanism.common.network;
import java.io.DataOutputStream;
import mekanism.api.Object3D;
import mekanism.common.MekanismUtils;
import mekanism.common.PacketHandler;
import mekanism.common.Teleporter;
import mekanism.common.PacketHandler.Transmission;
import mekanism.common.item.ItemPortableTeleporter;
import mekanism.common.util.MekanismUtils;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.entity.player.EntityPlayerMP;
import net.minecraft.item.ItemStack;

2
common/mekanism/common/network/PacketTime.java
View file

@ -2,7 +2,7 @@ package mekanism.common.network;
import java.io.DataOutputStream;
import mekanism.common.MekanismUtils;
import mekanism.common.util.MekanismUtils;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.world.World;

4
common/mekanism/common/tileentity/TileEntityAdvancedElectricMachine.java
View file

@ -6,11 +6,11 @@ import mekanism.api.EnumColor;
import mekanism.api.IStorageTank;
import mekanism.api.SideData;
import mekanism.api.gas.EnumGas;
import mekanism.common.ChargeUtils;
import mekanism.common.Mekanism;
import mekanism.common.MekanismUtils;
import mekanism.common.RecipeHandler;
import mekanism.common.TileComponentUpgrade;
import mekanism.common.util.ChargeUtils;
import mekanism.common.util.MekanismUtils;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.util.ResourceLocation;

4
common/mekanism/common/tileentity/TileEntityBasicMachine.java
View file

@ -9,18 +9,18 @@ import mekanism.api.IUpgradeManagement;
import mekanism.api.Object3D;
import mekanism.api.SideData;
import mekanism.api.energy.IStrictEnergyAcceptor;
import mekanism.client.IHasSound;
import mekanism.client.sound.IHasSound;
import mekanism.common.IActiveState;
import mekanism.common.IElectricMachine;
import mekanism.common.IRedstoneControl;
import mekanism.common.IUpgradeTile;
import mekanism.common.Mekanism;
import mekanism.common.MekanismUtils;
import mekanism.common.PacketHandler;
import mekanism.common.TileComponentUpgrade;
import mekanism.common.IRedstoneControl.RedstoneControl;
import mekanism.common.PacketHandler.Transmission;
import mekanism.common.network.PacketTileEntity;
import mekanism.common.util.MekanismUtils;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.ResourceLocation;

4
common/mekanism/common/tileentity/TileEntityChargepad.java
View file

@ -13,14 +13,14 @@ import mekanism.api.Object3D;
import mekanism.api.energy.EnergizedItemManager;
import mekanism.api.energy.IEnergizedItem;
import mekanism.api.energy.IStrictEnergyAcceptor;
import mekanism.client.IHasSound;
import mekanism.client.sound.IHasSound;
import mekanism.common.EntityRobit;
import mekanism.common.IActiveState;
import mekanism.common.Mekanism;
import mekanism.common.MekanismUtils;
import mekanism.common.PacketHandler;
import mekanism.common.PacketHandler.Transmission;
import mekanism.common.network.PacketTileEntity;
import mekanism.common.util.MekanismUtils;
import net.minecraft.entity.EntityLiving;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.player.EntityPlayer;

2
common/mekanism/common/tileentity/TileEntityDynamicTank.java
View file

@ -6,13 +6,13 @@ import java.util.Map;
import mekanism.api.Object3D;
import mekanism.common.Mekanism;
import mekanism.common.MekanismUtils;
import mekanism.common.PacketHandler;
import mekanism.common.SynchronizedTankData;
import mekanism.common.TankUpdateProtocol;
import mekanism.common.PacketHandler.Transmission;
import mekanism.common.SynchronizedTankData.ValveData;
import mekanism.common.network.PacketTileEntity;
import mekanism.common.util.MekanismUtils;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;

2
common/mekanism/common/tileentity/TileEntityElectricChest.java
View file

@ -5,8 +5,8 @@ import ic2.api.energy.tile.IEnergySink;
import java.util.ArrayList;
import mekanism.api.energy.IStrictEnergyAcceptor;
import mekanism.common.ChargeUtils;
import mekanism.common.Mekanism;
import mekanism.common.util.ChargeUtils;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;

4
common/mekanism/common/tileentity/TileEntityElectricMachine.java
View file

@ -2,11 +2,11 @@ package mekanism.common.tileentity;
import mekanism.api.EnumColor;
import mekanism.api.SideData;
import mekanism.common.ChargeUtils;
import mekanism.common.Mekanism;
import mekanism.common.MekanismUtils;
import mekanism.common.RecipeHandler;
import mekanism.common.TileComponentUpgrade;
import mekanism.common.util.ChargeUtils;
import mekanism.common.util.MekanismUtils;
import net.minecraft.item.ItemStack;
import net.minecraft.util.ResourceLocation;
import dan200.computer.api.IComputerAccess;

4
common/mekanism/common/tileentity/TileEntityElectricPump.java
View file

@ -11,13 +11,13 @@ import java.util.Set;
import mekanism.api.Object3D;
import mekanism.api.energy.IStrictEnergyAcceptor;
import mekanism.common.ChargeUtils;
import mekanism.common.ISustainedTank;
import mekanism.common.Mekanism;
import mekanism.common.MekanismUtils;
import mekanism.common.PacketHandler;
import mekanism.common.PacketHandler.Transmission;
import mekanism.common.network.PacketTileEntity;
import mekanism.common.util.ChargeUtils;
import mekanism.common.util.MekanismUtils;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.nbt.NBTTagList;

6
common/mekanism/common/tileentity/TileEntityEnergyCube.java
View file

@ -12,14 +12,14 @@ import mekanism.api.Object3D;
import mekanism.api.energy.ICableOutputter;
import mekanism.api.energy.IStrictEnergyAcceptor;
import mekanism.api.transmitters.TransmissionType;
import mekanism.common.CableUtils;
import mekanism.common.ChargeUtils;
import mekanism.common.IRedstoneControl;
import mekanism.common.Mekanism;
import mekanism.common.MekanismUtils;
import mekanism.common.Tier;
import mekanism.common.IRedstoneControl.RedstoneControl;
import mekanism.common.Tier.EnergyCubeTier;
import mekanism.common.util.CableUtils;
import mekanism.common.util.ChargeUtils;
import mekanism.common.util.MekanismUtils;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.tileentity.TileEntity;

6
common/mekanism/common/tileentity/TileEntityFactory.java
View file

@ -10,14 +10,12 @@ import mekanism.api.IUpgradeManagement;
import mekanism.api.Object3D;
import mekanism.api.SideData;
import mekanism.api.energy.IStrictEnergyAcceptor;
import mekanism.client.IHasSound;
import mekanism.common.ChargeUtils;
import mekanism.client.sound.IHasSound;
import mekanism.common.IActiveState;
import mekanism.common.IFactory;
import mekanism.common.IRedstoneControl;
import mekanism.common.IUpgradeTile;
import mekanism.common.Mekanism;
import mekanism.common.MekanismUtils;
import mekanism.common.PacketHandler;
import mekanism.common.Tier;
import mekanism.common.TileComponentUpgrade;
@ -28,6 +26,8 @@ import mekanism.common.Tier.FactoryTier;
import mekanism.common.block.BlockMachine;
import mekanism.common.block.BlockMachine.MachineType;
import mekanism.common.network.PacketTileEntity;
import mekanism.common.util.ChargeUtils;
import mekanism.common.util.MekanismUtils;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.tileentity.TileEntity;

2
common/mekanism/common/tileentity/TileEntityGasTank.java
View file

@ -10,8 +10,8 @@ import mekanism.api.gas.IGasAcceptor;
import mekanism.api.gas.IGasStorage;
import mekanism.api.gas.ITubeConnection;
import mekanism.common.IRedstoneControl;
import mekanism.common.MekanismUtils;
import mekanism.common.IRedstoneControl.RedstoneControl;
import mekanism.common.util.MekanismUtils;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.tileentity.TileEntity;

2
common/mekanism/common/tileentity/TileEntityLogisticalTransporter.java
View file

@ -9,9 +9,9 @@ import mekanism.api.transmitters.TransmissionType;
import mekanism.common.ITileNetwork;
import mekanism.common.InventoryNetwork;
import mekanism.common.PacketHandler;
import mekanism.common.TransporterUtils;
import mekanism.common.PacketHandler.Transmission;
import mekanism.common.network.PacketDataRequest;
import mekanism.common.util.TransporterUtils;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.AxisAlignedBB;

6
common/mekanism/common/tileentity/TileEntityMetallurgicInfuser.java
View file

@ -15,13 +15,11 @@ import mekanism.api.infuse.InfuseRegistry;
import mekanism.api.infuse.InfuseType;
import mekanism.api.infuse.InfusionInput;
import mekanism.api.infuse.InfusionOutput;
import mekanism.client.IHasSound;
import mekanism.common.ChargeUtils;
import mekanism.client.sound.IHasSound;
import mekanism.common.IActiveState;
import mekanism.common.IRedstoneControl;
import mekanism.common.IUpgradeTile;
import mekanism.common.Mekanism;
import mekanism.common.MekanismUtils;
import mekanism.common.PacketHandler;
import mekanism.common.RecipeHandler;
import mekanism.common.TileComponentUpgrade;
@ -30,6 +28,8 @@ import mekanism.common.PacketHandler.Transmission;
import mekanism.common.RecipeHandler.Recipe;
import mekanism.common.block.BlockMachine.MachineType;
import mekanism.common.network.PacketTileEntity;
import mekanism.common.util.ChargeUtils;
import mekanism.common.util.MekanismUtils;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.tileentity.TileEntity;

2
common/mekanism/common/tileentity/TileEntityTeleporter.java
View file

@ -8,13 +8,13 @@ import java.util.List;
import mekanism.api.EnumColor;
import mekanism.api.Object3D;
import mekanism.api.energy.IStrictEnergyAcceptor;
import mekanism.common.ChargeUtils;
import mekanism.common.Mekanism;
import mekanism.common.PacketHandler;
import mekanism.common.Teleporter;
import mekanism.common.PacketHandler.Transmission;
import mekanism.common.Teleporter.Code;
import mekanism.common.network.PacketPortalFX;
import mekanism.common.util.ChargeUtils;
import net.minecraft.entity.Entity;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.entity.player.EntityPlayerMP;

2
common/mekanism/common/tileentity/TileEntityUniversalCable.java
View file

@ -9,9 +9,9 @@ import java.util.HashSet;
import mekanism.api.Object3D;
import mekanism.api.transmitters.ITransmitter;
import mekanism.api.transmitters.TransmissionType;
import mekanism.common.CableUtils;
import mekanism.common.EnergyNetwork;
import mekanism.common.Mekanism;
import mekanism.common.util.CableUtils;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.World;
import net.minecraftforge.common.ForgeDirection;

4
common/mekanism/common/CableUtils.java → common/mekanism/common/util/CableUtils.java
View file

@ -1,4 +1,4 @@
package mekanism.common;
package mekanism.common.util;
import ic2.api.energy.tile.IEnergyAcceptor;
import ic2.api.energy.tile.IEnergySink;
@ -14,6 +14,8 @@ import mekanism.api.energy.ICableOutputter;
import mekanism.api.energy.IStrictEnergyAcceptor;
import mekanism.api.transmitters.ITransmitter;
import mekanism.api.transmitters.TransmissionType;
import mekanism.common.EnergyNetwork;
import mekanism.common.Mekanism;
import net.minecraft.tileentity.TileEntity;
import net.minecraftforge.common.ForgeDirection;
import universalelectricity.core.block.IElectrical;

3
common/mekanism/common/ChargeUtils.java → common/mekanism/common/util/ChargeUtils.java
View file

@ -1,9 +1,10 @@
package mekanism.common;
package mekanism.common.util;
import ic2.api.item.ElectricItem;
import ic2.api.item.IElectricItem;
import mekanism.api.energy.EnergizedItemManager;
import mekanism.api.energy.IEnergizedItem;
import mekanism.common.Mekanism;
import mekanism.common.tileentity.TileEntityElectricBlock;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;

13
common/mekanism/common/MekanismUtils.java → common/mekanism/common/util/MekanismUtils.java
View file

@ -1,4 +1,4 @@
package mekanism.common;
package mekanism.common.util;
import ic2.api.Direction;
@ -14,9 +14,20 @@ import java.util.Iterator;
import mekanism.api.EnumColor;
import mekanism.api.IConfigurable;
import mekanism.api.Object3D;
import mekanism.common.DynamicTankCache;
import mekanism.common.IActiveState;
import mekanism.common.IFactory;
import mekanism.common.IModule;
import mekanism.common.IRedstoneControl;
import mekanism.common.Mekanism;
import mekanism.common.PacketHandler;
import mekanism.common.Teleporter;
import mekanism.common.Tier;
import mekanism.common.Version;
import mekanism.common.IFactory.RecipeType;
import mekanism.common.IRedstoneControl.RedstoneControl;
import mekanism.common.PacketHandler.Transmission;
import mekanism.common.Teleporter.Code;
import mekanism.common.Tier.EnergyCubeTier;
import mekanism.common.Tier.FactoryTier;
import mekanism.common.inventory.container.ContainerElectricChest;

2
common/mekanism/common/TransporterUtils.java → common/mekanism/common/util/TransporterUtils.java
View file

@ -1,4 +1,4 @@
package mekanism.common;
package mekanism.common.util;
import java.util.Arrays;

6
common/mekanism/generators/client/BlockRenderingHandler.java
View file

@ -1,8 +1,8 @@
package mekanism.generators.client;
import mekanism.client.MekanismRenderer;
import mekanism.common.MekanismUtils;
import mekanism.common.MekanismUtils.ResourceType;
import mekanism.client.render.MekanismRenderer;
import mekanism.common.util.MekanismUtils;
import mekanism.common.util.MekanismUtils.ResourceType;
import mekanism.generators.client.model.ModelAdvancedSolarGenerator;
import mekanism.generators.client.model.ModelBioGenerator;
import mekanism.generators.client.model.ModelElectrolyticSeparator;

4
common/mekanism/generators/client/gui/GuiBioGenerator.java
View file

@ -2,8 +2,8 @@ package mekanism.generators.client.gui;
import mekanism.client.gui.GuiMekanism;
import mekanism.client.gui.GuiRedstoneControl;
import mekanism.common.MekanismUtils;
import mekanism.common.MekanismUtils.ResourceType;
import mekanism.common.util.MekanismUtils;
import mekanism.common.util.MekanismUtils.ResourceType;
import mekanism.generators.common.inventory.container.ContainerBioGenerator;
import mekanism.generators.common.tileentity.TileEntityBioGenerator;
import net.minecraft.entity.player.InventoryPlayer;

4
common/mekanism/generators/client/gui/GuiElectrolyticSeparator.java
View file

@ -4,11 +4,11 @@ import java.util.ArrayList;
import mekanism.api.Object3D;
import mekanism.api.gas.EnumGas;
import mekanism.common.MekanismUtils;
import mekanism.common.PacketHandler;
import mekanism.common.MekanismUtils.ResourceType;
import mekanism.common.PacketHandler.Transmission;
import mekanism.common.network.PacketTileEntity;
import mekanism.common.util.MekanismUtils;
import mekanism.common.util.MekanismUtils.ResourceType;
import mekanism.generators.common.inventory.container.ContainerElectrolyticSeparator;
import mekanism.generators.common.tileentity.TileEntityElectrolyticSeparator;
import net.minecraft.client.gui.inventory.GuiContainer;

4
common/mekanism/generators/client/gui/GuiHeatGenerator.java
View file

@ -2,8 +2,8 @@ package mekanism.generators.client.gui;
import mekanism.client.gui.GuiMekanism;
import mekanism.client.gui.GuiRedstoneControl;
import mekanism.common.MekanismUtils;
import mekanism.common.MekanismUtils.ResourceType;
import mekanism.common.util.MekanismUtils;
import mekanism.common.util.MekanismUtils.ResourceType;
import mekanism.generators.common.inventory.container.ContainerHeatGenerator;
import mekanism.generators.common.tileentity.TileEntityHeatGenerator;
import net.minecraft.entity.player.InventoryPlayer;

4
common/mekanism/generators/client/gui/GuiHydrogenGenerator.java
View file

@ -2,8 +2,8 @@ package mekanism.generators.client.gui;
import mekanism.client.gui.GuiMekanism;
import mekanism.client.gui.GuiRedstoneControl;
import mekanism.common.MekanismUtils;
import mekanism.common.MekanismUtils.ResourceType;
import mekanism.common.util.MekanismUtils;
import mekanism.common.util.MekanismUtils.ResourceType;
import mekanism.generators.common.inventory.container.ContainerHydrogenGenerator;
import mekanism.generators.common.tileentity.TileEntityHydrogenGenerator;
import net.minecraft.entity.player.InventoryPlayer;

4
common/mekanism/generators/client/gui/GuiSolarGenerator.java
View file

@ -2,8 +2,8 @@ package mekanism.generators.client.gui;
import mekanism.client.gui.GuiMekanism;
import mekanism.client.gui.GuiRedstoneControl;
import mekanism.common.MekanismUtils;
import mekanism.common.MekanismUtils.ResourceType;
import mekanism.common.util.MekanismUtils;
import mekanism.common.util.MekanismUtils.ResourceType;
import mekanism.generators.common.inventory.container.ContainerSolarGenerator;
import mekanism.generators.common.tileentity.TileEntitySolarGenerator;
import net.minecraft.entity.player.InventoryPlayer;

4
common/mekanism/generators/client/gui/GuiWindTurbine.java
View file

@ -3,8 +3,8 @@ package mekanism.generators.client.gui;
import mekanism.api.EnumColor;
import mekanism.client.gui.GuiMekanism;
import mekanism.client.gui.GuiRedstoneControl;
import mekanism.common.MekanismUtils;
import mekanism.common.MekanismUtils.ResourceType;
import mekanism.common.util.MekanismUtils;
import mekanism.common.util.MekanismUtils.ResourceType;
import mekanism.generators.common.MekanismGenerators;
import mekanism.generators.common.inventory.container.ContainerWindTurbine;
import mekanism.generators.common.tileentity.TileEntityWindTurbine;

4
common/mekanism/generators/client/render/RenderAdvancedSolarGenerator.java
View file

@ -1,7 +1,7 @@
package mekanism.generators.client.render;
import mekanism.common.MekanismUtils;
import mekanism.common.MekanismUtils.ResourceType;
import mekanism.common.util.MekanismUtils;
import mekanism.common.util.MekanismUtils.ResourceType;
import mekanism.generators.client.model.ModelAdvancedSolarGenerator;
import mekanism.generators.common.tileentity.TileEntityAdvancedSolarGenerator;
import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;

4
common/mekanism/generators/client/render/RenderBioGenerator.java
View file

@ -1,7 +1,7 @@
package mekanism.generators.client.render;
import mekanism.common.MekanismUtils;
import mekanism.common.MekanismUtils.ResourceType;
import mekanism.common.util.MekanismUtils;
import mekanism.common.util.MekanismUtils.ResourceType;
import mekanism.generators.client.model.ModelBioGenerator;
import mekanism.generators.common.tileentity.TileEntityBioGenerator;
import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;

4
common/mekanism/generators/client/render/RenderElectrolyticSeparator.java
View file

@ -1,8 +1,8 @@
package mekanism.generators.client.render;
import mekanism.api.gas.EnumGas;
import mekanism.common.MekanismUtils;
import mekanism.common.MekanismUtils.ResourceType;
import mekanism.common.util.MekanismUtils;
import mekanism.common.util.MekanismUtils.ResourceType;
import mekanism.generators.client.model.ModelElectrolyticSeparator;
import mekanism.generators.common.tileentity.TileEntityElectrolyticSeparator;
import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;

4
common/mekanism/generators/client/render/RenderHeatGenerator.java
View file

@ -1,7 +1,7 @@
package mekanism.generators.client.render;
import mekanism.common.MekanismUtils;
import mekanism.common.MekanismUtils.ResourceType;
import mekanism.common.util.MekanismUtils;
import mekanism.common.util.MekanismUtils.ResourceType;
import mekanism.generators.client.model.ModelHeatGenerator;
import mekanism.generators.common.tileentity.TileEntityHeatGenerator;
import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;

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