Update mappings for 26.1

Author: kalucky0

build.gradle

@@ -1,54 +1,55 @@
 plugins {
-    id 'fabric-loom'
+    id 'net.fabricmc.fabric-loom' version "${loom_version}"
     id 'maven-publish'
 }
 
 version = project.mod_version
 group = project.maven_group
 
+base {
+    archivesName = project.archives_base_name
+}
+
 repositories {
     maven { url "https://maven.terraformersmc.com/" }
 }
 
 dependencies {
     minecraft "com.mojang:minecraft:${project.minecraft_version}"
-    mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2"
-    modImplementation "net.fabricmc:fabric-loader:${project.loader_version}"
-
-    modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}"
 
-    modImplementation("com.terraformersmc:modmenu:${project.modmenu_version}") {
-        exclude module: "fabric-api"
-    }
-}
+    implementation "net.fabricmc:fabric-loader:${project.loader_version}"
+    implementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_api_version}"
+    implementation "com.terraformersmc:modmenu:${project.modmenu_version}"
 
-base {
-    archivesName = project.archives_base_name
+//    modImplementation("com.terraformersmc:modmenu:${project.modmenu_version}") {
+//        exclude module: "fabric-api"
+//    }
 }
 
 processResources {
     inputs.property "version", project.version
 
     filesMatching("fabric.mod.json") {
-        expand "version": project.version
+        expand "version": inputs.properties.version
     }
 }
 
 tasks.withType(JavaCompile).configureEach {
-    it.options.encoding = "UTF-8"
-    it.options.release = 21
+    it.options.release = 25
 }
 
 java {
     withSourcesJar()
 
-    sourceCompatibility = JavaVersion.VERSION_21
-    targetCompatibility = JavaVersion.VERSION_21
+    sourceCompatibility = JavaVersion.VERSION_25
+    targetCompatibility = JavaVersion.VERSION_25
 }
 
 jar {
-    from("LICENSE.md") {
-        rename { "${it}_${base.archivesName.get()}"}
+    inputs.property "archivesName", project.base.archivesName
+
+    from("LICENSE") {
+        rename { "${it}_${inputs.properties.archivesName}" }
     }
 }
 

gradle.properties

@@ -2,18 +2,17 @@ org.gradle.jvmargs=-Xmx4G
 
 # Fabric Properties
 # Check these on https://fabricmc.net/develop/
-minecraft_version=1.21.10
-yarn_mappings=1.21.10+build.3
-loader_version=0.18.2
+minecraft_version=26.1-snapshot-6
+loader_version=0.18.4
 
 # Fabric API
-fabric_version=0.138.3+1.21.10
-loom_version=1.14-SNAPSHOT
+fabric_api_version=0.143.2+26.1
+loom_version=1.15-SNAPSHOT
 
 # Mod Properties
-mod_version=2.0.0-beta.2
+mod_version=2.0.0-rc.1
 maven_group=net.immortaldevs
 archives_base_name=fabric-bind-cmd
 
 # Dependencies
-modmenu_version=16.0.0-rc.1
+modmenu_version=18.0.0-alpha.5

settings.gradle

@@ -4,10 +4,7 @@ pluginManagement {
             name = 'Fabric'
             url = 'https://maven.fabricmc.net/'
         }
+        mavenCentral()
         gradlePluginPortal()
     }
-
-    plugins {
-        id 'fabric-loom' version loom_version
-    }
-}
+}

src/main/java/net/immortaldevs/bindcmd/BindCmdClient.java

@@ -6,35 +6,34 @@
 import net.fabricmc.fabric.api.client.networking.v1.ClientPlayNetworking;
 import net.fabricmc.fabric.api.networking.v1.PayloadTypeRegistry;
 import net.immortaldevs.bindcmd.config.Config;
