Merge pull request #5 from Lucaslah/develop

feat: make text translatable + bump to version 1.0.1
Merge pull request #6 from Amirhan-Taipovjan-Greatest-I/patch-1
2026-01-12 00:49:54 +00:00 · 2024-04-30 23:06:47 +12:00 · 2024-04-30 23:01:36 +12:00 · 2024-04-30 13:55:55 +03:00 · 2024-04-30 13:53:04 +03:00 · 2024-04-30 13:49:26 +03:00
13 changed files with 120 additions and 31 deletions
--- a/.github/workflows/website.yml
+++ b/.github/workflows/website.yml
@@ -0,0 +1,41 @@
+name: Deploy Website
+
+on:
+  workflow_dispatch:
+  push:
+    branches:
+      - gh-pages
+
+permissions:
+  contents: read
+  pages: write
+  id-token: write
+
+concurrency:
+  group: "pages"
+  cancel-in-progress: false
+
+jobs:
+  deploy-website:
+    environment:
+      name: github-pages
+      url: ${{ steps.deployment.outputs.page_url }}
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          ref: gh-pages
+      - name: Install dependencies
+        run: yarn install
+      - name: Build
+        run: yarn build
+      - name: Setup Pages
+        uses: actions/configure-pages@v4
+      - name: Upload artifact
+        uses: actions/upload-pages-artifact@v3
+        with:
+          path: './dist'
+      - name: Deploy to GitHub Pages
+        id: deployment
+        uses: actions/deploy-pages@v4
--- a/README.md
+++ b/README.md
@@ -62,6 +62,7 @@ You can download the mod from any of the platforms below.
 ## Minecraft Versions
 | Version | Status                          |
 |---------|---------------------------------|
+| 1.20.5  | Supported                       |
 | 1.20.4  | Supported                       |
 | 1.20.3  | Supported                       |
 | 1.20.2  | Supported                       |
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -1,10 +1,12 @@
 import io.github.themrmilchmann.gradle.publish.curseforge.ChangelogFormat
 import io.github.themrmilchmann.gradle.publish.curseforge.GameVersion
 import io.github.themrmilchmann.gradle.publish.curseforge.ReleaseType
+import net.fabricmc.loom.task.RemapJarTask
+import net.fabricmc.loom.task.RemapSourcesJarTask

 plugins {
-    id("architectury-plugin") version "3.4-SNAPSHOT"
-    id ("dev.architectury.loom") version "1.4-SNAPSHOT" apply false
+    id("architectury-plugin") version "3.4.+"
+    id ("dev.architectury.loom") version "1.5.+" apply false
    id("com.modrinth.minotaur") version "2.+"
    id("io.github.themrmilchmann.curseforge-publish") version "0.6.1"
 }
