Upstream
/
dynmap
mirror of https://github.com/webbukkit/dynmap.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Add 1.13.2 Spigot support

This commit is contained in:
Mike Primm 2018-10-22 18:52:41 -05:00
parent d227d48ffb
commit 54ed4c7842
7 changed files with 261 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bukkit-helper-113-2/.gitignore vendored Normal file
View File

@ -0,0 +1,4 @@
/target/
/build/
/bin/
/.classpath

10
bukkit-helper-113-2/build.gradle Normal file
View File

@ -0,0 +1,10 @@
description = 'bukkit-helper-1.13.2'
dependencies {
compile project(':bukkit-helper')
compile project(':dynmap-api')
compile project(path: ':DynmapCore', configuration: 'shadow')
compile group: 'org.bukkit', name: 'bukkit', version:'1.13.2-R0.1-SNAPSHOT'
compile group: 'org.bukkit', name: 'craftbukkit', version:'1.13.2-R0.1-SNAPSHOT'
}

171
bukkit-helper-113-2/src/main/java/org/dynmap/bukkit/helper/v113_2/BukkitVersionHelperSpigot113_2.java Normal file
View File

@ -0,0 +1,171 @@
package org.dynmap.bukkit.helper.v113_2;
import java.lang.reflect.Field;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap;
import java.util.IdentityHashMap;
import java.util.List;
import java.util.Map;
import java.util.Set;
import org.bukkit.Bukkit;
import org.bukkit.Chunk;
import org.bukkit.ChunkSnapshot;
import org.bukkit.Server;
import org.bukkit.World;
import org.dynmap.DynmapChunk;
import org.dynmap.Log;
import org.dynmap.bukkit.helper.BukkitVersionHelper;
import org.dynmap.bukkit.helper.BukkitVersionHelperCB;
import org.dynmap.bukkit.helper.BukkitWorld;
import org.dynmap.bukkit.helper.v113_2.MapChunkCache113_2;
import org.dynmap.hdmap.HDBlockModels;
import org.dynmap.renderer.DynmapBlockState;
import org.dynmap.utils.MapChunkCache;
import org.dynmap.utils.Polygon;
import org.dynmap.common.BiomeMap;
import net.minecraft.server.v1_13_R2.BiomeBase;
import net.minecraft.server.v1_13_R2.Block;
import net.minecraft.server.v1_13_R2.BlockFluids;
import net.minecraft.server.v1_13_R2.BlockLogAbstract;
import net.minecraft.server.v1_13_R2.IBlockData;
import net.minecraft.server.v1_13_R2.IBlockState;
import net.minecraft.server.v1_13_R2.IRegistry;
import net.minecraft.server.v1_13_R2.Material;
/**
* Helper for isolation of bukkit version specific issues
*/
public class BukkitVersionHelperSpigot113_2 extends BukkitVersionHelperCB {
/** CraftChunkSnapshot */
protected Class<?> datapalettearray;
private Field blockid_field;
@Override
protected boolean isBlockIdNeeded() {
return false;
}
public BukkitVersionHelperSpigot113_2() {
datapalettearray = getNMSClass("[Lnet.minecraft.server.DataPaletteBlock;");
blockid_field = getPrivateField(craftchunksnapshot, new String[] { "blockids" }, datapalettearray);
}
@Override
public Object[] getBlockIDFieldFromSnapshot(ChunkSnapshot css) {
try {
return (Object[]) blockid_field.get(css);
} catch (IllegalArgumentException e) {
} catch (IllegalAccessException e) {
}
return null;
}
@Override
public void unloadChunkNoSave(World w, Chunk c, int cx, int cz) {
w.unloadChunk(cx, cz, false, false);
}
private String stripBlockString(String bname) {
int idx = bname.indexOf('{');
if (idx >= 0) bname = bname.substring(idx+1);
idx = bname.indexOf('}');
if (idx >= 0) bname = bname.substring(0, idx);
return bname;
}
/**
* Get block short name list
*/
@Override
public String[] getBlockNames() {
int cnt = Block.REGISTRY_ID.a();
String[] names = new String[cnt];
for (int i = 0; i < cnt; i++) {
IBlockData bd = Block.getByCombinedId(i);
names[i] = IRegistry.BLOCK.getKey(bd.getBlock()).toString();
Log.info(i + ": blk=" + names[i] + ", bd=" + bd.toString());
}
return names;
}
/** Get ID from biomebase */
@Override
public int getBiomeBaseID(Object bb) {
return IRegistry.BIOME.a((BiomeBase)bb);
}
public static IdentityHashMap<IBlockData, DynmapBlockState> dataToState;
/**
* Initialize block states (org.dynmap.blockstate.DynmapBlockState)
*/
@Override
public void initializeBlockStates() {
dataToState = new IdentityHashMap<IBlockData, DynmapBlockState>();
HashMap<String, DynmapBlockState> lastBlockState = new HashMap<String, DynmapBlockState>();
int cnt = Block.REGISTRY_ID.a();
// Loop through block data states
for (int i = 0; i < cnt; i++) {
IBlockData bd = Block.getByCombinedId(i);
String bname = IRegistry.BLOCK.getKey(bd.getBlock()).toString();
DynmapBlockState lastbs = lastBlockState.get(bname); // See if we have seen this one
int idx = 0;
if (lastbs != null) { // Yes
idx = lastbs.getStateCount(); // Get number of states so far, since this is next
}
// Build state name
String sb = "";
String fname = bd.toString();
int off1 = fname.indexOf('[');
if (off1 >= 0) {
int off2 = fname.indexOf(']');
sb = fname.substring(off1+1, off2);
}
DynmapBlockState bs = new DynmapBlockState(lastbs, idx, bname, sb);
if ((!bd.s().e()) && ((bd.getBlock() instanceof BlockFluids) == false)) { // Test if fluid type for block is not empty
bs.setWaterlogged();
}
if (bd.getMaterial() == Material.AIR) {
bs.setAir();
}
if (bd.getMaterial() == Material.LEAVES) {
bs.setLeaves();
}
if (bd.getBlock() instanceof BlockLogAbstract) {
bs.setLog();
}
if (bd.getMaterial().isSolid()) {
bs.setSolid();
}
dataToState.put(bd, bs);
lastBlockState.put(bname, (lastbs == null) ? bs : lastbs);
Log.verboseinfo(i + ": blk=" + bname + ", idx=" + idx + ", state=" + sb + ", waterlogged=" + bs.isWaterlogged());
}
}
/**
* Create chunk cache for given chunks of given world
* @param dw - world
* @param chunks - chunk list
* @return cache
*/
@Override
public MapChunkCache getChunkCache(BukkitWorld dw, List<DynmapChunk> chunks) {
MapChunkCache113_2 c = new MapChunkCache113_2();
c.setChunks(dw, chunks);
return c;
}
/**
* Get biome base water multiplier
*/
@Override
public int getBiomeBaseWaterMult(Object bb) {
return ((BiomeBase)bb).n();
}
}

