From c9af49076ca0ca24e2c5c05956f72387518a73a3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=9D=E5=A4=8F=E5=90=8C=E5=AD=A6?= <2411829240@qq.com> Date: Mon, 27 May 2024 23:53:44 +0800 Subject: [PATCH] =?UTF-8?q?Fix=20minor=20bugs=20and=20add=20command=20to?= =?UTF-8?q?=20load=20=E5=90=97modification=20in=20the=20server?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dependencies.gradle | 6 ++-- .../client/command/GTNHModifyCommand.java | 9 ++++- .../client/gui/GTNHModifyGuiConfig.java | 2 +- .../wohaopa/GTNHModify/handler/Handlers.java | 33 ++++++++++--------- .../assets/GTNHModify/lang/en_US.lang | 7 ++++ 5 files changed, 36 insertions(+), 21 deletions(-) diff --git a/dependencies.gradle b/dependencies.gradle index 69e7ff9..ef74be9 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -36,12 +36,12 @@ dependencies { runtimeOnlyNonPublishable("com.github.GTNewHorizons:NotEnoughItems:2.5.27-GTNH:dev") - implementation("com.github.GTNewHorizons:GT5-Unofficial:5.09.45.163:dev") + compileOnly("com.github.GTNewHorizons:GT5-Unofficial:5.09.45.163:dev") implementation("thaumcraft:Thaumcraft:1.7.10-4.2.3.5:dev") - implementation("com.github.GTNewHorizons:GTNH-Intergalactic:1.3.4:dev") + compileOnly("com.github.GTNewHorizons:GTNH-Intergalactic:1.3.4:dev") - runtimeOnly("com.github.GTNewHorizons:TecTech:5.3.45:dev") + compileOnly("com.github.GTNewHorizons:TecTech:5.3.45:dev") // runtimeOnly("com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-352-GTNH:dev") // runtimeOnly("com.github.GTNewHorizons:AE2FluidCraft-Rework:1.2.28-gtnh:dev") diff --git a/src/main/java/com/github/wohaopa/GTNHModify/client/command/GTNHModifyCommand.java b/src/main/java/com/github/wohaopa/GTNHModify/client/command/GTNHModifyCommand.java index 8cb89b4..bd4067f 100644 --- a/src/main/java/com/github/wohaopa/GTNHModify/client/command/GTNHModifyCommand.java +++ b/src/main/java/com/github/wohaopa/GTNHModify/client/command/GTNHModifyCommand.java @@ -11,6 +11,8 @@ import net.minecraft.util.ChatComponentText; import net.minecraft.util.ChatComponentTranslation; +import com.github.wohaopa.GTNHModify.handler.Handlers; + public class GTNHModifyCommand extends CommandBase { @Override @@ -38,7 +40,7 @@ public String getCommandUsage(ICommandSender sender) { return "commands.gtnh-modify.usage"; } - private static final List subCmds = Stream.of("hello", "export", "help") + private static final List subCmds = Stream.of("hello", "export", "help", "load") .sorted() .collect(Collectors.toList()); @@ -86,6 +88,11 @@ public void processCommand(ICommandSender sender, String[] args) { switch (test) { case "help" -> printHelps(sender); case "hello" -> sender.addChatMessage(new ChatComponentText("你好")); + case "load" -> { + if (Handlers.init()) + sender.addChatMessage(new ChatComponentTranslation("commands.gtnh-modify.load.success")); + else sender.addChatMessage(new ChatComponentTranslation("commands.gtnh-modify.load.failure")); + } default -> { if (subCmds.contains(test)) { printHelp(sender, test); diff --git a/src/main/java/com/github/wohaopa/GTNHModify/client/gui/GTNHModifyGuiConfig.java b/src/main/java/com/github/wohaopa/GTNHModify/client/gui/GTNHModifyGuiConfig.java index 909dd07..ab6205d 100644 --- a/src/main/java/com/github/wohaopa/GTNHModify/client/gui/GTNHModifyGuiConfig.java +++ b/src/main/java/com/github/wohaopa/GTNHModify/client/gui/GTNHModifyGuiConfig.java @@ -17,7 +17,7 @@ public GTNHModifyGuiConfig(GuiScreen guiScreen) { guiScreen, new ConfigElement(Config.config.getCategory(Configuration.CATEGORY_GENERAL)).getChildElements(), GTNHModifyMod.MODID, - false, + true, false, GuiConfig.getAbridgedConfigPath(Config.config.toString())); } diff --git a/src/main/java/com/github/wohaopa/GTNHModify/handler/Handlers.java b/src/main/java/com/github/wohaopa/GTNHModify/handler/Handlers.java index 4e84d08..772805d 100644 --- a/src/main/java/com/github/wohaopa/GTNHModify/handler/Handlers.java +++ b/src/main/java/com/github/wohaopa/GTNHModify/handler/Handlers.java @@ -15,15 +15,16 @@ public class Handlers { private static final String Suffix = "Handler"; private static final List methods = new ArrayList<>(); - public static void init() { - if (!Strategy.prevInit()) return; - - handlers.add("Minecraft"); - if (ModHelper.hasGregtech) handlers.add("GregTech"); - if (ModHelper.hasThaumcraft) handlers.add("Thaumcraft"); + public static boolean init() { + if (!Strategy.prevInit()) return false; GTNHModifyMod.LOG.info("Start processing the recipe"); if (methods.isEmpty()) { + + handlers.add("Minecraft"); + if (ModHelper.hasGregtech) handlers.add("GregTech"); + if (ModHelper.hasThaumcraft) handlers.add("Thaumcraft"); + String pkg = Handlers.class.getName() .replace("Handlers", ""); for (String name : handlers) { @@ -40,20 +41,20 @@ public static void init() { GTNHModifyMod.LOG.debug("An error occurred while initializing handler. Reason: " + e.getMessage()); } } - - for (Method method : methods) { - try { - GTNHModifyMod.LOG.info( - "Invoke handler: " + method.getDeclaringClass() - .getName()); - method.invoke(null); - } catch (IllegalAccessException | InvocationTargetException e) { - GTNHModifyMod.LOG.debug("An error occurred while executing handler. Reason: " + e.getMessage()); - } + } + for (Method method : methods) { + try { + GTNHModifyMod.LOG.info( + "Invoke handler: " + method.getDeclaringClass() + .getName()); + method.invoke(null); + } catch (IllegalAccessException | InvocationTargetException e) { + GTNHModifyMod.LOG.debug("An error occurred while executing handler. Reason: " + e.getMessage()); } } Strategy.postInit(); GTNHModifyMod.LOG.info("Complete processing the recipe"); + return true; } } diff --git a/src/main/resources/assets/GTNHModify/lang/en_US.lang b/src/main/resources/assets/GTNHModify/lang/en_US.lang index b362597..89e8c10 100644 --- a/src/main/resources/assets/GTNHModify/lang/en_US.lang +++ b/src/main/resources/assets/GTNHModify/lang/en_US.lang @@ -1 +1,8 @@ commands.gtnh-modify.usage=Used to export some game content. +commands.gtnh-modify.help.usage=/gtnh-modify help: Get help +commands.gtnh-modify.export.usage=/gtnh-modify export: Export +commands.gtnh-modify.load.usage=/gtnh-modify load: Load modify if nei does not display correctly +commands.gtnh-modify.hello.usage=/gtnh-modify hello: HelloWorld + +commands.gtnh-modify.load.success=Load Modify Success! +commands.gtnh-modify.load.failure=Load Modify Failure! Probably need a restart, or it's already loaded!