diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 63c3cde..48ad79e 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -12,10 +12,10 @@ jobs: fetch-depth: 0 fetch-tags: true - - name: Setup JDK 21 + - name: Setup JDK 17 uses: actions/setup-java@v4 with: - java-version: '21' + java-version: '17' distribution: 'temurin' - name: Setup Gradle diff --git a/build.gradle b/build.gradle index 525958c..6e56b37 100644 --- a/build.gradle +++ b/build.gradle @@ -25,7 +25,7 @@ base { archivesName = mod_id } -// Mojang ships Java 17 to end users from 1.18 to 1.20.4, so your mod should target Java 17. +// Mojang ships Java 17 to end users in 1.20.4, so mods should target Java 17. java.toolchain.languageVersion = JavaLanguageVersion.of(17) neoForge { @@ -142,7 +142,6 @@ var generateModMetadata = tasks.register("generateModMetadata", ProcessResources minecraft_version : minecraft_version, minecraft_version_range: minecraft_version_range, neo_version : neo_version, - neo_version_range : neo_version_range, loader_version_range : loader_version_range, mod_id : mod_id, mod_name : mod_name, diff --git a/gradle.properties b/gradle.properties index 25490c2..2c2b364 100644 --- a/gradle.properties +++ b/gradle.properties @@ -19,8 +19,6 @@ minecraft_version=1.20.4 minecraft_version_range=[1.20.4] # The Neo version must agree with the Minecraft version to get a valid artifact neo_version=20.4.248 -# The Neo version range can use any version of Neo as bounds -neo_version_range=[20.4.248,) # The loader version range can only use the major version of FML as bounds loader_version_range=[1,) diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index ff23a68..d4081da 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/src/main/templates/META-INF/mods.toml b/src/main/templates/META-INF/mods.toml index 4803529..b834462 100644 --- a/src/main/templates/META-INF/mods.toml +++ b/src/main/templates/META-INF/mods.toml @@ -69,7 +69,7 @@ description='''${mod_description}''' # Optional field describing why the dependency is required or why it is incompatible # reason="..." # The version range of the dependency - versionRange="${neo_version_range}" #mandatory + versionRange="[${neo_version},)" #mandatory # An ordering relationship for the dependency. # BEFORE - This mod is loaded BEFORE the dependency # AFTER - This mod is loaded AFTER the dependency