Update and enable EMI in dev

Author: pupnewfster

build.gradle

@@ -42,8 +42,7 @@ idea {
 }
 
 ext {
-    versionProperties = ["version"    : mod_version, "mc_version": minecraft_version_range, "forge_version": forge_version_range, "loader_version": loader_version_range,
-                         "emi_version": emi_version_range]
+    versionProperties = ["version"    : mod_version, "mc_version": minecraft_version_range, "forge_version": forge_version_range, "loader_version": loader_version_range]
     jsonPatterns = ["**/*.json", "**/*.mcmeta"]
     secondaryModules = ['additions', 'defense', 'generators', 'tools']
     extraTypes = ['datagen']
@@ -432,10 +431,10 @@ dependencies {
         //runtimeOnly("mezz.jei:jei-${previous_minor_minecraft_version}-neoforge:${jei_version}")
     }
 
-    compileOnly("dev.emi:emi-neoforge:${emi_version}+${previous_minor_minecraft_version}:api")
+    compileOnly("dev.emi:emi-neoforge:${emi_version}+${minecraft_version}:api")
 
     if (recipe_viewer == "emi" || recipe_viewer == "hybrid") {
-        runtimeOnly("dev.emi:emi-neoforge:${emi_version}+${previous_minor_minecraft_version}")
+        runtimeOnly("dev.emi:emi-neoforge:${emi_version}+${minecraft_version}")
     }
 
     //TODO - 1.19: Re-enable once https://github.com/Chisel-Team/ConnectedTexturesMod/pull/204 is merged

gradle.properties

@@ -28,15 +28,15 @@ neogradle.subsystems.parchment.mappingsVersion=2024.02.25
 
 #misc settings
 # recipe viewer, currently accepts: jei, emi, hybrid
-recipe_viewer=jei
+recipe_viewer=emi
 
 #datagen
 yamlops_version=1.2.0
 
 #Mod dependencies
 crafttweaker_version=17.0.3
 curios_version=7.3.4+1.20.4
-emi_version=1.1.4
+emi_version=1.1.6
 jade_api_id=5111969
 jade_id=5109393
 jei_version=17.3.0.49
@@ -45,7 +45,7 @@ top_version=1.20.4_neo-11.0.1-2
 wthit_version=10.4.0
 
 #Mod dependency min version ranges
-emi_version_range=[1.1.4,)
+
 
 #Mod dependency min version ranges until next MC version. For deps that we need a min version of but otherwise don't have to force ourselves loading after
 

src/main/java/mekanism/client/recipe_viewer/emi/ChemicalEmiIngredientSerializer.java

@@ -6,7 +6,7 @@
 import mekanism.api.annotations.NothingNullByDefault;
 import mekanism.api.chemical.Chemical;
 import net.minecraft.core.Registry;
-import net.minecraft.nbt.CompoundTag;
+import net.minecraft.core.component.DataComponentPatch;
 import net.minecraft.resources.ResourceLocation;
 
 @NothingNullByDefault
@@ -27,7 +27,7 @@ public EmiStack create(CHEMICAL chemical) {
     }
 
     @Override
-    public EmiStack create(ResourceLocation id, CompoundTag nbt, long amount) {
+    public EmiStack create(ResourceLocation id, DataComponentPatch ignored, long amount) {
         Optional<CHEMICAL> chemical = registry.getOptional(id).filter(c -> !c.isEmptyType());
         if (chemical.isPresent()) {
             return stackCreator.create(chemical.get(), amount);

src/main/java/mekanism/client/recipe_viewer/emi/ChemicalEmiStack.java

@@ -24,6 +24,7 @@
 import net.minecraft.client.gui.GuiGraphics;
 import net.minecraft.client.gui.screens.inventory.tooltip.ClientTooltipComponent;
 import net.minecraft.client.renderer.texture.TextureAtlasSprite;
+import net.minecraft.core.component.DataComponentPatch;
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.network.chat.Component;
 import net.minecraft.resources.ResourceLocation;
@@ -82,10 +83,9 @@ public boolean isEmpty() {
         return chemical.isEmptyType() || amount == 0;
     }
 
-    @Nullable
     @Override
-    public CompoundTag getNbt() {
-        return null;
+    public DataComponentPatch getComponentChanges() {
+        return DataComponentPatch.EMPTY;
     }
 
     @Override
@@ -145,6 +145,10 @@ public static ChemicalEmiStack<?> create(Chemical<?> chemical, long amount) {
 
     public static class GasEmiStack extends ChemicalEmiStack<Gas> {
 
+        public GasEmiStack(Gas gas, DataComponentPatch ignored, long amount) {
+            this(gas, amount);
+        }
+
         public GasEmiStack(Gas gas, long amount) {
             super(gas, amount);
         }
@@ -157,6 +161,10 @@ protected GasEmiStack construct(Gas gas, long amount) {
 
     public static class InfusionEmiStack extends ChemicalEmiStack<InfuseType> {
 
+        public InfusionEmiStack(InfuseType infuseType, DataComponentPatch ignored, long amount) {
+            this(infuseType, amount);
+        }
+
         public InfusionEmiStack(InfuseType infuseType, long amount) {
             super(infuseType, amount);
         }
@@ -169,6 +177,10 @@ protected InfusionEmiStack construct(InfuseType infuseType, long amount) {
 
     public static class PigmentEmiStack extends ChemicalEmiStack<Pigment> {
 
+        public PigmentEmiStack(Pigment pigment, DataComponentPatch ignored, long amount) {
+            this(pigment, amount);
+        }
+
         public PigmentEmiStack(Pigment pigment, long amount) {
             super(pigment, amount);
         }
@@ -181,6 +193,10 @@ protected PigmentEmiStack construct(Pigment pigment, long amount) {
 
     public static class SlurryEmiStack extends ChemicalEmiStack<Slurry> {
 
+        public SlurryEmiStack(Slurry slurry, DataComponentPatch ignored, long amount) {
+            this(slurry, amount);
+        }
+
         public SlurryEmiStack(Slurry slurry, long amount) {
             super(slurry, amount);
         }

src/main/java/mekanism/client/recipe_viewer/emi/EmiGhostIngredientHandler.java

@@ -52,8 +52,7 @@ private static Object getFirstSupportedStack(IGhostIngredientConsumer handler, E
             if (emiStack.getKey() instanceof Item) {
                 raw = emiStack.getItemStack();
             } else if (emiStack.getKey() instanceof Fluid fluid) {
-                //TODO - 1.20.5: Components
-                raw = new FluidStack(fluid, FluidType.BUCKET_VOLUME);
+                raw = new FluidStack(fluid.builtInRegistryHolder(), FluidType.BUCKET_VOLUME, emiStack.getComponentChanges());
             } else if (emiStack.getKey() instanceof Chemical<?> chemical) {
                 raw = chemical.getStack(emiStack.getAmount());
             }

src/main/java/mekanism/client/recipe_viewer/emi/MekanismEmi.java

@@ -9,6 +9,7 @@
 import dev.emi.emi.api.recipe.VanillaEmiRecipeCategories;
 import dev.emi.emi.api.stack.Comparison;
 import dev.emi.emi.api.stack.EmiIngredient;
+import dev.emi.emi.api.stack.EmiRegistryAdapter;
 import dev.emi.emi.api.stack.EmiStack;
 import java.util.ArrayList;
 import java.util.Collection;
@@ -98,26 +99,30 @@ public class MekanismEmi implements EmiPlugin {
 
     @SuppressWarnings("Convert2Diamond")//Can't be detected properly
     private static final ChemicalEmiIngredientSerializer<Gas, GasEmiStack> GAS_SERIALIZER = new ChemicalEmiIngredientSerializer<Gas, GasEmiStack>("Gas", MekanismAPI.GAS_REGISTRY, GasEmiStack::new);
+    private static final EmiRegistryAdapter<Gas> GAS_REGISTRY_ADAPTER = EmiRegistryAdapter.simple(Gas.class, MekanismAPI.GAS_REGISTRY, GasEmiStack::new);
     @SuppressWarnings("Convert2Diamond")//Can't be detected properly
     private static final ChemicalEmiIngredientSerializer<InfuseType, InfusionEmiStack> INFUSION_SERIALIZER = new ChemicalEmiIngredientSerializer<InfuseType, InfusionEmiStack>("Infuse Type", MekanismAPI.INFUSE_TYPE_REGISTRY, InfusionEmiStack::new);
+    private static final EmiRegistryAdapter<InfuseType> INFUSE_TYPE_REGISTRY_ADAPTER = EmiRegistryAdapter.simple(InfuseType.class, MekanismAPI.INFUSE_TYPE_REGISTRY, InfusionEmiStack::new);
     @SuppressWarnings("Convert2Diamond")//Can't be detected properly
     private static final ChemicalEmiIngredientSerializer<Pigment, PigmentEmiStack> PIGMENT_SERIALIZER = new ChemicalEmiIngredientSerializer<Pigment, PigmentEmiStack>("Pigment", MekanismAPI.PIGMENT_REGISTRY, PigmentEmiStack::new);
+    private static final EmiRegistryAdapter<Pigment> PIGMENT_REGISTRY_ADAPTER = EmiRegistryAdapter.simple(Pigment.class, MekanismAPI.PIGMENT_REGISTRY, PigmentEmiStack::new);
     @SuppressWarnings("Convert2Diamond")//Can't be detected properly
     private static final ChemicalEmiIngredientSerializer<Slurry, SlurryEmiStack> SLURRY_SERIALIZER = new ChemicalEmiIngredientSerializer<Slurry, SlurryEmiStack>("Slurry", MekanismAPI.SLURRY_REGISTRY, SlurryEmiStack::new);
+    private static final EmiRegistryAdapter<Slurry> SLURRY_REGISTRY_ADAPTER = EmiRegistryAdapter.simple(Slurry.class, MekanismAPI.SLURRY_REGISTRY, SlurryEmiStack::new);
 
-    //TODO - 1.20.4: I believe this doesn't work because of https://github.com/emilyploszaj/emi/issues/475
     private static final Comparison MEKANISM_COMPARISON = Comparison.compareData(emiStack -> {
-        ItemStack stack = emiStack.getItemStack();
         //TODO - 1.20.5: Re-evaluate if we want the components check or if it should check it slightly differently?
-        if (!stack.getComponents().isEmpty()) {
+        if (!emiStack.getComponentChanges().isEmpty()) {
             Set<Object> representation = new HashSet<>();
+            ItemStack stack = emiStack.getItemStack();
             addChemicalComponent(representation, stack, ContainerType.GAS, Capabilities.GAS.item());
             addChemicalComponent(representation, stack, ContainerType.INFUSION, Capabilities.INFUSION.item());
             addChemicalComponent(representation, stack, ContainerType.PIGMENT, Capabilities.PIGMENT.item());
             addChemicalComponent(representation, stack, ContainerType.SLURRY, Capabilities.SLURRY.item());
             addFluidComponent(representation, stack);
             addEnergyComponent(representation, stack);
             if (!representation.isEmpty()) {
+
                 return representation;
             }
         }
@@ -204,7 +209,11 @@ public void initialize(EmiInitRegistry registry) {
         registry.addIngredientSerializer(InfusionEmiStack.class, INFUSION_SERIALIZER);
         registry.addIngredientSerializer(PigmentEmiStack.class, PIGMENT_SERIALIZER);
         registry.addIngredientSerializer(SlurryEmiStack.class, SLURRY_SERIALIZER);
-        //TODO - 1.20.4: Add a support for tag ingredients https://github.com/emilyploszaj/emi/issues/483
+        //TODO - 1.20.5: Test this works properly for getting things to display as tags
+        registry.addRegistryAdapter(GAS_REGISTRY_ADAPTER);
+        registry.addRegistryAdapter(INFUSE_TYPE_REGISTRY_ADAPTER);
+        registry.addRegistryAdapter(PIGMENT_REGISTRY_ADAPTER);
+        registry.addRegistryAdapter(SLURRY_REGISTRY_ADAPTER);
     }
 
     private <CHEMICAL extends Chemical<CHEMICAL>> void addEmiStacks(EmiRegistry emiRegistry, ChemicalEmiIngredientSerializer<CHEMICAL, ?> serializer) {
@@ -217,7 +226,6 @@ private <CHEMICAL extends Chemical<CHEMICAL>> void addEmiStacks(EmiRegistry emiR
 
     @Override
     public void register(EmiRegistry registry) {
-        //TODO - 1.20.4: Tooltips in EMI in mekanism screens render behind the items rendered in EMI https://github.com/emilyploszaj/emi/issues/480
         addEmiStacks(registry, GAS_SERIALIZER);
         addEmiStacks(registry, INFUSION_SERIALIZER);
         addEmiStacks(registry, PIGMENT_SERIALIZER);

src/main/java/mekanism/client/recipe_viewer/emi/widget/MekanismTankEmiWidget.java

@@ -54,8 +54,7 @@ public void drawStack(GuiGraphics graphics, int mouseX, int mouseY, float delta)
                 MekanismRenderer.color(graphics, chemical);
                 sprite = MekanismRenderer.getChemicalTexture(chemical);
             } else if (stack.getKey() instanceof Fluid fluid) {
-                //TODO - 1.20.5: Components
-                FluidStack fluidStack = new FluidStack(fluid, MathUtils.clampToInt(ingredient.getAmount()));
+                FluidStack fluidStack = new FluidStack(fluid.builtInRegistryHolder(), MathUtils.clampToInt(ingredient.getAmount()), stack.getComponentChanges());
                 MekanismRenderer.color(graphics, fluidStack);
                 sprite = MekanismRenderer.getFluidTexture(fluidStack, FluidTextureType.STILL);
             } else {

src/main/resources/META-INF/neoforge.mods.toml

@@ -22,10 +22,4 @@ license="MIT"
     modId="neoforge"
     type="required"
     versionRange="${forge_version}"
-    side="BOTH"
-[[dependencies.mekanism]]
-    modId="emi"
-    type="optional"
-    versionRange="${emi_version}"
-    ordering="AFTER"
     side="BOTH"