organize compat mixins

iPortalTeam · Aug 5, 2023 · 2bb2682 · 2bb2682
1 parent 773d352
commit 2bb2682
Show file tree

Hide file tree

Showing 17 changed files with 31 additions and 31 deletions.
diff --git a/...mixin/MixinFlywheelCrumblingRenderer.java → ...wheel/MixinFlywheelCrumblingRenderer.java b/...mixin/MixinFlywheelCrumblingRenderer.java → ...wheel/MixinFlywheelCrumblingRenderer.java
@@ -1,4 +1,4 @@
-package qouteall.imm_ptl.core.compat.mixin;
+package qouteall.imm_ptl.core.compat.mixin.flywheel;
 
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Pseudo;

diff --git a/...t/mixin/MixinFlywheelProgramCompiler.java → ...lywheel/MixinFlywheelProgramCompiler.java b/...t/mixin/MixinFlywheelProgramCompiler.java → ...lywheel/MixinFlywheelProgramCompiler.java
@@ -1,4 +1,4 @@
-package qouteall.imm_ptl.core.compat.mixin;
+package qouteall.imm_ptl.core.compat.mixin.flywheel;
 
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Pseudo;

diff --git a/...pat/mixin/MixinFlywheelQuadConverter.java → .../flywheel/MixinFlywheelQuadConverter.java b/...pat/mixin/MixinFlywheelQuadConverter.java → .../flywheel/MixinFlywheelQuadConverter.java
@@ -1,4 +1,4 @@
-package qouteall.imm_ptl.core.compat.mixin;
+package qouteall.imm_ptl.core.compat.mixin.flywheel;
 
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Pseudo;

diff --git a/...core/compat/mixin/MixinIrisClearPass.java → ...compat/mixin/iris/MixinIrisClearPass.java b/...core/compat/mixin/MixinIrisClearPass.java → ...compat/mixin/iris/MixinIrisClearPass.java
@@ -1,4 +1,4 @@
-package qouteall.imm_ptl.core.compat.mixin;
+package qouteall.imm_ptl.core.compat.mixin.iris;
 
 import net.coderbot.iris.pipeline.ClearPass;
 import org.joml.Vector4f;

diff --git a/...pat/mixin/MixinIrisFinalPassRenderer.java → ...ixin/iris/MixinIrisFinalPassRenderer.java b/...pat/mixin/MixinIrisFinalPassRenderer.java → ...ixin/iris/MixinIrisFinalPassRenderer.java
@@ -1,4 +1,4 @@
-package qouteall.imm_ptl.core.compat.mixin;
+package qouteall.imm_ptl.core.compat.mixin.iris;
 
 import net.coderbot.iris.postprocess.FinalPassRenderer;
 import org.lwjgl.opengl.GL11;

diff --git a/..._ptl/core/compat/mixin/MixinIrisIris.java → ...core/compat/mixin/iris/MixinIrisIris.java b/..._ptl/core/compat/mixin/MixinIrisIris.java → ...core/compat/mixin/iris/MixinIrisIris.java
@@ -1,4 +1,4 @@
-package qouteall.imm_ptl.core.compat.mixin;
+package qouteall.imm_ptl.core.compat.mixin.iris;
 
 import net.coderbot.iris.Iris;
 import org.spongepowered.asm.mixin.Mixin;

diff --git a/...n/MixinIrisNewWorldRenderingPipeline.java → ...s/MixinIrisNewWorldRenderingPipeline.java b/...n/MixinIrisNewWorldRenderingPipeline.java → ...s/MixinIrisNewWorldRenderingPipeline.java
@@ -1,4 +1,4 @@
-package qouteall.imm_ptl.core.compat.mixin;
+package qouteall.imm_ptl.core.compat.mixin.iris;
 
 import net.coderbot.iris.pipeline.newshader.NewWorldRenderingPipeline;
 import org.spongepowered.asm.mixin.Mixin;

diff --git a/...t/mixin/MixinIrisShadowRenderTargets.java → ...in/iris/MixinIrisShadowRenderTargets.java b/...t/mixin/MixinIrisShadowRenderTargets.java → ...in/iris/MixinIrisShadowRenderTargets.java
@@ -1,4 +1,4 @@
-package qouteall.imm_ptl.core.compat.mixin;
+package qouteall.imm_ptl.core.compat.mixin.iris;
 
 import net.coderbot.iris.shadows.ShadowRenderTargets;
 import org.spongepowered.asm.mixin.Mixin;

diff --git a/.../MixinIrisSodiumChunkShaderInterface.java → .../MixinIrisSodiumChunkShaderInterface.java b/.../MixinIrisSodiumChunkShaderInterface.java → .../MixinIrisSodiumChunkShaderInterface.java
@@ -1,4 +1,4 @@
-package qouteall.imm_ptl.core.compat.mixin;
+package qouteall.imm_ptl.core.compat.mixin.iris;
 
 import me.jellysquid.mods.sodium.client.render.chunk.shader.ChunkShaderOptions;
 import net.coderbot.iris.compat.sodium.impl.shader_overrides.IrisChunkShaderInterface;

diff --git a/...MixinIrisSodiumSodiumTerrainPipeline.java → ...MixinIrisSodiumSodiumTerrainPipeline.java b/...MixinIrisSodiumSodiumTerrainPipeline.java → ...MixinIrisSodiumSodiumTerrainPipeline.java
@@ -1,4 +1,4 @@
-package qouteall.imm_ptl.core.compat.mixin;
+package qouteall.imm_ptl.core.compat.mixin.iris;
 
 import com.mojang.blaze3d.shaders.Program;
 import me.jellysquid.mods.sodium.client.render.chunk.vertex.format.ChunkVertexType;

