Compare commits

..

No commits in common. "a518828197367da1037bc160d451c3faef1ee74b" and "c1f570147c9c5c5674e450c068bfb065255d47c7" have entirely different histories.

5 changed files with 17 additions and 6 deletions

View file

@ -10,7 +10,7 @@ trigger:
steps: steps:
- name: publish - name: publish
pull: if-not-exists pull: if-not-exists
image: openjdk:21-jdk image: openjdk:17-jdk
environment: environment:
PACKAGESKEY: PACKAGESKEY:
from_secret: GITEA_PACKAGE_PUBLIC_RW from_secret: GITEA_PACKAGE_PUBLIC_RW

View file

@ -6,7 +6,7 @@ subprojects {
version "2.0.0-netherite-snapshot" version "2.0.0-netherite-snapshot"
java { java {
toolchain.languageVersion.set(JavaLanguageVersion.of(21)) toolchain.languageVersion.set(JavaLanguageVersion.of(17))
} }
dependencies { dependencies {

View file

@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.2-bin.zip
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists

View file

@ -1,6 +1,14 @@
plugins { plugins {
id "java" id "java"
id "io.github.goooler.shadow" version "8.1.8" id "com.github.johnrengelman.shadow" version "8.1.1"
id "xyz.jpenilla.run-paper" version "2.2.0"
}
runServer {
javaLauncher = javaToolchains.launcherFor {
languageVersion = JavaLanguageVersion.of(21)
}
minecraftVersion "1.21.3"
} }
processResources { processResources {
@ -9,14 +17,15 @@ processResources {
dependencies { dependencies {
compileOnly "me.clip:placeholderapi:2.11.6" // Placeholder support compileOnly "me.clip:placeholderapi:2.11.6" // Placeholder support
implementation "com.google.code.gson:gson:2.12.1" // JSON parsing implementation "com.google.code.gson:gson:2.10.1" // JSON parsing
implementation "org.bstats:bstats-bukkit:3.0.2" // Plugin stats
implementation "com.github.retrooper:packetevents-spigot:2.7.0" // Packets implementation "com.github.retrooper:packetevents-spigot:2.7.0" // Packets
implementation "space.arim.dazzleconf:dazzleconf-ext-snakeyaml:1.2.1" // Configs implementation "space.arim.dazzleconf:dazzleconf-ext-snakeyaml:1.2.1" // Configs
implementation "lol.pyr:director-adventure:2.1.2" // Commands implementation "lol.pyr:director-adventure:2.1.2" // Commands
// Fancy text library // Fancy text library
implementation "net.kyori:adventure-platform-bukkit:4.3.4" implementation "net.kyori:adventure-platform-bukkit:4.3.4"
implementation "net.kyori:adventure-text-minimessage:4.18.0" implementation "net.kyori:adventure-text-minimessage:4.17.0"
implementation project(":api") implementation project(":api")
} }

View file

@ -55,6 +55,7 @@ import net.kyori.adventure.text.Component;
import net.kyori.adventure.text.format.NamedTextColor; import net.kyori.adventure.text.format.NamedTextColor;
import net.kyori.adventure.text.format.TextColor; import net.kyori.adventure.text.format.TextColor;
import net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer; import net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer;
import org.bstats.bukkit.Metrics;
import org.bukkit.*; import org.bukkit.*;
import org.bukkit.plugin.Plugin; import org.bukkit.plugin.Plugin;
import org.bukkit.plugin.PluginDescriptionFile; import org.bukkit.plugin.PluginDescriptionFile;
@ -154,6 +155,7 @@ public class ZNpcsPlus {
actionRegistry.registerTypes(scheduler, adventure, textSerializer, bungeeConnector); actionRegistry.registerTypes(scheduler, adventure, textSerializer, bungeeConnector);
packetEvents.getEventManager().registerListener(new InteractionPacketListener(userManager, npcRegistry, typeRegistry, scheduler), PacketListenerPriority.MONITOR); packetEvents.getEventManager().registerListener(new InteractionPacketListener(userManager, npcRegistry, typeRegistry, scheduler), PacketListenerPriority.MONITOR);
packetEvents.getEventManager().registerListener(new ClientPacketListener(configManager), PacketListenerPriority.LOWEST); packetEvents.getEventManager().registerListener(new ClientPacketListener(configManager), PacketListenerPriority.LOWEST);
new Metrics(bootstrap, 18244);
pluginManager.registerEvents(new UserListener(userManager), bootstrap); pluginManager.registerEvents(new UserListener(userManager), bootstrap);
registerCommands(npcRegistry, skinCache, adventure, actionRegistry, registerCommands(npcRegistry, skinCache, adventure, actionRegistry,