TX Loader support; Fix the problem that the recipe does not update the components correctly during operation.

Author: KasumiNova

build.gradle

@@ -108,8 +108,7 @@ dependencies {
     implementation fg.deobf("curse.maven:flux-networks-248020:3178199")
     implementation fg.deobf("curse.maven:tinkers-construct-74072:2902483")
     implementation fg.deobf("curse.maven:mantle-74924:2713386")
-
-    compileOnly fg.deobf("curse.maven:lazy-ae2-322347:3254160")
+    implementation fg.deobf("curse.maven:tx-loader-706505:4515357")
 }
 
 jar {

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

@@ -28,6 +28,9 @@ public enum Mods {
     TOP("theoneprobe"),
     NUCLEARCRAFT_OVERHAULED("nuclearcraft"),
     RESOURCELOADER("resourceloader"),
+    // TXLoader uses fully private variables and I can't get the correct resource folder.
+    // Bad design.
+    TX_LOADER("txloader"),
     FLUX_NETWORKS("fluxnetworks"),
     ZEN_UTILS("zenutils"),
     TCONSTRUCT("tconstruct"),

src/main/java/hellfirepvp/modularmachinery/common/crafting/helper/RecipeCraftingContext.java

@@ -24,6 +24,7 @@
 import hellfirepvp.modularmachinery.common.tiles.base.TileMultiblockMachineController;
 import hellfirepvp.modularmachinery.common.util.Asyncable;
 import hellfirepvp.modularmachinery.common.util.ResultChance;
+import net.minecraft.util.Tuple;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
@@ -341,6 +342,14 @@ private boolean canStartCrafting(final CraftingCheckResult result, final Compone
         return false;
     }
 
+    public void updateComponents(Collection<Tuple<MachineComponent<?>, ComponentSelectorTag>> components) {
+        this.typeComponents.clear();
+        for (final Tuple<MachineComponent<?>, ComponentSelectorTag> tuple : components) {
+            addComponent(tuple.getFirst(), tuple.getSecond());
+        }
+        updateRequirementComponents();
+    }
+
     public <T> void addComponent(MachineComponent<T> component, @Nullable ComponentSelectorTag tag) {
         this.typeComponents.add(new ProcessingComponent<>(component, component.getContainerProvider(), tag));
     }

src/main/java/hellfirepvp/modularmachinery/common/integration/preview/StructurePreviewWrapper.java

@@ -328,12 +328,22 @@ public static ItemStack renderItemStackToGUI(final GuiScreen g, final Minecraft
         ri.renderItemOverlays(mc.fontRenderer, stack, x, y);
 
         if ((mouseX >= x && mouseX <= x + 16) && (mouseY >= y && mouseY <= y + 16)) {
-            GuiScreen.drawRect(x, y, x + 16, y + 16, new Color(255, 255, 255, 150).getRGB());
+            renderHoveredForeground(x, y);
             return stack;
         }
         return null;
     }
 
+    private static void renderHoveredForeground(final int x, final int y) {
+        GlStateManager.disableLighting();
+        GlStateManager.disableDepth();
+        GlStateManager.colorMask(true, true, true, false);
+        GuiScreen.drawRect(x, y, x + 16, y + 16, new Color(255, 255, 255, 150).getRGB());
+        GlStateManager.colorMask(true, true, true, true);
+        GlStateManager.enableLighting();
+        GlStateManager.enableDepth();
+    }
+
     private void renderUpgrades(final Minecraft minecraft, final int mouseX, final int mouseY) {
         minecraft.getTextureManager().bindTexture(TEXTURE_BACKGROUND);
         this.drawableUpgradesHover.draw(minecraft, 5, 124);

src/main/java/hellfirepvp/modularmachinery/common/machine/DynamicMachine.java

@@ -153,13 +153,10 @@ public RecipeCraftingContext createContext(ActiveMachineRecipe activeRecipe,
         if (!activeRecipe.getRecipe().getOwningMachineIdentifier().equals(registryName)) {
             throw new IllegalArgumentException("Tried to create context for a recipe that doesn't belong to the referenced machine!");
         }
-        RecipeCraftingContext context = new RecipeCraftingContext(activeRecipe, controller);
-        for (Tuple<MachineComponent<?>, ComponentSelectorTag> tpl : taggedComponents) {
-            context.addComponent(tpl.getFirst(), tpl.getSecond());
-        }
-        modifiers.forEach(context::addModifier);
-        context.updateRequirementComponents();
-        return context;
+        RecipeCraftingContext ctx = new RecipeCraftingContext(activeRecipe, controller);
+        ctx.updateComponents(taggedComponents);
+        modifiers.forEach(ctx::addModifier);
+        return ctx;
     }
 
     public void mergeFrom(DynamicMachine another) {

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

@@ -61,7 +61,7 @@ public class RegistryBlocks {
 
     public static void initialize() {
         registerBlocks();
-        if (Mods.RESOURCELOADER.isPresent()) {
+        if (Mods.RESOURCELOADER.isPresent() || Mods.TX_LOADER.isPresent()) {
             try {
                 RegistryBlocks.writeAllCustomControllerModels();
             } catch (IOException e) {

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

@@ -347,8 +347,8 @@ public void offerRecipe(RecipeCraftingContext context) {
 
         FactoryRecipeThread thread = new FactoryRecipeThread(this);
         thread.setContext(context)
-                  .setActiveRecipe(context.getActiveRecipe())
-                  .setStatus(CraftingStatus.SUCCESS);
+                .setActiveRecipe(context.getActiveRecipe())
+                .setStatus(CraftingStatus.SUCCESS);
         recipeThreadList.add(thread);
         onThreadRecipeStart(thread);
     }
@@ -437,6 +437,26 @@ public boolean hasIdleThread() {
         return false;
     }
 
+    @Override
+    protected void updateComponents() {
+        super.updateComponents();
+        for (final FactoryRecipeThread thread : this.recipeThreadList) {
+            RecipeCraftingContext ctx = thread.getContext();
+            if (ctx == null) {
+                continue;
+            }
+            ctx.updateComponents(this.foundComponents);
+        }
+
+        for (final FactoryRecipeThread thread : this.coreRecipeThreads.values()) {
+            RecipeCraftingContext ctx = thread.getContext();
+            if (ctx == null) {
+                continue;
+            }
+            ctx.updateComponents(this.foundComponents);
+        }
+    }
+
     @Override
     protected void checkRotation() {
         IBlockState state = getWorld().getBlockState(getPos());

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

@@ -18,6 +18,7 @@
 import hellfirepvp.modularmachinery.common.crafting.ActiveMachineRecipe;
 import hellfirepvp.modularmachinery.common.crafting.MachineRecipe;
 import hellfirepvp.modularmachinery.common.crafting.helper.CraftingStatus;
+import hellfirepvp.modularmachinery.common.crafting.helper.RecipeCraftingContext;
 import hellfirepvp.modularmachinery.common.lib.BlocksMM;
 import hellfirepvp.modularmachinery.common.machine.DynamicMachine;
 import hellfirepvp.modularmachinery.common.machine.MachineRecipeThread;
@@ -134,6 +135,16 @@ protected boolean doRecipeTick() {
         return true;
     }
 
+    @Override
+    protected void updateComponents() {
+        super.updateComponents();
+        RecipeCraftingContext ctx = this.recipeThread.getContext();
+        if (ctx == null) {
+            return;
+        }
+        ctx.updateComponents(this.foundComponents);
+    }
+
     @Override
     protected void checkRotation() {
         IBlockState state = getWorld().getBlockState(getPos());

src/main/java/hellfirepvp/modularmachinery/common/tiles/base/TileMultiblockMachineController.java

@@ -377,7 +377,7 @@ protected void updateStatedMachineComponent(final boolean working) {
     }
 
     public RecipeCraftingContext createContext(ActiveMachineRecipe activeRecipe) {
-        RecipeCraftingContext context = this.foundMachine.createContext(activeRecipe, this, Collections.unmodifiableList(this.foundComponents), MiscUtils.flatten(this.foundModifiers.values()));
+        RecipeCraftingContext context = this.foundMachine.createContext(activeRecipe, this, this.foundComponents, MiscUtils.flatten(this.foundModifiers.values()));
         context.addModifier(customModifiers.values());
         return context;
     }

src/main/java/hellfirepvp/modularmachinery/common/util/BlockArray.java

@@ -83,10 +83,7 @@ public BlockArray(BlockArray other, Vec3i offset) {
     public StructureBoundingBox getPatternBoundingBox(final BlockPos ctrlPos) {
         BlockPos min = ctrlPos.add(this.min);
         BlockPos max = ctrlPos.add(this.max);
-        return new StructureBoundingBox(new int[]{
-                min.getX(), min.getY(), min.getZ(),
-                max.getX(), max.getY(), max.getZ()
-        });
+        return new StructureBoundingBox(min, max);
     }
 
     public void flushTileBlocksCache() {