Skip to content

Crafter Slot Enable/Disable Support (fixes #766) #767

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Crafter Slot Enable/Disable Support (fixes #766) #767

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d4d4d54
Crafter Slot Enable/Disable Support (fixes #766)
stuffyerface May 29, 2025
1cb7e85
Exclude negative slot values
stuffyerface May 30, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
60 changes: 51 additions & 9 deletions src/main/java/net/coreprotect/listener/player/InventoryChangeListener.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,21 +10,15 @@
import org.bukkit.Location;
import org.bukkit.Material;
import org.bukkit.World;
import org.bukkit.block.Block;
import org.bukkit.block.BlockState;
import org.bukkit.block.DoubleChest;
import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler;
import org.bukkit.event.EventPriority;
import org.bukkit.event.Listener;
import org.bukkit.event.inventory.InventoryAction;
import org.bukkit.event.inventory.InventoryClickEvent;
import org.bukkit.event.inventory.InventoryDragEvent;
import org.bukkit.event.inventory.InventoryMoveItemEvent;
import org.bukkit.event.inventory.InventoryType;
import org.bukkit.inventory.BlockInventoryHolder;
import org.bukkit.inventory.Inventory;
import org.bukkit.inventory.InventoryHolder;
import org.bukkit.inventory.ItemStack;
import org.bukkit.event.inventory.*;
import org.bukkit.inventory.*;

import net.coreprotect.CoreProtect;
import net.coreprotect.config.Config;
Expand Down Expand Up @@ -88,151 +82,151 @@
return false;
}

static boolean onInventoryInteract(String user, final Inventory inventory, ItemStack[] inventoryData, Material containerType, Location location, boolean aSync) {
if (inventory != null && location != null) {
World world = location.getWorld();

if (Config.getConfig(world).ITEM_TRANSACTIONS) {
Material type = Material.CHEST;
Location playerLocation = null;

if (aSync) {
playerLocation = location;
if (containerType != null) {
type = containerType;
}
}
else {
InventoryHolder inventoryHolder = inventory.getHolder();
if (inventoryHolder == null) {
if (CoreProtect.getInstance().isAdvancedChestsEnabled()) {
AdvancedChest<?, ?> advancedChest = AdvancedChestsAPI.getInventoryManager().getAdvancedChest(inventory);
if (advancedChest != null) {
playerLocation = advancedChest.getLocation();
}
else {
return false;
}
}
else {
return false;
}
}
if (inventoryHolder instanceof BlockState) {
BlockState state = (BlockState) inventoryHolder;
type = state.getType();
if (BlockGroup.CONTAINERS.contains(type)) {
playerLocation = state.getLocation();
}
}
else if (inventoryHolder instanceof DoubleChest) {
DoubleChest state = (DoubleChest) inventoryHolder;
playerLocation = state.getLocation();
}
}

if (playerLocation != null) {
if (inventoryData == null) {
inventoryData = inventory.getContents();
}

int x = playerLocation.getBlockX();
int y = playerLocation.getBlockY();
int z = playerLocation.getBlockZ();

String transactingChestId = playerLocation.getWorld().getUID().toString() + "." + x + "." + y + "." + z;
String loggingChestId = user.toLowerCase(Locale.ROOT) + "." + x + "." + y + "." + z;
for (String loggingChestIdViewer : ConfigHandler.oldContainer.keySet()) {
if (loggingChestIdViewer.equals(loggingChestId) || !loggingChestIdViewer.endsWith("." + x + "." + y + "." + z)) {
continue;
}

if (ConfigHandler.oldContainer.get(loggingChestIdViewer) != null) { // player has pending consumer item
int sizeOld = ConfigHandler.oldContainer.get(loggingChestIdViewer).size();
ConfigHandler.forceContainer.computeIfAbsent(loggingChestIdViewer, k -> new ArrayList<>());
List<ItemStack[]> list = ConfigHandler.forceContainer.get(loggingChestIdViewer);

if (list != null && list.size() < sizeOld) {
ItemStack[] containerState = ItemUtils.getContainerState(inventoryData);

// If items have been removed by a hopper, merge into containerState
List<Object> transactingChest = ConfigHandler.transactingChest.get(transactingChestId);
if (transactingChest != null) {
List<Object> transactingChestList = Collections.synchronizedList(new ArrayList<>(transactingChest));
if (!transactingChestList.isEmpty()) {
ItemStack[] newState = new ItemStack[containerState.length + transactingChestList.size()];
int count = 0;

for (int j = 0; j < containerState.length; j++) {
newState[j] = containerState[j];
count++;
}

for (Object item : transactingChestList) {
ItemStack addItem = null;
ItemStack removeItem = null;
if (item instanceof ItemStack) {
addItem = (ItemStack) item;
}
else {
addItem = ((ItemStack[]) item)[0];
removeItem = ((ItemStack[]) item)[1];
}

// item was removed by hopper, add back to state
if (addItem != null) {
newState[count] = addItem;
count++;
}

// item was added by hopper, remove from state
if (removeItem != null) {
for (ItemStack check : newState) {
if (check != null && check.isSimilar(removeItem)) {
check.setAmount(check.getAmount() - 1);
break;
}
}
}
}
containerState = newState;
}
}

modifyForceContainer(loggingChestIdViewer, containerState);
}
}
}

int chestId = getChestId(loggingChestId);
if (chestId > 0) {
List<ItemStack[]> forceList = ConfigHandler.forceContainer.get(loggingChestId);
if (forceList != null) {
int forceSize = forceList.size();
List<ItemStack[]> list = ConfigHandler.oldContainer.get(loggingChestId);

if (list != null && list.size() <= forceSize) {
list.add(ItemUtils.getContainerState(inventoryData));
ConfigHandler.oldContainer.put(loggingChestId, list);
}
}
}
else {
List<ItemStack[]> list = new ArrayList<>();
list.add(ItemUtils.getContainerState(inventoryData));
ConfigHandler.oldContainer.put(loggingChestId, list);
}

ConfigHandler.transactingChest.computeIfAbsent(transactingChestId, k -> Collections.synchronizedList(new ArrayList<>()));
Queue.queueContainerTransaction(user, playerLocation, type, inventory, chestId);
return true;
}
}
}

return false;
}

Check notice on line 229 in src/main/java/net/coreprotect/listener/player/InventoryChangeListener.java

View check run for this annotation

codefactor.io / CodeFactor

src/main/java/net/coreprotect/listener/player/InventoryChangeListener.java#L85-L229 

Complex Method
static void onInventoryInteractAsync(Player player, Inventory inventory, boolean enderChest) {
if (inventory == null) {
return;
Expand Down Expand Up @@ -342,70 +336,118 @@
return true;
}

private boolean checkCrafterSlotChange(InventoryClickEvent event) {
// Check if the clicked inventory is a crafter
if (event.getInventory().getType() != InventoryType.CRAFTER) {
return false;
}

// Check that the Action is NOTHING
if (event.getAction() != InventoryAction.NOTHING) {
return false;
}

// Check if the clicked slot is one of the crafter slots
if (event.getRawSlot() < 0 || event.getRawSlot() > 8) {
return false;
}

// Check that the click type is not a middle click
if (!(event.getClick() == ClickType.LEFT || event.getClick() == ClickType.RIGHT)) {
return false;
}

// Gather other necessary information
Player player = (Player) event.getWhoClicked();
Inventory inventory = event.getInventory();

Location location = null;
try {
location = inventory.getLocation();
} catch (Exception e) {
return false;
}

if (location == null) {
return false;
}

Block block = location.getBlock();
BlockState blockState = block.getState();

Queue.queueBlockPlace(player.getName(), blockState, block.getType(), blockState, block.getType(), -1, 0, blockState.getBlockData().getAsString());
return true;
}

@EventHandler(priority = EventPriority.LOWEST)
protected void onInventoryClick(InventoryClickEvent event) {
InventoryAction inventoryAction = event.getAction();

if (checkCrafterSlotChange(event)) {
return;
}

if (inventoryAction == InventoryAction.NOTHING) {
return;
}

// Check if this is an anvil operation first
if (checkAnvilOperation(event)) {
return;
}

boolean enderChest = false;
boolean advancedChest;
if (inventoryAction != InventoryAction.MOVE_TO_OTHER_INVENTORY && inventoryAction != InventoryAction.COLLECT_TO_CURSOR && inventoryAction != InventoryAction.UNKNOWN) {
// Perform this check to prevent triggering onInventoryInteractAsync when a user is just clicking items in their own inventory
Inventory inventory = null;
try {
try {
inventory = event.getView().getInventory(event.getRawSlot());
}
catch (IncompatibleClassChangeError e) {
inventory = event.getClickedInventory();
}
}
catch (Exception e) {
return;
}
if (inventory == null) {
return;
}

InventoryHolder inventoryHolder = inventory.getHolder();
enderChest = inventory.equals(event.getWhoClicked().getEnderChest());
advancedChest = isAdvancedChest(inventory);
if ((!(inventoryHolder instanceof BlockInventoryHolder || inventoryHolder instanceof DoubleChest)) && !enderChest && !advancedChest) {
return;
}
if (advancedChest && event.getSlot() > inventory.getSize() - 10) {
return;
}
}
else {
// Perform standard inventory holder check on primary inventory
Inventory inventory = event.getInventory();
if (inventory == null) {
return;
}

InventoryHolder inventoryHolder = inventory.getHolder();
enderChest = inventory.equals(event.getWhoClicked().getEnderChest());
advancedChest = isAdvancedChest(inventory);
if ((!(inventoryHolder instanceof BlockInventoryHolder || inventoryHolder instanceof DoubleChest)) && !enderChest && !advancedChest) {
return;
}
if (advancedChest && event.getSlot() > inventory.getSize() - 10) {
return;
}
}

Player player = (Player) event.getWhoClicked();
onInventoryInteractAsync(player, event.getInventory(), enderChest);
}

Check notice on line 450 in src/main/java/net/coreprotect/listener/player/InventoryChangeListener.java

View check run for this annotation

codefactor.io / CodeFactor

src/main/java/net/coreprotect/listener/player/InventoryChangeListener.java#L382-L450 

Complex Method
@EventHandler(priority = EventPriority.LOWEST)
protected void onInventoryDragEvent(InventoryDragEvent event) {
boolean movedItem = false;
Expand All @@ -430,66 +472,66 @@
onInventoryInteractAsync(player, event.getInventory(), enderChest);
}

@EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
protected void onInventoryMoveItemEvent(InventoryMoveItemEvent event) {
if (event.isCancelled()) {
return;
}

Inventory sourceInventory = event.getSource();
if (sourceInventory == null) {
return;
}

Location location = sourceInventory.getLocation();
if (location == null) {
return;
}

boolean hopperTransactions = Config.getConfig(location.getWorld()).HOPPER_TRANSACTIONS;
if (!hopperTransactions && !Config.getConfig(location.getWorld()).ITEM_TRANSACTIONS) {
return;
}

InventoryHolder sourceHolder = PaperAdapter.ADAPTER.getHolder(sourceInventory, false);
if (sourceHolder == null) {
return;
}

InventoryHolder destinationHolder = PaperAdapter.ADAPTER.getHolder(event.getDestination(), false);
if (destinationHolder == null) {
return;
}

if (hopperTransactions) {
if (Validate.isHopper(destinationHolder) && (Validate.isContainer(sourceHolder) && !Validate.isHopper(sourceHolder))) {
HopperPullListener.processHopperPull(location, "#hopper", sourceHolder, destinationHolder, event.getItem());
}
else if (Validate.isHopper(sourceHolder) && (Validate.isContainer(destinationHolder) && !Validate.isHopper(destinationHolder))) {
HopperPushListener.processHopperPush(location, "#hopper", sourceHolder, destinationHolder, event.getItem());
}
else if (Validate.isDropper(sourceHolder) && (Validate.isContainer(destinationHolder))) {
HopperPullListener.processHopperPull(location, "#dropper", sourceHolder, destinationHolder, event.getItem());
if (!Validate.isHopper(destinationHolder)) {
HopperPushListener.processHopperPush(location, "#dropper", sourceHolder, destinationHolder, event.getItem());
}
}

return;
}

if (destinationHolder instanceof Player || (!(sourceHolder instanceof BlockInventoryHolder) && !(sourceHolder instanceof DoubleChest))) {
return;
}

List<Object> list = ConfigHandler.transactingChest.get(location.getWorld().getUID().toString() + "." + location.getBlockX() + "." + location.getBlockY() + "." + location.getBlockZ());
if (list == null) {
return;
}

HopperPullListener.processHopperPull(location, "#hopper", sourceHolder, destinationHolder, event.getItem());
}

Check notice on line 534 in src/main/java/net/coreprotect/listener/player/InventoryChangeListener.java

View check run for this annotation

codefactor.io / CodeFactor

src/main/java/net/coreprotect/listener/player/InventoryChangeListener.java#L475-L534 

Complex Method
private boolean isAdvancedChest(Inventory inventory) {
return CoreProtect.getInstance().isAdvancedChestsEnabled() && AdvancedChestsAPI.getInventoryManager().getAdvancedChest(inventory) != null;
}
Expand Down