diff --git a/fabric/build.gradle b/fabric/build.gradle index 6db63be..a08cac0 100644 --- a/fabric/build.gradle +++ b/fabric/build.gradle @@ -20,16 +20,6 @@ repositories { repositories { maven { url = "https://jitpack.io" } } - // OkZoomer - ivy { - url 'https://github.com/joaoh1/OkZoomer/releases/download/' - patternLayout { - artifact '[revision]/[module]-[revision].[ext]' - } - metadataSources() { - artifact() - } - } } configurations { @@ -52,7 +42,7 @@ dependencies { include "com.github.lambdaurora:spruceui:${project.spruceui_version}" // Compatibility mods - modImplementation "io.github.joaoh1:okzoomer:4.0.0-alpha.4.1.16.1" + modImplementation "com.github.joaoh1:okzoomer:4.0.0-alpha.4plus1.1.16.1" modImplementation "me.shedaniel:RoughlyEnoughItems:4.5.5" api project(":core") diff --git a/fabric/src/main/java/me/lambdaurora/lambdacontrols/client/compat/OkZoomerCompat.java b/fabric/src/main/java/me/lambdaurora/lambdacontrols/client/compat/OkZoomerCompat.java index a540531..aa39012 100644 --- a/fabric/src/main/java/me/lambdaurora/lambdacontrols/client/compat/OkZoomerCompat.java +++ b/fabric/src/main/java/me/lambdaurora/lambdacontrols/client/compat/OkZoomerCompat.java @@ -10,10 +10,9 @@ package me.lambdaurora.lambdacontrols.client.compat; import io.github.joaoh1.okzoomer.client.OkZoomerClientMod; -import io.github.joaoh1.okzoomer.main.OkZoomerMod; +import io.github.joaoh1.okzoomer.client.utils.ZoomUtils; import me.lambdaurora.lambdacontrols.client.LambdaControlsClient; import me.lambdaurora.lambdacontrols.client.controller.ButtonBinding; -import org.aperlambda.lambdacommon.Identifier; import org.jetbrains.annotations.NotNull; import org.lwjgl.glfw.GLFW; @@ -39,25 +38,27 @@ public class OkZoomerCompat implements CompatHandler .linkKeybind(OkZoomerClientMod.zoomKeyBinding) .register(); - new ButtonBinding.Builder("zoom.in") - .buttons(GLFW.GLFW_GAMEPAD_BUTTON_DPAD_UP, ButtonBinding.axisAsButton(GLFW.GLFW_GAMEPAD_AXIS_RIGHT_TRIGGER, true)) - .onlyInGame() - .cooldown(true) - .category(ButtonBinding.MISC_CATEGORY) - .linkKeybind(OkZoomerClientMod.increaseZoomKeyBinding) - .register(); - new ButtonBinding.Builder("zoom.out") - .buttons(GLFW.GLFW_GAMEPAD_BUTTON_DPAD_UP, ButtonBinding.axisAsButton(GLFW.GLFW_GAMEPAD_AXIS_LEFT_TRIGGER, true)) - .onlyInGame() - .cooldown(true) - .category(ButtonBinding.MISC_CATEGORY) - .linkKeybind(OkZoomerClientMod.decreaseZoomKeyBinding) - .register(); - new ButtonBinding.Builder("zoom.reset") - .onlyInGame() - .cooldown(true) - .category(ButtonBinding.MISC_CATEGORY) - .linkKeybind(OkZoomerClientMod.resetZoomKeyBinding) - .register(); + if (ZoomUtils.areExtraKeybindsEnabled()) { + new ButtonBinding.Builder("zoom.in") + .buttons(GLFW.GLFW_GAMEPAD_BUTTON_DPAD_UP, ButtonBinding.axisAsButton(GLFW.GLFW_GAMEPAD_AXIS_RIGHT_TRIGGER, true)) + .onlyInGame() + .cooldown(true) + .category(ButtonBinding.MISC_CATEGORY) + .linkKeybind(OkZoomerClientMod.increaseZoomKeyBinding) + .register(); + new ButtonBinding.Builder("zoom.out") + .buttons(GLFW.GLFW_GAMEPAD_BUTTON_DPAD_UP, ButtonBinding.axisAsButton(GLFW.GLFW_GAMEPAD_AXIS_LEFT_TRIGGER, true)) + .onlyInGame() + .cooldown(true) + .category(ButtonBinding.MISC_CATEGORY) + .linkKeybind(OkZoomerClientMod.decreaseZoomKeyBinding) + .register(); + new ButtonBinding.Builder("zoom.reset") + .onlyInGame() + .cooldown(true) + .category(ButtonBinding.MISC_CATEGORY) + .linkKeybind(OkZoomerClientMod.resetZoomKeyBinding) + .register(); + } } }