Merge branch 'MCreator:master' into master

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -2,6 +2,18 @@ name: Bug report
 description: Create a report to help us improve (search for duplicates first)
 labels: bug
 body:
+ - type: checkboxes
+   attributes:
+    label: Issue tracker rule checks (please read carefully)
+    options:
+     - label: "I have checked that my problem <a href='https://github.com/MCreator/MCreator/issues?q=is%3Aissue' target='_blank'>is not already reported</a>"
+       required: true
+     - label: "I have checked that my problem is not covered on <a href='https://mcreator.net/support/knowledgebase' target='_blank'>Knowledge Base</a> or on <a href='https://mcreator.net/wiki' target='_blank'>MCreator's Wiki</a>"
+       required: true
+     - label: "I have made sure this bug is not plugin-related (tested with MCreator without plugins installed)"
+       required: true
+     - label: "I have checked that my written content does not violate the <a href='https://mcreator.net/wiki/general-publishing-guidelines' target='_blank'>publishing guidelines</a>"
+       required: true
  - type: textarea
    attributes:
     label: Issue description
@@ -61,13 +73,3 @@ body:
     placeholder: https://gist.github.com/...
    validations:
     required: false
- - type: checkboxes
-   attributes:
-    label: Issue tracker rule checks (please read carefully)
-    options:
-     - label: "I have checked that my problem <a href='https://github.com/MCreator/MCreator/issues?q=is%3Aissue' target='_blank'>is not already reported</a>"
-       required: true
-     - label: "I have checked that my problem is not covered on <a href='https://mcreator.net/support/knowledgebase' target='_blank'>Knowledge Base</a> or on <a href='https://mcreator.net/wiki' target='_blank'>MCreator's Wiki</a>"
-       required: true
-     - label: "I have checked that my written content does not violate the <a href='https://mcreator.net/wiki/general-publishing-guidelines' target='_blank'>publishing guidelines</a>"
-       required: true

.github/workflows/crowdin-pull.yml

@@ -10,7 +10,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
-      - uses: crowdin/github-action@v1
+      - uses: crowdin/github-action@cb33a030bb1675169b76617d5805242aeea6eaec
         name: Pull Crowdin translations
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/crowdin-push.yml

@@ -11,7 +11,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
-      - uses: crowdin/github-action@v1
+      - uses: crowdin/github-action@cb33a030bb1675169b76617d5805242aeea6eaec
         name: Push sources to Crowdin
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/deploy.yml

@@ -12,6 +12,7 @@ jobs:
   export1:
     name: Build and Export (all but MacOS)
     runs-on: ubuntu-latest
+    environment: production
     outputs:
       mcr_version: ${{ steps.determineExportVersion.outputs.mcr_version }}
       mc_version: ${{ steps.determineExportVersion.outputs.mc_version }}
@@ -30,8 +31,8 @@ jobs:
       - name: Set up JDK 17
         uses: actions/setup-java@v3
         with:
-          java-version: '17.0.8+7'
-          distribution: 'adopt'
+          java-version: '17.0.9+9'
+          distribution: 'temurin'
       - name: Install Dependencies
         run: |
           sudo apt-get install -y mkisofs nsis nsis-pluginapi
@@ -79,13 +80,14 @@ jobs:
     name: Build and Export (only MacOS)
     needs: export1
     runs-on: macos-latest
+    environment: production
     steps:
       - uses: actions/checkout@v3
       - name: Set up JDK 17
         uses: actions/setup-java@v3
         with:
-          java-version: '17.0.8+7'
-          distribution: 'adopt'
+          java-version: '17.0.9+9'
+          distribution: 'temurin'
       - name: Install Dependencies
         run: |
           brew install create-dmg

.github/workflows/documentation.yml

@@ -14,8 +14,8 @@ jobs:
       - name: Set up JDK 17
         uses: actions/setup-java@v3
         with:
-          java-version: '17.0.8+7'
-          distribution: 'adopt'
+          java-version: '17.0.9+9'
+          distribution: 'temurin'
       - name: Generate Javadoc
         run: ./gradlew javadoc
       - name: Deploy Javadoc

