Merge branch 'master-MC1.10.2' of https://github.com/ForestryMC/Binnie into master-MC1.10.2

This commit is contained in:
marcin212 committed 2016-10-21 10:37:23 +02:00
commit a7af5980a1
10 files changed
+288 -139

No files matched your search

@@ -4,16 +4,21 @@ import binnie.core.machines.MachineUtil;
import net.minecraft.item.ItemStack;
import net.minecraftforge.fluids.FluidStack;
import java.util.List;
public interface IIncubatorRecipe {
boolean isInputLiquid(final FluidStack p0);
boolean isInputLiquidSufficient(final FluidStack p0);
boolean isItemStack(final ItemStack p0);
void doTask(final MachineUtil p0);
float getChance();
boolean roomForOutput(final MachineUtil p0);
FluidStack getInput();
FluidStack getOutput();
List<ItemStack> getValidItemStacks();
}
@@ -0,0 +1,32 @@
package binnie.genetics.integration.jei;
import binnie.genetics.integration.jei.incubator.IncubatorRecipeCategory;
import binnie.genetics.integration.jei.incubator.IncubatorRecipeHandler;
import binnie.genetics.machine.Incubator;
import mezz.jei.api.BlankModPlugin;
import mezz.jei.api.IGuiHelper;
import mezz.jei.api.IJeiHelpers;
import mezz.jei.api.IModRegistry;
import mezz.jei.api.JEIPlugin;
@JEIPlugin
public class GeneticsJeiPlugin extends BlankModPlugin {
public static IJeiHelpers jeiHelpers;
public static IGuiHelper guiHelper;
@Override
public void register(IModRegistry registry) {
GeneticsJeiPlugin.jeiHelpers = registry.getJeiHelpers();
GeneticsJeiPlugin.guiHelper = jeiHelpers.getGuiHelper();
registry.addRecipeCategories(
new IncubatorRecipeCategory()
);
registry.addRecipeHandlers(
new IncubatorRecipeHandler()
);
registry.addRecipes(Incubator.getRecipes());
}
}
@@ -0,0 +1,5 @@
package binnie.genetics.integration.jei;
public class RecipeUids {
public static final String INCUBATOR = "binnie.genetics.incubator";
}
@@ -0,0 +1,40 @@
package binnie.genetics.integration.jei.incubator;
import binnie.genetics.integration.jei.GeneticsJeiPlugin;
import binnie.genetics.integration.jei.RecipeUids;
import binnie.genetics.machine.Incubator;
import mezz.jei.api.gui.IDrawable;
import mezz.jei.api.gui.IRecipeLayout;
import mezz.jei.api.ingredients.IIngredients;
import mezz.jei.api.recipe.BlankRecipeCategory;
import mezz.jei.api.recipe.IRecipeWrapper;
import net.minecraft.client.Minecraft;
public class IncubatorRecipeCategory extends BlankRecipeCategory {
@Override
public String getUid() {
return RecipeUids.INCUBATOR;
}
@Override
public String getTitle() {
return "Incubation";
}
@Override
public IDrawable getBackground() {
return GeneticsJeiPlugin.guiHelper.createBlankDrawable(60, 60);
}
@Override
public void drawExtras(Minecraft minecraft) {
super.drawExtras(minecraft);
}
@Override
public void setRecipe(IRecipeLayout recipeLayout, IRecipeWrapper recipeWrapper, IIngredients ingredients) {
recipeLayout.getFluidStacks().init(Incubator.tankInput, true, 0, 0, 16, 59, 10000, true, null);
recipeLayout.getFluidStacks().init(Incubator.tankOutput, false, 32, 0, 16, 59, 10000, true, null);
recipeLayout.getFluidStacks().set(ingredients);
}
}
@@ -0,0 +1,33 @@
package binnie.genetics.integration.jei.incubator;
import binnie.genetics.api.IIncubatorRecipe;
import binnie.genetics.integration.jei.RecipeUids;
import mezz.jei.api.recipe.IRecipeHandler;
import mezz.jei.api.recipe.IRecipeWrapper;
public class IncubatorRecipeHandler implements IRecipeHandler<IIncubatorRecipe> {
@Override
public Class<IIncubatorRecipe> getRecipeClass() {
return IIncubatorRecipe.class;
}
@Override
public String getRecipeCategoryUid() {
return RecipeUids.INCUBATOR;
}
@Override
public String getRecipeCategoryUid(IIncubatorRecipe recipe) {
return RecipeUids.INCUBATOR;
}
@Override
public IRecipeWrapper getRecipeWrapper(IIncubatorRecipe recipe) {
return new IncubatorRecipeWrapper(recipe);
}
@Override
public boolean isRecipeValid(IIncubatorRecipe recipe) {
return true;
}
}
@@ -0,0 +1,20 @@
package binnie.genetics.integration.jei.incubator;
import binnie.genetics.api.IIncubatorRecipe;
import mezz.jei.api.ingredients.IIngredients;
import mezz.jei.api.recipe.BlankRecipeWrapper;
import net.minecraftforge.fluids.FluidStack;
public class IncubatorRecipeWrapper extends BlankRecipeWrapper {
private final IIncubatorRecipe recipe;
public IncubatorRecipeWrapper(IIncubatorRecipe recipe) {
this.recipe = recipe;
}
@Override
public void getIngredients(IIngredients ingredients) {
ingredients.setInput(FluidStack.class, recipe.getInput());
ingredients.setOutput(FluidStack.class, recipe.getOutput());
}
}
@@ -0,0 +1,7 @@
@ParametersAreNonnullByDefault
@MethodsReturnNonnullByDefault
package binnie.genetics.integration.jei.incubator;
import mcp.MethodsReturnNonnullByDefault;
import javax.annotation.ParametersAreNonnullByDefault;
@@ -0,0 +1,7 @@
@ParametersAreNonnullByDefault
@MethodsReturnNonnullByDefault
package binnie.genetics.integration.jei;
import mcp.MethodsReturnNonnullByDefault;
import javax.annotation.ParametersAreNonnullByDefault;
@@ -2,6 +2,7 @@ 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;
@@ -27,6 +28,7 @@ import net.minecraft.tileentity.TileEntity;
import net.minecraftforge.fluids.FluidStack;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.Random;
@@ -39,61 +41,17 @@ public class Incubator {
private static List<IIncubatorRecipe> RECIPES;
public static void addRecipes() {
Incubator.RECIPES.add(new IncubatorRecipe(Binnie.Liquid.getLiquidStack("water", 25), GeneticLiquid.GrowthMedium.get(25), 0.2f) {
@Override
public boolean isItemStack(final ItemStack stack) {
return ItemStack.areItemsEqual(GeneticsItems.GrowthMedium.get(1), stack);
}
});
Incubator.RECIPES.add(new IncubatorRecipe(GeneticLiquid.GrowthMedium.get(25), GeneticLiquid.Bacteria.get(5), 0.2f) {
@Override
public boolean isItemStack(final ItemStack stack) {
return new ItemStack(Items.WHEAT).isItemEqual(stack);
}
});
Incubator.RECIPES.add(new IncubatorRecipe(GeneticLiquid.Bacteria.get(0), GeneticLiquid.Bacteria.get(5), 0.05f) {
@Override
public boolean isItemStack(final ItemStack stack) {
return ItemStack.areItemsEqual(GeneticsItems.GrowthMedium.get(1), stack);
}
});
Incubator.RECIPES.add(new IncubatorRecipe(GeneticLiquid.Bacteria.get(2), null, 0.5f, 0.2f) {
@Override
public boolean isItemStack(final ItemStack stack) {
return stack.getItem() == Items.SUGAR;
}
}.setOutputStack(GeneticsItems.Enzyme.get(1)));
Incubator.RECIPES.add(new IncubatorRecipe(GeneticLiquid.BacteriaPoly.get(0), GeneticLiquid.BacteriaPoly.get(5), 0.05f) {
@Override
public boolean isItemStack(final ItemStack stack) {
return ItemStack.areItemsEqual(GeneticsItems.GrowthMedium.get(1), stack);
}
});
Incubator.RECIPES.add(new IncubatorRecipe(GeneticLiquid.BacteriaVector.get(0), GeneticLiquid.BacteriaVector.get(5), 0.05f) {
@Override
public boolean isItemStack(final ItemStack stack) {
return ItemStack.areItemsEqual(GeneticsItems.GrowthMedium.get(1), stack);
}
});
Incubator.RECIPES.add(new IncubatorRecipe(GeneticLiquid.Bacteria.get(10), GeneticLiquid.BacteriaPoly.get(10), 0.1f) {
@Override
public boolean isItemStack(final ItemStack stack) {
return new ItemStack(Items.DYE, 1, 15).isItemEqual(stack);
}
});
Incubator.RECIPES.add(new IncubatorRecipe(GeneticLiquid.Bacteria.get(10), GeneticLiquid.BacteriaVector.get(10), 0.05f) {
@Override
public boolean isItemStack(final ItemStack stack) {
return new ItemStack(Items.BLAZE_POWDER).isItemEqual(stack);
}
});
Incubator.RECIPES.add(new IncubatorRecipe(GeneticsItems.GrowthMedium.get(1), Binnie.Liquid.getLiquidStack("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(new IncubatorRecipe(GeneticLiquid.GrowthMedium.get(50), null, 1.0f, 0.05f) {
@Override
public boolean isItemStack(final ItemStack stack) {
return Binnie.Genetics.getBeeRoot().isMember(stack) && Binnie.Genetics.getBeeRoot().getType(stack) == EnumBeeType.LARVAE;
}
Incubator.RECIPES.add(new IncubatorRecipe(Mods.Forestry.stack("beeLarvaeGE"), GeneticLiquid.GrowthMedium.get(50), null, 1.0f, 0.05f) {
@Override
public ItemStack getOutputStack(final MachineUtil machine) {
final ItemStack larvae = machine.getStack(3);
@@ -104,6 +62,10 @@ public class Incubator {
}
}
public static List<IIncubatorRecipe> getRecipes() {
return Collections.unmodifiableList(RECIPES);
}
static {
slotQueue = new int[]{0, 1, 2};
slotOutput = new int[]{4, 5, 6};
@@ -196,7 +158,7 @@ public class Incubator {
private IIncubatorRecipe getRecipe(final ItemStack stack, final FluidStack liquid) {
for (final IIncubatorRecipe recipe : Incubator.RECIPES) {
final boolean rightLiquid = recipe.isInputLiquid(liquid);
final boolean rightItem = recipe.isItemStack(stack);
final boolean rightItem = isStackValid(stack, recipe);
if (rightLiquid && rightItem) {
return recipe;
}
@@ -204,6 +166,15 @@ public class Incubator {
return null;
}
private static boolean isStackValid(ItemStack stack, IIncubatorRecipe recipe) {
for (ItemStack validItemStack : recipe.getValidItemStacks()) {
if (ItemStack.areItemsEqual(validItemStack, stack)) {
return true;
}
}
return false;
}
@Override
public void onInventoryUpdate() {
super.onInventoryUpdate();
@@ -212,7 +183,7 @@ public class Incubator {
}
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) || !this.recipe.isItemStack(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.slotOutput).ignoreValidation().transfer(true);
this.getUtil().setStack(3, leftover);
@@ -236,7 +207,7 @@ public class Incubator {
if (potential == null) {
for (final IIncubatorRecipe recipe2 : Incubator.RECIPES) {
final boolean rightLiquid = recipe2.isInputLiquid(liquid);
final boolean rightItem = recipe2.isItemStack(stack);
final boolean rightItem = isStackValid(stack, recipe2);
if (rightLiquid && rightItem) {
potential = recipe2;
potentialSlot = slot;
@@ -268,84 +239,4 @@ public class Incubator {
FluidStack fluid;
}
private abstract static class IncubatorRecipe implements IIncubatorRecipe {
FluidStack input;
FluidStack output;
float lossChance;
ItemStack outputStack;
float tickChance;
@Override
public float getChance() {
return this.tickChance;
}
public IncubatorRecipe(final FluidStack input, final FluidStack output, final float lossChance) {
this(input, output, lossChance, 1.0f);
}
public IncubatorRecipe(final FluidStack input, final FluidStack output, final float lossChance, final float chance) {
this.input = input;
this.output = output;
this.lossChance = lossChance;
this.tickChance = chance;
}
@Override
public boolean isInputLiquid(final FluidStack fluid) {
return fluid != null && this.input.isFluidEqual(fluid);
}
@Override
public boolean isInputLiquidSufficient(final FluidStack fluid) {
return fluid != null && fluid.amount >= 500;
}
@Override
public void doTask(final MachineUtil machine) {
machine.drainTank(0, this.input.amount);
if (this.output != null) {
machine.fillTank(1, 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();
product.transfer(true);
}
final Random rand = machine.getRandom();
if (rand.nextFloat() < this.lossChance) {
machine.decreaseStack(3, 1);
}
}
public IncubatorRecipe setOutputStack(final ItemStack stack) {
this.outputStack = stack;
return this;
}
protected ItemStack getOutputStack(final MachineUtil util) {
return this.outputStack;
}
@Override
public boolean roomForOutput(final MachineUtil machine) {
if (this.output != null && !machine.isTankEmpty(1)) {
if (!machine.getFluid(1).isFluidEqual(this.output)) {
return false;
}
if (!machine.spaceInTank(1, 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 ItemStack leftover = product.transfer(false);
return leftover == null;
}
return true;
}
}
}
@@ -0,0 +1,109 @@
package binnie.genetics.machine;
import binnie.core.machines.MachineUtil;
import binnie.core.machines.transfer.TransferRequest;
import binnie.genetics.api.IIncubatorRecipe;
import net.minecraft.item.ItemStack;
import net.minecraftforge.fluids.FluidStack;
import java.util.Collections;
import java.util.List;
import java.util.Random;
public class IncubatorRecipe implements IIncubatorRecipe {
private final FluidStack input;
private final FluidStack output;
private final List<ItemStack> itemStacks;
private final float lossChance;
private final float tickChance;
private ItemStack outputStack;
public IncubatorRecipe(ItemStack itemStack, final FluidStack input, final FluidStack output, final float lossChance) {
this(itemStack, input, output, lossChance, 1.0f);
}
public IncubatorRecipe(ItemStack itemStack, final FluidStack input, final FluidStack output, final float lossChance, final float chance) {
this.itemStacks = Collections.singletonList(itemStack);
this.input = input;
this.output = output;
this.lossChance = lossChance;
this.tickChance = chance;
}
@Override
public float getChance() {
return this.tickChance;
}
@Override
public boolean isInputLiquid(final FluidStack fluid) {
return fluid != null && this.input.isFluidEqual(fluid);
}
@Override
public boolean isInputLiquidSufficient(final FluidStack fluid) {
return fluid != null && fluid.amount >= 500;
}
@Override
public FluidStack getInput() {
return input;
}
@Override
public FluidStack getOutput() {
return output;
}
@Override
public List<ItemStack> getValidItemStacks() {
return Collections.unmodifiableList(itemStacks);
}
@Override
public void doTask(final MachineUtil machine) {
machine.drainTank(0, this.input.amount);
if (this.output != null) {
machine.fillTank(1, 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();
product.transfer(true);
}
final Random rand = machine.getRandom();
if (rand.nextFloat() < this.lossChance) {
machine.decreaseStack(3, 1);
}
}
public IncubatorRecipe setOutputStack(final ItemStack stack) {
this.outputStack = stack;
return this;
}
protected ItemStack getOutputStack(final MachineUtil util) {
return this.outputStack;
}
@Override
public boolean roomForOutput(final MachineUtil machine) {
if (this.output != null && !machine.isTankEmpty(1)) {
if (!machine.getFluid(1).isFluidEqual(this.output)) {
return false;
}
if (!machine.spaceInTank(1, 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 ItemStack leftover = product.transfer(false);
return leftover == null;
}
return true;
}
}