fix: Improve exception logging for entity widgets

2 files changed, 36 insertions, 37 deletions

diff --git a/src/compat/rei/java/moe/nea/firmament/compat/rei/EntityWidget.kt b/src/compat/rei/java/moe/nea/firmament/compat/rei/EntityWidget.kt
index 7a464c3..d8238be 100644
--- a/src/compat/rei/java/moe/nea/firmament/compat/rei/EntityWidget.kt
+++ b/src/compat/rei/java/moe/nea/firmament/compat/rei/EntityWidget.kt
@@ -10,9 +10,10 @@ import net.minecraft.client.gui.Element
 import net.minecraft.client.gui.ParentElement
 import net.minecraft.entity.LivingEntity
 import moe.nea.firmament.gui.entity.EntityRenderer
+import moe.nea.firmament.util.ErrorUtil
 
 
-class EntityWidget(val entity: LivingEntity, val point: Point) : WidgetWithBounds() {
+class EntityWidget(val entity: LivingEntity?, val point: Point) : WidgetWithBounds() {
 	override fun children(): List<Element> {
 		return emptyList()
 	}
@@ -22,9 +23,9 @@ class EntityWidget(val entity: LivingEntity, val point: Point) : WidgetWithBound
 	override fun render(context: DrawContext, mouseX: Int, mouseY: Int, delta: Float) {
 		try {
 			if (!hasErrored)
-				EntityRenderer.renderEntity(entity, context, point.x, point.y, mouseX.toFloat(), mouseY.toFloat())
+				EntityRenderer.renderEntity(entity!!, context, point.x, point.y, mouseX.toFloat(), mouseY.toFloat())
 		} catch (ex: Exception) {
-			EntityRenderer.logger.error("Failed to render constructed entity: $entity", ex)
+			ErrorUtil.softError("Failed to render constructed entity: $entity", ex)
 			hasErrored = true
 		}
 		if (hasErrored) {
diff --git a/src/compat/rei/java/moe/nea/firmament/compat/rei/recipes/SBMobDropRecipe.kt b/src/compat/rei/java/moe/nea/firmament/compat/rei/recipes/SBMobDropRecipe.kt
index 81ec41b..b05c3c7 100644
--- a/src/compat/rei/java/moe/nea/firmament/compat/rei/recipes/SBMobDropRecipe.kt
+++ b/src/compat/rei/java/moe/nea/firmament/compat/rei/recipes/SBMobDropRecipe.kt
@@ -39,44 +39,42 @@ class SBMobDropRecipe(override val neuRecipe: NEUMobDropRecipe) : SBRecipe() {
 				} else {
 					EntityRenderer.applyModifiers(source, listOf())
 				}
-				if (entity != null) {
-					val level = display.neuRecipe.level
-					val fullMobName =
-						if (level > 0) Text.translatable("firmament.recipe.mobs.name", level, display.neuRecipe.name)
-						else Text.translatable("firmament.recipe.mobs.name.nolevel", display.neuRecipe.name)
-					val tt = mutableListOf<Text>()
-					tt.add((fullMobName))
-					tt.add(Text.literal(""))
-					if (display.neuRecipe.coins > 0) {
-						tt.add(Text.stringifiedTranslatable("firmament.recipe.mobs.coins", display.neuRecipe.coins))
-					}
-					if (display.neuRecipe.combatExperience > 0) {
-						tt.add(
-							Text.stringifiedTranslatable(
-								"firmament.recipe.mobs.combat",
-								display.neuRecipe.combatExperience
-							)
-						)
-					}
-					if (display.neuRecipe.enchantingExperience > 0) {
-						tt.add(
-							Text.stringifiedTranslatable(
-								"firmament.recipe.mobs.exp",
-								display.neuRecipe.enchantingExperience
-							)
+				val level = display.neuRecipe.level
+				val fullMobName =
+					if (level > 0) Text.translatable("firmament.recipe.mobs.name", level, display.neuRecipe.name)
+					else Text.translatable("firmament.recipe.mobs.name.nolevel", display.neuRecipe.name)
+				val tt = mutableListOf<Text>()
+				tt.add((fullMobName))
+				tt.add(Text.literal(""))
+				if (display.neuRecipe.coins > 0) {
+					tt.add(Text.stringifiedTranslatable("firmament.recipe.mobs.coins", display.neuRecipe.coins))
+				}
+				if (display.neuRecipe.combatExperience > 0) {
+					tt.add(
+						Text.stringifiedTranslatable(
+							"firmament.recipe.mobs.combat",
+							display.neuRecipe.combatExperience
 						)
-					}
-					if (display.neuRecipe.extra != null)
-						display.neuRecipe.extra.mapTo(tt) { Text.literal(it) }
-					if (tt.size == 2)
-						tt.removeAt(1)
-					add(
-						Widgets.withTooltip(
-							EntityWidget(entity, Point(bounds.minX + 5, bounds.minY + 15)),
-							tt
+					)
+				}
+				if (display.neuRecipe.enchantingExperience > 0) {
+					tt.add(
+						Text.stringifiedTranslatable(
+							"firmament.recipe.mobs.exp",
+							display.neuRecipe.enchantingExperience
 						)
 					)
 				}
+				if (display.neuRecipe.extra != null)
+					display.neuRecipe.extra.mapTo(tt) { Text.literal(it) }
+				if (tt.size == 2)
+					tt.removeAt(1)
+				add(
+					Widgets.withTooltip(
+						EntityWidget(entity, Point(bounds.minX + 5, bounds.minY + 15)),
+						tt
+					)
+				)
 				add(
 					Widgets.createLabel(Point(bounds.minX + 15, bounds.minY + 5), Text.literal(display.neuRecipe.name))
 						.leftAligned()