Input parts code dedup pt1

Author: Zorbatron

src/main/java/gregtech/api/capability/impl/GhostCircuitItemStackHandler.java

@@ -12,6 +12,7 @@
 import net.minecraftforge.items.IItemHandlerModifiable;
 
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -29,8 +30,15 @@ public class GhostCircuitItemStackHandler extends GTItemStackHandler
     private int circuitValue = NO_CONFIG;
     private ItemStack circuitStack = ItemStack.EMPTY;
 
-    public GhostCircuitItemStackHandler(MetaTileEntity metaTileEntity) {
+    public GhostCircuitItemStackHandler(@NotNull MetaTileEntity metaTileEntity) {
+        this(metaTileEntity, metaTileEntity);
+    }
+
+    public GhostCircuitItemStackHandler(@NotNull MetaTileEntity metaTileEntity, @Nullable MetaTileEntity mteToNotify) {
         super(metaTileEntity);
+        if (mteToNotify != null) {
+            notifiableEntities.add(mteToNotify);
+        }
     }
 
     /**

src/main/java/gregtech/api/metatileentity/SimpleMachineMetaTileEntity.java

@@ -127,7 +127,6 @@ protected void initializeInventory() {
         this.outputFluidInventory = new FluidHandlerProxy(new FluidTankList(false), exportFluids);
         if (this.hasGhostCircuitInventory()) {
             this.circuitInventory = new GhostCircuitItemStackHandler(this);
-            this.circuitInventory.addNotifiableMetaTileEntity(this);
         }
 
         this.actualImportItems = null;

src/main/java/gregtech/api/mui/sync/appeng/AEFluidSyncHandler.java

@@ -1,13 +1,16 @@
 package gregtech.api.mui.sync.appeng;
 
+import gregtech.api.capability.impl.GhostCircuitItemStackHandler;
 import gregtech.api.mui.GTByteBufAdapters;
+import gregtech.api.recipes.ingredients.IntCircuitIngredient;
 import gregtech.api.util.GTUtility;
 import gregtech.api.util.JEIUtil;
 import gregtech.common.metatileentities.multi.multiblockpart.appeng.slot.ExportOnlyAEFluidList;
 import gregtech.common.metatileentities.multi.multiblockpart.appeng.slot.ExportOnlyAEFluidSlot;
 import gregtech.common.metatileentities.multi.multiblockpart.appeng.slot.IConfigurableSlot;
 import gregtech.common.metatileentities.multi.multiblockpart.appeng.stack.WrappedFluidStack;
 
+import net.minecraft.item.ItemStack;
 import net.minecraftforge.fluids.FluidStack;
 import net.minecraftforge.fml.relauncher.Side;
 import net.minecraftforge.fml.relauncher.SideOnly;
@@ -22,13 +25,15 @@
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.function.IntConsumer;
 
 public class AEFluidSyncHandler extends AESyncHandler<IAEFluidStack> {
 
     protected final ExportOnlyAEFluidList fluidList;
 
-    public AEFluidSyncHandler(ExportOnlyAEFluidList fluidList, @Nullable Runnable dirtyNotifier) {
-        super(fluidList.getInventory(), fluidList.isStocking(), dirtyNotifier);
+    public AEFluidSyncHandler(ExportOnlyAEFluidList fluidList, @Nullable Runnable dirtyNotifier,
+                              @NotNull IntConsumer circuitChangeConsumer) {
+        super(fluidList.getInventory(), fluidList.isStocking(), dirtyNotifier, circuitChangeConsumer);
         this.fluidList = fluidList;
     }
 
@@ -71,6 +76,17 @@ public IRecipeTransferError receiveRecipe(@NotNull IRecipeLayout recipeLayout, b
         }
         clearConfigFrom(lastSlotIndex);
 
+        Int2ObjectMap<ItemStack> itemInputs = JEIUtil.getDisplayedInputItemStacks(recipeLayout.getItemStacks(), false,
+                false);
+        int circuitValue = GhostCircuitItemStackHandler.NO_CONFIG;
+        for (ItemStack inputStack : itemInputs.values()) {
+            if (IntCircuitIngredient.isIntegratedCircuit(inputStack)) {
+                circuitValue = IntCircuitIngredient.getCircuitConfiguration(inputStack);
+                break;
+            }
+        }
+        ghostCircuitConfig.accept(circuitValue);
+
         return null;
     }
 

src/main/java/gregtech/api/mui/sync/appeng/AEItemSyncHandler.java

@@ -25,17 +25,16 @@
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
+import java.util.function.IntConsumer;
 
 public class AEItemSyncHandler extends AESyncHandler<IAEItemStack> {
 
     protected final ExportOnlyAEItemList itemList;
-    protected final GhostCircuitItemStackHandler ghostCircuitHandler;
 
     public AEItemSyncHandler(ExportOnlyAEItemList itemList, @Nullable Runnable dirtyNotifier,
-                             @NotNull GhostCircuitItemStackHandler ghostCircuitHandler) {
-        super(itemList.getInventory(), itemList.isStocking(), dirtyNotifier);
+                             @NotNull IntConsumer circuitChangeConsumer) {
+        super(itemList.getInventory(), itemList.isStocking(), dirtyNotifier, circuitChangeConsumer);
         this.itemList = itemList;
-        this.ghostCircuitHandler = ghostCircuitHandler;
     }
 
     @Override
@@ -76,11 +75,12 @@ public IRecipeTransferError receiveRecipe(@NotNull IRecipeLayout recipeLayout, b
             ItemStack stack = inputsIterator.next();
             if (stack == null) continue;
             if (IntCircuitIngredient.isIntegratedCircuit(stack)) {
-                inputsIterator.remove();
                 circuitValue = IntCircuitIngredient.getCircuitConfiguration(stack);
+                inputsIterator.remove();
+                break;
             }
         }
-        setGhostCircuit(circuitValue);
+        ghostCircuitConfig.accept(circuitValue);
 
         int lastSlotIndex;
         for (lastSlotIndex = 0; lastSlotIndex < itemInputs.size(); lastSlotIndex++) {
@@ -96,8 +96,4 @@ public IRecipeTransferError receiveRecipe(@NotNull IRecipeLayout recipeLayout, b
     public void setConfig(int index, @Nullable ItemStack stack) {
         setConfig(index, WrappedItemStack.fromItemStack(stack));
     }
-
-    protected void setGhostCircuit(int circuitValue) {
-        ghostCircuitHandler.setCircuitValue(circuitValue);
-    }
 }

src/main/java/gregtech/api/mui/sync/appeng/AESyncHandler.java

@@ -20,6 +20,7 @@
 
 import java.io.IOException;
 import java.util.function.IntBinaryOperator;
+import java.util.function.IntConsumer;
 
 public abstract class AESyncHandler<AEStackType extends IAEStack<AEStackType>> extends SyncHandler
                                    implements IJEIRecipeReceiver {
@@ -32,6 +33,7 @@ public abstract class AESyncHandler<AEStackType extends IAEStack<AEStackType>> e
     public static final int bulkConfigAmountChangeID = 5;
 
     protected final boolean isStocking;
+    protected final IntConsumer ghostCircuitConfig;
     protected final @NotNull IConfigurableSlot<AEStackType>[] slots;
     private final @NotNull IConfigurableSlot<AEStackType>[] cached;
     private final Int2ObjectMap<@NotNull IConfigurableSlot<AEStackType>> changeMap = new Int2ObjectOpenHashMap<>();
@@ -41,9 +43,11 @@ public abstract class AESyncHandler<AEStackType extends IAEStack<AEStackType>> e
     @Nullable
     private final Runnable dirtyNotifier;
 
-    public AESyncHandler(IConfigurableSlot<AEStackType>[] slots, boolean isStocking, @Nullable Runnable dirtyNotifier) {
+    public AESyncHandler(IConfigurableSlot<AEStackType>[] slots, boolean isStocking, @Nullable Runnable dirtyNotifier,
+                         @NotNull IntConsumer ghostCircuitConfig) {
         this.slots = slots;
         this.isStocking = isStocking;
+        this.ghostCircuitConfig = ghostCircuitConfig;
         this.dirtyNotifier = dirtyNotifier;
         this.cached = initializeCache();
         this.byteBufAdapter = initializeByteBufAdapter();

src/main/java/gregtech/api/mui/widget/appeng/AEConfigSlot.java

@@ -45,7 +45,7 @@ public abstract class AEConfigSlot<T extends IAEStack<T>> extends Widget<AEConfi
     @Nullable
     protected Runnable onSelect;
 
-    public AEConfigSlot(boolean isStocking, int index, BooleanSupplier isAutoPull) {
+    public AEConfigSlot(boolean isStocking, int index, @NotNull BooleanSupplier isAutoPull) {
         this.isStocking = isStocking;
         this.index = index;
         this.isAutoPull = isAutoPull;

src/main/java/gregtech/api/mui/widget/appeng/fluid/AEFluidConfigSlot.java

@@ -32,7 +32,7 @@
 public class AEFluidConfigSlot extends AEConfigSlot<IAEFluidStack>
                                implements Interactable, JeiGhostIngredientSlot<FluidStack> {
 
-    public AEFluidConfigSlot(boolean isStocking, int index, BooleanSupplier isAutoPull) {
+    public AEFluidConfigSlot(boolean isStocking, int index, @NotNull BooleanSupplier isAutoPull) {
         super(isStocking, index, isAutoPull);
         tooltipAutoUpdate(true);
     }

src/main/java/gregtech/api/mui/widget/appeng/item/AEItemConfigSlot.java

@@ -26,7 +26,7 @@
 
 public class AEItemConfigSlot extends AEConfigSlot<IAEItemStack> implements JeiGhostIngredientSlot<ItemStack> {
 
-    public AEItemConfigSlot(boolean isStocking, int index, BooleanSupplier isAutoPull) {
+    public AEItemConfigSlot(boolean isStocking, int index, @NotNull BooleanSupplier isAutoPull) {
         super(isStocking, index, isAutoPull);
         tooltipAutoUpdate(true);
     }

src/main/java/gregtech/common/metatileentities/multi/multiblockpart/MetaTileEntityFluidHatch.java

@@ -90,7 +90,6 @@ protected void initializeInventory() {
         super.initializeInventory();
         if (this.hasGhostCircuitInventory()) {
             this.circuitInventory = new GhostCircuitItemStackHandler(this);
-            this.circuitInventory.addNotifiableMetaTileEntity(this);
         }
     }
 

src/main/java/gregtech/common/metatileentities/multi/multiblockpart/MetaTileEntityItemBus.java

@@ -84,7 +84,6 @@ protected void initializeInventory() {
         super.initializeInventory();
         if (this.hasGhostCircuitInventory()) {
             this.circuitInventory = new GhostCircuitItemStackHandler(this);
-            this.circuitInventory.addNotifiableMetaTileEntity(this);
             this.actualImportItems = new ItemHandlerList(Arrays.asList(super.getImportItems(), this.circuitInventory));
         } else {
             this.actualImportItems = null;