Chieri/Firmament
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: REI crash

Browse Source
This commit is contained in:
Linnea Gräf
2024-11-11 02:35:10 +01:00
parent 85eac70cb5
commit 67f5994258
2 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
build.gradle.kts
View File

@@ -172,6 +172,10 @@ fun createIsolatedSourceSet(name: String, path: String = "compat/$name", isEnabl
tasks.shadowJar { tasks.shadowJar {
from(ss.output) 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 { collectTranslations {
this.classes.from(sourceSets.main.get().kotlin.classesDirectory) this.classes.from(sourceSets.main.get().kotlin.classesDirectory)
} }
@@ -373,7 +377,6 @@ tasks.shadowJar {
} }
tasks.remapJar { tasks.remapJar {
// injectAccessWidener.set(true)
inputFile.set(tasks.shadowJar.flatMap { it.archiveFile }) inputFile.set(tasks.shadowJar.flatMap { it.archiveFile })
dependsOn(tasks.shadowJar) dependsOn(tasks.shadowJar)
archiveClassifier.set("") archiveClassifier.set("")

3
src/compat/rei/java/moe/nea/firmament/compat/rei/EntityWidget.kt
View File

@@ -5,10 +5,13 @@ import me.shedaniel.math.Point
import me.shedaniel.math.Rectangle import me.shedaniel.math.Rectangle
import me.shedaniel.rei.api.client.gui.widgets.WidgetWithBounds import me.shedaniel.rei.api.client.gui.widgets.WidgetWithBounds
import net.minecraft.client.gui.DrawContext import net.minecraft.client.gui.DrawContext
import net.minecraft.client.gui.Drawable
import net.minecraft.client.gui.Element import net.minecraft.client.gui.Element
import net.minecraft.client.gui.ParentElement
import net.minecraft.entity.LivingEntity import net.minecraft.entity.LivingEntity
import moe.nea.firmament.gui.entity.EntityRenderer import moe.nea.firmament.gui.entity.EntityRenderer
class EntityWidget(val entity: LivingEntity, val point: Point) : WidgetWithBounds() { class EntityWidget(val entity: LivingEntity, val point: Point) : WidgetWithBounds() {
override fun children(): List<Element> { override fun children(): List<Element> {
return emptyList() return emptyList()