Feature: Optimal Angles Overlay for Squeaky Mousemat #2999

nikijul007 · 2024-11-27T16:14:06Z

What

Adds an overlay for Squeaky Mousemat to choose from given angle-pairs for each crop - like the Rancher Boots Overlay for speed. You can edit the angles in config and choose between normal and compact display

Changelog New Features

Optimal Angles Overlay. - nikijul

…verlay)

ILike2WatchMemes · 2024-11-29T20:15:17Z

#2977, might want to merge these two together in some way

src/main/java/at/hannibal2/skyhanni/utils/LorenzUtils.kt

github-actions · 2024-12-25T01:06:15Z

This pull request has conflicts with the base branch "beta". Please resolve those so we can test out your changes.

…gles # Conflicts: # src/main/java/at/hannibal2/skyhanni/utils/LorenzUtils.kt

github-actions · 2025-01-01T15:26:10Z

Conflicts have been resolved! 🎉

rueblimaster · 2025-01-07T17:58:02Z

@CalMWolfs can this be merged now?

hannibal002 · 2025-01-07T18:31:46Z

Ive marked this PR as soon, it should get merged in beta 1.3.0 or 1.4.0 or so

rueblimaster · 2025-01-07T19:49:18Z

Ive marked this PR as soon, it should get merged in beta 1.3.0 or 1.4.0 or so

I ment because it sais unresolver conversations, is there a way to make this go away if I created the pull request?

nikijul007 · 2025-01-07T22:01:19Z

Ive marked this PR as soon, it should get merged in beta 1.3.0 or 1.4.0 or so

I ment because it sais unresolver conversations, is there a way to make this go away if I created the pull request?

The request was to remove a function from LorenzUtils as this class shouldn't be modified. I've already relocated the affected methods in a new class

github-actions · 2025-01-09T15:59:04Z

One or more Detekt Failures were detected:

CustomAnglesConfig.kt#L9: Expected space after opening comment.
CustomAnglesConfig.kt#L20: Expected space after opening comment.
CustomAnglesConfig.kt#L31: Expected space after opening comment.
CustomAnglesConfig.kt#L42: Expected space after opening comment.
CustomAnglesConfig.kt#L53: Expected space after opening comment.
CustomAnglesConfig.kt#L64: Expected space after opening comment.
CustomAnglesConfig.kt#L75: Expected space after opening comment.
CustomAnglesConfig.kt#L86: Expected space after opening comment.
CustomAnglesConfig.kt#L97: Expected space after opening comment.
CustomAnglesConfig.kt#L108: Expected space after opening comment.

…gles

rueblimaster · 2025-01-11T11:44:20Z

I need this utils changes!

github-actions · 2025-01-25T01:38:54Z

This pull request has conflicts with the base branch "beta". Please resolve those so we can test out your changes.

…gles # Conflicts: # src/main/java/at/hannibal2/skyhanni/data/GuiEditManager.kt # src/main/java/at/hannibal2/skyhanni/features/garden/GardenOptimalSpeed.kt # src/main/java/at/hannibal2/skyhanni/utils/LorenzUtils.kt

github-actions · 2025-01-25T15:53:45Z

Conflicts have been resolved! 🎉

github-actions · 2025-01-25T20:28:27Z

This pull request has conflicts with the base branch "beta". Please resolve those so we can test out your changes.

…gles # Conflicts: # src/main/java/at/hannibal2/skyhanni/features/misc/BetterSignEditing.kt

github-actions · 2025-01-25T20:47:07Z

Conflicts have been resolved! 🎉

Eveeifyeve · 2025-02-09T03:55:19Z

Any status on this pr?

CalMWolfs · 2025-02-09T03:58:04Z

Any status on this pr?

NopoTheGamer · 2025-02-09T03:58:12Z

Any status on this pr?

hannibal002 · 2025-02-09T04:05:40Z

I plan on looking at it tomorrow

…gles

hannibal002

the code works fine!
the variable names in the config and the display names are a bit confusing, maybe look over them again while creating the new mousemat config file.

the display here is a direct copy of the rancher boots gui. This gui uses a old design. please add hover text and different colors, maybe even a table (for having all values cleanly aligned) here. look at sack display render for an idea. if you need help with any of that feel free to ask

hannibal002 · 2025-02-11T12:10:48Z

