diff --git a/README.md b/README.md index 00c532bc..aca520a4 100644 --- a/README.md +++ b/README.md @@ -38,24 +38,17 @@ The following target platforms are supported, and you can find them at the links | Server type | Version | Dynmap JAR | Where? | | ------------ | ------- | ---------- | ------ | -| Spigot/PaperMC | ≤1.17.1 | `Dynmap--spigot.jar` | [SpigotMC](https://www.spigotmc.org/resources/dynmap.274/) | -| Spigot/PaperMC | ≤1.17.1 | `Dynmap--spigot.jar` | [GitHub Releases](https://github.com/webbukkit/dynmap/releases) | +| Spigot/PaperMC | ≤1.18 | `Dynmap--spigot.jar` | [SpigotMC](https://www.spigotmc.org/resources/dynmap.274/) | +| Spigot/PaperMC | ≤1.18 | `Dynmap--spigot.jar` | [GitHub Releases](https://github.com/webbukkit/dynmap/releases) | | Forge | 1.11.2 | `Dynmap--forge-1.11.2.jar` | [GitHub Releases](https://github.com/webbukkit/dynmap/releases) | | Forge | 1.12.2 | `Dynmap--forge-1.12.2.jar` | [GitHub Releases](https://github.com/webbukkit/dynmap/releases) | | Forge | 1.13.2 | `Dynmap--forge-1.13.2.jar` | [GitHub Releases](https://github.com/webbukkit/dynmap/releases) | | Forge | 1.14.4 | `Dynmap--forge-1.14.4.jar` | [GitHub Releases](https://github.com/webbukkit/dynmap/releases) | | Forge | 1.15.2 | `Dynmap--forge-1.15.2.jar` | [GitHub Releases](https://github.com/webbukkit/dynmap/releases) | -| Forge | 1.16.1 | `Dynmap--forge-1.16.1.jar` | [GitHub Releases](https://github.com/webbukkit/dynmap/releases) | -| Forge | 1.16.2 | `Dynmap--forge-1.16.2.jar` | [Curseforge](https://www.curseforge.com/minecraft/mc-mods/dynmapforge) | -| Forge | 1.16.3 | `Dynmap--forge-1.16.3.jar` | [Curseforge](https://www.curseforge.com/minecraft/mc-mods/dynmapforge) | -| Forge | 1.16.4 | `Dynmap--forge-1.16.4.jar` | [Curseforge](https://www.curseforge.com/minecraft/mc-mods/dynmapforge) | | Forge | 1.16.5 | `Dynmap--forge-1.16.5.jar` | [Curseforge](https://www.curseforge.com/minecraft/mc-mods/dynmapforge) | | Forge | 1.17.1 | `Dynmap--forge-1.17.1.jar` | [Curseforge](https://www.curseforge.com/minecraft/mc-mods/dynmapforge) | | Fabric | 1.15.2 | `Dynmap--fabric-1.15.2.jar` | [Curseforge](https://www.curseforge.com/minecraft/mc-mods/dynmapforge) | -| Fabric | 1.16.1 | `Dynmap--fabric-1.16.1.jar` | [Curseforge](https://www.curseforge.com/minecraft/mc-mods/dynmapforge) | -| Fabric | 1.16.2 | `Dynmap--fabric-1.16.2.jar` | [Curseforge](https://www.curseforge.com/minecraft/mc-mods/dynmapforge) | | Fabric | 1.16.4 | `Dynmap--fabric-1.16.4.jar` | [Curseforge](https://www.curseforge.com/minecraft/mc-mods/dynmapforge) | -| Fabric | 1.17 | `Dynmap--fabric-1.17.jar` | [Curseforge](https://www.curseforge.com/minecraft/mc-mods/dynmapforge) | | Fabric | 1.17.1 | `Dynmap--fabric-1.17.1.jar` | [Curseforge](https://www.curseforge.com/minecraft/mc-mods/dynmapforge) | | Fabric | 1.18 | `Dynmap--fabric-1.18.jar` | [Curseforge](https://www.curseforge.com/minecraft/mc-mods/dynmapforge) | @@ -143,4 +136,4 @@ We also have a subreddit located at https://www.reddit.com/r/Dynmap/ I've set up a coffee-fund jar (I believe in the theory that software developers are machines that turn caffeine into code), for anyone who wants to throw in some tips! I've got a Patreon here - https://www.patreon.com/dynmap, and for folks just looking to for a one-time coffee buy, hit my Ko-Fi at https://ko-fi.com/michaelprimm ! -Dynmap is a registed trademark of Michael Primm, TX USA. All Rights Reserved. +Dynmap is a registered trademark of Michael Primm, TX USA. All Rights Reserved. diff --git a/bukkit-helper-118/src/main/java/org/dynmap/bukkit/helper/v118/BukkitVersionHelperSpigot118.java b/bukkit-helper-118/src/main/java/org/dynmap/bukkit/helper/v118/BukkitVersionHelperSpigot118.java index f66c44fb..3b7a266e 100644 --- a/bukkit-helper-118/src/main/java/org/dynmap/bukkit/helper/v118/BukkitVersionHelperSpigot118.java +++ b/bukkit-helper-118/src/main/java/org/dynmap/bukkit/helper/v118/BukkitVersionHelperSpigot118.java @@ -11,7 +11,6 @@ import org.dynmap.bukkit.helper.BukkitMaterial; import org.dynmap.bukkit.helper.BukkitVersionHelper; import org.dynmap.bukkit.helper.BukkitWorld; import org.dynmap.bukkit.helper.BukkitVersionHelperGeneric.TexturesPayload; -import org.dynmap.bukkit.helper.v118.MapChunkCache118; import org.dynmap.renderer.DynmapBlockState; import org.dynmap.utils.MapChunkCache; import org.dynmap.utils.Polygon; diff --git a/bukkit-helper-118/src/main/java/org/dynmap/bukkit/helper/v118/MapChunkCache118.java b/bukkit-helper-118/src/main/java/org/dynmap/bukkit/helper/v118/MapChunkCache118.java index 8ff717c2..dc18cf62 100644 --- a/bukkit-helper-118/src/main/java/org/dynmap/bukkit/helper/v118/MapChunkCache118.java +++ b/bukkit-helper-118/src/main/java/org/dynmap/bukkit/helper/v118/MapChunkCache118.java @@ -16,11 +16,9 @@ import org.dynmap.utils.DataBitsPacked; import org.dynmap.utils.DynIntHashMap; import org.dynmap.utils.VisibilityLimit; -import jline.internal.Log; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import net.minecraft.util.DataBits; -import net.minecraft.util.MathHelper; import net.minecraft.util.SimpleBitStorage; import net.minecraft.world.level.ChunkCoordIntPair; import net.minecraft.world.level.chunk.ChunkStatus; @@ -57,7 +55,6 @@ public class MapChunkCache118 extends AbstractMapChunkCache { private static final int BLOCKS_PER_SECTION = 16 * 16 * 16; private static final int BIOMES_PER_SECTION = 4 * 4 * 4; private static final int COLUMNS_PER_CHUNK = 16 * 16; - private static final int V1_15_BIOME_PER_CHUNK = 4 * 4 * 64; private static final byte[] emptyData = new byte[BLOCKS_PER_SECTION / 2]; private static final byte[] fullData = new byte[BLOCKS_PER_SECTION / 2];