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

Port to 1.11

Browse Source
This commit is contained in:
yueh
2016-12-08 12:42:00 +01:00
parent 589730bfad
commit ed9e6dd21c
262 changed files with 4027 additions and 3954 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/appeng/decorative/solid/BlockChargedQuartzOre.java
+2 -2
View File
@@ -33,7 +33,7 @@ import appeng.api.AEApi;
import appeng.api.exceptions.MissingDefinition;
import appeng.client.render.effects.ChargedOreFX;
import appeng.core.AEConfig;
import appeng.core.CommonHelper;
import appeng.core.AppEng;
public final class BlockChargedQuartzOre extends BlockQuartzOre
@@ -98,7 +98,7 @@ public final class BlockChargedQuartzOre extends BlockQuartzOre
break;
}
if( CommonHelper.proxy.shouldAddParticles( r ) )
if( AppEng.proxy.shouldAddParticles( r ) )
{
final ChargedOreFX fx = new ChargedOreFX( w, pos.getX() + xOff, pos.getY() + yOff, pos.getZ() + zOff, 0.0f, 0.0f, 0.0f );
Minecraft.getMinecraft().effectRenderer.addEffect( fx );
src/main/java/appeng/decorative/solid/BlockQuartzLamp.java
+2 -2
View File
@@ -30,7 +30,7 @@ import net.minecraftforge.fml.relauncher.SideOnly;
import appeng.client.render.effects.VibrantFX;
import appeng.core.AEConfig;
import appeng.core.CommonHelper;
import appeng.core.AppEng;
public class BlockQuartzLamp extends BlockQuartzGlass
@@ -50,7 +50,7 @@ public class BlockQuartzLamp extends BlockQuartzGlass
return;
}
if( CommonHelper.proxy.shouldAddParticles( r ) )
if( AppEng.proxy.shouldAddParticles( r ) )
{
final double d0 = ( r.nextFloat() - 0.5F ) * 0.96D;
final double d1 = ( r.nextFloat() - 0.5F ) * 0.96D;
src/main/java/appeng/decorative/solid/BlockQuartzOre.java
+1 -1
View File
@@ -104,7 +104,7 @@ public class BlockQuartzOre extends AEBaseBlock
if( this.getItemDropped( state, w.rand, fortune ) != Item.getItemFromBlock( this ) )
{
final int xp = MathHelper.getRandomIntegerInRange( w.rand, 2, 5 );
final int xp = MathHelper.getInt( w.rand, 2, 5 );
this.dropXpOnBlockBreak( w, pos, xp );
}
src/main/java/appeng/decorative/solid/BlockSkyStone.java
+1 -1
View File
@@ -66,7 +66,7 @@ public class BlockSkyStone extends AEBaseBlock
if( is != null && is.getItem() != null )
{
level = is.getItem().getHarvestLevel( is, "pickaxe" );
level = is.getItem().getHarvestLevel( is, "pickaxe", event.getEntityPlayer(), event.getState() );
}
if( this.type != SkystoneType.STONE || level >= 3 || event.getOriginalSpeed() > BREAK_SPEAK_THRESHOLD )