Skip to content

hotfix: changed format of searchchest #393

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

Merged
Jikoo merged 3 commits into from
May 4, 2026
Merged

hotfix: changed format of searchchest #393

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
de2a8f4
hotfix: changed format of searchchest command to include customname a…
tonyjamesstark Apr 24, 2026
8fefe76
changes requested from PR
tonyjamesstark Apr 28, 2026
503ac62
additional requested change, logic bug
tonyjamesstark May 4, 2026
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
34 changes: 17 additions & 17 deletions plugin/src/main/java/com/lishid/openinv/command/SearchContainerCommand.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
import org.bukkit.command.CommandSender;
import org.bukkit.command.TabExecutor;
import org.bukkit.entity.Player;
import org.bukkit.Nameable;
import org.bukkit.inventory.InventoryHolder;
import org.bukkit.plugin.Plugin;
import org.jetbrains.annotations.NotNull;
Expand All @@ -54,8 +55,7 @@ public boolean onCommand(
@NotNull CommandSender sender,
@NotNull Command command,
@NotNull String label,
@NotNull String[] args
) {
@NotNull String[] args) {
if (!(sender instanceof Player senderPlayer)) {
lang.sendMessage(sender, "messages.error.consoleUnsupported");
return true;
Expand All @@ -72,8 +72,7 @@ public boolean onCommand(
lang.sendMessage(
sender,
"messages.error.invalidMaterial",
new Replacement("%target%", args[0])
);
new Replacement("%target%", args[0]));
return false;
}

Expand All @@ -95,6 +94,7 @@ public boolean onCommand(
World world = senderPlayer.getWorld();
Chunk centerChunk = senderPlayer.getLocation().getChunk();
StringBuilder locations = new StringBuilder();
locations.append("\n");

for (int dX = -radius; dX <= radius; ++dX) {
for (int dZ = -radius; dZ <= radius; ++dZ) {
Expand All @@ -109,31 +109,32 @@ public boolean onCommand(
if (!SearchHelper.findMatch(holder.getInventory(), itemStack -> itemStack.getType() == material)) {
continue;
}
locations.append(holder.getInventory().getType().name().toLowerCase(Locale.ENGLISH)).append(" (")
.append(tileEntity.getX()).append(',').append(tileEntity.getY()).append(',')
.append(tileEntity.getZ()).append("), ");
locations.append(holder.getInventory().getType().name().toLowerCase(Locale.ENGLISH)).append(": ");
if (holder instanceof Nameable named) {
String customName = named.getCustomName();
if (customName != null) {
locations.append(customName.toLowerCase(Locale.ENGLISH).strip()).append(" - ");
}
}
locations.append(" (").append(tileEntity.getX()).append(',').append(tileEntity.getY()).append(',')
.append(tileEntity.getZ()).append(")\n");
}
}
}

// Matches found, delete trailing comma and space
if (!locations.isEmpty()) {
locations.delete(locations.length() - 2, locations.length());
} else {
if (locations.length() < 2) {
lang.sendMessage(
sender,
"messages.info.container.noMatches",
new Replacement("%target%", material.name())
);
new Replacement("%target%", material.name()));
return true;
}

lang.sendMessage(
sender,
"messages.info.container.matches",
new Replacement("%target%", material.name()),
new Replacement("%detail%", locations.toString())
);
new Replacement("%detail%", locations.toString()));
return true;
}

Expand All @@ -142,8 +143,7 @@ public List<String> onTabComplete(
@NotNull CommandSender sender,
@NotNull Command command,
@NotNull String label,
String[] args
) {
String[] args) {
if (args.length < 1 || args.length > 2 || !command.testPermissionSilent(sender)) {
return Collections.emptyList();
}
Expand Down