From 98aa20c1cd8c2efef9744f5f7590966b0634ce3a Mon Sep 17 00:00:00 2001 From: p455w0rd Date: Tue, 14 Jun 2016 12:12:57 -0400 Subject: [PATCH] Minor update to fix an issue with EC2+Official EC2 Update --- gradle.properties | 2 +- latestversionrv2.txt | 2 +- latestversionrv3.txt | 2 +- .../api/gui/ICraftingIssuerContainer.java | 4 +- .../client/gui/GuiCraftConfirm.java | 16 ++++---- .../client/gui/GuiCraftingCPU.java | 20 +++++----- .../client/gui/GuiCraftingStatus.java | 10 ++--- .../client/gui/WCTBaseGui.java | 23 +++++------ .../client/gui/widgets/GuiScrollbar.java | 2 +- .../client/gui/widgets/GuiTabButton.java | 4 +- .../client/me/ClientDCInternalInv.java | 3 +- .../client/me/InternalSlotME.java | 3 +- .../client/me/ItemRepo.java | 6 +-- .../client/me/SlotDisconnected.java | 4 +- .../client/me/SlotME.java | 3 +- .../client/me/WCTRenderItem.java | 11 +++-- .../client/textures/IStateIconTexture.java | 1 + .../common/WirelessCraftingTerminal.java | 19 +++++---- .../container/ContainerCraftAmount.java | 12 +++--- .../container/ContainerCraftConfirm.java | 37 +++++++++-------- .../container/ContainerCraftingCPU.java | 24 +++++------ .../container/ContainerCraftingStatus.java | 4 +- .../container/ContainerOpenContext.java | 3 +- .../common/container/WCTBaseContainer.java | 40 +++++++++---------- .../common/container/guisync/SyncData.java | 2 +- .../container/slot/AppEngCraftingSlot.java | 3 +- .../common/container/slot/AppEngSlot.java | 4 +- .../common/container/slot/SlotBooster.java | 4 +- .../container/slot/SlotCraftingTerm.java | 13 +++--- .../core/sync/WCTPacket.java | 3 +- .../core/sync/WCTPacketHandlerBase.java | 2 +- .../core/sync/network/IPacketHandler.java | 3 +- .../core/sync/network/NetworkHandler.java | 8 ++-- .../sync/network/WCTClientPacketHandler.java | 3 +- .../sync/network/WCTServerPacketHandler.java | 5 +-- .../core/sync/packets/PacketCraftRequest.java | 9 ++--- .../sync/packets/PacketInventoryAction.java | 2 +- .../sync/packets/PacketMEInventoryUpdate.java | 12 +++--- .../core/sync/packets/PacketNEIRecipe.java | 40 +++++++++---------- .../core/sync/packets/PacketPartialItem.java | 3 +- .../core/sync/packets/PacketProgressBar.java | 3 +- .../core/sync/packets/PacketSetJobBytes.java | 1 + .../core/sync/packets/PacketSwapSlots.java | 2 +- .../core/sync/packets/PacketValueConfig.java | 2 +- .../helpers/WirelessTerminalGuiObject.java | 10 ++--- .../implementation/WirelessAELink.java | 2 +- .../integration/modules/NEI.java | 14 +++---- .../NEIHelpers/NEIAEShapedRecipeHandler.java | 23 +++++------ .../NEIHelpers/NEICraftingHandler.java | 9 ++--- .../modules/helpers/NullRFHandler.java | 3 +- .../items/ItemInfinityBooster.java | 2 +- .../proxy/CommonProxy.java | 1 + 52 files changed, 212 insertions(+), 231 deletions(-) diff --git a/gradle.properties b/gradle.properties index b09a6a9..c40c438 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,6 +1,6 @@ aeversion=rv3 wctchannel=b -wctbuild=1.8.6.2 +wctbuild=1.8.7.1 wctgroup=net.p455w0rd.wirelesscraftingterminal wctbasename=WirelessCraftingTerminal diff --git a/latestversionrv2.txt b/latestversionrv2.txt index 4140ad6..fe089e9 100644 --- a/latestversionrv2.txt +++ b/latestversionrv2.txt @@ -1 +1 @@ -1.7.10-rv2-1.8.6.2b \ No newline at end of file +1.7.10-rv2-1.8.7b \ No newline at end of file diff --git a/latestversionrv3.txt b/latestversionrv3.txt index f56d3a9..7ef7a49 100644 --- a/latestversionrv3.txt +++ b/latestversionrv3.txt @@ -1 +1 @@ -1.7.10-rv3-1.8.6.3b \ No newline at end of file +1.7.10-rv3-1.8.7.1b \ No newline at end of file diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/api/gui/ICraftingIssuerContainer.java b/src/java/net/p455w0rd/wirelesscraftingterminal/api/gui/ICraftingIssuerContainer.java index d4af8d4..bfdfae2 100644 --- a/src/java/net/p455w0rd/wirelesscraftingterminal/api/gui/ICraftingIssuerContainer.java +++ b/src/java/net/p455w0rd/wirelesscraftingterminal/api/gui/ICraftingIssuerContainer.java @@ -1,9 +1,9 @@ package net.p455w0rd.wirelesscraftingterminal.api.gui; -import net.p455w0rd.wirelesscraftingterminal.api.grid.ICraftingIssuerHost; - import javax.annotation.Nonnull; +import net.p455w0rd.wirelesscraftingterminal.api.grid.ICraftingIssuerHost; + public interface ICraftingIssuerContainer { @Nonnull diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/client/gui/GuiCraftConfirm.java b/src/java/net/p455w0rd/wirelesscraftingterminal/client/gui/GuiCraftConfirm.java index b1d14aa..3a0766f 100644 --- a/src/java/net/p455w0rd/wirelesscraftingterminal/client/gui/GuiCraftConfirm.java +++ b/src/java/net/p455w0rd/wirelesscraftingterminal/client/gui/GuiCraftConfirm.java @@ -6,10 +6,18 @@ import java.util.ArrayList; import java.util.Iterator; import java.util.LinkedList; import java.util.List; -import com.google.common.base.Joiner; + import org.lwjgl.input.Mouse; import org.lwjgl.opengl.GL11; +import com.google.common.base.Joiner; + +import appeng.api.AEApi; +import appeng.api.storage.ITerminalHost; +import appeng.api.storage.data.IAEItemStack; +import appeng.api.storage.data.IItemList; +import appeng.core.localization.GuiText; +import appeng.util.Platform; import net.minecraft.client.gui.GuiButton; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.item.ItemStack; @@ -21,12 +29,6 @@ import net.p455w0rd.wirelesscraftingterminal.core.sync.packets.PacketSwitchGuis; import net.p455w0rd.wirelesscraftingterminal.core.sync.packets.PacketValueConfig; import net.p455w0rd.wirelesscraftingterminal.helpers.WirelessTerminalGuiObject; import net.p455w0rd.wirelesscraftingterminal.reference.Reference; -import appeng.api.AEApi; -import appeng.api.storage.ITerminalHost; -import appeng.api.storage.data.IAEItemStack; -import appeng.api.storage.data.IItemList; -import appeng.core.localization.GuiText; -import appeng.util.Platform; public class GuiCraftConfirm extends WCTBaseGui { diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/client/gui/GuiCraftingCPU.java b/src/java/net/p455w0rd/wirelesscraftingterminal/client/gui/GuiCraftingCPU.java index cb52d03..2a9f2cf 100644 --- a/src/java/net/p455w0rd/wirelesscraftingterminal/client/gui/GuiCraftingCPU.java +++ b/src/java/net/p455w0rd/wirelesscraftingterminal/client/gui/GuiCraftingCPU.java @@ -7,19 +7,11 @@ import java.util.LinkedList; import java.util.List; import java.util.concurrent.TimeUnit; -import com.google.common.base.Joiner; - import org.apache.commons.lang3.time.DurationFormatUtils; import org.lwjgl.opengl.GL11; -import net.minecraft.client.gui.GuiButton; -import net.minecraft.entity.player.InventoryPlayer; -import net.minecraft.item.ItemStack; -import net.p455w0rd.wirelesscraftingterminal.client.gui.widgets.GuiScrollbar; -import net.p455w0rd.wirelesscraftingterminal.common.container.ContainerCraftingCPU; -import net.p455w0rd.wirelesscraftingterminal.common.utils.WCTLog; -import net.p455w0rd.wirelesscraftingterminal.core.sync.network.NetworkHandler; -import net.p455w0rd.wirelesscraftingterminal.core.sync.packets.PacketValueConfig; +import com.google.common.base.Joiner; + import appeng.api.AEApi; import appeng.api.config.SortDir; import appeng.api.config.SortOrder; @@ -32,6 +24,14 @@ import appeng.core.AEConfig; import appeng.core.localization.GuiText; import appeng.util.Platform; import appeng.util.ReadableNumberConverter; +import net.minecraft.client.gui.GuiButton; +import net.minecraft.entity.player.InventoryPlayer; +import net.minecraft.item.ItemStack; +import net.p455w0rd.wirelesscraftingterminal.client.gui.widgets.GuiScrollbar; +import net.p455w0rd.wirelesscraftingterminal.common.container.ContainerCraftingCPU; +import net.p455w0rd.wirelesscraftingterminal.common.utils.WCTLog; +import net.p455w0rd.wirelesscraftingterminal.core.sync.network.NetworkHandler; +import net.p455w0rd.wirelesscraftingterminal.core.sync.packets.PacketValueConfig; public class GuiCraftingCPU extends WCTBaseGui implements ISortSource diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/client/gui/GuiCraftingStatus.java b/src/java/net/p455w0rd/wirelesscraftingterminal/client/gui/GuiCraftingStatus.java index 7c5e473..e648728 100644 --- a/src/java/net/p455w0rd/wirelesscraftingterminal/client/gui/GuiCraftingStatus.java +++ b/src/java/net/p455w0rd/wirelesscraftingterminal/client/gui/GuiCraftingStatus.java @@ -4,6 +4,11 @@ import java.io.IOException; import org.lwjgl.input.Mouse; +import appeng.api.AEApi; +import appeng.api.definitions.IDefinitions; +import appeng.api.definitions.IParts; +import appeng.api.storage.ITerminalHost; +import appeng.core.localization.GuiText; import net.minecraft.client.gui.GuiButton; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.item.ItemStack; @@ -17,11 +22,6 @@ import net.p455w0rd.wirelesscraftingterminal.helpers.WirelessTerminalGuiObject; import net.p455w0rd.wirelesscraftingterminal.items.ItemEnum; import net.p455w0rd.wirelesscraftingterminal.items.ItemWirelessCraftingTerminal; import net.p455w0rd.wirelesscraftingterminal.reference.Reference; -import appeng.api.AEApi; -import appeng.api.definitions.IDefinitions; -import appeng.api.definitions.IParts; -import appeng.api.storage.ITerminalHost; -import appeng.core.localization.GuiText; public class GuiCraftingStatus extends GuiCraftingCPU diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/client/gui/WCTBaseGui.java b/src/java/net/p455w0rd/wirelesscraftingterminal/client/gui/WCTBaseGui.java index b142bba..e57e612 100644 --- a/src/java/net/p455w0rd/wirelesscraftingterminal/client/gui/WCTBaseGui.java +++ b/src/java/net/p455w0rd/wirelesscraftingterminal/client/gui/WCTBaseGui.java @@ -10,14 +10,20 @@ import java.util.List; import java.util.Set; import java.util.concurrent.TimeUnit; -import com.google.common.base.Joiner; -import com.google.common.base.Stopwatch; - import org.lwjgl.input.Keyboard; import org.lwjgl.input.Mouse; import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL12; +import com.google.common.base.Joiner; +import com.google.common.base.Stopwatch; + +import appeng.api.storage.data.IAEItemStack; +import appeng.client.gui.widgets.ITooltip; +import appeng.container.slot.SlotRestrictedInput; +import appeng.helpers.InventoryAction; +import cpw.mods.fml.common.Loader; +import cpw.mods.fml.common.ObfuscationReflectionHelper; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.inventory.GuiContainer; @@ -29,12 +35,12 @@ import net.minecraft.inventory.Container; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; -import net.p455w0rd.wirelesscraftingterminal.common.container.WCTBaseContainer; import net.p455w0rd.wirelesscraftingterminal.client.gui.widgets.GuiScrollbar; -import net.p455w0rd.wirelesscraftingterminal.client.me.WCTRenderItem; import net.p455w0rd.wirelesscraftingterminal.client.me.InternalSlotME; import net.p455w0rd.wirelesscraftingterminal.client.me.SlotDisconnected; import net.p455w0rd.wirelesscraftingterminal.client.me.SlotME; +import net.p455w0rd.wirelesscraftingterminal.client.me.WCTRenderItem; +import net.p455w0rd.wirelesscraftingterminal.common.container.WCTBaseContainer; import net.p455w0rd.wirelesscraftingterminal.common.container.slot.AppEngCraftingSlot; import net.p455w0rd.wirelesscraftingterminal.common.container.slot.AppEngSlot; import net.p455w0rd.wirelesscraftingterminal.common.container.slot.AppEngSlot.hasCalculatedValidness; @@ -51,13 +57,6 @@ import net.p455w0rd.wirelesscraftingterminal.core.sync.packets.PacketSwapSlots; import net.p455w0rd.wirelesscraftingterminal.integration.IntegrationRegistry; import net.p455w0rd.wirelesscraftingterminal.integration.IntegrationType; import net.p455w0rd.wirelesscraftingterminal.integration.abstraction.INEI; -import cpw.mods.fml.common.Loader; -import cpw.mods.fml.common.ObfuscationReflectionHelper; - -import appeng.api.storage.data.IAEItemStack; -import appeng.client.gui.widgets.ITooltip; -import appeng.container.slot.SlotRestrictedInput; -import appeng.helpers.InventoryAction; public abstract class WCTBaseGui extends GuiContainer { private static boolean switchingGuis; diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/client/gui/widgets/GuiScrollbar.java b/src/java/net/p455w0rd/wirelesscraftingterminal/client/gui/widgets/GuiScrollbar.java index 0e6269a..630eb9b 100644 --- a/src/java/net/p455w0rd/wirelesscraftingterminal/client/gui/widgets/GuiScrollbar.java +++ b/src/java/net/p455w0rd/wirelesscraftingterminal/client/gui/widgets/GuiScrollbar.java @@ -4,8 +4,8 @@ import org.lwjgl.opengl.GL11; import appeng.client.gui.widgets.IScrollSource; import net.minecraft.client.gui.inventory.GuiContainer; -import net.p455w0rd.wirelesscraftingterminal.client.gui.WCTBaseGui; import net.p455w0rd.wirelesscraftingterminal.client.gui.GuiWirelessCraftingTerminal; +import net.p455w0rd.wirelesscraftingterminal.client.gui.WCTBaseGui; public class GuiScrollbar implements IScrollSource { diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/client/gui/widgets/GuiTabButton.java b/src/java/net/p455w0rd/wirelesscraftingterminal/client/gui/widgets/GuiTabButton.java index d5aea31..cdb1516 100644 --- a/src/java/net/p455w0rd/wirelesscraftingterminal/client/gui/widgets/GuiTabButton.java +++ b/src/java/net/p455w0rd/wirelesscraftingterminal/client/gui/widgets/GuiTabButton.java @@ -3,14 +3,14 @@ package net.p455w0rd.wirelesscraftingterminal.client.gui.widgets; import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL12; +import appeng.client.gui.widgets.ITooltip; +import appeng.client.texture.ExtraBlockTextures; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.FontRenderer; import net.minecraft.client.gui.GuiButton; import net.minecraft.client.renderer.RenderHelper; import net.minecraft.client.renderer.entity.RenderItem; import net.minecraft.item.ItemStack; -import appeng.client.gui.widgets.ITooltip; -import appeng.client.texture.ExtraBlockTextures; public class GuiTabButton extends GuiButton implements ITooltip diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/client/me/ClientDCInternalInv.java b/src/java/net/p455w0rd/wirelesscraftingterminal/client/me/ClientDCInternalInv.java index 1c75c07..33e9960 100644 --- a/src/java/net/p455w0rd/wirelesscraftingterminal/client/me/ClientDCInternalInv.java +++ b/src/java/net/p455w0rd/wirelesscraftingterminal/client/me/ClientDCInternalInv.java @@ -2,10 +2,9 @@ package net.p455w0rd.wirelesscraftingterminal.client.me; import javax.annotation.Nonnull; -import net.minecraft.util.StatCollector; - import appeng.tile.inventory.AppEngInternalInventory; import appeng.util.ItemSorters; +import net.minecraft.util.StatCollector; public class ClientDCInternalInv implements Comparable diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/client/me/InternalSlotME.java b/src/java/net/p455w0rd/wirelesscraftingterminal/client/me/InternalSlotME.java index 097f62d..6706dbf 100644 --- a/src/java/net/p455w0rd/wirelesscraftingterminal/client/me/InternalSlotME.java +++ b/src/java/net/p455w0rd/wirelesscraftingterminal/client/me/InternalSlotME.java @@ -1,8 +1,7 @@ package net.p455w0rd.wirelesscraftingterminal.client.me; -import net.minecraft.item.ItemStack; - import appeng.api.storage.data.IAEItemStack; +import net.minecraft.item.ItemStack; public class InternalSlotME diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/client/me/ItemRepo.java b/src/java/net/p455w0rd/wirelesscraftingterminal/client/me/ItemRepo.java index e1f4f30..c5b143c 100644 --- a/src/java/net/p455w0rd/wirelesscraftingterminal/client/me/ItemRepo.java +++ b/src/java/net/p455w0rd/wirelesscraftingterminal/client/me/ItemRepo.java @@ -8,10 +8,6 @@ import java.util.regex.Pattern; import javax.annotation.Nonnull; -import net.minecraft.item.ItemStack; - -import cpw.mods.fml.relauncher.ReflectionHelper; - import appeng.api.AEApi; import appeng.api.config.SearchBoxMode; import appeng.api.config.Settings; @@ -27,6 +23,8 @@ import appeng.items.storage.ItemViewCell; import appeng.util.ItemSorters; import appeng.util.Platform; import appeng.util.prioitylist.IPartitionList; +import cpw.mods.fml.relauncher.ReflectionHelper; +import net.minecraft.item.ItemStack; public class ItemRepo diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/client/me/SlotDisconnected.java b/src/java/net/p455w0rd/wirelesscraftingterminal/client/me/SlotDisconnected.java index a6d3f70..3786bf2 100644 --- a/src/java/net/p455w0rd/wirelesscraftingterminal/client/me/SlotDisconnected.java +++ b/src/java/net/p455w0rd/wirelesscraftingterminal/client/me/SlotDisconnected.java @@ -1,11 +1,11 @@ package net.p455w0rd.wirelesscraftingterminal.client.me; +import appeng.items.misc.ItemEncodedPattern; +import appeng.util.Platform; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.p455w0rd.wirelesscraftingterminal.common.container.slot.AppEngSlot; -import appeng.items.misc.ItemEncodedPattern; -import appeng.util.Platform; public class SlotDisconnected extends AppEngSlot diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/client/me/SlotME.java b/src/java/net/p455w0rd/wirelesscraftingterminal/client/me/SlotME.java index 48dfe9a..0e7f82e 100644 --- a/src/java/net/p455w0rd/wirelesscraftingterminal/client/me/SlotME.java +++ b/src/java/net/p455w0rd/wirelesscraftingterminal/client/me/SlotME.java @@ -1,12 +1,11 @@ package net.p455w0rd.wirelesscraftingterminal.client.me; +import appeng.api.storage.data.IAEItemStack; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; -import appeng.api.storage.data.IAEItemStack; - public class SlotME extends Slot { diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/client/me/WCTRenderItem.java b/src/java/net/p455w0rd/wirelesscraftingterminal/client/me/WCTRenderItem.java index 958c3bc..11416fe 100644 --- a/src/java/net/p455w0rd/wirelesscraftingterminal/client/me/WCTRenderItem.java +++ b/src/java/net/p455w0rd/wirelesscraftingterminal/client/me/WCTRenderItem.java @@ -4,18 +4,17 @@ import javax.annotation.Nonnull; import org.lwjgl.opengl.GL11; -import net.minecraft.client.gui.FontRenderer; -import net.minecraft.client.renderer.Tessellator; -import net.minecraft.client.renderer.entity.RenderItem; -import net.minecraft.client.renderer.texture.TextureManager; -import net.minecraft.item.ItemStack; - import appeng.api.storage.data.IAEItemStack; import appeng.core.AEConfig; import appeng.core.localization.GuiText; import appeng.util.ISlimReadableNumberConverter; import appeng.util.IWideReadableNumberConverter; import appeng.util.ReadableNumberConverter; +import net.minecraft.client.gui.FontRenderer; +import net.minecraft.client.renderer.Tessellator; +import net.minecraft.client.renderer.entity.RenderItem; +import net.minecraft.client.renderer.texture.TextureManager; +import net.minecraft.item.ItemStack; /** diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/client/textures/IStateIconTexture.java b/src/java/net/p455w0rd/wirelesscraftingterminal/client/textures/IStateIconTexture.java index a5930cb..c4dbdcd 100644 --- a/src/java/net/p455w0rd/wirelesscraftingterminal/client/textures/IStateIconTexture.java +++ b/src/java/net/p455w0rd/wirelesscraftingterminal/client/textures/IStateIconTexture.java @@ -1,6 +1,7 @@ package net.p455w0rd.wirelesscraftingterminal.client.textures; import javax.annotation.Nonnull; + import net.minecraft.util.ResourceLocation; /** diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/common/WirelessCraftingTerminal.java b/src/java/net/p455w0rd/wirelesscraftingterminal/common/WirelessCraftingTerminal.java index 2481540..07aa890 100644 --- a/src/java/net/p455w0rd/wirelesscraftingterminal/common/WirelessCraftingTerminal.java +++ b/src/java/net/p455w0rd/wirelesscraftingterminal/common/WirelessCraftingTerminal.java @@ -1,15 +1,20 @@ package net.p455w0rd.wirelesscraftingterminal.common; -import net.minecraft.creativetab.CreativeTabs; -import cpw.mods.fml.common.*; -import cpw.mods.fml.common.Mod.*; -import cpw.mods.fml.common.event.*; -import cpw.mods.fml.common.network.NetworkRegistry; - import java.io.File; import appeng.api.AEApi; import appeng.api.features.IWirelessTermHandler; +import cpw.mods.fml.common.FMLCommonHandler; +import cpw.mods.fml.common.LoaderState; +import cpw.mods.fml.common.Mod; +import cpw.mods.fml.common.Mod.EventHandler; +import cpw.mods.fml.common.Mod.Instance; +import cpw.mods.fml.common.SidedProxy; +import cpw.mods.fml.common.event.FMLInitializationEvent; +import cpw.mods.fml.common.event.FMLPostInitializationEvent; +import cpw.mods.fml.common.event.FMLPreInitializationEvent; +import cpw.mods.fml.common.network.NetworkRegistry; +import net.minecraft.creativetab.CreativeTabs; import net.p455w0rd.wirelesscraftingterminal.common.utils.WCTLog; import net.p455w0rd.wirelesscraftingterminal.core.sync.network.NetworkHandler; import net.p455w0rd.wirelesscraftingterminal.creativetab.CreativeTabWCT; @@ -17,9 +22,9 @@ import net.p455w0rd.wirelesscraftingterminal.handlers.AchievementHandler; import net.p455w0rd.wirelesscraftingterminal.handlers.ConfigHandler; import net.p455w0rd.wirelesscraftingterminal.handlers.RecipeHandler; import net.p455w0rd.wirelesscraftingterminal.integration.IntegrationRegistry; +import net.p455w0rd.wirelesscraftingterminal.items.ItemEnum; import net.p455w0rd.wirelesscraftingterminal.proxy.CommonProxy; import net.p455w0rd.wirelesscraftingterminal.reference.Reference; -import net.p455w0rd.wirelesscraftingterminal.items.ItemEnum; @Mod(modid = Reference.MODID, acceptedMinecraftVersions = "[1.7.10]", name = Reference.NAME, version = Reference.VERSION, guiFactory = Reference.GUI_FACTORY, dependencies = "" + "required-after:Forge@[" diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/common/container/ContainerCraftAmount.java b/src/java/net/p455w0rd/wirelesscraftingterminal/common/container/ContainerCraftAmount.java index 3bd0295..49f06f9 100644 --- a/src/java/net/p455w0rd/wirelesscraftingterminal/common/container/ContainerCraftAmount.java +++ b/src/java/net/p455w0rd/wirelesscraftingterminal/common/container/ContainerCraftAmount.java @@ -2,18 +2,18 @@ package net.p455w0rd.wirelesscraftingterminal.common.container; import javax.annotation.Nonnull; -import net.minecraft.entity.player.InventoryPlayer; -import net.minecraft.inventory.Slot; -import net.minecraft.world.World; -import net.p455w0rd.wirelesscraftingterminal.api.networking.security.WCTIActionHost; -import net.p455w0rd.wirelesscraftingterminal.api.networking.security.WCTPlayerSource; -import net.p455w0rd.wirelesscraftingterminal.common.container.slot.SlotInaccessible; import appeng.api.config.SecurityPermissions; import appeng.api.networking.IGrid; import appeng.api.networking.security.BaseActionSource; import appeng.api.storage.ITerminalHost; import appeng.api.storage.data.IAEItemStack; import appeng.tile.inventory.AppEngInternalInventory; +import net.minecraft.entity.player.InventoryPlayer; +import net.minecraft.inventory.Slot; +import net.minecraft.world.World; +import net.p455w0rd.wirelesscraftingterminal.api.networking.security.WCTIActionHost; +import net.p455w0rd.wirelesscraftingterminal.api.networking.security.WCTPlayerSource; +import net.p455w0rd.wirelesscraftingterminal.common.container.slot.SlotInaccessible; public class ContainerCraftAmount extends WCTBaseContainer diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/common/container/ContainerCraftConfirm.java b/src/java/net/p455w0rd/wirelesscraftingterminal/common/container/ContainerCraftConfirm.java index 9c53327..e291bce 100644 --- a/src/java/net/p455w0rd/wirelesscraftingterminal/common/container/ContainerCraftConfirm.java +++ b/src/java/net/p455w0rd/wirelesscraftingterminal/common/container/ContainerCraftConfirm.java @@ -9,25 +9,6 @@ import javax.annotation.Nonnull; import com.google.common.collect.ImmutableSet; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.entity.player.EntityPlayerMP; -import net.minecraft.entity.player.InventoryPlayer; -import net.minecraft.inventory.ICrafting; -import net.minecraft.util.ChatComponentText; -import net.minecraft.world.World; -import net.p455w0rd.wirelesscraftingterminal.api.networking.security.WCTIActionHost; -import net.p455w0rd.wirelesscraftingterminal.api.networking.security.WCTPlayerSource; -import net.p455w0rd.wirelesscraftingterminal.common.WCTGuiHandler; -import net.p455w0rd.wirelesscraftingterminal.common.container.guisync.GuiSync; -import net.p455w0rd.wirelesscraftingterminal.common.utils.WCTLog; -import net.p455w0rd.wirelesscraftingterminal.core.sync.network.NetworkHandler; -import net.p455w0rd.wirelesscraftingterminal.core.sync.packets.PacketMEInventoryUpdate; -import net.p455w0rd.wirelesscraftingterminal.core.sync.packets.PacketSetJobBytes; -import net.p455w0rd.wirelesscraftingterminal.common.container.CraftingCPURecord; -import net.p455w0rd.wirelesscraftingterminal.core.sync.packets.PacketSwitchGuis; -import net.p455w0rd.wirelesscraftingterminal.core.sync.packets.PacketUpdateCPUInfo; -import net.p455w0rd.wirelesscraftingterminal.helpers.WirelessTerminalGuiObject; -import net.p455w0rd.wirelesscraftingterminal.reference.Reference; import appeng.api.AEApi; import appeng.api.config.Actionable; import appeng.api.config.SecurityPermissions; @@ -43,6 +24,24 @@ import appeng.api.storage.ITerminalHost; import appeng.api.storage.data.IAEItemStack; import appeng.api.storage.data.IItemList; import appeng.util.Platform; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.EntityPlayerMP; +import net.minecraft.entity.player.InventoryPlayer; +import net.minecraft.inventory.ICrafting; +import net.minecraft.util.ChatComponentText; +import net.minecraft.world.World; +import net.p455w0rd.wirelesscraftingterminal.api.networking.security.WCTIActionHost; +import net.p455w0rd.wirelesscraftingterminal.api.networking.security.WCTPlayerSource; +import net.p455w0rd.wirelesscraftingterminal.common.WCTGuiHandler; +import net.p455w0rd.wirelesscraftingterminal.common.container.guisync.GuiSync; +import net.p455w0rd.wirelesscraftingterminal.common.utils.WCTLog; +import net.p455w0rd.wirelesscraftingterminal.core.sync.network.NetworkHandler; +import net.p455w0rd.wirelesscraftingterminal.core.sync.packets.PacketMEInventoryUpdate; +import net.p455w0rd.wirelesscraftingterminal.core.sync.packets.PacketSetJobBytes; +import net.p455w0rd.wirelesscraftingterminal.core.sync.packets.PacketSwitchGuis; +import net.p455w0rd.wirelesscraftingterminal.core.sync.packets.PacketUpdateCPUInfo; +import net.p455w0rd.wirelesscraftingterminal.helpers.WirelessTerminalGuiObject; +import net.p455w0rd.wirelesscraftingterminal.reference.Reference; public class ContainerCraftConfirm extends WCTBaseContainer diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/common/container/ContainerCraftingCPU.java b/src/java/net/p455w0rd/wirelesscraftingterminal/common/container/ContainerCraftingCPU.java index e635f6e..f3954f6 100644 --- a/src/java/net/p455w0rd/wirelesscraftingterminal/common/container/ContainerCraftingCPU.java +++ b/src/java/net/p455w0rd/wirelesscraftingterminal/common/container/ContainerCraftingCPU.java @@ -2,6 +2,18 @@ package net.p455w0rd.wirelesscraftingterminal.common.container; import java.io.IOException; +import appeng.api.AEApi; +import appeng.api.networking.IGrid; +import appeng.api.networking.crafting.CraftingItemList; +import appeng.api.networking.crafting.ICraftingCPU; +import appeng.api.networking.security.BaseActionSource; +import appeng.api.networking.storage.IBaseMonitor; +import appeng.api.storage.IMEMonitorHandlerReceiver; +import appeng.api.storage.data.IAEItemStack; +import appeng.api.storage.data.IItemList; +import appeng.helpers.ICustomNameObject; +import appeng.me.cluster.implementations.CraftingCPUCluster; +import appeng.util.Platform; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.entity.player.InventoryPlayer; @@ -16,18 +28,6 @@ import net.p455w0rd.wirelesscraftingterminal.core.sync.network.NetworkHandler; import net.p455w0rd.wirelesscraftingterminal.core.sync.packets.PacketMEInventoryUpdate; import net.p455w0rd.wirelesscraftingterminal.core.sync.packets.PacketValueConfig; import net.p455w0rd.wirelesscraftingterminal.helpers.WirelessTerminalGuiObject; -import appeng.api.AEApi; -import appeng.api.networking.IGrid; -import appeng.api.networking.crafting.CraftingItemList; -import appeng.api.networking.crafting.ICraftingCPU; -import appeng.api.networking.security.BaseActionSource; -import appeng.api.networking.storage.IBaseMonitor; -import appeng.api.storage.IMEMonitorHandlerReceiver; -import appeng.api.storage.data.IAEItemStack; -import appeng.api.storage.data.IItemList; -import appeng.helpers.ICustomNameObject; -import appeng.me.cluster.implementations.CraftingCPUCluster; -import appeng.util.Platform; public class ContainerCraftingCPU extends WCTBaseContainer implements IMEMonitorHandlerReceiver, ICustomNameObject diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/common/container/ContainerCraftingStatus.java b/src/java/net/p455w0rd/wirelesscraftingterminal/common/container/ContainerCraftingStatus.java index d6b0c27..280d98e 100644 --- a/src/java/net/p455w0rd/wirelesscraftingterminal/common/container/ContainerCraftingStatus.java +++ b/src/java/net/p455w0rd/wirelesscraftingterminal/common/container/ContainerCraftingStatus.java @@ -6,11 +6,11 @@ import java.util.List; import com.google.common.collect.ImmutableSet; -import net.minecraft.entity.player.InventoryPlayer; -import net.p455w0rd.wirelesscraftingterminal.common.container.guisync.GuiSync; import appeng.api.networking.crafting.ICraftingCPU; import appeng.api.networking.crafting.ICraftingGrid; import appeng.api.storage.ITerminalHost; +import net.minecraft.entity.player.InventoryPlayer; +import net.p455w0rd.wirelesscraftingterminal.common.container.guisync.GuiSync; public class ContainerCraftingStatus extends ContainerCraftingCPU diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/common/container/ContainerOpenContext.java b/src/java/net/p455w0rd/wirelesscraftingterminal/common/container/ContainerOpenContext.java index 99daef8..b23f5e1 100644 --- a/src/java/net/p455w0rd/wirelesscraftingterminal/common/container/ContainerOpenContext.java +++ b/src/java/net/p455w0rd/wirelesscraftingterminal/common/container/ContainerOpenContext.java @@ -1,11 +1,10 @@ package net.p455w0rd.wirelesscraftingterminal.common.container; +import appeng.api.parts.IPart; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; -import appeng.api.parts.IPart; - public class ContainerOpenContext { diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/common/container/WCTBaseContainer.java b/src/java/net/p455w0rd/wirelesscraftingterminal/common/container/WCTBaseContainer.java index a08122f..22e91ec 100644 --- a/src/java/net/p455w0rd/wirelesscraftingterminal/common/container/WCTBaseContainer.java +++ b/src/java/net/p455w0rd/wirelesscraftingterminal/common/container/WCTBaseContainer.java @@ -10,6 +10,26 @@ import java.util.HashSet; import java.util.LinkedList; import java.util.List; +import appeng.api.AEApi; +import appeng.api.config.Actionable; +import appeng.api.config.SecurityPermissions; +import appeng.api.implementations.guiobjects.IGuiItemObject; +import appeng.api.networking.IGrid; +import appeng.api.networking.energy.IEnergyGrid; +import appeng.api.networking.energy.IEnergySource; +import appeng.api.networking.security.BaseActionSource; +import appeng.api.networking.security.ISecurityGrid; +import appeng.api.parts.IPart; +import appeng.api.storage.IMEInventoryHandler; +import appeng.api.storage.data.IAEItemStack; +import appeng.client.me.InternalSlotME; +import appeng.client.me.SlotME; +import appeng.helpers.ICustomNameObject; +import appeng.helpers.InventoryAction; +import appeng.util.InventoryAdaptor; +import appeng.util.Platform; +import appeng.util.inv.AdaptorPlayerHand; +import appeng.util.item.AEItemStack; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.entity.player.InventoryPlayer; @@ -43,26 +63,6 @@ import net.p455w0rd.wirelesscraftingterminal.core.sync.packets.PacketInventoryAc import net.p455w0rd.wirelesscraftingterminal.core.sync.packets.PacketPartialItem; import net.p455w0rd.wirelesscraftingterminal.core.sync.packets.PacketValueConfig; import net.p455w0rd.wirelesscraftingterminal.helpers.WirelessTerminalGuiObject; -import appeng.api.AEApi; -import appeng.api.config.Actionable; -import appeng.api.config.SecurityPermissions; -import appeng.api.implementations.guiobjects.IGuiItemObject; -import appeng.api.networking.IGrid; -import appeng.api.networking.energy.IEnergyGrid; -import appeng.api.networking.energy.IEnergySource; -import appeng.api.networking.security.BaseActionSource; -import appeng.api.networking.security.ISecurityGrid; -import appeng.api.parts.IPart; -import appeng.api.storage.IMEInventoryHandler; -import appeng.api.storage.data.IAEItemStack; -import appeng.client.me.InternalSlotME; -import appeng.client.me.SlotME; -import appeng.helpers.ICustomNameObject; -import appeng.helpers.InventoryAction; -import appeng.util.InventoryAdaptor; -import appeng.util.Platform; -import appeng.util.inv.AdaptorPlayerHand; -import appeng.util.item.AEItemStack; public abstract class WCTBaseContainer extends Container { diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/common/container/guisync/SyncData.java b/src/java/net/p455w0rd/wirelesscraftingterminal/common/container/guisync/SyncData.java index e2bfe89..5fb1d40 100644 --- a/src/java/net/p455w0rd/wirelesscraftingterminal/common/container/guisync/SyncData.java +++ b/src/java/net/p455w0rd/wirelesscraftingterminal/common/container/guisync/SyncData.java @@ -7,8 +7,8 @@ import java.util.EnumSet; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.inventory.Container; import net.minecraft.inventory.ICrafting; -import net.p455w0rd.wirelesscraftingterminal.common.container.WCTBaseContainer; import net.p455w0rd.wirelesscraftingterminal.common.container.ContainerWirelessCraftingTerminal; +import net.p455w0rd.wirelesscraftingterminal.common.container.WCTBaseContainer; import net.p455w0rd.wirelesscraftingterminal.common.utils.WCTLog; import net.p455w0rd.wirelesscraftingterminal.core.sync.network.NetworkHandler; import net.p455w0rd.wirelesscraftingterminal.core.sync.packets.PacketValueConfig; diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/common/container/slot/AppEngCraftingSlot.java b/src/java/net/p455w0rd/wirelesscraftingterminal/common/container/slot/AppEngCraftingSlot.java index 6f0b88b..a6ccd9c 100644 --- a/src/java/net/p455w0rd/wirelesscraftingterminal/common/container/slot/AppEngCraftingSlot.java +++ b/src/java/net/p455w0rd/wirelesscraftingterminal/common/container/slot/AppEngCraftingSlot.java @@ -1,5 +1,6 @@ package net.p455w0rd.wirelesscraftingterminal.common.container.slot; +import cpw.mods.fml.common.FMLCommonHandler; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.init.Items; @@ -14,8 +15,6 @@ import net.minecraft.stats.AchievementList; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.player.PlayerDestroyItemEvent; -import cpw.mods.fml.common.FMLCommonHandler; - public class AppEngCraftingSlot extends AppEngSlot { diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/common/container/slot/AppEngSlot.java b/src/java/net/p455w0rd/wirelesscraftingterminal/common/container/slot/AppEngSlot.java index b77d207..ba2b539 100644 --- a/src/java/net/p455w0rd/wirelesscraftingterminal/common/container/slot/AppEngSlot.java +++ b/src/java/net/p455w0rd/wirelesscraftingterminal/common/container/slot/AppEngSlot.java @@ -1,13 +1,13 @@ package net.p455w0rd.wirelesscraftingterminal.common.container.slot; +import appeng.tile.inventory.AppEngInternalInventory; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.Container; import net.minecraft.inventory.IInventory; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; -import net.p455w0rd.wirelesscraftingterminal.common.container.WCTBaseContainer; import net.p455w0rd.wirelesscraftingterminal.common.container.ContainerWirelessCraftingTerminal; -import appeng.tile.inventory.AppEngInternalInventory; +import net.p455w0rd.wirelesscraftingterminal.common.container.WCTBaseContainer; public class AppEngSlot extends Slot { diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/common/container/slot/SlotBooster.java b/src/java/net/p455w0rd/wirelesscraftingterminal/common/container/slot/SlotBooster.java index c65432c..515176d 100644 --- a/src/java/net/p455w0rd/wirelesscraftingterminal/common/container/slot/SlotBooster.java +++ b/src/java/net/p455w0rd/wirelesscraftingterminal/common/container/slot/SlotBooster.java @@ -1,13 +1,13 @@ package net.p455w0rd.wirelesscraftingterminal.common.container.slot; -import net.p455w0rd.wirelesscraftingterminal.items.ItemBoosterBGIcon; -import net.p455w0rd.wirelesscraftingterminal.items.ItemInfinityBooster; import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; +import net.p455w0rd.wirelesscraftingterminal.items.ItemBoosterBGIcon; +import net.p455w0rd.wirelesscraftingterminal.items.ItemInfinityBooster; public class SlotBooster extends AppEngSlot { diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/common/container/slot/SlotCraftingTerm.java b/src/java/net/p455w0rd/wirelesscraftingterminal/common/container/slot/SlotCraftingTerm.java index 5d4f270..659c72c 100644 --- a/src/java/net/p455w0rd/wirelesscraftingterminal/common/container/slot/SlotCraftingTerm.java +++ b/src/java/net/p455w0rd/wirelesscraftingterminal/common/container/slot/SlotCraftingTerm.java @@ -3,13 +3,6 @@ package net.p455w0rd.wirelesscraftingterminal.common.container.slot; import java.util.ArrayList; import java.util.List; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.IInventory; -import net.minecraft.inventory.InventoryCrafting; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.item.crafting.IRecipe; - import appeng.api.config.Actionable; import appeng.api.networking.energy.IEnergySource; import appeng.api.networking.security.BaseActionSource; @@ -24,6 +17,12 @@ import appeng.util.InventoryAdaptor; import appeng.util.Platform; import appeng.util.inv.AdaptorPlayerHand; import appeng.util.item.AEItemStack; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.IInventory; +import net.minecraft.inventory.InventoryCrafting; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.item.crafting.IRecipe; public class SlotCraftingTerm extends AppEngCraftingSlot { diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/core/sync/WCTPacket.java b/src/java/net/p455w0rd/wirelesscraftingterminal/core/sync/WCTPacket.java index c72eef8..876d6fb 100644 --- a/src/java/net/p455w0rd/wirelesscraftingterminal/core/sync/WCTPacket.java +++ b/src/java/net/p455w0rd/wirelesscraftingterminal/core/sync/WCTPacket.java @@ -1,11 +1,10 @@ package net.p455w0rd.wirelesscraftingterminal.core.sync; +import cpw.mods.fml.common.network.internal.FMLProxyPacket; import io.netty.buffer.ByteBuf; - import net.minecraft.entity.player.EntityPlayer; import net.p455w0rd.wirelesscraftingterminal.core.sync.network.INetworkInfo; import net.p455w0rd.wirelesscraftingterminal.core.sync.network.NetworkHandler; -import cpw.mods.fml.common.network.internal.FMLProxyPacket; public abstract class WCTPacket { diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/core/sync/WCTPacketHandlerBase.java b/src/java/net/p455w0rd/wirelesscraftingterminal/core/sync/WCTPacketHandlerBase.java index 96d7511..9698733 100644 --- a/src/java/net/p455w0rd/wirelesscraftingterminal/core/sync/WCTPacketHandlerBase.java +++ b/src/java/net/p455w0rd/wirelesscraftingterminal/core/sync/WCTPacketHandlerBase.java @@ -17,9 +17,9 @@ import net.p455w0rd.wirelesscraftingterminal.core.sync.packets.PacketNEIRecipe; import net.p455w0rd.wirelesscraftingterminal.core.sync.packets.PacketOpenGui; import net.p455w0rd.wirelesscraftingterminal.core.sync.packets.PacketPartialItem; import net.p455w0rd.wirelesscraftingterminal.core.sync.packets.PacketSetJobBytes; +import net.p455w0rd.wirelesscraftingterminal.core.sync.packets.PacketSetMagnet; import net.p455w0rd.wirelesscraftingterminal.core.sync.packets.PacketSwapSlots; import net.p455w0rd.wirelesscraftingterminal.core.sync.packets.PacketSwitchGuis; -import net.p455w0rd.wirelesscraftingterminal.core.sync.packets.PacketSetMagnet; import net.p455w0rd.wirelesscraftingterminal.core.sync.packets.PacketUpdateCPUInfo; import net.p455w0rd.wirelesscraftingterminal.core.sync.packets.PacketValueConfig; diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/core/sync/network/IPacketHandler.java b/src/java/net/p455w0rd/wirelesscraftingterminal/core/sync/network/IPacketHandler.java index 6b14fdf..f1b269c 100644 --- a/src/java/net/p455w0rd/wirelesscraftingterminal/core/sync/network/IPacketHandler.java +++ b/src/java/net/p455w0rd/wirelesscraftingterminal/core/sync/network/IPacketHandler.java @@ -1,8 +1,7 @@ package net.p455w0rd.wirelesscraftingterminal.core.sync.network; -import net.minecraft.entity.player.EntityPlayer; - import cpw.mods.fml.common.network.internal.FMLProxyPacket; +import net.minecraft.entity.player.EntityPlayer; public interface IPacketHandler diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/core/sync/network/NetworkHandler.java b/src/java/net/p455w0rd/wirelesscraftingterminal/core/sync/network/NetworkHandler.java index 3b8ab20..acbcd84 100644 --- a/src/java/net/p455w0rd/wirelesscraftingterminal/core/sync/network/NetworkHandler.java +++ b/src/java/net/p455w0rd/wirelesscraftingterminal/core/sync/network/NetworkHandler.java @@ -1,16 +1,14 @@ package net.p455w0rd.wirelesscraftingterminal.core.sync.network; -import net.minecraft.entity.player.EntityPlayerMP; -import net.minecraft.network.NetHandlerPlayServer; - -import net.p455w0rd.wirelesscraftingterminal.core.sync.WCTPacket; - import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.common.eventhandler.SubscribeEvent; import cpw.mods.fml.common.network.FMLEventChannel; import cpw.mods.fml.common.network.FMLNetworkEvent.ClientCustomPacketEvent; import cpw.mods.fml.common.network.FMLNetworkEvent.ServerCustomPacketEvent; import cpw.mods.fml.common.network.NetworkRegistry; +import net.minecraft.entity.player.EntityPlayerMP; +import net.minecraft.network.NetHandlerPlayServer; +import net.p455w0rd.wirelesscraftingterminal.core.sync.WCTPacket; public class NetworkHandler { diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/core/sync/network/WCTClientPacketHandler.java b/src/java/net/p455w0rd/wirelesscraftingterminal/core/sync/network/WCTClientPacketHandler.java index 3715122..8d4fed5 100644 --- a/src/java/net/p455w0rd/wirelesscraftingterminal/core/sync/network/WCTClientPacketHandler.java +++ b/src/java/net/p455w0rd/wirelesscraftingterminal/core/sync/network/WCTClientPacketHandler.java @@ -2,14 +2,13 @@ package net.p455w0rd.wirelesscraftingterminal.core.sync.network; import java.lang.reflect.InvocationTargetException; +import cpw.mods.fml.common.network.internal.FMLProxyPacket; import io.netty.buffer.ByteBuf; - import net.minecraft.client.Minecraft; import net.minecraft.entity.player.EntityPlayer; import net.p455w0rd.wirelesscraftingterminal.common.utils.WCTLog; import net.p455w0rd.wirelesscraftingterminal.core.sync.WCTPacket; import net.p455w0rd.wirelesscraftingterminal.core.sync.WCTPacketHandlerBase; -import cpw.mods.fml.common.network.internal.FMLProxyPacket; public class WCTClientPacketHandler extends WCTPacketHandlerBase implements IPacketHandler { diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/core/sync/network/WCTServerPacketHandler.java b/src/java/net/p455w0rd/wirelesscraftingterminal/core/sync/network/WCTServerPacketHandler.java index aae9dce..cf012d0 100644 --- a/src/java/net/p455w0rd/wirelesscraftingterminal/core/sync/network/WCTServerPacketHandler.java +++ b/src/java/net/p455w0rd/wirelesscraftingterminal/core/sync/network/WCTServerPacketHandler.java @@ -2,16 +2,13 @@ package net.p455w0rd.wirelesscraftingterminal.core.sync.network; import java.lang.reflect.InvocationTargetException; +import cpw.mods.fml.common.network.internal.FMLProxyPacket; import io.netty.buffer.ByteBuf; - import net.minecraft.entity.player.EntityPlayer; - import net.p455w0rd.wirelesscraftingterminal.common.utils.WCTLog; import net.p455w0rd.wirelesscraftingterminal.core.sync.WCTPacket; import net.p455w0rd.wirelesscraftingterminal.core.sync.WCTPacketHandlerBase; -import cpw.mods.fml.common.network.internal.FMLProxyPacket; - public final class WCTServerPacketHandler extends WCTPacketHandlerBase implements IPacketHandler { diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/core/sync/packets/PacketCraftRequest.java b/src/java/net/p455w0rd/wirelesscraftingterminal/core/sync/packets/PacketCraftRequest.java index 3a62168..31c3eee 100644 --- a/src/java/net/p455w0rd/wirelesscraftingterminal/core/sync/packets/PacketCraftRequest.java +++ b/src/java/net/p455w0rd/wirelesscraftingterminal/core/sync/packets/PacketCraftRequest.java @@ -2,9 +2,12 @@ package net.p455w0rd.wirelesscraftingterminal.core.sync.packets; import java.util.concurrent.Future; +import appeng.api.networking.IGrid; +import appeng.api.networking.IGridHost; +import appeng.api.networking.crafting.ICraftingGrid; +import appeng.api.networking.crafting.ICraftingJob; import io.netty.buffer.ByteBuf; import io.netty.buffer.Unpooled; - import net.minecraft.entity.player.EntityPlayer; import net.p455w0rd.wirelesscraftingterminal.common.WCTGuiHandler; import net.p455w0rd.wirelesscraftingterminal.common.container.ContainerCraftAmount; @@ -12,10 +15,6 @@ import net.p455w0rd.wirelesscraftingterminal.common.container.ContainerCraftConf import net.p455w0rd.wirelesscraftingterminal.core.sync.WCTPacket; import net.p455w0rd.wirelesscraftingterminal.core.sync.network.INetworkInfo; import net.p455w0rd.wirelesscraftingterminal.reference.Reference; -import appeng.api.networking.IGrid; -import appeng.api.networking.IGridHost; -import appeng.api.networking.crafting.ICraftingGrid; -import appeng.api.networking.crafting.ICraftingJob; public class PacketCraftRequest extends WCTPacket { diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/core/sync/packets/PacketInventoryAction.java b/src/java/net/p455w0rd/wirelesscraftingterminal/core/sync/packets/PacketInventoryAction.java index 7002d5e..a85ee5b 100644 --- a/src/java/net/p455w0rd/wirelesscraftingterminal/core/sync/packets/PacketInventoryAction.java +++ b/src/java/net/p455w0rd/wirelesscraftingterminal/core/sync/packets/PacketInventoryAction.java @@ -13,10 +13,10 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.inventory.Container; import net.p455w0rd.wirelesscraftingterminal.common.WCTGuiHandler; -import net.p455w0rd.wirelesscraftingterminal.common.container.WCTBaseContainer; import net.p455w0rd.wirelesscraftingterminal.common.container.ContainerCraftAmount; import net.p455w0rd.wirelesscraftingterminal.common.container.ContainerOpenContext; import net.p455w0rd.wirelesscraftingterminal.common.container.ContainerWirelessCraftingTerminal; +import net.p455w0rd.wirelesscraftingterminal.common.container.WCTBaseContainer; import net.p455w0rd.wirelesscraftingterminal.core.sync.WCTPacket; import net.p455w0rd.wirelesscraftingterminal.core.sync.network.INetworkInfo; import net.p455w0rd.wirelesscraftingterminal.reference.Reference; diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/core/sync/packets/PacketMEInventoryUpdate.java b/src/java/net/p455w0rd/wirelesscraftingterminal/core/sync/packets/PacketMEInventoryUpdate.java index e769f0b..09068cb 100644 --- a/src/java/net/p455w0rd/wirelesscraftingterminal/core/sync/packets/PacketMEInventoryUpdate.java +++ b/src/java/net/p455w0rd/wirelesscraftingterminal/core/sync/packets/PacketMEInventoryUpdate.java @@ -11,9 +11,13 @@ import java.util.zip.GZIPOutputStream; import javax.annotation.Nullable; +import appeng.api.storage.data.IAEItemStack; +import appeng.util.item.AEItemStack; +import cpw.mods.fml.common.network.internal.FMLProxyPacket; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import io.netty.buffer.ByteBuf; import io.netty.buffer.Unpooled; - import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiScreen; import net.minecraft.entity.player.EntityPlayer; @@ -23,12 +27,6 @@ import net.p455w0rd.wirelesscraftingterminal.client.gui.GuiWirelessCraftingTermi import net.p455w0rd.wirelesscraftingterminal.common.utils.WCTLog; import net.p455w0rd.wirelesscraftingterminal.core.sync.WCTPacket; import net.p455w0rd.wirelesscraftingterminal.core.sync.network.INetworkInfo; -import cpw.mods.fml.common.network.internal.FMLProxyPacket; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - -import appeng.api.storage.data.IAEItemStack; -import appeng.util.item.AEItemStack; public class PacketMEInventoryUpdate extends WCTPacket diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/core/sync/packets/PacketNEIRecipe.java b/src/java/net/p455w0rd/wirelesscraftingterminal/core/sync/packets/PacketNEIRecipe.java index b676375..a0279d2 100644 --- a/src/java/net/p455w0rd/wirelesscraftingterminal/core/sync/packets/PacketNEIRecipe.java +++ b/src/java/net/p455w0rd/wirelesscraftingterminal/core/sync/packets/PacketNEIRecipe.java @@ -5,9 +5,27 @@ import java.io.ByteArrayOutputStream; import java.io.DataOutputStream; import java.io.IOException; +import appeng.api.AEApi; +import appeng.api.config.Actionable; +import appeng.api.config.FuzzyMode; +import appeng.api.config.SecurityPermissions; +import appeng.api.networking.IGrid; +import appeng.api.networking.IGridNode; +import appeng.api.networking.energy.IEnergyGrid; +import appeng.api.networking.security.ISecurityGrid; +import appeng.api.networking.storage.IStorageGrid; +import appeng.api.storage.IMEMonitor; +import appeng.api.storage.data.IAEItemStack; +import appeng.api.storage.data.IItemList; +import appeng.container.ContainerNull; +import appeng.helpers.IContainerCraftingPacket; +import appeng.items.storage.ItemViewCell; +import appeng.util.InventoryAdaptor; +import appeng.util.Platform; +import appeng.util.item.AEItemStack; +import appeng.util.prioitylist.IPartitionList; import io.netty.buffer.ByteBuf; import io.netty.buffer.Unpooled; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.inventory.Container; @@ -26,26 +44,6 @@ import net.p455w0rd.wirelesscraftingterminal.common.utils.RandomUtils; import net.p455w0rd.wirelesscraftingterminal.core.sync.WCTPacket; import net.p455w0rd.wirelesscraftingterminal.core.sync.network.INetworkInfo; import net.p455w0rd.wirelesscraftingterminal.helpers.WirelessTerminalGuiObject; -import appeng.api.AEApi; -import appeng.api.config.Actionable; -import appeng.api.config.FuzzyMode; -import appeng.api.config.SecurityPermissions; -import appeng.api.networking.IGrid; -import appeng.api.networking.IGridHost; -import appeng.api.networking.IGridNode; -import appeng.api.networking.energy.IEnergyGrid; -import appeng.api.networking.security.ISecurityGrid; -import appeng.api.networking.storage.IStorageGrid; -import appeng.api.storage.IMEMonitor; -import appeng.api.storage.data.IAEItemStack; -import appeng.api.storage.data.IItemList; -import appeng.container.ContainerNull; -import appeng.helpers.IContainerCraftingPacket; -import appeng.items.storage.ItemViewCell; -import appeng.util.InventoryAdaptor; -import appeng.util.Platform; -import appeng.util.item.AEItemStack; -import appeng.util.prioitylist.IPartitionList; public class PacketNEIRecipe extends WCTPacket diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/core/sync/packets/PacketPartialItem.java b/src/java/net/p455w0rd/wirelesscraftingterminal/core/sync/packets/PacketPartialItem.java index e34e75a..d0d6b70 100644 --- a/src/java/net/p455w0rd/wirelesscraftingterminal/core/sync/packets/PacketPartialItem.java +++ b/src/java/net/p455w0rd/wirelesscraftingterminal/core/sync/packets/PacketPartialItem.java @@ -2,10 +2,9 @@ package net.p455w0rd.wirelesscraftingterminal.core.sync.packets; import io.netty.buffer.ByteBuf; import io.netty.buffer.Unpooled; - import net.minecraft.entity.player.EntityPlayer; -import net.p455w0rd.wirelesscraftingterminal.common.container.WCTBaseContainer; import net.p455w0rd.wirelesscraftingterminal.common.container.ContainerWirelessCraftingTerminal; +import net.p455w0rd.wirelesscraftingterminal.common.container.WCTBaseContainer; import net.p455w0rd.wirelesscraftingterminal.core.sync.WCTPacket; import net.p455w0rd.wirelesscraftingterminal.core.sync.network.INetworkInfo; diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/core/sync/packets/PacketProgressBar.java b/src/java/net/p455w0rd/wirelesscraftingterminal/core/sync/packets/PacketProgressBar.java index 75ed9b8..2044940 100644 --- a/src/java/net/p455w0rd/wirelesscraftingterminal/core/sync/packets/PacketProgressBar.java +++ b/src/java/net/p455w0rd/wirelesscraftingterminal/core/sync/packets/PacketProgressBar.java @@ -2,11 +2,10 @@ package net.p455w0rd.wirelesscraftingterminal.core.sync.packets; import io.netty.buffer.ByteBuf; import io.netty.buffer.Unpooled; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.Container; -import net.p455w0rd.wirelesscraftingterminal.common.container.WCTBaseContainer; import net.p455w0rd.wirelesscraftingterminal.common.container.ContainerWirelessCraftingTerminal; +import net.p455w0rd.wirelesscraftingterminal.common.container.WCTBaseContainer; import net.p455w0rd.wirelesscraftingterminal.core.sync.WCTPacket; import net.p455w0rd.wirelesscraftingterminal.core.sync.network.INetworkInfo; diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/core/sync/packets/PacketSetJobBytes.java b/src/java/net/p455w0rd/wirelesscraftingterminal/core/sync/packets/PacketSetJobBytes.java index 45feb93..6b57882 100644 --- a/src/java/net/p455w0rd/wirelesscraftingterminal/core/sync/packets/PacketSetJobBytes.java +++ b/src/java/net/p455w0rd/wirelesscraftingterminal/core/sync/packets/PacketSetJobBytes.java @@ -1,6 +1,7 @@ package net.p455w0rd.wirelesscraftingterminal.core.sync.packets; import java.io.IOException; + import io.netty.buffer.ByteBuf; import io.netty.buffer.Unpooled; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/core/sync/packets/PacketSwapSlots.java b/src/java/net/p455w0rd/wirelesscraftingterminal/core/sync/packets/PacketSwapSlots.java index 87d2ad5..210a575 100644 --- a/src/java/net/p455w0rd/wirelesscraftingterminal/core/sync/packets/PacketSwapSlots.java +++ b/src/java/net/p455w0rd/wirelesscraftingterminal/core/sync/packets/PacketSwapSlots.java @@ -3,8 +3,8 @@ package net.p455w0rd.wirelesscraftingterminal.core.sync.packets; import io.netty.buffer.ByteBuf; import io.netty.buffer.Unpooled; import net.minecraft.entity.player.EntityPlayer; -import net.p455w0rd.wirelesscraftingterminal.common.container.WCTBaseContainer; import net.p455w0rd.wirelesscraftingterminal.common.container.ContainerWirelessCraftingTerminal; +import net.p455w0rd.wirelesscraftingterminal.common.container.WCTBaseContainer; import net.p455w0rd.wirelesscraftingterminal.core.sync.WCTPacket; import net.p455w0rd.wirelesscraftingterminal.core.sync.network.INetworkInfo; diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/core/sync/packets/PacketValueConfig.java b/src/java/net/p455w0rd/wirelesscraftingterminal/core/sync/packets/PacketValueConfig.java index c2a5c96..c4b9147 100644 --- a/src/java/net/p455w0rd/wirelesscraftingterminal/core/sync/packets/PacketValueConfig.java +++ b/src/java/net/p455w0rd/wirelesscraftingterminal/core/sync/packets/PacketValueConfig.java @@ -18,11 +18,11 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.Container; import net.minecraft.item.ItemStack; import net.p455w0rd.wirelesscraftingterminal.client.gui.GuiCraftingCPU; -import net.p455w0rd.wirelesscraftingterminal.common.container.WCTBaseContainer; import net.p455w0rd.wirelesscraftingterminal.common.container.ContainerCraftConfirm; import net.p455w0rd.wirelesscraftingterminal.common.container.ContainerCraftingCPU; import net.p455w0rd.wirelesscraftingterminal.common.container.ContainerCraftingStatus; import net.p455w0rd.wirelesscraftingterminal.common.container.ContainerWirelessCraftingTerminal; +import net.p455w0rd.wirelesscraftingterminal.common.container.WCTBaseContainer; import net.p455w0rd.wirelesscraftingterminal.common.utils.RandomUtils; import net.p455w0rd.wirelesscraftingterminal.core.sync.WCTPacket; import net.p455w0rd.wirelesscraftingterminal.core.sync.network.INetworkInfo; diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/helpers/WirelessTerminalGuiObject.java b/src/java/net/p455w0rd/wirelesscraftingterminal/helpers/WirelessTerminalGuiObject.java index fcb3795..d3aa16e 100644 --- a/src/java/net/p455w0rd/wirelesscraftingterminal/helpers/WirelessTerminalGuiObject.java +++ b/src/java/net/p455w0rd/wirelesscraftingterminal/helpers/WirelessTerminalGuiObject.java @@ -1,10 +1,5 @@ package net.p455w0rd.wirelesscraftingterminal.helpers; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; -import net.minecraft.world.World; -import net.minecraftforge.common.util.ForgeDirection; -import net.p455w0rd.wirelesscraftingterminal.api.networking.security.WCTIActionHost; import appeng.api.AEApi; import appeng.api.config.AccessRestriction; import appeng.api.config.Actionable; @@ -31,6 +26,11 @@ import appeng.api.util.DimensionalCoord; import appeng.api.util.IConfigManager; import appeng.container.interfaces.IInventorySlotAware; import appeng.tile.networking.TileWireless; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.world.World; +import net.minecraftforge.common.util.ForgeDirection; +import net.p455w0rd.wirelesscraftingterminal.api.networking.security.WCTIActionHost; public class WirelessTerminalGuiObject implements IActionHost, IPortableCell, IInventorySlotAware, WCTIActionHost { diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/implementation/WirelessAELink.java b/src/java/net/p455w0rd/wirelesscraftingterminal/implementation/WirelessAELink.java index 3a6e9d1..cda74ff 100644 --- a/src/java/net/p455w0rd/wirelesscraftingterminal/implementation/WirelessAELink.java +++ b/src/java/net/p455w0rd/wirelesscraftingterminal/implementation/WirelessAELink.java @@ -24,8 +24,8 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; import net.p455w0rd.wirelesscraftingterminal.api.networking.security.MachineSource; -import net.p455w0rd.wirelesscraftingterminal.api.networking.security.WCTPlayerSource; import net.p455w0rd.wirelesscraftingterminal.api.networking.security.WCTIActionHost; +import net.p455w0rd.wirelesscraftingterminal.api.networking.security.WCTPlayerSource; /** * Provides wireless access to a ME network. diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/integration/modules/NEI.java b/src/java/net/p455w0rd/wirelesscraftingterminal/integration/modules/NEI.java index 0c4710f..ab99fae 100644 --- a/src/java/net/p455w0rd/wirelesscraftingterminal/integration/modules/NEI.java +++ b/src/java/net/p455w0rd/wirelesscraftingterminal/integration/modules/NEI.java @@ -8,6 +8,13 @@ import appeng.api.AEApi; import appeng.api.storage.data.IAEItemStack; import appeng.integration.modules.NEIHelpers.NEIAEShapelessRecipeHandler; import appeng.util.Platform; +import codechicken.nei.PositionedStack; +import codechicken.nei.api.API; +import codechicken.nei.api.IOverlayHandler; +import codechicken.nei.api.IStackPositioner; +import codechicken.nei.guihook.GuiContainerManager; +import codechicken.nei.guihook.IContainerTooltipHandler; +import codechicken.nei.recipe.IRecipeHandler; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.FontRenderer; import net.minecraft.client.gui.inventory.GuiContainer; @@ -27,13 +34,6 @@ import net.p455w0rd.wirelesscraftingterminal.integration.IIntegrationModule; import net.p455w0rd.wirelesscraftingterminal.integration.IntegrationHelper; import net.p455w0rd.wirelesscraftingterminal.integration.abstraction.INEI; import net.p455w0rd.wirelesscraftingterminal.integration.modules.NEIHelpers.NEIAEShapedRecipeHandler; -import codechicken.nei.PositionedStack; -import codechicken.nei.api.API; -import codechicken.nei.api.IOverlayHandler; -import codechicken.nei.api.IStackPositioner; -import codechicken.nei.guihook.GuiContainerManager; -import codechicken.nei.guihook.IContainerTooltipHandler; -import codechicken.nei.recipe.IRecipeHandler; public class NEI implements INEI, IContainerTooltipHandler, IIntegrationModule { @Reflected diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/integration/modules/NEIHelpers/NEIAEShapedRecipeHandler.java b/src/java/net/p455w0rd/wirelesscraftingterminal/integration/modules/NEIHelpers/NEIAEShapedRecipeHandler.java index 8f769f5..9e201d3 100644 --- a/src/java/net/p455w0rd/wirelesscraftingterminal/integration/modules/NEIHelpers/NEIAEShapedRecipeHandler.java +++ b/src/java/net/p455w0rd/wirelesscraftingterminal/integration/modules/NEIHelpers/NEIAEShapedRecipeHandler.java @@ -4,6 +4,17 @@ import java.awt.Rectangle; import java.util.ArrayList; import java.util.List; +import appeng.core.AEConfig; +import appeng.util.Platform; +import codechicken.nei.NEIClientUtils; +import codechicken.nei.NEIServerUtils; +import codechicken.nei.PositionedStack; +import codechicken.nei.api.DefaultOverlayRenderer; +import codechicken.nei.api.IOverlayHandler; +import codechicken.nei.api.IRecipeOverlayRenderer; +import codechicken.nei.api.IStackPositioner; +import codechicken.nei.recipe.RecipeInfo; +import codechicken.nei.recipe.TemplateRecipeHandler; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.client.gui.inventory.GuiCrafting; import net.minecraft.inventory.Container; @@ -14,18 +25,6 @@ import net.p455w0rd.wirelesscraftingterminal.api.exceptions.MissingIngredientErr import net.p455w0rd.wirelesscraftingterminal.api.exceptions.RegistrationError; import net.p455w0rd.wirelesscraftingterminal.api.recipes.IIngredient; import net.p455w0rd.wirelesscraftingterminal.api.recipes.game.ShapedRecipe; -import codechicken.nei.NEIClientUtils; -import codechicken.nei.NEIServerUtils; -import codechicken.nei.PositionedStack; -import codechicken.nei.api.DefaultOverlayRenderer; -import codechicken.nei.api.IOverlayHandler; -import codechicken.nei.api.IRecipeOverlayRenderer; -import codechicken.nei.api.IStackPositioner; -import codechicken.nei.recipe.RecipeInfo; -import codechicken.nei.recipe.TemplateRecipeHandler; - -import appeng.core.AEConfig; -import appeng.util.Platform; public class NEIAEShapedRecipeHandler extends TemplateRecipeHandler diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/integration/modules/NEIHelpers/NEICraftingHandler.java b/src/java/net/p455w0rd/wirelesscraftingterminal/integration/modules/NEIHelpers/NEICraftingHandler.java index 4102d9a..666a4d5 100644 --- a/src/java/net/p455w0rd/wirelesscraftingterminal/integration/modules/NEIHelpers/NEICraftingHandler.java +++ b/src/java/net/p455w0rd/wirelesscraftingterminal/integration/modules/NEIHelpers/NEICraftingHandler.java @@ -3,6 +3,10 @@ package net.p455w0rd.wirelesscraftingterminal.integration.modules.NEIHelpers; import java.util.LinkedList; import java.util.List; +import appeng.util.Platform; +import codechicken.nei.PositionedStack; +import codechicken.nei.api.IOverlayHandler; +import codechicken.nei.recipe.IRecipeHandler; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; @@ -13,11 +17,6 @@ import net.p455w0rd.wirelesscraftingterminal.common.container.slot.SlotCraftingM import net.p455w0rd.wirelesscraftingterminal.common.container.slot.SlotFakeCraftingMatrix; import net.p455w0rd.wirelesscraftingterminal.core.sync.network.NetworkHandler; import net.p455w0rd.wirelesscraftingterminal.core.sync.packets.PacketNEIRecipe; -import codechicken.nei.PositionedStack; -import codechicken.nei.api.IOverlayHandler; -import codechicken.nei.recipe.IRecipeHandler; - -import appeng.util.Platform; public class NEICraftingHandler implements IOverlayHandler diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/integration/modules/helpers/NullRFHandler.java b/src/java/net/p455w0rd/wirelesscraftingterminal/integration/modules/helpers/NullRFHandler.java index bd7dc0a..ea8ab2c 100644 --- a/src/java/net/p455w0rd/wirelesscraftingterminal/integration/modules/helpers/NullRFHandler.java +++ b/src/java/net/p455w0rd/wirelesscraftingterminal/integration/modules/helpers/NullRFHandler.java @@ -1,8 +1,7 @@ package net.p455w0rd.wirelesscraftingterminal.integration.modules.helpers; -import net.minecraftforge.common.util.ForgeDirection; - import cofh.api.energy.IEnergyReceiver; +import net.minecraftforge.common.util.ForgeDirection; public class NullRFHandler implements IEnergyReceiver diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/items/ItemInfinityBooster.java b/src/java/net/p455w0rd/wirelesscraftingterminal/items/ItemInfinityBooster.java index b2fc903..8db35c8 100644 --- a/src/java/net/p455w0rd/wirelesscraftingterminal/items/ItemInfinityBooster.java +++ b/src/java/net/p455w0rd/wirelesscraftingterminal/items/ItemInfinityBooster.java @@ -13,8 +13,8 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.p455w0rd.wirelesscraftingterminal.common.utils.RandomUtils; -import net.p455w0rd.wirelesscraftingterminal.reference.Reference; import net.p455w0rd.wirelesscraftingterminal.handlers.LocaleHandler; +import net.p455w0rd.wirelesscraftingterminal.reference.Reference; public class ItemInfinityBooster extends Item { diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/proxy/CommonProxy.java b/src/java/net/p455w0rd/wirelesscraftingterminal/proxy/CommonProxy.java index 907d20f..57e413f 100644 --- a/src/java/net/p455w0rd/wirelesscraftingterminal/proxy/CommonProxy.java +++ b/src/java/net/p455w0rd/wirelesscraftingterminal/proxy/CommonProxy.java @@ -1,6 +1,7 @@ package net.p455w0rd.wirelesscraftingterminal.proxy; import java.util.Random; + import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.common.Loader; import cpw.mods.fml.common.eventhandler.SubscribeEvent;