Update JEI and add support for recipe category crafting items

This commit is contained in:
Vincent Lee committed 2016-05-06 22:24:15 -05:00
1 parent 5e11fe6e06
commit 072f13d3db
8 files changed
+40 -7

No files matched your search

+1 -1
View File
@@ -68,7 +68,7 @@ dependencies {
//compile "codechicken:CodeChickenCore:1.8-1.0.5.36:dev"
//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.9:3.2.3.176"
deobfCompile "mezz.jei:jei_1.9:3.3.3.197"
//and a bit more for SCP
sshAntTask "org.apache.ant:ant-jsch:1.7.1", "jsch:jsch:0.1.29"
@@ -14,7 +14,10 @@ import mezz.jei.api.IModPlugin;
import mezz.jei.api.IModRegistry;
import mezz.jei.api.JEIPlugin;
import mezz.jei.api.recipe.VanillaRecipeCategoryUid;
import net.minecraft.item.ItemStack;
import vazkii.botania.api.BotaniaAPI;
import vazkii.botania.api.state.enums.AltarVariant;
import vazkii.botania.api.state.enums.PoolVariant;
import vazkii.botania.client.gui.crafting.ContainerCraftingHalo;
import vazkii.botania.client.integration.jei.brewery.BreweryRecipeCategory;
import vazkii.botania.client.integration.jei.brewery.BreweryRecipeHandler;
@@ -28,6 +31,10 @@ 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;
import vazkii.botania.common.block.ModBlocks;
import vazkii.botania.common.item.ModItems;
import vazkii.botania.common.item.block.ItemBlockFloatingSpecialFlower;
import vazkii.botania.common.item.block.ItemBlockSpecialFlower;
import javax.annotation.Nonnull;
@@ -63,6 +70,26 @@ public class JEIBotaniaPlugin implements IModPlugin {
registry.addRecipes(BotaniaAPI.runeAltarRecipes);
registry.addRecipes(BotaniaAPI.manaInfusionRecipes);
registry.addRecipeCategoryCraftingItem(new ItemStack(ModBlocks.brewery), BreweryRecipeCategory.UID);
registry.addRecipeCategoryCraftingItem(new ItemStack(ModBlocks.alfPortal), ElvenTradeRecipeCategory.UID);
for(PoolVariant v : PoolVariant.values()) {
registry.addRecipeCategoryCraftingItem(new ItemStack(ModBlocks.pool, 1, v.ordinal()), ManaPoolRecipeCategory.UID);
}
for(AltarVariant v : AltarVariant.values()) {
if(v == AltarVariant.MOSSY) continue;
registry.addRecipeCategoryCraftingItem(new ItemStack(ModBlocks.altar, 1, v.ordinal()), PetalApothecaryRecipeCategory.UID);
}
registry.addRecipeCategoryCraftingItem(ItemBlockSpecialFlower.ofType("puredaisy"), PureDaisyRecipeCategory.UID);
registry.addRecipeCategoryCraftingItem(ItemBlockSpecialFlower.ofType(new ItemStack(ModBlocks.floatingSpecialFlower), "puredaisy"), PureDaisyRecipeCategory.UID);
registry.addRecipeCategoryCraftingItem(new ItemStack(ModBlocks.runeAltar), RunicAltarRecipeCategory.UID);
registry.addRecipeCategoryCraftingItem(new ItemStack(ModItems.autocraftingHalo), VanillaRecipeCategoryUid.CRAFTING);
registry.addRecipeCategoryCraftingItem(new ItemStack(ModItems.craftingHalo), VanillaRecipeCategoryUid.CRAFTING);
registry.getRecipeTransferRegistry().addRecipeTransferHandler(ContainerCraftingHalo.class, VanillaRecipeCategoryUid.CRAFTING, 1, 9, 10, 36);
}
@@ -25,6 +25,7 @@ import java.util.List;
public class BreweryRecipeCategory implements IRecipeCategory {
public static final String UID = "botania.brewery";
private final IDrawableStatic background;
private final String localizedName;
@@ -37,7 +38,7 @@ public class BreweryRecipeCategory implements IRecipeCategory {
@Nonnull
@Override
public String getUid() {
return "botania.brewery";
return UID;
}
@Nonnull
@@ -31,6 +31,7 @@ import java.util.Collection;
public class ElvenTradeRecipeCategory implements IRecipeCategory {
public static final String UID = "botania.elvenTrade";
private final String localizedName;
private final IDrawable background;
private final IDrawable overlay;
@@ -44,7 +45,7 @@ public class ElvenTradeRecipeCategory implements IRecipeCategory {
@Nonnull
@Override
public String getUid() {
return "botania.elvenTrade";
return UID;
}
@Nonnull
@@ -26,6 +26,7 @@ import java.util.Collection;
public class ManaPoolRecipeCategory implements IRecipeCategory {
public static final String UID = "botania.manaPool";
private final IDrawable background;
private final String localizedName;
private final IDrawable overlay;
@@ -42,7 +43,7 @@ public class ManaPoolRecipeCategory implements IRecipeCategory {
@Nonnull
@Override
public String getUid() {
return "botania.manaPool";
return UID;
}
@Nonnull
@@ -27,6 +27,7 @@ import java.util.Collection;
public class PetalApothecaryRecipeCategory implements IRecipeCategory {
public static final String UID = "botania.petals";
private final IDrawableStatic background;
private final String localizedName;
private final IDrawableStatic overlay;
@@ -41,7 +42,7 @@ public class PetalApothecaryRecipeCategory implements IRecipeCategory {
@Nonnull
@Override
public String getUid() {
return "botania.petals";
return UID;
}
@Nonnull
@@ -26,6 +26,7 @@ import java.util.Collection;
public class PureDaisyRecipeCategory implements IRecipeCategory {
public static final String UID = "botania.pureDaisy";
private final IDrawable background;
private final String localizedName;
private final IDrawable overlay;
@@ -40,7 +41,7 @@ public class PureDaisyRecipeCategory implements IRecipeCategory {
@Nonnull
@Override
public String getUid() {
return "botania.pureDaisy";
return UID;
}
@Nonnull
@@ -26,6 +26,7 @@ import java.util.Collection;
public class RunicAltarRecipeCategory implements IRecipeCategory {
public static final String UID = "botania.runicAltar";
private final IDrawable background;
private final String localizedName;
private final IDrawable overlay;
@@ -40,7 +41,7 @@ public class RunicAltarRecipeCategory implements IRecipeCategory {
@Nonnull
@Override
public String getUid() {
return "botania.runicAltar";
return UID;
}
@Nonnull