Skip to content

Commit 83d645e

Browse files
committed
update+gradle+deps+bs
1 parent fac88c7 commit 83d645e

8 files changed

Lines changed: 60 additions & 17 deletions

dependencies.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
* For more details, see https://docs.gradle.org/8.0.1/userguide/java_library_plugin.html#sec:java_library_configurations_graph
3535
*/
3636
dependencies {
37-
implementation("com.github.GTNewHorizons:Chisel:2.16.5-GTNH:dev")
37+
implementation("com.github.GTNewHorizons:Chisel:2.17.26-GTNH:dev")
3838

39-
runtimeOnlyNonPublishable("com.github.GTNewHorizons:NotEnoughItems:2.7.60-GTNH:dev")
39+
runtimeOnlyNonPublishable("com.github.GTNewHorizons:NotEnoughItems:2.8.93-GTNH:dev")
4040
}

gradle.properties

Lines changed: 40 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,33 @@ remoteMappings = https\://raw.githubusercontent.com/MinecraftForge/FML/1.7.10/co
3939
# `./gradlew runClient --username=AnotherPlayer`, or configuring this command in your IDE.
4040
developmentEnvironmentUserName = Developer
4141

42-
# Enables using modern Java syntax (up to version 17) via Jabel, while still targeting JVM 8.
43-
# See https://github.com/bsideup/jabel for details on how this works.
44-
enableModernJavaSyntax = true
42+
# Enables modern Java syntax support. Valid values:
43+
# - false: No modern syntax, Java 8 only
44+
# - jabel: Jabel syntax-only support, compiles to J8 bytecode
45+
# - jvmDowngrader: Full modern Java via JVM Downgrader (syntax + stdlib APIs)
46+
# - modern: Native modern Java bytecode, no downgrading
47+
enableModernJavaSyntax = jabel
48+
49+
# If set, ignores the above setting and compiles with the given toolchain. This may cause unexpected issues,
50+
# and should *not* be used in most situations. -1 disables this.
51+
# forceToolchainVersion = -1
52+
53+
# Target JVM version for JVM Downgrader bytecode downgrading.
54+
# Only used when enableModernJavaSyntax = jvmDowngrader
55+
# downgradeTargetVersion = 8
56+
57+
# Comma-separated list of Java versions for multi-release jar support (JVM Downgrader only).
58+
# Classes will be available in META-INF/versions/N/ for each version N in this list.
59+
# Default: "21,25" (J25+ gets native classes, J21-24 gets partial downgrade, J8-20 gets full downgrade).
60+
# jvmDowngraderMultiReleaseVersions = 21,25
61+
62+
# Specifies how JVM Downgrader API stubs are provided. Options:
63+
# - shade: Shade minimized stubs into the jar
64+
# - gtnhlib: GTNHLib provides stubs at runtime (adds version constraint)
65+
# - external: Another dependency provides stubs (no constraint, no warning)
66+
# - (empty): Warning reminding you to configure stubs
67+
# Note: 'shade' option requires you to verify license compliance, see: https://github.com/unimined/JvmDowngrader/blob/main/LICENSE.md
68+
# jvmDowngraderStubsProvider =
4569

4670
# Enables injecting missing generics into the decompiled source code for a better coding experience.
4771
# Turns most publicly visible List, Map, etc. into proper List<E>, Map<K, V> types.
@@ -87,7 +111,9 @@ usesMixinDebug = false
87111
# Specify the location of your implementation of IMixinConfigPlugin. Leave it empty otherwise.
88112
mixinPlugin =
89113

90-
# Specify the package that contains all of your Mixins. You may only place Mixins in this package or the build will fail!
114+
# Specify the package that contains all of your Mixins. The package must exist or
115+
# the build will fail. If you have a package property defined in your mixins.<modid>.json,
116+
# it must match with this or the build will fail.
91117
mixinsPackage =
92118

