Merge branch 'Creators-of-Create:mc1.21.1/dev' into mc1.20.1/peculiar-transformation

Author: Attack8

.editorconfig

@@ -9,6 +9,9 @@ charset = utf-8
 trim_trailing_whitespace = true
 insert_final_newline = true
 
+[{*.markdown,*.md}]
+ij_markdown_wrap_text_if_long = false
+
 [*.yml]
 indent_size = 2
 
@@ -25,5 +28,5 @@ ij_java_blank_lines_before_method_body = 0
 ij_java_else_on_new_line = false
 ij_java_class_count_to_use_import_on_demand = 999
 ij_java_names_count_to_use_import_on_demand = 999
-ij_java_imports_layout = $*,|,java.**,|,javax.**,|,org.**,|,com.**,|,*,|,net.minecraftforge.**
+ij_java_imports_layout = $*, |, java.**, |, javax.**, |, org.**, |, com.**, |, *, |, net.neoforged.**
 ij_java_insert_inner_class_imports = true

.github/workflows/build.yml

@@ -1,6 +1,14 @@
 name: Build
-
-on: [ workflow_dispatch, pull_request ]
+on:
+  push:
+  pull_request:
+  workflow_dispatch:
+    inputs:
+      is-release:
+        description: 'Publish release to Modrinth, Curseforge and Github'
+        required: false
+        default: false
+        type: boolean
 
 jobs:
   build:
@@ -9,14 +17,26 @@ jobs:
       - name: Checkout Repository
         uses: actions/checkout@v4
 
-      - name: Setup Java
-        run: echo "JAVA_HOME=$JAVA_HOME_17_X64" >> "$GITHUB_ENV"
+      - name: Setup Java 21
+        run: echo "JAVA_HOME=$JAVA_HOME_21_X64" >> "$GITHUB_ENV"
 
       - name: Setup Gradle
         uses: gradle/actions/setup-gradle@v4
-
-      - name: Validate Gradle Wrapper Integrity
-        uses: gradle/actions/wrapper-validation@v3
+        with:
+          cache-disabled: ${{ inputs.is-release }}
+          cache-read-only: false
 
       - name: Build
         run: ./gradlew build
+
+      - name: Run Gametests
+        if: ${{ !inputs.is-release }}
+        run: ./gradlew runGameTestServer
+
+      - name: Publish
+        if: ${{ inputs.is-release }}
+        env:
+          MODRINTH_TOKEN: ${{ secrets.MODRINTH_TOKEN }}
+          CURSEFORGE_TOKEN: ${{ secrets.CURSEFORGE_TOKEN }}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: ./gradlew publishMods

.github/workflows/localization.yml

@@ -1,32 +1,36 @@
 # This workflow will run Crowdin Action that will upload new texts to Crowdin, download the newest translations and create a PR
 # For more information see: https://github.com/crowdin/github-action
 name: Crowdin Action
-on: workflow_dispatch
+
+on:
+  workflow_dispatch:
+    inputs:
+      uploadTranslations:
+        description: "Set to true to upload (changed) translations to Crowdin"
+        type: boolean
+        required: true
+        default: false
 
 jobs:
   synchronize-with-crowdin:
     runs-on: ubuntu-latest
+
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
 
       - name: crowdin action
-        uses: crowdin/github-action@1.4.9
+        uses: crowdin/github-action@v2
         with:
-          # Upload sources to Crowdin
           upload_sources: true
-          # Upload translations to Crowdin, only use true at initial run
-          upload_translations: false
-          # Make pull request of Crowdin translations
+          upload_translations: ${{ github.event.inputs.uploadTranslations }}
           download_translations: true
-          # To download translations to the specified version branch
           localization_branch_name: l10n_crowdin_translations
-          # Create pull request after pushing to branch
           create_pull_request: true
           pull_request_title: 'New Crowdin translations'
           pull_request_body: 'New Crowdin pull request with translations'
           pull_request_base_branch_name: 'mc1.20.1/dev'
         env:
