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

Merge pull request #5 from tomevoll/mc1.9

Browse Source 
Smaller text in controller (machine list) removed tooltip
This commit is contained in:
Raoul
2016-03-25 22:17:28 +01:00
parent 28812b2391 3ae02290c5
commit 25b302f914
1 changed files with 21 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2,6 +2,7 @@ package refinedstorage.gui;
import net.minecraft.block.Block; import net.minecraft.block.Block;
import net.minecraft.block.state.IBlockState; import net.minecraft.block.state.IBlockState;
import net.minecraft.client.renderer.GlStateManager;
import net.minecraft.client.renderer.RenderHelper; import net.minecraft.client.renderer.RenderHelper;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import refinedstorage.container.ContainerController; import refinedstorage.container.ContainerController;
@@ -48,6 +49,13 @@ public class GuiController extends GuiBase {
scrollbar.draw(this); scrollbar.draw(this);
} }
private int calculateOffsetOnScale(int pos ,float scale)
{
float multiplier = (pos / scale);
return (int)multiplier;
}
@Override @Override
public void drawForeground(int mouseX, int mouseY) { public void drawForeground(int mouseX, int mouseY) {
scrollbar.update(this, mouseX, mouseY); scrollbar.update(this, mouseX, mouseY);
@@ -76,8 +84,14 @@ public class GuiController extends GuiBase {
hoveringMachineStack = machineStack; hoveringMachineStack = machineStack;
} }
drawItem(x, y, machineStack); drawItem(x, y+5, machineStack);
drawString(x + 21, y + 5, t("misc.refinedstorage:energy_usage_minimal", machine.getEnergyUsage())); GlStateManager.pushMatrix();
float scale = 0.5f;
GlStateManager.scale(scale,scale,1);
drawString(calculateOffsetOnScale(x+1,scale) , calculateOffsetOnScale(y-3,scale), machineStack.getDisplayName());
drawString(calculateOffsetOnScale(x+21,scale), calculateOffsetOnScale(y+10,scale),t("misc.refinedstorage:energy_usage_minimal", machine.getEnergyUsage()));
GlStateManager.popMatrix();
} }
if (i == 1) { if (i == 1) {
@@ -90,10 +104,13 @@ public class GuiController extends GuiBase {
slot++; slot++;
} }
if (hoveringMachineStack != null) { /* Not needed?
if (hoveringMachineStack != null) {
drawTooltip(mouseX, mouseY, hoveringMachineStack); drawTooltip(mouseX, mouseY, hoveringMachineStack);
} }
*/
if (inBounds(barX, barY, barWidth, barHeight, mouseX, mouseY)) { if (inBounds(barX, barY, barWidth, barHeight, mouseX, mouseY)) {
drawTooltip(mouseX, mouseY, t("misc.refinedstorage:energy_usage", controller.getEnergyUsage()) + "\n" + t("misc.refinedstorage:energy_stored", controller.getEnergyStored(null), controller.getMaxEnergyStored(null))); drawTooltip(mouseX, mouseY, t("misc.refinedstorage:energy_usage", controller.getEnergyUsage()) + "\n" + t("misc.refinedstorage:energy_stored", controller.getEnergyStored(null), controller.getMaxEnergyStored(null)));
} }