From 142cefd9be33efde44fe66507093b0570f2edaeb Mon Sep 17 00:00:00 2001 From: Nick Date: Fri, 1 Jan 2016 13:47:17 -0800 Subject: [PATCH] Attempt #1 at orb recipe handlers They do not work, they are not initialized. i need a break. my brain hurts --- .../api/recipe/ShapedBloodOrbRecipe.java | 7 ++++++ .../api/recipe/ShapelessBloodOrbRecipe.java | 9 +++++++- .../compat/jei/BloodMagicPlugin.java | 15 ++++++++---- .../compat/jei/BloodMagicRecipeWrapper.java | 23 ------------------- .../AlchemyArrayCraftingRecipeJEI.java | 19 +++------------ .../compat/jei/altar/AltarRecipeJEI.java | 10 ++------ .../compat/jei/binding/BindingRecipeJEI.java | 19 +++------------ 7 files changed, 33 insertions(+), 69 deletions(-) delete mode 100644 src/main/java/WayofTime/bloodmagic/compat/jei/BloodMagicRecipeWrapper.java diff --git a/src/main/java/WayofTime/bloodmagic/api/recipe/ShapedBloodOrbRecipe.java b/src/main/java/WayofTime/bloodmagic/api/recipe/ShapedBloodOrbRecipe.java index febbd3f4..0469089f 100644 --- a/src/main/java/WayofTime/bloodmagic/api/recipe/ShapedBloodOrbRecipe.java +++ b/src/main/java/WayofTime/bloodmagic/api/recipe/ShapedBloodOrbRecipe.java @@ -28,6 +28,7 @@ public class ShapedBloodOrbRecipe implements IRecipe private Object[] input = null; public int width = 0; public int height = 0; + private int tier; private boolean mirrored = true; public ShapedBloodOrbRecipe(Block result, Object... recipe) @@ -237,6 +238,7 @@ public class ShapedBloodOrbRecipe implements IRecipe if (slot != null && slot.getItem() instanceof IBloodOrb) { IBloodOrb orb = (IBloodOrb) slot.getItem(); + tier = (Integer) target; if (orb.getOrbLevel(slot.getItemDamage()) < (Integer) target) { return false; @@ -296,4 +298,9 @@ public class ShapedBloodOrbRecipe implements IRecipe return aitemstack; } + + public int getTier() + { + return tier; + } } \ No newline at end of file diff --git a/src/main/java/WayofTime/bloodmagic/api/recipe/ShapelessBloodOrbRecipe.java b/src/main/java/WayofTime/bloodmagic/api/recipe/ShapelessBloodOrbRecipe.java index c69dfcb1..00e45c50 100644 --- a/src/main/java/WayofTime/bloodmagic/api/recipe/ShapelessBloodOrbRecipe.java +++ b/src/main/java/WayofTime/bloodmagic/api/recipe/ShapelessBloodOrbRecipe.java @@ -23,6 +23,7 @@ public class ShapelessBloodOrbRecipe implements IRecipe { private ItemStack output = null; private ArrayList input = new ArrayList(); + private int tier; public ShapelessBloodOrbRecipe(Block result, Object... recipe) { @@ -130,9 +131,10 @@ public class ShapelessBloodOrbRecipe implements IRecipe // orb value of the item instead if (next instanceof Integer) { - if (slot != null && slot.getItem() instanceof IBloodOrb) + if (slot.getItem() instanceof IBloodOrb) { IBloodOrb orb = (IBloodOrb) slot.getItem(); + tier = (Integer) next; if (orb.getOrbLevel(slot.getItemDamage()) < (Integer) next) { return false; @@ -188,4 +190,9 @@ public class ShapelessBloodOrbRecipe implements IRecipe return aitemstack; } + + public int getTier() + { + return tier; + } } \ 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 1ac12dec..65eb8249 100644 --- a/src/main/java/WayofTime/bloodmagic/compat/jei/BloodMagicPlugin.java +++ b/src/main/java/WayofTime/bloodmagic/compat/jei/BloodMagicPlugin.java @@ -1,6 +1,5 @@ package WayofTime.bloodmagic.compat.jei; -import WayofTime.bloodmagic.api.alchemyCrafting.AlchemyArrayEffectCrafting; import WayofTime.bloodmagic.compat.jei.alchemyArray.AlchemyArrayCraftingCategory; import WayofTime.bloodmagic.compat.jei.alchemyArray.AlchemyArrayCraftingRecipeHandler; import WayofTime.bloodmagic.compat.jei.alchemyArray.AlchemyArrayCraftingRecipeMaker; @@ -15,8 +14,6 @@ import WayofTime.bloodmagic.registry.ModItems; import mezz.jei.api.*; import net.minecraft.item.ItemStack; -import java.util.Collections; - @JEIPlugin public class BloodMagicPlugin implements IModPlugin { @@ -32,9 +29,17 @@ public class BloodMagicPlugin implements IModPlugin @Override public void register(IModRegistry registry) { - registry.addRecipeCategories(new AltarRecipeCategory(), new BindingRecipeCategory(), new AlchemyArrayCraftingCategory()); + registry.addRecipeCategories( + new AltarRecipeCategory(), + new BindingRecipeCategory(), + new AlchemyArrayCraftingCategory() + ); - registry.addRecipeHandlers(new AltarRecipeHandler(), new BindingRecipeHandler(), new AlchemyArrayCraftingRecipeHandler()); + registry.addRecipeHandlers( + new AltarRecipeHandler(), + new BindingRecipeHandler(), + new AlchemyArrayCraftingRecipeHandler() + ); registry.addRecipes(AltarRecipeMaker.getRecipes()); registry.addRecipes(BindingRecipeMaker.getRecipes()); diff --git a/src/main/java/WayofTime/bloodmagic/compat/jei/BloodMagicRecipeWrapper.java b/src/main/java/WayofTime/bloodmagic/compat/jei/BloodMagicRecipeWrapper.java deleted file mode 100644 index 7e925d27..00000000 --- a/src/main/java/WayofTime/bloodmagic/compat/jei/BloodMagicRecipeWrapper.java +++ /dev/null @@ -1,23 +0,0 @@ -package WayofTime.bloodmagic.compat.jei; - -import mezz.jei.api.recipe.IRecipeWrapper; -import net.minecraftforge.fluids.FluidStack; - -import java.util.Collections; -import java.util.List; - -public abstract class BloodMagicRecipeWrapper implements IRecipeWrapper -{ - - @Override - public List getFluidInputs() - { - return Collections.emptyList(); - } - - @Override - public List getFluidOutputs() - { - return Collections.emptyList(); - } -} 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 428e7985..bcc7ee92 100644 --- a/src/main/java/WayofTime/bloodmagic/compat/jei/alchemyArray/AlchemyArrayCraftingRecipeJEI.java +++ b/src/main/java/WayofTime/bloodmagic/compat/jei/alchemyArray/AlchemyArrayCraftingRecipeJEI.java @@ -7,11 +7,10 @@ import java.util.List; import javax.annotation.Nonnull; import javax.annotation.Nullable; -import net.minecraft.client.Minecraft; +import mezz.jei.api.recipe.BlankRecipeWrapper; import net.minecraft.item.ItemStack; -import WayofTime.bloodmagic.compat.jei.BloodMagicRecipeWrapper; -public class AlchemyArrayCraftingRecipeJEI extends BloodMagicRecipeWrapper +public class AlchemyArrayCraftingRecipeJEI extends BlankRecipeWrapper { @Nonnull @@ -23,7 +22,7 @@ public class AlchemyArrayCraftingRecipeJEI extends BloodMagicRecipeWrapper @SuppressWarnings("unchecked") public AlchemyArrayCraftingRecipeJEI(@Nonnull ItemStack input, @Nullable ItemStack catalyst, @Nonnull ItemStack output) { - this.inputs = Arrays.asList(new ItemStack[] { input, catalyst }); + this.inputs = Arrays.asList(input, catalyst); this.output = output; } @@ -38,16 +37,4 @@ public class AlchemyArrayCraftingRecipeJEI extends BloodMagicRecipeWrapper { return Collections.singletonList(output); } - - @Override - public void drawInfo(@Nonnull Minecraft minecraft, int recipeWidth, int recipeHeight) - { - - } - - @Override - public void drawAnimations(@Nonnull Minecraft minecraft, int recipeWidth, int recipeHeight) - { - - } } 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 076f36bf..9d6efae3 100644 --- a/src/main/java/WayofTime/bloodmagic/compat/jei/altar/AltarRecipeJEI.java +++ b/src/main/java/WayofTime/bloodmagic/compat/jei/altar/AltarRecipeJEI.java @@ -1,7 +1,7 @@ package WayofTime.bloodmagic.compat.jei.altar; -import WayofTime.bloodmagic.compat.jei.BloodMagicRecipeWrapper; import WayofTime.bloodmagic.util.helper.TextHelper; +import mezz.jei.api.recipe.BlankRecipeWrapper; import net.minecraft.client.Minecraft; import net.minecraft.item.ItemStack; @@ -10,7 +10,7 @@ import java.awt.*; import java.util.Collections; import java.util.List; -public class AltarRecipeJEI extends BloodMagicRecipeWrapper +public class AltarRecipeJEI extends BlankRecipeWrapper { @Nonnull @@ -47,10 +47,4 @@ public class AltarRecipeJEI extends BloodMagicRecipeWrapper 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/BindingRecipeJEI.java b/src/main/java/WayofTime/bloodmagic/compat/jei/binding/BindingRecipeJEI.java index 78949c21..846fd7d6 100644 --- a/src/main/java/WayofTime/bloodmagic/compat/jei/binding/BindingRecipeJEI.java +++ b/src/main/java/WayofTime/bloodmagic/compat/jei/binding/BindingRecipeJEI.java @@ -6,11 +6,10 @@ import java.util.List; import javax.annotation.Nonnull; -import net.minecraft.client.Minecraft; +import mezz.jei.api.recipe.BlankRecipeWrapper; import net.minecraft.item.ItemStack; -import WayofTime.bloodmagic.compat.jei.BloodMagicRecipeWrapper; -public class BindingRecipeJEI extends BloodMagicRecipeWrapper +public class BindingRecipeJEI extends BlankRecipeWrapper { @Nonnull @@ -22,7 +21,7 @@ public class BindingRecipeJEI extends BloodMagicRecipeWrapper @SuppressWarnings("unchecked") public BindingRecipeJEI(@Nonnull ItemStack input, @Nonnull ItemStack catalyst, @Nonnull ItemStack output) { - this.inputs = Arrays.asList(new ItemStack[] { input, catalyst }); + this.inputs = Arrays.asList(input, catalyst); this.output = output; } @@ -37,16 +36,4 @@ public class BindingRecipeJEI extends BloodMagicRecipeWrapper { return Collections.singletonList(output); } - - @Override - public void drawInfo(@Nonnull Minecraft minecraft, int recipeWidth, int recipeHeight) - { - - } - - @Override - public void drawAnimations(@Nonnull Minecraft minecraft, int recipeWidth, int recipeHeight) - { - - } }