From 7d727da41c041daa33fad82a2f711b6732a82a4b Mon Sep 17 00:00:00 2001 From: Hempfest <64885225+Hempfest@users.noreply.github.com> Date: Sun, 4 Feb 2024 22:19:53 -0800 Subject: [PATCH] * Support for new game versions added. --- labyrinth-bukkit/pom.xml | 2 +- labyrinth-common/pom.xml | 2 +- labyrinth-gui/pom.xml | 2 +- labyrinth-loci/pom.xml | 2 +- labyrinth-perms/pom.xml | 2 +- labyrinth-plugin/pom.xml | 2 +- .../src/main/resources/lib/1_20_R2.jar | Bin 0 -> 4942 bytes .../src/main/resources/lib/1_20_R3.jar | Bin 0 -> 4968 bytes labyrinth-regions/pom.xml | 2 +- labyrinth-skulls/pom.xml | 2 +- .../github/sanctum/skulls/CustomHeadLoader.java | 3 ++- pom.xml | 2 +- 12 files changed, 11 insertions(+), 10 deletions(-) create mode 100644 labyrinth-plugin/src/main/resources/lib/1_20_R2.jar create mode 100644 labyrinth-plugin/src/main/resources/lib/1_20_R3.jar diff --git a/labyrinth-bukkit/pom.xml b/labyrinth-bukkit/pom.xml index c995645..930826a 100644 --- a/labyrinth-bukkit/pom.xml +++ b/labyrinth-bukkit/pom.xml @@ -5,7 +5,7 @@ labyrinth com.github.the-h-team - 1.9.4-SNAPSHOT + 1.9.4 4.0.0 diff --git a/labyrinth-common/pom.xml b/labyrinth-common/pom.xml index 6c910ab..da44294 100644 --- a/labyrinth-common/pom.xml +++ b/labyrinth-common/pom.xml @@ -5,7 +5,7 @@ labyrinth com.github.the-h-team - 1.9.4-SNAPSHOT + 1.9.4 4.0.0 diff --git a/labyrinth-gui/pom.xml b/labyrinth-gui/pom.xml index fd15e44..28d6a29 100644 --- a/labyrinth-gui/pom.xml +++ b/labyrinth-gui/pom.xml @@ -5,7 +5,7 @@ labyrinth com.github.the-h-team - 1.9.4-SNAPSHOT + 1.9.4 4.0.0 diff --git a/labyrinth-loci/pom.xml b/labyrinth-loci/pom.xml index 67363a7..98ef6e1 100644 --- a/labyrinth-loci/pom.xml +++ b/labyrinth-loci/pom.xml @@ -5,7 +5,7 @@ labyrinth com.github.the-h-team - 1.9.4-SNAPSHOT + 1.9.4 4.0.0 diff --git a/labyrinth-perms/pom.xml b/labyrinth-perms/pom.xml index e2485b9..d21271d 100644 --- a/labyrinth-perms/pom.xml +++ b/labyrinth-perms/pom.xml @@ -5,7 +5,7 @@ labyrinth com.github.the-h-team - 1.9.4-SNAPSHOT + 1.9.4 4.0.0 diff --git a/labyrinth-plugin/pom.xml b/labyrinth-plugin/pom.xml index 5893545..d71d443 100644 --- a/labyrinth-plugin/pom.xml +++ b/labyrinth-plugin/pom.xml @@ -5,7 +5,7 @@ labyrinth com.github.the-h-team - 1.9.4-SNAPSHOT + 1.9.4 4.0.0 diff --git a/labyrinth-plugin/src/main/resources/lib/1_20_R2.jar b/labyrinth-plugin/src/main/resources/lib/1_20_R2.jar new file mode 100644 index 0000000000000000000000000000000000000000..a2beac13ca4ac9189b197aa2019fd42455823085 GIT binary patch literal 4942 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 TQXWfCA3a`2zx$T)`0Kv_TOwqy literal 0 HcmV?d00001 diff --git a/labyrinth-plugin/src/main/resources/lib/1_20_R3.jar b/labyrinth-plugin/src/main/resources/lib/1_20_R3.jar new file mode 100644 index 0000000000000000000000000000000000000000..0550702e39bac27f70a41df8babeecdd70e00509 GIT binary patch literal 4968 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 literal 0 HcmV?d00001 diff --git a/labyrinth-regions/pom.xml b/labyrinth-regions/pom.xml index ba2c833..60200ed 100644 --- a/labyrinth-regions/pom.xml +++ b/labyrinth-regions/pom.xml @@ -5,7 +5,7 @@ labyrinth com.github.the-h-team - 1.9.4-SNAPSHOT + 1.9.4 4.0.0 diff --git a/labyrinth-skulls/pom.xml b/labyrinth-skulls/pom.xml index 4f9322f..97a378a 100644 --- a/labyrinth-skulls/pom.xml +++ b/labyrinth-skulls/pom.xml @@ -5,7 +5,7 @@ labyrinth com.github.the-h-team - 1.9.4-SNAPSHOT + 1.9.4 4.0.0 diff --git a/labyrinth-skulls/src/main/java/com/github/sanctum/skulls/CustomHeadLoader.java b/labyrinth-skulls/src/main/java/com/github/sanctum/skulls/CustomHeadLoader.java index 541d402..62f92da 100644 --- a/labyrinth-skulls/src/main/java/com/github/sanctum/skulls/CustomHeadLoader.java +++ b/labyrinth-skulls/src/main/java/com/github/sanctum/skulls/CustomHeadLoader.java @@ -4,6 +4,7 @@ import com.github.sanctum.labyrinth.data.FileList; import com.github.sanctum.panther.file.MemorySpace; import com.github.sanctum.panther.file.Node; +import com.github.sanctum.panther.util.HUID; import com.google.common.base.Preconditions; import com.mojang.authlib.GameProfile; import com.mojang.authlib.properties.Property; @@ -146,7 +147,7 @@ public static ItemStack provide(String headValue) { if (headValue != null) { SkullMeta skullMeta = (SkullMeta) skull.getItemMeta(); - GameProfile profile = new GameProfile(UUID.randomUUID(), null); + GameProfile profile = new GameProfile(UUID.randomUUID(), HUID.randomID().toString()); profile.getProperties().put("textures", new Property("textures", headValue)); diff --git a/pom.xml b/pom.xml index 1d60810..792e9da 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ com.github.the-h-team labyrinth - 1.9.4-SNAPSHOT + 1.9.4 labyrinth-common labyrinth-gui