diff --git a/src/main/java/com/glodblock/github/FluidCraft.java b/src/main/java/com/glodblock/github/FluidCraft.java index 0360725f..39b06b1b 100644 --- a/src/main/java/com/glodblock/github/FluidCraft.java +++ b/src/main/java/com/glodblock/github/FluidCraft.java @@ -28,7 +28,7 @@ import cpw.mods.fml.common.network.NetworkRegistry; modid = FluidCraft.MODID, version = FluidCraft.VERSION, name = FluidCraft.MODNAME, - dependencies = "required-after:appliedenergistics2;required-after:CoFHCore;after:waila") + dependencies = "required-after:appliedenergistics2;required-after:CoFHCore;after:waila;after:thaumicenergistics;after:ae2wct") public class FluidCraft { public static final String MODID = "GRADLETOKEN_MODID"; @@ -72,7 +72,7 @@ public class FluidCraft { if (!Config.removeRecipe) { RecipeLoader.INSTANCE.run(); } - RecipeLoader.runWCTRecipe(); + RecipeLoader.runTerminalRecipe(); if (ModAndClassUtil.isV2) { CalculatorV2PluginLoader.installCalculatorV2Plugins(); diff --git a/src/main/java/com/glodblock/github/client/gui/GuiEssentiaTerminal.java b/src/main/java/com/glodblock/github/client/gui/GuiEssentiaTerminal.java new file mode 100644 index 00000000..8b1ed82c --- /dev/null +++ b/src/main/java/com/glodblock/github/client/gui/GuiEssentiaTerminal.java @@ -0,0 +1,109 @@ +package com.glodblock.github.client.gui; + +import java.util.HashMap; +import java.util.Map; +import java.util.Objects; + +import net.minecraft.client.gui.GuiButton; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.InventoryPlayer; +import net.minecraft.inventory.Slot; +import net.minecraft.item.ItemStack; +import net.minecraftforge.fluids.FluidStack; + +import appeng.api.storage.data.IAEFluidStack; +import appeng.api.storage.data.IAEItemStack; +import appeng.client.me.SlotME; +import appeng.client.render.AppEngRenderItem; + +import com.glodblock.github.FluidCraft; +import com.glodblock.github.client.gui.container.ContainerEssentiaMonitor; +import com.glodblock.github.client.me.EssentiaRepo; +import com.glodblock.github.common.item.ItemFluidDrop; +import com.glodblock.github.crossmod.thaumcraft.AspectRender; +import com.glodblock.github.crossmod.thaumcraft.AspectUtil; +import com.glodblock.github.inventory.InventoryHandler; +import com.glodblock.github.inventory.gui.GuiType; +import com.glodblock.github.inventory.item.IWirelessTerminal; +import com.glodblock.github.network.CPacketFluidUpdate; +import com.glodblock.github.util.Ae2ReflectClient; + +public class GuiEssentiaTerminal extends GuiFluidMonitor { + + private final AppEngRenderItem stackSizeRenderer = Ae2ReflectClient.getStackSizeRenderer(this); + protected EntityPlayer player; + + public GuiEssentiaTerminal(InventoryPlayer inventoryPlayer, IWirelessTerminal te) { + super(inventoryPlayer, te, new ContainerEssentiaMonitor(inventoryPlayer, te)); + this.repo = new EssentiaRepo(getScrollBar(), this); + this.player = inventoryPlayer.player; + } + + @Override + public void setTextFieldValue(String displayName, int mousex, int mousey, ItemStack stack) { + if (AspectUtil.getAspectFromJar(stack) != null) { + setSearchString(Objects.requireNonNull(AspectUtil.getAspectFromJar(stack)).getName(), true); + } + } + + @Override + public void func_146977_a(final Slot s) { + if (drawSlot0(s)) super.func_146977_a(s); + } + + public boolean drawSlot0(Slot slot) { + if (slot instanceof SlotME) { + IAEItemStack stack = ((SlotME) slot).getAEStack(); + if (stack == null) return true; + FluidStack fluidStack = ItemFluidDrop.getFluidStack(slot.getStack()); + AspectRender.drawAspect( + this.player, + slot.xDisplayPosition, + slot.yDisplayPosition, + this.zLevel, + AspectUtil.getAspectFromGas(fluidStack), + fluidStack.amount); + IAEItemStack gas = stack.copy().setStackSize(stack.getStackSize() / AspectUtil.R); + stackSizeRenderer.setAeStack(gas); + stackSizeRenderer.renderItemOverlayIntoGUI( + fontRendererObj, + mc.getTextureManager(), + gas.getItemStack(), + slot.xDisplayPosition, + slot.yDisplayPosition); + return false; + } + return true; + } + + @Override + protected void handleMouseClick(final Slot slot, final int slotIdx, final int ctrlDown, final int mouseButton) { + if (slot instanceof SlotME && AspectUtil.isEssentiaContainer(player.inventory.getItemStack())) { + Map tmp = new HashMap<>(); + ItemStack itemStack = this.player.inventory.getItemStack().copy(); + tmp.put(0, ItemFluidDrop.getAeFluidStack(((SlotME) slot).getAEStack())); + if (!isShiftKeyDown()) { + itemStack.stackSize = 1; + } + FluidCraft.proxy.netHandler.sendToServer(new CPacketFluidUpdate(tmp, itemStack)); + } + if (mouseButton == 3 && slot instanceof SlotME) { + return; + } + super.handleMouseClick(slot, slotIdx, ctrlDown, mouseButton); + } + + @Override + protected void actionPerformed(final GuiButton btn) { + if (btn == craftingStatusBtn) { + InventoryHandler.switchGui(GuiType.CRAFTING_STATUS); + } else { + super.actionPerformed(btn); + } + } + + public void update(ItemStack itemStack) { + this.player.inventory.setItemStack(itemStack); + } + +} diff --git a/src/main/java/com/glodblock/github/client/gui/GuiFCImgButton.java b/src/main/java/com/glodblock/github/client/gui/GuiFCImgButton.java index e6e7b8f0..b3c148b1 100644 --- a/src/main/java/com/glodblock/github/client/gui/GuiFCImgButton.java +++ b/src/main/java/com/glodblock/github/client/gui/GuiFCImgButton.java @@ -50,6 +50,10 @@ public class GuiFCImgButton extends GuiButton implements ITooltip { this.registerApp(4, "SUBMIT", "SUBMIT", "submit"); this.registerApp(6, "DISABLE", "DISABLE", "disable"); this.registerApp(7, "ENABLE", "ENABLE", "enable"); + this.registerApp(10, "FLUID_TEM", "YES", "fluid_terminal_w"); + this.registerApp(11, "CRAFT_TEM", "YES", "craft_terminal_w"); + this.registerApp(12, "PATTERN_TEM", "YES", "pattern_terminal_w"); + this.registerApp(13, "ESSENTIA_TEM", "YES", "essentia_terminal_w"); } } @@ -61,7 +65,8 @@ public class GuiFCImgButton extends GuiButton implements ITooltip { } else { a.displayValue = StatCollector.translateToLocal(prefix + title + ".hint"); } - a.index = iconIndex; + a.index = iconIndex % 10; + a.page = iconIndex / 10; appearances.put(new EnumPair(setting, val), a); } @@ -81,6 +86,17 @@ public class GuiFCImgButton extends GuiButton implements ITooltip { return 8; } + private int getIconPage() { + if (this.buttonSetting != null && this.currentValue != null) { + final ButtonAppearance app = appearances.get(new EnumPair(this.buttonSetting, this.currentValue)); + if (app == null) { + return 0; + } + return app.page; + } + return 0; + } + public String getSetting() { return this.buttonSetting; } @@ -184,6 +200,7 @@ public class GuiFCImgButton extends GuiButton implements ITooltip { public void drawButton(final Minecraft par1Minecraft, final int par2, final int par3) { if (this.visible) { final int iconIndex = this.getIconIndex(); + final int iconPage = this.getIconPage(); if (this.halfSize) { this.width = 8; @@ -199,7 +216,7 @@ public class GuiFCImgButton extends GuiButton implements ITooltip { GL11.glColor4f(0.5f, 0.5f, 0.5f, 1.0f); } - par1Minecraft.renderEngine.bindTexture(FluidCraft.resource("textures/gui/states.png")); + par1Minecraft.renderEngine.bindTexture(FluidCraft.resource("textures/gui/states" + iconPage + ".png")); this.field_146123_n = par2 >= this.xPosition && par3 >= this.yPosition && par2 < this.xPosition + this.width && par3 < this.yPosition + this.height; @@ -235,7 +252,7 @@ public class GuiFCImgButton extends GuiButton implements ITooltip { GL11.glColor4f(0.5f, 0.5f, 0.5f, 1.0f); } - par1Minecraft.renderEngine.bindTexture(FluidCraft.resource("textures/gui/states.png")); + par1Minecraft.renderEngine.bindTexture(FluidCraft.resource("textures/gui/states" + iconPage + ".png")); this.field_146123_n = par2 >= this.xPosition && par3 >= this.yPosition && par2 < this.xPosition + this.width && par3 < this.yPosition + this.height; @@ -296,6 +313,7 @@ public class GuiFCImgButton extends GuiButton implements ITooltip { private static class ButtonAppearance { public int index; + public int page; public String displayName; public String displayValue; } diff --git a/src/main/java/com/glodblock/github/client/gui/GuiFluidCraftAmount.java b/src/main/java/com/glodblock/github/client/gui/GuiFluidCraftAmount.java index 5b4f4ece..51548d96 100644 --- a/src/main/java/com/glodblock/github/client/gui/GuiFluidCraftAmount.java +++ b/src/main/java/com/glodblock/github/client/gui/GuiFluidCraftAmount.java @@ -10,10 +10,13 @@ import appeng.core.localization.GuiText; import com.glodblock.github.FluidCraft; import com.glodblock.github.client.gui.base.FCGuiAmount; +import com.glodblock.github.common.item.ItemWirelessUltraTerminal; import com.glodblock.github.common.parts.PartFluidPatternTerminal; import com.glodblock.github.common.parts.PartFluidPatternTerminalEx; import com.glodblock.github.common.parts.PartFluidTerminal; import com.glodblock.github.inventory.gui.GuiType; +import com.glodblock.github.inventory.item.IWirelessTerminal; +import com.glodblock.github.inventory.item.WirelessPatternTerminalInventory; import com.glodblock.github.loader.ItemAndBlockHolder; import com.glodblock.github.network.CPacketCraftRequest; @@ -64,14 +67,18 @@ public class GuiFluidCraftAmount extends FCGuiAmount { if (target instanceof PartFluidPatternTerminal) { this.myIcon = new ItemStack(ItemAndBlockHolder.FLUID_TERMINAL, 1); this.originalGui = GuiType.FLUID_PATTERN_TERMINAL; - } - if (target instanceof PartFluidPatternTerminalEx) { + } else if (target instanceof PartFluidPatternTerminalEx) { this.myIcon = new ItemStack(ItemAndBlockHolder.FLUID_TERMINAL_EX, 1); this.originalGui = GuiType.FLUID_PATTERN_TERMINAL_EX; - } - if (target instanceof PartFluidTerminal) { + } else if (target instanceof PartFluidTerminal) { this.myIcon = new ItemStack(ItemAndBlockHolder.FLUID_TERM, 1); this.originalGui = GuiType.FLUID_TERMINAL; + } else if (target instanceof IWirelessTerminal && ((IWirelessTerminal) target).isUniversal(target)) { + this.myIcon = new ItemStack(ItemAndBlockHolder.WIRELESS_ULTRA_TERM, 1); + this.originalGui = ItemWirelessUltraTerminal.readMode(((IWirelessTerminal) target).getItemStack()); + } else if (target instanceof WirelessPatternTerminalInventory) { + this.myIcon = new ItemStack(ItemAndBlockHolder.WIRELESS_PATTERN_TERM, 1); + this.originalGui = GuiType.FLUID_TERMINAL; } } diff --git a/src/main/java/com/glodblock/github/client/gui/GuiFluidCraftConfirm.java b/src/main/java/com/glodblock/github/client/gui/GuiFluidCraftConfirm.java index febf6194..f2a2c2b8 100644 --- a/src/main/java/com/glodblock/github/client/gui/GuiFluidCraftConfirm.java +++ b/src/main/java/com/glodblock/github/client/gui/GuiFluidCraftConfirm.java @@ -23,10 +23,13 @@ import appeng.util.Platform; import com.glodblock.github.FluidCraft; import com.glodblock.github.client.gui.container.ContainerFluidCraftConfirm; +import com.glodblock.github.common.item.ItemWirelessUltraTerminal; import com.glodblock.github.common.parts.PartFluidPatternTerminal; import com.glodblock.github.common.parts.PartFluidPatternTerminalEx; import com.glodblock.github.coremod.hooker.CoreModHooks; import com.glodblock.github.inventory.gui.GuiType; +import com.glodblock.github.inventory.item.IWirelessTerminal; +import com.glodblock.github.inventory.item.WirelessPatternTerminalInventory; import com.glodblock.github.network.CPacketFluidPatternTermBtns; import com.glodblock.github.network.CPacketSwitchGuis; import com.glodblock.github.util.ModAndClassUtil; @@ -62,9 +65,12 @@ public class GuiFluidCraftConfirm extends AEBaseGui { if (te instanceof PartFluidPatternTerminal) { this.OriginalGui = GuiType.FLUID_PATTERN_TERMINAL; - } - if (te instanceof PartFluidPatternTerminalEx) { + } else if (te instanceof PartFluidPatternTerminalEx) { this.OriginalGui = GuiType.FLUID_PATTERN_TERMINAL_EX; + } else if (te instanceof IWirelessTerminal && ((IWirelessTerminal) te).isUniversal(te)) { + this.OriginalGui = ItemWirelessUltraTerminal.readMode(((IWirelessTerminal) te).getItemStack()); + } else if (te instanceof WirelessPatternTerminalInventory) { + this.OriginalGui = GuiType.FLUID_TERMINAL; } } diff --git a/src/main/java/com/glodblock/github/client/gui/GuiFluidCraftingWireless.java b/src/main/java/com/glodblock/github/client/gui/GuiFluidCraftingWireless.java new file mode 100644 index 00000000..3f453e76 --- /dev/null +++ b/src/main/java/com/glodblock/github/client/gui/GuiFluidCraftingWireless.java @@ -0,0 +1,85 @@ +package com.glodblock.github.client.gui; + +import net.minecraft.client.gui.GuiButton; +import net.minecraft.entity.player.InventoryPlayer; +import net.minecraft.inventory.Container; +import net.minecraft.inventory.Slot; + +import appeng.api.config.ActionItems; +import appeng.api.config.Settings; +import appeng.client.gui.widgets.GuiImgButton; +import appeng.container.slot.SlotCraftingMatrix; +import appeng.core.localization.GuiColors; +import appeng.core.localization.GuiText; +import appeng.core.sync.network.NetworkHandler; +import appeng.core.sync.packets.PacketInventoryAction; +import appeng.helpers.InventoryAction; + +import com.glodblock.github.client.gui.container.ContainerCraftingWireless; +import com.glodblock.github.inventory.InventoryHandler; +import com.glodblock.github.inventory.gui.GuiType; +import com.glodblock.github.inventory.item.IWirelessTerminal; + +public class GuiFluidCraftingWireless extends GuiItemMonitor { + + private GuiImgButton clearBtn; + + public GuiFluidCraftingWireless(final InventoryPlayer inventoryPlayer, final IWirelessTerminal te) { + super(inventoryPlayer, te, new ContainerCraftingWireless(inventoryPlayer, te)); + this.setReservedSpace(73); + } + + @Override + protected void actionPerformed(final GuiButton btn) { + if (btn == craftingStatusBtn) { + InventoryHandler.switchGui(GuiType.CRAFTING_STATUS); + } else { + super.actionPerformed(btn); + if (this.clearBtn == btn) { + Slot s = null; + final Container c = this.inventorySlots; + for (final Object j : c.inventorySlots) { + if (j instanceof SlotCraftingMatrix) { + s = (Slot) j; + } + } + if (s != null) { + final PacketInventoryAction p = new PacketInventoryAction( + InventoryAction.MOVE_REGION, + s.slotNumber, + 0); + NetworkHandler.instance.sendToServer(p); + } + } + } + } + + @Override + @SuppressWarnings("unchecked") + public void initGui() { + super.initGui(); + this.buttonList.add( + this.clearBtn = new GuiImgButton( + this.guiLeft + 92, + this.guiTop + this.ySize - 156, + Settings.ACTIONS, + ActionItems.STASH)); + this.clearBtn.setHalfSize(true); + } + + @Override + public void drawFG(final int offsetX, final int offsetY, final int mouseX, final int mouseY) { + super.drawFG(offsetX, offsetY, mouseX, mouseY); + this.fontRendererObj.drawString( + GuiText.CraftingTerminal.getLocal(), + 8, + this.ySize - 96 + 1 - this.getReservedSpace(), + GuiColors.CraftingTerminalTitle.getColor()); + } + + @Override + protected String getBackground() { + return "gui/crafting.png"; + } + +} diff --git a/src/main/java/com/glodblock/github/client/gui/GuiFluidPatternTerminalCraftingStatus.java b/src/main/java/com/glodblock/github/client/gui/GuiFluidPatternTerminalCraftingStatus.java index f93c569c..e872d882 100644 --- a/src/main/java/com/glodblock/github/client/gui/GuiFluidPatternTerminalCraftingStatus.java +++ b/src/main/java/com/glodblock/github/client/gui/GuiFluidPatternTerminalCraftingStatus.java @@ -8,13 +8,15 @@ import appeng.api.storage.ITerminalHost; import appeng.client.gui.implementations.GuiCraftingStatus; import appeng.client.gui.widgets.GuiTabButton; +import com.glodblock.github.common.item.ItemWirelessUltraTerminal; import com.glodblock.github.common.parts.PartFluidPatternTerminal; import com.glodblock.github.common.parts.PartFluidPatternTerminalEx; import com.glodblock.github.common.parts.PartFluidTerminal; import com.glodblock.github.inventory.InventoryHandler; import com.glodblock.github.inventory.gui.GuiType; -import com.glodblock.github.inventory.item.WirelessFluidTerminal; -import com.glodblock.github.inventory.item.WirelessPatternTerminal; +import com.glodblock.github.inventory.item.IWirelessTerminal; +import com.glodblock.github.inventory.item.WirelessFluidTerminalInventory; +import com.glodblock.github.inventory.item.WirelessPatternTerminalInventory; import com.glodblock.github.loader.ItemAndBlockHolder; import com.glodblock.github.util.Ae2ReflectClient; @@ -36,12 +38,13 @@ public class GuiFluidPatternTerminalCraftingStatus extends GuiCraftingStatus { Ae2ReflectClient.rewriteIcon(this, new ItemStack(ItemAndBlockHolder.FLUID_TERMINAL_EX, 1)); else if (host instanceof PartFluidTerminal) { Ae2ReflectClient.rewriteIcon(this, new ItemStack(ItemAndBlockHolder.FLUID_TERM, 1)); - } else if (host instanceof WirelessFluidTerminal) { + } else if (host instanceof IWirelessTerminal && ((IWirelessTerminal) host).isUniversal(host)) { + Ae2ReflectClient.rewriteIcon(this, new ItemStack(ItemAndBlockHolder.WIRELESS_ULTRA_TERM, 1)); + } else if (host instanceof WirelessFluidTerminalInventory) { Ae2ReflectClient.rewriteIcon(this, new ItemStack(ItemAndBlockHolder.WIRELESS_FLUID_TERM, 1)); - } else if (host instanceof WirelessPatternTerminal) { + } else if (host instanceof WirelessPatternTerminalInventory) { Ae2ReflectClient.rewriteIcon(this, new ItemStack(ItemAndBlockHolder.WIRELESS_PATTERN_TERM, 1)); } - super.initGui(); originalGuiBtn = Ae2ReflectClient.getOriginalGuiButton(this); } @@ -53,8 +56,11 @@ public class GuiFluidPatternTerminalCraftingStatus extends GuiCraftingStatus { else if (host instanceof PartFluidPatternTerminalEx) InventoryHandler.switchGui(GuiType.FLUID_PATTERN_TERMINAL_EX); else if (host instanceof PartFluidTerminal) InventoryHandler.switchGui(GuiType.FLUID_TERMINAL); - else if (host instanceof WirelessFluidTerminal) InventoryHandler.switchGui(GuiType.WIRELESS_FLUID_TERMINAL); - else if (host instanceof WirelessPatternTerminal) + else if (host instanceof IWirelessTerminal && ((IWirelessTerminal) host).isUniversal(host)) InventoryHandler + .switchGui(ItemWirelessUltraTerminal.readMode(((IWirelessTerminal) host).getItemStack())); + else if (host instanceof WirelessFluidTerminalInventory) + InventoryHandler.switchGui(GuiType.WIRELESS_FLUID_TERMINAL); + else if (host instanceof WirelessPatternTerminalInventory) InventoryHandler.switchGui(GuiType.WIRELESS_FLUID_PATTERN_TERMINAL); } else { super.actionPerformed(btn); diff --git a/src/main/java/com/glodblock/github/client/gui/GuiPatternPortableCell.java b/src/main/java/com/glodblock/github/client/gui/GuiFluidPatternWireless.java similarity index 55% rename from src/main/java/com/glodblock/github/client/gui/GuiPatternPortableCell.java rename to src/main/java/com/glodblock/github/client/gui/GuiFluidPatternWireless.java index aca7de2b..ed801c36 100644 --- a/src/main/java/com/glodblock/github/client/gui/GuiPatternPortableCell.java +++ b/src/main/java/com/glodblock/github/client/gui/GuiFluidPatternWireless.java @@ -4,9 +4,9 @@ import net.minecraft.entity.player.InventoryPlayer; import com.glodblock.github.inventory.item.IWirelessTerminal; -public class GuiPatternPortableCell extends GuiFluidPatternTerminal { +public class GuiFluidPatternWireless extends GuiFluidPatternTerminal { - public GuiPatternPortableCell(InventoryPlayer inventoryPlayer, IWirelessTerminal te) { + public GuiFluidPatternWireless(InventoryPlayer inventoryPlayer, IWirelessTerminal te) { super(inventoryPlayer, te); } } diff --git a/src/main/java/com/glodblock/github/client/gui/GuiPatternValueAmount.java b/src/main/java/com/glodblock/github/client/gui/GuiPatternValueAmount.java index c415670f..b0abfc30 100644 --- a/src/main/java/com/glodblock/github/client/gui/GuiPatternValueAmount.java +++ b/src/main/java/com/glodblock/github/client/gui/GuiPatternValueAmount.java @@ -10,9 +10,12 @@ import appeng.core.localization.GuiText; import com.glodblock.github.FluidCraft; import com.glodblock.github.client.gui.base.FCGuiAmount; import com.glodblock.github.client.gui.container.ContainerPatternValueAmount; +import com.glodblock.github.common.item.ItemWirelessUltraTerminal; import com.glodblock.github.common.parts.PartFluidPatternTerminal; import com.glodblock.github.common.parts.PartFluidPatternTerminalEx; import com.glodblock.github.inventory.gui.GuiType; +import com.glodblock.github.inventory.item.IWirelessTerminal; +import com.glodblock.github.inventory.item.WirelessPatternTerminalInventory; import com.glodblock.github.loader.ItemAndBlockHolder; import com.glodblock.github.network.CPacketPatternValueSet; @@ -66,10 +69,15 @@ public class GuiPatternValueAmount extends FCGuiAmount { if (target instanceof PartFluidPatternTerminal) { this.myIcon = new ItemStack(ItemAndBlockHolder.FLUID_TERMINAL, 1); this.originalGui = GuiType.FLUID_PATTERN_TERMINAL; - } - if (target instanceof PartFluidPatternTerminalEx) { + } else if (target instanceof PartFluidPatternTerminalEx) { this.myIcon = new ItemStack(ItemAndBlockHolder.FLUID_TERMINAL_EX, 1); this.originalGui = GuiType.FLUID_PATTERN_TERMINAL_EX; + } else if (target instanceof IWirelessTerminal && ((IWirelessTerminal) target).isUniversal(target)) { + this.myIcon = new ItemStack(ItemAndBlockHolder.WIRELESS_ULTRA_TERM, 1); + this.originalGui = ItemWirelessUltraTerminal.readMode(((IWirelessTerminal) target).getItemStack()); + } else if (target instanceof WirelessPatternTerminalInventory) { + this.myIcon = new ItemStack(ItemAndBlockHolder.WIRELESS_PATTERN_TERM, 1); + this.originalGui = GuiType.WIRELESS_FLUID_PATTERN_TERMINAL; } } diff --git a/src/main/java/com/glodblock/github/client/gui/base/FCGuiMonitor.java b/src/main/java/com/glodblock/github/client/gui/base/FCGuiMonitor.java index 028e8e30..ce885405 100644 --- a/src/main/java/com/glodblock/github/client/gui/base/FCGuiMonitor.java +++ b/src/main/java/com/glodblock/github/client/gui/base/FCGuiMonitor.java @@ -49,8 +49,10 @@ import codechicken.nei.LayoutManager; import codechicken.nei.util.TextHistory; import com.glodblock.github.FluidCraft; -import com.glodblock.github.client.gui.FCGuiTextField; +import com.glodblock.github.client.gui.*; import com.glodblock.github.client.gui.container.base.FCContainerMonitor; +import com.glodblock.github.common.item.ItemWirelessUltraTerminal; +import com.glodblock.github.inventory.gui.GuiType; import com.glodblock.github.network.CPacketInventoryAction; import com.glodblock.github.util.Ae2ReflectClient; import com.glodblock.github.util.ModAndClassUtil; @@ -78,12 +80,18 @@ public abstract class FCGuiMonitor> extends AEBaseMEGui protected int rows = 0; protected int maxRows = Integer.MAX_VALUE; protected int standardSize; + protected int offsetY; protected GuiImgButton ViewBox; protected GuiImgButton SortByBox; protected GuiImgButton SortDirBox; protected GuiImgButton searchBoxSettings; protected GuiImgButton terminalStyleBox; protected GuiImgButton searchStringSave; + protected GuiFCImgButton FluidTerminal; + protected GuiFCImgButton CraftingTerminal; + protected GuiFCImgButton PatternTerminal; + protected GuiFCImgButton EssentiaTerminal; + protected boolean drawSwitchGuiBtn; @SuppressWarnings("unchecked") public FCGuiMonitor(final InventoryPlayer inventoryPlayer, final ITerminalHost te, final FCContainerMonitor c) { @@ -96,6 +104,9 @@ public abstract class FCGuiMonitor> extends AEBaseMEGui this.configSrc = ((IConfigurableObject) this.inventorySlots).getConfigManager(); (this.monitorableContainer = (FCContainerMonitor) this.inventorySlots).setGui(this); this.viewCell = te instanceof IViewCellStorage; + if (inventoryPlayer.getCurrentItem() != null + && inventoryPlayer.getCurrentItem().getItem() instanceof ItemWirelessUltraTerminal) + this.drawSwitchGuiBtn = true; } public abstract void postUpdate(final List list); @@ -113,7 +124,17 @@ public abstract class FCGuiMonitor> extends AEBaseMEGui if (btn == this.craftingStatusBtn || btn == this.craftingStatusImgBtn) { NetworkHandler.instance.sendToServer(new PacketSwitchGuis(GuiBridge.GUI_CRAFTING_STATUS)); } - + if (btn instanceof GuiFCImgButton) { + if (btn == this.FluidTerminal) { + ItemWirelessUltraTerminal.switchTerminal(this.mc.thePlayer, GuiType.WIRELESS_FLUID_TERMINAL); + } else if (btn == this.CraftingTerminal) { + ItemWirelessUltraTerminal.switchTerminal(this.mc.thePlayer, GuiType.WIRELESS_CRAFTING_TERMINAL); + } else if (btn == this.EssentiaTerminal) { + ItemWirelessUltraTerminal.switchTerminal(this.mc.thePlayer, GuiType.WIRELESS_ESSENTIA_TERMINAL); + } else if (btn == this.PatternTerminal) { + ItemWirelessUltraTerminal.switchTerminal(this.mc.thePlayer, GuiType.WIRELESS_FLUID_PATTERN_TERMINAL); + } + } if (btn instanceof GuiImgButton) { final boolean backwards = Mouse.isButtonDown(1); final GuiImgButton iBtn = (GuiImgButton) btn; @@ -200,60 +221,60 @@ public abstract class FCGuiMonitor> extends AEBaseMEGui final int unusedSpace = this.height - this.ySize; this.guiTop = (int) Math.floor(unusedSpace / (unusedSpace < 0 ? 3.8f : 2.0f)); - int offset = this.guiTop + 8; + this.offsetY = this.guiTop + 8; if (this.customSortOrder) { this.buttonList.add( this.SortByBox = new GuiImgButton( this.guiLeft - 18, - offset, + this.offsetY, Settings.SORT_BY, this.configSrc.getSetting(Settings.SORT_BY))); - offset += 20; + this.offsetY += 20; } if (this.showViewBtn) { this.buttonList.add( this.ViewBox = new GuiImgButton( this.guiLeft - 18, - offset, + this.offsetY, Settings.VIEW_MODE, this.configSrc.getSetting(Settings.VIEW_MODE))); - offset += 20; + this.offsetY += 20; } this.buttonList.add( this.SortDirBox = new GuiImgButton( this.guiLeft - 18, - offset, + this.offsetY, Settings.SORT_DIRECTION, this.configSrc.getSetting(Settings.SORT_DIRECTION))); - offset += 20; + this.offsetY += 20; this.buttonList.add( this.searchBoxSettings = new GuiImgButton( this.guiLeft - 18, - offset, + this.offsetY, Settings.SEARCH_MODE, AEConfig.instance.settings.getSetting(Settings.SEARCH_MODE))); - offset += 20; + this.offsetY += 20; if (ModAndClassUtil.isSaveText) { this.buttonList.add( this.searchStringSave = new GuiImgButton( this.guiLeft - 18, - offset, + this.offsetY, Settings.SAVE_SEARCH, AEConfig.instance.preserveSearchBar ? YesNo.YES : YesNo.NO)); - offset += 20; + this.offsetY += 20; } this.buttonList.add( this.terminalStyleBox = new GuiImgButton( this.guiLeft - 18, - offset, + this.offsetY, Settings.TERMINAL_STYLE, AEConfig.instance.settings.getSetting(Settings.TERMINAL_STYLE))); - offset += 20; + this.offsetY += 20; this.searchField = new FCGuiTextField( this.fontRendererObj, @@ -274,9 +295,10 @@ public abstract class FCGuiMonitor> extends AEBaseMEGui this.buttonList.add( this.craftingStatusImgBtn = new GuiImgButton( this.guiLeft - 18, - offset, + this.offsetY, Settings.CRAFTING_STATUS, AEConfig.instance.settings.getSetting(Settings.CRAFTING_STATUS))); + this.offsetY += 20; } else { this.buttonList.add( this.craftingStatusBtn = new GuiTabButton( @@ -321,6 +343,31 @@ public abstract class FCGuiMonitor> extends AEBaseMEGui craftingGridOffsetX -= 25; craftingGridOffsetY -= 6; + if (drawSwitchGuiBtn) drawSwitchGuiBtns(); + } + + @SuppressWarnings("unchecked") + private void drawSwitchGuiBtns() { + if (!(this instanceof GuiFluidCraftingWireless)) { + this.buttonList.add( + this.CraftingTerminal = new GuiFCImgButton(this.guiLeft - 18, this.offsetY, "CRAFT_TEM", "YES")); + this.offsetY += 20; + } + if (!(this instanceof GuiFluidPatternWireless)) { + this.buttonList.add( + this.PatternTerminal = new GuiFCImgButton(this.guiLeft - 18, this.offsetY, "PATTERN_TEM", "YES")); + this.offsetY += 20; + } + if (!(this instanceof GuiFluidPortableCell)) { + this.buttonList + .add(this.FluidTerminal = new GuiFCImgButton(this.guiLeft - 18, this.offsetY, "FLUID_TEM", "YES")); + this.offsetY += 20; + } + if (ModAndClassUtil.ThE && !(this instanceof GuiEssentiaTerminal)) { + this.buttonList.add( + this.EssentiaTerminal = new GuiFCImgButton(this.guiLeft - 18, this.offsetY, "ESSENTIA_TEM", "YES")); + this.offsetY += 20; + } } public void setSearchString(String memoryText, boolean updateView) { @@ -375,7 +422,6 @@ public abstract class FCGuiMonitor> extends AEBaseMEGui } @Override - @SuppressWarnings("unchecked") protected void handleMouseClick(final Slot slot, final int slotIdx, final int ctrlDown, final int mouseButton) { final EntityPlayer player = Minecraft.getMinecraft().thePlayer; if (mouseButton == 3) { diff --git a/src/main/java/com/glodblock/github/client/gui/container/ContainerCraftingWireless.java b/src/main/java/com/glodblock/github/client/gui/container/ContainerCraftingWireless.java new file mode 100644 index 00000000..bae3b302 --- /dev/null +++ b/src/main/java/com/glodblock/github/client/gui/container/ContainerCraftingWireless.java @@ -0,0 +1,111 @@ +package com.glodblock.github.client.gui.container; + +import net.minecraft.entity.player.InventoryPlayer; +import net.minecraft.inventory.IInventory; +import net.minecraft.inventory.InventoryCrafting; +import net.minecraft.item.ItemStack; +import net.minecraft.item.crafting.CraftingManager; + +import appeng.container.ContainerNull; +import appeng.container.slot.SlotCraftingMatrix; +import appeng.container.slot.SlotCraftingTerm; +import appeng.helpers.IContainerCraftingPacket; +import appeng.tile.inventory.AppEngInternalInventory; +import appeng.tile.inventory.IAEAppEngInventory; +import appeng.tile.inventory.InvOperation; + +import com.glodblock.github.inventory.item.IWirelessCraftTerminal; +import com.glodblock.github.inventory.item.IWirelessTerminal; +import com.glodblock.github.util.Util; + +public class ContainerCraftingWireless extends ContainerItemMonitor + implements IAEAppEngInventory, IContainerCraftingPacket { + + private final IWirelessCraftTerminal it; + private final SlotCraftingMatrix[] craftingSlots = new SlotCraftingMatrix[9]; + private final SlotCraftingTerm outputSlot; + private final int slot; + private int ticks = 0; + private double powerMultiplier = 0.5; + + public ContainerCraftingWireless(final InventoryPlayer ip, final IWirelessTerminal monitorable) { + super(ip, monitorable, false); + this.it = (IWirelessCraftTerminal) monitorable; + final int slotIndex = monitorable.getInventorySlot(); + this.lockPlayerInventorySlot(slotIndex); + this.slot = slotIndex; + final IInventory crafting = this.it.getInventoryByName("crafting"); + for (int y = 0; y < 3; y++) { + for (int x = 0; x < 3; x++) { + this.addSlotToContainer( + this.craftingSlots[x + y * 3] = new SlotCraftingMatrix( + this, + crafting, + x + y * 3, + 37 + x * 18, + -72 + y * 18)); + } + } + AppEngInternalInventory output = new AppEngInternalInventory(this, 1); + this.addSlotToContainer( + this.outputSlot = new SlotCraftingTerm( + this.getPlayerInv().player, + this.getActionSource(), + this.getPowerSource(), + monitorable, + crafting, + crafting, + output, + 131, + -72 + 18, + this)); + this.bindPlayerInventory(ip, 0, 0); + this.onCraftMatrixChanged(crafting); + } + + public void detectAndSendChanges() { + this.ticks = Util + .drainItemPower(this, this.getPlayerInv(), this.slot, this.ticks, this.getPowerMultiplier(), this.it); + super.detectAndSendChanges(); + } + + private double getPowerMultiplier() { + return this.powerMultiplier; + } + + @Override + public void onCraftMatrixChanged(final IInventory par1IInventory) { + final ContainerNull cn = new ContainerNull(); + final InventoryCrafting ic = new InventoryCrafting(cn, 3, 3); + for (int x = 0; x < 9; x++) { + ic.setInventorySlotContents(x, this.craftingSlots[x].getStack()); + } + this.outputSlot + .putStack(CraftingManager.getInstance().findMatchingRecipe(ic, this.getPlayerInv().player.worldObj)); + } + + @Override + public void saveChanges() { + // NO-OP + } + + @Override + public void onChangeInventory(final IInventory inv, final int slot, final InvOperation mc, + final ItemStack removedStack, final ItemStack newStack) { + // NO-OP + } + + @Override + public IInventory getInventoryByName(final String name) { + if (name.equals("player")) { + return this.getInventoryPlayer(); + } + return this.it.getInventoryByName(name); + } + + @Override + public boolean useRealItems() { + return true; + } + +} diff --git a/src/main/java/com/glodblock/github/client/gui/container/ContainerEssentiaMonitor.java b/src/main/java/com/glodblock/github/client/gui/container/ContainerEssentiaMonitor.java new file mode 100644 index 00000000..02f6532f --- /dev/null +++ b/src/main/java/com/glodblock/github/client/gui/container/ContainerEssentiaMonitor.java @@ -0,0 +1,159 @@ +package com.glodblock.github.client.gui.container; + +import java.util.HashMap; +import java.util.Map; + +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.EntityPlayerMP; +import net.minecraft.entity.player.InventoryPlayer; +import net.minecraft.inventory.Slot; +import net.minecraft.item.ItemStack; + +import org.apache.commons.lang3.tuple.MutablePair; + +import appeng.api.config.Actionable; +import appeng.api.storage.data.IAEFluidStack; +import appeng.container.slot.SlotPlayerHotBar; +import appeng.container.slot.SlotPlayerInv; +import appeng.util.Platform; +import appeng.util.item.AEFluidStack; + +import com.glodblock.github.FluidCraft; +import com.glodblock.github.crossmod.thaumcraft.AspectUtil; +import com.glodblock.github.inventory.item.IWirelessTerminal; +import com.glodblock.github.network.CPacketFluidUpdate; +import com.glodblock.github.network.SPacketFluidUpdate; +import com.glodblock.github.util.Util; + +public class ContainerEssentiaMonitor extends ContainerFluidPortableCell { + + public ContainerEssentiaMonitor(InventoryPlayer ip, IWirelessTerminal monitorable) { + super(ip, monitorable); + } + + @Override + public ItemStack transferStackInSlot(final EntityPlayer p, final int idx) { + if (Platform.isClient()) { + Slot clickSlot = (Slot) this.inventorySlots.get(idx); + if ((clickSlot instanceof SlotPlayerInv || clickSlot instanceof SlotPlayerHotBar) && clickSlot.getHasStack() + && AspectUtil.isEssentiaContainer(clickSlot.getStack())) { + ItemStack tis = clickSlot.getStack(); + Map tmp = new HashMap<>(); + tmp.put(0, null); + int index = Util.findItemInPlayerInvSlot(p, clickSlot.getStack()); + FluidCraft.proxy.netHandler.sendToServer(new CPacketFluidUpdate(tmp, tis, index)); + } + } + return super.transferStackInSlot(p, idx); + } + + @Override + public void postChange(Iterable change, ItemStack fluidContainer, EntityPlayer player, + int slotIndex) { + for (IAEFluidStack fluid : change) { + IAEFluidStack nfluid = this.monitor.getStorageList().findPrecise(fluid); + ItemStack out = fluidContainer.copy(); + out.stackSize = 1; + if (AspectUtil.isEmptyEssentiaContainer(fluidContainer) && AspectUtil.isEssentiaGas(fluid)) { + // add essentia to jars + if (nfluid.getStackSize() / AspectUtil.R <= 0) continue; + final IAEFluidStack toExtract = nfluid.copy(); + MutablePair fillStack = AspectUtil + .fillEssentiaFromGas(out, toExtract.getFluidStack()); + if (fillStack == null || fillStack.right == null || fillStack.left <= 0) continue; + toExtract.setStackSize((long) fillStack.left * fluidContainer.stackSize); + IAEFluidStack tmp = this.host.getFluidInventory() + .extractItems(toExtract, Actionable.SIMULATE, this.getActionSource()); + if (tmp == null) continue; + fillStack.right.stackSize = (int) (tmp.getStackSize() / fillStack.left); + this.dropItem(fillStack.right); + out.stackSize = fillStack.right.stackSize; + if (AspectUtil.isEssentiaContainer(fillStack.right)) { + this.host.getFluidInventory().extractItems(toExtract, Actionable.MODULATE, this.getActionSource()); + if ((int) (tmp.getStackSize() % fillStack.left) / AspectUtil.R > 0) { + this.dropItem( + AspectUtil.setAspectAmount( + fillStack.right, + (int) (tmp.getStackSize() % fillStack.left) / AspectUtil.R, + AspectUtil.getAspectFromGas(toExtract)), + 1); + out.stackSize++; + } + } + } else if (!AspectUtil.isEmptyEssentiaContainer(fluidContainer)) { + // add essentia to ae network + AEFluidStack fluidStack = AspectUtil.getAEGasFromContainer(fluidContainer); + if (fluidStack == null) { + continue; + } + final IAEFluidStack aeFluidStack = fluidStack.copy(); + // simulate result is incorrect. so I'm using other solution and ec2 both mod have same issues + final IAEFluidStack notInserted = this.host.getFluidInventory() + .injectItems(aeFluidStack, Actionable.MODULATE, this.getActionSource()); + MutablePair drainStack = AspectUtil + .drainEssentiaFromGas(out.copy(), aeFluidStack.getFluidStack()); + if (notInserted != null && notInserted.getStackSize() > 0 && drainStack != null) { + if (fluidStack.getStackSize() == notInserted.getStackSize()) continue; + aeFluidStack.decStackSize(notInserted.getStackSize()); + + if (drainStack.left > aeFluidStack.getStackSize() + && AspectUtil.isEssentiaContainer(drainStack.right)) { + aeFluidStack.setStackSize(drainStack.left - aeFluidStack.getStackSize()); + this.host.getFluidInventory() + .extractItems(aeFluidStack, Actionable.MODULATE, this.getActionSource()); + continue; + } + + // drop empty item + this.dropItem(drainStack.right, (int) (aeFluidStack.getStackSize() / drainStack.left)); + out.stackSize = (int) (notInserted.getStackSize() / drainStack.left); + if (AspectUtil.isEssentiaContainer(drainStack.right)) { + if (notInserted.getStackSize() % drainStack.left > 0) { + fluidStack.setStackSize((notInserted.getStackSize() % drainStack.left)); + AspectUtil.fillEssentiaFromGas(drainStack.right, fluidStack.getFluidStack()); + this.dropItem(drainStack.right, 1); + } + } + if (slotIndex == -1) out.stackSize = fluidContainer.stackSize - out.stackSize; + } else if (drainStack != null) { + if (slotIndex == -1) { + out.stackSize = fluidContainer.stackSize; + } else { + if (drainStack != null) { + System.out.print("---------\n"); + System.out.print(drainStack.right + "\n"); + System.out.print(drainStack.left + "\n"); + System.out.print(aeFluidStack.getStackSize() + "\n"); + } + out.stackSize = (int) (fluidContainer.stackSize + - (aeFluidStack.getStackSize() / drainStack.left)); + } + this.dropItem(drainStack.right, fluidContainer.stackSize); // drop empty item + } + } else { + continue; + } + if (slotIndex == -1) { + player.inventory.getItemStack().stackSize = player.inventory.getItemStack().stackSize - out.stackSize; + if (player.inventory.getItemStack().stackSize > 0) { + FluidCraft.proxy.netHandler.sendTo( + new SPacketFluidUpdate(new HashMap<>(), player.inventory.getItemStack()), + (EntityPlayerMP) player); + } else { + player.inventory.setItemStack(null); + FluidCraft.proxy.netHandler + .sendTo(new SPacketFluidUpdate(new HashMap<>()), (EntityPlayerMP) player); + } + } else { + player.inventory.setInventorySlotContents(slotIndex, out.stackSize > 0 ? out : null); + } + } + this.detectAndSendChanges(); + } + + @Override + protected boolean isEssentiaMode() { + return true; + } + +} diff --git a/src/main/java/com/glodblock/github/client/gui/container/ContainerFluidMonitor.java b/src/main/java/com/glodblock/github/client/gui/container/ContainerFluidMonitor.java index 201f6095..d75f4323 100644 --- a/src/main/java/com/glodblock/github/client/gui/container/ContainerFluidMonitor.java +++ b/src/main/java/com/glodblock/github/client/gui/container/ContainerFluidMonitor.java @@ -50,7 +50,7 @@ import com.glodblock.github.util.Util; public class ContainerFluidMonitor extends FCContainerMonitor { - private final IItemList fluids = AEApi.instance().storage().createFluidList(); + protected final IItemList fluids = AEApi.instance().storage().createFluidList(); public ContainerFluidMonitor(final InventoryPlayer ip, final ITerminalHost monitorable) { this(ip, monitorable, true); @@ -109,7 +109,7 @@ public class ContainerFluidMonitor extends FCContainerMonitor { @Override public ItemStack transferStackInSlot(final EntityPlayer p, final int idx) { - if (Platform.isClient()) { + if (Platform.isClient() && !isEssentiaMode()) { Slot clickSlot = (Slot) this.inventorySlots.get(idx); if ((clickSlot instanceof SlotPlayerInv || clickSlot instanceof SlotPlayerHotBar) && clickSlot.getHasStack() && Util.FluidUtil.isFluidContainer(clickSlot.getStack())) { @@ -183,7 +183,7 @@ public class ContainerFluidMonitor extends FCContainerMonitor { } } - private void dropItem(ItemStack is) { + protected void dropItem(ItemStack is) { if (is == null || is.stackSize <= 0) return; ItemStack itemStack = is.copy(); int i = itemStack.getMaxStackSize(); @@ -204,7 +204,7 @@ public class ContainerFluidMonitor extends FCContainerMonitor { } } - private void dropItem(ItemStack itemStack, int stackSize) { + protected void dropItem(ItemStack itemStack, int stackSize) { if (itemStack == null || itemStack.stackSize <= 0) return; ItemStack is = itemStack.copy(); is.stackSize = stackSize; @@ -314,4 +314,8 @@ public class ContainerFluidMonitor extends FCContainerMonitor { } this.detectAndSendChanges(); } + + protected boolean isEssentiaMode() { + return false; + } } diff --git a/src/main/java/com/glodblock/github/client/gui/container/ContainerFluidPatternWireless.java b/src/main/java/com/glodblock/github/client/gui/container/ContainerFluidPatternWireless.java new file mode 100644 index 00000000..84f125b1 --- /dev/null +++ b/src/main/java/com/glodblock/github/client/gui/container/ContainerFluidPatternWireless.java @@ -0,0 +1,41 @@ +package com.glodblock.github.client.gui.container; + +import net.minecraft.entity.player.InventoryPlayer; + +import com.glodblock.github.inventory.item.IWirelessTerminal; +import com.glodblock.github.util.Util; + +public class ContainerFluidPatternWireless extends ContainerFluidPatternTerminal { + + private double powerMultiplier = 0.5; + private final IWirelessTerminal civ; + private int ticks = 0; + private final int slot; + + public ContainerFluidPatternWireless(InventoryPlayer ip, IWirelessTerminal monitorable) { + super(ip, monitorable); + if (monitorable != null) { + final int slotIndex = monitorable.getInventorySlot(); + this.lockPlayerInventorySlot(slotIndex); + this.slot = slotIndex; + } else { + this.slot = -1; + this.lockPlayerInventorySlot(ip.currentItem); + } + this.civ = monitorable; + } + + public void detectAndSendChanges() { + this.ticks = Util + .drainItemPower(this, this.getPlayerInv(), this.slot, this.ticks, this.getPowerMultiplier(), this.civ); + super.detectAndSendChanges(); + } + + private double getPowerMultiplier() { + return this.powerMultiplier; + } + + void setPowerMultiplier(final double powerMultiplier) { + this.powerMultiplier = powerMultiplier; + } +} diff --git a/src/main/java/com/glodblock/github/client/gui/container/ContainerFluidPortableCell.java b/src/main/java/com/glodblock/github/client/gui/container/ContainerFluidPortableCell.java index ae94e6b8..a55f86e9 100644 --- a/src/main/java/com/glodblock/github/client/gui/container/ContainerFluidPortableCell.java +++ b/src/main/java/com/glodblock/github/client/gui/container/ContainerFluidPortableCell.java @@ -1,13 +1,9 @@ package com.glodblock.github.client.gui.container; import net.minecraft.entity.player.InventoryPlayer; -import net.minecraft.item.ItemStack; - -import appeng.api.config.Actionable; -import appeng.api.config.PowerMultiplier; -import appeng.util.Platform; import com.glodblock.github.inventory.item.IFluidPortableCell; +import com.glodblock.github.util.Util; public class ContainerFluidPortableCell extends ContainerFluidMonitor { @@ -32,32 +28,8 @@ public class ContainerFluidPortableCell extends ContainerFluidMonitor { @Override public void detectAndSendChanges() { - final ItemStack currentItem = this.slot < 0 ? this.getPlayerInv().getCurrentItem() - : this.getPlayerInv().getStackInSlot(this.slot); - if (this.civ != null) { - if (currentItem != this.civ.getItemStack()) { - if (currentItem != null) { - if (Platform.isSameItem(this.civ.getItemStack(), currentItem)) { - this.getPlayerInv() - .setInventorySlotContents(this.getPlayerInv().currentItem, this.civ.getItemStack()); - } else { - this.setValidContainer(false); - } - } else { - this.setValidContainer(false); - } - } - } else { - this.setValidContainer(false); - } - this.ticks++; - if (this.ticks > 10 && this.civ != null) { - this.civ.extractAEPower( - this.getPowerMultiplier() * this.ticks, - Actionable.MODULATE, - PowerMultiplier.CONFIG); - this.ticks = 0; - } + this.ticks = Util + .drainItemPower(this, this.getPlayerInv(), this.slot, this.ticks, this.getPowerMultiplier(), this.civ); super.detectAndSendChanges(); } diff --git a/src/main/java/com/glodblock/github/client/gui/container/ContainerPatternPortableCell.java b/src/main/java/com/glodblock/github/client/gui/container/ContainerPatternPortableCell.java deleted file mode 100644 index 319efe07..00000000 --- a/src/main/java/com/glodblock/github/client/gui/container/ContainerPatternPortableCell.java +++ /dev/null @@ -1,69 +0,0 @@ -package com.glodblock.github.client.gui.container; - -import net.minecraft.entity.player.InventoryPlayer; -import net.minecraft.item.ItemStack; - -import appeng.api.config.Actionable; -import appeng.api.config.PowerMultiplier; -import appeng.util.Platform; - -import com.glodblock.github.inventory.item.IWirelessTerminal; - -public class ContainerPatternPortableCell extends ContainerFluidPatternTerminal { - - private double powerMultiplier = 0.5; - private final IWirelessTerminal civ; - private int ticks = 0; - private final int slot; - - public ContainerPatternPortableCell(InventoryPlayer ip, IWirelessTerminal monitorable) { - super(ip, monitorable); - if (monitorable != null) { - final int slotIndex = monitorable.getInventorySlot(); - this.lockPlayerInventorySlot(slotIndex); - this.slot = slotIndex; - } else { - this.slot = -1; - this.lockPlayerInventorySlot(ip.currentItem); - } - this.civ = monitorable; - } - - public void detectAndSendChanges() { - final ItemStack currentItem = this.slot < 0 ? this.getPlayerInv().getCurrentItem() - : this.getPlayerInv().getStackInSlot(this.slot); - if (this.civ != null) { - if (currentItem != this.civ.getItemStack()) { - if (currentItem != null) { - if (Platform.isSameItem(this.civ.getItemStack(), currentItem)) { - this.getPlayerInv() - .setInventorySlotContents(this.getPlayerInv().currentItem, this.civ.getItemStack()); - } else { - this.setValidContainer(false); - } - } else { - this.setValidContainer(false); - } - } - } else { - this.setValidContainer(false); - } - this.ticks++; - if (this.ticks > 10 && this.civ != null) { - this.civ.extractAEPower( - this.getPowerMultiplier() * this.ticks, - Actionable.MODULATE, - PowerMultiplier.CONFIG); - this.ticks = 0; - } - super.detectAndSendChanges(); - } - - private double getPowerMultiplier() { - return this.powerMultiplier; - } - - void setPowerMultiplier(final double powerMultiplier) { - this.powerMultiplier = powerMultiplier; - } -} diff --git a/src/main/java/com/glodblock/github/client/gui/container/base/FCContainerEncodeTerminal.java b/src/main/java/com/glodblock/github/client/gui/container/base/FCContainerEncodeTerminal.java index b05db36e..58be4050 100644 --- a/src/main/java/com/glodblock/github/client/gui/container/base/FCContainerEncodeTerminal.java +++ b/src/main/java/com/glodblock/github/client/gui/container/base/FCContainerEncodeTerminal.java @@ -37,7 +37,7 @@ import com.glodblock.github.common.item.ItemFluidDrop; import com.glodblock.github.common.item.ItemFluidEncodedPattern; import com.glodblock.github.common.item.ItemFluidPacket; import com.glodblock.github.inventory.IPatternConsumer; -import com.glodblock.github.inventory.item.PatternTerminal; +import com.glodblock.github.inventory.item.IItemPatternTerminal; import com.glodblock.github.loader.ItemAndBlockHolder; import com.glodblock.github.util.FluidPatternDetails; import com.glodblock.github.util.Util; @@ -45,7 +45,7 @@ import com.glodblock.github.util.Util; public abstract class FCContainerEncodeTerminal extends ContainerItemMonitor implements IAEAppEngInventory, IOptionalSlotHost, IContainerCraftingPacket, IPatternConsumer { - protected final PatternTerminal patternTerminal; + protected final IItemPatternTerminal patternTerminal; protected final AppEngInternalInventory cOut = new AppEngInternalInventory(null, 1); protected final IInventory crafting; protected final SlotRestrictedInput patternSlotIN; @@ -77,7 +77,7 @@ public abstract class FCContainerEncodeTerminal extends ContainerItemMonitor public FCContainerEncodeTerminal(final InventoryPlayer ip, final ITerminalHost monitorable) { super(ip, monitorable); - this.patternTerminal = (PatternTerminal) monitorable; + this.patternTerminal = (IItemPatternTerminal) monitorable; this.inverted = patternTerminal.isInverted(); final IInventory patternInv = this.patternTerminal.getInventoryByName("pattern"); this.crafting = this.patternTerminal.getInventoryByName("crafting"); @@ -170,7 +170,7 @@ public abstract class FCContainerEncodeTerminal extends ContainerItemMonitor } } - public PatternTerminal getPatternTerminal() { + public IItemPatternTerminal getPatternTerminal() { return this.patternTerminal; } diff --git a/src/main/java/com/glodblock/github/client/gui/container/base/FCContainerMonitor.java b/src/main/java/com/glodblock/github/client/gui/container/base/FCContainerMonitor.java index 9013a721..5293422e 100644 --- a/src/main/java/com/glodblock/github/client/gui/container/base/FCContainerMonitor.java +++ b/src/main/java/com/glodblock/github/client/gui/container/base/FCContainerMonitor.java @@ -79,19 +79,21 @@ public abstract class FCContainerMonitor> extends AEBaseCo if (isInvalid()) { this.setValidContainer(false); } - for (final Settings set : this.serverCM.getSettings()) { - final Enum sideLocal = this.serverCM.getSetting(set); - final Enum sideRemote = this.clientCM.getSetting(set); + if (this.serverCM != null) { + for (final Settings set : this.serverCM.getSettings()) { + final Enum sideLocal = this.serverCM.getSetting(set); + final Enum sideRemote = this.clientCM.getSetting(set); - if (sideLocal != sideRemote) { - this.clientCM.putSetting(set, sideLocal); - for (final Object crafter : this.crafters) { - try { - NetworkHandler.instance.sendTo( - new PacketValueConfig(set.name(), sideLocal.name()), - (EntityPlayerMP) crafter); - } catch (final IOException e) { - AELog.debug(e); + if (sideLocal != sideRemote) { + this.clientCM.putSetting(set, sideLocal); + for (final Object crafter : this.crafters) { + try { + NetworkHandler.instance.sendTo( + new PacketValueConfig(set.name(), sideLocal.name()), + (EntityPlayerMP) crafter); + } catch (final IOException e) { + AELog.debug(e); + } } } } diff --git a/src/main/java/com/glodblock/github/client/me/EssentiaRepo.java b/src/main/java/com/glodblock/github/client/me/EssentiaRepo.java new file mode 100644 index 00000000..86c5fb5e --- /dev/null +++ b/src/main/java/com/glodblock/github/client/me/EssentiaRepo.java @@ -0,0 +1,41 @@ +package com.glodblock.github.client.me; + +import java.util.Iterator; + +import net.minecraft.item.ItemStack; +import net.minecraftforge.fluids.FluidStack; + +import appeng.api.storage.data.IAEFluidStack; +import appeng.api.storage.data.IAEItemStack; +import appeng.client.gui.widgets.IScrollSource; +import appeng.client.gui.widgets.ISortSource; + +import com.glodblock.github.common.item.ItemFluidDrop; +import com.glodblock.github.crossmod.thaumcraft.AspectUtil; + +public class EssentiaRepo extends FluidRepo { + + public EssentiaRepo(final IScrollSource src, final ISortSource sortSrc) { + super(src, sortSrc); + } + + @Override + public void updateView() { + super.updateView(); + Iterator it1 = this.view.iterator(); + while (it1.hasNext()) { + IAEFluidStack fluid = ItemFluidDrop.getAeFluidStack(it1.next()); + if (!AspectUtil.isEssentiaGas(fluid)) { + it1.remove(); + } + } + Iterator it2 = this.dsp.iterator(); + while (it2.hasNext()) { + FluidStack fluid = ItemFluidDrop.getFluidStack(it2.next()); + if (!AspectUtil.isEssentiaGas(fluid)) { + it2.remove(); + } + } + } + +} diff --git a/src/main/java/com/glodblock/github/client/me/FluidRepo.java b/src/main/java/com/glodblock/github/client/me/FluidRepo.java index c6b759ca..a82c242e 100644 --- a/src/main/java/com/glodblock/github/client/me/FluidRepo.java +++ b/src/main/java/com/glodblock/github/client/me/FluidRepo.java @@ -39,8 +39,8 @@ import cpw.mods.fml.relauncher.ReflectionHelper; public class FluidRepo extends ItemRepo { private final IItemList list = AEApi.instance().storage().createItemList(); - private final ArrayList view = new ArrayList(); - private final ArrayList dsp = new ArrayList(); + protected final ArrayList view = new ArrayList<>(); + protected final ArrayList dsp = new ArrayList<>(); private final IScrollSource src; private final ISortSource sortSrc; @@ -182,7 +182,7 @@ public class FluidRepo extends ItemRepo { private void updateNEI(final String filter) { try { if (this.NEIWord == null || !this.NEIWord.equals(filter)) { - final Class c = ReflectionHelper + final Class c = ReflectionHelper .getClass(this.getClass().getClassLoader(), "codechicken.nei.LayoutManager"); final Field fldSearchField = c.getField("searchField"); final Object searchField = fldSearchField.get(c); diff --git a/src/main/java/com/glodblock/github/common/item/ItemBaseWirelessTerminal.java b/src/main/java/com/glodblock/github/common/item/ItemBaseWirelessTerminal.java index 514f0a1b..f4940f62 100644 --- a/src/main/java/com/glodblock/github/common/item/ItemBaseWirelessTerminal.java +++ b/src/main/java/com/glodblock/github/common/item/ItemBaseWirelessTerminal.java @@ -4,7 +4,6 @@ import static com.glodblock.github.loader.recipe.WirelessTerminalRecipe.getInfin import static com.glodblock.github.util.Util.hasInfinityBoosterCard; import java.util.List; -import java.util.Optional; import net.minecraft.client.gui.GuiScreen; import net.minecraft.entity.player.EntityPlayer; @@ -36,7 +35,7 @@ public class ItemBaseWirelessTerminal extends ToolWirelessTerminal implements II public ItemBaseWirelessTerminal(GuiType t) { super(); - this.type = Optional.of(t).get(); + this.type = t; } @Override @@ -65,7 +64,7 @@ public class ItemBaseWirelessTerminal extends ToolWirelessTerminal implements II w, new BlockPos(player.inventory.currentItem, 0, 0), ForgeDirection.UNKNOWN, - this.type); + this.guiGuiType(item)); } else { player.addChatMessage(PlayerMessages.DeviceNotPowered.get()); } @@ -112,11 +111,7 @@ public class ItemBaseWirelessTerminal extends ToolWirelessTerminal implements II return null; } - public void setGuiType(GuiType type) { - this.type = type; - } - - public GuiType guiGuiType() { + public GuiType guiGuiType(ItemStack stack) { return this.type; } diff --git a/src/main/java/com/glodblock/github/common/item/ItemWirelessFluidTerminal.java b/src/main/java/com/glodblock/github/common/item/ItemWirelessFluidTerminal.java index 0937225c..a963537a 100644 --- a/src/main/java/com/glodblock/github/common/item/ItemWirelessFluidTerminal.java +++ b/src/main/java/com/glodblock/github/common/item/ItemWirelessFluidTerminal.java @@ -15,7 +15,7 @@ import appeng.util.Platform; import com.glodblock.github.FluidCraft; import com.glodblock.github.common.tabs.FluidCraftingTabs; import com.glodblock.github.inventory.gui.GuiType; -import com.glodblock.github.inventory.item.WirelessFluidTerminal; +import com.glodblock.github.inventory.item.WirelessFluidTerminalInventory; import com.glodblock.github.loader.IRegister; import com.glodblock.github.util.NameConst; import com.glodblock.github.util.Util; @@ -44,7 +44,7 @@ public class ItemWirelessFluidTerminal extends ItemBaseWirelessTerminal try { IGridNode gridNode = Util.getWirelessGrid(stack); if (gridNode != null) { - return new WirelessFluidTerminal(stack, x, gridNode, player); + return new WirelessFluidTerminalInventory(stack, x, gridNode, player); } } catch (Exception e) { if (Platform.isClient()) player.addChatMessage(PlayerMessages.OutOfRange.get()); diff --git a/src/main/java/com/glodblock/github/common/item/ItemWirelessPatternTerminal.java b/src/main/java/com/glodblock/github/common/item/ItemWirelessPatternTerminal.java index 6bedab72..6144aea9 100644 --- a/src/main/java/com/glodblock/github/common/item/ItemWirelessPatternTerminal.java +++ b/src/main/java/com/glodblock/github/common/item/ItemWirelessPatternTerminal.java @@ -15,7 +15,7 @@ import appeng.util.Platform; import com.glodblock.github.FluidCraft; import com.glodblock.github.common.tabs.FluidCraftingTabs; import com.glodblock.github.inventory.gui.GuiType; -import com.glodblock.github.inventory.item.WirelessPatternTerminal; +import com.glodblock.github.inventory.item.WirelessPatternTerminalInventory; import com.glodblock.github.loader.IRegister; import com.glodblock.github.util.NameConst; import com.glodblock.github.util.Util; @@ -44,7 +44,7 @@ public class ItemWirelessPatternTerminal extends ItemBaseWirelessTerminal try { IGridNode gridNode = Util.getWirelessGrid(stack); if (gridNode != null) { - return new WirelessPatternTerminal(stack, x, gridNode, player); + return new WirelessPatternTerminalInventory(stack, x, gridNode, player); } } catch (Exception e) { if (Platform.isClient()) player.addChatMessage(PlayerMessages.OutOfRange.get()); diff --git a/src/main/java/com/glodblock/github/common/item/ItemWirelessUltraTerminal.java b/src/main/java/com/glodblock/github/common/item/ItemWirelessUltraTerminal.java new file mode 100644 index 00000000..00791fb5 --- /dev/null +++ b/src/main/java/com/glodblock/github/common/item/ItemWirelessUltraTerminal.java @@ -0,0 +1,183 @@ +package com.glodblock.github.common.item; + +import static net.minecraft.client.gui.GuiScreen.isShiftKeyDown; + +import java.util.ArrayList; +import java.util.EnumSet; +import java.util.List; + +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.util.StatCollector; +import net.minecraft.world.World; +import net.minecraftforge.common.util.ForgeDirection; + +import appeng.api.AEApi; +import appeng.api.networking.IGridNode; +import appeng.core.features.AEFeature; +import appeng.core.localization.PlayerMessages; +import appeng.util.Platform; + +import com.glodblock.github.FluidCraft; +import com.glodblock.github.common.tabs.FluidCraftingTabs; +import com.glodblock.github.inventory.InventoryHandler; +import com.glodblock.github.inventory.gui.GuiType; +import com.glodblock.github.inventory.item.WirelessCraftingTerminalInventory; +import com.glodblock.github.inventory.item.WirelessFluidTerminalInventory; +import com.glodblock.github.inventory.item.WirelessPatternTerminalInventory; +import com.glodblock.github.loader.IRegister; +import com.glodblock.github.network.CPacketSwitchGuis; +import com.glodblock.github.util.BlockPos; +import com.glodblock.github.util.ModAndClassUtil; +import com.glodblock.github.util.NameConst; +import com.glodblock.github.util.Util; + +import cpw.mods.fml.common.registry.GameRegistry; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + +public class ItemWirelessUltraTerminal extends ItemBaseWirelessTerminal + implements IRegister { + + public final static String MODE = "mode_main"; + private final static List guis = new ArrayList<>(); + + public ItemWirelessUltraTerminal() { + super(null); + AEApi.instance().registries().wireless().registerWirelessHandler(this); + this.setFeature(EnumSet.of(AEFeature.WirelessAccessTerminal, AEFeature.PoweredTools)); + setUnlocalizedName(NameConst.ITEM_WIRELESS_ULTRA_TERMINAL); + setTextureName(FluidCraft.resource(NameConst.ITEM_WIRELESS_ULTRA_TERMINAL).toString()); + guis.add(GuiType.WIRELESS_CRAFTING_TERMINAL); + guis.add(GuiType.WIRELESS_FLUID_PATTERN_TERMINAL); + guis.add(GuiType.WIRELESS_FLUID_TERMINAL); + if (ModAndClassUtil.ThE) { + guis.add(GuiType.WIRELESS_ESSENTIA_TERMINAL); + } + } + + @Override + public ItemWirelessUltraTerminal register() { + GameRegistry.registerItem(this, NameConst.ITEM_WIRELESS_ULTRA_TERMINAL, FluidCraft.MODID); + setCreativeTab(FluidCraftingTabs.INSTANCE); + return this; + } + + @SideOnly(Side.CLIENT) + @Override + public void addCheckedInformation(ItemStack stack, EntityPlayer player, List lines, + boolean displayMoreInfo) { + super.addCheckedInformation(stack, player, lines, displayMoreInfo); + if (isShiftKeyDown()) { + lines.add(StatCollector.translateToLocal(NameConst.TT_ULTRA_TERMINAL)); + lines.add(StatCollector.translateToLocal(NameConst.TT_ULTRA_TERMINAL + "." + guiGuiType(stack))); + } else { + lines.add(NameConst.i18n(NameConst.TT_SHIFT_FOR_MORE)); + } + } + + @Override + public String getItemStackDisplayName(ItemStack stack) { + return StatCollector.translateToLocalFormatted("item.wireless_ultra_terminal." + guiGuiType(stack) + ".name"); + } + + @Override + public Object getInventory(ItemStack stack, World world, int x, int y, int z, EntityPlayer player) { + try { + IGridNode gridNode = Util.getWirelessGrid(stack); + if (gridNode != null) { + GuiType gui = readMode(stack); + if (gui == GuiType.WIRELESS_FLUID_PATTERN_TERMINAL) { + return new WirelessPatternTerminalInventory(stack, x, gridNode, player); + } + if (gui == GuiType.WIRELESS_CRAFTING_TERMINAL) { + return new WirelessCraftingTerminalInventory(stack, x, gridNode, player); + } else if (ModAndClassUtil.ThE && gui == GuiType.WIRELESS_ESSENTIA_TERMINAL) { + return new WirelessFluidTerminalInventory(stack, x, gridNode, player); + } else if (gui == GuiType.WIRELESS_FLUID_TERMINAL) { + return new WirelessFluidTerminalInventory(stack, x, gridNode, player); + } else { + this.setMode(GuiType.WIRELESS_FLUID_TERMINAL, stack); // set as default mode + return new WirelessFluidTerminalInventory(stack, x, gridNode, player); + } + } + } catch (Exception e) { + if (Platform.isClient()) player.addChatMessage(PlayerMessages.OutOfRange.get()); + } + return null; + } + + @Override + public ItemStack onItemRightClick(final ItemStack item, final World w, final EntityPlayer player) { + if (player.isSneaking()) { + setNext(readMode(item), item); + return item; + } + readMode(item); + return super.onItemRightClick(item, w, player); + } + + public static GuiType readMode(ItemStack stack) { + NBTTagCompound data = Platform.openNbtData(stack); + if (data.hasKey(MODE)) { + String GUI = data.getString(MODE); + try { + return GuiType.valueOf(GUI); + } catch (IllegalArgumentException e) { + return GuiType.WIRELESS_CRAFTING_TERMINAL; + } + } else { + return GuiType.WIRELESS_CRAFTING_TERMINAL; + } + } + + public void setNext(GuiType type, ItemStack stack) { + boolean f = false; + for (GuiType g : guis) { + if (f) { + setMode(g.toString(), stack); + return; + } + if (g == type) { + f = true; + } + } + setMode(guis.get(0).toString(), stack); + } + + public void setMode(String mode, ItemStack stack) { + NBTTagCompound data = Platform.openNbtData(stack); + data.setString(MODE, mode); + } + + public void setMode(GuiType mode, ItemStack stack) { + this.setMode(mode.toString(), stack); + } + + public static void switchTerminal(EntityPlayer player, GuiType guiType) { + if (player.inventory.getCurrentItem().getItem() instanceof ItemWirelessUltraTerminal) { + ((ItemWirelessUltraTerminal) player.inventory.getCurrentItem().getItem()) + .setMode(guiType, player.inventory.getCurrentItem()); + } + if (Platform.isClient()) { + player.closeScreen(); + FluidCraft.proxy.netHandler.sendToServer(new CPacketSwitchGuis(guiType, true)); + } else { + InventoryHandler.openGui( + player, + player.worldObj, + new BlockPos( + player.inventory.currentItem, + Util.GuiHelper.encodeType(0, Util.GuiHelper.GuiType.ITEM), + 0), + ForgeDirection.UNKNOWN, + guiType); + } + } + + @Override + public GuiType guiGuiType(ItemStack stack) { + return readMode(stack); + } +} diff --git a/src/main/java/com/glodblock/github/common/parts/PartFluidPatternTerminal.java b/src/main/java/com/glodblock/github/common/parts/PartFluidPatternTerminal.java index d3759126..51955cb9 100644 --- a/src/main/java/com/glodblock/github/common/parts/PartFluidPatternTerminal.java +++ b/src/main/java/com/glodblock/github/common/parts/PartFluidPatternTerminal.java @@ -88,6 +88,9 @@ public class PartFluidPatternTerminal extends FCFluidEncodeTerminal { } } } + if (inv == this.crafting) { + this.fixCraftingRecipes(); + } this.getHost().markForSave(); } diff --git a/src/main/java/com/glodblock/github/common/parts/base/FCFluidEncodeTerminal.java b/src/main/java/com/glodblock/github/common/parts/base/FCFluidEncodeTerminal.java index dc8e9c36..0a04948a 100644 --- a/src/main/java/com/glodblock/github/common/parts/base/FCFluidEncodeTerminal.java +++ b/src/main/java/com/glodblock/github/common/parts/base/FCFluidEncodeTerminal.java @@ -11,9 +11,9 @@ import appeng.api.storage.data.IAEItemStack; import appeng.tile.inventory.AppEngInternalInventory; import com.glodblock.github.common.item.ItemFluidPacket; -import com.glodblock.github.inventory.item.PatternTerminal; +import com.glodblock.github.inventory.item.IItemPatternTerminal; -public abstract class FCFluidEncodeTerminal extends FCPart implements PatternTerminal { +public abstract class FCFluidEncodeTerminal extends FCPart implements IItemPatternTerminal { protected AppEngInternalInventory crafting; protected AppEngInternalInventory output; @@ -71,62 +71,77 @@ public abstract class FCFluidEncodeTerminal extends FCPart implements PatternTer this.crafting.writeToNBT(data, "craftingGrid"); } + @Override public boolean shouldCombine() { return this.combine; } + @Override public void setCombineMode(boolean shouldCombine) { this.combine = shouldCombine; } + @Override public boolean isSubstitution() { return this.substitute; } + @Override public boolean isPrioritize() { return this.prioritize; } + @Override public void setBeSubstitute(boolean canBeSubstitute) { this.beSubstitute = canBeSubstitute; } + @Override public boolean canBeSubstitute() { return this.beSubstitute; } + @Override public void setSubstitution(boolean canSubstitute) { this.substitute = canSubstitute; } + @Override public void setPrioritization(boolean canPrioritize) { this.prioritize = canPrioritize; } + @Override public boolean isInverted() { return inverted; } + @Override public void setInverted(boolean inverted) { this.inverted = inverted; } + @Override public int getActivePage() { return this.activePage; } + @Override public void setActivePage(int activePage) { this.activePage = activePage; } + @Override public void setCraftingRecipe(final boolean craftingMode) { this.craftingMode = craftingMode; } + @Override public boolean isCraftingRecipe() { return this.craftingMode; } + @Override public void onChangeCrafting(IAEItemStack[] newCrafting, IAEItemStack[] newOutput) { IInventory crafting = this.getInventoryByName("crafting"); IInventory output = this.getInventoryByName("output"); @@ -159,6 +174,7 @@ public abstract class FCFluidEncodeTerminal extends FCPart implements PatternTer return super.getInventoryByName(name); } + @Override public void sortCraftingItems() { List items = new ArrayList(); List fluids = new ArrayList(); diff --git a/src/main/java/com/glodblock/github/crossmod/thaumcraft/AspectRender.java b/src/main/java/com/glodblock/github/crossmod/thaumcraft/AspectRender.java new file mode 100644 index 00000000..51b5e2a9 --- /dev/null +++ b/src/main/java/com/glodblock/github/crossmod/thaumcraft/AspectRender.java @@ -0,0 +1,38 @@ +package com.glodblock.github.crossmod.thaumcraft; + +import net.minecraft.client.Minecraft; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.util.ResourceLocation; + +import org.lwjgl.opengl.GL11; + +import thaumcraft.api.aspects.Aspect; +import thaumcraft.client.lib.UtilsFX; + +import com.glodblock.github.util.RenderUtil; + +public class AspectRender { + + public static final ResourceLocation UNKNOWN_TEXTURE = new ResourceLocation( + "thaumcraft", + "textures/aspects/_unknown.png"); + + public static void drawAspect(EntityPlayer player, int posX, int posY, float zLevel, Aspect aspect, long amount) { + if (aspect == null || amount <= 0) { + return; + } + if (AspectUtil.isPlayerDiscoveredAspect(player, aspect)) { + UtilsFX.drawTag(posX, posY, aspect, 0, 0, zLevel); + } else { + Minecraft.getMinecraft().renderEngine.bindTexture(UNKNOWN_TEXTURE); + RenderUtil.setGLColorFromInt(aspect.getColor()); + GL11.glDisable(GL11.GL_LIGHTING); + GL11.glEnable(GL11.GL_BLEND); + GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); + UtilsFX.drawTexturedQuadFull(posX, posY, zLevel); + GL11.glEnable(GL11.GL_LIGHTING); + GL11.glDisable(GL11.GL_BLEND); + } + } + +} diff --git a/src/main/java/com/glodblock/github/crossmod/thaumcraft/AspectUtil.java b/src/main/java/com/glodblock/github/crossmod/thaumcraft/AspectUtil.java new file mode 100644 index 00000000..57ccc6a2 --- /dev/null +++ b/src/main/java/com/glodblock/github/crossmod/thaumcraft/AspectUtil.java @@ -0,0 +1,142 @@ +package com.glodblock.github.crossmod.thaumcraft; + +import java.util.Objects; + +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraftforge.fluids.FluidStack; + +import org.apache.commons.lang3.tuple.ImmutablePair; +import org.apache.commons.lang3.tuple.MutablePair; + +import thaumcraft.api.aspects.Aspect; +import thaumcraft.api.aspects.IEssentiaContainerItem; +import thaumcraft.common.Thaumcraft; +import thaumicenergistics.api.storage.IAspectStack; +import thaumicenergistics.common.fluids.GaseousEssentia; +import thaumicenergistics.common.integration.tc.EssentiaItemContainerHelper; +import thaumicenergistics.common.storage.AspectStack; +import appeng.api.storage.data.IAEFluidStack; +import appeng.util.item.AEFluidStack; + +public class AspectUtil { + + public static final EssentiaItemContainerHelper HELPER = EssentiaItemContainerHelper.INSTANCE; + public static final int R = 128; + + public static boolean isPlayerDiscoveredAspect(final EntityPlayer player, final Aspect aspect) { + if (player != null && aspect != null) { + return Thaumcraft.proxy.getPlayerKnowledge().hasDiscoveredAspect(player.getCommandSenderName(), aspect); + } + return false; + } + + public static boolean isEssentiaGas(FluidStack fluid) { + return fluid != null && fluid.getFluid() instanceof GaseousEssentia; + } + + public static boolean isEssentiaGas(IAEFluidStack fluid) { + return fluid != null && fluid.getFluid() instanceof GaseousEssentia; + } + + public static Aspect getAspectFromGas(FluidStack fluid) { + if (!isEssentiaGas(fluid)) { + return null; + } + GaseousEssentia gas = (GaseousEssentia) fluid.getFluid(); + return gas.getAspect(); + } + + public static Aspect getAspectFromJar(ItemStack stack) { + if (isEssentiaContainer(stack)) { + return HELPER.getAspectInContainer(stack); + } + return null; + } + + public static Aspect getAspectFromGas(IAEFluidStack fluid) { + if (isEssentiaGas(fluid)) { + return null; + } + GaseousEssentia gas = (GaseousEssentia) fluid.getFluid(); + return gas.getAspect(); + } + + public static FluidStack getGasFromAspect(IAspectStack aspectStack) { + if (aspectStack == null || aspectStack.isEmpty()) return null; + return new FluidStack( + GaseousEssentia.getGasFromAspect(aspectStack.getAspect()), + (int) aspectStack.getStackSize() * R); + } + + public static boolean isEssentiaContainer(ItemStack stack) { + return HELPER.getItemType(stack) != EssentiaItemContainerHelper.AspectItemType.Invalid + && HELPER.getItemType(stack) != EssentiaItemContainerHelper.AspectItemType.ItemAspect; + } + + public static AEFluidStack getAEGasFromContainer(ItemStack stack) { + if (isEssentiaContainer(stack) && !isEmptyEssentiaContainer(stack)) { + IAspectStack aspectStack = HELPER.getAspectStackFromContainer(stack); + aspectStack.setStackSize(stack.stackSize * aspectStack.getStackSize()); + FluidStack gas = getGasFromAspect(aspectStack); + return AEFluidStack.create(gas); + } + return null; + } + + public static boolean isEmptyEssentiaContainer(ItemStack stack) { + return HELPER.isContainerEmpty(stack) && isEssentiaContainer(stack); + } + + public static ItemStack setAspectAmount(ItemStack itemStack, int amount, Aspect aspect) { + if (isEssentiaContainer(itemStack)) { + IEssentiaContainerItem container = (IEssentiaContainerItem) itemStack.getItem(); + assert container != null; + container.getAspects(itemStack).aspects.put(aspect, amount); + return itemStack; + } + return null; + } + + public static MutablePair fillEssentiaFromGas(ItemStack itemStack, FluidStack fluid) { + if (isEssentiaContainer(itemStack) && isEssentiaGas(fluid)) { + if (itemStack.stackSize != 1) { + return null; + } + Aspect aspect = getAspectFromGas(fluid); + int amount = fluid.amount / R; + EssentiaItemContainerHelper.AspectItemType iType = HELPER.getItemType(itemStack); + if (iType == EssentiaItemContainerHelper.AspectItemType.JarLabel) { + ItemStack label = itemStack.copy(); + HELPER.setLabelAspect(label, aspect); + } + int cap = HELPER.getContainerCapacity(itemStack); + int tryFill = Math.min(cap, amount); + ImmutablePair result = HELPER + .injectIntoContainer(itemStack, new AspectStack(aspect, tryFill)); + return result != null ? new MutablePair<>(result.left * R, result.right) : null; + } + return null; + } + + public static MutablePair drainEssentiaFromGas(ItemStack itemStack, FluidStack fluid) { + if (isEssentiaContainer(itemStack) && isEssentiaGas(fluid)) { + Aspect aspect = getAspectFromGas(fluid); + int amount = fluid.amount / R; + IAspectStack contents = HELPER.getAspectStackFromContainer(itemStack); + int drained; + ItemStack stack = null; + if (contents == null || !Objects.equals(contents.getAspect(), aspect)) { + drained = 0; + } else { + ImmutablePair result = HELPER + .extractFromContainer(itemStack, new AspectStack(aspect, amount)); + drained = result == null ? 0 : result.left; + stack = result == null ? null : result.right; + } + return stack == null ? null : new MutablePair<>(drained * R, stack); + } + return null; + } + +} diff --git a/src/main/java/com/glodblock/github/inventory/ItemBiggerAppEngInventory.java b/src/main/java/com/glodblock/github/inventory/ItemBiggerAppEngInventory.java index ab897af2..d2459bfb 100644 --- a/src/main/java/com/glodblock/github/inventory/ItemBiggerAppEngInventory.java +++ b/src/main/java/com/glodblock/github/inventory/ItemBiggerAppEngInventory.java @@ -5,6 +5,8 @@ import net.minecraft.item.ItemStack; import appeng.tile.inventory.BiggerAppEngInventory; import appeng.util.Platform; +import com.glodblock.github.inventory.gui.GuiType; + public class ItemBiggerAppEngInventory extends BiggerAppEngInventory { private final ItemStack is; @@ -19,6 +21,17 @@ public class ItemBiggerAppEngInventory extends BiggerAppEngInventory { @Override public void markDirty() { + boolean isCraft = Platform.openNbtData(is).getBoolean("craftingMode"); + boolean isCraftingTerm = Platform.openNbtData(is).getString("mode_main") + .equals(GuiType.WIRELESS_CRAFTING_TERMINAL.toString()); + if (!isCraftingTerm && isCraft) { + for (int x = 0; x < this.getSizeInventory(); x++) { + final ItemStack is = this.getStackInSlot(x); + if (is != null) { + is.stackSize = 1; + } + } + } this.writeToNBT(Platform.openNbtData(is), this.name); } diff --git a/src/main/java/com/glodblock/github/inventory/gui/GuiType.java b/src/main/java/com/glodblock/github/inventory/gui/GuiType.java index e88a29bd..4cf9e5a8 100644 --- a/src/main/java/com/glodblock/github/inventory/gui/GuiType.java +++ b/src/main/java/com/glodblock/github/inventory/gui/GuiType.java @@ -208,6 +208,7 @@ public enum GuiType { return new GuiFluidPortableCell(player.inventory, inv); } }), + WIRELESS_FLUID_TERMINAL(new ItemGuiFactory(IWirelessTerminal.class) { @Override @@ -220,16 +221,43 @@ public enum GuiType { return new GuiFluidPortableCell(player.inventory, inv); } }), - WIRELESS_FLUID_PATTERN_TERMINAL(new ItemGuiFactory(IWirelessTerminal.class) { + + WIRELESS_ESSENTIA_TERMINAL(new ItemGuiFactory(IWirelessTerminal.class) { @Override protected Object createServerGui(EntityPlayer player, IWirelessTerminal inv) { - return new ContainerPatternPortableCell(player.inventory, inv); + return new ContainerEssentiaMonitor(player.inventory, inv); } @Override protected Object createClientGui(EntityPlayer player, IWirelessTerminal inv) { - return new GuiPatternPortableCell(player.inventory, inv); + return new GuiEssentiaTerminal(player.inventory, inv); + } + }), + + WIRELESS_FLUID_PATTERN_TERMINAL(new ItemGuiFactory(IWirelessTerminal.class) { + + @Override + protected Object createServerGui(EntityPlayer player, IWirelessTerminal inv) { + return new ContainerFluidPatternWireless(player.inventory, inv); + } + + @Override + protected Object createClientGui(EntityPlayer player, IWirelessTerminal inv) { + return new GuiFluidPatternWireless(player.inventory, inv); + } + }), + + WIRELESS_CRAFTING_TERMINAL(new ItemGuiFactory(IWirelessTerminal.class) { + + @Override + protected Object createServerGui(EntityPlayer player, IWirelessTerminal inv) { + return new ContainerCraftingWireless(player.inventory, inv); + } + + @Override + protected Object createClientGui(EntityPlayer player, IWirelessTerminal inv) { + return new GuiFluidCraftingWireless(player.inventory, inv); } }), @@ -285,15 +313,28 @@ public enum GuiType { } }), - FLUID_CRAFTING_AMOUNT(new PartGuiFactory(FCPart.class) { + FLUID_CRAFTING_CONFIRM_ITEM(new ItemGuiFactory(IWirelessTerminal.class) { @Override - protected Object createServerGui(EntityPlayer player, FCPart inv) { + protected Object createServerGui(EntityPlayer player, IWirelessTerminal inv) { + return new ContainerFluidCraftConfirm(player.inventory, inv); + } + + @Override + protected Object createClientGui(EntityPlayer player, IWirelessTerminal inv) { + return new GuiFluidCraftConfirm(player.inventory, inv); + } + }), + + FLUID_CRAFTING_AMOUNT(new PartOrItemGuiFactory(ITerminalHost.class) { + + @Override + protected Object createServerGui(EntityPlayer player, ITerminalHost inv) { return new ContainerCraftAmount(player.inventory, inv); } @Override - protected Object createClientGui(EntityPlayer player, FCPart inv) { + protected Object createClientGui(EntityPlayer player, ITerminalHost inv) { return new GuiFluidCraftAmount(player.inventory, inv); } }), @@ -311,15 +352,15 @@ public enum GuiType { } }), - PATTERN_VALUE_SET(new PartGuiFactory(FCPart.class) { + PATTERN_VALUE_SET(new PartOrItemGuiFactory(ITerminalHost.class) { @Override - protected Object createServerGui(EntityPlayer player, FCPart inv) { + protected Object createServerGui(EntityPlayer player, ITerminalHost inv) { return new ContainerPatternValueAmount(player.inventory, inv); } @Override - protected Object createClientGui(EntityPlayer player, FCPart inv) { + protected Object createClientGui(EntityPlayer player, ITerminalHost inv) { return new GuiPatternValueAmount(player.inventory, inv); } }); diff --git a/src/main/java/com/glodblock/github/inventory/item/PatternTerminal.java b/src/main/java/com/glodblock/github/inventory/item/IItemPatternTerminal.java similarity index 81% rename from src/main/java/com/glodblock/github/inventory/item/PatternTerminal.java rename to src/main/java/com/glodblock/github/inventory/item/IItemPatternTerminal.java index a2ea143b..4ba4f335 100644 --- a/src/main/java/com/glodblock/github/inventory/item/PatternTerminal.java +++ b/src/main/java/com/glodblock/github/inventory/item/IItemPatternTerminal.java @@ -1,15 +1,11 @@ package com.glodblock.github.inventory.item; -import net.minecraft.inventory.IInventory; - import appeng.api.storage.data.IAEItemStack; -public interface PatternTerminal { +public interface IItemPatternTerminal extends IItemTerminal { boolean isInverted(); - IInventory getInventoryByName(final String name); - boolean canBeSubstitute(); boolean isPrioritize(); @@ -39,6 +35,4 @@ public interface PatternTerminal { boolean isCraftingRecipe(); void sortCraftingItems(); - - default void saveSettings() {} } diff --git a/src/main/java/com/glodblock/github/inventory/item/IItemTerminal.java b/src/main/java/com/glodblock/github/inventory/item/IItemTerminal.java new file mode 100644 index 00000000..5764099c --- /dev/null +++ b/src/main/java/com/glodblock/github/inventory/item/IItemTerminal.java @@ -0,0 +1,11 @@ +package com.glodblock.github.inventory.item; + +import net.minecraft.inventory.IInventory; + +public interface IItemTerminal { + + IInventory getInventoryByName(final String name); + + default void saveSettings() {} + +} diff --git a/src/main/java/com/glodblock/github/inventory/item/IWirelessCraftTerminal.java b/src/main/java/com/glodblock/github/inventory/item/IWirelessCraftTerminal.java new file mode 100644 index 00000000..2b4526ea --- /dev/null +++ b/src/main/java/com/glodblock/github/inventory/item/IWirelessCraftTerminal.java @@ -0,0 +1,5 @@ +package com.glodblock.github.inventory.item; + +public interface IWirelessCraftTerminal extends IWirelessTerminal, IItemTerminal { + +} diff --git a/src/main/java/com/glodblock/github/inventory/item/IWirelessPatternTerminal.java b/src/main/java/com/glodblock/github/inventory/item/IWirelessPatternTerminal.java index cf845429..ccada8e4 100644 --- a/src/main/java/com/glodblock/github/inventory/item/IWirelessPatternTerminal.java +++ b/src/main/java/com/glodblock/github/inventory/item/IWirelessPatternTerminal.java @@ -1,5 +1,5 @@ package com.glodblock.github.inventory.item; -public interface IWirelessPatternTerminal extends IWirelessTerminal, PatternTerminal { +public interface IWirelessPatternTerminal extends IWirelessTerminal, IItemPatternTerminal { } diff --git a/src/main/java/com/glodblock/github/inventory/item/IWirelessTerminal.java b/src/main/java/com/glodblock/github/inventory/item/IWirelessTerminal.java index 1c4d1317..f8e9f1b5 100644 --- a/src/main/java/com/glodblock/github/inventory/item/IWirelessTerminal.java +++ b/src/main/java/com/glodblock/github/inventory/item/IWirelessTerminal.java @@ -1,9 +1,24 @@ package com.glodblock.github.inventory.item; +import net.minecraft.item.ItemStack; + +import appeng.api.implementations.guiobjects.IGuiItemObject; import appeng.api.implementations.tiles.IViewCellStorage; import appeng.api.networking.IGridHost; +import appeng.api.networking.security.IActionHost; import appeng.tile.inventory.IAEAppEngInventory; -public interface IWirelessTerminal extends IFluidPortableCell, IViewCellStorage, IAEAppEngInventory, IGridHost { +import com.glodblock.github.common.item.ItemWirelessUltraTerminal; + +public interface IWirelessTerminal + extends IFluidPortableCell, IViewCellStorage, IAEAppEngInventory, IGridHost, IActionHost { + + default boolean isUniversal(Object holder) { + if (holder instanceof IGuiItemObject) { + ItemStack stack = ((IGuiItemObject) holder).getItemStack(); + return stack != null && stack.getItem() instanceof ItemWirelessUltraTerminal; + } + return false; + } } diff --git a/src/main/java/com/glodblock/github/inventory/item/WirelessCraftingTerminalInventory.java b/src/main/java/com/glodblock/github/inventory/item/WirelessCraftingTerminalInventory.java new file mode 100644 index 00000000..9dd2d21b --- /dev/null +++ b/src/main/java/com/glodblock/github/inventory/item/WirelessCraftingTerminalInventory.java @@ -0,0 +1,155 @@ +package com.glodblock.github.inventory.item; + +import java.util.Objects; + +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.IInventory; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraftforge.common.util.ForgeDirection; + +import appeng.api.config.*; +import appeng.api.implementations.items.IAEItemPowerStorage; +import appeng.api.networking.IGridNode; +import appeng.api.storage.IMEInventoryHandler; +import appeng.api.storage.IMEMonitor; +import appeng.api.storage.MEMonitorHandler; +import appeng.api.storage.StorageChannel; +import appeng.api.storage.data.IAEFluidStack; +import appeng.api.storage.data.IAEItemStack; +import appeng.api.util.AECableType; +import appeng.api.util.IConfigManager; +import appeng.items.contents.WirelessTerminalViewCells; +import appeng.items.tools.powered.ToolWirelessTerminal; +import appeng.tile.inventory.AppEngInternalInventory; +import appeng.tile.inventory.InvOperation; +import appeng.util.ConfigManager; +import appeng.util.Platform; + +import com.glodblock.github.inventory.ItemBiggerAppEngInventory; +import com.glodblock.github.util.Util; + +public class WirelessCraftingTerminalInventory extends MEMonitorHandler + implements IWirelessCraftTerminal { + + private final ItemStack target; + private final IAEItemPowerStorage ips; + private final int inventorySlot; + private final AppEngInternalInventory viewCell; + private final StorageChannel channel; + private final IGridNode grid; + + protected AppEngInternalInventory crafting; + protected AppEngInternalInventory output; + + @SuppressWarnings("unchecked") + public WirelessCraftingTerminalInventory(final ItemStack is, final int slot, IGridNode gridNode, + EntityPlayer player) { + super( + (IMEInventoryHandler) Objects + .requireNonNull(Util.getWirelessInv(is, player, StorageChannel.ITEMS))); + this.ips = (ToolWirelessTerminal) is.getItem(); + this.grid = gridNode; + this.target = is; + this.inventorySlot = slot; + this.viewCell = new WirelessTerminalViewCells(is); + this.channel = StorageChannel.ITEMS; + this.crafting = new ItemBiggerAppEngInventory(is, "crafting_c", 9); + this.output = new ItemBiggerAppEngInventory(is, "output_c", 3); + } + + public StorageChannel getChannel() { + return this.channel; + } + + @Override + public ItemStack getItemStack() { + return this.target; + } + + @Override + public double extractAEPower(double amt, Actionable mode, PowerMultiplier usePowerMultiplier) { + amt = usePowerMultiplier.multiply(amt); + if (mode == Actionable.SIMULATE) { + return usePowerMultiplier.divide(Math.min(amt, this.ips.getAECurrentPower(this.target))); + } + return usePowerMultiplier.divide(this.ips.extractAEPower(this.target, amt)); + } + + @Override + public IMEMonitor getItemInventory() { + return this; + } + + @Override + public IMEMonitor getFluidInventory() { + return null; + } + + @Override + public IConfigManager getConfigManager() { + final ConfigManager out = new ConfigManager((manager, settingName, newValue) -> { + final NBTTagCompound data = Platform.openNbtData(this.target); + manager.writeToNBT(data); + }); + out.registerSetting(Settings.SORT_BY, SortOrder.NAME); + out.registerSetting(Settings.VIEW_MODE, ViewItems.ALL); + out.registerSetting(Settings.SORT_DIRECTION, SortDir.ASCENDING); + out.readFromNBT((NBTTagCompound) Platform.openNbtData(this.target).copy()); + return out; + } + + @Override + public int getInventorySlot() { + return this.inventorySlot; + } + + @Override + public IInventory getViewCellStorage() { + return this.viewCell; + } + + @Override + public IGridNode getGridNode(ForgeDirection dir) { + return this.grid; + } + + @Override + public AECableType getCableConnectionType(ForgeDirection dir) { + return AECableType.NONE; + } + + @Override + public void securityBreak() { + this.getGridNode(ForgeDirection.UNKNOWN).getMachine().securityBreak(); + } + + @Override + public void saveChanges() { + // NO-OP + } + + @Override + public void onChangeInventory(IInventory inv, int slot, InvOperation mc, ItemStack removedStack, + ItemStack newStack) { + // NO-OP + } + + @Override + public IInventory getInventoryByName(String name) { + if (name.equals("crafting")) { + return this.crafting; + } + + if (name.equals("output")) { + return this.output; + } + + return null; + } + + @Override + public IGridNode getActionableNode() { + return this.grid; + } +} diff --git a/src/main/java/com/glodblock/github/inventory/item/WirelessFluidTerminal.java b/src/main/java/com/glodblock/github/inventory/item/WirelessFluidTerminalInventory.java similarity index 92% rename from src/main/java/com/glodblock/github/inventory/item/WirelessFluidTerminal.java rename to src/main/java/com/glodblock/github/inventory/item/WirelessFluidTerminalInventory.java index 0c9541c5..6240ac90 100644 --- a/src/main/java/com/glodblock/github/inventory/item/WirelessFluidTerminal.java +++ b/src/main/java/com/glodblock/github/inventory/item/WirelessFluidTerminalInventory.java @@ -28,7 +28,7 @@ import appeng.util.Platform; import com.glodblock.github.util.Util; -public class WirelessFluidTerminal extends MEMonitorHandler implements IWirelessTerminal { +public class WirelessFluidTerminalInventory extends MEMonitorHandler implements IWirelessTerminal { private final ItemStack target; private final IAEItemPowerStorage ips; @@ -38,7 +38,7 @@ public class WirelessFluidTerminal extends MEMonitorHandler imple private final IGridNode grid; @SuppressWarnings("unchecked") - public WirelessFluidTerminal(final ItemStack is, final int slot, IGridNode gridNode, EntityPlayer player) { + public WirelessFluidTerminalInventory(final ItemStack is, final int slot, IGridNode gridNode, EntityPlayer player) { super( (IMEInventoryHandler) Objects .requireNonNull(Util.getWirelessInv(is, player, StorageChannel.FLUIDS))); @@ -121,6 +121,11 @@ public class WirelessFluidTerminal extends MEMonitorHandler imple } + @Override + public IGridNode getActionableNode() { + return this.grid; + } + @Override public void onChangeInventory(IInventory inv, int slot, InvOperation mc, ItemStack removedStack, ItemStack newStack) {} diff --git a/src/main/java/com/glodblock/github/inventory/item/WirelessPatternTerminal.java b/src/main/java/com/glodblock/github/inventory/item/WirelessPatternTerminalInventory.java similarity index 92% rename from src/main/java/com/glodblock/github/inventory/item/WirelessPatternTerminal.java rename to src/main/java/com/glodblock/github/inventory/item/WirelessPatternTerminalInventory.java index 0e5e174c..bf3ac20e 100644 --- a/src/main/java/com/glodblock/github/inventory/item/WirelessPatternTerminal.java +++ b/src/main/java/com/glodblock/github/inventory/item/WirelessPatternTerminalInventory.java @@ -33,11 +33,11 @@ import com.glodblock.github.inventory.ItemBiggerAppEngInventory; import com.glodblock.github.inventory.WirelessFluidPatternTerminalPatterns; import com.glodblock.github.util.Util; -public class WirelessPatternTerminal extends MEMonitorHandler implements IWirelessPatternTerminal { +public class WirelessPatternTerminalInventory extends MEMonitorHandler + implements IWirelessPatternTerminal { private final ItemStack target; private final IAEItemPowerStorage ips; - private final EntityPlayer p; private final int inventorySlot; private final AppEngInternalInventory viewCell; private final StorageChannel channel; @@ -56,14 +56,14 @@ public class WirelessPatternTerminal extends MEMonitorHandler impl protected int activePage = 0; @SuppressWarnings("unchecked") - public WirelessPatternTerminal(final ItemStack is, final int slot, IGridNode gridNode, EntityPlayer player) { + public WirelessPatternTerminalInventory(final ItemStack is, final int slot, IGridNode gridNode, + EntityPlayer player) { super( (IMEInventoryHandler) Objects .requireNonNull(Util.getWirelessInv(is, player, StorageChannel.ITEMS))); this.ips = (ToolWirelessTerminal) is.getItem(); this.grid = gridNode; this.target = is; - this.p = player; this.inventorySlot = slot; this.viewCell = new WirelessTerminalViewCells(is); this.channel = StorageChannel.ITEMS; @@ -163,12 +163,25 @@ public class WirelessPatternTerminal extends MEMonitorHandler impl @Override public void saveChanges() { - + // NO-OP } @Override public void onChangeInventory(IInventory inv, int slot, InvOperation mc, ItemStack removedStack, - ItemStack newStack) {} + ItemStack newStack) { + // NO-OP + } + + private void fixCraftingRecipes() { + if (this.craftingMode) { + for (int x = 0; x < this.crafting.getSizeInventory(); x++) { + final ItemStack is = this.crafting.getStackInSlot(x); + if (is != null) { + is.stackSize = 1; + } + } + } + } @Override public boolean isInverted() { @@ -231,6 +244,7 @@ public class WirelessPatternTerminal extends MEMonitorHandler impl @Override public void setCraftingRecipe(boolean craftingMode) { this.craftingMode = craftingMode; + this.fixCraftingRecipes(); } @Override @@ -309,4 +323,9 @@ public class WirelessPatternTerminal extends MEMonitorHandler impl this.writeToNBT(); } + @Override + public IGridNode getActionableNode() { + return this.grid; + } + } diff --git a/src/main/java/com/glodblock/github/loader/ItemAndBlockHolder.java b/src/main/java/com/glodblock/github/loader/ItemAndBlockHolder.java index 114487c2..5e9f9b12 100644 --- a/src/main/java/com/glodblock/github/loader/ItemAndBlockHolder.java +++ b/src/main/java/com/glodblock/github/loader/ItemAndBlockHolder.java @@ -33,6 +33,7 @@ public class ItemAndBlockHolder { public static ItemFluidConversionMonitor FLUID_CONVERSION_MONITOR = new ItemFluidConversionMonitor().register(); public static ItemPortableFluidCell PORTABLE_FLUID_CELL = new ItemPortableFluidCell().register(); public static ItemWirelessFluidTerminal WIRELESS_FLUID_TERM = new ItemWirelessFluidTerminal().register(); + public static ItemWirelessUltraTerminal WIRELESS_ULTRA_TERM = new ItemWirelessUltraTerminal().register(); public static ItemWirelessPatternTerminal WIRELESS_PATTERN_TERM = new ItemWirelessPatternTerminal().register(); public static ItemFluidPacket PACKET = new ItemFluidPacket().register(); public static ItemBasicFluidStorageCell CELL1K = new ItemBasicFluidStorageCell(CellType.Cell1kPart, 1).register(); diff --git a/src/main/java/com/glodblock/github/loader/RecipeLoader.java b/src/main/java/com/glodblock/github/loader/RecipeLoader.java index 31b323de..d18c4cf6 100644 --- a/src/main/java/com/glodblock/github/loader/RecipeLoader.java +++ b/src/main/java/com/glodblock/github/loader/RecipeLoader.java @@ -4,6 +4,9 @@ import static com.glodblock.github.loader.ItemAndBlockHolder.*; import static net.minecraft.init.Blocks.redstone_torch; import static net.minecraft.init.Items.fish; +import java.util.Arrays; +import java.util.Objects; + import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; @@ -102,6 +105,10 @@ public class RecipeLoader implements Runnable { .findItemStack("appliedenergistics2", "tile.BlockChest", 1); public static final ItemStack AE2_ENERGY_CELL = GameRegistry .findItemStack("appliedenergistics2", "tile.BlockEnergyCell", 1); + public static final ItemStack THE_WIRELESS_TERM = GameRegistry + .findItemStack("thaumicenergistics", "wireless.essentia.terminal", 1); + private static final ItemStack WCT_WIRELESS_TERM = GameRegistry + .findItemStack("ae2wct", "wirelessCraftingTerminal", 1); public static final ItemStack BUCKET = new ItemStack(Items.bucket, 1); public static final ItemStack IRON_BAR = new ItemStack(Blocks.iron_bars, 1); @@ -450,10 +457,18 @@ public class RecipeLoader implements Runnable { } } - public static void runWCTRecipe() { + public static void runTerminalRecipe() { if (ModAndClassUtil.WCT) { GameRegistry.addRecipe(new WirelessTerminalRecipe(WIRELESS_PATTERN_TERM.stack())); GameRegistry.addRecipe(new WirelessTerminalRecipe(WIRELESS_FLUID_TERM.stack())); + GameRegistry.addRecipe(new WirelessTerminalRecipe(WIRELESS_ULTRA_TERM.stack())); } + + ItemStack[] term = { AE2_WIRELESS_TERMINAL, WIRELESS_FLUID_TERM.stack(), WIRELESS_PATTERN_TERM.stack(), + THE_WIRELESS_TERM, WCT_WIRELESS_TERM }; + GameRegistry.addShapelessRecipe( + WIRELESS_ULTRA_TERM.stack(), + Arrays.stream(term).filter(Objects::nonNull).toArray()); + } } diff --git a/src/main/java/com/glodblock/github/nei/FluidCraftingTransferHandler.java b/src/main/java/com/glodblock/github/nei/FluidCraftingTransferHandler.java new file mode 100644 index 00000000..2771cdac --- /dev/null +++ b/src/main/java/com/glodblock/github/nei/FluidCraftingTransferHandler.java @@ -0,0 +1,76 @@ +package com.glodblock.github.nei; + +import java.io.IOException; +import java.util.LinkedList; +import java.util.List; + +import net.minecraft.client.gui.inventory.GuiContainer; +import net.minecraft.inventory.Slot; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.NBTTagList; + +import appeng.container.slot.SlotCraftingMatrix; +import appeng.container.slot.SlotFakeCraftingMatrix; +import appeng.core.sync.network.NetworkHandler; +import appeng.core.sync.packets.PacketNEIRecipe; +import appeng.util.Platform; +import codechicken.nei.PositionedStack; +import codechicken.nei.api.IOverlayHandler; +import codechicken.nei.recipe.IRecipeHandler; + +import com.glodblock.github.client.gui.GuiFluidCraftingWireless; + +public class FluidCraftingTransferHandler implements IOverlayHandler { + + public static final FluidCraftingTransferHandler INSTANCE = new FluidCraftingTransferHandler(); + + @Override + public void overlayRecipe(GuiContainer firstGui, IRecipeHandler recipe, int recipeIndex, boolean shift) { + try { + final List ingredients = recipe.getIngredientStacks(recipeIndex); + if (firstGui instanceof GuiFluidCraftingWireless + && FluidPatternTerminalRecipeTransferHandler.craftSet.contains(recipe.getOverlayIdentifier())) { + PacketNEIRecipe packet = new PacketNEIRecipe(packIngredients(firstGui, ingredients)); + NetworkHandler.instance.sendToServer(packet); + } + } catch (final Exception | Error ignored) { + // NO-OP + } + } + + private NBTTagCompound packIngredients(GuiContainer gui, List ingredients) throws IOException { + final NBTTagCompound recipe = new NBTTagCompound(); + for (final PositionedStack positionedStack : ingredients) { + final int col = (positionedStack.relx - 25) / 18; + final int row = (positionedStack.rely - 6) / 18; + if (positionedStack.items != null && positionedStack.items.length > 0) { + for (final Object o : gui.inventorySlots.inventorySlots) { + if (o instanceof SlotCraftingMatrix || o instanceof SlotFakeCraftingMatrix) { + Slot slot = (Slot) o; + if (slot.getSlotIndex() == col + row * 3) { + final NBTTagList tags = new NBTTagList(); + final List list = new LinkedList(); + // prefer pure crystals. + for (int x = 0; x < positionedStack.items.length; x++) { + if (Platform.isRecipePrioritized(positionedStack.items[x])) { + list.add(0, positionedStack.items[x]); + } else { + list.add(positionedStack.items[x]); + } + } + for (final ItemStack is : list) { + final NBTTagCompound tag = new NBTTagCompound(); + is.writeToNBT(tag); + tags.appendTag(tag); + } + recipe.setTag("#" + slot.getSlotIndex(), tags); + break; + } + } + } + } + } + return recipe; + } +} diff --git a/src/main/java/com/glodblock/github/nei/NEI_FC_Config.java b/src/main/java/com/glodblock/github/nei/NEI_FC_Config.java index dda71243..d8209f8a 100644 --- a/src/main/java/com/glodblock/github/nei/NEI_FC_Config.java +++ b/src/main/java/com/glodblock/github/nei/NEI_FC_Config.java @@ -4,9 +4,10 @@ import codechicken.nei.api.API; import codechicken.nei.api.IConfigureNEI; import com.glodblock.github.FluidCraft; +import com.glodblock.github.client.gui.GuiFluidCraftingWireless; import com.glodblock.github.client.gui.GuiFluidPatternTerminal; import com.glodblock.github.client.gui.GuiFluidPatternTerminalEx; -import com.glodblock.github.client.gui.GuiPatternPortableCell; +import com.glodblock.github.client.gui.GuiFluidPatternWireless; import com.glodblock.github.nei.recipes.FluidRecipe; public class NEI_FC_Config implements IConfigureNEI { @@ -17,7 +18,11 @@ public class NEI_FC_Config implements IConfigureNEI { API.addSearchProvider(new NEIItemFilter()); for (String identifier : FluidRecipe.getSupportRecipes()) { API.registerGuiOverlayHandler( - GuiPatternPortableCell.class, + GuiFluidCraftingWireless.class, + FluidCraftingTransferHandler.INSTANCE, + identifier); + API.registerGuiOverlayHandler( + GuiFluidPatternWireless.class, FluidPatternTerminalRecipeTransferHandler.INSTANCE, identifier); API.registerGuiOverlayHandler( diff --git a/src/main/java/com/glodblock/github/network/CPacketCraftRequest.java b/src/main/java/com/glodblock/github/network/CPacketCraftRequest.java index e644dac1..8e49fe3c 100644 --- a/src/main/java/com/glodblock/github/network/CPacketCraftRequest.java +++ b/src/main/java/com/glodblock/github/network/CPacketCraftRequest.java @@ -89,14 +89,22 @@ public class CPacketCraftRequest implements IMessage { final ContainerOpenContext context = cca.getOpenContext(); if (context != null) { - final TileEntity te = context.getTile(); - InventoryHandler.openGui( - player, - player.worldObj, - new BlockPos(te), - Objects.requireNonNull(context.getSide()), - GuiType.FLUID_CRAFTING_CONFIRM); + if (te != null) { + InventoryHandler.openGui( + player, + player.worldObj, + new BlockPos(te), + Objects.requireNonNull(context.getSide()), + GuiType.FLUID_CRAFTING_CONFIRM); + } else { + InventoryHandler.openGui( + player, + player.worldObj, + new BlockPos(player.inventory.currentItem, 0, 0), + Objects.requireNonNull(context.getSide()), + GuiType.FLUID_CRAFTING_CONFIRM_ITEM); + } if (player.openContainer instanceof ContainerFluidCraftConfirm) { final ContainerFluidCraftConfirm ccc = (ContainerFluidCraftConfirm) player.openContainer; diff --git a/src/main/java/com/glodblock/github/network/CPacketInventoryAction.java b/src/main/java/com/glodblock/github/network/CPacketInventoryAction.java index 4bfc95d6..07855a0d 100644 --- a/src/main/java/com/glodblock/github/network/CPacketInventoryAction.java +++ b/src/main/java/com/glodblock/github/network/CPacketInventoryAction.java @@ -7,6 +7,7 @@ import javax.annotation.Nullable; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.tileentity.TileEntity; +import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.FluidStack; import appeng.api.storage.data.IAEItemStack; @@ -22,6 +23,7 @@ import com.glodblock.github.common.item.ItemFluidPacket; import com.glodblock.github.inventory.InventoryHandler; import com.glodblock.github.inventory.gui.GuiType; import com.glodblock.github.util.BlockPos; +import com.glodblock.github.util.Util; import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; @@ -96,12 +98,24 @@ public class CPacketInventoryAction implements IMessage { final ContainerOpenContext context = baseContainer.getOpenContext(); if (context != null) { final TileEntity te = context.getTile(); - InventoryHandler.openGui( - sender, - te.getWorldObj(), - new BlockPos(te), - Objects.requireNonNull(baseContainer.getOpenContext().getSide()), - GuiType.FLUID_CRAFTING_AMOUNT); + if (te != null) { + InventoryHandler.openGui( + sender, + te.getWorldObj(), + new BlockPos(te), + Objects.requireNonNull(baseContainer.getOpenContext().getSide()), + GuiType.FLUID_CRAFTING_AMOUNT); + } else { + InventoryHandler.openGui( + sender, + sender.worldObj, + new BlockPos( + sender.inventory.currentItem, + Util.GuiHelper.encodeType(0, Util.GuiHelper.GuiType.ITEM), + 0), + ForgeDirection.UNKNOWN, + GuiType.FLUID_CRAFTING_AMOUNT); + } if (sender.openContainer instanceof ContainerCraftAmount) { final ContainerCraftAmount cca = (ContainerCraftAmount) sender.openContainer; if (baseContainer.getTargetStack() != null) { @@ -115,12 +129,24 @@ public class CPacketInventoryAction implements IMessage { final ContainerOpenContext context = baseContainer.getOpenContext(); if (context != null && message.stack != null) { final TileEntity te = context.getTile(); - InventoryHandler.openGui( - sender, - te.getWorldObj(), - new BlockPos(te), - Objects.requireNonNull(baseContainer.getOpenContext().getSide()), - GuiType.PATTERN_VALUE_SET); + if (te != null) { + InventoryHandler.openGui( + sender, + te.getWorldObj(), + new BlockPos(te), + Objects.requireNonNull(baseContainer.getOpenContext().getSide()), + GuiType.PATTERN_VALUE_SET); + } else { + InventoryHandler.openGui( + sender, + sender.worldObj, + new BlockPos( + sender.inventory.currentItem, + Util.GuiHelper.encodeType(0, Util.GuiHelper.GuiType.ITEM), + 0), + ForgeDirection.UNKNOWN, + GuiType.PATTERN_VALUE_SET); + } int amt = (int) message.stack.getStackSize(); if (message.stack.getItem() instanceof ItemFluidPacket) { FluidStack fluid = ItemFluidPacket.getFluidStack(message.stack); diff --git a/src/main/java/com/glodblock/github/network/CPacketPatternValueSet.java b/src/main/java/com/glodblock/github/network/CPacketPatternValueSet.java index 72980542..d5e6fee7 100644 --- a/src/main/java/com/glodblock/github/network/CPacketPatternValueSet.java +++ b/src/main/java/com/glodblock/github/network/CPacketPatternValueSet.java @@ -17,6 +17,7 @@ import com.glodblock.github.client.gui.container.base.FCContainerEncodeTerminal; import com.glodblock.github.common.item.ItemFluidPacket; import com.glodblock.github.inventory.InventoryHandler; import com.glodblock.github.inventory.gui.GuiType; +import com.glodblock.github.inventory.gui.PartOrItemGuiFactory; import com.glodblock.github.util.BlockPos; import com.glodblock.github.util.Util; @@ -67,12 +68,31 @@ public class CPacketPatternValueSet implements IMessage { final ContainerOpenContext context = cpv.getOpenContext(); if (context != null) { final TileEntity te = context.getTile(); - InventoryHandler.openGui( - player, - player.worldObj, - new BlockPos(te), - Objects.requireNonNull(context.getSide()), - message.originGui); + if (te != null) { + InventoryHandler.openGui( + player, + player.worldObj, + new BlockPos(te), + Objects.requireNonNull(context.getSide()), + message.originGui); + } else if (message.originGui.guiFactory instanceof PartOrItemGuiFactory) { + InventoryHandler.openGui( + player, + player.worldObj, + new BlockPos( + player.inventory.currentItem, + Util.GuiHelper.encodeType(0, Util.GuiHelper.GuiType.ITEM), + 0), + Objects.requireNonNull(context.getSide()), + message.originGui); + } else { + InventoryHandler.openGui( + player, + player.worldObj, + new BlockPos(player.inventory.currentItem, 0, 0), + Objects.requireNonNull(context.getSide()), + message.originGui); + } if (player.openContainer instanceof FCContainerEncodeTerminal) { Slot slot = player.openContainer.getSlot(message.valueIndex); if (slot instanceof SlotFake) { diff --git a/src/main/java/com/glodblock/github/network/CPacketSwitchGuis.java b/src/main/java/com/glodblock/github/network/CPacketSwitchGuis.java index 94dc7004..2ca828d8 100644 --- a/src/main/java/com/glodblock/github/network/CPacketSwitchGuis.java +++ b/src/main/java/com/glodblock/github/network/CPacketSwitchGuis.java @@ -11,6 +11,7 @@ import net.minecraft.tileentity.TileEntity; import appeng.container.AEBaseContainer; import appeng.container.ContainerOpenContext; +import com.glodblock.github.common.item.ItemWirelessUltraTerminal; import com.glodblock.github.inventory.InventoryHandler; import com.glodblock.github.inventory.gui.GuiType; import com.glodblock.github.util.BlockPos; @@ -24,9 +25,15 @@ import io.netty.buffer.ByteBuf; public class CPacketSwitchGuis implements IMessage { private GuiType guiType; + private boolean switchTerminal; public CPacketSwitchGuis(GuiType guiType) { + this(guiType, false); + } + + public CPacketSwitchGuis(GuiType guiType, boolean switchTerminal) { this.guiType = guiType; + this.switchTerminal = switchTerminal; } public CPacketSwitchGuis() { @@ -36,11 +43,13 @@ public class CPacketSwitchGuis implements IMessage { @Override public void fromBytes(ByteBuf byteBuf) { guiType = GuiType.getByOrdinal(byteBuf.readByte()); + switchTerminal = byteBuf.readBoolean(); } @Override public void toBytes(ByteBuf byteBuf) { byteBuf.writeByte(guiType != null ? guiType.ordinal() : 0); + byteBuf.writeBoolean(this.switchTerminal); } public static class Handler implements IMessageHandler { @@ -51,36 +60,44 @@ public class CPacketSwitchGuis implements IMessage { if (message.guiType == null) { return null; } + EntityPlayerMP player = ctx.getServerHandler().playerEntity; Container cont = player.openContainer; - if (!(cont instanceof AEBaseContainer)) { + + // switch terminal + if (message.switchTerminal) { + ItemWirelessUltraTerminal.switchTerminal(player, message.guiType); return null; } - ContainerOpenContext context = ((AEBaseContainer) cont).getOpenContext(); - if (context == null) { - return null; - } - TileEntity te = context.getTile(); - if (te != null) { - InventoryHandler.openGui( - player, - player.worldObj, - new BlockPos(te), - Objects.requireNonNull(context.getSide()), - message.guiType); - } else { - InventoryHandler.openGui( - player, - player.worldObj, - new BlockPos( - player.inventory.currentItem, - Util.GuiHelper.encodeType(0, Util.GuiHelper.GuiType.ITEM), - 0), - Objects.requireNonNull(context.getSide()), - message.guiType); - } + // open new terminal + if (cont instanceof AEBaseContainer) { + ContainerOpenContext context = ((AEBaseContainer) cont).getOpenContext(); + if (context == null) { + return null; + } + TileEntity te = context.getTile(); + if (te != null) { + InventoryHandler.openGui( + player, + player.worldObj, + new BlockPos(te), + Objects.requireNonNull(context.getSide()), + message.guiType); + } else { + InventoryHandler.openGui( + player, + player.worldObj, + new BlockPos( + player.inventory.currentItem, + Util.GuiHelper.encodeType(0, Util.GuiHelper.GuiType.ITEM), + 0), + Objects.requireNonNull(context.getSide()), + message.guiType); + } + } return null; } } + } diff --git a/src/main/java/com/glodblock/github/network/CPacketTransferRecipe.java b/src/main/java/com/glodblock/github/network/CPacketTransferRecipe.java index 3c96902c..0f1215d0 100644 --- a/src/main/java/com/glodblock/github/network/CPacketTransferRecipe.java +++ b/src/main/java/com/glodblock/github/network/CPacketTransferRecipe.java @@ -17,6 +17,7 @@ import appeng.api.storage.ITerminalHost; import appeng.api.storage.data.IAEItemStack; import appeng.api.storage.data.IItemList; +import com.glodblock.github.client.gui.container.ContainerItemMonitor; import com.glodblock.github.client.gui.container.base.FCContainerEncodeTerminal; import com.glodblock.github.common.item.ItemFluidPacket; import com.glodblock.github.nei.NEIUtils; @@ -95,56 +96,60 @@ public class CPacketTransferRecipe implements IMessage { @SuppressWarnings("unchecked") public IMessage onMessage(CPacketTransferRecipe message, MessageContext ctx) { Container c = ctx.getServerHandler().playerEntity.openContainer; - if (c instanceof FCContainerEncodeTerminal) { - FCContainerEncodeTerminal cf = (FCContainerEncodeTerminal) c; - ITerminalHost host = cf.getHost(); + if (c instanceof ContainerItemMonitor) { + ITerminalHost host = ((ContainerItemMonitor) c).getHost(); IItemList storageList; if (host != null) { storageList = host.getItemInventory().getStorageList(); } else { storageList = AEApi.instance().storage().createItemList(); } + if (c instanceof FCContainerEncodeTerminal) { + // pattern terminal only + FCContainerEncodeTerminal cf = (FCContainerEncodeTerminal) c; - boolean combine = cf.combine; - cf.getPatternTerminal().setCraftingRecipe(message.isCraft); - IInventory inputSlot = cf.getInventoryByName("crafting"); - IInventory outputSlot = cf.getInventoryByName("output"); - for (int i = 0; i < inputSlot.getSizeInventory(); i++) { - inputSlot.setInventorySlotContents(i, null); - } - for (int i = 0; i < outputSlot.getSizeInventory(); i++) { - outputSlot.setInventorySlotContents(i, null); - } - - if (!message.isCraft) { - if (combine) { - message.inputs = NEIUtils.compress(message.inputs); - message.outputs = NEIUtils.compress(message.outputs); + boolean combine = cf.combine; + cf.getPatternTerminal().setCraftingRecipe(message.isCraft); + IInventory inputSlot = cf.getInventoryByName("crafting"); + IInventory outputSlot = cf.getInventoryByName("output"); + for (int i = 0; i < inputSlot.getSizeInventory(); i++) { + inputSlot.setInventorySlotContents(i, null); } - message.inputs = NEIUtils.clearNull(message.inputs); - message.outputs = NEIUtils.clearNull(message.outputs); - } - // using exists item to fill slot - if (message.shift && !storageList.isEmpty()) { - for (OrderStack stack : message.inputs) { - if (stack.getStack() instanceof FluidStack) continue; - ItemStack is = (ItemStack) stack.getStack(); - IAEItemStack iaeItemStack = AEApi.instance().storage().createItemStack(is); - if (storageList.findPrecise(iaeItemStack) == null) { - for (IAEItemStack tmp : storageList.findFuzzy(iaeItemStack, FuzzyMode.IGNORE_ALL)) { - ItemStack substitute = tmp.getItemStack().copy(); - substitute.stackSize = is.stackSize; - stack.putStack(substitute); - break; + for (int i = 0; i < outputSlot.getSizeInventory(); i++) { + outputSlot.setInventorySlotContents(i, null); + } + + if (!message.isCraft) { + if (combine) { + message.inputs = NEIUtils.compress(message.inputs); + message.outputs = NEIUtils.compress(message.outputs); + } + message.inputs = NEIUtils.clearNull(message.inputs); + message.outputs = NEIUtils.clearNull(message.outputs); + } + // using exists item to fill slot + if (message.shift && !storageList.isEmpty()) { + for (OrderStack stack : message.inputs) { + if (stack.getStack() instanceof FluidStack) continue; + ItemStack is = (ItemStack) stack.getStack(); + IAEItemStack iaeItemStack = AEApi.instance().storage().createItemStack(is); + if (storageList.findPrecise(iaeItemStack) == null) { + for (IAEItemStack tmp : storageList.findFuzzy(iaeItemStack, FuzzyMode.IGNORE_ALL)) { + ItemStack substitute = tmp.getItemStack().copy(); + substitute.stackSize = is.stackSize; + stack.putStack(substitute); + break; + } } } } + transferPack(message.inputs, inputSlot); + transferPack(message.outputs, outputSlot); + c.onCraftMatrixChanged(inputSlot); + c.onCraftMatrixChanged(outputSlot); } - transferPack(message.inputs, inputSlot); - transferPack(message.outputs, outputSlot); - c.onCraftMatrixChanged(inputSlot); - c.onCraftMatrixChanged(outputSlot); } + return null; } diff --git a/src/main/java/com/glodblock/github/network/SPacketFluidUpdate.java b/src/main/java/com/glodblock/github/network/SPacketFluidUpdate.java index 831dce1f..2d0aa473 100644 --- a/src/main/java/com/glodblock/github/network/SPacketFluidUpdate.java +++ b/src/main/java/com/glodblock/github/network/SPacketFluidUpdate.java @@ -98,6 +98,12 @@ public class SPacketFluidUpdate implements IMessage { } else { ((GuiFluidTerminal) gs).update(null); } + } else if (gs instanceof GuiEssentiaTerminal) { + if (message.itemStack != null) { + ((GuiEssentiaTerminal) gs).update(message.itemStack.getItemStack()); + } else { + ((GuiEssentiaTerminal) gs).update(null); + } } else if (gs instanceof GuiFluidStorageBus) { for (Map.Entry e : message.list.entrySet()) ((GuiFluidStorageBus) gs).update(e.getKey(), e.getValue()); diff --git a/src/main/java/com/glodblock/github/util/NameConst.java b/src/main/java/com/glodblock/github/util/NameConst.java index ab83f1e3..21a15e20 100644 --- a/src/main/java/com/glodblock/github/util/NameConst.java +++ b/src/main/java/com/glodblock/github/util/NameConst.java @@ -37,6 +37,7 @@ public class NameConst { public static final String ITEM_FLUID_STORAGE = "fluid_storage"; public static final String ITEM_FLUID_PORTABLE_CELL = "portable_fluid_cell"; public static final String ITEM_WIRELESS_FLUID_TERMINAL = "wireless_fluid_terminal"; + public static final String ITEM_WIRELESS_ULTRA_TERMINAL = "wireless_ultra_terminal"; public static final String ITEM_WIRELESS_FLUID_PATTERN_TERMINAL = "wireless_fluid_pattern_terminal"; public static final String ITEM_FLUID_PART = "fluid_part"; @@ -77,6 +78,7 @@ public class NameConst { public static final String TT_WIRELESS = TT_KEY + "wireless."; public static final String TT_WIRELESS_INSTALLED = TT_WIRELESS + "installed"; public static final String TT_FLUID_AUTO_FILLER = TT_KEY + "fluid_auto_filler"; + public static final String TT_ULTRA_TERMINAL = TT_KEY + "ultra_terminal"; public static final String WAILA_KEY = FluidCraft.MODID + ".waila."; public static final String WAILA_ENABLE = WAILA_KEY + "enable"; diff --git a/src/main/java/com/glodblock/github/util/Util.java b/src/main/java/com/glodblock/github/util/Util.java index 993ee423..6a8c18e1 100644 --- a/src/main/java/com/glodblock/github/util/Util.java +++ b/src/main/java/com/glodblock/github/util/Util.java @@ -6,6 +6,7 @@ import java.io.IOException; import java.util.Map; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; @@ -17,6 +18,8 @@ import org.apache.commons.lang3.tuple.ImmutablePair; import org.apache.commons.lang3.tuple.MutablePair; import appeng.api.AEApi; +import appeng.api.config.Actionable; +import appeng.api.config.PowerMultiplier; import appeng.api.config.SecurityPermissions; import appeng.api.implementations.tiles.IWirelessAccessPoint; import appeng.api.networking.IGrid; @@ -30,6 +33,7 @@ import appeng.api.storage.StorageChannel; import appeng.api.storage.data.IAEFluidStack; import appeng.api.storage.data.IAEStack; import appeng.api.util.WorldCoord; +import appeng.container.AEBaseContainer; import appeng.items.tools.powered.ToolWirelessTerminal; import appeng.tile.networking.TileCableBus; import appeng.tile.networking.TileWireless; @@ -40,6 +44,7 @@ import com.glodblock.github.common.item.ItemBaseWirelessTerminal; import com.glodblock.github.common.item.ItemFluidDrop; import com.glodblock.github.common.item.ItemFluidPacket; import com.glodblock.github.inventory.IAEFluidTank; +import com.glodblock.github.inventory.item.IFluidPortableCell; import cpw.mods.fml.common.ModContainer; import cpw.mods.fml.common.registry.GameData; @@ -47,6 +52,32 @@ import io.netty.buffer.ByteBuf; public final class Util { + public static int drainItemPower(AEBaseContainer c, InventoryPlayer ip, int slot, int ticks, double pm, + IFluidPortableCell wt) { + final ItemStack currentItem = slot < 0 ? ip.getCurrentItem() : ip.getStackInSlot(slot); + if (wt != null) { + if (currentItem != wt.getItemStack()) { + if (currentItem != null) { + if (Platform.isSameItem(wt.getItemStack(), currentItem)) { + ip.setInventorySlotContents(ip.currentItem, wt.getItemStack()); + } else { + c.setValidContainer(false); + } + } else { + c.setValidContainer(false); + } + } + } else { + c.setValidContainer(false); + } + ticks++; + if (ticks > 10 && wt != null) { + wt.extractAEPower(pm * ticks, Actionable.MODULATE, PowerMultiplier.CONFIG); + ticks = 0; + } + return ticks; + } + public static boolean hasInfinityBoosterCard(ItemStack is) { if (ModAndClassUtil.WCT && is.getItem() instanceof ItemBaseWirelessTerminal) { NBTTagCompound data = Platform.openNbtData(is); @@ -66,7 +97,6 @@ public final class Util { return null; } - @SuppressWarnings("unchecked") public static IBaseMonitor>> getWirelessInv(ItemStack is, EntityPlayer player, StorageChannel channel) { IGridNode gridNode = getWirelessGrid(is); @@ -440,7 +470,7 @@ public final class Util { public static MutablePair fillStack(ItemStack itemStack, FluidStack fluid) { if (itemStack == null || itemStack.stackSize != 1) return null; Item item = itemStack.getItem(); - // If its a fluid container item instance + // If it's a fluid container item instance if (item instanceof IFluidContainerItem) { // Call the fill method on it. int filled = ((IFluidContainerItem) item).fill(itemStack, fluid, true); diff --git a/src/main/resources/assets/ae2fc/lang/en_US.lang b/src/main/resources/assets/ae2fc/lang/en_US.lang index f56a9f07..4b0f6d3b 100644 --- a/src/main/resources/assets/ae2fc/lang/en_US.lang +++ b/src/main/resources/assets/ae2fc/lang/en_US.lang @@ -13,6 +13,10 @@ item.part_fluid_conversion_monitor.name=ME Fluid Conversion Monitor item.portable_fluid_cell.name=Portable Fluid Cell item.wireless_fluid_terminal.name=Wireless Fluid Terminal item.wireless_fluid_pattern_terminal.name=Wireless Fluid Pattern Terminal +item.wireless_ultra_terminal.WIRELESS_CRAFTING_TERMINAL.name=Universal Wireless Terminal - Crafting +item.wireless_ultra_terminal.WIRELESS_FLUID_PATTERN_TERMINAL.name=Universal Wireless Terminal - Pattern +item.wireless_ultra_terminal.WIRELESS_FLUID_TERMINAL.name=Universal Wireless Terminal - Fluid +item.wireless_ultra_terminal.WIRELESS_ESSENTIA_TERMINAL.name=Universal Wireless Terminal - Essentia item.fluid_packet.name=Fluid Packet item.fluid_storage.1.name=%s1k%s ME Fluid Storage Cell item.fluid_storage.4.name=%s4k%s ME Fluid Storage Cell @@ -70,6 +74,11 @@ ae2fc.tooltip.level_maintainer.batch_size=§6Crafting Batch Size§r ae2fc.tooltip.level_maintainer.batch_size.hint=When craft requests are emitted, the Requester will use the batch size for the request. Using larger batches will increase the speed of stocking up items but will require more crafting storage. ae2fc.tooltip.level_maintainer.request_size=§6Amount to Maintain§r ae2fc.tooltip.level_maintainer.request_size.hint=The count defines how many items should be held in stock before the Requester starts requesting new crafts. +ae2fc.tooltip.ultra_terminal.WIRELESS_CRAFTING_TERMINAL=Mode: Crafting Terminal +ae2fc.tooltip.ultra_terminal.WIRELESS_FLUID_PATTERN_TERMINAL=Mode: Pattern Terminal +ae2fc.tooltip.ultra_terminal.WIRELESS_FLUID_TERMINAL=Mode: Fluid Terminal +ae2fc.tooltip.ultra_terminal.WIRELESS_ESSENTIA_TERMINAL=Mode: Essentia Terminal +ae2fc.tooltip.ultra_terminal=Right click + sneaking to switch mode. ae2fc.tooltip.cell_contents=Contains Fluid: ae2fc.tooltip.cell_empty=Cell is empty @@ -85,6 +94,14 @@ ae2fc.tooltip.not_combine=Merge the same items ae2fc.tooltip.not_combine.hint=Disabled ae2fc.tooltip.combine=Merge the same items ae2fc.tooltip.combine.hint=Enabled +ae2fc.tooltip.fluid_terminal_w=Fluid Terminal +ae2fc.tooltip.fluid_terminal_w.hint=Switch to Fluid Terminal +ae2fc.tooltip.craft_terminal_w=Crafting Terminal +ae2fc.tooltip.craft_terminal_w.hint=Switch to Crafting Terminal +ae2fc.tooltip.pattern_terminal_w=Pattern Terminal +ae2fc.tooltip.pattern_terminal_w.hint=Switch to Pattern Terminal +ae2fc.tooltip.essentia_terminal_w=Essentia Terminal +ae2fc.tooltip.essentia_terminal_w.hint=Switch to Essentia Terminal ae2fc.tooltip.wireless.installed=Installed Card: ae2fc.tooltip.not_prio=Allow fluids to be placed first diff --git a/src/main/resources/assets/ae2fc/textures/gui/crafting.png b/src/main/resources/assets/ae2fc/textures/gui/crafting.png new file mode 100644 index 00000000..b49bf22b Binary files /dev/null and b/src/main/resources/assets/ae2fc/textures/gui/crafting.png differ diff --git a/src/main/resources/assets/ae2fc/textures/gui/states.png b/src/main/resources/assets/ae2fc/textures/gui/states0.png similarity index 100% rename from src/main/resources/assets/ae2fc/textures/gui/states.png rename to src/main/resources/assets/ae2fc/textures/gui/states0.png diff --git a/src/main/resources/assets/ae2fc/textures/gui/states1.png b/src/main/resources/assets/ae2fc/textures/gui/states1.png new file mode 100644 index 00000000..e9d89f18 Binary files /dev/null and b/src/main/resources/assets/ae2fc/textures/gui/states1.png differ diff --git a/src/main/resources/assets/ae2fc/textures/items/wireless_ultra_terminal.png b/src/main/resources/assets/ae2fc/textures/items/wireless_ultra_terminal.png new file mode 100644 index 00000000..fd514aac Binary files /dev/null and b/src/main/resources/assets/ae2fc/textures/items/wireless_ultra_terminal.png differ