Anvilcraft/buildcraft
3
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Update to use proper forge chunkloading API

Browse source
This commit is contained in:
Christian 2012-09-25 23:12:24 -04:00
parent 8da16b8956
commit bb7da60425
2 changed files with 31 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
common/buildcraft/BuildCraftFactory.java
View file

@ -10,6 +10,8 @@ package buildcraft;
import java.util.List;
import com.google.common.collect.Lists;
import cpw.mods.fml.common.Mod;
import cpw.mods.fml.common.Mod.Init;
import cpw.mods.fml.common.Mod.Instance;
@ -85,10 +87,17 @@ public class BuildCraftFactory {
ForgeChunkManager.setForcedChunkLoadingCallback(instance,new QuarryChunkloadCallback());
}
public class QuarryChunkloadCallback implements ForgeChunkManager.LoadingCallback
public class QuarryChunkloadCallback implements ForgeChunkManager.OrderedLoadingCallback
{
@Override
public void ticketsLoaded(List<Ticket> tickets, World world) {
// NO OP for OrderedLoadingCallback
}
@Override
public List<Ticket> ticketsLoaded(List<Ticket> tickets, World world,
int maxTicketCount) {
List<Ticket> validTickets = Lists.newArrayList();
for (Ticket ticket : tickets)
{
int quarryX = ticket.getModData().getInteger("quarryX");
@ -100,8 +109,10 @@ public class BuildCraftFactory {
{
TileQuarry tq = (TileQuarry) world.getBlockTileEntity(quarryX, quarryY, quarryZ);
tq.forceChunkLoading(ticket);
validTickets.add(ticket);
}
}
return validTickets;
}
}

22
common/buildcraft/factory/TileQuarry.java
View file

@ -13,6 +13,7 @@ import java.util.ArrayList;
import java.util.List;
import cpw.mods.fml.common.FMLLog;
import cpw.mods.fml.common.network.PacketDispatcher;
import buildcraft.BuildCraftFactory;
import buildcraft.api.core.BuildCraftAPI;
@ -44,6 +45,7 @@ import net.minecraft.src.EntityItem;
import net.minecraft.src.EntityPlayer;
import net.minecraft.src.ItemStack;
import net.minecraft.src.NBTTagCompound;
import net.minecraft.src.Packet3Chat;
import net.minecraftforge.common.ForgeChunkManager;
import net.minecraftforge.common.ForgeChunkManager.Ticket;
import net.minecraftforge.common.ForgeChunkManager.Type;
@ -116,6 +118,7 @@ public class TileQuarry extends TileMachine implements IMachine, IPowerReceptor,
private boolean movingVertically;
private double headTrajectory;
private Ticket chunkTicket;
private boolean isAlive;
private void createArm() {
@ -134,6 +137,10 @@ public class TileQuarry extends TileMachine implements IMachine, IPowerReceptor,
@Override
public void updateEntity() {
if (!isAlive && CoreProxy.proxy.isSimulating(worldObj))
{
return;
}
super.updateEntity();
if (inProcess) {
float energyToUse = 2 + powerProvider.getEnergyStored() / 1000;
@ -464,7 +471,16 @@ public class TileQuarry extends TileMachine implements IMachine, IPowerReceptor,
}
private void setBoundaries(boolean useDefault) {
chunkTicket = ForgeChunkManager.requestTicket(BuildCraftFactory.instance, worldObj, Type.NORMAL);
if (chunkTicket == null)
{
chunkTicket = ForgeChunkManager.requestTicket(BuildCraftFactory.instance, worldObj, Type.NORMAL);
}
if (chunkTicket == null)
{
isAlive = false;
PacketDispatcher.sendPacketToAllPlayers(new Packet3Chat(String.format("[BUILDCRAFT] Chunkloading capabilities exhausted. The quarry at %d, %d, %d will not work. Remove some quarries!", xCoord, yCoord, zCoord)));
return;
}
chunkTicket.getModData().setInteger("quarryX", xCoord);
chunkTicket.getModData().setInteger("quarryY", yCoord);
chunkTicket.getModData().setInteger("quarryZ", zCoord);
@ -486,7 +502,7 @@ public class TileQuarry extends TileMachine implements IMachine, IPowerReceptor,
int ySize = a.yMax() - a.yMin() + 1;
int zSize = a.zMax() - a.zMin() + 1;
if (xSize < 3 || zSize < 3 || ((xSize * zSize) >> 4) >= chunkTicket.getMaxChunkListDepth())
if (xSize < 3 || zSize < 3 || ((xSize * zSize) >> 8) >= chunkTicket.getMaxChunkListDepth())
{
FMLLog.info("Quarry size is outside of bounds %d %d (%d)", xSize, zSize, chunkTicket.getMaxChunkListDepth());
a = new DefaultAreaProvider(xCoord, yCoord, zCoord, xCoord + 10, yCoord + 4, zCoord + 10);
@ -764,13 +780,13 @@ public class TileQuarry extends TileMachine implements IMachine, IPowerReceptor,
chunkTicket = ticket;
}
isAlive = true;
ForgeChunkManager.forceChunk(ticket, new ChunkCoordIntPair(xCoord >> 4, zCoord >> 4));
for (int chunkX = box.xMin >> 4; chunkX <= box.xMax >> 4; chunkX ++)
{
for (int chunkZ = box.zMin >> 4; chunkZ <= box.zMax >> 4; chunkZ ++)
{
FMLLog.info("Forcing chunk %d %d", chunkX, chunkZ);
ForgeChunkManager.forceChunk(ticket, new ChunkCoordIntPair(chunkX, chunkZ));
}
}