Implemented smithing table functionality #6202

HimmelKreis4865 · 2023-12-18T13:50:37Z

Introduction

This PR adds working smithing tables to pocketmine.
There are no known issues or problems

Changes

API changes

Amor->setTrim(ArmorTrim)
Armor->getTrim() : ?ArmorTrim
Armor->clearTrim()

SmithingTableInventory->getInput() : Item
SmithingTableInventory->getAddition() : Item
SmithingTableInventory->getTemplate() : Item

The new enums: ArmorTrimPattern & ArmorTrimMaterial (required to construct ArmorTrim)

Tests

Tested ingame with the smithing table several times:

Tested the code

$player->getInventory()->addItem(VanillaItems::LEATHER_CAP()->setTrim(new ArmorTrim(ArmorTrimMaterial::QUARTZ, ArmorTrimPattern::EYE)));

src/crafting/CraftingManagerFromDataHelper.php

src/block/inventory/SmithingTableInventory.php

src/crafting/SmithingRecipe.php

src/inventory/transaction/SmithingTransaction.php

src/item/ArmorTrimPattern.php

dktapps · 2023-12-20T10:51:26Z

src/network/mcpe/handler/PreSpawnPacketHandler.php

+			$this->session->getLogger()->debug("Sending armor trim data");
+			$patterns = array_map(fn(ArmorTrimPattern $pattern) => new TrimPattern($pattern->getItemId(), $pattern->value), ArmorTrimPattern::cases());
+			$materials = array_map(fn(ArmorTrimMaterial $material) => new TrimMaterial($material->value, $material->getColor(), $material->getItemId()), ArmorTrimMaterial::cases());
+			$this->session->sendDataPacket(TrimDataPacket::create($patterns, $materials));


Is this customizable? If so, why are we using hard enums for this?

@HimmelKreis4865 I don't know about patterns, but colours can be definitely customized. (For example, I can change the amethyst colour from purple to white). What do you think about allowing plugins to customize this?

yeah I'm aware of this, and this should be customizable but I did not yet find a solution for this problem that satisfies me

I pushed a commit to make this all customizable, please tell me what you think of this

To me it looks good, but I'm not sure about passing type id and serialized item name to the constructor. Wouldn't a better to pass an Item and then serialize it when sending TrimData?
(from ipad54 on discord)

what do you guys think about this?

src/network/mcpe/cache/CraftingDataCache.php

src/network/mcpe/handler/ItemStackRequestExecutor.php

src/crafting/CraftingManager.php

HimmelKreis4865 · 2024-01-23T20:26:52Z

There's not much more I can do at this point, everthing is fixed except for save ids.

jasonw4331

Looks pretty good to me, one comment.

src/item/Armor.php

src/crafting/CraftingManager.php

src/block/SmithingTable.php

src/network/mcpe/handler/ItemStackRequestExecutor.php

pandaaaBE · 2024-03-22T17:00:30Z

Looks finished now :)

HimmelKreis4865 · 2024-03-22T17:06:01Z

yeah, ready to be reviewed again.

src/block/SmithingTable.php

ShockedPlot7560 · 2024-03-23T17:53:45Z

src/crafting/SmithingTransformRecipe.php

