Make organization of platform mixin packages consistent

Fixes #2688
CaffeineMC · Oct 26, 2024 · 90b8762 · 90b8762
1 parent b3c70d5
commit 90b8762
Show file tree

Hide file tree

Showing 22 changed files with 44 additions and 44 deletions.
diff --git a/...abric/core/model/quad/BakedQuadMixin.java → ...mixin/core/model/quad/BakedQuadMixin.java b/...abric/core/model/quad/BakedQuadMixin.java → ...mixin/core/model/quad/BakedQuadMixin.java
@@ -1,4 +1,4 @@
-package net.caffeinemc.mods.sodium.mixin.fabric.core.model.quad;
+package net.caffeinemc.mods.sodium.mixin.core.model.quad;
 
 import net.caffeinemc.mods.sodium.client.model.quad.BakedQuadView;
 import net.caffeinemc.mods.sodium.client.model.quad.properties.ModelQuadFacing;

diff --git a/...tures/model/MultiPartBakedModelMixin.java → ...tures/model/MultiPartBakedModelMixin.java b/...tures/model/MultiPartBakedModelMixin.java → ...tures/model/MultiPartBakedModelMixin.java
@@ -1,4 +1,4 @@
-package net.caffeinemc.mods.sodium.mixin.fabric.features.model;
+package net.caffeinemc.mods.sodium.mixin.features.model;
 
 import it.unimi.dsi.fastutil.objects.Reference2ReferenceOpenHashMap;
 import net.minecraft.client.renderer.block.model.BakedQuad;

diff --git a/...atures/model/WeightedBakedModelMixin.java → ...atures/model/WeightedBakedModelMixin.java b/...atures/model/WeightedBakedModelMixin.java → ...atures/model/WeightedBakedModelMixin.java
@@ -1,4 +1,4 @@
-package net.caffeinemc.mods.sodium.mixin.fabric.features.model;
+package net.caffeinemc.mods.sodium.mixin.features.model;
 
 import net.minecraft.client.renderer.block.model.BakedQuad;
 import net.minecraft.client.resources.model.BakedModel;

diff --git a/.../model/block/ModelBlockRendererMixin.java → .../model/block/ModelBlockRendererMixin.java b/.../model/block/ModelBlockRendererMixin.java → .../model/block/ModelBlockRendererMixin.java
@@ -1,4 +1,4 @@
-package net.caffeinemc.mods.sodium.mixin.fabric.features.render.model.block;
+package net.caffeinemc.mods.sodium.mixin.features.render.model.block;
 
 import com.mojang.blaze3d.vertex.PoseStack;
 import com.mojang.blaze3d.vertex.VertexConsumer;

diff --git a/...bric/features/world/biome/BiomeMixin.java → ...ixin/features/world/biome/BiomeMixin.java b/...bric/features/world/biome/BiomeMixin.java → ...ixin/features/world/biome/BiomeMixin.java
@@ -1,4 +1,4 @@
-package net.caffeinemc.mods.sodium.mixin.fabric.features.world.biome;
+package net.caffeinemc.mods.sodium.mixin.features.world.biome;
 
 import net.caffeinemc.mods.sodium.client.world.biome.BiomeColorMaps;
 import net.minecraft.util.Mth;

diff --git a/fabric/src/main/resources/sodium-fabric.mixins.json b/fabric/src/main/resources/sodium-fabric.mixins.json
@@ -1,5 +1,5 @@
 {
-  "package": "net.caffeinemc.mods.sodium.mixin.fabric",
+  "package": "net.caffeinemc.mods.sodium.mixin",
   "required": true,
   "compatibilityLevel": "JAVA_17",
   "injectors": {
@@ -9,10 +9,10 @@
     "conformVisibility": true
   },
   "client": [
-    "core.model.quad.BakedQuadMixin",
-    "features.model.MultiPartBakedModelMixin",
-    "features.model.WeightedBakedModelMixin",
-    "features.render.model.block.ModelBlockRendererMixin",
-    "features.world.biome.BiomeMixin"
+      "core.model.quad.BakedQuadMixin",
+      "features.model.MultiPartBakedModelMixin",
+      "features.model.WeightedBakedModelMixin",
+      "features.render.model.block.ModelBlockRendererMixin",
+      "features.world.biome.BiomeMixin"
   ]
 }
