Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: Make all Dungeon solver colors customizable #487

Merged
merged 7 commits into from
Jul 6, 2024
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 24 additions & 4 deletions src/main/kotlin/gg/skytils/skytilsmod/core/Config.kt
Original file line number Diff line number Diff line change
Expand Up @@ -1132,14 +1132,24 @@ object Config : Vigilant(

@Property(
type = PropertyType.SWITCH, name = "Boulder Solver",
description = "§b[WIP] §rShow which boxes to move on the Boulder puzzle.",
description = "Show which boxes to move on the Boulder puzzle.",
category = "Dungeons", subcategory = "Solvers",
i18nName = "skytils.config.dungeons.solvers.boulder_solver",
i18nCategory = "skytils.config.dungeons",
i18nSubcategory = "skytils.config.dungeons.solvers"
)
var boulderSolver = false

@Property(
type = PropertyType.COLOR, name = "Boulder Solver Color",
description = "Color of the box that shows which button to click in the Boulder puzzle.",
category = "Dungeons", subcategory = "Solvers",
i18nName = "skytils.config.dungeons.solvers.boulder_solver_color",
i18nCategory = "skytils.config.dungeons",
i18nSubcategory = "skytils.config.dungeons.solvers"
)
var boulderSolverColor = Color(255, 0, 0, 255)

@Property(
type = PropertyType.SWITCH, name = "Creeper Beams Solver",
description = "Shows pairs on the Creeper Beams puzzle.",
Expand Down Expand Up @@ -1182,7 +1192,7 @@ object Config : Vigilant(

@Property(
type = PropertyType.COLOR, name = "Teleport Maze Solver Color",
description = "Color of the thing that shows which pads you've stepped on in the Teleport Maze puzzle.",
description = "Color of the box that shows which pads you've stepped on in the Teleport Maze puzzle.",
category = "Dungeons", subcategory = "Solvers",
i18nName = "skytils.config.dungeons.solvers.teleport_maze_solver_color",
i18nCategory = "skytils.config.dungeons",
Expand All @@ -1200,9 +1210,19 @@ object Config : Vigilant(
)
var threeWeirdosSolver = false

@Property(
type = PropertyType.COLOR, name = "Three Weirdos Solver Color",
description = "Color of the chest to click on the Three Weirdos puzzle.",
category = "Dungeons", subcategory = "Solvers",
i18nName = "skytils.config.dungeons.solvers.three_weirdos_solver_color",
i18nCategory = "skytils.config.dungeons",
i18nSubcategory = "skytils.config.dungeons.solvers"
)
var threeWeirdosSolverColor = Color(255, 0, 0, 255)

@Property(
type = PropertyType.SWITCH, name = "Tic Tac Toe Solver",
description = "§b[WIP] §rDisplays the best move on the Tic Tac Toe puzzle.",
description = "Displays the best move on the Tic Tac Toe puzzle.",
category = "Dungeons", subcategory = "Solvers",
i18nName = "skytils.config.dungeons.solvers.tic_tac_toe_solver",
i18nCategory = "skytils.config.dungeons",
Expand All @@ -1212,7 +1232,7 @@ object Config : Vigilant(

@Property(
type = PropertyType.COLOR, name = "Tic Tac Toe Solver Color",
description = "Color of the thing that displays the best move on the Tic Tac Toe puzzle.",
description = "Color of the outline that displays the best move on the Tic Tac Toe puzzle.",
category = "Dungeons", subcategory = "Solvers",
i18nName = "skytils.config.dungeons.solvers.tic_tac_toe_solver_color",
i18nCategory = "skytils.config.dungeons",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ object BoulderSolver {
RenderUtil.drawFilledBoundingBox(
matrixStack,
AxisAlignedBB(x, y, z, x + 1, y + 1, z + 1),
Color(255, 0, 0, 255),
Skytils.config.boulderSolverColor,
0.7f
)
GlStateManager.enableCull()
Expand Down Expand Up @@ -379,4 +379,4 @@ object BoulderSolver {
)
variantSteps.add(arrayListOf(BoulderPush(0, 1, Direction.FORWARD)))
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
*/
package gg.skytils.skytilsmod.mixins.hooks.renderer

import gg.skytils.skytilsmod.Skytils
import gg.skytils.skytilsmod.features.impl.dungeons.solvers.ThreeWeirdosSolver
import gg.skytils.skytilsmod.utils.bindColor
import net.minecraft.client.renderer.GlStateManager
Expand All @@ -34,7 +35,7 @@ fun setChestColor(
ci: CallbackInfo
) {
if (te.pos == ThreeWeirdosSolver.riddleChest) {
Color.RED.bindColor()
Skytils.config.threeWeirdosSolverColor.bindColor()
Sychic marked this conversation as resolved.
Show resolved Hide resolved
GlStateManager.disableTexture2D()
}
}
Expand Down
2 changes: 2 additions & 0 deletions src/main/resources/assets/skytils/lang/en_US.lang
Original file line number Diff line number Diff line change
Expand Up @@ -103,12 +103,14 @@ skytils.config.dungeons.solvers.highest_blaze_color=Highest Blaze Color
skytils.config.dungeons.solvers.next_blaze_color=Next Blaze Color
skytils.config.dungeons.solvers.line_to_next_blaze_color=Line to Next Blaze Color
skytils.config.dungeons.solvers.boulder_solver=Boulder Solver
skytils.config.dungeons.solvers.boulder_solver_color=Boulder Solver Color
skytils.config.dungeons.solvers.creeper_beams_solver=Creeper Beams Solver
skytils.config.dungeons.solvers.ice_fill_solver=Ice Fill Solver
skytils.config.dungeons.solvers.ice_path_solver=Ice Path Solver
skytils.config.dungeons.solvers.teleport_maze_solver=Teleport Maze Solver
skytils.config.dungeons.solvers.teleport_maze_solver_color=Teleport Maze Solver Color
skytils.config.dungeons.solvers.three_weirdos_solver=Three Weirdos Solver
skytils.config.dungeons.solvers.three_weirdos_solver_color=Three Weirdos Solver Color
skytils.config.dungeons.solvers.tic_tac_toe_solver=Tic Tac Toe Solver
skytils.config.dungeons.solvers.tic_tac_toe_solver_color=Tic Tac Toe Solver Color
skytils.config.dungeons.solvers.trivia_solver=Trivia Solver
Expand Down