Merge pull request #703 from VolmitSoftware/master

Merge

src/main/java/com/volmit/iris/engine/IrisWorldManager.java

@@ -139,6 +139,7 @@ public class IrisWorldManager extends EngineAssignedWorldManager {
                         updateChunks();
                     }
 
+
                     if (getDimension().isInfiniteEnergy()) {
                         energy += 1000;
                         fixEnergy();
@@ -285,7 +286,7 @@ public class IrisWorldManager extends EngineAssignedWorldManager {
     }
 
     private void fixEnergy() {
-        energy = M.clip(energy, 1D, 1000D);
+        energy = M.clip(energy, 1D, getDimension().getMaximumEnergy());
     }
 
     private void spawnIn(Chunk c, boolean initial) {

src/main/java/com/volmit/iris/engine/object/IrisDimension.java

@@ -211,6 +211,10 @@ public class IrisDimension extends IrisRegistrant {
     private KList<IrisShapedGeneratorStyle> overlayNoise = new KList<>();
     @Desc("If true, the spawner system has infinite energy. This is NOT recommended because it would allow for mobs to keep spawning over and over without a rate limit")
     private boolean infiniteEnergy = false;
+    @MinNumber(0)
+    @MaxNumber(10000)
+    @Desc("This is the maximum energy you can have in a dimension")
+    private double maximumEnergy = 1000;
     @MinNumber(0.0001)
     @MaxNumber(512)
     @Desc("The rock zoom mostly for zooming in on a wispy palette")

src/main/java/com/volmit/iris/engine/object/IrisEntitySpawn.java

@@ -161,6 +161,7 @@ public class IrisEntitySpawn implements IRare {
         try {
             IrisEntity irisEntity = getRealEntity(g);
             if(irisEntity == null){ // No entity
+                Iris.debug("      You are trying to spawn an entity that does not exist!");
                 return null;
             }