2.0.3

Author: Chikage0o0

gradle.properties

@@ -5,7 +5,7 @@ minecraft_version=1.19.2
 fabric_version=0.68.0+1.19.2
 loader_version=0.14.11
 # Mod Properties
-mod_version=2.0.2
+mod_version=2.0.3
 maven_group=me.chikage
 archives_base_name=emicompat
 emi_version=0.4.3+1.19

src/main/java/me/chikage/emicompat/EmiCompatPlugin.java

@@ -2,14 +2,21 @@
 
 import dev.emi.emi.api.EmiPlugin;
 import dev.emi.emi.api.EmiRegistry;
+import dev.emi.emi.api.recipe.EmiRecipe;
 import me.chikage.emicompat.ae2.Ae2Plugin;
 import me.chikage.emicompat.ae2wtlib.Ae2wtlibPlugin;
 import me.chikage.emicompat.createaddition.CreateAdditionPlugin;
 import me.chikage.emicompat.farmersdelight.FarmersDelightPlugin;
 import net.fabricmc.loader.api.FabricLoader;
+import net.minecraft.world.Container;
+import net.minecraft.world.item.crafting.Recipe;
+import net.minecraft.world.item.crafting.RecipeType;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.util.List;
+import java.util.function.Function;
+
 public class EmiCompatPlugin implements EmiPlugin {
     public static final Logger LOGGER = LoggerFactory.getLogger("emicompat");
 
@@ -25,4 +32,11 @@ public void register(EmiRegistry emi) {
         if (loader.isModLoaded("ae2wtlib"))
             new Ae2wtlibPlugin().register(emi);
     }
+
+    @SuppressWarnings("unchecked")
+    public static <T extends Recipe<?>> void addAll(EmiRegistry registry, RecipeType type, Function<T, EmiRecipe> constructor) {
+        for (T recipe : (List<T>) registry.getRecipeManager().getAllRecipesFor(type)) {
+            registry.addRecipe(constructor.apply(recipe));
+        }
+    }
 }

src/main/java/me/chikage/emicompat/ae2/Ae2Plugin.java

@@ -32,6 +32,8 @@
 import java.util.Map;
 import java.util.stream.Collectors;
 
+import static me.chikage.emicompat.EmiCompatPlugin.addAll;
+
 
 public class Ae2Plugin implements EmiPlugin {
     public static final Map<ResourceLocation, EmiRecipeCategory> ALL = new LinkedHashMap<>();
@@ -46,7 +48,6 @@ public class Ae2Plugin implements EmiPlugin {
 
     @Override
     public void register(EmiRegistry registry) {
-        var recipes = registry.getRecipeManager();
         ALL.forEach((id, category) -> registry.addCategory(category));
 
         registry.addWorkstation(VanillaEmiRecipeCategories.CRAFTING, EmiStack.of(AEParts.CRAFTING_TERMINAL.stack()));
@@ -63,9 +64,7 @@ public void register(EmiRegistry registry) {
         });
 
         registry.addWorkstation(INSCRIBER, EmiStack.of(AEBlocks.INSCRIBER.stack()));
-        recipes.getAllRecipesFor(InscriberRecipe.TYPE).stream()
-                .parallel().map(EMIInscriberRecipe::new)
-                .forEach(registry::addRecipe);
+        addAll(registry,InscriberRecipe.TYPE,EMIInscriberRecipe::new);
 
         registry.addWorkstation(CONDENSER, EmiStack.of(AEBlocks.CONDENSER.stack()));
         registry.addRecipe(new EMICondenserRecipe(CondenserOutput.MATTER_BALLS));
@@ -76,14 +75,10 @@ public void register(EmiRegistry registry) {
                     List.of(EmiStack.of(entry.getValue()))));
         }
 
-        recipes.getAllRecipesFor(TransformRecipe.TYPE).stream()
-                .parallel().map(EMIItemTransformationRecipe::new)
-                .forEach(registry::addRecipe);
+        addAll(registry,TransformRecipe.TYPE,EMIItemTransformationRecipe::new);
 
         registry.addWorkstation(CHARGER, EmiStack.of(AEBlocks.CHARGER.stack()));
