diff --git a/dependencies.gradle b/dependencies.gradle index 44a4305d..5f839436 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -34,21 +34,21 @@ * For more details, see https://docs.gradle.org/8.0.1/userguide/java_library_plugin.html#sec:java_library_configurations_graph */ dependencies { - api('com.github.GTNewHorizons:NotEnoughItems:2.7.52-GTNH:dev') - api('com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-632-GTNH:dev') + api('com.github.GTNewHorizons:NotEnoughItems:2.7.57-GTNH:dev') + api('com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-636-GTNH:dev') api('curse.maven:cofh-core-69162:2388751') - api('com.github.GTNewHorizons:waila:1.8.7:dev') - api("com.github.GTNewHorizons:GTNHLib:0.6.30:dev") + api('com.github.GTNewHorizons:waila:1.8.8:dev') + api("com.github.GTNewHorizons:GTNHLib:0.6.32:dev") implementation("com.github.GTNewHorizons:WirelessCraftingTerminal:1.12.3:dev") { exclude group: 'com.github.GTNewHorizons', module: 'Applied-Energistics-2-Unofficial' } - compileOnly('com.github.GTNewHorizons:Baubles-Expanded:2.1.8-GTNH:dev') + compileOnly('com.github.GTNewHorizons:Baubles-Expanded:2.1.9-GTNH:dev') compileOnly('com.github.GTNewHorizons:ExtraCells2:2.5.35:dev') { transitive = false } compileOnly('com.github.GTNewHorizons:ForestryMC:4.10.11:dev') - compileOnly('com.github.GTNewHorizons:EnderIO:2.9.16:dev') - compileOnly('com.github.GTNewHorizons:GT5-Unofficial:5.09.51.339:dev') { + compileOnly('com.github.GTNewHorizons:EnderIO:2.9.18:dev') + compileOnly('com.github.GTNewHorizons:GT5-Unofficial:5.09.51.349:dev') { exclude group: 'com.github.GTNewHorizons', module: 'AE2FluidCraft-Rework' exclude group: 'com.github.GTNewHorizons', module: 'Applied-Energistics-2-Unofficial' } @@ -57,7 +57,7 @@ dependencies { compileOnly('com.gregoriust.gregtech:gregtech_1.7.10:6.14.23:dev') { transitive = false } compileOnly('com.github.GTNewHorizons:OpenComputers:1.11.16-GTNH:dev') { transitive = false } compileOnly('com.github.GTNewHorizons:ThaumicEnergistics:1.7.7-GTNH:dev') { transitive = false } - compileOnly("com.github.GTNewHorizons:Hodgepodge:2.6.76:dev") { transitive = false } + compileOnly("com.github.GTNewHorizons:Hodgepodge:2.6.79:dev") { transitive = false } runtimeOnlyNonPublishable("com.github.GTNewHorizons:DuraDisplay:1.3.4:dev") } diff --git a/src/main/java/com/glodblock/github/common/item/FCBaseItemCell.java b/src/main/java/com/glodblock/github/common/item/FCBaseItemCell.java index a4c11363..09942871 100644 --- a/src/main/java/com/glodblock/github/common/item/FCBaseItemCell.java +++ b/src/main/java/com/glodblock/github/common/item/FCBaseItemCell.java @@ -20,6 +20,7 @@ import com.glodblock.github.common.storage.CellType; import com.glodblock.github.common.storage.FluidCellInventory; import com.glodblock.github.common.storage.FluidCellInventoryHandler; import com.glodblock.github.common.storage.IStorageFluidCell; +import com.glodblock.github.inventory.FluidCellConfig; import com.glodblock.github.loader.ItemAndBlockHolder; import com.glodblock.github.util.NameConst; import com.google.common.base.Optional; @@ -36,7 +37,6 @@ import appeng.core.features.AEFeature; import appeng.core.localization.GuiText; import appeng.helpers.ICellRestriction; import appeng.items.AEBaseItem; -import appeng.items.contents.CellConfig; import appeng.items.contents.CellUpgrades; import appeng.util.InventoryAdaptor; import appeng.util.IterationCounter; @@ -208,7 +208,7 @@ public abstract class FCBaseItemCell extends AEBaseItem implements IStorageFluid @Override public IInventory getConfigInventory(ItemStack is) { - return new CellConfig(is); + return new FluidCellConfig(is); } @Override diff --git a/src/main/java/com/glodblock/github/common/item/ItemCreativeFluidStorageCell.java b/src/main/java/com/glodblock/github/common/item/ItemCreativeFluidStorageCell.java index f417fca6..b7452e07 100644 --- a/src/main/java/com/glodblock/github/common/item/ItemCreativeFluidStorageCell.java +++ b/src/main/java/com/glodblock/github/common/item/ItemCreativeFluidStorageCell.java @@ -8,12 +8,12 @@ import net.minecraft.item.ItemStack; import com.glodblock.github.FluidCraft; import com.glodblock.github.common.storage.IStorageFluidCell; import com.glodblock.github.common.tabs.FluidCraftingTabs; +import com.glodblock.github.inventory.FluidCellConfig; import com.glodblock.github.loader.IRegister; import com.glodblock.github.util.NameConst; import appeng.api.config.FuzzyMode; import appeng.core.features.AEFeature; -import appeng.items.contents.CellConfig; import appeng.util.Platform; import cpw.mods.fml.common.registry.GameRegistry; @@ -30,7 +30,7 @@ public class ItemCreativeFluidStorageCell extends ItemBaseInfinityStorageCell @Override public IInventory getConfigInventory(ItemStack is) { - return new CellConfig(is); + return new FluidCellConfig(is); } @Override diff --git a/src/main/java/com/glodblock/github/common/item/ItemFluidVoidStorageCell.java b/src/main/java/com/glodblock/github/common/item/ItemFluidVoidStorageCell.java index 1e2d7720..9994bbfa 100644 --- a/src/main/java/com/glodblock/github/common/item/ItemFluidVoidStorageCell.java +++ b/src/main/java/com/glodblock/github/common/item/ItemFluidVoidStorageCell.java @@ -14,6 +14,7 @@ import com.glodblock.github.common.storage.IFluidCellInventory; import com.glodblock.github.common.storage.IFluidCellInventoryHandler; import com.glodblock.github.common.storage.IStorageFluidCell; import com.glodblock.github.common.tabs.FluidCraftingTabs; +import com.glodblock.github.inventory.FluidCellConfig; import com.glodblock.github.loader.IRegister; import com.glodblock.github.util.NameConst; @@ -25,7 +26,6 @@ import appeng.api.storage.data.IAEFluidStack; import appeng.core.features.AEFeature; import appeng.core.localization.GuiText; import appeng.items.AEBaseItem; -import appeng.items.contents.CellConfig; import appeng.items.contents.CellUpgrades; import appeng.util.Platform; import cpw.mods.fml.common.registry.GameRegistry; @@ -116,7 +116,7 @@ public class ItemFluidVoidStorageCell extends AEBaseItem @Override public IInventory getConfigInventory(ItemStack is) { - return new CellConfig(is); + return new FluidCellConfig(is); } @Override diff --git a/src/main/java/com/glodblock/github/common/item/ItemPortableFluidCell.java b/src/main/java/com/glodblock/github/common/item/ItemPortableFluidCell.java index 8492fcc5..6cec6095 100644 --- a/src/main/java/com/glodblock/github/common/item/ItemPortableFluidCell.java +++ b/src/main/java/com/glodblock/github/common/item/ItemPortableFluidCell.java @@ -20,6 +20,7 @@ import com.glodblock.github.common.storage.IFluidCellInventory; import com.glodblock.github.common.storage.IFluidCellInventoryHandler; import com.glodblock.github.common.storage.IStorageFluidCell; import com.glodblock.github.common.tabs.FluidCraftingTabs; +import com.glodblock.github.inventory.FluidCellConfig; import com.glodblock.github.inventory.InventoryHandler; import com.glodblock.github.inventory.gui.GuiType; import com.glodblock.github.inventory.item.IItemInventory; @@ -37,7 +38,6 @@ import appeng.api.storage.StorageChannel; import appeng.api.storage.data.IAEFluidStack; import appeng.core.features.AEFeature; import appeng.core.localization.GuiText; -import appeng.items.contents.CellConfig; import appeng.items.contents.CellUpgrades; import appeng.items.tools.powered.powersink.AEBasePoweredItem; import appeng.util.Platform; @@ -163,7 +163,7 @@ public class ItemPortableFluidCell extends AEBasePoweredItem @Override public IInventory getConfigInventory(final ItemStack is) { - return new CellConfig(is); + return new FluidCellConfig(is); } @Override diff --git a/src/main/java/com/glodblock/github/common/storage/FluidCellInventoryHandler.java b/src/main/java/com/glodblock/github/common/storage/FluidCellInventoryHandler.java index a5725207..a73af7c9 100644 --- a/src/main/java/com/glodblock/github/common/storage/FluidCellInventoryHandler.java +++ b/src/main/java/com/glodblock/github/common/storage/FluidCellInventoryHandler.java @@ -6,6 +6,7 @@ import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.FluidStack; +import com.glodblock.github.common.item.ItemFluidPacket; import com.glodblock.github.util.Ae2Reflect; import com.glodblock.github.util.Util; @@ -42,6 +43,12 @@ public class FluidCellInventoryHandler extends MEInventoryHandler AEFluidStack stack = AEFluidStack.create(fluid); stack.setStackSize(1); priorityList.add(stack); + + // convert partition on cells in network + if (!(is.getItem() instanceof ItemFluidPacket)) { + config.setInventorySlotContents(x, ItemFluidPacket.newDisplayStack(fluid)); + config.markDirty(); + } } } if (!priorityList.isEmpty()) { diff --git a/src/main/java/com/glodblock/github/crossmod/extracells/ProxyItem.java b/src/main/java/com/glodblock/github/crossmod/extracells/ProxyItem.java index 8c6900b3..167f1a43 100644 --- a/src/main/java/com/glodblock/github/crossmod/extracells/ProxyItem.java +++ b/src/main/java/com/glodblock/github/crossmod/extracells/ProxyItem.java @@ -14,7 +14,9 @@ import net.minecraft.world.World; import com.glodblock.github.FluidCraft; import com.glodblock.github.common.item.FCBaseItem; +import com.glodblock.github.util.ModAndClassUtil; +import codechicken.nei.api.API; import cpw.mods.fml.common.registry.GameRegistry; /** @@ -38,6 +40,10 @@ public class ProxyItem extends FCBaseItem { @Override public FCBaseItem register() { GameRegistry.registerItem(this, "ec2placeholder." + name, FluidCraft.MODID); + if (!ModAndClassUtil.EC2) { + API.hideItem("ec2placeholder." + name); + } + return this; } diff --git a/src/main/java/com/glodblock/github/crossmod/extracells/storage/ProxyFluidStorageCell.java b/src/main/java/com/glodblock/github/crossmod/extracells/storage/ProxyFluidStorageCell.java index 4ebb3190..3ae624c9 100644 --- a/src/main/java/com/glodblock/github/crossmod/extracells/storage/ProxyFluidStorageCell.java +++ b/src/main/java/com/glodblock/github/crossmod/extracells/storage/ProxyFluidStorageCell.java @@ -6,10 +6,10 @@ import net.minecraft.item.ItemStack; import com.glodblock.github.api.FluidCraftAPI; import com.glodblock.github.common.storage.IStorageFluidCell; import com.glodblock.github.crossmod.extracells.ProxyItem; +import com.glodblock.github.inventory.FluidCellConfig; import appeng.api.config.FuzzyMode; import appeng.api.storage.data.IAEFluidStack; -import appeng.items.contents.CellConfig; import appeng.items.contents.CellUpgrades; import appeng.util.Platform; @@ -88,7 +88,7 @@ public class ProxyFluidStorageCell extends ProxyItem implements IStorageFluidCel @Override public IInventory getConfigInventory(ItemStack is) { - return new CellConfig(is); + return new FluidCellConfig(is); } @Override diff --git a/src/main/java/com/glodblock/github/inventory/FluidCellConfig.java b/src/main/java/com/glodblock/github/inventory/FluidCellConfig.java new file mode 100644 index 00000000..d4a0ea34 --- /dev/null +++ b/src/main/java/com/glodblock/github/inventory/FluidCellConfig.java @@ -0,0 +1,27 @@ +package com.glodblock.github.inventory; + +import net.minecraft.item.ItemStack; + +import com.glodblock.github.common.item.ItemFluidPacket; +import com.glodblock.github.util.Util; + +import appeng.items.contents.CellConfig; + +public class FluidCellConfig extends CellConfig { + + public FluidCellConfig(ItemStack is) { + super(is); + } + + @Override + public void setInventorySlotContents(int slot, ItemStack newItemStack) { + if (newItemStack != null && !(newItemStack.getItem() instanceof ItemFluidPacket)) { + ItemStack fluidPacket = ItemFluidPacket.newDisplayStack(Util.getFluidFromItem(newItemStack)); + if (fluidPacket != null) { + super.setInventorySlotContents(slot, fluidPacket); + return; + } + } + super.setInventorySlotContents(slot, newItemStack); + } +} diff --git a/src/main/java/com/glodblock/github/inventory/item/BaseWirelessInventory.java b/src/main/java/com/glodblock/github/inventory/item/BaseWirelessInventory.java index 207313e2..6a41bc7c 100644 --- a/src/main/java/com/glodblock/github/inventory/item/BaseWirelessInventory.java +++ b/src/main/java/com/glodblock/github/inventory/item/BaseWirelessInventory.java @@ -47,6 +47,7 @@ public abstract class BaseWirelessInventory extends MEMonitorHandler implements public BaseWirelessInventory(final ItemStack is, final int slot, IGridNode gridNode, EntityPlayer player, StorageChannel channel) { super(Objects.requireNonNull(Util.getWirelessInv(is, player, channel))); + this.player = player; this.ips = (ToolWirelessTerminal) is.getItem(); this.grid = gridNode; this.target = is; @@ -60,6 +61,7 @@ public abstract class BaseWirelessInventory extends MEMonitorHandler implements public BaseWirelessInventory(final ItemStack is, final int slot, IGridNode gridNode, EntityPlayer player, StorageChannel channel, boolean nullInventory) { super(new NullInventory<>()); + this.player = player; this.ips = (ToolWirelessTerminal) is.getItem(); this.grid = gridNode; this.target = is;