Merge v3.1.2 changes into 1.21.2.

Author: LambdAurora

CHANGELOG.md

@@ -206,6 +206,12 @@
 
 - Fixed in-world item light source data reload not applying.
 
+### 3.1.2
+
+- Added base light of 8 to allays.
+- Fixed dynamic lighting of various projectiles.
+- Fixed water-sensitive items lighting up underwater while they shouldn't.
+
 ## 3.2.0
 
 - Updated to Minecraft 1.21.2.
@@ -220,6 +226,12 @@
 - Same changes as v3.1.1 but for 1.21.3.
 - Fixed in-world item light source data reload not applying.
 
+### 3.2.2
+
+- Same changes as v3.1.2 but for 1.21.3.
+- Fixed dynamic lighting of various projectiles.
+- Fixed water-sensitive items lighting up underwater while they shouldn't.
+
 [SpruceUI]: https://github.com/LambdAurora/SpruceUI "SpruceUI page"
 [pridelib]: https://github.com/Queerbric/pridelib "Pridelib page"
 [Sodium]: https://modrinth.com/mod/sodium "Sodium Modrinth page"

build_logic/src/main/kotlin/lambdynamiclights/Constants.kt

@@ -5,7 +5,7 @@ import org.gradle.accessors.dm.LibrariesForLibs
 object Constants {
 	const val GROUP = "dev.lambdaurora"
 	const val NAME = "lambdynamiclights"
-	const val VERSION = "3.2.1"
+	const val VERSION = "3.2.2"
 	const val JAVA_VERSION = 21
 
 	private var minecraftVersion: String? = null

gradle/libs.versions.toml

@@ -2,7 +2,7 @@
 minecraft = "1.21.3"
 fabric-loader = "0.16.7"
 fabric-api = "0.106.1+1.21.3"
-mappings-yalmm = "1"
+mappings-yalmm = "2"
 mappings-parchment = "2024.07.28"
 
 # Dependencies

src/main/java/dev/lambdaurora/lambdynlights/LambDynLightsConstants.java

@@ -15,7 +15,7 @@
  * Contains constants about LambDynamicLights.
  *
  * @author LambdAurora
- * @version 3.0.1
+ * @version 3.1.2
  * @since 3.0.1
  */
 public final class LambDynLightsConstants {
@@ -24,6 +24,11 @@ public final class LambDynLightsConstants {
 	 */
 	public static final String NAMESPACE = "lambdynlights";
 
+	/**
+	 * The unsupported development mode text.
+	 */
+	public static final String DEV_MODE_OVERLAY_TEXT = "[LambDynamicLights Dev Version (Unsupported)]";
+
 	/**
 	 * {@return {@code true} if this mod is in development mode, or {@code false} otherwise}
 	 */

src/main/java/dev/lambdaurora/lambdynlights/api/DynamicLightHandler.java

@@ -10,6 +10,7 @@
 package dev.lambdaurora.lambdynlights.api;
 
 import dev.lambdaurora.lambdynlights.LambDynLights;
+import net.minecraft.world.entity.Entity;
 import net.minecraft.world.entity.LivingEntity;
 import net.minecraft.world.entity.monster.Creeper;
 import org.jetbrains.annotations.NotNull;
@@ -22,7 +23,7 @@
  *
  * @param <T> The type of the light source.
  * @author LambdAurora
- * @version 1.3.0
+ * @version 3.1.2
  * @since 1.1.0
  */
 public interface DynamicLightHandler<T> {
@@ -52,7 +53,7 @@ default boolean isWaterSensitive(T lightSource) {
 	 * @param <T> The type of the entity.
 	 * @return The completed handler.
 	 */
-	static <T extends LivingEntity> @NotNull DynamicLightHandler<T> makeHandler(
+	static <T extends Entity> @NotNull DynamicLightHandler<T> makeHandler(
 			Function<T, Integer> luminance, Function<T, Boolean> waterSensitive
 	) {
 		return new DynamicLightHandler<>() {

src/main/java/dev/lambdaurora/lambdynlights/api/DynamicLightHandlers.java

@@ -20,7 +20,7 @@
 
 /**
  * @author LambdAurora
- * @version 3.2.0
+ * @version 3.2.2
  * @since 1.1.0
  */
 public final class DynamicLightHandlers {
@@ -32,7 +32,7 @@ private DynamicLightHandlers() {
 	 * Registers the default handlers.
 	 */
 	public static void registerDefaultHandlers() {
-		registerDynamicLightHandler(EntityType.ALLAY, DynamicLightHandler.makeHandler(blaze -> 8, blaze -> true));
+		registerDynamicLightHandler(EntityType.ALLAY, allay -> 8);
 		registerDynamicLightHandler(EntityType.BLAZE, DynamicLightHandler.makeHandler(blaze -> 10, blaze -> true));
 		registerDynamicLightHandler(EntityType.CREEPER, DynamicLightHandler.makeCreeperEntityHandler(null));
 		registerDynamicLightHandler(EntityType.ENDERMAN, entity -> {
@@ -42,7 +42,8 @@ public static void registerDefaultHandlers() {
 			return luminance;
 		});
 		registerDynamicLightHandler(EntityType.ITEM,
-				entity -> LambDynLights.getLuminanceFromItemStack(entity.getItem(), entity.isSubmergedInWater()));
+				entity -> LambDynLights.getLuminanceFromItemStack(entity.getItem(), entity.isSubmergedInWater())
+		);
 		registerDynamicLightHandler(EntityType.ITEM_FRAME, entity -> {
 			var world = entity.level();
 			return LambDynLights.getLuminanceFromItemStack(entity.getItem(), !world.getFluidState(entity.getBlockPos()).isEmpty());
@@ -57,6 +58,12 @@ public static void registerDefaultHandlers() {
 		registerDynamicLightHandler(EntityType.GLOW_SQUID,
 				entity -> (int) MathHelper.clampedLerp(0.f, 12.f, 1.f - entity.getDarkTicksRemaining() / 10.f)
 		);
+
+		// Fireballs and other similar entities
+		registerDynamicLightHandler(EntityType.FIREBALL, DynamicLightHandler.makeHandler(ball -> 14, ball -> true));
+		registerDynamicLightHandler(EntityType.SMALL_FIREBALL, DynamicLightHandler.makeHandler(ball -> 12, ball -> true));
+		registerDynamicLightHandler(EntityType.DRAGON_FIREBALL, ball -> 14);
+		registerDynamicLightHandler(EntityType.WITHER_SKULL, ball -> 12);
 	}
 
 	/**
@@ -100,8 +107,12 @@ private static <T> void register(DynamicLightHandlerHolder<T> holder, DynamicLig
 	 * @return {@code true} if the entity can light up, otherwise {@code false}
 	 */
 	public static <T extends Entity> boolean canLightUp(T entity) {
-		if (entity == Minecraft.getInstance().player && !LambDynLights.get().config.getSelfLightSource().get())
+		if (entity == Minecraft.getInstance().player) {
+			if (!LambDynLights.get().config.getSelfLightSource().get())
+				return false;
+		} else if (!LambDynLights.get().config.getEntitiesLightSource().get()) {
 			return false;
+		}
 
 		var setting = DynamicLightHandlerHolder.cast(entity.getType()).lambdynlights$getSetting();
 		return !(setting == null || !setting.get());

src/main/java/dev/lambdaurora/lambdynlights/mixin/DebugScreenOverlayMixin.java

@@ -10,6 +10,7 @@
 package dev.lambdaurora.lambdynlights.mixin;
 
 import dev.lambdaurora.lambdynlights.LambDynLights;
+import dev.lambdaurora.lambdynlights.LambDynLightsConstants;
 import dev.lambdaurora.lambdynlights.engine.DynamicLightingEngine;
 import net.minecraft.TextFormatting;
 import net.minecraft.client.gui.components.DebugScreenOverlay;
@@ -24,7 +25,7 @@
  * Adds a debug string for dynamic light sources tracking and updates.
  *
  * @author LambdAurora
- * @version 3.2.0
+ * @version 3.2.2
  * @since 1.3.2
  */
 @Mixin(DebugScreenOverlay.class)
@@ -49,5 +50,9 @@ private void onGetLeftText(CallbackInfoReturnable<List<String>> cir) {
 
 		builder.append(')');
 		list.add(builder.toString());
+
+		if (LambDynLightsConstants.isDevMode()) {
+			list.add(TextFormatting.RED + LambDynLightsConstants.DEV_MODE_OVERLAY_TEXT);
+		}
 	}
 }

src/main/java/dev/lambdaurora/lambdynlights/mixin/DevModeMixin.java

@@ -11,6 +11,7 @@
 
 import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
 import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
+import dev.lambdaurora.lambdynlights.LambDynLightsConstants;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.GuiGraphics;
 import net.minecraft.client.renderer.GameRenderer;
@@ -21,22 +22,25 @@
 
 @Mixin(GameRenderer.class)
 public class DevModeMixin {
-	@Final
 	@Shadow
+	@Final
 	private Minecraft minecraft;
 
 	@WrapOperation(
 			method = "Lnet/minecraft/client/renderer/GameRenderer;render(Lnet/minecraft/client/DeltaTracker;Z)V",
 			at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/GuiGraphics;flush()V")
 	)
 	private void handler(GuiGraphics graphics, Operation<Void> original) {
-		final String text = "[LambDynamicLights Dev Version (Unsupported)]";
 		int bottom = this.minecraft.getWindow().getGuiScaledHeight();
 		int y = bottom - this.minecraft.font.lineHeight;
 
-		if (this.minecraft.isGameLoadFinished()) {
-			graphics.fill(0, y - 4, this.minecraft.font.width(text) + 4, bottom, 0xaa000000);
-			graphics.drawShadowedText(this.minecraft.font, text, 2, y - 2, 0xff0000);
+		if (this.minecraft.isGameLoadFinished() && !this.minecraft.getDebugOverlay().showDebugScreen()) {
+			graphics.fill(
+					0, y - 4,
+					this.minecraft.font.width(LambDynLightsConstants.DEV_MODE_OVERLAY_TEXT) + 4, bottom,
+					0xaa000000
+			);
+			graphics.drawShadowedText(this.minecraft.font, LambDynLightsConstants.DEV_MODE_OVERLAY_TEXT, 2, y - 2, 0xff0000);
 		}
 		original.call(graphics);
 	}

src/main/java/dev/lambdaurora/lambdynlights/mixin/lightsource/AbstractHurtingProjectileEntityMixin.java

@@ -45,7 +45,7 @@
  * Represents an item light sources manager.
  *
  * @author LambdAurora
- * @version 3.2.1
+ * @version 3.2.2
  * @since 1.3.0
  */
 public final class ItemLightSources implements ItemLightSourceManager, IdentifiableResourceReloadListener {
@@ -166,12 +166,21 @@ public Event<Identifier, OnRegister> onRegisterEvent() {
 	public int getLuminance(ItemStack stack, boolean submergedInWater) {
 		boolean shouldCareAboutWater = submergedInWater && LambDynLights.get().config.getWaterSensitiveCheck().get();
 
-		int luminance = Block.byItem(stack.getItem()).defaultState().getLightEmission();
+		int luminance = 0;
+		boolean matchedAny = false;
 
 		for (var data : lightSources) {
-			if (shouldCareAboutWater && data.waterSensitive()) continue;
+			if (data.predicate().test(stack)) {
+				matchedAny = true;
 
-			luminance = Math.max(luminance, data.getLuminance(stack));
+				if (shouldCareAboutWater && data.waterSensitive()) continue;
+
+				luminance = Math.max(luminance, data.getLuminance(stack));
+			}
+		}
+
+		if (!matchedAny) {
+			luminance = Block.byItem(stack.getItem()).defaultState().getLightEmission();
 		}
 
 		return luminance;