From b10a642297704fe6b95c6470cb126e8c9f0573bc Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sun, 3 Jan 2016 22:02:02 -0600 Subject: [PATCH 1/7] Brewery recipe support --- build.gradle | 6 ++ .../integration/jei/JEIBotaniaPlugin.java | 63 ++++++++++++++ .../jei/brewery/BreweryRecipeCategory.java | 87 +++++++++++++++++++ .../jei/brewery/BreweryRecipeHandler.java | 34 ++++++++ .../jei/brewery/BreweryRecipeWrapper.java | 58 +++++++++++++ 5 files changed, 248 insertions(+) create mode 100644 src/main/java/vazkii/botania/client/integration/jei/JEIBotaniaPlugin.java create mode 100644 src/main/java/vazkii/botania/client/integration/jei/brewery/BreweryRecipeCategory.java create mode 100644 src/main/java/vazkii/botania/client/integration/jei/brewery/BreweryRecipeHandler.java create mode 100644 src/main/java/vazkii/botania/client/integration/jei/brewery/BreweryRecipeWrapper.java diff --git a/build.gradle b/build.gradle index c307243fb..48540666b 100644 --- a/build.gradle +++ b/build.gradle @@ -21,6 +21,9 @@ repositories { name = "chickenbones" url = "http://chickenbones.net/maven/" } + maven { + url "http://dvs1.progwml6.com/files/maven" + } } apply plugin: 'net.minecraftforge.gradle.forge' @@ -46,6 +49,7 @@ minecraft { replace 'GRADLE:VERSION', config.version replaceIn 'LibMisc.java' //I may have missed another file, though I can only find it in here. + useDepAts = true } //This here is for SCP @@ -67,6 +71,8 @@ dependencies { //compile "codechicken:NotEnoughItems:1.8-1.0.5.104:dev" //compile "codechicken:ForgeMultipart:1.7.10-1.1.1.320:dev" + deobfCompile "mezz.jei:jei_1.8.9:2.13.7.64" + //and a bit more for SCP sshAntTask "org.apache.ant:ant-jsch:1.7.1", "jsch:jsch:0.1.29" } diff --git a/src/main/java/vazkii/botania/client/integration/jei/JEIBotaniaPlugin.java b/src/main/java/vazkii/botania/client/integration/jei/JEIBotaniaPlugin.java new file mode 100644 index 000000000..3c7ada357 --- /dev/null +++ b/src/main/java/vazkii/botania/client/integration/jei/JEIBotaniaPlugin.java @@ -0,0 +1,63 @@ +/** + * This class was created by . It's distributed as + * part of the Botania Mod. Get the Source Code in github: + * https://github.com/Vazkii/Botania + * + * Botania is Open Source and distributed under the + * Botania License: http://botaniamod.net/license.php + * + * File Created @ [Jan 3, 2016, 2:32:39 AM (GMT)] + */ + +package vazkii.botania.client.integration.jei; + +import mezz.jei.api.IItemRegistry; +import mezz.jei.api.IJeiHelpers; +import mezz.jei.api.IModPlugin; +import mezz.jei.api.IModRegistry; +import mezz.jei.api.IRecipeRegistry; +import mezz.jei.api.JEIPlugin; +import vazkii.botania.api.BotaniaAPI; +import vazkii.botania.client.integration.jei.brewery.BreweryRecipeCategory; +import vazkii.botania.client.integration.jei.brewery.BreweryRecipeHandler; + +@JEIPlugin +public class JEIBotaniaPlugin implements IModPlugin { + + private IJeiHelpers jeiHelpers; + private IItemRegistry itemRegistry; + + @Override + public boolean isModLoaded() { + return true; + } + + @Override + public void onJeiHelpersAvailable(IJeiHelpers jeiHelpers) { + this.jeiHelpers = jeiHelpers; + } + + @Override + public void onItemRegistryAvailable(IItemRegistry itemRegistry) { + this.itemRegistry = itemRegistry; + } + + @Override + public void register(IModRegistry registry) { + registry.addRecipeCategories( + new BreweryRecipeCategory(jeiHelpers.getGuiHelper()) + ); + + registry.addRecipeHandlers( + new BreweryRecipeHandler() + ); + + registry.addRecipes(BotaniaAPI.brewRecipes); + } + + @Override + public void onRecipeRegistryAvailable(IRecipeRegistry recipeRegistry) { + + } + +} diff --git a/src/main/java/vazkii/botania/client/integration/jei/brewery/BreweryRecipeCategory.java b/src/main/java/vazkii/botania/client/integration/jei/brewery/BreweryRecipeCategory.java new file mode 100644 index 000000000..5ac5f76ff --- /dev/null +++ b/src/main/java/vazkii/botania/client/integration/jei/brewery/BreweryRecipeCategory.java @@ -0,0 +1,87 @@ +package vazkii.botania.client.integration.jei.brewery; + +import mezz.jei.api.IGuiHelper; +import mezz.jei.api.gui.IDrawable; +import mezz.jei.api.gui.IDrawableStatic; +import mezz.jei.api.gui.IRecipeLayout; +import mezz.jei.api.recipe.IRecipeCategory; +import mezz.jei.api.recipe.IRecipeWrapper; +import net.minecraft.client.Minecraft; +import net.minecraft.item.ItemStack; +import net.minecraft.util.ResourceLocation; +import net.minecraft.util.StatCollector; + +import javax.annotation.Nonnull; +import java.util.Collection; +import java.util.List; + +public class BreweryRecipeCategory implements IRecipeCategory { + + private final IDrawableStatic background; + private final String localizedName; + + private static final int slotContainerInput = 0; + private static final int slotIngredient1 = 1; + private static final int slotIngredient2 = 2; + private static final int slotIngredient3 = 3; + private static final int slotIngredient4 = 4; + private static final int slotIngredient5 = 5; + private static final int slotIngredient6 = 6; + private static final int slotOutput = 7; + + public BreweryRecipeCategory(IGuiHelper guiHelper) { + ResourceLocation location = new ResourceLocation("botania", "textures/gui/neiBrewery.png"); + background = guiHelper.createDrawable(location, 0, 0, 166, 65, 0, 0, 0, 0); + localizedName = StatCollector.translateToLocal("botania.nei.brewery"); + } + + @Nonnull + @Override + public String getUid() { + return "botania.brewery"; + } + + @Nonnull + @Override + public String getTitle() { + return localizedName; + } + + @Nonnull + @Override + public IDrawable getBackground() { + return background; + } + + @Override + public void drawExtras(Minecraft minecraft) {} + + @Override + public void drawAnimations(Minecraft minecraft) {} + + @Override + public void setRecipe(@Nonnull IRecipeLayout recipeLayout, @Nonnull IRecipeWrapper recipeWrapper) { + recipeLayout.getItemStacks().init(slotContainerInput, true, 39, 41); + recipeLayout.getItemStacks().init(slotIngredient1, true, 64, 6); + recipeLayout.getItemStacks().init(slotIngredient2, true, 80, 6); + recipeLayout.getItemStacks().init(slotIngredient3, true, 96, 6); + recipeLayout.getItemStacks().init(slotIngredient4, true, 112, 6); + recipeLayout.getItemStacks().init(slotIngredient5, true, 128, 6); + recipeLayout.getItemStacks().init(slotIngredient6, true, 144, 6); + recipeLayout.getItemStacks().init(slotOutput, false, 87, 41); // todo coords + + BreweryRecipeWrapper wrapper = ((BreweryRecipeWrapper) recipeWrapper); + List inputs = wrapper.getInputs(); + for (int i = 0; i < inputs.size(); i++) { + if (i > slotOutput) { + break; + } + if (inputs.get(i) instanceof ItemStack) { + recipeLayout.getItemStacks().set(i, ((ItemStack) inputs.get(i))); + } else if (inputs.get(i) instanceof Collection) { + recipeLayout.getItemStacks().set(i, ((Collection) inputs.get(i))); + } + } + recipeLayout.getItemStacks().set(slotOutput, wrapper.getOutputs().get(0)); + } +} diff --git a/src/main/java/vazkii/botania/client/integration/jei/brewery/BreweryRecipeHandler.java b/src/main/java/vazkii/botania/client/integration/jei/brewery/BreweryRecipeHandler.java new file mode 100644 index 000000000..ea218cfa7 --- /dev/null +++ b/src/main/java/vazkii/botania/client/integration/jei/brewery/BreweryRecipeHandler.java @@ -0,0 +1,34 @@ +package vazkii.botania.client.integration.jei.brewery; + +import mezz.jei.api.recipe.IRecipeHandler; +import mezz.jei.api.recipe.IRecipeWrapper; +import vazkii.botania.api.recipe.RecipeBrew; + +import javax.annotation.Nonnull; + +public class BreweryRecipeHandler implements IRecipeHandler { + + @Nonnull + @Override + public Class getRecipeClass() { + return RecipeBrew.class; + } + + @Nonnull + @Override + public String getRecipeCategoryUid() { + return "botania.brewery"; + } + + @Nonnull + @Override + public IRecipeWrapper getRecipeWrapper(@Nonnull RecipeBrew recipe) { + return new BreweryRecipeWrapper(recipe); + } + + @Override + public boolean isRecipeValid(@Nonnull RecipeBrew recipe) { + return recipe.getInputs().size() <= 6; + } + +} diff --git a/src/main/java/vazkii/botania/client/integration/jei/brewery/BreweryRecipeWrapper.java b/src/main/java/vazkii/botania/client/integration/jei/brewery/BreweryRecipeWrapper.java new file mode 100644 index 000000000..f52973a3a --- /dev/null +++ b/src/main/java/vazkii/botania/client/integration/jei/brewery/BreweryRecipeWrapper.java @@ -0,0 +1,58 @@ +package vazkii.botania.client.integration.jei.brewery; + +import com.google.common.collect.ImmutableList; +import mezz.jei.api.recipe.IRecipeWrapper; +import net.minecraft.client.Minecraft; +import net.minecraft.item.ItemStack; +import net.minecraftforge.fluids.FluidStack; +import net.minecraftforge.oredict.OreDictionary; +import vazkii.botania.api.recipe.RecipeBrew; +import vazkii.botania.common.block.ModBlocks; +import vazkii.botania.common.item.ModItems; + +import javax.annotation.Nonnull; +import java.util.List; + +public class BreweryRecipeWrapper implements IRecipeWrapper { + + private final List input; + private final List output; + + public BreweryRecipeWrapper(RecipeBrew recipeBrew) { + ImmutableList.Builder builder = ImmutableList.builder(); + builder.add(new ItemStack(ModItems.vial)); + for (Object o : recipeBrew.getInputs()) { + if (o instanceof ItemStack) { + builder.add(o); + } + if (o instanceof String) { + builder.add(OreDictionary.getOres(((String) o))); + } + } + + input = builder.build(); + output = ImmutableList.of(recipeBrew.getOutput(new ItemStack(ModItems.vial)).copy(), new ItemStack(ModBlocks.brewery)); + } + + @Override + public List getInputs() { + return input; + } + + @Override + public List getOutputs() { + return output; + } + + @Override + public List getFluidInputs() { return ImmutableList.of(); } + + @Override + public List getFluidOutputs() { return ImmutableList.of(); } + + @Override + public void drawInfo(@Nonnull Minecraft minecraft, int recipeWidth, int recipeHeight) {} + + @Override + public void drawAnimations(@Nonnull Minecraft minecraft, int recipeWidth, int recipeHeight) {} +} From 6cf82eb98d01ec459c608ef21ef0553fde418d91 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sun, 3 Jan 2016 23:43:24 -0600 Subject: [PATCH 2/7] Rudimentary pure daisy integration --- .../integration/jei/JEIBotaniaPlugin.java | 9 +- .../puredaisy/PureDaisyRecipeCategory.java | 101 ++++++++++++++++++ .../jei/puredaisy/PureDaisyRecipeHandler.java | 34 ++++++ .../jei/puredaisy/PureDaisyRecipeWrapper.java | 69 ++++++++++++ 4 files changed, 211 insertions(+), 2 deletions(-) create mode 100644 src/main/java/vazkii/botania/client/integration/jei/puredaisy/PureDaisyRecipeCategory.java create mode 100644 src/main/java/vazkii/botania/client/integration/jei/puredaisy/PureDaisyRecipeHandler.java create mode 100644 src/main/java/vazkii/botania/client/integration/jei/puredaisy/PureDaisyRecipeWrapper.java diff --git a/src/main/java/vazkii/botania/client/integration/jei/JEIBotaniaPlugin.java b/src/main/java/vazkii/botania/client/integration/jei/JEIBotaniaPlugin.java index 3c7ada357..9b7836898 100644 --- a/src/main/java/vazkii/botania/client/integration/jei/JEIBotaniaPlugin.java +++ b/src/main/java/vazkii/botania/client/integration/jei/JEIBotaniaPlugin.java @@ -20,6 +20,8 @@ import mezz.jei.api.JEIPlugin; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.client.integration.jei.brewery.BreweryRecipeCategory; import vazkii.botania.client.integration.jei.brewery.BreweryRecipeHandler; +import vazkii.botania.client.integration.jei.puredaisy.PureDaisyRecipeCategory; +import vazkii.botania.client.integration.jei.puredaisy.PureDaisyRecipeHandler; @JEIPlugin public class JEIBotaniaPlugin implements IModPlugin { @@ -45,14 +47,17 @@ public class JEIBotaniaPlugin implements IModPlugin { @Override public void register(IModRegistry registry) { registry.addRecipeCategories( - new BreweryRecipeCategory(jeiHelpers.getGuiHelper()) + new BreweryRecipeCategory(jeiHelpers.getGuiHelper()), + new PureDaisyRecipeCategory(jeiHelpers.getGuiHelper()) ); registry.addRecipeHandlers( - new BreweryRecipeHandler() + new BreweryRecipeHandler(), + new PureDaisyRecipeHandler() ); registry.addRecipes(BotaniaAPI.brewRecipes); + registry.addRecipes(BotaniaAPI.pureDaisyRecipes); } @Override diff --git a/src/main/java/vazkii/botania/client/integration/jei/puredaisy/PureDaisyRecipeCategory.java b/src/main/java/vazkii/botania/client/integration/jei/puredaisy/PureDaisyRecipeCategory.java new file mode 100644 index 000000000..153c952da --- /dev/null +++ b/src/main/java/vazkii/botania/client/integration/jei/puredaisy/PureDaisyRecipeCategory.java @@ -0,0 +1,101 @@ +package vazkii.botania.client.integration.jei.puredaisy; + +import mezz.jei.api.IGuiHelper; +import mezz.jei.api.gui.IDrawable; +import mezz.jei.api.gui.IDrawableStatic; +import mezz.jei.api.gui.IRecipeLayout; +import mezz.jei.api.recipe.IRecipeCategory; +import mezz.jei.api.recipe.IRecipeWrapper; +import net.minecraft.client.Minecraft; +import net.minecraft.item.ItemStack; +import net.minecraft.util.ResourceLocation; +import net.minecraft.util.StatCollector; +import vazkii.botania.common.item.block.ItemBlockSpecialFlower; +import vazkii.botania.common.lib.LibBlockNames; + +import javax.annotation.Nonnull; +import java.util.Collection; + +public class PureDaisyRecipeCategory implements IRecipeCategory { + + private final IDrawableStatic background; + private final String localizedName; + private final IDrawableStatic overlay; + + private static final int inputSlot = 0; + private static final int pureDaisySlot = 1; + private static final int outputSlot = 2; + + public PureDaisyRecipeCategory(IGuiHelper guiHelper) { + ResourceLocation location = new ResourceLocation("botania", "textures/gui/neiBlank.png"); + background = guiHelper.createDrawable(location, 0, 0, 166, 65, 0, 0, 0, 0); + localizedName = StatCollector.translateToLocal("botania.nei.pureDaisy"); + overlay = guiHelper.createDrawable(new ResourceLocation("botania", "textures/gui/pureDaisyOverlay.png"), + 0, 0, 64, 46); + } + + @Nonnull + @Override + public String getUid() { + return "botania.pureDaisy"; + } + + @Nonnull + @Override + public String getTitle() { + return localizedName; + } + + @Nonnull + @Override + public IDrawable getBackground() { + return background; + } + + @Override + public void drawExtras(Minecraft minecraft) { + overlay.draw(minecraft, 48, 0); + } + + @Override + public void drawAnimations(Minecraft minecraft) {} + + @Override + public void setRecipe(@Nonnull IRecipeLayout recipeLayout, @Nonnull IRecipeWrapper recipeWrapper) { + if (!(recipeWrapper instanceof PureDaisyRecipeWrapper)) + return; + + PureDaisyRecipeWrapper wrapper = ((PureDaisyRecipeWrapper) recipeWrapper); + boolean inputFluid = wrapper.getInputs().isEmpty(); + boolean outputFluid = wrapper.getOutputs().isEmpty(); + + + if (inputFluid) { + recipeLayout.getFluidStacks().init(inputSlot, true, 40, 12, 16, 16, 1000, false, null); + recipeLayout.getFluidStacks().set(inputSlot, wrapper.getFluidInputs().get(0)); + } else { + recipeLayout.getItemStacks().init(inputSlot, true, 40, 12); + if (wrapper.getInputs().get(0) instanceof Collection) { + recipeLayout.getItemStacks().set(inputSlot, ((Collection) wrapper.getInputs().get(0))); + } else { + recipeLayout.getItemStacks().set(inputSlot, ((ItemStack) wrapper.getInputs().get(0))); + } + } + + recipeLayout.getItemStacks().init(pureDaisySlot, true, 72, 12); + recipeLayout.getItemStacks().set(pureDaisySlot, ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_PUREDAISY)); + + if (outputFluid) { + recipeLayout.getFluidStacks().init(outputSlot, false, 99, 12, 16, 16, 1000, false, null); + recipeLayout.getFluidStacks().set(outputSlot, wrapper.getFluidOutputs().get(0)); + } else { + recipeLayout.getItemStacks().init(outputSlot, false, 99, 12); + if (wrapper.getOutputs().get(0) instanceof Collection) { + recipeLayout.getItemStacks().set(outputSlot, ((Collection) wrapper.getOutputs().get(0))); + } else { + recipeLayout.getItemStacks().set(outputSlot, ((ItemStack) wrapper.getOutputs().get(0))); + } + } + } + +} diff --git a/src/main/java/vazkii/botania/client/integration/jei/puredaisy/PureDaisyRecipeHandler.java b/src/main/java/vazkii/botania/client/integration/jei/puredaisy/PureDaisyRecipeHandler.java new file mode 100644 index 000000000..f46820960 --- /dev/null +++ b/src/main/java/vazkii/botania/client/integration/jei/puredaisy/PureDaisyRecipeHandler.java @@ -0,0 +1,34 @@ +package vazkii.botania.client.integration.jei.puredaisy; + +import mezz.jei.api.recipe.IRecipeHandler; +import mezz.jei.api.recipe.IRecipeWrapper; +import vazkii.botania.api.recipe.RecipePureDaisy; + +import javax.annotation.Nonnull; + +public class PureDaisyRecipeHandler implements IRecipeHandler { + + @Nonnull + @Override + public Class getRecipeClass() { + return RecipePureDaisy.class; + } + + @Nonnull + @Override + public String getRecipeCategoryUid() { + return "botania.pureDaisy"; + } + + @Nonnull + @Override + public IRecipeWrapper getRecipeWrapper(@Nonnull RecipePureDaisy recipe) { + return new PureDaisyRecipeWrapper(recipe); + } + + @Override + public boolean isRecipeValid(@Nonnull RecipePureDaisy recipe) { + return true; + } + +} diff --git a/src/main/java/vazkii/botania/client/integration/jei/puredaisy/PureDaisyRecipeWrapper.java b/src/main/java/vazkii/botania/client/integration/jei/puredaisy/PureDaisyRecipeWrapper.java new file mode 100644 index 000000000..9177b2571 --- /dev/null +++ b/src/main/java/vazkii/botania/client/integration/jei/puredaisy/PureDaisyRecipeWrapper.java @@ -0,0 +1,69 @@ +package vazkii.botania.client.integration.jei.puredaisy; + +import com.google.common.collect.ImmutableList; +import mezz.jei.api.recipe.IRecipeWrapper; +import net.minecraft.block.Block; +import net.minecraft.client.Minecraft; +import net.minecraft.item.ItemStack; +import net.minecraftforge.fluids.FluidRegistry; +import net.minecraftforge.fluids.FluidStack; +import net.minecraftforge.oredict.OreDictionary; +import vazkii.botania.api.recipe.RecipePureDaisy; + +import javax.annotation.Nonnull; +import java.util.List; + +public class PureDaisyRecipeWrapper implements IRecipeWrapper { + + private List inputs = ImmutableList.of(); + private List outputs = ImmutableList.of(); + private List fluidInputs = ImmutableList.of(); + private List fluidOutputs = ImmutableList.of(); + + public PureDaisyRecipeWrapper(RecipePureDaisy recipe) { + if (recipe.getInput() instanceof String) { + inputs = ImmutableList.of(OreDictionary.getOres(((String) recipe.getInput()))); + } else if (recipe.getInput() instanceof Block) { + Block b = ((Block) recipe.getInput()); + if (FluidRegistry.lookupFluidForBlock(b) != null) { + fluidInputs = ImmutableList.of(new FluidStack(FluidRegistry.lookupFluidForBlock(b), 1000)); + } else { + inputs = ImmutableList.of(new ItemStack(b, 1, b.getMetaFromState(b.getDefaultState()))); + } + } + + Block outBlock = recipe.getOutputState().getBlock(); + if (FluidRegistry.lookupFluidForBlock(outBlock) != null) { + fluidOutputs = ImmutableList.of(new FluidStack(FluidRegistry.lookupFluidForBlock(outBlock), 1000)); + } else { + outputs = ImmutableList.of(new ItemStack(outBlock, 1, outBlock.getMetaFromState(recipe.getOutputState()))); + } + } + + @Override + public List getInputs() { + return inputs; + } + + @Override + public List getOutputs() { + return outputs; + } + + @Override + public List getFluidInputs() { + return fluidInputs; + } + + @Override + public List getFluidOutputs() { + return fluidOutputs; + } + + @Override + public void drawInfo(@Nonnull Minecraft minecraft, int recipeWidth, int recipeHeight) {} + + @Override + public void drawAnimations(@Nonnull Minecraft minecraft, int recipeWidth, int recipeHeight) {} + +} From 95118696ce875998cf43714b1b04e9efdad58ab8 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Mon, 4 Jan 2016 20:57:14 -0600 Subject: [PATCH 3/7] Half complete petal apothecary --- .../integration/jei/JEIBotaniaPlugin.java | 9 +- .../jei/brewery/BreweryRecipeCategory.java | 2 +- .../PetalApothecaryRecipeCategory.java | 85 +++++++++++++++++++ .../PetalApothecaryRecipeHandler.java | 34 ++++++++ .../PetalApothecaryRecipeWrapper.java | 59 +++++++++++++ .../puredaisy/PureDaisyRecipeCategory.java | 3 +- 6 files changed, 187 insertions(+), 5 deletions(-) create mode 100644 src/main/java/vazkii/botania/client/integration/jei/petalapothecary/PetalApothecaryRecipeCategory.java create mode 100644 src/main/java/vazkii/botania/client/integration/jei/petalapothecary/PetalApothecaryRecipeHandler.java create mode 100644 src/main/java/vazkii/botania/client/integration/jei/petalapothecary/PetalApothecaryRecipeWrapper.java diff --git a/src/main/java/vazkii/botania/client/integration/jei/JEIBotaniaPlugin.java b/src/main/java/vazkii/botania/client/integration/jei/JEIBotaniaPlugin.java index 9b7836898..5d3570f17 100644 --- a/src/main/java/vazkii/botania/client/integration/jei/JEIBotaniaPlugin.java +++ b/src/main/java/vazkii/botania/client/integration/jei/JEIBotaniaPlugin.java @@ -20,6 +20,8 @@ import mezz.jei.api.JEIPlugin; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.client.integration.jei.brewery.BreweryRecipeCategory; import vazkii.botania.client.integration.jei.brewery.BreweryRecipeHandler; +import vazkii.botania.client.integration.jei.petalapothecary.PetalApothecaryRecipeCategory; +import vazkii.botania.client.integration.jei.petalapothecary.PetalApothecaryRecipeHandler; import vazkii.botania.client.integration.jei.puredaisy.PureDaisyRecipeCategory; import vazkii.botania.client.integration.jei.puredaisy.PureDaisyRecipeHandler; @@ -48,16 +50,19 @@ public class JEIBotaniaPlugin implements IModPlugin { public void register(IModRegistry registry) { registry.addRecipeCategories( new BreweryRecipeCategory(jeiHelpers.getGuiHelper()), - new PureDaisyRecipeCategory(jeiHelpers.getGuiHelper()) + new PureDaisyRecipeCategory(jeiHelpers.getGuiHelper()), + new PetalApothecaryRecipeCategory(jeiHelpers.getGuiHelper()) ); registry.addRecipeHandlers( new BreweryRecipeHandler(), - new PureDaisyRecipeHandler() + new PureDaisyRecipeHandler(), + new PetalApothecaryRecipeHandler() ); registry.addRecipes(BotaniaAPI.brewRecipes); registry.addRecipes(BotaniaAPI.pureDaisyRecipes); + registry.addRecipes(BotaniaAPI.petalRecipes); } @Override diff --git a/src/main/java/vazkii/botania/client/integration/jei/brewery/BreweryRecipeCategory.java b/src/main/java/vazkii/botania/client/integration/jei/brewery/BreweryRecipeCategory.java index 5ac5f76ff..1962cc9d9 100644 --- a/src/main/java/vazkii/botania/client/integration/jei/brewery/BreweryRecipeCategory.java +++ b/src/main/java/vazkii/botania/client/integration/jei/brewery/BreweryRecipeCategory.java @@ -68,7 +68,7 @@ public class BreweryRecipeCategory implements IRecipeCategory { recipeLayout.getItemStacks().init(slotIngredient4, true, 112, 6); recipeLayout.getItemStacks().init(slotIngredient5, true, 128, 6); recipeLayout.getItemStacks().init(slotIngredient6, true, 144, 6); - recipeLayout.getItemStacks().init(slotOutput, false, 87, 41); // todo coords + recipeLayout.getItemStacks().init(slotOutput, false, 87, 41); BreweryRecipeWrapper wrapper = ((BreweryRecipeWrapper) recipeWrapper); List inputs = wrapper.getInputs(); diff --git a/src/main/java/vazkii/botania/client/integration/jei/petalapothecary/PetalApothecaryRecipeCategory.java b/src/main/java/vazkii/botania/client/integration/jei/petalapothecary/PetalApothecaryRecipeCategory.java new file mode 100644 index 000000000..c8034cb47 --- /dev/null +++ b/src/main/java/vazkii/botania/client/integration/jei/petalapothecary/PetalApothecaryRecipeCategory.java @@ -0,0 +1,85 @@ +package vazkii.botania.client.integration.jei.petalapothecary; + +import mezz.jei.api.IGuiHelper; +import mezz.jei.api.gui.IDrawable; +import mezz.jei.api.gui.IDrawableStatic; +import mezz.jei.api.gui.IRecipeLayout; +import mezz.jei.api.recipe.IRecipeCategory; +import mezz.jei.api.recipe.IRecipeWrapper; +import net.minecraft.client.Minecraft; +import net.minecraft.item.ItemStack; +import net.minecraft.util.ResourceLocation; +import net.minecraft.util.StatCollector; +import vazkii.botania.common.block.ModBlocks; +import vazkii.botania.common.item.block.ItemBlockSpecialFlower; +import vazkii.botania.common.lib.LibBlockNames; + +import javax.annotation.Nonnull; +import java.util.Collection; + +public class PetalApothecaryRecipeCategory implements IRecipeCategory { + + private final IDrawableStatic background; + private final String localizedName; + private final IDrawableStatic overlay; + + public PetalApothecaryRecipeCategory(IGuiHelper guiHelper) { + background = guiHelper.createBlankDrawable(168, 64); + localizedName = StatCollector.translateToLocal("botania.nei.petalApothecary"); + overlay = guiHelper.createDrawable(new ResourceLocation("botania", "textures/gui/petalOverlay.png"), + 0, 0, 64, 46); + } + + @Nonnull + @Override + public String getUid() { + return "botania.petals"; + } + + @Nonnull + @Override + public String getTitle() { + return localizedName; + } + + @Nonnull + @Override + public IDrawable getBackground() { + return background; + } + + @Override + public void drawExtras(Minecraft minecraft) { + overlay.draw(minecraft, 48, 0); + } + + @Override + public void drawAnimations(Minecraft minecraft) {} + + @Override + public void setRecipe(@Nonnull IRecipeLayout recipeLayout, @Nonnull IRecipeWrapper recipeWrapper) { + if (!(recipeWrapper instanceof PetalApothecaryRecipeWrapper)) + return; + PetalApothecaryRecipeWrapper wrapper = ((PetalApothecaryRecipeWrapper) recipeWrapper); + + recipeLayout.getItemStacks().init(0, true, 0, 0); + recipeLayout.getItemStacks().set(0, new ItemStack(ModBlocks.altar)); + + int index = 1, pos = 16; + for (Object o : wrapper.getInputs()) { + recipeLayout.getItemStacks().init(index, true, pos, 0); + if (o instanceof Collection) { + recipeLayout.getItemStacks().set(index, ((Collection) o)); + } + if (o instanceof ItemStack) { + recipeLayout.getItemStacks().set(index, ((ItemStack) o)); + } + pos += 16; + index += 1; + } + + recipeLayout.getItemStacks().init(index, false, 32, 0); + recipeLayout.getItemStacks().set(index, wrapper.getOutputs().get(0)); + } + +} diff --git a/src/main/java/vazkii/botania/client/integration/jei/petalapothecary/PetalApothecaryRecipeHandler.java b/src/main/java/vazkii/botania/client/integration/jei/petalapothecary/PetalApothecaryRecipeHandler.java new file mode 100644 index 000000000..6c48db83b --- /dev/null +++ b/src/main/java/vazkii/botania/client/integration/jei/petalapothecary/PetalApothecaryRecipeHandler.java @@ -0,0 +1,34 @@ +package vazkii.botania.client.integration.jei.petalapothecary; + +import mezz.jei.api.recipe.IRecipeHandler; +import mezz.jei.api.recipe.IRecipeWrapper; +import vazkii.botania.api.recipe.RecipePetals; + +import javax.annotation.Nonnull; + +public class PetalApothecaryRecipeHandler implements IRecipeHandler { + + @Nonnull + @Override + public Class getRecipeClass() { + return RecipePetals.class; + } + + @Nonnull + @Override + public String getRecipeCategoryUid() { + return "botania.petals"; + } + + @Nonnull + @Override + public IRecipeWrapper getRecipeWrapper(@Nonnull RecipePetals recipe) { + return new PetalApothecaryRecipeWrapper(recipe); + } + + @Override + public boolean isRecipeValid(@Nonnull RecipePetals recipe) { + return recipe.getInputs().size() <= 16; + } + +} diff --git a/src/main/java/vazkii/botania/client/integration/jei/petalapothecary/PetalApothecaryRecipeWrapper.java b/src/main/java/vazkii/botania/client/integration/jei/petalapothecary/PetalApothecaryRecipeWrapper.java new file mode 100644 index 000000000..46c073f93 --- /dev/null +++ b/src/main/java/vazkii/botania/client/integration/jei/petalapothecary/PetalApothecaryRecipeWrapper.java @@ -0,0 +1,59 @@ +package vazkii.botania.client.integration.jei.petalapothecary; + +import com.google.common.collect.ImmutableList; +import mezz.jei.api.recipe.IRecipeWrapper; +import net.minecraft.client.Minecraft; +import net.minecraft.item.ItemStack; +import net.minecraftforge.fluids.FluidStack; +import net.minecraftforge.oredict.OreDictionary; +import vazkii.botania.api.recipe.RecipePetals; + +import javax.annotation.Nonnull; +import java.util.List; + +public class PetalApothecaryRecipeWrapper implements IRecipeWrapper { + + private final List input; + private final ItemStack output; + + public PetalApothecaryRecipeWrapper(RecipePetals recipe) { + ImmutableList.Builder builder = ImmutableList.builder(); + for (Object o : recipe.getInputs()) { + if (o instanceof ItemStack) { + builder.add(o); + } + if (o instanceof String) { + builder.add(OreDictionary.getOres(((String) o))); + } + } + input = builder.build(); + output = recipe.getOutput(); + } + + @Override + public List getInputs() { + return input; + } + + @Override + public List getOutputs() { + return ImmutableList.of(output); + } + + @Override + public List getFluidInputs() { + return ImmutableList.of(); + } + + @Override + public List getFluidOutputs() { + return ImmutableList.of(); + } + + @Override + public void drawInfo(@Nonnull Minecraft minecraft, int recipeWidth, int recipeHeight) {} + + @Override + public void drawAnimations(@Nonnull Minecraft minecraft, int recipeWidth, int recipeHeight) {} + +} diff --git a/src/main/java/vazkii/botania/client/integration/jei/puredaisy/PureDaisyRecipeCategory.java b/src/main/java/vazkii/botania/client/integration/jei/puredaisy/PureDaisyRecipeCategory.java index 153c952da..660ed89f0 100644 --- a/src/main/java/vazkii/botania/client/integration/jei/puredaisy/PureDaisyRecipeCategory.java +++ b/src/main/java/vazkii/botania/client/integration/jei/puredaisy/PureDaisyRecipeCategory.java @@ -27,8 +27,7 @@ public class PureDaisyRecipeCategory implements IRecipeCategory { private static final int outputSlot = 2; public PureDaisyRecipeCategory(IGuiHelper guiHelper) { - ResourceLocation location = new ResourceLocation("botania", "textures/gui/neiBlank.png"); - background = guiHelper.createDrawable(location, 0, 0, 166, 65, 0, 0, 0, 0); + background = guiHelper.createBlankDrawable(168, 64); localizedName = StatCollector.translateToLocal("botania.nei.pureDaisy"); overlay = guiHelper.createDrawable(new ResourceLocation("botania", "textures/gui/pureDaisyOverlay.png"), 0, 0, 64, 46); From 9bf2e0c555eb53c10a91cd0fb274914b1887eaee Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Mon, 4 Jan 2016 22:34:45 -0600 Subject: [PATCH 4/7] Semi working petal apothecary itnegration --- .../PetalApothecaryRecipeCategory.java | 32 ++++++++++++++----- .../puredaisy/PureDaisyRecipeCategory.java | 5 +++ 2 files changed, 29 insertions(+), 8 deletions(-) diff --git a/src/main/java/vazkii/botania/client/integration/jei/petalapothecary/PetalApothecaryRecipeCategory.java b/src/main/java/vazkii/botania/client/integration/jei/petalapothecary/PetalApothecaryRecipeCategory.java index c8034cb47..d3ad4298f 100644 --- a/src/main/java/vazkii/botania/client/integration/jei/petalapothecary/PetalApothecaryRecipeCategory.java +++ b/src/main/java/vazkii/botania/client/integration/jei/petalapothecary/PetalApothecaryRecipeCategory.java @@ -7,6 +7,7 @@ import mezz.jei.api.gui.IRecipeLayout; import mezz.jei.api.recipe.IRecipeCategory; import mezz.jei.api.recipe.IRecipeWrapper; import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.GlStateManager; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; import net.minecraft.util.StatCollector; @@ -15,6 +16,7 @@ import vazkii.botania.common.item.block.ItemBlockSpecialFlower; import vazkii.botania.common.lib.LibBlockNames; import javax.annotation.Nonnull; +import java.awt.*; import java.util.Collection; public class PetalApothecaryRecipeCategory implements IRecipeCategory { @@ -24,10 +26,10 @@ public class PetalApothecaryRecipeCategory implements IRecipeCategory { private final IDrawableStatic overlay; public PetalApothecaryRecipeCategory(IGuiHelper guiHelper) { - background = guiHelper.createBlankDrawable(168, 64); + background = guiHelper.createBlankDrawable(150, 110); localizedName = StatCollector.translateToLocal("botania.nei.petalApothecary"); overlay = guiHelper.createDrawable(new ResourceLocation("botania", "textures/gui/petalOverlay.png"), - 0, 0, 64, 46); + 0, 0, 150, 110); } @Nonnull @@ -50,7 +52,11 @@ public class PetalApothecaryRecipeCategory implements IRecipeCategory { @Override public void drawExtras(Minecraft minecraft) { - overlay.draw(minecraft, 48, 0); + GlStateManager.enableAlpha(); + GlStateManager.enableBlend(); + overlay.draw(minecraft, 0, 0); + GlStateManager.disableBlend(); + GlStateManager.disableAlpha(); } @Override @@ -62,24 +68,34 @@ public class PetalApothecaryRecipeCategory implements IRecipeCategory { return; PetalApothecaryRecipeWrapper wrapper = ((PetalApothecaryRecipeWrapper) recipeWrapper); - recipeLayout.getItemStacks().init(0, true, 0, 0); + recipeLayout.getItemStacks().init(0, true, 64, 52); recipeLayout.getItemStacks().set(0, new ItemStack(ModBlocks.altar)); - int index = 1, pos = 16; + int index = 1; + double angleBetweenEach = 360.0 / wrapper.getInputs().size(); + Point point = new Point(64, 20), center = new Point(64, 52); + for (Object o : wrapper.getInputs()) { - recipeLayout.getItemStacks().init(index, true, pos, 0); + recipeLayout.getItemStacks().init(index, true, point.x, point.y); if (o instanceof Collection) { recipeLayout.getItemStacks().set(index, ((Collection) o)); } if (o instanceof ItemStack) { recipeLayout.getItemStacks().set(index, ((ItemStack) o)); } - pos += 16; index += 1; + point = rotatePointAbout(point, center, angleBetweenEach); } - recipeLayout.getItemStacks().init(index, false, 32, 0); + recipeLayout.getItemStacks().init(index, false, 103, 17); recipeLayout.getItemStacks().set(index, wrapper.getOutputs().get(0)); } + private Point rotatePointAbout(Point in, Point about, double degrees) { + double rad = degrees * Math.PI / 180.0; + double newX = Math.cos(rad) * (in.x - about.x) - Math.sin(rad) * (in.y - about.y) + about.x; + double newY = Math.sin(rad) * (in.x - about.x) - Math.cos(rad) * (in.y - about.y) + about.y; + return new Point(((int) newX), ((int) newY)); + } + } diff --git a/src/main/java/vazkii/botania/client/integration/jei/puredaisy/PureDaisyRecipeCategory.java b/src/main/java/vazkii/botania/client/integration/jei/puredaisy/PureDaisyRecipeCategory.java index 660ed89f0..98787eb96 100644 --- a/src/main/java/vazkii/botania/client/integration/jei/puredaisy/PureDaisyRecipeCategory.java +++ b/src/main/java/vazkii/botania/client/integration/jei/puredaisy/PureDaisyRecipeCategory.java @@ -7,6 +7,7 @@ import mezz.jei.api.gui.IRecipeLayout; import mezz.jei.api.recipe.IRecipeCategory; import mezz.jei.api.recipe.IRecipeWrapper; import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.GlStateManager; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; import net.minecraft.util.StatCollector; @@ -53,7 +54,11 @@ public class PureDaisyRecipeCategory implements IRecipeCategory { @Override public void drawExtras(Minecraft minecraft) { + GlStateManager.enableAlpha(); + GlStateManager.enableBlend(); overlay.draw(minecraft, 48, 0); + GlStateManager.disableBlend(); + GlStateManager.disableAlpha(); } @Override From 10d095d6567fdee1abf0743695724edd5e1ec1c7 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Mon, 4 Jan 2016 22:46:24 -0600 Subject: [PATCH 5/7] Finish pure daisy integration --- .../jei/petalapothecary/PetalApothecaryRecipeCategory.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/vazkii/botania/client/integration/jei/petalapothecary/PetalApothecaryRecipeCategory.java b/src/main/java/vazkii/botania/client/integration/jei/petalapothecary/PetalApothecaryRecipeCategory.java index d3ad4298f..3c3adb9e0 100644 --- a/src/main/java/vazkii/botania/client/integration/jei/petalapothecary/PetalApothecaryRecipeCategory.java +++ b/src/main/java/vazkii/botania/client/integration/jei/petalapothecary/PetalApothecaryRecipeCategory.java @@ -94,7 +94,7 @@ public class PetalApothecaryRecipeCategory implements IRecipeCategory { private Point rotatePointAbout(Point in, Point about, double degrees) { double rad = degrees * Math.PI / 180.0; double newX = Math.cos(rad) * (in.x - about.x) - Math.sin(rad) * (in.y - about.y) + about.x; - double newY = Math.sin(rad) * (in.x - about.x) - Math.cos(rad) * (in.y - about.y) + about.y; + double newY = Math.sin(rad) * (in.x - about.x) + Math.cos(rad) * (in.y - about.y) + about.y; return new Point(((int) newX), ((int) newY)); } From 28249d1e33c03e804ba7c256df7f7d9aee6919d0 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Tue, 5 Jan 2016 15:36:10 -0600 Subject: [PATCH 6/7] Elven trade integration --- .../integration/jei/JEIBotaniaPlugin.java | 9 +- .../elventrade/ElvenTradeRecipeCategory.java | 104 ++++++++++++++++++ .../elventrade/ElvenTradeRecipeHandler.java | 34 ++++++ .../elventrade/ElvenTradeRecipeWrapper.java | 59 ++++++++++ 4 files changed, 204 insertions(+), 2 deletions(-) create mode 100644 src/main/java/vazkii/botania/client/integration/jei/elventrade/ElvenTradeRecipeCategory.java create mode 100644 src/main/java/vazkii/botania/client/integration/jei/elventrade/ElvenTradeRecipeHandler.java create mode 100644 src/main/java/vazkii/botania/client/integration/jei/elventrade/ElvenTradeRecipeWrapper.java diff --git a/src/main/java/vazkii/botania/client/integration/jei/JEIBotaniaPlugin.java b/src/main/java/vazkii/botania/client/integration/jei/JEIBotaniaPlugin.java index 5d3570f17..b33f20d29 100644 --- a/src/main/java/vazkii/botania/client/integration/jei/JEIBotaniaPlugin.java +++ b/src/main/java/vazkii/botania/client/integration/jei/JEIBotaniaPlugin.java @@ -20,6 +20,8 @@ import mezz.jei.api.JEIPlugin; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.client.integration.jei.brewery.BreweryRecipeCategory; import vazkii.botania.client.integration.jei.brewery.BreweryRecipeHandler; +import vazkii.botania.client.integration.jei.elventrade.ElvenTradeRecipeCategory; +import vazkii.botania.client.integration.jei.elventrade.ElvenTradeRecipeHandler; import vazkii.botania.client.integration.jei.petalapothecary.PetalApothecaryRecipeCategory; import vazkii.botania.client.integration.jei.petalapothecary.PetalApothecaryRecipeHandler; import vazkii.botania.client.integration.jei.puredaisy.PureDaisyRecipeCategory; @@ -51,18 +53,21 @@ public class JEIBotaniaPlugin implements IModPlugin { registry.addRecipeCategories( new BreweryRecipeCategory(jeiHelpers.getGuiHelper()), new PureDaisyRecipeCategory(jeiHelpers.getGuiHelper()), - new PetalApothecaryRecipeCategory(jeiHelpers.getGuiHelper()) + new PetalApothecaryRecipeCategory(jeiHelpers.getGuiHelper()), + new ElvenTradeRecipeCategory(jeiHelpers.getGuiHelper()) ); registry.addRecipeHandlers( new BreweryRecipeHandler(), new PureDaisyRecipeHandler(), - new PetalApothecaryRecipeHandler() + new PetalApothecaryRecipeHandler(), + new ElvenTradeRecipeHandler() ); registry.addRecipes(BotaniaAPI.brewRecipes); registry.addRecipes(BotaniaAPI.pureDaisyRecipes); registry.addRecipes(BotaniaAPI.petalRecipes); + registry.addRecipes(BotaniaAPI.elvenTradeRecipes); } @Override diff --git a/src/main/java/vazkii/botania/client/integration/jei/elventrade/ElvenTradeRecipeCategory.java b/src/main/java/vazkii/botania/client/integration/jei/elventrade/ElvenTradeRecipeCategory.java new file mode 100644 index 000000000..0d21846d9 --- /dev/null +++ b/src/main/java/vazkii/botania/client/integration/jei/elventrade/ElvenTradeRecipeCategory.java @@ -0,0 +1,104 @@ +package vazkii.botania.client.integration.jei.elventrade; + +import mezz.jei.api.IGuiHelper; +import mezz.jei.api.gui.IDrawable; +import mezz.jei.api.gui.IRecipeLayout; +import mezz.jei.api.recipe.IRecipeCategory; +import mezz.jei.api.recipe.IRecipeWrapper; +import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.GlStateManager; +import net.minecraft.client.renderer.Tessellator; +import net.minecraft.client.renderer.WorldRenderer; +import net.minecraft.client.renderer.texture.TextureAtlasSprite; +import net.minecraft.client.renderer.texture.TextureMap; +import net.minecraft.client.renderer.vertex.DefaultVertexFormats; +import net.minecraft.item.ItemStack; +import net.minecraft.util.ResourceLocation; +import net.minecraft.util.StatCollector; +import org.lwjgl.opengl.GL11; +import vazkii.botania.client.core.handler.RenderEventHandler; +import vazkii.botania.common.block.ModBlocks; + +import javax.annotation.Nonnull; +import java.util.Collection; + +public class ElvenTradeRecipeCategory implements IRecipeCategory { + + private final String localizedName; + private final IDrawable background; + private final IDrawable overlay; + + public ElvenTradeRecipeCategory(IGuiHelper guiHelper) { + localizedName = StatCollector.translateToLocal("botania.nei.elvenTrade"); + background = guiHelper.createBlankDrawable(145, 95); + overlay = guiHelper.createDrawable(new ResourceLocation("botania", "textures/gui/elvenTradeOverlay.png"), 0, 15, 140, 90); + } + + @Nonnull + @Override + public String getUid() { + return "botania.elvenTrade"; + } + + @Nonnull + @Override + public String getTitle() { + return localizedName; + } + + @Nonnull + @Override + public IDrawable getBackground() { + return background; + } + + @Override + public void drawExtras(Minecraft minecraft) { + GlStateManager.enableAlpha(); + GlStateManager.enableBlend(); + overlay.draw(minecraft, 0, 4); + GlStateManager.disableBlend(); + GlStateManager.disableAlpha(); + } + + @Override + public void drawAnimations(Minecraft minecraft) { + minecraft.renderEngine.bindTexture(TextureMap.locationBlocksTexture); + TextureAtlasSprite sprite = RenderEventHandler.INSTANCE.alfPortalTex; + Tessellator tess = Tessellator.getInstance(); + WorldRenderer wr = tess.getWorldRenderer(); + wr.begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION_TEX); + int startX = 22; + int startY = 25; + int stopX = 70; + int stopY = 73; + wr.pos(startX, startY, 0).tex(sprite.getMinU(), sprite.getMinV()).endVertex(); + wr.pos(startX, stopY, 0).tex(sprite.getMinU(), sprite.getMaxV()).endVertex(); + wr.pos(stopX, stopY, 0).tex(sprite.getMaxU(), sprite.getMaxV()).endVertex(); + wr.pos(stopX, startY, 0).tex(sprite.getMaxU(), sprite.getMinV()).endVertex(); + tess.draw(); + } + + @Override + public void setRecipe(@Nonnull IRecipeLayout recipeLayout, @Nonnull IRecipeWrapper recipeWrapper) { + if (!(recipeWrapper instanceof ElvenTradeRecipeWrapper)) + return; + ElvenTradeRecipeWrapper wrapper = ((ElvenTradeRecipeWrapper) recipeWrapper); + + int index = 0, posX = 42; + for (Object o : wrapper.getInputs()) { + recipeLayout.getItemStacks().init(index, true, posX, 0); + if (o instanceof Collection) { + recipeLayout.getItemStacks().set(index, ((Collection) o)); + } else { + recipeLayout.getItemStacks().set(index, ((ItemStack) o)); + } + index++; + posX += 18; + } + + recipeLayout.getItemStacks().init(index, false, 93, 41); + recipeLayout.getItemStacks().set(index, wrapper.getOutputs().get(0)); + } + +} diff --git a/src/main/java/vazkii/botania/client/integration/jei/elventrade/ElvenTradeRecipeHandler.java b/src/main/java/vazkii/botania/client/integration/jei/elventrade/ElvenTradeRecipeHandler.java new file mode 100644 index 000000000..bee3e2f28 --- /dev/null +++ b/src/main/java/vazkii/botania/client/integration/jei/elventrade/ElvenTradeRecipeHandler.java @@ -0,0 +1,34 @@ +package vazkii.botania.client.integration.jei.elventrade; + +import mezz.jei.api.recipe.IRecipeHandler; +import mezz.jei.api.recipe.IRecipeWrapper; +import vazkii.botania.api.recipe.RecipeElvenTrade; + +import javax.annotation.Nonnull; + +public class ElvenTradeRecipeHandler implements IRecipeHandler { + + @Nonnull + @Override + public Class getRecipeClass() { + return RecipeElvenTrade.class; + } + + @Nonnull + @Override + public String getRecipeCategoryUid() { + return "botania.elvenTrade"; + } + + @Nonnull + @Override + public IRecipeWrapper getRecipeWrapper(@Nonnull RecipeElvenTrade recipe) { + return new ElvenTradeRecipeWrapper(recipe); + } + + @Override + public boolean isRecipeValid(@Nonnull RecipeElvenTrade recipe) { + return true; + } + +} diff --git a/src/main/java/vazkii/botania/client/integration/jei/elventrade/ElvenTradeRecipeWrapper.java b/src/main/java/vazkii/botania/client/integration/jei/elventrade/ElvenTradeRecipeWrapper.java new file mode 100644 index 000000000..515124afb --- /dev/null +++ b/src/main/java/vazkii/botania/client/integration/jei/elventrade/ElvenTradeRecipeWrapper.java @@ -0,0 +1,59 @@ +package vazkii.botania.client.integration.jei.elventrade; + +import com.google.common.collect.ImmutableList; +import mezz.jei.api.recipe.IRecipeWrapper; +import net.minecraft.client.Minecraft; +import net.minecraft.item.ItemStack; +import net.minecraftforge.fluids.FluidStack; +import net.minecraftforge.oredict.OreDictionary; +import vazkii.botania.api.recipe.RecipeElvenTrade; + +import javax.annotation.Nonnull; +import java.util.List; + +public class ElvenTradeRecipeWrapper implements IRecipeWrapper { + + private final List input; + private final ItemStack output; + + public ElvenTradeRecipeWrapper(RecipeElvenTrade recipe) { + ImmutableList.Builder builder = ImmutableList.builder(); + for (Object o : recipe.getInputs()) { + if (o instanceof ItemStack) { + builder.add(o); + } + if (o instanceof String) { + builder.add(OreDictionary.getOres(((String) o))); + } + } + input = builder.build(); + output = recipe.getOutput(); + } + + @Override + public List getInputs() { + return input; + } + + @Override + public List getOutputs() { + return ImmutableList.of(output); + } + + @Override + public List getFluidInputs() { + return ImmutableList.of(); + } + + @Override + public List getFluidOutputs() { + return ImmutableList.of(); + } + + @Override + public void drawInfo(@Nonnull Minecraft minecraft, int recipeWidth, int recipeHeight) {} + + @Override + public void drawAnimations(@Nonnull Minecraft minecraft, int recipeWidth, int recipeHeight) {} + +} From 8e6dc7c637832afe73ec6e5e413279b435027f7f Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Tue, 5 Jan 2016 16:51:03 -0600 Subject: [PATCH 7/7] JEI integration complete (runic altar, mana infusion) --- .../integration/jei/JEIBotaniaPlugin.java | 18 +++- .../jei/brewery/BreweryRecipeCategory.java | 43 ++++---- .../jei/brewery/BreweryRecipeWrapper.java | 6 +- .../elventrade/ElvenTradeRecipeCategory.java | 1 - .../jei/manapool/ManaPoolRecipeCategory.java | 97 ++++++++++++++++++ .../jei/manapool/ManaPoolRecipeHandler.java | 34 +++++++ .../jei/manapool/ManaPoolRecipeWrapper.java | 74 ++++++++++++++ .../PetalApothecaryRecipeCategory.java | 2 +- .../puredaisy/PureDaisyRecipeCategory.java | 32 +++--- .../runicaltar/RunicAltarRecipeCategory.java | 98 +++++++++++++++++++ .../runicaltar/RunicAltarRecipeHandler.java | 34 +++++++ .../runicaltar/RunicAltarRecipeWrapper.java | 68 +++++++++++++ 12 files changed, 460 insertions(+), 47 deletions(-) create mode 100644 src/main/java/vazkii/botania/client/integration/jei/manapool/ManaPoolRecipeCategory.java create mode 100644 src/main/java/vazkii/botania/client/integration/jei/manapool/ManaPoolRecipeHandler.java create mode 100644 src/main/java/vazkii/botania/client/integration/jei/manapool/ManaPoolRecipeWrapper.java create mode 100644 src/main/java/vazkii/botania/client/integration/jei/runicaltar/RunicAltarRecipeCategory.java create mode 100644 src/main/java/vazkii/botania/client/integration/jei/runicaltar/RunicAltarRecipeHandler.java create mode 100644 src/main/java/vazkii/botania/client/integration/jei/runicaltar/RunicAltarRecipeWrapper.java diff --git a/src/main/java/vazkii/botania/client/integration/jei/JEIBotaniaPlugin.java b/src/main/java/vazkii/botania/client/integration/jei/JEIBotaniaPlugin.java index b33f20d29..d80c81802 100644 --- a/src/main/java/vazkii/botania/client/integration/jei/JEIBotaniaPlugin.java +++ b/src/main/java/vazkii/botania/client/integration/jei/JEIBotaniaPlugin.java @@ -22,10 +22,14 @@ import vazkii.botania.client.integration.jei.brewery.BreweryRecipeCategory; import vazkii.botania.client.integration.jei.brewery.BreweryRecipeHandler; import vazkii.botania.client.integration.jei.elventrade.ElvenTradeRecipeCategory; import vazkii.botania.client.integration.jei.elventrade.ElvenTradeRecipeHandler; +import vazkii.botania.client.integration.jei.manapool.ManaPoolRecipeCategory; +import vazkii.botania.client.integration.jei.manapool.ManaPoolRecipeHandler; import vazkii.botania.client.integration.jei.petalapothecary.PetalApothecaryRecipeCategory; import vazkii.botania.client.integration.jei.petalapothecary.PetalApothecaryRecipeHandler; import vazkii.botania.client.integration.jei.puredaisy.PureDaisyRecipeCategory; import vazkii.botania.client.integration.jei.puredaisy.PureDaisyRecipeHandler; +import vazkii.botania.client.integration.jei.runicaltar.RunicAltarRecipeCategory; +import vazkii.botania.client.integration.jei.runicaltar.RunicAltarRecipeHandler; @JEIPlugin public class JEIBotaniaPlugin implements IModPlugin { @@ -54,25 +58,29 @@ public class JEIBotaniaPlugin implements IModPlugin { new BreweryRecipeCategory(jeiHelpers.getGuiHelper()), new PureDaisyRecipeCategory(jeiHelpers.getGuiHelper()), new PetalApothecaryRecipeCategory(jeiHelpers.getGuiHelper()), - new ElvenTradeRecipeCategory(jeiHelpers.getGuiHelper()) + new ElvenTradeRecipeCategory(jeiHelpers.getGuiHelper()), + new RunicAltarRecipeCategory(jeiHelpers.getGuiHelper()), + new ManaPoolRecipeCategory(jeiHelpers.getGuiHelper()) ); registry.addRecipeHandlers( new BreweryRecipeHandler(), new PureDaisyRecipeHandler(), new PetalApothecaryRecipeHandler(), - new ElvenTradeRecipeHandler() + new ElvenTradeRecipeHandler(), + new RunicAltarRecipeHandler(), + new ManaPoolRecipeHandler() ); registry.addRecipes(BotaniaAPI.brewRecipes); registry.addRecipes(BotaniaAPI.pureDaisyRecipes); registry.addRecipes(BotaniaAPI.petalRecipes); registry.addRecipes(BotaniaAPI.elvenTradeRecipes); + registry.addRecipes(BotaniaAPI.runeAltarRecipes); + registry.addRecipes(BotaniaAPI.manaInfusionRecipes); } @Override - public void onRecipeRegistryAvailable(IRecipeRegistry recipeRegistry) { - - } + public void onRecipeRegistryAvailable(IRecipeRegistry recipeRegistry) {} } diff --git a/src/main/java/vazkii/botania/client/integration/jei/brewery/BreweryRecipeCategory.java b/src/main/java/vazkii/botania/client/integration/jei/brewery/BreweryRecipeCategory.java index 1962cc9d9..32ae594d0 100644 --- a/src/main/java/vazkii/botania/client/integration/jei/brewery/BreweryRecipeCategory.java +++ b/src/main/java/vazkii/botania/client/integration/jei/brewery/BreweryRecipeCategory.java @@ -61,27 +61,32 @@ public class BreweryRecipeCategory implements IRecipeCategory { @Override public void setRecipe(@Nonnull IRecipeLayout recipeLayout, @Nonnull IRecipeWrapper recipeWrapper) { - recipeLayout.getItemStacks().init(slotContainerInput, true, 39, 41); - recipeLayout.getItemStacks().init(slotIngredient1, true, 64, 6); - recipeLayout.getItemStacks().init(slotIngredient2, true, 80, 6); - recipeLayout.getItemStacks().init(slotIngredient3, true, 96, 6); - recipeLayout.getItemStacks().init(slotIngredient4, true, 112, 6); - recipeLayout.getItemStacks().init(slotIngredient5, true, 128, 6); - recipeLayout.getItemStacks().init(slotIngredient6, true, 144, 6); - recipeLayout.getItemStacks().init(slotOutput, false, 87, 41); - + if (!(recipeWrapper instanceof BreweryRecipeWrapper)) + return; BreweryRecipeWrapper wrapper = ((BreweryRecipeWrapper) recipeWrapper); + List inputs = wrapper.getInputs(); - for (int i = 0; i < inputs.size(); i++) { - if (i > slotOutput) { - break; - } - if (inputs.get(i) instanceof ItemStack) { - recipeLayout.getItemStacks().set(i, ((ItemStack) inputs.get(i))); - } else if (inputs.get(i) instanceof Collection) { - recipeLayout.getItemStacks().set(i, ((Collection) inputs.get(i))); - } + + recipeLayout.getItemStacks().init(0, true, 39, 41); + if (inputs.get(0) instanceof ItemStack) { + recipeLayout.getItemStacks().set(0, ((ItemStack) inputs.get(0))); + } else { + recipeLayout.getItemStacks().set(0, ((Collection) inputs.get(0))); } - recipeLayout.getItemStacks().set(slotOutput, wrapper.getOutputs().get(0)); + + int index = 1, posX = 60; + for (Object o : wrapper.getInputs()) { + recipeLayout.getItemStacks().init(index, true, posX, 6); + if (o instanceof ItemStack) { + recipeLayout.getItemStacks().set(index, ((ItemStack) o)); + } else if (o instanceof Collection) { + recipeLayout.getItemStacks().set(index, ((Collection) o)); + } + index++; + posX += 18; + } + + recipeLayout.getItemStacks().init(7, false, 87, 41); + recipeLayout.getItemStacks().set(7, wrapper.getOutputs().get(0)); } } diff --git a/src/main/java/vazkii/botania/client/integration/jei/brewery/BreweryRecipeWrapper.java b/src/main/java/vazkii/botania/client/integration/jei/brewery/BreweryRecipeWrapper.java index f52973a3a..65735e071 100644 --- a/src/main/java/vazkii/botania/client/integration/jei/brewery/BreweryRecipeWrapper.java +++ b/src/main/java/vazkii/botania/client/integration/jei/brewery/BreweryRecipeWrapper.java @@ -16,7 +16,7 @@ import java.util.List; public class BreweryRecipeWrapper implements IRecipeWrapper { private final List input; - private final List output; + private final ItemStack output; public BreweryRecipeWrapper(RecipeBrew recipeBrew) { ImmutableList.Builder builder = ImmutableList.builder(); @@ -31,7 +31,7 @@ public class BreweryRecipeWrapper implements IRecipeWrapper { } input = builder.build(); - output = ImmutableList.of(recipeBrew.getOutput(new ItemStack(ModItems.vial)).copy(), new ItemStack(ModBlocks.brewery)); + output = recipeBrew.getOutput(new ItemStack(ModItems.vial)).copy(); } @Override @@ -41,7 +41,7 @@ public class BreweryRecipeWrapper implements IRecipeWrapper { @Override public List getOutputs() { - return output; + return ImmutableList.of(output); } @Override diff --git a/src/main/java/vazkii/botania/client/integration/jei/elventrade/ElvenTradeRecipeCategory.java b/src/main/java/vazkii/botania/client/integration/jei/elventrade/ElvenTradeRecipeCategory.java index 0d21846d9..e38ea88cd 100644 --- a/src/main/java/vazkii/botania/client/integration/jei/elventrade/ElvenTradeRecipeCategory.java +++ b/src/main/java/vazkii/botania/client/integration/jei/elventrade/ElvenTradeRecipeCategory.java @@ -17,7 +17,6 @@ import net.minecraft.util.ResourceLocation; import net.minecraft.util.StatCollector; import org.lwjgl.opengl.GL11; import vazkii.botania.client.core.handler.RenderEventHandler; -import vazkii.botania.common.block.ModBlocks; import javax.annotation.Nonnull; import java.util.Collection; diff --git a/src/main/java/vazkii/botania/client/integration/jei/manapool/ManaPoolRecipeCategory.java b/src/main/java/vazkii/botania/client/integration/jei/manapool/ManaPoolRecipeCategory.java new file mode 100644 index 000000000..b63a3b0c4 --- /dev/null +++ b/src/main/java/vazkii/botania/client/integration/jei/manapool/ManaPoolRecipeCategory.java @@ -0,0 +1,97 @@ +package vazkii.botania.client.integration.jei.manapool; + +import mezz.jei.api.IGuiHelper; +import mezz.jei.api.gui.IDrawable; +import mezz.jei.api.gui.IRecipeLayout; +import mezz.jei.api.recipe.IRecipeCategory; +import mezz.jei.api.recipe.IRecipeWrapper; +import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.GlStateManager; +import net.minecraft.item.ItemStack; +import net.minecraft.util.ResourceLocation; +import net.minecraft.util.StatCollector; +import vazkii.botania.common.block.ModBlocks; + +import javax.annotation.Nonnull; +import java.util.Collection; + +public class ManaPoolRecipeCategory implements IRecipeCategory { + + private final IDrawable background; + private final String localizedName; + private final IDrawable overlay; + + public ManaPoolRecipeCategory(IGuiHelper guiHelper) { + background = guiHelper.createBlankDrawable(168, 64); + localizedName = StatCollector.translateToLocal("botania.nei.manaPool"); + overlay = guiHelper.createDrawable(new ResourceLocation("botania", "textures/gui/pureDaisyOverlay.png"), + 0, 0, 64, 46); + } + + @Nonnull + @Override + public String getUid() { + return "botania.manaPool"; + } + + @Nonnull + @Override + public String getTitle() { + return localizedName; + } + + @Nonnull + @Override + public IDrawable getBackground() { + return background; + } + + @Override + public void drawExtras(Minecraft minecraft) { + GlStateManager.enableAlpha(); + GlStateManager.enableBlend(); + overlay.draw(minecraft, 48, 0); + GlStateManager.disableBlend(); + GlStateManager.disableAlpha(); + } + + @Override + public void drawAnimations(Minecraft minecraft) {} + + @Override + public void setRecipe(@Nonnull IRecipeLayout recipeLayout, @Nonnull IRecipeWrapper recipeWrapper) { + if (!(recipeWrapper instanceof ManaPoolRecipeWrapper)) + return; + + ManaPoolRecipeWrapper wrapper = ((ManaPoolRecipeWrapper) recipeWrapper); + int index = 0; + + recipeLayout.getItemStacks().init(index, true, 40, 12); + if (wrapper.getInputs().get(0) instanceof Collection) { + recipeLayout.getItemStacks().set(index, ((Collection) wrapper.getInputs().get(0))); + } else { + recipeLayout.getItemStacks().set(index, ((ItemStack) wrapper.getInputs().get(0))); + } + + index++; + + if (wrapper.getInputs().size() > 1) { + // Has catalyst + recipeLayout.getItemStacks().init(index, true, 20, 12); + recipeLayout.getItemStacks().set(index, ((ItemStack) wrapper.getInputs().get(1))); + index++; + } + + recipeLayout.getItemStacks().init(index, true, 70, 12); + recipeLayout.getItemStacks().set(index, new ItemStack(ModBlocks.pool, 1, 0)); + index++; + + recipeLayout.getItemStacks().init(index, false, 99, 12); + if (wrapper.getOutputs().get(0) instanceof Collection) { + recipeLayout.getItemStacks().set(index, ((Collection) wrapper.getOutputs().get(0))); + } else { + recipeLayout.getItemStacks().set(index, ((ItemStack) wrapper.getOutputs().get(0))); + } + } + +} diff --git a/src/main/java/vazkii/botania/client/integration/jei/manapool/ManaPoolRecipeHandler.java b/src/main/java/vazkii/botania/client/integration/jei/manapool/ManaPoolRecipeHandler.java new file mode 100644 index 000000000..bf591050a --- /dev/null +++ b/src/main/java/vazkii/botania/client/integration/jei/manapool/ManaPoolRecipeHandler.java @@ -0,0 +1,34 @@ +package vazkii.botania.client.integration.jei.manapool; + +import mezz.jei.api.recipe.IRecipeHandler; +import mezz.jei.api.recipe.IRecipeWrapper; +import vazkii.botania.api.recipe.RecipeManaInfusion; + +import javax.annotation.Nonnull; + +public class ManaPoolRecipeHandler implements IRecipeHandler { + + @Nonnull + @Override + public Class getRecipeClass() { + return RecipeManaInfusion.class; + } + + @Nonnull + @Override + public String getRecipeCategoryUid() { + return "botania.manaPool"; + } + + @Nonnull + @Override + public IRecipeWrapper getRecipeWrapper(@Nonnull RecipeManaInfusion recipe) { + return new ManaPoolRecipeWrapper(recipe); + } + + @Override + public boolean isRecipeValid(@Nonnull RecipeManaInfusion recipe) { + return recipe.getManaToConsume() <= 100000; + } + +} diff --git a/src/main/java/vazkii/botania/client/integration/jei/manapool/ManaPoolRecipeWrapper.java b/src/main/java/vazkii/botania/client/integration/jei/manapool/ManaPoolRecipeWrapper.java new file mode 100644 index 000000000..dad031503 --- /dev/null +++ b/src/main/java/vazkii/botania/client/integration/jei/manapool/ManaPoolRecipeWrapper.java @@ -0,0 +1,74 @@ +package vazkii.botania.client.integration.jei.manapool; + +import com.google.common.collect.ImmutableList; +import mezz.jei.api.recipe.IRecipeWrapper; +import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.GlStateManager; +import net.minecraft.item.ItemStack; +import net.minecraftforge.fluids.FluidStack; +import net.minecraftforge.oredict.OreDictionary; +import vazkii.botania.api.recipe.RecipeManaInfusion; +import vazkii.botania.client.core.handler.HUDHandler; +import vazkii.botania.common.block.ModBlocks; +import vazkii.botania.common.block.tile.mana.TilePool; + +import javax.annotation.Nonnull; +import java.util.List; + +public class ManaPoolRecipeWrapper implements IRecipeWrapper { + + private final List input; + private final ItemStack output; + private final int mana; + + public ManaPoolRecipeWrapper(RecipeManaInfusion recipe) { + ImmutableList.Builder builder = ImmutableList.builder(); + + if (recipe.getInput() instanceof ItemStack) { + builder.add(recipe.getInput()); + } else if (recipe.getInput() instanceof String) { + builder.add(OreDictionary.getOres(((String) recipe.getInput()))); + } + + if (recipe.isAlchemy()) { + builder.add(new ItemStack(ModBlocks.alchemyCatalyst)); + } else if (recipe.isConjuration()) { + builder.add(new ItemStack(ModBlocks.conjurationCatalyst)); + } + + input = builder.build(); + output = recipe.getOutput(); + mana = recipe.getManaToConsume(); + } + + @Override + public List getInputs() { + return input; + } + + @Override + public List getOutputs() { + return ImmutableList.of(output); + } + + @Override + public List getFluidInputs() { + return ImmutableList.of(); + } + + @Override + public List getFluidOutputs() { + return ImmutableList.of(); + } + + @Override + public void drawInfo(@Nonnull Minecraft minecraft, int recipeWidth, int recipeHeight) { + GlStateManager.enableAlpha(); + HUDHandler.renderManaBar(28, 50, 0x0000FF, 0.75F, mana, TilePool.MAX_MANA / 10); + GlStateManager.disableAlpha(); + } + + @Override + public void drawAnimations(@Nonnull Minecraft minecraft, int recipeWidth, int recipeHeight) {} + +} diff --git a/src/main/java/vazkii/botania/client/integration/jei/petalapothecary/PetalApothecaryRecipeCategory.java b/src/main/java/vazkii/botania/client/integration/jei/petalapothecary/PetalApothecaryRecipeCategory.java index 3c3adb9e0..135d95636 100644 --- a/src/main/java/vazkii/botania/client/integration/jei/petalapothecary/PetalApothecaryRecipeCategory.java +++ b/src/main/java/vazkii/botania/client/integration/jei/petalapothecary/PetalApothecaryRecipeCategory.java @@ -54,7 +54,7 @@ public class PetalApothecaryRecipeCategory implements IRecipeCategory { public void drawExtras(Minecraft minecraft) { GlStateManager.enableAlpha(); GlStateManager.enableBlend(); - overlay.draw(minecraft, 0, 0); + overlay.draw(minecraft); GlStateManager.disableBlend(); GlStateManager.disableAlpha(); } diff --git a/src/main/java/vazkii/botania/client/integration/jei/puredaisy/PureDaisyRecipeCategory.java b/src/main/java/vazkii/botania/client/integration/jei/puredaisy/PureDaisyRecipeCategory.java index 98787eb96..94bb346cd 100644 --- a/src/main/java/vazkii/botania/client/integration/jei/puredaisy/PureDaisyRecipeCategory.java +++ b/src/main/java/vazkii/botania/client/integration/jei/puredaisy/PureDaisyRecipeCategory.java @@ -19,13 +19,9 @@ import java.util.Collection; public class PureDaisyRecipeCategory implements IRecipeCategory { - private final IDrawableStatic background; + private final IDrawable background; private final String localizedName; - private final IDrawableStatic overlay; - - private static final int inputSlot = 0; - private static final int pureDaisySlot = 1; - private static final int outputSlot = 2; + private final IDrawable overlay; public PureDaisyRecipeCategory(IGuiHelper guiHelper) { background = guiHelper.createBlankDrawable(168, 64); @@ -75,29 +71,29 @@ public class PureDaisyRecipeCategory implements IRecipeCategory { if (inputFluid) { - recipeLayout.getFluidStacks().init(inputSlot, true, 40, 12, 16, 16, 1000, false, null); - recipeLayout.getFluidStacks().set(inputSlot, wrapper.getFluidInputs().get(0)); + recipeLayout.getFluidStacks().init(0, true, 40, 12, 16, 16, 1000, false, null); + recipeLayout.getFluidStacks().set(0, wrapper.getFluidInputs().get(0)); } else { - recipeLayout.getItemStacks().init(inputSlot, true, 40, 12); + recipeLayout.getItemStacks().init(0, true, 40, 12); if (wrapper.getInputs().get(0) instanceof Collection) { - recipeLayout.getItemStacks().set(inputSlot, ((Collection) wrapper.getInputs().get(0))); + recipeLayout.getItemStacks().set(0, ((Collection) wrapper.getInputs().get(0))); } else { - recipeLayout.getItemStacks().set(inputSlot, ((ItemStack) wrapper.getInputs().get(0))); + recipeLayout.getItemStacks().set(0, ((ItemStack) wrapper.getInputs().get(0))); } } - recipeLayout.getItemStacks().init(pureDaisySlot, true, 72, 12); - recipeLayout.getItemStacks().set(pureDaisySlot, ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_PUREDAISY)); + recipeLayout.getItemStacks().init(1, true, 70, 12); + recipeLayout.getItemStacks().set(1, ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_PUREDAISY)); if (outputFluid) { - recipeLayout.getFluidStacks().init(outputSlot, false, 99, 12, 16, 16, 1000, false, null); - recipeLayout.getFluidStacks().set(outputSlot, wrapper.getFluidOutputs().get(0)); + recipeLayout.getFluidStacks().init(2, false, 99, 12, 16, 16, 1000, false, null); + recipeLayout.getFluidStacks().set(2, wrapper.getFluidOutputs().get(0)); } else { - recipeLayout.getItemStacks().init(outputSlot, false, 99, 12); + recipeLayout.getItemStacks().init(2, false, 99, 12); if (wrapper.getOutputs().get(0) instanceof Collection) { - recipeLayout.getItemStacks().set(outputSlot, ((Collection) wrapper.getOutputs().get(0))); + recipeLayout.getItemStacks().set(2, ((Collection) wrapper.getOutputs().get(0))); } else { - recipeLayout.getItemStacks().set(outputSlot, ((ItemStack) wrapper.getOutputs().get(0))); + recipeLayout.getItemStacks().set(2, ((ItemStack) wrapper.getOutputs().get(0))); } } } diff --git a/src/main/java/vazkii/botania/client/integration/jei/runicaltar/RunicAltarRecipeCategory.java b/src/main/java/vazkii/botania/client/integration/jei/runicaltar/RunicAltarRecipeCategory.java new file mode 100644 index 000000000..c1b757012 --- /dev/null +++ b/src/main/java/vazkii/botania/client/integration/jei/runicaltar/RunicAltarRecipeCategory.java @@ -0,0 +1,98 @@ +package vazkii.botania.client.integration.jei.runicaltar; + +import mezz.jei.api.IGuiHelper; +import mezz.jei.api.gui.IDrawable; +import mezz.jei.api.gui.IRecipeLayout; +import mezz.jei.api.recipe.IRecipeCategory; +import mezz.jei.api.recipe.IRecipeWrapper; +import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.GlStateManager; +import net.minecraft.item.ItemStack; +import net.minecraft.util.ResourceLocation; +import net.minecraft.util.StatCollector; +import vazkii.botania.common.block.ModBlocks; + +import javax.annotation.Nonnull; +import java.awt.*; +import java.util.Collection; + +public class RunicAltarRecipeCategory implements IRecipeCategory { + + private final IDrawable background; + private final String localizedName; + private final IDrawable overlay; + + public RunicAltarRecipeCategory(IGuiHelper guiHelper) { + background = guiHelper.createBlankDrawable(150, 110); + localizedName = StatCollector.translateToLocal("botania.nei.runicAltar"); + overlay = guiHelper.createDrawable(new ResourceLocation("botania", "textures/gui/petalOverlay.png"), + 0, 0, 150, 110); + } + + @Nonnull + @Override + public String getUid() { + return "botania.runicAltar"; + } + + @Nonnull + @Override + public String getTitle() { + return localizedName; + } + + @Nonnull + @Override + public IDrawable getBackground() { + return background; + } + + @Override + public void drawExtras(Minecraft minecraft) { + GlStateManager.enableAlpha(); + GlStateManager.enableBlend(); + overlay.draw(minecraft); + GlStateManager.disableBlend(); + GlStateManager.disableAlpha(); + } + + @Override + public void drawAnimations(Minecraft minecraft) {} + + @Override + public void setRecipe(@Nonnull IRecipeLayout recipeLayout, @Nonnull IRecipeWrapper recipeWrapper) { + if (!(recipeWrapper instanceof RunicAltarRecipeWrapper)) + return; + RunicAltarRecipeWrapper wrapper = ((RunicAltarRecipeWrapper) recipeWrapper); + + recipeLayout.getItemStacks().init(0, true, 64, 52); + recipeLayout.getItemStacks().set(0, new ItemStack(ModBlocks.runeAltar)); + + int index = 1; + double angleBetweenEach = 360.0 / wrapper.getInputs().size(); + Point point = new Point(64, 20), center = new Point(64, 52); + + for (Object o : wrapper.getInputs()) { + recipeLayout.getItemStacks().init(index, true, point.x, point.y); + if (o instanceof Collection) { + recipeLayout.getItemStacks().set(index, ((Collection) o)); + } + if (o instanceof ItemStack) { + recipeLayout.getItemStacks().set(index, ((ItemStack) o)); + } + index += 1; + point = rotatePointAbout(point, center, angleBetweenEach); + } + + recipeLayout.getItemStacks().init(index, false, 103, 17); + recipeLayout.getItemStacks().set(index, wrapper.getOutputs().get(0)); + } + + private Point rotatePointAbout(Point in, Point about, double degrees) { + double rad = degrees * Math.PI / 180.0; + double newX = Math.cos(rad) * (in.x - about.x) - Math.sin(rad) * (in.y - about.y) + about.x; + double newY = Math.sin(rad) * (in.x - about.x) + Math.cos(rad) * (in.y - about.y) + about.y; + return new Point(((int) newX), ((int) newY)); + } + +} diff --git a/src/main/java/vazkii/botania/client/integration/jei/runicaltar/RunicAltarRecipeHandler.java b/src/main/java/vazkii/botania/client/integration/jei/runicaltar/RunicAltarRecipeHandler.java new file mode 100644 index 000000000..4b83897e6 --- /dev/null +++ b/src/main/java/vazkii/botania/client/integration/jei/runicaltar/RunicAltarRecipeHandler.java @@ -0,0 +1,34 @@ +package vazkii.botania.client.integration.jei.runicaltar; + +import mezz.jei.api.recipe.IRecipeHandler; +import mezz.jei.api.recipe.IRecipeWrapper; +import vazkii.botania.api.recipe.RecipeRuneAltar; + +import javax.annotation.Nonnull; + +public class RunicAltarRecipeHandler implements IRecipeHandler { + + @Nonnull + @Override + public Class getRecipeClass() { + return RecipeRuneAltar.class; + } + + @Nonnull + @Override + public String getRecipeCategoryUid() { + return "botania.runicAltar"; + } + + @Nonnull + @Override + public IRecipeWrapper getRecipeWrapper(@Nonnull RecipeRuneAltar recipe) { + return new RunicAltarRecipeWrapper(recipe); + } + + @Override + public boolean isRecipeValid(@Nonnull RecipeRuneAltar recipe) { + return recipe.getInputs().size() <= 16; + } + +} diff --git a/src/main/java/vazkii/botania/client/integration/jei/runicaltar/RunicAltarRecipeWrapper.java b/src/main/java/vazkii/botania/client/integration/jei/runicaltar/RunicAltarRecipeWrapper.java new file mode 100644 index 000000000..8f056c9b4 --- /dev/null +++ b/src/main/java/vazkii/botania/client/integration/jei/runicaltar/RunicAltarRecipeWrapper.java @@ -0,0 +1,68 @@ +package vazkii.botania.client.integration.jei.runicaltar; + +import com.google.common.collect.ImmutableList; +import mezz.jei.api.recipe.IRecipeWrapper; +import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.GlStateManager; +import net.minecraft.item.ItemStack; +import net.minecraftforge.fluids.FluidStack; +import net.minecraftforge.oredict.OreDictionary; +import vazkii.botania.api.recipe.RecipeRuneAltar; +import vazkii.botania.client.core.handler.HUDHandler; +import vazkii.botania.common.block.tile.mana.TilePool; + +import javax.annotation.Nonnull; +import java.util.List; + +public class RunicAltarRecipeWrapper implements IRecipeWrapper { + + private final List input; + private final ItemStack output; + private final int manaUsage; + + public RunicAltarRecipeWrapper(RecipeRuneAltar recipe) { + ImmutableList.Builder builder = ImmutableList.builder(); + for (Object o : recipe.getInputs()) { + if (o instanceof ItemStack) { + builder.add(o); + } + if (o instanceof String) { + builder.add(OreDictionary.getOres(((String) o))); + } + } + input = builder.build(); + output = recipe.getOutput(); + manaUsage = recipe.getManaUsage(); + } + + @Override + public List getInputs() { + return input; + } + + @Override + public List getOutputs() { + return ImmutableList.of(output); + } + + @Override + public List getFluidInputs() { + return ImmutableList.of(); + } + + @Override + public List getFluidOutputs() { + return ImmutableList.of(); + } + + @Override + public void drawInfo(@Nonnull Minecraft minecraft, int recipeWidth, int recipeHeight) { + GlStateManager.enableAlpha(); + HUDHandler.renderManaBar(28, 113, 0x0000FF, 0.75F, manaUsage, TilePool.MAX_MANA / 10); + GlStateManager.disableAlpha(); + } + + @Override + public void drawAnimations(@Nonnull Minecraft minecraft, int recipeWidth, int recipeHeight) {} + +}