From 0f26cbedd78022f1792dda296fce46f6405cbe0a Mon Sep 17 00:00:00 2001 From: TehNut Date: Mon, 14 Dec 2015 01:07:22 -0600 Subject: [PATCH] Update JEI compat to latest --- gradle.properties | 2 +- .../compat/jei/BloodMagicPlugin.java | 39 +++---------------- .../compat/jei/altar/AltarRecipeCategory.java | 9 +++-- .../compat/jei/altar/AltarRecipeJEI.java | 12 +++--- .../jei/binding/BindingRecipeCategory.java | 9 +++-- .../compat/jei/binding/BindingRecipeJEI.java | 12 +++--- 6 files changed, 31 insertions(+), 52 deletions(-) diff --git a/gradle.properties b/gradle.properties index 28f8ec76..41a5396a 100644 --- a/gradle.properties +++ b/gradle.properties @@ -7,4 +7,4 @@ curse_id=224791 mappings_version=snapshot_20151128 -jei_version=2.2.0.15 \ No newline at end of file +jei_version=2.8.2.38 \ 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 741a51c9..31f03db6 100644 --- a/src/main/java/WayofTime/bloodmagic/compat/jei/BloodMagicPlugin.java +++ b/src/main/java/WayofTime/bloodmagic/compat/jei/BloodMagicPlugin.java @@ -7,15 +7,8 @@ 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.IModRegistry; import mezz.jei.api.JEIPlugin; -import mezz.jei.api.recipe.IRecipeCategory; -import mezz.jei.api.recipe.IRecipeHandler; -import mezz.jei.api.recipe.IRecipeTransferHelper; - -import javax.annotation.Nonnull; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; @JEIPlugin public class BloodMagicPlugin implements IModPlugin { @@ -26,38 +19,18 @@ public class BloodMagicPlugin implements IModPlugin { } @Override - @Nonnull - public Iterable getRecipeCategories() { - return Arrays.asList( + public void register(IModRegistry registry) { + registry.addRecipeCategories( new AltarRecipeCategory(), new BindingRecipeCategory() ); - } - @Override - @Nonnull - public Iterable getRecipeHandlers() { - return Arrays.asList( + registry.addRecipeHandlers( new AltarRecipeHandler(), new BindingRecipeHandler() ); - } - @Nonnull - public Iterable getRecipeTransferHelpers() { - return Arrays.asList( - - ); - } - - @Override - @Nonnull - public Iterable getRecipes() { - List recipes = new ArrayList(); - - recipes.addAll(AltarRecipeMaker.getRecipes()); - recipes.addAll(BindingRecipeMaker.getRecipes()); - - return recipes; + registry.addRecipes(AltarRecipeMaker.getRecipes()); + registry.addRecipes(BindingRecipeMaker.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 29b2ce8b..a256c9fb 100644 --- a/src/main/java/WayofTime/bloodmagic/compat/jei/altar/AltarRecipeCategory.java +++ b/src/main/java/WayofTime/bloodmagic/compat/jei/altar/AltarRecipeCategory.java @@ -46,14 +46,17 @@ public class AltarRecipeCategory implements IRecipeCategory { } @Override - public void init(@Nonnull IRecipeLayout recipeLayout) { - recipeLayout.getItemStacks().init(INPUT_SLOT, true, 31, 0); - recipeLayout.getItemStacks().init(OUTPUT_SLOT, false, 125, 30); + public void drawAnimations(Minecraft minecraft) { + } @Override @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); + if (recipeWrapper instanceof AltarRecipeJEI) { AltarRecipeJEI altarRecipeWrapper = (AltarRecipeJEI) recipeWrapper; recipeLayout.getItemStacks().set(INPUT_SLOT, altarRecipeWrapper.getInputs()); 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 fb338d59..8fbf8560 100644 --- a/src/main/java/WayofTime/bloodmagic/compat/jei/altar/AltarRecipeJEI.java +++ b/src/main/java/WayofTime/bloodmagic/compat/jei/altar/AltarRecipeJEI.java @@ -27,11 +27,6 @@ public class AltarRecipeJEI extends BloodMagicRecipeWrapper { this.infoString = new String[]{TextHelper.localize("jei.BloodMagic.recipe.requiredTier", tier), TextHelper.localize("jei.BloodMagic.recipe.requiredLP", requiredLP)}; } - @Override - public boolean usesOreDictionaryComparison() { - return false; - } - @Override public List getInputs() { return Collections.singletonList(input); @@ -43,8 +38,13 @@ public class AltarRecipeJEI extends BloodMagicRecipeWrapper { } @Override - public void drawInfo(@Nonnull Minecraft minecraft) { + public void drawInfo(@Nonnull Minecraft minecraft, int recipeWidth, int recipeHeight) { minecraft.fontRendererObj.drawString(infoString[0], 90 - minecraft.fontRendererObj.getStringWidth(infoString[0]) / 2, 0, Color.gray.getRGB()); minecraft.fontRendererObj.drawString(infoString[1], 90 - minecraft.fontRendererObj.getStringWidth(infoString[1]) / 2, 10, Color.gray.getRGB()); } + + @Override + public void drawAnimations(@Nonnull Minecraft minecraft, int recipeWidth, int recipeHeight) { + + } } 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 cd5e706b..2e4f6160 100644 --- a/src/main/java/WayofTime/bloodmagic/compat/jei/binding/BindingRecipeCategory.java +++ b/src/main/java/WayofTime/bloodmagic/compat/jei/binding/BindingRecipeCategory.java @@ -46,14 +46,17 @@ public class BindingRecipeCategory implements IRecipeCategory { } @Override - public void init(@Nonnull IRecipeLayout recipeLayout) { - recipeLayout.getItemStacks().init(INPUT_SLOT, true, 0, 5); - recipeLayout.getItemStacks().init(OUTPUT_SLOT, false, 73, 5); + public void drawAnimations(Minecraft minecraft) { + } @Override @SuppressWarnings("unchecked") public void setRecipe(@Nonnull IRecipeLayout recipeLayout, @Nonnull IRecipeWrapper recipeWrapper) { + + recipeLayout.getItemStacks().init(INPUT_SLOT, true, 0, 5); + recipeLayout.getItemStacks().init(OUTPUT_SLOT, false, 73, 5); + if (recipeWrapper instanceof BindingRecipeJEI) { BindingRecipeJEI bindingRecipeWrapper = (BindingRecipeJEI) recipeWrapper; recipeLayout.getItemStacks().set(INPUT_SLOT, bindingRecipeWrapper.getInputs()); 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 41ef0bfa..7a65aa8c 100644 --- a/src/main/java/WayofTime/bloodmagic/compat/jei/binding/BindingRecipeJEI.java +++ b/src/main/java/WayofTime/bloodmagic/compat/jei/binding/BindingRecipeJEI.java @@ -21,11 +21,6 @@ public class BindingRecipeJEI extends BloodMagicRecipeWrapper { this.output = output; } - @Override - public boolean usesOreDictionaryComparison() { - return false; - } - @Override public List getInputs() { return Collections.singletonList(input); @@ -37,7 +32,12 @@ public class BindingRecipeJEI extends BloodMagicRecipeWrapper { } @Override - public void drawInfo(@Nonnull Minecraft minecraft) { + public void drawInfo(@Nonnull Minecraft minecraft, int recipeWidth, int recipeHeight) { + + } + + @Override + public void drawAnimations(@Nonnull Minecraft minecraft, int recipeWidth, int recipeHeight) { } }