Implement Copper variant of existing blocks (#6839)

src/block/BlockTypeIds.php

@@ -822,8 +822,12 @@ final class BlockTypeIds{
 	public const WARPED_CEILING_CENTER_HANGING_SIGN = 10792;
 	public const WARPED_CEILING_EDGES_HANGING_SIGN = 10793;
 	public const WARPED_WALL_HANGING_SIGN = 10794;
+	public const COPPER_BARS = 10795;
+	public const COPPER_CHAIN = 10796;
+	public const COPPER_LANTERN = 10797;
+	public const COPPER_TORCH = 10798;
 
-	public const FIRST_UNUSED_BLOCK_ID = 10795;
+	public const FIRST_UNUSED_BLOCK_ID = 10799;
 
 	private static int $nextDynamicId = self::FIRST_UNUSED_BLOCK_ID;
 

src/block/Chain.php

@@ -30,7 +30,7 @@ use pocketmine\math\Axis;
 use pocketmine\math\AxisAlignedBB;
 use pocketmine\math\Facing;
 
-final class Chain extends Transparent implements PillarRotation{
+class Chain extends Transparent implements PillarRotation{
 	use PillarRotationTrait;
 
 	public function getSupportType(int $facing) : SupportType{

src/block/CopperBars.php

@@ -0,0 +1,31 @@
+<?php
+
+/*
+ *
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * @author PocketMine Team
+ * @link http://www.pocketmine.net/
+ *
+ *
+ */
+
+declare(strict_types=1);
+
+namespace pocketmine\block;
+
+use pocketmine\block\utils\CopperMaterial;
+use pocketmine\block\utils\CopperTrait;
+
+class CopperBars extends Thin implements CopperMaterial{
+	use CopperTrait;
+}

src/block/CopperChain.php

@@ -0,0 +1,31 @@
+<?php
+
+/*
+ *
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * @author PocketMine Team
+ * @link http://www.pocketmine.net/
+ *
+ *
+ */
+
+declare(strict_types=1);
+
+namespace pocketmine\block;
+
+use pocketmine\block\utils\CopperMaterial;
+use pocketmine\block\utils\CopperTrait;
+
+class CopperChain extends Chain implements CopperMaterial{
+	use CopperTrait;
+}

src/block/CopperLantern.php

@@ -0,0 +1,31 @@
+<?php
+
+/*
+ *
+ *  ____            _        _   __  __ _                  __  __ ____
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_|
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * @author PocketMine Team
+ * @link http://www.pocketmine.net/
+ *
+ *
+ */
+
+declare(strict_types=1);
+
+namespace pocketmine\block;
+
+use pocketmine\block\utils\CopperMaterial;
+use pocketmine\block\utils\CopperTrait;
+
+class CopperLantern extends Lantern implements CopperMaterial{
+	use CopperTrait;
+}

src/block/LightningRod.php

@@ -25,6 +25,8 @@ namespace pocketmine\block;
 
 use pocketmine\block\utils\AnyFacing;
 use pocketmine\block\utils\AnyFacingTrait;
+use pocketmine\block\utils\CopperMaterial;
+use pocketmine\block\utils\CopperTrait;
 use pocketmine\item\Item;
 use pocketmine\math\Axis;
 use pocketmine\math\AxisAlignedBB;
@@ -33,7 +35,8 @@ use pocketmine\math\Vector3;
 use pocketmine\player\Player;
 use pocketmine\world\BlockTransaction;
 
-final class LightningRod extends Transparent implements AnyFacing{
+final class LightningRod extends Transparent implements AnyFacing, CopperMaterial{
+	use CopperTrait;
 	use AnyFacingTrait;
 
 	protected function recalculateCollisionBoxes() : array{

src/block/VanillaBlocks.php

@@ -225,10 +225,14 @@ use function strtolower;
  * @method static Concrete CONCRETE()
  * @method static ConcretePowder CONCRETE_POWDER()
  * @method static Copper COPPER()
+ * @method static CopperBars COPPER_BARS()
  * @method static CopperBulb COPPER_BULB()
+ * @method static CopperChain COPPER_CHAIN()
  * @method static CopperDoor COPPER_DOOR()
  * @method static CopperGrate COPPER_GRATE()
+ * @method static CopperLantern COPPER_LANTERN()
  * @method static CopperOre COPPER_ORE()
+ * @method static Torch COPPER_TORCH()
  * @method static CopperTrapdoor COPPER_TRAPDOOR()
  * @method static Coral CORAL()
  * @method static CoralBlock CORAL_BLOCK()
@@ -1035,6 +1039,7 @@ final class VanillaBlocks{
 		$ironBreakInfo = new Info(BreakInfo::pickaxe(5.0, ToolTier::STONE, 30.0));
 		self::register("iron", fn(BID $id) => new Opaque($id, "Iron Block", $ironBreakInfo));
 		self::register("iron_bars", fn(BID $id) => new Thin($id, "Iron Bars", $ironBreakInfo));
+		self::register("copper_bars", fn(BID $id) => new CopperBars($id, "Copper Bars", $ironBreakInfo));
 
 		self::register("iron_door", fn(BID $id) => new Door($id, "Iron Door", new Info(BreakInfo::pickaxe(5.0))));
 		self::register("iron_trapdoor", fn(BID $id) => new Trapdoor($id, "Iron Trapdoor", new Info(BreakInfo::pickaxe(5.0, ToolTier::WOOD))));
@@ -1049,6 +1054,7 @@ final class VanillaBlocks{
 		$lanternBreakInfo = new Info(BreakInfo::pickaxe(3.5));
 		self::register("lantern", fn(BID $id) => new Lantern($id, "Lantern", $lanternBreakInfo, 15));
 		self::register("soul_lantern", fn(BID $id) => new Lantern($id, "Soul Lantern", $lanternBreakInfo, 10));
+		self::register("copper_lantern", fn(BID $id) => new CopperLantern($id, "Copper Lantern", $lanternBreakInfo, 15));
 
 		self::register("lapis_lazuli", fn(BID $id) => new Opaque($id, "Lapis Lazuli Block", new Info(BreakInfo::pickaxe(3.0, ToolTier::STONE))));
 		self::register("lava", fn(BID $id) => new Lava($id, "Lava", new Info(BreakInfo::indestructible(500.0))));
@@ -1227,6 +1233,7 @@ final class VanillaBlocks{
 		self::register("tall_grass", fn(BID $id) => new TallGrass($id, "Tall Grass", new Info(BreakInfo::instant(ToolType::SHEARS, 1))));
 
 		self::register("blue_torch", fn(BID $id) => new Torch($id, "Blue Torch", new Info(BreakInfo::instant())));
+		self::register("copper_torch", fn(BID $id) => new Torch($id, "Copper Torch", new Info(BreakInfo::instant())));
 		self::register("purple_torch", fn(BID $id) => new Torch($id, "Purple Torch", new Info(BreakInfo::instant())));
 		self::register("red_torch", fn(BID $id) => new Torch($id, "Red Torch", new Info(BreakInfo::instant())));
 		self::register("green_torch", fn(BID $id) => new Torch($id, "Green Torch", new Info(BreakInfo::instant())));
@@ -1704,6 +1711,7 @@ final class VanillaBlocks{
 		self::register("warped_roots", fn(BID $id) => new NetherRoots($id, "Warped Roots", $netherRootsInfo));
 
 		self::register("chain", fn(BID $id) => new Chain($id, "Chain", new Info(BreakInfo::pickaxe(5.0, ToolTier::WOOD, 30.0))));
+		self::register("copper_chain", fn(BID $id) => new CopperChain($id, "Copper Chain", new Info(BreakInfo::pickaxe(5.0, ToolTier::WOOD, 30.0))));
 
 		self::register("respawn_anchor", fn(BID $id) => new RespawnAnchor($id, "Respawn Anchor", new Info(BreakInfo::pickaxe(50.0, ToolTier::DIAMOND, 6000.0))));
 	}
@@ -1765,7 +1773,6 @@ final class VanillaBlocks{
 
 		self::register("tinted_glass", fn(BID $id) => new TintedGlass($id, "Tinted Glass", new Info(new BreakInfo(0.3))));
 
-		//blast resistance should be 30 if we were matched with java :(
 		$copperBreakInfo = new Info(BreakInfo::pickaxe(3.0, ToolTier::STONE, 30.0));
 		self::register("lightning_rod", fn(BID $id) => new LightningRod($id, "Lightning Rod", $copperBreakInfo));
 

src/data/bedrock/block/convert/VanillaBlockMappings.php

@@ -43,6 +43,7 @@ use pocketmine\block\ChiseledBookshelf;
 use pocketmine\block\ChorusFlower;
 use pocketmine\block\CocoaBlock;
 use pocketmine\block\Copper;
+use pocketmine\block\CopperLantern;
 use pocketmine\block\DaylightSensor;
 use pocketmine\block\DetectorRail;
 use pocketmine\block\Dirt;
@@ -661,6 +662,25 @@ final class VanillaBlockMappings{
 			])
 			->properties([$commonProperties->slabPositionProperty])
 		);
+
+		$reg->mapFlattenedId(FlattenedIdModel::create(Blocks::COPPER_BARS())->idComponents([...$commonProperties->copperIdPrefixes, "copper_bars"]));
+		$reg->mapFlattenedId(FlattenedIdModel::create(Blocks::COPPER_CHAIN())
+			->idComponents([...$commonProperties->copperIdPrefixes, "copper_chain"])
+			->properties([$commonProperties->pillarAxis])
+		);
+		$reg->mapFlattenedId(FlattenedIdModel::create(Blocks::COPPER_LANTERN())
+			->idComponents([...$commonProperties->copperIdPrefixes, "copper_lantern"])
+			->properties([
+				new BoolProperty(StateNames::HANGING, fn(CopperLantern $b) => $b->isHanging(), fn(CopperLantern $b, bool $v) => $b->setHanging($v))
+			])
+		);
+		$reg->mapFlattenedId(FlattenedIdModel::create(Blocks::LIGHTNING_ROD())
+			->idComponents([...$commonProperties->copperIdPrefixes, "lightning_rod"])
+			->properties([
+				$commonProperties->anyFacingClassic,
+				new DummyProperty(StateNames::POWERED_BIT, false) //TODO
+			])
+		);
 	}
 
 	private static function registerFlattenedEnumMappings(BlockSerializerDeserializerRegistrar $reg, CommonProperties $commonProperties) : void{
@@ -1184,6 +1204,7 @@ final class VanillaBlockMappings{
 	private static function registerTorchMappings(BlockSerializerDeserializerRegistrar $reg, CommonProperties $commonProperties) : void{
 		foreach([
 			[Blocks::BLUE_TORCH(), Ids::COLORED_TORCH_BLUE],
+			[Blocks::COPPER_TORCH(), Ids::COPPER_TORCH],
 			[Blocks::GREEN_TORCH(), Ids::COLORED_TORCH_GREEN],
 			[Blocks::PURPLE_TORCH(), Ids::COLORED_TORCH_PURPLE],
 			[Blocks::RED_TORCH(), Ids::COLORED_TORCH_RED],
@@ -1355,10 +1376,6 @@ final class VanillaBlockMappings{
 			new ValueFromStringProperty(StateNames::LEVER_DIRECTION, ValueMappings::getInstance()->leverFacing, fn(Lever $b) => $b->getFacing(), fn(Lever $b, LeverFacing $v) => $b->setFacing($v)),
 			new BoolProperty(StateNames::OPEN_BIT, fn(Lever $b) => $b->isActivated(), fn(Lever $b, bool $v) => $b->setActivated($v)),
 		]));
-		$reg->mapModel(Model::create(Blocks::LIGHTNING_ROD(), Ids::LIGHTNING_ROD)->properties([
-			$commonProperties->anyFacingClassic,
-			new DummyProperty(StateNames::POWERED_BIT, false) //TODO
-		]));
 		$reg->mapModel(Model::create(Blocks::LIT_PUMPKIN(), Ids::LIT_PUMPKIN)->properties([$commonProperties->horizontalFacingCardinal]));
 		$reg->mapModel(Model::create(Blocks::LOOM(), Ids::LOOM)->properties([$commonProperties->horizontalFacingSWNE]));
 

src/item/StringToItemParser.php

@@ -106,6 +106,10 @@ final class StringToItemParser extends StringToTParser{
 				$register("copper_bulb", fn() => Blocks::COPPER_BULB()->setOxidation($oxidation)->setWaxed($waxed));
 				$register("copper_door", fn() => Blocks::COPPER_DOOR()->setOxidation($oxidation)->setWaxed($waxed));
 				$register("copper_trapdoor", fn() => Blocks::COPPER_TRAPDOOR()->setOxidation($oxidation)->setWaxed($waxed));
+				$register("copper_bars", fn() => Blocks::COPPER_BARS()->setOxidation($oxidation)->setWaxed($waxed));
+				$register("copper_chain", fn() => Blocks::COPPER_CHAIN()->setOxidation($oxidation)->setWaxed($waxed));
+				$register("copper_lantern", fn() => Blocks::COPPER_LANTERN()->setOxidation($oxidation)->setWaxed($waxed));
+				$register("lightning_rod", fn() => Blocks::LIGHTNING_ROD()->setOxidation($oxidation)->setWaxed($waxed));
 			}
 		}
 
@@ -279,6 +283,7 @@ final class StringToItemParser extends StringToTParser{
 		$result->registerBlock("concrete_powder", fn() => Blocks::CONCRETE_POWDER());
 		$result->registerBlock("concretepowder", fn() => Blocks::CONCRETE_POWDER());
 		$result->registerBlock("copper_ore", fn() => Blocks::COPPER_ORE());
+		$result->registerBlock("copper_torch", fn() => Blocks::COPPER_TORCH());
 		$result->registerBlock("coral", fn() => Blocks::CORAL());
 		$result->registerBlock("coral_block", fn() => Blocks::CORAL_BLOCK());
 		$result->registerBlock("coral_fan", fn() => Blocks::CORAL_FAN());
@@ -771,7 +776,6 @@ final class StringToItemParser extends StringToTParser{
 		$result->registerBlock("light", fn() => Blocks::LIGHT());
 		$result->registerBlock("light_block", fn() => Blocks::LIGHT());
 		$result->registerBlock("light_weighted_pressure_plate", fn() => Blocks::WEIGHTED_PRESSURE_PLATE_LIGHT());
-		$result->registerBlock("lightning_rod", fn() => Blocks::LIGHTNING_ROD());
 		$result->registerBlock("lilac", fn() => Blocks::LILAC());
 		$result->registerBlock("lily_of_the_valley", fn() => Blocks::LILY_OF_THE_VALLEY());
 		$result->registerBlock("lily_pad", fn() => Blocks::LILY_PAD());

tests/phpunit/block/block_factory_consistency_check.json

@@ -145,10 +145,14 @@
         "CONCRETE": 16,
         "CONCRETE_POWDER": 16,
         "COPPER": 8,
+        "COPPER_BARS": 8,
         "COPPER_BULB": 32,
+        "COPPER_CHAIN": 24,
         "COPPER_DOOR": 256,
         "COPPER_GRATE": 8,
+        "COPPER_LANTERN": 16,
         "COPPER_ORE": 1,
+        "COPPER_TORCH": 5,
         "COPPER_TRAPDOOR": 128,
         "CORAL": 10,
         "CORAL_BLOCK": 10,
@@ -453,7 +457,7 @@
         "LEGACY_STONECUTTER": 1,
         "LEVER": 16,
         "LIGHT": 16,
-        "LIGHTNING_ROD": 6,
+        "LIGHTNING_ROD": 48,
         "LILAC": 2,
         "LILY_OF_THE_VALLEY": 1,
         "LILY_PAD": 1,