From 1a0821c72706b4e85fb96c46558b246d720c1920 Mon Sep 17 00:00:00 2001 From: "Aidan C. Brady" Date: Sat, 14 Jun 2014 01:35:25 +0200 Subject: [PATCH] Found work-around for javac issue - need to remember to submit an issue to oracle tomorrow --- .../java/mekanism/client/ClientTickHandler.java | 4 ++-- .../mekanism/client/gui/GuiConfiguration.java | 2 +- .../mekanism/client/gui/GuiDigitalMiner.java | 2 +- .../client/gui/GuiDigitalMinerConfig.java | 2 +- .../mekanism/client/gui/GuiElectricChest.java | 2 +- .../client/gui/GuiLogisticalSorter.java | 2 +- .../mekanism/client/gui/GuiMFilterSelect.java | 3 +-- .../client/gui/GuiMItemStackFilter.java | 2 +- .../mekanism/client/gui/GuiMMaterialFilter.java | 2 +- .../mekanism/client/gui/GuiMModIDFilter.java | 2 +- .../mekanism/client/gui/GuiMOreDictFilter.java | 2 +- .../mekanism/client/gui/GuiPasswordEnter.java | 2 +- .../mekanism/client/gui/GuiPasswordModify.java | 2 +- .../mekanism/client/gui/GuiRobitCrafting.java | 2 +- .../mekanism/client/gui/GuiRobitInventory.java | 2 +- .../java/mekanism/client/gui/GuiRobitMain.java | 2 +- .../mekanism/client/gui/GuiRobitRepair.java | 2 +- .../mekanism/client/gui/GuiRobitSmelting.java | 2 +- .../mekanism/client/gui/GuiTFilterSelect.java | 2 +- .../client/gui/GuiTItemStackFilter.java | 2 +- .../mekanism/client/gui/GuiTMaterialFilter.java | 2 +- .../mekanism/client/gui/GuiTModIDFilter.java | 5 ++--- .../mekanism/client/gui/GuiTOreDictFilter.java | 2 +- .../mekanism/common/CommonPlayerTracker.java | 4 ++-- src/main/java/mekanism/common/Mekanism.java | 2 +- .../mekanism/common/block/BlockMachine.java | 4 ++-- .../mekanism/common/item/ItemBlockMachine.java | 2 +- .../common/multipart/PartTransmitter.java | 2 +- .../network/PacketConfigurationUpdate.java | 9 ++++----- .../common/network/PacketDigitalMinerGui.java | 9 ++++----- .../common/network/PacketElectricChest.java | 16 ++++++++-------- .../common/network/PacketJetpackData.java | 13 ++++++------- .../network/PacketLogisticalSorterGui.java | 9 ++++----- .../mekanism/common/network/PacketRobit.java | 17 ++++++++--------- .../common/network/PacketScubaTankData.java | 13 ++++++------- .../common/network/PacketTransmitterUpdate.java | 15 +++++++-------- .../mekanism/common/util/MekanismUtils.java | 2 +- 37 files changed, 80 insertions(+), 89 deletions(-) diff --git a/src/main/java/mekanism/client/ClientTickHandler.java b/src/main/java/mekanism/client/ClientTickHandler.java index f09c800ae..148872f6e 100644 --- a/src/main/java/mekanism/client/ClientTickHandler.java +++ b/src/main/java/mekanism/client/ClientTickHandler.java @@ -26,9 +26,9 @@ import mekanism.common.item.ItemWalkieTalkie; import mekanism.common.network.PacketConfiguratorState.ConfiguratorStateMessage; import mekanism.common.network.PacketElectricBowState.ElectricBowStateMessage; import mekanism.common.network.PacketJetpackData.JetpackDataMessage; -import mekanism.common.network.PacketJetpackData.JetpackDataMessage.JetpackPacket; +import mekanism.common.network.PacketJetpackData.JetpackPacket; import mekanism.common.network.PacketScubaTankData.ScubaTankDataMessage; -import mekanism.common.network.PacketScubaTankData.ScubaTankDataMessage.ScubaTankPacket; +import mekanism.common.network.PacketScubaTankData.ScubaTankPacket; import mekanism.common.network.PacketWalkieTalkieState.WalkieTalkieStateMessage; import mekanism.common.util.MekanismUtils; import mekanism.common.util.StackUtils; diff --git a/src/main/java/mekanism/client/gui/GuiConfiguration.java b/src/main/java/mekanism/client/gui/GuiConfiguration.java index 26f2a5f8e..4d28ccffa 100644 --- a/src/main/java/mekanism/client/gui/GuiConfiguration.java +++ b/src/main/java/mekanism/client/gui/GuiConfiguration.java @@ -12,8 +12,8 @@ import mekanism.common.Mekanism; import mekanism.common.SideData; import mekanism.common.block.BlockMachine.MachineType; import mekanism.common.inventory.container.ContainerNull; +import mekanism.common.network.PacketConfigurationUpdate.ConfigurationPacket; import mekanism.common.network.PacketConfigurationUpdate.ConfigurationUpdateMessage; -import mekanism.common.network.PacketConfigurationUpdate.ConfigurationUpdateMessage.ConfigurationPacket; import mekanism.common.network.PacketSimpleGui.SimpleGuiMessage; import mekanism.common.tile.TileEntityContainerBlock; import mekanism.common.util.MekanismUtils; diff --git a/src/main/java/mekanism/client/gui/GuiDigitalMiner.java b/src/main/java/mekanism/client/gui/GuiDigitalMiner.java index f49eefc44..9115c5d5b 100644 --- a/src/main/java/mekanism/client/gui/GuiDigitalMiner.java +++ b/src/main/java/mekanism/client/gui/GuiDigitalMiner.java @@ -13,7 +13,7 @@ import mekanism.common.Mekanism; import mekanism.common.inventory.container.ContainerDigitalMiner; import mekanism.common.miner.ThreadMinerSearch.State; import mekanism.common.network.PacketDigitalMinerGui.DigitalMinerGuiMessage; -import mekanism.common.network.PacketDigitalMinerGui.DigitalMinerGuiMessage.MinerGuiPacket; +import mekanism.common.network.PacketDigitalMinerGui.MinerGuiPacket; import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.tile.TileEntityDigitalMiner; import mekanism.common.util.MekanismUtils; diff --git a/src/main/java/mekanism/client/gui/GuiDigitalMinerConfig.java b/src/main/java/mekanism/client/gui/GuiDigitalMinerConfig.java index 1ba7db575..08b2e248d 100644 --- a/src/main/java/mekanism/client/gui/GuiDigitalMinerConfig.java +++ b/src/main/java/mekanism/client/gui/GuiDigitalMinerConfig.java @@ -18,7 +18,7 @@ import mekanism.common.miner.MMaterialFilter; import mekanism.common.miner.MOreDictFilter; import mekanism.common.miner.MinerFilter; import mekanism.common.network.PacketDigitalMinerGui.DigitalMinerGuiMessage; -import mekanism.common.network.PacketDigitalMinerGui.DigitalMinerGuiMessage.MinerGuiPacket; +import mekanism.common.network.PacketDigitalMinerGui.MinerGuiPacket; import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.tile.TileEntityDigitalMiner; import mekanism.common.util.MekanismUtils; diff --git a/src/main/java/mekanism/client/gui/GuiElectricChest.java b/src/main/java/mekanism/client/gui/GuiElectricChest.java index fb0b9cd6e..daacc8322 100644 --- a/src/main/java/mekanism/client/gui/GuiElectricChest.java +++ b/src/main/java/mekanism/client/gui/GuiElectricChest.java @@ -8,7 +8,7 @@ import mekanism.common.IElectricChest; import mekanism.common.Mekanism; import mekanism.common.inventory.container.ContainerElectricChest; import mekanism.common.network.PacketElectricChest.ElectricChestMessage; -import mekanism.common.network.PacketElectricChest.ElectricChestMessage.ElectricChestPacketType; +import mekanism.common.network.PacketElectricChest.ElectricChestPacketType; import mekanism.common.tile.TileEntityElectricChest; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; diff --git a/src/main/java/mekanism/client/gui/GuiLogisticalSorter.java b/src/main/java/mekanism/client/gui/GuiLogisticalSorter.java index d7f7ad4a6..6541ea2ee 100644 --- a/src/main/java/mekanism/client/gui/GuiLogisticalSorter.java +++ b/src/main/java/mekanism/client/gui/GuiLogisticalSorter.java @@ -14,7 +14,7 @@ import mekanism.client.sound.SoundHandler; import mekanism.common.Mekanism; import mekanism.common.inventory.container.ContainerNull; import mekanism.common.network.PacketLogisticalSorterGui.LogisticalSorterGuiMessage; -import mekanism.common.network.PacketLogisticalSorterGui.LogisticalSorterGuiMessage.SorterGuiPacket; +import mekanism.common.network.PacketLogisticalSorterGui.SorterGuiPacket; import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.tile.TileEntityLogisticalSorter; import mekanism.common.transporter.TItemStackFilter; diff --git a/src/main/java/mekanism/client/gui/GuiMFilterSelect.java b/src/main/java/mekanism/client/gui/GuiMFilterSelect.java index 47d9575d9..bf349d764 100644 --- a/src/main/java/mekanism/client/gui/GuiMFilterSelect.java +++ b/src/main/java/mekanism/client/gui/GuiMFilterSelect.java @@ -4,9 +4,8 @@ import mekanism.api.Coord4D; import mekanism.client.sound.SoundHandler; import mekanism.common.Mekanism; import mekanism.common.inventory.container.ContainerNull; -import mekanism.common.network.PacketDigitalMinerGui; import mekanism.common.network.PacketDigitalMinerGui.DigitalMinerGuiMessage; -import mekanism.common.network.PacketDigitalMinerGui.DigitalMinerGuiMessage.MinerGuiPacket; +import mekanism.common.network.PacketDigitalMinerGui.MinerGuiPacket; import mekanism.common.tile.TileEntityDigitalMiner; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; diff --git a/src/main/java/mekanism/client/gui/GuiMItemStackFilter.java b/src/main/java/mekanism/client/gui/GuiMItemStackFilter.java index 0d16f2a00..cf842f4d5 100644 --- a/src/main/java/mekanism/client/gui/GuiMItemStackFilter.java +++ b/src/main/java/mekanism/client/gui/GuiMItemStackFilter.java @@ -7,7 +7,7 @@ import mekanism.common.Mekanism; import mekanism.common.inventory.container.ContainerFilter; import mekanism.common.miner.MItemStackFilter; import mekanism.common.network.PacketDigitalMinerGui.DigitalMinerGuiMessage; -import mekanism.common.network.PacketDigitalMinerGui.DigitalMinerGuiMessage.MinerGuiPacket; +import mekanism.common.network.PacketDigitalMinerGui.MinerGuiPacket; import mekanism.common.network.PacketEditFilter.EditFilterMessage; import mekanism.common.network.PacketNewFilter.NewFilterMessage; import mekanism.common.tile.TileEntityDigitalMiner; diff --git a/src/main/java/mekanism/client/gui/GuiMMaterialFilter.java b/src/main/java/mekanism/client/gui/GuiMMaterialFilter.java index 16b27f017..c353c68e3 100644 --- a/src/main/java/mekanism/client/gui/GuiMMaterialFilter.java +++ b/src/main/java/mekanism/client/gui/GuiMMaterialFilter.java @@ -7,7 +7,7 @@ import mekanism.common.Mekanism; import mekanism.common.inventory.container.ContainerFilter; import mekanism.common.miner.MMaterialFilter; import mekanism.common.network.PacketDigitalMinerGui.DigitalMinerGuiMessage; -import mekanism.common.network.PacketDigitalMinerGui.DigitalMinerGuiMessage.MinerGuiPacket; +import mekanism.common.network.PacketDigitalMinerGui.MinerGuiPacket; import mekanism.common.network.PacketEditFilter.EditFilterMessage; import mekanism.common.network.PacketNewFilter.NewFilterMessage; import mekanism.common.tile.TileEntityDigitalMiner; diff --git a/src/main/java/mekanism/client/gui/GuiMModIDFilter.java b/src/main/java/mekanism/client/gui/GuiMModIDFilter.java index 39ac38764..a1e902e30 100644 --- a/src/main/java/mekanism/client/gui/GuiMModIDFilter.java +++ b/src/main/java/mekanism/client/gui/GuiMModIDFilter.java @@ -10,7 +10,7 @@ import mekanism.common.Mekanism; import mekanism.common.inventory.container.ContainerFilter; import mekanism.common.miner.MModIDFilter; import mekanism.common.network.PacketDigitalMinerGui.DigitalMinerGuiMessage; -import mekanism.common.network.PacketDigitalMinerGui.DigitalMinerGuiMessage.MinerGuiPacket; +import mekanism.common.network.PacketDigitalMinerGui.MinerGuiPacket; import mekanism.common.network.PacketEditFilter.EditFilterMessage; import mekanism.common.network.PacketNewFilter.NewFilterMessage; import mekanism.common.tile.TileEntityDigitalMiner; diff --git a/src/main/java/mekanism/client/gui/GuiMOreDictFilter.java b/src/main/java/mekanism/client/gui/GuiMOreDictFilter.java index 401eb456e..19d24531a 100644 --- a/src/main/java/mekanism/client/gui/GuiMOreDictFilter.java +++ b/src/main/java/mekanism/client/gui/GuiMOreDictFilter.java @@ -10,7 +10,7 @@ import mekanism.common.Mekanism; import mekanism.common.inventory.container.ContainerFilter; import mekanism.common.miner.MOreDictFilter; import mekanism.common.network.PacketDigitalMinerGui.DigitalMinerGuiMessage; -import mekanism.common.network.PacketDigitalMinerGui.DigitalMinerGuiMessage.MinerGuiPacket; +import mekanism.common.network.PacketDigitalMinerGui.MinerGuiPacket; import mekanism.common.network.PacketEditFilter.EditFilterMessage; import mekanism.common.network.PacketNewFilter.NewFilterMessage; import mekanism.common.tile.TileEntityDigitalMiner; diff --git a/src/main/java/mekanism/client/gui/GuiPasswordEnter.java b/src/main/java/mekanism/client/gui/GuiPasswordEnter.java index 7826b4d2e..68688a477 100644 --- a/src/main/java/mekanism/client/gui/GuiPasswordEnter.java +++ b/src/main/java/mekanism/client/gui/GuiPasswordEnter.java @@ -7,7 +7,7 @@ import mekanism.client.sound.SoundHandler; import mekanism.common.IElectricChest; import mekanism.common.Mekanism; import mekanism.common.network.PacketElectricChest.ElectricChestMessage; -import mekanism.common.network.PacketElectricChest.ElectricChestMessage.ElectricChestPacketType; +import mekanism.common.network.PacketElectricChest.ElectricChestPacketType; import mekanism.common.tile.TileEntityElectricChest; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; diff --git a/src/main/java/mekanism/client/gui/GuiPasswordModify.java b/src/main/java/mekanism/client/gui/GuiPasswordModify.java index f124bb0a8..09a8d0bfe 100644 --- a/src/main/java/mekanism/client/gui/GuiPasswordModify.java +++ b/src/main/java/mekanism/client/gui/GuiPasswordModify.java @@ -5,7 +5,7 @@ import mekanism.api.EnumColor; import mekanism.common.IElectricChest; import mekanism.common.Mekanism; import mekanism.common.network.PacketElectricChest.ElectricChestMessage; -import mekanism.common.network.PacketElectricChest.ElectricChestMessage.ElectricChestPacketType; +import mekanism.common.network.PacketElectricChest.ElectricChestPacketType; import mekanism.common.tile.TileEntityElectricChest; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; diff --git a/src/main/java/mekanism/client/gui/GuiRobitCrafting.java b/src/main/java/mekanism/client/gui/GuiRobitCrafting.java index 8344cb47c..bef30bcd5 100644 --- a/src/main/java/mekanism/client/gui/GuiRobitCrafting.java +++ b/src/main/java/mekanism/client/gui/GuiRobitCrafting.java @@ -4,7 +4,7 @@ import mekanism.client.sound.SoundHandler; import mekanism.common.Mekanism; import mekanism.common.inventory.container.ContainerRobitCrafting; import mekanism.common.network.PacketRobit.RobitMessage; -import mekanism.common.network.PacketRobit.RobitMessage.RobitPacketType; +import mekanism.common.network.PacketRobit.RobitPacketType; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.entity.player.InventoryPlayer; diff --git a/src/main/java/mekanism/client/gui/GuiRobitInventory.java b/src/main/java/mekanism/client/gui/GuiRobitInventory.java index afb387794..0c58f63a4 100644 --- a/src/main/java/mekanism/client/gui/GuiRobitInventory.java +++ b/src/main/java/mekanism/client/gui/GuiRobitInventory.java @@ -5,7 +5,7 @@ import mekanism.common.Mekanism; import mekanism.common.entity.EntityRobit; import mekanism.common.inventory.container.ContainerRobitInventory; import mekanism.common.network.PacketRobit.RobitMessage; -import mekanism.common.network.PacketRobit.RobitMessage.RobitPacketType; +import mekanism.common.network.PacketRobit.RobitPacketType; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.entity.player.InventoryPlayer; diff --git a/src/main/java/mekanism/client/gui/GuiRobitMain.java b/src/main/java/mekanism/client/gui/GuiRobitMain.java index 828195a2a..74b3a89bf 100644 --- a/src/main/java/mekanism/client/gui/GuiRobitMain.java +++ b/src/main/java/mekanism/client/gui/GuiRobitMain.java @@ -5,7 +5,7 @@ import mekanism.common.Mekanism; import mekanism.common.entity.EntityRobit; import mekanism.common.inventory.container.ContainerRobitMain; import mekanism.common.network.PacketRobit.RobitMessage; -import mekanism.common.network.PacketRobit.RobitMessage.RobitPacketType; +import mekanism.common.network.PacketRobit.RobitPacketType; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.client.gui.GuiButton; diff --git a/src/main/java/mekanism/client/gui/GuiRobitRepair.java b/src/main/java/mekanism/client/gui/GuiRobitRepair.java index df592995c..a7456eade 100644 --- a/src/main/java/mekanism/client/gui/GuiRobitRepair.java +++ b/src/main/java/mekanism/client/gui/GuiRobitRepair.java @@ -6,7 +6,7 @@ import mekanism.client.sound.SoundHandler; import mekanism.common.Mekanism; import mekanism.common.inventory.container.ContainerRobitRepair; import mekanism.common.network.PacketRobit.RobitMessage; -import mekanism.common.network.PacketRobit.RobitMessage.RobitPacketType; +import mekanism.common.network.PacketRobit.RobitPacketType; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.client.gui.GuiTextField; diff --git a/src/main/java/mekanism/client/gui/GuiRobitSmelting.java b/src/main/java/mekanism/client/gui/GuiRobitSmelting.java index 813c924ad..8ed95f2d1 100644 --- a/src/main/java/mekanism/client/gui/GuiRobitSmelting.java +++ b/src/main/java/mekanism/client/gui/GuiRobitSmelting.java @@ -5,7 +5,7 @@ import mekanism.common.Mekanism; import mekanism.common.entity.EntityRobit; import mekanism.common.inventory.container.ContainerRobitSmelting; import mekanism.common.network.PacketRobit.RobitMessage; -import mekanism.common.network.PacketRobit.RobitMessage.RobitPacketType; +import mekanism.common.network.PacketRobit.RobitPacketType; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.entity.player.InventoryPlayer; diff --git a/src/main/java/mekanism/client/gui/GuiTFilterSelect.java b/src/main/java/mekanism/client/gui/GuiTFilterSelect.java index df300f514..9a44aab09 100644 --- a/src/main/java/mekanism/client/gui/GuiTFilterSelect.java +++ b/src/main/java/mekanism/client/gui/GuiTFilterSelect.java @@ -5,7 +5,7 @@ import mekanism.client.sound.SoundHandler; import mekanism.common.Mekanism; import mekanism.common.inventory.container.ContainerNull; import mekanism.common.network.PacketLogisticalSorterGui.LogisticalSorterGuiMessage; -import mekanism.common.network.PacketLogisticalSorterGui.LogisticalSorterGuiMessage.SorterGuiPacket; +import mekanism.common.network.PacketLogisticalSorterGui.SorterGuiPacket; import mekanism.common.tile.TileEntityLogisticalSorter; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; diff --git a/src/main/java/mekanism/client/gui/GuiTItemStackFilter.java b/src/main/java/mekanism/client/gui/GuiTItemStackFilter.java index 5a76db9f4..bf02a3f78 100644 --- a/src/main/java/mekanism/client/gui/GuiTItemStackFilter.java +++ b/src/main/java/mekanism/client/gui/GuiTItemStackFilter.java @@ -8,7 +8,7 @@ import mekanism.common.Mekanism; import mekanism.common.inventory.container.ContainerFilter; import mekanism.common.network.PacketEditFilter.EditFilterMessage; import mekanism.common.network.PacketLogisticalSorterGui.LogisticalSorterGuiMessage; -import mekanism.common.network.PacketLogisticalSorterGui.LogisticalSorterGuiMessage.SorterGuiPacket; +import mekanism.common.network.PacketLogisticalSorterGui.SorterGuiPacket; import mekanism.common.network.PacketNewFilter.NewFilterMessage; import mekanism.common.tile.TileEntityLogisticalSorter; import mekanism.common.transporter.TItemStackFilter; diff --git a/src/main/java/mekanism/client/gui/GuiTMaterialFilter.java b/src/main/java/mekanism/client/gui/GuiTMaterialFilter.java index 83e5a27d7..d3b6a6c18 100644 --- a/src/main/java/mekanism/client/gui/GuiTMaterialFilter.java +++ b/src/main/java/mekanism/client/gui/GuiTMaterialFilter.java @@ -8,7 +8,7 @@ import mekanism.common.Mekanism; import mekanism.common.inventory.container.ContainerFilter; import mekanism.common.network.PacketEditFilter.EditFilterMessage; import mekanism.common.network.PacketLogisticalSorterGui.LogisticalSorterGuiMessage; -import mekanism.common.network.PacketLogisticalSorterGui.LogisticalSorterGuiMessage.SorterGuiPacket; +import mekanism.common.network.PacketLogisticalSorterGui.SorterGuiPacket; import mekanism.common.network.PacketNewFilter.NewFilterMessage; import mekanism.common.tile.TileEntityLogisticalSorter; import mekanism.common.transporter.TMaterialFilter; diff --git a/src/main/java/mekanism/client/gui/GuiTModIDFilter.java b/src/main/java/mekanism/client/gui/GuiTModIDFilter.java index eb7320a4a..1fe34e7ae 100644 --- a/src/main/java/mekanism/client/gui/GuiTModIDFilter.java +++ b/src/main/java/mekanism/client/gui/GuiTModIDFilter.java @@ -11,13 +11,13 @@ import mekanism.common.Mekanism; import mekanism.common.inventory.container.ContainerFilter; import mekanism.common.network.PacketEditFilter.EditFilterMessage; import mekanism.common.network.PacketLogisticalSorterGui.LogisticalSorterGuiMessage; -import mekanism.common.network.PacketLogisticalSorterGui.LogisticalSorterGuiMessage.SorterGuiPacket; +import mekanism.common.network.PacketLogisticalSorterGui.SorterGuiPacket; import mekanism.common.network.PacketNewFilter.NewFilterMessage; import mekanism.common.tile.TileEntityLogisticalSorter; import mekanism.common.transporter.TModIDFilter; import mekanism.common.util.MekanismUtils; -import mekanism.common.util.TransporterUtils; import mekanism.common.util.MekanismUtils.ResourceType; +import mekanism.common.util.TransporterUtils; import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiTextField; import net.minecraft.entity.player.EntityPlayer; @@ -29,7 +29,6 @@ import org.lwjgl.input.Keyboard; import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL12; -import cpw.mods.fml.common.registry.GameData; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/mekanism/client/gui/GuiTOreDictFilter.java b/src/main/java/mekanism/client/gui/GuiTOreDictFilter.java index ffa7844d8..0079dab00 100644 --- a/src/main/java/mekanism/client/gui/GuiTOreDictFilter.java +++ b/src/main/java/mekanism/client/gui/GuiTOreDictFilter.java @@ -11,7 +11,7 @@ import mekanism.common.Mekanism; import mekanism.common.inventory.container.ContainerFilter; import mekanism.common.network.PacketEditFilter.EditFilterMessage; import mekanism.common.network.PacketLogisticalSorterGui.LogisticalSorterGuiMessage; -import mekanism.common.network.PacketLogisticalSorterGui.LogisticalSorterGuiMessage.SorterGuiPacket; +import mekanism.common.network.PacketLogisticalSorterGui.SorterGuiPacket; import mekanism.common.network.PacketNewFilter.NewFilterMessage; import mekanism.common.tile.TileEntityLogisticalSorter; import mekanism.common.transporter.TOreDictFilter; diff --git a/src/main/java/mekanism/common/CommonPlayerTracker.java b/src/main/java/mekanism/common/CommonPlayerTracker.java index 7a2306433..42054c155 100644 --- a/src/main/java/mekanism/common/CommonPlayerTracker.java +++ b/src/main/java/mekanism/common/CommonPlayerTracker.java @@ -3,9 +3,9 @@ package mekanism.common; import mekanism.common.network.PacketBoxBlacklist.BoxBlacklistMessage; import mekanism.common.network.PacketConfigSync.ConfigSyncMessage; import mekanism.common.network.PacketJetpackData.JetpackDataMessage; -import mekanism.common.network.PacketJetpackData.JetpackDataMessage.JetpackPacket; +import mekanism.common.network.PacketJetpackData.JetpackPacket; import mekanism.common.network.PacketScubaTankData.ScubaTankDataMessage; -import mekanism.common.network.PacketScubaTankData.ScubaTankDataMessage.ScubaTankPacket; +import mekanism.common.network.PacketScubaTankData.ScubaTankPacket; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraftforge.common.MinecraftForge; import cpw.mods.fml.common.eventhandler.SubscribeEvent; diff --git a/src/main/java/mekanism/common/Mekanism.java b/src/main/java/mekanism/common/Mekanism.java index 895359ae2..86c1e11ee 100644 --- a/src/main/java/mekanism/common/Mekanism.java +++ b/src/main/java/mekanism/common/Mekanism.java @@ -90,8 +90,8 @@ import mekanism.common.multipart.ItemGlowPanel; import mekanism.common.multipart.ItemPartTransmitter; import mekanism.common.multipart.MultipartMekanism; import mekanism.common.network.PacketDataRequest.DataRequestMessage; +import mekanism.common.network.PacketTransmitterUpdate.PacketType; import mekanism.common.network.PacketTransmitterUpdate.TransmitterUpdateMessage; -import mekanism.common.network.PacketTransmitterUpdate.TransmitterUpdateMessage.PacketType; import mekanism.common.recipe.BinRecipe; import mekanism.common.recipe.MekanismRecipe; import mekanism.common.recipe.RecipeHandler; diff --git a/src/main/java/mekanism/common/block/BlockMachine.java b/src/main/java/mekanism/common/block/BlockMachine.java index 30fae4ed6..c3bfcbb22 100644 --- a/src/main/java/mekanism/common/block/BlockMachine.java +++ b/src/main/java/mekanism/common/block/BlockMachine.java @@ -21,9 +21,9 @@ import mekanism.common.ItemAttacher; import mekanism.common.Mekanism; import mekanism.common.miner.MinerFilter; import mekanism.common.network.PacketElectricChest.ElectricChestMessage; -import mekanism.common.network.PacketElectricChest.ElectricChestMessage.ElectricChestPacketType; +import mekanism.common.network.PacketElectricChest.ElectricChestPacketType; import mekanism.common.network.PacketLogisticalSorterGui.LogisticalSorterGuiMessage; -import mekanism.common.network.PacketLogisticalSorterGui.LogisticalSorterGuiMessage.SorterGuiPacket; +import mekanism.common.network.PacketLogisticalSorterGui.SorterGuiPacket; import mekanism.common.tile.TileEntityAdvancedFactory; import mekanism.common.tile.TileEntityBasicBlock; import mekanism.common.tile.TileEntityChargepad; diff --git a/src/main/java/mekanism/common/item/ItemBlockMachine.java b/src/main/java/mekanism/common/item/ItemBlockMachine.java index 981157bf2..1a1f8d7c9 100644 --- a/src/main/java/mekanism/common/item/ItemBlockMachine.java +++ b/src/main/java/mekanism/common/item/ItemBlockMachine.java @@ -26,7 +26,7 @@ import mekanism.common.integration.IC2ItemManager; import mekanism.common.inventory.InventoryElectricChest; import mekanism.common.miner.MinerFilter; import mekanism.common.network.PacketElectricChest.ElectricChestMessage; -import mekanism.common.network.PacketElectricChest.ElectricChestMessage.ElectricChestPacketType; +import mekanism.common.network.PacketElectricChest.ElectricChestPacketType; import mekanism.common.tile.TileEntityChemicalInfuser; import mekanism.common.tile.TileEntityChemicalOxidizer; import mekanism.common.tile.TileEntityDigitalMiner; diff --git a/src/main/java/mekanism/common/multipart/PartTransmitter.java b/src/main/java/mekanism/common/multipart/PartTransmitter.java index 709fcb177..3b442bd1d 100644 --- a/src/main/java/mekanism/common/multipart/PartTransmitter.java +++ b/src/main/java/mekanism/common/multipart/PartTransmitter.java @@ -11,8 +11,8 @@ import mekanism.api.transmitters.TransmitterNetworkRegistry; import mekanism.client.ClientTickHandler; import mekanism.common.IConfigurable; import mekanism.common.Mekanism; +import mekanism.common.network.PacketTransmitterUpdate.PacketType; import mekanism.common.network.PacketTransmitterUpdate.TransmitterUpdateMessage; -import mekanism.common.network.PacketTransmitterUpdate.TransmitterUpdateMessage.PacketType; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.util.ForgeDirection; import codechicken.multipart.TileMultipart; diff --git a/src/main/java/mekanism/common/network/PacketConfigurationUpdate.java b/src/main/java/mekanism/common/network/PacketConfigurationUpdate.java index b578e6af8..36d49364d 100644 --- a/src/main/java/mekanism/common/network/PacketConfigurationUpdate.java +++ b/src/main/java/mekanism/common/network/PacketConfigurationUpdate.java @@ -10,7 +10,6 @@ import mekanism.common.ITileNetwork; import mekanism.common.Mekanism; import mekanism.common.PacketHandler; import mekanism.common.network.PacketConfigurationUpdate.ConfigurationUpdateMessage; -import mekanism.common.network.PacketConfigurationUpdate.ConfigurationUpdateMessage.ConfigurationPacket; import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.tile.TileEntityBasicBlock; import mekanism.common.util.MekanismUtils; @@ -188,10 +187,10 @@ public class PacketConfigurationUpdate implements IMessageHandler entityId = dataStream.readInt(); } } + } - public static enum RobitPacketType - { - GUI, - FOLLOW, - NAME, - GO_HOME, - DROP_PICKUP; - } + public static enum RobitPacketType + { + GUI, + FOLLOW, + NAME, + GO_HOME, + DROP_PICKUP; } } diff --git a/src/main/java/mekanism/common/network/PacketScubaTankData.java b/src/main/java/mekanism/common/network/PacketScubaTankData.java index 12b577100..a44ffbb36 100644 --- a/src/main/java/mekanism/common/network/PacketScubaTankData.java +++ b/src/main/java/mekanism/common/network/PacketScubaTankData.java @@ -5,7 +5,6 @@ import mekanism.common.Mekanism; import mekanism.common.PacketHandler; import mekanism.common.item.ItemScubaTank; import mekanism.common.network.PacketScubaTankData.ScubaTankDataMessage; -import mekanism.common.network.PacketScubaTankData.ScubaTankDataMessage.ScubaTankPacket; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import cpw.mods.fml.common.network.simpleimpl.IMessage; @@ -110,12 +109,12 @@ public class PacketScubaTankData implements IMessageHandler