From 3e22ee946f46fd3b326ddca7ee7dfd16ebe21444 Mon Sep 17 00:00:00 2001 From: BluSunrize Date: Sat, 19 Nov 2016 22:24:58 +0100 Subject: [PATCH] Build 49 yeah. it's terribly broken with TCon. I know >_> --- build.gradle | 2 +- changelog.md | 2 +- .../util/compat/jei/IERecipeCategory.java | 10 +++++- .../common/util/compat/jei/JEIHelper.java | 36 ++++++++++--------- .../jei/squeezer/SqueezerRecipeCategory.java | 2 +- 5 files changed, 32 insertions(+), 20 deletions(-) diff --git a/build.gradle b/build.gradle index 51a097eef5..94d58c5450 100644 --- a/build.gradle +++ b/build.gradle @@ -1,5 +1,5 @@ def mainVersion = "0.10" -def buildNumber = "48" +def buildNumber = "49" // For those who want the bleeding edge buildscript { diff --git a/changelog.md b/changelog.md index 6b091cfc36..94520ec45c 100644 --- a/changelog.md +++ b/changelog.md @@ -1,4 +1,4 @@ -#####Version 0.10-49 +#####Version 0.10-49 - BUILT - rewrote the shader system - improved texture performance - changed API integration diff --git a/src/main/java/blusunrize/immersiveengineering/common/util/compat/jei/IERecipeCategory.java b/src/main/java/blusunrize/immersiveengineering/common/util/compat/jei/IERecipeCategory.java index b1dff56a8c..165df5dbfa 100644 --- a/src/main/java/blusunrize/immersiveengineering/common/util/compat/jei/IERecipeCategory.java +++ b/src/main/java/blusunrize/immersiveengineering/common/util/compat/jei/IERecipeCategory.java @@ -8,6 +8,7 @@ import net.minecraft.client.resources.I18n; import javax.annotation.Nonnull; +import javax.annotation.Nullable; public abstract class IERecipeCategory implements IRecipeCategory, IRecipeHandler { @@ -23,7 +24,14 @@ public IERecipeCategory(String uniqueName, String localKey, IDrawable background this.background = background; this.wrapperClass = wrapperClass; } - + + @Nullable + @Override + public IDrawable getIcon() + { + return null; + } + @Override public String getUid() { diff --git a/src/main/java/blusunrize/immersiveengineering/common/util/compat/jei/JEIHelper.java b/src/main/java/blusunrize/immersiveengineering/common/util/compat/jei/JEIHelper.java index 72137e5b99..7c1ac02e03 100644 --- a/src/main/java/blusunrize/immersiveengineering/common/util/compat/jei/JEIHelper.java +++ b/src/main/java/blusunrize/immersiveengineering/common/util/compat/jei/JEIHelper.java @@ -44,22 +44,10 @@ public class JEIHelper implements IModPlugin public static IJeiHelpers jeiHelpers; @Override - public void registerIngredients(IModIngredientRegistration registry) - { - } - - @Override - public void register(IModRegistry registryIn) + public void registerItemSubtypes(ISubtypeRegistry subtypeRegistry) { - jeiHelpers = registryIn.getJeiHelpers(); - //Blacklist - jeiHelpers.getItemBlacklist().addItemToBlacklist(new ItemStack(IEContent.blockCrop,1,OreDictionary.WILDCARD_VALUE)); - jeiHelpers.getItemBlacklist().addItemToBlacklist(new ItemStack(IEContent.itemFakeIcons,1,OreDictionary.WILDCARD_VALUE)); - jeiHelpers.getItemBlacklist().addItemToBlacklist(new ItemStack(IEContent.blockStoneDevice,1,OreDictionary.WILDCARD_VALUE)); - jeiHelpers.getItemBlacklist().addItemToBlacklist(new ItemStack(IEContent.blockMetalMultiblock,1,OreDictionary.WILDCARD_VALUE)); - //NBT Ignorance - jeiHelpers.getSubtypeRegistry().registerNbtInterpreter(Item.getItemFromBlock(IEContent.blockConveyor), new ISubtypeInterpreter() + subtypeRegistry.registerNbtInterpreter(Item.getItemFromBlock(IEContent.blockConveyor), new ISubtypeInterpreter() { @Nullable @Override @@ -70,7 +58,7 @@ public String getSubtypeInfo(@Nonnull ItemStack itemStack) return null; } }); - jeiHelpers.getSubtypeRegistry().registerNbtInterpreter(IEContent.itemBullet, new ISubtypeInterpreter() + subtypeRegistry.registerNbtInterpreter(IEContent.itemBullet, new ISubtypeInterpreter() { @Nullable @Override @@ -81,8 +69,24 @@ public String getSubtypeInfo(@Nonnull ItemStack itemStack) return null; } }); + } + + @Override + public void registerIngredients(IModIngredientRegistration registry) + { + } + + @Override + public void register(IModRegistry registryIn) + { + jeiHelpers = registryIn.getJeiHelpers(); + //Blacklist + jeiHelpers.getItemBlacklist().addItemToBlacklist(new ItemStack(IEContent.blockCrop,1,OreDictionary.WILDCARD_VALUE)); + jeiHelpers.getItemBlacklist().addItemToBlacklist(new ItemStack(IEContent.itemFakeIcons,1,OreDictionary.WILDCARD_VALUE)); + jeiHelpers.getItemBlacklist().addItemToBlacklist(new ItemStack(IEContent.blockStoneDevice,1,OreDictionary.WILDCARD_VALUE)); + jeiHelpers.getItemBlacklist().addItemToBlacklist(new ItemStack(IEContent.blockMetalMultiblock,1,OreDictionary.WILDCARD_VALUE)); - registryIn.getRecipeTransferRegistry().addRecipeTransferHandler(new AssemblerRecipeTransferHandler()); + registryIn.getRecipeTransferRegistry().addRecipeTransferHandler(new AssemblerRecipeTransferHandler(), "immersiveengineering:assembler"); //Recipes IGuiHelper guiHelper = jeiHelpers.getGuiHelper(); diff --git a/src/main/java/blusunrize/immersiveengineering/common/util/compat/jei/squeezer/SqueezerRecipeCategory.java b/src/main/java/blusunrize/immersiveengineering/common/util/compat/jei/squeezer/SqueezerRecipeCategory.java index e05c99bb6e..33cd35484a 100644 --- a/src/main/java/blusunrize/immersiveengineering/common/util/compat/jei/squeezer/SqueezerRecipeCategory.java +++ b/src/main/java/blusunrize/immersiveengineering/common/util/compat/jei/squeezer/SqueezerRecipeCategory.java @@ -20,7 +20,7 @@ public SqueezerRecipeCategory(IGuiHelper helper) super("squeezer","tile.immersiveengineering.metalMultiblock.squeezer.name", helper.createDrawable(background, 6,12, 164,59), SqueezerRecipeWrapper.class); tankOverlay = helper.createDrawable(background, 177,31, 16,47, -2,2,-2,2); } - + @Override @Deprecated public void setRecipe(IRecipeLayout recipeLayout, IRecipeWrapper recipeWrapper)