Netherite-Public/ZNPCsPlus
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix skin layers & some adventure warnings

Browse Source
This commit is contained in:
Pyrbu 2023-04-24 02:33:26 +01:00
parent 02b6d1fb4c
commit 9b71d532f6
3 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/java/io/github/znetworkw/znpcservers/commands/CommandSender.java
View File

@ -3,16 +3,14 @@ package io.github.znetworkw.znpcservers.commands;
import com.google.common.base.Joiner; import com.google.common.base.Joiner;
import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableList;
import com.google.common.collect.Iterables; import com.google.common.collect.Iterables;
import io.github.znetworkw.znpcservers.utility.Utils;
import lol.pyr.znpcsplus.ZNPCsPlus; import lol.pyr.znpcsplus.ZNPCsPlus;
import net.kyori.adventure.text.Component;
import net.kyori.adventure.text.TextComponent; import net.kyori.adventure.text.TextComponent;
import net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import java.util.Arrays; import java.util.Arrays;
import java.util.stream.Collectors; import java.util.stream.Collectors;
@SuppressWarnings("deprecation")
public class CommandSender { public class CommandSender {
static final Joiner LINE_SEPARATOR_JOINER = Joiner.on("\n"); static final Joiner LINE_SEPARATOR_JOINER = Joiner.on("\n");
@ -40,10 +38,10 @@ public class CommandSender {
} }
public void sendMessage(String message, Iterable<String> hover) { public void sendMessage(String message, Iterable<String> hover) {
TextComponent textComponent = Component.text(Utils.toColor(message)); message = message.replace(LegacyComponentSerializer.SECTION_CHAR, LegacyComponentSerializer.AMPERSAND_CHAR);
if (hover != null) LegacyComponentSerializer serializer = LegacyComponentSerializer.legacyAmpersand();
textComponent = textComponent.hoverEvent(Component.text(Utils.toColor(LINE_SEPARATOR_JOINER TextComponent textComponent = serializer.deserialize(message);
.join(Iterables.concat(HELP_PREFIX, hover))))); if (hover != null) textComponent = textComponent.hoverEvent(serializer.deserialize(LINE_SEPARATOR_JOINER.join(Iterables.concat(HELP_PREFIX, hover))));
ZNPCsPlus.ADVENTURE.player(getPlayer()).sendMessage(textComponent); ZNPCsPlus.ADVENTURE.player(getPlayer()).sendMessage(textComponent);
} }

2
src/main/java/io/github/znetworkw/znpcservers/commands/list/DefaultCommand.java
View File

@ -127,7 +127,7 @@ public class DefaultCommand extends Command {
.append(Component.text(" " + npcModel.getHologramLines().toString() + .append(Component.text(" " + npcModel.getHologramLines().toString() +
" (" + npcModel.getLocation().getWorldName() + " " + (int) npcModel.getLocation().getX() + " " + " (" + npcModel.getLocation().getWorldName() + " " + (int) npcModel.getLocation().getX() + " " +
(int) npcModel.getLocation().getY() + " " + (int) npcModel.getLocation().getZ() + ") ", NamedTextColor.GREEN)) (int) npcModel.getLocation().getY() + " " + (int) npcModel.getLocation().getZ() + ") ", NamedTextColor.GREEN))
.append(Component.text("[TELEPORT]", NamedTextColor.GREEN, TextDecoration.BOLD) .append(Component.text("[TELEPORT]", NamedTextColor.DARK_GREEN, TextDecoration.BOLD)
.clickEvent(ClickEvent.runCommand("/znpcs teleport " + npcModel.getId())) .clickEvent(ClickEvent.runCommand("/znpcs teleport " + npcModel.getId()))
.hoverEvent(HoverEvent.showText(Component.text("Click to teleport to this NPC.")))) .hoverEvent(HoverEvent.showText(Component.text("Click to teleport to this NPC."))))
.append(Component.text(" [DELETE]", NamedTextColor.RED, TextDecoration.BOLD) .append(Component.text(" [DELETE]", NamedTextColor.RED, TextDecoration.BOLD)

7
src/main/java/io/github/znetworkw/znpcservers/npc/NPC.java
View File

@ -2,6 +2,8 @@ package io.github.znetworkw.znpcservers.npc;
import com.github.retrooper.packetevents.PacketEvents; import com.github.retrooper.packetevents.PacketEvents;
import com.github.retrooper.packetevents.manager.server.ServerVersion; import com.github.retrooper.packetevents.manager.server.ServerVersion;
import com.github.retrooper.packetevents.protocol.entity.data.EntityData;
import com.github.retrooper.packetevents.protocol.entity.data.EntityDataTypes;
import com.github.retrooper.packetevents.protocol.entity.type.EntityType; import com.github.retrooper.packetevents.protocol.entity.type.EntityType;
import com.github.retrooper.packetevents.protocol.player.Equipment; import com.github.retrooper.packetevents.protocol.player.Equipment;
import com.github.retrooper.packetevents.protocol.player.UserProfile; import com.github.retrooper.packetevents.protocol.player.UserProfile;
@ -179,8 +181,7 @@ public class NPC {
try { try {
Object dataWatcherObject = Reflections.GET_DATA_WATCHER_METHOD.get().invoke(this.nmsEntity); Object dataWatcherObject = Reflections.GET_DATA_WATCHER_METHOD.get().invoke(this.nmsEntity);
if (Utils.versionNewer(9)) { if (Utils.versionNewer(9)) {
Reflections.SET_DATA_WATCHER_METHOD.get().invoke(dataWatcherObject, Reflections.SET_DATA_WATCHER_METHOD.get().invoke(dataWatcherObject, Reflections.DATA_WATCHER_OBJECT_CONSTRUCTOR.get()
Reflections.DATA_WATCHER_OBJECT_CONSTRUCTOR.get()
.newInstance(this.npcSkin.getLayerIndex(), Reflections.DATA_WATCHER_REGISTER_FIELD.get()), (byte) 127); .newInstance(this.npcSkin.getLayerIndex(), Reflections.DATA_WATCHER_REGISTER_FIELD.get()), (byte) 127);
} else { } else {
Reflections.WATCH_DATA_WATCHER_METHOD.get().invoke(dataWatcherObject, 10, (byte) 127); Reflections.WATCH_DATA_WATCHER_METHOD.get().invoke(dataWatcherObject, 10, (byte) 127);
@ -242,6 +243,8 @@ public class NPC {
ZNPCsPlus.SCHEDULER.runTask(() -> { ZNPCsPlus.SCHEDULER.runTask(() -> {
PacketEvents.getAPI().getPlayerManager().sendPacket(player, new WrapperPlayServerSpawnPlayer(entityID, PacketEvents.getAPI().getPlayerManager().sendPacket(player, new WrapperPlayServerSpawnPlayer(entityID,
this.gameProfile.getId(), SpigotConversionUtil.fromBukkitLocation(location.toBukkitLocation()))); this.gameProfile.getId(), SpigotConversionUtil.fromBukkitLocation(location.toBukkitLocation())));
PacketEvents.getAPI().getPlayerManager().sendPacket(player, new WrapperPlayServerEntityMetadata(entityID,
List.of(new EntityData(17, EntityDataTypes.BYTE, Byte.MAX_VALUE))));
PacketEvents.getAPI().getPlayerManager().sendPacket(player, new WrapperPlayServerEntityHeadLook(entityID, location.getYaw())); PacketEvents.getAPI().getPlayerManager().sendPacket(player, new WrapperPlayServerEntityHeadLook(entityID, location.getYaw()));
}); });
} }