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

More spigot 1.20 updates

This commit is contained in:
Michael Primm 2023-06-09 02:49:17 -04:00
parent 43a86b820c
commit 6863243d49
3 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
bukkit-helper-120/src/main/java/org/dynmap/bukkit/helper/v120/BukkitVersionHelperSpigot120.java
View File

@ -11,7 +11,6 @@ import org.dynmap.bukkit.helper.BukkitMaterial;
import org.dynmap.bukkit.helper.BukkitVersionHelper; import org.dynmap.bukkit.helper.BukkitVersionHelper;
import org.dynmap.bukkit.helper.BukkitWorld; import org.dynmap.bukkit.helper.BukkitWorld;
import org.dynmap.bukkit.helper.BukkitVersionHelperGeneric.TexturesPayload; import org.dynmap.bukkit.helper.BukkitVersionHelperGeneric.TexturesPayload;
import org.dynmap.bukkit.helper.v120.MapChunkCache119_4;
import org.dynmap.renderer.DynmapBlockState; import org.dynmap.renderer.DynmapBlockState;
import org.dynmap.utils.MapChunkCache; import org.dynmap.utils.MapChunkCache;
import org.dynmap.utils.Polygon; import org.dynmap.utils.Polygon;
@ -25,7 +24,6 @@ import com.mojang.authlib.properties.Property;
import com.mojang.authlib.properties.PropertyMap; import com.mojang.authlib.properties.PropertyMap;
import net.minecraft.core.RegistryBlockID; import net.minecraft.core.RegistryBlockID;
import net.minecraft.core.RegistryBlocks;
import net.minecraft.core.registries.BuiltInRegistries; import net.minecraft.core.registries.BuiltInRegistries;
import net.minecraft.core.registries.Registries; import net.minecraft.core.registries.Registries;
import net.minecraft.core.BlockPosition; import net.minecraft.core.BlockPosition;
@ -47,10 +45,7 @@ import net.minecraft.tags.TagsBlock;
import net.minecraft.world.level.BlockAccessAir; import net.minecraft.world.level.BlockAccessAir;
import net.minecraft.world.level.biome.BiomeBase; import net.minecraft.world.level.biome.BiomeBase;
import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.Block;
import net.minecraft.world.level.block.BlockAir;
import net.minecraft.world.level.block.BlockFluids; import net.minecraft.world.level.block.BlockFluids;
import net.minecraft.world.level.block.BlockLeaves;
import net.minecraft.world.level.block.BlockRotatable;
import net.minecraft.world.level.block.entity.TileEntity; import net.minecraft.world.level.block.entity.TileEntity;
import net.minecraft.world.level.block.state.IBlockData; import net.minecraft.world.level.block.state.IBlockData;
import net.minecraft.world.level.chunk.ChunkStatus; import net.minecraft.world.level.chunk.ChunkStatus;
@ -65,7 +60,6 @@ import java.util.IdentityHashMap;
import java.util.Iterator; import java.util.Iterator;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Set;
/** /**
@ -215,7 +209,7 @@ public class BukkitVersionHelperSpigot120 extends BukkitVersionHelper {
*/ */
@Override @Override
public MapChunkCache getChunkCache(BukkitWorld dw, List<DynmapChunk> chunks) { public MapChunkCache getChunkCache(BukkitWorld dw, List<DynmapChunk> chunks) {
MapChunkCache119_4 c = new MapChunkCache119_4(gencache); MapChunkCache120 c = new MapChunkCache120(gencache);
c.setChunks(dw, chunks); c.setChunks(dw, chunks);
return c; return c;
} }

4
bukkit-helper-120/src/main/java/org/dynmap/bukkit/helper/v120/MapChunkCache119_4.java → bukkit-helper-120/src/main/java/org/dynmap/bukkit/helper/v120/MapChunkCache120.java
View File

@ -30,13 +30,13 @@ import java.util.function.Supplier;
/** /**
* 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 MapChunkCache119_4 extends GenericMapChunkCache { public class MapChunkCache120 extends GenericMapChunkCache {
private static final AsyncChunkProvider120 provider = BukkitVersionHelper.helper.isUnsafeAsync() ? null : new AsyncChunkProvider120(); private static final AsyncChunkProvider120 provider = BukkitVersionHelper.helper.isUnsafeAsync() ? null : new AsyncChunkProvider120();
private World w; private World w;
/** /**
* Construct empty cache * Construct empty cache
*/ */
public MapChunkCache119_4(GenericChunkCache cc) { public MapChunkCache120(GenericChunkCache cc) {
super(cc); super(cc);
} }

2
spigot/build.gradle
View File

@ -22,7 +22,7 @@ dependencies {
implementation 'me.lucko.luckperms:luckperms-api:4.3' implementation 'me.lucko.luckperms:luckperms-api:4.3'
implementation 'net.luckperms:api:5.0' implementation 'net.luckperms:api:5.0'
implementation('com.github.MilkBowl:VaultAPI:1.7') { transitive = false } implementation('com.github.MilkBowl:VaultAPI:1.7') { transitive = false }
compileOnly 'net.skinsrestorer:skinsrestorer-api:14.2.+' implementation 'net.skinsrestorer:skinsrestorer-api:14.2.+'
implementation project(":dynmap-api") implementation project(":dynmap-api")
implementation project(path: ":DynmapCore", configuration: "shadow") implementation project(path: ":DynmapCore", configuration: "shadow")
implementation group: 'ru.tehkode', name: 'PermissionsEx', version: '1.19.1' implementation group: 'ru.tehkode', name: 'PermissionsEx', version: '1.19.1'