diff --git a/gradle.properties b/gradle.properties index 878b0bb1..7544c319 100644 --- a/gradle.properties +++ b/gradle.properties @@ -7,5 +7,5 @@ curse_id=224791 mappings_version=snapshot_20151128 -jei_version=2.13.0.52 +jei_version=2.13.6.63 waila_version=1.6.0-B3 \ No newline at end of file diff --git a/src/main/java/WayofTime/bloodmagic/compat/jei/BloodMagicPlugin.java b/src/main/java/WayofTime/bloodmagic/compat/jei/BloodMagicPlugin.java index 4e9ed104..0584b754 100644 --- a/src/main/java/WayofTime/bloodmagic/compat/jei/BloodMagicPlugin.java +++ b/src/main/java/WayofTime/bloodmagic/compat/jei/BloodMagicPlugin.java @@ -18,7 +18,6 @@ import net.minecraft.item.ItemStack; @JEIPlugin public class BloodMagicPlugin implements IModPlugin { - public static IJeiHelpers jeiHelper; @Override @@ -47,6 +46,8 @@ public class BloodMagicPlugin implements IModPlugin jeiHelper = jeiHelpers; 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); } diff --git a/src/main/java/WayofTime/bloodmagic/compat/jei/CompatibilityJustEnoughItems.java b/src/main/java/WayofTime/bloodmagic/compat/jei/CompatibilityJustEnoughItems.java index e6b10184..5bfe66ee 100644 --- a/src/main/java/WayofTime/bloodmagic/compat/jei/CompatibilityJustEnoughItems.java +++ b/src/main/java/WayofTime/bloodmagic/compat/jei/CompatibilityJustEnoughItems.java @@ -4,7 +4,6 @@ import WayofTime.bloodmagic.compat.ICompatibility; public class CompatibilityJustEnoughItems implements ICompatibility { - @Override public void loadCompatibility() { diff --git a/src/main/java/WayofTime/bloodmagic/compat/jei/alchemyArray/AlchemyArrayCraftingCategory.java b/src/main/java/WayofTime/bloodmagic/compat/jei/alchemyArray/AlchemyArrayCraftingCategory.java index a06f4ff9..a0d65804 100644 --- a/src/main/java/WayofTime/bloodmagic/compat/jei/alchemyArray/AlchemyArrayCraftingCategory.java +++ b/src/main/java/WayofTime/bloodmagic/compat/jei/alchemyArray/AlchemyArrayCraftingCategory.java @@ -15,7 +15,6 @@ import javax.annotation.Nonnull; public class AlchemyArrayCraftingCategory implements IRecipeCategory { - private static final int INPUT_SLOT = 0; private static final int CATALYST_SLOT = 1; private static final int OUTPUT_SLOT = 2; diff --git a/src/main/java/WayofTime/bloodmagic/compat/jei/alchemyArray/AlchemyArrayCraftingRecipeHandler.java b/src/main/java/WayofTime/bloodmagic/compat/jei/alchemyArray/AlchemyArrayCraftingRecipeHandler.java index b9a594fd..bf841c0d 100644 --- a/src/main/java/WayofTime/bloodmagic/compat/jei/alchemyArray/AlchemyArrayCraftingRecipeHandler.java +++ b/src/main/java/WayofTime/bloodmagic/compat/jei/alchemyArray/AlchemyArrayCraftingRecipeHandler.java @@ -8,7 +8,6 @@ import javax.annotation.Nonnull; public class AlchemyArrayCraftingRecipeHandler implements IRecipeHandler { - @Nonnull @Override public Class getRecipeClass() diff --git a/src/main/java/WayofTime/bloodmagic/compat/jei/alchemyArray/AlchemyArrayCraftingRecipeJEI.java b/src/main/java/WayofTime/bloodmagic/compat/jei/alchemyArray/AlchemyArrayCraftingRecipeJEI.java index bcc7ee92..9e307a28 100644 --- a/src/main/java/WayofTime/bloodmagic/compat/jei/alchemyArray/AlchemyArrayCraftingRecipeJEI.java +++ b/src/main/java/WayofTime/bloodmagic/compat/jei/alchemyArray/AlchemyArrayCraftingRecipeJEI.java @@ -12,7 +12,6 @@ import net.minecraft.item.ItemStack; public class AlchemyArrayCraftingRecipeJEI extends BlankRecipeWrapper { - @Nonnull private final List inputs; diff --git a/src/main/java/WayofTime/bloodmagic/compat/jei/alchemyArray/AlchemyArrayCraftingRecipeMaker.java b/src/main/java/WayofTime/bloodmagic/compat/jei/alchemyArray/AlchemyArrayCraftingRecipeMaker.java index 783854e7..7f851fb5 100644 --- a/src/main/java/WayofTime/bloodmagic/compat/jei/alchemyArray/AlchemyArrayCraftingRecipeMaker.java +++ b/src/main/java/WayofTime/bloodmagic/compat/jei/alchemyArray/AlchemyArrayCraftingRecipeMaker.java @@ -14,7 +14,6 @@ import java.util.Map; public class AlchemyArrayCraftingRecipeMaker { - @Nonnull public static List getRecipes() { diff --git a/src/main/java/WayofTime/bloodmagic/compat/jei/altar/AltarRecipeCategory.java b/src/main/java/WayofTime/bloodmagic/compat/jei/altar/AltarRecipeCategory.java index 6a8138a1..04bb25d6 100644 --- a/src/main/java/WayofTime/bloodmagic/compat/jei/altar/AltarRecipeCategory.java +++ b/src/main/java/WayofTime/bloodmagic/compat/jei/altar/AltarRecipeCategory.java @@ -3,7 +3,6 @@ package WayofTime.bloodmagic.compat.jei.altar; import WayofTime.bloodmagic.api.Constants; import WayofTime.bloodmagic.compat.jei.BloodMagicPlugin; import WayofTime.bloodmagic.util.helper.TextHelper; -import mezz.jei.api.JEIManager; import mezz.jei.api.gui.IDrawable; import mezz.jei.api.gui.IRecipeLayout; import mezz.jei.api.recipe.IRecipeCategory; @@ -15,7 +14,6 @@ import javax.annotation.Nonnull; public class AltarRecipeCategory implements IRecipeCategory { - private static final int INPUT_SLOT = 0; private static final int OUTPUT_SLOT = 1; @@ -61,7 +59,6 @@ public class AltarRecipeCategory implements IRecipeCategory @SuppressWarnings("unchecked") public void setRecipe(@Nonnull IRecipeLayout recipeLayout, @Nonnull IRecipeWrapper recipeWrapper) { - recipeLayout.getItemStacks().init(INPUT_SLOT, true, 31, 0); recipeLayout.getItemStacks().init(OUTPUT_SLOT, false, 125, 30); diff --git a/src/main/java/WayofTime/bloodmagic/compat/jei/altar/AltarRecipeHandler.java b/src/main/java/WayofTime/bloodmagic/compat/jei/altar/AltarRecipeHandler.java index 70ac0f52..6f3e76d6 100644 --- a/src/main/java/WayofTime/bloodmagic/compat/jei/altar/AltarRecipeHandler.java +++ b/src/main/java/WayofTime/bloodmagic/compat/jei/altar/AltarRecipeHandler.java @@ -8,7 +8,6 @@ import javax.annotation.Nonnull; public class AltarRecipeHandler implements IRecipeHandler { - @Nonnull @Override public Class getRecipeClass() diff --git a/src/main/java/WayofTime/bloodmagic/compat/jei/altar/AltarRecipeJEI.java b/src/main/java/WayofTime/bloodmagic/compat/jei/altar/AltarRecipeJEI.java index 9d6efae3..88e97942 100644 --- a/src/main/java/WayofTime/bloodmagic/compat/jei/altar/AltarRecipeJEI.java +++ b/src/main/java/WayofTime/bloodmagic/compat/jei/altar/AltarRecipeJEI.java @@ -12,7 +12,6 @@ import java.util.List; public class AltarRecipeJEI extends BlankRecipeWrapper { - @Nonnull private final ItemStack input; diff --git a/src/main/java/WayofTime/bloodmagic/compat/jei/altar/AltarRecipeMaker.java b/src/main/java/WayofTime/bloodmagic/compat/jei/altar/AltarRecipeMaker.java index a6776a38..03da575f 100644 --- a/src/main/java/WayofTime/bloodmagic/compat/jei/altar/AltarRecipeMaker.java +++ b/src/main/java/WayofTime/bloodmagic/compat/jei/altar/AltarRecipeMaker.java @@ -11,7 +11,6 @@ import java.util.Map; public class AltarRecipeMaker { - @Nonnull public static List getRecipes() { diff --git a/src/main/java/WayofTime/bloodmagic/compat/jei/binding/BindingRecipeCategory.java b/src/main/java/WayofTime/bloodmagic/compat/jei/binding/BindingRecipeCategory.java index dfac1b53..908e9f22 100644 --- a/src/main/java/WayofTime/bloodmagic/compat/jei/binding/BindingRecipeCategory.java +++ b/src/main/java/WayofTime/bloodmagic/compat/jei/binding/BindingRecipeCategory.java @@ -15,7 +15,6 @@ import javax.annotation.Nonnull; public class BindingRecipeCategory implements IRecipeCategory { - private static final int INPUT_SLOT = 0; private static final int CATALYST_SLOT = 1; private static final int OUTPUT_SLOT = 2; diff --git a/src/main/java/WayofTime/bloodmagic/compat/jei/binding/BindingRecipeHandler.java b/src/main/java/WayofTime/bloodmagic/compat/jei/binding/BindingRecipeHandler.java index dec2bd62..b2492b5e 100644 --- a/src/main/java/WayofTime/bloodmagic/compat/jei/binding/BindingRecipeHandler.java +++ b/src/main/java/WayofTime/bloodmagic/compat/jei/binding/BindingRecipeHandler.java @@ -8,7 +8,6 @@ import javax.annotation.Nonnull; public class BindingRecipeHandler implements IRecipeHandler { - @Nonnull @Override public Class getRecipeClass() diff --git a/src/main/java/WayofTime/bloodmagic/compat/jei/binding/BindingRecipeJEI.java b/src/main/java/WayofTime/bloodmagic/compat/jei/binding/BindingRecipeJEI.java index 846fd7d6..22f33019 100644 --- a/src/main/java/WayofTime/bloodmagic/compat/jei/binding/BindingRecipeJEI.java +++ b/src/main/java/WayofTime/bloodmagic/compat/jei/binding/BindingRecipeJEI.java @@ -11,7 +11,6 @@ import net.minecraft.item.ItemStack; public class BindingRecipeJEI extends BlankRecipeWrapper { - @Nonnull private final List inputs; diff --git a/src/main/java/WayofTime/bloodmagic/compat/jei/binding/BindingRecipeMaker.java b/src/main/java/WayofTime/bloodmagic/compat/jei/binding/BindingRecipeMaker.java index 0d831e1f..f22b8e25 100644 --- a/src/main/java/WayofTime/bloodmagic/compat/jei/binding/BindingRecipeMaker.java +++ b/src/main/java/WayofTime/bloodmagic/compat/jei/binding/BindingRecipeMaker.java @@ -14,7 +14,6 @@ import java.util.Map; public class BindingRecipeMaker { - @Nonnull public static List getRecipes() {