Add keybind translations & some renames

DFOnline · Feb 23, 2024 · 908267d · 908267d
1 parent f405bb2
commit 908267d
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 21 deletions.
diff --git a/src/main/java/dev/dfonline/codeclient/CodeClient.java b/src/main/java/dev/dfonline/codeclient/CodeClient.java
@@ -4,7 +4,7 @@
 import dev.dfonline.codeclient.action.Action;
 import dev.dfonline.codeclient.action.None;
 import dev.dfonline.codeclient.config.Config;
-import dev.dfonline.codeclient.dev.BuildClip;
+import dev.dfonline.codeclient.dev.BuildPhaser;
 import dev.dfonline.codeclient.dev.Debug.Debug;
 import dev.dfonline.codeclient.dev.LastPos;
 import dev.dfonline.codeclient.dev.NoClip;
@@ -34,13 +34,9 @@
 import net.minecraft.network.listener.PacketListener;
 import net.minecraft.network.packet.Packet;
 import net.minecraft.network.packet.c2s.play.CommandExecutionC2SPacket;
-import net.minecraft.network.packet.c2s.play.PlayerInteractBlockC2SPacket;
 import net.minecraft.network.packet.s2c.play.CloseScreenS2CPacket;
-import net.minecraft.network.packet.s2c.play.EntityVelocityUpdateS2CPacket;
-import net.minecraft.network.packet.s2c.play.ParticleS2CPacket;
 import net.minecraft.util.Identifier;
 import net.minecraft.util.math.BlockPos;
-import org.apache.commons.logging.Log;
 import org.jetbrains.annotations.NotNull;
 import org.lwjgl.glfw.GLFW;
 import org.slf4j.Logger;
