Fix lang and craftable toggle depth

5 files changed, 21 insertions, 17 deletions

diff --git a/src/main/java/me/shedaniel/rei/gui/ContainerScreenOverlay.java b/src/main/java/me/shedaniel/rei/gui/ContainerScreenOverlay.java
index 51a14e246..5e9a6c54d 100644
--- a/src/main/java/me/shedaniel/rei/gui/ContainerScreenOverlay.java
+++ b/src/main/java/me/shedaniel/rei/gui/ContainerScreenOverlay.java
@@ -41,6 +41,7 @@ public class ContainerScreenOverlay extends AbstractParentElement implements Dra
     private final List<Widget> widgets = Lists.newLinkedList();
     private Rectangle rectangle;
     private Window window;
+    private CraftableToggleButtonWidget toggleButtonWidget;
     private ButtonWidget buttonLeft, buttonRight;
     private int lastLeft;
     
@@ -226,7 +227,7 @@ public class ContainerScreenOverlay extends AbstractParentElement implements Dra
         this.widgets.add(ScreenHelper.searchField);
         ScreenHelper.searchField.setText(searchTerm);
         if (RoughlyEnoughItemsCore.getConfigManager().getConfig().enableCraftableOnlyButton)
-            this.widgets.add(new CraftableToggleButtonWidget(getCraftableToggleArea()) {
+            this.widgets.add(toggleButtonWidget = new CraftableToggleButtonWidget(getCraftableToggleArea()) {
                 @Override
                 public void onPressed() {
                     RoughlyEnoughItemsCore.getConfigManager().toggleCraftableOnly();
@@ -234,12 +235,13 @@ public class ContainerScreenOverlay extends AbstractParentElement implements Dra
                 }
                 
                 @Override
-                public void render(int mouseX, int mouseY, float delta) {
-                    blitOffset = 600;
-                    super.render(mouseX, mouseY, delta);
+                public void lateRender(int mouseX, int mouseY, float delta) {
+                    blitOffset = 300;
+                    super.lateRender(mouseX, mouseY, delta);
                 }
             });
-        
+        else
+            toggleButtonWidget = null;
         this.itemListOverlay.updateList(boundsHandler, boundsHandler.getItemListArea(rectangle), page, searchTerm);
     }
     
@@ -331,6 +333,8 @@ public class ContainerScreenOverlay extends AbstractParentElement implements Dra
     
     public void lateRender(int mouseX, int mouseY, float delta) {
         ScreenHelper.searchField.laterRender(mouseX, mouseY, delta);
+        if (toggleButtonWidget != null)
+            toggleButtonWidget.lateRender(mouseX, mouseY, delta);
         Screen currentScreen = MinecraftClient.getInstance().currentScreen;
         if (!(currentScreen instanceof RecipeViewingScreen) || !((RecipeViewingScreen) currentScreen).choosePageActivated)
             QUEUED_TOOLTIPS.stream().filter(Objects::nonNull).forEach(queuedTooltip -> renderTooltip(queuedTooltip.getText(), queuedTooltip.getX(), queuedTooltip.getY()));
@@ -339,17 +343,14 @@ public class ContainerScreenOverlay extends AbstractParentElement implements Dra
     
     public void renderTooltip(List<String> list_1, int int_1, int int_2) {
         TextRenderer font = MinecraftClient.getInstance().textRenderer;
-        Window window = MinecraftClient.getInstance().window;
         if (!list_1.isEmpty()) {
             GlStateManager.disableRescaleNormal();
             GuiLighting.disable();
             GlStateManager.disableLighting();
             int int_3 = 0;
-            for(String string_1 : list_1) {
-                int int_4 = font.getStringWidth(string_1);
-                if (int_4 > int_3)
-                    int_3 = int_4;
-            }
+            for(String string_1 : list_1)
+                if (font.getStringWidth(string_1) > int_3)
+                    int_3 = font.getStringWidth(string_1);
             int int_5 = int_1 + 12;
             int int_6 = int_2 - 12;
             int int_8 = 8;
diff --git a/src/main/java/me/shedaniel/rei/gui/widget/CraftableToggleButtonWidget.java b/src/main/java/me/shedaniel/rei/gui/widget/CraftableToggleButtonWidget.java
index e635f6b54..a2731c692 100644
--- a/src/main/java/me/shedaniel/rei/gui/widget/CraftableToggleButtonWidget.java
+++ b/src/main/java/me/shedaniel/rei/gui/widget/CraftableToggleButtonWidget.java
@@ -27,8 +27,7 @@ public abstract class CraftableToggleButtonWidget extends ButtonWidget {
         this(new Rectangle(x, y, width, height));
     }
     
-    @Override
-    public void render(int mouseX, int mouseY, float delta) {
+    public void lateRender(int mouseX, int mouseY, float delta) {
         GuiLighting.disable();
         super.render(mouseX, mouseY, delta);
         
@@ -40,12 +39,16 @@ public abstract class CraftableToggleButtonWidget extends ButtonWidget {
         MinecraftClient.getInstance().getTextureManager().bindTexture(CHEST_GUI_TEXTURE);
         GlStateManager.color4f(1.0F, 1.0F, 1.0F, 1.0F);
         int color = RoughlyEnoughItemsCore.getConfigManager().isCraftableOnlyEnabled() ? 939579655 : 956235776;
-        this.blitOffset += 100f;
+        this.blitOffset += 10f;
         this.fillGradient(getBounds().x, getBounds().y, getBounds().x + getBounds().width, getBounds().y + getBounds().height, color, color);
         this.blitOffset = 0;
     }
     
     @Override
+    public void render(int mouseX, int mouseY, float delta) {
+    }
+    
+    @Override
     public boolean changeFocus(boolean boolean_1) {
         return false;
     }
diff --git a/src/main/resources/assets/roughlyenoughitems/lang/et_ee.json b/src/main/resources/assets/roughlyenoughitems/lang/et_ee.json
index 7f77ac5d0..9b6a89832 100644
--- a/src/main/resources/assets/roughlyenoughitems/lang/et_ee.json
+++ b/src/main/resources/assets/roughlyenoughitems/lang/et_ee.json
@@ -60,5 +60,5 @@
   "text.rei.gamemode_button.tooltip": "Vaheta mängurežiimi\n§7Lülita %s-režiimile.",
   "text.rei.weather_button.tooltip": "Vaheta ilma\n§7Lülita ilmale %s.",
   "text.rei.enabled": "Jah",
-  "text.rei.disabled": "Ei",
+  "text.rei.disabled": "Ei"
 }
diff --git a/src/main/resources/assets/roughlyenoughitems/lang/zh_cn.json b/src/main/resources/assets/roughlyenoughitems/lang/zh_cn.json
index 7ed31cd55..e1bdc9abf 100644
--- a/src/main/resources/assets/roughlyenoughitems/lang/zh_cn.json
+++ b/src/main/resources/assets/roughlyenoughitems/lang/zh_cn.json
@@ -82,5 +82,5 @@
   "text.rei.config.item_cheating_mode": "物品作弊数量模式:",
   "text.rei.config.item_cheating_mode.rei_like": "标准",
   "text.rei.config.item_cheating_mode.jei_like": "反转",
-  "text.rei.no_config_api": "Cloth Config API 不存在!\n请安装它以显示游戏中的配置界面!",
+  "text.rei.no_config_api": "Cloth Config API 不存在!\n请安装它以显示游戏中的配置界面!"
 }
diff --git a/src/main/resources/assets/roughlyenoughitems/lang/zh_tw.json b/src/main/resources/assets/roughlyenoughitems/lang/zh_tw.json
index 25736515d..d82d82935 100644
--- a/src/main/resources/assets/roughlyenoughitems/lang/zh_tw.json
+++ b/src/main/resources/assets/roughlyenoughitems/lang/zh_tw.json
@@ -82,5 +82,5 @@
   "text.rei.config.item_cheating_mode": "物品作弊數量模式:",
   "text.rei.config.item_cheating_mode.rei_like": "標准",
   "text.rei.config.item_cheating_mode.jei_like": "反轉",
-  "text.rei.no_config_api": "Cloth Config API 不存在!\n請安裝它以顯示游戲中的配置界面!",
+  "text.rei.no_config_api": "Cloth Config API 不存在!\n請安裝它以顯示游戲中的配置界面!"
 }