WIP: Port BlockUI to Minecraft 26.2

build.gradle

@@ -2,21 +2,7 @@ tableau {
     project {
         group = "com.ldtteam"
         publisher = "LDTTeam"
-        modId = "domum_ornamentum"
-    }
-
-    sourceSets {
-        api {
-            isPartOfPrimaryJar = true
-            neogradle {
-                isModSource = true
-            }
-        }
-        main {
-            dependencies {
-                implementation sourceSets.named('api')
-            }
-        }
+        modId = "blockui"
     }
 
     maven {
@@ -27,4 +13,53 @@ tableau {
             usingGit()
         })
     }
-}
+}
+
+dependencies {
+    testImplementation 'junit:junit:4.13.2'
+}
+
+// NeoGradle 7.1.x does not strip @OnlyIn annotations that Vineflower adds back
+// during decompilation for MC 26.x. The NeoForm and UserDev patches expect them
+// removed before nested type declarations. We also restore blank-line separators.
+tasks.matching { it.name == 'neoFormPatch' }.configureEach {
+    doFirst {
+        def decompileJar = project.file("build/neoForm/neoFormJoined26.2-2/steps/decompile/outputs.jar")
+        if (!decompileJar.exists()) return
+
+        def workDir = new File(project.buildDir, "onlyin-fix")
+        workDir.deleteDir()
+        workDir.mkdirs()
+
+        def zipTree = project.zipTree(decompileJar)
+        def javaFiles = []
+        zipTree.visit { details ->
+            def dest = new File(workDir, details.path)
+            if (details.directory) {
+                return
+            }
+            if (!dest.name.endsWith('.java')) {
+                return
+            }
+
+            dest.parentFile.mkdirs()
+            details.copyTo(dest)
+            javaFiles << dest
+        }
+
+        javaFiles.each { f ->
+            def text = f.text
+            def fixed = text.replaceAll(
+                /(?m)^( +)@OnlyIn\s*\([^)]*\)\n(\1(?:public |private |protected )?(?:static |final |abstract )?(?:class |interface |record |enum |@interface ))/,
+                '$2')
+            fixed = fixed.replaceAll(
+                /(?m)^(\}+)\n( +(?:public|private|protected)\s+(?:static\s+)?(?:class |record |interface |enum ))/,
+                '$1\n\n$2')
+            if (fixed != text) f.text = fixed
+        }
+
+        def ant = new groovy.ant.AntBuilder()
+        ant.jar(destfile: decompileJar.absolutePath, basedir: workDir, update: true)
+        workDir.deleteDir()
+    }
+}

gradle.properties

@@ -1,25 +1,34 @@
+org.gradle.jvmargs=-Xmx3G
 org.gradle.daemon=true
 org.gradle.parallel=true
 org.gradle.caching=true
-org.gradle.configuration-cache=true
+org.gradle.configuration-cache=false
 
-local.version=0.0.1
+modId=blockui
+modGroup=com.ldtteam
+local.version=0.0.1-local
 
 javaVersion=25
+useJavaToolChains=true
 
-modId=blockui
-type=MOD
-description=XML Based Minecraft UI Library
+# Minecraft and NeoForge
+minecraft.version=26.2
+minecraft.additionalVersions=
+neoforge.version=26.2.0.66
 
-#The currently running forge.
-neoforge.version=26.1.0.0-alpha.11+snapshot-7
+fml_range=[11,)
+neoforge_range=[26.2,)
+minecraft_range=[26.2, 27)
+#Semicolon seperated list of mc versions, which are marked as compatible on curseforge
+additionalMinecraftVersions=
 
-curseId=522992
-usesCurse=true
+githubUrl=https://github.com/ldtteam/BlockUI
+gitUrl=https://github.com/ldtteam/BlockUI.git
+gitConnectUrl=https://github.com/ldtteam/BlockUI.git
+projectUrl=https://github.com/ldtteam/BlockUI
 
-### Minecraft
-minecraft.version=26.1-snapshot-7
-minecraft.additionalVersions=
+curse.id=522992
+usesCurse=true
 
 useDefaultTestSystem=true
 runtimeSourceSets=main

settings.gradle

@@ -10,7 +10,7 @@ pluginManagement {
 }
 
 plugins {
-    id 'com.ldtteam.tableau' version '0.0.87'
+    id 'com.ldtteam.tableau' version '0.0.96-j21.0'
     id 'org.gradle.toolchains.foojay-resolver-convention' version '1.0.0'
 }
 
@@ -19,5 +19,4 @@ rootProject.name = 'blockui'
 features {
     usesGit = true
     usesCurse = true
-    usesParchment = true
-}
+}