diff --git a/common/mekanism/client/ClientProxy.java b/common/mekanism/client/ClientProxy.java index d3010b427..02a56f21a 100644 --- a/common/mekanism/client/ClientProxy.java +++ b/common/mekanism/client/ClientProxy.java @@ -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; diff --git a/common/mekanism/client/ClientTickHandler.java b/common/mekanism/client/ClientTickHandler.java index 9e1576537..f692d5d19 100644 --- a/common/mekanism/client/ClientTickHandler.java +++ b/common/mekanism/client/ClientTickHandler.java @@ -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; diff --git a/common/mekanism/client/gui/GuiControlPanel.java b/common/mekanism/client/gui/GuiControlPanel.java index 2477a6a37..e8b1ad072 100644 --- a/common/mekanism/client/gui/GuiControlPanel.java +++ b/common/mekanism/client/gui/GuiControlPanel.java @@ -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; diff --git a/common/mekanism/client/gui/GuiCredits.java b/common/mekanism/client/gui/GuiCredits.java index 03b736090..fecd1da00 100644 --- a/common/mekanism/client/gui/GuiCredits.java +++ b/common/mekanism/client/gui/GuiCredits.java @@ -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; diff --git a/common/mekanism/client/gui/GuiDynamicTank.java b/common/mekanism/client/gui/GuiDynamicTank.java index f44ad8dca..b48521849 100644 --- a/common/mekanism/client/gui/GuiDynamicTank.java +++ b/common/mekanism/client/gui/GuiDynamicTank.java @@ -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; diff --git a/common/mekanism/client/gui/GuiElectricChest.java b/common/mekanism/client/gui/GuiElectricChest.java index 09efb48d8..67b96997d 100644 --- a/common/mekanism/client/gui/GuiElectricChest.java +++ b/common/mekanism/client/gui/GuiElectricChest.java @@ -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; diff --git a/common/mekanism/client/gui/GuiElectricPump.java b/common/mekanism/client/gui/GuiElectricPump.java index ffaae8ad3..a643d64de 100644 --- a/common/mekanism/client/gui/GuiElectricPump.java +++ b/common/mekanism/client/gui/GuiElectricPump.java @@ -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; diff --git a/common/mekanism/client/gui/GuiEnergyCube.java b/common/mekanism/client/gui/GuiEnergyCube.java index 0b36cd558..4efe1e30e 100644 --- a/common/mekanism/client/gui/GuiEnergyCube.java +++ b/common/mekanism/client/gui/GuiEnergyCube.java @@ -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; diff --git a/common/mekanism/client/gui/GuiGasTank.java b/common/mekanism/client/gui/GuiGasTank.java index 9fd4dd760..223e4f125 100644 --- a/common/mekanism/client/gui/GuiGasTank.java +++ b/common/mekanism/client/gui/GuiGasTank.java @@ -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; diff --git a/common/mekanism/client/gui/GuiMetallurgicInfuser.java b/common/mekanism/client/gui/GuiMetallurgicInfuser.java index 207548809..e4d993555 100644 --- a/common/mekanism/client/gui/GuiMetallurgicInfuser.java +++ b/common/mekanism/client/gui/GuiMetallurgicInfuser.java @@ -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; diff --git a/common/mekanism/client/gui/GuiPasswordEnter.java b/common/mekanism/client/gui/GuiPasswordEnter.java index 840ddef38..8eacb2d41 100644 --- a/common/mekanism/client/gui/GuiPasswordEnter.java +++ b/common/mekanism/client/gui/GuiPasswordEnter.java @@ -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; diff --git a/common/mekanism/client/gui/GuiPasswordModify.java b/common/mekanism/client/gui/GuiPasswordModify.java index 17e67da0d..c9c4a0f55 100644 --- a/common/mekanism/client/gui/GuiPasswordModify.java +++ b/common/mekanism/client/gui/GuiPasswordModify.java @@ -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; diff --git a/common/mekanism/client/gui/GuiPortableTeleporter.java b/common/mekanism/client/gui/GuiPortableTeleporter.java index f9835723f..d0dadfac5 100644 --- a/common/mekanism/client/gui/GuiPortableTeleporter.java +++ b/common/mekanism/client/gui/GuiPortableTeleporter.java @@ -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; diff --git a/common/mekanism/client/gui/GuiRedstoneControl.java b/common/mekanism/client/gui/GuiRedstoneControl.java index 671e809fb..45859c400 100644 --- a/common/mekanism/client/gui/GuiRedstoneControl.java +++ b/common/mekanism/client/gui/GuiRedstoneControl.java @@ -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; diff --git a/common/mekanism/client/gui/GuiRobitCrafting.java b/common/mekanism/client/gui/GuiRobitCrafting.java index 2264a62b9..0df182189 100644 --- a/common/mekanism/client/gui/GuiRobitCrafting.java +++ b/common/mekanism/client/gui/GuiRobitCrafting.java @@ -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; diff --git a/common/mekanism/client/gui/GuiRobitInventory.java b/common/mekanism/client/gui/GuiRobitInventory.java index 804ef7c5e..ce777de4c 100644 --- a/common/mekanism/client/gui/GuiRobitInventory.java +++ b/common/mekanism/client/gui/GuiRobitInventory.java @@ -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; diff --git a/common/mekanism/client/gui/GuiRobitMain.java b/common/mekanism/client/gui/GuiRobitMain.java index 53b8d314d..7e05c913d 100644 --- a/common/mekanism/client/gui/GuiRobitMain.java +++ b/common/mekanism/client/gui/GuiRobitMain.java @@ -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; diff --git a/common/mekanism/client/gui/GuiRobitRepair.java b/common/mekanism/client/gui/GuiRobitRepair.java index 849b130aa..1e933e365 100644 --- a/common/mekanism/client/gui/GuiRobitRepair.java +++ b/common/mekanism/client/gui/GuiRobitRepair.java @@ -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; diff --git a/common/mekanism/client/gui/GuiRobitSmelting.java b/common/mekanism/client/gui/GuiRobitSmelting.java index 6a57edd98..1686da591 100644 --- a/common/mekanism/client/gui/GuiRobitSmelting.java +++ b/common/mekanism/client/gui/GuiRobitSmelting.java @@ -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; diff --git a/common/mekanism/client/gui/GuiStopwatch.java b/common/mekanism/client/gui/GuiStopwatch.java index 86849d88a..b736b1bfb 100644 --- a/common/mekanism/client/gui/GuiStopwatch.java +++ b/common/mekanism/client/gui/GuiStopwatch.java @@ -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; diff --git a/common/mekanism/client/gui/GuiTeleporter.java b/common/mekanism/client/gui/GuiTeleporter.java index 1ad2c4cef..7d6bda3d0 100644 --- a/common/mekanism/client/gui/GuiTeleporter.java +++ b/common/mekanism/client/gui/GuiTeleporter.java @@ -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; diff --git a/common/mekanism/client/gui/GuiTheoreticalElementizer.java b/common/mekanism/client/gui/GuiTheoreticalElementizer.java index 0347325af..ad0ac11d6 100644 --- a/common/mekanism/client/gui/GuiTheoreticalElementizer.java +++ b/common/mekanism/client/gui/GuiTheoreticalElementizer.java @@ -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) diff --git a/common/mekanism/client/gui/GuiUpgradeManagement.java b/common/mekanism/client/gui/GuiUpgradeManagement.java index b861f50ae..53fbddfff 100644 --- a/common/mekanism/client/gui/GuiUpgradeManagement.java +++ b/common/mekanism/client/gui/GuiUpgradeManagement.java @@ -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; diff --git a/common/mekanism/client/gui/GuiWeatherOrb.java b/common/mekanism/client/gui/GuiWeatherOrb.java index b5037af02..864b1057e 100644 --- a/common/mekanism/client/gui/GuiWeatherOrb.java +++ b/common/mekanism/client/gui/GuiWeatherOrb.java @@ -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; diff --git a/common/mekanism/client/model/ModelRendererSelectiveFace.java b/common/mekanism/client/model/ModelRendererSelectiveFace.java index 1b09ee40a..19abb98a0 100644 --- a/common/mekanism/client/model/ModelRendererSelectiveFace.java +++ b/common/mekanism/client/model/ModelRendererSelectiveFace.java @@ -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; diff --git a/common/mekanism/client/model/ModelRobit.java b/common/mekanism/client/model/ModelRobit.java index b408dd963..70c93d12b 100644 --- a/common/mekanism/client/model/ModelRobit.java +++ b/common/mekanism/client/model/ModelRobit.java @@ -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; diff --git a/common/mekanism/client/MekanismRenderer.java b/common/mekanism/client/render/MekanismRenderer.java similarity index 99% rename from common/mekanism/client/MekanismRenderer.java rename to common/mekanism/client/render/MekanismRenderer.java index d9cdc628c..004b81efd 100644 --- a/common/mekanism/client/MekanismRenderer.java +++ b/common/mekanism/client/render/MekanismRenderer.java @@ -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; diff --git a/common/mekanism/client/BasicRenderingHandler.java b/common/mekanism/client/render/block/BasicRenderingHandler.java similarity index 91% rename from common/mekanism/client/BasicRenderingHandler.java rename to common/mekanism/client/render/block/BasicRenderingHandler.java index a784cce4f..ea510d9c6 100644 --- a/common/mekanism/client/BasicRenderingHandler.java +++ b/common/mekanism/client/render/block/BasicRenderingHandler.java @@ -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; diff --git a/common/mekanism/client/MachineRenderingHandler.java b/common/mekanism/client/render/block/MachineRenderingHandler.java similarity index 94% rename from common/mekanism/client/MachineRenderingHandler.java rename to common/mekanism/client/render/block/MachineRenderingHandler.java index b46d31cba..e0998e41a 100644 --- a/common/mekanism/client/MachineRenderingHandler.java +++ b/common/mekanism/client/render/block/MachineRenderingHandler.java @@ -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; diff --git a/common/mekanism/client/TransmitterRenderingHandler.java b/common/mekanism/client/render/block/TransmitterRenderingHandler.java similarity index 92% rename from common/mekanism/client/TransmitterRenderingHandler.java rename to common/mekanism/client/render/block/TransmitterRenderingHandler.java index 8bbf124fc..190223047 100644 --- a/common/mekanism/client/TransmitterRenderingHandler.java +++ b/common/mekanism/client/render/block/TransmitterRenderingHandler.java @@ -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; diff --git a/common/mekanism/client/render/RenderObsidianTNT.java b/common/mekanism/client/render/entity/RenderObsidianTNT.java similarity index 98% rename from common/mekanism/client/render/RenderObsidianTNT.java rename to common/mekanism/client/render/entity/RenderObsidianTNT.java index 3a0f2900f..40dc2068d 100644 --- a/common/mekanism/client/render/RenderObsidianTNT.java +++ b/common/mekanism/client/render/entity/RenderObsidianTNT.java @@ -1,4 +1,4 @@ -package mekanism.client.render; +package mekanism.client.render.entity; import mekanism.common.EntityObsidianTNT; import mekanism.common.Mekanism; diff --git a/common/mekanism/client/render/RenderRobit.java b/common/mekanism/client/render/entity/RenderRobit.java similarity index 79% rename from common/mekanism/client/render/RenderRobit.java rename to common/mekanism/client/render/entity/RenderRobit.java index a3745b995..021e9d11e 100644 --- a/common/mekanism/client/render/RenderRobit.java +++ b/common/mekanism/client/render/entity/RenderRobit.java @@ -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; diff --git a/common/mekanism/client/ItemRenderingHandler.java b/common/mekanism/client/render/item/ItemRenderingHandler.java similarity index 96% rename from common/mekanism/client/ItemRenderingHandler.java rename to common/mekanism/client/render/item/ItemRenderingHandler.java index fbd9e0dd1..9aa582cba 100644 --- a/common/mekanism/client/ItemRenderingHandler.java +++ b/common/mekanism/client/render/item/ItemRenderingHandler.java @@ -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; diff --git a/common/mekanism/client/render/RenderChargepad.java b/common/mekanism/client/render/tileentity/RenderChargepad.java similarity index 90% rename from common/mekanism/client/render/RenderChargepad.java rename to common/mekanism/client/render/tileentity/RenderChargepad.java index c541dfba5..97a463fd5 100644 --- a/common/mekanism/client/render/RenderChargepad.java +++ b/common/mekanism/client/render/tileentity/RenderChargepad.java @@ -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; diff --git a/common/mekanism/client/render/RenderConfigurableMachine.java b/common/mekanism/client/render/tileentity/RenderConfigurableMachine.java similarity index 95% rename from common/mekanism/client/render/RenderConfigurableMachine.java rename to common/mekanism/client/render/tileentity/RenderConfigurableMachine.java index fc73bb089..2e99e1686 100644 --- a/common/mekanism/client/render/RenderConfigurableMachine.java +++ b/common/mekanism/client/render/tileentity/RenderConfigurableMachine.java @@ -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; diff --git a/common/mekanism/client/render/RenderDynamicTank.java b/common/mekanism/client/render/tileentity/RenderDynamicTank.java similarity index 97% rename from common/mekanism/client/render/RenderDynamicTank.java rename to common/mekanism/client/render/tileentity/RenderDynamicTank.java index f86d671ea..a3bf9eb05 100644 --- a/common/mekanism/client/render/RenderDynamicTank.java +++ b/common/mekanism/client/render/tileentity/RenderDynamicTank.java @@ -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; diff --git a/common/mekanism/client/render/RenderElectricChest.java b/common/mekanism/client/render/tileentity/RenderElectricChest.java similarity index 92% rename from common/mekanism/client/render/RenderElectricChest.java rename to common/mekanism/client/render/tileentity/RenderElectricChest.java index b0afcd674..23205556e 100644 --- a/common/mekanism/client/render/RenderElectricChest.java +++ b/common/mekanism/client/render/tileentity/RenderElectricChest.java @@ -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; diff --git a/common/mekanism/client/render/RenderElectricPump.java b/common/mekanism/client/render/tileentity/RenderElectricPump.java similarity index 88% rename from common/mekanism/client/render/RenderElectricPump.java rename to common/mekanism/client/render/tileentity/RenderElectricPump.java index fe35a697a..6b47bd879 100644 --- a/common/mekanism/client/render/RenderElectricPump.java +++ b/common/mekanism/client/render/tileentity/RenderElectricPump.java @@ -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; diff --git a/common/mekanism/client/render/RenderLogisticalTransporter.java b/common/mekanism/client/render/tileentity/RenderLogisticalTransporter.java similarity index 88% rename from common/mekanism/client/render/RenderLogisticalTransporter.java rename to common/mekanism/client/render/tileentity/RenderLogisticalTransporter.java index 49b35777f..f3bcf44ff 100644 --- a/common/mekanism/client/render/RenderLogisticalTransporter.java +++ b/common/mekanism/client/render/tileentity/RenderLogisticalTransporter.java @@ -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; diff --git a/common/mekanism/client/render/RenderMechanicalPipe.java b/common/mekanism/client/render/tileentity/RenderMechanicalPipe.java similarity index 95% rename from common/mekanism/client/render/RenderMechanicalPipe.java rename to common/mekanism/client/render/tileentity/RenderMechanicalPipe.java index 1f4d3ec70..328d96531 100644 --- a/common/mekanism/client/render/RenderMechanicalPipe.java +++ b/common/mekanism/client/render/tileentity/RenderMechanicalPipe.java @@ -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; diff --git a/common/mekanism/client/render/RenderMetallurgicInfuser.java b/common/mekanism/client/render/tileentity/RenderMetallurgicInfuser.java similarity index 91% rename from common/mekanism/client/render/RenderMetallurgicInfuser.java rename to common/mekanism/client/render/tileentity/RenderMetallurgicInfuser.java index 102dea887..151347bff 100644 --- a/common/mekanism/client/render/RenderMetallurgicInfuser.java +++ b/common/mekanism/client/render/tileentity/RenderMetallurgicInfuser.java @@ -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; diff --git a/common/mekanism/client/render/RenderPressurizedTube.java b/common/mekanism/client/render/tileentity/RenderPressurizedTube.java similarity index 95% rename from common/mekanism/client/render/RenderPressurizedTube.java rename to common/mekanism/client/render/tileentity/RenderPressurizedTube.java index cd67ab13e..89fad5663 100644 --- a/common/mekanism/client/render/RenderPressurizedTube.java +++ b/common/mekanism/client/render/tileentity/RenderPressurizedTube.java @@ -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; diff --git a/common/mekanism/client/render/RenderTheoreticalElementizer.java b/common/mekanism/client/render/tileentity/RenderTheoreticalElementizer.java similarity index 91% rename from common/mekanism/client/render/RenderTheoreticalElementizer.java rename to common/mekanism/client/render/tileentity/RenderTheoreticalElementizer.java index 7768fef97..d5e34b19e 100644 --- a/common/mekanism/client/render/RenderTheoreticalElementizer.java +++ b/common/mekanism/client/render/tileentity/RenderTheoreticalElementizer.java @@ -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; diff --git a/common/mekanism/client/render/RenderUniversalCable.java b/common/mekanism/client/render/tileentity/RenderUniversalCable.java similarity index 94% rename from common/mekanism/client/render/RenderUniversalCable.java rename to common/mekanism/client/render/tileentity/RenderUniversalCable.java index 7c787fe72..da6752904 100644 --- a/common/mekanism/client/render/RenderUniversalCable.java +++ b/common/mekanism/client/render/tileentity/RenderUniversalCable.java @@ -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; diff --git a/common/mekanism/client/IHasSound.java b/common/mekanism/client/sound/IHasSound.java similarity index 92% rename from common/mekanism/client/IHasSound.java rename to common/mekanism/client/sound/IHasSound.java index b8ee970bd..08606ae8a 100644 --- a/common/mekanism/client/IHasSound.java +++ b/common/mekanism/client/sound/IHasSound.java @@ -1,4 +1,4 @@ -package mekanism.client; +package mekanism.client.sound; /** * Implement this if your TileEntity has a specific sound. diff --git a/common/mekanism/client/Sound.java b/common/mekanism/client/sound/Sound.java similarity index 99% rename from common/mekanism/client/Sound.java rename to common/mekanism/client/sound/Sound.java index b6a3ad265..ebdd2616f 100644 --- a/common/mekanism/client/Sound.java +++ b/common/mekanism/client/sound/Sound.java @@ -1,4 +1,4 @@ -package mekanism.client; +package mekanism.client.sound; import java.net.URL; diff --git a/common/mekanism/client/SoundHandler.java b/common/mekanism/client/sound/SoundHandler.java similarity index 99% rename from common/mekanism/client/SoundHandler.java rename to common/mekanism/client/sound/SoundHandler.java index 7c34ed371..255fa7b32 100644 --- a/common/mekanism/client/SoundHandler.java +++ b/common/mekanism/client/sound/SoundHandler.java @@ -1,4 +1,4 @@ -package mekanism.client; +package mekanism.client.sound; import java.net.URL; import java.util.ArrayList; diff --git a/common/mekanism/common/CommandMekanism.java b/common/mekanism/common/CommandMekanism.java index 7f78cdff2..311ccea62 100644 --- a/common/mekanism/common/CommandMekanism.java +++ b/common/mekanism/common/CommandMekanism.java @@ -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; diff --git a/common/mekanism/common/CommonPlayerTickHandler.java b/common/mekanism/common/CommonPlayerTickHandler.java index 4e48ac7ba..c636bfacd 100644 --- a/common/mekanism/common/CommonPlayerTickHandler.java +++ b/common/mekanism/common/CommonPlayerTickHandler.java @@ -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; diff --git a/common/mekanism/common/EnergyNetwork.java b/common/mekanism/common/EnergyNetwork.java index b252c3906..5faca1028 100644 --- a/common/mekanism/common/EnergyNetwork.java +++ b/common/mekanism/common/EnergyNetwork.java @@ -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; diff --git a/common/mekanism/common/InventoryNetwork.java b/common/mekanism/common/InventoryNetwork.java index 48e31598d..5087dd4ef 100644 --- a/common/mekanism/common/InventoryNetwork.java +++ b/common/mekanism/common/InventoryNetwork.java @@ -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; diff --git a/common/mekanism/common/Mekanism.java b/common/mekanism/common/Mekanism.java index 2e266ac4a..88b51f398 100644 --- a/common/mekanism/common/Mekanism.java +++ b/common/mekanism/common/Mekanism.java @@ -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; diff --git a/common/mekanism/common/MekanismHooks.java b/common/mekanism/common/MekanismHooks.java index 8055e974a..aad07d34a 100644 --- a/common/mekanism/common/MekanismHooks.java +++ b/common/mekanism/common/MekanismHooks.java @@ -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; diff --git a/common/mekanism/common/TankUpdateProtocol.java b/common/mekanism/common/TankUpdateProtocol.java index 1070f0eae..0adb84585 100644 --- a/common/mekanism/common/TankUpdateProtocol.java +++ b/common/mekanism/common/TankUpdateProtocol.java @@ -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; diff --git a/common/mekanism/common/ThreadGetData.java b/common/mekanism/common/ThreadGetData.java index c18f21ac0..4e5f9f8ce 100644 --- a/common/mekanism/common/ThreadGetData.java +++ b/common/mekanism/common/ThreadGetData.java @@ -1,5 +1,7 @@ package mekanism.common; +import mekanism.common.util.MekanismUtils; + /** * Thread used to retrieve data from the Mekanism server. * @author AidanBrady diff --git a/common/mekanism/common/block/BlockMachine.java b/common/mekanism/common/block/BlockMachine.java index 67c56d231..d1ef8af53 100644 --- a/common/mekanism/common/block/BlockMachine.java +++ b/common/mekanism/common/block/BlockMachine.java @@ -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; diff --git a/common/mekanism/common/block/BlockTransmitter.java b/common/mekanism/common/block/BlockTransmitter.java index 12810457f..6e159a4d6 100644 --- a/common/mekanism/common/block/BlockTransmitter.java +++ b/common/mekanism/common/block/BlockTransmitter.java @@ -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; diff --git a/common/mekanism/common/inventory/container/ContainerAdvancedElectricMachine.java b/common/mekanism/common/inventory/container/ContainerAdvancedElectricMachine.java index 2ac050a4b..3658d1a95 100644 --- a/common/mekanism/common/inventory/container/ContainerAdvancedElectricMachine.java +++ b/common/mekanism/common/inventory/container/ContainerAdvancedElectricMachine.java @@ -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; diff --git a/common/mekanism/common/inventory/container/ContainerElectricChest.java b/common/mekanism/common/inventory/container/ContainerElectricChest.java index 53d676a8e..c63172d73 100644 --- a/common/mekanism/common/inventory/container/ContainerElectricChest.java +++ b/common/mekanism/common/inventory/container/ContainerElectricChest.java @@ -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; diff --git a/common/mekanism/common/inventory/container/ContainerElectricMachine.java b/common/mekanism/common/inventory/container/ContainerElectricMachine.java index d3eb8df92..b7a7e49ff 100644 --- a/common/mekanism/common/inventory/container/ContainerElectricMachine.java +++ b/common/mekanism/common/inventory/container/ContainerElectricMachine.java @@ -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; diff --git a/common/mekanism/common/inventory/container/ContainerElectricPump.java b/common/mekanism/common/inventory/container/ContainerElectricPump.java index 2641af982..c782ceca4 100644 --- a/common/mekanism/common/inventory/container/ContainerElectricPump.java +++ b/common/mekanism/common/inventory/container/ContainerElectricPump.java @@ -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; diff --git a/common/mekanism/common/inventory/container/ContainerEnergyCube.java b/common/mekanism/common/inventory/container/ContainerEnergyCube.java index 15b3dfc55..77685341e 100644 --- a/common/mekanism/common/inventory/container/ContainerEnergyCube.java +++ b/common/mekanism/common/inventory/container/ContainerEnergyCube.java @@ -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; diff --git a/common/mekanism/common/inventory/container/ContainerFactory.java b/common/mekanism/common/inventory/container/ContainerFactory.java index 0157ce16b..fc5092bf6 100644 --- a/common/mekanism/common/inventory/container/ContainerFactory.java +++ b/common/mekanism/common/inventory/container/ContainerFactory.java @@ -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; diff --git a/common/mekanism/common/inventory/container/ContainerMetallurgicInfuser.java b/common/mekanism/common/inventory/container/ContainerMetallurgicInfuser.java index 73a00af9f..daf2a1672 100644 --- a/common/mekanism/common/inventory/container/ContainerMetallurgicInfuser.java +++ b/common/mekanism/common/inventory/container/ContainerMetallurgicInfuser.java @@ -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; diff --git a/common/mekanism/common/inventory/container/ContainerTeleporter.java b/common/mekanism/common/inventory/container/ContainerTeleporter.java index 0ca38c53a..8cd38289d 100644 --- a/common/mekanism/common/inventory/container/ContainerTeleporter.java +++ b/common/mekanism/common/inventory/container/ContainerTeleporter.java @@ -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; diff --git a/common/mekanism/common/inventory/slot/SlotEnergy.java b/common/mekanism/common/inventory/slot/SlotEnergy.java index 485fd98ce..043827997 100644 --- a/common/mekanism/common/inventory/slot/SlotEnergy.java +++ b/common/mekanism/common/inventory/slot/SlotEnergy.java @@ -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; diff --git a/common/mekanism/common/item/ItemBlockMachine.java b/common/mekanism/common/item/ItemBlockMachine.java index 62af9bd92..3fc10f2f1 100644 --- a/common/mekanism/common/item/ItemBlockMachine.java +++ b/common/mekanism/common/item/ItemBlockMachine.java @@ -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; diff --git a/common/mekanism/common/item/ItemConfigurator.java b/common/mekanism/common/item/ItemConfigurator.java index ed6239cf5..75f2c0dcf 100644 --- a/common/mekanism/common/item/ItemConfigurator.java +++ b/common/mekanism/common/item/ItemConfigurator.java @@ -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; diff --git a/common/mekanism/common/network/PacketElectricChest.java b/common/mekanism/common/network/PacketElectricChest.java index 2ca454522..154404791 100644 --- a/common/mekanism/common/network/PacketElectricChest.java +++ b/common/mekanism/common/network/PacketElectricChest.java @@ -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; diff --git a/common/mekanism/common/network/PacketPortableTeleport.java b/common/mekanism/common/network/PacketPortableTeleport.java index 9915fbbf2..90adea549 100644 --- a/common/mekanism/common/network/PacketPortableTeleport.java +++ b/common/mekanism/common/network/PacketPortableTeleport.java @@ -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; diff --git a/common/mekanism/common/network/PacketTime.java b/common/mekanism/common/network/PacketTime.java index e5edafeb7..7a7bf292b 100644 --- a/common/mekanism/common/network/PacketTime.java +++ b/common/mekanism/common/network/PacketTime.java @@ -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; diff --git a/common/mekanism/common/tileentity/TileEntityAdvancedElectricMachine.java b/common/mekanism/common/tileentity/TileEntityAdvancedElectricMachine.java index a25d7ef39..91a546ac6 100644 --- a/common/mekanism/common/tileentity/TileEntityAdvancedElectricMachine.java +++ b/common/mekanism/common/tileentity/TileEntityAdvancedElectricMachine.java @@ -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; diff --git a/common/mekanism/common/tileentity/TileEntityBasicMachine.java b/common/mekanism/common/tileentity/TileEntityBasicMachine.java index 75c09cab6..a233ebcd2 100644 --- a/common/mekanism/common/tileentity/TileEntityBasicMachine.java +++ b/common/mekanism/common/tileentity/TileEntityBasicMachine.java @@ -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; diff --git a/common/mekanism/common/tileentity/TileEntityChargepad.java b/common/mekanism/common/tileentity/TileEntityChargepad.java index 508620045..cb82e9c68 100644 --- a/common/mekanism/common/tileentity/TileEntityChargepad.java +++ b/common/mekanism/common/tileentity/TileEntityChargepad.java @@ -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; diff --git a/common/mekanism/common/tileentity/TileEntityDynamicTank.java b/common/mekanism/common/tileentity/TileEntityDynamicTank.java index fea0dfe98..581a490e8 100644 --- a/common/mekanism/common/tileentity/TileEntityDynamicTank.java +++ b/common/mekanism/common/tileentity/TileEntityDynamicTank.java @@ -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; diff --git a/common/mekanism/common/tileentity/TileEntityElectricChest.java b/common/mekanism/common/tileentity/TileEntityElectricChest.java index 967512fda..440b9ddbd 100644 --- a/common/mekanism/common/tileentity/TileEntityElectricChest.java +++ b/common/mekanism/common/tileentity/TileEntityElectricChest.java @@ -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; diff --git a/common/mekanism/common/tileentity/TileEntityElectricMachine.java b/common/mekanism/common/tileentity/TileEntityElectricMachine.java index 6414fe3db..422fa317b 100644 --- a/common/mekanism/common/tileentity/TileEntityElectricMachine.java +++ b/common/mekanism/common/tileentity/TileEntityElectricMachine.java @@ -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; diff --git a/common/mekanism/common/tileentity/TileEntityElectricPump.java b/common/mekanism/common/tileentity/TileEntityElectricPump.java index c2dec6939..d4e034492 100644 --- a/common/mekanism/common/tileentity/TileEntityElectricPump.java +++ b/common/mekanism/common/tileentity/TileEntityElectricPump.java @@ -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; diff --git a/common/mekanism/common/tileentity/TileEntityEnergyCube.java b/common/mekanism/common/tileentity/TileEntityEnergyCube.java index 4cf392b26..4e4a4f690 100644 --- a/common/mekanism/common/tileentity/TileEntityEnergyCube.java +++ b/common/mekanism/common/tileentity/TileEntityEnergyCube.java @@ -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; diff --git a/common/mekanism/common/tileentity/TileEntityFactory.java b/common/mekanism/common/tileentity/TileEntityFactory.java index 2e9a432d8..35d462903 100644 --- a/common/mekanism/common/tileentity/TileEntityFactory.java +++ b/common/mekanism/common/tileentity/TileEntityFactory.java @@ -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; diff --git a/common/mekanism/common/tileentity/TileEntityGasTank.java b/common/mekanism/common/tileentity/TileEntityGasTank.java index 3c79580c0..56dd39677 100644 --- a/common/mekanism/common/tileentity/TileEntityGasTank.java +++ b/common/mekanism/common/tileentity/TileEntityGasTank.java @@ -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; diff --git a/common/mekanism/common/tileentity/TileEntityLogisticalTransporter.java b/common/mekanism/common/tileentity/TileEntityLogisticalTransporter.java index ecd4c146e..2f9534516 100644 --- a/common/mekanism/common/tileentity/TileEntityLogisticalTransporter.java +++ b/common/mekanism/common/tileentity/TileEntityLogisticalTransporter.java @@ -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; diff --git a/common/mekanism/common/tileentity/TileEntityMetallurgicInfuser.java b/common/mekanism/common/tileentity/TileEntityMetallurgicInfuser.java index d8a3e8ba7..82eceb7bf 100644 --- a/common/mekanism/common/tileentity/TileEntityMetallurgicInfuser.java +++ b/common/mekanism/common/tileentity/TileEntityMetallurgicInfuser.java @@ -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; diff --git a/common/mekanism/common/tileentity/TileEntityTeleporter.java b/common/mekanism/common/tileentity/TileEntityTeleporter.java index 2e66d6a98..9e7096182 100644 --- a/common/mekanism/common/tileentity/TileEntityTeleporter.java +++ b/common/mekanism/common/tileentity/TileEntityTeleporter.java @@ -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; diff --git a/common/mekanism/common/tileentity/TileEntityUniversalCable.java b/common/mekanism/common/tileentity/TileEntityUniversalCable.java index f060ff741..d123b1a0f 100644 --- a/common/mekanism/common/tileentity/TileEntityUniversalCable.java +++ b/common/mekanism/common/tileentity/TileEntityUniversalCable.java @@ -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; diff --git a/common/mekanism/common/CableUtils.java b/common/mekanism/common/util/CableUtils.java similarity index 98% rename from common/mekanism/common/CableUtils.java rename to common/mekanism/common/util/CableUtils.java index 2d61d9fb2..2947f83dc 100644 --- a/common/mekanism/common/CableUtils.java +++ b/common/mekanism/common/util/CableUtils.java @@ -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; diff --git a/common/mekanism/common/ChargeUtils.java b/common/mekanism/common/util/ChargeUtils.java similarity index 99% rename from common/mekanism/common/ChargeUtils.java rename to common/mekanism/common/util/ChargeUtils.java index 092bbf74e..bb67fc550 100644 --- a/common/mekanism/common/ChargeUtils.java +++ b/common/mekanism/common/util/ChargeUtils.java @@ -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; diff --git a/common/mekanism/common/MekanismUtils.java b/common/mekanism/common/util/MekanismUtils.java similarity index 98% rename from common/mekanism/common/MekanismUtils.java rename to common/mekanism/common/util/MekanismUtils.java index d30e0482a..ef749767f 100644 --- a/common/mekanism/common/MekanismUtils.java +++ b/common/mekanism/common/util/MekanismUtils.java @@ -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; diff --git a/common/mekanism/common/TransporterUtils.java b/common/mekanism/common/util/TransporterUtils.java similarity index 99% rename from common/mekanism/common/TransporterUtils.java rename to common/mekanism/common/util/TransporterUtils.java index 17cd97f5a..a06880171 100644 --- a/common/mekanism/common/TransporterUtils.java +++ b/common/mekanism/common/util/TransporterUtils.java @@ -1,4 +1,4 @@ -package mekanism.common; +package mekanism.common.util; import java.util.Arrays; diff --git a/common/mekanism/generators/client/BlockRenderingHandler.java b/common/mekanism/generators/client/BlockRenderingHandler.java index 33781d389..af83866b0 100644 --- a/common/mekanism/generators/client/BlockRenderingHandler.java +++ b/common/mekanism/generators/client/BlockRenderingHandler.java @@ -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; diff --git a/common/mekanism/generators/client/gui/GuiBioGenerator.java b/common/mekanism/generators/client/gui/GuiBioGenerator.java index d16abc0cb..3791a061f 100644 --- a/common/mekanism/generators/client/gui/GuiBioGenerator.java +++ b/common/mekanism/generators/client/gui/GuiBioGenerator.java @@ -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; diff --git a/common/mekanism/generators/client/gui/GuiElectrolyticSeparator.java b/common/mekanism/generators/client/gui/GuiElectrolyticSeparator.java index 84332db8f..947b7df90 100644 --- a/common/mekanism/generators/client/gui/GuiElectrolyticSeparator.java +++ b/common/mekanism/generators/client/gui/GuiElectrolyticSeparator.java @@ -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; diff --git a/common/mekanism/generators/client/gui/GuiHeatGenerator.java b/common/mekanism/generators/client/gui/GuiHeatGenerator.java index 38d030df8..a5d773ebe 100644 --- a/common/mekanism/generators/client/gui/GuiHeatGenerator.java +++ b/common/mekanism/generators/client/gui/GuiHeatGenerator.java @@ -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; diff --git a/common/mekanism/generators/client/gui/GuiHydrogenGenerator.java b/common/mekanism/generators/client/gui/GuiHydrogenGenerator.java index b42021b9d..215a5ec99 100644 --- a/common/mekanism/generators/client/gui/GuiHydrogenGenerator.java +++ b/common/mekanism/generators/client/gui/GuiHydrogenGenerator.java @@ -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; diff --git a/common/mekanism/generators/client/gui/GuiSolarGenerator.java b/common/mekanism/generators/client/gui/GuiSolarGenerator.java index bf393c868..02dc22892 100644 --- a/common/mekanism/generators/client/gui/GuiSolarGenerator.java +++ b/common/mekanism/generators/client/gui/GuiSolarGenerator.java @@ -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; diff --git a/common/mekanism/generators/client/gui/GuiWindTurbine.java b/common/mekanism/generators/client/gui/GuiWindTurbine.java index 43a4a8a55..849c8ca39 100644 --- a/common/mekanism/generators/client/gui/GuiWindTurbine.java +++ b/common/mekanism/generators/client/gui/GuiWindTurbine.java @@ -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; diff --git a/common/mekanism/generators/client/render/RenderAdvancedSolarGenerator.java b/common/mekanism/generators/client/render/RenderAdvancedSolarGenerator.java index 712c5e302..9bb271a20 100644 --- a/common/mekanism/generators/client/render/RenderAdvancedSolarGenerator.java +++ b/common/mekanism/generators/client/render/RenderAdvancedSolarGenerator.java @@ -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; diff --git a/common/mekanism/generators/client/render/RenderBioGenerator.java b/common/mekanism/generators/client/render/RenderBioGenerator.java index 02cf4dbb6..c9f75c0fd 100644 --- a/common/mekanism/generators/client/render/RenderBioGenerator.java +++ b/common/mekanism/generators/client/render/RenderBioGenerator.java @@ -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; diff --git a/common/mekanism/generators/client/render/RenderElectrolyticSeparator.java b/common/mekanism/generators/client/render/RenderElectrolyticSeparator.java index 7ddddcf08..af60bd929 100644 --- a/common/mekanism/generators/client/render/RenderElectrolyticSeparator.java +++ b/common/mekanism/generators/client/render/RenderElectrolyticSeparator.java @@ -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; diff --git a/common/mekanism/generators/client/render/RenderHeatGenerator.java b/common/mekanism/generators/client/render/RenderHeatGenerator.java index b4fd5d2de..290e9a8fe 100644 --- a/common/mekanism/generators/client/render/RenderHeatGenerator.java +++ b/common/mekanism/generators/client/render/RenderHeatGenerator.java @@ -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; diff --git a/common/mekanism/generators/client/render/RenderHydrogenGenerator.java b/common/mekanism/generators/client/render/RenderHydrogenGenerator.java index ba45b96fb..0907d98d3 100644 --- a/common/mekanism/generators/client/render/RenderHydrogenGenerator.java +++ b/common/mekanism/generators/client/render/RenderHydrogenGenerator.java @@ -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.ModelHydrogenGenerator; import mekanism.generators.common.tileentity.TileEntityHydrogenGenerator; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; diff --git a/common/mekanism/generators/client/render/RenderWindTurbine.java b/common/mekanism/generators/client/render/RenderWindTurbine.java index 683e4d32b..cde121ee9 100644 --- a/common/mekanism/generators/client/render/RenderWindTurbine.java +++ b/common/mekanism/generators/client/render/RenderWindTurbine.java @@ -1,8 +1,8 @@ package mekanism.generators.client.render; import mekanism.common.Mekanism; -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.ModelWindTurbine; import mekanism.generators.common.tileentity.TileEntityWindTurbine; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; diff --git a/common/mekanism/generators/common/MekanismGenerators.java b/common/mekanism/generators/common/MekanismGenerators.java index 71b64630d..86155e4ff 100644 --- a/common/mekanism/generators/common/MekanismGenerators.java +++ b/common/mekanism/generators/common/MekanismGenerators.java @@ -6,9 +6,9 @@ import mekanism.api.infuse.InfuseType; import mekanism.common.IModule; import mekanism.common.Mekanism; import mekanism.common.MekanismRecipe; -import mekanism.common.MekanismUtils; -import mekanism.common.MekanismUtils.ResourceType; import mekanism.common.item.ItemMekanism; +import mekanism.common.util.MekanismUtils; +import mekanism.common.util.MekanismUtils.ResourceType; import mekanism.common.PacketHandler; import mekanism.common.RecipeHandler; import mekanism.common.Version; diff --git a/common/mekanism/generators/common/block/BlockGenerator.java b/common/mekanism/generators/common/block/BlockGenerator.java index 38b758721..cc7178d55 100644 --- a/common/mekanism/generators/common/block/BlockGenerator.java +++ b/common/mekanism/generators/common/block/BlockGenerator.java @@ -10,9 +10,9 @@ import mekanism.common.ISpecialBounds; import mekanism.common.ISustainedInventory; import mekanism.common.ISustainedTank; import mekanism.common.Mekanism; -import mekanism.common.MekanismUtils; import mekanism.common.tileentity.TileEntityBasicBlock; import mekanism.common.tileentity.TileEntityElectricBlock; +import mekanism.common.util.MekanismUtils; import mekanism.generators.client.GeneratorsClientProxy; import mekanism.generators.common.MekanismGenerators; import mekanism.generators.common.tileentity.TileEntityAdvancedSolarGenerator; diff --git a/common/mekanism/generators/common/inventory/container/ContainerBioGenerator.java b/common/mekanism/generators/common/inventory/container/ContainerBioGenerator.java index 7fd6853fd..10a28e2cd 100644 --- a/common/mekanism/generators/common/inventory/container/ContainerBioGenerator.java +++ b/common/mekanism/generators/common/inventory/container/ContainerBioGenerator.java @@ -1,7 +1,7 @@ package mekanism.generators.common.inventory.container; -import mekanism.common.ChargeUtils; import mekanism.common.inventory.slot.SlotEnergy.SlotCharge; +import mekanism.common.util.ChargeUtils; import mekanism.generators.common.tileentity.TileEntityBioGenerator; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; diff --git a/common/mekanism/generators/common/inventory/container/ContainerElectrolyticSeparator.java b/common/mekanism/generators/common/inventory/container/ContainerElectrolyticSeparator.java index 265915013..5c04079f3 100644 --- a/common/mekanism/generators/common/inventory/container/ContainerElectrolyticSeparator.java +++ b/common/mekanism/generators/common/inventory/container/ContainerElectrolyticSeparator.java @@ -2,9 +2,9 @@ package mekanism.generators.common.inventory.container; import mekanism.api.IStorageTank; import mekanism.api.gas.EnumGas; -import mekanism.common.ChargeUtils; import mekanism.common.inventory.slot.SlotStorageTank; import mekanism.common.inventory.slot.SlotEnergy.SlotDischarge; +import mekanism.common.util.ChargeUtils; import mekanism.generators.common.tileentity.TileEntityElectrolyticSeparator; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; diff --git a/common/mekanism/generators/common/inventory/container/ContainerHeatGenerator.java b/common/mekanism/generators/common/inventory/container/ContainerHeatGenerator.java index 5670dc8af..ab40b1532 100644 --- a/common/mekanism/generators/common/inventory/container/ContainerHeatGenerator.java +++ b/common/mekanism/generators/common/inventory/container/ContainerHeatGenerator.java @@ -1,7 +1,7 @@ package mekanism.generators.common.inventory.container; -import mekanism.common.ChargeUtils; import mekanism.common.inventory.slot.SlotEnergy.SlotCharge; +import mekanism.common.util.ChargeUtils; import mekanism.generators.common.tileentity.TileEntityHeatGenerator; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; diff --git a/common/mekanism/generators/common/inventory/container/ContainerHydrogenGenerator.java b/common/mekanism/generators/common/inventory/container/ContainerHydrogenGenerator.java index aac994ac6..1ed57c51d 100644 --- a/common/mekanism/generators/common/inventory/container/ContainerHydrogenGenerator.java +++ b/common/mekanism/generators/common/inventory/container/ContainerHydrogenGenerator.java @@ -2,8 +2,8 @@ package mekanism.generators.common.inventory.container; import mekanism.api.IStorageTank; import mekanism.api.gas.EnumGas; -import mekanism.common.ChargeUtils; import mekanism.common.inventory.slot.SlotEnergy.SlotCharge; +import mekanism.common.util.ChargeUtils; import mekanism.generators.common.tileentity.TileEntityHydrogenGenerator; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; diff --git a/common/mekanism/generators/common/inventory/container/ContainerSolarGenerator.java b/common/mekanism/generators/common/inventory/container/ContainerSolarGenerator.java index 8226fb23d..cc36883b1 100644 --- a/common/mekanism/generators/common/inventory/container/ContainerSolarGenerator.java +++ b/common/mekanism/generators/common/inventory/container/ContainerSolarGenerator.java @@ -1,7 +1,7 @@ package mekanism.generators.common.inventory.container; -import mekanism.common.ChargeUtils; import mekanism.common.inventory.slot.SlotEnergy.SlotCharge; +import mekanism.common.util.ChargeUtils; import mekanism.generators.common.tileentity.TileEntitySolarGenerator; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; diff --git a/common/mekanism/generators/common/inventory/container/ContainerWindTurbine.java b/common/mekanism/generators/common/inventory/container/ContainerWindTurbine.java index 8aa741bd1..63d6eaf2d 100644 --- a/common/mekanism/generators/common/inventory/container/ContainerWindTurbine.java +++ b/common/mekanism/generators/common/inventory/container/ContainerWindTurbine.java @@ -1,7 +1,7 @@ package mekanism.generators.common.inventory.container; -import mekanism.common.ChargeUtils; import mekanism.common.inventory.slot.SlotEnergy.SlotCharge; +import mekanism.common.util.ChargeUtils; import mekanism.generators.common.tileentity.TileEntityWindTurbine; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; diff --git a/common/mekanism/generators/common/tileentity/TileEntityAdvancedSolarGenerator.java b/common/mekanism/generators/common/tileentity/TileEntityAdvancedSolarGenerator.java index 810fc41d9..a3f0a86fb 100644 --- a/common/mekanism/generators/common/tileentity/TileEntityAdvancedSolarGenerator.java +++ b/common/mekanism/generators/common/tileentity/TileEntityAdvancedSolarGenerator.java @@ -2,7 +2,7 @@ package mekanism.generators.common.tileentity; import mekanism.api.Object3D; import mekanism.common.IBoundingBlock; -import mekanism.common.MekanismUtils; +import mekanism.common.util.MekanismUtils; import mekanism.generators.common.MekanismGenerators; public class TileEntityAdvancedSolarGenerator extends TileEntitySolarGenerator implements IBoundingBlock diff --git a/common/mekanism/generators/common/tileentity/TileEntityBioGenerator.java b/common/mekanism/generators/common/tileentity/TileEntityBioGenerator.java index 8d4fc58c5..e3b11f6a6 100644 --- a/common/mekanism/generators/common/tileentity/TileEntityBioGenerator.java +++ b/common/mekanism/generators/common/tileentity/TileEntityBioGenerator.java @@ -2,10 +2,10 @@ package mekanism.generators.common.tileentity; import java.util.ArrayList; -import mekanism.client.Sound; -import mekanism.common.ChargeUtils; +import mekanism.client.sound.Sound; import mekanism.common.FluidSlot; -import mekanism.common.MekanismUtils; +import mekanism.common.util.ChargeUtils; +import mekanism.common.util.MekanismUtils; import mekanism.generators.common.MekanismGenerators; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; diff --git a/common/mekanism/generators/common/tileentity/TileEntityElectrolyticSeparator.java b/common/mekanism/generators/common/tileentity/TileEntityElectrolyticSeparator.java index 689c00f08..47308110c 100644 --- a/common/mekanism/generators/common/tileentity/TileEntityElectrolyticSeparator.java +++ b/common/mekanism/generators/common/tileentity/TileEntityElectrolyticSeparator.java @@ -13,13 +13,13 @@ import mekanism.api.gas.GasTransmission; import mekanism.api.gas.IGasAcceptor; import mekanism.api.gas.IGasStorage; import mekanism.api.gas.ITubeConnection; -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.tileentity.TileEntityElectricBlock; +import mekanism.common.util.ChargeUtils; +import mekanism.common.util.MekanismUtils; import mekanism.generators.common.MekanismGenerators; import mekanism.generators.common.block.BlockGenerator.GeneratorType; import mekanism.generators.common.network.PacketElectrolyticSeparatorParticle; diff --git a/common/mekanism/generators/common/tileentity/TileEntityGenerator.java b/common/mekanism/generators/common/tileentity/TileEntityGenerator.java index 521d26c2c..eb1198933 100644 --- a/common/mekanism/generators/common/tileentity/TileEntityGenerator.java +++ b/common/mekanism/generators/common/tileentity/TileEntityGenerator.java @@ -9,16 +9,16 @@ import java.util.EnumSet; import mekanism.api.Object3D; import mekanism.api.energy.ICableOutputter; import mekanism.api.transmitters.TransmissionType; -import mekanism.client.IHasSound; -import mekanism.common.CableUtils; +import mekanism.client.sound.IHasSound; import mekanism.common.IActiveState; import mekanism.common.IRedstoneControl; 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.tileentity.TileEntityElectricBlock; +import mekanism.common.util.CableUtils; +import mekanism.common.util.MekanismUtils; import mekanism.generators.common.MekanismGenerators; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; diff --git a/common/mekanism/generators/common/tileentity/TileEntityHeatGenerator.java b/common/mekanism/generators/common/tileentity/TileEntityHeatGenerator.java index db90cd057..aac60ac98 100644 --- a/common/mekanism/generators/common/tileentity/TileEntityHeatGenerator.java +++ b/common/mekanism/generators/common/tileentity/TileEntityHeatGenerator.java @@ -2,8 +2,8 @@ package mekanism.generators.common.tileentity; import java.util.ArrayList; -import mekanism.common.ChargeUtils; -import mekanism.common.MekanismUtils; +import mekanism.common.util.ChargeUtils; +import mekanism.common.util.MekanismUtils; import mekanism.generators.common.MekanismGenerators; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; diff --git a/common/mekanism/generators/common/tileentity/TileEntityHydrogenGenerator.java b/common/mekanism/generators/common/tileentity/TileEntityHydrogenGenerator.java index 25f6b7035..a435893b0 100644 --- a/common/mekanism/generators/common/tileentity/TileEntityHydrogenGenerator.java +++ b/common/mekanism/generators/common/tileentity/TileEntityHydrogenGenerator.java @@ -7,8 +7,8 @@ import mekanism.api.gas.EnumGas; import mekanism.api.gas.IGasAcceptor; import mekanism.api.gas.IGasStorage; import mekanism.api.gas.ITubeConnection; -import mekanism.common.ChargeUtils; -import mekanism.common.MekanismUtils; +import mekanism.common.util.ChargeUtils; +import mekanism.common.util.MekanismUtils; import mekanism.generators.common.MekanismGenerators; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; diff --git a/common/mekanism/generators/common/tileentity/TileEntitySolarGenerator.java b/common/mekanism/generators/common/tileentity/TileEntitySolarGenerator.java index d0c2431c2..43c853dfc 100644 --- a/common/mekanism/generators/common/tileentity/TileEntitySolarGenerator.java +++ b/common/mekanism/generators/common/tileentity/TileEntitySolarGenerator.java @@ -3,8 +3,8 @@ package mekanism.generators.common.tileentity; import java.util.ArrayList; import mekanism.api.Object3D; -import mekanism.common.ChargeUtils; -import mekanism.common.MekanismUtils; +import mekanism.common.util.ChargeUtils; +import mekanism.common.util.MekanismUtils; import mekanism.generators.common.MekanismGenerators; import mekanism.generators.common.block.BlockGenerator.GeneratorType; import micdoodle8.mods.galacticraft.API.ISolarLevel; diff --git a/common/mekanism/generators/common/tileentity/TileEntityWindTurbine.java b/common/mekanism/generators/common/tileentity/TileEntityWindTurbine.java index d75de35e0..142bfe613 100644 --- a/common/mekanism/generators/common/tileentity/TileEntityWindTurbine.java +++ b/common/mekanism/generators/common/tileentity/TileEntityWindTurbine.java @@ -1,9 +1,9 @@ package mekanism.generators.common.tileentity; import mekanism.api.Object3D; -import mekanism.common.ChargeUtils; import mekanism.common.IBoundingBlock; -import mekanism.common.MekanismUtils; +import mekanism.common.util.ChargeUtils; +import mekanism.common.util.MekanismUtils; import mekanism.generators.common.MekanismGenerators; import net.minecraft.item.ItemStack; import dan200.computer.api.IComputerAccess;