From 0b87cd9aefd0ba470275e13f7b3730d21031a3e8 Mon Sep 17 00:00:00 2001 From: Daniel Mills Date: Sun, 13 Dec 2020 09:37:37 -0500 Subject: [PATCH] Support gleam only if on paper --- gource.bat | 2 +- src/main/java/com/volmit/iris/util/PregenJob.java | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/gource.bat b/gource.bat index 6786239d7..8d5f1f5f3 100644 --- a/gource.bat +++ b/gource.bat @@ -1,3 +1,3 @@ @echo off cd gource -gource -f -a 1 -s 0.5 --colour-images --max-file-lag 10 --title MyGuide --user-scale 1.67 --max-user-speed 725 --filename-time 2 \ No newline at end of file +gource -f -a 1 -s 0.01 -t 100000 --colour-images --max-file-lag 35 --title MyGuide --user-scale 1.67 --max-user-speed 725 --filename-time 2 -title Chimera --user-friction 2.5 --padding 1.2 --user-scale 1.25 --filename-time 2 --bloom-intensity 0.1 --bloom-multiplier 3 --hide filenames,dirnames \ No newline at end of file diff --git a/src/main/java/com/volmit/iris/util/PregenJob.java b/src/main/java/com/volmit/iris/util/PregenJob.java index fe0c0bcf8..1ab9d91e2 100644 --- a/src/main/java/com/volmit/iris/util/PregenJob.java +++ b/src/main/java/com/volmit/iris/util/PregenJob.java @@ -52,7 +52,7 @@ public class PregenJob implements Listener private double cps = 0; private int lg = 0; private long lt = M.ms(); - private int cubeSize = IrisSettings.get().isUseGleamPregenerator() ? 11 : 32; + private int cubeSize = (IrisSettings.get().isUseGleamPregenerator() && PaperLib.isPaper()) ? 11 : 32; private long nogen = M.ms(); private KList requeueMCA = new KList(); private RollingSequence acps = new RollingSequence(PaperLib.isPaper() ? 8 : 32); @@ -65,7 +65,7 @@ public class PregenJob implements Listener public PregenJob(World world, int size, MortarSender sender, Runnable onDone) { - gleaming = IrisSettings.get().isUseGleamPregenerator(); + gleaming = (IrisSettings.get().isUseGleamPregenerator() && PaperLib.isPaper()); g.set(0); burst = new MultiBurst(gleaming ? IrisSettings.get().getMaxAsyncChunkPregenThreads() : tc()); instance = this; @@ -431,7 +431,7 @@ public class PregenJob implements Listener consumer.accept(new ChunkPosition(cx, cz), Color.magenta); } - Chunk chunk = PaperLib.getChunkAtAsync(world, cx, cz, true).join(); + Chunk chunk = PaperLib.getChunkAtAsync(world, cx, cz, true, true).join(); working.release(); genned++; nogen = M.ms();