From 1880248ef3516f06a0d6185e26ba83b0932f2829 Mon Sep 17 00:00:00 2001
From: Unknown <shekwancheung0528@gmail.com>
Date: Sun, 18 Aug 2019 20:20:20 +0800
Subject: Last Second API changes

---
 src/main/java/me/shedaniel/rei/api/plugins/REIPluginV0.java     | 4 ++--
 src/main/java/me/shedaniel/rei/gui/widget/RecipeBaseWidget.java | 2 +-
 src/main/java/me/shedaniel/rei/gui/widget/SlotBaseWidget.java   | 2 +-
 src/main/java/me/shedaniel/rei/impl/ClientHelperImpl.java       | 3 +--
 src/main/java/me/shedaniel/rei/impl/RecipeHelperImpl.java       | 2 +-
 src/main/java/me/shedaniel/rei/plugin/DefaultPlugin.java        | 2 +-
 6 files changed, 7 insertions(+), 8 deletions(-)

(limited to 'src/main/java/me')

diff --git a/src/main/java/me/shedaniel/rei/api/plugins/REIPluginV0.java b/src/main/java/me/shedaniel/rei/api/plugins/REIPluginV0.java
index 3a728adb7..22ad3af01 100644
--- a/src/main/java/me/shedaniel/rei/api/plugins/REIPluginV0.java
+++ b/src/main/java/me/shedaniel/rei/api/plugins/REIPluginV0.java
@@ -23,11 +23,11 @@ public interface REIPluginV0 extends REIPluginEntry {
     }
     
     /**
-     * Registers items on the item panel
+     * Registers entries on the item panel
      *
      * @param entryRegistry the helper class
      */
-    default void registerItems(EntryRegistry entryRegistry) {
+    default void registerEntries(EntryRegistry entryRegistry) {
     }
     
     /**
diff --git a/src/main/java/me/shedaniel/rei/gui/widget/RecipeBaseWidget.java b/src/main/java/me/shedaniel/rei/gui/widget/RecipeBaseWidget.java
index ee3ae26a4..821e6ffbe 100644
--- a/src/main/java/me/shedaniel/rei/gui/widget/RecipeBaseWidget.java
+++ b/src/main/java/me/shedaniel/rei/gui/widget/RecipeBaseWidget.java
@@ -84,7 +84,7 @@ public class RecipeBaseWidget extends WidgetWithBounds {
     }
     
     protected int getInnerColor() {
-        return ScreenHelper.isDarkModeEnabled() ? 0xFF2E2E2E : -3750202;
+        return ScreenHelper.isDarkModeEnabled() ? -13750738 : -3750202;
     }
     
     protected int getTextureOffset() {
diff --git a/src/main/java/me/shedaniel/rei/gui/widget/SlotBaseWidget.java b/src/main/java/me/shedaniel/rei/gui/widget/SlotBaseWidget.java
index 89e96d1b3..94a47af3e 100644
--- a/src/main/java/me/shedaniel/rei/gui/widget/SlotBaseWidget.java
+++ b/src/main/java/me/shedaniel/rei/gui/widget/SlotBaseWidget.java
@@ -16,7 +16,7 @@ public class SlotBaseWidget extends RecipeBaseWidget {
     
     @Override
     public int getInnerColor() {
-        return ScreenHelper.isDarkModeEnabled() ? 0xFF303030 : -7631989;
+        return ScreenHelper.isDarkModeEnabled() ? -13619152 : -7631989;
     }
     
     @Override
diff --git a/src/main/java/me/shedaniel/rei/impl/ClientHelperImpl.java b/src/main/java/me/shedaniel/rei/impl/ClientHelperImpl.java
index 952608a66..fba9c0e82 100644
--- a/src/main/java/me/shedaniel/rei/impl/ClientHelperImpl.java
+++ b/src/main/java/me/shedaniel/rei/impl/ClientHelperImpl.java
@@ -243,8 +243,7 @@ public class ClientHelperImpl implements ClientHelper, ClientModInitializer {
             screen = new PreRecipeViewingScreen(map);
         else
             screen = new RecipeViewingScreen(map);
-        if (MinecraftClient.getInstance().currentScreen instanceof VillagerRecipeViewingScreen || MinecraftClient.getInstance().currentScreen instanceof RecipeViewingScreen)
-            ScreenHelper.storeRecipeScreen(MinecraftClient.getInstance().currentScreen);
+        ScreenHelper.storeRecipeScreen(MinecraftClient.getInstance().currentScreen);
         MinecraftClient.getInstance().openScreen(screen);
     }
     
diff --git a/src/main/java/me/shedaniel/rei/impl/RecipeHelperImpl.java b/src/main/java/me/shedaniel/rei/impl/RecipeHelperImpl.java
index 1501d1355..d05823fe6 100644
--- a/src/main/java/me/shedaniel/rei/impl/RecipeHelperImpl.java
+++ b/src/main/java/me/shedaniel/rei/impl/RecipeHelperImpl.java
@@ -258,7 +258,7 @@ public class RecipeHelperImpl implements RecipeHelper {
                     ((REIPluginV0) plugin).registerRecipeDisplays(this);
                     ((REIPluginV0) plugin).registerBounds(RoughlyEnoughItemsCore.getDisplayHelper());
                     ((REIPluginV0) plugin).registerOthers(this);
-                    ((REIPluginV0) plugin).registerItems(RoughlyEnoughItemsCore.getEntryRegistry());
+                    ((REIPluginV0) plugin).registerEntries(RoughlyEnoughItemsCore.getEntryRegistry());
                 } else {
                     throw new IllegalStateException("Invaild Plugin Class!");
                 }
diff --git a/src/main/java/me/shedaniel/rei/plugin/DefaultPlugin.java b/src/main/java/me/shedaniel/rei/plugin/DefaultPlugin.java
index 1a915e9bc..b57694dac 100644
--- a/src/main/java/me/shedaniel/rei/plugin/DefaultPlugin.java
+++ b/src/main/java/me/shedaniel/rei/plugin/DefaultPlugin.java
@@ -93,7 +93,7 @@ public class DefaultPlugin implements REIPluginV0 {
     }
     
     @Override
-    public void registerItems(EntryRegistry entryRegistry) {
+    public void registerEntries(EntryRegistry entryRegistry) {
         if (!RoughlyEnoughItemsCore.getConfigManager().getConfig().isLoadingDefaultPlugin()) {
             return;
         }
-- 
cgit