From 930c1b4870c52f31efb5a370b04e30b44cd848e6 Mon Sep 17 00:00:00 2001 From: DANRULEZ123 <40849132+DANRULEZ123@users.noreply.github.com> Date: Thu, 21 Nov 2024 08:52:13 -0500 Subject: [PATCH 01/79] Update Player.php --- src/pocketmine/Player.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/pocketmine/Player.php b/src/pocketmine/Player.php index 14441d48..fdbf373a 100644 --- a/src/pocketmine/Player.php +++ b/src/pocketmine/Player.php @@ -4809,4 +4809,8 @@ public function getDeviceModel() : ?string{ public function getDeviceId() : ?string{ return $this->deviceId; } + + public function testMessage(): string{ + return "§r§aTestString Successful"; + } } From 924dcf65512e1b5e0562e709c1583dd6b10d5a07 Mon Sep 17 00:00:00 2001 From: DANRULEZ123 <40849132+DANRULEZ123@users.noreply.github.com> Date: Mon, 25 Nov 2024 14:59:51 -0500 Subject: [PATCH 02/79] Update item_id_map.json Added Echo Shards and Amethyst Crystals to item id map. --- src/pocketmine/resources/vanilla/item_id_map.json | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/pocketmine/resources/vanilla/item_id_map.json b/src/pocketmine/resources/vanilla/item_id_map.json index 365f69ed..178c04e4 100644 --- a/src/pocketmine/resources/vanilla/item_id_map.json +++ b/src/pocketmine/resources/vanilla/item_id_map.json @@ -808,5 +808,7 @@ "minecraft:record_pigstep": 759, "minecraft:nether_sprouts": 760, "minecraft:spyglass": 772, - "minecraft:soul_campfire": 801 -} \ No newline at end of file + "minecraft:soul_campfire": 801, + "minecraft:echo_shard": 900, + "minecraft:amethyst_crystal": 901 +} From 62f2ebf9ced08aadafb8cd5c85274671729c9096 Mon Sep 17 00:00:00 2001 From: DANRULEZ123 <40849132+DANRULEZ123@users.noreply.github.com> Date: Mon, 25 Nov 2024 15:04:14 -0500 Subject: [PATCH 03/79] Create EchoShard.php --- src/pocketmine/item/EchoShard.php | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 src/pocketmine/item/EchoShard.php diff --git a/src/pocketmine/item/EchoShard.php b/src/pocketmine/item/EchoShard.php new file mode 100644 index 00000000..bc5cc81a --- /dev/null +++ b/src/pocketmine/item/EchoShard.php @@ -0,0 +1,20 @@ + Date: Mon, 25 Nov 2024 15:05:48 -0500 Subject: [PATCH 04/79] Create AmethystCrystal.php --- src/pocketmine/item/AmethystCrystal.php | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 src/pocketmine/item/AmethystCrystal.php diff --git a/src/pocketmine/item/AmethystCrystal.php b/src/pocketmine/item/AmethystCrystal.php new file mode 100644 index 00000000..4d39a8d5 --- /dev/null +++ b/src/pocketmine/item/AmethystCrystal.php @@ -0,0 +1,20 @@ + Date: Mon, 25 Nov 2024 15:08:01 -0500 Subject: [PATCH 05/79] Update ItemIds.php Add Echo Shard & Amethyst Crystal Item IDs. --- src/pocketmine/item/ItemIds.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/pocketmine/item/ItemIds.php b/src/pocketmine/item/ItemIds.php index b775eb1c..bf64045d 100644 --- a/src/pocketmine/item/ItemIds.php +++ b/src/pocketmine/item/ItemIds.php @@ -279,5 +279,6 @@ interface ItemIds extends BlockIds{ public const NETHERITE_LEGGINGS = 750; public const NETHERITE_BOOTS = 751; public const NETHERITE_SCRAP = 752; - + public const ECHO_SHARD = 900; + public const AMETHYST_CRYSTAL = 901; } From 5af1f6afb8f887a8e8eaa559f1249ee05f3717aa Mon Sep 17 00:00:00 2001 From: DANRULEZ123 <40849132+DANRULEZ123@users.noreply.github.com> Date: Mon, 25 Nov 2024 15:10:56 -0500 Subject: [PATCH 06/79] Update ItemFactory.php Added Echo Shards & Amethyst Crystals to registered ids. --- src/pocketmine/item/ItemFactory.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/pocketmine/item/ItemFactory.php b/src/pocketmine/item/ItemFactory.php index 2df427f1..65a532e6 100644 --- a/src/pocketmine/item/ItemFactory.php +++ b/src/pocketmine/item/ItemFactory.php @@ -302,6 +302,8 @@ public static function init(){ self::registerItem(new Item(Item::HONEYCOMB, 0, "Honeycomb")); self::registerItem(new HoneyBottle()); self::registerItem(new Spyglass()); + self::registerItem(new EchoShard()); + self::registerItem(new AmethystCrystal()); } /** From 2efd8e1fe48bd63f117e4ecded37af3dd972b5b2 Mon Sep 17 00:00:00 2001 From: DANRULEZ123 <40849132+DANRULEZ123@users.noreply.github.com> Date: Mon, 25 Nov 2024 15:44:25 -0500 Subject: [PATCH 07/79] Update AmethystCrystal.php Removed getName() --- src/pocketmine/item/AmethystCrystal.php | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/pocketmine/item/AmethystCrystal.php b/src/pocketmine/item/AmethystCrystal.php index 4d39a8d5..552be185 100644 --- a/src/pocketmine/item/AmethystCrystal.php +++ b/src/pocketmine/item/AmethystCrystal.php @@ -14,7 +14,4 @@ public function __construct(int $meta = 0){ public function getMaxStackSize(): int { return 64; } - public function getName(): string{ - return "Amethyst Crystal"; -} } From 96531c8539b709389d0b63b4d2f974f8ca0e4670 Mon Sep 17 00:00:00 2001 From: DANRULEZ123 <40849132+DANRULEZ123@users.noreply.github.com> Date: Mon, 25 Nov 2024 15:48:49 -0500 Subject: [PATCH 08/79] Update EchoShard.php Remove getName() --- src/pocketmine/item/EchoShard.php | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/pocketmine/item/EchoShard.php b/src/pocketmine/item/EchoShard.php index bc5cc81a..e4c4bb78 100644 --- a/src/pocketmine/item/EchoShard.php +++ b/src/pocketmine/item/EchoShard.php @@ -14,7 +14,4 @@ public function __construct(int $meta = 0){ public function getMaxStackSize(): int { return 64; } - public function getName(): string{ - return "Echo Shard"; -} } From 6dea26885b8c7450c299e361091656ad685a3869 Mon Sep 17 00:00:00 2001 From: DANRULEZ123 <40849132+DANRULEZ123@users.noreply.github.com> Date: Mon, 25 Nov 2024 16:36:14 -0500 Subject: [PATCH 09/79] Update item_id_map.json Changed amethyst_crystal to amethyst_shard to correct error. --- src/pocketmine/resources/vanilla/item_id_map.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/pocketmine/resources/vanilla/item_id_map.json b/src/pocketmine/resources/vanilla/item_id_map.json index 178c04e4..efdf3baf 100644 --- a/src/pocketmine/resources/vanilla/item_id_map.json +++ b/src/pocketmine/resources/vanilla/item_id_map.json @@ -810,5 +810,6 @@ "minecraft:spyglass": 772, "minecraft:soul_campfire": 801, "minecraft:echo_shard": 900, - "minecraft:amethyst_crystal": 901 + "minecraft:amethyst_shard": 901 + } From 67a3827f60e5bc2cb4ef672ff0ec6649e03b8daa Mon Sep 17 00:00:00 2001 From: DANRULEZ123 <40849132+DANRULEZ123@users.noreply.github.com> Date: Mon, 25 Nov 2024 16:39:34 -0500 Subject: [PATCH 10/79] Update AmethystCrystal.php Change ID --- src/pocketmine/item/AmethystCrystal.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pocketmine/item/AmethystCrystal.php b/src/pocketmine/item/AmethystCrystal.php index 552be185..51b97be4 100644 --- a/src/pocketmine/item/AmethystCrystal.php +++ b/src/pocketmine/item/AmethystCrystal.php @@ -8,7 +8,7 @@ class AmethystCrystal extends Item { public function __construct(int $meta = 0){ - parent::__construct(self::AMETHYST_CRYSTAL, $meta, "Amethyst Crystal"); + parent::__construct(self::AMETHYST_SHARD, $meta, "Amethyst Crystal"); } public function getMaxStackSize(): int { From 646e77daa31ab2b06d5a0c742d5ade93abcb1f11 Mon Sep 17 00:00:00 2001 From: DANRULEZ123 <40849132+DANRULEZ123@users.noreply.github.com> Date: Mon, 25 Nov 2024 16:41:36 -0500 Subject: [PATCH 11/79] Update ItemIds.php AMETHYST_CRYSTAL -> AMETHYST_SHARD --- src/pocketmine/item/ItemIds.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pocketmine/item/ItemIds.php b/src/pocketmine/item/ItemIds.php index bf64045d..dd57c5d3 100644 --- a/src/pocketmine/item/ItemIds.php +++ b/src/pocketmine/item/ItemIds.php @@ -280,5 +280,5 @@ interface ItemIds extends BlockIds{ public const NETHERITE_BOOTS = 751; public const NETHERITE_SCRAP = 752; public const ECHO_SHARD = 900; - public const AMETHYST_CRYSTAL = 901; + public const AMETHYST_SHARD = 901; } From ed9c3845ca7c4b070a7fefb04100aa3f3dc95b89 Mon Sep 17 00:00:00 2001 From: DANRULEZ123 <40849132+DANRULEZ123@users.noreply.github.com> Date: Mon, 25 Nov 2024 22:35:08 -0500 Subject: [PATCH 12/79] Create Directory --- src/pocketmine/item/trims/Directory | 1 + 1 file changed, 1 insertion(+) create mode 100644 src/pocketmine/item/trims/Directory diff --git a/src/pocketmine/item/trims/Directory b/src/pocketmine/item/trims/Directory new file mode 100644 index 00000000..8b137891 --- /dev/null +++ b/src/pocketmine/item/trims/Directory @@ -0,0 +1 @@ + From 90747bf549ef15c5b524ea2aa9a64d4bcb9db5f0 Mon Sep 17 00:00:00 2001 From: DANRULEZ123 <40849132+DANRULEZ123@users.noreply.github.com> Date: Mon, 25 Nov 2024 22:36:01 -0500 Subject: [PATCH 13/79] Delete src/pocketmine/item/trims/Directory --- src/pocketmine/item/trims/Directory | 1 - 1 file changed, 1 deletion(-) delete mode 100644 src/pocketmine/item/trims/Directory diff --git a/src/pocketmine/item/trims/Directory b/src/pocketmine/item/trims/Directory deleted file mode 100644 index 8b137891..00000000 --- a/src/pocketmine/item/trims/Directory +++ /dev/null @@ -1 +0,0 @@ - From d9a50e747d049a5105610afc1868310f015d78b4 Mon Sep 17 00:00:00 2001 From: DANRULEZ123 <40849132+DANRULEZ123@users.noreply.github.com> Date: Mon, 25 Nov 2024 23:13:59 -0500 Subject: [PATCH 14/79] Added 33 Vanilla Items! # Details: - 18 Armor Trim Templates (items) - 15 Other Vanilla Items --- src/pocketmine/item/ArmadilloScute.php | 17 +++++++++++++++++ src/pocketmine/item/Bolt.php | 17 +++++++++++++++++ src/pocketmine/item/BreezeRod.php | 17 +++++++++++++++++ src/pocketmine/item/Brush.php | 18 ++++++++++++++++++ src/pocketmine/item/Coast.php | 17 +++++++++++++++++ src/pocketmine/item/CopperIngot.php | 17 +++++++++++++++++ src/pocketmine/item/DiscFragment.php | 17 +++++++++++++++++ src/pocketmine/item/Dune.php | 17 +++++++++++++++++ src/pocketmine/item/Eye.php | 17 +++++++++++++++++ src/pocketmine/item/Flow.php | 17 +++++++++++++++++ src/pocketmine/item/HeavyCore.php | 18 ++++++++++++++++++ src/pocketmine/item/Host.php | 17 +++++++++++++++++ src/pocketmine/item/Mace.php | 19 +++++++++++++++++++ src/pocketmine/item/OminousTrialKey.php | 17 +++++++++++++++++ src/pocketmine/item/Raiser.php | 17 +++++++++++++++++ src/pocketmine/item/RawCopper.php | 17 +++++++++++++++++ src/pocketmine/item/RawGold.php | 17 +++++++++++++++++ src/pocketmine/item/RawIron.php | 17 +++++++++++++++++ src/pocketmine/item/RecoveryCompass.php | 17 +++++++++++++++++ src/pocketmine/item/Rib.php | 17 +++++++++++++++++ src/pocketmine/item/Sentry.php | 17 +++++++++++++++++ src/pocketmine/item/Shaper.php | 17 +++++++++++++++++ src/pocketmine/item/Silence.php | 17 +++++++++++++++++ src/pocketmine/item/SmithingTemplate.php | 17 +++++++++++++++++ src/pocketmine/item/Snout.php | 17 +++++++++++++++++ src/pocketmine/item/Spire.php | 17 +++++++++++++++++ src/pocketmine/item/Tide.php | 17 +++++++++++++++++ src/pocketmine/item/TrialKey.php | 17 +++++++++++++++++ src/pocketmine/item/Vex.php | 17 +++++++++++++++++ src/pocketmine/item/Ward.php | 17 +++++++++++++++++ src/pocketmine/item/Wayfinder.php | 17 +++++++++++++++++ src/pocketmine/item/Wild.php | 17 +++++++++++++++++ src/pocketmine/item/WindCharge.php | 17 +++++++++++++++++ 33 files changed, 565 insertions(+) create mode 100644 src/pocketmine/item/ArmadilloScute.php create mode 100644 src/pocketmine/item/Bolt.php create mode 100644 src/pocketmine/item/BreezeRod.php create mode 100644 src/pocketmine/item/Brush.php create mode 100644 src/pocketmine/item/Coast.php create mode 100644 src/pocketmine/item/CopperIngot.php create mode 100644 src/pocketmine/item/DiscFragment.php create mode 100644 src/pocketmine/item/Dune.php create mode 100644 src/pocketmine/item/Eye.php create mode 100644 src/pocketmine/item/Flow.php create mode 100644 src/pocketmine/item/HeavyCore.php create mode 100644 src/pocketmine/item/Host.php create mode 100644 src/pocketmine/item/Mace.php create mode 100644 src/pocketmine/item/OminousTrialKey.php create mode 100644 src/pocketmine/item/Raiser.php create mode 100644 src/pocketmine/item/RawCopper.php create mode 100644 src/pocketmine/item/RawGold.php create mode 100644 src/pocketmine/item/RawIron.php create mode 100644 src/pocketmine/item/RecoveryCompass.php create mode 100644 src/pocketmine/item/Rib.php create mode 100644 src/pocketmine/item/Sentry.php create mode 100644 src/pocketmine/item/Shaper.php create mode 100644 src/pocketmine/item/Silence.php create mode 100644 src/pocketmine/item/SmithingTemplate.php create mode 100644 src/pocketmine/item/Snout.php create mode 100644 src/pocketmine/item/Spire.php create mode 100644 src/pocketmine/item/Tide.php create mode 100644 src/pocketmine/item/TrialKey.php create mode 100644 src/pocketmine/item/Vex.php create mode 100644 src/pocketmine/item/Ward.php create mode 100644 src/pocketmine/item/Wayfinder.php create mode 100644 src/pocketmine/item/Wild.php create mode 100644 src/pocketmine/item/WindCharge.php diff --git a/src/pocketmine/item/ArmadilloScute.php b/src/pocketmine/item/ArmadilloScute.php new file mode 100644 index 00000000..16d343e0 --- /dev/null +++ b/src/pocketmine/item/ArmadilloScute.php @@ -0,0 +1,17 @@ + Date: Mon, 25 Nov 2024 23:16:30 -0500 Subject: [PATCH 15/79] Update ItemIds.php - +33 Item Ids --- src/pocketmine/item/ItemIds.php | 37 +++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/src/pocketmine/item/ItemIds.php b/src/pocketmine/item/ItemIds.php index dd57c5d3..8348a5d8 100644 --- a/src/pocketmine/item/ItemIds.php +++ b/src/pocketmine/item/ItemIds.php @@ -279,6 +279,43 @@ interface ItemIds extends BlockIds{ public const NETHERITE_LEGGINGS = 750; public const NETHERITE_BOOTS = 751; public const NETHERITE_SCRAP = 752; + + + // Dan's Implementations! public const ECHO_SHARD = 900; public const AMETHYST_SHARD = 901; + public const RAW_GOLD = 902; + public const RAW_IRON = 903; + public const RAW_COPPER = 904; + public const COPPER_INGOT = 905; + public const TRIAL_KEY = 906; + public const OMINOUS_TRIAL_KEY = 907; + public const WIND_CHARGE = 908; + public const BREEZE_ROD = 909; + public const DISC_FRAGMENT_5 = 910; + public const BRUSH = 911; + public const RECOVERY_COMPASS = 912; + public const MACE = 913; + public const HEAVY_CORE = 914; + public const NETHERITE_UPGRADE_SMITHING_TEMPLATE = 915; + public const BOLT_ARMOR_TRIM_SMITHING_TEMPLATE = 916; + public const HOST_ARMOR_TRIM_SMITHING_TEMPLATE = 917; + public const WAYFINDER_ARMOR_TRIM_SMITHING_TEMPLATE = 918; + public const SHAPER_ARMOR_TRIM_SMITHING_TEMPLATE = 919; + public const RAISER_ARMOR_TRIM_SMITHING_TEMPLATE = 920; + public const SENTRY_ARMOR_TRIM_SMITHING_TEMPLATE = 921; + public const VEX_ARMOR_TRIM_SMITHING_TEMPLATE = 922; + public const WILD_ARMOR_TRIM_SMITHING_TEMPLATE = 923; + public const COAST_ARMOR_TRIM_SMITHING_TEMPLATE = 924; + public const DUNE_ARMOR_TRIM_SMITHING_TEMPLATE = 925; + public const WARD_ARMOR_TRIM_SMITHING_TEMPLATE = 926; + public const TIDE_ARMOR_TRIM_SMITHING_TEMPLATE = 927; + public const SNOUT_ARMOR_TRIM_SMITHING_TEMPLATE = 928; + public const RIB_ARMOR_TRIM_SMITHING_TEMPLATE = 929; + public const EYE_ARMOR_TRIM_SMITHING_TEMPLATE = 930; + public const SPIRE_ARMOR_TRIM_SMITHING_TEMPLATE = 931; + public const FLOW_ARMOR_TRIM_SMITHING_TEMPLATE = 932; + public const SILENCE_ARMOR_TRIM_SMITHING_TEMPLATE = 933; + public const SNIFFER_EGG = 934; + public const ARMADILLO_SCUTE = 935; } From fdb3e48d1b950453cabdd363696e5e548a2b8e82 Mon Sep 17 00:00:00 2001 From: DANRULEZ123 <40849132+DANRULEZ123@users.noreply.github.com> Date: Mon, 25 Nov 2024 23:18:33 -0500 Subject: [PATCH 16/79] Update item_id_map.json +33 Vanilla Items --- .../resources/vanilla/item_id_map.json | 36 ++++++++++++++++++- 1 file changed, 35 insertions(+), 1 deletion(-) diff --git a/src/pocketmine/resources/vanilla/item_id_map.json b/src/pocketmine/resources/vanilla/item_id_map.json index efdf3baf..4c3a9eac 100644 --- a/src/pocketmine/resources/vanilla/item_id_map.json +++ b/src/pocketmine/resources/vanilla/item_id_map.json @@ -810,6 +810,40 @@ "minecraft:spyglass": 772, "minecraft:soul_campfire": 801, "minecraft:echo_shard": 900, - "minecraft:amethyst_shard": 901 + "minecraft:amethyst_shard": 901, + "minecraft:raw_gold": 902, + "minecraft:raw_iron": 903, + "minecraft:raw_copper": 904, + "minecraft:copper_ingot": 905, + "minecraft:trial_key": 906, + "minecraft:ominous_trial_key": 907, + "minecraft:wind_charge": 908, + "minecraft:breeze_rod": 909, + "minecraft:disc_fragment_5": 910, + "minecraft:brush": 911, + "minecraft:recovery_compass": 912, + "minecraft:mace": 913, + "minecraft:heavy_core": 914, + "minecraft:netherite_upgrade_smithing_template": 915, + "minecraft:bolt_armor_trim_smithing_template": 916, + "minecraft:host_armor_trim_smithing_template": 917, + "minecraft:wayfinder_armor_trim_smithing_template": 918, + "minecraft:shaper_armor_trim_smithing_template": 919, + "minecraft:raiser_armor_trim_smithing_template": 920, + "minecraft:sentry_armor_trim_smithing_template": 921, + "minecraft:vex_armor_trim_smithing_template": 922, + "minecraft:wild_armor_trim_smithing_template": 923, + "minecraft:coast_armor_trim_smithing_template": 924, + "minecraft:dune_armor_trim_smithing_template": 925 + "minecraft:ward_armor_trim_smithing_template": 926, + "minecraft:tide_armor_trim_smithing_template": 927, + "minecraft:snout_armor_trim_smithing_template": 928, + "minecraft:rib_armor_trim_smithing_template": 929, + "minecraft:eye_armor_trim_smithing_template": 930, + "minecraft:spire_armor_trim_smithing_template": 931, + "minecraft:flow_armor_trim_smithing_template": 932, + "minecraft:silence_armor_trim_smithing_template": 933, + "minecraft:sniffer_egg": 934, + "minecraft:armadillo_scute": 935 } From 5e5b418ebb43a117647356c1d65dd244242c6fca Mon Sep 17 00:00:00 2001 From: DANRULEZ123 <40849132+DANRULEZ123@users.noreply.github.com> Date: Mon, 25 Nov 2024 23:28:28 -0500 Subject: [PATCH 17/79] Update ItemFactory.php Registered new vanilla items. --- src/pocketmine/item/ItemFactory.php | 34 +++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/src/pocketmine/item/ItemFactory.php b/src/pocketmine/item/ItemFactory.php index 65a532e6..00ca0cbd 100644 --- a/src/pocketmine/item/ItemFactory.php +++ b/src/pocketmine/item/ItemFactory.php @@ -304,6 +304,40 @@ public static function init(){ self::registerItem(new Spyglass()); self::registerItem(new EchoShard()); self::registerItem(new AmethystCrystal()); + self::registerItem(new RawGold()); + self::registerItem(new RawIron()); + self::registerItem(new RawCopper()); + self::registerItem(new CopperIngot()); + self::registerItem(new TrialKey()); + self::registerItem(new OminousTrialKey()); + self::registerItem(new WindCharge()); + self::registerItem(new BreezeRod()); + self::registerItem(new DiscFragment()); + self::registerItem(new Brush()); + self::registerItem(new RecoveryCompass()); + self::registerItem(new Mace()); + self::registerItem(new HeavyCore()); + self::registerItem(new SmithingTemplate()); + self::registerItem(new Bolt()); + self::registerItem(new Host()); + self::registerItem(new Wayfinder()); + self::registerItem(new Shaper()); + self::registerItem(new Raiser()); + self::registerItem(new Sentry()); + self::registerItem(new Vex()); + self::registerItem(new Wild()); + self::registerItem(new Coast()); + self::registerItem(new Dune()); + self::registerItem(new Ward()); + self::registerItem(new Tide()); + self::registerItem(new Snout()); + self::registerItem(new Rib()); + self::registerItem(new Eye()); + self::registerItem(new Spire()); + self::registerItem(new Flow()); + self::registerItem(new Silence()); + self::registerItem(new SnifferEgg()); + self::registerItem(new ArmadilloScute()); } /** From c0424da78db7ffc03f2c5712fe998c8ab3a733f3 Mon Sep 17 00:00:00 2001 From: DANRULEZ123 <40849132+DANRULEZ123@users.noreply.github.com> Date: Mon, 25 Nov 2024 23:29:44 -0500 Subject: [PATCH 18/79] Create SnifferEgg.php Forgot SnifferEgg lol... --- src/pocketmine/item/SnifferEgg.php | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 src/pocketmine/item/SnifferEgg.php diff --git a/src/pocketmine/item/SnifferEgg.php b/src/pocketmine/item/SnifferEgg.php new file mode 100644 index 00000000..24d5b75d --- /dev/null +++ b/src/pocketmine/item/SnifferEgg.php @@ -0,0 +1,17 @@ + Date: Tue, 26 Nov 2024 08:53:10 -0500 Subject: [PATCH 19/79] Update Dune.php Fix invalid ID. --- src/pocketmine/item/Dune.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/pocketmine/item/Dune.php b/src/pocketmine/item/Dune.php index 7847c60d..abafe3a0 100644 --- a/src/pocketmine/item/Dune.php +++ b/src/pocketmine/item/Dune.php @@ -8,10 +8,10 @@ class Dune extends Item { public function __construct(int $meta = 0){ - parent::__construct(self::_ARMOR_TRIM_SMITHING_TEMPLATE, $meta, "Dune Smithing Template"); + parent::__construct(self::DUNE_ARMOR_TRIM_SMITHING_TEMPLATE, $meta, "Dune Smithing Template"); } public function getMaxStackSize(): int { return 64; } -} \ No newline at end of file +} From 9d8c34bd105c6c417777bbdeb64b6ec00fe1c565 Mon Sep 17 00:00:00 2001 From: DANRULEZ123 <40849132+DANRULEZ123@users.noreply.github.com> Date: Tue, 26 Nov 2024 11:28:12 -0500 Subject: [PATCH 20/79] Update item_id_map.json Fixed missing comma --- src/pocketmine/resources/vanilla/item_id_map.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pocketmine/resources/vanilla/item_id_map.json b/src/pocketmine/resources/vanilla/item_id_map.json index 4c3a9eac..26cae2e7 100644 --- a/src/pocketmine/resources/vanilla/item_id_map.json +++ b/src/pocketmine/resources/vanilla/item_id_map.json @@ -834,7 +834,7 @@ "minecraft:vex_armor_trim_smithing_template": 922, "minecraft:wild_armor_trim_smithing_template": 923, "minecraft:coast_armor_trim_smithing_template": 924, - "minecraft:dune_armor_trim_smithing_template": 925 + "minecraft:dune_armor_trim_smithing_template": 925, "minecraft:ward_armor_trim_smithing_template": 926, "minecraft:tide_armor_trim_smithing_template": 927, "minecraft:snout_armor_trim_smithing_template": 928, From 42f2333d829a6b2d587153c7fafdf9d4b6f7e1a9 Mon Sep 17 00:00:00 2001 From: DANRULEZ123 <40849132+DANRULEZ123@users.noreply.github.com> Date: Tue, 26 Nov 2024 14:31:34 -0500 Subject: [PATCH 21/79] Update Player.php Reverted to original --- src/pocketmine/Player.php | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/pocketmine/Player.php b/src/pocketmine/Player.php index fdbf373a..14441d48 100644 --- a/src/pocketmine/Player.php +++ b/src/pocketmine/Player.php @@ -4809,8 +4809,4 @@ public function getDeviceModel() : ?string{ public function getDeviceId() : ?string{ return $this->deviceId; } - - public function testMessage(): string{ - return "§r§aTestString Successful"; - } } From ba20de4e73a26826f5a6860eddc1e956fdcac059 Mon Sep 17 00:00:00 2001 From: DANRULEZ123 <40849132+DANRULEZ123@users.noreply.github.com> Date: Wed, 4 Dec 2024 05:49:59 -0500 Subject: [PATCH 22/79] Update item_id_map.json 1.21.50 - Added Resin Clump & Resin Brick items. --- src/pocketmine/resources/vanilla/item_id_map.json | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/pocketmine/resources/vanilla/item_id_map.json b/src/pocketmine/resources/vanilla/item_id_map.json index 26cae2e7..4c340f91 100644 --- a/src/pocketmine/resources/vanilla/item_id_map.json +++ b/src/pocketmine/resources/vanilla/item_id_map.json @@ -844,6 +844,8 @@ "minecraft:flow_armor_trim_smithing_template": 932, "minecraft:silence_armor_trim_smithing_template": 933, "minecraft:sniffer_egg": 934, - "minecraft:armadillo_scute": 935 + "minecraft:armadillo_scute": 935, + "minecraft:resin_clump": 936, + "minecraft:resin_brick": 937 } From 344ef5cb2430291af6f29efd9bab612423bcb7c4 Mon Sep 17 00:00:00 2001 From: DANRULEZ123 <40849132+DANRULEZ123@users.noreply.github.com> Date: Wed, 4 Dec 2024 05:52:51 -0500 Subject: [PATCH 23/79] Delete src/pocketmine/item/AmethystCrystal.php No extra functionality needed. --- src/pocketmine/item/AmethystCrystal.php | 17 ----------------- 1 file changed, 17 deletions(-) delete mode 100644 src/pocketmine/item/AmethystCrystal.php diff --git a/src/pocketmine/item/AmethystCrystal.php b/src/pocketmine/item/AmethystCrystal.php deleted file mode 100644 index 51b97be4..00000000 --- a/src/pocketmine/item/AmethystCrystal.php +++ /dev/null @@ -1,17 +0,0 @@ - Date: Wed, 4 Dec 2024 05:53:12 -0500 Subject: [PATCH 24/79] Delete src/pocketmine/item/ArmadilloScute.php No extra functionality needed. --- src/pocketmine/item/ArmadilloScute.php | 17 ----------------- 1 file changed, 17 deletions(-) delete mode 100644 src/pocketmine/item/ArmadilloScute.php diff --git a/src/pocketmine/item/ArmadilloScute.php b/src/pocketmine/item/ArmadilloScute.php deleted file mode 100644 index 16d343e0..00000000 --- a/src/pocketmine/item/ArmadilloScute.php +++ /dev/null @@ -1,17 +0,0 @@ - Date: Wed, 4 Dec 2024 05:55:19 -0500 Subject: [PATCH 25/79] Delete src/pocketmine/item/BreezeRod.php No extra functionality needed. --- src/pocketmine/item/BreezeRod.php | 17 ----------------- 1 file changed, 17 deletions(-) delete mode 100644 src/pocketmine/item/BreezeRod.php diff --git a/src/pocketmine/item/BreezeRod.php b/src/pocketmine/item/BreezeRod.php deleted file mode 100644 index da41be7c..00000000 --- a/src/pocketmine/item/BreezeRod.php +++ /dev/null @@ -1,17 +0,0 @@ - Date: Wed, 4 Dec 2024 05:56:13 -0500 Subject: [PATCH 26/79] Delete src/pocketmine/item/Bolt.php No extra functionality needed. --- src/pocketmine/item/Bolt.php | 17 ----------------- 1 file changed, 17 deletions(-) delete mode 100644 src/pocketmine/item/Bolt.php diff --git a/src/pocketmine/item/Bolt.php b/src/pocketmine/item/Bolt.php deleted file mode 100644 index 2d388198..00000000 --- a/src/pocketmine/item/Bolt.php +++ /dev/null @@ -1,17 +0,0 @@ - Date: Wed, 4 Dec 2024 05:58:07 -0500 Subject: [PATCH 27/79] Update Brush.php Changed comment, the brushing animation already occurs. --- src/pocketmine/item/Brush.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/pocketmine/item/Brush.php b/src/pocketmine/item/Brush.php index e913614c..26264dd7 100644 --- a/src/pocketmine/item/Brush.php +++ b/src/pocketmine/item/Brush.php @@ -14,5 +14,5 @@ public function __construct(int $meta = 0){ public function getMaxStackSize(): int { return 1; } - // Add future implementation for brushing animation when holding right click. -} \ No newline at end of file + // Add functionality for brushing suspicious sand and gravel (future implementation.) +} From 034da6713a5567e7e847d5a52401e486a5b70493 Mon Sep 17 00:00:00 2001 From: DANRULEZ123 <40849132+DANRULEZ123@users.noreply.github.com> Date: Mon, 13 Jan 2025 07:51:37 -0500 Subject: [PATCH 28/79] Delete src/pocketmine/item/Coast.php --- src/pocketmine/item/Coast.php | 17 ----------------- 1 file changed, 17 deletions(-) delete mode 100644 src/pocketmine/item/Coast.php diff --git a/src/pocketmine/item/Coast.php b/src/pocketmine/item/Coast.php deleted file mode 100644 index 1d6bb4e2..00000000 --- a/src/pocketmine/item/Coast.php +++ /dev/null @@ -1,17 +0,0 @@ - Date: Mon, 13 Jan 2025 07:52:17 -0500 Subject: [PATCH 29/79] Delete src/pocketmine/item/CopperIngot.php --- src/pocketmine/item/CopperIngot.php | 17 ----------------- 1 file changed, 17 deletions(-) delete mode 100644 src/pocketmine/item/CopperIngot.php diff --git a/src/pocketmine/item/CopperIngot.php b/src/pocketmine/item/CopperIngot.php deleted file mode 100644 index 9f8d06da..00000000 --- a/src/pocketmine/item/CopperIngot.php +++ /dev/null @@ -1,17 +0,0 @@ - Date: Mon, 13 Jan 2025 07:53:02 -0500 Subject: [PATCH 30/79] Delete src/pocketmine/item/Dune.php --- src/pocketmine/item/Dune.php | 17 ----------------- 1 file changed, 17 deletions(-) delete mode 100644 src/pocketmine/item/Dune.php diff --git a/src/pocketmine/item/Dune.php b/src/pocketmine/item/Dune.php deleted file mode 100644 index abafe3a0..00000000 --- a/src/pocketmine/item/Dune.php +++ /dev/null @@ -1,17 +0,0 @@ - Date: Mon, 13 Jan 2025 07:53:33 -0500 Subject: [PATCH 31/79] Delete src/pocketmine/item/DiscFragment.php --- src/pocketmine/item/DiscFragment.php | 17 ----------------- 1 file changed, 17 deletions(-) delete mode 100644 src/pocketmine/item/DiscFragment.php diff --git a/src/pocketmine/item/DiscFragment.php b/src/pocketmine/item/DiscFragment.php deleted file mode 100644 index b765523c..00000000 --- a/src/pocketmine/item/DiscFragment.php +++ /dev/null @@ -1,17 +0,0 @@ - Date: Mon, 13 Jan 2025 07:54:04 -0500 Subject: [PATCH 32/79] Delete src/pocketmine/item/EchoShard.php --- src/pocketmine/item/EchoShard.php | 17 ----------------- 1 file changed, 17 deletions(-) delete mode 100644 src/pocketmine/item/EchoShard.php diff --git a/src/pocketmine/item/EchoShard.php b/src/pocketmine/item/EchoShard.php deleted file mode 100644 index e4c4bb78..00000000 --- a/src/pocketmine/item/EchoShard.php +++ /dev/null @@ -1,17 +0,0 @@ - Date: Mon, 13 Jan 2025 07:54:19 -0500 Subject: [PATCH 33/79] Delete src/pocketmine/item/Eye.php --- src/pocketmine/item/Eye.php | 17 ----------------- 1 file changed, 17 deletions(-) delete mode 100644 src/pocketmine/item/Eye.php diff --git a/src/pocketmine/item/Eye.php b/src/pocketmine/item/Eye.php deleted file mode 100644 index 64642efc..00000000 --- a/src/pocketmine/item/Eye.php +++ /dev/null @@ -1,17 +0,0 @@ - Date: Mon, 13 Jan 2025 07:54:37 -0500 Subject: [PATCH 34/79] Delete src/pocketmine/item/Flow.php --- src/pocketmine/item/Flow.php | 17 ----------------- 1 file changed, 17 deletions(-) delete mode 100644 src/pocketmine/item/Flow.php diff --git a/src/pocketmine/item/Flow.php b/src/pocketmine/item/Flow.php deleted file mode 100644 index 5f768463..00000000 --- a/src/pocketmine/item/Flow.php +++ /dev/null @@ -1,17 +0,0 @@ - Date: Mon, 13 Jan 2025 07:54:55 -0500 Subject: [PATCH 35/79] Delete src/pocketmine/item/HeavyCore.php --- src/pocketmine/item/HeavyCore.php | 18 ------------------ 1 file changed, 18 deletions(-) delete mode 100644 src/pocketmine/item/HeavyCore.php diff --git a/src/pocketmine/item/HeavyCore.php b/src/pocketmine/item/HeavyCore.php deleted file mode 100644 index 2c7cb374..00000000 --- a/src/pocketmine/item/HeavyCore.php +++ /dev/null @@ -1,18 +0,0 @@ - Date: Mon, 13 Jan 2025 07:55:08 -0500 Subject: [PATCH 36/79] Delete src/pocketmine/item/Host.php --- src/pocketmine/item/Host.php | 17 ----------------- 1 file changed, 17 deletions(-) delete mode 100644 src/pocketmine/item/Host.php diff --git a/src/pocketmine/item/Host.php b/src/pocketmine/item/Host.php deleted file mode 100644 index b3797bc5..00000000 --- a/src/pocketmine/item/Host.php +++ /dev/null @@ -1,17 +0,0 @@ - Date: Mon, 13 Jan 2025 07:55:46 -0500 Subject: [PATCH 37/79] Delete src/pocketmine/item/Raiser.php --- src/pocketmine/item/Raiser.php | 17 ----------------- 1 file changed, 17 deletions(-) delete mode 100644 src/pocketmine/item/Raiser.php diff --git a/src/pocketmine/item/Raiser.php b/src/pocketmine/item/Raiser.php deleted file mode 100644 index 85ee8737..00000000 --- a/src/pocketmine/item/Raiser.php +++ /dev/null @@ -1,17 +0,0 @@ - Date: Mon, 13 Jan 2025 07:56:48 -0500 Subject: [PATCH 38/79] Delete src/pocketmine/item/Wild.php --- src/pocketmine/item/Wild.php | 17 ----------------- 1 file changed, 17 deletions(-) delete mode 100644 src/pocketmine/item/Wild.php diff --git a/src/pocketmine/item/Wild.php b/src/pocketmine/item/Wild.php deleted file mode 100644 index 293416d7..00000000 --- a/src/pocketmine/item/Wild.php +++ /dev/null @@ -1,17 +0,0 @@ - Date: Mon, 13 Jan 2025 07:57:26 -0500 Subject: [PATCH 39/79] Delete src/pocketmine/item/Tide.php --- src/pocketmine/item/Tide.php | 17 ----------------- 1 file changed, 17 deletions(-) delete mode 100644 src/pocketmine/item/Tide.php diff --git a/src/pocketmine/item/Tide.php b/src/pocketmine/item/Tide.php deleted file mode 100644 index 83620877..00000000 --- a/src/pocketmine/item/Tide.php +++ /dev/null @@ -1,17 +0,0 @@ - Date: Mon, 13 Jan 2025 07:57:43 -0500 Subject: [PATCH 40/79] Delete src/pocketmine/item/Vex.php --- src/pocketmine/item/Vex.php | 17 ----------------- 1 file changed, 17 deletions(-) delete mode 100644 src/pocketmine/item/Vex.php diff --git a/src/pocketmine/item/Vex.php b/src/pocketmine/item/Vex.php deleted file mode 100644 index fd323d79..00000000 --- a/src/pocketmine/item/Vex.php +++ /dev/null @@ -1,17 +0,0 @@ - Date: Mon, 13 Jan 2025 07:58:14 -0500 Subject: [PATCH 41/79] Delete src/pocketmine/item/Ward.php --- src/pocketmine/item/Ward.php | 17 ----------------- 1 file changed, 17 deletions(-) delete mode 100644 src/pocketmine/item/Ward.php diff --git a/src/pocketmine/item/Ward.php b/src/pocketmine/item/Ward.php deleted file mode 100644 index 495fecfe..00000000 --- a/src/pocketmine/item/Ward.php +++ /dev/null @@ -1,17 +0,0 @@ - Date: Mon, 13 Jan 2025 07:58:32 -0500 Subject: [PATCH 42/79] Delete src/pocketmine/item/Wayfinder.php --- src/pocketmine/item/Wayfinder.php | 17 ----------------- 1 file changed, 17 deletions(-) delete mode 100644 src/pocketmine/item/Wayfinder.php diff --git a/src/pocketmine/item/Wayfinder.php b/src/pocketmine/item/Wayfinder.php deleted file mode 100644 index d8e7d234..00000000 --- a/src/pocketmine/item/Wayfinder.php +++ /dev/null @@ -1,17 +0,0 @@ - Date: Mon, 13 Jan 2025 07:58:59 -0500 Subject: [PATCH 43/79] Delete src/pocketmine/item/Silence.php --- src/pocketmine/item/Silence.php | 17 ----------------- 1 file changed, 17 deletions(-) delete mode 100644 src/pocketmine/item/Silence.php diff --git a/src/pocketmine/item/Silence.php b/src/pocketmine/item/Silence.php deleted file mode 100644 index a3a2341a..00000000 --- a/src/pocketmine/item/Silence.php +++ /dev/null @@ -1,17 +0,0 @@ - Date: Mon, 13 Jan 2025 07:59:22 -0500 Subject: [PATCH 44/79] Delete src/pocketmine/item/SmithingTemplate.php --- src/pocketmine/item/SmithingTemplate.php | 17 ----------------- 1 file changed, 17 deletions(-) delete mode 100644 src/pocketmine/item/SmithingTemplate.php diff --git a/src/pocketmine/item/SmithingTemplate.php b/src/pocketmine/item/SmithingTemplate.php deleted file mode 100644 index b680990b..00000000 --- a/src/pocketmine/item/SmithingTemplate.php +++ /dev/null @@ -1,17 +0,0 @@ - Date: Mon, 13 Jan 2025 07:59:39 -0500 Subject: [PATCH 45/79] Delete src/pocketmine/item/SnifferEgg.php --- src/pocketmine/item/SnifferEgg.php | 17 ----------------- 1 file changed, 17 deletions(-) delete mode 100644 src/pocketmine/item/SnifferEgg.php diff --git a/src/pocketmine/item/SnifferEgg.php b/src/pocketmine/item/SnifferEgg.php deleted file mode 100644 index 24d5b75d..00000000 --- a/src/pocketmine/item/SnifferEgg.php +++ /dev/null @@ -1,17 +0,0 @@ - Date: Mon, 13 Jan 2025 08:00:21 -0500 Subject: [PATCH 46/79] Delete src/pocketmine/item/Rib.php --- src/pocketmine/item/Rib.php | 17 ----------------- 1 file changed, 17 deletions(-) delete mode 100644 src/pocketmine/item/Rib.php diff --git a/src/pocketmine/item/Rib.php b/src/pocketmine/item/Rib.php deleted file mode 100644 index 741505a2..00000000 --- a/src/pocketmine/item/Rib.php +++ /dev/null @@ -1,17 +0,0 @@ - Date: Mon, 13 Jan 2025 08:00:44 -0500 Subject: [PATCH 47/79] Delete src/pocketmine/item/RecoveryCompass.php --- src/pocketmine/item/RecoveryCompass.php | 17 ----------------- 1 file changed, 17 deletions(-) delete mode 100644 src/pocketmine/item/RecoveryCompass.php diff --git a/src/pocketmine/item/RecoveryCompass.php b/src/pocketmine/item/RecoveryCompass.php deleted file mode 100644 index e582c4d2..00000000 --- a/src/pocketmine/item/RecoveryCompass.php +++ /dev/null @@ -1,17 +0,0 @@ - Date: Mon, 13 Jan 2025 08:00:58 -0500 Subject: [PATCH 48/79] Delete src/pocketmine/item/Sentry.php --- src/pocketmine/item/Sentry.php | 17 ----------------- 1 file changed, 17 deletions(-) delete mode 100644 src/pocketmine/item/Sentry.php diff --git a/src/pocketmine/item/Sentry.php b/src/pocketmine/item/Sentry.php deleted file mode 100644 index 5b02e9c6..00000000 --- a/src/pocketmine/item/Sentry.php +++ /dev/null @@ -1,17 +0,0 @@ - Date: Mon, 13 Jan 2025 08:01:14 -0500 Subject: [PATCH 49/79] Delete src/pocketmine/item/Spire.php --- src/pocketmine/item/Spire.php | 17 ----------------- 1 file changed, 17 deletions(-) delete mode 100644 src/pocketmine/item/Spire.php diff --git a/src/pocketmine/item/Spire.php b/src/pocketmine/item/Spire.php deleted file mode 100644 index 39831084..00000000 --- a/src/pocketmine/item/Spire.php +++ /dev/null @@ -1,17 +0,0 @@ - Date: Mon, 13 Jan 2025 08:01:29 -0500 Subject: [PATCH 50/79] Delete src/pocketmine/item/Snout.php --- src/pocketmine/item/Snout.php | 17 ----------------- 1 file changed, 17 deletions(-) delete mode 100644 src/pocketmine/item/Snout.php diff --git a/src/pocketmine/item/Snout.php b/src/pocketmine/item/Snout.php deleted file mode 100644 index e3f15bfa..00000000 --- a/src/pocketmine/item/Snout.php +++ /dev/null @@ -1,17 +0,0 @@ - Date: Mon, 13 Jan 2025 08:01:42 -0500 Subject: [PATCH 51/79] Delete src/pocketmine/item/Shaper.php --- src/pocketmine/item/Shaper.php | 17 ----------------- 1 file changed, 17 deletions(-) delete mode 100644 src/pocketmine/item/Shaper.php diff --git a/src/pocketmine/item/Shaper.php b/src/pocketmine/item/Shaper.php deleted file mode 100644 index d693b77b..00000000 --- a/src/pocketmine/item/Shaper.php +++ /dev/null @@ -1,17 +0,0 @@ - Date: Mon, 13 Jan 2025 08:16:41 -0500 Subject: [PATCH 52/79] Update ItemFactory.php Removed most new vanilla item classes for optimization purposes. --- src/pocketmine/item/ItemFactory.php | 74 +++++++++++++++-------------- 1 file changed, 38 insertions(+), 36 deletions(-) diff --git a/src/pocketmine/item/ItemFactory.php b/src/pocketmine/item/ItemFactory.php index 00ca0cbd..202a120f 100644 --- a/src/pocketmine/item/ItemFactory.php +++ b/src/pocketmine/item/ItemFactory.php @@ -302,42 +302,44 @@ public static function init(){ self::registerItem(new Item(Item::HONEYCOMB, 0, "Honeycomb")); self::registerItem(new HoneyBottle()); self::registerItem(new Spyglass()); - self::registerItem(new EchoShard()); - self::registerItem(new AmethystCrystal()); - self::registerItem(new RawGold()); - self::registerItem(new RawIron()); - self::registerItem(new RawCopper()); - self::registerItem(new CopperIngot()); - self::registerItem(new TrialKey()); - self::registerItem(new OminousTrialKey()); - self::registerItem(new WindCharge()); - self::registerItem(new BreezeRod()); - self::registerItem(new DiscFragment()); - self::registerItem(new Brush()); - self::registerItem(new RecoveryCompass()); - self::registerItem(new Mace()); - self::registerItem(new HeavyCore()); - self::registerItem(new SmithingTemplate()); - self::registerItem(new Bolt()); - self::registerItem(new Host()); - self::registerItem(new Wayfinder()); - self::registerItem(new Shaper()); - self::registerItem(new Raiser()); - self::registerItem(new Sentry()); - self::registerItem(new Vex()); - self::registerItem(new Wild()); - self::registerItem(new Coast()); - self::registerItem(new Dune()); - self::registerItem(new Ward()); - self::registerItem(new Tide()); - self::registerItem(new Snout()); - self::registerItem(new Rib()); - self::registerItem(new Eye()); - self::registerItem(new Spire()); - self::registerItem(new Flow()); - self::registerItem(new Silence()); - self::registerItem(new SnifferEgg()); - self::registerItem(new ArmadilloScute()); + + // Register newer items. + self::registerItem(new Item(Item::ECHO_SHARD, 0, "Echo Shard")); + self::registerItem(new Item(Item::AMETHYST_CRYSTAL, 0, "Amethyst Crystal")); + self::registerItem(new Item(Item::RAW_GOLD, 0, "Raw Gold")); + self::registerItem(new Item(Item::RAW_IRON, 0, "Raw Iron")); + self::registerItem(new Item(Item::RAW_COPPER, 0, "Raw Copper")); + self::registerItem(new Item(Item::COPPER_INGOT, 0, "Copper Ingot")); + self::registerItem(new Item(Item::TRIAL_KEY, 0, "Trial Key")); + self::registerItem(new Item(Item::OMINOUS_TRIAL_KEY, 0, "Ominous Trial Key")); + self::registerItem(new Item(Item::WIND_CHARGE, 0, "Wind Charge")); + self::registerItem(new Item(Item::BREEZE_ROD, 0, "Breeze Rod")); + self::registerItem(new Item(Item::DISC_FRAGMENT_5, 0, "Disc Fragment")); + self::registerItem(new Item(Item::BRUSH, 0, "Brush")); + self::registerItem(new Item(Item::RECOVERY_COMPASS, 0, "Recovery Compass")); + self::registerItem(new Item(Item::MACE, 0, "Mace")); + self::registerItem(new Item(Item::HEAVY_CORE, 0, "Heavy Core")); + self::registerItem(new Item(Item::NETHERITE_UPGRADE_SMITHING_TEMPLATE, 0, "Smithing Template")); + self::registerItem(new Item(Item::BOLT_ARMOR_TRIM_SMITHING_TEMPLATE, 0, "Bolt")); + self::registerItem(new Item(Item::HOST_ARMOR_TRIM_SMITHING_TEMPLATE, 0, "Host")); + self::registerItem(new Item(Item::WAYFINDER_ARMOR_TRIM_SMITHING_TEMPLATE, 0, "Wayfinder")); + self::registerItem(new Item(Item::SHAPER_ARMOR_TRIM_SMITHING_TEMPLATE, 0, "Shaper")); + self::registerItem(new Item(Item::RAISER_ARMOR_TRIM_SMITHING_TEMPLATE, 0, "Raiser")); + self::registerItem(new Item(Item::SENTRY_ARMOR_TRIM_SMITHING_TEMPLATE, 0, "Sentry")); + self::registerItem(new Item(Item::VEX_ARMOR_TRIM_SMITHING_TEMPLATE, 0, "Vex")); + self::registerItem(new Item(Item::WILD_ARMOR_TRIM_SMITHING_TEMPLATE, 0, "Wild")); + self::registerItem(new Item(Item::COAST_ARMOR_TRIM_SMITHING_TEMPLATE, 0, "Coast")); + self::registerItem(new Item(Item::DUNE_ARMOR_TRIM_SMITHING_TEMPLATE, 0, "Dune")); + self::registerItem(new Item(Item::WARD_ARMOR_TRIM_SMITHING_TEMPLATE, 0, "Ward")); + self::registerItem(new Item(Item::TIDE_ARMOR_TRIM_SMITHING_TEMPLATE, 0, "Tide")); + self::registerItem(new Item(Item::SNOUT_ARMOR_TRIM_SMITHING_TEMPLATE, 0, "Snout")); + self::registerItem(new Item(Item::RIB_ARMOR_TRIM_SMITHING_TEMPLATE, 0, "Rib")); + self::registerItem(new Item(Item::EYE_ARMOR_TRIM_SMITHING_TEMPLATE, 0, "Eye")); + self::registerItem(new Item(Item::SPIRE_ARMOR_TRIM_SMITHING_TEMPLATE, 0, "Spire")); + self::registerItem(new Item(Item::FLOW_ARMOR_TRIM_SMITHING_TEMPLATE, 0, "Flow")); + self::registerItem(new Item(Item::SILENCE_ARMOR_TRIM_SMITHING_TEMPLATE, 0, "Silence")); + self::registerItem(new Item(Item::SNIFFER_EGG, 0, "Sniffer Egg")); + self::registerItem(new Item(Item::ARMADILLO_SCUTE, 0, "Armadillo Scute")); } /** From 1495ebdd07ef99821cc4481d8663ce64082dfd32 Mon Sep 17 00:00:00 2001 From: DANRULEZ123 <40849132+DANRULEZ123@users.noreply.github.com> Date: Mon, 13 Jan 2025 08:20:30 -0500 Subject: [PATCH 53/79] Re-added classes for Wind Charge and Mace. Allows for proper, accurate implementation. --- src/pocketmine/item/ItemFactory.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/pocketmine/item/ItemFactory.php b/src/pocketmine/item/ItemFactory.php index 202a120f..c6d0a346 100644 --- a/src/pocketmine/item/ItemFactory.php +++ b/src/pocketmine/item/ItemFactory.php @@ -312,12 +312,12 @@ public static function init(){ self::registerItem(new Item(Item::COPPER_INGOT, 0, "Copper Ingot")); self::registerItem(new Item(Item::TRIAL_KEY, 0, "Trial Key")); self::registerItem(new Item(Item::OMINOUS_TRIAL_KEY, 0, "Ominous Trial Key")); - self::registerItem(new Item(Item::WIND_CHARGE, 0, "Wind Charge")); + self::registerItem(new WindCharge()); // Class reverted due to missing functionality. self::registerItem(new Item(Item::BREEZE_ROD, 0, "Breeze Rod")); self::registerItem(new Item(Item::DISC_FRAGMENT_5, 0, "Disc Fragment")); self::registerItem(new Item(Item::BRUSH, 0, "Brush")); self::registerItem(new Item(Item::RECOVERY_COMPASS, 0, "Recovery Compass")); - self::registerItem(new Item(Item::MACE, 0, "Mace")); + self::registerItem(new Mace()); // Class reverted due to missing functionality. self::registerItem(new Item(Item::HEAVY_CORE, 0, "Heavy Core")); self::registerItem(new Item(Item::NETHERITE_UPGRADE_SMITHING_TEMPLATE, 0, "Smithing Template")); self::registerItem(new Item(Item::BOLT_ARMOR_TRIM_SMITHING_TEMPLATE, 0, "Bolt")); From a8638b8cf68f396234153defad1eff763a2dc9e6 Mon Sep 17 00:00:00 2001 From: DANRULEZ123 <40849132+DANRULEZ123@users.noreply.github.com> Date: Mon, 13 Jan 2025 08:21:00 -0500 Subject: [PATCH 54/79] Delete src/pocketmine/item/Brush.php --- src/pocketmine/item/Brush.php | 18 ------------------ 1 file changed, 18 deletions(-) delete mode 100644 src/pocketmine/item/Brush.php diff --git a/src/pocketmine/item/Brush.php b/src/pocketmine/item/Brush.php deleted file mode 100644 index 26264dd7..00000000 --- a/src/pocketmine/item/Brush.php +++ /dev/null @@ -1,18 +0,0 @@ - Date: Mon, 13 Jan 2025 08:21:35 -0500 Subject: [PATCH 55/79] Delete src/pocketmine/item/OminousTrialKey.php --- src/pocketmine/item/OminousTrialKey.php | 17 ----------------- 1 file changed, 17 deletions(-) delete mode 100644 src/pocketmine/item/OminousTrialKey.php diff --git a/src/pocketmine/item/OminousTrialKey.php b/src/pocketmine/item/OminousTrialKey.php deleted file mode 100644 index f22090c4..00000000 --- a/src/pocketmine/item/OminousTrialKey.php +++ /dev/null @@ -1,17 +0,0 @@ - Date: Mon, 13 Jan 2025 08:21:50 -0500 Subject: [PATCH 56/79] Delete src/pocketmine/item/TrialKey.php --- src/pocketmine/item/TrialKey.php | 17 ----------------- 1 file changed, 17 deletions(-) delete mode 100644 src/pocketmine/item/TrialKey.php diff --git a/src/pocketmine/item/TrialKey.php b/src/pocketmine/item/TrialKey.php deleted file mode 100644 index 0c8a1db0..00000000 --- a/src/pocketmine/item/TrialKey.php +++ /dev/null @@ -1,17 +0,0 @@ - Date: Mon, 13 Jan 2025 09:43:50 -0500 Subject: [PATCH 57/79] Update item_id_map.json Added modern vanilla block variants for Copper, Deepslate, Tuff, Cherry Wood, Bamboo Wood, Mangrove Wood, and Pale Oak Wood. Also added Sculk blocks. --- .../resources/vanilla/item_id_map.json | 128 +++++++++++++++++- 1 file changed, 127 insertions(+), 1 deletion(-) diff --git a/src/pocketmine/resources/vanilla/item_id_map.json b/src/pocketmine/resources/vanilla/item_id_map.json index 4c340f91..6e1259a0 100644 --- a/src/pocketmine/resources/vanilla/item_id_map.json +++ b/src/pocketmine/resources/vanilla/item_id_map.json @@ -809,6 +809,7 @@ "minecraft:nether_sprouts": 760, "minecraft:spyglass": 772, "minecraft:soul_campfire": 801, + "minecraft:echo_shard": 900, "minecraft:amethyst_shard": 901, "minecraft:raw_gold": 902, @@ -846,6 +847,131 @@ "minecraft:sniffer_egg": 934, "minecraft:armadillo_scute": 935, "minecraft:resin_clump": 936, - "minecraft:resin_brick": 937 + "minecraft:resin_brick": 937, + "minecraft:bundle": 938, + + "minecraft:raw_gold_block": -305, + "minecraft:raw_iron_block": -306, + "minecraft:raw_copper_block": -307, + "minecraft:deepslate": -308, + "minecraft:tuff": -309, + "minecraft:deepslate_coal_ore": -310, + "minecraft:deepslate_iron_ore": -311, + "minecraft:deepslate_copper_ore": -312, + "minecraft:deepslate_gold_ore": -313, + "minecraft:deepslate_lapis_ore": -314, + "minecraft:deepslate_redstone_ore": -315, + "minecraft:deepslate_diamond_ore": -316, + "minecraft:deepslate_emerald_ore": -317, + "minecraft:polished_deepslate": -318, + "minecraft:polished_tuff": -319, + "minecraft:ochre_froglight": -320, + "minecraft:verdant_froglight": -321, + "minecraft:deepslate_tiles": -322, + "minecraft:polished_deepslate_stairs": -323, + "minecraft:cobbled_deepslate_stairs": -324, + "minecraft:polished_deepslate_slab": -325, + "minecraft:cobbled_deepslate_slab": -326, + "minecraft:deepslate_bricks": -327, + "minecraft:chiseled_deepslate": -328, + "minecraft:cobbled_deepslate": -329, + "minecraft:deepslate_brick_slab": -330, + "minecraft:deepslate_brick_stairs": -331, + "minecraft:deepslate_tile_slab": -332, + "minecraft:deepslate_tile_stairs": -333, + "minecraft:chiseled_tuff": -334, + "minecraft:chiseled_tuff_bricks": -335, + "minecraft:polished_tuff_slab": -336, + "minecraft:polished_tuff_stairs": -337, + "minecraft:sculk": -338, + "minecraft:sculk_catalyst": -339, + "minecraft:sculk_sensor": -340, + "minecraft_sculk_shrieker": -341, + "minecraft:sculk_vein": -342, + "minecraft:calibrated_sculk_sensor": -343, + "minecraft:copper_block": -344, + "minecraft:copper_door": -345, + "minecraft:copper_trapdoor": -346, + "minecraft:copper_grate": -347, + "minecraft:copper_bulb": -348, + "minecraft:cut_copper_slab": -349, + "minecraft:cut_copper_stairs": -350, + "minecraft:chiseled_copper": -351, + "minecraft:exposed_copper": -352, + "minecraft:exposed_copper_door": -353, + "minecraft:exposed_copper_trapdoor": -354, + "minecraft:exposed_copper_grate": -355, + "minecraft:exposed_copper_bulb": -356, + "minecraft:exposed_cut_copper_slab": -357, + "minecraft:exposed_cut_copper_stairs": -358, + "minecraft:exposed_chiseled_copper": -359, + "minecraft:cut_copper": -360, + "minecraft:exposed_cut_copper": -361, + "minecraft:weathered_cut_copper": -362, + "minecraft:weathered_copper": -363, + "minecraft:weathered_copper_door": -364, + "minecraft:weathered_copper_trapdoor": -365, + "minecraft:weathered_copper_grate": -366, + "minecraft:weathered_copper_bulb": -367, + "minecraft:weathered_cut_copper_slab": -368, + "minecraft:weathered_cut_copper_stairs": -369, + "minecraft:weathered_chiseled_copper": -370, + "minecraft:oxidized_cut_copper": -371, + "minecraft:oxidized_copper": -372, + "minecraft:oxidized_copper_door": -373, + "minecraft:oxidized_copper_trapdoor": -374, + "minecraft:oxidized_copper_grate": -375, + "minecraft:oxidized_copper_bulb": -376, + "minecraft:oxidized_cut_copper_slab": -377, + "minecraft:oxidized_cut_copper_stairs": -378, + "minecraft:oxidized_chiseled_copper": -379, + "minecraft:cherry_sapling": -380, + "minecraft:pale_oak_sapling": -381, + "minecraft:mangrove_propagule": -382, + "minecraft:trial_spawner": -383, + "minecraft:resin_block": -384, + "minecraft:resin_bricks": -385, + "minecraft:resin_brick_slab": -386, + "minecraft:resin_brick_stairs": -387, + "minecraft:chiseled_resin_bricks": -388, + "minecraft:vault": -389, + "minecraft:mangrove_planks": -390, + "minecraft:cherry_planks": -391, + "minecraft:bamboo_planks": -392, + "minecraft:pale_oak_planks": -393, + "minecraft:mangrove_slab": -394, + "minecraft:mangrove_stairs": -395, + "minecraft:mangrove_door": -396, + "minecraft:mangrove_trapdoor": -397, + "minecraft:mangrove_fence": -398, + "minecraft:mangrove_fence_gate": -399, + "minecraft:mangrove_sign": -400, + "minecraft:mangrove_hanging_sign": -401, + "minecraft:mangrove_log": -402, + "minecraft:cherry_slab": -403, + "minecraft:cherry_stairs": -404, + "minecraft:cherry_door": -405, + "minecraft:cherry_trapdoor": -406, + "minecraft:cherry_fence": -407, + "minecraft:cherry_fence_gate": -408, + "minecraft:cherry_sign": -409, + "minecraft:cherry_hanging_sign": -410, + "minecraft:cherry_log": -411, + "minecraft:bamboo_slab": -412, + "minecraft:bamboo_stairs": -413, + "minecraft:bamboo_door": -414, + "minecraft:bamboo_trapdoor": -415, + "minecraft:bamboo_fence": -416, + "minecraft:bamboo_fence_gate": -417, + "minecraft:bamboo_sign": -418, + "minecraft:bamboo_hanging_sign": -419, + "minecraft:pale_oak_slab": -420, + "minecraft:pale_oak_stairs": -421, + "minecraft:pale_oak_door": -422, + "minecraft:pale_oak_trapdoor": -423, + "minecraft:pale_oak_fence": -424, + "minecraft:pale_oak_fence_gate": -425, + "minecraft:pale_oak_sign": -426, + "minecraft:pale_oak_hanging_sign": -427 } From 3dec74e1dbcb1e88567543a1658220377c7c20f9 Mon Sep 17 00:00:00 2001 From: DANRULEZ123 <40849132+DANRULEZ123@users.noreply.github.com> Date: Mon, 13 Jan 2025 09:49:41 -0500 Subject: [PATCH 58/79] Update item_id_map.json Added the default bundle (in the last commit.) This commit has added all the color varients. --- .../resources/vanilla/item_id_map.json | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/src/pocketmine/resources/vanilla/item_id_map.json b/src/pocketmine/resources/vanilla/item_id_map.json index 6e1259a0..7e6f10e2 100644 --- a/src/pocketmine/resources/vanilla/item_id_map.json +++ b/src/pocketmine/resources/vanilla/item_id_map.json @@ -849,6 +849,22 @@ "minecraft:resin_clump": 936, "minecraft:resin_brick": 937, "minecraft:bundle": 938, + "minecraft:black_bundle": 939, + "minecraft:blue_bundle": 940, + "minecraft:brown_bundle": 941, + "minecraft:cyan_bundle": 942, + "minecraft:gray_bundle": 943, + "minecraft:green_bundle": 944, + "minecraft:light_blue_bundle": 945, + "minecraft:light_gray_bundle": 946, + "minecraft:lime_bundle": 947, + "minecraft:magenta_bundle": 948, + "minecraft:orange_bundle": 949, + "minecraft:pink_bundle": 950, + "minecraft:purple_bundle": 951, + "minecraft:red_bundle": 952, + "minecraft:white_bundle": 953, + "minecraft:yellow_bundle": 954 "minecraft:raw_gold_block": -305, From 61f67305912b745d4f7aeaecff6c75867daf857f Mon Sep 17 00:00:00 2001 From: DANRULEZ123 <40849132+DANRULEZ123@users.noreply.github.com> Date: Mon, 13 Jan 2025 09:59:38 -0500 Subject: [PATCH 59/79] Gold Ore now drops Raw Gold. --- src/pocketmine/block/GoldOre.php | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/pocketmine/block/GoldOre.php b/src/pocketmine/block/GoldOre.php index a776e01f..821b5348 100644 --- a/src/pocketmine/block/GoldOre.php +++ b/src/pocketmine/block/GoldOre.php @@ -48,4 +48,10 @@ public function getToolType() : int{ public function getToolHarvestLevel() : int{ return TieredTool::TIER_IRON; } + + public function getDropsForCompatibleTool(Item $item) : array{ + return [ + ItemFactory::get(Item::RAW_GOLD); + ]; + } } From d8a06317900588cca642f9379f9e37f6042a6875 Mon Sep 17 00:00:00 2001 From: DANRULEZ123 <40849132+DANRULEZ123@users.noreply.github.com> Date: Mon, 13 Jan 2025 10:02:15 -0500 Subject: [PATCH 60/79] Update GoldOre.php Added missing use statements. (pocketmine\item\Item & ItemFactory) --- src/pocketmine/block/GoldOre.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pocketmine/block/GoldOre.php b/src/pocketmine/block/GoldOre.php index 821b5348..7467deae 100644 --- a/src/pocketmine/block/GoldOre.php +++ b/src/pocketmine/block/GoldOre.php @@ -23,7 +23,7 @@ namespace pocketmine\block; -use pocketmine\item\TieredTool; +use pocketmine\item\{Item, ItemFactory, TieredTool}; class GoldOre extends Solid{ From e42afabf355ad9bcadd47b0577deb7a2ec31d147 Mon Sep 17 00:00:00 2001 From: DANRULEZ123 <40849132+DANRULEZ123@users.noreply.github.com> Date: Mon, 13 Jan 2025 10:04:00 -0500 Subject: [PATCH 61/79] Update IronOre.php Iron Ore now drops raw iron. --- src/pocketmine/block/IronOre.php | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/pocketmine/block/IronOre.php b/src/pocketmine/block/IronOre.php index 003e8384..83ca8969 100644 --- a/src/pocketmine/block/IronOre.php +++ b/src/pocketmine/block/IronOre.php @@ -23,7 +23,7 @@ namespace pocketmine\block; -use pocketmine\item\TieredTool; +use pocketmine\item\{Item, ItemFactory, TieredTool}; class IronOre extends Solid{ @@ -48,4 +48,10 @@ public function getToolHarvestLevel() : int{ public function getHardness() : float{ return 3; } + + public function getDropsForCompatibleTool(Item $item) : array{ + return [ + ItemFactory::get(Item::RAW_IRON); + ]; + } } From 584c0290e9c5646178d5dd97946e12a33356ce1e Mon Sep 17 00:00:00 2001 From: DANRULEZ123 <40849132+DANRULEZ123@users.noreply.github.com> Date: Mon, 13 Jan 2025 10:09:59 -0500 Subject: [PATCH 62/79] Update MobSpawner.php Fixed typo that remained unnoticed for 4 years. --- src/pocketmine/tile/MobSpawner.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/pocketmine/tile/MobSpawner.php b/src/pocketmine/tile/MobSpawner.php index d3a12951..ffe9e3b1 100644 --- a/src/pocketmine/tile/MobSpawner.php +++ b/src/pocketmine/tile/MobSpawner.php @@ -40,7 +40,7 @@ class MobSpawner extends Spawnable{ public const TAG_DELAY = "Delay"; public const TAG_MAX_NEARBY_ENTITIES = "MaxNearbyEntities"; public const TAG_MAX_SPAWN_DELAY = "MaxSpawnDelay"; - public const TAG_MIN_SPAWN_DELAY = "MinSawnDelay"; + public const TAG_MIN_SPAWN_DELAY = "MinSpawnDelay"; public const TAG_REQUIRED_PLAYER_RANGE = "RequiredPlayerRange"; public const TAG_SPAWN_COUNT = "SpawnCount"; public const TAG_SPAWN_RANGE = "SpawnRange"; @@ -277,4 +277,4 @@ public function onUpdate() : bool{ public function isValidSpawnPosition(Vector3 $pos) : bool{ return $this->level->getBlock($pos) instanceof Air and $this->level->getBlock($pos->up()) instanceof Air and $this->level->getBlock($pos->down())->isSolid(); } -} \ No newline at end of file +} From 60f8fb20d3dc11f895de319c6ad2117589156616 Mon Sep 17 00:00:00 2001 From: DANRULEZ123 <40849132+DANRULEZ123@users.noreply.github.com> Date: Mon, 13 Jan 2025 10:20:23 -0500 Subject: [PATCH 63/79] Update recipes.json Attempt at making raw ores smeltable. --- src/pocketmine/resources/vanilla/recipes.json | 32 ++++++++++++++++++- 1 file changed, 31 insertions(+), 1 deletion(-) diff --git a/src/pocketmine/resources/vanilla/recipes.json b/src/pocketmine/resources/vanilla/recipes.json index 0647aad0..c81063d4 100644 --- a/src/pocketmine/resources/vanilla/recipes.json +++ b/src/pocketmine/resources/vanilla/recipes.json @@ -49790,6 +49790,36 @@ "damage": 2 } }, + { + "block": "furnace", + "input": { + "id": 902, + "damage": 0 + }, + "output": { + "id": 266 + } + }, + { + "block": "furnace", + "input": { + "id": 903, + "damage": 0 + }, + "output": { + "id": 265 + } + }, + { + "block": "furnace", + "input": { + "id": 904, + "damage": 0 + }, + "output": { + "id": 905 + } + }, { "block": "smoker", "input": { @@ -49985,4 +50015,4 @@ "d392b075-4ba1-40ae-8789-af868d56f6ce", "d81aaeaf-e172-4440-9225-868df030d27b" ] -} \ No newline at end of file +} From 437bda81c3e64215cbbcbc118d9b3e525721cc49 Mon Sep 17 00:00:00 2001 From: DANRULEZ123 <40849132+DANRULEZ123@users.noreply.github.com> Date: Mon, 13 Jan 2025 10:31:39 -0500 Subject: [PATCH 64/79] Add WIND_CHARGE_PROJECTILE Entity ID. --- src/pocketmine/entity/EntityIds.php | 1 + 1 file changed, 1 insertion(+) diff --git a/src/pocketmine/entity/EntityIds.php b/src/pocketmine/entity/EntityIds.php index 219919e4..2c877377 100644 --- a/src/pocketmine/entity/EntityIds.php +++ b/src/pocketmine/entity/EntityIds.php @@ -138,4 +138,5 @@ interface EntityIds{ public const GLOW_SQUID = 139; public const GOAT = 128; public const PILLAGER = 114; + public const WIND_CHARGE_PROJECTILE = 143; } From f71fb4c377b0741995b7aeffab3ef700e92dca1a Mon Sep 17 00:00:00 2001 From: DANRULEZ123 <40849132+DANRULEZ123@users.noreply.github.com> Date: Wed, 15 Jan 2025 10:55:54 -0500 Subject: [PATCH 65/79] Update block_id_map.json Implemented 123 new block ids! (Use extended blocks to register and use) --- .../resources/vanilla/block_id_map.json | 127 +++++++++++++++++- 1 file changed, 125 insertions(+), 2 deletions(-) diff --git a/src/pocketmine/resources/vanilla/block_id_map.json b/src/pocketmine/resources/vanilla/block_id_map.json index e322f706..6dce59c6 100644 --- a/src/pocketmine/resources/vanilla/block_id_map.json +++ b/src/pocketmine/resources/vanilla/block_id_map.json @@ -551,5 +551,128 @@ "minecraft:stripped_warped_hyphae": 556, "minecraft:chiseled_nether_bricks": 557, "minecraft:cracked_nether_bricks": 558, - "minecraft:quartz_bricks": 559 -} \ No newline at end of file + "minecraft:quartz_bricks": 559, + "minecraft:raw_gold_block": 560, + "minecraft:raw_iron_block": 561, + "minecraft:raw_copper_block": 562, + "minecraft:deepslate": 563, + "minecraft:tuff": 564, + "minecraft:deepslate_coal_ore": 565, + "minecraft:deepslate_iron_ore": 566, + "minecraft:deepslate_copper_ore": 567, + "minecraft:deepslate_gold_ore": 568, + "minecraft:deepslate_lapis_ore": 569, + "minecraft:deepslate_redstone_ore": 570, + "minecraft:deepslate_diamond_ore": 571, + "minecraft:deepslate_emerald_ore": 572, + "minecraft:polished_deepslate": 573, + "minecraft:polished_tuff": 574, + "minecraft:ochre_froglight": 575, + "minecraft:verdant_froglight": 576, + "minecraft:deepslate_tiles": 577, + "minecraft:polished_deepslate_stairs": 578, + "minecraft:cobbled_deepslate_stairs": 579, + "minecraft:polished_deepslate_slab": 580, + "minecraft:cobbled_deepslate_slab": 581, + "minecraft:deepslate_bricks": 582, + "minecraft:chiseled_deepslate": 583, + "minecraft:cobbled_deepslate": 584, + "minecraft:deepslate_brick_slab": 585, + "minecraft:deepslate_brick_stairs": 586, + "minecraft:deepslate_tile_slab": 587, + "minecraft:deepslate_tile_stairs": 588, + "minecraft:chiseled_tuff": 589, + "minecraft:chiseled_tuff_bricks": 590, + "minecraft:polished_tuff_slab": 591, + "minecraft:polished_tuff_stairs": 592, + "minecraft:sculk": 593, + "minecraft:sculk_catalyst": 594, + "minecraft:sculk_sensor": 595, + "minecraft:sculk_shrieker": 596, + "minecraft:sculk_vein": 597, + "minecraft:calibrated_sculk_sensor": 598, + "minecraft:copper_block": 599, + "minecraft:copper_door": 600, + "minecraft:copper_trapdoor": 601, + "minecraft:copper_grate": 602, + "minecraft:copper_bulb": 603, + "minecraft:cut_copper_slab": 604, + "minecraft:cut_copper_stairs": 605, + "minecraft:chiseled_copper": 606, + "minecraft:exposed_copper": 607, + "minecraft:exposed_copper_door": 608, + "minecraft:exposed_copper_trapdoor": 609, + "minecraft:exposed_copper_grate": 610, + "minecraft:exposed_copper_bulb": 611, + "minecraft:exposed_cut_copper_slab": 612, + "minecraft:exposed_cut_copper_stairs": 613, + "minecraft:exposed_chiseled_copper": 614, + "minecraft:cut_copper": 615, + "minecraft:exposed_cut_copper": 616, + "minecraft:weathered_cut_copper": 617, + "minecraft:weathered_copper": 618, + "minecraft:weathered_copper_door": 619, + "minecraft:weathered_copper_trapdoor": 620, + "minecraft:weathered_copper_grate": 621, + "minecraft:weathered_copper_bulb": 622, + "minecraft:weathered_cut_copper_slab": 623, + "minecraft:weathered_cut_copper_stairs": 624, + "minecraft:weathered_chiseled_copper": 625, + "minecraft:oxidized_cut_copper": 626, + "minecraft:oxidized_copper": 627, + "minecraft:oxidized_copper_door": 628, + "minecraft:oxidized_copper_trapdoor": 629, + "minecraft:oxidized_copper_grate": 630, + "minecraft:oxidized_copper_bulb": 631, + "minecraft:oxidized_cut_copper_slab": 632, + "minecraft:oxidized_cut_copper_stairs": 633, + "minecraft:oxidized_chiseled_copper": 634, + "minecraft:cherry_sapling": 635, + "minecraft:pale_oak_sapling": 636, + "minecraft:mangrove_propagule": 637, + "minecraft:trial_spawner": 638, + "minecraft:resin_block": 639, + "minecraft:resin_bricks": 640, + "minecraft:resin_brick_slab": 641, + "minecraft:resin_brick_stairs": 642, + "minecraft:chiseled_resin_bricks": 643, + "minecraft:vault": 644, + "minecraft:mangrove_planks": 645, + "minecraft:cherry_planks": 646, + "minecraft:bamboo_planks": 647, + "minecraft:pale_oak_planks": 648, + "minecraft:mangrove_slab": 649, + "minecraft:mangrove_stairs": 650, + "minecraft:mangrove_door": 651, + "minecraft:mangrove_trapdoor": 652, + "minecraft:mangrove_fence": 653, + "minecraft:mangrove_fence_gate": 654, + "minecraft:mangrove_sign": 655, + "minecraft:mangrove_hanging_sign": 656, + "minecraft:mangrove_log": 657, + "minecraft:cherry_slab": 658, + "minecraft:cherry_stairs": 659, + "minecraft:cherry_door": 660, + "minecraft:cherry_trapdoor": 661, + "minecraft:cherry_fence": 662, + "minecraft:cherry_fence_gate": 663, + "minecraft:cherry_sign": 664, + "minecraft:cherry_hanging_sign": 665, + "minecraft:cherry_log": 666, + "minecraft:bamboo_slab": 667, + "minecraft:bamboo_stairs": 668, + "minecraft:bamboo_door": 669, + "minecraft:bamboo_trapdoor": 670, + "minecraft:bamboo_fence": 671, + "minecraft:bamboo_fence_gate": 672, + "minecraft:bamboo_sign": 673, + "minecraft:bamboo_hanging_sign": 674, + "minecraft:pale_oak_slab": 675, + "minecraft:pale_oak_stairs": 676, + "minecraft:pale_oak_door": 677, + "minecraft:pale_oak_trapdoor": 678, + "minecraft:pale_oak_fence": 679, + "minecraft:pale_oak_fence_gate": 680, + "minecraft:pale_oak_sign": 681, + "minecraft:pale_oak_hanging_sign": 682 +} From 165bca5251efcb8d7fd6df4661c99c0b17b16034 Mon Sep 17 00:00:00 2001 From: DANRULEZ123 <40849132+DANRULEZ123@users.noreply.github.com> Date: Sat, 18 Jan 2025 10:01:37 -0500 Subject: [PATCH 66/79] Update ItemIds.php Added previously implemented IDs that weren't here from item_id_map.json. --- src/pocketmine/item/ItemIds.php | 578 +++++++++++++++++--------------- 1 file changed, 299 insertions(+), 279 deletions(-) diff --git a/src/pocketmine/item/ItemIds.php b/src/pocketmine/item/ItemIds.php index 8348a5d8..7582bf55 100644 --- a/src/pocketmine/item/ItemIds.php +++ b/src/pocketmine/item/ItemIds.php @@ -27,295 +27,315 @@ interface ItemIds extends BlockIds{ - public const IRON_SHOVEL = 256; - public const IRON_PICKAXE = 257; - public const IRON_AXE = 258; - public const FLINT_AND_STEEL = 259, FLINT_STEEL = 259; - public const APPLE = 260; - public const BOW = 261; - public const ARROW = 262; - public const COAL = 263; - public const DIAMOND = 264; - public const IRON_INGOT = 265; - public const GOLD_INGOT = 266; - public const IRON_SWORD = 267; - public const WOODEN_SWORD = 268; - public const WOODEN_SHOVEL = 269; - public const WOODEN_PICKAXE = 270; - public const WOODEN_AXE = 271; - public const STONE_SWORD = 272; - public const STONE_SHOVEL = 273; - public const STONE_PICKAXE = 274; - public const STONE_AXE = 275; - public const DIAMOND_SWORD = 276; - public const DIAMOND_SHOVEL = 277; - public const DIAMOND_PICKAXE = 278; - public const DIAMOND_AXE = 279; - public const STICK = 280; - public const BOWL = 281; - public const MUSHROOM_STEW = 282; - public const GOLDEN_SWORD = 283, GOLD_SWORD = 283; - public const GOLDEN_SHOVEL = 284, GOLD_SHOVEL = 284; - public const GOLDEN_PICKAXE = 285, GOLD_PICKAXE = 285; - public const GOLDEN_AXE = 286, GOLD_AXE = 286; - public const STRING = 287; - public const FEATHER = 288; - public const GUNPOWDER = 289; - public const WOODEN_HOE = 290; - public const STONE_HOE = 291; - public const IRON_HOE = 292; - public const DIAMOND_HOE = 293; - public const GOLDEN_HOE = 294, GOLD_HOE = 294; - public const SEEDS = 295, WHEAT_SEEDS = 295; - public const WHEAT = 296; - public const BREAD = 297; - public const LEATHER_CAP = 298, LEATHER_HELMET = 298; - public const LEATHER_CHESTPLATE = 299, LEATHER_TUNIC = 299; - public const LEATHER_LEGGINGS = 300, LEATHER_PANTS = 300; - public const LEATHER_BOOTS = 301; - public const CHAINMAIL_HELMET = 302, CHAIN_HELMET = 302; - public const CHAINMAIL_CHESTPLATE = 303, CHAIN_CHESTPLATE = 303; - public const CHAINMAIL_LEGGINGS = 304, CHAIN_LEGGINGS = 304; - public const CHAINMAIL_BOOTS = 305, CHAIN_BOOTS = 305; - public const IRON_HELMET = 306; - public const IRON_CHESTPLATE = 307; - public const IRON_LEGGINGS = 308; - public const IRON_BOOTS = 309; - public const DIAMOND_HELMET = 310; - public const DIAMOND_CHESTPLATE = 311; - public const DIAMOND_LEGGINGS = 312; - public const DIAMOND_BOOTS = 313; - public const GOLDEN_HELMET = 314, GOLD_HELMET = 314; - public const GOLDEN_CHESTPLATE = 315, GOLD_CHESTPLATE = 315; - public const GOLDEN_LEGGINGS = 316, GOLD_LEGGINGS = 316; - public const GOLDEN_BOOTS = 317, GOLD_BOOTS = 317; - public const FLINT = 318; - public const PORKCHOP = 319, RAW_PORKCHOP = 319; - public const COOKED_PORKCHOP = 320; - public const PAINTING = 321; - public const GOLDEN_APPLE = 322; - public const SIGN = 323; - public const OAK_DOOR = 324, WOODEN_DOOR = 324; - public const BUCKET = 325; + public const IRON_SHOVEL = 256; + public const IRON_PICKAXE = 257; + public const IRON_AXE = 258; + public const FLINT_AND_STEEL = 259, FLINT_STEEL = 259; + public const APPLE = 260; + public const BOW = 261; + public const ARROW = 262; + public const COAL = 263; + public const DIAMOND = 264; + public const IRON_INGOT = 265; + public const GOLD_INGOT = 266; + public const IRON_SWORD = 267; + public const WOODEN_SWORD = 268; + public const WOODEN_SHOVEL = 269; + public const WOODEN_PICKAXE = 270; + public const WOODEN_AXE = 271; + public const STONE_SWORD = 272; + public const STONE_SHOVEL = 273; + public const STONE_PICKAXE = 274; + public const STONE_AXE = 275; + public const DIAMOND_SWORD = 276; + public const DIAMOND_SHOVEL = 277; + public const DIAMOND_PICKAXE = 278; + public const DIAMOND_AXE = 279; + public const STICK = 280; + public const BOWL = 281; + public const MUSHROOM_STEW = 282; + public const GOLDEN_SWORD = 283, GOLD_SWORD = 283; + public const GOLDEN_SHOVEL = 284, GOLD_SHOVEL = 284; + public const GOLDEN_PICKAXE = 285, GOLD_PICKAXE = 285; + public const GOLDEN_AXE = 286, GOLD_AXE = 286; + public const STRING = 287; + public const FEATHER = 288; + public const GUNPOWDER = 289; + public const WOODEN_HOE = 290; + public const STONE_HOE = 291; + public const IRON_HOE = 292; + public const DIAMOND_HOE = 293; + public const GOLDEN_HOE = 294, GOLD_HOE = 294; + public const SEEDS = 295, WHEAT_SEEDS = 295; + public const WHEAT = 296; + public const BREAD = 297; + public const LEATHER_CAP = 298, LEATHER_HELMET = 298; + public const LEATHER_CHESTPLATE = 299, LEATHER_TUNIC = 299; + public const LEATHER_LEGGINGS = 300, LEATHER_PANTS = 300; + public const LEATHER_BOOTS = 301; + public const CHAINMAIL_HELMET = 302, CHAIN_HELMET = 302; + public const CHAINMAIL_CHESTPLATE = 303, CHAIN_CHESTPLATE = 303; + public const CHAINMAIL_LEGGINGS = 304, CHAIN_LEGGINGS = 304; + public const CHAINMAIL_BOOTS = 305, CHAIN_BOOTS = 305; + public const IRON_HELMET = 306; + public const IRON_CHESTPLATE = 307; + public const IRON_LEGGINGS = 308; + public const IRON_BOOTS = 309; + public const DIAMOND_HELMET = 310; + public const DIAMOND_CHESTPLATE = 311; + public const DIAMOND_LEGGINGS = 312; + public const DIAMOND_BOOTS = 313; + public const GOLDEN_HELMET = 314, GOLD_HELMET = 314; + public const GOLDEN_CHESTPLATE = 315, GOLD_CHESTPLATE = 315; + public const GOLDEN_LEGGINGS = 316, GOLD_LEGGINGS = 316; + public const GOLDEN_BOOTS = 317, GOLD_BOOTS = 317; + public const FLINT = 318; + public const PORKCHOP = 319, RAW_PORKCHOP = 319; + public const COOKED_PORKCHOP = 320; + public const PAINTING = 321; + public const GOLDEN_APPLE = 322; + public const SIGN = 323; + public const OAK_DOOR = 324, WOODEN_DOOR = 324; + public const BUCKET = 325; - public const MINECART = 328; - public const SADDLE = 329; - public const IRON_DOOR = 330; - public const REDSTONE = 331, REDSTONE_DUST = 331; - public const SNOWBALL = 332; - public const BOAT = 333; - public const LEATHER = 334; - public const KELP = 335; - public const BRICK = 336; - public const CLAY = 337, CLAY_BALL = 337; - public const REEDS = 338, SUGARCANE = 338; - public const PAPER = 339; - public const BOOK = 340; - public const SLIMEBALL = 341, SLIME_BALL = 341; - public const CHEST_MINECART = 342, MINECART_WITH_CHEST = 342; + public const MINECART = 328; + public const SADDLE = 329; + public const IRON_DOOR = 330; + public const REDSTONE = 331, REDSTONE_DUST = 331; + public const SNOWBALL = 332; + public const BOAT = 333; + public const LEATHER = 334; + public const KELP = 335; + public const BRICK = 336; + public const CLAY = 337, CLAY_BALL = 337; + public const REEDS = 338, SUGARCANE = 338; + public const PAPER = 339; + public const BOOK = 340; + public const SLIMEBALL = 341, SLIME_BALL = 341; + public const CHEST_MINECART = 342, MINECART_WITH_CHEST = 342; - public const EGG = 344; - public const COMPASS = 345; - public const FISHING_ROD = 346; - public const CLOCK = 347; - public const GLOWSTONE_DUST = 348; - public const FISH = 349, RAW_FISH = 349; - public const COOKED_FISH = 350; - public const DYE = 351; - public const BONE = 352; - public const SUGAR = 353; - public const CAKE = 354; - public const BED = 355; - public const REPEATER = 356; - public const COOKIE = 357; - public const FILLED_MAP = 358; - public const SHEARS = 359; - public const MELON = 360, MELON_SLICE = 360; - public const PUMPKIN_SEEDS = 361; - public const MELON_SEEDS = 362; - public const BEEF = 363, RAW_BEEF = 363; - public const COOKED_BEEF = 364, STEAK = 364; - public const CHICKEN = 365, RAW_CHICKEN = 365; - public const COOKED_CHICKEN = 366; - public const ROTTEN_FLESH = 367; - public const ENDER_PEARL = 368; - public const BLAZE_ROD = 369; - public const GHAST_TEAR = 370; - public const GOLDEN_NUGGET = 371, GOLD_NUGGET = 371; - public const NETHER_WART = 372; - public const POTION = 373; - public const GLASS_BOTTLE = 374; - public const SPIDER_EYE = 375; - public const FERMENTED_SPIDER_EYE = 376; - public const BLAZE_POWDER = 377; - public const MAGMA_CREAM = 378; - public const BREWING_STAND = 379; - public const CAULDRON = 380; - public const ENDER_EYE = 381; - public const GLISTERING_MELON = 382, SPECKLED_MELON = 382; - public const SPAWN_EGG = 383; - public const BOTTLE_O_ENCHANTING = 384, EXPERIENCE_BOTTLE = 384; - public const FIREBALL = 385, FIRE_CHARGE = 385; - public const WRITABLE_BOOK = 386; - public const WRITTEN_BOOK = 387; - public const EMERALD = 388; - public const FRAME = 389, ITEM_FRAME = 389; - public const FLOWER_POT = 390; - public const CARROT = 391; - public const POTATO = 392; - public const BAKED_POTATO = 393; - public const POISONOUS_POTATO = 394; - public const EMPTYMAP = 395, EMPTY_MAP = 395, MAP = 395; - public const GOLDEN_CARROT = 396; - public const MOB_HEAD = 397, SKULL = 397; - public const CARROTONASTICK = 398, CARROT_ON_A_STICK = 398; - public const NETHERSTAR = 399, NETHER_STAR = 399; - public const PUMPKIN_PIE = 400; - public const FIREWORKS = 401; - public const FIREWORKSCHARGE = 402, FIREWORKS_CHARGE = 402; - public const ENCHANTED_BOOK = 403; - public const COMPARATOR = 404; - public const NETHERBRICK = 405, NETHER_BRICK = 405; - public const NETHER_QUARTZ = 406, QUARTZ = 406; - public const MINECART_WITH_TNT = 407, TNT_MINECART = 407; - public const HOPPER_MINECART = 408, MINECART_WITH_HOPPER = 408; - public const PRISMARINE_SHARD = 409; - public const HOPPER = 410; - public const RABBIT = 411, RAW_RABBIT = 411; - public const COOKED_RABBIT = 412; - public const RABBIT_STEW = 413; - public const RABBIT_FOOT = 414; - public const RABBIT_HIDE = 415; - public const HORSEARMORLEATHER = 416, HORSE_ARMOR_LEATHER = 416, LEATHER_HORSE_ARMOR = 416; - public const HORSEARMORIRON = 417, HORSE_ARMOR_IRON = 417, IRON_HORSE_ARMOR = 417; - public const GOLD_HORSE_ARMOR = 418, GOLDEN_HORSE_ARMOR = 418, HORSEARMORGOLD = 418, HORSE_ARMOR_GOLD = 418; - public const DIAMOND_HORSE_ARMOR = 419, HORSEARMORDIAMOND = 419, HORSE_ARMOR_DIAMOND = 419; - public const LEAD = 420; - public const NAMETAG = 421, NAME_TAG = 421; - public const PRISMARINE_CRYSTALS = 422; - public const MUTTON = 423, MUTTONRAW = 423, MUTTON_RAW = 423, RAW_MUTTON = 423; - public const COOKED_MUTTON = 424, MUTTONCOOKED = 424, MUTTON_COOKED = 424; - public const ARMOR_STAND = 425; - public const END_CRYSTAL = 426; - public const SPRUCE_DOOR = 427; - public const BIRCH_DOOR = 428; - public const JUNGLE_DOOR = 429; - public const ACACIA_DOOR = 430; - public const DARK_OAK_DOOR = 431; - public const CHORUS_FRUIT = 432; - public const CHORUS_FRUIT_POPPED = 433; - public const BANNER_PATTERN = 434; + public const EGG = 344; + public const COMPASS = 345; + public const FISHING_ROD = 346; + public const CLOCK = 347; + public const GLOWSTONE_DUST = 348; + public const FISH = 349, RAW_FISH = 349; + public const COOKED_FISH = 350; + public const DYE = 351; + public const BONE = 352; + public const SUGAR = 353; + public const CAKE = 354; + public const BED = 355; + public const REPEATER = 356; + public const COOKIE = 357; + public const FILLED_MAP = 358; + public const SHEARS = 359; + public const MELON = 360, MELON_SLICE = 360; + public const PUMPKIN_SEEDS = 361; + public const MELON_SEEDS = 362; + public const BEEF = 363, RAW_BEEF = 363; + public const COOKED_BEEF = 364, STEAK = 364; + public const CHICKEN = 365, RAW_CHICKEN = 365; + public const COOKED_CHICKEN = 366; + public const ROTTEN_FLESH = 367; + public const ENDER_PEARL = 368; + public const BLAZE_ROD = 369; + public const GHAST_TEAR = 370; + public const GOLDEN_NUGGET = 371, GOLD_NUGGET = 371; + public const NETHER_WART = 372; + public const POTION = 373; + public const GLASS_BOTTLE = 374; + public const SPIDER_EYE = 375; + public const FERMENTED_SPIDER_EYE = 376; + public const BLAZE_POWDER = 377; + public const MAGMA_CREAM = 378; + public const BREWING_STAND = 379; + public const CAULDRON = 380; + public const ENDER_EYE = 381; + public const GLISTERING_MELON = 382, SPECKLED_MELON = 382; + public const SPAWN_EGG = 383; + public const BOTTLE_O_ENCHANTING = 384, EXPERIENCE_BOTTLE = 384; + public const FIREBALL = 385, FIRE_CHARGE = 385; + public const WRITABLE_BOOK = 386; + public const WRITTEN_BOOK = 387; + public const EMERALD = 388; + public const FRAME = 389, ITEM_FRAME = 389; + public const FLOWER_POT = 390; + public const CARROT = 391; + public const POTATO = 392; + public const BAKED_POTATO = 393; + public const POISONOUS_POTATO = 394; + public const EMPTYMAP = 395, EMPTY_MAP = 395, MAP = 395; + public const GOLDEN_CARROT = 396; + public const MOB_HEAD = 397, SKULL = 397; + public const CARROTONASTICK = 398, CARROT_ON_A_STICK = 398; + public const NETHERSTAR = 399, NETHER_STAR = 399; + public const PUMPKIN_PIE = 400; + public const FIREWORKS = 401; + public const FIREWORKSCHARGE = 402, FIREWORKS_CHARGE = 402; + public const ENCHANTED_BOOK = 403; + public const COMPARATOR = 404; + public const NETHERBRICK = 405, NETHER_BRICK = 405; + public const NETHER_QUARTZ = 406, QUARTZ = 406; + public const MINECART_WITH_TNT = 407, TNT_MINECART = 407; + public const HOPPER_MINECART = 408, MINECART_WITH_HOPPER = 408; + public const PRISMARINE_SHARD = 409; + public const HOPPER = 410; + public const RABBIT = 411, RAW_RABBIT = 411; + public const COOKED_RABBIT = 412; + public const RABBIT_STEW = 413; + public const RABBIT_FOOT = 414; + public const RABBIT_HIDE = 415; + public const HORSEARMORLEATHER = 416, HORSE_ARMOR_LEATHER = 416, LEATHER_HORSE_ARMOR = 416; + public const HORSEARMORIRON = 417, HORSE_ARMOR_IRON = 417, IRON_HORSE_ARMOR = 417; + public const GOLD_HORSE_ARMOR = 418, GOLDEN_HORSE_ARMOR = 418, HORSEARMORGOLD = 418, HORSE_ARMOR_GOLD = 418; + public const DIAMOND_HORSE_ARMOR = 419, HORSEARMORDIAMOND = 419, HORSE_ARMOR_DIAMOND = 419; + public const LEAD = 420; + public const NAMETAG = 421, NAME_TAG = 421; + public const PRISMARINE_CRYSTALS = 422; + public const MUTTON = 423, MUTTONRAW = 423, MUTTON_RAW = 423, RAW_MUTTON = 423; + public const COOKED_MUTTON = 424, MUTTONCOOKED = 424, MUTTON_COOKED = 424; + public const ARMOR_STAND = 425; + public const END_CRYSTAL = 426; + public const SPRUCE_DOOR = 427; + public const BIRCH_DOOR = 428; + public const JUNGLE_DOOR = 429; + public const ACACIA_DOOR = 430; + public const DARK_OAK_DOOR = 431; + public const CHORUS_FRUIT = 432; + public const CHORUS_FRUIT_POPPED = 433; + public const BANNER_PATTERN = 434; - public const DRAGON_BREATH = 437; - public const SPLASH_POTION = 438; + public const DRAGON_BREATH = 437; + public const SPLASH_POTION = 438; - public const LINGERING_POTION = 441; - public const SPARKLER = 442; - public const COMMAND_BLOCK_MINECART = 443, MINECART_WITH_COMMAND_BLOCK = 443; - public const ELYTRA = 444; - public const SHULKER_SHELL = 445; - public const BANNER = 446; - public const MEDICINE = 447; - public const BALLOON = 448; - public const RAPID_FERTILIZER = 449; - public const TOTEM = 450; - public const BLEACH = 451; - public const IRON_NUGGET = 452; - public const ICE_BOMB = 453; + public const LINGERING_POTION = 441; + public const SPARKLER = 442; + public const COMMAND_BLOCK_MINECART = 443, MINECART_WITH_COMMAND_BLOCK = 443; + public const ELYTRA = 444; + public const SHULKER_SHELL = 445; + public const BANNER = 446; + public const MEDICINE = 447; + public const BALLOON = 448; + public const RAPID_FERTILIZER = 449; + public const TOTEM = 450; + public const BLEACH = 451; + public const IRON_NUGGET = 452; + public const ICE_BOMB = 453; - public const TRIDENT = 455; + public const TRIDENT = 455; - public const BEETROOT = 457; - public const BEETROOT_SEEDS = 458; - public const BEETROOT_SOUP = 459; - public const RAW_SALMON = 460, SALMON = 460; - public const CLOWNFISH = 461; - public const PUFFERFISH = 462; - public const COOKED_SALMON = 463; - public const DRIED_KELP = 464; - public const NAUTILUS_SHELL = 465; - public const APPLEENCHANTED = 466, APPLE_ENCHANTED = 466, ENCHANTED_GOLDEN_APPLE = 466; - public const HEART_OF_THE_SEA = 467; - public const TURTLE_SHELL_PIECE = 468; - public const TURTLE_HELMET = 469; - public const PHANTOM_MEMBRANE = 470; - public const CROSSBOW = 471; - public const SPRUCE_SIGN = 472; - public const BIRCH_SIGN = 473; - public const JUNGLE_SIGN = 474; - public const ACACIA_SIGN = 475; - public const DARKOAK_SIGN = 476; - public const SWEET_BERRIES = 477; + public const BEETROOT = 457; + public const BEETROOT_SEEDS = 458; + public const BEETROOT_SOUP = 459; + public const RAW_SALMON = 460, SALMON = 460; + public const CLOWNFISH = 461; + public const PUFFERFISH = 462; + public const COOKED_SALMON = 463; + public const DRIED_KELP = 464; + public const NAUTILUS_SHELL = 465; + public const APPLEENCHANTED = 466, APPLE_ENCHANTED = 466, ENCHANTED_GOLDEN_APPLE = 466; + public const HEART_OF_THE_SEA = 467; + public const TURTLE_SHELL_PIECE = 468; + public const TURTLE_HELMET = 469; + public const PHANTOM_MEMBRANE = 470; + public const CROSSBOW = 471; + public const SPRUCE_SIGN = 472; + public const BIRCH_SIGN = 473; + public const JUNGLE_SIGN = 474; + public const ACACIA_SIGN = 475; + public const DARKOAK_SIGN = 476; + public const SWEET_BERRIES = 477; - public const COMPOUND = 499; - public const RECORD_13 = 500; - public const RECORD_CAT = 501; - public const RECORD_BLOCKS = 502; - public const RECORD_CHIRP = 503; - public const RECORD_FAR = 504; - public const RECORD_MALL = 505; - public const RECORD_MELLOHI = 506; - public const RECORD_STAL = 507; - public const RECORD_STRAD = 508; - public const RECORD_WARD = 509; - public const RECORD_11 = 510; - public const RECORD_WAIT = 511; + public const COMPOUND = 499; + public const RECORD_13 = 500; + public const RECORD_CAT = 501; + public const RECORD_BLOCKS = 502; + public const RECORD_CHIRP = 503; + public const RECORD_FAR = 504; + public const RECORD_MALL = 505; + public const RECORD_MELLOHI = 506; + public const RECORD_STAL = 507; + public const RECORD_STRAD = 508; + public const RECORD_WARD = 509; + public const RECORD_11 = 510; + public const RECORD_WAIT = 511; - public const SHIELD = 513; + public const SHIELD = 513; - public const SPYGLASS = 772; + public const SPYGLASS = 772; - public const HONEYCOMB = 736; - public const HONEY_BOTTLE = 737; + public const HONEYCOMB = 736; + public const HONEY_BOTTLE = 737; - public const NETHERITE_INGOT = 742; - public const NETHERITE_SWORD = 743; - public const NETHERITE_SHOVEL = 744; - public const NETHERITE_PICKAXE = 745; - public const NETHERITE_AXE = 746; - public const NETHERITE_HOE = 747; - public const NETHERITE_HELMET = 748; - public const NETHERITE_CHESTPLATE = 749; - public const NETHERITE_LEGGINGS = 750; - public const NETHERITE_BOOTS = 751; - public const NETHERITE_SCRAP = 752; + public const NETHERITE_INGOT = 742; + public const NETHERITE_SWORD = 743; + public const NETHERITE_SHOVEL = 744; + public const NETHERITE_PICKAXE = 745; + public const NETHERITE_AXE = 746; + public const NETHERITE_HOE = 747; + public const NETHERITE_HELMET = 748; + public const NETHERITE_CHESTPLATE = 749; + public const NETHERITE_LEGGINGS = 750; + public const NETHERITE_BOOTS = 751; + public const NETHERITE_SCRAP = 752; - - // Dan's Implementations! - public const ECHO_SHARD = 900; - public const AMETHYST_SHARD = 901; - public const RAW_GOLD = 902; - public const RAW_IRON = 903; - public const RAW_COPPER = 904; - public const COPPER_INGOT = 905; - public const TRIAL_KEY = 906; - public const OMINOUS_TRIAL_KEY = 907; - public const WIND_CHARGE = 908; - public const BREEZE_ROD = 909; - public const DISC_FRAGMENT_5 = 910; - public const BRUSH = 911; - public const RECOVERY_COMPASS = 912; - public const MACE = 913; - public const HEAVY_CORE = 914; - public const NETHERITE_UPGRADE_SMITHING_TEMPLATE = 915; - public const BOLT_ARMOR_TRIM_SMITHING_TEMPLATE = 916; - public const HOST_ARMOR_TRIM_SMITHING_TEMPLATE = 917; - public const WAYFINDER_ARMOR_TRIM_SMITHING_TEMPLATE = 918; - public const SHAPER_ARMOR_TRIM_SMITHING_TEMPLATE = 919; - public const RAISER_ARMOR_TRIM_SMITHING_TEMPLATE = 920; - public const SENTRY_ARMOR_TRIM_SMITHING_TEMPLATE = 921; - public const VEX_ARMOR_TRIM_SMITHING_TEMPLATE = 922; - public const WILD_ARMOR_TRIM_SMITHING_TEMPLATE = 923; - public const COAST_ARMOR_TRIM_SMITHING_TEMPLATE = 924; - public const DUNE_ARMOR_TRIM_SMITHING_TEMPLATE = 925; - public const WARD_ARMOR_TRIM_SMITHING_TEMPLATE = 926; - public const TIDE_ARMOR_TRIM_SMITHING_TEMPLATE = 927; - public const SNOUT_ARMOR_TRIM_SMITHING_TEMPLATE = 928; - public const RIB_ARMOR_TRIM_SMITHING_TEMPLATE = 929; - public const EYE_ARMOR_TRIM_SMITHING_TEMPLATE = 930; - public const SPIRE_ARMOR_TRIM_SMITHING_TEMPLATE = 931; - public const FLOW_ARMOR_TRIM_SMITHING_TEMPLATE = 932; - public const SILENCE_ARMOR_TRIM_SMITHING_TEMPLATE = 933; - public const SNIFFER_EGG = 934; - public const ARMADILLO_SCUTE = 935; + // Dan's Implementations! + public const ECHO_SHARD = 900; + public const AMETHYST_SHARD = 901; + public const RAW_GOLD = 902; + public const RAW_IRON = 903; + public const RAW_COPPER = 904; + public const COPPER_INGOT = 905; + public const TRIAL_KEY = 906; + public const OMINOUS_TRIAL_KEY = 907; + public const WIND_CHARGE = 908; + public const BREEZE_ROD = 909; + public const DISC_FRAGMENT_5 = 910; + public const BRUSH = 911; + public const RECOVERY_COMPASS = 912; + public const MACE = 913; + public const HEAVY_CORE = 914; + public const NETHERITE_UPGRADE_SMITHING_TEMPLATE = 915; + public const BOLT_ARMOR_TRIM_SMITHING_TEMPLATE = 916; + public const HOST_ARMOR_TRIM_SMITHING_TEMPLATE = 917; + public const WAYFINDER_ARMOR_TRIM_SMITHING_TEMPLATE = 918; + public const SHAPER_ARMOR_TRIM_SMITHING_TEMPLATE = 919; + public const RAISER_ARMOR_TRIM_SMITHING_TEMPLATE = 920; + public const SENTRY_ARMOR_TRIM_SMITHING_TEMPLATE = 921; + public const VEX_ARMOR_TRIM_SMITHING_TEMPLATE = 922; + public const WILD_ARMOR_TRIM_SMITHING_TEMPLATE = 923; + public const COAST_ARMOR_TRIM_SMITHING_TEMPLATE = 924; + public const DUNE_ARMOR_TRIM_SMITHING_TEMPLATE = 925; + public const WARD_ARMOR_TRIM_SMITHING_TEMPLATE = 926; + public const TIDE_ARMOR_TRIM_SMITHING_TEMPLATE = 927; + public const SNOUT_ARMOR_TRIM_SMITHING_TEMPLATE = 928; + public const RIB_ARMOR_TRIM_SMITHING_TEMPLATE = 929; + public const EYE_ARMOR_TRIM_SMITHING_TEMPLATE = 930; + public const SPIRE_ARMOR_TRIM_SMITHING_TEMPLATE = 931; + public const FLOW_ARMOR_TRIM_SMITHING_TEMPLATE = 932; + public const SILENCE_ARMOR_TRIM_SMITHING_TEMPLATE = 933; + public const SNIFFER_EGG = 934; + public const ARMADILLO_SCUTE = 935; + public const RESIN_CLUMP = 936; + + // New item constants + public const RESIN_BRICK = 937; + public const BUNDLE = 938; + public const BLACK_BUNDLE = 939; + public const BLUE_BUNDLE = 940; + public const BROWN_BUNDLE = 941; + public const CYAN_BUNDLE = 942; + public const GRAY_BUNDLE = 943; + public const GREEN_BUNDLE = 944; + public const LIGHT_BLUE_BUNDLE = 945; + public const LIGHT_GRAY_BUNDLE = 946; + public const LIME_BUNDLE = 947; + public const MAGENTA_BUNDLE = 948; + public const ORANGE_BUNDLE = 949; + public const PINK_BUNDLE = 950; + public const PURPLE_BUNDLE = 951; + public const RED_BUNDLE = 952; + public const WHITE_BUNDLE = 953; + public const YELLOW_BUNDLE = 954; } From 99b02d7bfc4ea7f0672c2f6c2982add52b9f4cc1 Mon Sep 17 00:00:00 2001 From: DANRULEZ123 <40849132+DANRULEZ123@users.noreply.github.com> Date: Sat, 18 Jan 2025 10:02:10 -0500 Subject: [PATCH 67/79] Update ItemIds.php Remove unnecessary comment --- src/pocketmine/item/ItemIds.php | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/pocketmine/item/ItemIds.php b/src/pocketmine/item/ItemIds.php index 7582bf55..dcf55693 100644 --- a/src/pocketmine/item/ItemIds.php +++ b/src/pocketmine/item/ItemIds.php @@ -318,8 +318,6 @@ interface ItemIds extends BlockIds{ public const SNIFFER_EGG = 934; public const ARMADILLO_SCUTE = 935; public const RESIN_CLUMP = 936; - - // New item constants public const RESIN_BRICK = 937; public const BUNDLE = 938; public const BLACK_BUNDLE = 939; From a430dabbc645889f9fc48187271c017632ae33a0 Mon Sep 17 00:00:00 2001 From: DANRULEZ123 <40849132+DANRULEZ123@users.noreply.github.com> Date: Sat, 18 Jan 2025 10:10:41 -0500 Subject: [PATCH 68/79] Update ItemFactory.php Registered previously added items. (936-954) --- src/pocketmine/item/ItemFactory.php | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/src/pocketmine/item/ItemFactory.php b/src/pocketmine/item/ItemFactory.php index c6d0a346..da98b58d 100644 --- a/src/pocketmine/item/ItemFactory.php +++ b/src/pocketmine/item/ItemFactory.php @@ -340,6 +340,25 @@ public static function init(){ self::registerItem(new Item(Item::SILENCE_ARMOR_TRIM_SMITHING_TEMPLATE, 0, "Silence")); self::registerItem(new Item(Item::SNIFFER_EGG, 0, "Sniffer Egg")); self::registerItem(new Item(Item::ARMADILLO_SCUTE, 0, "Armadillo Scute")); + self::registerItem(new Item(Item::RESIN_BRICK, 0, "Resin Brick")); + self::registerItem(new Item(Item::BUNDLE, 0, "Bundle")); + self::registerItem(new Item(Item::BLACK_BUNDLE, 0, "Black Bundle")); + self::registerItem(new Item(Item::BLUE_BUNDLE, 0, "Blue Bundle")); + self::registerItem(new Item(Item::BROWN_BUNDLE, 0, "Brown Bundle")); + self::registerItem(new Item(Item::CYAN_BUNDLE, 0, "Cyan Bundle")); + self::registerItem(new Item(Item::GRAY_BUNDLE, 0, "Gray Bundle")); + self::registerItem(new Item(Item::GREEN_BUNDLE, 0, "Green Bundle")); + self::registerItem(new Item(Item::LIGHT_BLUE_BUNDLE, 0, "Light Blue Bundle")); + self::registerItem(new Item(Item::LIGHT_GRAY_BUNDLE, 0, "Light Gray Bundle")); + self::registerItem(new Item(Item::LIME_BUNDLE, 0, "Lime Bundle")); + self::registerItem(new Item(Item::MAGENTA_BUNDLE, 0, "Magenta Bundle")); + self::registerItem(new Item(Item::ORANGE_BUNDLE, 0, "Orange Bundle")); + self::registerItem(new Item(Item::PINK_BUNDLE, 0, "Pink Bundle")); + self::registerItem(new Item(Item::PURPLE_BUNDLE, 0, "Purple Bundle")); + self::registerItem(new Item(Item::RED_BUNDLE, 0, "Red Bundle")); + self::registerItem(new Item(Item::WHITE_BUNDLE, 0, "White Bundle")); + self::registerItem(new Item(Item::YELLOW_BUNDLE, 0, "Yellow Bundle")); + } /** From 16f359aded1fd74753859a8d5d694b4ac2dd6976 Mon Sep 17 00:00:00 2001 From: Benedikt05 <60869945+Benedikt05@users.noreply.github.com> Date: Sat, 18 Jan 2025 16:53:53 +0100 Subject: [PATCH 69/79] fix: addressed multiple syntax errors --- src/pocketmine/block/GoldOre.php | 2 +- src/pocketmine/block/IronOre.php | 2 +- src/pocketmine/item/ItemFactory.php | 100 +++++++++--------- .../resources/vanilla/item_id_map.json | 2 +- 4 files changed, 53 insertions(+), 53 deletions(-) diff --git a/src/pocketmine/block/GoldOre.php b/src/pocketmine/block/GoldOre.php index 7467deae..abea140d 100644 --- a/src/pocketmine/block/GoldOre.php +++ b/src/pocketmine/block/GoldOre.php @@ -51,7 +51,7 @@ public function getToolHarvestLevel() : int{ public function getDropsForCompatibleTool(Item $item) : array{ return [ - ItemFactory::get(Item::RAW_GOLD); + ItemFactory::get(Item::RAW_GOLD) ]; } } diff --git a/src/pocketmine/block/IronOre.php b/src/pocketmine/block/IronOre.php index 83ca8969..a3cb20a4 100644 --- a/src/pocketmine/block/IronOre.php +++ b/src/pocketmine/block/IronOre.php @@ -51,7 +51,7 @@ public function getHardness() : float{ public function getDropsForCompatibleTool(Item $item) : array{ return [ - ItemFactory::get(Item::RAW_IRON); + ItemFactory::get(Item::RAW_IRON) ]; } } diff --git a/src/pocketmine/item/ItemFactory.php b/src/pocketmine/item/ItemFactory.php index da98b58d..da9e1064 100644 --- a/src/pocketmine/item/ItemFactory.php +++ b/src/pocketmine/item/ItemFactory.php @@ -305,59 +305,59 @@ public static function init(){ // Register newer items. self::registerItem(new Item(Item::ECHO_SHARD, 0, "Echo Shard")); - self::registerItem(new Item(Item::AMETHYST_CRYSTAL, 0, "Amethyst Crystal")); + //self::registerItem(new Item(Item::AMETHYST_CRYSTAL, 0, "Amethyst Crystal")); self::registerItem(new Item(Item::RAW_GOLD, 0, "Raw Gold")); - self::registerItem(new Item(Item::RAW_IRON, 0, "Raw Iron")); - self::registerItem(new Item(Item::RAW_COPPER, 0, "Raw Copper")); - self::registerItem(new Item(Item::COPPER_INGOT, 0, "Copper Ingot")); - self::registerItem(new Item(Item::TRIAL_KEY, 0, "Trial Key")); - self::registerItem(new Item(Item::OMINOUS_TRIAL_KEY, 0, "Ominous Trial Key")); + self::registerItem(new Item(Item::RAW_IRON, 0, "Raw Iron")); + self::registerItem(new Item(Item::RAW_COPPER, 0, "Raw Copper")); + self::registerItem(new Item(Item::COPPER_INGOT, 0, "Copper Ingot")); + self::registerItem(new Item(Item::TRIAL_KEY, 0, "Trial Key")); + self::registerItem(new Item(Item::OMINOUS_TRIAL_KEY, 0, "Ominous Trial Key")); self::registerItem(new WindCharge()); // Class reverted due to missing functionality. - self::registerItem(new Item(Item::BREEZE_ROD, 0, "Breeze Rod")); - self::registerItem(new Item(Item::DISC_FRAGMENT_5, 0, "Disc Fragment")); - self::registerItem(new Item(Item::BRUSH, 0, "Brush")); - self::registerItem(new Item(Item::RECOVERY_COMPASS, 0, "Recovery Compass")); - self::registerItem(new Mace()); // Class reverted due to missing functionality. - self::registerItem(new Item(Item::HEAVY_CORE, 0, "Heavy Core")); - self::registerItem(new Item(Item::NETHERITE_UPGRADE_SMITHING_TEMPLATE, 0, "Smithing Template")); - self::registerItem(new Item(Item::BOLT_ARMOR_TRIM_SMITHING_TEMPLATE, 0, "Bolt")); - self::registerItem(new Item(Item::HOST_ARMOR_TRIM_SMITHING_TEMPLATE, 0, "Host")); - self::registerItem(new Item(Item::WAYFINDER_ARMOR_TRIM_SMITHING_TEMPLATE, 0, "Wayfinder")); - self::registerItem(new Item(Item::SHAPER_ARMOR_TRIM_SMITHING_TEMPLATE, 0, "Shaper")); - self::registerItem(new Item(Item::RAISER_ARMOR_TRIM_SMITHING_TEMPLATE, 0, "Raiser")); - self::registerItem(new Item(Item::SENTRY_ARMOR_TRIM_SMITHING_TEMPLATE, 0, "Sentry")); - self::registerItem(new Item(Item::VEX_ARMOR_TRIM_SMITHING_TEMPLATE, 0, "Vex")); - self::registerItem(new Item(Item::WILD_ARMOR_TRIM_SMITHING_TEMPLATE, 0, "Wild")); - self::registerItem(new Item(Item::COAST_ARMOR_TRIM_SMITHING_TEMPLATE, 0, "Coast")); - self::registerItem(new Item(Item::DUNE_ARMOR_TRIM_SMITHING_TEMPLATE, 0, "Dune")); - self::registerItem(new Item(Item::WARD_ARMOR_TRIM_SMITHING_TEMPLATE, 0, "Ward")); - self::registerItem(new Item(Item::TIDE_ARMOR_TRIM_SMITHING_TEMPLATE, 0, "Tide")); - self::registerItem(new Item(Item::SNOUT_ARMOR_TRIM_SMITHING_TEMPLATE, 0, "Snout")); - self::registerItem(new Item(Item::RIB_ARMOR_TRIM_SMITHING_TEMPLATE, 0, "Rib")); - self::registerItem(new Item(Item::EYE_ARMOR_TRIM_SMITHING_TEMPLATE, 0, "Eye")); - self::registerItem(new Item(Item::SPIRE_ARMOR_TRIM_SMITHING_TEMPLATE, 0, "Spire")); - self::registerItem(new Item(Item::FLOW_ARMOR_TRIM_SMITHING_TEMPLATE, 0, "Flow")); - self::registerItem(new Item(Item::SILENCE_ARMOR_TRIM_SMITHING_TEMPLATE, 0, "Silence")); - self::registerItem(new Item(Item::SNIFFER_EGG, 0, "Sniffer Egg")); - self::registerItem(new Item(Item::ARMADILLO_SCUTE, 0, "Armadillo Scute")); + self::registerItem(new Item(Item::BREEZE_ROD, 0, "Breeze Rod")); + self::registerItem(new Item(Item::DISC_FRAGMENT_5, 0, "Disc Fragment")); + self::registerItem(new Item(Item::BRUSH, 0, "Brush")); + self::registerItem(new Item(Item::RECOVERY_COMPASS, 0, "Recovery Compass")); + self::registerItem(new Mace()); // Class reverted due to missing functionality. + self::registerItem(new Item(Item::HEAVY_CORE, 0, "Heavy Core")); + self::registerItem(new Item(Item::NETHERITE_UPGRADE_SMITHING_TEMPLATE, 0, "Smithing Template")); + self::registerItem(new Item(Item::BOLT_ARMOR_TRIM_SMITHING_TEMPLATE, 0, "Bolt")); + self::registerItem(new Item(Item::HOST_ARMOR_TRIM_SMITHING_TEMPLATE, 0, "Host")); + self::registerItem(new Item(Item::WAYFINDER_ARMOR_TRIM_SMITHING_TEMPLATE, 0, "Wayfinder")); + self::registerItem(new Item(Item::SHAPER_ARMOR_TRIM_SMITHING_TEMPLATE, 0, "Shaper")); + self::registerItem(new Item(Item::RAISER_ARMOR_TRIM_SMITHING_TEMPLATE, 0, "Raiser")); + self::registerItem(new Item(Item::SENTRY_ARMOR_TRIM_SMITHING_TEMPLATE, 0, "Sentry")); + self::registerItem(new Item(Item::VEX_ARMOR_TRIM_SMITHING_TEMPLATE, 0, "Vex")); + self::registerItem(new Item(Item::WILD_ARMOR_TRIM_SMITHING_TEMPLATE, 0, "Wild")); + self::registerItem(new Item(Item::COAST_ARMOR_TRIM_SMITHING_TEMPLATE, 0, "Coast")); + self::registerItem(new Item(Item::DUNE_ARMOR_TRIM_SMITHING_TEMPLATE, 0, "Dune")); + self::registerItem(new Item(Item::WARD_ARMOR_TRIM_SMITHING_TEMPLATE, 0, "Ward")); + self::registerItem(new Item(Item::TIDE_ARMOR_TRIM_SMITHING_TEMPLATE, 0, "Tide")); + self::registerItem(new Item(Item::SNOUT_ARMOR_TRIM_SMITHING_TEMPLATE, 0, "Snout")); + self::registerItem(new Item(Item::RIB_ARMOR_TRIM_SMITHING_TEMPLATE, 0, "Rib")); + self::registerItem(new Item(Item::EYE_ARMOR_TRIM_SMITHING_TEMPLATE, 0, "Eye")); + self::registerItem(new Item(Item::SPIRE_ARMOR_TRIM_SMITHING_TEMPLATE, 0, "Spire")); + self::registerItem(new Item(Item::FLOW_ARMOR_TRIM_SMITHING_TEMPLATE, 0, "Flow")); + self::registerItem(new Item(Item::SILENCE_ARMOR_TRIM_SMITHING_TEMPLATE, 0, "Silence")); + self::registerItem(new Item(Item::SNIFFER_EGG, 0, "Sniffer Egg")); + self::registerItem(new Item(Item::ARMADILLO_SCUTE, 0, "Armadillo Scute")); self::registerItem(new Item(Item::RESIN_BRICK, 0, "Resin Brick")); - self::registerItem(new Item(Item::BUNDLE, 0, "Bundle")); - self::registerItem(new Item(Item::BLACK_BUNDLE, 0, "Black Bundle")); - self::registerItem(new Item(Item::BLUE_BUNDLE, 0, "Blue Bundle")); - self::registerItem(new Item(Item::BROWN_BUNDLE, 0, "Brown Bundle")); - self::registerItem(new Item(Item::CYAN_BUNDLE, 0, "Cyan Bundle")); - self::registerItem(new Item(Item::GRAY_BUNDLE, 0, "Gray Bundle")); - self::registerItem(new Item(Item::GREEN_BUNDLE, 0, "Green Bundle")); - self::registerItem(new Item(Item::LIGHT_BLUE_BUNDLE, 0, "Light Blue Bundle")); - self::registerItem(new Item(Item::LIGHT_GRAY_BUNDLE, 0, "Light Gray Bundle")); - self::registerItem(new Item(Item::LIME_BUNDLE, 0, "Lime Bundle")); - self::registerItem(new Item(Item::MAGENTA_BUNDLE, 0, "Magenta Bundle")); - self::registerItem(new Item(Item::ORANGE_BUNDLE, 0, "Orange Bundle")); - self::registerItem(new Item(Item::PINK_BUNDLE, 0, "Pink Bundle")); - self::registerItem(new Item(Item::PURPLE_BUNDLE, 0, "Purple Bundle")); - self::registerItem(new Item(Item::RED_BUNDLE, 0, "Red Bundle")); - self::registerItem(new Item(Item::WHITE_BUNDLE, 0, "White Bundle")); - self::registerItem(new Item(Item::YELLOW_BUNDLE, 0, "Yellow Bundle")); + self::registerItem(new Item(Item::BUNDLE, 0, "Bundle")); + self::registerItem(new Item(Item::BLACK_BUNDLE, 0, "Black Bundle")); + self::registerItem(new Item(Item::BLUE_BUNDLE, 0, "Blue Bundle")); + self::registerItem(new Item(Item::BROWN_BUNDLE, 0, "Brown Bundle")); + self::registerItem(new Item(Item::CYAN_BUNDLE, 0, "Cyan Bundle")); + self::registerItem(new Item(Item::GRAY_BUNDLE, 0, "Gray Bundle")); + self::registerItem(new Item(Item::GREEN_BUNDLE, 0, "Green Bundle")); + self::registerItem(new Item(Item::LIGHT_BLUE_BUNDLE, 0, "Light Blue Bundle")); + self::registerItem(new Item(Item::LIGHT_GRAY_BUNDLE, 0, "Light Gray Bundle")); + self::registerItem(new Item(Item::LIME_BUNDLE, 0, "Lime Bundle")); + self::registerItem(new Item(Item::MAGENTA_BUNDLE, 0, "Magenta Bundle")); + self::registerItem(new Item(Item::ORANGE_BUNDLE, 0, "Orange Bundle")); + self::registerItem(new Item(Item::PINK_BUNDLE, 0, "Pink Bundle")); + self::registerItem(new Item(Item::PURPLE_BUNDLE, 0, "Purple Bundle")); + self::registerItem(new Item(Item::RED_BUNDLE, 0, "Red Bundle")); + self::registerItem(new Item(Item::WHITE_BUNDLE, 0, "White Bundle")); + self::registerItem(new Item(Item::YELLOW_BUNDLE, 0, "Yellow Bundle")); } diff --git a/src/pocketmine/resources/vanilla/item_id_map.json b/src/pocketmine/resources/vanilla/item_id_map.json index 7e6f10e2..5d1270ba 100644 --- a/src/pocketmine/resources/vanilla/item_id_map.json +++ b/src/pocketmine/resources/vanilla/item_id_map.json @@ -864,7 +864,7 @@ "minecraft:purple_bundle": 951, "minecraft:red_bundle": 952, "minecraft:white_bundle": 953, - "minecraft:yellow_bundle": 954 + "minecraft:yellow_bundle": 954, "minecraft:raw_gold_block": -305, From 79ed84e21d1398cb2d1efd0cfc038036f397bbad Mon Sep 17 00:00:00 2001 From: DANRULEZ123 <40849132+DANRULEZ123@users.noreply.github.com> Date: Sat, 18 Jan 2025 11:36:45 -0500 Subject: [PATCH 70/79] Update ItemFactory.php Fixed typo for Amethyst Crystals/Shards. The wrong constant was used. (AMETHYST_CRYSTAL -> AMETHYST_SHARD) --- src/pocketmine/item/ItemFactory.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pocketmine/item/ItemFactory.php b/src/pocketmine/item/ItemFactory.php index da9e1064..09ac8bfc 100644 --- a/src/pocketmine/item/ItemFactory.php +++ b/src/pocketmine/item/ItemFactory.php @@ -305,7 +305,7 @@ public static function init(){ // Register newer items. self::registerItem(new Item(Item::ECHO_SHARD, 0, "Echo Shard")); - //self::registerItem(new Item(Item::AMETHYST_CRYSTAL, 0, "Amethyst Crystal")); + self::registerItem(new Item(Item::AMETHYST_SHARD, 0, "Amethyst Shard")); self::registerItem(new Item(Item::RAW_GOLD, 0, "Raw Gold")); self::registerItem(new Item(Item::RAW_IRON, 0, "Raw Iron")); self::registerItem(new Item(Item::RAW_COPPER, 0, "Raw Copper")); From aff617585e353d131c81f03f106669af4263313a Mon Sep 17 00:00:00 2001 From: DANRULEZ123 <40849132+DANRULEZ123@users.noreply.github.com> Date: Sat, 18 Jan 2025 11:41:00 -0500 Subject: [PATCH 71/79] Delete src/pocketmine/item/RawCopper.php --- src/pocketmine/item/RawCopper.php | 17 ----------------- 1 file changed, 17 deletions(-) delete mode 100644 src/pocketmine/item/RawCopper.php diff --git a/src/pocketmine/item/RawCopper.php b/src/pocketmine/item/RawCopper.php deleted file mode 100644 index a932744a..00000000 --- a/src/pocketmine/item/RawCopper.php +++ /dev/null @@ -1,17 +0,0 @@ - Date: Sat, 18 Jan 2025 11:41:41 -0500 Subject: [PATCH 72/79] Delete src/pocketmine/item/RawGold.php --- src/pocketmine/item/RawGold.php | 17 ----------------- 1 file changed, 17 deletions(-) delete mode 100644 src/pocketmine/item/RawGold.php diff --git a/src/pocketmine/item/RawGold.php b/src/pocketmine/item/RawGold.php deleted file mode 100644 index f3d0ff97..00000000 --- a/src/pocketmine/item/RawGold.php +++ /dev/null @@ -1,17 +0,0 @@ - Date: Sat, 18 Jan 2025 11:41:59 -0500 Subject: [PATCH 73/79] Delete src/pocketmine/item/RawIron.php --- src/pocketmine/item/RawIron.php | 17 ----------------- 1 file changed, 17 deletions(-) delete mode 100644 src/pocketmine/item/RawIron.php diff --git a/src/pocketmine/item/RawIron.php b/src/pocketmine/item/RawIron.php deleted file mode 100644 index 8a2f9d05..00000000 --- a/src/pocketmine/item/RawIron.php +++ /dev/null @@ -1,17 +0,0 @@ - Date: Mon, 27 Jan 2025 12:25:03 -0500 Subject: [PATCH 74/79] Implement modern items to creative inv --- .../resources/vanilla/creativeitems.json | 169 +++++++++++++++++- 1 file changed, 167 insertions(+), 2 deletions(-) diff --git a/src/pocketmine/resources/vanilla/creativeitems.json b/src/pocketmine/resources/vanilla/creativeitems.json index 948b4270..f122de07 100644 --- a/src/pocketmine/resources/vanilla/creativeitems.json +++ b/src/pocketmine/resources/vanilla/creativeitems.json @@ -4897,5 +4897,170 @@ }, { "id": 772 - } -] \ No newline at end of file + }, + { + "id": 900 +}, +{ + "id": 901 +}, +{ + "id": 902 +}, +{ + "id": 903 +}, +{ + "id": 904 +}, +{ + "id": 905 +}, +{ + "id": 906 +}, +{ + "id": 907 +}, +{ + "id": 908 +}, +{ + "id": 909 +}, +{ + "id": 910 +}, +{ + "id": 911 +}, +{ + "id": 912 +}, +{ + "id": 913 +}, +{ + "id": 914 +}, +{ + "id": 915 +}, +{ + "id": 916 +}, +{ + "id": 917 +}, +{ + "id": 918 +}, +{ + "id": 919 +}, +{ + "id": 920 +}, +{ + "id": 921 +}, +{ + "id": 922 +}, +{ + "id": 923 +}, +{ + "id": 924 +}, +{ + "id": 925 +}, +{ + "id": 926 +}, +{ + "id": 927 +}, +{ + "id": 928 +}, +{ + "id": 929 +}, +{ + "id": 930 +}, +{ + "id": 931 +}, +{ + "id": 932 +}, +{ + "id": 933 +}, +{ + "id": 934 +}, +{ + "id": 935 +}, +{ + "id": 936 +}, +{ + "id": 937 +}, +{ + "id": 938 +}, +{ + "id": 939 +}, +{ + "id": 940 +}, +{ + "id": 941 +}, +{ + "id": 942 +}, +{ + "id": 943 +}, +{ + "id": 944 +}, +{ + "id": 945 +}, +{ + "id": 946 +}, +{ + "id": 947 +}, +{ + "id": 948 +}, +{ + "id": 949 +}, +{ + "id": 950 +}, +{ + "id": 951 +}, +{ + "id": 952 +}, +{ + "id": 953 +}, +{ + "id": 954 +} +] From bde36657490fbe82d7de9783e0c81edb0a5e731d Mon Sep 17 00:00:00 2001 From: DANRULEZ123 <40849132+DANRULEZ123@users.noreply.github.com> Date: Mon, 27 Jan 2025 13:55:47 -0500 Subject: [PATCH 75/79] Update README.md --- README.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/README.md b/README.md index 266b1257..cfa09399 100644 --- a/README.md +++ b/README.md @@ -29,6 +29,10 @@ --- +## 🧰 BetterAltay Improved + +This is a fork of BetterAltay, used primarily for the addition of rich, vanilla additions. Blocks and Items have been added for more variety and diversity. Allowing for a more creative outline for your server! + ## 📖 About BetterAltay BetterAltay is a highly optimized and feature-rich server software designed for Minecraft: Bedrock Edition. It brings improvements and new functionalities to the original [Altay](https://github.com/unresolved3169/Altay) project, offering a better experience for server owners who want more features and stability. From 62e5cf944e2cb8d68b99babd4ac416d4a908f45d Mon Sep 17 00:00:00 2001 From: DANRULEZ123 <40849132+DANRULEZ123@users.noreply.github.com> Date: Mon, 27 Jan 2025 13:56:43 -0500 Subject: [PATCH 76/79] Update README.md --- README.md | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/README.md b/README.md index cfa09399..7105accf 100644 --- a/README.md +++ b/README.md @@ -33,6 +33,14 @@ This is a fork of BetterAltay, used primarily for the addition of rich, vanilla additions. Blocks and Items have been added for more variety and diversity. Allowing for a more creative outline for your server! + + +# 🧭 Original BetterAltay Contents: + + +--- + + ## 📖 About BetterAltay BetterAltay is a highly optimized and feature-rich server software designed for Minecraft: Bedrock Edition. It brings improvements and new functionalities to the original [Altay](https://github.com/unresolved3169/Altay) project, offering a better experience for server owners who want more features and stability. From ba5a19ad1ac505dda578778b4db5a85b4e5cd8c0 Mon Sep 17 00:00:00 2001 From: DANRULEZ123 <40849132+DANRULEZ123@users.noreply.github.com> Date: Mon, 27 Jan 2025 14:33:14 -0500 Subject: [PATCH 77/79] Attempt to correctly register education edition content. --- src/pocketmine/network/mcpe/protocol/StartGamePacket.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pocketmine/network/mcpe/protocol/StartGamePacket.php b/src/pocketmine/network/mcpe/protocol/StartGamePacket.php index 824520ab..821adec4 100644 --- a/src/pocketmine/network/mcpe/protocol/StartGamePacket.php +++ b/src/pocketmine/network/mcpe/protocol/StartGamePacket.php @@ -70,7 +70,7 @@ class StartGamePacket extends DataPacket{ public bool $exportedFromEditor = false; public int $time = -1; public int $eduEditionOffer = EducationEditionOffer::NONE; - public bool $hasEduFeaturesEnabled = false; + public bool $hasEduFeaturesEnabled = true; public string $eduProductUUID = ""; public float $rainLevel; public float $lightningLevel; From 6d3729ad64e014ae55071cd2de25f917cae55c04 Mon Sep 17 00:00:00 2001 From: DANRULEZ123 <40849132+DANRULEZ123@users.noreply.github.com> Date: Tue, 28 Jan 2025 07:07:21 -0500 Subject: [PATCH 78/79] Update README.md --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 7105accf..fd739a4e 100644 --- a/README.md +++ b/README.md @@ -19,10 +19,10 @@ Protocol - + Latest Release - + Issues

From 8360e7b871eda0e87d4f4695728104df4e27e904 Mon Sep 17 00:00:00 2001 From: DANRULEZ123 <40849132+DANRULEZ123@users.noreply.github.com> Date: Tue, 28 Jan 2025 07:08:17 -0500 Subject: [PATCH 79/79] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index fd739a4e..5b672aca 100644 --- a/README.md +++ b/README.md @@ -23,7 +23,7 @@ Latest Release - Issues + Issues