diff --git a/build.gradle b/build.gradle index a9967414b..0e160be5d 100644 --- a/build.gradle +++ b/build.gradle @@ -34,7 +34,7 @@ plugins { } group 'com.volmit.iris' -version '1.6.8-Dangerously-Unstable-Seriously-Im-Warning-You-I-Dare-You-I-Double-Dare-You-Just-Do-It-You-Wont' +version '1.7' def apiVersion = '1.17' def name = getRootProject().getName() // See settings.gradle def main = 'com.volmit.iris.Iris' diff --git a/src/main/java/com/volmit/iris/Iris.java b/src/main/java/com/volmit/iris/Iris.java index 40576bddd..7be139290 100644 --- a/src/main/java/com/volmit/iris/Iris.java +++ b/src/main/java/com/volmit/iris/Iris.java @@ -85,7 +85,7 @@ public class Iris extends VolmitPlugin implements Listener { public static ConversionManager convert; public static WandManager wand; public static EditManager edit; - public static IrisBoardManager board; + public static BoardManager board; public static MultiverseCoreLink linkMultiverseCore; public static OraxenLink linkOraxen; public static MythicMobsLink linkMythicMobs; @@ -121,7 +121,7 @@ public class Iris extends VolmitPlugin implements Listener { proj = new ProjectManager(); convert = new ConversionManager(); wand = new WandManager(); - board = new IrisBoardManager(); + board = new BoardManager(); linkMultiverseCore = new MultiverseCoreLink(); linkOraxen = new OraxenLink(); linkMythicMobs = new MythicMobsLink(); diff --git a/src/main/java/com/volmit/iris/core/IrisBoardManager.java b/src/main/java/com/volmit/iris/core/BoardManager.java similarity index 91% rename from src/main/java/com/volmit/iris/core/IrisBoardManager.java rename to src/main/java/com/volmit/iris/core/BoardManager.java index 16bb7e6ab..40df2bcd4 100644 --- a/src/main/java/com/volmit/iris/core/IrisBoardManager.java +++ b/src/main/java/com/volmit/iris/core/BoardManager.java @@ -22,7 +22,6 @@ import com.volmit.iris.Iris; import com.volmit.iris.core.tools.IrisToolbelt; import com.volmit.iris.engine.framework.Engine; import com.volmit.iris.engine.object.feature.IrisFeaturePositional; -import com.volmit.iris.util.board.BoardManager; import com.volmit.iris.util.board.BoardProvider; import com.volmit.iris.util.board.BoardSettings; import com.volmit.iris.util.board.ScoreDirection; @@ -44,20 +43,20 @@ import org.bukkit.event.player.PlayerChangedWorldEvent; import java.util.List; -public class IrisBoardManager implements BoardProvider, Listener { +public class BoardManager implements BoardProvider, Listener { private final BossBar energyBar; - private final BoardManager manager; + private final com.volmit.iris.util.board.BoardManager manager; private String mem = "..."; public final RollingSequence hits = new RollingSequence(20); public final RollingSequence tp = new RollingSequence(100); private final ChronoLatch cl = new ChronoLatch(1000); private final ChronoLatch ecl = new ChronoLatch(50); - public IrisBoardManager() { + public BoardManager() { Iris.instance.registerListener(this); //@builder - manager = new BoardManager(Iris.instance, BoardSettings.builder() + manager = new com.volmit.iris.util.board.BoardManager(Iris.instance, BoardSettings.builder() .boardProvider(this) .scoreDirection(ScoreDirection.DOWN) .build()); @@ -104,7 +103,6 @@ public class IrisBoardManager implements BoardProvider, Listener { Engine engine = IrisToolbelt.access(player.getWorld()).getEngine(); if (cl.flip()) { - // TODO MEMORY mem = Form.memSize(0, 2); } @@ -127,11 +125,11 @@ public class IrisBoardManager implements BoardProvider, Listener { memoryGuess += parallaxChunks * 3500L; memoryGuess += parallaxRegions * 1700000L; - tp.put(0); // TODO: CHUNK SPEED + tp.put(engine.getGeneratedPerSecond()); v.add("&7&m------------------"); - v.add(C.GREEN + "Speed" + C.GRAY + ": " + Form.f(engine.getGeneratedPerSecond(), 0) + "/s " + Form.duration(1000D / engine.getGeneratedPerSecond(), 0)); + v.add(C.GREEN + "Speed" + C.GRAY + ": " + Form.f(tp.getAverage(), 0) + "/s " + Form.duration(1000D / engine.getGeneratedPerSecond(), 0)); v.add(C.GREEN + "Memory Use" + C.GRAY + ": ~" + Form.memSize(memoryGuess, 0)); if (engine != null) { diff --git a/src/main/java/com/volmit/iris/util/mantle/Mantle.java b/src/main/java/com/volmit/iris/util/mantle/Mantle.java index 9f6eef567..387c82199 100644 --- a/src/main/java/com/volmit/iris/util/mantle/Mantle.java +++ b/src/main/java/com/volmit/iris/util/mantle/Mantle.java @@ -136,6 +136,11 @@ public class Mantle { throw new RuntimeException("The Mantle is closed"); } + if(y < 0) + { + return; + } + Matter matter = get((x >> 4) >> 5, (z >> 4) >> 5) .getOrCreate((x >> 4) & 31, (z >> 4) & 31) .getOrCreate(y >> 4); @@ -165,6 +170,11 @@ public class Mantle { throw new RuntimeException("The Mantle is closed"); } + if(y < 0) + { + return null; + } + return (T) get((x >> 4) >> 5, (z >> 4) >> 5) .getOrCreate((x >> 4) & 31, (z >> 4) & 31) .getOrCreate(y >> 4).slice(t)