diff --git a/src/main/java/binnie/botany/items/BotanyItems.java b/src/main/java/binnie/botany/items/BotanyItems.java index d69bb967..917f1674 100644 --- a/src/main/java/binnie/botany/items/BotanyItems.java +++ b/src/main/java/binnie/botany/items/BotanyItems.java @@ -1,11 +1,12 @@ package binnie.botany.items; +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.item.ItemStack; +import net.minecraft.util.IIcon; + import binnie.botany.Botany; import binnie.core.item.IItemMisc; import binnie.core.util.I18N; -import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.item.ItemStack; -import net.minecraft.util.IIcon; public enum BotanyItems implements IItemMisc { diff --git a/src/main/java/binnie/core/item/DamageItems.java b/src/main/java/binnie/core/item/DamageItems.java index a68109d2..9b3500ee 100644 --- a/src/main/java/binnie/core/item/DamageItems.java +++ b/src/main/java/binnie/core/item/DamageItems.java @@ -1,15 +1,17 @@ package binnie.core.item; -import cpw.mods.fml.common.registry.GameRegistry; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import java.util.List; + import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; +import cpw.mods.fml.common.registry.GameRegistry; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + public abstract class DamageItems extends Item { private final String[] NAMES; diff --git a/src/main/java/binnie/core/item/IItemEnum.java b/src/main/java/binnie/core/item/IItemEnum.java index 8ecf2b07..5c7385d5 100644 --- a/src/main/java/binnie/core/item/IItemEnum.java +++ b/src/main/java/binnie/core/item/IItemEnum.java @@ -4,7 +4,9 @@ import net.minecraft.item.ItemStack; public interface IItemEnum { - default boolean isActive() { return true; } + default boolean isActive() { + return true; + } String getName(ItemStack itemStack); diff --git a/src/main/java/binnie/core/item/IItemMisc.java b/src/main/java/binnie/core/item/IItemMisc.java index 909f9b5d..3e820d85 100644 --- a/src/main/java/binnie/core/item/IItemMisc.java +++ b/src/main/java/binnie/core/item/IItemMisc.java @@ -1,11 +1,12 @@ package binnie.core.item; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + public interface IItemMisc extends IItemEnum { IIcon getIcon(ItemStack itemStack); diff --git a/src/main/java/binnie/core/item/ItemMisc.java b/src/main/java/binnie/core/item/ItemMisc.java index a1aff666..717120db 100644 --- a/src/main/java/binnie/core/item/ItemMisc.java +++ b/src/main/java/binnie/core/item/ItemMisc.java @@ -1,14 +1,16 @@ package binnie.core.item; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import java.util.List; + import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + public class ItemMisc extends Item { private final IItemMisc[] items; diff --git a/src/main/java/binnie/core/liquid/FluidContainer.java b/src/main/java/binnie/core/liquid/FluidContainer.java index 4d88a375..5517b1a7 100644 --- a/src/main/java/binnie/core/liquid/FluidContainer.java +++ b/src/main/java/binnie/core/liquid/FluidContainer.java @@ -1,16 +1,17 @@ package binnie.core.liquid; +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.init.Items; +import net.minecraft.item.ItemStack; +import net.minecraft.util.IIcon; +import net.minecraftforge.fluids.FluidContainerRegistry; + import binnie.core.BinnieCore; import binnie.core.Mods; import binnie.core.util.I18N; import binnie.genetics.item.GeneticsMisc; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.init.Items; -import net.minecraft.item.ItemStack; -import net.minecraft.util.IIcon; -import net.minecraftforge.fluids.FluidContainerRegistry; public enum FluidContainer { diff --git a/src/main/java/binnie/extrabees/core/ExtraBeeItems.java b/src/main/java/binnie/extrabees/core/ExtraBeeItems.java index 5a8ff9e8..73cd2b42 100644 --- a/src/main/java/binnie/extrabees/core/ExtraBeeItems.java +++ b/src/main/java/binnie/extrabees/core/ExtraBeeItems.java @@ -1,5 +1,13 @@ package binnie.extrabees.core; +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.init.Blocks; +import net.minecraft.init.Items; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.util.IIcon; +import net.minecraftforge.oredict.OreDictionary; + import binnie.Binnie; import binnie.core.Mods; import binnie.core.item.IItemMisc; @@ -9,13 +17,6 @@ import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import forestry.api.recipes.RecipeManagers; -import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.init.Blocks; -import net.minecraft.init.Items; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.util.IIcon; -import net.minecraftforge.oredict.OreDictionary; public enum ExtraBeeItems implements IItemMisc { diff --git a/src/main/java/binnie/extrabees/products/EnumHoneyDrop.java b/src/main/java/binnie/extrabees/products/EnumHoneyDrop.java index e159ac83..05e6967b 100644 --- a/src/main/java/binnie/extrabees/products/EnumHoneyDrop.java +++ b/src/main/java/binnie/extrabees/products/EnumHoneyDrop.java @@ -3,6 +3,7 @@ package binnie.extrabees.products; import java.awt.Color; import javax.annotation.Nonnull; + import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; diff --git a/src/main/java/binnie/extratrees/item/ExtraTreeItems.java b/src/main/java/binnie/extratrees/item/ExtraTreeItems.java index ac6ac9bd..b7cedd20 100644 --- a/src/main/java/binnie/extratrees/item/ExtraTreeItems.java +++ b/src/main/java/binnie/extratrees/item/ExtraTreeItems.java @@ -1,11 +1,12 @@ package binnie.extratrees.item; +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.item.ItemStack; +import net.minecraft.util.IIcon; + import binnie.core.item.IItemMisc; import binnie.core.util.I18N; import binnie.extratrees.ExtraTrees; -import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.item.ItemStack; -import net.minecraft.util.IIcon; public enum ExtraTreeItems implements IItemMisc { diff --git a/src/main/java/binnie/genetics/GeneticsCreativeTab.java b/src/main/java/binnie/genetics/GeneticsCreativeTab.java index c8c59cc7..6ceb1369 100644 --- a/src/main/java/binnie/genetics/GeneticsCreativeTab.java +++ b/src/main/java/binnie/genetics/GeneticsCreativeTab.java @@ -2,13 +2,14 @@ package binnie.genetics; import static binnie.genetics.item.GeneticsMisc.Items.EmptySerum; -import binnie.core.util.I18N; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import binnie.core.util.I18N; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + public class GeneticsCreativeTab extends CreativeTabs { public static CreativeTabs instance = new GeneticsCreativeTab(); diff --git a/src/main/java/binnie/genetics/genetics/Engineering.java b/src/main/java/binnie/genetics/genetics/Engineering.java index 78e3668a..4c1059eb 100644 --- a/src/main/java/binnie/genetics/genetics/Engineering.java +++ b/src/main/java/binnie/genetics/genetics/Engineering.java @@ -4,13 +4,14 @@ import static binnie.genetics.item.GeneticsItems.SEQUENCER; import static binnie.genetics.item.GeneticsMisc.Items.EmptyGenome; import static binnie.genetics.item.GeneticsMisc.Items.EmptySerum; +import net.minecraft.item.ItemStack; + import binnie.genetics.Genetics; import binnie.genetics.api.IGene; import binnie.genetics.api.IItemChargable; import binnie.genetics.api.IItemSerum; import binnie.genetics.item.ItemSerum; import binnie.genetics.item.ItemSerumArray; -import net.minecraft.item.ItemStack; public class Engineering { @@ -21,8 +22,8 @@ public class Engineering { if (stack.getItem() instanceof IItemSerum) { return ((IItemSerum) stack.getItem()).getCharges(stack) == 0; } - return stack.getItem() == Genetics.itemGenetics && (stack.getItemDamage() == EmptySerum.ordinal() - || stack.getItemDamage() == EmptyGenome.ordinal()); + return stack.getItem() == Genetics.itemGenetics + && (stack.getItemDamage() == EmptySerum.ordinal() || stack.getItemDamage() == EmptyGenome.ordinal()); } public static boolean canAcceptGene(ItemStack stack, IGene gene) { diff --git a/src/main/java/binnie/genetics/gui/WindowAnalyst.java b/src/main/java/binnie/genetics/gui/WindowAnalyst.java index 0961393e..15b577fb 100644 --- a/src/main/java/binnie/genetics/gui/WindowAnalyst.java +++ b/src/main/java/binnie/genetics/gui/WindowAnalyst.java @@ -2,6 +2,13 @@ package binnie.genetics.gui; import static binnie.genetics.item.GeneticsMisc.Items.DNADye; +import java.util.ArrayList; +import java.util.List; + +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.IInventory; +import net.minecraft.item.ItemStack; + import binnie.Binnie; import binnie.botany.api.IFlower; import binnie.core.AbstractMod; @@ -40,11 +47,6 @@ import forestry.api.genetics.AlleleManager; import forestry.api.genetics.IBreedingTracker; import forestry.api.genetics.IIndividual; import forestry.api.lepidopterology.IButterfly; -import java.util.ArrayList; -import java.util.List; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.IInventory; -import net.minecraft.item.ItemStack; public class WindowAnalyst extends Window { @@ -100,8 +102,7 @@ public class WindowAnalyst extends Window { || (Analyser.isAnalysable(itemStack) && getWindowInventory().getStackInSlot(1) != null); } }); - getWindowInventory() - .setValidator(1, new SlotValidator.Item(DNADye.get(1), ModuleMachine.IconDye)); + getWindowInventory().setValidator(1, new SlotValidator.Item(DNADye.get(1), ModuleMachine.IconDye)); } } diff --git a/src/main/java/binnie/genetics/item/GeneticsItems.java b/src/main/java/binnie/genetics/item/GeneticsItems.java index 3d2f4310..18f2ac6f 100644 --- a/src/main/java/binnie/genetics/item/GeneticsItems.java +++ b/src/main/java/binnie/genetics/item/GeneticsItems.java @@ -3,6 +3,7 @@ package binnie.genetics.item; import net.minecraft.item.Item; public enum GeneticsItems { + SERUM(new ItemSerum()), SERUM_ARRAY(new ItemSerumArray()), SEQUENCER(new ItemSequence()), diff --git a/src/main/java/binnie/genetics/item/GeneticsMisc.java b/src/main/java/binnie/genetics/item/GeneticsMisc.java index 3452f996..27b0de22 100644 --- a/src/main/java/binnie/genetics/item/GeneticsMisc.java +++ b/src/main/java/binnie/genetics/item/GeneticsMisc.java @@ -3,14 +3,17 @@ package binnie.genetics.item; import static binnie.genetics.Genetics.GENETICS_MODID; import static binnie.genetics.Genetics.itemGenetics; +import java.util.Arrays; + +import net.minecraft.item.ItemStack; + import binnie.core.item.DamageItems; import binnie.genetics.GeneticsCreativeTab; -import java.util.Arrays; -import net.minecraft.item.ItemStack; public class GeneticsMisc extends DamageItems { public enum Items { + LaboratoryCasing("casingIron"), DNADye("dnaDye"), FluorescentDye("dyeFluor"), @@ -37,7 +40,9 @@ public class GeneticsMisc extends DamageItems { } protected GeneticsMisc() { - super(GeneticsCreativeTab.instance, GENETICS_MODID, + super( + GeneticsCreativeTab.instance, + GENETICS_MODID, Arrays.stream(Items.VALUES).map(i -> i.name).toArray(String[]::new)); } } diff --git a/src/main/java/binnie/genetics/item/ItemSerum.java b/src/main/java/binnie/genetics/item/ItemSerum.java index 12a1be2a..7c3ea7f3 100644 --- a/src/main/java/binnie/genetics/item/ItemSerum.java +++ b/src/main/java/binnie/genetics/item/ItemSerum.java @@ -2,6 +2,14 @@ package binnie.genetics.item; import static binnie.genetics.item.GeneticsItems.SERUM; +import java.util.List; +import java.util.Map; + +import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; + import binnie.Binnie; import binnie.core.genetics.BreedingSystem; import binnie.core.genetics.Gene; @@ -16,12 +24,6 @@ import forestry.api.genetics.AlleleManager; import forestry.api.genetics.IAllele; import forestry.api.genetics.IChromosomeType; import forestry.api.genetics.ISpeciesRoot; -import java.util.List; -import java.util.Map; -import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; public class ItemSerum extends ItemGene implements IItemSerum { diff --git a/src/main/java/binnie/genetics/item/ModuleItem.java b/src/main/java/binnie/genetics/item/ModuleItem.java index a8e4fca2..4b4b3473 100644 --- a/src/main/java/binnie/genetics/item/ModuleItem.java +++ b/src/main/java/binnie/genetics/item/ModuleItem.java @@ -1,22 +1,29 @@ package binnie.genetics.item; -import static binnie.genetics.item.GeneticsMisc.Items.Cylinder; -import static binnie.genetics.item.GeneticsMisc.Items.DNADye; -import static binnie.genetics.item.GeneticsMisc.Items.EmptyGenome; -import static binnie.genetics.item.GeneticsMisc.Items.EmptySequencer; -import static binnie.genetics.item.GeneticsMisc.Items.EmptySerum; -import static binnie.genetics.item.GeneticsMisc.Items.FluorescentDye; -import static binnie.genetics.item.GeneticsMisc.Items.IntegratedCPU; -import static binnie.genetics.item.GeneticsMisc.Items.IntegratedCasing; -import static binnie.genetics.item.GeneticsMisc.Items.IntegratedCircuit; -import static binnie.genetics.item.GeneticsMisc.Items.LaboratoryCasing; -import static binnie.genetics.item.GeneticsMisc.Items.GrowthMedium; import static binnie.genetics.item.GeneticsItems.ANALYST; import static binnie.genetics.item.GeneticsItems.DATABASE; import static binnie.genetics.item.GeneticsItems.REGISTRY; import static binnie.genetics.item.GeneticsItems.SEQUENCER; import static binnie.genetics.item.GeneticsItems.SERUM; import static binnie.genetics.item.GeneticsItems.SERUM_ARRAY; +import static binnie.genetics.item.GeneticsMisc.Items.Cylinder; +import static binnie.genetics.item.GeneticsMisc.Items.DNADye; +import static binnie.genetics.item.GeneticsMisc.Items.EmptyGenome; +import static binnie.genetics.item.GeneticsMisc.Items.EmptySequencer; +import static binnie.genetics.item.GeneticsMisc.Items.EmptySerum; +import static binnie.genetics.item.GeneticsMisc.Items.FluorescentDye; +import static binnie.genetics.item.GeneticsMisc.Items.GrowthMedium; +import static binnie.genetics.item.GeneticsMisc.Items.IntegratedCPU; +import static binnie.genetics.item.GeneticsMisc.Items.IntegratedCasing; +import static binnie.genetics.item.GeneticsMisc.Items.IntegratedCircuit; +import static binnie.genetics.item.GeneticsMisc.Items.LaboratoryCasing; + +import net.minecraft.init.Blocks; +import net.minecraft.init.Items; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraftforge.oredict.ShapedOreRecipe; +import net.minecraftforge.oredict.ShapelessOreRecipe; import binnie.Binnie; import binnie.botany.Botany; @@ -30,12 +37,6 @@ import binnie.extratrees.ExtraTrees; import binnie.genetics.Genetics; import cpw.mods.fml.common.registry.GameRegistry; import forestry.api.recipes.RecipeManagers; -import net.minecraft.init.Blocks; -import net.minecraft.init.Items; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraftforge.oredict.ShapedOreRecipe; -import net.minecraftforge.oredict.ShapelessOreRecipe; public class ModuleItem implements IInitializable { @@ -82,8 +83,7 @@ public class ModuleItem implements IInitializable { @Override public void postInit() { - GameRegistry - .addShapelessRecipe(DNADye.get(8), Items.glowstone_dust, new ItemStack(Items.dye, 1, 5)); + GameRegistry.addShapelessRecipe(DNADye.get(8), Items.glowstone_dust, new ItemStack(Items.dye, 1, 5)); GameRegistry.addRecipe( new ShapedOreRecipe( @@ -92,9 +92,7 @@ public class ModuleItem implements IInitializable { Mods.forestry.item("sturdyMachine") })); GameRegistry.addRecipe( - new ShapelessOreRecipe( - DNADye.get(2), - new Object[] { "dyePurple", "dyeMagenta", "dyePink" })); + new ShapelessOreRecipe(DNADye.get(2), new Object[] { "dyePurple", "dyeMagenta", "dyePink" })); GameRegistry.addRecipe( new ShapelessOreRecipe( @@ -118,14 +116,10 @@ public class ModuleItem implements IInitializable { new Object[] { " g ", " G ", "GGG", 'g', "ingotGold", 'G', Blocks.glass_pane })); GameRegistry.addRecipe( - new ShapedOreRecipe( - EmptyGenome.get(1), - new Object[] { "sss", "sss", "sss", 's', EmptySerum.get(1) })); + new ShapedOreRecipe(EmptyGenome.get(1), new Object[] { "sss", "sss", "sss", 's', EmptySerum.get(1) })); GameRegistry.addRecipe( - new ShapedOreRecipe( - Cylinder.get(8), - new Object[] { " g ", "g g", " ", 'g', Blocks.glass_pane })); + new ShapedOreRecipe(Cylinder.get(8), new Object[] { " g ", "g g", " ", 'g', Blocks.glass_pane })); GameRegistry.addRecipe( new ShapedOreRecipe( @@ -147,8 +141,7 @@ public class ModuleItem implements IInitializable { GameRegistry.addRecipe( new ShapedOreRecipe( IntegratedCPU.get(1), - new Object[] { "ccc", "cdc", "ccc", 'c', IntegratedCircuit.get(1), 'd', - Items.diamond })); + new Object[] { "ccc", "cdc", "ccc", 'c', IntegratedCircuit.get(1), 'd', Items.diamond })); RecipeManagers.carpenterManager.addRecipe( 100, @@ -194,7 +187,7 @@ public class ModuleItem implements IInitializable { Item diamond = Items.diamond; // save a reference to diamond ItemStack analyst = new ItemStack(ANALYST.getItem()); // save a reference to the analyst, will make the next bit - // easier + // easier // the following code is a sufficient replacement for the 3 nested loops that preceded it; arguably this is // still diff --git a/src/main/java/binnie/genetics/machine/ComponentGUIHolder.java b/src/main/java/binnie/genetics/machine/ComponentGUIHolder.java index 0501f556..2e40b3a1 100644 --- a/src/main/java/binnie/genetics/machine/ComponentGUIHolder.java +++ b/src/main/java/binnie/genetics/machine/ComponentGUIHolder.java @@ -5,6 +5,18 @@ import static binnie.genetics.item.GeneticsItems.DATABASE; import static binnie.genetics.item.GeneticsItems.MASTER_REGISTRY; import static binnie.genetics.item.GeneticsItems.REGISTRY; +import java.util.ArrayList; +import java.util.List; +import java.util.Random; + +import net.minecraft.entity.item.EntityItem; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.world.World; + import binnie.botany.Botany; import binnie.core.BinnieCore; import binnie.core.machines.IMachine; @@ -14,16 +26,6 @@ import binnie.core.machines.network.INetwork; import binnie.extrabees.ExtraBees; import binnie.extratrees.ExtraTrees; import buildcraft.api.tools.IToolWrench; -import java.util.ArrayList; -import java.util.List; -import java.util.Random; -import net.minecraft.entity.item.EntityItem; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.world.World; public class ComponentGUIHolder extends MachineComponent implements INetwork.TilePacketSync, IInteraction.RightClick { diff --git a/src/main/java/binnie/genetics/machine/ModuleMachine.java b/src/main/java/binnie/genetics/machine/ModuleMachine.java index 6a6da9be..43aba87d 100644 --- a/src/main/java/binnie/genetics/machine/ModuleMachine.java +++ b/src/main/java/binnie/genetics/machine/ModuleMachine.java @@ -8,6 +8,12 @@ import static binnie.genetics.item.GeneticsMisc.Items.IntegratedCasing; import static binnie.genetics.item.GeneticsMisc.Items.IntegratedCircuit; import static binnie.genetics.item.GeneticsMisc.Items.LaboratoryCasing; +import net.minecraft.init.Blocks; +import net.minecraft.init.Items; +import net.minecraft.item.Item; +import net.minecraftforge.oredict.OreDictionary; +import net.minecraftforge.oredict.ShapedOreRecipe; + import binnie.core.BinnieCore; import binnie.core.IInitializable; import binnie.core.Mods; @@ -18,11 +24,6 @@ import binnie.genetics.GeneticsCreativeTab; import binnie.genetics.machine.acclimatiser.Acclimatiser; import binnie.genetics.machine.incubator.Incubator; import cpw.mods.fml.common.registry.GameRegistry; -import net.minecraft.init.Blocks; -import net.minecraft.init.Items; -import net.minecraft.item.Item; -import net.minecraftforge.oredict.OreDictionary; -import net.minecraftforge.oredict.ShapedOreRecipe; public class ModuleMachine implements IInitializable { @@ -83,9 +84,8 @@ public class ModuleMachine implements IInitializable { GameRegistry.addRecipe( new ShapedOreRecipe( LaboratoryMachine.Incubator.get(1), - new Object[] { "gFg", "cCc", "aPa", 'C', LaboratoryCasing.get(1), 'F', - Blocks.furnace, 'c', circuit, 'g', Blocks.glass_pane, 'P', "gearBronze", 'a', - ironGear })); + new Object[] { "gFg", "cCc", "aPa", 'C', LaboratoryCasing.get(1), 'F', Blocks.furnace, 'c', + circuit, 'g', Blocks.glass_pane, 'P', "gearBronze", 'a', ironGear })); Item alyzer = null; if (BinnieCore.isApicultureActive()) { @@ -100,22 +100,20 @@ public class ModuleMachine implements IInitializable { GameRegistry.addRecipe( new ShapedOreRecipe( LaboratoryMachine.Analyser.get(1), - new Object[] { "gBg", "cCc", "aPa", 'C', LaboratoryCasing.get(1), 'B', - alyzer, 'c', circuit, 'g', Blocks.glass_pane, 'P', "gearBronze", 'a', - DNADye.get(1) })); + new Object[] { "gBg", "cCc", "aPa", 'C', LaboratoryCasing.get(1), 'B', alyzer, 'c', + circuit, 'g', Blocks.glass_pane, 'P', "gearBronze", 'a', DNADye.get(1) })); } GameRegistry.addRecipe( new ShapedOreRecipe( LaboratoryMachine.Genepool.get(1), - new Object[] { "gBg", "cCc", "aPa", 'C', LaboratoryCasing.get(1), 'B', - "gearBronze", 'c', circuit, 'g', Blocks.glass_pane, 'P', "gearBronze", 'a', - Blocks.glass })); + new Object[] { "gBg", "cCc", "aPa", 'C', LaboratoryCasing.get(1), 'B', "gearBronze", 'c', + circuit, 'g', Blocks.glass_pane, 'P', "gearBronze", 'a', Blocks.glass })); GameRegistry.addRecipe( new ShapedOreRecipe( LaboratoryMachine.Acclimatiser.get(1), - new Object[] { "gBg", "cCc", "aPa", 'C', LaboratoryCasing.get(1), 'B', - Items.lava_bucket, 'c', circuit, 'g', Blocks.glass_pane, 'P', "gearBronze", 'a', + new Object[] { "gBg", "cCc", "aPa", 'C', LaboratoryCasing.get(1), 'B', Items.lava_bucket, + 'c', circuit, 'g', Blocks.glass_pane, 'P', "gearBronze", 'a', Items.water_bucket })); } @@ -123,38 +121,35 @@ public class ModuleMachine implements IInitializable { GameRegistry.addRecipe( new ShapedOreRecipe( GeneticMachine.Isolator.get(1), - new Object[] { "gBg", "cCc", "aPa", 'C', LaboratoryCasing.get(1), 'B', - goldGear, 'c', circuit, 'g', Items.gold_nugget, 'P', "gearBronze", 'a', - Enzyme.get(1) })); + new Object[] { "gBg", "cCc", "aPa", 'C', LaboratoryCasing.get(1), 'B', goldGear, 'c', + circuit, 'g', Items.gold_nugget, 'P', "gearBronze", 'a', Enzyme.get(1) })); GameRegistry.addRecipe( new ShapedOreRecipe( GeneticMachine.Polymeriser.get(1), - new Object[] { "gBg", "cCc", "gPg", 'C', LaboratoryCasing.get(1), 'B', - ironGear, 'c', circuit, 'g', Items.gold_nugget, 'P', "gearBronze" })); + new Object[] { "gBg", "cCc", "gPg", 'C', LaboratoryCasing.get(1), 'B', ironGear, 'c', + circuit, 'g', Items.gold_nugget, 'P', "gearBronze" })); GameRegistry.addRecipe( new ShapedOreRecipe( GeneticMachine.Sequencer.get(1), - new Object[] { "gBg", "cCc", "aPa", 'C', LaboratoryCasing.get(1), 'B', - "gearBronze", 'c', circuit, 'g', Items.gold_nugget, 'P', "gearBronze", 'a', - FluorescentDye.get(1) })); + new Object[] { "gBg", "cCc", "aPa", 'C', LaboratoryCasing.get(1), 'B', "gearBronze", 'c', + circuit, 'g', Items.gold_nugget, 'P', "gearBronze", 'a', FluorescentDye.get(1) })); GameRegistry.addRecipe( new ShapedOreRecipe( GeneticMachine.Inoculator.get(1), - new Object[] { "gBg", "cCc", "aPa", 'C', LaboratoryCasing.get(1), 'B', - diamondGear, 'c', circuit, 'g', Items.gold_nugget, 'P', "gearBronze", 'a', - Items.emerald })); + new Object[] { "gBg", "cCc", "aPa", 'C', LaboratoryCasing.get(1), 'B', diamondGear, 'c', + circuit, 'g', Items.gold_nugget, 'P', "gearBronze", 'a', Items.emerald })); } GameRegistry.addRecipe( new ShapedOreRecipe( AdvGeneticMachine.Splicer.get(1), - new Object[] { "gBg", "cCc", "aPa", 'C', IntegratedCasing.get(1), 'B', - diamondGear, 'c', IntegratedCPU.get(1), 'g', Items.gold_nugget, 'P', - "gearBronze", 'a', Items.blaze_rod })); + new Object[] { "gBg", "cCc", "aPa", 'C', IntegratedCasing.get(1), 'B', diamondGear, 'c', + IntegratedCPU.get(1), 'g', Items.gold_nugget, 'P', "gearBronze", 'a', + Items.blaze_rod })); GameRegistry.addRecipe( new ShapedOreRecipe( LaboratoryMachine.LabMachine.get(1), - new Object[] { "igi", "gCg", "igi", 'C', LaboratoryCasing.get(1), 'i', - "ingotIron", 'g', Blocks.glass_pane })); + new Object[] { "igi", "gCg", "igi", 'C', LaboratoryCasing.get(1), 'i', "ingotIron", 'g', + Blocks.glass_pane })); } } diff --git a/src/main/java/binnie/genetics/machine/analyser/DyeSlotValidator.java b/src/main/java/binnie/genetics/machine/analyser/DyeSlotValidator.java index 28e80438..d1b69afb 100644 --- a/src/main/java/binnie/genetics/machine/analyser/DyeSlotValidator.java +++ b/src/main/java/binnie/genetics/machine/analyser/DyeSlotValidator.java @@ -2,10 +2,11 @@ package binnie.genetics.machine.analyser; import static binnie.genetics.item.GeneticsMisc.Items.DNADye; +import net.minecraft.item.ItemStack; + import binnie.core.machines.inventory.SlotValidator; import binnie.core.util.I18N; import binnie.genetics.machine.ModuleMachine; -import net.minecraft.item.ItemStack; public class DyeSlotValidator extends SlotValidator { diff --git a/src/main/java/binnie/genetics/machine/incubator/Incubator.java b/src/main/java/binnie/genetics/machine/incubator/Incubator.java index d0f171fc..7a2ecb56 100644 --- a/src/main/java/binnie/genetics/machine/incubator/Incubator.java +++ b/src/main/java/binnie/genetics/machine/incubator/Incubator.java @@ -3,6 +3,12 @@ package binnie.genetics.machine.incubator; import static binnie.genetics.item.GeneticLiquid.GrowthMedium; import static binnie.genetics.item.GeneticsMisc.Items.Enzyme; +import java.util.ArrayList; +import java.util.List; + +import net.minecraft.init.Items; +import net.minecraft.item.ItemStack; + import binnie.Binnie; import binnie.core.BinnieCore; import binnie.genetics.api.IIncubatorRecipe; @@ -13,10 +19,6 @@ import forestry.api.apiculture.EnumBeeType; import forestry.api.genetics.AlleleManager; import forestry.api.genetics.IAllele; import forestry.api.genetics.IIndividual; -import java.util.ArrayList; -import java.util.List; -import net.minecraft.init.Items; -import net.minecraft.item.ItemStack; public class Incubator { diff --git a/src/main/java/binnie/genetics/machine/sequencer/SequencerComponentLogic.java b/src/main/java/binnie/genetics/machine/sequencer/SequencerComponentLogic.java index 6a427af2..19fd59b3 100644 --- a/src/main/java/binnie/genetics/machine/sequencer/SequencerComponentLogic.java +++ b/src/main/java/binnie/genetics/machine/sequencer/SequencerComponentLogic.java @@ -2,6 +2,8 @@ package binnie.genetics.machine.sequencer; import static binnie.genetics.item.GeneticsMisc.Items.EmptySequencer; +import net.minecraft.item.ItemStack; + import binnie.core.machines.Machine; import binnie.core.machines.inventory.ComponentInventoryTransfer; import binnie.core.machines.power.ComponentProcess; @@ -10,7 +12,6 @@ import binnie.core.machines.power.IProcess; import binnie.core.util.I18N; import binnie.genetics.genetics.GeneTracker; import binnie.genetics.genetics.SequencerItem; -import net.minecraft.item.ItemStack; public class SequencerComponentLogic extends ComponentProcess implements IProcess, ComponentInventoryTransfer.ITransferRestockListener { diff --git a/src/main/java/binnie/genetics/machine/sequencer/UnsequencedSlotValidator.java b/src/main/java/binnie/genetics/machine/sequencer/UnsequencedSlotValidator.java index 8a5aa076..1794d937 100644 --- a/src/main/java/binnie/genetics/machine/sequencer/UnsequencedSlotValidator.java +++ b/src/main/java/binnie/genetics/machine/sequencer/UnsequencedSlotValidator.java @@ -2,11 +2,12 @@ package binnie.genetics.machine.sequencer; import static binnie.genetics.item.GeneticsItems.SEQUENCER; +import net.minecraft.item.ItemStack; + import binnie.core.machines.inventory.SlotValidator; import binnie.core.util.I18N; import binnie.genetics.genetics.SequencerItem; import binnie.genetics.machine.ModuleMachine; -import net.minecraft.item.ItemStack; public class UnsequencedSlotValidator extends SlotValidator { diff --git a/src/main/java/binnie/genetics/nei/AnalyserRecipeHandler.java b/src/main/java/binnie/genetics/nei/AnalyserRecipeHandler.java index d83ed9d3..1c0bdf72 100644 --- a/src/main/java/binnie/genetics/nei/AnalyserRecipeHandler.java +++ b/src/main/java/binnie/genetics/nei/AnalyserRecipeHandler.java @@ -3,6 +3,13 @@ package binnie.genetics.nei; import static binnie.genetics.item.GeneticsItems.SEQUENCER; import static binnie.genetics.item.GeneticsMisc.Items.DNADye; +import java.util.ArrayList; +import java.util.List; + +import net.minecraft.item.ItemStack; +import net.minecraft.util.StatCollector; +import net.minecraftforge.oredict.OreDictionary; + import binnie.botany.Botany; import binnie.core.BinnieCore; import binnie.core.Mods; @@ -12,11 +19,6 @@ import codechicken.lib.gui.GuiDraw; import codechicken.nei.ItemList; import codechicken.nei.NEIServerUtils; import codechicken.nei.PositionedStack; -import java.util.ArrayList; -import java.util.List; -import net.minecraft.item.ItemStack; -import net.minecraft.util.StatCollector; -import net.minecraftforge.oredict.OreDictionary; public class AnalyserRecipeHandler extends RecipeHandlerBase { diff --git a/src/main/java/binnie/genetics/nei/DatabaseRecipeHandler.java b/src/main/java/binnie/genetics/nei/DatabaseRecipeHandler.java index a423953b..872e3c8a 100644 --- a/src/main/java/binnie/genetics/nei/DatabaseRecipeHandler.java +++ b/src/main/java/binnie/genetics/nei/DatabaseRecipeHandler.java @@ -5,17 +5,19 @@ import static binnie.genetics.item.GeneticsItems.SERUM_ARRAY; import static binnie.genetics.item.GeneticsMisc.Items.EmptyGenome; import static binnie.genetics.item.GeneticsMisc.Items.EmptySerum; +import java.util.ArrayList; +import java.util.List; + +import net.minecraft.item.ItemStack; +import net.minecraft.util.StatCollector; +import net.minecraftforge.oredict.OreDictionary; + import binnie.core.nei.RecipeHandlerBase; import binnie.genetics.item.ItemSerumArray; import codechicken.lib.gui.GuiDraw; import codechicken.nei.ItemList; import codechicken.nei.NEIServerUtils; import codechicken.nei.PositionedStack; -import java.util.ArrayList; -import java.util.List; -import net.minecraft.item.ItemStack; -import net.minecraft.util.StatCollector; -import net.minecraftforge.oredict.OreDictionary; public class DatabaseRecipeHandler extends RecipeHandlerBase { @@ -103,8 +105,7 @@ public class DatabaseRecipeHandler extends RecipeHandlerBase { } public ItemStack getEmptySerum() { - return this.serum.getItem() instanceof ItemSerumArray ? EmptyGenome.get(1) - : EmptySerum.get(1); + return this.serum.getItem() instanceof ItemSerumArray ? EmptyGenome.get(1) : EmptySerum.get(1); } } diff --git a/src/main/java/binnie/genetics/nei/GenepoolRecipeHandler.java b/src/main/java/binnie/genetics/nei/GenepoolRecipeHandler.java index 0a2ee19e..b4055116 100644 --- a/src/main/java/binnie/genetics/nei/GenepoolRecipeHandler.java +++ b/src/main/java/binnie/genetics/nei/GenepoolRecipeHandler.java @@ -2,6 +2,15 @@ package binnie.genetics.nei; import static binnie.genetics.item.GeneticsMisc.Items.Enzyme; +import java.awt.Rectangle; +import java.util.ArrayList; +import java.util.List; + +import net.minecraft.item.ItemStack; +import net.minecraft.util.StatCollector; +import net.minecraftforge.fluids.FluidStack; +import net.minecraftforge.oredict.OreDictionary; + import binnie.Binnie; import binnie.botany.Botany; import binnie.core.BinnieCore; @@ -14,13 +23,6 @@ import codechicken.lib.gui.GuiDraw; import codechicken.nei.NEIServerUtils; import codechicken.nei.PositionedStack; import forestry.api.apiculture.EnumBeeType; -import java.awt.Rectangle; -import java.util.ArrayList; -import java.util.List; -import net.minecraft.item.ItemStack; -import net.minecraft.util.StatCollector; -import net.minecraftforge.fluids.FluidStack; -import net.minecraftforge.oredict.OreDictionary; public class GenepoolRecipeHandler extends RecipeHandlerBase { diff --git a/src/main/java/binnie/genetics/nei/InoculatorRecipeHandler.java b/src/main/java/binnie/genetics/nei/InoculatorRecipeHandler.java index b015f6b7..6fc46463 100644 --- a/src/main/java/binnie/genetics/nei/InoculatorRecipeHandler.java +++ b/src/main/java/binnie/genetics/nei/InoculatorRecipeHandler.java @@ -3,6 +3,15 @@ package binnie.genetics.nei; import static binnie.genetics.item.GeneticsItems.SERUM; import static binnie.genetics.item.GeneticsItems.SERUM_ARRAY; +import java.awt.Rectangle; +import java.util.ArrayList; +import java.util.List; + +import net.minecraft.item.ItemStack; +import net.minecraft.util.StatCollector; +import net.minecraftforge.fluids.FluidStack; +import net.minecraftforge.oredict.OreDictionary; + import binnie.botany.Botany; import binnie.core.BinnieCore; import binnie.core.Mods; @@ -16,22 +25,18 @@ import codechicken.nei.NEIServerUtils; import codechicken.nei.PositionedStack; import forestry.api.genetics.AlleleManager; import forestry.api.genetics.ISpeciesRoot; -import java.awt.Rectangle; -import java.util.ArrayList; -import java.util.List; -import net.minecraft.item.ItemStack; -import net.minecraft.util.StatCollector; -import net.minecraftforge.fluids.FluidStack; -import net.minecraftforge.oredict.OreDictionary; public class InoculatorRecipeHandler extends RecipeHandlerBase { private static final List recipes = new ArrayList<>(); private void createInoculatorRecipeForNEI(ItemStack dnaManipulable) { - recipes.add(new InoculatorRecipe(dnaManipulable, new ItemStack(SERUM.getItem(), 1, OreDictionary.WILDCARD_VALUE))); recipes.add( - new InoculatorRecipe(dnaManipulable, new ItemStack(SERUM_ARRAY.getItem(), 1, OreDictionary.WILDCARD_VALUE))); + new InoculatorRecipe(dnaManipulable, new ItemStack(SERUM.getItem(), 1, OreDictionary.WILDCARD_VALUE))); + recipes.add( + new InoculatorRecipe( + dnaManipulable, + new ItemStack(SERUM_ARRAY.getItem(), 1, OreDictionary.WILDCARD_VALUE))); } @Override diff --git a/src/main/java/binnie/genetics/nei/IsolatorRecipeHandler.java b/src/main/java/binnie/genetics/nei/IsolatorRecipeHandler.java index 9541e088..16b8c085 100644 --- a/src/main/java/binnie/genetics/nei/IsolatorRecipeHandler.java +++ b/src/main/java/binnie/genetics/nei/IsolatorRecipeHandler.java @@ -4,6 +4,15 @@ import static binnie.genetics.item.GeneticsItems.SEQUENCER; import static binnie.genetics.item.GeneticsMisc.Items.EmptySequencer; import static binnie.genetics.item.GeneticsMisc.Items.Enzyme; +import java.awt.Rectangle; +import java.util.ArrayList; +import java.util.List; + +import net.minecraft.item.ItemStack; +import net.minecraft.util.StatCollector; +import net.minecraftforge.fluids.FluidStack; +import net.minecraftforge.oredict.OreDictionary; + import binnie.Binnie; import binnie.botany.Botany; import binnie.core.BinnieCore; @@ -21,13 +30,6 @@ import forestry.api.genetics.AlleleManager; import forestry.api.genetics.IAllele; import forestry.api.genetics.IChromosomeType; import forestry.api.genetics.ISpeciesRoot; -import java.awt.Rectangle; -import java.util.ArrayList; -import java.util.List; -import net.minecraft.item.ItemStack; -import net.minecraft.util.StatCollector; -import net.minecraftforge.fluids.FluidStack; -import net.minecraftforge.oredict.OreDictionary; public class IsolatorRecipeHandler extends RecipeHandlerBase { diff --git a/src/main/java/binnie/genetics/nei/PolymeriserRecipeHandler.java b/src/main/java/binnie/genetics/nei/PolymeriserRecipeHandler.java index 4e3d22ea..f6872e92 100644 --- a/src/main/java/binnie/genetics/nei/PolymeriserRecipeHandler.java +++ b/src/main/java/binnie/genetics/nei/PolymeriserRecipeHandler.java @@ -4,6 +4,16 @@ import static binnie.genetics.item.GeneticsItems.SEQUENCER; import static binnie.genetics.item.GeneticsItems.SERUM; import static binnie.genetics.item.GeneticsItems.SERUM_ARRAY; +import java.awt.Rectangle; +import java.util.ArrayList; +import java.util.List; + +import net.minecraft.init.Items; +import net.minecraft.item.ItemStack; +import net.minecraft.util.StatCollector; +import net.minecraftforge.fluids.FluidStack; +import net.minecraftforge.oredict.OreDictionary; + import binnie.core.nei.NEIUtils; import binnie.core.nei.PositionedFluidTank; import binnie.core.nei.PositionedStackAdv; @@ -16,14 +26,6 @@ import codechicken.lib.gui.GuiDraw; import codechicken.nei.ItemList; import codechicken.nei.NEIServerUtils; import codechicken.nei.PositionedStack; -import java.awt.Rectangle; -import java.util.ArrayList; -import java.util.List; -import net.minecraft.init.Items; -import net.minecraft.item.ItemStack; -import net.minecraft.util.StatCollector; -import net.minecraftforge.fluids.FluidStack; -import net.minecraftforge.oredict.OreDictionary; public class PolymeriserRecipeHandler extends RecipeHandlerBase { diff --git a/src/main/java/binnie/genetics/nei/SequencerRecipeHandler.java b/src/main/java/binnie/genetics/nei/SequencerRecipeHandler.java index a6f004a8..e9bdc41f 100644 --- a/src/main/java/binnie/genetics/nei/SequencerRecipeHandler.java +++ b/src/main/java/binnie/genetics/nei/SequencerRecipeHandler.java @@ -5,15 +5,17 @@ import static binnie.genetics.item.GeneticsItems.SEQUENCER; import static binnie.genetics.item.GeneticsMisc.Items.EmptySequencer; import static binnie.genetics.item.GeneticsMisc.Items.FluorescentDye; +import java.util.ArrayList; +import java.util.List; + +import net.minecraft.item.ItemStack; +import net.minecraft.util.StatCollector; + import binnie.core.nei.RecipeHandlerBase; import codechicken.lib.gui.GuiDraw; import codechicken.nei.ItemList; import codechicken.nei.NEIServerUtils; import codechicken.nei.PositionedStack; -import java.util.ArrayList; -import java.util.List; -import net.minecraft.item.ItemStack; -import net.minecraft.util.StatCollector; public class SequencerRecipeHandler extends RecipeHandlerBase { diff --git a/src/main/java/binnie/genetics/nei/SplicerRecipeHandler.java b/src/main/java/binnie/genetics/nei/SplicerRecipeHandler.java index 54e864be..d4199791 100644 --- a/src/main/java/binnie/genetics/nei/SplicerRecipeHandler.java +++ b/src/main/java/binnie/genetics/nei/SplicerRecipeHandler.java @@ -3,6 +3,14 @@ package binnie.genetics.nei; import static binnie.genetics.item.GeneticsItems.SERUM; import static binnie.genetics.item.GeneticsItems.SERUM_ARRAY; +import java.util.ArrayList; +import java.util.List; + +import net.minecraft.item.ItemStack; +import net.minecraft.util.StatCollector; +import net.minecraftforge.fluids.FluidStack; +import net.minecraftforge.oredict.OreDictionary; + import binnie.botany.Botany; import binnie.core.BinnieCore; import binnie.core.Mods; @@ -16,20 +24,13 @@ import codechicken.nei.NEIServerUtils; import codechicken.nei.PositionedStack; import forestry.api.genetics.AlleleManager; import forestry.api.genetics.ISpeciesRoot; -import java.util.ArrayList; -import java.util.List; -import net.minecraft.item.ItemStack; -import net.minecraft.util.StatCollector; -import net.minecraftforge.fluids.FluidStack; -import net.minecraftforge.oredict.OreDictionary; public class SplicerRecipeHandler extends RecipeHandlerBase { private static final List recipes = new ArrayList<>(); private void createSplicerRecipeForNEI(ItemStack dnaManipulable) { - recipes.add( - new SplicerRecipe(dnaManipulable, new ItemStack(SERUM.getItem(), 1, OreDictionary.WILDCARD_VALUE))); + recipes.add(new SplicerRecipe(dnaManipulable, new ItemStack(SERUM.getItem(), 1, OreDictionary.WILDCARD_VALUE))); recipes.add( new SplicerRecipe( dnaManipulable,