Improved logistics manager to handle empty requests from redstone requesters

Author: LIUKRAST

README.md

@@ -1,16 +1,10 @@
 # ![deployer.png](src/main/resources/deployer.png)
 Deployer is a [Create]() library addon built to bring stability over delicate non-modular code in create.
 
-A lot of features, like packages,
-factory gauges and others are often coded in create without thinking about possible addons that want to expand that feature,
-and here is where we come on.
-
-Deployer aims to bring stability over this topic, by modifying create code in a very precise way:
-
-- We do not overwrite any of the original function, which is the main reason of mod incompatibility
-- Every code injection is as precise as possible, and studied to be compatible with eventual code changes
-- We leave create's code implementation the same on most things, so that other mods will not find any strange behaviour on their blocks
+Our philosophy is "less compatibility, more stability" which makes every feature in the mod coded while thinking about any kind of modification from other mods. We prefer other mods to just not support our features, instead of just crashing.
+**This doesn't mean we don't care about compatibility! Please let us know if theres any mod you want to see compatible with Deployer!**
 
+### Deployer is still in beta and might still cause crashes with other mods. We will work on that 24h/7
 
 ## Features
 
@@ -41,4 +35,4 @@ This is configurable through the server config
 
 <img src="fluid_fix.png" style="width:300px"> For example, cauldrons couldn't be handled before
 
-## Please remember that Deployer is still under development and under his first stages
+### Please remember that Deployer is still under development and under his first stages

…st/deployer/lib/DeployerWailaPlugin.java …ast/deployer/lib/compat/WailaCompat.javasrc/main/java/net/liukrast/deployer/lib/DeployerWailaPlugin.java renamed to src/main/java/net/liukrast/deployer/lib/compat/WailaCompat.java src/main/java/net/liukrast/deployer/lib/DeployerWailaPlugin.java renamed to src/main/java/net/liukrast/deployer/lib/compat/WailaCompat.java

@@ -1,4 +1,4 @@
-package net.liukrast.deployer.lib;
+package net.liukrast.deployer.lib.compat;
 
 import com.simibubi.create.AllBlocks;
 import com.simibubi.create.content.logistics.factoryBoard.FactoryPanelBlock;
@@ -12,7 +12,7 @@
 
 @SuppressWarnings("unused")
 @WailaPlugin
