Compare commits

..
28 Commits
Author SHA1 Message Date
Martin Robertz 3f2ebe44e8 update + sa + fix 2025-11-15 13:34:00 +01:00
Martin Robertz 34176738d5 sa 2025-11-15 13:23:43 +01:00
Martin Robertz a7971e1e3a Merge remote-tracking branch 'MalTeeez/energybars' into dev
# Conflicts:
#	dependencies.gradle
2025-11-15 13:23:18 +01:00
Martin Robertz 62b4f9d8ce Merge remote-tracking branch 'danyadev/WailaPlugins-compat' into dev
# Conflicts:
#	src/main/java/mcp/mobius/waila/addons/railcraft/TankFluidHandler.java
#	src/main/java/mcp/mobius/waila/addons/thermalexpansion/TankFluidHandler.java
#	src/main/java/mcp/mobius/waila/addons/thermalexpansion/TankModeHandler.java
#	src/main/java/mcp/mobius/waila/overlay/tooltiprenderers/TTRenderFluidBar.java
2025-11-15 13:22:57 +01:00
danyadev 940a65e01c review fixes 2025-11-15 15:18:49 +03:00
danyadev e855e9d579 no need for setGroupingUsed as it's true by default 2025-11-15 15:18:49 +03:00
danyadev 64de9d0d76 remove < > symbols from hud.msg.empty 2025-11-15 15:18:49 +03:00
danyadev 259caad7ac fix server 2025-11-15 15:18:49 +03:00
danyadev 1ec4b77057 use NumberFormat 2025-11-15 15:18:49 +03:00
danyadev 2b6634ef1f format numbers with , 2025-11-15 15:18:49 +03:00
danyadev a979059af7 damn spotless 2025-11-15 15:18:49 +03:00
danyadev 0f1dda58ae use fluidUnit from config 2025-11-15 15:18:49 +03:00
danyadev 3c9a443fb0 hide fluid settings when WailaPlugins is present 2025-11-15 15:18:49 +03:00
danyadev d551b63e45 don't show fluid info if WailaPlugins mod is present 2025-11-15 15:18:49 +03:00
danyadev 955bd4cb2c extract loaded mod checks in a LoadedMods class 2025-11-15 15:18:49 +03:00
Martin Robertz 37e6858a2d Merge branch 'master' into energybars 2025-11-15 13:07:49 +01:00
Martin Robertz 464bd14f41 Merge branch 'master' into master 2025-11-15 13:07:41 +01:00
MalTeeez 6ae4a8fb6e Merge branch 'master' into energybars 2025-11-15 01:13:32 +01:00
Mika Hensel 4fb2924e2c Revert language changes to be compatible with #54 2025-11-15 00:06:16 +01:00
Mika Hensel 7d2a9221a7 Format Numbers for non-bar case 2025-11-14 23:50:17 +01:00
Mika Hensel ebdc187f48 Add config option for energy bar 2025-11-14 23:26:27 +01:00
Mika Hensel 147598567e Finish first version of energy bar with subpixel skips, need to add a config setting to optionally use the bars 2025-11-14 03:11:24 +01:00
Mika Hensel 157399c11b Switch to String.format for tooltip strings, remove wrong padding for getsize on empty tanks 2025-11-13 05:54:04 +01:00
Mika Hensel 604c4eb253 Fix italian language change, use correct double for size calculation, switch back background opacity
Use old version of background opacity for filled tanks since we now treat bot of those as separate backgrounds
2025-11-13 05:43:23 +02:00
Mika Hensel 4098a2fcf4 Add another 'Empty' localization entry without the <> and use that instead
(cherry picked from commit f0b35d061b0dd1df6e42f48e322789f3a615318e)
2025-11-13 05:43:23 +02:00
Mika Hensel 15e40a94cd Change box color back, consider empty tanks in getSize() too
(cherry picked from commit cc9861c44bf0cd5e60e646a4522411525fd98ca2)
2025-11-13 05:43:23 +02:00
Mika Hensel ca489363fa Only render fluid when not empty, change colors a little to fit empty bar better 2025-11-13 05:43:23 +02:00
Mika Hensel 05b3488dc1 Accept empty fluid tanks and treat them differently in fluid bars
(cherry picked from commit 7cb54e77707b844aae2f379e1759a59640dd7221)
2025-11-12 22:47:48 +02:00
28 changed files with 232 additions and 186 deletions

No files matched your search

