From 10e19719d65d74b7dd81ebaebe6fe69ff900982f Mon Sep 17 00:00:00 2001 From: songreaver <87545636+Kemmisch@users.noreply.github.com> Date: Mon, 28 Oct 2024 00:11:08 +0000 Subject: [PATCH 01/10] feat: scalable ch player arrow make ch player arrow scalable --- src/main/kotlin/gg/skytils/skytilsmod/core/Config.kt | 8 ++++++++ .../skytilsmod/features/impl/mining/CHWaypoints.kt | 5 +++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/src/main/kotlin/gg/skytils/skytilsmod/core/Config.kt b/src/main/kotlin/gg/skytils/skytilsmod/core/Config.kt index f824169ba..9603a5e3d 100644 --- a/src/main/kotlin/gg/skytils/skytilsmod/core/Config.kt +++ b/src/main/kotlin/gg/skytils/skytilsmod/core/Config.kt @@ -1991,6 +1991,14 @@ object Config : Vigilant( ) var crystalHollowMapPlaces = false + @Property( + type = PropertyType.DECIMAL_SLIDER, name = "Crystal Hollows map player arrow scale", + description = "Scale the arro indicating the arrorw on the crystal hollows map", + category = "Mining", subcategory = "Crystal Hollows", + minF = 0.5f, maxF = 10f, decimalPlaces = 1 + ) + var crystalHollowsMapPlayerScale = 1.5F + @Property( type = PropertyType.SWITCH, name = "Crystal Hollows waypoints", description = "Shows waypoints to special places inside the Crystal Hollows.", diff --git a/src/main/kotlin/gg/skytils/skytilsmod/features/impl/mining/CHWaypoints.kt b/src/main/kotlin/gg/skytils/skytilsmod/features/impl/mining/CHWaypoints.kt index 8deb54836..abc95a1af 100644 --- a/src/main/kotlin/gg/skytils/skytilsmod/features/impl/mining/CHWaypoints.kt +++ b/src/main/kotlin/gg/skytils/skytilsmod/features/impl/mining/CHWaypoints.kt @@ -297,6 +297,7 @@ object CHWaypoints { } val x = (mc.thePlayer.posX - 202).coerceIn(0.0, 624.0) val y = (mc.thePlayer.posZ - 202).coerceIn(0.0, 624.0) + val scale = Skytils.config.crystalHollowsMapPlayerScale // player marker code val wr = UGraphics.getFromTessellator() @@ -307,8 +308,8 @@ object CHWaypoints { // Rotate about the center to match the player's yaw stack.rotate((mc.thePlayer.rotationYawHead + 180f) % 360f, 0f, 0f, 1f) - stack.scale(1.5f, 1.5f, 1.5f) - stack.translate(-0.125f, 0.125f, 0.0f) + stack.scale(scale*1.5,scale*1.5,scale*1.5) + stack.translate(-0.125f*scale/1.5, 0.125f*scale/1.5, 0.0) UGraphics.color4f(1f, 1f, 1f, 1f) UGraphics.enableAlpha() val d1 = 0.0 From 7f4d6a471cd71509df7d37765a097c69431ea381 Mon Sep 17 00:00:00 2001 From: songreaver <87545636+Kemmisch@users.noreply.github.com> Date: Sun, 3 Nov 2024 12:00:51 +0000 Subject: [PATCH 02/10] Update Config.kt spelling & translation Signed-off-by: songreaver <87545636+Kemmisch@users.noreply.github.com> --- src/main/kotlin/gg/skytils/skytilsmod/core/Config.kt | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/main/kotlin/gg/skytils/skytilsmod/core/Config.kt b/src/main/kotlin/gg/skytils/skytilsmod/core/Config.kt index 9603a5e3d..23b620f3e 100644 --- a/src/main/kotlin/gg/skytils/skytilsmod/core/Config.kt +++ b/src/main/kotlin/gg/skytils/skytilsmod/core/Config.kt @@ -1993,11 +1993,14 @@ object Config : Vigilant( @Property( type = PropertyType.DECIMAL_SLIDER, name = "Crystal Hollows map player arrow scale", - description = "Scale the arro indicating the arrorw on the crystal hollows map", + description = "Scale the arrow indicating the player on the crystal hollows map", category = "Mining", subcategory = "Crystal Hollows", - minF = 0.5f, maxF = 10f, decimalPlaces = 1 + minF = 0.5f, maxF = 10f, decimalPlaces = 2, + i18nName = "skytils.config.mining.crystal_hollows.player_arrow_scaling", + i18nCategory = "skytils.config.mining", + i18nSubcategory = "skytils.config.mining.crystal_hollows" ) - var crystalHollowsMapPlayerScale = 1.5F + var crystalHollowsMapPlayerScale = 2.25F @Property( type = PropertyType.SWITCH, name = "Crystal Hollows waypoints", From 57b37ebbd6ee5fe406e92c39319859571053f124 Mon Sep 17 00:00:00 2001 From: songreaver <87545636+Kemmisch@users.noreply.github.com> Date: Sun, 3 Nov 2024 12:08:41 +0000 Subject: [PATCH 03/10] Update CHWaypoints.kt fix scaling numbers Signed-off-by: songreaver <87545636+Kemmisch@users.noreply.github.com> --- .../skytils/skytilsmod/features/impl/mining/CHWaypoints.kt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/kotlin/gg/skytils/skytilsmod/features/impl/mining/CHWaypoints.kt b/src/main/kotlin/gg/skytils/skytilsmod/features/impl/mining/CHWaypoints.kt index abc95a1af..edf0ac009 100644 --- a/src/main/kotlin/gg/skytils/skytilsmod/features/impl/mining/CHWaypoints.kt +++ b/src/main/kotlin/gg/skytils/skytilsmod/features/impl/mining/CHWaypoints.kt @@ -308,8 +308,8 @@ object CHWaypoints { // Rotate about the center to match the player's yaw stack.rotate((mc.thePlayer.rotationYawHead + 180f) % 360f, 0f, 0f, 1f) - stack.scale(scale*1.5,scale*1.5,scale*1.5) - stack.translate(-0.125f*scale/1.5, 0.125f*scale/1.5, 0.0) + stack.scale(scale,scale,scale) + stack.translate((-0.125f*scale).toDouble(), (0.125f*scale).toDouble(), 0.0) UGraphics.color4f(1f, 1f, 1f, 1f) UGraphics.enableAlpha() val d1 = 0.0 @@ -404,4 +404,4 @@ object CHWaypoints { ) } } -} \ No newline at end of file +} From 7d7b55db5c120542d71e4a50bb7919c574432dfd Mon Sep 17 00:00:00 2001 From: songreaver <87545636+Kemmisch@users.noreply.github.com> Date: Sun, 3 Nov 2024 12:13:33 +0000 Subject: [PATCH 04/10] Update en_US.lang Signed-off-by: songreaver <87545636+Kemmisch@users.noreply.github.com> --- src/main/resources/assets/skytils/lang/en_US.lang | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/resources/assets/skytils/lang/en_US.lang b/src/main/resources/assets/skytils/lang/en_US.lang index 3d44c5148..340c40ea8 100644 --- a/src/main/resources/assets/skytils/lang/en_US.lang +++ b/src/main/resources/assets/skytils/lang/en_US.lang @@ -184,6 +184,7 @@ skytils.config.mining.solvers.fetchur_solver=Fetchur Solver skytils.config.mining.solvers.puzzler_solver=Puzzler Solver skytils.config.mining.crystal_hollows.crystal_hollows_death_waypoints=Crystal Hollows Death Waypoints skytils.config.mining.crystal_hollows.crystal_hollows_map=Crystal Hollows map +skytils.config.mining.crystal_hollows.player_arrow_scaling=Crystal Hollows map player arrow scale skytils.config.mining.crystal_hollows.crystal_hollows_map_special_places=Crystal Hollows map special places skytils.config.mining.crystal_hollows.crystal_hollows_waypoints=Crystal Hollows waypoints skytils.config.mining.crystal_hollows.king_yolkar_waypoint=King Yolkar waypoint @@ -471,4 +472,4 @@ skytils.config.spam.display=Display skytils.config.spam.abilities=Abilities skytils.config.spam.dungeons=Dungeons skytils.config.spam.miscellaneous=Miscellaneous -skytils.config.spam.fishing=Fishing \ No newline at end of file +skytils.config.spam.fishing=Fishing From 4d3de5e39b6d0372d39278512f628fccbb961ef3 Mon Sep 17 00:00:00 2001 From: songreaver <87545636+Kemmisch@users.noreply.github.com> Date: Sun, 3 Nov 2024 12:29:08 +0000 Subject: [PATCH 05/10] Update Config.kt move scale up and make dependent on map Signed-off-by: songreaver <87545636+Kemmisch@users.noreply.github.com> --- .../gg/skytils/skytilsmod/core/Config.kt | 22 ++++++++++--------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/src/main/kotlin/gg/skytils/skytilsmod/core/Config.kt b/src/main/kotlin/gg/skytils/skytilsmod/core/Config.kt index 23b620f3e..5a76a2bee 100644 --- a/src/main/kotlin/gg/skytils/skytilsmod/core/Config.kt +++ b/src/main/kotlin/gg/skytils/skytilsmod/core/Config.kt @@ -1981,16 +1981,6 @@ object Config : Vigilant( ) var crystalHollowMap = false - @Property( - type = PropertyType.SWITCH, name = "Crystal Hollows map special places", - description = "Show special places on the map (like Lost Precusor City).", - category = "Mining", subcategory = "Crystal Hollows", - i18nName = "skytils.config.mining.crystal_hollows.crystal_hollows_map_special_places", - i18nCategory = "skytils.config.mining", - i18nSubcategory = "skytils.config.mining.crystal_hollows" - ) - var crystalHollowMapPlaces = false - @Property( type = PropertyType.DECIMAL_SLIDER, name = "Crystal Hollows map player arrow scale", description = "Scale the arrow indicating the player on the crystal hollows map", @@ -2001,6 +1991,16 @@ object Config : Vigilant( i18nSubcategory = "skytils.config.mining.crystal_hollows" ) var crystalHollowsMapPlayerScale = 2.25F + + @Property( + type = PropertyType.SWITCH, name = "Crystal Hollows map special places", + description = "Show special places on the map (like Lost Precusor City).", + category = "Mining", subcategory = "Crystal Hollows", + i18nName = "skytils.config.mining.crystal_hollows.crystal_hollows_map_special_places", + i18nCategory = "skytils.config.mining", + i18nSubcategory = "skytils.config.mining.crystal_hollows" + ) + var crystalHollowMapPlaces = false @Property( type = PropertyType.SWITCH, name = "Crystal Hollows waypoints", @@ -4488,6 +4488,8 @@ object Config : Vigilant( addDependency("shinyPigLocations", "shinyOrbWaypoints") + addDependency("crystalHollowsMapPlayerScale","crystalHollowMap") + registerListener("protectItemBINThreshold") { _: String -> tickTimer(1) { val numeric = protectItemBINThreshold.replace(Regex("[^0-9]"), "") From d7be63246d3206d73d8330699d2c4a414ae6386a Mon Sep 17 00:00:00 2001 From: songreaver <87545636+Kemmisch@users.noreply.github.com> Date: Wed, 6 Nov 2024 18:38:56 +0000 Subject: [PATCH 06/10] Apply suggestions from code review Co-authored-by: My-Name-Is-Jeff <37018278+My-Name-Is-Jeff@users.noreply.github.com> Signed-off-by: songreaver <87545636+Kemmisch@users.noreply.github.com> --- src/main/kotlin/gg/skytils/skytilsmod/core/Config.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/kotlin/gg/skytils/skytilsmod/core/Config.kt b/src/main/kotlin/gg/skytils/skytilsmod/core/Config.kt index 5a76a2bee..ecb3dd244 100644 --- a/src/main/kotlin/gg/skytils/skytilsmod/core/Config.kt +++ b/src/main/kotlin/gg/skytils/skytilsmod/core/Config.kt @@ -4488,7 +4488,7 @@ object Config : Vigilant( addDependency("shinyPigLocations", "shinyOrbWaypoints") - addDependency("crystalHollowsMapPlayerScale","crystalHollowMap") + addDependency("crystalHollowsMapPlayerScale", "crystalHollowMap") registerListener("protectItemBINThreshold") { _: String -> tickTimer(1) { From 39da68cfef25a7eb05f1ebac736c02f15c560106 Mon Sep 17 00:00:00 2001 From: songreaver <87545636+Kemmisch@users.noreply.github.com> Date: Wed, 6 Nov 2024 18:42:41 +0000 Subject: [PATCH 07/10] Update zh_CN.lang Signed-off-by: songreaver <87545636+Kemmisch@users.noreply.github.com> --- src/main/resources/assets/skytils/lang/zh_CN.lang | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/resources/assets/skytils/lang/zh_CN.lang b/src/main/resources/assets/skytils/lang/zh_CN.lang index 8a96c2ae5..293d6affa 100644 --- a/src/main/resources/assets/skytils/lang/zh_CN.lang +++ b/src/main/resources/assets/skytils/lang/zh_CN.lang @@ -180,6 +180,7 @@ skytils.config.mining.solvers.fetchur_solver=Fetchur的解密器 skytils.config.mining.solvers.puzzler_solver=Puzzler的解密器 skytils.config.mining.crystal_hollows.crystal_hollows_death_waypoints=水晶矿洞死亡路径点 skytils.config.mining.crystal_hollows.crystal_hollows_map=水晶矿洞地图 +kytils.config.mining.crystal_hollows.player_arrow_scaling= skytils.config.mining.crystal_hollows.crystal_hollows_map_special_places=水晶矿洞地图标记特殊地点 skytils.config.mining.crystal_hollows.crystal_hollows_waypoints=水晶矿洞路径点 skytils.config.mining.crystal_hollows.king_yolkar_waypoint=哥布林王路径点 @@ -466,4 +467,4 @@ skytils.config.spam.display=显示 skytils.config.spam.abilities=能力 skytils.config.spam.dungeons=地牢 skytils.config.spam.miscellaneous=杂项 -skytils.config.spam.fishing=钓鱼 \ No newline at end of file +skytils.config.spam.fishing=钓鱼 From d07995152f47bb2d4c8c47c319f47bbce12255a1 Mon Sep 17 00:00:00 2001 From: songreaver <87545636+Kemmisch@users.noreply.github.com> Date: Wed, 6 Nov 2024 18:43:10 +0000 Subject: [PATCH 08/10] Update zh_TW.lang Signed-off-by: songreaver <87545636+Kemmisch@users.noreply.github.com> --- src/main/resources/assets/skytils/lang/zh_TW.lang | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/resources/assets/skytils/lang/zh_TW.lang b/src/main/resources/assets/skytils/lang/zh_TW.lang index ed7e93dc8..794f856fc 100644 --- a/src/main/resources/assets/skytils/lang/zh_TW.lang +++ b/src/main/resources/assets/skytils/lang/zh_TW.lang @@ -180,6 +180,7 @@ skytils.config.mining.solvers.fetchur_solver=Fetchur的解答器 skytils.config.mining.solvers.puzzler_solver=Puzzler的解答器 skytils.config.mining.crystal_hollows.crystal_hollows_death_waypoints=Crystal Hollows死亡路徑點 skytils.config.mining.crystal_hollows.crystal_hollows_map=Crystal Hollows地圖 +kytils.config.mining.crystal_hollows.player_arrow_scaling= skytils.config.mining.crystal_hollows.crystal_hollows_map_special_places=Crystal Hollows地圖標記特殊地點 skytils.config.mining.crystal_hollows.crystal_hollows_waypoints=Crystal Hollows路徑點 skytils.config.mining.crystal_hollows.king_yolkar_waypoint=哥布林王路徑點 From 84b0db8427fd1da8c418aa195122a7fb06b262ae Mon Sep 17 00:00:00 2001 From: songreaver <87545636+Kemmisch@users.noreply.github.com> Date: Wed, 6 Nov 2024 18:45:08 +0000 Subject: [PATCH 09/10] Update zh_TW.lang oops missed an s Signed-off-by: songreaver <87545636+Kemmisch@users.noreply.github.com> --- src/main/resources/assets/skytils/lang/zh_TW.lang | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/assets/skytils/lang/zh_TW.lang b/src/main/resources/assets/skytils/lang/zh_TW.lang index 794f856fc..15b3dceab 100644 --- a/src/main/resources/assets/skytils/lang/zh_TW.lang +++ b/src/main/resources/assets/skytils/lang/zh_TW.lang @@ -180,7 +180,7 @@ skytils.config.mining.solvers.fetchur_solver=Fetchur的解答器 skytils.config.mining.solvers.puzzler_solver=Puzzler的解答器 skytils.config.mining.crystal_hollows.crystal_hollows_death_waypoints=Crystal Hollows死亡路徑點 skytils.config.mining.crystal_hollows.crystal_hollows_map=Crystal Hollows地圖 -kytils.config.mining.crystal_hollows.player_arrow_scaling= +skytils.config.mining.crystal_hollows.player_arrow_scaling= skytils.config.mining.crystal_hollows.crystal_hollows_map_special_places=Crystal Hollows地圖標記特殊地點 skytils.config.mining.crystal_hollows.crystal_hollows_waypoints=Crystal Hollows路徑點 skytils.config.mining.crystal_hollows.king_yolkar_waypoint=哥布林王路徑點 From 52bca6b837018be7fd38de097f0b62ebc7e3a9c2 Mon Sep 17 00:00:00 2001 From: songreaver <87545636+Kemmisch@users.noreply.github.com> Date: Wed, 6 Nov 2024 18:50:44 +0000 Subject: [PATCH 10/10] Update zh_CN.lang ok apparently i forgot twice? Signed-off-by: songreaver <87545636+Kemmisch@users.noreply.github.com> --- src/main/resources/assets/skytils/lang/zh_CN.lang | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/assets/skytils/lang/zh_CN.lang b/src/main/resources/assets/skytils/lang/zh_CN.lang index 293d6affa..e7fcb0fe6 100644 --- a/src/main/resources/assets/skytils/lang/zh_CN.lang +++ b/src/main/resources/assets/skytils/lang/zh_CN.lang @@ -180,7 +180,7 @@ skytils.config.mining.solvers.fetchur_solver=Fetchur的解密器 skytils.config.mining.solvers.puzzler_solver=Puzzler的解密器 skytils.config.mining.crystal_hollows.crystal_hollows_death_waypoints=水晶矿洞死亡路径点 skytils.config.mining.crystal_hollows.crystal_hollows_map=水晶矿洞地图 -kytils.config.mining.crystal_hollows.player_arrow_scaling= +skytils.config.mining.crystal_hollows.player_arrow_scaling= skytils.config.mining.crystal_hollows.crystal_hollows_map_special_places=水晶矿洞地图标记特殊地点 skytils.config.mining.crystal_hollows.crystal_hollows_waypoints=水晶矿洞路径点 skytils.config.mining.crystal_hollows.king_yolkar_waypoint=哥布林王路径点