Upstream
/
Citizens2
mirror of https://github.com/CitizensDev/Citizens2.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Use placeholders in /npc shop

This commit is contained in:
fullwall 2022-07-29 09:15:15 +08:00
parent 8b488ddc61
commit 967fea021e
3 changed files with 25 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
main/src/main/java/net/citizensnpcs/trait/ShopTrait.java
View File

@ -39,6 +39,7 @@ import net.citizensnpcs.api.trait.Trait;
import net.citizensnpcs.api.trait.TraitName;
import net.citizensnpcs.api.util.Colorizer;
import net.citizensnpcs.api.util.DataKey;
import net.citizensnpcs.api.util.Placeholders;
import net.citizensnpcs.trait.shop.ItemAction;
import net.citizensnpcs.trait.shop.ItemAction.ItemActionGUI;
import net.citizensnpcs.trait.shop.MoneyAction;
@ -93,7 +94,7 @@ public class ShopTrait extends Trait {
sender.sendMessage(ChatColor.RED + "Empty shop");
return;
}
InventoryMenu.createSelfRegistered(new NPCShopViewer(this)).present(sender);
InventoryMenu.createSelfRegistered(new NPCShopViewer(this, sender)).present(sender);
}
public void displayEditor(Player sender) {
@ -270,6 +271,21 @@ public class ShopTrait extends Trait {
return pending;
}
public ItemStack getDisplayItem(Player player) {
if (display == null)
return null;
ItemStack stack = display.clone();
ItemMeta meta = stack.getItemMeta();
if (meta.hasDisplayName()) {
meta.setDisplayName(Placeholders.replace(meta.getDisplayName(), player));
}
if (meta.hasLore()) {
meta.setLore(Lists.transform(meta.getLore(), line -> Placeholders.replace(line, player)));
}
stack.setItemMeta(meta);
return stack;
}
public void onClick(NPCShop shop, CitizensInventoryClickEvent event) {
if (shop.type != ShopType.COMMAND) {
List<Transaction> take = execute(cost, action -> action.take(event.getWhoClicked()));
@ -479,14 +495,6 @@ public class ShopTrait extends Trait {
@Override
public void initialise(MenuContext ctx) {
this.ctx = ctx;
ctx.getSlot(8).clear();
if (shop.pages.size() > 0) {
ctx.getSlot(8).setItemStack(new ItemStack(Material.CHEST, 1), "Open shop");
ctx.getSlot(8).setClickHandler(evt -> {
evt.setCancelled(true);
ctx.getMenu().transition(new NPCShopViewer(shop));
});
}
ctx.getSlot(2).setDescription("<f>Edit shop view permission<br>" + shop.getRequiredPermission());
ctx.getSlot(6).setDescription("<f>Edit shop title<br>" + shop.title);
}
@ -527,10 +535,12 @@ public class ShopTrait extends Trait {
public static class NPCShopViewer extends InventoryMenuPage {
private MenuContext ctx;
private int currentPage = 0;
private final Player player;
private final NPCShop shop;
public NPCShopViewer(NPCShop shop) {
public NPCShopViewer(NPCShop shop, Player player) {
this.shop = shop;
this.player = player;
}
public void changePage(int newPage) {
@ -538,7 +548,7 @@ public class ShopTrait extends Trait {
NPCShopPage page = shop.pages.get(currentPage);
if (page.title != null && !page.title.isEmpty()) {
Bukkit.getScheduler().runTaskLater(CitizensAPI.getPlugin(), () -> {
ctx.setTitle(page.title);
ctx.setTitle(Placeholders.replace(page.title, player));
}, 1);
}
for (int i = 0; i < ctx.getInventory().getSize(); i++) {
@ -547,7 +557,7 @@ public class ShopTrait extends Trait {
if (item == null)
continue;
ctx.getSlot(i).setItemStack(item.display);
ctx.getSlot(i).setItemStack(item.getDisplayItem(player));
ctx.getSlot(i).setClickHandler(evt -> {
evt.setCancelled(true);
item.onClick(shop, evt);
@ -576,7 +586,8 @@ public class ShopTrait extends Trait {
@Override
public Inventory createInventory(String title) {
return Bukkit.createInventory(null, 45, shop.title == null || shop.title.isEmpty() ? "Shop" : shop.title);
return Bukkit.createInventory(null, 45,
shop.title == null || shop.title.isEmpty() ? "Shop" : Placeholders.replace(shop.title, player));
}
@Override

2
main/src/main/java/net/citizensnpcs/util/NMSBridge.java
View File

@ -109,7 +109,7 @@ public interface NMSBridge {
public void mount(Entity entity, Entity passenger);
InventoryView openAnvilInventory(Player player, Inventory anvil, String title);
public InventoryView openAnvilInventory(Player player, Inventory anvil, String title);
public void openHorseScreen(Tameable horse, Player equipper);

4
main/src/main/java/net/citizensnpcs/util/PlayerUpdateTask.java
View File

@ -12,8 +12,6 @@ import org.bukkit.entity.Player;
import org.bukkit.scheduler.BukkitRunnable;
public class PlayerUpdateTask extends BukkitRunnable {
private boolean playerTicking;
@Override
public void cancel() {
super.cancel();
@ -50,13 +48,11 @@ public class PlayerUpdateTask extends BukkitRunnable {
PLAYERS_PENDING_ADD.clear();
PLAYERS_PENDING_REMOVE.clear();
playerTicking = true;
for (Player entity : PLAYERS.values()) {
if (entity.isValid()) {
NMS.playerTick(entity);
}
}
playerTicking = false;
}
public static void addOrRemove(org.bukkit.entity.Entity entity, boolean remove) {