Format number migration

dependencies.gradle

@@ -1,3 +1,4 @@
 dependencies {
 	compileOnly 'curse.maven:cofh-lib-220333:2388748'
+    api("com.github.GTNewHorizons:GTNHLib:0.9.6:dev")
 }

gradle.properties

@@ -14,7 +14,7 @@ modId = BrandonsCore
 modGroup = com.brandon3055.brandonscore
 
 # Whether to use modGroup as the maven publishing group.
-# Due to a history of using JitPack, the default is com.github.GTNewHorizons for all mods.
+# When false, com.github.GTNewHorizons is used.
 useModGroupForPublishing = false
 
 # Updates your build.gradle and settings.gradle automatically whenever an update is available.
@@ -85,13 +85,20 @@ accessTransformersFile =
 # Provides setup for Mixins if enabled. If you don't know what mixins are: Keep it disabled!
 usesMixins = false
 
+# Set to a non-empty string to configure mixins in a separate source set under src/VALUE, instead of src/main.
+# This can speed up compile times thanks to not running the mixin annotation processor on all input sources.
+# Mixin classes will have access to "main" classes, but not the other way around.
+separateMixinSourceSet =
+
 # Adds some debug arguments like verbose output and class export.
 usesMixinDebug = false
 
 # Specify the location of your implementation of IMixinConfigPlugin. Leave it empty otherwise.
 mixinPlugin =
 
-# Specify the package that contains all of your Mixins. You may only place Mixins in this package or the build will fail!
+# Specify the package that contains all of your Mixins. The package must exist or
+# the build will fail. If you have a package property defined in your mixins.<modid>.json,
+# it must match with this or the build will fail.
 mixinsPackage =
 
 # Specify the core mod entry class if you use a core mod. This class must implement IFMLLoadingPlugin!
@@ -117,9 +124,15 @@ minimizeShadowedDependencies = true
 # If disabled, won't rename the shadowed classes.
 relocateShadowedDependencies = true
 
-# Adds the GTNH maven, CurseMaven, Modrinth, and some more well-known 1.7.10 repositories.
+# Adds CurseMaven, Modrinth, and some more well-known 1.7.10 repositories.
 includeWellKnownRepositories = true
 
+# A list of repositories to exclude from the includeWellKnownRepositories setting. Should be a space separated
+# list of strings, with the acceptable keys being(case does not matter):
+# cursemaven
+# modrinth
+excludeWellKnownRepositories =
+
 # Change these to your Maven coordinates if you want to publish to a custom Maven repository instead of the default GTNH Maven.
 # Authenticate with the MAVEN_USER and MAVEN_PASSWORD environment variables.
 # If you need a more complex setup disable maven publishing here and add a publishing repository to addon.gradle.
@@ -140,7 +153,7 @@ modrinthProjectId =
 #       type can be one of [project, version],
 #       and the name is the Modrinth project or version slug/id of the other mod.
 # Example: required-project:fplib;optional-project:gasstation;incompatible-project:gregtech
-# Note: GTNH Mixins is automatically set as a required dependency if usesMixins = true
+# Note: UniMixins is automatically set as a required dependency if usesMixins = true.
 modrinthRelations =
 
 # Publishing to CurseForge requires you to set the CURSEFORGE_TOKEN environment variable to one of your CurseForge API tokens.
@@ -161,6 +174,12 @@ curseForgeRelations =
 # projects. New projects should not use this parameter.
 # customArchiveBaseName =
 
+# Optional parameter to customize the default working directory used by the runClient* tasks. Relative to the project directory.
+# runClientWorkingDirectory = run/client
+
+# Optional parameter to customize the default working directory used by the runServer* tasks. Relative to the project directory.
+# runServerWorkingDirectory = run/server
+
 # Optional parameter to have the build automatically fail if an illegal version is used.
 # This can be useful if you e.g. only want to allow versions in the form of '1.1.xxx'.
 # The check is ONLY performed if the version is a git tag.

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

settings.gradle

@@ -17,7 +17,7 @@ pluginManagement {
 }
 
 plugins {
-    id 'com.gtnewhorizons.gtnhsettingsconvention' version '1.0.23'
+    id 'com.gtnewhorizons.gtnhsettingsconvention' version '1.0.49'
 }
 
 

src/main/java/com/brandon3055/brandonscore/BrandonsCore.java

@@ -16,6 +16,7 @@
 import cpw.mods.fml.relauncher.Side;
 
 @Mod(modid = BrandonsCore.MODID, version = BrandonsCore.VERSION, name = BrandonsCore.MODNAME)
