Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions src/main/java/dev/unnm3d/redischat/RedisChat.java
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,7 @@ public final class RedisChat extends JavaPlugin {
@Getter
private MailGUIManager mailGUIManager;


public Config config;
public FiltersConfig filterSettings;
public Messages messages;
Expand Down Expand Up @@ -391,5 +392,4 @@ private void loadCommandAPICommand(CommandAPICommand commandAPICommand) {
registeredCommands.add(commandAPICommand);
getLogger().info("Command " + commandAPICommand.getName() + " registered on CommandAPI!");
}

}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
package dev.unnm3d.redischat.api.events;

import lombok.Getter;
import org.bukkit.entity.Player;
import org.bukkit.event.Event;
import org.bukkit.event.HandlerList;
import org.bukkit.inventory.ItemStack;
import org.jetbrains.annotations.NotNull;

public class InventoryPlaceholderEvent extends Event {
public enum Type { INVENTORY, ITEM, ENDERCHEST }

private static final HandlerList HANDLERS = new HandlerList();

@Getter
private final Player player;
@Getter
private final Type type;
private ItemStack[] contents;

public InventoryPlaceholderEvent(Player player, Type type, ItemStack[] defaultContents) {
super(!player.getServer().isPrimaryThread());
this.player = player;
this.type = type;
this.contents = defaultContents;
}

public ItemStack[] getContents() {
return contents.clone();
}

/** Replace the inventory that will be shown when someone uses the chat tag */
public void setContents(ItemStack[] newContents) {
this.contents = newContents.clone();
}

@Override
public @NotNull HandlerList getHandlers() {
return HANDLERS;
}

public static HandlerList getHandlerList() {
return HANDLERS;
}
}
132 changes: 114 additions & 18 deletions src/main/java/dev/unnm3d/redischat/chat/ComponentProvider.java
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
import dev.unnm3d.redischat.Permissions;
import dev.unnm3d.redischat.RedisChat;
import dev.unnm3d.redischat.api.TagResolverIntegration;
import dev.unnm3d.redischat.api.events.InventoryPlaceholderEvent;
import dev.unnm3d.redischat.utils.ItemNameProvider;
import lombok.AllArgsConstructor;
import lombok.Getter;
Expand All @@ -16,6 +17,7 @@
import net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer;
import net.kyori.adventure.text.serializer.plain.PlainTextComponentSerializer;
import org.bukkit.Bukkit;
import org.bukkit.Material;
import org.bukkit.OfflinePlayer;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
Expand Down Expand Up @@ -255,19 +257,52 @@ public Component parseChatMessageContent(@NotNull CommandSender cmdSender, @NotN
String toParseItem = plugin.config.itemFormat
.replace("%player%", player.getName())
.replace("%command%", "/invshare " + player.getName() + "-item");
Component toParseItemComponent = parse(player, toParseItem, true, false, false, this.standardTagResolver);
Component toParseItemComponent = parse(player, toParseItem,
true, false, false, this.standardTagResolver);

// 1) Default item from main hand
ItemStack defaultItem = p.getInventory().getItemInMainHand();

// 2) Fire event and allow override
InventoryPlaceholderEvent itemEvent = new InventoryPlaceholderEvent(
p,
InventoryPlaceholderEvent.Type.ITEM,
new ItemStack[]{ defaultItem }
);
Bukkit.getPluginManager().callEvent(itemEvent);


// 3) Unwrap result and clone contents
ItemStack[] originalArr = itemEvent.getContents();
ItemStack[] clonedArr = Arrays.stream(originalArr)
.map(item -> item == null ? null : item.clone())
.toArray(ItemStack[]::new);

// safely grab a display item
ItemStack itemToDisplay = (clonedArr.length > 0 && clonedArr[0] != null)
? clonedArr[0]
: new ItemStack(Material.AIR);

// … continue as before …
final Component itemName = getItemNameComponent(itemToDisplay);
toParseItemComponent = toParseItemComponent.replaceText(r -> r
.matchLiteral("%item_name%")
.replacement(itemName)
);
toParseItemComponent = toParseItemComponent.replaceText(r -> r
.matchLiteral("%amount%")
.replacement(itemToDisplay.getAmount() > 1
? "x" + itemToDisplay.getAmount() + " "
: ""
)
);

final Component itemName = getItemNameComponent(p.getInventory().getItemInMainHand());
toParseItemComponent = toParseItemComponent.replaceText(rTextBuilder -> rTextBuilder.matchLiteral("%item_name%").replacement(itemName));
toParseItemComponent = toParseItemComponent.replaceText(rTextBuilder -> rTextBuilder.matchLiteral("%amount%").replacement(
p.getInventory().getItemInMainHand().getAmount() > 1 ?
"x" + p.getInventory().getItemInMainHand().getAmount() + " " :
""
));

builder.resolver(Placeholder.component(plugin.config.item_tag, toParseItemComponent));
}



