diff --git a/dependencies.gradle b/dependencies.gradle index 8afad2f4..bf0eaec3 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -6,7 +6,7 @@ dependencies { compile('curse.maven:cofh-core-69162:2388751') compile('com.github.GTNewHorizons:waila:1.5.22:dev') compile('com.github.GTNewHorizons:CraftTweaker:3.2.11:dev') - compileOnly('com.github.GTNewHorizons:ExtraCells2:2.5.25:dev') { transitive = false } + compile('com.github.GTNewHorizons:ExtraCells2:2.5.25:dev') { transitive = false } compileOnly("com.github.GTNewHorizons:WirelessCraftingTerminal:1.8.9.2:dev") compileOnly('com.github.GTNewHorizons:ForestryMC:4.5.6:dev') diff --git a/src/main/java/com/glodblock/github/client/gui/GuiEssentiaTerminal.java b/src/main/java/com/glodblock/github/client/gui/GuiEssentiaTerminal.java index 5c075fc2..8b1ed82c 100644 --- a/src/main/java/com/glodblock/github/client/gui/GuiEssentiaTerminal.java +++ b/src/main/java/com/glodblock/github/client/gui/GuiEssentiaTerminal.java @@ -4,8 +4,6 @@ import java.util.HashMap; import java.util.Map; import java.util.Objects; -import com.glodblock.github.inventory.InventoryHandler; -import com.glodblock.github.inventory.gui.GuiType; import net.minecraft.client.gui.GuiButton; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; @@ -24,6 +22,8 @@ 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; 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 ae87053c..51548d96 100644 --- a/src/main/java/com/glodblock/github/client/gui/GuiFluidCraftAmount.java +++ b/src/main/java/com/glodblock/github/client/gui/GuiFluidCraftAmount.java @@ -1,10 +1,5 @@ package com.glodblock.github.client.gui; -import com.glodblock.github.common.item.ItemWirelessUltraTerminal; -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.util.Ae2ReflectClient; import net.minecraft.client.gui.GuiButton; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.item.ItemStack; @@ -15,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; 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 0fff6bbe..f2a2c2b8 100644 --- a/src/main/java/com/glodblock/github/client/gui/GuiFluidCraftConfirm.java +++ b/src/main/java/com/glodblock/github/client/gui/GuiFluidCraftConfirm.java @@ -3,9 +3,6 @@ package com.glodblock.github.client.gui; import java.text.NumberFormat; import java.util.*; -import com.glodblock.github.common.item.ItemWirelessUltraTerminal; -import com.glodblock.github.inventory.item.IWirelessTerminal; -import com.glodblock.github.inventory.item.WirelessPatternTerminalInventory; import net.minecraft.client.gui.GuiButton; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.item.ItemStack; @@ -26,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; diff --git a/src/main/java/com/glodblock/github/client/gui/GuiFluidCraftingWireless.java b/src/main/java/com/glodblock/github/client/gui/GuiFluidCraftingWireless.java index a74116ce..3f453e76 100644 --- a/src/main/java/com/glodblock/github/client/gui/GuiFluidCraftingWireless.java +++ b/src/main/java/com/glodblock/github/client/gui/GuiFluidCraftingWireless.java @@ -1,7 +1,5 @@ package com.glodblock.github.client.gui; -import com.glodblock.github.inventory.InventoryHandler; -import com.glodblock.github.inventory.gui.GuiType; import net.minecraft.client.gui.GuiButton; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; @@ -18,6 +16,8 @@ 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 { @@ -44,7 +44,10 @@ public class GuiFluidCraftingWireless extends GuiItemMonitor { } } if (s != null) { - final PacketInventoryAction p = new PacketInventoryAction(InventoryAction.MOVE_REGION, s.slotNumber, 0); + final PacketInventoryAction p = new PacketInventoryAction( + InventoryAction.MOVE_REGION, + s.slotNumber, + 0); NetworkHandler.instance.sendToServer(p); } } 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 8680eb79..e872d882 100644 --- a/src/main/java/com/glodblock/github/client/gui/GuiFluidPatternTerminalCraftingStatus.java +++ b/src/main/java/com/glodblock/github/client/gui/GuiFluidPatternTerminalCraftingStatus.java @@ -1,7 +1,5 @@ package com.glodblock.github.client.gui; -import com.glodblock.github.common.item.ItemWirelessUltraTerminal; -import com.glodblock.github.inventory.item.IWirelessTerminal; import net.minecraft.client.gui.GuiButton; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.item.ItemStack; @@ -10,11 +8,13 @@ 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.IWirelessTerminal; import com.glodblock.github.inventory.item.WirelessFluidTerminalInventory; import com.glodblock.github.inventory.item.WirelessPatternTerminalInventory; import com.glodblock.github.loader.ItemAndBlockHolder; @@ -56,8 +56,8 @@ 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 IWirelessTerminal && ((IWirelessTerminal) host).isUniversal(host)) - InventoryHandler.switchGui(ItemWirelessUltraTerminal.readMode(((IWirelessTerminal) host).getItemStack())); + 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) 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 57537fb8..b0abfc30 100644 --- a/src/main/java/com/glodblock/github/client/gui/GuiPatternValueAmount.java +++ b/src/main/java/com/glodblock/github/client/gui/GuiPatternValueAmount.java @@ -1,8 +1,5 @@ package com.glodblock.github.client.gui; -import com.glodblock.github.common.item.ItemWirelessUltraTerminal; -import com.glodblock.github.inventory.item.IWirelessTerminal; -import com.glodblock.github.inventory.item.WirelessPatternTerminalInventory; import net.minecraft.client.gui.GuiButton; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.item.ItemStack; @@ -13,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; diff --git a/src/main/java/com/glodblock/github/common/item/ItemWirelessUltraTerminal.java b/src/main/java/com/glodblock/github/common/item/ItemWirelessUltraTerminal.java index 8d87cdfc..ca0b7bc5 100644 --- a/src/main/java/com/glodblock/github/common/item/ItemWirelessUltraTerminal.java +++ b/src/main/java/com/glodblock/github/common/item/ItemWirelessUltraTerminal.java @@ -4,7 +4,6 @@ import java.util.ArrayList; import java.util.EnumSet; import java.util.List; -import com.glodblock.github.util.ModAndClassUtil; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; @@ -24,6 +23,7 @@ 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.util.ModAndClassUtil; import com.glodblock.github.util.NameConst; import com.glodblock.github.util.Util; @@ -69,11 +69,7 @@ public class ItemWirelessUltraTerminal extends ItemBaseWirelessTerminal @Override public String getItemStackDisplayName(ItemStack stack) { - return StatCollector.translateToLocalFormatted( - "item.wireless_ultra_terminal." + - guiGuiType(stack) + - ".name" - ); + return StatCollector.translateToLocalFormatted("item.wireless_ultra_terminal." + guiGuiType(stack) + ".name"); } @Override 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 4782da58..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,14 +1,17 @@ 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; -import com.glodblock.github.common.item.ItemWirelessUltraTerminal; -import net.minecraft.item.ItemStack; -public interface IWirelessTerminal extends IFluidPortableCell, IViewCellStorage, IAEAppEngInventory, IGridHost, IActionHost { +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) { 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 b85d538a..ebfe1853 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,6 +4,7 @@ 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.GuiFluidPatternWireless; @@ -16,6 +17,10 @@ public class NEI_FC_Config implements IConfigureNEI { API.registerNEIGuiHandler(new NEIGuiHandler()); API.addSearchProvider(new NEIItemFilter()); for (String identifier : FluidRecipe.getSupportRecipes()) { + API.registerGuiOverlayHandler( + GuiFluidCraftingWireless.class, + FluidPatternTerminalRecipeTransferHandler.INSTANCE, + identifier); API.registerGuiOverlayHandler( GuiFluidPatternWireless.class, FluidPatternTerminalRecipeTransferHandler.INSTANCE, diff --git a/src/main/java/com/glodblock/github/network/CPacketCraftRequest.java b/src/main/java/com/glodblock/github/network/CPacketCraftRequest.java index 9f09f896..8e49fe3c 100644 --- a/src/main/java/com/glodblock/github/network/CPacketCraftRequest.java +++ b/src/main/java/com/glodblock/github/network/CPacketCraftRequest.java @@ -92,18 +92,18 @@ public class CPacketCraftRequest implements IMessage { final TileEntity te = context.getTile(); if (te != null) { InventoryHandler.openGui( - player, - player.worldObj, - new BlockPos(te), - Objects.requireNonNull(context.getSide()), - GuiType.FLUID_CRAFTING_CONFIRM); + 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); + player, + player.worldObj, + new BlockPos(player.inventory.currentItem, 0, 0), + Objects.requireNonNull(context.getSide()), + GuiType.FLUID_CRAFTING_CONFIRM_ITEM); } if (player.openContainer instanceof ContainerFluidCraftConfirm) { diff --git a/src/main/java/com/glodblock/github/network/CPacketInventoryAction.java b/src/main/java/com/glodblock/github/network/CPacketInventoryAction.java index 29c7383b..07855a0d 100644 --- a/src/main/java/com/glodblock/github/network/CPacketInventoryAction.java +++ b/src/main/java/com/glodblock/github/network/CPacketInventoryAction.java @@ -5,7 +5,6 @@ import java.util.Objects; import javax.annotation.Nullable; -import com.glodblock.github.util.Util; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.util.ForgeDirection; @@ -24,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; @@ -100,18 +100,21 @@ public class CPacketInventoryAction implements IMessage { final TileEntity te = context.getTile(); if (te != null) { InventoryHandler.openGui( - sender, - te.getWorldObj(), - new BlockPos(te), - Objects.requireNonNull(baseContainer.getOpenContext().getSide()), - GuiType.FLUID_CRAFTING_AMOUNT); + 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); + 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; @@ -128,18 +131,21 @@ public class CPacketInventoryAction implements IMessage { final TileEntity te = context.getTile(); if (te != null) { InventoryHandler.openGui( - sender, - te.getWorldObj(), - new BlockPos(te), - Objects.requireNonNull(baseContainer.getOpenContext().getSide()), - GuiType.PATTERN_VALUE_SET); + 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); + 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) { diff --git a/src/main/java/com/glodblock/github/network/CPacketPatternValueSet.java b/src/main/java/com/glodblock/github/network/CPacketPatternValueSet.java index 867ee510..a04fcf46 100644 --- a/src/main/java/com/glodblock/github/network/CPacketPatternValueSet.java +++ b/src/main/java/com/glodblock/github/network/CPacketPatternValueSet.java @@ -69,18 +69,18 @@ public class CPacketPatternValueSet implements IMessage { final TileEntity te = context.getTile(); if (te != null) { InventoryHandler.openGui( - player, - player.worldObj, - new BlockPos(te), - Objects.requireNonNull(context.getSide()), - message.originGui); + player, + player.worldObj, + new BlockPos(te), + 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); + 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);