From a5c90bb7d4748ba2da024ce468ffeeda99bf4a0f Mon Sep 17 00:00:00 2001 From: Unknown Date: Wed, 8 May 2019 00:55:25 +0800 Subject: start of 2.9 update beta --- .../me/shedaniel/rei/gui/widget/TabWidget.java | 38 ++++++++++------------ 1 file changed, 17 insertions(+), 21 deletions(-) (limited to 'src/main/java/me/shedaniel/rei/gui/widget/TabWidget.java') diff --git a/src/main/java/me/shedaniel/rei/gui/widget/TabWidget.java b/src/main/java/me/shedaniel/rei/gui/widget/TabWidget.java index 07493792c..b86be1927 100644 --- a/src/main/java/me/shedaniel/rei/gui/widget/TabWidget.java +++ b/src/main/java/me/shedaniel/rei/gui/widget/TabWidget.java @@ -1,11 +1,12 @@ package me.shedaniel.rei.gui.widget; import com.mojang.blaze3d.platform.GlStateManager; +import me.shedaniel.rei.api.ClientHelper; +import me.shedaniel.rei.api.RecipeCategory; +import me.shedaniel.rei.api.Renderable; import me.shedaniel.rei.client.ScreenHelper; import me.shedaniel.rei.gui.RecipeViewingScreen; import net.minecraft.client.render.GuiLighting; -import net.minecraft.client.render.item.ItemRenderer; -import net.minecraft.item.ItemStack; import net.minecraft.util.Identifier; import java.awt.*; @@ -17,28 +18,28 @@ public class TabWidget extends HighlightableWidget { public static final Identifier CHEST_GUI_TEXTURE = new Identifier("roughlyenoughitems", "textures/gui/recipecontainer.png"); public boolean shown = false, selected = false; - public ItemStack item; + public Renderable renderable; public int id; public RecipeViewingScreen recipeViewingWidget; public String categoryName; public Rectangle bounds; - private ItemRenderer itemRenderer; + public RecipeCategory category; public TabWidget(int id, RecipeViewingScreen recipeViewingWidget, Rectangle bounds) { this.id = id; this.recipeViewingWidget = recipeViewingWidget; this.bounds = bounds; - this.itemRenderer = minecraft.getItemRenderer(); } - public void setItem(ItemStack item, String categoryName, boolean selected) { - if (item == null) { + public void setRenderable(RecipeCategory category, Renderable renderable, String categoryName, boolean selected) { + if (renderable == null) { shown = false; - this.item = null; + this.renderable = null; } else { shown = true; - this.item = item; + this.renderable = renderable; } + this.category = category; this.selected = selected; this.categoryName = categoryName; } @@ -55,8 +56,8 @@ public class TabWidget extends HighlightableWidget { return shown; } - public ItemStack getItemStack() { - return item; + public Renderable getRenderable() { + return renderable; } @Override @@ -67,26 +68,21 @@ public class TabWidget extends HighlightableWidget { @Override public void render(int mouseX, int mouseY, float delta) { if (shown) { - int l = (int) this.bounds.getCenterX() - 8, i1 = (int) this.bounds.getCenterY() - 6; GlStateManager.color4f(1.0F, 1.0F, 1.0F, 1.0F); GuiLighting.disable(); minecraft.getTextureManager().bindTexture(CHEST_GUI_TEXTURE); this.blit(bounds.x, bounds.y + 2, selected ? 28 : 0, 192, 28, (selected ? 30 : 27)); - this.blitOffset = 100; - this.itemRenderer.zOffset = 100.0F; - GuiLighting.enableForItems(); - this.itemRenderer.renderGuiItem(getItemStack(), l, i1); - this.itemRenderer.renderGuiItemOverlay(minecraft.textRenderer, getItemStack(), l, i1); - GlStateManager.disableLighting(); - this.itemRenderer.zOffset = 0.0F; - this.blitOffset = 0; + renderable.render((int) bounds.getCenterX(), (int) bounds.getCenterY(), mouseX, mouseY, delta); if (isHighlighted(mouseX, mouseY)) drawTooltip(); } } private void drawTooltip() { - ScreenHelper.getLastOverlay().addTooltip(QueuedTooltip.create(categoryName)); + if (this.minecraft.options.advancedItemTooltips) + ScreenHelper.getLastOverlay().addTooltip(QueuedTooltip.create(categoryName, "ยง8" + category.getIdentifier().toString(), ClientHelper.getInstance().getFormattedModFromIdentifier(category.getIdentifier()))); + else + ScreenHelper.getLastOverlay().addTooltip(QueuedTooltip.create(categoryName, ClientHelper.getInstance().getFormattedModFromIdentifier(category.getIdentifier()))); } @Override -- cgit From 33ed36eff27c1a533dacb2fa73510687f119c12b Mon Sep 17 00:00:00 2001 From: Unknown Date: Wed, 8 May 2019 01:24:22 +0800 Subject: more internal changes Fix #56 --- .../java/me/shedaniel/rei/gui/widget/TabWidget.java | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) (limited to 'src/main/java/me/shedaniel/rei/gui/widget/TabWidget.java') diff --git a/src/main/java/me/shedaniel/rei/gui/widget/TabWidget.java b/src/main/java/me/shedaniel/rei/gui/widget/TabWidget.java index b86be1927..9616922d3 100644 --- a/src/main/java/me/shedaniel/rei/gui/widget/TabWidget.java +++ b/src/main/java/me/shedaniel/rei/gui/widget/TabWidget.java @@ -3,7 +3,7 @@ package me.shedaniel.rei.gui.widget; import com.mojang.blaze3d.platform.GlStateManager; import me.shedaniel.rei.api.ClientHelper; import me.shedaniel.rei.api.RecipeCategory; -import me.shedaniel.rei.api.Renderable; +import me.shedaniel.rei.api.Renderer; import me.shedaniel.rei.client.ScreenHelper; import me.shedaniel.rei.gui.RecipeViewingScreen; import net.minecraft.client.render.GuiLighting; @@ -18,7 +18,7 @@ public class TabWidget extends HighlightableWidget { public static final Identifier CHEST_GUI_TEXTURE = new Identifier("roughlyenoughitems", "textures/gui/recipecontainer.png"); public boolean shown = false, selected = false; - public Renderable renderable; + public Renderer renderer; public int id; public RecipeViewingScreen recipeViewingWidget; public String categoryName; @@ -31,13 +31,13 @@ public class TabWidget extends HighlightableWidget { this.bounds = bounds; } - public void setRenderable(RecipeCategory category, Renderable renderable, String categoryName, boolean selected) { + public void setRenderer(RecipeCategory category, Renderer renderable, String categoryName, boolean selected) { if (renderable == null) { shown = false; - this.renderable = null; + this.renderer = null; } else { shown = true; - this.renderable = renderable; + this.renderer = renderable; } this.category = category; this.selected = selected; @@ -56,8 +56,8 @@ public class TabWidget extends HighlightableWidget { return shown; } - public Renderable getRenderable() { - return renderable; + public Renderer getRenderer() { + return renderer; } @Override @@ -72,7 +72,8 @@ public class TabWidget extends HighlightableWidget { GuiLighting.disable(); minecraft.getTextureManager().bindTexture(CHEST_GUI_TEXTURE); this.blit(bounds.x, bounds.y + 2, selected ? 28 : 0, 192, 28, (selected ? 30 : 27)); - renderable.render((int) bounds.getCenterX(), (int) bounds.getCenterY(), mouseX, mouseY, delta); + renderer.setBlitOffset(100); + renderer.render((int) bounds.getCenterX(), (int) bounds.getCenterY(), mouseX, mouseY, delta); if (isHighlighted(mouseX, mouseY)) drawTooltip(); } -- cgit From c1b0219e8d5458ddf1eccc194d34893f698b7d88 Mon Sep 17 00:00:00 2001 From: Unknown Date: Thu, 9 May 2019 22:38:34 +0800 Subject: VillagerRecipeViewingScreen done --- src/main/java/me/shedaniel/rei/gui/widget/TabWidget.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'src/main/java/me/shedaniel/rei/gui/widget/TabWidget.java') diff --git a/src/main/java/me/shedaniel/rei/gui/widget/TabWidget.java b/src/main/java/me/shedaniel/rei/gui/widget/TabWidget.java index 9616922d3..3f43eb156 100644 --- a/src/main/java/me/shedaniel/rei/gui/widget/TabWidget.java +++ b/src/main/java/me/shedaniel/rei/gui/widget/TabWidget.java @@ -20,14 +20,12 @@ public class TabWidget extends HighlightableWidget { public boolean shown = false, selected = false; public Renderer renderer; public int id; - public RecipeViewingScreen recipeViewingWidget; public String categoryName; public Rectangle bounds; public RecipeCategory category; - public TabWidget(int id, RecipeViewingScreen recipeViewingWidget, Rectangle bounds) { + public TabWidget(int id, Rectangle bounds) { this.id = id; - this.recipeViewingWidget = recipeViewingWidget; this.bounds = bounds; } -- cgit