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

Add this qualifier

Browse Source
This commit is contained in:
thatsIch
2015-09-30 14:26:54 +02:00
parent efecd4b8c1
commit ebda927fb5
105 changed files with 422 additions and 415 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/appeng/core/api/definitions/ApiBlocks.java
+8 -8
View File
@@ -215,14 +215,14 @@ public final class ApiBlocks implements IBlocks
this.lightDetector = constructor.registerTileDefinition( new BlockLightDetector() );
this.paint = constructor.registerTileDefinition( new BlockPaint() );
this.skyStoneStair = makeStairs( constructor, skyStone_stone, "skystone.stone" );
this.skyStoneBlockStair = makeStairs( constructor, skyStone_block, "skystone.block" );
this.skyStoneBrickStair = makeStairs( constructor, skyStone_brick, "skystone.brick" );
this.skyStoneSmallBrickStair = makeStairs( constructor, skyStone_smallbrick, "skystone.brick.small" );
this.fluixStair = makeStairs( constructor, fluix, "fluix" );
this.quartzStair = makeStairs( constructor, quartz, "quartz.certus" );
this.chiseledQuartzStair = makeStairs( constructor, quartzChiseled, "quartz.certus.chiseled" );
this.quartzPillarStair = makeStairs( constructor, quartzPillar, "quartz.certus.pillar" );
this.skyStoneStair = this.makeStairs( constructor, this.skyStone_stone, "skystone.stone" );
this.skyStoneBlockStair = this.makeStairs( constructor, this.skyStone_block, "skystone.block" );
this.skyStoneBrickStair = this.makeStairs( constructor, this.skyStone_brick, "skystone.brick" );
this.skyStoneSmallBrickStair = this.makeStairs( constructor, this.skyStone_smallbrick, "skystone.brick.small" );
this.fluixStair = this.makeStairs( constructor, this.fluix, "fluix" );
this.quartzStair = this.makeStairs( constructor, this.quartz, "quartz.certus" );
this.chiseledQuartzStair = this.makeStairs( constructor, this.quartzChiseled, "quartz.certus.chiseled" );
this.quartzPillarStair = this.makeStairs( constructor, this.quartzPillar, "quartz.certus.pillar" );
// TODO Re-Add Slabs...
/*
src/main/java/appeng/core/features/ItemFeatureHandler.java
+1 -1
View File
@@ -97,7 +97,7 @@ public final class ItemFeatureHandler implements IFeatureHandler
if( side == Side.CLIENT )
{
CommonHelper.proxy.configureIcon( item, itemPhysicalName );
CommonHelper.proxy.configureIcon( this.item, itemPhysicalName );
}
}
}
src/main/java/appeng/core/sync/AppEngPacket.java
+3 -2
View File
@@ -93,12 +93,13 @@ public abstract class AppEngPacket implements Packet
PacketCallState caller;
public void setCallParam( final PacketCallState call ){caller = call;}
public void setCallParam( final PacketCallState call ){
this.caller = call;}
@Override
public void processPacket( final INetHandler handler)
{
caller.call(this);
this.caller.call( this );
}
}
src/main/java/appeng/core/sync/packets/PacketNEIRecipe.java
+1 -1
View File
@@ -218,7 +218,7 @@ public class PacketNEIRecipe extends AppEngPacket
// If that doesn't work, grab from the player's inventory
if( whichItem == null && playerInventory != null )
{
whichItem = extractItemFromPlayerInventory( player, realForFake, patternItem );
whichItem = this.extractItemFromPlayerInventory( player, realForFake, patternItem );
}
craftMatrix.setInventorySlotContents( x, whichItem );