Working 1.21 port (for the most part)#985
Merged
object-Object merged 60 commits intoMay 24, 2026
Merged
Conversation
# Conflicts: # Fabric/build.gradle # Forge/build.gradle # Forge/src/generated/resources/.cache/d4b3e6634c30118e1127c02b727ea285752e5aac # Neoforge/src/main/java/at/petrak/hexcasting/forge/loot/ForgeHexCypherLootMod.java
* Attempted fix of Networking (Incomplete) * Some minor fixes here and there
* Other fixes here and there (fixed up some whole minor folders so that's pretty cool) * Fixed NBTUtils!
* New ContainerInput for Recipes * Various edits to different Items * etc, this is setting up for a merge anyway
…visualizing on impeti scrying sight mishap) Fixed slate rendering both as a block entity and an item stack.
…n Fabric; might overhaul the registry with it. * Registered ItemApiLookups (ParticleSprays function on Fabric!!!) * Readded BrainsweepeeIngredient.getSomeKindOfReasonableIDForEmi(), EMI recipes work for the most part * Fixed Fabric Creative Tabs (mostly)
…r other things. * Fixed Fabric interop naming.
…(Not when erroring) * Adjusted Fabric creative mode tab entries (untested) * Fixed scrolls being unreadable * Fixed rendering artifacts when both toasts and casting stack are present on screen
Reverted NullIota and GarbageIota implementations, Adjusted various things, Got FabricRegister working, etc
Added new MishapEntityNotFound mishap documentation in Patchouli, among other things
… rendering too dark on slates... again
|
+38 406 -23 258 so far. |
Author
|
Waiting for review. |
Updated the push branch in the PR workflow from 'main' to 'indev/1.21.1'.
Updated dependencies and modloader configurations for neoforge.
Comment on lines
+65
to
+73
| @Override | ||
| public void readFromNbt(CompoundTag tag, HolderLookup.Provider registryLookup) { | ||
|
|
||
| } | ||
|
|
||
| @Override | ||
| public void writeToNbt(CompoundTag tag, HolderLookup.Provider registryLookup) { | ||
|
|
||
| } |
Member
There was a problem hiding this comment.
Are these supposed to be empty? Do we need to add a TODO comment or something?
Comment on lines
96
to
97
| // oh havoc, you think you're so funny | ||
| // the worst part is you're /right/ |
Member
There was a problem hiding this comment.
Should this comment be removed (or moved to FabricHexInitializer) since the code it was commenting on is no longer here?
| int messageIdx = 0; | ||
| public static void init(IEventBus modBus) { | ||
| modBus.addListener(RegisterPayloadHandlersEvent.class, ev -> { | ||
| final PayloadRegistrar registar = ev.registrar("1"); |
Member
There was a problem hiding this comment.
Typo: "registar" should be "registrar"
object-Object
approved these changes
May 9, 2026
Member
object-Object
left a comment
object-Object
left a comment
There was a problem hiding this comment.
None of the remaining comments are blocking; I think I'm ok with merging this pretty much as-is and addressing remaining issues in followup PRs. Thanks everyone for your work on this!
…L jars fix(rendering): replace pattern rendering depth with VCDrawHelper depth reversal
this is getting annoying...
object-Object
merged commit bc65193
into
FallingColors:devel/port-1.21
4 of 8 checks passed
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
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.
No description provided.