From 6870b211c5908172ea22bc6957e7cf51553deb8a Mon Sep 17 00:00:00 2001 From: "Aidan C. Brady" Date: Fri, 13 Mar 2015 10:20:19 -0500 Subject: [PATCH] Oredictionificator work --- .../client/gui/GuiOredictionificator.java | 43 +++ .../ContainerOredictionificator.java | 41 ++- .../common/network/PacketEditFilter.java | 62 +++- .../common/network/PacketNewFilter.java | 33 +- .../tile/TileEntityMetallurgicInfuser.java | 2 +- .../tile/TileEntityOredictionificator.java | 335 +++++++++++++++++- .../mekanism/gui/GuiOredictionificator.png | Bin 7693 -> 4017 bytes .../gui/GuiOredictionificatorFilter.png | Bin 0 -> 4420 bytes .../resources/assets/mekanism/lang/en_US.lang | 1 + 9 files changed, 507 insertions(+), 10 deletions(-) create mode 100644 src/main/resources/assets/mekanism/gui/GuiOredictionificatorFilter.png diff --git a/src/main/java/mekanism/client/gui/GuiOredictionificator.java b/src/main/java/mekanism/client/gui/GuiOredictionificator.java index f93d8d330..970ff54f0 100644 --- a/src/main/java/mekanism/client/gui/GuiOredictionificator.java +++ b/src/main/java/mekanism/client/gui/GuiOredictionificator.java @@ -3,10 +3,13 @@ package mekanism.client.gui; import mekanism.client.gui.element.GuiProgress; import mekanism.client.gui.element.GuiProgress.IProgressInfoHandler; import mekanism.client.gui.element.GuiProgress.ProgressBar; +import mekanism.client.gui.element.GuiSlot; +import mekanism.client.gui.element.GuiSlot.SlotType; import mekanism.common.inventory.container.ContainerOredictionificator; import mekanism.common.tile.TileEntityOredictionificator; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; +import net.minecraft.client.gui.GuiButton; import net.minecraft.entity.player.InventoryPlayer; import org.lwjgl.opengl.GL11; @@ -19,6 +22,12 @@ public class GuiOredictionificator extends GuiMekanism { public TileEntityOredictionificator tileEntity; + public boolean isDragging = false; + + public int dragOffset = 0; + + public float scroll; + public GuiOredictionificator(InventoryPlayer inventory, TileEntityOredictionificator tentity) { super(tentity, new ContainerOredictionificator(inventory, tentity)); @@ -32,6 +41,38 @@ public class GuiOredictionificator extends GuiMekanism return 1;//tileEntity.isActive ? 1 : 0; } }, ProgressBar.LARGE_RIGHT, this, MekanismUtils.getResource(ResourceType.GUI, "GuiOredictionificator.png"), 62, 118)); + guiElements.add(new GuiSlot(SlotType.NORMAL, this, MekanismUtils.getResource(ResourceType.GUI, "GuiOredictionificator.png"), 25, 114)); + guiElements.add(new GuiSlot(SlotType.NORMAL, this, MekanismUtils.getResource(ResourceType.GUI, "GuiOredictionificator.png"), 133, 114)); + + ySize+=64; + } + + public int getScroll() + { + return Math.max(Math.min((int)(scroll*88), 88), 0); + } + + @Override + public void initGui() + { + super.initGui(); + + int guiWidth = (width - xSize) / 2; + int guiHeight = (height - ySize) / 2; + + buttonList.clear(); + buttonList.add(new GuiButton(0, guiWidth + 10, guiHeight + 86, 142, 20, MekanismUtils.localize("gui.newFilter"))); + } + + @Override + protected void actionPerformed(GuiButton guibutton) + { + super.actionPerformed(guibutton); + + if(guibutton.id == 0) + { + + } } @Override @@ -57,6 +98,8 @@ public class GuiOredictionificator extends GuiMekanism int xAxis = mouseX - guiWidth; int yAxis = mouseY - guiHeight; + + drawTexturedModalRect(guiWidth + 154, guiHeight + 18 + getScroll(), 232, 0, 12, 15); super.drawGuiContainerBackgroundLayer(partialTick, mouseX, mouseY); } diff --git a/src/main/java/mekanism/common/inventory/container/ContainerOredictionificator.java b/src/main/java/mekanism/common/inventory/container/ContainerOredictionificator.java index 9a2fc12a8..bcf2c2c54 100644 --- a/src/main/java/mekanism/common/inventory/container/ContainerOredictionificator.java +++ b/src/main/java/mekanism/common/inventory/container/ContainerOredictionificator.java @@ -1,14 +1,53 @@ package mekanism.common.inventory.container; +import mekanism.common.inventory.slot.SlotOutput; import mekanism.common.tile.TileEntityOredictionificator; +import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; +import net.minecraft.inventory.Container; +import net.minecraft.inventory.Slot; -public class ContainerOredictionificator extends ContainerNull//TODO +public class ContainerOredictionificator extends Container { private TileEntityOredictionificator tileEntity; public ContainerOredictionificator(InventoryPlayer inventory, TileEntityOredictionificator tentity) { + tileEntity = tentity; + addSlotToContainer(new Slot(tentity, 0, 26, 115)); + addSlotToContainer(new SlotOutput(tentity, 1, 134, 115)); + int slotX; + + for(slotX = 0; slotX < 3; slotX++) + { + for(int slotY = 0; slotY < 9; slotY++) + { + addSlotToContainer(new Slot(inventory, slotY + slotX * 9 + 9, 8 + slotY * 18, 148 + slotX * 18)); + } + } + + for(slotX = 0; slotX < 9; slotX++) + { + addSlotToContainer(new Slot(inventory, slotX, 8 + slotX * 18, 206)); + } + + tileEntity.open(inventory.player); + tileEntity.openInventory(); + } + + @Override + public void onContainerClosed(EntityPlayer entityplayer) + { + super.onContainerClosed(entityplayer); + + tileEntity.close(entityplayer); + tileEntity.closeInventory(); + } + + @Override + public boolean canInteractWith(EntityPlayer entityplayer) + { + return tileEntity.isUseableByPlayer(entityplayer); } } diff --git a/src/main/java/mekanism/common/network/PacketEditFilter.java b/src/main/java/mekanism/common/network/PacketEditFilter.java index 49280a708..23c12a26f 100644 --- a/src/main/java/mekanism/common/network/PacketEditFilter.java +++ b/src/main/java/mekanism/common/network/PacketEditFilter.java @@ -1,5 +1,7 @@ package mekanism.common.network; +import io.netty.buffer.ByteBuf; + import java.util.ArrayList; import mekanism.api.Coord4D; @@ -11,7 +13,8 @@ import mekanism.common.network.PacketEditFilter.EditFilterMessage; import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.tile.TileEntityDigitalMiner; import mekanism.common.tile.TileEntityLogisticalSorter; - +import mekanism.common.tile.TileEntityOredictionificator; +import mekanism.common.tile.TileEntityOredictionificator.OredictionificatorFilter; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.world.World; @@ -20,8 +23,6 @@ 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 io.netty.buffer.ByteBuf; - public class PacketEditFilter implements IMessageHandler { @Override @@ -77,6 +78,29 @@ public class PacketEditFilter implements IMessageHandler { @Override @@ -53,6 +54,17 @@ public class PacketNewFilter implements IMessageHandler filters = new HashList(); + + public RedstoneControl controlType = RedstoneControl.DISABLED; + public TileEntityOredictionificator() { super(MachineType.OREDICTIONIFICATOR.name); + + inventory = new ItemStack[2]; + doAutoSync = false; } @Override public void onUpdate() { + if(!worldObj.isRemote) + { + if(playersUsing.size() > 0) + { + for(EntityPlayer player : playersUsing) + { + Mekanism.packetHandler.sendTo(new TileEntityMessage(Coord4D.get(this), getGenericPacket(new ArrayList())), (EntityPlayerMP)player); + } + } + } + } + + @Override + public void writeToNBT(NBTTagCompound nbtTags) + { + super.writeToNBT(nbtTags); + + nbtTags.setInteger("controlType", controlType.ordinal()); + + NBTTagList filterTags = new NBTTagList(); + + for(OredictionificatorFilter filter : filters) + { + NBTTagCompound tagCompound = new NBTTagCompound(); + filter.write(tagCompound); + filterTags.appendTag(tagCompound); + } + + if(filterTags.tagCount() != 0) + { + nbtTags.setTag("filters", filterTags); + } + } + + @Override + public void readFromNBT(NBTTagCompound nbtTags) + { + super.readFromNBT(nbtTags); + + controlType = RedstoneControl.values()[nbtTags.getInteger("controlType")]; + + if(nbtTags.hasKey("filters")) + { + NBTTagList tagList = nbtTags.getTagList("filters", NBT.TAG_COMPOUND); + + for(int i = 0; i < tagList.tagCount(); i++) + { + filters.add(OredictionificatorFilter.readFromNBT((NBTTagCompound)tagList.getCompoundTagAt(i))); + } + } + } + + @Override + public void handlePacketData(ByteBuf dataStream) + { + super.handlePacketData(dataStream); + + int type = dataStream.readInt(); + + if(type == 0) + { + controlType = RedstoneControl.values()[dataStream.readInt()]; + + filters.clear(); + + int amount = dataStream.readInt(); + + for(int i = 0; i < amount; i++) + { + filters.add(OredictionificatorFilter.readFromPacket(dataStream)); + } + } + else if(type == 1) + { + controlType = RedstoneControl.values()[dataStream.readInt()]; + } + else if(type == 2) + { + filters.clear(); + + int amount = dataStream.readInt(); + + for(int i = 0; i < amount; i++) + { + filters.add(OredictionificatorFilter.readFromPacket(dataStream)); + } + } + } + + @Override + public ArrayList getNetworkedData(ArrayList data) + { + super.getNetworkedData(data); + + data.add(0); + + data.add(controlType.ordinal()); + + data.add(filters.size()); + + for(OredictionificatorFilter filter : filters) + { + filter.write(data); + } + + return data; + } + + public ArrayList getGenericPacket(ArrayList data) + { + super.getNetworkedData(data); + + data.add(1); + + data.add(controlType.ordinal()); + + return data; + + } + + public ArrayList getFilterPacket(ArrayList data) + { + super.getNetworkedData(data); + + data.add(2); + + data.add(filters.size()); + + for(OredictionificatorFilter filter : filters) + { + filter.write(data); + } + + return data; + } + + @Override + public void openInventory() + { + if(!worldObj.isRemote) + { + Mekanism.packetHandler.sendToReceivers(new TileEntityMessage(Coord4D.get(this), getFilterPacket(new ArrayList())), new Range4D(Coord4D.get(this))); + } + } + + @Override + public NBTTagCompound getFilterData(NBTTagCompound nbtTags) + { + nbtTags.setInteger("controlType", controlType.ordinal()); + + NBTTagList filterTags = new NBTTagList(); + + for(OredictionificatorFilter filter : filters) + { + NBTTagCompound tagCompound = new NBTTagCompound(); + filter.write(tagCompound); + filterTags.appendTag(tagCompound); + } + + if(filterTags.tagCount() != 0) + { + nbtTags.setTag("filters", filterTags); + } + return nbtTags; + } + + @Override + public void setFilterData(NBTTagCompound nbtTags) + { + controlType = RedstoneControl.values()[nbtTags.getInteger("controlType")]; + + if(nbtTags.hasKey("filters")) + { + NBTTagList tagList = nbtTags.getTagList("filters", NBT.TAG_COMPOUND); + + for(int i = 0; i < tagList.tagCount(); i++) + { + filters.add(OredictionificatorFilter.readFromNBT((NBTTagCompound)tagList.getCompoundTagAt(i))); + } + } + } + + @Override + public String getDataType() + { + return "tooltip.filterCard.oredictionificator"; + } + + @Override + public void writeSustainedData(ItemStack itemStack) + { + itemStack.stackTagCompound.setBoolean("hasOredictionificatorConfig", true); + + NBTTagList filterTags = new NBTTagList(); + + for(OredictionificatorFilter filter : filters) + { + NBTTagCompound tagCompound = new NBTTagCompound(); + filter.write(tagCompound); + filterTags.appendTag(tagCompound); + } + + if(filterTags.tagCount() != 0) + { + itemStack.stackTagCompound.setTag("filters", filterTags); + } + } + + @Override + public void readSustainedData(ItemStack itemStack) + { + if(itemStack.stackTagCompound.hasKey("hasOredictionificatorConfig")) + { + if(itemStack.stackTagCompound.hasKey("filters")) + { + NBTTagList tagList = itemStack.stackTagCompound.getTagList("filters", NBT.TAG_COMPOUND); + + for(int i = 0; i < tagList.tagCount(); i++) + { + filters.add(OredictionificatorFilter.readFromNBT((NBTTagCompound)tagList.getCompoundTagAt(i))); + } + } + } + } + + @Override + public RedstoneControl getControlType() + { + return controlType; + } + + @Override + public void setControlType(RedstoneControl type) + { + controlType = type; + } + + @Override + public boolean canPulse() + { + return true; + } + + public static class OredictionificatorFilter + { + public String filter; + public int index; + + public void write(NBTTagCompound nbtTags) + { + nbtTags.setString("filter", filter); + nbtTags.setInteger("index", index); + } + + protected void read(NBTTagCompound nbtTags) + { + filter = nbtTags.getString("filter"); + index = nbtTags.getInteger("index"); + } + + public void write(ArrayList data) + { + data.add(filter); + data.add(index); + } + + protected void read(ByteBuf dataStream) + { + filter = PacketHandler.readString(dataStream); + index = dataStream.readInt(); + } + + public static OredictionificatorFilter readFromNBT(NBTTagCompound nbtTags) + { + OredictionificatorFilter filter = new OredictionificatorFilter(); + + filter.read(nbtTags); + + return filter; + } + + public static OredictionificatorFilter readFromPacket(ByteBuf dataStream) + { + OredictionificatorFilter filter = new OredictionificatorFilter(); + + filter.read(dataStream); + + return filter; + } + + @Override + public int hashCode() + { + int code = 1; + code = 31 * code + filter.hashCode(); + return code; + } + + @Override + public boolean equals(Object filter) + { + return filter instanceof OredictionificatorFilter && ((OredictionificatorFilter)filter).filter.equals(filter); + } } } diff --git a/src/main/resources/assets/mekanism/gui/GuiOredictionificator.png b/src/main/resources/assets/mekanism/gui/GuiOredictionificator.png index 01a8eaa67fb1ad0f1767d2437b4f7dd95f381592..bd127f56b2090c852542758348200005ac5f5766 100644 GIT binary patch delta 3028 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 YA`7d_cW$V%UPl1L70b(2m)sxx3!gv3+W-In literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/mekanism/lang/en_US.lang b/src/main/resources/assets/mekanism/lang/en_US.lang index 59bd5a43b..eb5849eba 100644 --- a/src/main/resources/assets/mekanism/lang/en_US.lang +++ b/src/main/resources/assets/mekanism/lang/en_US.lang @@ -629,6 +629,7 @@ tooltip.filterCard.set=Injected filter data of type %s tooltip.filterCard.unequal=Unequal filter data formats tooltip.filterCard.logisticalSorter=Logistical Sorter tooltip.filterCard.digitalMiner=Digital Miner +tooltip.filterCard.oredictionificator=Oredictionificator tooltip.balloon=Balloon