Skip to content

Commit dba5b0c

Browse files
committed
JsonMessage廃止
1 parent cb43f0d commit dba5b0c

File tree

9 files changed

+48
-80
lines changed

9 files changed

+48
-80
lines changed

pom.xml

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -62,10 +62,6 @@
6262
<id>papermc</id>
6363
<url>https://repo.papermc.io/repository/maven-public/</url>
6464
</repository>
65-
<repository>
66-
<id>rayzr-repo</id>
67-
<url>https://raw.githubusercontent.com/Rayzr522/maven-repo/master/</url>
68-
</repository>
6965
</repositories>
7066

7167
<dependencies>
@@ -80,11 +76,6 @@
8076
<version>1.16.5-R0.1-SNAPSHOT</version>
8177
<scope>provided</scope>
8278
</dependency>
83-
<dependency>
84-
<groupId>me.rayzr522</groupId>
85-
<artifactId>jsonmessage</artifactId>
86-
<version>1.3.1</version>
87-
</dependency>
8879
<dependency>
8980
<groupId>com.shampaggon</groupId>
9081
<artifactId>CrackShot</artifactId>

src/main/java/net/azisaba/namechange/chat/ChatReader.java

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
import com.shampaggon.crackshot.CSUtility;
44
import lombok.RequiredArgsConstructor;
5-
import me.rayzr522.jsonmessage.JSONMessage;
65
import net.azisaba.namechange.NameChangeAutomation;
76
import net.azisaba.namechange.config.NameChangeInfoIO;
87
import net.azisaba.namechange.data.NameChangeInfoData;
@@ -11,6 +10,8 @@
1110
import net.azisaba.namechange.gui.pages.PageEditNameInfo;
1211
import net.azisaba.namechange.gui.pages.PageNameChange;
1312
import net.azisaba.namechange.utils.Chat;
13+
import net.kyori.adventure.text.Component;
14+
import net.kyori.adventure.text.event.ClickEvent;
1415
import org.bukkit.Bukkit;
1516
import org.bukkit.OfflinePlayer;
1617
import org.bukkit.Sound;
@@ -56,11 +57,9 @@ public void onChat(Player p, String msg) {
5657
p.sendMessage(Chat.f("&c使用できない文字が使われています! &7( &e| &7)"));
5758
p.sendMessage(Chat.f("&a全角にするか、他の縦棒を使用してください。"));
5859
p.playSound(p.getLocation(), Sound.ENTITY_ENDERMAN_TELEPORT, 1, 1);
59-
JSONMessage.create(Chat.f("&e⇓&a説明文を打ち込んで下さい!&e⇓ "))
60-
.suggestCommand("")
61-
.then(Chat.f("&b[クリックで補完]"))
62-
.suggestCommand(msg)
63-
.send(p);
60+
p.sendMessage(Component.text(Chat.f("&e⇓&a説明文を打ち込んで下さい!&e⇓ "))
61+
.append(Component.text(Chat.f("&b[クリックで補完]"))).clickEvent(ClickEvent.suggestCommand(msg)));
62+
6463
return;
6564
}
6665
plugin.getDataContainer().getNameChangeData(p).receiveLoreChat(msg);
Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,20 @@
11
package net.azisaba.namechange.gui.items;
22

3-
import me.rayzr522.jsonmessage.JSONMessage;
43
import net.azisaba.namechange.NameChangeAutomation;
54
import net.azisaba.namechange.chat.ChatContentType;
65
import net.azisaba.namechange.data.NameChangeData;
76
import net.azisaba.namechange.gui.GuiItem;
87
import net.azisaba.namechange.gui.InventoryGui;
98
import net.azisaba.namechange.utils.Chat;
9+
import net.kyori.adventure.text.Component;
10+
import net.kyori.adventure.text.event.ClickEvent;
11+
import net.kyori.adventure.title.Title;
1012
import org.bukkit.Material;
1113
import org.bukkit.event.inventory.InventoryClickEvent;
1214
import org.bukkit.inventory.ItemStack;
1315

