From 412c6d9cf2cc5a34ff41279381af400ca47a46a6 Mon Sep 17 00:00:00 2001 From: lordIcocain <62835225+lordIcocain@users.noreply.github.com> Date: Sun, 11 May 2025 20:15:24 +0300 Subject: [PATCH 01/15] fix player inventory position in interface terminal (#290) --- .../github/client/gui/container/ContainerInterfaceWireless.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/glodblock/github/client/gui/container/ContainerInterfaceWireless.java b/src/main/java/com/glodblock/github/client/gui/container/ContainerInterfaceWireless.java index 02bed991..1f05b5cd 100644 --- a/src/main/java/com/glodblock/github/client/gui/container/ContainerInterfaceWireless.java +++ b/src/main/java/com/glodblock/github/client/gui/container/ContainerInterfaceWireless.java @@ -19,7 +19,7 @@ public class ContainerInterfaceWireless extends FCBaseContainer { delegateContainer = new ContainerInterfaceTerminal(ip, monitorable); - this.bindPlayerInventory(ip, 14, 0); + this.bindPlayerInventory(ip, 14, 3); } @Override From 3af7873882da2f521bf0766fc8bf0392d0bcf0dc Mon Sep 17 00:00:00 2001 From: Maya <10861407+serenibyss@users.noreply.github.com> Date: Sun, 11 May 2025 12:16:20 -0500 Subject: [PATCH 02/15] update --- dependencies.gradle | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dependencies.gradle b/dependencies.gradle index ecf866f5..8ba66d46 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -35,7 +35,7 @@ */ dependencies { api('com.github.GTNewHorizons:NotEnoughItems:2.7.40-GTNH:dev') - api('com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-597-GTNH:dev') + api('com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-600-GTNH:dev') api('curse.maven:cofh-core-69162:2388751') api('com.github.GTNewHorizons:waila:1.8.4:dev') api("com.github.GTNewHorizons:GTNHLib:0.6.21:dev") @@ -47,8 +47,8 @@ dependencies { compileOnly('com.github.GTNewHorizons:Baubles-Expanded:2.1.7-GTNH:dev') compileOnly('com.github.GTNewHorizons:ExtraCells2:2.5.35:dev') { transitive = false } compileOnly('com.github.GTNewHorizons:ForestryMC:4.10.7:dev') - compileOnly('com.github.GTNewHorizons:EnderIO:2.9.8:dev') - compileOnly('com.github.GTNewHorizons:GT5-Unofficial:5.09.51.266:dev') { + compileOnly('com.github.GTNewHorizons:EnderIO:2.9.12:dev') + compileOnly('com.github.GTNewHorizons:GT5-Unofficial:5.09.51.279: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.13-GTNH:dev') { transitive = false } compileOnly('com.github.GTNewHorizons:ThaumicEnergistics:1.7.7-GTNH:dev') { transitive = false } - compileOnly("com.github.GTNewHorizons:Hodgepodge:2.6.46:dev") { transitive = false } + compileOnly("com.github.GTNewHorizons:Hodgepodge:2.6.53:dev") { transitive = false } runtimeOnlyNonPublishable("com.github.GTNewHorizons:DuraDisplay:1.3.4:dev") } From 6e613b33af1b8e71a1a2e8f8a740ab87604df6ba Mon Sep 17 00:00:00 2001 From: Martin Robertz Date: Mon, 12 May 2025 09:31:48 +0200 Subject: [PATCH 03/15] update --- dependencies.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dependencies.gradle b/dependencies.gradle index 8ba66d46..40ec3792 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -35,7 +35,7 @@ */ dependencies { api('com.github.GTNewHorizons:NotEnoughItems:2.7.40-GTNH:dev') - api('com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-600-GTNH:dev') + api('com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-602-GTNH:dev') api('curse.maven:cofh-core-69162:2388751') api('com.github.GTNewHorizons:waila:1.8.4:dev') api("com.github.GTNewHorizons:GTNHLib:0.6.21:dev") @@ -48,7 +48,7 @@ dependencies { compileOnly('com.github.GTNewHorizons:ExtraCells2:2.5.35:dev') { transitive = false } compileOnly('com.github.GTNewHorizons:ForestryMC:4.10.7:dev') compileOnly('com.github.GTNewHorizons:EnderIO:2.9.12:dev') - compileOnly('com.github.GTNewHorizons:GT5-Unofficial:5.09.51.279:dev') { + compileOnly('com.github.GTNewHorizons:GT5-Unofficial:5.09.51.282:dev') { exclude group: 'com.github.GTNewHorizons', module: 'AE2FluidCraft-Rework' exclude group: 'com.github.GTNewHorizons', module: 'Applied-Energistics-2-Unofficial' } From c9cf92ca4a706cc9d29c97c648f58f9e65dbde8c Mon Sep 17 00:00:00 2001 From: lordIcocain <62835225+lordIcocain@users.noreply.github.com> Date: Mon, 12 May 2025 17:21:33 +0300 Subject: [PATCH 04/15] Fix cell math for distribution card (#291) Co-authored-by: Maya <10861407+serenibyss@users.noreply.github.com> --- .../github/common/storage/FluidCellInventory.java | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/glodblock/github/common/storage/FluidCellInventory.java b/src/main/java/com/glodblock/github/common/storage/FluidCellInventory.java index 436d458e..f1c54283 100644 --- a/src/main/java/com/glodblock/github/common/storage/FluidCellInventory.java +++ b/src/main/java/com/glodblock/github/common/storage/FluidCellInventory.java @@ -226,12 +226,9 @@ public class FluidCellInventory implements IFluidCellInventory { if (types == 0) types = this.getTotalFluidTypes(); if (l != null) { if (restrictionLong > 0) { - remaining = Math.min((restrictionLong / types) - l.getStackSize(), this.getUnusedFluidCount()); + remaining = Math.min((restrictionLong / types) - l.getStackSize(), getRemainingFluidCount()); } else { - remaining = (((this.getTotalBytes() / types) - - (int) Math.ceil((double) l.getStackSize() / singleByteAmount) - - getBytesPerType()) * singleByteAmount) - + (singleByteAmount - l.getStackSize() % singleByteAmount); + remaining = (((getTotalBytes() / types) - getBytesPerType()) * singleByteAmount) - l.getStackSize(); } } else { if (restrictionLong > 0) { From f629b3a7da12db28f96bb52eb739d38cd2e8a34d Mon Sep 17 00:00:00 2001 From: Caedis Date: Tue, 13 May 2025 09:00:56 -0500 Subject: [PATCH 05/15] Update dependencies.gradle (#292) --- dependencies.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dependencies.gradle b/dependencies.gradle index 40ec3792..7010828f 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -40,7 +40,7 @@ dependencies { api('com.github.GTNewHorizons:waila:1.8.4:dev') api("com.github.GTNewHorizons:GTNHLib:0.6.21:dev") - implementation("com.github.GTNewHorizons:WirelessCraftingTerminal:1.12.0:dev") { + implementation("com.github.GTNewHorizons:WirelessCraftingTerminal:1.12.1:dev") { exclude group: 'com.github.GTNewHorizons', module: 'Applied-Energistics-2-Unofficial' } From 1a959b5b8d63704677aa06bab5adfdc359881e83 Mon Sep 17 00:00:00 2001 From: Martin Robertz Date: Fri, 16 May 2025 21:33:36 +0200 Subject: [PATCH 06/15] update --- dependencies.gradle | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dependencies.gradle b/dependencies.gradle index 7010828f..667dd8e7 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -34,11 +34,11 @@ * 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.40-GTNH:dev') - api('com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-602-GTNH:dev') + api('com.github.GTNewHorizons:NotEnoughItems:2.7.44-GTNH:dev') + api('com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-606-GTNH:dev') api('curse.maven:cofh-core-69162:2388751') api('com.github.GTNewHorizons:waila:1.8.4:dev') - api("com.github.GTNewHorizons:GTNHLib:0.6.21:dev") + api("com.github.GTNewHorizons:GTNHLib:0.6.22:dev") implementation("com.github.GTNewHorizons:WirelessCraftingTerminal:1.12.1:dev") { exclude group: 'com.github.GTNewHorizons', module: 'Applied-Energistics-2-Unofficial' @@ -48,7 +48,7 @@ dependencies { compileOnly('com.github.GTNewHorizons:ExtraCells2:2.5.35:dev') { transitive = false } compileOnly('com.github.GTNewHorizons:ForestryMC:4.10.7:dev') compileOnly('com.github.GTNewHorizons:EnderIO:2.9.12:dev') - compileOnly('com.github.GTNewHorizons:GT5-Unofficial:5.09.51.282:dev') { + compileOnly('com.github.GTNewHorizons:GT5-Unofficial:5.09.51.285:dev') { exclude group: 'com.github.GTNewHorizons', module: 'AE2FluidCraft-Rework' exclude group: 'com.github.GTNewHorizons', module: 'Applied-Energistics-2-Unofficial' } From 830ac91521ebabd28f5184147148ebfbf498142a Mon Sep 17 00:00:00 2001 From: lordIcocain <62835225+lordIcocain@users.noreply.github.com> Date: Fri, 23 May 2025 12:14:36 +0300 Subject: [PATCH 07/15] make baubles optional (#296) --- .../java/com/glodblock/github/FluidCraft.java | 2 +- .../java/com/glodblock/github/util/Util.java | 21 ++++++++++++------- 2 files changed, 15 insertions(+), 8 deletions(-) diff --git a/src/main/java/com/glodblock/github/FluidCraft.java b/src/main/java/com/glodblock/github/FluidCraft.java index 4a6a51af..5c20a21a 100644 --- a/src/main/java/com/glodblock/github/FluidCraft.java +++ b/src/main/java/com/glodblock/github/FluidCraft.java @@ -33,7 +33,7 @@ import cpw.mods.fml.common.network.NetworkRegistry; modid = FluidCraft.MODID, version = FluidCraft.VERSION, name = FluidCraft.MODNAME, - dependencies = "required-after:appliedenergistics2@[rv3-beta-238,);required-after:CoFHCore;required-after:Baubles;after:waila;after:thaumicenergistics;after:ae2wct") + dependencies = "required-after:appliedenergistics2@[rv3-beta-238,);required-after:CoFHCore;after:waila;after:thaumicenergistics;after:ae2wct") public class FluidCraft { public static final String MODID = "ae2fc"; diff --git a/src/main/java/com/glodblock/github/util/Util.java b/src/main/java/com/glodblock/github/util/Util.java index 6b3de0b2..d478c524 100644 --- a/src/main/java/com/glodblock/github/util/Util.java +++ b/src/main/java/com/glodblock/github/util/Util.java @@ -59,12 +59,15 @@ import appeng.util.Platform; import appeng.util.item.AEFluidStack; import baubles.api.BaublesApi; import codechicken.nei.recipe.StackInfo; +import cpw.mods.fml.common.Loader; import cpw.mods.fml.common.ModContainer; import cpw.mods.fml.common.registry.GameData; import io.netty.buffer.ByteBuf; public final class Util { + public static boolean isBaublesLoaded = Loader.isModLoaded("Baubles"); + public static int drainItemPower(AEBaseContainer c, InventoryPlayer ip, int slot, int ticks, double pm, IFluidPortableCell wt) { if (slot != -1) { @@ -181,16 +184,20 @@ public final class Util { return new ImmutablePair<>(i, is); } } - IInventory handler = BaublesApi.getBaubles(player); - if (handler != null) { - invSize = handler.getSizeInventory(); - for (int i = 0; i < invSize; ++i) { - ItemStack is = handler.getStackInSlot(i); - if (is != null && is.getItem() instanceof ItemWirelessUltraTerminal) { - return new ImmutablePair<>(GuiHelper.encodeType(i, GuiHelper.InvType.PLAYER_BAUBLES), is); + + if (isBaublesLoaded) { + IInventory handler = BaublesApi.getBaubles(player); + if (handler != null) { + invSize = handler.getSizeInventory(); + for (int i = 0; i < invSize; ++i) { + ItemStack is = handler.getStackInSlot(i); + if (is != null && is.getItem() instanceof ItemWirelessUltraTerminal) { + return new ImmutablePair<>(GuiHelper.encodeType(i, GuiHelper.InvType.PLAYER_BAUBLES), is); + } } } } + return null; } From c0d438f77402c1d86f677acf0bfa88d8e238ac43 Mon Sep 17 00:00:00 2001 From: Kogepan229 <73163994+Kogepan229@users.noreply.github.com> Date: Sat, 24 May 2025 04:46:16 +0900 Subject: [PATCH 08/15] Use long stack size in NEI CellView (#297) --- src/main/java/com/glodblock/github/nei/NEICellViewHandler.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/main/java/com/glodblock/github/nei/NEICellViewHandler.java b/src/main/java/com/glodblock/github/nei/NEICellViewHandler.java index 6f8b0d77..372fc60b 100644 --- a/src/main/java/com/glodblock/github/nei/NEICellViewHandler.java +++ b/src/main/java/com/glodblock/github/nei/NEICellViewHandler.java @@ -85,7 +85,6 @@ public class NEICellViewHandler implements IUsageHandler { int count = 0; for (IAEFluidStack aeFluid : sortedStacks) { FluidStack fluid = aeFluid.getFluidStack(); - long amount = fluid.amount; ItemStack fluidItemStack = ItemFluidDrop.newStack(fluid); if (fluidItemStack != null) { fluidItemStack.stackSize = 1; @@ -93,7 +92,7 @@ public class NEICellViewHandler implements IUsageHandler { fluidItemStack, OFFSET_X + count % ROW_ITEM_NUM * 18 + 1, ITEMS_OFFSET_Y + count / ROW_ITEM_NUM * 18 + 1); - stacks.add(new ViewItemStack(positionedStack, amount, fluid.getFluid().getIcon(), fluid.getFluid().getColor())); + stacks.add(new ViewItemStack(positionedStack, aeFluid.getStackSize(), fluid.getFluid().getIcon(), fluid.getFluid().getColor())); count++; } } From a57cb5db5294a694ee92fc4a2a1ea29be9e9120b Mon Sep 17 00:00:00 2001 From: Martin Robertz Date: Fri, 23 May 2025 22:59:21 +0200 Subject: [PATCH 09/15] update --- dependencies.gradle | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/dependencies.gradle b/dependencies.gradle index 667dd8e7..01b91734 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -34,28 +34,28 @@ * 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.44-GTNH:dev') - api('com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-606-GTNH:dev') + api('com.github.GTNewHorizons:NotEnoughItems:2.7.45-GTNH:dev') + api('com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-613-GTNH:dev') api('curse.maven:cofh-core-69162:2388751') api('com.github.GTNewHorizons:waila:1.8.4:dev') api("com.github.GTNewHorizons:GTNHLib:0.6.22:dev") - implementation("com.github.GTNewHorizons:WirelessCraftingTerminal:1.12.1:dev") { + implementation("com.github.GTNewHorizons:WirelessCraftingTerminal:1.12.2:dev") { exclude group: 'com.github.GTNewHorizons', module: 'Applied-Energistics-2-Unofficial' } - compileOnly('com.github.GTNewHorizons:Baubles-Expanded:2.1.7-GTNH:dev') + compileOnly('com.github.GTNewHorizons:Baubles-Expanded:2.1.8-GTNH:dev') compileOnly('com.github.GTNewHorizons:ExtraCells2:2.5.35:dev') { transitive = false } - compileOnly('com.github.GTNewHorizons:ForestryMC:4.10.7:dev') - compileOnly('com.github.GTNewHorizons:EnderIO:2.9.12:dev') - compileOnly('com.github.GTNewHorizons:GT5-Unofficial:5.09.51.285:dev') { + compileOnly('com.github.GTNewHorizons:ForestryMC:4.10.8:dev') + compileOnly('com.github.GTNewHorizons:EnderIO:2.9.13:dev') + compileOnly('com.github.GTNewHorizons:GT5-Unofficial:5.09.51.291:dev') { exclude group: 'com.github.GTNewHorizons', module: 'AE2FluidCraft-Rework' exclude group: 'com.github.GTNewHorizons', module: 'Applied-Energistics-2-Unofficial' } compileOnly('thaumcraft:Thaumcraft:1.7.10-4.2.3.5:dev') compileOnly('com.gregoriust.gregtech:gregtech_1.7.10:6.14.23:dev') { transitive = false } - compileOnly('com.github.GTNewHorizons:OpenComputers:1.11.13-GTNH:dev') { transitive = false } + compileOnly('com.github.GTNewHorizons:OpenComputers:1.11.15-GTNH:dev') { transitive = false } compileOnly('com.github.GTNewHorizons:ThaumicEnergistics:1.7.7-GTNH:dev') { transitive = false } compileOnly("com.github.GTNewHorizons:Hodgepodge:2.6.53:dev") { transitive = false } From a70854c832fb9390ec6e7ab5a1aeb4399e6395c4 Mon Sep 17 00:00:00 2001 From: Kogepan229 <73163994+Kogepan229@users.noreply.github.com> Date: Sun, 25 May 2025 03:09:11 +0900 Subject: [PATCH 10/15] Restore NEI highlighting when searching for fluid in cells (#299) Co-authored-by: boubou19 --- ...EIItemFilter.java => NEISearchFilter.java} | 23 ++++++++++++++----- .../glodblock/github/nei/NEI_FC_Config.java | 2 +- 2 files changed, 18 insertions(+), 7 deletions(-) rename src/main/java/com/glodblock/github/nei/{NEIItemFilter.java => NEISearchFilter.java} (75%) diff --git a/src/main/java/com/glodblock/github/nei/NEIItemFilter.java b/src/main/java/com/glodblock/github/nei/NEISearchFilter.java similarity index 75% rename from src/main/java/com/glodblock/github/nei/NEIItemFilter.java rename to src/main/java/com/glodblock/github/nei/NEISearchFilter.java index 5bb2070e..c8fdfc98 100644 --- a/src/main/java/com/glodblock/github/nei/NEIItemFilter.java +++ b/src/main/java/com/glodblock/github/nei/NEISearchFilter.java @@ -3,6 +3,7 @@ package com.glodblock.github.nei; import java.util.regex.Pattern; import net.minecraft.item.ItemStack; +import net.minecraft.util.EnumChatFormatting; import com.glodblock.github.common.storage.IFluidCellInventory; import com.glodblock.github.common.storage.IFluidCellInventoryHandler; @@ -13,9 +14,10 @@ import appeng.api.storage.IMEInventoryHandler; import appeng.api.storage.StorageChannel; import appeng.api.storage.data.IAEFluidStack; import codechicken.nei.SearchField; +import codechicken.nei.SearchTokenParser; import codechicken.nei.api.ItemFilter; -public class NEIItemFilter implements SearchField.ISearchProvider { +public class NEISearchFilter implements SearchTokenParser.ISearchParserProvider { @Override public ItemFilter getFilter(String searchText) { @@ -24,8 +26,18 @@ public class NEIItemFilter implements SearchField.ISearchProvider { } @Override - public boolean isPrimary() { - return false; + public char getPrefix() { + return 0; + } + + @Override + public EnumChatFormatting getHighlightedColor() { + return null; + } + + @Override + public SearchTokenParser.SearchMode getSearchMode() { + return SearchTokenParser.SearchMode.ALWAYS; } public static class Filter implements ItemFilter { @@ -40,13 +52,13 @@ public class NEIItemFilter implements SearchField.ISearchProvider { public boolean matches(ItemStack itemStack) { if (itemStack.getItem() instanceof IStorageFluidCell) { final IMEInventoryHandler inventory = AEApi.instance().registries().cell() - .getCellInventory(itemStack, null, StorageChannel.FLUIDS); + .getCellInventory(itemStack, null, StorageChannel.FLUIDS); if (inventory instanceof final IFluidCellInventoryHandler handler) { final IFluidCellInventory cellInventory = handler.getCellInv(); if (cellInventory != null) { for (IAEFluidStack fluid : cellInventory.getContents()) { boolean result = pattern.matcher(fluid.getFluidStack().getLocalizedName().toLowerCase()) - .find(); + .find(); if (result) return true; } @@ -57,5 +69,4 @@ public class NEIItemFilter implements SearchField.ISearchProvider { } } - } 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 bae93cf9..1a586139 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 @@ -18,7 +18,7 @@ public class NEI_FC_Config implements IConfigureNEI { @Override public void loadConfig() { API.registerNEIGuiHandler(new AE2FC_NEIGuiHandler()); - API.addSearchProvider(new NEIItemFilter()); + API.addSearchProvider(new NEISearchFilter()); API.registerStackStringifyHandler(new FCStackStringifyHandler()); API.registerUsageHandler(new NEICellViewHandler()); From df1384a7ee863637735d47426c6d3034b3781d0e Mon Sep 17 00:00:00 2001 From: Martin Robertz Date: Sat, 24 May 2025 22:27:58 +0200 Subject: [PATCH 11/15] update --- dependencies.gradle | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dependencies.gradle b/dependencies.gradle index 01b91734..0aef018d 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -35,7 +35,7 @@ */ dependencies { api('com.github.GTNewHorizons:NotEnoughItems:2.7.45-GTNH:dev') - api('com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-613-GTNH:dev') + api('com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-615-GTNH:dev') api('curse.maven:cofh-core-69162:2388751') api('com.github.GTNewHorizons:waila:1.8.4:dev') api("com.github.GTNewHorizons:GTNHLib:0.6.22:dev") @@ -47,8 +47,8 @@ dependencies { compileOnly('com.github.GTNewHorizons:Baubles-Expanded:2.1.8-GTNH:dev') compileOnly('com.github.GTNewHorizons:ExtraCells2:2.5.35:dev') { transitive = false } compileOnly('com.github.GTNewHorizons:ForestryMC:4.10.8:dev') - compileOnly('com.github.GTNewHorizons:EnderIO:2.9.13:dev') - compileOnly('com.github.GTNewHorizons:GT5-Unofficial:5.09.51.291:dev') { + compileOnly('com.github.GTNewHorizons:EnderIO:2.9.14:dev') + compileOnly('com.github.GTNewHorizons:GT5-Unofficial:5.09.51.299:dev') { exclude group: 'com.github.GTNewHorizons', module: 'AE2FluidCraft-Rework' exclude group: 'com.github.GTNewHorizons', module: 'Applied-Energistics-2-Unofficial' } From 47e41751df51272af5d33cdd526274e27b095aa3 Mon Sep 17 00:00:00 2001 From: Kogepan229 <73163994+Kogepan229@users.noreply.github.com> Date: Sun, 25 May 2025 11:02:42 +0900 Subject: [PATCH 12/15] Fix NEI search always showing void cell (#300) --- .../github/common/storage/FluidCellInventory.java | 4 +++- .../common/storage/FluidVoidStorageCellInventory.java | 7 +++++-- .../github/common/storage/IFluidCellInventory.java | 3 +++ 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/glodblock/github/common/storage/FluidCellInventory.java b/src/main/java/com/glodblock/github/common/storage/FluidCellInventory.java index f1c54283..56f363ba 100644 --- a/src/main/java/com/glodblock/github/common/storage/FluidCellInventory.java +++ b/src/main/java/com/glodblock/github/common/storage/FluidCellInventory.java @@ -13,6 +13,8 @@ import net.minecraft.nbt.NBTBase; import net.minecraft.nbt.NBTTagCompound; import net.minecraftforge.fluids.FluidStack; +import org.jetbrains.annotations.NotNull; + import com.glodblock.github.common.item.ItemBaseInfinityStorageCell; import com.glodblock.github.common.item.ItemFluidVoidStorageCell; import com.glodblock.github.crossmod.extracells.storage.ProxyFluidCellInventory; @@ -476,7 +478,7 @@ public class FluidCellInventory implements IFluidCellInventory { } @Override - public List getContents() { + public @NotNull List getContents() { List ret = new ArrayList<>(); for (IAEFluidStack fluid : this.getCellFluids()) { ret.add(fluid); diff --git a/src/main/java/com/glodblock/github/common/storage/FluidVoidStorageCellInventory.java b/src/main/java/com/glodblock/github/common/storage/FluidVoidStorageCellInventory.java index 21fe409d..bc5635d9 100644 --- a/src/main/java/com/glodblock/github/common/storage/FluidVoidStorageCellInventory.java +++ b/src/main/java/com/glodblock/github/common/storage/FluidVoidStorageCellInventory.java @@ -1,11 +1,14 @@ package com.glodblock.github.common.storage; +import java.util.Collections; import java.util.List; import javax.annotation.Nonnull; import net.minecraft.item.ItemStack; +import org.jetbrains.annotations.NotNull; + import appeng.api.config.Actionable; import appeng.api.exceptions.AppEngException; import appeng.api.networking.security.BaseActionSource; @@ -109,7 +112,7 @@ public class FluidVoidStorageCellInventory extends FluidCellInventory { } @Override - public List getContents() { - return null; + public @NotNull List getContents() { + return Collections.emptyList(); } } diff --git a/src/main/java/com/glodblock/github/common/storage/IFluidCellInventory.java b/src/main/java/com/glodblock/github/common/storage/IFluidCellInventory.java index dfea4858..c1c4384e 100644 --- a/src/main/java/com/glodblock/github/common/storage/IFluidCellInventory.java +++ b/src/main/java/com/glodblock/github/common/storage/IFluidCellInventory.java @@ -5,6 +5,8 @@ import java.util.List; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; +import org.jetbrains.annotations.NotNull; + import appeng.api.storage.IMEInventory; import appeng.api.storage.data.IAEFluidStack; @@ -90,6 +92,7 @@ public interface IFluidCellInventory extends IMEInventory { */ long getTotalFluidTypes(); + @NotNull List getContents(); /** From f235a682664987aed34d8ccddf34a5fa2dd417d4 Mon Sep 17 00:00:00 2001 From: Martin Robertz Date: Sun, 25 May 2025 15:10:33 +0200 Subject: [PATCH 13/15] update --- dependencies.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dependencies.gradle b/dependencies.gradle index 0aef018d..3ae36999 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -37,7 +37,7 @@ dependencies { api('com.github.GTNewHorizons:NotEnoughItems:2.7.45-GTNH:dev') api('com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-615-GTNH:dev') api('curse.maven:cofh-core-69162:2388751') - api('com.github.GTNewHorizons:waila:1.8.4:dev') + api('com.github.GTNewHorizons:waila:1.8.6:dev') api("com.github.GTNewHorizons:GTNHLib:0.6.22:dev") implementation("com.github.GTNewHorizons:WirelessCraftingTerminal:1.12.2:dev") { @@ -48,7 +48,7 @@ dependencies { compileOnly('com.github.GTNewHorizons:ExtraCells2:2.5.35:dev') { transitive = false } compileOnly('com.github.GTNewHorizons:ForestryMC:4.10.8:dev') compileOnly('com.github.GTNewHorizons:EnderIO:2.9.14:dev') - compileOnly('com.github.GTNewHorizons:GT5-Unofficial:5.09.51.299:dev') { + compileOnly('com.github.GTNewHorizons:GT5-Unofficial:5.09.51.302:dev') { exclude group: 'com.github.GTNewHorizons', module: 'AE2FluidCraft-Rework' exclude group: 'com.github.GTNewHorizons', module: 'Applied-Energistics-2-Unofficial' } From 410e33faa03f9d26f3647f057cd9ad6a10e016eb Mon Sep 17 00:00:00 2001 From: Kogepan229 <73163994+Kogepan229@users.noreply.github.com> Date: Mon, 26 May 2025 03:36:05 +0900 Subject: [PATCH 14/15] Fix fluid import/export bus GUI when WAILA is disabled (#298) Co-authored-by: Maya <10861407+serenibyss@users.noreply.github.com> --- .../crossmod/waila/part/SpeedWailaDataProvider.java | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/glodblock/github/crossmod/waila/part/SpeedWailaDataProvider.java b/src/main/java/com/glodblock/github/crossmod/waila/part/SpeedWailaDataProvider.java index e16b62e7..7fc376fe 100644 --- a/src/main/java/com/glodblock/github/crossmod/waila/part/SpeedWailaDataProvider.java +++ b/src/main/java/com/glodblock/github/crossmod/waila/part/SpeedWailaDataProvider.java @@ -20,9 +20,8 @@ public class SpeedWailaDataProvider extends BasePartWailaDataProvider { @Override public List getWailaBody(final IPart part, final List currentToolTip, final IWailaDataAccessor accessor, final IWailaConfigHandler config) { - if (part instanceof FCSharedFluidBus) { - part.readFromNBT(accessor.getNBTData()); - currentToolTip.add(Tooltip.partFluidBusFormat(((FCSharedFluidBus) part).calculateAmountToSend() / 5)); + if (accessor.getNBTData().hasKey("BusSpeed")) { + currentToolTip.add(Tooltip.partFluidBusFormat(accessor.getNBTData().getInteger("BusSpeed"))); } return currentToolTip; } @@ -30,8 +29,8 @@ public class SpeedWailaDataProvider extends BasePartWailaDataProvider { @Override public NBTTagCompound getNBTData(final EntityPlayerMP player, final IPart part, final TileEntity te, final NBTTagCompound tag, final World world, final int x, final int y, final int z) { - if (part instanceof FCSharedFluidBus) { - part.writeToNBT(tag); + if (part instanceof FCSharedFluidBus bus) { + tag.setInteger("BusSpeed", bus.calculateAmountToSend() / 5); } return tag; } From 5cc8534ba2d7bc30fea9df428b13cc311baad81b Mon Sep 17 00:00:00 2001 From: Martin Robertz Date: Sun, 25 May 2025 21:10:05 +0200 Subject: [PATCH 15/15] update --- dependencies.gradle | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dependencies.gradle b/dependencies.gradle index 3ae36999..6fc40534 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -38,17 +38,17 @@ dependencies { api('com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-615-GTNH:dev') api('curse.maven:cofh-core-69162:2388751') api('com.github.GTNewHorizons:waila:1.8.6:dev') - api("com.github.GTNewHorizons:GTNHLib:0.6.22:dev") + api("com.github.GTNewHorizons:GTNHLib:0.6.24:dev") - implementation("com.github.GTNewHorizons:WirelessCraftingTerminal:1.12.2: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:ExtraCells2:2.5.35:dev') { transitive = false } - compileOnly('com.github.GTNewHorizons:ForestryMC:4.10.8:dev') + compileOnly('com.github.GTNewHorizons:ForestryMC:4.10.10:dev') compileOnly('com.github.GTNewHorizons:EnderIO:2.9.14:dev') - compileOnly('com.github.GTNewHorizons:GT5-Unofficial:5.09.51.302:dev') { + compileOnly('com.github.GTNewHorizons:GT5-Unofficial:5.09.51.309: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.15-GTNH:dev') { transitive = false } compileOnly('com.github.GTNewHorizons:ThaumicEnergistics:1.7.7-GTNH:dev') { transitive = false } - compileOnly("com.github.GTNewHorizons:Hodgepodge:2.6.53:dev") { transitive = false } + compileOnly("com.github.GTNewHorizons:Hodgepodge:2.6.64:dev") { transitive = false } runtimeOnlyNonPublishable("com.github.GTNewHorizons:DuraDisplay:1.3.4:dev") }