Skip to content

Commit 0286723

Browse files
6283262832
committed
Add integration with AppliedE (MEGA Transmutation Interface
1 parent 935a2ba commit 0286723

34 files changed

+686
-24
lines changed

‎build.gradle.kts‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ dependencies {
2121
api(libs.ae2)
2222

2323
compileOnly(libs.ae2wtlibapi)
24-
runtimeOnly(libs.ae2wtlib) { exclude("appeng") }
24+
runtimeOnly(libs.ae2wtlib)
2525

2626
implementation(libs.appmek)
2727
compileOnly(libs.mekanism)
@@ -37,6 +37,9 @@ dependencies {
3737
implementation(libs.appex)
3838
runtimeOnly(libs.explib)
3939

40+
implementation(libs.appliede)
41+
runtimeOnly(libs.projecte)
42+
4043
compileOnly(libs.appbot)
4144
compileOnly(libs.botania)
4245

‎settings.gradle.kts‎

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -81,24 +81,24 @@ run {
8181
versionCatalogs {
8282
val mc = "1.21.1"
8383
val maj = mc.substringAfter('.')
84-
val nf = "${maj + (if (!maj.contains('.')) ".0" else "")}.113"
84+
val nf = "${maj + (if (!maj.contains('.')) ".0" else "")}.119"
8585

8686
create("libs") {
8787
version("minecraft", mc)
8888

8989
version("neoforge", nf)
9090
version("parchment", "2024.11.17")
9191

92-
version("ae2", "19.2.1-beta")
92+
version("ae2", "19.2.5-beta")
9393
library("ae2", "org.appliedenergistics", "appliedenergistics2").versionRef("ae2")
9494

95-
version("ae2wtlib", "19.1.3-beta")
95+
version("ae2wtlib", "19.2.2")
9696
library("ae2wtlib", "de.mari_023", "ae2wtlib").versionRef("ae2wtlib")
9797
library("ae2wtlibapi", "de.mari_023", "ae2wtlib_api").versionRef("ae2wtlib")
9898

9999
version("appmek", "1.6.2")
100100
library("appmek", "curse.maven", "applied-mekanistics-574300").version("5978711")
101-
library("mekanism", "mekanism", "Mekanism").version("$mc-10.7.4.60")
101+
library("mekanism", "mekanism", "Mekanism").version("$mc-10.7.9.72")
102102

103103
library("appbot", "curse.maven", "applied-botanics-addon-610632").version("4904185")
104104
val botaniaVersion = "446"
@@ -114,8 +114,11 @@ run {
114114
library("appflux", "curse.maven", "applied-flux-965012").version("5946853")
115115
library("glodium", "curse.maven", "glodium-957920").version("5821676")
116116

117-
library("appex", "curse.maven", "applied-experienced-1157608").version("6080443")
117+
library("appex", "curse.maven", "applied-experienced-1157608").version("6112629")
118118
library("explib", "curse.maven", "experiencelib-1156551").version("5992832")
119+
120+
library("appliede", "curse.maven", "appliede-1009940").version("6328848")
121+
library("projecte", "curse.maven", "projecte-226410").version("6301953")
119122
}
120123

121124
create("testlibs") {

‎src/data/java/gripe/_90/megacells/datagen/MEGAModelProvider.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,9 +83,11 @@ protected void registerStatesAndModels() {
8383
simpleBlockWithItem(MEGABlocks.SKY_BRONZE_BLOCK.block(), cubeAll(MEGABlocks.SKY_BRONZE_BLOCK.block()));
8484
simpleBlockWithItem(MEGABlocks.SKY_OSMIUM_BLOCK.block(), cubeAll(MEGABlocks.SKY_OSMIUM_BLOCK.block()));
8585
simpleBlockWithItem(MEGABlocks.MEGA_INTERFACE.block(), cubeAll(MEGABlocks.MEGA_INTERFACE.block()));
86+
simpleBlockWithItem(MEGABlocks.MEGA_EMC_INTERFACE.block(), cubeAll(MEGABlocks.MEGA_EMC_INTERFACE.block()));
8687

8788
interfaceOrProviderPart(MEGAItems.MEGA_INTERFACE);
8889
interfaceOrProviderPart(MEGAItems.MEGA_PATTERN_PROVIDER);
90+
interfaceOrProviderPart(MEGAItems.MEGA_EMC_INTERFACE);
8991

9092
// CRAFTING UNITS
9193
for (var type : MEGACraftingUnitType.values()) {

‎src/data/java/gripe/_90/megacells/datagen/MEGARecipeProvider.java‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@
3939
import gripe._90.megacells.MEGACells;
4040
import gripe._90.megacells.datagen.integration.AppBotIntegrationData;
4141
import gripe._90.megacells.datagen.integration.AppMekIntegrationData;
42+
import gripe._90.megacells.datagen.integration.AppliedEIntegrationData;
4243
import gripe._90.megacells.datagen.integration.ArsEngIntegrationData;
4344
import gripe._90.megacells.definition.MEGABlocks;
4445
import gripe._90.megacells.definition.MEGAItems;
@@ -336,6 +337,14 @@ protected void buildRecipes(@NotNull RecipeOutput output) {
336337
.requires(MEGAItems.MEGA_PATTERN_PROVIDER)
337338
.unlockedBy("has_cable_mega_pattern_provider", has(MEGAItems.MEGA_PATTERN_PROVIDER))
338339
.save(output, MEGACells.makeId("network/mega_pattern_provider_block"));
340+
ShapelessRecipeBuilder.shapeless(RecipeCategory.MISC, MEGAItems.MEGA_EMC_INTERFACE)
341+
.requires(MEGABlocks.MEGA_EMC_INTERFACE)
342+
.unlockedBy("has_mega_emc_interface", has(MEGABlocks.MEGA_EMC_INTERFACE))
343+
.save(output, MEGACells.makeId("network/mega_emc_interface_part"));
344+
ShapelessRecipeBuilder.shapeless(RecipeCategory.MISC, MEGABlocks.MEGA_EMC_INTERFACE)
345+
.requires(MEGAItems.MEGA_EMC_INTERFACE)
346+
.unlockedBy("has_mega_emc_interface", has(MEGABlocks.MEGA_EMC_INTERFACE))
347+
.save(output, MEGACells.makeId("network/mega_emc_interface_block"));
339348

340349
ShapedRecipeBuilder.shaped(RecipeCategory.MISC, MEGAItems.CELL_DOCK)
341350
.pattern("ICI")
@@ -366,6 +375,10 @@ protected void buildRecipes(@NotNull RecipeOutput output) {
366375
if (Addons.ARSENG.isLoaded()) {
367376
ArsEngIntegrationData.recipes(output);
368377
}
378+
379+
if (Addons.APPLIEDE.isLoaded()) {
380+
AppliedEIntegrationData.recipes(output);
381+
}
369382
}
370383

371384
private static void component(RecipeOutput output, StorageTier tier, StorageTier preceding, Ingredient binder) {

‎src/data/java/gripe/_90/megacells/datagen/integration/AppliedEIntegrationData.java‎

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
package gripe._90.megacells.datagen.integration;
2+
3+
import java.util.concurrent.CompletableFuture;
4+
5+
import net.minecraft.core.HolderLookup;
6+
import net.minecraft.data.PackOutput;
7+
import net.minecraft.data.recipes.RecipeCategory;
8+
import net.minecraft.data.recipes.RecipeOutput;
9+
import net.minecraft.data.recipes.RecipeProvider;
10+
import net.minecraft.data.recipes.ShapelessRecipeBuilder;
11+
import net.neoforged.neoforge.common.conditions.ModLoadedCondition;
12+
13+
import gripe._90.appliede.AppliedE;
14+
import gripe._90.megacells.MEGACells;
15+
import gripe._90.megacells.definition.MEGABlocks;
16+
import gripe._90.megacells.definition.MEGAItems;
17+
import gripe._90.megacells.integration.Addons;
18+
19+
public class AppliedEIntegrationData extends RecipeProvider {
20+
public AppliedEIntegrationData(PackOutput output, CompletableFuture<HolderLookup.Provider> registries) {
21+
super(output, registries);
22+
}
23+
24+
public static void recipes(RecipeOutput output) {
25+
var conditional = output.withConditions(new ModLoadedCondition(Addons.APPLIEDE.getModId()));
26+
ShapelessRecipeBuilder.shapeless(RecipeCategory.MISC, MEGABlocks.MEGA_EMC_INTERFACE)
27+
.requires(AppliedE.EMC_INTERFACE)
28+
.requires(MEGAItems.ACCUMULATION_PROCESSOR)
29+
.unlockedBy("has_emc_interface", has(AppliedE.EMC_INTERFACE))
30+
.unlockedBy("has_accumulation_processor", has(MEGAItems.ACCUMULATION_PROCESSOR))
31+
.save(conditional, MEGACells.makeId("network/mega_emc_interface"));
32+
}
33+
}

‎src/generated/resources/assets/megacells/blockstates/mega_emc_interface.json‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"variants": {
3+
"": {
4+
"model": "megacells:block/mega_emc_interface"
5+
}
6+
}
7+
}

‎src/generated/resources/assets/megacells/lang/en_us.json‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
"block.megacells.mega_crafting_accelerator": "MEGA Crafting Co-Processing Unit",
88
"block.megacells.mega_crafting_monitor": "MEGA Crafting Monitor",
99
"block.megacells.mega_crafting_unit": "MEGA Crafting Unit",
10+
"block.megacells.mega_emc_interface": "MEGA Transmutation Interface",
1011
"block.megacells.mega_energy_cell": "Superdense Energy Cell",
1112
"block.megacells.mega_interface": "MEGA Interface",
1213
"block.megacells.mega_pattern_provider": "MEGA Pattern Provider",
@@ -37,6 +38,7 @@
3738
"item.megacells.accumulation_processor_press": "Inscriber Accumulation Press",
3839
"item.megacells.bulk_cell_component": "MEGA Bulk Storage Component",
3940
"item.megacells.bulk_item_cell": "MEGA Bulk Item Storage Cell",
41+
"item.megacells.cable_mega_emc_interface": "MEGA Transmutation Interface",
4042
"item.megacells.cable_mega_interface": "MEGA Interface",
4143
"item.megacells.cable_mega_pattern_provider": "MEGA Pattern Provider",
4244
"item.megacells.cell_component_16m": "16M MEGA Storage Component",

‎src/generated/resources/assets/megacells/models/block/mega_emc_interface.json‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"parent": "minecraft:block/cube_all",
3+
"textures": {
4+
"all": "megacells:block/mega_emc_interface"
5+
}
6+
}

‎src/generated/resources/assets/megacells/models/item/cable_mega_emc_interface.json‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
{
2+
"parent": "ae2:item/cable_interface",
3+
"textures": {
4+
"back": "megacells:part/mega_emc_interface_back",
5+
"front": "megacells:part/mega_emc_interface",
6+
"sides": "megacells:part/mega_monitor_sides"
7+
}
8+
}

‎src/generated/resources/assets/megacells/models/item/mega_emc_interface.json‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"parent": "megacells:block/mega_emc_interface"
3+
}

0 commit comments

Comments
 (0)