Skip to content

Commit 35305c7

Browse files
committed
Fix: Crash at launch
1 parent 54c5cd4 commit 35305c7

File tree

3 files changed

+12
-17
lines changed

3 files changed

+12
-17
lines changed

common/src/main/kotlin/com/lambda/module/modules/BoringModule.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ object BoringModule : Module(
2424
mapOf("One" to 1, "Two" to 2, "Three" to 3, "Four" to 4, "Five" to 5)
2525
)
2626
private val boringEnum by setting("Boring Enum", BoringEnum.ONE)
27-
private val blockSetting by setting("Boring Block", Blocks.STONE)
27+
//private val blockSetting by setting("Boring Block", Blocks.STONE) // Registries are not initialized yet
2828
private val blockPosSetting by setting("Boring BlockPos", BlockPos(420, 69, 1337))
2929
// private val blockListSetting by setting("Boring Block List", listOf(Blocks.STONE, Blocks.DIRT, Blocks.GRASS_BLOCK))
3030

@@ -49,4 +49,4 @@ object BoringModule : Module(
4949
LOG.info("I'm ${if (superBoring) "super boring ($boringValue)" else "boring"}! $isEnabled")
5050
}
5151
}
52-
}
52+
}
Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
package com.lambda.util
22

3-
import com.lambda.Lambda.mc
43
import java.io.File
54

65
object FolderRegister {
7-
val minecraft: File = mc.runDirectory
6+
val minecraft: File = File("") // Absolute path to .minecraft
87
val lambda: File = File(minecraft, "lambda")
98
val config: File = File(lambda, "config")
10-
}
9+
}

forge/build.gradle.kts

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -37,16 +37,13 @@ val common: Configuration by configurations.creating {
3737
}
3838

3939
val includeLib: Configuration by configurations.creating
40-
val includeMod: Configuration by configurations.creating
4140

4241
fun DependencyHandlerScope.setupConfigurations() {
42+
// Please look at this before yelling at me
43+
// https://docs.architectury.dev/loom/using_libraries/
4344
includeLib.dependencies.forEach {
4445
implementation(it)
45-
include(it)
46-
}
47-
48-
includeMod.dependencies.forEach {
49-
modImplementation(it)
46+
forgeRuntimeLibrary(it) // Avoid mods not being found in dev environment
5047
include(it)
5148
}
5249
}
@@ -56,14 +53,13 @@ dependencies {
5653
forge("net.minecraftforge:forge:$forgeVersion")
5754

5855
// Add dependencies on the required Kotlin modules.
59-
includeLib("thedarkcolour:kotlinforforge:$kotlinForgeVersion") { isTransitive = false }
60-
includeLib("io.github.llamalad7:mixinextras-forge:$mixinExtrasVersion") { isTransitive = false }
56+
includeLib("thedarkcolour:kotlinforforge:$kotlinForgeVersion")
57+
includeLib("io.github.llamalad7:mixinextras-forge:$mixinExtrasVersion")
6158
includeLib("org.reflections:reflections:0.10.2")
59+
includeLib("org.javassist:javassist:3.27.0-GA")
6260

63-
// Add mods to the mod jar
64-
includeMod("thedarkcolour:kotlinforforge:$kotlinForgeVersion") // Both a library and a mod
65-
66-
compileOnly(kotlin("stdlib")) // Hacky fix https://github.com/thedarkcolour/KotlinForForge/issues/93
61+
// Bugfixes
62+
compileOnly(kotlin("stdlib")) // Hack https://github.com/thedarkcolour/KotlinForForge/issues/93
6763

6864
// Common (Do not touch)
6965
implementation(project(":common", configuration = "namedElements")) { isTransitive = false } // We cannot common here because it is treated as a different mod and forge will panic

0 commit comments

Comments
 (0)