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

Basic reformat, hit once, hope never again

Browse Source
This commit is contained in:
thatsIch
2015-04-03 08:54:31 +02:00
parent 4ff1631f89
commit d34c988c88
886 changed files with 31400 additions and 30990 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/appeng/fmp/FMPEvent.java
+33 -34
View File
@@ -18,6 +18,7 @@
package appeng.fmp;
import net.minecraft.block.Block;
import net.minecraft.block.BlockFence;
import net.minecraft.entity.player.EntityPlayer;
@@ -44,6 +45,7 @@ import appeng.core.sync.network.NetworkHandler;
import appeng.core.sync.packets.PacketMultiPart;
import appeng.integration.modules.helpers.FMPPacketEvent;
/**
* Basically a total rip of of the FMP version for vanilla, seemed to work well enough...
*/
@@ -53,29 +55,15 @@ public class FMPEvent
private final ThreadLocal<Object> placing = new ThreadLocal<Object>();
@SubscribeEvent
public void ServerFMPEvent(FMPPacketEvent event)
public void ServerFMPEvent( FMPPacketEvent event )
{
FMPEvent.place( event.sender, event.sender.worldObj );
}
@SubscribeEvent
public void playerInteract(PlayerInteractEvent event)
{
if ( event.action == Action.RIGHT_CLICK_BLOCK && event.entityPlayer.worldObj.isRemote )
{
if ( this.placing.get() != null )
return;
this.placing.set( event );
if ( place( event.entityPlayer, event.entityPlayer.worldObj ) )
event.setCanceled( true );
this.placing.set( null );
}
}
public static boolean place(EntityPlayer player, World world)
public static boolean place( EntityPlayer player, World world )
{
MovingObjectPosition hit = RayTracer.reTrace( world, player );
if ( hit == null )
if( hit == null )
return false;
BlockCoord pos = new BlockCoord( hit.blockX, hit.blockY, hit.blockZ ).offset( hit.sideHit );
@@ -84,47 +72,44 @@ public class FMPEvent
Block blk = null;
if ( held == null )
if( held == null )
return false;
if ( held.getItem() instanceof AEBaseItemBlock )
if( held.getItem() instanceof AEBaseItemBlock )
{
AEBaseItemBlock ib = (AEBaseItemBlock) held.getItem();
blk = Block.getBlockFromItem( ib );
part = PartRegistry.getPartByBlock( blk, hit.sideHit );
}
if ( part == null )
if( part == null )
return false;
if ( world.isRemote && !player.isSneaking() )// attempt to use block activated like normal and tell the server
// the right stuff
if( world.isRemote && !player.isSneaking() )// attempt to use block activated like normal and tell the server
// the right stuff
{
Vector3 f = new Vector3( hit.hitVec ).add( -hit.blockX, -hit.blockY, -hit.blockZ );
Block block = world.getBlock( hit.blockX, hit.blockY, hit.blockZ );
if ( block != null && !ignoreActivate( block )
&& block.onBlockActivated( world, hit.blockX, hit.blockY, hit.blockZ, player, hit.sideHit, (float) f.x, (float) f.y, (float) f.z ) )
if( block != null && !ignoreActivate( block ) && block.onBlockActivated( world, hit.blockX, hit.blockY, hit.blockZ, player, hit.sideHit, (float) f.x, (float) f.y, (float) f.z ) )
{
player.swingItem();
PacketCustom.sendToServer( new C08PacketPlayerBlockPlacement( hit.blockX, hit.blockY, hit.blockZ, hit.sideHit, player.inventory
.getCurrentItem(), (float) f.x, (float) f.y, (float) f.z ) );
PacketCustom.sendToServer( new C08PacketPlayerBlockPlacement( hit.blockX, hit.blockY, hit.blockZ, hit.sideHit, player.inventory.getCurrentItem(), (float) f.x, (float) f.y, (float) f.z ) );
return true;
}
}
TileMultipart tile = TileMultipart.getOrConvertTile( world, pos );
if ( tile == null || !tile.canAddPart( part ) )
if( tile == null || !tile.canAddPart( part ) )
return false;
if ( !world.isRemote )
if( !world.isRemote )
{
TileMultipart.addPart( world, pos, part );
world.playSoundEffect( pos.x + 0.5, pos.y + 0.5, pos.z + 0.5, blk.stepSound.func_150496_b(), (blk.stepSound.getVolume() + 1.0F) / 2.0F,
blk.stepSound.getPitch() * 0.8F );
if ( !player.capabilities.isCreativeMode )
world.playSoundEffect( pos.x + 0.5, pos.y + 0.5, pos.z + 0.5, blk.stepSound.func_150496_b(), ( blk.stepSound.getVolume() + 1.0F ) / 2.0F, blk.stepSound.getPitch() * 0.8F );
if( !player.capabilities.isCreativeMode )
{
held.stackSize--;
if ( held.stackSize == 0 )
if( held.stackSize == 0 )
{
player.inventory.mainInventory[player.inventory.currentItem] = null;
MinecraftForge.EVENT_BUS.post( new PlayerDestroyItemEvent( player, held ) );
@@ -142,10 +127,24 @@ public class FMPEvent
/**
* Because vanilla is weird.
*/
private static boolean ignoreActivate(Block block)
private static boolean ignoreActivate( Block block )
{
if ( block instanceof BlockFence )
if( block instanceof BlockFence )
return true;
return false;
}
@SubscribeEvent
public void playerInteract( PlayerInteractEvent event )
{
if( event.action == Action.RIGHT_CLICK_BLOCK && event.entityPlayer.worldObj.isRemote )
{
if( this.placing.get() != null )
return;
this.placing.set( event );
if( place( event.entityPlayer, event.entityPlayer.worldObj ) )
event.setCanceled( true );
this.placing.set( null );
}
}
}