Supports ZenScript hot reload (Require ZenUtils).

Author: KasumiNova

src/main/java/hellfirepvp/modularmachinery/ModularMachinery.java

@@ -10,9 +10,12 @@
 
 import github.kasuminova.mmce.common.concurrent.TaskExecutor;
 import hellfirepvp.modularmachinery.common.CommonProxy;
+import hellfirepvp.modularmachinery.common.base.Mods;
+import hellfirepvp.modularmachinery.common.command.CommandGetBluePrint;
 import hellfirepvp.modularmachinery.common.command.CommandHand;
 import hellfirepvp.modularmachinery.common.command.CommandPerformanceReport;
 import hellfirepvp.modularmachinery.common.command.CommandSyntax;
+import hellfirepvp.modularmachinery.common.integration.crafttweaker.command.CommandCTReload;
 import hellfirepvp.modularmachinery.common.network.*;
 import net.minecraft.launchwrapper.Launch;
 import net.minecraftforge.fluids.FluidRegistry;
@@ -96,7 +99,12 @@ public void onServerStart(FMLServerStartingEvent event) {
         //Cmd registration
         event.registerServerCommand(new CommandSyntax());
         event.registerServerCommand(new CommandHand());
+        event.registerServerCommand(new CommandGetBluePrint());
         event.registerServerCommand(new CommandPerformanceReport());
+
+        if (Mods.ZEN_UTILS.isPresent()) {
+            event.registerServerCommand(new CommandCTReload());
+        }
     }
 
 }

src/main/java/hellfirepvp/modularmachinery/common/base/Mods.java

