Update JEI compat

This commit is contained in:
Nick 2016-01-03 15:51:54 -08:00
parent 52a067e845
commit 9c25ff38a6
15 changed files with 3 additions and 17 deletions

View file

@ -7,5 +7,5 @@ curse_id=224791
mappings_version=snapshot_20151128 mappings_version=snapshot_20151128
jei_version=2.13.0.52 jei_version=2.13.6.63
waila_version=1.6.0-B3 waila_version=1.6.0-B3

View file

@ -18,7 +18,6 @@ import net.minecraft.item.ItemStack;
@JEIPlugin @JEIPlugin
public class BloodMagicPlugin implements IModPlugin public class BloodMagicPlugin implements IModPlugin
{ {
public static IJeiHelpers jeiHelper; public static IJeiHelpers jeiHelper;
@Override @Override
@ -47,6 +46,8 @@ public class BloodMagicPlugin implements IModPlugin
jeiHelper = jeiHelpers; jeiHelper = jeiHelpers;
jeiHelpers.getItemBlacklist().addItemToBlacklist(new ItemStack(ModBlocks.bloodLight)); jeiHelpers.getItemBlacklist().addItemToBlacklist(new ItemStack(ModBlocks.bloodLight));
jeiHelpers.getItemBlacklist().addItemToBlacklist(new ItemStack(ModBlocks.spectralBlock));
jeiHelpers.getItemBlacklist().addItemToBlacklist(new ItemStack(ModBlocks.phantomBlock));
jeiHelpers.getNbtIgnoreList().ignoreNbtTagNames(Constants.NBT.OWNER_UUID); jeiHelpers.getNbtIgnoreList().ignoreNbtTagNames(Constants.NBT.OWNER_UUID);
} }

View file

