Merge pull request #21 from joaoh1/1.16

🚸 Hide Ok Zoomer's extra keybinds when disabled
This commit is contained in:
LambdAurora
2020-07-31 21:40:44 +02:00
committed by GitHub
2 changed files with 24 additions and 33 deletions

View File

@@ -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")

View File

@@ -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,6 +38,7 @@ public class OkZoomerCompat implements CompatHandler
.linkKeybind(OkZoomerClientMod.zoomKeyBinding)
.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()
@@ -61,3 +61,4 @@ public class OkZoomerCompat implements CompatHandler
.register();
}
}
}