From f8f8dfa737d5180ea635004299bac5c8f2a01711 Mon Sep 17 00:00:00 2001 From: aidancbrady Date: Fri, 4 Mar 2016 13:14:48 -0500 Subject: [PATCH] More work on entangloporters --- .../java/mekanism/client/ClientProxy.java | 6 +- .../client/gui/GuiQuantumEntangloporter.java | 338 +++++++++++++++++- .../java/mekanism/common/CommonProxy.java | 4 +- src/main/java/mekanism/common/Mekanism.java | 4 +- .../mekanism/common/block/BlockMachine.java | 4 +- .../entangloporter/InventoryFrequency.java | 25 -- .../common/frequency/FrequencyManager.java | 16 +- .../ContainerQuantumEntangloporter.java | 102 ++++++ .../tile/TileEntityQuantumEntangloporter.java | 4 +- .../common/tile/TileEntityTeleporter.java | 3 +- .../assets/mekanism/gui/GuiTeleporter.png | Bin 5923 -> 5928 bytes 11 files changed, 463 insertions(+), 43 deletions(-) create mode 100644 src/main/java/mekanism/common/inventory/container/ContainerQuantumEntangloporter.java diff --git a/src/main/java/mekanism/client/ClientProxy.java b/src/main/java/mekanism/client/ClientProxy.java index bfa116de1..482cb167e 100644 --- a/src/main/java/mekanism/client/ClientProxy.java +++ b/src/main/java/mekanism/client/ClientProxy.java @@ -28,7 +28,6 @@ import mekanism.client.gui.GuiElectrolyticSeparator; import mekanism.client.gui.GuiEnergizedSmelter; import mekanism.client.gui.GuiEnergyCube; import mekanism.client.gui.GuiEnrichmentChamber; -import mekanism.client.gui.GuiEntangledBlock; import mekanism.client.gui.GuiFactory; import mekanism.client.gui.GuiFluidTank; import mekanism.client.gui.GuiFluidicPlenisher; @@ -45,6 +44,7 @@ import mekanism.client.gui.GuiPasswordEnter; import mekanism.client.gui.GuiPasswordModify; import mekanism.client.gui.GuiPrecisionSawmill; import mekanism.client.gui.GuiPurificationChamber; +import mekanism.client.gui.GuiQuantumEntangloporter; import mekanism.client.gui.GuiResistiveHeater; import mekanism.client.gui.GuiRobitCrafting; import mekanism.client.gui.GuiRobitInventory; @@ -148,7 +148,6 @@ import mekanism.common.tile.TileEntityEliteFactory; import mekanism.common.tile.TileEntityEnergizedSmelter; import mekanism.common.tile.TileEntityEnergyCube; import mekanism.common.tile.TileEntityEnrichmentChamber; -import mekanism.common.tile.TileEntityQuantumEntangloporter; import mekanism.common.tile.TileEntityFactory; import mekanism.common.tile.TileEntityFluidTank; import mekanism.common.tile.TileEntityFluidicPlenisher; @@ -169,6 +168,7 @@ import mekanism.common.tile.TileEntityOsmiumCompressor; import mekanism.common.tile.TileEntityPRC; import mekanism.common.tile.TileEntityPrecisionSawmill; import mekanism.common.tile.TileEntityPurificationChamber; +import mekanism.common.tile.TileEntityQuantumEntangloporter; import mekanism.common.tile.TileEntityResistiveHeater; import mekanism.common.tile.TileEntityRotaryCondensentrator; import mekanism.common.tile.TileEntitySeismicVibrator; @@ -510,7 +510,7 @@ public class ClientProxy extends CommonProxy case 45: return new GuiLaserTractorBeam(player.inventory, (TileEntityLaserTractorBeam)tileEntity); case 46: - return new GuiEntangledBlock(player.inventory, (TileEntityQuantumEntangloporter)tileEntity); + return new GuiQuantumEntangloporter(player.inventory, (TileEntityQuantumEntangloporter)tileEntity); case 47: return new GuiSolarNeutronActivator(player.inventory, (TileEntitySolarNeutronActivator)tileEntity); case 48: diff --git a/src/main/java/mekanism/client/gui/GuiQuantumEntangloporter.java b/src/main/java/mekanism/client/gui/GuiQuantumEntangloporter.java index 6c5bc02df..e6a1a9d47 100644 --- a/src/main/java/mekanism/client/gui/GuiQuantumEntangloporter.java +++ b/src/main/java/mekanism/client/gui/GuiQuantumEntangloporter.java @@ -1,5 +1,341 @@ package mekanism.client.gui; -public class GuiQuantumEntangloporter { +import java.util.ArrayList; +import java.util.List; +import mekanism.api.Coord4D; +import mekanism.api.EnumColor; +import mekanism.client.gui.element.GuiScrollList; +import mekanism.client.gui.element.GuiSideConfigurationTab; +import mekanism.client.gui.element.GuiTransporterConfigTab; +import mekanism.client.sound.SoundHandler; +import mekanism.common.Mekanism; +import mekanism.common.frequency.Frequency; +import mekanism.common.inventory.container.ContainerQuantumEntangloporter; +import mekanism.common.network.PacketPortableTeleporter.PortableTeleporterMessage; +import mekanism.common.network.PacketPortableTeleporter.PortableTeleporterPacketType; +import mekanism.common.network.PacketTileEntity.TileEntityMessage; +import mekanism.common.tile.TileEntityQuantumEntangloporter; +import mekanism.common.util.LangUtils; +import mekanism.common.util.MekanismUtils; +import mekanism.common.util.MekanismUtils.ResourceType; +import net.minecraft.client.gui.GuiButton; +import net.minecraft.client.gui.GuiTextField; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.InventoryPlayer; +import net.minecraft.util.ResourceLocation; + +import org.lwjgl.input.Keyboard; +import org.lwjgl.opengl.GL11; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + +@SideOnly(Side.CLIENT) +public class GuiQuantumEntangloporter extends GuiMekanism +{ + public static int MAX_LENGTH = 16; + + public ResourceLocation resource; + + public TileEntityQuantumEntangloporter tileEntity; + + public EntityPlayer entityPlayer; + + public GuiButton publicButton; + public GuiButton privateButton; + + public GuiButton setButton; + public GuiButton deleteButton; + + public GuiButton teleportButton; + + public GuiScrollList scrollList; + + public GuiTextField frequencyField; + + public boolean privateMode; + + public GuiQuantumEntangloporter(InventoryPlayer inventory, TileEntityQuantumEntangloporter tentity) + { + super(tentity, new ContainerQuantumEntangloporter(inventory, tentity)); + tileEntity = tentity; + resource = MekanismUtils.getResource(ResourceType.GUI, "GuiTeleporter.png"); + + guiElements.add(scrollList = new GuiScrollList(this, resource, 28, 37, 120, 4)); + guiElements.add(new GuiSideConfigurationTab(this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiTeleporter.png"))); + guiElements.add(new GuiTransporterConfigTab(this, 34, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiTeleporter.png"))); + + if(tileEntity.frequency != null) + { + privateMode = !tileEntity.frequency.publicFreq; + } + + ySize+=64; + } + + @Override + public void initGui() + { + super.initGui(); + + int guiWidth = (width - xSize) / 2; + int guiHeight = (height - ySize) / 2; + + buttonList.clear(); + + publicButton = new GuiButton(0, guiWidth + 27, guiHeight + 14, 60, 20, LangUtils.localize("gui.public")); + privateButton = new GuiButton(1, guiWidth + 89, guiHeight + 14, 60, 20, LangUtils.localize("gui.private")); + + setButton = new GuiButton(2, guiWidth + 27, guiHeight + 116, 60, 20, LangUtils.localize("gui.set")); + deleteButton = new GuiButton(3, guiWidth + 89, guiHeight + 116, 60, 20, LangUtils.localize("gui.delete")); + + frequencyField = new GuiTextField(fontRendererObj, guiWidth + 50, guiHeight + 104, 86, 11); + frequencyField.setMaxStringLength(MAX_LENGTH); + frequencyField.setEnableBackgroundDrawing(false); + + updateButtons(); + + buttonList.add(publicButton); + buttonList.add(privateButton); + buttonList.add(setButton); + buttonList.add(deleteButton); + } + + public void setFrequency(String freq) + { + if(freq.isEmpty()) + { + return; + } + + ArrayList data = new ArrayList(); + data.add(0); + data.add(freq); + data.add(!privateMode); + + Mekanism.packetHandler.sendToServer(new TileEntityMessage(Coord4D.get(tileEntity), data)); + } + + public String getSecurity(Frequency freq) + { + return !freq.publicFreq ? EnumColor.DARK_RED + LangUtils.localize("gui.private") : LangUtils.localize("gui.public"); + } + + public void updateButtons() + { + if(tileEntity.owner == null) + { + return; + } + + List text = new ArrayList(); + + if(privateMode) + { + for(Frequency freq : tileEntity.privateCache) + { + text.add(freq.name); + } + } + else { + for(Frequency freq : tileEntity.publicCache) + { + text.add(freq.name + " (" + freq.owner + ")"); + } + } + + scrollList.setText(text); + + if(privateMode) + { + publicButton.enabled = true; + privateButton.enabled = false; + } + else { + publicButton.enabled = false; + privateButton.enabled = true; + } + + if(scrollList.hasSelection()) + { + Frequency freq = privateMode ? tileEntity.privateCache.get(scrollList.selected) : tileEntity.publicCache.get(scrollList.selected); + + if(tileEntity.getFrequency() == null || !tileEntity.getFrequency().equals(freq)) + { + setButton.enabled = true; + } + else { + setButton.enabled = false; + } + + if(tileEntity.owner.equals(freq.owner)) + { + deleteButton.enabled = true; + } + else { + deleteButton.enabled = false; + } + } + else { + setButton.enabled = false; + deleteButton.enabled = false; + } + } + + @Override + public void updateScreen() + { + super.updateScreen(); + + updateButtons(); + + frequencyField.updateCursorCounter(); + } + + @Override + public void mouseClicked(int mouseX, int mouseY, int button) + { + super.mouseClicked(mouseX, mouseY, button); + + updateButtons(); + + frequencyField.mouseClicked(mouseX, mouseY, button); + + if(button == 0) + { + int xAxis = (mouseX - (width - xSize) / 2); + int yAxis = (mouseY - (height - ySize) / 2); + + if(xAxis >= 137 && xAxis <= 148 && yAxis >= 103 && yAxis <= 114) + { + setFrequency(frequencyField.getText()); + frequencyField.setText(""); + SoundHandler.playSound("gui.button.press"); + } + } + } + + @Override + public void keyTyped(char c, int i) + { + if(!frequencyField.isFocused() || i == Keyboard.KEY_ESCAPE) + { + super.keyTyped(c, i); + } + + if(i == Keyboard.KEY_RETURN) + { + if(frequencyField.isFocused()) + { + setFrequency(frequencyField.getText()); + frequencyField.setText(""); + } + } + + if(Character.isDigit(c) || Character.isLetter(c) || i == Keyboard.KEY_BACK || i == Keyboard.KEY_DELETE || i == Keyboard.KEY_LEFT || i == Keyboard.KEY_RIGHT) + { + frequencyField.textboxKeyTyped(c, i); + } + + updateButtons(); + } + + @Override + protected void actionPerformed(GuiButton guibutton) + { + super.actionPerformed(guibutton); + + if(guibutton.id == 0) + { + privateMode = false; + } + else if(guibutton.id == 1) + { + privateMode = true; + } + else if(guibutton.id == 2) + { + int selection = scrollList.getSelection(); + + if(selection != -1) + { + Frequency freq = privateMode ? tileEntity.privateCache.get(selection) : tileEntity.publicCache.get(selection); + setFrequency(freq.name); + } + } + else if(guibutton.id == 3) + { + int selection = scrollList.getSelection(); + + if(selection != -1) + { + Frequency freq = privateMode ? tileEntity.privateCache.get(selection) : tileEntity.publicCache.get(selection); + + if(tileEntity != null) + { + ArrayList data = new ArrayList(); + data.add(1); + data.add(freq.name); + data.add(freq.publicFreq); + + Mekanism.packetHandler.sendToServer(new TileEntityMessage(Coord4D.get(tileEntity), data)); + } + else { + Mekanism.packetHandler.sendToServer(new PortableTeleporterMessage(PortableTeleporterPacketType.DEL_FREQ, freq)); + Mekanism.packetHandler.sendToServer(new PortableTeleporterMessage(PortableTeleporterPacketType.DATA_REQUEST, null)); + } + + scrollList.selected = -1; + } + } + + updateButtons(); + } + + @Override + protected void drawGuiContainerForegroundLayer(int mouseX, int mouseY) + { + int xAxis = (mouseX-(width-xSize)/2); + int yAxis = (mouseY-(height-ySize)/2); + + fontRendererObj.drawString(tileEntity.getInventoryName(), (xSize/2)-(fontRendererObj.getStringWidth(tileEntity.getInventoryName())/2), 4, 0x404040); + fontRendererObj.drawString(LangUtils.localize("gui.owner") + ": " + (tileEntity.owner != null ? tileEntity.owner : LangUtils.localize("gui.none")), 8, (ySize-96)+4, 0x404040); + + fontRendererObj.drawString(LangUtils.localize("gui.freq") + ":", 32, 81, 0x404040); + fontRendererObj.drawString(LangUtils.localize("gui.security") + ":", 32, 91, 0x404040); + + fontRendererObj.drawString(" " + (tileEntity.getFrequency() != null ? tileEntity.getFrequency().name : EnumColor.DARK_RED + LangUtils.localize("gui.none")), 32 + fontRendererObj.getStringWidth(LangUtils.localize("gui.freq") + ":"), 81, 0x797979); + fontRendererObj.drawString(" " + (tileEntity.getFrequency() != null ? getSecurity(tileEntity.getFrequency()) : EnumColor.DARK_RED + LangUtils.localize("gui.none")), 32 + fontRendererObj.getStringWidth(LangUtils.localize("gui.security") + ":"), 91, 0x797979); + + String str = LangUtils.localize("gui.set") + ":"; + renderScaledText(str, 27, 104, 0x404040, 20); + + super.drawGuiContainerForegroundLayer(mouseX, mouseY); + } + + @Override + protected void drawGuiContainerBackgroundLayer(float partialTick, int mouseX, int mouseY) + { + mc.renderEngine.bindTexture(resource); + GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); + int guiWidth = (width-xSize)/2; + int guiHeight = (height-ySize)/2; + drawTexturedModalRect(guiWidth, guiHeight, 0, 0, xSize, ySize); + + int xAxis = (mouseX - (width - xSize) / 2); + int yAxis = (mouseY - (height - ySize) / 2); + + if(xAxis >= 137 && xAxis <= 148 && yAxis >= 103 && yAxis <= 114) + { + drawTexturedModalRect(guiWidth + 137, guiHeight + 103, xSize, 0, 11, 11); + } + else { + drawTexturedModalRect(guiWidth + 137, guiHeight + 103, xSize, 11, 11, 11); + } + + super.drawGuiContainerBackgroundLayer(partialTick, mouseX, mouseY); + + frequencyField.drawTextBox(); + } } diff --git a/src/main/java/mekanism/common/CommonProxy.java b/src/main/java/mekanism/common/CommonProxy.java index d62938b70..c6ebe7984 100644 --- a/src/main/java/mekanism/common/CommonProxy.java +++ b/src/main/java/mekanism/common/CommonProxy.java @@ -42,6 +42,7 @@ import mekanism.common.inventory.container.ContainerMetallurgicInfuser; import mekanism.common.inventory.container.ContainerNull; import mekanism.common.inventory.container.ContainerOredictionificator; import mekanism.common.inventory.container.ContainerPRC; +import mekanism.common.inventory.container.ContainerQuantumEntangloporter; import mekanism.common.inventory.container.ContainerResistiveHeater; import mekanism.common.inventory.container.ContainerRobitCrafting; import mekanism.common.inventory.container.ContainerRobitInventory; @@ -104,6 +105,7 @@ import mekanism.common.tile.TileEntityOsmiumCompressor; import mekanism.common.tile.TileEntityPRC; import mekanism.common.tile.TileEntityPrecisionSawmill; import mekanism.common.tile.TileEntityPurificationChamber; +import mekanism.common.tile.TileEntityQuantumEntangloporter; import mekanism.common.tile.TileEntityResistiveHeater; import mekanism.common.tile.TileEntityRotaryCondensentrator; import mekanism.common.tile.TileEntitySeismicVibrator; @@ -528,7 +530,7 @@ public class CommonProxy implements IGuiProvider case 45: return new ContainerLaserTractorBeam(player.inventory, (TileEntityLaserTractorBeam)tileEntity); case 46: - return new ContainerNull(player, (TileEntityContainerBlock)tileEntity); + return new ContainerQuantumEntangloporter(player.inventory, (TileEntityQuantumEntangloporter)tileEntity); case 47: return new ContainerSolarNeutronActivator(player.inventory, (TileEntitySolarNeutronActivator)tileEntity); case 48: diff --git a/src/main/java/mekanism/common/Mekanism.java b/src/main/java/mekanism/common/Mekanism.java index 766e2d7f2..c8445f29c 100644 --- a/src/main/java/mekanism/common/Mekanism.java +++ b/src/main/java/mekanism/common/Mekanism.java @@ -175,10 +175,10 @@ public class Mekanism public static MultiblockManager boilerManager = new MultiblockManager("thermoelectricBoiler"); /** FrequencyManagers for various networks */ - public static FrequencyManager publicTeleporters = new FrequencyManager(Frequency.class); + public static FrequencyManager publicTeleporters = new FrequencyManager(Frequency.class, "Teleporter"); public static Map privateTeleporters = new HashMap(); - public static FrequencyManager publicEntangloporters = new FrequencyManager(InventoryFrequency.class); + public static FrequencyManager publicEntangloporters = new FrequencyManager(InventoryFrequency.class, "Entangloporter"); public static Map privateEntangloporters = new HashMap(); /** Mekanism creative tab */ diff --git a/src/main/java/mekanism/common/block/BlockMachine.java b/src/main/java/mekanism/common/block/BlockMachine.java index ea0069887..a5bb7d046 100644 --- a/src/main/java/mekanism/common/block/BlockMachine.java +++ b/src/main/java/mekanism/common/block/BlockMachine.java @@ -223,7 +223,7 @@ public class BlockMachine extends BlockContainer implements ISpecialBounds, IBlo MekanismRenderer.loadDynamicTextures(register, MachineType.PRECISION_SAWMILL.name, icons[5], def); break; case MACHINE_BLOCK_3: - icons[0][0] = register.registerIcon("mekanism:AmbientAccumulator"); + icons[0][0] = BASE_ICON; icons[2][0] = BASE_ICON; icons[4][0] = BASE_ICON; MekanismRenderer.loadDynamicTextures(register, MachineType.OREDICTIONIFICATOR.name, icons[3], DefIcon.getAll(register.registerIcon("mekanism:OredictionificatorSide"))); @@ -1224,7 +1224,7 @@ public class BlockMachine extends BlockContainer implements ISpecialBounds, IBlo for(MachineType type : MachineType.values()) { - if(type != QUANTUM_ENTANGLOPORTER && type != AMBIENT_ACCUMULATOR) + if(type != AMBIENT_ACCUMULATOR) { ret.add(type); } diff --git a/src/main/java/mekanism/common/content/entangloporter/InventoryFrequency.java b/src/main/java/mekanism/common/content/entangloporter/InventoryFrequency.java index e42c9ee61..e59a6ca92 100644 --- a/src/main/java/mekanism/common/content/entangloporter/InventoryFrequency.java +++ b/src/main/java/mekanism/common/content/entangloporter/InventoryFrequency.java @@ -3,12 +3,9 @@ package mekanism.common.content.entangloporter; import io.netty.buffer.ByteBuf; import java.util.ArrayList; -import java.util.HashMap; -import java.util.Map; import mekanism.api.gas.GasStack; import mekanism.api.gas.GasTank; -import mekanism.api.transmitters.TransmissionType; import mekanism.common.frequency.Frequency; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; @@ -26,8 +23,6 @@ public class InventoryFrequency extends Frequency public ItemStack storedItem; public double temperature; - public Map transmissions = new HashMap(); - public InventoryFrequency(String n, String o) { super(n, o); @@ -66,11 +61,6 @@ public class InventoryFrequency extends Frequency } nbtTags.setDouble("temperature", temperature); - - for(TransmissionType type : TransmissionType.values()) - { - nbtTags.setInteger("transmission" + type.ordinal(), transmissions.get(type).ordinal()); - } } @Override @@ -96,11 +86,6 @@ public class InventoryFrequency extends Frequency } temperature = nbtTags.getDouble("temperature"); - - for(TransmissionType type : TransmissionType.values()) - { - transmissions.put(type, TransferType.values()[nbtTags.getInteger("transmission" + type.ordinal())]); - } } @Override @@ -131,11 +116,6 @@ public class InventoryFrequency extends Frequency } data.add(temperature); - - for(TransmissionType type : TransmissionType.values()) - { - data.add(transmissions.get(type).ordinal()); - } } @Override @@ -162,11 +142,6 @@ public class InventoryFrequency extends Frequency } temperature = dataStream.readDouble(); - - for(TransmissionType type : TransmissionType.values()) - { - transmissions.put(type, TransferType.values()[dataStream.readInt()]); - } } public static enum TransferType diff --git a/src/main/java/mekanism/common/frequency/FrequencyManager.java b/src/main/java/mekanism/common/frequency/FrequencyManager.java index c0bcc29a4..de97292f6 100644 --- a/src/main/java/mekanism/common/frequency/FrequencyManager.java +++ b/src/main/java/mekanism/common/frequency/FrequencyManager.java @@ -28,17 +28,21 @@ public class FrequencyManager private String owner; + private String name; + private Class frequencyClass; - public FrequencyManager(Class c) + public FrequencyManager(Class c, String n) { frequencyClass = c; + name = n; + managers.add(this); } - public FrequencyManager(Class c, String s) + public FrequencyManager(Class c, String n, String s) { - this(c); + this(c, n); owner = s; } @@ -173,9 +177,9 @@ public class FrequencyManager } } - public static FrequencyManager loadOnly(World world, String owner, Class freqClass) + public static FrequencyManager loadOnly(World world, String owner, Class freqClass, String n) { - FrequencyManager manager = new FrequencyManager(freqClass); + FrequencyManager manager = new FrequencyManager(freqClass, n); String name = manager.getName(); FrequencyDataHandler handler = (FrequencyDataHandler)world.perWorldStorage.loadData(FrequencyDataHandler.class, name); @@ -295,7 +299,7 @@ public class FrequencyManager public String getName() { - return owner != null ? owner + "FrequencyHandler" : "FrequencyHandler"; + return owner != null ? (owner + "_" + name + "FrequencyHandler") : (name + "FrequencyHandler"); } public static void reset() diff --git a/src/main/java/mekanism/common/inventory/container/ContainerQuantumEntangloporter.java b/src/main/java/mekanism/common/inventory/container/ContainerQuantumEntangloporter.java new file mode 100644 index 000000000..e43016c93 --- /dev/null +++ b/src/main/java/mekanism/common/inventory/container/ContainerQuantumEntangloporter.java @@ -0,0 +1,102 @@ +package mekanism.common.inventory.container; + +import mekanism.common.tile.TileEntityQuantumEntangloporter; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.InventoryPlayer; +import net.minecraft.inventory.Container; +import net.minecraft.inventory.Slot; +import net.minecraft.item.ItemStack; + +public class ContainerQuantumEntangloporter extends Container +{ + private TileEntityQuantumEntangloporter tileEntity; + + public ContainerQuantumEntangloporter(InventoryPlayer inventory, TileEntityQuantumEntangloporter tentity) + { + tileEntity = tentity; + + 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); + } + + @Override + public ItemStack transferStackInSlot(EntityPlayer player, int slotID) + { + ItemStack stack = null; + Slot currentSlot = (Slot)inventorySlots.get(slotID); + + if(currentSlot != null && currentSlot.getHasStack()) + { + ItemStack slotStack = currentSlot.getStack(); + stack = slotStack.copy(); + + if(slotID >= 0 && slotID <= 26) + { + if(!mergeItemStack(slotStack, 27, inventorySlots.size(), false)) + { + return null; + } + } + else if(slotID > 26) + { + if(!mergeItemStack(slotStack, 0, 26, false)) + { + return null; + } + } + else { + if(!mergeItemStack(slotStack, 0, inventorySlots.size(), true)) + { + return null; + } + } + + if(slotStack.stackSize == 0) + { + currentSlot.putStack((ItemStack)null); + } + else { + currentSlot.onSlotChanged(); + } + + if(slotStack.stackSize == stack.stackSize) + { + return null; + } + + currentSlot.onPickupFromSlot(player, slotStack); + } + + return stack; + } +} diff --git a/src/main/java/mekanism/common/tile/TileEntityQuantumEntangloporter.java b/src/main/java/mekanism/common/tile/TileEntityQuantumEntangloporter.java index b632ba822..bb4a40b1f 100644 --- a/src/main/java/mekanism/common/tile/TileEntityQuantumEntangloporter.java +++ b/src/main/java/mekanism/common/tile/TileEntityQuantumEntangloporter.java @@ -62,7 +62,7 @@ public class TileEntityQuantumEntangloporter extends TileEntityElectricBlock imp { super("QuantumEntangloporter", 0); - configComponent = new TileComponentConfig(this, TransmissionType.ITEM, TransmissionType.ENERGY); + configComponent = new TileComponentConfig(this, TransmissionType.ITEM, TransmissionType.FLUID, TransmissionType.GAS, TransmissionType.ENERGY, TransmissionType.HEAT); for(TransmissionType type : TransmissionType.values()) { @@ -190,7 +190,7 @@ public class TileEntityQuantumEntangloporter extends TileEntityElectricBlock imp } } - Frequency freq = new Frequency(name, owner).setPublic(publicFreq); + Frequency freq = new InventoryFrequency(name, owner).setPublic(publicFreq); freq.activeCoords.add(Coord4D.get(this)); manager.addFrequency(freq); frequency = (InventoryFrequency)freq; diff --git a/src/main/java/mekanism/common/tile/TileEntityTeleporter.java b/src/main/java/mekanism/common/tile/TileEntityTeleporter.java index 8b0155f9f..3e1138ef1 100644 --- a/src/main/java/mekanism/common/tile/TileEntityTeleporter.java +++ b/src/main/java/mekanism/common/tile/TileEntityTeleporter.java @@ -179,6 +179,7 @@ public class TileEntityTeleporter extends TileEntityElectricBlock implements ICo { frequency = freq; frequency.activeCoords.add(Coord4D.get(this)); + return; } } @@ -221,7 +222,7 @@ public class TileEntityTeleporter extends TileEntityElectricBlock implements ICo return Mekanism.privateTeleporters.get(owner); } - return FrequencyManager.loadOnly(world, owner, Frequency.class); + return FrequencyManager.loadOnly(world, owner, Frequency.class, "Teleporter"); } @Override diff --git a/src/main/resources/assets/mekanism/gui/GuiTeleporter.png b/src/main/resources/assets/mekanism/gui/GuiTeleporter.png index 3ddea9267e77f51dafda44981883028cf6da9a7b..1c32f08b0b3b7d1ee3cf18d0c8ca6d64e53c7df2 100644 GIT binary patch literal 5928 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