tilera/electrodynamics
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases Wiki Activity

Added basic animation and sound to block breaker

Browse source
This commit is contained in:
Robert S 2014-03-22 02:10:17 -04:00
parent 170f46b3a9
commit 620848f4e7
3 changed files with 58 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
mechanical/src/main/java/resonantinduction/mechanical/process/edit/TileBreaker.java
View file

@ -5,6 +5,7 @@ import java.util.ArrayList;
import net.minecraft.block.Block; import net.minecraft.block.Block;
import net.minecraft.block.material.Material; import net.minecraft.block.material.Material;
import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemBlock;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.network.packet.Packet; import net.minecraft.network.packet.Packet;
@ -98,19 +99,28 @@ public class TileBreaker extends TileBase implements IRotatable, IPacketReceiver
int candidateMeta = world().getBlockMetadata(check.intX(), check.intY(), check.intZ()); int candidateMeta = world().getBlockMetadata(check.intX(), check.intY(), check.intZ());
boolean flag = true; boolean flag = true;
//Get items dropped
ArrayList<ItemStack> drops = block.getBlockDropped(getWorldObj(), check.intX(), check.intY(), check.intZ(), candidateMeta, 0); ArrayList<ItemStack> drops = block.getBlockDropped(getWorldObj(), check.intX(), check.intY(), check.intZ(), candidateMeta, 0);
for (ItemStack stack : drops) for (ItemStack stack : drops)
{ {
//Insert into tile if one exists
ItemStack insert = stack.copy(); ItemStack insert = stack.copy();
insert = getInvHandler().storeItem(insert, this.getDirection().getOpposite()); insert = getInvHandler().storeItem(insert, this.getDirection().getOpposite());
//If not spit items into world
if (insert != null) if (insert != null)
{ {
getInvHandler().throwItem(this.getDirection().getOpposite(), insert); getInvHandler().throwItem(this.getDirection().getOpposite(), insert);
} }
} }
getWorldObj().destroyBlock(check.intX(), check.intY(), check.intZ(), false);
//Destroy block
ResonantInduction.proxy.renderBlockParticle(worldObj, check.intX(), check.intY(), check.intZ(), new Vector3((Math.random() - 0.5f) * 3, (Math.random() - 0.5f) * 3, (Math.random() - 0.5f) * 3), world().getBlockId(check.intX(), check.intY(), check.intZ()), 1);
getWorldObj().destroyBlock(check.intX(), check.intY(), check.intZ(), false);
getWorldObj().playAuxSFX(1012, check.intX(), check.intY(), check.intZ(), 0);
} }
} }
} }

80
src/main/java/resonantinduction/core/ClientProxy.java
View file

@ -11,50 +11,54 @@ import cpw.mods.fml.client.FMLClientHandler;
import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly; import cpw.mods.fml.relauncher.SideOnly;
/** /** @author Calclavia */
* @author Calclavia
*
*/
@SideOnly(Side.CLIENT) @SideOnly(Side.CLIENT)
public class ClientProxy extends CommonProxy public class ClientProxy extends CommonProxy
{ {
@Override @Override
public void preInit() public void preInit()
{ {
MinecraftForge.EVENT_BUS.register(SoundHandler.INSTANCE); MinecraftForge.EVENT_BUS.register(SoundHandler.INSTANCE);
} }
@Override @Override
public boolean isPaused() public boolean isPaused()
{ {
if (FMLClientHandler.instance().getClient().isSingleplayer() && !FMLClientHandler.instance().getClient().getIntegratedServer().getPublic()) if (FMLClientHandler.instance().getClient().isSingleplayer() && !FMLClientHandler.instance().getClient().getIntegratedServer().getPublic())
{ {
GuiScreen screen = FMLClientHandler.instance().getClient().currentScreen; GuiScreen screen = FMLClientHandler.instance().getClient().currentScreen;
if (screen != null) if (screen != null)
{ {
if (screen.doesGuiPauseGame()) if (screen.doesGuiPauseGame())
{ {
return true; return true;
} }
} }
} }
return false; return false;
} }
@Override @Override
public boolean isGraphicsFancy() public boolean isGraphicsFancy()
{ {
return FMLClientHandler.instance().getClient().gameSettings.fancyGraphics; return FMLClientHandler.instance().getClient().gameSettings.fancyGraphics;
} }
@Override
public void renderBlockParticle(World world, Vector3 position, Vector3 velocity, int blockID, float scale)
{
this.renderBlockParticle(world, position.x, position.y, position.z, velocity, blockID, scale);
}
@Override
public void renderBlockParticle(World world, double x, double y, double z, Vector3 velocity, int blockID, float scale)
{
EntityFX fx = new EntityDiggingFX(world, x, y, z, velocity.x, velocity.y, velocity.z, Block.blocksList[blockID], 0, 0);
fx.multipleParticleScaleBy(scale);
fx.noClip = true;
FMLClientHandler.instance().getClient().effectRenderer.addEffect(fx);
}
@Override
public void renderBlockParticle(World world, Vector3 position, Vector3 velocity, int blockID, float scale)
{
EntityFX fx = new EntityDiggingFX(world, position.x, position.y, position.z, velocity.x, velocity.y, velocity.z, Block.blocksList[blockID], 0, 0);
fx.multipleParticleScaleBy(scale);
fx.noClip = true;
FMLClientHandler.instance().getClient().effectRenderer.addEffect(fx);
}
} }

5
src/main/java/resonantinduction/core/CommonProxy.java
View file

@ -23,6 +23,11 @@ public class CommonProxy extends ProxyBase
return false; return false;
} }
public void renderBlockParticle(World world, double x, double y, double z, Vector3 velocity, int blockID, float scale)
{
}
public void renderBlockParticle(World world, Vector3 position, Vector3 velocity, int blockID, float scale) public void renderBlockParticle(World world, Vector3 position, Vector3 velocity, int blockID, float scale)
{ {