Clean out the preprocessor crap

I'm done catering to this pain in the ass ...
pmmp · Mar 11, 2021 · 9f82ca4 · 9f82ca4
1 parent 7de6bdf
commit 9f82ca4
Show file tree

Hide file tree

Showing 15 changed files with 5 additions and 43 deletions.
diff --git a/src/BigEndianNBTStream.php b/src/BigEndianNBTStream.php
@@ -23,16 +23,12 @@
 
 namespace pocketmine\nbt;
 
+use pocketmine\utils\Binary;
 use function array_values;
 use function assert;
 use function count;
 use function pack;
 use function unpack;
-#ifndef COMPILE
-use pocketmine\utils\Binary;
-#endif
-
-#include <rules/NBT.h>
 
 class BigEndianNBTStream extends NBTStream{
 

diff --git a/src/LittleEndianNBTStream.php b/src/LittleEndianNBTStream.php
@@ -23,16 +23,12 @@
 
 namespace pocketmine\nbt;
 
+use pocketmine\utils\Binary;
 use function array_values;
 use function assert;
 use function count;
 use function pack;
 use function unpack;
-#ifndef COMPILE
-use pocketmine\utils\Binary;
-#endif
-
-#include <rules/NBT.h>
 
 class LittleEndianNBTStream extends NBTStream{
 

diff --git a/src/NBTStream.php b/src/NBTStream.php
@@ -31,6 +31,8 @@
 use pocketmine\nbt\tag\ListTag;
 use pocketmine\nbt\tag\NamedTag;
 use pocketmine\nbt\tag\StringTag;
+use pocketmine\utils\Binary;
+use pocketmine\utils\BinaryDataException;
 use function call_user_func;
 use function is_array;
 use function is_bool;
@@ -42,12 +44,6 @@
 use function substr;
 use function zlib_decode;
 use function zlib_encode;
-#ifndef COMPILE
-use pocketmine\utils\Binary;
-#endif
-use pocketmine\utils\BinaryDataException;
-
-#include <rules/NBT.h>
 
 /**
  * Base Named Binary Tag encoder/decoder

diff --git a/src/NetworkLittleEndianNBTStream.php b/src/NetworkLittleEndianNBTStream.php
@@ -23,13 +23,9 @@
 
 namespace pocketmine\nbt;
 
+use pocketmine\utils\Binary;
 use function count;
 use function strlen;
-#ifndef COMPILE
-use pocketmine\utils\Binary;
-#endif
-
-#include <rules/NBT.h>
 
 class NetworkLittleEndianNBTStream extends LittleEndianNBTStream{
 

diff --git a/src/tag/ByteArrayTag.php b/src/tag/ByteArrayTag.php
@@ -28,8 +28,6 @@
 use pocketmine\nbt\ReaderTracker;
 use function strlen;
 
-#include <rules/NBT.h>
-
 class ByteArrayTag extends NamedTag{
 	/** @var string */
 	private $value;

diff --git a/src/tag/ByteTag.php b/src/tag/ByteTag.php
@@ -27,8 +27,6 @@
 use pocketmine\nbt\NBTStream;
 use pocketmine\nbt\ReaderTracker;
 
-#include <rules/NBT.h>
-
 class ByteTag extends NamedTag{
 	/** @var int */
 	private $value;

diff --git a/src/tag/CompoundTag.php b/src/tag/CompoundTag.php
@@ -39,8 +39,6 @@
 use function reset;
 use function str_repeat;
 
-#include <rules/NBT.h>
-
 /**
  * @phpstan-implements \ArrayAccess<string, mixed>
  * @phpstan-implements \Iterator<string, NamedTag>

diff --git a/src/tag/DoubleTag.php b/src/tag/DoubleTag.php
@@ -27,8 +27,6 @@
 use pocketmine\nbt\NBTStream;
 use pocketmine\nbt\ReaderTracker;
 
-#include <rules/NBT.h>
-
 class DoubleTag extends NamedTag{
 	/** @var float */
 	private $value;

diff --git a/src/tag/FloatTag.php b/src/tag/FloatTag.php
@@ -28,8 +28,6 @@
 use pocketmine\nbt\ReaderTracker;
 use pocketmine\utils\Binary;
 
-#include <rules/NBT.h>
-
 class FloatTag extends NamedTag{
 	/** @var float */
 	private $value;

diff --git a/src/tag/IntArrayTag.php b/src/tag/IntArrayTag.php
@@ -32,8 +32,6 @@
 use function is_int;
 use function str_repeat;
 
-#include <rules/NBT.h>
-
 class IntArrayTag extends NamedTag{
 	/** @var int[] */
 	private $value;

diff --git a/src/tag/IntTag.php b/src/tag/IntTag.php
@@ -27,8 +27,6 @@
 use pocketmine\nbt\NBTStream;
 use pocketmine\nbt\ReaderTracker;
 
-#include <rules/NBT.h>
-
 class IntTag extends NamedTag{
 	/** @var int */
 	private $value;

diff --git a/src/tag/ListTag.php b/src/tag/ListTag.php
@@ -31,8 +31,6 @@
 use function is_object;
 use function str_repeat;
 
-#include <rules/NBT.h>
-
 /**
  * @phpstan-implements \ArrayAccess<int, mixed>
  * @phpstan-implements \Iterator<int, NamedTag>

diff --git a/src/tag/LongTag.php b/src/tag/LongTag.php
@@ -27,8 +27,6 @@
 use pocketmine\nbt\NBTStream;
 use pocketmine\nbt\ReaderTracker;
 
-#include <rules/NBT.h>
-
 class LongTag extends NamedTag{
 	/** @var int */
 	private $value;

diff --git a/src/tag/ShortTag.php b/src/tag/ShortTag.php
@@ -27,8 +27,6 @@
 use pocketmine\nbt\NBTStream;
 use pocketmine\nbt\ReaderTracker;
 
-#include <rules/NBT.h>
-
 class ShortTag extends NamedTag{
 	/** @var int */
 	private $value;

diff --git a/src/tag/StringTag.php b/src/tag/StringTag.php
@@ -28,8 +28,6 @@
 use pocketmine\nbt\ReaderTracker;
 use function strlen;
 
-#include <rules/NBT.h>
-
 class StringTag extends NamedTag{
 	/** @var string */
 	private $value;