diff --git a/src/main/java/net/minecraftforge/oredict/ShapedOreRecipe.java b/src/main/java/net/minecraftforge/oredict/ShapedOreRecipe.java old mode 100644 new mode 100755 index 755a3517b..d128b822b --- a/src/main/java/net/minecraftforge/oredict/ShapedOreRecipe.java +++ b/src/main/java/net/minecraftforge/oredict/ShapedOreRecipe.java @@ -84,7 +84,7 @@ public class ShapedOreRecipe extends IForgeRegistryEntry.Impl implement public ItemStack getRecipeOutput(){ return output; } @Override - public boolean matches(InventoryCrafting inv, World world) + public boolean matches(@Nonnull InventoryCrafting inv, @Nonnull World world) { for (int x = 0; x <= MAX_CRAFT_GRID_WIDTH - width; x++) { @@ -143,13 +143,15 @@ public class ShapedOreRecipe extends IForgeRegistryEntry.Impl implement return this; } + @Nonnull public NonNullList func_192400_c() { return this.input; } @Override - public NonNullList getRemainingItems(InventoryCrafting inv) //getRecipeLeftovers + @Nonnull + public NonNullList getRemainingItems(@Nonnull InventoryCrafting inv) //getRecipeLeftovers { return ForgeHooks.defaultRecipeGetRemainingItems(inv); } @@ -164,6 +166,8 @@ public class ShapedOreRecipe extends IForgeRegistryEntry.Impl implement return height; } + @Override + @Nonnull public String func_193358_e() { return this.group.toString(); diff --git a/src/main/java/net/minecraftforge/oredict/ShapelessOreRecipe.java b/src/main/java/net/minecraftforge/oredict/ShapelessOreRecipe.java old mode 100644 new mode 100755 index 070372451..8b3d481ea --- a/src/main/java/net/minecraftforge/oredict/ShapelessOreRecipe.java +++ b/src/main/java/net/minecraftforge/oredict/ShapelessOreRecipe.java @@ -90,7 +90,7 @@ public class ShapelessOreRecipe extends IForgeRegistryEntry.Impl implem public ItemStack getCraftingResult(@Nonnull InventoryCrafting var1){ return output.copy(); } @Override - public boolean matches(InventoryCrafting var1, World world) + public boolean matches(@Nonnull InventoryCrafting var1, @Nonnull World world) { NonNullList required = NonNullList.create(); required.addAll(input); @@ -124,7 +124,8 @@ public class ShapelessOreRecipe extends IForgeRegistryEntry.Impl implem return required.isEmpty(); } - + @Override + @Nonnull public NonNullList func_192400_c() { return this.input; @@ -132,11 +133,13 @@ public class ShapelessOreRecipe extends IForgeRegistryEntry.Impl implem @Override @Nonnull - public NonNullList getRemainingItems(InventoryCrafting inv) + public NonNullList getRemainingItems(@Nonnull InventoryCrafting inv) { return ForgeHooks.defaultRecipeGetRemainingItems(inv); } + @Override + @Nonnull public String func_193358_e() { return this.group == null ? "" : this.group.toString();