feat: Switch to translatable texts

MisterCheezeCake · MisterCheezeCake · commit d907dc54c62c · 2025-03-31T22:49:43.000-04:00
diff --git a/build.gradle b/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-	id 'fabric-loom' version '1.7-SNAPSHOT'
+	id 'fabric-loom' version '1.10-SNAPSHOT'
 	id 'maven-publish'
 }
 
@@ -42,6 +42,7 @@ dependencies {
 	modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}"
 	modImplementation("maven.modrinth:controlling:AfdAiHU4")
 	modImplementation("maven.modrinth:searchables:sxC8II3c")
+//	modImplementation("maven.modrinth:amecs-reborn:2.0.0")
 	include(implementation("com.moulberry:mixinconstraints:1.0.1"))
 
 	
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.21.1-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/src/main/java/wtf/cheeze/smkb/SaveMyKeybinds.java b/src/main/java/wtf/cheeze/smkb/SaveMyKeybinds.java
@@ -46,9 +46,6 @@ public void onInitialize() {
 		}
 	}
 
-	public static void sendToast(String title, String message) {
-		sendToast(Text.literal(title), Text.literal(message));
-	}
 	public static void sendToast(Text title, Text message) {
 		MinecraftClient.getInstance().getToastManager().add(new SystemToast(SystemToast.Type.PERIODIC_NOTIFICATION, title, message));
 	}
diff --git a/src/main/java/wtf/cheeze/smkb/mixin/KeybindsScreenMixin.java b/src/main/java/wtf/cheeze/smkb/mixin/KeybindsScreenMixin.java
@@ -40,7 +40,6 @@ public abstract class KeybindsScreenMixin {
 	private void addCustomButton(CallbackInfo ci, @Local DirectionalLayoutWidget widget) {
 		widget.add(SavePresetScreen.getButton());
 		widget.add(LoadPresetScreen.getButton());
-		SaveMyKeybinds.LOGGER.info("Added custom buttons");
 	}
 	@Inject(method = "initFooter", at = @At("TAIL"))
 	private void addCustomButton2(CallbackInfo ci, @Local DirectionalLayoutWidget widget) {
diff --git a/src/main/java/wtf/cheeze/smkb/preset/PresetManager.java b/src/main/java/wtf/cheeze/smkb/preset/PresetManager.java
@@ -22,6 +22,8 @@
 import com.google.gson.GsonBuilder;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.util.InputUtil;
+import net.minecraft.text.Text;
+import net.minecraft.util.Formatting;
 import wtf.cheeze.smkb.SaveMyKeybinds;
 
 import java.io.FileWriter;
@@ -40,10 +42,10 @@ public static int savePreset(String name) {
             FileWriter writer = new FileWriter(presetFile.toFile());
             writer.write(GSON.toJson(preset));
             writer.close();
-            SaveMyKeybinds.sendToast("§aPreset Saved", "Saved Preset " + name);
+            SaveMyKeybinds.sendToast(Text.translatable("smkb.toast.save.success.title").formatted(Formatting.GREEN), Text.translatable("smkb.toast.save.success.body", name));
         } catch (Exception e) {
             SaveMyKeybinds.LOGGER.error("Failed to write preset file", e);
-            SaveMyKeybinds.sendToast("Error Saving Preset", "Preset" + name + " could not be saved due to an error");
+            SaveMyKeybinds.sendToast(Text.translatable("smkb.toast.save.failure.title").formatted(Formatting.RED), Text.translatable("smkb.toast.save.failure.body", name));
             return 0;
         }
         return 1;
@@ -60,10 +62,10 @@ public static int loadPreset(String name) {
                     keybinding.setBoundKey(InputUtil.fromTranslationKey(presetBinding.key));
                 }
             }
-            SaveMyKeybinds.sendToast("§aPreset Loaded", "Loaded Preset " + name);
+        SaveMyKeybinds.sendToast(Text.translatable("smkb.toast.load.success.title").formatted(Formatting.GREEN), Text.translatable("smkb.toast.load.success.body", name));
         } catch (Exception e) {
             SaveMyKeybinds.LOGGER.error("Failed to read preset file", e);
-            SaveMyKeybinds.sendToast("Error Loading Preset", "Preset" + name + " could not be loaded due to an error");
+            SaveMyKeybinds.sendToast(Text.translatable("smkb.toast.load.failure.title").formatted(Formatting.RED), Text.translatable("smkb.toast.load.failure.body", name));
             return 0;
         }
         return 1;
