Merge branch '1.20.1/dev' into 1.21.1/dev

Author: Jozufozu

.editorconfig

@@ -37,3 +37,16 @@ ij_java_else_on_new_line = false
 ij_java_class_count_to_use_import_on_demand = 99
 ij_java_names_count_to_use_import_on_demand = 99
 ij_java_imports_layout = $*, |, java.**, |, javax.**, |, org.**, |, com.**, |, *
+
+[*.ts]
+indent_size = 2
+ij_javascript_use_semicolon_after_statement = true
+ij_javascript_force_semicolon_style = true
+ij_javascript_space_before_for_semicolon = false
+ij_javascript_enforce_trailing_comma = whenmultiline
+ij_javascript_force_quote_style = true
+ij_javascript_use_double_quotes = true
+
+[*.css]
+indent_size = 2
+

.github/workflows/build.yml

@@ -23,14 +23,11 @@ jobs:
           restore-keys: "${{ runner.os }}-gradle-"
 
       - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@v4.2.0
+        uses: gradle/actions/setup-gradle@v4
         with:
           gradle-home-cache-cleanup: true
           cache-read-only: ${{ !endsWith(github.ref_name, '/dev') }}
 
-      - name: Validate Gradle Wrapper Integrity
-        uses: gradle/wrapper-validation-action@v2
-
       - name: Build
         # Doesn't actually publish, as no secrets are passed in, just makes sure that publishing works
         # Also generate the mod jars for the test job

.github/workflows/docs.yml

@@ -0,0 +1,60 @@
+name: Deploy VitePress site to Pages
+
+on:
+  push:
+    branches: [ "1.20.1/dev" ]
+  workflow_dispatch:
+
+permissions:
+  contents: read
+  pages: write
+  id-token: write
+
+concurrency:
+  group: pages
+  cancel-in-progress: false
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    defaults:
+      run:
+        working-directory: docs/
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+      - name: Install pnpm
+        uses: pnpm/action-setup@v4
+        with:
+          version: 10
+      - name: Setup Node
+        uses: actions/setup-node@v4
+        with:
+          node-version: 20
+          cache: pnpm
+          cache-dependency-path: docs/pnpm-lock.yaml
+      - name: Setup Pages
+        uses: actions/configure-pages@v4
+      - name: Install dependencies
+        run: pnpm install --frozen-lockfile
+      - name: Build with VitePress
+        run: pnpm run build
+      - name: Upload artifact
+        uses: actions/upload-pages-artifact@v3
+        with:
+          path: docs/.vitepress/dist
+
+  deploy:
+    environment:
+      name: github-pages
+      url: ${{ steps.deployment.outputs.page_url }}
+    needs: build
+    runs-on: ubuntu-latest
+    name: Deploy
+    steps:
+      - name: Deploy to GitHub Pages
+        id: deployment
+        uses: actions/deploy-pages@v4

.gitignore

@@ -43,6 +43,24 @@ local.properties
 # PDT-specific
 .buildpath
 
+# Vitepress
+docs/.vitepress/dist/
+docs/.vitepress/cache/
+
+# Logs
+docs/logs
+docs/*.log
+docs/npm-debug.log*
+docs/yarn-debug.log*
+docs/yarn-error.log*
+docs/pnpm-debug.log*
+docs/lerna-debug.log*
+
+docs/node_modules
+docs/dist
+docs/dist-ssr
+docs/*.local
+
 # Other
 .DS_Store
 mcmodsrepo

Jenkinsfile

@@ -1,63 +1,86 @@
 #!/usr/bin/env groovy
 
 pipeline {
-
-    agent any
+    agent none
 
     tools {
         jdk "jdk-21"
     }
 
-    options {
-        // Sometimes builds freeze, but this doesn't have to be super aggressive.
-        timeout(time: 30, unit: 'MINUTES')
-    }
-
-    parameters {
-        booleanParam(name: 'RELEASE', defaultValue: false, description: 'Publish artifacts without a build number.')
-    }
-
     stages {
-
-        stage('Setup') {
+        stage('Build') {
+            agent any
 
             steps {
-
-                echo 'Setup Project'
+                echo 'Setup project.'
                 sh 'chmod +x gradlew'
                 sh './gradlew clean'
+
+                withCredentials([
+                    // build_secrets is parsed in SubprojectExtension#loadSecrets
+                    file(credentialsId: 'build_secrets', variable: 'ORG_GRADLE_PROJECT_secretFile'),
+                ]) {
+                    echo 'Building project.'
+                    // Sometimes builds freeze, so wrap in a timeout.
+                    timeout(time: 30, unit: 'MINUTES') {
+                        sh './gradlew build publish --stacktrace --warn'
+                    }
+                }
+            }
+
+            post {
+                always {
+                    archiveArtifacts artifacts: '**/build/libs/**/*.jar', fingerprint: true
+
+                    withCredentials([
+                            string(credentialsId: 'discord_webhook_url', variable: 'DISCORD_URL')
+                    ]) {
+                        echo 'Notifying Discord..'
+                        discordSend description: "Build: #${currentBuild.number}", link: env.BUILD_URL, result: currentBuild.currentResult, title: env.JOB_NAME, webhookURL: env.DISCORD_URL, showChangeset: true, enableArtifactsList: true
+                    }
+                }
             }
         }
 
