From 39bca37d0de590c8a498af81089af957324bfe05 Mon Sep 17 00:00:00 2001 From: ABKQPO <93412322+ABKQPO@users.noreply.github.com> Date: Sat, 9 May 2026 11:31:22 +0800 Subject: [PATCH] Adjust IDynamicLightProducer to allow passing an ItemStack parameter (#1734) Co-authored-by: Caedis --- .../gtnewhorizons/angelica/api/IDynamicLightProducer.java | 4 +++- .../gtnewhorizons/angelica/dynamiclights/DynamicLights.java | 6 +++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/gtnewhorizons/angelica/api/IDynamicLightProducer.java b/src/main/java/com/gtnewhorizons/angelica/api/IDynamicLightProducer.java index 125e836c1..401e6ec11 100644 --- a/src/main/java/com/gtnewhorizons/angelica/api/IDynamicLightProducer.java +++ b/src/main/java/com/gtnewhorizons/angelica/api/IDynamicLightProducer.java @@ -1,8 +1,10 @@ package com.gtnewhorizons.angelica.api; +import net.minecraft.item.ItemStack; + /** * To be used for modded items that don't have blocks. Baubles for example. */ public interface IDynamicLightProducer { - int getLuminance(); + int getLuminance(ItemStack stack); } diff --git a/src/main/java/com/gtnewhorizons/angelica/dynamiclights/DynamicLights.java b/src/main/java/com/gtnewhorizons/angelica/dynamiclights/DynamicLights.java index cb0c49bb0..7981500b4 100644 --- a/src/main/java/com/gtnewhorizons/angelica/dynamiclights/DynamicLights.java +++ b/src/main/java/com/gtnewhorizons/angelica/dynamiclights/DynamicLights.java @@ -573,13 +573,13 @@ public class DynamicLights { */ public static int getLuminanceFromItemStack(@NotNull ItemStack stack) { final Item item = stack.getItem(); - if (item instanceof ItemBlock itemBlock) { + if (item instanceof IDynamicLightProducer lightProducer) { + return lightProducer.getLuminance(stack); + } else if (item instanceof ItemBlock itemBlock) { final Block block = itemBlock.field_150939_a; if (block != null) { return block.getLightValue(); } - } else if (item instanceof IDynamicLightProducer lightProducer){ - return lightProducer.getLuminance(); } if (item == Items.lava_bucket) return Blocks.lava.getLightValue();