Merge OptiGUI 2.3.0-beta.2

Author: opekope2

.github/workflows/build.yml

@@ -11,16 +11,47 @@ on:
         type: boolean
       upload-output:
         type: boolean
+      fast:
+        type: boolean
 
 jobs:
+  prepare-build-matrix:
+    name: Prepare build matrix
+    runs-on: ubuntu-latest
+    steps:
+      - name: Create build matrix
+        id: create-build-matrix
+        env:
+          DEFAULT_MATRIX: '
+            {
+              "os": [
+                "ubuntu-latest",
+                "windows-latest"
+              ]
+            }
+            '
+          FAST_MATRIX: '
+            {
+              "os": [
+                "ubuntu-latest"
+              ]
+            }
+            '
+        run: |
+          if [ "${{ inputs.fast }}" = true ]; then
+            echo "BUILD_MATRIX=$FAST_MATRIX" >> $GITHUB_OUTPUT
+          else
+            echo "BUILD_MATRIX=$DEFAULT_MATRIX" >> $GITHUB_OUTPUT
+          fi
+    outputs:
+      build-matrix: ${{ steps.create-build-matrix.outputs.BUILD_MATRIX }}
+
   build:
     name: Build project
     strategy:
-      matrix:
-        os:
-          - ubuntu-latest
-          - windows-latest
+      matrix: ${{ fromJson(needs.prepare-build-matrix.outputs.build-matrix) }}
     runs-on: ${{ matrix.os }}
+    needs: prepare-build-matrix
     steps:
       - name: Checkout repository
         uses: actions/checkout@v4.1.1
@@ -44,21 +75,21 @@ jobs:
         if: inputs.build-docs
         run: ./gradlew :OptiGUI:dokkaHtml -PjavaSyntax
       - name: Upload build output
-        if: inputs.build-project && inputs.upload-output && matrix.os == 'ubuntu-latest'
+        if: inputs.build-project && inputs.upload-output
         uses: actions/upload-artifact@v4.3.1
         with:
           name: jars
           path: OptiGUI/build/libs/*.jar
           if-no-files-found: error
       - name: Upload documentation output
-        if: inputs.build-docs && inputs.upload-output && matrix.os == 'ubuntu-latest'
+        if: inputs.build-docs && inputs.upload-output
         uses: actions/upload-artifact@v4.3.1
         with:
           name: kdoc
           path: OptiGUI/build/dokka/kotlinHtml
           if-no-files-found: error
       - name: Upload documentation output (Java syntax)
-        if: inputs.build-docs && inputs.upload-output && matrix.os == 'ubuntu-latest'
+        if: inputs.build-docs && inputs.upload-output
         uses: actions/upload-artifact@v4.3.1
         with:
           name: javadoc

.github/workflows/publish-release.yml

@@ -13,6 +13,7 @@ jobs:
       build-project: true
       build-docs: true
       upload-output: true
+      fast: true
 
   publish:
     name: Publish OptiGUI

OptiGUI/src/main/kotlin/opekope2/optigui/util/InteractionUtil.kt

@@ -2,8 +2,6 @@
 
 package opekope2.optigui.util
 
-import net.fabricmc.loader.api.FabricLoader
-import net.fabricmc.loader.api.Version
 import net.minecraft.nbt.NbtCompound
 import opekope2.optigui.interaction.Interaction
 import opekope2.optigui.internal.TextureReplacer
@@ -21,10 +19,6 @@ val interactionData: Interaction.Data?
  */
 fun invalidateCachedReplacement() = TextureReplacer.clearReplacementCache()
 
-// FIXME tech debt
-private val minecraft_1_20_5 =
-    FabricLoader.getInstance().getModContainer("minecraft").get().metadata.version >= Version.parse("1.20.5")
-
 /**
  * Creates an OptiGUI INI from the current interaction data.
  */
@@ -45,14 +39,7 @@ fun inspectInteraction(): String? {
         appendLine()
 
         when {
-            // FIXME tech debt
-            data.blockEntity != null && minecraft_1_20_5 -> {
-                appendLine("# Block entity NBT is not available on Minecraft 1.20.5+")
-                appendLine()
-            }
-
-            // FIXME tech debt
-            data.blockEntity != null && !minecraft_1_20_5 -> {
+            data.blockEntity != null -> {
                 appendLine("# NBT (for more detailed inspection purposes, as there is no selector for NBT):")
                 appendLine("# ${data.blockEntity.createNbt()}")
                 appendLine()

OptiGUI/src/main/resources/fabric.mod.json

@@ -59,7 +59,7 @@
     "fabric-networking-api-v1": "*",
     "fabric-resource-loader-v0": "*",
     "fabric-language-kotlin": ">=$fabric_language_kotlin",
-    "minecraft": ">=$minecraft",
+    "minecraft": ">=$minecraft <1.20.5",
     "java": ">=$java"
   },
   "recommends": {

gradle/libs.versions.toml

@@ -1,7 +1,7 @@
 [versions]
 java = "17" # Don't forget to update *.mixins.json
 kotlin = "1.9.22"
-optigui = "2.3.0-beta.1"
+optigui = "2.3.0-beta.2"
 minecraft = "1.20.2"
 yarn = "1.20.2+build.4"
 fabric-loom = "1.5-SNAPSHOT"