diff --git a/neoforge/build.gradle.kts b/neoforge/build.gradle.kts
@@ -138,4 +138,5 @@ tasks {
     processResources {
         from(configurationCommonModResources)
     }
-}
+}
+
diff --git a/...mixin/core/model/quad/BakedQuadMixin.java → ...mixin/core/model/quad/BakedQuadMixin.java b/...mixin/core/model/quad/BakedQuadMixin.java → ...mixin/core/model/quad/BakedQuadMixin.java
@@ -1,4 +1,4 @@
-package net.caffeinemc.mods.sodium.neoforge.mixin.core.model.quad;
+package net.caffeinemc.mods.sodium.mixin.core.model.quad;
 
 import net.caffeinemc.mods.sodium.client.model.quad.BakedQuadView;
 import net.caffeinemc.mods.sodium.client.model.quad.properties.ModelQuadFacing;

diff --git a/...tures/model/MultiPartBakedModelMixin.java → ...tures/model/MultiPartBakedModelMixin.java b/...tures/model/MultiPartBakedModelMixin.java → ...tures/model/MultiPartBakedModelMixin.java
@@ -1,8 +1,8 @@
-package net.caffeinemc.mods.sodium.neoforge.mixin.features.model;
+package net.caffeinemc.mods.sodium.mixin.features.model;
 
 import it.unimi.dsi.fastutil.objects.Reference2ReferenceOpenHashMap;
-import net.caffeinemc.mods.sodium.neoforge.mixin.ChunkRenderTypeSetAccessor;
-import net.caffeinemc.mods.sodium.neoforge.mixin.SimpleBakedModelAccessor;
+import net.caffeinemc.mods.sodium.mixin.platform.neoforge.ChunkRenderTypeSetAccessor;
+import net.caffeinemc.mods.sodium.mixin.platform.neoforge.SimpleBakedModelAccessor;
 import net.minecraft.client.renderer.ItemBlockRenderTypes;
 import net.minecraft.client.renderer.RenderType;
 import net.minecraft.client.renderer.block.model.BakedQuad;

diff --git a/...atures/model/WeightedBakedModelMixin.java → ...atures/model/WeightedBakedModelMixin.java b/...atures/model/WeightedBakedModelMixin.java → ...atures/model/WeightedBakedModelMixin.java
@@ -1,4 +1,4 @@
-package net.caffeinemc.mods.sodium.neoforge.mixin.features.model;
+package net.caffeinemc.mods.sodium.mixin.features.model;
 
 import net.minecraft.client.renderer.RenderType;
 import net.minecraft.client.renderer.block.model.BakedQuad;

diff --git a/.../model/block/ModelBlockRendererMixin.java → .../model/block/ModelBlockRendererMixin.java b/.../model/block/ModelBlockRendererMixin.java → .../model/block/ModelBlockRendererMixin.java
@@ -1,4 +1,4 @@
-package net.caffeinemc.mods.sodium.neoforge.mixin.features.render.model.block;
+package net.caffeinemc.mods.sodium.mixin.features.render.model.block;
 
 import com.mojang.blaze3d.vertex.PoseStack;
 import com.mojang.blaze3d.vertex.VertexConsumer;

diff --git a/...ixin/features/world/biome/BiomeMixin.java → ...ixin/features/world/biome/BiomeMixin.java b/...ixin/features/world/biome/BiomeMixin.java → ...ixin/features/world/biome/BiomeMixin.java
@@ -1,4 +1,4 @@
-package net.caffeinemc.mods.sodium.neoforge.mixin.features.world.biome;
+package net.caffeinemc.mods.sodium.mixin.features.world.biome;
 
 import net.caffeinemc.mods.sodium.client.world.biome.BiomeColorMaps;
 import net.minecraft.util.Mth;

