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

Various Changes, Support for doMobSpawning, Overhauled CommonTickHandler #53

Merged
SenseiKiwi merged 7 commits from master into master 2013-07-26 19:38:46 +00:00
Conversation 0 Commits 7 Files Changed 32 +15 -3
1 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 960f9af1a8 - Show all commits

18
StevenDimDoors/mod_pocketDim/CommonTickHandler.java
View File

@@ -5,6 +5,8 @@ import java.util.EnumSet;
import java.util.Random; import java.util.Random;
import net.minecraft.entity.Entity; import net.minecraft.entity.Entity;
import net.minecraft.server.MinecraftServer;
import net.minecraft.world.GameRules;
import net.minecraft.world.World; 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;
@@ -23,7 +25,8 @@ public class CommonTickHandler implements ITickHandler
private static final Random rand = new Random(); 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 String label = "Dimensional Doors: Common Tick"; private static final String PROFILING_LABEL = "Dimensional Doors: Common Tick";
private static final String MOB_SPAWNING_RULE = "doMobSpawning";
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 private static final int RIFT_REGENERATION_INTERVAL = 100; //Regenerate random rifts every 100 ticks
@@ -49,7 +52,7 @@ public class CommonTickHandler implements ITickHandler
{ {
if (type.equals(EnumSet.of(TickType.SERVER))) if (type.equals(EnumSet.of(TickType.SERVER)))
{ {
if(!CommonTickHandler.chunksToPopulate.isEmpty()) if(!CommonTickHandler.chunksToPopulate.isEmpty() && IsMobSpawningAllowed())
{ {
//TODO: This is bad. =/ We should not be passing around arrays of magic numbers. //TODO: This is bad. =/ We should not be passing around arrays of magic numbers.
//We should have an object that contains this information. ~SenseiKiwi //We should have an object that contains this information. ~SenseiKiwi
@@ -80,7 +83,7 @@ public class CommonTickHandler implements ITickHandler
@Override @Override
public String getLabel() public String getLabel()
{ {
return label; //Used for profiling! return PROFILING_LABEL; //Used for profiling!
} }
private void placeMonolithsInPockets(int worldID, int chunkX, int chunkZ) private void placeMonolithsInPockets(int worldID, int chunkX, int chunkZ)
@@ -211,6 +214,15 @@ public class CommonTickHandler implements ITickHandler
while (yTest > y); while (yTest > y);
} }
} }
private static boolean IsMobSpawningAllowed()
{
//This function is used to retrieve the value of doMobSpawning. The code is the same
//as the code used by Minecraft. Jaitsu requested this to make testing easier. ~SenseiKiwi
GameRules rules = MinecraftServer.getServer().worldServerForDimension(0).getGameRules();
return rules.getGameRuleBooleanValue(MOB_SPAWNING_RULE);
}
private void onServerTick() private void onServerTick()
{ {