Merge pull request #151 from viciscat/1.20.5

compose or something idk

.github/workflows/build.yml

@@ -11,23 +11,31 @@ jobs:
       - name: checkout repository
         uses: actions/checkout@v2
       - name: setup jdk 21
-        uses: actions/setup-java@v1
+        uses: actions/setup-java@v4
         with:
+          distribution: temurin
           java-version: 21
       # to cache gradle files
       - name: Setup Gradle
-        uses: gradle/gradle-build-action@v2
+        uses: gradle/actions/setup-gradle@v3
         with:
-          cache-read-only: false
           gradle-home-cache-cleanup: true
-      - name: make gradle wrapper executable
-        if: ${{ runner.os != 'Windows' }}
-        run: chmod +x ./gradlew
+          dependency-graph: generate-and-submit
+# Already needs to be executable, so the dirty check is correct
+#      - name: make gradle wrapper executable
+#        if: ${{ runner.os != 'Windows' }}
+#        run: chmod +x ./gradlecw
       - name: build
-        run: ./gradlew build
+        run: ./gradlecw build
       - name: capture build artifacts
         uses: actions/upload-artifact@v2
         with:
           name: Artifacts
-          path: |
-            build/libs/*
+          path: 'versions/**/build/libs/*.jar'
+#      - name: Test Report
+#        uses: dorny/test-reporter@v1
+#        if: success() || failure()
+#        with:
+#          name: JUnit Tests
+#          path: '**/build/test-results/test/TEST-*.xml'
+#          reporter: java-junit        

.github/workflows/tag.yml

@@ -8,27 +8,33 @@ jobs:
     steps:
       - name: checkout repository
         uses: actions/checkout@v2
-      - name: setup jdk 17
+      - name: setup jdk 21
         uses: actions/setup-java@v1
         with:
-          java-version: 17
+          java-version: 21
       - name: make gradle wrapper executable
         run: chmod +x ./gradlecw
       - name: build
         run: ./gradlecw build -Pbuild.release=true
       - name: Release
         uses: softprops/action-gh-release@v1
         with:
-          files: |
-            FG-Fabric/build/libs/*
-      - name: Publish-Fabric
+          files: 'versions/**/build/libs/!(*-@(dev|sources|javadoc|all)).jar'
+      - name: Publish-1.20.6-fabric-Curseforge
+        uses: Kir-Antipov/mc-publish@v3.3.0
+        with:
+          curseforge-id: 681953
+          curseforge-token: ${{ secrets.CURSEFORGE_TOKEN }}
+          loaders: fabric
+          name: ${{github.ref_name}}-1.20.6 - Fabric
+          files: 'versions/1.20.6-fabric/build/libs/!(*-@(dev|sources|javadoc|all)).jar'
+          game-versions: 1.20.6
+      - name: Publish-1.20.6-fabric-Modrinth
         uses: Kir-Antipov/mc-publish@v3.3.0
         with:
           modrinth-id: DynYZEae
           modrinth-token: ${{ secrets.MODRINTH_TOKEN }}
-          curseforge-id: 681953
-          curseforge-token: ${{ secrets.CURSEFORGE_TOKEN }}  
           loaders: fabric
-          name: ${{github.ref_name}} - Fabric
-          files: '*Fabric/build/libs/!(*-@(dev|sources|javadoc|all)).jar'
-          game-versions: 1.20.4
+          name: ${{github.ref_name}}-1.20.6 - Fabric
+          files: 'versions/1.20.6-fabric/build/libs/!(*-@(dev|sources|javadoc|all)).jar'
+          game-versions: 1.20.6

.gitignore

@@ -32,3 +32,21 @@ bin/
 
 run/
 logs/
+
+# compose
+
+*.gradle
+*.properties
+gradle/wrapper
+VersionShared
+UtilityCode
+formatter.xml
+src/main/fabric-resources/fabric.mod.json
+src/main/forge-resources/META-INF/mods.toml
+src/main/neoforge-resources/META-INF/mods.toml
+**/src/main/java/dev/tr7zw/config/CustomConfigScreen.java
+**/src/main/java/dev/tr7zw/util/ComponentProvider.java
+src/main/resources/pack.mcmeta
+src/main/java/dev/tr7zw/util/ModLoaderUtil.java
+src/main/java/dev/tr7zw/util/NMSHelper.java
+src/main/neoforge-resources/META-INF/neoforge.mods.toml

src/main/java/dev/tr7zw/exordium/config/Config.java → Exordium-Versionless/src/main/java/dev/tr7zw/exordium/versionless/Config.java

@@ -1,4 +1,4 @@
-package dev.tr7zw.exordium.config;
+package dev.tr7zw.exordium.versionless;
 
 public class Config {
 

src/main/java/dev/tr7zw/exordium/config/ConfigUpgrader.java → Exordium-Versionless/src/main/java/dev/tr7zw/exordium/versionless/ConfigUpgrader.java

@@ -1,4 +1,4 @@
-package dev.tr7zw.exordium.config;
+package dev.tr7zw.exordium.versionless;
 
 public class ConfigUpgrader {
 

gradle-compose.yml

@@ -0,0 +1,35 @@
+version: '0.0.2'
+source: "https://github.com/tr7zw/ProcessedModTemplate/tree/legacy12006"
+replacements:
+  name: "Exordium"
+  id: "exordium"
+  version: "1.2.1"
+  description: "UI Frames go die"
+  homepageUrl: "https://modrinth.com/mod/exordium"
+  sourcesUrl: "https://github.com/tr7zw/Exordium"
+  issuesUrl: "https://github.com/tr7zw/Exordium/issues"
+  fabric_entrypoint: "dev.tr7zw.exordium.ExordiumMod"
+  fabric_modmenu_entrypoint: "dev.tr7zw.exordium.ExordiumModMenu"
+  relocationpackage: "dev.tr7zw.exordium"
+  licensename: "LICENSE-Exordium"
+  modrinthid: DynYZEae
+  curseforgeid: 681953
+  versionlessname: "Exordium-Versionless"
+enabledFlags:
+  - autopublish
+  - publishFabric
+  - modrinth
+  - curseforge
+  - versionless
+rootProject:
+  template: "."
+subProjects:
+  Exordium-Versionless:
+    template: "Versionless"
+    replacements:
+      dependencies: '
+
+      compileOnly "com.google.code.gson:gson:2.10.1"
+
+      compileOnly "org.apache.logging.log4j:log4j-core:2.20.0"
+      '