bump patch version

application.properties

@@ -2,4 +2,4 @@ mcversion=1.7.10
 forgeversion=10.13.2.1286
 version_major=3
 version_minor=5
-version_patch=2
+version_patch=4

src/main/java/forestry/core/fluids/TankManager.java

@@ -29,6 +29,7 @@ import net.minecraft.tileentity.TileEntity;
 
 import net.minecraftforge.common.util.ForgeDirection;
 import net.minecraftforge.fluids.Fluid;
+import net.minecraftforge.fluids.FluidRegistry;
 import net.minecraftforge.fluids.FluidStack;
 import net.minecraftforge.fluids.FluidTankInfo;
 import net.minecraftforge.fluids.IFluidHandler;
@@ -126,7 +127,7 @@ public class TankManager extends ForwardingList<StandardTank> implements IFluidH
 		StandardTank tank = tanks.get(tankIndex);
 		FluidStack fluidStack = tank.getFluid();
 		if (fluidStack != null) {
-			data.writeShort(fluidStack.fluidID);
+			data.writeShort(fluidStack.getFluid().getID());
 			data.writeInt(fluidStack.amount);
 			data.writeInt(fluidStack.getFluid().getColor(fluidStack));
 		} else {
@@ -146,8 +147,11 @@ public class TankManager extends ForwardingList<StandardTank> implements IFluidH
 		}
 		StandardTank tank = tanks.get(tankIndex);
 		int fluidId = data.readShort();
