Motschen/MidnightControls
1
0
Fork 0
mirror of https://github.com/TeamMidnightDust/MidnightControls.git synced 2025-12-14 07:35:10 +01:00
Code Issues Packages Projects Releases Wiki Activity

Update and fix Ok Zoomer compatibility (#68)

Browse Source
This commit is contained in:
Ennui Langeweile
2021-07-14 20:28:02 -03:00
committed by GitHub
parent d08647b3fc
commit 5d5d808403
9 changed files with 30 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
build.gradle
View File

@@ -94,6 +94,7 @@ repositories {
} }
} }
maven { url 'https://maven.shedaniel.me/' } maven { url 'https://maven.shedaniel.me/' }
maven { url 'https://jitpack.io' }
} }
configurations { configurations {
@@ -116,10 +117,10 @@ dependencies {
modImplementation "com.terraformersmc:modmenu:${project.modmenu_version}" modImplementation "com.terraformersmc:modmenu:${project.modmenu_version}"
// Compatibility mods // Compatibility mods
/*modImplementation("com.github.joaoh1:okzoomer:e13183c59b") { modImplementation("com.github.EnnuiL:okzoomer:e6a801b1a3") {
exclude group: 'me.shedaniel.cloth' exclude group: 'com.terraformersmc'
exclude group: 'io.github.prospector' exclude group: 'dev.lambdaurora'
}*/ }
shadow 'com.electronwill.night-config:core:3.6.3' shadow 'com.electronwill.night-config:core:3.6.3'
shadow 'com.electronwill.night-config:toml:3.6.3' shadow 'com.electronwill.night-config:toml:3.6.3'

4
src/main/java/dev/lambdaurora/lambdacontrols/client/compat/LambdaControlsCompat.java
View File

@@ -39,11 +39,11 @@ public class LambdaControlsCompat {
* @param mod the mod instance * @param mod the mod instance
*/ */
public static void init(@NotNull LambdaControlsClient mod) { public static void init(@NotNull LambdaControlsClient mod) {
/*if (FabricLoader.getInstance().isModLoaded("okzoomer")) { if (FabricLoader.getInstance().isModLoaded("okzoomer")) {
mod.log("Adding okzoomer compatibility..."); mod.log("Adding okzoomer compatibility...");
HANDLERS.add(new OkZoomerCompat()); HANDLERS.add(new OkZoomerCompat());
} }
if (isReiPresent()) { /*if (isReiPresent()) {
mod.log("Adding REI compatiblity..."); mod.log("Adding REI compatiblity...");
HANDLERS.add(new ReiCompat()); HANDLERS.add(new ReiCompat());
}*/ }*/

7
src/main/java/dev/lambdaurora/lambdacontrols/client/compat/OkZoomerCompat.java
View File

@@ -10,7 +10,10 @@
package dev.lambdaurora.lambdacontrols.client.compat; package dev.lambdaurora.lambdacontrols.client.compat;
import dev.lambdaurora.lambdacontrols.client.LambdaControlsClient; import dev.lambdaurora.lambdacontrols.client.LambdaControlsClient;
import dev.lambdaurora.lambdacontrols.client.controller.ButtonBinding;
import io.github.ennuil.okzoomer.keybinds.ZoomKeybinds;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.lwjgl.glfw.GLFW;
/** /**
* Represents a compatibility handler for OkZoomer. * Represents a compatibility handler for OkZoomer.
@@ -22,7 +25,7 @@ import org.jetbrains.annotations.NotNull;
public class OkZoomerCompat implements CompatHandler { public class OkZoomerCompat implements CompatHandler {
@Override @Override
public void handle(@NotNull LambdaControlsClient mod) { public void handle(@NotNull LambdaControlsClient mod) {
/*new ButtonBinding.Builder("zoom") new ButtonBinding.Builder("zoom")
.buttons(GLFW.GLFW_GAMEPAD_BUTTON_DPAD_UP, GLFW.GLFW_GAMEPAD_BUTTON_X) .buttons(GLFW.GLFW_GAMEPAD_BUTTON_DPAD_UP, GLFW.GLFW_GAMEPAD_BUTTON_X)
.onlyInGame() .onlyInGame()
.cooldown(true) .cooldown(true)
@@ -51,6 +54,6 @@ public class OkZoomerCompat implements CompatHandler {
.category(ButtonBinding.MISC_CATEGORY) .category(ButtonBinding.MISC_CATEGORY)
.linkKeybind(ZoomKeybinds.resetZoomKey) .linkKeybind(ZoomKeybinds.resetZoomKey)
.register(); .register();
}*/ }
} }
} }