+12 -13
View File
@@ -1,24 +1,23 @@
// Add your dependencies here
dependencies {
implementation('com.github.GTNewHorizons:NotEnoughItems:2.8.55-GTNH:dev')
implementation('com.github.GTNewHorizons:NotEnoughItems:2.8.37-GTNH:dev')
shadowImplementation('au.com.bytecode:opencsv:2.4')
compileOnly("com.github.GTNewHorizons:GT5-Unofficial:5.09.52.226:dev") { transitive = false }
compileOnly("com.github.GTNewHorizons:GT5-Unofficial:5.09.52.111:dev") { transitive = false }
runtimeOnlyNonPublishable("com.github.GTNewHorizons:WAILAPlugins:0.7.2:dev") {
runtimeOnly("com.github.GTNewHorizons:WAILAPlugins:0.7.0:dev") {
exclude group: 'com.github.GTNewHorizons', module: 'waila'
}
runtimeOnlyNonPublishable("com.github.GTNewHorizons:EnderCore:0.5.5:dev")
runtimeOnlyNonPublishable("com.github.GTNewHorizons:BuildCraft:7.1.48:dev")
runtimeOnlyNonPublishable("curse.maven:cofh-lib-220333:2388748")
runtimeOnlyNonPublishable("curse.maven:extrautils-225561:2264383")
runtimeOnlyNonPublishable("com.github.GTNewHorizons:OpenBlocks:1.12.4-GTNH:dev")
runtimeOnlyNonPublishable("com.github.GTNewHorizons:Railcraft:9.17.15:dev")
runtimeOnlyNonPublishable('curse.maven:thermal-foundation-222880:2388753')
runtimeOnlyNonPublishable('curse.maven:thermal-expansion-69163:2388759')
runtimeOnlyNonPublishable('curse.maven:thermal-dynamics-227443:2388756')
runtimeOnly("com.github.GTNewHorizons:EnderCore:0.5.0:dev")
runtimeOnly("com.github.GTNewHorizons:BuildCraft:7.1.45:dev")
runtimeOnly("curse.maven:cofh-lib-220333:2388748")
runtimeOnly("curse.maven:extrautils-225561:2264383")
runtimeOnly("com.github.GTNewHorizons:OpenBlocks:1.12.3-GTNH:dev")
runtimeOnly("com.github.GTNewHorizons:Railcraft:9.17.6:dev")
runtimeOnly('curse.maven:thermal-foundation-222880:2388753')
runtimeOnly('curse.maven:thermal-expansion-69163:2388759')
runtimeOnly('curse.maven:thermal-dynamics-227443:2388756')
implementation('curse.maven:cofh-core-69162:2388751')
api("com.github.GTNewHorizons:GTNHLib:0.9.6:dev")
}
+3 -30
View File
@@ -39,33 +39,9 @@ remoteMappings = https\://raw.githubusercontent.com/MinecraftForge/FML/1.7.10/co
# `./gradlew runClient --username=AnotherPlayer`, or configuring this command in your IDE.
developmentEnvironmentUserName = Developer
# Enables modern Java syntax support. Valid values:
# - false: No modern syntax, Java 8 only
# - jabel: Jabel syntax-only support, compiles to J8 bytecode
# - jvmDowngrader: Full modern Java via JVM Downgrader (syntax + stdlib APIs)
# - modern: Native modern Java bytecode, no downgrading
enableModernJavaSyntax = jabel
# If set, ignores the above setting and compiles with the given toolchain. This may cause unexpected issues,
# and should *not* be used in most situations. -1 disables this.
# forceToolchainVersion = -1
# Target JVM version for JVM Downgrader bytecode downgrading.
# Only used when enableModernJavaSyntax = jvmDowngrader
# downgradeTargetVersion = 8
# Comma-separated list of Java versions for multi-release jar support (JVM Downgrader only).
# Classes will be available in META-INF/versions/N/ for each version N in this list.
# Default: "21,25" (J25+ gets native classes, J21-24 gets partial downgrade, J8-20 gets full downgrade).
# jvmDowngraderMultiReleaseVersions = 21,25
# Specifies how JVM Downgrader API stubs are provided. Options:
# - shade: Shade minimized stubs into the jar
# - gtnhlib: GTNHLib provides stubs at runtime (adds version constraint)
# - external: Another dependency provides stubs (no constraint, no warning)
# - (empty): Warning reminding you to configure stubs
# Note: 'shade' option requires you to verify license compliance, see: https://github.com/unimined/JvmDowngrader/blob/main/LICENSE.md
# jvmDowngraderStubsProvider =
# Enables using modern Java syntax (up to version 17) via Jabel, while still targeting JVM 8.
# See https://github.com/bsideup/jabel for details on how this works.
enableModernJavaSyntax = true
# Enables injecting missing generics into the decompiled source code for a better coding experience.
# Turns most publicly visible List, Map, etc. into proper List<E>, Map<K, V> types.
@@ -233,6 +209,3 @@ curseForgeRelations =
# This is meant to be set in $HOME/.gradle/gradle.properties.
# ideaCheckSpotlessOnBuild = true
# Non-GTNH properties
org.gradle.configuration-cache = true
org.gradle.parallel = true
-12
View File
@@ -1,12 +0,0 @@
#This file is generated by updateDaemonJvm
toolchainUrl.FREE_BSD.AARCH64=https\://api.foojay.io/disco/v3.0/ids/df211d3c3eefdc408b462041881bc575/redirect
toolchainUrl.FREE_BSD.X86_64=https\://api.foojay.io/disco/v3.0/ids/93aeea858331bd6bb00ba94759830234/redirect
toolchainUrl.LINUX.AARCH64=https\://api.foojay.io/disco/v3.0/ids/df211d3c3eefdc408b462041881bc575/redirect
toolchainUrl.LINUX.X86_64=https\://api.foojay.io/disco/v3.0/ids/93aeea858331bd6bb00ba94759830234/redirect
toolchainUrl.MAC_OS.AARCH64=https\://api.foojay.io/disco/v3.0/ids/7799fb2cb9f9eb382df2b8b6fb793b77/redirect
toolchainUrl.MAC_OS.X86_64=https\://api.foojay.io/disco/v3.0/ids/99a42fd36e2e41c7c8ed49f423f49fdf/redirect
toolchainUrl.UNIX.AARCH64=https\://api.foojay.io/disco/v3.0/ids/df211d3c3eefdc408b462041881bc575/redirect
toolchainUrl.UNIX.X86_64=https\://api.foojay.io/disco/v3.0/ids/93aeea858331bd6bb00ba94759830234/redirect
toolchainUrl.WINDOWS.AARCH64=https\://api.foojay.io/disco/v3.0/ids/3087f28f30be41ab6818c16a488f5f8a/redirect
toolchainUrl.WINDOWS.X86_64=https\://api.foojay.io/disco/v3.0/ids/552c7bffe0370c66410a51c55985b511/redirect
toolchainVersion=25
Binary file not shown.
+1 -1
View File
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Vendored
+4 -1
View File
@@ -1,7 +1,7 @@
#!/bin/sh
#
# Copyright © 2015 the original authors.
# Copyright © 2015-2021 the original authors.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -114,6 +114,7 @@ case "$( uname )" in #(
NONSTOP* ) nonstop=true ;;
esac
CLASSPATH="\\\"\\\""
# Determine the Java command to use to start the JVM.
@@ -171,6 +172,7 @@ fi
# For Cygwin or MSYS, switch paths to Windows format before running java
if "$cygwin" || "$msys" ; then
APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
JAVACMD=$( cygpath --unix "$JAVACMD" )
@@ -210,6 +212,7 @@ DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
set -- \
"-Dorg.gradle.appname=$APP_BASE_NAME" \
-classpath "$CLASSPATH" \
-jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
"$@"
Vendored
+2 -1
View File
@@ -70,10 +70,11 @@ goto fail
:execute
@rem Setup the command line
set CLASSPATH=
@rem Execute Gradle
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
:end
@rem End local scope for the variables with windows NT shell
+1 -1
View File
@@ -17,7 +17,7 @@ pluginManagement {
}
plugins {
id 'com.gtnewhorizons.gtnhsettingsconvention' version '2.0.18'
id 'com.gtnewhorizons.gtnhsettingsconvention' version '1.0.48'
}
@@ -1,8 +1,5 @@
package mcp.mobius.waila.addons.buildcraft;
import static com.gtnewhorizon.gtnhlib.util.numberformatting.NumberFormatUtil.formatFluid;
import static com.gtnewhorizon.gtnhlib.util.numberformatting.NumberFormatUtil.formatNumber;
import java.util.List;
import net.minecraft.entity.player.EntityPlayerMP;
@@ -22,6 +19,7 @@ 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 TankFluidHandler implements IWailaDataProvider {
@@ -62,7 +60,12 @@ public class TankFluidHandler implements IWailaDataProvider {
int liquidAmount = stack != null ? stack.amount : 0;
int capacity = tank != null ? tank.capacity : 0;
currenttip.add(String.format("%s / %s", formatNumber(liquidAmount), formatFluid(capacity)));
currenttip.add(
String.format(
"%s / %s %s",
NumberFormatter.format(liquidAmount),
NumberFormatter.format(capacity),
ConfigHandler.instance().fluidUnit));
return currenttip;
}
@@ -1,8 +1,5 @@
package mcp.mobius.waila.addons.exu;
import static com.gtnewhorizon.gtnhlib.util.numberformatting.NumberFormatUtil.formatFluid;
import static com.gtnewhorizon.gtnhlib.util.numberformatting.NumberFormatUtil.formatNumber;
import java.util.List;
import net.minecraft.entity.player.EntityPlayerMP;
@@ -17,6 +14,8 @@ 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 DrumFluidHandler implements IWailaDataProvider {
@@ -44,7 +43,12 @@ public class DrumFluidHandler implements IWailaDataProvider {
if (tanks.length != 1) return currenttip;
int amount = tanks[0].fluid == null ? 0 : tanks[0].fluid.amount;
currenttip.add(String.format("%s / %s", formatNumber(amount), formatFluid(tanks[0].capacity)));
currenttip.add(
String.format(
"%s / %s %s",
NumberFormatter.format(amount),
NumberFormatter.format(tanks[0].capacity),
ConfigHandler.instance().fluidUnit));
return currenttip;
}
@@ -1,8 +1,5 @@
package mcp.mobius.waila.addons.openblocks;
import static com.gtnewhorizon.gtnhlib.util.numberformatting.NumberFormatUtil.formatFluid;
import static com.gtnewhorizon.gtnhlib.util.numberformatting.NumberFormatUtil.formatNumber;
import java.util.List;
import net.minecraft.entity.player.EntityPlayerMP;
@@ -18,7 +15,9 @@ 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 TankFluidHandler implements IWailaDataProvider {
@@ -60,7 +59,12 @@ public class TankFluidHandler implements IWailaDataProvider {
if (tanks.length != 1) return currenttip;
int amount = tanks[0].fluid == null ? 0 : tanks[0].fluid.amount;
currenttip.add(String.format("%s / %s", formatNumber(amount), formatFluid(tanks[0].capacity)));
currenttip.add(
String.format(
"%s / %s %s",
NumberFormatter.format(amount),
NumberFormatter.format(tanks[0].capacity),
ConfigHandler.instance().fluidUnit));
return currenttip;
}
@@ -1,8 +1,5 @@
package mcp.mobius.waila.addons.railcraft;
import static com.gtnewhorizon.gtnhlib.util.numberformatting.NumberFormatUtil.formatFluid;
import static com.gtnewhorizon.gtnhlib.util.numberformatting.NumberFormatUtil.formatNumber;
import java.util.List;
import net.minecraft.entity.player.EntityPlayerMP;
@@ -18,7 +15,9 @@ 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 {
@@ -57,7 +56,12 @@ public class TankFluidHandler implements IWailaDataProvider {
FluidStack fluid = tank.getFluid();
int amount = fluid == null ? 0 : fluid.amount;
currenttip.add(String.format("%s / %s", formatNumber(amount), formatFluid(tank.getCapacity())));
currenttip.add(
String.format(
"%s / %s %s",
NumberFormatter.format(amount),
NumberFormatter.format(tank.getCapacity()),
ConfigHandler.instance().fluidUnit));
return currenttip;
}
@@ -1,6 +1,5 @@
package mcp.mobius.waila.addons.stevescarts;
import static com.gtnewhorizon.gtnhlib.util.numberformatting.NumberFormatUtil.formatNumber;
import static mcp.mobius.waila.api.SpecialChars.ALIGNRIGHT;
import static mcp.mobius.waila.api.SpecialChars.GRAY;
import static mcp.mobius.waila.api.SpecialChars.ITALIC;
@@ -81,8 +80,7 @@ public class HUDCargoManager implements IWailaDataProvider {
String direction = (toCart & (1 << i)) != 0 ? "Load" : "Unload";
String shouldReturn = (doReturn & (1 << i)) != 0 ? "Ret." : "Cont.";
String sAmount = amount == 0 ? "All"
: formatNumber(this.getAmount(amount)) + " " + this.getAmountType(amount);
String sAmount = amount == 0 ? "All" : this.getAmount(amount) + " " + this.getAmountType(amount);
String selection = (String) StevesCartsModule.GetSelectionName
.invoke(StevesCartsModule.CargoItemSelection.cast(itemSelection.get(target)));
@@ -1,6 +1,5 @@
package mcp.mobius.waila.addons.stevescarts;
import static com.gtnewhorizon.gtnhlib.util.numberformatting.NumberFormatUtil.formatFluid;
import static mcp.mobius.waila.api.SpecialChars.ALIGNRIGHT;
import static mcp.mobius.waila.api.SpecialChars.GRAY;
import static mcp.mobius.waila.api.SpecialChars.ITALIC;
@@ -78,14 +77,13 @@ public class HUDLiquidManager implements IWailaDataProvider {
fluidAmount = tag.getCompoundTag("Fluid" + i).getInteger("Amount");
}
String fluidString = fluidAmount == 0 ? "<Empty>"
: String.format("%s of %s", formatFluid(fluidAmount), fluidName);
String fluidString = fluidAmount == 0 ? "<Empty>" : String.format("%s mB of %s", fluidAmount, fluidName);
if (color == 5) continue;
String direction = (toCart & (1 << i)) != 0 ? "Load" : "Unload";
String shouldReturn = (doReturn & (1 << i)) != 0 ? "Ret." : "Cont.";
String sAmount = amount == 0 ? "All" : formatFluid(this.getMaxAmountBuckets(amount));
String sAmount = amount == 0 ? "All" : this.getMaxAmountBuckets(amount) + " mB";
currenttip.add(
String.format(
@@ -1,6 +1,5 @@
package mcp.mobius.waila.addons.stevescarts;
import static com.gtnewhorizon.gtnhlib.util.numberformatting.NumberFormatUtil.formatNumber;
import static mcp.mobius.waila.api.SpecialChars.ALIGNRIGHT;
import static mcp.mobius.waila.api.SpecialChars.GRAY;
import static mcp.mobius.waila.api.SpecialChars.ITALIC;
@@ -48,7 +47,7 @@ public class HUDMinecartModular implements IWailaEntityProvider {
return currenttip;
}
Item ItemCartModule;
Item ItemCartModule = null;
try {
ItemCartModule = (Item) StevesCartsModule.ItemCartModule.get(null);
} catch (Exception e) {
@@ -77,11 +76,12 @@ public class HUDMinecartModular implements IWailaEntityProvider {
currenttip.add(
new ItemStack(ItemCartModule, 1, metas[i]).getDisplayName() + TAB
+ ALIGNRIGHT
+ GRAY
+ " [ "
+ WHITE
+ formatNumber(amount)
+ " of "
+ amount
+ GRAY
+ " mB of "
+ WHITE
+ fluid
+ GRAY
+ " ]");
@@ -1,8 +1,5 @@
package mcp.mobius.waila.addons.thermaldynamics;
import static com.gtnewhorizon.gtnhlib.util.numberformatting.NumberFormatUtil.formatFluid;
import static com.gtnewhorizon.gtnhlib.util.numberformatting.NumberFormatUtil.formatNumber;
import java.util.List;
import net.minecraft.entity.player.EntityPlayerMP;
@@ -18,7 +15,9 @@ 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.
@@ -72,7 +71,12 @@ public class FluiductFluidHandler implements IWailaDataProvider {
return currenttip;
}
currenttip.add(String.format("%s / %s", formatNumber(amount), formatFluid(capacity)));
currenttip.add(
String.format(
"%s / %s %s",
NumberFormatter.format(amount),
NumberFormatter.format(capacity),
ConfigHandler.instance().fluidUnit));
return currenttip;
}
@@ -1,7 +1,5 @@
package mcp.mobius.waila.addons.thermalexpansion;
import static com.gtnewhorizon.gtnhlib.util.numberformatting.NumberFormatUtil.formatNumber;
import java.util.List;
import net.minecraft.entity.player.EntityPlayerMP;
@@ -38,11 +36,11 @@ public class HUDHandlerEnergyCell implements IWailaDataProvider {
currenttip.add(
String.format(
"%s/%s : %s / %s RF/t",
"%s/%s : %d / %d RF/t",
LangUtil.translateG("hud.msg.in"),
LangUtil.translateG("hud.msg.out"),
formatNumber(energyReceive),
formatNumber(energySend)));
energyReceive,
energySend));
return currenttip;
}
@@ -1,7 +1,6 @@
package mcp.mobius.waila.addons.thermalexpansion;
import static com.gtnewhorizon.gtnhlib.util.numberformatting.NumberFormatUtil.formatNumber;
import java.text.NumberFormat;
import java.util.List;
import net.minecraft.entity.player.EntityPlayerMP;
@@ -49,7 +48,11 @@ public class HUDHandlerIEnergyHandler implements IWailaDataProvider {
"RFEnergyStorage");
} else {
taggedTips.add(
String.format("%s / %s RF", formatNumber(energy), formatNumber(maxEnergy)),
// TODO: Use NumberFormatter from #54
String.format(
"%s / %s RF",
NumberFormat.getInstance().format(energy),
NumberFormat.getInstance().format(maxEnergy)),
"RFEnergyStorage");
}
}
@@ -11,7 +11,6 @@ import net.minecraft.world.World;
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;
public class HUDHandlerTesseract implements IWailaDataProvider {
@@ -34,9 +33,9 @@ public class HUDHandlerTesseract implements IWailaDataProvider {
if (config.getConfig("thermalexpansion.tesssendrecv")) {
String send = String.format("%s : ", LangUtil.translateG("hud.msg.send"));
String recv = String.format("%s : ", LangUtil.translateG("hud.msg.recv"));
String item = String.format("%s ", SpecialChars.GREEN + LangUtil.translateG("hud.msg.item"));
String fluid = String.format("%s ", SpecialChars.BLUE + LangUtil.translateG("hud.msg.fluid"));
String energ = String.format("%s ", SpecialChars.RED + LangUtil.translateG("hud.msg.energ"));
String item = String.format("\u00a7a%s ", LangUtil.translateG("hud.msg.item"));
String fluid = String.format("\u00a79%s ", LangUtil.translateG("hud.msg.fluid"));
String energ = String.format("\u00a7c%s ", LangUtil.translateG("hud.msg.energ"));
switch (accessor.getNBTInteger(accessor.getNBTData(), "Item.Mode")) {
case 0:
@@ -1,8 +1,5 @@
package mcp.mobius.waila.addons.thermalexpansion;
import static com.gtnewhorizon.gtnhlib.util.numberformatting.NumberFormatUtil.formatFluid;
import static com.gtnewhorizon.gtnhlib.util.numberformatting.NumberFormatUtil.formatNumber;
import java.util.List;
import net.minecraft.entity.player.EntityPlayerMP;
@@ -15,7 +12,9 @@ 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 {
@@ -66,7 +65,12 @@ public class TankFluidHandler implements IWailaDataProvider {
int amount = (Integer) ThermalExpansionModule.TileTank_getTankAmount.invoke(tileEntity);
int capacity = (Integer) ThermalExpansionModule.TileTank_getTankCapacity.invoke(tileEntity);
currenttip.add(String.format("%s / %s", formatNumber(amount), formatFluid(capacity)));
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);
@@ -34,6 +34,8 @@ public class ConfigHandler implements IWailaConfigHandler {
public HashMap<String, Boolean> forcedConfigs = new HashMap<>();
public Configuration config = null;
public String fluidUnit;
public void addModule(String modName, HashMap<String, String> options) {
this.addModule(modName, new ConfigModule(modName, options));
}
@@ -150,6 +152,7 @@ public class ConfigHandler implements IWailaConfigHandler {
config.get(Configuration.CATEGORY_GENERAL, Constants.CFG_WAILA_KEYBIND, true);
config.get(Configuration.CATEGORY_GENERAL, Constants.CFG_WAILA_NEWFILTERS, true);
config.get(Configuration.CATEGORY_GENERAL, Constants.CFG_WAILA_SHOWICON, true);
fluidUnit = config.get(Configuration.CATEGORY_GENERAL, Constants.CFG_WAILA_FLUIDUNIT, "mB").getString();
OverlayConfig.posX = config.get(Configuration.CATEGORY_GENERAL, Constants.CFG_WAILA_POSX, 5000).getInt();
OverlayConfig.posY = config.get(Configuration.CATEGORY_GENERAL, Constants.CFG_WAILA_POSY, 100).getInt();
@@ -1,6 +1,10 @@
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;
@@ -24,6 +28,7 @@ import mcp.mobius.waila.overlay.tooltiprenderers.TTRenderRFBar;
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 {
@@ -62,6 +67,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
@@ -80,4 +88,12 @@ public class ProxyClient extends ProxyServer {
}
}
}
private static class NumberFormatterReloadListener implements IResourceManagerReloadListener {
@Override
public void onResourceManagerReload(IResourceManager resourceManager) {
NumberFormatter.onResourcesReload();
}
}
}
@@ -15,16 +15,14 @@ public class OverlayRenderer {
private static boolean hasDepthTest;
private static int boundTexIndex;
public static boolean isOverlayVisible() {
final Minecraft mc = Minecraft.getMinecraft();
return (mc.currentScreen == null && mc.theWorld != null
public static void renderOverlay(Tooltip tooltip) {
Minecraft mc = Minecraft.getMinecraft();
if (!(mc.currentScreen == null && mc.theWorld != null
&& Minecraft.isGuiEnabled()
&& !mc.gameSettings.keyBindPlayerList.getIsKeyPressed()
&& ConfigHandler.instance().showTooltip());
}
public static void renderOverlay(Tooltip tooltip) {
if (!isOverlayVisible() || RayTracing.instance().getTarget() == null) return;
&& ConfigHandler.instance().showTooltip()
&& RayTracing.instance().getTarget() != null))
return;
if (RayTracing.instance().getTarget().typeOfHit == MovingObjectPosition.MovingObjectType.BLOCK
&& RayTracing.instance().getTargetStack() != null) {
@@ -35,9 +35,13 @@ public class WailaTickHandler {
@SubscribeEvent
public void tickClient(TickEvent.ClientTickEvent event) {
if (event.phase == TickEvent.Phase.START) return;
if (!OverlayRenderer.isOverlayVisible()) {
Minecraft mc = Minecraft.getMinecraft();
World world = mc.theWorld;
EntityPlayer player = mc.thePlayer;
if (world == null || player == null) {
this.tooltip = null;
RayTracing.instance().clear();
return;
@@ -45,9 +49,6 @@ public class WailaTickHandler {
RayTracing.instance().fire();
MovingObjectPosition target = RayTracing.instance().getTarget();
Minecraft mc = Minecraft.getMinecraft();
EntityPlayer player = mc.thePlayer;
World world = mc.theWorld;
List<String> currenttip;
List<String> currenttipHead;
@@ -1,8 +1,5 @@
package mcp.mobius.waila.overlay.tooltiprenderers;
import static com.gtnewhorizon.gtnhlib.util.numberformatting.NumberFormatUtil.formatFluid;
import static com.gtnewhorizon.gtnhlib.util.numberformatting.NumberFormatUtil.formatNumber;
import java.awt.Dimension;
import java.util.function.Consumer;
@@ -23,9 +20,11 @@ import gtPlusPlus.api.objects.minecraft.FluidGT6;
import gtPlusPlus.core.util.minecraft.FluidUtils;
import mcp.mobius.waila.api.IWailaCommonAccessor;
import mcp.mobius.waila.api.IWailaVariableWidthTooltipRenderer;
import mcp.mobius.waila.api.impl.ConfigHandler;
import mcp.mobius.waila.cbcore.LangUtil;
import mcp.mobius.waila.overlay.DisplayUtil;
import mcp.mobius.waila.utils.LoadedMods;
import mcp.mobius.waila.utils.NumberFormatter;
public class TTRenderFluidBar implements IWailaVariableWidthTooltipRenderer {
@@ -52,15 +51,33 @@ public class TTRenderFluidBar implements IWailaVariableWidthTooltipRenderer {
@Override
public Dimension getSize(String[] params, IWailaCommonAccessor accessor) {
boolean isEmpty = (params[0].equals("EMPTYFLUID") && params[1].equals("EMPTYFLUID"));
int displayWidth = DisplayUtil.getDisplayWidth(
buildDisplayText(
isEmpty ? 0 : Double.parseDouble(params[2]),
Double.parseDouble(params[3]),
params[1],
isEmpty));
String barText;
if (!(params[0].equals("EMPTYFLUID") && params[1].equals("EMPTYFLUID"))) {
int commaCount = (int) (Math.floor((params[2].length() - 1) / 3D)
+ Math.floor((params[3].length() - 1) / 3D));
// ",".repeat(commaCount) doesn't exist in java 8 so do this instead.
StringBuilder sb = new StringBuilder(commaCount);
for (int i = 0; i < commaCount; i++) {
sb.append(",");
}
barText = String
.format("%s / %s %s %s%s", params[2], params[3], ConfigHandler.instance().fluidUnit, params[1], sb);
} else {
int commaCount = (int) (Math.floor((params[3].length() - 1) / 3D));
// ",".repeat(commaCount) doesn't exist in java 8 so do this instead.
StringBuilder sb = new StringBuilder(commaCount);
for (int i = 0; i < commaCount; i++) {
sb.append(",");
}
barText = String.format(
"%s / %s %s%s",
LangUtil.translateG("hud.msg.empty"),
params[3],
ConfigHandler.instance().fluidUnit,
sb);
}
return new Dimension(displayWidth + 4, height);
return new Dimension(DisplayUtil.getDisplayWidth(barText) + 4, height);
}
public static final ResourceLocation gradient = new ResourceLocation("waila", "textures/gradient.png");
@@ -116,17 +133,30 @@ public class TTRenderFluidBar implements IWailaVariableWidthTooltipRenderer {
drawThickBeveledBox(0, 0, maxStringW, height, 1, 0xFF505050, 0xFF505050, -1);
DisplayUtil.drawString(
buildDisplayText(amount, capacity, localizedName, isEmpty),
2,
2,
isEmpty ? 0xFFDDDDDD : 0xFFFFFFFF,
true);
}
public String buildDisplayText(double amount, double capacity, String fluidName, boolean isEmpty) {
return isEmpty ? String.format("%s / %s", LangUtil.translateG("hud.msg.empty"), formatFluid(capacity))
: String.format("%s / %s %s", formatNumber(amount), formatFluid(capacity), fluidName);
if (!isEmpty) {
DisplayUtil.drawString(
String.format(
"%s / %s %s %s",
NumberFormatter.format((int) amount),
NumberFormatter.format((int) capacity),
ConfigHandler.instance().fluidUnit,
localizedName),
2,
2,
0xFFFFFFFF,
true);
} else {
DisplayUtil.drawString(
String.format(
"%s / %s %s",
LangUtil.translateG("hud.msg.empty"),
NumberFormatter.format((int) capacity),
ConfigHandler.instance().fluidUnit),
2,
2,
0xFFDDDDDD,
true);
}
}
public static void drawRectFromIcon(Tessellator tessellator, int x, int y, double z, IIcon icon, int width,
@@ -1,8 +1,8 @@
package mcp.mobius.waila.overlay.tooltiprenderers;
import static com.gtnewhorizon.gtnhlib.util.numberformatting.NumberFormatUtil.formatNumber;
import java.awt.Dimension;
import java.text.NumberFormat;
import java.util.function.Function;
import net.minecraft.client.Minecraft;
import net.minecraft.client.gui.Gui;
@@ -19,14 +19,28 @@ public class TTRenderRFBar implements IWailaVariableWidthTooltipRenderer {
int maxStringW;
private final Function<Integer, String> formatNumber;
private static final NumberFormat energyFormat = NumberFormat.getInstance();
private static final int height = 12;
private static final int width = 2;
static {
energyFormat.setGroupingUsed(true);
}
public TTRenderRFBar() {
formatNumber = energyFormat::format;
}
@Override
public Dimension getSize(String[] params, IWailaCommonAccessor accessor) {
int commaCount = (int) (Math.floor((params[0].length() - 1) / 3D) + Math.floor((params[1].length() - 1) / 3D));
StringBuilder sb = new StringBuilder(commaCount);
for (int i = 0; i < commaCount; i++) {
sb.append(",");
}
return new Dimension(
DisplayUtil.getDisplayWidth(buildDisplayText(Integer.parseInt(params[0]), Integer.parseInt(params[1])))
+ 4,
DisplayUtil.getDisplayWidth(String.format("%s / %s RF%s", params[0], params[1], sb)) + 4,
height);
}
@@ -71,11 +85,13 @@ public class TTRenderRFBar implements IWailaVariableWidthTooltipRenderer {
drawRect(tessellator, 1, 1, 0, maxStringW - 2, height - 2, 0, 0, 1, 1);
tessellator.draw();
DisplayUtil.drawString(buildDisplayText(amount, capacity), 2, 2, 0xFFFFFFFF, true);
}
DisplayUtil.drawString(
String.format("%s / %s RF", formatNumber.apply(amount), formatNumber.apply(capacity)),
2,
2,
0xFFFFFFFF,
true);
public String buildDisplayText(int amount, int capacity) {
return String.format("%s / %s RF", formatNumber(amount), formatNumber(capacity));
}
public static void drawRect(Tessellator tessellator, int x, int y, double z, int width, int height, double minU,
@@ -7,21 +7,15 @@ import net.minecraft.client.renderer.RenderHelper;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import org.lwjgl.opengl.GL11;
import org.lwjgl.opengl.GL12;
import cpw.mods.fml.common.registry.GameData;
import mcp.mobius.waila.api.IWailaCommonAccessor;
import mcp.mobius.waila.api.IWailaTooltipRenderer;
import mcp.mobius.waila.api.SpecialChars;
import mcp.mobius.waila.overlay.DisplayUtil;
public class TTRenderStack implements IWailaTooltipRenderer {
@Override
public Dimension getSize(String[] params, IWailaCommonAccessor accessor) {
boolean small = Boolean.parseBoolean(params.length > 4 ? params[4] : "false");
return small ? new Dimension(10, 8) : new Dimension(16, 16);
return new Dimension(16, 16);
}
@Override
@@ -30,43 +24,14 @@ public class TTRenderStack implements IWailaTooltipRenderer {
String name = params[1]; // Fully qualified name
int amount = Integer.parseInt(params[2]);
int meta = Integer.parseInt(params[3]);
boolean small = Boolean.parseBoolean(params.length > 4 ? params[4] : "false");
final float scale = 0.5f;
ItemStack stack = null;
if (type == 0) stack = new ItemStack((Block) Block.blockRegistry.getObject(name), amount, meta);
if (type == 1) stack = new ItemStack((Item) Item.itemRegistry.getObject(name), amount, meta);
RenderHelper.enableGUIStandardItemLighting();
if (small) {
GL11.glPushMatrix();
GL11.glEnable(GL12.GL_RESCALE_NORMAL);
GL11.glScaled(scale, scale, 1.0f);
DisplayUtil.renderStack(0, 0, stack);
GL11.glDisable(GL12.GL_RESCALE_NORMAL);
GL11.glPopMatrix();
} else {
DisplayUtil.renderStack(0, 0, stack);
}
DisplayUtil.renderStack(0, 0, stack);
RenderHelper.disableStandardItemLighting();
}
public static String create(ItemStack itemStack, int amount, boolean small) {
String name = GameData.getItemRegistry().getNameForObject(itemStack.getItem());
int meta = itemStack.getItemDamage();
return SpecialChars.getRenderString(
"waila.stack",
String.valueOf(1),
name,
String.valueOf(amount),
String.valueOf(meta),
String.valueOf(small));
}
public static String create(ItemStack itemStack, boolean small) {
return create(itemStack, 1, small);
}
}
@@ -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());
}
}