-
-
Notifications
You must be signed in to change notification settings - Fork 230
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Fix mixin conflict with ImmPtl (#1232)
- Loading branch information
Showing
22 changed files
with
180 additions
and
32 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
6 changes: 6 additions & 0 deletions
6
arclight-common/src/main/java/io/izzel/arclight/common/mod/compat/ModIds.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,6 @@ | ||
| package io.izzel.arclight.common.mod.compat; | ||
|
|
||
| public class ModIds { | ||
|
|
||
| public static final String IMMERSIVE_PORTALS = "immersive_portals"; | ||
| } |
48 changes: 48 additions & 0 deletions
48
arclight-common/src/main/java/io/izzel/arclight/common/mod/mixins/LoadIfModProcessor.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,48 @@ | ||
| package io.izzel.arclight.common.mod.mixins; | ||
|
|
||
| import io.izzel.arclight.common.mod.ArclightCommon; | ||
| import io.izzel.arclight.common.mod.mixins.annotation.LoadIfMod; | ||
| import org.objectweb.asm.Type; | ||
| import org.objectweb.asm.tree.AnnotationNode; | ||
| import org.objectweb.asm.tree.ClassNode; | ||
|
|
||
| import java.util.Objects; | ||
|
|
||
| public class LoadIfModProcessor { | ||
|
|
||
| private static final String TYPE = Type.getDescriptor(LoadIfMod.class); | ||
|
|
||
| static boolean shouldApply(ClassNode node) { | ||
| for (var ann : node.invisibleAnnotations) { | ||
| if (ann.desc.equals(TYPE)) { | ||
| var loadIfModData = parse(ann); | ||
| return switch (loadIfModData.condition()) { | ||
| case ABSENT -> !ArclightCommon.api().isModLoaded(loadIfModData.modid()); | ||
| case PRESENT -> ArclightCommon.api().isModLoaded(loadIfModData.modid()); | ||
| }; | ||
| } | ||
| } | ||
| return true; | ||
| } | ||
|
|
||
| private static LoadIfModData parse(AnnotationNode ann) { | ||
| LoadIfMod.ModCondition condition = null; | ||
| String modid = null; | ||
| for (int i = 0; i < ann.values.size(); i += 2) { | ||
| var name = ((String) ann.values.get(i)); | ||
| var value = ann.values.get(i + 1); | ||
| switch (name) { | ||
| case "condition" -> { | ||
| var condName = ((String[]) value)[1]; | ||
| condition = LoadIfMod.ModCondition.valueOf(condName); | ||
| } | ||
| case "modid" -> modid = ((String) value); | ||
| } | ||
| } | ||
| return new LoadIfModData(Objects.requireNonNull(condition, "condition"), | ||
| Objects.requireNonNull(modid, "modid")); | ||
| } | ||
|
|
||
| private record LoadIfModData(LoadIfMod.ModCondition condition, String modid) { | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
38 changes: 38 additions & 0 deletions
38
arclight-common/src/main/java/io/izzel/arclight/common/mod/mixins/ShouldApplyProcessor.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,38 @@ | ||
| package io.izzel.arclight.common.mod.mixins; | ||
|
|
||
| import org.objectweb.asm.ClassReader; | ||
| import org.objectweb.asm.tree.ClassNode; | ||
|
|
||
| import java.io.IOException; | ||
| import java.util.List; | ||
| import java.util.function.Predicate; | ||
|
|
||
| public class ShouldApplyProcessor { | ||
|
|
||
| private static final List<Predicate<ClassNode>> PREDICATES = List.of( | ||
| PlatformMixinProcessor::shouldApply, | ||
| LoadIfModProcessor::shouldApply | ||
| ); | ||
|
|
||
| public static boolean shouldApply(String mixinClass) { | ||
| try (var stream = PlatformMixinProcessor.class.getClassLoader().getResourceAsStream(mixinClass.replace('.', '/') + ".class")) { | ||
| if (stream != null) { | ||
| var bytes = stream.readAllBytes(); | ||
| var cr = new ClassReader(bytes); | ||
| var node = new ClassNode(); | ||
| cr.accept(node, ClassReader.SKIP_CODE); | ||
| for (var predicate : PREDICATES) { | ||
| if (!predicate.test(node)) { | ||
| return false; | ||
| } | ||
| } | ||
| return true; | ||
| } else { | ||
| System.out.println(mixinClass); | ||
| } | ||
| return true; | ||
| } catch (IOException e) { | ||
| return true; | ||
| } | ||
| } | ||
| } |
20 changes: 20 additions & 0 deletions
20
arclight-common/src/main/java/io/izzel/arclight/common/mod/mixins/annotation/LoadIfMod.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,20 @@ | ||
| package io.izzel.arclight.common.mod.mixins.annotation; | ||
|
|
||
| import java.lang.annotation.ElementType; | ||
| import java.lang.annotation.Retention; | ||
| import java.lang.annotation.RetentionPolicy; | ||
| import java.lang.annotation.Target; | ||
|
|
||
| @Target(ElementType.TYPE) | ||
| @Retention(RetentionPolicy.CLASS) | ||
| public @interface LoadIfMod { | ||
|
|
||
| String modid(); | ||
|
|
||
| ModCondition condition(); | ||
|
|
||
| enum ModCondition { | ||
| ABSENT, | ||
| PRESENT | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
1 change: 0 additions & 1 deletion
1
arclight-fabric/src/main/java/io/izzel/arclight/fabric/mod/FabricArclightServer.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
12 changes: 12 additions & 0 deletions
12
arclight-forge/src/main/java/io/izzel/arclight/forge/mod/ForgeMixinPlugin.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,12 @@ | ||
| package io.izzel.arclight.forge.mod; | ||
|
|
||
| import io.izzel.arclight.common.mod.ArclightCommon; | ||
| import io.izzel.arclight.common.mod.ArclightMixinPlugin; | ||
|
|
||
| public class ForgeMixinPlugin extends ArclightMixinPlugin { | ||
|
|
||
| @Override | ||
| public void onLoad(String mixinPackage) { | ||
| ArclightCommon.setInstance(new ForgeCommonImpl()); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
12 changes: 12 additions & 0 deletions
12
arclight-neoforge/src/main/java/io/izzel/arclight/neoforge/mod/NeoForgeMixinPlugin.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,12 @@ | ||
| package io.izzel.arclight.neoforge.mod; | ||
|
|
||
| import io.izzel.arclight.common.mod.ArclightCommon; | ||
| import io.izzel.arclight.common.mod.ArclightMixinPlugin; | ||
|
|
||
| public class NeoForgeMixinPlugin extends ArclightMixinPlugin { | ||
|
|
||
| @Override | ||
| public void onLoad(String mixinPackage) { | ||
| ArclightCommon.setInstance(new NeoForgeCommonImpl()); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters