Skip to content
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

Fix/dropping #32

Merged
merged 2 commits into from
Jan 1, 2024
Merged

Fix/dropping #32

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2f0f5a1
feat: log items dropped by players
rexlManu Jan 1, 2024
064bf4d
fix: don't track changes in own player inventory
rexlManu Jan 1, 2024
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
40 changes: 36 additions & 4 deletions src/main/java/net/simplyvanilla/noillegals/NoIllegalsPlugin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,16 @@
public final class NoIllegalsPlugin extends JavaPlugin {
private static final String PLAYER_NAME_PLACEHOLDER = "[player_name]";
private static final String ITEM_PLACEHOLDER = "[item]";
private static final String AMOUNT_PLACEHOLDER = "[amount]";
private static final String ENCHANTMENTS_PLACEHOLDER = "[enchantments]";

private boolean checkOPPlayers;
private String infoLogText = "";
private String inventoryOpenLogText = "";
private String playerItemReceiveLogText = "";
private String playerItemSentLogText = "";
private String inventoryCreationLogText = "";
private String playerDroppedItemLogText = "";

private final List<Material> blockedItems = new ArrayList<>();
private final List<Material> loggedItemTypes = new ArrayList<>();
Expand Down Expand Up @@ -61,6 +64,10 @@ public void onEnable() {
inventoryCreationLogText = getConfig().getString("log.inventoryCreation");
}

if (getConfig().isSet("log.playerDroppedItem")) {
playerDroppedItemLogText = getConfig().getString("log.playerDroppedItem");
}

getConfig()
.getStringList("blockedItemTypes")
.forEach(
Expand Down Expand Up @@ -175,12 +182,12 @@ public void logPlayerItemReceive(Player player, ItemStack itemStack) {
() ->
playerItemReceiveLogText
.replace(ITEM_PLACEHOLDER, itemStack.getType().name())
.replace("[amount]", String.valueOf(itemStack.getAmount()))
.replace(AMOUNT_PLACEHOLDER, String.valueOf(itemStack.getAmount()))
.replace(PLAYER_NAME_PLACEHOLDER, player.getName())
.replace("[x]", String.valueOf(player.getLocation().getBlockX()))
.replace("[y]", String.valueOf(player.getLocation().getBlockY()))
.replace("[z]", String.valueOf(player.getLocation().getBlockZ()))
.replace("[enchantments]",
.replace(ENCHANTMENTS_PLACEHOLDER,
itemStack.getEnchantments().entrySet().stream()
.map(entry -> entry.getKey().getKey() + "=" + entry.getValue())
.collect(
Expand All @@ -202,13 +209,13 @@ public void logPlayerItemSent(Player player, ItemStack itemStack,
() ->
playerItemSentLogText
.replace(ITEM_PLACEHOLDER, itemStack.getType().name())
.replace("[amount]", String.valueOf(itemStack.getAmount()))
.replace(AMOUNT_PLACEHOLDER, String.valueOf(itemStack.getAmount()))
.replace(PLAYER_NAME_PLACEHOLDER, player.getName())
.replace("[inventory_type]", inventoryType.name())
.replace("[x]", String.valueOf(player.getLocation().getBlockX()))
.replace("[y]", String.valueOf(player.getLocation().getBlockY()))
.replace("[z]", String.valueOf(player.getLocation().getBlockZ()))
.replace("[enchantments]",
.replace(ENCHANTMENTS_PLACEHOLDER,
itemStack.getEnchantments().entrySet().stream()
.map(entry -> entry.getKey().getKey() + "=" + entry.getValue())
.collect(
Expand All @@ -232,6 +239,31 @@ public void logInventoryCreation(Player player, InventoryType inventoryType,
}
}

public void logPlayerDroppedItem(Player player, ItemStack itemStack) {
// We don't want to log items that are not in the loggedItemTypes list
if (!this.isItemLogged(itemStack.getType())) {
return;
}
if (!playerDroppedItemLogText.isEmpty()) {
this.getLogger()
.log(
Level.INFO,
() ->
playerDroppedItemLogText
.replace(ITEM_PLACEHOLDER, itemStack.getType().name())
.replace(AMOUNT_PLACEHOLDER, String.valueOf(itemStack.getAmount()))
.replace(PLAYER_NAME_PLACEHOLDER, player.getName())
.replace("[x]", String.valueOf(player.getLocation().getBlockX()))
.replace("[y]", String.valueOf(player.getLocation().getBlockY()))
.replace("[z]", String.valueOf(player.getLocation().getBlockZ()))
.replace(ENCHANTMENTS_PLACEHOLDER,
itemStack.getEnchantments().entrySet().stream()
.map(entry -> entry.getKey().getKey() + "=" + entry.getValue())
.collect(
Collectors.joining(","))));
}
}

public boolean isCheckOPPlayers() {
return checkOPPlayers;
}
Expand Down
11 changes: 9 additions & 2 deletions src/main/java/net/simplyvanilla/noillegals/check/InventoryItemCheck.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
import org.bukkit.event.Listener;
import org.bukkit.event.inventory.InventoryAction;
import org.bukkit.event.inventory.InventoryClickEvent;
import org.bukkit.event.inventory.InventoryType;
import org.bukkit.inventory.PlayerInventory;

public class InventoryItemCheck implements Listener {
Expand All @@ -24,7 +25,6 @@ public void handleInventoryMoveItem(InventoryClickEvent event) {
if (this.plugin.isCheckOPPlayers() && player.isOp()) {
return;
}

// handles when the player picks up an item from the inventory
if (event.getAction().name().startsWith("PLACE_")) {
this.handleItemPickups(player, event);
Expand All @@ -47,6 +47,10 @@ private void handleItemManipulation(InventoryClickEvent event, Player player) {
return;
}

if (event.getView().getTopInventory().getType().equals(InventoryType.CRAFTING)) {
return;
}

if (item != null && event.getAction().equals(InventoryAction.MOVE_TO_OTHER_INVENTORY)) {
if (!(event.getClickedInventory() instanceof PlayerInventory)) {
this.plugin.logPlayerItemReceive(player, item);
Expand Down Expand Up @@ -78,7 +82,10 @@ private void handleItemPickups(Player player, InventoryClickEvent event) {
item.setAmount(0);
return;
}


if (event.getView().getTopInventory().getType().equals(InventoryType.CRAFTING)) {
return;
}
if (event.getClickedInventory() instanceof PlayerInventory) {
this.plugin.logPlayerItemReceive(player, item);
} else {
Expand Down
3 changes: 3 additions & 0 deletions src/main/java/net/simplyvanilla/noillegals/check/ItemDropCheck.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,9 @@ void onItemDrop(PlayerDropItemEvent event) {
if (this.plugin.isItemBlocked(event.getItemDrop().getItemStack().getType())) {
this.plugin.log(event.getPlayer(), event.getItemDrop().getItemStack().getType());
event.getItemDrop().remove();
return;
}

this.plugin.logPlayerDroppedItem(event.getPlayer(), event.getItemDrop().getItemStack());
}
}
1 change: 1 addition & 0 deletions src/main/resources/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ log:
playerItemSent: "[player_name] sent [item] [amount] to [inventory_type] at [x] [y] [z] with enchantments [enchantments]"
inventoryOpen: "[player_name] opened [block_type] at [x] [y] [z]"
inventoryCreation: "[player_name] created [inventory_type] at [x] [y] [z]"
playerDroppedItem: "[player_name] dropped [item] [amount] at [x] [y] [z] with enchantments [enchantments]"

# Reference: https://hub.spigotmc.org/javadocs/bukkit/org/bukkit/Material.html
blockedItemTypes:
Expand Down