cleaned up pipettes, chemplant loading change delay

changelog

@@ -1,5 +1,13 @@
+## Added
+* Pipettes
+  * Precision tools for carrying small amounts of liquids
+  * Come in three variants, normal, boron (corrosion-resistant) and laboratory (smaller capacity, more precision)
+  * Unlike most fluid containers, can be partially filled
+  * Capacity can be changed by right-clicking if the pipette is empty
+
 ## Changed
-* there is now a config option to disable the biome change caused by fallout. The config will also determine whether the biomes are registered at all, which prevents them from conflicting with other mods' biomes when disabled.
+* There is now a config option to disable the biome change caused by fallout. The config will also determine whether the biomes are registered at all, which prevents them from conflicting with other mods' biomes when disabled.
+* Chemical plants now have a timer that starts after loading/unloading fluids using item fluid containers from the input buffers, this creates a delay between switching from loading and unloading, making it possible to retrieve fluids using pipettes.
 
 ## Fixed
 * Fixed trenchmaster armor not doing most of the armor calculation, making it the worst armor

src/main/java/com/hbm/crafting/ToolRecipes.java

@@ -131,6 +131,7 @@ public class ToolRecipes {
 
 		CraftingManager.addRecipeAuto(new ItemStack(ModItems.pipette, 1), new Object[] { "  L", " G ", "G  ", 'L', ANY_RUBBER.ingot(), 'G', KEY_CLEARGLASS});
 		CraftingManager.addRecipeAuto(new ItemStack(ModItems.pipette_boron, 1), new Object[] { "  P", " B ", "B  ", 'P', RUBBER.ingot(), 'B', ModBlocks.glass_boron});
+		CraftingManager.addRecipeAuto(new ItemStack(ModItems.pipette_laboratory, 1), new Object[] { "  C", " R ", "P  ", 'C', ModItems.circuit_aluminium, 'R', RUBBER.ingot(), 'P', ModItems.pipette_boron });
 
 		CraftingManager.addRecipeAuto(new ItemStack(ModItems.mirror_tool), new Object[] { " A ", " IA", "I  ", 'A', AL.ingot(), 'I', IRON.ingot() });
 		CraftingManager.addRecipeAuto(new ItemStack(ModItems.rbmk_tool), new Object[] { " A ", " IA", "I  ", 'A', PB.ingot(), 'I', IRON.ingot() });

src/main/java/com/hbm/inventory/recipes/anvil/AnvilRecipes.java

@@ -422,13 +422,6 @@ public class AnvilRecipes {
 						new ComparableStack(Items.leather, 4),
 						new ComparableStack(Items.feather, 24)
 				}, new AnvilOutput(new ItemStack(ModItems.wings_limp))).setTier(2));
