From 3716ac9265e8cd63e31aa59f331ee7994a631feb Mon Sep 17 00:00:00 2001 From: gigaherz Date: Mon, 14 Nov 2016 21:35:07 +0100 Subject: [PATCH] Fix crash with JEI. --- build.gradle | 12 ++++++------ .../survivalist/integration/MixedRecipeWrapper.java | 5 ++++- .../integration/chopping/ChoppingCategory.java | 9 +++------ .../integration/drying/DryingCategory.java | 8 ++------ .../integration/drying/DryingRecipeWrapper.java | 2 +- 5 files changed, 16 insertions(+), 20 deletions(-) diff --git a/build.gradle b/build.gradle index b9a99f5..9d4b1cb 100644 --- a/build.gradle +++ b/build.gradle @@ -29,15 +29,15 @@ repositories { apply plugin: 'net.minecraftforge.gradle.forge' -version = "1.7.1" +version = "1.7.2" group= "gigaherz.survivalist" // http://maven.apache.org/guides/mini/guide-naming-conventions.html archivesBaseName = "Survivalist-1.10.2" minecraft { - version = "1.10.2-12.18.2.2114" + version = "1.10.2-12.18.2.2125" runDir = "run" - mappings = "snapshot_20161029" + mappings = "snapshot_20161112" replace "@VERSION@", project.version replaceIn "Survivalist.java" @@ -68,10 +68,10 @@ artifacts { } dependencies { - deobfCompile "gigaherz.commons:Commons:1.10.2-0.4.1" + deobfCompile "gigaherz.commons:Commons:1.10.2-0.4.2" - deobfCompile "mezz.jei:jei_1.10.2:3.12.3.293:api" - runtime "mezz.jei:jei_1.10.2:3.12.3.293" + deobfCompile "mezz.jei:jei_1.10.2:3.13.3.372:api" + runtime "mezz.jei:jei_1.10.2:3.13.3.372" compile fileTree(dir: 'libs', include: '*.jar') } diff --git a/src/main/java/gigaherz/survivalist/integration/MixedRecipeWrapper.java b/src/main/java/gigaherz/survivalist/integration/MixedRecipeWrapper.java index 64d008f..d86d43b 100644 --- a/src/main/java/gigaherz/survivalist/integration/MixedRecipeWrapper.java +++ b/src/main/java/gigaherz/survivalist/integration/MixedRecipeWrapper.java @@ -3,6 +3,9 @@ import mezz.jei.api.ingredients.IIngredients; import mezz.jei.api.recipe.BlankRecipeWrapper; import net.minecraft.item.ItemStack; +import net.minecraftforge.oredict.OreDictionary; + +import java.util.Collections; public abstract class MixedRecipeWrapper extends BlankRecipeWrapper { @@ -26,7 +29,7 @@ protected MixedRecipeWrapper(ItemStack input, ItemStack output) public void getIngredients(IIngredients ingredients) { if (inputOredict != null) - ingredients.setInput(String.class, inputOredict); + ingredients.setInputLists(ItemStack.class, Collections.singletonList(OreDictionary.getOres(inputOredict))); if (inputStack != null) ingredients.setInput(ItemStack.class, inputStack); ingredients.setOutput(ItemStack.class, output); diff --git a/src/main/java/gigaherz/survivalist/integration/chopping/ChoppingCategory.java b/src/main/java/gigaherz/survivalist/integration/chopping/ChoppingCategory.java index 9bd1a07..74ef8e9 100644 --- a/src/main/java/gigaherz/survivalist/integration/chopping/ChoppingCategory.java +++ b/src/main/java/gigaherz/survivalist/integration/chopping/ChoppingCategory.java @@ -6,14 +6,16 @@ import mezz.jei.api.gui.IGuiItemStackGroup; import mezz.jei.api.gui.IRecipeLayout; import mezz.jei.api.ingredients.IIngredients; +import mezz.jei.api.recipe.BlankRecipeCategory; import mezz.jei.api.recipe.IRecipeCategory; import net.minecraft.client.Minecraft; import net.minecraft.client.resources.I18n; import net.minecraft.util.ResourceLocation; import javax.annotation.Nonnull; +import javax.annotation.Nullable; -public class ChoppingCategory implements IRecipeCategory +public class ChoppingCategory extends BlankRecipeCategory { private static final ResourceLocation GUI_TEXTURE_LOCATION = Survivalist.location("textures/gui/conversion.png"); public static final String UID = Survivalist.MODID + "_chopping"; @@ -50,11 +52,6 @@ public IDrawable getBackground() return background; } - @Override - public void drawExtras(@Nonnull Minecraft mc) - { - } - @Override public void drawAnimations(@Nonnull Minecraft minecraft) { diff --git a/src/main/java/gigaherz/survivalist/integration/drying/DryingCategory.java b/src/main/java/gigaherz/survivalist/integration/drying/DryingCategory.java index e729599..6b071f8 100644 --- a/src/main/java/gigaherz/survivalist/integration/drying/DryingCategory.java +++ b/src/main/java/gigaherz/survivalist/integration/drying/DryingCategory.java @@ -6,6 +6,7 @@ import mezz.jei.api.gui.IGuiItemStackGroup; import mezz.jei.api.gui.IRecipeLayout; import mezz.jei.api.ingredients.IIngredients; +import mezz.jei.api.recipe.BlankRecipeCategory; import mezz.jei.api.recipe.IRecipeCategory; import net.minecraft.client.Minecraft; import net.minecraft.client.resources.I18n; @@ -13,7 +14,7 @@ import javax.annotation.Nonnull; -public class DryingCategory implements IRecipeCategory +public class DryingCategory extends BlankRecipeCategory { private static final ResourceLocation GUI_TEXTURE_LOCATION = Survivalist.location("textures/gui/conversion.png"); public static final String UID = Survivalist.MODID + "_drying"; @@ -50,11 +51,6 @@ public IDrawable getBackground() return background; } - @Override - public void drawExtras(@Nonnull Minecraft mc) - { - } - @Override public void drawAnimations(@Nonnull Minecraft minecraft) { diff --git a/src/main/java/gigaherz/survivalist/integration/drying/DryingRecipeWrapper.java b/src/main/java/gigaherz/survivalist/integration/drying/DryingRecipeWrapper.java index 34c5256..c38cfd4 100644 --- a/src/main/java/gigaherz/survivalist/integration/drying/DryingRecipeWrapper.java +++ b/src/main/java/gigaherz/survivalist/integration/drying/DryingRecipeWrapper.java @@ -25,7 +25,7 @@ public static List getRecipes() return list; } - int time; + private int time; private DryingRecipeWrapper(String input, ItemStack output, int time) {