Align with new Sodium mixin conventions

Technici4n · Aug 26, 2023 · 6f4d0b9 · 6f4d0b9
1 parent 6aad895
commit 6f4d0b9
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 8 deletions.
diff --git a/...ain/java/me/jellysquid/mods/sodium/client/model/light/data/SingleBlockLightDataCache.java b/...ain/java/me/jellysquid/mods/sodium/client/model/light/data/SingleBlockLightDataCache.java
@@ -6,7 +6,7 @@
 import java.util.Arrays;
 
 /**
- * Adaption of {@link ArrayLightDataCache} that stores data for
+ * Adaptation of {@link ArrayLightDataCache} that stores data for
  * only one block and its neighbors.
  */
 public class SingleBlockLightDataCache extends LightDataAccess {

diff --git a/..._non_terrain/MixinBlockModelRenderer.java → ..._non_terrain/BlockModelRendererMixin.java b/..._non_terrain/MixinBlockModelRenderer.java → ..._non_terrain/BlockModelRendererMixin.java
@@ -36,7 +36,7 @@
  * Entrypoint of the FRAPI pipeline for non-terrain block rendering, for the baked models that require it.
  */
 @Mixin(BlockModelRenderer.class)
-public abstract class MixinBlockModelRenderer implements BlockModelRendererExtended {
+public abstract class BlockModelRendererMixin implements BlockModelRendererExtended {
 	@Unique
 	private ThreadLocal<NonTerrainBlockRenderContext> sodium_contexts = ThreadLocal.withInitial(NonTerrainBlockRenderContext::new);
 

diff --git a/..._non_terrain/MixinBlockRenderManager.java → ..._non_terrain/BlockRenderManagerMixin.java b/..._non_terrain/MixinBlockRenderManager.java → ..._non_terrain/BlockRenderManagerMixin.java
@@ -11,7 +11,7 @@
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
 @Mixin(BlockRenderManager.class)
-public class MixinBlockRenderManager {
+public class BlockRenderManagerMixin {
     @Shadow
     private BlockModelRenderer blockModelRenderer;
 

diff --git a/...eatures/frapi/item/MixinItemRenderer.java → ...eatures/frapi/item/ItemRendererMixin.java b/...eatures/frapi/item/MixinItemRenderer.java → ...eatures/frapi/item/ItemRendererMixin.java
@@ -38,7 +38,7 @@
  * Entrypoint of the FRAPI pipeline for item rendering, for the baked models that require it.
  */
 @Mixin(ItemRenderer.class)
-public abstract class MixinItemRenderer {
+public abstract class ItemRendererMixin {
     @Final
     @Shadow
     private ItemColors colors;

diff --git a/src/main/resources/sodium.mixins.json b/src/main/resources/sodium.mixins.json
@@ -32,6 +32,10 @@
     "core.world.map.ClientChunkManagerMixin",
     "core.world.map.ClientPlayNetworkHandlerMixin",
     "core.world.map.ClientWorldMixin",
+    "features.frapi.block_non_terrain.BlockModelRendererMixin",
+    "features.frapi.block_non_terrain.BlockRenderManagerMixin",
+    "features.frapi.item.ItemRendererAccessor",
+    "features.frapi.item.ItemRendererMixin",
     "features.gui.hooks.console.GameRendererMixin",
     "features.gui.hooks.debug.DebugHudMixin",
     "features.gui.hooks.settings.OptionsScreenMixin",
@@ -54,10 +58,6 @@
     "features.render.immediate.buffer_builder.sorting.BufferBuilderMixin",
     "features.render.immediate.buffer_builder.sorting.VertexSorterMixin",
     "features.render.immediate.matrix_stack.MatrixStackMixin",
-    "features.frapi.block_non_terrain.MixinBlockModelRenderer",
-    "features.frapi.block_non_terrain.MixinBlockRenderManager",
-    "features.frapi.item.ItemRendererAccessor",
-    "features.frapi.item.MixinItemRenderer",
     "features.render.immediate.matrix_stack.VertexConsumerMixin",
     "features.render.model.RenderLayersMixin",
     "features.render.model.block.BlockModelRendererMixin",