-public class DeployerWailaPlugin implements IWailaPlugin {
+public class WailaCompat implements IWailaPlugin {
 
     @Override
     public void registerClient(IWailaClientRegistration registration) {

src/main/java/net/liukrast/deployer/lib/helper/extensions/PRHExtension.java

@@ -0,0 +1,5 @@
+package net.liukrast.deployer.lib.helper.extensions;
+
+public interface PRHExtension {
+    boolean isOrderComplete(int orderId);
+}

src/main/java/net/liukrast/deployer/lib/logistics/packagerLink/LogisticsGenericManager.java

@@ -98,7 +98,8 @@ public static <K,V,H> boolean broadcastPackageRequest(StockInventoryType<K,V,H>
      * */
     @SuppressWarnings("unchecked")
     public static boolean broadcastAllPackageRequest(PackageOrderWithCrafts defaultOrder, UUID freqId, LogisticallyLinkedBehaviour.RequestType type, Map<StockInventoryType<?,?,?>, GenericOrderContained<?>> rq, String address) {
-        if(defaultOrder.isEmpty() && rq.values().stream().allMatch(GenericOrderContained::isEmpty))
+        boolean stockOrdersEmpty = rq.values().stream().allMatch(GenericOrderContained::isEmpty);
+        if(defaultOrder.isEmpty() && stockOrdersEmpty)
             return false;
         Multimap<PackagerBlockEntity, PackagingRequest> requests = LogisticsManager.findPackagersForRequest(freqId, defaultOrder, null, address);
 
@@ -111,11 +112,12 @@ public static boolean broadcastAllPackageRequest(PackageOrderWithCrafts defaultO
         int id = vals.isEmpty() ? LogisticsManagerAccessor.getR().nextInt() :
                 Optional.ofNullable(vals.iterator().next()).map(PackagingRequest::orderId)
                         .orElseGet(() -> LogisticsManagerAccessor.getR().nextInt());
-        if(!rq.isEmpty()) {
+        if(!rq.isEmpty() && !stockOrdersEmpty) {
             int index = vals.isEmpty() ? 0 : 1;
             Iterator<Map.Entry<StockInventoryType<?, ?, ?>, GenericOrderContained<?>>> it = rq.entrySet().iterator();
             while(it.hasNext()) {
                 Map.Entry<StockInventoryType<?, ?, ?>, GenericOrderContained<?>> entry = it.next();
+                if(rq.isEmpty()) continue;
                 boolean isLast = !it.hasNext();
                 if(broadcastPackageRequest((StockInventoryType<Object, Object, Object>) entry.getKey(), freqId, type, (GenericOrderContained<Object>) entry.getValue(), null, address, () -> id, index, isLast))
                     index++;

src/main/java/net/liukrast/deployer/lib/mixin/PackageRepackageHelperMixin.java

@@ -37,7 +37,7 @@
 public abstract class PackageRepackageHelperMixin implements PRHExtension {
 
     @Unique
-    private final Map<StockInventoryType<?,?,?>, Map<Integer, List<ItemStack>>> deployer$collectedPackages = new HashMap<>();
+    private final Map<StockInventoryType<?, ?, ?>, Map<Integer, List<ItemStack>>> deployer$collectedPackages = new HashMap<>();
 
     @Inject(method = "clear", at = @At("TAIL"))
     private void clear(CallbackInfo ci) {
@@ -46,28 +46,28 @@ private void clear(CallbackInfo ci) {
 
     @Inject(method = "isFragmented", at = @At("RETURN"), cancellable = true)
     private void isFragmented(ItemStack box, CallbackInfoReturnable<Boolean> cir) {
-        if(!(box.getItem() instanceof GenericPackageItem generic)) return;
+        if (!(box.getItem() instanceof GenericPackageItem generic)) return;
         cir.setReturnValue(box.has(generic.getType().packageHandler().packageOrderData()));
     }
 
     @ModifyVariable(method = "addPackageFragment", at = @At("STORE"), name = "collectedOrder")
     private List<ItemStack> addPackageFragment(List<ItemStack> value, @Local(argsOnly = true, name = "arg1") ItemStack box, @Local(name = "collectedOrderId") int collectedOrderId) {
-        if(!(box.getItem() instanceof GenericPackageItem item)) return value;
+        if (!(box.getItem() instanceof GenericPackageItem item)) return value;
         return deployer$collectedPackages
                 .computeIfAbsent(item.getType(), $ -> new HashMap<>())
                 .computeIfAbsent(collectedOrderId, $ -> Lists.newArrayList());
     }
 
     @WrapOperation(method = "addPackageFragment", at = @At(value = "INVOKE", target = "Lcom/simibubi/create/content/logistics/packager/repackager/PackageRepackageHelper;isOrderComplete(I)Z"))
     private boolean addPackageFragment(PackageRepackageHelper instance, int orderId, Operation<Boolean> original, @Local(argsOnly = true, name = "arg1") ItemStack box) {
-        if(!(box.getItem() instanceof GenericPackageItem item)) return original.call(instance, orderId);
+        if (!(box.getItem() instanceof GenericPackageItem item)) return original.call(instance, orderId);
         return deployer$isOrderComplete(item.getType(), orderId);
     }
 
     @Inject(method = "repack", at = @At("RETURN"))
     private void repack(int orderId, RandomSource r, CallbackInfoReturnable<List<BigItemStack>> cir) {
         var list = cir.getReturnValue();
-        for(StockInventoryType<?,?,?> type : deployer$collectedPackages.keySet()) {
+        for (StockInventoryType<?, ?, ?> type : deployer$collectedPackages.keySet()) {
             list.addAll(deployer$repack(type, orderId, r));
         }
     }
@@ -80,15 +80,15 @@ private void repack(int orderId, RandomSource r, CallbackInfoReturnable<List<Big
         GenericOrderContained<V> orderContext = null;
         AbstractInventorySummary<K, V> summary = type.networkHandler().createSummary();
         var li = deployer$collectedPackages.computeIfAbsent(type, $ -> new HashMap<>()).get(orderId);
-        if(li != null) {
+        if (li != null) {
             for (ItemStack box : li) {
                 address = PackageItem.getAddress(box);
                 var c = box.get(DeployerDataComponents.ORDER_STOCK_TYPE_DATA);
-                if(c != null) typeData = c;
+                if (c != null) typeData = c;
                 var comp = type.packageHandler().packageOrderData();
                 if (box.has(comp)) {
                     var compGot = box.get(comp);
-                    if(compGot != null) {
+                    if (compGot != null) {
                         GenericOrderContained<V> context = compGot.orderContext();
                         if (context != null && !context.isEmpty())
                             orderContext = context;
@@ -136,7 +136,7 @@ private void repack(int orderId, RandomSource r, CallbackInfoReturnable<List<Big
                     continue;
                 if (targetedEntry != null) {
                     targetAmount = type.valueHandler().getCount(targetedEntry);
-                    if(!type.valueHandler().equalsIgnoreCount(entry, targetedEntry))
+                    if (!type.valueHandler().equalsIgnoreCount(entry, targetedEntry))
                         continue;
                 }
 
@@ -148,7 +148,7 @@ private void repack(int orderId, RandomSource r, CallbackInfoReturnable<List<Big
 
                     V output = type.valueHandler().copyWithCount(entry, removedAmount);
                     targetAmount -= removedAmount;
-                    if(targetedEntry != null)
+                    if (targetedEntry != null)
                         type.valueHandler().setCount(targetedEntry, targetAmount);
                     type.valueHandler().setCount(entry, type.valueHandler().getCount(entry) - removedAmount);
                     outputSlots.add(output);
@@ -180,7 +180,7 @@ private void repack(int orderId, RandomSource r, CallbackInfoReturnable<List<Big
 
         for (BigItemStack box : exportingPackages) {
             PackageItem.addAddress(box.stack, address);
-            if(typeData != null) box.stack.set(DeployerDataComponents.ORDER_STOCK_TYPE_DATA, typeData);
+            if (typeData != null) box.stack.set(DeployerDataComponents.ORDER_STOCK_TYPE_DATA, typeData);
         }
 
         for (int i = 0; i < exportingPackages.size(); i++) {
@@ -196,7 +196,7 @@ private void repack(int orderId, RandomSource r, CallbackInfoReturnable<List<Big
     }
 
     @Override
-    public <K,V,H> boolean deployer$isOrderComplete(StockInventoryType<K, V, H> type, int orderId) {
+    public <K, V, H> boolean deployer$isOrderComplete(StockInventoryType<K, V, H> type, int orderId) {
         boolean finalLinkReached = false;
         Links:
         for (int linkCounter = 0; linkCounter < 1000; linkCounter++) {
@@ -226,17 +226,17 @@ private void repack(int orderId, RandomSource r, CallbackInfoReturnable<List<Big
     private List<BigItemStack> repackBasedOnRecipes(List<BigItemStack> original) {
         List<ItemStack> copied = original.stream().map(big -> big.stack.copy()).toList();
         List<ItemStack> result = NonNullList.withSize(copied.size(), ItemStack.EMPTY);
-        for(var stack : copied) {
-            for(int i = 0; i < result.size(); i++) {
+        for (var stack : copied) {
+            for (int i = 0; i < result.size(); i++) {
                 var slot = result.get(i);
-                if(slot.isEmpty()) {
+                if (slot.isEmpty()) {
                     result.set(i, stack);
                     break;
-                } else if(ItemStack.isSameItemSameComponents(stack, slot)) {
+                } else if (ItemStack.isSameItemSameComponents(stack, slot)) {
                     int canPut = slot.getMaxStackSize() - slot.getCount();
-                    slot.setCount(slot.getCount() + Mth.clamp(stack.getCount(),0,canPut));
-                    stack.setCount(Math.max(stack.getCount()-canPut, 0));
-                    if(stack.getCount() == 0) break;
+                    slot.setCount(slot.getCount() + Mth.clamp(stack.getCount(), 0, canPut));
+                    stack.setCount(Math.max(stack.getCount() - canPut, 0));
+                    if (stack.getCount() == 0) break;
                 }
             }
         }
@@ -247,4 +247,12 @@ private List<BigItemStack> repackBasedOnRecipes(List<BigItemStack> original) {
     private ItemStack repackBasedOnRecipes(ItemStack instance, int i, Operation<ItemStack> original) {
         return instance.copy();
     }
+
+    @Inject(method = "isOrderComplete", at = @At("HEAD"), cancellable = true)
+    private void isOrderComplete(int orderId, CallbackInfoReturnable<Boolean> cir) {
+        if(this instanceof net.liukrast.deployer.lib.helper.extensions.PRHExtension prh) {
+            cir.setReturnValue(prh.isOrderComplete(orderId));
+            cir.cancel();
+        }
+    }
 }

src/main/java/net/liukrast/deployer/lib/mixin/RedstoneRequesterBlockEntityMixin.java

@@ -43,6 +43,7 @@ public abstract class RedstoneRequesterBlockEntityMixin extends StockCheckingBlo
     @Unique
     private final Map<StockInventoryType<?,?,?>, GenericOrderContained<?>> deployer$encodedRequests = new HashMap<>();
 
+    @Deprecated
     @Unique
     private boolean deployer$triggerRequest$local$anySucceeded;
 
@@ -58,7 +59,7 @@ public RedstoneRequesterBlockEntityMixin(BlockEntityType<?> type, BlockPos pos,
     @SuppressWarnings("unchecked")
     @Override
     public <K, V, H> GenericOrderContained<V> deployer$getEncodedRequest(StockInventoryType<K, V, H> type) {
-        return (GenericOrderContained<V>) deployer$encodedRequests.computeIfAbsent(type, t -> GenericOrderContained.empty());
+        return (GenericOrderContained<V>) deployer$encodedRequests.getOrDefault(type, GenericOrderContained.empty());
     }
 
     @Inject(method = "triggerRequest", at = @At("HEAD"), cancellable = true)
@@ -70,10 +71,9 @@ private void triggerRequest(CallbackInfo ci) {
         this.deployer$triggerRequest$local$anySucceeded = anySucceeded;
     }
 
-    @SuppressWarnings("unchecked")
     @Unique
     private <K,V,H> boolean deployer$triggerRequest(StockInventoryType<K, V, H> type, CallbackInfo ci) {
-        GenericOrderContained<V> encodedRequest = (GenericOrderContained<V>) deployer$encodedRequests.computeIfAbsent(type, t -> GenericOrderContained.empty());
+        GenericOrderContained<V> encodedRequest = deployer$getEncodedRequest(type);
 
         if(encodedRequest.isEmpty())
             return false;