aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinnea Gräf <nea@nea.moe>2024-11-11 02:35:10 +0100
committerLinnea Gräf <nea@nea.moe>2024-11-11 02:35:10 +0100
commit67f5994258737387c2d827ece5e60c6bcf10c80f (patch)
treeb37e5228c46c8133e94c90c5cb717ad2186c2db5
parent85eac70cb5c0d08bda56fc454e9a620949ab8cb1 (diff)
downloadFirmament-67f5994258737387c2d827ece5e60c6bcf10c80f.tar.gz
Firmament-67f5994258737387c2d827ece5e60c6bcf10c80f.tar.bz2
Firmament-67f5994258737387c2d827ece5e60c6bcf10c80f.zip
fix: REI crash
-rw-r--r--build.gradle.kts5
-rw-r--r--src/compat/rei/java/moe/nea/firmament/compat/rei/EntityWidget.kt3
2 files changed, 7 insertions, 1 deletions
diff --git a/build.gradle.kts b/build.gradle.kts
index f272fdf..6b25ee5 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -172,6 +172,10 @@ fun createIsolatedSourceSet(name: String, path: String = "compat/$name", isEnabl
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)
}
@@ -373,7 +377,6 @@ tasks.shadowJar {
}
tasks.remapJar {
-// injectAccessWidener.set(true)
inputFile.set(tasks.shadowJar.flatMap { it.archiveFile })
dependsOn(tasks.shadowJar)
archiveClassifier.set("")
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 b0efc98..7a464c3 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
@@ -5,10 +5,13 @@ import me.shedaniel.math.Point
import me.shedaniel.math.Rectangle
import me.shedaniel.rei.api.client.gui.widgets.WidgetWithBounds
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
import moe.nea.firmament.gui.entity.EntityRenderer
+
class EntityWidget(val entity: LivingEntity, val point: Point) : WidgetWithBounds() {
override fun children(): List<Element> {
return emptyList()