93119
# Specify the core mod entry class if you use a core mod. This class must implement IFMLLoadingPlugin!
@@ -142,7 +168,7 @@ modrinthProjectId = modernmarkings
142168
# type can be one of [project, version],
143169
# and the name is the Modrinth project or version slug/id of the other mod.
144170
# Example: required-project:fplib;optional-project:gasstation;incompatible-project:gregtech
145-
# Note: GTNH Mixins is automatically set as a required dependency if usesMixins = true
171+
# Note: UniMixins is automatically set as a required dependency if usesMixins = true.
146172
modrinthRelations =
147173

148174
# Publishing to CurseForge requires you to set the CURSEFORGE_TOKEN environment variable to one of your CurseForge API tokens.
@@ -163,6 +189,12 @@ curseForgeRelations =
163189
# projects. New projects should not use this parameter.
164190
# customArchiveBaseName =
165191

192+
# Optional parameter to customize the default working directory used by the runClient* tasks. Relative to the project directory.
193+
# runClientWorkingDirectory = run/client
194+
195+
# Optional parameter to customize the default working directory used by the runServer* tasks. Relative to the project directory.
196+
# runServerWorkingDirectory = run/server
197+
166198
# Optional parameter to have the build automatically fail if an illegal version is used.
167199
# This can be useful if you e.g. only want to allow versions in the form of '1.1.xxx'.
168200
# The check is ONLY performed if the version is a git tag.
@@ -192,3 +224,6 @@ versionPattern = \\d+\\.\\d+\\.\\d+-1\\.7\\.10(-pre|-snapshot)?
192224
# This is meant to be set in $HOME/.gradle/gradle.properties.
193225
# ideaCheckSpotlessOnBuild = true
194226

227+
# Non-GTNH properties
228+
org.gradle.configuration-cache = true
229+
org.gradle.parallel = true
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
#This file is generated by updateDaemonJvm
2+
toolchainUrl.FREE_BSD.AARCH64=https\://api.foojay.io/disco/v3.0/ids/1630f7ebef05444cb27a2709ea0249b3/redirect
3+
toolchainUrl.FREE_BSD.X86_64=https\://api.foojay.io/disco/v3.0/ids/fa1e318c287360478e3c83a9a3ef1007/redirect
4+
toolchainUrl.LINUX.AARCH64=https\://api.foojay.io/disco/v3.0/ids/1630f7ebef05444cb27a2709ea0249b3/redirect
5+
toolchainUrl.LINUX.X86_64=https\://api.foojay.io/disco/v3.0/ids/fa1e318c287360478e3c83a9a3ef1007/redirect
6+
toolchainUrl.MAC_OS.AARCH64=https\://api.foojay.io/disco/v3.0/ids/c2dd35c9d0aaf0ba6ad0791320f99dfc/redirect
7+
toolchainUrl.MAC_OS.X86_64=https\://api.foojay.io/disco/v3.0/ids/e5810bd7fd1f8a586644409d395a7e55/redirect
8+
toolchainUrl.UNIX.AARCH64=https\://api.foojay.io/disco/v3.0/ids/1630f7ebef05444cb27a2709ea0249b3/redirect
9+
toolchainUrl.UNIX.X86_64=https\://api.foojay.io/disco/v3.0/ids/fa1e318c287360478e3c83a9a3ef1007/redirect
10+
toolchainUrl.WINDOWS.X86_64=https\://api.foojay.io/disco/v3.0/ids/8e1d9ee5d0f13e442218f6884a306da1/redirect
11+
toolchainVendor=ADOPTIUM
12+
toolchainVersion=25

gradle/wrapper/gradle-wrapper.jar

5.14 KB
Binary file not shown.

gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.0-bin.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

gradlew

Lines changed: 3 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

gradlew.bat

Lines changed: 1 addition & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

settings.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,5 +17,5 @@ pluginManagement {
1717
}
1818

1919
plugins {
20-
id("com.gtnewhorizons.gtnhsettingsconvention") version("1.0.38")
20+
id("com.gtnewhorizons.gtnhsettingsconvention") version("2.0.24")
2121
}

0 commit comments

Comments
 (0)