Skip to content

Commit 5dd17ad

Browse files
thecatcorethecatcore
committed
Update mapping-io and tiny remapper
1 parent 9e08dac commit 5dd17ad

File tree

4 files changed

+25
-23
lines changed

4 files changed

+25
-23
lines changed

‎README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ This mod jar-in-jars:
1818
- [MixinExtras](https://github.com/LlamaLad7/MixinExtras) 0.2.1 for Fabric Loader 0.14 compatibility purpose only.
1919

2020
This mod shadows and relocates for internal usage:
21-
- [mapping-io](https://github.com/FabricMC/mapping-io) 0.6.1
22-
- [tiny-remapper](https://github.com/FabricMC/tiny-remapper) 0.10.2
21+
- [mapping-io](https://github.com/FabricMC/mapping-io) 0.7.1
22+
- [tiny-remapper](https://github.com/FabricMC/tiny-remapper) 0.11.0
2323
- [gson](https://github.com/google/gson) 2.2.4
2424

2525
This mod doesn't depend on a specific Minecraft version and should work on any version that Fabric Loader can launch.

‎build.gradle‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,10 +42,10 @@ dependencies {
4242
modImplementation(include(legacy.apiModule("legacy-fabric-logger-api-v1", project.fabric_version)))
4343
modImplementation(include("maven.modrinth:spasm:${project.spasm_version}"))
4444

45-
shadow(runtimeOnly('net.fabricmc:mapping-io:0.6.1')) {
45+
shadow(runtimeOnly('net.fabricmc:mapping-io:0.7.1')) {
4646
transitive = false
4747
}
48-
shadow(runtimeOnly('net.fabricmc:tiny-remapper:0.10.2')) {
48+
shadow(runtimeOnly('net.fabricmc:tiny-remapper:0.11.0')) {
4949
transitive = false
5050
}
5151

@@ -150,7 +150,8 @@ modrinth {
150150
token = System.getenv("MODRINTH_TOKEN")
151151
projectId = "mod-remapping-api"
152152
changelog = """
153-
Support remapping mods from other namespaces than obfuscated/official.
153+
Update mapping-io to 0.7.1.\
154+
Update tiny remapper to 0.11.0.
154155
"""
155156
uploadFile = remapJar
156157

‎gradle.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,6 @@ org.gradle.jvmargs=-Xmx1G
1212
spasm_version=0.2
1313

1414
# Mod Properties
15-
mod_version = 1.23.0
15+
mod_version = 1.24.0
1616
maven_group = io.github.fabriccompatibiltylayers
1717
archives_base_name = mod-remapping-api

‎src/main/java/fr/catcore/modremapperapi/remapping/RemapUtil.java‎

Lines changed: 18 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -395,6 +395,7 @@ private static void preloadClasses() {
395395
getLibClassName("tinyremapper", "TinyRemapper$AnalyzeVisitorProvider"),
396396
getLibClassName("tinyremapper", "TinyRemapper$ApplyVisitorProvider"),
397397
getLibClassName("tinyremapper", "TinyRemapper$Builder"),
398+
getLibClassName("tinyremapper", "TinyRemapper$CLIExtensionProvider"),
398399
getLibClassName("tinyremapper", "TinyRemapper$Direction"),
399400
getLibClassName("tinyremapper", "TinyRemapper$Extension"),
400401
getLibClassName("tinyremapper", "TinyRemapper$LinkedMethodPropagation"),
@@ -417,50 +418,45 @@ private static void preloadClasses() {
417418
getLibClassName("tinyremapper", "extension.mixin.common.data.MxClass"),
418419
getLibClassName("tinyremapper", "extension.mixin.common.data.MxMember"),
419420
getLibClassName("tinyremapper", "extension.mixin.common.data.Pair"),
420-
getLibClassName("tinyremapper", "extension.mixin.common.Logger"),
421-
getLibClassName("tinyremapper", "extension.mixin.common.Logger$Level"),
422421
getLibClassName("tinyremapper", "extension.mixin.soft.SoftTargetMixinClassVisitor"),
423422
getLibClassName("tinyremapper", "extension.mixin.soft.SoftTargetMixinMethodVisitor"),
424423
getLibClassName("tinyremapper", "extension.mixin.soft.annotation.AccessorAnnotationVisitor"),
425-
getLibClassName("tinyremapper", "extension.mixin.soft.annotation.AccessorAnnotationVisitor$AccessorSecondPassAnnotationVisitor"),
426-
getLibClassName("tinyremapper", "extension.mixin.soft.annotation.FirstPassAnnotationVisitor"),
427424
getLibClassName("tinyremapper", "extension.mixin.soft.annotation.InvokerAnnotationVisitor"),
428-
getLibClassName("tinyremapper", "extension.mixin.soft.annotation.InvokerAnnotationVisitor$InvokerSecondPassAnnotationVisitor"),
429425
getLibClassName("tinyremapper", "extension.mixin.soft.annotation.MixinAnnotationVisitor"),
430-
getLibClassName("tinyremapper", "extension.mixin.soft.annotation.MixinAnnotationVisitor$MixinSecondPassAnnotationVisitor"),
431-
getLibClassName("tinyremapper", "extension.mixin.soft.annotation.MixinAnnotationVisitor$MixinSecondPassAnnotationVisitor$1"),
432-
getLibClassName("tinyremapper", "extension.mixin.soft.annotation.MixinAnnotationVisitor$MixinSecondPassAnnotationVisitor$2"),
433426
getLibClassName("tinyremapper", "extension.mixin.soft.annotation.injection.AtAnnotationVisitor"),
434427
getLibClassName("tinyremapper", "extension.mixin.soft.annotation.injection.AtAnnotationVisitor$AtConstructorMappable"),
435-
getLibClassName("tinyremapper", "extension.mixin.soft.annotation.injection.AtAnnotationVisitor$AtMethodMappable"),
436428
getLibClassName("tinyremapper", "extension.mixin.soft.annotation.injection.AtAnnotationVisitor$AtSecondPassAnnotationVisitor"),
437429
getLibClassName("tinyremapper", "extension.mixin.soft.annotation.injection.AtAnnotationVisitor$AtSecondPassAnnotationVisitor$1"),
438430
getLibClassName("tinyremapper", "extension.mixin.soft.annotation.injection.CommonInjectionAnnotationVisitor"),
439-
getLibClassName("tinyremapper", "extension.mixin.soft.annotation.injection.CommonInjectionAnnotationVisitor$CommonInjectionSecondPassAnnotationVisitor"),
440-
getLibClassName("tinyremapper", "extension.mixin.soft.annotation.injection.CommonInjectionAnnotationVisitor$CommonInjectionSecondPassAnnotationVisitor$1"),
441-
getLibClassName("tinyremapper", "extension.mixin.soft.annotation.injection.CommonInjectionAnnotationVisitor$CommonInjectionSecondPassAnnotationVisitor$2"),
442-
getLibClassName("tinyremapper", "extension.mixin.soft.annotation.injection.CommonInjectionAnnotationVisitor$CommonInjectionSecondPassAnnotationVisitor$3"),
443431
getLibClassName("tinyremapper", "extension.mixin.soft.annotation.injection.CommonInjectionAnnotationVisitor$InjectMethodMappable"),
432+
getLibClassName("tinyremapper", "extension.mixin.soft.annotation.injection.DefinitionAnnotationVisitor"),
433+
getLibClassName("tinyremapper", "extension.mixin.soft.annotation.injection.DefinitionAnnotationVisitor$MemberRemappingVisitor"),
434+
getLibClassName("tinyremapper", "extension.mixin.soft.annotation.injection.DefinitionsAnnotationVisitor"),
435+
getLibClassName("tinyremapper", "extension.mixin.soft.annotation.injection.DefinitionsAnnotationVisitor$DefinitionRemappingVisitor"),
436+
getLibClassName("tinyremapper", "extension.mixin.soft.annotation.injection.DescAnnotationVisitor"),
444437
getLibClassName("tinyremapper", "extension.mixin.soft.annotation.injection.InjectAnnotationVisitor"),
445438
getLibClassName("tinyremapper", "extension.mixin.soft.annotation.injection.ModifyArgAnnotationVisitor"),
446439
getLibClassName("tinyremapper", "extension.mixin.soft.annotation.injection.ModifyArgsAnnotationVisitor"),
447440
getLibClassName("tinyremapper", "extension.mixin.soft.annotation.injection.ModifyConstantAnnotationVisitor"),
441+
getLibClassName("tinyremapper", "extension.mixin.soft.annotation.injection.ModifyExpressionValueAnnotationVisitor"),
442+
getLibClassName("tinyremapper", "extension.mixin.soft.annotation.injection.ModifyReceiverAnnotationVisitor"),
443+
getLibClassName("tinyremapper", "extension.mixin.soft.annotation.injection.ModifyReturnValueAnnotationVisitor"),
448444
getLibClassName("tinyremapper", "extension.mixin.soft.annotation.injection.ModifyVariableAnnotationVisitor"),
449445
getLibClassName("tinyremapper", "extension.mixin.soft.annotation.injection.RedirectAnnotationVisitor"),
450446
getLibClassName("tinyremapper", "extension.mixin.soft.annotation.injection.SliceAnnotationVisitor"),
447+
getLibClassName("tinyremapper", "extension.mixin.soft.annotation.injection.WrapMethodAnnotationVisitor"),
448+
getLibClassName("tinyremapper", "extension.mixin.soft.annotation.injection.WrapOperationAnnotationVisitor"),
449+
getLibClassName("tinyremapper", "extension.mixin.soft.annotation.injection.WrapWithConditionAnnotationVisitor"),
450+
getLibClassName("tinyremapper", "extension.mixin.soft.annotation.injection.WrapWithConditionV2AnnotationVisitor"),
451451
getLibClassName("tinyremapper", "extension.mixin.soft.data.MemberInfo"),
452452
getLibClassName("tinyremapper", "extension.mixin.soft.util.NamedMappable"),
453453
getLibClassName("tinyremapper", "extension.mixin.hard.HardTargetMixinClassVisitor"),
454454
getLibClassName("tinyremapper", "extension.mixin.hard.HardTargetMixinFieldVisitor"),
455455
getLibClassName("tinyremapper", "extension.mixin.hard.HardTargetMixinMethodVisitor"),
456-
getLibClassName("tinyremapper", "extension.mixin.hard.annotation.AccessorAnnotationVisitor"),
457-
getLibClassName("tinyremapper", "extension.mixin.hard.annotation.AccessorAnnotationVisitor$AccessorMappable"),
458456
getLibClassName("tinyremapper", "extension.mixin.hard.annotation.ImplementsAnnotationVisitor"),
459457
getLibClassName("tinyremapper", "extension.mixin.hard.annotation.ImplementsAnnotationVisitor$1"),
460458
getLibClassName("tinyremapper", "extension.mixin.hard.annotation.ImplementsAnnotationVisitor$InterfaceAnnotationVisitor"),
461459
getLibClassName("tinyremapper", "extension.mixin.hard.annotation.ImplementsAnnotationVisitor$SoftImplementsMappable"),
462-
getLibClassName("tinyremapper", "extension.mixin.hard.annotation.InvokerAnnotationVisitor"),
463-
getLibClassName("tinyremapper", "extension.mixin.hard.annotation.InvokerAnnotationVisitor$InvokerMappable"),
464460
getLibClassName("tinyremapper", "extension.mixin.hard.annotation.MixinAnnotationVisitor"),
465461
getLibClassName("tinyremapper", "extension.mixin.hard.annotation.MixinAnnotationVisitor$1"),
466462
getLibClassName("tinyremapper", "extension.mixin.hard.annotation.MixinAnnotationVisitor$2"),
@@ -477,10 +473,15 @@ private static void preloadClasses() {
477473
getLibClassName("tinyremapper", "extension.mixin.hard.util.IdentityString"),
478474
getLibClassName("tinyremapper", "extension.mixin.hard.util.PrefixString"),
479475
getLibClassName("tinyremapper", "extension.mixin.MixinExtension"),
476+
getLibClassName("tinyremapper", "extension.mixin.MixinExtension$AnalyzeVisitorProvider"),
480477
getLibClassName("tinyremapper", "extension.mixin.MixinExtension$AnnotationTarget"),
478+
getLibClassName("tinyremapper", "extension.mixin.MixinExtension$CLIProvider"),
479+
getLibClassName("tinyremapper", "extension.mixin.MixinExtension$PreApplyVisitorProvider"),
481480
getLibClassName("tinyremapper", "api.TrClass"),
482481
getLibClassName("tinyremapper", "api.TrEnvironment"),
483482
getLibClassName("tinyremapper", "api.TrField"),
483+
getLibClassName("tinyremapper", "api.TrLogger"),
484+
getLibClassName("tinyremapper", "api.TrLogger$Level"),
484485
getLibClassName("tinyremapper", "api.TrMember"),
485486
getLibClassName("tinyremapper", "api.TrMember$MemberType"),
486487
getLibClassName("tinyremapper", "api.TrMethod"),

0 commit comments

Comments
 (0)