Fix bugs + translation

8 files changed, 2 insertions, 187 deletions

diff --git a/src/main/java/me/shedaniel/rei/gui/VillagerRecipeViewingScreen.java b/src/main/java/me/shedaniel/rei/gui/VillagerRecipeViewingScreen.java
index 3485e56d8..2a26605aa 100644
--- a/src/main/java/me/shedaniel/rei/gui/VillagerRecipeViewingScreen.java
+++ b/src/main/java/me/shedaniel/rei/gui/VillagerRecipeViewingScreen.java
@@ -269,6 +269,7 @@ public class VillagerRecipeViewingScreen extends Screen {
             scroll = MathHelper.clamp(scroll, 0, height - scrollListBounds.height + 2);
             if (scrollBarAlphaFuture == 0)
                 scrollBarAlphaFuture = 1f;
+            if (System.currentTimeMillis() - scrollBarAlphaFutureTime > 300f)
             scrollBarAlphaFutureTime = System.currentTimeMillis();
             return true;
         }
diff --git a/src/main/java/me/shedaniel/rei/plugin/DefaultAutoCraftingPlugin.java b/src/main/java/me/shedaniel/rei/plugin/DefaultAutoCraftingPlugin.java
index ff59c1148..2e3d87325 100644
--- a/src/main/java/me/shedaniel/rei/plugin/DefaultAutoCraftingPlugin.java
+++ b/src/main/java/me/shedaniel/rei/plugin/DefaultAutoCraftingPlugin.java
@@ -32,11 +32,6 @@ public class DefaultAutoCraftingPlugin implements REIPluginV0 {
         if (!RoughlyEnoughItemsCore.getConfigManager().getConfig().isLoadingDefaultPlugin()) {
             return;
         }
-        //        recipeHelper.registerAutoCraftingHandler(new AutoCraftingTableBookHandler());
-        //        recipeHelper.registerAutoCraftingHandler(new AutoInventoryBookHandler());
-        //        recipeHelper.registerAutoCraftingHandler(new AutoFurnaceBookHandler());
-        //        recipeHelper.registerAutoCraftingHandler(new AutoSmokerBookHandler());
-        //        recipeHelper.registerAutoCraftingHandler(new AutoBlastingBookHandler());
         recipeHelper.registerAutoCraftingHandler(new DefaultCategoryHandler());
     }
 }
