diff --git a/build.gradle b/build.gradle index 4ddce049f..8c652609d 100644 --- a/build.gradle +++ b/build.gradle @@ -1,5 +1,5 @@ plugins { - id 'fabric-loom' version '1.7-SNAPSHOT' + id 'fabric-loom' version '1.8-SNAPSHOT' id 'maven-publish' } @@ -24,9 +24,9 @@ dependencies { //modImplementation "curse.maven:litematica-${project.minecraft_version_out}-308892:${project.litematica_fileid}" //modImplementation "curse.maven:malilib-${project.minecraft_version_out}-303119:${project.malilib_fileid}" - modImplementation "fi.dy.masa.malilib:malilib-fabric-${project.minecraft_version_out}:${project.malilib_version}" + //modImplementation "fi.dy.masa.malilib:malilib-fabric-${project.minecraft_version_out}:${project.malilib_version}" //modImplementation "fi.dy.masa.litematica:litematica-fabric-${project.minecraft_version_out}:${project.litematica_version}" - //modImplementation "com.github.sakura-ryoko:malilib:${project.malilib_id}" + modImplementation "com.github.sakura-ryoko:malilib:${project.malilib_id}" modImplementation "com.github.sakura-ryoko:litematica:${project.litematica_id}" include(modApi(fabricApi.module("fabric-networking-api-v1", project.fabric_api_version))) diff --git a/gradle.properties b/gradle.properties index f5b6ccf3a..270895c50 100644 --- a/gradle.properties +++ b/gradle.properties @@ -10,21 +10,22 @@ mod_name = Syncmatica mod_file_name = syncmatica-fabric # Mod Version -mod_version = 0.3.12-sakura.6 +mod_version = 0.3.12-sakura.7 # Dependencies (malilib, litematica) #malilib_fileid=4946328 #litematica_fileid=4946471 -malilib_version = 0.20.0 -litematica_version = 0.19.0 +malilib_version = 0.22.0-sakura.1 +malilib_id = cedafa9370 -litematica_id = cb4d3d4722 +litematica_version = 0.20.0-sakura.1 +litematica_id = ee96b722e7 # Minecraft, Fabric Loader and API and mappings versions -minecraft_version_out = 1.21 -minecraft_version = 1.21 -mappings_version = 1.21+build.9 +minecraft_version_out = 1.21.2 +minecraft_version = 1.21.2 +mappings_version = 1.21.2+build.1 -fabric_loader_version = 0.15.11 -mod_menu_version = 11.0.1 -fabric_api_version = 0.100.7+1.21 +fabric_loader_version = 0.16.7 +mod_menu_version = 12.0.0-beta.1 +fabric_api_version = 0.106.1+1.21.2 diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index e6441136f..a4b76b953 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 09523c0e5..df97d72b8 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.9-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/gradlew b/gradlew index 1aa94a426..f5feea6d6 100755 --- a/gradlew +++ b/gradlew @@ -15,6 +15,8 @@ # See the License for the specific language governing permissions and # limitations under the License. # +# SPDX-License-Identifier: Apache-2.0 +# ############################################################################## # @@ -55,7 +57,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/. @@ -84,7 +86,8 @@ done # shellcheck disable=SC2034 APP_BASE_NAME=${0##*/} # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) -APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit +APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s +' "$PWD" ) || exit # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD=maximum diff --git a/gradlew.bat b/gradlew.bat index 25da30dbd..9d21a2183 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -13,6 +13,8 @@ @rem See the License for the specific language governing permissions and @rem limitations under the License. @rem +@rem SPDX-License-Identifier: Apache-2.0 +@rem @if "%DEBUG%"=="" @echo off @rem ########################################################################## diff --git a/src/main/java/ch/endte/syncmatica/litematica_mixin/MixinSchematicPlacement.java b/src/main/java/ch/endte/syncmatica/litematica_mixin/MixinSchematicPlacement.java index 3485107f4..5f5efed70 100644 --- a/src/main/java/ch/endte/syncmatica/litematica_mixin/MixinSchematicPlacement.java +++ b/src/main/java/ch/endte/syncmatica/litematica_mixin/MixinSchematicPlacement.java @@ -52,7 +52,7 @@ private static void loadSyncmatic(final JsonObject obj, final CallbackInfoReturn } } - @Inject(method = "", at = @At("TAIL"), remap = false) + @Inject(method = "(Lfi/dy/masa/litematica/schematic/LitematicaSchematic;Lnet/minecraft/util/math/BlockPos;Ljava/lang/String;ZZ)V", at = @At("TAIL"), remap = false) public void setNull(final LitematicaSchematic schematic, final BlockPos origin, final String name, final boolean enabled, final boolean enableRender, final CallbackInfo ci) { serverId = null; } diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index 0d43a12af..15615b6a3 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -23,12 +23,12 @@ "syncmatica.litematica_mixin.json" ], "depends": { - "minecraft": ">=1.21 <=1.21.1", - "fabric-networking-api-v1": ">=4.1.0" + "minecraft": "1.21.2", + "fabric-networking-api-v1": ">=4.3.3" }, "suggests": { - "litematica": ">=0.19.0", - "malilib": ">=0.20.0" + "litematica": ">=0.20.0.sakura.1", + "malilib": ">=0.22.0-sakura.1" }, "icon": "assets/syncmatica/icon/logo.png",