Support for 1.18+ ClientboundLevelChunkWithLightPacket

src/main/java/com/comphenix/protocol/events/AbstractStructure.java

@@ -954,6 +954,24 @@ public StructureModifier<WrappedProfileKeyData> getProfilePublicKeyData() {
             BukkitConverters.getWrappedPublicKeyDataConverter());
     }
 
+    /**
+     * Retrieve a read/write structure for LevelChunkPacketData in 1.18+
+     *
+     * @return The Structure Modifier
+     */
+    public StructureModifier<WrappedLevelChunkData.ChunkData> getLevelChunkData() {
+        return structureModifier.withType(MinecraftReflection.getLevelChunkPacketDataClass(), WrappedLevelChunkData.ChunkData.getConverter());
+    }
+
+    /**
+     * Retrieve a read/write structure for LightUpdatePacketData in 1.18+
+     *
+     * @return The Structure Modifier
+     */
+    public StructureModifier<WrappedLevelChunkData.LightData> getLightUpdateData() {
+        return structureModifier.withType(MinecraftReflection.getLightUpdatePacketDataClass(), WrappedLevelChunkData.LightData.getConverter());
+    }
+
     /**
      * Retrieve a read/write structure for the Map class.
      * @param keyConverter Converter for map keys

src/main/java/com/comphenix/protocol/utility/MinecraftReflection.java

@@ -2299,4 +2299,21 @@ public static Class<?> getLibraryClass(String classname) {
 			return clazz;
 		}
 	}
+
+	public static Class<?> getLevelChunkPacketDataClass() {
+		return getNullableNMS("network.protocol.game.ClientboundLevelChunkPacketData");
+	}
+
+	public static Class<?> getLightUpdatePacketDataClass() {
+		return getNullableNMS("network.protocol.game.ClientboundLightUpdatePacketData");
+	}
+
+	public static Class<?> getBlockEntityTypeClass() {
+		return getMinecraftClass("world.level.block.entity.BlockEntityType", "world.level.block.entity.TileEntityTypes", "TileEntityTypes");
+	}
+
+	public static Class<?> getBlockEntityInfoClass() {
+		return getNullableNMS("network.protocol.game.ClientboundLevelChunkPacketData$BlockEntityInfo",
+				"network.protocol.game.ClientboundLevelChunkPacketData$a");
+	}
 }

src/main/java/com/comphenix/protocol/wrappers/MinecraftKey.java

@@ -18,6 +18,7 @@
 
 import java.lang.reflect.Constructor;
 import java.util.Locale;
+import java.util.Objects;
 
 import com.comphenix.protocol.reflect.EquivalentConverter;
 import com.comphenix.protocol.reflect.StructureModifier;
@@ -112,6 +113,23 @@ public String getEnumFormat() {
 		return key.toUpperCase(Locale.ENGLISH).replace(".", "_");
 	}
 
+	@Override
+	public boolean equals(Object o) {
+		if(this == o) {
+			return true;
+		}
+		if(o == null || getClass() != o.getClass()) {
+			return false;
+		}
+		MinecraftKey that = (MinecraftKey) o;
+		return Objects.equals(prefix, that.prefix) && Objects.equals(key, that.key);
+	}
+
+	@Override
+	public int hashCode() {
+		return Objects.hash(prefix, key);
+	}
+
 	private static Constructor<?> constructor = null;
 
 	public static EquivalentConverter<MinecraftKey> getConverter() {