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 equals and hashCode for SizedIngredients #965

Merged
merged 1 commit into from
May 17, 2024
Merged

Implement equals and hashCode for SizedIngredients #965

merged 1 commit into from
May 17, 2024

Conversation

pupnewfster
Copy link
Member

Ingredient already implements equals and hashCode, so it is trivial to support them for SizedIngredient as well.

@pupnewfster pupnewfster added the 1.20.6 Targeted at Minecraft 1.20.6 label May 16, 2024
@neoforged-pr-publishing
Copy link

neoforged-pr-publishing bot commented May 16, 2024 •
edited by pupnewfster
Loading

  • Publish PR to GitHub Packages

@marchermans marchermans merged commit a7edbae into neoforged:1.20.x May 17, 2024
5 checks passed
CodexAdrian added a commit to CodexAdrian/NeoForge that referenced this pull request May 21, 2024
@CodexAdrian
Squashed commit of the following:
d6e08eb 
commit 8ac9f9c
Author: Minecraftschurli <[email protected]>
Date:   Tue May 21 15:25:59 2024 +0200

    [Testframework] Fix wrapping GameTestAssertException (neoforged#988)

commit 66197fe
Author: Max <[email protected]>
Date:   Sat May 18 20:11:00 2024 +0200

    Add a Fluid Ingredient system as an analogue to vanilla's Ingredient (neoforged#789)

commit b1c3fe0
Author: NeoForged Localizations <[email protected]>
Date:   Sun May 19 00:43:32 2024 +0800

    New Crowdin updates (neoforged#972)

commit a7edbae
Author: Sara Freimer <[email protected]>
Date:   Fri May 17 01:32:34 2024 -0500

    Implement equals and hashCode for SizedIngredients (neoforged#965)

commit e9e8af0
Author: Dennis C <[email protected]>
Date:   Fri May 17 08:31:55 2024 +0200

    [1.20.6] Use extensible enum codec and streamcodec for rarity enum (neoforged#958)

commit 986e0e3
Author: TelepathicGrunt <[email protected]>
Date:   Fri May 17 02:28:12 2024 -0400

    Patch in missing LivingJumpEvent for Slime and Camel (neoforged#966)

commit 2bf3073
Author: TelepathicGrunt <[email protected]>
Date:   Fri May 17 02:26:49 2024 -0400

    Pass growing plant blockstate into onCropsGrowPre for various vine blocks (neoforged#967)

commit 0033435
Author: embeddedt <[email protected]>
Date:   Fri May 17 02:25:24 2024 -0400

    Fix ComputeCameraAngles event applying roll in global space (neoforged#968)

commit bb3537b
Author: TelepathicGrunt <[email protected]>
Date:   Wed May 15 23:02:02 2024 -0400

    [no ci] Remove PitcherCrop patch TODO (neoforged#963)

commit d80f154
Author: TelepathicGrunt <[email protected]>
Date:   Wed May 15 23:01:36 2024 -0400

    [no ci] Fixed Bubble Column gametest template size (neoforged#964)

commit c888a68
Author: Luke Bemish <[email protected]>
Date:   Wed May 15 01:29:03 2024 -0500

    [1.20.6] Add KnownPacks for mods (neoforged#901)

commit a28986f
Author: shartte <[email protected]>
Date:   Mon May 13 09:13:19 2024 +0200

    Update FML to 3.0.29 (neoforged#957)

commit 2aadb61
Author: TelepathicGrunt <[email protected]>
Date:   Sat May 11 14:11:06 2024 -0400

    Make StructureTemplate's Palette caches thread safe (neoforged#954)

commit 2bced72
Author: TelepathicGrunt <[email protected]>
Date:   Sat May 11 13:49:18 2024 -0400

    Address POI memory leak and Generate Command issues (neoforged#937)

    Co-authored-by: embeddedt <[email protected]>

commit abc54b7
Author: Sirttas <[email protected]>
Date:   Sat May 11 19:48:09 2024 +0200

    [Test Framework] Add a check in `StructureTemplateBuilder#set` to prevent placing block outside template bondaries (neoforged#950)

commit 2d93ce5
Author: embeddedt <[email protected]>
Date:   Sat May 11 01:28:34 2024 -0400

    Delete ItemModelShaper patch (neoforged#952)

commit 018e104
Author: embeddedt <[email protected]>
Date:   Fri May 10 19:58:05 2024 -0400

    Fix more particle culling issues (neoforged#951)

commit 03e346b
Author: TelepathicGrunt <[email protected]>
Date:   Fri May 10 12:14:37 2024 -0400

    Fix MC-268617 to allow valid filepaths in Minecraft (neoforged#767)

commit fe57823
Author: TelepathicGrunt <[email protected]>
Date:   Fri May 10 12:02:54 2024 -0400

    Fire Villager/Wandering Trader trade events on /reload (neoforged#922)

commit d0ed10a
Author: TelepathicGrunt <[email protected]>
Date:   Fri May 10 12:02:04 2024 -0400

    Remove Unnecessary Stitcher patch (neoforged#948)

commit a598489
Author: Matyrobbrt <[email protected]>
Date:   Fri May 10 14:44:48 2024 +0300

    Bump Mixin to 0.13.4 to fix local variable issues (neoforged#945)

    Fixes neoforged#768

commit 212f760
Author: sciwhiz12 <[email protected]>
Date:   Fri May 10 10:29:47 2024 +0800

    Fix dedicated server GUI never showing up (neoforged#946)

commit 238a273
Author: embeddedt <[email protected]>
Date:   Thu May 9 17:07:08 2024 -0400

    Add more accurate culling for single quad particles (neoforged#885)

commit 27c5d7a
Author: Brennan Ward <[email protected]>
Date:   Thu May 9 10:50:55 2024 -0700

    Fix FinalizeSpawnEvent for trial spawners and fix SpawnGroupData propagation (neoforged#880)

    Closes neoforged#783
    Closes neoforged#939

commit 989ed3b
Author: TelepathicGrunt <[email protected]>
Date:   Thu May 9 13:40:34 2024 -0400

    [1.20.6] Fix several NeoForge command crashes and allow chat OpenFile click action on Integrated Server  (neoforged#915)
@pupnewfster pupnewfster deleted the sized_ingredient_comparison branch May 29, 2024 00:57
CodexAdrian added a commit to CodexAdrian/NeoForge that referenced this pull request Jun 14, 2024
@CodexAdrian
Squashed commit of the following:
383957f 
commit 8ac9f9c
Author: Minecraftschurli <[email protected]>
Date:   Tue May 21 15:25:59 2024 +0200

    [Testframework] Fix wrapping GameTestAssertException (neoforged#988)

commit 66197fe
Author: Max <[email protected]>
Date:   Sat May 18 20:11:00 2024 +0200

    Add a Fluid Ingredient system as an analogue to vanilla's Ingredient (neoforged#789)

commit b1c3fe0
Author: NeoForged Localizations <[email protected]>
Date:   Sun May 19 00:43:32 2024 +0800

    New Crowdin updates (neoforged#972)

commit a7edbae
Author: Sara Freimer <[email protected]>
Date:   Fri May 17 01:32:34 2024 -0500

    Implement equals and hashCode for SizedIngredients (neoforged#965)

commit e9e8af0
Author: Dennis C <[email protected]>
Date:   Fri May 17 08:31:55 2024 +0200

    [1.20.6] Use extensible enum codec and streamcodec for rarity enum (neoforged#958)

commit 986e0e3
Author: TelepathicGrunt <[email protected]>
Date:   Fri May 17 02:28:12 2024 -0400

    Patch in missing LivingJumpEvent for Slime and Camel (neoforged#966)

commit 2bf3073
Author: TelepathicGrunt <[email protected]>
Date:   Fri May 17 02:26:49 2024 -0400

    Pass growing plant blockstate into onCropsGrowPre for various vine blocks (neoforged#967)

commit 0033435
Author: embeddedt <[email protected]>
Date:   Fri May 17 02:25:24 2024 -0400

    Fix ComputeCameraAngles event applying roll in global space (neoforged#968)

commit bb3537b
Author: TelepathicGrunt <[email protected]>
Date:   Wed May 15 23:02:02 2024 -0400

    [no ci] Remove PitcherCrop patch TODO (neoforged#963)

commit d80f154
Author: TelepathicGrunt <[email protected]>
Date:   Wed May 15 23:01:36 2024 -0400

    [no ci] Fixed Bubble Column gametest template size (neoforged#964)

commit c888a68
Author: Luke Bemish <[email protected]>
Date:   Wed May 15 01:29:03 2024 -0500

    [1.20.6] Add KnownPacks for mods (neoforged#901)

commit a28986f
Author: shartte <[email protected]>
Date:   Mon May 13 09:13:19 2024 +0200

    Update FML to 3.0.29 (neoforged#957)

commit 2aadb61
Author: TelepathicGrunt <[email protected]>
Date:   Sat May 11 14:11:06 2024 -0400

    Make StructureTemplate's Palette caches thread safe (neoforged#954)

commit 2bced72
Author: TelepathicGrunt <[email protected]>
Date:   Sat May 11 13:49:18 2024 -0400

    Address POI memory leak and Generate Command issues (neoforged#937)

    Co-authored-by: embeddedt <[email protected]>

commit abc54b7
Author: Sirttas <[email protected]>
Date:   Sat May 11 19:48:09 2024 +0200

    [Test Framework] Add a check in `StructureTemplateBuilder#set` to prevent placing block outside template bondaries (neoforged#950)

commit 2d93ce5
Author: embeddedt <[email protected]>
Date:   Sat May 11 01:28:34 2024 -0400

    Delete ItemModelShaper patch (neoforged#952)

commit 018e104
Author: embeddedt <[email protected]>
Date:   Fri May 10 19:58:05 2024 -0400

    Fix more particle culling issues (neoforged#951)

commit 03e346b
Author: TelepathicGrunt <[email protected]>
Date:   Fri May 10 12:14:37 2024 -0400

    Fix MC-268617 to allow valid filepaths in Minecraft (neoforged#767)

commit fe57823
Author: TelepathicGrunt <[email protected]>
Date:   Fri May 10 12:02:54 2024 -0400

    Fire Villager/Wandering Trader trade events on /reload (neoforged#922)

commit d0ed10a
Author: TelepathicGrunt <[email protected]>
Date:   Fri May 10 12:02:04 2024 -0400

    Remove Unnecessary Stitcher patch (neoforged#948)

commit a598489
Author: Matyrobbrt <[email protected]>
Date:   Fri May 10 14:44:48 2024 +0300

    Bump Mixin to 0.13.4 to fix local variable issues (neoforged#945)

    Fixes neoforged#768

commit 212f760
Author: sciwhiz12 <[email protected]>
Date:   Fri May 10 10:29:47 2024 +0800

    Fix dedicated server GUI never showing up (neoforged#946)

commit 238a273
Author: embeddedt <[email protected]>
Date:   Thu May 9 17:07:08 2024 -0400

    Add more accurate culling for single quad particles (neoforged#885)

commit 27c5d7a
Author: Brennan Ward <[email protected]>
Date:   Thu May 9 10:50:55 2024 -0700

    Fix FinalizeSpawnEvent for trial spawners and fix SpawnGroupData propagation (neoforged#880)

    Closes neoforged#783
    Closes neoforged#939

commit 989ed3b
Author: TelepathicGrunt <[email protected]>
Date:   Thu May 9 13:40:34 2024 -0400

    [1.20.6] Fix several NeoForge command crashes and allow chat OpenFile click action on Integrated Server  (neoforged#915)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Technici4n Technici4n Technici4n approved these changes

@marchermans marchermans marchermans approved these changes

Assignees
No one assigned
Labels
1.20.6 Targeted at Minecraft 1.20.6
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@pupnewfster @marchermans @Technici4n