mirror of
https://github.com/GTNewHorizons/AE2FluidCraft-Rework.git
synced 2026-11-15 17:44:46 +00:00
Merge branch 'master' into upstream
This commit is contained in:
27 files changed
+670
-355
No files matched your search
@@ -81,25 +81,31 @@ public class CPacketFluidPatternTermBtns implements IMessage {
|
||||
cpt.doubleStacks(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 "PatternTerminalEx.ActivePage":
|
||||
cpt.getPatternTerminal().setActivePage(Integer.parseInt(Value));
|
||||
break;
|
||||
}
|
||||
} else if(Name.equals( "Terminal.Cpu" ) && c instanceof ContainerFluidCraftConfirm) {
|
||||
final ContainerFluidCraftConfirm qk = (ContainerFluidCraftConfirm) c;
|
||||
|
||||
@@ -24,7 +24,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(){
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user