From 94ffef1a99fa1afdf80c8de5b9a380e67b333237 Mon Sep 17 00:00:00 2001 From: "Dylan K. Taylor" Date: Tue, 21 Feb 2023 16:14:31 +0000 Subject: [PATCH] ItemIdMetaUpgrader: consistency of API method naming --- src/data/bedrock/item/upgrade/ItemDataUpgrader.php | 4 ++-- src/data/bedrock/item/upgrade/ItemIdMetaUpgrader.php | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/data/bedrock/item/upgrade/ItemDataUpgrader.php b/src/data/bedrock/item/upgrade/ItemDataUpgrader.php index 07629043e..46fce81ce 100644 --- a/src/data/bedrock/item/upgrade/ItemDataUpgrader.php +++ b/src/data/bedrock/item/upgrade/ItemDataUpgrader.php @@ -63,7 +63,7 @@ final class ItemDataUpgrader{ $blockStateData = null; } - [$newNameId, $newMeta] = $this->idMetaUpgrader->upgradeStringIdMeta($rawNameId, $meta); + [$newNameId, $newMeta] = $this->idMetaUpgrader->upgrade($rawNameId, $meta); //TODO: this won't account for spawn eggs from before 1.16.100 - perhaps we're lucky and they just left the meta in there anyway? @@ -136,7 +136,7 @@ final class ItemDataUpgrader{ $blockStateData = null; } - [$newNameId, $newMeta] = $this->idMetaUpgrader->upgradeStringIdMeta($rawNameId, $meta); + [$newNameId, $newMeta] = $this->idMetaUpgrader->upgrade($rawNameId, $meta); //TODO: this won't account for spawn eggs from before 1.16.100 - perhaps we're lucky and they just left the meta in there anyway? diff --git a/src/data/bedrock/item/upgrade/ItemIdMetaUpgrader.php b/src/data/bedrock/item/upgrade/ItemIdMetaUpgrader.php index 71ba2f47e..8afd28f0e 100644 --- a/src/data/bedrock/item/upgrade/ItemIdMetaUpgrader.php +++ b/src/data/bedrock/item/upgrade/ItemIdMetaUpgrader.php @@ -60,7 +60,7 @@ final class ItemIdMetaUpgrader{ /** * @phpstan-return array{string, int} */ - public function upgradeStringIdMeta(string $id, int $meta) : array{ + public function upgrade(string $id, int $meta) : array{ $newId = $id; $newMeta = $meta; foreach($this->idMetaUpgradeSchemas as $schema){