Skip to content

Commit 9d130a0

Browse files
CoolAid48CoolAid48
committed
Fixed wrong imports during merge, and Terraformers maven is broken currently, so I need to use Modrinth's for ModMenu
1 parent 0af02a4 commit 9d130a0

3 files changed

Lines changed: 29 additions & 21 deletions

File tree

‎build.gradle‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,14 @@ base {
1717
}
1818

1919
repositories {
20-
maven { url = "https://maven.terraformersmc.com/releases" }
2120
maven { url = "https://maven.isxander.dev/releases" }
21+
maven {
22+
name = "Modrinth"
23+
url = "https://api.modrinth.com/maven"
24+
content {
25+
includeGroup "maven.modrinth"
26+
}
27+
}
2228

2329
maven {
2430
url = "https://maven.siphalor.de/"
@@ -40,7 +46,7 @@ dependencies {
4046
modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}"
4147
modImplementation "dev.isxander:yet-another-config-lib:${project.yacl_version}"
4248
modImplementation "de.siphalor.amecs.amecs-key-modifiers:${project.amecs_version}"
43-
modImplementation "com.terraformersmc:modmenu:${project.modmenu_version}"
49+
modImplementation "maven.modrinth:modmenu:${project.modmenu_version}"
4450

4551
include "de.siphalor.amecs.amecs-key-modifiers:${project.amecs_version}"
4652
}

‎src/main/java/me/coolaid/enhancedkeybinds/keybindings/BasicSkinLayerTogglesBinds.java‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import com.mojang.blaze3d.platform.InputConstants;
44
import me.coolaid.enhancedkeybinds.config.EnhancedKeybindsConfig;
55
import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientTickEvents;
6-
import net.fabricmc.fabric.api.client.keymapping.v1.KeyMappingHelper;
6+
import net.fabricmc.fabric.api.client.keybinding.v1.KeyBindingHelper;
77
import net.minecraft.ChatFormatting;
88
import net.minecraft.client.KeyMapping;
99
import net.minecraft.client.Minecraft;
@@ -44,12 +44,13 @@ private static void handle(Minecraft client) {
4444
client.options.mainHand().set(newArm);
4545
client.player.setMainArm(newArm);
4646
client.options.save();
47-
client.player.sendOverlayMessage(
47+
client.player.displayClientMessage(
4848
Component.translatable(
4949
"enhancedkeybinds.actionbar.main_hand",
5050
Component.translatable(newArm == HumanoidArm.RIGHT ? "enhancedkeybinds.actionbar.component.right" : "enhancedkeybinds.actionbar.component.left")
5151
.withStyle(ChatFormatting.GREEN)
52-
)
52+
),
53+
true
5354
);
5455
}
5556
}
@@ -67,17 +68,18 @@ private static void toggleAllSkinLayers(Minecraft client) {
6768
client.options.setModelPart(part, anyDisabled);
6869
}
6970

70-
client.player.sendOverlayMessage(
71+
client.player.displayClientMessage(
7172
Component.translatable(
7273
"enhancedkeybinds.actionbar.component.toggled",
7374
Component.translatable("enhancedkeybinds.actionbar.skin-layers"),
7475
Component.translatable(anyDisabled ? "enhancedkeybinds.actionbar.component.enabled" : "enhancedkeybinds.actionbar.component.disabled")
7576
.withStyle(anyDisabled ? ChatFormatting.GREEN : ChatFormatting.RED)
76-
)
77+
),
78+
true
7779
);
7880
}
7981

8082
private static KeyMapping register(String translationKey) {
81-
return KeyMappingHelper.registerKeyMapping(new KeyMapping(translationKey, InputConstants.UNKNOWN.getValue(), RegisterCategories.SKIN_CUSTOMIZATION));
83+
return KeyBindingHelper.registerKeyBinding(new KeyMapping(translationKey, InputConstants.UNKNOWN.getValue(), RegisterCategories.SKIN_CUSTOMIZATION));
8284
}
8385
}

