mirror of
https://github.com/GTNewHorizons/Binnie.git
synced 2026-11-18 03:25:07 +00:00
Update JEI integration
This commit is contained in:
1 parent
2c277cc311
commit
c6ee1184ff
6 files changed
+21
-78
No files matched your search
@@ -55,7 +55,8 @@ import java.util.List;
|
||||
name = "Binnie Core",
|
||||
useMetadata = true,
|
||||
dependencies = "required-after:forge@[13.20.0.2230,);" +
|
||||
"required-after:forestry@[5.3.2.68,);"
|
||||
"required-after:forestry@[5.3.2.68,);" +
|
||||
"after:jei@[4.3.0,);"
|
||||
)
|
||||
public final class BinnieCore extends AbstractMod {
|
||||
|
||||
|
||||
@@ -1,19 +1,14 @@
|
||||
package binnie.extratrees.integration.jei;
|
||||
|
||||
import binnie.core.integration.jei.Drawables;
|
||||
import binnie.core.integration.jei.SimpleRecipeHandler;
|
||||
import binnie.extratrees.integration.jei.brewery.BreweryRecipeCategory;
|
||||
import binnie.extratrees.integration.jei.brewery.BreweryRecipeMaker;
|
||||
import binnie.extratrees.integration.jei.brewery.BreweryRecipeWrapper;
|
||||
import binnie.extratrees.integration.jei.distillery.brewery.DistilleryRecipeCategory;
|
||||
import binnie.extratrees.integration.jei.distillery.brewery.DistilleryRecipeMaker;
|
||||
import binnie.extratrees.integration.jei.distillery.brewery.DistilleryRecipeWrapper;
|
||||
import binnie.extratrees.integration.jei.fruitpress.FruitPressRecipeCategory;
|
||||
import binnie.extratrees.integration.jei.fruitpress.FruitPressRecipeMaker;
|
||||
import binnie.extratrees.integration.jei.fruitpress.FruitPressRecipeWrapper;
|
||||
import binnie.extratrees.integration.jei.lumbermill.LumbermillRecipeCategory;
|
||||
import binnie.extratrees.integration.jei.lumbermill.LumbermillRecipeMaker;
|
||||
import binnie.extratrees.integration.jei.lumbermill.LumbermillRecipeWrapper;
|
||||
import binnie.extratrees.machines.ExtraTreeMachine;
|
||||
import mezz.jei.api.BlankModPlugin;
|
||||
import mezz.jei.api.IGuiHelper;
|
||||
@@ -46,21 +41,14 @@ public class ExtraTreesJeiPlugin extends BlankModPlugin {
|
||||
new DistilleryRecipeCategory()
|
||||
);
|
||||
|
||||
registry.addRecipeHandlers(
|
||||
new SimpleRecipeHandler<>(LumbermillRecipeWrapper.class, RecipeUids.LUMBERMILL),
|
||||
new SimpleRecipeHandler<>(FruitPressRecipeWrapper.class, RecipeUids.FRUIT_PRESS),
|
||||
new SimpleRecipeHandler<>(BreweryRecipeWrapper.class, RecipeUids.BREWING),
|
||||
new SimpleRecipeHandler<>(DistilleryRecipeWrapper.class, RecipeUids.DISTILLING)
|
||||
);
|
||||
|
||||
registry.addRecipeCategoryCraftingItem(ExtraTreeMachine.Lumbermill.get(1), RecipeUids.LUMBERMILL);
|
||||
registry.addRecipeCategoryCraftingItem(ExtraTreeMachine.Press.get(1), RecipeUids.FRUIT_PRESS);
|
||||
registry.addRecipeCategoryCraftingItem(ExtraTreeMachine.Brewery.get(1), RecipeUids.BREWING);
|
||||
registry.addRecipeCategoryCraftingItem(ExtraTreeMachine.Distillery.get(1), RecipeUids.DISTILLING);
|
||||
|
||||
registry.addRecipes(LumbermillRecipeMaker.create());
|
||||
registry.addRecipes(FruitPressRecipeMaker.create());
|
||||
registry.addRecipes(BreweryRecipeMaker.create());
|
||||
registry.addRecipes(DistilleryRecipeMaker.create());
|
||||
registry.addRecipes(LumbermillRecipeMaker.create(), RecipeUids.LUMBERMILL);
|
||||
registry.addRecipes(FruitPressRecipeMaker.create(), RecipeUids.FRUIT_PRESS);
|
||||
registry.addRecipes(BreweryRecipeMaker.create(), RecipeUids.BREWING);
|
||||
registry.addRecipes(DistilleryRecipeMaker.create(), RecipeUids.DISTILLING);
|
||||
}
|
||||
}
|
||||
@@ -1,34 +1,26 @@
|
||||
package binnie.genetics.integration.jei;
|
||||
|
||||
import binnie.core.integration.jei.Drawables;
|
||||
import binnie.core.integration.jei.SimpleRecipeHandler;
|
||||
import binnie.genetics.Genetics;
|
||||
import binnie.genetics.api.IIncubatorRecipe;
|
||||
import binnie.genetics.api.IItemChargeable;
|
||||
import binnie.genetics.integration.jei.database.DatabaseRecipeCategory;
|
||||
import binnie.genetics.integration.jei.database.DatabaseRecipeMaker;
|
||||
import binnie.genetics.integration.jei.database.DatabaseRecipeWrapper;
|
||||
import binnie.genetics.integration.jei.genepool.GenepoolRecipeCategory;
|
||||
import binnie.genetics.integration.jei.genepool.GenepoolRecipeMaker;
|
||||
import binnie.genetics.integration.jei.genepool.GenepoolRecipeWrapper;
|
||||
import binnie.genetics.integration.jei.incubator.IncubatorRecipeCategory;
|
||||
import binnie.genetics.integration.jei.incubator.IncubatorRecipeHandler;
|
||||
import binnie.genetics.integration.jei.incubator.IncubatorRecipeWrapper;
|
||||
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.inoculator.SplicerRecipeCategory;
|
||||
import binnie.genetics.integration.jei.inoculator.SplicerRecipeWrapper;
|
||||
import binnie.genetics.integration.jei.isolator.IsolatorRecipeCategory;
|
||||
import binnie.genetics.integration.jei.isolator.IsolatorRecipeMaker;
|
||||
import binnie.genetics.integration.jei.isolator.IsolatorRecipeWrapper;
|
||||
import binnie.genetics.integration.jei.polymeriser.PolymeriserRecipeCategory;
|
||||
import binnie.genetics.integration.jei.polymeriser.PolymeriserRecipeMaker;
|
||||
import binnie.genetics.integration.jei.polymeriser.PolymeriserRecipeWrapper;
|
||||
import binnie.genetics.integration.jei.sequencer.SequencerRecipeCategory;
|
||||
import binnie.genetics.integration.jei.sequencer.SequencerRecipeMaker;
|
||||
import binnie.genetics.integration.jei.sequencer.SequencerRecipeWrapper;
|
||||
import binnie.genetics.item.ModuleItems;
|
||||
import binnie.genetics.machine.AdvGeneticMachine;
|
||||
import binnie.genetics.machine.GeneticMachine;
|
||||
@@ -82,18 +74,6 @@ public class GeneticsJeiPlugin extends BlankModPlugin {
|
||||
new DatabaseRecipeCategory()
|
||||
);
|
||||
|
||||
registry.addRecipeHandlers(
|
||||
new IncubatorRecipeHandler(),
|
||||
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<>(InoculatorRecipeWrapper.class, RecipeUids.INOCULATOR),
|
||||
new SimpleRecipeHandler<>(SplicerRecipeWrapper.class, RecipeUids.SPLICER),
|
||||
new SimpleRecipeHandler<>(GenepoolRecipeWrapper.class, RecipeUids.GENEPOOL),
|
||||
new SimpleRecipeHandler<>(DatabaseRecipeWrapper.class, RecipeUids.DATABASE)
|
||||
);
|
||||
|
||||
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);
|
||||
@@ -104,14 +84,16 @@ public class GeneticsJeiPlugin extends BlankModPlugin {
|
||||
registry.addRecipeCategoryCraftingItem(new ItemStack(Genetics.items().database), RecipeUids.DATABASE);
|
||||
registry.addRecipeCategoryCraftingItem(new ItemStack(Genetics.items().database, 1, 1), RecipeUids.DATABASE);
|
||||
|
||||
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());
|
||||
registry.addRecipes(GenepoolRecipeMaker.create());
|
||||
registry.addRecipes(DatabaseRecipeMaker.create());
|
||||
registry.addRecipes(Incubator.getRecipes(), RecipeUids.INCUBATOR);
|
||||
registry.addRecipes(LarvaeIncubatorRecipeMaker.create(Incubator.getLarvaeRecipe()), RecipeUids.INCUBATOR);
|
||||
registry.addRecipes(IsolatorRecipeMaker.create(), RecipeUids.ISOLATOR);
|
||||
registry.addRecipes(PolymeriserRecipeMaker.create(), RecipeUids.POLYMERISER);
|
||||
registry.addRecipes(SequencerRecipeMaker.create(), RecipeUids.SEQUENCER);
|
||||
registry.addRecipes(InoculatorRecipeMaker.create(), RecipeUids.INOCULATOR);
|
||||
registry.addRecipes(GenepoolRecipeMaker.create(), RecipeUids.GENEPOOL);
|
||||
registry.addRecipes(DatabaseRecipeMaker.create(), RecipeUids.DATABASE);
|
||||
|
||||
registry.handleRecipes(IIncubatorRecipe.class, IncubatorRecipeWrapper::new, RecipeUids.INCUBATOR);
|
||||
}
|
||||
|
||||
private static class ChargeableSubtypeInterpreter implements ISubtypeRegistry.ISubtypeInterpreter {
|
||||
|
||||
@@ -1,29 +0,0 @@
|
||||
package binnie.genetics.integration.jei.incubator;
|
||||
|
||||
import binnie.genetics.api.IIncubatorRecipe;
|
||||
import binnie.genetics.integration.jei.RecipeUids;
|
||||
import binnie.genetics.machine.incubator.IncubatorRecipeLarvae;
|
||||
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(IIncubatorRecipe recipe) {
|
||||
return RecipeUids.INCUBATOR;
|
||||
}
|
||||
|
||||
@Override
|
||||
public IRecipeWrapper getRecipeWrapper(IIncubatorRecipe recipe) {
|
||||
return new IncubatorRecipeWrapper(recipe);
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean isRecipeValid(IIncubatorRecipe recipe) {
|
||||
return !(recipe instanceof IncubatorRecipeLarvae);
|
||||
}
|
||||
}
|
||||
@@ -27,6 +27,7 @@ public class Incubator {
|
||||
public static final int TANK_INPUT = 0;
|
||||
public static final int TANK_OUTPUT = 1;
|
||||
private static List<IIncubatorRecipe> RECIPES = new ArrayList<>();
|
||||
@Nullable
|
||||
private static IncubatorRecipeLarvae LARVAE_RECIPE;
|
||||
|
||||
public static void addRecipes() {
|
||||
|
||||
Reference in new issue
Block a user