From 8a349ce684075ef0d7354893e2761a89ac6255e6 Mon Sep 17 00:00:00 2001 From: Fury_Phoenix <64714532+Phoenix-Starlight@users.noreply.github.com> Date: Tue, 12 Dec 2023 21:13:13 -0800 Subject: [PATCH] Don't assume common mixins is always present --- .../org/fury_phoenix/mixinAp/annotation/MixinProcessor.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/annotation-processor/src/main/java/org/fury_phoenix/mixinAp/annotation/MixinProcessor.java b/annotation-processor/src/main/java/org/fury_phoenix/mixinAp/annotation/MixinProcessor.java index c24ff5ce..30701624 100644 --- a/annotation-processor/src/main/java/org/fury_phoenix/mixinAp/annotation/MixinProcessor.java +++ b/annotation-processor/src/main/java/org/fury_phoenix/mixinAp/annotation/MixinProcessor.java @@ -6,6 +6,7 @@ import com.google.common.base.Throwables; import java.util.List; import java.util.HashMap; import java.util.Map; +import java.util.Optional; import java.util.Set; import java.util.stream.Collectors; import java.util.stream.Stream; @@ -43,7 +44,9 @@ public class MixinProcessor extends AbstractProcessor { if(roundEnv.processingOver()){ filterMixinSets(); // create record for serialization, compute package name - String packageName = mixinConfigList.get("mixins").get(0).split("(?<=mixin)")[0]; + String packageName = Optional.ofNullable(mixinConfigList.get("mixins")) + .orElse(mixinConfigList.get("client")) + .get(0).split("(?<=mixin)")[0]; finalizeMixinConfig(); new MixinConfig(packageName, mixinConfigList.get("mixins"), @@ -84,6 +87,7 @@ public class MixinProcessor extends AbstractProcessor { private void filterMixinSets() { List commonSet = mixinConfigList.get("mixins"); + if(commonSet == null) return; commonSet.removeAll(mixinConfigList.get("client")); }