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/block/AEBaseBlock.java
+7 -7
View File
@@ -123,7 +123,7 @@ public abstract class AEBaseBlock extends Block
for( final AxisAlignedBB b : tmp )
{
final AxisAlignedBB offset = b.offset( pos.getX(), pos.getY(), pos.getZ() );
if( bb.intersectsWith( offset ) )
if( bb.intersects( offset ) )
{
out.add( offset );
}
@@ -163,9 +163,9 @@ public abstract class AEBaseBlock extends Block
if( r != null )
{
final double xLen = ( ld.getA().xCoord - r.hitVec.xCoord );
final double yLen = ( ld.getA().yCoord - r.hitVec.yCoord );
final double zLen = ( ld.getA().zCoord - r.hitVec.zCoord );
final double xLen = ( ld.getA().x - r.hitVec.x );
final double yLen = ( ld.getA().y - r.hitVec.y );
final double zLen = ( ld.getA().z - r.hitVec.z );
final double thisDist = xLen * xLen + yLen * yLen + zLen * zLen;
@@ -249,9 +249,9 @@ public abstract class AEBaseBlock extends Block
if( r != null )
{
final double xLen = ( a.xCoord - r.hitVec.xCoord );
final double yLen = ( a.yCoord - r.hitVec.yCoord );
final double zLen = ( a.zCoord - r.hitVec.zCoord );
final double xLen = ( a.x - r.hitVec.x );
final double yLen = ( a.y - r.hitVec.y );
final double zLen = ( a.z - r.hitVec.z );
final double thisDist = xLen * xLen + yLen * yLen + zLen * zLen;
if( br == null || lastDist > thisDist )
src/main/java/appeng/block/networking/BlockCableBus.java
+3 -3
View File
@@ -270,9 +270,9 @@ public class BlockCableBus extends AEBaseTileBlock
TextureAtlasSprite texture = Platform.pickRandom( cableBusModel.getParticleTextures( renderState ) );
if( texture != null )
{
double x = target.hitVec.xCoord;
double y = target.hitVec.yCoord;
double z = target.hitVec.zCoord;
double x = target.hitVec.x;
double y = target.hitVec.y;
double z = target.hitVec.z;
Particle fx = new DestroyFX( world, x, y, z, 0.0D, 0.0D, 0.0D, state ).setBlockPos( target.getBlockPos() ).multipleParticleScaleBy( 0.8F );
fx.setParticleTexture( texture );
src/main/java/appeng/client/ClientHelper.java
+1 -1
View File
@@ -321,7 +321,7 @@ public class ClientHelper extends ServerHelper
private void spawnLightningArc( final World world, final double posX, final double posY, final double posZ, final Vec3d second )
{
final LightningFX fx = new LightningArcFX( world, posX, posY, posZ, second.xCoord, second.yCoord, second.zCoord, 0.0f, 0.0f, 0.0f );
final LightningFX fx = new LightningArcFX( world, posX, posY, posZ, second.x, second.y, second.z, 0.0f, 0.0f, 0.0f );
Minecraft.getMinecraft().effectRenderer.addEffect( fx );
}
src/main/java/appeng/client/gui/AEBaseGui.java
+4 -4
View File
@@ -170,8 +170,8 @@ public abstract class AEBaseGui extends GuiContainer
if( c instanceof ITooltip )
{
final ITooltip tooltip = (ITooltip) c;
final int x = tooltip.xPos(); // ((GuiImgButton) c).xPosition;
int y = tooltip.yPos(); // ((GuiImgButton) c).yPosition;
final int x = tooltip.xPos(); // ((GuiImgButton) c).x;
int y = tooltip.yPos(); // ((GuiImgButton) c).y;
if( x < mouseX && x + tooltip.getWidth() > mouseX && tooltip.isVisible() )
{
@@ -218,7 +218,7 @@ public abstract class AEBaseGui extends GuiContainer
lines.set( i, TextFormatting.GRAY + lines.get( i ) );
}
this.drawHoveringText( lines, x, y, fontRendererObj );
this.drawHoveringText( lines, x, y, fontRenderer );
}
@Override
@@ -728,7 +728,7 @@ public abstract class AEBaseGui extends GuiContainer
// Annoying but easier than trying to splice into render item
super.drawSlot( new Size1Slot( s ) );
stackSizeRenderer.renderStackSize( fontRendererObj, ( (SlotME) s ).getAEStack(), s.getStack(), s.xPos, s.yPos );
stackSizeRenderer.renderStackSize( fontRenderer, ( (SlotME) s ).getAEStack(), s.getStack(), s.xPos, s.yPos );
}
catch( final Exception err )
src/main/java/appeng/client/gui/implementations/GuiChest.java
+2 -2
View File
@@ -67,8 +67,8 @@ public class GuiChest extends AEBaseGui
@Override
public void drawFG( final int offsetX, final int offsetY, final int mouseX, final int mouseY )
{
this.fontRendererObj.drawString( this.getGuiDisplayName( GuiText.Chest.getLocal() ), 8, 6, 4210752 );
this.fontRendererObj.drawString( GuiText.inventory.getLocal(), 8, this.ySize - 96 + 3, 4210752 );
this.fontRenderer.drawString( this.getGuiDisplayName( GuiText.Chest.getLocal() ), 8, 6, 4210752 );
this.fontRenderer.drawString( GuiText.inventory.getLocal(), 8, this.ySize - 96 + 3, 4210752 );
}
@Override
src/main/java/appeng/client/gui/implementations/GuiCondenser.java
+2 -2
View File
@@ -81,8 +81,8 @@ public class GuiCondenser extends AEBaseGui
@Override
public void drawFG( final int offsetX, final int offsetY, final int mouseX, final int mouseY )
{
this.fontRendererObj.drawString( this.getGuiDisplayName( GuiText.Condenser.getLocal() ), 8, 6, 4210752 );
this.fontRendererObj.drawString( GuiText.inventory.getLocal(), 8, this.ySize - 96 + 3, 4210752 );
this.fontRenderer.drawString( this.getGuiDisplayName( GuiText.Condenser.getLocal() ), 8, 6, 4210752 );
this.fontRenderer.drawString( GuiText.inventory.getLocal(), 8, this.ySize - 96 + 3, 4210752 );
this.mode.set( this.cvc.getOutput() );
this.mode.setFillVar( String.valueOf( this.cvc.getOutput().requiredPower ) );
src/main/java/appeng/client/gui/implementations/GuiCraftAmount.java
+2 -2
View File
@@ -128,7 +128,7 @@ public class GuiCraftAmount extends AEBaseGui
this.buttonList.add( this.originalGuiBtn = new GuiTabButton( this.guiLeft + 154, this.guiTop, myIcon, myIcon.getDisplayName(), this.itemRender ) );
}
this.amountToCraft = new GuiNumberBox( this.fontRendererObj, this.guiLeft + 62, this.guiTop + 57, 59, this.fontRendererObj.FONT_HEIGHT, Integer.class );
this.amountToCraft = new GuiNumberBox( this.fontRenderer, this.guiLeft + 62, this.guiTop + 57, 59, this.fontRenderer.FONT_HEIGHT, Integer.class );
this.amountToCraft.setEnableBackgroundDrawing( false );
this.amountToCraft.setMaxStringLength( 16 );
this.amountToCraft.setTextColor( 0xFFFFFF );
@@ -140,7 +140,7 @@ public class GuiCraftAmount extends AEBaseGui
@Override
public void drawFG( final int offsetX, final int offsetY, final int mouseX, final int mouseY )
{
this.fontRendererObj.drawString( GuiText.SelectAmount.getLocal(), 8, 6, 4210752 );
this.fontRenderer.drawString( GuiText.SelectAmount.getLocal(), 8, 6, 4210752 );
}
@Override
src/main/java/appeng/client/gui/implementations/GuiCraftConfirm.java
+9 -9
View File
@@ -209,7 +209,7 @@ public class GuiCraftConfirm extends AEBaseGui
final long BytesUsed = this.ccc.getUsedBytes();
final String byteUsed = NumberFormat.getInstance().format( BytesUsed );
final String Add = BytesUsed > 0 ? ( byteUsed + ' ' + GuiText.BytesUsed.getLocal() ) : GuiText.CalculatingWait.getLocal();
this.fontRendererObj.drawString( GuiText.CraftingPlan.getLocal() + " - " + Add, 8, 7, 4210752 );
this.fontRenderer.drawString( GuiText.CraftingPlan.getLocal() + " - " + Add, 8, 7, 4210752 );
String dsp = null;
@@ -222,8 +222,8 @@ public class GuiCraftConfirm extends AEBaseGui
dsp = this.ccc.getCpuAvailableBytes() > 0 ? ( GuiText.Bytes.getLocal() + ": " + this.ccc.getCpuAvailableBytes() + " : " + GuiText.CoProcessors.getLocal() + ": " + this.ccc.getCpuCoProcessors() ) : GuiText.Bytes.getLocal() + ": N/A : " + GuiText.CoProcessors.getLocal() + ": N/A";
}
final int offset = ( 219 - this.fontRendererObj.getStringWidth( dsp ) ) / 2;
this.fontRendererObj.drawString( dsp, offset, 165, 4210752 );
final int offset = ( 219 - this.fontRenderer.getStringWidth( dsp ) ) / 2;
this.fontRenderer.drawString( dsp, offset, 165, 4210752 );
final int sectionLength = 67;
@@ -284,8 +284,8 @@ public class GuiCraftConfirm extends AEBaseGui
}
str = GuiText.FromStorage.getLocal() + ": " + str;
final int w = 4 + this.fontRendererObj.getStringWidth( str );
this.fontRendererObj.drawString( str, (int) ( ( x * ( 1 + sectionLength ) + xo + sectionLength - 19 - ( w * 0.5 ) ) * 2 ), ( y * offY + yo + 6 - negY + downY ) * 2, 4210752 );
final int w = 4 + this.fontRenderer.getStringWidth( str );
this.fontRenderer.drawString( str, (int) ( ( x * ( 1 + sectionLength ) + xo + sectionLength - 19 - ( w * 0.5 ) ) * 2 ), ( y * offY + yo + 6 - negY + downY ) * 2, 4210752 );
if( this.tooltip == z - viewStart )
{
@@ -309,8 +309,8 @@ public class GuiCraftConfirm extends AEBaseGui
}
str = GuiText.Missing.getLocal() + ": " + str;
final int w = 4 + this.fontRendererObj.getStringWidth( str );
this.fontRendererObj.drawString( str, (int) ( ( x * ( 1 + sectionLength ) + xo + sectionLength - 19 - ( w * 0.5 ) ) * 2 ), ( y * offY + yo + 6 - negY + downY ) * 2, 4210752 );
final int w = 4 + this.fontRenderer.getStringWidth( str );
this.fontRenderer.drawString( str, (int) ( ( x * ( 1 + sectionLength ) + xo + sectionLength - 19 - ( w * 0.5 ) ) * 2 ), ( y * offY + yo + 6 - negY + downY ) * 2, 4210752 );
if( this.tooltip == z - viewStart )
{
@@ -334,8 +334,8 @@ public class GuiCraftConfirm extends AEBaseGui
}
str = GuiText.ToCraft.getLocal() + ": " + str;
final int w = 4 + this.fontRendererObj.getStringWidth( str );
this.fontRendererObj.drawString( str, (int) ( ( x * ( 1 + sectionLength ) + xo + sectionLength - 19 - ( w * 0.5 ) ) * 2 ), ( y * offY + yo + 6 - negY + downY ) * 2, 4210752 );
final int w = 4 + this.fontRenderer.getStringWidth( str );
this.fontRenderer.drawString( str, (int) ( ( x * ( 1 + sectionLength ) + xo + sectionLength - 19 - ( w * 0.5 ) ) * 2 ), ( y * offY + yo + 6 - negY + downY ) * 2, 4210752 );
if( this.tooltip == z - viewStart )
{
src/main/java/appeng/client/gui/implementations/GuiCraftingCPU.java
+7 -7
View File
@@ -202,7 +202,7 @@ public class GuiCraftingCPU extends AEBaseGui implements ISortSource
title += " - " + etaTimeText;
}
this.fontRendererObj.drawString( title, TITLE_LEFT_OFFSET, TITLE_TOP_OFFSET, TEXT_COLOR );
this.fontRenderer.drawString( title, TITLE_LEFT_OFFSET, TITLE_TOP_OFFSET, TEXT_COLOR );
int x = 0;
int y = 0;
@@ -262,8 +262,8 @@ public class GuiCraftingCPU extends AEBaseGui implements ISortSource
if( stored != null && stored.getStackSize() > 0 )
{
final String str = GuiText.Stored.getLocal() + ": " + converter.toWideReadableForm( stored.getStackSize() );
final int w = 4 + this.fontRendererObj.getStringWidth( str );
this.fontRendererObj.drawString( str, (int) ( ( x * ( 1 + SECTION_LENGTH ) + ITEMSTACK_LEFT_OFFSET + SECTION_LENGTH - 19 - ( w * 0.5 ) ) * 2 ), ( y * offY + ITEMSTACK_TOP_OFFSET + 6 - negY + downY ) * 2, TEXT_COLOR );
final int w = 4 + this.fontRenderer.getStringWidth( str );
this.fontRenderer.drawString( str, (int) ( ( x * ( 1 + SECTION_LENGTH ) + ITEMSTACK_LEFT_OFFSET + SECTION_LENGTH - 19 - ( w * 0.5 ) ) * 2 ), ( y * offY + ITEMSTACK_TOP_OFFSET + 6 - negY + downY ) * 2, TEXT_COLOR );
if( this.tooltip == z - viewStart )
{
@@ -276,9 +276,9 @@ public class GuiCraftingCPU extends AEBaseGui implements ISortSource
if( activeStack != null && activeStack.getStackSize() > 0 )
{
final String str = GuiText.Crafting.getLocal() + ": " + converter.toWideReadableForm( activeStack.getStackSize() );
final int w = 4 + this.fontRendererObj.getStringWidth( str );
final int w = 4 + this.fontRenderer.getStringWidth( str );
this.fontRendererObj.drawString( str, (int) ( ( x * ( 1 + SECTION_LENGTH ) + ITEMSTACK_LEFT_OFFSET + SECTION_LENGTH - 19 - ( w * 0.5 ) ) * 2 ), ( y * offY + ITEMSTACK_TOP_OFFSET + 6 - negY + downY ) * 2, TEXT_COLOR );
this.fontRenderer.drawString( str, (int) ( ( x * ( 1 + SECTION_LENGTH ) + ITEMSTACK_LEFT_OFFSET + SECTION_LENGTH - 19 - ( w * 0.5 ) ) * 2 ), ( y * offY + ITEMSTACK_TOP_OFFSET + 6 - negY + downY ) * 2, TEXT_COLOR );
if( this.tooltip == z - viewStart )
{
@@ -291,9 +291,9 @@ public class GuiCraftingCPU extends AEBaseGui implements ISortSource
if( pendingStack != null && pendingStack.getStackSize() > 0 )
{
final String str = GuiText.Scheduled.getLocal() + ": " + converter.toWideReadableForm( pendingStack.getStackSize() );
final int w = 4 + this.fontRendererObj.getStringWidth( str );
final int w = 4 + this.fontRenderer.getStringWidth( str );
this.fontRendererObj.drawString( str, (int) ( ( x * ( 1 + SECTION_LENGTH ) + ITEMSTACK_LEFT_OFFSET + SECTION_LENGTH - 19 - ( w * 0.5 ) ) * 2 ), ( y * offY + ITEMSTACK_TOP_OFFSET + 6 - negY + downY ) * 2, TEXT_COLOR );
this.fontRenderer.drawString( str, (int) ( ( x * ( 1 + SECTION_LENGTH ) + ITEMSTACK_LEFT_OFFSET + SECTION_LENGTH - 19 - ( w * 0.5 ) ) * 2 ), ( y * offY + ITEMSTACK_TOP_OFFSET + 6 - negY + downY ) * 2, TEXT_COLOR );
if( this.tooltip == z - viewStart )
{
src/main/java/appeng/client/gui/implementations/GuiCraftingTerm.java
+1 -1
View File
@@ -84,7 +84,7 @@ public class GuiCraftingTerm extends GuiMEMonitorable
public void drawFG( final int offsetX, final int offsetY, final int mouseX, final int mouseY )
{
super.drawFG( offsetX, offsetY, mouseX, mouseY );
this.fontRendererObj.drawString( GuiText.CraftingTerminal.getLocal(), 8, this.ySize - 96 + 1 - this.getReservedSpace(), 4210752 );
this.fontRenderer.drawString( GuiText.CraftingTerminal.getLocal(), 8, this.ySize - 96 + 1 - this.getReservedSpace(), 4210752 );
}
@Override
src/main/java/appeng/client/gui/implementations/GuiDrive.java
+2 -2
View File
@@ -67,8 +67,8 @@ public class GuiDrive extends AEBaseGui
@Override
public void drawFG( final int offsetX, final int offsetY, final int mouseX, final int mouseY )
{
this.fontRendererObj.drawString( this.getGuiDisplayName( GuiText.Drive.getLocal() ), 8, 6, 4210752 );
this.fontRendererObj.drawString( GuiText.inventory.getLocal(), 8, this.ySize - 96 + 3, 4210752 );
this.fontRenderer.drawString( this.getGuiDisplayName( GuiText.Drive.getLocal() ), 8, 6, 4210752 );
this.fontRenderer.drawString( GuiText.inventory.getLocal(), 8, this.ySize - 96 + 3, 4210752 );
}
@Override
src/main/java/appeng/client/gui/implementations/GuiFormationPlane.java
+2 -2
View File
@@ -67,8 +67,8 @@ public class GuiFormationPlane extends GuiUpgradeable
@Override
public void drawFG( final int offsetX, final int offsetY, final int mouseX, final int mouseY )
{
this.fontRendererObj.drawString( this.getGuiDisplayName( GuiText.FormationPlane.getLocal() ), 8, 6, 4210752 );
this.fontRendererObj.drawString( GuiText.inventory.getLocal(), 8, this.ySize - 96 + 3, 4210752 );
this.fontRenderer.drawString( this.getGuiDisplayName( GuiText.FormationPlane.getLocal() ), 8, 6, 4210752 );
this.fontRenderer.drawString( GuiText.inventory.getLocal(), 8, this.ySize - 96 + 3, 4210752 );
if( this.fuzzyMode != null )
{
src/main/java/appeng/client/gui/implementations/GuiGrinder.java
+2 -2
View File
@@ -39,8 +39,8 @@ public class GuiGrinder extends AEBaseGui
@Override
public void drawFG( final int offsetX, final int offsetY, final int mouseX, final int mouseY )
{
this.fontRendererObj.drawString( this.getGuiDisplayName( GuiText.GrindStone.getLocal() ), 8, 6, 4210752 );
this.fontRendererObj.drawString( GuiText.inventory.getLocal(), 8, this.ySize - 96 + 3, 4210752 );
this.fontRenderer.drawString( this.getGuiDisplayName( GuiText.GrindStone.getLocal() ), 8, 6, 4210752 );
this.fontRenderer.drawString( GuiText.inventory.getLocal(), 8, this.ySize - 96 + 3, 4210752 );
}
@Override
src/main/java/appeng/client/gui/implementations/GuiIOPort.java
+2 -2
View File
@@ -67,8 +67,8 @@ public class GuiIOPort extends GuiUpgradeable
@Override
public void drawFG( final int offsetX, final int offsetY, final int mouseX, final int mouseY )
{
this.fontRendererObj.drawString( this.getGuiDisplayName( GuiText.IOPort.getLocal() ), 8, 6, 4210752 );
this.fontRendererObj.drawString( GuiText.inventory.getLocal(), 8, this.ySize - 96 + 3, 4210752 );
this.fontRenderer.drawString( this.getGuiDisplayName( GuiText.IOPort.getLocal() ), 8, 6, 4210752 );
this.fontRenderer.drawString( GuiText.inventory.getLocal(), 8, this.ySize - 96 + 3, 4210752 );
if( this.redstoneMode != null )
{
src/main/java/appeng/client/gui/implementations/GuiInscriber.java
+4 -4
View File
@@ -63,16 +63,16 @@ public class GuiInscriber extends AEBaseGui
{
this.pb.setFullMsg( this.cvc.getCurrentProgress() * 100 / this.cvc.getMaxProgress() + "%" );
this.fontRendererObj.drawString( this.getGuiDisplayName( GuiText.Inscriber.getLocal() ), 8, 6, 4210752 );
this.fontRendererObj.drawString( GuiText.inventory.getLocal(), 8, this.ySize - 96 + 3, 4210752 );
this.fontRenderer.drawString( this.getGuiDisplayName( GuiText.Inscriber.getLocal() ), 8, 6, 4210752 );
this.fontRenderer.drawString( GuiText.inventory.getLocal(), 8, this.ySize - 96 + 3, 4210752 );
}
@Override
public void drawBG( final int offsetX, final int offsetY, final int mouseX, final int mouseY )
{
this.bindTexture( "guis/inscriber.png" );
this.pb.xPosition = 135 + this.guiLeft;
this.pb.yPosition = 39 + this.guiTop;
this.pb.x = 135 + this.guiLeft;
this.pb.y = 39 + this.guiTop;
this.drawTexturedModalRect( offsetX, offsetY, 0, 0, 211 - 34, this.ySize );
src/main/java/appeng/client/gui/implementations/GuiInterface.java
+5 -5
View File
@@ -79,13 +79,13 @@ public class GuiInterface extends GuiUpgradeable
this.interfaceMode.setState( ( (ContainerInterface) this.cvb ).getInterfaceTerminalMode() == YesNo.YES );
}
this.fontRendererObj.drawString( this.getGuiDisplayName( GuiText.Interface.getLocal() ), 8, 6, 4210752 );
this.fontRenderer.drawString( this.getGuiDisplayName( GuiText.Interface.getLocal() ), 8, 6, 4210752 );
this.fontRendererObj.drawString( GuiText.Config.getLocal(), 18, 6 + 11 + 7, 4210752 );
this.fontRendererObj.drawString( GuiText.StoredItems.getLocal(), 18, 6 + 60 + 7, 4210752 );
this.fontRendererObj.drawString( GuiText.Patterns.getLocal(), 8, 6 + 73 + 7, 4210752 );
this.fontRenderer.drawString( GuiText.Config.getLocal(), 18, 6 + 11 + 7, 4210752 );
this.fontRenderer.drawString( GuiText.StoredItems.getLocal(), 18, 6 + 60 + 7, 4210752 );
this.fontRenderer.drawString( GuiText.Patterns.getLocal(), 8, 6 + 73 + 7, 4210752 );
this.fontRendererObj.drawString( GuiText.inventory.getLocal(), 8, this.ySize - 96 + 3, 4210752 );
this.fontRenderer.drawString( GuiText.inventory.getLocal(), 8, this.ySize - 96 + 3, 4210752 );
}
@Override
src/main/java/appeng/client/gui/implementations/GuiInterfaceTerminal.java
+5 -5
View File
@@ -87,7 +87,7 @@ public class GuiInterfaceTerminal extends AEBaseGui
this.getScrollBar().setHeight( 106 );
this.getScrollBar().setTop( 18 );
this.searchField = new MEGuiTextField( this.fontRendererObj, this.guiLeft + Math.max( 104, this.offsetX ), this.guiTop + 4, 65, 12 );
this.searchField = new MEGuiTextField( this.fontRenderer, this.guiLeft + Math.max( 104, this.offsetX ), this.guiTop + 4, 65, 12 );
this.searchField.setEnableBackgroundDrawing( false );
this.searchField.setMaxStringLength( 25 );
this.searchField.setTextColor( 0xFFFFFF );
@@ -98,8 +98,8 @@ public class GuiInterfaceTerminal extends AEBaseGui
@Override
public void drawFG( final int offsetX, final int offsetY, final int mouseX, final int mouseY )
{
this.fontRendererObj.drawString( this.getGuiDisplayName( GuiText.InterfaceTerminal.getLocal() ), 8, 6, 4210752 );
this.fontRendererObj.drawString( GuiText.inventory.getLocal(), 8, this.ySize - 96 + 3, 4210752 );
this.fontRenderer.drawString( this.getGuiDisplayName( GuiText.InterfaceTerminal.getLocal() ), 8, 6, 4210752 );
this.fontRenderer.drawString( GuiText.inventory.getLocal(), 8, this.ySize - 96 + 3, 4210752 );
final int ex = this.getScrollBar().getCurrentScroll();
@@ -133,12 +133,12 @@ public class GuiInterfaceTerminal extends AEBaseGui
name = name + " (" + rows + ')';
}
while( name.length() > 2 && this.fontRendererObj.getStringWidth( name ) > 155 )
while( name.length() > 2 && this.fontRenderer.getStringWidth( name ) > 155 )
{
name = name.substring( 0, name.length() - 1 );
}
this.fontRendererObj.drawString( name, 10, 6 + offset, 4210752 );
this.fontRenderer.drawString( name, 10, 6 + offset, 4210752 );
}
offset += 18;
}
src/main/java/appeng/client/gui/implementations/GuiLevelEmitter.java
+1 -1
View File
@@ -71,7 +71,7 @@ public class GuiLevelEmitter extends GuiUpgradeable
{
super.initGui();
this.level = new GuiNumberBox( this.fontRendererObj, this.guiLeft + 24, this.guiTop + 43, 79, this.fontRendererObj.FONT_HEIGHT, Long.class );
this.level = new GuiNumberBox( this.fontRenderer, this.guiLeft + 24, this.guiTop + 43, 79, this.fontRenderer.FONT_HEIGHT, Long.class );
this.level.setEnableBackgroundDrawing( false );
this.level.setMaxStringLength( 16 );
this.level.setTextColor( 0xFFFFFF );
src/main/java/appeng/client/gui/implementations/GuiMAC.java
+2 -2
View File
@@ -70,8 +70,8 @@ public class GuiMAC extends GuiUpgradeable
@Override
public void drawBG( final int offsetX, final int offsetY, final int mouseX, final int mouseY )
{
this.pb.xPosition = 148 + this.guiLeft;
this.pb.yPosition = 48 + this.guiTop;
this.pb.x = 148 + this.guiLeft;
this.pb.y = 48 + this.guiTop;
super.drawBG( offsetX, offsetY, mouseX, mouseY );
}
src/main/java/appeng/client/gui/implementations/GuiMEMonitorable.java
+3 -3
View File
@@ -295,7 +295,7 @@ public class GuiMEMonitorable extends AEBaseMEGui implements ISortSource, IConfi
this.buttonList.add( this.terminalStyleBox = new GuiImgButton( this.guiLeft - 18, offset, Settings.TERMINAL_STYLE, AEConfig.instance().getConfigManager().getSetting( Settings.TERMINAL_STYLE ) ) );
}
this.searchField = new MEGuiTextField( this.fontRendererObj, this.guiLeft + Math.max( 80, this.offsetX ), this.guiTop + 4, 90, 12 );
this.searchField = new MEGuiTextField( this.fontRenderer, this.guiLeft + Math.max( 80, this.offsetX ), this.guiTop + 4, 90, 12 );
this.searchField.setEnableBackgroundDrawing( false );
this.searchField.setMaxStringLength( 25 );
this.searchField.setTextColor( 0xFFFFFF );
@@ -350,8 +350,8 @@ public class GuiMEMonitorable extends AEBaseMEGui implements ISortSource, IConfi
@Override
public void drawFG( final int offsetX, final int offsetY, final int mouseX, final int mouseY )
{
this.fontRendererObj.drawString( this.getGuiDisplayName( this.myName.getLocal() ), 8, 6, 4210752 );
this.fontRendererObj.drawString( GuiText.inventory.getLocal(), 8, this.ySize - 96 + 3, 4210752 );
this.fontRenderer.drawString( this.getGuiDisplayName( this.myName.getLocal() ), 8, 6, 4210752 );
this.fontRenderer.drawString( GuiText.inventory.getLocal(), 8, this.ySize - 96 + 3, 4210752 );
}
@Override
src/main/java/appeng/client/gui/implementations/GuiNetworkStatus.java
+7 -7
View File
@@ -133,13 +133,13 @@ public class GuiNetworkStatus extends AEBaseGui implements ISortSource
{
final ContainerNetworkStatus ns = (ContainerNetworkStatus) this.inventorySlots;
this.fontRendererObj.drawString( GuiText.NetworkDetails.getLocal(), 8, 6, 4210752 );
this.fontRenderer.drawString( GuiText.NetworkDetails.getLocal(), 8, 6, 4210752 );
this.fontRendererObj.drawString( GuiText.StoredPower.getLocal() + ": " + Platform.formatPowerLong( ns.getCurrentPower(), false ), 13, 16, 4210752 );
this.fontRendererObj.drawString( GuiText.MaxPower.getLocal() + ": " + Platform.formatPowerLong( ns.getMaxPower(), false ), 13, 26, 4210752 );
this.fontRenderer.drawString( GuiText.StoredPower.getLocal() + ": " + Platform.formatPowerLong( ns.getCurrentPower(), false ), 13, 16, 4210752 );
this.fontRenderer.drawString( GuiText.MaxPower.getLocal() + ": " + Platform.formatPowerLong( ns.getMaxPower(), false ), 13, 26, 4210752 );
this.fontRendererObj.drawString( GuiText.PowerInputRate.getLocal() + ": " + Platform.formatPowerLong( ns.getAverageAddition(), true ), 13, 143 - 10, 4210752 );
this.fontRendererObj.drawString( GuiText.PowerUsageRate.getLocal() + ": " + Platform.formatPowerLong( ns.getPowerUsage(), true ), 13, 143 - 20, 4210752 );
this.fontRenderer.drawString( GuiText.PowerInputRate.getLocal() + ": " + Platform.formatPowerLong( ns.getAverageAddition(), true ), 13, 143 - 10, 4210752 );
this.fontRenderer.drawString( GuiText.PowerUsageRate.getLocal() + ": " + Platform.formatPowerLong( ns.getPowerUsage(), true ), 13, 143 - 20, 4210752 );
final int sectionLength = 30;
@@ -168,8 +168,8 @@ public class GuiNetworkStatus extends AEBaseGui implements ISortSource
str = Long.toString( refStack.getStackSize() / 1000 ) + 'k';
}
final int w = this.fontRendererObj.getStringWidth( str );
this.fontRendererObj.drawString( str, (int) ( ( x * sectionLength + xo + sectionLength - 19 - ( w * 0.5 ) ) * 2 ), ( y * 18 + yo + 6 ) * 2, 4210752 );
final int w = this.fontRenderer.getStringWidth( str );
this.fontRenderer.drawString( str, (int) ( ( x * sectionLength + xo + sectionLength - 19 - ( w * 0.5 ) ) * 2 ), ( y * 18 + yo + 6 ) * 2, 4210752 );
GlStateManager.popMatrix();
final int posX = x * sectionLength + xo + sectionLength - 18;
src/main/java/appeng/client/gui/implementations/GuiNetworkTool.java
+2 -2
View File
@@ -81,8 +81,8 @@ public class GuiNetworkTool extends AEBaseGui
this.tFacades.setState( ( (ContainerNetworkTool) this.inventorySlots ).isFacadeMode() );
}
this.fontRendererObj.drawString( this.getGuiDisplayName( GuiText.NetworkTool.getLocal() ), 8, 6, 4210752 );
this.fontRendererObj.drawString( GuiText.inventory.getLocal(), 8, this.ySize - 96 + 3, 4210752 );
this.fontRenderer.drawString( this.getGuiDisplayName( GuiText.NetworkTool.getLocal() ), 8, 6, 4210752 );
this.fontRenderer.drawString( GuiText.inventory.getLocal(), 8, this.ySize - 96 + 3, 4210752 );
}
@Override
src/main/java/appeng/client/gui/implementations/GuiPatternTerm.java
+1 -1
View File
@@ -157,7 +157,7 @@ public class GuiPatternTerm extends GuiMEMonitorable
}
super.drawFG( offsetX, offsetY, mouseX, mouseY );
this.fontRendererObj.drawString( GuiText.PatternTerminal.getLocal(), 8, this.ySize - 96 + 2 - this.getReservedSpace(), 4210752 );
this.fontRenderer.drawString( GuiText.PatternTerminal.getLocal(), 8, this.ySize - 96 + 2 - this.getReservedSpace(), 4210752 );
}
@Override
src/main/java/appeng/client/gui/implementations/GuiPriority.java
+2 -2
View File
@@ -139,7 +139,7 @@ public class GuiPriority extends AEBaseGui
this.buttonList.add( this.originalGuiBtn = new GuiTabButton( this.guiLeft + 154, this.guiTop, myIcon, myIcon.getDisplayName(), this.itemRender ) );
}
this.priority = new GuiNumberBox( this.fontRendererObj, this.guiLeft + 62, this.guiTop + 57, 59, this.fontRendererObj.FONT_HEIGHT, Long.class );
this.priority = new GuiNumberBox( this.fontRenderer, this.guiLeft + 62, this.guiTop + 57, 59, this.fontRenderer.FONT_HEIGHT, Long.class );
this.priority.setEnableBackgroundDrawing( false );
this.priority.setMaxStringLength( 16 );
this.priority.setTextColor( 0xFFFFFF );
@@ -151,7 +151,7 @@ public class GuiPriority extends AEBaseGui
@Override
public void drawFG( final int offsetX, final int offsetY, final int mouseX, final int mouseY )
{
this.fontRendererObj.drawString( GuiText.Priority.getLocal(), 8, 6, 4210752 );
this.fontRenderer.drawString( GuiText.Priority.getLocal(), 8, 6, 4210752 );
}
@Override
src/main/java/appeng/client/gui/implementations/GuiQNB.java
+2 -2
View File
@@ -39,8 +39,8 @@ public class GuiQNB extends AEBaseGui
@Override
public void drawFG( final int offsetX, final int offsetY, final int mouseX, final int mouseY )
{
this.fontRendererObj.drawString( this.getGuiDisplayName( GuiText.QuantumLinkChamber.getLocal() ), 8, 6, 4210752 );
this.fontRendererObj.drawString( GuiText.inventory.getLocal(), 8, this.ySize - 96 + 3, 4210752 );
this.fontRenderer.drawString( this.getGuiDisplayName( GuiText.QuantumLinkChamber.getLocal() ), 8, 6, 4210752 );
this.fontRenderer.drawString( GuiText.inventory.getLocal(), 8, this.ySize - 96 + 3, 4210752 );
}
@Override
src/main/java/appeng/client/gui/implementations/GuiQuartzKnife.java
+3 -3
View File
@@ -49,7 +49,7 @@ public class GuiQuartzKnife extends AEBaseGui
{
super.initGui();
this.name = new GuiTextField( 0, this.fontRendererObj, this.guiLeft + 24, this.guiTop + 32, 79, this.fontRendererObj.FONT_HEIGHT );
this.name = new GuiTextField( 0, this.fontRenderer, this.guiLeft + 24, this.guiTop + 32, 79, this.fontRenderer.FONT_HEIGHT );
this.name.setEnableBackgroundDrawing( false );
this.name.setMaxStringLength( 32 );
this.name.setTextColor( 0xFFFFFF );
@@ -60,8 +60,8 @@ public class GuiQuartzKnife extends AEBaseGui
@Override
public void drawFG( final int offsetX, final int offsetY, final int mouseX, final int mouseY )
{
this.fontRendererObj.drawString( this.getGuiDisplayName( GuiText.QuartzCuttingKnife.getLocal() ), 8, 6, 4210752 );
this.fontRendererObj.drawString( GuiText.inventory.getLocal(), 8, this.ySize - 96 + 3, 4210752 );
this.fontRenderer.drawString( this.getGuiDisplayName( GuiText.QuartzCuttingKnife.getLocal() ), 8, 6, 4210752 );
this.fontRenderer.drawString( GuiText.inventory.getLocal(), 8, this.ySize - 96 + 3, 4210752 );
}
@Override
src/main/java/appeng/client/gui/implementations/GuiSecurityStation.java
+1 -1
View File
@@ -116,7 +116,7 @@ public class GuiSecurityStation extends GuiMEMonitorable
public void drawFG( final int offsetX, final int offsetY, final int mouseX, final int mouseY )
{
super.drawFG( offsetX, offsetY, mouseX, mouseY );
this.fontRendererObj.drawString( GuiText.SecurityCardEditor.getLocal(), 8, this.ySize - 96 + 1 - this.getReservedSpace(), 4210752 );
this.fontRenderer.drawString( GuiText.SecurityCardEditor.getLocal(), 8, this.ySize - 96 + 1 - this.getReservedSpace(), 4210752 );
}
@Override
src/main/java/appeng/client/gui/implementations/GuiSkyChest.java
+2 -2
View File
@@ -40,8 +40,8 @@ public class GuiSkyChest extends AEBaseGui
@Override
public void drawFG( final int offsetX, final int offsetY, final int mouseX, final int mouseY )
{
this.fontRendererObj.drawString( this.getGuiDisplayName( GuiText.SkyChest.getLocal() ), 8, 8, 4210752 );
this.fontRendererObj.drawString( GuiText.inventory.getLocal(), 8, this.ySize - 96 + 2, 4210752 );
this.fontRenderer.drawString( this.getGuiDisplayName( GuiText.SkyChest.getLocal() ), 8, 8, 4210752 );
this.fontRenderer.drawString( GuiText.inventory.getLocal(), 8, this.ySize - 96 + 2, 4210752 );
}
@Override
src/main/java/appeng/client/gui/implementations/GuiSpatialIOPort.java
+6 -6
View File
@@ -75,13 +75,13 @@ public class GuiSpatialIOPort extends AEBaseGui
@Override
public void drawFG( final int offsetX, final int offsetY, final int mouseX, final int mouseY )
{
this.fontRendererObj.drawString( GuiText.StoredPower.getLocal() + ": " + Platform.formatPowerLong( this.container.getCurrentPower(), false ), 13, 21, 4210752 );
this.fontRendererObj.drawString( GuiText.MaxPower.getLocal() + ": " + Platform.formatPowerLong( this.container.getMaxPower(), false ), 13, 31, 4210752 );
this.fontRendererObj.drawString( GuiText.RequiredPower.getLocal() + ": " + Platform.formatPowerLong( this.container.getRequiredPower(), false ), 13, 78, 4210752 );
this.fontRendererObj.drawString( GuiText.Efficiency.getLocal() + ": " + ( ( (float) this.container.getEfficency() ) / 100 ) + '%', 13, 88, 4210752 );
this.fontRenderer.drawString( GuiText.StoredPower.getLocal() + ": " + Platform.formatPowerLong( this.container.getCurrentPower(), false ), 13, 21, 4210752 );
this.fontRenderer.drawString( GuiText.MaxPower.getLocal() + ": " + Platform.formatPowerLong( this.container.getMaxPower(), false ), 13, 31, 4210752 );
this.fontRenderer.drawString( GuiText.RequiredPower.getLocal() + ": " + Platform.formatPowerLong( this.container.getRequiredPower(), false ), 13, 78, 4210752 );
this.fontRenderer.drawString( GuiText.Efficiency.getLocal() + ": " + ( ( (float) this.container.getEfficency() ) / 100 ) + '%', 13, 88, 4210752 );
this.fontRendererObj.drawString( this.getGuiDisplayName( GuiText.SpatialIOPort.getLocal() ), 8, 6, 4210752 );
this.fontRendererObj.drawString( GuiText.inventory.getLocal(), 8, this.ySize - 96, 4210752 );
this.fontRenderer.drawString( this.getGuiDisplayName( GuiText.SpatialIOPort.getLocal() ), 8, 6, 4210752 );
this.fontRenderer.drawString( GuiText.inventory.getLocal(), 8, this.ySize - 96, 4210752 );
}
@Override
src/main/java/appeng/client/gui/implementations/GuiStorageBus.java
+2 -2
View File
@@ -80,8 +80,8 @@ public class GuiStorageBus extends GuiUpgradeable
@Override
public void drawFG( final int offsetX, final int offsetY, final int mouseX, final int mouseY )
{
this.fontRendererObj.drawString( this.getGuiDisplayName( GuiText.StorageBus.getLocal() ), 8, 6, 4210752 );
this.fontRendererObj.drawString( GuiText.inventory.getLocal(), 8, this.ySize - 96 + 3, 4210752 );
this.fontRenderer.drawString( this.getGuiDisplayName( GuiText.StorageBus.getLocal() ), 8, 6, 4210752 );
this.fontRenderer.drawString( GuiText.inventory.getLocal(), 8, this.ySize - 96 + 3, 4210752 );
if( this.fuzzyMode != null )
{
src/main/java/appeng/client/gui/implementations/GuiUpgradeable.java
+2 -2
View File
@@ -97,8 +97,8 @@ public class GuiUpgradeable extends AEBaseGui
@Override
public void drawFG( final int offsetX, final int offsetY, final int mouseX, final int mouseY )
{
this.fontRendererObj.drawString( this.getGuiDisplayName( this.getName().getLocal() ), 8, 6, 4210752 );
this.fontRendererObj.drawString( GuiText.inventory.getLocal(), 8, this.ySize - 96 + 3, 4210752 );
this.fontRenderer.drawString( this.getGuiDisplayName( this.getName().getLocal() ), 8, 6, 4210752 );
this.fontRenderer.drawString( GuiText.inventory.getLocal(), 8, this.ySize - 96 + 3, 4210752 );
if( this.redstoneMode != null )
{
src/main/java/appeng/client/gui/implementations/GuiVibrationChamber.java
+4 -4
View File
@@ -55,8 +55,8 @@ public class GuiVibrationChamber extends AEBaseGui
@Override
public void drawFG( final int offsetX, final int offsetY, final int mouseX, final int mouseY )
{
this.fontRendererObj.drawString( this.getGuiDisplayName( GuiText.VibrationChamber.getLocal() ), 8, 6, 4210752 );
this.fontRendererObj.drawString( GuiText.inventory.getLocal(), 8, this.ySize - 96 + 3, 4210752 );
this.fontRenderer.drawString( this.getGuiDisplayName( GuiText.VibrationChamber.getLocal() ), 8, 6, 4210752 );
this.fontRenderer.drawString( GuiText.inventory.getLocal(), 8, this.ySize - 96 + 3, 4210752 );
this.pb.setFullMsg( this.cvc.getAePerTick() * this.cvc.getCurrentProgress() / 100 + " AE/t" );
@@ -75,8 +75,8 @@ public class GuiVibrationChamber extends AEBaseGui
public void drawBG( final int offsetX, final int offsetY, final int mouseX, final int mouseY )
{
this.bindTexture( "guis/vibchamber.png" );
this.pb.xPosition = 99 + this.guiLeft;
this.pb.yPosition = 36 + this.guiTop;
this.pb.x = 99 + this.guiLeft;
this.pb.y = 36 + this.guiTop;
this.drawTexturedModalRect( offsetX, offsetY, 0, 0, this.xSize, this.ySize );
}
}
src/main/java/appeng/client/gui/implementations/GuiWireless.java
+5 -5
View File
@@ -73,8 +73,8 @@ public class GuiWireless extends AEBaseGui
@Override
public void drawFG( final int offsetX, final int offsetY, final int mouseX, final int mouseY )
{
this.fontRendererObj.drawString( this.getGuiDisplayName( GuiText.Wireless.getLocal() ), 8, 6, 4210752 );
this.fontRendererObj.drawString( GuiText.inventory.getLocal(), 8, this.ySize - 96 + 3, 4210752 );
this.fontRenderer.drawString( this.getGuiDisplayName( GuiText.Wireless.getLocal() ), 8, 6, 4210752 );
this.fontRenderer.drawString( GuiText.inventory.getLocal(), 8, this.ySize - 96 + 3, 4210752 );
final ContainerWireless cw = (ContainerWireless) this.inventorySlots;
@@ -83,10 +83,10 @@ public class GuiWireless extends AEBaseGui
final String firstMessage = GuiText.Range.getLocal() + ": " + ( cw.getRange() / 10.0 ) + " m";
final String secondMessage = GuiText.PowerUsageRate.getLocal() + ": " + Platform.formatPowerLong( cw.getDrain(), true );
final int strWidth = Math.max( this.fontRendererObj.getStringWidth( firstMessage ), this.fontRendererObj.getStringWidth( secondMessage ) );
final int strWidth = Math.max( this.fontRenderer.getStringWidth( firstMessage ), this.fontRenderer.getStringWidth( secondMessage ) );
final int cOffset = ( this.xSize / 2 ) - ( strWidth / 2 );
this.fontRendererObj.drawString( firstMessage, cOffset, 20, 4210752 );
this.fontRendererObj.drawString( secondMessage, cOffset, 20 + 12, 4210752 );
this.fontRenderer.drawString( firstMessage, cOffset, 20, 4210752 );
this.fontRenderer.drawString( secondMessage, cOffset, 20 + 12, 4210752 );
}
}
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
src/main/java/appeng/client/render/TesrRenderHelper.java
+1 -1
View File
@@ -133,7 +133,7 @@ public class TesrRenderHelper
final String renderedStackSize = NUMBER_CONVERTER.toWideReadableForm( stackSize );
// Render the item count
final FontRenderer fr = Minecraft.getMinecraft().fontRendererObj;
final FontRenderer fr = Minecraft.getMinecraft().fontRenderer;
final int width = fr.getStringWidth( renderedStackSize );
GlStateManager.translate( 0.0f, spacing, 0 );
GlStateManager.scale( 1.0f / 62.0f, 1.0f / 62.0f, 1.0f / 62.0f );
src/main/java/appeng/client/render/cablebus/FacadeBuilder.java
+1 -1
View File
@@ -398,7 +398,7 @@ public class FacadeBuilder
AEAxisAlignedBB b = null;
for( AxisAlignedBB bb : partBoxes )
{
if( bb.intersectsWith( facadeBox ) )
if( bb.intersects( facadeBox ) )
{
if( b == null )
{
src/main/java/appeng/client/render/model/GlassBakedModel.java
+5 -5
View File
@@ -219,10 +219,10 @@ class GlassBakedModel implements IBakedModel
UnpackedBakedQuad.Builder builder = new UnpackedBakedQuad.Builder( vertexFormat );
builder.setTexture( sprite );
putVertex( builder, normal, c1.xCoord, c1.yCoord, c1.zCoord, sprite, u1, v1 );
putVertex( builder, normal, c2.xCoord, c2.yCoord, c2.zCoord, sprite, u1, v2 );
putVertex( builder, normal, c3.xCoord, c3.yCoord, c3.zCoord, sprite, u2, v2 );
putVertex( builder, normal, c4.xCoord, c4.yCoord, c4.zCoord, sprite, u2, v1 );
putVertex( builder, normal, c1.x, c1.y, c1.z, sprite, u1, v1 );
putVertex( builder, normal, c2.x, c2.y, c2.z, sprite, u1, v2 );
putVertex( builder, normal, c3.x, c3.y, c3.z, sprite, u2, v2 );
putVertex( builder, normal, c4.x, c4.y, c4.z, sprite, u2, v1 );
return builder.build();
}
@@ -251,7 +251,7 @@ class GlassBakedModel implements IBakedModel
break;
}
case NORMAL:
builder.put( e, (float) normal.xCoord, (float) normal.yCoord, (float) normal.zCoord, 0f );
builder.put( e, (float) normal.x, (float) normal.y, (float) normal.z, 0f );
break;
default:
builder.put( e );
src/main/java/appeng/client/render/model/RenderHelper.java
+3 -3
View File
@@ -86,11 +86,11 @@ final class RenderHelper
{
default:
case X:
return new Vec3d( vec.xCoord + delta, vec.yCoord, vec.zCoord );
return new Vec3d( vec.x + delta, vec.y, vec.z );
case Y:
return new Vec3d( vec.xCoord, vec.yCoord + delta, vec.zCoord );
return new Vec3d( vec.x, vec.y + delta, vec.z );
case Z:
return new Vec3d( vec.xCoord, vec.yCoord, vec.zCoord + delta );
return new Vec3d( vec.x, vec.y, vec.z + delta );
}
}
}
src/main/java/appeng/container/guisync/SyncData.java
+3 -3
View File
@@ -93,7 +93,7 @@ public class SyncData
}
else if( this.field.getType().isEnum() )
{
o.sendProgressBarUpdate( this.source, this.channel, ( (Enum) val ).ordinal() );
o.sendWindowProperty( this.source, this.channel, ( (Enum) val ).ordinal() );
}
else if( val instanceof Long || val.getClass() == long.class )
{
@@ -104,11 +104,11 @@ public class SyncData
}
else if( val instanceof Boolean || val.getClass() == boolean.class )
{
o.sendProgressBarUpdate( this.source, this.channel, ( (Boolean) val ) ? 1 : 0 );
o.sendWindowProperty( this.source, this.channel, ( (Boolean) val ) ? 1 : 0 );
}
else
{
o.sendProgressBarUpdate( this.source, this.channel, (Integer) val );
o.sendWindowProperty( this.source, this.channel, (Integer) val );
}
this.clientVersion = val;
src/main/java/appeng/core/stats/AchievementPickupHandler.java
+2 -2
View File
@@ -45,12 +45,12 @@ public class AchievementPickupHandler
@SubscribeEvent
public void onItemPickUp( final PlayerEvent.ItemPickupEvent event )
{
if( this.differentiator.isNoPlayer( event.player ) || event.pickedUp == null || event.pickedUp.getEntityItem().isEmpty() )
if( this.differentiator.isNoPlayer( event.player ) || event.pickedUp == null || event.pickedUp.getItem().isEmpty() )
{
return;
}
final ItemStack is = event.pickedUp.getEntityItem();
final ItemStack is = event.pickedUp.getItem();
for( final Achievements achievement : Achievements.values() )
{
src/main/java/appeng/core/sync/network/NetworkHandler.java
+1 -1
View File
@@ -112,7 +112,7 @@ public class NetworkHandler
{
try
{
this.serveHandler.onPacketData( null, ev.getHandler(), ev.getPacket(), srv.playerEntity );
this.serveHandler.onPacketData( null, ev.getHandler(), ev.getPacket(), srv.player );
}
catch( final ThreadQuickExitException ignored )
{
src/main/java/appeng/entity/EntityChargedQuartz.java
+8 -8
View File
@@ -103,7 +103,7 @@ public final class EntityChargedQuartz extends AEBaseEntityItem
private boolean transform()
{
final ItemStack item = this.getEntityItem();
final ItemStack item = this.getItem();
final IMaterials materials = AEApi.instance().definitions().materials();
if( materials.certusQuartzCrystalCharged().isSameAs( item ) )
@@ -118,7 +118,7 @@ public final class EntityChargedQuartz extends AEBaseEntityItem
{
if( e instanceof EntityItem && !e.isDead )
{
final ItemStack other = ( (EntityItem) e ).getEntityItem();
final ItemStack other = ( (EntityItem) e ).getItem();
if( !other.isEmpty() )
{
if( Platform.itemComparisons().isEqualItem( other, new ItemStack( Items.REDSTONE ) ) )
@@ -136,21 +136,21 @@ public final class EntityChargedQuartz extends AEBaseEntityItem
if( redstone != null && netherQuartz != null )
{
this.getEntityItem().grow( -1 );
redstone.getEntityItem().grow( -1 );
netherQuartz.getEntityItem().grow( -1 );
this.getItem().grow( -1 );
redstone.getItem().grow( -1 );
netherQuartz.getItem().grow( -1 );
if( this.getEntityItem().getCount() <= 0 )
if( this.getItem().getCount() <= 0 )
{
this.setDead();
}
if( redstone.getEntityItem().getCount() <= 0 )
if( redstone.getItem().getCount() <= 0 )
{
redstone.setDead();
}
if( netherQuartz.getEntityItem().getCount() <= 0 )
if( netherQuartz.getItem().getCount() <= 0 )
{
netherQuartz.setDead();
}
src/main/java/appeng/entity/EntityGrowingCrystal.java
+2 -2
View File
@@ -64,7 +64,7 @@ public final class EntityGrowingCrystal extends EntityItem
return;
}
final ItemStack is = this.getEntityItem();
final ItemStack is = this.getItem();
final Item gc = is.getItem();
if( gc instanceof IGrowableCrystal ) // if it changes this just stops being an issue...
@@ -143,7 +143,7 @@ public final class EntityGrowingCrystal extends EntityItem
if( this.progress_1000 > 1000 )
{
this.progress_1000 -= 1000;
this.setEntityItemStack( cry.triggerGrowth( is ) );
this.setItem( cry.triggerGrowth( is ) );
}
}
}
src/main/java/appeng/entity/EntitySingularity.java
+2 -2
View File
@@ -79,7 +79,7 @@ public final class EntitySingularity extends AEBaseEntityItem
return;
}
final ItemStack item = this.getEntityItem();
final ItemStack item = this.getItem();
final IMaterials materials = AEApi.instance().definitions().materials();
@@ -92,7 +92,7 @@ public final class EntitySingularity extends AEBaseEntityItem
{
if( e instanceof EntityItem )
{
final ItemStack other = ( (EntityItem) e ).getEntityItem();
final ItemStack other = ( (EntityItem) e ).getItem();
if( !other.isEmpty() )
{
boolean matches = false;
src/main/java/appeng/entity/RenderFloatingItem.java
+1 -1
View File
@@ -49,7 +49,7 @@ public class RenderFloatingItem extends RenderEntityItem
{
GlStateManager.pushMatrix();
if( !( efi.getEntityItem().getItem() instanceof ItemBlock ) )
if( !( efi.getItem().getItem() instanceof ItemBlock ) )
{
GlStateManager.translate( 0, -0.3f, 0 );
}
src/main/java/appeng/helpers/Splotch.java
+6 -6
View File
@@ -45,20 +45,20 @@ public class Splotch
if( side == EnumFacing.SOUTH || side == EnumFacing.NORTH )
{
x = position.xCoord;
y = position.yCoord;
x = position.x;
y = position.y;
}
else if( side == EnumFacing.UP || side == EnumFacing.DOWN )
{
x = position.xCoord;
y = position.zCoord;
x = position.x;
y = position.z;
}
else
{
x = position.yCoord;
y = position.zCoord;
x = position.y;
y = position.z;
}
final int a = (int) ( x * 0xF );
src/main/java/appeng/integration/modules/jei/GrinderRecipeWrapper.java
+1 -1
View File
@@ -59,7 +59,7 @@ class GrinderRecipeWrapper extends BlankRecipeWrapper
public void drawInfo( Minecraft minecraft, int recipeWidth, int recipeHeight, int mouseX, int mouseY )
{
FontRenderer fr = Minecraft.getMinecraft().fontRendererObj;
FontRenderer fr = Minecraft.getMinecraft().fontRenderer;
int x = 118;
src/main/java/appeng/integration/modules/waila/part/Tracer.java
+1 -1
View File
@@ -54,7 +54,7 @@ public final class Tracer
final Vec3d headVec = this.getCorrectedHeadVec( player );
final Vec3d lookVec = player.getLook( 1.0F );
final double reach = this.getBlockReachDistance_server( player );
final Vec3d endVec = headVec.addVector( lookVec.xCoord * reach, lookVec.yCoord * reach, lookVec.zCoord * reach );
final Vec3d endVec = headVec.addVector( lookVec.x * reach, lookVec.y * reach, lookVec.z * reach );
return blockState.collisionRayTrace( world, pos, headVec, endVec );
}
src/main/java/appeng/items/parts/ItemFacade.java
+1 -1
View File
@@ -183,7 +183,7 @@ public class ItemFacade extends AEBaseItem implements IFacadeItem, IAlphaPassIte
return ItemStack.EMPTY;
}
final boolean defaultValue = ( b.isFullyOpaque( blockState ) && hasSimpleModel( blockState ) && !b.getTickRandomly() && !hasTile && !disableOre ) || enableGlass;
final boolean defaultValue = ( b.isTopSolid( blockState ) && hasSimpleModel( blockState ) && !b.getTickRandomly() && !hasTile && !disableOre ) || enableGlass;
if( FacadeConfig.instance().checkEnabled( b, metadata, defaultValue ) )
{
if( returnItem )
src/main/java/appeng/items/tools/powered/ToolMatterCannon.java
+10 -10
View File
@@ -156,9 +156,9 @@ public class ToolMatterCannon extends AEBasePoweredItem implements IStorageCell
final Vec3d direction = Vec3d1.subtract( Vec3d );
direction.normalize();
final double d0 = Vec3d.xCoord;
final double d1 = Vec3d.yCoord;
final double d2 = Vec3d.zCoord;
final double d0 = Vec3d.x;
final double d1 = Vec3d.y;
final double d2 = Vec3d.z;
final float penetration = AEApi.instance().registries().matterCannon().getPenetration( ammo ); // 196.96655f;
if( penetration <= 0 )
@@ -191,7 +191,7 @@ public class ToolMatterCannon extends AEBasePoweredItem implements IStorageCell
private void shootPaintBalls( final ItemStack type, final World w, final EntityPlayer p, final Vec3d Vec3d, final Vec3d Vec3d1, final Vec3d direction, final double d0, final double d1, final double d2 )
{
final AxisAlignedBB bb = new AxisAlignedBB( Math.min( Vec3d.xCoord, Vec3d1.xCoord ), Math.min( Vec3d.yCoord, Vec3d1.yCoord ), Math.min( Vec3d.zCoord, Vec3d1.zCoord ), Math.max( Vec3d.xCoord, Vec3d1.xCoord ), Math.max( Vec3d.yCoord, Vec3d1.yCoord ), Math.max( Vec3d.zCoord, Vec3d1.zCoord ) ).expand( 16, 16, 16 );
final AxisAlignedBB bb = new AxisAlignedBB( Math.min( Vec3d.x, Vec3d1.x ), Math.min( Vec3d.y, Vec3d1.y ), Math.min( Vec3d.z, Vec3d1.z ), Math.max( Vec3d.x, Vec3d1.x ), Math.max( Vec3d.y, Vec3d1.y ), Math.max( Vec3d.z, Vec3d1.z ) ).expand( 16, 16, 16 );
Entity entity = null;
final List list = w.getEntitiesWithinAABBExcludingEntity( p, bb );
@@ -244,7 +244,7 @@ public class ToolMatterCannon extends AEBasePoweredItem implements IStorageCell
try
{
AppEng.proxy.sendToAllNearExcept( null, d0, d1, d2, 128, w, new PacketMatterCannon( d0, d1, d2, (float) direction.xCoord, (float) direction.yCoord, (float) direction.zCoord, (byte) ( pos == null ? 32 : pos.hitVec.squareDistanceTo( vec ) + 1 ) ) );
AppEng.proxy.sendToAllNearExcept( null, d0, d1, d2, 128, w, new PacketMatterCannon( d0, d1, d2, (float) direction.x, (float) direction.y, (float) direction.z, (byte) ( pos == null ? 32 : pos.hitVec.squareDistanceTo( vec ) + 1 ) ) );
}
catch( final Exception err )
{
@@ -309,7 +309,7 @@ public class ToolMatterCannon extends AEBasePoweredItem implements IStorageCell
{
hasDestroyed = false;
final AxisAlignedBB bb = new AxisAlignedBB( Math.min( Vec3d.xCoord, Vec3d1.xCoord ), Math.min( Vec3d.yCoord, Vec3d1.yCoord ), Math.min( Vec3d.zCoord, Vec3d1.zCoord ), Math.max( Vec3d.xCoord, Vec3d1.xCoord ), Math.max( Vec3d.yCoord, Vec3d1.yCoord ), Math.max( Vec3d.zCoord, Vec3d1.zCoord ) ).expand( 16, 16, 16 );
final AxisAlignedBB bb = new AxisAlignedBB( Math.min( Vec3d.x, Vec3d1.x ), Math.min( Vec3d.y, Vec3d1.y ), Math.min( Vec3d.z, Vec3d1.z ), Math.max( Vec3d.x, Vec3d1.x ), Math.max( Vec3d.y, Vec3d1.y ), Math.max( Vec3d.z, Vec3d1.z ) ).expand( 16, 16, 16 );
Entity entity = null;
final List list = w.getEntitiesWithinAABBExcludingEntity( p, bb );
@@ -361,7 +361,7 @@ public class ToolMatterCannon extends AEBasePoweredItem implements IStorageCell
try
{
AppEng.proxy.sendToAllNearExcept( null, d0, d1, d2, 128, w, new PacketMatterCannon( d0, d1, d2, (float) direction.xCoord, (float) direction.yCoord, (float) direction.zCoord, (byte) ( pos == null ? 32 : pos.hitVec.squareDistanceTo( vec ) + 1 ) ) );
AppEng.proxy.sendToAllNearExcept( null, d0, d1, d2, 128, w, new PacketMatterCannon( d0, d1, d2, (float) direction.x, (float) direction.y, (float) direction.z, (byte) ( pos == null ? 32 : pos.hitVec.squareDistanceTo( vec ) + 1 ) ) );
}
catch( final Exception err )
{
@@ -380,9 +380,9 @@ public class ToolMatterCannon extends AEBasePoweredItem implements IStorageCell
{
final EntityLivingBase el = (EntityLivingBase) pos.entityHit;
penetration -= dmg;
el.knockBack( p, 0, -direction.xCoord, -direction.zCoord );
// el.knockBack( p, 0, Vec3d.xCoord,
// Vec3d.zCoord );
el.knockBack( p, 0, -direction.x, -direction.z );
// el.knockBack( p, 0, Vec3d.x,
// Vec3d.z );
el.attackEntityFrom( dmgSrc, dmg );
if( !el.isEntityAlive() )
{
src/main/java/appeng/parts/CableBusContainer.java
+2 -2
View File
@@ -419,7 +419,7 @@ public class CableBusContainer extends CableBusStorage implements AEMultiTile, I
for( AxisAlignedBB bb : boxes )
{
bb = bb.expand( 0.002, 0.002, 0.002 );
if( bb.isVecInside( pos ) )
if( bb.contains( pos ) )
{
return new SelectedPart( p, side );
}
@@ -442,7 +442,7 @@ public class CableBusContainer extends CableBusStorage implements AEMultiTile, I
for( AxisAlignedBB bb : boxes )
{
bb = bb.expand( 0.01, 0.01, 0.01 );
if( bb.isVecInside( pos ) )
if( bb.contains( pos ) )
{
return new SelectedPart( p, side );
}
src/main/java/appeng/parts/automation/PartAnnihilationPlane.java
+3 -3
View File
@@ -313,7 +313,7 @@ public class PartAnnihilationPlane extends PartBasicState implements IGridTickab
{
if( !entityItem.isDead )
{
final IAEItemStack overflow = this.storeItemStack( entityItem.getEntityItem() );
final IAEItemStack overflow = this.storeItemStack( entityItem.getItem() );
return this.handleOverflow( entityItem, overflow );
}
@@ -367,11 +367,11 @@ public class PartAnnihilationPlane extends PartBasicState implements IGridTickab
return true;
}
final int oldStackSize = entityItem.getEntityItem().getCount();
final int oldStackSize = entityItem.getItem().getCount();
final int newStackSize = (int) overflow.getStackSize();
final boolean changed = oldStackSize != newStackSize;
entityItem.getEntityItem().setCount( newStackSize );
entityItem.getItem().setCount( newStackSize );
return changed;
}
src/main/java/appeng/parts/p2p/PartP2PRFPower.java
+1 -1
View File
@@ -170,7 +170,7 @@ package appeng.parts.p2p;
// if( !this.cachedTarget )
// {
// TileEntity self = this.getTile();
// TileEntity te = self.getworld().getTileEntity( self.xCoord + this.side.offsetX, self.yCoord + this.side.offsetY, self.zCoord + this.side.offsetZ );
// TileEntity te = self.getworld().getTileEntity( self.x + this.side.offsetX, self.y + this.side.offsetY, self.z + this.side.offsetZ );
// this.outputTarget = te instanceof IEnergyReceiver ? (IEnergyReceiver) te : null;
// this.cachedTarget = true;
// }
src/main/java/appeng/server/subcommands/ChunkLogger.java
+2 -2
View File
@@ -42,7 +42,7 @@ public class ChunkLogger implements ISubCommand
{
if( !event.getWorld().isRemote )
{
AELog.info( "Chunk Loaded: " + event.getChunk().xPosition + ", " + event.getChunk().zPosition );
AELog.info( "Chunk Loaded: " + event.getChunk().x + ", " + event.getChunk().z );
this.displayStack();
}
}
@@ -71,7 +71,7 @@ public class ChunkLogger implements ISubCommand
{
if( !unload.getWorld().isRemote )
{
AELog.info( "Chunk Unloaded: " + unload.getChunk().xPosition + ", " + unload.getChunk().zPosition );
AELog.info( "Chunk Unloaded: " + unload.getChunk().x + ", " + unload.getChunk().z );
this.displayStack();
}
}
src/main/java/appeng/spatial/BiomeGenStorage.java
+3 -3
View File
@@ -27,9 +27,9 @@ public class BiomeGenStorage extends Biome
{
super(new BiomeProperties( "Storage Cell" ).setRainDisabled().setTemperature( -100 ));
this.theBiomeDecorator.treesPerChunk = 0;
this.theBiomeDecorator.flowersPerChunk = 0;
this.theBiomeDecorator.grassPerChunk = 0;
this.decorator.treesPerChunk = 0;
this.decorator.flowersPerChunk = 0;
this.decorator.grassPerChunk = 0;
this.spawnableMonsterList.clear();
this.spawnableCreatureList.clear();
src/main/java/appeng/spatial/CachedPlane.java
+4 -4
View File
@@ -365,7 +365,7 @@ public class CachedPlane
for( int y = 1; y < 255; y += 32 )
{
WorldData.instance().compassData().service().updateArea( this.getWorld(), c.xPosition << 4, y, c.zPosition << 4 );
WorldData.instance().compassData().service().updateArea( this.getWorld(), c.x << 4, y, c.z << 4 );
}
Platform.sendChunk( c, this.verticalBits );
@@ -407,7 +407,7 @@ public class CachedPlane
ExtendedBlockStorage extendedblockstorage = this.storage[by];
if( extendedblockstorage == null )
{
extendedblockstorage = this.storage[by] = new ExtendedBlockStorage( by << 4, !this.c.getWorld().provider.hasNoSky() );
extendedblockstorage = this.storage[by] = new ExtendedBlockStorage( by << 4, !this.c.getWorld().provider.hasSkyLight() );
}
}
}
@@ -422,14 +422,14 @@ public class CachedPlane
final ExtendedBlockStorage extendedBlockStorage = this.storage[y >> 4];
extendedBlockStorage.set( this.x, y & 15, this.z, (IBlockState) blk[0] );
// extendedBlockStorage.setExtBlockID( x, y & 15, z, blk[0] );
extendedBlockStorage.setExtBlocklightValue( this.x, y & 15, this.z, (Integer) blk[1] );
extendedBlockStorage.setBlockLight( this.x, y & 15, this.z, (Integer) blk[1] );
}
private Object[] getDetails( final int y )
{
final ExtendedBlockStorage extendedblockstorage = this.storage[y >> 4];
this.ch[0] = extendedblockstorage.get( this.x, y & 15, this.z );
this.ch[1] = extendedblockstorage.getExtBlocklightValue( this.x, y & 15, this.z );
this.ch[1] = extendedblockstorage.getBlockLight( this.x, y & 15, this.z );
return this.ch;
}
src/main/java/appeng/spatial/StorageChunkProvider.java
+2 -2
View File
@@ -46,7 +46,7 @@ public class StorageChunkProvider extends ChunkProviderOverworld
}
@Override
public Chunk provideChunk( final int x, final int z )
public Chunk generateChunk( final int x, final int z )
{
final Chunk chunk = new Chunk( this.world, x, z );
@@ -105,7 +105,7 @@ public class StorageChunkProvider extends ChunkProviderOverworld
}
@Override
public BlockPos getStrongholdGen( World worldIn, String structureName, BlockPos position, boolean p_180513_4_ )
public BlockPos getNearestStructurePos( World worldIn, String structureName, BlockPos position, boolean p_180513_4_ )
{
return null;
}
src/main/java/appeng/spatial/StorageHelper.java
+1 -1
View File
@@ -123,7 +123,7 @@ public class StorageHelper
else
{
entity.getServer().getPlayerList().transferEntityToWorld( entity, entity.dimension,
entity.getServer().worldServerForDimension( entity.dimension ), (WorldServer) link.dim, new METeleporter( newWorld, link ) );
entity.getServer().getWorld( entity.dimension ), (WorldServer) link.dim, new METeleporter( newWorld, link ) );
}
}
src/main/java/appeng/spatial/StorageWorldProvider.java
+1 -1
View File
@@ -43,7 +43,7 @@ public class StorageWorldProvider extends WorldProvider
public StorageWorldProvider()
{
this.hasNoSky = true;
this.hasSkyLight = true;
biome = AppEng.instance().getRegistration().getStorageBiome();
this.biomeProvider = new BiomeProviderSingle( biome );
}
src/main/java/appeng/util/Platform.java
+3 -6
View File
@@ -61,7 +61,6 @@ import net.minecraft.stats.Achievement;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.tileentity.TileEntityChest;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.ResourceLocation;
import net.minecraft.util.math.AxisAlignedBB;
import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.MathHelper;
@@ -77,8 +76,6 @@ import net.minecraftforge.common.util.FakePlayerFactory;
import net.minecraftforge.fml.common.FMLCommonHandler;
import net.minecraftforge.fml.common.Loader;
import net.minecraftforge.fml.common.ModContainer;
import net.minecraftforge.fml.common.registry.GameData;
import net.minecraftforge.fml.common.registry.GameRegistry;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import net.minecraftforge.oredict.OreDictionary;
@@ -1188,8 +1185,8 @@ public class Platform
final Vec3d vec31 = vec3.addVector( f7 * d3, f6 * d3, f8 * d3 );
final AxisAlignedBB bb = new AxisAlignedBB( Math.min( vec3.xCoord, vec31.xCoord ), Math.min( vec3.yCoord, vec31.yCoord ), Math.min( vec3.zCoord,
vec31.zCoord ), Math.max( vec3.xCoord, vec31.xCoord ), Math.max( vec3.yCoord, vec31.yCoord ), Math.max( vec3.zCoord, vec31.zCoord ) ).expand(
final AxisAlignedBB bb = new AxisAlignedBB( Math.min( vec3.x, vec31.x ), Math.min( vec3.y, vec31.y ), Math.min( vec3.z,
vec31.z ), Math.max( vec3.x, vec31.x ), Math.max( vec3.y, vec31.y ), Math.max( vec3.z, vec31.z ) ).expand(
16, 16, 16 );
Entity entity = null;
@@ -1783,7 +1780,7 @@ public class Platform
{
final WorldServer ws = (WorldServer) c.getWorld();
final PlayerChunkMap pm = ws.getPlayerChunkMap();
final PlayerChunkMapEntry playerInstance = pm.getEntry( c.xPosition, c.zPosition );
final PlayerChunkMapEntry playerInstance = pm.getEntry( c.x, c.z );
if( playerInstance != null )
{
src/main/java/appeng/worldgen/MeteoritePlacer.java
+2 -2
View File
@@ -188,7 +188,7 @@ public final class MeteoritePlacer
if( j > h + distanceFrom * 0.02 )
{
if( lava && j < y && w.getBlock( x, y - 1, z ).isBlockSolid( w.getWorld(), new BlockPos( i, j, k ), EnumFacing.UP ) )
if( lava && j < y && w.getBlock( x, y - 1, z ).causesDownwardCurrent( w.getWorld(), new BlockPos( i, j, k ), EnumFacing.UP ) )
{
if( j > h + distanceFrom * 0.02 )
{
@@ -437,7 +437,7 @@ public final class MeteoritePlacer
public boolean spawnMeteorite( final IMeteoriteWorld w, final int x, final int y, final int z )
{
if( !w.hasNoSky() )
if( !w.hasSkyLight() )
{
return false;
}
src/main/java/appeng/worldgen/meteorite/IMeteoriteWorld.java
+1 -1
View File
@@ -35,7 +35,7 @@ public interface IMeteoriteWorld
int maxZ( int in );
boolean hasNoSky();
boolean hasSkyLight();
Block getBlock( int x, int y, int z );
src/main/java/appeng/worldgen/meteorite/StandardWorld.java
+2 -2
View File
@@ -64,9 +64,9 @@ public class StandardWorld implements IMeteoriteWorld
}
@Override
public boolean hasNoSky()
public boolean hasSkyLight()
{
return !this.getWorld().provider.hasNoSky();
return !this.getWorld().provider.hasSkyLight();
}
@Override