fujin/Applied-Energistics-2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update MCP Mappings to stable_32

Browse Source 
Some mapping updates are just straight up weird. 20170516 -> isBlockSolid, 20170517 -> causesDownwardCurrent
This commit is contained in:
Gunther De Wachter
2017-07-03 06:54:45 +02:00
parent 780ce89ac3
commit 890eef1803
67 changed files with 213 additions and 216 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/appeng/client/gui/widgets/GuiImgButton.java
+9 -9
View File
@@ -68,8 +68,8 @@ public class GuiImgButton extends GuiButton implements ITooltip
this.buttonSetting = idx;
this.currentValue = val;
this.xPosition = x;
this.yPosition = y;
this.x = x;
this.y = y;
this.width = 16;
this.height = 16;
@@ -193,7 +193,7 @@ public class GuiImgButton extends GuiButton implements ITooltip
this.height = 8;
GlStateManager.pushMatrix();
GlStateManager.translate( this.xPosition, this.yPosition, 0.0F );
GlStateManager.translate( this.x, this.y, 0.0F );
GlStateManager.scale( 0.5f, 0.5f, 0.5f );
if( this.enabled )
@@ -206,7 +206,7 @@ public class GuiImgButton extends GuiButton implements ITooltip
}
par1Minecraft.renderEngine.bindTexture( new ResourceLocation( "appliedenergistics2", "textures/guis/states.png" ) );
this.hovered = par2 >= this.xPosition && par3 >= this.yPosition && par2 < this.xPosition + this.width && par3 < this.yPosition + this.height;
this.hovered = par2 >= this.x && par3 >= this.y && par2 < this.x + this.width && par3 < this.y + this.height;
final int uv_y = (int) Math.floor( iconIndex / 16 );
final int uv_x = iconIndex - uv_y * 16;
@@ -229,13 +229,13 @@ public class GuiImgButton extends GuiButton implements ITooltip
}
par1Minecraft.renderEngine.bindTexture( new ResourceLocation( "appliedenergistics2", "textures/guis/states.png" ) );
this.hovered = par2 >= this.xPosition && par3 >= this.yPosition && par2 < this.xPosition + this.width && par3 < this.yPosition + this.height;
this.hovered = par2 >= this.x && par3 >= this.y && par2 < this.x + this.width && par3 < this.y + this.height;
final int uv_y = (int) Math.floor( iconIndex / 16 );
final int uv_x = iconIndex - uv_y * 16;
this.drawTexturedModalRect( this.xPosition, this.yPosition, 256 - 16, 256 - 16, 16, 16 );
this.drawTexturedModalRect( this.xPosition, this.yPosition, uv_x * 16, uv_y * 16, 16, 16 );
this.drawTexturedModalRect( this.x, this.y, 256 - 16, 256 - 16, 16, 16 );
this.drawTexturedModalRect( this.x, this.y, uv_x * 16, uv_y * 16, 16, 16 );
this.mouseDragged( par1Minecraft, par2, par3 );
}
}
@@ -324,13 +324,13 @@ public class GuiImgButton extends GuiButton implements ITooltip
@Override
public int xPos()
{
return this.xPosition;
return this.x;
}
@Override
public int yPos()
{
return this.yPosition;
return this.y;
}
@Override