Added a compatibility layer to make AAE work with ae2cl

build.gradle

@@ -117,6 +117,7 @@ repositories {
         name = "ftbMavenReleases"
         url = uri("https://maven.ftb.dev/releases")
     }
+    maven { url = "https://maven.bawnorton.com/releases" }
 }
 
 version = mod_version
@@ -196,6 +197,10 @@ dependencies {
     // Apply Mixin AP
     annotationProcessor('org.spongepowered:mixin:0.8.5:processor')
 
+    // Mixin squared
+    compileOnly(annotationProcessor("com.github.bawnorton.mixinsquared:mixinsquared-common:0.3.7-beta.1"))
+    implementation(jarJar("com.github.bawnorton.mixinsquared:mixinsquared-forge:0.3.7-beta.1"))
+
     // JEI, EMI, Jade
     modCompileOnly("mezz.jei:jei-${minecraft_version}-forge-api:${jei_version}")
     modCompileOnly("mezz.jei:jei-${minecraft_version}-common-api:${jei_version}")
@@ -235,6 +240,9 @@ dependencies {
 
     // MAE2 for cloud chamber effects
     modImplementation("curse.maven:mae2-1028068:7084998")
+
+    // AAE because we need to redo their mixin
+    modCompileOnly("maven.modrinth:advancedae:${aae_version}")
 }
 
 tasks.named('processResources', ProcessResources).configure {

gradle.properties

@@ -31,10 +31,11 @@ org.gradle.jvmargs=-Xmx1G
     configuration_version=2.2.0
     jei_version=15.20.0.118
     emi_version = 1.1.22
-    mae2_version = 2.0.0-beta.g
+    mae2_version = 2.0.0-beta.i
     oculus_version = 1.20.1-1.8.0
     embeddium_version = 0.3.31+mc1.20.1
     ftblibrary_version = 2001.2.4
     ftbteams_version = 2001.3.0
     jade_version = 11.6.3
-    ae2_version=15.4.10-cosmolite.32
+    ae2_version=15.4.10-cosmolite.33
+    aae_version=1.3.2-1.20.1

src/generated/resources/assets/monilabs/lang/en_ud.json

@@ -76,6 +76,7 @@
   "gtceu.placeholder_info.sculkVatXPBuffer.0": "˙ʇɐΛ ʞןnɔS ǝɥʇ ɟo ɹǝɟɟnq ԀX ʇuǝɹɹnɔ ǝɥʇ suɹnʇǝᴚ",
   "gtceu.placeholder_info.sculkVatXPBuffer.1": ":ǝbɐs∩",
   "gtceu.placeholder_info.sculkVatXPBuffer.2": ")sʇǝʞɔnqıןןıɯ uı ǝnןɐʌ( :pǝɹoʇS ԀX >- }ɹǝɟɟnᗺԀXʇɐΛʞןnɔs{  ",
+  "gui.ae2.With": "ɥʇıM",
   "item.monilabs.max_conveyor_module": "ǝןnpoW ɹoʎǝʌuoƆ XⱯW",
   "item.monilabs.max_electric_motor": "ɹoʇoW ɔıɹʇɔǝןƎ XⱯW",
   "item.monilabs.max_electric_piston": "uoʇsıԀ ɔıɹʇɔǝןƎ XⱯW",

src/generated/resources/assets/monilabs/lang/en_us.json

@@ -76,6 +76,7 @@
   "gtceu.placeholder_info.sculkVatXPBuffer.0": "Returns the current XP buffer of the Sculk Vat.",
   "gtceu.placeholder_info.sculkVatXPBuffer.1": "Usage:",
   "gtceu.placeholder_info.sculkVatXPBuffer.2": "  {sculkVatXPBuffer} -> XP Stored: (value in millibuckets)",
+  "gui.ae2.With": "With",
   "item.monilabs.max_conveyor_module": "MAX Conveyor Module",
   "item.monilabs.max_electric_motor": "MAX Electric Motor",
   "item.monilabs.max_electric_piston": "MAX Electric Piston",

src/main/java/net/neganote/monilabs/data/lang/MoniLangHandler.java

@@ -187,6 +187,8 @@ public static void init(RegistrateLangProvider provider) {
         provider.add("config.jade.plugin_monilabs.sculk_vat_xp_info", "Sculk Vat XP Buffer Info");
         provider.add("config.jade.plugin_monilabs.omnic_synth_info", "Omnic Synthesizer Info");
 
+        provider.add("gui.ae2.With", "With");
+
         multiLang(provider, "gtceu.placeholder_info.prismacColor",
                 "Returns the current color of the Prismatic Crucible.",
                 "Usage:",