From bdd0da82e7f0996b76c285a81705ed34df18ade2 Mon Sep 17 00:00:00 2001 From: Daniel Mills Date: Fri, 4 Sep 2020 02:15:36 -0400 Subject: [PATCH] A Splash of Iris --- src/main/java/com/volmit/iris/Iris.java | 40 +++++++++++++++++++ .../iris/gen/ParallaxChunkGenerator.java | 21 +++++----- 2 files changed, 51 insertions(+), 10 deletions(-) diff --git a/src/main/java/com/volmit/iris/Iris.java b/src/main/java/com/volmit/iris/Iris.java index a924ea333..7f9f41ecb 100644 --- a/src/main/java/com/volmit/iris/Iris.java +++ b/src/main/java/com/volmit/iris/Iris.java @@ -25,6 +25,7 @@ import com.volmit.iris.gen.post.PostWallPatcher; import com.volmit.iris.gen.post.PostWaterlogger; import com.volmit.iris.link.MultiverseCoreLink; import com.volmit.iris.util.C; +import com.volmit.iris.util.Form; import com.volmit.iris.util.GroupedExecutor; import com.volmit.iris.util.IO; import com.volmit.iris.util.IrisLock; @@ -88,6 +89,7 @@ public class Iris extends MortarPlugin board = new IrisBoardManager(); linkMultiverseCore = new MultiverseCoreLink(); J.a(() -> IO.delete(getTemp())); + J.s(this::splash, 20); super.onEnable(); } @@ -270,4 +272,42 @@ public class Iris extends MortarPlugin { board.hits.put(hits2); } + + public void splash() + { + //@builder + String padd = Form.repeat(" ", 8); + String padd2 = Form.repeat(" ", 4); + String[] info = { + "", + "", + "", + "", + "", + padd2 + C.GREEN + " Iris", + padd2 + C.GRAY + " by "+C.randomColor()+"V"+C.randomColor()+"o"+C.randomColor()+"l"+C.randomColor()+"m"+C.randomColor()+"i"+C.randomColor()+"t"+C.randomColor()+"S"+C.randomColor()+"o"+C.randomColor()+"f"+C.randomColor()+"t"+C.randomColor()+"w"+C.randomColor()+"a"+C.randomColor()+"r"+C.randomColor()+"e", + padd2 + C.GRAY + " v" + getDescription().getVersion(), + }; + String[] splash = { + padd + C.GRAY + " @%%%%%%%%%%%%%%%%%%%% ", + padd + C.GRAY + " @@&&&&&&&&&&&&&&&%%" + C.GREEN + " (((((( ", + padd + C.GRAY + "@@@&&&&&&&&&&&&&" + C.GREEN + " (((((((((((((( ", + padd + C.GRAY + "@@@&&&&&&&&&&" + C.GREEN + " (((((((((((((((((((( " + C.GRAY + " @ ", + padd + C.GRAY + "@@@&&&&@@@@@&" + C.GREEN + " (((((((((((((((((((( " + C.GRAY + " @@ ", + padd + C.GRAY + "@@@ " + C.GREEN + " (((((((((((((((((((( " + C.GRAY + " @@@", + padd + C.GRAY + "@@ " + C.GREEN + " (((((((((((((((((((( " + C.GRAY + "&%%%%%%%%%@@@", + padd + C.GRAY + "@ " + C.GREEN + " (((((((((((((((((((( " + C.GRAY + "&&&&%%%%%%@@@", + padd + C.GRAY + " " + C.GREEN + " (((((((((((((( " + C.GRAY + "&&&&&&&&%%&&%@@@", + padd + C.GRAY + " " + C.GREEN + " (((((( " + C.GRAY + "@@@&&&&&&&&&&&&%%@@ ", + padd + C.GRAY + " @@@@@@@&&&&&&&&&&&&&@ " + }; + //@done + + for(int i = 0; i < info.length; i++) + { + splash[i] += info[i]; + } + + Iris.info("\n\n " + new KList(splash).toString("\n") + "\n"); + } } diff --git a/src/main/java/com/volmit/iris/gen/ParallaxChunkGenerator.java b/src/main/java/com/volmit/iris/gen/ParallaxChunkGenerator.java index fd0d82591..f2f1996ba 100644 --- a/src/main/java/com/volmit/iris/gen/ParallaxChunkGenerator.java +++ b/src/main/java/com/volmit/iris/gen/ParallaxChunkGenerator.java @@ -285,16 +285,6 @@ public abstract class ParallaxChunkGenerator extends TerrainChunkGenerator imple k.place(this, random.nextParallelRNG(-22228 + -4228 + -7228 + (34 * ((i * 30) + (j * 30)) * i * j) + i - j + 1569962), i, j); } - for(IrisStructurePlacement k : r.getStructures()) - { - k.place(this, random.nextParallelRNG(2228), i, j); - } - - for(IrisStructurePlacement k : b.getStructures()) - { - k.place(this, random.nextParallelRNG(-22228), i, j); - } - for(IrisObjectPlacement k : b.getObjects()) { int gg = g++; @@ -324,6 +314,17 @@ public abstract class ParallaxChunkGenerator extends TerrainChunkGenerator imple placeCaveObject(k, i, j, random.nextParallelRNG((34 * ((i * 30) + (j * 30) + gg) * i * j) + i - j + 1869322)); } } + + for(IrisStructurePlacement k : r.getStructures()) + { + k.place(this, random.nextParallelRNG(2228), i, j); + } + + for(IrisStructurePlacement k : b.getStructures()) + { + k.place(this, random.nextParallelRNG(-22228), i, j); + } + }); getParallaxChunk(ii, jj).setParallaxGenerated(true);