Auto discover mixins
This commit is contained in:
@@ -54,6 +54,11 @@ repositories {
|
|||||||
includeGroup("maven.modrinth")
|
includeGroup("maven.modrinth")
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
maven("https://repo.sleeping.town") {
|
||||||
|
content {
|
||||||
|
includeGroup("com.unascribed")
|
||||||
|
}
|
||||||
|
}
|
||||||
maven("https://server.bbkr.space/artifactory/libs-release")
|
maven("https://server.bbkr.space/artifactory/libs-release")
|
||||||
maven("https://repo.nea.moe/releases")
|
maven("https://repo.nea.moe/releases")
|
||||||
mavenLocal()
|
mavenLocal()
|
||||||
@@ -82,6 +87,8 @@ dependencies {
|
|||||||
modImplementation(libs.fabric.kotlin)
|
modImplementation(libs.fabric.kotlin)
|
||||||
modImplementation(libs.modmenu)
|
modImplementation(libs.modmenu)
|
||||||
modImplementation(libs.libgui)
|
modImplementation(libs.libgui)
|
||||||
|
modImplementation(libs.lib39.core)
|
||||||
|
include(libs.lib39.core)
|
||||||
include(libs.libgui)
|
include(libs.libgui)
|
||||||
modApi(libs.fabric.api)
|
modApi(libs.fabric.api)
|
||||||
modApi(libs.architectury)
|
modApi(libs.architectury)
|
||||||
|
|||||||
@@ -14,6 +14,7 @@ architectury = "8.1.79"
|
|||||||
neurepoparser = "1.1.0"
|
neurepoparser = "1.1.0"
|
||||||
qolify = "1.2.2-1.19.4"
|
qolify = "1.2.2-1.19.4"
|
||||||
citresewn = "1.1.3+1.19.4"
|
citresewn = "1.1.3+1.19.4"
|
||||||
|
lib39 = "1.4.2"
|
||||||
ncr = "Fabric-1.19.4-v2.1.1"
|
ncr = "Fabric-1.19.4-v2.1.1"
|
||||||
|
|
||||||
[libraries]
|
[libraries]
|
||||||
@@ -27,6 +28,7 @@ repoparser = { module = "moe.nea:neurepoparser", version.ref = "neurepoparser" }
|
|||||||
dbus_java_core = { module = "com.github.hypfvieh:dbus-java-core", version.ref = "dbus_java" }
|
dbus_java_core = { module = "com.github.hypfvieh:dbus-java-core", version.ref = "dbus_java" }
|
||||||
dbus_java_unixsocket = { module = "com.github.hypfvieh:dbus-java-transport-native-unixsocket", version.ref = "dbus_java" }
|
dbus_java_unixsocket = { module = "com.github.hypfvieh:dbus-java-transport-native-unixsocket", version.ref = "dbus_java" }
|
||||||
libgui = { module = "io.github.cottonmc:LibGui", version.ref = "libgui" }
|
libgui = { module = "io.github.cottonmc:LibGui", version.ref = "libgui" }
|
||||||
|
lib39_core = { module = "com.unascribed:lib39-core", version.ref = "lib39" }
|
||||||
|
|
||||||
# Runtime:
|
# Runtime:
|
||||||
architectury_fabric = { module = "dev.architectury:architectury-fabric", version.ref = "architectury" }
|
architectury_fabric = { module = "dev.architectury:architectury-fabric", version.ref = "architectury" }
|
||||||
|
|||||||
@@ -18,47 +18,25 @@
|
|||||||
|
|
||||||
package moe.nea.firmament.init;
|
package moe.nea.firmament.init;
|
||||||
|
|
||||||
import org.objectweb.asm.tree.ClassNode;
|
import com.unascribed.lib39.core.api.AutoMixin;
|
||||||
import org.spongepowered.asm.mixin.extensibility.IMixinConfigPlugin;
|
|
||||||
import org.spongepowered.asm.mixin.extensibility.IMixinInfo;
|
|
||||||
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Set;
|
|
||||||
|
|
||||||
public class MixinPlugin implements IMixinConfigPlugin {
|
// TODO: replace AutoMixin with KSP plugin?
|
||||||
@Override
|
public class MixinPlugin extends AutoMixin {
|
||||||
public void onLoad(String mixinPackage) {
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public String getRefMapperConfig() {
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean shouldApplyMixin(String targetClassName, String mixinClassName) {
|
public boolean shouldApplyMixin(String targetClassName, String mixinClassName) {
|
||||||
return Boolean.getBoolean("firmament.debug") ||
|
if (!Boolean.getBoolean("firmament.debug") && mixinClassName.contains("devenv.")) {
|
||||||
!mixinClassName.startsWith("moe.nea.firmament.mixins.devenv");
|
return false;
|
||||||
}
|
}
|
||||||
|
return super.shouldApplyMixin(targetClassName, mixinClassName);
|
||||||
@Override
|
|
||||||
public void acceptTargets(Set<String> myTargets, Set<String> otherTargets) {
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public List<String> getMixins() {
|
public List<String> getMixins() {
|
||||||
return null;
|
var autoDiscoveredMixins = super.getMixins();
|
||||||
}
|
autoDiscoveredMixins.removeIf(it -> !shouldApplyMixin(null, it));
|
||||||
|
return autoDiscoveredMixins;
|
||||||
@Override
|
|
||||||
public void preApply(String targetClassName, ClassNode targetClass, String mixinClassName, IMixinInfo mixinInfo) {
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void postApply(String targetClassName, ClassNode targetClass, String mixinClassName, IMixinInfo mixinInfo) {
|
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -3,23 +3,6 @@
|
|||||||
"plugin": "moe.nea.firmament.init.MixinPlugin",
|
"plugin": "moe.nea.firmament.init.MixinPlugin",
|
||||||
"package": "moe.nea.firmament.mixins",
|
"package": "moe.nea.firmament.mixins",
|
||||||
"compatibilityLevel": "JAVA_16",
|
"compatibilityLevel": "JAVA_16",
|
||||||
"client": [
|
|
||||||
"MixinDownloadingTerrainScreen",
|
|
||||||
"MixinMessageHandler",
|
|
||||||
"MixinMinecraft",
|
|
||||||
"MixinWorldRenderer",
|
|
||||||
"accessor.AccessorHandledScreen",
|
|
||||||
"devenv.DisableCommonPacketWarnings"
|
|
||||||
],
|
|
||||||
"mixins": [
|
|
||||||
"MixinClientPacketHandler",
|
|
||||||
"MixinClientPlayerEntity",
|
|
||||||
"MixinEntityIdFix",
|
|
||||||
"MixinHandledScreen",
|
|
||||||
"MixinPlayerInventory",
|
|
||||||
"devenv.DisableInvalidFishingHook",
|
|
||||||
"devenv.MixinScoreboard"
|
|
||||||
],
|
|
||||||
"injectors": {
|
"injectors": {
|
||||||
"defaultRequire": 1
|
"defaultRequire": 1
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user