Skip to content

Commit 75cc788

Browse files
committed
add soft malilib dependency and filter for render layers in printer
1 parent 683aadb commit 75cc788

File tree

3 files changed

+8
-3
lines changed

3 files changed

+8
-3
lines changed

build.gradle.kts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ val spairVersion: String by project
3737
val lwjglVersion: String by project
3838
val sodiumVersion: String by project
3939
val litematicaVersion: String by project
40+
val maLiLibVersion: String by project
4041

4142
val libs = file("libs")
4243
val targets = listOf("fabric.mod.json")
@@ -176,6 +177,7 @@ dependencies {
176177
// Add mods
177178
modImplementation("com.github.rfresh2:baritone-fabric:$minecraftVersion")
178179
modCompileOnly("maven.modrinth:sodium:$sodiumVersion")
180+
modCompileOnly("maven.modrinth:malilib:$maLiLibVersion")
179181
modCompileOnly("maven.modrinth:litematica:$litematicaVersion")
180182

181183
// Test implementations

gradle.properties

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ fabricApiVersion=0.124.0
4949
kotlinFabricVersion=1.13.4+kotlin
5050
sodiumVersion=mc1.21.5-0.6.13-fabric
5151
litematicaVersion=0.22.2
52+
maLiLibVersion=0.24.2
5253

5354
# Kotlin https://kotlinlang.org/
5455
kotlin.code.style=official

src/main/kotlin/com/lambda/module/modules/player/Printer.kt

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ import com.lambda.task.RootTask.run
2727
import com.lambda.task.Task
2828
import com.lambda.task.tasks.BuildTask.Companion.build
2929
import com.lambda.util.BlockUtils.blockPos
30+
import fi.dy.masa.litematica.data.DataManager
3031
import fi.dy.masa.litematica.world.SchematicWorldHandler
3132
import net.minecraft.util.math.BlockPos
3233

@@ -35,8 +36,8 @@ object Printer : Module(
3536
description = "Automatically prints schematics",
3637
tag = ModuleTag.PLAYER
3738
) {
38-
private fun isSchematicHandlerAvailable(): Boolean = runCatching {
39-
Class.forName("fi.dy.masa.litematica.world.SchematicWorldHandler")
39+
private fun isLitematicaAvailable(): Boolean = runCatching {
40+
Class.forName("fi.dy.masa.litematica.Litematica")
4041
true
4142
}.getOrDefault(false)
4243

@@ -58,7 +59,7 @@ object Printer : Module(
5859
}
5960
}
6061
onEnable {
61-
if (!isSchematicHandlerAvailable()) {
62+
if (!isLitematicaAvailable()) {
6263
error("Litematica is not installed!")
6364
disable()
6465
return@onEnable
@@ -68,6 +69,7 @@ object Printer : Module(
6869
BlockPos.iterateOutwards(player.blockPos, range, range, range)
6970
.asSequence()
7071
.map { it.blockPos }
72+
.filter { DataManager.getRenderLayerRange().isPositionWithinRange(it) }
7173
.associateWith { TargetState.State(schematicWorld.getBlockState(it)) }
7274
.filter { air || !it.value.blockState.isAir }
7375
}.build(finishOnDone = false).run()

0 commit comments

Comments
 (0)