+	 * @param Item[] $inputs
+	 * @phpstan-param list<Item> $inputs
+	 */
+	public function getResultFor(array $inputs) : ?Item{


I'm sceptical about the fact that it's up to the recipe to find out what the input is.

tbh I don't see a problem here, it also has 2 usages so I don't know how I'd change it smoothly..

is this relevant now? If so, please give me some more information on where to move the methods

ShockedPlot7560 · 2024-03-23T17:53:58Z

src/crafting/SmithingTrimRecipe.php

+	 * @param Item[] $inputs
+	 * @phpstan-param list<Item> $inputs
+	 */
+	public function getResultFor(array $inputs) : ?Item{


src/crafting/SmithingTransformRecipe.php

src/item/ArmorTrim.php

src/item/Armor.php

src/item/SmithingTemplate.php

src/utils/TextFormat.php

src/crafting/SmithingTrimRecipe.php

src/utils/TextFormat.php

HimmelKreis4865 · 2024-07-15T10:46:59Z

what is still missing?

pandaaaBE · 2024-07-15T11:16:51Z

what is still missing?

nothing. just reviews 😭

jasonw4331

Here are some micro-optimizations which I believe may help the API

jasonw4331 · 2024-07-23T23:19:37Z

src/crafting/SmithingTrimRecipe.php

+	public function __construct(
+		private readonly RecipeIngredient $input,
+		private readonly RecipeIngredient $addition,
+		private readonly RecipeIngredient $template){


Because these are readonly values the getter functions are redundant and these variables can be made public

jasonw4331 · 2024-07-23T23:21:50Z

src/item/ArmorTrimPattern.php

+	public function __construct(
+		private string $identifier,
+		private string $itemName,
+		private int $typeId


These can also be public, making the getters redundant.

jasonw4331 · 2024-07-23T23:21:57Z

src/item/ArmorTrimMaterial.php

+		private string $identifier,
+		private string $color,
+		private string $itemName,
+		private int $typeId


These can also be public, making the getters redundant.

ipad54 · 2024-08-28T21:34:46Z

src/item/ArmorTrimRegistry.php

+	}
+
+	private function registerDefaultMaterials() : void{
+		$this->registerMaterial(new ArmorTrimMaterial(ArmorTrimMaterial::AMETHYST, TextFormat::MATERIAL_AMETHYST, Names::AMETHYST_SHARD, Ids::AMETHYST_SHARD));


As I said in discord, it would be better to pass an Item and then serialise it when sending TrimData instead of passing type id and serialised item name

HimmelKreis4865 added 5 commits December 17, 2023 11:56

add basic smithing table requirements

ae13dc9

Merge branch 'pmmp:stable' into smithing-table

16de186

fixed remaining problems

fc5e5eb

phpstan stop crying

c3ea0ba

why are headers missing?

2a56e41

IvanCraft623 requested changes Dec 18, 2023

View reviewed changes

src/crafting/CraftingManagerFromDataHelper.php Outdated Show resolved Hide resolved

ShockedPlot7560 added Category: API Related to the plugin API Category: Core Related to internal functionality Type: Enhancement Contributes features or other improvements to PocketMine-MP labels Dec 20, 2023

dktapps requested changes Dec 20, 2023

View reviewed changes

HimmelKreis4865 added 3 commits January 21, 2024 19:39

updated version with all fixes except for save ids - they must be fixed

4da34c3

oops (save ids still not working)

6dce15d

oops

b82de65

jasonw4331 suggested changes Jan 27, 2024

View reviewed changes

src/item/Armor.php Outdated Show resolved Hide resolved

dktapps reviewed Jan 29, 2024

View reviewed changes

src/crafting/CraftingManager.php Outdated Show resolved Hide resolved

dktapps reviewed Jan 29, 2024

View reviewed changes

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

dktapps reviewed Feb 16, 2024

View reviewed changes

src/network/mcpe/handler/ItemStackRequestExecutor.php Outdated Show resolved Hide resolved

dktapps added the Status: Waiting on Author label Mar 4, 2024

$@fractalllll$

This comment was marked as off-topic.

Sign in to view

HimmelKreis4865 added 3 commits March 22, 2024 14:29

fixes all big remaining issues

93db5ef

Merge remote-tracking branch 'origin/minor-next' into working-smithing

1ad80e9

cs style fixes

5360b77

HimmelKreis4865 force-pushed the smithing-table branch from 3999602 to 5360b77 Compare March 22, 2024 16:57

ShockedPlot7560 removed the Status: Waiting on Author label Mar 23, 2024

ShockedPlot7560 reviewed Mar 23, 2024

View reviewed changes

ipad54 reviewed Mar 23, 2024

View reviewed changes

src/crafting/SmithingTrimRecipe.php Show resolved Hide resolved

resolved some more problems

7433655

made materials & patterns customizable

d987a65

diamond-gold reviewed Mar 26, 2024

View reviewed changes

src/utils/TextFormat.php Show resolved Hide resolved

ShockedPlot7560 added the Status: Waiting on Author label Mar 29, 2024

jasonw4331 reviewed Jul 23, 2024

View reviewed changes

ipad54 reviewed Aug 28, 2024

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Implemented smithing table functionality #6202

Implemented smithing table functionality #6202

HimmelKreis4865 commented Dec 18, 2023

dktapps Dec 20, 2023

ipad54 Mar 23, 2024

HimmelKreis4865 Mar 23, 2024

HimmelKreis4865 Mar 24, 2024

HimmelKreis4865 Mar 30, 2024 •

edited

Loading

HimmelKreis4865 commented Jan 23, 2024

jasonw4331 left a comment •

edited

Loading

This comment was marked as off-topic.

pandaaaBE commented Mar 22, 2024 •

edited

Loading

HimmelKreis4865 commented Mar 22, 2024

ShockedPlot7560 Mar 23, 2024

HimmelKreis4865 Mar 23, 2024

HimmelKreis4865 Mar 30, 2024

ShockedPlot7560 Mar 23, 2024

HimmelKreis4865 commented Jul 15, 2024

pandaaaBE commented Jul 15, 2024

jasonw4331 left a comment

jasonw4331 Jul 23, 2024

jasonw4331 Jul 23, 2024

jasonw4331 Jul 23, 2024

ipad54 Aug 28, 2024

Implemented smithing table functionality #6202

Are you sure you want to change the base?

Implemented smithing table functionality #6202

Conversation

HimmelKreis4865 commented Dec 18, 2023

Introduction

Changes

API changes

Tests

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

HimmelKreis4865 Mar 30, 2024 • edited Loading

Choose a reason for hiding this comment

HimmelKreis4865 commented Jan 23, 2024

jasonw4331 left a comment • edited Loading

Choose a reason for hiding this comment

This comment was marked as off-topic.

pandaaaBE commented Mar 22, 2024 • edited Loading

HimmelKreis4865 commented Mar 22, 2024

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

HimmelKreis4865 commented Jul 15, 2024

pandaaaBE commented Jul 15, 2024

jasonw4331 left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

HimmelKreis4865 Mar 30, 2024 •

edited

Loading

jasonw4331 left a comment •

edited

Loading

pandaaaBE commented Mar 22, 2024 •

edited

Loading