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

More stuff ingame and showing up.

Browse Source
This commit is contained in:
Sebastian Hartte
2020-06-01 01:01:32 +02:00
parent 6a88728544
commit 077ff17078
864 changed files with 11515 additions and 11761 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/appeng/decorative/solid/BlockChargedQuartzOre.java
+42 -45
View File
@@ -19,65 +19,63 @@
package appeng.decorative.solid;
import java.util.Random;
import appeng.client.render.effects.ChargedOreFX;
import appeng.core.AEConfig;
import appeng.core.AppEng;
import net.minecraft.block.BlockState;
import net.minecraft.client.Minecraft;
import net.minecraft.entity.player.PlayerEntity;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.RayTraceResult;
import net.minecraft.world.World;
import net.minecraftforge.api.distmarker.Dist;
import net.minecraftforge.api.distmarker.OnlyIn;
import appeng.api.AEApi;
import appeng.api.exceptions.MissingDefinitionException;
import appeng.client.render.effects.ChargedOreFX;
import appeng.core.AEConfig;
import appeng.core.AppEng;
import java.util.Random;
public class BlockChargedQuartzOre extends BlockQuartzOre
{
@Override
public Item getItemDropped( final BlockState state, final Random rand, final int fortune )
{
return AEApi.instance()
.definitions()
.materials()
.certusQuartzCrystalCharged()
.maybeItem()
.orElseThrow( () -> new MissingDefinitionException( "Tried to access charged certus quartz crystal, even though they are disabled" ) );
public BlockChargedQuartzOre(Properties props) {
super(props);
}
@Override
public int damageDropped( final BlockState state )
{
return AEApi.instance()
.definitions()
.materials()
.certusQuartzCrystalCharged()
.maybeStack( 1 )
.orElseThrow( () -> new MissingDefinitionException( "Tried to access charged certus quartz crystal, even though they are disabled" ) )
.getItemDamage();
}
@Override
public ItemStack getPickBlock( BlockState state, RayTraceResult target, World world, BlockPos pos, PlayerEntity player )
{
return AEApi.instance()
.definitions()
.blocks()
.quartzOreCharged()
.maybeStack( 1 )
.orElseThrow( () -> new MissingDefinitionException( "Tried to access charged certus quartz ore, even though they are disabled" ) );
}
// FIXME: Loot tables
// @Override
// public Item getItemDropped( final BlockState state, final Random rand, final int fortune )
// {
// return AEApi.instance()
// .definitions()
// .materials()
// .certusQuartzCrystalCharged()
// .maybeItem()
// .orElseThrow( () -> new MissingDefinitionException( "Tried to access charged certus quartz crystal, even though they are disabled" ) );
// }
//
// @Override
// public int damageDropped( final BlockState state )
// {
// return AEApi.instance()
// .definitions()
// .materials()
// .certusQuartzCrystalCharged()
// .maybeStack( 1 )
// .orElseThrow( () -> new MissingDefinitionException( "Tried to access charged certus quartz crystal, even though they are disabled" ) )
// .getItemDamage();
// }
//
// @Override
// public ItemStack getPickBlock( BlockState state, RayTraceResult target, World world, BlockPos pos, PlayerEntity player )
// {
// return AEApi.instance()
// .definitions()
// .blocks()
// .quartzOreCharged()
// .maybeStack( 1 )
// .orElseThrow( () -> new MissingDefinitionException( "Tried to access charged certus quartz ore, even though they are disabled" ) );
// }
@Override
@OnlyIn( Dist.CLIENT )
public void randomDisplayTick( final BlockState state, final World w, final BlockPos pos, final Random r )
public void animateTick( final BlockState state, final World w, final BlockPos pos, final Random r )
{
if( !AEConfig.instance().isEnableEffects() )
{
@@ -115,8 +113,7 @@ public class BlockChargedQuartzOre extends BlockQuartzOre
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.getInstance().effectRenderer.addEffect( fx );
Minecraft.getInstance().particles.addParticle(ChargedOreFX.TYPE, pos.getX() + xOff, pos.getY() + yOff, pos.getZ() + zOff, 0.0f, 0.0f, 0.0f);
}
}
}
src/main/java/appeng/decorative/solid/BlockQuartzLamp.java
+1 -1
View File
@@ -43,7 +43,7 @@ public class BlockQuartzLamp extends BlockQuartzGlass
@Override
@OnlyIn( Dist.CLIENT )
public void randomDisplayTick( final BlockState state, final World w, final BlockPos pos, final Random r )
public void animateTick( final BlockState state, final World w, final BlockPos pos, final Random r )
{
if( !AEConfig.instance().isEnableEffects() )
{
src/main/java/appeng/decorative/solid/BlockQuartzOre.java
+62 -78
View File
@@ -19,95 +19,79 @@
package appeng.decorative.solid;
import java.util.Random;
import net.minecraft.block.material.Material;
import appeng.block.AEBaseBlock;
import net.minecraft.block.BlockState;
import net.minecraft.item.Item;
import net.minecraft.util.BlockRenderLayer;
import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.MathHelper;
import net.minecraft.world.IBlockReader;
import net.minecraft.world.World;
import appeng.api.AEApi;
import appeng.api.exceptions.MissingDefinitionException;
import appeng.block.AEBaseBlock;
public class BlockQuartzOre extends AEBaseBlock
{
public BlockQuartzOre()
{
super( Material.ROCK );
this.setHardness( 3.0F );
this.setResistance( 5.0F );
public BlockQuartzOre(Properties props) {
super(props);
}
// FIXME @Override
// public BlockRenderLayer getBlockLayer()
// {
// return BlockRenderLayer.CUTOUT;
// }
// FIXME: Loot Tables
// @Override
// public int quantityDropped( BlockState state, int fortune, Random rand )
// {
// if( fortune > 0 && Item.getItemFromBlock( this ) != this.getItemDropped( null, rand, fortune ) )
// {
// int j = rand.nextInt( fortune + 2 ) - 1;
//
// if( j < 0 )
// {
// j = 0;
// }
//
// return this.quantityDropped( rand ) * ( j + 1 );
// }
// else
// {
// return this.quantityDropped( rand );
// }
// }
// @Override
// public int quantityDropped( final Random rand )
// {
// return 1 + rand.nextInt( 2 );
// }
//
@Override
public BlockRenderLayer getBlockLayer()
{
return BlockRenderLayer.CUTOUT;
public int getExpDrop(BlockState state, net.minecraft.world.IWorldReader reader, BlockPos pos, int fortune, int silktouch) {
return silktouch == 0 ? MathHelper.nextInt(RANDOM, 2, 5) : 0;
}
@Override
public int quantityDropped( BlockState state, int fortune, Random rand )
{
if( fortune > 0 && Item.getItemFromBlock( this ) != this.getItemDropped( null, rand, fortune ) )
{
int j = rand.nextInt( fortune + 2 ) - 1;
// FIXME: loot tables
// @Override
// public Item getItemDropped( final BlockState state, final Random rand, final int fortune )
// {
// return AEApi.instance()
// .definitions()
// .materials()
// .certusQuartzCrystal()
// .maybeItem()
// .orElseThrow( () -> new MissingDefinitionException( "Tried to access certus quartz crystal, even though they are disabled" ) );
// }
if( j < 0 )
{
j = 0;
}
return this.quantityDropped( rand ) * ( j + 1 );
}
else
{
return this.quantityDropped( rand );
}
}
@Override
public int quantityDropped( final Random rand )
{
return 1 + rand.nextInt( 2 );
}
@Override
public int getExpDrop( BlockState state, IBlockReader world, BlockPos pos, int fortune )
{
Random rand = world instanceof World ? ( (World) world ).rand : new Random();
if( this.getItemDropped( state, rand, fortune ) != Item.getItemFromBlock( this ) )
{
return MathHelper.getInt( rand, 2, 5 );
}
return super.getExpDrop( state, world, pos, fortune );
}
@Override
public Item getItemDropped( final BlockState state, final Random rand, final int fortune )
{
return AEApi.instance()
.definitions()
.materials()
.certusQuartzCrystal()
.maybeItem()
.orElseThrow( () -> new MissingDefinitionException( "Tried to access certus quartz crystal, even though they are disabled" ) );
}
@Override
public int damageDropped( final BlockState state )
{
return AEApi.instance()
.definitions()
.materials()
.certusQuartzCrystal()
.maybeStack( 1 )
.orElseThrow( () -> new MissingDefinitionException( "Tried to access certus quartz crystal, even though they are disabled" ) )
.getItemDamage();
}
// FIXME: loot tables
// @Override
// public int damageDropped( final BlockState state )
// {
// return AEApi.instance()
// .definitions()
// .materials()
// .certusQuartzCrystal()
// .maybeStack( 1 )
// .orElseThrow( () -> new MissingDefinitionException( "Tried to access certus quartz crystal, even though they are disabled" ) )
// .getItemDamage();
// }
}
src/main/java/appeng/decorative/solid/BlockSkyStone.java
+2 -3
View File
@@ -87,9 +87,8 @@ public class BlockSkyStone extends AEBaseBlock
}
@Override
public void breakBlock( final World w, final BlockPos pos, final BlockState state )
{
super.breakBlock( w, pos, state );
public void onReplaced(BlockState state, World w, BlockPos pos, BlockState newState, boolean isMoving) {
super.onReplaced(state, w, pos, newState, isMoving);
if( Platform.isServer() )
{