@@ -29,6 +29,7 @@ public enum Mods {
     NUCLEARCRAFT_OVERHAULED("nuclearcraft"),
     RESOURCELOADER("resourceloader"),
     FLUX_NETWORKS("fluxnetworks"),
+    ZEN_UTILS("zenutils"),
     ;
 
     public final String modid;

src/main/java/hellfirepvp/modularmachinery/common/command/CommandGetBluePrint.java

@@ -0,0 +1,61 @@
+package hellfirepvp.modularmachinery.common.command;
+
+import hellfirepvp.modularmachinery.ModularMachinery;
+import hellfirepvp.modularmachinery.common.item.ItemBlueprint;
+import hellfirepvp.modularmachinery.common.lib.ItemsMM;
+import hellfirepvp.modularmachinery.common.machine.DynamicMachine;
+import hellfirepvp.modularmachinery.common.machine.MachineRegistry;
+import net.minecraft.command.CommandBase;
+import net.minecraft.command.ICommandSender;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.ItemStack;
+import net.minecraft.server.MinecraftServer;
+import net.minecraft.util.ResourceLocation;
+import net.minecraft.util.text.TextComponentTranslation;
+
+public class CommandGetBluePrint extends CommandBase {
+    @Override
+    public String getName() {
+        return "mm-get_blueprint";
+    }
+
+    @Override
+    public String getUsage(ICommandSender sender) {
+        return "command.modularmachinery.get_blueprint";
+    }
+
+    @Override
+    public int getRequiredPermissionLevel() {
+        return 2;
+    }
+
+    @Override
+    public void execute(MinecraftServer server, ICommandSender sender, String[] args) {
+        if (!(sender instanceof EntityPlayer)) {
+            sender.sendMessage(new TextComponentTranslation("command.modularmachinery.get_blueprint.player_only"));
+            return;
+        }
+        if (args.length < 1) {
+            sender.sendMessage(new TextComponentTranslation(getUsage(sender)));
+            return;
+        }
+
+        String machineName = args[0];
+
+        DynamicMachine machine = MachineRegistry.getRegistry().getMachine(new ResourceLocation(ModularMachinery.MODID, machineName));
+        if (machine == null) {
+            sender.sendMessage(new TextComponentTranslation(
+                    "command.modularmachinery.get_blueprint.not_found", machineName));
+            return;
+        }
+
+        EntityPlayer player = (EntityPlayer) sender;
+        ItemStack blueprint = new ItemStack(ItemsMM.blueprint);
+        ItemBlueprint.setAssociatedMachine(blueprint, machine);
+
+        if (player.addItemStackToInventory(blueprint)) {
+            sender.sendMessage(
+                    new TextComponentTranslation("command.modularmachinery.get_blueprint.success"));
+        }
+    }
+}

src/main/java/hellfirepvp/modularmachinery/common/command/CommandSyntax.java

@@ -13,7 +13,6 @@
 import net.minecraft.command.CommandBase;
 import net.minecraft.command.CommandException;
 import net.minecraft.command.ICommandSender;
-import net.minecraft.entity.player.EntityPlayerMP;
 import net.minecraft.server.MinecraftServer;
 import net.minecraft.util.text.TextComponentString;
 
@@ -43,13 +42,12 @@ public String getUsage(ICommandSender sender) {
 
     @Override
     public void execute(MinecraftServer server, ICommandSender sender, String[] args) throws CommandException {
-        EntityPlayerMP player = getCommandSenderAsPlayer(sender);
-        player.sendMessage(new TextComponentString("Testing Machines:"));
+        sender.sendMessage(new TextComponentString("Testing Machines:"));
         MachineRegistry.preloadMachines();
-        MachineRegistry.loadMachines(player);
-        player.sendMessage(new TextComponentString(""));
-        player.sendMessage(new TextComponentString("Testing Recipes:"));
-        RecipeRegistry.getRegistry().loadRecipeRegistry(player, false);
+        MachineRegistry.loadMachines(sender);
+        sender.sendMessage(new TextComponentString(""));
+        sender.sendMessage(new TextComponentString("Testing Recipes:"));
+        RecipeRegistry.getRegistry().loadRecipeRegistry(sender, false);
     }
 
 }

src/main/java/hellfirepvp/modularmachinery/common/crafting/RecipeRegistry.java

@@ -16,7 +16,7 @@
 import hellfirepvp.modularmachinery.common.data.DataLoadProfiler;
 import hellfirepvp.modularmachinery.common.integration.crafttweaker.RecipeAdapterBuilder;
 import hellfirepvp.modularmachinery.common.machine.DynamicMachine;
-import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.command.ICommandSender;
 import net.minecraft.util.ResourceLocation;
 import net.minecraft.util.Tuple;
 import net.minecraftforge.fml.common.ProgressManager;
@@ -63,7 +63,7 @@ public static MachineRecipe getRecipe(ResourceLocation key) {
         return RECIPE_REGISTRY.get(key);
     }
 
-    private static Map<DynamicMachine, List<MachineRecipe>> loadAdapters(@Nullable EntityPlayer player,
+    private static Map<DynamicMachine, List<MachineRecipe>> loadAdapters(@Nullable ICommandSender sender,
                                                                          Map<ResourceLocation, MachineRecipe> sharedLoadRegistry,
                                                                          List<RecipeAdapterBuilder> earlyRecipeAdapters) {
         ProgressManager.ProgressBar barRecipes = ProgressManager.push("RecipeRegistry - Adapters", 3);
@@ -94,7 +94,7 @@ private static Map<DynamicMachine, List<MachineRecipe>> loadAdapters(@Nullable E
 
         Map<DynamicMachine, List<MachineRecipe>> validRecipes = loadAndValidateRecipes(recipes, profiler, sharedLoadRegistry);
 
-        profiler.printLines(player);
+        profiler.printLines(sender);
         ProgressManager.pop(barRecipes);
         return validRecipes;
     }
@@ -178,20 +178,24 @@ public static void registerRecipes(Map<DynamicMachine, List<MachineRecipe>> map)
         }
     }
 
-    public void loadRecipeRegistry(@Nullable EntityPlayer player, boolean doRegister) {
+    public static int registeredRecipeCount() {
+        return RECIPE_REGISTRY.size();
+    }
+
+    public void loadRecipeRegistry(@Nullable ICommandSender sender, boolean doRegister) {
         Map<ResourceLocation, MachineRecipe> sharedLoadRegistry = new HashMap<>();
 
-        Map<DynamicMachine, List<MachineRecipe>> recipes = loadRecipes(player, sharedLoadRegistry);
+        Map<DynamicMachine, List<MachineRecipe>> recipes = loadRecipes(sender, sharedLoadRegistry);
         if (doRegister) {
             registerRecipes(recipes);
         }
-        recipes = loadAdapters(player, sharedLoadRegistry, earlyRecipeAdapters);
+        recipes = loadAdapters(sender, sharedLoadRegistry, earlyRecipeAdapters);
         if (doRegister) {
             registerRecipes(recipes);
         }
     }
 
-    private Map<DynamicMachine, List<MachineRecipe>> loadRecipes(@Nullable EntityPlayer player, Map<ResourceLocation, MachineRecipe> sharedLoadRegistry) {
+    private Map<DynamicMachine, List<MachineRecipe>> loadRecipes(@Nullable ICommandSender player, Map<ResourceLocation, MachineRecipe> sharedLoadRegistry) {
         ProgressManager.ProgressBar barRecipes = ProgressManager.push("RecipeRegistry - Recipes", 3);
         barRecipes.step("Discovering Files");
         DataLoadProfiler profiler = new DataLoadProfiler();
@@ -238,4 +242,10 @@ public void clearLingeringRecipes() {
         this.earlyRecipeAdapters.clear();
     }
 
+    public void clearAllRecipes() {
+        RECIPE_REGISTRY.clear();
+        REGISTRY_RECIPE_BY_MACHINE.clear();
+        this.earlyRecipes.clear();
+        this.earlyRecipeAdapters.clear();
+    }
 }

src/main/java/hellfirepvp/modularmachinery/common/crafting/adapter/AdapterIC2Compressor.java

@@ -23,7 +23,6 @@
 
 public class AdapterIC2Compressor extends RecipeAdapter {
     public static final int workTime = 300;
-    private int incId = 0;
 
     public AdapterIC2Compressor() {
         super(new ResourceLocation("ic2", "te_compressor"));

src/main/java/hellfirepvp/modularmachinery/common/crafting/adapter/AdapterMinecraftFurnace.java

@@ -37,8 +37,6 @@
  */
 public class AdapterMinecraftFurnace extends RecipeAdapter {
 
-    private int incId = 0;
-
     public AdapterMinecraftFurnace() {
         super(new ResourceLocation("minecraft", "furnace"));
     }

src/main/java/hellfirepvp/modularmachinery/common/crafting/adapter/DynamicMachineRecipeAdapter.java

@@ -33,7 +33,6 @@
  */
 public class DynamicMachineRecipeAdapter extends RecipeAdapter {
     private final DynamicMachine originalMachine;
-    private int incId = 0;
 
     public DynamicMachineRecipeAdapter(@Nonnull ResourceLocation registryName, DynamicMachine originalMachine) {
         super(registryName);

src/main/java/hellfirepvp/modularmachinery/common/crafting/adapter/RecipeAdapter.java

@@ -32,6 +32,7 @@
 public abstract class RecipeAdapter implements IForgeRegistryEntry<RecipeAdapter> {
 
     private final ResourceLocation registryName;
+    protected int incId = 0;
 
     public RecipeAdapter(@Nonnull ResourceLocation registryName) {
         this.registryName = registryName;
@@ -66,6 +67,10 @@ public MachineRecipe createRecipeShell(ResourceLocation uniqueRecipeName, Resour
                 uniqueRecipeName, owningMachineName, tickTime, priority, voidPerTickFailure, Config.recipeParallelizeEnabledByDefault);
     }
 
+    public void resetIncId() {
+        incId = 0;
+    }
+
     public static void addAdditionalRequirements(MachineRecipe recipe,
                                                  List<ComponentRequirement<?, ?>> additionalRequirements,
                                                  Map<Class<?>, List<IEventHandler<RecipeEvent>>> eventHandlers,

src/main/java/hellfirepvp/modularmachinery/common/crafting/adapter/nco/AdapterNCOAlloyFurnace.java

@@ -6,8 +6,8 @@
 import hellfirepvp.modularmachinery.common.crafting.adapter.RecipeAdapter;
 import hellfirepvp.modularmachinery.common.crafting.helper.ComponentRequirement;
 import hellfirepvp.modularmachinery.common.crafting.requirement.RequirementEnergy;
-import hellfirepvp.modularmachinery.common.crafting.requirement.RequirementItem;
 import hellfirepvp.modularmachinery.common.crafting.requirement.RequirementIngredientArray;
+import hellfirepvp.modularmachinery.common.crafting.requirement.RequirementItem;
 import hellfirepvp.modularmachinery.common.integration.crafttweaker.event.recipe.RecipeEvent;
 import hellfirepvp.modularmachinery.common.lib.RequirementTypesMM;
 import hellfirepvp.modularmachinery.common.machine.IOType;
@@ -30,7 +30,6 @@
 public class AdapterNCOAlloyFurnace extends RecipeAdapter {
     public static final int WORK_TIME = 400;
     public static final int BASE_ENERGY_USAGE = 10;
-    private int incId = 0;
 
     public AdapterNCOAlloyFurnace() {
         super(new ResourceLocation("nuclearcraft", "alloy_furnace"));