From f235a682664987aed34d8ccddf34a5fa2dd417d4 Mon Sep 17 00:00:00 2001 From: Martin Robertz Date: Sun, 25 May 2025 15:10:33 +0200 Subject: [PATCH 1/3] 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 2/3] 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 3/3] 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") }