From 5b47b3f0cac8fe370487c5a294c35ab5f7eda347 Mon Sep 17 00:00:00 2001 From: Raoul Van den Berge Date: Thu, 26 May 2016 22:18:40 +0200 Subject: [PATCH] Move into method --- .../java/refinedstorage/RefinedStorageUtils.java | 6 ++++++ .../java/refinedstorage/gui/GuiController.java | 15 ++++++--------- src/main/java/refinedstorage/gui/GuiCrafter.java | 14 +++++--------- .../refinedstorage/gui/GuiCraftingMonitor.java | 13 +++++-------- 4 files changed, 22 insertions(+), 26 deletions(-) diff --git a/src/main/java/refinedstorage/RefinedStorageUtils.java b/src/main/java/refinedstorage/RefinedStorageUtils.java index 6a2624e8a..3d6007e03 100755 --- a/src/main/java/refinedstorage/RefinedStorageUtils.java +++ b/src/main/java/refinedstorage/RefinedStorageUtils.java @@ -239,4 +239,10 @@ public class RefinedStorageUtils { return handler; } + + public static int calculateOffsetOnScale(int pos, float scale) { + float multiplier = (pos / scale); + + return (int) multiplier; + } } diff --git a/src/main/java/refinedstorage/gui/GuiController.java b/src/main/java/refinedstorage/gui/GuiController.java index e366a28f7..94ba67f3f 100755 --- a/src/main/java/refinedstorage/gui/GuiController.java +++ b/src/main/java/refinedstorage/gui/GuiController.java @@ -2,6 +2,7 @@ package refinedstorage.gui; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.RenderHelper; +import refinedstorage.RefinedStorageUtils; import refinedstorage.container.ContainerController; import refinedstorage.gui.sidebutton.SideButtonRedstoneMode; import refinedstorage.tile.controller.ClientSideMachine; @@ -58,11 +59,6 @@ public class GuiController extends GuiBase { scrollbar.draw(this); } - private int calculateOffsetOnScale(int pos, float scale) { - float multiplier = (pos / scale); - return (int) multiplier; - } - @Override public void drawForeground(int mouseX, int mouseY) { drawString(7, 7, t("gui.refinedstorage:controller." + controller.getType().getId())); @@ -85,12 +81,13 @@ public class GuiController extends GuiBase { drawItem(x, y + 5, machine.stack); - GlStateManager.pushMatrix(); - float scale = 0.5f; + + GlStateManager.pushMatrix(); GlStateManager.scale(scale, scale, 1); - drawString(calculateOffsetOnScale(x + 1, scale), calculateOffsetOnScale(y - 2, scale), machine.stack.getDisplayName()); - drawString(calculateOffsetOnScale(x + 21, scale), calculateOffsetOnScale(y + 10, scale), t("gui.refinedstorage:controller.machine_amount", machine.amount)); + + drawString(RefinedStorageUtils.calculateOffsetOnScale(x + 1, scale), RefinedStorageUtils.calculateOffsetOnScale(y - 2, scale), machine.stack.getDisplayName()); + drawString(RefinedStorageUtils.calculateOffsetOnScale(x + 21, scale), RefinedStorageUtils.calculateOffsetOnScale(y + 10, scale), t("gui.refinedstorage:controller.machine_amount", machine.amount)); GlStateManager.popMatrix(); diff --git a/src/main/java/refinedstorage/gui/GuiCrafter.java b/src/main/java/refinedstorage/gui/GuiCrafter.java index 2fe07fdb5..a40db641b 100755 --- a/src/main/java/refinedstorage/gui/GuiCrafter.java +++ b/src/main/java/refinedstorage/gui/GuiCrafter.java @@ -3,6 +3,7 @@ package refinedstorage.gui; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.RenderHelper; import net.minecraft.item.ItemStack; +import refinedstorage.RefinedStorageUtils; import refinedstorage.container.ContainerCrafter; import refinedstorage.gui.sidebutton.SideButtonRedstoneMode; import refinedstorage.item.ItemPattern; @@ -33,11 +34,6 @@ public class GuiCrafter extends GuiBase { drawTexture(x, y, 0, 0, width, height); } - private int calculateOffsetOnScale(int pos, float scale) { - float multiplier = (pos / scale); - return (int) multiplier; - } - @Override public void drawForeground(int mouseX, int mouseY) { drawString(7, 7, t("gui.refinedstorage:crafter")); @@ -62,12 +58,12 @@ public class GuiCrafter extends GuiBase { text = result.getDisplayName(); } - GlStateManager.pushMatrix(); - float scale = 0.5f; - GlStateManager.scale(scale, scale, 1); - drawString(calculateOffsetOnScale(x + (ItemPattern.isProcessing(pattern) ? 1 : 20), scale), calculateOffsetOnScale(y + 6, scale), text); + GlStateManager.pushMatrix(); + GlStateManager.scale(scale, scale, 1); + + drawString(RefinedStorageUtils.calculateOffsetOnScale(x + (ItemPattern.isProcessing(pattern) ? 1 : 20), scale), RefinedStorageUtils.calculateOffsetOnScale(y + 6, scale), text); GlStateManager.popMatrix(); } } diff --git a/src/main/java/refinedstorage/gui/GuiCraftingMonitor.java b/src/main/java/refinedstorage/gui/GuiCraftingMonitor.java index b52c0d1ce..daeb7fecb 100755 --- a/src/main/java/refinedstorage/gui/GuiCraftingMonitor.java +++ b/src/main/java/refinedstorage/gui/GuiCraftingMonitor.java @@ -4,6 +4,7 @@ import net.minecraft.client.gui.GuiButton; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.RenderHelper; import refinedstorage.RefinedStorage; +import refinedstorage.RefinedStorageUtils; import refinedstorage.container.ContainerCraftingMonitor; import refinedstorage.gui.sidebutton.SideButtonRedstoneMode; import refinedstorage.network.MessageCraftingMonitorCancel; @@ -85,11 +86,6 @@ public class GuiCraftingMonitor extends GuiBase { scrollbar.draw(this); } - private int calculateOffsetOnScale(int pos, float scale) { - float multiplier = (pos / scale); - return (int) multiplier; - } - @Override public void drawForeground(int mouseX, int mouseY) { drawString(7, 7, t("gui.refinedstorage:crafting_monitor")); @@ -118,11 +114,12 @@ public class GuiCraftingMonitor extends GuiBase { drawItem(x + 4, y + 11, task.output); - GlStateManager.pushMatrix(); - float scale = 0.5f; + + GlStateManager.pushMatrix(); GlStateManager.scale(scale, scale, 1); - drawString(calculateOffsetOnScale(x + 5, scale), calculateOffsetOnScale(y + 4, scale), task.output.getDisplayName()); + + drawString(RefinedStorageUtils.calculateOffsetOnScale(x + 5, scale), RefinedStorageUtils.calculateOffsetOnScale(y + 4, scale), task.output.getDisplayName()); GlStateManager.popMatrix();