--- a/net/minecraft/server/TileEntityFurnace.java +++ b/net/minecraft/server/TileEntityFurnace.java @@ -7,6 +7,16 @@ import java.util.Map; import java.util.Map.Entry; import javax.annotation.Nullable; +// CraftBukkit start +import org.bukkit.craftbukkit.block.CraftBlock; +import org.bukkit.craftbukkit.entity.CraftHumanEntity; +import org.bukkit.craftbukkit.inventory.CraftItemStack; +import org.bukkit.entity.HumanEntity; +import org.bukkit.entity.Player; +import org.bukkit.event.inventory.FurnaceBurnEvent; +import org.bukkit.event.inventory.FurnaceExtractEvent; +import org.bukkit.event.inventory.FurnaceSmeltEvent; +// CraftBukkit end public abstract class TileEntityFurnace extends TileEntityContainer implements IWorldInventory, RecipeHolder, AutoRecipeOutput, ITickable { @@ -135,6 +145,36 @@ return map; } + // CraftBukkit start - add fields and methods + private int maxStack = MAX_STACK; + public List<HumanEntity> transaction = new java.util.ArrayList<HumanEntity>(); + + public List<ItemStack> getContents() { + return this.items; + } + + public void onOpen(CraftHumanEntity who) { + transaction.add(who); + } + + public void onClose(CraftHumanEntity who) { + transaction.remove(who); + } + + public List<HumanEntity> getViewers() { + return transaction; + } + + @Override + public int getMaxStackSize() { + return maxStack; + } + + public void setMaxStackSize(int size) { + maxStack = size; + } + // CraftBukkit end + private static void a(Map<Item, Integer> map, Tag<Item> tag, int i) { Iterator iterator = tag.a().iterator(); @@ -211,12 +251,23 @@ this.cookTime = MathHelper.clamp(this.cookTime - 2, 0, this.cookTimeTotal); } } else { - IRecipe<?> irecipe = (IRecipe) this.world.getCraftingManager().craft(this.c, this, this.world).orElse((Object) null); + IRecipe irecipe = this.world.getCraftingManager().craft((Recipes<RecipeCooking>) this.c, this, this.world).orElse(null); // Eclipse fail if (!this.isBurning() && this.canBurn(irecipe)) { - this.burnTime = this.fuelTime(itemstack); + // CraftBukkit start + CraftItemStack fuel = CraftItemStack.asCraftMirror(itemstack); + + FurnaceBurnEvent furnaceBurnEvent = new FurnaceBurnEvent(CraftBlock.at(this.world, this.position), fuel, fuelTime(itemstack)); + this.world.getServer().getPluginManager().callEvent(furnaceBurnEvent); + + if (furnaceBurnEvent.isCancelled()) { + return; + } + + this.burnTime = furnaceBurnEvent.getBurnTime(); this.ticksForCurrentFuel = this.burnTime; - if (this.isBurning()) { + if (this.isBurning() && furnaceBurnEvent.isBurning()) { + // CraftBukkit end flag1 = true; if (!itemstack.isEmpty()) { Item item = itemstack.getItem(); @@ -278,11 +329,38 @@ ItemStack itemstack1 = irecipe.getResult(); ItemStack itemstack2 = (ItemStack) this.items.get(2); + // CraftBukkit start - fire FurnaceSmeltEvent + CraftItemStack source = CraftItemStack.asCraftMirror(itemstack); + org.bukkit.inventory.ItemStack result = CraftItemStack.asBukkitCopy(itemstack1); + + FurnaceSmeltEvent furnaceSmeltEvent = new FurnaceSmeltEvent(this.world.getWorld().getBlockAt(position.getX(), position.getY(), position.getZ()), source, result); + this.world.getServer().getPluginManager().callEvent(furnaceSmeltEvent); + + if (furnaceSmeltEvent.isCancelled()) { + return; + } + + result = furnaceSmeltEvent.getResult(); + itemstack1 = CraftItemStack.asNMSCopy(result); + + if (!itemstack1.isEmpty()) { + if (itemstack2.isEmpty()) { + this.items.set(2, itemstack1.cloneItemStack()); + } else if (CraftItemStack.asCraftMirror(itemstack2).isSimilar(result)) { + itemstack2.add(itemstack1.getCount()); + } else { + return; + } + } + + /* if (itemstack2.isEmpty()) { this.items.set(2, itemstack1.cloneItemStack()); } else if (itemstack2.getItem() == itemstack1.getItem()) { itemstack2.add(1); } + */ + // CraftBukkit end if (!this.world.isClientSide) { this.a(irecipe); @@ -307,7 +385,7 @@ } protected int getRecipeCookingTime() { - return (Integer) this.world.getCraftingManager().craft(this.c, this, this.world).map(RecipeCooking::e).orElse(200); + return (this.hasWorld()) ? (Integer) this.world.getCraftingManager().craft((Recipes<RecipeCooking>) this.c, this, this.world).map(RecipeCooking::e).orElse(200) : 200; // CraftBukkit - SPIGOT-4302 // Eclipse fail } public static boolean isFuel(ItemStack itemstack) { @@ -434,7 +512,7 @@ @Override public void b(EntityHuman entityhuman) {} - public void d(EntityHuman entityhuman) { + public void d(EntityHuman entityhuman, ItemStack itemstack, int amount) { // CraftBukkit List<IRecipe<?>> list = Lists.newArrayList(); Iterator iterator = this.n.entrySet().iterator(); @@ -443,7 +521,7 @@ entityhuman.world.getCraftingManager().a((MinecraftKey) entry.getKey()).ifPresent((irecipe) -> { list.add(irecipe); - a(entityhuman, (Integer) entry.getValue(), ((RecipeCooking) irecipe).b()); + a(entityhuman, (Integer) entry.getValue(), ((RecipeCooking) irecipe).b(), itemstack, amount); // CraftBukkit }); } @@ -451,7 +529,7 @@ this.n.clear(); } - private static void a(EntityHuman entityhuman, int i, float f) { + private void a(EntityHuman entityhuman, int i, float f, ItemStack itemstack, int amount) { // CraftBukkit int j; if (f == 0.0F) { @@ -465,6 +543,14 @@ i = j; } + // CraftBukkit start - fire FurnaceExtractEvent + if (amount != 0) { + FurnaceExtractEvent event = new FurnaceExtractEvent((Player) entityhuman.getBukkitEntity(), CraftBlock.at(world, position), org.bukkit.craftbukkit.util.CraftMagicNumbers.getMaterial(itemstack.getItem()), amount, i); + world.getServer().getPluginManager().callEvent(event); + i = event.getExpToDrop(); + } + // CraftBukkit end + while (i > 0) { j = EntityExperienceOrb.getOrbValue(i); i -= j;