-        recipes.getAllRecipesFor(ChargerRecipe.TYPE).stream()
-                .parallel().map(EMIChargerRecipe::new)
-                .forEach(registry::addRecipe);
+        addAll(registry,ChargerRecipe.TYPE,EMIChargerRecipe::new);
     }
 
     private static EmiRecipeCategory register(String name, EmiRenderable icon) {
@@ -94,7 +89,8 @@ private static EmiRecipeCategory register(String name, EmiRenderable icon) {
     }
 
 
-    public static List<Bounds> mapRects(List<Rect2i> exclusionZones) {
+
+    private static List<Bounds> mapRects(List<Rect2i> exclusionZones) {
         return exclusionZones.stream()
                 .map(ez -> new Bounds(ez.getX(), ez.getY(), ez.getWidth(), ez.getHeight()))
                 .collect(Collectors.toList());

src/main/java/me/chikage/emicompat/createaddition/CreateAdditionPlugin.java

@@ -17,6 +17,8 @@
 import java.util.LinkedHashMap;
 import java.util.Map;
 
+import static me.chikage.emicompat.EmiCompatPlugin.addAll;
+
 
 public class CreateAdditionPlugin implements EmiPlugin {
     public static final Map<ResourceLocation, EmiRecipeCategory> ALL = new LinkedHashMap<>();
@@ -27,20 +29,13 @@ public class CreateAdditionPlugin implements EmiPlugin {
 
     @Override
     public void register(EmiRegistry registry) {
-        var recipes = registry.getRecipeManager();
         ALL.forEach((id, category) -> registry.addCategory(category));
 
         registry.addWorkstation(Charging, EmiStack.of(CABlocks.TESLA_COIL.get()));
         registry.addWorkstation(RollingMill, EmiStack.of(CABlocks.ROLLING_MILL.get()));
 
-        recipes.getAllRecipesFor(ChargingRecipe.TYPE).stream()
-                .parallel().map(EMIChargingRecipe::new)
-                .forEach(registry::addRecipe);
-
-        recipes.getAllRecipesFor(RollingRecipe.TYPE).stream()
-                .parallel().map(EMIRollingMillRecipe::new)
-                .forEach(registry::addRecipe);
-
+        addAll(registry, ChargingRecipe.TYPE, EMIChargingRecipe::new);
+        addAll(registry, RollingRecipe.TYPE, EMIRollingMillRecipe::new);
     }
 
     private static EmiRecipeCategory register(String name, EmiRenderable icon) {

src/main/java/me/chikage/emicompat/farmersdelight/FarmersDelightPlugin.java

@@ -29,6 +29,7 @@
 import java.util.Map;
 
 import static com.nhoryzon.mc.farmersdelight.FarmersDelightMod.MOD_ID;
+import static me.chikage.emicompat.EmiCompatPlugin.addAll;
 
 public class FarmersDelightPlugin implements EmiPlugin {
     public static final Map<ResourceLocation, EmiRecipeCategory> ALL = new LinkedHashMap<>();
@@ -43,23 +44,16 @@ public void register(EmiRegistry registry) {
         RecipeType<CookingPotRecipe> COOKING_T = RecipeTypesRegistry.COOKING_RECIPE_SERIALIZER.type();
         RecipeType<CuttingBoardRecipe> CUTTING_T = RecipeTypesRegistry.CUTTING_RECIPE_SERIALIZER.type();
 
-        var recipes = registry.getRecipeManager();
         ALL.forEach((id, category) -> registry.addCategory(category));
 
         registry.addWorkstation(VanillaEmiRecipeCategories.CAMPFIRE_COOKING, EmiStack.of(ItemsRegistry.STOVE.get()));
         registry.addWorkstation(VanillaEmiRecipeCategories.CAMPFIRE_COOKING, EmiStack.of(ItemsRegistry.SKILLET.get()));
 
         registry.addWorkstation(FarmersDelightPlugin.COOKING, EmiStack.of(ItemsRegistry.COOKING_POT.get()));
-        recipes.getAllRecipesFor(COOKING_T).stream()
-                .parallel()
-                .map(EmiCookingPotRecipe::new)
-                .forEach(registry::addRecipe);
+        addAll(registry, COOKING_T, EmiCookingPotRecipe::new);
 
         registry.addWorkstation(CUTTING, EmiStack.of(ItemsRegistry.CUTTING_BOARD.get()));
-        recipes.getAllRecipesFor(CUTTING_T).stream()
-                .parallel()
-                .map(EmiCuttingBoardRecipe::new)
-                .forEach(registry::addRecipe);
+        addAll(registry, CUTTING_T, EmiCuttingBoardRecipe::new);
 
         registry.addRecipe(new EmiDecompositionRecipe(
                 List.of(EmiIngredient.of(Ingredient.of(BlocksRegistry.ORGANIC_COMPOST.get()))),

src/main/java/me/chikage/emicompat/farmersdelight/recipe/EmiDecompositionRecipe.java

@@ -1,6 +1,7 @@
 package me.chikage.emicompat.farmersdelight.recipe;
 
 import com.nhoryzon.mc.farmersdelight.FarmersDelightMod;
+import com.nhoryzon.mc.farmersdelight.registry.TagsRegistry;
 import dev.emi.emi.EmiPort;
 import dev.emi.emi.api.recipe.EmiRecipe;
 import dev.emi.emi.api.recipe.EmiRecipeCategory;
@@ -11,6 +12,9 @@
 import dev.emi.emi.api.widget.WidgetHolder;
 import me.chikage.emicompat.farmersdelight.FarmersDelightPlugin;
 import net.minecraft.client.gui.screens.inventory.tooltip.ClientTooltipComponent;
+import net.minecraft.core.Holder;
+import net.minecraft.core.HolderSet;
+import net.minecraft.core.Registry;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.item.crafting.Ingredient;
 import net.minecraft.world.level.block.Block;
@@ -19,6 +23,7 @@
 import java.util.Collection;
 import java.util.List;
 import java.util.PrimitiveIterator;
+import java.util.stream.Collectors;
 import java.util.stream.IntStream;
 
 public class EmiDecompositionRecipe implements EmiRecipe {
@@ -67,12 +72,9 @@ public void addWidgets(WidgetHolder gui) {
         gui.addSlot(output.get(0), 84, 16)
                 .drawBack(false);
 
-        if (!catalysts.isEmpty() && catalysts.get(0).isEmpty()) {
-            // gui.addTexture(SLOT, 55, 44);
-            gui.addSlot(this.catalysts.get(0), 55, 44)
-                    .customBackground(GUI_TEXTURE, 119, 0, 18, 18)
-                    .catalyst(true);
-        }
+        gui.addSlot(EmiIngredient.of(Registry.BLOCK.getTag(TagsRegistry.COMPOST_ACTIVATORS).stream().flatMap(HolderSet::stream).map(Holder::value).map(v->EmiStack.of(v.asItem())).collect(Collectors.toList())) , 55, 44)
+                .customBackground(GUI_TEXTURE, 119, 0, 18, 18)
+                .catalyst(true);
 
         gui.addDrawable(33, 30, 13, 13, NULL_RENDERABLE)
                 .tooltip(((mouseX, mouseY) -> List.of(ClientTooltipComponent.create(EmiPort.translatable("farmersdelight.rei.decomposition.light").getVisualOrderText()))));