diff --git a/dependencies.gradle b/dependencies.gradle index 88ddf9c..7973d79 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -11,5 +11,5 @@ dependencies { api('net.industrial-craft:industrialcraft-2:2.2.828-experimental:dev') api('thaumcraft:Thaumcraft:1.7.10-4.2.3.5:dev') - compileOnly('com.github.GTNewHorizons:GT5-Unofficial:5.09.52.190:dev') + compileOnly('com.github.GTNewHorizons:GT5-Unofficial:5.09.52.223:dev') } diff --git a/gradle.properties b/gradle.properties index 4c9e995..e1acb2b 100644 --- a/gradle.properties +++ b/gradle.properties @@ -39,14 +39,34 @@ 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 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 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 injecting missing generics into the decompiled source code for a better coding experience. # Turns most publicly visible List, Map, etc. into proper List, Map types. enableGenericInjection = true diff --git a/settings.gradle b/settings.gradle index 647b0d4..32896c7 100644 --- a/settings.gradle +++ b/settings.gradle @@ -17,7 +17,7 @@ pluginManagement { } plugins { - id 'com.gtnewhorizons.gtnhsettingsconvention' version '2.0.10' + id 'com.gtnewhorizons.gtnhsettingsconvention' version '2.0.18' } diff --git a/src/main/java/emt/item/block/ItemBlockSolars.java b/src/main/java/emt/item/block/ItemBlockSolars.java index 610af6c..c56a398 100644 --- a/src/main/java/emt/item/block/ItemBlockSolars.java +++ b/src/main/java/emt/item/block/ItemBlockSolars.java @@ -1,7 +1,7 @@ package emt.item.block; +import static com.gtnewhorizon.gtnhlib.util.numberformatting.NumberFormatUtil.formatNumber; import static emt.util.EMTTextHelper.localize; -import static gregtech.api.util.GTUtility.formatNumbers; import java.io.StringReader; import java.util.List; @@ -59,19 +59,19 @@ public class ItemBlockSolars extends ItemBlock { switch (itemstack.getItemDamage()) { case 0: { list.add( - formatNumbers(EMTConfigHandler.compressedSolarOutput) + formatNumber(EMTConfigHandler.compressedSolarOutput) + localize("tooltip.EMT.euPerTick")); break; } case 1: { list.add( - formatNumbers(EMTConfigHandler.doubleCompressedSolarOutput) + formatNumber(EMTConfigHandler.doubleCompressedSolarOutput) + localize("tooltip.EMT.euPerTick")); break; } case 2: { list.add( - formatNumbers(EMTConfigHandler.tripleCompressedSolarOutput) + formatNumber(EMTConfigHandler.tripleCompressedSolarOutput) + localize("tooltip.EMT.euPerTick")); break; } @@ -80,14 +80,14 @@ public class ItemBlockSolars extends ItemBlock { EMTTextHelper.BRIGHT_BLUE + localize("tooltip.EMT.normalConditions") + ": " + EMTTextHelper.LIGHT_GRAY - + formatNumbers(EMTConfigHandler.compressedSolarOutput) + + formatNumber(EMTConfigHandler.compressedSolarOutput) + " " + localize("tooltip.EMT.euPerTick")); list.add( EMTTextHelper.BRIGHT_GREEN + localize("tooltip.EMT.specialEffect") + ": " + EMTTextHelper.LIGHT_GRAY - + formatNumbers(2F * EMTConfigHandler.compressedSolarOutput) + + formatNumber(2F * EMTConfigHandler.compressedSolarOutput) + " " + localize("tooltip.EMT.euPerTick") + " " @@ -96,7 +96,7 @@ public class ItemBlockSolars extends ItemBlock { EMTTextHelper.BRIGHT_GREEN + localize("tooltip.EMT.specialEffect") + ": " + EMTTextHelper.LIGHT_GRAY - + formatNumbers(3F * EMTConfigHandler.compressedSolarOutput) + + formatNumber(3F * EMTConfigHandler.compressedSolarOutput) + " " + localize("tooltip.EMT.euPerTick") + " " @@ -105,7 +105,7 @@ public class ItemBlockSolars extends ItemBlock { EMTTextHelper.BRIGHT_GREEN + localize("tooltip.EMT.specialEffect") + ": " + EMTTextHelper.LIGHT_GRAY - + formatNumbers(6F * EMTConfigHandler.compressedSolarOutput) + + formatNumber(6F * EMTConfigHandler.compressedSolarOutput) + " " + localize("tooltip.EMT.euPerTick") + " " @@ -117,14 +117,14 @@ public class ItemBlockSolars extends ItemBlock { EMTTextHelper.BRIGHT_BLUE + localize("tooltip.EMT.normalConditions") + ": " + EMTTextHelper.LIGHT_GRAY - + formatNumbers(EMTConfigHandler.doubleCompressedSolarOutput) + + formatNumber(EMTConfigHandler.doubleCompressedSolarOutput) + " " + localize("tooltip.EMT.euPerTick")); list.add( EMTTextHelper.BRIGHT_GREEN + localize("tooltip.EMT.specialEffect") + ": " + EMTTextHelper.LIGHT_GRAY - + formatNumbers(2F * EMTConfigHandler.doubleCompressedSolarOutput) + + formatNumber(2F * EMTConfigHandler.doubleCompressedSolarOutput) + " " + localize("tooltip.EMT.euPerTick") + " " @@ -133,7 +133,7 @@ public class ItemBlockSolars extends ItemBlock { EMTTextHelper.BRIGHT_GREEN + localize("tooltip.EMT.specialEffect") + ": " + EMTTextHelper.LIGHT_GRAY - + formatNumbers(3F * EMTConfigHandler.doubleCompressedSolarOutput) + + formatNumber(3F * EMTConfigHandler.doubleCompressedSolarOutput) + " " + localize("tooltip.EMT.euPerTick") + " " @@ -142,7 +142,7 @@ public class ItemBlockSolars extends ItemBlock { EMTTextHelper.BRIGHT_GREEN + localize("tooltip.EMT.specialEffect") + ": " + EMTTextHelper.LIGHT_GRAY - + formatNumbers(6F * EMTConfigHandler.doubleCompressedSolarOutput) + + formatNumber(6F * EMTConfigHandler.doubleCompressedSolarOutput) + " " + localize("tooltip.EMT.euPerTick") + " " @@ -154,14 +154,14 @@ public class ItemBlockSolars extends ItemBlock { EMTTextHelper.BRIGHT_BLUE + localize("tooltip.EMT.normalConditions") + ": " + EMTTextHelper.LIGHT_GRAY - + formatNumbers(EMTConfigHandler.tripleCompressedSolarOutput) + + formatNumber(EMTConfigHandler.tripleCompressedSolarOutput) + " " + localize("tooltip.EMT.euPerTick")); list.add( EMTTextHelper.BRIGHT_GREEN + localize("tooltip.EMT.specialEffect") + ": " + EMTTextHelper.LIGHT_GRAY - + formatNumbers(2F * EMTConfigHandler.tripleCompressedSolarOutput) + + formatNumber(2F * EMTConfigHandler.tripleCompressedSolarOutput) + " " + localize("tooltip.EMT.euPerTick") + " " @@ -170,7 +170,7 @@ public class ItemBlockSolars extends ItemBlock { EMTTextHelper.BRIGHT_GREEN + localize("tooltip.EMT.specialEffect") + ": " + EMTTextHelper.LIGHT_GRAY - + formatNumbers(3F * EMTConfigHandler.tripleCompressedSolarOutput) + + formatNumber(3F * EMTConfigHandler.tripleCompressedSolarOutput) + " " + localize("tooltip.EMT.euPerTick") + " " @@ -179,7 +179,7 @@ public class ItemBlockSolars extends ItemBlock { EMTTextHelper.BRIGHT_GREEN + localize("tooltip.EMT.specialEffect") + ": " + EMTTextHelper.LIGHT_GRAY - + formatNumbers(6F * EMTConfigHandler.tripleCompressedSolarOutput) + + formatNumber(6F * EMTConfigHandler.tripleCompressedSolarOutput) + " " + localize("tooltip.EMT.euPerTick") + " " @@ -192,7 +192,7 @@ public class ItemBlockSolars extends ItemBlock { EMTTextHelper.BRIGHT_BLUE + localize("tooltip.EMT.normalConditions") + ": " + EMTTextHelper.LIGHT_GRAY - + formatNumbers(0.75F * EMTConfigHandler.compressedSolarOutput) + + formatNumber(0.75F * EMTConfigHandler.compressedSolarOutput) + " " + localize("tooltip.EMT.euPerTick") + " " @@ -201,7 +201,7 @@ public class ItemBlockSolars extends ItemBlock { EMTTextHelper.BRIGHT_GREEN + localize("tooltip.EMT.specialEffect") + ": " + EMTTextHelper.LIGHT_GRAY - + formatNumbers(2F * EMTConfigHandler.compressedSolarOutput) + + formatNumber(2F * EMTConfigHandler.compressedSolarOutput) + " " + localize("tooltip.EMT.euPerTick") + " " @@ -213,7 +213,7 @@ public class ItemBlockSolars extends ItemBlock { EMTTextHelper.BRIGHT_BLUE + localize("tooltip.EMT.normalConditions") + ": " + EMTTextHelper.LIGHT_GRAY - + formatNumbers(0.75F * EMTConfigHandler.doubleCompressedSolarOutput) + + formatNumber(0.75F * EMTConfigHandler.doubleCompressedSolarOutput) + " " + localize("tooltip.EMT.euPerTick") + " " @@ -222,7 +222,7 @@ public class ItemBlockSolars extends ItemBlock { EMTTextHelper.BRIGHT_GREEN + localize("tooltip.EMT.specialEffect") + ": " + EMTTextHelper.LIGHT_GRAY - + formatNumbers(2F * EMTConfigHandler.doubleCompressedSolarOutput) + + formatNumber(2F * EMTConfigHandler.doubleCompressedSolarOutput) + " " + localize("tooltip.EMT.euPerTick") + " " @@ -234,7 +234,7 @@ public class ItemBlockSolars extends ItemBlock { EMTTextHelper.BRIGHT_BLUE + localize("tooltip.EMT.normalConditions") + ": " + EMTTextHelper.LIGHT_GRAY - + formatNumbers(0.75F * EMTConfigHandler.tripleCompressedSolarOutput) + + formatNumber(0.75F * EMTConfigHandler.tripleCompressedSolarOutput) + " " + localize("tooltip.EMT.euPerTick") + " " @@ -243,7 +243,7 @@ public class ItemBlockSolars extends ItemBlock { EMTTextHelper.BRIGHT_GREEN + localize("tooltip.EMT.specialEffect") + ": " + EMTTextHelper.LIGHT_GRAY - + formatNumbers(2F * EMTConfigHandler.tripleCompressedSolarOutput) + + formatNumber(2F * EMTConfigHandler.tripleCompressedSolarOutput) + " " + localize("tooltip.EMT.euPerTick") + " " @@ -255,7 +255,7 @@ public class ItemBlockSolars extends ItemBlock { EMTTextHelper.BRIGHT_BLUE + localize("tooltip.EMT.normalConditions") + ": " + EMTTextHelper.LIGHT_GRAY - + formatNumbers(2F * EMTConfigHandler.compressedSolarOutput) + + formatNumber(2F * EMTConfigHandler.compressedSolarOutput) + " " + localize("tooltip.EMT.euPerTick") + " " @@ -264,7 +264,7 @@ public class ItemBlockSolars extends ItemBlock { EMTTextHelper.BRIGHT_GREEN + localize("tooltip.EMT.specialEffect") + ": " + EMTTextHelper.LIGHT_GRAY - + formatNumbers(0.75F * EMTConfigHandler.compressedSolarOutput) + + formatNumber(0.75F * EMTConfigHandler.compressedSolarOutput) + " " + localize("tooltip.EMT.euPerTick") + " " @@ -276,7 +276,7 @@ public class ItemBlockSolars extends ItemBlock { EMTTextHelper.BRIGHT_BLUE + localize("tooltip.EMT.normalConditions") + ": " + EMTTextHelper.LIGHT_GRAY - + formatNumbers(2F * EMTConfigHandler.doubleCompressedSolarOutput) + + formatNumber(2F * EMTConfigHandler.doubleCompressedSolarOutput) + " " + localize("tooltip.EMT.euPerTick") + " " @@ -285,7 +285,7 @@ public class ItemBlockSolars extends ItemBlock { EMTTextHelper.BRIGHT_GREEN + localize("tooltip.EMT.specialEffect") + ": " + EMTTextHelper.LIGHT_GRAY - + formatNumbers(0.75F * EMTConfigHandler.doubleCompressedSolarOutput) + + formatNumber(0.75F * EMTConfigHandler.doubleCompressedSolarOutput) + " " + localize("tooltip.EMT.euPerTick") + " " @@ -298,7 +298,7 @@ public class ItemBlockSolars extends ItemBlock { EMTTextHelper.BRIGHT_BLUE + localize("tooltip.EMT.normalConditions") + ": " + EMTTextHelper.LIGHT_GRAY - + formatNumbers(2F * EMTConfigHandler.tripleCompressedSolarOutput) + + formatNumber(2F * EMTConfigHandler.tripleCompressedSolarOutput) + " " + localize("tooltip.EMT.euPerTick") + " " @@ -307,7 +307,7 @@ public class ItemBlockSolars extends ItemBlock { EMTTextHelper.BRIGHT_GREEN + localize("tooltip.EMT.specialEffect") + ": " + EMTTextHelper.LIGHT_GRAY - + formatNumbers(0.75F * EMTConfigHandler.tripleCompressedSolarOutput) + + formatNumber(0.75F * EMTConfigHandler.tripleCompressedSolarOutput) + " " + localize("tooltip.EMT.euPerTick") + " " @@ -319,7 +319,7 @@ public class ItemBlockSolars extends ItemBlock { EMTTextHelper.BRIGHT_BLUE + localize("tooltip.EMT.normalConditions") + ": " + EMTTextHelper.LIGHT_GRAY - + formatNumbers(EMTConfigHandler.compressedSolarOutput) + + formatNumber(EMTConfigHandler.compressedSolarOutput) + " " + localize("tooltip.EMT.euPerTick")); list.add( @@ -343,7 +343,7 @@ public class ItemBlockSolars extends ItemBlock { EMTTextHelper.BRIGHT_BLUE + localize("tooltip.EMT.normalConditions") + ": " + EMTTextHelper.LIGHT_GRAY - + formatNumbers(EMTConfigHandler.doubleCompressedSolarOutput) + + formatNumber(EMTConfigHandler.doubleCompressedSolarOutput) + " " + localize("tooltip.EMT.euPerTick")); list.add( @@ -367,7 +367,7 @@ public class ItemBlockSolars extends ItemBlock { EMTTextHelper.BRIGHT_BLUE + localize("tooltip.EMT.normalConditions") + ": " + EMTTextHelper.LIGHT_GRAY - + formatNumbers(EMTConfigHandler.tripleCompressedSolarOutput) + + formatNumber(EMTConfigHandler.tripleCompressedSolarOutput) + " " + localize("tooltip.EMT.euPerTick")); list.add( @@ -391,7 +391,7 @@ public class ItemBlockSolars extends ItemBlock { EMTTextHelper.BRIGHT_BLUE + localize("tooltip.EMT.normalConditions") + ": " + EMTTextHelper.LIGHT_GRAY - + formatNumbers(EMTConfigHandler.compressedSolarOutput) + + formatNumber(EMTConfigHandler.compressedSolarOutput) + " " + localize("tooltip.EMT.euPerTick")); list.add( @@ -413,7 +413,7 @@ public class ItemBlockSolars extends ItemBlock { EMTTextHelper.BRIGHT_BLUE + localize("tooltip.EMT.normalConditions") + ": " + EMTTextHelper.LIGHT_GRAY - + formatNumbers(EMTConfigHandler.doubleCompressedSolarOutput) + + formatNumber(EMTConfigHandler.doubleCompressedSolarOutput) + " " + localize("tooltip.EMT.euPerTick")); list.add( @@ -428,7 +428,7 @@ public class ItemBlockSolars extends ItemBlock { EMTTextHelper.BRIGHT_BLUE + localize("tooltip.EMT.normalConditions") + ": " + EMTTextHelper.LIGHT_GRAY - + formatNumbers(EMTConfigHandler.tripleCompressedSolarOutput) + + formatNumber(EMTConfigHandler.tripleCompressedSolarOutput) + " " + localize("tooltip.EMT.euPerTick")); list.add( @@ -443,7 +443,7 @@ public class ItemBlockSolars extends ItemBlock { EMTTextHelper.BRIGHT_BLUE + localize("tooltip.EMT.normalConditions") + ": " + EMTTextHelper.LIGHT_GRAY - + formatNumbers(EMTConfigHandler.compressedSolarOutput) + + formatNumber(EMTConfigHandler.compressedSolarOutput) + " " + localize("tooltip.EMT.euPerTick")); list.add( @@ -458,7 +458,7 @@ public class ItemBlockSolars extends ItemBlock { EMTTextHelper.BRIGHT_BLUE + localize("tooltip.EMT.normalConditions") + ": " + EMTTextHelper.LIGHT_GRAY - + formatNumbers(EMTConfigHandler.doubleCompressedSolarOutput) + + formatNumber(EMTConfigHandler.doubleCompressedSolarOutput) + " " + localize("tooltip.EMT.euPerTick")); list.add( @@ -473,7 +473,7 @@ public class ItemBlockSolars extends ItemBlock { EMTTextHelper.BRIGHT_BLUE + localize("tooltip.EMT.normalConditions") + ": " + EMTTextHelper.LIGHT_GRAY - + formatNumbers(EMTConfigHandler.tripleCompressedSolarOutput) + + formatNumber(EMTConfigHandler.tripleCompressedSolarOutput) + " " + localize("tooltip.EMT.euPerTick")); list.add( @@ -495,7 +495,7 @@ public class ItemBlockSolars extends ItemBlock { EMTTextHelper.BRIGHT_BLUE + localize("tooltip.EMT.normalConditions") + ": " + EMTTextHelper.LIGHT_GRAY - + formatNumbers(2F * te.output) + + formatNumber(2F * te.output) + " " + localize("tooltip.EMT.euPerTick") + " " @@ -504,7 +504,7 @@ public class ItemBlockSolars extends ItemBlock { EMTTextHelper.BRIGHT_GREEN + localize("tooltip.EMT.specialEffect") + ": " + EMTTextHelper.LIGHT_GRAY - + formatNumbers(0.75F * te.output) + + formatNumber(0.75F * te.output) + " " + localize("tooltip.EMT.euPerTick") + " " @@ -515,7 +515,7 @@ public class ItemBlockSolars extends ItemBlock { EMTTextHelper.BRIGHT_BLUE + localize("tooltip.EMT.normalConditions") + ": " + EMTTextHelper.LIGHT_GRAY - + formatNumbers(0.75F * te.output) + + formatNumber(0.75F * te.output) + " " + localize("tooltip.EMT.euPerTick") + " " @@ -524,7 +524,7 @@ public class ItemBlockSolars extends ItemBlock { EMTTextHelper.BRIGHT_GREEN + localize("tooltip.EMT.specialEffect") + ": " + EMTTextHelper.LIGHT_GRAY - + formatNumbers(2F * te.output) + + formatNumber(2F * te.output) + " " + localize("tooltip.EMT.euPerTick") + " " @@ -535,7 +535,7 @@ public class ItemBlockSolars extends ItemBlock { EMTTextHelper.BRIGHT_BLUE + localize("tooltip.EMT.normalConditions") + ": " + EMTTextHelper.LIGHT_GRAY - + formatNumbers(te.output) + + formatNumber(te.output) + " " + localize("tooltip.EMT.euPerTick")); list.add( @@ -549,7 +549,7 @@ public class ItemBlockSolars extends ItemBlock { EMTTextHelper.BRIGHT_BLUE + localize("tooltip.EMT.normalConditions") + ": " + EMTTextHelper.LIGHT_GRAY - + formatNumbers(te.output) + + formatNumber(te.output) + " " + localize("tooltip.EMT.euPerTick")); list.add( @@ -563,14 +563,14 @@ public class ItemBlockSolars extends ItemBlock { EMTTextHelper.BRIGHT_BLUE + localize("tooltip.EMT.normalConditions") + ": " + EMTTextHelper.LIGHT_GRAY - + formatNumbers(te.output) + + formatNumber(te.output) + " " + localize("tooltip.EMT.euPerTick")); list.add( EMTTextHelper.BRIGHT_GREEN + localize("tooltip.EMT.specialEffect") + ": " + EMTTextHelper.LIGHT_GRAY - + formatNumbers(2F * te.output) + + formatNumber(2F * te.output) + " " + localize("tooltip.EMT.euPerTick") + " " @@ -579,7 +579,7 @@ public class ItemBlockSolars extends ItemBlock { EMTTextHelper.BRIGHT_GREEN + localize("tooltip.EMT.specialEffect") + ": " + EMTTextHelper.LIGHT_GRAY - + formatNumbers(3F * te.output) + + formatNumber(3F * te.output) + " " + localize("tooltip.EMT.euPerTick") + " " @@ -588,7 +588,7 @@ public class ItemBlockSolars extends ItemBlock { EMTTextHelper.BRIGHT_GREEN + localize("tooltip.EMT.specialEffect") + ": " + EMTTextHelper.LIGHT_GRAY - + formatNumbers(6F * te.output) + + formatNumber(6F * te.output) + " " + localize("tooltip.EMT.euPerTick") + " " @@ -599,7 +599,7 @@ public class ItemBlockSolars extends ItemBlock { EMTTextHelper.BRIGHT_BLUE + localize("tooltip.EMT.normalConditions") + ": " + EMTTextHelper.LIGHT_GRAY - + formatNumbers(te.output) + + formatNumber(te.output) + " " + localize("tooltip.EMT.euPerTick")); list.add( @@ -622,7 +622,7 @@ public class ItemBlockSolars extends ItemBlock { EMTTextHelper.BRIGHT_BLUE + localize("tooltip.EMT.normalConditions") + ": " + EMTTextHelper.LIGHT_GRAY - + formatNumbers(te.output) + + formatNumber(te.output) + " " + localize("tooltip.EMT.euPerTick")); break; @@ -632,9 +632,9 @@ public class ItemBlockSolars extends ItemBlock { EMTTextHelper.BRIGHT_BLUE + StatCollector.translateToLocal("emt.OutputMax") + " " + EMTTextHelper.LIGHT_GRAY - + formatNumbers(te.calculateMaxVoltAmp()[0]) + + formatNumber(te.calculateMaxVoltAmp()[0]) + "EU/t @ " - + formatNumbers(te.calculateMaxVoltAmp()[1]) + + formatNumber(te.calculateMaxVoltAmp()[1]) + "A"); } else list.add(StatCollector.translateToLocal("emt.PressShift")); }