Netherite-Public/EntityLib
5
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix!

Browse source
This commit is contained in:
Tofaa 2024-07-16 12:13:11 +04:00
parent 24887cb05a
commit 96e1401d0a
3 changed files with 17 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
api/src/main/java/me/tofaa/entitylib/meta/EntityMeta.java
View file

@ -1,5 +1,6 @@
package me.tofaa.entitylib.meta; package me.tofaa.entitylib.meta;
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.manager.server.VersionComparison; import com.github.retrooper.packetevents.manager.server.VersionComparison;
import com.github.retrooper.packetevents.protocol.entity.data.EntityData; import com.github.retrooper.packetevents.protocol.entity.data.EntityData;
@ -203,17 +204,29 @@ public class EntityMeta implements EntityMetadataProvider {
} }
protected static void isVersionNewer(ServerVersion version) { protected static void isVersionNewer(ServerVersion version) {
if (!EntityLib.getApi().getPacketEvents().getServerManager().getVersion().is(VersionComparison.NEWER_THAN, version)) { if (EntityLib.getOptionalApi().isPresent()) {
if (!EntityLib.getApi().getPacketEvents().getServerManager().getVersion().is(VersionComparison.NEWER_THAN, version)) {
throw new InvalidVersionException("This method is only available for versions newer than " + version.name() + ".");
}
}
if (!PacketEvents.getAPI().getServerManager().getVersion().is(VersionComparison.NEWER_THAN, version)) {
throw new InvalidVersionException("This method is only available for versions newer than " + version.name() + "."); throw new InvalidVersionException("This method is only available for versions newer than " + version.name() + ".");
} }
} }
protected static boolean isVersion(ServerVersion version, VersionComparison comparison) { protected static boolean isVersion(ServerVersion version, VersionComparison comparison) {
return EntityLib.getApi().getPacketEvents().getServerManager().getVersion().is(comparison, version); if (EntityLib.getOptionalApi().isPresent()) {
return EntityLib.getApi().getPacketEvents().getServerManager().getVersion().is(comparison, version);
}
return PacketEvents.getAPI().getServerManager().getVersion().is(comparison, version);
} }
protected static boolean isVersion(ServerVersion version) { protected static boolean isVersion(ServerVersion version) {
return EntityLib.getApi().getPacketEvents().getServerManager().getVersion().is(VersionComparison.EQUALS, version); if (EntityLib.getOptionalApi().isPresent()) {
return EntityLib.getApi().getPacketEvents().getServerManager().getVersion().is(VersionComparison.EQUALS, version);
}
return PacketEvents.getAPI().getServerManager().getVersion().is(VersionComparison.EQUALS, version);
} }
/** /**

1
api/src/main/java/me/tofaa/entitylib/meta/types/PlayerMeta.java
View file

@ -4,7 +4,6 @@ import com.github.retrooper.packetevents.manager.server.ServerVersion;
import com.github.retrooper.packetevents.protocol.entity.data.EntityDataTypes; import com.github.retrooper.packetevents.protocol.entity.data.EntityDataTypes;
import com.github.retrooper.packetevents.protocol.nbt.NBTCompound; import com.github.retrooper.packetevents.protocol.nbt.NBTCompound;
import me.tofaa.entitylib.EntityLib; import me.tofaa.entitylib.EntityLib;
import me.tofaa.entitylib.meta.EntityMeta;
import me.tofaa.entitylib.meta.Metadata; import me.tofaa.entitylib.meta.Metadata;
import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Nullable;

1
test-plugin/build.gradle.kts
View file

@ -11,6 +11,7 @@ repositories {
dependencies { dependencies {
compileOnly(libs.paper) compileOnly(libs.paper)
compileOnly(libs.packetevents.spigot) compileOnly(libs.packetevents.spigot)
implementation("com.github.Tofaa2.EntityLib:spigot:24887cb05a")
implementation(project(":platforms:spigot")) implementation(project(":platforms:spigot"))
} }