6
src/main/resources/assets/lambdacontrols/lang/en_us.json
View File

@@ -32,9 +32,9 @@
"lambdacontrols.action.toggle_smooth_camera": "Toggle Cinematic Camera", "lambdacontrols.action.toggle_smooth_camera": "Toggle Cinematic Camera",
"lambdacontrols.action.use": "Use", "lambdacontrols.action.use": "Use",
"lambdacontrols.action.zoom": "Zoom", "lambdacontrols.action.zoom": "Zoom",
"lambdacontrols.action.zoom.in": "Increase Zoom", "lambdacontrols.action.zoom_in": "Increase Zoom",
"lambdacontrols.action.zoom.out": "Decrease Zoom", "lambdacontrols.action.zoom_out": "Decrease Zoom",
"lambdacontrols.action.zoom.reset": "Reset Zoom", "lambdacontrols.action.zoom_reset": "Reset Zoom",
"lambdacontrols.button.a": "A", "lambdacontrols.button.a": "A",
"lambdacontrols.button.b": "B", "lambdacontrols.button.b": "B",
"lambdacontrols.button.x": "X", "lambdacontrols.button.x": "X",

6
src/main/resources/assets/lambdacontrols/lang/es_mx.json
View File

@@ -32,9 +32,9 @@
"lambdacontrols.action.toggle_smooth_camera": "Cambiar cámara cinematográfica", "lambdacontrols.action.toggle_smooth_camera": "Cambiar cámara cinematográfica",
"lambdacontrols.action.use": "Usar", "lambdacontrols.action.use": "Usar",
"lambdacontrols.action.zoom": "Zoom", "lambdacontrols.action.zoom": "Zoom",
"lambdacontrols.action.zoom.in": "Aumentar zoom", "lambdacontrols.action.zoom_in": "Aumentar zoom",
"lambdacontrols.action.zoom.out": "Disminuir zoom", "lambdacontrols.action.zoom_out": "Disminuir zoom",
"lambdacontrols.action.zoom.reset": "Restablecer zoom", "lambdacontrols.action.zoom_reset": "Restablecer zoom",
"lambdacontrols.button.a": "A", "lambdacontrols.button.a": "A",
"lambdacontrols.button.b": "B", "lambdacontrols.button.b": "B",
"lambdacontrols.button.x": "X", "lambdacontrols.button.x": "X",

6
src/main/resources/assets/lambdacontrols/lang/fr_ca.json
View File

@@ -32,9 +32,9 @@
"lambdacontrols.action.toggle_smooth_camera": "Basculer en mode cinématique", "lambdacontrols.action.toggle_smooth_camera": "Basculer en mode cinématique",
"lambdacontrols.action.use": "Utiliser", "lambdacontrols.action.use": "Utiliser",
"lambdacontrols.action.zoom": "Zoom", "lambdacontrols.action.zoom": "Zoom",
"lambdacontrols.action.zoom.in": "Augmenter le zoom", "lambdacontrols.action.zoom_in": "Augmenter le zoom",
"lambdacontrols.action.zoom.out": "Diminuer le zoom", "lambdacontrols.action.zoom_out": "Diminuer le zoom",
"lambdacontrols.action.zoom.reset": "Remettre le zoom à zéro", "lambdacontrols.action.zoom_reset": "Remettre le zoom à zéro",
"lambdacontrols.button.a": "A", "lambdacontrols.button.a": "A",
"lambdacontrols.button.b": "B", "lambdacontrols.button.b": "B",
"lambdacontrols.button.x": "X", "lambdacontrols.button.x": "X",

