Skip to content

Commit c80fd13

Browse files
committed
Changed the displayed mod for the emi interface
1 parent 6224b1f commit c80fd13

File tree

4 files changed

+32
-14
lines changed

4 files changed

+32
-14
lines changed

Diff for: gradle.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ loader_version_range=[4,)
1414
mod_id=advanced_ae
1515
mod_name=Advanced AE
1616
mod_license=LGPL-3.0
17-
mod_version=0.4-1.21.1
17+
mod_version=0.4.1-1.21.1
1818
mod_group_id=net.pedroksl.advanced_ae
1919
mod_authors=Pedroksl
2020
mod_description=This mod aims to expand on the added capabilities of Extended AE.

Diff for: src/main/java/net/pedroksl/advanced_ae/xmod/emi/EMIPlugin.java

+25-4
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,18 @@
11
package net.pedroksl.advanced_ae.xmod.emi;
22

3+
import java.util.ArrayList;
34
import java.util.Arrays;
45
import java.util.List;
56
import java.util.function.Function;
67

8+
import com.glodblock.github.glodium.recipe.stack.IngredientStack;
9+
710
import net.minecraft.network.chat.Component;
811
import net.minecraft.resources.ResourceLocation;
9-
import net.minecraft.world.item.crafting.Recipe;
10-
import net.minecraft.world.item.crafting.RecipeHolder;
11-
import net.minecraft.world.item.crafting.RecipeInput;
12-
import net.minecraft.world.item.crafting.RecipeType;
12+
import net.minecraft.world.item.crafting.*;
1313
import net.minecraft.world.level.ItemLike;
14+
import net.neoforged.neoforge.fluids.FluidStack;
15+
import net.neoforged.neoforge.fluids.crafting.FluidIngredient;
1416
import net.pedroksl.advanced_ae.AdvancedAE;
1517
import net.pedroksl.advanced_ae.common.definitions.AAEBlocks;
1618
import net.pedroksl.advanced_ae.recipes.ReactionChamberRecipe;
@@ -21,6 +23,7 @@
2123
import dev.emi.emi.api.EmiRegistry;
2224
import dev.emi.emi.api.recipe.EmiInfoRecipe;
2325
import dev.emi.emi.api.recipe.EmiRecipe;
26+
import dev.emi.emi.api.stack.EmiIngredient;
2427
import dev.emi.emi.api.stack.EmiStack;
2528

2629
@EmiEntrypoint
@@ -45,4 +48,22 @@ private static void addInfo(EmiRegistry registry, ItemLike item, Component... de
4548
registry.addRecipe(new EmiInfoRecipe(
4649
List.of(EmiStack.of(item)), Arrays.stream(desc).toList(), null));
4750
}
51+
52+
public static EmiIngredient stackOf(IngredientStack.Item stack) {
53+
return !stack.isEmpty() ? EmiIngredient.of(stack.getIngredient(), stack.getAmount()) : EmiStack.EMPTY;
54+
}
55+
56+
public static EmiIngredient stackOf(IngredientStack.Fluid stack) {
57+
FluidIngredient ingredient = stack.getIngredient();
58+
List<EmiIngredient> list = new ArrayList();
59+
FluidStack[] var3 = ingredient.getStacks();
60+
int var4 = var3.length;
61+
62+
for (int var5 = 0; var5 < var4; ++var5) {
63+
FluidStack fluid = var3[var5];
64+
list.add(EmiStack.of(fluid.getFluid(), stack.getAmount()));
65+
}
66+
67+
return EmiIngredient.of(list, stack.getAmount());
68+
}
4869
}

Diff for: src/main/java/net/pedroksl/advanced_ae/xmod/emi/recipes/AAERecipeCategory.java

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,16 @@
11
package net.pedroksl.advanced_ae.xmod.emi.recipes;
22

3-
import com.glodblock.github.extendedae.ExtendedAE;
4-
53
import net.minecraft.network.chat.Component;
64

75
import dev.emi.emi.api.recipe.EmiRecipeCategory;
86
import dev.emi.emi.api.render.EmiRenderable;
7+
import net.pedroksl.advanced_ae.AdvancedAE;
98

109
public class AAERecipeCategory extends EmiRecipeCategory {
1110
private final Component name;
1211

1312
public AAERecipeCategory(String id, EmiRenderable icon, Component name) {
14-
super(ExtendedAE.id(id), icon);
13+
super(AdvancedAE.makeId(id), icon);
1514
this.name = name;
1615
}
1716

Diff for: src/main/java/net/pedroksl/advanced_ae/xmod/emi/recipes/EMIReactionChamberRecipe.java

+4-6
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
package net.pedroksl.advanced_ae.xmod.emi.recipes;
22

3-
import com.glodblock.github.extendedae.xmod.emi.recipes.EMIStackUtil;
4-
53
import net.minecraft.network.chat.Component;
64
import net.minecraft.resources.ResourceLocation;
75
import net.minecraft.world.item.crafting.RecipeHolder;
@@ -31,11 +29,11 @@ public EMIReactionChamberRecipe(RecipeHolder<ReactionChamberRecipe> holder) {
3129
this.recipe = holder.value();
3230
for (var in : this.recipe.getInputs()) {
3331
if (!in.isEmpty()) {
34-
this.inputs.add(EMIStackUtil.of(in));
32+
this.inputs.add(EMIPlugin.stackOf(in));
3533
}
3634
}
3735
if (this.recipe.getFluid() != null) {
38-
this.inputs.add(EMIStackUtil.of(this.recipe.getFluid()));
36+
this.inputs.add(EMIPlugin.stackOf(this.recipe.getFluid()));
3937
}
4038
this.outputs.add(EmiStack.of(this.recipe.getResultItem()));
4139
}
@@ -60,12 +58,12 @@ public void addWidgets(WidgetHolder widgets) {
6058
int x = 11;
6159
for (var in : this.recipe.getInputs()) {
6260
if (!in.isEmpty()) {
63-
widgets.addSlot(EMIStackUtil.of(in), x, 5).drawBack(false);
61+
widgets.addSlot(EMIPlugin.stackOf(in), x, 5).drawBack(false);
6462
x += 18;
6563
}
6664
}
6765
if (this.recipe.getFluid() != null) {
68-
widgets.addSlot(EMIStackUtil.of(this.recipe.getFluid()), 29, 24).drawBack(false);
66+
widgets.addSlot(EMIPlugin.stackOf(this.recipe.getFluid()), 29, 24).drawBack(false);
6967
}
7068
widgets.addSlot(EmiStack.of(recipe.getResultItem()), 99, 5)
7169
.recipeContext(this)

0 commit comments

Comments
 (0)