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/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 );
}