From 4fea28b313aa6b481ae20e4aaf8cd82088d42020 Mon Sep 17 00:00:00 2001 From: Brian Fopiano Date: Thu, 30 Dec 2021 19:55:31 -0800 Subject: [PATCH 1/2] This maked a moddable energy maximum, its default is the same Imma just push it --- src/main/java/com/volmit/iris/engine/IrisWorldManager.java | 3 ++- .../java/com/volmit/iris/engine/object/IrisDimension.java | 4 ++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/volmit/iris/engine/IrisWorldManager.java b/src/main/java/com/volmit/iris/engine/IrisWorldManager.java index 0dc5719b8..9e283cdeb 100644 --- a/src/main/java/com/volmit/iris/engine/IrisWorldManager.java +++ b/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) { diff --git a/src/main/java/com/volmit/iris/engine/object/IrisDimension.java b/src/main/java/com/volmit/iris/engine/object/IrisDimension.java index 7c68c0784..f0129e226 100644 --- a/src/main/java/com/volmit/iris/engine/object/IrisDimension.java +++ b/src/main/java/com/volmit/iris/engine/object/IrisDimension.java @@ -211,6 +211,10 @@ public class IrisDimension extends IrisRegistrant { private KList 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") From 21f1ecfa157a8c195066bf732d86cf27c97c96fb Mon Sep 17 00:00:00 2001 From: Brian Fopiano Date: Sun, 2 Jan 2022 16:21:59 -0800 Subject: [PATCH 2/2] make it debug but hide error for entities --- src/main/java/com/volmit/iris/engine/object/IrisEntitySpawn.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/com/volmit/iris/engine/object/IrisEntitySpawn.java b/src/main/java/com/volmit/iris/engine/object/IrisEntitySpawn.java index 92b06ef2d..85fc4286c 100644 --- a/src/main/java/com/volmit/iris/engine/object/IrisEntitySpawn.java +++ b/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; }