diff --git a/build.gradle b/build.gradle index 92344d6..c4b6765 100644 --- a/build.gradle +++ b/build.gradle @@ -4,7 +4,7 @@ dependencies { modImplementation("io.gitlab.jfronny.libjf:libjf-config-v0:${project.jfapi_version}") modRuntimeOnly("io.gitlab.jfronny.libjf:libjf-devutil-v0:${project.jfapi_version}") - modImplementation "com.terraformersmc:modmenu:4.0.0-beta.4" + modImplementation "com.terraformersmc:modmenu:4.0.5" // Compat fix include modImplementation(fabricApi.module("fabric-command-api-v2", "${project.fabric_version}")) diff --git a/gradle.properties b/gradle.properties index 2596913..0f32151 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,17 +1,17 @@ # https://fabricmc.net/develop/ -minecraft_version=1.19 +minecraft_version=1.19.1 yarn_mappings=build.1 -loader_version=0.14.6 +loader_version=0.14.8 maven_group=io.gitlab.jfronny archives_base_name=combit -fabric_version=0.55.1+1.19 -jfapi_version=2.9.1 +fabric_version=0.58.5+1.19.1 +jfapi_version=2.10.0 -modrinth_id=oPRrsg3M -modrinth_required_dependencies=WKwQAwke -modrinth_optional_dependencies=mOgUt4GM +modrinth_id=combit +modrinth_required_dependencies=libjf +modrinth_optional_dependencies=modmenu, cloth-config curseforge_id=561742 curseforge_required_dependencies=libjf curseforge_optional_dependencies=modmenu, cloth-config \ No newline at end of file diff --git a/src/main/java/io/gitlab/jfronny/combit/mixin/InGameHudMixin.java b/src/client/java/io/gitlab/jfronny/combit/mixin/InGameHudMixin.java similarity index 100% rename from src/main/java/io/gitlab/jfronny/combit/mixin/InGameHudMixin.java rename to src/client/java/io/gitlab/jfronny/combit/mixin/InGameHudMixin.java diff --git a/src/client/resources/combit.client.mixins.json b/src/client/resources/combit.client.mixins.json new file mode 100644 index 0000000..e2384a4 --- /dev/null +++ b/src/client/resources/combit.client.mixins.json @@ -0,0 +1,12 @@ +{ + "required": true, + "minVersion": "0.8", + "package": "io.gitlab.jfronny.combit.mixin", + "compatibilityLevel": "JAVA_17", + "client": [ + "InGameHudMixin" + ], + "injectors": { + "defaultRequire": 1 + } +} diff --git a/src/main/resources/combit.mixins.json b/src/main/resources/combit.mixins.json index 14d3e04..0f78193 100644 --- a/src/main/resources/combit.mixins.json +++ b/src/main/resources/combit.mixins.json @@ -15,9 +15,6 @@ "SnowballEntityMixin", "ZombieEntityMixin" ], - "client": [ - "InGameHudMixin" - ], "injectors": { "defaultRequire": 1 } diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index 3d91193..0d71a1b 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -20,12 +20,15 @@ ] }, "mixins": [ - "combit.mixins.json" + "combit.mixins.json", + { + "config": "combit.client.mixins.json", + "environment": "client" + } ], "depends": { "fabricloader": ">=0.12.12", "minecraft": "*", - "libjf-unsafe-v0": ">=2.7.2", "libjf-config-v0": ">=2.7.2" } }