@ -4,7 +4,6 @@ import WayofTime.bloodmagic.compat.ICompatibility;
public class CompatibilityJustEnoughItems implements ICompatibility public class CompatibilityJustEnoughItems implements ICompatibility
{ {
@Override @Override
public void loadCompatibility() public void loadCompatibility()
{ {

View file

@ -15,7 +15,6 @@ import javax.annotation.Nonnull;
public class AlchemyArrayCraftingCategory implements IRecipeCategory public class AlchemyArrayCraftingCategory implements IRecipeCategory
{ {
private static final int INPUT_SLOT = 0; private static final int INPUT_SLOT = 0;
private static final int CATALYST_SLOT = 1; private static final int CATALYST_SLOT = 1;
private static final int OUTPUT_SLOT = 2; private static final int OUTPUT_SLOT = 2;

View file

@ -8,7 +8,6 @@ import javax.annotation.Nonnull;
public class AlchemyArrayCraftingRecipeHandler implements IRecipeHandler<AlchemyArrayCraftingRecipeJEI> public class AlchemyArrayCraftingRecipeHandler implements IRecipeHandler<AlchemyArrayCraftingRecipeJEI>
{ {
@Nonnull @Nonnull
@Override @Override
public Class<AlchemyArrayCraftingRecipeJEI> getRecipeClass() public Class<AlchemyArrayCraftingRecipeJEI> getRecipeClass()

View file

@ -12,7 +12,6 @@ import net.minecraft.item.ItemStack;
public class AlchemyArrayCraftingRecipeJEI extends BlankRecipeWrapper public class AlchemyArrayCraftingRecipeJEI extends BlankRecipeWrapper
{ {
@Nonnull @Nonnull
private final List<ItemStack> inputs; private final List<ItemStack> inputs;

View file

@ -14,7 +14,6 @@ import java.util.Map;
public class AlchemyArrayCraftingRecipeMaker public class AlchemyArrayCraftingRecipeMaker
{ {
@Nonnull @Nonnull
public static List<AlchemyArrayCraftingRecipeJEI> getRecipes() public static List<AlchemyArrayCraftingRecipeJEI> getRecipes()
{ {

View file

@ -3,7 +3,6 @@ package WayofTime.bloodmagic.compat.jei.altar;
import WayofTime.bloodmagic.api.Constants; import WayofTime.bloodmagic.api.Constants;
import WayofTime.bloodmagic.compat.jei.BloodMagicPlugin; import WayofTime.bloodmagic.compat.jei.BloodMagicPlugin;
import WayofTime.bloodmagic.util.helper.TextHelper; import WayofTime.bloodmagic.util.helper.TextHelper;
import mezz.jei.api.JEIManager;
import mezz.jei.api.gui.IDrawable; import mezz.jei.api.gui.IDrawable;
import mezz.jei.api.gui.IRecipeLayout; import mezz.jei.api.gui.IRecipeLayout;
import mezz.jei.api.recipe.IRecipeCategory; import mezz.jei.api.recipe.IRecipeCategory;
@ -15,7 +14,6 @@ import javax.annotation.Nonnull;
public class AltarRecipeCategory implements IRecipeCategory public class AltarRecipeCategory implements IRecipeCategory
{ {
private static final int INPUT_SLOT = 0; private static final int INPUT_SLOT = 0;
private static final int OUTPUT_SLOT = 1; private static final int OUTPUT_SLOT = 1;
@ -61,7 +59,6 @@ public class AltarRecipeCategory implements IRecipeCategory
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
public void setRecipe(@Nonnull IRecipeLayout recipeLayout, @Nonnull IRecipeWrapper recipeWrapper) public void setRecipe(@Nonnull IRecipeLayout recipeLayout, @Nonnull IRecipeWrapper recipeWrapper)
{ {
recipeLayout.getItemStacks().init(INPUT_SLOT, true, 31, 0); recipeLayout.getItemStacks().init(INPUT_SLOT, true, 31, 0);
recipeLayout.getItemStacks().init(OUTPUT_SLOT, false, 125, 30); recipeLayout.getItemStacks().init(OUTPUT_SLOT, false, 125, 30);

View file

@ -8,7 +8,6 @@ import javax.annotation.Nonnull;
public class AltarRecipeHandler implements IRecipeHandler<AltarRecipeJEI> public class AltarRecipeHandler implements IRecipeHandler<AltarRecipeJEI>
{ {
@Nonnull @Nonnull
@Override @Override
public Class<AltarRecipeJEI> getRecipeClass() public Class<AltarRecipeJEI> getRecipeClass()

View file

@ -12,7 +12,6 @@ import java.util.List;
public class AltarRecipeJEI extends BlankRecipeWrapper public class AltarRecipeJEI extends BlankRecipeWrapper
{ {
@Nonnull @Nonnull
private final ItemStack input; private final ItemStack input;

View file

@ -11,7 +11,6 @@ import java.util.Map;
public class AltarRecipeMaker public class AltarRecipeMaker
{ {
@Nonnull @Nonnull
public static List<AltarRecipeJEI> getRecipes() public static List<AltarRecipeJEI> getRecipes()
{ {

View file

@ -15,7 +15,6 @@ import javax.annotation.Nonnull;
public class BindingRecipeCategory implements IRecipeCategory public class BindingRecipeCategory implements IRecipeCategory
{ {
private static final int INPUT_SLOT = 0; private static final int INPUT_SLOT = 0;
private static final int CATALYST_SLOT = 1; private static final int CATALYST_SLOT = 1;
private static final int OUTPUT_SLOT = 2; private static final int OUTPUT_SLOT = 2;

View file

@ -8,7 +8,6 @@ import javax.annotation.Nonnull;
public class BindingRecipeHandler implements IRecipeHandler<BindingRecipeJEI> public class BindingRecipeHandler implements IRecipeHandler<BindingRecipeJEI>
{ {
@Nonnull @Nonnull
@Override @Override
public Class<BindingRecipeJEI> getRecipeClass() public Class<BindingRecipeJEI> getRecipeClass()

View file

@ -11,7 +11,6 @@ import net.minecraft.item.ItemStack;
public class BindingRecipeJEI extends BlankRecipeWrapper public class BindingRecipeJEI extends BlankRecipeWrapper
{ {
@Nonnull @Nonnull
private final List<ItemStack> inputs; private final List<ItemStack> inputs;

View file

@ -14,7 +14,6 @@ import java.util.Map;
public class BindingRecipeMaker public class BindingRecipeMaker
{ {
@Nonnull @Nonnull
public static List<BindingRecipeJEI> getRecipes() public static List<BindingRecipeJEI> getRecipes()
{ {