-
-		constructionRecipes.add(new AnvilConstructionRecipe(
-				new AStack[] {
-					new ComparableStack(ModBlocks.glass_boron, 2),
-					new OreDictStack(ANY_HARDPLASTIC.ingot(), 1),
-					new ComparableStack(ModItems.circuit_aluminium, 2)
-				}, new AnvilOutput(new ItemStack(ModItems.pipette_laboratory))).setTier(3));
 		
 		constructionRecipes.add(new AnvilConstructionRecipe(
 				new AStack[] {

src/main/java/com/hbm/items/tool/ItemPipette.java

@@ -23,186 +23,180 @@ import java.util.List;
 
 public class ItemPipette extends Item implements IFillableItem {
 
-    public ItemPipette() {
+	public ItemPipette() {
-        this.canRepair = false;
+		this.canRepair = false;
-        this.setMaxDamage(1);
+		this.setMaxDamage(1);
-    }
+	}
 
-    @SideOnly(Side.CLIENT) protected IIcon overlayIcon;
+	@SideOnly(Side.CLIENT) protected IIcon overlayIcon;
+	@SideOnly(Side.CLIENT) protected IIcon emptyIcon;
 
-    public short getMaxFill() {
+	public short getMaxFill() {
-        if(this == ModItems.pipette_laboratory)
+		if(this == ModItems.pipette_laboratory) return 50;
-            return 50;
+		else return 1_000;
-        else
+	}
-            return 1_000;
-    }
 
-    public void initNBT(ItemStack stack) {
+	public void initNBT(ItemStack stack) {
+		stack.stackTagCompound = new NBTTagCompound();
+		this.setFill(stack, Fluids.NONE, (short) 0); // sets "type" and "fill" NBT
+		stack.stackTagCompound.setShort("capacity", this.getMaxFill()); // set "capacity"
+	}
 
-        stack.stackTagCompound = new NBTTagCompound();
+	public FluidType getType(ItemStack stack) {
+		if(!stack.hasTagCompound()) {
+			initNBT(stack);
+		}
 
-        this.setFill(stack, Fluids.NONE, (short) 0); //sets "type" and "fill" NBT
+		return Fluids.fromID(stack.stackTagCompound.getShort("type"));
-        stack.stackTagCompound.setShort("capacity", this.getMaxFill()); //set "capacity"
+	}
-    }
 
-    public FluidType getType(ItemStack stack) {
+	public short getCapacity(ItemStack stack) {
-        if(!stack.hasTagCompound()) {
+		if(!stack.hasTagCompound()) {
-            initNBT(stack);
+			initNBT(stack);
-        }
+		}
 
-        return Fluids.fromID(stack.stackTagCompound.getShort("type"));
+		return stack.stackTagCompound.getShort("capacity");
-    }
+	}
 
-    public short getCapacity(ItemStack stack) {
+	public void setFill(ItemStack stack, FluidType type, short fill) {
-        if(!stack.hasTagCompound()) {
+		if(!stack.hasTagCompound()) {
-            initNBT(stack);
+			initNBT(stack);
-        }
+		}
 
-        return stack.stackTagCompound.getShort("capacity");
+		stack.stackTagCompound.setShort("type", (short) type.getID());
-    }
+		stack.stackTagCompound.setShort("fill", fill);
+	}
 
-    public void setFill(ItemStack stack, FluidType type, short fill) {
+	public short getFill(ItemStack stack) {
-        if(!stack.hasTagCompound()) {
+		if(!stack.hasTagCompound()) {
-            initNBT(stack);
+			initNBT(stack);
-        }
+		}
 
-        stack.stackTagCompound.setShort("type", (short) type.getID());
+		return stack.stackTagCompound.getShort("fill");
-        stack.stackTagCompound.setShort("fill", fill);
+	}
-    }
 
-    public short getFill(ItemStack stack) {
+	@Override
-        if(!stack.hasTagCompound()) {
+	public ItemStack onItemRightClick(ItemStack stack, World world, EntityPlayer player) {
-            initNBT(stack);
-        }
 
-        return stack.stackTagCompound.getShort("fill");
+		if(!stack.hasTagCompound()) {
-    }
+			initNBT(stack);
+		}
 
-    @Override
+		if(!world.isRemote) {
-    public ItemStack onItemRightClick(ItemStack stack, World world, EntityPlayer player) {
+			if(this.getFill(stack) == 0) {
+				int a;
+				if(this == ModItems.pipette_laboratory)
+					a = !player.isSneaking() ? Math.min(this.getCapacity(stack) + 1, 50) : Math.max(this.getCapacity(stack) - 1, 1);
+				else 
+					a = !player.isSneaking() ? Math.min(this.getCapacity(stack) + 50, 1_000) : Math.max(this.getCapacity(stack) - 50, 50);
+				stack.stackTagCompound.setShort("capacity", (short) a);
+				player.addChatMessage(new ChatComponentText(a + "/" + this.getMaxFill() + "mB"));
+			} else {
+				player.addChatMessage(new ChatComponentText(I18nUtil.resolveKey("desc.item.pipette.noEmpty")));
+			}
+		}
+		return stack;
+	}
 
-        if(!stack.hasTagCompound()) {
+	@Override
-            initNBT(stack);
+	public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean bool) {
-        }
+		if(this == ModItems.pipette_laboratory) {
+			list.add(I18nUtil.resolveKey("desc.item.pipette.corrosive"));
+			list.add(I18nUtil.resolveKey("desc.item.pipette.laboratory"));
+		}
+		if(this == ModItems.pipette_boron)
+			list.add(I18nUtil.resolveKey("desc.item.pipette.corrosive"));
+		if(this == ModItems.pipette)
+			list.add(I18nUtil.resolveKey("desc.item.pipette.noCorrosive"));
+		list.add("Fluid: " + this.getType(stack).getLocalizedName());
+		list.add("Amount: " + this.getFill(stack) + "/" + this.getCapacity(stack) + "mB (" + this.getMaxFill() + "mB)");
+	}
 
-        if(!world.isRemote) {
+	@Override
-            // ok i need to add some explanation
+	public boolean acceptsFluid(FluidType type, ItemStack stack) {
-            if (this.getFill(stack) == 0) { //if the pipette is empty
+		return (type == this.getType(stack) || this.getFill(stack) == 0) && (!type.isAntimatter());
-                int a;
+	}
-                if(this == ModItems.pipette_laboratory) //if the pipette is a laboratory pipette
-                    //if the player is sneaking then the capacity should increase, else it should decrease (Math.min and Math.max for negative numbers/going over capacity)
-                    a = !player.isSneaking() ? Math.min(this.getCapacity(stack) + 1, 50) : Math.max(this.getCapacity(stack) - 1, 1);
-                else //if its not a laboratory pipette
-                    //if the player is sneaking then the capacity should increase, else it should decrease
-                    a = !player.isSneaking() ? Math.min(this.getCapacity(stack) + 50, 1_000) : Math.max(this.getCapacity(stack) - 50, 50);
-                stack.stackTagCompound.setShort("capacity", (short) a); // set the capacity to the new value
-                player.addChatMessage(new ChatComponentText(a + "/" + this.getMaxFill() + "mB")); // send new value in chat for player to see
-            } else {
-                player.addChatMessage(new ChatComponentText(I18nUtil.resolveKey("desc.item.pipette.noEmpty"))); // if pipette is not empty, no chance in capacity and tell player
-            }
-        }
-        return stack;
-    }
 
-    @Override
+	@Override
-    public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean bool) {
+	public int tryFill(FluidType type, int amount, ItemStack stack) {
-        if(this == ModItems.pipette_laboratory) {
-            list.add(I18nUtil.resolveKey("desc.item.pipette.corrosive"));
-            list.add(I18nUtil.resolveKey("desc.item.pipette.laboratory"));
-        }
-        if(this == ModItems.pipette_boron)
-            list.add(I18nUtil.resolveKey("desc.item.pipette.corrosive"));
-        if(this == ModItems.pipette)
-            list.add(I18nUtil.resolveKey("desc.item.pipette.noCorrosive"));
-        list.add("Fluid: " + this.getType(stack).getLocalizedName());
-        list.add("Amount: " + this.getFill(stack) + "/" + this.getCapacity(stack) + "mB (" + this.getMaxFill() + "mB)");
-    }
 
-    @Override
+		if(!acceptsFluid(type, stack))
-    public boolean acceptsFluid(FluidType type, ItemStack stack) {
+			return amount;
-        return (type == this.getType(stack) || this.getFill(stack) == 0) && (!type.isAntimatter());
-    }
 
-    @Override
+		if(this.getFill(stack) == 0)
-    public int tryFill(FluidType type, int amount, ItemStack stack) {
+			this.setFill(stack, type, (short) 0);
 
-        if(!acceptsFluid(type, stack))
+		int req = this.getCapacity(stack) - this.getFill(stack);
-            return amount;
+		int toFill = Math.min(req, amount);
 
-        if(this.getFill(stack) == 0)
+		this.setFill(stack, type, (short) (this.getFill(stack) + toFill));
-            this.setFill(stack, type, (short) 0);
 
-        int req = this.getCapacity(stack) - this.getFill(stack);
+		// fizzling checks
-        int toFill = Math.min(req, amount);
+		if(this.getFill(stack) > 0 && (this.getType(stack).isCorrosive() && type != Fluids.ACID)) {
+			if(this == ModItems.pipette) {
+				stack.stackSize = 0;
+			}
+		}
 
-        this.setFill(stack, type, (short) (this.getFill(stack) + toFill));
+		return amount - toFill;
+	}
 
-        //fizzling checks
+	@Override
-        if(this.getFill(stack) > 0 && (this.getType(stack).isCorrosive() && type != Fluids.ACID)) /*hydrogen peroxide corroding glass? unheard of! */ {
+	public boolean providesFluid(FluidType type, ItemStack stack) {
-            if(this == ModItems.pipette) {
+		return this.getType(stack) == type;
-                //fizzle it!
+	}
-                stack.stackSize = 0;
-            }
-        }
 
-        return amount - toFill;
+	@Override
-    }
+	public int tryEmpty(FluidType type, int amount, ItemStack stack) {
+		if(providesFluid(type, stack)) {
+			int toUnload = Math.min(amount, this.getFill(stack));
+			this.setFill(stack, type, (short) (this.getFill(stack) - toUnload));
+			if(this.getFill(stack) == 0)
+				this.setFill(stack, Fluids.NONE, (short) 0);
+			return toUnload;
+		}
+		return amount;
+	}
 
-    @Override
+	@Override
-    public boolean providesFluid(FluidType type, ItemStack stack) {
+	@SideOnly(Side.CLIENT)
-        return this.getType(stack) == type;
+	public void registerIcons(IIconRegister icon) {
-    }
+		super.registerIcons(icon);
+		if(this == ModItems.pipette_laboratory)
+			this.overlayIcon = icon.registerIcon("hbm:pipette_laboratory_overlay");
+		else
+			this.overlayIcon = icon.registerIcon("hbm:pipette_overlay");
+		
+		this.emptyIcon = icon.registerIcon("hbm:pipette_empty");
+	}
+	
+	@Override
+	@SideOnly(Side.CLIENT)
+	public IIcon getIcon(ItemStack stack, int pass) {
+		if(getFill(stack) == 0 && pass == 1) return this.emptyIcon;
+		return pass == 1 ? this.overlayIcon : getIconFromDamageForRenderPass(stack.getItemDamage(), pass);
+	}
 
-    @Override
+	@Override
-    public int tryEmpty(FluidType type, int amount, ItemStack stack) {
+	@SideOnly(Side.CLIENT)
-        if(providesFluid(type, stack)) {
+	public boolean requiresMultipleRenderPasses() {
-            int toUnload = Math.min(amount, this.getFill(stack));
+		return true;
-            this.setFill(stack, type,(short) (this.getFill(stack) - toUnload));
+	}
-            if(this.getFill(stack) == 0)
-                this.setFill(stack, Fluids.NONE, (short) 0);
-            return toUnload;
-        }
-        return amount;
-    }
 
-    //this took me way too long to figure out
+	@Override
+	@SideOnly(Side.CLIENT)
+	public int getColorFromItemStack(ItemStack stack, int pass) {
+		if(pass == 0) {
+			return 0xffffff;
+		} else {
+			int j = this.getType(stack).getColor();
 
-    @Override
+			if(j < 0) {
-    @SideOnly(Side.CLIENT)
+				j = 0xffffff;
-    public void registerIcons(IIconRegister icon) {
+			}
-        super.registerIcons(icon);
-        if (this == ModItems.pipette_laboratory)
-            this.overlayIcon = icon.registerIcon("hbm:pipette_laboratory_overlay");
-        else
-            this.overlayIcon = icon.registerIcon("hbm:pipette_overlay");
-    }
 
-    @Override
+			return j;
-    @SideOnly(Side.CLIENT)
+		}
-    public IIcon getIconFromDamageForRenderPass(int p_77618_1_, int p_77618_2_) {
+	}
-        return p_77618_2_ == 1 ? this.overlayIcon : super.getIconFromDamageForRenderPass(p_77618_1_, p_77618_2_);
-    }
-
-    @Override
-    @SideOnly(Side.CLIENT)
-    public boolean requiresMultipleRenderPasses() {
-        return true;
-    }
-
-    @Override
-    @SideOnly(Side.CLIENT)
-    public int getColorFromItemStack(ItemStack stack, int pass) {
-        if(pass == 0) {
-            return 0xffffff;
-        } else {
-            int j = this.getType(stack).getColor();
-
-            if(j < 0) {
-                j = 0xffffff;
-            }
-
-            return j;
-        }
-    }
 
 }

src/main/java/com/hbm/tileentity/machine/TileEntityMachineChemplant.java

@@ -86,6 +86,12 @@ public class TileEntityMachineChemplant extends TileEntityMachineBase implements
 	public String getName() {
 		return "container.chemplant";
 	}
+	
+	// last successful load
+	int lsl0 = 0;
+	int lsl1 = 0;
+	int lsu0 = 0;
+	int lsu1 = 0;
 
 	@Override
 	public void updateEntity() {
@@ -98,11 +104,21 @@ public class TileEntityMachineChemplant extends TileEntityMachineBase implements
 			this.isProgressing = false;
 			this.power = Library.chargeTEFromItems(slots, 0, power, maxPower);
 
-			if(!tanks[0].loadTank(17, 19, slots) && (slots[17] == null || slots[17].getItem() != ModItems.fluid_barrel_infinite)) tanks[0].unloadTank(17, 19, slots);
+			int fluidDelay = 40;
-			if(!tanks[1].loadTank(18, 20, slots) && (slots[18] == null || slots[18].getItem() != ModItems.fluid_barrel_infinite)) tanks[1].unloadTank(18, 20, slots);
+			
+			if(lsu0 >= fluidDelay && tanks[0].loadTank(17, 19, slots)) lsl0 = 0;
+			if(lsu1 >= fluidDelay && tanks[1].loadTank(18, 20, slots)) lsl1 = 0;
+			
+			if(lsl0 >= fluidDelay && slots[17] != null && slots[17].getItem() != ModItems.fluid_barrel_infinite) if(tanks[0].unloadTank(17, 19, slots)) lsu0 = 0;
+			if(lsl1 >= fluidDelay && slots[18] != null && slots[18].getItem() != ModItems.fluid_barrel_infinite) if(tanks[1].unloadTank(18, 20, slots)) lsu1 = 0;
 			
 			tanks[2].unloadTank(9, 11, slots);
 			tanks[3].unloadTank(10, 12, slots);
+
+			if(lsl0 < fluidDelay) lsl0++;
+			if(lsl1 < fluidDelay) lsl1++;
+			if(lsu0 < fluidDelay) lsu0++;
+			if(lsu1 < fluidDelay) lsu1++;
 			
 			loadItems();
 			unloadItems();