-		if (fluidId != -1) {
-			tank.setFluid(new FluidStack(fluidId, data.readInt()));
+		Fluid fluid = FluidRegistry.getFluid(fluidId);
+		if (fluid != null) {
+			int amount = data.readInt();
+			FluidStack fluidStack = new FluidStack(fluid, amount);
+			tank.setFluid(fluidStack);
 			tank.colorCache = data.readInt();
 		} else {
 			tank.setFluid(null);
@@ -195,7 +199,7 @@ public class TankManager extends ForwardingList<StandardTank> implements IFluidH
 				int fluidId = -1;
 				int fluidAmount = 0;
 				if (fluidStack != null) {
-					fluidId = fluidStack.fluidID;
+					fluidId = fluidStack.getFluid().getID();
 					fluidAmount = fluidStack.amount;
 				}
 				player.sendProgressBarUpdate(container, tankIndex * NETWORK_DATA, fluidId);
@@ -203,7 +207,7 @@ public class TankManager extends ForwardingList<StandardTank> implements IFluidH
 				Proxies.net.sendToPlayer(packet, player);
 			} else if (fluidStack != null && prev != null) {
 				if (fluidStack.getFluid() != prev.getFluid()) {
-					player.sendProgressBarUpdate(container, tankIndex * NETWORK_DATA, fluidStack.fluidID);
+					player.sendProgressBarUpdate(container, tankIndex * NETWORK_DATA, fluidStack.getFluid().getID());
 				}
 				if (fluidStack.amount != prev.amount) {
 					PacketGuiInteger packet = new PacketGuiInteger(container.windowId, tankIndex * NETWORK_DATA + 1, fluidStack.amount);
@@ -227,33 +231,28 @@ public class TankManager extends ForwardingList<StandardTank> implements IFluidH
 			return;
 		}
 		StandardTank tank = tanks.get(tankIndex);
-		FluidStack fluidStack = tank.getFluid();
-		if (fluidStack == null) {
-			fluidStack = new FluidStack(-1, 0);
-			tank.setFluid(fluidStack);
-		}
-		int fluidId = fluidStack.fluidID;
-		int amount = fluidStack.amount;
-		int color = tank.colorCache;
-		boolean newLiquid = false;
+
 		switch (messageId % NETWORK_DATA) {
-			case 0:
-				fluidId = data;
-				newLiquid = true;
+			case 0: {
+				int amount = tank.getFluidAmount();
+				Fluid fluid = FluidRegistry.getFluid(data);
+				if (fluid != null) {
+					FluidStack fluidStack = new FluidStack(fluid, amount);
+					tank.setFluid(fluidStack);
+				}
+			}
+			case 1: {
+				FluidStack fluidStack = tank.getFluid();
+				if (fluidStack != null) {
+					fluidStack.amount = data;
+				}
 				break;
-			case 1:
-				amount = data;
-				break;
-			case 2:
-				color = data;
+			}
+			case 2: {
+				tank.colorCache = data;
 				break;
+			}
 		}
-		if (newLiquid) {
-			fluidStack = new FluidStack(fluidId, 0);
-			tank.setFluid(fluidStack);
-		}
-		fluidStack.amount = amount;
-		tank.colorCache = color;
 	}
 
 	@Override

src/main/java/forestry/core/items/ItemPipette.java

@@ -58,7 +58,7 @@ public class ItemPipette extends ItemForestry implements IToolPipette {
 				return false;
 			}
 
-			return contents.fluidID > 0 && contents.amount >= limit;
+			return contents.getFluid().getID() > 0 && contents.amount >= limit;
 		}
 
 		public void addTooltip(List<String> list) {
@@ -108,7 +108,7 @@ public class ItemPipette extends ItemForestry implements IToolPipette {
 				filled = liquid.amount;
 			}
 
-			contained.contents = new FluidStack(liquid.fluidID, filled);
+			contained.contents = new FluidStack(liquid, filled);
 			filled = liquid.amount;
 
 		} else {
@@ -174,7 +174,7 @@ public class ItemPipette extends ItemForestry implements IToolPipette {
 	@Override
 	public FluidStack drain(ItemStack pipette, int maxDrain, boolean doDrain) {
 		PipetteContents contained = new PipetteContents(pipette.getTagCompound());
-		if (contained.contents == null || contained.contents.fluidID <= 0) {
+		if (contained.contents == null || contained.contents.getFluid().getID() <= 0) {
 			return null;
 		}
 
@@ -196,7 +196,7 @@ public class ItemPipette extends ItemForestry implements IToolPipette {
 			}
 		}
 
-		return new FluidStack(contained.contents.fluidID, drained);
+		return new FluidStack(contained.contents, drained);
 	}
 
 	@Override

src/main/java/forestry/factory/gadgets/MachineStill.java

@@ -242,7 +242,7 @@ public class MachineStill extends TilePowered implements ISidedInventory, ILiqui
 				// Start next cycle if enough bio mass is available
 				distillationTime = distillationTotalTime = resourceRequired;
 				resourceTank.drain(resourceRequired, true);
-				bufferedLiquid = new FluidStack(currentRecipe.input.fluidID, resourceRequired);
+				bufferedLiquid = new FluidStack(currentRecipe.input, resourceRequired);
 
 				setErrorState(EnumErrorCode.OK);
 				return true;
@@ -257,7 +257,7 @@ public class MachineStill extends TilePowered implements ISidedInventory, ILiqui
 		Recipe sameRec = RecipeManager.findMatchingRecipe(resourceTank.getFluid());
 
 		if (sameRec == null && bufferedLiquid != null && distillationTime > 0) {
-			sameRec = RecipeManager.findMatchingRecipe(new FluidStack(bufferedLiquid.fluidID, distillationTime));
+			sameRec = RecipeManager.findMatchingRecipe(new FluidStack(bufferedLiquid, distillationTime));
 		}
 
 		if (sameRec == null) {

src/main/java/forestry/plugins/PluginLepidopterology.java

@@ -88,14 +88,14 @@ public class PluginLepidopterology extends ForestryPlugin {
 		super.setupAPI();
 
 		AlleleManager.alleleRegistry.registerSpeciesRoot(PluginLepidopterology.butterflyInterface = new ButterflyHelper());
-		createAlleles();
-		registerTemplates();
 	}
 
 	@Override
 	public void preInit() {
 		ForestryBlock.lepidopterology.registerBlock(new BlockBase(Material.iron), ItemForestryBlock.class, "lepidopterology");
 		ForestryBlock.lepidopterology.block().setCreativeTab(Tabs.tabLepidopterology);
+
+		createAlleles();
 	}
 
 	@Override
@@ -128,6 +128,8 @@ public class PluginLepidopterology extends ForestryPlugin {
 		Utils.registerEntity(EntityButterfly.class, "butterflyGE", 0, 0x000000, 0xffffff, 50, 1, true);
 		proxy.initializeRendering();
 
+		registerTemplates();
+
 		BlockBase lepidopterology = ((BlockBase) ForestryBlock.lepidopterology.block());
 		definitionChest = lepidopterology.addDefinition((new MachineDefinition(Defaults.DEFINITION_LEPICHEST_META, "forestry.LepiChest", TileLepidopteristChest.class,
 				ShapedRecipeCustom.createShapedRecipe(