diff --git a/...ixin/AbstractBlockRenderContextMixin.java → ...orge/AbstractBlockRenderContextMixin.java b/...ixin/AbstractBlockRenderContextMixin.java → ...orge/AbstractBlockRenderContextMixin.java
@@ -1,4 +1,4 @@
-package net.caffeinemc.mods.sodium.neoforge.mixin;
+package net.caffeinemc.mods.sodium.mixin.platform.neoforge;
 
 import net.caffeinemc.mods.sodium.client.render.frapi.render.AbstractBlockRenderContext;
 import net.caffeinemc.mods.sodium.client.services.SodiumModelData;

diff --git a/...rge/mixin/AuxiliaryLightManagerMixin.java → .../neoforge/AuxiliaryLightManagerMixin.java b/...rge/mixin/AuxiliaryLightManagerMixin.java → .../neoforge/AuxiliaryLightManagerMixin.java
@@ -1,4 +1,4 @@
-package net.caffeinemc.mods.sodium.neoforge.mixin;
+package net.caffeinemc.mods.sodium.mixin.platform.neoforge;
 
 import net.caffeinemc.mods.sodium.client.world.SodiumAuxiliaryLightManager;
 import net.neoforged.neoforge.common.world.AuxiliaryLightManager;

diff --git a/...rge/mixin/ChunkRenderTypeSetAccessor.java → .../neoforge/ChunkRenderTypeSetAccessor.java b/...rge/mixin/ChunkRenderTypeSetAccessor.java → .../neoforge/ChunkRenderTypeSetAccessor.java
@@ -1,4 +1,4 @@
-package net.caffeinemc.mods.sodium.neoforge.mixin;
+package net.caffeinemc.mods.sodium.mixin.platform.neoforge;
 
 import net.neoforged.neoforge.client.ChunkRenderTypeSet;
 import org.spongepowered.asm.mixin.Mixin;

diff --git a/...dium/neoforge/mixin/ClientHooksMixin.java → ...n/platform/neoforge/ClientHooksMixin.java b/...dium/neoforge/mixin/ClientHooksMixin.java → ...n/platform/neoforge/ClientHooksMixin.java
@@ -1,4 +1,4 @@
-package net.caffeinemc.mods.sodium.neoforge.mixin;
+package net.caffeinemc.mods.sodium.mixin.platform.neoforge;
 
 import net.minecraft.client.renderer.texture.TextureAtlasSprite;
 import net.neoforged.neoforge.client.ClientHooks;

diff --git a/...odium/neoforge/mixin/EntrypointMixin.java → ...in/platform/neoforge/EntrypointMixin.java b/...odium/neoforge/mixin/EntrypointMixin.java → ...in/platform/neoforge/EntrypointMixin.java
@@ -1,4 +1,4 @@
-package net.caffeinemc.mods.sodium.neoforge.mixin;
+package net.caffeinemc.mods.sodium.mixin.platform.neoforge;
 
 import net.caffeinemc.mods.sodium.client.SodiumClientMod;
 import net.minecraft.client.Minecraft;

diff --git a/...odium/neoforge/mixin/LevelSliceMixin.java → ...in/platform/neoforge/LevelSliceMixin.java b/...odium/neoforge/mixin/LevelSliceMixin.java → ...in/platform/neoforge/LevelSliceMixin.java
@@ -1,8 +1,7 @@
-package net.caffeinemc.mods.sodium.neoforge.mixin;
+package net.caffeinemc.mods.sodium.mixin.platform.neoforge;
 
 
 import net.caffeinemc.mods.sodium.client.services.SodiumModelData;
-import net.caffeinemc.mods.sodium.client.services.SodiumModelDataContainer;
 import net.caffeinemc.mods.sodium.client.world.LevelSlice;
 import net.caffeinemc.mods.sodium.client.world.SodiumAuxiliaryLightManager;
 import net.minecraft.client.multiplayer.ClientLevel;

