Skip to content

Commit cf27a6f

Browse files
nextdayynextdayy
committed
fix build (hopefully)
1 parent d52bd00 commit cf27a6f

File tree

5 files changed

+24
-21
lines changed

5 files changed

+24
-21
lines changed

‎gradle/libs.versions.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ kotlin = "2.0.20"
66
kotlinx-coroutines = "1.8.1"
77
kotlinx-atomicfu = "0.24.0"
88
fabric-language-kotlin = "1.12.2+kotlin.2.0.20"
9-
polyui = "1.7.26"
9+
polyui = "1.7.28"
1010
annotations = "24.1.0"
1111
hypixel-modapi = "1.0"
1212
hypixel-data = "0.1.2" # Dep of hypixel-modapi

‎modules/config-impl/api/config-impl.api‎

Lines changed: 17 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ public abstract class org/polyfrost/oneconfig/api/config/v1/Config {
1212
protected fun getProperty (Ljava/lang/String;)Lorg/polyfrost/oneconfig/api/config/v1/Property;
1313
public fun getTree ()Lorg/polyfrost/oneconfig/api/config/v1/Tree;
1414
protected fun hideIf (Ljava/lang/String;Ljava/lang/String;)V
15+
protected fun hideIf (Ljava/lang/String;Ljava/util/function/BooleanSupplier;)V
1516
protected fun loadFrom (Ljava/lang/String;)V
1617
protected fun loadFrom (Ljava/nio/file/Path;)V
1718
protected fun makeTree (Ljava/lang/String;)Lorg/polyfrost/oneconfig/api/config/v1/Tree;
@@ -55,27 +56,27 @@ public final class org/polyfrost/oneconfig/api/config/v1/ConfigManager {
5556
public class org/polyfrost/oneconfig/api/config/v1/KtConfig : org/polyfrost/oneconfig/api/config/v1/Config {
5657
public fun <init> (Ljava/lang/String;Ljava/lang/String;Lorg/polyfrost/oneconfig/api/config/v1/Config$Category;Ljava/lang/String;)V
5758
public synthetic fun <init> (Ljava/lang/String;Ljava/lang/String;Lorg/polyfrost/oneconfig/api/config/v1/Config$Category;Ljava/lang/String;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
58-
protected final synthetic fun color (Lorg/polyfrost/polyui/color/PolyColor;Ljava/lang/String;Ljava/lang/String;)Lorg/polyfrost/oneconfig/api/config/v1/KtConfig$Provider;
59-
public static synthetic fun color$default (Lorg/polyfrost/oneconfig/api/config/v1/KtConfig;Lorg/polyfrost/polyui/color/PolyColor;Ljava/lang/String;Ljava/lang/String;ILjava/lang/Object;)Lorg/polyfrost/oneconfig/api/config/v1/KtConfig$Provider;
60-
protected final synthetic fun dropdown ([Ljava/lang/String;ILjava/lang/String;Ljava/lang/String;)Lorg/polyfrost/oneconfig/api/config/v1/KtConfig$Provider;
61-
public static synthetic fun dropdown$default (Lorg/polyfrost/oneconfig/api/config/v1/KtConfig;[Ljava/lang/String;ILjava/lang/String;Ljava/lang/String;ILjava/lang/Object;)Lorg/polyfrost/oneconfig/api/config/v1/KtConfig$Provider;
59+
protected final synthetic fun color (Lorg/polyfrost/polyui/color/PolyColor;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Lorg/polyfrost/oneconfig/api/config/v1/KtConfig$Provider;
60+
public static synthetic fun color$default (Lorg/polyfrost/oneconfig/api/config/v1/KtConfig;Lorg/polyfrost/polyui/color/PolyColor;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;ILjava/lang/Object;)Lorg/polyfrost/oneconfig/api/config/v1/KtConfig$Provider;
61+
protected final synthetic fun dropdown ([Ljava/lang/String;ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Lorg/polyfrost/oneconfig/api/config/v1/KtConfig$Provider;
62+
public static synthetic fun dropdown$default (Lorg/polyfrost/oneconfig/api/config/v1/KtConfig;[Ljava/lang/String;ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;ILjava/lang/Object;)Lorg/polyfrost/oneconfig/api/config/v1/KtConfig$Provider;
6263
protected final fun getProperty (Lkotlin/reflect/KProperty;)Lorg/polyfrost/oneconfig/api/config/v1/Property;
63-
protected final synthetic fun keybind (Lorg/polyfrost/polyui/input/KeyBinder$Bind;Ljava/lang/String;Ljava/lang/String;)Lorg/polyfrost/oneconfig/api/config/v1/KtConfig$Provider;
64-
public static synthetic fun keybind$default (Lorg/polyfrost/oneconfig/api/config/v1/KtConfig;Lorg/polyfrost/polyui/input/KeyBinder$Bind;Ljava/lang/String;Ljava/lang/String;ILjava/lang/Object;)Lorg/polyfrost/oneconfig/api/config/v1/KtConfig$Provider;
64+
protected final synthetic fun keybind (Lorg/polyfrost/polyui/input/KeyBinder$Bind;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Lorg/polyfrost/oneconfig/api/config/v1/KtConfig$Provider;
65+
public static synthetic fun keybind$default (Lorg/polyfrost/oneconfig/api/config/v1/KtConfig;Lorg/polyfrost/polyui/input/KeyBinder$Bind;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;ILjava/lang/Object;)Lorg/polyfrost/oneconfig/api/config/v1/KtConfig$Provider;
6566
protected final fun makeTree (Ljava/lang/String;)Lorg/polyfrost/oneconfig/api/config/v1/Tree;
66-
protected final synthetic fun radiobutton ([Ljava/lang/String;ILjava/lang/String;Ljava/lang/String;)Lorg/polyfrost/oneconfig/api/config/v1/KtConfig$Provider;
67-
public static synthetic fun radiobutton$default (Lorg/polyfrost/oneconfig/api/config/v1/KtConfig;[Ljava/lang/String;ILjava/lang/String;Ljava/lang/String;ILjava/lang/Object;)Lorg/polyfrost/oneconfig/api/config/v1/KtConfig$Provider;
68-
protected final synthetic fun slider (FFFLjava/lang/String;Ljava/lang/String;)Lorg/polyfrost/oneconfig/api/config/v1/KtConfig$Provider;
69-
public static synthetic fun slider$default (Lorg/polyfrost/oneconfig/api/config/v1/KtConfig;FFFLjava/lang/String;Ljava/lang/String;ILjava/lang/Object;)Lorg/polyfrost/oneconfig/api/config/v1/KtConfig$Provider;
70-
protected final synthetic fun switch (ZLjava/lang/String;Ljava/lang/String;)Lorg/polyfrost/oneconfig/api/config/v1/KtConfig$Provider;
71-
public static synthetic fun switch$default (Lorg/polyfrost/oneconfig/api/config/v1/KtConfig;ZLjava/lang/String;Ljava/lang/String;ILjava/lang/Object;)Lorg/polyfrost/oneconfig/api/config/v1/KtConfig$Provider;
72-
protected final synthetic fun text (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Lorg/polyfrost/oneconfig/api/config/v1/KtConfig$Provider;
73-
public static synthetic fun text$default (Lorg/polyfrost/oneconfig/api/config/v1/KtConfig;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;ILjava/lang/Object;)Lorg/polyfrost/oneconfig/api/config/v1/KtConfig$Provider;
67+
protected final synthetic fun radiobutton ([Ljava/lang/String;ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Lorg/polyfrost/oneconfig/api/config/v1/KtConfig$Provider;
68+
public static synthetic fun radiobutton$default (Lorg/polyfrost/oneconfig/api/config/v1/KtConfig;[Ljava/lang/String;ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;ILjava/lang/Object;)Lorg/polyfrost/oneconfig/api/config/v1/KtConfig$Provider;
69+
protected final synthetic fun slider (FFFLjava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Lorg/polyfrost/oneconfig/api/config/v1/KtConfig$Provider;
70+
public static synthetic fun slider$default (Lorg/polyfrost/oneconfig/api/config/v1/KtConfig;FFFLjava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;ILjava/lang/Object;)Lorg/polyfrost/oneconfig/api/config/v1/KtConfig$Provider;
71+
protected final synthetic fun switch (ZLjava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Lorg/polyfrost/oneconfig/api/config/v1/KtConfig$Provider;
72+
public static synthetic fun switch$default (Lorg/polyfrost/oneconfig/api/config/v1/KtConfig;ZLjava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;ILjava/lang/Object;)Lorg/polyfrost/oneconfig/api/config/v1/KtConfig$Provider;
73+
protected final synthetic fun text (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Lorg/polyfrost/oneconfig/api/config/v1/KtConfig$Provider;
74+
public static synthetic fun text$default (Lorg/polyfrost/oneconfig/api/config/v1/KtConfig;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;ILjava/lang/Object;)Lorg/polyfrost/oneconfig/api/config/v1/KtConfig$Provider;
7475
}
7576

7677
protected final class org/polyfrost/oneconfig/api/config/v1/KtConfig$Provider : kotlin/properties/PropertyDelegateProvider {
77-
public fun <init> (Ljava/lang/Object;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Class;Ljava/lang/Class;Lkotlin/jvm/functions/Function1;)V
78-
public synthetic fun <init> (Ljava/lang/Object;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Class;Ljava/lang/Class;Lkotlin/jvm/functions/Function1;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
78+
public fun <init> (Ljava/lang/Object;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Class;Ljava/lang/Class;Lkotlin/jvm/functions/Function1;)V
79+
public synthetic fun <init> (Ljava/lang/Object;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Class;Ljava/lang/Class;Lkotlin/jvm/functions/Function1;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
7980
public synthetic fun provideDelegate (Ljava/lang/Object;Lkotlin/reflect/KProperty;)Ljava/lang/Object;
8081
public fun provideDelegate (Lorg/polyfrost/oneconfig/api/config/v1/KtConfig;Lkotlin/reflect/KProperty;)Lkotlin/properties/ReadWriteProperty;
8182
}

‎modules/hud/api/hud.api‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ public abstract class org/polyfrost/oneconfig/api/hud/v1/Hud : org/polyfrost/one
1111
public final fun get ()Lorg/polyfrost/polyui/component/Drawable;
1212
public final fun getHidden ()Z
1313
public final fun getHud ()Lorg/polyfrost/polyui/component/Drawable;
14-
public abstract fun id ()Ljava/lang/String;
14+
public fun id ()Ljava/lang/String;
1515
public fun initialize ()V
1616
public final fun isReal ()Z
1717
public final fun make (Lorg/polyfrost/oneconfig/api/config/v1/Tree;)Lorg/polyfrost/oneconfig/api/hud/v1/Hud;
@@ -47,7 +47,7 @@ public final class org/polyfrost/oneconfig/api/hud/v1/Hud$Category$Companion {
4747

4848
public final class org/polyfrost/oneconfig/api/hud/v1/HudManager {
4949
public static final field INSTANCE Lorg/polyfrost/oneconfig/api/hud/v1/HudManager;
50-
public final fun getPanel ()Lorg/polyfrost/polyui/component/impl/Block;
50+
public final fun getPanel ()Lorg/polyfrost/polyui/component/Drawable;
5151
public final fun getPanelExists ()Z
5252
public final fun getPanelOpen ()Z
5353
public final fun getSlinex ()F
@@ -69,7 +69,7 @@ public abstract class org/polyfrost/oneconfig/api/hud/v1/LegacyHud : org/polyfro
6969
protected final fun createLegacy ()Lorg/polyfrost/polyui/component/Drawable;
7070
public abstract fun getHeight ()F
7171
public abstract fun getWidth ()F
72-
public abstract fun render (Lorg/polyfrost/universal/UMatrixStack;FF)V
72+
public abstract fun render (Lorg/polyfrost/universal/UMatrixStack;FFFF)V
7373
public abstract fun setHeight (F)V
7474
public abstract fun setWidth (F)V
7575
}

‎modules/hud/src/main/kotlin/org/polyfrost/oneconfig/api/hud/v1/HudManager.kt‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,7 @@ object HudManager {
9292

9393
private lateinit var hudsPage: Component
9494
lateinit var panel: Drawable
95+
private set
9596

9697
@Suppress("INVISIBLE_MEMBER", "INVISIBLE_REFERENCE")
9798
@kotlin.internal.InlineOnly
@@ -241,7 +242,7 @@ object HudManager {
241242

242243
internal fun canAutoOpen(): Boolean = !polyUI.master.hasChildIn(polyUI.size.x - panel.width - 34f, 0f, panel.width, polyUI.size.y)
243244

244-
fun makePanel(): Drawable {
245+
private fun makePanel(): Drawable {
245246
hudsPage = HudsPage(hudProviders.values)
246247
return Block(
247248
Block(

‎modules/ui/api/ui.api‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -158,6 +158,7 @@ public final class org/polyfrost/oneconfig/api/ui/v1/keybind/OCKeybindHelper : o
158158
public fun <init> ()V
159159
public fun build ()Lorg/polyfrost/polyui/input/KeyBinder$Bind;
160160
public static final fun builder ()Lorg/polyfrost/oneconfig/api/ui/v1/keybind/OCKeybindHelper;
161+
public final fun inScreens ()Lorg/polyfrost/oneconfig/api/ui/v1/keybind/OCKeybindHelper;
161162
public final fun register ()Lorg/polyfrost/polyui/input/KeyBinder$Bind;
162163
public final fun register (Lorg/polyfrost/polyui/input/KeyBinder$Bind;)Lorg/polyfrost/polyui/input/KeyBinder$Bind;
163164
}

0 commit comments

Comments
 (0)