Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,7 @@
import com.github.juliarn.npclib.api.protocol.PlatformPacketAdapter;
import com.github.juliarn.npclib.bukkit.BukkitPlatform;
import com.github.juliarn.npclib.bukkit.BukkitWorldAccessor;
import com.github.juliarn.npclib.bukkit.protocol.BukkitProtocolAdapter;
import com.github.juliarn.npclib.ext.labymod.LabyModExtension;
import com.github.retrooper.packetevents.manager.server.ServerVersion;
import com.github.retrooper.packetevents.util.PEVersion;
import com.google.common.base.Preconditions;
import eu.cloudnetservice.driver.ComponentInfo;
import eu.cloudnetservice.driver.event.EventManager;
Expand All @@ -44,6 +41,7 @@
import eu.cloudnetservice.modules.npc.impl.platform.PlatformNPCManagement;
import eu.cloudnetservice.modules.npc.impl.platform.bukkit.entity.EntityBukkitPlatformSelectorEntity;
import eu.cloudnetservice.modules.npc.impl.platform.bukkit.entity.NPCBukkitPlatformSelector;
import eu.cloudnetservice.modules.npc.impl.platform.bukkit.util.BukkitPacketAdapterUtil;
import eu.cloudnetservice.modules.npc.platform.PlatformSelectorEntity;
import eu.cloudnetservice.wrapper.configuration.WrapperConfiguration;
import jakarta.inject.Inject;
Expand Down Expand Up @@ -290,15 +288,6 @@ protected void startEmoteTask(boolean force) {
}

protected @NonNull PlatformPacketAdapter<World, Player, ItemStack, Plugin> resolvePacketAdapter() {
var bukkitVersion = this.server.getBukkitVersion();
var parsedVersion = PEVersion.fromString(bukkitVersion.substring(0, bukkitVersion.indexOf("-")));
var latestPEVersion = PEVersion.fromString(ServerVersion.getLatest().getReleaseName());
if (parsedVersion.isNewerThan(latestPEVersion)) {
this.plugin.getLogger().info("NPCs using ProtocolLib for version " + bukkitVersion);
return BukkitProtocolAdapter.protocolLib();
}

this.plugin.getLogger().info("NPCs using PacketEvents for version " + bukkitVersion);
return BukkitProtocolAdapter.packetEvents();
return BukkitPacketAdapterUtil.resolve();
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,101 @@
/*
* Copyright 2019-present CloudNetService team & contributors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

package eu.cloudnetservice.modules.npc.impl.platform.bukkit.util;

import com.github.juliarn.npclib.api.protocol.PlatformPacketAdapter;
import com.github.juliarn.npclib.bukkit.protocol.BukkitProtocolAdapter;
import com.github.retrooper.packetevents.manager.server.ServerVersion;
import com.github.retrooper.packetevents.util.PEVersion;
import eu.cloudnetservice.utils.base.StringUtil;
import java.lang.invoke.MethodHandle;
import java.lang.invoke.MethodHandles;
import java.lang.invoke.MethodType;
import java.util.function.Supplier;
import lombok.NonNull;
import org.bukkit.Bukkit;
import org.bukkit.Server;
import org.bukkit.World;
import org.bukkit.entity.Player;
import org.bukkit.inventory.ItemStack;
import org.bukkit.plugin.Plugin;

public final class BukkitPacketAdapterUtil {

private static final String NPC_PACKET_ADAPTER = System.getProperty("cloudnet.npcs.packet-adapter");

private static final MethodHandle SERVER_GET_BUKKIT_VERSION;

static {
MethodHandle handle = null;
try {
handle = MethodHandles.publicLookup().findVirtual(Server.class, "getBukkitVersion", MethodType.methodType(String.class));
} catch (Throwable _) {
}
SERVER_GET_BUKKIT_VERSION = handle;
}

private static final Supplier<PlatformPacketAdapter<World, Player, ItemStack, Plugin>> RESOLVED = StableValue.supplier(
BukkitPacketAdapterUtil::resolveAdapter);

private BukkitPacketAdapterUtil() {
throw new UnsupportedOperationException();
}

public static @NonNull PlatformPacketAdapter<World, Player, ItemStack, Plugin> resolve() {
return RESOLVED.get();
}

private static @NonNull PlatformPacketAdapter<World, Player, ItemStack, Plugin> resolveAdapter() {
if (NPC_PACKET_ADAPTER == null) {
return evaluateAdapter();
}

return switch (StringUtil.toLower(NPC_PACKET_ADAPTER)) {
case "protocollib" -> BukkitProtocolAdapter.protocolLib();
case "packetevents" -> BukkitProtocolAdapter.packetEvents();
default -> evaluateAdapter();
};
}

private static @NonNull PlatformPacketAdapter<World, Player, ItemStack, Plugin> evaluateAdapter() {
try {
var bukkitVersion = resolveMinecraftVersion();
var versionStart = bukkitVersion.indexOf('-');
var parsedVersion = PEVersion.fromString(versionStart >= 0 ? bukkitVersion.substring(0, versionStart) : bukkitVersion);
var latestPEVersion = PEVersion.fromString(ServerVersion.getLatest().getReleaseName());
if (parsedVersion.isNewerThan(latestPEVersion)) {
return BukkitProtocolAdapter.protocolLib();
}

return BukkitProtocolAdapter.packetEvents();
} catch (Throwable _) {
return BukkitProtocolAdapter.protocolLib();
}
}

private static @NonNull String resolveMinecraftVersion() {
try {
if (SERVER_GET_BUKKIT_VERSION != null) {
return (String) SERVER_GET_BUKKIT_VERSION.invoke(Bukkit.getServer());
}
} catch (Throwable _) {
}
return Bukkit.getBukkitVersion();
}
}


Loading