diff --git a/src/main/java/net/minecraftforge/oredict/RecipeSorter.java b/src/main/java/net/minecraftforge/oredict/RecipeSorter.java index 74018e0c4..bc7f152dd 100644 --- a/src/main/java/net/minecraftforge/oredict/RecipeSorter.java +++ b/src/main/java/net/minecraftforge/oredict/RecipeSorter.java @@ -18,11 +18,14 @@ import net.minecraft.item.crafting.CraftingManager; import net.minecraft.item.crafting.IRecipe; import net.minecraft.item.crafting.RecipeBookCloning; import net.minecraft.item.crafting.RecipeFireworks; +import net.minecraft.item.crafting.RecipeRepairItem; import net.minecraft.item.crafting.RecipesArmorDyes; import net.minecraft.item.crafting.RecipesMapCloning; import net.minecraft.item.crafting.RecipesMapExtending; import net.minecraft.item.crafting.ShapedRecipes; import net.minecraft.item.crafting.ShapelessRecipes; +import net.minecraft.item.crafting.RecipesBanners.RecipeAddPattern; +import net.minecraft.item.crafting.RecipesBanners.RecipeDuplicatePattern; import static net.minecraftforge.oredict.RecipeSorter.Category.*; @SuppressWarnings("rawtypes") @@ -115,15 +118,18 @@ public class RecipeSorter implements Comparator register("minecraft:shaped", ShapedRecipes.class, SHAPED, "before:minecraft:shapeless"); register("minecraft:mapextending", RecipesMapExtending.class, SHAPED, "after:minecraft:shaped before:minecraft:shapeless"); register("minecraft:shapeless", ShapelessRecipes.class, SHAPELESS, "after:minecraft:shaped"); + register("minecraft:repair", RecipeRepairItem.class, SHAPELESS, "after:minecraft:shapeless"); //Size 4 register("minecraft:bookcloning", RecipeBookCloning.class, SHAPELESS, "after:minecraft:shapeless"); //Size 9 register("minecraft:fireworks", RecipeFireworks.class, SHAPELESS, "after:minecraft:shapeless"); //Size 10 register("minecraft:armordyes", RecipesArmorDyes.class, SHAPELESS, "after:minecraft:shapeless"); //Size 10 register("minecraft:mapcloning", RecipesMapCloning.class, SHAPELESS, "after:minecraft:shapeless"); //Size 10 + register("minecraft:pattern_dupe", RecipeDuplicatePattern.class, SHAPELESS, "after:minecraft:shapeless"); //Size 2 + register("minecraft:pattern_add", RecipeAddPattern.class, SHAPELESS, "after:minecraft:shapeless"); //Size 10 register("forge:shapedore", ShapedOreRecipe.class, SHAPED, "after:minecraft:shaped before:minecraft:shapeless"); register("forge:shapelessore", ShapelessOreRecipe.class, SHAPELESS, "after:minecraft:shapeless"); } - + @Override public int compare(IRecipe r1, IRecipe r2) { @@ -133,7 +139,7 @@ public class RecipeSorter implements Comparator if (c1 == SHAPED && c2 == SHAPELESS) return -1; if (r2.getRecipeSize() < r1.getRecipeSize()) return -1; if (r2.getRecipeSize() > r1.getRecipeSize()) return 1; - return getPriority(r2) - getPriority(r1); // high priority value first! + return getPriority(r2) - getPriority(r1); // high priority value first! } private static Set warned = Sets.newHashSet(); @@ -145,7 +151,7 @@ public class RecipeSorter implements Comparator warned.clear(); Collections.sort(CraftingManager.getInstance().getRecipeList(), INSTANCE); } - + public static void register(String name, Class recipe, Category category, String dependancies) { assert(category != UNKNOWN) : "Category must not be unknown!"; diff --git a/src/main/resources/forge_at.cfg b/src/main/resources/forge_at.cfg index 49efb1763..ff42e14a5 100644 --- a/src/main/resources/forge_at.cfg +++ b/src/main/resources/forge_at.cfg @@ -118,3 +118,5 @@ public net.minecraft.world.gen.ChunkProviderServer field_73245_g # loadedChunks public net.minecraft.world.gen.ChunkProviderServer field_73251_h # worldObj # RenderEntityItem protected net.minecraft.client.renderer.entity.RenderEntityItem func_177078_a(Lnet/minecraft/item/ItemStack;)I # getMiniItemCount +public net.minecraft.item.crafting.RecipesBanners$RecipeAddPattern +public net.minecraft.item.crafting.RecipesBanners$RecipeDuplicatePattern \ No newline at end of file