From 27ff00d65b99fece1d1e03ddc6b2ce4a017aef46 Mon Sep 17 00:00:00 2001
From: Linnea Gräf <nea@nea.moe>
Date: Mon, 11 Nov 2024 02:35:10 +0100
Subject: fix: REI crash

---
 build.gradle.kts                                                 | 8 ++++----
 src/compat/rei/java/moe/nea/firmament/compat/rei/EntityWidget.kt | 3 +++
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index 5ae5edf..df0fdee 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -104,16 +104,12 @@ fun String.capitalizeN() = replaceFirstChar { it.uppercaseChar() }
 val unpackAllJars by tasks.registering
 fun innerJarsOf(name: String, dependency: Dependency): Provider<FileTree> {
 	val task = tasks.create("unpackInnerJarsFor${name.capitalizeN()}", InnerJarsUnpacker::class) {
-		doFirst {
-			println("Unpacking JARs for $name")
-		}
 		this.inputJars.setFrom(files(configurations.detachedConfiguration(dependency)))
 		this.outputDir.set(layout.buildDirectory.dir("unpackedJars/$name").also {
 			it.get().asFile.mkdirs()
 		})
 	}
 	unpackAllJars { dependsOn(task) }
-	println("Constructed innerJars task: ${project.files(task).asFileTree.toList().map {it to it.exists()}}")
 	return project.provider {
 		project.files(task).asFileTree
 	}
@@ -160,6 +156,10 @@ fun createIsolatedSourceSet(name: String, path: String = "compat/$name"): Source
 	tasks.shadowJar {
 		from(ss.output)
 	}
+	// TODO: figure out why inheritances are not being respected by tiny kotlin names
+	tasks.remapJar {
+		classpath.from(configurations.getByName(ss.compileClasspathConfigurationName))
+	}
 	collectTranslations {
 		this.classes.from(sourceSets.main.get().kotlin.classesDirectory)
 	}
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 9b7b190..1f0a4f5 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
@@ -6,9 +6,12 @@ import me.shedaniel.math.Rectangle
 import me.shedaniel.rei.api.client.gui.widgets.WidgetWithBounds
 import moe.nea.firmament.gui.entity.EntityRenderer
 import net.minecraft.client.gui.DrawContext
+import net.minecraft.client.gui.Drawable
 import net.minecraft.client.gui.Element
+import net.minecraft.client.gui.ParentElement
 import net.minecraft.entity.LivingEntity
 
+
 class EntityWidget(val entity: LivingEntity, val point: Point) : WidgetWithBounds() {
     override fun children(): List<Element> {
         return emptyList()
-- 
cgit