forked from PaperMC/Paper
-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Make spawn egg colours visible (PaperMC#10158)
Co-authored-by: Yannick Lamprecht <[email protected]>
- Loading branch information
Showing
2 changed files
with
54 additions
and
0 deletions.
There are no files selected for viewing
28 changes: 28 additions & 0 deletions
28
patches/api/0458-Add-api-for-spawn-egg-texture-colors.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,28 @@ | ||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 | ||
From: Luis <[email protected]> | ||
Date: Thu, 11 Jan 2024 19:58:17 +0100 | ||
Subject: [PATCH] Add api for spawn egg texture colors | ||
|
||
|
||
diff --git a/src/main/java/org/bukkit/UnsafeValues.java b/src/main/java/org/bukkit/UnsafeValues.java | ||
index a4b38f284d4fea7df7f9df9bf44e4f68fefaf20f..923d8655a84e26960d35d8dc6e4ebc0b10c295d5 100644 | ||
--- a/src/main/java/org/bukkit/UnsafeValues.java | ||
+++ b/src/main/java/org/bukkit/UnsafeValues.java | ||
@@ -260,4 +260,17 @@ public interface UnsafeValues { | ||
|
||
String getStatisticCriteriaKey(@NotNull org.bukkit.Statistic statistic); | ||
// Paper end | ||
+ | ||
+ // Paper start - spawn egg color visibility | ||
+ /** | ||
+ * Obtains the underlying color informating for a spawn egg of a given | ||
+ * entity type, or null if the entity passed does not have a spawn egg. | ||
+ * Spawn eggs have two colors - the background layer (0), and the | ||
+ * foreground layer (1) | ||
+ * @param entityType The entity type to get the color for | ||
+ * @param layer The texture layer to get a color for | ||
+ * @return The color of the layer for the entity's spawn egg | ||
+ */ | ||
+ @Nullable org.bukkit.Color getSpawnEggLayerColor(org.bukkit.entity.EntityType entityType, int layer); | ||
+ // Paper end - spawn egg color visibility | ||
} |
26 changes: 26 additions & 0 deletions
26
patches/server/1043-Add-api-for-spawn-egg-texture-colors.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,26 @@ | ||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 | ||
From: Luis <[email protected]> | ||
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> |