Skip to content

Commit 3e8fa38

Browse files
authored
Added native EMI integration. (#358)
1 parent cee7dda commit 3e8fa38

File tree

4 files changed

+35
-6
lines changed

4 files changed

+35
-6
lines changed

CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1+
- Add native EMI integration (#358)

build.gradle.kts

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ val ccaVersion: String by project
3030
val clothVersion: String by project
3131
val modMenuVersion: String by project
3232
val ae2Version: String by project
33+
val guidemeVersion: String by project
3334
val architecturyVersion: String by project
3435
val runtimeItemlistMod: String by project
3536
val jeiMinecraftVersion: String by project
@@ -57,6 +58,7 @@ if (tag != "") {
5758
dependencies {
5859
add("minecraft", "net.neoforged:forge:${minecraftVersion}-${forgeVersion}")
5960

61+
implementation(fg.deobf("org.appliedenergistics:guideme:${guidemeVersion}"))
6062
implementation(fg.deobf("top.theillusivec4.curios:curios-forge:${curiosVersion}"))
6163
implementation(fg.deobf("me.shedaniel.cloth:cloth-config-${modloader}:${clothVersion}"))
6264
implementation(fg.deobf("dev.architectury:architectury-${modloader}:${architecturyVersion}"))
@@ -67,6 +69,7 @@ dependencies {
6769

6870
compileOnly(fg.deobf("me.shedaniel:RoughlyEnoughItems-${modloader}:${reiVersion}"))
6971
compileOnly(fg.deobf("mezz.jei:jei-${jeiMinecraftVersion}-${modloader}:${jeiVersion}"))
72+
compileOnly(fg.deobf("dev.emi:emi-${modloader}:${emiVersion}+${minecraftVersion}:api"))
7073

7174
when (runtimeItemlistMod) {
7275
"rei" -> runtimeOnly(fg.deobf("me.shedaniel:RoughlyEnoughItems-${modloader}:${reiVersion}"))
@@ -75,7 +78,7 @@ dependencies {
7578

7679
"emi" -> {
7780
runtimeOnly(fg.deobf("dev.emi:emi-${modloader}:${emiVersion}+${minecraftVersion}"))
78-
runtimeOnly(fg.deobf("mezz.jei:jei-${jeiMinecraftVersion}-${modloader}:${jeiVersion}"))
81+
//runtimeOnly(fg.deobf("mezz.jei:jei-${jeiMinecraftVersion}-${modloader}:${jeiVersion}"))
7982
}
8083
}
8184

gradle.properties

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ parchmentMinecraftVersion=1.20.1
55
parchmentVersion=2023.07.23
66
fabricLoaderVersion=0.14.22
77
# Mod Properties
8-
modVersion=0.0.0
8+
modVersion=15.2.3
99
mavenGroup=de.mari_023
1010
archivesBaseName=AE2WTLib
1111
# Dependencies
@@ -14,7 +14,8 @@ fabricApiVersion=0.88.1+1.20.1
1414
forgeVersion=47.1.54
1515
modloader=forge
1616

17-
ae2Version=15.0.12
17+
ae2Version=15.4.10
18+
guidemeVersion=20.1.12
1819
trinketsVersion=3.7.1
1920
#Trinkets dependency
2021
ccaVersion=5.2.1
@@ -25,9 +26,9 @@ modMenuVersion=7.1.0
2526
architecturyVersion=9.1.12
2627
jeiMinecraftVersion=1.20.1
2728
jeiVersion=15.2.0.23
28-
emiVersion=1.0.23
29+
emiVersion=1.1.22
2930

30-
runtimeItemlistMod=rei
31+
runtimeItemlistMod=emi
3132

3233
# Temp fix for Spotless
3334
# https://github.com/diffplug/spotless/issues/834
Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
package de.mari_023.ae2wtlib.reijei;
2+
3+
import de.mari_023.ae2wtlib.wct.WCTMenu;
4+
import de.mari_023.ae2wtlib.wet.WETMenu;
5+
import de.mari_023.ae2wtlib.wut.WUTHandler;
6+
import dev.emi.emi.api.EmiEntrypoint;
7+
import dev.emi.emi.api.EmiPlugin;
8+
import dev.emi.emi.api.EmiRegistry;
9+
import dev.emi.emi.api.recipe.VanillaEmiRecipeCategories;
10+
import dev.emi.emi.api.stack.EmiStack;
11+
12+
import appeng.integration.modules.emi.EmiEncodePatternHandler;
13+
import appeng.integration.modules.emi.EmiUseCraftingRecipeHandler;
14+
15+
@EmiEntrypoint
16+
public class AE2wtlibEmiPlugin implements EmiPlugin {
17+
@Override
18+
public void register(EmiRegistry registry) {
19+
registry.addRecipeHandler(WETMenu.TYPE, new EmiEncodePatternHandler<>(WETMenu.class));
20+
registry.addRecipeHandler(WCTMenu.TYPE, new EmiUseCraftingRecipeHandler<>(WCTMenu.class));
21+
22+
registry.addWorkstation(VanillaEmiRecipeCategories.CRAFTING,
23+
EmiStack.of(WUTHandler.wirelessTerminals.get("crafting").universalTerminal()));
24+
}
25+
}

0 commit comments

Comments
 (0)