Upstream/mmoitems
1
0
Fork 0
mirror of https://gitlab.com/phoenix-dvpmt/mmoitems.git synced 2025-02-02 11:21:20 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed crafting dupe bugs related to stack sizes.

Browse Source
This commit is contained in:
ASangarin 2020-08-09 00:53:05 +02:00
parent 812de85edc
commit ebb5edbe7a
1 changed files with 24 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/main/java/net/Indyuce/mmoitems/listener/CraftingListener.java
View File

@ -1,15 +1,17 @@
package net.Indyuce.mmoitems.listener;
import net.Indyuce.mmoitems.MMOItems;
import net.Indyuce.mmoitems.api.recipe.workbench.CachedRecipe;
import net.Indyuce.mmoitems.api.recipe.workbench.CustomRecipe;
import net.Indyuce.mmoitems.api.recipe.workbench.ingredients.WorkbenchIngredient;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
import java.util.UUID;
import org.bukkit.Bukkit;
import org.bukkit.Material;
import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler;
import org.bukkit.event.Listener;
import org.bukkit.event.inventory.ClickType;
import org.bukkit.event.inventory.InventoryAction;
import org.bukkit.event.inventory.InventoryClickEvent;
import org.bukkit.event.inventory.InventoryType.SlotType;
@ -17,8 +19,10 @@ import org.bukkit.event.inventory.PrepareItemCraftEvent;
import org.bukkit.inventory.CraftingInventory;
import org.bukkit.inventory.ItemStack;
import java.util.*;
import java.util.Map.Entry;
import net.Indyuce.mmoitems.MMOItems;
import net.Indyuce.mmoitems.api.recipe.workbench.CachedRecipe;
import net.Indyuce.mmoitems.api.recipe.workbench.CustomRecipe;
import net.Indyuce.mmoitems.api.recipe.workbench.ingredients.WorkbenchIngredient;
public class CraftingListener implements Listener {
Map<UUID, CachedRecipe> cachedRecipe = new HashMap<>();
@ -32,8 +36,10 @@ public class CraftingListener implements Listener {
@EventHandler
public void getResult(InventoryClickEvent e) {
if (!(e.getView().getPlayer() instanceof Player)) return;
if (!(e.getInventory() instanceof CraftingInventory)) return;
if (!(e.getView().getPlayer() instanceof Player) ||
!(e.getInventory() instanceof CraftingInventory)) return;
debug("Inventory Action", e.getAction());
debug("Click Type", e.getClick());
if (e.getSlotType() == SlotType.CRAFTING && e.getAction() == InventoryAction.PLACE_ONE)
Bukkit.getScheduler().runTaskLater(MMOItems.plugin, new Runnable() {
@Override
@ -45,14 +51,14 @@ public class CraftingListener implements Listener {
CraftingInventory inv = (CraftingInventory) e.getInventory();
if (e.getCurrentItem() == null || !cachedRecipe.containsKey(e.getWhoClicked().getUniqueId()))
return;
if (e.getClick() != ClickType.LEFT) {
if (e.getAction() != InventoryAction.PICKUP_ALL) {
e.setCancelled(true);
return;
}
CachedRecipe cached = cachedRecipe.get(e.getWhoClicked().getUniqueId());
cachedRecipe.remove(e.getWhoClicked().getUniqueId());
if (!cached.isValid(inv.getMatrix()) || !e.getCurrentItem().isSimilar(cached.getResult())
|| e.getCurrentItem().getAmount() == e.getCurrentItem().getMaxStackSize()) {
if (!cached.isValid(inv.getMatrix())) {
e.setCancelled(true);
return;
}
@ -76,8 +82,12 @@ public class CraftingListener implements Listener {
}
}
private void debug(String s1, Object s2) {
System.out.println("[DEBUG MMOCRAFTING] " + s1 + ": " + s2);
}
public void handleCustomCrafting(CraftingInventory inv, Player player) {
player.updateInventory();
cachedRecipe.remove(player.getUniqueId());
for (CustomRecipe recipe : MMOItems.plugin.getRecipes().getCustomRecipes()) {
if (!recipe.fitsPlayerCrafting() && inv.getMatrix().length == 4)
@ -137,6 +147,7 @@ public class CraftingListener implements Listener {
@Override
public void run() {
inv.setItem(0, recipe.getResult());
player.updateInventory();
}
}, 1);
break;