16+
import java.time.Duration;
17+
1418
public class ItemChangeDisplayName extends GuiItem {
1519
public ItemChangeDisplayName(InventoryGui gui) {
1620
super(gui, new ItemStack(Material.NAME_TAG));
@@ -25,14 +29,12 @@ public void onClick(InventoryClickEvent e){
2529
NameChangeAutomation.INSTANCE.getChatReader().registerNextChat(gui.player, ChatContentType.DISPLAY_NAME);
2630
gui.player.closeInventory();
2731

28-
JSONMessage.create(Chat.f("&aチャットにアイテム名を打ち込んでください!")).title(0, 100, 20, gui.player);
29-
30-
JSONMessage msg = JSONMessage.create(Chat.f("&e⇓&aアイテム名を打ち込んで下さい!&e⇓ "));
32+
e.getWhoClicked().showTitle(Title.title(Component.text(Chat.f("&aチャットにアイテム名を打ち込んでください!")), Component.empty(), Title.Times.times(Duration.ofMillis(0), Duration.ofSeconds(5), Duration.ofSeconds(1))));
33+
Component msg = Component.text(Chat.f("&e⇓&aアイテム名を打ち込んで下さい!&e⇓ "));
3134
if (data.getDisplayName() != null) {
32-
msg.suggestCommand("")
33-
.then(Chat.f("&b[クリックで補完]"))
34-
.suggestCommand(data.getDisplayName());
35+
gui.player.sendMessage(msg.append(Component.text(Chat.f("&b[クリックで補完]")).clickEvent(ClickEvent.suggestCommand(data.getDisplayName()))));
36+
}else {
37+
gui.player.sendMessage(msg);
3538
}
36-
msg.send(gui.player);
3739
}
3840
}

src/main/java/net/azisaba/namechange/gui/items/ItemEditLoreCS.java

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
11
package net.azisaba.namechange.gui.items;
22

3-
import me.rayzr522.jsonmessage.JSONMessage;
43
import net.azisaba.namechange.NameChangeAutomation;
54
import net.azisaba.namechange.chat.ChatContentType;
65
import net.azisaba.namechange.chat.ChatReader;
7-
import net.azisaba.namechange.data.NameChangeData;
86
import net.azisaba.namechange.gui.GuiItem;
97
import net.azisaba.namechange.gui.InventoryGui;
108
import net.azisaba.namechange.utils.Chat;
@@ -54,14 +52,11 @@ public void onClick(InventoryClickEvent e){
5452
chatReader.registerNextChat(gui.player, ChatContentType.LOREEXREMOVE);
5553
}
5654
gui.player.closeInventory();
57-
JSONMessage msg;
5855
if(slot == 18){
5956
//指定行削除用
60-
msg = JSONMessage.create(Chat.f("&e⇓&a削除したい行数を数字(半角)で打ち込んで下さい!&e⇓ "));
57+
gui.player.sendMessage(Component.text(Chat.f("&e⇓&a削除したい行数を数字(半角)で打ち込んで下さい!&e⇓ ")));
6158
}else {
62-
msg = JSONMessage.create(Chat.f("&e⇓&a説明文を打ち込んで下さい!&e⇓ "));
59+
gui.player.sendMessage(Component.text(Chat.f("&e⇓&a説明文を打ち込んで下さい!&e⇓ ")));
6360
}
64-
65-
msg.send(gui.player);
6661
}
6762
}

src/main/java/net/azisaba/namechange/gui/items/ItemLoreEdit.java

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
package net.azisaba.namechange.gui.items;
22