@@ -15,18 +17,35 @@ architectury {
 }

 subprojects {
+    apply(plugin = "java")
+    apply(plugin = "architectury-plugin")
    apply(plugin = "dev.architectury.loom")

    dependencies {
        "minecraft"("com.mojang:minecraft:${properties["minecraft_version"]}")
        "mappings"("net.fabricmc:yarn:${rootProject.properties["yarn_mappings"]}:v2")
    }
+
+    tasks.withType<JavaCompile> {
+        options.encoding = "UTF-8"
+        options.release.set(17)
+    }
+
+    tasks.withType<Jar> {
+        archiveBaseName.set(properties["archives_base_name"].toString() + "-${project.name}")
+    }
+
+    tasks.withType<RemapJarTask> {
+        archiveBaseName.set(properties["archives_base_name"].toString() + "-${project.name}")
+    }
+
+    tasks.withType<RemapSourcesJarTask> {
+        archiveBaseName.set(properties["archives_base_name"].toString() + "-${project.name}")
+    }
 }

 allprojects {
-    apply(plugin = "java")
    apply(plugin = "maven-publish")
-    apply(plugin = "architectury-plugin")

    version = if (System.getenv("CI_DEV_BUILD")?.toBoolean() == true) {
        System.getenv("BUILD_NUMBER") ?: properties["mod_version"].toString()
@@ -35,15 +54,6 @@ allprojects {
    }

    group = properties["maven_group"].toString()
-
-    tasks.withType<JavaCompile> {
-        options.encoding = "UTF-8"
-        options.release.set(17)
-    }
-
-    tasks.withType<Jar> {
-        archiveBaseName.set(properties["archives_base_name"].toString())
-    }
 }

 modrinth {
--- a/common/src/main/java/me/lucaslah/weatherchanger/WeatherChanger.java
+++ b/common/src/main/java/me/lucaslah/weatherchanger/WeatherChanger.java
@@ -148,7 +148,7 @@ public class WeatherChanger {
        return commandManager;
    }

-    public static void sendClientMessage(String message) {
-        MinecraftClient.getInstance().inGameHud.getChatHud().addMessage(Text.literal(message));
+    public static void sendClientMessage(Text message) {
+        MinecraftClient.getInstance().inGameHud.getChatHud().addMessage(message);
    }
 }
--- a/common/src/main/java/me/lucaslah/weatherchanger/commands/WeatherChangerCommand.java
+++ b/common/src/main/java/me/lucaslah/weatherchanger/commands/WeatherChangerCommand.java
@@ -2,11 +2,11 @@ package me.lucaslah.weatherchanger.commands;

 import com.mojang.brigadier.CommandDispatcher;
 import com.mojang.brigadier.builder.LiteralArgumentBuilder;
-import com.mojang.brigadier.tree.CommandNode;
 import com.mojang.brigadier.tree.LiteralCommandNode;
 import me.lucaslah.weatherchanger.WeatherChanger;
 import me.lucaslah.weatherchanger.command.Command;
 import me.lucaslah.weatherchanger.config.WcMode;
+import net.minecraft.text.Text;
 import net.minecraft.util.Identifier;

 import static me.lucaslah.weatherchanger.WeatherChanger.sendClientMessage;
@@ -14,12 +14,12 @@ import static me.lucaslah.weatherchanger.WeatherChanger.sendClientMessage;
 public class WeatherChangerCommand extends Command {
    @Override
    public <T> void register(CommandDispatcher<T> dispatcher) {
-        LiteralArgumentBuilder<T> command = LiteralArgumentBuilder.<T>literal("clientweather");
+        LiteralArgumentBuilder<T> command = LiteralArgumentBuilder.literal("clientweather");

        command.then(LiteralArgumentBuilder.<T>literal("off")
                .executes(context -> {
                    WeatherChanger.setMode(WcMode.OFF);
-                    sendClientMessage("Set client weather to: Off");
+                    sendClientMessage(Text.translatable("commands.weatherchanger.set.off"));
                    return 1;
                })
        );
@@ -27,7 +27,7 @@ public class WeatherChangerCommand extends Command {
        command.then(LiteralArgumentBuilder.<T>literal("clear")
                .executes(context -> {
                    WeatherChanger.setMode(WcMode.CLEAR);
-                    sendClientMessage("Set client weather to: Clear");
+                    sendClientMessage(Text.translatable("commands.weatherchanger.set.clear"));
                    return 1;
                })
        );
@@ -35,7 +35,7 @@ public class WeatherChangerCommand extends Command {
        command.then(LiteralArgumentBuilder.<T>literal("rain")
                .executes(context -> {
                    WeatherChanger.setMode(WcMode.RAIN);
-                    sendClientMessage("Set client weather to: Rain");
+                    sendClientMessage(Text.translatable("commands.weatherchanger.set.rain"));
                    return 1;
                })
        );
@@ -43,13 +43,13 @@ public class WeatherChangerCommand extends Command {
        command.then(LiteralArgumentBuilder.<T>literal("thunder")
                .executes(context -> {
                    WeatherChanger.setMode(WcMode.THUNDER);
-                    sendClientMessage("Set client weather to: Thunder");
+                    sendClientMessage(Text.translatable("commands.weatherchanger.set.thunder"));
                    return 1;
                })
        );

        LiteralCommandNode<T> node = dispatcher.register(command);
-        dispatcher.register((LiteralArgumentBuilder<T>) LiteralArgumentBuilder.literal("cweather").redirect((CommandNode<Object>) node));
+        dispatcher.register(LiteralArgumentBuilder.<T>literal("cweather").redirect(node));
    }

    @Override
--- a/common/src/main/java/me/lucaslah/weatherchanger/keys/ToggleClearKey.java
+++ b/common/src/main/java/me/lucaslah/weatherchanger/keys/ToggleClearKey.java
@@ -5,6 +5,7 @@ import me.lucaslah.weatherchanger.config.WcMode;
 import me.lucaslah.weatherchanger.keybinding.Key;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.option.KeyBinding;
+import net.minecraft.client.resource.language.I18n;
 import net.minecraft.client.util.InputUtil;
 import net.minecraft.text.Text;
 import net.minecraft.util.Identifier;
@@ -19,7 +20,7 @@ public class ToggleClearKey extends Key {
    public void onPress(@NotNull MinecraftClient client) {
        WeatherChanger.setMode(WcMode.CLEAR);
        assert mc.player != null;
-        mc.player.sendMessage(Text.of("Set client weather to: Clear"), true);
+        mc.player.sendMessage(Text.translatable("commands.weatherchanger.set.clear"), true);
    }

    @Override
@@ -39,7 +40,7 @@ public class ToggleClearKey extends Key {

    @Override
    public String getDisplayName() {
-        return "Toggle Weather Clear";
+        return I18n.translate("keys.weatherchanger.clear.name");
    }

    @Override
--- a/common/src/main/java/me/lucaslah/weatherchanger/keys/ToggleOffKey.java
+++ b/common/src/main/java/me/lucaslah/weatherchanger/keys/ToggleOffKey.java
@@ -5,6 +5,7 @@ import me.lucaslah.weatherchanger.config.WcMode;
 import me.lucaslah.weatherchanger.keybinding.Key;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.option.KeyBinding;
+import net.minecraft.client.resource.language.I18n;
 import net.minecraft.client.util.InputUtil;
 import net.minecraft.text.Text;
 import net.minecraft.util.Identifier;
@@ -19,7 +20,7 @@ public class ToggleOffKey extends Key {
    public void onPress(@NotNull MinecraftClient client) {
        WeatherChanger.setMode(WcMode.OFF);
        assert mc.player != null;
-        mc.player.sendMessage(Text.of("Set client weather to: Off"), true);
+        mc.player.sendMessage(Text.translatable("commands.weatherchanger.set.off"), true);
    }

    @Override
@@ -39,7 +40,7 @@ public class ToggleOffKey extends Key {

    @Override
    public String getDisplayName() {
-        return "Toggle Weather Off";
+        return I18n.translate("keys.weatherchanger.off.name");
    }

    @Override
--- a/common/src/main/java/me/lucaslah/weatherchanger/keys/ToggleRainKey.java
+++ b/common/src/main/java/me/lucaslah/weatherchanger/keys/ToggleRainKey.java
@@ -5,6 +5,7 @@ import me.lucaslah.weatherchanger.config.WcMode;
 import me.lucaslah.weatherchanger.keybinding.Key;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.option.KeyBinding;
+import net.minecraft.client.resource.language.I18n;
 import net.minecraft.client.util.InputUtil;
 import net.minecraft.text.Text;
 import net.minecraft.util.Identifier;
@@ -19,7 +20,7 @@ public class ToggleRainKey extends Key {
    public void onPress(@NotNull MinecraftClient client) {
        WeatherChanger.setMode(WcMode.RAIN);
        assert mc.player != null;
-        mc.player.sendMessage(Text.of("Set client weather to: Rain"), true);
+        mc.player.sendMessage(Text.translatable("commands.weatherchanger.set.rain"), true);
    }

    @Override
@@ -39,7 +40,7 @@ public class ToggleRainKey extends Key {

    @Override
    public String getDisplayName() {
-        return "Toggle Weather Rain";
+        return I18n.translate("keys.weatherchanger.rain.name");
    }

    @Override
--- a/common/src/main/java/me/lucaslah/weatherchanger/keys/ToggleThunderKey.java
+++ b/common/src/main/java/me/lucaslah/weatherchanger/keys/ToggleThunderKey.java
@@ -5,6 +5,7 @@ import me.lucaslah.weatherchanger.config.WcMode;
 import me.lucaslah.weatherchanger.keybinding.Key;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.option.KeyBinding;
+import net.minecraft.client.resource.language.I18n;
 import net.minecraft.client.util.InputUtil;
 import net.minecraft.text.Text;
 import net.minecraft.util.Identifier;
@@ -19,7 +20,7 @@ public class ToggleThunderKey extends Key {
    public void onPress(@NotNull MinecraftClient client) {
        WeatherChanger.setMode(WcMode.THUNDER);
        assert mc.player != null;
-        mc.player.sendMessage(Text.of("Set client weather to: Thunder"), true);
+        mc.player.sendMessage(Text.translatable("commands.weatherchanger.set.thunder"), true);
    }

    @Override
@@ -39,7 +40,7 @@ public class ToggleThunderKey extends Key {

    @Override
    public String getDisplayName() {
-        return "Toggle Weather Thunder";
+        return I18n.translate("keys.weatherchanger.thunder.name");
    }

    @Override
--- a/common/src/main/resources/assets/weatherchanger/lang/en_us.json
+++ b/common/src/main/resources/assets/weatherchanger/lang/en_us.json
@@ -0,0 +1,10 @@
+{
+  "commands.weatherchanger.set.off": "Set client weather to: Off",
+  "commands.weatherchanger.set.clear": "Set client weather to: Clear",
+  "commands.weatherchanger.set.rain": "Set client weather to: Rain",
+  "commands.weatherchanger.set.thunder": "Set client weather to: Thunder",
+  "keys.weatherchanger.off.name": "Toggle Weather Off",
+  "keys.weatherchanger.clear.name": "Toggle Weather Clear",
+  "keys.weatherchanger.rain.name": "Toggle Weather Rain",
+  "keys.weatherchanger.thunder.name": "Toggle Weather Thunder"
+}
--- a/common/src/main/resources/assets/weatherchanger/lang/ru_ru.json
+++ b/common/src/main/resources/assets/weatherchanger/lang/ru_ru.json
@@ -0,0 +1,11 @@
+{
+  "modmenu.descriptionTranslation.weatherchanger": "Позволяет изменять погоду в клиенте, не изменяя погоду сервера.",
+  "commands.weatherchanger.set.off": "Установлена клиентская погода: Выкл.",
+  "commands.weatherchanger.set.clear": "Установлена клиентская погода: Ясная",
+  "commands.weatherchanger.set.rain": "Установлена клиентская погода: Дождливая",
+  "commands.weatherchanger.set.thunder": "Установлена клиентская погода: Гроза и дождь",
+  "keys.weatherchanger.off.name": "Выключить клиентскую погоду",
+  "keys.weatherchanger.clear.name": "Переключить ясную погоду",
+  "keys.weatherchanger.rain.name": "Переключить дождливую погоду",
+  "keys.weatherchanger.thunder.name": "Переключить дождливую и грозовую погоду"
+}
--- a/common/src/main/resources/assets/weatherchanger/lang/tt_ru.json
+++ b/common/src/main/resources/assets/weatherchanger/lang/tt_ru.json
@@ -0,0 +1,12 @@
+{
+  "modmenu.summaryTranslation.weatherchanger": "Клиент тарафыннан Minecraft һава торышын үзгәртү",
+  "modmenu.descriptionTranslation.weatherchanger": "Сервер тарафыннан һава торышын үзгәртмичә, клиент тарафыннан Minecraft һава торышын үзгәртү",
+  "commands.weatherchanger.set.off": "Клиентлы һава торышы урнаштырылды: Сүнек",
+  "commands.weatherchanger.set.clear": "Клиентлы һава торышы урнаштырылды: Аяз",
+  "commands.weatherchanger.set.rain": "Клиентлы һава торышы урнаштырылды: Яңгырлы",
+  "commands.weatherchanger.set.thunder": "Клиентлы һава торышы урнаштырылды: Яшенле һәм яңгырлы",
+  "keys.weatherchanger.off.name": "Клиентлы һава торышын сүндерү",
+  "keys.weatherchanger.clear.name": "Аяз һава торышын күчерү",
+  "keys.weatherchanger.rain.name": "Яңгырлы һава торышын күчерү",
+  "keys.weatherchanger.thunder.name": "Яшенле һәм яңгырлы һава торышын күчерү"
+}
--- a/gradle.properties
+++ b/gradle.properties
@@ -10,7 +10,7 @@ yarn_mappings=1.20.1+build.8
 enabled_platforms=fabric,forge

 # Mod Properties
-mod_version = 1.0.0
+mod_version = 1.0.1
 mod_id = weatherchanger
 maven_group = me.lucaslah.weatherchanger
 archives_base_name = weather-changer
Author	SHA1	Message	Date
lucaslah	67524f1cb8	Merge pull request #5 from Lucaslah/develop feat: make text translatable + bump to version 1.0.1	2024-04-30 23:06:47 +12:00
lucaslah	184ce53df8	Merge pull request #6 from Amirhan-Taipovjan-Greatest-I/patch-1 Vanilla-ish Tatar Translation and ≈Vanilla-ish Russian Translation.	2024-04-30 23:01:36 +12:00
Amirhan-Taipovjan-Greatest-I	4dbfe76b45	Updated ModMenu Metadata Translation.	2024-04-30 13:55:55 +03:00
Amirhan-Taipovjan-Greatest-I	145c638746	Russian Translation. It is not quite Vanilla-ish, but I tried to do My best.	2024-04-30 13:53:04 +03:00
Amirhan-Taipovjan-Greatest-I	22372cdd63	Vanilla-ish Tatar Translation.	2024-04-30 13:49:26 +03:00
Lucas Petrino	604d98ac13	fix: update architectury + add base archive name to build - [bug] add base archive name to build artifacts - [deps] update architectury loom from 1.4-SNAPSHOT -> 1.5 - [deps] update architectury plugin to non snapshot build - [bug] fixes an unchecked cast warning during the build	2024-04-30 12:01:12 +12:00
Lucas Petrino	4c046a3828	fix: make keys press text translatable	2024-04-30 11:00:27 +12:00
lucaslah	274c6bb035	Merge branch 'main' into develop	2024-04-29 19:14:11 +12:00
Lucas Petrino	ff08c6ee77	feat: make text translatable + bump to version 1.0.1	2024-04-29 19:10:49 +12:00
lucaslah	cc5d9d2d51	[skip ci] auto deploy website on push	2024-04-04 21:37:06 +13:00
Lucas Petrino	7aedf2fd4a	[skip ci] add website deployment	2024-04-04 21:19:15 +13:00