diff options
Diffstat (limited to 'src/main/java/me/shedaniel')
6 files changed, 10 insertions, 6 deletions
diff --git a/src/main/java/me/shedaniel/rei/gui/widget/AutoCraftingButtonWidget.java b/src/main/java/me/shedaniel/rei/gui/widget/AutoCraftingButtonWidget.java index a1cb25d16..216cd6ee0 100644 --- a/src/main/java/me/shedaniel/rei/gui/widget/AutoCraftingButtonWidget.java +++ b/src/main/java/me/shedaniel/rei/gui/widget/AutoCraftingButtonWidget.java @@ -99,7 +99,8 @@ public class AutoCraftingButtonWidget extends ButtonWidget { } error.add(result.getErrorKey()); color = result.getColor(); - redSlots = result.getIntegers(); + if (result.getIntegers() != null && !result.getIntegers().isEmpty()) + redSlots = result.getIntegers(); } } catch (Exception e) { e.printStackTrace(); diff --git a/src/main/java/me/shedaniel/rei/gui/widget/EntryListWidget.java b/src/main/java/me/shedaniel/rei/gui/widget/EntryListWidget.java index 64862a4e3..6c92e335b 100644 --- a/src/main/java/me/shedaniel/rei/gui/widget/EntryListWidget.java +++ b/src/main/java/me/shedaniel/rei/gui/widget/EntryListWidget.java @@ -347,7 +347,7 @@ public class EntryListWidget extends WidgetWithBounds { int width = innerBounds.width / 18; int pageHeight = innerBounds.height / 18; int sizeForFavorites = getScrollNumberForFavorites(); - int slotsToPrepare = allStacks.size() + sizeForFavorites; + int slotsToPrepare = allStacks.size() + sizeForFavorites * 3; int currentX = 0; int currentY = 0; List<EntryListEntry> entries = Lists.newLinkedList(); diff --git a/src/main/java/me/shedaniel/rei/plugin/autocrafting/DefaultCategoryHandler.java b/src/main/java/me/shedaniel/rei/plugin/autocrafting/DefaultCategoryHandler.java index 78ca518f5..16832cf19 100644 --- a/src/main/java/me/shedaniel/rei/plugin/autocrafting/DefaultCategoryHandler.java +++ b/src/main/java/me/shedaniel/rei/plugin/autocrafting/DefaultCategoryHandler.java @@ -76,7 +76,7 @@ public class DefaultCategoryHandler implements AutoTransferHandler { return -10; } - public boolean canUseMovePackets() { + public static boolean canUseMovePackets() { return ClientSidePacketRegistry.INSTANCE.canServerReceive(RoughlyEnoughItemsNetwork.MOVE_ITEMS_PACKET); } 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 d6eeb40f7..83f1b861c 100644 --- a/src/main/java/me/shedaniel/rei/plugin/autocrafting/DefaultRecipeBookHandler.java +++ b/src/main/java/me/shedaniel/rei/plugin/autocrafting/DefaultRecipeBookHandler.java @@ -7,6 +7,7 @@ package me.shedaniel.rei.plugin.autocrafting; import me.shedaniel.rei.api.AutoTransferHandler; import me.shedaniel.rei.api.RecipeDisplay; +import me.shedaniel.rei.api.TransferRecipeDisplay; import me.shedaniel.rei.impl.ScreenHelper; import me.shedaniel.rei.listeners.RecipeBookGuiHooks; import me.shedaniel.rei.plugin.cooking.DefaultCookingDisplay; @@ -23,6 +24,8 @@ public class DefaultRecipeBookHandler implements AutoTransferHandler { @SuppressWarnings("deprecation") @Override public Result handle(Context context) { + if (context.getRecipe() instanceof TransferRecipeDisplay && DefaultCategoryHandler.canUseMovePackets()) + return Result.createNotApplicable(); RecipeDisplay display = context.getRecipe(); if (!(context.getContainer() instanceof CraftingContainer)) return Result.createNotApplicable(); diff --git a/src/main/java/me/shedaniel/rei/plugin/cooking/DefaultCookingCategory.java b/src/main/java/me/shedaniel/rei/plugin/cooking/DefaultCookingCategory.java index f56f9429f..b67475b55 100644 --- a/src/main/java/me/shedaniel/rei/plugin/cooking/DefaultCookingCategory.java +++ b/src/main/java/me/shedaniel/rei/plugin/cooking/DefaultCookingCategory.java @@ -47,7 +47,7 @@ public class DefaultCookingCategory implements TransferRecipeCategory<DefaultCoo Point startPoint = new Point(bounds.getCenterX() - 41, bounds.getCenterY() - 27); RenderSystem.translatef(0, 0, 400); if (redSlots.contains(0)) { - DrawableHelper.fill(startPoint.x + 1, startPoint.y + 1, startPoint.x + 1 + 16, startPoint.y + 1 + 16, 822018048); + DrawableHelper.fill(startPoint.x + 1, startPoint.y + 1, startPoint.x + 1 + 16, startPoint.y + 1 + 16, 1090453504); } RenderSystem.translatef(0, 0, -400); } diff --git a/src/main/java/me/shedaniel/rei/plugin/crafting/DefaultCraftingCategory.java b/src/main/java/me/shedaniel/rei/plugin/crafting/DefaultCraftingCategory.java index 5660957b9..e1906461c 100644 --- a/src/main/java/me/shedaniel/rei/plugin/crafting/DefaultCraftingCategory.java +++ b/src/main/java/me/shedaniel/rei/plugin/crafting/DefaultCraftingCategory.java @@ -91,10 +91,10 @@ public class DefaultCraftingCategory implements TransferRecipeCategory<DefaultCr Point startPoint = new Point(bounds.getCenterX() - 58, bounds.getCenterY() - 27); RenderSystem.translatef(0, 0, 400); for (Integer slot : redSlots) { - int i = getSlotWithSize(display, slot, 3); + int i = slot; int x = i % 3; int y = (i - x) / 3; - DrawableHelper.fill(startPoint.x + 1 + x * 18, startPoint.y + 1 + y * 18, startPoint.x + 1 + x * 18 + 16, startPoint.y + 1 + y * 18 + 16, 822018048); + DrawableHelper.fill(startPoint.x + 1 + x * 18, startPoint.y + 1 + y * 18, startPoint.x + 1 + x * 18 + 16, startPoint.y + 1 + y * 18 + 16, 0x60ff0000); } RenderSystem.translatef(0, 0, -400); } |