diff --git a/ReleaseNotes.txt b/ReleaseNotes.txt index 68df6c8b..389442ad 100644 --- a/ReleaseNotes.txt +++ b/ReleaseNotes.txt @@ -19,6 +19,7 @@ Changes - #1272 Number of items required for each enchantment level in the Enchanter can now be set in the config - #1011 Shift-clicking armor from a Capacitor Bank's charge slots will re-equip the item if possible - Added config option to disable Dimensional Transceiver +- Added send/recieve item filters to the Dimensional Transceiver Bugs - Fix outer corners on connected texture blocks not being metadata sensitive when they should be diff --git a/resources/assets/enderio/textures/gui/transceiver.png b/resources/assets/enderio/textures/gui/transceiver.png index 5ea33e5f..05da567b 100644 Binary files a/resources/assets/enderio/textures/gui/transceiver.png and b/resources/assets/enderio/textures/gui/transceiver.png differ diff --git a/resources/assets/enderio/textures/gui/widgets.png b/resources/assets/enderio/textures/gui/widgets.png index 468d2152..4f7dcf18 100644 Binary files a/resources/assets/enderio/textures/gui/widgets.png and b/resources/assets/enderio/textures/gui/widgets.png differ diff --git a/src/main/java/crazypants/enderio/conduit/gui/ExternalConnectionContainer.java b/src/main/java/crazypants/enderio/conduit/gui/ExternalConnectionContainer.java index c531c8d1..d8bb8803 100644 --- a/src/main/java/crazypants/enderio/conduit/gui/ExternalConnectionContainer.java +++ b/src/main/java/crazypants/enderio/conduit/gui/ExternalConnectionContainer.java @@ -104,7 +104,7 @@ public class ExternalConnectionContainer extends Container { List slots; inputFilter = itemConduit.getInputFilter(dir); if(inputFilter != null && inputFilter.getSlotCount() > 0) { - slots = inputFilter.getSlots(); + slots = inputFilter.getSlots(33, 69); for (Slot slot : slots) { addSlotToContainer(slot); slotLocations.add(new Point(slot.xDisplayPosition, slot.yDisplayPosition)); @@ -113,7 +113,7 @@ public class ExternalConnectionContainer extends Container { outputFilter = itemConduit.getOutputFilter(dir); if(outputFilter != null && outputFilter.getSlotCount() > 0) { - slots = outputFilter.getSlots(); + slots = outputFilter.getSlots(33, 69); for (Slot slot : slots) { addSlotToContainer(slot); slotLocations.add(new Point(slot.xDisplayPosition, slot.yDisplayPosition)); diff --git a/src/main/java/crazypants/enderio/conduit/gui/item/BasicItemFilterGui.java b/src/main/java/crazypants/enderio/conduit/gui/item/BasicItemFilterGui.java index 412808a2..bc8cb2bb 100644 --- a/src/main/java/crazypants/enderio/conduit/gui/item/BasicItemFilterGui.java +++ b/src/main/java/crazypants/enderio/conduit/gui/item/BasicItemFilterGui.java @@ -5,13 +5,11 @@ import net.minecraft.client.gui.GuiButton; import org.lwjgl.opengl.GL11; import crazypants.enderio.conduit.gui.GuiExternalConnection; -import crazypants.enderio.conduit.item.IItemConduit; import crazypants.enderio.conduit.item.filter.ItemFilter; -import crazypants.enderio.conduit.packet.PacketItemConduitFilter; import crazypants.enderio.gui.IconButtonEIO; import crazypants.enderio.gui.IconEIO; import crazypants.enderio.gui.ToggleButtonEIO; -import crazypants.enderio.network.PacketHandler; +import crazypants.gui.GuiContainerBase; import crazypants.render.RenderUtil; import crazypants.util.Lang; @@ -23,8 +21,7 @@ public class BasicItemFilterGui implements IItemFilterGui { private static final int ID_ORE_DICT = GuiExternalConnection.nextButtonId(); private static final int ID_STICKY = GuiExternalConnection.nextButtonId(); - private IItemConduit itemConduit; - private GuiExternalConnection gui; + private GuiContainerBase gui; private ToggleButtonEIO useMetaB; private ToggleButtonEIO useNbtB; @@ -33,36 +30,47 @@ public class BasicItemFilterGui implements IItemFilterGui { private ToggleButtonEIO stickyB; boolean isAdvanced; - boolean isInput; + boolean isStickyModeAvailable; + private IItemFilterContainer filterContainer; private ItemFilter filter; - public BasicItemFilterGui(GuiExternalConnection gui, IItemConduit itemConduit, boolean isInput) { + private int buttonIdOffset; + private int xOffset; + private int yOffset; + + public BasicItemFilterGui(GuiContainerBase gui, IItemFilterContainer filterContainer, boolean isStickyModeAvailable) { + this(gui, filterContainer, isStickyModeAvailable, 32, 68, 0); + } + + public BasicItemFilterGui(GuiContainerBase gui, IItemFilterContainer filterContainer, boolean isStickyModeAvailable, int xOffset, int yOffset, + int buttonIdOffset) { this.gui = gui; - this.itemConduit = itemConduit; - this.isInput = isInput; + this.isStickyModeAvailable = isStickyModeAvailable; + this.filterContainer = filterContainer; + this.xOffset = xOffset; + this.yOffset = yOffset; + this.buttonIdOffset = buttonIdOffset; + + + filter = filterContainer.getItemFilter(); - if(isInput) { - filter = (ItemFilter) itemConduit.getInputFilter(gui.getDir()); - } else { - filter = (ItemFilter) itemConduit.getOutputFilter(gui.getDir()); - } isAdvanced = filter.isAdvanced(); - int butLeft = 124; + int butLeft = xOffset + 92; int x = butLeft ; - int y = 68; - whiteListB = new IconButtonEIO(gui, ID_WHITELIST, x, y, IconEIO.FILTER_WHITELIST); + int y = yOffset; + whiteListB = new IconButtonEIO(gui, ID_WHITELIST + buttonIdOffset, x, y, IconEIO.FILTER_WHITELIST); whiteListB.setToolTip(Lang.localize("gui.conduit.item.whitelist")); x += 20; - useMetaB = new ToggleButtonEIO(gui, ID_META, x, y, IconEIO.FILTER_META_OFF, IconEIO.FILTER_META); + useMetaB = new ToggleButtonEIO(gui, ID_META + buttonIdOffset, x, y, IconEIO.FILTER_META_OFF, IconEIO.FILTER_META); useMetaB.setSelectedToolTip(Lang.localize("gui.conduit.item.matchMetaData")); useMetaB.setUnselectedToolTip(Lang.localize("gui.conduit.item.ignoreMetaData")); useMetaB.setPaintSelectedBorder(false); x += 20; - stickyB = new ToggleButtonEIO(gui, ID_STICKY, x, y, IconEIO.FILTER_STICKY_OFF, IconEIO.FILTER_STICKY); + stickyB = new ToggleButtonEIO(gui, ID_STICKY + buttonIdOffset, x, y, IconEIO.FILTER_STICKY_OFF, IconEIO.FILTER_STICKY); String[] lines = Lang.localizeList("gui.conduit.item.stickyEnabled"); stickyB.setSelectedToolTip(lines); stickyB.setUnselectedToolTip(Lang.localize("gui.conduit.item.stickyDisbaled")); @@ -72,13 +80,13 @@ public class BasicItemFilterGui implements IItemFilterGui { x = butLeft; x += 20; - useNbtB = new ToggleButtonEIO(gui, ID_NBT, x, y, IconEIO.FILTER_NBT_OFF, IconEIO.FILTER_NBT); + useNbtB = new ToggleButtonEIO(gui, ID_NBT + buttonIdOffset, x, y, IconEIO.FILTER_NBT_OFF, IconEIO.FILTER_NBT); useNbtB.setSelectedToolTip(Lang.localize("gui.conduit.item.matchNBT")); useNbtB.setUnselectedToolTip(Lang.localize("gui.conduit.item.ignoreNBT")); useNbtB.setPaintSelectedBorder(false); x = butLeft; - useOreDictB = new ToggleButtonEIO(gui, ID_ORE_DICT, x, y, IconEIO.FILTER_ORE_DICT_OFF, IconEIO.FILTER_ORE_DICT); + useOreDictB = new ToggleButtonEIO(gui, ID_ORE_DICT + buttonIdOffset, x, y, IconEIO.FILTER_ORE_DICT_OFF, IconEIO.FILTER_ORE_DICT); useOreDictB.setSelectedToolTip(Lang.localize("gui.conduit.item.oreDicEnabled")); useOreDictB.setUnselectedToolTip(Lang.localize("gui.conduit.item.oreDicDisabled")); useOreDictB.setPaintSelectedBorder(false); @@ -91,7 +99,7 @@ public class BasicItemFilterGui implements IItemFilterGui { @Override public void updateButtons() { - ItemFilter activeFilter = (ItemFilter)filter; + ItemFilter activeFilter = filter; if(isAdvanced) { useNbtB.onGuiInit(); @@ -100,7 +108,7 @@ public class BasicItemFilterGui implements IItemFilterGui { useOreDictB.onGuiInit(); useOreDictB.setSelected(activeFilter.isUseOreDict()); - if(!isInput) { + if(isStickyModeAvailable) { stickyB.onGuiInit(); stickyB.setSelected(activeFilter.isSticky()); } @@ -120,21 +128,22 @@ public class BasicItemFilterGui implements IItemFilterGui { } + @Override public void actionPerformed(GuiButton guiButton) { - if(guiButton.id == ID_META) { + if(guiButton.id == ID_META + buttonIdOffset) { filter.setMatchMeta(useMetaB.isSelected()); sendFilterChange(); - } else if(guiButton.id == ID_NBT) { + } else if(guiButton.id == ID_NBT + buttonIdOffset) { filter.setMatchNBT(useNbtB.isSelected()); sendFilterChange(); - } else if(guiButton.id == ID_STICKY) { + } else if(guiButton.id == ID_STICKY + buttonIdOffset) { filter.setSticky(stickyB.isSelected()); sendFilterChange(); - } else if(guiButton.id == ID_ORE_DICT) { + } else if(guiButton.id == ID_ORE_DICT + buttonIdOffset) { filter.setUseOreDict(useOreDictB.isSelected()); sendFilterChange(); - } else if(guiButton.id == ID_WHITELIST) { + } else if(guiButton.id == ID_WHITELIST + buttonIdOffset) { filter.setBlacklist(!filter.isBlacklist()); sendFilterChange(); } @@ -142,9 +151,10 @@ public class BasicItemFilterGui implements IItemFilterGui { private void sendFilterChange() { updateButtons(); - PacketHandler.INSTANCE.sendToServer(new PacketItemConduitFilter(itemConduit, gui.getDir())); + filterContainer.onFilterChanged(); } + @Override public void deactivate() { useNbtB.detach(); useMetaB.detach(); @@ -153,12 +163,13 @@ public class BasicItemFilterGui implements IItemFilterGui { stickyB.detach(); } + @Override public void renderCustomOptions(int top, float par1, int par2, int par3) { GL11.glColor3f(1, 1, 1); RenderUtil.bindTexture("enderio:textures/gui/itemFilter.png"); - gui.drawTexturedModalRect(gui.getGuiLeft() + 32, gui.getGuiTop() + 68, 0, 238, 18 * 5, 18); + gui.drawTexturedModalRect(gui.getGuiLeft() + xOffset, gui.getGuiTop() + yOffset, 0, 238, 18 * 5, 18); if(filter.isAdvanced()) { - gui.drawTexturedModalRect(gui.getGuiLeft() + 32, gui.getGuiTop() + 86, 0, 238, 18 * 5, 18); + gui.drawTexturedModalRect(gui.getGuiLeft() + xOffset, gui.getGuiTop() + yOffset + 20, 0, 238, 18 * 5, 18); } } diff --git a/src/main/java/crazypants/enderio/conduit/gui/item/IItemFilterContainer.java b/src/main/java/crazypants/enderio/conduit/gui/item/IItemFilterContainer.java new file mode 100644 index 00000000..285d60cd --- /dev/null +++ b/src/main/java/crazypants/enderio/conduit/gui/item/IItemFilterContainer.java @@ -0,0 +1,11 @@ +package crazypants.enderio.conduit.gui.item; + +import crazypants.enderio.conduit.item.filter.ItemFilter; + +public interface IItemFilterContainer { + + ItemFilter getItemFilter(); + + void onFilterChanged(); + +} diff --git a/src/main/java/crazypants/enderio/conduit/gui/item/ItemConduitFilterContainer.java b/src/main/java/crazypants/enderio/conduit/gui/item/ItemConduitFilterContainer.java new file mode 100644 index 00000000..d4c92503 --- /dev/null +++ b/src/main/java/crazypants/enderio/conduit/gui/item/ItemConduitFilterContainer.java @@ -0,0 +1,35 @@ +package crazypants.enderio.conduit.gui.item; + +import net.minecraftforge.common.util.ForgeDirection; +import crazypants.enderio.conduit.item.IItemConduit; +import crazypants.enderio.conduit.item.filter.ItemFilter; +import crazypants.enderio.conduit.packet.PacketItemConduitFilter; +import crazypants.enderio.network.PacketHandler; + +public class ItemConduitFilterContainer implements IItemFilterContainer { + + private IItemConduit itemConduit; + private ForgeDirection dir; + private boolean isInput; + + public ItemConduitFilterContainer(IItemConduit itemConduit, ForgeDirection dir, boolean isInput) { + this.itemConduit = itemConduit; + this.dir = dir; + this.isInput = isInput; + } + + @Override + public ItemFilter getItemFilter() { + if(isInput) { + return (ItemFilter) itemConduit.getInputFilter(dir); + } else { + return (ItemFilter) itemConduit.getOutputFilter(dir); + } + } + + @Override + public void onFilterChanged() { + PacketHandler.INSTANCE.sendToServer(new PacketItemConduitFilter(itemConduit, dir)); + } + +} diff --git a/src/main/java/crazypants/enderio/conduit/gui/item/ItemSettings.java b/src/main/java/crazypants/enderio/conduit/gui/item/ItemSettings.java index fa91d767..144b9cfe 100644 --- a/src/main/java/crazypants/enderio/conduit/gui/item/ItemSettings.java +++ b/src/main/java/crazypants/enderio/conduit/gui/item/ItemSettings.java @@ -263,9 +263,10 @@ public class ItemSettings extends BaseSettingsPanel { private IItemFilterGui getFilterGui(IItemFilter filter, boolean isInput) { //TODO: move to a factory if(filter instanceof ItemFilter) { - return new BasicItemFilterGui(gui, itemConduit, isInput); + ItemConduitFilterContainer cont = new ItemConduitFilterContainer(itemConduit, gui.getDir(), isInput); + return new BasicItemFilterGui(gui, cont, !isInput); } else if(filter instanceof ExistingItemFilter) { - return new ExistingItemFilterGui(gui, itemConduit, isInput); + return new ExistingItemFilterGui(gui, itemConduit, isInput); } else if(filter instanceof ModItemFilter) { return new ModItemFilterGui(gui, itemConduit, isInput); } diff --git a/src/main/java/crazypants/enderio/conduit/item/filter/ExistingItemFilter.java b/src/main/java/crazypants/enderio/conduit/item/filter/ExistingItemFilter.java index be66587e..4ed0c7a8 100644 --- a/src/main/java/crazypants/enderio/conduit/item/filter/ExistingItemFilter.java +++ b/src/main/java/crazypants/enderio/conduit/item/filter/ExistingItemFilter.java @@ -79,7 +79,7 @@ public class ExistingItemFilter implements IItemFilter { } @Override - public List getSlots() { + public List getSlots(int xOffset, int yOffset) { return Collections.emptyList(); } @@ -120,7 +120,7 @@ public class ExistingItemFilter implements IItemFilter { } public void setMatchNBT(boolean matchNbt) { - this.matchNBT = matchNbt; + matchNBT = matchNbt; } public boolean isUseOreDict() { diff --git a/src/main/java/crazypants/enderio/conduit/item/filter/IItemFilter.java b/src/main/java/crazypants/enderio/conduit/item/filter/IItemFilter.java index c9bbd076..3a7ecaaf 100644 --- a/src/main/java/crazypants/enderio/conduit/item/filter/IItemFilter.java +++ b/src/main/java/crazypants/enderio/conduit/item/filter/IItemFilter.java @@ -21,7 +21,7 @@ public interface IItemFilter { boolean isSticky(); - List getSlots(); + List getSlots(int xOffset, int yOffset); int getSlotCount(); diff --git a/src/main/java/crazypants/enderio/conduit/item/filter/ItemFilter.java b/src/main/java/crazypants/enderio/conduit/item/filter/ItemFilter.java index 5fc3e394..b9f4b965 100644 --- a/src/main/java/crazypants/enderio/conduit/item/filter/ItemFilter.java +++ b/src/main/java/crazypants/enderio/conduit/item/filter/ItemFilter.java @@ -1,6 +1,5 @@ package crazypants.enderio.conduit.item.filter; -import java.io.FilterInputStream; import java.util.ArrayList; import java.util.Arrays; import java.util.List; @@ -167,7 +166,7 @@ public class ItemFilter implements IInventory, IItemFilter { } public void setMatchNBT(boolean matchNbt) { - this.matchNBT = matchNbt; + matchNBT = matchNbt; } public boolean isUseOreDict() { @@ -312,17 +311,17 @@ public class ItemFilter implements IInventory, IItemFilter { } @Override - public List getSlots() { + public List getSlots(int xOffset, int yOffset) { List result = new ArrayList(); - int topY = 69; - int leftX = 33; + int topY = yOffset; + int leftX = xOffset; int index = 0; int numRows = isAdvanced ? 2 : 1; for (int row = 0; row < numRows; ++row) { for (int col = 0; col < 5; ++col) { int x = leftX + col * 18; - int y = topY + row * 18; + int y = topY + row * 20; result.add(new TemplateSlot(this, index, x, y)); index++; } diff --git a/src/main/java/crazypants/enderio/conduit/item/filter/ModItemFilter.java b/src/main/java/crazypants/enderio/conduit/item/filter/ModItemFilter.java index 68385977..acd2c570 100644 --- a/src/main/java/crazypants/enderio/conduit/item/filter/ModItemFilter.java +++ b/src/main/java/crazypants/enderio/conduit/item/filter/ModItemFilter.java @@ -1,18 +1,13 @@ package crazypants.enderio.conduit.item.filter; -import java.util.ArrayList; import java.util.Collections; import java.util.List; -import cpw.mods.fml.common.registry.GameRegistry; -import cpw.mods.fml.common.registry.GameRegistry.UniqueIdentifier; - import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTBase; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.nbt.NBTTagList; -import net.minecraft.nbt.NBTTagString; +import cpw.mods.fml.common.registry.GameRegistry; +import cpw.mods.fml.common.registry.GameRegistry.UniqueIdentifier; import crazypants.enderio.conduit.item.NetworkedInventory; public class ModItemFilter implements IItemFilter { @@ -93,7 +88,7 @@ public class ModItemFilter implements IItemFilter { } @Override - public List getSlots() { + public List getSlots(int xOffset, int yOffset) { return Collections.emptyList(); } diff --git a/src/main/java/crazypants/enderio/gui/IconEIO.java b/src/main/java/crazypants/enderio/gui/IconEIO.java index a12f9864..533b95ec 100644 --- a/src/main/java/crazypants/enderio/gui/IconEIO.java +++ b/src/main/java/crazypants/enderio/gui/IconEIO.java @@ -113,6 +113,8 @@ public final class IconEIO { public static final IconEIO ENDER_RAIL = new IconEIO(235, 175); + public static final IconEIO FILTER = new IconEIO(203, 31); + private static final int TEX_SIZE = 256; private static final double PIX_SIZE = 1d / TEX_SIZE; diff --git a/src/main/java/crazypants/enderio/machine/AbstractMachineContainer.java b/src/main/java/crazypants/enderio/machine/AbstractMachineContainer.java index 43adde45..985f90ef 100644 --- a/src/main/java/crazypants/enderio/machine/AbstractMachineContainer.java +++ b/src/main/java/crazypants/enderio/machine/AbstractMachineContainer.java @@ -81,7 +81,7 @@ public abstract class AbstractMachineContainer extends Container { SlotDefinition slotDef = tileEntity.getSlotDefinition(); - int startPlayerSlot = slotDef.getNumSlots(); + int startPlayerSlot = getIndexOfFirstPlayerInvSlot(slotDef); int endPlayerSlot = startPlayerSlot + 26; int startHotBarSlot = endPlayerSlot + 1; int endHotBarSlot = startHotBarSlot + 9; @@ -143,6 +143,10 @@ public abstract class AbstractMachineContainer extends Container { return copystack; } + protected int getIndexOfFirstPlayerInvSlot(SlotDefinition slotDef) { + return slotDef.getNumSlots(); + } + /** * Added validation of slot input */ diff --git a/src/main/java/crazypants/enderio/machine/AbstractMachineEntity.java b/src/main/java/crazypants/enderio/machine/AbstractMachineEntity.java index 9012e917..89d41742 100644 --- a/src/main/java/crazypants/enderio/machine/AbstractMachineEntity.java +++ b/src/main/java/crazypants/enderio/machine/AbstractMachineEntity.java @@ -273,6 +273,7 @@ public abstract class AbstractMachineEntity extends TileEntityEio implements ISi return VecmathUtil.clamp(Math.round(scale * ((float)storedEnergyRF / getMaxEnergyStored())), 0, scale); } + @Override public int getEnergyStored() { return storedEnergyRF; } @@ -527,6 +528,9 @@ public abstract class AbstractMachineEntity extends TileEntityEio implements ISi readCommon(nbtRoot); } + /** + * Read state common to both block and item + */ public void readCommon(NBTTagCompound nbtRoot) { setCapacitor(Capacitors.values()[nbtRoot.getShort("capacitorType")]); @@ -592,6 +596,9 @@ public abstract class AbstractMachineEntity extends TileEntityEio implements ISi writeCommon(nbtRoot); } + /** + * Write state common to both block and item + */ public void writeCommon(NBTTagCompound nbtRoot) { nbtRoot.setInteger("storedEnergyRF", storedEnergyRF); nbtRoot.setShort("capacitorType", (short) capacitorType.ordinal()); diff --git a/src/main/java/crazypants/enderio/machine/transceiver/BlockTransceiver.java b/src/main/java/crazypants/enderio/machine/transceiver/BlockTransceiver.java index e5441524..07dd5464 100644 --- a/src/main/java/crazypants/enderio/machine/transceiver/BlockTransceiver.java +++ b/src/main/java/crazypants/enderio/machine/transceiver/BlockTransceiver.java @@ -30,6 +30,7 @@ public class BlockTransceiver extends AbstractMachineBlock { PacketHandler.INSTANCE.registerMessage(PacketAddRemoveChannel.class, PacketAddRemoveChannel.class, PacketHandler.nextID(), Side.CLIENT); PacketHandler.INSTANCE.registerMessage(PacketChannelList.class, PacketChannelList.class, PacketHandler.nextID(), Side.CLIENT); PacketHandler.INSTANCE.registerMessage(PacketSendRecieveChannelList.class, PacketSendRecieveChannelList.class, PacketHandler.nextID(), Side.CLIENT); + PacketHandler.INSTANCE.registerMessage(PacketItemFilter.class, PacketItemFilter.class, PacketHandler.nextID(), Side.SERVER); ConnectionHandler ch = new ConnectionHandler(); FMLCommonHandler.instance().bus().register(ch); diff --git a/src/main/java/crazypants/enderio/machine/transceiver/PacketItemFilter.java b/src/main/java/crazypants/enderio/machine/transceiver/PacketItemFilter.java new file mode 100644 index 00000000..68f5207f --- /dev/null +++ b/src/main/java/crazypants/enderio/machine/transceiver/PacketItemFilter.java @@ -0,0 +1,64 @@ +package crazypants.enderio.machine.transceiver; + +import io.netty.buffer.ByteBuf; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.nbt.NBTTagCompound; +import cpw.mods.fml.common.network.simpleimpl.IMessage; +import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; +import cpw.mods.fml.common.network.simpleimpl.MessageContext; +import crazypants.enderio.conduit.item.filter.ItemFilter; +import crazypants.enderio.network.MessageTileEntity; +import crazypants.enderio.network.NetworkUtil; + +public class PacketItemFilter extends MessageTileEntity implements IMessageHandler { + + private boolean isSend; + private ItemFilter filter; + + public PacketItemFilter() { + } + + public PacketItemFilter(TileTransceiver te, boolean isSend) { + super(te); + this.isSend = isSend; + if(isSend) { + filter = te.getSendItemFilter(); + } else { + filter = te.getReceiveItemFilter(); + } + } + + @Override + public void toBytes(ByteBuf buf) { + super.toBytes(buf); + buf.writeBoolean(isSend); + NBTTagCompound tag = new NBTTagCompound(); + filter.writeToNBT(tag); + NetworkUtil.writeNBTTagCompound(tag, buf); + } + + @Override + public void fromBytes(ByteBuf buf) { + super.fromBytes(buf); + isSend = buf.readBoolean(); + NBTTagCompound tag = NetworkUtil.readNBTTagCompound(buf); + filter = new ItemFilter(); + filter.readFromNBT(tag); + } + + @Override + public IMessage onMessage(PacketItemFilter message, MessageContext ctx) { + EntityPlayer player = ctx.getServerHandler().playerEntity; + TileTransceiver tile = message.getTileEntity(player.worldObj); + boolean isSend = message.isSend; + ItemFilter filter = message.filter; + if(tile != null && filter != null) { + if(isSend) { + tile.setSendItemFilter(filter); + } else { + tile.setRecieveItemFilter(filter); + } + } + return null; + } +} diff --git a/src/main/java/crazypants/enderio/machine/transceiver/ServerChannelRegister.java b/src/main/java/crazypants/enderio/machine/transceiver/ServerChannelRegister.java index d0a01424..a423b858 100644 --- a/src/main/java/crazypants/enderio/machine/transceiver/ServerChannelRegister.java +++ b/src/main/java/crazypants/enderio/machine/transceiver/ServerChannelRegister.java @@ -140,9 +140,9 @@ public class ServerChannelRegister extends ChannelRegister { public void dergister(TileTransceiver transceiver) { transceivers.remove(transceiver); } - + @Override - public void reset() { + public void reset() { super.reset(); transceivers.clear(); iterators.clear(); @@ -182,7 +182,7 @@ public class ServerChannelRegister extends ChannelRegister { } } } - } + } //Fluid @@ -235,6 +235,9 @@ public class ServerChannelRegister extends ChannelRegister { if(!from.hasPower()) { return; } + if(!from.getSendItemFilter().doesItemPassFilter(null, contents)) { + return; + } for (Channel channel : channels) { RoundRobinIterator iter = getIterator(channel); for (TileTransceiver trans : iter) { @@ -250,9 +253,12 @@ public class ServerChannelRegister extends ChannelRegister { private ItemStack sendItem(TileTransceiver from, int slot, ItemStack contents, TileTransceiver to) { SlotDefinition sd = to.getSlotDefinition(); + if(!to.getReceiveItemFilter().doesItemPassFilter(null, contents)) { + return contents; + } //try merging into existing stacks - - boolean sendComplete = false; // Only allow 1 stack per item type + + boolean sendComplete = false; // Only allow 1 stack per item type for (int i = sd.minOutputSlot; i <= sd.maxOutputSlot && !sendComplete; i++) { ItemStack existing = to.getStackInSlot(i); if(ItemUtil.areStacksEqual(existing, contents)) { diff --git a/src/main/java/crazypants/enderio/machine/transceiver/TileTransceiver.java b/src/main/java/crazypants/enderio/machine/transceiver/TileTransceiver.java index efecd803..23ec7fa7 100644 --- a/src/main/java/crazypants/enderio/machine/transceiver/TileTransceiver.java +++ b/src/main/java/crazypants/enderio/machine/transceiver/TileTransceiver.java @@ -1,13 +1,10 @@ package crazypants.enderio.machine.transceiver; import java.util.ArrayList; -import java.util.Collection; import java.util.EnumMap; -import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.Map.Entry; -import java.util.Set; import net.minecraft.block.Block; import net.minecraft.item.ItemStack; @@ -19,23 +16,20 @@ import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidTankInfo; import net.minecraftforge.fluids.IFluidHandler; import crazypants.enderio.ModObject; +import crazypants.enderio.conduit.item.FilterRegister; +import crazypants.enderio.conduit.item.filter.ItemFilter; import crazypants.enderio.config.Config; import crazypants.enderio.machine.AbstractPoweredTaskEntity; import crazypants.enderio.machine.ContinuousTask; -import crazypants.enderio.machine.IMachineRecipe; -import crazypants.enderio.machine.IPoweredTask; import crazypants.enderio.machine.IoMode; -import crazypants.enderio.machine.PoweredTask; import crazypants.enderio.machine.SlotDefinition; import crazypants.enderio.network.PacketHandler; import crazypants.enderio.power.BasicCapacitor; -import crazypants.enderio.power.Capacitors; import crazypants.enderio.power.ICapacitor; import crazypants.enderio.power.PowerDistributor; import crazypants.enderio.rail.EnderRailController; import crazypants.util.FluidUtil; import crazypants.util.ItemUtil; -import crazypants.vecmath.VecmathUtil; public class TileTransceiver extends AbstractPoweredTaskEntity implements IFluidHandler { @@ -59,6 +53,9 @@ public class TileTransceiver extends AbstractPoweredTaskEntity implements IFluid private boolean inFluidFill = false; private boolean inGetTankInfo = false; + private ItemFilter sendItemFilter; + private ItemFilter recieveItemFilter; + public TileTransceiver() { super(new SlotDefinition(8, 8, 0)); for (ChannelType type : ChannelType.values()) { @@ -67,6 +64,9 @@ public class TileTransceiver extends AbstractPoweredTaskEntity implements IFluid } currentTask = new ContinuousTask(Config.transceiverUpkeepCostRF); railController = new EnderRailController(this); + + sendItemFilter = new ItemFilter(true); + recieveItemFilter = new ItemFilter(true); } public EnderRailController getRailController() { @@ -155,16 +155,12 @@ public class TileTransceiver extends AbstractPoweredTaskEntity implements IFluid return hasPower(); } - @Override - protected boolean isMachineItemValidForSlot(int i, ItemStack itemstack) { - return true; - } - @Override public ICapacitor getCapacitor() { return capacitor; } + @Override public int getPowerUsePerTick() { return Config.transceiverUpkeepCostRF; } @@ -242,6 +238,15 @@ public class TileTransceiver extends AbstractPoweredTaskEntity implements IFluid super.readCommon(nbtRoot); readChannels(nbtRoot, sendChannels, "sendChannels"); readChannels(nbtRoot, recieveChannels, "recieveChannels"); + + if(nbtRoot.hasKey("sendItemFilter")) { + NBTTagCompound itemRoot = nbtRoot.getCompoundTag("sendItemFilter"); + sendItemFilter = (ItemFilter) FilterRegister.loadFilterFromNbt(itemRoot); + } + if(nbtRoot.hasKey("recieveItemFilter")) { + NBTTagCompound itemRoot = nbtRoot.getCompoundTag("recieveItemFilter"); + recieveItemFilter = (ItemFilter) FilterRegister.loadFilterFromNbt(itemRoot); + } } static void readChannels(NBTTagCompound nbtRoot, EnumMap> readInto, String key) { @@ -273,6 +278,17 @@ public class TileTransceiver extends AbstractPoweredTaskEntity implements IFluid channelTags = createTagList(recieveChannels); nbtRoot.setTag("recieveChannels", channelTags); + + if(sendItemFilter != null) { + NBTTagCompound itemRoot = new NBTTagCompound(); + FilterRegister.writeFilterToNbt(sendItemFilter, itemRoot); + nbtRoot.setTag("sendItemFilter", itemRoot); + } + if(recieveItemFilter != null) { + NBTTagCompound itemRoot = new NBTTagCompound(); + FilterRegister.writeFilterToNbt(recieveItemFilter, itemRoot); + nbtRoot.setTag("recieveItemFilter", itemRoot); + } } static NBTTagList createTagList(EnumMap> chans) { @@ -489,6 +505,8 @@ public class TileTransceiver extends AbstractPoweredTaskEntity implements IFluid } //---------------- item handling + + private void processItems() { List sendItemChannels = getSendChannels(ChannelType.ITEM); if(!sendItemChannels.isEmpty()) { @@ -501,6 +519,43 @@ public class TileTransceiver extends AbstractPoweredTaskEntity implements IFluid } } + public ItemFilter getSendItemFilter() { + return sendItemFilter; + } + + public ItemFilter getReceiveItemFilter() { + return recieveItemFilter; + } + + public ItemFilter getRecieveItemFilter() { + return recieveItemFilter; + } + + public void setRecieveItemFilter(ItemFilter recieveItemFilter) { + this.recieveItemFilter = recieveItemFilter; + } + + public void setSendItemFilter(ItemFilter sendItemFilter) { + this.sendItemFilter = sendItemFilter; + } + + @Override + protected boolean isMachineItemValidForSlot(int slot, ItemStack itemstack) { + if(itemstack == null) { + return false; + } + if(slotDefinition.isInputSlot(slot)) { + if(!getSendItemFilter().doesItemPassFilter(null, itemstack)) { + return false; + } + } else if(slotDefinition.isOutputSlot(slot)) { + if(!getReceiveItemFilter().doesItemPassFilter(null, itemstack)) { + return false; + } + } + return true; + } + @Override public boolean canInsertItem(int slot, ItemStack itemstack, int j) { if(itemstack == null) { @@ -509,6 +564,15 @@ public class TileTransceiver extends AbstractPoweredTaskEntity implements IFluid //only allow 1 stack per type if(slotDefinition.isInputSlot(slot)) { + + List chans = getSendChannels().get(ChannelType.ITEM); + if(chans == null || chans.size() == 0) { + return false; + } + if(!getSendItemFilter().doesItemPassFilter(null, itemstack)) { + return false; + } + for (int i = slotDefinition.getMinInputSlot(); i <= slotDefinition.getMaxInputSlot(); i++) { if(i != slot) { if(ItemUtil.areStacksEqual(itemstack, getStackInSlot(i))) { @@ -517,6 +581,10 @@ public class TileTransceiver extends AbstractPoweredTaskEntity implements IFluid } } } else if(slotDefinition.isOutputSlot(slot)) { + + if(!getRecieveItemFilter().doesItemPassFilter(null, itemstack)) { + return false; + } for (int i = slotDefinition.getMinOutputSlot(); i <= slotDefinition.getMaxOutputSlot(); i++) { if(i != slot) { if(ItemUtil.areStacksEqual(itemstack, getStackInSlot(i))) { diff --git a/src/main/java/crazypants/enderio/machine/transceiver/gui/ContainerTransceiver.java b/src/main/java/crazypants/enderio/machine/transceiver/gui/ContainerTransceiver.java index 57bc6456..236524da 100644 --- a/src/main/java/crazypants/enderio/machine/transceiver/gui/ContainerTransceiver.java +++ b/src/main/java/crazypants/enderio/machine/transceiver/gui/ContainerTransceiver.java @@ -1,32 +1,56 @@ package crazypants.enderio.machine.transceiver.gui; import java.awt.Point; +import java.util.HashMap; +import java.util.List; +import java.util.Map; import java.util.Map.Entry; import java.util.Set; -import crazypants.enderio.machine.AbstractMachineContainer; -import crazypants.enderio.machine.transceiver.TileTransceiver; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; +import crazypants.enderio.conduit.gui.item.InventoryFilterUpgrade; +import crazypants.enderio.machine.AbstractMachineContainer; +import crazypants.enderio.machine.SlotDefinition; +import crazypants.enderio.machine.transceiver.TileTransceiver; public class ContainerTransceiver extends AbstractMachineContainer { + public static final int GUI_WIDTH = 256; + static final Point PLAYER_INV_OFFSET = new Point(47, 86); static final Point ITEM_INV_OFFSET = new Point(54, 30); static final Point HIDDEN_OFFSET = new Point(-3000, -3000); + static final Point FILTER_OFFSET = new Point(PLAYER_INV_OFFSET.x, 30); + + private TileTransceiver trans; + + private Map sendFilterLocs; + private Map recFilterLocs; + public ContainerTransceiver(InventoryPlayer inventory, TileTransceiver te) { super(inventory, te); + trans = te; } @Override protected void addMachineSlots(InventoryPlayer playerInv) { + + trans = (TileTransceiver) tileEntity; + int i; for (i = 0; i < 8; i++) { - addSlotToContainer(new Slot(tileEntity, i, 0, 0)); + addSlotToContainer(new Slot(tileEntity, i, 0, 0) { + @Override + public boolean isItemValid(ItemStack itemstack) { + return trans.isItemValidForSlot(getSlotIndex(), itemstack); + //return true; + } + }); } for (; i < 16; i++) { addSlotToContainer(new Slot(tileEntity, i, 0, 0) { @@ -38,18 +62,55 @@ public class ContainerTransceiver extends AbstractMachineContainer { } setItemSlotLocations(getItemInventoryOffset()); + List sendFilterSlots = trans.getSendItemFilter().getSlots(0, 0); + sendFilterLocs = new HashMap(); + for (Slot slot : sendFilterSlots) { + addSlotToContainer(slot); + sendFilterLocs.put(slot, new Point(slot.xDisplayPosition, slot.yDisplayPosition)); + } + List recFilterSlots = trans.getReceiveItemFilter().getSlots(0, 0); + recFilterLocs = new HashMap(); + for (Slot slot : recFilterSlots) { + addSlotToContainer(slot); + recFilterLocs.put(slot, new Point(slot.xDisplayPosition, slot.yDisplayPosition)); + } + setSendFilterSlotsVisible(false); + setReceiveFilterSlotsVisible(false); + } - public void setPlayerInventory(boolean visible) { + public void setPlayerInventoryVisible(boolean visible) { Set> entries = playerSlotLocations.entrySet(); for (Entry entry : entries) { entry.getKey().xDisplayPosition = visible ? entry.getValue().x : -3000; entry.getKey().yDisplayPosition = visible ? entry.getValue().y : -3000; } + } + + public void setBufferSlotsVisible(boolean visible) { Point itemOffset = visible ? getItemInventoryOffset() : HIDDEN_OFFSET; setItemSlotLocations(itemOffset); } + public void setSendFilterSlotsVisible(boolean visible) { + setFilterSlotsVisible(sendFilterLocs, visible); + } + + public void setReceiveFilterSlotsVisible(boolean visible) { + setFilterSlotsVisible(recFilterLocs, visible); + } + + public void setFilterSlotsVisible(Map slots, boolean visible) { + Point offset = HIDDEN_OFFSET; + if(visible) { + offset = FILTER_OFFSET; + } + for (Entry entry : slots.entrySet()) { + entry.getKey().xDisplayPosition = offset.x + entry.getValue().x + 1; + entry.getKey().yDisplayPosition = offset.y + entry.getValue().y + 1; + } + } + private void setItemSlotLocations(Point offset) { int i; int x = offset.x; @@ -93,8 +154,33 @@ public class ContainerTransceiver extends AbstractMachineContainer { return ITEM_INV_OFFSET; } + public Point getFilterOffset() { + return FILTER_OFFSET; + } + public int getItemBufferSpacing() { return 5; } + @Override + protected int getIndexOfFirstPlayerInvSlot(SlotDefinition slotDef) { + return slotDef.getNumSlots() + sendFilterLocs.size() + recFilterLocs.size(); + } + + public static class FilterSlot extends Slot { + + InventoryFilterUpgrade inv; + + public FilterSlot(InventoryFilterUpgrade inv) { + super(inv, 0, 0, 0); + this.inv = inv; + } + + @Override + public boolean isItemValid(ItemStack stack) { + return inv.isItemValidForSlot(0, stack); + } + + } + } diff --git a/src/main/java/crazypants/enderio/machine/transceiver/gui/FilterTab.java b/src/main/java/crazypants/enderio/machine/transceiver/gui/FilterTab.java new file mode 100644 index 00000000..46dde1bd --- /dev/null +++ b/src/main/java/crazypants/enderio/machine/transceiver/gui/FilterTab.java @@ -0,0 +1,169 @@ +package crazypants.enderio.machine.transceiver.gui; + +import java.awt.Color; +import java.awt.Point; + +import net.minecraft.client.gui.FontRenderer; +import net.minecraft.client.gui.GuiButton; + +import org.lwjgl.opengl.GL11; + +import crazypants.enderio.conduit.gui.item.BasicItemFilterGui; +import crazypants.enderio.conduit.gui.item.IItemFilterContainer; +import crazypants.enderio.conduit.item.filter.ItemFilter; +import crazypants.enderio.gui.ITabPanel; +import crazypants.enderio.gui.IconButtonEIO; +import crazypants.enderio.gui.IconEIO; +import crazypants.enderio.machine.transceiver.PacketItemFilter; +import crazypants.enderio.machine.transceiver.TileTransceiver; +import crazypants.enderio.network.PacketHandler; +import crazypants.render.ColorUtil; +import crazypants.render.RenderUtil; + +public class FilterTab implements ITabPanel { + + GuiTransceiver parent; + ContainerTransceiver container; + BasicItemFilterGui sendGui; + BasicItemFilterGui recGui; + + IconButtonEIO sendRecB; + + boolean showSend = true; + + FilterTab(GuiTransceiver parent) { + this.parent = parent; + container = parent.container; + sendGui = new BasicItemFilterGui(parent, new FilterContainer(parent.entity, true), false, container.getFilterOffset().x, + container.getFilterOffset().y, 0); + recGui = new BasicItemFilterGui(parent, new FilterContainer(parent.entity, true), false, container.getFilterOffset().x, + container.getFilterOffset().y, 20); + + sendRecB = new IconButtonEIO(parent, 8888, container.getFilterOffset().x + 79, container.getFilterOffset().y - 20, IconEIO.RIGHT_ARROW); + sendRecB.setSize(10, 16); + } + + @Override + public void onGuiInit(int x, int y, int width, int height) { + parent.container.setPlayerInventoryVisible(true); + sendRecB.onGuiInit(); + updateSendRecieve(); + + } + + protected void updateSendRecieve() { + if(showSend) { + parent.container.setSendFilterSlotsVisible(true); + parent.container.setReceiveFilterSlotsVisible(false); + sendGui.updateButtons(); + recGui.deactivate(); + } else { + parent.container.setSendFilterSlotsVisible(false); + parent.container.setReceiveFilterSlotsVisible(true); + sendGui.deactivate(); + recGui.updateButtons(); + } + } + + @Override + public void deactivate() { + parent.container.setPlayerInventoryVisible(false); + parent.container.setSendFilterSlotsVisible(false); + parent.container.setReceiveFilterSlotsVisible(false); + sendGui.deactivate(); + recGui.deactivate(); + sendRecB.detach(); + } + + @Override + public IconEIO getIcon() { + return IconEIO.FILTER; + } + + @Override + public void render(float par1, int par2, int par3) { + int top = parent.getGuiTop(); + int left = parent.getGuiLeft(); + + GL11.glColor3f(1, 1, 1); + + //Inventory + RenderUtil.bindTexture("enderio:textures/gui/transceiver.png"); + Point invRoot = container.getPlayerInventoryOffset(); + parent.drawTexturedModalRect(left + invRoot.x - 1, top + invRoot.y - 1, 24, 180, 162, 76); + + if(showSend) { + sendGui.renderCustomOptions(0, par1, par2, par3); + } else { + recGui.renderCustomOptions(0, par1, par2, par3); + } + + String txt = "Send Filter"; + if(!showSend) { + txt = "Receive Filter"; + } + FontRenderer fr = parent.getFontRenderer(); + int x = left + container.getFilterOffset().x; + int y = top - fr.FONT_HEIGHT + container.getFilterOffset().y - 7; + fr.drawStringWithShadow(txt, x, y, ColorUtil.getRGB(Color.WHITE)); + + //sendRecB.xPosition = left + container.getFilterOffset().x + fr.getStringWidth(txt) + 10; + //System.out.println("FilterTab.enclosing_method: " + (fr.getStringWidth(txt) + 10)); + } + + @Override + public void actionPerformed(GuiButton guiButton) { + if(guiButton == sendRecB) { + showSend = !showSend; + updateSendRecieve(); + } + if(showSend) { + sendGui.actionPerformed(guiButton); + } else { + recGui.actionPerformed(guiButton); + } + } + + @Override + public void mouseClicked(int x, int y, int par3) { + if(showSend) { + sendGui.mouseClicked(x, y, par3); + } else { + recGui.mouseClicked(x, y, par3); + } + } + + @Override + public void keyTyped(char par1, int par2) { + } + + @Override + public void updateScreen() { + } + + private static class FilterContainer implements IItemFilterContainer { + + private TileTransceiver trans; + private boolean isSend; + + private FilterContainer(TileTransceiver trans, boolean isSend) { + this.trans = trans; + this.isSend = isSend; + } + + @Override + public ItemFilter getItemFilter() { + if(isSend) { + return trans.getSendItemFilter(); + } + return trans.getReceiveItemFilter(); + } + + @Override + public void onFilterChanged() { + PacketHandler.INSTANCE.sendToServer(new PacketItemFilter(trans, isSend)); + } + + } + +} diff --git a/src/main/java/crazypants/enderio/machine/transceiver/gui/GeneralTab.java b/src/main/java/crazypants/enderio/machine/transceiver/gui/GeneralTab.java index 7cd235cb..3bc58753 100644 --- a/src/main/java/crazypants/enderio/machine/transceiver/gui/GeneralTab.java +++ b/src/main/java/crazypants/enderio/machine/transceiver/gui/GeneralTab.java @@ -5,10 +5,11 @@ import java.awt.Point; import java.awt.Rectangle; import java.util.List; -import org.lwjgl.opengl.GL11; - import net.minecraft.client.gui.FontRenderer; import net.minecraft.client.gui.GuiButton; + +import org.lwjgl.opengl.GL11; + import crazypants.enderio.config.Config; import crazypants.enderio.gui.ITabPanel; import crazypants.enderio.gui.IconEIO; @@ -42,12 +43,14 @@ public class GeneralTab implements ITabPanel { @Override public void onGuiInit(int x, int y, int width, int height) { - container.setPlayerInventory(true); + container.setPlayerInventoryVisible(true); + container.setBufferSlotsVisible(true); } @Override public void deactivate() { - container.setPlayerInventory(false); + container.setPlayerInventoryVisible(false); + container.setBufferSlotsVisible(false); } @Override diff --git a/src/main/java/crazypants/enderio/machine/transceiver/gui/GuiTransceiver.java b/src/main/java/crazypants/enderio/machine/transceiver/gui/GuiTransceiver.java index 48467231..c97254ba 100644 --- a/src/main/java/crazypants/enderio/machine/transceiver/gui/GuiTransceiver.java +++ b/src/main/java/crazypants/enderio/machine/transceiver/gui/GuiTransceiver.java @@ -1,9 +1,12 @@ package crazypants.enderio.machine.transceiver.gui; -import java.awt.Color; import java.util.ArrayList; import java.util.List; +import net.minecraft.client.gui.GuiButton; +import net.minecraft.client.renderer.Tessellator; +import net.minecraft.entity.player.InventoryPlayer; + import org.lwjgl.opengl.GL11; import crazypants.enderio.config.Config; @@ -11,18 +14,9 @@ import crazypants.enderio.gui.IGuiOverlay; import crazypants.enderio.gui.ITabPanel; import crazypants.enderio.gui.IconEIO; import crazypants.enderio.machine.GuiMachineBase; -import crazypants.enderio.machine.generator.stirling.StirlingGeneratorContainer; -import crazypants.enderio.machine.generator.stirling.TileEntityStirlingGenerator; -import crazypants.enderio.machine.power.PowerDisplayUtil; import crazypants.enderio.machine.transceiver.ChannelType; import crazypants.enderio.machine.transceiver.TileTransceiver; -import crazypants.render.ColorUtil; import crazypants.render.RenderUtil; -import crazypants.util.Lang; -import net.minecraft.client.gui.FontRenderer; -import net.minecraft.client.gui.GuiButton; -import net.minecraft.client.renderer.Tessellator; -import net.minecraft.entity.player.InventoryPlayer; public class GuiTransceiver extends GuiMachineBase { @@ -41,12 +35,14 @@ public class GuiTransceiver extends GuiMachineBase { public GuiTransceiver(InventoryPlayer par1InventoryPlayer, TileTransceiver te) { super(te, new ContainerTransceiver(par1InventoryPlayer, te)); - this.entity = te; + entity = te; container = (ContainerTransceiver) inventorySlots; transceiver = te; generalTab = new GeneralTab(this); tabs.add(generalTab); + FilterTab filterTab = new FilterTab(this); + tabs.add(filterTab); tabs.add(new ChannelTab(this, ChannelType.POWER)); tabs.add(new ChannelTab(this, ChannelType.ITEM)); tabs.add(new ChannelTab(this, ChannelType.FLUID)); @@ -55,6 +51,7 @@ public class GuiTransceiver extends GuiMachineBase { } } + @Override protected void updatePowerBarTooltip(List text) { generalTab.updatePowerBarTooltip(text); } @@ -66,7 +63,7 @@ public class GuiTransceiver extends GuiMachineBase { @Override public int getXSize() { - return 256; + return ContainerTransceiver.GUI_WIDTH; } @Override @@ -88,7 +85,7 @@ public class GuiTransceiver extends GuiMachineBase { return; } } - this.mc.thePlayer.closeScreen(); + mc.thePlayer.closeScreen(); } for (int i = 0; i < tabs.size(); i++) { @@ -102,11 +99,14 @@ public class GuiTransceiver extends GuiMachineBase { @Override public void initGui() { super.initGui(); + for (int i = 0; i < tabs.size(); i++) { + if(i != activeTab) { + tabs.get(i).deactivate(); + } + } for (int i = 0; i < tabs.size(); i++) { if(i == activeTab) { tabs.get(i).onGuiInit(guiLeft + 10, guiTop, xSize - 20, ySize - 20); - } else { - tabs.get(i).deactivate(); } } configB.visible = activeTab == 0; @@ -217,7 +217,7 @@ public class GuiTransceiver extends GuiMachineBase { tes.draw(); RenderUtil.bindTexture("enderio:textures/gui/transceiver.png"); - drawTexturedModalRect(sx, sy, 0, 0, this.xSize, this.ySize); + drawTexturedModalRect(sx, sy, 0, 0, xSize, ySize); super.drawGuiContainerBackgroundLayer(par1, par2, par3); GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);