upstream/Draconic-Evolution
1
0 Fork 0
mirror of https://github.com/GTNewHorizons/Draconic-Evolution.git synced 2026-10-26 14:24:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

update deps and fix Format Numbers

Browse Source
This commit is contained in:
Martin Robertz committed 2026-02-01 15:02:02 +01:00
1 parent 2d544acf07
commit 65a44b0080
13 files changed
+45 -27
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

dependencies.gradle
+1
View File
@@ -12,6 +12,7 @@ dependencies {
compileOnly('com.github.GTNewHorizons:Baubles-Expanded:2.2.6-GTNH:dev') {transitive = false}
compileOnly("com.github.GTNewHorizons:GT5-Unofficial:5.09.52.246:dev") {transitive = false}
compileOnly("com.github.GTNewHorizons:GTNHLib:0.9.6:dev") {transitive = false}
compileOnly("com.github.GTNewHorizons:Backhand:1.8.2:dev") {transitive = false}
compileOnly("thaumcraft:Thaumcraft:1.7.10-4.2.3.5:dev") {transitive = false}
compileOnly("curse.maven:computercraft-67504:2269339") {transitive = false}
src/main/java/com/brandon3055/draconicevolution/client/handler/HudHandler.java
+3 -2
View File
@@ -1,5 +1,7 @@
package com.brandon3055.draconicevolution.client.handler;
import static com.gtnewhorizon.gtnhlib.util.numberformatting.NumberFormatUtil.formatNumber;
import java.util.ArrayList;
import java.util.List;
@@ -15,7 +17,6 @@ import net.minecraftforge.client.event.RenderGameOverlayEvent;
import org.lwjgl.opengl.GL11;
import com.brandon3055.brandonscore.client.utills.GuiHelper;
import com.brandon3055.brandonscore.common.utills.Utills;
import com.brandon3055.draconicevolution.client.gui.GuiHudConfig;
import com.brandon3055.draconicevolution.common.handler.ConfigHandler;
import com.brandon3055.draconicevolution.common.items.armor.CustomArmorHandler;
@@ -213,7 +214,7 @@ public class HudHandler {
GL11.glTranslated(-x, -y, 0);
String shield = Math.round(shieldPoints) + "/" + (int) maxShieldPoints;
String entropy = "EN: " + (int) shieldEntropy + "%";
String energy = "RF: " + Utills.formatNumber(rfTotal);
String energy = "RF: " + formatNumber(rfTotal);
float fade = Math.min(armorStatsFadeOut, 1F);
if (!rotated) {
fontRenderer
src/main/java/com/brandon3055/draconicevolution/common/items/armor/DraconicArmor.java
+3 -1
View File
@@ -1,5 +1,7 @@
package com.brandon3055.draconicevolution.common.items.armor;
import static com.gtnewhorizon.gtnhlib.util.numberformatting.NumberFormatUtil.formatNumber;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
@@ -516,7 +518,7 @@ public class DraconicArmor extends ItemArmor implements ISpecialArmor, IConfigur
InfoHelper.ITC() + StatCollector.translateToLocal("gui.de.RFCapacity.txt")
+ ": "
+ InfoHelper.HITC()
+ Utills.formatNumber(getMaxEnergyStored(stack)));
+ formatNumber(getMaxEnergyStored(stack)));
strings.add(
InfoHelper.ITC() + StatCollector.translateToLocal("gui.de.ShieldCapacity.txt")
+ ": "
src/main/java/com/brandon3055/draconicevolution/common/items/armor/WyvernArmor.java
+3 -1
View File
@@ -1,5 +1,7 @@
package com.brandon3055.draconicevolution.common.items.armor;
import static com.gtnewhorizon.gtnhlib.util.numberformatting.NumberFormatUtil.formatNumber;
import java.util.ArrayList;
import java.util.List;
@@ -395,7 +397,7 @@ public class WyvernArmor extends ItemArmor implements ISpecialArmor, IConfigurab
InfoHelper.ITC() + StatCollector.translateToLocal("gui.de.RFCapacity.txt")
+ ": "
+ InfoHelper.HITC()
+ Utills.formatNumber(getMaxEnergyStored(stack)));
+ formatNumber(getMaxEnergyStored(stack)));
strings.add(
InfoHelper.ITC() + StatCollector.translateToLocal("gui.de.ShieldCapacity.txt")
+ ": "
src/main/java/com/brandon3055/draconicevolution/common/items/tools/DraconicHoe.java
+5 -4
View File
@@ -1,5 +1,7 @@
package com.brandon3055.draconicevolution.common.items.tools;
import static com.gtnewhorizon.gtnhlib.util.numberformatting.NumberFormatUtil.formatNumber;
import java.util.ArrayList;
import java.util.List;
@@ -24,7 +26,6 @@ import org.lwjgl.opengl.GL11;
import com.brandon3055.brandonscore.common.utills.InfoHelper;
import com.brandon3055.brandonscore.common.utills.ItemNBTHelper;
import com.brandon3055.brandonscore.common.utills.Utills;
import com.brandon3055.draconicevolution.DraconicEvolution;
import com.brandon3055.draconicevolution.client.render.IRenderTweak;
import com.brandon3055.draconicevolution.common.ModItems;
@@ -358,7 +359,7 @@ public class DraconicHoe extends ItemHoe
InfoHelper.ITC() + StatCollector.translateToLocal("gui.de.RFCapacity.txt")
+ ": "
+ InfoHelper.HITC()
+ Utills.formatNumber(getMaxEnergyStored(itemstack)));
+ formatNumber(getMaxEnergyStored(itemstack)));
strings.add(
InfoHelper.ITC() + StatCollector.translateToLocal("gui.de.max.txt")
+ " "
@@ -388,9 +389,9 @@ public class DraconicHoe extends ItemHoe
InfoHelper.ITC() + StatCollector.translateToLocal("info.de.charge.txt")
+ ": "
+ InfoHelper.HITC()
+ Utills.formatNumber(getEnergyStored(stack))
+ formatNumber(getEnergyStored(stack))
+ " / "
+ Utills.formatNumber(capacity));
+ formatNumber(capacity));
return list;
}
src/main/java/com/brandon3055/draconicevolution/common/items/tools/DraconiumFluxCapacitor.java
+3 -2
View File
@@ -1,5 +1,7 @@
package com.brandon3055.draconicevolution.common.items.tools;
import static com.gtnewhorizon.gtnhlib.util.numberformatting.NumberFormatUtil.formatNumber;
import java.util.ArrayList;
import java.util.List;
@@ -16,7 +18,6 @@ import net.minecraft.world.World;
import com.brandon3055.brandonscore.common.utills.InfoHelper;
import com.brandon3055.brandonscore.common.utills.ItemNBTHelper;
import com.brandon3055.brandonscore.common.utills.Utills;
import com.brandon3055.draconicevolution.DraconicEvolution;
import com.brandon3055.draconicevolution.common.ModItems;
import com.brandon3055.draconicevolution.common.handler.BalanceConfigHandler;
@@ -240,7 +241,7 @@ public class DraconiumFluxCapacitor extends RFItemBase implements IUpgradableIte
InfoHelper.ITC() + StatCollector.translateToLocal("gui.de.RFCapacity.txt")
+ ": "
+ InfoHelper.HITC()
+ Utills.formatNumber(getMaxEnergyStored(stack)));
+ formatNumber(getMaxEnergyStored(stack)));
return strings;
}
}
src/main/java/com/brandon3055/draconicevolution/common/items/tools/baseclasses/MiningTool.java
+3 -2
View File
@@ -1,5 +1,7 @@
package com.brandon3055.draconicevolution.common.items.tools.baseclasses;
import static com.gtnewhorizon.gtnhlib.util.numberformatting.NumberFormatUtil.formatNumber;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
@@ -32,7 +34,6 @@ import net.minecraftforge.event.world.BlockEvent;
import com.brandon3055.brandonscore.common.utills.InfoHelper;
import com.brandon3055.brandonscore.common.utills.ItemNBTHelper;
import com.brandon3055.brandonscore.common.utills.Utills;
import com.brandon3055.draconicevolution.common.handler.ConfigHandler;
import com.brandon3055.draconicevolution.common.lib.References;
import com.brandon3055.draconicevolution.common.utills.IConfigurableItem;
@@ -389,7 +390,7 @@ public abstract class MiningTool extends ToolBase implements IUpgradableItem {
InfoHelper.ITC() + StatCollector.translateToLocal("gui.de.RFCapacity.txt")
+ ": "
+ InfoHelper.HITC()
+ Utills.formatNumber(getMaxEnergyStored(stack)));
+ formatNumber(getMaxEnergyStored(stack)));
strings.add(
InfoHelper.ITC() + StatCollector.translateToLocal("gui.de.max.txt")
+ " "
src/main/java/com/brandon3055/draconicevolution/common/items/tools/baseclasses/RFItemBase.java
+4 -3
View File
@@ -1,5 +1,7 @@
package com.brandon3055.draconicevolution.common.items.tools.baseclasses;
import static com.gtnewhorizon.gtnhlib.util.numberformatting.NumberFormatUtil.formatNumber;
import java.util.ArrayList;
import java.util.List;
@@ -14,7 +16,6 @@ import net.minecraft.world.World;
import com.brandon3055.brandonscore.common.utills.InfoHelper;
import com.brandon3055.brandonscore.common.utills.ItemNBTHelper;
import com.brandon3055.brandonscore.common.utills.Utills;
import com.brandon3055.draconicevolution.DraconicEvolution;
import com.brandon3055.draconicevolution.common.entity.EntityPersistentItem;
import com.brandon3055.draconicevolution.common.items.ItemDE;
@@ -166,9 +167,9 @@ public class RFItemBase extends ItemDE implements IEnergyContainerItem, IConfigu
InfoHelper.ITC() + StatCollector.translateToLocal("info.de.charge.txt")
+ ": "
+ InfoHelper.HITC()
+ Utills.formatNumber(getEnergyStored(stack))
+ formatNumber(getEnergyStored(stack))
+ " / "
+ Utills.formatNumber(capacity));
+ formatNumber(capacity));
}
return list;
src/main/java/com/brandon3055/draconicevolution/common/items/weapons/DraconicBow.java
+5 -3
View File
@@ -1,5 +1,7 @@
package com.brandon3055.draconicevolution.common.items.weapons;
import static com.gtnewhorizon.gtnhlib.util.numberformatting.NumberFormatUtil.formatNumber;
import java.util.ArrayList;
import java.util.List;
@@ -298,7 +300,7 @@ public class DraconicBow extends ItemBow
InfoHelper.ITC() + StatCollector.translateToLocal("gui.de.RFCapacity.txt")
+ ": "
+ InfoHelper.HITC()
+ Utills.formatNumber(getMaxEnergyStored(stack)));
+ formatNumber(getMaxEnergyStored(stack)));
list.add(
InfoHelper.ITC() + StatCollector.translateToLocal("gui.de.max.txt")
+ " "
@@ -395,9 +397,9 @@ public class DraconicBow extends ItemBow
InfoHelper.ITC() + StatCollector.translateToLocal("info.de.charge.txt")
+ ": "
+ InfoHelper.HITC()
+ Utills.formatNumber(getEnergyStored(stack))
+ formatNumber(getEnergyStored(stack))
+ " / "
+ Utills.formatNumber(getMaxEnergyStored(stack)));
+ formatNumber(getMaxEnergyStored(stack)));
if (BrandonsCore.proxy.getClientPlayer() != null) {
BowHandler.BowProperties properties = new BowHandler.BowProperties(
src/main/java/com/brandon3055/draconicevolution/common/items/weapons/DraconicSword.java
+3 -2
View File
@@ -1,5 +1,7 @@
package com.brandon3055.draconicevolution.common.items.weapons;
import static com.gtnewhorizon.gtnhlib.util.numberformatting.NumberFormatUtil.formatNumber;
import java.util.ArrayList;
import java.util.List;
@@ -23,7 +25,6 @@ import org.lwjgl.opengl.GL11;
import com.brandon3055.brandonscore.BrandonsCore;
import com.brandon3055.brandonscore.common.utills.InfoHelper;
import com.brandon3055.brandonscore.common.utills.ItemNBTHelper;
import com.brandon3055.brandonscore.common.utills.Utills;
import com.brandon3055.draconicevolution.DraconicEvolution;
import com.brandon3055.draconicevolution.client.render.IRenderTweak;
import com.brandon3055.draconicevolution.common.ModItems;
@@ -305,7 +306,7 @@ public class DraconicSword extends ItemSword
InfoHelper.ITC() + StatCollector.translateToLocal("gui.de.RFCapacity.txt")
+ ": "
+ InfoHelper.HITC()
+ Utills.formatNumber(getMaxEnergyStored(stack)));
+ formatNumber(getMaxEnergyStored(stack)));
strings.add(
InfoHelper.ITC() + StatCollector.translateToLocal("info.de.attackDamage.txt")
+ ": "
src/main/java/com/brandon3055/draconicevolution/common/items/weapons/WyvernBow.java
+5 -3
View File
@@ -1,5 +1,7 @@
package com.brandon3055.draconicevolution.common.items.weapons;
import static com.gtnewhorizon.gtnhlib.util.numberformatting.NumberFormatUtil.formatNumber;
import java.util.ArrayList;
import java.util.List;
@@ -299,7 +301,7 @@ public class WyvernBow extends ItemBow
InfoHelper.ITC() + StatCollector.translateToLocal("gui.de.RFCapacity.txt")
+ ": "
+ InfoHelper.HITC()
+ Utills.formatNumber(getMaxEnergyStored(stack)));
+ formatNumber(getMaxEnergyStored(stack)));
list.add(
InfoHelper.ITC() + StatCollector.translateToLocal("gui.de.max.txt")
+ " "
@@ -386,9 +388,9 @@ public class WyvernBow extends ItemBow
InfoHelper.ITC() + StatCollector.translateToLocal("info.de.charge.txt")
+ ": "
+ InfoHelper.HITC()
+ Utills.formatNumber(getEnergyStored(stack))
+ formatNumber(getEnergyStored(stack))
+ " / "
+ Utills.formatNumber(getMaxEnergyStored(stack)));
+ formatNumber(getMaxEnergyStored(stack)));
if (BrandonsCore.proxy.getClientPlayer() != null) {
BowHandler.BowProperties properties = new BowHandler.BowProperties(
src/main/java/com/brandon3055/draconicevolution/common/items/weapons/WyvernSword.java
+3 -2
View File
@@ -1,5 +1,7 @@
package com.brandon3055.draconicevolution.common.items.weapons;
import static com.gtnewhorizon.gtnhlib.util.numberformatting.NumberFormatUtil.formatNumber;
import java.util.ArrayList;
import java.util.List;
@@ -24,7 +26,6 @@ import org.lwjgl.opengl.GL11;
import com.brandon3055.brandonscore.BrandonsCore;
import com.brandon3055.brandonscore.common.utills.InfoHelper;
import com.brandon3055.brandonscore.common.utills.ItemNBTHelper;
import com.brandon3055.brandonscore.common.utills.Utills;
import com.brandon3055.draconicevolution.DraconicEvolution;
import com.brandon3055.draconicevolution.client.render.IRenderTweak;
import com.brandon3055.draconicevolution.common.ModItems;
@@ -307,7 +308,7 @@ public class WyvernSword extends ItemSword
InfoHelper.ITC() + StatCollector.translateToLocal("gui.de.RFCapacity.txt")
+ ": "
+ InfoHelper.HITC()
+ Utills.formatNumber(getMaxEnergyStored(stack)));
+ formatNumber(getMaxEnergyStored(stack)));
strings.add(
InfoHelper.ITC() + StatCollector.translateToLocal("info.de.attackDamage.txt")
+ ": "
src/main/java/com/brandon3055/draconicevolution/common/tileentities/multiblocktiles/TileEnergyStorageCore.java
+4 -2
View File
@@ -1,5 +1,7 @@
package com.brandon3055.draconicevolution.common.tileentities.multiblocktiles;
import static com.gtnewhorizon.gtnhlib.util.numberformatting.NumberFormatUtil.formatNumber;
import java.util.ArrayList;
import java.util.List;
@@ -500,9 +502,9 @@ public class TileEnergyStorageCore extends TileObjectSync {
information.add(
StatCollector.translateToLocal("info.de.charge.txt") + ": "
+ InfoHelper.ITC()
+ Utills.formatNumber(energy)
+ formatNumber(energy)
+ " / "
+ Utills.formatNumber(capacity)
+ formatNumber(capacity)
+ " ["
+ Utills.addCommas(energy)
+ " RF]");