From f0528766ade495ece3c5fb29394b10eaa499d9d6 Mon Sep 17 00:00:00 2001 From: Kogepan229 Date: Sat, 31 Jan 2026 15:22:19 +0900 Subject: [PATCH] Move IO Bus Waila provider to AE2 --- .../crossmod/waila/PartWailaDataProvider.java | 4 +- .../github/crossmod/waila/Tooltip.java | 5 --- .../waila/part/SpeedWailaDataProvider.java | 37 ------------------- 3 files changed, 1 insertion(+), 45 deletions(-) delete mode 100644 src/main/java/com/glodblock/github/crossmod/waila/part/SpeedWailaDataProvider.java diff --git a/src/main/java/com/glodblock/github/crossmod/waila/PartWailaDataProvider.java b/src/main/java/com/glodblock/github/crossmod/waila/PartWailaDataProvider.java index 52d07723..328a84fb 100644 --- a/src/main/java/com/glodblock/github/crossmod/waila/PartWailaDataProvider.java +++ b/src/main/java/com/glodblock/github/crossmod/waila/PartWailaDataProvider.java @@ -10,7 +10,6 @@ import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.World; import com.glodblock.github.crossmod.waila.part.FluidInvWailaDataProvider; -import com.glodblock.github.crossmod.waila.part.SpeedWailaDataProvider; import com.google.common.base.Optional; import com.google.common.collect.Lists; @@ -29,9 +28,8 @@ public class PartWailaDataProvider implements IWailaDataProvider { private final Tracer tracer = new Tracer(); public PartWailaDataProvider() { - final IPartWailaDataProvider speed = new SpeedWailaDataProvider(); final IPartWailaDataProvider fluidInv = new FluidInvWailaDataProvider(); - this.providers = Lists.newArrayList(speed, fluidInv); + this.providers = Lists.newArrayList(fluidInv); } @Override diff --git a/src/main/java/com/glodblock/github/crossmod/waila/Tooltip.java b/src/main/java/com/glodblock/github/crossmod/waila/Tooltip.java index 202af0f6..f3db6097 100644 --- a/src/main/java/com/glodblock/github/crossmod/waila/Tooltip.java +++ b/src/main/java/com/glodblock/github/crossmod/waila/Tooltip.java @@ -27,11 +27,6 @@ public class Tooltip { return String.format("0 mB / %s mB", NumberFormat.getInstance().format(capacity)); } - public static String partFluidBusFormat(int amount) { - return String - .format("%s: %s mB/t", I18n.format(NameConst.WAILA_SPEED), NumberFormat.getInstance().format(amount)); - } - public static String tileFluidInterfaceFormat(String name, int amount, int face) { return String.format( "%s %s: %s mB", 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 deleted file mode 100644 index 1255ada7..00000000 --- a/src/main/java/com/glodblock/github/crossmod/waila/part/SpeedWailaDataProvider.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.glodblock.github.crossmod.waila.part; - -import java.util.List; - -import net.minecraft.entity.player.EntityPlayerMP; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.world.World; - -import com.glodblock.github.crossmod.waila.Tooltip; - -import appeng.api.parts.IPart; -import appeng.integration.modules.waila.part.BasePartWailaDataProvider; -import appeng.parts.automation.PartSharedItemBus; -import mcp.mobius.waila.api.IWailaConfigHandler; -import mcp.mobius.waila.api.IWailaDataAccessor; - -public class SpeedWailaDataProvider extends BasePartWailaDataProvider { - - @Override - public List getWailaBody(final IPart part, final List currentToolTip, - final IWailaDataAccessor accessor, final IWailaConfigHandler config) { - if (accessor.getNBTData().hasKey("BusSpeed")) { - currentToolTip.add(Tooltip.partFluidBusFormat(accessor.getNBTData().getInteger("BusSpeed"))); - } - return currentToolTip; - } - - @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 PartSharedItemBusbus) { - tag.setInteger("BusSpeed", bus.calculateAmountToSend() / 5); - } - return tag; - } -}