This commit is contained in:
Timofey Gelazoniya 2024-09-24 16:43:44 +03:00
parent 7a643a541d
commit 63274c088a
Signed by: zeldon
GPG Key ID: 047886915281DD2A
7 changed files with 18 additions and 17 deletions

View File

@ -12,7 +12,7 @@ jobs:
matrix: matrix:
# Use these Java versions # Use these Java versions
java: [ java: [
17, # Current Java LTS & minimum supported by Minecraft 21, # Current Java LTS & minimum supported by Minecraft
] ]
# and run on both Linux and Windows # and run on both Linux and Windows
os: [ubuntu-20.04, windows-2022] os: [ubuntu-20.04, windows-2022]
@ -32,7 +32,7 @@ jobs:
- name: build - name: build
run: ./gradlew build run: ./gradlew build
- name: capture build artifacts - name: capture build artifacts
if: ${{ runner.os == 'Linux' && matrix.java == '17' }} # Only upload artifacts built from latest java on one OS if: ${{ runner.os == 'Linux' && matrix.java == '21' }} # Only upload artifacts built from latest java on one OS
uses: actions/upload-artifact@v2 uses: actions/upload-artifact@v2
with: with:
name: Artifacts name: Artifacts

View File

@ -1,10 +1,10 @@
plugins { plugins {
id 'fabric-loom' version '0.12-SNAPSHOT' id 'fabric-loom' version '1.7-SNAPSHOT'
id 'maven-publish' id 'maven-publish'
} }
sourceCompatibility = JavaVersion.VERSION_17 sourceCompatibility = JavaVersion.VERSION_21
targetCompatibility = JavaVersion.VERSION_17 targetCompatibility = JavaVersion.VERSION_21
archivesBaseName = project.archives_base_name archivesBaseName = project.archives_base_name
version = project.mod_version version = project.mod_version
@ -37,8 +37,7 @@ processResources {
} }
tasks.withType(JavaCompile).configureEach { tasks.withType(JavaCompile).configureEach {
// Minecraft 1.18 (1.18-pre2) upwards uses Java 17. it.options.release = 21
it.options.release = 17
} }
java { java {

View File

@ -3,14 +3,14 @@ org.gradle.jvmargs=-Xmx1G
# Fabric Properties # Fabric Properties
# check these on https://fabricmc.net/develop # check these on https://fabricmc.net/develop
minecraft_version=1.20.1 minecraft_version=1.21.1
yarn_mappings=1.20.1+build.2 yarn_mappings=1.21.1+build.3
loader_version=0.14.21 loader_version=0.16.2
# Mod Properties # Mod Properties
mod_version = 1.1.2-1.20.1 mod_version = 1.1.2-1.21.1
maven_group = ru.xzeldon.removeblockoutline maven_group = ru.xzeldon.removeblockoutline
archives_base_name = removeblockoutline archives_base_name = removeblockoutline
# Dependencies # Dependencies
fabric_version=0.83.1+1.20.1 fabric_version=0.102.1+1.21.1

View File

@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-bin.zip
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists

2
gradlew.bat vendored
View File

@ -13,6 +13,8 @@
@rem See the License for the specific language governing permissions and @rem See the License for the specific language governing permissions and
@rem limitations under the License. @rem limitations under the License.
@rem @rem
@rem SPDX-License-Identifier: Apache-2.0
@rem
@if "%DEBUG%" == "" @echo off @if "%DEBUG%" == "" @echo off
@rem ########################################################################## @rem ##########################################################################

View File

@ -31,10 +31,10 @@
], ],
"depends": { "depends": {
"fabricloader": ">=0.14.6", "fabricloader": ">=0.16.2",
"fabric": "*", "fabric": "*",
"minecraft": "~1.20", "minecraft": "~1.21.1",
"java": ">=17" "java": ">=21"
}, },
"suggests": { "suggests": {
"another-mod": "*" "another-mod": "*"

View File

@ -2,7 +2,7 @@
"required": true, "required": true,
"minVersion": "0.8", "minVersion": "0.8",
"package": "ru.xzeldon.removeblockoutline.mixin", "package": "ru.xzeldon.removeblockoutline.mixin",
"compatibilityLevel": "JAVA_17", "compatibilityLevel": "JAVA_21",
"mixins": [ "mixins": [
], ],
"client": [ "client": [