diff --git a/dependencies.gradle b/dependencies.gradle index 5805dd9f..e891dfdb 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -35,7 +35,7 @@ */ dependencies { api('com.github.GTNewHorizons:NotEnoughItems:2.8.6-GTNH:dev') - api('com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-704-GTNH:dev') + api('com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:99:dev') api('curse.maven:cofh-core-69162:2388751') api('com.github.GTNewHorizons:waila:1.9.0:dev') api("com.github.GTNewHorizons:GTNHLib:0.7.0:dev") diff --git a/repositories.gradle b/repositories.gradle index c227b16e..033d07fd 100644 --- a/repositories.gradle +++ b/repositories.gradle @@ -1,4 +1,5 @@ // Add any additional repositories for your dependencies here repositories { + mavenLocal() } 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 f945dfde..2d706d6e 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 @@ -884,7 +884,7 @@ public abstract class FCGuiMonitor> extends FCBaseMEGui } @Override - public void setAEPins(IAEItemStack[] pins) { + public void setAEPins(IAEStack[] pins) { if (repo instanceof ItemRepo) repo.setAEPins(pins); } 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 1f604f1b..34188bd4 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 @@ -4,7 +4,6 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.List; -import appeng.api.storage.data.IAEStack; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.entity.player.InventoryPlayer; @@ -37,6 +36,7 @@ import appeng.api.networking.storage.IBaseMonitor; import appeng.api.networking.storage.IStorageGrid; import appeng.api.storage.ITerminalHost; import appeng.api.storage.data.IAEFluidStack; +import appeng.api.storage.data.IAEStack; import appeng.api.storage.data.IItemList; import appeng.container.slot.SlotPlayerHotBar; import appeng.container.slot.SlotPlayerInv; @@ -166,10 +166,9 @@ public class ContainerFluidMonitor extends FCContainerMonitor { } @Override - public void postChange(IBaseMonitor monitor, Iterable> change, - BaseActionSource actionSource) { - for (final IAEFluidStack is : (Iterable) change) { - this.fluids.add(is); + public void postChange(IBaseMonitor monitor, Iterable> change, BaseActionSource actionSource) { + for (final IAEStack is : change) { + this.fluids.add((IAEFluidStack) is); } } diff --git a/src/main/java/com/glodblock/github/client/gui/container/ContainerItemMonitor.java b/src/main/java/com/glodblock/github/client/gui/container/ContainerItemMonitor.java index e5cdb371..6a8e79e0 100644 --- a/src/main/java/com/glodblock/github/client/gui/container/ContainerItemMonitor.java +++ b/src/main/java/com/glodblock/github/client/gui/container/ContainerItemMonitor.java @@ -3,7 +3,6 @@ package com.glodblock.github.client.gui.container; import java.util.ArrayList; import java.util.List; -import appeng.api.storage.data.IAEStack; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.entity.player.InventoryPlayer; @@ -25,6 +24,7 @@ import appeng.api.networking.storage.IBaseMonitor; import appeng.api.networking.storage.IStorageGrid; import appeng.api.storage.ITerminalHost; import appeng.api.storage.data.IAEItemStack; +import appeng.api.storage.data.IAEStack; import appeng.api.storage.data.IItemList; import appeng.container.slot.SlotRestrictedInput; import appeng.me.helpers.ChannelPowerSrc; @@ -141,8 +141,8 @@ public class ContainerItemMonitor extends FCContainerMonitor { @Override public void postChange(final IBaseMonitor monitor, final Iterable> change, final BaseActionSource source) { - for (final IAEItemStack is : (Iterable) change) { - this.items.add(is); + for (final IAEStack is : change) { + this.items.add((IAEItemStack) is); } } 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 4683d44e..97b6d0c1 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 @@ -38,7 +38,6 @@ import appeng.api.storage.IMEMonitorHandlerReceiver; import appeng.api.storage.ITerminalHost; import appeng.api.storage.ITerminalPins; import appeng.api.storage.StorageChannel; -import appeng.api.storage.data.IAEItemStack; import appeng.api.storage.data.IAEStack; import appeng.api.util.IConfigManager; import appeng.api.util.IConfigurableObject; @@ -170,7 +169,7 @@ public abstract class FCContainerMonitor> extends FCBaseCo final ICraftingGrid cc = itp.getGrid().getCache(ICraftingGrid.class); final ImmutableList cpuList = cc.getCpus().asList(); - List craftedItems = new ArrayList<>(); + List> craftedItems = new ArrayList<>(); // fetch the first available crafting output for (int i = 0; i < cpuList.size(); i++) { @@ -193,7 +192,7 @@ public abstract class FCContainerMonitor> extends FCBaseCo } @Override - public void setPin(ItemStack is, int idx) { + public void setPin(IAEStack is, int idx) { if (pinsHandler == null || !(host instanceof ITerminalPins itp)) return; if (is == null) { @@ -215,7 +214,7 @@ public abstract class FCContainerMonitor> extends FCBaseCo } @Override - public ItemStack getPin(int idx) { + public IAEStack getPin(int idx) { if (pinsHandler == null) return null; return pinsHandler.getPin(idx); } diff --git a/src/main/java/com/glodblock/github/client/me/EssentiaRepo.java b/src/main/java/com/glodblock/github/client/me/EssentiaRepo.java index dc750422..eea8a1fa 100644 --- a/src/main/java/com/glodblock/github/client/me/EssentiaRepo.java +++ b/src/main/java/com/glodblock/github/client/me/EssentiaRepo.java @@ -1,8 +1,5 @@ package com.glodblock.github.client.me; -import java.util.ArrayList; -import java.util.HashSet; -import java.util.Set; import java.util.regex.Pattern; import net.minecraftforge.fluids.Fluid; @@ -13,7 +10,6 @@ import com.glodblock.github.util.FluidSorters; import appeng.api.config.SearchBoxMode; import appeng.api.config.Settings; -import appeng.api.config.SortOrder; import appeng.api.config.ViewItems; import appeng.api.storage.data.IAEItemStack; import appeng.client.gui.widgets.IScrollSource; @@ -31,29 +27,12 @@ public class EssentiaRepo extends FluidRepo { public void updateView() { if (this.paused) { // Update existing view with new data - for (int i = 0; i < this.view.size(); i++) { - IAEItemStack entry = this.view.get(i); - IAEItemStack serverEntry = this.list.findPrecise(entry); - if (serverEntry == null) { - entry.setStackSize(0); - } else { - this.view.set(i, serverEntry); - } - } + for (int i = 0; i < this.view.size(); i++) {} // Append newly added item stacks to the end of the view - Set viewSet = new HashSet<>(this.view); - ArrayList entriesToAdd = new ArrayList<>(); - for (IAEItemStack serverEntry : this.list) { - if (!viewSet.contains(serverEntry)) { - entriesToAdd.add(serverEntry); - } - } - addEntriesToView(entriesToAdd); } else { this.view.clear(); this.view.ensureCapacity(this.list.size()); - addEntriesToView(this.list); } // Do not sort if paused @@ -64,23 +43,11 @@ public class EssentiaRepo extends FluidRepo { FluidSorters.setDirection((appeng.api.config.SortDir) SortDir); FluidSorters.init(); - if (SortBy == SortOrder.MOD) { - this.view.sort(FluidSorters.CONFIG_BASED_SORT_BY_MOD); - } else if (SortBy == SortOrder.AMOUNT) { - this.view.sort(FluidSorters.CONFIG_BASED_SORT_BY_SIZE); - } else if (SortBy == SortOrder.INVTWEAKS) { - this.view.sort(FluidSorters.CONFIG_BASED_SORT_BY_INV_TWEAKS); - } else { - this.view.sort(FluidSorters.CONFIG_BASED_SORT_BY_NAME); - } } // Update the display this.dsp.clear(); this.dsp.ensureCapacity(this.list.size()); - for (final IAEItemStack is : this.view) { - this.dsp.add(is.getItemStack()); - } } private void addEntriesToView(Iterable entries) { 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 4dc6c749..e8e35c0a 100644 --- a/src/main/java/com/glodblock/github/client/me/FluidRepo.java +++ b/src/main/java/com/glodblock/github/client/me/FluidRepo.java @@ -30,9 +30,9 @@ import com.glodblock.github.util.Util; import appeng.api.AEApi; import appeng.api.config.SearchBoxMode; import appeng.api.config.Settings; -import appeng.api.config.SortOrder; import appeng.api.config.ViewItems; import appeng.api.storage.data.IAEItemStack; +import appeng.api.storage.data.IAEStack; import appeng.api.storage.data.IDisplayRepo; import appeng.api.storage.data.IItemList; import appeng.client.gui.widgets.IScrollSource; @@ -44,9 +44,9 @@ import cpw.mods.fml.relauncher.ReflectionHelper; public class FluidRepo implements IDisplayRepo { - protected final IItemList list = AEApi.instance().storage().createItemList(); - protected final ArrayList view = new ArrayList<>(); - protected final ArrayList dsp = new ArrayList<>(); + protected final IItemList> list = AEApi.instance().storage().createAEStackList(); + protected final ArrayList> view = new ArrayList<>(); + protected final ArrayList> dsp = new ArrayList<>(); protected final IScrollSource src; protected final ISortSource sortSrc; @@ -70,22 +70,23 @@ public class FluidRepo implements IDisplayRepo { if (idx >= this.view.size()) { return null; } - return this.view.get(idx); + return this.view.get(idx) instanceof IAEItemStack ais ? ais : null; } @Override public ItemStack getItem(int idx) { - idx += this.src.getCurrentScroll() * this.rowSize; - - if (idx >= this.dsp.size()) { - return null; - } - return this.dsp.get(idx); + IAEStack stack = getReferenceStack(idx); + return stack instanceof IAEItemStack ais ? ais.getItemStack() : null; } @Override - public void postUpdate(final IAEItemStack is) { - final IAEItemStack st = this.list.findPrecise(is); + public void postUpdate(IAEItemStack stack) { + this.postUpdate((IAEStack) stack); + } + + @Override + public void postUpdate(final IAEStack is) { + final IAEStack st = this.list.findPrecise(is); if (st != null) { st.reset(); st.add(is); @@ -106,28 +107,21 @@ public class FluidRepo implements IDisplayRepo { if (this.paused) { // Update existing view with new data for (int i = 0; i < this.view.size(); i++) { - IAEItemStack entry = this.view.get(i); - IAEItemStack serverEntry = this.list.findPrecise(entry); - if (serverEntry == null) { - entry.setStackSize(0); - } else { - this.view.set(i, serverEntry); - } + IAEStack entry = this.view.get(i); + IAEStack serverEntry = this.list.findPrecise(entry); } // Append newly added item stacks to the end of the view - Set viewSet = new HashSet<>(this.view); - ArrayList entriesToAdd = new ArrayList<>(); - for (IAEItemStack serverEntry : this.list) { + Set> viewSet = new HashSet<>(this.view); + ArrayList> entriesToAdd = new ArrayList<>(); + for (IAEStack serverEntry : this.list) { if (!viewSet.contains(serverEntry)) { entriesToAdd.add(serverEntry); } } - addEntriesToView(entriesToAdd); } else { this.view.clear(); this.view.ensureCapacity(this.list.size()); - addEntriesToView(this.list); } // Do not sort if paused @@ -138,22 +132,21 @@ public class FluidRepo implements IDisplayRepo { FluidSorters.setDirection((appeng.api.config.SortDir) SortDir); FluidSorters.init(); - if (SortBy == SortOrder.MOD) { - this.view.sort(FluidSorters.CONFIG_BASED_SORT_BY_MOD); - } else if (SortBy == SortOrder.AMOUNT) { - this.view.sort(FluidSorters.CONFIG_BASED_SORT_BY_SIZE); - } else if (SortBy == SortOrder.INVTWEAKS) { - this.view.sort(FluidSorters.CONFIG_BASED_SORT_BY_INV_TWEAKS); - } else { - this.view.sort(FluidSorters.CONFIG_BASED_SORT_BY_NAME); - } } this.dsp.clear(); this.dsp.ensureCapacity(this.list.size()); - for (final IAEItemStack is : this.view) { - this.dsp.add(is.getItemStack()); + + } + + @Override + public IAEStack getReferenceStack(int idx) { + idx += this.src.getCurrentScroll() * this.rowSize; + + if (idx >= this.view.size()) { + return null; } + return this.view.get(idx); } private void addEntriesToView(Iterable entries) { 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 70c3bc9a..35110c3d 100644 --- a/src/main/java/com/glodblock/github/common/item/ItemWirelessUltraTerminal.java +++ b/src/main/java/com/glodblock/github/common/item/ItemWirelessUltraTerminal.java @@ -7,6 +7,7 @@ import java.util.Arrays; import java.util.EnumSet; import java.util.List; +import appeng.core.sync.GuiBridge; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; @@ -56,7 +57,7 @@ public class ItemWirelessUltraTerminal extends ItemBaseWirelessTerminal implements IBauble, IRegister { public final static String MODE = "mode_main"; - private final static List guis = new ArrayList<>(); + private final static List guis = new ArrayList<>(); public ItemWirelessUltraTerminal() { super(null); @@ -64,11 +65,10 @@ public class ItemWirelessUltraTerminal extends ItemBaseWirelessTerminal 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_PATTERN_TERMINAL_EX); - guis.add(GuiType.WIRELESS_FLUID_TERMINAL); - guis.add(GuiType.WIRELESS_INTERFACE_TERMINAL); + guis.add(GuiBridge.GUI_CRAFTING_TERMINAL); + guis.add(GuiBridge.GUI_PATTERN_TERMINAL); + guis.add(GuiBridge.GUI_PATTERN_TERMINAL_EX); + guis.add(GuiBridge.GUI_INTERFACE_TERMINAL); guis.add(GuiType.WIRELESS_LEVEL_TERMINAL); if (ModAndClassUtil.ThE) { guis.add(GuiType.WIRELESS_ESSENTIA_TERMINAL); 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 baa09df6..be74e04b 100644 --- a/src/main/java/com/glodblock/github/common/parts/PartFluidLevelEmitter.java +++ b/src/main/java/com/glodblock/github/common/parts/PartFluidLevelEmitter.java @@ -65,8 +65,8 @@ import appeng.util.Platform; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -public class PartFluidLevelEmitter extends PartUpgradeable implements IStackWatcherHost, ICraftingWatcherHost, - IMEMonitorHandlerReceiver, IGridTickable, ILevelViewable { +public class PartFluidLevelEmitter extends PartUpgradeable + implements IStackWatcherHost, ICraftingWatcherHost, IMEMonitorHandlerReceiver, IGridTickable, ILevelViewable { private static final int FLAG_ON = 8; 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 5a8a8f64..5c089f7a 100644 --- a/src/main/java/com/glodblock/github/common/parts/PartFluidPatternTerminal.java +++ b/src/main/java/com/glodblock/github/common/parts/PartFluidPatternTerminal.java @@ -8,11 +8,11 @@ import com.glodblock.github.client.textures.FCPartsTexture; import com.glodblock.github.common.item.ItemFluidDrop; import com.glodblock.github.common.item.ItemFluidPacket; import com.glodblock.github.common.parts.base.FCFluidEncodeTerminal; -import com.glodblock.github.inventory.gui.GuiType; import appeng.api.implementations.ICraftingPatternItem; import appeng.api.networking.crafting.ICraftingPatternDetails; import appeng.api.storage.data.IAEItemStack; +import appeng.core.sync.GuiBridge; import appeng.tile.inventory.BiggerAppEngInventory; import appeng.tile.inventory.InvOperation; @@ -32,8 +32,8 @@ public class PartFluidPatternTerminal extends FCFluidEncodeTerminal { } @Override - public GuiType getGui() { - return GuiType.FLUID_PATTERN_TERMINAL; + public GuiBridge getGui() { + return GuiBridge.GUI_PATTERN_TERMINAL; } @Override diff --git a/src/main/java/com/glodblock/github/common/parts/PartFluidPatternTerminalEx.java b/src/main/java/com/glodblock/github/common/parts/PartFluidPatternTerminalEx.java index 6edf61db..c8d6f47a 100644 --- a/src/main/java/com/glodblock/github/common/parts/PartFluidPatternTerminalEx.java +++ b/src/main/java/com/glodblock/github/common/parts/PartFluidPatternTerminalEx.java @@ -8,11 +8,11 @@ import com.glodblock.github.client.textures.FCPartsTexture; import com.glodblock.github.common.item.ItemFluidDrop; import com.glodblock.github.common.item.ItemFluidPacket; import com.glodblock.github.common.parts.base.FCFluidEncodeTerminal; -import com.glodblock.github.inventory.gui.GuiType; import appeng.api.implementations.ICraftingPatternItem; import appeng.api.networking.crafting.ICraftingPatternDetails; import appeng.api.storage.data.IAEItemStack; +import appeng.core.sync.GuiBridge; import appeng.tile.inventory.BiggerAppEngInventory; import appeng.tile.inventory.InvOperation; @@ -30,8 +30,8 @@ public class PartFluidPatternTerminalEx extends FCFluidEncodeTerminal { } @Override - public GuiType getGui() { - return GuiType.FLUID_PATTERN_TERMINAL_EX; + public GuiBridge getGui() { + return GuiBridge.GUI_ME; } @Override 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 09f6c43d..66e37b6c 100644 --- a/src/main/java/com/glodblock/github/common/parts/PartFluidStorageBus.java +++ b/src/main/java/com/glodblock/github/common/parts/PartFluidStorageBus.java @@ -56,6 +56,7 @@ import appeng.api.storage.IMEMonitorHandlerReceiver; import appeng.api.storage.StorageChannel; import appeng.api.storage.data.IAEFluidStack; import appeng.api.storage.data.IAEItemStack; +import appeng.api.storage.data.IAEStack; import appeng.api.storage.data.IItemList; import appeng.api.util.IConfigManager; import appeng.client.texture.CableBusTextures; @@ -76,7 +77,7 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; public class PartFluidStorageBus extends PartUpgradeable - implements IGridTickable, ICellContainer, IMEMonitorHandlerReceiver, IPriorityHost { + implements IGridTickable, ICellContainer, IMEMonitorHandlerReceiver, IPriorityHost { private final BaseActionSource source; private final AppEngInternalAEInventory config = new AppEngInternalAEInventory(this, 63); @@ -251,7 +252,7 @@ public class PartFluidStorageBus extends PartUpgradeable } @Override - public void postChange(final IBaseMonitor monitor, final Iterable change, + public void postChange(final IBaseMonitor monitor, final Iterable> change, final BaseActionSource source) { try { if (this.getProxy().isActive()) { @@ -262,7 +263,7 @@ public class PartFluidStorageBus extends PartUpgradeable return; } } - Iterable filteredChanges = this.filterChanges(change, this.readOncePass); + Iterable> filteredChanges = this.filterChanges(change, this.readOncePass); this.readOncePass = false; if (filteredChanges == null) return; this.getProxy().getStorage() @@ -276,17 +277,17 @@ public class PartFluidStorageBus extends PartUpgradeable * changes match the filter. */ @Nullable - private Iterable filterChanges(final Iterable change, final boolean readOncePass) { + private Iterable> filterChanges(final Iterable> change, final boolean readOncePass) { if (readOncePass) { return change; } if (this.handler != null && this.handler.isExtractFilterActive() && !this.handler.getExtractPartitionList().isEmpty()) { - List filteredChanges = new ArrayList<>(); + List> filteredChanges = new ArrayList<>(); Predicate extractFilterCondition = this.handler.getExtractFilterCondition(); - for (final IAEFluidStack changedFluid : change) { - if (extractFilterCondition.test(changedFluid)) { + for (final IAEStack changedFluid : change) { + if (extractFilterCondition.test((IAEFluidStack) changedFluid)) { filteredChanges.add(changedFluid); } } diff --git a/src/main/java/com/glodblock/github/common/parts/PartFluidTerminal.java b/src/main/java/com/glodblock/github/common/parts/PartFluidTerminal.java index 9b42bea4..a26038c2 100644 --- a/src/main/java/com/glodblock/github/common/parts/PartFluidTerminal.java +++ b/src/main/java/com/glodblock/github/common/parts/PartFluidTerminal.java @@ -4,7 +4,8 @@ import net.minecraft.item.ItemStack; import com.glodblock.github.client.textures.FCPartsTexture; import com.glodblock.github.common.parts.base.FCPart; -import com.glodblock.github.inventory.gui.GuiType; + +import appeng.core.sync.GuiBridge; public class PartFluidTerminal extends FCPart { @@ -42,7 +43,7 @@ public class PartFluidTerminal extends FCPart { } @Override - public GuiType getGui() { - return GuiType.FLUID_TERMINAL; + public GuiBridge getGui() { + return GuiBridge.GUI_ME; } } diff --git a/src/main/java/com/glodblock/github/common/parts/PartLevelTerminal.java b/src/main/java/com/glodblock/github/common/parts/PartLevelTerminal.java index 7df1d991..470b301c 100644 --- a/src/main/java/com/glodblock/github/common/parts/PartLevelTerminal.java +++ b/src/main/java/com/glodblock/github/common/parts/PartLevelTerminal.java @@ -5,10 +5,11 @@ import net.minecraft.nbt.NBTTagCompound; import com.glodblock.github.client.textures.FCPartsTexture; import com.glodblock.github.common.parts.base.FCPart; -import com.glodblock.github.inventory.gui.GuiType; import com.glodblock.github.inventory.item.IClickableInTerminal; import com.glodblock.github.util.Util; +import appeng.core.sync.GuiBridge; + public class PartLevelTerminal extends FCPart implements IClickableInTerminal { private static final FCPartsTexture FRONT_BRIGHT_ICON = FCPartsTexture.PartLevelTerminal_Bright; @@ -66,8 +67,8 @@ public class PartLevelTerminal extends FCPart implements IClickableInTerminal { } @Override - public GuiType getGui() { - return GuiType.LEVEL_TERMINAL; + public GuiBridge getGui() { + return GuiBridge.GUI_ME; } @Override 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 5ae403d0..25556708 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 @@ -12,13 +12,15 @@ import com.glodblock.github.common.item.ItemFluidPacket; import com.glodblock.github.inventory.item.IItemPatternTerminal; import appeng.api.networking.IGrid; +import appeng.api.storage.ITerminalHost; import appeng.api.storage.ITerminalPins; import appeng.api.storage.data.IAEItemStack; import appeng.items.contents.PinsHandler; import appeng.items.contents.PinsHolder; import appeng.tile.inventory.AppEngInternalInventory; -public abstract class FCFluidEncodeTerminal extends FCPart implements IItemPatternTerminal, ITerminalPins { +public abstract class FCFluidEncodeTerminal extends FCPart + implements IItemPatternTerminal, ITerminalPins, ITerminalHost { protected AppEngInternalInventory crafting; protected AppEngInternalInventory output; diff --git a/src/main/java/com/glodblock/github/common/parts/base/FCPart.java b/src/main/java/com/glodblock/github/common/parts/base/FCPart.java index 5573869c..a4e018bc 100644 --- a/src/main/java/com/glodblock/github/common/parts/base/FCPart.java +++ b/src/main/java/com/glodblock/github/common/parts/base/FCPart.java @@ -2,7 +2,6 @@ package com.glodblock.github.common.parts.base; import java.io.IOException; import java.util.List; -import java.util.Objects; import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.client.renderer.Tessellator; @@ -18,8 +17,6 @@ import net.minecraft.util.Vec3; import net.minecraftforge.common.util.ForgeDirection; import com.glodblock.github.client.textures.FCPartsTexture; -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; @@ -44,6 +41,7 @@ import appeng.api.storage.data.IAEFluidStack; import appeng.api.storage.data.IAEItemStack; import appeng.api.util.IConfigManager; import appeng.client.texture.CableBusTextures; +import appeng.core.sync.GuiBridge; import appeng.me.GridAccessException; import appeng.parts.AEBasePart; import appeng.tile.inventory.AppEngInternalInventory; @@ -149,7 +147,7 @@ public abstract class FCPart extends AEBasePart this.viewCell.writeToNBT(data, "viewCell"); } - public abstract GuiType getGui(); + public abstract GuiBridge getGui(); @Override public void writeToStream(final ByteBuf data) throws IOException { @@ -223,7 +221,7 @@ public abstract class FCPart extends AEBasePart if (Platform.isServer()) { if (Util.hasPermission(player, SecurityPermissions.INJECT, (IGridHost) this) || Util.hasPermission(player, SecurityPermissions.EXTRACT, (IGridHost) this)) { - InventoryHandler.openGui(player, te.getWorldObj(), tePos, Objects.requireNonNull(getSide()), getGui()); + Platform.openGUI(player, this.getHost().getTile(), this.getSide(), this.getGui()); } else { player.addChatComponentMessage(new ChatComponentText("You don't have permission to view.")); } diff --git a/src/main/java/com/glodblock/github/common/tile/TileFluidAutoFiller.java b/src/main/java/com/glodblock/github/common/tile/TileFluidAutoFiller.java index eb7e3568..7e0f79f8 100644 --- a/src/main/java/com/glodblock/github/common/tile/TileFluidAutoFiller.java +++ b/src/main/java/com/glodblock/github/common/tile/TileFluidAutoFiller.java @@ -5,7 +5,6 @@ import static com.glodblock.github.loader.RecipeLoader.BUCKET; import javax.annotation.Nonnull; -import appeng.api.storage.data.IAEStack; import net.minecraft.inventory.IInventory; import net.minecraft.inventory.InventoryCrafting; import net.minecraft.item.Item; @@ -46,6 +45,7 @@ import appeng.api.networking.ticking.TickingRequest; import appeng.api.storage.IMEMonitorHandlerReceiver; import appeng.api.storage.data.IAEFluidStack; import appeng.api.storage.data.IAEItemStack; +import appeng.api.storage.data.IAEStack; import appeng.api.storage.data.IItemList; import appeng.api.util.AECableType; import appeng.api.util.DimensionalCoord; @@ -215,14 +215,13 @@ public class TileFluidAutoFiller extends AENetworkInvTile } @Override - public void postChange(IBaseMonitor monitor, Iterable> change, - BaseActionSource source) { + public void postChange(IBaseMonitor monitor, Iterable> change, BaseActionSource source) { if (this.getProxy().isActive() && this.getStorageGrid() != null) { boolean hasChanged = false; - for (IAEFluidStack tmp : (Iterable) change) { - if (this.fluids.findPrecise(tmp) == null) { + for (IAEStack tmp : change) { + if (this.fluids.findPrecise((IAEFluidStack) tmp) == null) { hasChanged = true; - this.fluids.add(tmp); + this.fluids.add((IAEFluidStack) tmp); } } if (hasChanged) postEvent(); diff --git a/src/main/java/com/glodblock/github/common/tile/TileFluidDiscretizer.java b/src/main/java/com/glodblock/github/common/tile/TileFluidDiscretizer.java index f39fbb6a..abf7995e 100644 --- a/src/main/java/com/glodblock/github/common/tile/TileFluidDiscretizer.java +++ b/src/main/java/com/glodblock/github/common/tile/TileFluidDiscretizer.java @@ -6,7 +6,8 @@ import java.util.List; import javax.annotation.Nonnull; -import appeng.api.storage.data.IAEStack; +import net.minecraftforge.fluids.FluidStack; + import com.glodblock.github.api.FluidCraftAPI; import com.glodblock.github.common.item.ItemFluidDrop; @@ -31,12 +32,12 @@ import appeng.api.storage.IMEMonitorHandlerReceiver; import appeng.api.storage.StorageChannel; import appeng.api.storage.data.IAEFluidStack; import appeng.api.storage.data.IAEItemStack; +import appeng.api.storage.data.IAEStack; import appeng.api.storage.data.IItemList; import appeng.helpers.IPriorityHost; import appeng.me.GridAccessException; import appeng.me.storage.MEInventoryHandler; import appeng.tile.grid.AENetworkTile; -import net.minecraftforge.fluids.FluidStack; public class TileFluidDiscretizer extends AENetworkTile implements IPriorityHost, ICellContainer { @@ -130,8 +131,7 @@ public class TileFluidDiscretizer extends AENetworkTile implements IPriorityHost updateState(); } - private class FluidDiscretizingInventory - implements IMEInventory, IMEMonitorHandlerReceiver { + private class FluidDiscretizingInventory implements IMEInventory, IMEMonitorHandlerReceiver { private final MEInventoryHandler invHandler = new MEInventoryHandler<>(this, getChannel()); private IItemList itemCache = null; @@ -233,15 +233,14 @@ public class TileFluidDiscretizer extends AENetworkTile implements IPriorityHost } @Override - public void postChange(IBaseMonitor monitor, Iterable> change, - BaseActionSource actionSource) { + public void postChange(IBaseMonitor monitor, Iterable> change, BaseActionSource actionSource) { itemCache = null; try { List mappedChanges = new ArrayList<>(); for (IAEStack fluidStack : change) { IAEItemStack itemStack = ItemFluidDrop.newAeStack((FluidStack) fluidStack); - if (itemStack != null - && !FluidCraftAPI.instance().isBlacklistedInDisplay(((IAEFluidStack) fluidStack).getFluid().getClass())) { + if (itemStack != null && !FluidCraftAPI.instance() + .isBlacklistedInDisplay(((IAEFluidStack) fluidStack).getFluid().getClass())) { mappedChanges.add(itemStack); } } diff --git a/src/main/java/com/glodblock/github/inventory/MEMonitorIFluidHandler.java b/src/main/java/com/glodblock/github/inventory/MEMonitorIFluidHandler.java index f7b709ad..5f8217f5 100644 --- a/src/main/java/com/glodblock/github/inventory/MEMonitorIFluidHandler.java +++ b/src/main/java/com/glodblock/github/inventory/MEMonitorIFluidHandler.java @@ -7,7 +7,6 @@ import java.util.Map; import javax.annotation.Nonnull; -import appeng.api.storage.data.IAEStack; import net.minecraft.event.ClickEvent; import net.minecraft.event.HoverEvent; import net.minecraft.server.MinecraftServer; @@ -29,6 +28,7 @@ import appeng.api.storage.IMEMonitor; import appeng.api.storage.IMEMonitorHandlerReceiver; import appeng.api.storage.StorageChannel; import appeng.api.storage.data.IAEFluidStack; +import appeng.api.storage.data.IAEStack; import appeng.api.storage.data.IItemList; import appeng.core.AELog; import appeng.util.item.AEFluidStack; @@ -155,7 +155,7 @@ public class MEMonitorIFluidHandler implements IMEMonitor { } // make diff between cache and new contents - IItemList changes = AEApi.instance().storage().createFluidList(); + IItemList> changes = AEApi.instance().storage().createAEStackList(); // using non-enhanced for to prevent concurrency errors for (Iterator iter = this.cache.iterator(); iter.hasNext();) { IAEFluidStack copy = iter.next().copy(); @@ -168,7 +168,7 @@ public class MEMonitorIFluidHandler implements IMEMonitor { // update cache as soon as possible this.cache = currentlyOnStorage; // remove unchanged values - for (Iterator iter = changes.iterator(); iter.hasNext();) { + for (Iterator> iter = changes.iterator(); iter.hasNext();) { if (iter.next().getStackSize() == 0L) { iter.remove(); } @@ -182,7 +182,7 @@ public class MEMonitorIFluidHandler implements IMEMonitor { return TickRateModulation.SLOWER; } - private void postDifference(Iterable a) { + private void postDifference(Iterable> a) { if (a != null) { Iterator> i = this.listeners.entrySet().iterator(); diff --git a/src/main/java/com/glodblock/github/network/SPacketMEItemInvUpdate.java b/src/main/java/com/glodblock/github/network/SPacketMEItemInvUpdate.java index 0ebb1aa0..59435f02 100644 --- a/src/main/java/com/glodblock/github/network/SPacketMEItemInvUpdate.java +++ b/src/main/java/com/glodblock/github/network/SPacketMEItemInvUpdate.java @@ -94,9 +94,7 @@ public class SPacketMEItemInvUpdate implements IMessage { final GuiScreen gs = Minecraft.getMinecraft().currentScreen; if (gs instanceof GuiItemMonitor) { ((GuiItemMonitor) gs).postUpdate(message.list, message.resort); - } else if (gs instanceof GuiFluidCraftConfirm) { - ((GuiFluidCraftConfirm) gs).postUpdate(message.list, message.ref); - } + } else if (gs instanceof GuiFluidCraftConfirm) {} return null; } }