Allow playername placeholder in own title.

GeorgH93 · Jan 16, 2024 · 6d0022e · 6d0022e
1 parent 5f3b803
commit 6d0022e
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 12 deletions.
diff --git a/Minepacks/src/at/pcgamingfreaks/Minepacks/Bukkit/Backpack.java b/Minepacks/src/at/pcgamingfreaks/Minepacks/Bukkit/Backpack.java
@@ -1,5 +1,5 @@
 /*
- *   Copyright (C) 2020 GeorgH93
+ *   Copyright (C) 2024 GeorgH93
  *
  *   This program is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
@@ -12,7 +12,7 @@
  *   GNU General Public License for more details.
  *
  *   You should have received a copy of the GNU General Public License
- *   along with this program. If not, see <https://www.gnu.org/licenses/>.
+ *   along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 package at.pcgamingfreaks.Minepacks.Bukkit;
@@ -21,9 +21,7 @@
 import at.pcgamingfreaks.Bukkit.Util.InventoryUtils;
 import at.pcgamingfreaks.Minepacks.Bukkit.Database.Helper.InventoryCompressor;
 import at.pcgamingfreaks.Util.StringUtils;
-import lombok.AccessLevel;
-import lombok.Getter;
-import lombok.Setter;
+
 import org.bukkit.Bukkit;
 import org.bukkit.Location;
 import org.bukkit.OfflinePlayer;
@@ -33,6 +31,10 @@
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
+import lombok.AccessLevel;
+import lombok.Getter;
+import lombok.Setter;
+
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
@@ -42,8 +44,9 @@
 public class Backpack implements at.pcgamingfreaks.Minepacks.Bukkit.API.Backpack
 {
 	@Setter(AccessLevel.PACKAGE) private static ShrinkApproach shrinkApproach = ShrinkApproach.COMPRESS;
-	private static Object titleOwn;
-	private static String titleOtherFormat;
+	private static Object titleOwnGlobal;
+	private static String titleFormat, titleOtherFormat;
+	private final Object titleOwn;
 	private final String titleOther;
 	@Getter private final UUID ownerId;
 	private final Map<Player, Boolean> opened = new ConcurrentHashMap<>(); //Thanks Minecraft 1.14
@@ -54,7 +57,8 @@ public class Backpack implements at.pcgamingfreaks.Minepacks.Bukkit.API.Backpack
 
 	public static void setTitle(final @NotNull String title, final @NotNull String titleOther)
 	{
-		titleOwn = InventoryUtils.prepareTitleForOpenInventoryWithCustomTitle(title);
+		titleOwnGlobal = title.contains("%s") ? null : InventoryUtils.prepareTitleForOpenInventoryWithCustomTitle(title);
+		titleFormat = title;
 		titleOtherFormat = titleOther;
 	}
 
@@ -80,6 +84,9 @@ public Backpack(OfflinePlayer owner, int size, int ID)
 		bp = Bukkit.createInventory(this, size, titleOther);
 		this.size = size;
 		ownerDatabaseId = ID;
+
+		if (titleOwnGlobal != null) titleOwn = titleOwnGlobal;
+		else titleOwn = InventoryUtils.prepareTitleForOpenInventoryWithCustomTitle(String.format(titleFormat, owner.getName()));
 	}
 
 	public Backpack(final OfflinePlayer owner, ItemStack[] backpack, final int ID)

diff --git a/Minepacks/src/at/pcgamingfreaks/Minepacks/Bukkit/Database/Config.java b/Minepacks/src/at/pcgamingfreaks/Minepacks/Bukkit/Database/Config.java
@@ -1,5 +1,5 @@
 /*
- *   Copyright (C) 2023 GeorgH93
+ *   Copyright (C) 2024 GeorgH93
  *
  *   This program is free software: you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
@@ -12,7 +12,7 @@
  *   GNU General Public License for more details.
  *
  *   You should have received a copy of the GNU General Public License
- *   along with this program. If not, see <https://www.gnu.org/licenses/>.
+ *   along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 package at.pcgamingfreaks.Minepacks.Bukkit.Database;
@@ -31,6 +31,7 @@
 import at.pcgamingfreaks.Minepacks.Bukkit.ShrinkApproach;
 import at.pcgamingfreaks.Minepacks.MagicValues;
 import at.pcgamingfreaks.Version;
+
 import org.bukkit.*;
 import org.jetbrains.annotations.NotNull;
 
@@ -175,7 +176,7 @@ public String getBPTitleOther()
 
 	public String getBPTitle()
 	{
-		return ChatColor.translateAlternateColorCodes('&', getConfigE().getString("BackpackTitle", "Backpack"));
+		return ChatColor.translateAlternateColorCodes('&', getConfigE().getString("BackpackTitle", "Backpack").replace("%", "%%").replace("{OwnerName}", "%s"));
 	}
 
 	public boolean getDropOnDeath()

diff --git a/pom.xml b/pom.xml
@@ -7,7 +7,7 @@
 	<packaging>pom</packaging>
 
 	<properties>
-		<revision>2.4.25</revision>
+		<revision>2.4.26</revision>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>