-        stage('Build') {
+        stage('Release') {
+            // Take the input in our when block so that we don't block any agents.
+            when {
+                expression {
+                    input(message: 'Publish without build number?', ok: 'Yes', cancel: 'No')
+                    // If input is cancelled the entire step will abort. Return true so we continue on confirmation.
+                    return true
+                }
+                beforeAgent true
+            }
+
+            agent any
 
             environment {
-                RELEASE="${params.RELEASE}"
+                RELEASE="true"
             }
 
             steps {
+                // Prevent older builds from being released.
+                milestone(ordinal: 1, label: 'Release Guardian')
+
+                echo 'Setup project for release.'
+                sh 'chmod +x gradlew'
+
+                // Clean again because the agent may have changed.
+                sh './gradlew clean'
+
                 withCredentials([
                     // build_secrets is parsed in SubprojectExtension#loadSecrets
                     file(credentialsId: 'build_secrets', variable: 'ORG_GRADLE_PROJECT_secretFile'),
                 ]) {
-                    echo 'Building project.'
-                    sh './gradlew build publish --stacktrace --warn'
+                    echo 'Building project for release.'
+                    // Sometimes builds freeze, so wrap in a timeout.
+                    timeout(time: 30, unit: 'MINUTES') {
+                        sh './gradlew build publish --stacktrace --warn'
+                    }
                 }
-            }
-        }
-    }
-
-    post {
-
-        always {
-
-            archiveArtifacts artifacts: '**/build/libs/**/*.jar', fingerprint: true
 
-            withCredentials([
-                    string(credentialsId: 'discord_webhook_url', variable: 'DISCORD_URL')
-            ]) {
-                echo 'Notifying Discord..'
-                discordSend description: "Build: #${currentBuild.number}", link: env.BUILD_URL, result: currentBuild.currentResult, title: env.JOB_NAME, webhookURL: env.DISCORD_URL, showChangeset: true, enableArtifactsList: true
+                milestone(ordinal: 2, label: 'Release')
             }
         }
     }

common/src/backend/java/dev/engine_room/flywheel/backend/engine/AbstractArena.java

@@ -42,6 +42,10 @@ public int capacity() {
 		return top;
 	}
 
+	public int occupancy() {
+		return top - freeStack.size();
+	}
+
 	public abstract long byteCapacity();
 
 	protected abstract void grow();

common/src/backend/java/dev/engine_room/flywheel/backend/engine/CommonCrumbling.java

@@ -1,5 +1,6 @@
 package dev.engine_room.flywheel.backend.engine;
 
+import dev.engine_room.flywheel.api.material.CardinalLightingMode;
 import dev.engine_room.flywheel.api.material.Material;
 import dev.engine_room.flywheel.api.material.Transparency;
 import dev.engine_room.flywheel.api.material.WriteMask;
@@ -19,6 +20,6 @@ public static void applyCrumblingProperties(SimpleMaterial.Builder crumblingMate
 				.writeMask(WriteMask.COLOR)
 				.useOverlay(false)
 				.useLight(false)
-				.diffuse(false);
+				.cardinalLightingMode(CardinalLightingMode.OFF);
 	}
 }