Removed "emit signal when item is being autocrafted" option in the Detector. Fixes #1910

CHANGELOG.md

@@ -5,6 +5,7 @@
 - Added Crafting Upgrade support for fluids on the Exporter, Constructor and Fluid Interface (raoulvdberge)
 - Added support for JEI ghost slot dragging (raoulvdberge)
 - Added config option to hide covers in the creative mode tabs and JEI (raoulvdberge)
+- Removed "emit signal when item is being autocrafted" option in the Detector (raoulvdberge)
 - You can now keep fluids in stock by attaching a External Storage in fluid mode to a Fluid Interface with a Crafting Upgrade (raoulvdberge)
 - You can now specify the amount to export in the Fluid Interface (raoulvdberge)
 - Made the Crafting Preview window bigger (raoulvdberge)

src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeDetector.java

@@ -2,10 +2,8 @@ package com.raoulvdberge.refinedstorage.apiimpl.network.node;
 
 import com.raoulvdberge.refinedstorage.RS;
 import com.raoulvdberge.refinedstorage.RSBlocks;
-import com.raoulvdberge.refinedstorage.api.autocrafting.task.ICraftingTask;
 import com.raoulvdberge.refinedstorage.api.network.INetwork;
 import com.raoulvdberge.refinedstorage.api.util.IComparer;
-import com.raoulvdberge.refinedstorage.apiimpl.API;
 import com.raoulvdberge.refinedstorage.inventory.fluid.FluidInventory;
 import com.raoulvdberge.refinedstorage.inventory.item.ItemHandlerBase;
 import com.raoulvdberge.refinedstorage.inventory.listener.ListenerNetworkNode;
@@ -30,7 +28,6 @@ public class NetworkNodeDetector extends NetworkNode implements IComparable, ITy
     public static final int MODE_UNDER = 0;
     public static final int MODE_EQUAL = 1;
     public static final int MODE_ABOVE = 2;
-    public static final int MODE_AUTOCRAFTING = 3;
 
     private static final String NBT_COMPARE = "Compare";
     private static final String NBT_MODE = "Mode";