diff --git a/...e/compat/mixin/IESodiumWorldRenderer.java → ...t/mixin/sodium/IESodiumWorldRenderer.java b/...e/compat/mixin/IESodiumWorldRenderer.java → ...t/mixin/sodium/IESodiumWorldRenderer.java
@@ -1,4 +1,4 @@
-package qouteall.imm_ptl.core.compat.mixin;
+package qouteall.imm_ptl.core.compat.mixin.sodium;
 
 import me.jellysquid.mods.sodium.client.render.SodiumWorldRenderer;
 import me.jellysquid.mods.sodium.client.render.chunk.RenderSectionManager;

diff --git a/...ixin/MixinSodiumChunkShaderInterface.java → ...dium/MixinSodiumChunkShaderInterface.java b/...ixin/MixinSodiumChunkShaderInterface.java → ...dium/MixinSodiumChunkShaderInterface.java
@@ -1,4 +1,4 @@
-package qouteall.imm_ptl.core.compat.mixin;
+package qouteall.imm_ptl.core.compat.mixin.sodium;
 
 import me.jellysquid.mods.sodium.client.gl.GlObject;
 import me.jellysquid.mods.sodium.client.render.chunk.shader.ChunkShaderInterface;

diff --git a/...ixin/MixinSodiumRenderSectionManager.java → ...dium/MixinSodiumRenderSectionManager.java b/...ixin/MixinSodiumRenderSectionManager.java → ...dium/MixinSodiumRenderSectionManager.java
@@ -1,4 +1,4 @@
-package qouteall.imm_ptl.core.compat.mixin;
+package qouteall.imm_ptl.core.compat.mixin.sodium;
 
 import me.jellysquid.mods.sodium.client.render.chunk.RenderSectionManager;
 import me.jellysquid.mods.sodium.client.render.chunk.lists.SortedRenderListBuilder;

diff --git a/...compat/mixin/MixinSodiumShaderLoader.java → ...mixin/sodium/MixinSodiumShaderLoader.java b/...compat/mixin/MixinSodiumShaderLoader.java → ...mixin/sodium/MixinSodiumShaderLoader.java
@@ -1,4 +1,4 @@
-package qouteall.imm_ptl.core.compat.mixin;
+package qouteall.imm_ptl.core.compat.mixin.sodium;
 
 import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
 import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;

diff --git a/...ompat/mixin/MixinSodiumWorldRenderer.java → ...ixin/sodium/MixinSodiumWorldRenderer.java b/...ompat/mixin/MixinSodiumWorldRenderer.java → ...ixin/sodium/MixinSodiumWorldRenderer.java
@@ -1,4 +1,4 @@
-package qouteall.imm_ptl.core.compat.mixin;
+package qouteall.imm_ptl.core.compat.mixin.sodium;
 
 import me.jellysquid.mods.sodium.client.render.SodiumWorldRenderer;
 import me.jellysquid.mods.sodium.client.render.viewport.Viewport;

diff --git a/...core/src/main/java/qouteall/imm_ptl/core/compat/sodium_compatibility/SodiumInterface.java b/...core/src/main/java/qouteall/imm_ptl/core/compat/sodium_compatibility/SodiumInterface.java
@@ -12,7 +12,7 @@
 import net.minecraft.client.multiplayer.ClientLevel;
 import net.minecraft.client.renderer.texture.TextureAtlasSprite;
 import org.jetbrains.annotations.Nullable;
-import qouteall.imm_ptl.core.compat.mixin.IESodiumWorldRenderer;
+import qouteall.imm_ptl.core.compat.mixin.sodium.IESodiumWorldRenderer;
 import qouteall.imm_ptl.core.render.FrustumCuller;
 
 @Environment(EnvType.CLIENT)

diff --git a/imm_ptl_core/src/main/resources/imm_ptl_compat.mixins.json b/imm_ptl_core/src/main/resources/imm_ptl_compat.mixins.json
@@ -4,21 +4,21 @@
   "compatibilityLevel": "JAVA_17",
   "plugin": "qouteall.imm_ptl.core.compat.IPCompatMixinPlugin",
   "mixins": [
-    "IESodiumWorldRenderer",
-    "MixinFlywheelCrumblingRenderer",
-    "MixinFlywheelProgramCompiler",
-    "MixinFlywheelQuadConverter",
-    "MixinIrisClearPass",
-    "MixinIrisFinalPassRenderer",
-    "MixinIrisIris",
-    "MixinIrisNewWorldRenderingPipeline",
-    "MixinIrisShadowRenderTargets",
-    "MixinIrisSodiumChunkShaderInterface",
-    "MixinIrisSodiumSodiumTerrainPipeline",
-    "MixinSodiumChunkShaderInterface",
-    "MixinSodiumRenderSectionManager",
-    "MixinSodiumShaderLoader",
-    "MixinSodiumWorldRenderer"
+    "flywheel.MixinFlywheelCrumblingRenderer",
+    "flywheel.MixinFlywheelProgramCompiler",
+    "flywheel.MixinFlywheelQuadConverter",
+    "iris.MixinIrisClearPass",
+    "iris.MixinIrisFinalPassRenderer",
+    "iris.MixinIrisIris",
+    "iris.MixinIrisNewWorldRenderingPipeline",
+    "iris.MixinIrisShadowRenderTargets",
+    "iris.MixinIrisSodiumChunkShaderInterface",
+    "iris.MixinIrisSodiumSodiumTerrainPipeline",
+    "sodium.IESodiumWorldRenderer",
+    "sodium.MixinSodiumChunkShaderInterface",
+    "sodium.MixinSodiumRenderSectionManager",
+    "sodium.MixinSodiumShaderLoader",
+    "sodium.MixinSodiumWorldRenderer"
   ],
   "injectors": {
     "defaultRequire": 1