From 9a43f868aaaa466b8b1d3bd7e87d798ddd92a074 Mon Sep 17 00:00:00 2001 From: Daniel Mills Date: Thu, 29 Jul 2021 14:32:17 -0400 Subject: [PATCH] Hotload Iris Vision --- src/main/java/com/volmit/iris/Iris.java | 6 ++-- .../com/volmit/iris/core/gui/VisionGUI.java | 34 +++++++++++++++++++ 2 files changed, 36 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/volmit/iris/Iris.java b/src/main/java/com/volmit/iris/Iris.java index 29baaf38b..3ffc08863 100644 --- a/src/main/java/com/volmit/iris/Iris.java +++ b/src/main/java/com/volmit/iris/Iris.java @@ -28,12 +28,10 @@ import com.volmit.iris.core.link.MythicMobsLink; import com.volmit.iris.core.nms.INMS; import com.volmit.iris.core.tools.IrisWorlds; import com.volmit.iris.engine.framework.EngineCompositeGenerator; -import com.volmit.iris.engine.object.IrisBiome; -import com.volmit.iris.engine.object.IrisBiomeCustom; -import com.volmit.iris.engine.object.IrisCompat; -import com.volmit.iris.engine.object.IrisDimension; +import com.volmit.iris.engine.object.*; import com.volmit.iris.engine.parallel.MultiBurst; import com.volmit.iris.util.collection.KList; +import com.volmit.iris.util.collection.KMap; import com.volmit.iris.util.collection.KSet; import com.volmit.iris.util.format.C; import com.volmit.iris.util.format.Form; diff --git a/src/main/java/com/volmit/iris/core/gui/VisionGUI.java b/src/main/java/com/volmit/iris/core/gui/VisionGUI.java index 5b538a040..031b6f4b7 100644 --- a/src/main/java/com/volmit/iris/core/gui/VisionGUI.java +++ b/src/main/java/com/volmit/iris/core/gui/VisionGUI.java @@ -21,8 +21,12 @@ package com.volmit.iris.core.gui; import com.volmit.iris.Iris; import com.volmit.iris.core.gui.components.IrisRenderer; import com.volmit.iris.core.gui.components.RenderType; +import com.volmit.iris.core.tools.IrisWorlds; import com.volmit.iris.engine.IrisComplex; +import com.volmit.iris.engine.IrisEngine; import com.volmit.iris.engine.framework.Engine; +import com.volmit.iris.engine.framework.EngineCompositeGenerator; +import com.volmit.iris.engine.framework.EngineFramework; import com.volmit.iris.engine.framework.IrisAccess; import com.volmit.iris.engine.object.IrisBiome; import com.volmit.iris.engine.object.IrisRegion; @@ -153,6 +157,31 @@ public class VisionGUI extends JPanel implements MouseWheelListener, KeyListener }); } + public boolean updateEngine() + { + if(engine.isClosed()) + { + int index = engine.getIndex(); + + if(world.hasRealWorld()) + { + try + { + engine = IrisWorlds.access(world.realWorld()).getCompound().getEngine(index); + } + + catch(Throwable e) + { + engine = IrisWorlds.access(world.realWorld()).getCompound().getDefaultEngine(); + } + + return true; + } + } + + return false; + } + @Override public void mouseMoved(MouseEvent e) { Point cp = e.getPoint(); @@ -385,6 +414,11 @@ public class VisionGUI extends JPanel implements MouseWheelListener, KeyListener @Override public void paint(Graphics gx) { + if(updateEngine()) + { + dump(); + } + if (ox < oxp) { velocity = Math.abs(ox - oxp) * 0.36; oxp -= velocity;