3-
import me.rayzr522.jsonmessage.JSONMessage;
43
import net.azisaba.namechange.NameChangeAutomation;
54
import net.azisaba.namechange.chat.ChatContentType;
65
import net.azisaba.namechange.data.NameChangeData;
76
import net.azisaba.namechange.gui.GuiItem;
87
import net.azisaba.namechange.gui.InventoryGui;
98
import net.azisaba.namechange.utils.Chat;
9+
import net.kyori.adventure.text.Component;
10+
import net.kyori.adventure.text.event.ClickEvent;
1011
import net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer;
1112
import org.bukkit.Material;
1213
import org.bukkit.event.inventory.InventoryClickEvent;
@@ -25,12 +26,10 @@ public void onClick(InventoryClickEvent e){
2526
NameChangeAutomation.INSTANCE.getChatReader().registerNextChat(gui.player, ChatContentType.LORE);
2627
data.setLoreInput(line);
2728
gui.player.closeInventory();
28-
JSONMessage msg = JSONMessage.create(Chat.f("&e⇓&a説明文を打ち込んで下さい!&e⇓ "));
29+
Component msg = Component.text(Chat.f("&e⇓&a説明文を打ち込んで下さい!&e⇓ "));
2930
if (data.getLore().size() >= line && data.getLore().get(line) != null) {
30-
msg.suggestCommand("")
31-
.then(Chat.f("&b[クリックで補完]"))
32-
.suggestCommand(LegacyComponentSerializer.legacyAmpersand().serialize(data.getLore().get(line)).replace('§','&'));
31+
msg = msg.append(Component.text(Chat.f(" &b[クリックで補完]")).clickEvent(ClickEvent.suggestCommand(LegacyComponentSerializer.legacyAmpersand().serialize(data.getLore().get(line)).replace('§','&'))));
3332
}
34-
msg.send(gui.player);
33+
gui.player.sendMessage(msg);
3534
}
3635
}

src/main/java/net/azisaba/namechange/gui/items/ItemNIApprover.java

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package net.azisaba.namechange.gui.items;
22

33
import com.shampaggon.crackshot.CSUtility;
4-
import me.rayzr522.jsonmessage.JSONMessage;
54
import net.azisaba.namechange.NameChangeAutomation;
65
import net.azisaba.namechange.chat.ChatContentType;
76
import net.azisaba.namechange.config.NameChangeInfoIO;
@@ -10,12 +9,15 @@
109
import net.azisaba.namechange.gui.InventoryGui;
1110
import net.azisaba.namechange.utils.Chat;
1211
import net.kyori.adventure.text.Component;
12+
import net.kyori.adventure.text.event.ClickEvent;
13+
import net.kyori.adventure.title.Title;
1314
import org.bukkit.Bukkit;
1415
import org.bukkit.Material;
1516
import org.bukkit.event.inventory.InventoryClickEvent;
1617
import org.bukkit.inventory.ItemStack;
1718
import org.bukkit.inventory.meta.SkullMeta;
1819

20+
import java.time.Duration;
1921
import java.util.ArrayList;
2022
import java.util.List;
2123
import java.util.UUID;
@@ -46,14 +48,9 @@ public void onClick(InventoryClickEvent e){
4648
}
4749
NameChangeAutomation.INSTANCE.getChatReader().registerNextChat(gui.player, ChatContentType.APPROVER_PLAYER_NAME);
4850
gui.player.closeInventory();
49-
JSONMessage.create(Chat.f("&aチャットに変更したい名前を入力してください")).title(0, 100, 20, gui.player);
50-
JSONMessage msg = JSONMessage.create(Chat.f("&e⇓&aプレイヤー名を打ち込んで下さい!&e⇓ "));
51-
gui.player.getName();
52-
msg.suggestCommand("")
53-
.then(Chat.f("&b[クリックで自分の名前を入力]"))
54-
.suggestCommand(gui.player.getName())
55-
.then(Chat.f("&b[クリックで登録済みの名前を入力]"))
56-
.suggestCommand(data.getApproverName());
57-
msg.send(gui.player);
51+
e.getWhoClicked().showTitle(Title.title(Component.text(Chat.f("&aチャットに変更したい名前を入力してください")), Component.empty(), Title.Times.times(Duration.ofMillis(0), Duration.ofSeconds(5), Duration.ofSeconds(1))));
52+
gui.player.sendMessage(Component.text(Chat.f("&e⇓&aプレイヤー名を打ち込んで下さい!&e⇓ ")));
53+
gui.player.sendMessage(Component.text(Chat.f("&b[クリックで自分の名前を入力]")).clickEvent(ClickEvent.suggestCommand(gui.player.getName())));
54+
gui.player.sendMessage(Component.text(Chat.f("&b[クリックで登録済みの名前を入力]")).clickEvent(ClickEvent.suggestCommand(data.getApproverName())));
5855
}
5956
}

src/main/java/net/azisaba/namechange/gui/items/ItemNIAuthor.java

Lines changed: 7 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
11
package net.azisaba.namechange.gui.items;
22

