From 9bf7b373b103b1317caf55d9b82cab454ec9475f Mon Sep 17 00:00:00 2001 From: dfsek Date: Thu, 22 Jul 2021 18:27:30 -0700 Subject: [PATCH] delete GenWrapper --- .../com/dfsek/terra/platform/DirectWorld.java | 2 +- .../com/dfsek/terra/platform/GenWrapper.java | 18 ------------------ .../java/com/dfsek/terra/region/Generator.java | 4 +--- 3 files changed, 2 insertions(+), 22 deletions(-) delete mode 100644 platforms/region/src/main/java/com/dfsek/terra/platform/GenWrapper.java diff --git a/platforms/region/src/main/java/com/dfsek/terra/platform/DirectWorld.java b/platforms/region/src/main/java/com/dfsek/terra/platform/DirectWorld.java index 620aa5a54..de8b0a58f 100644 --- a/platforms/region/src/main/java/com/dfsek/terra/platform/DirectWorld.java +++ b/platforms/region/src/main/java/com/dfsek/terra/platform/DirectWorld.java @@ -24,7 +24,7 @@ public class DirectWorld implements World { private final GenWrapper generator; private final Map files = Collections.synchronizedMap(new HashMap<>()); - public DirectWorld(long seed, GenWrapper generator) { + public DirectWorld(long seed) { this.seed = seed; this.generator = generator; } diff --git a/platforms/region/src/main/java/com/dfsek/terra/platform/GenWrapper.java b/platforms/region/src/main/java/com/dfsek/terra/platform/GenWrapper.java deleted file mode 100644 index a093ebe95..000000000 --- a/platforms/region/src/main/java/com/dfsek/terra/platform/GenWrapper.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.dfsek.terra.platform; - -import com.dfsek.terra.api.world.generator.ChunkGenerator; -import com.dfsek.terra.api.world.generator.TerraChunkGenerator; - -public class GenWrapper implements ChunkGenerator { - private final TerraChunkGenerator generator; - - public GenWrapper(TerraChunkGenerator generator) { - this.generator = generator; - } - - @Override - public Object getHandle() { - return generator; - } - -} diff --git a/platforms/region/src/main/java/com/dfsek/terra/region/Generator.java b/platforms/region/src/main/java/com/dfsek/terra/region/Generator.java index 6a674000e..1c88db64c 100644 --- a/platforms/region/src/main/java/com/dfsek/terra/region/Generator.java +++ b/platforms/region/src/main/java/com/dfsek/terra/region/Generator.java @@ -4,7 +4,6 @@ import com.dfsek.terra.StandalonePlugin; import com.dfsek.terra.api.world.generator.TerraChunkGenerator; import com.dfsek.terra.platform.DirectChunkData; import com.dfsek.terra.platform.DirectWorld; -import com.dfsek.terra.platform.GenWrapper; import net.querz.mca.MCAFile; import net.querz.mca.MCAUtil; @@ -28,8 +27,7 @@ public class Generator { System.out.println("Total mem: " + Runtime.getRuntime().maxMemory() / 1024 / 1024 / 1024 + "GB"); - GenWrapper wrapper = new GenWrapper(generator); - DirectWorld world = new DirectWorld(seed, wrapper); + DirectWorld world = new DirectWorld(seed, null); long l = System.nanoTime(); int count = 0;