From 5e12090f95caecb683c8609a66aa18f9757da5a5 Mon Sep 17 00:00:00 2001 From: Mike Primm Date: Tue, 7 Dec 2021 00:24:05 -0600 Subject: [PATCH] Additional tuning --- .../common/chunk/GenericMapChunkCache.java | 22 ++++++------- .../fabric_1_17_1/FabricMapChunkCache.java | 8 ----- .../org/dynmap/forge_1_18/DynmapPlugin.java | 1 - .../dynmap/forge_1_18/ForgeMapChunkCache.java | 31 ------------------- 4 files changed, 11 insertions(+), 51 deletions(-) diff --git a/DynmapCore/src/main/java/org/dynmap/common/chunk/GenericMapChunkCache.java b/DynmapCore/src/main/java/org/dynmap/common/chunk/GenericMapChunkCache.java index 163caca7..36785f92 100644 --- a/DynmapCore/src/main/java/org/dynmap/common/chunk/GenericMapChunkCache.java +++ b/DynmapCore/src/main/java/org/dynmap/common/chunk/GenericMapChunkCache.java @@ -371,7 +371,7 @@ public abstract class GenericMapChunkCache extends MapChunkCache { * Unstep current position to previous position */ @Override - public BlockStep unstepPosition() { + public final BlockStep unstepPosition() { BlockStep ls = laststep; stepPosition(unstep[ls.ordinal()]); return ls; @@ -381,7 +381,7 @@ public abstract class GenericMapChunkCache extends MapChunkCache { * Unstep current position in oppisite director of given step */ @Override - public void unstepPosition(BlockStep s) { + public final void unstepPosition(BlockStep s) { stepPosition(unstep[s.ordinal()]); } @@ -440,17 +440,17 @@ public abstract class GenericMapChunkCache extends MapChunkCache { } @Override - public BlockStep getLastStep() { + public final BlockStep getLastStep() { return laststep; } @Override - public int getWorldHeight() { + public final int getWorldHeight() { return worldheight; } @Override - public long getBlockKey() { + public final long getBlockKey() { return (((chunkindex * (worldheight - ymin)) + (y - ymin)) << 8) | (bx << 4) | bz; } @@ -465,18 +465,18 @@ public abstract class GenericMapChunkCache extends MapChunkCache { } @Override - public RenderPatchFactory getPatchFactory() { + public final RenderPatchFactory getPatchFactory() { return HDBlockModels.getPatchDefinitionFactory(); } @Override - public Object getBlockTileEntityField(String fieldId) { + public final Object getBlockTileEntityField(String fieldId) { // TODO: handle tile entities here return null; } @Override - public DynmapBlockState getBlockTypeAt(int xoff, int yoff, int zoff) { + public final DynmapBlockState getBlockTypeAt(int xoff, int yoff, int zoff) { int xx = this.x + xoff; int yy = this.y + yoff; int zz = this.z + zoff; @@ -489,12 +489,12 @@ public abstract class GenericMapChunkCache extends MapChunkCache { } @Override - public Object getBlockTileEntityFieldAt(String fieldId, int xoff, int yoff, int zoff) { + public final Object getBlockTileEntityFieldAt(String fieldId, int xoff, int yoff, int zoff) { return null; } @Override - public long getInhabitedTicks() { + public final long getInhabitedTicks() { try { return snap.getInhabitedTicks(); } catch (Exception x) { @@ -503,7 +503,7 @@ public abstract class GenericMapChunkCache extends MapChunkCache { } @Override - public DynmapBlockState getBlockType() { + public final DynmapBlockState getBlockType() { if (blk == null) { blk = snap.getBlockType(bx, y, bz); } diff --git a/fabric-1.17.1/src/main/java/org/dynmap/fabric_1_17_1/FabricMapChunkCache.java b/fabric-1.17.1/src/main/java/org/dynmap/fabric_1_17_1/FabricMapChunkCache.java index 0239e687..ef14b435 100644 --- a/fabric-1.17.1/src/main/java/org/dynmap/fabric_1_17_1/FabricMapChunkCache.java +++ b/fabric-1.17.1/src/main/java/org/dynmap/fabric_1_17_1/FabricMapChunkCache.java @@ -5,23 +5,15 @@ import net.minecraft.server.world.ServerChunkManager; import net.minecraft.server.world.ServerWorld; import net.minecraft.server.world.ThreadedAnvilChunkStorage; import net.minecraft.util.math.ChunkPos; -import net.minecraft.util.registry.Registry; import net.minecraft.world.ChunkSerializer; import net.minecraft.world.World; -import net.minecraft.world.biome.Biome; import net.minecraft.world.chunk.ChunkManager; import net.minecraft.world.chunk.ChunkStatus; import org.dynmap.DynmapChunk; -import org.dynmap.DynmapCore; -import org.dynmap.DynmapWorld; import org.dynmap.Log; -import org.dynmap.common.BiomeMap; import org.dynmap.common.chunk.GenericChunk; import org.dynmap.common.chunk.GenericMapChunkCache; -import org.dynmap.hdmap.HDBlockModels; -import org.dynmap.utils.*; -import java.lang.reflect.Field; import java.util.*; diff --git a/forge-1.18/src/main/java/org/dynmap/forge_1_18/DynmapPlugin.java b/forge-1.18/src/main/java/org/dynmap/forge_1_18/DynmapPlugin.java index eef644fd..78fd199f 100644 --- a/forge-1.18/src/main/java/org/dynmap/forge_1_18/DynmapPlugin.java +++ b/forge-1.18/src/main/java/org/dynmap/forge_1_18/DynmapPlugin.java @@ -2,7 +2,6 @@ package org.dynmap.forge_1_18; import java.io.File; import java.io.InputStream; -import java.lang.reflect.Field; import java.net.InetSocketAddress; import java.net.SocketAddress; import java.util.ArrayList; diff --git a/forge-1.18/src/main/java/org/dynmap/forge_1_18/ForgeMapChunkCache.java b/forge-1.18/src/main/java/org/dynmap/forge_1_18/ForgeMapChunkCache.java index 2716d357..dcef0bd1 100644 --- a/forge-1.18/src/main/java/org/dynmap/forge_1_18/ForgeMapChunkCache.java +++ b/forge-1.18/src/main/java/org/dynmap/forge_1_18/ForgeMapChunkCache.java @@ -1,48 +1,17 @@ package org.dynmap.forge_1_18; -import java.lang.reflect.Field; -import java.util.ArrayList; -import java.util.HashMap; import java.util.List; -import java.util.ListIterator; import org.dynmap.DynmapChunk; -import org.dynmap.DynmapCore; -import org.dynmap.DynmapWorld; import org.dynmap.Log; -import org.dynmap.common.BiomeMap; import org.dynmap.common.chunk.GenericChunk; import org.dynmap.common.chunk.GenericChunkCache; -import org.dynmap.common.chunk.GenericChunkSection; import org.dynmap.common.chunk.GenericMapChunkCache; -import org.dynmap.hdmap.HDBlockModels; -import org.dynmap.renderer.DynmapBlockState; -import org.dynmap.renderer.RenderPatchFactory; -import org.dynmap.utils.DynIntHashMap; -import org.dynmap.utils.MapChunkCache; -import org.dynmap.utils.MapIterator; -import org.dynmap.utils.BlockStep; -import org.dynmap.utils.DataBitsPacked; -import org.dynmap.utils.VisibilityLimit; -import net.minecraft.util.BitStorage; -import net.minecraft.util.SimpleBitStorage; -import net.minecraft.nbt.ByteArrayTag; -import net.minecraft.nbt.ByteTag; import net.minecraft.nbt.CompoundTag; -import net.minecraft.nbt.DoubleTag; -import net.minecraft.nbt.FloatTag; -import net.minecraft.nbt.IntArrayTag; -import net.minecraft.nbt.IntTag; -import net.minecraft.nbt.ListTag; -import net.minecraft.nbt.LongTag; -import net.minecraft.nbt.ShortTag; -import net.minecraft.nbt.StringTag; -import net.minecraft.nbt.Tag; import net.minecraft.server.level.ServerChunkCache; import net.minecraft.server.level.ServerLevel; import net.minecraft.world.level.ChunkPos; -import net.minecraft.world.level.biome.Biome; import net.minecraft.world.level.chunk.ChunkAccess; import net.minecraft.world.level.chunk.ChunkStatus; import net.minecraft.world.level.chunk.storage.ChunkSerializer;