Mfw

CHANGELOG.md

@@ -1,13 +1 @@
-- Added Flecks, a way to display lines and other features in the world using spells. (@Vlue, @enjarai, @StellarWitch7)
-  - This system will be expanded upon in the future.
-- Added scroll shelves, a way to nicely display and store scrolls in your base. (@enjarai)
-- Implemented a weight system for fragments. (@enjarai)
-  - Overweight fragments may cause a spell to fail.
-  - Weight limits are set quite generously, and are subject to change based on feedback.
-- Modified a bunch of trick signatures to be chainable. (@StellarWitch7)
-- Fix being able to die from mana overuse in creative mode. (@enjarai)
-- Fix scrolling in the hat ui only working for offhand hats. (@enjarai)
-- Partially fixed compatibility with Sodium for shadow blocks. (@enjarai)
-  - Some behaviour is still inconsistent between vanilla and Sodium, but we plan to address this.
-- Implemented a temporary solution for Surveyor (used by Antique Atlas) compat. (@enjarai)
-- Added a keybind for modifying any spell on any item in creative mode. (@Awakened-Redstone)
+- Undid Sodium compat changes temporarily due to a crash on world load. (@enjarai)

gradle.properties

@@ -9,7 +9,7 @@ deps.yarn=1.21+build.2
 loader_version=0.15.11
 
 # Mod Properties
-mod_version=2.0.0-alpha.38
+mod_version=2.0.0-alpha.39
 maven_group=dev.enjarai
 archives_base_name=trickster
 

src/client/java/dev/enjarai/trickster/mixin/client/sodium/ChunkBuilderMeshingTaskMixin.java

@@ -46,16 +46,16 @@ private void preGetComponent(ChunkBuildContext buildContext, CancellationToken c
         shadowMap.set(ModChunkComponents.SHADOW_DISGUISE_MAP.get(world.getChunk(render.getChunkX(), render.getChunkZ())));
     }
 
-    @WrapOperation(
-            method = "execute(Lnet/caffeinemc/mods/sodium/client/render/chunk/compile/ChunkBuildContext;Lnet/caffeinemc/mods/sodium/client/util/task/CancellationToken;)Lnet/caffeinemc/mods/sodium/client/render/chunk/compile/ChunkBuildOutput;",
-            at = @At(
-                    value = "INVOKE",
-                    target = "Lnet/caffeinemc/mods/sodium/client/world/LevelSlice;getBlockState(III)Lnet/minecraft/block/BlockState;"
-            ),
-            remap = false
-    )
-    private BlockState modifyBlockState(LevelSlice instance, int blockX, int blockY, int blockZ, Operation<BlockState> original, @Share("shadow_map") LocalRef<ShadowDisguiseMapComponent> shadowMap) {
-        var customState = shadowMap.get().getFunnyState(blockX, blockY, blockZ);
-        return customState != null ? customState : original.call(instance, blockX, blockY, blockZ);
-    }
+//    @WrapOperation(
+//            method = "execute(Lnet/caffeinemc/mods/sodium/client/render/chunk/compile/ChunkBuildContext;Lnet/caffeinemc/mods/sodium/client/util/task/CancellationToken;)Lnet/caffeinemc/mods/sodium/client/render/chunk/compile/ChunkBuildOutput;",
+//            at = @At(
+//                    value = "INVOKE",
+//                    target = "Lnet/caffeinemc/mods/sodium/client/world/LevelSlice;getBlockState(III)Lnet/minecraft/block/BlockState;"
+//            ),
+//            remap = false
+//    )
+//    private BlockState modifyBlockState(LevelSlice instance, int blockX, int blockY, int blockZ, Operation<BlockState> original, @Share("shadow_map") LocalRef<ShadowDisguiseMapComponent> shadowMap) {
+//        var customState = shadowMap.get().getFunnyState(blockX, blockY, blockZ);
+//        return customState != null ? customState : original.call(instance, blockX, blockY, blockZ);
+//    }
 }