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
src/main/java/appeng/client/gui/widgets/GuiProgressBar.java
+6 -6
View File
@@ -47,8 +47,8 @@ public class GuiProgressBar extends GuiButton implements ITooltip
{
super( posX, posY, width, "" );
this.source = source;
this.xPosition = posX;
this.yPosition = posY;
this.x = posX;
this.y = posY;
this.texture = new ResourceLocation( "appliedenergistics2", "textures/" + texture );
this.width = width;
this.height = height;
@@ -70,12 +70,12 @@ public class GuiProgressBar extends GuiButton implements ITooltip
if( this.layout == Direction.VERTICAL )
{
final int diff = this.height - ( max > 0 ? ( this.height * current ) / max : 0 );
this.drawTexturedModalRect( this.xPosition, this.yPosition + diff, this.fill_u, this.fill_v + diff, this.width, this.height - diff );
this.drawTexturedModalRect( this.x, this.y + diff, this.fill_u, this.fill_v + diff, this.width, this.height - diff );
}
else
{
final int diff = this.width - ( max > 0 ? ( this.width * current ) / max : 0 );
this.drawTexturedModalRect( this.xPosition, this.yPosition, this.fill_u + diff, this.fill_v, this.width - diff, this.height );
this.drawTexturedModalRect( this.x, this.y, this.fill_u + diff, this.fill_v, this.width - diff, this.height );
}
this.mouseDragged( par1Minecraft, par2, par3 );
@@ -101,13 +101,13 @@ public class GuiProgressBar extends GuiButton implements ITooltip
@Override
public int xPos()
{
return this.xPosition - 2;
return this.x - 2;
}
@Override
public int yPos()
{
return this.yPosition - 2;
return this.y - 2;
}
@Override
src/main/java/appeng/client/gui/widgets/GuiTabButton.java
+10 -10
View File
@@ -40,8 +40,8 @@ public class GuiTabButton extends GuiButton implements ITooltip
{
super( 0, 0, 16, "" );
this.xPosition = x;
this.yPosition = y;
this.x = x;
this.y = y;
this.width = 22;
this.height = 22;
this.myIcon = ico;
@@ -61,8 +61,8 @@ public class GuiTabButton extends GuiButton implements ITooltip
public GuiTabButton( final int x, final int y, final ItemStack ico, final String message, final RenderItem ir )
{
super( 0, 0, 16, "" );
this.xPosition = x;
this.yPosition = y;
this.x = x;
this.y = y;
this.width = 22;
this.height = 22;
this.myItem = ico;
@@ -77,20 +77,20 @@ public class GuiTabButton extends GuiButton implements ITooltip
{
GlStateManager.color( 1.0f, 1.0f, 1.0f, 1.0f );
minecraft.renderEngine.bindTexture( new ResourceLocation( "appliedenergistics2", "textures/guis/states.png" ) );
this.hovered = x >= this.xPosition && y >= this.yPosition && x < this.xPosition + this.width && y < this.yPosition + this.height;
this.hovered = x >= this.x && y >= this.y && x < this.x + this.width && y < this.y + this.height;
int uv_x = ( this.hideEdge > 0 ? 11 : 13 );
final int offsetX = this.hideEdge > 0 ? 1 : 0;
this.drawTexturedModalRect( this.xPosition, this.yPosition, uv_x * 16, 0, 25, 22 );
this.drawTexturedModalRect( this.x, this.y, uv_x * 16, 0, 25, 22 );
if( this.myIcon >= 0 )
{
final int uv_y = (int) Math.floor( this.myIcon / 16 );
uv_x = this.myIcon - uv_y * 16;
this.drawTexturedModalRect( offsetX + this.xPosition + 3, this.yPosition + 3, uv_x * 16, uv_y * 16, 16, 16 );
this.drawTexturedModalRect( offsetX + this.x + 3, this.y + 3, uv_x * 16, uv_y * 16, 16, 16 );
}
this.mouseDragged( minecraft, x, y );
@@ -102,7 +102,7 @@ public class GuiTabButton extends GuiButton implements ITooltip
GlStateManager.enableDepth();
RenderHelper.enableGUIStandardItemLighting();
this.itemRenderer.renderItemAndEffectIntoGUI( this.myItem, offsetX + this.xPosition + 3, this.yPosition + 3 );
this.itemRenderer.renderItemAndEffectIntoGUI( this.myItem, offsetX + this.x + 3, this.y + 3 );
GlStateManager.disableDepth();
this.itemRenderer.zLevel = 0.0F;
@@ -120,13 +120,13 @@ public class GuiTabButton 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
src/main/java/appeng/client/gui/widgets/GuiToggleButton.java
+7 -7
View File
@@ -46,8 +46,8 @@ public class GuiToggleButton extends GuiButton implements ITooltip
this.iconIdxOff = off;
this.displayName = displayName;
this.displayHint = displayHint;
this.xPosition = x;
this.yPosition = y;
this.x = x;
this.y = y;
this.width = 16;
this.height = 16;
}
@@ -66,13 +66,13 @@ public class GuiToggleButton extends GuiButton implements ITooltip
GlStateManager.color( 1.0f, 1.0f, 1.0f, 1.0f );
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 );
}
}
@@ -120,13 +120,13 @@ public class GuiToggleButton 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