Fix some things not being lowercase/uppercase in Snowy.kt
Signed-off-by: Username404-59 <w.iron.zombie@gmail.com>
This commit is contained in:
parent
da26662668
commit
d3e842be1f
@ -19,7 +19,7 @@ abstract class Snowy {
|
|||||||
val MissingComponent: Component = translatable("MISSING_COMPONENT")
|
val MissingComponent: Component = translatable("MISSING_COMPONENT")
|
||||||
@Suppress("JVM_STATIC_ON_CONST_OR_JVM_FIELD") // See KT-39868
|
@Suppress("JVM_STATIC_ON_CONST_OR_JVM_FIELD") // See KT-39868
|
||||||
@JvmStatic
|
@JvmStatic
|
||||||
protected const val FeaturePackage: String = "fr.username404.snowygui.gui.feature"
|
protected const val FEATURE_PACKAGE: String = "fr.username404.snowygui.gui.feature"
|
||||||
lateinit var annotatedButtons: () -> Set<Class<out ButtonImpl>>
|
lateinit var annotatedButtons: () -> Set<Class<out ButtonImpl>>
|
||||||
fun onEvent(e: Any, lambda: argsLambda) = EventSnowy[e.toString()].add(lambda)
|
fun onEvent(e: Any, lambda: argsLambda) = EventSnowy[e.toString()].add(lambda)
|
||||||
@JvmField
|
@JvmField
|
||||||
@ -28,9 +28,9 @@ abstract class Snowy {
|
|||||||
init { Companion.annotatedButtons = ::annotatedButtons::get }
|
init { Companion.annotatedButtons = ::annotatedButtons::get }
|
||||||
private fun eventsInit() {
|
private fun eventsInit() {
|
||||||
onEvent("EndTick") {
|
onEvent("EndTick") {
|
||||||
for (Key in AddKeyMaps.list.keys) {
|
for (key in AddKeyMaps.list.keys) {
|
||||||
if (Key.isDown) {
|
if (key.isDown) {
|
||||||
AddKeyMaps.list[Key]?.invoke()
|
AddKeyMaps.list[key]?.invoke()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -26,7 +26,7 @@ class FabricInit: Snowy(), ClientModInitializer {
|
|||||||
)
|
)
|
||||||
}
|
}
|
||||||
override val annotatedButtons = FabricLoader.getInstance().allMods.mapNotNull {
|
override val annotatedButtons = FabricLoader.getInstance().allMods.mapNotNull {
|
||||||
it.findPath(FeaturePackage.replace('.', '/')).getOrNull()
|
it.findPath(FEATURE_PACKAGE.replace('.', '/')).getOrNull()
|
||||||
}.filter { it.exists() && it.isDirectory() }.flatMap { buttonsDirectory ->
|
}.filter { it.exists() && it.isDirectory() }.flatMap { buttonsDirectory ->
|
||||||
mutableSetOf<Class<out ButtonImpl>>().apply {
|
mutableSetOf<Class<out ButtonImpl>>().apply {
|
||||||
buttonsDirectory.listDirectoryEntries("*.class").forEach { file ->
|
buttonsDirectory.listDirectoryEntries("*.class").forEach { file ->
|
||||||
|
|||||||
@ -11,7 +11,6 @@ import net.neoforged.fml.event.lifecycle.FMLClientSetupEvent
|
|||||||
import net.neoforged.neoforge.client.gui.IConfigScreenFactory
|
import net.neoforged.neoforge.client.gui.IConfigScreenFactory
|
||||||
import net.neoforged.neoforge.common.NeoForge
|
import net.neoforged.neoforge.common.NeoForge
|
||||||
import net.neoforged.neoforgespi.language.ModFileScanData
|
import net.neoforged.neoforgespi.language.ModFileScanData
|
||||||
import org.objectweb.asm.Type
|
|
||||||
|
|
||||||
@Mod("snowygui")
|
@Mod("snowygui")
|
||||||
@Suppress("UNUSED_PARAMETER")
|
@Suppress("UNUSED_PARAMETER")
|
||||||
@ -22,7 +21,7 @@ class ForgeInit(container: ModContainer): Snowy() {
|
|||||||
.flatMap { obj: ModFileScanData -> obj.classes }
|
.flatMap { obj: ModFileScanData -> obj.classes }
|
||||||
.filter { data: ModFileScanData.ClassData? ->
|
.filter { data: ModFileScanData.ClassData? ->
|
||||||
data!!.clazz.className.let {
|
data!!.clazz.className.let {
|
||||||
it.startsWith(FeaturePackage) && Class.forName(it).isValidForButtonCollection()
|
it.startsWith(FEATURE_PACKAGE) && Class.forName(it).isValidForButtonCollection()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
.map { Class.forName((it!!.clazz.className)).asSubclass(ButtonImpl::class.java)}
|
.map { Class.forName((it!!.clazz.className)).asSubclass(ButtonImpl::class.java)}
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user