From 536ed2b967c44d56c01f95fd7860c74fccb9e26f Mon Sep 17 00:00:00 2001 From: Daniel Mills Date: Sat, 31 Oct 2020 08:47:47 -0400 Subject: [PATCH] Fix parallax sizes & imports --- src/main/java/com/volmit/iris/Iris.java | 5 +- .../iris/object/IrisDimensionIndex.java | 11 ++-- .../iris/object/IrisObjectPlacement.java | 3 +- .../iris/object/IrisObjectRotation.java | 8 +-- .../com/volmit/iris/util/VolmitPlugin.java | 6 +-- src/main/java/com/volmit/iris/v2/TestGen.java | 14 +---- .../iris/v2/scaffold/cache/Multicache.java | 7 ++- .../iris/v2/scaffold/engine/Engine.java | 11 ++-- .../v2/scaffold/engine/EngineActuator.java | 5 -- .../engine/EngineAssignedActuator.java | 5 -- .../engine/EngineAssignedModifier.java | 3 -- .../engine/EngineCompositeGenerator.java | 25 +++++---- .../v2/scaffold/engine/EngineCompound.java | 6 +-- .../v2/scaffold/engine/EngineFramework.java | 8 ++- .../v2/scaffold/engine/EngineModifier.java | 5 -- .../v2/scaffold/engine/EngineParallax.java | 26 ++++++---- .../v2/scaffold/hunk/io/HunkRegionSlice.java | 52 ++++++++++++------- .../v2/scaffold/parallax/ParallaxWorld.java | 2 +- 18 files changed, 95 insertions(+), 107 deletions(-) diff --git a/src/main/java/com/volmit/iris/Iris.java b/src/main/java/com/volmit/iris/Iris.java index 2b50d9fe1..ab8677f0d 100644 --- a/src/main/java/com/volmit/iris/Iris.java +++ b/src/main/java/com/volmit/iris/Iris.java @@ -39,17 +39,16 @@ import com.volmit.iris.util.C; import com.volmit.iris.util.Form; import com.volmit.iris.util.GroupedExecutor; import com.volmit.iris.util.IO; -import com.volmit.iris.util.IrisLock; import com.volmit.iris.util.J; import com.volmit.iris.util.KList; import com.volmit.iris.util.M; import com.volmit.iris.util.MetricsLite; -import com.volmit.iris.util.VolmitPlugin; import com.volmit.iris.util.NastyRunnable; import com.volmit.iris.util.Permission; import com.volmit.iris.util.Queue; import com.volmit.iris.util.RNG; import com.volmit.iris.util.ShurikenQueue; +import com.volmit.iris.util.VolmitPlugin; import io.papermc.lib.PaperLib; @@ -68,7 +67,6 @@ public class Iris extends VolmitPlugin public static MultiverseCoreLink linkMultiverseCore; public static MythicMobsLink linkMythicMobs; public static CitizensLink linkCitizens; - private static IrisLock lock = new IrisLock("Iris"); private static final Queue syncJobs = new ShurikenQueue<>(); public static boolean customModels = doesSupportCustomModels(); public static boolean awareEntities = doesSupportAwareness(); @@ -187,7 +185,6 @@ public class Iris extends VolmitPlugin { instance = this; compat = IrisCompat.configured(getDataFile("compat.json")); - lock = new IrisLock("Iris"); proj = new ProjectManager(); hotloader = new IrisHotloadManager(); convert = new ConversionManager(); diff --git a/src/main/java/com/volmit/iris/object/IrisDimensionIndex.java b/src/main/java/com/volmit/iris/object/IrisDimensionIndex.java index 1343e695a..498d07306 100644 --- a/src/main/java/com/volmit/iris/object/IrisDimensionIndex.java +++ b/src/main/java/com/volmit/iris/object/IrisDimensionIndex.java @@ -1,15 +1,16 @@ package com.volmit.iris.object; -import com.volmit.iris.Iris; -import com.volmit.iris.gen.atomics.AtomicCache; -import com.volmit.iris.manager.IrisDataManager; -import com.volmit.iris.util.*; +import com.volmit.iris.util.Desc; +import com.volmit.iris.util.DontObfuscate; +import com.volmit.iris.util.MinNumber; +import com.volmit.iris.util.RegistryListDimension; +import com.volmit.iris.util.Required; + import lombok.AllArgsConstructor; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; import lombok.experimental.Accessors; -import org.bukkit.block.data.BlockData; @Accessors(chain = true) @NoArgsConstructor diff --git a/src/main/java/com/volmit/iris/object/IrisObjectPlacement.java b/src/main/java/com/volmit/iris/object/IrisObjectPlacement.java index 5dda0ae39..60d9efbd2 100644 --- a/src/main/java/com/volmit/iris/object/IrisObjectPlacement.java +++ b/src/main/java/com/volmit/iris/object/IrisObjectPlacement.java @@ -1,7 +1,6 @@ package com.volmit.iris.object; import com.volmit.iris.Iris; -import com.volmit.iris.gen.ContextualTerrainProvider; import com.volmit.iris.gen.atomics.AtomicCache; import com.volmit.iris.noise.CNG; import com.volmit.iris.util.ArrayType; @@ -13,8 +12,8 @@ import com.volmit.iris.util.MinNumber; import com.volmit.iris.util.RNG; import com.volmit.iris.util.RegistryListObject; import com.volmit.iris.util.Required; - import com.volmit.iris.v2.scaffold.data.DataProvider; + import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/src/main/java/com/volmit/iris/object/IrisObjectRotation.java b/src/main/java/com/volmit/iris/object/IrisObjectRotation.java index 0a32d7675..c6fc230a3 100644 --- a/src/main/java/com/volmit/iris/object/IrisObjectRotation.java +++ b/src/main/java/com/volmit/iris/object/IrisObjectRotation.java @@ -2,11 +2,13 @@ package com.volmit.iris.object; import java.util.List; -import com.volmit.iris.util.M; import org.bukkit.Axis; -import org.bukkit.Material; import org.bukkit.block.BlockFace; -import org.bukkit.block.data.*; +import org.bukkit.block.data.BlockData; +import org.bukkit.block.data.Directional; +import org.bukkit.block.data.MultipleFacing; +import org.bukkit.block.data.Orientable; +import org.bukkit.block.data.Rotatable; import org.bukkit.util.BlockVector; import com.volmit.iris.util.Desc; diff --git a/src/main/java/com/volmit/iris/util/VolmitPlugin.java b/src/main/java/com/volmit/iris/util/VolmitPlugin.java index 681dd62f7..ecef23c47 100644 --- a/src/main/java/com/volmit/iris/util/VolmitPlugin.java +++ b/src/main/java/com/volmit/iris/util/VolmitPlugin.java @@ -10,7 +10,6 @@ import java.util.List; import java.util.Map; import org.bukkit.Bukkit; -import org.bukkit.Sound; import org.bukkit.command.Command; import org.bukkit.command.CommandMap; import org.bukkit.command.CommandSender; @@ -18,16 +17,15 @@ import org.bukkit.command.PluginCommand; import org.bukkit.command.SimpleCommandMap; import org.bukkit.configuration.file.FileConfiguration; import org.bukkit.configuration.file.YamlConfiguration; -import org.bukkit.entity.Player; import org.bukkit.event.HandlerList; import org.bukkit.event.Listener; import org.bukkit.permissions.PermissionDefault; import org.bukkit.plugin.java.JavaPlugin; - -import com.volmit.iris.Iris; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import com.volmit.iris.Iris; + public abstract class VolmitPlugin extends JavaPlugin implements Listener { public static boolean bad = false; diff --git a/src/main/java/com/volmit/iris/v2/TestGen.java b/src/main/java/com/volmit/iris/v2/TestGen.java index a27a830e1..94176bf5a 100644 --- a/src/main/java/com/volmit/iris/v2/TestGen.java +++ b/src/main/java/com/volmit/iris/v2/TestGen.java @@ -1,24 +1,12 @@ package com.volmit.iris.v2; -import java.util.List; -import java.util.Random; import java.util.UUID; -import com.volmit.iris.util.KList; -import com.volmit.iris.v2.scaffold.engine.EngineCompositeGenerator; import org.bukkit.Location; -import org.bukkit.World; import org.bukkit.WorldCreator; -import org.bukkit.block.Biome; import org.bukkit.entity.Player; -import org.bukkit.generator.BlockPopulator; -import org.bukkit.generator.ChunkGenerator; -import com.volmit.iris.Iris; -import com.volmit.iris.v2.scaffold.hunk.Hunk; -import com.volmit.iris.util.Form; -import com.volmit.iris.util.PrecisionStopwatch; -import org.jetbrains.annotations.NotNull; +import com.volmit.iris.v2.scaffold.engine.EngineCompositeGenerator; public class TestGen { diff --git a/src/main/java/com/volmit/iris/v2/scaffold/cache/Multicache.java b/src/main/java/com/volmit/iris/v2/scaffold/cache/Multicache.java index 36591ec88..4b1bb8e8e 100644 --- a/src/main/java/com/volmit/iris/v2/scaffold/cache/Multicache.java +++ b/src/main/java/com/volmit/iris/v2/scaffold/cache/Multicache.java @@ -4,7 +4,10 @@ import com.volmit.iris.util.V; public interface Multicache { - public Cache getCache(int id); + @SuppressWarnings("hiding") + public Cache getCache(int id); - public Cache createCache(); + @SuppressWarnings("hiding") + public Cache createCache(); } + \ No newline at end of file diff --git a/src/main/java/com/volmit/iris/v2/scaffold/engine/Engine.java b/src/main/java/com/volmit/iris/v2/scaffold/engine/Engine.java index ff68bc7db..f32b8977e 100644 --- a/src/main/java/com/volmit/iris/v2/scaffold/engine/Engine.java +++ b/src/main/java/com/volmit/iris/v2/scaffold/engine/Engine.java @@ -1,15 +1,14 @@ package com.volmit.iris.v2.scaffold.engine; -import com.volmit.iris.v2.scaffold.hunk.Hunk; -import com.volmit.iris.v2.scaffold.hunk.io.BlockDataHunkIOAdapter; -import com.volmit.iris.v2.scaffold.parallax.ParallaxAccess; -import com.volmit.iris.manager.IrisDataManager; -import com.volmit.iris.object.IrisDimension; -import com.volmit.iris.v2.scaffold.parallel.MultiBurst; import org.bukkit.World; import org.bukkit.block.Biome; import org.bukkit.block.data.BlockData; +import com.volmit.iris.manager.IrisDataManager; +import com.volmit.iris.object.IrisDimension; +import com.volmit.iris.v2.scaffold.hunk.Hunk; +import com.volmit.iris.v2.scaffold.parallax.ParallaxAccess; + public interface Engine { public void setParallelism(int parallelism); diff --git a/src/main/java/com/volmit/iris/v2/scaffold/engine/EngineActuator.java b/src/main/java/com/volmit/iris/v2/scaffold/engine/EngineActuator.java index ffeeb320b..defdb642b 100644 --- a/src/main/java/com/volmit/iris/v2/scaffold/engine/EngineActuator.java +++ b/src/main/java/com/volmit/iris/v2/scaffold/engine/EngineActuator.java @@ -1,11 +1,6 @@ package com.volmit.iris.v2.scaffold.engine; -import com.volmit.iris.util.RollingSequence; -import com.volmit.iris.v2.generator.IrisComplex; import com.volmit.iris.v2.scaffold.hunk.Hunk; -import com.volmit.iris.v2.scaffold.parallax.ParallaxAccess; -import com.volmit.iris.manager.IrisDataManager; -import com.volmit.iris.object.IrisDimension; public interface EngineActuator extends EngineComponent { diff --git a/src/main/java/com/volmit/iris/v2/scaffold/engine/EngineAssignedActuator.java b/src/main/java/com/volmit/iris/v2/scaffold/engine/EngineAssignedActuator.java index 335e767af..74ff617aa 100644 --- a/src/main/java/com/volmit/iris/v2/scaffold/engine/EngineAssignedActuator.java +++ b/src/main/java/com/volmit/iris/v2/scaffold/engine/EngineAssignedActuator.java @@ -1,11 +1,6 @@ package com.volmit.iris.v2.scaffold.engine; -import com.volmit.iris.util.PrecisionStopwatch; -import com.volmit.iris.util.RollingSequence; import com.volmit.iris.v2.scaffold.hunk.Hunk; -import lombok.AllArgsConstructor; -import lombok.Getter; -import org.bukkit.block.data.BlockData; public abstract class EngineAssignedActuator extends EngineAssignedComponent implements EngineActuator { diff --git a/src/main/java/com/volmit/iris/v2/scaffold/engine/EngineAssignedModifier.java b/src/main/java/com/volmit/iris/v2/scaffold/engine/EngineAssignedModifier.java index fe3bf30ee..cd97bf52c 100644 --- a/src/main/java/com/volmit/iris/v2/scaffold/engine/EngineAssignedModifier.java +++ b/src/main/java/com/volmit/iris/v2/scaffold/engine/EngineAssignedModifier.java @@ -1,9 +1,6 @@ package com.volmit.iris.v2.scaffold.engine; -import com.volmit.iris.util.PrecisionStopwatch; -import com.volmit.iris.util.RollingSequence; import com.volmit.iris.v2.scaffold.hunk.Hunk; -import lombok.Getter; public abstract class EngineAssignedModifier extends EngineAssignedComponent implements EngineModifier { diff --git a/src/main/java/com/volmit/iris/v2/scaffold/engine/EngineCompositeGenerator.java b/src/main/java/com/volmit/iris/v2/scaffold/engine/EngineCompositeGenerator.java index 6fa687dee..b6c885552 100644 --- a/src/main/java/com/volmit/iris/v2/scaffold/engine/EngineCompositeGenerator.java +++ b/src/main/java/com/volmit/iris/v2/scaffold/engine/EngineCompositeGenerator.java @@ -1,14 +1,10 @@ package com.volmit.iris.v2.scaffold.engine; -import com.mysql.jdbc.profiler.ProfilerEvent; -import com.volmit.iris.Iris; -import com.volmit.iris.manager.IrisDataManager; -import com.volmit.iris.object.IrisDimension; -import com.volmit.iris.util.Form; -import com.volmit.iris.util.M; -import com.volmit.iris.util.PrecisionStopwatch; -import com.volmit.iris.v2.generator.IrisEngineCompound; -import com.volmit.iris.v2.scaffold.hunk.Hunk; +import java.io.File; +import java.util.List; +import java.util.Random; +import java.util.concurrent.atomic.AtomicBoolean; + import org.bukkit.Location; import org.bukkit.World; import org.bukkit.block.Biome; @@ -18,10 +14,13 @@ import org.bukkit.generator.ChunkGenerator; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import java.io.File; -import java.util.List; -import java.util.Random; -import java.util.concurrent.atomic.AtomicBoolean; +import com.volmit.iris.Iris; +import com.volmit.iris.manager.IrisDataManager; +import com.volmit.iris.object.IrisDimension; +import com.volmit.iris.util.Form; +import com.volmit.iris.util.M; +import com.volmit.iris.v2.generator.IrisEngineCompound; +import com.volmit.iris.v2.scaffold.hunk.Hunk; public class EngineCompositeGenerator extends ChunkGenerator implements Hotloadable { private EngineCompound compound; diff --git a/src/main/java/com/volmit/iris/v2/scaffold/engine/EngineCompound.java b/src/main/java/com/volmit/iris/v2/scaffold/engine/EngineCompound.java index 9b8db1c61..d9bb5d472 100644 --- a/src/main/java/com/volmit/iris/v2/scaffold/engine/EngineCompound.java +++ b/src/main/java/com/volmit/iris/v2/scaffold/engine/EngineCompound.java @@ -1,13 +1,13 @@ package com.volmit.iris.v2.scaffold.engine; -import com.volmit.iris.v2.scaffold.engine.Engine; -import com.volmit.iris.v2.scaffold.hunk.Hunk; -import com.volmit.iris.v2.scaffold.parallel.MultiBurst; import org.bukkit.World; import org.bukkit.block.Biome; import org.bukkit.block.data.BlockData; import org.bukkit.event.Listener; +import com.volmit.iris.v2.scaffold.hunk.Hunk; +import com.volmit.iris.v2.scaffold.parallel.MultiBurst; + public interface EngineCompound extends Listener { public void generate(int x, int z, Hunk blocks, Hunk biomes); diff --git a/src/main/java/com/volmit/iris/v2/scaffold/engine/EngineFramework.java b/src/main/java/com/volmit/iris/v2/scaffold/engine/EngineFramework.java index fd118517b..264465850 100644 --- a/src/main/java/com/volmit/iris/v2/scaffold/engine/EngineFramework.java +++ b/src/main/java/com/volmit/iris/v2/scaffold/engine/EngineFramework.java @@ -1,13 +1,11 @@ package com.volmit.iris.v2.scaffold.engine; +import org.bukkit.block.Biome; +import org.bukkit.block.data.BlockData; + import com.volmit.iris.manager.IrisDataManager; import com.volmit.iris.v2.generator.IrisComplex; -import com.volmit.iris.v2.generator.IrisEngine; import com.volmit.iris.v2.scaffold.data.DataProvider; -import com.volmit.iris.v2.scaffold.parallax.ParallaxAccess; -import com.volmit.iris.v2.scaffold.parallax.ParallaxWorld; -import org.bukkit.block.Biome; -import org.bukkit.block.data.BlockData; public interface EngineFramework extends DataProvider { diff --git a/src/main/java/com/volmit/iris/v2/scaffold/engine/EngineModifier.java b/src/main/java/com/volmit/iris/v2/scaffold/engine/EngineModifier.java index 3d2e243bc..b3f93344d 100644 --- a/src/main/java/com/volmit/iris/v2/scaffold/engine/EngineModifier.java +++ b/src/main/java/com/volmit/iris/v2/scaffold/engine/EngineModifier.java @@ -1,11 +1,6 @@ package com.volmit.iris.v2.scaffold.engine; -import com.volmit.iris.manager.IrisDataManager; -import com.volmit.iris.object.IrisDimension; -import com.volmit.iris.util.RollingSequence; -import com.volmit.iris.v2.generator.IrisComplex; import com.volmit.iris.v2.scaffold.hunk.Hunk; -import com.volmit.iris.v2.scaffold.parallax.ParallaxAccess; public interface EngineModifier extends EngineComponent { public void modify(Hunk t); diff --git a/src/main/java/com/volmit/iris/v2/scaffold/engine/EngineParallax.java b/src/main/java/com/volmit/iris/v2/scaffold/engine/EngineParallax.java index bc5049443..959976295 100644 --- a/src/main/java/com/volmit/iris/v2/scaffold/engine/EngineParallax.java +++ b/src/main/java/com/volmit/iris/v2/scaffold/engine/EngineParallax.java @@ -1,22 +1,31 @@ package com.volmit.iris.v2.scaffold.engine; +import java.util.concurrent.atomic.AtomicInteger; + +import org.bukkit.block.data.BlockData; +import org.bukkit.util.BlockVector; + import com.volmit.iris.Iris; -import com.volmit.iris.gen.ContextualTerrainProvider; import com.volmit.iris.manager.IrisDataManager; -import com.volmit.iris.object.*; -import com.volmit.iris.util.*; +import com.volmit.iris.object.IrisBiome; +import com.volmit.iris.object.IrisDepositGenerator; +import com.volmit.iris.object.IrisObject; +import com.volmit.iris.object.IrisObjectPlacement; +import com.volmit.iris.object.IrisRegion; +import com.volmit.iris.object.IrisTextPlacement; +import com.volmit.iris.util.B; +import com.volmit.iris.util.Form; +import com.volmit.iris.util.IObjectPlacer; +import com.volmit.iris.util.KList; +import com.volmit.iris.util.KSet; +import com.volmit.iris.util.RNG; import com.volmit.iris.v2.generator.IrisComplex; -import com.volmit.iris.v2.generator.IrisEngine; import com.volmit.iris.v2.scaffold.cache.Cache; import com.volmit.iris.v2.scaffold.data.DataProvider; import com.volmit.iris.v2.scaffold.hunk.Hunk; import com.volmit.iris.v2.scaffold.parallax.ParallaxAccess; import com.volmit.iris.v2.scaffold.parallel.BurstExecutor; import com.volmit.iris.v2.scaffold.parallel.MultiBurst; -import org.bukkit.block.data.BlockData; -import org.bukkit.util.BlockVector; - -import java.util.concurrent.atomic.AtomicInteger; public interface EngineParallax extends DataProvider, IObjectPlacer { @@ -157,7 +166,6 @@ public interface EngineParallax extends DataProvider, IObjectPlacer } } - IrisLock t = new IrisLock("t"); Iris.verbose("Checking sizes for " + Form.f(objects.size()) + " referenced objects."); BurstExecutor e = MultiBurst.burst.burst(objects.size()); for(String i : objects) diff --git a/src/main/java/com/volmit/iris/v2/scaffold/hunk/io/HunkRegionSlice.java b/src/main/java/com/volmit/iris/v2/scaffold/hunk/io/HunkRegionSlice.java index 6cedddfb7..bb82444ee 100644 --- a/src/main/java/com/volmit/iris/v2/scaffold/hunk/io/HunkRegionSlice.java +++ b/src/main/java/com/volmit/iris/v2/scaffold/hunk/io/HunkRegionSlice.java @@ -1,12 +1,18 @@ package com.volmit.iris.v2.scaffold.hunk.io; import java.io.IOException; -import java.util.concurrent.atomic.AtomicIntegerArray; -import com.volmit.iris.util.*; import org.bukkit.block.data.BlockData; import com.volmit.iris.Iris; +import com.volmit.iris.util.ByteArrayTag; +import com.volmit.iris.util.CompoundTag; +import com.volmit.iris.util.Function2; +import com.volmit.iris.util.Function3; +import com.volmit.iris.util.KList; +import com.volmit.iris.util.KMap; +import com.volmit.iris.util.M; +import com.volmit.iris.util.Tag; import com.volmit.iris.v2.scaffold.hunk.Hunk; public class HunkRegionSlice @@ -18,9 +24,9 @@ public class HunkRegionSlice private final HunkIOAdapter adapter; private final CompoundTag compound; private final String key; - private final KMap> loadedChunks; - private final KMap lastUse; - private final KList save; + private final KMap> loadedChunks; + private final KMap lastUse; + private final KList save; private final int height; public HunkRegionSlice(int height, Function3> factory, HunkIOAdapter adapter, CompoundTag compound, String key) @@ -42,11 +48,12 @@ public class HunkRegionSlice Iris.warn("Incorrect chunk use counts in " + key); } - for(Short i : lastUse.k()) + for(Long i : lastUse.k()) { if(M.ms() - lastUse.get(i) > t) { - unload((byte) (i & 0xFF), (byte) ((i >> 8) & 0xFF)); + System.out.println("Trying to unload " + i); + unload((int)(i >> 32), (int) i.longValue()); } } } @@ -67,9 +74,9 @@ public class HunkRegionSlice public void save() { - for(short i : save) + for(Long i : save) { - save((byte) (i & 0xFF), (byte) ((i >> 8) & 0xFF)); + save((int)(i >> 32), (int) i.longValue()); } save.clear(); @@ -105,9 +112,9 @@ public class HunkRegionSlice public synchronized void unloadAll() { - for(Short i : loadedChunks.k()) + for(Long i : loadedChunks.k()) { - unload((byte) (i & 0xFF), (byte) ((i >> 8) & 0xFF)); + unload((int)(i >> 32), (int) i.longValue()); } save.clear(); @@ -142,10 +149,11 @@ public class HunkRegionSlice public synchronized void unload(int x, int z) { - short key = ikey(x, z); - + long key = ikey(x, z); + System.out.println(x + "," + z + " = " + key); if(isLoaded(x, z)) { + System.out.println("HOT IT"); if(save.contains(key)) { save(x, z); @@ -155,6 +163,11 @@ public class HunkRegionSlice lastUse.remove(key); loadedChunks.remove(key); } + + else + { + System.out.println("IDK WHERE " + key + " IS"); + } } public synchronized Hunk load(int x, int z) @@ -191,7 +204,7 @@ public class HunkRegionSlice public Hunk get(int x, int z) { - short key = ikey(x, z); + long key = ikey(x, z); Hunk c = loadedChunks.get(key); @@ -200,7 +213,7 @@ public class HunkRegionSlice c = load(x, z); } - lastUse.put(ikey(x,z), M.ms()); + lastUse.put(ikey(x, z), M.ms()); return c; } @@ -216,9 +229,9 @@ public class HunkRegionSlice return get(x, z); } - private short ikey(int x, int z) + private long ikey(int x, int z) { - return ((short) (((x & 0xFF) << 8) | (z & 0xFF))); + return (((long) x) << 32) | (((long) z) & 0xffffffffL); } private String key(int x, int z) @@ -228,10 +241,11 @@ public class HunkRegionSlice throw new IndexOutOfBoundsException("The chunk " + x + " " + z + " is out of bounds max is 31x31"); } - return key + "." + Integer.toString(((short) (((x & 0xFF) << 8) | (z & 0xFF))), 36); + return key + "." + Long.toString(ikey(x,z), 36); } - public int getLoadCount() { + public int getLoadCount() + { return loadedChunks.size(); } } diff --git a/src/main/java/com/volmit/iris/v2/scaffold/parallax/ParallaxWorld.java b/src/main/java/com/volmit/iris/v2/scaffold/parallax/ParallaxWorld.java index a82b2abfc..d2c957c77 100644 --- a/src/main/java/com/volmit/iris/v2/scaffold/parallax/ParallaxWorld.java +++ b/src/main/java/com/volmit/iris/v2/scaffold/parallax/ParallaxWorld.java @@ -192,7 +192,7 @@ public class ParallaxWorld implements ParallaxAccess public void cleanup() { - cleanup(30000, 10000); + cleanup(10000, 3000); } @Override