.github/workflows/stale.yml

@@ -0,0 +1,37 @@
+permissions:
+  issues: write
+  pull-requests: write
+
+name: 'Handle stale issues and PRs'
+on:
+  schedule:
+    - cron: '30 1 * * *'
+
+jobs:
+  stale:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/stale@v8
+        with:
+          stale-issue-message: >
+            This issue has been automatically marked as stale because it has not had
+            recent activity. It will be closed if no further activity occurs. 
+            Thank you for your contributions.
+
+
+            Do not remove this label manually, it should be removed by the bot when
+            new activity occurs.
+          stale-pr-message: >
+            This PR has been automatically marked as stale because it has not had
+            recent activity. It will be closed if no further activity occurs. 
+            Thank you for your contributions.
+
+
+            Do not remove this label manually, it should be removed by the bot when
+            new activity occurs.
+          days-before-stale: 14
+          days-before-close: 3
+          stale-issue-label: stale
+          stale-pr-label: stale
+          exempt-issue-labels: official, on hold
+          exempt-pr-labels: official, on hold

.github/workflows/test.yml

@@ -22,8 +22,8 @@ jobs:
       - name: Set up JDK 17
         uses: actions/setup-java@v3
         with:
-          java-version: '17.0.8+7'
-          distribution: 'adopt'
+          java-version: '17.0.9+9'
+          distribution: 'temurin'
       - name: Cache Gradle Packages
         uses: actions/cache@v3
         with:

build.gradle