-          GITHUB_TOKEN: ${{ secrets.GH_TOKEN }}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           CROWDIN_PROJECT_ID: ${{ secrets.CROWDIN_PROJECT_ID }}
           CROWDIN_PERSONAL_TOKEN: ${{ secrets.CROWDIN_PERSONAL_TOKEN }}

.github/workflows/release.yml

@@ -29,6 +29,7 @@ local.properties
 .classpath
 .settings/
 .loadpath
+.factorypath
 
 # External tool builders
 .externalToolBuilders/

.gitignore

@@ -5,7 +5,7 @@ pipeline {
     agent any
 
     tools {
-        jdk "jdk-17.0.1"
+        jdk "jdk-21"
     }
 
     stages {

Jenkinsfile

@@ -0,0 +1,39 @@
+# License Overview
+
+## Assets License (All Rights Reserved)
+
+All Rights Reserved
+
+Copyright (c) The Create Team / The Creators of Create
+
+This license applies to any files under the following directories:
+
+- ./src/main/resources/assets/
+
+---
+
+## Code License (MIT)
+
+All other files are licensed under the MIT License:
+
+MIT License
+
+Copyright (c) The Create Team / The Creators of Create
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

LICENSE

@@ -1,11 +1,9 @@
 <p align="center"><img src="./.idea/icon.png" alt="Logo" width="200"></p>
 <h1 align="center">Create  <br>
-	<a href="https://www.patreon.com/simibubi"><img src="https://img.shields.io/endpoint.svg?url=https%3A%2F%2Fshieldsio-patreon.vercel.app%2Fapi%3Fusername%3Dsimibubi%26type%3Dpatrons&style=flat&label=Supporters&color=ff5733" alt="Patreon"></a>
-	<a href="https://www.curseforge.com/minecraft/mc-mods/create/files"><img src="https://cf.way2muchnoise.eu/versions/328085(c70039).svg" alt="Supported Versions"></a>
-	<a href="https://github.com/Creators-of-Create/Create/blob/master/LICENSE"><img src="https://img.shields.io/github/license/Creators-of-Create/Create?style=flat&color=900c3f" alt="License"></a>
-	<a href="https://discord.gg/hmaD7Se"><img src="https://img.shields.io/discord/620934202875183104?color=5865f2&label=Discord&style=flat" alt="Discord"></a>
-	<a href="https://www.curseforge.com/minecraft/mc-mods/create"><img src="http://cf.way2muchnoise.eu/328085.svg" alt="CF"></a>
-    <a href="https://modrinth.com/mod/create"><img src="https://img.shields.io/modrinth/dt/create?logo=modrinth&label=&suffix=%20&style=flat&color=242629&labelColor=5ca424&logoColor=1c1c1c" alt="Modrinth"></a>
+	<a href="https://r.createmod.net/p"><img src="https://img.shields.io/endpoint.svg?url=https%3A%2F%2Fshieldsio-patreon.vercel.app%2Fapi%3Fusername%3Dsimibubi%26type%3Dpatrons&style=flat&label=Supporters&color=FF5733" alt="Patreon"></a>
+	<a href="https://r.createmod.net/d"><img src="https://img.shields.io/discord/620934202875183104?color=5865F2&label=Discord&style=flat" alt="Discord"></a>
+	<a href="https://r.createmod.net/cf"><img src="https://img.shields.io/curseforge/dt/328085?logo=curseforge&label=&suffix=%20&style=flat&color=242629&labelColor=F16436&logoColor=1C1C1C" alt="CurseForge"></a>
+    <a href="https://r.createmod.net/mr"><img src="https://img.shields.io/modrinth/dt/create?logo=modrinth&label=&suffix=%20&style=flat&color=242629&labelColor=5CA424&logoColor=1C1C1C" alt="Modrinth"></a>
     <br><br>
 </h1>
 

LICENSE.md

@@ -0,0 +1,9 @@
+# Security Policy
+
+## Supported Versions
+
+The versions currently supported can be found [here](https://wiki.createmod.net/users/development-status)
+
+## Reporting a Vulnerability
+
+To report a vulnerability please head [here](https://github.com/Creators-of-Create/Create/security/advisories/new)