diff --git a/CHANGELOG.md b/CHANGELOG.md index 1c92c50b4..e96292ad0 100755 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,7 @@ - Fixed Grid crash with search field (raoulvdberge) - Fixed External Storage not working without Storage Drawers (raoulvdberge) - Fixed External Storage not calculating max stack size in the calculation of it's capacity display in the GUI (raoulvdberge) +- Fixed Refined Storage not drawing small text correctly with Unicode font (raoulvdberge) ### 1.5.14 - Updated Forge to 2426 (raoulvdberge) diff --git a/src/main/java/com/raoulvdberge/refinedstorage/api/render/IElementDrawers.java b/src/main/java/com/raoulvdberge/refinedstorage/api/render/IElementDrawers.java index 6ac8ed54b..3cff02bb3 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/api/render/IElementDrawers.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/api/render/IElementDrawers.java @@ -1,5 +1,6 @@ package com.raoulvdberge.refinedstorage.api.render; +import net.minecraft.client.gui.FontRenderer; import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.FluidStack; @@ -35,6 +36,11 @@ public interface IElementDrawers { return getNullDrawer(); } + /** + * @return the font renderer + */ + FontRenderer getFontRenderer(); + /** * DO NOT OVERRIDE! * diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/craftingmonitor/CraftingMonitorElementFluidRender.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/craftingmonitor/CraftingMonitorElementFluidRender.java index fa2142f09..f21e12fcc 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/craftingmonitor/CraftingMonitorElementFluidRender.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/craftingmonitor/CraftingMonitorElementFluidRender.java @@ -29,7 +29,7 @@ public class CraftingMonitorElementFluidRender implements ICraftingMonitorElemen public void draw(int x, int y, IElementDrawers drawers) { drawers.getFluidDrawer().draw(x + 2 + offset, y + 1, stack); - float scale = 0.5f; + float scale = drawers.getFontRenderer().getUnicodeFlag() ? 1F : 0.5F; GlStateManager.pushMatrix(); GlStateManager.scale(scale, scale, 1); diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/craftingmonitor/CraftingMonitorElementItemRender.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/craftingmonitor/CraftingMonitorElementItemRender.java index 9d2d519a5..cf4b2f6b8 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/craftingmonitor/CraftingMonitorElementItemRender.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/craftingmonitor/CraftingMonitorElementItemRender.java @@ -31,7 +31,7 @@ public class CraftingMonitorElementItemRender implements ICraftingMonitorElement public void draw(int x, int y, IElementDrawers drawers) { drawers.getItemDrawer().draw(x + 2 + offset, y + 1, stack); - float scale = 0.5f; + float scale = drawers.getFontRenderer().getUnicodeFlag() ? 1F : 0.5F; GlStateManager.pushMatrix(); GlStateManager.scale(scale, scale, 1); diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/craftingmonitor/CraftingMonitorElementText.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/craftingmonitor/CraftingMonitorElementText.java index 74ca8de2b..583e3b409 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/craftingmonitor/CraftingMonitorElementText.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/craftingmonitor/CraftingMonitorElementText.java @@ -32,7 +32,7 @@ public class CraftingMonitorElementText implements ICraftingMonitorElement { @Override @SideOnly(Side.CLIENT) public void draw(int x, int y, IElementDrawers drawers) { - float scale = 0.5f; + float scale = drawers.getFontRenderer().getUnicodeFlag() ? 1F : 0.5F; GlStateManager.pushMatrix(); GlStateManager.scale(scale, scale, 1); diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/preview/CraftingPreviewElementFluidStack.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/preview/CraftingPreviewElementFluidStack.java index ac2e75645..7005874c2 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/preview/CraftingPreviewElementFluidStack.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/preview/CraftingPreviewElementFluidStack.java @@ -69,7 +69,7 @@ public class CraftingPreviewElementFluidStack implements ICraftingPreviewElement y += 7; drawers.getFluidDrawer().draw(x, y, getElement()); - float scale = 0.5f; + float scale = drawers.getFontRenderer().getUnicodeFlag() ? 1F : 0.5F; GlStateManager.pushMatrix(); GlStateManager.scale(scale, scale, 1); diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/preview/CraftingPreviewElementItemStack.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/preview/CraftingPreviewElementItemStack.java index a100364d4..f39edb248 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/preview/CraftingPreviewElementItemStack.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/preview/CraftingPreviewElementItemStack.java @@ -68,11 +68,14 @@ public class CraftingPreviewElementItemStack implements ICraftingPreviewElement< if (missing) { drawers.getOverlayDrawer().draw(x, y, 0xFFF2DEDE); } + x += 5; y += 7; + drawers.getItemDrawer().draw(x, y, getElement()); - float scale = 0.5f; + float scale = drawers.getFontRenderer().getUnicodeFlag() ? 1F : 0.5F; + y += 2; GlStateManager.pushMatrix(); diff --git a/src/main/java/com/raoulvdberge/refinedstorage/gui/GuiBase.java b/src/main/java/com/raoulvdberge/refinedstorage/gui/GuiBase.java index 5802d837a..58244f098 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/gui/GuiBase.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/gui/GuiBase.java @@ -6,6 +6,7 @@ import com.raoulvdberge.refinedstorage.api.render.IElementDrawers; import com.raoulvdberge.refinedstorage.gui.sidebutton.SideButton; import com.raoulvdberge.refinedstorage.inventory.ItemHandlerFluid; import com.raoulvdberge.refinedstorage.util.RenderUtils; +import net.minecraft.client.gui.FontRenderer; import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.client.renderer.GlStateManager; @@ -49,6 +50,11 @@ public abstract class GuiBase extends GuiContainer { public IElementDrawer getStringDrawer() { return GuiBase.this::drawString; } + + @Override + public FontRenderer getFontRenderer() { + return fontRenderer; + } } private int lastButtonId; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/gui/GuiController.java b/src/main/java/com/raoulvdberge/refinedstorage/gui/GuiController.java index c2cf018d8..e4d7c8879 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/gui/GuiController.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/gui/GuiController.java @@ -74,7 +74,7 @@ public class GuiController extends GuiBase { drawItem(x, y + 5, node.getStack()); - float scale = 0.5f; + float scale = fontRenderer.getUnicodeFlag() ? 1F : 0.5F; GlStateManager.pushMatrix(); GlStateManager.scale(scale, scale, 1); diff --git a/src/main/java/com/raoulvdberge/refinedstorage/gui/GuiCraftingPreview.java b/src/main/java/com/raoulvdberge/refinedstorage/gui/GuiCraftingPreview.java index bb8585d32..129ce6e6f 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/gui/GuiCraftingPreview.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/gui/GuiCraftingPreview.java @@ -105,7 +105,8 @@ public class GuiCraftingPreview extends GuiBase { int x = 7; int y = 15; - float scale = 0.5f; + + float scale = fontRenderer.getUnicodeFlag() ? 1F : 0.5F; if (stacks.isEmpty()) { GlStateManager.pushMatrix(); diff --git a/src/main/java/com/raoulvdberge/refinedstorage/gui/GuiReaderWriter.java b/src/main/java/com/raoulvdberge/refinedstorage/gui/GuiReaderWriter.java index 47e322da6..b9658a675 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/gui/GuiReaderWriter.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/gui/GuiReaderWriter.java @@ -100,6 +100,8 @@ public class GuiReaderWriter extends GuiBase { int item = scrollbar != null ? scrollbar.getOffset() : 0; + float scale = fontRenderer.getUnicodeFlag() ? 1F : 0.5F; + for (int i = 0; i < VISIBLE_ROWS; ++i) { if (item < getChannels().size()) { if (item == itemSelected) { @@ -107,8 +109,6 @@ public class GuiReaderWriter extends GuiBase { itemSelectedY = y; } - float scale = 0.5f; - GlStateManager.pushMatrix(); GlStateManager.scale(scale, scale, 1);