src/main/java/at/hannibal2/skyhanni/config/features/garden/optimalAngles/OptimalAnglesConfig.kt

+import io.github.notenoughupdates.moulconfig.annotations.ConfigLink
+import io.github.notenoughupdates.moulconfig.annotations.ConfigOption
+
+class OptimalAnglesConfig {


please move the squeaky mousemat options into a new class that is part of this class here

hannibal002 · 2025-02-11T12:12:08Z

src/main/java/at/hannibal2/skyhanni/utils/LorenzUtils.kt

-
-        val signText = (this as AccessorGuiEditSign).tileSign.signText.map { it.unformattedText.removeColor() }
-        return signText[1] == "^^^^^^" && signText[2] == "Set your" && signText[3] == "speed cap!"
+    @Deprecated("do not use List<Any>, use List<Renderable> instead", ReplaceWith(""))


here some merge conflict got wrongfully fixed. remove this function

hannibal002 · 2025-02-11T12:20:34Z

src/main/java/at/hannibal2/skyhanni/features/garden/GardenOptimalAngles.kt

+
+    private val config get() = GardenApi.config.optimalAngles
+
+    private val configCustomAngles get() = config.customAngles


if this is only used once it can be inlined

hannibal002 · 2025-02-11T12:21:01Z

src/main/java/at/hannibal2/skyhanni/features/garden/GardenOptimalAngles.kt

+
+    private fun CropType.getConfig(): Pair<Property<Float>, Property<Float>> = with(configCustomAngles) {
+        when (this@getConfig) {
+            CropType.CACTUS -> Pair(cactusYaw, cactusPitch)


instead of Pair(a, b) you can use a to b

hannibal002 · 2025-02-11T12:29:22Z

src/main/java/at/hannibal2/skyhanni/config/features/garden/optimalAngles/OptimalAnglesConfig.kt

+    var signPosition: Position = Position(20, -195, false, true)
+
+    @Expose
+    @ConfigOption(name = "Custom Speed", desc = "Change the exact speed for every single crop.")


update the name/desc

Add Optimal Angles Overlay for Squeaky Mousemat (like Rancher Boots O…

cd4f122

…verlay)

hannibal002 added this to the Version 0.29 milestone Nov 28, 2024

CalMWolfs and others added 3 commits December 4, 2024 19:51

Merge branch 'beta' into feature_garden_angles

3e61b03

Merge branch 'beta' into feature_garden_angles

5c8632a

fix events merge

0a63ca0

CalMWolfs requested changes Dec 6, 2024

View reviewed changes

src/main/java/at/hannibal2/skyhanni/utils/LorenzUtils.kt Outdated Show resolved Hide resolved

CalMWolfs and others added 3 commits December 10, 2024 12:07

Merge branch 'beta' into feature_garden_angles

efcf5ac

Add SignUtils and relocate suitable affected functions

845ff5d

Merge branch 'beta' into feature_garden_angles

da305b0

github-actions bot added the Merge Conflicts There are open merge conflicts with the beta branch. label Dec 25, 2024

CalMWolfs added 2 commits January 1, 2025 10:23

Merge branch 'refs/heads/beta' into fork/nikijul007/feature_garden_an…

8fe4ac6

…gles # Conflicts: # src/main/java/at/hannibal2/skyhanni/utils/LorenzUtils.kt

fix merge

ec0366b

github-actions bot removed the Merge Conflicts There are open merge conflicts with the beta branch. label Jan 1, 2025

hannibal002 added the Soon This Pull Request will be merged within the next couple of betas label Jan 7, 2025

CalMWolfs and others added 3 commits January 8, 2025 10:36

Merge branch 'beta' into feature_garden_angles

43de886

Rename .java to .kt

c56cca4

make kotlin, dictionary

fed8b8d

github-actions bot added the Detekt Has detekt problem label Jan 9, 2025

CalMWolfs added 2 commits January 9, 2025 16:59

Merge branch 'refs/heads/beta' into fork/nikijul007/feature_garden_an…

8140fd1

…gles

detekt

29c913b

github-actions bot removed the Detekt Has detekt problem label Jan 9, 2025

Merge branch 'beta' into feature_garden_angles

49f2d62

CalMWolfs added 5 commits January 12, 2025 20:34

Merge branch 'beta' into feature_garden_angles

d0c759e

Merge branch 'beta' into feature_garden_angles

1934772

Merge branch 'beta' into feature_garden_angles

df06c91

Merge branch 'beta' into feature_garden_angles

02ad94a

Merge branch 'beta' into feature_garden_angles

de1c1b9

github-actions bot added the Merge Conflicts There are open merge conflicts with the beta branch. label Jan 25, 2025

hannibal002 added 2 commits January 25, 2025 16:48

Fixed merge conflicts

c273058

github-actions bot added Merge Conflicts There are open merge conflicts with the beta branch. and removed Merge Conflicts There are open merge conflicts with the beta branch. labels Jan 25, 2025

Merge branch 'refs/heads/beta' into fork/nikijul007/feature_garden_an…

dc93775

…gles # Conflicts: # src/main/java/at/hannibal2/skyhanni/features/misc/BetterSignEditing.kt

github-actions bot removed the Merge Conflicts There are open merge conflicts with the beta branch. label Jan 25, 2025

Merge branch 'beta' into feature_garden_angles

6489b39

hannibal002 added 2 commits February 11, 2025 13:04

Merge branch 'refs/heads/beta' into fork/nikijul007/feature_garden_an…

651b165

…gles

code cleanup

f0b0dda

hannibal002 requested changes Feb 11, 2025

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Feature: Optimal Angles Overlay for Squeaky Mousemat #2999

Feature: Optimal Angles Overlay for Squeaky Mousemat #2999

nikijul007 commented Nov 27, 2024

ILike2WatchMemes commented Nov 29, 2024

github-actions bot commented Dec 25, 2024

github-actions bot commented Jan 1, 2025

rueblimaster commented Jan 7, 2025

hannibal002 commented Jan 7, 2025

rueblimaster commented Jan 7, 2025

nikijul007 commented Jan 7, 2025

github-actions bot commented Jan 9, 2025

rueblimaster commented Jan 11, 2025

github-actions bot commented Jan 25, 2025

github-actions bot commented Jan 25, 2025

github-actions bot commented Jan 25, 2025

github-actions bot commented Jan 25, 2025

Eveeifyeve commented Feb 9, 2025

CalMWolfs commented Feb 9, 2025

NopoTheGamer commented Feb 9, 2025

hannibal002 commented Feb 9, 2025

hannibal002 left a comment

hannibal002 Feb 11, 2025 •

edited

Loading

hannibal002 Feb 11, 2025

hannibal002 Feb 11, 2025

hannibal002 Feb 11, 2025

hannibal002 Feb 11, 2025


		private val config get() = GardenApi.config.optimalAngles

		private val configCustomAngles get() = config.customAngles

Feature: Optimal Angles Overlay for Squeaky Mousemat #2999

Are you sure you want to change the base?

Feature: Optimal Angles Overlay for Squeaky Mousemat #2999

Conversation

nikijul007 commented Nov 27, 2024

What

Changelog New Features

ILike2WatchMemes commented Nov 29, 2024

github-actions bot commented Dec 25, 2024

github-actions bot commented Jan 1, 2025

rueblimaster commented Jan 7, 2025

hannibal002 commented Jan 7, 2025

rueblimaster commented Jan 7, 2025

nikijul007 commented Jan 7, 2025

github-actions bot commented Jan 9, 2025

One or more Detekt Failures were detected:

rueblimaster commented Jan 11, 2025

github-actions bot commented Jan 25, 2025

github-actions bot commented Jan 25, 2025

github-actions bot commented Jan 25, 2025

github-actions bot commented Jan 25, 2025

Eveeifyeve commented Feb 9, 2025

CalMWolfs commented Feb 9, 2025

NopoTheGamer commented Feb 9, 2025

hannibal002 commented Feb 9, 2025

hannibal002 left a comment

Choose a reason for hiding this comment

hannibal002 Feb 11, 2025 • edited Loading

Choose a reason for hiding this comment

hannibal002 Feb 11, 2025

Choose a reason for hiding this comment

hannibal002 Feb 11, 2025

Choose a reason for hiding this comment

hannibal002 Feb 11, 2025

Choose a reason for hiding this comment

hannibal002 Feb 11, 2025

Choose a reason for hiding this comment

hannibal002 Feb 11, 2025 •

edited

Loading