Upstream
/
ChestShop-3
mirror of https://github.com/ChestShop-authors/ChestShop-3.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix ShowItem incompatibility as well as update adventure

This commit is contained in:
Phoenix616 2020-12-04 14:53:27 +01:00
parent af32b041ff
commit 4e40823d23
No known key found for this signature in database
GPG Key ID: 40E2321E71738EB0
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@ -98,7 +98,7 @@
<dependency> <dependency>
<groupId>net.kyori</groupId> <groupId>net.kyori</groupId>
<artifactId>adventure-text-serializer-gson</artifactId> <artifactId>adventure-text-serializer-gson</artifactId>
<version>4.2.0</version> <version>4.3.0</version>
<scope>compile</scope> <scope>compile</scope>
<exclusions> <exclusions>
<exclusion> <exclusion>

9
src/main/java/com/Acrobot/Breeze/Utils/MaterialUtil.java
View File

@ -10,6 +10,9 @@ import de.themoep.ShowItem.api.ShowItem;
import de.themoep.minedown.adventure.Replacer; import de.themoep.minedown.adventure.Replacer;
import info.somethingodd.OddItem.OddItem; import info.somethingodd.OddItem.OddItem;
import net.kyori.adventure.text.Component; import net.kyori.adventure.text.Component;
import net.kyori.adventure.text.ComponentBuilder;
import net.kyori.adventure.text.TextComponent;
import net.kyori.adventure.text.serializer.gson.GsonComponentSerializer;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.Material; import org.bukkit.Material;
import org.bukkit.configuration.file.YamlConstructor; import org.bukkit.configuration.file.YamlConstructor;
@ -537,10 +540,10 @@ public class MaterialUtil {
return false; return false;
} }
Component itemComponent = Component.empty(); TextComponent.Builder itemComponent = Component.text();
for (ItemStack item : InventoryUtil.mergeSimilarStacks(stock)) { for (ItemStack item : InventoryUtil.mergeSimilarStacks(stock)) {
try { try {
itemComponent.append(showItem.getItemConverter().createComponent(item, Level.FINE).toTextComponent(player)); itemComponent.append(GsonComponentSerializer.gson().deserialize(showItem.getItemConverter().createComponent(item, Level.FINE).toJsonString(player)));
} catch (Exception e) { } catch (Exception e) {
ChestShop.getPlugin().getLogger().log(Level.WARNING, "Error while trying to send message '" + message + "' to player " + player.getName() + ": " + e.getMessage()); ChestShop.getPlugin().getLogger().log(Level.WARNING, "Error while trying to send message '" + message + "' to player " + player.getName() + ": " + e.getMessage());
return false; return false;
@ -551,7 +554,7 @@ public class MaterialUtil {
newMap.put("material", "item"); newMap.put("material", "item");
Component component = new Replacer() Component component = new Replacer()
.placeholderSuffix("") .placeholderSuffix("")
.replace("item",itemComponent) .replace("item",itemComponent.build())
.replaceIn(message.getComponent(player, true, newMap, replacements)); .replaceIn(message.getComponent(player, true, newMap, replacements));
if (player != null) { if (player != null) {
ChestShop.getAudiences().player(player).sendMessage(component); ChestShop.getAudiences().player(player).sendMessage(component);