From 1d6346b58033bebbb5cb48ec905ef2a97494d9b1 Mon Sep 17 00:00:00 2001 From: Michael Primm Date: Sun, 28 Apr 2024 14:01:07 -0500 Subject: [PATCH] Handle tile entity lookup in 1.20.5 --- build.gradle | 2 +- .../v117/BukkitVersionHelperSpigot117.java | 2 +- .../BukkitVersionHelperSpigot118_2.java | 2 +- .../v118/BukkitVersionHelperSpigot118.java | 2 +- .../BukkitVersionHelperSpigot119_3.java | 2 +- .../BukkitVersionHelperSpigot119_4.java | 2 +- .../v119/BukkitVersionHelperSpigot119.java | 2 +- .../BukkitVersionHelperSpigot120_2.java | 2 +- .../BukkitVersionHelperSpigot120_4.java | 2 +- .../BukkitVersionHelperSpigot120_5.java | 6 ++- .../v120/BukkitVersionHelperSpigot120.java | 2 +- bukkit-helper/.project | 37 +++++++++---------- .../org.eclipse.buildship.core.prefs | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 2 +- .../bukkit/helper/AbstractMapChunkCache.java | 2 +- .../bukkit/helper/BukkitVersionHelper.java | 2 +- .../helper/BukkitVersionHelperGeneric.java | 4 +- .../helper/BukkitVersionHelperGlowstone.java | 2 +- 18 files changed, 39 insertions(+), 38 deletions(-) diff --git a/build.gradle b/build.gradle index a155abed..b0a4b47f 100644 --- a/build.gradle +++ b/build.gradle @@ -40,7 +40,7 @@ allprojects { apply plugin: 'java' group = 'us.dynmap' - version = '3.7-SNAPSHOT' + version = '3.7-beta-5' } diff --git a/bukkit-helper-117/src/main/java/org/dynmap/bukkit/helper/v117/BukkitVersionHelperSpigot117.java b/bukkit-helper-117/src/main/java/org/dynmap/bukkit/helper/v117/BukkitVersionHelperSpigot117.java index f5a9b076..cd9dbcd7 100644 --- a/bukkit-helper-117/src/main/java/org/dynmap/bukkit/helper/v117/BukkitVersionHelperSpigot117.java +++ b/bukkit-helper-117/src/main/java/org/dynmap/bukkit/helper/v117/BukkitVersionHelperSpigot117.java @@ -318,7 +318,7 @@ public class BukkitVersionHelperSpigot117 extends BukkitVersionHelper { } @Override - public Object readTileEntityNBT(Object te) { + public Object readTileEntityNBT(Object te, org.bukkit.World w) { TileEntity tileent = (TileEntity) te; NBTTagCompound nbt = new NBTTagCompound(); tileent.save(nbt); // readNBT diff --git a/bukkit-helper-118-2/src/main/java/org/dynmap/bukkit/helper/v118_2/BukkitVersionHelperSpigot118_2.java b/bukkit-helper-118-2/src/main/java/org/dynmap/bukkit/helper/v118_2/BukkitVersionHelperSpigot118_2.java index fed30017..82a0308c 100644 --- a/bukkit-helper-118-2/src/main/java/org/dynmap/bukkit/helper/v118_2/BukkitVersionHelperSpigot118_2.java +++ b/bukkit-helper-118-2/src/main/java/org/dynmap/bukkit/helper/v118_2/BukkitVersionHelperSpigot118_2.java @@ -354,7 +354,7 @@ public class BukkitVersionHelperSpigot118_2 extends BukkitVersionHelper { } @Override - public Object readTileEntityNBT(Object te) { + public Object readTileEntityNBT(Object te, org.bukkit.World w) { TileEntity tileent = (TileEntity) te; NBTTagCompound nbt = tileent.n(); return nbt; 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 fbacfa6d..b7a89d0a 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 @@ -347,7 +347,7 @@ public class BukkitVersionHelperSpigot118 extends BukkitVersionHelper { } @Override - public Object readTileEntityNBT(Object te) { + public Object readTileEntityNBT(Object te, org.bukkit.World w) { TileEntity tileent = (TileEntity) te; NBTTagCompound nbt = tileent.n(); return nbt; diff --git a/bukkit-helper-119-3/src/main/java/org/dynmap/bukkit/helper/v119_3/BukkitVersionHelperSpigot119_3.java b/bukkit-helper-119-3/src/main/java/org/dynmap/bukkit/helper/v119_3/BukkitVersionHelperSpigot119_3.java index 93c5627a..2cb2ac67 100644 --- a/bukkit-helper-119-3/src/main/java/org/dynmap/bukkit/helper/v119_3/BukkitVersionHelperSpigot119_3.java +++ b/bukkit-helper-119-3/src/main/java/org/dynmap/bukkit/helper/v119_3/BukkitVersionHelperSpigot119_3.java @@ -356,7 +356,7 @@ public class BukkitVersionHelperSpigot119_3 extends BukkitVersionHelper { } @Override - public Object readTileEntityNBT(Object te) { + public Object readTileEntityNBT(Object te, org.bukkit.World w) { TileEntity tileent = (TileEntity) te; NBTTagCompound nbt = tileent.n(); return nbt; diff --git a/bukkit-helper-119-4/src/main/java/org/dynmap/bukkit/helper/v119_4/BukkitVersionHelperSpigot119_4.java b/bukkit-helper-119-4/src/main/java/org/dynmap/bukkit/helper/v119_4/BukkitVersionHelperSpigot119_4.java index b1591485..fb62b90f 100644 --- a/bukkit-helper-119-4/src/main/java/org/dynmap/bukkit/helper/v119_4/BukkitVersionHelperSpigot119_4.java +++ b/bukkit-helper-119-4/src/main/java/org/dynmap/bukkit/helper/v119_4/BukkitVersionHelperSpigot119_4.java @@ -364,7 +364,7 @@ public class BukkitVersionHelperSpigot119_4 extends BukkitVersionHelper { } @Override - public Object readTileEntityNBT(Object te) { + public Object readTileEntityNBT(Object te, org.bukkit.World w) { TileEntity tileent = (TileEntity) te; NBTTagCompound nbt = tileent.n(); return nbt; diff --git a/bukkit-helper-119/src/main/java/org/dynmap/bukkit/helper/v119/BukkitVersionHelperSpigot119.java b/bukkit-helper-119/src/main/java/org/dynmap/bukkit/helper/v119/BukkitVersionHelperSpigot119.java index e6c27c31..621a3373 100644 --- a/bukkit-helper-119/src/main/java/org/dynmap/bukkit/helper/v119/BukkitVersionHelperSpigot119.java +++ b/bukkit-helper-119/src/main/java/org/dynmap/bukkit/helper/v119/BukkitVersionHelperSpigot119.java @@ -354,7 +354,7 @@ public class BukkitVersionHelperSpigot119 extends BukkitVersionHelper { } @Override - public Object readTileEntityNBT(Object te) { + public Object readTileEntityNBT(Object te, org.bukkit.World w) { TileEntity tileent = (TileEntity) te; NBTTagCompound nbt = tileent.n(); return nbt; diff --git a/bukkit-helper-120-2/src/main/java/org/dynmap/bukkit/helper/v120_2/BukkitVersionHelperSpigot120_2.java b/bukkit-helper-120-2/src/main/java/org/dynmap/bukkit/helper/v120_2/BukkitVersionHelperSpigot120_2.java index 37255217..0ea5d571 100644 --- a/bukkit-helper-120-2/src/main/java/org/dynmap/bukkit/helper/v120_2/BukkitVersionHelperSpigot120_2.java +++ b/bukkit-helper-120-2/src/main/java/org/dynmap/bukkit/helper/v120_2/BukkitVersionHelperSpigot120_2.java @@ -362,7 +362,7 @@ public class BukkitVersionHelperSpigot120_2 extends BukkitVersionHelper { } @Override - public Object readTileEntityNBT(Object te) { + public Object readTileEntityNBT(Object te, org.bukkit.World w) { TileEntity tileent = (TileEntity) te; NBTTagCompound nbt = tileent.n(); return nbt; diff --git a/bukkit-helper-120-4/src/main/java/org/dynmap/bukkit/helper/v120_4/BukkitVersionHelperSpigot120_4.java b/bukkit-helper-120-4/src/main/java/org/dynmap/bukkit/helper/v120_4/BukkitVersionHelperSpigot120_4.java index ca396833..669c55d1 100644 --- a/bukkit-helper-120-4/src/main/java/org/dynmap/bukkit/helper/v120_4/BukkitVersionHelperSpigot120_4.java +++ b/bukkit-helper-120-4/src/main/java/org/dynmap/bukkit/helper/v120_4/BukkitVersionHelperSpigot120_4.java @@ -362,7 +362,7 @@ public class BukkitVersionHelperSpigot120_4 extends BukkitVersionHelper { } @Override - public Object readTileEntityNBT(Object te) { + public Object readTileEntityNBT(Object te, org.bukkit.World w) { TileEntity tileent = (TileEntity) te; NBTTagCompound nbt = tileent.o(); return nbt; diff --git a/bukkit-helper-120-5/src/main/java/org/dynmap/bukkit/helper/v120_5/BukkitVersionHelperSpigot120_5.java b/bukkit-helper-120-5/src/main/java/org/dynmap/bukkit/helper/v120_5/BukkitVersionHelperSpigot120_5.java index 3839fee2..20d4af0f 100644 --- a/bukkit-helper-120-5/src/main/java/org/dynmap/bukkit/helper/v120_5/BukkitVersionHelperSpigot120_5.java +++ b/bukkit-helper-120-5/src/main/java/org/dynmap/bukkit/helper/v120_5/BukkitVersionHelperSpigot120_5.java @@ -362,9 +362,11 @@ public class BukkitVersionHelperSpigot120_5 extends BukkitVersionHelper { } @Override - public Object readTileEntityNBT(Object te) { + public Object readTileEntityNBT(Object te, org.bukkit.World w) { TileEntity tileent = (TileEntity) te; - NBTTagCompound nbt = new NBTTagCompound(); //TODO tileent.o(); + CraftWorld cw = (CraftWorld) w; + //NBTTagCompound nbt = tileent.o(world.registrtAccess()); + NBTTagCompound nbt = tileent.e(cw.getHandle().H_()); return nbt; } diff --git a/bukkit-helper-120/src/main/java/org/dynmap/bukkit/helper/v120/BukkitVersionHelperSpigot120.java b/bukkit-helper-120/src/main/java/org/dynmap/bukkit/helper/v120/BukkitVersionHelperSpigot120.java index 1463776b..d473dfd3 100644 --- a/bukkit-helper-120/src/main/java/org/dynmap/bukkit/helper/v120/BukkitVersionHelperSpigot120.java +++ b/bukkit-helper-120/src/main/java/org/dynmap/bukkit/helper/v120/BukkitVersionHelperSpigot120.java @@ -362,7 +362,7 @@ public class BukkitVersionHelperSpigot120 extends BukkitVersionHelper { } @Override - public Object readTileEntityNBT(Object te) { + public Object readTileEntityNBT(Object te, org.bukkit.World world) { TileEntity tileent = (TileEntity) te; NBTTagCompound nbt = tileent.n(); return nbt; diff --git a/bukkit-helper/.project b/bukkit-helper/.project index 33f7105e..f654b6b0 100644 --- a/bukkit-helper/.project +++ b/bukkit-helper/.project @@ -2,35 +2,32 @@ Dynmap(Spigot-Common) bukkit-helper - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.buildship.core.gradleprojectbuilder - - - - - org.eclipse.m2e.core.maven2Builder - - - - + org.eclipse.jdt.core.javanature org.eclipse.m2e.core.maven2Nature org.eclipse.buildship.core.gradleprojectnature + + + org.eclipse.jdt.core.javabuilder + + + + org.eclipse.buildship.core.gradleprojectbuilder + + + + org.eclipse.m2e.core.maven2Builder + + + + 1 - 30 + org.eclipse.core.resources.regexFilterMatcher node_modules|\.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__ diff --git a/bukkit-helper/.settings/org.eclipse.buildship.core.prefs b/bukkit-helper/.settings/org.eclipse.buildship.core.prefs index b476a285..02e6009a 100644 --- a/bukkit-helper/.settings/org.eclipse.buildship.core.prefs +++ b/bukkit-helper/.settings/org.eclipse.buildship.core.prefs @@ -2,7 +2,7 @@ arguments= auto.sync=false build.scans.enabled=false connection.gradle.distribution=GRADLE_DISTRIBUTION(VERSION(6.3)) -connection.project.dir=../bukkit-helper-120-2 +connection.project.dir=../bukkit-helper-120-5 eclipse.preferences.version=1 gradle.user.home= java.home=/Library/Java/JavaVirtualMachines/jdk1.8.0_251.jdk/Contents/Home diff --git a/bukkit-helper/.settings/org.eclipse.jdt.core.prefs b/bukkit-helper/.settings/org.eclipse.jdt.core.prefs index ccf02c1b..57dfcdce 100644 --- a/bukkit-helper/.settings/org.eclipse.jdt.core.prefs +++ b/bukkit-helper/.settings/org.eclipse.jdt.core.prefs @@ -1,5 +1,5 @@ # -#Fri Apr 26 17:37:35 CDT 2024 +#Sun Apr 28 13:34:57 CDT 2024 eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.annotation.nonnull=javax.annotation.Nonnull org.eclipse.jdt.core.compiler.annotation.nullable=javax.annotation.Nullable diff --git a/bukkit-helper/src/main/java/org/dynmap/bukkit/helper/AbstractMapChunkCache.java b/bukkit-helper/src/main/java/org/dynmap/bukkit/helper/AbstractMapChunkCache.java index 794490fb..d8102259 100644 --- a/bukkit-helper/src/main/java/org/dynmap/bukkit/helper/AbstractMapChunkCache.java +++ b/bukkit-helper/src/main/java/org/dynmap/bukkit/helper/AbstractMapChunkCache.java @@ -900,7 +900,7 @@ public abstract class AbstractMapChunkCache extends MapChunkCache { String[] te_fields = HDBlockModels.getTileEntityFieldsNeeded(ss.getBlockType(cx, te_y, cz)); if(te_fields != null) { //Object nbtcompound = BukkitVersionHelper.helper.readTileEntityNBT(t); - Object nbtcompound = BukkitVersionHelper.helper.readTileEntityNBT(t); + Object nbtcompound = BukkitVersionHelper.helper.readTileEntityNBT(t, this.w); vals.clear(); for(String id: te_fields) { Object val = BukkitVersionHelper.helper.getFieldValue(nbtcompound, id); diff --git a/bukkit-helper/src/main/java/org/dynmap/bukkit/helper/BukkitVersionHelper.java b/bukkit-helper/src/main/java/org/dynmap/bukkit/helper/BukkitVersionHelper.java index 58cdb90d..04b99f9f 100644 --- a/bukkit-helper/src/main/java/org/dynmap/bukkit/helper/BukkitVersionHelper.java +++ b/bukkit-helper/src/main/java/org/dynmap/bukkit/helper/BukkitVersionHelper.java @@ -101,7 +101,7 @@ public abstract class BukkitVersionHelper { /** * Read tile entity NBT */ - public abstract Object readTileEntityNBT(Object te); + public abstract Object readTileEntityNBT(Object te, World world); /** * Get field value from NBT compound */ diff --git a/bukkit-helper/src/main/java/org/dynmap/bukkit/helper/BukkitVersionHelperGeneric.java b/bukkit-helper/src/main/java/org/dynmap/bukkit/helper/BukkitVersionHelperGeneric.java index edb0faf8..15bdb73b 100644 --- a/bukkit-helper/src/main/java/org/dynmap/bukkit/helper/BukkitVersionHelperGeneric.java +++ b/bukkit-helper/src/main/java/org/dynmap/bukkit/helper/BukkitVersionHelperGeneric.java @@ -24,6 +24,7 @@ import com.google.gson.Gson; import com.google.gson.GsonBuilder; import com.google.gson.JsonParseException; + /** * Helper for isolation of bukkit version specific issues */ @@ -456,7 +457,8 @@ public abstract class BukkitVersionHelperGeneric extends BukkitVersionHelper { /** * Read tile entity NBT */ - public Object readTileEntityNBT(Object te) { + @Override + public Object readTileEntityNBT(Object te, org.bukkit.World w) { if(nbttagcompound == null) return null; Object nbt = null; try { diff --git a/bukkit-helper/src/main/java/org/dynmap/bukkit/helper/BukkitVersionHelperGlowstone.java b/bukkit-helper/src/main/java/org/dynmap/bukkit/helper/BukkitVersionHelperGlowstone.java index 92629236..033c4963 100644 --- a/bukkit-helper/src/main/java/org/dynmap/bukkit/helper/BukkitVersionHelperGlowstone.java +++ b/bukkit-helper/src/main/java/org/dynmap/bukkit/helper/BukkitVersionHelperGlowstone.java @@ -127,7 +127,7 @@ public class BukkitVersionHelperGlowstone extends BukkitVersionHelper { } @Override - public Object readTileEntityNBT(Object te) { + public Object readTileEntityNBT(Object te, org.bukkit.World w) { // TODO Auto-generated method stub return null; }