fix #5 and add local mode for testing #21

ix0rai · 2024-11-22T04:47:47Z

i probably should have done two PRs here, but at least it's neatly separated by commits!

example changes to a file: (using https://meta.quiltmc.org/v3/versions/loader/1.14.4/0.27.0)

--- 0.27.0-old.json	2024-11-21 22:48:38.565417076 -0600
+++ 0.27.0.json	2024-11-22 22:29:19.250099198 -0600
@@ -3,60 +3,120 @@
     "separator": ".",
     "build": 0,
     "maven": "org.quiltmc:quilt-loader:0.27.0",
-    "version": "0.27.0"
+    "version": "0.27.0",
+    "md5": "2a48d2692e0929002b16ee5bec0a99c2",
+    "sha1": "1d975b20ff84c443e7a17ddc1c8c19f9eb15dfb6",
+    "sha256": "7769b6a99ff8baa1b6d414bf1454ea6d5da321b0b62d0f822b236b46581db11b",
+    "sha512": "d732ded33299a9663493c584d47795904349b8767a65930178c5d952558d69fdde338585ce9b5bb87e687f0a07e6a5aaa43c9ec196a4eee4ca2f28f2975c8f62",
+    "size": 2492855
   },
   "hashed": {
     "maven": "org.quiltmc:hashed:1.14.4",
-    "version": "1.14.4"
+    "version": "1.14.4",
+    "md5": "a71bef1bf2496e43969901e133e1b828",
+    "sha1": "7f405b2688cb249777415a005499e2eaa91a3c91",
+    "sha256": "69c1d7aace9639e6c114a2cc2387e038d253302afbc4575a0b29ea6d30353e27",
+    "sha512": "0f04750e98f293af39212de04ffc2cfe7a2fbb6009fdfe3bbad519a7b412870337af2fc5e85df762a60d9a7955b05a6f9fd1a45ea40bb2a1d4968123d089fa59",
+    "size": 438242
   },
   "intermediary": {
     "maven": "net.fabricmc:intermediary:1.14.4",
     "version": "1.14.4"
   },
   "launcherMeta": {
     "version": 2,
     "min_java_version": 8,
     "libraries": {
       "client": [],
+      "server": [],
       "common": [
         {
           "name": "net.fabricmc:sponge-mixin:0.15.3+mixin.0.8.7",
-          "url": "https://maven.fabricmc.net/"
+          "url": "https://maven.fabricmc.net/",
+          "md5": "a33725dd52de94c33514b6867c8d0b4b",
+          "sha1": "51ee0a44ab05f6fddd66b09e66b3a16904f9c55d",
+          "sha256": "0a7735e98905e445a7ddb0eef617ebfb5166ac95c293206cce4241aab7be56fd",
+          "sha512": "3be527b0122a54a1cd5b542a45afd7a9d3d1186fd7d0c62a6c704656229e426a283be35ae285dbd188817467a307f969b0aef28dfa8fa1f360fafdb6a561c9db",
+          "size": 1494835
         },
         {
           "name": "org.quiltmc:quilt-json5:1.0.4+final",
-          "url": "https://maven.quiltmc.org/repository/release/"
+          "url": "https://maven.quiltmc.org/repository/release/",
+          "md5": "47783c9a809c7dc7e69919e820f24688",
+          "sha1": "c7705a5fca3d4e85a8c8a1fc0c6c5758c0a0325c",
+          "sha256": "c07d781820af7dc304de7c7fda9c4dd9c479851d451b1cb473851d6af226ac37",
+          "sha512": "382e1c1f44693cf8849fc76b02e292439d177710e7cc689d84bf5549584d5bc127f7c1373f2f4f84d593421bc16c8ede9303d90784a6b4afb5ae9091fa1d77c5",
+          "size": 25897
         },
         {
           "name": "org.ow2.asm:asm:9.7.1",
-          "url": "https://maven.fabricmc.net/"
+          "url": "https://maven.fabricmc.net/",
+          "md5": "e2cdd32d198ad31427d298eee9d39d8d",
+          "sha1": "f0ed132a49244b042cd0e15702ab9f2ce3cc8436",
+          "sha256": "8cadd43ac5eb6d09de05faecca38b917a040bb9139c7edeb4cc81c740b713281",
+          "sha512": "4767b01603dad5c79cc1e2b5f3722f72b1059d928f184f446ba11badeb1b381b3a3a9a801cc43d25d396df950b09d19597c73173c411b1da890de808b94f1f50",
+          "size": 126093
         },
         {
           "name": "org.ow2.asm:asm-analysis:9.7.1",
-          "url": "https://maven.fabricmc.net/"
+          "url": "https://maven.fabricmc.net/",
+          "md5": "4cd9e7178dfb85371bba3077e40cd514",
+          "sha1": "f97a3b319f0ed6a8cd944dc79060d3912a28985f",
+          "sha256": "85b29371884ba31bb76edf22323c2c24e172c3267a67152eba3d1ccc2e041ef2",
+          "sha512": "a8bd265c81d9bb4371cafd3f5d18f96ad79aec65031457d518c54599144d199d9feddf13b8dc822b2598b8b504a88edbd81d1f2c52991a70a6b343d8f5bb6fe5",
+          "size": 35126
         },
         {
           "name": "org.ow2.asm:asm-commons:9.7.1",
-          "url": "https://maven.fabricmc.net/"
+          "url": "https://maven.fabricmc.net/",
+          "md5": "8344aea3c8b7d707e9d35a62710e77c9",
+          "sha1": "406c6a2225cfe1819f102a161e54cc16a5c24f75",
+          "sha256": "9a579b54d292ad9be171d4313fd4739c635592c2b5ac3a459bbd1049cddec6a0",
+          "sha512": "81daf5765e387e6aeec5d45c4b9e4e1b471fb4f350931e5a214845c7c657a2142768f6902765e49c0ce2c595962e5d008883cba2e4a40c4bdce8f2e92518d2db",
+          "size": 73459
         },
         {
           "name": "org.ow2.asm:asm-tree:9.7.1",
-          "url": "https://maven.fabricmc.net/"
+          "url": "https://maven.fabricmc.net/",
+          "md5": "e85029f613b6469989cc7cf53fe06b74",
+          "sha1": "3a53139787663b139de76b627fca0084ab60d32c",
+          "sha256": "9929881f59eb6b840e86d54570c77b59ce721d104e6dfd7a40978991c2d3b41f",
+          "sha512": "e55008c392fdd35e95d3404766b12dd4b46e13d5c362fcd0ab42a65751a82737eaf0ebc857691d1916190d34407adfde4437615d69c278785416fd911e00978d",
+          "size": 51939
         },
         {
           "name": "org.ow2.asm:asm-util:9.7.1",
-          "url": "https://maven.fabricmc.net/"
+          "url": "https://maven.fabricmc.net/",
+          "md5": "36d373a9cd6cad9b35db9f984c6b4bbb",
+          "sha1": "9e23359b598ec6b74b23e53110dd5c577adf2243",
+          "sha256": "f885be71b5c90556f5f1ad1c4f9276b29b96057c497d46666fe4ddbec3cb43c6",
+          "sha512": "522d793d15a2c5ea6504a50222cf0750f1eab7b881cf289675042539b1aba8b3868197b1bebe729de728dd10020eb028ae16252dcd5d84fdcbf7f925832bc269",
+          "size": 94519
         },
         {
           "name": "org.quiltmc:quilt-config:1.3.1",
-          "url": "https://maven.quiltmc.org/repository/release/"
+          "url": "https://maven.quiltmc.org/repository/release/",
+          "md5": "4079ad0e22cd1963840c5a180b88796e",
+          "sha1": "c0e275ff3e33dc879e0719933a30180993f7cce2",
+          "sha256": "f91ed67bfff06aba7820b758304edaeb613f2939df3045a60252ce6085dd4617",
+          "sha512": "a312bfe84a731c28a72a7af4b5087c8706a266691ba1fd95774aad2ac56a07ce196abd7961a185c2c6ba88abfa0fad4564390ce2d52d4ea7585060abe8486677",
+          "size": 155315
         }
       ],
-      "server": [],
       "development": [
         {
           "name": "io.github.llamalad7:mixinextras-fabric:0.4.1",
-          "url": "https://maven.fabricmc.net/"
+          "url": "https://maven.fabricmc.net/",
+          "md5": "e447f76602559932e9b3e790f27da065",
+          "sha1": "8d1a9e96afb990367fa1f904d17580d164da72e3",
+          "sha256": "bb7042dd915cad67dc7c2ad0a4c0eabe6e097123785d7877beded6e0700f92ef",
+          "sha512": "424a8c33f37159d5987c6bba56ffb5704c70763a157cb2de7a6962c0021d8829cc3850ce474ceae86acf26921b2ec811a48577aed2f18c96902a30205103ae3c",
+          "size": 202066
         }
       ]
     },

todo:

update API spec?

…ishes intermediary, we can't provide reliable info)

OroArmor

hopefully someone from infra can review this

kb-1000 · 2025-01-13T08:19:49Z

src/main/java/org/quiltmc/Constants.java

@@ -11,6 +11,7 @@ public final class Constants {
    static final String USER_AGENT = "update-quilt-meta/" + TOOL_VERSION;

    static final String GROUP = "org.quiltmc";
+    static final boolean TESTING = true;


You probably wanted to set this to false, right?

kb-1000 · 2025-01-13T08:25:00Z

src/main/java/org/quiltmc/LoaderJson.java

+				conn.connect();
+				library.size = conn.getContentLength();
+			} catch (IOException e) {
+				// this cannot be a hard crash because of a funny quirk: the json on quilt loader 0.17.5-beta.4 is completely broken and has ${version} instead of the real versions


I think it might be better to just go and finally drop the thing entirely - at least from meta if not from the Maven.
But doing that this way (by catching the error afterwards) also makes the generated files somewhat nondeterministic if intermittent download failures appear, which aren't too uncommon. For the same reason, you probably want to retry downloads once or twice.

yes, i believe pyro said they'd go in and drop it after i asked -- i haven't checked if it's actually been removed
[20 seconds later rai talking now say hi] it hasn't been removed yet. i'll make sure it happens so this code can be removed

ix0rai added 2 commits November 21, 2024 20:15

create offline testing mode

3326d3f

rough version of loader dependency metadata generation

0398dc5

ix0rai added the enhancement New feature or request label Nov 22, 2024

ix0rai marked this pull request as draft November 22, 2024 06:29

add extra metadata for loader, hashed, and intermediary

8ed51ff

ix0rai marked this pull request as ready for review November 23, 2024 04:58

ix0rai added 2 commits November 23, 2024 11:46

do not add metadata for intermediary (since fabric frequently re-publ…

29207c8

…ishes intermediary, we can't provide reliable info)

update openAPI spec

7a1697f

OroArmor approved these changes Jan 13, 2025

View reviewed changes

kb-1000 reviewed Jan 13, 2025

View reviewed changes

ix0rai added 2 commits January 15, 2025 17:18

set testing to false

1fae7b7

remove error handling code from LoaderJson

3006db9

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

fix #5 and add local mode for testing #21

fix #5 and add local mode for testing #21

ix0rai commented Nov 22, 2024 •

edited

Loading

OroArmor left a comment

kb-1000 Jan 13, 2025

ix0rai Jan 14, 2025

kb-1000 Jan 13, 2025

ix0rai Jan 14, 2025

fix #5 and add local mode for testing #21

Are you sure you want to change the base?

fix #5 and add local mode for testing #21

Conversation

ix0rai commented Nov 22, 2024 • edited Loading

OroArmor left a comment

Choose a reason for hiding this comment

kb-1000 Jan 13, 2025

Choose a reason for hiding this comment

ix0rai Jan 14, 2025

Choose a reason for hiding this comment

kb-1000 Jan 13, 2025

Choose a reason for hiding this comment

ix0rai Jan 14, 2025

Choose a reason for hiding this comment

ix0rai commented Nov 22, 2024 •

edited

Loading