3-
import com.shampaggon.crackshot.CSUtility;
4-
import me.rayzr522.jsonmessage.JSONMessage;
53
import net.azisaba.namechange.NameChangeAutomation;
64
import net.azisaba.namechange.chat.ChatContentType;
7-
import net.azisaba.namechange.config.NameChangeInfoIO;
85
import net.azisaba.namechange.data.NameChangeInfoData;
96
import net.azisaba.namechange.gui.GuiItem;
107
import net.azisaba.namechange.gui.InventoryGui;
118
import net.azisaba.namechange.utils.Chat;
129
import net.kyori.adventure.text.Component;
10+
import net.kyori.adventure.text.event.ClickEvent;
11+
import net.kyori.adventure.title.Title;
1312
import org.bukkit.Bukkit;
1413
import org.bukkit.Material;
1514
import org.bukkit.event.inventory.InventoryClickEvent;
1615
import org.bukkit.inventory.ItemStack;
1716
import org.bukkit.inventory.meta.SkullMeta;
1817

18+
import java.time.Duration;
1919
import java.util.ArrayList;
2020
import java.util.List;
2121
import java.util.UUID;
@@ -46,14 +46,9 @@ public void onClick(InventoryClickEvent e){
4646
}
4747
NameChangeAutomation.INSTANCE.getChatReader().registerNextChat(gui.player, ChatContentType.AUTHOR_PLAYER_NAME);
4848
gui.player.closeInventory();
49-
JSONMessage.create(Chat.f("&aチャットに変更したい名前を入力してください")).title(0, 100, 20, gui.player);
50-
JSONMessage msg = JSONMessage.create(Chat.f("&e⇓&aプレイヤー名を打ち込んで下さい!&e⇓ "));
51-
gui.player.getName();
52-
msg.suggestCommand("")
53-
.then(Chat.f("&b[クリックで自分の名前を入力]"))
54-
.suggestCommand(gui.player.getName())
55-
.then(Chat.f("&b[クリックで登録済みの名前を入力]"))
56-
.suggestCommand(data.getAuthorName());
57-
msg.send(gui.player);
49+
e.getWhoClicked().showTitle(Title.title(Component.text(Chat.f("&aチャットに変更したい名前を入力してください")), Component.empty(), Title.Times.times(Duration.ofMillis(0), Duration.ofSeconds(5), Duration.ofSeconds(1))));
50+
gui.player.sendMessage(Component.text(Chat.f("&e⇓&aプレイヤー名を打ち込んで下さい!&e⇓ ")));
51+
gui.player.sendMessage(Component.text(Chat.f("&b[クリックで自分の名前を入力]")).clickEvent(ClickEvent.suggestCommand(gui.player.getName())));
52+
gui.player.sendMessage(Component.text(Chat.f("&b[クリックで登録済みの名前を入力]")).clickEvent(ClickEvent.suggestCommand(data.getAuthorName())));
5853
}
5954
}

src/main/java/net/azisaba/namechange/gui/items/ItemNIBaseWeapon.java

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,20 @@
11
package net.azisaba.namechange.gui.items;
22

3-
import com.shampaggon.crackshot.CSDirector;
43
import com.shampaggon.crackshot.CSUtility;
5-
import me.rayzr522.jsonmessage.JSONMessage;
64
import net.azisaba.namechange.NameChangeAutomation;
75
import net.azisaba.namechange.chat.ChatContentType;
8-
import net.azisaba.namechange.config.NameChangeInfoIO;
96
import net.azisaba.namechange.data.NameChangeInfoData;
107
import net.azisaba.namechange.gui.GuiItem;
118
import net.azisaba.namechange.gui.InventoryGui;
129
import net.azisaba.namechange.utils.Chat;
1310
import net.kyori.adventure.text.Component;
14-
import org.bukkit.ChatColor;
11+
import net.kyori.adventure.text.event.ClickEvent;
12+
import net.kyori.adventure.title.Title;
1513
import org.bukkit.Material;
1614
import org.bukkit.event.inventory.InventoryClickEvent;
1715
import org.bukkit.inventory.ItemStack;
1816

17+
import java.time.Duration;
1918
import java.util.ArrayList;
2019
import java.util.List;
2120

