Handle tile entity lookup in 1.20.5

mikeprimm · mikeprimm · commit 1d6346b58033 · 2024-04-28T14:01:07.000-05:00
diff --git 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
@@ -318,7 +318,7 @@ public int getTileEntityZ(Object te) {
 	}
 
 	@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
@@ -354,7 +354,7 @@ public int getTileEntityZ(Object te) {
 	}
 
 	@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
@@ -347,7 +347,7 @@ public int getTileEntityZ(Object te) {
 	}
 
 	@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
@@ -356,7 +356,7 @@ public int getTileEntityZ(Object te) {
 	}
 
 	@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
@@ -364,7 +364,7 @@ public int getTileEntityZ(Object te) {
 	}
 
 	@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
@@ -354,7 +354,7 @@ public int getTileEntityZ(Object te) {
 	}
 
 	@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
@@ -362,7 +362,7 @@ public int getTileEntityZ(Object te) {
 	}
 
 	@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
@@ -362,7 +362,7 @@ public int getTileEntityZ(Object te) {
 	}
 
 	@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
@@ -362,9 +362,11 @@ public int getTileEntityZ(Object te) {
 	}
 
 	@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
@@ -362,7 +362,7 @@ public int getTileEntityZ(Object te) {
 	}
 
 	@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
@@ -2,35 +2,32 @@
 <projectDescription>
 	<name>Dynmap(Spigot-Common)</name>
 	<comment>bukkit-helper</comment>
-	<projects>
-	</projects>
+	<projects/>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
+		<nature>org.eclipse.buildship.core.gradleprojectnature</nature>
+	</natures>
 	<buildSpec>
 		<buildCommand>
 			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
+			<arguments/>
 		</buildCommand>
 		<buildCommand>
 			<name>org.eclipse.buildship.core.gradleprojectbuilder</name>
-			<arguments>
-			</arguments>
+			<arguments/>
 		</buildCommand>
 		<buildCommand>
 			<name>org.eclipse.m2e.core.maven2Builder</name>
-			<arguments>
-			</arguments>
+			<arguments/>
 		</buildCommand>
 	</buildSpec>
-	<natures>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.m2e.core.maven2Nature</nature>
-		<nature>org.eclipse.buildship.core.gradleprojectnature</nature>
-	</natures>
+	<linkedResources/>
 	<filteredResources>
 		<filter>
 			<id>1</id>
-			<name></name>
 			<type>30</type>
+			<name/>
 			<matcher>
 				<id>org.eclipse.core.resources.regexFilterMatcher</id>
 				<arguments>node_modules|\.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__</arguments>
diff --git 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
@@ -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
@@ -900,7 +900,7 @@ else if(hidestyle == HiddenChunkStyle.FILL_OCEAN)
                             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
@@ -101,7 +101,7 @@ protected 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
@@ -24,6 +24,7 @@
 import com.google.gson.GsonBuilder;
 import com.google.gson.JsonParseException;
 
+
 /**
  * Helper for isolation of bukkit version specific issues
  */
