Fix JSON Machine cannot reload problem; Add client-only reload command.

Author: KasumiNova

src/main/java/hellfirepvp/modularmachinery/client/ClientProxy.java

@@ -18,6 +18,7 @@
 import hellfirepvp.modularmachinery.common.block.BlockController;
 import hellfirepvp.modularmachinery.common.block.BlockDynamicColor;
 import hellfirepvp.modularmachinery.common.block.BlockVariants;
+import hellfirepvp.modularmachinery.common.integration.crafttweaker.command.CommandCTReloadClient;
 import hellfirepvp.modularmachinery.common.item.ItemBlueprint;
 import hellfirepvp.modularmachinery.common.item.ItemDynamicColor;
 import hellfirepvp.modularmachinery.common.machine.DynamicMachine;
@@ -46,6 +47,7 @@
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.MathHelper;
 import net.minecraft.world.World;
+import net.minecraftforge.client.ClientCommandHandler;
 import net.minecraftforge.client.event.ModelRegistryEvent;
 import net.minecraftforge.client.model.ModelLoader;
 import net.minecraftforge.common.MinecraftForge;
@@ -170,6 +172,7 @@ public void init() {
     @Override
     public void postInit() {
         super.postInit();
+        ClientCommandHandler.instance.registerCommand(new CommandCTReloadClient());
     }
 
     @Override

src/main/java/hellfirepvp/modularmachinery/common/integration/ModIntegrationCrafttweaker.java

@@ -62,11 +62,13 @@ public void onScriptsReloading(ScriptReloadEvent.Pre event) {
         // Reset RecipeAdapterIncId
         RegistriesMM.ADAPTER_REGISTRY.getValuesCollection().forEach(RecipeAdapter::resetIncId);
 
-        // Reload JSON Machine
         for (DynamicMachine loadedMachine : MachineRegistry.getLoadedMachines()) {
             loadedMachine.getMachineEventHandlers().clear();
             loadedMachine.getSmartInterfaceTypes().clear();
         }
+        // Reload JSON Machine
+        MachineRegistry.preloadMachines();
+        // Reload All Machine
         MachineRegistry.reloadMachine(MachineRegistry.loadMachines(null));
         sender.sendMessage(new TextComponentTranslation(
                 "message.reloaded.machines", MachineRegistry.getLoadedMachines().size()));

src/main/java/hellfirepvp/modularmachinery/common/integration/crafttweaker/command/CommandCTReloadClient.java

@@ -0,0 +1,50 @@
+package hellfirepvp.modularmachinery.common.integration.crafttweaker.command;
+
+import crafttweaker.CraftTweakerAPI;
+import crafttweaker.runtime.ScriptLoader;
+import net.minecraft.command.CommandBase;
+import net.minecraft.command.ICommandSender;
+import net.minecraft.server.MinecraftServer;
+import net.minecraft.util.text.TextFormatting;
+import net.minecraftforge.common.MinecraftForge;
+import stanhebben.zenscript.ZenModule;
+import youyihj.zenutils.ZenUtils;
+import youyihj.zenutils.api.reload.ScriptReloadEvent;
+
+import static crafttweaker.mc1120.commands.SpecialMessagesChat.getNormalMessage;
+import static youyihj.zenutils.impl.reload.ReloadCommand.RELOADABLE_LOADER;
+
+/**
+ * Similar to {@link CommandCTReload}, but only works in client.
+ */
+public class CommandCTReloadClient extends CommandBase {
+    @Override
+    public String getName() {
+        return "mm-reload_client";
+    }
+
+    @Override
+    public String getUsage(ICommandSender sender) {
+        return "command.modularmachinery.reload_client";
+    }
+
+    @Override
+    public void execute(MinecraftServer server, ICommandSender sender, String[] args) {
+        sender.sendMessage(getNormalMessage(TextFormatting.AQUA + "Beginning reload scripts"));
+        sender.sendMessage(getNormalMessage("Only scripts that marked " + TextFormatting.GRAY + "#loader reloadable " + TextFormatting.RESET + "can be reloaded."));
+        sender.sendMessage(getNormalMessage(TextFormatting.YELLOW + "Most recipe modifications are not reloadable, they will be ignored."));
+        ZenUtils.tweaker.freezeActionApplying();
+        ZenModule.loadedClasses.clear();
+        ZenUtils.crafttweakerLogger.clear();
+        MinecraftForge.EVENT_BUS.post(new ScriptReloadEvent.Pre(sender));
+        ScriptLoader loader = RELOADABLE_LOADER.get();
+        loader.setLoaderStage(ScriptLoader.LoaderStage.NOT_LOADED);
+        CraftTweakerAPI.tweaker.loadScript(false, loader);
+        if (loader.getLoaderStage() == ScriptLoader.LoaderStage.ERROR) {
+            sender.sendMessage(getNormalMessage(TextFormatting.DARK_RED + "Failed to reload scripts"));
+        } else {
+            sender.sendMessage(getNormalMessage("Reloaded successfully"));
+        }
+        MinecraftForge.EVENT_BUS.post(new ScriptReloadEvent.Post(sender));
+    }
+}

src/main/java/hellfirepvp/modularmachinery/common/tiles/TileMachineController.java

@@ -408,8 +408,7 @@ public void onFinished() {
 
         this.context.finishCrafting();
 
-        this.activeRecipe.reset();
-        this.activeRecipe.setMaxParallelism(getMaxParallelism());
+        this.activeRecipe = new ActiveMachineRecipe(this.activeRecipe.getRecipe(), getMaxParallelism());
         this.context = createContext(this.activeRecipe);
         tryStartRecipe(context);
     }

src/main/resources/assets/modularmachinery/lang/en_US.lang

@@ -8,6 +8,7 @@ command.modularmachinery.get_blueprint.player_only=§cThis command can only be e
 command.modularmachinery.get_blueprint.not_found=The machine with the registered name %s was not found!
 command.modularmachinery.get_blueprint.success=Blueprints have been given.
 command.modularmachinery.reload=/mm-reload
+command.modularmachinery.reload_client=/mm-reload_client
 command.modularmachinery.performance_report=/mm-performance_report [reset]
 command.modularmachinery.performance_report.title=Modular Machinery - Concurrent Performance Reporting (%s Executions Counted)
 command.modularmachinery.performance_report.reset=Performance report has been reset.

src/main/resources/assets/modularmachinery/lang/zh_CN.lang

@@ -7,6 +7,8 @@ command.modularmachinery.get_blueprint=/mm-get_blueprint <machineName>
 command.modularmachinery.get_blueprint.player_only=§c该指令只能由玩家执行。
 command.modularmachinery.get_blueprint.not_found=未找到注册名为 %s 的机械！
 command.modularmachinery.get_blueprint.success=已给予机械蓝图。
+command.modularmachinery.reload=/mm-reload
+command.modularmachinery.reload_client=/mm-reload_client
 command.modularmachinery.performance_report=/mm-performance_report [reset]
 command.modularmachinery.performance_report.title=模块化机械 - 并行性能报告（已统计 %s 次执行）
 command.modularmachinery.performance_report.reset=性能报告数据已重置。