dave/refinedstorage
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move into method

Browse Source
This commit is contained in:
Raoul Van den Berge
2016-05-26 22:18:40 +02:00
parent 782813de90
commit 5b47b3f0ca
4 changed files with 22 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/refinedstorage/RefinedStorageUtils.java
View File

@@ -239,4 +239,10 @@ public class RefinedStorageUtils {
return handler;
}
public static int calculateOffsetOnScale(int pos, float scale) {
float multiplier = (pos / scale);
return (int) multiplier;
}
}

15
src/main/java/refinedstorage/gui/GuiController.java
View File

@@ -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();

14
src/main/java/refinedstorage/gui/GuiCrafter.java
View File

@@ -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();
}
}

13
src/main/java/refinedstorage/gui/GuiCraftingMonitor.java
View File

@@ -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();