@@ -92,21 +92,21 @@ dependencies {
     implementation fileTree(dir: 'lib', include: ['*.jar'])
 
     // from maven
-    implementation group: 'commons-io', name: 'commons-io', version: '2.15.0'
+    implementation group: 'commons-io', name: 'commons-io', version: '2.15.1'
     implementation group: 'org.freemarker', name: 'freemarker', version: '2.3.32'
     implementation group: 'com.google.code.gson', name: 'gson', version: '2.10.1'
     implementation group: 'com.github.sps.junidecode', name: 'junidecode', version: '0.3'
     implementation group: 'org.jboss.forge.roaster', name: 'roaster-api', version: '2.29.0.Final'
     implementation group: 'org.jboss.forge.roaster', name: 'roaster-jdt', version: '2.29.0.Final'
     implementation group: 'org.snakeyaml', name: 'snakeyaml-engine', version: '2.7'
     implementation group: 'org.reflections', name: 'reflections', version: '0.10.2'
-    implementation group: 'com.google.guava', name: 'guava', version: '32.1.2-jre'
+    implementation group: 'com.google.guava', name: 'guava', version: '33.0.0-jre'
     implementation group: 'de.javagl', name: 'obj', version: '0.4.0'
     implementation group: 'com.univocity', name: 'univocity-parsers', version: '2.9.1'
-    implementation group: 'org.apache.logging.log4j', name: 'log4j-core', version: '2.21.1'
-    implementation group: 'org.apache.commons', name: 'commons-text', version: '1.10.0'
-    implementation group: 'org.slf4j', name: 'slf4j-nop', version: '2.0.9'
-    implementation group: 'org.gradle', name: 'gradle-tooling-api', version: '8.4'
+    implementation group: 'org.apache.logging.log4j', name: 'log4j-core', version: '2.22.0'
+    implementation group: 'org.apache.commons', name: 'commons-text', version: '1.11.0'
+    implementation group: 'org.slf4j', name: 'slf4j-nop', version: '2.0.10'
+    implementation group: 'org.gradle', name: 'gradle-tooling-api', version: '8.5'
     implementation group: 'net.java.balloontip', name: 'balloontip', version: '1.2.4.1'
     implementation group: 'com.atlassian.commonmark', name: 'commonmark', version: '0.17.0'
     implementation group: 'com.atlassian.commonmark', name: 'commonmark-ext-autolink', version: '0.17.0'
@@ -116,11 +116,11 @@ dependencies {
     implementation(group: 'com.fifesoft', name: 'languagesupport', version: '3.3.0') {
         dep -> dep.exclude group: 'org.mozilla', module: 'rhino'
     }
-    implementation group: 'net.java.dev.jna', name: 'jna', version: '5.13.0' // needed by discord-rpc.jar
+    implementation group: 'net.java.dev.jna', name: 'jna', version: '5.14.0' // needed by discord-rpc.jar
 
     // test dependencies
-    testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter-api', version: '5.10.0'
-    testRuntimeOnly group: 'org.junit.jupiter', name: 'junit-jupiter-engine', version: '5.10.0'
+    testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter-api', version: '5.10.1'
+    testRuntimeOnly group: 'org.junit.jupiter', name: 'junit-jupiter-engine', version: '5.10.1'
 }
 
 javafx {

platform/setup.gradle

@@ -1,16 +1,15 @@
 import org.apache.tools.ant.taskdefs.condition.Os
 
-def jdk17_win_64 = 'https://api.adoptopenjdk.net/v3/binary/version/jdk-17.0.8+7/windows/x64/jdk/hotspot/normal/adoptopenjdk'
-def jdk17_linux_64 = 'https://api.adoptopenjdk.net/v3/binary/version/jdk-17.0.8+7/linux/x64/jdk/hotspot/normal/adoptopenjdk'
-def jdk17_mac_x64 = 'https://api.adoptopenjdk.net/v3/binary/version/jdk-17.0.8+7/mac/x64/jdk/hotspot/normal/adoptopenjdk'
-def jdk17_mac_aarch64 = 'https://api.adoptopenjdk.net/v3/binary/version/jdk-17.0.8+7/mac/aarch64/jdk/hotspot/normal/adoptopenjdk'
+def jdk17_win_64 = 'https://api.adoptium.net/v3/binary/version/jdk-17.0.9+9.1/windows/x64/jdk/hotspot/normal/eclipse?project=jdk'
+def jdk17_linux_64 = 'https://api.adoptium.net/v3/binary/version/jdk-17.0.9+9/linux/x64/jdk/hotspot/normal/eclipse?project=jdk'
+def jdk17_mac_x64 = 'https://api.adoptium.net/v3/binary/version/jdk-17.0.9+9/mac/x64/jdk/hotspot/normal/eclipse?project=jdk'
+def jdk17_mac_aarch64 = 'https://api.adoptium.net/v3/binary/version/jdk-17.0.9+9/mac/aarch64/jdk/hotspot/normal/eclipse?project=jdk'
 
-def nsis_url = 'https://netcologne.dl.sourceforge.net/project/nsis/NSIS%203/3.08/nsis-3.08.zip'
+// Binaries needed on Windows for export (install them using Gradle since Windows does not have a package manager)
+def nsis_url = 'https://netcologne.dl.sourceforge.net/project/nsis/NSIS%203/3.09/nsis-3.09.zip'
 def nsis_lockedlist_plugin_url = 'https://nsis.sourceforge.io/mediawiki/images/d/d3/LockedList.zip'
-
 def mkisofs_url = 'https://netix.dl.sourceforge.net/project/mkisofs-md5/mkisofs-md5-v2.01/mkisofs-md5-2.01-Binary.zip'
 
-
 tasks.register('downloadJDKWin64') {
     group 'setup'
     doLast {
@@ -25,8 +24,8 @@ tasks.register('downloadJDKWin64') {
             copy { from zipTree('build/tmp/jdk17_win_64') into file('jdk/jdk17_win_64/') }
             delete 'build/tmp/jdk17_win_64'
 
-            copy { from file('jdk/jdk17_win_64/jdk-17.0.8+7') into file('jdk/jdk17_win_64/') }
-            delete 'jdk/jdk17_win_64/jdk-17.0.8+7'
+            copy { from file('jdk/jdk17_win_64/jdk-17.0.9+9') into file('jdk/jdk17_win_64/') }
+            delete 'jdk/jdk17_win_64/jdk-17.0.9+9'
         }
     }
 }
@@ -45,8 +44,8 @@ tasks.register('downloadJDKLinux64') {
             copy { from tarTree(resources.gzip('build/tmp/jdk17_linux_64')) into file('jdk/jdk17_linux_64/') }
             delete 'build/tmp/jdk17_linux_64'
 
-            copy { from file('jdk/jdk17_linux_64/jdk-17.0.8+7') into file('jdk/jdk17_linux_64/') }
-            delete 'jdk/jdk17_linux_64/jdk-17.0.8+7'
+            copy { from file('jdk/jdk17_linux_64/jdk-17.0.9+9') into file('jdk/jdk17_linux_64/') }
+            delete 'jdk/jdk17_linux_64/jdk-17.0.9+9'
         }
     }
 }
