apex/DimDoors
1
1
Fork 0
Code Issues 26 Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed NPE in yCoordHelper, Other Bugs, Reimplemented Limbo Decay #52

Merged
SenseiKiwi merged 8 commits from 1.4.1fixes into master 2013-07-26 19:32:37 +00:00
Conversation 0 Commits 8 Files Changed 7 +92 -86
1 changed files with 92 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 9da6304dc9 - Show all commits

124
StevenDimDoors/mod_pocketDim/CommonTickHandler.java
View File

@@ -4,14 +4,11 @@ import java.util.ArrayList;
import java.util.EnumSet; import java.util.EnumSet;
import java.util.Random; import java.util.Random;
import net.minecraft.entity.Entity;
import net.minecraft.world.World;
import StevenDimDoors.mod_pocketDim.helpers.dimHelper; import StevenDimDoors.mod_pocketDim.helpers.dimHelper;
import StevenDimDoors.mod_pocketDim.helpers.yCoordHelper; import StevenDimDoors.mod_pocketDim.helpers.yCoordHelper;
import StevenDimDoors.mod_pocketDim.ticking.MobObelisk; import StevenDimDoors.mod_pocketDim.ticking.MobObelisk;
import net.minecraft.block.Block;
import net.minecraft.block.BlockContainer;
import net.minecraft.entity.Entity;
import net.minecraft.world.World;
import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.common.FMLCommonHandler;
import cpw.mods.fml.common.ITickHandler; import cpw.mods.fml.common.ITickHandler;
import cpw.mods.fml.common.TickType; import cpw.mods.fml.common.TickType;
@@ -19,15 +16,16 @@ import cpw.mods.fml.relauncher.Side;
public class CommonTickHandler implements ITickHandler public class CommonTickHandler implements ITickHandler
{ {
private Random rand = new Random(); private int tickCount = 0;
public int tickCount=0;
public int tickCount2=0;
private static DDProperties properties = null; private static DDProperties properties = null;
public static ArrayList<int[]> chunksToPopulate= new ArrayList<int[]>(); public static ArrayList<int[]> chunksToPopulate = new ArrayList<int[]>();
private static final Random rand = new Random();
public static final int MAX_MONOLITH_SPAWNING_CHANCE = 100; public static final int MAX_MONOLITH_SPAWNING_CHANCE = 100;
private static final int MAX_MONOLITH_SPAWN_Y = 245; private static final int MAX_MONOLITH_SPAWN_Y = 245;
private static final int CHUNK_SIZE = 16; private static final int CHUNK_SIZE = 16;
private static final int RIFT_REGENERATION_INTERVAL = 100; //Regenerate random rifts every 100 ticks
public CommonTickHandler() public CommonTickHandler()
{ {
@@ -40,7 +38,7 @@ public class CommonTickHandler implements ITickHandler
{ {
if (type.equals(EnumSet.of(TickType.SERVER))) if (type.equals(EnumSet.of(TickType.SERVER)))
{ {
onTickInGame(); onServerTick();
} }
} }
@@ -51,9 +49,12 @@ public class CommonTickHandler implements ITickHandler
{ {
if(!CommonTickHandler.chunksToPopulate.isEmpty()) if(!CommonTickHandler.chunksToPopulate.isEmpty())
{ {
for(int[] chunkData : CommonTickHandler.chunksToPopulate) //TODO: This is bad. =/ We should not be passing around arrays of magic numbers.
//We should have an object that contains this information. ~SenseiKiwi
for (int[] chunkData : CommonTickHandler.chunksToPopulate)
{ {
if(chunkData[0]==properties.LimboDimensionID) if(chunkData[0] == properties.LimboDimensionID)
{ {
this.placeMonolithsInLimbo(chunkData[0], chunkData[1], chunkData[2]); this.placeMonolithsInLimbo(chunkData[0], chunkData[1], chunkData[2]);
} }
@@ -68,11 +69,13 @@ public class CommonTickHandler implements ITickHandler
} }
} }
public EnumSet ticks() @Override
public EnumSet<TickType> ticks()
{ {
return EnumSet.of(TickType.SERVER); return EnumSet.of(TickType.SERVER);
} }
@Override
public String getLabel() public String getLabel()
{ {
return null; return null;
@@ -82,23 +85,23 @@ public class CommonTickHandler implements ITickHandler
{ {
World worldObj = dimHelper.getWorld(worldID); World worldObj = dimHelper.getWorld(worldID);
DimData dimData = dimHelper.dimList.get(worldObj.provider.dimensionId); DimData dimData = dimHelper.dimList.get(worldObj.provider.dimensionId);
int sanity = 0; int sanity = 0;
int blockID = 0; int blockID = 0;
boolean didSpawn=false; boolean didSpawn=false;
if (dimData == null || if (dimData == null ||
dimData.dungeonGenerator == null || dimData.dungeonGenerator == null ||
dimData.dungeonGenerator.isOpen) dimData.dungeonGenerator.isOpen)
{ {
return; return;
} }
//The following initialization code is based on code from ChunkProviderGenerate. //The following initialization code is based on code from ChunkProviderGenerate.
//It makes our generation depend on the world seed. //It makes our generation depend on the world seed.
Random random = new Random(worldObj.getSeed()); Random random = new Random(worldObj.getSeed());
long factorA = random.nextLong() / 2L * 2L + 1L; long factorA = random.nextLong() / 2L * 2L + 1L;
long factorB = random.nextLong() / 2L * 2L + 1L; long factorB = random.nextLong() / 2L * 2L + 1L;
random.setSeed((long)chunkX * factorA + (long)chunkZ * factorB ^ worldObj.getSeed()); random.setSeed(chunkX * factorA + chunkZ * factorB ^ worldObj.getSeed());
int x, y, z; int x, y, z;
do do
@@ -207,40 +210,53 @@ public class CommonTickHandler implements ITickHandler
} }
} }
private void onTickInGame() private void onServerTick()
{
tickCount++; //There is no need to reset the counter. Let it overflow.
if (tickCount % RIFT_REGENERATION_INTERVAL == 0)
{
regenerateRifts();
}
if (mod_pocketDim.teleTimer > 0)
{
mod_pocketDim.teleTimer--;
}
}
private void regenerateRifts()
{ {
try try
{ {
//Replace rifts that have been replaced (not permanently removed) by players //Replace rifts that have been replaced (not permanently removed) by players
if (tickCount > 100)
int i = 0;
while (i < 15 && FMLCommonHandler.instance().getEffectiveSide() == Side.SERVER)
{ {
tickCount = 0; i++;
int i = 0; LinkData link;
while (i < 15 && FMLCommonHandler.instance().getEffectiveSide() == Side.SERVER) //actually gets the random rift based on the size of the list
link = (LinkData) dimHelper.instance.getRandomLinkData(true);
if(link!=null)
{ {
i++;
LinkData link;
//actually gets the random rift based on the size of the list if (dimHelper.getWorld(link.locDimID)!=null)
link = (LinkData) dimHelper.instance.getRandomLinkData(true);
if(link!=null)
{ {
World world = dimHelper.getWorld(link.locDimID);
if(dimHelper.getWorld(link.locDimID)!=null) int blocktoReplace = world.getBlockId(link.locXCoord, link.locYCoord, link.locZCoord);
if(!mod_pocketDim.blocksImmuneToRift.contains(blocktoReplace))//makes sure the rift doesn't replace a door or something
{ {
World world=dimHelper.getWorld(link.locDimID); if(dimHelper.instance.getLinkDataFromCoords(link.locXCoord, link.locYCoord, link.locZCoord, link.locDimID) != null)
int blocktoReplace = world.getBlockId(link.locXCoord, link.locYCoord, link.locZCoord);
if(!mod_pocketDim.blocksImmuneToRift.contains(blocktoReplace))//makes sure the rift doesn't replace a door or something
{ {
if(dimHelper.instance.getLinkDataFromCoords(link.locXCoord, link.locYCoord, link.locZCoord, link.locDimID) != null) dimHelper.getWorld(link.locDimID).setBlock(link.locXCoord, link.locYCoord, link.locZCoord, properties.RiftBlockID);
{ TileEntityRift.class.cast(dimHelper.getWorld(link.locDimID).getBlockTileEntity(link.locXCoord, link.locYCoord, link.locZCoord)).hasGrownRifts=true;
dimHelper.getWorld(link.locDimID).setBlock(link.locXCoord, link.locYCoord, link.locZCoord, properties.RiftBlockID);
TileEntityRift.class.cast(dimHelper.getWorld(link.locDimID).getBlockTileEntity(link.locXCoord, link.locYCoord, link.locZCoord)).hasGrownRifts=true;
}
} }
} }
} }
@@ -249,18 +265,8 @@ public class CommonTickHandler implements ITickHandler
} }
catch (Exception e) catch (Exception e)
{ {
System.out.println("An exception occurred in CommonTickHandler.onGameTick():"); System.out.println("An exception occurred in CommonTickHandler.onServerTick():");
e.printStackTrace(); e.printStackTrace();
} }
finally
{
tickCount++;
}
if (mod_pocketDim.teleTimer > 0)
{
mod_pocketDim.teleTimer--;
}
} }
} }