keith
/
ForgePatch
1
0
Fork 0
Code Issues Pull Requests Projects Releases 2 Wiki Activity

Clean up ShapedOreRecipe and ShapelessOreRecipe

This commit is contained in:
mezz 2017-06-11 14:24:17 -07:00
parent f009435fa4
commit 864b05074e
2 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/net/minecraftforge/oredict/ShapedOreRecipe.java Normal file → Executable file
View File

@ -84,7 +84,7 @@ public class ShapedOreRecipe extends IForgeRegistryEntry.Impl<IRecipe> 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<IRecipe> implement
return this;
}
@Nonnull
public NonNullList<Ingredient> func_192400_c()
{
return this.input;
}
@Override
public NonNullList<ItemStack> getRemainingItems(InventoryCrafting inv) //getRecipeLeftovers
@Nonnull
public NonNullList<ItemStack> getRemainingItems(@Nonnull InventoryCrafting inv) //getRecipeLeftovers
{
return ForgeHooks.defaultRecipeGetRemainingItems(inv);
}
@ -164,6 +166,8 @@ public class ShapedOreRecipe extends IForgeRegistryEntry.Impl<IRecipe> implement
return height;
}
@Override
@Nonnull
public String func_193358_e()
{
return this.group.toString();

9
src/main/java/net/minecraftforge/oredict/ShapelessOreRecipe.java Normal file → Executable file
View File

@ -90,7 +90,7 @@ public class ShapelessOreRecipe extends IForgeRegistryEntry.Impl<IRecipe> 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<Ingredient> required = NonNullList.create();
required.addAll(input);
@ -124,7 +124,8 @@ public class ShapelessOreRecipe extends IForgeRegistryEntry.Impl<IRecipe> implem
return required.isEmpty();
}
@Override
@Nonnull
public NonNullList<Ingredient> func_192400_c()
{
return this.input;
@ -132,11 +133,13 @@ public class ShapelessOreRecipe extends IForgeRegistryEntry.Impl<IRecipe> implem
@Override
@Nonnull
public NonNullList<ItemStack> getRemainingItems(InventoryCrafting inv)
public NonNullList<ItemStack> getRemainingItems(@Nonnull InventoryCrafting inv)
{
return ForgeHooks.defaultRecipeGetRemainingItems(inv);
}
@Override
@Nonnull
public String func_193358_e()
{
return this.group == null ? "" : this.group.toString();