From 6f08c1f758d0e337c297af8fac69f2dad54c5f4e Mon Sep 17 00:00:00 2001 From: Daniel Mills Date: Wed, 4 Aug 2021 02:13:08 -0400 Subject: [PATCH] Actually gen --- .../iris/engine/framework/EngineAssignedWorldManager.java | 3 ++- .../iris/engine/framework/EngineParallaxManager.java | 7 ++++--- src/main/java/com/volmit/iris/util/math/Position2.java | 6 ++++++ 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/volmit/iris/engine/framework/EngineAssignedWorldManager.java b/src/main/java/com/volmit/iris/engine/framework/EngineAssignedWorldManager.java index eae3c9677..95735b097 100644 --- a/src/main/java/com/volmit/iris/engine/framework/EngineAssignedWorldManager.java +++ b/src/main/java/com/volmit/iris/engine/framework/EngineAssignedWorldManager.java @@ -31,6 +31,7 @@ import org.bukkit.event.EventHandler; import org.bukkit.event.Listener; import org.bukkit.event.block.BlockBreakEvent; import org.bukkit.event.block.BlockPlaceEvent; +import org.bukkit.event.entity.EntitySpawnEvent; import org.bukkit.event.entity.ProjectileLaunchEvent; import org.bukkit.event.world.ChunkLoadEvent; import org.bukkit.event.world.WorldSaveEvent; @@ -58,7 +59,7 @@ public abstract class EngineAssignedWorldManager extends EngineAssignedComponent } @EventHandler - public void on(ProjectileLaunchEvent e) { + public void on(EntitySpawnEvent e) { if (e.getEntity().getWorld().equals(getTarget().getWorld().realWorld())) { if(e.getEntityType().equals(EntityType.ENDER_SIGNAL)) { diff --git a/src/main/java/com/volmit/iris/engine/framework/EngineParallaxManager.java b/src/main/java/com/volmit/iris/engine/framework/EngineParallaxManager.java index 42d8abf5e..0cd2a006c 100644 --- a/src/main/java/com/volmit/iris/engine/framework/EngineParallaxManager.java +++ b/src/main/java/com/volmit/iris/engine/framework/EngineParallaxManager.java @@ -39,6 +39,7 @@ import com.volmit.iris.util.documentation.BlockCoordinates; import com.volmit.iris.util.documentation.ChunkCoordinates; import com.volmit.iris.util.format.Form; import com.volmit.iris.util.function.Consumer4; +import com.volmit.iris.util.math.Position2; import com.volmit.iris.util.math.RNG; import com.volmit.iris.util.scheduling.J; import com.volmit.iris.util.scheduling.PrecisionStopwatch; @@ -429,13 +430,13 @@ public interface EngineParallaxManager extends DataProvider, IObjectPlacer { boolean placed = false; if (getEngine().getDimension().getStronghold() != null) { - List poss = getEngine().getCompound().getStrongholdPositions(); + List poss = getEngine().getDimension().getStrongholds(getEngine().getWorld().seed()); if (poss != null) { - for (IrisPosition pos : poss) { + for (Position2 pos : poss) { if (x == pos.getX() >> 4 && z == pos.getZ() >> 4) { IrisJigsawStructure structure = getData().getJigsawStructureLoader().load(getEngine().getDimension().getStronghold()); - placeAfter.addAll(placeStructure(pos, structure, rng)); + placeAfter.addAll(placeStructure(pos.toIris(), structure, rng)); placed = true; } } diff --git a/src/main/java/com/volmit/iris/util/math/Position2.java b/src/main/java/com/volmit/iris/util/math/Position2.java index ffa22063d..d7b0d549e 100644 --- a/src/main/java/com/volmit/iris/util/math/Position2.java +++ b/src/main/java/com/volmit/iris/util/math/Position2.java @@ -18,6 +18,8 @@ package com.volmit.iris.util.math; +import com.volmit.iris.engine.object.IrisPosition; + public class Position2 { private int x; private int z; @@ -82,4 +84,8 @@ public class Position2 { public Position2 blockToChunk() { return new Position2(x >> 4, z >> 4); } + + public IrisPosition toIris() { + return new IrisPosition(x, 0, z); + } }