spdis/voxy
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

patch

Browse Source
This commit is contained in:
mcrcortex
2025-03-21 22:56:03 +10:00
parent eb7172aaba
commit 41c31976d6
1 changed files with 37 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/main/java/me/cortex/voxy/commonImpl/importers/DHImporter.java
View File

@@ -46,6 +46,7 @@ public class DHImporter {
private final RegistryEntry.Reference<Biome> defaultBiome; private final RegistryEntry.Reference<Biome> defaultBiome;
private final Registry<Biome> biomeRegistry; private final Registry<Biome> biomeRegistry;
private final Registry<Block> blockRegistry; private final Registry<Block> blockRegistry;
private Thread runner;
private record Task(int x, int z, int fmt, int compression){} private record Task(int x, int z, int fmt, int compression){}
private final ConcurrentLinkedDeque<Task> tasks = new ConcurrentLinkedDeque<>(); private final ConcurrentLinkedDeque<Task> tasks = new ConcurrentLinkedDeque<>();
@@ -58,12 +59,12 @@ public class DHImporter {
public DHImporter(File file, WorldEngine worldEngine, World mcWorld, ServiceThreadPool servicePool, SectionSavingService savingService) { public DHImporter(File file, WorldEngine worldEngine, World mcWorld, ServiceThreadPool servicePool, SectionSavingService savingService) {
this.engine = worldEngine; this.engine = worldEngine;
this.world = mcWorld; this.world = mcWorld;
this.bottomOfWorld = mcWorld.getBottomY();
this.biomeRegistry = mcWorld.getRegistryManager().getOrThrow(RegistryKeys.BIOME); this.biomeRegistry = mcWorld.getRegistryManager().getOrThrow(RegistryKeys.BIOME);
this.defaultBiome = this.biomeRegistry.getOrThrow(BiomeKeys.PLAINS); this.defaultBiome = this.biomeRegistry.getOrThrow(BiomeKeys.PLAINS);
this.blockRegistry = mcWorld.getRegistryManager().getOrThrow(RegistryKeys.BLOCK); this.blockRegistry = mcWorld.getRegistryManager().getOrThrow(RegistryKeys.BLOCK);
int worldHeight = 640+64; this.bottomOfWorld = mcWorld.getBottomY();
int worldHeight = mcWorld.getHeight();
this.worldHeightSections = (worldHeight+15)/16; this.worldHeightSections = (worldHeight+15)/16;
String con = "jdbc:sqlite:" + file.getPath(); String con = "jdbc:sqlite:" + file.getPath();
@@ -93,7 +94,8 @@ public class DHImporter {
public void runImport() { public void runImport() {
try (var stmt = this.db.createStatement()){ this.runner = new Thread(()-> {
try (var stmt = this.db.createStatement()) {
var resSet = stmt.executeQuery("SELECT PosX,PosZ,CompressionMode,DataFormatVersion FROM FullData WHERE DetailLevel = 0;"); var resSet = stmt.executeQuery("SELECT PosX,PosZ,CompressionMode,DataFormatVersion FROM FullData WHERE DetailLevel = 0;");
int i = 0; int i = 0;
while (resSet.next()) { while (resSet.next()) {
@@ -109,15 +111,24 @@ public class DHImporter {
Logger.warn("Unknown compression mode: " + compression); Logger.warn("Unknown compression mode: " + compression);
continue; continue;
} }
this.tasks.add(new Task(x,z,format,compression)); this.tasks.add(new Task(x, z, format, compression));
this.threadPool.execute(); this.threadPool.execute();
i++; i++;
while (this.tasks.size() > 100) {
try {
Thread.sleep(500);
} catch (InterruptedException e) {
throw new RuntimeException(e);
}
}
} }
resSet.close(); resSet.close();
Logger.info("Importing " + i + " DH section"); Logger.info("Importing " + i + " DH section");
} catch (SQLException e) { } catch (SQLException e) {
throw new RuntimeException(e); throw new RuntimeException(e);
} }
});
this.runner.start();
} }
private static void readStream(InputStream in, ResettableArrayCache cache, byte[] into) throws IOException { private static void readStream(InputStream in, ResettableArrayCache cache, byte[] into) throws IOException {
@@ -259,7 +270,7 @@ public class DHImporter {
System.arraycopy(storage, (sz|(sy<<2))<<12, section.section, 0, 16 * 16 * 16); System.arraycopy(storage, (sz|(sy<<2))<<12, section.section, 0, 16 * 16 * 16);
WorldConversionFactory.mipSection(section, this.engine.getMapper()); WorldConversionFactory.mipSection(section, this.engine.getMapper());
section.setPosition(X*4+(x>>4), sy-(this.bottomOfWorld>>4), (Z*4)+sz); section.setPosition(X*4+(x>>4), sy+(this.bottomOfWorld>>4), (Z*4)+sz);
this.engine.insertUpdate(section); this.engine.insertUpdate(section);
} }
} }