diff --git a/src/main/java/com/glodblock/github/client/gui/GuiDualInterface.java b/src/main/java/com/glodblock/github/client/gui/GuiDualInterface.java index 34cb4dbb..1cbadf7b 100644 --- a/src/main/java/com/glodblock/github/client/gui/GuiDualInterface.java +++ b/src/main/java/com/glodblock/github/client/gui/GuiDualInterface.java @@ -226,7 +226,7 @@ public class GuiDualInterface extends GuiUpgradeable { super.actionPerformed(btn); final boolean backwards = Mouse.isButtonDown(1); if (btn == this.priority) { - InventoryHandler.switchGui(GuiType.PRIORITY); + // InventoryHandler.switchGui(GuiType.PRIORITY); } else if (btn == this.switcher) { InventoryHandler.switchGui(GuiType.DUAL_INTERFACE_FLUID); } else if (btn == this.interfaceMode) { diff --git a/src/main/java/com/glodblock/github/client/gui/GuiFluidStorageBus.java b/src/main/java/com/glodblock/github/client/gui/GuiFluidStorageBus.java index b1630e51..5509556e 100644 --- a/src/main/java/com/glodblock/github/client/gui/GuiFluidStorageBus.java +++ b/src/main/java/com/glodblock/github/client/gui/GuiFluidStorageBus.java @@ -9,8 +9,6 @@ import org.lwjgl.input.Mouse; import com.glodblock.github.FluidCraft; import com.glodblock.github.client.gui.container.ContainerFluidStorageBus; import com.glodblock.github.common.parts.PartFluidStorageBus; -import com.glodblock.github.inventory.InventoryHandler; -import com.glodblock.github.inventory.gui.GuiType; import com.glodblock.github.network.CPacketFluidPatternTermBtns; import com.glodblock.github.util.NameConst; @@ -92,7 +90,7 @@ public class GuiFluidStorageBus extends GuiUpgradeable { } else if (btn == this.clear) { FluidCraft.proxy.netHandler.sendToServer(new CPacketFluidPatternTermBtns("StorageBus.Action", "Clear")); } else if (btn == this.priority) { - InventoryHandler.switchGui(GuiType.PRIORITY); + // InventoryHandler.switchGui(GuiType.PRIORITY); } else if (btn == this.rwMode) { NetworkHandler.instance.sendToServer(new PacketConfigButton(this.rwMode.getSetting(), backwards)); } diff --git a/src/main/java/com/glodblock/github/client/gui/GuiMagnetFilter.java b/src/main/java/com/glodblock/github/client/gui/GuiMagnetFilter.java index 4621e1c6..7bb8b7ff 100644 --- a/src/main/java/com/glodblock/github/client/gui/GuiMagnetFilter.java +++ b/src/main/java/com/glodblock/github/client/gui/GuiMagnetFilter.java @@ -8,8 +8,6 @@ import org.lwjgl.input.Keyboard; import com.glodblock.github.FluidCraft; import com.glodblock.github.client.gui.container.ContainerMagnetFilter; -import com.glodblock.github.common.item.ItemWirelessUltraTerminal; -import com.glodblock.github.inventory.InventoryHandler; import com.glodblock.github.inventory.item.WirelessMagnet; import com.glodblock.github.network.CPacketFluidPatternTermBtns; import com.glodblock.github.util.NameConst; @@ -202,7 +200,7 @@ public class GuiMagnetFilter extends AEBaseMEGui { "WirelessTerminal.magnet.FilterMode", this.cont.listMode != WirelessMagnet.ListMode.WhiteList)); } else if (btn == this.originalGuiBtn) { - InventoryHandler.switchGui(ItemWirelessUltraTerminal.readMode(this.cont.getPortableCell().getItemStack())); + // InventoryHandler.switchGui(ItemWirelessUltraTerminal.readMode(this.cont.getPortableCell().getItemStack())); } else if (btn == this.clearBtn) { FluidCraft.proxy.netHandler .sendToServer(new CPacketFluidPatternTermBtns("WirelessTerminal.magnet.clear", 1)); diff --git a/src/main/java/com/glodblock/github/client/gui/base/FCBaseMEGui.java b/src/main/java/com/glodblock/github/client/gui/base/FCBaseMEGui.java index 8218f0fb..b704af71 100644 --- a/src/main/java/com/glodblock/github/client/gui/base/FCBaseMEGui.java +++ b/src/main/java/com/glodblock/github/client/gui/base/FCBaseMEGui.java @@ -12,14 +12,12 @@ import com.glodblock.github.client.gui.GuiFCImgButton; import com.glodblock.github.client.gui.GuiLevelWireless; import com.glodblock.github.client.gui.container.base.FCBaseContainer; import com.glodblock.github.common.item.ItemWirelessUltraTerminal; -import com.glodblock.github.inventory.gui.GuiType; import com.glodblock.github.inventory.item.IWirelessTerminal; import com.glodblock.github.inventory.item.WirelessMagnet; import com.glodblock.github.network.CPacketFluidPatternTermBtns; import appeng.api.storage.StorageChannel; import appeng.client.gui.AEBaseMEGui; -import appeng.core.sync.GuiBridge; public abstract class FCBaseMEGui extends AEBaseMEGui { @@ -181,18 +179,12 @@ public abstract class FCBaseMEGui extends AEBaseMEGui { @Override protected void actionPerformed(final GuiButton btn) { if (btn instanceof GuiFCImgButton) { - if (btn == this.CraftingTerminal) { - ItemWirelessUltraTerminal.switchTerminal(this.mc.thePlayer, GuiBridge.GUI_CRAFTING_TERMINAL); - } else if (btn == this.PatternTerminal) { - ItemWirelessUltraTerminal.switchTerminal(this.mc.thePlayer, GuiBridge.GUI_PATTERN_TERMINAL); - } else if (btn == this.InterfaceTerminal) { - ItemWirelessUltraTerminal.switchTerminal(this.mc.thePlayer, GuiBridge.GUI_INTERFACE_TERMINAL); - } else if (btn == this.LevelTerminal) { - ItemWirelessUltraTerminal.switchTerminal(this.mc.thePlayer, GuiType.WIRELESS_LEVEL_TERMINAL); - } else if (btn == this.magnetOff || btn == this.magnetME || btn == this.magnetInv) { - FluidCraft.proxy.netHandler.sendToServer(new CPacketFluidPatternTermBtns("WirelessTerminal.MagnetMode", this.getMagnetMode().ordinal())); + if (btn == this.magnetOff || btn == this.magnetME || btn == this.magnetInv) { + FluidCraft.proxy.netHandler.sendToServer( + new CPacketFluidPatternTermBtns("WirelessTerminal.MagnetMode", this.getMagnetMode().ordinal())); } else if (btn == this.magnetFilter) { - FluidCraft.proxy.netHandler.sendToServer(new CPacketFluidPatternTermBtns("WirelessTerminal.OpenMagnet", 0)); + FluidCraft.proxy.netHandler + .sendToServer(new CPacketFluidPatternTermBtns("WirelessTerminal.OpenMagnet", 0)); } else if (btn == this.restockDisableBtn || btn == this.restockEnableBtn) { FluidCraft.proxy.netHandler.sendToServer(new CPacketFluidPatternTermBtns("WirelessTerminal.Stock", 1)); } 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 ba2b5267..1941e0bf 100644 --- a/src/main/java/com/glodblock/github/common/item/ItemBaseWirelessTerminal.java +++ b/src/main/java/com/glodblock/github/common/item/ItemBaseWirelessTerminal.java @@ -1,6 +1,5 @@ package com.glodblock.github.common.item; -import static appeng.util.Platform.openGUI; import static com.glodblock.github.common.item.ItemWirelessUltraTerminal.MODE; import static com.glodblock.github.loader.recipe.WirelessTerminalEnergyRecipe.getEnergyCard; import static com.glodblock.github.loader.recipe.WirelessTerminalRecipe.getInfinityBoosterCard; @@ -9,10 +8,6 @@ import static com.glodblock.github.util.Util.hasInfinityBoosterCard; import java.util.List; -import appeng.api.implementations.guiobjects.IGuiItem; -import appeng.api.implementations.guiobjects.IGuiItemObject; -import appeng.helpers.WirelessPatternTerminalGuiObject; -import com.glodblock.github.util.UltraTerminalModes; import net.minecraft.client.gui.GuiScreen; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; @@ -22,24 +17,27 @@ import net.minecraft.util.EnumChatFormatting; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.event.ForgeEventFactory; +import net.p455w0rd.wirelesscraftingterminal.helpers.WirelessTerminalGuiObject; import com.glodblock.github.inventory.InventoryHandler; import com.glodblock.github.inventory.gui.GuiType; import com.glodblock.github.inventory.item.IItemInventory; import com.glodblock.github.util.BlockPos; import com.glodblock.github.util.NameConst; +import com.glodblock.github.util.UltraTerminalModes; import appeng.api.AEApi; import appeng.api.features.ILocatable; import appeng.api.features.IWirelessTermHandler; import appeng.api.features.IWirelessTermRegistry; +import appeng.api.implementations.guiobjects.IGuiItem; +import appeng.api.implementations.guiobjects.IGuiItemObject; import appeng.core.localization.PlayerMessages; import appeng.core.sync.GuiBridge; import appeng.items.tools.powered.ToolWirelessTerminal; import appeng.util.Platform; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import net.p455w0rd.wirelesscraftingterminal.helpers.WirelessTerminalGuiObject; public class ItemBaseWirelessTerminal extends ToolWirelessTerminal implements IItemInventory, IGuiItem { @@ -144,7 +142,7 @@ public class ItemBaseWirelessTerminal extends ToolWirelessTerminal implements II Item item = is.getItem(); if (item instanceof ItemWirelessUltraTerminal) { return UltraTerminalModes.values()[is.getTagCompound().getInteger(MODE)]; - } else if (item instanceof ItemWirelessPatternTerminal) { + } else if (item instanceof ItemWirelessPatternTerminal) { return UltraTerminalModes.PATTERN; } else if (item instanceof ItemWirelessInterfaceTerminal) { return UltraTerminalModes.INTERFACE; @@ -168,16 +166,16 @@ public class ItemBaseWirelessTerminal extends ToolWirelessTerminal implements II case INTERFACE -> aeGui = GuiBridge.GUI_INTERFACE_TERMINAL; case LEVEL -> { InventoryHandler.openGui( - player, - w, - new BlockPos(player.inventory.currentItem, 0, 0), - ForgeDirection.UNKNOWN, - GuiType.WIRELESS_LEVEL_TERMINAL); + player, + w, + new BlockPos(player.inventory.currentItem, 0, 0), + ForgeDirection.UNKNOWN, + GuiType.WIRELESS_LEVEL_TERMINAL); return; } default -> aeGui = GuiBridge.GUI_ME; } - Platform.openGUI(player, null,null, aeGui); + Platform.openGUI(player, null, null, aeGui); } @Override diff --git a/src/main/java/com/glodblock/github/common/item/ItemWirelessInterfaceTerminal.java b/src/main/java/com/glodblock/github/common/item/ItemWirelessInterfaceTerminal.java index 9af683a5..4342b479 100644 --- a/src/main/java/com/glodblock/github/common/item/ItemWirelessInterfaceTerminal.java +++ b/src/main/java/com/glodblock/github/common/item/ItemWirelessInterfaceTerminal.java @@ -2,27 +2,20 @@ package com.glodblock.github.common.item; import java.util.EnumSet; -import appeng.api.features.IWirelessTermHandler; -import appeng.api.implementations.guiobjects.IGuiItemObject; -import appeng.helpers.WirelessInterfaceTerminalGuiObject; -import appeng.helpers.WirelessPatternTerminalGuiObject; -import com.glodblock.github.util.UltraTerminalModes; -import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.world.World; import com.glodblock.github.FluidCraft; import com.glodblock.github.common.tabs.FluidCraftingTabs; -import com.glodblock.github.inventory.item.WirelessInterfaceTerminalInventory; import com.glodblock.github.loader.IRegister; import com.glodblock.github.util.NameConst; -import com.glodblock.github.util.Util; import appeng.api.AEApi; -import appeng.api.networking.IGridNode; +import appeng.api.features.IWirelessTermHandler; +import appeng.api.implementations.guiobjects.IGuiItemObject; import appeng.core.features.AEFeature; -import appeng.core.localization.PlayerMessages; import appeng.core.sync.GuiBridge; +import appeng.helpers.WirelessInterfaceTerminalGuiObject; import cpw.mods.fml.common.registry.GameRegistry; public class ItemWirelessInterfaceTerminal extends ItemBaseWirelessTerminal diff --git a/src/main/java/com/glodblock/github/common/item/ItemWirelessLevelTerminal.java b/src/main/java/com/glodblock/github/common/item/ItemWirelessLevelTerminal.java index eb6c197b..543081f2 100644 --- a/src/main/java/com/glodblock/github/common/item/ItemWirelessLevelTerminal.java +++ b/src/main/java/com/glodblock/github/common/item/ItemWirelessLevelTerminal.java @@ -2,7 +2,6 @@ package com.glodblock.github.common.item; import java.util.EnumSet; -import com.glodblock.github.util.UltraTerminalModes; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.world.World; 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 c4f56a4e..29f28d98 100644 --- a/src/main/java/com/glodblock/github/common/item/ItemWirelessPatternTerminal.java +++ b/src/main/java/com/glodblock/github/common/item/ItemWirelessPatternTerminal.java @@ -2,13 +2,6 @@ package com.glodblock.github.common.item; import java.util.EnumSet; -import appeng.api.features.IWirelessTermHandler; -import appeng.api.implementations.guiobjects.IGuiItemObject; -import appeng.helpers.WirelessInterfaceTerminalGuiObject; -import appeng.helpers.WirelessPatternTerminalGuiObject; -import com.glodblock.github.inventory.item.WirelessPatternTerminalInventory; -import com.glodblock.github.util.UltraTerminalModes; -import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.world.World; @@ -16,13 +9,13 @@ import com.glodblock.github.FluidCraft; import com.glodblock.github.common.tabs.FluidCraftingTabs; import com.glodblock.github.loader.IRegister; import com.glodblock.github.util.NameConst; -import com.glodblock.github.util.Util; import appeng.api.AEApi; -import appeng.api.networking.IGridNode; +import appeng.api.features.IWirelessTermHandler; +import appeng.api.implementations.guiobjects.IGuiItemObject; import appeng.core.features.AEFeature; -import appeng.core.localization.PlayerMessages; import appeng.core.sync.GuiBridge; +import appeng.helpers.WirelessPatternTerminalGuiObject; import cpw.mods.fml.common.registry.GameRegistry; public class ItemWirelessPatternTerminal extends ItemBaseWirelessTerminal 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 6e7db7c5..eace9cc3 100644 --- a/src/main/java/com/glodblock/github/common/item/ItemWirelessUltraTerminal.java +++ b/src/main/java/com/glodblock/github/common/item/ItemWirelessUltraTerminal.java @@ -3,35 +3,30 @@ package com.glodblock.github.common.item; import static appeng.util.Platform.nextEnum; import static net.minecraft.client.gui.GuiScreen.isShiftKeyDown; -import java.util.ArrayList; import java.util.Arrays; import java.util.EnumSet; import java.util.List; -import com.glodblock.github.inventory.item.WirelessLevelTerminalInventory; -import com.glodblock.github.inventory.item.WirelessMagnetCardFilterInventory; -import com.glodblock.github.inventory.item.WirelessPatternTerminalExInventory; -import com.glodblock.github.util.*; -import net.minecraft.client.Minecraft; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; 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 org.apache.commons.lang3.tuple.ImmutablePair; 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.WirelessLevelTerminalInventory; import com.glodblock.github.inventory.item.WirelessMagnet; +import com.glodblock.github.inventory.item.WirelessMagnetCardFilterInventory; import com.glodblock.github.loader.IRegister; import com.glodblock.github.network.CPacketSwitchGuis; +import com.glodblock.github.util.NameConst; +import com.glodblock.github.util.UltraTerminalModes; +import com.glodblock.github.util.Util; import appeng.api.AEApi; import appeng.api.features.IWirelessTermHandler; @@ -40,18 +35,15 @@ import appeng.api.implementations.guiobjects.IGuiItemObject; import appeng.api.networking.IGridNode; import appeng.core.features.AEFeature; import appeng.core.localization.PlayerMessages; -import appeng.core.sync.GuiBridge; import appeng.helpers.WirelessPatternTerminalGuiObject; import appeng.util.Platform; -import baubles.api.BaubleType; import baubles.api.BaublesApi; -import baubles.api.IBauble; -import cpw.mods.fml.common.Optional; 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, IGuiItem { +public class ItemWirelessUltraTerminal extends ItemBaseWirelessTerminal + implements IRegister, IGuiItem { public final static String MODE = "mode"; @@ -95,7 +87,7 @@ public class ItemWirelessUltraTerminal extends ItemBaseWirelessTerminal implemen try { final IGridNode gridNode = Util.getWirelessGrid(stack); - //wireless magnet + // wireless magnet if (Util.GuiHelper.decodeType(y).getLeft() == Util.GuiHelper.GuiType.ITEM && z == -1) { return new WirelessMagnetCardFilterInventory(stack, x, gridNode, player); } @@ -172,6 +164,6 @@ public class ItemWirelessUltraTerminal extends ItemBaseWirelessTerminal implemen public IGuiItemObject getGuiObject(ItemStack is, World world, int x, int y, int z) { final IWirelessTermHandler wh = AEApi.instance().registries().wireless().getWirelessTerminalHandler(is); if (wh == null) return null; - return new WirelessPatternTerminalGuiObject(wh, is, world.getClosestPlayer(x, y, z, 1), world, x, y, z); + return new WirelessPatternTerminalGuiObject(wh, is, world.getClosestPlayer(x, y, z, 2), world, x, y, z); } } diff --git a/src/main/java/com/glodblock/github/common/parts/PartFluidLevelEmitter.java b/src/main/java/com/glodblock/github/common/parts/PartFluidLevelEmitter.java index be74e04b..101192d3 100644 --- a/src/main/java/com/glodblock/github/common/parts/PartFluidLevelEmitter.java +++ b/src/main/java/com/glodblock/github/common/parts/PartFluidLevelEmitter.java @@ -1,6 +1,5 @@ package com.glodblock.github.common.parts; -import java.util.Objects; import java.util.Random; import net.minecraft.client.renderer.RenderBlocks; @@ -21,9 +20,6 @@ import com.glodblock.github.api.registries.ILevelViewable; import com.glodblock.github.api.registries.LevelItemInfo; import com.glodblock.github.api.registries.LevelState; 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 appeng.api.config.RedstoneMode; @@ -520,13 +516,10 @@ public class PartFluidLevelEmitter extends PartUpgradeable if (!player.isSneaking()) { if (Platform.isClient()) { return true; - } - InventoryHandler.openGui( - player, - this.getHost().getTile().getWorldObj(), - new BlockPos(this.getHost().getTile()), - Objects.requireNonNull(getSide()), - GuiType.FLUID_LEVEL_EMITTER); + } /* + * InventoryHandler.openGui( player, this.getHost().getTile().getWorldObj(), new + * BlockPos(this.getHost().getTile()), Objects.requireNonNull(getSide()), GuiType.FLUID_LEVEL_EMITTER); + */ return true; } diff --git a/src/main/java/com/glodblock/github/common/parts/PartFluidStorageBus.java b/src/main/java/com/glodblock/github/common/parts/PartFluidStorageBus.java index 66e37b6c..28a42da2 100644 --- a/src/main/java/com/glodblock/github/common/parts/PartFluidStorageBus.java +++ b/src/main/java/com/glodblock/github/common/parts/PartFluidStorageBus.java @@ -3,7 +3,6 @@ package com.glodblock.github.common.parts; import java.util.ArrayList; import java.util.Collections; import java.util.List; -import java.util.Objects; import java.util.function.Predicate; import javax.annotation.Nullable; @@ -18,9 +17,7 @@ import net.minecraft.util.Vec3; import com.glodblock.github.client.textures.FCPartsTexture; import com.glodblock.github.common.item.ItemFluidPacket; -import com.glodblock.github.inventory.InventoryHandler; import com.glodblock.github.inventory.MEMonitorIFluidHandler; -import com.glodblock.github.inventory.gui.GuiType; import com.glodblock.github.util.BlockPos; import appeng.api.AEApi; @@ -318,13 +315,11 @@ public class PartFluidStorageBus extends PartUpgradeable if (player.isSneaking()) { return false; } - if (Platform.isServer()) { - InventoryHandler.openGui( - player, - this.getHost().getTile().getWorldObj(), - new BlockPos(this.getHost().getTile()), - Objects.requireNonNull(this.getSide()), - GuiType.FLUID_STORAGE_BUS); + if (Platform.isServer()) {/* + * InventoryHandler.openGui( player, this.getHost().getTile().getWorldObj(), new + * BlockPos(this.getHost().getTile()), Objects.requireNonNull(this.getSide()), + * GuiType.FLUID_STORAGE_BUS); + */ } return true; } diff --git a/src/main/java/com/glodblock/github/common/parts/base/FCSharedFluidBus.java b/src/main/java/com/glodblock/github/common/parts/base/FCSharedFluidBus.java index aac34257..f2dd3aaf 100644 --- a/src/main/java/com/glodblock/github/common/parts/base/FCSharedFluidBus.java +++ b/src/main/java/com/glodblock/github/common/parts/base/FCSharedFluidBus.java @@ -1,7 +1,5 @@ package com.glodblock.github.common.parts.base; -import java.util.Objects; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; @@ -12,8 +10,6 @@ import net.minecraft.util.Vec3; import net.minecraft.world.World; 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 appeng.api.config.RedstoneMode; @@ -26,7 +22,6 @@ import appeng.api.storage.data.IAEFluidStack; import appeng.me.GridAccessException; import appeng.parts.automation.PartUpgradeable; import appeng.tile.inventory.AppEngInternalAEInventory; -import appeng.util.Platform; public abstract class FCSharedFluidBus extends PartUpgradeable implements IGridTickable { @@ -69,15 +64,10 @@ public abstract class FCSharedFluidBus extends PartUpgradeable implements IGridT public boolean onPartActivate(final EntityPlayer player, final Vec3 pos) { if (player.isSneaking()) { return false; - } - if (Platform.isServer()) { - InventoryHandler.openGui( - player, - this.getHost().getTile().getWorldObj(), - new BlockPos(this.getHost().getTile()), - Objects.requireNonNull(this.getSide()), - GuiType.FLUID_BUS_IO); - } + } /* + * if (Platform.isServer()) { InventoryHandler.openGui( player, this.getHost().getTile().getWorldObj(), new + * BlockPos(this.getHost().getTile()), Objects.requireNonNull(this.getSide()), GuiType.FLUID_BUS_IO); } + */ return true; } diff --git a/src/main/java/com/glodblock/github/inventory/InventoryHandler.java b/src/main/java/com/glodblock/github/inventory/InventoryHandler.java index 384f953c..b76f03d6 100644 --- a/src/main/java/com/glodblock/github/inventory/InventoryHandler.java +++ b/src/main/java/com/glodblock/github/inventory/InventoryHandler.java @@ -20,7 +20,7 @@ import cpw.mods.fml.relauncher.SideOnly; public class InventoryHandler implements IGuiHandler { public static void switchGui(Object guiType) { - FluidCraft.proxy.netHandler.sendToServer(new CPacketSwitchGuis(guiType)); + FluidCraft.proxy.netHandler.sendToServer(new CPacketSwitchGuis()); } public static void openGui(EntityPlayer player, World world, BlockPos pos, ForgeDirection face, Object guiType) { 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 90360e04..0c9c5787 100644 --- a/src/main/java/com/glodblock/github/inventory/gui/GuiType.java +++ b/src/main/java/com/glodblock/github/inventory/gui/GuiType.java @@ -7,14 +7,10 @@ import javax.annotation.Nullable; import net.minecraft.entity.player.EntityPlayer; import com.glodblock.github.client.gui.GuiDualInterface; -import com.glodblock.github.client.gui.GuiFCPriority; import com.glodblock.github.client.gui.GuiFluidAutoFiller; -import com.glodblock.github.client.gui.GuiFluidIO; import com.glodblock.github.client.gui.GuiFluidInterface; -import com.glodblock.github.client.gui.GuiFluidLevelEmitter; import com.glodblock.github.client.gui.GuiFluidPacketDecoder; import com.glodblock.github.client.gui.GuiFluidPatternEncoder; -import com.glodblock.github.client.gui.GuiFluidStorageBus; import com.glodblock.github.client.gui.GuiIngredientBuffer; import com.glodblock.github.client.gui.GuiLargeIngredientBuffer; import com.glodblock.github.client.gui.GuiLevelMaintainer; @@ -25,12 +21,9 @@ import com.glodblock.github.client.gui.GuiOCPatternEditor; import com.glodblock.github.client.gui.GuiSuperStockReplenisher; import com.glodblock.github.client.gui.container.ContainerDualInterface; import com.glodblock.github.client.gui.container.ContainerFluidAutoFiller; -import com.glodblock.github.client.gui.container.ContainerFluidIO; import com.glodblock.github.client.gui.container.ContainerFluidInterface; -import com.glodblock.github.client.gui.container.ContainerFluidLevelEmitter; import com.glodblock.github.client.gui.container.ContainerFluidPacketDecoder; import com.glodblock.github.client.gui.container.ContainerFluidPatternEncoder; -import com.glodblock.github.client.gui.container.ContainerFluidStorageBus; import com.glodblock.github.client.gui.container.ContainerIngredientBuffer; import com.glodblock.github.client.gui.container.ContainerLargeIngredientBuffer; import com.glodblock.github.client.gui.container.ContainerLevelMaintainer; @@ -39,9 +32,6 @@ import com.glodblock.github.client.gui.container.ContainerLevelWireless; import com.glodblock.github.client.gui.container.ContainerMagnetFilter; import com.glodblock.github.client.gui.container.ContainerOCPatternEditor; import com.glodblock.github.client.gui.container.ContainerSuperStockReplenisher; -import com.glodblock.github.common.parts.PartFluidLevelEmitter; -import com.glodblock.github.common.parts.PartFluidStorageBus; -import com.glodblock.github.common.parts.base.FCSharedFluidBus; import com.glodblock.github.common.tile.TileFluidAutoFiller; import com.glodblock.github.common.tile.TileFluidPacketDecoder; import com.glodblock.github.common.tile.TileFluidPatternEncoder; @@ -55,9 +45,7 @@ import com.glodblock.github.inventory.item.IWirelessTerminal; import com.google.common.collect.ImmutableList; import appeng.api.storage.ITerminalHost; -import appeng.container.implementations.ContainerPriority; import appeng.helpers.IInterfaceHost; -import appeng.helpers.IPriorityHost; public enum GuiType { @@ -74,19 +62,6 @@ public enum GuiType { } }), - FLUID_LEVEL_EMITTER(new PartGuiFactory<>(PartFluidLevelEmitter.class) { - - @Override - protected Object createServerGui(EntityPlayer player, PartFluidLevelEmitter inv) { - return new ContainerFluidLevelEmitter(player.inventory, inv); - } - - @Override - protected Object createClientGui(EntityPlayer player, PartFluidLevelEmitter inv) { - return new GuiFluidLevelEmitter(player.inventory, inv); - } - }), - LEVEL_MAINTAINER(new TileGuiFactory<>(TileLevelMaintainer.class) { @Override @@ -139,45 +114,6 @@ public enum GuiType { } }), - PRIORITY(new TileOrPartGuiFactory<>(IPriorityHost.class) { - - @Override - protected Object createServerGui(EntityPlayer player, IPriorityHost inv) { - return new ContainerPriority(player.inventory, inv); - } - - @Override - protected Object createClientGui(EntityPlayer player, IPriorityHost inv) { - return new GuiFCPriority(player.inventory, inv); - } - }), - - FLUID_BUS_IO(new PartGuiFactory<>(FCSharedFluidBus.class) { - - @Override - protected Object createServerGui(EntityPlayer player, FCSharedFluidBus inv) { - return new ContainerFluidIO(player.inventory, inv); - } - - @Override - protected Object createClientGui(EntityPlayer player, FCSharedFluidBus inv) { - return new GuiFluidIO(player.inventory, inv); - } - }), - - FLUID_STORAGE_BUS(new PartGuiFactory<>(PartFluidStorageBus.class) { - - @Override - protected Object createServerGui(EntityPlayer player, PartFluidStorageBus inv) { - return new ContainerFluidStorageBus(player.inventory, inv); - } - - @Override - protected Object createClientGui(EntityPlayer player, PartFluidStorageBus inv) { - return new GuiFluidStorageBus(player.inventory, inv); - } - }), - INGREDIENT_BUFFER(new TileGuiFactory<>(TileIngredientBuffer.class) { @Override diff --git a/src/main/java/com/glodblock/github/loader/KeybindLoader.java b/src/main/java/com/glodblock/github/loader/KeybindLoader.java index 0f2e597d..527e8864 100644 --- a/src/main/java/com/glodblock/github/loader/KeybindLoader.java +++ b/src/main/java/com/glodblock/github/loader/KeybindLoader.java @@ -1,5 +1,7 @@ package com.glodblock.github.loader; +import static com.glodblock.github.common.item.ItemWirelessUltraTerminal.switchTerminal; + import net.minecraft.client.Minecraft; import net.minecraft.client.entity.EntityClientPlayerMP; import net.minecraft.client.settings.KeyBinding; @@ -9,7 +11,6 @@ import org.apache.commons.lang3.tuple.ImmutablePair; import org.lwjgl.input.Keyboard; import com.glodblock.github.FluidCraft; -import com.glodblock.github.common.item.ItemWirelessUltraTerminal; import com.glodblock.github.network.CPacketValueConfig; import com.glodblock.github.util.Util; @@ -20,9 +21,6 @@ import cpw.mods.fml.common.gameevent.InputEvent; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import static com.glodblock.github.common.item.ItemBaseWirelessTerminal.getMode; -import static com.glodblock.github.common.item.ItemWirelessUltraTerminal.switchTerminal; - @SideOnly(Side.CLIENT) public class KeybindLoader implements Runnable { diff --git a/src/main/java/com/glodblock/github/network/CPacketSwitchGuis.java b/src/main/java/com/glodblock/github/network/CPacketSwitchGuis.java index 3aea48c0..00a3b87d 100644 --- a/src/main/java/com/glodblock/github/network/CPacketSwitchGuis.java +++ b/src/main/java/com/glodblock/github/network/CPacketSwitchGuis.java @@ -1,19 +1,20 @@ package com.glodblock.github.network; +import static com.glodblock.github.common.item.ItemWirelessUltraTerminal.switchTerminal; + import java.util.Objects; import javax.annotation.Nullable; -import com.glodblock.github.util.UltraTerminalModes; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.inventory.Container; import net.minecraft.tileentity.TileEntity; -import com.glodblock.github.common.item.ItemWirelessUltraTerminal; import com.glodblock.github.inventory.InventoryHandler; import com.glodblock.github.inventory.gui.GuiType; import com.glodblock.github.inventory.item.IWirelessTerminal; import com.glodblock.github.util.BlockPos; +import com.glodblock.github.util.UltraTerminalModes; import com.glodblock.github.util.Util; import appeng.container.AEBaseContainer; @@ -25,8 +26,6 @@ import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; import io.netty.buffer.ByteBuf; -import static com.glodblock.github.common.item.ItemWirelessUltraTerminal.switchTerminal; - public class CPacketSwitchGuis implements IMessage { private UltraTerminalModes mode; @@ -79,23 +78,23 @@ public class CPacketSwitchGuis implements IMessage { if (te != null) { if (guiType instanceof GuiType gt) { InventoryHandler.openGui( - player, - player.worldObj, - new BlockPos(te), - Objects.requireNonNull(context.getSide()), - gt); + player, + player.worldObj, + new BlockPos(te), + Objects.requireNonNull(context.getSide()), + gt); } else if (guiType instanceof GuiBridge gb) Platform.openGUI(player, te, context.getSide(), gb); } else if (aeBaseContainer.getTarget() instanceof IWirelessTerminal wt) { if (guiType instanceof GuiType gt) { InventoryHandler.openGui( - player, - player.worldObj, - new BlockPos( - wt.getInventorySlot(), - Util.GuiHelper.encodeType(0, Util.GuiHelper.GuiType.ITEM), - 0), - Objects.requireNonNull(context.getSide()), - gt); + player, + player.worldObj, + new BlockPos( + wt.getInventorySlot(), + Util.GuiHelper.encodeType(0, Util.GuiHelper.GuiType.ITEM), + 0), + Objects.requireNonNull(context.getSide()), + gt); } else if (guiType instanceof GuiBridge gb) Platform.openGUI(player, null, null, gb); } }