diff --git a/src/main/java/net/minecraft/item/crafting/CraftingManager.java b/src/main/java/net/minecraft/item/crafting/CraftingManager.java index 961989d..00fd1ab 100644 --- a/src/main/java/net/minecraft/item/crafting/CraftingManager.java +++ b/src/main/java/net/minecraft/item/crafting/CraftingManager.java @@ -5,6 +5,9 @@ import java.util.Comparator; import java.util.HashMap; import java.util.List; + +import org.ultramine.server.UltramineServerModContainer; + import net.minecraft.block.Block; import net.minecraft.init.Blocks; import net.minecraft.init.Items; @@ -316,6 +319,7 @@ } else { + /* for (j = 0; j < this.recipes.size(); ++j) { IRecipe irecipe = (IRecipe)this.recipes.get(j); @@ -325,8 +329,10 @@ return irecipe.getCraftingResult(p_82787_1_); } } + */ - return null; + IRecipe recipe = UltramineServerModContainer.getInstance().getRecipeCache().findRecipe(p_82787_1_, p_82787_2_); + return recipe == null ? null : recipe.getCraftingResult(p_82787_1_); } } diff --git a/src/main/java/org/ultramine/server/RecipeCache.java b/src/main/java/org/ultramine/server/RecipeCache.java index 65cff56..1042fc8 100644 --- a/src/main/java/org/ultramine/server/RecipeCache.java +++ b/src/main/java/org/ultramine/server/RecipeCache.java @@ -27,6 +27,10 @@ public RecipeCache() { originList = CraftingManager.getInstance().getRecipeList(); + } + + public void installHardOverride() + { CraftingManager.getInstance().recipes = newRecipeList; } diff --git a/src/main/java/org/ultramine/server/UltramineServerModContainer.java b/src/main/java/org/ultramine/server/UltramineServerModContainer.java index f0f462c..151eede 100644 --- a/src/main/java/org/ultramine/server/UltramineServerModContainer.java +++ b/src/main/java/org/ultramine/server/UltramineServerModContainer.java @@ -52,7 +52,7 @@ @SideOnly(Side.SERVER) private ButtonCommand buttonCommand; - private RecipeCache recipeCache; + private final RecipeCache recipeCache = new RecipeCache(); public UltramineServerModContainer() { @@ -143,7 +143,7 @@ loader.addDefaultWarps(); for(String name : loader.getFastWarps()) reg.registerCommand(new FastWarpCommand(name)); - recipeCache = new RecipeCache(); +// recipeCache.installHardOverride(); } @Subscribe