Feature: ubiks cube reminder

annotation-processors/out/production/resources/META-INF/services/com.google.devtools.ksp.processing.SymbolProcessorProvider

@@ -0,0 +1 @@
+at.hannibal2.skyhanni.skyhannimodule.ModuleProvider

docs/CHANGELOG.md

@@ -105,6 +105,7 @@
     + Reset search terms in GUIs after closing inventory (Profit Trackers, Area Navigation list, etc.).
     + Enabled by default to reduce confusion caused by the search feature.
 + The Estimated Item Value now displays material names used to unlock gemstone slots. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/3089)
++ Added Mithril Infusion to Estimated Item Value. - Empa (https://github.com/hannibal002/SkyHanni/pull/2990)
 
 #### Chat and Command Improvements
 
@@ -185,6 +186,7 @@
 + Added an option to send the optimal speed warning even when not wearing Rancher's Boots. - Obsidian (https://github.com/hannibal002/SkyHanni/pull/2859)
 + Added a Pest Traps tab widget to the Tab Widget Display. - Luna (https://github.com/hannibal002/SkyHanni/pull/2984)
 + Updated Pest chat and GUI to indicate Pests Widget is disabled when displaying pests. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/3022)
++ Changed Anita medal profit display to show profit per copper medal and sort by this value. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/3122)
 
 #### Event Improvements
 
