Anvilcraft/WarpDrive
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

A little cleaning

Browse source
This commit is contained in:
Francesco Macagno 2015-08-15 21:18:25 -07:00
parent 1e687cbf4c
commit 9b7d99c408
1 changed files with 33 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

68
src/main/java/cr0s/warpdrive/world/EntitySphereGen.java
View file

@ -44,31 +44,31 @@ public final class EntitySphereGen extends Entity {
public int xCoord;
public int yCoord;
public int zCoord;
private int radius;
private int gasColor;
private final int BLOCKS_PER_TICK = 5000;
private final int STATE_SAVING = 0;
private final int STATE_SETUP = 1;
private final int STATE_DELETE = 2;
private final int STATE_STOP = 3;
private int state = STATE_DELETE;
private int ticksDelay = 0;
private int currentIndex = 0;
private int pregenSize = 0;
private ArrayList<JumpBlock> blocks;
private int defaultMeta;
private Orb orb;
private boolean replace;
public EntitySphereGen(World world) {
super(world);
}
public EntitySphereGen(World world, int x, int y, int z, int radius, Orb orb, boolean replace) {
super(world);
this.xCoord = x;
@ -86,23 +86,23 @@ public final class EntitySphereGen extends Entity {
this.orb = orb;
this.replace = replace;
}
public void killEntity() {
this.state = STATE_STOP;
worldObj.removeEntity(this);
}
@Override
public void onUpdate() {
if (FMLCommonHandler.instance().getEffectiveSide().isClient()) {
return;
}
if (ticksDelay > 0) {
ticksDelay--;
return;
}
switch (this.state) {
case STATE_SAVING:
tickScheduleBlocks();
@ -120,13 +120,13 @@ public final class EntitySphereGen extends Entity {
break;
}
}
private void tickPlaceBlocks() {
int blocksToMove = Math.min(BLOCKS_PER_TICK, blocks.size() - currentIndex);
// LocalProfiler.start("[EntitySphereGen] Placing blocks: " +
// currentIndex + "/" + blocks.size());
int notifyFlag;
for (int index = 0; index < blocksToMove; index++) {
if (currentIndex >= blocks.size())
break;
@ -135,19 +135,17 @@ public final class EntitySphereGen extends Entity {
JumpBlock.setBlockNoLight(worldObj, jb.x, jb.y, jb.z, jb.block, jb.blockMeta, notifyFlag);
currentIndex++;
}
// LocalProfiler.stop();
}
private void tickScheduleBlocks() {
// LocalProfiler.start("EntitySphereGen.tickScheduleBlocks");
radius += 0.5D; // Radius from center of block
double radius1Sq = (radius - 1.0D) * (radius - 1.0D); // for hollow
// sphere
int ceilRadius = (int) Math.ceil(radius);
// Pass the cube and check points for sphere equation x^2 + y^2 + z^2 =
// r^2
// Pass the cube and check points for sphere equation x^2 + y^2 + z^2 = r^2
for (int x = 0; x <= ceilRadius; x++) {
double x2 = (x + 0.5D) * (x + 0.5D);
for (int y = 0; y <= ceilRadius; y++) {
@ -156,28 +154,28 @@ public final class EntitySphereGen extends Entity {
double z2 = (z + 0.5D) * (z + 0.5D);
double dSq = Math.sqrt(x2 + y2 + z2); // Distance from current position
// to center
// Skip too far blocks
if (dSq > radius)
continue;
int rad = (int) Math.ceil(dSq);
// Add blocks to memory
addBlock(new JumpBlock(orb.getBlockForRadius(rand, rad), defaultMeta, xCoord + x, yCoord + y, zCoord + z));
addBlock(new JumpBlock(orb.getBlockForRadius(rand, rad), defaultMeta, xCoord - x, yCoord + y, zCoord + z));
addBlock(new JumpBlock(orb.getBlockForRadius(rand, rad), defaultMeta, xCoord + x, yCoord - y, zCoord + z));
addBlock(new JumpBlock(orb.getBlockForRadius(rand, rad), defaultMeta, xCoord + x, yCoord + y, zCoord - z));
addBlock(new JumpBlock(orb.getBlockForRadius(rand, rad), defaultMeta, xCoord - x, yCoord - y, zCoord + z));
addBlock(new JumpBlock(orb.getBlockForRadius(rand, rad), defaultMeta, xCoord + x, yCoord - y, zCoord - z));
addBlock(new JumpBlock(orb.getBlockForRadius(rand, rad), defaultMeta, xCoord - x, yCoord + y, zCoord - z));
addBlock(new JumpBlock(orb.getBlockForRadius(rand, rad), defaultMeta, xCoord - x, yCoord - y, zCoord - z));
}
}
@ -187,7 +185,7 @@ public final class EntitySphereGen extends Entity {
}
// LocalProfiler.stop();
}
private void addBlock(JumpBlock jb) {
if (blocks == null)
return;
@ -205,19 +203,19 @@ public final class EntitySphereGen extends Entity {
return;
blocks.add(jb);
}
@Override
protected void readEntityFromNBT(NBTTagCompound tag) {
}
@Override
protected void entityInit() {
}
@Override
protected void writeEntityToNBT(NBTTagCompound tag) {
}
@Override
public boolean shouldRenderInPass(int pass) {
return false;