update tests to 1.21.1

PaperMC · Oct 19, 2024 · 5e9a117 · 5e9a117
1 parent cc219ab
commit 5e9a117
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 22 deletions.
diff --git a/paperweight-core/src/test/resources/fake_mache/mache.json b/paperweight-core/src/test/resources/fake_mache/mache.json
@@ -13,8 +13,8 @@
     "paramMappings": [
       {
         "group": "org.parchmentmc.data",
-        "name": "parchment-1.20.4",
-        "version": "2024.02.25",
+        "name": "parchment-1.21",
+        "version": "2024.07.28",
         "extension": "zip"
       }
     ],
@@ -32,7 +32,7 @@
       {
         "group": "org.vineflower",
         "name": "vineflower",
-        "version": "1.10.0-20240212.003104-88"
+        "version": "1.11.0-20240829.184116-48"
       }
     ]
   },
@@ -75,17 +75,23 @@
     }
   ],
   "decompilerArgs": [
-    "-nns=true",
-    "-tcs=true",
-    "-ovr=false",
-    "-vvm=true",
-    "-iec=true",
-    "-jrt=current",
-    "-ind=    ",
-    "-jvn=false",
-    "-dcc=true",
-    "-sef=true",
-    "-nls=1"
+    "--synthetic-not-set=true",
+    "--ternary-constant-simplification=true",
+    "--include-runtime=current",
+    "--decompile-complex-constant-dynamic=true",
+    "--indent-string=    ",
+    "--decompile-inner=true",
+    "--remove-bridge=true",
+    "--decompile-generics=true",
+    "--ascii-strings=false",
+    "--remove-synthetic=true",
+    "--include-classpath=true",
+    "--inline-simple-lambdas=true",
+    "--ignore-invalid-bytecode=false",
+    "--bytecode-source-mapping=true",
+    "--dump-code-lines=true",
+    "--override-annotation=false",
+    "--skip-extra-files=true"
   ],
   "remapperArgs": [
     "--temp-dir={tempDir}",

diff --git a/paperweight-core/src/test/resources/functional_test/build.gradle b/paperweight-core/src/test/resources/functional_test/build.gradle
@@ -19,7 +19,7 @@ dependencies {
     if (fake) {
         mache files('mache.zip') // use fake mache for testing
     } else {
-        mache 'io.papermc:mache:1.20.4+build.3'
+        mache 'io.papermc:mache:1.21.1+build.1'
     }
 }
 
@@ -41,7 +41,7 @@ paperweight {
             paperServerDir.set(file('test-server'))
         }
     } else {
-        minecraftVersion = '1.20.4'
+        minecraftVersion = '1.21.1'
 
         paper {
             paperServerDir.set(file('test-server'))

diff --git a/...-core/src/test/resources/functional_test/test-server/patches/resources/version.json.patch b/...-core/src/test/resources/functional_test/test-server/patches/resources/version.json.patch
@@ -2,10 +2,10 @@
 +++ b/version.json
 @@ -1,6 +_,6 @@
  {
--    "id": "1.20.4",
--    "name": "1.20.4",
-+    "id": "1.20.4-paper",
-+    "name": "1.20.4 - Paper",
-     "world_version": 3700,
+-    "id": "1.21.1",
+-    "name": "1.21.1",
++    "id": "1.21.1-paper",
++    "name": "1.21.1 - Paper",
+     "world_version": 3955,
      "series_id": "main",
-     "protocol_version": 765,
+     "protocol_version": 767,