sort configs properly

This commit is contained in:
FalsePattern committed 2023-05-23 14:07:25 +02:00
1 parent bf0c5978b9
commit 750626cb04
8 files changed
+99 -7

No files matched your search

@@ -25,6 +25,10 @@ import com.falsepattern.lib.StableAPI;
import com.falsepattern.lib.asm.IClassNodeTransformer;
import com.falsepattern.lib.asm.SmartTransformer;
import com.falsepattern.lib.internal.Tags;
import com.falsepattern.lib.internal.asm.transformers.ConfigOrderTransformer;
import com.falsepattern.lib.internal.asm.transformers.GasStationValidatorTransformer;
import com.falsepattern.lib.internal.asm.transformers.IMixinPluginTransformer;
import com.falsepattern.lib.internal.asm.transformers.ITypeDiscovererTransformer;
import lombok.Getter;
import lombok.experimental.Accessors;
import org.apache.logging.log4j.LogManager;
@@ -36,7 +40,7 @@ import java.util.List;
@Accessors(fluent = true)
@StableAPI(since = "__INTERNAL__")
public class FPTransformer implements SmartTransformer {
static final Logger LOG = LogManager.getLogger(Tags.MODNAME + " ASM");
public static final Logger LOG = LogManager.getLogger(Tags.MODNAME + " ASM");
@Getter
private final List<IClassNodeTransformer> transformers;
@@ -45,6 +49,9 @@ public class FPTransformer implements SmartTransformer {
private final Logger logger = LOG;
public FPTransformer() {
transformers = Arrays.asList(new IMixinPluginTransformer(), new ITypeDiscovererTransformer(), new GasStationValidatorTransformer());
transformers = Arrays.asList(new IMixinPluginTransformer(),
new ITypeDiscovererTransformer(),
new GasStationValidatorTransformer(),
new ConfigOrderTransformer());
}
}
@@ -0,0 +1,55 @@
package com.falsepattern.lib.internal.asm.transformers;
import com.falsepattern.lib.asm.IClassNodeTransformer;
import com.falsepattern.lib.config.Config;
import com.falsepattern.lib.internal.impl.config.DeclOrderInternal;
import lombok.val;
import org.objectweb.asm.Opcodes;
import org.objectweb.asm.Type;
import org.objectweb.asm.tree.AnnotationNode;
import org.objectweb.asm.tree.ClassNode;
import java.util.ArrayList;
import java.util.HashSet;
import java.util.Optional;
public class ConfigOrderTransformer implements IClassNodeTransformer {
private static final String DESC_CONFIG = Type.getDescriptor(Config.class);
private static final String DESC_CONFIG_IGNORE = Type.getDescriptor(Config.Ignore.class);
private static final String DESC_ORDER = Type.getDescriptor(DeclOrderInternal.class);
@Override
public String getName() {
return "ConfigOrderTransformer";
}
@Override
public boolean shouldTransform(ClassNode cn, String transformedName, boolean obfuscated) {
if (cn.visibleAnnotations != null) {
for (val ann : cn.visibleAnnotations) {
if (DESC_CONFIG.equals(ann.desc)) {
return true;
}
}
}
return false;
}
@Override
public void transform(ClassNode cn, String transformedName, boolean obfuscated) {
int order = 0;
for (val field: cn.fields) {
if ((field.access & Opcodes.ACC_PUBLIC) != 0 && (field.access & Opcodes.ACC_STATIC) != 0 && (field.access & Opcodes.ACC_FINAL) == 0) {
if (field.visibleAnnotations != null) {
for (val ann: field.visibleAnnotations) {
if (DESC_CONFIG_IGNORE.equals(ann.desc)) {
continue;
}
}
}
}
val annVisitor = field.visitAnnotation(DESC_ORDER, true);
annVisitor.visit("value", order++);
annVisitor.visitEnd();
}
}
}
@@ -19,9 +19,10 @@
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
package com.falsepattern.lib.internal.asm;
package com.falsepattern.lib.internal.asm.transformers;
import com.falsepattern.lib.asm.IClassNodeTransformer;
import com.falsepattern.lib.internal.asm.CoreLoadingPlugin;
import org.objectweb.asm.tree.ClassNode;
import static com.falsepattern.lib.mixin.MixinInfo.isClassPresentSafe;
@@ -19,10 +19,11 @@
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
package com.falsepattern.lib.internal.asm;
package com.falsepattern.lib.internal.asm.transformers;
import com.falsepattern.lib.asm.IClassNodeTransformer;
import com.falsepattern.lib.internal.Tags;
import com.falsepattern.lib.internal.asm.FPTransformer;
import lombok.val;
import org.objectweb.asm.tree.ClassNode;
import org.spongepowered.asm.mixin.extensibility.IMixinConfigPlugin;
@@ -19,7 +19,7 @@
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
package com.falsepattern.lib.internal.asm;
package com.falsepattern.lib.internal.asm.transformers;
import com.falsepattern.lib.asm.IClassNodeTransformer;
import lombok.val;