From c3f5a69bcae6c1dce1af6193abb6a1abe4c227b5 Mon Sep 17 00:00:00 2001
From: = <asdada@gmail.com>
Date: Sat, 14 Dec 2024 23:51:43 +0200
Subject: [PATCH] Use commit hash for beta builds
---
api/src/main/java/me/tofaa/entitylib/extras/Color.java | 4 ++++
api/src/main/java/me/tofaa/entitylib/extras/DyeColor.java | 3 +++
api/src/main/java/me/tofaa/entitylib/extras/Rotation.java | 4 ++++
.../main/java/me/tofaa/entitylib/extras/skin/SkinFetcher.java | 4 ++--
.../src/main/kotlin/entitylib.library-conventions.gradle.kts | 2 +-
.../main/java/me/tofaa/entitylib/common/AbstractPlatform.java | 4 ++--
test-plugin/build.gradle.kts | 2 +-
7 files changed, 17 insertions(+), 6 deletions(-)
diff --git a/api/src/main/java/me/tofaa/entitylib/extras/Color.java b/api/src/main/java/me/tofaa/entitylib/extras/Color.java
index 8feba87..b142888 100644
--- a/api/src/main/java/me/tofaa/entitylib/extras/Color.java
+++ b/api/src/main/java/me/tofaa/entitylib/extras/Color.java
@@ -4,6 +4,10 @@ import net.kyori.adventure.util.RGBLike;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Range;
+/*
+ @Deprecated: My PR for this was accepted a while ago into PacketEvents, 3.0 will convert to the packet events version of this class.
+ */
+@Deprecated
public final class Color implements RGBLike {
private static final int BIT_MASK = 0xFF;
diff --git a/api/src/main/java/me/tofaa/entitylib/extras/DyeColor.java b/api/src/main/java/me/tofaa/entitylib/extras/DyeColor.java
index 7a1014c..66f51bf 100644
--- a/api/src/main/java/me/tofaa/entitylib/extras/DyeColor.java
+++ b/api/src/main/java/me/tofaa/entitylib/extras/DyeColor.java
@@ -3,6 +3,9 @@ package me.tofaa.entitylib.extras;
import net.kyori.adventure.util.RGBLike;
import org.jetbrains.annotations.NotNull;
+/*
+ @Deprecated: My PR for this was accepted a while ago into PacketEvents, 3.0 will convert to the packet events version of this class.
+ */
@Deprecated
public enum DyeColor implements RGBLike {
WHITE(new Color(0xf9fffe), new Color(0xffffff), new Color(0xf0f0f0), 8),
diff --git a/api/src/main/java/me/tofaa/entitylib/extras/Rotation.java b/api/src/main/java/me/tofaa/entitylib/extras/Rotation.java
index b05b61e..2da52d6 100644
--- a/api/src/main/java/me/tofaa/entitylib/extras/Rotation.java
+++ b/api/src/main/java/me/tofaa/entitylib/extras/Rotation.java
@@ -1,5 +1,9 @@
package me.tofaa.entitylib.extras;
+/*
+ @Deprecated: My PR for this was accepted a while ago into PacketEvents, 3.0 will convert to the packet events version of this class.
+ */
+@Deprecated
public enum Rotation {
/**
diff --git a/api/src/main/java/me/tofaa/entitylib/extras/skin/SkinFetcher.java b/api/src/main/java/me/tofaa/entitylib/extras/skin/SkinFetcher.java
index 1f32edb..36e95e8 100644
--- a/api/src/main/java/me/tofaa/entitylib/extras/skin/SkinFetcher.java
+++ b/api/src/main/java/me/tofaa/entitylib/extras/skin/SkinFetcher.java
@@ -6,8 +6,8 @@ import java.util.List;
import java.util.UUID;
/**
- * Represents a interface that fetches the skin of a player.
- * This class is non static, you should create and store an instance of it.
+ * Represents an interface that fetches the skin of a player.
+ * This class is non-static, you should create and store an instance of it.
* Creating one should be done using the builder. SkinFetcher is synchronous. You must handle that yourself.
*/
public interface SkinFetcher {
diff --git a/buildSrc/src/main/kotlin/entitylib.library-conventions.gradle.kts b/buildSrc/src/main/kotlin/entitylib.library-conventions.gradle.kts
index 9010b11..6acd71e 100644
--- a/buildSrc/src/main/kotlin/entitylib.library-conventions.gradle.kts
+++ b/buildSrc/src/main/kotlin/entitylib.library-conventions.gradle.kts
@@ -60,7 +60,7 @@ publishing {
create<MavenPublication>("EntityLib") {
groupId = project.group as String
artifactId = project.name
- version = rootProject.ext["versionNoHash"] as String
+ version = rootProject.ext["version"] as String
from(components["java"])
pom {
diff --git a/common/src/main/java/me/tofaa/entitylib/common/AbstractPlatform.java b/common/src/main/java/me/tofaa/entitylib/common/AbstractPlatform.java
index 6bb5109..22d589e 100644
--- a/common/src/main/java/me/tofaa/entitylib/common/AbstractPlatform.java
+++ b/common/src/main/java/me/tofaa/entitylib/common/AbstractPlatform.java
@@ -49,12 +49,12 @@ public abstract class AbstractPlatform<P> implements Platform<P> {
}
@Override
- public void setEntityIdProvider(EntityIdProvider entityIdProvider) {
+ public void setEntityIdProvider(@NotNull EntityIdProvider entityIdProvider) {
this.entityIdProvider = entityIdProvider;
}
@Override
- public void setEntityUuidProvider(EntityUuidProvider entityUuidProvider) {
+ public void setEntityUuidProvider(@NotNull EntityUuidProvider entityUuidProvider) {
this.entityUuidProvider = entityUuidProvider;
}
diff --git a/test-plugin/build.gradle.kts b/test-plugin/build.gradle.kts
index da66ed9..5eef05e 100644
--- a/test-plugin/build.gradle.kts
+++ b/test-plugin/build.gradle.kts
@@ -21,7 +21,7 @@ tasks {
// 1.17 = Java 16
// 1.18 - 1.20.4 = Java 17
// 1-20.5+ = Java 21
- val version = "1.21"
+ val version = "1.21.3"
val javaVersion = JavaLanguageVersion.of(21)
val jvmArgsExternal = listOf(