Low memory mode support

This commit is contained in:
Daniel Mills 2020-09-04 03:24:38 -04:00
parent f334b0137e
commit b8f58b9cc7
3 changed files with 7 additions and 4 deletions

View File

@ -3,6 +3,7 @@ package com.volmit.iris.gen.atomics;
import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicInteger;
import java.util.function.Supplier; import java.util.function.Supplier;
import com.volmit.iris.Iris;
import com.volmit.iris.IrisSettings; import com.volmit.iris.IrisSettings;
import com.volmit.iris.object.IrisBiome; import com.volmit.iris.object.IrisBiome;
import com.volmit.iris.object.IrisRegion; import com.volmit.iris.object.IrisRegion;
@ -44,7 +45,7 @@ public class AtomicMulticache
this.x.set(x); this.x.set(x);
this.z.set(z); this.z.set(z);
if(!IrisSettings.get().sharedCaching) if(!IrisSettings.get().sharedCaching || Iris.lowMemoryMode)
{ {
drop(); drop();
} }
@ -268,5 +269,7 @@ public class AtomicMulticache
region.clear(); region.clear();
biome.clear(); biome.clear();
rawBiome.clear(); rawBiome.clear();
carvedHeight.clear();
carvedHeightIgnoreWater.clear();
} }
} }

View File

@ -278,7 +278,7 @@ public class AtomicWorldData
break; break;
} }
if(M.ms() - lastRegion.get(i) > 30000) if(M.ms() - lastRegion.get(i) > (Iris.lowMemoryMode ? 15000 : 30000))
{ {
unloadRegions.add(i); unloadRegions.add(i);
m++; m++;
@ -311,7 +311,7 @@ public class AtomicWorldData
break; break;
} }
if(M.ms() - lastChunk.get(i) > 30000) if(M.ms() - lastChunk.get(i) > (Iris.lowMemoryMode ? 8000 : 30000))
{ {
m++; m++;
unloadChunks.add(i); unloadChunks.add(i);

View File

@ -31,7 +31,7 @@ public class ObjectResourceLoader extends ResourceLoader<IrisObject>
{ {
if(useFlip.flip()) if(useFlip.flip())
{ {
unloadLast(60000 * 5); unloadLast(Iris.lowMemoryMode ? 60000 : (60000 * 5));
} }
} }