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

Fix spaces 

* fix 1.16.2 spaces

* fix 1.16.4 spaces

* fix 1.16

* fix 1.16.0 x2

* fix 1.17

* fix 1.18.2

* fix 1.18.2 map cache

* fix 1.18.2 map cache p2

* fix 1.18

* fix 1.16.3
This commit is contained in:
mastermc05 2022-03-30 15:39:58 +03:00 committed by GitHub
parent b0f0a4deb5
commit de510108a2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 105 additions and 107 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
bukkit-helper-116-2/src/main/java/org/dynmap/bukkit/helper/v116_2/BukkitVersionHelperSpigot116_2.java
View File

@ -37,14 +37,14 @@ import net.minecraft.server.v1_16_R2.MinecraftServer;
* Helper for isolation of bukkit version specific issues * Helper for isolation of bukkit version specific issues
*/ */
public class BukkitVersionHelperSpigot116_2 extends BukkitVersionHelperGeneric { public class BukkitVersionHelperSpigot116_2 extends BukkitVersionHelperGeneric {
private final boolean unsafeAsync; private final boolean unsafeAsync;
private Field watercolorfield; private Field watercolorfield;
public BukkitVersionHelperSpigot116_2() { public BukkitVersionHelperSpigot116_2() {
Class biomefog = getNMSClass("net.minecraft.server.BiomeFog"); Class biomefog = getNMSClass("net.minecraft.server.BiomeFog");
watercolorfield = getPrivateField(biomefog, new String[] { "c" }, int.class); watercolorfield = getPrivateField(biomefog, new String[] { "c" }, int.class);
this.unsafeAsync = true; this.unsafeAsync = true;
} }
/** /**
* Get block short name list * Get block short name list

22
bukkit-helper-116-3/src/main/java/org/dynmap/bukkit/helper/v116_3/BukkitVersionHelperSpigot116_3.java
View File

@ -37,14 +37,14 @@ import net.minecraft.server.v1_16_R2.BlockPosition;
* Helper for isolation of bukkit version specific issues * Helper for isolation of bukkit version specific issues
*/ */
public class BukkitVersionHelperSpigot116_3 extends BukkitVersionHelperGeneric { public class BukkitVersionHelperSpigot116_3 extends BukkitVersionHelperGeneric {
private final boolean unsafeAsync; private final boolean unsafeAsync;
private Field watercolorfield; private Field watercolorfield;
public BukkitVersionHelperSpigot116_3() { public BukkitVersionHelperSpigot116_3() {
Class biomefog = getNMSClass("net.minecraft.server.BiomeFog"); Class biomefog = getNMSClass("net.minecraft.server.BiomeFog");
watercolorfield = getPrivateField(biomefog, new String[] { "c" }, int.class); watercolorfield = getPrivateField(biomefog, new String[] { "c" }, int.class);
this.unsafeAsync = true; this.unsafeAsync = true;
} }
/** /**
* Get block short name list * Get block short name list
@ -72,12 +72,12 @@ public class BukkitVersionHelperSpigot116_3 extends BukkitVersionHelperGeneric {
private Object[] biomelist; private Object[] biomelist;
@Override @Override
public boolean isUnsafeAsync() { public boolean isUnsafeAsync() {
return unsafeAsync; return unsafeAsync;
} }
/** /**
* Get list of defined biomebase objects * Get list of defined biomebase objects
*/ */
@Override @Override

18
bukkit-helper-116-4/src/main/java/org/dynmap/bukkit/helper/v116_4/BukkitVersionHelperSpigot116_4.java
View File

@ -26,14 +26,14 @@ import java.util.List;
* Helper for isolation of bukkit version specific issues * Helper for isolation of bukkit version specific issues
*/ */
public class BukkitVersionHelperSpigot116_4 extends BukkitVersionHelperGeneric { public class BukkitVersionHelperSpigot116_4 extends BukkitVersionHelperGeneric {
private final boolean unsafeAsync; private final boolean unsafeAsync;
private Field watercolorfield; private Field watercolorfield;
public BukkitVersionHelperSpigot116_4() { public BukkitVersionHelperSpigot116_4() {
Class biomefog = getNMSClass("net.minecraft.server.BiomeFog"); Class biomefog = getNMSClass("net.minecraft.server.BiomeFog");
watercolorfield = getPrivateField(biomefog, new String[] { "c" }, int.class); watercolorfield = getPrivateField(biomefog, new String[] { "c" }, int.class);
this.unsafeAsync = true; this.unsafeAsync = true;
} }
/** /**
* Get block short name list * Get block short name list
@ -61,12 +61,12 @@ public class BukkitVersionHelperSpigot116_4 extends BukkitVersionHelperGeneric {
private Object[] biomelist; private Object[] biomelist;
@Override @Override
public boolean isUnsafeAsync() { public boolean isUnsafeAsync() {
return unsafeAsync; return unsafeAsync;
} }
/** /**
* Get list of defined biomebase objects * Get list of defined biomebase objects
*/ */
@Override @Override

14
bukkit-helper-116/src/main/java/org/dynmap/bukkit/helper/v116/BukkitVersionHelperSpigot116.java
View File

@ -42,8 +42,8 @@ public class BukkitVersionHelperSpigot116 extends BukkitVersionHelperGeneric {
public BukkitVersionHelperSpigot116() { public BukkitVersionHelperSpigot116() {
Class biomefog = getNMSClass("net.minecraft.server.BiomeFog"); Class biomefog = getNMSClass("net.minecraft.server.BiomeFog");
watercolorfield = getPrivateField(biomefog, new String[] { "c" }, int.class); watercolorfield = getPrivateField(biomefog, new String[] { "c" }, int.class);
this.unsafeAsync = true; this.unsafeAsync = true;
} }
/** /**
* Get block short name list * Get block short name list
@ -62,12 +62,12 @@ public class BukkitVersionHelperSpigot116 extends BukkitVersionHelperGeneric {
private Object[] biomelist; private Object[] biomelist;
@Override @Override
public boolean isUnsafeAsync() { public boolean isUnsafeAsync() {
return unsafeAsync; return unsafeAsync;
} }
/** /**
* Get list of defined biomebase objects * Get list of defined biomebase objects
*/ */
@Override @Override

16
bukkit-helper-117/src/main/java/org/dynmap/bukkit/helper/v117/BukkitVersionHelperSpigot117.java
View File

@ -59,18 +59,18 @@ import java.util.Map;
* Helper for isolation of bukkit version specific issues * Helper for isolation of bukkit version specific issues
*/ */
public class BukkitVersionHelperSpigot117 extends BukkitVersionHelper { public class BukkitVersionHelperSpigot117 extends BukkitVersionHelper {
private final boolean unsafeAsync; private final boolean unsafeAsync;
public BukkitVersionHelperSpigot117() { public BukkitVersionHelperSpigot117() {
this.unsafeAsync = true; this.unsafeAsync = true;
} }
@Override @Override
public boolean isUnsafeAsync() { public boolean isUnsafeAsync() {
return unsafeAsync; return unsafeAsync;
} }
/** /**
* Get block short name list * Get block short name list
*/ */
@Override @Override

30
bukkit-helper-118-2/src/main/java/org/dynmap/bukkit/helper/v118_2/BukkitVersionHelperSpigot118_2.java
View File

@ -64,25 +64,25 @@ import java.util.Set;
* Helper for isolation of bukkit version specific issues * Helper for isolation of bukkit version specific issues
*/ */
public class BukkitVersionHelperSpigot118_2 extends BukkitVersionHelper { public class BukkitVersionHelperSpigot118_2 extends BukkitVersionHelper {
private final boolean unsafeAsync; private final boolean unsafeAsync;
public BukkitVersionHelperSpigot118_2() { public BukkitVersionHelperSpigot118_2() {
boolean unsafeAsync1; boolean unsafeAsync1;
try { try {
Class.forName("com.destroystokyo.paper.io.PaperFileIOThread"); Class.forName("com.destroystokyo.paper.io.PaperFileIOThread");
unsafeAsync1 = false; unsafeAsync1 = false;
} catch (ClassNotFoundException e) { } catch (ClassNotFoundException e) {
unsafeAsync1 = true; unsafeAsync1 = true;
} }
this.unsafeAsync = unsafeAsync1; this.unsafeAsync = unsafeAsync1;
} }
@Override @Override
public boolean isUnsafeAsync() { public boolean isUnsafeAsync() {
return unsafeAsync; return unsafeAsync;
} }
/** /**
* Get block short name list * Get block short name list
*/ */
@Override @Override

87
bukkit-helper-118-2/src/main/java/org/dynmap/bukkit/helper/v118_2/MapChunkCache118_2.java
View File

@ -25,57 +25,56 @@ import java.util.concurrent.CompletableFuture;
* Container for managing chunks - dependent upon using chunk snapshots, since rendering is off server thread * Container for managing chunks - dependent upon using chunk snapshots, since rendering is off server thread
*/ */
public class MapChunkCache118_2 extends GenericMapChunkCache { public class MapChunkCache118_2 extends GenericMapChunkCache {
private final AsyncChunkProvider118_2 provider = BukkitVersionHelper.helper.isUnsafeAsync() ? null : new AsyncChunkProvider118_2(); private final AsyncChunkProvider118_2 provider = BukkitVersionHelper.helper.isUnsafeAsync() ? null : new AsyncChunkProvider118_2();
private World w; private World w;
/** /**
* Construct empty cache * Construct empty cache
*/ */
public MapChunkCache118_2(GenericChunkCache cc) { public MapChunkCache118_2(GenericChunkCache cc) {
super(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); //already safe async on vanilla
if ((c != null) && c.o) { // c.loaded
if (provider == null) { //idk why, but paper uses this only sync, so I won't be smarter
nbt = ChunkRegionLoader.a(cw.getHandle(), c);
} else {
nbt = CompletableFuture.supplyAsync(() -> ChunkRegionLoader.a(cw.getHandle(), c), ((CraftServer) Bukkit.getServer()).getServer()).join();
}
}
if (nbt != null) {
gc = parseChunkFromNBT(new NBT.NBTCompound(nbt));
}
} }
return gc;
} // Load generic chunk from existing and already loaded chunk
// Load generic chunk from unloaded chunk protected GenericChunk getLoadedChunk(DynmapChunk chunk) {
protected GenericChunk loadChunk(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); //already safe async on vanilla
if ((c != null) && c.o) { // c.loaded
if (provider == null) { //idk why, but paper uses this only sync, so I won't be smarter
nbt = ChunkRegionLoader.a(cw.getHandle(), c);
} else {
nbt = CompletableFuture.supplyAsync(() -> ChunkRegionLoader.a(cw.getHandle(), c), ((CraftServer) Bukkit.getServer()).getServer()).join();
}
}
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; CraftWorld cw = (CraftWorld) w;
NBTTagCompound nbt = null; NBTTagCompound nbt = null;
ChunkCoordIntPair cc = new ChunkCoordIntPair(chunk.x, chunk.z); ChunkCoordIntPair cc = new ChunkCoordIntPair(chunk.x, chunk.z);
GenericChunk gc = null; GenericChunk gc = null;
try { try {
if (provider == null){ if (provider == null){
nbt = cw.getHandle().k().a.f(cc); // playerChunkMap nbt = cw.getHandle().k().a.f(cc); // playerChunkMap
} else { } else {
nbt = provider.getChunk(cw.getHandle(),chunk.x, chunk.z); nbt = provider.getChunk(cw.getHandle(),chunk.x, chunk.z);
} }
} catch (IOException | InvocationTargetException | IllegalAccessException | NoSuchFieldException ignored) { } catch (IOException | InvocationTargetException | IllegalAccessException | NoSuchFieldException ignored) {}
}
if (nbt != null) { if (nbt != null) {
gc = parseChunkFromNBT(new NBT.NBTCompound(nbt)); gc = parseChunkFromNBT(new NBT.NBTCompound(nbt));
} }
return gc; return gc;
} }
public void setChunks(BukkitWorld dw, List<DynmapChunk> chunks) { public void setChunks(BukkitWorld dw, List<DynmapChunk> chunks) {
this.w = dw.getWorld(); this.w = dw.getWorld();
super.setChunks(dw, chunks); super.setChunks(dw, chunks);
} }
} }

17
bukkit-helper-118/src/main/java/org/dynmap/bukkit/helper/v118/BukkitVersionHelperSpigot118.java
View File

@ -64,19 +64,18 @@ import java.util.Set;
* Helper for isolation of bukkit version specific issues * Helper for isolation of bukkit version specific issues
*/ */
public class BukkitVersionHelperSpigot118 extends BukkitVersionHelper { public class BukkitVersionHelperSpigot118 extends BukkitVersionHelper {
private final boolean unsafeAsync;
private final boolean unsafeAsync; public BukkitVersionHelperSpigot118() {
this.unsafeAsync = true;
public BukkitVersionHelperSpigot118() {
this.unsafeAsync = true;
} }
@Override @Override
public boolean isUnsafeAsync() { public boolean isUnsafeAsync() {
return unsafeAsync; return unsafeAsync;
} }
/** /**
* Get block short name list * Get block short name list
*/ */
@Override @Override