diff options
| author | shedaniel <daniel@shedaniel.me> | 2021-09-12 03:02:32 +0800 |
|---|---|---|
| committer | shedaniel <daniel@shedaniel.me> | 2021-09-12 03:02:32 +0800 |
| commit | 43dda4a6c8336180478b66b8c821e1535f65d970 (patch) | |
| tree | fa16b7f848eb8eb0f36716a91abeb20ba9d33462 | |
| parent | 014562d166a1c217afa9c0e5bc9e65ea0edb0936 (diff) | |
| parent | df7f56306b9465b6f0c885a836919d5f4272f69e (diff) | |
| download | architectury-loom-43dda4a6c8336180478b66b8c821e1535f65d970.tar.gz architectury-loom-43dda4a6c8336180478b66b8c821e1535f65d970.tar.bz2 architectury-loom-43dda4a6c8336180478b66b8c821e1535f65d970.zip | |
Merge remote-tracking branch 'FabricMC/dev/0.10' into dev/0.10.0
| -rw-r--r-- | build.gradle | 2 | ||||
| -rw-r--r-- | src/test/groovy/net/fabricmc/loom/test/unit/layeredmappings/ParchmentMappingLayerTest.groovy | 8 |
2 files changed, 6 insertions, 4 deletions
diff --git a/build.gradle b/build.gradle index 9d676d13..f037b0ef 100644 --- a/build.gradle +++ b/build.gradle @@ -97,7 +97,7 @@ dependencies { implementation ('net.fabricmc:tiny-mappings-parser:0.3.0+build.17') implementation 'net.fabricmc:access-widener:1.1.0' - implementation 'net.fabricmc:mapping-io:0.2.0' + implementation 'net.fabricmc:mapping-io:0.2.1' implementation ('net.fabricmc:lorenz-tiny:3.0.0') { transitive = false diff --git a/src/test/groovy/net/fabricmc/loom/test/unit/layeredmappings/ParchmentMappingLayerTest.groovy b/src/test/groovy/net/fabricmc/loom/test/unit/layeredmappings/ParchmentMappingLayerTest.groovy index 760019b2..ac9592cf 100644 --- a/src/test/groovy/net/fabricmc/loom/test/unit/layeredmappings/ParchmentMappingLayerTest.groovy +++ b/src/test/groovy/net/fabricmc/loom/test/unit/layeredmappings/ParchmentMappingLayerTest.groovy @@ -38,7 +38,7 @@ class ParchmentMappingLayerTest extends LayeredMappingsSpecification { def mappings = getLayeredMappings( new IntermediaryMappingsSpec(), new MojangMappingsSpec(), - new ParchmentMappingsSpec(PARCHMENT_NOTATION, true) + new ParchmentMappingsSpec(PARCHMENT_NOTATION, false) ) def tiny = getTiny(mappings) def reorderedMappings = reorder(mappings) @@ -48,7 +48,7 @@ class ParchmentMappingLayerTest extends LayeredMappingsSpecification { mappings.classes.size() == 5747 mappings.classes[0].srcName.hashCode() == -1112444138 // MojMap name, just check the hash mappings.classes[0].getDstName(0) == "net/minecraft/class_2573" - mappings.classes[0].methods[0].args[0].srcName.hashCode() == 109757064 + mappings.classes[0].methods[0].args[0].srcName.hashCode() == -1008297992 reorderedMappings.getClass("net/minecraft/class_2573").getMethod("method_10913", "(Lnet/minecraft/class_1799;Lnet/minecraft/class_1767;)V").args.size() > 0 } @@ -64,12 +64,14 @@ class ParchmentMappingLayerTest extends LayeredMappingsSpecification { new ParchmentMappingsSpec(PARCHMENT_NOTATION, true) ) def tiny = getTiny(mappings) + def reorderedMappings = reorder(mappings) then: mappings.srcNamespace == "named" mappings.dstNamespaces == ["intermediary", "official"] mappings.classes.size() == 5747 mappings.classes[0].srcName.hashCode() == -1112444138 // MojMap name, just check the hash mappings.classes[0].getDstName(0) == "net/minecraft/class_2573" - mappings.classes[0].methods[0].args[0].srcName == "stack" + mappings.classes[0].methods[0].args[0].srcName.hashCode() == 109757064 + reorderedMappings.getClass("net/minecraft/class_2573").getMethod("method_10913", "(Lnet/minecraft/class_1799;Lnet/minecraft/class_1767;)V").args.size() > 0 } } |