mirror of
https://github.com/PaperMC/Paper.git
synced 2024-09-19 18:31:18 +02:00
54 lines
2.6 KiB
Diff
54 lines
2.6 KiB
Diff
--- a/net/minecraft/server/CraftingManager.java
|
|
+++ b/net/minecraft/server/CraftingManager.java
|
|
@@ -10,10 +10,16 @@
|
|
import java.util.List;
|
|
import javax.annotation.Nullable;
|
|
|
|
+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;
|
|
@@ -178,7 +184,12 @@
|
|
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())});
|
|
this.registerShapedRecipe(new ItemStack(Blocks.END_ROD, 4), new Object[] { "/", "#", Character.valueOf('/'), Items.BLAZE_ROD, Character.valueOf('#'), Items.CHORUS_FRUIT_POPPED});
|
|
this.registerShapedRecipe(new ItemStack(Blocks.di, 1), new Object[] { "XXX", "XXX", "XXX", Character.valueOf('X'), new ItemStack(Items.DYE, 1, EnumColor.WHITE.getInvColorIndex())});
|
|
- 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)));
|
|
}
|
|
@@ -290,13 +301,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) {
|