From 0ef7d4d944b0683250f905f856c08e759ae9355d Mon Sep 17 00:00:00 2001 From: shedaniel Date: Tue, 10 Mar 2020 02:45:09 +0800 Subject: ScreenWithHandler refractor, why must we suffer Signed-off-by: shedaniel --- .../autocrafting/DefaultRecipeBookHandler.java | 26 +++++++++++----------- 1 file changed, 13 insertions(+), 13 deletions(-) (limited to 'src/main/java/me/shedaniel/rei/plugin/autocrafting/DefaultRecipeBookHandler.java') diff --git a/src/main/java/me/shedaniel/rei/plugin/autocrafting/DefaultRecipeBookHandler.java b/src/main/java/me/shedaniel/rei/plugin/autocrafting/DefaultRecipeBookHandler.java index 761dafd73..b16e41e2c 100644 --- a/src/main/java/me/shedaniel/rei/plugin/autocrafting/DefaultRecipeBookHandler.java +++ b/src/main/java/me/shedaniel/rei/plugin/autocrafting/DefaultRecipeBookHandler.java @@ -33,10 +33,10 @@ import me.shedaniel.rei.plugin.crafting.DefaultCraftingDisplay; import net.minecraft.client.gui.screen.Screen; import net.minecraft.client.gui.screen.recipebook.RecipeBookProvider; import net.minecraft.client.resource.language.I18n; -import net.minecraft.container.CraftingContainer; -import net.minecraft.container.CraftingTableContainer; -import net.minecraft.container.PlayerContainer; import net.minecraft.recipe.Recipe; +import net.minecraft.screen.CraftingScreenHandler; +import net.minecraft.screen.CraftingTableScreenHandler; +import net.minecraft.screen.PlayerScreenHandler; public class DefaultRecipeBookHandler implements AutoTransferHandler { @Override @@ -44,17 +44,17 @@ public class DefaultRecipeBookHandler implements AutoTransferHandler { if (context.getRecipe() instanceof TransferRecipeDisplay && DefaultCategoryHandler.canUseMovePackets()) return Result.createNotApplicable(); RecipeDisplay display = context.getRecipe(); - if (!(context.getContainer() instanceof CraftingContainer)) + if (!(context.getScreenHandler() instanceof CraftingScreenHandler)) return Result.createNotApplicable(); - CraftingContainer container = (CraftingContainer) context.getContainer(); + CraftingScreenHandler container = (CraftingScreenHandler) context.getScreenHandler(); if (display instanceof DefaultCraftingDisplay) { DefaultCraftingDisplay craftingDisplay = (DefaultCraftingDisplay) display; if (craftingDisplay.getOptionalRecipe().isPresent()) { int h = -1, w = -1; - if (container instanceof CraftingTableContainer) { + if (container instanceof CraftingTableScreenHandler) { h = 3; w = 3; - } else if (container instanceof PlayerContainer) { + } else if (container instanceof PlayerScreenHandler) { h = 2; w = 2; } @@ -67,9 +67,9 @@ public class DefaultRecipeBookHandler implements AutoTransferHandler { return Result.createFailed(I18n.translate("error.rei.recipe.not.unlocked")); if (!context.isActuallyCrafting()) return Result.createSuccessful(); - context.getMinecraft().openScreen(context.getContainerScreen()); - if (context.getContainerScreen() instanceof RecipeBookProvider) - ((RecipeBookGuiHooks) ((RecipeBookProvider) context.getContainerScreen()).getRecipeBookWidget()).rei_getGhostSlots().reset(); + context.getMinecraft().openScreen(context.getScreenWithHandler()); + if (context.getScreenWithHandler() instanceof RecipeBookProvider) + ((RecipeBookGuiHooks) ((RecipeBookProvider) context.getScreenWithHandler()).getRecipeBookWidget()).rei_getGhostSlots().reset(); context.getMinecraft().interactionManager.clickRecipe(container.syncId, recipe, Screen.hasShiftDown()); ScreenHelper.getLastOverlay().init(); } @@ -81,9 +81,9 @@ public class DefaultRecipeBookHandler implements AutoTransferHandler { return Result.createFailed(I18n.translate("error.rei.recipe.not.unlocked")); if (!context.isActuallyCrafting()) return Result.createSuccessful(); - context.getMinecraft().openScreen(context.getContainerScreen()); - if (context.getContainerScreen() instanceof RecipeBookProvider) - ((RecipeBookGuiHooks) ((RecipeBookProvider) context.getContainerScreen()).getRecipeBookWidget()).rei_getGhostSlots().reset(); + context.getMinecraft().openScreen(context.getScreenWithHandler()); + if (context.getScreenWithHandler() instanceof RecipeBookProvider) + ((RecipeBookGuiHooks) ((RecipeBookProvider) context.getScreenWithHandler()).getRecipeBookWidget()).rei_getGhostSlots().reset(); context.getMinecraft().interactionManager.clickRecipe(container.syncId, recipe, Screen.hasShiftDown()); ScreenHelper.getLastOverlay().init(); } -- cgit