Skip to content

Commit 787fe98

Browse files
committed
Split wall filling into both sides
1 parent ea613ed commit 787fe98

File tree

2 files changed

+13
-12
lines changed

2 files changed

+13
-12
lines changed

src/main/kotlin/com/lambda/config/groups/EatConfig.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,8 @@ interface EatConfig {
5555
enum class SelectionPriority(
5656
val comparator: Comparator<ItemStack>,
5757
override val displayName: String,
58-
override val description: String): NamedEnum, Describable {
58+
override val description: String
59+
): NamedEnum, Describable {
5960
LeastNutritious(
6061
compareBy { it.item.nutrition },
6162
"Least Nutritious",

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

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -61,8 +61,9 @@ object HighwayTools : Module(
6161
private val pavementMaterial by setting("Pavement Material", Blocks.OBSIDIAN, "Material to build the highway with") { pavement == Material.Block }.group(Group.Structure)
6262
private val floor by setting("Floor", Material.None, "Material for the floor").group(Group.Structure)
6363
private val floorMaterial by setting("Floor Material", Blocks.NETHERRACK, "Material to build the floor with") { floor == Material.Block }.group(Group.Structure)
64-
private val walls by setting("Walls", Material.None, "Material for the walls").group(Group.Structure)
65-
private val wallMaterial by setting("Wall Material", Blocks.NETHERRACK, "Material to build the walls with") { walls == Material.Block }.group(Group.Structure)
64+
private val rightWall by setting("Right Wall", Material.None, "Build the right wall").group(Group.Structure)
65+
private val leftWall by setting("Left Wall", Material.None, "Build the left wall").group(Group.Structure)
66+
private val wallMaterial by setting("Wall Material", Blocks.NETHERRACK, "Material to build the walls with") { rightWall == Material.Block }.group(Group.Structure)
6667
private val ceiling by setting("Ceiling", Material.None, "Material for the ceiling").group(Group.Structure)
6768
private val ceilingMaterial by setting("Ceiling Material", Blocks.OBSIDIAN, "Material to build the ceiling with") { ceiling == Material.Block }.group(Group.Structure)
6869
private val distance by setting("Distance", -1, -1..1000000, 1, "Distance to build the highway/tunnel (negative for infinite)").group(Group.Structure)
@@ -224,26 +225,25 @@ object HighwayTools : Module(
224225
).associateWith { target(ceiling, ceilingMaterial) }
225226
}
226227

227-
if (walls != Material.None) {
228-
val wallElevation = rimHeight + if (pavement != Material.None) 1 else 0
229-
230-
// Left wall
228+
val wallElevation = if (pavement != Material.None) rimHeight else 0 + if (pavement != Material.None) 1 else 0
229+
if (rightWall != Material.None) {
231230
structure += generateDirectionalTube(
232231
orthogonal,
233232
1,
234233
height - wallElevation,
235-
-center + width,
234+
-center - 1,
236235
wallElevation,
237-
).associateWith { target(walls, wallMaterial) }
236+
).associateWith { target(rightWall, wallMaterial) }
237+
}
238238

239-
// Right wall
239+
if (leftWall != Material.None) {
240240
structure += generateDirectionalTube(
241241
orthogonal,
242242
1,
243243
height - wallElevation,
244-
-center - 1,
244+
-center + width,
245245
wallElevation,
246-
).associateWith { target(walls, wallMaterial) }
246+
).associateWith { target(rightWall, wallMaterial) }
247247
}
248248

249249
if (floor != Material.None) {

0 commit comments

Comments
 (0)