mirror of
https://github.com/webbukkit/dynmap.git
synced 2024-09-27 13:22:34 +02:00
First pass of 1.18.2 spigot/paper support
This commit is contained in:
parent
19ee08716b
commit
d635473d50
2
bukkit-helper-118-2/.gitignore
vendored
Normal file
2
bukkit-helper-118-2/.gitignore
vendored
Normal file
@ -0,0 +1,2 @@
|
|||||||
|
/bin/
|
||||||
|
/build/
|
15
bukkit-helper-118-2/build.gradle
Normal file
15
bukkit-helper-118-2/build.gradle
Normal file
@ -0,0 +1,15 @@
|
|||||||
|
eclipse {
|
||||||
|
project {
|
||||||
|
name = "Dynmap(Spigot-1.18.2)"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
description = 'bukkit-helper-1.18.2'
|
||||||
|
|
||||||
|
dependencies {
|
||||||
|
implementation project(':bukkit-helper')
|
||||||
|
implementation project(':dynmap-api')
|
||||||
|
implementation project(path: ':DynmapCore', configuration: 'shadow')
|
||||||
|
implementation group: 'org.spigotmc', name: 'spigot-api', version:'1.18.2-R0.1-SNAPSHOT'
|
||||||
|
implementation group: 'org.spigotmc', name: 'spigot', version:'1.18.2-R0.1-SNAPSHOT'
|
||||||
|
}
|
@ -0,0 +1,443 @@
|
|||||||
|
package org.dynmap.bukkit.helper.v118_2;
|
||||||
|
|
||||||
|
import org.bukkit.*;
|
||||||
|
import org.bukkit.craftbukkit.v1_18_R2.CraftChunk;
|
||||||
|
import org.bukkit.craftbukkit.v1_18_R2.CraftWorld;
|
||||||
|
import org.bukkit.craftbukkit.v1_18_R2.entity.CraftPlayer;
|
||||||
|
import org.bukkit.entity.Player;
|
||||||
|
import org.dynmap.DynmapChunk;
|
||||||
|
import org.dynmap.Log;
|
||||||
|
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.renderer.DynmapBlockState;
|
||||||
|
import org.dynmap.utils.MapChunkCache;
|
||||||
|
import org.dynmap.utils.Polygon;
|
||||||
|
|
||||||
|
import com.google.common.collect.Iterables;
|
||||||
|
import com.google.gson.Gson;
|
||||||
|
import com.google.gson.GsonBuilder;
|
||||||
|
import com.google.gson.JsonParseException;
|
||||||
|
import com.mojang.authlib.GameProfile;
|
||||||
|
import com.mojang.authlib.properties.Property;
|
||||||
|
import com.mojang.authlib.properties.PropertyMap;
|
||||||
|
|
||||||
|
import net.minecraft.core.RegistryBlockID;
|
||||||
|
import net.minecraft.core.RegistryBlocks;
|
||||||
|
import net.minecraft.core.BlockPosition;
|
||||||
|
import net.minecraft.core.IRegistry;
|
||||||
|
import net.minecraft.nbt.NBTTagByteArray;
|
||||||
|
import net.minecraft.nbt.NBTTagByte;
|
||||||
|
import net.minecraft.nbt.NBTTagCompound;
|
||||||
|
import net.minecraft.nbt.NBTTagDouble;
|
||||||
|
import net.minecraft.nbt.NBTTagFloat;
|
||||||
|
import net.minecraft.nbt.NBTTagIntArray;
|
||||||
|
import net.minecraft.nbt.NBTTagInt;
|
||||||
|
import net.minecraft.nbt.NBTTagLong;
|
||||||
|
import net.minecraft.nbt.NBTTagShort;
|
||||||
|
import net.minecraft.nbt.NBTTagString;
|
||||||
|
import net.minecraft.resources.MinecraftKey;
|
||||||
|
import net.minecraft.nbt.NBTBase;
|
||||||
|
import net.minecraft.server.MinecraftServer;
|
||||||
|
import net.minecraft.world.level.BlockAccessAir;
|
||||||
|
import net.minecraft.world.level.biome.BiomeBase;
|
||||||
|
import net.minecraft.world.level.block.Block;
|
||||||
|
import net.minecraft.world.level.block.BlockFluids;
|
||||||
|
import net.minecraft.world.level.block.entity.TileEntity;
|
||||||
|
import net.minecraft.world.level.block.state.IBlockData;
|
||||||
|
|
||||||
|
import java.nio.charset.StandardCharsets;
|
||||||
|
import java.util.ArrayList;
|
||||||
|
import java.util.Arrays;
|
||||||
|
import java.util.Base64;
|
||||||
|
import java.util.Collection;
|
||||||
|
import java.util.HashMap;
|
||||||
|
import java.util.IdentityHashMap;
|
||||||
|
import java.util.Iterator;
|
||||||
|
import java.util.List;
|
||||||
|
import java.util.Map;
|
||||||
|
import java.util.Set;
|
||||||
|
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Helper for isolation of bukkit version specific issues
|
||||||
|
*/
|
||||||
|
public class BukkitVersionHelperSpigot118_2 extends BukkitVersionHelper {
|
||||||
|
|
||||||
|
public BukkitVersionHelperSpigot118_2() {
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Get block short name list
|
||||||
|
*/
|
||||||
|
@Override
|
||||||
|
public String[] getBlockNames() {
|
||||||
|
RegistryBlockID<IBlockData> bsids = Block.o;
|
||||||
|
Block baseb = null;
|
||||||
|
Iterator<IBlockData> iter = bsids.iterator();
|
||||||
|
ArrayList<String> names = new ArrayList<String>();
|
||||||
|
while (iter.hasNext()) {
|
||||||
|
IBlockData bs = iter.next();
|
||||||
|
Block b = bs.b();
|
||||||
|
// If this is new block vs last, it's the base block state
|
||||||
|
if (b != baseb) {
|
||||||
|
baseb = b;
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
MinecraftKey id = RegistryBlocks.U.b(b);
|
||||||
|
String bn = id.toString();
|
||||||
|
if (bn != null) {
|
||||||
|
names.add(bn);
|
||||||
|
Log.info("block=" + bn);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return names.toArray(new String[0]);
|
||||||
|
}
|
||||||
|
|
||||||
|
private static IRegistry<BiomeBase> reg = null;
|
||||||
|
|
||||||
|
private static IRegistry<BiomeBase> getBiomeReg() {
|
||||||
|
if (reg == null) {
|
||||||
|
reg = MinecraftServer.getServer().aU().d(IRegistry.aP);
|
||||||
|
}
|
||||||
|
return reg;
|
||||||
|
}
|
||||||
|
|
||||||
|
private Object[] biomelist;
|
||||||
|
/**
|
||||||
|
* Get list of defined biomebase objects
|
||||||
|
*/
|
||||||
|
@Override
|
||||||
|
public Object[] getBiomeBaseList() {
|
||||||
|
if (biomelist == null) {
|
||||||
|
biomelist = new BiomeBase[256];
|
||||||
|
Iterator<BiomeBase> iter = getBiomeReg().iterator();
|
||||||
|
while (iter.hasNext()) {
|
||||||
|
BiomeBase b = iter.next();
|
||||||
|
int bidx = getBiomeReg().a(b);
|
||||||
|
if (bidx >= biomelist.length) {
|
||||||
|
biomelist = Arrays.copyOf(biomelist, bidx + biomelist.length);
|
||||||
|
}
|
||||||
|
biomelist[bidx] = b;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return biomelist;
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Get ID from biomebase */
|
||||||
|
@Override
|
||||||
|
public int getBiomeBaseID(Object bb) {
|
||||||
|
return getBiomeReg().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>();
|
||||||
|
RegistryBlockID<IBlockData> bsids = Block.o;
|
||||||
|
Block baseb = null;
|
||||||
|
Iterator<IBlockData> iter = bsids.iterator();
|
||||||
|
ArrayList<String> names = new ArrayList<String>();
|
||||||
|
|
||||||
|
// Loop through block data states
|
||||||
|
DynmapBlockState.Builder bld = new DynmapBlockState.Builder();
|
||||||
|
while (iter.hasNext()) {
|
||||||
|
IBlockData bd = iter.next();
|
||||||
|
Block b = bd.b();
|
||||||
|
MinecraftKey id = RegistryBlocks.U.b(b);
|
||||||
|
String bname = id.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);
|
||||||
|
}
|
||||||
|
net.minecraft.world.level.material.Material mat = bd.c();
|
||||||
|
|
||||||
|
int lightAtten = b.g(bd, BlockAccessAir.a, BlockPosition.b); // getLightBlock
|
||||||
|
//Log.info("statename=" + bname + "[" + sb + "], lightAtten=" + lightAtten);
|
||||||
|
// Fill in base attributes
|
||||||
|
bld.setBaseState(lastbs).setStateIndex(idx).setBlockName(bname).setStateName(sb).setMaterial(mat.toString()).setAttenuatesLight(lightAtten);
|
||||||
|
if (mat.b()) { bld.setSolid(); }
|
||||||
|
if (mat == net.minecraft.world.level.material.Material.a) { bld.setAir(); }
|
||||||
|
if (mat == net.minecraft.world.level.material.Material.z) { bld.setLog(); }
|
||||||
|
if (mat == net.minecraft.world.level.material.Material.F) { bld.setLeaves(); }
|
||||||
|
if ((!bd.o().c()) && ((bd.b() instanceof BlockFluids) == false)) { // Test if fluid type for block is not empty
|
||||||
|
bld.setWaterlogged();
|
||||||
|
}
|
||||||
|
DynmapBlockState dbs = bld.build(); // Build state
|
||||||
|
|
||||||
|
dataToState.put(bd, dbs);
|
||||||
|
lastBlockState.put(bname, (lastbs == null) ? dbs : lastbs);
|
||||||
|
Log.verboseinfo("blk=" + bname + ", idx=" + idx + ", state=" + sb + ", waterlogged=" + dbs.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) {
|
||||||
|
MapChunkCache118_2 c = new MapChunkCache118_2(gencache);
|
||||||
|
c.setChunks(dw, chunks);
|
||||||
|
return c;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Get biome base water multiplier
|
||||||
|
*/
|
||||||
|
@Override
|
||||||
|
public int getBiomeBaseWaterMult(Object bb) {
|
||||||
|
BiomeBase biome = (BiomeBase) bb;
|
||||||
|
return biome.k(); // waterColor
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Get temperature from biomebase */
|
||||||
|
@Override
|
||||||
|
public float getBiomeBaseTemperature(Object bb) {
|
||||||
|
return ((BiomeBase)bb).i();
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Get humidity from biomebase */
|
||||||
|
@Override
|
||||||
|
public float getBiomeBaseHumidity(Object bb) {
|
||||||
|
return ((BiomeBase)bb).h();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public Polygon getWorldBorder(World world) {
|
||||||
|
Polygon p = null;
|
||||||
|
WorldBorder wb = world.getWorldBorder();
|
||||||
|
if (wb != null) {
|
||||||
|
Location c = wb.getCenter();
|
||||||
|
double size = wb.getSize();
|
||||||
|
if ((size > 1) && (size < 1E7)) {
|
||||||
|
size = size / 2;
|
||||||
|
p = new Polygon();
|
||||||
|
p.addVertex(c.getX()-size, c.getZ()-size);
|
||||||
|
p.addVertex(c.getX()+size, c.getZ()-size);
|
||||||
|
p.addVertex(c.getX()+size, c.getZ()+size);
|
||||||
|
p.addVertex(c.getX()-size, c.getZ()+size);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return p;
|
||||||
|
}
|
||||||
|
// Send title/subtitle to user
|
||||||
|
public void sendTitleText(Player p, String title, String subtitle, int fadeInTicks, int stayTicks, int fadeOutTIcks) {
|
||||||
|
if (p != null) {
|
||||||
|
p.sendTitle(title, subtitle, fadeInTicks, stayTicks, fadeOutTIcks);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Get material map by block ID
|
||||||
|
*/
|
||||||
|
@Override
|
||||||
|
public BukkitMaterial[] getMaterialList() {
|
||||||
|
return new BukkitMaterial[4096]; // Not used
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void unloadChunkNoSave(World w, org.bukkit.Chunk c, int cx, int cz) {
|
||||||
|
Log.severe("unloadChunkNoSave not implemented");
|
||||||
|
}
|
||||||
|
|
||||||
|
private String[] biomenames;
|
||||||
|
@Override
|
||||||
|
public String[] getBiomeNames() {
|
||||||
|
if (biomenames == null) {
|
||||||
|
biomenames = new String[256];
|
||||||
|
Iterator<BiomeBase> iter = getBiomeReg().iterator();
|
||||||
|
while (iter.hasNext()) {
|
||||||
|
BiomeBase b = iter.next();
|
||||||
|
int bidx = getBiomeReg().a(b);
|
||||||
|
if (bidx >= biomenames.length) {
|
||||||
|
biomenames = Arrays.copyOf(biomenames, bidx + biomenames.length);
|
||||||
|
}
|
||||||
|
biomenames[bidx] = b.toString();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return biomenames;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public String getStateStringByCombinedId(int blkid, int meta) {
|
||||||
|
Log.severe("getStateStringByCombinedId not implemented");
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
@Override
|
||||||
|
/** Get ID string from biomebase */
|
||||||
|
public String getBiomeBaseIDString(Object bb) {
|
||||||
|
return getBiomeReg().b((BiomeBase)bb).a();
|
||||||
|
}
|
||||||
|
@Override
|
||||||
|
public String getBiomeBaseResourceLocsation(Object bb) {
|
||||||
|
return getBiomeReg().b((BiomeBase)bb).toString();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public Object getUnloadQueue(World world) {
|
||||||
|
Log.warning("getUnloadQueue not implemented yet");
|
||||||
|
// TODO Auto-generated method stub
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean isInUnloadQueue(Object unloadqueue, int x, int z) {
|
||||||
|
Log.warning("isInUnloadQueue not implemented yet");
|
||||||
|
// TODO Auto-generated method stub
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public Object[] getBiomeBaseFromSnapshot(ChunkSnapshot css) {
|
||||||
|
Log.warning("getBiomeBaseFromSnapshot not implemented yet");
|
||||||
|
// TODO Auto-generated method stub
|
||||||
|
return new Object[256];
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public long getInhabitedTicks(Chunk c) {
|
||||||
|
return ((CraftChunk)c).getHandle().u();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public Map<?, ?> getTileEntitiesForChunk(Chunk c) {
|
||||||
|
return ((CraftChunk)c).getHandle().i;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public int getTileEntityX(Object te) {
|
||||||
|
TileEntity tileent = (TileEntity) te;
|
||||||
|
return tileent.p().u();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public int getTileEntityY(Object te) {
|
||||||
|
TileEntity tileent = (TileEntity) te;
|
||||||
|
return tileent.p().v();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public int getTileEntityZ(Object te) {
|
||||||
|
TileEntity tileent = (TileEntity) te;
|
||||||
|
return tileent.p().w();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public Object readTileEntityNBT(Object te) {
|
||||||
|
TileEntity tileent = (TileEntity) te;
|
||||||
|
NBTTagCompound nbt = tileent.n();
|
||||||
|
return nbt;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public Object getFieldValue(Object nbt, String field) {
|
||||||
|
NBTTagCompound rec = (NBTTagCompound) nbt;
|
||||||
|
NBTBase val = rec.c(field);
|
||||||
|
if(val == null) return null;
|
||||||
|
if(val instanceof NBTTagByte) {
|
||||||
|
return ((NBTTagByte)val).h();
|
||||||
|
}
|
||||||
|
else if(val instanceof NBTTagShort) {
|
||||||
|
return ((NBTTagShort)val).g();
|
||||||
|
}
|
||||||
|
else if(val instanceof NBTTagInt) {
|
||||||
|
return ((NBTTagInt)val).f();
|
||||||
|
}
|
||||||
|
else if(val instanceof NBTTagLong) {
|
||||||
|
return ((NBTTagLong)val).e();
|
||||||
|
}
|
||||||
|
else if(val instanceof NBTTagFloat) {
|
||||||
|
return ((NBTTagFloat)val).j();
|
||||||
|
}
|
||||||
|
else if(val instanceof NBTTagDouble) {
|
||||||
|
return ((NBTTagDouble)val).i();
|
||||||
|
}
|
||||||
|
else if(val instanceof NBTTagByteArray) {
|
||||||
|
return ((NBTTagByteArray)val).d();
|
||||||
|
}
|
||||||
|
else if(val instanceof NBTTagString) {
|
||||||
|
return ((NBTTagString)val).e_();
|
||||||
|
}
|
||||||
|
else if(val instanceof NBTTagIntArray) {
|
||||||
|
return ((NBTTagIntArray)val).f();
|
||||||
|
}
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public Player[] getOnlinePlayers() {
|
||||||
|
Collection<? extends Player> p = Bukkit.getServer().getOnlinePlayers();
|
||||||
|
return p.toArray(new Player[0]);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public double getHealth(Player p) {
|
||||||
|
return p.getHealth();
|
||||||
|
}
|
||||||
|
|
||||||
|
private static final Gson gson = new GsonBuilder().create();
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Get skin URL for player
|
||||||
|
* @param player
|
||||||
|
*/
|
||||||
|
@Override
|
||||||
|
public String getSkinURL(Player player) {
|
||||||
|
String url = null;
|
||||||
|
CraftPlayer cp = (CraftPlayer)player;
|
||||||
|
GameProfile profile = cp.getProfile();
|
||||||
|
if (profile != null) {
|
||||||
|
PropertyMap pm = profile.getProperties();
|
||||||
|
if (pm != null) {
|
||||||
|
Collection<Property> txt = pm.get("textures");
|
||||||
|
Property textureProperty = Iterables.getFirst(pm.get("textures"), null);
|
||||||
|
if (textureProperty != null) {
|
||||||
|
String val = textureProperty.getValue();
|
||||||
|
if (val != null) {
|
||||||
|
TexturesPayload result = null;
|
||||||
|
try {
|
||||||
|
String json = new String(Base64.getDecoder().decode(val), StandardCharsets.UTF_8);
|
||||||
|
result = gson.fromJson(json, TexturesPayload.class);
|
||||||
|
} catch (JsonParseException e) {
|
||||||
|
} catch (IllegalArgumentException x) {
|
||||||
|
Log.warning("Malformed response from skin URL check: " + val);
|
||||||
|
}
|
||||||
|
if ((result != null) && (result.textures != null) && (result.textures.containsKey("SKIN"))) {
|
||||||
|
url = result.textures.get("SKIN").url;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return url;
|
||||||
|
}
|
||||||
|
// Get minY for world
|
||||||
|
@Override
|
||||||
|
public int getWorldMinY(World w) {
|
||||||
|
CraftWorld cw = (CraftWorld) w;
|
||||||
|
return cw.getMinHeight();
|
||||||
|
}
|
||||||
|
@Override
|
||||||
|
public boolean useGenericCache() {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
@ -0,0 +1,67 @@
|
|||||||
|
package org.dynmap.bukkit.helper.v118_2;
|
||||||
|
|
||||||
|
import org.bukkit.World;
|
||||||
|
import org.bukkit.craftbukkit.v1_18_R2.CraftWorld;
|
||||||
|
import org.dynmap.DynmapChunk;
|
||||||
|
import org.dynmap.bukkit.helper.BukkitWorld;
|
||||||
|
import org.dynmap.common.chunk.GenericChunk;
|
||||||
|
import org.dynmap.common.chunk.GenericChunkCache;
|
||||||
|
import org.dynmap.common.chunk.GenericMapChunkCache;
|
||||||
|
|
||||||
|
import net.minecraft.nbt.NBTTagCompound;
|
||||||
|
import net.minecraft.world.level.ChunkCoordIntPair;
|
||||||
|
import net.minecraft.world.level.chunk.storage.ChunkRegionLoader;
|
||||||
|
import net.minecraft.world.level.chunk.Chunk;
|
||||||
|
|
||||||
|
import java.io.IOException;
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Container for managing chunks - dependent upon using chunk snapshots, since rendering is off server thread
|
||||||
|
*/
|
||||||
|
public class MapChunkCache118_2 extends GenericMapChunkCache {
|
||||||
|
private World w;
|
||||||
|
/**
|
||||||
|
* Construct empty cache
|
||||||
|
*/
|
||||||
|
public MapChunkCache118_2(GenericChunkCache cc) {
|
||||||
|
super(cc);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Load generic chunk from existing and already loaded chunk
|
||||||
|
protected GenericChunk getLoadedChunk(DynmapChunk chunk) {
|
||||||
|
CraftWorld cw = (CraftWorld) w;
|
||||||
|
NBTTagCompound nbt = null;
|
||||||
|
GenericChunk gc = null;
|
||||||
|
if (cw.isChunkLoaded(chunk.x, chunk.z)) {
|
||||||
|
Chunk c = cw.getHandle().getChunkIfLoaded(chunk.x, chunk.z);
|
||||||
|
if ((c != null) && c.o) { // c.loaded
|
||||||
|
nbt = ChunkRegionLoader.a(cw.getHandle(), c);
|
||||||
|
}
|
||||||
|
if (nbt != null) {
|
||||||
|
gc = parseChunkFromNBT(new NBT.NBTCompound(nbt));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return gc;
|
||||||
|
}
|
||||||
|
// Load generic chunk from unloaded chunk
|
||||||
|
protected GenericChunk loadChunk(DynmapChunk chunk) {
|
||||||
|
CraftWorld cw = (CraftWorld) w;
|
||||||
|
NBTTagCompound nbt = null;
|
||||||
|
ChunkCoordIntPair cc = new ChunkCoordIntPair(chunk.x, chunk.z);
|
||||||
|
GenericChunk gc = null;
|
||||||
|
try {
|
||||||
|
nbt = cw.getHandle().k().a.f(cc); // playerChunkMap
|
||||||
|
} catch (IOException iox) {
|
||||||
|
}
|
||||||
|
if (nbt != null) {
|
||||||
|
gc = parseChunkFromNBT(new NBT.NBTCompound(nbt));
|
||||||
|
}
|
||||||
|
return gc;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setChunks(BukkitWorld dw, List<DynmapChunk> chunks) {
|
||||||
|
this.w = dw.getWorld();
|
||||||
|
super.setChunks(dw, chunks);
|
||||||
|
}
|
||||||
|
}
|
@ -0,0 +1,126 @@
|
|||||||
|
package org.dynmap.bukkit.helper.v118_2;
|
||||||
|
|
||||||
|
import org.dynmap.common.chunk.GenericBitStorage;
|
||||||
|
import org.dynmap.common.chunk.GenericNBTCompound;
|
||||||
|
import org.dynmap.common.chunk.GenericNBTList;
|
||||||
|
|
||||||
|
import java.util.Set;
|
||||||
|
import net.minecraft.nbt.NBTTagCompound;
|
||||||
|
import net.minecraft.nbt.NBTTagList;
|
||||||
|
import net.minecraft.util.SimpleBitStorage;
|
||||||
|
|
||||||
|
public class NBT {
|
||||||
|
|
||||||
|
public static class NBTCompound implements GenericNBTCompound {
|
||||||
|
private final NBTTagCompound obj;
|
||||||
|
public NBTCompound(NBTTagCompound t) {
|
||||||
|
this.obj = t;
|
||||||
|
}
|
||||||
|
@Override
|
||||||
|
public Set<String> getAllKeys() {
|
||||||
|
return obj.d();
|
||||||
|
}
|
||||||
|
@Override
|
||||||
|
public boolean contains(String s) {
|
||||||
|
return obj.e(s);
|
||||||
|
}
|
||||||
|
@Override
|
||||||
|
public boolean contains(String s, int i) {
|
||||||
|
return obj.b(s, i);
|
||||||
|
}
|
||||||
|
@Override
|
||||||
|
public byte getByte(String s) {
|
||||||
|
return obj.f(s);
|
||||||
|
}
|
||||||
|
@Override
|
||||||
|
public short getShort(String s) {
|
||||||
|
return obj.g(s);
|
||||||
|
}
|
||||||
|
@Override
|
||||||
|
public int getInt(String s) {
|
||||||
|
return obj.h(s);
|
||||||
|
}
|
||||||
|
@Override
|
||||||
|
public long getLong(String s) {
|
||||||
|
return obj.i(s);
|
||||||
|
}
|
||||||
|
@Override
|
||||||
|
public float getFloat(String s) {
|
||||||
|
return obj.j(s);
|
||||||
|
}
|
||||||
|
@Override
|
||||||
|
public double getDouble(String s) {
|
||||||
|
return obj.k(s);
|
||||||
|
}
|
||||||
|
@Override
|
||||||
|
public String getString(String s) {
|
||||||
|
return obj.l(s);
|
||||||
|
}
|
||||||
|
@Override
|
||||||
|
public byte[] getByteArray(String s) {
|
||||||
|
return obj.m(s);
|
||||||
|
}
|
||||||
|
@Override
|
||||||
|
public int[] getIntArray(String s) {
|
||||||
|
return obj.n(s);
|
||||||
|
}
|
||||||
|
@Override
|
||||||
|
public long[] getLongArray(String s) {
|
||||||
|
return obj.o(s);
|
||||||
|
}
|
||||||
|
@Override
|
||||||
|
public GenericNBTCompound getCompound(String s) {
|
||||||
|
return new NBTCompound(obj.p(s));
|
||||||
|
}
|
||||||
|
@Override
|
||||||
|
public GenericNBTList getList(String s, int i) {
|
||||||
|
return new NBTList(obj.c(s, i));
|
||||||
|
}
|
||||||
|
@Override
|
||||||
|
public boolean getBoolean(String s) {
|
||||||
|
return obj.q(s);
|
||||||
|
}
|
||||||
|
@Override
|
||||||
|
public String getAsString(String s) {
|
||||||
|
return obj.c(s).e_();
|
||||||
|
}
|
||||||
|
@Override
|
||||||
|
public GenericBitStorage makeBitStorage(int bits, int count, long[] data) {
|
||||||
|
return new OurBitStorage(bits, count, data);
|
||||||
|
}
|
||||||
|
public String toString() {
|
||||||
|
return obj.toString();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
public static class NBTList implements GenericNBTList {
|
||||||
|
private final NBTTagList obj;
|
||||||
|
public NBTList(NBTTagList t) {
|
||||||
|
obj = t;
|
||||||
|
}
|
||||||
|
@Override
|
||||||
|
public int size() {
|
||||||
|
return obj.size();
|
||||||
|
}
|
||||||
|
@Override
|
||||||
|
public String getString(int idx) {
|
||||||
|
return obj.j(idx);
|
||||||
|
}
|
||||||
|
@Override
|
||||||
|
public GenericNBTCompound getCompound(int idx) {
|
||||||
|
return new NBTCompound(obj.a(idx));
|
||||||
|
}
|
||||||
|
public String toString() {
|
||||||
|
return obj.toString();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
public static class OurBitStorage implements GenericBitStorage {
|
||||||
|
private final SimpleBitStorage bs;
|
||||||
|
public OurBitStorage(int bits, int count, long[] data) {
|
||||||
|
bs = new SimpleBitStorage(bits, count, data);
|
||||||
|
}
|
||||||
|
@Override
|
||||||
|
public int get(int idx) {
|
||||||
|
return bs.a(idx);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
@ -2,35 +2,32 @@
|
|||||||
<projectDescription>
|
<projectDescription>
|
||||||
<name>Dynmap(Spigot-Common)</name>
|
<name>Dynmap(Spigot-Common)</name>
|
||||||
<comment>bukkit-helper</comment>
|
<comment>bukkit-helper</comment>
|
||||||
<projects>
|
<projects/>
|
||||||
</projects>
|
|
||||||
<buildSpec>
|
|
||||||
<buildCommand>
|
|
||||||
<name>org.eclipse.jdt.core.javabuilder</name>
|
|
||||||
<arguments>
|
|
||||||
</arguments>
|
|
||||||
</buildCommand>
|
|
||||||
<buildCommand>
|
|
||||||
<name>org.eclipse.buildship.core.gradleprojectbuilder</name>
|
|
||||||
<arguments>
|
|
||||||
</arguments>
|
|
||||||
</buildCommand>
|
|
||||||
<buildCommand>
|
|
||||||
<name>org.eclipse.m2e.core.maven2Builder</name>
|
|
||||||
<arguments>
|
|
||||||
</arguments>
|
|
||||||
</buildCommand>
|
|
||||||
</buildSpec>
|
|
||||||
<natures>
|
<natures>
|
||||||
<nature>org.eclipse.jdt.core.javanature</nature>
|
<nature>org.eclipse.jdt.core.javanature</nature>
|
||||||
<nature>org.eclipse.m2e.core.maven2Nature</nature>
|
<nature>org.eclipse.m2e.core.maven2Nature</nature>
|
||||||
<nature>org.eclipse.buildship.core.gradleprojectnature</nature>
|
<nature>org.eclipse.buildship.core.gradleprojectnature</nature>
|
||||||
</natures>
|
</natures>
|
||||||
|
<buildSpec>
|
||||||
|
<buildCommand>
|
||||||
|
<name>org.eclipse.jdt.core.javabuilder</name>
|
||||||
|
<arguments/>
|
||||||
|
</buildCommand>
|
||||||
|
<buildCommand>
|
||||||
|
<name>org.eclipse.buildship.core.gradleprojectbuilder</name>
|
||||||
|
<arguments/>
|
||||||
|
</buildCommand>
|
||||||
|
<buildCommand>
|
||||||
|
<name>org.eclipse.m2e.core.maven2Builder</name>
|
||||||
|
<arguments/>
|
||||||
|
</buildCommand>
|
||||||
|
</buildSpec>
|
||||||
|
<linkedResources/>
|
||||||
<filteredResources>
|
<filteredResources>
|
||||||
<filter>
|
<filter>
|
||||||
<id>1</id>
|
<id>1</id>
|
||||||
<name></name>
|
|
||||||
<type>30</type>
|
<type>30</type>
|
||||||
|
<name/>
|
||||||
<matcher>
|
<matcher>
|
||||||
<id>org.eclipse.core.resources.regexFilterMatcher</id>
|
<id>org.eclipse.core.resources.regexFilterMatcher</id>
|
||||||
<arguments>node_modules|.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__</arguments>
|
<arguments>node_modules|.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__</arguments>
|
||||||
|
@ -2,7 +2,7 @@ arguments=
|
|||||||
auto.sync=false
|
auto.sync=false
|
||||||
build.scans.enabled=false
|
build.scans.enabled=false
|
||||||
connection.gradle.distribution=GRADLE_DISTRIBUTION(VERSION(6.3))
|
connection.gradle.distribution=GRADLE_DISTRIBUTION(VERSION(6.3))
|
||||||
connection.project.dir=..
|
connection.project.dir=../bukkit-helper-118-2
|
||||||
eclipse.preferences.version=1
|
eclipse.preferences.version=1
|
||||||
gradle.user.home=
|
gradle.user.home=
|
||||||
java.home=/Library/Java/JavaVirtualMachines/jdk1.8.0_251.jdk/Contents/Home
|
java.home=/Library/Java/JavaVirtualMachines/jdk1.8.0_251.jdk/Contents/Home
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
#
|
#
|
||||||
#Thu Feb 17 22:40:49 CST 2022
|
#Mon Feb 28 17:07:38 CST 2022
|
||||||
org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
|
org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
|
||||||
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
|
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
|
||||||
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
|
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
|
||||||
|
@ -18,6 +18,7 @@ include ':bukkit-helper-116-3'
|
|||||||
include ':bukkit-helper-116-4'
|
include ':bukkit-helper-116-4'
|
||||||
include ':bukkit-helper-117'
|
include ':bukkit-helper-117'
|
||||||
include ':bukkit-helper-118'
|
include ':bukkit-helper-118'
|
||||||
|
include ':bukkit-helper-118-2'
|
||||||
include ':bukkit-helper'
|
include ':bukkit-helper'
|
||||||
include ':dynmap-api'
|
include ':dynmap-api'
|
||||||
include ':DynmapCore'
|
include ':DynmapCore'
|
||||||
@ -43,6 +44,7 @@ project(':bukkit-helper-116-3').projectDir = "$rootDir/bukkit-helper-116-3" as F
|
|||||||
project(':bukkit-helper-116-4').projectDir = "$rootDir/bukkit-helper-116-4" as File
|
project(':bukkit-helper-116-4').projectDir = "$rootDir/bukkit-helper-116-4" as File
|
||||||
project(':bukkit-helper-117').projectDir = "$rootDir/bukkit-helper-117" as File
|
project(':bukkit-helper-117').projectDir = "$rootDir/bukkit-helper-117" as File
|
||||||
project(':bukkit-helper-118').projectDir = "$rootDir/bukkit-helper-118" as File
|
project(':bukkit-helper-118').projectDir = "$rootDir/bukkit-helper-118" as File
|
||||||
|
project(':bukkit-helper-118-2').projectDir = "$rootDir/bukkit-helper-118-2" as File
|
||||||
project(':bukkit-helper').projectDir = "$rootDir/bukkit-helper" as File
|
project(':bukkit-helper').projectDir = "$rootDir/bukkit-helper" as File
|
||||||
project(':dynmap-api').projectDir = "$rootDir/dynmap-api" as File
|
project(':dynmap-api').projectDir = "$rootDir/dynmap-api" as File
|
||||||
project(':DynmapCore').projectDir = "$rootDir/DynmapCore" as File
|
project(':DynmapCore').projectDir = "$rootDir/DynmapCore" as File
|
||||||
|
@ -60,6 +60,9 @@ dependencies {
|
|||||||
implementation(project(':bukkit-helper-118')) {
|
implementation(project(':bukkit-helper-118')) {
|
||||||
transitive = false
|
transitive = false
|
||||||
}
|
}
|
||||||
|
implementation(project(':bukkit-helper-118-2')) {
|
||||||
|
transitive = false
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
processResources {
|
processResources {
|
||||||
@ -92,6 +95,7 @@ shadowJar {
|
|||||||
include(dependency(':bukkit-helper-116-4'))
|
include(dependency(':bukkit-helper-116-4'))
|
||||||
include(dependency(':bukkit-helper-117'))
|
include(dependency(':bukkit-helper-117'))
|
||||||
include(dependency(':bukkit-helper-118'))
|
include(dependency(':bukkit-helper-118'))
|
||||||
|
include(dependency(':bukkit-helper-118-2'))
|
||||||
}
|
}
|
||||||
relocate('org.bstats', 'org.dynmap.bstats')
|
relocate('org.bstats', 'org.dynmap.bstats')
|
||||||
destinationDir = file '../target'
|
destinationDir = file '../target'
|
||||||
|
@ -14,6 +14,7 @@ import org.dynmap.bukkit.helper.v116_3.BukkitVersionHelperSpigot116_3;
|
|||||||
import org.dynmap.bukkit.helper.v116_4.BukkitVersionHelperSpigot116_4;
|
import org.dynmap.bukkit.helper.v116_4.BukkitVersionHelperSpigot116_4;
|
||||||
import org.dynmap.bukkit.helper.v117.BukkitVersionHelperSpigot117;
|
import org.dynmap.bukkit.helper.v117.BukkitVersionHelperSpigot117;
|
||||||
import org.dynmap.bukkit.helper.v118.BukkitVersionHelperSpigot118;
|
import org.dynmap.bukkit.helper.v118.BukkitVersionHelperSpigot118;
|
||||||
|
import org.dynmap.bukkit.helper.v118_2.BukkitVersionHelperSpigot118_2;
|
||||||
|
|
||||||
public class Helper {
|
public class Helper {
|
||||||
|
|
||||||
@ -39,9 +40,12 @@ public class Helper {
|
|||||||
Log.info("Loading Glowstone support");
|
Log.info("Loading Glowstone support");
|
||||||
BukkitVersionHelper.helper = new BukkitVersionHelperGlowstone();
|
BukkitVersionHelper.helper = new BukkitVersionHelperGlowstone();
|
||||||
}
|
}
|
||||||
else if (v.contains("(MC: 1.18")) {
|
else if (v.contains("(MC: 1.18)") || (v.contains("(MC: 1.18.1)"))) {
|
||||||
BukkitVersionHelper.helper = new BukkitVersionHelperSpigot118();
|
BukkitVersionHelper.helper = new BukkitVersionHelperSpigot118();
|
||||||
}
|
}
|
||||||
|
else if (v.contains("(MC: 1.18")) {
|
||||||
|
BukkitVersionHelper.helper = new BukkitVersionHelperSpigot118_2();
|
||||||
|
}
|
||||||
else if (v.contains("(MC: 1.17")) {
|
else if (v.contains("(MC: 1.17")) {
|
||||||
BukkitVersionHelper.helper = new BukkitVersionHelperSpigot117();
|
BukkitVersionHelper.helper = new BukkitVersionHelperSpigot117();
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user