54 lines
2.6 KiB
Diff
54 lines
2.6 KiB
Diff
|
--- a/net/minecraft/server/CraftingManager.java
|
||
|
|
+++ b/net/minecraft/server/CraftingManager.java
|
||
|
|
@@ -9,10 +9,16 @@
|
||
|
|
import java.util.Iterator;
|
||
|
|
import java.util.List;
|
||
|
|
|
||
|
|
+import org.bukkit.craftbukkit.event.CraftEventFactory; // CraftBukkit
|
||
|
|
+
|
||
|
|
public class CraftingManager {
|
||
|
|
|
||
|
|
private static final CraftingManager a = new CraftingManager();
|
||
|
|
public List<IRecipe> recipes = Lists.newArrayList();
|
||
|
|
+ // CraftBukkit start
|
||
|
|
+ public IRecipe lastRecipe;
|
||
|
|
+ public org.bukkit.inventory.InventoryView lastCraftView;
|
||
|
|
+ // CraftBukkit end
|
||
|
|
|
||
|
|
public static CraftingManager getInstance() {
|
||
|
|
return CraftingManager.a;
|
||
|
|
@@ -167,7 +173,12 @@
|
||
|
|
this.registerShapedRecipe(new ItemStack(Blocks.DAYLIGHT_DETECTOR), new Object[] { "GGG", "QQQ", "WWW", Character.valueOf('G'), Blocks.GLASS, Character.valueOf('Q'), Items.QUARTZ, Character.valueOf('W'), Blocks.WOODEN_SLAB});
|
||
|
|
this.registerShapedRecipe(new ItemStack(Blocks.HOPPER), new Object[] { "I I", "ICI", " I ", Character.valueOf('I'), Items.IRON_INGOT, Character.valueOf('C'), Blocks.CHEST});
|
||
|
|
this.registerShapedRecipe(new ItemStack(Items.ARMOR_STAND, 1), new Object[] { "///", " / ", "/_/", Character.valueOf('/'), Items.STICK, Character.valueOf('_'), new ItemStack(Blocks.STONE_SLAB, 1, BlockDoubleStepAbstract.EnumStoneSlabVariant.STONE.a())});
|
||
|
|
- Collections.sort(this.recipes, new Comparator() {
|
||
|
|
+ sort();
|
||
|
|
+ }
|
||
|
|
+
|
||
|
|
+ // CraftBukkit start
|
||
|
|
+ public void sort() {
|
||
|
|
+ Collections.sort(this.recipes, new Comparator() {
|
||
|
|
public int a(IRecipe irecipe, IRecipe irecipe1) {
|
||
|
|
return irecipe instanceof ShapelessRecipes && irecipe1 instanceof ShapedRecipes ? 1 : (irecipe1 instanceof ShapelessRecipes && irecipe instanceof ShapedRecipes ? -1 : (irecipe1.a() < irecipe.a() ? -1 : (irecipe1.a() > irecipe.a() ? 1 : 0)));
|
||
|
|
}
|
||
|
|
@@ -274,13 +285,18 @@
|
||
|
|
|
||
|
|
do {
|
||
|
|
if (!iterator.hasNext()) {
|
||
|
|
+ inventorycrafting.currentRecipe = null; // CraftBukkit - Clear recipe when no recipe is found
|
||
|
|
return null;
|
||
|
|
}
|
||
|
|
|
||
|
|
irecipe = (IRecipe) iterator.next();
|
||
|
|
} while (!irecipe.a(inventorycrafting, world));
|
||
|
|
|
||
|
|
- return irecipe.craftItem(inventorycrafting);
|
||
|
|
+ // CraftBukkit start - INVENTORY_PRE_CRAFT event
|
||
|
|
+ inventorycrafting.currentRecipe = irecipe;
|
||
|
|
+ ItemStack result = irecipe.craftItem(inventorycrafting);
|
||
|
|
+ return CraftEventFactory.callPreCraftEvent(inventorycrafting, result, lastCraftView, false);
|
||
|
|
+ // CraftBukkit end
|
||
|
|
}
|
||
|
|
|
||
|
|
public ItemStack[] b(InventoryCrafting inventorycrafting, World world) {
|