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

Improve -l option detection and add --center option to /dh h create command #262

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

Improve -l option detection and add --center option to /dh h create command #262

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
d5a5f73
Improve location option for DH create + add center flag
Andre601 Nov 29, 2024
175340c
Add [--center] to command usage
Andre601 Nov 29, 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
1 change: 0 additions & 1 deletion src/main/java/eu/decentsoftware/holograms/api/utils/items/SkullUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
import eu.decentsoftware.holograms.api.utils.reflect.Version;
import lombok.NonNull;
import lombok.experimental.UtilityClass;
import org.bukkit.Bukkit;
import org.bukkit.SkullType;
import org.bukkit.inventory.ItemStack;
import org.bukkit.inventory.meta.ItemMeta;
Expand Down
46 changes: 34 additions & 12 deletions src/main/java/eu/decentsoftware/holograms/plugin/commands/HologramSubCommand.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,10 @@
import org.bukkit.Material;
import org.bukkit.entity.Player;

import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.Locale;
import java.util.stream.Collectors;

@CommandInfo(
Expand Down Expand Up @@ -293,7 +295,7 @@ public TabCompleteHandler getTabCompleteHandler() {

@CommandInfo(
permissions = "dh.command.holograms.create",
usage = "/dh hologram create <name> [-l:world:x:y:z] [content]",
usage = "/dh hologram create <name> [-l:world:x:y:z] [--center] [content]",
description = "Create new Hologram.",
aliases = {"new", "c"},
minArgs = 1
Expand All @@ -317,29 +319,49 @@ public CommandHandler getCommandHandler() {
Lang.HOLOGRAM_ALREADY_EXISTS.send(sender, hologramName);
return true;
}

// Look for the optional location argument.
// Format: -l:world:x:y:z
boolean containsLocation = false;

Location location = null;
if (args.length >= 2 && args[1].toLowerCase().startsWith("-l:")) {
String locationString = args[1].substring(3);
location = LocationUtils.asLocation(locationString);
containsLocation = location != null;
boolean centerHologram = false;

List<String> contentArgs = new ArrayList<>();

// Iterate through the args to find -l:<world>:<x>:<y>:<z> and/or --center.
// If found, set values and skip arg, else add arg to content List.
for (int i = 1; i < args.length; i++) {
if (args[i].toLowerCase(Locale.ROOT).startsWith("-l:")) {
String locationString = args[i].substring(3);
location = LocationUtils.asLocation(locationString);

// Valid Location, skip this arg.
if (location != null)
continue;
} else if (args[i].equalsIgnoreCase("--center")) {
centerHologram = true;
continue;
}

contentArgs.add(args[i]);
}

if (!(sender instanceof Player) && !containsLocation) {
if (!(sender instanceof Player) && location == null) {
Lang.ONLY_PLAYER.send(sender);
return true;
} else {
if (location == null) {
final Player player = (Player) sender;
location = Settings.HOLOGRAMS_EYE_LEVEL_POSITIONING ? player.getEyeLocation() : player.getLocation();
}

if (centerHologram) {
int x = (int) location.getX();
int z = (int) location.getZ();
location.setX(x > location.getX() ? x - 0.5d : x + 0.5d);
location.setZ(z > location.getZ() ? z - 0.5d : z + 0.5d);
}
}

// Get the content of the line.
final String content = Validator.getLineContent(args, containsLocation ? 2 : 1);
final String content = Validator.getLineContent(contentArgs.toArray(new String[0]), 0);
// Create the hologram.
final Hologram hologram = new Hologram(hologramName, location);
// Add the first line to the hologram.
Expand Down