@@ -65,8 +64,8 @@ tasks.register('downloadJDKMacX64') {
             copy { from tarTree(resources.gzip('build/tmp/jdk17_mac_x64')) into file('jdk/jdk17_mac_x64/') }
             delete 'build/tmp/jdk17_mac_x64'
 
-            copy { from file('jdk/jdk17_mac_x64/jdk-17.0.8+7') into file('jdk/jdk17_mac_x64/') }
-            delete 'jdk/jdk17_mac_x64/jdk-17.0.8+7/'
+            copy { from file('jdk/jdk17_mac_x64/jdk-17.0.9+9') into file('jdk/jdk17_mac_x64/') }
+            delete 'jdk/jdk17_mac_x64/jdk-17.0.9+9/'
         }
     }
 }
@@ -85,8 +84,8 @@ tasks.register('downloadJDKMacAarch64') {
             copy { from tarTree(resources.gzip('build/tmp/jdk17_mac_aarch64/')) into file('jdk/jdk17_mac_aarch64/') }
             delete 'build/tmp/jdk17_mac_aarch64'
 
-            copy { from file('jdk/jdk17_mac_aarch64/jdk-17.0.8+7') into file('jdk/jdk17_mac_aarch64/') }
-            delete 'jdk/jdk17_mac_aarch64/jdk-17.0.8+7/'
+            copy { from file('jdk/jdk17_mac_aarch64/jdk-17.0.9+9') into file('jdk/jdk17_mac_aarch64/') }
+            delete 'jdk/jdk17_mac_aarch64/jdk-17.0.9+9/'
         }
     }
 }
@@ -103,7 +102,7 @@ tasks.register('downloadNSIS') {
                     overwrite false
                 }
                 copy { from zipTree(file('build/tmp/nsis')) into file('build/tools/') }
-                file('build/tools/nsis-3.08').renameTo(file('build/tools/nsis'))
+                file('build/tools/nsis-3.09').renameTo(file('build/tools/nsis'))
                 delete 'build/tmp/nsis'
 
                 download.run {

platform/windows/windows.gradle

@@ -17,7 +17,9 @@ launch4j {
     errTitle = 'MCreator'
     supportUrl = 'https://mcreator.net/support'
 
-    fileDescription = "MCreator " + (String) project.mcreatorconf.getProperty('mcreator')
+    fileDescription = "MCreator " + (String) project.mcreatorconf.getProperty('mcreator') + "." + project.builddate
+    version = (String) project.mcreatorconf.getProperty('mcreator') + "." + project.builddate
+    textVersion = (String) project.mcreatorconf.getProperty('mcreator') + "." + project.builddate
     productName = "MCreator"
     companyName = "Pylo"
     copyright = "Pylo"
@@ -72,7 +74,7 @@ tasks.register('buildInstallerWin64', Exec.class) {
 
     def nsis_binary
     if (Os.isFamily(Os.FAMILY_WINDOWS)) {
-        nsis_binary = projectDir.toString() + '/build/tools/nsis/makensis'
+        nsis_binary = new File(projectDir, '/build/tools/nsis/makensis')
     } else {
         nsis_binary = 'makensis'
     }

plugins/generator-1.19.4/datapack-1.19.4/damagetype.definition.yaml

@@ -0,0 +1,6 @@
+templates:
+  - template: damagetype.json.ftl
+    writer: json
+    name: "@MODDATAROOT/damage_type/@registryname.json"
+
+field_exclusions: [normalDeathMessage, itemDeathMessage, playerDeathMessage]