Merge OptiGUI 2.3.0-alpha.2

opekope2 · Mar 12, 2024 · c3c02f7 · c3c02f7
2 parents 2f810eb + 54686d3
commit c3c02f7
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 2 deletions.
diff --git a/.github/workflows/publish-release.yml b/.github/workflows/publish-release.yml
@@ -35,7 +35,7 @@ jobs:
           JAVA_VERSION=$(grep java_version gradle.properties | sed "s|java_version=||g")
           echo "JAVA_VERSION=$JAVA_VERSION" >> $GITHUB_OUTPUT
       - name: Publish to GitHub, Modrinth, and CurseForge
-        uses: Kir-Antipov/[email protected]
+        uses: Kir-Antipov/[email protected].0
         with:
           modrinth-id: ${{ vars.MODRINTH_ID }}
           modrinth-token: ${{ secrets.MODRINTH_TOKEN }}

diff --git a/OptiGUI/src/main/kotlin/opekope2/optigui/registry/LoadSelectorRegistry.kt b/OptiGUI/src/main/kotlin/opekope2/optigui/registry/LoadSelectorRegistry.kt
@@ -20,6 +20,7 @@ object LoadSelectorRegistry : Iterable<Pair<String, (String) -> Boolean>> {
      * @return `true` if the registration was successful, `false` if there was a selector or load selector registered
      *   for the given key
      */
+    @JvmStatic
     fun tryRegister(selectorKey: String, selector: (String) -> Boolean): Boolean {
         if (selectorKey in this || selectorKey in SelectorRegistry) return false
 
@@ -34,6 +35,7 @@ object LoadSelectorRegistry : Iterable<Pair<String, (String) -> Boolean>> {
      * @param selectorKey The key (as in key-value pair) to register a load selector for
      * @param selector The load selector instance
      */
+    @JvmStatic
     fun register(selectorKey: String, selector: (String) -> Boolean) {
         if (!tryRegister(selectorKey, selector)) {
             throw IllegalStateException("A selector or load selector for `$selectorKey` has already been registered")

diff --git a/OptiGUI/src/main/kotlin/opekope2/optigui/registry/SelectorRegistry.kt b/OptiGUI/src/main/kotlin/opekope2/optigui/registry/SelectorRegistry.kt
@@ -16,6 +16,7 @@ object SelectorRegistry : Iterable<Pair<String, ISelector>> {
      * @return `true` if the registration was successful, `false` if there was a selector or load selector registered
      *   for the given key
      */
+    @JvmStatic
     fun tryRegister(selectorKey: String, selector: ISelector): Boolean {
         if (selectorKey in this || selectorKey in LoadSelectorRegistry) return false
 
@@ -30,6 +31,7 @@ object SelectorRegistry : Iterable<Pair<String, ISelector>> {
      * @param selectorKey The key (as in key-value pair) to register a selector for
      * @param selector The selector instance
      */
+    @JvmStatic
     fun register(selectorKey: String, selector: ISelector) {
         if (!tryRegister(selectorKey, selector)) {
             throw IllegalStateException("A selector or load selector for `$selectorKey` has already been registered")

diff --git a/gradle.properties b/gradle.properties
@@ -10,7 +10,7 @@ loom_version=1.5-SNAPSHOT
 java_version=17
 ##########################################################################
 # Mod Properties
-mod_version=2.3.0-alpha.1
+mod_version=2.3.0-alpha.2
 maven_group=opekope2.optigui
 ##########################################################################
 # Kotlin Dependencies