New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Implement new 1.21 copper blocks #6366

Open

IvanCraft623 wants to merge 8 commits into pmmp:minor-next from IvanCraft623:feat/1.21-copper-blocks

Member

IvanCraft623 commented Jun 23, 2024 •

edited

Loading

Introduction

Implement the new 1.21 copper blocks types!!!

Changes

Gameplay

Blocks

Added the following new blocks:
- All types of Copper Bulb
- All types of Copper Door
- All types of Copper Trapdoor
- All types of Chiseled Copper
- All types of Copper Grate

Tests

I tested this PR by doing the following (tick all that apply):

Playtesting using a Minecraft client (provide screenshots or a video)
Writing a test plugin (provide the code)
- To be able to test Copper Bulb light activation I wrote this hack code:

public function onWorldSoundEvent(WorldSoundEvent $event) : void {
	$sound = $event->getSound();
	if (!($powerOn = $sound instanceof RedstonePowerOnSound) && !$sound instanceof RedstonePowerOffSound) {
		return;
	}

	$world = $event->getWorld();
	$block = $world->getBlock($event->getPosition());
	if (!$block instanceof Button) {
		return;
	}

	$support = $block->getSide(Facing::opposite($block->getFacing()));
	if (!$support instanceof CopperBulb) {
		return;
	}

	$world->setBlock($support->getPosition(), $support->togglePowered($powerOn));
}

IvanCraft623 added 5 commits

June 21, 2024 11:02


          Implement Copper Bulb

135b8b3


          Implement Copper Door & Copper Trapdoor


          Implement Chiseled Copper block

fc054a2


          Implement Copper Grate block

b81f59e


          Update block_factory_consistency_check.json

53b6121

IvanCraft623 requested a review from ShockedPlot7560

June 23, 2024 04:50


          Merge branch 'minor-next' into feat/1.21-copper-blocks

4e69cc8

jasonw4331 added Category: Gameplay Type: Enhancement labels

CJMustard1452 approved these changes

View reviewed changes

Gaprix suggested changes

View reviewed changes

src/data/bedrock/block/convert/BlockStateDeserializerHelper.php Show resolved Hide resolved

src/block/CopperDoor.php Outdated Show resolved Hide resolved

src/block/CopperTrapdoor.php Outdated Show resolved Hide resolved

ipad54 mentioned this pull request

Added ICopper interface to reduce duplications #6390

Merged

IvanCraft623 added 2 commits

July 8, 2024 17:19


          Allow players opening copper door and trapdoor when sneaking without …

4054d71

…an item


          Merge branch 'minor-next' into feat/1.21-copper-blocks

f79d9eb

Gaprix approved these changes

View reviewed changes

ShockedPlot7560 reviewed

View reviewed changes

src/block/CopperBulb.php

Comment on lines +45 to +53

+              	public function togglePowered(bool $powered) : self{
+              		if($powered === $this->powered){
+              			return $this;
+              		}
+              		if ($powered) {
+              			$this->setLit(!$this->lit);
+              		}
+              		$this->setPowered($powered);
+              		return $this;

Member

ShockedPlot7560 Jul 10, 2024

The name "toggle" suggest we don't have parameters and it just toggle the actual state ?

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

Comment on lines +1231 to +1242

+              				Helper::selectCopperId($oxidation,
+              					Ids::WAXED_CHISELED_COPPER,
+              					Ids::WAXED_EXPOSED_CHISELED_COPPER,
+              					Ids::WAXED_WEATHERED_CHISELED_COPPER,
+              					Ids::WAXED_OXIDIZED_CHISELED_COPPER
+              				) :
+              				Helper::selectCopperId($oxidation,
+              					Ids::CHISELED_COPPER,
+              					Ids::EXPOSED_CHISELED_COPPER,
+              					Ids::WEATHERED_CHISELED_COPPER,
+              					Ids::OXIDIZED_CHISELED_COPPER
+              				)

Member

ShockedPlot7560 Jul 10, 2024

To be consistent, maybe inline this lines ?

Member

dktapps Sep 10, 2024

More important that the code isn't inconveniently wide so it doesn't require horizontal scrolling.

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

Comment on lines +1248 to +1260

+              				Helper::selectCopperId($oxidation,
+              					Ids::WAXED_COPPER_GRATE,
+              					Ids::WAXED_EXPOSED_COPPER_GRATE,
+              					Ids::WAXED_WEATHERED_COPPER_GRATE,
+              					Ids::WAXED_OXIDIZED_COPPER_GRATE
+              				) :
+              				Helper::selectCopperId($oxidation,
+              					Ids::COPPER_GRATE,
+              					Ids::EXPOSED_COPPER_GRATE,
+              					Ids::WEATHERED_COPPER_GRATE,
+              					Ids::OXIDIZED_COPPER_GRATE
+              				)
+              			);

Member

ShockedPlot7560 Jul 10, 2024

Same

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

Comment on lines +1332 to +1342

+              				Helper::selectCopperId($oxidation,
+              					Ids::WAXED_COPPER_BULB,
+              					Ids::WAXED_EXPOSED_COPPER_BULB,
+              					Ids::WAXED_WEATHERED_COPPER_BULB,
+              					Ids::WAXED_OXIDIZED_COPPER_BULB) :
+              				Helper::selectCopperId($oxidation,
+              					Ids::COPPER_BULB,
+              					Ids::EXPOSED_COPPER_BULB,
+              					Ids::WEATHERED_COPPER_BULB,
+              					Ids::OXIDIZED_COPPER_BULB
+              				))

Member

ShockedPlot7560 Jul 10, 2024

same

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

Comment on lines +1351 to +1364

+              					Helper::selectCopperId(
+              						$oxidation,
+              						Ids::WAXED_COPPER_DOOR,
+              						Ids::WAXED_EXPOSED_COPPER_DOOR,
+              						Ids::WAXED_WEATHERED_COPPER_DOOR,
+              						Ids::WAXED_OXIDIZED_COPPER_DOOR
+              					) :
+              					Helper::selectCopperId(
+              						$oxidation,
+              						Ids::COPPER_DOOR,
+              						Ids::EXPOSED_COPPER_DOOR,
+              						Ids::WEATHERED_COPPER_DOOR,
+              						Ids::OXIDIZED_COPPER_DOOR
+              					)

Member

ShockedPlot7560 Jul 10, 2024

same

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

Comment on lines +1372 to +1386

+              				new Writer($block->isWaxed() ?
+              					Helper::selectCopperId(
+              						$oxidation,
+              						Ids::WAXED_COPPER_TRAPDOOR,
+              						Ids::WAXED_EXPOSED_COPPER_TRAPDOOR,
+              						Ids::WAXED_WEATHERED_COPPER_TRAPDOOR,
+              						Ids::WAXED_OXIDIZED_COPPER_TRAPDOOR
+              					) :
+              					Helper::selectCopperId(
+              						$oxidation,
+              						Ids::COPPER_TRAPDOOR,
+              						Ids::EXPOSED_COPPER_TRAPDOOR,
+              						Ids::WEATHERED_COPPER_TRAPDOOR,
+              						Ids::OXIDIZED_COPPER_TRAPDOOR
+              					)

Member

ShockedPlot7560 Jul 10, 2024

same

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Category: Gameplay Type: Enhancement