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

1.20.5/6 #4347

Open
wants to merge 10 commits into
base: 1.20.4
Choose a base branch
from
Open

1.20.5/6 #4347

wants to merge 10 commits into from
+238 −148

Conversation

wagyourtail
Copy link
Collaborator

No description provided.

wagyourtail
wagyourtail commented Apr 28, 2024
View reviewed changes
src/api/java/baritone/api/utils/BlockOptionalMeta.java
.withParameter(LootContextParams.ORIGIN, Vec3.ZERO)
.withParameter(LootContextParams.BLOCK_STATE, b.defaultBlockState())
.withParameter(LootContextParams.TOOL, new ItemStack(Items.NETHERITE_PICKAXE, 1));
getDrops(block, lv5).stream().map(ItemStack::getItem).forEach(items::add);
Copy link
Collaborator Author

Choose a reason for hiding this comment

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

this didn't work. registry is missing LootTable entries, so needs to be re-built somehow.

Copy link
Contributor

Choose a reason for hiding this comment

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

i put up a gist for how i've initialized these registries for client access: https://gist.github.com/rfresh2/697c3996dbfdfe595c3322f2adfaa4a6 might be possible to simplify this further

Copy link

Choose a reason for hiding this comment

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

does it work now?

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

that appears to work. good enough for now. thanks!
just had to change one line to not deadlock with where I run it :)

@wagyourtail wagyourtail marked this pull request as ready for review May 7, 2024 18:00
@wagyourtail wagyourtail changed the title 1.20.5 1.20.5/6 May 7, 2024
@rfresh2
Copy link
Contributor

rfresh2 commented May 7, 2024

Found a few issues so far:

  • Forge:
    • Mixins are being remapped, they need to be kept in mojmap like neoforge now
  • NeoForge:
    • processResources gradle task needs to be updated to point to neoforge.mods.toml
    • This Neoforge patch is causing an error in MixinClientPlayerEntity$isAllowFlying as they replaced the injection point. Might become more difficult to maintain mod loader agnostic mixins if neo continues making more src patches like this

@ZacSharp ZacSharp mentioned this pull request May 26, 2024
Open
2 tasks
@ZacSharp
Copy link
Collaborator

ZacSharp commented May 26, 2024 •
edited

As mentioned by @Edouard127 in #4354 we also have to update our dependency declarations for neo.
EDIT: Actually, they only mentioned the rename and I picked up the dependency format change from the link they provided.

@Sayrix
Copy link

Sayrix commented May 26, 2024

Seems to work pretty good on Fabric 1.20.6

@wagyourtail @ZacSharp
Update neoforge/src/main/resources/META-INF/neoforge.mods.toml
8bb1979 
Co-authored-by: ZacSharp <68165024+ZacSharp@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ZacSharp ZacSharp ZacSharp left review comments

@rfresh2 rfresh2 rfresh2 left review comments

@TheDerpyCoder TheDerpyCoder TheDerpyCoder left review comments

@Sayrix Sayrix Sayrix approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@wagyourtail @rfresh2 @ZacSharp @Sayrix @TheDerpyCoder