@@ -208,6 +210,7 @@
 + Added a warning for empty messages left behind by Stash Compact. - Daveed (https://github.com/hannibal002/SkyHanni/pull/3009)
 + Added option to hide seconds in the Real Time GUI. - Obsidian (https://github.com/hannibal002/SkyHanni/pull/2979)
 + Improved graph navigation performance. - hannibal2 & Thunderblade (https://github.com/hannibal002/SkyHanni/pull/3083)
++ Added Roman numeral support to slayer names in trackers, Profit Tracker Items, and Scoreboard. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/3113)
 
 ### Fixes
 
@@ -260,6 +263,7 @@
 + Fixed a small typo in Bestiary Display. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/2748)
 + Fixed `Line to Slayer Miniboss` not checking for walls. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/2788)
 + Fixed Special Zealots not highlighted after a recent Hypixel update. - Luna (https://github.com/hannibal002/SkyHanni/pull/3099)
++ Fixed Kuudra Lines sometimes not displaying in Custom Scoreboard. - j10a1n15 (https://github.com/hannibal002/SkyHanni/pull/3118)
 
 #### Custom Scoreboard Fixes
 
@@ -358,6 +362,7 @@
 + Fixed Time Tower warnings showing up on new profiles (e.g. Bingo). - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/3012)
     + You can open `/cf` once to make the message disappear without changing settings if a new profile was created before applying the fix for the first time.
 + Fixed stray flash overlaying other Chocolate Factory information. - Daveed (https://github.com/hannibal002/SkyHanni/pull/3054)
++ Fixed error when opening Choc Factory via NEU buttons. - Daveed (https://github.com/hannibal002/SkyHanni/pull/3108)
 
 #### Event Fixes
 
@@ -392,6 +397,7 @@
     +  Fixed the color of material messages.
 + Fixed overly liberal player message detection in Enable Chat Formatting. - !nea (https://github.com/hannibal002/SkyHanni/pull/2871)
     +  This should fix many formatting issues related to `[SomethingHere] Something Else: Something Even More`.
++ Fixed /shwords causing blank messages in chat. - nopo (https://github.com/hannibal002/SkyHanni/pull/3110)
 
 #### Misc Fixes
 
@@ -424,6 +430,10 @@
 + Fixed collection tracker to recognize the current collection. - nopo (https://github.com/hannibal002/SkyHanni/pull/3049)
 + Fixed skill level. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/3068)
 + Fixed Replace Roman Numerals replacing random letters. - Mikecraft1224 (https://github.com/hannibal002/SkyHanni/pull/3003)
++ Fixed most incorrect farming skill XP cases. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/3121)
+    + Calculation errors when reaching a skill cap below 60 are not fixed yet.
++ Fixed distortion of regular words due to incorrect Roman numeral replacement. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/3113)
++ Fixed rare error message in skill progress display. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/3105)
 
 ### Technical Details
 
@@ -542,6 +552,14 @@
 + Moved Next Jacobs Contest, Best Crop Milestone & Jyrre Timer to Renderable. - j10a1n15 (https://github.com/hannibal002/SkyHanni/pull/3004)
 + Added /shtestactionbar command: set your clipboard as a fake Action Bar. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/3085)
 + Added /shdebug support for SkyBlock island, Bingo, and Tab List data tests. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/3085)
++ Added error logging to trevor solver. - CalMWolfs (https://github.com/hannibal002/SkyHanni/pull/3107)
++ Added allowlist for Roman numeral replacement. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/3113)
++ Added debug command /shdebugvisualwords. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/3112)
+    + Added console logging of all words replaced by /shword.
++ Added contributor rabbit names. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/3109)
+    + Replaced rabbit names in the rabbit collection menu with SkyHanni contributor names.
++ Added debug data for crop reading errors. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/3114)
++ Improved Detekt and .editorconfig rules. - hannibal2 (https://github.com/hannibal002/SkyHanni/pull/3104)
 
 ### Removed Features
 

root.gradle.kts

@@ -14,7 +14,7 @@ plugins {
 
 allprojects {
     group = "at.hannibal2.skyhanni"
-    version = "0.28.Beta.21"
+    version = "0.28.Beta.22"
     repositories {
         mavenCentral()
         mavenLocal()

src/main/java/META-INF/MANIFEST.MF

@@ -0,0 +1,3 @@
+Manifest-Version: 1.0
+Main-Class: SkyHanniInstallerFrame
+

src/main/java/at/hannibal2/skyhanni/config/features/rift/RiftConfig.java

@@ -55,4 +55,10 @@ public class RiftConfig {
     @ConfigEditorBoolean
     @FeatureToggle
     public boolean horsezookaHider = false;
+
+    @Expose
+    @ConfigOption(name = "Ubik's cube reminder", desc = "Reminder for Ubik's cube in the rift")
+    @ConfigEditorBoolean
+    @FeatureToggle
+    public boolean ubikReminder = false;
 }

src/main/java/at/hannibal2/skyhanni/features/rift/everywhere/Ubikreminder.kt

@@ -0,0 +1,37 @@
+package at.hannibal2.skyhanni.features.rift.everywhere
+
+import at.hannibal2.skyhanni.events.LorenzChatEvent
+import at.hannibal2.skyhanni.features.rift.RiftAPI
+import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule
+import at.hannibal2.skyhanni.utils.ChatUtils
+import at.hannibal2.skyhanni.utils.DelayedRun
+import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
+import kotlin.time.Duration.Companion.hours
+
+@SkyHanniModule
+object Ubikreminder {
+
+    private val config get() = RiftAPI.config.ubikReminder
+
+    private var isTimerRunning = false
+    private val messageRegex = Regex("ROUND [1-9] \\(FINAL\\):")
+
+
+    @SubscribeEvent
+    fun onChat(event: LorenzChatEvent) {
+        if (!RiftAPI.config.ubikReminder) return
+        val message = event.message
+        if (messageRegex.matches(message) && !isTimerRunning) {
+            startTimer()
+        }
+    }
+    private fun startTimer() {
+        isTimerRunning = true
+
+        DelayedRun.runDelayed(2.hours) { // 2 hours as a Duration
+            ChatUtils.chat("§aUbik's cube is ready in the rift!")
+            isTimerRunning = false
+
+        }
+    }
+}

src/main/resources/META-INF/MANIFEST.MF

@@ -0,0 +1,3 @@
+Manifest-Version: 1.0
+Main-Class: SkyHanniInstallerFrame
+

src/main/resources/production/SkyHanni.1.8.9.main/META-INF/MANIFEST.MF

@@ -0,0 +1,3 @@
+Manifest-Version: 1.0
+Main-Class: SkyHanniInstallerFrame
+

src/main/resources/production/SkyHanni.1.8.9.main/assets/skyhanni/gui/regexes.xml

@@ -0,0 +1,25 @@
+<Root xmlns="http://notenoughupdates.org/moulconfig" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+      xsi:schemaLocation="http://notenoughupdates.org/moulconfig https://raw.githubusercontent.com/NotEnoughUpdates/MoulConfig/master/MoulConfig.xsd">
+    <Gui>
+        <Column>
+            <Row>
+                <Text text="Search: "/>
+                <TextField value="@search"/>
+                <Text text="@poll"/>
+            </Row>
+            <ScrollPanel width="560" height="400">
+                <Array data="@searchResults">
+                    <Row>
+                        <Hover lines="@keyW">
+                            <Text text="@key" width="200"/>
+                        </Hover>
+                        <Hover lines="@hoverRegex">
+                            <Text text="@regex" width="300"/>
+                        </Hover>
+                        <Text text="@overriden" width="50"/>
+                    </Row>
+                </Array>
+            </ScrollPanel>
+        </Column>
+    </Gui>
+</Root>

src/main/resources/production/SkyHanni.1.8.9.main/assets/skyhanni/shaders/darken.fsh

@@ -0,0 +1,13 @@
+#version 120
+
+// Fragment Shader
+uniform sampler2D texture;
+uniform float darknessLevel;
+
+varying vec4 outColor;
+
+void main() {
+    vec4 color = texture2D(texture, gl_TexCoord[0].st) * outColor;
+    vec3 darkenedColor = color.rgb * darknessLevel;
+    gl_FragColor = vec4(darkenedColor, color.a);
+}

src/main/resources/production/SkyHanni.1.8.9.main/assets/skyhanni/shaders/darken.vsh

@@ -0,0 +1,9 @@
+#version 120
+
+varying vec4 outColor;
+
+void main() {
+    gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex;
+    gl_TexCoord[0] = gl_MultiTexCoord0;
+    outColor = gl_Color;
+}

src/main/resources/production/SkyHanni.1.8.9.main/assets/skyhanni/shaders/rounded_rect.fsh

@@ -0,0 +1,34 @@
+#version 120
+
+uniform float scaleFactor;
+uniform float radius;
+uniform float smoothness;
+uniform vec2 halfSize;
+uniform vec2 centerPos;
+
+varying vec4 color;
+
+// From https://www.shadertoy.com/view/WtdSDs
+float roundedRectSDF(vec2 center, vec2 halfSize, float radius) {
+    return length(max(abs(center) - halfSize + radius, 0.0)) - radius;
+}
+
+void main() {
+    float xScale = gl_ModelViewMatrix[0][0];
+    float yScale = gl_ModelViewMatrix[1][1];
+    float xTranslation = gl_ModelViewMatrix[3][0];
+    float yTranslation = gl_ModelViewMatrix[3][1];
+
+    vec2 newHalfSize = vec2(halfSize.x * xScale, halfSize.y * yScale);
+
+    float newCenterPosY = centerPos.y;
+    if (yScale != 1.0) {
+        newCenterPosY = centerPos.y - (halfSize.y * (yScale - 1));
+    }
+
+    vec2 newCenterPos = vec2((centerPos.x * xScale) + (xTranslation * scaleFactor), newCenterPosY - (yTranslation * scaleFactor));
+
+    float distance = roundedRectSDF(gl_FragCoord.xy - newCenterPos, newHalfSize, radius);
+    float smoothed = 1.0 - smoothstep(0.0, smoothness, distance);
+    gl_FragColor = color * vec4(1.0, 1.0, 1.0, smoothed);
+}

src/main/resources/production/SkyHanni.1.8.9.main/assets/skyhanni/shaders/rounded_rect.vsh

@@ -0,0 +1,8 @@
+#version 120
+
+varying vec4 color;
+
+void main() {
+    gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex;
+    color = gl_Color;
+}

src/main/resources/production/SkyHanni.1.8.9.main/assets/skyhanni/shaders/rounded_rect_outline.fsh

@@ -0,0 +1,40 @@
+#version 120
+
+// Rect specific uniforms
+uniform float scaleFactor;
+uniform float radius;
+uniform vec2 halfSize;
+uniform vec2 centerPos;
+
+// Outline specific uniforms
+uniform float borderThickness;
+uniform float borderBlur;
+
+varying vec4 color;
+
+// From https://www.shadertoy.com/view/WtdSDs
+float roundedRectSDF(vec2 center, vec2 halfSize, float radius) {
+    return length(max(abs(center) - halfSize + radius, 0.0)) - radius;
+}
+
+void main() {
+    float xScale = gl_ModelViewMatrix[0][0];
+    float yScale = gl_ModelViewMatrix[1][1];
+    float xTranslation = gl_ModelViewMatrix[3][0];
+    float yTranslation = gl_ModelViewMatrix[3][1];
+
+    vec2 newHalfSize = vec2(halfSize.x * xScale, halfSize.y * yScale);
+
+    float newCenterPosY = centerPos.y;
+    if (yScale != 1.0) {
+        newCenterPosY = centerPos.y - (halfSize.y * (yScale - 1));
+    }
+
+    vec2 newCenterPos = vec2((centerPos.x * xScale) + (xTranslation * scaleFactor), newCenterPosY - (yTranslation * scaleFactor));
+
+    float distance = roundedRectSDF(gl_FragCoord.xy - newCenterPos, newHalfSize, max(radius, borderThickness));
+
+    // In testing, keeping the upper bound at 1.0 and letting the lower be changable seemed the most sensible for nice results
+    float smoothed = 1.0 - smoothstep(borderBlur, 1.0, abs(distance / borderThickness));
+    gl_FragColor = color * vec4(1.0, 1.0, 1.0, smoothed);
+}

src/main/resources/production/SkyHanni.1.8.9.main/assets/skyhanni/shaders/rounded_rect_outline.vsh

@@ -0,0 +1,8 @@
+#version 120
+
+varying vec4 color;
+
+void main() {
+    gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex;
+    color = gl_Color;
+}

src/main/resources/production/SkyHanni.1.8.9.main/assets/skyhanni/shaders/rounded_texture.fsh

@@ -0,0 +1,37 @@
+#version 120
+
+uniform float scaleFactor;
+uniform float radius;
+uniform float smoothness;
+uniform vec2 halfSize;
+uniform vec2 centerPos;
+
+uniform sampler2D outTexture;
+
+varying vec2 outTextureCoords;
+varying vec4 outColor;
+
+// From https://www.shadertoy.com/view/WtdSDs
+float roundedRectSDF(vec2 center, vec2 halfSize, float radius) {
+    return length(max(abs(center) - halfSize + radius, 0.0)) - radius;
+}
+
+void main() {
+    float xScale = gl_ModelViewMatrix[0][0];
+    float yScale = gl_ModelViewMatrix[1][1];
+    float xTranslation = gl_ModelViewMatrix[3][0];
+    float yTranslation = gl_ModelViewMatrix[3][1];
+
+    vec2 newHalfSize = vec2(halfSize.x * xScale, halfSize.y * yScale);
+
+    float newCenterPosY = centerPos.y;
+    if (yScale != 1.0) {
+        newCenterPosY = centerPos.y - (halfSize.y * (yScale - 1));
+    }
+
+    vec2 newCenterPos = vec2((centerPos.x * xScale) + (xTranslation * scaleFactor), newCenterPosY - (yTranslation * scaleFactor));
+
+    float distance = roundedRectSDF(gl_FragCoord.xy - newCenterPos, newHalfSize, radius);
+    float smoothed = 1.0 - smoothstep(0.0, smoothness, distance);
+    gl_FragColor = (texture2D(outTexture, outTextureCoords) * outColor) * vec4(1.0, 1.0, 1.0, smoothed);
+}

src/main/resources/production/SkyHanni.1.8.9.main/assets/skyhanni/shaders/rounded_texture.vsh

@@ -0,0 +1,10 @@
+#version 120
+
+varying vec2 outTextureCoords;
+varying vec4 outColor;
+
+void main(){
+    gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex;
+    outColor = gl_Color;
+    outTextureCoords = gl_MultiTexCoord0.st;
+}

src/main/resources/production/SkyHanni.1.8.9.main/assets/skyhanni/shaders/standard_chroma.fsh

@@ -0,0 +1,37 @@
+// Chroma Fragment Shader
+// (Same as textured_chroma.fsh but isn't restricted to textured elements)
+
+#version 120
+
+uniform float chromaSize;
+uniform float timeOffset;
+uniform float saturation;
+uniform bool forwardDirection;
+
+varying vec4 originalColor;
+
+float rgb2b(vec3 rgb) {
+    return max(max(rgb.r, rgb.g), rgb.b);
+}
+
+vec3 hsb2rgb_smooth(vec3 c) {
+    vec3 rgb = clamp(abs(mod(c.x * 6.0 + vec3(0.0, 4.0, 2.0), 6.0) - 3.0) - 1.0, 0.0, 1.0);
+    rgb = rgb * rgb * (3.0 - 2.0 * rgb); // Cubic smoothing
+    return c.z * mix(vec3(1.0), rgb, c.y);
+}
+
+void main() {
+    // Determine the direction chroma moves
+    float fragCoord;
+    if (forwardDirection) {
+        fragCoord = gl_FragCoord.x - gl_FragCoord.y;
+    } else {
+        fragCoord = gl_FragCoord.x + gl_FragCoord.y;
+    }
+
+    // The hue takes in account the position, chroma settings, and time
+    float hue = mod(((fragCoord) / chromaSize) - timeOffset, 1.0);
+
+    // Set the color to use the new hue & original saturation/value/alpha values
+    gl_FragColor = vec4(hsb2rgb_smooth(vec3(hue, saturation, rgb2b(originalColor.rgb))), originalColor.a);
+}