Merge branch '0.2.0' into main

unimined · Nov 22, 2022 · c1960b1 · c1960b1
2 parents 7114e0e + 4959ebd
commit c1960b1
Show file tree

Hide file tree

Showing 69 changed files with 3,863 additions and 1,956 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -1,7 +1,7 @@
 name: Build Release
 on:
   release:
-    types: [created]
+    types: [ created ]
 jobs:
   build:
     runs-on: ubuntu-latest

diff --git a/.github/workflows/build_snapshot.yml b/.github/workflows/build_snapshot.yml
@@ -1,19 +1,19 @@
 name: Build Snapshot
-on:
-  push:
-    branches:
-      - main
+
+on: push
+
 jobs:
   build:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
 
       - name: Set up JDK 17
-        uses: actions/setup-java@v2
+        uses: actions/setup-java@v3
         with:
-          distribution: 'adopt'
+          distribution: 'temurin'
           java-version: '17'
+          cache: 'gradle'
 
       - name: Grant execute permission for gradlew
         run: chmod +x gradlew

diff --git a/README.md b/README.md
@@ -3,44 +3,48 @@
 unified minecraft modding environment.
 
 ## TODO for initial release
+
 * ~~remap fg2+ era at's back to notch (fixing mc 1.7+)~~
 * ~~remap user at's to notch~~
 * ~~auto disable combined on <=1.2.5~~
 * ~~figure out, why modloader not launching in dev due to classpath path instead of jar path~~
 
 ## TODO
+
 * Refactor, refactor, refactor
-~~* FG3+ support (>1.12.2)~~
+  ~~* FG3+ support (>1.12.2)~~
 * test user AT support
-~~* fix fg3 versions of 1.12.2~~
+  ~~* fix fg3 versions of 1.12.2~~
 * fabric aw support
 * combined jar support
-~~* figure out how to get forge to recognise resources as part of the dev mod~~
+  ~~* figure out how to get forge to recognise resources as part of the dev mod~~
 * split fg2+ out of the mc jar
 * figure out how to do automated testing
-  * figure out how to determine the correctness of remap output
-  * aka automate the verification that versions work
-    * list of versions to verify
-      * 1.19.2
-      * 1.17.1
-      * 1.16.5
-      * 1.13.2
-      * 1.12.2
-      * 1.8.9
-      * 1.7.10
-      * 1.6.4
-      * 1.5.2
-      * 1.3.2
-      * 1.2.5
-      * 1.7.3
-      * b1.3_01
-      * a1.1.2_01
-  * maybe by hash check?
-* figure out what versions need `-Djava.util.Arrays.useLegacyMergeSort=true` to not randomly crash, this should really be part of the legacy mc version.json, or at least betacraft's, but it's not
-~~* make myself a maven to host this on~~
-~~* fix forge mappings on 1.17+~~
+    * figure out how to determine the correctness of remap output
+    * aka automate the verification that versions work
+        * list of versions to verify
+            * 1.19.2
+            * 1.17.1
+            * 1.16.5
+            * 1.13.2
+            * 1.12.2
+            * 1.8.9
+            * 1.7.10
+            * 1.6.4
+            * 1.5.2
+            * 1.3.2
+            * 1.2.5
+            * 1.7.3
+            * b1.3_01
+            * a1.1.2_01
+    * maybe by hash check?
+* figure out what versions need `-Djava.util.Arrays.useLegacyMergeSort=true` to not randomly crash, this should really
+  be part of the legacy mc version.json, or at least betacraft's, but it's not
+  ~~* make myself a maven to host this on~~
+  ~~* fix forge mappings on 1.17+~~
 
 ## Example Usage
+
 ```groovy
 plugins {
     id 'java'
@@ -106,6 +110,7 @@ dependencies {
 ```
 
 ## B1.3_01 example
+
 ```groovy
 plugins {
     id 'java'

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -32,6 +32,7 @@ dependencies {
     testImplementation(kotlin("test"))
     // guava
     implementation("com.google.guava:guava:31.1-jre")
+
     // gson
     implementation("com.google.code.gson:gson:2.9.0")
 
@@ -52,13 +53,26 @@ dependencies {
 
     // pack200 provided by apache commons-compress
     implementation("org.apache.commons:commons-compress:1.21")
+
+    // aw
+    implementation("net.fabricmc:access-widener:2.1.0")
+
+    // at
+    implementation("net.minecraftforge:accesstransformers:8.0.7")
+
+    implementation("org.jetbrains.kotlinx:kotlinx-metadata-jvm:0.4.2") {
+        isTransitive = false
+    }
+
 }
 
 tasks.jar {
     manifest {
-        attributes.putAll(mapOf(
-            "Implementation-Version" to project.version
-        ))
+        attributes.putAll(
+            mapOf(
+                "Implementation-Version" to project.version
+            )
+        )
     }
 }
 

diff --git a/gradle.properties b/gradle.properties
@@ -1,9 +1,6 @@
 kotlin.code.style=official
-
 org.gradle.jvmargs=-Xmx1G
 org.gradle.parallel=true
-
-version=0.1.6
-
+version=0.2.0
 maven_group=xyz.wagyourtail
 archives_base_name=unimined