From 7689bdbb42ad10b2ad99e2bae55ddaceac15bca7 Mon Sep 17 00:00:00 2001 From: Unknown Date: Mon, 3 Jun 2019 21:39:36 +0800 Subject: Dark Mode --- src/main/java/me/shedaniel/rei/gui/widget/SlotWidget.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'src/main/java/me/shedaniel/rei/gui/widget/SlotWidget.java') diff --git a/src/main/java/me/shedaniel/rei/gui/widget/SlotWidget.java b/src/main/java/me/shedaniel/rei/gui/widget/SlotWidget.java index 7bcda080d..d6c42b385 100644 --- a/src/main/java/me/shedaniel/rei/gui/widget/SlotWidget.java +++ b/src/main/java/me/shedaniel/rei/gui/widget/SlotWidget.java @@ -31,6 +31,7 @@ import java.util.stream.Collectors; public class SlotWidget extends HighlightableWidget { private static final Identifier RECIPE_GUI = new Identifier("roughlyenoughitems", "textures/gui/recipecontainer.png"); + private static final Identifier RECIPE_GUI_DARK = new Identifier("roughlyenoughitems", "textures/gui/recipecontainer_dark.png"); private static final ItemStackRenderer TROPICAL_FISH_RENDERABLE = Renderable.fromItemStack(Items.TROPICAL_FISH.getDefaultStack()); private List renderers = new LinkedList<>(); private boolean drawBackground, showToolTips, clickToMoreRecipes, drawHighlightedBackground; @@ -99,8 +100,9 @@ public class SlotWidget extends HighlightableWidget { @Override public void render(int mouseX, int mouseY, float delta) { Renderer renderer = getCurrentRenderer(); + boolean darkTheme = RoughlyEnoughItemsCore.getConfigManager().getConfig().darkTheme; if (drawBackground) { - minecraft.getTextureManager().bindTexture(RECIPE_GUI); + minecraft.getTextureManager().bindTexture(darkTheme ? RECIPE_GUI_DARK : RECIPE_GUI); blit(this.x - 1, this.y - 1, 0, 222, 18, 18); } boolean highlighted = isHighlighted(mouseX, mouseY); @@ -108,7 +110,8 @@ public class SlotWidget extends HighlightableWidget { GlStateManager.disableLighting(); GlStateManager.disableDepthTest(); GlStateManager.colorMask(true, true, true, false); - fillGradient(x, y, x + 16, y + 16, -2130706433, -2130706433); + int color = darkTheme ? 0xFF5E5E5E : -2130706433; + fillGradient(x, y, x + 16, y + 16, color, color); GlStateManager.colorMask(true, true, true, true); GlStateManager.enableLighting(); GlStateManager.enableDepthTest(); -- cgit From fd99a42678f27d74483cfa2ae069de8bea38f893 Mon Sep 17 00:00:00 2001 From: Unknown Date: Wed, 5 Jun 2019 20:14:36 +0800 Subject: recipe id cache --- src/main/java/me/shedaniel/rei/gui/widget/SlotWidget.java | 3 --- 1 file changed, 3 deletions(-) (limited to 'src/main/java/me/shedaniel/rei/gui/widget/SlotWidget.java') diff --git a/src/main/java/me/shedaniel/rei/gui/widget/SlotWidget.java b/src/main/java/me/shedaniel/rei/gui/widget/SlotWidget.java index d6c42b385..159962241 100644 --- a/src/main/java/me/shedaniel/rei/gui/widget/SlotWidget.java +++ b/src/main/java/me/shedaniel/rei/gui/widget/SlotWidget.java @@ -32,7 +32,6 @@ public class SlotWidget extends HighlightableWidget { private static final Identifier RECIPE_GUI = new Identifier("roughlyenoughitems", "textures/gui/recipecontainer.png"); private static final Identifier RECIPE_GUI_DARK = new Identifier("roughlyenoughitems", "textures/gui/recipecontainer_dark.png"); - private static final ItemStackRenderer TROPICAL_FISH_RENDERABLE = Renderable.fromItemStack(Items.TROPICAL_FISH.getDefaultStack()); private List renderers = new LinkedList<>(); private boolean drawBackground, showToolTips, clickToMoreRecipes, drawHighlightedBackground; private int x, y; @@ -117,8 +116,6 @@ public class SlotWidget extends HighlightableWidget { GlStateManager.enableDepthTest(); } if (isCurrentRendererItem() && !getCurrentItemStack().isEmpty()) { - if (RoughlyEnoughItemsCore.getConfigManager().getConfig().aprilFoolsFish2019 && !highlighted) - renderer = TROPICAL_FISH_RENDERABLE; renderer.setBlitOffset(200); renderer.render(x + 8, y + 6, mouseX, mouseY, delta); if (!getCurrentItemStack().isEmpty() && highlighted && showToolTips) -- cgit From 94e6085d2d49e7fe38871c9548774c4e50a2f422 Mon Sep 17 00:00:00 2001 From: Unknown Date: Thu, 6 Jun 2019 16:09:48 +0800 Subject: this is still not working --- .../me/shedaniel/rei/gui/widget/SlotWidget.java | 29 +++++++++++++++++++--- 1 file changed, 26 insertions(+), 3 deletions(-) (limited to 'src/main/java/me/shedaniel/rei/gui/widget/SlotWidget.java') diff --git a/src/main/java/me/shedaniel/rei/gui/widget/SlotWidget.java b/src/main/java/me/shedaniel/rei/gui/widget/SlotWidget.java index 159962241..aaa997631 100644 --- a/src/main/java/me/shedaniel/rei/gui/widget/SlotWidget.java +++ b/src/main/java/me/shedaniel/rei/gui/widget/SlotWidget.java @@ -17,7 +17,6 @@ import me.shedaniel.rei.client.ScreenHelper; import me.shedaniel.rei.gui.renderables.ItemStackRenderer; import net.minecraft.client.gui.Element; import net.minecraft.item.ItemStack; -import net.minecraft.item.Items; import net.minecraft.util.Identifier; import net.minecraft.util.math.MathHelper; @@ -30,8 +29,8 @@ import java.util.stream.Collectors; public class SlotWidget extends HighlightableWidget { - private static final Identifier RECIPE_GUI = new Identifier("roughlyenoughitems", "textures/gui/recipecontainer.png"); - private static final Identifier RECIPE_GUI_DARK = new Identifier("roughlyenoughitems", "textures/gui/recipecontainer_dark.png"); + public static final Identifier RECIPE_GUI = new Identifier("roughlyenoughitems", "textures/gui/recipecontainer.png"); + public static final Identifier RECIPE_GUI_DARK = new Identifier("roughlyenoughitems", "textures/gui/recipecontainer_dark.png"); private List renderers = new LinkedList<>(); private boolean drawBackground, showToolTips, clickToMoreRecipes, drawHighlightedBackground; private int x, y; @@ -59,6 +58,22 @@ public class SlotWidget extends HighlightableWidget { this.clickToMoreRecipes = clickToMoreRecipes; } + public int getX() { + return x; + } + + public void setX(int x) { + this.x = x; + } + + public int getY() { + return y; + } + + public void setY(int y) { + this.y = y; + } + public boolean isShowToolTips() { return showToolTips; } @@ -126,6 +141,14 @@ public class SlotWidget extends HighlightableWidget { } } + public int getBlitOffset() { + return this.blitOffset; + } + + public void setBlitOffset(int offset) { + this.blitOffset = offset; + } + protected void queueTooltip(ItemStack itemStack, float delta) { ScreenHelper.getLastOverlay().addTooltip(QueuedTooltip.create(getTooltip(itemStack))); } -- cgit From 36609262e4014e976523130bf26879eac2e90e19 Mon Sep 17 00:00:00 2001 From: Unknown Date: Thu, 6 Jun 2019 17:56:11 +0800 Subject: giving up on that --- src/main/java/me/shedaniel/rei/gui/widget/SlotWidget.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/main/java/me/shedaniel/rei/gui/widget/SlotWidget.java') diff --git a/src/main/java/me/shedaniel/rei/gui/widget/SlotWidget.java b/src/main/java/me/shedaniel/rei/gui/widget/SlotWidget.java index aaa997631..9bb20a201 100644 --- a/src/main/java/me/shedaniel/rei/gui/widget/SlotWidget.java +++ b/src/main/java/me/shedaniel/rei/gui/widget/SlotWidget.java @@ -33,7 +33,7 @@ public class SlotWidget extends HighlightableWidget { public static final Identifier RECIPE_GUI_DARK = new Identifier("roughlyenoughitems", "textures/gui/recipecontainer_dark.png"); private List renderers = new LinkedList<>(); private boolean drawBackground, showToolTips, clickToMoreRecipes, drawHighlightedBackground; - private int x, y; + protected int x, y; public SlotWidget(int x, int y, ItemStack itemStack, boolean drawBackground, boolean showToolTips) { this(x, y, Collections.singletonList(itemStack), drawBackground, showToolTips); -- cgit