Skip to content

Commit

Permalink
Add keybind configuration (#176)
Browse files Browse the repository at this point in the history
* add keybind api

Signed-off-by: CyberFlame <cyberflameu@gmail.com>

* implement feature

Signed-off-by: Aaron Lowe <cyberflameu@gmail.com>

* add translations, bump version

Signed-off-by: Aaron Lowe <cyberflameu@gmail.com>

---------

Signed-off-by: CyberFlame <cyberflameu@gmail.com>
Signed-off-by: Aaron Lowe <cyberflameu@gmail.com>
  • Loading branch information
CyberFlameGO authored Oct 15, 2024
1 parent c006e02 commit ae81bd0
Show file tree
Hide file tree
Showing 12 changed files with 65 additions and 30 deletions.
3 changes: 2 additions & 1 deletion .idea/modules.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

18 changes: 18 additions & 0 deletions .idea/modules/cyberflame.IdeaProjects.viewmodel-changer.main.iml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

18 changes: 18 additions & 0 deletions .idea/modules/cyberflame.IdeaProjects.viewmodel-changer.test.iml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .idea/runConfigurations/Minecraft_Server.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ org.gradle.jvmargs=-Xmx4G
# check these on https://modmuss50.me/fabric.html
minecraft_version=1.21.1
yarn_mappings=1.21.1+build.3
loader_version=0.16.5
loader_version=0.16.7
# Mod Properties
mod_version=1.10.2
mod_version=1.10.3
maven_group=net.cyberflame
archives_base_name=viewmodel
# Dependencies
Expand Down
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
1 change: 0 additions & 1 deletion settings.gradle
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
pluginManagement {
repositories {
jcenter()
maven {
name = 'Fabric'
url = 'https://maven.fabricmc.net/'
Expand Down
17 changes: 17 additions & 0 deletions src/main/java/net/cyberflame/viewmodel/Viewmodel.java
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,20 @@

import net.cyberflame.viewmodel.config.LoadConfig;
import net.cyberflame.viewmodel.config.SaveConfig;
import net.cyberflame.viewmodel.gui.ViewmodelScreen;
import net.cyberflame.viewmodel.settings.Setting;
import net.cyberflame.viewmodel.settings.SettingType;
import net.fabricmc.api.ModInitializer;
import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientTickEvents;
import net.fabricmc.fabric.api.client.keybinding.v1.KeyBindingHelper;
import net.minecraft.client.option.KeyBinding;
import net.minecraft.client.util.InputUtil;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.jetbrains.annotations.Contract;
import org.jetbrains.annotations.NonNls;
import org.jetbrains.annotations.NotNull;
import org.lwjgl.glfw.GLFW;

import java.io.IOException;
import java.util.ArrayList;
Expand All @@ -25,6 +31,7 @@ public class Viewmodel implements ModInitializer {
private static final List<Setting<?>> SETTINGS = Arrays.stream(SettingType.values())
.map(SettingType::getSetting)
.collect(Collectors.toList());
private static KeyBinding keyBinding;

@Contract(value = " -> new", pure = true)
public static @NotNull List<Setting<?>> getSettings() {
Expand All @@ -45,6 +52,16 @@ public final void onInitialize() {
} catch (IOException e) {
LOGGER.error("Failed to load settings!", e);
}
keyBinding = KeyBindingHelper.registerKeyBinding(
new KeyBinding("key.viewmodel.open", InputUtil.Type.KEYSYM,
GLFW.GLFW_KEY_BACKSLASH, "category.viewmodel.menu"));
ClientTickEvents.END_CLIENT_TICK.register(client -> {
while (keyBinding.wasPressed()) {
if (client.world != null) {
client.setScreen(new ViewmodelScreen());
}
}
});
getRuntime().addShutdownHook(new Thread(SaveConfig::saveAllSettings));
}

Expand Down
22 changes: 0 additions & 22 deletions src/main/java/net/cyberflame/viewmodel/mixin/MixinKeyboard.java

This file was deleted.

4 changes: 4 additions & 0 deletions src/main/resources/assets/viewmodel/lang/en_us.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"category.viewmodel.menu": "Viewmodel",
"key.viewmodel.open": "Open Viewmodel Settings"
}
3 changes: 2 additions & 1 deletion src/main/resources/fabric.mod.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
"fabricloader": ">=0.15.1",
"minecraft": "~1.21.1",
"java": ">=21",
"fabric-api": "*"
"fabric-api": "*",
"fabric-key-binding-api-v1": "*"
}
}
3 changes: 1 addition & 2 deletions src/main/resources/viewmodel.mixins.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,7 @@
"package": "net.cyberflame.viewmodel.mixin",
"compatibilityLevel": "JAVA_21",
"mixins": [
"MixinHeldItemRenderer",
"MixinKeyboard"
"MixinHeldItemRenderer"
],
"client": [
],
Expand Down

0 comments on commit ae81bd0

Please sign in to comment.