From 632a3c950aacd66122c49426b23f2d36120517bf Mon Sep 17 00:00:00 2001 From: 3093FengMing <83573615+3093FengMing@users.noreply.github.com> Date: Wed, 4 Jan 2023 18:55:38 +0800 Subject: [PATCH] =?UTF-8?q?update=20to=201.2.4=20=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E6=9C=AC=E5=9C=B0=E5=8C=96=E8=AF=AD=E8=A8=80=E4=B8=8E=E6=8F=90?= =?UTF-8?q?=E9=AB=98=E4=BC=98=E5=85=88=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build.gradle | 2 +- src/main/java/me/fengming/vaultpatcher/Utils.java | 6 ++++++ src/main/java/me/fengming/vaultpatcher/VaultPatcher.java | 7 ++++--- .../fengming/vaultpatcher/command/CommandEventHandler.java | 7 ++++--- .../me/fengming/vaultpatcher/command/ExportCommand.java | 7 ++++--- .../java/me/fengming/vaultpatcher/mixin/FontMixin.java | 2 +- .../me/fengming/vaultpatcher/mixin/TextComponentMixin.java | 2 +- src/main/resources/META-INF/mods.toml | 6 +++--- src/main/resources/assets/vaultpatcher/lang/en_us.json | 4 ++++ src/main/resources/assets/vaultpatcher/lang/zh_cn.json | 4 ++++ src/main/resources/mixins.vaultpatcher.json | 4 +++- 11 files changed, 35 insertions(+), 16 deletions(-) create mode 100644 src/main/java/me/fengming/vaultpatcher/Utils.java create mode 100644 src/main/resources/assets/vaultpatcher/lang/en_us.json create mode 100644 src/main/resources/assets/vaultpatcher/lang/zh_cn.json diff --git a/build.gradle b/build.gradle index c85ab12..dfe33f2 100644 --- a/build.gradle +++ b/build.gradle @@ -21,7 +21,7 @@ apply plugin: 'net.minecraftforge.gradle' apply plugin: 'org.spongepowered.mixin' -version = 'forge-1.2.3+1.18.2' +version = 'forge-1.2.4+1.18.2' group = 'me.fengming.vaultpatcher' // http://maven.apache.org/guides/mini/guide-naming-conventions.html archivesBaseName = 'vaultpatcher' diff --git a/src/main/java/me/fengming/vaultpatcher/Utils.java b/src/main/java/me/fengming/vaultpatcher/Utils.java new file mode 100644 index 0000000..6215b91 --- /dev/null +++ b/src/main/java/me/fengming/vaultpatcher/Utils.java @@ -0,0 +1,6 @@ +package me.fengming.vaultpatcher; + +public class Utils { + public static final String MOD_ID = "vaultpatcher"; + public static final String MOD_NAME = "Vault Patcher"; +} diff --git a/src/main/java/me/fengming/vaultpatcher/VaultPatcher.java b/src/main/java/me/fengming/vaultpatcher/VaultPatcher.java index 2e20941..7bc0aa0 100644 --- a/src/main/java/me/fengming/vaultpatcher/VaultPatcher.java +++ b/src/main/java/me/fengming/vaultpatcher/VaultPatcher.java @@ -2,6 +2,7 @@ import com.mojang.logging.LogUtils; import me.fengming.vaultpatcher.config.VaultPatcherConfig; +import net.minecraftforge.eventbus.api.EventPriority; import net.minecraftforge.eventbus.api.SubscribeEvent; import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.event.lifecycle.FMLCommonSetupEvent; @@ -10,14 +11,14 @@ import java.io.IOException; import java.util.ArrayList; -@Mod("vaultpatcher") +@Mod(Utils.MOD_ID) public class VaultPatcher { public static final Logger LOGGER = LogUtils.getLogger(); public static ArrayList exportList = new ArrayList<>(); - @Mod.EventBusSubscriber(modid = "vaultpatcher", bus = Mod.EventBusSubscriber.Bus.MOD) + @Mod.EventBusSubscriber(modid = Utils.MOD_ID, bus = Mod.EventBusSubscriber.Bus.MOD) public static final class Events { - @SubscribeEvent + @SubscribeEvent(priority = EventPriority.HIGHEST) public static void loadConfig(FMLCommonSetupEvent event) { event.enqueueWork(() -> { try { diff --git a/src/main/java/me/fengming/vaultpatcher/command/CommandEventHandler.java b/src/main/java/me/fengming/vaultpatcher/command/CommandEventHandler.java index daa425f..a2cf376 100644 --- a/src/main/java/me/fengming/vaultpatcher/command/CommandEventHandler.java +++ b/src/main/java/me/fengming/vaultpatcher/command/CommandEventHandler.java @@ -1,6 +1,7 @@ package me.fengming.vaultpatcher.command; import com.mojang.brigadier.CommandDispatcher; +import me.fengming.vaultpatcher.Utils; import net.minecraft.commands.CommandSourceStack; import net.minecraft.commands.Commands; import net.minecraftforge.client.event.RegisterClientCommandsEvent; @@ -8,13 +9,13 @@ import net.minecraftforge.eventbus.api.SubscribeEvent; import net.minecraftforge.fml.common.Mod; -@Mod.EventBusSubscriber(modid = "vaultpatcher", bus = Mod.EventBusSubscriber.Bus.FORGE) +@Mod.EventBusSubscriber(modid = Utils.MOD_ID, bus = Mod.EventBusSubscriber.Bus.FORGE) public class CommandEventHandler { - @SubscribeEvent(priority = EventPriority.HIGH) + @SubscribeEvent(priority = EventPriority.HIGHEST) public static void registerClientCommands(RegisterClientCommandsEvent event) { CommandDispatcher dispatcher = event.getDispatcher(); dispatcher.register( - Commands.literal("vaultpatcher").then( + Commands.literal(Utils.MOD_ID).then( Commands.literal("export") .requires((commandSource) -> commandSource.hasPermission(2)) .executes(ExportCommand.instance) diff --git a/src/main/java/me/fengming/vaultpatcher/command/ExportCommand.java b/src/main/java/me/fengming/vaultpatcher/command/ExportCommand.java index 63ed39c..4a6180b 100644 --- a/src/main/java/me/fengming/vaultpatcher/command/ExportCommand.java +++ b/src/main/java/me/fengming/vaultpatcher/command/ExportCommand.java @@ -7,6 +7,7 @@ import net.minecraft.client.Minecraft; import net.minecraft.commands.CommandSourceStack; import net.minecraft.network.chat.TextComponent; +import net.minecraft.network.chat.TranslatableComponent; import java.io.BufferedWriter; import java.io.FileWriter; @@ -22,11 +23,11 @@ public class ExportCommand implements Command { @Override public int run(CommandContext context) { - context.getSource().sendSuccess(new TextComponent("Warning: This is *WIP*"), true); + context.getSource().sendSuccess(new TranslatableComponent("commands.vaultpatcher.export.warning.wip"), true); Gson gson = new Gson(); String json = gson.toJson(exportList, new TypeToken>() { }.getType()); - //Export Patch + //Export langs try { BufferedWriter bw = new BufferedWriter( new FileWriter( @@ -40,7 +41,7 @@ public int run(CommandContext context) { } catch (IOException e) { e.printStackTrace(); } - context.getSource().sendSuccess(new TextComponent("Export langpatcher.json"), true); + context.getSource().sendSuccess(new TranslatableComponent("commands.vaultpatcher.export.tips.success"), true); return 0; } } diff --git a/src/main/java/me/fengming/vaultpatcher/mixin/FontMixin.java b/src/main/java/me/fengming/vaultpatcher/mixin/FontMixin.java index 6cc76d8..5017120 100644 --- a/src/main/java/me/fengming/vaultpatcher/mixin/FontMixin.java +++ b/src/main/java/me/fengming/vaultpatcher/mixin/FontMixin.java @@ -10,7 +10,7 @@ import static me.fengming.vaultpatcher.VaultPatcher.exportList; -@Mixin(Font.class) +@Mixin(value = Font.class, priority = Integer.MAX_VALUE) public class FontMixin { //GUI Transcription @ModifyArg( diff --git a/src/main/java/me/fengming/vaultpatcher/mixin/TextComponentMixin.java b/src/main/java/me/fengming/vaultpatcher/mixin/TextComponentMixin.java index f32438c..71898a7 100644 --- a/src/main/java/me/fengming/vaultpatcher/mixin/TextComponentMixin.java +++ b/src/main/java/me/fengming/vaultpatcher/mixin/TextComponentMixin.java @@ -10,7 +10,7 @@ import static me.fengming.vaultpatcher.VaultPatcher.exportList; -@Mixin(TextComponent.class) +@Mixin(value = TextComponent.class, priority = Integer.MAX_VALUE) public abstract class TextComponentMixin { @Accessor("text") abstract String getText(); diff --git a/src/main/resources/META-INF/mods.toml b/src/main/resources/META-INF/mods.toml index 24e8743..d4f0ae7 100644 --- a/src/main/resources/META-INF/mods.toml +++ b/src/main/resources/META-INF/mods.toml @@ -20,9 +20,9 @@ modId = "vaultpatcher" #mandatory # The version number of the mod - there's a few well known ${} variables useable here or just hardcode it # ${file.jarVersion} will substitute the value of the Implementation-Version as read from the mod's JAR file metadata # see the associated build.gradle script for how to populate this completely automatically during a build -version = "1.2.3+1.18.2" #mandatory +version = "1.2.4+1.18.2" #mandatory # A display name for the mod -displayName = "Vanilla Hardcoded Bearker" #mandatory +displayName = "Vault Patcher" #mandatory # A URL to query for updates for this mod. See the JSON update specification https://mcforge.readthedocs.io/en/latest/gettingstarted/autoupdate/ #updateJSONURL="https://change.me.example.invalid/updates.json" #optional # A URL for the "homepage" for this mod, displayed in the mod UI @@ -50,6 +50,6 @@ side = "BOTH" modId = "minecraft" mandatory = true # This version range declares a minimum of the current minecraft version up to but not including the next major version -versionRange = "[1.18.2,1.19)" +versionRange = "[1.18.2,1.19.3)" ordering = "NONE" side = "BOTH" diff --git a/src/main/resources/assets/vaultpatcher/lang/en_us.json b/src/main/resources/assets/vaultpatcher/lang/en_us.json new file mode 100644 index 0000000..c6f6338 --- /dev/null +++ b/src/main/resources/assets/vaultpatcher/lang/en_us.json @@ -0,0 +1,4 @@ +{ + "commands.vaultpatcher.export.tips.success": "Done! Export to langpatcher.json", + "commands.vaultpatcher.export.warning.wip": "Warning: This feature is still *WIP*!" +} \ No newline at end of file diff --git a/src/main/resources/assets/vaultpatcher/lang/zh_cn.json b/src/main/resources/assets/vaultpatcher/lang/zh_cn.json new file mode 100644 index 0000000..1c06577 --- /dev/null +++ b/src/main/resources/assets/vaultpatcher/lang/zh_cn.json @@ -0,0 +1,4 @@ +{ + "commands.vaultpatcher.export.tips.success": "完成！导出到langpatcher.json", + "commands.vaultpatcher.export.warning.wip": "警告：此功能仍是WIP！" +} \ No newline at end of file diff --git a/src/main/resources/mixins.vaultpatcher.json b/src/main/resources/mixins.vaultpatcher.json index a8ee8f0..fe617cb 100644 --- a/src/main/resources/mixins.vaultpatcher.json +++ b/src/main/resources/mixins.vaultpatcher.json @@ -1,6 +1,8 @@ { + "mixinPriority": 2147483647, + "priority": 2147483647, "compatibilityLevel": "JAVA_17", - "minVersion": "1", + "minVersion": "0.6", "package": "me.fengming.vaultpatcher.mixin", "refmap": "mixins.vaultpatcher.refmap.json", "mixins": [