From d51a908f6bc5a3ee5e7d104cf2e3201d18d1920e Mon Sep 17 00:00:00 2001 From: Nick Date: Thu, 3 Dec 2015 17:12:50 -0800 Subject: [PATCH] Update JEI compat --- gradle.properties | 2 +- src/main/java/WayofTime/bloodmagic/ConfigHandler.java | 2 -- .../WayofTime/bloodmagic/compat/jei/BloodMagicPlugin.java | 2 ++ .../compat/jei/CompatibilityJustEnoughItems.java | 7 ++++--- .../bloodmagic/compat/jei/altar/AltarRecipeCategory.java | 6 ++++++ .../compat/jei/binding/BindingRecipeCategory.java | 6 ++++++ 6 files changed, 19 insertions(+), 6 deletions(-) diff --git a/gradle.properties b/gradle.properties index 88f1f728..28f8ec76 100644 --- a/gradle.properties +++ b/gradle.properties @@ -7,4 +7,4 @@ curse_id=224791 mappings_version=snapshot_20151128 -jei_version=2.1.3.13 \ No newline at end of file +jei_version=2.2.0.15 \ No newline at end of file diff --git a/src/main/java/WayofTime/bloodmagic/ConfigHandler.java b/src/main/java/WayofTime/bloodmagic/ConfigHandler.java index 056c80c9..582f71bf 100644 --- a/src/main/java/WayofTime/bloodmagic/ConfigHandler.java +++ b/src/main/java/WayofTime/bloodmagic/ConfigHandler.java @@ -88,7 +88,6 @@ public class ConfigHandler { public static boolean vanillaPotionAbsorptionEnabled; // Compat - public static boolean compatibilityJustEnoughItems; public static void init(File file) { config = new Configuration(file); @@ -176,7 +175,6 @@ public class ConfigHandler { category = "Compatibility"; config.addCustomCategoryComment(category, "Compatibility settings"); - compatibilityJustEnoughItems = config.getBoolean("compatibilityJustEnoughItems", category, true, "Enables the JEI recipe categories for specialized recipes."); config.save(); } diff --git a/src/main/java/WayofTime/bloodmagic/compat/jei/BloodMagicPlugin.java b/src/main/java/WayofTime/bloodmagic/compat/jei/BloodMagicPlugin.java index e5db7008..741a51c9 100644 --- a/src/main/java/WayofTime/bloodmagic/compat/jei/BloodMagicPlugin.java +++ b/src/main/java/WayofTime/bloodmagic/compat/jei/BloodMagicPlugin.java @@ -7,6 +7,7 @@ import WayofTime.bloodmagic.compat.jei.binding.BindingRecipeCategory; import WayofTime.bloodmagic.compat.jei.binding.BindingRecipeHandler; import WayofTime.bloodmagic.compat.jei.binding.BindingRecipeMaker; import mezz.jei.api.IModPlugin; +import mezz.jei.api.JEIPlugin; import mezz.jei.api.recipe.IRecipeCategory; import mezz.jei.api.recipe.IRecipeHandler; import mezz.jei.api.recipe.IRecipeTransferHelper; @@ -16,6 +17,7 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; +@JEIPlugin public class BloodMagicPlugin implements IModPlugin { @Override diff --git a/src/main/java/WayofTime/bloodmagic/compat/jei/CompatibilityJustEnoughItems.java b/src/main/java/WayofTime/bloodmagic/compat/jei/CompatibilityJustEnoughItems.java index e0b0d76d..95d3b46b 100644 --- a/src/main/java/WayofTime/bloodmagic/compat/jei/CompatibilityJustEnoughItems.java +++ b/src/main/java/WayofTime/bloodmagic/compat/jei/CompatibilityJustEnoughItems.java @@ -1,14 +1,15 @@ package WayofTime.bloodmagic.compat.jei; -import WayofTime.bloodmagic.ConfigHandler; import WayofTime.bloodmagic.compat.ICompatibility; +import WayofTime.bloodmagic.registry.ModBlocks; import mezz.jei.api.JEIManager; +import net.minecraft.item.ItemStack; public class CompatibilityJustEnoughItems implements ICompatibility { @Override public void loadCompatibility() { - JEIManager.pluginRegistry.registerPlugin(new BloodMagicPlugin()); + JEIManager.itemBlacklist.addItemToBlacklist(new ItemStack(ModBlocks.bloodLight)); } @Override @@ -18,6 +19,6 @@ public class CompatibilityJustEnoughItems implements ICompatibility { @Override public boolean enableCompat() { - return ConfigHandler.compatibilityJustEnoughItems; + return true; } } 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 36ed65b2..29b2ce8b 100644 --- a/src/main/java/WayofTime/bloodmagic/compat/jei/altar/AltarRecipeCategory.java +++ b/src/main/java/WayofTime/bloodmagic/compat/jei/altar/AltarRecipeCategory.java @@ -7,6 +7,7 @@ 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.util.ResourceLocation; import javax.annotation.Nonnull; @@ -39,6 +40,11 @@ public class AltarRecipeCategory implements IRecipeCategory { return background; } + @Override + public void drawExtras(Minecraft minecraft) { + + } + @Override public void init(@Nonnull IRecipeLayout recipeLayout) { recipeLayout.getItemStacks().init(INPUT_SLOT, true, 31, 0); 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 c4f0f68f..cd5e706b 100644 --- a/src/main/java/WayofTime/bloodmagic/compat/jei/binding/BindingRecipeCategory.java +++ b/src/main/java/WayofTime/bloodmagic/compat/jei/binding/BindingRecipeCategory.java @@ -7,6 +7,7 @@ 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.util.ResourceLocation; import javax.annotation.Nonnull; @@ -39,6 +40,11 @@ public class BindingRecipeCategory implements IRecipeCategory { return background; } + @Override + public void drawExtras(Minecraft minecraft) { + + } + @Override public void init(@Nonnull IRecipeLayout recipeLayout) { recipeLayout.getItemStacks().init(INPUT_SLOT, true, 0, 5);