-import net.minecraft.client.MinecraftClient;
+import net.minecraft.client.Minecraft;
 
 public final class BindCmdClient implements ClientModInitializer {
     private static long lastKeyPress = 0L;
     private static final long COOLDOWN = 200L;
 
     @Override
     public void onInitializeClient() {
-        PayloadTypeRegistry.playS2C().register(
-                ConfigS2CPayload.ID, ConfigS2CPayload.CODEC
-        );
+        PayloadTypeRegistry.clientboundPlay().register(ConfigPayload.ID, ConfigPayload.CODEC);
+        PayloadTypeRegistry.clientboundConfiguration().register(ConfigPayload.ID, ConfigPayload.CODEC);
 
         Config.load();
 
         ClientTickEvents.END_CLIENT_TICK.register(BindCmdClient::onEndClientTick);
-        ClientPlayConnectionEvents.JOIN.register((handler, sender, client) -> onPlayerJoin(client));
-        ClientPlayConnectionEvents.DISCONNECT.register((handler, client) -> onPlayerDisconnect());
+        ClientPlayConnectionEvents.JOIN.register((_, _, client) -> onPlayerJoin(client));
+        ClientPlayConnectionEvents.DISCONNECT.register((_, _) -> onPlayerDisconnect());
 
         ClientPlayNetworking.registerGlobalReceiver(
-                ConfigS2CPayload.ID,
-                (payload, context) -> Config.setServerBindings(payload.config())
+                ConfigPayload.ID,
+                (payload, _) -> Config.setServerBindings(payload.config())
         );
     }
 
-    private static void onPlayerJoin(MinecraftClient client) {
+    private static void onPlayerJoin(Minecraft client) {
         Config.clearServerBindings();
-        if (client.getServer() != null && client.getServer().isSingleplayer()) {
-            var server = client.getServer();
-            var dir = server.session.getDirectory().path();
+        if (client.getSingleplayerServer() != null && client.getSingleplayerServer().isSingleplayer()) {
+            var server = client.getSingleplayerServer();
+            var dir = server.storageSource.getLevelDirectory().path();
             Config.loadWorldConfig(dir);
         }
     }
@@ -43,15 +42,15 @@ private static void onPlayerDisconnect() {
         Config.clearServerBindings();
     }
 
-    private static void onEndClientTick(MinecraftClient client) {
+    private static void onEndClientTick(Minecraft client) {
         if (System.currentTimeMillis() - lastKeyPress < COOLDOWN) return;
         for (CommandBinding binding : Config.getBindings()) {
             handleBinding(client, binding);
         }
     }
 
-    private static void handleBinding(MinecraftClient client, CommandBinding binding) {
-        var networkHandler = client.getNetworkHandler();
+    private static void handleBinding(Minecraft client, CommandBinding binding) {
+        var networkHandler = client.getConnection();
 
         if (binding.isUnknown() || networkHandler == null) {
             return;
@@ -66,8 +65,8 @@ private static void handleBinding(MinecraftClient client, CommandBinding binding
             for (String command : commands) {
                 Command cmd = new Command(command);
                 switch (cmd.getType()) {
-                    case COMMAND -> networkHandler.sendChatCommand(cmd.getCommand());
-                    case MESSAGE -> networkHandler.sendChatMessage(cmd.getCommand());
+                    case COMMAND -> networkHandler.sendCommand(cmd.getCommand());
+                    case MESSAGE -> networkHandler.sendChat(cmd.getCommand());
                     case NONE -> {
                         return;
                     }

src/main/java/net/immortaldevs/bindcmd/BindCmdServer.java

@@ -8,7 +8,7 @@
 import net.immortaldevs.bindcmd.config.ConfigEntry;
 import net.immortaldevs.bindcmd.config.ConfigLoader;
 import net.minecraft.server.MinecraftServer;
-import net.minecraft.server.network.ServerPlayerEntity;
+import net.minecraft.server.level.ServerPlayer;
 
 import java.util.List;
 
@@ -17,18 +17,17 @@ public final class BindCmdServer implements DedicatedServerModInitializer {
 
     @Override
     public void onInitializeServer() {
-        PayloadTypeRegistry.playS2C().register(
-                ConfigS2CPayload.ID, ConfigS2CPayload.CODEC
-        );
+        PayloadTypeRegistry.clientboundPlay().register(ConfigPayload.ID, ConfigPayload.CODEC);
+        PayloadTypeRegistry.clientboundConfiguration().register(ConfigPayload.ID, ConfigPayload.CODEC);
 
         ServerLifecycleEvents.SERVER_STARTED.register((MinecraftServer minecraftServer) -> {
-            ConfigLoader loader = new ConfigLoader(minecraftServer.getRunDirectory().toFile());
+            ConfigLoader loader = new ConfigLoader(minecraftServer.getServerDirectory().toFile());
             bindings = loader.read();
         });
 
-        ServerEntityEvents.ENTITY_LOAD.register((entity, world) -> {
-            if (!(entity instanceof ServerPlayerEntity player)) return;
-            ConfigS2CPayload payload = new ConfigS2CPayload(bindings);
+        ServerEntityEvents.ENTITY_LOAD.register((entity, _) -> {
+            if (!(entity instanceof ServerPlayer player)) return;
+            ConfigPayload payload = new ConfigPayload(bindings);
             ServerPlayNetworking.send(player, payload);
         });
     }

src/main/java/net/immortaldevs/bindcmd/Command.java

@@ -1,8 +1,8 @@
 package net.immortaldevs.bindcmd;
 
-import net.minecraft.client.MinecraftClient;
-import net.minecraft.client.network.ClientPlayerEntity;
-import net.minecraft.util.collection.ArrayListDeque;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.player.LocalPlayer;
+import net.minecraft.util.ArrayListDeque;
 
 import java.util.*;
 import java.util.regex.Matcher;
@@ -57,11 +57,9 @@ private String getLastMessage(String command) {
     }
 
     private ArrayListDeque<String> getChatHistory() {
-        var inGameHud = MinecraftClient.getInstance().inGameHud;
-        if (inGameHud == null) return new ArrayListDeque<>();
-        var chatHud = inGameHud.getChatHud();
-        if (chatHud == null) return new ArrayListDeque<>();
-        return chatHud.getMessageHistory();
+        var inGameHud = Minecraft.getInstance().gui;
+        var chatHud = inGameHud.getChat();
+        return chatHud.getRecentChat();
     }
 
     private String processMessage(String message) {
@@ -88,15 +86,15 @@ private String processMessage(String message) {
     }
 
     private String replaceVariables(String expression) {
-        MinecraftClient client = MinecraftClient.getInstance();
-        ClientPlayerEntity player = client.player;
+        Minecraft client = Minecraft.getInstance();
+        LocalPlayer player = client.player;
         if (player == null) return expression;
 
         Map<String, String> variables = Map.of(
                 "username", player.getName().getString(),
                 "maxHealth", String.valueOf(player.getMaxHealth()),
                 "health", String.valueOf(player.getHealth()),
-                "hunger", String.valueOf(player.getHungerManager().getFoodLevel()),
+                "hunger", String.valueOf(player.getFoodData().getFoodLevel()),
                 "x", String.valueOf(player.getBlockX()),
                 "y", String.valueOf(player.getBlockY()),
                 "z", String.valueOf(player.getBlockZ())

src/main/java/net/immortaldevs/bindcmd/CommandBinding.java

@@ -1,41 +1,41 @@
 package net.immortaldevs.bindcmd;
 
-import net.minecraft.client.input.KeyInput;
-import net.minecraft.client.option.KeyBinding;
-import net.minecraft.client.util.InputUtil;
-import net.minecraft.util.Identifier;
+import com.mojang.blaze3d.platform.InputConstants;
+import net.minecraft.client.KeyMapping;
+import net.minecraft.client.input.KeyEvent;
+import net.minecraft.resources.Identifier;
 
 public class CommandBinding {
-    private static final KeyBinding.Category CATEGORY = new KeyBinding.Category(
-            Identifier.of("bindcmd", "category")
+    private static final KeyMapping.Category CATEGORY = new KeyMapping.Category(
+            Identifier.fromNamespaceAndPath("bindcmd", "category")
     );
 
     public boolean wasPressed = false;
     public String command;
 
     private BindSource source = BindSource.CLIENT;
-    private KeyBinding key;
+    private KeyMapping key;
 
-    public CommandBinding(String command, KeyBinding key) {
+    public CommandBinding(String command, KeyMapping key) {
         this.command = command;
         this.key = key;
     }
 
     public CommandBinding(String command) {
-        this(command, new KeyBinding("key.keyboard.unknown", -1, CATEGORY));
+        this(command, new KeyMapping("key.keyboard.unknown", -1, CATEGORY));
     }
 
     public CommandBinding(String command, String translationKey, BindSource source) {
         this(command);
         this.command = command;
         this.source = source;
-        InputUtil.Key keyFromTranslation = InputUtil.fromTranslationKey(translationKey);
-        int keyCode = keyFromTranslation.getCode();
-        InputUtil.Type type = translationKey.startsWith("key.mouse") ? InputUtil.Type.MOUSE : InputUtil.Type.KEYSYM;
-        this.key = new KeyBinding(translationKey, type, keyCode, CATEGORY);
+        InputConstants.Key keyFromTranslation = InputConstants.getKey(translationKey);
+        int keyCode = keyFromTranslation.getValue();
+        InputConstants.Type type = translationKey.startsWith("key.mouse") ? InputConstants.Type.MOUSE : InputConstants.Type.KEYSYM;
+        this.key = new KeyMapping(translationKey, type, keyCode, CATEGORY);
     }
 
-    public KeyBinding getKey() {
+    public KeyMapping getKey() {
         return this.key;
     }
 
@@ -44,31 +44,31 @@ public BindSource getSource() {
     }
 
     public String getTranslationKey() {
-        return this.key.getBoundKeyTranslationKey();
+        return this.key.saveString();
     }
 
     public boolean isUnknown() {
         return getTranslationKey().endsWith("unknown");
     }
 
     public boolean isPressed() {
-        return key.isPressed();
+        return key.isDown();
     }
 
-    public void setBoundKey(KeyInput keyInput) {
+    public void setBoundKey(KeyEvent keyInput) {
         unbind();
-        InputUtil.Key inpuKey = keyInput.isEscape() ? InputUtil.UNKNOWN_KEY : InputUtil.fromKeyCode(keyInput);
-        key = new KeyBinding(inpuKey.getTranslationKey(), inpuKey.getCode(), CATEGORY);
+        InputConstants.Key inpuKey = keyInput.isEscape() ? InputConstants.UNKNOWN : InputConstants.getKey(keyInput);
+        key = new KeyMapping(inpuKey.getName(), inpuKey.getValue(), CATEGORY);
     }
 
     public void setBoundMouse(int button) {
         unbind();
-        InputUtil.Key inpuKey = InputUtil.Type.MOUSE.createFromCode(button);
-        key = new KeyBinding(inpuKey.getTranslationKey(), InputUtil.Type.MOUSE, inpuKey.getCode(), CATEGORY);
+        InputConstants.Key inpuKey = InputConstants.Type.MOUSE.getOrCreate(button);
+        key = new KeyMapping(inpuKey.getName(), InputConstants.Type.MOUSE, inpuKey.getValue(), CATEGORY);
     }
 
     public void unbind() {
-        KeyBinding.KEYS_BY_ID.remove(getTranslationKey());
-        KeyBinding.updateKeysByCode();
+        KeyMapping.ALL.remove(getTranslationKey());
+        KeyMapping.resetMapping();
     }
 }