CC2 - Switch to RenderLevelStage event, bump min Forge version

Author: robotgryphon

.github/workflows/ci-tests-nightly.yml

@@ -106,10 +106,16 @@ jobs:
 
       - name: Generate Resources
         run: ./gradlew runData
+        env:
+          CM_RELEASE: false
+          CM_SEMVER_VERSION: ${{ needs.vars.outputs.version }}
+          CM_BUILD_NUM: "0"
 
       - name: Publish gradle nightly jar
         run: ./gradlew publishNightlyPublicationToGitHubPackagesRepository
         env:
           CM_RELEASE: false
+          CM_SEMVER_VERSION: ${{ needs.vars.outputs.version }}
+          CM_BUILD_NUM: "0"
           GITHUB_ACTOR: ${{ secrets.GITHUB_ACTOR }}
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/tagged-release.yml

@@ -2,12 +2,6 @@
 name: Latest Tag
 
 on:
-  push:
-    tags:
-      - v*
-    paths-ignore:
-      - 'README.md'
-      - LICENSE
   workflow_dispatch:
 
 jobs:
@@ -19,6 +13,8 @@ jobs:
       cf_project: ${{steps.cf_project.outputs.value }}
       mod_version: ${{steps.mod_version.outputs.value }}
       mod_id: ${{steps.mod_id.outputs.value }}
+      version: ${{steps.version.outputs.version }}
+
     steps:
       - name: Checkout
         uses: actions/checkout@v2
@@ -51,6 +47,12 @@ jobs:
           path: './gradle.properties'
           property: 'mod_id'
 
+      - name: Semver Version
+        id: version
+        run: |
+          version=$(echo "${{steps.current.outputs.tag}}" | cut -dv -f2)
+          echo "::set-output name=version::$version"
+
   changelog:
     name: Generate Changelog (tags)
     runs-on: ubuntu-20.04
@@ -136,6 +138,8 @@ jobs:
         run: ./gradlew build -x test
         env:
           CM_RELEASE: true
+          CM_SEMVER_VERSION: ${{ needs.vars.outputs.version }}
+          CM_BUILD_NUM: "0"
           GITHUB_ACTOR: ${{ secrets.GITHUB_ACTOR }}
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
@@ -159,7 +163,7 @@ jobs:
           path: changelog
       - run: cat changelog/CHANGELOG.md
 
-  release:
+  release-github:
     name: Make Releases
     runs-on: ubuntu-20.04
     needs: [changelog, vars, jar]
@@ -191,6 +195,25 @@ jobs:
             build-out/${{ needs.vars.outputs.mod_id }}-${{ needs.vars.outputs.mod_version }}.jar
             build-out/${{ needs.vars.outputs.mod_id }}-${{ needs.vars.outputs.mod_version }}-api.jar
 
+  release-cf:
+    name: Make Releases
+    runs-on: ubuntu-20.04
+    needs: [changelog, vars, jar]
+    steps:
+      - name: Download Build Results
+        uses: actions/download-artifact@v2
+        with:
+          name: libs
+          path: build-out
+      - name: Download Changelog Results
+        uses: actions/download-artifact@v2
+        with:
+          name: out
+          path: changelog
+
+      - name: Load Changelog File
+        id: changelog
+        run: echo ::set-output name=changelog::$(cat changelog/CHANGELOG.md)
       - name: Full File
         id: filename
         run: echo "::set-output name=fullpath::build-out/${{ needs.vars.outputs.mod_id }}-${{ needs.vars.outputs.mod_version }}.jar"
@@ -204,10 +227,10 @@ jobs:
           file_path: ${{ steps.filename.outputs.fullpath }}
           changelog: ${{ steps.changelog.outputs.changelog }}
           changelog_type: markdown
-          game_versions: java:Java 8,Forge
+          game_versions: java:Java 17,Forge
           release_type: ${{ needs.vars.outputs.release_type }}
 
-  publishMaven:
+  release-gh-packages:
     name: Maven Release (GH Packages)
     runs-on: ubuntu-20.04
     needs: [changelog, vars, jar]
@@ -243,5 +266,7 @@ jobs:
         run: ./gradlew publishMavenPublicationToGitHubPackagesRepository -x test
         env:
           CM_RELEASE: "true"