+@SuppressWarnings("unused")
 public class BrandonsCore {
 
     public static final String MODNAME = "Brandon's Core";

src/main/java/com/brandon3055/brandonscore/client/utills/ClientUtills.java

@@ -7,6 +7,7 @@
 /**
  * Created by brandon3055 on 11/11/2015.
  */
+@SuppressWarnings("unused")
 public class ClientUtills {
 
     public static void openLink(String url) {

src/main/java/com/brandon3055/brandonscore/client/utills/GuiHelper.java

@@ -13,6 +13,7 @@
 /**
  * Created by Brandon on 28/06/2014.
  */
+@SuppressWarnings("unused")
 public class GuiHelper {
 
     public static final double PXL128 = 0.0078125;

src/main/java/com/brandon3055/brandonscore/common/CommonProxy.java

@@ -9,6 +9,7 @@
 /**
  * Created by Brandon on 14/5/2015.
  */
+@SuppressWarnings("unused")
 public class CommonProxy {
 
     public boolean isDedicatedServer() {

src/main/java/com/brandon3055/brandonscore/common/handlers/IProcess.java

@@ -5,7 +5,7 @@
  */
 public interface IProcess {
 
-    public void updateProcess();
+    void updateProcess();
 
-    public boolean isDead();
+    boolean isDead();
 }

src/main/java/com/brandon3055/brandonscore/common/handlers/ProcessHandler.java

@@ -28,6 +28,7 @@ public static void init() {
     }
 
     @SubscribeEvent
+    @SuppressWarnings("unused")
     public void onServerTick(TickEvent.ServerTickEvent event) {
         if (event.phase == TickEvent.Phase.START) {
 
@@ -47,11 +48,13 @@ public void onServerTick(TickEvent.ServerTickEvent event) {
     }
 
     @SubscribeEvent
+    @SuppressWarnings("unused")
     public void onWorldClose(WorldEvent.Unload event) {
         processes.clear();
         newProcesses.clear();
     }
 
+    @SuppressWarnings("unused")
     public static void addProcess(IProcess process) {
         newProcesses.add(process);
     }

src/main/java/com/brandon3055/brandonscore/common/utills/DataUtills.java

@@ -13,6 +13,7 @@
 /**
  * Created by Brandon on 31/12/2014.
  */
+@SuppressWarnings("unused")
 public class DataUtills {
 
     public static DataUtills instance = new DataUtills();

src/main/java/com/brandon3055/brandonscore/common/utills/InfoHelper.java

@@ -1,5 +1,7 @@
 package com.brandon3055.brandonscore.common.utills;
 
+import static com.gtnewhorizon.gtnhlib.util.numberformatting.NumberFormatUtil.formatNumberCompact;
+
 import java.util.List;
 
 import net.minecraft.item.ItemStack;
@@ -13,23 +15,21 @@
 /**
  * Created by Brandon on 1/07/2014.
  */
+@SuppressWarnings("unused")
 public class InfoHelper {
 
     @SuppressWarnings("unchecked")
     public static void addEnergyInfo(ItemStack stack, List list) {
         IEnergyContainerItem item = (IEnergyContainerItem) stack.getItem();
         int energy = item.getEnergyStored(stack);
         int maxEnergy = item.getMaxEnergyStored(stack);
-        String eS = "";
-        String eM = "";
-        if (energy < 1000) eS = String.valueOf(energy);
-        else if (energy < 1000000) eS = String.valueOf(energy); // Math.round((float)energy / 10F)/100F)+"k";
-        else eS = String.valueOf(Math.round((float) energy / 1000F) / 1000F) + "m";
-        if (maxEnergy < 1000) eM = String.valueOf(maxEnergy);
-        else if (maxEnergy < 1000000) eM = String.valueOf(Math.round((float) maxEnergy / 100F) / 10F) + "k";
-        else eM = String.valueOf(Math.round((float) maxEnergy / 10000F) / 100F) + "m";
-
-        list.add(StatCollector.translateToLocal("info.de.charge.txt") + ": " + eS + " / " + eM + " RF");
+
+        list.add(
+                StatCollector.translateToLocal("info.de.charge.txt") + ": "
+                        + formatNumberCompact(energy)
+                        + " / "
+                        + formatNumberCompact(maxEnergy)
+                        + " RF");
     }
 
     @SuppressWarnings("unchecked")

src/main/java/com/brandon3055/brandonscore/common/utills/Utills.java

@@ -14,6 +14,7 @@
 /**
  * Created by Brandon on 25/07/2014.
  */
+@SuppressWarnings("unused")
 public class Utills {
 
     public static IEntitySelector selectLivingBase = new IEntitySelector() {
@@ -32,22 +33,6 @@ public boolean isEntityApplicable(Entity entity) {
         }
     };
 
-    public static String formatNumber(double value) {
-        if (value < 1000D) return String.valueOf(value);
-        else if (value < 1000000D) return String.valueOf(Math.round(value) / 1000D) + "K";
-        else if (value < 1000000000D) return String.valueOf(Math.round(value / 1000D) / 1000D) + "M";
-        else if (value < 1000000000000D) return String.valueOf(Math.round(value / 1000000D) / 1000D) + "B";
-        else return String.valueOf(Math.round(value / 1000000000D) / 1000D) + "T";
-    }
-
-    public static String formatNumber(long value) {
-        if (value < 1000L) return String.valueOf(value);
-        else if (value < 1000000L) return String.valueOf(Math.round(value) / 1000D) + "K";
-        else if (value < 1000000000L) return String.valueOf(Math.round(value / 1000L) / 1000D) + "M";
-        else if (value < 1000000000000L) return String.valueOf(Math.round(value / 1000000L) / 1000D) + "B";
-        else return String.valueOf(Math.round(value / 1000000000L) / 1000D) + "T";
-    }
-
     /**
      * Add commas to a number e.g. 161253126 > 161,253,126
      */