From ae2be55a1c65b10d62dd435ba10ac5f45f15eaba Mon Sep 17 00:00:00 2001 From: p455w0rd Date: Fri, 29 Apr 2016 15:52:50 -0400 Subject: [PATCH] bit of code cleanu --- .../client/gui/GuiCraftConfirm.java | 10 +- .../client/gui/GuiCraftingStatus.java | 1 - .../client/gui/GuiMagnet.java | 3 + .../gui/GuiWirelessCraftingTerminal.java | 35 ++- .../common/container/ContainerMagnet.java | 218 +++++++++++++++--- .../ContainerWirelessCraftingTerminal.java | 68 +++--- .../common/container/slot/SlotTrash.java | 8 +- .../inventory/WCTInventoryMagnetFilter.java | 2 +- .../common/utils/RandomUtils.java | 38 +-- .../core/sync/WCTPacketHandlerBase.java | 16 +- .../core/sync/packets/PacketConfigSync.java | 55 +++++ .../core/sync/packets/PacketEmptyTrash.java | 49 ++++ ...enWirelessTerm.java => PacketOpenGui.java} | 23 +- .../core/sync/packets/PacketSwitchGuis.java | 48 ++-- .../sync/packets/PacketSwitchMagnetMode.java | 69 ++++++ .../creativetab/CreativeTabWCT.java | 19 +- .../handlers/AchievementHandler.java | 2 +- .../handlers/KeybindHandler.java | 51 +++- .../handlers/LocaleHandler.java | 3 +- .../helpers/WirelessTerminalGuiObject.java | 2 +- .../implementation/WCTInteractionHelper.java | 4 +- .../implementation/WCTItems.java | 1 - .../items/ItemAE2WCTDummyIcon.java | 15 -- .../items/ItemEnum.java | 1 - .../items/ItemInfinityBooster.java | 2 +- .../items/ItemMagnet.java | 81 +++++-- .../items/ItemWirelessCraftingTerminal.java | 9 +- .../proxy/ClientProxy.java | 6 - .../proxy/CommonProxy.java | 16 +- src/resources/assets/ae2wct/lang/en_US.lang | 10 +- src/resources/mcmod.info | 2 +- 31 files changed, 640 insertions(+), 227 deletions(-) create mode 100644 src/java/net/p455w0rd/wirelesscraftingterminal/core/sync/packets/PacketConfigSync.java create mode 100644 src/java/net/p455w0rd/wirelesscraftingterminal/core/sync/packets/PacketEmptyTrash.java rename src/java/net/p455w0rd/wirelesscraftingterminal/core/sync/packets/{PacketOpenWirelessTerm.java => PacketOpenGui.java} (60%) create mode 100644 src/java/net/p455w0rd/wirelesscraftingterminal/core/sync/packets/PacketSwitchMagnetMode.java delete mode 100644 src/java/net/p455w0rd/wirelesscraftingterminal/items/ItemAE2WCTDummyIcon.java diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/client/gui/GuiCraftConfirm.java b/src/java/net/p455w0rd/wirelesscraftingterminal/client/gui/GuiCraftConfirm.java index e12ae2d..bf1768a 100644 --- a/src/java/net/p455w0rd/wirelesscraftingterminal/client/gui/GuiCraftConfirm.java +++ b/src/java/net/p455w0rd/wirelesscraftingterminal/client/gui/GuiCraftConfirm.java @@ -169,11 +169,12 @@ public class GuiCraftConfirm extends WCTBaseGui @Override 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 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(); - this.fontRendererObj.drawString( GuiText.CraftingPlan.getLocal() + " -- " + Add, 8, 7, 4210752 ); + //this.fontRendererObj.drawString( GuiText.CraftingPlan.getLocal() + " -- " + Add, 8, 7, 4210752 ); + this.fontRendererObj.drawString( GuiText.CraftingPlan.getLocal(), 8, 7, 4210752 ); String dsp = null; @@ -183,7 +184,8 @@ public class GuiCraftConfirm extends WCTBaseGui } else { - dsp = this.ccc.getCpuAvailableBytes() > 0 ? ( GuiText.Bytes.getLocal() + ": " + this.ccc.getCpuAvailableBytes() + " : " + GuiText.CoProcessors.getLocal() + ": " + this.ccc.getCpuCoProcessors() ) : GuiText.Bytes.getLocal() + ": N/A : " + GuiText.CoProcessors.getLocal() + ": N/A"; + //dsp = this.ccc.getCpuAvailableBytes() > 0 ? ( GuiText.Bytes.getLocal() + ": " + this.ccc.getCpuAvailableBytes() + " : " + GuiText.CoProcessors.getLocal() + ": " + this.ccc.getCpuCoProcessors() ) : GuiText.Bytes.getLocal() + ": N/A : " + GuiText.CoProcessors.getLocal() + ": N/A"; + dsp = ""; } final int offset = ( 219 - this.fontRendererObj.getStringWidth( dsp ) ) / 2; diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/client/gui/GuiCraftingStatus.java b/src/java/net/p455w0rd/wirelesscraftingterminal/client/gui/GuiCraftingStatus.java index e02aaf8..9c73b1e 100644 --- a/src/java/net/p455w0rd/wirelesscraftingterminal/client/gui/GuiCraftingStatus.java +++ b/src/java/net/p455w0rd/wirelesscraftingterminal/client/gui/GuiCraftingStatus.java @@ -23,7 +23,6 @@ import appeng.api.definitions.IDefinitions; import appeng.api.definitions.IParts; import appeng.api.storage.ITerminalHost; import appeng.core.localization.GuiText; -import appeng.core.sync.GuiBridge; public class GuiCraftingStatus extends GuiCraftingCPU diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/client/gui/GuiMagnet.java b/src/java/net/p455w0rd/wirelesscraftingterminal/client/gui/GuiMagnet.java index 5e04006..d2ceaee 100644 --- a/src/java/net/p455w0rd/wirelesscraftingterminal/client/gui/GuiMagnet.java +++ b/src/java/net/p455w0rd/wirelesscraftingterminal/client/gui/GuiMagnet.java @@ -27,9 +27,12 @@ public class GuiMagnet extends GuiContainer { public GuiMagnet(ContainerMagnet c) { super(c); this.xSize = 176; + this.width = this.xSize; this.ySize = 168; + this.height = this.ySize; magnetItem = c.heldItem; this.mode = getMode(); + this.container = c; } @Override diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/client/gui/GuiWirelessCraftingTerminal.java b/src/java/net/p455w0rd/wirelesscraftingterminal/client/gui/GuiWirelessCraftingTerminal.java index f3ace0b..63da763 100644 --- a/src/java/net/p455w0rd/wirelesscraftingterminal/client/gui/GuiWirelessCraftingTerminal.java +++ b/src/java/net/p455w0rd/wirelesscraftingterminal/client/gui/GuiWirelessCraftingTerminal.java @@ -1,8 +1,16 @@ package net.p455w0rd.wirelesscraftingterminal.client.gui; import java.io.IOException; -import java.text.*; -import java.util.*; +import java.text.DecimalFormat; +import java.text.NumberFormat; +import java.text.ParseException; +import java.util.Collection; +import java.util.HashSet; +import java.util.Iterator; +import java.util.LinkedList; +import java.util.List; +import java.util.Locale; +import java.util.Set; import java.util.concurrent.TimeUnit; import org.lwjgl.input.Keyboard; @@ -17,7 +25,6 @@ import appeng.api.config.ActionItems; import appeng.api.config.SearchBoxMode; import appeng.api.config.Settings; import appeng.api.storage.data.IAEItemStack; -import appeng.api.storage.data.IItemList; import appeng.api.util.IConfigManager; import appeng.api.util.IConfigurableObject; import appeng.client.gui.widgets.GuiImgButton; @@ -30,9 +37,7 @@ import appeng.core.localization.GuiText; import appeng.helpers.InventoryAction; import appeng.util.IConfigManagerHost; import appeng.util.Platform; - import cpw.mods.fml.common.ObfuscationReflectionHelper; - import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.inventory.GuiContainer; @@ -50,18 +55,27 @@ import net.p455w0rd.wirelesscraftingterminal.client.gui.widgets.GuiScrollbar; import net.p455w0rd.wirelesscraftingterminal.client.gui.widgets.GuiTabButton; import net.p455w0rd.wirelesscraftingterminal.client.gui.widgets.GuiTrashButton; import net.p455w0rd.wirelesscraftingterminal.client.gui.widgets.MEGuiTextField; -import net.p455w0rd.wirelesscraftingterminal.client.me.WCTRenderItem; import net.p455w0rd.wirelesscraftingterminal.client.me.InternalSlotME; import net.p455w0rd.wirelesscraftingterminal.client.me.ItemRepo; import net.p455w0rd.wirelesscraftingterminal.client.me.SlotDisconnected; import net.p455w0rd.wirelesscraftingterminal.client.me.SlotME; -import net.p455w0rd.wirelesscraftingterminal.common.WirelessCraftingTerminal; +import net.p455w0rd.wirelesscraftingterminal.client.me.WCTRenderItem; import net.p455w0rd.wirelesscraftingterminal.common.container.ContainerWirelessCraftingTerminal; -import net.p455w0rd.wirelesscraftingterminal.common.container.slot.*; +import net.p455w0rd.wirelesscraftingterminal.common.container.slot.AppEngCraftingSlot; +import net.p455w0rd.wirelesscraftingterminal.common.container.slot.AppEngSlot; import net.p455w0rd.wirelesscraftingterminal.common.container.slot.AppEngSlot.hasCalculatedValidness; +import net.p455w0rd.wirelesscraftingterminal.common.container.slot.OptionalSlotFake; +import net.p455w0rd.wirelesscraftingterminal.common.container.slot.SlotCraftingMatrix; +import net.p455w0rd.wirelesscraftingterminal.common.container.slot.SlotCraftingTerm; +import net.p455w0rd.wirelesscraftingterminal.common.container.slot.SlotDisabled; +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; import net.p455w0rd.wirelesscraftingterminal.core.sync.packets.PacketInventoryAction; import net.p455w0rd.wirelesscraftingterminal.core.sync.packets.PacketSwapSlots; import net.p455w0rd.wirelesscraftingterminal.core.sync.packets.PacketSwitchGuis; @@ -70,7 +84,6 @@ import net.p455w0rd.wirelesscraftingterminal.handlers.LocaleHandler; import net.p455w0rd.wirelesscraftingterminal.integration.IntegrationRegistry; import net.p455w0rd.wirelesscraftingterminal.integration.IntegrationType; import net.p455w0rd.wirelesscraftingterminal.integration.abstraction.INEI; -import net.p455w0rd.wirelesscraftingterminal.items.ItemEnum; import net.p455w0rd.wirelesscraftingterminal.reference.Reference; public class GuiWirelessCraftingTerminal extends GuiContainer implements ISortSource, IConfigManagerHost { @@ -214,7 +227,9 @@ public class GuiWirelessCraftingTerminal extends GuiContainer implements ISortSo if (s != null) { if (s.getHasStack()) { - containerWCT.emptyTrash(); + containerWCT.trashSlot.clearStack(); + final PacketEmptyTrash p = new PacketEmptyTrash(); + NetworkHandler.instance.sendToServer(p); } } } diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/common/container/ContainerMagnet.java b/src/java/net/p455w0rd/wirelesscraftingterminal/common/container/ContainerMagnet.java index 47de7c5..9fb6942 100644 --- a/src/java/net/p455w0rd/wirelesscraftingterminal/common/container/ContainerMagnet.java +++ b/src/java/net/p455w0rd/wirelesscraftingterminal/common/container/ContainerMagnet.java @@ -1,19 +1,19 @@ package net.p455w0rd.wirelesscraftingterminal.common.container; -import java.util.List; +import java.util.HashSet; +import java.util.Iterator; +import java.util.Set; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; -import net.minecraft.inventory.IInventory; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; +import net.minecraft.util.MathHelper; import net.minecraftforge.oredict.OreDictionary; import net.p455w0rd.wirelesscraftingterminal.common.container.slot.SlotMagnetFilter; import net.p455w0rd.wirelesscraftingterminal.common.inventory.WCTInventoryMagnetFilter; import net.p455w0rd.wirelesscraftingterminal.common.utils.RandomUtils; -import net.p455w0rd.wirelesscraftingterminal.items.ItemEnum; -import net.p455w0rd.wirelesscraftingterminal.items.ItemWirelessCraftingTerminal; public class ContainerMagnet extends Container { @@ -21,10 +21,11 @@ public class ContainerMagnet extends Container { private EntityPlayer player; public ItemStack heldItem; public WCTInventoryMagnetFilter magnetInventory; - private final int playerInventorySize = 9 * 4; - private final int playerHotbarSize = 9; - private final int PLAYER_INV_START = 0, PLAYER_INV_END = 26, HOTBAR_START = 27, HOTBAR_END = 36, FILTERS_START = 37, - FILTERS_END = 56; + private int distributeState = 0; + private int pressedKeyInRange = -1; + 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; @@ -50,6 +51,7 @@ 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) { @@ -80,22 +82,114 @@ public class ContainerMagnet extends Container { @Override public ItemStack slotClick(int slotNum, int mouseButton, int modifier, EntityPlayer player) { - if (slotNum < 0) { + if (slotNum >= this.inventorySlots.size()) { return null; } - if (getSlot(slotNum) == null) { - if (getSlot(slotNum) instanceof SlotMagnetFilter) { - arrangeSlots(); + InventoryPlayer inventoryplayer = player.inventory; + ItemStack itemstack3; + ItemStack stack = null; + int sizeOrID; + if (slotNum == -999) { + + if (inventoryplayer.getItemStack() != null && slotNum == -999) { + if (mouseButton == 0) { + player.dropPlayerItemWithRandomChoice(inventoryplayer.getItemStack(), true); + inventoryplayer.setItemStack((ItemStack) null); + } + + if (mouseButton == 1) { + player.dropPlayerItemWithRandomChoice(inventoryplayer.getItemStack().splitStack(1), true); + + if (inventoryplayer.getItemStack().stackSize == 0) { + inventoryplayer.setItemStack((ItemStack) null); + } + } } return null; } - //if (getSlot(slotNum).getStack() == RandomUtils.getMagnet(player.inventory)) { - // return null; - //} - if (getSlot(slotNum) instanceof SlotMagnetFilter) { + + //Click+drag stack + else if (modifier == 5) { + //if (isInFilters(slotNum)) { + // return null; + //} + int currentDistributeState = this.distributeState; + this.distributeState = checkForPressedButton(mouseButton); + + if ((currentDistributeState != 1 || this.distributeState != 2) && currentDistributeState != this.distributeState) { + this.resetDistributionVariables(); + } + else if (inventoryplayer.getItemStack() == null) { + this.resetDistributionVariables(); + } + else if (this.distributeState == 0) { + this.pressedKeyInRange = checkForPressedButton2(mouseButton); + + if (checkValue(this.pressedKeyInRange)) { + this.distributeState = 1; + this.distributeSlotSet.clear(); + } + else { + this.resetDistributionVariables(); + } + } + else if (this.distributeState == 1) { + Slot slot = (Slot) this.inventorySlots.get(slotNum); + + if (slot != null && stackFitsInSlot(slot, inventoryplayer.getItemStack(), true) && slot.isItemValid(inventoryplayer.getItemStack()) && inventoryplayer.getItemStack().stackSize > this.distributeSlotSet.size() && this.canDragIntoSlot(slot)) { + this.distributeSlotSet.add(slot); + } + } + else if (this.distributeState == 2) { + if (!this.distributeSlotSet.isEmpty()) { + itemstack3 = inventoryplayer.getItemStack().copy(); + sizeOrID = inventoryplayer.getItemStack().stackSize; + Iterator iterator = this.distributeSlotSet.iterator(); + + while (iterator.hasNext()) { + Slot slot1 = (Slot) iterator.next(); + + if (slot1 != null && stackFitsInSlot(slot1, inventoryplayer.getItemStack(), true) && slot1.isItemValid(inventoryplayer.getItemStack()) && inventoryplayer.getItemStack().stackSize >= this.distributeSlotSet.size() && this.canDragIntoSlot(slot1)) { + ItemStack itemstack1 = itemstack3.copy(); + int j1 = slot1.getHasStack() ? slot1.getStack().stackSize : 0; + setSlotStack(this.distributeSlotSet, this.pressedKeyInRange, itemstack1, j1); + + if (itemstack1.stackSize > itemstack1.getMaxStackSize()) { + itemstack1.stackSize = itemstack1.getMaxStackSize(); + } + + if (itemstack1.stackSize > slot1.getSlotStackLimit()) { + itemstack1.stackSize = slot1.getSlotStackLimit(); + } + + sizeOrID -= itemstack1.stackSize - j1; + slot1.putStack(itemstack1); + } + } + + itemstack3.stackSize = sizeOrID; + + if (itemstack3.stackSize <= 0) { + itemstack3 = null; + } + + inventoryplayer.setItemStack(itemstack3); + } + + this.resetDistributionVariables(); + } + else { + this.resetDistributionVariables(); + } + } + + else if (this.distributeState != 0) { + this.resetDistributionVariables(); + } + + else if (getSlot(slotNum) != null && getSlot(slotNum) instanceof SlotMagnetFilter) { SlotMagnetFilter slot = (SlotMagnetFilter) getSlot(slotNum); - ItemStack stack = null; ItemStack stackSlot = slot.getStack(); if (alreadyFiltered(player.inventory.getItemStack()) && player.inventory.getItemStack() != null) { @@ -130,20 +224,63 @@ public class ContainerMagnet extends Container { } } } - else if (mouseButton == 5) { - InventoryPlayer playerInv = player.inventory; - ItemStack stackHeld = playerInv.getItemStack(); - if (!slot.getHasStack()) { - fillPhantomSlot(slot, stackHeld, mouseButton); - } - } return stack; } - return super.slotClick(slotNum, mouseButton, modifier, player); + else { + return super.slotClick(slotNum, mouseButton, modifier, player); + } + return stack; + } + + public boolean alwaysTrue(Slot slot) { + return true; + } + + public static void setSlotStack(Set slotSet, int stackSizeSelector, ItemStack stackToResize, int currentSlotStackSize) { + switch (stackSizeSelector) { + case 0: + stackToResize.stackSize = MathHelper.floor_float((float) stackToResize.stackSize / (float) slotSet.size()); + break; + case 1: + stackToResize.stackSize = 1; + } + + stackToResize.stackSize += currentSlotStackSize; + } + + public static boolean stackFitsInSlot(Slot slot, ItemStack itemStack, boolean sizeMatters) { + boolean flag1 = slot == null || !slot.getHasStack(); + + if (slot != null && slot.getHasStack() && itemStack != null && itemStack.isItemEqual(slot.getStack()) && ItemStack.areItemStackTagsEqual(slot.getStack(), itemStack)) { + int i = sizeMatters ? 0 : itemStack.stackSize; + flag1 |= slot.getStack().stackSize + i <= itemStack.getMaxStackSize(); + } + + return flag1; + } + + public static int checkForPressedButton(int btn) { + return btn & 3; + } + + public static int checkForPressedButton2(int mouseButtonPressed) { + return mouseButtonPressed >> 2 & 3; + } + + public static boolean checkValue(int value) { + return value == 0 || value == 1; + } + + protected void resetDistributionVariables() { + this.distributeState = 0; + this.distributeSlotSet.clear(); } private void arrangeSlots() { int invSize = magnetInventory.getSizeInventory(); + if (invSize <= 0) { + return; + } for (int i = 0; i < invSize; i++) { if (magnetInventory.getStackInSlot(i) == null) { for (int j = 0; j < invSize; j++) { @@ -212,18 +349,28 @@ public class ContainerMagnet extends Container { public ItemStack transferStackInSlot(final EntityPlayer p, final int slotIndex) { ItemStack itemStack = null; Slot slot = (Slot) inventorySlots.get(slotIndex); - if (slot == null || !slot.getHasStack()) { + if (slot == null || slot.getStack() == null) { return null; } ItemStack stack = slot.getStack(); itemStack = stack.copy(); if (isInHotbar(slotIndex)) { - if (!mergeItemStack(stack, PLAYER_INV_START, PLAYER_INV_END + 1, false)) { + if (!mergePhantomStack(stack)) { + if (!mergeItemStack(stack, PLAYER_INV_START, PLAYER_INV_END + 1, false)) { + return null; + } + } + else { return null; } } else if (isInPlayerInventory(slotIndex)) { - if (!mergeItemStack(stack, HOTBAR_START, HOTBAR_END + 1, false)) { + if (!mergePhantomStack(stack)) { + if (!mergeItemStack(stack, HOTBAR_START, HOTBAR_END + 1, false)) { + return null; + } + } + else { return null; } } @@ -240,6 +387,21 @@ public class ContainerMagnet extends Container { return stack; } + protected boolean mergePhantomStack(ItemStack stack) { + if (!alreadyFiltered(stack)) { + for (int i = FILTERS_START; i <= FILTERS_END; i++) { + if (this.getSlot(i).getStack() != null) { + continue; + } + else { + fillPhantomSlot((SlotMagnetFilter) this.getSlot(i), stack, 0); + return true; + } + } + } + return false; + } + public boolean isIdenticalItem(ItemStack lhs, ItemStack rhs) { if (lhs == rhs) { return true; diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/common/container/ContainerWirelessCraftingTerminal.java b/src/java/net/p455w0rd/wirelesscraftingterminal/common/container/ContainerWirelessCraftingTerminal.java index 3476b5d..86a0278 100644 --- a/src/java/net/p455w0rd/wirelesscraftingterminal/common/container/ContainerWirelessCraftingTerminal.java +++ b/src/java/net/p455w0rd/wirelesscraftingterminal/common/container/ContainerWirelessCraftingTerminal.java @@ -145,7 +145,7 @@ public class ContainerWirelessCraftingTerminal extends Container implements ICon private SlotArmor[] armorSlot; private SlotCraftingMatrix[] craftMatrixSlot; private SlotCraftingTerm craftingSlot; - private SlotTrash trashSlot; + public SlotTrash trashSlot; private int firstCraftingSlotNumber = -1, lastCraftingSlotNumber = -1, craftingSlotNumber = -1; private final WirelessTerminalGuiObject obj; @@ -282,7 +282,7 @@ public class ContainerWirelessCraftingTerminal extends Container implements ICon magnetSlot = new SlotMagnet(this.magnetInventory, 152, MAGNET_Y_OFFSET); this.addSlotToContainer(magnetSlot); - trashSlot = new SlotTrash(trashInventory, 80, TRASH_Y_OFFSET, player); + trashSlot = new SlotTrash(this.trashInventory, 80, TRASH_Y_OFFSET, player); trashSlot.setContainer(this); this.addSlotToContainer(trashSlot); @@ -292,10 +292,6 @@ public class ContainerWirelessCraftingTerminal extends Container implements ICon thisItem.checkForBooster(containerstack); } - public void emptyTrash() { - this.trashSlot.clearStack(); - } - public void setCellInventory(final IMEInventoryHandler cellInv) { this.cellInv = cellInv; } @@ -752,7 +748,7 @@ public class ContainerWirelessCraftingTerminal extends Container implements ICon // this.getPlayerInv().setInventorySlotContents(this.getPlayerInv().currentItem, this.civ.getItemStack()); //} //else { - //this.setValidContainer(false); + //this.setValidContainer(false); //} // drain 1 ae t @@ -826,30 +822,31 @@ public class ContainerWirelessCraftingTerminal extends Container implements ICon } } } - boolean hasAxxess = hasAccess(SecurityPermissions.CRAFT, true) || hasAccess(SecurityPermissions.EXTRACT, true) || hasAccess(SecurityPermissions.INJECT, true); - if (!isInRange()) { - if (!isBoosterInstalled() || !Reference.WCT_BOOSTER_ENABLED) { - if (Platform.isServer() && this.isValidContainer()) { - this.getPlayerInv().player.addChatMessage(PlayerMessages.OutOfRange.get()); + if (Platform.isServer()) { + if (!isInRange()) { + if (!isBoosterInstalled() || !Reference.WCT_BOOSTER_ENABLED) { + if (this.isValidContainer()) { + this.getPlayerInv().player.addChatMessage(PlayerMessages.OutOfRange.get()); + } + this.setValidContainer(false); + } + if (!networkIsPowered()) { + if (this.isValidContainer()) { + this.getPlayerInv().player.addChatMessage(new ChatComponentText(LocaleHandler.NoNetworkPower.getLocal())); + } + this.setValidContainer(false); + } + } + else if (!hasAccess(SecurityPermissions.CRAFT, true) || !hasAccess(SecurityPermissions.EXTRACT, true) || !hasAccess(SecurityPermissions.INJECT, true)) { + if (this.isValidContainer()) { + this.getPlayerInv().player.addChatMessage(PlayerMessages.CommunicationError.get()); } this.setValidContainer(false); } - if (!networkIsPowered()) { - if (Platform.isServer() && this.isValidContainer()) { - this.getPlayerInv().player.addChatMessage(new ChatComponentText(LocaleHandler.NoNetworkPower.getLocal())); - } - this.setValidContainer(false); + else { + this.setPowerMultiplier(AEConfig.instance.wireless_getDrainRate(this.obj.getRange())); } } - else if (!hasAxxess) { - if (Platform.isServer() && this.isValidContainer()) { - this.getPlayerInv().player.addChatMessage(PlayerMessages.CommunicationError.get()); - } - this.setValidContainer(false); - } - else { - this.setPowerMultiplier(AEConfig.instance.wireless_getDrainRate(this.obj.getRange())); - } super.detectAndSendChanges(); } @@ -986,19 +983,18 @@ public class ContainerWirelessCraftingTerminal extends Container implements ICon if (g != null) { if (requirePower) { final IEnergyGrid eg = g.getCache(IEnergyGrid.class); - if (!eg.isNetworkPowered()) { + if (!eg.isNetworkPowered() && Platform.isServer()) { return false; } } final ISecurityGrid sg = g.getCache(ISecurityGrid.class); - if (sg.hasPermission(this.getInventoryPlayer().player, perm)) { + if (sg.hasPermission(this.player, perm) && Platform.isServer()) { return true; } } } } - return false; } @@ -1225,7 +1221,7 @@ public class ContainerWirelessCraftingTerminal extends Container implements ICon public boolean isPowered() { NBTTagCompound testnbt = this.containerstack.getTagCompound(); double pwr = testnbt.getDouble("internalCurrentPower"); - return (pwr > 0.8); + return (pwr > 0.0); } public void setPowerSource(final IEnergySource powerSrc) { @@ -1681,10 +1677,16 @@ public class ContainerWirelessCraftingTerminal extends Container implements ICon @Override public ItemStack slotClick(int slot, int button, int flag, EntityPlayer player) { - if (slot >= 0 && getSlot(slot) != null && getSlot(slot).getStack() == RandomUtils.getWirelessTerm(player.inventory)) { - return null; + try { + if (slot >= 0 && getSlot(slot) != null && getSlot(slot).getStack() == RandomUtils.getWirelessTerm(player.inventory)) { + return null; + } + return super.slotClick(slot, button, flag, player); } - return super.slotClick(slot, button, flag, player); + catch (IndexOutOfBoundsException e) { + //When clicking super fast, for some reason, MC tried to access this inv size (max index + 1) + } + return null; } public final void updateFullProgressBar(final int idx, final long value) { 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 b0fe510..d34bf13 100644 --- a/src/java/net/p455w0rd/wirelesscraftingterminal/common/container/slot/SlotTrash.java +++ b/src/java/net/p455w0rd/wirelesscraftingterminal/common/container/slot/SlotTrash.java @@ -20,7 +20,7 @@ public class SlotTrash extends AppEngSlot { public SlotTrash(IInventory inv, int x, int y, EntityPlayer player) { super(null, 0, x, y); entityPlayer = player; - //readNBT(); + readNBT(); } @Override @@ -37,7 +37,7 @@ public class SlotTrash extends AppEngSlot { public void putStack(ItemStack itemStack) { shouldDeleteMouseStack = (this.itemStack != null); this.itemStack = itemStack; - //writeNBT(); + writeNBT(); } @Override @@ -70,7 +70,7 @@ public class SlotTrash extends AppEngSlot { returnStack = itemStack; itemStack = null; shouldDeleteMouseStack = true; - //writeNBT(); + writeNBT(); return returnStack; } else { returnStack = itemStack.splitStack(amount); @@ -79,7 +79,7 @@ public class SlotTrash extends AppEngSlot { itemStack = null; shouldDeleteMouseStack = true; } - //writeNBT(); + writeNBT(); return returnStack; } } diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/common/inventory/WCTInventoryMagnetFilter.java b/src/java/net/p455w0rd/wirelesscraftingterminal/common/inventory/WCTInventoryMagnetFilter.java index 6967df5..3aa4c72 100644 --- a/src/java/net/p455w0rd/wirelesscraftingterminal/common/inventory/WCTInventoryMagnetFilter.java +++ b/src/java/net/p455w0rd/wirelesscraftingterminal/common/inventory/WCTInventoryMagnetFilter.java @@ -97,7 +97,7 @@ public class WCTInventoryMagnetFilter implements IInventory { @Override public boolean isItemValidForSlot(int slot, ItemStack itemstack) { - return (itemstack.getItem() instanceof ItemInfinityBooster); + return true; } public void readFromNBT(NBTTagCompound nbtTagCompound) { diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/common/utils/RandomUtils.java b/src/java/net/p455w0rd/wirelesscraftingterminal/common/utils/RandomUtils.java index 362048f..0810e5b 100644 --- a/src/java/net/p455w0rd/wirelesscraftingterminal/common/utils/RandomUtils.java +++ b/src/java/net/p455w0rd/wirelesscraftingterminal/common/utils/RandomUtils.java @@ -4,6 +4,8 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.NBTTagList; import net.minecraft.util.EnumChatFormatting; import net.p455w0rd.wirelesscraftingterminal.items.ItemEnum; import net.p455w0rd.wirelesscraftingterminal.items.ItemMagnet; @@ -37,7 +39,7 @@ public class RandomUtils { return EnumChatFormatting.GRAY.toString(); } } - + public static ItemStack getWirelessTerm(InventoryPlayer playerInv) { if (playerInv.player.getHeldItem() != null && playerInv.player.getHeldItem().getItem() instanceof ItemWirelessCraftingTerminal) { return playerInv.player.getHeldItem(); @@ -72,13 +74,29 @@ public class RandomUtils { return wirelessTerm; } } - + public static ItemStack getMagnet(InventoryPlayer playerInv) { + // Is player holding a Magnet Card? if (playerInv.player.getHeldItem() != null && playerInv.player.getHeldItem().getItem() instanceof ItemMagnet) { return playerInv.player.getHeldItem(); } - ItemStack magnetItem = null; int invSize = playerInv.getSizeInventory(); + // if not true, try to return first wireless crafting terminal + // that has a MagnetCard installed + ItemStack wirelessTerm = getWirelessTerm(playerInv); + if (wirelessTerm != null && wirelessTerm.getItem() instanceof ItemWirelessCraftingTerminal) { + NBTTagCompound nbtTC = wirelessTerm.getTagCompound(); + if (nbtTC.hasKey("MagnetSlot")) { + NBTTagList magnetSlot = nbtTC.getTagList("MagnetSlot", 10); + ItemStack magnetItem = ItemStack.loadItemStackFromNBT(magnetSlot.getCompoundTagAt(0)); + if (magnetItem != null && magnetItem.getItem() instanceof ItemMagnet) { + return magnetItem; + } + } + } + // No wireless crafting terminal with Magnet Card installed, + // is there a Magnet Card in the player's inventory? + ItemStack magnetItem = null; if (invSize <= 0) { return null; } @@ -95,17 +113,7 @@ public class RandomUtils { continue; } } - if (magnetItem == null) { - if (playerInv.player.getHeldItem() != null) { - return playerInv.player.getHeldItem(); - } - else { - return ItemEnum.WIRELESS_CRAFTING_TERMINAL.getStack(); - } - } - else { - return magnetItem; - } + return magnetItem; } - + } diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/core/sync/WCTPacketHandlerBase.java b/src/java/net/p455w0rd/wirelesscraftingterminal/core/sync/WCTPacketHandlerBase.java index a4d5b21..c7c4d49 100644 --- a/src/java/net/p455w0rd/wirelesscraftingterminal/core/sync/WCTPacketHandlerBase.java +++ b/src/java/net/p455w0rd/wirelesscraftingterminal/core/sync/WCTPacketHandlerBase.java @@ -7,16 +7,18 @@ import java.util.Map; import io.netty.buffer.ByteBuf; import io.netty.handler.codec.DecoderException; -import net.p455w0rd.wirelesscraftingterminal.core.sync.WCTPacketHandlerBase.PacketTypes; +import net.p455w0rd.wirelesscraftingterminal.core.sync.packets.PacketConfigSync; import net.p455w0rd.wirelesscraftingterminal.core.sync.packets.PacketCraftRequest; +import net.p455w0rd.wirelesscraftingterminal.core.sync.packets.PacketEmptyTrash; import net.p455w0rd.wirelesscraftingterminal.core.sync.packets.PacketInventoryAction; import net.p455w0rd.wirelesscraftingterminal.core.sync.packets.PacketMEInventoryUpdate; import net.p455w0rd.wirelesscraftingterminal.core.sync.packets.PacketMagnetFilterMode; import net.p455w0rd.wirelesscraftingterminal.core.sync.packets.PacketNEIRecipe; -import net.p455w0rd.wirelesscraftingterminal.core.sync.packets.PacketOpenWirelessTerm; +import net.p455w0rd.wirelesscraftingterminal.core.sync.packets.PacketOpenGui; import net.p455w0rd.wirelesscraftingterminal.core.sync.packets.PacketPartialItem; import net.p455w0rd.wirelesscraftingterminal.core.sync.packets.PacketSwapSlots; import net.p455w0rd.wirelesscraftingterminal.core.sync.packets.PacketSwitchGuis; +import net.p455w0rd.wirelesscraftingterminal.core.sync.packets.PacketSwitchMagnetMode; import net.p455w0rd.wirelesscraftingterminal.core.sync.packets.PacketValueConfig; public class WCTPacketHandlerBase { @@ -27,8 +29,6 @@ public class WCTPacketHandlerBase { PACKET_ME_INVENTORY_UPDATE(PacketMEInventoryUpdate.class), - //PACKET_CONFIG_BUTTON( PacketConfigButton.class ), - PACKET_VALUE_CONFIG(PacketValueConfig.class), PACKET_SWITCH_GUIS(PacketSwitchGuis.class), @@ -43,7 +43,13 @@ public class WCTPacketHandlerBase { PACKET_MAGNETFILTER_MODE(PacketMagnetFilterMode.class), - PACKET_OPENWIRELESSTERM(PacketOpenWirelessTerm.class); + PACKET_OPENWIRELESSTERM(PacketOpenGui.class), + + PACKET_SWITCHMAGNETMODE(PacketSwitchMagnetMode.class), + + PACKET_EMPTY_TRASH(PacketEmptyTrash.class), + + PACKET_SYNC_CONFIGS(PacketConfigSync.class); private final Class packetClass; private final Constructor packetConstructor; diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/core/sync/packets/PacketConfigSync.java b/src/java/net/p455w0rd/wirelesscraftingterminal/core/sync/packets/PacketConfigSync.java new file mode 100644 index 0000000..930fcc7 --- /dev/null +++ b/src/java/net/p455w0rd/wirelesscraftingterminal/core/sync/packets/PacketConfigSync.java @@ -0,0 +1,55 @@ +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; +import net.p455w0rd.wirelesscraftingterminal.reference.Reference; + +public class PacketConfigSync extends WCTPacket { + + int wirelessTermMaxPower; + boolean easyMode, boosterEnabled; + + public PacketConfigSync(final ByteBuf stream) { + this.wirelessTermMaxPower = stream.readInt(); + this.easyMode = stream.readBoolean(); + this.boosterEnabled = stream.readBoolean(); + } + + // api + public PacketConfigSync(int power, boolean mode, boolean booster) { + this.wirelessTermMaxPower = power; + this.easyMode = mode; + this.boosterEnabled = booster; + + final ByteBuf data = Unpooled.buffer(); + data.writeInt(this.getPacketID()); + data.writeInt(this.wirelessTermMaxPower); + data.writeBoolean(this.easyMode); + data.writeBoolean(this.boosterEnabled); + this.configureWrite(data); + } + + @Override + public void serverPacketData(final INetworkInfo manager, final WCTPacket packet, final EntityPlayer player) { + + } + + @Override + public void clientPacketData(final INetworkInfo network, final WCTPacket packet, final EntityPlayer player) { + Reference.WCT_MAX_POWER = this.wirelessTermMaxPower; + Reference.WCT_EASYMODE_ENABLED = this.easyMode; + Reference.WCT_BOOSTER_ENABLED = this.boosterEnabled; + ConfigHandler.removeBooster(); + ConfigHandler.removeBoosterIcon(); + ConfigHandler.reloadRecipes(); + } + +} diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/core/sync/packets/PacketEmptyTrash.java b/src/java/net/p455w0rd/wirelesscraftingterminal/core/sync/packets/PacketEmptyTrash.java new file mode 100644 index 0000000..57c3242 --- /dev/null +++ b/src/java/net/p455w0rd/wirelesscraftingterminal/core/sync/packets/PacketEmptyTrash.java @@ -0,0 +1,49 @@ +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.items.ItemMagnet; + +public class PacketEmptyTrash extends WCTPacket { + + public PacketEmptyTrash(final ByteBuf stream) { + } + + // api + public PacketEmptyTrash() { + final ByteBuf data = Unpooled.buffer(); + + data.writeInt(this.getPacketID()); + this.configureWrite(data); + } + + @Override + public void serverPacketData(final INetworkInfo manager, final WCTPacket packet, final EntityPlayer player) { + ItemStack wirelessTerm = RandomUtils.getWirelessTerm(player.inventory); + if (wirelessTerm.getTagCompound() != null) { + NBTTagCompound nbtTC = wirelessTerm.getTagCompound(); + if (nbtTC.hasKey("TrashSlot")) { + NBTTagList trashSlot = nbtTC.getTagList("TrashSlot", 10); + if (trashSlot != null) { + ItemStack trashItem = ItemStack.loadItemStackFromNBT(trashSlot.getCompoundTagAt(0)); + if (trashItem != null) { + trashSlot.removeTag(0); + } + } + } + } + } + + @Override + public void clientPacketData(final INetworkInfo network, final WCTPacket packet, final EntityPlayer player) { + + } + +} diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/core/sync/packets/PacketOpenWirelessTerm.java b/src/java/net/p455w0rd/wirelesscraftingterminal/core/sync/packets/PacketOpenGui.java similarity index 60% rename from src/java/net/p455w0rd/wirelesscraftingterminal/core/sync/packets/PacketOpenWirelessTerm.java rename to src/java/net/p455w0rd/wirelesscraftingterminal/core/sync/packets/PacketOpenGui.java index d56c15d..d648478 100644 --- a/src/java/net/p455w0rd/wirelesscraftingterminal/core/sync/packets/PacketOpenWirelessTerm.java +++ b/src/java/net/p455w0rd/wirelesscraftingterminal/core/sync/packets/PacketOpenGui.java @@ -9,33 +9,44 @@ 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 PacketOpenWirelessTerm extends WCTPacket { +public class PacketOpenGui extends WCTPacket { + + private final int whichGui; // automatic. - public PacketOpenWirelessTerm(final ByteBuf stream) { - + public PacketOpenGui(final ByteBuf stream) { + this.whichGui = stream.readInt(); } - public PacketOpenWirelessTerm() { + public PacketOpenGui(int gui) { + this.whichGui = gui; final ByteBuf data = Unpooled.buffer(); data.writeInt(this.getPacketID()); + data.writeInt(gui); this.configureWrite(data); } @Override public void serverPacketData(final INetworkInfo manager, final WCTPacket packet, final EntityPlayer player) { if (player.openContainer instanceof ContainerPlayer) { - WCTApi.instance().interact().openWirelessCraftingTerminalGui(player); + 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 { + WCTGuiHandler.launchGui(this.whichGui, player, player.worldObj, (int)player.posX, (int)player.posY, (int)player.posZ); + } } } @Override public void clientPacketData(final INetworkInfo network, final WCTPacket packet, final EntityPlayer player) { - //WCTApi.instance().interact().openWirelessCraftingTerminalGui(player); } } 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 e431e46..7e435f2 100644 --- a/src/java/net/p455w0rd/wirelesscraftingterminal/core/sync/packets/PacketSwitchGuis.java +++ b/src/java/net/p455w0rd/wirelesscraftingterminal/core/sync/packets/PacketSwitchGuis.java @@ -13,38 +13,33 @@ import net.p455w0rd.wirelesscraftingterminal.common.WirelessCraftingTerminal; import net.p455w0rd.wirelesscraftingterminal.core.sync.WCTPacket; import net.p455w0rd.wirelesscraftingterminal.core.sync.network.INetworkInfo; -public class PacketSwitchGuis extends WCTPacket -{ +public class PacketSwitchGuis extends WCTPacket { private final int newGui; // automatic. - public PacketSwitchGuis( final ByteBuf stream ) - { + public PacketSwitchGuis(final ByteBuf stream) { this.newGui = stream.readInt(); } // api - public PacketSwitchGuis( final int newGui ) - { + public PacketSwitchGuis(final int newGui) { this.newGui = newGui; - if( Platform.isClient() ) - { - GuiWirelessCraftingTerminal.setSwitchingGuis( true ); + if (Platform.isClient()) { + GuiWirelessCraftingTerminal.setSwitchingGuis(true); } final ByteBuf data = Unpooled.buffer(); - data.writeInt( this.getPacketID() ); - data.writeInt( newGui ); + data.writeInt(this.getPacketID()); + data.writeInt(newGui); - this.configureWrite( data ); + this.configureWrite(data); } @Override - public void serverPacketData( final INetworkInfo manager, final WCTPacket packet, final EntityPlayer player ) - { + public void serverPacketData(final INetworkInfo manager, final WCTPacket packet, final EntityPlayer player) { World world = player.worldObj; if (world.isRemote) { int x = player.serverPosX; @@ -53,30 +48,15 @@ public class PacketSwitchGuis extends WCTPacket WCTGuiHandler.launchGui(newGui, player, world, x, y, z); } else { - int x = (int)player.posX; - int y = (int)player.posY; - int z = (int)player.posZ; + int x = (int) player.posX; + int y = (int) player.posY; + int z = (int) player.posZ; WCTGuiHandler.launchGui(newGui, player, world, x, y, z); } - - /* - final Container c = player.openContainer; - if( c instanceof ContainerWirelessCraftingTerminal ) - { - final ContainerWirelessCraftingTerminal bc = (ContainerWirelessCraftingTerminal) c; - final ContainerOpenContext context = bc.getOpenContext(); - if( context != null ) - { - final TileEntity te = context.getTile(); - Platform.openGUI( player, te, context.getSide(), this.newGui ); - } - } - */ } @Override - public void clientPacketData( final INetworkInfo network, final WCTPacket packet, final EntityPlayer player ) - { - GuiWirelessCraftingTerminal.setSwitchingGuis( true ); + public void clientPacketData(final INetworkInfo network, final WCTPacket packet, final EntityPlayer player) { + GuiWirelessCraftingTerminal.setSwitchingGuis(true); } } diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/core/sync/packets/PacketSwitchMagnetMode.java b/src/java/net/p455w0rd/wirelesscraftingterminal/core/sync/packets/PacketSwitchMagnetMode.java new file mode 100644 index 0000000..504d96d --- /dev/null +++ b/src/java/net/p455w0rd/wirelesscraftingterminal/core/sync/packets/PacketSwitchMagnetMode.java @@ -0,0 +1,69 @@ +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.util.ChatComponentText; +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.LocaleHandler; +import net.p455w0rd.wirelesscraftingterminal.items.ItemMagnet; + +public class PacketSwitchMagnetMode extends WCTPacket { + + int magnetDamage; + + public PacketSwitchMagnetMode(final ByteBuf stream) { + this.magnetDamage = stream.readInt(); + } + + // api + public PacketSwitchMagnetMode(int itemDamage) { + this.magnetDamage = itemDamage; + final ByteBuf data = Unpooled.buffer(); + + data.writeInt(this.getPacketID()); + data.writeInt(this.magnetDamage); + this.configureWrite(data); + } + + @Override + public void serverPacketData(final INetworkInfo manager, final WCTPacket packet, final EntityPlayer player) { + ItemStack magnetItem = RandomUtils.getMagnet(player.inventory); + if (!(magnetItem.getItem() instanceof ItemMagnet)) { + return; + } + if (magnetItem != null) { + + if (magnetItem.getItemDamage() == 2) { + //magnetItem.setItemDamage(0); + RandomUtils.getWirelessTerm(player.inventory).getTagCompound().getTagList("MagnetSlot", 10).getCompoundTagAt(0).setShort("Damage", (short)0); + player.addChatMessage(new ChatComponentText(LocaleHandler.MagnetMode1.getLocal())); + } + else { + RandomUtils.getWirelessTerm(player.inventory).getTagCompound().getTagList("MagnetSlot", 10).getCompoundTagAt(0).setShort("Damage", (short)(magnetItem.getItemDamage() + 1)); + if (magnetItem.getItemDamage() == 0) { + player.addChatMessage(new ChatComponentText(LocaleHandler.MagnetMode2.getLocal())); + } + else{ + player.addChatMessage(new ChatComponentText(LocaleHandler.MagnetMode3.getLocal())); + } + } + } + } + + @Override + public void clientPacketData(final INetworkInfo network, final WCTPacket packet, final EntityPlayer player) { + ItemStack magnetItem = RandomUtils.getMagnet(player.inventory); + if (!(magnetItem.getItem() instanceof ItemMagnet)) { + return; + } + if (magnetItem != null) { + ((ItemMagnet) magnetItem.getItem()).switchMagnetMode(magnetItem, player); + //magnetItem.setItemDamage(this.magnetDamage); + } + } +} diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/creativetab/CreativeTabWCT.java b/src/java/net/p455w0rd/wirelesscraftingterminal/creativetab/CreativeTabWCT.java index 4e111a7..84ad364 100644 --- a/src/java/net/p455w0rd/wirelesscraftingterminal/creativetab/CreativeTabWCT.java +++ b/src/java/net/p455w0rd/wirelesscraftingterminal/creativetab/CreativeTabWCT.java @@ -1,22 +1,31 @@ package net.p455w0rd.wirelesscraftingterminal.creativetab; -import cpw.mods.fml.relauncher.SideOnly; import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.util.EnumChatFormatting; import net.p455w0rd.wirelesscraftingterminal.items.ItemEnum; +import net.p455w0rd.wirelesscraftingterminal.items.ItemWirelessCraftingTerminal; import net.p455w0rd.wirelesscraftingterminal.reference.Reference; -public class CreativeTabWCT extends CreativeTabs -{ +public class CreativeTabWCT extends CreativeTabs { + public CreativeTabWCT(int id, String unlocalizedName) { super(id, unlocalizedName); } + @SideOnly(Side.CLIENT) + @Override + public ItemStack getIconItemStack() { + ItemStack is = new ItemStack(getTabIconItem()); + ((ItemWirelessCraftingTerminal) is.getItem()).injectAEPower(is, 6400001); + return is; + } + + @SideOnly(Side.CLIENT) @Override public Item getTabIconItem() { - return ItemEnum.WCT_DUMMY_ICON.getItem(); + return ItemEnum.WIRELESS_CRAFTING_TERMINAL.getItem(); } } diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/handlers/AchievementHandler.java b/src/java/net/p455w0rd/wirelesscraftingterminal/handlers/AchievementHandler.java index 087494a..8297b3b 100644 --- a/src/java/net/p455w0rd/wirelesscraftingterminal/handlers/AchievementHandler.java +++ b/src/java/net/p455w0rd/wirelesscraftingterminal/handlers/AchievementHandler.java @@ -28,7 +28,7 @@ import net.p455w0rd.wirelesscraftingterminal.reference.Reference; public class AchievementHandler { private static ItemInfinityBooster booster = (ItemInfinityBooster) ItemEnum.BOOSTER_ICON.getItem(); - public static final Achievement wctAch = new Achievement("achievement.wctAchievement", "wctAchievement", 0, 0, ItemEnum.WCT_DUMMY_ICON.getItem(), (Achievement) null); + public static final Achievement wctAch = new Achievement("achievement.wctAchievement", "wctAchievement", 0, 0, ItemEnum.WIRELESS_CRAFTING_TERMINAL.getStack(), (Achievement) null); public static final Achievement boosterAch = new Achievement("achievment.boosterAchievement", "boosterAchievement", 0, 2, booster.hasEffect(true), wctAch); public static final Achievement magnetAch = new Achievement("achievement.magnetAchievement", "magnetAchievement", 2, 0, ItemEnum.MAGNET_CARD.getItem(), wctAch); private static final AchievementPage achPage = new AchievementPage("Wireless Crafting Term", wctAch, boosterAch, magnetAch); diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/handlers/KeybindHandler.java b/src/java/net/p455w0rd/wirelesscraftingterminal/handlers/KeybindHandler.java index e3a04f1..392fb5c 100644 --- a/src/java/net/p455w0rd/wirelesscraftingterminal/handlers/KeybindHandler.java +++ b/src/java/net/p455w0rd/wirelesscraftingterminal/handlers/KeybindHandler.java @@ -2,50 +2,77 @@ 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.common.gameevent.TickEvent.ClientTickEvent; -import cpw.mods.fml.common.gameevent.TickEvent.Phase; import cpw.mods.fml.relauncher.Side; 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.p455w0rd.wirelesscraftingterminal.api.WCTApi; +import net.minecraft.item.ItemStack; +import net.minecraft.server.MinecraftServer; import net.p455w0rd.wirelesscraftingterminal.client.gui.GuiWirelessCraftingTerminal; -import net.p455w0rd.wirelesscraftingterminal.common.WirelessCraftingTerminal; +import net.p455w0rd.wirelesscraftingterminal.common.utils.RandomUtils; import net.p455w0rd.wirelesscraftingterminal.core.sync.network.NetworkHandler; -import net.p455w0rd.wirelesscraftingterminal.core.sync.packets.PacketOpenWirelessTerm; +import net.p455w0rd.wirelesscraftingterminal.core.sync.packets.PacketOpenGui; +import net.p455w0rd.wirelesscraftingterminal.core.sync.packets.PacketSwitchMagnetMode; +import net.p455w0rd.wirelesscraftingterminal.items.ItemMagnet; +import net.p455w0rd.wirelesscraftingterminal.items.ItemWirelessCraftingTerminal; +import net.p455w0rd.wirelesscraftingterminal.reference.Reference; @SideOnly(Side.CLIENT) public class KeybindHandler { public static KeyBinding openTerminal; public static KeyBinding openMagnetFilter; - public static KeyBinding disableMagnet; + public static KeyBinding changeMagnetMode; public static void registerKeybinds() { openTerminal = new KeyBinding("key.OpenTerminal", Keyboard.CHAR_NONE, "key.categories.ae2wct"); openMagnetFilter = new KeyBinding("key.OpenMagnetFilter", Keyboard.CHAR_NONE, "key.categories.ae2wct"); - disableMagnet = new KeyBinding("key.DisableMagnet", Keyboard.CHAR_NONE, "key.categories.ae2wct"); + changeMagnetMode = new KeyBinding("key.SwitchMagnetMode", Keyboard.CHAR_NONE, "key.categories.ae2wct"); ClientRegistry.registerKeyBinding(openTerminal); ClientRegistry.registerKeyBinding(openMagnetFilter); - ClientRegistry.registerKeyBinding(disableMagnet); + ClientRegistry.registerKeyBinding(changeMagnetMode); } @SubscribeEvent public void onKeyInput(KeyInputEvent event) { EntityClientPlayerMP p = (EntityClientPlayerMP) Minecraft.getMinecraft().thePlayer; - if (openTerminal.isPressed()) { - if (p.openContainer != null && p.openContainer instanceof ContainerPlayer) { + if (p.openContainer == null) { + return; + } + if (p.openContainer != null && p.openContainer instanceof ContainerPlayer) { + if (openTerminal.isPressed()) { if (!FMLClientHandler.instance().isGUIOpen(GuiWirelessCraftingTerminal.class)) { - NetworkHandler.instance.sendToServer(new PacketOpenWirelessTerm()); + NetworkHandler.instance.sendToServer(new PacketOpenGui(Reference.GUI_WCT)); } } + else if (openMagnetFilter.isPressed()) { + ItemWirelessCraftingTerminal wirelessTerm = (ItemWirelessCraftingTerminal) RandomUtils.getWirelessTerm(p.inventory).getItem(); + //ensure player has a Wireless Crafting Terminal (with Magnet Card Installed) or Magnet Card in their inventory + if (wirelessTerm != null && wirelessTerm instanceof ItemWirelessCraftingTerminal) { + ItemStack magnetItem = RandomUtils.getMagnet(p.inventory); + if (magnetItem != null && magnetItem.getItem() instanceof ItemMagnet) { + NetworkHandler.instance.sendToServer(new PacketOpenGui(Reference.GUI_MAGNET)); + } + } + } + else if (changeMagnetMode.isPressed()) { + ItemStack magnetItem = RandomUtils.getMagnet(p.inventory); + if (magnetItem != null) { + NetworkHandler.instance.sendToServer(new PacketSwitchMagnetMode(magnetItem.getItemDamage())); + } + } + else { + return; + } } } - } diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/handlers/LocaleHandler.java b/src/java/net/p455w0rd/wirelesscraftingterminal/handlers/LocaleHandler.java index c594b30..7f172a9 100644 --- a/src/java/net/p455w0rd/wirelesscraftingterminal/handlers/LocaleHandler.java +++ b/src/java/net/p455w0rd/wirelesscraftingterminal/handlers/LocaleHandler.java @@ -8,7 +8,8 @@ public enum LocaleHandler { MaxPowerDesc("config.ae2wct"), InfinityBoosterCfgDesc("config.ae2wct"), EasyModeDesc("config.ae2wct"), MagnetDesc, MagnetDesc2, PressShift, OnlyWorks, LinkStatus, Installed, NotInstalled, Active, Inactive, Status, EmptyTrash, EmptyTrashDesc, MagnetFilterTitle, NoNetworkPower("chatmessages.ae2wct"), FilterMode, - Whitelisting, Blacklisting; + Whitelisting, Blacklisting, MagnetMode1("chatmessages.ae2wct"), MagnetMode2("chatmessages.ae2wct"), MagnetMode3("chatmessages.ae2wct"), + MagnetActiveDesc1, MagnetActiveDesc2; private final String root; diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/helpers/WirelessTerminalGuiObject.java b/src/java/net/p455w0rd/wirelesscraftingterminal/helpers/WirelessTerminalGuiObject.java index 2ccba1c..82457b9 100644 --- a/src/java/net/p455w0rd/wirelesscraftingterminal/helpers/WirelessTerminalGuiObject.java +++ b/src/java/net/p455w0rd/wirelesscraftingterminal/helpers/WirelessTerminalGuiObject.java @@ -300,7 +300,7 @@ public class WirelessTerminalGuiObject implements IPortableCell, IActionHost, II } } else { - if (wap.isActive()) { + if (wap.isActive() && ignoreRange) { this.sqRange = r; this.myRange = Math.sqrt(r); return true; diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/implementation/WCTInteractionHelper.java b/src/java/net/p455w0rd/wirelesscraftingterminal/implementation/WCTInteractionHelper.java index 4db69f7..89837dd 100644 --- a/src/java/net/p455w0rd/wirelesscraftingterminal/implementation/WCTInteractionHelper.java +++ b/src/java/net/p455w0rd/wirelesscraftingterminal/implementation/WCTInteractionHelper.java @@ -11,6 +11,8 @@ 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; import net.p455w0rd.wirelesscraftingterminal.reference.Reference; @@ -60,7 +62,7 @@ public class WCTInteractionHelper implements IWCTInteractionHelper { player.addChatMessage(PlayerMessages.StationCanNotBeLocated.get()); } else { - WCTGuiHandler.launchGui(Reference.GUI_WCT, player, player.worldObj, (int) player.posX, (int) player.posY, (int) player.posZ); + NetworkHandler.instance.sendToServer(new PacketOpenGui(Reference.GUI_WCT)); } } diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/implementation/WCTItems.java b/src/java/net/p455w0rd/wirelesscraftingterminal/implementation/WCTItems.java index a09f452..d0712fe 100644 --- a/src/java/net/p455w0rd/wirelesscraftingterminal/implementation/WCTItems.java +++ b/src/java/net/p455w0rd/wirelesscraftingterminal/implementation/WCTItems.java @@ -8,7 +8,6 @@ public class WCTItems extends IWCTItems { WCTItems() { this.InfinityBoosterCard = new WCTItemDescription(ItemEnum.BOOSTER_CARD.getStack()); this.WirelessCraftingTerminal = new WCTItemDescription(ItemEnum.WIRELESS_CRAFTING_TERMINAL.getStack()); - this.WCTDummyIcon = new WCTItemDescription(ItemEnum.WCT_DUMMY_ICON.getStack()); this.WCTBoosterBGIcon = new WCTItemDescription(ItemEnum.WCT_BOOSTER_BG_ICON.getStack()); this.MagnetCard = new WCTItemDescription(ItemEnum.MAGNET_CARD.getStack()); } diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/items/ItemAE2WCTDummyIcon.java b/src/java/net/p455w0rd/wirelesscraftingterminal/items/ItemAE2WCTDummyIcon.java deleted file mode 100644 index 5010a3f..0000000 --- a/src/java/net/p455w0rd/wirelesscraftingterminal/items/ItemAE2WCTDummyIcon.java +++ /dev/null @@ -1,15 +0,0 @@ -package net.p455w0rd.wirelesscraftingterminal.items; - -import net.minecraft.item.Item; -import net.p455w0rd.wirelesscraftingterminal.creativetab.CreativeTabWCT; -import net.p455w0rd.wirelesscraftingterminal.reference.Reference; - -public class ItemAE2WCTDummyIcon extends Item { - public ItemAE2WCTDummyIcon() - { - super(); - setUnlocalizedName("ae2wctDummyIcon"); - setTextureName(Reference.MODID + ":wirelessCraftingTerminal"); - setMaxStackSize(0); - } -} diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/items/ItemEnum.java b/src/java/net/p455w0rd/wirelesscraftingterminal/items/ItemEnum.java index 1f2b7a5..4d328b2 100644 --- a/src/java/net/p455w0rd/wirelesscraftingterminal/items/ItemEnum.java +++ b/src/java/net/p455w0rd/wirelesscraftingterminal/items/ItemEnum.java @@ -7,7 +7,6 @@ public enum ItemEnum { BOOSTER_CARD("infinityBoosterCard", new ItemInfinityBooster().setUnlocalizedName("infinityBoosterCard")), BOOSTER_ICON("infinityBoosterIcon", new ItemInfinityBooster().setUnlocalizedName("infinityBoosterIcon")), WIRELESS_CRAFTING_TERMINAL("wirelessCraftingTerminal", new ItemWirelessCraftingTerminal()), - WCT_DUMMY_ICON("ae2wctDummyIcon", new ItemAE2WCTDummyIcon()), MAGNET_CARD("magnetCard", new ItemMagnet().setUnlocalizedName("magnetCard")), WCT_BOOSTER_BG_ICON("boosterBG", new ItemBoosterBGIcon()); diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/items/ItemInfinityBooster.java b/src/java/net/p455w0rd/wirelesscraftingterminal/items/ItemInfinityBooster.java index 2df7a4d..7c6c425 100644 --- a/src/java/net/p455w0rd/wirelesscraftingterminal/items/ItemInfinityBooster.java +++ b/src/java/net/p455w0rd/wirelesscraftingterminal/items/ItemInfinityBooster.java @@ -49,7 +49,7 @@ public class ItemInfinityBooster extends Item { @SideOnly(Side.CLIENT) 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") + "==========================="); + list.add(color("aqua") + "=============================="); if (isShiftKeyDown()) { String info = LocaleHandler.InfinityBoosterDesc.getLocal(); for (String line : Splitter.on("\n").split(WordUtils.wrap(info, 37, "\n", false))) { diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/items/ItemMagnet.java b/src/java/net/p455w0rd/wirelesscraftingterminal/items/ItemMagnet.java index e5c22b0..4af2eec 100644 --- a/src/java/net/p455w0rd/wirelesscraftingterminal/items/ItemMagnet.java +++ b/src/java/net/p455w0rd/wirelesscraftingterminal/items/ItemMagnet.java @@ -17,7 +17,6 @@ import appeng.api.networking.IGridNode; import appeng.api.networking.energy.IEnergyGrid; import appeng.api.networking.energy.IEnergySource; import appeng.api.networking.security.BaseActionSource; -import appeng.api.networking.security.IActionHost; import appeng.api.networking.security.ISecurityGrid; import appeng.api.storage.IMEInventoryHandler; import appeng.api.storage.IMEMonitor; @@ -25,7 +24,6 @@ import appeng.api.storage.data.IAEItemStack; import appeng.util.Platform; import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.common.eventhandler.Event.Result; -import cpw.mods.fml.common.eventhandler.EventPriority; import cpw.mods.fml.common.gameevent.PlayerEvent.ItemPickupEvent; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -37,7 +35,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.EnumChatFormatting; +import net.minecraft.util.ChatComponentText; import net.minecraft.world.World; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.player.EntityItemPickupEvent; @@ -45,6 +43,7 @@ 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; @@ -87,6 +86,11 @@ public class ItemMagnet extends Item { public void setItemStack(ItemStack is) { this.thisItemStack = is; } + + @Override + public boolean isDamageable() { + return false; + } public ItemStack getItemStack() { if (thisItemStack != null && (thisItemStack.getItem() instanceof ItemMagnet)) { @@ -98,36 +102,43 @@ public class ItemMagnet extends Item { @Override @SideOnly(Side.CLIENT) public void addInformation(ItemStack is, EntityPlayer player, List list, boolean par4) { - list.add(color("aqua") + "==========================="); + list.add(color("aqua") + "=============================="); String shift = LocaleHandler.PressShift.getLocal().replace("Shift", color("yellow") + "" + color("bold") + "" + color("italics") + "Shift" + color("gray")); if (isShiftKeyDown()) { String info = LocaleHandler.MagnetDesc.getLocal(); for (String line : Splitter.on("\n").split(WordUtils.wrap(info, 37, "\n", false))) { list.add(line.trim()); } - + list.add(""); list.add(LocaleHandler.MagnetDesc2.getLocal()); - + list.add(""); list.add(LocaleHandler.Status.getLocal() + ": " + (isActivated(is) ? color("green") + "" + LocaleHandler.Active.getLocal() : color("red") + "" + LocaleHandler.Inactive.getLocal())); + if (is.getItemDamage() == 1) { + list.add(color("white") + " " + LocaleHandler.MagnetActiveDesc1.getLocal()); + } + else if (is.getItemDamage() == 2) { + list.add(color("white") + " " + LocaleHandler.MagnetActiveDesc2.getLocal()); + } + String white = LocaleHandler.Whitelisting.getLocal(); String black = LocaleHandler.Blacklisting.getLocal(); - + list.add(LocaleHandler.FilterMode.getLocal() + ": " + color("white") + "" + (getMode(is) ? white : black)); list.add(""); - + String onlyWorks = LocaleHandler.OnlyWorks.getLocal(); for (String line : Splitter.on("\n").split(WordUtils.wrap(onlyWorks, 27, "\n", false))) { list.add(color("white") + "" + color("bold") + "" + color("italics") + "" + line.trim()); } - + } else { list.add(shift); } } - + @SideOnly(Side.CLIENT) private String color(String color) { return RandomUtils.color(color); @@ -143,7 +154,7 @@ public class ItemMagnet extends Item { public ItemStack onItemRightClick(ItemStack item, World world, EntityPlayer player) { if (!world.isRemote) { if (player.isSneaking()) { - item.setItemDamage(item.getItemDamage() == 0 ? 1 : 0); + switchMagnetMode(item, player); } else { int x = (int) player.posX; @@ -154,15 +165,35 @@ public class ItemMagnet extends Item { } return item; } + + public void switchMagnetMode(ItemStack item, EntityPlayer player) { + if (item.getItemDamage() == 0) { + item.setItemDamage(1); + player.addChatMessage(new ChatComponentText(LocaleHandler.MagnetMode2.getLocal())); + } + else if (item.getItemDamage() == 1) { + item.setItemDamage(2); + player.addChatMessage(new ChatComponentText(LocaleHandler.MagnetMode3.getLocal())); + } + else { + item.setItemDamage(0); + player.addChatMessage(new ChatComponentText(LocaleHandler.MagnetMode1.getLocal())); + } + } @SuppressWarnings("rawtypes") public void doMagnet(ItemStack item, World world, EntityPlayer player, ItemStack wirelessTerm) { - if (world.isRemote || getItemStack() == null) + if (world.isRemote) { return; + } + if (getItemStack() == null) { + return; + } if (!isActivated(item)) return; if (player == null) return; + List filteredList = getFilteredItems(this.getItemStack()); // items Iterator iterator = getEntitiesInRange(EntityItem.class, world, (int) player.posX, (int) player.posY, (int) player.posZ, this.distanceFromPlayer).iterator(); @@ -194,33 +225,37 @@ public class ItemMagnet extends Item { // whitelist if (getMode(this.getItemStack())) { - if (isItemFiltered(itemStackToGet, filteredList) || filteredList == null || filteredList.size() == 0) { + if (isItemFiltered(itemStackToGet, filteredList) && filteredList != null && filteredList.size() > 0) { itemToGet.setDead(); doInject(ais, pickupEvent, stackSize, player, itemToGet, itemStackToGet, world); continue; } else { - if (pickupEvent.getResult() == Result.ALLOW || itemPickupEvent.getResult() == Result.ALLOW || stackSize <= 0 || player.inventory.addItemStackToInventory(itemStackToGet)) { - player.onItemPickup(itemToGet, stackSize); - world.playSoundAtEntity(player, "random.pop", 0.15F, ((world.rand.nextFloat() - world.rand.nextFloat()) * 0.7F + 1.0F) * 2.0F); + if (item.getItemDamage() == 1) { + if (pickupEvent.getResult() == Result.ALLOW || itemPickupEvent.getResult() == Result.ALLOW || stackSize <= 0 || player.inventory.addItemStackToInventory(itemStackToGet)) { + player.onItemPickup(itemToGet, stackSize); + world.playSoundAtEntity(player, "random.pop", 0.15F, ((world.rand.nextFloat() - world.rand.nextFloat()) * 0.7F + 1.0F) * 2.0F); + } + FMLCommonHandler.instance().bus().post(itemPickupEvent); } } - FMLCommonHandler.instance().bus().post(itemPickupEvent); } // blacklist else { - if (!isItemFiltered(itemStackToGet, filteredList) && filteredList != null && filteredList.size() > 0) { + if (!isItemFiltered(itemStackToGet, filteredList) || filteredList == null || filteredList.size() <= 0) { itemToGet.setDead(); doInject(ais, pickupEvent, stackSize, player, itemToGet, itemStackToGet, world); continue; } else { - if (pickupEvent.getResult() == Result.ALLOW || itemPickupEvent.getResult() == Result.ALLOW || stackSize <= 0 || player.inventory.addItemStackToInventory(itemStackToGet)) { - player.onItemPickup(itemToGet, stackSize); - world.playSoundAtEntity(player, "random.pop", 0.15F, ((world.rand.nextFloat() - world.rand.nextFloat()) * 0.7F + 1.0F) * 2.0F); + if (item.getItemDamage() == 1) { + if (pickupEvent.getResult() == Result.ALLOW || itemPickupEvent.getResult() == Result.ALLOW || stackSize <= 0 || player.inventory.addItemStackToInventory(itemStackToGet)) { + player.onItemPickup(itemToGet, stackSize); + world.playSoundAtEntity(player, "random.pop", 0.15F, ((world.rand.nextFloat() - world.rand.nextFloat()) * 0.7F + 1.0F) * 2.0F); + } + FMLCommonHandler.instance().bus().post(itemPickupEvent); } } - FMLCommonHandler.instance().bus().post(itemPickupEvent); } } @@ -377,7 +412,7 @@ public class ItemMagnet extends Item { } protected boolean isActivated(ItemStack item) { - return item.getItemDamage() == 1; + return item.getItemDamage() != 0; } @Override diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/items/ItemWirelessCraftingTerminal.java b/src/java/net/p455w0rd/wirelesscraftingterminal/items/ItemWirelessCraftingTerminal.java index a896798..17f2b09 100644 --- a/src/java/net/p455w0rd/wirelesscraftingterminal/items/ItemWirelessCraftingTerminal.java +++ b/src/java/net/p455w0rd/wirelesscraftingterminal/items/ItemWirelessCraftingTerminal.java @@ -1,6 +1,5 @@ package net.p455w0rd.wirelesscraftingterminal.items; -import java.util.EnumSet; import java.util.List; import org.lwjgl.input.Keyboard; @@ -15,7 +14,6 @@ import appeng.api.config.SortDir; import appeng.api.config.SortOrder; import appeng.api.config.ViewItems; import appeng.api.util.IConfigManager; -import appeng.core.features.AEFeature; import appeng.items.tools.powered.powersink.AEBasePoweredItem; import appeng.util.ConfigManager; import appeng.util.IConfigManagerHost; @@ -23,14 +21,10 @@ import appeng.util.Platform; import cofh.api.energy.IEnergyContainerItem; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import net.minecraft.client.entity.EntityClientPlayerMP; -import net.minecraft.client.multiplayer.WorldClient; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.entity.player.InventoryPlayer; -import net.minecraft.inventory.ContainerPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; @@ -40,6 +34,7 @@ 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; @@ -219,7 +214,7 @@ public class ItemWirelessCraftingTerminal extends AEBasePoweredItem implements I if ((int) aeCurrPowerPct <= 5) { pctTxtColor = color("red") + ""; } - list.add(color("aqua") + "==========================="); + list.add(color("aqua") + "=============================="); list.add(StatCollector.translateToLocal("gui.appliedenergistics2.StoredEnergy") + ": " + pctTxtColor + (int) aeCurrPower + " AE - " + aeCurrPowerPct + "%"); if (isShiftKeyDown()) { String linked = color("red") + StatCollector.translateToLocal("gui.appliedenergistics2.Unlinked"); diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/proxy/ClientProxy.java b/src/java/net/p455w0rd/wirelesscraftingterminal/proxy/ClientProxy.java index ba549cd..542b849 100644 --- a/src/java/net/p455w0rd/wirelesscraftingterminal/proxy/ClientProxy.java +++ b/src/java/net/p455w0rd/wirelesscraftingterminal/proxy/ClientProxy.java @@ -15,7 +15,6 @@ public class ClientProxy extends CommonProxy { public ClientProxy() { MinecraftForge.EVENT_BUS.register(this); KeybindHandler.registerKeybinds(); - //MinecraftForge.EVENT_BUS.register(new KeybindHandler()); FMLCommonHandler.instance().bus().register(new KeybindHandler()); } @@ -23,14 +22,9 @@ public class ClientProxy extends CommonProxy { public void removeItemsFromNEI() { if (IntegrationRegistry.INSTANCE.isEnabled(IntegrationType.NEI)) { codechicken.nei.api.API.hideItem(new ItemStack(ItemEnum.WCT_BOOSTER_BG_ICON.getItem(), 1)); - codechicken.nei.api.API.hideItem(new ItemStack(ItemEnum.WCT_DUMMY_ICON.getItem(), 1)); return; } } - - //public void registerItems() { - // =] - //} public void registerRenderers() { // No renderers...yet =] diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/proxy/CommonProxy.java b/src/java/net/p455w0rd/wirelesscraftingterminal/proxy/CommonProxy.java index 6265fdb..6f3f220 100644 --- a/src/java/net/p455w0rd/wirelesscraftingterminal/proxy/CommonProxy.java +++ b/src/java/net/p455w0rd/wirelesscraftingterminal/proxy/CommonProxy.java @@ -19,14 +19,12 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; 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.MinecraftForge; import net.minecraftforge.common.util.FakePlayer; import net.minecraftforge.event.entity.living.LivingDropsEvent; -import net.minecraftforge.event.entity.player.AchievementEvent; +import net.p455w0rd.wirelesscraftingterminal.core.sync.WCTPacket; +import net.p455w0rd.wirelesscraftingterminal.core.sync.network.NetworkHandler; +import net.p455w0rd.wirelesscraftingterminal.core.sync.packets.PacketConfigSync; import net.p455w0rd.wirelesscraftingterminal.handlers.AchievementHandler; import net.p455w0rd.wirelesscraftingterminal.handlers.ConfigHandler; import net.p455w0rd.wirelesscraftingterminal.items.ItemEnum; @@ -114,8 +112,8 @@ public class CommonProxy { public void onPlayerLogin(PlayerLoggedInEvent e) { // SSP Login if (FMLCommonHandler.instance().getSide() == Side.CLIENT) { - boolean hasWCTAch = ((EntityPlayerMP) e.player).func_147099_x().hasAchievementUnlocked(AchievementHandler.wctAch); - boolean hasBoosterAch = ((EntityPlayerMP) e.player).func_147099_x().hasAchievementUnlocked(AchievementHandler.boosterAch); + //boolean hasWCTAch = ((EntityPlayerMP) e.player).func_147099_x().hasAchievementUnlocked(AchievementHandler.wctAch); + //boolean hasBoosterAch = ((EntityPlayerMP) e.player).func_147099_x().hasAchievementUnlocked(AchievementHandler.boosterAch); ConfigHandler.removeBooster(); ConfigHandler.removeBoosterIcon(); @@ -139,6 +137,10 @@ public class CommonProxy { } */ } + else { + final PacketConfigSync p = new PacketConfigSync(Reference.WCT_MAX_POWER, Reference.WCT_EASYMODE_ENABLED, Reference.WCT_BOOSTER_ENABLED); + NetworkHandler.instance.sendTo((WCTPacket) p, (EntityPlayerMP) e.player); + } } @SubscribeEvent diff --git a/src/resources/assets/ae2wct/lang/en_US.lang b/src/resources/assets/ae2wct/lang/en_US.lang index 7a85161..e0159c5 100644 --- a/src/resources/assets/ae2wct/lang/en_US.lang +++ b/src/resources/assets/ae2wct/lang/en_US.lang @@ -27,7 +27,8 @@ gui.tooltips.ae2wct.MagnetFilterTitle=Magnet Filter gui.tooltips.ae2wct.FilterMode=Filter Mode gui.tooltips.ae2wct.Whitelisting=Whitelisting gui.tooltips.ae2wct.Blacklisting=Blacklisting - +gui.tooltips.ae2wct.MagnetActiveDesc1=Extra items added to inventory +gui.tooltips.ae2wct.MagnetActiveDesc2=Extra items left on ground //Labels gui.labels.ae2wct.WirelessTermLabel=Wireless Term @@ -46,9 +47,12 @@ achievement.magnetAchievement.desc=Craft a Magnet Card //Chat Messages chatmessages.ae2wct.NoNetworkPower=Network has no power! +chatmessages.ae2wct.MagnetMode1=Magnet Card Deactivated +chatmessages.ae2wct.MagnetMode2=Magnet Card Activated - Items not stored in AE network will be placed in inventory +chatmessages.ae2wct.MagnetMode3=Magnet Card Activated - Items not stored in AE network will be left on ground //Keybindings key.OpenTerminal=Open Wireless Crafting Terminal -key.OpenMagnetFilter=Open Magnet Filter GUI -key.DisableMagnet=Deactivate Magnet +key.OpenMagnetFilter=Open Magnet Card Filter GUI +key.SwitchMagnetMode=Activate/Deactivate Magnet Card key.categories.ae2wct=Wireless Crafting Terminal \ No newline at end of file diff --git a/src/resources/mcmod.info b/src/resources/mcmod.info index 3534165..815e04b 100644 --- a/src/resources/mcmod.info +++ b/src/resources/mcmod.info @@ -3,7 +3,7 @@ "modid": "ae2wct", "name": "AE2 Wireless Crafting Terminal", "description": "Adds a wireless version of the AE2 Crafting Terminal", - "version": "1.7.10-0.1a", + "version": "1.7.10-1.0b", "mcversion": "1.7.10", "url": "http://p455w0rd.net/", "updateUrl": "",