@@ -75,31 +72,11 @@ public class NetworkNodeDetector extends NetworkNode implements IComparable, ITy
                 ItemStack slot = itemFilters.getStackInSlot(0);
 
                 if (!slot.isEmpty()) {
-                    if (mode == MODE_AUTOCRAFTING) {
+                    ItemStack stack = network.getItemStorageCache().getList().get(slot, compare);
-                        boolean found = false;
 
-                        for (ICraftingTask task : network.getCraftingManager().getTasks()) {
+                    powered = isPowered(stack == null ? null : stack.getCount());
-                            for (ItemStack output : task.getPattern().getOutputs()) {
-                                if (API.instance().getComparer().isEqualNoQuantity(slot, output)) {
-                                    found = true;
-
-                                    break;
-                                }
-                            }
-
-                            if (found) {
-                                break;
-                            }
-                        }
-
-                        powered = found;
-                    } else {
-                        ItemStack stack = network.getItemStorageCache().getList().get(slot, compare);
-
-                        powered = isPowered(stack == null ? null : stack.getCount());
-                    }
                 } else {
-                    powered = mode == MODE_AUTOCRAFTING ? !network.getCraftingManager().getTasks().isEmpty() : isPowered(network.getItemStorageCache().getList().getStacks().stream().map(ItemStack::getCount).mapToInt(Number::intValue).sum());
+                    powered = isPowered(network.getItemStorageCache().getList().getStacks().stream().map(ItemStack::getCount).mapToInt(Number::intValue).sum());
                 }
             } else if (type == IType.FLUIDS) {
                 FluidStack slot = fluidFilters.getFluid(0);

src/main/java/com/raoulvdberge/refinedstorage/gui/control/SideButtonDetectorMode.java

@@ -30,8 +30,6 @@ public class SideButtonDetectorMode extends SideButton {
         } else if (mode == NetworkNodeDetector.MODE_ABOVE) {
             mode = NetworkNodeDetector.MODE_UNDER;
         } else if (mode == NetworkNodeDetector.MODE_UNDER) {
-            mode = NetworkNodeDetector.MODE_AUTOCRAFTING;
-        } else if (mode == NetworkNodeDetector.MODE_AUTOCRAFTING) {
             mode = NetworkNodeDetector.MODE_EQUAL;
         }
 

src/main/java/com/raoulvdberge/refinedstorage/tile/TileDetector.java

@@ -19,7 +19,7 @@ public class TileDetector extends TileNode<NetworkNodeDetector> {
     public static final TileDataParameter<Integer, TileDetector> COMPARE = IComparable.createParameter();
     public static final TileDataParameter<Integer, TileDetector> TYPE = IType.createParameter();
     public static final TileDataParameter<Integer, TileDetector> MODE = new TileDataParameter<>(DataSerializers.VARINT, 0, t -> t.getNode().getMode(), (t, v) -> {
-        if (v == NetworkNodeDetector.MODE_UNDER || v == NetworkNodeDetector.MODE_EQUAL || v == NetworkNodeDetector.MODE_ABOVE || v == NetworkNodeDetector.MODE_AUTOCRAFTING) {
+        if (v == NetworkNodeDetector.MODE_UNDER || v == NetworkNodeDetector.MODE_EQUAL || v == NetworkNodeDetector.MODE_ABOVE) {
             t.getNode().setMode(v);
             t.getNode().markDirty();
         }

src/main/resources/assets/refinedstorage/lang/de_de.lang

@@ -183,7 +183,6 @@ sidebutton.refinedstorage:detector.mode=Modus
 sidebutton.refinedstorage:detector.mode.0=Signal Wenn Weniger
 sidebutton.refinedstorage:detector.mode.1=Signal Wenn Gleich
 sidebutton.refinedstorage:detector.mode.2=Signal Wenn Mehr
-sidebutton.refinedstorage:detector.mode.3=Signal Während Automatischer Fertigung
 
 sidebutton.refinedstorage:constructor.drop=Blöcke fallen lassen anstatt zu platzieren
 

src/main/resources/assets/refinedstorage/lang/en_us.lang

@@ -183,7 +183,6 @@ sidebutton.refinedstorage:detector.mode=Mode
 sidebutton.refinedstorage:detector.mode.0=Emit signal when under the amount
 sidebutton.refinedstorage:detector.mode.1=Emit signal when on the amount
 sidebutton.refinedstorage:detector.mode.2=Emit signal when above the amount
-sidebutton.refinedstorage:detector.mode.3=Emit signal when item is being autocrafted
 
 sidebutton.refinedstorage:constructor.drop=Drop blocks instead of placing
 

src/main/resources/assets/refinedstorage/lang/es_es.lang

@@ -170,7 +170,6 @@ sidebutton.refinedstorage:detector.mode=Modo
 sidebutton.refinedstorage:detector.mode.0=Emitir señal si hay menos de lo indicado
 sidebutton.refinedstorage:detector.mode.1=Emitir señal si la cantidad se alcanza
 sidebutton.refinedstorage:detector.mode.2=Emitir señal si esta más de lo indicado
-sidebutton.refinedstorage:detector.mode.3=Emitir señal si se esta fabricando esto
 
 sidebutton.refinedstorage:constructor.drop=Soltar bloques en lugar de colocar
 

src/main/resources/assets/refinedstorage/lang/fr_fr.lang

@@ -145,9 +145,8 @@ sidebutton.refinedstorage:type.1=Fluides
 
 sidebutton.refinedstorage:detector.mode=Mode
 sidebutton.refinedstorage:detector.mode.0=Emet un signal quand la quantité est inférieure
-guidebutton.refinedstorage:detector.mode.1=Emet un signal quand la quantité est égale
+sidebutton.refinedstorage:detector.mode.1=Emet un signal quand la quantité est égale
 sidebutton.refinedstorage:detector.mode.2=Emet un signal quand la quantité est supérieure
-sidebutton.refinedstorage:detector.mode.3=Emet un signal quand l'item est crafté auto
 
 sidebutton.refinedstorage:constructor.drop=Laisse tomber les blocs au lieu de les placer
 

src/main/resources/assets/refinedstorage/lang/ko_kr.lang

@@ -145,7 +145,6 @@ sidebutton.refinedstorage:detector.mode=모드
 sidebutton.refinedstorage:detector.mode.0=수량 이하일 때 신호 출력
 sidebutton.refinedstorage:detector.mode.1=수량과 일치할 때 신호 출력
 sidebutton.refinedstorage:detector.mode.2=수량 이상일 때 신호 출력
-sidebutton.refinedstorage:detector.mode.3=자동 조합 시 신호 출력
 
 sidebutton.refinedstorage:constructor.drop=블럭을 설치하지 않고 떨어트림
 

src/main/resources/assets/refinedstorage/lang/nl_nl.lang

@@ -103,7 +103,6 @@ sidebutton.refinedstorage:detector.mode=Mode
 sidebutton.refinedstorage:detector.mode.0=Redstone signaal aan wanneer onder het aantal
 sidebutton.refinedstorage:detector.mode.1=Redstone signaal aan wanneer op het aantal
 sidebutton.refinedstorage:detector.mode.2=Redstone signaal aan wanneer boven het aantal
-sidebutton.refinedstorage:detector.mode.3=Redstone signaal aan wanneer aan het autocraften
 
 sidebutton.refinedstorage:crafter.triggered_autocrafting=Autocrafting triggeren met redstone signaal
 

src/main/resources/assets/refinedstorage/lang/pt_br.lang

@@ -148,7 +148,6 @@ sidebutton.refinedstorage:detector.mode=Modo
 sidebutton.refinedstorage:detector.mode.0=Emite um sinal quando estiver abaixo do valor
 sidebutton.refinedstorage:detector.mode.1=Emite um sinal quando estiver no valor
 sidebutton.refinedstorage:detector.mode.2=Emite sinal quando acima do valor
-sidebutton.refinedstorage:detector.mode.3=Emite o sinal quando o item está sendo auto-fabricado
 
 sidebutton.refinedstorage:constructor.drop=Solte os blocos em vez de colocar
 

src/main/resources/assets/refinedstorage/lang/ru_ru.lang

@@ -176,7 +176,6 @@ sidebutton.refinedstorage:detector.mode=Режим
 sidebutton.refinedstorage:detector.mode.0=Выдача сигнала, если количество меньше
 sidebutton.refinedstorage:detector.mode.1=Выдача сигнала, если количество равно
 sidebutton.refinedstorage:detector.mode.2=Выдача сигнала, если количество больше
-sidebutton.refinedstorage:detector.mode.3=Излучать сигнал, когда предмет начинает автосоздание
 
 sidebutton.refinedstorage:constructor.drop=Выкидывать блоки вместо размещения
 

src/main/resources/assets/refinedstorage/lang/zh_cn.lang

@@ -149,7 +149,6 @@ sidebutton.refinedstorage:detector.mode=模式
 sidebutton.refinedstorage:detector.mode.0=物品数量小于输入数量时输出信号
 sidebutton.refinedstorage:detector.mode.1=物品数量等于输入数量时输出信号
 sidebutton.refinedstorage:detector.mode.2=物品数量大于于输入数量时输出信号
-sidebutton.refinedstorage:detector.mode.3=当正在自动合成的时候输出红石信号
 
 sidebutton.refinedstorage:constructor.drop=将物品以掉落物形式抛出