R3944Realms/ModernFix
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Don't assume common mixins is always present

Browse Source
This commit is contained in:
Fury_Phoenix 2023-12-12 21:13:13 -08:00
parent da5e64280b
commit 8a349ce684
No known key found for this signature in database
GPG Key ID: 0595F98084987DB8
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
annotation-processor/src/main/java/org/fury_phoenix/mixinAp/annotation/MixinProcessor.java
View File

@ -6,6 +6,7 @@ import com.google.common.base.Throwables;
import java.util.List; import java.util.List;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
import java.util.Optional;
import java.util.Set; import java.util.Set;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import java.util.stream.Stream; import java.util.stream.Stream;
@ -43,7 +44,9 @@ public class MixinProcessor extends AbstractProcessor {
if(roundEnv.processingOver()){ if(roundEnv.processingOver()){
filterMixinSets(); filterMixinSets();
// create record for serialization, compute package name // 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(); finalizeMixinConfig();
new MixinConfig(packageName, new MixinConfig(packageName,
mixinConfigList.get("mixins"), mixinConfigList.get("mixins"),
@ -84,6 +87,7 @@ public class MixinProcessor extends AbstractProcessor {
private void filterMixinSets() { private void filterMixinSets() {
List<String> commonSet = mixinConfigList.get("mixins"); List<String> commonSet = mixinConfigList.get("mixins");
if(commonSet == null) return;
commonSet.removeAll(mixinConfigList.get("client")); commonSet.removeAll(mixinConfigList.get("client"));
} }