build(mappings): migrate mappings to **Mojang official**

Author: MSDNicrosoft

README.md

@@ -19,3 +19,9 @@ Up to 20 buttons are currently supported! More are planned.
 
 ### How It Works
 The list of commands are serialized into a JSON format and stored locally on the users’ systems. The mod writes any new commands into the JSON as new buttons are created, and loads the JSON at the start of the game. A local list instance exists for reading and loading the buttons each time, so that file reading is kept to a minimum.
+
+## Development
+
+### Mappings
+
+We are using the **Mojang official** mappings to de-obfuscate Minecraft and insert patches.

build.gradle

@@ -26,7 +26,7 @@ repositories {
 dependencies {
     // To change the versions see the gradle.properties file
     minecraft "com.mojang:minecraft:${project.minecraft_version}"
-    mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2"
+    mappings(loom.officialMojangMappings())
     modImplementation "net.fabricmc:fabric-loader:${project.loader_version}"
 
     // Fabric API. This is technically optional, but you probably want it anyway.

src/main/java/cn/msdnicrosoft/commandbuttons/CommandButtons.java

@@ -2,13 +2,13 @@
 
 import cn.msdnicrosoft.commandbuttons.gui.ButtonGUI;
 import cn.msdnicrosoft.commandbuttons.gui.ButtonGUIScreen;
+import com.mojang.blaze3d.platform.InputConstants;
 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.MinecraftClient;
-import net.minecraft.client.network.ClientPlayerEntity;
-import net.minecraft.client.option.KeyBinding;
-import net.minecraft.client.util.InputUtil;
+import net.minecraft.client.KeyMapping;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.player.LocalPlayer;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.json.simple.JSONObject;
@@ -19,7 +19,7 @@
 public class CommandButtons implements ModInitializer {
     public static final String MOD_ID = "mgbuttons";
     private static ArrayList<JSONObject> masterCommList;
-    private static final MinecraftClient mc = MinecraftClient.getInstance();
+    private static final Minecraft mc = Minecraft.getInstance();
     public static final Logger LOGGER = LogManager.getLogger(MOD_ID);
 
     public static void send(String text) {
@@ -31,14 +31,14 @@ public static void send(String text) {
     }
 
     public static void send(String text, boolean useCommand) {
-        ClientPlayerEntity player = mc.player;
+        LocalPlayer player = mc.player;
         if (player == null) {
             return;
         }
         if (useCommand) {
-            player.sendCommand(text);
+            player.command(text);
         } else {
-            player.sendChatMessage(text);
+            player.chat(text);
         }
     }
 
@@ -67,16 +67,16 @@ public void onInitialize() {
 
     private void assignGuiToKey() {
         // Currently, assigns to the G key
-        KeyBinding keyBinding = KeyBindingHelper.registerKeyBinding(new KeyBinding(
+        KeyMapping keyBinding = KeyBindingHelper.registerKeyBinding(new KeyMapping(
                 "key.commandbuttons.opengui", // The translation key of the keybinding's name
-                InputUtil.Type.KEYSYM, // The type of the keybinding, KEYSYM for keyboard, MOUSE for mouse.
+                InputConstants.Type.KEYSYM, // The type of the keybinding, KEYSYM for keyboard, MOUSE for mouse.
                 GLFW.GLFW_KEY_G, // The keycode of the key
                 "gui.commandbuttons.mgbuttons" // The translation key of the keybinding's category.
         ));
 
         ClientTickEvents.END_CLIENT_TICK.register(client -> {
-            while (keyBinding.wasPressed()) {
-                MinecraftClient.getInstance().setScreen(new ButtonGUIScreen(new ButtonGUI()));
+            while (keyBinding.consumeClick()) {
+                Minecraft.getInstance().setScreen(new ButtonGUIScreen(new ButtonGUI()));
                 // client.player.closeScreen();
             }
         });

src/main/java/cn/msdnicrosoft/commandbuttons/gui/ButtonGUI.java

@@ -8,11 +8,11 @@
 import io.github.cottonmc.cotton.gui.widget.WGridPanel;
 import io.github.cottonmc.cotton.gui.widget.WTextField;
 import io.github.cottonmc.cotton.gui.widget.WToggleButton;
-import net.minecraft.client.MinecraftClient;
-import net.minecraft.text.Text;
 import org.json.simple.JSONObject;
 
 import java.util.ArrayList;
+import net.minecraft.client.Minecraft;
+import net.minecraft.network.chat.Component;
 
 public class ButtonGUI extends LightweightGuiDescription {
     int xValue = 0;
@@ -25,7 +25,7 @@ public ButtonGUI() {
         addCloseButton(root);
 
         // Add delete toggle button
-        WToggleButton delToggle = new WToggleButton(Text.translatable("mgbuttons.gui.delete"));
+        WToggleButton delToggle = new WToggleButton(Component.translatable("mgbuttons.gui.delete"));
         root.add(delToggle, 0, 11, 3, 1);
 
         addSavedButtons(root, delToggle);
@@ -34,10 +34,10 @@ public ButtonGUI() {
     }
 
     private void addCloseButton(WGridPanel root) {
-        WButton escButton = new WButton(Text.literal("X"));
+        WButton escButton = new WButton(Component.literal("X"));
         escButton.setOnClick(() -> {
-            assert MinecraftClient.getInstance().player != null;
-            MinecraftClient.getInstance().player.closeScreen();
+            assert Minecraft.getInstance().player != null;
+            Minecraft.getInstance().player.clientSideCloseContainer();
         });
         root.add(escButton, 17, 1, 2, 2);
     }
@@ -46,17 +46,17 @@ private void addCommandSection(WGridPanel root, WToggleButton toggle) {
         // Add text field for command NAME entry
         WTextField nameTextField = new WTextField();
         nameTextField.setMaxLength(11);
-        nameTextField.setSuggestion(Text.translatable("mgbuttons.gui.name"));
+        nameTextField.setSuggestion(Component.translatable("mgbuttons.gui.name"));
         root.add(nameTextField, 0, 12, 6, 1);
 
         // Add text field for command / entry
         WTextField commandTextField = new WTextField();
-        commandTextField.setSuggestion(Text.translatable("mgbuttons.gui.command"));
+        commandTextField.setSuggestion(Component.translatable("mgbuttons.gui.command"));
         commandTextField.setMaxLength(300);
         root.add(commandTextField, 6, 12, 11, 1);
 
         // Add button for command entry
-        WButton addCmdBtn = new WButton(Text.literal("+"));
+        WButton addCmdBtn = new WButton(Component.literal("+"));
         addCmdBtn.setOnClick(() -> addGUIButton(root, nameTextField, commandTextField, toggle));
         root.add(addCmdBtn, 18, 12, 1, 1);
     }
@@ -72,7 +72,7 @@ private void addGUIButton(WGridPanel root, WTextField name, WTextField command,
 
             if (!isListTooLong()) {
                 String commandString = command.getText();
-                WButton button = new WButton(Text.literal(name.getText()));
+                WButton button = new WButton(Component.literal(name.getText()));
                 button.setOnClick(() -> {
                     if (isDeleteToggled.getToggle()) {
                         ConfigFile.removeObject(newJsonObject);
@@ -103,7 +103,7 @@ private void addGUIButton(WGridPanel root, WTextField name, WTextField command,
     // function to load buttons from commands.json
     private void addGUIButton(WGridPanel root, String name, String command, WToggleButton isDeleteToggled, JSONObject object) {
         if (!name.equals("") && !command.equals("")) {
-            WButton button = new WButton(Text.literal(name));
+            WButton button = new WButton(Component.literal(name));
             button.setOnClick(() -> {
                 if (isDeleteToggled.getToggle()) {
                     ConfigFile.removeObject(object);