From 0458d29bbfe1507319f007fe0450e1ebc300bc79 Mon Sep 17 00:00:00 2001 From: tterrag1098 Date: Thu, 21 Aug 2014 02:35:18 -0400 Subject: [PATCH] Fix non-sorted IRecipes and register dark iron bars in OreDict --- .../conduit/item/filter/ClearFilterRecipe.java | 9 ++++++--- .../enderio/conduit/item/filter/CopyFilterRecipe.java | 11 ++++++----- .../crazypants/enderio/machine/ClearConfigRecipe.java | 6 ++++++ .../enderio/material/BlockDarkIronBars.java | 6 +++--- 4 files changed, 21 insertions(+), 11 deletions(-) diff --git a/src/main/java/crazypants/enderio/conduit/item/filter/ClearFilterRecipe.java b/src/main/java/crazypants/enderio/conduit/item/filter/ClearFilterRecipe.java index 8ecf4cc5..047ec520 100644 --- a/src/main/java/crazypants/enderio/conduit/item/filter/ClearFilterRecipe.java +++ b/src/main/java/crazypants/enderio/conduit/item/filter/ClearFilterRecipe.java @@ -1,20 +1,23 @@ package crazypants.enderio.conduit.item.filter; -import net.minecraft.block.Block; import net.minecraft.inventory.InventoryCrafting; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.IRecipe; -import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.EnumChatFormatting; import net.minecraft.world.World; import net.minecraftforge.event.entity.player.ItemTooltipEvent; +import net.minecraftforge.oredict.RecipeSorter; +import net.minecraftforge.oredict.RecipeSorter.Category; import cpw.mods.fml.common.eventhandler.SubscribeEvent; import crazypants.enderio.conduit.item.FilterRegister; -import crazypants.enderio.machine.AbstractMachineBlock; import crazypants.util.Lang; public class ClearFilterRecipe implements IRecipe{ + static { + RecipeSorter.register("EnderIO:clearFilter", ClearFilterRecipe.class, Category.SHAPELESS, "after:minecraft:shapeless"); + } + private ItemStack output; @Override diff --git a/src/main/java/crazypants/enderio/conduit/item/filter/CopyFilterRecipe.java b/src/main/java/crazypants/enderio/conduit/item/filter/CopyFilterRecipe.java index 2de30960..8e3f7d5b 100644 --- a/src/main/java/crazypants/enderio/conduit/item/filter/CopyFilterRecipe.java +++ b/src/main/java/crazypants/enderio/conduit/item/filter/CopyFilterRecipe.java @@ -3,15 +3,16 @@ package crazypants.enderio.conduit.item.filter; import net.minecraft.inventory.InventoryCrafting; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.IRecipe; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.EnumChatFormatting; import net.minecraft.world.World; -import net.minecraftforge.event.entity.player.ItemTooltipEvent; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; +import net.minecraftforge.oredict.RecipeSorter; +import net.minecraftforge.oredict.RecipeSorter.Category; import crazypants.enderio.conduit.item.FilterRegister; -import crazypants.util.Lang; public class CopyFilterRecipe implements IRecipe{ + + static { + RecipeSorter.register("EnderIO:copyFilter", CopyFilterRecipe.class, Category.SHAPELESS, "after:minecraft:shapeless"); + } private ItemStack output; diff --git a/src/main/java/crazypants/enderio/machine/ClearConfigRecipe.java b/src/main/java/crazypants/enderio/machine/ClearConfigRecipe.java index 900e1e32..bb46baee 100644 --- a/src/main/java/crazypants/enderio/machine/ClearConfigRecipe.java +++ b/src/main/java/crazypants/enderio/machine/ClearConfigRecipe.java @@ -10,8 +10,14 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.EnumChatFormatting; import net.minecraft.world.World; import net.minecraftforge.event.entity.player.ItemTooltipEvent; +import net.minecraftforge.oredict.RecipeSorter; +import net.minecraftforge.oredict.RecipeSorter.Category; public class ClearConfigRecipe implements IRecipe{ + + static { + RecipeSorter.register("EnderIO:clearConfig", ClearConfigRecipe.class, Category.SHAPELESS, "after:minecraft:shapeless"); + } private ItemStack output; diff --git a/src/main/java/crazypants/enderio/material/BlockDarkIronBars.java b/src/main/java/crazypants/enderio/material/BlockDarkIronBars.java index 263e9a38..2476fff4 100644 --- a/src/main/java/crazypants/enderio/material/BlockDarkIronBars.java +++ b/src/main/java/crazypants/enderio/material/BlockDarkIronBars.java @@ -2,6 +2,7 @@ package crazypants.enderio.material; import net.minecraft.block.BlockPane; import net.minecraft.block.material.Material; +import net.minecraftforge.oredict.OreDictionary; import cpw.mods.fml.common.registry.GameRegistry; import crazypants.enderio.EnderIOTab; import crazypants.enderio.ModObject; @@ -24,9 +25,8 @@ public class BlockDarkIronBars extends BlockPane { } protected void init() { - GameRegistry.registerBlock(this, BlockItemDarkIronBars.class, ModObject.blockDarkIronBars.unlocalisedName); + GameRegistry.registerBlock(this, BlockItemDarkIronBars.class, ModObject.blockDarkIronBars.unlocalisedName); + OreDictionary.registerOre("barsIron", this); } - - }