GUI Fix; Add ParallelController TOP support.

Author: KasumiNova

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

@@ -36,7 +36,6 @@
  */
 @Mod(modid = ModularMachinery.MODID, name = ModularMachinery.NAME, version = ModularMachinery.VERSION,
         dependencies = "required-after:forge@[14.21.0.2371,);after:crafttweaker@[4.0.4,);after:jei@[4.13.1.222,)",
-        certificateFingerprint = "a0f0b759d895c15ceb3e3bcb5f3c2db7c582edf0",
         acceptedMinecraftVersions = "[1.12, 1.13)"
 )
 public class ModularMachinery {

src/main/java/hellfirepvp/modularmachinery/client/gui/GuiMachineController.java

@@ -152,14 +152,13 @@ protected void drawGuiContainerForegroundLayer(int mouseX, int mouseY) {
                 String progressStr = I18n.format("gui.controller.status.crafting.progress",  progress + "%");
                 fr.drawStringWithShadow(progressStr, offsetX, offsetY, 0xFFFFFF);
             }
+
             int parallelism = activeRecipe.getParallelism();
+            int maxParallelism = activeRecipe.getMaxParallelism();
             if (parallelism > 1) {
-                offsetY += 10;
+                offsetY += 15;
                 String parallelismStr = I18n.format("gui.controller.parallelism", parallelism);
                 fr.drawStringWithShadow(parallelismStr, offsetX, offsetY, 0xFFFFFF);
-            }
-            int maxParallelism = activeRecipe.getMaxParallelism();
-            if (maxParallelism > 1) {
                 offsetY += 10;
                 String maxParallelismStr = I18n.format("gui.controller.max_parallelism", maxParallelism);
                 fr.drawStringWithShadow(maxParallelismStr, offsetX, offsetY, 0xFFFFFF);

src/main/java/hellfirepvp/modularmachinery/common/data/Config.java

@@ -31,6 +31,7 @@
  */
 public class Config {
     public static boolean mocCompatibleMode = false;
+    public static boolean onlyOneMachineController = false;
     public static boolean disableMocDeprecatedTip = false;
     public static int machineColor;
     public static boolean selectiveUpdateTileEntity = false;
@@ -76,6 +77,8 @@ private static void load() {
         mocCompatibleMode = lastReadConfig.getBoolean(
                 "modular-controller-compatible-mode", "general", false,
                 "When enabled, the mod registers a controller block under the name modularcontroller to prevent incompatibility with older saves.");
+        onlyOneMachineController = lastReadConfig.getBoolean("only-one-machine-controller", "general", false,
+                "When enabled, Modules no longer register a separate controller for each machine, and the modular-controller-compatible-mode option is turned off.");
         disableMocDeprecatedTip = lastReadConfig.getBoolean(
                 "disable-moc-deprecated-tip", "general", false,
                 "Disable the ModularController is deprecated tooltip.");

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

@@ -1,6 +1,6 @@
 package hellfirepvp.modularmachinery.common.integration;
 
-import hellfirepvp.modularmachinery.common.integration.theoneprobe.DynamicMachineInfoProvider;
+import hellfirepvp.modularmachinery.common.integration.theoneprobe.MMInfoProvider;
 import mcjty.theoneprobe.TheOneProbe;
 import mcjty.theoneprobe.apiimpl.TheOneProbeImp;
 import net.minecraftforge.common.config.Configuration;
@@ -11,11 +11,12 @@ public class ModIntegrationTOP {
     public static int recipeProgressBarBorderColor = 0xCC43CD80;
     public static int recipeProgressBarBackgroundColor = 0xFF000000;
     public static boolean showRecipeProgressBarDecimalPoints = true;
+    public static boolean showParallelControllerInfo = true;
 
     public static void registerProvider() {
         TheOneProbeImp top = TheOneProbe.theOneProbeImp;
 
-        top.registerProvider(new DynamicMachineInfoProvider());
+        top.registerProvider(new MMInfoProvider());
     }
 
     public static void loadFromConfig(Configuration cfg) {
@@ -41,5 +42,7 @@ public static void loadFromConfig(Configuration cfg) {
         showRecipeProgressBarDecimalPoints = cfg.getBoolean("SHOW_RECIPE_PROGRESSBAR_DECIMAL_POINTS",
                 "display.theoneprobe", true,
                 "Show recipe progressbar decimal points if TheOneProbe mod is installed.");
+        showParallelControllerInfo = cfg.getBoolean("SHOW_PARALLEL_CONTROLLER_INFO", "display.theoneprobe",
+                true, "Show parallel controller info if TheOneProbe mod is installed.");
     }
 }

…oneprobe/DynamicMachineInfoProvider.java …egration/theoneprobe/MMInfoProvider.javasrc/main/java/hellfirepvp/modularmachinery/common/integration/theoneprobe/DynamicMachineInfoProvider.java renamed to src/main/java/hellfirepvp/modularmachinery/common/integration/theoneprobe/MMInfoProvider.java src/main/java/hellfirepvp/modularmachinery/common/integration/theoneprobe/DynamicMachineInfoProvider.java renamed to src/main/java/hellfirepvp/modularmachinery/common/integration/theoneprobe/MMInfoProvider.java

@@ -3,14 +3,15 @@
 import hellfirepvp.modularmachinery.common.crafting.ActiveMachineRecipe;
 import hellfirepvp.modularmachinery.common.integration.ModIntegrationTOP;
 import hellfirepvp.modularmachinery.common.tiles.TileMachineController;
+import hellfirepvp.modularmachinery.common.tiles.TileParallelController;
 import mcjty.theoneprobe.api.*;
 import net.minecraft.block.state.IBlockState;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.text.TextFormatting;
 import net.minecraft.world.World;
 
-public class DynamicMachineInfoProvider implements IProbeInfoProvider {
+public class MMInfoProvider implements IProbeInfoProvider {
     @Override
     public String getID() {
         return "modularmachinery:dynamic_machine_info_provider";
@@ -24,18 +25,38 @@ public void addProbeInfo(ProbeMode mode, IProbeInfo probeInfo, EntityPlayer play
         TileEntity tileEntity = world.getTileEntity(data.getPos());
         if (tileEntity == null) return;
         //判断是否为机械控制器
-        TileMachineController machine = tileEntity instanceof TileMachineController ? (TileMachineController) tileEntity : null;
-        if (machine == null) return;
+        if (tileEntity instanceof TileMachineController) {
+            processMachineControllerTOP((TileMachineController) tileEntity, probeInfo, player);
+        }
+        if (tileEntity instanceof TileParallelController) {
+            processParallelControllerTOP((TileParallelController) tileEntity, probeInfo);
+        }
+    }
+
+    private static void processParallelControllerTOP(TileParallelController parallelController, IProbeInfo probeInfo) {
+        if (!ModIntegrationTOP.showParallelControllerInfo) {
+            return;
+        }
+        TileParallelController.ParallelControllerProvider provider = parallelController.provideComponent();
+        probeInfo.text(TextFormatting.AQUA + "{*top.parallelism*}" + TextFormatting.GREEN + provider.getParallelism());
+        probeInfo.text(TextFormatting.GOLD + "{*top.max_parallelism*}" + TextFormatting.YELLOW + provider.getMaxParallelism());
+    }
 
+    private static void processMachineControllerTOP(TileMachineController machine, IProbeInfo probeInfo, EntityPlayer player) {
         //是否在工作
-        if (machine.hasActiveRecipe() && machine.getFoundMachine() != null) {
+        if (machine.getActiveRecipe() != null && machine.getFoundMachine() != null) {
             probeInfo.text(TextFormatting.GREEN + "{*top.machine.working*}");
 
             ActiveMachineRecipe activeRecipe = machine.getActiveRecipe();
             int tick = activeRecipe.getTick();
             int totalTick = activeRecipe.getTotalTick();
             float progress = (float) (tick * 100) / totalTick;
 
+            if (activeRecipe.getParallelism() > 1) {
+                probeInfo.text(TextFormatting.AQUA + "{*top.parallelism*}" + TextFormatting.GREEN + activeRecipe.getParallelism());
+                probeInfo.text(TextFormatting.GOLD + "{*top.max_parallelism*}" + TextFormatting.YELLOW + activeRecipe.getMaxParallelism());
+            }
+
             String progressStr;
             if (player.isSneaking()) {
                 //如：20.5 秒 / 40.0 秒

src/main/java/hellfirepvp/modularmachinery/common/registry/RegistryBlocks.java

@@ -113,6 +113,9 @@ private static void registerTiles() {
     }
 
     private static void registerCustomControllers() {
+        if (Config.onlyOneMachineController) {
+            return;
+        }
         List<DynamicMachine> waitForLoadMachines = MachineRegistry.getWaitForLoadMachines();
         for (MachineBuilder builder : MachineBuilder.PRE_LOAD_MACHINES.values()) {
             waitForLoadMachines.add(builder.getMachine());

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

@@ -84,6 +84,7 @@ public class TileMachineController extends TileEntityRestrictedTick implements I
     private final Map<String, RecipeModifier> customModifiers = new HashMap<>();
     private final Map<TileSmartInterface.SmartInterfaceProvider, String> foundSmartInterfaces = new HashMap<>();
     private final List<Tuple<MachineComponent<?>, ComponentSelectorTag>> foundComponents = new ArrayList<>();
+    private final List<TileParallelController.ParallelControllerProvider> foundParallelControllers = new ArrayList<>();
     private BlockController parentController = null;
     private NBTTagCompound customData = new NBTTagCompound();
     private CraftingStatus craftingStatus = CraftingStatus.MISSING_STRUCTURE;
@@ -698,11 +699,8 @@ private boolean matchesRotation(TaggedPositionBlockArray pattern, DynamicMachine
 
     public int getMaxParallelism() {
         int parallelism = 0;
-        for (Tuple<MachineComponent<?>, ComponentSelectorTag> foundComponent : foundComponents) {
-            if (foundComponent.getFirst() instanceof TileParallelController.ParallelControllerProvider) {
-                TileParallelController.ParallelControllerProvider provider = (TileParallelController.ParallelControllerProvider) foundComponent.getFirst();
-                parallelism += provider.getParallelism();
-            }
+        for (TileParallelController.ParallelControllerProvider provider : foundParallelControllers) {
+            parallelism += provider.getParallelism();
         }
         return Math.min(Math.max(1, parallelism), foundMachine.getMaxParallelism());
     }
@@ -722,6 +720,7 @@ private void updateComponents() {
 
         this.foundComponents.clear();
         this.foundSmartInterfaces.clear();
+        this.foundParallelControllers.clear();
         for (BlockPos potentialPosition : this.foundPattern.getPattern().keySet()) {
             BlockPos realPos = getPos().add(potentialPosition);
             TileEntity te = getWorld().getTileEntity(realPos);
@@ -737,6 +736,11 @@ private void updateComponents() {
 
             this.foundComponents.add(new Tuple<>(component, tag));
 
+            if (component instanceof TileParallelController.ParallelControllerProvider) {
+                this.foundParallelControllers.add((TileParallelController.ParallelControllerProvider) component);
+                continue;
+            }
+
             if (!(component instanceof TileSmartInterface.SmartInterfaceProvider) || foundMachine.smartInterfaceTypesIsEmpty()) {
                 continue;
             }
@@ -877,7 +881,15 @@ public void readCustomNBT(NBTTagCompound compound) {
         } else {
             this.craftingStatus = CraftingStatus.deserialize(compound.getCompoundTag("statusTag"));
         }
-
+        if (compound.hasKey("parentMachine")) {
+            ResourceLocation rl = new ResourceLocation(compound.getString("parentMachine"));
+            parentMachine = MachineRegistry.getRegistry().getMachine(rl);
+            if (parentMachine != null) {
+                parentController = BlockController.MACHINE_CONTROLLERS.get(parentMachine);
+            } else {
+                ModularMachinery.log.info("Couldn't find machine named " + rl + " for controller at " + getPos());
+            }
+        }
         if (compound.hasKey("machine") && compound.hasKey("rotation")) {
             ResourceLocation rl = new ResourceLocation(compound.getString("machine"));
             DynamicMachine machine = MachineRegistry.getRegistry().getMachine(rl);
@@ -913,15 +925,6 @@ public void readCustomNBT(NBTTagCompound compound) {
         } else {
             resetMachine(false);
         }
-        if (compound.hasKey("parentMachine")) {
-            ResourceLocation rl = new ResourceLocation(compound.getString("parentMachine"));
-            parentMachine = MachineRegistry.getRegistry().getMachine(rl);
-            if (parentMachine != null) {
-                parentController = BlockController.MACHINE_CONTROLLERS.get(parentMachine);
-            } else {
-                ModularMachinery.log.info("Couldn't find machine named " + rl + " for controller at " + getPos());
-            }
-        }
         if (compound.hasKey("activeRecipe")) {
             NBTTagCompound tag = compound.getCompoundTag("activeRecipe");
             ActiveMachineRecipe recipe = new ActiveMachineRecipe(tag);

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

@@ -42,6 +42,8 @@ top.recipe.progress=Progress
 top.machine.working=Processing
 top.machine.structure.found=Structure formed
 top.machine.structure.none=Missing structure
+top.max_parallelism=Max Parallelism：
+top.parallelism=Parallelism：
 
 craftcheck.failure.item.input=Missing input item!
 craftcheck.failure.item.output.space=Not enough inventory space for item output(s)!

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

@@ -45,6 +45,8 @@ top.recipe.progress=进度
 top.machine.working=工作中
 top.machine.structure.found=结构已形成
 top.machine.structure.none=结构不完整
+top.max_parallelism=最大并行数：
+top.parallelism=并行数：
 
 craftcheck.failure.item.input=缺少物品输入！
 craftcheck.failure.item.output.space=没有足够的库存空间用于物品输出！