diff --git a/...sodium/neoforge/mixin/ModelDataMixin.java → ...xin/platform/neoforge/ModelDataMixin.java b/...sodium/neoforge/mixin/ModelDataMixin.java → ...xin/platform/neoforge/ModelDataMixin.java
@@ -1,4 +1,4 @@
-package net.caffeinemc.mods.sodium.neoforge.mixin;
+package net.caffeinemc.mods.sodium.mixin.platform.neoforge;
 
 import net.caffeinemc.mods.sodium.client.services.SodiumModelData;
 import net.neoforged.neoforge.client.model.data.ModelData;

diff --git a/...oforge/mixin/ResourcePackLoaderMixin.java → ...orm/neoforge/ResourcePackLoaderMixin.java b/...oforge/mixin/ResourcePackLoaderMixin.java → ...orm/neoforge/ResourcePackLoaderMixin.java
@@ -1,4 +1,4 @@
-package net.caffeinemc.mods.sodium.neoforge.mixin;
+package net.caffeinemc.mods.sodium.mixin.platform.neoforge;
 
 import it.unimi.dsi.fastutil.objects.ReferenceLinkedOpenHashSet;
 import net.minecraft.server.packs.repository.Pack;

diff --git a/...forge/mixin/SimpleBakedModelAccessor.java → ...rm/neoforge/SimpleBakedModelAccessor.java b/...forge/mixin/SimpleBakedModelAccessor.java → ...rm/neoforge/SimpleBakedModelAccessor.java
@@ -1,4 +1,4 @@
-package net.caffeinemc.mods.sodium.neoforge.mixin;
+package net.caffeinemc.mods.sodium.mixin.platform.neoforge;
 
 import net.minecraft.client.resources.model.SimpleBakedModel;
 import net.neoforged.neoforge.client.ChunkRenderTypeSet;

diff --git a/neoforge/src/main/resources/sodium-neoforge.mixins.json b/neoforge/src/main/resources/sodium-neoforge.mixins.json
@@ -1,5 +1,5 @@
 {
-  "package" : "net.caffeinemc.mods.sodium.neoforge.mixin",
+  "package" : "net.caffeinemc.mods.sodium.mixin",
   "required" : true,
   "compatibilityLevel" : "JAVA_17",
   "injectors" : {
@@ -9,19 +9,19 @@
     "conformVisibility" : true
   },
   "client" : [
-    "core.model.quad.BakedQuadMixin",
-    "features.model.MultiPartBakedModelMixin",
-    "features.model.WeightedBakedModelMixin",
-    "features.render.model.block.ModelBlockRendererMixin",
-    "features.world.biome.BiomeMixin",
-    "AbstractBlockRenderContextMixin",
-    "AuxiliaryLightManagerMixin",
-    "ChunkRenderTypeSetAccessor",
-    "ClientHooksMixin",
-    "EntrypointMixin",
-    "LevelSliceMixin",
-    "ModelDataMixin",
-    "ResourcePackLoaderMixin",
-    "SimpleBakedModelAccessor"
+      "core.model.quad.BakedQuadMixin",
+      "features.model.MultiPartBakedModelMixin",
+      "features.model.WeightedBakedModelMixin",
+      "features.render.model.block.ModelBlockRendererMixin",
+      "features.world.biome.BiomeMixin",
+      "platform.neoforge.AbstractBlockRenderContextMixin",
+      "platform.neoforge.AuxiliaryLightManagerMixin",
+      "platform.neoforge.ChunkRenderTypeSetAccessor",
+      "platform.neoforge.ClientHooksMixin",
+      "platform.neoforge.EntrypointMixin",
+      "platform.neoforge.LevelSliceMixin",
+      "platform.neoforge.ModelDataMixin",
+      "platform.neoforge.ResourcePackLoaderMixin",
+      "platform.neoforge.SimpleBakedModelAccessor"
   ]
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -138,4 +138,5 @@ tasks { @@
         processResources {
             from(configurationCommonModResources)
         }
-    }
+    }