@@ -456,7 +457,8 @@ public int getTileEntityZ(Object te) {
     /**
      * 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
@@ -127,7 +127,7 @@ public int getTileEntityZ(Object te) {
     }
 
     @Override
-    public Object readTileEntityNBT(Object te) {
+    public Object readTileEntityNBT(Object te, org.bukkit.World w) {
         // TODO Auto-generated method stub
         return null;
     }

Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ allprojects {`
`40`	`40`	`apply plugin: 'java'`
`41`	`41`
`42`	`42`	`group = 'us.dynmap'`
`43`		`- version = '3.7-SNAPSHOT'`
	`43`	`+ version = '3.7-beta-5'`
`44`	`44`
`45`	`45`	`}`
`46`	`46`
Original file line number	Diff line number	Diff line change
`@@ -318,7 +318,7 @@ public int getTileEntityZ(Object te) {`
`318`	`318`	`}`
`319`	`319`
`320`	`320`	`@Override`
`321`		`- public Object readTileEntityNBT(Object te) {`
	`321`	`+ public Object readTileEntityNBT(Object te, org.bukkit.World w) {`
`322`	`322`	`TileEntity tileent = (TileEntity) te;`
`323`	`323`	`NBTTagCompound nbt = new NBTTagCompound();`
`324`	`324`	`tileent.save(nbt); // readNBT`
Original file line number	Diff line number	Diff line change
`@@ -354,7 +354,7 @@ public int getTileEntityZ(Object te) {`
`354`	`354`	`}`
`355`	`355`
`356`	`356`	`@Override`
`357`		`- public Object readTileEntityNBT(Object te) {`
	`357`	`+ public Object readTileEntityNBT(Object te, org.bukkit.World w) {`
`358`	`358`	`TileEntity tileent = (TileEntity) te;`
`359`	`359`	`NBTTagCompound nbt = tileent.n();`
`360`	`360`	`return nbt;`
Original file line number	Diff line number	Diff line change
`@@ -347,7 +347,7 @@ public int getTileEntityZ(Object te) {`
`347`	`347`	`}`
`348`	`348`
`349`	`349`	`@Override`
`350`		`- public Object readTileEntityNBT(Object te) {`
	`350`	`+ public Object readTileEntityNBT(Object te, org.bukkit.World w) {`
`351`	`351`	`TileEntity tileent = (TileEntity) te;`
`352`	`352`	`NBTTagCompound nbt = tileent.n();`
`353`	`353`	`return nbt;`
Original file line number	Diff line number	Diff line change
`@@ -356,7 +356,7 @@ public int getTileEntityZ(Object te) {`
`356`	`356`	`}`
`357`	`357`
`358`	`358`	`@Override`
`359`		`- public Object readTileEntityNBT(Object te) {`
	`359`	`+ public Object readTileEntityNBT(Object te, org.bukkit.World w) {`
`360`	`360`	`TileEntity tileent = (TileEntity) te;`
`361`	`361`	`NBTTagCompound nbt = tileent.n();`
`362`	`362`	`return nbt;`
Original file line number	Diff line number	Diff line change
`@@ -364,7 +364,7 @@ public int getTileEntityZ(Object te) {`
`364`	`364`	`}`
`365`	`365`
`366`	`366`	`@Override`
`367`		`- public Object readTileEntityNBT(Object te) {`
	`367`	`+ public Object readTileEntityNBT(Object te, org.bukkit.World w) {`
`368`	`368`	`TileEntity tileent = (TileEntity) te;`
`369`	`369`	`NBTTagCompound nbt = tileent.n();`
`370`	`370`	`return nbt;`
Original file line number	Diff line number	Diff line change
`@@ -362,7 +362,7 @@ public int getTileEntityZ(Object te) {`
`362`	`362`	`}`
`363`	`363`
`364`	`364`	`@Override`
`365`		`- public Object readTileEntityNBT(Object te) {`
	`365`	`+ public Object readTileEntityNBT(Object te, org.bukkit.World w) {`
`366`	`366`	`TileEntity tileent = (TileEntity) te;`
`367`	`367`	`NBTTagCompound nbt = tileent.n();`
`368`	`368`	`return nbt;`
Original file line number	Diff line number	Diff line change
`@@ -362,9 +362,11 @@ public int getTileEntityZ(Object te) {`
`362`	`362`	`}`
`363`	`363`
`364`	`364`	`@Override`
`365`		`- public Object readTileEntityNBT(Object te) {`
	`365`	`+ public Object readTileEntityNBT(Object te, org.bukkit.World w) {`
`366`	`366`	`TileEntity tileent = (TileEntity) te;`
`367`		`- NBTTagCompound nbt = new NBTTagCompound(); //TODO tileent.o();`
	`367`	`+ CraftWorld cw = (CraftWorld) w;`
	`368`	`+ //NBTTagCompound nbt = tileent.o(world.registrtAccess());`
	`369`	`+ NBTTagCompound nbt = tileent.e(cw.getHandle().H_());`
`368`	`370`	`return nbt;`
`369`	`371`	`}`
`370`	`372`