Initial 1.21 support #192
Initial 1.21 support #192
Conversation
* fix samolego#137 (init): speak distance, requires some testing * fix: removed refmap field in common.mixins.json, fixed crash - Replacement was not anywhere in build setup - Loom automatically adds the right refmap anyway, no need to explicitly define it * removed commented code (lol)
Updated mod_version to ensure compatibility with FabricTailor is retained
Initialised an empty JsonObject to ensure the mod doesn't trip over lang being null. Has the odd side effect of allowing the GUI to start working.
Updated the path to the language files within the .jar. Note that it loads from within it, NOT from the filepath in the config folder.
Commented out SEVER_TRANSLATIONS reference because it was blocking any attempt to read from the language.json files in toto. This may be removed in future as it doesn't seem to apply anywhere else in the codebase, and was returning nothing that could be used by the functions seeking translation.
Generated temporary UUID to keep GameProfile from crashing the server when it tries to generate a result using a null uuid entry.
Fix syntax error for defining JsonObject
This just seems to be dead code. It throws an error at build when not commented out, but doesn't seem to affect mod function. Most of the imports can be removed, too.
Introduced the concept of modEntity, which is a part of an NPC's definition, and which maps directly to the Entity Type in CAPS.
Added the hashmaps for the entity list and player entity so that we can track and manipulate them with ease when setting TYPE.
We make the necessary changes to allow player TYPE to be edited and for it to persist across world / game loads.
Loose bracket...
Changes to exclude disguiselib (polymer provides that function), servertranslations (unsure of 1.21 version support, but doesn't impact most mod function), and updated Java build versions and targets inline with the requirements for 1.21
Updated the Fabric Properties to 1.21 requirements. Updated the mod_version, and dependencies that support 1.21
toJson and fromJson now need a provider as the final argument when invoked. Currently nulled, and seems to work fine. May require more investigation later.
Commented out the openEditorGui code (and import) since we've disabled the GUI for now as part of the 1.21 update. The issues is tied to ItemStacks and whether we'll stick to the official mappings or Yarn going forward.
Changes to ResourceLocation introduced in Minecraft 1.21
Commented out the teleport command for now. TODO work to correct its implementation with Minecraft 1.21 changes.
Updated the ResourceLocation code to match Minecraft 1.21 support
Temporarily disables the teleport command while working out the 1.21 Minecraft changes.
Updated to address the ResourceLocation changes in 1.21
Updated to address the ResourceLocation changes for 1.21
Error when running prior diff. Corrected the corrected ResourceLocation fix.
Corrected error from prior diff. Related to the ResourceLocation fix.
Updated the ResourceLocation implementation in accordance with 1.21
Updated ResourceLocation usage in accordance with the 1.21 ResourceLocation implementation.
Commenting out the DisguiseLib support for now, as Polymer provides the entity type modification interface.
Updated the ResourceLocation code in accordance with the 1.21 ResourceLocation changes.
Updated fromJson implementation with changes to Serializer with Minecraft 1.21
Significant changes throughout: - setMaxUpStep is removed from 1.20.5 - ResourceLocation changes to meet 1.21 - dropCustomDeathLoot issues to be resolved - isLeashed issues to be resolved - Projectile related issues to be resolved - Issues with data.removeIf implementation to be resolved -
Updated ResourceLocation code to 1.21 implementation. Commented out ClientBoundCustomPayloadPacket code as it still needs work to meet 1.21. Query whether Bungee support is still required in the mod.
Updated the ResourceLocation code to meet 1.21
Fixed spelling mistake. Main update was to temporarily comment out the EditorGUI functions.
Commented out issues with itemStack implementation that haven't been resolved to the 1.21 implementation yet. As such, the GUIs have been disabled for now.
Commented out issues with itemStack implementation that haven't been resolved to the 1.21 implementation yet. As such, the GUIs have been disabled for now.
Commented out issues with itemStack implementation that haven't been resolved to the 1.21 implementation yet. As such, the GUIs have been disabled for now.
Since polymer can handle the disguises, I think the special dishuiselib compatibility should be removed. Might be worth to implement migration though 🤔 ? The Bungee can be fixed later ig. |
|
From what I could see, the polymer entity disguise integration is fully integrated. I've left what I saw of the Disguiselib commented out and there's been no change to mod function. I'm sure I'm missing something, though. Bungee stuff is breaking due to 1.21 changes to some packet handling and I wasn't able to work it out in the time I gave the problem, so I just disabled it. The primary purpose of this build, I guess, is proof of concept of it working on 1.21. I'm still not hugely encouraged by the sweeping 1.20.5+ changes that took place, and am still trying to find how anyone has done a vanilla implementation of those changes. Your build process is failing because it needs to be Java 23 (really 21+, but I set the wrapper to 23). The Minecraft changelogs indicate a minimum Java version of 21 from now on. |
|
I'm sorry, somehow I managed to merge into your branch! |
|
I take it you were able to roll it back? I can't see in either branch that it's been stomped by the other one. And people say that local repositories are bad... I can always rebuild my branch from my local, but it seems fine. |
Pull Request to introduce back my 1.21 initial build to the parent codebase.
As the polymer-rewrite branch was for 1.20.4 support and there's no 1.21 branch, I'm putting through the PR against master.
Details of the changes are described in the commits, as well as the release notes over on the working build I've released 1.15.5.
A decision needs to be made as to whether Bungee support is still worthwhile from 1.21 onwards, and whether the DisguiseLib integration should be removed now that polymer does that function.
I'm not sure how much more I'll get done with this mod, but I'll keep trying to fix the remaining bugs I've identified.