Smithing templates + Table and Armour Trims #861
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
TwistedAsylumMC
requested changes
Apr 19, 2024
DaPigGuy
requested changes
Apr 20, 2024
server/session/player.go
Outdated
| @@ -135,6 +135,34 @@ func (s *Session) sendRecipes() { | |||
| s.writePacket(&packet.CraftingData{Recipes: recipes, ClearRecipes: true}) | |||
| } | |||
|
|
|||
| // sendArmourTrimData sends the armour trim data. | |||
| func (s *Session) sendArmourTrimData() { | |||
| var trimPatters []protocol.TrimPattern | |||
There was a problem hiding this comment.
Suggested change
| var trimPatters []protocol.TrimPattern | |
| var trimPatterns []protocol.TrimPattern |
server/internal/nbtconv/write.go
Outdated
| @@ -111,6 +112,16 @@ func writeEnchantments(m map[string]any, s item.Stack) { | |||
| } | |||
| } | |||
|
|
|||
| // writeArmourTrim writes the | |||
| return ArmourSmithingTemplate{7} | ||
| } | ||
|
|
||
| // TemplateShaper returns the Raiser Template. |
There was a problem hiding this comment.
Suggested change
| // TemplateShaper returns the Raiser Template. | |
| // TemplateShaper returns the Shaper Template. |
TwistedAsylumMC
requested changes
Apr 27, 2024
server/item/armour_trim.go
Outdated
| type ArmourTrimMaterial interface { | ||
| // TrimMaterial returns the material name used for reading and writing trim data. | ||
| TrimMaterial() string | ||
| // MaterialColour returns the color code used for internal text formatting. Use text.Colourf for proper formatting. |
There was a problem hiding this comment.
Change "color" to "colour", can probably remove the text.Colourf reference now we return the constant
server/item/recipe/recipe.go
Outdated
Comment on lines
56
to
57
| // in the parameters. If the block given a crafting table, the recipe can also be crafted in the 2x2 crafting grid in | ||
| // the player's inventory. This is almost identical to SmithingTransform except there is no output item. |
There was a problem hiding this comment.
Same thing about the crafting grid here
server/item/smithing_template.go
Outdated
| @@ -0,0 +1,16 @@ | |||
| package item | |||
|
|
|||
| // SmithingTemplate is an item used in smithing tables to alter tools and armor. | |||
There was a problem hiding this comment.
Use "armour" instead of "armor"
server/item/stack.go
Outdated
| @@ -42,6 +44,26 @@ func NewStack(t world.Item, count int) Stack { | |||
| return Stack{item: t, count: count, id: newID()} | |||
| } | |||
|
|
|||
| // WithArmourTrim returns a new stack with the ArmorTrim passed. | |||
There was a problem hiding this comment.
"ArmourTrim" instead of "ArmorTrim"
server/item/stack.go
Outdated
Comment on lines
58
to
59
| // ArmourTrim returns the ArmourTrim. | ||
| // if this returns false it does not have an armor trim, or it is not an armour |
There was a problem hiding this comment.
Grammar could be better here, maybe "ArmourTrim returns the ArmourTrim and true if present, otherwise false is returned."
server/session/handler_smithing.go
Outdated
| @@ -11,6 +11,8 @@ const ( | |||
| smithingInputSlot = 0x33 | |||
| // smithingMaterialSlot is the slot index of the material in the smithing table. | |||
| smithingMaterialSlot = 0x34 | |||
| // smithingTemplateSlot is the slot index of the template item in the smithing table | |||
There was a problem hiding this comment.
End with a "." for proper punctuation
# Conflicts: # go.mod # go.sum # server/item/recipe/vanilla.go
|
Thank you for the contribution! |
89 tasks
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Co-authored-by: Flonja
Everything works properly but the smithing recipes are still missing
would like some help generating the smithing_data.nbt file.