feat: still not working.
This commit is contained in:
parent
4282b1f0cd
commit
b1d1570b39
7 changed files with 20 additions and 41 deletions
|
@ -35,12 +35,11 @@ dependencies {
|
||||||
compileOnly("io.papermc.paper:paper-api:1.21.8-R0.1-SNAPSHOT")
|
compileOnly("io.papermc.paper:paper-api:1.21.8-R0.1-SNAPSHOT")
|
||||||
|
|
||||||
compileOnly("me.clip:placeholderapi:2.11.5")
|
compileOnly("me.clip:placeholderapi:2.11.5")
|
||||||
compileOnly("net.kyori:adventure-api:4.21.0")
|
compileOnly("net.kyori:adventure-api:4.24.0")
|
||||||
compileOnly("xyz.xenondevs.invui:invui-core:$invuiVersion")
|
compileOnly("xyz.xenondevs.invui:invui-core:$invuiVersion")
|
||||||
compileOnly("net.wesjd:anvilgui:1.10.4-SNAPSHOT")
|
compileOnly("net.wesjd:anvilgui:1.10.4-SNAPSHOT")
|
||||||
|
|
||||||
implementation("com.github.retrooper:packetevents-spigot:2.9.0")
|
implementation("com.github.retrooper:packetevents-spigot:2.9.5")
|
||||||
|
|
||||||
implementation("com.github.jsixface:yamlconfig:1.2")
|
implementation("com.github.jsixface:yamlconfig:1.2")
|
||||||
implementation("com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:$jacksonVersion")
|
implementation("com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:$jacksonVersion")
|
||||||
implementation("com.fasterxml.jackson.core:jackson-core:$jacksonVersion")
|
implementation("com.fasterxml.jackson.core:jackson-core:$jacksonVersion")
|
||||||
|
@ -48,11 +47,6 @@ dependencies {
|
||||||
implementation("org.mariadb.jdbc:mariadb-java-client:3.5.2")
|
implementation("org.mariadb.jdbc:mariadb-java-client:3.5.2")
|
||||||
implementation("redis.clients:jedis:5.2.0")
|
implementation("redis.clients:jedis:5.2.0")
|
||||||
implementation("com.google.code.gson:gson:2.13.1")
|
implementation("com.google.code.gson:gson:2.13.1")
|
||||||
|
|
||||||
testImplementation("org.mockbukkit.mockbukkit:mockbukkit-v1.21:$mockBukkitVersion")
|
|
||||||
testImplementation(platform("org.junit:junit-bom:5.13.4"))
|
|
||||||
testImplementation("org.junit.jupiter:junit-jupiter")
|
|
||||||
testRuntimeOnly("org.junit.platform:junit-platform-launcher")
|
|
||||||
}
|
}
|
||||||
|
|
||||||
tasks {
|
tasks {
|
||||||
|
|
|
@ -2,6 +2,7 @@ package xyz.ineanto.nicko;
|
||||||
|
|
||||||
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.settings.PacketEventsSettings;
|
||||||
import io.github.retrooper.packetevents.factory.spigot.SpigotPacketEventsBuilder;
|
import io.github.retrooper.packetevents.factory.spigot.SpigotPacketEventsBuilder;
|
||||||
import org.bukkit.Bukkit;
|
import org.bukkit.Bukkit;
|
||||||
import org.bukkit.Material;
|
import org.bukkit.Material;
|
||||||
|
@ -32,22 +33,23 @@ import java.io.IOException;
|
||||||
public class Nicko extends JavaPlugin {
|
public class Nicko extends JavaPlugin {
|
||||||
private static Nicko plugin;
|
private static Nicko plugin;
|
||||||
|
|
||||||
private MojangAPI mojangAPI;
|
private final MojangAPI mojangApi = new MojangAPI();
|
||||||
|
private final PlayerNameStore nameStore = new PlayerNameStore();
|
||||||
private PlayerDataStore dataStore;
|
private PlayerDataStore dataStore;
|
||||||
private ConfigurationManager configurationManager;
|
private ConfigurationManager configurationManager;
|
||||||
private Configuration configuration;
|
private Configuration configuration;
|
||||||
private CustomLanguage customLanguage;
|
private CustomLanguage customLanguage;
|
||||||
private PlayerNameStore nameStore;
|
|
||||||
private RandomNameFetcher nameFetcher;
|
private RandomNameFetcher nameFetcher;
|
||||||
|
|
||||||
public Nicko() {
|
|
||||||
super();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onLoad() {
|
public void onLoad() {
|
||||||
PacketEvents.setAPI(SpigotPacketEventsBuilder.build(this));
|
PacketEvents.setAPI(
|
||||||
PacketEvents.getAPI().getSettings().checkForUpdates(false).kickOnPacketException(true);
|
SpigotPacketEventsBuilder.build(this,
|
||||||
|
new PacketEventsSettings()
|
||||||
|
.checkForUpdates(true)
|
||||||
|
.kickOnPacketException(true)
|
||||||
|
)
|
||||||
|
);
|
||||||
PacketEvents.getAPI().load();
|
PacketEvents.getAPI().load();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -55,12 +57,13 @@ public class Nicko extends JavaPlugin {
|
||||||
public void onEnable() {
|
public void onEnable() {
|
||||||
plugin = this;
|
plugin = this;
|
||||||
|
|
||||||
PacketEvents.getAPI().init();
|
|
||||||
|
|
||||||
configurationManager = new ConfigurationManager(getDataFolder());
|
configurationManager = new ConfigurationManager(getDataFolder());
|
||||||
configurationManager.saveDefaultConfig();
|
configurationManager.saveDefaultConfig();
|
||||||
|
|
||||||
dataStore = new PlayerDataStore(mojangAPI, getNickoConfig());
|
nameFetcher = new RandomNameFetcher(this);
|
||||||
|
dataStore = new PlayerDataStore(mojangApi, getNickoConfig());
|
||||||
|
|
||||||
|
PacketEvents.getAPI().init();
|
||||||
|
|
||||||
if (PacketEvents.getAPI().getServerManager().getVersion().isOlderThan(ServerVersion.V_1_20)) {
|
if (PacketEvents.getAPI().getServerManager().getVersion().isOlderThan(ServerVersion.V_1_20)) {
|
||||||
getLogger().severe("This version (" + PacketEvents.getAPI().getServerManager().getVersion() + ") is not officially supported by Nicko!");
|
getLogger().severe("This version (" + PacketEvents.getAPI().getServerManager().getVersion() + ") is not officially supported by Nicko!");
|
||||||
|
@ -95,10 +98,6 @@ public class Nicko extends JavaPlugin {
|
||||||
dataStore.setCache(cache);
|
dataStore.setCache(cache);
|
||||||
}
|
}
|
||||||
|
|
||||||
nameStore = new PlayerNameStore();
|
|
||||||
mojangAPI = new MojangAPI();
|
|
||||||
nameFetcher = new RandomNameFetcher(this);
|
|
||||||
|
|
||||||
new ConfigurationMigrator(this).migrate();
|
new ConfigurationMigrator(this).migrate();
|
||||||
InvUI.getInstance().setPlugin(this);
|
InvUI.getInstance().setPlugin(this);
|
||||||
|
|
||||||
|
@ -181,7 +180,7 @@ public class Nicko extends JavaPlugin {
|
||||||
}
|
}
|
||||||
|
|
||||||
public MojangAPI getMojangAPI() {
|
public MojangAPI getMojangAPI() {
|
||||||
return mojangAPI;
|
return mojangApi;
|
||||||
}
|
}
|
||||||
|
|
||||||
public CustomLanguage getCustomLocale() {
|
public CustomLanguage getCustomLocale() {
|
||||||
|
|
|
@ -60,8 +60,7 @@ public class AppearanceManager {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Not needed, but still broken using PE.
|
packetSender.sendPlayerRespawn();
|
||||||
//packetSender.sendPlayerRespawn();
|
|
||||||
|
|
||||||
// Call the event.
|
// Call the event.
|
||||||
final PlayerDisguiseEvent event = new PlayerDisguiseEvent(player, profile.getSkin(), profile.getName());
|
final PlayerDisguiseEvent event = new PlayerDisguiseEvent(player, profile.getSkin(), profile.getName());
|
||||||
|
|
|
@ -14,7 +14,7 @@ public class NickoPluginLoader implements PluginLoader {
|
||||||
final MavenLibraryResolver resolver = new MavenLibraryResolver();
|
final MavenLibraryResolver resolver = new MavenLibraryResolver();
|
||||||
|
|
||||||
resolver.addRepository(new RemoteRepository.Builder("xenondevs", "default", "https://repo.xenondevs.xyz/releases/").build());
|
resolver.addRepository(new RemoteRepository.Builder("xenondevs", "default", "https://repo.xenondevs.xyz/releases/").build());
|
||||||
resolver.addDependency(new Dependency(new DefaultArtifact("xyz.xenondevs.invui:invui:pom:1.45"), null));
|
resolver.addDependency(new Dependency(new DefaultArtifact("xyz.xenondevs.invui:invui:pom:1.46"), null));
|
||||||
|
|
||||||
pluginClasspathBuilder.addLibrary(resolver);
|
pluginClasspathBuilder.addLibrary(resolver);
|
||||||
}
|
}
|
||||||
|
|
|
@ -111,7 +111,7 @@ public record PacketEventsPacketSender(Player player, NickoProfile profile) impl
|
||||||
Difficulty.getById(world.getDifficulty().ordinal()),
|
Difficulty.getById(world.getDifficulty().ordinal()),
|
||||||
world.getSeed(),
|
world.getSeed(),
|
||||||
SpigotConversionUtil.fromBukkitGameMode(player.getGameMode()),
|
SpigotConversionUtil.fromBukkitGameMode(player.getGameMode()),
|
||||||
SpigotConversionUtil.fromBukkitGameMode(player.getPreviousGameMode()),
|
null,
|
||||||
false,
|
false,
|
||||||
false,
|
false,
|
||||||
true,
|
true,
|
||||||
|
|
|
@ -6,15 +6,6 @@ author: Ineanto
|
||||||
description: "The feature packed, next generation disguise plugin for Minecraft."
|
description: "The feature packed, next generation disguise plugin for Minecraft."
|
||||||
api-version: "1.21"
|
api-version: "1.21"
|
||||||
softdepend: [ PlaceholderAPI ]
|
softdepend: [ PlaceholderAPI ]
|
||||||
depend:
|
|
||||||
- ProtocolLib
|
|
||||||
|
|
||||||
dependencies:
|
|
||||||
server:
|
|
||||||
ProtocolLib:
|
|
||||||
load: BEFORE
|
|
||||||
join-classpath: true
|
|
||||||
|
|
||||||
permissions:
|
permissions:
|
||||||
nicko.*:
|
nicko.*:
|
||||||
default: op
|
default: op
|
||||||
|
|
|
@ -1,4 +0,0 @@
|
||||||
package xyz.ineanto.nicko.test;
|
|
||||||
|
|
||||||
public class TestPluginMock {
|
|
||||||
}
|
|
Loading…
Add table
Add a link
Reference in a new issue