mirror of
https://github.com/GTNewHorizons/Binnie.git
synced 2026-11-18 19:39:37 +00:00
Add Inoculator JEI recipes
This commit is contained in:
1 parent
125cd54b66
commit
41e847b944
26 files changed
+366
-57
No files matched your search
@@ -70,7 +70,13 @@ public class FlowerBreedingSystem extends BreedingSystem {
|
||||
|
||||
@Override
|
||||
public boolean isDNAManipulable(final ItemStack member) {
|
||||
return ((IFlowerRoot) this.getSpeciesRoot()).getType(member) == EnumFlowerStage.POLLEN;
|
||||
ISpeciesType type = this.getSpeciesRoot().getType(member);
|
||||
return isDNAManipulable(type);
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean isDNAManipulable(ISpeciesType type) {
|
||||
return type == EnumFlowerStage.POLLEN;
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -74,7 +74,13 @@ class BeeBreedingSystem extends BreedingSystem {
|
||||
|
||||
@Override
|
||||
public boolean isDNAManipulable(final ItemStack member) {
|
||||
return ((IBeeRoot) this.getSpeciesRoot()).getType(member) == EnumBeeType.LARVAE;
|
||||
ISpeciesType type = this.getSpeciesRoot().getType(member);
|
||||
return isDNAManipulable(type);
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean isDNAManipulable(ISpeciesType type) {
|
||||
return type == EnumBeeType.LARVAE;
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -450,6 +450,8 @@ public abstract class BreedingSystem implements IItemStackRepresentitive {
|
||||
|
||||
public abstract boolean isDNAManipulable(final ItemStack p0);
|
||||
|
||||
public abstract boolean isDNAManipulable(final ISpeciesType type);
|
||||
|
||||
public IIndividual getConversion(final ItemStack stack) {
|
||||
return null;
|
||||
}
|
||||
|
||||
@@ -26,6 +26,7 @@ import net.minecraft.world.World;
|
||||
import net.minecraftforge.event.world.WorldEvent;
|
||||
import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
|
||||
|
||||
import javax.annotation.Nullable;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Collection;
|
||||
import java.util.Comparator;
|
||||
@@ -90,6 +91,7 @@ public class ManagerGenetics extends ManagerBase {
|
||||
return (IFlowerRoot) AlleleManager.alleleRegistry.getSpeciesRoot("rootFlowers");
|
||||
}
|
||||
|
||||
@Nullable
|
||||
public BreedingSystem getSystem(final String string) {
|
||||
for (final BreedingSystem system : this.BREEDING_SYSTEMS.values()) {
|
||||
if (system.getIdent().equals(string)) {
|
||||
@@ -99,6 +101,7 @@ public class ManagerGenetics extends ManagerBase {
|
||||
return null;
|
||||
}
|
||||
|
||||
@Nullable
|
||||
public BreedingSystem getSystem(final ISpeciesRoot root) {
|
||||
return this.getSystem(root.getUID());
|
||||
}
|
||||
|
||||
@@ -79,7 +79,13 @@ class MothBreedingSystem extends BreedingSystem {
|
||||
|
||||
@Override
|
||||
public boolean isDNAManipulable(final ItemStack member) {
|
||||
return ((IButterflyRoot) this.getSpeciesRoot()).getType(member) == EnumFlutterType.SERUM;
|
||||
ISpeciesType type = this.getSpeciesRoot().getType(member);
|
||||
return isDNAManipulable(type);
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean isDNAManipulable(ISpeciesType type) {
|
||||
return type == EnumFlutterType.SERUM;
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -231,7 +231,13 @@ public class TreeBreedingSystem extends BreedingSystem {
|
||||
|
||||
@Override
|
||||
public boolean isDNAManipulable(final ItemStack member) {
|
||||
return ((ITreeRoot) this.getSpeciesRoot()).getType(member) == EnumGermlingType.POLLEN;
|
||||
ISpeciesType type = this.getSpeciesRoot().getType(member);
|
||||
return isDNAManipulable(type);
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean isDNAManipulable(ISpeciesType type) {
|
||||
return type == EnumGermlingType.POLLEN;
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -6,10 +6,10 @@ public class ComponentProcessSetCost extends ComponentProcess {
|
||||
private int processLength;
|
||||
private int processEnergy;
|
||||
|
||||
public ComponentProcessSetCost(final IMachine machine, final int rfCost, final int timePeriod) {
|
||||
public ComponentProcessSetCost(final IMachine machine, final int processEnergy, final int processLength) {
|
||||
super(machine);
|
||||
this.processLength = timePeriod;
|
||||
this.processEnergy = rfCost;
|
||||
this.processLength = processLength;
|
||||
this.processEnergy = processEnergy;
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -0,0 +1,13 @@
|
||||
package binnie.core.util;
|
||||
|
||||
import javax.annotation.Nonnull;
|
||||
import javax.annotation.meta.TypeQualifierDefault;
|
||||
import java.lang.annotation.ElementType;
|
||||
import java.lang.annotation.Retention;
|
||||
import java.lang.annotation.RetentionPolicy;
|
||||
|
||||
@Nonnull
|
||||
@TypeQualifierDefault(ElementType.FIELD)
|
||||
@Retention(RetentionPolicy.RUNTIME)
|
||||
public @interface FieldsAreNonnullByDefault {
|
||||
}
|
||||
@@ -18,6 +18,7 @@ import binnie.genetics.item.ItemSerumArray;
|
||||
import binnie.genetics.item.ModuleItem;
|
||||
import binnie.genetics.machine.ModuleMachine;
|
||||
import binnie.genetics.proxy.Proxy;
|
||||
import com.google.common.base.Preconditions;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraftforge.fml.common.Mod;
|
||||
import net.minecraftforge.fml.common.SidedProxy;
|
||||
@@ -25,6 +26,8 @@ import net.minecraftforge.fml.common.event.FMLInitializationEvent;
|
||||
import net.minecraftforge.fml.common.event.FMLPostInitializationEvent;
|
||||
import net.minecraftforge.fml.common.event.FMLPreInitializationEvent;
|
||||
|
||||
import javax.annotation.Nonnull;
|
||||
|
||||
@Mod(modid = Constants.GENETICS_MOD_ID, name = "Binnie's Genetics", useMetadata = true, dependencies = "required-after:" + Constants.CORE_MOD_ID)
|
||||
public class Genetics extends AbstractMod {
|
||||
|
||||
@@ -35,7 +38,7 @@ public class Genetics extends AbstractMod {
|
||||
public static Proxy proxy;
|
||||
|
||||
public static String channel = "GEN";
|
||||
public static Item itemGenetics;
|
||||
private static Item itemGenetics;
|
||||
public static ItemSerum itemSerum;
|
||||
public static ItemSequence itemSequencer;
|
||||
public static MachineGroup packageGenetic;
|
||||
@@ -47,6 +50,16 @@ public class Genetics extends AbstractMod {
|
||||
public static Item masterRegistry;
|
||||
public static ItemSerumArray itemSerumArray = null;
|
||||
|
||||
@Nonnull
|
||||
public static Item getItemGenetics() {
|
||||
Preconditions.checkState(itemGenetics != null);
|
||||
return itemGenetics;
|
||||
}
|
||||
|
||||
public static void setItemGenetics(Item itemGenetics) {
|
||||
Genetics.itemGenetics = itemGenetics;
|
||||
}
|
||||
|
||||
@Mod.EventHandler
|
||||
public void preInit(final FMLPreInitializationEvent evt) {
|
||||
this.preInit();
|
||||
|
||||
@@ -17,7 +17,7 @@ public class Engineering {
|
||||
if (stack.getItem() instanceof IItemSerum) {
|
||||
return ((IItemSerum) stack.getItem()).getCharges(stack) == 0;
|
||||
}
|
||||
return stack.getItem() == Genetics.itemGenetics && (stack.getItemDamage() == GeneticsItems.EmptySerum.ordinal() || stack.getItemDamage() == GeneticsItems.EmptyGenome.ordinal());
|
||||
return stack.getItem() == Genetics.getItemGenetics() && (stack.getItemDamage() == GeneticsItems.EmptySerum.ordinal() || stack.getItemDamage() == GeneticsItems.EmptyGenome.ordinal());
|
||||
}
|
||||
|
||||
public static boolean canAcceptGene(final ItemStack stack, final IGene gene) {
|
||||
@@ -41,10 +41,10 @@ public class Engineering {
|
||||
if (stack.getItem() instanceof IItemSerum) {
|
||||
((IItemSerum) stack.getItem()).addGene(stack, gene);
|
||||
}
|
||||
if (stack.getItem() == Genetics.itemGenetics && stack.getItemDamage() == GeneticsItems.EmptySerum.ordinal()) {
|
||||
if (stack.getItem() == Genetics.getItemGenetics() && stack.getItemDamage() == GeneticsItems.EmptySerum.ordinal()) {
|
||||
return ItemSerum.create(gene);
|
||||
}
|
||||
if (stack.getItem() == Genetics.itemGenetics && stack.getItemDamage() == GeneticsItems.EmptyGenome.ordinal()) {
|
||||
if (stack.getItem() == Genetics.getItemGenetics() && stack.getItemDamage() == GeneticsItems.EmptyGenome.ordinal()) {
|
||||
return ItemSerumArray.create(gene);
|
||||
}
|
||||
return stack;
|
||||
|
||||
@@ -9,6 +9,9 @@ import binnie.genetics.integration.jei.incubator.IncubatorRecipeHandler;
|
||||
import binnie.genetics.integration.jei.incubator.LarvaeIncubatorRecipeCategory;
|
||||
import binnie.genetics.integration.jei.incubator.LarvaeIncubatorRecipeMaker;
|
||||
import binnie.genetics.integration.jei.incubator.LarvaeIncubatorRecipeWrapper;
|
||||
import binnie.genetics.integration.jei.inoculator.InoculatorRecipeCategory;
|
||||
import binnie.genetics.integration.jei.inoculator.InoculatorRecipeMaker;
|
||||
import binnie.genetics.integration.jei.inoculator.InoculatorRecipeWrapper;
|
||||
import binnie.genetics.integration.jei.isolator.IsolatorRecipeCategory;
|
||||
import binnie.genetics.integration.jei.isolator.IsolatorRecipeMaker;
|
||||
import binnie.genetics.integration.jei.isolator.IsolatorRecipeWrapper;
|
||||
@@ -61,7 +64,8 @@ public class GeneticsJeiPlugin extends BlankModPlugin {
|
||||
new LarvaeIncubatorRecipeCategory(),
|
||||
new IsolatorRecipeCategory(),
|
||||
new PolymeriserRecipeCategory(),
|
||||
new SequencerRecipeCategory()
|
||||
new SequencerRecipeCategory(),
|
||||
new InoculatorRecipeCategory()
|
||||
);
|
||||
|
||||
registry.addRecipeHandlers(
|
||||
@@ -69,19 +73,22 @@ public class GeneticsJeiPlugin extends BlankModPlugin {
|
||||
new SimpleRecipeHandler<>(LarvaeIncubatorRecipeWrapper.class, RecipeUids.INCUBATOR_LARVAE),
|
||||
new SimpleRecipeHandler<>(IsolatorRecipeWrapper.class, RecipeUids.ISOLATOR),
|
||||
new SimpleRecipeHandler<>(PolymeriserRecipeWrapper.class, RecipeUids.POLYMERISER),
|
||||
new SimpleRecipeHandler<>(SequencerRecipeWrapper.class, RecipeUids.SEQUENCER)
|
||||
new SimpleRecipeHandler<>(SequencerRecipeWrapper.class, RecipeUids.SEQUENCER),
|
||||
new SimpleRecipeHandler<>(InoculatorRecipeWrapper.class, RecipeUids.INOCULATOR)
|
||||
);
|
||||
|
||||
registry.addRecipeCategoryCraftingItem(LaboratoryMachine.Incubator.get(1), RecipeUids.INCUBATOR, RecipeUids.INCUBATOR_LARVAE);
|
||||
registry.addRecipeCategoryCraftingItem(GeneticMachine.Isolator.get(1), RecipeUids.ISOLATOR);
|
||||
registry.addRecipeCategoryCraftingItem(GeneticMachine.Polymeriser.get(1), RecipeUids.POLYMERISER);
|
||||
registry.addRecipeCategoryCraftingItem(GeneticMachine.Sequencer.get(1), RecipeUids.SEQUENCER);
|
||||
registry.addRecipeCategoryCraftingItem(GeneticMachine.Inoculator.get(1), RecipeUids.INOCULATOR);
|
||||
|
||||
registry.addRecipes(Incubator.getRecipes());
|
||||
registry.addRecipes(LarvaeIncubatorRecipeMaker.create(Incubator.getLarvaeRecipe()));
|
||||
registry.addRecipes(IsolatorRecipeMaker.create());
|
||||
registry.addRecipes(PolymeriserRecipeMaker.create());
|
||||
registry.addRecipes(SequencerRecipeMaker.create());
|
||||
registry.addRecipes(InoculatorRecipeMaker.create());
|
||||
}
|
||||
|
||||
private static class ChargeableSubtypeInterpreter implements ISubtypeRegistry.ISubtypeInterpreter {
|
||||
|
||||
@@ -6,4 +6,5 @@ public class RecipeUids {
|
||||
public static final String ISOLATOR = "binnie.genetics.isolator";
|
||||
public static final String POLYMERISER = "binnie.genetics.polymeriser";
|
||||
public static final String SEQUENCER = "binnie.genetics.sequencer";
|
||||
public static final String INOCULATOR = "binnie.genetics.inoculator";
|
||||
}
|
||||
@@ -1,7 +1,9 @@
|
||||
@ParametersAreNonnullByDefault
|
||||
@FieldsAreNonnullByDefault
|
||||
@MethodsReturnNonnullByDefault
|
||||
package binnie.genetics.integration.jei.incubator;
|
||||
|
||||
import binnie.core.util.FieldsAreNonnullByDefault;
|
||||
import mcp.MethodsReturnNonnullByDefault;
|
||||
|
||||
import javax.annotation.ParametersAreNonnullByDefault;
|
||||
+110
@@ -0,0 +1,110 @@
|
||||
package binnie.genetics.integration.jei.inoculator;
|
||||
|
||||
import binnie.core.genetics.Gene;
|
||||
import binnie.genetics.integration.jei.GeneticsJeiPlugin;
|
||||
import binnie.genetics.integration.jei.RecipeUids;
|
||||
import binnie.genetics.item.ItemSerum;
|
||||
import binnie.genetics.machine.inoculator.Inoculator;
|
||||
import binnie.genetics.machine.inoculator.InoculatorLogic;
|
||||
import forestry.api.genetics.AlleleManager;
|
||||
import forestry.api.genetics.IAlleleSpecies;
|
||||
import forestry.api.genetics.IIndividual;
|
||||
import forestry.api.genetics.ISpeciesRoot;
|
||||
import mezz.jei.api.gui.IDrawable;
|
||||
import mezz.jei.api.gui.IDrawableAnimated;
|
||||
import mezz.jei.api.gui.IGuiFluidStackGroup;
|
||||
import mezz.jei.api.gui.IGuiItemStackGroup;
|
||||
import mezz.jei.api.gui.IRecipeLayout;
|
||||
import mezz.jei.api.ingredients.IIngredients;
|
||||
import mezz.jei.api.recipe.BlankRecipeCategory;
|
||||
import mezz.jei.api.recipe.IFocus;
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.item.ItemStack;
|
||||
|
||||
public class InoculatorRecipeCategory extends BlankRecipeCategory<InoculatorRecipeWrapper> {
|
||||
private final IDrawableAnimated arrowAnimated;
|
||||
|
||||
public InoculatorRecipeCategory() {
|
||||
this.arrowAnimated = GeneticsJeiPlugin.drawables.createArrowAnimated(56);
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getUid() {
|
||||
return RecipeUids.INOCULATOR;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getTitle() {
|
||||
return "Inoculation";
|
||||
}
|
||||
|
||||
@Override
|
||||
public IDrawable getBackground() {
|
||||
return GeneticsJeiPlugin.guiHelper.createBlankDrawable(130, 60);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void drawExtras(Minecraft minecraft) {
|
||||
IDrawable tank = GeneticsJeiPlugin.drawables.getTank();
|
||||
tank.draw(minecraft, 0, 0);
|
||||
|
||||
IDrawable arrow = GeneticsJeiPlugin.drawables.getArrow();
|
||||
arrow.draw(minecraft, 69, 25);
|
||||
arrowAnimated.draw(minecraft, 69, 25);
|
||||
|
||||
IDrawable slot = GeneticsJeiPlugin.guiHelper.getSlotDrawable();
|
||||
slot.draw(minecraft, 22, 0);
|
||||
slot.draw(minecraft, 42, 21);
|
||||
|
||||
slot.draw(minecraft, 92, 21);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void setRecipe(IRecipeLayout recipeLayout, InoculatorRecipeWrapper recipeWrapper, IIngredients ingredients) {
|
||||
IDrawable tankOverlay = GeneticsJeiPlugin.drawables.getTankOverlay();
|
||||
IGuiFluidStackGroup fluidStacks = recipeLayout.getFluidStacks();
|
||||
fluidStacks.init(Inoculator.TANK_VEKTOR, true, 1, 1, 16, 58, 100, false, tankOverlay);
|
||||
fluidStacks.set(ingredients);
|
||||
|
||||
IGuiItemStackGroup itemStacks = recipeLayout.getItemStacks();
|
||||
itemStacks.init(0, true, 22, 0);
|
||||
itemStacks.init(1, true, 42, 21);
|
||||
itemStacks.init(2, false, 92, 21);
|
||||
|
||||
IFocus<?> focus = recipeLayout.getFocus();
|
||||
Object focusValue = focus.getValue();
|
||||
if (focusValue instanceof ItemStack) {
|
||||
ItemStack focusStack = (ItemStack) focusValue;
|
||||
if (AlleleManager.alleleRegistry.isIndividual(focusStack)) {
|
||||
if (focus.getMode() == IFocus.Mode.INPUT) {
|
||||
ItemStack serum = recipeWrapper.getInputSerum();
|
||||
ItemStack output = InoculatorLogic.applySerum(focusStack, serum);
|
||||
itemStacks.set(0, serum);
|
||||
itemStacks.set(1, focusStack);
|
||||
itemStacks.set(2, output);
|
||||
return;
|
||||
} else if (focus.getMode() == IFocus.Mode.OUTPUT) {
|
||||
IIndividual individual = AlleleManager.alleleRegistry.getIndividual(focusStack);
|
||||
ISpeciesRoot speciesRoot = individual.getGenome().getSpeciesRoot();
|
||||
IAlleleSpecies species = individual.getGenome().getPrimary();
|
||||
ItemStack serum = ItemSerum.create(new Gene(species, speciesRoot.getSpeciesChromosomeType(), speciesRoot));
|
||||
serum.setItemDamage(0); // set fully charged
|
||||
|
||||
itemStacks.set(0, serum);
|
||||
itemStacks.set(1, recipeWrapper.getWildcardTarget());
|
||||
itemStacks.set(2, focusStack);
|
||||
return;
|
||||
}
|
||||
} else if (focusStack.getItem() instanceof ItemSerum) {
|
||||
ItemStack input = recipeWrapper.getWildcardTarget();
|
||||
ItemStack output = InoculatorLogic.applySerum(input, focusStack);
|
||||
itemStacks.set(0, focusStack);
|
||||
itemStacks.set(1, input);
|
||||
itemStacks.set(2, output);
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
itemStacks.set(ingredients);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,44 @@
|
||||
package binnie.genetics.integration.jei.inoculator;
|
||||
|
||||
import binnie.Binnie;
|
||||
import binnie.core.genetics.BreedingSystem;
|
||||
import binnie.core.genetics.Gene;
|
||||
import binnie.genetics.item.ItemSerum;
|
||||
import forestry.api.genetics.IAllele;
|
||||
import forestry.api.genetics.IChromosomeType;
|
||||
import forestry.api.genetics.IIndividual;
|
||||
import forestry.api.genetics.ISpeciesRoot;
|
||||
import forestry.api.genetics.ISpeciesType;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraftforge.oredict.OreDictionary;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
public class InoculatorRecipeMaker {
|
||||
public static List<InoculatorRecipeWrapper> create() {
|
||||
List<InoculatorRecipeWrapper> recipes = new ArrayList<>();
|
||||
|
||||
for (BreedingSystem system : Binnie.Genetics.getActiveSystems()) {
|
||||
ISpeciesRoot root = system.getSpeciesRoot();
|
||||
IChromosomeType speciesChromosomeType = root.getSpeciesChromosomeType();
|
||||
IAllele[] defaultTemplate = root.getDefaultTemplate();
|
||||
IIndividual individual = root.templateAsIndividual(defaultTemplate);
|
||||
for (ISpeciesType speciesType : system.getActiveTypes()) {
|
||||
if (system.isDNAManipulable(speciesType)) {
|
||||
ItemStack memberStack = root.getMemberStack(individual, speciesType);
|
||||
memberStack.setItemDamage(OreDictionary.WILDCARD_VALUE);
|
||||
|
||||
IAllele species = defaultTemplate[speciesChromosomeType.ordinal()];
|
||||
ItemStack serum = ItemSerum.create(new Gene(species, speciesChromosomeType, root));
|
||||
serum.setItemDamage(0); // set fully charged
|
||||
|
||||
InoculatorRecipeWrapper recipeWrapper = new InoculatorRecipeWrapper(serum, memberStack);
|
||||
recipes.add(recipeWrapper);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return recipes;
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,48 @@
|
||||
package binnie.genetics.integration.jei.inoculator;
|
||||
|
||||
import binnie.genetics.item.GeneticLiquid;
|
||||
import binnie.genetics.machine.inoculator.InoculatorLogic;
|
||||
import mezz.jei.api.ingredients.IIngredients;
|
||||
import mezz.jei.api.recipe.BlankRecipeWrapper;
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraftforge.fluids.FluidStack;
|
||||
|
||||
import java.util.Arrays;
|
||||
|
||||
public class InoculatorRecipeWrapper extends BlankRecipeWrapper {
|
||||
private static final FluidStack BACTERIA_VECTOR = GeneticLiquid.BacteriaVector.get(InoculatorLogic.BACTERIA_PER_PROCESS);
|
||||
|
||||
private final ItemStack inputSerum;
|
||||
private final ItemStack wildcardTarget;
|
||||
|
||||
public InoculatorRecipeWrapper(ItemStack inputSerum, ItemStack wildcardTarget) {
|
||||
this.inputSerum = inputSerum;
|
||||
this.wildcardTarget = wildcardTarget;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void getIngredients(IIngredients ingredients) {
|
||||
ingredients.setInputs(ItemStack.class, Arrays.asList(
|
||||
inputSerum,
|
||||
wildcardTarget
|
||||
));
|
||||
|
||||
ingredients.setOutput(ItemStack.class, wildcardTarget);
|
||||
|
||||
ingredients.setInput(FluidStack.class, BACTERIA_VECTOR);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void drawInfo(Minecraft minecraft, int recipeWidth, int recipeHeight, int mouseX, int mouseY) {
|
||||
|
||||
}
|
||||
|
||||
public ItemStack getInputSerum() {
|
||||
return inputSerum;
|
||||
}
|
||||
|
||||
public ItemStack getWildcardTarget() {
|
||||
return wildcardTarget;
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,9 @@
|
||||
@ParametersAreNonnullByDefault
|
||||
@FieldsAreNonnullByDefault
|
||||
@MethodsReturnNonnullByDefault
|
||||
package binnie.genetics.integration.jei.inoculator;
|
||||
|
||||
import binnie.core.util.FieldsAreNonnullByDefault;
|
||||
import mcp.MethodsReturnNonnullByDefault;
|
||||
|
||||
import javax.annotation.ParametersAreNonnullByDefault;
|
||||
@@ -1,7 +1,9 @@
|
||||
@ParametersAreNonnullByDefault
|
||||
@FieldsAreNonnullByDefault
|
||||
@MethodsReturnNonnullByDefault
|
||||
package binnie.genetics.integration.jei.isolator;
|
||||
|
||||
import binnie.core.util.FieldsAreNonnullByDefault;
|
||||
import mcp.MethodsReturnNonnullByDefault;
|
||||
|
||||
import javax.annotation.ParametersAreNonnullByDefault;
|
||||
@@ -1,7 +1,9 @@
|
||||
@ParametersAreNonnullByDefault
|
||||
@FieldsAreNonnullByDefault
|
||||
@MethodsReturnNonnullByDefault
|
||||
package binnie.genetics.integration.jei;
|
||||
|
||||
import binnie.core.util.FieldsAreNonnullByDefault;
|
||||
import mcp.MethodsReturnNonnullByDefault;
|
||||
|
||||
import javax.annotation.ParametersAreNonnullByDefault;
|
||||
@@ -1,7 +1,9 @@
|
||||
@ParametersAreNonnullByDefault
|
||||
@FieldsAreNonnullByDefault
|
||||
@MethodsReturnNonnullByDefault
|
||||
package binnie.genetics.integration.jei.polymeriser;
|
||||
|
||||
import binnie.core.util.FieldsAreNonnullByDefault;
|
||||
import mcp.MethodsReturnNonnullByDefault;
|
||||
|
||||
import javax.annotation.ParametersAreNonnullByDefault;
|
||||
@@ -1,7 +1,9 @@
|
||||
@ParametersAreNonnullByDefault
|
||||
@FieldsAreNonnullByDefault
|
||||
@MethodsReturnNonnullByDefault
|
||||
package binnie.genetics.integration.jei.sequencer;
|
||||
|
||||
import binnie.core.util.FieldsAreNonnullByDefault;
|
||||
import mcp.MethodsReturnNonnullByDefault;
|
||||
|
||||
import javax.annotation.ParametersAreNonnullByDefault;
|
||||
@@ -46,7 +46,7 @@ public enum GeneticsItems implements IItemMiscProvider {
|
||||
|
||||
@Override
|
||||
public ItemStack get(final int size) {
|
||||
return (Genetics.itemGenetics == null) ? null : new ItemStack(Genetics.itemGenetics, size, this.ordinal());
|
||||
return new ItemStack(Genetics.getItemGenetics(), size, this.ordinal());
|
||||
}
|
||||
|
||||
public ItemStack get(@Nonnull Item itemGenetics, final int size) {
|
||||
|
||||
@@ -72,7 +72,7 @@ public class ItemSequence extends ItemCore implements IItemAnalysable, IItemChar
|
||||
// }
|
||||
|
||||
@Override
|
||||
public void getSubItems(final Item par1, final CreativeTabs par2CreativeTabs, final List itemList) {
|
||||
public void getSubItems(final Item par1, final CreativeTabs par2CreativeTabs, final List<ItemStack> itemList) {
|
||||
final IAlleleBeeSpecies species = (IAlleleBeeSpecies) AlleleManager.alleleRegistry.getAllele("forestry.speciesMeadows");
|
||||
itemList.add(create(new Gene(species, EnumBeeChromosome.SPECIES, Binnie.Genetics.getBeeRoot()), false));
|
||||
}
|
||||
|
||||
@@ -42,11 +42,11 @@ public class ModuleItem implements IInitializable {
|
||||
Genetics.itemSerum = new ItemSerum();
|
||||
Genetics.itemSerumArray = new ItemSerumArray();
|
||||
Genetics.itemSequencer = new ItemSequence();
|
||||
Genetics.itemGenetics = Binnie.Item.registerMiscItems(GeneticsItems.values(), CreativeTabGenetics.instance);
|
||||
Genetics.setItemGenetics(Binnie.Item.registerMiscItems(GeneticsItems.values(), CreativeTabGenetics.instance));
|
||||
Genetics.proxy.registerItem(Genetics.itemSerum);
|
||||
Genetics.proxy.registerItem(Genetics.itemSerumArray);
|
||||
Genetics.proxy.registerItem(Genetics.itemSequencer);
|
||||
Genetics.proxy.registerItem(Genetics.itemGenetics);
|
||||
Genetics.proxy.registerItem(Genetics.getItemGenetics());
|
||||
|
||||
Genetics.database = new ItemDatabase();
|
||||
Genetics.analyst = new ItemAnalyst();
|
||||
@@ -81,7 +81,7 @@ public class ModuleItem implements IInitializable {
|
||||
|
||||
@Override
|
||||
public void postInit() {
|
||||
Item itemGenetics = Genetics.itemGenetics;
|
||||
Item itemGenetics = Genetics.getItemGenetics();
|
||||
if (itemGenetics != null) {
|
||||
GameRegistry.addShapelessRecipe(GeneticsItems.DNADye.get(8),
|
||||
Items.GLOWSTONE_DUST, new ItemStack(Items.DYE, 1, 5));
|
||||
|
||||
@@ -18,8 +18,7 @@ public class Inoculator {
|
||||
public static final int TANK_VEKTOR = 0;
|
||||
|
||||
public static void setGene(final IGene gene, final ItemStack target, final int chromoN) {
|
||||
int chromosomeID;
|
||||
final int chromosome = chromosomeID = gene.getChromosome().ordinal();
|
||||
int chromosomeID = gene.getChromosome().ordinal();
|
||||
if (chromosomeID >= EnumBeeChromosome.HUMIDITY_TOLERANCE.ordinal() && gene.getSpeciesRoot() instanceof IBeeRoot) {
|
||||
--chromosomeID;
|
||||
}
|
||||
|
||||
@@ -1,7 +1,8 @@
|
||||
package binnie.genetics.machine.inoculator;
|
||||
|
||||
import binnie.core.machines.Machine;
|
||||
import binnie.core.machines.power.ComponentProcessSetCost;
|
||||
import binnie.core.machines.MachineUtil;
|
||||
import binnie.core.machines.power.ComponentProcess;
|
||||
import binnie.core.machines.power.ErrorState;
|
||||
import binnie.core.machines.power.IProcess;
|
||||
import binnie.genetics.Genetics;
|
||||
@@ -13,31 +14,53 @@ import forestry.api.genetics.IAllele;
|
||||
import forestry.api.genetics.IIndividual;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.nbt.NBTTagCompound;
|
||||
import net.minecraftforge.oredict.OreDictionary;
|
||||
|
||||
public class InoculatorLogic extends ComponentProcessSetCost implements IProcess {
|
||||
private float bacteriaDrain;
|
||||
import javax.annotation.Nullable;
|
||||
|
||||
@Override
|
||||
public int getProcessLength() {
|
||||
return super.getProcessLength() * this.getNumberOfGenes();
|
||||
public class InoculatorLogic extends ComponentProcess implements IProcess {
|
||||
public static final int PROCESS_BASE_LENGTH = 12000;
|
||||
public static final int PROCESS_BASE_ENERGY = 600000;
|
||||
public static final int BACTERIA_PER_PROCESS = 15;
|
||||
|
||||
public static int getProcessLength(ItemStack itemStack) {
|
||||
return PROCESS_BASE_LENGTH * getNumberOfGenes(itemStack);
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getProcessEnergy() {
|
||||
return super.getProcessEnergy() * this.getNumberOfGenes();
|
||||
public static int getProcessBaseEnergy(ItemStack itemStack) {
|
||||
return PROCESS_BASE_ENERGY * getNumberOfGenes(itemStack);
|
||||
}
|
||||
|
||||
private int getNumberOfGenes() {
|
||||
final ItemStack serum = this.getUtil().getStack(0);
|
||||
private static int getNumberOfGenes(@Nullable ItemStack serum) {
|
||||
if (serum == null) {
|
||||
return 1;
|
||||
}
|
||||
return Engineering.getGenes(serum).length;
|
||||
}
|
||||
|
||||
private float bacteriaDrain;
|
||||
|
||||
public InoculatorLogic(final Machine machine) {
|
||||
super(machine);
|
||||
this.bacteriaDrain = 0.0f;
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getProcessLength() {
|
||||
ItemStack stack = this.getUtil().getStack(0);
|
||||
return getProcessLength(stack);
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getProcessEnergy() {
|
||||
ItemStack stack = this.getUtil().getStack(0);
|
||||
return getProcessBaseEnergy(stack);
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getTooltip() {
|
||||
int n = this.getNumberOfGenes();
|
||||
ItemStack stack = this.getUtil().getStack(0);
|
||||
int n = getNumberOfGenes(stack);
|
||||
if (n > 1) {
|
||||
return String.format(Genetics.proxy.localise("genetics.machine.machine.inoculator.tooltips.logic.genes"), Integer.valueOf(n).toString());
|
||||
} else {
|
||||
@@ -45,11 +68,6 @@ public class InoculatorLogic extends ComponentProcessSetCost implements IProcess
|
||||
}
|
||||
}
|
||||
|
||||
public InoculatorLogic(final Machine machine) {
|
||||
super(machine, 600000, 12000);
|
||||
this.bacteriaDrain = 0.0f;
|
||||
}
|
||||
|
||||
@Override
|
||||
public ErrorState canWork() {
|
||||
if (this.getUtil().isSlotEmpty(Inoculator.SLOT_TARGET)) {
|
||||
@@ -79,18 +97,14 @@ public class InoculatorLogic extends ComponentProcessSetCost implements IProcess
|
||||
return new ErrorState(Genetics.proxy.localise("machine.errors.invalid.serum.desc"), Genetics.proxy.localise("machine.errors.invalid.serum.mismatch.info"));
|
||||
}
|
||||
final IIndividual individual = genes[0].getSpeciesRoot().getMember(target);
|
||||
boolean hasAll = true;
|
||||
for (final IGene gene : genes) {
|
||||
if (hasAll) {
|
||||
final IAllele a = individual.getGenome().getActiveAllele(gene.getChromosome());
|
||||
final IAllele b = individual.getGenome().getInactiveAllele(gene.getChromosome());
|
||||
hasAll = (hasAll && a.getUID().equals(gene.getAllele().getUID()) && b.getUID().equals(gene.getAllele().getUID()));
|
||||
final IAllele a = individual.getGenome().getActiveAllele(gene.getChromosome());
|
||||
final IAllele b = individual.getGenome().getInactiveAllele(gene.getChromosome());
|
||||
if (!a.getUID().equals(gene.getAllele().getUID()) || !b.getUID().equals(gene.getAllele().getUID())) {
|
||||
return null;
|
||||
}
|
||||
}
|
||||
if (hasAll) {
|
||||
return new ErrorState(Genetics.proxy.localise("genetics.machine.errors.defunct.serum.desc"), Genetics.proxy.localise("genetics.machine.errors.defunct.serum.info"));
|
||||
}
|
||||
return null;
|
||||
return new ErrorState(Genetics.proxy.localise("genetics.machine.errors.defunct.serum.desc"), Genetics.proxy.localise("genetics.machine.errors.defunct.serum.info"));
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -101,27 +115,39 @@ public class InoculatorLogic extends ComponentProcessSetCost implements IProcess
|
||||
@Override
|
||||
protected void onFinishTask() {
|
||||
super.onFinishTask();
|
||||
final ItemStack serum = this.getUtil().getStack(Inoculator.SLOT_SERUM_VIAL);
|
||||
final ItemStack target = this.getUtil().getStack(Inoculator.SLOT_TARGET);
|
||||
final IIndividual ind = AlleleManager.alleleRegistry.getIndividual(target);
|
||||
MachineUtil util = this.getUtil();
|
||||
|
||||
final ItemStack serum = util.getStack(Inoculator.SLOT_SERUM_VIAL);
|
||||
final ItemStack target = util.getStack(Inoculator.SLOT_TARGET);
|
||||
|
||||
ItemStack applied = applySerum(target, serum);
|
||||
util.setStack(Inoculator.SLOT_TARGET, applied);
|
||||
util.damageItem(Inoculator.SLOT_SERUM_VIAL, 1);
|
||||
}
|
||||
|
||||
public static ItemStack applySerum(ItemStack target, ItemStack serum) {
|
||||
ItemStack applied = target.copy();
|
||||
final IIndividual ind = AlleleManager.alleleRegistry.getIndividual(applied);
|
||||
if (!ind.isAnalyzed()) {
|
||||
ind.analyze();
|
||||
final NBTTagCompound nbttagcompound = new NBTTagCompound();
|
||||
ind.writeToNBT(nbttagcompound);
|
||||
target.setTagCompound(nbttagcompound);
|
||||
applied.setTagCompound(nbttagcompound);
|
||||
}
|
||||
final IGene[] arr$;
|
||||
final IGene[] genes = arr$ = ((IItemSerum) serum.getItem()).getGenes(serum);
|
||||
for (final IGene gene : arr$) {
|
||||
Inoculator.setGene(gene, target, 0);
|
||||
Inoculator.setGene(gene, target, 1);
|
||||
final IGene[] genes = ((IItemSerum) serum.getItem()).getGenes(serum);
|
||||
for (final IGene gene : genes) {
|
||||
Inoculator.setGene(gene, applied, 0);
|
||||
Inoculator.setGene(gene, applied, 1);
|
||||
}
|
||||
this.getUtil().damageItem(Inoculator.SLOT_SERUM_VIAL, 1);
|
||||
if (applied.getItemDamage() == OreDictionary.WILDCARD_VALUE) {
|
||||
applied.setItemDamage(0);
|
||||
}
|
||||
return applied;
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void onTickTask() {
|
||||
this.bacteriaDrain += 15.0f * this.getProgressPerTick() / 100.0f;
|
||||
this.bacteriaDrain += BACTERIA_PER_PROCESS / (float) this.getProcessLength();
|
||||
if (this.bacteriaDrain >= 1.0f) {
|
||||
this.getUtil().drainTank(Inoculator.TANK_VEKTOR, 1);
|
||||
--this.bacteriaDrain;
|
||||
|
||||
Reference in new issue
Block a user