Fix #5209; now using FluidStacks everywhere, including all more efficient encodings over network

This commit is contained in:
Dave Smith committed 2019-03-11 14:00:40 -06:00
1 parent de0ab0d6c9
commit c92069f716
28 files changed
+131 -244

No files matched your search

@@ -663,7 +663,9 @@ public class TileEntityFactory extends TileEntityMachine implements IComputerInt
upgraded = dataStream.readBoolean();
lastUsage = dataStream.readDouble();
infuseStored.amount = dataStream.readInt();
infuseStored.type = InfuseRegistry.get(PacketHandler.readString(dataStream));
if (infuseStored.amount > 0) {
infuseStored.type = InfuseRegistry.get(PacketHandler.readString(dataStream));
}
if (recipeType != oldRecipe) {
setRecipeType(recipeType);
@@ -738,12 +740,10 @@ public class TileEntityFactory extends TileEntityMachine implements IComputerInt
data.add(sorting);
data.add(upgraded);
data.add(lastUsage);
data.add(infuseStored.amount);
if (infuseStored.type != null) {
data.add(infuseStored.amount);
if (infuseStored.amount > 0) {
data.add(infuseStored.type.name);
} else {
data.add("null");
}
data.add(progress);