Skip to content

Commit

Permalink
1.21 build & gradle update
Browse files Browse the repository at this point in the history
  • Loading branch information
Leronus committed Aug 9, 2024
1 parent eaa28dd commit 24288f4
Show file tree
Hide file tree
Showing 8 changed files with 42 additions and 48 deletions.
9 changes: 9 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
#
# https://help.github.com/articles/dealing-with-line-endings/
#
# Linux start script should use lf
/gradlew text eol=lf

# These are Windows script files and should use crlf
*.bat text eol=crlf

27 changes: 6 additions & 21 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -38,18 +38,6 @@ repositories {
}
}

loom {
splitEnvironmentSourceSets()

mods {
"mores" {
sourceSet sourceSets.main
sourceSet sourceSets.client
}
}

}

fabricApi {
configureDataGeneration()
}
Expand Down Expand Up @@ -106,7 +94,7 @@ processResources {
}

tasks.withType(JavaCompile).configureEach {
it.options.release = 17
it.options.release = 21
}

java {
Expand All @@ -115,8 +103,8 @@ java {
// If you remove this line, sources will not be generated.
withSourcesJar()

sourceCompatibility = JavaVersion.VERSION_17
targetCompatibility = JavaVersion.VERSION_17
sourceCompatibility = JavaVersion.VERSION_21
targetCompatibility = JavaVersion.VERSION_21
}

jar {
Expand All @@ -128,16 +116,13 @@ jar {
// configure the maven publication
publishing {
publications {
mavenJava(MavenPublication) {
create("mavenJava", MavenPublication) {
artifactId = project.archives_base_name
from components.java
}
}

// See https://docs.gradle.org/current/userguide/publishing_maven.html for information on how to set up publishing.
repositories {
// Add repositories to publish to here.
// Notice: This block does NOT have the same function as the block in the top level.
// The repositories here will be used for publishing your artifact, not for
// retrieving dependencies.
//
}
}
24 changes: 12 additions & 12 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ org.gradle.parallel=true

# Fabric Properties
# check these on https://fabricmc.net/develop
minecraft_version=1.20.6
yarn_mappings=1.20.6+build.3
minecraft_version=1.21
yarn_mappings=1.21+build.9
loader_version=0.15.11

# Mod Properties
Expand All @@ -14,18 +14,18 @@ maven_group=mod.leronus.mores
archives_base_name=mores

# Dependencies
fabric_version=0.100.8+1.20.6
sodium_version=mc1.20.6-0.5.11
lithium_version=mc1.20.6-0.12.5
fabric_version=0.102.0+1.21
sodium_version=mc1.21-0.5.11
lithium_version=mc1.21-0.12.7

iris_version=1.7.2+1.20.6
indium_version=1.0.34+mc1.20.1
iris_version=1.7.3+1.21
indium_version=1.0.34+mc1.21

entity_culling_version=1.6.6
continuity_version=3.0.0-beta.5+1.20.5
nvidium_version=0.2.7-beta
continuity_version=3.0.0-beta.5+1.21
nvidium_version=0.2.9-beta

fabric_shield_lib_version=1.7.2-1.20.6
midnightlib_version=1.5.5-fabric
mod_menu_version=10.0.0
fabric_shield_lib_version=1.7.2-1.21
midnightlib_version=1.5.7-fabric
mod_menu_version=11.0.1
fabricasm_version=2.3
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
2 changes: 1 addition & 1 deletion gradlew
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
# Darwin, MinGW, and NonStop.
#
# (3) This script is generated from the Groovy template
# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
# within the Gradle project.
#
# You can find Gradle at https://github.com/gradle/gradle/.
Expand Down
20 changes: 10 additions & 10 deletions gradlew.bat
Original file line number Diff line number Diff line change
Expand Up @@ -43,11 +43,11 @@ set JAVA_EXE=java.exe
%JAVA_EXE% -version >NUL 2>&1
if %ERRORLEVEL% equ 0 goto execute

echo.
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
echo.
echo Please set the JAVA_HOME variable in your environment to match the
echo location of your Java installation.
echo. 1>&2
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
echo. 1>&2
echo Please set the JAVA_HOME variable in your environment to match the 1>&2
echo location of your Java installation. 1>&2

goto fail

Expand All @@ -57,11 +57,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe

if exist "%JAVA_EXE%" goto execute

echo.
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
echo.
echo Please set the JAVA_HOME variable in your environment to match the
echo location of your Java installation.
echo. 1>&2
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
echo. 1>&2
echo Please set the JAVA_HOME variable in your environment to match the 1>&2
echo location of your Java installation. 1>&2

goto fail

Expand Down
6 changes: 3 additions & 3 deletions src/main/resources/fabric.mod.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,9 @@
"mores.mixins.json"
],
"depends": {
"fabricloader": ">=0.15.3",
"minecraft": "~1.20.1",
"java": ">=17",
"fabricloader": ">=0.15.11",
"minecraft": "~1.21",
"java": ">=21",
"fabric-api": "*"
},
"suggests": {
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/mores.mixins.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"required": true,
"package": "mod.leronus.mores.mixin",
"compatibilityLevel": "JAVA_17",
"compatibilityLevel": "JAVA_21",
"mixins": [
"MoresMixin",
"BlockMixin",
Expand Down

0 comments on commit 24288f4

Please sign in to comment.