From b53ef8fbcc2a892a1fe5e36687763432383c9e83 Mon Sep 17 00:00:00 2001
From: Unknown <shekwancheung0528@gmail.com>
Date: Fri, 10 May 2019 00:05:20 +0800
Subject: better rendering

---
 .../shedaniel/rei/gui/PreRecipeViewingScreen.java  |  6 +++++
 .../rei/gui/renderables/SimpleRecipeRenderer.java  | 27 ++++------------------
 2 files changed, 11 insertions(+), 22 deletions(-)

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

diff --git a/src/main/java/me/shedaniel/rei/gui/PreRecipeViewingScreen.java b/src/main/java/me/shedaniel/rei/gui/PreRecipeViewingScreen.java
index 699060edb..68ddc78a0 100644
--- a/src/main/java/me/shedaniel/rei/gui/PreRecipeViewingScreen.java
+++ b/src/main/java/me/shedaniel/rei/gui/PreRecipeViewingScreen.java
@@ -21,6 +21,7 @@ import net.minecraft.text.TranslatableTextComponent;
 import net.minecraft.util.Identifier;
 
 import java.awt.*;
+import java.io.IOException;
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
@@ -47,6 +48,11 @@ public class PreRecipeViewingScreen extends Screen {
             @Override
             public void onPressed() {
                 RoughlyEnoughItemsCore.getConfigManager().getConfig().screenType = original ? RecipeScreenType.ORIGINAL : RecipeScreenType.VILLAGER;
+                try {
+                    RoughlyEnoughItemsCore.getConfigManager().saveConfig();
+                } catch (IOException e) {
+                    e.printStackTrace();
+                }
                 ClientHelper.getInstance().openRecipeViewingScreen(map);
             }
         });
diff --git a/src/main/java/me/shedaniel/rei/gui/renderables/SimpleRecipeRenderer.java b/src/main/java/me/shedaniel/rei/gui/renderables/SimpleRecipeRenderer.java
index 6067993a9..bc76ec563 100644
--- a/src/main/java/me/shedaniel/rei/gui/renderables/SimpleRecipeRenderer.java
+++ b/src/main/java/me/shedaniel/rei/gui/renderables/SimpleRecipeRenderer.java
@@ -54,27 +54,18 @@ public class SimpleRecipeRenderer extends RecipeRenderer {
             itemStackRenderer.render(xx + 8, yy + 6, mouseX, mouseY, delta);
             xx += 18;
             j++;
-            if (j >= getItemsPerLine()) {
+            if (j >= getItemsPerLine() - 3) {
                 yy += 18;
                 xx = x + 5;
                 j = 0;
             }
         }
-        if (itemsPerLine - j + 1 < 3) {
-            j = 0;
-            xx = x + 5;
-            yy += 18;
-        }
+        xx = x + 5 + 18 * (getItemsPerLine() - 3);
+        yy = y + getHeight() / 2 - 8;
         GuiLighting.disable();
         MinecraftClient.getInstance().getTextureManager().bindTexture(CHEST_GUI_TEXTURE);
         blit(xx, yy, 0, 28, 36, 18);
         xx += 36;
-        j += 2;
-        if (j >= getItemsPerLine()) {
-            yy += 18;
-            xx = x + 5;
-            j = 0;
-        }
         outputRenderer.setBlitOffset(getBlitOffset() + 50);
         outputRenderer.drawTooltip = MinecraftClient.getInstance().currentScreen instanceof VillagerRecipeViewingScreen;
         outputRenderer.render(xx + 8, yy + 6, mouseX, mouseY, delta);
@@ -82,19 +73,11 @@ public class SimpleRecipeRenderer extends RecipeRenderer {
     
     @Override
     public int getHeight() {
-        return 10 + getEntriesHeight() * 18;
+        return 10 + getItemsHeight() * 18;
     }
     
     public int getItemsHeight() {
-        return MathHelper.ceil(((float) inputRenderer.size()) / getItemsPerLine());
-    }
-    
-    public int getEntriesHeight() {
-        int itemsPerLine = getItemsPerLine();
-        if (itemsPerLine - (inputRenderer.size() - MathHelper.floor(((float) inputRenderer.size()) / itemsPerLine)) < 3)
-            return getItemsHeight() + 1;
-        else
-            return getItemsHeight();
+        return MathHelper.ceil(((float) inputRenderer.size()) / (getItemsPerLine() - 3));
     }
     
     public int getItemsPerLine() {
-- 
cgit