Merge upstream

.editorconfig

@@ -8,5 +8,22 @@ charset = utf-8
 trim_trailing_whitespace = true
 insert_final_newline = true
 
+ij_continuation_indent_size = 4
+ij_any_do_while_brace_force = if_multiline
+ij_any_if_brace_force = if_multiline
+ij_any_for_brace_force = if_multiline
+ij_any_spaces_within_array_initializer_braces = true
+
+ij_kotlin_allow_trailing_comma = true
+ij_kotlin_allow_trailing_comma_on_call_site = true
+ij_kotlin_method_parameters_wrap = off
+ij_kotlin_call_parameters_wrap = off
+
 [*.md]
 trim_trailing_whitespace = false
+
+[*.sexp]
+indent_size = 2
+
+[*.yml]
+indent_size = 2

.git-blame-ignore-revs

@@ -0,0 +1,2 @@
+# Reformat everything
+f478c4ffc4fb9fc2200ec9b0bc751d047057ce81

.gitattributes

@@ -1,5 +1,6 @@
 # Ignore changes in generated files
-src/generated/resources/data/** linguist-generated
+projects/*/src/generated/** linguist-generated
+projects/common/src/testMod/resources/data/cctest/structures/* linguist-generated
 
 * text=auto
 

.github/workflows/main-ci.yml

@@ -8,17 +8,18 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
       with:
         submodules: true
 
     - name: Set up Java 17
-      uses: actions/setup-java@v1
+      uses: actions/setup-java@v3
       with:
         java-version: 17
+        distribution: 'temurin'
 
     - name: Cache gradle dependencies
-      uses: actions/cache@v2
+      uses: actions/cache@v3
       with:
         path: ~/.gradle/caches
         key: ${{ runner.os }}-gradle-${{ hashFiles('gradle.properties') }}
@@ -31,29 +32,17 @@ jobs:
         echo "org.gradle.daemon=false" >> ~/.gradle/gradle.properties
 
     - name: Build with Gradle
-      run: |
-        ./gradlew assemble || ./gradlew assemble
-        ./gradlew build
+      run: ./gradlew build
 
     - name: Upload Jar
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v3
       with:
         name: cc-restitched
-        path: build/libs
+        path: projects/fabric/build/libs
 
     - name: Parse test reports
       run: ./tools/parse-reports.py
       if: ${{ failure() }}
 
-    - name: Cache pre-commit
-      uses: actions/cache@v2
-      with:
-        path: ~/.cache/pre-commit
-        key: ${{ runner.os }}-pre-commit-${{ hashFiles('config/pre-commit/config.yml') }}
-        restore-keys: |
-          ${{ runner.os }}-pre-commit-
-
     - name: Run linters
-      run: |
-        pip install pre-commit
-        pre-commit run --config config/pre-commit/config.yml --show-diff-on-failure --all --color=always
+      uses: pre-commit/[email protected]

.github/workflows/release.yml

@@ -1,47 +1,44 @@
 name: Release
 
 on:
-    release:
-        types:
-            - published
-    workflow_dispatch:
+  release:
+    types:
+    - published
+  workflow_dispatch:
 
 jobs:
-    build:
-        runs-on: ubuntu-latest
-        steps:
-            - uses: actions/cache@v2
-              with:
-                  path: |
-                      ~/.gradle/loom-cache
-                      ~/.gradle/caches
-                      ~/.gradle/wrapper
-                  key: gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
-                  restore-keys: |
-                      gradle-
-            - uses: actions/checkout@v2
-              with:
-                  submodules: true
-            - name: Set up JDK
-              uses: actions/setup-java@v1
-              with:
-                  java-version: 17
+  build:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v3
+      with:
+        submodules: true
 
-            - name: Pull submodules
-              run: git submodule update --init --recursive
+    - uses: actions/cache@v3
+      with:
+        path: |
+            ~/.gradle/loom-cache
+            ~/.gradle/caches
+            ~/.gradle/wrapper
+        key: gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
+        restore-keys: |
+            gradle-
 
-            - name: Grant execute permission for gradlew
-              run: chmod +x gradlew
+    - name: Set up Java 17
+      uses: actions/setup-java@v3
+      with:
+        java-version: 17
+        distribution: 'temurin'
 
-            - name: Build and publish with Gradle
-              run: ./gradlew build publish
-              env:
-                  CURSEFORGE: ${{ secrets.CURSEFORGE }}
-                  MODRINTH: ${{ secrets.MODRINTH }}
-                  CHANGELOG: ${{ github.event.release.body }}
+    - name: Build and publish with Gradle
+      run: ./gradlew build publish
+      env:
+        CURSEFORGE: ${{ secrets.CURSEFORGE }}
+        MODRINTH: ${{ secrets.MODRINTH }}
+        CHANGELOG: ${{ github.event.release.body }}
 
-            - name: Upload GitHub release
-              uses: AButler/[email protected]
-              with:
-                  files: 'build/libs/*.jar;!build/libs/*-sources.jar;!build/libs/*-dev.jar'
-                  repo-token: ${{ secrets.GITHUB_TOKEN }}
+    - name: Upload GitHub release
+      uses: AButler/[email protected]
+      with:
+        files: 'build/libs/*.jar;!build/libs/*-sources.jar;!build/libs/*-dev.jar'
+        repo-token: ${{ secrets.GITHUB_TOKEN }}

.gitignore

@@ -2,25 +2,29 @@
 /classes
 /logs
 /build
+/projects/*/logs
+/projects/*/build
+/buildSrc/build
 /out
+/doc/out/
+/node_modules
+.jqwik-database
 
 # Runtime directories
 /run
-/run-*
-/test-files
-
-# Autogenerated by IDE
-/bin
-/.settings
-.classpath
+/projects/*/run
 
 *.ipr
 *.iws
 *.iml
 .idea
 .gradle
 *.DS_Store
