Merge branch 'mc/forge/1.20.4'

Author: MichaelHillcox

.github/workflows/build.yml

@@ -3,8 +3,6 @@ name: Build and Package
 on:
   push:
     branches: [ main ]
-  pull_request:
-    branches: [ main ]
 
 jobs:
   build:
@@ -21,13 +19,3 @@ jobs:
         run: |
           chmod +x ./gradlew
           ./gradlew build
-      - name: Setting mod version
-        run: |
-          cat $GITHUB_WORKSPACE/gradle.properties | grep ^mod_version= >> $GITHUB_ENV
-          cat $GITHUB_WORKSPACE/gradle.properties | grep ^minecraft_version= >> $GITHUB_ENV
-      - name: Create package name
-        run: echo "package_name=Advanced-XRay-$minecraft_version-$mod_version-${{ github.head_ref || 'main' }}-SNAPSHOT-$GITHUB_RUN_NUMBER" >> $GITHUB_ENV
-      - uses: actions/upload-artifact@v2
-        with:
-          name: ${{ env.package_name }}
-          path: build/libs

.github/workflows/release.yml

@@ -3,7 +3,7 @@ name: CI Build & Release
 on:
   push:
     tags:
-      - v*
+      - mc/*/*
 
 jobs:
   build:
@@ -22,4 +22,4 @@ jobs:
           CURSE_DEPLOY_TOKEN: ${{ secrets.CURSE_DEPLOY_TOKEN }}
         run: |
           chmod +x ./gradlew
-          ./gradlew build publish curseforge --stacktrace --no-daemon
+          ./gradlew build publish publishMods --stacktrace --no-daemon

CHANGELOG.md

@@ -1,5 +1,5 @@
-## [2.17.0]
+## [84.0.0]
 
 ### Changed
 
-- Ported to 1.20.1
+- Updated to 1.20.4

build.gradle

@@ -1,28 +1,69 @@
 plugins {
-    id "dev.architectury.loom" version "1.2-SNAPSHOT"
+    id 'idea'
     id 'maven-publish'
-    id "com.matthewprenger.cursegradle" version "1.4.0"
+    id 'net.minecraftforge.gradle' version '[6.0.16,6.2)'
+    id "me.modmuss50.mod-publish-plugin" version "0.4.5"
+    id 'org.spongepowered.mixin' version '0.7.+'
 }
 
-sourceCompatibility = targetCompatibility = compileJava.sourceCompatibility = compileJava.targetCompatibility = 17
+java.toolchain.languageVersion = JavaLanguageVersion.of(17)
 
-def ENV = System.getenv()
-version = "${minecraft_version}-${mod_version}-build.${ENV.GITHUB_RUN_NUMBER ?: 9999}"
-group= "pro.mikey"
-archivesBaseName = "advanced-xray-forge"
+version = mod_version
+group = 'pro.mikey'
 
-loom {
-    silentMojangMappingsLicense()
-
-    forge {
-    }
+base {
+    archivesName = "advanced-xray-forge"
+}
 
-    accessWidenerPath = file("src/main/resources/xray.accesswidener")
+mixin {
+    add sourceSets.main, 'xray.mixins.refmap.json'
+    config 'xray.mixins.json'
 }
 
-repositories {
+minecraft {
+    mappings channel: "official", version: minecraft_version
+
+    copyIdeResources = true
+    // See https://docs.minecraftforge.net/en/latest/advanced/accesstransformers/ for more information.
+    accessTransformer = file('src/main/resources/META-INF/accesstransformer.cfg')
+
+    runs {
+        // applies to all the run configs below
+        configureEach {
+            workingDirectory project.file('run')
+
+            property 'forge.logging.markers', 'REGISTRIES'
+            property 'forge.logging.console.level', 'debug'
+
+            mods {
+                "${mod_id}" {
+                    source sourceSets.main
+                }
+            }
+        }
+
+        client {
+            property 'forge.enabledGameTestNamespaces', mod_id
+        }
+
+        server {
+            property 'forge.enabledGameTestNamespaces', mod_id
+            args '--nogui'
+        }
+
+        gameTestServer {
+            property 'forge.enabledGameTestNamespaces', mod_id
+        }
+
+        data {
+            workingDirectory project.file('run-data')
+            args '--mod', mod_id, '--all', '--output', file('src/generated/resources/'), '--existing', file('src/main/resources/')
+        }
+    }
 }
 
+sourceSets.main.resources { srcDir 'src/generated/resources' }
+
 def replaceProperties = [
     minecraft_version: minecraft_version,
     minecraft_version_range: minecraft_version_range.replace("[%base]", minecraft_version),
@@ -40,10 +81,14 @@ processResources {
 }
 
 dependencies {
-    minecraft "com.mojang:minecraft:${project.minecraft_version}"
-    mappings loom.officialMojangMappings()
+    minecraft "net.minecraftforge:forge:${minecraft_version}-${forge_version}"
+    annotationProcessor 'org.spongepowered:mixin:0.8.5:processor'
+}
 
-    forge "net.minecraftforge:forge:${project.minecraft_version}-${project.forge_version}"
+repositories {
+    maven {
+        url "https://maven.saps.dev/mirror"
+    }
 }
 
 compileJava {
@@ -54,56 +99,75 @@ java {
     withSourcesJar()
 }
 
-jar {
-    from("LICENSE") {
-        rename { "${it}_${project.archivesBaseName}" }
-    }
-
+tasks.named('jar', Jar).configure {
     manifest {
         attributes([
-                "Specification-Title"     : "Advanced XRay",
-                "Specification-Vendor"    : "Advanced XRay",
-                "Specification-Version"   : "1",
-                "Implementation-Title"    : "Advanced XRay",
-                "Implementation-Version"  : version,
-                "Implementation-Vendor"   : "Advanced XRay",
-                "Implementation-Timestamp": new Date().format("yyyy-MM-dd'T'HH:mm:ssZ")
+                'Specification-Title'     : "Advanced XRay",
+                'Specification-Vendor'    : "Advanced XRay Team",
+                'Specification-Version'   : '1', // We are version 1 of ourselves
+                'Implementation-Title'    : project.name,
+                'Implementation-Version'  : project.jar.archiveVersion,
+                'Implementation-Vendor'   : "Advanced XRay Team",
+                'Implementation-Timestamp': new Date().format("yyyy-MM-dd'T'HH:mm:ssZ")
         ])
     }
+
+    finalizedBy 'reobfJar'
 }
 
 publishing {
     publications {
         mavenJava(MavenPublication) {
             artifactId = rootProject.archivesBaseName
-            from components.java
+            artifact jar
         }
     }
 
     repositories {
-        if (ENV.SAPS_TOKEN) {
+        def token = providers.environmentVariable("SAPS_TOKEN");
+        if (token.isPresent()) {
             maven {
                 url "https://maven.saps.dev/releases"
                 credentials {
                     username = "mikeymods"
-                    password = "${ENV.SAPS_TOKEN}"
+                    password = token.get()
                 }
             }
         }
     }
 }
 
-if (ENV.CURSE_DEPLOY_TOKEN) {
+publishMods {
+    dryRun = providers.environmentVariable("CURSE_DEPLOY_TOKEN").getOrNull() == null
+    changelog = file("./CHANGELOG.md").text
+    version = "${mod_version}"
+    type = STABLE
+
     curseforge {
-        apiKey = ENV.CURSE_DEPLOY_TOKEN
-        project {
-            id = project.curse_id
-            releaseType = "release"
-            addGameVersion "Forge"
-            addGameVersion "$minecraft_version"
-            changelog = file("./CHANGELOG.md")
-            changelogType = 'markdown'
-            mainArtifact(remapJar)
-        }
+        accessToken = providers.environmentVariable("CURSE_DEPLOY_TOKEN")
+        projectId = "${curse_id}"
+        minecraftVersions.add("${minecraft_version}")
+        modLoaders.add("forge")
+        displayName = "[FORGE] [${minecraft_version}] ${project.name} ${mod_version}"
+        file = project.tasks.jar.archiveFile
     }
+
+    github {
+        accessToken = providers.environmentVariable("GITHUB_TOKEN")
+        repository = "AdvancedXRay/XRay-Mod"
+        commitish = providers.environmentVariable("GITHUB_SHA").orElse("dryRun")
+        tagName = providers.environmentVariable("GITHUB_REF_NAME").orElse("dryRun")
+
+        file = project.tasks.jar.archiveFile
+    }
+}
+
+sourceSets.each {
+    def dir = layout.buildDirectory.dir("sourcesSets/$it.name")
+    it.output.resourcesDir = dir
+    it.java.destinationDirectory = dir
+}
+
+tasks.register("idePostSync") {
+
 }

gradle.properties

@@ -2,12 +2,13 @@
 # This is required to provide enough memory for the Minecraft decompilation process.
 org.gradle.jvmargs=-Xmx4G
 
-mod_version=2.17.0
-minecraft_version=1.20.1
-minecraft_version_range=[%base],1.20.2
+mod_id=xray
+mod_version=84.0.0
+minecraft_version=1.20.4
+minecraft_version_range=[%base],1.20.5
 
 # Forge
-forge_version=47.0.3
+forge_version=49.0.3
 curse_id=256256
 
 loom.platform=forge

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

settings.gradle

@@ -1,9 +1,10 @@
 pluginManagement {
     repositories {
-        maven { url "https://maven.creeperhost.net/" }
-        maven { url "https://maven.shedaniel.me/" }
         gradlePluginPortal()
+        maven {
+            url "https://maven.saps.dev/mirror"
+        }
     }
 }
 
-rootProject.name = 'Advanced XRay (forge)'
+rootProject.name = 'advanced-xray-forge'

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

@@ -5,10 +5,8 @@
 import net.minecraft.client.resources.language.I18n;
 import net.minecraft.network.chat.Component;
 import net.minecraft.world.entity.player.Player;
-import net.minecraftforge.client.ForgeHooksClient;
 import net.minecraftforge.common.MinecraftForge;
 import net.minecraftforge.event.entity.EntityJoinLevelEvent;
-import net.minecraftforge.event.level.LevelEvent;
 import net.minecraftforge.eventbus.api.IEventBus;
 import net.minecraftforge.fml.ModLoadingContext;
 import net.minecraftforge.fml.config.ModConfig;
@@ -21,6 +19,7 @@
 import pro.mikey.xray.store.GameBlockStore;
 import pro.mikey.xray.utils.BlockData;
 import pro.mikey.xray.xray.Controller;
+import pro.mikey.xray.xray.Events;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -42,6 +41,10 @@ public static void setup() {
         // Keybindings
         MinecraftForge.EVENT_BUS.register(KeyBindings.class);
         MinecraftForge.EVENT_BUS.addListener(ClientController::onGameJoin);
+
+        MinecraftForge.EVENT_BUS.addListener(Events::tickEnd);
+        MinecraftForge.EVENT_BUS.addListener(Events::onWorldRenderLast);
+
     }
 
     private static void onSetup(final FMLCommonSetupEvent event) {

src/main/java/pro/mikey/xray/gui/GuiOverlay.java

@@ -32,5 +32,8 @@ public static void RenderGameOverlayEvent(RenderGuiOverlayEvent event) {
         guiGraphics.blit(CIRCLE, 5, 5, 0f, 0f, 5, 5, 5, 5);
 
         guiGraphics.drawString(Minecraft.getInstance().font, I18n.get("xray.overlay"), 15, 4, 0xffffffff);
+
+        // Reset color
+        RenderSystem.setShaderColor(1F, 1F, 1F, 1F);
     }
 }