‎src/main/java/me/coolaid/enhancedkeybinds/keybindings/ControlsTogglesBinds.java‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import com.mojang.blaze3d.platform.InputConstants;
44
import me.coolaid.enhancedkeybinds.config.EnhancedKeybindsConfig;
55
import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientTickEvents;
6-
import net.fabricmc.fabric.api.client.keymapping.v1.KeyMappingHelper;
6+
import net.fabricmc.fabric.api.client.keybinding.v1.KeyBindingHelper;
77
import net.minecraft.ChatFormatting;
88
import net.minecraft.client.KeyMapping;
99
import net.minecraft.client.Minecraft;
@@ -61,30 +61,30 @@ private static void handle(Minecraft client) {
6161
while (toggleAutoJump != null && toggleAutoJump.consumeClick()) {
6262
boolean enabled = !client.options.autoJump().get();
6363
client.options.autoJump().set(enabled);
64-
client.player.sendOverlayMessage(stateMessage("enhancedkeybinds.actionbar.auto-jump", enabled));
64+
client.player.displayClientMessage(stateMessage("enhancedkeybinds.actionbar.auto-jump", enabled), true);
6565
}
6666

6767
while (toggleSneak != null && toggleSneak.consumeClick()) {
6868
boolean enabled = !client.options.toggleCrouch().get();
6969
client.options.toggleCrouch().set(enabled);
7070
MutableComponent mode = Component.translatable(enabled ? "enhancedkeybinds.actionbar.component.toggle" : "enhancedkeybinds.actionbar.component.hold")
7171
.withStyle(ChatFormatting.GREEN);
72-
client.player.sendOverlayMessage(Component.translatable("enhancedkeybinds.actionbar.sneaking_mode", mode));
72+
client.player.displayClientMessage(Component.translatable("enhancedkeybinds.actionbar.sneaking_mode", mode), true);
7373
}
7474

7575
while (toggleSprint != null && toggleSprint.consumeClick()) {
7676
boolean enabled = !client.options.toggleSprint().get();
7777
client.options.toggleSprint().set(enabled);
7878
MutableComponent mode = Component.translatable(enabled ? "enhancedkeybinds.actionbar.component.toggle" : "enhancedkeybinds.actionbar.component.hold")
7979
.withStyle(ChatFormatting.GREEN);
80-
client.player.sendOverlayMessage(
81-
Component.translatable("enhancedkeybinds.actionbar.sprinting_mode", mode));
80+
client.player.displayClientMessage(
81+
Component.translatable("enhancedkeybinds.actionbar.sprinting_mode", mode), true);
8282
}
8383

8484
while (toggleClosedCaptions != null && toggleClosedCaptions.consumeClick()) {
8585
boolean enabled = !client.options.showSubtitles().get();
8686
client.options.showSubtitles().set(enabled);
87-
client.player.sendOverlayMessage(stateMessage("enhancedkeybinds.actionbar.closed-captions", enabled));
87+
client.player.displayClientMessage(stateMessage("enhancedkeybinds.actionbar.closed-captions", enabled), true);
8888
}
8989

9090
while (toggleAttackMode != null && toggleAttackMode.consumeClick()) {
@@ -94,7 +94,7 @@ private static void handle(Minecraft client) {
9494
cancelAttackAction(client);
9595
}
9696
client.options.save();
97-
client.player.sendOverlayMessage(modeMessage("enhancedkeybinds.actionbar.attack-destroy", enabled));
97+
client.player.displayClientMessage(modeMessage("enhancedkeybinds.actionbar.attack-destroy", enabled), true);
9898
}
9999

100100
while (toggleUseMode != null && toggleUseMode.consumeClick()) {
@@ -104,22 +104,22 @@ private static void handle(Minecraft client) {
104104
cancelUseAction(client);
105105
}
106106
client.options.save();
107-
client.player.sendOverlayMessage(modeMessage("enhancedkeybinds.actionbar.use-item-place-block", enabled));
107+
client.player.displayClientMessage(modeMessage("enhancedkeybinds.actionbar.use-item-place-block", enabled), true);
108108
}
109109

110110
while (toggleOperatorItemsTab != null && toggleOperatorItemsTab.consumeClick()) {
111111
boolean enabled = !client.options.operatorItemsTab().get();
112112
client.options.operatorItemsTab().set(enabled);
113113
client.options.save();
114-
client.player.sendOverlayMessage(stateMessage("enhancedkeybinds.actionbar.operator-items-tab", enabled));
114+
client.player.displayClientMessage(stateMessage("enhancedkeybinds.actionbar.operator-items-tab", enabled), true);
115115
}
116116

117117
while (cycleChat != null && cycleChat.consumeClick()) {
118118
ChatVisiblity visibility = nextChatVisibility(client.options.chatVisibility().get());
119119
client.options.chatVisibility().set(visibility);
120120
client.options.save();
121-
client.player.sendOverlayMessage(
122-
Component.translatable("enhancedkeybinds.actionbar.chat", chatVisibilityMode(visibility)));
121+
client.player.displayClientMessage(
122+
Component.translatable("enhancedkeybinds.actionbar.chat", chatVisibilityMode(visibility)), true);
123123
}
124124
}
125125

@@ -176,6 +176,6 @@ private static MutableComponent chatVisibilityMode(ChatVisiblity visibility) {
176176
}
177177

178178
private static KeyMapping register(String translationKey) {
179-
return KeyMappingHelper.registerKeyMapping(new KeyMapping(translationKey, InputConstants.UNKNOWN.getValue(), RegisterCategories.CONTROLS));
179+
return KeyBindingHelper.registerKeyBinding(new KeyMapping(translationKey, InputConstants.UNKNOWN.getValue(), RegisterCategories.CONTROLS));
180180
}
181-
}
181+
}

0 commit comments

Comments
 (0)