From c95ea19da10aa6d0a438fc986555aad0deebffe7 Mon Sep 17 00:00:00 2001 From: Daniel Mills Date: Mon, 9 Aug 2021 01:15:37 -0400 Subject: [PATCH] Fix typing for goto --- .../com/volmit/iris/engine/framework/Engine.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/volmit/iris/engine/framework/Engine.java b/src/main/java/com/volmit/iris/engine/framework/Engine.java index 40537d142..b816573c6 100644 --- a/src/main/java/com/volmit/iris/engine/framework/Engine.java +++ b/src/main/java/com/volmit/iris/engine/framework/Engine.java @@ -498,7 +498,7 @@ public interface Engine extends DataProvider, Fallible, GeneratorAccess, LootPro return r.get(); } - default Location lookForBiome(IrisBiome biome, long timeout, Consumer triesc) { + default IrisPosition lookForBiome(IrisBiome biome, long timeout, Consumer triesc) { if (!getWorld().hasRealWorld()) { Iris.error("Cannot GOTO without a bound world (headless mode)"); return null; @@ -515,7 +515,7 @@ public interface Engine extends DataProvider, Fallible, GeneratorAccess, LootPro AtomicInteger tries = new AtomicInteger(0); AtomicBoolean found = new AtomicBoolean(false); AtomicBoolean running = new AtomicBoolean(true); - AtomicReference location = new AtomicReference<>(); + AtomicReference location = new AtomicReference<>(); for (int i = 0; i < cpus; i++) { J.a(() -> { try { @@ -535,7 +535,7 @@ public interface Engine extends DataProvider, Fallible, GeneratorAccess, LootPro if (b != null && b.getLoadKey().equals(biome.getLoadKey())) { found.lazySet(true); - location.lazySet(new Location(getWorld().realWorld(), x, getHeight(x, z), z)); + location.lazySet(new IrisPosition(x, getHeight(x, z), z)); } tries.getAndIncrement(); @@ -569,7 +569,7 @@ public interface Engine extends DataProvider, Fallible, GeneratorAccess, LootPro return location.get(); } - default Location lookForRegion(IrisRegion reg, long timeout, Consumer triesc) { + default IrisPosition lookForRegion(IrisRegion reg, long timeout, Consumer triesc) { if (getWorld().hasRealWorld()) { Iris.error("Cannot GOTO without a bound world (headless mode)"); return null; @@ -586,7 +586,7 @@ public interface Engine extends DataProvider, Fallible, GeneratorAccess, LootPro AtomicInteger tries = new AtomicInteger(0); AtomicBoolean found = new AtomicBoolean(false); AtomicBoolean running = new AtomicBoolean(true); - AtomicReference location = new AtomicReference<>(); + AtomicReference location = new AtomicReference<>(); for (int i = 0; i < cpus; i++) { J.a(() -> { @@ -602,7 +602,7 @@ public interface Engine extends DataProvider, Fallible, GeneratorAccess, LootPro if (b != null && b.getLoadKey() != null && b.getLoadKey().equals(reg.getLoadKey())) { found.lazySet(true); - location.lazySet(new Location(getWorld().realWorld(), x, getHeight(x, z), z)); + location.lazySet(new IrisPosition(x, getHeight(x, z), z)); } tries.getAndIncrement();