diff --git a/src/main/java/me/shedaniel/rei/plugin/autocrafting/AutoBlastingBookHandler.java b/src/main/java/me/shedaniel/rei/plugin/autocrafting/AutoBlastingBookHandler.java
deleted file mode 100644
index 2dd8811bd..000000000
--- a/src/main/java/me/shedaniel/rei/plugin/autocrafting/AutoBlastingBookHandler.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Roughly Enough Items by Danielshe.
- * Licensed under the MIT License.
- */
-
-package me.shedaniel.rei.plugin.autocrafting;
-
-import me.shedaniel.rei.api.AutoTransferHandler;
-import me.shedaniel.rei.impl.ScreenHelper;
-import me.shedaniel.rei.listeners.RecipeBookGuiHooks;
-import me.shedaniel.rei.plugin.blasting.DefaultBlastingDisplay;
-import net.minecraft.client.gui.screen.Screen;
-import net.minecraft.client.gui.screen.ingame.BlastFurnaceScreen;
-import net.minecraft.container.BlastFurnaceContainer;
-
-public class AutoBlastingBookHandler implements AutoTransferHandler {
-    @Override
-    public Result handle(Context context) {
-        if (!(context.getContainerScreen() instanceof BlastFurnaceScreen) || !(context.getRecipe() instanceof DefaultBlastingDisplay))
-            return Result.createNotApplicable();
-        if (!((DefaultBlastingDisplay) context.getRecipe()).getOptionalRecipe().isPresent() || !context.getMinecraft().player.getRecipeBook().contains(((DefaultBlastingDisplay) context.getRecipe()).getOptionalRecipe().get()))
-            return Result.createNotApplicable();
-        if (!context.isActuallyCrafting())
-            return Result.createSuccessful();
-        
-        DefaultBlastingDisplay display = (DefaultBlastingDisplay) context.getRecipe();
-        BlastFurnaceScreen furnaceScreen = (BlastFurnaceScreen) context.getContainerScreen();
-        context.getMinecraft().openScreen(furnaceScreen);
-        ((RecipeBookGuiHooks) furnaceScreen.getRecipeBookGui()).rei_getGhostSlots().reset();
-        BlastFurnaceContainer container = furnaceScreen.getContainer();
-        context.getMinecraft().interactionManager.clickRecipe(container.syncId, display.getOptionalRecipe().get(), Screen.hasShiftDown());
-        ScreenHelper.getLastOverlay().init();
-        return Result.createSuccessful();
-    }
-}
diff --git a/src/main/java/me/shedaniel/rei/plugin/autocrafting/AutoCraftingTableBookHandler.java b/src/main/java/me/shedaniel/rei/plugin/autocrafting/AutoCraftingTableBookHandler.java
deleted file mode 100644
index 607cdd7a7..000000000
--- a/src/main/java/me/shedaniel/rei/plugin/autocrafting/AutoCraftingTableBookHandler.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Roughly Enough Items by Danielshe.
- * Licensed under the MIT License.
- */
-
-package me.shedaniel.rei.plugin.autocrafting;
-
-import me.shedaniel.rei.api.AutoTransferHandler;
-import me.shedaniel.rei.impl.ScreenHelper;
-import me.shedaniel.rei.listeners.RecipeBookGuiHooks;
-import me.shedaniel.rei.plugin.crafting.DefaultCraftingDisplay;
-import net.minecraft.client.gui.screen.Screen;
-import net.minecraft.client.gui.screen.ingame.CraftingTableScreen;
-import net.minecraft.container.CraftingTableContainer;
-
-public class AutoCraftingTableBookHandler implements AutoTransferHandler {
-    @Override
-    public Result handle(Context context) {
-        if (!(context.getContainerScreen() instanceof CraftingTableScreen) || !(context.getRecipe() instanceof DefaultCraftingDisplay))
-            return Result.createNotApplicable();
-        if (!((DefaultCraftingDisplay) context.getRecipe()).getOptionalRecipe().isPresent() || !context.getMinecraft().player.getRecipeBook().contains(((DefaultCraftingDisplay) context.getRecipe()).getOptionalRecipe().get()))
-            return Result.createNotApplicable();
-        if (!context.isActuallyCrafting())
-            return Result.createSuccessful();
-        
-        DefaultCraftingDisplay display = (DefaultCraftingDisplay) context.getRecipe();
-        CraftingTableScreen craftingTableScreen = (CraftingTableScreen) context.getContainerScreen();
-        context.getMinecraft().openScreen(craftingTableScreen);
-        ((RecipeBookGuiHooks) craftingTableScreen.getRecipeBookGui()).rei_getGhostSlots().reset();
-        CraftingTableContainer container = craftingTableScreen.getContainer();
-        context.getMinecraft().interactionManager.clickRecipe(container.syncId, display.getOptionalRecipe().get(), Screen.hasShiftDown());
-        ScreenHelper.getLastOverlay().init();
-        return Result.createSuccessful();
-    }
-}
diff --git a/src/main/java/me/shedaniel/rei/plugin/autocrafting/AutoFurnaceBookHandler.java b/src/main/java/me/shedaniel/rei/plugin/autocrafting/AutoFurnaceBookHandler.java
deleted file mode 100644
index 036b616f0..000000000
--- a/src/main/java/me/shedaniel/rei/plugin/autocrafting/AutoFurnaceBookHandler.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Roughly Enough Items by Danielshe.
- * Licensed under the MIT License.
- */
-
-package me.shedaniel.rei.plugin.autocrafting;
-
-import me.shedaniel.rei.api.AutoTransferHandler;
-import me.shedaniel.rei.impl.ScreenHelper;
-import me.shedaniel.rei.listeners.RecipeBookGuiHooks;
-import me.shedaniel.rei.plugin.smelting.DefaultSmeltingDisplay;
-import net.minecraft.client.gui.screen.Screen;
-import net.minecraft.client.gui.screen.ingame.FurnaceScreen;
-import net.minecraft.container.FurnaceContainer;
-
-public class AutoFurnaceBookHandler implements AutoTransferHandler {
-    @Override
-    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();
-        context.getMinecraft().interactionManager.clickRecipe(container.syncId, display.getOptionalRecipe().get(), Screen.hasShiftDown());
-        ScreenHelper.getLastOverlay().init();
-        return Result.createSuccessful();
-    }
-}
diff --git a/src/main/java/me/shedaniel/rei/plugin/autocrafting/AutoInventoryBookHandler.java b/src/main/java/me/shedaniel/rei/plugin/autocrafting/AutoInventoryBookHandler.java
deleted file mode 100644
index ac7ed0572..000000000
--- a/src/main/java/me/shedaniel/rei/plugin/autocrafting/AutoInventoryBookHandler.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Roughly Enough Items by Danielshe.
- * Licensed under the MIT License.
- */
-
-package me.shedaniel.rei.plugin.autocrafting;
-
-import me.shedaniel.rei.api.AutoTransferHandler;
-import me.shedaniel.rei.impl.ScreenHelper;
-import me.shedaniel.rei.listeners.RecipeBookGuiHooks;
-import me.shedaniel.rei.plugin.crafting.DefaultCraftingDisplay;
-import net.minecraft.client.gui.screen.Screen;
-import net.minecraft.client.gui.screen.ingame.InventoryScreen;
-import net.minecraft.container.PlayerContainer;
-
-public class AutoInventoryBookHandler implements AutoTransferHandler {
-    @Override
-    public Result handle(Context context) {
-        if (!(context.getContainerScreen() instanceof InventoryScreen) || !(context.getRecipe() instanceof DefaultCraftingDisplay))
-            return Result.createNotApplicable();
-        if (!((DefaultCraftingDisplay) context.getRecipe()).getOptionalRecipe().isPresent() || !context.getMinecraft().player.getRecipeBook().contains(((DefaultCraftingDisplay) context.getRecipe()).getOptionalRecipe().get()))
-            return Result.createNotApplicable();
-        if (((DefaultCraftingDisplay) context.getRecipe()).getWidth() > 2 || ((DefaultCraftingDisplay) context.getRecipe()).getHeight() > 2)
-            return Result.createFailed("error.rei.transfer.too_small");
-        if (!context.isActuallyCrafting())
-            return Result.createSuccessful();
-        
-        DefaultCraftingDisplay display = (DefaultCraftingDisplay) context.getRecipe();
-        InventoryScreen inventoryScreen = (InventoryScreen) context.getContainerScreen();
-        context.getMinecraft().openScreen(inventoryScreen);
-        ((RecipeBookGuiHooks) inventoryScreen.getRecipeBookGui()).rei_getGhostSlots().reset();
-        PlayerContainer container = inventoryScreen.getContainer();
-        context.getMinecraft().interactionManager.clickRecipe(container.syncId, display.getOptionalRecipe().get(), Screen.hasShiftDown());
-        ScreenHelper.getLastOverlay().init();
-        return Result.createSuccessful();
-    }
-}
diff --git a/src/main/java/me/shedaniel/rei/plugin/autocrafting/AutoSmokerBookHandler.java b/src/main/java/me/shedaniel/rei/plugin/autocrafting/AutoSmokerBookHandler.java
deleted file mode 100644
index a5b1575ea..000000000
--- a/src/main/java/me/shedaniel/rei/plugin/autocrafting/AutoSmokerBookHandler.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Roughly Enough Items by Danielshe.
- * Licensed under the MIT License.
- */
-
-package me.shedaniel.rei.plugin.autocrafting;
-
-import me.shedaniel.rei.api.AutoTransferHandler;
-import me.shedaniel.rei.impl.ScreenHelper;
-import me.shedaniel.rei.listeners.RecipeBookGuiHooks;
-import me.shedaniel.rei.plugin.smoking.DefaultSmokingDisplay;
-import net.minecraft.client.gui.screen.Screen;
-import net.minecraft.client.gui.screen.ingame.SmokerScreen;
-import net.minecraft.container.SmokerContainer;
-
-public class AutoSmokerBookHandler implements AutoTransferHandler {
-    @Override
-    public Result handle(Context context) {
-        if (!(context.getContainerScreen() instanceof SmokerScreen) || !(context.getRecipe() instanceof DefaultSmokingDisplay))
-            return Result.createNotApplicable();
-        if (!((DefaultSmokingDisplay) context.getRecipe()).getOptionalRecipe().isPresent() || !context.getMinecraft().player.getRecipeBook().contains(((DefaultSmokingDisplay) context.getRecipe()).getOptionalRecipe().get()))
-            return Result.createNotApplicable();
-        if (!context.isActuallyCrafting())
-            return Result.createSuccessful();
-        
-        DefaultSmokingDisplay display = (DefaultSmokingDisplay) context.getRecipe();
-        SmokerScreen smokerScreen = (SmokerScreen) context.getContainerScreen();
-        context.getMinecraft().openScreen(smokerScreen);
-        ((RecipeBookGuiHooks) smokerScreen.getRecipeBookGui()).rei_getGhostSlots().reset();
-        SmokerContainer container = smokerScreen.getContainer();
-        context.getMinecraft().interactionManager.clickRecipe(container.syncId, display.getOptionalRecipe().get(), Screen.hasShiftDown());
-        ScreenHelper.getLastOverlay().init();
-        return Result.createSuccessful();
-    }
-}
diff --git a/src/main/java/me/shedaniel/rei/plugin/crafting/DefaultCraftingDisplay.java b/src/main/java/me/shedaniel/rei/plugin/crafting/DefaultCraftingDisplay.java
index 740a7f545..701b9347d 100644
--- a/src/main/java/me/shedaniel/rei/plugin/crafting/DefaultCraftingDisplay.java
+++ b/src/main/java/me/shedaniel/rei/plugin/crafting/DefaultCraftingDisplay.java
@@ -44,11 +44,7 @@ public interface DefaultCraftingDisplay extends TransferRecipeDisplay {
         }
         for (int i = 0; i < getInput().size(); i++) {
             List<ItemStack> stacks = getInput().get(i);
-            if (this instanceof DefaultShapedDisplay) {
-                if (!stacks.isEmpty())
-                    list.set(DefaultCraftingCategory.getSlotWithSize(this, i), stacks);
-            } else if (!stacks.isEmpty())
-                list.set(i, stacks);
+            list.set(i, stacks);
         }
         return list;
     }