More tweaks

FabricMC · Oct 15, 2024 · e59407e · e59407e
1 parent dfb17c3
commit e59407e
Show file tree

Hide file tree

Showing 8 changed files with 13 additions and 13 deletions.
diff --git a/src/main/java/net/fabricmc/tinyremapper/AsmClassRemapper.java b/src/main/java/net/fabricmc/tinyremapper/AsmClassRemapper.java
@@ -287,7 +287,7 @@ private Handle getLambdaImplementedMethod(String name, String desc, Handle bsm,
 			} else if (knownIndyBsm.contains(bsm.getOwner())) {
 				return null;
 			} else {
-				tr.getEnvironment().getLogger().warn("unknown invokedynamic bsm: %s/%s%s (tag=%d iif=%b)", bsm.getOwner(), bsm.getName(), bsm.getDesc(), bsm.getTag(), bsm.isInterface());
+				tr.getLogger().warn("unknown invokedynamic bsm: %s/%s%s (tag=%d iif=%b)", bsm.getOwner(), bsm.getName(), bsm.getDesc(), bsm.getTag(), bsm.isInterface());
 				return null;
 			}
 		}

diff --git a/src/main/java/net/fabricmc/tinyremapper/extension/mixin/common/ResolveUtility.java b/src/main/java/net/fabricmc/tinyremapper/extension/mixin/common/ResolveUtility.java
@@ -63,7 +63,7 @@ public Optional<TrClass> resolveClass(String name) {
 		TrClass _class = environment.getClass(name);
 
 		if (_class == null && !StringUtility.isInternalClassName(name)) {
-			logger.error(String.format(Message.CANNOT_RESOLVE_CLASS, name));
+			logger.error(Message.CANNOT_RESOLVE_CLASS, name);
 		}
 
 		return Optional.ofNullable(_class);

diff --git a/...et/fabricmc/tinyremapper/extension/mixin/hard/annotation/ImplementsAnnotationVisitor.java b/...et/fabricmc/tinyremapper/extension/mixin/hard/annotation/ImplementsAnnotationVisitor.java
@@ -184,7 +184,7 @@ protected Optional<String> getMappedName() {
 			List<String> collection = stream.distinct().collect(Collectors.toList());
 
 			if (collection.size() > 1) {
-				data.getLogger().error(String.format(Message.CONFLICT_MAPPING, self.getName(), collection));
+				data.getLogger().error(Message.CONFLICT_MAPPING, self.getName(), collection);
 			}
 
 			return collection.stream().findFirst();

diff --git a/src/main/java/net/fabricmc/tinyremapper/extension/mixin/hard/util/ConvertibleMappable.java b/src/main/java/net/fabricmc/tinyremapper/extension/mixin/hard/util/ConvertibleMappable.java
@@ -62,9 +62,9 @@ protected Optional<String> getMappedName() {
 				.collect(Collectors.toList());
 
 		if (collection.size() > 1) {
-			data.getLogger().error(String.format(Message.CONFLICT_MAPPING, self.getName(), collection));
+			data.getLogger().error(Message.CONFLICT_MAPPING, self.getName(), collection);
 		} else if (collection.isEmpty()) {
-			data.getLogger().warn(String.format(Message.NO_MAPPING_RECURSIVE, self.getName(), targets));
+			data.getLogger().warn(Message.NO_MAPPING_RECURSIVE, self.getName(), targets);
 		}
 
 		return collection.stream().findFirst();

diff --git a/.../fabricmc/tinyremapper/extension/mixin/soft/annotation/injection/AtAnnotationVisitor.java b/.../fabricmc/tinyremapper/extension/mixin/soft/annotation/injection/AtAnnotationVisitor.java
@@ -138,7 +138,7 @@ private static class AtMethodMappable implements IMappable<MemberInfo> {
 		@Override
 		public MemberInfo result() {
 			if (!info.isFullyQualified()) {
-				data.getLogger().warn(String.format(Message.NOT_FULLY_QUALIFIED, info));
+				data.getLogger().warn(Message.NOT_FULLY_QUALIFIED, info);
 				return info;
 			}
 

diff --git a/...yremapper/extension/mixin/soft/annotation/injection/CommonInjectionAnnotationVisitor.java b/...yremapper/extension/mixin/soft/annotation/injection/CommonInjectionAnnotationVisitor.java
@@ -112,9 +112,9 @@ public MemberInfo result() {
 					.distinct().collect(Collectors.toList());
 
 			if (collection.size() > 1) {
-				data.getLogger().error(String.format(Message.CONFLICT_MAPPING, info.getName(), collection));
+				data.getLogger().error(Message.CONFLICT_MAPPING, info.getName(), collection);
 			} else if (collection.isEmpty()) {
-				data.getLogger().warn(String.format(Message.NO_MAPPING_NON_RECURSIVE, info.getName(), targets));
+				data.getLogger().warn(Message.NO_MAPPING_NON_RECURSIVE, info.getName(), targets);
 			}
 
 			return collection.stream().findFirst()

diff --git a/...abricmc/tinyremapper/extension/mixin/soft/annotation/injection/DescAnnotationVisitor.java b/...abricmc/tinyremapper/extension/mixin/soft/annotation/injection/DescAnnotationVisitor.java
@@ -137,7 +137,7 @@ public void visitEnd() {
 				if (proposedName == null) {
 					proposedName = remapped;
 				} else if (!proposedName.equals(remapped)) {
-					data.getLogger().error(String.format(Message.MULTIPLE_MAPPING_CHOICES, value + desc, owner + "." + remapped + desc, proposedName + desc));
+					data.getLogger().error(Message.MULTIPLE_MAPPING_CHOICES, value + desc, owner + "." + remapped + desc, proposedName + desc);
 				}
 			}
 
@@ -148,7 +148,7 @@ public void visitEnd() {
 			}
 		} else if (expectedType == MemberType.FIELD) {
 			if (ret == null) {
-				data.getLogger().warn(String.format(Message.NOT_FULLY_QUALIFIED, owner + "." + value));
+				data.getLogger().warn(Message.NOT_FULLY_QUALIFIED, owner + "." + value);
 				super.visit("value", value);
 				super.visitEnd();
 				return;
@@ -169,7 +169,7 @@ public void visitEnd() {
 				if (proposedName == null) {
 					proposedName = remapped;
 				} else if (!proposedName.equals(remapped)) {
-					data.getLogger().error(String.format(Message.MULTIPLE_MAPPING_CHOICES, value + desc, owner + "." + remapped + desc, proposedName + desc));
+					data.getLogger().error(Message.MULTIPLE_MAPPING_CHOICES, value + desc, owner + "." + remapped + desc, proposedName + desc);
 				}
 			}
 

diff --git a/src/main/java/net/fabricmc/tinyremapper/extension/mixin/soft/util/NamedMappable.java b/src/main/java/net/fabricmc/tinyremapper/extension/mixin/soft/util/NamedMappable.java
@@ -61,9 +61,9 @@ public String result() {
 				.distinct().collect(Collectors.toList());
 
 		if (collection.size() > 1) {
-			data.getLogger().error(String.format(Message.CONFLICT_MAPPING, this.name, collection));
+			data.getLogger().error(Message.CONFLICT_MAPPING, this.name, collection);
 		} else if (collection.isEmpty()) {
-			data.getLogger().warn(String.format(Message.NO_MAPPING_RECURSIVE, this.name, targets));
+			data.getLogger().warn(Message.NO_MAPPING_RECURSIVE, this.name, targets);
 		}
 
 		return collection.stream().findFirst().orElse(name);