From 92fa94c2a061e1a70c0d92b98bb5718f575a4066 Mon Sep 17 00:00:00 2001 From: Connor Colenso Date: Sat, 24 Jan 2026 01:36:28 +0000 Subject: [PATCH 1/2] Update BS + dep update --- dependencies.gradle | 2 +- gradle.properties | 26 +++++++++++++++++++++++--- settings.gradle | 2 +- 3 files changed, 25 insertions(+), 5 deletions(-) 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' } From 5207c3c32161f208d02dbc1f67dc7694f908f1a1 Mon Sep 17 00:00:00 2001 From: Connor Colenso Date: Sat, 24 Jan 2026 01:36:35 +0000 Subject: [PATCH 2/2] Transition formatting over --- .../java/emt/item/block/ItemBlockSolars.java | 102 +++++++++--------- 1 file changed, 51 insertions(+), 51 deletions(-) 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 void addInformation(ItemStack itemstack, EntityPlayer player, List