From 21cf3813bef9fa0aa975e00072c2210cf38af547 Mon Sep 17 00:00:00 2001
From: "Dylan K. Taylor" <dktapps@pmmp.io>
Date: Thu, 23 Jun 2022 20:01:19 +0100
Subject: [PATCH] Add extra interfaces to make it easier to get at the actual
 blockstate serializer/deserializer this still is a pain the ass, but it's
 much less so than before.

---
 .../block/CachingBlockStateDeserializer.php   |  2 +-
 .../block/CachingBlockStateSerializer.php     |  2 +-
 .../DelegatingBlockStateDeserializer.php      | 29 +++++++++++++++++++
 .../block/DelegatingBlockStateSerializer.php  | 29 +++++++++++++++++++
 4 files changed, 60 insertions(+), 2 deletions(-)
 create mode 100644 src/data/bedrock/block/DelegatingBlockStateDeserializer.php
 create mode 100644 src/data/bedrock/block/DelegatingBlockStateSerializer.php

diff --git a/src/data/bedrock/block/CachingBlockStateDeserializer.php b/src/data/bedrock/block/CachingBlockStateDeserializer.php
index 84edcff2f..3071a9eb1 100644
--- a/src/data/bedrock/block/CachingBlockStateDeserializer.php
+++ b/src/data/bedrock/block/CachingBlockStateDeserializer.php
@@ -23,7 +23,7 @@ declare(strict_types=1);
 
 namespace pocketmine\data\bedrock\block;
 
-final class CachingBlockStateDeserializer implements BlockStateDeserializer{
+final class CachingBlockStateDeserializer implements DelegatingBlockStateDeserializer{
 
 	/**
 	 * @var int[]
diff --git a/src/data/bedrock/block/CachingBlockStateSerializer.php b/src/data/bedrock/block/CachingBlockStateSerializer.php
index 18003b086..f6129622d 100644
--- a/src/data/bedrock/block/CachingBlockStateSerializer.php
+++ b/src/data/bedrock/block/CachingBlockStateSerializer.php
@@ -23,7 +23,7 @@ declare(strict_types=1);
 
 namespace pocketmine\data\bedrock\block;
 
-final class CachingBlockStateSerializer implements BlockStateSerializer{
+final class CachingBlockStateSerializer implements DelegatingBlockStateSerializer{
 
 	/**
 	 * @var BlockStateData[]
diff --git a/src/data/bedrock/block/DelegatingBlockStateDeserializer.php b/src/data/bedrock/block/DelegatingBlockStateDeserializer.php
new file mode 100644
index 000000000..2c89ec03b
--- /dev/null
+++ b/src/data/bedrock/block/DelegatingBlockStateDeserializer.php
@@ -0,0 +1,29 @@
+<?php
+
+/*
+ *
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * @author PocketMine Team
+ * @link http://www.pocketmine.net/
+ *
+ *
+ */
+
+declare(strict_types=1);
+
+namespace pocketmine\data\bedrock\block;
+
+interface DelegatingBlockStateDeserializer extends BlockStateDeserializer{
+
+	public function getRealDeserializer() : BlockStateDeserializer;
+}
\ No newline at end of file
diff --git a/src/data/bedrock/block/DelegatingBlockStateSerializer.php b/src/data/bedrock/block/DelegatingBlockStateSerializer.php
new file mode 100644
index 000000000..fc0788d54
--- /dev/null
+++ b/src/data/bedrock/block/DelegatingBlockStateSerializer.php
@@ -0,0 +1,29 @@
+<?php
+
+/*
+ *
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * @author PocketMine Team
+ * @link http://www.pocketmine.net/
+ *
+ *
+ */
+
+declare(strict_types=1);
+
+namespace pocketmine\data\bedrock\block;
+
+interface DelegatingBlockStateSerializer extends BlockStateSerializer{
+
+	public function getRealSerializer() : BlockStateSerializer;
+}
\ No newline at end of file