From f35f563526f2f86db470239789d890a2691d7b32 Mon Sep 17 00:00:00 2001 From: ix0rai Date: Thu, 26 Sep 2024 17:03:08 -0500 Subject: [PATCH] why did i think this would be a 1 night fix --- .../proposal/CodecNameProposer.java | 6 ++--- .../proposal/ConflictFixProposer.java | 2 +- .../proposal/ConstantFieldNameProposer.java | 6 ++--- .../ConstructorParamsNameProposer.java | 6 ++--- .../DelegateParametersNameProposer.java | 5 ++-- .../proposal/EqualsNameProposer.java | 6 ++--- .../proposal/GetterSetterNameProposer.java | 6 ++--- .../proposal/LoggerNameProposer.java | 6 ++--- .../proposal/MojangNameProposer.java | 6 ++--- .../enigma_plugin/proposal/NameProposer.java | 5 +--- .../proposal/NameProposerService.java | 26 ++++++++----------- .../proposal/RecordComponentNameProposer.java | 6 ++--- .../proposal/SimpleTypeFieldNameProposer.java | 3 +-- .../com/example/z_conflicts/ConflictTest.java | 4 +-- 14 files changed, 34 insertions(+), 59 deletions(-) diff --git a/src/main/java/org/quiltmc/enigma_plugin/proposal/CodecNameProposer.java b/src/main/java/org/quiltmc/enigma_plugin/proposal/CodecNameProposer.java index 44b231b..fddd556 100644 --- a/src/main/java/org/quiltmc/enigma_plugin/proposal/CodecNameProposer.java +++ b/src/main/java/org/quiltmc/enigma_plugin/proposal/CodecNameProposer.java @@ -16,7 +16,6 @@ package org.quiltmc.enigma_plugin.proposal; -import org.jetbrains.annotations.Nullable; import org.quiltmc.enigma.api.analysis.index.jar.JarIndex; import org.quiltmc.enigma.api.translation.mapping.EntryMapping; import org.quiltmc.enigma.api.translation.representation.entry.Entry; @@ -25,15 +24,14 @@ import org.quiltmc.enigma_plugin.index.CodecIndex; import org.quiltmc.enigma_plugin.index.JarIndexer; -import java.util.List; import java.util.Map; public class CodecNameProposer extends NameProposer { public static final String ID = "codecs"; private final CodecIndex index; - public CodecNameProposer(JarIndexer index, @Nullable List proposerList) { - super(ID, proposerList); + public CodecNameProposer(JarIndexer index) { + super(ID); this.index = index.getIndex(CodecIndex.class); } diff --git a/src/main/java/org/quiltmc/enigma_plugin/proposal/ConflictFixProposer.java b/src/main/java/org/quiltmc/enigma_plugin/proposal/ConflictFixProposer.java index 055b817..5753888 100644 --- a/src/main/java/org/quiltmc/enigma_plugin/proposal/ConflictFixProposer.java +++ b/src/main/java/org/quiltmc/enigma_plugin/proposal/ConflictFixProposer.java @@ -18,7 +18,7 @@ public class ConflictFixProposer extends NameProposer { private final SimpleTypeSingleIndex index; public ConflictFixProposer(JarIndexer jarIndex) { - super(ID, null); + super(ID); this.index = jarIndex.getIndex(SimpleTypeSingleIndex.class); } diff --git a/src/main/java/org/quiltmc/enigma_plugin/proposal/ConstantFieldNameProposer.java b/src/main/java/org/quiltmc/enigma_plugin/proposal/ConstantFieldNameProposer.java index 693a868..cc39e5a 100644 --- a/src/main/java/org/quiltmc/enigma_plugin/proposal/ConstantFieldNameProposer.java +++ b/src/main/java/org/quiltmc/enigma_plugin/proposal/ConstantFieldNameProposer.java @@ -16,7 +16,6 @@ package org.quiltmc.enigma_plugin.proposal; -import org.jetbrains.annotations.Nullable; import org.quiltmc.enigma.api.analysis.index.jar.JarIndex; import org.quiltmc.enigma.api.translation.mapping.EntryMapping; import org.quiltmc.enigma.api.translation.representation.entry.Entry; @@ -24,15 +23,14 @@ import org.quiltmc.enigma_plugin.index.JarIndexer; import org.quiltmc.enigma_plugin.index.constant_fields.ConstantFieldIndex; -import java.util.List; import java.util.Map; public class ConstantFieldNameProposer extends NameProposer { public static final String ID = "constant_fields"; private final ConstantFieldIndex fieldIndex; - public ConstantFieldNameProposer(JarIndexer index, @Nullable List proposerList) { - super(ID, proposerList); + public ConstantFieldNameProposer(JarIndexer index) { + super(ID); this.fieldIndex = index.getIndex(ConstantFieldIndex.class); } diff --git a/src/main/java/org/quiltmc/enigma_plugin/proposal/ConstructorParamsNameProposer.java b/src/main/java/org/quiltmc/enigma_plugin/proposal/ConstructorParamsNameProposer.java index 2d87b8e..dbfef5b 100644 --- a/src/main/java/org/quiltmc/enigma_plugin/proposal/ConstructorParamsNameProposer.java +++ b/src/main/java/org/quiltmc/enigma_plugin/proposal/ConstructorParamsNameProposer.java @@ -16,7 +16,6 @@ package org.quiltmc.enigma_plugin.proposal; -import org.jetbrains.annotations.Nullable; import org.quiltmc.enigma.api.analysis.index.jar.JarIndex; import org.quiltmc.enigma.api.translation.mapping.EntryMapping; import org.quiltmc.enigma.api.translation.mapping.EntryRemapper; @@ -26,15 +25,14 @@ import org.quiltmc.enigma_plugin.index.ConstructorParametersIndex; import org.quiltmc.enigma_plugin.index.JarIndexer; -import java.util.List; import java.util.Map; public class ConstructorParamsNameProposer extends NameProposer { public static final String ID = "constructor_params"; private final ConstructorParametersIndex index; - public ConstructorParamsNameProposer(JarIndexer index, @Nullable List proposerList) { - super(ID, proposerList); + public ConstructorParamsNameProposer(JarIndexer index) { + super(ID); this.index = index.getIndex(ConstructorParametersIndex.class); } diff --git a/src/main/java/org/quiltmc/enigma_plugin/proposal/DelegateParametersNameProposer.java b/src/main/java/org/quiltmc/enigma_plugin/proposal/DelegateParametersNameProposer.java index 9af14d3..012fe72 100644 --- a/src/main/java/org/quiltmc/enigma_plugin/proposal/DelegateParametersNameProposer.java +++ b/src/main/java/org/quiltmc/enigma_plugin/proposal/DelegateParametersNameProposer.java @@ -16,7 +16,6 @@ package org.quiltmc.enigma_plugin.proposal; -import org.jetbrains.annotations.Nullable; import org.quiltmc.enigma.api.analysis.index.jar.JarIndex; import org.quiltmc.enigma.api.translation.mapping.EntryMapping; import org.quiltmc.enigma.api.translation.mapping.EntryRemapper; @@ -37,8 +36,8 @@ public class DelegateParametersNameProposer extends NameProposer { private static final List IGNORED_SOURCE_PLUGIN_IDS = Stream.of(ID, SimpleTypeFieldNameProposer.ID).map(NameProposer::getSourcePluginId).toList(); private final DelegateParametersIndex index; - public DelegateParametersNameProposer(JarIndexer index, @Nullable List proposerList) { - super(ID, proposerList); + public DelegateParametersNameProposer(JarIndexer index) { + super(ID); this.index = index.getIndex(DelegateParametersIndex.class); } diff --git a/src/main/java/org/quiltmc/enigma_plugin/proposal/EqualsNameProposer.java b/src/main/java/org/quiltmc/enigma_plugin/proposal/EqualsNameProposer.java index e03f032..9e18db9 100644 --- a/src/main/java/org/quiltmc/enigma_plugin/proposal/EqualsNameProposer.java +++ b/src/main/java/org/quiltmc/enigma_plugin/proposal/EqualsNameProposer.java @@ -16,7 +16,6 @@ package org.quiltmc.enigma_plugin.proposal; -import org.jetbrains.annotations.Nullable; import org.quiltmc.enigma.api.analysis.index.jar.EntryIndex; import org.quiltmc.enigma.api.analysis.index.jar.JarIndex; import org.quiltmc.enigma.api.translation.mapping.EntryMapping; @@ -25,15 +24,14 @@ import org.quiltmc.enigma.api.translation.representation.entry.LocalVariableEntry; import org.quiltmc.enigma.api.translation.representation.entry.MethodEntry; -import java.util.List; import java.util.Map; public class EqualsNameProposer extends NameProposer { public static final String ID = "equals"; private static final MethodDescriptor EQUALS_DESCRIPTOR = new MethodDescriptor("(Ljava/lang/Object;)Z"); - public EqualsNameProposer(@Nullable List proposerList) { - super(ID, proposerList); + public EqualsNameProposer() { + super(ID); } @Override diff --git a/src/main/java/org/quiltmc/enigma_plugin/proposal/GetterSetterNameProposer.java b/src/main/java/org/quiltmc/enigma_plugin/proposal/GetterSetterNameProposer.java index 099e5ad..af8bd01 100644 --- a/src/main/java/org/quiltmc/enigma_plugin/proposal/GetterSetterNameProposer.java +++ b/src/main/java/org/quiltmc/enigma_plugin/proposal/GetterSetterNameProposer.java @@ -16,7 +16,6 @@ package org.quiltmc.enigma_plugin.proposal; -import org.jetbrains.annotations.Nullable; import org.quiltmc.enigma.api.analysis.index.jar.JarIndex; import org.quiltmc.enigma.api.translation.mapping.EntryMapping; import org.quiltmc.enigma.api.translation.mapping.EntryRemapper; @@ -28,15 +27,14 @@ import org.quiltmc.enigma_plugin.index.JarIndexer; import org.quiltmc.enigma_plugin.util.Descriptors; -import java.util.List; import java.util.Map; public class GetterSetterNameProposer extends NameProposer { public static final String ID = "getter_setter"; private final GetterSetterIndex index; - public GetterSetterNameProposer(JarIndexer index, @Nullable List proposerList) { - super(ID, proposerList); + public GetterSetterNameProposer(JarIndexer index) { + super(ID); this.index = index.getIndex(GetterSetterIndex.class); } diff --git a/src/main/java/org/quiltmc/enigma_plugin/proposal/LoggerNameProposer.java b/src/main/java/org/quiltmc/enigma_plugin/proposal/LoggerNameProposer.java index 40bbaa6..e5fe56c 100644 --- a/src/main/java/org/quiltmc/enigma_plugin/proposal/LoggerNameProposer.java +++ b/src/main/java/org/quiltmc/enigma_plugin/proposal/LoggerNameProposer.java @@ -16,7 +16,6 @@ package org.quiltmc.enigma_plugin.proposal; -import org.jetbrains.annotations.Nullable; import org.quiltmc.enigma.api.analysis.index.jar.JarIndex; import org.quiltmc.enigma.api.translation.mapping.EntryMapping; import org.quiltmc.enigma.api.translation.representation.entry.Entry; @@ -24,7 +23,6 @@ import org.quiltmc.enigma_plugin.index.JarIndexer; import org.quiltmc.enigma_plugin.index.LoggerIndex; -import java.util.List; import java.util.Map; /** @@ -34,8 +32,8 @@ public class LoggerNameProposer extends NameProposer { public static final String ID = "logger"; private final LoggerIndex index; - public LoggerNameProposer(JarIndexer index, @Nullable List proposerList) { - super(ID, proposerList); + public LoggerNameProposer(JarIndexer index) { + super(ID); this.index = index.getIndex(LoggerIndex.class); } diff --git a/src/main/java/org/quiltmc/enigma_plugin/proposal/MojangNameProposer.java b/src/main/java/org/quiltmc/enigma_plugin/proposal/MojangNameProposer.java index 08dcc98..9c63b18 100644 --- a/src/main/java/org/quiltmc/enigma_plugin/proposal/MojangNameProposer.java +++ b/src/main/java/org/quiltmc/enigma_plugin/proposal/MojangNameProposer.java @@ -16,7 +16,6 @@ package org.quiltmc.enigma_plugin.proposal; -import org.jetbrains.annotations.Nullable; import org.quiltmc.enigma.api.analysis.index.jar.EntryIndex; import org.quiltmc.enigma.api.analysis.index.jar.JarIndex; import org.quiltmc.enigma.api.translation.mapping.EntryMapping; @@ -25,7 +24,6 @@ import org.quiltmc.enigma.api.translation.representation.entry.FieldEntry; import org.quiltmc.enigma.api.translation.representation.entry.MethodEntry; -import java.util.List; import java.util.Map; /** @@ -35,8 +33,8 @@ public class MojangNameProposer extends NameProposer { public static final String ID = "map_non_hashed"; - public MojangNameProposer(@Nullable List proposerList) { - super(ID, proposerList); + public MojangNameProposer() { + super(ID); } @Override diff --git a/src/main/java/org/quiltmc/enigma_plugin/proposal/NameProposer.java b/src/main/java/org/quiltmc/enigma_plugin/proposal/NameProposer.java index 166c70e..19d99ff 100644 --- a/src/main/java/org/quiltmc/enigma_plugin/proposal/NameProposer.java +++ b/src/main/java/org/quiltmc/enigma_plugin/proposal/NameProposer.java @@ -24,16 +24,13 @@ import org.quiltmc.enigma.api.translation.representation.entry.Entry; import org.quiltmc.enigma_plugin.QuiltEnigmaPlugin; -import java.util.ArrayList; -import java.util.List; import java.util.Map; public abstract class NameProposer { private final String id; - public NameProposer(String id, @Nullable List proposerList) { + public NameProposer(String id) { this.id = id; - //this.proposers.addAll(proposerList); } public String getSourcePluginId() { diff --git a/src/main/java/org/quiltmc/enigma_plugin/proposal/NameProposerService.java b/src/main/java/org/quiltmc/enigma_plugin/proposal/NameProposerService.java index af226ae..a78a86d 100644 --- a/src/main/java/org/quiltmc/enigma_plugin/proposal/NameProposerService.java +++ b/src/main/java/org/quiltmc/enigma_plugin/proposal/NameProposerService.java @@ -38,24 +38,20 @@ public class NameProposerService implements NameProposalService { private final List nameProposers = new ArrayList<>(); public NameProposerService(JarIndexer indexer, EnigmaServiceContext context) { - this.addIfEnabled(context, indexer, Arguments.DISABLE_RECORDS, (index) -> new RecordComponentNameProposer(index, this.nameProposers)); - this.addIfEnabled(context, indexer, Arguments.DISABLE_CONSTANT_FIELDS, (index) -> new ConstantFieldNameProposer(index, this.nameProposers)); - this.addIfEnabled(context, Arguments.DISABLE_EQUALS, () -> new EqualsNameProposer(this.nameProposers)); - this.addIfEnabled(context, indexer, Arguments.DISABLE_LOGGER, (index) -> new LoggerNameProposer(index, this.nameProposers)); - this.addIfEnabled(context, indexer, Arguments.DISABLE_CODECS, (index) -> new CodecNameProposer(index, this.nameProposers)); - this.addIfNotDisabled(context, Arguments.DISABLE_MAP_NON_HASHED, () -> new MojangNameProposer(this.nameProposers)); - - SimpleTypeFieldNameProposer proposer; + this.addIfEnabled(context, indexer, Arguments.DISABLE_RECORDS, RecordComponentNameProposer::new); + this.addIfEnabled(context, indexer, Arguments.DISABLE_CONSTANT_FIELDS, ConstantFieldNameProposer::new); + this.addIfEnabled(context, Arguments.DISABLE_EQUALS, EqualsNameProposer::new); + this.addIfEnabled(context, indexer, Arguments.DISABLE_LOGGER, LoggerNameProposer::new); + this.addIfEnabled(context, indexer, Arguments.DISABLE_CODECS, CodecNameProposer::new); + this.addIfNotDisabled(context, Arguments.DISABLE_MAP_NON_HASHED, MojangNameProposer::new); + if (indexer.getIndex(SimpleTypeSingleIndex.class).isEnabled()) { - proposer = new SimpleTypeFieldNameProposer(indexer); - this.nameProposers.add(proposer); - } else { - proposer = null; + this.nameProposers.add(new SimpleTypeFieldNameProposer(indexer)); } - this.addIfEnabled(context, indexer, Arguments.DISABLE_CONSTRUCTOR_PARAMS, (index) -> new ConstructorParamsNameProposer(index, List.of(proposer))); - this.addIfEnabled(context, indexer, Arguments.DISABLE_GETTER_SETTER, (index) -> new GetterSetterNameProposer(index, this.nameProposers)); - this.addIfEnabled(context, indexer, Arguments.DISABLE_DELEGATE_PARAMS, (index) -> new DelegateParametersNameProposer(index, List.of(proposer))); + this.addIfEnabled(context, indexer, Arguments.DISABLE_CONSTRUCTOR_PARAMS, ConstructorParamsNameProposer::new); + this.addIfEnabled(context, indexer, Arguments.DISABLE_GETTER_SETTER, GetterSetterNameProposer::new); + this.addIfEnabled(context, indexer, Arguments.DISABLE_DELEGATE_PARAMS, DelegateParametersNameProposer::new); // conflict fixer must be last in order to get context from other dynamic proposers this.addIfEnabled(context, indexer, Arguments.DISABLE_CONFLICT_FIXER, ConflictFixProposer::new); diff --git a/src/main/java/org/quiltmc/enigma_plugin/proposal/RecordComponentNameProposer.java b/src/main/java/org/quiltmc/enigma_plugin/proposal/RecordComponentNameProposer.java index d4cb917..ba736a0 100644 --- a/src/main/java/org/quiltmc/enigma_plugin/proposal/RecordComponentNameProposer.java +++ b/src/main/java/org/quiltmc/enigma_plugin/proposal/RecordComponentNameProposer.java @@ -16,7 +16,6 @@ package org.quiltmc.enigma_plugin.proposal; -import org.jetbrains.annotations.Nullable; import org.quiltmc.enigma.api.analysis.index.jar.JarIndex; import org.quiltmc.enigma.api.translation.mapping.EntryMapping; import org.quiltmc.enigma.api.translation.representation.entry.ClassEntry; @@ -26,15 +25,14 @@ import org.quiltmc.enigma_plugin.index.JarIndexer; import org.quiltmc.enigma_plugin.index.RecordIndex; -import java.util.List; import java.util.Map; public class RecordComponentNameProposer extends NameProposer { public static final String ID = "records"; private final RecordIndex index; - public RecordComponentNameProposer(JarIndexer index, @Nullable List proposerList) { - super(ID, proposerList); + public RecordComponentNameProposer(JarIndexer index) { + super(ID); this.index = index.getIndex(RecordIndex.class); } diff --git a/src/main/java/org/quiltmc/enigma_plugin/proposal/SimpleTypeFieldNameProposer.java b/src/main/java/org/quiltmc/enigma_plugin/proposal/SimpleTypeFieldNameProposer.java index 62d7ad7..fc1c103 100644 --- a/src/main/java/org/quiltmc/enigma_plugin/proposal/SimpleTypeFieldNameProposer.java +++ b/src/main/java/org/quiltmc/enigma_plugin/proposal/SimpleTypeFieldNameProposer.java @@ -24,7 +24,6 @@ import org.quiltmc.enigma_plugin.index.JarIndexer; import org.quiltmc.enigma_plugin.index.simple_type_single.SimpleTypeSingleIndex; -import java.util.ArrayList; import java.util.Map; public class SimpleTypeFieldNameProposer extends NameProposer { @@ -32,7 +31,7 @@ public class SimpleTypeFieldNameProposer extends NameProposer { private final SimpleTypeSingleIndex index; public SimpleTypeFieldNameProposer(JarIndexer index) { - super(ID, new ArrayList<>()); + super(ID); this.index = index.getIndex(SimpleTypeSingleIndex.class); } diff --git a/src/testInputs/java/com/example/z_conflicts/ConflictTest.java b/src/testInputs/java/com/example/z_conflicts/ConflictTest.java index 59159f7..139cc81 100644 --- a/src/testInputs/java/com/example/z_conflicts/ConflictTest.java +++ b/src/testInputs/java/com/example/z_conflicts/ConflictTest.java @@ -1,8 +1,8 @@ package com.example.z_conflicts; public class ConflictTest { - public int a; - public CharSequence b; + public final int a; + public final CharSequence b; public ConflictTest(int a, CharSequence b) { this.a = a;