tilera/Mekanism-tilera-Edition
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Oredictionificator GUI fixes

Browse source
This commit is contained in:
aidancbrady 2016-04-19 16:13:59 -04:00
parent 12c2c6099f
commit d6bce421f4
2 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/main/java/mekanism/client/gui/GuiOredictionificator.java
View file

@ -70,7 +70,7 @@ public class GuiOredictionificator extends GuiMekanism
public int getScroll() public int getScroll()
{ {
return Math.max(Math.min((int)(scroll*88), 88), 0); return Math.max(Math.min((int)(scroll*73), 73), 0);
} }
public int getFilterIndex() public int getFilterIndex()
@ -167,7 +167,7 @@ public class GuiOredictionificator extends GuiMekanism
if(tileEntity.filters.get(getFilterIndex()+i) != null) if(tileEntity.filters.get(getFilterIndex()+i) != null)
{ {
int yStart = i*22 + 18; int yStart = i*22 + 18;
boolean mouseOver = xAxis >= 10 && xAxis <= 152 && yAxis >= yStart && yAxis <= yStart+22; boolean mouseOver = xAxis > 10 && xAxis <= 152 && yAxis > yStart && yAxis <= yStart+22;
if(mouseOver) if(mouseOver)
{ {
@ -207,9 +207,9 @@ public class GuiOredictionificator extends GuiMekanism
{ {
if(tileEntity.filters.get(getFilterIndex()+i) != null) if(tileEntity.filters.get(getFilterIndex()+i) != null)
{ {
int yStart = i*29 + 18; int yStart = i*22 + 18;
if(xAxis >= 10 && xAxis <= 152 && yAxis >= yStart && yAxis <= yStart+22) if(xAxis > 10 && xAxis <= 152 && yAxis > yStart && yAxis <= yStart+22)
{ {
OredictionificatorFilter filter = tileEntity.filters.get(getFilterIndex()+i); OredictionificatorFilter filter = tileEntity.filters.get(getFilterIndex()+i);
@ -231,7 +231,7 @@ public class GuiOredictionificator extends GuiMekanism
if(isDragging) if(isDragging)
{ {
scroll = Math.min(Math.max((float)(yAxis-18-dragOffset)/88F, 0), 1); scroll = Math.min(Math.max((float)(yAxis-18-dragOffset)/73F, 0), 1);
} }
} }

3
src/main/java/mekanism/client/render/block/PlasticRenderingHandler.java
View file

@ -24,6 +24,7 @@ public class PlasticRenderingHandler implements ISimpleBlockRenderingHandler
public boolean renderWorldBlock(IBlockAccess world, int x, int y, int z, Block block, int modelId, RenderBlocks renderer) public boolean renderWorldBlock(IBlockAccess world, int x, int y, int z, Block block, int modelId, RenderBlocks renderer)
{ {
boolean flag = false; boolean flag = false;
if(block == MekanismBlocks.GlowPlasticBlock) if(block == MekanismBlocks.GlowPlasticBlock)
{ {
Tessellator tessellator = Tessellator.instance; Tessellator tessellator = Tessellator.instance;
@ -73,8 +74,10 @@ public class PlasticRenderingHandler implements ISimpleBlockRenderingHandler
return flag; return flag;
} }
flag = renderer.renderStandardBlock(block, x, y, z); flag = renderer.renderStandardBlock(block, x, y, z);
renderer.setRenderBoundsFromBlock(block); renderer.setRenderBoundsFromBlock(block);
return flag; return flag;
} }