66
bukkit-helper-113-2/src/main/java/org/dynmap/bukkit/helper/v113_2/MapChunkCache113_2.java Normal file
View File

@ -0,0 +1,66 @@
package org.dynmap.bukkit.helper.v113_2;
import org.bukkit.block.Biome;
import org.bukkit.ChunkSnapshot;
import org.dynmap.bukkit.helper.AbstractMapChunkCache;
import org.dynmap.bukkit.helper.BukkitVersionHelper;
import org.dynmap.renderer.DynmapBlockState;
import net.minecraft.server.v1_13_R2.DataPaletteBlock;
/**
* Container for managing chunks - dependent upon using chunk snapshots, since rendering is off server thread
*/
public class MapChunkCache113_2 extends AbstractMapChunkCache {
public static class WrappedSnapshot implements Snapshot {
private final ChunkSnapshot ss;
private final DataPaletteBlock[] blockids;
private final int sectionmask;
public WrappedSnapshot(ChunkSnapshot ss) {
this.ss = ss;
blockids = (DataPaletteBlock[]) BukkitVersionHelper.helper.getBlockIDFieldFromSnapshot(ss);
int mask = 0;
for (int i = 0; i < blockids.length; i++) {
if (ss.isSectionEmpty(i))
mask |= (1 << i);
}
sectionmask = mask;
}
@Override
public final DynmapBlockState getBlockType(int x, int y, int z) {
if ((sectionmask & (1 << (y >> 4))) != 0)
return DynmapBlockState.AIR;
return BukkitVersionHelperSpigot113_2.dataToState.getOrDefault(blockids[y >> 4].a(x & 0xF, y & 0xF, z & 0xF), DynmapBlockState.AIR);
}
@Override
public final int getBlockSkyLight(int x, int y, int z) {
return ss.getBlockSkyLight(x, y, z);
}
@Override
public final int getBlockEmittedLight(int x, int y, int z) {
return ss.getBlockEmittedLight(x, y, z);
}
@Override
public final int getHighestBlockYAt(int x, int z) {
return ss.getHighestBlockYAt(x, z);
}
@Override
public final Biome getBiome(int x, int z) {
return ss.getBiome(x, z);
}
@Override
public final boolean isSectionEmpty(int sy) {
return (sectionmask & (1 << sy)) != 0;
}
@Override
public final Object[] getBiomeBaseFromSnapshot() {
return BukkitVersionHelper.helper.getBiomeBaseFromSnapshot(ss);
}
}
@Override
public Snapshot wrapChunkSnapshot(ChunkSnapshot css) {
return new WrappedSnapshot(css);
}
}

