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

Dispenser stuff #666

Merged
merged 16 commits into from
Jan 23, 2025
Merged

Dispenser stuff #666

merged 16 commits into from
Jan 23, 2025

Conversation

supersaiyansubtlety
Copy link
Member

@supersaiyansubtlety supersaiyansubtlety commented Nov 22, 2024 •
edited
Loading

  • completes n/m/block/dispenser/ and CauldronBehavior
  • renames ItemDispenserBehavior -> DefaultDispenserBehavior
  • rename FallibleItemDispenserBehavior -> FallibleDispenserBehavior
  • renames n/m/util/math/BlockPointer -> n/m/block/dispenser/DispenserContext:
    it holds a DispenserBlockEntity and is used by DispenserBehaviors, context is more conventional than pointer
  • consistently names the methods called in Bootstrap::bootstrap bootstrap

@supersaiyansubtlety
rename n/m/util/math/BlockPointer -> n/m/block/dispenser/DispenserCon…
28622b1 
…text:

it holds a DispenserBlockEntity and is used by DispenserBehaviors, context is more conventional than pointer
@supersaiyansubtlety
complete and clarify BlockHitResult
72bddfe
@supersaiyansubtlety
map MinecartDispenserBehavior
4d7df7f
@supersaiyansubtlety
add simple type for Hand
d783f48
@supersaiyansubtlety
map EquipmentDispenserBehavior
b9a2ddd
@supersaiyansubtlety
complete n/m/block/dispenser
e723c40 
complete CauldronBehavior
rename Bootstrap ->  Bootstrapper and make bootstrap methods names consistent
@supersaiyansubtlety
rename ItemDispenserBehavior -> DefaultDispenserBehavior
b4c8a8e 
rename    FallibleItemDispenserBehavior -> FallibleDispenserBehavior
@supersaiyansubtlety supersaiyansubtlety added t: refactor proposes a refactor v: snapshot targets a snapshot version of minecraft reviews needed please review this PR s: small PRs with less than 200 lines labels Nov 22, 2024
@supersaiyansubtlety supersaiyansubtlety self-assigned this Nov 22, 2024
ix0rai
ix0rai requested changes Nov 25, 2024
View reviewed changes
Copy link
Member

@ix0rai ix0rai left a comment

Choose a reason for hiding this comment

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

looks great, just one issue!

mappings/net/minecraft/Bootstrapper.mapping Outdated Show resolved Hide resolved
@supersaiyansubtlety supersaiyansubtlety added the update-base used to notify github actions that the base branch should be updated label Nov 27, 2024
@github-actions GitHub Actions
Copy link
Contributor

🚀 Target branch has been updated to 1.21.4-pre2

@github-actions github-actions bot changed the base branch from 1.21.4-pre1 to 1.21.4-pre2 November 27, 2024 05:55
@github-actions GitHub Actions
Copy link
Contributor

🚨 Please fix merge conflicts before this can be merged

@github-actions github-actions bot added outdated this pull request hasn't been updated to the latest version or has merge conflicts and removed update-base used to notify github actions that the base branch should be updated labels Nov 27, 2024
@supersaiyansubtlety supersaiyansubtlety added update-base used to notify github actions that the base branch should be updated and removed outdated this pull request hasn't been updated to the latest version or has merge conflicts labels Nov 27, 2024
@github-actions github-actions bot changed the base branch from 1.21.4-pre2 to 1.21.4-rc3 December 2, 2024 23:42
@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Dec 2, 2024

🚀 Target branch has been updated to 1.21.4-rc3

@github-actions github-actions bot removed the update-base used to notify github actions that the base branch should be updated label Dec 2, 2024
actions-user and others added 2 commits December 2, 2024 23:44
@actions-user
Drop invalid mappings
2d4e8bf
@supersaiyansubtlety
re-complete DispenserBehavior
f95f53f 
rename DefaultDispenserBehavior dispenseSilently -> dispenseImpl and correct its old pointer param name
@supersaiyansubtlety supersaiyansubtlety added the update-base used to notify github actions that the base branch should be updated label Dec 4, 2024
@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Dec 4, 2024

🚀 Target branch has been updated to 1.21.4

@github-actions github-actions bot changed the base branch from 1.21.4-rc3 to 1.21.4 December 4, 2024 00:35
@github-actions github-actions bot removed the update-base used to notify github actions that the base branch should be updated label Dec 4, 2024
@ix0rai ix0rai added the update-base used to notify github actions that the base branch should be updated label Jan 15, 2025
@github-actions GitHub Actions
Copy link
Contributor

🚀 Target branch has been updated to 25w02a

@github-actions github-actions bot changed the base branch from 1.21.4 to 25w02a January 15, 2025 23:20
@github-actions github-actions bot removed the update-base used to notify github actions that the base branch should be updated label Jan 15, 2025
@supersaiyansubtlety supersaiyansubtlety added final-comment-period is approved and will soon be merged if no issues are raised and removed reviews needed please review this PR labels Jan 20, 2025
@supersaiyansubtlety supersaiyansubtlety merged commit 4ecb5a4 into QuiltMC:25w02a Jan 23, 2025
3 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ix0rai ix0rai ix0rai approved these changes

@IotaBread IotaBread IotaBread approved these changes

Assignees

@supersaiyansubtlety supersaiyansubtlety

Labels
final-comment-period is approved and will soon be merged if no issues are raised s: small PRs with less than 200 lines t: refactor proposes a refactor v: snapshot targets a snapshot version of minecraft
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@supersaiyansubtlety @IotaBread @ix0rai @actions-user