mirrors/Iris
1
0
Fork 0
mirror of https://github.com/VolmitSoftware/Iris.git synced 2026-04-12 02:36:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Auto stash before revert of "Drop it "

Browse Source
This commit is contained in:
cyberpwn
2021-09-22 12:54:06 -04:00
parent 3ba7c18288
commit f9e934fa1a
19 changed files with 376 additions and 125 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/volmit/iris/util/matter/MatterSlice.java
View File

@@ -152,7 +152,7 @@ public interface MatterSlice<T> extends Hunk<T>, PaletteType<T> {
default void write(DataOutputStream dos) throws IOException {
dos.writeUTF(getType().getCanonicalName());
if(IrisSettings.get().getPerformance().isUseExperimentalMantleMemoryCompression() && (this instanceof PaletteOrHunk f && f.isPalette()))
if((this instanceof PaletteOrHunk f && f.isPalette()))
{
PalettedContainer<T> c = f.palette();
List<T> palette = new ArrayList<>();
@@ -192,7 +192,7 @@ public interface MatterSlice<T> extends Hunk<T>, PaletteType<T> {
}
default void read(DataInputStream din) throws IOException {
if(IrisSettings.get().getPerformance().isUseExperimentalMantleMemoryCompression() && (this instanceof PaletteOrHunk f && f.isPalette()))
if((this instanceof PaletteOrHunk f && f.isPalette()))
{
PalettedContainer<T> c = new PalettedContainer<>();
List<T> palette = new ArrayList<>();

99
src/main/java/com/volmit/iris/util/matter/MatterTest.java
View File

@@ -1,99 +0,0 @@
/*
* Iris is a World Generator for Minecraft Bukkit Servers
* Copyright (c) 2021 Arcane Arts (Volmit Software)
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
package com.volmit.iris.util.matter;
import com.volmit.iris.Iris;
import com.volmit.iris.core.IrisSettings;
import com.volmit.iris.util.collection.KList;
import com.volmit.iris.util.format.Form;
import com.volmit.iris.util.io.IO;
import com.volmit.iris.util.mantle.Mantle;
import com.volmit.iris.util.mantle.TectonicPlate;
import com.volmit.iris.util.math.RNG;
import com.volmit.iris.util.nbt.tag.ByteArrayTag;
import com.volmit.iris.util.scheduling.J;
import com.volmit.iris.util.scheduling.PrecisionStopwatch;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.File;
import java.io.IOException;
import java.util.List;
import java.util.concurrent.ThreadLocalRandom;
public class MatterTest {
public static long memorySample()
{
Runtime rt = Runtime.getRuntime();
System.gc();
System.gc();
return rt.totalMemory() - rt.freeMemory();
}
public static void test()
{
for(Thread i : Thread.getAllStackTraces().keySet())
{
if(i.getId() != Thread.currentThread().getId())
{
try {
i.wait(10000);
} catch (Throwable ignored) {
}
}
}
System.gc();
System.gc();
J.sleep(250);
try {
double ms = 0;
long a = memorySample();
PrecisionStopwatch p = PrecisionStopwatch.start();
IrisSettings.get().getPerformance().setUseExperimentalMantleMemoryCompression(true);
Mantle mantle = new Mantle(new File("mantle-test/legacy"), 256);
for(int i = 0; i < 512; i++)
{
for(int j = 0; j < 255; j++)
{
for(int k = 0; k < 512; k++)
{
mantle.set(i,j,k,RNG.r.chance(0.5));
mantle.set(i,j,k,RNG.r.chance(0.5)?"a" : "b");
}
}
}
ms += p.getMilliseconds();
long b = memorySample() - a;
Iris.info("Memory: " + Form.memSize(b, 0) + " (" + Form.f(b) + " bytes)");
p = PrecisionStopwatch.start();
mantle.saveAll();
mantle.close();
ms+=p.getMilliseconds();
Iris.info("Closed, done! took " + Form.duration(ms, 2));
} catch (Throwable e) {
e.printStackTrace();
}
}
}