Revert name change to "accessWidener" across most of the codebase - partial revert of #486

AlexIIL · AlexIIL · commit fa0d7b5f9a60 · 2025-12-09T15:47:43.000Z
diff --git a/src/main/java/org/quiltmc/loader/api/ModMetadataToBeMovedToPlugins.java b/src/main/java/org/quiltmc/loader/api/ModMetadataToBeMovedToPlugins.java
@@ -38,7 +38,7 @@ public interface ModMetadataToBeMovedToPlugins extends ModMetadata {
 	 */
 	Collection<String> mixins(EnvType env);
 
-	Collection<String> classTweakers();
+	Collection<String> accessWideners();
 
 	ModEnvironment environment();
 }
diff --git a/src/main/java/org/quiltmc/loader/impl/fabric/metadata/V0ModMetadataFabric.java b/src/main/java/org/quiltmc/loader/impl/fabric/metadata/V0ModMetadataFabric.java
@@ -273,7 +273,7 @@ public Collection<String> getMixinConfigs(EnvType type) {
 	}
 
 	@Override
-	public String getClassTweaker() {
+	public String getAccessWidener() {
 		return null; // intentional null
 	}
 
diff --git a/src/main/java/org/quiltmc/loader/impl/fabric/metadata/V1ModMetadataFabric.java b/src/main/java/org/quiltmc/loader/impl/fabric/metadata/V1ModMetadataFabric.java
@@ -61,7 +61,7 @@ final class V1ModMetadataFabric extends AbstractModMetadata implements FabricLoa
 	private final Collection<NestedJarEntry> jars;
 	private final Collection<MixinEntry> mixins;
 	@Nullable
-	private final String classTweaker;
+	private final String accessWidener;
 
 	// Optional (dependency resolution)
 	private Collection<ModDependency> dependencies;
@@ -88,7 +88,7 @@ final class V1ModMetadataFabric extends AbstractModMetadata implements FabricLoa
 
 	V1ModMetadataFabric(String id, Version version, Collection<String> provides,
 						ModEnvironment environment, Map<String, List<EntrypointMetadata>> entrypoints, Collection<NestedJarEntry> jars,
-						Collection<MixinEntry> mixins, @Nullable String classTweaker,
+						Collection<MixinEntry> mixins, @Nullable String accessWidener,
 						Collection<ModDependency> dependencies, boolean hasRequires,
 			/* @Nullable */ String name, @Nullable String description,
 						Collection<Person> authors, Collection<Person> contributors, @Nullable ContactInformation contact, Collection<String> license, IconEntry icon,
@@ -101,7 +101,7 @@ final class V1ModMetadataFabric extends AbstractModMetadata implements FabricLoa
 		this.entrypoints = Collections.unmodifiableMap(entrypoints);
 		this.jars = Collections.unmodifiableCollection(jars);
 		this.mixins = Collections.unmodifiableCollection(mixins);
-		this.classTweaker = classTweaker;
+		this.accessWidener = accessWidener;
 		this.dependencies = Collections.unmodifiableCollection(dependencies);
 		this.hasRequires = hasRequires;
 		this.name = name;
@@ -264,8 +264,8 @@ public Collection<String> getMixinConfigs(EnvType type) {
 	}
 
 	@Override
-	public String getClassTweaker() {
-		return this.classTweaker;
+	public String getAccessWidener() {
+		return this.accessWidener;
 	}
 
 	@Override
diff --git a/src/main/java/org/quiltmc/loader/impl/fabric/metadata/V1ModMetadataParser.java b/src/main/java/org/quiltmc/loader/impl/fabric/metadata/V1ModMetadataParser.java
@@ -69,7 +69,7 @@ static FabricLoaderModMetadata parse(JsonReader reader) throws IOException, Pars
 		Map<String, List<EntrypointMetadata>> entrypoints = new HashMap<>();
 		List<NestedJarEntry> jars = new ArrayList<>();
 		List<V1ModMetadataFabric.MixinEntry> mixins = new ArrayList<>();
-		String classTweaker = null;
+		String accessWidener = null;
 
 		// Optional (dependency resolution)
 		List<ModDependency> dependencies = new ArrayList<>();
@@ -152,7 +152,7 @@ static FabricLoaderModMetadata parse(JsonReader reader) throws IOException, Pars
 					throw new ParseMetadataException("Access Widener file must be a string", reader);
 				}
 
-				classTweaker = reader.nextString();
+				accessWidener = reader.nextString();
 				break;
 			case "depends":
 				readDependenciesContainer(reader, ModDependency.Kind.DEPENDS, dependencies);
@@ -232,7 +232,7 @@ static FabricLoaderModMetadata parse(JsonReader reader) throws IOException, Pars
 		FabricModMetadataReader.logWarningMessages(id, warnings);
 
 		return new V1ModMetadataFabric(id, version, provides,
-				environment, entrypoints, jars, mixins, classTweaker,
+				environment, entrypoints, jars, mixins, accessWidener,
 				dependencies, hasRequires,
 				name, description, authors, contributors, contact, license, icon, languageAdapters, customValues);
 	}
diff --git a/src/main/java/org/quiltmc/loader/impl/metadata/FabricLoaderModMetadata.java b/src/main/java/org/quiltmc/loader/impl/metadata/FabricLoaderModMetadata.java
@@ -47,7 +47,7 @@ default String getOldStyleLanguageAdapter() {
 	Collection<NestedJarEntry> getJars();
 	Collection<String> getMixinConfigs(EnvType type);
 	@Nullable
-	String getClassTweaker();
+	String getAccessWidener();
 	@Override
 	boolean loadsInEnvironment(EnvType type);
 
diff --git a/src/main/java/org/quiltmc/loader/impl/metadata/GeneralExt2FabricMetadata.java b/src/main/java/org/quiltmc/loader/impl/metadata/GeneralExt2FabricMetadata.java
@@ -325,7 +325,7 @@ public Collection<String> getMixinConfigs(EnvType type) {
 	}
 
 	@Override
-	public @Nullable String getClassTweaker() {
+	public @Nullable String getAccessWidener() {
 		throw internalError();
 	}
 
diff --git a/src/main/java/org/quiltmc/loader/impl/metadata/qmj/FabricModMetadataWrapper.java b/src/main/java/org/quiltmc/loader/impl/metadata/qmj/FabricModMetadataWrapper.java
@@ -285,8 +285,8 @@ public Collection<String> mixins(EnvType env) {
 	}
 
 	@Override
-	public Collection<String> classTweakers() {
-		String acc = fabricMeta.getClassTweaker();
+	public Collection<String> accessWideners() {
+		String acc = fabricMeta.getAccessWidener();
 		return acc == null ? Collections.emptyList() : Collections.singleton(acc);
 	}
 
diff --git a/src/main/java/org/quiltmc/loader/impl/metadata/qmj/ProvidedModMetadata.java b/src/main/java/org/quiltmc/loader/impl/metadata/qmj/ProvidedModMetadata.java
@@ -71,8 +71,8 @@ public String name() {
 	}
 
 	@Override
-	public Collection<String> classTweakers() {
-		return metadata.classTweakers();
+	public Collection<String> accessWideners() {
+		return metadata.accessWideners();
 	}
 
 	@Override
diff --git a/src/main/java/org/quiltmc/loader/impl/metadata/qmj/V1ModMetadataBuilder.java b/src/main/java/org/quiltmc/loader/impl/metadata/qmj/V1ModMetadataBuilder.java
@@ -64,7 +64,7 @@ public class V1ModMetadataBuilder {
 	public final List<String> repositories = new ArrayList<>();
 	/* TODO: Move to plugins */
 	public final Map<EnvType, List<String>> mixins = new HashMap<>();
-	public final List<String> classTweakers = new ArrayList<>();
+	public final List<String> accessWideners = new ArrayList<>();
 	public ModEnvironment env = ModEnvironment.UNIVERSAL;
 
 	public InternalModMetadata build() {
diff --git a/src/main/java/org/quiltmc/loader/impl/metadata/qmj/V1ModMetadataImpl.java b/src/main/java/org/quiltmc/loader/impl/metadata/qmj/V1ModMetadataImpl.java
@@ -67,7 +67,7 @@ final class V1ModMetadataImpl implements InternalModMetadata {
 	private final Map<String, String> languageAdapters;
 	private final Collection<String> repositories;
 	private final Map<EnvType, Collection<String>> mixins;
-	private final Collection<String> classTweakers;
+	private final Collection<String> accessWideners;
 	private final ModEnvironment environment;
 	private final @Nullable ModPlugin plugin;
 	private QuiltModMetadataWrapperFabric cache2fabricNoContainer;
@@ -131,7 +131,7 @@ final class V1ModMetadataImpl implements InternalModMetadata {
 
 		// Move to plugins
 		this.mixins = Collections.unmodifiableMap(builder.mixins);
-		this.classTweakers = Collections.unmodifiableCollection(builder.classTweakers);
+		this.accessWideners = Collections.unmodifiableCollection(builder.accessWideners);
 		this.environment = builder.env;
 
 		// Experimental
@@ -310,8 +310,8 @@ public Collection<String> mixins(EnvType env) {
 	}
 
 	@Override
-	public Collection<String> classTweakers() {
-		return this.classTweakers;
+	public Collection<String> accessWideners() {
+		return this.accessWideners;
 	}
 
 	@Override
diff --git a/src/main/java/org/quiltmc/loader/impl/metadata/qmj/V1ModMetadataReader.java b/src/main/java/org/quiltmc/loader/impl/metadata/qmj/V1ModMetadataReader.java
@@ -415,10 +415,10 @@ private V1ModMetadataImpl readFields(JsonLoaderValue.ObjectImpl root) {
 			if (awValue != null) {
 				switch (awValue.type()) {
 					case ARRAY:
-						readStringList((JsonLoaderValue.ArrayImpl) awValue, "access_widener", builder.classTweakers);
+						readStringList((JsonLoaderValue.ArrayImpl) awValue, "access_widener", builder.accessWideners);
 						break;
 					case STRING:
-						builder.classTweakers.add(awValue.asString());
+						builder.accessWideners.add(awValue.asString());
 						break;
 					default:
 						throw parseException(awValue, "mixin value must be an array of strings or a string");
diff --git a/src/main/java/org/quiltmc/loader/impl/transformer/RuntimeModRemapper.java b/src/main/java/org/quiltmc/loader/impl/transformer/RuntimeModRemapper.java
@@ -201,9 +201,9 @@ private void remap0(TransformCache cache, QuiltLauncher launcher, Set<InputTag>
 			// Run while the remapper is doing its thing.
 			for (ModLoadOption mod : modsToRemap) {
 				RemapInfo info = infoMap.get(mod);
-				if (!mod.metadata().classTweakers().isEmpty()) {
+				if (!mod.metadata().accessWideners().isEmpty()) {
 					info.classTweakers = new HashMap<>();
-					for (String classTweaker : mod.metadata().classTweakers()) {
+					for (String classTweaker : mod.metadata().accessWideners()) {
 						// use resourceRoot as the info.inputPath only contains class files
 						info.classTweakers.put(classTweaker, remapClassTweaker(Files.readAllBytes(mod.resourceRoot().resolve(classTweaker)), remapper.getRemapper()));
 					}
diff --git a/src/main/java/org/quiltmc/loader/impl/transformer/TransformCache.java b/src/main/java/org/quiltmc/loader/impl/transformer/TransformCache.java
@@ -91,7 +91,7 @@ public TransformCache(Path root, List<ModLoadOption> orderedMods) {
 
 						}
 					}
-					for (String aw : mod.metadata().classTweakers()) {
+					for (String aw : mod.metadata().accessWideners()) {
 						copyFile(modSrc.resolve(aw), modSrc, modDst);
 					}
 
diff --git a/src/main/java/org/quiltmc/loader/impl/transformer/TransformCacheGenerator.java b/src/main/java/org/quiltmc/loader/impl/transformer/TransformCacheGenerator.java
@@ -112,7 +112,7 @@ private static ClassTweaker loadClassTweakers(TransformCache cache) {
 		ClassTweakerReader classTweakerReader = ClassTweakerReader.create(ret);
 
 		for (ModLoadOption mod : cache.getModsInCache()) {
-			for (String classTweaker : mod.metadata().classTweakers()) {
+			for (String classTweaker : mod.metadata().accessWideners()) {
 
 				Path path = cache.getRoot(mod).resolve(classTweaker);
 
diff --git a/src/test/java/net/fabricmc/test/V1ModJsonParsingTests.java b/src/test/java/net/fabricmc/test/V1ModJsonParsingTests.java
@@ -148,7 +148,7 @@ private void validateRequiredValues(FabricLoaderModMetadata metadata) {
 	public void testLongFile() throws IOException, ParseMetadataException {
 		final FabricLoaderModMetadata modMetadata = parseMetadata(specPath.resolve("long.json"));
 
-		if (!modMetadata.getClassTweaker().equals("examplemod.accessWidener")) {
+		if (!modMetadata.getAccessWidener().equals("examplemod.accessWidener")) {
 			throw new RuntimeException("Incorrect access widener entry");
 		}
 

Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@ public interface ModMetadataToBeMovedToPlugins extends ModMetadata {`
`38`	`38`	`*/`
`39`	`39`	`Collection<String> mixins(EnvType env);`
`40`	`40`
`41`		`- Collection<String> classTweakers();`
	`41`	`+ Collection<String> accessWideners();`
`42`	`42`
`43`	`43`	`ModEnvironment environment();`
`44`	`44`	`}`
Original file line number	Diff line number	Diff line change
`@@ -273,7 +273,7 @@ public Collection<String> getMixinConfigs(EnvType type) {`
`273`	`273`	`}`
`274`	`274`
`275`	`275`	`@Override`
`276`		`- public String getClassTweaker() {`
	`276`	`+ public String getAccessWidener() {`
`277`	`277`	`return null; // intentional null`
`278`	`278`	`}`
`279`	`279`
Original file line number	Diff line number	Diff line change
`@@ -325,7 +325,7 @@ public Collection<String> getMixinConfigs(EnvType type) {`
`325`	`325`	`}`
`326`	`326`
`327`	`327`	`@Override`
`328`		`- public @Nullable String getClassTweaker() {`
	`328`	`+ public @Nullable String getAccessWidener() {`
`329`	`329`	`throw internalError();`
`330`	`330`	`}`
`331`	`331`
Original file line number	Diff line number	Diff line change
`@@ -285,8 +285,8 @@ public Collection<String> mixins(EnvType env) {`
`285`	`285`	`}`
`286`	`286`
`287`	`287`	`@Override`
`288`		`- public Collection<String> classTweakers() {`
`289`		`- String acc = fabricMeta.getClassTweaker();`
	`288`	`+ public Collection<String> accessWideners() {`
	`289`	`+ String acc = fabricMeta.getAccessWidener();`
`290`	`290`	`return acc == null ? Collections.emptyList() : Collections.singleton(acc);`
`291`	`291`	`}`
`292`	`292`
Original file line number	Diff line number	Diff line change
`@@ -71,8 +71,8 @@ public String name() {`
`71`	`71`	`}`
`72`	`72`
`73`	`73`	`@Override`
`74`		`- public Collection<String> classTweakers() {`
`75`		`- return metadata.classTweakers();`
	`74`	`+ public Collection<String> accessWideners() {`
	`75`	`+ return metadata.accessWideners();`
`76`	`76`	`}`
`77`	`77`
`78`	`78`	`@Override`