if (player.hasPermission(Permissions.USE_ENDERCHEST.getPermission())) {
String toParseEnderChest = plugin.config.enderChestFormat
.replace("%player%", player.getName())
Expand Down Expand Up @@ -393,25 +428,88 @@ public String invShareFormatting(CommandSender sender, String message) {
if (!(sender instanceof Player player)) return message;

if (plugin.config.interactiveChatNostalgia) {
message = message.replace("[inv]", "<" + plugin.config.inv_tag + ">")
message = message
.replace("[inv]", "<" + plugin.config.inv_tag + ">")
.replace("[inventory]", "<" + plugin.config.inv_tag + ">")
.replace("[i]", "<" + plugin.config.item_tag + ">")
.replace("[item]", "<" + plugin.config.item_tag + ">")
.replace("[enderchest]", "<" + plugin.config.ec_tag + ">")
.replace("[ec]", "<" + plugin.config.ec_tag + ">");
.replace("[i]", "<" + plugin.config.item_tag + ">")
.replace("[ec]", "<" + plugin.config.ec_tag + ">")
.replace("[enderchest]", "<" + plugin.config.ec_tag + ">");
}

// Inventory-Tag → Event + save
if (message.contains("<" + plugin.config.inv_tag + ">")) {
plugin.getDataManager().addInventory(player.getName(), player.getInventory().getContents());
ItemStack[] contents = player.getInventory().getContents();
ItemStack[] armor = player.getInventory().getArmorContents();
ItemStack offhand = player.getInventory().getItemInOffHand();

ItemStack[] combined = new ItemStack[45];
Arrays.fill(combined, new ItemStack(Material.AIR));

for (int i = 0; i < armor.length && i < 4; i++) {
if (armor[i] != null) {
combined[i] = armor[i].clone();
}
}
combined[4] = offhand.clone();

for (int i = 9; i < contents.length; i++) {
ItemStack it = contents[i];
if (it != null) {
combined[i] = it.clone();
}
}

for (int i = 0; i < 9; i++) {
ItemStack hot = contents[i];
if (hot != null) {
combined[36 + i] = hot.clone();
} else {
//Secure to not show duplicated Armour
combined[36 + i] = new ItemStack(Material.AIR);
}
}

InventoryPlaceholderEvent ev = new InventoryPlaceholderEvent(
player,
InventoryPlaceholderEvent.Type.INVENTORY,
combined
);
Bukkit.getPluginManager().callEvent(ev);
plugin.getDataManager().addInventory(player.getName(), ev.getContents());
}

if (message.contains("<" + plugin.config.item_tag + ">")) {
plugin.getDataManager().addItem(player.getName(), player.getInventory().getItemInMainHand());
ItemStack inHand = player.getInventory().getItemInMainHand();
InventoryPlaceholderEvent ev = new InventoryPlaceholderEvent(
player,
InventoryPlaceholderEvent.Type.ITEM,
new ItemStack[]{ inHand }
);
Bukkit.getPluginManager().callEvent(ev);
// save only one item
ItemStack toSave = ev.getContents().length > 0
? ev.getContents()[0]
: new ItemStack(Material.AIR);
plugin.getDataManager().addItem(player.getName(), toSave);
}

// Enderchest-Tag → Event + save
if (message.contains("<" + plugin.config.ec_tag + ">")) {
plugin.getDataManager().addEnderchest(player.getName(), player.getEnderChest().getContents());
ItemStack[] ec = player.getEnderChest().getContents();
InventoryPlaceholderEvent ev = new InventoryPlaceholderEvent(
player,
InventoryPlaceholderEvent.Type.ENDERCHEST,
ec
);
Bukkit.getPluginManager().callEvent(ev);
plugin.getDataManager().addEnderchest(player.getName(), ev.getContents());
}

return message;
}


@SuppressWarnings("ResultOfMethodCallIgnored")
public void logComponent(Component component) {
if (!plugin.config.chatLogging) {
Expand Down Expand Up @@ -468,6 +566,4 @@ public void sendMessage(CommandSender sender, String message) {
public void sendMessage(CommandSender sender, Component component) {
bukkitAudiences.sender(sender).sendMessage(component);
}

}

}
Loading