Skip to content
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 enchanting tables #548

Merged
merged 112 commits into from
Jul 16, 2022
Merged

Implement enchanting tables #548

merged 112 commits into from
Jul 16, 2022

Conversation

JustTalDevelops
Copy link
Member

@JustTalDevelops JustTalDevelops commented Jul 10, 2022 •
edited
Loading

Resolves #502.

JustTalDevelops and others added 30 commits May 15, 2022 17:06
@JustTalDevelops
dragonfly: Started implementing anvils.
2bf1ce8
@T14Raptor
Merge remote-tracking branch 'origin/master' into feature/anvils
0c68672 
# Conflicts:
#	server/session/handler_item_stack_request.go
#	server/session/player.go
#	server/session/session.go
#	server/session/world.go
@T14Raptor
Anvil progress
a4c6aee
@T14Raptor
Progress.
a6c896c
@T14Raptor
session/handler_item_stack_request.go: Set enchantments.
780c119
@JustTalDevelops
Merge branch 'master' into feature/anvils
6d1b6df 
# Conflicts:
#	cmd/blockhash/main.go
#	server/block/wood_fence_gate.go
@JustTalDevelops
item/item.go: Added a DisplayName function.
acfcc6d
@JustTalDevelops
session/handler_item_stack_request.go: Renaming.
8f36c70
@JustTalDevelops
session/handler_item_stack_request.go: Fix damaging.
9dccb44
@JustTalDevelops
enchantment/sharpness.go: Correct MaxLevel.
775bb73
@T14Raptor
Repairing stuff
8041cb4
@JustTalDevelops
block/anvil.go: Proper falling block mechanics.
69fd08f
@JustTalDevelops
Merge remote-tracking branch 'origin/feature/anvils' into feature/anvils
45483c3
@JustTalDevelops
entity/falling_block.go: Move damage information to damageables.
516eed3
@JustTalDevelops
item/tool.go: ToolTierGold is repairable.
ebfc7fc
@JustTalDevelops
cube/direction.go: Replaced (Direction).Horizontal() with an unexport…
a8ee312 
…ed function.
@JustTalDevelops
enchantment/efficiency.go: Fix CompatibleWithItem not accounting for …
9137fed 
…regular axes.
@JustTalDevelops
enchantment/efficiency.go: Fix CompatibleWithItem not accounting for …
10a337f 
…shovels.
@JustTalDevelops
enchantment/efficiency.go: Account for shears and hoes.
146b798
@T14Raptor
repair cost
b0d6f29
@T14Raptor
Merge remote-tracking branch 'origin/feature/anvils' into feature/anvils
bbecd9a
@JustTalDevelops
session/handler_item_stack_request.go: Only cancel if there are no co…
b004c58 
…mpatible enchantments.
@JustTalDevelops
Merge remote-tracking branch 'origin/feature/anvils' into feature/anvils
3b0eba5
@JustTalDevelops
session/handler_item_stack_request.go: Remove useless resultEnchantme…
9a5ebe2 
…nts field.
@JustTalDevelops
main.go: Removed debugging code.
c881565
@JustTalDevelops
nbtconv: Always read/write RepairCost as an int32.
f7e2e8a
@JustTalDevelops
session/handler_item_stack_request.go: Update result with repair cost.
a7b79b9
@JustTalDevelops
session/handler_item_stack_request.go: Split up anvils, crafting, and…
8c662b5 
… beacons.
@JustTalDevelops
session/handler_anvil.go: Document handleCraftRecipeOptional.
5228bfc
@JustTalDevelops
session/handler_anvil.go: Error on impossible circumstances.
f6d50b2
Sandertv
Sandertv requested changes Jul 15, 2022
View reviewed changes
Copy link
Member

@Sandertv Sandertv left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've got a couple of comments, most of them should be pretty trivial to resolve and are small nitpicks or things to make the code just a bit more readable.

In general: Really good job! The documentation throughout the enchantment logic is super helpful and makes it a lot easier to see what's going on. As far as I could tell, the enchantment logic made sense. If anyone who has knowledge about enchantment tables could have another glance over that, that would be appreciated.

server/item/armour.go Outdated Show resolved Hide resolved
server/item/enchantment.go Outdated Show resolved Hide resolved
server/item/stack.go Show resolved Hide resolved
server/session/handler_enchanting.go Outdated Show resolved Hide resolved
server/session/handler_enchanting.go Outdated Show resolved Hide resolved
server/block/model/enchanting_table.go Show resolved Hide resolved
server/session/handler_enchanting.go Outdated Show resolved Hide resolved
server/session/handler_enchanting.go Outdated Show resolved Hide resolved
server/session/handler_enchanting.go Outdated Show resolved Hide resolved
Sandertv
Sandertv approved these changes Jul 16, 2022
View reviewed changes
Copy link
Member

@Sandertv Sandertv left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This looks good to me. Feel free to merge this at your own discretion if you've made sure all is working as intended!

@DaPigGuy DaPigGuy merged commit 9fe8209 into master Jul 16, 2022
@DaPigGuy DaPigGuy deleted the feature/enchanting-tables branch July 16, 2022 21:17
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Sandertv Sandertv Sandertv approved these changes

@provsalt provsalt provsalt approved these changes

@DaPigGuy DaPigGuy Awaiting requested review from DaPigGuy

@T14Raptor T14Raptor Awaiting requested review from T14Raptor

Assignees
No one assigned
Labels
feature New feature or request
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Implement enchanting tables
5 participants
@JustTalDevelops @DaPigGuy @Sandertv @provsalt @T14Raptor