Compare commits

...
Author SHA1 Message Date
Connor Colenso da9830ffd1 Spotless 2025-12-20 01:33:30 +00:00
Connor Colenso adcde8bcab Use formatNumber from GTNHLib 2025-12-20 01:31:04 +00:00
Connor Colenso 0214437bc6 Add GTNHLib optional dep (pre) 2025-12-20 01:30:44 +00:00
Connor Colenso aa1e9fc8dc Fix openblocks dep 2025-12-20 01:30:21 +00:00
3 changed files with 7 additions and 5 deletions

No files matched your search

+2 -1
View File
@@ -6,6 +6,7 @@ dependencies {
shadowImplementation('au.com.bytecode:opencsv:2.4')
compileOnly("com.github.GTNewHorizons:GT5-Unofficial:5.09.52.69:dev") { transitive = false }
compileOnly("com.github.GTNewHorizons:GTNHLib:0.8.35-pre-pre:dev") { transitive = false }
runtimeOnlyNonPublishable("com.github.GTNewHorizons:WAILAPlugins:0.7.0:dev") {
exclude group: 'com.github.GTNewHorizons', module: 'waila'
@@ -14,7 +15,7 @@ dependencies {
runtimeOnlyNonPublishable("com.github.GTNewHorizons:BuildCraft:7.1.31:dev")
runtimeOnlyNonPublishable("curse.maven:cofh-lib-220333:2388748")
runtimeOnlyNonPublishable("curse.maven:extrautils-225561:2264383")
runtimeOnlyNonPublishable("com.github.GTNewHorizons:OpenBlocks:1.12.3-GTNH:dev")
runtimeOnlyNonPublishable("com.github.GTNewHorizons:OpenBlocks:1.12.4-GTNH:dev")
runtimeOnlyNonPublishable("com.github.GTNewHorizons:Railcraft:9.17.6:dev")
runtimeOnlyNonPublishable('curse.maven:thermal-foundation-222880:2388753')
runtimeOnlyNonPublishable('curse.maven:thermal-expansion-69163:2388759')
@@ -7,5 +7,6 @@ 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 GTNH_LIB = Loader.isModLoaded("gtnhlib");
public static boolean WAILA_PLUGINS = Loader.isModLoaded("wailaplugins");
}
@@ -1,19 +1,19 @@
package mcp.mobius.waila.utils;
import static com.gtnewhorizon.gtnhlib.util.numberformatting.NumberFormatUtil.formatNumber;
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);
if (LoadedMods.GTNH_LIB) {
return formatNumber(number);
}
return numberFormat.format(number);