@@ -41,13 +40,9 @@ public void onClick(InventoryClickEvent e){
4140
}
4241
NameChangeAutomation.INSTANCE.getChatReader().registerNextChat(gui.player, ChatContentType.BASE_WEAPON);
4342
gui.player.closeInventory();
44-
JSONMessage.create(Chat.f("&aチャットに変更したいベース武器のIDを入力してください")).title(0, 100, 20, gui.player);
45-
JSONMessage msg = JSONMessage.create(Chat.f("&e⇓&a武器IDを打ち込んで下さい!&e⇓ "));
46-
gui.player.getName();
47-
msg.suggestCommand("")
48-
.then(Chat.f("&b[クリックで登録済みのIDを入力]"))
49-
.suggestCommand(data.getBaseWeapon());
50-
msg.send(gui.player);
43+
e.getWhoClicked().showTitle(Title.title(Component.text(Chat.f("&aチャットに変更したいベース武器のIDを入力してください")), Component.empty(), Title.Times.times(Duration.ofMillis(0), Duration.ofSeconds(5), Duration.ofSeconds(1))));
44+
gui.player.sendMessage(Component.text(Chat.f("&e⇓&a武器IDを打ち込んで下さい!&e⇓ ")));
45+
gui.player.sendMessage(Component.text(Chat.f("&b[クリックで登録済みのIDを入力]")).clickEvent(ClickEvent.suggestCommand(data.getBaseWeapon())));
5146
}
5247

5348
}

src/main/java/net/azisaba/namechange/gui/items/ItemNICustomModelData.java

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
import com.shampaggon.crackshot.CSDirector;
44
import com.shampaggon.crackshot.CSUtility;
5-
import me.rayzr522.jsonmessage.JSONMessage;
65
import net.azisaba.namechange.NameChangeAutomation;
76
import net.azisaba.namechange.chat.ChatContentType;
87
import net.azisaba.namechange.config.NameChangeInfoIO;
@@ -11,12 +10,12 @@
1110
import net.azisaba.namechange.gui.InventoryGui;
1211
import net.azisaba.namechange.utils.Chat;
1312
import net.kyori.adventure.text.Component;
14-
import org.bukkit.Bukkit;
13+
import net.kyori.adventure.text.event.ClickEvent;
14+
import net.kyori.adventure.title.Title;
1515
import org.bukkit.Material;
1616
import org.bukkit.event.inventory.InventoryClickEvent;
1717
import org.bukkit.inventory.ItemStack;
18-
import org.bukkit.inventory.meta.SkullMeta;
19-
18+
import java.time.Duration;
2019
import java.util.ArrayList;
2120
import java.util.List;
2221

@@ -41,12 +40,8 @@ public void onClick(InventoryClickEvent e){
4140
}
4241
NameChangeAutomation.INSTANCE.getChatReader().registerNextChat(gui.player, ChatContentType.NUMBER);
4342
gui.player.closeInventory();
44-
JSONMessage.create(Chat.f("&aチャットに変更するCMDを入力してください")).title(0, 100, 20, gui.player);
45-
JSONMessage msg = JSONMessage.create(Chat.f("&e⇓&a数字を打ち込んで下さい!&e⇓ "));
46-
gui.player.getName();
47-
msg.suggestCommand("")
48-
.then(Chat.f("&b[クリックで登録済みのCMDを入力]"))
49-
.suggestCommand(String.valueOf(data.getCustomModelData()));
50-
msg.send(gui.player);
43+
e.getWhoClicked().showTitle(Title.title(Component.text(Chat.f("&aチャットに変更するCMDを入力してください")), Component.empty(), Title.Times.times(Duration.ofMillis(0), Duration.ofSeconds(5), Duration.ofSeconds(1))));
44+
gui.player.sendMessage(Component.text(Chat.f("&e⇓&a数字を打ち込んで下さい!&e⇓ ")));
45+
gui.player.sendMessage(Component.text(Chat.f("&b[クリックで登録済みのCMDを入力]")).clickEvent(ClickEvent.suggestCommand(String.valueOf(data.getCustomModelData()))));
5146
}
5247
}

0 commit comments

Comments
 (0)