From 5c115d9af342e48ecd2131d6ccf103c0f786eaa7 Mon Sep 17 00:00:00 2001 From: danyadev Date: Sat, 15 Nov 2025 20:17:38 +0300 Subject: [PATCH] WailaPlugins compat (#54) --- .../waila/addons/buildcraft/BCModule.java | 18 ++- ...dlerBCTanks.java => TankFluidHandler.java} | 31 +++-- ...HandlerDrum.java => DrumFluidHandler.java} | 18 +-- .../addons/exu/ExtraUtilitiesModule.java | 16 +-- .../addons/openblocks/OpenBlocksModule.java | 21 ++-- ...HandlerTank.java => TankFluidHandler.java} | 25 ++-- .../addons/railcraft/HUDHandlerTank.java | 88 -------------- .../addons/railcraft/RailcraftModule.java | 40 +++++-- .../addons/railcraft/TankFluidHandler.java | 102 ++++++++++++++++ .../thermaldynamics/FluiductFluidHandler.java | 112 ++++++++++++++++++ .../ThermalDynamicsModule.java | 38 +++--- .../thermalexpansion/HUDHandlerCache.java | 9 +- .../thermalexpansion/HUDHandlerTank.java | 104 ---------------- .../thermalexpansion/TankFluidHandler.java | 94 +++++++++++++++ .../TankModeHandler.java} | 51 ++++---- .../ThermalExpansionModule.java | 106 ++++++++--------- .../mcp/mobius/waila/client/KeyEvent.java | 14 +-- .../mcp/mobius/waila/client/ProxyClient.java | 20 +++- .../tooltiprenderers/TTRenderFluidBar.java | 15 +-- .../mcp/mobius/waila/server/ProxyServer.java | 4 +- .../mcp/mobius/waila/utils/LoadedMods.java | 11 ++ .../mobius/waila/utils/NumberFormatter.java | 34 ++++++ .../resources/assets/waila/lang/cs_CZ.lang | 3 +- .../resources/assets/waila/lang/de_DE.lang | 3 +- .../resources/assets/waila/lang/en_US.lang | 3 +- src/main/resources/assets/waila/lang/et_EE | 3 +- .../resources/assets/waila/lang/et_EE.lang | 3 +- .../resources/assets/waila/lang/fr_FR.lang | 3 +- .../resources/assets/waila/lang/it_IT.lang | 3 +- .../resources/assets/waila/lang/nl_NL.lang | 3 +- .../resources/assets/waila/lang/ru_RU.lang | 3 +- .../resources/assets/waila/lang/zh_CN.lang | 3 +- 32 files changed, 597 insertions(+), 404 deletions(-) rename src/main/java/mcp/mobius/waila/addons/buildcraft/{HUDHandlerBCTanks.java => TankFluidHandler.java} (75%) rename src/main/java/mcp/mobius/waila/addons/exu/{HUDHandlerDrum.java => DrumFluidHandler.java} (78%) rename src/main/java/mcp/mobius/waila/addons/openblocks/{HUDHandlerTank.java => TankFluidHandler.java} (76%) delete mode 100644 src/main/java/mcp/mobius/waila/addons/railcraft/HUDHandlerTank.java create mode 100644 src/main/java/mcp/mobius/waila/addons/railcraft/TankFluidHandler.java create mode 100644 src/main/java/mcp/mobius/waila/addons/thermaldynamics/FluiductFluidHandler.java delete mode 100644 src/main/java/mcp/mobius/waila/addons/thermalexpansion/HUDHandlerTank.java create mode 100644 src/main/java/mcp/mobius/waila/addons/thermalexpansion/TankFluidHandler.java rename src/main/java/mcp/mobius/waila/addons/{thermaldynamics/HUDHandlerDuct.java => thermalexpansion/TankModeHandler.java} (53%) create mode 100644 src/main/java/mcp/mobius/waila/utils/LoadedMods.java create mode 100644 src/main/java/mcp/mobius/waila/utils/NumberFormatter.java diff --git a/src/main/java/mcp/mobius/waila/addons/buildcraft/BCModule.java b/src/main/java/mcp/mobius/waila/addons/buildcraft/BCModule.java index 21797a7..abc9c6c 100644 --- a/src/main/java/mcp/mobius/waila/addons/buildcraft/BCModule.java +++ b/src/main/java/mcp/mobius/waila/addons/buildcraft/BCModule.java @@ -8,6 +8,7 @@ import org.apache.logging.log4j.Level; import mcp.mobius.waila.Waila; import mcp.mobius.waila.api.impl.ModuleRegistrar; +import mcp.mobius.waila.utils.LoadedMods; public class BCModule { @@ -15,21 +16,26 @@ public class BCModule { public static Method TileTank_getTankInfo = null; public static void register() { + if (LoadedMods.WAILA_PLUGINS) { + return; + } + try { TileTank = Class.forName("buildcraft.factory.TileTank"); TileTank_getTankInfo = TileTank.getMethod("getTankInfo", ForgeDirection.class); - ModuleRegistrar.instance().addConfig("Buildcraft", "bc.tankamount"); - ModuleRegistrar.instance().addConfig("Buildcraft", "bc.tanktype"); - ModuleRegistrar.instance().registerHeadProvider(new HUDHandlerBCTanks(), TileTank); - ModuleRegistrar.instance().registerBodyProvider(new HUDHandlerBCTanks(), TileTank); - + Waila.log.log(Level.INFO, "Buildcraft mod found."); } catch (ClassNotFoundException | NoSuchMethodException e) { Waila.log.log(Level.INFO, "[BC] Buildcraft mod not found."); return; } - Waila.log.log(Level.INFO, "Buildcraft mod found."); + ModuleRegistrar.instance().addConfig("Buildcraft", "bc.tanktype"); + ModuleRegistrar.instance().addConfig("Buildcraft", "bc.tankamount"); + + TankFluidHandler tankFluidHandler = new TankFluidHandler(); + ModuleRegistrar.instance().registerHeadProvider(tankFluidHandler, TileTank); + ModuleRegistrar.instance().registerBodyProvider(tankFluidHandler, TileTank); } } diff --git a/src/main/java/mcp/mobius/waila/addons/buildcraft/HUDHandlerBCTanks.java b/src/main/java/mcp/mobius/waila/addons/buildcraft/TankFluidHandler.java similarity index 75% rename from src/main/java/mcp/mobius/waila/addons/buildcraft/HUDHandlerBCTanks.java rename to src/main/java/mcp/mobius/waila/addons/buildcraft/TankFluidHandler.java index a3430ba..d6fe815 100644 --- a/src/main/java/mcp/mobius/waila/addons/buildcraft/HUDHandlerBCTanks.java +++ b/src/main/java/mcp/mobius/waila/addons/buildcraft/TankFluidHandler.java @@ -19,8 +19,9 @@ import mcp.mobius.waila.api.IWailaDataAccessor; import mcp.mobius.waila.api.IWailaDataProvider; import mcp.mobius.waila.api.impl.ConfigHandler; import mcp.mobius.waila.cbcore.LangUtil; +import mcp.mobius.waila.utils.NumberFormatter; -public class HUDHandlerBCTanks implements IWailaDataProvider { +public class TankFluidHandler implements IWailaDataProvider { @Override public ItemStack getWailaStack(IWailaDataAccessor accessor, IWailaConfigHandler config) { @@ -30,27 +31,41 @@ public class HUDHandlerBCTanks implements IWailaDataProvider { @Override public List getWailaHead(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) { + + if (!ConfigHandler.instance().getConfig("bc.tanktype")) { + return currenttip; + } + FluidTankInfo tank = this.getTank(accessor); FluidStack stack = tank != null ? tank.fluid : null; - String name = currenttip.get(0); - if (stack != null && ConfigHandler.instance().getConfig("bc.tanktype")) - name = name + " (" + stack.getFluid().getName() + ")"; - else if (stack == null && ConfigHandler.instance().getConfig("bc.tanktype")) - name = name + " " + LangUtil.translateG("hud.msg.empty"); - currenttip.set(0, name); + String fluidName = stack == null ? LangUtil.translateG("hud.msg.empty") + : stack.getFluid().getLocalizedName(stack); + + currenttip.set(0, name + " < " + fluidName + " >"); + return currenttip; } @Override public List getWailaBody(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) { + + if (!ConfigHandler.instance().getConfig("bc.tankamount")) { + return currenttip; + } + FluidTankInfo tank = this.getTank(accessor); FluidStack stack = tank != null ? tank.fluid : null; int liquidAmount = stack != null ? stack.amount : 0; int capacity = tank != null ? tank.capacity : 0; - if (ConfigHandler.instance().getConfig("bc.tankamount")) currenttip.add(liquidAmount + "/" + capacity + " mB"); + currenttip.add( + String.format( + "%s / %s %s", + NumberFormatter.format(liquidAmount), + NumberFormatter.format(capacity), + ConfigHandler.instance().fluidUnit)); return currenttip; } diff --git a/src/main/java/mcp/mobius/waila/addons/exu/HUDHandlerDrum.java b/src/main/java/mcp/mobius/waila/addons/exu/DrumFluidHandler.java similarity index 78% rename from src/main/java/mcp/mobius/waila/addons/exu/HUDHandlerDrum.java rename to src/main/java/mcp/mobius/waila/addons/exu/DrumFluidHandler.java index b18bfad..ab83e71 100644 --- a/src/main/java/mcp/mobius/waila/addons/exu/HUDHandlerDrum.java +++ b/src/main/java/mcp/mobius/waila/addons/exu/DrumFluidHandler.java @@ -14,8 +14,10 @@ import net.minecraftforge.fluids.IFluidHandler; import mcp.mobius.waila.api.IWailaConfigHandler; import mcp.mobius.waila.api.IWailaDataAccessor; import mcp.mobius.waila.api.IWailaDataProvider; +import mcp.mobius.waila.api.impl.ConfigHandler; +import mcp.mobius.waila.utils.NumberFormatter; -public class HUDHandlerDrum implements IWailaDataProvider { +public class DrumFluidHandler implements IWailaDataProvider { @Override public ItemStack getWailaStack(IWailaDataAccessor accessor, IWailaConfigHandler config) { @@ -34,18 +36,19 @@ public class HUDHandlerDrum implements IWailaDataProvider { if (!config.getConfig("extrautilities.fluidamount")) return currenttip; - int amount = 0; - - NBTTagCompound subtag = accessor.getNBTData().getCompoundTag("tank"); - if (subtag.hasKey("Amount")) amount = accessor.getNBTInteger(subtag, "Amount"); - IFluidHandler handler = (IFluidHandler) accessor.getTileEntity(); if (handler == null) return currenttip; FluidTankInfo[] tanks = handler.getTankInfo(ForgeDirection.UNKNOWN); if (tanks.length != 1) return currenttip; - currenttip.add(String.format("%d / %d mB", amount, tanks[0].capacity)); + int amount = tanks[0].fluid == null ? 0 : tanks[0].fluid.amount; + currenttip.add( + String.format( + "%s / %s %s", + NumberFormatter.format(amount), + NumberFormatter.format(tanks[0].capacity), + ConfigHandler.instance().fluidUnit)); return currenttip; } @@ -59,7 +62,6 @@ public class HUDHandlerDrum implements IWailaDataProvider { @Override public NBTTagCompound getNBTData(EntityPlayerMP player, TileEntity te, NBTTagCompound tag, World world, int x, int y, int z) { - if (te != null) te.writeToNBT(tag); return tag; } diff --git a/src/main/java/mcp/mobius/waila/addons/exu/ExtraUtilitiesModule.java b/src/main/java/mcp/mobius/waila/addons/exu/ExtraUtilitiesModule.java index 26d7aae..05b500a 100644 --- a/src/main/java/mcp/mobius/waila/addons/exu/ExtraUtilitiesModule.java +++ b/src/main/java/mcp/mobius/waila/addons/exu/ExtraUtilitiesModule.java @@ -4,30 +4,26 @@ import org.apache.logging.log4j.Level; import mcp.mobius.waila.Waila; import mcp.mobius.waila.api.impl.ModuleRegistrar; +import mcp.mobius.waila.utils.LoadedMods; public class ExtraUtilitiesModule { public static Class TileEntityDrum = null; public static void register() { + if (LoadedMods.WAILA_PLUGINS) { + return; + } try { - Class.forName("com.rwtema.extrautils.ExtraUtils"); + TileEntityDrum = Class.forName("com.rwtema.extrautils.tileentity.TileEntityDrum"); Waila.log.log(Level.INFO, "ExtraUtilities mod found."); } catch (ClassNotFoundException e) { Waila.log.log(Level.INFO, "[ExtraUtilities] ExtraUtilities mod not found."); return; } - try { - TileEntityDrum = Class.forName("com.rwtema.extrautils.tileentity.TileEntityDrum"); - } catch (ClassNotFoundException e) { - Waila.log.log(Level.WARN, "[ExtraUtilities] Class not found. " + e); - return; - } - ModuleRegistrar.instance().addConfigRemote("ExtraUtilities", "extrautilities.fluidamount"); - ModuleRegistrar.instance().registerBodyProvider(new HUDHandlerDrum(), TileEntityDrum); - ModuleRegistrar.instance().registerNBTProvider(new HUDHandlerDrum(), TileEntityDrum); + ModuleRegistrar.instance().registerBodyProvider(new DrumFluidHandler(), TileEntityDrum); } } diff --git a/src/main/java/mcp/mobius/waila/addons/openblocks/OpenBlocksModule.java b/src/main/java/mcp/mobius/waila/addons/openblocks/OpenBlocksModule.java index 3213e36..0ebf282 100644 --- a/src/main/java/mcp/mobius/waila/addons/openblocks/OpenBlocksModule.java +++ b/src/main/java/mcp/mobius/waila/addons/openblocks/OpenBlocksModule.java @@ -4,30 +4,29 @@ import org.apache.logging.log4j.Level; import mcp.mobius.waila.Waila; import mcp.mobius.waila.api.impl.ModuleRegistrar; +import mcp.mobius.waila.utils.LoadedMods; public class OpenBlocksModule { public static Class TileEntityTank = null; public static void register() { + if (LoadedMods.WAILA_PLUGINS) { + return; + } + try { - Class.forName("openblocks.OpenBlocks"); + TileEntityTank = Class.forName("openblocks.common.tileentity.TileEntityTank"); Waila.log.log(Level.INFO, "OpenBlocks mod found."); } catch (ClassNotFoundException e) { Waila.log.log(Level.INFO, "[OpenBlocks] OpenBlocks mod not found."); return; } - try { - TileEntityTank = Class.forName("openblocks.common.tileentity.TileEntityTank"); - } catch (ClassNotFoundException e) { - Waila.log.log(Level.WARN, "[OpenBlocks] Class not found. " + e); - return; - } - ModuleRegistrar.instance().addConfigRemote("OpenBlocks", "openblocks.fluidamount"); - ModuleRegistrar.instance().registerBodyProvider(new HUDHandlerTank(), TileEntityTank); - ModuleRegistrar.instance().registerHeadProvider(new HUDHandlerTank(), TileEntityTank); - ModuleRegistrar.instance().registerNBTProvider(new HUDHandlerTank(), TileEntityTank); + + TankFluidHandler tankFluidHandler = new TankFluidHandler(); + ModuleRegistrar.instance().registerBodyProvider(tankFluidHandler, TileEntityTank); + ModuleRegistrar.instance().registerHeadProvider(tankFluidHandler, TileEntityTank); } } diff --git a/src/main/java/mcp/mobius/waila/addons/openblocks/HUDHandlerTank.java b/src/main/java/mcp/mobius/waila/addons/openblocks/TankFluidHandler.java similarity index 76% rename from src/main/java/mcp/mobius/waila/addons/openblocks/HUDHandlerTank.java rename to src/main/java/mcp/mobius/waila/addons/openblocks/TankFluidHandler.java index 8d39d0b..005e950 100644 --- a/src/main/java/mcp/mobius/waila/addons/openblocks/HUDHandlerTank.java +++ b/src/main/java/mcp/mobius/waila/addons/openblocks/TankFluidHandler.java @@ -15,9 +15,11 @@ import net.minecraftforge.fluids.IFluidHandler; import mcp.mobius.waila.api.IWailaConfigHandler; import mcp.mobius.waila.api.IWailaDataAccessor; import mcp.mobius.waila.api.IWailaDataProvider; +import mcp.mobius.waila.api.impl.ConfigHandler; import mcp.mobius.waila.cbcore.LangUtil; +import mcp.mobius.waila.utils.NumberFormatter; -public class HUDHandlerTank implements IWailaDataProvider { +public class TankFluidHandler implements IWailaDataProvider { @Override public ItemStack getWailaStack(IWailaDataAccessor accessor, IWailaConfigHandler config) { @@ -37,14 +39,10 @@ public class HUDHandlerTank implements IWailaDataProvider { FluidStack fluid = tanks[0].fluid; String name = currenttip.get(0); + String fluidName = fluid == null ? LangUtil.translateG("hud.msg.empty") + : fluid.getFluid().getLocalizedName(fluid); - try { - name += String.format(" < %s >", fluid.getFluid().getLocalizedName(fluid)); - } catch (NullPointerException f) { - name += " " + LangUtil.translateG("hud.msg.empty"); - } - - currenttip.set(0, name); + currenttip.set(0, name + " < " + fluidName + " >"); return currenttip; } @@ -60,9 +58,13 @@ public class HUDHandlerTank implements IWailaDataProvider { FluidTankInfo[] tanks = handler.getTankInfo(ForgeDirection.UNKNOWN); if (tanks.length != 1) return currenttip; - if (tanks[0].fluid != null) - currenttip.add(String.format("%d / %d mB", tanks[0].fluid.amount, tanks[0].capacity)); - else currenttip.add(String.format("0 / %d mB", tanks[0].capacity)); + int amount = tanks[0].fluid == null ? 0 : tanks[0].fluid.amount; + currenttip.add( + String.format( + "%s / %s %s", + NumberFormatter.format(amount), + NumberFormatter.format(tanks[0].capacity), + ConfigHandler.instance().fluidUnit)); return currenttip; } @@ -76,7 +78,6 @@ public class HUDHandlerTank implements IWailaDataProvider { @Override public NBTTagCompound getNBTData(EntityPlayerMP player, TileEntity te, NBTTagCompound tag, World world, int x, int y, int z) { - if (te != null) te.writeToNBT(tag); return tag; } diff --git a/src/main/java/mcp/mobius/waila/addons/railcraft/HUDHandlerTank.java b/src/main/java/mcp/mobius/waila/addons/railcraft/HUDHandlerTank.java deleted file mode 100644 index 9b7fb4b..0000000 --- a/src/main/java/mcp/mobius/waila/addons/railcraft/HUDHandlerTank.java +++ /dev/null @@ -1,88 +0,0 @@ -package mcp.mobius.waila.addons.railcraft; - -import java.util.List; - -import net.minecraft.entity.player.EntityPlayerMP; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.world.World; -import net.minecraftforge.fluids.FluidStack; -import net.minecraftforge.fluids.IFluidTank; - -import mcp.mobius.waila.api.IWailaConfigHandler; -import mcp.mobius.waila.api.IWailaDataAccessor; -import mcp.mobius.waila.api.IWailaDataProvider; -import mcp.mobius.waila.cbcore.LangUtil; -import mcp.mobius.waila.utils.WailaExceptionHandler; - -public class HUDHandlerTank implements IWailaDataProvider { - - @Override - public ItemStack getWailaStack(IWailaDataAccessor accessor, IWailaConfigHandler config) { - return null; - } - - @Override - public List getWailaHead(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, - IWailaConfigHandler config) { - if (!config.getConfig("railcraft.fluidamount")) return currenttip; - try { - IFluidTank tank = (IFluidTank) RailcraftModule.ITankTile_getTank - .invoke(RailcraftModule.ITankTile.cast(accessor.getTileEntity())); - if (tank == null) return currenttip; - - FluidStack fluid = tank.getFluid(); - - String name = currenttip.get(0); - - try { - name += String.format(" < %s >", fluid.getFluid().getLocalizedName(fluid)); - } catch (NullPointerException f) { - name += " " + LangUtil.translateG("hud.msg.empty"); - } - - currenttip.set(0, name); - - } catch (Exception e) { - currenttip = WailaExceptionHandler.handleErr(e, accessor.getTileEntity().getClass().getName(), currenttip); - } - - return currenttip; - } - - @Override - public List getWailaBody(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, - IWailaConfigHandler config) { - if (!config.getConfig("railcraft.fluidamount")) return currenttip; - - try { - IFluidTank tank = (IFluidTank) RailcraftModule.ITankTile_getTank - .invoke(RailcraftModule.ITankTile.cast(accessor.getTileEntity())); - if (tank == null) return currenttip; - - FluidStack fluid = tank.getFluid(); - if (fluid != null) currenttip.add(String.format("%d / %d mB", fluid.amount, tank.getInfo().capacity)); - else currenttip.add(String.format("0 / %d mB", tank.getInfo().capacity)); - - } catch (Exception e) { - currenttip = WailaExceptionHandler.handleErr(e, accessor.getTileEntity().getClass().getName(), currenttip); - } - - return currenttip; - } - - @Override - public List getWailaTail(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, - IWailaConfigHandler config) { - return currenttip; - } - - @Override - public NBTTagCompound getNBTData(EntityPlayerMP player, TileEntity te, NBTTagCompound tag, World world, int x, - int y, int z) { - if (te != null) te.writeToNBT(tag); - return tag; - } - -} diff --git a/src/main/java/mcp/mobius/waila/addons/railcraft/RailcraftModule.java b/src/main/java/mcp/mobius/waila/addons/railcraft/RailcraftModule.java index 363cf8b..a173766 100644 --- a/src/main/java/mcp/mobius/waila/addons/railcraft/RailcraftModule.java +++ b/src/main/java/mcp/mobius/waila/addons/railcraft/RailcraftModule.java @@ -1,43 +1,59 @@ package mcp.mobius.waila.addons.railcraft; +import java.lang.reflect.Field; import java.lang.reflect.Method; import org.apache.logging.log4j.Level; import mcp.mobius.waila.Waila; import mcp.mobius.waila.api.impl.ModuleRegistrar; +import mcp.mobius.waila.utils.LoadedMods; public class RailcraftModule { public static Class TileTankBase = null; - public static Class ITankTile = null; - public static Method ITankTile_getTank = null; + public static Method TileTankBase_getTank = null; + + public static Class StandardTank = null; + public static Field StandardTank_capacity = null; + public static Field StandardTank_renderData = null; + + public static Field StandardTank_renderDataFluid = null; + public static Field StandardTank_renderDataAmount = null; public static void register() { - try { - Class.forName("mods.railcraft.common.core.Railcraft"); - Waila.log.log(Level.INFO, "Railcraft mod found."); - } catch (ClassNotFoundException e) { - Waila.log.log(Level.INFO, "[Railcraft] Railcraft mod not found."); + if (LoadedMods.WAILA_PLUGINS) { return; } try { TileTankBase = Class.forName("mods.railcraft.common.blocks.machine.beta.TileTankBase"); - ITankTile = Class.forName("mods.railcraft.common.blocks.machine.ITankTile"); - ITankTile_getTank = ITankTile.getMethod("getTank"); + TileTankBase_getTank = TileTankBase.getMethod("getTank"); + StandardTank = Class.forName("mods.railcraft.common.fluids.tanks.StandardTank"); + StandardTank_capacity = StandardTank.getSuperclass().getDeclaredField("capacity"); + StandardTank_capacity.setAccessible(true); + StandardTank_renderData = StandardTank.getField("renderData"); + + StandardTank_renderDataFluid = StandardTank_renderData.getType().getField("fluid"); + StandardTank_renderDataAmount = StandardTank_renderData.getType().getField("amount"); + + Waila.log.log(Level.INFO, "Railcraft mod found."); } catch (ClassNotFoundException e) { Waila.log.log(Level.WARN, "[Railcraft] Class not found. " + e); return; } catch (NoSuchMethodException e) { Waila.log.log(Level.WARN, "[Railcraft] Method not found." + e); return; + } catch (NoSuchFieldException e) { + Waila.log.log(Level.WARN, "[Railcraft] Field not found." + e); + return; } ModuleRegistrar.instance().addConfigRemote("Railcraft", "railcraft.fluidamount"); - ModuleRegistrar.instance().registerBodyProvider(new HUDHandlerTank(), TileTankBase); - ModuleRegistrar.instance().registerHeadProvider(new HUDHandlerTank(), TileTankBase); - ModuleRegistrar.instance().registerNBTProvider(new HUDHandlerTank(), TileTankBase); + + TankFluidHandler tankFluidHandler = new TankFluidHandler(); + ModuleRegistrar.instance().registerHeadProvider(tankFluidHandler, TileTankBase); + ModuleRegistrar.instance().registerBodyProvider(tankFluidHandler, TileTankBase); } } diff --git a/src/main/java/mcp/mobius/waila/addons/railcraft/TankFluidHandler.java b/src/main/java/mcp/mobius/waila/addons/railcraft/TankFluidHandler.java new file mode 100644 index 0000000..7c8b2b2 --- /dev/null +++ b/src/main/java/mcp/mobius/waila/addons/railcraft/TankFluidHandler.java @@ -0,0 +1,102 @@ +package mcp.mobius.waila.addons.railcraft; + +import java.util.List; + +import net.minecraft.entity.player.EntityPlayerMP; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.world.World; +import net.minecraftforge.fluids.Fluid; +import net.minecraftforge.fluids.FluidStack; +import net.minecraftforge.fluids.FluidTank; +import net.minecraftforge.fluids.IFluidTank; + +import mcp.mobius.waila.api.IWailaConfigHandler; +import mcp.mobius.waila.api.IWailaDataAccessor; +import mcp.mobius.waila.api.IWailaDataProvider; +import mcp.mobius.waila.api.impl.ConfigHandler; +import mcp.mobius.waila.cbcore.LangUtil; +import mcp.mobius.waila.utils.NumberFormatter; +import mcp.mobius.waila.utils.WailaExceptionHandler; + +public class TankFluidHandler implements IWailaDataProvider { + + @Override + public ItemStack getWailaStack(IWailaDataAccessor accessor, IWailaConfigHandler config) { + return null; + } + + @Override + public List getWailaHead(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, + IWailaConfigHandler config) { + if (!config.getConfig("railcraft.fluidamount")) return currenttip; + + IFluidTank tank = this.getTank(accessor.getTileEntity()); + if (tank == null) return currenttip; + + FluidStack fluid = tank.getFluid(); + String name = currenttip.get(0); + String fluidName = fluid == null ? LangUtil.translateG("hud.msg.empty") + : fluid.getFluid().getLocalizedName(fluid); + + currenttip.set(0, name + " < " + fluidName + " >"); + + return currenttip; + } + + @Override + public List getWailaBody(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, + IWailaConfigHandler config) { + if (!config.getConfig("railcraft.fluidamount")) return currenttip; + + IFluidTank tank = this.getTank(accessor.getTileEntity()); + if (tank == null) return currenttip; + + FluidStack fluid = tank.getFluid(); + int amount = fluid == null ? 0 : fluid.amount; + + currenttip.add( + String.format( + "%s / %s %s", + NumberFormatter.format(amount), + NumberFormatter.format(tank.getCapacity()), + ConfigHandler.instance().fluidUnit)); + + return currenttip; + } + + @Override + public List getWailaTail(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, + IWailaConfigHandler config) { + return currenttip; + } + + @Override + public NBTTagCompound getNBTData(EntityPlayerMP player, TileEntity te, NBTTagCompound tag, World world, int x, + int y, int z) { + return tag; + } + + private FluidTank getTank(TileEntity tileEntity) { + if (tileEntity == null) { + return null; + } + + try { + Object tank = RailcraftModule.TileTankBase_getTank.invoke(tileEntity); + + int capacity = RailcraftModule.StandardTank_capacity.getInt(tank); + Object renderData = RailcraftModule.StandardTank_renderData.get(tank); + + Fluid fluid = (Fluid) RailcraftModule.StandardTank_renderDataFluid.get(renderData); + int amount = RailcraftModule.StandardTank_renderDataAmount.getInt(renderData); + + return new FluidTank(fluid, amount, capacity); + } catch (Exception e) { + WailaExceptionHandler.handleErr(e, tileEntity.getClass().getName(), null); + return null; + } + } + +} diff --git a/src/main/java/mcp/mobius/waila/addons/thermaldynamics/FluiductFluidHandler.java b/src/main/java/mcp/mobius/waila/addons/thermaldynamics/FluiductFluidHandler.java new file mode 100644 index 0000000..431ff19 --- /dev/null +++ b/src/main/java/mcp/mobius/waila/addons/thermaldynamics/FluiductFluidHandler.java @@ -0,0 +1,112 @@ +package mcp.mobius.waila.addons.thermaldynamics; + +import java.util.List; + +import net.minecraft.entity.player.EntityPlayerMP; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.world.World; +import net.minecraftforge.common.util.ForgeDirection; +import net.minecraftforge.fluids.FluidStack; +import net.minecraftforge.fluids.FluidTankInfo; +import net.minecraftforge.fluids.IFluidHandler; + +import mcp.mobius.waila.api.IWailaConfigHandler; +import mcp.mobius.waila.api.IWailaDataAccessor; +import mcp.mobius.waila.api.IWailaDataProvider; +import mcp.mobius.waila.api.impl.ConfigHandler; +import mcp.mobius.waila.cbcore.LangUtil; +import mcp.mobius.waila.utils.NumberFormatter; + +/** + * Created by Lordmau5 on 28.02.2015. + */ +public class FluiductFluidHandler implements IWailaDataProvider { + + @Override + public ItemStack getWailaStack(IWailaDataAccessor accessor, IWailaConfigHandler config) { + return null; + } + + @Override + public List getWailaHead(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, + IWailaConfigHandler config) { + + if (!config.getConfig("thermaldynamics.fluiductsFluid")) { + return currenttip; + } + + NBTTagCompound tag = accessor.getNBTData(); + FluidStack fluid = FluidStack.loadFluidStackFromNBT(tag.getCompoundTag("fluid")); + int capacity = tag.getInteger("capacity"); + + if (capacity == 0) { + return currenttip; + } + + String name = currenttip.get(0); + String fluidName = fluid == null ? LangUtil.translateG("hud.msg.empty") + : fluid.getFluid().getLocalizedName(fluid); + + currenttip.set(0, name + " < " + fluidName + " >"); + + return currenttip; + } + + @Override + public List getWailaBody(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, + IWailaConfigHandler config) { + + if (!config.getConfig("thermaldynamics.fluiductsAmount")) { + return currenttip; + } + + NBTTagCompound tag = accessor.getNBTData(); + FluidStack fluid = FluidStack.loadFluidStackFromNBT(tag.getCompoundTag("fluid")); + int amount = fluid == null ? 0 : fluid.amount; + int capacity = tag.getInteger("capacity"); + + if (capacity == 0) { + return currenttip; + } + + currenttip.add( + String.format( + "%s / %s %s", + NumberFormatter.format(amount), + NumberFormatter.format(capacity), + ConfigHandler.instance().fluidUnit)); + + return currenttip; + } + + @Override + public List getWailaTail(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, + IWailaConfigHandler config) { + return currenttip; + } + + @Override + public NBTTagCompound getNBTData(EntityPlayerMP player, TileEntity te, NBTTagCompound tag, World world, int x, + int y, int z) { + if (te instanceof IFluidHandler fluidHandler) { + FluidTankInfo[] infos = fluidHandler.getTankInfo(ForgeDirection.UNKNOWN); + if (infos.length != 1) { + return tag; + } + + FluidTankInfo info = infos[0]; + + if (info.fluid != null) { + NBTTagCompound fluidNBT = info.fluid.writeToNBT(new NBTTagCompound()); + tag.setTag("fluid", fluidNBT); + } + + tag.setInteger("capacity", info.capacity); + } + + return tag; + } + +} diff --git a/src/main/java/mcp/mobius/waila/addons/thermaldynamics/ThermalDynamicsModule.java b/src/main/java/mcp/mobius/waila/addons/thermaldynamics/ThermalDynamicsModule.java index 335ad1e..fb5c4eb 100644 --- a/src/main/java/mcp/mobius/waila/addons/thermaldynamics/ThermalDynamicsModule.java +++ b/src/main/java/mcp/mobius/waila/addons/thermaldynamics/ThermalDynamicsModule.java @@ -4,31 +4,35 @@ import org.apache.logging.log4j.Level; import mcp.mobius.waila.Waila; import mcp.mobius.waila.api.impl.ModuleRegistrar; +import mcp.mobius.waila.utils.LoadedMods; public class ThermalDynamicsModule { public static Class TileFluidDuct = null; public static void register() { - // XXX : We register the Fluiduct - try { - TileFluidDuct = Class.forName("cofh.thermaldynamics.ducts.fluid.TileFluidDuct"); - - ModuleRegistrar.instance().addConfigRemote("Thermal Dynamics", "thermaldynamics.fluidDuctsFluid"); - ModuleRegistrar.instance().addConfigRemote("Thermal Dynamics", "thermaldynamics.fluidDuctsAmount"); - ModuleRegistrar.instance().registerHeadProvider(new HUDHandlerDuct(), TileFluidDuct); - ModuleRegistrar.instance().registerBodyProvider(new HUDHandlerDuct(), TileFluidDuct); - ModuleRegistrar.instance().registerNBTProvider(new HUDHandlerDuct(), TileFluidDuct); - - } catch (Exception e) { - if (e instanceof ClassNotFoundException) { - Waila.log.log(Level.INFO, "[Thermal Dynamics] Thermal Dynamics mod not found."); - } else { - Waila.log.log(Level.WARN, "[Thermal Dynamics] Error while loading FluidDuct hooks. {}", e); - } + if (LoadedMods.WAILA_PLUGINS) { return; } - Waila.log.log(Level.INFO, "Thermal Dynamics mod found."); + + try { + TileFluidDuct = Class.forName("cofh.thermaldynamics.duct.fluid.TileFluidDuct"); + Waila.log.log(Level.INFO, "Thermal Dynamics mod found."); + } catch (ClassNotFoundException e) { + Waila.log.log(Level.INFO, "[Thermal Dynamics] Thermal Dynamics mod not found."); + return; + } catch (Exception e) { + Waila.log.log(Level.WARN, "[Thermal Dynamics] Error while loading FluidDuct hooks. {}", e); + return; + } + + ModuleRegistrar.instance().addConfigRemote("Thermal Dynamics", "thermaldynamics.fluidDuctsFluid"); + ModuleRegistrar.instance().addConfigRemote("Thermal Dynamics", "thermaldynamics.fluidDuctsAmount"); + + FluiductFluidHandler fluiductFluidHandler = new FluiductFluidHandler(); + ModuleRegistrar.instance().registerHeadProvider(fluiductFluidHandler, TileFluidDuct); + ModuleRegistrar.instance().registerBodyProvider(fluiductFluidHandler, TileFluidDuct); + ModuleRegistrar.instance().registerNBTProvider(fluiductFluidHandler, TileFluidDuct); } } diff --git a/src/main/java/mcp/mobius/waila/addons/thermalexpansion/HUDHandlerCache.java b/src/main/java/mcp/mobius/waila/addons/thermalexpansion/HUDHandlerCache.java index 2ce28ed..5525922 100644 --- a/src/main/java/mcp/mobius/waila/addons/thermalexpansion/HUDHandlerCache.java +++ b/src/main/java/mcp/mobius/waila/addons/thermalexpansion/HUDHandlerCache.java @@ -40,14 +40,17 @@ public class HUDHandlerCache implements IWailaDataProvider { if (storedItem != null) { String namex = GameData.getItemRegistry().getNameForObject(storedItem.getItem()); name += String.format( - " < " + SpecialChars.getRenderString( + " < %s %s >", + SpecialChars.getRenderString( "waila.stack", "1", namex, "0", - String.valueOf(storedItem.getItemDamage())) + color + " %s >", + String.valueOf(storedItem.getItemDamage())) + color, storedItem.getDisplayName()); - } else name += " " + LangUtil.translateG("hud.msg.empty"); + } else { + name += " < " + LangUtil.translateG("hud.msg.empty") + " >"; + } currenttip.set(0, name); } catch (Exception e) { diff --git a/src/main/java/mcp/mobius/waila/addons/thermalexpansion/HUDHandlerTank.java b/src/main/java/mcp/mobius/waila/addons/thermalexpansion/HUDHandlerTank.java deleted file mode 100644 index 82920d3..0000000 --- a/src/main/java/mcp/mobius/waila/addons/thermalexpansion/HUDHandlerTank.java +++ /dev/null @@ -1,104 +0,0 @@ -package mcp.mobius.waila.addons.thermalexpansion; - -import java.util.List; - -import net.minecraft.entity.player.EntityPlayerMP; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.world.World; -import net.minecraftforge.fluids.FluidStack; - -import mcp.mobius.waila.api.IWailaConfigHandler; -import mcp.mobius.waila.api.IWailaDataAccessor; -import mcp.mobius.waila.api.IWailaDataProvider; -import mcp.mobius.waila.cbcore.LangUtil; -import mcp.mobius.waila.utils.WailaExceptionHandler; - -public class HUDHandlerTank implements IWailaDataProvider { - - @Override - public ItemStack getWailaStack(IWailaDataAccessor accessor, IWailaConfigHandler config) { - return null; - } - - @Override - public List getWailaHead(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, - IWailaConfigHandler config) { - if (!config.getConfig("thermalexpansion.fluidtype")) return currenttip; - - try { - FluidStack fluid = (FluidStack) ThermalExpansionModule.TileTank_getTankFluid - .invoke(accessor.getTileEntity()); - String name = currenttip.get(0); - - try { - name += String.format(" < %s >", fluid.getFluid().getLocalizedName(fluid)); - } catch (NullPointerException f) { - name += " " + LangUtil.translateG("hud.msg.empty"); - } - - currenttip.set(0, name); - - } catch (Exception e) { - currenttip = WailaExceptionHandler.handleErr(e, accessor.getTileEntity().getClass().getName(), currenttip); - } - return currenttip; - } - - @Override - public List getWailaBody(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, - IWailaConfigHandler config) { - try { - if (config.getConfig("thermalexpansion.fluidamount")) { - int amount = 0; - if (accessor.getNBTData().hasKey("Amount")) - amount = accessor.getNBTInteger(accessor.getNBTData(), "Amount"); - - Integer capacity = (Integer) ThermalExpansionModule.TileTank_getTankCapacity - .invoke(accessor.getTileEntity()); - - currenttip.add(String.format("%d / %d mB", amount, capacity)); - } - - if (config.getConfig("thermalexpansion.tankmode")) { - Byte mode = (Byte) ThermalExpansionModule.TileTank_mode.get(accessor.getTileEntity()); - if (mode == 0) currenttip.add( - String.format( - "%s : \u00a7a%s", - LangUtil.translateG("hud.msg.mode"), - LangUtil.translateG("hud.msg.input"))); - else if (mode == 1) currenttip.add( - String.format( - "%s : \u00a7c%s", - LangUtil.translateG("hud.msg.mode"), - LangUtil.translateG("hud.msg.output"))); - else currenttip.add(String.format("Mode : Unknown (%d)", mode)); - } - - } catch (Exception e) { - currenttip = WailaExceptionHandler.handleErr(e, accessor.getTileEntity().getClass().getName(), currenttip); - } - - return currenttip; - } - - @Override - public List getWailaTail(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, - IWailaConfigHandler config) { - return currenttip; - } - - @Override - public NBTTagCompound getNBTData(EntityPlayerMP player, TileEntity te, NBTTagCompound tag, World world, int x, - int y, int z) { - try { - int amount = (Integer) ThermalExpansionModule.TileTank_getTankAmount.invoke(te); - tag.setInteger("Amount", amount); - } catch (Exception e) { - throw new RuntimeException(e); - } - return tag; - } - -} diff --git a/src/main/java/mcp/mobius/waila/addons/thermalexpansion/TankFluidHandler.java b/src/main/java/mcp/mobius/waila/addons/thermalexpansion/TankFluidHandler.java new file mode 100644 index 0000000..d816ece --- /dev/null +++ b/src/main/java/mcp/mobius/waila/addons/thermalexpansion/TankFluidHandler.java @@ -0,0 +1,94 @@ +package mcp.mobius.waila.addons.thermalexpansion; + +import java.util.List; + +import net.minecraft.entity.player.EntityPlayerMP; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.world.World; +import net.minecraftforge.fluids.FluidStack; + +import mcp.mobius.waila.api.IWailaConfigHandler; +import mcp.mobius.waila.api.IWailaDataAccessor; +import mcp.mobius.waila.api.IWailaDataProvider; +import mcp.mobius.waila.api.impl.ConfigHandler; +import mcp.mobius.waila.cbcore.LangUtil; +import mcp.mobius.waila.utils.NumberFormatter; +import mcp.mobius.waila.utils.WailaExceptionHandler; + +public class TankFluidHandler implements IWailaDataProvider { + + @Override + public ItemStack getWailaStack(IWailaDataAccessor accessor, IWailaConfigHandler config) { + return null; + } + + @Override + public List getWailaHead(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, + IWailaConfigHandler config) { + + if (!config.getConfig("thermalexpansion.fluidtype")) { + return currenttip; + } + + TileEntity tileEntity = accessor.getTileEntity(); + if (tileEntity == null) return currenttip; + + try { + FluidStack fluid = (FluidStack) ThermalExpansionModule.TileTank_getTankFluid.invoke(tileEntity); + String name = currenttip.get(0); + String fluidName = fluid == null ? LangUtil.translateG("hud.msg.empty") + : fluid.getFluid().getLocalizedName(fluid); + + currenttip.set(0, name + " < " + fluidName + " >"); + + } catch (Exception e) { + WailaExceptionHandler.handleErr(e, tileEntity.getClass().getName(), currenttip); + } + + return currenttip; + } + + @Override + public List getWailaBody(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, + IWailaConfigHandler config) { + + if (!config.getConfig("thermalexpansion.fluidamount")) { + return currenttip; + } + + TileEntity tileEntity = accessor.getTileEntity(); + if (tileEntity == null) return currenttip; + + try { + int amount = (Integer) ThermalExpansionModule.TileTank_getTankAmount.invoke(tileEntity); + int capacity = (Integer) ThermalExpansionModule.TileTank_getTankCapacity.invoke(tileEntity); + + currenttip.add( + String.format( + "%s / %s %s", + NumberFormatter.format(amount), + NumberFormatter.format(capacity), + ConfigHandler.instance().fluidUnit)); + + } catch (Exception e) { + WailaExceptionHandler.handleErr(e, tileEntity.getClass().getName(), currenttip); + } + + return currenttip; + } + + @Override + public List getWailaTail(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, + IWailaConfigHandler config) { + return currenttip; + } + + @Override + public NBTTagCompound getNBTData(EntityPlayerMP player, TileEntity te, NBTTagCompound tag, World world, int x, + int y, int z) { + return tag; + } + +} diff --git a/src/main/java/mcp/mobius/waila/addons/thermaldynamics/HUDHandlerDuct.java b/src/main/java/mcp/mobius/waila/addons/thermalexpansion/TankModeHandler.java similarity index 53% rename from src/main/java/mcp/mobius/waila/addons/thermaldynamics/HUDHandlerDuct.java rename to src/main/java/mcp/mobius/waila/addons/thermalexpansion/TankModeHandler.java index 8979870..60002a0 100644 --- a/src/main/java/mcp/mobius/waila/addons/thermaldynamics/HUDHandlerDuct.java +++ b/src/main/java/mcp/mobius/waila/addons/thermalexpansion/TankModeHandler.java @@ -1,4 +1,4 @@ -package mcp.mobius.waila.addons.thermaldynamics; +package mcp.mobius.waila.addons.thermalexpansion; import java.util.List; @@ -7,17 +7,15 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; -import net.minecraftforge.fluids.FluidStack; import mcp.mobius.waila.api.IWailaConfigHandler; import mcp.mobius.waila.api.IWailaDataAccessor; import mcp.mobius.waila.api.IWailaDataProvider; +import mcp.mobius.waila.api.SpecialChars; import mcp.mobius.waila.cbcore.LangUtil; +import mcp.mobius.waila.utils.WailaExceptionHandler; -/** - * Created by Lordmau5 on 28.02.2015. - */ -public class HUDHandlerDuct implements IWailaDataProvider { +public class TankModeHandler implements IWailaDataProvider { @Override public ItemStack getWailaStack(IWailaDataAccessor accessor, IWailaConfigHandler config) { @@ -27,33 +25,33 @@ public class HUDHandlerDuct implements IWailaDataProvider { @Override public List getWailaHead(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) { - if (!config.getConfig("thermaldynamics.fluiductsFluid")) return currenttip; - - FluidStack fluid = FluidStack.loadFluidStackFromNBT(accessor.getNBTData()); - - String name = ""; - - try { - name += String.format(" < %s >", fluid.getFluid().getLocalizedName(fluid)); - } catch (NullPointerException f) { - name += " " + LangUtil.translateG("hud.msg.empty"); - } - - currenttip.add(name); return currenttip; } @Override public List getWailaBody(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) { - if (!config.getConfig("thermaldynamics.fluiductsAmount")) return currenttip; + try { + if (config.getConfig("thermalexpansion.tankmode")) { + Byte mode = (Byte) ThermalExpansionModule.TileTank_mode.get(accessor.getTileEntity()); + if (mode == 0) { + currenttip.add( + String.format( + "%s : %s", + LangUtil.translateG("hud.msg.mode"), + SpecialChars.GREEN + LangUtil.translateG("hud.msg.input"))); + } else if (mode == 1) { + currenttip.add( + String.format( + "%s : %s", + LangUtil.translateG("hud.msg.mode"), + SpecialChars.RED + LangUtil.translateG("hud.msg.output"))); + } + } - int amount = 0; - - NBTTagCompound tag = accessor.getNBTData(); - if (tag.hasKey("Amount")) amount = accessor.getNBTInteger(tag, "Amount"); - - currenttip.add(String.format(" %d / 1000 mB", amount)); + } catch (Exception e) { + WailaExceptionHandler.handleErr(e, accessor.getTileEntity().getClass().getName(), currenttip); + } return currenttip; } @@ -67,7 +65,6 @@ public class HUDHandlerDuct implements IWailaDataProvider { @Override public NBTTagCompound getNBTData(EntityPlayerMP player, TileEntity te, NBTTagCompound tag, World world, int x, int y, int z) { - if (te != null) te.writeToNBT(tag); return tag; } diff --git a/src/main/java/mcp/mobius/waila/addons/thermalexpansion/ThermalExpansionModule.java b/src/main/java/mcp/mobius/waila/addons/thermalexpansion/ThermalExpansionModule.java index 585a48e..1d64562 100644 --- a/src/main/java/mcp/mobius/waila/addons/thermalexpansion/ThermalExpansionModule.java +++ b/src/main/java/mcp/mobius/waila/addons/thermalexpansion/ThermalExpansionModule.java @@ -9,6 +9,7 @@ import org.apache.logging.log4j.Level; import mcp.mobius.waila.Waila; import mcp.mobius.waila.api.impl.ModuleRegistrar; +import mcp.mobius.waila.utils.LoadedMods; public class ThermalExpansionModule { @@ -74,13 +75,11 @@ public class ThermalExpansionModule { ModuleRegistrar.instance().registerBodyProvider(new HUDHandlerIEnergyHandler(), IEnergyInfo); ModuleRegistrar.instance().registerNBTProvider(new HUDHandlerIEnergyHandler(), IEnergyInfo); + } catch (ClassNotFoundException e) { + Waila.log.log(Level.INFO, "[Thermal Expansion] Thermal Expansion mod not found."); + printedThermalExpansionNotFound = true; } catch (Exception e) { - if (e instanceof ClassNotFoundException) { - Waila.log.log(Level.INFO, "[Thermal Expansion] Thermal Expansion mod not found."); - printedThermalExpansionNotFound = true; - } else { - Waila.log.log(Level.WARN, "[Thermal Expansion] Error while loading Energy hooks. {}", e); - } + Waila.log.log(Level.WARN, "[Thermal Expansion] Error while loading Energy hooks. {}", e); } // XXX : We register the energy cell @@ -93,41 +92,43 @@ public class ThermalExpansionModule { ModuleRegistrar.instance().registerBodyProvider(new HUDHandlerEnergyCell(), TileEnergyCell); ModuleRegistrar.instance().registerNBTProvider(new HUDHandlerEnergyCell(), TileEnergyCell); - } catch (Exception e) { - if (e instanceof ClassNotFoundException || e instanceof NoSuchFieldException) { - if (!printedThermalExpansionNotFound) { - printedThermalExpansionNotFound = true; - Waila.log.log(Level.INFO, "[Thermal Expansion] Thermal Expansion mod not found."); - } - } else { - Waila.log.log(Level.WARN, "[Thermal Expansion] Error while loading Energy Cell hooks. {}", e); + } catch (ClassNotFoundException e) { + if (!printedThermalExpansionNotFound) { + printedThermalExpansionNotFound = true; + Waila.log.log(Level.INFO, "[Thermal Expansion] Thermal Expansion mod not found."); } + } catch (Exception e) { + Waila.log.log(Level.WARN, "[Thermal Expansion] Error while loading Energy Cell hooks. {}", e); } // XXX : We register the Tank interface try { TileTank = Class.forName("cofh.thermalexpansion.block.tank.TileTank"); - TileTank_getTankFluid = TileTank.getMethod("getTankFluid"); - TileTank_getTankCapacity = TileTank.getMethod("getTankCapacity"); - TileTank_getTankAmount = TileTank.getMethod("getTankFluidAmount"); TileTank_mode = TileTank.getField("mode"); - ModuleRegistrar.instance().addConfigRemote("Thermal Expansion", "thermalexpansion.fluidtype"); - ModuleRegistrar.instance().addConfigRemote("Thermal Expansion", "thermalexpansion.fluidamount"); - ModuleRegistrar.instance().addConfig("Thermal Expansion", "thermalexpansion.tankmode"); - ModuleRegistrar.instance().registerHeadProvider(new HUDHandlerTank(), TileTank); - ModuleRegistrar.instance().registerBodyProvider(new HUDHandlerTank(), TileTank); - ModuleRegistrar.instance().registerNBTProvider(new HUDHandlerTank(), TileTank); + if (!LoadedMods.WAILA_PLUGINS) { + TileTank_getTankFluid = TileTank.getMethod("getTankFluid"); + TileTank_getTankCapacity = TileTank.getMethod("getTankCapacity"); + TileTank_getTankAmount = TileTank.getMethod("getTankFluidAmount"); - } catch (Exception e) { - if (e instanceof ClassNotFoundException || e instanceof NoSuchFieldException) { - if (!printedThermalExpansionNotFound) { - printedThermalExpansionNotFound = true; - Waila.log.log(Level.INFO, "[Thermal Expansion] Thermal Expansion mod not found."); - } - } else { - Waila.log.log(Level.WARN, "[Thermal Expansion] Error while loading Tank hooks. {}", e); + ModuleRegistrar.instance().addConfigRemote("Thermal Expansion", "thermalexpansion.fluidtype"); + ModuleRegistrar.instance().addConfigRemote("Thermal Expansion", "thermalexpansion.fluidamount"); + + TankFluidHandler tankFluidHandler = new TankFluidHandler(); + ModuleRegistrar.instance().registerHeadProvider(tankFluidHandler, TileTank); + ModuleRegistrar.instance().registerBodyProvider(tankFluidHandler, TileTank); } + + ModuleRegistrar.instance().addConfig("Thermal Expansion", "thermalexpansion.tankmode"); + ModuleRegistrar.instance().registerBodyProvider(new TankModeHandler(), TileTank); + + } catch (ClassNotFoundException e) { + if (!printedThermalExpansionNotFound) { + printedThermalExpansionNotFound = true; + Waila.log.log(Level.INFO, "[Thermal Expansion] Thermal Expansion mod not found."); + } + } catch (Exception e) { + Waila.log.log(Level.WARN, "[Thermal Expansion] Error while loading Tank hooks. {}", e); } // XXX : We register the Tesseract interface @@ -142,15 +143,13 @@ public class ThermalExpansionModule { ModuleRegistrar.instance().registerBodyProvider(new HUDHandlerTesseract(), TileTesseract); ModuleRegistrar.instance().registerNBTProvider(new HUDHandlerTesseract(), TileTesseract); - } catch (Exception e) { - if (e instanceof ClassNotFoundException || e instanceof NoSuchFieldException) { - if (!printedThermalExpansionNotFound) { - printedThermalExpansionNotFound = true; - Waila.log.log(Level.INFO, "[Thermal Expansion] Thermal Expansion mod not found."); - } - } else { - Waila.log.log(Level.WARN, "[Thermal Expansion] Error while loading Tesseract hooks. {}", e); + } catch (ClassNotFoundException e) { + if (!printedThermalExpansionNotFound) { + printedThermalExpansionNotFound = true; + Waila.log.log(Level.INFO, "[Thermal Expansion] Thermal Expansion mod not found."); } + } catch (Exception e) { + Waila.log.log(Level.WARN, "[Thermal Expansion] Error while loading Tesseract hooks. {}", e); } // XXX : We register the ISecureTile interface @@ -163,15 +162,13 @@ public class ThermalExpansionModule { ModuleRegistrar.instance().registerBodyProvider(new HUDHandlerISecureTile(), ISecureTile); ModuleRegistrar.instance().registerNBTProvider(new HUDHandlerISecureTile(), ISecureTile); - } catch (Exception e) { - if (e instanceof ClassNotFoundException) { - if (!printedThermalExpansionNotFound) { - printedThermalExpansionNotFound = true; - Waila.log.log(Level.INFO, "[Thermal Expansion] Thermal Expansion mod not found."); - } - } else { - Waila.log.log(Level.WARN, "[Thermal Expansion] Error while loading ISecureTile hooks. {}", e); + } catch (ClassNotFoundException e) { + if (!printedThermalExpansionNotFound) { + printedThermalExpansionNotFound = true; + Waila.log.log(Level.INFO, "[Thermal Expansion] Thermal Expansion mod not found."); } + } catch (Exception e) { + Waila.log.log(Level.WARN, "[Thermal Expansion] Error while loading ISecureTile hooks. {}", e); } // XXX : We register the Cache interface @@ -186,16 +183,15 @@ public class ThermalExpansionModule { ModuleRegistrar.instance().registerBodyProvider(new HUDHandlerCache(), TileCache); ModuleRegistrar.instance().registerNBTProvider(new HUDHandlerCache(), TileCache); - } catch (Exception e) { - if (e instanceof ClassNotFoundException) { - if (!printedThermalExpansionNotFound) { - printedThermalExpansionNotFound = true; - Waila.log.log(Level.INFO, "[Thermal Expansion] Thermal Expansion mod not found."); - } - } else { - Waila.log.log(Level.WARN, "[Thermal Expansion] Error while loading Tesseract hooks. {}", e); + } catch (ClassNotFoundException e) { + if (!printedThermalExpansionNotFound) { + printedThermalExpansionNotFound = true; + Waila.log.log(Level.INFO, "[Thermal Expansion] Thermal Expansion mod not found."); } + } catch (Exception e) { + Waila.log.log(Level.WARN, "[Thermal Expansion] Error while loading Tesseract hooks. {}", e); } + if (!printedThermalExpansionNotFound) { Waila.log.log(Level.INFO, "Thermal Expansion mod found."); } diff --git a/src/main/java/mcp/mobius/waila/client/KeyEvent.java b/src/main/java/mcp/mobius/waila/client/KeyEvent.java index 43e1a87..eb03e9d 100644 --- a/src/main/java/mcp/mobius/waila/client/KeyEvent.java +++ b/src/main/java/mcp/mobius/waila/client/KeyEvent.java @@ -7,7 +7,6 @@ import net.minecraftforge.common.config.Configuration; import org.lwjgl.input.Keyboard; import cpw.mods.fml.client.registry.ClientRegistry; -import cpw.mods.fml.common.Loader; import cpw.mods.fml.common.eventhandler.SubscribeEvent; import cpw.mods.fml.common.gameevent.InputEvent.KeyInputEvent; import cpw.mods.fml.common.gameevent.TickEvent; @@ -15,6 +14,7 @@ import mcp.mobius.waila.api.impl.ConfigHandler; import mcp.mobius.waila.gui.screens.config.ScreenConfig; import mcp.mobius.waila.handlers.nei.NEIHandler; import mcp.mobius.waila.utils.Constants; +import mcp.mobius.waila.utils.LoadedMods; public class KeyEvent { @@ -63,14 +63,10 @@ public class KeyEvent { boolean status = ConfigHandler.instance() .getConfig(Configuration.CATEGORY_GENERAL, Constants.CFG_WAILA_LIQUID, true); ConfigHandler.instance().setConfig(Configuration.CATEGORY_GENERAL, Constants.CFG_WAILA_LIQUID, !status); - } else if (key_recipe.isPressed()) { - if (Loader.isModLoaded("NotEnoughItems")) { - NEIHandler.openRecipeGUI(true); - } - } else if (key_usage.isPressed()) { - if (Loader.isModLoaded("NotEnoughItems")) { - NEIHandler.openRecipeGUI(false); - } + } else if (LoadedMods.NEI && key_recipe.isPressed()) { + NEIHandler.openRecipeGUI(true); + } else if (LoadedMods.NEI && key_usage.isPressed()) { + NEIHandler.openRecipeGUI(false); } } diff --git a/src/main/java/mcp/mobius/waila/client/ProxyClient.java b/src/main/java/mcp/mobius/waila/client/ProxyClient.java index 9aee88b..a5ec155 100644 --- a/src/main/java/mcp/mobius/waila/client/ProxyClient.java +++ b/src/main/java/mcp/mobius/waila/client/ProxyClient.java @@ -1,12 +1,15 @@ package mcp.mobius.waila.client; import net.minecraft.block.Block; +import net.minecraft.client.Minecraft; +import net.minecraft.client.resources.IReloadableResourceManager; +import net.minecraft.client.resources.IResourceManager; +import net.minecraft.client.resources.IResourceManagerReloadListener; import net.minecraft.entity.Entity; import net.minecraft.util.ResourceLocation; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.world.WorldEvent; -import cpw.mods.fml.common.Loader; import cpw.mods.fml.common.eventhandler.SubscribeEvent; import mcp.mobius.waila.api.impl.DataAccessorCommon; import mcp.mobius.waila.api.impl.ModuleRegistrar; @@ -23,6 +26,8 @@ import mcp.mobius.waila.overlay.tooltiprenderers.TTRenderHealth; import mcp.mobius.waila.overlay.tooltiprenderers.TTRenderProgressBar; import mcp.mobius.waila.overlay.tooltiprenderers.TTRenderStack; import mcp.mobius.waila.server.ProxyServer; +import mcp.mobius.waila.utils.LoadedMods; +import mcp.mobius.waila.utils.NumberFormatter; public class ProxyClient extends ProxyServer { @@ -35,7 +40,7 @@ public class ProxyClient extends ProxyServer { LangUtil.loadLangDir("waila"); - if (Loader.isModLoaded("NotEnoughItems")) { + if (LoadedMods.NEI) { NEIHandler.register(); } else { MinecraftForge.EVENT_BUS.register(new VanillaTooltipHandler()); @@ -60,6 +65,9 @@ public class ProxyClient extends ProxyServer { ModuleRegistrar.instance().registerTooltipRenderer("waila.tcaspect", new TTRenderAspectString()); MinecraftForge.EVENT_BUS.register(new WorldUnloadEventHandler()); + + ((IReloadableResourceManager) Minecraft.getMinecraft().getResourceManager()) + .registerReloadListener(new NumberFormatterReloadListener()); } @Override @@ -78,4 +86,12 @@ public class ProxyClient extends ProxyServer { } } } + + private static class NumberFormatterReloadListener implements IResourceManagerReloadListener { + + @Override + public void onResourceManagerReload(IResourceManager resourceManager) { + NumberFormatter.onResourcesReload(); + } + } } diff --git a/src/main/java/mcp/mobius/waila/overlay/tooltiprenderers/TTRenderFluidBar.java b/src/main/java/mcp/mobius/waila/overlay/tooltiprenderers/TTRenderFluidBar.java index f184053..67af348 100644 --- a/src/main/java/mcp/mobius/waila/overlay/tooltiprenderers/TTRenderFluidBar.java +++ b/src/main/java/mcp/mobius/waila/overlay/tooltiprenderers/TTRenderFluidBar.java @@ -2,7 +2,6 @@ package mcp.mobius.waila.overlay.tooltiprenderers; import java.awt.Dimension; import java.util.function.Consumer; -import java.util.function.Function; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.Gui; @@ -15,9 +14,7 @@ import net.minecraftforge.fluids.FluidStack; import org.lwjgl.opengl.GL11; -import cpw.mods.fml.common.Loader; import gregtech.api.util.GTUtil; -import gregtech.api.util.GTUtility; import gregtech.common.fluid.GTFluid; import gtPlusPlus.api.objects.minecraft.FluidGT6; import gtPlusPlus.core.util.minecraft.FluidUtils; @@ -25,17 +22,18 @@ import mcp.mobius.waila.api.IWailaCommonAccessor; import mcp.mobius.waila.api.IWailaVariableWidthTooltipRenderer; import mcp.mobius.waila.api.impl.ConfigHandler; import mcp.mobius.waila.overlay.DisplayUtil; +import mcp.mobius.waila.utils.LoadedMods; +import mcp.mobius.waila.utils.NumberFormatter; public class TTRenderFluidBar implements IWailaVariableWidthTooltipRenderer { int maxStringW; private final Consumer bindColor; - private final Function formatNumber; private static final int height = 12; public TTRenderFluidBar() { - if (Loader.isModLoaded("gregtech_nh")) { + if (LoadedMods.GT5U) { bindColor = (fluidName) -> { FluidStack aCheck = FluidUtils.getWildcardFluidStack(fluidName, 1000); if (aCheck != null && (aCheck.getFluid() instanceof FluidGT6 || aCheck.getFluid() instanceof GTFluid)) { @@ -45,11 +43,8 @@ public class TTRenderFluidBar implements IWailaVariableWidthTooltipRenderer { GL11.glColor4f(1F, 1F, 1F, 1F); } }; - - formatNumber = GTUtility::formatNumbers; } else { bindColor = (fluidName) -> GL11.glColor4f(1F, 1F, 1F, 1F); - formatNumber = (number) -> String.format("%,d", number); } } @@ -115,8 +110,8 @@ public class TTRenderFluidBar implements IWailaVariableWidthTooltipRenderer { drawThickBeveledBox(0, 0, maxStringW, height, 1, 0xFF505050, 0xFF505050, -1); DisplayUtil.drawString( - formatNumber.apply((int) amount) + " / " - + formatNumber.apply((int) capacity) + NumberFormatter.format((int) amount) + " / " + + NumberFormatter.format((int) capacity) + " " + ConfigHandler.instance().fluidUnit + " " diff --git a/src/main/java/mcp/mobius/waila/server/ProxyServer.java b/src/main/java/mcp/mobius/waila/server/ProxyServer.java index 769768a..da362bd 100644 --- a/src/main/java/mcp/mobius/waila/server/ProxyServer.java +++ b/src/main/java/mcp/mobius/waila/server/ProxyServer.java @@ -2,7 +2,6 @@ package mcp.mobius.waila.server; import java.lang.reflect.Method; -import cpw.mods.fml.common.Loader; import mcp.mobius.waila.Waila; import mcp.mobius.waila.addons.agriculture.AgricultureModule; import mcp.mobius.waila.addons.buildcraft.BCModule; @@ -30,6 +29,7 @@ import mcp.mobius.waila.api.IWailaRegistrar; import mcp.mobius.waila.api.impl.ModuleRegistrar; import mcp.mobius.waila.handlers.DecoratorFMP; import mcp.mobius.waila.handlers.HUDHandlerFMP; +import mcp.mobius.waila.utils.LoadedMods; public class ProxyServer { @@ -102,7 +102,7 @@ public class ProxyServer { /* Agriculture */ AgricultureModule.register(); - if (Loader.isModLoaded("ForgeMultipart")) { + if (LoadedMods.FORGE_MULTIPART) { HUDHandlerFMP.register(); DecoratorFMP.register(); } diff --git a/src/main/java/mcp/mobius/waila/utils/LoadedMods.java b/src/main/java/mcp/mobius/waila/utils/LoadedMods.java new file mode 100644 index 0000000..9d02e2f --- /dev/null +++ b/src/main/java/mcp/mobius/waila/utils/LoadedMods.java @@ -0,0 +1,11 @@ +package mcp.mobius.waila.utils; + +import cpw.mods.fml.common.Loader; + +public class LoadedMods { + + public static boolean FORGE_MULTIPART = Loader.isModLoaded("ForgeMultipart"); + public static boolean NEI = Loader.isModLoaded("NotEnoughItems"); + public static boolean GT5U = Loader.isModLoaded("gregtech_nh"); + public static boolean WAILA_PLUGINS = Loader.isModLoaded("wailaplugins"); +} diff --git a/src/main/java/mcp/mobius/waila/utils/NumberFormatter.java b/src/main/java/mcp/mobius/waila/utils/NumberFormatter.java new file mode 100644 index 0000000..094ab49 --- /dev/null +++ b/src/main/java/mcp/mobius/waila/utils/NumberFormatter.java @@ -0,0 +1,34 @@ +package mcp.mobius.waila.utils; + +import java.text.NumberFormat; +import java.util.Locale; + +import net.minecraft.client.Minecraft; + +import gregtech.api.util.GTUtility; + +public class NumberFormatter { + + private static NumberFormat numberFormat = NumberFormat.getInstance(getCurrentLocale()); + + public static String format(long number) { + if (LoadedMods.GT5U) { + return GTUtility.formatNumbers(number); + } + + return numberFormat.format(number); + } + + public static Locale getCurrentLocale() { + String langCode = Minecraft.getMinecraft().getLanguageManager().getCurrentLanguage().getLanguageCode(); + String[] parts = langCode.split("_", 2); + String language = parts[0]; + String country = parts.length == 1 ? "" : parts[1]; + + return new Locale(language, country); + } + + public static void onResourcesReload() { + numberFormat = NumberFormat.getInstance(getCurrentLocale()); + } +} diff --git a/src/main/resources/assets/waila/lang/cs_CZ.lang b/src/main/resources/assets/waila/lang/cs_CZ.lang index cd99b25..e0df651 100644 --- a/src/main/resources/assets/waila/lang/cs_CZ.lang +++ b/src/main/resources/assets/waila/lang/cs_CZ.lang @@ -41,8 +41,7 @@ client.msg.nousage=Nenalezeno žádné využití. hud.msg.holdkeymoreinfo=Držte %s pro více informací -hud.msg.none= -hud.msg.empty= +hud.msg.empty=Prázdný hud.msg.output=Výstup hud.msg.input=Vstup hud.msg.out=Ven diff --git a/src/main/resources/assets/waila/lang/de_DE.lang b/src/main/resources/assets/waila/lang/de_DE.lang index 5f81b2d..23726f8 100644 --- a/src/main/resources/assets/waila/lang/de_DE.lang +++ b/src/main/resources/assets/waila/lang/de_DE.lang @@ -41,8 +41,7 @@ client.msg.nousage=Keine Nutzung gefunden. hud.msg.holdkeymoreinfo=Halte %s für mehr Infos -hud.msg.none= -hud.msg.empty= +hud.msg.empty=Leer hud.msg.output=Output hud.msg.input=Input hud.msg.out=Out diff --git a/src/main/resources/assets/waila/lang/en_US.lang b/src/main/resources/assets/waila/lang/en_US.lang index 1a6867e..8bf9a33 100644 --- a/src/main/resources/assets/waila/lang/en_US.lang +++ b/src/main/resources/assets/waila/lang/en_US.lang @@ -42,8 +42,7 @@ client.msg.nousage=No usage found. hud.msg.holdkeymoreinfo=Hold %s for more info -hud.msg.none= -hud.msg.empty= +hud.msg.empty=Empty hud.msg.output=Output hud.msg.input=Input hud.msg.out=Out diff --git a/src/main/resources/assets/waila/lang/et_EE b/src/main/resources/assets/waila/lang/et_EE index db52211..eff09c2 100644 --- a/src/main/resources/assets/waila/lang/et_EE +++ b/src/main/resources/assets/waila/lang/et_EE @@ -38,8 +38,7 @@ waila.keybind.testing=[Waila] Testimine client.msg.norecipe=Ühtegi retsepti ei leitud. client.msg.nousage=Ühtegi kasutust ei leitud. -hud.msg.none= -hud.msg.empty= +hud.msg.empty=Tühi hud.msg.output=Väljund hud.msg.input=Sisend hud.msg.out=Välja diff --git a/src/main/resources/assets/waila/lang/et_EE.lang b/src/main/resources/assets/waila/lang/et_EE.lang index 32b3f5a..919a2af 100644 --- a/src/main/resources/assets/waila/lang/et_EE.lang +++ b/src/main/resources/assets/waila/lang/et_EE.lang @@ -41,8 +41,7 @@ client.msg.nousage=Ühtegi kasutust ei leitud. hud.msg.holdkeymoreinfo=Hoia %s lisainfo saamiseks -hud.msg.none= -hud.msg.empty= +hud.msg.empty=Tühi hud.msg.output=Väljund hud.msg.input=Sisend hud.msg.out=Välja diff --git a/src/main/resources/assets/waila/lang/fr_FR.lang b/src/main/resources/assets/waila/lang/fr_FR.lang index 04ddc06..d4748e7 100644 --- a/src/main/resources/assets/waila/lang/fr_FR.lang +++ b/src/main/resources/assets/waila/lang/fr_FR.lang @@ -39,8 +39,7 @@ client.msg.nousage=Pas d'utilisation trouvée. hud.msg.holdkeymoreinfo=Maintenez %s pour plus d'infos -hud.msg.none= -hud.msg.empty= +hud.msg.empty=Vide hud.msg.output=Sortie hud.msg.input=Entrée hud.msg.out=Sortie diff --git a/src/main/resources/assets/waila/lang/it_IT.lang b/src/main/resources/assets/waila/lang/it_IT.lang index cb95b97..718fa1d 100644 --- a/src/main/resources/assets/waila/lang/it_IT.lang +++ b/src/main/resources/assets/waila/lang/it_IT.lang @@ -41,8 +41,7 @@ client.msg.nousage=Nessun uso trovato. hud.msg.holdkeymoreinfo=Tieni premuto %s per più info -hud.msg.none= -hud.msg.empty= +hud.msg.empty=Vuoto hud.msg.output=Uscita hud.msg.input=Entrata hud.msg.out=Fuori diff --git a/src/main/resources/assets/waila/lang/nl_NL.lang b/src/main/resources/assets/waila/lang/nl_NL.lang index 5012a16..f9fb6e6 100644 --- a/src/main/resources/assets/waila/lang/nl_NL.lang +++ b/src/main/resources/assets/waila/lang/nl_NL.lang @@ -39,8 +39,7 @@ client.msg.nousage=Geen gebruik gevonden. hud.msg.holdkeymoreinfo=Houd %s ingedrukt voor meer info -hud.msg.none= -hud.msg.empty= +hud.msg.empty=Leeg hud.msg.output=Uitvoer hud.msg.input=Invoer hud.msg.out=Uit diff --git a/src/main/resources/assets/waila/lang/ru_RU.lang b/src/main/resources/assets/waila/lang/ru_RU.lang index 1cb72e2..34e8e68 100644 --- a/src/main/resources/assets/waila/lang/ru_RU.lang +++ b/src/main/resources/assets/waila/lang/ru_RU.lang @@ -41,8 +41,7 @@ client.msg.nousage=Применений не найдено. hud.msg.holdkeymoreinfo=Удерживайте %s для подробностей -hud.msg.none=<Ничего> -hud.msg.empty=<Пусто> +hud.msg.empty=Пусто hud.msg.output=Вывод hud.msg.input=Ввод hud.msg.out=Из diff --git a/src/main/resources/assets/waila/lang/zh_CN.lang b/src/main/resources/assets/waila/lang/zh_CN.lang index 7f18b7c..e66b129 100644 --- a/src/main/resources/assets/waila/lang/zh_CN.lang +++ b/src/main/resources/assets/waila/lang/zh_CN.lang @@ -41,8 +41,7 @@ client.msg.nousage=未发现可参与合成. hud.msg.holdkeymoreinfo=按住 %s 查看更多信息 -hud.msg.none=<无> -hud.msg.empty=<空> +hud.msg.empty=空 hud.msg.output=输出 hud.msg.input=输入 hud.msg.out=输出