feat: port to 1.21.6

Author: MichaelHillcox

CHANGELOG.md

@@ -1,5 +1,13 @@
-## [21.5.1]
+## [21.6.0]
 
-### Fixed
+### Changed
 
-- Rendering issue causing water and other effects to mutate vertex colours (Thanks to [@cargocats](https://github.com/cargocats) [#303](https://github.com/AdvancedXRay/XRay-Mod/pull/303))
+- Ported to `1.21.6`, `1.21.7`, `1.21.8`
+- Basically rewrote most of the mod to improve performance
+- All data is now stored in the `config/xray` folder instead of being in both the config and an `xray` folder
+    - This means older configs will no longer work
+- Block store has been improved to support categories but this is not yet implemented in the UI
+  - Block store now supports `rgb`, `hsl`, `hex` and `0x` color formats for the `color` field
+  - Support has been added for more scan targets but this is not yet implemented in the UI
+- Reworked the scanning code to hopefully remove lag on scanning large areas
+- Reworked the block rendering to use VBOs per chunk to improve performance

build.gradle

@@ -1,96 +1,100 @@
 plugins {
-    id 'idea'
     id 'java-library'
-    id 'maven-publish'
-    id 'net.neoforged.moddev' version '2.0.78'
+    id 'fabric-loom' version '1.10-SNAPSHOT' apply(false)
+    id 'net.neoforged.moddev' version '2.0.78' apply(false)
     id "me.modmuss50.mod-publish-plugin" version "0.8.4"
 }
 
 tasks.named('wrapper', Wrapper).configure {
     distributionType = Wrapper.DistributionType.BIN
 }
 
-java.toolchain.languageVersion = JavaLanguageVersion.of(21)
-
 version = mod_version
 group = 'pro.mikey'
 
-base {
-    archivesName = "advanced-xray-neoforge"
-}
+java.toolchain.languageVersion = JavaLanguageVersion.of(21)
 
-neoForge {
-    version = project.forge_version
-    accessTransformers = project.files('src/main/resources/META-INF/accesstransformer.cfg')
+allprojects {
+    apply plugin: 'idea'
+    apply plugin: 'java-library'
+    apply plugin: 'maven-publish'
 
-    runs {
-        // applies to all the run configs below
-        configureEach {
-            systemProperty 'forge.logging.markers', 'REGISTRIES'
-            logLevel = org.slf4j.event.Level.DEBUG
-        }
+    version = mod_version
+    java.toolchain.languageVersion = JavaLanguageVersion.of(21)
 
-        client {
-            client()
-            systemProperty 'neoforge.enabledGameTestNamespaces', project.mod_id
-        }
+    tasks.withType(JavaCompile).configureEach {
+        options.encoding = 'UTF-8'
     }
 
-    mods {
-        "${mod_id}" {
-            sourceSet(sourceSets.main)
+    idea {
+        module {
+            downloadSources = true
+            downloadJavadoc = true
         }
     }
-}
 
-def replaceProperties = [
-    minecraft_version: minecraft_version,
-    minecraft_version_range: minecraft_version_range.replace("[%base]", minecraft_version),
-    forge_version_range: forge_version_range,
-    version: version,
-]
+//    jar {
+//        from(rootProject.file("LICENSE").toString()) {
+//            rename { "${it}_${project.archivesBaseName}" }
+//        }
+//    }
+}
 
-processResources {
-    inputs.properties replaceProperties
+subprojects {
+    base {
+        archivesName = "advanced-xray-$project.name"
+    }
 
-    filesMatching("META-INF/neoforge.mods.toml") {
-        expand replaceProperties
+    repositories {
+        maven {
+            url "https://libraries.minecraft.net"
+            content {
+                includeModule("org.lwjgl", "lwjgl-freetype")
+            }
+        }
     }
-}
 
-configurations {
-    runtimeClasspath.extendsFrom localRuntime
-}
+    if (project.name != "common") {
+        tasks.withType(JavaCompile).configureEach {
+            if (!it.name.toLowerCase().contains("test")) {
+                source(project(":common").sourceSets.main.allSource)
+            }
+        }
 
-dependencies {
-}
+        tasks.withType(Javadoc).configureEach {
+            source(project(":common").sourceSets.main.allJava)
+        }
 
-repositories {
-    maven {
-        url "https://maven.neoforged.net/releases"
+        processResources {
+            from project(":common").sourceSets.main.resources
+        }
     }
-}
 
-java {
-    withSourcesJar()
-}
+    def replaceProperties = [
+            minecraft_version: minecraft_version,
+            minecraft_version_range: minecraft_version_range.replace("[%base]", minecraft_version),
+            forge_version_range: forge_version_range,
+            version: version,
+    ]
 
-publishing {
-    publications {
-        mavenJava(MavenPublication) {
-            artifactId = rootProject.archivesBaseName
-            from components.java
+    processResources {
+        inputs.properties replaceProperties
+
+        filesMatching(["META-INF/neoforge.mods.toml", "fabric.mod.json", "META-INF/mods.toml"]) {
+            expand replaceProperties
         }
     }
 
-    repositories {
-        def token = providers.environmentVariable("SAPS_TOKEN");
-        if (token.isPresent()) {
-            maven {
-                url "https://maven.saps.dev/releases"
-                credentials {
-                    username = "mikeymods"
-                    password = token.get()
+    publishing {
+        repositories {
+            def token = providers.environmentVariable("SAPS_TOKEN");
+            if (token.isPresent()) {
+                maven {
+                    url "https://maven.saps.dev/releases"
+                    credentials {
+                        username = "mikeymods"
+                        password = token.get()
+                    }
                 }
             }
         }
@@ -103,13 +107,28 @@ publishMods {
     version = "${mod_version}"
     type = STABLE
 
-    curseforge {
+    def createOptions = (String platform, String taskName) -> {
+        publishOptions {
+            file = project.provider { project(":$platform").tasks[taskName] }.flatMap { it.archiveFile }
+            displayName = "[${platform.toUpperCase()}] Advanced XRay ${mod_version}"
+            modLoaders.add(platform.toLowerCase())
+        }
+    }
+
+    def curseForgeOptions = curseforgeOptions {
         accessToken = providers.environmentVariable("CURSE_DEPLOY_TOKEN")
-        projectId = "${curse_id}"
         minecraftVersions.add("${minecraft_version}")
-        modLoaders.add("neoforge")
-        displayName = "[NEOFORGE] [${minecraft_version}] ${project.name} ${mod_version}"
-        file = project.tasks.jar.archiveFile
+        javaVersions.add(JavaVersion.VERSION_21)
+    }
+
+    curseforge("curseforgeNeoforge") {
+        from(curseForgeOptions, createOptions("neoforge", "jar"))
+        projectId = "256256"
+    }
+
+    curseforge("curseforgeFabric") {
+        from(curseForgeOptions, createOptions("fabric", "remapJar"))
+        projectId = "444663"
     }
 
     github {
@@ -118,17 +137,7 @@ publishMods {
         commitish = providers.environmentVariable("GITHUB_SHA").orElse("dryRun")
         tagName = providers.environmentVariable("GITHUB_REF_NAME").orElse("dryRun")
 
-        file = project.tasks.jar.archiveFile
+        file = project.provider { project(":neoforge").tasks.jar }.flatMap { it.archiveFile }
+        additionalFiles.from project.provider { project(":fabric").tasks.remapJar }.flatMap { it.archiveFile }
     }
-}
-
-tasks.withType(JavaCompile).configureEach {
-    options.encoding = 'UTF-8'
-}
-
-idea {
-    module {
-        downloadSources = true
-        downloadJavadoc = true
-    }
-}
+}

common/build.gradle

@@ -0,0 +1,30 @@
+plugins {
+    id 'fabric-loom'
+}
+
+loom {
+    accessWidenerPath = project(":common").file("src/main/resources/xray.accesswidener")
+}
+
+dependencies {
+    minecraft "com.mojang:minecraft:${project.minecraft_version}"
+    mappings loom.officialMojangMappings()
+
+    testImplementation platform('org.junit:junit-bom:5.10.3')
+    testImplementation 'org.junit.jupiter:junit-jupiter'
+
+    compileOnly group: 'org.spongepowered', name: 'mixin', version: '0.8.5'
+}
+
+test {
+    useJUnitPlatform()
+}
+
+repositories {
+    maven {
+        url = "https://repo.spongepowered.org/repository/maven-public/"
+        content {
+            includeGroup "org.spongepowered"
+        }
+    }
+}

common/src/main/java/pro/mikey/xray/ClientController.java

@@ -0,0 +1,17 @@
+package pro.mikey.xray;
+
+import net.minecraft.client.resources.language.I18n;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import pro.mikey.xray.core.ScanController;
+
+public class ClientController {
+    private static final Logger LOGGER = LoggerFactory.getLogger(ClientController.class);
+
+    public static void onSetup() {
+        LOGGER.debug(I18n.get("xray.debug.init"));
+        XRay.config().load();
+
+        ScanController.INSTANCE.init();
+    }
+}