-.project
+
+/.classpath
+/.project
+/.settings
+/.vscode
 *.launch
 
-/src/generated/resources/.cache
+/projects/*/src/generated/resources/.cache

.gitmodules

@@ -1,4 +1,4 @@
-[submodule "src/main/resources/resourcepacks/overhaul"]
-	path = src/main/resources/resourcepacks/overhaul
-	url = https://github.com/cc-orgs/cc-overhaul
-	branch = main
+[submodule "projects/common/src/main/resources/resourcepacks/overhaul"]
+	path = projects/common/src/main/resources/resourcepacks/overhaul
+	url = https://github.com/cc-orgs/cc-overhaul.git
+	branch = "main"

.gitpod.yml

@@ -7,11 +7,16 @@ ports:
 
 vscode:
   extensions:
+    - eamodio.gitlens
+    - github.vscode-pull-request-github
+    - ms-azuretools.vscode-docker
     - redhat.java
     - richardwillis.vscode-gradle
     - vscjava.vscode-java-debug
-
+    - vscode.github
 
 tasks:
   - name: Setup pre-commit hool
-    init: pre-commit install --config config/pre-commit/config.yml --allow-missing-config
+    init: pre-commit install --allow-missing-config
+  - name: Install npm packages
+    init: npm ci

.pre-commit-config.yaml

@@ -0,0 +1,47 @@
+# See https://pre-commit.com for more information
+# See https://pre-commit.com/hooks.html for more hooks
+repos:
+- repo: https://github.com/pre-commit/pre-commit-hooks
+  rev: v4.0.1
+  hooks:
+  - id: trailing-whitespace
+  - id: end-of-file-fixer
+  - id: check-merge-conflict
+
+  # Quick syntax checkers
+  - id: check-xml
+  - id: check-yaml
+  - id: check-toml
+  - id: check-json
+    exclude: "tsconfig\\.json|\\.vscode/settings\\.json$"
+
+- repo: https://github.com/editorconfig-checker/editorconfig-checker.python
+  rev: 2.3.54
+  hooks:
+  - id: editorconfig-checker
+    args: ['-disable-indentation']
+    exclude: "^(.*\\.(bat)|LICENSE)$"
+
+- repo: local
+  hooks:
+  - id: license
+    name: Spotless
+    files: ".*\\.(java|kt|kts)$"
+    language: system
+    entry: ./gradlew spotlessApply
+    pass_filenames: false
+    require_serial: true
+  - id: checkstyle
+    name: Check Java codestyle
+    files: ".*\\.java$"
+    language: system
+    entry: ./gradlew checkstyleMain checkstyleTest
+    pass_filenames: false
+    require_serial: true
+
+exclude: |
+  (?x)^(
+    projects/[a-z]+/src/generated|
+    projects/core/src/test/resources/test-rom/data/json-parsing/|
+    .*\.dfpwm
+  )

.vscode/settings.json

@@ -1,15 +1,15 @@
 {
-	"files.exclude": {
-		// Default Java Dev
+    "files.exclude": {
+        // Default Java Dev
         "**/.classpath": true,
         "**/.project": true,
         "**/.settings": true,
         "**/.factorypath": true,
 
-		// Custom Hidden Files
-		"**/.bin": true,
-		"**/.editorconfig": true,
+        // Custom Hidden Files
+        "**/.bin": true,
+        "**/.editorconfig": true,
     },
 
-	"java.configuration.updateBuildConfiguration": "automatic"
+    "java.configuration.updateBuildConfiguration": "automatic"
 }