2
settings.gradle
View File

@ -2,6 +2,7 @@ rootProject.name = 'dynmap-common'
include ':spigot'
include ':bukkit-helper-113'
include ':bukkit-helper-113-1'
include ':bukkit-helper-113-2'
include ':bukkit-helper'
include ':dynmap-api'
include ':DynmapCore'
@ -15,6 +16,7 @@ include ':forge-1.8.9'
project(':spigot').projectDir = "$rootDir/spigot" as File
project(':bukkit-helper-113').projectDir = "$rootDir/bukkit-helper-113" as File
project(':bukkit-helper-113-1').projectDir = "$rootDir/bukkit-helper-113-1" as File
project(':bukkit-helper-113-2').projectDir = "$rootDir/bukkit-helper-113-2" as File
project(':bukkit-helper').projectDir = "$rootDir/bukkit-helper" as File
project(':dynmap-api').projectDir = "$rootDir/dynmap-api" as File
project(':DynmapCore').projectDir = "$rootDir/DynmapCore" as File

4
spigot/build.gradle
View File

@ -20,6 +20,9 @@ dependencies {
implementation(project(':bukkit-helper-113-1')) {
transitive = false
}
implementation(project(':bukkit-helper-113-2')) {
transitive = false
}
}
processResources {
@ -46,6 +49,7 @@ shadowJar {
include(dependency(':bukkit-helper'))
include(dependency(':bukkit-helper-113'))
include(dependency(':bukkit-helper-113-1'))
include(dependency(':bukkit-helper-113-2'))
}
relocate('org.bstats', 'org.dynmap.bstats')
destinationDir = file '../target'

4
spigot/src/main/java/org/dynmap/bukkit/Helper.java
View File

@ -7,6 +7,7 @@ import org.dynmap.bukkit.helper.BukkitVersionHelperCB;
import org.dynmap.bukkit.helper.BukkitVersionHelperGlowstone;
import org.dynmap.bukkit.helper.v113.BukkitVersionHelperSpigot113;
import org.dynmap.bukkit.helper.v113_1.BukkitVersionHelperSpigot113_1;
import org.dynmap.bukkit.helper.v113_2.BukkitVersionHelperSpigot113_2;
public class Helper {
@ -32,6 +33,9 @@ public class Helper {
Log.info("Loading Glowstone support");
BukkitVersionHelper.helper = new BukkitVersionHelperGlowstone();
}
else if (v.contains("(MC: 1.13.2)")) {
BukkitVersionHelper.helper = new BukkitVersionHelperSpigot113_2();
}
else if (v.contains("(MC: 1.13.1)")) {
BukkitVersionHelper.helper = new BukkitVersionHelperSpigot113_1();
}