@@ -73,10 +75,10 @@ public static int deletePreset(String name) {
         try {
             Path presetFile = SaveMyKeybinds.FOLDER_PATH.resolve(name + ".preset.json");
             Files.delete(presetFile);
-            SaveMyKeybinds.sendToast("§aPreset Deleted", "Deleted Preset " + name);
+            SaveMyKeybinds.sendToast(Text.translatable("smkb.toast.delete.success.title").formatted(Formatting.GREEN), Text.translatable("smkb.toast.delete.success.body", name));
         } catch (Exception e) {
             SaveMyKeybinds.LOGGER.error("Failed to delete preset file", e);
-            SaveMyKeybinds.sendToast("Error Deleting Preset", "Preset" + name + " could not be deleted due to an error");
+            SaveMyKeybinds.sendToast(Text.translatable("smkb.toast.delete.failure.title").formatted(Formatting.RED), Text.translatable("smkb.toast.delete.failure.body", name));
             return 0;
         }
         return 1;
diff --git a/src/main/java/wtf/cheeze/smkb/screen/LoadPresetScreen.java b/src/main/java/wtf/cheeze/smkb/screen/LoadPresetScreen.java
@@ -36,21 +36,21 @@ public class LoadPresetScreen extends SMKBScreen {
     private final ButtonWidget loadButton;
 
     public LoadPresetScreen(Screen parent) {
-        super(Text.literal("Load Presets"), parent);
+        super(Text.translatable("smkb.screen.loadPresets"), parent);
         this.listWidget = new ListWidget(
                 MinecraftClient.getInstance(),
                 MinecraftClient.getInstance().getWindow().getScaledWidth(),
                 (int) (SMKBScreen.screenHeight() * 0.75f) - 25, 25, 20);
         int h = (int) (SMKBScreen.screenHeight() * 0.8f);
-        this.deleteButton = ButtonWidget.builder(Text.literal("Delete"), button -> {
+        this.deleteButton = ButtonWidget.builder(Text.translatable("smkb.screen.delete"), button -> {
             var t = listWidget.getSelectedOrNull();
             if (t == null) return;
             PresetManager.deletePreset(t.text);
             listWidget.reload();
 
         }).dimensions(centerX() - 160 ,h,150,20).build();
 
-        this.loadButton = ButtonWidget.builder(Text.literal("Load"), button -> {
+        this.loadButton = ButtonWidget.builder(Text.translatable("smkb.screen.load"), button -> {
             var t = listWidget.getSelectedOrNull();
             if (t == null) return;
 
@@ -85,7 +85,7 @@ public void init() {
     }
 
     public static ButtonWidget getButton() {
-        return ButtonWidget.builder(Text.literal("Load Presets"), button -> {
+        return ButtonWidget.builder(Text.translatable("smkb.screen.loadPresets"), button -> {
             MinecraftClient.getInstance().setScreen(new LoadPresetScreen(MinecraftClient.getInstance().currentScreen));
         }).width(74).build();
     }
diff --git a/src/main/java/wtf/cheeze/smkb/screen/SavePresetScreen.java b/src/main/java/wtf/cheeze/smkb/screen/SavePresetScreen.java
@@ -23,7 +23,9 @@
 import net.minecraft.client.gui.screen.Screen;
 import net.minecraft.client.gui.widget.ButtonWidget;
 import net.minecraft.client.gui.widget.TextFieldWidget;
+import net.minecraft.client.resource.language.I18n;
 import net.minecraft.text.Text;
+import net.minecraft.util.Formatting;
 import org.intellij.lang.annotations.Language;
 import wtf.cheeze.smkb.SaveMyKeybinds;
 import wtf.cheeze.smkb.preset.PresetManager;
@@ -42,16 +44,16 @@ public class SavePresetScreen extends SMKBScreen {
 
 
     public SavePresetScreen(Screen parent) {
-        super(Text.literal("Save Presets"), parent);
+        super(Text.translatable("smkb.screen.savePresets"), parent);
         this.nameWidget = new TextFieldWidget(MinecraftClient.getInstance().textRenderer, centerX() - 150, 40, 300, 20, Text.literal("Preset"));
         this.saveWidget = ButtonWidget.builder(Text.literal("Save"), (button) -> {
             var t = nameWidget.getText();
             if (t.isBlank()) {
-                SaveMyKeybinds.sendToast("Invalid Preset Name", "Preset name cannot be empty");
+                SaveMyKeybinds.sendToast(Text.translatable("smkb.toast.invalid.empty.title").formatted(Formatting.RED), Text.translatable("smkb.toast.invalid.empty.body"));
                 return;
             }
             if (FORBIDDEN_CHARS_PATTERN.matcher(t).find()) {
-                SaveMyKeybinds.sendToast("Invalid Preset Name", "Preset name cannot contain any of the following characters: \\/:*?\"<>|");
+                SaveMyKeybinds.sendToast(Text.translatable("smkb.toast.invalid.special.title").formatted(Formatting.RED), Text.translatable("smkb.toast.invalid.special.body"));
                 return;
             }
                     if (PresetManager.savePreset(t) != 0) {
@@ -72,11 +74,11 @@ public void init() {
     @Override
     public void render(DrawContext context, int mouseX, int mouseY, float delta) {
         super.render(context, mouseX, mouseY, delta);
-        context.drawCenteredTextWithShadow(textRenderer, Text.literal("Enter Preset Name"), centerX(), 27, 0xbbbbbb);
+        context.drawCenteredTextWithShadow(textRenderer, Text.translatable("smkb.screen.enterName"), centerX(), 27, 0xbbbbbb);
     }
 
     public static ButtonWidget getButton() {
-        return ButtonWidget.builder(Text.literal("Save Presets"), button -> {
+        return ButtonWidget.builder(Text.translatable("smkb.screen.savePresets"), button -> {
             MinecraftClient.getInstance().setScreen(new SavePresetScreen(MinecraftClient.getInstance().currentScreen));
         }).width(74).build();
     }
diff --git a/src/main/resources/assets/savemykeybinds/lang/en_us.json b/src/main/resources/assets/savemykeybinds/lang/en_us.json
@@ -0,0 +1,24 @@
+{
+  "smkb.toast.save.success.title": "Saved Preset",
+  "smkb.toast.save.success.body": "Saved preset %s",
+  "smkb.toast.save.failure.title": "Error Saving Preset",
+  "smkb.toast.save.failure.body": "Preset %s could not be saved due to an error",
+  "smkb.toast.load.success.title": "Loaded Preset",
+  "smkb.toast.load.success.body": "Loaded preset %s",
+  "smkb.toast.load.failure.title": "Error Loading Preset",
+  "smkb.toast.load.failure.body": "Preset %s could not be loaded due to an error",
+  "smkb.toast.delete.success.title": "Deleted Preset",
+  "smkb.toast.delete.success.body": "Deleted preset %s",
+  "smkb.toast.delete.failure.title": "Error Deleting Preset",
+  "smkb.toast.delete.failure.body": "Preset %s could not be deleted due to an error",
+  "smkb.toast.invalid.empty.title": "Invalid Preset Name",
+  "smkb.toast.invalid.empty.body": "Preset name cannot be empty",
+  "smkb.toast.invalid.special.title": "Invalid Preset Name",
+  "smkb.toast.invalid.special.body": "Preset name cannot contain any of the following characters: \\/:*?\"<>|",
+  "smkb.screen.enterName": "Enter Preset Name",
+  "smkb.screen.savePresets": "Save Presets",
+  "smkb.screen.delete": "Delete",
+  "smkb.screen.loadPresets": "Load Presets",
+  "smkb.screen.load": "Load"
+
+}

Original file line number	Diff line number	Diff line change
`@@ -46,9 +46,6 @@ public void onInitialize() {`
`46`	`46`	`}`
`47`	`47`	`}`
`48`	`48`
`49`		`- public static void sendToast(String title, String message) {`
`50`		`- sendToast(Text.literal(title), Text.literal(message));`
`51`		`- }`
`52`	`49`	`public static void sendToast(Text title, Text message) {`
`53`	`50`	`MinecraftClient.getInstance().getToastManager().add(new SystemToast(SystemToast.Type.PERIODIC_NOTIFICATION, title, message));`
`54`	`51`	`}`
Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,6 @@ public abstract class KeybindsScreenMixin {`
`40`	`40`	`private void addCustomButton(CallbackInfo ci, @Local DirectionalLayoutWidget widget) {`
`41`	`41`	`widget.add(SavePresetScreen.getButton());`
`42`	`42`	`widget.add(LoadPresetScreen.getButton());`
`43`		`- SaveMyKeybinds.LOGGER.info("Added custom buttons");`
`44`	`43`	`}`
`45`	`44`	`@Inject(method = "initFooter", at = @At("TAIL"))`
`46`	`45`	`private void addCustomButton2(CallbackInfo ci, @Local DirectionalLayoutWidget widget) {`