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

Fixes for formation plane, also enabled fireworks to be shot using it.

Browse Source
This commit is contained in:
AlgorithmX2
2014-06-29 21:03:00 -05:00
parent 2c77242667
commit a5a92af74a
1 changed files with 39 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
parts/automation/PartFormationPlane.java
+39 -10
View File
@@ -4,6 +4,7 @@ import java.util.ArrayList;
import java.util.List; import java.util.List;
import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.client.renderer.RenderBlocks;
import net.minecraft.entity.Entity;
import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.item.EntityItem;
import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.inventory.IInventory; import net.minecraft.inventory.IInventory;
@@ -390,6 +391,16 @@ public class PartFormationPlane extends PartUpgradeable implements ICellContaine
EntityPlayer player = Platform.getPlayer( (WorldServer) w ); EntityPlayer player = Platform.getPlayer( (WorldServer) w );
Platform.configurePlayer( player, side, tile ); Platform.configurePlayer( player, side, tile );
if ( i instanceof ItemFirework )
{
Chunk c = w.getChunkFromBlockCoords( x, z );
int sum = 0;
for (List Z : c.entityLists)
sum += Z.size();
if ( sum > 32 )
return input;
}
maxStorage = is.stackSize; maxStorage = is.stackSize;
worked = true; worked = true;
if ( type == Actionable.MODULATE ) if ( type == Actionable.MODULATE )
@@ -435,21 +446,39 @@ public class PartFormationPlane extends PartUpgradeable implements ICellContaine
{ {
if ( type == Actionable.MODULATE ) if ( type == Actionable.MODULATE )
{ {
is.stackSize = (int) maxStorage; is.stackSize = (int) maxStorage;
if ( type == Actionable.MODULATE ) EntityItem ei = new EntityItem( w, // w
((side.offsetX != 0 ? 0.0 : 0.7) * (Platform.getRandomFloat() - 0.5f)) + 0.5 + side.offsetX * -0.3 + (double) x, // spawn
((side.offsetY != 0 ? 0.0 : 0.7) * (Platform.getRandomFloat() - 0.5f)) + 0.5 + side.offsetY * -0.3 + (double) y, // spawn
((side.offsetZ != 0 ? 0.0 : 0.7) * (Platform.getRandomFloat() - 0.5f)) + 0.5 + side.offsetZ * -0.3 + (double) z, // spawn
is.copy() );
Entity result = ei;
ei.motionX = side.offsetX * 0.2;
ei.motionY = side.offsetY * 0.2;
ei.motionZ = side.offsetZ * 0.2;
if ( is.getItem().hasCustomEntity( is ) )
{ {
EntityItem ei = new EntityItem( w, // w result = is.getItem().createEntity( w, ei, is );
((side.offsetX != 0 ? 0.0 : 0.7) * (Platform.getRandomFloat() - 0.5f)) + 0.5 + side.offsetX * -0.3 + (double) x, // spawn if ( result != null )
((side.offsetY != 0 ? 0.0 : 0.7) * (Platform.getRandomFloat() - 0.5f)) + 0.5 + side.offsetY * -0.3 + (double) y, // spawn ei.setDead();
((side.offsetZ != 0 ? 0.0 : 0.7) * (Platform.getRandomFloat() - 0.5f)) + 0.5 + side.offsetZ * -0.3 + (double) z, // spawn else
is.copy() ); result = ei;
ei.motionX = side.offsetX * 0.2;
ei.motionY = side.offsetY * 0.2;
ei.motionZ = side.offsetZ * 0.2;
w.spawnEntityInWorld( ei );
} }
if ( !w.spawnEntityInWorld( result ) )
{
result.setDead();
worked = false;
}
} }
} }
else
worked = false;
} }
} }