From 70417f41613ae30582cd48708fe43ce9a3e6ae86 Mon Sep 17 00:00:00 2001 From: Unknown Date: Tue, 6 Aug 2019 22:35:12 +0800 Subject: These days are great days to completely scrap an api --- .../autocrafting/AutoFurnaceBookHandler.java | 34 ++++++++++------------ 1 file changed, 15 insertions(+), 19 deletions(-) (limited to 'src/main/java/me/shedaniel/rei/plugin/autocrafting/AutoFurnaceBookHandler.java') diff --git a/src/main/java/me/shedaniel/rei/plugin/autocrafting/AutoFurnaceBookHandler.java b/src/main/java/me/shedaniel/rei/plugin/autocrafting/AutoFurnaceBookHandler.java index b00e77747..47fbeeeaa 100644 --- a/src/main/java/me/shedaniel/rei/plugin/autocrafting/AutoFurnaceBookHandler.java +++ b/src/main/java/me/shedaniel/rei/plugin/autocrafting/AutoFurnaceBookHandler.java @@ -5,35 +5,31 @@ package me.shedaniel.rei.plugin.autocrafting; -import me.shedaniel.rei.api.AutoCraftingHandler; -import me.shedaniel.rei.api.RecipeDisplay; +import me.shedaniel.rei.api.AutoTransferHandler; import me.shedaniel.rei.client.ScreenHelper; -import me.shedaniel.rei.gui.ContainerScreenOverlay; import me.shedaniel.rei.listeners.RecipeBookGuiHooks; import me.shedaniel.rei.plugin.smelting.DefaultSmeltingDisplay; -import net.minecraft.client.MinecraftClient; import net.minecraft.client.gui.screen.Screen; -import net.minecraft.client.gui.screen.ingame.AbstractContainerScreen; import net.minecraft.client.gui.screen.ingame.FurnaceScreen; import net.minecraft.container.FurnaceContainer; -import java.util.function.Supplier; - -public class AutoFurnaceBookHandler implements AutoCraftingHandler { +public class AutoFurnaceBookHandler implements AutoTransferHandler { @Override - public boolean handle(Supplier displaySupplier, MinecraftClient minecraft, Screen recipeViewingScreen, AbstractContainerScreen parentScreen, ContainerScreenOverlay overlay) { - DefaultSmeltingDisplay display = (DefaultSmeltingDisplay) displaySupplier.get(); - FurnaceScreen furnaceScreen = (FurnaceScreen) parentScreen; - minecraft.openScreen(furnaceScreen); + public Result handle(Context context) { + if (!(context.getContainerScreen() instanceof FurnaceScreen) || !(context.getRecipe() instanceof DefaultSmeltingDisplay)) + return Result.createNotApplicable(); + if (!((DefaultSmeltingDisplay) context.getRecipe()).getOptionalRecipe().isPresent() || !context.getMinecraft().player.getRecipeBook().contains(((DefaultSmeltingDisplay) context.getRecipe()).getOptionalRecipe().get())) + return Result.createNotApplicable(); + if (!context.isActuallyCrafting()) + return Result.createSuccessful(); + + DefaultSmeltingDisplay display = (DefaultSmeltingDisplay) context.getRecipe(); + FurnaceScreen furnaceScreen = (FurnaceScreen) context.getContainerScreen(); + context.getMinecraft().openScreen(furnaceScreen); ((RecipeBookGuiHooks) furnaceScreen.getRecipeBookGui()).rei_getGhostSlots().reset(); FurnaceContainer container = furnaceScreen.getContainer(); - minecraft.interactionManager.clickRecipe(container.syncId, display.getOptionalRecipe().get(), Screen.hasShiftDown()); + context.getMinecraft().interactionManager.clickRecipe(container.syncId, display.getOptionalRecipe().get(), Screen.hasShiftDown()); ScreenHelper.getLastOverlay().init(); - return true; - } - - @Override - public boolean canHandle(Supplier displaySupplier, MinecraftClient minecraft, Screen recipeViewingScreen, AbstractContainerScreen parentScreen, ContainerScreenOverlay overlay) { - return parentScreen instanceof FurnaceScreen && displaySupplier.get() instanceof DefaultSmeltingDisplay && ((DefaultSmeltingDisplay) displaySupplier.get()).getOptionalRecipe().isPresent() && minecraft.player.getRecipeBook().contains(((DefaultSmeltingDisplay) displaySupplier.get()).getOptionalRecipe().get()); + return Result.createSuccessful(); } } -- cgit