From 87280d4ec56a8f723d802a8116d79e65814ee255 Mon Sep 17 00:00:00 2001 From: TropheusJ Date: Fri, 19 Apr 2024 17:46:15 -0400 Subject: [PATCH] fix #1397 --- FABRIC_CHANGELOG.txt | 1 + .../simibubi/create/compat/emi/CreateEmiPlugin.java | 6 +++--- .../create/compat/emi/recipes/DeployingEmiRecipe.java | 10 ++++++++++ 3 files changed, 14 insertions(+), 3 deletions(-) diff --git a/FABRIC_CHANGELOG.txt b/FABRIC_CHANGELOG.txt index 3d55c1fce8..2edab3da01 100644 --- a/FABRIC_CHANGELOG.txt +++ b/FABRIC_CHANGELOG.txt @@ -7,3 +7,4 @@ Change logging starts below: ---------- - added red sandpaper as a polishing workstation to EMI (#1453) - fix a possible error in EMI init (#1439) +- - fix deploying in EMI missing sandpaper and item application recipes (#1397) diff --git a/src/main/java/com/simibubi/create/compat/emi/CreateEmiPlugin.java b/src/main/java/com/simibubi/create/compat/emi/CreateEmiPlugin.java index 0ab387ee22..3c294455a0 100644 --- a/src/main/java/com/simibubi/create/compat/emi/CreateEmiPlugin.java +++ b/src/main/java/com/simibubi/create/compat/emi/CreateEmiPlugin.java @@ -54,14 +54,11 @@ import com.simibubi.create.content.kinetics.mixer.MixingRecipe; import com.simibubi.create.content.kinetics.press.MechanicalPressBlockEntity; import com.simibubi.create.content.kinetics.saw.SawBlockEntity; -import com.simibubi.create.content.legacy.ChromaticCompoundItem; -import com.simibubi.create.content.legacy.NoGravMagicalDohickyItem; import com.simibubi.create.content.logistics.filter.AttributeFilterScreen; import com.simibubi.create.content.logistics.filter.FilterScreen; import com.simibubi.create.content.processing.basin.BasinRecipe; import com.simibubi.create.content.processing.recipe.ProcessingRecipeBuilder; import com.simibubi.create.content.redstone.link.controller.LinkedControllerScreen; -import com.simibubi.create.content.trains.schedule.ScheduleItem; import com.simibubi.create.content.trains.schedule.ScheduleScreen; import com.simibubi.create.foundation.fluid.FluidIngredient; import com.simibubi.create.foundation.gui.menu.AbstractSimiContainerScreen; @@ -278,6 +275,9 @@ public void register(EmiRegistry registry) { } } addAll(registry, AllRecipeTypes.DEPLOYING, DeployingEmiRecipe::new); + addAll(registry, AllRecipeTypes.SANDPAPER_POLISHING, DeployingEmiRecipe::fromSandpaper); + addAll(registry, AllRecipeTypes.ITEM_APPLICATION, DeployingEmiRecipe::fromItemApplication); + for (ConversionRecipe recipe : MysteriousConversionEmiRecipe.RECIPES) { registry.addRecipe(new MysteriousConversionEmiRecipe(recipe)); } diff --git a/src/main/java/com/simibubi/create/compat/emi/recipes/DeployingEmiRecipe.java b/src/main/java/com/simibubi/create/compat/emi/recipes/DeployingEmiRecipe.java index da366abfa2..104cad976f 100644 --- a/src/main/java/com/simibubi/create/compat/emi/recipes/DeployingEmiRecipe.java +++ b/src/main/java/com/simibubi/create/compat/emi/recipes/DeployingEmiRecipe.java @@ -4,7 +4,9 @@ import com.simibubi.create.compat.emi.CreateEmiAnimations; import com.simibubi.create.compat.emi.CreateEmiPlugin; +import com.simibubi.create.content.equipment.sandPaper.SandPaperPolishingRecipe; import com.simibubi.create.content.kinetics.deployer.DeployerApplicationRecipe; +import com.simibubi.create.content.kinetics.deployer.ManualApplicationRecipe; import com.simibubi.create.foundation.gui.AllGuiTextures; import dev.emi.emi.api.stack.EmiIngredient; @@ -37,4 +39,12 @@ public void addWidgets(WidgetHolder widgets) { CreateEmiAnimations.addDeployer(widgets, widgets.getWidth() / 2 - 13, 30); } + + public static DeployingEmiRecipe fromSandpaper(SandPaperPolishingRecipe recipe) { + return new DeployingEmiRecipe(DeployerApplicationRecipe.convert(recipe)); + } + + public static DeployingEmiRecipe fromItemApplication(ManualApplicationRecipe recipe) { + return new DeployingEmiRecipe(ManualApplicationRecipe.asDeploying(recipe)); + } }