mirrors/Iris
1
0
Fork 0
mirror of https://github.com/VolmitSoftware/Iris.git synced 2025-07-03 00:17:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Support gleam only if on paper

Browse Source
This commit is contained in:
Daniel Mills 2020-12-13 09:37:37 -05:00
parent a5725439ee
commit 0b87cd9aef
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gource.bat
View File

@ -1,3 +1,3 @@
@echo off @echo off
cd gource 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 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

6
src/main/java/com/volmit/iris/util/PregenJob.java
View File

@ -52,7 +52,7 @@ public class PregenJob implements Listener
private double cps = 0; private double cps = 0;
private int lg = 0; private int lg = 0;
private long lt = M.ms(); 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 long nogen = M.ms();
private KList<ChunkPosition> requeueMCA = new KList<ChunkPosition>(); private KList<ChunkPosition> requeueMCA = new KList<ChunkPosition>();
private RollingSequence acps = new RollingSequence(PaperLib.isPaper() ? 8 : 32); 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) public PregenJob(World world, int size, MortarSender sender, Runnable onDone)
{ {
gleaming = IrisSettings.get().isUseGleamPregenerator(); gleaming = (IrisSettings.get().isUseGleamPregenerator() && PaperLib.isPaper());
g.set(0); g.set(0);
burst = new MultiBurst(gleaming ? IrisSettings.get().getMaxAsyncChunkPregenThreads() : tc()); burst = new MultiBurst(gleaming ? IrisSettings.get().getMaxAsyncChunkPregenThreads() : tc());
instance = this; instance = this;
@ -431,7 +431,7 @@ public class PregenJob implements Listener
consumer.accept(new ChunkPosition(cx, cz), Color.magenta); 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(); working.release();
genned++; genned++;
nogen = M.ms(); nogen = M.ms();