Merge branch 'master' into upstream

This commit is contained in:
Yang Xizhi authored and GitHub committed 2022-07-24 19:40:51 +08:00
commit 079e5e34c4
25 files changed
+591 -269

No files matched your search

@@ -84,27 +84,32 @@ public class CPacketFluidPatternTermBtns implements IMessage {
cpt.getPatternTerminal().setCombineMode(Value.equals("1"));
break;
}
} else if( Name.startsWith( "PatternTerminal." ) && (c instanceof ContainerFluidPatternTerminalEx))
} else if( Name.startsWith( "PatternTerminalEx." ) && (c instanceof ContainerFluidPatternTerminalEx))
{
final ContainerFluidPatternTerminalEx cpt = (ContainerFluidPatternTerminalEx) c;
switch (Name) {
case "PatternTerminal.Encode":
case "PatternTerminalEx.Encode":
if (Value.equals("2"))
cpt.encodeAndMoveToInventory();
else
cpt.encode();
break;
case "PatternTerminal.Clear":
case "PatternTerminalEx.Clear":
cpt.clear();
break;
case "PatternTerminal.Substitute":
case "PatternTerminalEx.Substitute":
cpt.getPatternTerminal().setSubstitution(Value.equals("1"));
break;
case "PatternTerminal.Double":
case "PatternTerminalEx.Invert":
cpt.getPatternTerminal().setInverted(Value.equals("1"));
break;
case "PatternTerminalEx.Double":
cpt.doubleStacks(Value.equals("1"));
break;
case "PatternTerminal.Combine":
cpt.getPatternTerminal().setCombineMode(Value.equals("1"));
case "PatternTerminalEx.ActivePage":
cpt.getPatternTerminal().setActivePage(Integer.parseInt(Value));
break;
}
} else if(Name.equals( "Terminal.Cpu" ) && c instanceof ContainerFluidCraftConfirm) {
@@ -27,7 +27,7 @@ public class CPacketTransferRecipe implements IMessage {
private List<OrderStack<?>> inputs;
private List<OrderStack<?>> outputs;
private boolean isCraft;
private final static int MAX_INDEX = 16;
private final static int MAX_INDEX = 32;
public CPacketTransferRecipe(){
}