From 49542b0851fc09f687b44fd1892b1513429d7333 Mon Sep 17 00:00:00 2001 From: mezz Date: Thu, 27 Oct 2016 02:41:42 -0700 Subject: [PATCH] Minor cleanup --- src/main/java/binnie/botany/flower/PropertyFlower.java | 2 +- src/main/java/binnie/core/Mods.java | 4 ++-- src/main/java/binnie/genetics/machine/LaboratoryMachine.java | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/java/binnie/botany/flower/PropertyFlower.java b/src/main/java/binnie/botany/flower/PropertyFlower.java index 72be0dd0..707f063f 100644 --- a/src/main/java/binnie/botany/flower/PropertyFlower.java +++ b/src/main/java/binnie/botany/flower/PropertyFlower.java @@ -46,7 +46,7 @@ public class PropertyFlower> extends PropertyHelper IAllele allele = AlleleManager.alleleRegistry.getAllele(value); if (IAlleleFlowerSpecies.class.isInstance(allele)) { IAlleleFlowerSpecies alleleValue = IAlleleFlowerSpecies.class.cast(allele); - return (Optional) Optional.of(alleleValue.getType()); + return Optional.of((I) alleleValue.getType()); } return Optional.absent(); } diff --git a/src/main/java/binnie/core/Mods.java b/src/main/java/binnie/core/Mods.java index e93bc441..c0da33f4 100644 --- a/src/main/java/binnie/core/Mods.java +++ b/src/main/java/binnie/core/Mods.java @@ -72,8 +72,8 @@ public class Mods { return this.stack(name, 1); } - public ItemStack stack(final String string, final int i, final int j) { - return new ItemStack(this.item(string), i, j); + public ItemStack stack(final String string, final int amount, final int meta) { + return new ItemStack(this.item(string), amount, meta); } public boolean active() { diff --git a/src/main/java/binnie/genetics/machine/LaboratoryMachine.java b/src/main/java/binnie/genetics/machine/LaboratoryMachine.java index 7cee453c..26b9ca4d 100644 --- a/src/main/java/binnie/genetics/machine/LaboratoryMachine.java +++ b/src/main/java/binnie/genetics/machine/LaboratoryMachine.java @@ -35,8 +35,8 @@ public enum LaboratoryMachine implements IMachineType { return true; } - public ItemStack get(final int i) { - return new ItemStack(Genetics.packageLabMachine.getBlock(), i, this.ordinal()); + public ItemStack get(final int amount) { + return new ItemStack(Genetics.packageLabMachine.getBlock(), amount, this.ordinal()); } public static class PackageLabMachine extends GeneticMachine.PackageGeneticBase {