Einjerjar · SettingDust · Oct 19, 2023 · Oct 19, 2023 · Nov 8, 2023 · Nov 13, 2023
diff --git a/.deepsource.toml b/.deepsource.toml
@@ -5,4 +5,4 @@ name = "java"
 enabled = true
 
 [analyzers.meta]
-runtime_version = "16"
+runtime_version = "17"
diff --git a/build.gradle b/build.gradle
@@ -1,7 +1,7 @@
 plugins {
     id "co.uzzu.dotenv.gradle" version "2.0.0"
-    id "architectury-plugin" version "3.4-SNAPSHOT"
-    id "dev.architectury.loom" version "0.12.0-SNAPSHOT" apply false
+    id "architectury-plugin" version "3.+"
+    id "dev.architectury.loom" version "1.3.+" apply false
     id "com.matthewprenger.cursegradle" version "1.4.0" apply false
     id "com.modrinth.minotaur" version "2.+" apply false
 }
@@ -18,18 +18,15 @@ subprojects {
     }
 
     dependencies {
-        compileOnly "org.projectlombok:lombok:${project.version_lombok}"
-        annotationProcessor "org.projectlombok:lombok:${project.version_lombok}"
+        compileOnly "org.projectlombok:lombok:${rootProject.version_lombok}"
+        annotationProcessor "org.projectlombok:lombok:${rootProject.version_lombok}"
 
         minecraft "com.mojang:minecraft:${rootProject.minecraft_version}"
 
         mappings loom.layered() {
             officialMojangMappings()
-            parchment("org.parchmentmc.data:parchment-1.18.2:2022.06.26@zip")
+            parchment("org.parchmentmc.data:parchment-${rootProject.minecraft_version}:${rootProject.parchmentmc_version}@zip")
         }
-
-        implementation "com.google.code.gson:gson:${project.version_gson}"
-        implementation("com.google.guava:guava:${project.version_guava}")
     }
 
     ext {
@@ -94,4 +91,4 @@ task publishAll(group: "publishing") {
         [":${it.name}:modrinth", ":${it.name}:curseforge"]
     }.flatten()
     dependsOn(subs)
-}
+}
diff --git a/changelog.md b/changelog.md
@@ -1,2 +1 @@
-- [CHORE] refactor
-- [FIX] keymap layouts not loading on quilt loader 0.18.x
+fix: publish the correct build
diff --git a/common/src/main/java/com/github/einjerjar/mc/keymap/Keymap.java b/common/src/main/java/com/github/einjerjar/mc/keymap/Keymap.java
@@ -17,14 +17,20 @@
 
 @Accessors(fluent = true, chain = true)
 public class Keymap {
-    public static final            String     MOD_ID      = "keymap";
-    public static final            String     SERVER_WARN = "Keymap is being ran on a DedicatedServer environment, even though it can only work on Client side environment";
-    @Getter protected static final String     MOD_NAME    = "keymap";
-    @Getter protected static final Logger     logger      = LogManager.getLogger();
-    @Getter protected static       KeyMapping kmOpenMapper;
+    public static final String MOD_ID = "keymap";
+    public static final String SERVER_WARN =
+            "Keymap is being ran on a DedicatedServer environment, even though it can only work on Client side environment";
 
-    private Keymap() {
-    }
+    @Getter
+    protected static final String MOD_NAME = "keymap";
+
+    @Getter
+    protected static final Logger logger = LogManager.getLogger();
+
+    @Getter
+    protected static KeyMapping kmOpenMapper;
+
+    private Keymap() {}
 
     /**
      * General mod setup
@@ -34,14 +40,11 @@ public static void init() {
         logger.info("Keymap loaded, loader={}, dev={}", PLATFORM.loader(), PLATFORM.dev());
 
         kmOpenMapper = KEYBIND.create(
-                InputConstants.Type.KEYSYM,
-                InputConstants.KEY_GRAVE,
-                "keymap.keyOpenKeymap",
-                "keymap.keyCat"
-        );
+                InputConstants.Type.KEYSYM, InputConstants.KEY_GRAVE, "keymap.keyOpenKeymap", "keymap.keyCat");
 
         for (KeyLayout keyLayout : KeyLayout.layouts().values()) {
-            logger.debug("Layout for {} @ {}",
+            logger.debug(
+                    "Layout for {} @ {}",
                     keyLayout.meta().code(),
                     keyLayout.meta().name());
         }
@@ -57,5 +60,4 @@ public static void init() {
 
         logger.warn(Credits.instance().toString());
     }
-
-}
+}
diff --git a/common/src/main/java/com/github/einjerjar/mc/keymap/client/gui/screen/ConfigScreen.java b/common/src/main/java/com/github/einjerjar/mc/keymap/client/gui/screen/ConfigScreen.java
@@ -2,14 +2,13 @@
 
 import com.github.einjerjar.mc.keymap.config.KeymapConfig;
 import com.github.einjerjar.mc.widgets.utils.Point;
-import com.github.einjerjar.mc.widgets.utils.Text;
 import com.github.einjerjar.mc.widgets2.ELabel2;
 import com.github.einjerjar.mc.widgets2.ELineToggleButton;
 import com.github.einjerjar.mc.widgets2.EScreen2;
-import com.mojang.blaze3d.vertex.PoseStack;
+import net.minecraft.client.gui.GuiGraphics;
 import net.minecraft.client.gui.screens.Screen;
+import net.minecraft.network.chat.Component;
 import net.minecraft.network.chat.Style;
-import org.jetbrains.annotations.NotNull;
 
 public class ConfigScreen extends EScreen2 {
 
@@ -18,64 +17,62 @@ public ConfigScreen(Screen parent) {
         targetScreenWidth = 450;
     }
 
-    @Override protected void onInit() {
+    @Override
+    protected void onInit() {
         children.clear();
         Style bold = Style.EMPTY.withBold(true);
 
         int h = font.lineHeight + 8;
 
         // General
         ELabel2 labelGeneral = new ELabel2(
-                Text.translatable("keymap.catGeneral").withStyle(bold),
-                scr.left(), scr.top(), scr.w(), h);
+                Component.translatable("keymap.catGeneral").withStyle(bold), scr.left(), scr.top(), scr.w(), h);
         ELineToggleButton toggleReplaceKeybind = new ELineToggleButton(
-                Text.translatable("keymap.optReplaceKeybindScreen"),
-                scr.left(), scr.top() + h, scr.w(), h);
+                Component.translatable("keymap.optReplaceKeybindScreen"), scr.left(), scr.top() + h, scr.w(), h);
 
         toggleReplaceKeybind.padding(new Point<>(4));
         toggleReplaceKeybind.value(KeymapConfig.instance().replaceKeybindScreen());
         toggleReplaceKeybind.onToggle(self -> KeymapConfig.instance().replaceKeybindScreen(self.value()));
 
         // Layout
         ELabel2 labelLayout = new ELabel2(
-                Text.translatable("keymap.catLayout").withStyle(bold),
-                scr.left(), scr.top() + h * 2, scr.w(), h);
+                Component.translatable("keymap.catLayout").withStyle(bold), scr.left(), scr.top() + h * 2, scr.w(), h);
         ELineToggleButton toggleAutoSelectLayout = new ELineToggleButton(
-                Text.translatable("keymap.optAutoSelectLayout"),
-                scr.left(), scr.top() + h * 3, scr.w(), h);
+                Component.translatable("keymap.optAutoSelectLayout"), scr.left(), scr.top() + h * 3, scr.w(), h);
 
         toggleAutoSelectLayout.padding(new Point<>(4));
         toggleAutoSelectLayout.value(KeymapConfig.instance().autoSelectLayout());
         toggleAutoSelectLayout.onToggle(self -> KeymapConfig.instance().autoSelectLayout(self.value()));
 
         // Tooltips
         ELabel2 labelTooltips = new ELabel2(
-                Text.translatable("keymap.catTooltips").withStyle(bold),
-                scr.left(), scr.top() + h * 4, scr.w(), h);
+                Component.translatable("keymap.catTooltips").withStyle(bold),
+                scr.left(),
+                scr.top() + h * 4,
+                scr.w(),
+                h);
         ELineToggleButton toggleShowHelpTooltips = new ELineToggleButton(
-                Text.translatable("keymap.optShowHelpTooltips"),
-                scr.left(), scr.top() + h * 5, scr.w(), h);
+                Component.translatable("keymap.optShowHelpTooltips"), scr.left(), scr.top() + h * 5, scr.w(), h);
 
         toggleShowHelpTooltips.padding(new Point<>(4));
         toggleShowHelpTooltips.value(KeymapConfig.instance().showHelpTooltips());
         toggleShowHelpTooltips.onToggle(self -> KeymapConfig.instance().showHelpTooltips(self.value()));
 
         // Extra
         ELabel2 labelExtra = new ELabel2(
-                Text.translatable("keymap.catExtra").withStyle(bold),
-                scr.left(), scr.top() + h * 6, scr.w(), h);
+                Component.translatable("keymap.catExtra").withStyle(bold), scr.left(), scr.top() + h * 6, scr.w(), h);
         ELineToggleButton toggleFirstOpenDone = new ELineToggleButton(
-                Text.translatable("keymap.optFirstOpenDoneExtra"),
-                scr.left(), scr.top() + h * 7, scr.w(), h);
+                Component.translatable("keymap.optFirstOpenDoneExtra"), scr.left(), scr.top() + h * 7, scr.w(), h);
         ELineToggleButton toggleDebug = new ELineToggleButton(
-                Text.translatable("keymap.optDebug"),
-                scr.left(), scr.top() + h * 8, scr.w(), h);
+                Component.translatable("keymap.optDebug"), scr.left(), scr.top() + h * 8, scr.w(), h);
         ELineToggleButton toggleDebug2 = new ELineToggleButton(
-                Text.translatable("keymap.optDebug2"),
-                scr.left(), scr.top() + h * 9, scr.w(), h);
+                Component.translatable("keymap.optDebug2"), scr.left(), scr.top() + h * 9, scr.w(), h);
         ELineToggleButton toggleMad = new ELineToggleButton(
-                Text.translatable("keymap.optCrashOnProblematicError"),
-                scr.left(), scr.top() + h * 10, scr.w(), h);
+                Component.translatable("keymap.optCrashOnProblematicError"),
+                scr.left(),
+                scr.top() + h * 10,
+                scr.w(),
+                h);
 
         toggleFirstOpenDone.padding(new Point<>(4));
         toggleFirstOpenDone.value(KeymapConfig.instance().firstOpenDone());
@@ -109,15 +106,18 @@ public ConfigScreen(Screen parent) {
         children.add(toggleMad);
     }
 
-    @Override protected void preRender(@NotNull PoseStack poseStack, int mouseX, int mouseY, float partialTick) {
-        super.preRender(poseStack, mouseX, mouseY, partialTick);
+    @Override
+    protected void preRender(GuiGraphics guiGraphics, int mouseX, int mouseY, float partialTick) {
+        super.preRender(guiGraphics, mouseX, mouseY, partialTick);
     }
 
-    @Override protected void postRender(@NotNull PoseStack poseStack, int mouseX, int mouseY, float partialTick) {
+    @Override
+    protected void postRender(GuiGraphics poseStack, int mouseX, int mouseY, float partialTick) {
         // postRender
     }
 
-    @Override public void onClose() {
+    @Override
+    public void onClose() {
         KeymapConfig.save();
         super.onClose();
     }

diff --git a/common/src/main/java/com/github/einjerjar/mc/keymap/client/gui/screen/CreditsScreen.java b/common/src/main/java/com/github/einjerjar/mc/keymap/client/gui/screen/CreditsScreen.java
@@ -3,65 +3,50 @@
 import com.github.einjerjar.mc.keymap.objects.Credits;
 import com.github.einjerjar.mc.keymap.utils.Utils;
 import com.github.einjerjar.mc.widgets.*;
-import com.github.einjerjar.mc.widgets.utils.Text;
-import com.mojang.blaze3d.vertex.PoseStack;
+import net.minecraft.client.gui.GuiGraphics;
 import net.minecraft.client.gui.screens.Screen;
+import net.minecraft.network.chat.Component;
+import org.jetbrains.annotations.NotNull;
 
 public class CreditsScreen extends EScreen {
     protected ScrollTextList listHelp;
-    protected ELabel         lblTitle;
-    protected EButton        btnClose;
+    protected ELabel lblTitle;
+    protected EButton btnClose;
 
     protected CreditsScreen(Screen parent) {
-        super(parent, Text.translatable("keymap.scrCredits"));
+        super(parent, Component.translatable("keymap.scrCredits"));
     }
 
-    @Override protected void onInit() {
+    @Override
+    protected void onInit() {
         scr = scrFromWidth(Math.min(450, width));
 
-        lblTitle = new ELabel(
-                scr.left() + padding.x(),
-                scr.top() + padding.y(),
-                scr.w() - padding.x() * 2,
-                16
-        );
-        lblTitle.text(Text.translatable("keymap.lblCredits"));
+        lblTitle = new ELabel(scr.left() + padding.x(), scr.top() + padding.y(), scr.w() - padding.x() * 2, 16);
+        lblTitle.text(Component.translatable("keymap.lblCredits"));
         lblTitle.center(true);
 
-        StringBuilder layoutCredits   = new StringBuilder(Utils.translate("keymap.lblCreditsLayout"));
+        StringBuilder layoutCredits = new StringBuilder(Utils.translate("keymap.lblCreditsLayout"));
         StringBuilder languageCredits = new StringBuilder(Utils.translate("keymap.lblCreditsLanguage"));
         StringBuilder coreCredits = new StringBuilder(Utils.translate("keymap.lblCreditsCore"));
 
         for (Credits.LayoutCredits lay : Credits.instance().layout()) {
-            layoutCredits
-                    .append("\n\n- ")
-                    .append(lay.key());
+            layoutCredits.append("\n\n- ").append(lay.key());
             for (String name : lay.name()) {
-                layoutCredits
-                        .append("\n   - ")
-                        .append(name);
+                layoutCredits.append("\n   - ").append(name);
             }
         }
 
         for (Credits.LanguageCredits lang : Credits.instance().language()) {
-            languageCredits
-                    .append("\n\n- ")
-                    .append(lang.lang());
+            languageCredits.append("\n\n- ").append(lang.lang());
             for (String name : lang.name()) {
-                languageCredits
-                        .append("\n   - ")
-                        .append(name);
+                languageCredits.append("\n   - ").append(name);
             }
         }
 
         for (Credits.CoreCredits contrib : Credits.instance().core()) {
-            coreCredits
-                    .append("\n\n- ")
-                    .append(contrib.name());
+            coreCredits.append("\n\n- ").append(contrib.name());
             for (String c : contrib.contributions()) {
-                coreCredits
-                        .append("\n   - ")
-                        .append(c);
+                coreCredits.append("\n   - ").append(c);
             }
         }
 
@@ -70,14 +55,10 @@ protected CreditsScreen(Screen parent) {
                 lblTitle.left(),
                 lblTitle.bottom() + padding.y(),
                 lblTitle.rect().w(),
-                scr.h() - padding.y() * 3 - 16
-        );
+                scr.h() - padding.y() * 3 - 16);
 
-        btnClose = new EButton(Text.translatable("keymap.btnClearSearch"),
-                listHelp.right() - 16,
-                scr.y() + padding.y(),
-                16,
-                16);
+        btnClose = new EButton(
+                Component.translatable("keymap.btnClearSearch"), listHelp.right() - 16, scr.y() + padding.y(), 16, 16);
 
         btnClose.clickAction(this::onBtnCloseClicked);
 
@@ -90,8 +71,9 @@ protected void onBtnCloseClicked(EWidget source) {
         onClose();
     }
 
-    @Override protected void preRenderScreen(PoseStack poseStack, int mouseX, int mouseY, float partialTick) {
-        fill(poseStack, 0, 0, width, height, 0x55000000);
-        if (scr != null) drawOutline(poseStack, scr, 0xFFFFFFFF);
+    @Override
+    protected void preRenderScreen(@NotNull GuiGraphics guiGraphics, int mouseX, int mouseY, float partialTick) {
+        guiGraphics.fill(0, 0, width, height, 0x55000000);
+        if (scr != null) drawOutline(guiGraphics, scr, 0xFFFFFFFF);
     }
 }