diff --git a/src/main/java/binnie/botany/gardening/ItemSoilMeter.java b/src/main/java/binnie/botany/gardening/ItemSoilMeter.java index 0e5c129f..755a595a 100644 --- a/src/main/java/binnie/botany/gardening/ItemSoilMeter.java +++ b/src/main/java/binnie/botany/gardening/ItemSoilMeter.java @@ -5,7 +5,6 @@ import binnie.botany.CreativeTabBotany; import binnie.botany.api.EnumAcidity; import binnie.botany.api.EnumMoisture; import binnie.botany.api.gardening.IBlockSoil; -import binnie.botany.genetics.EnumFlowerType; import binnie.core.BinnieCore; import forestry.api.core.IItemModelRegister; import forestry.api.core.IModelManager; diff --git a/src/main/java/binnie/botany/genetics/BotanistTracker.java b/src/main/java/binnie/botany/genetics/BotanistTracker.java index ee431bb5..43bde104 100644 --- a/src/main/java/binnie/botany/genetics/BotanistTracker.java +++ b/src/main/java/binnie/botany/genetics/BotanistTracker.java @@ -6,7 +6,6 @@ import forestry.api.genetics.IBreedingTracker; import forestry.api.genetics.IIndividual; import forestry.core.genetics.BreedingTracker; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.nbt.NBTTagCompound; public class BotanistTracker extends BreedingTracker implements IBotanistTracker { public BotanistTracker(final String s) { diff --git a/src/main/java/binnie/core/machines/MachineGroup.java b/src/main/java/binnie/core/machines/MachineGroup.java index 06e89914..3208d4b4 100644 --- a/src/main/java/binnie/core/machines/MachineGroup.java +++ b/src/main/java/binnie/core/machines/MachineGroup.java @@ -6,8 +6,6 @@ import binnie.core.BinnieCore; import net.minecraft.client.renderer.block.model.ModelResourceLocation; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; -import net.minecraftforge.fml.common.registry.GameRegistry; - import java.util.Collection; import java.util.LinkedHashMap; import java.util.Map; diff --git a/src/main/java/binnie/core/machines/TileEntityMachineRenderer.java b/src/main/java/binnie/core/machines/TileEntityMachineRenderer.java index a0b514a6..7f785b2d 100644 --- a/src/main/java/binnie/core/machines/TileEntityMachineRenderer.java +++ b/src/main/java/binnie/core/machines/TileEntityMachineRenderer.java @@ -1,6 +1,5 @@ package binnie.core.machines; -import net.minecraft.client.renderer.VertexBuffer; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; public class TileEntityMachineRenderer extends TileEntitySpecialRenderer { diff --git a/src/main/java/binnie/core/machines/component/IRender.java b/src/main/java/binnie/core/machines/component/IRender.java index cf794594..a51de08b 100644 --- a/src/main/java/binnie/core/machines/component/IRender.java +++ b/src/main/java/binnie/core/machines/component/IRender.java @@ -1,6 +1,5 @@ package binnie.core.machines.component; -import net.minecraft.client.renderer.RenderItem; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; diff --git a/src/main/java/binnie/core/machines/inventory/ComponentInventorySlots.java b/src/main/java/binnie/core/machines/inventory/ComponentInventorySlots.java index fc042937..d7cabb96 100644 --- a/src/main/java/binnie/core/machines/inventory/ComponentInventorySlots.java +++ b/src/main/java/binnie/core/machines/inventory/ComponentInventorySlots.java @@ -165,8 +165,9 @@ public class ComponentInventorySlots extends ComponentInventory implements IInve @Override public final InventorySlot addSlot(final int index, final String unlocName) { - this.inventory.put(index, new InventorySlot(index, unlocName)); - return this.getSlot(index); + InventorySlot slot = new InventorySlot(index, unlocName); + this.inventory.put(index, slot); + return slot; } @Override diff --git a/src/main/java/binnie/core/machines/inventory/ComponentTankContainer.java b/src/main/java/binnie/core/machines/inventory/ComponentTankContainer.java index 2adea8a3..fe72e96f 100644 --- a/src/main/java/binnie/core/machines/inventory/ComponentTankContainer.java +++ b/src/main/java/binnie/core/machines/inventory/ComponentTankContainer.java @@ -27,7 +27,7 @@ public class ComponentTankContainer extends MachineComponent implements ITankMac @Override public final TankSlot addTank(final int index, final String name, final int capacity) { - final TankSlot tank = new TankSlot(index, name, capacity); + TankSlot tank = new TankSlot(index, name, capacity); this.tanks.put(index, tank); return tank; } diff --git a/src/main/java/binnie/craftgui/genetics/machine/WindowIncubator.java b/src/main/java/binnie/craftgui/genetics/machine/WindowIncubator.java index 512fb4e3..9918d709 100644 --- a/src/main/java/binnie/craftgui/genetics/machine/WindowIncubator.java +++ b/src/main/java/binnie/craftgui/genetics/machine/WindowIncubator.java @@ -16,7 +16,7 @@ import binnie.craftgui.resource.Texture; import binnie.craftgui.resource.minecraft.StandardTexture; import binnie.genetics.Genetics; import binnie.genetics.core.GeneticsTexture; -import binnie.genetics.machine.Incubator; +import binnie.genetics.machine.incubator.Incubator; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import net.minecraftforge.fml.relauncher.Side; @@ -40,7 +40,7 @@ public class WindowIncubator extends WindowMachine { final int y = 32; new ControlLiquidTank(this, x, y).setTankID(0); x += 26; - new ControlSlotArray(this, x, y + 3, 1, 3).create(Incubator.slotQueue); + new ControlSlotArray(this, x, y + 3, 1, 3).create(Incubator.SLOT_QUEUE); x += 20; new ControlIconDisplay(this, x, y + 3 + 10, GUIIcon.ArrowRight.getIcon().getResourceLocation()); x += 18; @@ -49,7 +49,7 @@ public class WindowIncubator extends WindowMachine { x += 40; new ControlIconDisplay(this, x, y + 3 + 10, GUIIcon.ArrowRight.getIcon().getResourceLocation()); x += 18; - new ControlSlotArray(this, x, y + 3, 1, 3).create(Incubator.slotOutput); + new ControlSlotArray(this, x, y + 3, 1, 3).create(Incubator.SLOT_OUTPUT); x += 26; new ControlLiquidTank(this, x, y).setTankID(1); x += 34; diff --git a/src/main/java/binnie/craftgui/genetics/machine/WindowPolymeriser.java b/src/main/java/binnie/craftgui/genetics/machine/WindowPolymeriser.java index 14ee989d..e18ca40e 100644 --- a/src/main/java/binnie/craftgui/genetics/machine/WindowPolymeriser.java +++ b/src/main/java/binnie/craftgui/genetics/machine/WindowPolymeriser.java @@ -17,7 +17,7 @@ import binnie.craftgui.resource.Texture; import binnie.craftgui.resource.minecraft.StandardTexture; import binnie.genetics.Genetics; import binnie.genetics.core.GeneticsTexture; -import binnie.genetics.machine.Polymeriser; +import binnie.genetics.machine.polymeriser.PackagePolymeriser; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import net.minecraftforge.fml.relauncher.Side; @@ -39,7 +39,7 @@ public class WindowPolymeriser extends WindowMachine { super.initialiseClient(); int x = 16; final int y = 38; - new ControlSlotArray(this, x, y, 1, 4).create(Polymeriser.slotSerumReserve); + new ControlSlotArray(this, x, y, 1, 4).create(PackagePolymeriser.SLOT_SERUM_RESERVE); new ControlIconDisplay(this, x + 18, y + 1, GUIIcon.ArrowRight.getIcon().getResourceLocation()); x += 34; new ControlMachineProgress(this, x + 18, y - 6, WindowPolymeriser.ProgressBase, WindowPolymeriser.Progress, Position.Left); @@ -51,14 +51,14 @@ public class WindowPolymeriser extends WindowMachine { new ControlSlot(this, x + 30, y + 18 + 8).assign(1); new ControlSlotCharge(this, x + 30 + 20, y + 18 + 8, 1).setColour(16766976); x += 138; - new ControlSlotArray(this, x, y + 9, 2, 2).create(Polymeriser.slotSerumFinished); + new ControlSlotArray(this, x, y + 9, 2, 2).create(PackagePolymeriser.SLOT_SERUM_FINISHED); final ControlErrorState errorState = new ControlErrorState(this, 244.0f, 97.0f); new ControlPlayerInventory(this); } @Override public String getTitle() { - return "Polymeriser"; + return Genetics.proxy.localise("machine.machine.polymeriser.tile"); } @Override diff --git a/src/main/java/binnie/genetics/integration/jei/GeneticsJeiPlugin.java b/src/main/java/binnie/genetics/integration/jei/GeneticsJeiPlugin.java index 5be0db1d..b437a849 100644 --- a/src/main/java/binnie/genetics/integration/jei/GeneticsJeiPlugin.java +++ b/src/main/java/binnie/genetics/integration/jei/GeneticsJeiPlugin.java @@ -6,8 +6,8 @@ import binnie.genetics.integration.jei.incubator.IncubatorRecipeHandler; import binnie.genetics.integration.jei.incubator.LarvaeIncubatorRecipeCategory; import binnie.genetics.integration.jei.incubator.LarvaeIncubatorRecipeHandler; import binnie.genetics.integration.jei.incubator.LarvaeIncubatorRecipeMaker; -import binnie.genetics.machine.Incubator; import binnie.genetics.machine.LaboratoryMachine; +import binnie.genetics.machine.incubator.Incubator; import mezz.jei.api.BlankModPlugin; import mezz.jei.api.IGuiHelper; import mezz.jei.api.IJeiHelpers; diff --git a/src/main/java/binnie/genetics/integration/jei/incubator/IncubatorRecipeCategory.java b/src/main/java/binnie/genetics/integration/jei/incubator/IncubatorRecipeCategory.java index 8bc0b9ea..067ea69f 100644 --- a/src/main/java/binnie/genetics/integration/jei/incubator/IncubatorRecipeCategory.java +++ b/src/main/java/binnie/genetics/integration/jei/incubator/IncubatorRecipeCategory.java @@ -2,7 +2,7 @@ package binnie.genetics.integration.jei.incubator; import binnie.genetics.integration.jei.GeneticsJeiPlugin; import binnie.genetics.integration.jei.RecipeUids; -import binnie.genetics.machine.Incubator; +import binnie.genetics.machine.incubator.Incubator; import mezz.jei.api.IGuiHelper; import mezz.jei.api.gui.IDrawable; import mezz.jei.api.gui.IDrawableAnimated; @@ -63,8 +63,8 @@ public class IncubatorRecipeCategory extends BlankRecipeCategory { public void setRecipe(IRecipeLayout recipeLayout, IRecipeWrapper recipeWrapper, IIngredients ingredients) { IDrawable tankOverlay = GeneticsJeiPlugin.drawables.getTankOverlay(); IGuiFluidStackGroup fluidStacks = recipeLayout.getFluidStacks(); - fluidStacks.init(Incubator.tankInput, true, 1, 1, 16, 58, 50, false, tankOverlay); - fluidStacks.init(Incubator.tankOutput, false, 95, 1, 16, 58, 50, false, tankOverlay); + fluidStacks.init(Incubator.TANK_INPUT, true, 1, 1, 16, 58, 50, false, tankOverlay); + fluidStacks.init(Incubator.TANK_OUTPUT, false, 95, 1, 16, 58, 50, false, tankOverlay); fluidStacks.set(ingredients); IGuiItemStackGroup itemStacks = recipeLayout.getItemStacks(); diff --git a/src/main/java/binnie/genetics/integration/jei/incubator/IncubatorRecipeHandler.java b/src/main/java/binnie/genetics/integration/jei/incubator/IncubatorRecipeHandler.java index 261dc1e3..edde3a47 100644 --- a/src/main/java/binnie/genetics/integration/jei/incubator/IncubatorRecipeHandler.java +++ b/src/main/java/binnie/genetics/integration/jei/incubator/IncubatorRecipeHandler.java @@ -2,7 +2,7 @@ package binnie.genetics.integration.jei.incubator; import binnie.genetics.api.IIncubatorRecipe; import binnie.genetics.integration.jei.RecipeUids; -import binnie.genetics.machine.IncubatorRecipeLarvae; +import binnie.genetics.machine.incubator.IncubatorRecipeLarvae; import mezz.jei.api.recipe.IRecipeHandler; import mezz.jei.api.recipe.IRecipeWrapper; diff --git a/src/main/java/binnie/genetics/integration/jei/incubator/LarvaeIncubatorRecipeMaker.java b/src/main/java/binnie/genetics/integration/jei/incubator/LarvaeIncubatorRecipeMaker.java index 6bbba6fb..e8b5e1e0 100644 --- a/src/main/java/binnie/genetics/integration/jei/incubator/LarvaeIncubatorRecipeMaker.java +++ b/src/main/java/binnie/genetics/integration/jei/incubator/LarvaeIncubatorRecipeMaker.java @@ -2,8 +2,8 @@ package binnie.genetics.integration.jei.incubator; import binnie.Binnie; import binnie.genetics.integration.jei.GeneticsJeiPlugin; -import binnie.genetics.machine.IncubatorRecipe; -import binnie.genetics.machine.IncubatorRecipeLarvae; +import binnie.genetics.machine.incubator.IncubatorRecipe; +import binnie.genetics.machine.incubator.IncubatorRecipeLarvae; import forestry.api.apiculture.EnumBeeType; import forestry.api.apiculture.IBee; import net.minecraft.item.ItemStack; diff --git a/src/main/java/binnie/genetics/item/ItemGene.java b/src/main/java/binnie/genetics/item/ItemGene.java index fcedc933..6bb8e842 100644 --- a/src/main/java/binnie/genetics/item/ItemGene.java +++ b/src/main/java/binnie/genetics/item/ItemGene.java @@ -1,7 +1,6 @@ package binnie.genetics.item; import binnie.Binnie; -import binnie.core.BinnieCore; import binnie.core.item.ItemCore; import binnie.genetics.CreativeTabGenetics; import binnie.genetics.genetics.IGeneItem; diff --git a/src/main/java/binnie/genetics/machine/Analyser.java b/src/main/java/binnie/genetics/machine/Analyser.java index 740e6a28..8d26df51 100644 --- a/src/main/java/binnie/genetics/machine/Analyser.java +++ b/src/main/java/binnie/genetics/machine/Analyser.java @@ -26,7 +26,6 @@ import forestry.api.genetics.AlleleManager; import forestry.api.genetics.IIndividual; import forestry.api.genetics.ISpeciesRoot; import net.minecraft.client.particle.Particle; -import net.minecraft.client.renderer.RenderItem; import net.minecraft.client.renderer.block.model.ItemCameraTransforms; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/binnie/genetics/machine/GeneticMachine.java b/src/main/java/binnie/genetics/machine/GeneticMachine.java index f35c09b1..f4f6a259 100644 --- a/src/main/java/binnie/genetics/machine/GeneticMachine.java +++ b/src/main/java/binnie/genetics/machine/GeneticMachine.java @@ -7,13 +7,14 @@ import binnie.core.machines.TileEntityMachine; import binnie.core.resource.BinnieResource; import binnie.core.resource.IBinnieTexture; import binnie.genetics.Genetics; +import binnie.genetics.machine.polymeriser.PackagePolymeriser; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; public enum GeneticMachine implements IMachineType { Isolator(Isolator.PackageIsolator.class), Sequencer(Sequencer.PackageSequencer.class), - Polymeriser(Polymeriser.PackagePolymeriser.class), + Polymeriser(PackagePolymeriser.class), Inoculator(Inoculator.PackageInoculator.class); Class clss; diff --git a/src/main/java/binnie/genetics/machine/Incubator.java b/src/main/java/binnie/genetics/machine/Incubator.java deleted file mode 100644 index 793906f1..00000000 --- a/src/main/java/binnie/genetics/machine/Incubator.java +++ /dev/null @@ -1,244 +0,0 @@ -package binnie.genetics.machine; - -import binnie.Binnie; -import binnie.core.BinnieCore; -import binnie.core.Mods; -import binnie.core.machines.Machine; -import binnie.core.machines.MachineUtil; -import binnie.core.machines.TileEntityMachine; -import binnie.core.machines.inventory.ComponentInventorySlots; -import binnie.core.machines.inventory.ComponentTankContainer; -import binnie.core.machines.inventory.InventorySlot; -import binnie.core.machines.power.ComponentPowerReceptor; -import binnie.core.machines.power.ComponentProcessIndefinate; -import binnie.core.machines.power.ErrorState; -import binnie.core.machines.power.IProcess; -import binnie.core.machines.transfer.TransferRequest; -import binnie.craftgui.minecraft.IMachineInformation; -import binnie.genetics.api.IIncubatorRecipe; -import binnie.genetics.core.GeneticsGUI; -import binnie.genetics.core.GeneticsTexture; -import binnie.genetics.item.GeneticLiquid; -import binnie.genetics.item.GeneticsItems; -import forestry.api.apiculture.EnumBeeType; -import forestry.api.apiculture.IBee; -import net.minecraft.init.Items; -import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; -import net.minecraftforge.fluids.FluidStack; -import net.minecraftforge.oredict.OreDictionary; - -import javax.annotation.Nullable; -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; -import java.util.Random; - -public class Incubator { - public static final int[] slotQueue = new int[]{0, 1, 2}; - public static final int slotIncubator = 3; - public static final int[] slotOutput = new int[]{4, 5, 6}; - public static final int tankInput = 0; - public static final int tankOutput = 1; - private static List RECIPES = new ArrayList<>(); - private static IncubatorRecipeLarvae LARVAE_RECIPE; - - public static void addRecipes() { - Incubator.RECIPES.add(new IncubatorRecipe(GeneticsItems.GrowthMedium.get(1), Binnie.Liquid.getFluidStack("water", 25), GeneticLiquid.GrowthMedium.get(25), 0.2f)); - Incubator.RECIPES.add(new IncubatorRecipe(new ItemStack(Items.WHEAT), GeneticLiquid.GrowthMedium.get(25), GeneticLiquid.Bacteria.get(5), 0.2f)); - Incubator.RECIPES.add(new IncubatorRecipe(GeneticsItems.GrowthMedium.get(1), GeneticLiquid.Bacteria.get(0), GeneticLiquid.Bacteria.get(5), 0.05f)); - Incubator.RECIPES.add(new IncubatorRecipe(new ItemStack(Items.SUGAR), GeneticLiquid.Bacteria.get(2), null, 0.5f, 0.2f) - .setOutputStack(GeneticsItems.Enzyme.get(1))); - Incubator.RECIPES.add(new IncubatorRecipe(GeneticsItems.GrowthMedium.get(1), GeneticLiquid.BacteriaPoly.get(0), GeneticLiquid.BacteriaPoly.get(5), 0.05f)); - Incubator.RECIPES.add(new IncubatorRecipe(GeneticsItems.GrowthMedium.get(1), GeneticLiquid.BacteriaVector.get(0), GeneticLiquid.BacteriaVector.get(5), 0.05f)); - Incubator.RECIPES.add(new IncubatorRecipe(new ItemStack(Items.DYE, 1, 15), GeneticLiquid.Bacteria.get(10), GeneticLiquid.BacteriaPoly.get(10), 0.1f)); - Incubator.RECIPES.add(new IncubatorRecipe(new ItemStack(Items.BLAZE_POWDER), GeneticLiquid.Bacteria.get(10), GeneticLiquid.BacteriaVector.get(10), 0.05f)); - if (BinnieCore.isApicultureActive()) { - Incubator.RECIPES.add(LARVAE_RECIPE = new IncubatorRecipeLarvae(Mods.Forestry.stack("beeLarvaeGE", 1, OreDictionary.WILDCARD_VALUE), GeneticLiquid.GrowthMedium.get(50), null, 1.0f, 0.05f) { - @Override - public ItemStack getOutputStack(final MachineUtil machine) { - final ItemStack larvae = machine.getStack(3); - final IBee bee = Binnie.Genetics.getBeeRoot().getMember(larvae); - return Binnie.Genetics.getBeeRoot().getMemberStack(bee, EnumBeeType.DRONE); - } - - @Override - public ItemStack getExpectedOutput() { - return Mods.Forestry.stack("beeDroneGE", 1, OreDictionary.WILDCARD_VALUE); - } - }); - } - } - - public static List getRecipes() { - return Collections.unmodifiableList(RECIPES); - } - - @Nullable - public static IncubatorRecipeLarvae getLarvaeRecipe() { - return LARVAE_RECIPE; - } - - public static class PackageIncubator extends GeneticMachine.PackageGeneticBase implements IMachineInformation { - public PackageIncubator() { - super("incubator", GeneticsTexture.Incubator, 16767313, true); - } - - @Override - public void createMachine(final Machine machine) { - new ComponentGeneticGUI(machine, GeneticsGUI.Incubator); - final ComponentInventorySlots inventory = new ComponentInventorySlots(machine); - inventory.addSlotArray(Incubator.slotQueue, "input"); - for (final InventorySlot slot : inventory.getSlots(Incubator.slotQueue)) { - slot.forbidExtraction(); - } - inventory.addSlot(3, "incubator"); - inventory.getSlot(3).forbidInteraction(); - inventory.getSlot(3).setReadOnly(); - inventory.addSlotArray(Incubator.slotOutput, "output"); - for (final InventorySlot slot : inventory.getSlots(Incubator.slotOutput)) { - slot.forbidInsertion(); - slot.setReadOnly(); - } - new ComponentPowerReceptor(machine, 2000); - final ComponentTankContainer tanks = new ComponentTankContainer(machine); - tanks.addTank(0, "input", 2000).forbidExtraction(); - tanks.addTank(1, "output", 2000).setReadOnly(); - new ComponentIncubatorLogic(machine); - } - - @Override - public TileEntity createTileEntity() { - return new TileEntityMachine(this); - } - - @Override - public void register() { - } - } - - public static class ComponentIncubatorLogic extends ComponentProcessIndefinate implements IProcess { - IIncubatorRecipe recipe; - private Random rand; - private boolean roomForOutput; - - public ComponentIncubatorLogic(final Machine machine) { - super(machine, 2.0f); - this.recipe = null; - this.rand = new Random(); - this.roomForOutput = true; - } - - @Override - public ErrorState canWork() { - if (this.recipe == null) { - return new ErrorState("No Recipe", "There is no valid recipe"); - } - return super.canWork(); - } - - @Override - public ErrorState canProgress() { - if (this.recipe != null) { - if (!this.recipe.isInputLiquidSufficient(this.getUtil().getFluid(0))) { - return new ErrorState.InsufficientLiquid("Not enough incubation liquid", 0); - } - if (!this.roomForOutput) { - return new ErrorState.TankSpace("No room for output", 1); - } - } - return super.canProgress(); - } - - @Override - protected void onTickTask() { - if (this.rand.nextInt(20) == 0 && this.recipe != null && this.rand.nextFloat() < this.recipe.getChance()) { - this.recipe.doTask(this.getUtil()); - } - } - - @Override - public boolean inProgress() { - return this.recipe != null; - } - - private IIncubatorRecipe getRecipe(final ItemStack stack, final FluidStack liquid) { - for (final IIncubatorRecipe recipe : Incubator.RECIPES) { - final boolean rightLiquid = recipe.isInputLiquid(liquid); - final boolean rightItem = isStackValid(stack, recipe); - if (rightLiquid && rightItem) { - return recipe; - } - } - return null; - } - - private static boolean isStackValid(ItemStack stack, IIncubatorRecipe recipe) { - return ItemStack.areItemsEqual(recipe.getInputStack(), stack); - } - - @Override - public void onInventoryUpdate() { - super.onInventoryUpdate(); - if (!this.getUtil().isServer()) { - return; - } - final FluidStack liquid = this.getUtil().getFluid(0); - final ItemStack incubator = this.getUtil().getStack(3); - if (this.recipe != null && (incubator == null || liquid == null || !this.recipe.isInputLiquid(liquid) || !isStackValid(incubator, recipe))) { - this.recipe = null; - final ItemStack leftover = new TransferRequest(incubator, this.getInventory()).setTargetSlots(Incubator.slotOutput).ignoreValidation().transfer(true); - this.getUtil().setStack(3, leftover); - } - if (this.recipe == null) { - if (liquid == null) { - return; - } - if (incubator != null) { - final IIncubatorRecipe recipe = this.getRecipe(incubator, liquid); - if (recipe != null) { - this.recipe = recipe; - return; - } - } - IIncubatorRecipe potential = null; - int potentialSlot = 0; - for (final int slot : Incubator.slotQueue) { - final ItemStack stack = this.getUtil().getStack(slot); - if (stack != null) { - if (potential == null) { - for (final IIncubatorRecipe recipe2 : Incubator.RECIPES) { - final boolean rightLiquid = recipe2.isInputLiquid(liquid); - final boolean rightItem = isStackValid(stack, recipe2); - if (rightLiquid && rightItem) { - potential = recipe2; - potentialSlot = slot; - break; - } - } - } - } - } - if (potential != null) { - final TransferRequest removal = new TransferRequest(incubator, this.getInventory()).setTargetSlots(Incubator.slotOutput).ignoreValidation(); - if (removal.transfer(false) == null) { - this.recipe = potential; - } - removal.transfer(true); - final ItemStack stack2 = this.getUtil().getStack(potentialSlot); - this.getUtil().setStack(potentialSlot, null); - this.getUtil().setStack(3, stack2); - } - } - if (this.recipe != null) { - this.roomForOutput = this.recipe.roomForOutput(this.getUtil()); - } - } - } - - private class IncubatorCrafting { - ItemStack input; - FluidStack fluid; - } - -} diff --git a/src/main/java/binnie/genetics/machine/Inoculator.java b/src/main/java/binnie/genetics/machine/Inoculator.java index c02c8cfb..04b4e574 100644 --- a/src/main/java/binnie/genetics/machine/Inoculator.java +++ b/src/main/java/binnie/genetics/machine/Inoculator.java @@ -32,7 +32,6 @@ import forestry.api.genetics.IAllele; import forestry.api.genetics.IIndividual; import forestry.api.genetics.ISpeciesRoot; import net.minecraft.client.particle.Particle; -import net.minecraft.client.renderer.RenderItem; import net.minecraft.client.renderer.block.model.ItemCameraTransforms; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; @@ -88,7 +87,7 @@ public class Inoculator { inventory.addSlot(0, "serum.active"); inventory.getSlot(0).forbidInteraction(); inventory.getSlot(0).setReadOnly(); - final SlotValidator serumValid = new SlotValidator(ModuleMachine.IconSerum) { + final SlotValidator serumValid = new SlotValidator(ModuleMachine.iconSerum) { @Override public boolean isValid(final ItemStack itemStack) { return itemStack.getItem() instanceof IItemSerum; diff --git a/src/main/java/binnie/genetics/machine/LaboratoryMachine.java b/src/main/java/binnie/genetics/machine/LaboratoryMachine.java index aeffeeba..907028ad 100644 --- a/src/main/java/binnie/genetics/machine/LaboratoryMachine.java +++ b/src/main/java/binnie/genetics/machine/LaboratoryMachine.java @@ -9,6 +9,7 @@ import binnie.core.machines.component.IInteraction; import binnie.core.machines.network.INetwork; import binnie.genetics.Genetics; import binnie.genetics.core.GeneticsTexture; +import binnie.genetics.machine.incubator.Incubator; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; diff --git a/src/main/java/binnie/genetics/machine/MachineRendererGenetics.java b/src/main/java/binnie/genetics/machine/MachineRendererGenetics.java index 4f0c832b..e79816a2 100644 --- a/src/main/java/binnie/genetics/machine/MachineRendererGenetics.java +++ b/src/main/java/binnie/genetics/machine/MachineRendererGenetics.java @@ -3,9 +3,7 @@ package binnie.genetics.machine; import binnie.core.BinnieCore; import binnie.core.machines.Machine; import binnie.core.machines.component.IRender; -import binnie.core.resource.BinnieResource; import net.minecraft.client.Minecraft; -import net.minecraft.client.renderer.RenderItem; import net.minecraft.util.math.BlockPos; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; diff --git a/src/main/java/binnie/genetics/machine/MachineRendererLab.java b/src/main/java/binnie/genetics/machine/MachineRendererLab.java index 20aa0b6c..72e0db93 100644 --- a/src/main/java/binnie/genetics/machine/MachineRendererLab.java +++ b/src/main/java/binnie/genetics/machine/MachineRendererLab.java @@ -2,11 +2,8 @@ package binnie.genetics.machine; import org.lwjgl.opengl.GL11; -import binnie.Binnie; import binnie.core.BinnieCore; import binnie.core.machines.Machine; -import binnie.core.resource.BinnieResource; -import binnie.genetics.Genetics; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.entity.RenderManager; import net.minecraft.entity.item.EntityItem; diff --git a/src/main/java/binnie/genetics/machine/ModuleMachine.java b/src/main/java/binnie/genetics/machine/ModuleMachine.java index 611ab917..8c506d5f 100644 --- a/src/main/java/binnie/genetics/machine/ModuleMachine.java +++ b/src/main/java/binnie/genetics/machine/ModuleMachine.java @@ -8,6 +8,7 @@ import binnie.core.machines.inventory.ValidatorIcon; import binnie.genetics.CreativeTabGenetics; import binnie.genetics.Genetics; import binnie.genetics.item.GeneticsItems; +import binnie.genetics.machine.incubator.Incubator; import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.Item; @@ -17,11 +18,11 @@ import net.minecraftforge.oredict.ShapedOreRecipe; public class ModuleMachine implements IInitializable { static ValidatorIcon IconSequencer; - static ValidatorIcon IconSerum; + public static ValidatorIcon iconSerum; static ValidatorIcon IconEnzyme; public static ValidatorIcon IconDye; static ValidatorIcon IconBacteria; - static ValidatorIcon IconNugget; + public static ValidatorIcon IconNugget; @Override public void preInit() { @@ -33,7 +34,7 @@ public class ModuleMachine implements IInitializable { @Override public void init() { ModuleMachine.IconSequencer = new ValidatorIcon(Genetics.instance, "validator/sequencer.0", "validator/sequencer.1"); - ModuleMachine.IconSerum = new ValidatorIcon(Genetics.instance, "validator/serum.0", "validator/serum.1"); + ModuleMachine.iconSerum = new ValidatorIcon(Genetics.instance, "validator/serum.0", "validator/serum.1"); ModuleMachine.IconEnzyme = new ValidatorIcon(Genetics.instance, "validator/enzyme.0", "validator/enzyme.1"); ModuleMachine.IconDye = new ValidatorIcon(Genetics.instance, "validator/dye.0", "validator/dye.1"); ModuleMachine.IconNugget = new ValidatorIcon(Genetics.instance, "validator/nugget.0", "validator/nugget.1"); diff --git a/src/main/java/binnie/genetics/machine/Polymeriser.java b/src/main/java/binnie/genetics/machine/Polymeriser.java deleted file mode 100644 index dbf98349..00000000 --- a/src/main/java/binnie/genetics/machine/Polymeriser.java +++ /dev/null @@ -1,281 +0,0 @@ -package binnie.genetics.machine; - -import binnie.core.BinnieCore; -import binnie.core.machines.IMachine; -import binnie.core.machines.Machine; -import binnie.core.machines.MachineComponent; -import binnie.core.machines.TileEntityMachine; -import binnie.core.machines.component.IRender; -import binnie.core.machines.inventory.ComponentChargedSlots; -import binnie.core.machines.inventory.ComponentInventorySlots; -import binnie.core.machines.inventory.ComponentInventoryTransfer; -import binnie.core.machines.inventory.ComponentTankContainer; -import binnie.core.machines.inventory.InventorySlot; -import binnie.core.machines.inventory.SlotValidator; -import binnie.core.machines.inventory.Validator; -import binnie.core.machines.power.ComponentPowerReceptor; -import binnie.core.machines.power.ComponentProcessSetCost; -import binnie.core.machines.power.ErrorState; -import binnie.core.machines.power.IProcess; -import binnie.craftgui.minecraft.IMachineInformation; -import binnie.genetics.api.IItemChargable; -import binnie.genetics.core.GeneticsGUI; -import binnie.genetics.core.GeneticsTexture; -import binnie.genetics.genetics.Engineering; -import binnie.genetics.item.GeneticLiquid; -import net.minecraft.client.particle.Particle; -import net.minecraft.init.Items; -import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; -import net.minecraftforge.fluids.FluidStack; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; - -import java.util.Random; - -public class Polymeriser { - public static final int tankBacteria = 0; - public static final int tankDNA = 1; - public static final int slotSerum = 0; - public static final int slotGold = 1; - public static final int[] slotSerumReserve = new int[]{2, 3, 4, 5}; - public static final int[] slotSerumFinished = new int[]{6, 7, 8, 9}; - - public static class PackagePolymeriser extends GeneticMachine.PackageGeneticBase implements IMachineInformation { - public PackagePolymeriser() { - super("polymeriser", GeneticsTexture.Polymeriser, 58819, true); - } - - @Override - public void createMachine(final Machine machine) { - new ComponentGeneticGUI(machine, GeneticsGUI.Replicator); - final ComponentInventorySlots inventory = new ComponentInventorySlots(machine); - inventory.addSlot(1, "catalyst"); - inventory.getSlot(1).setValidator(new SlotValidator.Item(new ItemStack(Items.GOLD_NUGGET, 1), ModuleMachine.IconNugget)); - inventory.getSlot(1).forbidExtraction(); - inventory.addSlot(0, "process"); - inventory.getSlot(0).setValidator(new SlotValidatorUnfilledSerum()); - inventory.getSlot(0).forbidInteraction(); - inventory.getSlot(0).setReadOnly(); - for (final InventorySlot slot : inventory.addSlotArray(Polymeriser.slotSerumReserve, "input")) { - slot.setValidator(new SlotValidatorUnfilledSerum()); - slot.forbidExtraction(); - } - for (final InventorySlot slot : inventory.addSlotArray(Polymeriser.slotSerumFinished, "output")) { - slot.setReadOnly(); - } - final ComponentInventoryTransfer transfer = new ComponentInventoryTransfer(machine); - transfer.addRestock(Polymeriser.slotSerumReserve, 0, 1); - transfer.addStorage(0, Polymeriser.slotSerumFinished, new ComponentInventoryTransfer.Condition() { - @Override - public boolean fufilled(final ItemStack stack) { - return !stack.isItemDamaged(); - } - }); - final ComponentTankContainer tank = new ComponentTankContainer(machine); - tank.addTank(0, "input", 1000); - tank.getTankSlot(0).setValidator(new Validator() { - @Override - public boolean isValid(final FluidStack itemStack) { - return GeneticLiquid.BacteriaPoly.get(1).isFluidEqual(itemStack); - } - - @Override - public String getTooltip() { - return "Polymerising Bacteria"; - } - }); - tank.addTank(1, "input", 1000); - tank.getTankSlot(1).setValidator(new Validator() { - @Override - public boolean isValid(final FluidStack itemStack) { - return GeneticLiquid.RawDNA.get(1).isFluidEqual(itemStack); - } - - @Override - public String getTooltip() { - return "Raw DNA"; - } - }); - new ComponentChargedSlots(machine).addCharge(1); - new ComponentPowerReceptor(machine, 8000); - new ComponentPolymeriserLogic(machine); - new ComponentPolymeriserFX(machine); - } - - @Override - public TileEntity createTileEntity() { - return new TileEntityMachine(this); - } - - @Override - public void register() { - } - } - - public static class ComponentPolymeriserLogic extends ComponentProcessSetCost implements IProcess { - private static float chargePerProcess = 0.4f; - private float dnaDrain; - private float bacteriaDrain; - - public ComponentPolymeriserLogic(final Machine machine) { - super(machine, 96000, 2400); - this.dnaDrain = 0.0f; - this.bacteriaDrain = 0.0f; - } - - private float getCatalyst() { - return (this.getUtil().getSlotCharge(1) > 0.0f) ? 0.2f : 1.0f; - } - - @Override - public int getProcessLength() { - return (int) (super.getProcessLength() * this.getNumberOfGenes() * this.getCatalyst()); - } - - @Override - public int getProcessEnergy() { - return (int) (super.getProcessEnergy() * this.getNumberOfGenes() * this.getCatalyst()); - } - - private float getDNAPerProcess() { - return this.getNumberOfGenes() * 50; - } - - @Override - public void onTickTask() { - super.onTickTask(); - this.getUtil().useCharge(1, ComponentPolymeriserLogic.chargePerProcess * this.getProgressPerTick() / 100.0f); - this.dnaDrain += this.getDNAPerProcess() * this.getProgressPerTick() / 100.0f; - this.bacteriaDrain += 0.2f * this.getDNAPerProcess() * this.getProgressPerTick() / 100.0f; - if (this.dnaDrain >= 1.0f) { - this.getUtil().drainTank(1, 1); - --this.dnaDrain; - } - if (this.bacteriaDrain >= 1.0f) { - this.getUtil().drainTank(0, 1); - --this.bacteriaDrain; - } - } - - private int getNumberOfGenes() { - final ItemStack serum = this.getUtil().getStack(0); - if (serum == null) { - return 1; - } - return Engineering.getGenes(serum).length; - } - - @Override - public String getTooltip() { - final int n = this.getNumberOfGenes(); - return "Replicating " + n + " genes" + ((n > 1) ? "s" : ""); - } - - @Override - public ErrorState canWork() { - if (this.getUtil().isSlotEmpty(0)) { - return new ErrorState.NoItem("No item to replicate", 0); - } - if (!this.getUtil().getStack(0).isItemDamaged()) { - return new ErrorState.InvalidItem("Item filled", 0); - } - return super.canWork(); - } - - @Override - public ErrorState canProgress() { - if (this.getUtil().getFluid(0) == null) { - return new ErrorState.InsufficientLiquid("Insufficient Bacteria", 0); - } - if (this.getUtil().getFluid(1) == null) { - return new ErrorState.InsufficientLiquid("Insufficient DNA", 1); - } - return super.canProgress(); - } - - @Override - protected void onFinishTask() { - super.onFinishTask(); - this.getUtil().damageItem(0, -1); - } - } - - public static class SlotValidatorUnfilledSerum extends SlotValidator { - public SlotValidatorUnfilledSerum() { - super(ModuleMachine.IconSerum); - } - - @Override - public boolean isValid(final ItemStack itemStack) { - return itemStack.getItem() instanceof IItemChargable; - } - - @Override - public String getTooltip() { - return "Unfilled Serum"; - } - } - - public static class ComponentPolymeriserFX extends MachineComponent implements IRender.DisplayTick { - public ComponentPolymeriserFX(final IMachine machine) { - super(machine); - } - - @SideOnly(Side.CLIENT) - @Override - public void onDisplayTick(World world, BlockPos pos, Random rand) { - final int tick = (int) (world.getTotalWorldTime() % 8L); - if ((tick == 0 || tick == 3) && this.getUtil().getProcess().isInProgress()) { - BinnieCore.proxy.getMinecraftInstance().effectRenderer.addEffect(new Particle(world, pos.getX() + 0.5, pos.getY() + 1.8, pos.getZ() + 0.5, 0.0, 0.0, 0.0) { - double axisX = this.posX; - double axisZ = this.posZ; - double angle = 0.7 + (int) (this.worldObj.getTotalWorldTime() % 2L) * 3.1415; - - { - this.axisX = 0.0; - this.axisZ = 0.0; - this.angle = 0.0; - this.motionX = 0.0; - this.motionZ = 0.0; - this.motionY = -0.006; - this.particleMaxAge = 140; - this.particleGravity = 0.0f; - this.field_190017_n = true; - this.setRBGColorF(0.8f, 0.0f, 1.0f); - } - - @Override - public void onUpdate() { - super.onUpdate(); - this.angle += 0.1; - this.motionY = -0.006; - double dist = 0.2; - if (this.particleAge > 60) { - if (this.particleAge > 120) { - dist = 0.1; - } - else { - dist = 0.2 - 0.1 * ((this.particleAge - 60.0f) / 60.0f); - } - } - this.setPosition(this.axisX + dist * Math.sin(this.angle), this.posY, this.axisZ + dist * Math.cos(this.angle)); - if (this.particleAge <= 40) { - this.setAlphaF(this.particleAge / 40.0f); - } - if (this.particleAge > 80) { - this.setRBGColorF(this.particleRed + (0.0f - this.particleRed) / 10.0f, this.particleGreen + (1.0f - this.particleGreen) / 10.0f, this.particleBlue + (1.0f - this.particleBlue) / 10.0f); - } - } - - @Override - public int getFXLayer() { - return 0; - } - }); - } - } - } -} diff --git a/src/main/java/binnie/genetics/machine/Splicer.java b/src/main/java/binnie/genetics/machine/Splicer.java index 93be4be3..548af87f 100644 --- a/src/main/java/binnie/genetics/machine/Splicer.java +++ b/src/main/java/binnie/genetics/machine/Splicer.java @@ -29,7 +29,6 @@ import forestry.api.genetics.IAllele; import forestry.api.genetics.IIndividual; import forestry.api.genetics.ISpeciesRoot; import net.minecraft.client.particle.Particle; -import net.minecraft.client.renderer.RenderItem; import net.minecraft.client.renderer.block.model.ItemCameraTransforms; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; @@ -83,7 +82,7 @@ public class Splicer { inventory.addSlot(0, "serum.active"); inventory.getSlot(0).forbidInteraction(); inventory.getSlot(0).setReadOnly(); - final SlotValidator serumValid = new SlotValidator(ModuleMachine.IconSerum) { + final SlotValidator serumValid = new SlotValidator(ModuleMachine.iconSerum) { @Override public boolean isValid(final ItemStack itemStack) { return itemStack.getItem() instanceof IItemSerum; diff --git a/src/main/java/binnie/genetics/machine/incubator/Incubator.java b/src/main/java/binnie/genetics/machine/incubator/Incubator.java new file mode 100644 index 00000000..7f4a8401 --- /dev/null +++ b/src/main/java/binnie/genetics/machine/incubator/Incubator.java @@ -0,0 +1,72 @@ +package binnie.genetics.machine.incubator; + +import binnie.Binnie; +import binnie.core.BinnieCore; +import binnie.core.Mods; +import binnie.core.machines.MachineUtil; +import binnie.genetics.api.IIncubatorRecipe; +import binnie.genetics.item.GeneticLiquid; +import binnie.genetics.item.GeneticsItems; +import forestry.api.apiculture.EnumBeeType; +import forestry.api.apiculture.IBee; +import net.minecraft.init.Items; +import net.minecraft.item.ItemStack; +import net.minecraftforge.fluids.FluidStack; +import net.minecraftforge.oredict.OreDictionary; + +import javax.annotation.Nullable; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; + +public class Incubator { + public static final int[] SLOT_QUEUE = new int[]{0, 1, 2}; + public static final int SLOT_INCUBATOR = 3; + public static final int[] SLOT_OUTPUT = new int[]{4, 5, 6}; + public static final int TANK_INPUT = 0; + public static final int TANK_OUTPUT = 1; + private static List RECIPES = new ArrayList<>(); + private static IncubatorRecipeLarvae LARVAE_RECIPE; + + public static void addRecipes() { + Incubator.RECIPES.add(new IncubatorRecipe(GeneticsItems.GrowthMedium.get(1), Binnie.Liquid.getFluidStack("water", 25), GeneticLiquid.GrowthMedium.get(25), 0.2f)); + Incubator.RECIPES.add(new IncubatorRecipe(new ItemStack(Items.WHEAT), GeneticLiquid.GrowthMedium.get(25), GeneticLiquid.Bacteria.get(5), 0.2f)); + Incubator.RECIPES.add(new IncubatorRecipe(GeneticsItems.GrowthMedium.get(1), GeneticLiquid.Bacteria.get(0), GeneticLiquid.Bacteria.get(5), 0.05f)); + Incubator.RECIPES.add(new IncubatorRecipe(new ItemStack(Items.SUGAR), GeneticLiquid.Bacteria.get(2), null, 0.5f, 0.2f) + .setOutputStack(GeneticsItems.Enzyme.get(1))); + Incubator.RECIPES.add(new IncubatorRecipe(GeneticsItems.GrowthMedium.get(1), GeneticLiquid.BacteriaPoly.get(0), GeneticLiquid.BacteriaPoly.get(5), 0.05f)); + Incubator.RECIPES.add(new IncubatorRecipe(GeneticsItems.GrowthMedium.get(1), GeneticLiquid.BacteriaVector.get(0), GeneticLiquid.BacteriaVector.get(5), 0.05f)); + Incubator.RECIPES.add(new IncubatorRecipe(new ItemStack(Items.DYE, 1, 15), GeneticLiquid.Bacteria.get(10), GeneticLiquid.BacteriaPoly.get(10), 0.1f)); + Incubator.RECIPES.add(new IncubatorRecipe(new ItemStack(Items.BLAZE_POWDER), GeneticLiquid.Bacteria.get(10), GeneticLiquid.BacteriaVector.get(10), 0.05f)); + if (BinnieCore.isApicultureActive()) { + Incubator.RECIPES.add(LARVAE_RECIPE = new IncubatorRecipeLarvae(Mods.Forestry.stack("beeLarvaeGE", 1, OreDictionary.WILDCARD_VALUE), GeneticLiquid.GrowthMedium.get(50), null, 1.0f, 0.05f) { + @Override + public ItemStack getOutputStack(final MachineUtil machine) { + final ItemStack larvae = machine.getStack(3); + final IBee bee = Binnie.Genetics.getBeeRoot().getMember(larvae); + return Binnie.Genetics.getBeeRoot().getMemberStack(bee, EnumBeeType.DRONE); + } + + @Override + public ItemStack getExpectedOutput() { + return Mods.Forestry.stack("beeDroneGE", 1, OreDictionary.WILDCARD_VALUE); + } + }); + } + } + + public static List getRecipes() { + return Collections.unmodifiableList(RECIPES); + } + + @Nullable + public static IncubatorRecipeLarvae getLarvaeRecipe() { + return LARVAE_RECIPE; + } + + private class IncubatorCrafting { + ItemStack input; + FluidStack fluid; + } + +} diff --git a/src/main/java/binnie/genetics/machine/incubator/IncubatorLogic.java b/src/main/java/binnie/genetics/machine/incubator/IncubatorLogic.java new file mode 100644 index 00000000..8bbfe4fb --- /dev/null +++ b/src/main/java/binnie/genetics/machine/incubator/IncubatorLogic.java @@ -0,0 +1,131 @@ +package binnie.genetics.machine.incubator; + +import java.util.Random; + +import binnie.core.machines.Machine; +import binnie.core.machines.power.ComponentProcessIndefinate; +import binnie.core.machines.power.ErrorState; +import binnie.core.machines.power.IProcess; +import binnie.core.machines.transfer.TransferRequest; +import binnie.genetics.api.IIncubatorRecipe; +import net.minecraft.item.ItemStack; +import net.minecraftforge.fluids.FluidStack; + +public class IncubatorLogic extends ComponentProcessIndefinate implements IProcess { + IIncubatorRecipe recipe; + private Random rand; + private boolean roomForOutput; + + public IncubatorLogic(final Machine machine) { + super(machine, 2.0f); + this.recipe = null; + this.rand = new Random(); + this.roomForOutput = true; + } + + @Override + public ErrorState canWork() { + if (this.recipe == null) { + return new ErrorState("No Recipe", "There is no valid recipe"); + } + return super.canWork(); + } + + @Override + public ErrorState canProgress() { + if (this.recipe != null) { + if (!this.recipe.isInputLiquidSufficient(this.getUtil().getFluid(0))) { + return new ErrorState.InsufficientLiquid("Not enough incubation liquid", 0); + } + if (!this.roomForOutput) { + return new ErrorState.TankSpace("No room for output", 1); + } + } + return super.canProgress(); + } + + @Override + protected void onTickTask() { + if (this.rand.nextInt(20) == 0 && this.recipe != null && this.rand.nextFloat() < this.recipe.getChance()) { + this.recipe.doTask(this.getUtil()); + } + } + + @Override + public boolean inProgress() { + return this.recipe != null; + } + + private IIncubatorRecipe getRecipe(final ItemStack stack, final FluidStack liquid) { + for (final IIncubatorRecipe recipe : Incubator.getRecipes()) { + final boolean rightLiquid = recipe.isInputLiquid(liquid); + final boolean rightItem = isStackValid(stack, recipe); + if (rightLiquid && rightItem) { + return recipe; + } + } + return null; + } + + private static boolean isStackValid(ItemStack stack, IIncubatorRecipe recipe) { + return ItemStack.areItemsEqual(recipe.getInputStack(), stack); + } + + @Override + public void onInventoryUpdate() { + super.onInventoryUpdate(); + if (!this.getUtil().isServer()) { + return; + } + final FluidStack liquid = this.getUtil().getFluid(Incubator.TANK_INPUT); + final ItemStack incubator = this.getUtil().getStack(Incubator.SLOT_INCUBATOR); + if (this.recipe != null && (incubator == null || liquid == null || !this.recipe.isInputLiquid(liquid) || !isStackValid(incubator, recipe))) { + this.recipe = null; + final ItemStack leftover = new TransferRequest(incubator, this.getInventory()).setTargetSlots(Incubator.SLOT_OUTPUT).ignoreValidation().transfer(true); + this.getUtil().setStack(Incubator.SLOT_INCUBATOR, leftover); + } + if (this.recipe == null) { + if (liquid == null) { + return; + } + if (incubator != null) { + final IIncubatorRecipe recipe = this.getRecipe(incubator, liquid); + if (recipe != null) { + this.recipe = recipe; + return; + } + } + IIncubatorRecipe potential = null; + int potentialSlot = 0; + for (final int slot : Incubator.SLOT_QUEUE) { + final ItemStack stack = this.getUtil().getStack(slot); + if (stack != null) { + if (potential == null) { + for (final IIncubatorRecipe recipe2 : Incubator.getRecipes()) { + final boolean rightLiquid = recipe2.isInputLiquid(liquid); + final boolean rightItem = isStackValid(stack, recipe2); + if (rightLiquid && rightItem) { + potential = recipe2; + potentialSlot = slot; + break; + } + } + } + } + } + if (potential != null) { + final TransferRequest removal = new TransferRequest(incubator, this.getInventory()).setTargetSlots(Incubator.SLOT_OUTPUT).ignoreValidation(); + if (removal.transfer(false) == null) { + this.recipe = potential; + } + removal.transfer(true); + final ItemStack stack2 = this.getUtil().getStack(potentialSlot); + this.getUtil().setStack(potentialSlot, null); + this.getUtil().setStack(Incubator.SLOT_INCUBATOR, stack2); + } + } + if (this.recipe != null) { + this.roomForOutput = this.recipe.roomForOutput(this.getUtil()); + } + } +} diff --git a/src/main/java/binnie/genetics/machine/IncubatorRecipe.java b/src/main/java/binnie/genetics/machine/incubator/IncubatorRecipe.java similarity index 83% rename from src/main/java/binnie/genetics/machine/IncubatorRecipe.java rename to src/main/java/binnie/genetics/machine/incubator/IncubatorRecipe.java index f18fe0eb..081708c3 100644 --- a/src/main/java/binnie/genetics/machine/IncubatorRecipe.java +++ b/src/main/java/binnie/genetics/machine/incubator/IncubatorRecipe.java @@ -1,4 +1,4 @@ -package binnie.genetics.machine; +package binnie.genetics.machine.incubator; import binnie.core.machines.MachineUtil; import binnie.core.machines.transfer.TransferRequest; @@ -70,19 +70,19 @@ public class IncubatorRecipe implements IIncubatorRecipe { @Override public void doTask(final MachineUtil machine) { - machine.drainTank(0, this.input.amount); + machine.drainTank(Incubator.TANK_INPUT, this.input.amount); if (this.output != null) { - machine.fillTank(1, this.output); + machine.fillTank(Incubator.TANK_OUTPUT, this.output); } this.outputStack = this.getOutputStack(machine); if (this.outputStack != null) { final ItemStack output = this.outputStack.copy(); - final TransferRequest product = new TransferRequest(output, machine.getInventory()).setTargetSlots(Incubator.slotOutput).ignoreValidation(); + final TransferRequest product = new TransferRequest(output, machine.getInventory()).setTargetSlots(Incubator.SLOT_OUTPUT).ignoreValidation(); product.transfer(true); } final Random rand = machine.getRandom(); if (rand.nextFloat() < this.lossChance) { - machine.decreaseStack(3, 1); + machine.decreaseStack(Incubator.SLOT_INCUBATOR, 1); } } @@ -98,17 +98,17 @@ public class IncubatorRecipe implements IIncubatorRecipe { @Override public boolean roomForOutput(final MachineUtil machine) { if (this.output != null && !machine.isTankEmpty(1)) { - if (!machine.getFluid(1).isFluidEqual(this.output)) { + if (!machine.getFluid(Incubator.TANK_OUTPUT).isFluidEqual(this.output)) { return false; } - if (!machine.spaceInTank(1, this.output.amount)) { + if (!machine.spaceInTank(Incubator.TANK_OUTPUT, this.output.amount)) { return false; } } final ItemStack outputStack = this.getOutputStack(machine); if (outputStack != null) { final ItemStack output = outputStack.copy(); - final TransferRequest product = new TransferRequest(output, machine.getInventory()).setTargetSlots(Incubator.slotOutput).ignoreValidation(); + final TransferRequest product = new TransferRequest(output, machine.getInventory()).setTargetSlots(Incubator.SLOT_OUTPUT).ignoreValidation(); final ItemStack leftover = product.transfer(false); return leftover == null; } diff --git a/src/main/java/binnie/genetics/machine/IncubatorRecipeLarvae.java b/src/main/java/binnie/genetics/machine/incubator/IncubatorRecipeLarvae.java similarity index 88% rename from src/main/java/binnie/genetics/machine/IncubatorRecipeLarvae.java rename to src/main/java/binnie/genetics/machine/incubator/IncubatorRecipeLarvae.java index deed63be..68fb6bef 100644 --- a/src/main/java/binnie/genetics/machine/IncubatorRecipeLarvae.java +++ b/src/main/java/binnie/genetics/machine/incubator/IncubatorRecipeLarvae.java @@ -1,4 +1,4 @@ -package binnie.genetics.machine; +package binnie.genetics.machine.incubator; import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.FluidStack; diff --git a/src/main/java/binnie/genetics/machine/incubator/PackageIncubator.java b/src/main/java/binnie/genetics/machine/incubator/PackageIncubator.java new file mode 100644 index 00000000..efe70570 --- /dev/null +++ b/src/main/java/binnie/genetics/machine/incubator/PackageIncubator.java @@ -0,0 +1,50 @@ +package binnie.genetics.machine.incubator; + +import binnie.core.machines.Machine; +import binnie.core.machines.TileEntityMachine; +import binnie.core.machines.inventory.ComponentInventorySlots; +import binnie.core.machines.inventory.ComponentTankContainer; +import binnie.core.machines.inventory.InventorySlot; +import binnie.core.machines.power.ComponentPowerReceptor; +import binnie.craftgui.minecraft.IMachineInformation; +import binnie.genetics.core.GeneticsGUI; +import binnie.genetics.core.GeneticsTexture; +import binnie.genetics.machine.ComponentGeneticGUI; +import binnie.genetics.machine.GeneticMachine; +import net.minecraft.tileentity.TileEntity; + +public class PackageIncubator extends GeneticMachine.PackageGeneticBase implements IMachineInformation { + public PackageIncubator() { + super("incubator", GeneticsTexture.Incubator, 16767313, true); + } + + @Override + public void createMachine(final Machine machine) { + new ComponentGeneticGUI(machine, GeneticsGUI.Incubator); + ComponentInventorySlots inventory = new ComponentInventorySlots(machine); + for (InventorySlot slot : inventory.addSlotArray(Incubator.SLOT_QUEUE, "input")) { + slot.forbidExtraction(); + } + InventorySlot slotIncubator = inventory.addSlot(Incubator.SLOT_INCUBATOR, "incubator"); + slotIncubator.forbidInteraction(); + slotIncubator.setReadOnly(); + for (InventorySlot slot : inventory.addSlotArray(Incubator.SLOT_OUTPUT, "output")) { + slot.forbidInsertion(); + slot.setReadOnly(); + } + new ComponentPowerReceptor(machine, 2000); + ComponentTankContainer tanks = new ComponentTankContainer(machine); + tanks.addTank(Incubator.TANK_INPUT, "input", 2000).forbidExtraction(); + tanks.addTank(Incubator.TANK_OUTPUT, "output", 2000).setReadOnly(); + new IncubatorLogic(machine); + } + + @Override + public TileEntity createTileEntity() { + return new TileEntityMachine(this); + } + + @Override + public void register() { + } +} diff --git a/src/main/java/binnie/genetics/machine/polymeriser/PackagePolymeriser.java b/src/main/java/binnie/genetics/machine/polymeriser/PackagePolymeriser.java new file mode 100644 index 00000000..d1f86d96 --- /dev/null +++ b/src/main/java/binnie/genetics/machine/polymeriser/PackagePolymeriser.java @@ -0,0 +1,97 @@ +package binnie.genetics.machine.polymeriser; + +import binnie.core.machines.Machine; +import binnie.core.machines.TileEntityMachine; +import binnie.core.machines.inventory.ComponentChargedSlots; +import binnie.core.machines.inventory.ComponentInventorySlots; +import binnie.core.machines.inventory.ComponentInventoryTransfer; +import binnie.core.machines.inventory.ComponentTankContainer; +import binnie.core.machines.inventory.InventorySlot; +import binnie.core.machines.inventory.SlotValidator; +import binnie.core.machines.inventory.Validator; +import binnie.core.machines.power.ComponentPowerReceptor; +import binnie.craftgui.minecraft.IMachineInformation; +import binnie.genetics.Genetics; +import binnie.genetics.core.GeneticsGUI; +import binnie.genetics.core.GeneticsTexture; +import binnie.genetics.item.GeneticLiquid; +import binnie.genetics.machine.ComponentGeneticGUI; +import binnie.genetics.machine.GeneticMachine; +import binnie.genetics.machine.ModuleMachine; +import net.minecraft.init.Items; +import net.minecraft.item.ItemStack; +import net.minecraft.tileentity.TileEntity; +import net.minecraftforge.fluids.FluidStack; + +public class PackagePolymeriser extends GeneticMachine.PackageGeneticBase implements IMachineInformation { + + public PackagePolymeriser() { + super("polymeriser", GeneticsTexture.Polymeriser, 58819, true); + } + + @Override + public void createMachine(Machine machine) { + new ComponentGeneticGUI(machine, GeneticsGUI.Replicator); + ComponentInventorySlots inventory = new ComponentInventorySlots(machine); + //Slot Gold + InventorySlot slotGold = inventory.addSlot(Polymeriser.SLOT_GOLD, "catalyst"); + slotGold.setValidator(new SlotValidator.Item(new ItemStack(Items.GOLD_NUGGET, 1), ModuleMachine.IconNugget)); + slotGold.forbidExtraction(); + //Slot Serum + InventorySlot slotSerum = inventory.addSlot(Polymeriser.SLOT_SERUM, "process"); + slotSerum.setValidator(new SlotValidatorUnfilledSerum()); + slotSerum.forbidInteraction(); + slotSerum.setReadOnly(); + for (InventorySlot slot : inventory.addSlotArray(Polymeriser.SLOT_SERUM_RESERVE, "input")) { + slot.setValidator(new SlotValidatorUnfilledSerum()); + slot.forbidExtraction(); + } + for (InventorySlot slot : inventory.addSlotArray(Polymeriser.SLOT_SERUM_FINISHED, "output")) { + slot.setReadOnly(); + } + ComponentInventoryTransfer transfer = new ComponentInventoryTransfer(machine); + transfer.addRestock(Polymeriser.SLOT_SERUM_RESERVE, 0, 1); + transfer.addStorage(0, Polymeriser.SLOT_SERUM_FINISHED, new ComponentInventoryTransfer.Condition() { + @Override + public boolean fufilled(final ItemStack stack) { + return !stack.isItemDamaged(); + } + }); + ComponentTankContainer tank = new ComponentTankContainer(machine); + tank.addTank(Polymeriser.TANK_BACTERIA, "input", 1000).setValidator(new Validator() { + @Override + public boolean isValid(final FluidStack itemStack) { + return GeneticLiquid.BacteriaPoly.get(1).isFluidEqual(itemStack); + } + + @Override + public String getTooltip() { + return Genetics.proxy.localise("machine.machine.polymeriser.tank.bacteria.info"); + } + }); + tank.addTank(Polymeriser.TANK_DNA, "input", 1000).setValidator(new Validator() { + @Override + public boolean isValid(final FluidStack itemStack) { + return GeneticLiquid.RawDNA.get(1).isFluidEqual(itemStack); + } + + @Override + public String getTooltip() { + return Genetics.proxy.localise("machine.machine.polymeriser.tank.dna.info"); + } + }); + new ComponentChargedSlots(machine).addCharge(1); + new ComponentPowerReceptor(machine, 8000); + new PolymeriserLogic(machine); + new PolymeriserFX(machine); + } + + @Override + public TileEntity createTileEntity() { + return new TileEntityMachine(this); + } + + @Override + public void register() { + } +} \ No newline at end of file diff --git a/src/main/java/binnie/genetics/machine/polymeriser/Polymeriser.java b/src/main/java/binnie/genetics/machine/polymeriser/Polymeriser.java new file mode 100644 index 00000000..2ad21b87 --- /dev/null +++ b/src/main/java/binnie/genetics/machine/polymeriser/Polymeriser.java @@ -0,0 +1,12 @@ +package binnie.genetics.machine.polymeriser; + +public class Polymeriser { + + public static final int TANK_BACTERIA = 0; + public static final int TANK_DNA = 1; + public static final int SLOT_SERUM = 0; + public static final int SLOT_GOLD = 1; + public static final int[] SLOT_SERUM_RESERVE = new int[]{2, 3, 4, 5}; + public static final int[] SLOT_SERUM_FINISHED = new int[]{6, 7, 8, 9}; + +} diff --git a/src/main/java/binnie/genetics/machine/polymeriser/PolymeriserFX.java b/src/main/java/binnie/genetics/machine/polymeriser/PolymeriserFX.java new file mode 100644 index 00000000..1dabc86b --- /dev/null +++ b/src/main/java/binnie/genetics/machine/polymeriser/PolymeriserFX.java @@ -0,0 +1,73 @@ +package binnie.genetics.machine.polymeriser; + +import java.util.Random; + +import binnie.core.BinnieCore; +import binnie.core.machines.IMachine; +import binnie.core.machines.MachineComponent; +import binnie.core.machines.component.IRender; +import net.minecraft.client.particle.Particle; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.World; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + +public class PolymeriserFX extends MachineComponent implements IRender.DisplayTick { + public PolymeriserFX(final IMachine machine) { + super(machine); + } + + @SideOnly(Side.CLIENT) + @Override + public void onDisplayTick(World world, BlockPos pos, Random rand) { + final int tick = (int) (world.getTotalWorldTime() % 8L); + if ((tick == 0 || tick == 3) && this.getUtil().getProcess().isInProgress()) { + BinnieCore.proxy.getMinecraftInstance().effectRenderer.addEffect(new Particle(world, pos.getX() + 0.5, pos.getY() + 1.8, pos.getZ() + 0.5, 0.0, 0.0, 0.0) { + double axisX = this.posX; + double axisZ = this.posZ; + double angle = 0.7 + (int) (this.worldObj.getTotalWorldTime() % 2L) * 3.1415; + + { + this.axisX = 0.0; + this.axisZ = 0.0; + this.angle = 0.0; + this.motionX = 0.0; + this.motionZ = 0.0; + this.motionY = -0.006; + this.particleMaxAge = 140; + this.particleGravity = 0.0f; + this.field_190017_n = true; + this.setRBGColorF(0.8f, 0.0f, 1.0f); + } + + @Override + public void onUpdate() { + super.onUpdate(); + this.angle += 0.1; + this.motionY = -0.006; + double dist = 0.2; + if (this.particleAge > 60) { + if (this.particleAge > 120) { + dist = 0.1; + } + else { + dist = 0.2 - 0.1 * ((this.particleAge - 60.0f) / 60.0f); + } + } + this.setPosition(this.axisX + dist * Math.sin(this.angle), this.posY, this.axisZ + dist * Math.cos(this.angle)); + if (this.particleAge <= 40) { + this.setAlphaF(this.particleAge / 40.0f); + } + if (this.particleAge > 80) { + this.setRBGColorF(this.particleRed + (0.0f - this.particleRed) / 10.0f, this.particleGreen + (1.0f - this.particleGreen) / 10.0f, this.particleBlue + (1.0f - this.particleBlue) / 10.0f); + } + } + + @Override + public int getFXLayer() { + return 0; + } + }); + } + } +} diff --git a/src/main/java/binnie/genetics/machine/polymeriser/PolymeriserLogic.java b/src/main/java/binnie/genetics/machine/polymeriser/PolymeriserLogic.java new file mode 100644 index 00000000..29ebaf92 --- /dev/null +++ b/src/main/java/binnie/genetics/machine/polymeriser/PolymeriserLogic.java @@ -0,0 +1,101 @@ +package binnie.genetics.machine.polymeriser; + +import binnie.core.machines.Machine; +import binnie.core.machines.power.ComponentProcessSetCost; +import binnie.core.machines.power.ErrorState; +import binnie.core.machines.power.IProcess; +import binnie.genetics.Genetics; +import binnie.genetics.genetics.Engineering; +import net.minecraft.item.ItemStack; + +public class PolymeriserLogic extends ComponentProcessSetCost implements IProcess { + private static float chargePerProcess = 0.4f; + private float dnaDrain; + private float bacteriaDrain; + + public PolymeriserLogic(final Machine machine) { + super(machine, 96000, 2400); + this.dnaDrain = 0.0f; + this.bacteriaDrain = 0.0f; + } + + private float getCatalyst() { + return (this.getUtil().getSlotCharge(Polymeriser.SLOT_GOLD) > 0.0f) ? 0.2f : 1.0f; + } + + @Override + public int getProcessLength() { + return (int) (super.getProcessLength() * this.getNumberOfGenes() * this.getCatalyst()); + } + + @Override + public int getProcessEnergy() { + return (int) (super.getProcessEnergy() * this.getNumberOfGenes() * this.getCatalyst()); + } + + private float getDNAPerProcess() { + return this.getNumberOfGenes() * 50; + } + + @Override + public void onTickTask() { + super.onTickTask(); + this.getUtil().useCharge(Polymeriser.SLOT_GOLD, PolymeriserLogic.chargePerProcess * this.getProgressPerTick() / 100.0f); + this.dnaDrain += this.getDNAPerProcess() * this.getProgressPerTick() / 100.0f; + this.bacteriaDrain += 0.2f * this.getDNAPerProcess() * this.getProgressPerTick() / 100.0f; + if (this.dnaDrain >= 1.0f) { + this.getUtil().drainTank(Polymeriser.TANK_DNA, 1); + --this.dnaDrain; + } + if (this.bacteriaDrain >= 1.0f) { + this.getUtil().drainTank(Polymeriser.TANK_BACTERIA, 1); + --this.bacteriaDrain; + } + } + + private int getNumberOfGenes() { + final ItemStack serum = this.getUtil().getStack(Polymeriser.SLOT_SERUM); + if (serum == null) { + return 1; + } + return Engineering.getGenes(serum).length; + } + + @Override + public String getTooltip() { + int n = this.getNumberOfGenes(); + if(n > 1){ + return Genetics.proxy.localise("machine.machine.polymeriser.logic.genes").replaceAll("%GENES", Integer.valueOf(n).toString()); + }else{ + return Genetics.proxy.localise("machine.machine.polymeriser.logic.gene"); + } + } + + @Override + public ErrorState canWork() { + if (this.getUtil().isSlotEmpty(Polymeriser.SLOT_SERUM)) { + return new ErrorState.NoItem(Genetics.proxy.localise("machine.machine.polymeriser.logic.item.no"), Polymeriser.SLOT_SERUM); + } + if (!this.getUtil().getStack(Polymeriser.SLOT_SERUM).isItemDamaged()) { + return new ErrorState.InvalidItem(Genetics.proxy.localise("machine.machine.polymeriser.logic.item.filled"), Polymeriser.SLOT_SERUM); + } + return super.canWork(); + } + + @Override + public ErrorState canProgress() { + if (this.getUtil().getFluid(Polymeriser.TANK_BACTERIA) == null) { + return new ErrorState.InsufficientLiquid(Genetics.proxy.localise("machine.machine.polymeriser.logic.insufficient.bacteria"), Polymeriser.TANK_BACTERIA); + } + if (this.getUtil().getFluid(Polymeriser.TANK_DNA) == null) { + return new ErrorState.InsufficientLiquid(Genetics.proxy.localise("machine.machine.polymeriser.logic.insufficient.dna"), Polymeriser.TANK_DNA); + } + return super.canProgress(); + } + + @Override + protected void onFinishTask() { + super.onFinishTask(); + this.getUtil().damageItem(Polymeriser.SLOT_SERUM, -1); + } +} \ No newline at end of file diff --git a/src/main/java/binnie/genetics/machine/polymeriser/SlotValidatorUnfilledSerum.java b/src/main/java/binnie/genetics/machine/polymeriser/SlotValidatorUnfilledSerum.java new file mode 100644 index 00000000..99c55c03 --- /dev/null +++ b/src/main/java/binnie/genetics/machine/polymeriser/SlotValidatorUnfilledSerum.java @@ -0,0 +1,23 @@ +package binnie.genetics.machine.polymeriser; + +import binnie.core.machines.inventory.SlotValidator; +import binnie.genetics.Genetics; +import binnie.genetics.api.IItemChargable; +import binnie.genetics.machine.ModuleMachine; +import net.minecraft.item.ItemStack; + +public class SlotValidatorUnfilledSerum extends SlotValidator { + public SlotValidatorUnfilledSerum() { + super(ModuleMachine.iconSerum); + } + + @Override + public boolean isValid(final ItemStack itemStack) { + return itemStack.getItem() instanceof IItemChargable; + } + + @Override + public String getTooltip() { + return Genetics.proxy.localise("machine.machine.polymeriser.slot.unfilled"); + } +} diff --git a/src/main/resources/assets/genetics/lang/en_US.lang b/src/main/resources/assets/genetics/lang/en_US.lang index 5ab98056..a6200184 100644 --- a/src/main/resources/assets/genetics/lang/en_US.lang +++ b/src/main/resources/assets/genetics/lang/en_US.lang @@ -9,6 +9,16 @@ genetics.machine.machine.sequencer.info=The Sequencer takes unsequenced serums a genetics.machine.machine.polymeriser=Polymeriser genetics.machine.machine.polymeriser.info=The Polymeriser fills empty serums with Raw DNA and replicating bacteria. This process can be accelerated using gold nuggets. +genetics.machine.machine.polymeriser.tile=Polymeriser +genetics.machine.machine.polymeriser.logic.gene=Replicating 1 genes +genetics.machine.machine.polymeriser.logic.genes=Replicating %GENES geness +genetics.machine.machine.polymeriser.logic.item.no=No item to replicate +genetics.machine.machine.polymeriser.logic.item.filled=Item filled +genetics.machine.machine.polymeriser.logic.insufficient.bacteria=Insufficient Bacteria +genetics.machine.machine.polymeriser.logic.insufficient.dna=Insufficient DNA +genetics.machine.machine.polymeriser.slot.unfilled=Unfilled Serum +genetics.machine.machine.polymeriser.tank.bacteria.info=Polymerising Bacteria +genetics.machine.machine.polymeriser.tank.dna.info=Raw DNA genetics.machine.machine.inoculator=Inoculator genetics.machine.machine.inoculator.info=The Inoculator uses serums to add genes to breedable individuals. This process is very slow and requires a Bacteria Vector, but is always successful.