+          CM_SEMVER_VERSION: ${{ needs.vars.outputs.version }}
+          CM_BUILD_NUM: "0"
           GITHUB_ACTOR: ${{ secrets.GITHUB_ACTOR }}
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

build.gradle

@@ -19,36 +19,8 @@ plugins {
 
 apply plugin: "net.minecraftforge.gradle"
 
-def semver = { ->
-    try {
-        def code = new ByteArrayOutputStream()
-        exec {
-            commandLine 'git', 'describe', '--tags', '--match', 'v*'
-            standardOutput = code
-        }
-
-        return code.toString().trim().substring(1).split('-')[0]
-    }
-    catch (ignored) {
-        return "2.0.0";
-    }
-}
-
-def buildNumber = { ->
-    try {
-        def code = new ByteArrayOutputStream()
-        exec {
-            commandLine 'git', 'describe', '--tags', '--match', 'v*'
-            standardOutput = code
-        }
-
-        return Integer.parseInt(code.toString().trim().split('-')[1])
-    }
-    catch (ignored) {
-        return 0;
-    }
-}
-
+def semver = System.getenv("CM_SEMVER_VERSION")
+def buildNumber = System.getenv("CM_BUILD_NUM")
 def nightlyVersion = "${semver}.${buildNumber}"
 def isRelease = (System.getenv("CM_RELEASE") ?: "false").equalsIgnoreCase("true")
 

gradle.properties

@@ -4,7 +4,7 @@ org.gradle.jvmargs=-Xmx3G
 org.gradle.daemon=false
 
 minecraft_version=1.18.2
-forge_version=40.0.18
+forge_version=40.1.68
 
 mod_id=compactcrafting
 

src/main/java/dev/compactmods/crafting/client/ClientEventHandler.java

@@ -22,6 +22,7 @@
 import net.minecraft.world.phys.Vec3;
 import net.minecraftforge.api.distmarker.Dist;
 import net.minecraftforge.client.event.RenderLevelLastEvent;
+import net.minecraftforge.client.event.RenderLevelStageEvent;
 import net.minecraftforge.event.TickEvent;
 import net.minecraftforge.eventbus.api.SubscribeEvent;
 import net.minecraftforge.fml.common.Mod;
@@ -47,18 +48,20 @@ public static void onTick(final TickEvent.ClientTickEvent evt) {
     }
 
     @SubscribeEvent
-    public static void onWorldRender(final RenderLevelLastEvent event) {
+    public static void onWorldRender(final RenderLevelStageEvent event) {
         final Minecraft mc = Minecraft.getInstance();
 
         if (mc.level == null)
             return;
 
-        doProjectorRender(event, mc);
-        doFieldPreviewRender(event, mc);
+        if(event.getStage().equals(RenderLevelStageEvent.Stage.AFTER_PARTICLES)) {
+            doProjectorRender(event, mc);
+            doFieldPreviewRender(event, mc);
+        }
     }
 
     @Nonnull
-    private static void doFieldPreviewRender(RenderLevelLastEvent event, Minecraft mc) {
+    private static void doFieldPreviewRender(RenderLevelStageEvent event, Minecraft mc) {
         final Camera mainCamera = mc.gameRenderer.getMainCamera();
         final HitResult hitResult = mc.hitResult;
 
@@ -99,7 +102,7 @@ private static void doFieldPreviewRender(RenderLevelLastEvent event, Minecraft m
         buffers.endBatch();
     }
 
-    private static void doProjectorRender(RenderLevelLastEvent event, Minecraft mc) {
+    private static void doProjectorRender(RenderLevelStageEvent event, Minecraft mc) {
         mc.player.getCapability(CCCapabilities.TEMP_PROJECTOR_RENDERING)
                 .ifPresent(render -> render.render(event.getPoseStack()));
     }

src/main/resources/META-INF/mods.toml

@@ -25,7 +25,7 @@ Based off of the Compact Machines mod pre-1.16.
     # Does this dependency have to exist - if not, ordering below must be specified
     mandatory=true #mandatory
     # The version range of the dependency
-    versionRange="[40,41)" #mandatory
+    versionRange="[40.1.67,41)" #mandatory
     # An ordering relationship for the dependency - BEFORE or AFTER required if the relationship is not mandatory
     ordering="NONE"
     # Side this dependency is applied on - BOTH, CLIENT or SERVER