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

src/network/mcpe/handler/PreSpawnPacketHandler.php

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

src/crafting/SmithingTransformRecipe.php

src/crafting/SmithingTrimRecipe.php

src/crafting/SmithingTransformRecipe.php

src/item/ArmorTrim.php

src/item/Armor.php

src/item/SmithingTemplate.php

src/utils/TextFormat.php

src/crafting/SmithingTrimRecipe.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

src/crafting/SmithingTrimRecipe.php

src/item/ArmorTrimPattern.php

src/item/ArmorTrimMaterial.php

src/item/ArmorTrimRegistry.php

src/crafting/SmithingTransformRecipe.php

src/crafting/SmithingTrimRecipe.php

src/inventory/transaction/SmithingTransaction.php

…to smithing-table

Co-authored-by: Dylan T. <[email protected]>

…ocketMine-MP into smithing-table

src/data/bedrock/ArmorTrimPatternTypeIdMap.php

src/data/bedrock/ArmorTrimMaterialTypeIdMap.php

This reverts commit 30a4edb.

dktapps

Looks mostly OK.

I'm a bit uneasy about allowing custom armor trim patterns because they'll generate confusing errors if the objects are duplicated. The ArmorTrimPattern and ArmorTrimMaterial classes should use the NotCloneable and NotSerializable traits.

src/crafting/CraftingManager.php

src/block/inventory/SmithingTableInventory.php

src/data/bedrock/ArmorTrimMaterialTypeIdMap.php

src/data/bedrock/ArmorTrimPatternTypeIdMap.php

src/inventory/transaction/SmithingTransaction.php

src/network/mcpe/convert/TypeConverter.php

…to smithing-table

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 Outdated Show resolved Hide resolved

resolved some more problems

7433655

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

jasonw4331 reviewed Jul 23, 2024

View reviewed changes

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

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

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

ipad54 reviewed Aug 28, 2024

View reviewed changes

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

dktapps reviewed Nov 29, 2024

View reviewed changes

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

dktapps reviewed Nov 29, 2024

View reviewed changes

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

dktapps reviewed Nov 29, 2024

View reviewed changes

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

dktapps reviewed Nov 29, 2024

View reviewed changes

src/inventory/transaction/SmithingTransaction.php Outdated Show resolved Hide resolved

ipad54 added 2 commits November 30, 2024 18:28

Merge branch 'minor-next' of https://github.com/pmmp/PocketMine-MP in…

d818686

…to smithing-table

Code overhaul

849f9b1

ipad54 requested a review from a team as a code owner November 30, 2024 20:22

github-actions bot removed the Status: Waiting on Author label Nov 30, 2024

ipad54 and others added 4 commits November 30, 2024 23:23

Update src/inventory/transaction/SmithingTransaction.php

348a211

Co-authored-by: Dylan T. <[email protected]>

CS

2294a6f

Make trim constants private

e19d0d7

Merge branch 'smithing-table' of https://github.com/HimmelKreis4865/P…

671a578

…ocketMine-MP into smithing-table

dktapps requested changes Nov 30, 2024

View reviewed changes

src/data/bedrock/ArmorTrimPatternTypeIdMap.php Show resolved Hide resolved

dktapps assigned ipad54 Nov 30, 2024

ipad54 added 3 commits December 1, 2024 12:03

Don't use match

30a4edb

Use readonly where possible

d88960e

Fix CS

f479d66

dktapps reviewed Dec 1, 2024

View reviewed changes

src/data/bedrock/ArmorTrimMaterialTypeIdMap.php Outdated Show resolved Hide resolved

ipad54 added 2 commits December 1, 2024 15:33

Revert "Don't use match"

1deacda

This reverts commit 30a4edb.

Fix tests

b8da323

dktapps requested changes Dec 1, 2024

View reviewed changes

Changes for review

c41cf15

dktapps reviewed Dec 1, 2024

View reviewed changes

src/network/mcpe/convert/TypeConverter.php Outdated Show resolved Hide resolved

ipad54 added 2 commits December 1, 2024 18:30

Declare all offset constants together

780b373

Merge branch 'minor-next' of https://github.com/pmmp/PocketMine-MP in…

a68323a

…to smithing-table

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

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

HimmelKreis4865 commented Jul 15, 2024

pandaaaBE commented Jul 15, 2024

jasonw4331 left a comment

dktapps left a comment

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

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

HimmelKreis4865 commented Jul 15, 2024

pandaaaBE commented Jul 15, 2024

jasonw4331 left a comment

Choose a reason for hiding this comment

dktapps left a comment

Choose a reason for hiding this comment

jasonw4331 left a comment •

edited

Loading

pandaaaBE commented Mar 22, 2024 •

edited

Loading