From f694689a297fb10d18466d54d60389ad3bfc486f Mon Sep 17 00:00:00 2001 From: Kogepan229 Date: Sat, 24 May 2025 02:01:44 +0900 Subject: [PATCH 1/2] Fix fluid import/export bus GUI when WAILA is disabled --- .../crossmod/waila/part/SpeedWailaDataProvider.java | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 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..1c8ed277 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 @@ -7,6 +7,8 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; +import com.glodblock.github.common.parts.PartFluidExportBus; +import com.glodblock.github.common.parts.PartFluidImportBus; import com.glodblock.github.common.parts.base.FCSharedFluidBus; import com.glodblock.github.crossmod.waila.Tooltip; @@ -20,9 +22,14 @@ 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 (part instanceof PartFluidExportBus bus) { + PartFluidExportBus tmpBus = new PartFluidExportBus(bus.getItemStack()); + tmpBus.readFromNBT(accessor.getNBTData()); + currentToolTip.add(Tooltip.partFluidBusFormat(tmpBus.calculateAmountToSend() / 5)); + } else if (part instanceof PartFluidImportBus bus) { + PartFluidImportBus tmpBus = new PartFluidImportBus(bus.getItemStack()); + tmpBus.readFromNBT(accessor.getNBTData()); + currentToolTip.add(Tooltip.partFluidBusFormat(tmpBus.calculateAmountToSend() / 5)); } return currentToolTip; } From dcac065134d65e24b9e79828de6c14b9769bbf90 Mon Sep 17 00:00:00 2001 From: Kogepan229 Date: Sat, 24 May 2025 02:29:09 +0900 Subject: [PATCH 2/2] simple --- .../waila/part/SpeedWailaDataProvider.java | 16 ++++------------ 1 file changed, 4 insertions(+), 12 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 1c8ed277..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 @@ -7,8 +7,6 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; -import com.glodblock.github.common.parts.PartFluidExportBus; -import com.glodblock.github.common.parts.PartFluidImportBus; import com.glodblock.github.common.parts.base.FCSharedFluidBus; import com.glodblock.github.crossmod.waila.Tooltip; @@ -22,14 +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 PartFluidExportBus bus) { - PartFluidExportBus tmpBus = new PartFluidExportBus(bus.getItemStack()); - tmpBus.readFromNBT(accessor.getNBTData()); - currentToolTip.add(Tooltip.partFluidBusFormat(tmpBus.calculateAmountToSend() / 5)); - } else if (part instanceof PartFluidImportBus bus) { - PartFluidImportBus tmpBus = new PartFluidImportBus(bus.getItemStack()); - tmpBus.readFromNBT(accessor.getNBTData()); - currentToolTip.add(Tooltip.partFluidBusFormat(tmpBus.calculateAmountToSend() / 5)); + if (accessor.getNBTData().hasKey("BusSpeed")) { + currentToolTip.add(Tooltip.partFluidBusFormat(accessor.getNBTData().getInteger("BusSpeed"))); } return currentToolTip; } @@ -37,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; }