From 346950e9face6535db37ab9c296b510262878e01 Mon Sep 17 00:00:00 2001 From: "thatonecoder (formerly Coccocoa's Helper)" <157546848+Coccocoahelper@users.noreply.github.com> Date: Tue, 25 Jun 2024 23:15:36 +0100 Subject: [PATCH 1/7] feat: Make all Dungeon solver colors customizable Not ready, but likely not going to break thing Signed-off-by: thatonecoder (formerly Coccocoa's Helper) <157546848+Coccocoahelper@users.noreply.github.com> --- .../features/impl/dungeons/solvers/BoulderSolver.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/kotlin/gg/skytils/skytilsmod/features/impl/dungeons/solvers/BoulderSolver.kt b/src/main/kotlin/gg/skytils/skytilsmod/features/impl/dungeons/solvers/BoulderSolver.kt index 2da983ddd..284e637e7 100644 --- a/src/main/kotlin/gg/skytils/skytilsmod/features/impl/dungeons/solvers/BoulderSolver.kt +++ b/src/main/kotlin/gg/skytils/skytilsmod/features/impl/dungeons/solvers/BoulderSolver.kt @@ -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() @@ -379,4 +379,4 @@ object BoulderSolver { ) variantSteps.add(arrayListOf(BoulderPush(0, 1, Direction.FORWARD))) } -} \ No newline at end of file +} From 98c7695f713fd6f67a44c2b143d309e34b618328 Mon Sep 17 00:00:00 2001 From: "thatonecoder (formerly Coccocoa's Helper)" <157546848+Coccocoahelper@users.noreply.github.com> Date: Wed, 26 Jun 2024 10:03:50 +0100 Subject: [PATCH 2/7] Maybe done --- .../gg/skytils/skytilsmod/core/Config.kt | 28 ++++++++++++++++--- .../renderer/TileEntityChestRendererHook.kt | 3 +- .../resources/assets/skytils/lang/en_US.lang | 2 ++ 3 files changed, 28 insertions(+), 5 deletions(-) diff --git a/src/main/kotlin/gg/skytils/skytilsmod/core/Config.kt b/src/main/kotlin/gg/skytils/skytilsmod/core/Config.kt index a0016c846..ec80224f7 100644 --- a/src/main/kotlin/gg/skytils/skytilsmod/core/Config.kt +++ b/src/main/kotlin/gg/skytils/skytilsmod/core/Config.kt @@ -1132,7 +1132,7 @@ 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", @@ -1140,6 +1140,16 @@ object Config : Vigilant( ) 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.", @@ -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", @@ -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", @@ -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", diff --git a/src/main/kotlin/gg/skytils/skytilsmod/mixins/hooks/renderer/TileEntityChestRendererHook.kt b/src/main/kotlin/gg/skytils/skytilsmod/mixins/hooks/renderer/TileEntityChestRendererHook.kt index e44037e34..7c9872e3e 100644 --- a/src/main/kotlin/gg/skytils/skytilsmod/mixins/hooks/renderer/TileEntityChestRendererHook.kt +++ b/src/main/kotlin/gg/skytils/skytilsmod/mixins/hooks/renderer/TileEntityChestRendererHook.kt @@ -17,6 +17,7 @@ */ package gg.skytils.skytilsmod.mixins.hooks.renderer +import gg.skytils.skytilsmod.Skytils.config.threeWeirdosSolverColor import gg.skytils.skytilsmod.features.impl.dungeons.solvers.ThreeWeirdosSolver import gg.skytils.skytilsmod.utils.bindColor import net.minecraft.client.renderer.GlStateManager @@ -34,7 +35,7 @@ fun setChestColor( ci: CallbackInfo ) { if (te.pos == ThreeWeirdosSolver.riddleChest) { - Color.RED.bindColor() + ticTacToeSolverColor.bindColor() GlStateManager.disableTexture2D() } } diff --git a/src/main/resources/assets/skytils/lang/en_US.lang b/src/main/resources/assets/skytils/lang/en_US.lang index 7a1ac39bd..c9f98c2e5 100644 --- a/src/main/resources/assets/skytils/lang/en_US.lang +++ b/src/main/resources/assets/skytils/lang/en_US.lang @@ -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 From 198fe5d857d29f5022922a51b34648ff2ea9a241 Mon Sep 17 00:00:00 2001 From: "thatonecoder (formerly Coccocoa's Helper)" <157546848+Coccocoahelper@users.noreply.github.com> Date: Thu, 27 Jun 2024 11:18:48 +0100 Subject: [PATCH 3/7] maybe a proper fix --- .../mixins/hooks/renderer/TileEntityChestRendererHook.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/kotlin/gg/skytils/skytilsmod/mixins/hooks/renderer/TileEntityChestRendererHook.kt b/src/main/kotlin/gg/skytils/skytilsmod/mixins/hooks/renderer/TileEntityChestRendererHook.kt index 7c9872e3e..f99564975 100644 --- a/src/main/kotlin/gg/skytils/skytilsmod/mixins/hooks/renderer/TileEntityChestRendererHook.kt +++ b/src/main/kotlin/gg/skytils/skytilsmod/mixins/hooks/renderer/TileEntityChestRendererHook.kt @@ -17,7 +17,7 @@ */ package gg.skytils.skytilsmod.mixins.hooks.renderer -import gg.skytils.skytilsmod.Skytils.config.threeWeirdosSolverColor +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 @@ -35,7 +35,7 @@ fun setChestColor( ci: CallbackInfo ) { if (te.pos == ThreeWeirdosSolver.riddleChest) { - ticTacToeSolverColor.bindColor() + Skytils.config.threeWeirdosSolverColor.bindColor() GlStateManager.disableTexture2D() } } From 46602f3969d382ccbdc3e1f6e3ea43719f32bd5d Mon Sep 17 00:00:00 2001 From: "thatonecoder (formerly Coccocoa's Helper)" <157546848+Coccocoahelper@users.noreply.github.com> Date: Fri, 28 Jun 2024 12:08:30 +0100 Subject: [PATCH 4/7] Update TileEntityChestRendererHook.kt Signed-off-by: thatonecoder (formerly Coccocoa's Helper) <157546848+Coccocoahelper@users.noreply.github.com> --- .../mixins/hooks/renderer/TileEntityChestRendererHook.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/kotlin/gg/skytils/skytilsmod/mixins/hooks/renderer/TileEntityChestRendererHook.kt b/src/main/kotlin/gg/skytils/skytilsmod/mixins/hooks/renderer/TileEntityChestRendererHook.kt index f99564975..c3ebfd35e 100644 --- a/src/main/kotlin/gg/skytils/skytilsmod/mixins/hooks/renderer/TileEntityChestRendererHook.kt +++ b/src/main/kotlin/gg/skytils/skytilsmod/mixins/hooks/renderer/TileEntityChestRendererHook.kt @@ -17,7 +17,7 @@ */ package gg.skytils.skytilsmod.mixins.hooks.renderer -import gg.skytils.skytilsmod.Skytils +import gg.skytils.skytilsmod.Skytils.config.threeWeirdosSolverColor import gg.skytils.skytilsmod.features.impl.dungeons.solvers.ThreeWeirdosSolver import gg.skytils.skytilsmod.utils.bindColor import net.minecraft.client.renderer.GlStateManager @@ -35,7 +35,7 @@ fun setChestColor( ci: CallbackInfo ) { if (te.pos == ThreeWeirdosSolver.riddleChest) { - Skytils.config.threeWeirdosSolverColor.bindColor() + threeWeirdosSolverColor.bindColor() GlStateManager.disableTexture2D() } } From 527f8e96ab1489dbfda146faa8381736e012aa03 Mon Sep 17 00:00:00 2001 From: "thatonecoder (formerly Coccocoa's Helper)" <157546848+Coccocoahelper@users.noreply.github.com> Date: Sat, 29 Jun 2024 21:06:09 +0100 Subject: [PATCH 5/7] revert --- .../renderer/TileEntityChestRendererHook.kt | 25 +++---------------- 1 file changed, 3 insertions(+), 22 deletions(-) diff --git a/src/main/kotlin/gg/skytils/skytilsmod/mixins/hooks/renderer/TileEntityChestRendererHook.kt b/src/main/kotlin/gg/skytils/skytilsmod/mixins/hooks/renderer/TileEntityChestRendererHook.kt index c3ebfd35e..1c5e0e58d 100644 --- a/src/main/kotlin/gg/skytils/skytilsmod/mixins/hooks/renderer/TileEntityChestRendererHook.kt +++ b/src/main/kotlin/gg/skytils/skytilsmod/mixins/hooks/renderer/TileEntityChestRendererHook.kt @@ -1,23 +1,4 @@ -/* - * Skytils - Hypixel Skyblock Quality of Life Mod - * Copyright (C) 2020-2023 Skytils - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published - * by the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see . - */ -package gg.skytils.skytilsmod.mixins.hooks.renderer - -import gg.skytils.skytilsmod.Skytils.config.threeWeirdosSolverColor +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 @@ -35,7 +16,7 @@ fun setChestColor( ci: CallbackInfo ) { if (te.pos == ThreeWeirdosSolver.riddleChest) { - threeWeirdosSolverColor.bindColor() + Skytils.config.threeWeirdosSolverColor.bindColor() GlStateManager.disableTexture2D() } } @@ -50,4 +31,4 @@ fun setChestColorPost( ci: CallbackInfo ) { GlStateManager.enableTexture2D() -} +} \ No newline at end of file From a9977d0d544948091a6ee1577bdaa97cc99a4747 Mon Sep 17 00:00:00 2001 From: sychic <47618543+Sychic@users.noreply.github.com> Date: Wed, 3 Jul 2024 23:14:02 -0700 Subject: [PATCH 6/7] fix import --- .../mixins/hooks/renderer/TileEntityChestRendererHook.kt | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/main/kotlin/gg/skytils/skytilsmod/mixins/hooks/renderer/TileEntityChestRendererHook.kt b/src/main/kotlin/gg/skytils/skytilsmod/mixins/hooks/renderer/TileEntityChestRendererHook.kt index 1c5e0e58d..46fbca681 100644 --- a/src/main/kotlin/gg/skytils/skytilsmod/mixins/hooks/renderer/TileEntityChestRendererHook.kt +++ b/src/main/kotlin/gg/skytils/skytilsmod/mixins/hooks/renderer/TileEntityChestRendererHook.kt @@ -1,10 +1,9 @@ -import gg.skytils.skytilsmod.Skytils +import gg.skytils.skytilsmod.core.Config.threeWeirdosSolverColor import gg.skytils.skytilsmod.features.impl.dungeons.solvers.ThreeWeirdosSolver import gg.skytils.skytilsmod.utils.bindColor import net.minecraft.client.renderer.GlStateManager import net.minecraft.tileentity.TileEntityChest import org.spongepowered.asm.mixin.injection.callback.CallbackInfo -import java.awt.Color fun setChestColor( te: TileEntityChest, @@ -16,7 +15,7 @@ fun setChestColor( ci: CallbackInfo ) { if (te.pos == ThreeWeirdosSolver.riddleChest) { - Skytils.config.threeWeirdosSolverColor.bindColor() + threeWeirdosSolverColor.bindColor() GlStateManager.disableTexture2D() } } From 0a59b9f3de103876598e094338d462d4204708f3 Mon Sep 17 00:00:00 2001 From: sychic <47618543+Sychic@users.noreply.github.com> Date: Thu, 4 Jul 2024 01:03:23 -0700 Subject: [PATCH 7/7] Fix missing package ??????????????????????????????????????????????????????????? --- .../mixins/hooks/renderer/TileEntityChestRendererHook.kt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/main/kotlin/gg/skytils/skytilsmod/mixins/hooks/renderer/TileEntityChestRendererHook.kt b/src/main/kotlin/gg/skytils/skytilsmod/mixins/hooks/renderer/TileEntityChestRendererHook.kt index 46fbca681..6ece0a090 100644 --- a/src/main/kotlin/gg/skytils/skytilsmod/mixins/hooks/renderer/TileEntityChestRendererHook.kt +++ b/src/main/kotlin/gg/skytils/skytilsmod/mixins/hooks/renderer/TileEntityChestRendererHook.kt @@ -1,3 +1,5 @@ +package gg.skytils.skytilsmod.mixins.hooks.renderer + import gg.skytils.skytilsmod.core.Config.threeWeirdosSolverColor import gg.skytils.skytilsmod.features.impl.dungeons.solvers.ThreeWeirdosSolver import gg.skytils.skytilsmod.utils.bindColor