From c1b0219e8d5458ddf1eccc194d34893f698b7d88 Mon Sep 17 00:00:00 2001
From: Unknown <shekwancheung0528@gmail.com>
Date: Thu, 9 May 2019 22:38:34 +0800
Subject: VillagerRecipeViewingScreen done

---
 .../shedaniel/rei/gui/widget/RecipeBaseWidget.java | 64 ++++++++++------------
 1 file changed, 30 insertions(+), 34 deletions(-)

(limited to 'src/main/java/me/shedaniel/rei/gui/widget/RecipeBaseWidget.java')

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 a139d7d34..cd294dc69 100644
--- a/src/main/java/me/shedaniel/rei/gui/widget/RecipeBaseWidget.java
+++ b/src/main/java/me/shedaniel/rei/gui/widget/RecipeBaseWidget.java
@@ -2,6 +2,7 @@ package me.shedaniel.rei.gui.widget;
 
 import com.mojang.blaze3d.platform.GlStateManager;
 import me.shedaniel.rei.RoughlyEnoughItemsCore;
+import me.shedaniel.rei.client.RecipeScreenType;
 import net.minecraft.client.render.GuiLighting;
 import net.minecraft.util.Identifier;
 
@@ -14,7 +15,6 @@ public class RecipeBaseWidget extends HighlightableWidget {
     private static final Identifier CHEST_GUI_TEXTURE = new Identifier("roughlyenoughitems", "textures/gui/recipecontainer.png");
     
     private Rectangle bounds;
-    protected boolean render = true;
     
     public RecipeBaseWidget(Rectangle bounds) {
         this.bounds = bounds;
@@ -22,14 +22,6 @@ public class RecipeBaseWidget extends HighlightableWidget {
             throw new IllegalArgumentException("Base too small, at least 8x8!");
     }
     
-    public boolean isRender() {
-        return render;
-    }
-    
-    public void setRender(boolean render) {
-        this.render = render;
-    }
-    
     @Override
     public Rectangle getBounds() {
         return bounds;
@@ -46,32 +38,36 @@ public class RecipeBaseWidget extends HighlightableWidget {
     
     @Override
     public void render(int mouseX, int mouseY, float delta) {
-        if (render) {
-            GlStateManager.color4f(1.0F, 1.0F, 1.0F, 1.0F);
-            GuiLighting.disable();
-            minecraft.getTextureManager().bindTexture(CHEST_GUI_TEXTURE);
-            int x = bounds.x, y = bounds.y, width = bounds.width, height = bounds.height;
-            int textureOffset = getTextureOffset();
-    
-            //Four Corners
-            this.blit(x, y, 106, 124 + textureOffset, 4, 4);
-            this.blit(x + width - 4, y, 252, 124 + textureOffset, 4, 4);
-            this.blit(x, y + height - 4, 106, 186 + textureOffset, 4, 4);
-            this.blit(x + width - 4, y + height - 4, 252, 186 + textureOffset, 4, 4);
-    
-            //Sides
-            for(int xx = 4; xx < width - 4; xx += 128) {
-                int thisWidth = Math.min(128, width - 4 - xx);
-                this.blit(x + xx, y, 110, 124 + textureOffset, thisWidth, 4);
-                this.blit(x + xx, y + height - 4, 110, 186 + textureOffset, thisWidth, 4);
-            }
-            for(int yy = 4; yy < height - 4; yy += 50) {
-                int thisHeight = Math.min(50, height - 4 - yy);
-                this.blit(x, y + yy, 106, 128 + textureOffset, 4, thisHeight);
-                this.blit(x + width - 4, y + yy, 252, 128 + textureOffset, 4, thisHeight);
-            }
-            fillGradient(x + 4, y + 4, x + width - 4, y + height - 4, getInnerColor(), getInnerColor());
+        if (!isRendering())
+            return;
+        GlStateManager.color4f(1.0F, 1.0F, 1.0F, 1.0F);
+        GuiLighting.disable();
+        minecraft.getTextureManager().bindTexture(CHEST_GUI_TEXTURE);
+        int x = bounds.x, y = bounds.y, width = bounds.width, height = bounds.height;
+        int textureOffset = getTextureOffset();
+        
+        //Four Corners
+        this.blit(x, y, 106, 124 + textureOffset, 4, 4);
+        this.blit(x + width - 4, y, 252, 124 + textureOffset, 4, 4);
+        this.blit(x, y + height - 4, 106, 186 + textureOffset, 4, 4);
+        this.blit(x + width - 4, y + height - 4, 252, 186 + textureOffset, 4, 4);
+        
+        //Sides
+        for(int xx = 4; xx < width - 4; xx += 128) {
+            int thisWidth = Math.min(128, width - 4 - xx);
+            this.blit(x + xx, y, 110, 124 + textureOffset, thisWidth, 4);
+            this.blit(x + xx, y + height - 4, 110, 186 + textureOffset, thisWidth, 4);
+        }
+        for(int yy = 4; yy < height - 4; yy += 50) {
+            int thisHeight = Math.min(50, height - 4 - yy);
+            this.blit(x, y + yy, 106, 128 + textureOffset, 4, thisHeight);
+            this.blit(x + width - 4, y + yy, 252, 128 + textureOffset, 4, thisHeight);
         }
+        fillGradient(x + 4, y + 4, x + width - 4, y + height - 4, getInnerColor(), getInnerColor());
+    }
+    
+    protected boolean isRendering() {
+        return RoughlyEnoughItemsCore.getConfigManager().getConfig().screenType != RecipeScreenType.VILLAGER;
     }
     
     protected int getInnerColor() {
-- 
cgit