6
src/main/resources/assets/lambdacontrols/lang/fr_fr.json
View File

@@ -32,9 +32,9 @@
"lambdacontrols.action.toggle_smooth_camera": "Basculer en mode cinématique", "lambdacontrols.action.toggle_smooth_camera": "Basculer en mode cinématique",
"lambdacontrols.action.use": "Utiliser", "lambdacontrols.action.use": "Utiliser",
"lambdacontrols.action.zoom": "Zoom", "lambdacontrols.action.zoom": "Zoom",
"lambdacontrols.action.zoom.in": "Augmenter le zoom", "lambdacontrols.action.zoom_in": "Augmenter le zoom",
"lambdacontrols.action.zoom.out": "Diminuer le zoom", "lambdacontrols.action.zoom_out": "Diminuer le zoom",
"lambdacontrols.action.zoom.reset": "Remettre le zoom à zéro", "lambdacontrols.action.zoom_reset": "Remettre le zoom à zéro",
"lambdacontrols.button.a": "A", "lambdacontrols.button.a": "A",
"lambdacontrols.button.b": "B", "lambdacontrols.button.b": "B",
"lambdacontrols.button.x": "X", "lambdacontrols.button.x": "X",

6
src/main/resources/assets/lambdacontrols/lang/tr_tr.json
View File

@@ -32,9 +32,9 @@
"lambdacontrols.action.toggle_smooth_camera": "Sinemaitk Kameraya Geçme", "lambdacontrols.action.toggle_smooth_camera": "Sinemaitk Kameraya Geçme",
"lambdacontrols.action.use": "Kullanma", "lambdacontrols.action.use": "Kullanma",
"lambdacontrols.action.zoom": "Büyütme", "lambdacontrols.action.zoom": "Büyütme",
"lambdacontrols.action.zoom.in": "Büyütmeyi Arttır", "lambdacontrols.action.zoom_in": "Büyütmeyi Arttır",
"lambdacontrols.action.zoom.out": "Büyütmeyi Azalt", "lambdacontrols.action.zoom_out": "Büyütmeyi Azalt",
"lambdacontrols.action.zoom.reset": "Büyütmeyi Sıfırla", "lambdacontrols.action.zoom_reset": "Büyütmeyi Sıfırla",
"lambdacontrols.button.a": "A", "lambdacontrols.button.a": "A",
"lambdacontrols.button.b": "B", "lambdacontrols.button.b": "B",
"lambdacontrols.button.x": "X", "lambdacontrols.button.x": "X",

6
src/main/resources/assets/lambdacontrols/lang/zh_cn.json
View File

@@ -32,9 +32,9 @@
"lambdacontrols.action.toggle_smooth_camera": "切换电影视角", "lambdacontrols.action.toggle_smooth_camera": "切换电影视角",
"lambdacontrols.action.use": "使用物品/放置方块", "lambdacontrols.action.use": "使用物品/放置方块",
"lambdacontrols.action.zoom": "视野缩放", "lambdacontrols.action.zoom": "视野缩放",
"lambdacontrols.action.zoom.in": "缩放时将视野推近", "lambdacontrols.action.zoom_in": "缩放时将视野推近",
"lambdacontrols.action.zoom.out": "缩放时将视野拉远", "lambdacontrols.action.zoom_out": "缩放时将视野拉远",
"lambdacontrols.action.zoom.reset": "缩放时重置缩放距离", "lambdacontrols.action.zoom_reset": "缩放时重置缩放距离",
"lambdacontrols.button.a": "A", "lambdacontrols.button.a": "A",
"lambdacontrols.button.b": "B", "lambdacontrols.button.b": "B",
"lambdacontrols.button.x": "X", "lambdacontrols.button.x": "X",