diff --git a/build.gradle b/build.gradle index 27a6b2b..49bd830 100644 --- a/build.gradle +++ b/build.gradle @@ -35,16 +35,20 @@ dependencies { modImplementation "net.fabricmc:fabric-loader:${project.loader_version}" // Fabric API - modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}" - /* + //modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}" modIncludeImplementation(fabricApi.module("fabric-api-base", project.fabric_version)) modIncludeImplementation(fabricApi.module("fabric-rendering-data-attachment-v1", project.fabric_version)) modIncludeImplementation(fabricApi.module("fabric-lifecycle-events-v1", project.fabric_version)) - */ - + modIncludeImplementation(fabricApi.module("fabric-registry-sync-v0", project.fabric_version)) // Cloth Config - modIncludeImplementation("me.shedaniel.cloth:cloth-config-fabric:${project.cloth_config_version}") + modIncludeImplementation("me.shedaniel.cloth:cloth-config-fabric:${project.cloth_config_version}"){ + exclude(group: "net.fabricmc.fabric-api") + } + // Cloth devs wont update fabric api, so you cant use it certain versions without excluding it's fabric api + // but because you excluded its instance of fabric api, you need to re-add the bits it uses + modIncludeImplementation(fabricApi.module("fabric-screen-api-v1", project.fabric_version)) + modIncludeImplementation(fabricApi.module("fabric-resource-loader-v0", project.fabric_version)) // Mod Menu modImplementation("com.terraformersmc:modmenu:${project.mod_menu_version}") diff --git a/gradle.properties b/gradle.properties index a9f8189..04c921d 100644 --- a/gradle.properties +++ b/gradle.properties @@ -6,7 +6,7 @@ org.gradle.jvmargs=-Xmx1G # check these on https://fabricmc.net/develop/ minecraft_version=1.18.2 yarn_mappings=1.18.2+build.3 - loader_version=0.14.5 + loader_version=0.14.6 # Mod Properties mod_version = 2.0.0 @@ -14,6 +14,6 @@ org.gradle.jvmargs=-Xmx1G archives_base_name = HorseBuff # Dependencies - fabric_version=0.51.1+1.18.2 - cloth_config_version=6.0.42 + fabric_version=0.53.4+1.18.2 + cloth_config_version=6.2.62 mod_menu_version=3.0.0 diff --git a/src/main/java/net/F53/HorseBuff/mixin/Client/InventoryAccessor.java b/src/main/java/net/F53/HorseBuff/mixin/Client/InventoryAccessor.java index a37febe..3cd4403 100644 --- a/src/main/java/net/F53/HorseBuff/mixin/Client/InventoryAccessor.java +++ b/src/main/java/net/F53/HorseBuff/mixin/Client/InventoryAccessor.java @@ -20,8 +20,8 @@ public abstract class InventoryAccessor { @Shadow @Nullable public ClientPlayerEntity player; - @Redirect(method="net/minecraft/client/MinecraftClient.handleInputEvents()V", at = @At(value = "INVOKE", target = "net/minecraft/client/network/ClientPlayerEntity.openRidingInventory ()V")) - void teergtoind(ClientPlayerEntity instance){ + @Redirect(method= "handleInputEvents()V", at = @At(value = "INVOKE", target = "net/minecraft/client/network/ClientPlayerEntity.openRidingInventory ()V")) + void playerInventoryAccess(ClientPlayerEntity instance){ assert this.player != null; if (MinecraftClient.getInstance().options.sprintKey.isPressed()) { tutorialManager.onInventoryOpened(); diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index 84bc434..dc8548b 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -32,7 +32,7 @@ ], "depends": { - "fabricloader": ">=0.13.3", + "fabricloader": ">=0.14.6", "minecraft": "1.18.x", "java": ">=17" }