From e0d1d73823bdd5795166cd038be545aac583a814 Mon Sep 17 00:00:00 2001 From: modmuss Date: Fri, 16 Aug 2024 10:45:32 +0100 Subject: [PATCH] Suppress some warnings from name proposal (#3926) --- .../filament/nameproposal/RecordComponentNameFinder.java | 5 +++++ mappings/net/minecraft/component/type/BookContent.mapping | 1 - .../component/type/WrittenBookContentComponent.mapping | 1 - 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/filament/src/main/java/net/fabricmc/filament/nameproposal/RecordComponentNameFinder.java b/filament/src/main/java/net/fabricmc/filament/nameproposal/RecordComponentNameFinder.java index 6305f9968f..8ccafe96cc 100644 --- a/filament/src/main/java/net/fabricmc/filament/nameproposal/RecordComponentNameFinder.java +++ b/filament/src/main/java/net/fabricmc/filament/nameproposal/RecordComponentNameFinder.java @@ -100,6 +100,11 @@ public void visitInvokeDynamicInsn(String name, String descriptor, Handle bootst for (int i = 2; i < bootstrapMethodArguments.length; i++) { if (bootstrapMethodArguments[i] instanceof Handle handle) { + if (!handle.getName().startsWith("comp_")) { + // Valid record bytecode, but doesn't have an intermediary name, making it impossible to match up with the record field or method + continue; + } + if (handle.getTag() == Opcodes.H_GETFIELD && handle.getOwner().equals(recordClassName)) { var argName = names[i - 2]; put(recordNames, handle.getName(), argName); diff --git a/mappings/net/minecraft/component/type/BookContent.mapping b/mappings/net/minecraft/component/type/BookContent.mapping index 097cc68996..902aab6fe8 100644 --- a/mappings/net/minecraft/component/type/BookContent.mapping +++ b/mappings/net/minecraft/component/type/BookContent.mapping @@ -1,4 +1,3 @@ CLASS net/minecraft/class_9364 net/minecraft/component/type/BookContent - METHOD comp_2422 pages ()Ljava/util/List; METHOD method_58186 withPages (Ljava/util/List;)Ljava/lang/Object; ARG 1 pages diff --git a/mappings/net/minecraft/component/type/WrittenBookContentComponent.mapping b/mappings/net/minecraft/component/type/WrittenBookContentComponent.mapping index 75bb1d09e8..8b464d90e9 100644 --- a/mappings/net/minecraft/component/type/WrittenBookContentComponent.mapping +++ b/mappings/net/minecraft/component/type/WrittenBookContentComponent.mapping @@ -1,5 +1,4 @@ CLASS net/minecraft/class_9302 net/minecraft/component/type/WrittenBookContentComponent - FIELD comp_2422 pages Ljava/util/List; FIELD field_49375 MAX_SERIALIZED_PAGE_LENGTH I FIELD field_49378 MAX_TITLE_LENGTH I FIELD field_49379 MAX_GENERATION I