@@ -74,15 +70,15 @@ public class CodeClient implements ModInitializer {
     public static boolean shouldReload = false;
 
     /**
-     * For all recieving packet events and debugging.
+     * For all receiving packet events and debugging.
      * @return If the packet should be cancelled and not acted on. True to ignore.
      * @param <T> Server2Client
      */
     public static <T extends PacketListener> boolean handlePacket(Packet<T> packet) {
 
         if(currentAction.onReceivePacket(packet)) return true;
         if(Debug.handlePacket(packet)) return true;
-        if(BuildClip.handlePacket(packet)) return true;
+        if(BuildPhaser.handlePacket(packet)) return true;
         if(ChestPeeker.handlePacket(packet)) return true;
         Event.handlePacket(packet);
         LastPos.handlePacket(packet);
@@ -116,7 +112,7 @@ public static boolean noClipOn() {
      */
     public static <T extends PacketListener> boolean onSendPacket(Packet<T> packet) {
         if(CodeClient.currentAction.onSendPacket(packet)) return true;
-        if(BuildClip.onPacket(packet)) return true;
+        if(BuildPhaser.onPacket(packet)) return true;
         Event.onSendPacket(packet);
         String name = packet.getClass().getName().replace("net.minecraft.network.packet.c2s.play.","");
         if(packet instanceof CommandExecutionC2SPacket commandExecutionC2SPacket) {
@@ -133,7 +129,7 @@ public static void onTick() {
 
         currentAction.onTick();
         Debug.tick();
-        BuildClip.tick();
+        BuildPhaser.tick();
         ChestPeeker.tick();
         RecentChestInsert.tick();
 
@@ -196,8 +192,7 @@ public void onInitialize() {
             autoJoin = AutoJoin.GAME;
         }
 
-        editBind = KeyBindingHelper.registerKeyBinding(new KeyBinding(
-                "key.codeclient.actionpallete",
+        editBind = KeyBindingHelper.registerKeyBinding(new KeyBinding("key.codeclient.codepalette",
                 InputUtil.Type.KEYSYM,
                 GLFW.GLFW_KEY_Y,
                 "category.codeclient.dev"

diff --git a/src/main/java/dev/dfonline/codeclient/Commands.java b/src/main/java/dev/dfonline/codeclient/Commands.java
@@ -9,8 +9,7 @@
 import dev.dfonline.codeclient.action.None;
 import dev.dfonline.codeclient.action.impl.*;
 import dev.dfonline.codeclient.config.Config;
-import dev.dfonline.codeclient.dev.BuildClip;
-import dev.dfonline.codeclient.dev.LastPos;
+import dev.dfonline.codeclient.dev.BuildPhaser;
 import dev.dfonline.codeclient.hypercube.actiondump.ActionDump;
 import dev.dfonline.codeclient.hypercube.template.Template;
 import dev.dfonline.codeclient.location.*;
@@ -72,7 +71,7 @@ public static void register(CommandDispatcher<FabricClientCommandSource> dispatc
         dispatcher.register(literal("fixcc").executes(context -> {
             CodeClient.currentAction = new None();
             CodeClient.location = null;
-            BuildClip.disableClipping();
+            BuildPhaser.disableClipping();
             SocketHandler.setConnection(null);
             ActionDump.clear();
             Config.clear();

diff --git a/src/main/java/dev/dfonline/codeclient/config/Config.java b/src/main/java/dev/dfonline/codeclient/config/Config.java
@@ -195,7 +195,7 @@ public YetAnotherConfigLib getLibConfig() {
                                 .build())
                         .option(Option.createBuilder(boolean.class)
                                 .name(Text.literal("Auto Focus Search"))
-                                .description(OptionDescription.of(Text.literal("When opening the Code Palette (").append(Text.keybind("key.codeclient.actionpallete")).append(") automatically select the search bar."),Text.literal("This is disabled because it interferes with navigation binds.")))
+                                .description(OptionDescription.of(Text.literal("When opening the Code Palette (").append(Text.keybind("key.codeclient.codepalette")).append(") automatically select the search bar."),Text.literal("This is disabled because it interferes with navigation binds.")))
                                 .binding(
                                         false,
                                         () -> FocusSearch,

diff --git a/...ev/dfonline/codeclient/dev/BuildClip.java → .../dfonline/codeclient/dev/BuildPhaser.java b/...ev/dfonline/codeclient/dev/BuildClip.java → .../dfonline/codeclient/dev/BuildPhaser.java
@@ -10,9 +10,6 @@
 import net.minecraft.client.network.ClientPlayerEntity;
 import net.minecraft.entity.player.PlayerAbilities;
 import net.minecraft.item.ItemStack;
-import net.minecraft.item.Items;
-import net.minecraft.nbt.NbtCompound;
-import net.minecraft.nbt.NbtString;
 import net.minecraft.network.listener.PacketListener;
 import net.minecraft.network.packet.Packet;
 import net.minecraft.network.packet.c2s.play.ClientCommandC2SPacket;
@@ -30,7 +27,7 @@
 import net.minecraft.util.math.Direction;
 import net.minecraft.util.math.Vec3d;
 
-public class BuildClip {
+public class BuildPhaser {
     private static boolean clipping = false;
     public static boolean isClipping() {
         return clipping;

diff --git a/src/main/java/dev/dfonline/codeclient/mixin/entity/player/MAbstractClientPlayerEntity.java b/src/main/java/dev/dfonline/codeclient/mixin/entity/player/MAbstractClientPlayerEntity.java
@@ -1,6 +1,6 @@
 package dev.dfonline.codeclient.mixin.entity.player;
 
-import dev.dfonline.codeclient.dev.BuildClip;
+import dev.dfonline.codeclient.dev.BuildPhaser;
 import net.minecraft.client.network.AbstractClientPlayerEntity;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
@@ -11,6 +11,6 @@
 public class MAbstractClientPlayerEntity {
     @Inject(method = "isSpectator", at = @At("HEAD"), cancellable = true)
     public void isSpectator(CallbackInfoReturnable<Boolean> cir) {
-        if(BuildClip.isClipping()) cir.setReturnValue(true);
+        if(BuildPhaser.isClipping()) cir.setReturnValue(true);
     }
 }
diff --git a/src/main/resources/assets/codeclient/lang/en_us.json b/src/main/resources/assets/codeclient/lang/en_us.json
@@ -0,0 +1,6 @@
+{
+  "category.codeclient.dev": "CodeClient",
+
+  "key.codeclient.codepalette": "Code Palette",
+  "key.codeclient.phaser": "Phaser"
+}