mirrors/papermc
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Make spawn egg colours visible (#10158)

Browse source 
Co-authored-by: Yannick Lamprecht <1420893+yannicklamprecht@users.noreply.github.com>
This commit is contained in:
Luis 2024-01-27 18:32:05 +00:00 • committed by GitHub
parent 4643b0d959
commit b333831b70
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 54 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

26
patches/server/1043-Add-api-for-spawn-egg-texture-colors.patch Normal file
View file

@ -0,0 +1,26 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Luis <luisc99@icloud.com>
Date: Thu, 11 Jan 2024 19:58:23 +0100
Subject: [PATCH] Add api for spawn egg texture colors
diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
index 4e1390b9244aeb745ffd3fd1257bc74248722515..ca5312febcdd467889ad725c0263367bc5fe69f6 100644
--- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
+++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
@@ -645,6 +645,15 @@ public final class CraftMagicNumbers implements UnsafeValues {
}
// Paper end
+ // Paper start - spawn egg color visibility
+ @Override
+ public org.bukkit.Color getSpawnEggLayerColor(final EntityType entityType, final int layer) {
+ final net.minecraft.world.entity.EntityType<?> nmsType = org.bukkit.craftbukkit.entity.CraftEntityType.bukkitToMinecraft(entityType);
+ final net.minecraft.world.item.SpawnEggItem eggItem = net.minecraft.world.item.SpawnEggItem.byId(nmsType);
+ return eggItem == null ? null : org.bukkit.Color.fromRGB(eggItem.getColor(layer));
+ }
+ // Paper end - spawn egg color visibility
+
/**
* This helper class represents the different NBT Tags.
* <p>