From c4e9d90118cb01f57bbce020ffb28e1f04678d18 Mon Sep 17 00:00:00 2001 From: p455w0rd Date: Sat, 30 Apr 2016 13:53:07 -0400 Subject: [PATCH] Removed unneeded imports/suppressed warnings --- .../cofh/api/energy/IEnergyContainerItem.java | 3 - .../cofh/api/energy/ItemEnergyContainer.java | 3 - .../api/IWirelessCraftingTermHandler.java | 4 - .../wirelesscraftingterminal/api/WCTApi.java | 1 + .../api/recipes/game/ShapelessRecipe.java | 1 - .../client/gui/GuiCraftAmount.java | 3 +- .../client/gui/GuiCraftConfirm.java | 8 +- .../client/gui/GuiCraftingCPU.java | 4 + .../client/gui/GuiCraftingStatus.java | 4 +- .../client/gui/GuiMagnet.java | 17 +- .../gui/GuiWirelessCraftingTerminal.java | 26 +-- .../client/gui/WCTBaseGui.java | 1 - .../client/gui/WCTGuiConfig.java | 1 + .../client/gui/widgets/GuiTrashButton.java | 1 - .../client/me/ItemRepo.java | 2 + .../common/WCTGuiHandler.java | 4 - .../common/WirelessCraftingTerminal.java | 5 +- .../container/ContainerCraftAmount.java | 1 - .../container/ContainerCraftConfirm.java | 2 - .../container/ContainerCraftingCPU.java | 1 - .../common/container/ContainerMagnet.java | 10 +- .../ContainerWirelessCraftingTerminal.java | 18 +- .../common/container/guisync/SyncData.java | 3 +- .../common/container/slot/NullSlot.java | 1 - .../common/container/slot/SlotArmor.java | 1 - .../common/container/slot/SlotBooster.java | 2 - .../container/slot/SlotCraftingTerm.java | 194 +++++++----------- .../common/container/slot/SlotTrash.java | 3 - .../common/inventory/WCTInventoryBooster.java | 2 - .../inventory/WCTInventoryCrafting.java | 1 + .../common/inventory/WCTInventoryMagnet.java | 2 - .../inventory/WCTInventoryMagnetFilter.java | 3 - .../common/inventory/WCTInventoryTrash.java | 2 - .../common/utils/WCTLog.java | 3 - .../core/sync/WCTPacket.java | 6 - .../core/sync/network/NetworkHandler.java | 2 - .../core/sync/packets/PacketConfigSync.java | 4 - .../core/sync/packets/PacketCraftRequest.java | 3 - .../core/sync/packets/PacketEmptyTrash.java | 1 - .../sync/packets/PacketInventoryAction.java | 2 +- .../sync/packets/PacketMagnetFilterMode.java | 3 - .../core/sync/packets/PacketNEIRecipe.java | 3 +- .../core/sync/packets/PacketOpenGui.java | 8 - .../core/sync/packets/PacketSwitchGuis.java | 3 - .../sync/packets/PacketSwitchMagnetMode.java | 1 - .../core/sync/packets/PacketValueConfig.java | 3 +- .../creativetab/CreativeTabWCT.java | 1 - .../handlers/AchievementHandler.java | 15 -- .../handlers/KeybindHandler.java | 4 - .../handlers/RecipeHandler.java | 4 +- .../helpers/WirelessTerminalGuiObject.java | 1 + .../implementation/WCTInteractionHelper.java | 1 - .../integration/IntegrationNode.java | 1 + .../integration/modules/NEI.java | 10 +- .../NEIHelpers/NEIAEShapedRecipeHandler.java | 2 + .../NEIAEShapelessRecipeHandler.java | 3 + .../NEIHelpers/NEICraftingHandler.java | 2 + .../items/ItemBoosterBGIcon.java | 1 - .../items/ItemInfinityBooster.java | 8 +- .../items/ItemMagnet.java | 6 +- .../items/ItemWirelessCraftingTerminal.java | 26 ++- .../proxy/ClientProxy.java | 1 - .../reference/Reference.java | 2 +- .../transformer/WCTCore.java | 1 - .../transformer/asm/ASMIntegration.java | 2 + src/resources/META-INF/MANIFEST.MF | 4 - .../assets/ae2wct/textures/gui/crafting.psd | Bin 115524 -> 0 bytes .../ae2wct/textures/items/magnetCard.psd | Bin 23232 -> 0 bytes 68 files changed, 168 insertions(+), 303 deletions(-) delete mode 100644 src/resources/META-INF/MANIFEST.MF delete mode 100644 src/resources/assets/ae2wct/textures/gui/crafting.psd delete mode 100644 src/resources/assets/ae2wct/textures/items/magnetCard.psd diff --git a/src/java/cofh/api/energy/IEnergyContainerItem.java b/src/java/cofh/api/energy/IEnergyContainerItem.java index 317f26b..c28455b 100644 --- a/src/java/cofh/api/energy/IEnergyContainerItem.java +++ b/src/java/cofh/api/energy/IEnergyContainerItem.java @@ -1,8 +1,5 @@ package cofh.api.energy; -import java.util.List; - -import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; /** diff --git a/src/java/cofh/api/energy/ItemEnergyContainer.java b/src/java/cofh/api/energy/ItemEnergyContainer.java index 0555ba0..055ae45 100644 --- a/src/java/cofh/api/energy/ItemEnergyContainer.java +++ b/src/java/cofh/api/energy/ItemEnergyContainer.java @@ -1,8 +1,5 @@ package cofh.api.energy; -import java.util.List; - -import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/api/IWirelessCraftingTermHandler.java b/src/java/net/p455w0rd/wirelesscraftingterminal/api/IWirelessCraftingTermHandler.java index 0fd8bf2..2f3fab1 100644 --- a/src/java/net/p455w0rd/wirelesscraftingterminal/api/IWirelessCraftingTermHandler.java +++ b/src/java/net/p455w0rd/wirelesscraftingterminal/api/IWirelessCraftingTermHandler.java @@ -1,14 +1,10 @@ package net.p455w0rd.wirelesscraftingterminal.api; -import javax.annotation.Nonnull; - -//import appeng.api.features.INetworkEncodable; import appeng.api.features.IWirelessTermHandler; import appeng.api.implementations.items.IAEItemPowerStorage; import appeng.api.util.IConfigManager; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; /** * Provides the required functionality of a wireless terminal. diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/api/WCTApi.java b/src/java/net/p455w0rd/wirelesscraftingterminal/api/WCTApi.java index 708763e..b65d6f3 100644 --- a/src/java/net/p455w0rd/wirelesscraftingterminal/api/WCTApi.java +++ b/src/java/net/p455w0rd/wirelesscraftingterminal/api/WCTApi.java @@ -9,6 +9,7 @@ public abstract class WCTApi { protected static WCTApi api = null; + @SuppressWarnings({ "rawtypes", "unchecked" }) @Nullable public static WCTApi instance() { diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/api/recipes/game/ShapelessRecipe.java b/src/java/net/p455w0rd/wirelesscraftingterminal/api/recipes/game/ShapelessRecipe.java index e78d005..23789c4 100644 --- a/src/java/net/p455w0rd/wirelesscraftingterminal/api/recipes/game/ShapelessRecipe.java +++ b/src/java/net/p455w0rd/wirelesscraftingterminal/api/recipes/game/ShapelessRecipe.java @@ -45,7 +45,6 @@ public class ShapelessRecipe implements IRecipe, IRecipeBakeable return !this.disable; } - @SuppressWarnings( "unchecked" ) @Override public boolean matches( final InventoryCrafting var1, final World world ) { diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/client/gui/GuiCraftAmount.java b/src/java/net/p455w0rd/wirelesscraftingterminal/client/gui/GuiCraftAmount.java index 472c5b5..6d4e372 100644 --- a/src/java/net/p455w0rd/wirelesscraftingterminal/client/gui/GuiCraftAmount.java +++ b/src/java/net/p455w0rd/wirelesscraftingterminal/client/gui/GuiCraftAmount.java @@ -18,8 +18,6 @@ import net.p455w0rd.wirelesscraftingterminal.core.sync.network.NetworkHandler; import net.p455w0rd.wirelesscraftingterminal.core.sync.packets.PacketCraftRequest; import net.p455w0rd.wirelesscraftingterminal.core.sync.packets.PacketSwitchGuis; import net.p455w0rd.wirelesscraftingterminal.helpers.WirelessTerminalGuiObject; -import net.p455w0rd.wirelesscraftingterminal.items.ItemEnum; -import net.p455w0rd.wirelesscraftingterminal.items.ItemWirelessCraftingTerminal; import net.p455w0rd.wirelesscraftingterminal.reference.Reference; public class GuiCraftAmount extends WCTBaseGui { @@ -47,6 +45,7 @@ public class GuiCraftAmount extends WCTBaseGui { myIcon = RandomUtils.getWirelessTerm(inventoryPlayer); } + @SuppressWarnings({ "unchecked", "unused" }) @Override public void initGui() { super.initGui(); diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/client/gui/GuiCraftConfirm.java b/src/java/net/p455w0rd/wirelesscraftingterminal/client/gui/GuiCraftConfirm.java index bf1768a..00d2d00 100644 --- a/src/java/net/p455w0rd/wirelesscraftingterminal/client/gui/GuiCraftConfirm.java +++ b/src/java/net/p455w0rd/wirelesscraftingterminal/client/gui/GuiCraftConfirm.java @@ -1,7 +1,6 @@ package net.p455w0rd.wirelesscraftingterminal.client.gui; import java.io.IOException; -import java.text.NumberFormat; import java.util.ArrayList; import java.util.Iterator; import java.util.LinkedList; @@ -74,6 +73,7 @@ public class GuiCraftConfirm extends WCTBaseGui return ( (ContainerCraftConfirm) this.inventorySlots ).isAutoStart(); } + @SuppressWarnings("unchecked") @Override public void initGui() { @@ -170,9 +170,9 @@ public class GuiCraftConfirm extends WCTBaseGui public void drawFG( final int offsetX, final int offsetY, final int mouseX, final int mouseY ) { //final long BytesUsed = this.ccc.getUsedBytes(); - final long BytesUsed = ((ContainerCraftConfirm) this.inventorySlots).getUsedBytes(); - final String byteUsed = NumberFormat.getInstance().format( BytesUsed ); - final String Add = BytesUsed > 0 ? ( byteUsed + ' ' + GuiText.BytesUsed.getLocal() ) : GuiText.CalculatingWait.getLocal(); + //final long BytesUsed = ((ContainerCraftConfirm) this.inventorySlots).getUsedBytes(); + //final String byteUsed = NumberFormat.getInstance().format( BytesUsed ); + //final String Add = BytesUsed > 0 ? ( byteUsed + ' ' + GuiText.BytesUsed.getLocal() ) : GuiText.CalculatingWait.getLocal(); //this.fontRendererObj.drawString( GuiText.CraftingPlan.getLocal() + " -- " + Add, 8, 7, 4210752 ); this.fontRendererObj.drawString( GuiText.CraftingPlan.getLocal(), 8, 7, 4210752 ); diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/client/gui/GuiCraftingCPU.java b/src/java/net/p455w0rd/wirelesscraftingterminal/client/gui/GuiCraftingCPU.java index 6179e1a..cb52d03 100644 --- a/src/java/net/p455w0rd/wirelesscraftingterminal/client/gui/GuiCraftingCPU.java +++ b/src/java/net/p455w0rd/wirelesscraftingterminal/client/gui/GuiCraftingCPU.java @@ -113,6 +113,7 @@ public class GuiCraftingCPU extends WCTBaseGui implements ISortSource } } + @SuppressWarnings("unchecked") @Override public void initGui() { @@ -451,18 +452,21 @@ public class GuiCraftingCPU extends WCTBaseGui implements ISortSource return stack; } + @SuppressWarnings("rawtypes") @Override public Enum getSortBy() { return SortOrder.NAME; } + @SuppressWarnings("rawtypes") @Override public Enum getSortDir() { return SortDir.ASCENDING; } + @SuppressWarnings("rawtypes") @Override public Enum getSortDisplay() { diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/client/gui/GuiCraftingStatus.java b/src/java/net/p455w0rd/wirelesscraftingterminal/client/gui/GuiCraftingStatus.java index 9c73b1e..cc7f0bf 100644 --- a/src/java/net/p455w0rd/wirelesscraftingterminal/client/gui/GuiCraftingStatus.java +++ b/src/java/net/p455w0rd/wirelesscraftingterminal/client/gui/GuiCraftingStatus.java @@ -15,8 +15,6 @@ import net.p455w0rd.wirelesscraftingterminal.core.sync.network.NetworkHandler; 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.items.ItemEnum; -import net.p455w0rd.wirelesscraftingterminal.items.ItemWirelessCraftingTerminal; import net.p455w0rd.wirelesscraftingterminal.reference.Reference; import appeng.api.AEApi; import appeng.api.definitions.IDefinitions; @@ -35,6 +33,7 @@ public class GuiCraftingStatus extends GuiCraftingCPU private int originalGui; private ItemStack myIcon = null; + @SuppressWarnings("unused") public GuiCraftingStatus( final InventoryPlayer inventoryPlayer, final ITerminalHost te ) { super( new ContainerCraftingStatus( inventoryPlayer, te ) ); @@ -82,6 +81,7 @@ public class GuiCraftingStatus extends GuiCraftingCPU } } + @SuppressWarnings("unchecked") @Override public void initGui() { diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/client/gui/GuiMagnet.java b/src/java/net/p455w0rd/wirelesscraftingterminal/client/gui/GuiMagnet.java index d2ceaee..9c717ec 100644 --- a/src/java/net/p455w0rd/wirelesscraftingterminal/client/gui/GuiMagnet.java +++ b/src/java/net/p455w0rd/wirelesscraftingterminal/client/gui/GuiMagnet.java @@ -2,18 +2,14 @@ package net.p455w0rd.wirelesscraftingterminal.client.gui; import org.lwjgl.opengl.GL11; -import appeng.helpers.InventoryAction; import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.client.resources.I18n; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTBase; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.nbt.NBTTagList; import net.minecraft.util.ResourceLocation; import net.p455w0rd.wirelesscraftingterminal.common.container.ContainerMagnet; import net.p455w0rd.wirelesscraftingterminal.core.sync.network.NetworkHandler; -import net.p455w0rd.wirelesscraftingterminal.core.sync.packets.PacketInventoryAction; import net.p455w0rd.wirelesscraftingterminal.core.sync.packets.PacketMagnetFilterMode; import net.p455w0rd.wirelesscraftingterminal.handlers.LocaleHandler; @@ -22,7 +18,6 @@ public class GuiMagnet extends GuiContainer { private GuiButton modeBtn; public static boolean mode = true; private ItemStack magnetItem; - private ContainerMagnet container; public GuiMagnet(ContainerMagnet c) { super(c); @@ -31,8 +26,7 @@ public class GuiMagnet extends GuiContainer { this.ySize = 168; this.height = this.ySize; magnetItem = c.heldItem; - this.mode = getMode(); - this.container = c; + GuiMagnet.mode = getMode(); } @Override @@ -48,11 +42,12 @@ public class GuiMagnet extends GuiContainer { this.mc.fontRenderer.drawString(I18n.format("container.inventory"), 7, 74, 4210752); } + @SuppressWarnings("unchecked") @Override public void initGui() { super.initGui(); this.buttonList.clear(); - this.buttonList.add(this.modeBtn = new GuiButton(1, this.guiLeft + 108, this.guiTop + 3, 60, 10, getLabel(this.mode))); + this.buttonList.add(this.modeBtn = new GuiButton(1, this.guiLeft + 108, this.guiTop + 3, 60, 10, getLabel(GuiMagnet.mode))); } String getLabel(boolean filterMode) { @@ -62,9 +57,9 @@ public class GuiMagnet extends GuiContainer { @Override protected void actionPerformed(final GuiButton btn) { if (btn == this.modeBtn) { - btn.displayString = getLabel(!this.mode); - this.mode = !this.mode; - setMode(this.mode); + btn.displayString = getLabel(!GuiMagnet.mode); + GuiMagnet.mode = !GuiMagnet.mode; + setMode(GuiMagnet.mode); } } diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/client/gui/GuiWirelessCraftingTerminal.java b/src/java/net/p455w0rd/wirelesscraftingterminal/client/gui/GuiWirelessCraftingTerminal.java index 63da763..463b608 100644 --- a/src/java/net/p455w0rd/wirelesscraftingterminal/client/gui/GuiWirelessCraftingTerminal.java +++ b/src/java/net/p455w0rd/wirelesscraftingterminal/client/gui/GuiWirelessCraftingTerminal.java @@ -72,7 +72,6 @@ import net.p455w0rd.wirelesscraftingterminal.common.container.slot.SlotFake; import net.p455w0rd.wirelesscraftingterminal.common.container.slot.SlotInaccessible; import net.p455w0rd.wirelesscraftingterminal.common.container.slot.SlotOutput; import net.p455w0rd.wirelesscraftingterminal.common.container.slot.SlotTrash; -import net.p455w0rd.wirelesscraftingterminal.common.inventory.WCTInventoryBooster; import net.p455w0rd.wirelesscraftingterminal.common.utils.WCTLog; import net.p455w0rd.wirelesscraftingterminal.core.sync.network.NetworkHandler; import net.p455w0rd.wirelesscraftingterminal.core.sync.packets.PacketEmptyTrash; @@ -97,9 +96,8 @@ public class GuiWirelessCraftingTerminal extends GuiContainer implements ISortSo slotYOffset; protected static final int BUTTON_SEARCH_MODE_ID = 5; protected static final long TOOLTIP_UPDATE_INTERVAL = 3000L; - private int currScreenWidth, currScreenHeight, previousMouseX = 0, previousMouseY = 0; + private int currScreenWidth, currScreenHeight; private static final String bgTexturePath = "gui/crafting.png"; - private final WCTInventoryBooster inventory; private final ContainerWirelessCraftingTerminal containerWCT; private boolean isFullScreen, init = true, reInit, wasResized = false; public static GuiWirelessCraftingTerminal INSTANCE; @@ -116,21 +114,17 @@ public class GuiWirelessCraftingTerminal extends GuiContainer implements ISortSo public static int craftingGridOffsetX = 80; public static int craftingGridOffsetY; private static String memoryText = ""; - private static String memoryText2 = ""; private final ItemRepo repo; private final int offsetX = 8; private final IConfigManager configSrc; - private final ItemStack[] myCurrentViewCells = new ItemStack[5]; private GuiTabButton craftingStatusBtn; private MEGuiTextField searchField; private int perRow = 9; private boolean customSortOrder = true; - private int maxRows = Integer.MAX_VALUE; private GuiImgButton ViewBox; private GuiImgButton SortByBox; private GuiImgButton SortDirBox; private GuiImgButton searchBoxSettings; - private GuiImgButton terminalStyleBox; private GuiImgButton clearBtn; private GuiTrashButton trashBtn; public boolean devicePowered = false; @@ -140,9 +134,8 @@ public class GuiWirelessCraftingTerminal extends GuiContainer implements ISortSo public GuiWirelessCraftingTerminal(Container container) { super(container); - this.INSTANCE = this; + GuiWirelessCraftingTerminal.INSTANCE = this; this.containerWCT = (ContainerWirelessCraftingTerminal) container; - this.inventory = containerWCT.boosterInventory; this.scrollBar = new GuiScrollbar(); this.subGui = switchingGuis; switchingGuis = false; @@ -168,6 +161,7 @@ public class GuiWirelessCraftingTerminal extends GuiContainer implements ISortSo this.getScrollBar().setRange(0, (this.repo.size() + this.perRow - 1) / this.perRow - (AE_NUM_ROWS + 3), Math.max(1, (AE_NUM_ROWS + 3) / 6)); } + @SuppressWarnings("rawtypes") @Override protected void actionPerformed(final GuiButton btn) { if (btn == this.craftingStatusBtn) { @@ -264,6 +258,7 @@ public class GuiWirelessCraftingTerminal extends GuiContainer implements ISortSo /** * Initializes the GUI */ + @SuppressWarnings({ "unchecked", "rawtypes" }) @Override public void initGui() { Keyboard.enableRepeatEvents(true); @@ -288,8 +283,8 @@ public class GuiWirelessCraftingTerminal extends GuiContainer implements ISortSo int offset = this.guiTop + 8; this.buttonList.clear(); - this.buttonList.add(this.clearBtn = new GuiImgButton(this.guiLeft + 134, this.GUI_HEIGHT - this.GUI_LOWER_HEIGHT + 46, Settings.ACTIONS, ActionItems.STASH)); - this.buttonList.add(this.trashBtn = new GuiTrashButton(this.guiLeft + 98, this.GUI_HEIGHT - this.GUI_LOWER_HEIGHT + 103)); + this.buttonList.add(this.clearBtn = new GuiImgButton(this.guiLeft + 134, GuiWirelessCraftingTerminal.GUI_HEIGHT - GuiWirelessCraftingTerminal.GUI_LOWER_HEIGHT + 46, Settings.ACTIONS, ActionItems.STASH)); + this.buttonList.add(this.trashBtn = new GuiTrashButton(this.guiLeft + 98, GuiWirelessCraftingTerminal.GUI_HEIGHT - GuiWirelessCraftingTerminal.GUI_LOWER_HEIGHT + 103)); this.clearBtn.setHalfSize(true); if (this.customSortOrder) { this.buttonList.add(this.SortByBox = new GuiImgButton(this.guiLeft - 18, offset, Settings.SORT_BY, this.configSrc.getSetting(Settings.SORT_BY))); @@ -615,6 +610,7 @@ public class GuiWirelessCraftingTerminal extends GuiContainer implements ISortSo GuiInventory.func_147046_a(this.guiLeft + 51, this.guiTop + GUI_UPPER_HEIGHT + AE_TOTAL_ROWS_HEIGHT + 112, 32, (float) (this.guiLeft + 51) - this.xSize_lo, (float) (this.guiTop + 95 + (AE_NUM_ROWS * AE_ROW_HEIGHT)) - this.ySize_lo, this.mc.thePlayer); } + @SuppressWarnings("rawtypes") @Override protected void mouseClicked(final int xCoord, final int yCoord, final int btn) { @@ -987,7 +983,7 @@ public class GuiWirelessCraftingTerminal extends GuiContainer implements ISortSo return; } else { - this.itemRender = new RenderItem(); + GuiWirelessCraftingTerminal.itemRender = new RenderItem(); try { final ItemStack is = s.getStack(); if (s instanceof AppEngSlot && (((AppEngSlot) s).renderIconWithItem() || is == null) && (((AppEngSlot) s).shouldDisplay())) { @@ -1189,6 +1185,7 @@ public class GuiWirelessCraftingTerminal extends GuiContainer implements ISortSo return currentToolTip; } + @SuppressWarnings({ "unchecked", "rawtypes" }) @Override protected void renderToolTip(final ItemStack stack, final int x, final int y) { final Slot s = this.getSlot(x, y); @@ -1205,7 +1202,6 @@ public class GuiWirelessCraftingTerminal extends GuiContainer implements ISortSo } if (myStack != null) { - @SuppressWarnings("unchecked") final List currentToolTip = stack.getTooltip(this.mc.thePlayer, this.mc.gameSettings.advancedItemTooltips); if (myStack.getStackSize() > BigNumber || (myStack.getStackSize() > 1 && stack.isItemDamaged())) { @@ -1229,6 +1225,7 @@ public class GuiWirelessCraftingTerminal extends GuiContainer implements ISortSo // super.drawItemStackTooltip( stack, x, y ); } + @SuppressWarnings("rawtypes") @Override public void updateSetting(final IConfigManager manager, final Enum settingName, final Enum newValue) { if (this.SortByBox != null) { @@ -1254,16 +1251,19 @@ public class GuiWirelessCraftingTerminal extends GuiContainer implements ISortSo this.customSortOrder = customSortOrder; } + @SuppressWarnings("rawtypes") @Override public Enum getSortBy() { return this.configSrc.getSetting(Settings.SORT_BY); } + @SuppressWarnings("rawtypes") @Override public Enum getSortDir() { return this.configSrc.getSetting(Settings.SORT_DIRECTION); } + @SuppressWarnings("rawtypes") @Override public Enum getSortDisplay() { return this.configSrc.getSetting(Settings.VIEW_MODE); diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/client/gui/WCTBaseGui.java b/src/java/net/p455w0rd/wirelesscraftingterminal/client/gui/WCTBaseGui.java index 66ebd00..6d3af64 100644 --- a/src/java/net/p455w0rd/wirelesscraftingterminal/client/gui/WCTBaseGui.java +++ b/src/java/net/p455w0rd/wirelesscraftingterminal/client/gui/WCTBaseGui.java @@ -1,6 +1,5 @@ package net.p455w0rd.wirelesscraftingterminal.client.gui; -import java.io.IOException; import java.text.DecimalFormat; import java.text.ParseException; import java.util.Collection; diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/client/gui/WCTGuiConfig.java b/src/java/net/p455w0rd/wirelesscraftingterminal/client/gui/WCTGuiConfig.java index ad0196a..07fd059 100644 --- a/src/java/net/p455w0rd/wirelesscraftingterminal/client/gui/WCTGuiConfig.java +++ b/src/java/net/p455w0rd/wirelesscraftingterminal/client/gui/WCTGuiConfig.java @@ -9,6 +9,7 @@ import net.p455w0rd.wirelesscraftingterminal.reference.Reference; public class WCTGuiConfig extends GuiConfig { + @SuppressWarnings({ "unchecked", "rawtypes" }) public WCTGuiConfig(GuiScreen guiScreen) { super(guiScreen, diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/client/gui/widgets/GuiTrashButton.java b/src/java/net/p455w0rd/wirelesscraftingterminal/client/gui/widgets/GuiTrashButton.java index 6ccc93f..59842f4 100644 --- a/src/java/net/p455w0rd/wirelesscraftingterminal/client/gui/widgets/GuiTrashButton.java +++ b/src/java/net/p455w0rd/wirelesscraftingterminal/client/gui/widgets/GuiTrashButton.java @@ -3,7 +3,6 @@ package net.p455w0rd.wirelesscraftingterminal.client.gui.widgets; import org.lwjgl.opengl.GL11; import appeng.client.gui.widgets.ITooltip; -import appeng.client.texture.ExtraBlockTextures; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiButton; import net.minecraft.util.EnumChatFormatting; diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/client/me/ItemRepo.java b/src/java/net/p455w0rd/wirelesscraftingterminal/client/me/ItemRepo.java index 76adbbd..e1f4f30 100644 --- a/src/java/net/p455w0rd/wirelesscraftingterminal/client/me/ItemRepo.java +++ b/src/java/net/p455w0rd/wirelesscraftingterminal/client/me/ItemRepo.java @@ -100,6 +100,7 @@ public class ItemRepo this.updateView(); } + @SuppressWarnings("rawtypes") public void updateView() { this.view.clear(); @@ -227,6 +228,7 @@ public class ItemRepo } } + @SuppressWarnings("rawtypes") private void updateNEI( final String filter ) { try diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/common/WCTGuiHandler.java b/src/java/net/p455w0rd/wirelesscraftingterminal/common/WCTGuiHandler.java index b48d8af..cdbae7a 100644 --- a/src/java/net/p455w0rd/wirelesscraftingterminal/common/WCTGuiHandler.java +++ b/src/java/net/p455w0rd/wirelesscraftingterminal/common/WCTGuiHandler.java @@ -5,8 +5,6 @@ import appeng.api.implementations.guiobjects.IPortableCell; import appeng.api.storage.ITerminalHost; import cpw.mods.fml.common.network.IGuiHandler; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.entity.player.InventoryPlayer; -import net.minecraft.item.ItemStack; import net.minecraft.world.World; import net.p455w0rd.wirelesscraftingterminal.api.IWirelessCraftingTermHandler; import net.p455w0rd.wirelesscraftingterminal.client.gui.GuiCraftAmount; @@ -21,8 +19,6 @@ import net.p455w0rd.wirelesscraftingterminal.common.container.ContainerMagnet; import net.p455w0rd.wirelesscraftingterminal.common.container.ContainerWirelessCraftingTerminal; import net.p455w0rd.wirelesscraftingterminal.common.utils.RandomUtils; import net.p455w0rd.wirelesscraftingterminal.helpers.WirelessTerminalGuiObject; -import net.p455w0rd.wirelesscraftingterminal.items.ItemEnum; -import net.p455w0rd.wirelesscraftingterminal.items.ItemWirelessCraftingTerminal; import net.p455w0rd.wirelesscraftingterminal.reference.Reference; public class WCTGuiHandler implements IGuiHandler { diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/common/WirelessCraftingTerminal.java b/src/java/net/p455w0rd/wirelesscraftingterminal/common/WirelessCraftingTerminal.java index 77c6f4a..095b97a 100644 --- a/src/java/net/p455w0rd/wirelesscraftingterminal/common/WirelessCraftingTerminal.java +++ b/src/java/net/p455w0rd/wirelesscraftingterminal/common/WirelessCraftingTerminal.java @@ -1,8 +1,6 @@ package net.p455w0rd.wirelesscraftingterminal.common; import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.item.Item; -import net.minecraftforge.common.MinecraftForge; import cpw.mods.fml.common.*; import cpw.mods.fml.common.Mod.*; import cpw.mods.fml.common.event.*; @@ -18,7 +16,6 @@ import net.p455w0rd.wirelesscraftingterminal.core.sync.network.NetworkHandler; import net.p455w0rd.wirelesscraftingterminal.creativetab.CreativeTabWCT; import net.p455w0rd.wirelesscraftingterminal.handlers.AchievementHandler; import net.p455w0rd.wirelesscraftingterminal.handlers.ConfigHandler; -import net.p455w0rd.wirelesscraftingterminal.handlers.KeybindHandler; import net.p455w0rd.wirelesscraftingterminal.handlers.RecipeHandler; import net.p455w0rd.wirelesscraftingterminal.integration.IntegrationRegistry; import net.p455w0rd.wirelesscraftingterminal.proxy.CommonProxy; @@ -74,7 +71,7 @@ public class WirelessCraftingTerminal { long stopwatch = WCTLog.beginSection("PostInit"); IntegrationRegistry.INSTANCE.postInit(); FMLCommonHandler.instance().registerCrashCallable(new IntegrationCrashEnhancement()); - NetworkRegistry.INSTANCE.registerGuiHandler(this.INSTANCE, new WCTGuiHandler()); + NetworkRegistry.INSTANCE.registerGuiHandler(WirelessCraftingTerminal.INSTANCE, new WCTGuiHandler()); NetworkHandler.instance = new NetworkHandler("WCT"); WirelessCraftingTerminal.proxy.removeItemsFromNEI(); WCTLog.endSection("PostInit", stopwatch); diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/common/container/ContainerCraftAmount.java b/src/java/net/p455w0rd/wirelesscraftingterminal/common/container/ContainerCraftAmount.java index 0b1fe5a..8c6501c 100644 --- a/src/java/net/p455w0rd/wirelesscraftingterminal/common/container/ContainerCraftAmount.java +++ b/src/java/net/p455w0rd/wirelesscraftingterminal/common/container/ContainerCraftAmount.java @@ -8,7 +8,6 @@ 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 net.p455w0rd.wirelesscraftingterminal.common.inventory.WCTInventoryBooster; import appeng.api.config.SecurityPermissions; import appeng.api.networking.IGrid; import appeng.api.networking.security.BaseActionSource; diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/common/container/ContainerCraftConfirm.java b/src/java/net/p455w0rd/wirelesscraftingterminal/common/container/ContainerCraftConfirm.java index c73e9be..b772468 100644 --- a/src/java/net/p455w0rd/wirelesscraftingterminal/common/container/ContainerCraftConfirm.java +++ b/src/java/net/p455w0rd/wirelesscraftingterminal/common/container/ContainerCraftConfirm.java @@ -13,14 +13,12 @@ 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.tileentity.TileEntity; 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.inventory.WCTInventoryBooster; import net.p455w0rd.wirelesscraftingterminal.common.utils.WCTLog; import net.p455w0rd.wirelesscraftingterminal.core.sync.network.NetworkHandler; import net.p455w0rd.wirelesscraftingterminal.core.sync.packets.PacketMEInventoryUpdate; diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/common/container/ContainerCraftingCPU.java b/src/java/net/p455w0rd/wirelesscraftingterminal/common/container/ContainerCraftingCPU.java index 74435db..2623d92 100644 --- a/src/java/net/p455w0rd/wirelesscraftingterminal/common/container/ContainerCraftingCPU.java +++ b/src/java/net/p455w0rd/wirelesscraftingterminal/common/container/ContainerCraftingCPU.java @@ -8,7 +8,6 @@ import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.ICrafting; import net.minecraftforge.common.util.ForgeDirection; import net.p455w0rd.wirelesscraftingterminal.common.container.guisync.GuiSync; -import net.p455w0rd.wirelesscraftingterminal.common.inventory.WCTInventoryBooster; import net.p455w0rd.wirelesscraftingterminal.common.utils.WCTLog; import net.p455w0rd.wirelesscraftingterminal.core.sync.network.NetworkHandler; import net.p455w0rd.wirelesscraftingterminal.core.sync.packets.PacketMEInventoryUpdate; diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/common/container/ContainerMagnet.java b/src/java/net/p455w0rd/wirelesscraftingterminal/common/container/ContainerMagnet.java index 9fb6942..7f8a46c 100644 --- a/src/java/net/p455w0rd/wirelesscraftingterminal/common/container/ContainerMagnet.java +++ b/src/java/net/p455w0rd/wirelesscraftingterminal/common/container/ContainerMagnet.java @@ -18,18 +18,17 @@ import net.p455w0rd.wirelesscraftingterminal.common.utils.RandomUtils; public class ContainerMagnet extends Container { public final InventoryPlayer inventoryPlayer; - private EntityPlayer player; public ItemStack heldItem; public WCTInventoryMagnetFilter magnetInventory; private int distributeState = 0; private int pressedKeyInRange = -1; + @SuppressWarnings("rawtypes") private final Set distributeSlotSet = new HashSet(); private final int PLAYER_INV_START = 0, PLAYER_INV_END = 26, HOTBAR_START = 27, HOTBAR_END = 35, FILTERS_START = 36, FILTERS_END = 62; public ContainerMagnet(EntityPlayer player, InventoryPlayer inventoryPlayer) { this.inventoryPlayer = inventoryPlayer; - this.player = player; this.heldItem = RandomUtils.getMagnet(inventoryPlayer); this.magnetInventory = new WCTInventoryMagnetFilter(heldItem); @@ -51,7 +50,6 @@ public class ContainerMagnet extends Container { this.addSlotToContainer(new SlotMagnetFilter(this.magnetInventory, j + i * 9, j * 18 + 8, 18 + i * 18)); } } - boolean test1 = false; } private boolean isInHotbar(int slotNum) { @@ -62,6 +60,7 @@ public class ContainerMagnet extends Container { return (slotNum >= PLAYER_INV_START) && (slotNum <= PLAYER_INV_END); } + @SuppressWarnings("unused") private boolean isInFilters(int slotNum) { return (slotNum >= FILTERS_START) && (slotNum <= FILTERS_END); } @@ -80,6 +79,7 @@ public class ContainerMagnet extends Container { return false; } + @SuppressWarnings({ "unchecked", "rawtypes" }) @Override public ItemStack slotClick(int slotNum, int mouseButton, int modifier, EntityPlayer player) { if (slotNum >= this.inventorySlots.size()) { @@ -236,6 +236,7 @@ public class ContainerMagnet extends Container { return true; } + @SuppressWarnings("rawtypes") public static void setSlotStack(Set slotSet, int stackSizeSelector, ItemStack stackToResize, int currentSlotStackSize) { switch (stackSizeSelector) { case 0: @@ -312,7 +313,6 @@ public class ContainerMagnet extends Container { } ItemStack phantomStack = stackHeld.copy(); phantomStack.stackSize = stackSize; - ItemStack plainItem = new ItemStack(phantomStack.getItem(), 1); slot.putStack(phantomStack); arrangeSlots(); @@ -347,13 +347,11 @@ public class ContainerMagnet extends Container { @Override public ItemStack transferStackInSlot(final EntityPlayer p, final int slotIndex) { - ItemStack itemStack = null; Slot slot = (Slot) inventorySlots.get(slotIndex); if (slot == null || slot.getStack() == null) { return null; } ItemStack stack = slot.getStack(); - itemStack = stack.copy(); if (isInHotbar(slotIndex)) { if (!mergePhantomStack(stack)) { if (!mergeItemStack(stack, PLAYER_INV_START, PLAYER_INV_END + 1, false)) { diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/common/container/ContainerWirelessCraftingTerminal.java b/src/java/net/p455w0rd/wirelesscraftingterminal/common/container/ContainerWirelessCraftingTerminal.java index 86a0278..d6d1b56 100644 --- a/src/java/net/p455w0rd/wirelesscraftingterminal/common/container/ContainerWirelessCraftingTerminal.java +++ b/src/java/net/p455w0rd/wirelesscraftingterminal/common/container/ContainerWirelessCraftingTerminal.java @@ -16,7 +16,6 @@ import javax.annotation.Nonnull; import appeng.api.storage.IMEInventoryHandler; import appeng.api.storage.IMEMonitor; import appeng.api.storage.IMEMonitorHandlerReceiver; -import appeng.api.storage.ITerminalHost; import appeng.api.storage.data.IAEItemStack; import appeng.api.storage.data.IItemList; import appeng.api.util.IConfigManager; @@ -55,9 +54,6 @@ import appeng.api.networking.security.BaseActionSource; import appeng.api.networking.security.ISecurityGrid; import appeng.api.networking.storage.IBaseMonitor; import appeng.container.ContainerNull; -import cpw.mods.fml.common.FMLCommonHandler; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.entity.player.InventoryPlayer; @@ -66,7 +62,6 @@ import net.minecraft.inventory.ICrafting; import net.minecraft.inventory.IInventory; import net.minecraft.inventory.InventoryCrafting; import net.minecraft.inventory.Slot; -import net.minecraft.inventory.SlotCrafting; import net.minecraft.item.Item; import net.minecraft.item.ItemArmor; import net.minecraft.item.ItemStack; @@ -75,10 +70,8 @@ import net.minecraft.nbt.CompressedStreamTools; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import net.minecraft.util.ChatComponentText; -import net.minecraft.util.IIcon; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; -import net.minecraftforge.oredict.OreDictionary; import net.p455w0rd.wirelesscraftingterminal.items.ItemWirelessCraftingTerminal; import net.p455w0rd.wirelesscraftingterminal.items.ItemInfinityBooster; import net.p455w0rd.wirelesscraftingterminal.items.ItemMagnet; @@ -103,7 +96,6 @@ import net.p455w0rd.wirelesscraftingterminal.common.container.slot.SlotPlayerHot import net.p455w0rd.wirelesscraftingterminal.common.container.slot.SlotPlayerInv; import net.p455w0rd.wirelesscraftingterminal.common.container.slot.SlotTrash; import net.p455w0rd.wirelesscraftingterminal.common.inventory.WCTInventoryBooster; -import net.p455w0rd.wirelesscraftingterminal.common.inventory.WCTInventoryCraftResult; import net.p455w0rd.wirelesscraftingterminal.common.inventory.WCTInventoryCrafting; import net.p455w0rd.wirelesscraftingterminal.common.inventory.WCTInventoryMagnet; import net.p455w0rd.wirelesscraftingterminal.common.inventory.WCTInventoryTrash; @@ -129,6 +121,7 @@ public class ContainerWirelessCraftingTerminal extends Container implements ICon public ItemStack craftItem; private World worldObj; private EntityPlayer player; + @SuppressWarnings("unused") private static final int HOTBAR_START = 1, HOTBAR_END = HOTBAR_START + 8, INV_START = HOTBAR_END + 1, INV_END = INV_START + 26, ARMOR_START = INV_END + 1, ARMOR_END = ARMOR_START + 3, CRAFT_GRID_START = ARMOR_END + 1, CRAFT_GRID_END = CRAFT_GRID_START + 8, CRAFT_RESULT = CRAFT_GRID_END + 1, @@ -146,6 +139,7 @@ public class ContainerWirelessCraftingTerminal extends Container implements ICon private SlotCraftingMatrix[] craftMatrixSlot; private SlotCraftingTerm craftingSlot; public SlotTrash trashSlot; + @SuppressWarnings("unused") private int firstCraftingSlotNumber = -1, lastCraftingSlotNumber = -1, craftingSlotNumber = -1; private final WirelessTerminalGuiObject obj; @@ -957,7 +951,6 @@ public class ContainerWirelessCraftingTerminal extends Container implements ICon protected boolean networkIsPowered() { final WCTIActionHost host = this.getActionHost(); - boolean test2 = false; if (host != null) { final IGridNode gn = host.getActionableNode(Reference.WCT_BOOSTER_ENABLED && this.isBoosterInstalled()); if (gn != null) { @@ -1124,6 +1117,7 @@ public class ContainerWirelessCraftingTerminal extends Container implements ICon return this.clientCM; } + @SuppressWarnings("rawtypes") @Override public void updateSetting(final IConfigManager manager, final Enum settingName, final Enum newValue) { if (this.getGui() != null) { @@ -1623,6 +1617,7 @@ public class ContainerWirelessCraftingTerminal extends Container implements ICon b.putStack(testB); } + @SuppressWarnings("unused") private boolean isCraftMatrixSlot(AppEngSlot cs) { return (cs.getSlotIndex() >= this.firstCraftingSlotNumber) && !(cs.getSlotIndex() <= this.lastCraftingSlotNumber); } @@ -1650,22 +1645,27 @@ public class ContainerWirelessCraftingTerminal extends Container implements ICon return (index >= INV_START && index <= INV_END); } + @SuppressWarnings("unused") private boolean isInArmorSlot(@Nonnull int index) { return (index >= ARMOR_START && index <= ARMOR_END); } + @SuppressWarnings("unused") private boolean isInBoosterSlot(@Nonnull int index) { return (index == BOOSTER_INDEX); } + @SuppressWarnings("unused") private boolean isCraftResult(@Nonnull int index) { return (index == CRAFT_RESULT); } + @SuppressWarnings("unused") private boolean isInCraftMatrix(@Nonnull int index) { return (index >= CRAFT_GRID_START && index <= CRAFT_GRID_END); } + @SuppressWarnings("unused") private boolean notArmorOrBooster(ItemStack is) { if ((is.getItem() instanceof ItemInfinityBooster) || (is.getItem() instanceof ItemArmor)) { return false; 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 5eb4367..e2bfe89 100644 --- a/src/java/net/p455w0rd/wirelesscraftingterminal/common/container/guisync/SyncData.java +++ b/src/java/net/p455w0rd/wirelesscraftingterminal/common/container/guisync/SyncData.java @@ -11,7 +11,6 @@ import net.p455w0rd.wirelesscraftingterminal.common.container.WCTBaseContainer; import net.p455w0rd.wirelesscraftingterminal.common.container.ContainerWirelessCraftingTerminal; import net.p455w0rd.wirelesscraftingterminal.common.utils.WCTLog; import net.p455w0rd.wirelesscraftingterminal.core.sync.network.NetworkHandler; -import net.p455w0rd.wirelesscraftingterminal.core.sync.packets.PacketProgressBar; import net.p455w0rd.wirelesscraftingterminal.core.sync.packets.PacketValueConfig; public class SyncData @@ -70,6 +69,7 @@ public class SyncData } } + @SuppressWarnings("rawtypes") private void send( final ICrafting o, final Object val ) throws IOException { if( val instanceof String ) @@ -139,6 +139,7 @@ public class SyncData } } + @SuppressWarnings({ "unchecked", "rawtypes" }) private void updateValue( final Object oldValue, final long val ) { try diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/common/container/slot/NullSlot.java b/src/java/net/p455w0rd/wirelesscraftingterminal/common/container/slot/NullSlot.java index 1220a30..2613597 100644 --- a/src/java/net/p455w0rd/wirelesscraftingterminal/common/container/slot/NullSlot.java +++ b/src/java/net/p455w0rd/wirelesscraftingterminal/common/container/slot/NullSlot.java @@ -2,7 +2,6 @@ package net.p455w0rd.wirelesscraftingterminal.common.container.slot; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; -import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/common/container/slot/SlotArmor.java b/src/java/net/p455w0rd/wirelesscraftingterminal/common/container/slot/SlotArmor.java index 1fe35b1..fbd5564 100644 --- a/src/java/net/p455w0rd/wirelesscraftingterminal/common/container/slot/SlotArmor.java +++ b/src/java/net/p455w0rd/wirelesscraftingterminal/common/container/slot/SlotArmor.java @@ -4,7 +4,6 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; -import net.minecraft.inventory.Slot; import net.minecraft.item.Item; import net.minecraft.item.ItemArmor; import net.minecraft.item.ItemStack; 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 fbb04fe..c65432c 100644 --- a/src/java/net/p455w0rd/wirelesscraftingterminal/common/container/slot/SlotBooster.java +++ b/src/java/net/p455w0rd/wirelesscraftingterminal/common/container/slot/SlotBooster.java @@ -2,11 +2,9 @@ package net.p455w0rd.wirelesscraftingterminal.common.container.slot; import net.p455w0rd.wirelesscraftingterminal.items.ItemBoosterBGIcon; import net.p455w0rd.wirelesscraftingterminal.items.ItemInfinityBooster; -import net.p455w0rd.wirelesscraftingterminal.reference.Reference; import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import net.minecraft.client.Minecraft; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; 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 6f669d6..5d4f270 100644 --- a/src/java/net/p455w0rd/wirelesscraftingterminal/common/container/slot/SlotCraftingTerm.java +++ b/src/java/net/p455w0rd/wirelesscraftingterminal/common/container/slot/SlotCraftingTerm.java @@ -20,16 +20,12 @@ import appeng.api.storage.data.IItemList; import appeng.container.ContainerNull; import appeng.helpers.IContainerCraftingPacket; import appeng.helpers.InventoryAction; -import appeng.items.storage.ItemViewCell; import appeng.util.InventoryAdaptor; import appeng.util.Platform; import appeng.util.inv.AdaptorPlayerHand; import appeng.util.item.AEItemStack; -import appeng.util.prioitylist.IPartitionList; - -public class SlotCraftingTerm extends AppEngCraftingSlot -{ +public class SlotCraftingTerm extends AppEngCraftingSlot { private final IInventory craftInv; private final IInventory pattern; @@ -37,43 +33,36 @@ public class SlotCraftingTerm extends AppEngCraftingSlot private final BaseActionSource mySrc; private final IEnergySource energySrc; private final IStorageMonitorable storage; - private final IContainerCraftingPacket container; - public SlotCraftingTerm( final EntityPlayer player, final BaseActionSource mySrc, final IEnergySource energySrc, final IStorageMonitorable storage, final IInventory cMatrix, final IInventory secondMatrix, final IInventory output, final int x, final int y, final IContainerCraftingPacket ccp ) - { - super( player, cMatrix, output, 0, x, y ); + public SlotCraftingTerm(final EntityPlayer player, final BaseActionSource mySrc, final IEnergySource energySrc, + final IStorageMonitorable storage, final IInventory cMatrix, final IInventory secondMatrix, + final IInventory output, final int x, final int y, final IContainerCraftingPacket ccp) { + super(player, cMatrix, output, 0, x, y); this.energySrc = energySrc; this.storage = storage; this.mySrc = mySrc; this.pattern = cMatrix; this.craftInv = secondMatrix; - this.container = ccp; } - public IInventory getCraftingMatrix() - { + public IInventory getCraftingMatrix() { return this.craftInv; } @Override - public boolean canTakeStack( final EntityPlayer par1EntityPlayer ) - { + public boolean canTakeStack(final EntityPlayer par1EntityPlayer) { return false; } @Override - public void onPickupFromSlot( final EntityPlayer p, final ItemStack is ) - { + public void onPickupFromSlot(final EntityPlayer p, final ItemStack is) { } - public void doClick( final InventoryAction action, final EntityPlayer who ) - { - if( this.getStack() == null ) - { + public void doClick(final InventoryAction action, final EntityPlayer who) { + if (this.getStack() == null) { return; } - if( Platform.isClient() ) - { + if (Platform.isClient()) { return; } @@ -82,131 +71,114 @@ public class SlotCraftingTerm extends AppEngCraftingSlot int maxTimesToCraft = 0; InventoryAdaptor ia = null; - if( action == InventoryAction.CRAFT_SHIFT ) // craft into player inventory... + if (action == InventoryAction.CRAFT_SHIFT) // craft into player + // inventory... { - ia = InventoryAdaptor.getAdaptor( who, null ); - maxTimesToCraft = (int) Math.floor( (double) this.getStack().getMaxStackSize() / (double) howManyPerCraft ); - } - else if( action == InventoryAction.CRAFT_STACK ) // craft into hand, full stack + ia = InventoryAdaptor.getAdaptor(who, null); + maxTimesToCraft = (int) Math.floor((double) this.getStack().getMaxStackSize() / (double) howManyPerCraft); + } else if (action == InventoryAction.CRAFT_STACK) // craft into hand, + // full stack { - ia = new AdaptorPlayerHand( who ); - maxTimesToCraft = (int) Math.floor( (double) this.getStack().getMaxStackSize() / (double) howManyPerCraft ); - } - else + ia = new AdaptorPlayerHand(who); + maxTimesToCraft = (int) Math.floor((double) this.getStack().getMaxStackSize() / (double) howManyPerCraft); + } else // pick up what was crafted... { - ia = new AdaptorPlayerHand( who ); + ia = new AdaptorPlayerHand(who); maxTimesToCraft = 1; } - maxTimesToCraft = this.capCraftingAttempts( maxTimesToCraft ); + maxTimesToCraft = this.capCraftingAttempts(maxTimesToCraft); - if( ia == null ) - { + if (ia == null) { return; } - final ItemStack rs = Platform.cloneItemStack( this.getStack() ); - if( rs == null ) - { + final ItemStack rs = Platform.cloneItemStack(this.getStack()); + if (rs == null) { return; } - for( int x = 0; x < maxTimesToCraft; x++ ) - { - if( ia.simulateAdd( rs ) == null ) - { + for (int x = 0; x < maxTimesToCraft; x++) { + if (ia.simulateAdd(rs) == null) { final IItemList all = inv.getStorageList(); - final ItemStack extra = ia.addItems( this.craftItem( who, rs, inv, all ) ); - if( extra != null ) - { + final ItemStack extra = ia.addItems(this.craftItem(who, rs, inv, all)); + if (extra != null) { final List drops = new ArrayList(); - drops.add( extra ); - Platform.spawnDrops( who.worldObj, (int) who.posX, (int) who.posY, (int) who.posZ, drops ); + drops.add(extra); + Platform.spawnDrops(who.worldObj, (int) who.posX, (int) who.posY, (int) who.posZ, drops); return; } } } } - private int capCraftingAttempts( final int maxTimesToCraft ) - { + private int capCraftingAttempts(final int maxTimesToCraft) { return maxTimesToCraft; } - private ItemStack craftItem( final EntityPlayer p, final ItemStack request, final IMEMonitor inv, final IItemList all ) - { + @SuppressWarnings({ "rawtypes", "unchecked" }) + private ItemStack craftItem(final EntityPlayer p, final ItemStack request, final IMEMonitor inv, + final IItemList all) { // update crafting matrix... ItemStack is = this.getStack(); - if( is != null && Platform.isSameItem( request, is ) ) - { + if (is != null && Platform.isSameItem(request, is)) { final ItemStack[] set = new ItemStack[this.getPattern().getSizeInventory()]; // add one of each item to the items on the board... - if( Platform.isServer() ) - { - final InventoryCrafting ic = new InventoryCrafting( new ContainerNull(), 3, 3 ); - for( int x = 0; x < 9; x++ ) - { - ic.setInventorySlotContents( x, this.getPattern().getStackInSlot( x ) ); + if (Platform.isServer()) { + final InventoryCrafting ic = new InventoryCrafting(new ContainerNull(), 3, 3); + for (int x = 0; x < 9; x++) { + ic.setInventorySlotContents(x, this.getPattern().getStackInSlot(x)); } - final IRecipe r = Platform.findMatchingRecipe( ic, p.worldObj ); + final IRecipe r = Platform.findMatchingRecipe(ic, p.worldObj); - if( r == null ) - { + if (r == null) { final Item target = request.getItem(); - if( target.isDamageable() && target.isRepairable() ) - { + if (target.isDamageable() && target.isRepairable()) { boolean isBad = false; - for( int x = 0; x < ic.getSizeInventory(); x++ ) - { - final ItemStack pis = ic.getStackInSlot( x ); - if( pis == null ) - { + for (int x = 0; x < ic.getSizeInventory(); x++) { + final ItemStack pis = ic.getStackInSlot(x); + if (pis == null) { continue; } - if( pis.getItem() != target ) - { + if (pis.getItem() != target) { isBad = true; } } - if( !isBad ) - { - super.onPickupFromSlot( p, is ); + if (!isBad) { + super.onPickupFromSlot(p, is); // actually necessary to cleanup this case... - p.openContainer.onCraftMatrixChanged( this.craftInv ); + p.openContainer.onCraftMatrixChanged(this.craftInv); return request; } } return null; } - is = r.getCraftingResult( ic ); + is = r.getCraftingResult(ic); - if( inv != null ) - { - for( int x = 0; x < this.getPattern().getSizeInventory(); x++ ) - { - if( this.getPattern().getStackInSlot( x ) != null ) - { - set[x] = Platform.extractItemsByRecipe( this.energySrc, this.mySrc, inv, p.worldObj, r, is, ic, this.getPattern().getStackInSlot( x ), x, all, Actionable.MODULATE, null ); - ic.setInventorySlotContents( x, set[x] ); + if (inv != null) { + for (int x = 0; x < this.getPattern().getSizeInventory(); x++) { + if (this.getPattern().getStackInSlot(x) != null) { + set[x] = Platform.extractItemsByRecipe(this.energySrc, this.mySrc, inv, p.worldObj, r, is, + ic, this.getPattern().getStackInSlot(x), x, all, Actionable.MODULATE, null); + ic.setInventorySlotContents(x, set[x]); } } } } - if( this.preCraft( p, inv, set, is ) ) - { - this.makeItem( p, is ); + if (this.preCraft(p, inv, set, is)) { + this.makeItem(p, is); - this.postCraft( p, inv, set, is ); + this.postCraft(p, inv, set, is); } // shouldn't be necessary... - p.openContainer.onCraftMatrixChanged( this.craftInv ); + p.openContainer.onCraftMatrixChanged(this.craftInv); return is; } @@ -214,50 +186,42 @@ public class SlotCraftingTerm extends AppEngCraftingSlot return null; } - private boolean preCraft( final EntityPlayer p, final IMEMonitor inv, final ItemStack[] set, final ItemStack result ) - { + private boolean preCraft(final EntityPlayer p, final IMEMonitor inv, final ItemStack[] set, + final ItemStack result) { return true; } - private void makeItem( final EntityPlayer p, final ItemStack is ) - { - super.onPickupFromSlot( p, is ); + private void makeItem(final EntityPlayer p, final ItemStack is) { + super.onPickupFromSlot(p, is); } - private void postCraft( final EntityPlayer p, final IMEMonitor inv, final ItemStack[] set, final ItemStack result ) - { + private void postCraft(final EntityPlayer p, final IMEMonitor inv, final ItemStack[] set, + final ItemStack result) { final List drops = new ArrayList(); // add one of each item to the items on the board... - if( Platform.isServer() ) - { + if (Platform.isServer()) { // set new items onto the crafting table... - for( int x = 0; x < this.craftInv.getSizeInventory(); x++ ) - { - if( this.craftInv.getStackInSlot( x ) == null ) - { - this.craftInv.setInventorySlotContents( x, set[x] ); - } - else if( set[x] != null ) - { + for (int x = 0; x < this.craftInv.getSizeInventory(); x++) { + if (this.craftInv.getStackInSlot(x) == null) { + this.craftInv.setInventorySlotContents(x, set[x]); + } else if (set[x] != null) { // eek! put it back! - final IAEItemStack fail = inv.injectItems( AEItemStack.create( set[x] ), Actionable.MODULATE, this.mySrc ); - if( fail != null ) - { - drops.add( fail.getItemStack() ); + final IAEItemStack fail = inv.injectItems(AEItemStack.create(set[x]), Actionable.MODULATE, + this.mySrc); + if (fail != null) { + drops.add(fail.getItemStack()); } } } } - if( drops.size() > 0 ) - { - Platform.spawnDrops( p.worldObj, (int) p.posX, (int) p.posY, (int) p.posZ, drops ); + if (drops.size() > 0) { + Platform.spawnDrops(p.worldObj, (int) p.posX, (int) p.posY, (int) p.posZ, drops); } } - IInventory getPattern() - { + IInventory getPattern() { return this.pattern; } } \ No newline at end of file diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/common/container/slot/SlotTrash.java b/src/java/net/p455w0rd/wirelesscraftingterminal/common/container/slot/SlotTrash.java index d34bf13..7972a2b 100644 --- a/src/java/net/p455w0rd/wirelesscraftingterminal/common/container/slot/SlotTrash.java +++ b/src/java/net/p455w0rd/wirelesscraftingterminal/common/container/slot/SlotTrash.java @@ -1,14 +1,11 @@ package net.p455w0rd.wirelesscraftingterminal.common.container.slot; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import net.p455w0rd.wirelesscraftingterminal.common.utils.RandomUtils; -import net.p455w0rd.wirelesscraftingterminal.items.ItemEnum; -import net.p455w0rd.wirelesscraftingterminal.items.ItemWirelessCraftingTerminal; public class SlotTrash extends AppEngSlot { diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/common/inventory/WCTInventoryBooster.java b/src/java/net/p455w0rd/wirelesscraftingterminal/common/inventory/WCTInventoryBooster.java index cd5d434..d346aa1 100644 --- a/src/java/net/p455w0rd/wirelesscraftingterminal/common/inventory/WCTInventoryBooster.java +++ b/src/java/net/p455w0rd/wirelesscraftingterminal/common/inventory/WCTInventoryBooster.java @@ -1,12 +1,10 @@ package net.p455w0rd.wirelesscraftingterminal.common.inventory; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.Container; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; -import net.minecraftforge.common.util.Constants; import net.p455w0rd.wirelesscraftingterminal.items.ItemInfinityBooster; public class WCTInventoryBooster implements IInventory { diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/common/inventory/WCTInventoryCrafting.java b/src/java/net/p455w0rd/wirelesscraftingterminal/common/inventory/WCTInventoryCrafting.java index e5eb483..3e897e6 100644 --- a/src/java/net/p455w0rd/wirelesscraftingterminal/common/inventory/WCTInventoryCrafting.java +++ b/src/java/net/p455w0rd/wirelesscraftingterminal/common/inventory/WCTInventoryCrafting.java @@ -117,6 +117,7 @@ public class WCTInventoryCrafting extends AppEngInternalInventory { return true; } + @SuppressWarnings("rawtypes") @Override public IMEInventory getMEInventory() { return new MEIInventoryWrapper(this, null); diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/common/inventory/WCTInventoryMagnet.java b/src/java/net/p455w0rd/wirelesscraftingterminal/common/inventory/WCTInventoryMagnet.java index 23d3acd..64427b1 100644 --- a/src/java/net/p455w0rd/wirelesscraftingterminal/common/inventory/WCTInventoryMagnet.java +++ b/src/java/net/p455w0rd/wirelesscraftingterminal/common/inventory/WCTInventoryMagnet.java @@ -1,12 +1,10 @@ package net.p455w0rd.wirelesscraftingterminal.common.inventory; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.Container; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; -import net.minecraftforge.common.util.Constants; import net.p455w0rd.wirelesscraftingterminal.items.ItemMagnet; public class WCTInventoryMagnet implements IInventory { diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/common/inventory/WCTInventoryMagnetFilter.java b/src/java/net/p455w0rd/wirelesscraftingterminal/common/inventory/WCTInventoryMagnetFilter.java index 3aa4c72..9983124 100644 --- a/src/java/net/p455w0rd/wirelesscraftingterminal/common/inventory/WCTInventoryMagnetFilter.java +++ b/src/java/net/p455w0rd/wirelesscraftingterminal/common/inventory/WCTInventoryMagnetFilter.java @@ -1,13 +1,10 @@ package net.p455w0rd.wirelesscraftingterminal.common.inventory; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.Container; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; -import net.minecraftforge.common.util.Constants; -import net.p455w0rd.wirelesscraftingterminal.items.ItemInfinityBooster; public class WCTInventoryMagnetFilter implements IInventory { diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/common/inventory/WCTInventoryTrash.java b/src/java/net/p455w0rd/wirelesscraftingterminal/common/inventory/WCTInventoryTrash.java index 5de2a12..a9f6c77 100644 --- a/src/java/net/p455w0rd/wirelesscraftingterminal/common/inventory/WCTInventoryTrash.java +++ b/src/java/net/p455w0rd/wirelesscraftingterminal/common/inventory/WCTInventoryTrash.java @@ -1,12 +1,10 @@ package net.p455w0rd.wirelesscraftingterminal.common.inventory; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.Container; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; -import net.minecraftforge.common.util.Constants; public class WCTInventoryTrash implements IInventory { diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/common/utils/WCTLog.java b/src/java/net/p455w0rd/wirelesscraftingterminal/common/utils/WCTLog.java index 76ad491..d23bcb7 100644 --- a/src/java/net/p455w0rd/wirelesscraftingterminal/common/utils/WCTLog.java +++ b/src/java/net/p455w0rd/wirelesscraftingterminal/common/utils/WCTLog.java @@ -5,9 +5,6 @@ import javax.annotation.Nonnull; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import appeng.core.AEConfig; -import appeng.core.features.AEFeature; - public class WCTLog { public static final Logger log = LogManager.getLogger("Wireless Crafting Terminal"); diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/core/sync/WCTPacket.java b/src/java/net/p455w0rd/wirelesscraftingterminal/core/sync/WCTPacket.java index 972b6e9..c72eef8 100644 --- a/src/java/net/p455w0rd/wirelesscraftingterminal/core/sync/WCTPacket.java +++ b/src/java/net/p455w0rd/wirelesscraftingterminal/core/sync/WCTPacket.java @@ -3,14 +3,12 @@ package net.p455w0rd.wirelesscraftingterminal.core.sync; import io.netty.buffer.ByteBuf; import net.minecraft.entity.player.EntityPlayer; -import net.p455w0rd.wirelesscraftingterminal.common.utils.WCTLog; 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 { - private WCTPacketHandlerBase.PacketTypes id; private ByteBuf p; public void serverPacketData(final INetworkInfo manager, final WCTPacket packet, final EntityPlayer player) { @@ -37,10 +35,6 @@ public abstract class WCTPacket { final FMLProxyPacket pp = new FMLProxyPacket(this.p, NetworkHandler.instance.getChannel()); - //if (AEConfig.instance.isFeatureEnabled(AEFeature.PacketLogging)) { - // WCTLog.info(this.getClass().getName() + " : " + pp.payload().readableBytes()); - //} - return pp; } } \ No newline at end of file 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 220b60f..3b8ab20 100644 --- a/src/java/net/p455w0rd/wirelesscraftingterminal/core/sync/network/NetworkHandler.java +++ b/src/java/net/p455w0rd/wirelesscraftingterminal/core/sync/network/NetworkHandler.java @@ -7,10 +7,8 @@ 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.gameevent.PlayerEvent.PlayerLoggedInEvent; import cpw.mods.fml.common.network.FMLEventChannel; import cpw.mods.fml.common.network.FMLNetworkEvent.ClientCustomPacketEvent; -import cpw.mods.fml.common.network.FMLNetworkEvent.ServerConnectionFromClientEvent; import cpw.mods.fml.common.network.FMLNetworkEvent.ServerCustomPacketEvent; import cpw.mods.fml.common.network.NetworkRegistry; diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/core/sync/packets/PacketConfigSync.java b/src/java/net/p455w0rd/wirelesscraftingterminal/core/sync/packets/PacketConfigSync.java index 930fcc7..1e253b9 100644 --- a/src/java/net/p455w0rd/wirelesscraftingterminal/core/sync/packets/PacketConfigSync.java +++ b/src/java/net/p455w0rd/wirelesscraftingterminal/core/sync/packets/PacketConfigSync.java @@ -3,10 +3,6 @@ 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.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.nbt.NBTTagList; -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.handlers.ConfigHandler; 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 ee2e324..a606653 100644 --- a/src/java/net/p455w0rd/wirelesscraftingterminal/core/sync/packets/PacketCraftRequest.java +++ b/src/java/net/p455w0rd/wirelesscraftingterminal/core/sync/packets/PacketCraftRequest.java @@ -6,12 +6,10 @@ import io.netty.buffer.ByteBuf; import io.netty.buffer.Unpooled; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.util.ForgeDirection; import net.p455w0rd.wirelesscraftingterminal.common.WCTGuiHandler; import net.p455w0rd.wirelesscraftingterminal.common.container.ContainerCraftAmount; import net.p455w0rd.wirelesscraftingterminal.common.container.ContainerCraftConfirm; -import net.p455w0rd.wirelesscraftingterminal.common.container.ContainerOpenContext; import net.p455w0rd.wirelesscraftingterminal.common.utils.WCTLog; import net.p455w0rd.wirelesscraftingterminal.core.sync.WCTPacket; import net.p455w0rd.wirelesscraftingterminal.core.sync.network.INetworkInfo; @@ -21,7 +19,6 @@ import appeng.api.networking.IGridHost; import appeng.api.networking.IGridNode; import appeng.api.networking.crafting.ICraftingGrid; import appeng.api.networking.crafting.ICraftingJob; -import appeng.util.Platform; public class PacketCraftRequest extends WCTPacket { diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/core/sync/packets/PacketEmptyTrash.java b/src/java/net/p455w0rd/wirelesscraftingterminal/core/sync/packets/PacketEmptyTrash.java index 57c3242..a015c0b 100644 --- a/src/java/net/p455w0rd/wirelesscraftingterminal/core/sync/packets/PacketEmptyTrash.java +++ b/src/java/net/p455w0rd/wirelesscraftingterminal/core/sync/packets/PacketEmptyTrash.java @@ -9,7 +9,6 @@ import net.minecraft.nbt.NBTTagList; 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.items.ItemMagnet; public class PacketEmptyTrash 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 7648ae7..799a02d 100644 --- a/src/java/net/p455w0rd/wirelesscraftingterminal/core/sync/packets/PacketInventoryAction.java +++ b/src/java/net/p455w0rd/wirelesscraftingterminal/core/sync/packets/PacketInventoryAction.java @@ -12,7 +12,6 @@ import io.netty.buffer.Unpooled; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.inventory.Container; -import net.minecraft.tileentity.TileEntity; import net.p455w0rd.wirelesscraftingterminal.common.WCTGuiHandler; import net.p455w0rd.wirelesscraftingterminal.common.container.WCTBaseContainer; import net.p455w0rd.wirelesscraftingterminal.common.container.ContainerCraftAmount; @@ -100,6 +99,7 @@ public class PacketInventoryAction extends WCTPacket this.configureWrite( data ); } + @SuppressWarnings("unused") @Override public void serverPacketData( final INetworkInfo manager, final WCTPacket packet, final EntityPlayer player ) { diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/core/sync/packets/PacketMagnetFilterMode.java b/src/java/net/p455w0rd/wirelesscraftingterminal/core/sync/packets/PacketMagnetFilterMode.java index 0ba618a..b52625a 100644 --- a/src/java/net/p455w0rd/wirelesscraftingterminal/core/sync/packets/PacketMagnetFilterMode.java +++ b/src/java/net/p455w0rd/wirelesscraftingterminal/core/sync/packets/PacketMagnetFilterMode.java @@ -4,16 +4,13 @@ import cpw.mods.fml.common.FMLCommonHandler; import io.netty.buffer.ByteBuf; import io.netty.buffer.Unpooled; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.p455w0rd.wirelesscraftingterminal.client.gui.GuiMagnet; 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.items.ItemEnum; import net.p455w0rd.wirelesscraftingterminal.items.ItemMagnet; -import net.p455w0rd.wirelesscraftingterminal.items.ItemWirelessCraftingTerminal; public class PacketMagnetFilterMode 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 637d824..e36cd8b 100644 --- a/src/java/net/p455w0rd/wirelesscraftingterminal/core/sync/packets/PacketNEIRecipe.java +++ b/src/java/net/p455w0rd/wirelesscraftingterminal/core/sync/packets/PacketNEIRecipe.java @@ -87,6 +87,7 @@ public class PacketNEIRecipe extends WCTPacket this.configureWrite( data ); } + @SuppressWarnings({ "rawtypes", "unchecked" }) @Override public void serverPacketData( final INetworkInfo manager, final WCTPacket packet, final EntityPlayer player ) { @@ -229,7 +230,7 @@ public class PacketNEIRecipe extends WCTPacket { final InventoryAdaptor ia = InventoryAdaptor.getAdaptor( player, ForgeDirection.UNKNOWN ); final AEItemStack request = AEItemStack.create( patternItem ); - final boolean isSimulated = mode == Actionable.SIMULATE; + //final boolean isSimulated = mode == Actionable.SIMULATE; final boolean checkFuzzy = request.isOre() || patternItem.getItemDamage() == OreDictionary.WILDCARD_VALUE || patternItem.hasTagCompound() || patternItem.isItemStackDamageable(); if( !checkFuzzy ) diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/core/sync/packets/PacketOpenGui.java b/src/java/net/p455w0rd/wirelesscraftingterminal/core/sync/packets/PacketOpenGui.java index d648478..cd76c5a 100644 --- a/src/java/net/p455w0rd/wirelesscraftingterminal/core/sync/packets/PacketOpenGui.java +++ b/src/java/net/p455w0rd/wirelesscraftingterminal/core/sync/packets/PacketOpenGui.java @@ -1,19 +1,12 @@ package net.p455w0rd.wirelesscraftingterminal.core.sync.packets; -import appeng.util.Platform; import io.netty.buffer.ByteBuf; import io.netty.buffer.Unpooled; -import net.minecraft.client.Minecraft; -import net.minecraft.client.entity.EntityClientPlayerMP; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.ContainerPlayer; -import net.minecraft.world.World; -import net.p455w0rd.wirelesscraftingterminal.api.WCTApi; import net.p455w0rd.wirelesscraftingterminal.common.WCTGuiHandler; -import net.p455w0rd.wirelesscraftingterminal.common.WirelessCraftingTerminal; import net.p455w0rd.wirelesscraftingterminal.core.sync.WCTPacket; import net.p455w0rd.wirelesscraftingterminal.core.sync.network.INetworkInfo; -import net.p455w0rd.wirelesscraftingterminal.items.ItemMagnet; import net.p455w0rd.wirelesscraftingterminal.reference.Reference; public class PacketOpenGui extends WCTPacket { @@ -37,7 +30,6 @@ public class PacketOpenGui extends WCTPacket { public void serverPacketData(final INetworkInfo manager, final WCTPacket packet, final EntityPlayer player) { if (player.openContainer instanceof ContainerPlayer) { if (this.whichGui == Reference.GUI_WCT) { - //WCTApi.instance().interact().openWirelessCraftingTerminalGui(player); WCTGuiHandler.launchGui(Reference.GUI_WCT, player, player.worldObj, (int) player.posX, (int) player.posY, (int) player.posZ); } else { diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/core/sync/packets/PacketSwitchGuis.java b/src/java/net/p455w0rd/wirelesscraftingterminal/core/sync/packets/PacketSwitchGuis.java index 7e435f2..f884f9c 100644 --- a/src/java/net/p455w0rd/wirelesscraftingterminal/core/sync/packets/PacketSwitchGuis.java +++ b/src/java/net/p455w0rd/wirelesscraftingterminal/core/sync/packets/PacketSwitchGuis.java @@ -4,12 +4,9 @@ import appeng.util.Platform; import io.netty.buffer.ByteBuf; import io.netty.buffer.Unpooled; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.Container; -import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; import net.p455w0rd.wirelesscraftingterminal.client.gui.GuiWirelessCraftingTerminal; import net.p455w0rd.wirelesscraftingterminal.common.WCTGuiHandler; -import net.p455w0rd.wirelesscraftingterminal.common.WirelessCraftingTerminal; 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/PacketSwitchMagnetMode.java b/src/java/net/p455w0rd/wirelesscraftingterminal/core/sync/packets/PacketSwitchMagnetMode.java index 504d96d..d207aa3 100644 --- a/src/java/net/p455w0rd/wirelesscraftingterminal/core/sync/packets/PacketSwitchMagnetMode.java +++ b/src/java/net/p455w0rd/wirelesscraftingterminal/core/sync/packets/PacketSwitchMagnetMode.java @@ -4,7 +4,6 @@ import io.netty.buffer.ByteBuf; import io.netty.buffer.Unpooled; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.ChatComponentText; import net.p455w0rd.wirelesscraftingterminal.common.utils.RandomUtils; import net.p455w0rd.wirelesscraftingterminal.core.sync.WCTPacket; 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 aab1155..c2a5c96 100644 --- a/src/java/net/p455w0rd/wirelesscraftingterminal/core/sync/packets/PacketValueConfig.java +++ b/src/java/net/p455w0rd/wirelesscraftingterminal/core/sync/packets/PacketValueConfig.java @@ -6,7 +6,6 @@ import java.io.DataInputStream; import java.io.DataOutputStream; import java.io.IOException; -import appeng.api.config.FuzzyMode; import appeng.api.config.Settings; import appeng.api.util.IConfigManager; import appeng.api.util.IConfigurableObject; @@ -56,6 +55,7 @@ public class PacketValueConfig extends WCTPacket { this.configureWrite(data); } + @SuppressWarnings("unchecked") @Override public void serverPacketData(final INetworkInfo manager, final WCTPacket packet, final EntityPlayer player) { final Container c = player.openContainer; @@ -101,6 +101,7 @@ public class PacketValueConfig extends WCTPacket { } } + @SuppressWarnings("unchecked") @Override public void clientPacketData(final INetworkInfo network, final WCTPacket packet, final EntityPlayer player) { final Container c = player.openContainer; diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/creativetab/CreativeTabWCT.java b/src/java/net/p455w0rd/wirelesscraftingterminal/creativetab/CreativeTabWCT.java index 84ad364..cec4ac5 100644 --- a/src/java/net/p455w0rd/wirelesscraftingterminal/creativetab/CreativeTabWCT.java +++ b/src/java/net/p455w0rd/wirelesscraftingterminal/creativetab/CreativeTabWCT.java @@ -7,7 +7,6 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.p455w0rd.wirelesscraftingterminal.items.ItemEnum; import net.p455w0rd.wirelesscraftingterminal.items.ItemWirelessCraftingTerminal; -import net.p455w0rd.wirelesscraftingterminal.reference.Reference; public class CreativeTabWCT extends CreativeTabs { diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/handlers/AchievementHandler.java b/src/java/net/p455w0rd/wirelesscraftingterminal/handlers/AchievementHandler.java index 8297b3b..4c6507d 100644 --- a/src/java/net/p455w0rd/wirelesscraftingterminal/handlers/AchievementHandler.java +++ b/src/java/net/p455w0rd/wirelesscraftingterminal/handlers/AchievementHandler.java @@ -1,29 +1,14 @@ package net.p455w0rd.wirelesscraftingterminal.handlers; -import java.util.HashSet; -import java.util.LinkedList; -import java.util.Set; - import cpw.mods.fml.common.FMLCommonHandler; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; -import cpw.mods.fml.common.gameevent.PlayerEvent; import cpw.mods.fml.relauncher.Side; -import net.minecraft.client.Minecraft; -import net.minecraft.client.entity.EntityClientPlayerMP; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; -import net.minecraft.item.Item; -import net.minecraft.potion.Potion; import net.minecraft.stats.Achievement; import net.minecraft.stats.AchievementList; -import net.minecraft.util.ChatComponentText; -import net.minecraft.util.EnumChatFormatting; import net.minecraftforge.common.AchievementPage; -import net.minecraftforge.common.util.FakePlayer; -import net.minecraftforge.event.entity.player.AchievementEvent; import net.p455w0rd.wirelesscraftingterminal.items.ItemEnum; import net.p455w0rd.wirelesscraftingterminal.items.ItemInfinityBooster; -import net.p455w0rd.wirelesscraftingterminal.reference.Reference; public class AchievementHandler { diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/handlers/KeybindHandler.java b/src/java/net/p455w0rd/wirelesscraftingterminal/handlers/KeybindHandler.java index 392fb5c..edba898 100644 --- a/src/java/net/p455w0rd/wirelesscraftingterminal/handlers/KeybindHandler.java +++ b/src/java/net/p455w0rd/wirelesscraftingterminal/handlers/KeybindHandler.java @@ -2,10 +2,8 @@ package net.p455w0rd.wirelesscraftingterminal.handlers; import org.lwjgl.input.Keyboard; -import appeng.util.Platform; import cpw.mods.fml.client.FMLClientHandler; import cpw.mods.fml.client.registry.ClientRegistry; -import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.common.eventhandler.SubscribeEvent; import cpw.mods.fml.common.gameevent.InputEvent.KeyInputEvent; import cpw.mods.fml.relauncher.Side; @@ -13,10 +11,8 @@ import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.client.Minecraft; import net.minecraft.client.entity.EntityClientPlayerMP; import net.minecraft.client.settings.KeyBinding; -import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.ContainerPlayer; import net.minecraft.item.ItemStack; -import net.minecraft.server.MinecraftServer; import net.p455w0rd.wirelesscraftingterminal.client.gui.GuiWirelessCraftingTerminal; import net.p455w0rd.wirelesscraftingterminal.common.utils.RandomUtils; import net.p455w0rd.wirelesscraftingterminal.core.sync.network.NetworkHandler; diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/handlers/RecipeHandler.java b/src/java/net/p455w0rd/wirelesscraftingterminal/handlers/RecipeHandler.java index 84c79ec..f9bd5da 100644 --- a/src/java/net/p455w0rd/wirelesscraftingterminal/handlers/RecipeHandler.java +++ b/src/java/net/p455w0rd/wirelesscraftingterminal/handlers/RecipeHandler.java @@ -8,12 +8,9 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.CraftingManager; import net.minecraft.item.crafting.IRecipe; -import net.minecraft.item.crafting.ShapedRecipes; import net.minecraftforge.oredict.ShapedOreRecipe; import net.p455w0rd.wirelesscraftingterminal.common.utils.WCTLog; import net.p455w0rd.wirelesscraftingterminal.items.ItemEnum; -import net.p455w0rd.wirelesscraftingterminal.items.ItemInfinityBooster; -import net.p455w0rd.wirelesscraftingterminal.items.ItemWirelessCraftingTerminal; import net.p455w0rd.wirelesscraftingterminal.reference.Reference; public class RecipeHandler { @@ -83,6 +80,7 @@ public class RecipeHandler { init(); } + @SuppressWarnings("unchecked") public static void removeRecipes() { if (recipeList.size() == 0) { return; diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/helpers/WirelessTerminalGuiObject.java b/src/java/net/p455w0rd/wirelesscraftingterminal/helpers/WirelessTerminalGuiObject.java index 82457b9..3e2eb94 100644 --- a/src/java/net/p455w0rd/wirelesscraftingterminal/helpers/WirelessTerminalGuiObject.java +++ b/src/java/net/p455w0rd/wirelesscraftingterminal/helpers/WirelessTerminalGuiObject.java @@ -109,6 +109,7 @@ public class WirelessTerminalGuiObject implements IPortableCell, IActionHost, II } } + @SuppressWarnings({ "rawtypes", "unchecked" }) @Override public IItemList getAvailableItems(final IItemList out) { if (this.itemStorage != null) { diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/implementation/WCTInteractionHelper.java b/src/java/net/p455w0rd/wirelesscraftingterminal/implementation/WCTInteractionHelper.java index 89837dd..380df70 100644 --- a/src/java/net/p455w0rd/wirelesscraftingterminal/implementation/WCTInteractionHelper.java +++ b/src/java/net/p455w0rd/wirelesscraftingterminal/implementation/WCTInteractionHelper.java @@ -10,7 +10,6 @@ import net.minecraft.item.ItemStack; import net.minecraftforge.common.util.FakePlayer; import net.p455w0rd.wirelesscraftingterminal.api.IWCTInteractionHelper; import net.p455w0rd.wirelesscraftingterminal.api.IWirelessCraftingTermHandler; -import net.p455w0rd.wirelesscraftingterminal.common.WCTGuiHandler; import net.p455w0rd.wirelesscraftingterminal.core.sync.network.NetworkHandler; import net.p455w0rd.wirelesscraftingterminal.core.sync.packets.PacketOpenGui; import net.p455w0rd.wirelesscraftingterminal.items.ItemWirelessCraftingTerminal; diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/integration/IntegrationNode.java b/src/java/net/p455w0rd/wirelesscraftingterminal/integration/IntegrationNode.java index c18e06c..2f9a19f 100644 --- a/src/java/net/p455w0rd/wirelesscraftingterminal/integration/IntegrationNode.java +++ b/src/java/net/p455w0rd/wirelesscraftingterminal/integration/IntegrationNode.java @@ -15,6 +15,7 @@ public final class IntegrationNode private final String modID; private final IntegrationType shortName; private IntegrationStage state = IntegrationStage.PRE_INIT; + @SuppressWarnings("unused") private IntegrationStage failedStage = IntegrationStage.PRE_INIT; private Throwable exception = null; private String name = null; diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/integration/modules/NEI.java b/src/java/net/p455w0rd/wirelesscraftingterminal/integration/modules/NEI.java index 69cf18f..cb9a4a0 100644 --- a/src/java/net/p455w0rd/wirelesscraftingterminal/integration/modules/NEI.java +++ b/src/java/net/p455w0rd/wirelesscraftingterminal/integration/modules/NEI.java @@ -1,9 +1,5 @@ package net.p455w0rd.wirelesscraftingterminal.integration.modules; -import java.io.IOException; -import java.lang.reflect.Constructor; -import java.lang.reflect.InvocationTargetException; -import java.lang.reflect.Method; import java.util.ArrayList; import java.util.LinkedList; import java.util.List; @@ -20,11 +16,9 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import net.p455w0rd.wirelesscraftingterminal.client.gui.GuiWirelessCraftingTerminal; -import net.p455w0rd.wirelesscraftingterminal.client.me.WCTRenderItem; import net.p455w0rd.wirelesscraftingterminal.common.container.ContainerWirelessCraftingTerminal; import net.p455w0rd.wirelesscraftingterminal.common.container.slot.SlotCraftingMatrix; import net.p455w0rd.wirelesscraftingterminal.common.container.slot.SlotFakeCraftingMatrix; -import net.p455w0rd.wirelesscraftingterminal.common.utils.WCTLog; import net.p455w0rd.wirelesscraftingterminal.core.sync.network.NetworkHandler; import net.p455w0rd.wirelesscraftingterminal.core.sync.packets.PacketNEIRecipe; import net.p455w0rd.wirelesscraftingterminal.helpers.Reflected; @@ -32,7 +26,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 net.p455w0rd.wirelesscraftingterminal.reference.Reference; import codechicken.nei.PositionedStack; import codechicken.nei.api.API; import codechicken.nei.api.IOverlayHandler; @@ -45,6 +38,7 @@ public class NEI implements INEI, IContainerTooltipHandler, IIntegrationModule { @Reflected public static NEI instance; + @SuppressWarnings("unused") private final Class apiClass; @Reflected @@ -207,6 +201,7 @@ public class NEI implements INEI, IContainerTooltipHandler, IIntegrationModule { // overlayItems); } + @SuppressWarnings({ "rawtypes", "unchecked" }) @Override public void overlayRecipe( final GuiContainer gui, final IRecipeHandler recipe, final int recipeIndex, final boolean shift ) { @@ -223,6 +218,7 @@ public class NEI implements INEI, IContainerTooltipHandler, IIntegrationModule { } } + @SuppressWarnings("unchecked") private void overlayRecipe( final GuiContainer gui, final List ingredients, final boolean shift ) { try 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 f7c4eb9..8f769f5 100644 --- a/src/java/net/p455w0rd/wirelesscraftingterminal/integration/modules/NEIHelpers/NEIAEShapedRecipeHandler.java +++ b/src/java/net/p455w0rd/wirelesscraftingterminal/integration/modules/NEIHelpers/NEIAEShapedRecipeHandler.java @@ -37,6 +37,7 @@ public class NEIAEShapedRecipeHandler extends TemplateRecipeHandler this.transferRects.add( new TemplateRecipeHandler.RecipeTransferRect( new Rectangle( 84, 23, 24, 18 ), "crafting" ) ); } + @SuppressWarnings("unchecked") @Override public void loadCraftingRecipes( final String outputId, final Object... results ) { @@ -62,6 +63,7 @@ public class NEIAEShapedRecipeHandler extends TemplateRecipeHandler } } + @SuppressWarnings("unchecked") @Override public void loadCraftingRecipes( final ItemStack result ) { diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/integration/modules/NEIHelpers/NEIAEShapelessRecipeHandler.java b/src/java/net/p455w0rd/wirelesscraftingterminal/integration/modules/NEIHelpers/NEIAEShapelessRecipeHandler.java index 941e795..8cafef4 100644 --- a/src/java/net/p455w0rd/wirelesscraftingterminal/integration/modules/NEIHelpers/NEIAEShapelessRecipeHandler.java +++ b/src/java/net/p455w0rd/wirelesscraftingterminal/integration/modules/NEIHelpers/NEIAEShapelessRecipeHandler.java @@ -37,6 +37,7 @@ public class NEIAEShapelessRecipeHandler extends TemplateRecipeHandler this.transferRects.add( new TemplateRecipeHandler.RecipeTransferRect( new Rectangle( 84, 23, 24, 18 ), "crafting" ) ); } + @SuppressWarnings("unchecked") @Override public void loadCraftingRecipes( final String outputId, final Object... results ) { @@ -62,6 +63,7 @@ public class NEIAEShapelessRecipeHandler extends TemplateRecipeHandler } } + @SuppressWarnings("unchecked") @Override public void loadCraftingRecipes( final ItemStack result ) { @@ -80,6 +82,7 @@ public class NEIAEShapelessRecipeHandler extends TemplateRecipeHandler } } + @SuppressWarnings("unchecked") @Override public void loadUsageRecipes( final ItemStack ingredient ) { 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 d889ce8..4102d9a 100644 --- a/src/java/net/p455w0rd/wirelesscraftingterminal/integration/modules/NEIHelpers/NEICraftingHandler.java +++ b/src/java/net/p455w0rd/wirelesscraftingterminal/integration/modules/NEIHelpers/NEICraftingHandler.java @@ -27,6 +27,7 @@ public class NEICraftingHandler implements IOverlayHandler { } + @SuppressWarnings({ "unchecked", "rawtypes" }) @Override public void overlayRecipe( final GuiContainer gui, final IRecipeHandler recipe, final int recipeIndex, final boolean shift ) { @@ -43,6 +44,7 @@ public class NEICraftingHandler implements IOverlayHandler } } + @SuppressWarnings("unchecked") private void overlayRecipe( final GuiContainer gui, final List ingredients, final boolean shift ) { try diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/items/ItemBoosterBGIcon.java b/src/java/net/p455w0rd/wirelesscraftingterminal/items/ItemBoosterBGIcon.java index 426012d..4006cb8 100644 --- a/src/java/net/p455w0rd/wirelesscraftingterminal/items/ItemBoosterBGIcon.java +++ b/src/java/net/p455w0rd/wirelesscraftingterminal/items/ItemBoosterBGIcon.java @@ -4,7 +4,6 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; import net.p455w0rd.wirelesscraftingterminal.reference.Reference; diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/items/ItemInfinityBooster.java b/src/java/net/p455w0rd/wirelesscraftingterminal/items/ItemInfinityBooster.java index 7c6c425..b2fc903 100644 --- a/src/java/net/p455w0rd/wirelesscraftingterminal/items/ItemInfinityBooster.java +++ b/src/java/net/p455w0rd/wirelesscraftingterminal/items/ItemInfinityBooster.java @@ -12,10 +12,7 @@ import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.util.EnumChatFormatting; -import net.p455w0rd.wirelesscraftingterminal.common.WirelessCraftingTerminal; import net.p455w0rd.wirelesscraftingterminal.common.utils.RandomUtils; -import net.p455w0rd.wirelesscraftingterminal.creativetab.CreativeTabWCT; import net.p455w0rd.wirelesscraftingterminal.reference.Reference; import net.p455w0rd.wirelesscraftingterminal.handlers.LocaleHandler; @@ -44,9 +41,10 @@ public class ItemInfinityBooster extends Item { public int getMaxItemUseDuration(ItemStack stack) { return 1; } - - @Override + + @SuppressWarnings({ "unchecked", "rawtypes" }) @SideOnly(Side.CLIENT) + @Override public void addInformation(ItemStack is, EntityPlayer player, List list, boolean par4) { String shift = LocaleHandler.PressShift.getLocal().replace("Shift", color("yellow") + "" + color("bold") + "" + color("italics") + "Shift" + color("gray")); list.add(color("aqua") + "=============================="); diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/items/ItemMagnet.java b/src/java/net/p455w0rd/wirelesscraftingterminal/items/ItemMagnet.java index 4af2eec..ea4edfb 100644 --- a/src/java/net/p455w0rd/wirelesscraftingterminal/items/ItemMagnet.java +++ b/src/java/net/p455w0rd/wirelesscraftingterminal/items/ItemMagnet.java @@ -43,7 +43,6 @@ import net.p455w0rd.wirelesscraftingterminal.api.IWirelessCraftingTermHandler; 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.WirelessCraftingTerminal; import net.p455w0rd.wirelesscraftingterminal.common.utils.RandomUtils; import net.p455w0rd.wirelesscraftingterminal.handlers.LocaleHandler; import net.p455w0rd.wirelesscraftingterminal.helpers.WirelessTerminalGuiObject; @@ -60,7 +59,6 @@ public class ItemMagnet extends Item { private int distanceFromPlayer; private WirelessTerminalGuiObject obj; - private WCTIActionHost wctAH; private IPortableCell civ; private IEnergySource powerSrc; private IMEMonitor monitor; @@ -99,6 +97,7 @@ public class ItemMagnet extends Item { return null; } + @SuppressWarnings({ "unchecked", "rawtypes" }) @Override @SideOnly(Side.CLIENT) public void addInformation(ItemStack is, EntityPlayer player, List list, boolean par4) { @@ -212,7 +211,6 @@ public class ItemMagnet extends Item { this.obj = getGuiObject(wirelessTerm, player, world, (int) player.posX, (int) player.posY, (int) player.posZ); this.civ = (IPortableCell) this.obj; this.powerSrc = (IEnergySource) this.civ; - this.wctAH = (WCTIActionHost) this.powerSrc; this.monitor = civ.getItemInventory(); this.cellInv = this.monitor; this.mySrc = new WCTPlayerSource(player, (WCTIActionHost) this.obj); @@ -321,6 +319,7 @@ public class ItemMagnet extends Item { return false; } + @SuppressWarnings("rawtypes") private boolean isItemFiltered(ItemStack is, List itemList) { if (is != null && itemList != null) { Iterator thisList = itemList.iterator(); @@ -343,7 +342,6 @@ public class ItemMagnet extends Item { return null; } NBTTagList tagList = nbtTC.getTagList("MagnetFilter", 10); - boolean test1 = false; if (tagList.tagCount() > 0 && tagList != null) { List itemList = new ArrayList(); for (int i = 0; i < tagList.tagCount(); i++) { diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/items/ItemWirelessCraftingTerminal.java b/src/java/net/p455w0rd/wirelesscraftingterminal/items/ItemWirelessCraftingTerminal.java index 17f2b09..455aa03 100644 --- a/src/java/net/p455w0rd/wirelesscraftingterminal/items/ItemWirelessCraftingTerminal.java +++ b/src/java/net/p455w0rd/wirelesscraftingterminal/items/ItemWirelessCraftingTerminal.java @@ -34,7 +34,6 @@ import net.minecraft.world.World; import net.p455w0rd.wirelesscraftingterminal.api.IWirelessCraftingTermHandler; import net.p455w0rd.wirelesscraftingterminal.api.WCTApi; import net.p455w0rd.wirelesscraftingterminal.common.utils.RandomUtils; -import net.p455w0rd.wirelesscraftingterminal.creativetab.CreativeTabWCT; import net.p455w0rd.wirelesscraftingterminal.handlers.LocaleHandler; import net.p455w0rd.wirelesscraftingterminal.reference.Reference; @@ -48,9 +47,9 @@ public class ItemWirelessCraftingTerminal extends AEBasePoweredItem implements I public ItemWirelessCraftingTerminal() { super(Reference.WCT_MAX_POWER, Optional. absent()); - this.setUnlocalizedName("wirelessCraftingTerminal"); - this.setTextureName(Reference.MODID + ":wirelessCraftingTerminal"); - this.setMaxStackSize(1); + setUnlocalizedName("wirelessCraftingTerminal"); + setTextureName(Reference.MODID + ":wirelessCraftingTerminal"); + setMaxStackSize(1); } @SideOnly(Side.CLIENT) @@ -103,7 +102,7 @@ public class ItemWirelessCraftingTerminal extends AEBasePoweredItem implements I if (wirelessTerminal == null || !(wirelessTerminal.getItem() instanceof ItemWirelessCraftingTerminal)) { return; } - this.checkForBooster(wirelessTerminal); + checkForBooster(wirelessTerminal); } @Override @@ -150,12 +149,12 @@ public class ItemWirelessCraftingTerminal extends AEBasePoweredItem implements I @Override public boolean usePower(final EntityPlayer player, final double amount, final ItemStack is) { - return this.extractAEPower(is, amount) >= amount - 0.5; + return extractAEPower(is, amount) >= amount - 0.5; } @Override public boolean hasPower(final EntityPlayer player, final double amt, final ItemStack is) { - return this.getAECurrentPower(is) >= amt; + return getAECurrentPower(is) >= amt; } @Override @@ -163,7 +162,7 @@ public class ItemWirelessCraftingTerminal extends AEBasePoweredItem implements I final ConfigManager out = new ConfigManager(new IConfigManagerHost() { @Override - public void updateSetting(final IConfigManager manager, final Enum settingName, final Enum newValue) { + public void updateSetting(final IConfigManager manager, @SuppressWarnings("rawtypes") final Enum settingName, @SuppressWarnings("rawtypes") final Enum newValue) { final NBTTagCompound data = Platform.openNbtData(target); manager.writeToNBT(data); } @@ -197,7 +196,6 @@ public class ItemWirelessCraftingTerminal extends AEBasePoweredItem implements I return true; } - @SuppressWarnings({ "rawtypes", "unchecked" }) @Override @SideOnly(Side.CLIENT) public void addCheckedInformation(ItemStack is, EntityPlayer player, List list, boolean displayMore) { @@ -254,7 +252,7 @@ public class ItemWirelessCraftingTerminal extends AEBasePoweredItem implements I final NBTTagCompound data = ensureTagCompound(is); double currentStorage = data.getDouble(POWER_NBT_KEY); - final double maxStorage = this.getAEMaxPower(is); + final double maxStorage = getAEMaxPower(is); switch (op) { case INJECT: @@ -283,7 +281,7 @@ public class ItemWirelessCraftingTerminal extends AEBasePoweredItem implements I @Override public double getDurabilityForDisplay(ItemStack is) { - return 1 - getAECurrentPower(is) / this.getAEMaxPower(is); + return 1 - getAECurrentPower(is) / getAEMaxPower(is); } private NBTTagCompound ensureTagCompound(ItemStack is) { @@ -295,7 +293,7 @@ public class ItemWirelessCraftingTerminal extends AEBasePoweredItem implements I @Override public double getAECurrentPower(final ItemStack is) { - return this.getInternalBattery(is, batteryOperation.STORAGE, 0); + return getInternalBattery(is, batteryOperation.STORAGE, 0); } @Override @@ -305,12 +303,12 @@ public class ItemWirelessCraftingTerminal extends AEBasePoweredItem implements I @Override public double injectAEPower(final ItemStack is, final double amt) { - return this.getInternalBattery(is, batteryOperation.INJECT, amt); + return getInternalBattery(is, batteryOperation.INJECT, amt); } @Override public double extractAEPower(final ItemStack is, final double amt) { - return this.getInternalBattery(is, batteryOperation.EXTRACT, amt); + return getInternalBattery(is, batteryOperation.EXTRACT, amt); } @Override diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/proxy/ClientProxy.java b/src/java/net/p455w0rd/wirelesscraftingterminal/proxy/ClientProxy.java index 542b849..2c4fcb5 100644 --- a/src/java/net/p455w0rd/wirelesscraftingterminal/proxy/ClientProxy.java +++ b/src/java/net/p455w0rd/wirelesscraftingterminal/proxy/ClientProxy.java @@ -3,7 +3,6 @@ package net.p455w0rd.wirelesscraftingterminal.proxy; import cpw.mods.fml.common.FMLCommonHandler; import net.minecraft.item.ItemStack; import net.minecraftforge.common.MinecraftForge; -import net.p455w0rd.wirelesscraftingterminal.common.WirelessCraftingTerminal; import net.p455w0rd.wirelesscraftingterminal.handlers.KeybindHandler; import net.p455w0rd.wirelesscraftingterminal.integration.IntegrationRegistry; import net.p455w0rd.wirelesscraftingterminal.integration.IntegrationType; diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/reference/Reference.java b/src/java/net/p455w0rd/wirelesscraftingterminal/reference/Reference.java index 9057da0..ff75bef 100644 --- a/src/java/net/p455w0rd/wirelesscraftingterminal/reference/Reference.java +++ b/src/java/net/p455w0rd/wirelesscraftingterminal/reference/Reference.java @@ -2,7 +2,7 @@ package net.p455w0rd.wirelesscraftingterminal.reference; public class Reference { public static final String MODID = "ae2wct"; - public static final String VERSION = "1.7.10-1.0-alpha-1"; + public static final String VERSION = "1.7.10-1.0b"; public static final String NAME = "AE2 Wireless Crafting Terminal"; public static final String SERVER_PROXY_CLASS = "net.p455w0rd.wirelesscraftingterminal.proxy.CommonProxy"; public static final String CLIENT_PROXY_CLASS = "net.p455w0rd.wirelesscraftingterminal.proxy.ClientProxy"; diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/transformer/WCTCore.java b/src/java/net/p455w0rd/wirelesscraftingterminal/transformer/WCTCore.java index 39ecf71..106ed01 100644 --- a/src/java/net/p455w0rd/wirelesscraftingterminal/transformer/WCTCore.java +++ b/src/java/net/p455w0rd/wirelesscraftingterminal/transformer/WCTCore.java @@ -1,6 +1,5 @@ package net.p455w0rd.wirelesscraftingterminal.transformer; -import java.util.Collections; import java.util.HashSet; import java.util.List; import java.util.Map; diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/transformer/asm/ASMIntegration.java b/src/java/net/p455w0rd/wirelesscraftingterminal/transformer/asm/ASMIntegration.java index cc910dc..9d43305 100644 --- a/src/java/net/p455w0rd/wirelesscraftingterminal/transformer/asm/ASMIntegration.java +++ b/src/java/net/p455w0rd/wirelesscraftingterminal/transformer/asm/ASMIntegration.java @@ -61,6 +61,7 @@ public final class ASMIntegration implements IClassTransformer { return basicClass; } + @SuppressWarnings("rawtypes") private boolean removeOptionals(final ClassNode classNode) { boolean changed = false; @@ -144,6 +145,7 @@ public final class ASMIntegration implements IClassTransformer { return false; } + @SuppressWarnings("rawtypes") private boolean stripMethod(final ClassNode classNode, final MethodNode mn, final Iterator i, final Class class1, final AnnotationNode an) { if (an.values.size() != 2) { diff --git a/src/resources/META-INF/MANIFEST.MF b/src/resources/META-INF/MANIFEST.MF deleted file mode 100644 index 02ccabc..0000000 --- a/src/resources/META-INF/MANIFEST.MF +++ /dev/null @@ -1,4 +0,0 @@ -Manifest-Version: 1.0 -FMLCorePlugin: net.p455w0rd.wirelesscraftingterminal.transformer.WCTCore -FMLCorePluginContainsFMLMod: true - diff --git a/src/resources/assets/ae2wct/textures/gui/crafting.psd b/src/resources/assets/ae2wct/textures/gui/crafting.psd deleted file mode 100644 index c0f0264c148ebd4a681a005f867626098f5835bd..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 115524 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