From d78cf81eaecba514f2dc12b168d80a6717acbd6d Mon Sep 17 00:00:00 2001 From: embeddedt <42941056+embeddedt@users.noreply.github.com> Date: Sat, 14 Sep 2024 19:25:30 -0400 Subject: [PATCH] Revert "Move mixins to their own sourceset" This reverts commit 5f2be94984752ed523ef54de0ef8e0bab01f3aba. --- build.gradle.kts | 8 ++++---- .../vertex/VertexFormatDescriptionImpl.java | 3 ++- .../sodium/client/util/NativeImageHelper.java | 5 ++--- .../mods/sodium/mixin}/MixinClassValidator.java | 2 +- .../mods/sodium/mixin/MixinConfig.java | 0 .../mods/sodium/mixin/MixinOption.java | 0 .../mods/sodium/mixin/SodiumMixinPlugin.java | 1 - .../mixin/core/CrashReportExtenderMixin.java | 0 .../sodium/mixin/core/MinecraftClientMixin.java | 9 +-------- .../core/gui/DownloadingTerrainScreenMixin.java | 0 .../mixin/core/model/BakedModelMixin.java | 0 .../model/SimpleBakedModelBuilderMixin.java | 0 .../core/model/colors/BlockColorsMixin.java | 0 .../core/model/colors/ItemColorsMixin.java | 0 .../core/model/quad/BakedQuadFactoryMixin.java | 0 .../mixin/core/model/quad/BakedQuadMixin.java | 0 .../core/postprocess/PostprocessorMixin.java | 0 .../mixin/core/render/MatrixStackMixin.java | 0 .../mixin/core/render/MinecraftAccessor.java | 11 +++++++++++ .../mixin/core/render/VertexFormatAccessor.java | 0 .../mixin/core/render/frustum/FrustumMixin.java | 0 .../immediate/consumer/BufferBuilderMixin.java | 0 .../consumer/OutlineVertexConsumerMixin.java | 0 .../consumer/OverlayVertexConsumerMixin.java | 0 .../SpriteTexturedVertexConsumerMixin.java | 0 .../consumer/VertexConsumersMixin.java | 0 .../core/render/world/ChunkBuilderMixin.java | 0 .../core/render/world/WorldRendererMixin.java | 0 .../core/world/biome/ClientWorldMixin.java | 0 .../world/chunk/EmptyPaletteStorageMixin.java | 0 .../world/chunk/PackedIntegerArrayMixin.java | 0 .../world/chunk/PalettedContainerMixin.java | 0 .../map/ClientPlayNetworkHandlerMixin.java | 0 .../mixin/core/world/map/ClientWorldMixin.java | 0 .../gui/hooks/console/GameRendererMixin.java | 0 .../features/gui/hooks/debug/DebugHudMixin.java | 0 .../gui/hooks/settings/OptionsScreenMixin.java | 0 .../gui/screen/LevelLoadingScreenMixin.java | 0 .../mixin/features/model/BlockElementMixin.java | 0 .../mixin/features/model/ModelBakeryMixin.java | 0 .../features/model/ModelDataBuilderMixin.java | 0 .../mixin/features/model/ModelDataMixin.java | 0 .../model/MultipartBakedModelMixin.java | 0 .../model/SimpleBakedModelAccessor.java | 0 .../features/model/SimpleBakedModelMixin.java | 0 .../features/model/WeightedBakedModelMixin.java | 0 .../options/overlays/InGameHudMixin.java | 0 .../overlays/VanillaGuiOverlayMixin.java | 0 .../options/render_layers/LeavesBlockMixin.java | 0 .../render_layers/RenderLayersMixin.java | 0 .../options/weather/WorldRendererMixin.java | 0 .../render/entity/cull/EntityRendererMixin.java | 0 .../render/entity/fast_render/CuboidMixin.java | 0 .../entity/fast_render/ModelPartMixin.java | 0 .../remove_streams/HierarchicalModelMixin.java | 0 .../entity/remove_streams/ModelPartMixin.java | 0 .../shadows/EntityRenderDispatcherMixin.java | 0 .../gui/debug/DebugScreenOverlayAccessor.java | 0 .../render/gui/debug/ForgeGuiMixin.java | 0 .../features/render/gui/font/FontSetMixin.java | 0 .../render/gui/font/GlyphRendererMixin.java | 0 .../render/gui/outlines/WorldRendererMixin.java | 0 .../render/immediate/DirectionMixin.java | 0 .../buffer_builder/BufferBuilderMixin.java | 0 .../buffer_builder/VertexBufferMixin.java | 0 .../buffer_builder/VertexFormatMixin.java | 0 .../fast_delegate/BufferSourceMixin.java | 0 .../intrinsics/BufferBuilderMixin.java | 0 .../sorting/BufferBuilderMixin.java | 0 .../sorting/VertexSorterMixin.java | 0 .../matrix_stack/VertexConsumerMixin.java | 0 .../render/model/ChunkRenderTypeSetMixin.java | 0 .../render/model/RenderLayersMixin.java | 0 .../model/block/BlockModelRendererMixin.java | 0 .../render/model/item/ItemRendererMixin.java | 0 .../render/particle/BillboardParticleMixin.java | 0 .../features/render/world/ClientLevelMixin.java | 0 .../render/world/clouds/WorldRendererMixin.java | 0 .../world/sky/BackgroundRendererMixin.java | 0 .../render/world/sky/ClientWorldMixin.java | 0 .../render/world/sky/WorldRendererMixin.java | 0 .../shader/uniform/ShaderProgramMixin.java | 0 .../features/textures/NativeImageAccessor.java | 0 .../textures/SpriteContentsInvoker.java | 0 .../tracking/BlockModelRendererMixin.java | 0 .../animations/tracking/DrawContextMixin.java | 0 .../tracking/SpriteAtlasTextureMixin.java | 0 .../tracking/SpriteBillboardParticleMixin.java | 0 .../SpriteContentsAnimationAccessor.java | 0 .../SpriteContentsAnimationFrameAccessor.java | 0 .../SpriteContentsAnimatorImplMixin.java | 0 .../tracking/SpriteContentsMixin.java | 0 .../animations/tracking/SpriteMixin.java | 0 .../upload/SpriteContentsAccessor.java | 0 .../upload/SpriteContentsAnimationAccessor.java | 0 .../SpriteContentsAnimationFrameAccessor.java | 0 .../SpriteContentsAnimatorImplAccessor.java | 0 .../SpriteContentsInterpolationMixin.java | 0 .../textures/mipmaps/MipmapHelperMixin.java | 0 .../textures/mipmaps/SpriteContentsMixin.java | 0 .../mixin/features/world/biome/BiomeMixin.java | 0 .../ItemRenderContextMixin.java | 0 .../context_creation/WindowMixin.java | 0 .../event_loop/RenderSystemMixin.java | 0 .../impl/mixinterface/MinecraftAccessor.java | 5 ----- .../impl/mixinterface/NativeImageAccessor.java | 5 ----- .../chunk/compile/GlobalChunkBuildContext.java | 2 +- .../embeddium/taint/scanning/TaintDetector.java | 1 + .../resources/embeddium.mixins.json | 0 .../features/textures/NativeImageMixin.java | 17 ----------------- 110 files changed, 23 insertions(+), 46 deletions(-) rename src/main/java/{org/embeddedt/embeddium/taint/scanning => me/jellysquid/mods/sodium/mixin}/MixinClassValidator.java (96%) rename src/{mixin => main}/java/me/jellysquid/mods/sodium/mixin/MixinConfig.java (100%) rename src/{mixin => main}/java/me/jellysquid/mods/sodium/mixin/MixinOption.java (100%) rename src/{mixin => main}/java/me/jellysquid/mods/sodium/mixin/SodiumMixinPlugin.java (98%) rename src/{mixin => main}/java/me/jellysquid/mods/sodium/mixin/core/CrashReportExtenderMixin.java (100%) rename src/{mixin => main}/java/me/jellysquid/mods/sodium/mixin/core/MinecraftClientMixin.java (94%) rename src/{mixin => main}/java/me/jellysquid/mods/sodium/mixin/core/gui/DownloadingTerrainScreenMixin.java (100%) rename src/{mixin => main}/java/me/jellysquid/mods/sodium/mixin/core/model/BakedModelMixin.java (100%) rename src/{mixin => main}/java/me/jellysquid/mods/sodium/mixin/core/model/SimpleBakedModelBuilderMixin.java (100%) rename src/{mixin => main}/java/me/jellysquid/mods/sodium/mixin/core/model/colors/BlockColorsMixin.java (100%) rename src/{mixin => main}/java/me/jellysquid/mods/sodium/mixin/core/model/colors/ItemColorsMixin.java (100%) rename src/{mixin => main}/java/me/jellysquid/mods/sodium/mixin/core/model/quad/BakedQuadFactoryMixin.java (100%) rename src/{mixin => main}/java/me/jellysquid/mods/sodium/mixin/core/model/quad/BakedQuadMixin.java (100%) rename src/{mixin => main}/java/me/jellysquid/mods/sodium/mixin/core/postprocess/PostprocessorMixin.java (100%) rename src/{mixin => main}/java/me/jellysquid/mods/sodium/mixin/core/render/MatrixStackMixin.java (100%) create mode 100644 src/main/java/me/jellysquid/mods/sodium/mixin/core/render/MinecraftAccessor.java rename src/{mixin => main}/java/me/jellysquid/mods/sodium/mixin/core/render/VertexFormatAccessor.java (100%) rename src/{mixin => main}/java/me/jellysquid/mods/sodium/mixin/core/render/frustum/FrustumMixin.java (100%) rename src/{mixin => main}/java/me/jellysquid/mods/sodium/mixin/core/render/immediate/consumer/BufferBuilderMixin.java (100%) rename src/{mixin => main}/java/me/jellysquid/mods/sodium/mixin/core/render/immediate/consumer/OutlineVertexConsumerMixin.java (100%) rename src/{mixin => main}/java/me/jellysquid/mods/sodium/mixin/core/render/immediate/consumer/OverlayVertexConsumerMixin.java (100%) rename src/{mixin => main}/java/me/jellysquid/mods/sodium/mixin/core/render/immediate/consumer/SpriteTexturedVertexConsumerMixin.java (100%) rename src/{mixin => main}/java/me/jellysquid/mods/sodium/mixin/core/render/immediate/consumer/VertexConsumersMixin.java (100%) rename src/{mixin => main}/java/me/jellysquid/mods/sodium/mixin/core/render/world/ChunkBuilderMixin.java (100%) rename src/{mixin => main}/java/me/jellysquid/mods/sodium/mixin/core/render/world/WorldRendererMixin.java (100%) rename src/{mixin => main}/java/me/jellysquid/mods/sodium/mixin/core/world/biome/ClientWorldMixin.java (100%) rename src/{mixin => main}/java/me/jellysquid/mods/sodium/mixin/core/world/chunk/EmptyPaletteStorageMixin.java (100%) rename src/{mixin => main}/java/me/jellysquid/mods/sodium/mixin/core/world/chunk/PackedIntegerArrayMixin.java (100%) rename src/{mixin => main}/java/me/jellysquid/mods/sodium/mixin/core/world/chunk/PalettedContainerMixin.java (100%) rename src/{mixin => main}/java/me/jellysquid/mods/sodium/mixin/core/world/map/ClientPlayNetworkHandlerMixin.java (100%) rename src/{mixin => main}/java/me/jellysquid/mods/sodium/mixin/core/world/map/ClientWorldMixin.java (100%) rename src/{mixin => main}/java/me/jellysquid/mods/sodium/mixin/features/gui/hooks/console/GameRendererMixin.java (100%) rename src/{mixin => main}/java/me/jellysquid/mods/sodium/mixin/features/gui/hooks/debug/DebugHudMixin.java (100%) rename src/{mixin => main}/java/me/jellysquid/mods/sodium/mixin/features/gui/hooks/settings/OptionsScreenMixin.java (100%) rename src/{mixin => main}/java/me/jellysquid/mods/sodium/mixin/features/gui/screen/LevelLoadingScreenMixin.java (100%) rename src/{mixin => main}/java/me/jellysquid/mods/sodium/mixin/features/model/BlockElementMixin.java (100%) rename src/{mixin => main}/java/me/jellysquid/mods/sodium/mixin/features/model/ModelBakeryMixin.java (100%) rename src/{mixin => main}/java/me/jellysquid/mods/sodium/mixin/features/model/ModelDataBuilderMixin.java (100%) rename src/{mixin => main}/java/me/jellysquid/mods/sodium/mixin/features/model/ModelDataMixin.java (100%) rename src/{mixin => main}/java/me/jellysquid/mods/sodium/mixin/features/model/MultipartBakedModelMixin.java (100%) rename src/{mixin => main}/java/me/jellysquid/mods/sodium/mixin/features/model/SimpleBakedModelAccessor.java (100%) rename src/{mixin => main}/java/me/jellysquid/mods/sodium/mixin/features/model/SimpleBakedModelMixin.java (100%) rename src/{mixin => main}/java/me/jellysquid/mods/sodium/mixin/features/model/WeightedBakedModelMixin.java (100%) rename src/{mixin => main}/java/me/jellysquid/mods/sodium/mixin/features/options/overlays/InGameHudMixin.java (100%) rename src/{mixin => main}/java/me/jellysquid/mods/sodium/mixin/features/options/overlays/VanillaGuiOverlayMixin.java (100%) rename src/{mixin => main}/java/me/jellysquid/mods/sodium/mixin/features/options/render_layers/LeavesBlockMixin.java (100%) rename src/{mixin => main}/java/me/jellysquid/mods/sodium/mixin/features/options/render_layers/RenderLayersMixin.java (100%) rename src/{mixin => main}/java/me/jellysquid/mods/sodium/mixin/features/options/weather/WorldRendererMixin.java (100%) rename src/{mixin => main}/java/me/jellysquid/mods/sodium/mixin/features/render/entity/cull/EntityRendererMixin.java (100%) rename src/{mixin => main}/java/me/jellysquid/mods/sodium/mixin/features/render/entity/fast_render/CuboidMixin.java (100%) rename src/{mixin => main}/java/me/jellysquid/mods/sodium/mixin/features/render/entity/fast_render/ModelPartMixin.java (100%) rename src/{mixin => main}/java/me/jellysquid/mods/sodium/mixin/features/render/entity/remove_streams/HierarchicalModelMixin.java (100%) rename src/{mixin => main}/java/me/jellysquid/mods/sodium/mixin/features/render/entity/remove_streams/ModelPartMixin.java (100%) rename src/{mixin => main}/java/me/jellysquid/mods/sodium/mixin/features/render/entity/shadows/EntityRenderDispatcherMixin.java (100%) rename src/{mixin => main}/java/me/jellysquid/mods/sodium/mixin/features/render/gui/debug/DebugScreenOverlayAccessor.java (100%) rename src/{mixin => main}/java/me/jellysquid/mods/sodium/mixin/features/render/gui/debug/ForgeGuiMixin.java (100%) rename src/{mixin => main}/java/me/jellysquid/mods/sodium/mixin/features/render/gui/font/FontSetMixin.java (100%) rename src/{mixin => main}/java/me/jellysquid/mods/sodium/mixin/features/render/gui/font/GlyphRendererMixin.java (100%) rename src/{mixin => main}/java/me/jellysquid/mods/sodium/mixin/features/render/gui/outlines/WorldRendererMixin.java (100%) rename src/{mixin => main}/java/me/jellysquid/mods/sodium/mixin/features/render/immediate/DirectionMixin.java (100%) rename src/{mixin => main}/java/me/jellysquid/mods/sodium/mixin/features/render/immediate/buffer_builder/BufferBuilderMixin.java (100%) rename src/{mixin => main}/java/me/jellysquid/mods/sodium/mixin/features/render/immediate/buffer_builder/VertexBufferMixin.java (100%) rename src/{mixin => main}/java/me/jellysquid/mods/sodium/mixin/features/render/immediate/buffer_builder/VertexFormatMixin.java (100%) rename src/{mixin => main}/java/me/jellysquid/mods/sodium/mixin/features/render/immediate/buffer_builder/fast_delegate/BufferSourceMixin.java (100%) rename src/{mixin => main}/java/me/jellysquid/mods/sodium/mixin/features/render/immediate/buffer_builder/intrinsics/BufferBuilderMixin.java (100%) rename src/{mixin => main}/java/me/jellysquid/mods/sodium/mixin/features/render/immediate/buffer_builder/sorting/BufferBuilderMixin.java (100%) rename src/{mixin => main}/java/me/jellysquid/mods/sodium/mixin/features/render/immediate/buffer_builder/sorting/VertexSorterMixin.java (100%) rename src/{mixin => main}/java/me/jellysquid/mods/sodium/mixin/features/render/immediate/matrix_stack/VertexConsumerMixin.java (100%) rename src/{mixin => main}/java/me/jellysquid/mods/sodium/mixin/features/render/model/ChunkRenderTypeSetMixin.java (100%) rename src/{mixin => main}/java/me/jellysquid/mods/sodium/mixin/features/render/model/RenderLayersMixin.java (100%) rename src/{mixin => main}/java/me/jellysquid/mods/sodium/mixin/features/render/model/block/BlockModelRendererMixin.java (100%) rename src/{mixin => main}/java/me/jellysquid/mods/sodium/mixin/features/render/model/item/ItemRendererMixin.java (100%) rename src/{mixin => main}/java/me/jellysquid/mods/sodium/mixin/features/render/particle/BillboardParticleMixin.java (100%) rename src/{mixin => main}/java/me/jellysquid/mods/sodium/mixin/features/render/world/ClientLevelMixin.java (100%) rename src/{mixin => main}/java/me/jellysquid/mods/sodium/mixin/features/render/world/clouds/WorldRendererMixin.java (100%) rename src/{mixin => main}/java/me/jellysquid/mods/sodium/mixin/features/render/world/sky/BackgroundRendererMixin.java (100%) rename src/{mixin => main}/java/me/jellysquid/mods/sodium/mixin/features/render/world/sky/ClientWorldMixin.java (100%) rename src/{mixin => main}/java/me/jellysquid/mods/sodium/mixin/features/render/world/sky/WorldRendererMixin.java (100%) rename src/{mixin => main}/java/me/jellysquid/mods/sodium/mixin/features/shader/uniform/ShaderProgramMixin.java (100%) rename src/{mixin => main}/java/me/jellysquid/mods/sodium/mixin/features/textures/NativeImageAccessor.java (100%) rename src/{mixin => main}/java/me/jellysquid/mods/sodium/mixin/features/textures/SpriteContentsInvoker.java (100%) rename src/{mixin => main}/java/me/jellysquid/mods/sodium/mixin/features/textures/animations/tracking/BlockModelRendererMixin.java (100%) rename src/{mixin => main}/java/me/jellysquid/mods/sodium/mixin/features/textures/animations/tracking/DrawContextMixin.java (100%) rename src/{mixin => main}/java/me/jellysquid/mods/sodium/mixin/features/textures/animations/tracking/SpriteAtlasTextureMixin.java (100%) rename src/{mixin => main}/java/me/jellysquid/mods/sodium/mixin/features/textures/animations/tracking/SpriteBillboardParticleMixin.java (100%) rename src/{mixin => main}/java/me/jellysquid/mods/sodium/mixin/features/textures/animations/tracking/SpriteContentsAnimationAccessor.java (100%) rename src/{mixin => main}/java/me/jellysquid/mods/sodium/mixin/features/textures/animations/tracking/SpriteContentsAnimationFrameAccessor.java (100%) rename src/{mixin => main}/java/me/jellysquid/mods/sodium/mixin/features/textures/animations/tracking/SpriteContentsAnimatorImplMixin.java (100%) rename src/{mixin => main}/java/me/jellysquid/mods/sodium/mixin/features/textures/animations/tracking/SpriteContentsMixin.java (100%) rename src/{mixin => main}/java/me/jellysquid/mods/sodium/mixin/features/textures/animations/tracking/SpriteMixin.java (100%) rename src/{mixin => main}/java/me/jellysquid/mods/sodium/mixin/features/textures/animations/upload/SpriteContentsAccessor.java (100%) rename src/{mixin => main}/java/me/jellysquid/mods/sodium/mixin/features/textures/animations/upload/SpriteContentsAnimationAccessor.java (100%) rename src/{mixin => main}/java/me/jellysquid/mods/sodium/mixin/features/textures/animations/upload/SpriteContentsAnimationFrameAccessor.java (100%) rename src/{mixin => main}/java/me/jellysquid/mods/sodium/mixin/features/textures/animations/upload/SpriteContentsAnimatorImplAccessor.java (100%) rename src/{mixin => main}/java/me/jellysquid/mods/sodium/mixin/features/textures/animations/upload/SpriteContentsInterpolationMixin.java (100%) rename src/{mixin => main}/java/me/jellysquid/mods/sodium/mixin/features/textures/mipmaps/MipmapHelperMixin.java (100%) rename src/{mixin => main}/java/me/jellysquid/mods/sodium/mixin/features/textures/mipmaps/SpriteContentsMixin.java (100%) rename src/{mixin => main}/java/me/jellysquid/mods/sodium/mixin/features/world/biome/BiomeMixin.java (100%) rename src/{mixin => main}/java/me/jellysquid/mods/sodium/mixin/modcompat/fabric_renderer_indigo/ItemRenderContextMixin.java (100%) rename src/{mixin => main}/java/me/jellysquid/mods/sodium/mixin/workarounds/context_creation/WindowMixin.java (100%) rename src/{mixin => main}/java/me/jellysquid/mods/sodium/mixin/workarounds/event_loop/RenderSystemMixin.java (100%) delete mode 100644 src/main/java/org/embeddedt/embeddium/impl/mixinterface/MinecraftAccessor.java delete mode 100644 src/main/java/org/embeddedt/embeddium/impl/mixinterface/NativeImageAccessor.java rename src/{mixin => main}/resources/embeddium.mixins.json (100%) delete mode 100644 src/mixin/java/me/jellysquid/mods/sodium/mixin/features/textures/NativeImageMixin.java diff --git a/build.gradle.kts b/build.gradle.kts index d9b07dab3..493a15676 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -37,7 +37,7 @@ base { // Mojang ships Java 17 to end users in 1.18+, so your mod should target Java 17. // java.toolchain.languageVersion = JavaLanguageVersion.of(17) -val extraSourceSets = arrayOf("legacy", "compat", "mixin") +val extraSourceSets = arrayOf("legacy", "compat") sourceSets { val main = getByName("main") @@ -150,7 +150,7 @@ repositories { mixin { // MixinGradle Settings - add(sourceSets["mixin"], "embeddium-refmap.json") + add(sourceSets["main"], "embeddium-refmap.json") config("embeddium.mixins.json") } @@ -170,10 +170,10 @@ dependencies { compileOnly("net.fabricmc.fabric-api:fabric-api:${"fabric_version"()}") compileOnly("net.fabricmc:fabric-loader:${"fabric_loader_version"()}") - "mixinAnnotationProcessor"("net.fabricmc:sponge-mixin:0.12.5+mixin.0.8.5") + annotationProcessor("net.fabricmc:sponge-mixin:0.12.5+mixin.0.8.5") compileOnly("io.github.llamalad7:mixinextras-common:0.3.5") - "mixinAnnotationProcessor"("io.github.llamalad7:mixinextras-common:0.3.5") + annotationProcessor("io.github.llamalad7:mixinextras-common:0.3.5") compileOnly("org.projectlombok:lombok:1.18.30") annotationProcessor("org.projectlombok:lombok:1.18.30") diff --git a/src/main/java/me/jellysquid/mods/sodium/client/render/vertex/VertexFormatDescriptionImpl.java b/src/main/java/me/jellysquid/mods/sodium/client/render/vertex/VertexFormatDescriptionImpl.java index 9b199f7b3..bcb7d9ae0 100644 --- a/src/main/java/me/jellysquid/mods/sodium/client/render/vertex/VertexFormatDescriptionImpl.java +++ b/src/main/java/me/jellysquid/mods/sodium/client/render/vertex/VertexFormatDescriptionImpl.java @@ -1,5 +1,6 @@ package me.jellysquid.mods.sodium.client.render.vertex; +import me.jellysquid.mods.sodium.mixin.core.render.VertexFormatAccessor; import net.caffeinemc.mods.sodium.api.vertex.attributes.CommonVertexAttribute; import net.caffeinemc.mods.sodium.api.vertex.format.VertexFormatDescription; import com.mojang.blaze3d.vertex.VertexFormat; @@ -51,7 +52,7 @@ public static int[] getOffsets(VertexFormat format) { Arrays.fill(commonElementOffsets, -1); var elementList = format.getElements(); - var elementOffsets = format.offsets; + var elementOffsets = ((VertexFormatAccessor) format).getOffsets(); for (int elementIndex = 0; elementIndex < elementList.size(); elementIndex++) { var element = elementList.get(elementIndex); diff --git a/src/main/java/me/jellysquid/mods/sodium/client/util/NativeImageHelper.java b/src/main/java/me/jellysquid/mods/sodium/client/util/NativeImageHelper.java index 84b354cf7..b2e0cdd1a 100644 --- a/src/main/java/me/jellysquid/mods/sodium/client/util/NativeImageHelper.java +++ b/src/main/java/me/jellysquid/mods/sodium/client/util/NativeImageHelper.java @@ -1,8 +1,7 @@ package me.jellysquid.mods.sodium.client.util; +import me.jellysquid.mods.sodium.mixin.features.textures.NativeImageAccessor; import com.mojang.blaze3d.platform.NativeImage; -import org.embeddedt.embeddium.impl.mixinterface.NativeImageAccessor; - import java.util.Locale; public class NativeImageHelper { @@ -13,6 +12,6 @@ public static long getPointerRGBA(NativeImage nativeImage) { } return ((NativeImageAccessor) (Object) nativeImage) // duck type since NativeImage is final - .embeddium$getPixels(); + .getPointer(); } } diff --git a/src/main/java/org/embeddedt/embeddium/taint/scanning/MixinClassValidator.java b/src/main/java/me/jellysquid/mods/sodium/mixin/MixinClassValidator.java similarity index 96% rename from src/main/java/org/embeddedt/embeddium/taint/scanning/MixinClassValidator.java rename to src/main/java/me/jellysquid/mods/sodium/mixin/MixinClassValidator.java index 5ccbea0ba..c079aab5b 100644 --- a/src/main/java/org/embeddedt/embeddium/taint/scanning/MixinClassValidator.java +++ b/src/main/java/me/jellysquid/mods/sodium/mixin/MixinClassValidator.java @@ -1,4 +1,4 @@ -package org.embeddedt.embeddium.taint.scanning; +package me.jellysquid.mods.sodium.mixin; import org.objectweb.asm.ClassReader; import org.objectweb.asm.Type; diff --git a/src/mixin/java/me/jellysquid/mods/sodium/mixin/MixinConfig.java b/src/main/java/me/jellysquid/mods/sodium/mixin/MixinConfig.java similarity index 100% rename from src/mixin/java/me/jellysquid/mods/sodium/mixin/MixinConfig.java rename to src/main/java/me/jellysquid/mods/sodium/mixin/MixinConfig.java diff --git a/src/mixin/java/me/jellysquid/mods/sodium/mixin/MixinOption.java b/src/main/java/me/jellysquid/mods/sodium/mixin/MixinOption.java similarity index 100% rename from src/mixin/java/me/jellysquid/mods/sodium/mixin/MixinOption.java rename to src/main/java/me/jellysquid/mods/sodium/mixin/MixinOption.java diff --git a/src/mixin/java/me/jellysquid/mods/sodium/mixin/SodiumMixinPlugin.java b/src/main/java/me/jellysquid/mods/sodium/mixin/SodiumMixinPlugin.java similarity index 98% rename from src/mixin/java/me/jellysquid/mods/sodium/mixin/SodiumMixinPlugin.java rename to src/main/java/me/jellysquid/mods/sodium/mixin/SodiumMixinPlugin.java index e3b6597a8..b2f8a035a 100644 --- a/src/mixin/java/me/jellysquid/mods/sodium/mixin/SodiumMixinPlugin.java +++ b/src/main/java/me/jellysquid/mods/sodium/mixin/SodiumMixinPlugin.java @@ -9,7 +9,6 @@ import org.apache.logging.log4j.Logger; import org.embeddedt.embeddium.asm.AnnotationProcessingEngine; import org.embeddedt.embeddium.config.ConfigMigrator; -import org.embeddedt.embeddium.taint.scanning.MixinClassValidator; import org.embeddedt.embeddium_integrity.MixinTaintDetector; import org.objectweb.asm.tree.ClassNode; import org.spongepowered.asm.mixin.extensibility.IMixinConfigPlugin; diff --git a/src/mixin/java/me/jellysquid/mods/sodium/mixin/core/CrashReportExtenderMixin.java b/src/main/java/me/jellysquid/mods/sodium/mixin/core/CrashReportExtenderMixin.java similarity index 100% rename from src/mixin/java/me/jellysquid/mods/sodium/mixin/core/CrashReportExtenderMixin.java rename to src/main/java/me/jellysquid/mods/sodium/mixin/core/CrashReportExtenderMixin.java diff --git a/src/mixin/java/me/jellysquid/mods/sodium/mixin/core/MinecraftClientMixin.java b/src/main/java/me/jellysquid/mods/sodium/mixin/core/MinecraftClientMixin.java similarity index 94% rename from src/mixin/java/me/jellysquid/mods/sodium/mixin/core/MinecraftClientMixin.java rename to src/main/java/me/jellysquid/mods/sodium/mixin/core/MinecraftClientMixin.java index 2c5d734e2..72bbe9be8 100644 --- a/src/mixin/java/me/jellysquid/mods/sodium/mixin/core/MinecraftClientMixin.java +++ b/src/main/java/me/jellysquid/mods/sodium/mixin/core/MinecraftClientMixin.java @@ -11,7 +11,6 @@ import net.minecraft.server.packs.resources.ReloadableResourceManager; import net.minecraft.util.profiling.ProfilerFiller; import me.jellysquid.mods.sodium.client.compatibility.checks.ResourcePackScanner; -import org.embeddedt.embeddium.impl.mixinterface.MinecraftAccessor; import org.lwjgl.opengl.GL32C; import org.spongepowered.asm.mixin.Final; import org.spongepowered.asm.mixin.Mixin; @@ -24,12 +23,10 @@ import java.util.concurrent.CompletableFuture; @Mixin(Minecraft.class) -public class MinecraftClientMixin implements MinecraftAccessor { +public class MinecraftClientMixin { @Shadow @Final private ReloadableResourceManager resourceManager; - @Shadow - private Thread gameThread; @Unique private final LongArrayFIFOQueue fences = new LongArrayFIFOQueue(); @@ -103,8 +100,4 @@ private void postResourceReload(CallbackInfoReturnable> ResourcePackScanner.checkIfCoreShaderLoaded(this.resourceManager); } - @Override - public Thread embeddium$getGameThread() { - return this.gameThread; - } } diff --git a/src/mixin/java/me/jellysquid/mods/sodium/mixin/core/gui/DownloadingTerrainScreenMixin.java b/src/main/java/me/jellysquid/mods/sodium/mixin/core/gui/DownloadingTerrainScreenMixin.java similarity index 100% rename from src/mixin/java/me/jellysquid/mods/sodium/mixin/core/gui/DownloadingTerrainScreenMixin.java rename to src/main/java/me/jellysquid/mods/sodium/mixin/core/gui/DownloadingTerrainScreenMixin.java diff --git a/src/mixin/java/me/jellysquid/mods/sodium/mixin/core/model/BakedModelMixin.java b/src/main/java/me/jellysquid/mods/sodium/mixin/core/model/BakedModelMixin.java similarity index 100% rename from src/mixin/java/me/jellysquid/mods/sodium/mixin/core/model/BakedModelMixin.java rename to src/main/java/me/jellysquid/mods/sodium/mixin/core/model/BakedModelMixin.java diff --git a/src/mixin/java/me/jellysquid/mods/sodium/mixin/core/model/SimpleBakedModelBuilderMixin.java b/src/main/java/me/jellysquid/mods/sodium/mixin/core/model/SimpleBakedModelBuilderMixin.java similarity index 100% rename from src/mixin/java/me/jellysquid/mods/sodium/mixin/core/model/SimpleBakedModelBuilderMixin.java rename to src/main/java/me/jellysquid/mods/sodium/mixin/core/model/SimpleBakedModelBuilderMixin.java diff --git a/src/mixin/java/me/jellysquid/mods/sodium/mixin/core/model/colors/BlockColorsMixin.java b/src/main/java/me/jellysquid/mods/sodium/mixin/core/model/colors/BlockColorsMixin.java similarity index 100% rename from src/mixin/java/me/jellysquid/mods/sodium/mixin/core/model/colors/BlockColorsMixin.java rename to src/main/java/me/jellysquid/mods/sodium/mixin/core/model/colors/BlockColorsMixin.java diff --git a/src/mixin/java/me/jellysquid/mods/sodium/mixin/core/model/colors/ItemColorsMixin.java b/src/main/java/me/jellysquid/mods/sodium/mixin/core/model/colors/ItemColorsMixin.java similarity index 100% rename from src/mixin/java/me/jellysquid/mods/sodium/mixin/core/model/colors/ItemColorsMixin.java rename to src/main/java/me/jellysquid/mods/sodium/mixin/core/model/colors/ItemColorsMixin.java diff --git a/src/mixin/java/me/jellysquid/mods/sodium/mixin/core/model/quad/BakedQuadFactoryMixin.java b/src/main/java/me/jellysquid/mods/sodium/mixin/core/model/quad/BakedQuadFactoryMixin.java similarity index 100% rename from src/mixin/java/me/jellysquid/mods/sodium/mixin/core/model/quad/BakedQuadFactoryMixin.java rename to src/main/java/me/jellysquid/mods/sodium/mixin/core/model/quad/BakedQuadFactoryMixin.java diff --git a/src/mixin/java/me/jellysquid/mods/sodium/mixin/core/model/quad/BakedQuadMixin.java b/src/main/java/me/jellysquid/mods/sodium/mixin/core/model/quad/BakedQuadMixin.java similarity index 100% rename from src/mixin/java/me/jellysquid/mods/sodium/mixin/core/model/quad/BakedQuadMixin.java rename to src/main/java/me/jellysquid/mods/sodium/mixin/core/model/quad/BakedQuadMixin.java diff --git a/src/mixin/java/me/jellysquid/mods/sodium/mixin/core/postprocess/PostprocessorMixin.java b/src/main/java/me/jellysquid/mods/sodium/mixin/core/postprocess/PostprocessorMixin.java similarity index 100% rename from src/mixin/java/me/jellysquid/mods/sodium/mixin/core/postprocess/PostprocessorMixin.java rename to src/main/java/me/jellysquid/mods/sodium/mixin/core/postprocess/PostprocessorMixin.java diff --git a/src/mixin/java/me/jellysquid/mods/sodium/mixin/core/render/MatrixStackMixin.java b/src/main/java/me/jellysquid/mods/sodium/mixin/core/render/MatrixStackMixin.java similarity index 100% rename from src/mixin/java/me/jellysquid/mods/sodium/mixin/core/render/MatrixStackMixin.java rename to src/main/java/me/jellysquid/mods/sodium/mixin/core/render/MatrixStackMixin.java diff --git a/src/main/java/me/jellysquid/mods/sodium/mixin/core/render/MinecraftAccessor.java b/src/main/java/me/jellysquid/mods/sodium/mixin/core/render/MinecraftAccessor.java new file mode 100644 index 000000000..7c5f2d90d --- /dev/null +++ b/src/main/java/me/jellysquid/mods/sodium/mixin/core/render/MinecraftAccessor.java @@ -0,0 +1,11 @@ +package me.jellysquid.mods.sodium.mixin.core.render; + +import net.minecraft.client.Minecraft; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.gen.Accessor; + +@Mixin(Minecraft.class) +public interface MinecraftAccessor { + @Accessor("gameThread") + Thread embeddium$getGameThread(); +} diff --git a/src/mixin/java/me/jellysquid/mods/sodium/mixin/core/render/VertexFormatAccessor.java b/src/main/java/me/jellysquid/mods/sodium/mixin/core/render/VertexFormatAccessor.java similarity index 100% rename from src/mixin/java/me/jellysquid/mods/sodium/mixin/core/render/VertexFormatAccessor.java rename to src/main/java/me/jellysquid/mods/sodium/mixin/core/render/VertexFormatAccessor.java diff --git a/src/mixin/java/me/jellysquid/mods/sodium/mixin/core/render/frustum/FrustumMixin.java b/src/main/java/me/jellysquid/mods/sodium/mixin/core/render/frustum/FrustumMixin.java similarity index 100% rename from src/mixin/java/me/jellysquid/mods/sodium/mixin/core/render/frustum/FrustumMixin.java rename to src/main/java/me/jellysquid/mods/sodium/mixin/core/render/frustum/FrustumMixin.java diff --git a/src/mixin/java/me/jellysquid/mods/sodium/mixin/core/render/immediate/consumer/BufferBuilderMixin.java b/src/main/java/me/jellysquid/mods/sodium/mixin/core/render/immediate/consumer/BufferBuilderMixin.java similarity index 100% rename from src/mixin/java/me/jellysquid/mods/sodium/mixin/core/render/immediate/consumer/BufferBuilderMixin.java rename to src/main/java/me/jellysquid/mods/sodium/mixin/core/render/immediate/consumer/BufferBuilderMixin.java diff --git a/src/mixin/java/me/jellysquid/mods/sodium/mixin/core/render/immediate/consumer/OutlineVertexConsumerMixin.java b/src/main/java/me/jellysquid/mods/sodium/mixin/core/render/immediate/consumer/OutlineVertexConsumerMixin.java similarity index 100% rename from src/mixin/java/me/jellysquid/mods/sodium/mixin/core/render/immediate/consumer/OutlineVertexConsumerMixin.java rename to src/main/java/me/jellysquid/mods/sodium/mixin/core/render/immediate/consumer/OutlineVertexConsumerMixin.java diff --git a/src/mixin/java/me/jellysquid/mods/sodium/mixin/core/render/immediate/consumer/OverlayVertexConsumerMixin.java b/src/main/java/me/jellysquid/mods/sodium/mixin/core/render/immediate/consumer/OverlayVertexConsumerMixin.java similarity index 100% rename from src/mixin/java/me/jellysquid/mods/sodium/mixin/core/render/immediate/consumer/OverlayVertexConsumerMixin.java rename to src/main/java/me/jellysquid/mods/sodium/mixin/core/render/immediate/consumer/OverlayVertexConsumerMixin.java diff --git a/src/mixin/java/me/jellysquid/mods/sodium/mixin/core/render/immediate/consumer/SpriteTexturedVertexConsumerMixin.java b/src/main/java/me/jellysquid/mods/sodium/mixin/core/render/immediate/consumer/SpriteTexturedVertexConsumerMixin.java similarity index 100% rename from src/mixin/java/me/jellysquid/mods/sodium/mixin/core/render/immediate/consumer/SpriteTexturedVertexConsumerMixin.java rename to src/main/java/me/jellysquid/mods/sodium/mixin/core/render/immediate/consumer/SpriteTexturedVertexConsumerMixin.java diff --git a/src/mixin/java/me/jellysquid/mods/sodium/mixin/core/render/immediate/consumer/VertexConsumersMixin.java b/src/main/java/me/jellysquid/mods/sodium/mixin/core/render/immediate/consumer/VertexConsumersMixin.java similarity index 100% rename from src/mixin/java/me/jellysquid/mods/sodium/mixin/core/render/immediate/consumer/VertexConsumersMixin.java rename to src/main/java/me/jellysquid/mods/sodium/mixin/core/render/immediate/consumer/VertexConsumersMixin.java diff --git a/src/mixin/java/me/jellysquid/mods/sodium/mixin/core/render/world/ChunkBuilderMixin.java b/src/main/java/me/jellysquid/mods/sodium/mixin/core/render/world/ChunkBuilderMixin.java similarity index 100% rename from src/mixin/java/me/jellysquid/mods/sodium/mixin/core/render/world/ChunkBuilderMixin.java rename to src/main/java/me/jellysquid/mods/sodium/mixin/core/render/world/ChunkBuilderMixin.java diff --git a/src/mixin/java/me/jellysquid/mods/sodium/mixin/core/render/world/WorldRendererMixin.java b/src/main/java/me/jellysquid/mods/sodium/mixin/core/render/world/WorldRendererMixin.java similarity index 100% rename from src/mixin/java/me/jellysquid/mods/sodium/mixin/core/render/world/WorldRendererMixin.java rename to src/main/java/me/jellysquid/mods/sodium/mixin/core/render/world/WorldRendererMixin.java diff --git a/src/mixin/java/me/jellysquid/mods/sodium/mixin/core/world/biome/ClientWorldMixin.java b/src/main/java/me/jellysquid/mods/sodium/mixin/core/world/biome/ClientWorldMixin.java similarity index 100% rename from src/mixin/java/me/jellysquid/mods/sodium/mixin/core/world/biome/ClientWorldMixin.java rename to src/main/java/me/jellysquid/mods/sodium/mixin/core/world/biome/ClientWorldMixin.java diff --git a/src/mixin/java/me/jellysquid/mods/sodium/mixin/core/world/chunk/EmptyPaletteStorageMixin.java b/src/main/java/me/jellysquid/mods/sodium/mixin/core/world/chunk/EmptyPaletteStorageMixin.java similarity index 100% rename from src/mixin/java/me/jellysquid/mods/sodium/mixin/core/world/chunk/EmptyPaletteStorageMixin.java rename to src/main/java/me/jellysquid/mods/sodium/mixin/core/world/chunk/EmptyPaletteStorageMixin.java diff --git a/src/mixin/java/me/jellysquid/mods/sodium/mixin/core/world/chunk/PackedIntegerArrayMixin.java b/src/main/java/me/jellysquid/mods/sodium/mixin/core/world/chunk/PackedIntegerArrayMixin.java similarity index 100% rename from src/mixin/java/me/jellysquid/mods/sodium/mixin/core/world/chunk/PackedIntegerArrayMixin.java rename to src/main/java/me/jellysquid/mods/sodium/mixin/core/world/chunk/PackedIntegerArrayMixin.java diff --git a/src/mixin/java/me/jellysquid/mods/sodium/mixin/core/world/chunk/PalettedContainerMixin.java b/src/main/java/me/jellysquid/mods/sodium/mixin/core/world/chunk/PalettedContainerMixin.java similarity index 100% rename from src/mixin/java/me/jellysquid/mods/sodium/mixin/core/world/chunk/PalettedContainerMixin.java rename to src/main/java/me/jellysquid/mods/sodium/mixin/core/world/chunk/PalettedContainerMixin.java diff --git a/src/mixin/java/me/jellysquid/mods/sodium/mixin/core/world/map/ClientPlayNetworkHandlerMixin.java b/src/main/java/me/jellysquid/mods/sodium/mixin/core/world/map/ClientPlayNetworkHandlerMixin.java similarity index 100% rename from src/mixin/java/me/jellysquid/mods/sodium/mixin/core/world/map/ClientPlayNetworkHandlerMixin.java rename to src/main/java/me/jellysquid/mods/sodium/mixin/core/world/map/ClientPlayNetworkHandlerMixin.java diff --git a/src/mixin/java/me/jellysquid/mods/sodium/mixin/core/world/map/ClientWorldMixin.java b/src/main/java/me/jellysquid/mods/sodium/mixin/core/world/map/ClientWorldMixin.java similarity index 100% rename from src/mixin/java/me/jellysquid/mods/sodium/mixin/core/world/map/ClientWorldMixin.java rename to src/main/java/me/jellysquid/mods/sodium/mixin/core/world/map/ClientWorldMixin.java diff --git a/src/mixin/java/me/jellysquid/mods/sodium/mixin/features/gui/hooks/console/GameRendererMixin.java b/src/main/java/me/jellysquid/mods/sodium/mixin/features/gui/hooks/console/GameRendererMixin.java similarity index 100% rename from src/mixin/java/me/jellysquid/mods/sodium/mixin/features/gui/hooks/console/GameRendererMixin.java rename to src/main/java/me/jellysquid/mods/sodium/mixin/features/gui/hooks/console/GameRendererMixin.java diff --git a/src/mixin/java/me/jellysquid/mods/sodium/mixin/features/gui/hooks/debug/DebugHudMixin.java b/src/main/java/me/jellysquid/mods/sodium/mixin/features/gui/hooks/debug/DebugHudMixin.java similarity index 100% rename from src/mixin/java/me/jellysquid/mods/sodium/mixin/features/gui/hooks/debug/DebugHudMixin.java rename to src/main/java/me/jellysquid/mods/sodium/mixin/features/gui/hooks/debug/DebugHudMixin.java diff --git a/src/mixin/java/me/jellysquid/mods/sodium/mixin/features/gui/hooks/settings/OptionsScreenMixin.java b/src/main/java/me/jellysquid/mods/sodium/mixin/features/gui/hooks/settings/OptionsScreenMixin.java similarity index 100% rename from src/mixin/java/me/jellysquid/mods/sodium/mixin/features/gui/hooks/settings/OptionsScreenMixin.java rename to src/main/java/me/jellysquid/mods/sodium/mixin/features/gui/hooks/settings/OptionsScreenMixin.java diff --git a/src/mixin/java/me/jellysquid/mods/sodium/mixin/features/gui/screen/LevelLoadingScreenMixin.java b/src/main/java/me/jellysquid/mods/sodium/mixin/features/gui/screen/LevelLoadingScreenMixin.java similarity index 100% rename from src/mixin/java/me/jellysquid/mods/sodium/mixin/features/gui/screen/LevelLoadingScreenMixin.java rename to src/main/java/me/jellysquid/mods/sodium/mixin/features/gui/screen/LevelLoadingScreenMixin.java diff --git a/src/mixin/java/me/jellysquid/mods/sodium/mixin/features/model/BlockElementMixin.java b/src/main/java/me/jellysquid/mods/sodium/mixin/features/model/BlockElementMixin.java similarity index 100% rename from src/mixin/java/me/jellysquid/mods/sodium/mixin/features/model/BlockElementMixin.java rename to src/main/java/me/jellysquid/mods/sodium/mixin/features/model/BlockElementMixin.java diff --git a/src/mixin/java/me/jellysquid/mods/sodium/mixin/features/model/ModelBakeryMixin.java b/src/main/java/me/jellysquid/mods/sodium/mixin/features/model/ModelBakeryMixin.java similarity index 100% rename from src/mixin/java/me/jellysquid/mods/sodium/mixin/features/model/ModelBakeryMixin.java rename to src/main/java/me/jellysquid/mods/sodium/mixin/features/model/ModelBakeryMixin.java diff --git a/src/mixin/java/me/jellysquid/mods/sodium/mixin/features/model/ModelDataBuilderMixin.java b/src/main/java/me/jellysquid/mods/sodium/mixin/features/model/ModelDataBuilderMixin.java similarity index 100% rename from src/mixin/java/me/jellysquid/mods/sodium/mixin/features/model/ModelDataBuilderMixin.java rename to src/main/java/me/jellysquid/mods/sodium/mixin/features/model/ModelDataBuilderMixin.java diff --git a/src/mixin/java/me/jellysquid/mods/sodium/mixin/features/model/ModelDataMixin.java b/src/main/java/me/jellysquid/mods/sodium/mixin/features/model/ModelDataMixin.java similarity index 100% rename from src/mixin/java/me/jellysquid/mods/sodium/mixin/features/model/ModelDataMixin.java rename to src/main/java/me/jellysquid/mods/sodium/mixin/features/model/ModelDataMixin.java diff --git a/src/mixin/java/me/jellysquid/mods/sodium/mixin/features/model/MultipartBakedModelMixin.java b/src/main/java/me/jellysquid/mods/sodium/mixin/features/model/MultipartBakedModelMixin.java similarity index 100% rename from src/mixin/java/me/jellysquid/mods/sodium/mixin/features/model/MultipartBakedModelMixin.java rename to src/main/java/me/jellysquid/mods/sodium/mixin/features/model/MultipartBakedModelMixin.java diff --git a/src/mixin/java/me/jellysquid/mods/sodium/mixin/features/model/SimpleBakedModelAccessor.java b/src/main/java/me/jellysquid/mods/sodium/mixin/features/model/SimpleBakedModelAccessor.java similarity index 100% rename from src/mixin/java/me/jellysquid/mods/sodium/mixin/features/model/SimpleBakedModelAccessor.java rename to src/main/java/me/jellysquid/mods/sodium/mixin/features/model/SimpleBakedModelAccessor.java diff --git a/src/mixin/java/me/jellysquid/mods/sodium/mixin/features/model/SimpleBakedModelMixin.java b/src/main/java/me/jellysquid/mods/sodium/mixin/features/model/SimpleBakedModelMixin.java similarity index 100% rename from src/mixin/java/me/jellysquid/mods/sodium/mixin/features/model/SimpleBakedModelMixin.java rename to src/main/java/me/jellysquid/mods/sodium/mixin/features/model/SimpleBakedModelMixin.java diff --git a/src/mixin/java/me/jellysquid/mods/sodium/mixin/features/model/WeightedBakedModelMixin.java b/src/main/java/me/jellysquid/mods/sodium/mixin/features/model/WeightedBakedModelMixin.java similarity index 100% rename from src/mixin/java/me/jellysquid/mods/sodium/mixin/features/model/WeightedBakedModelMixin.java rename to src/main/java/me/jellysquid/mods/sodium/mixin/features/model/WeightedBakedModelMixin.java diff --git a/src/mixin/java/me/jellysquid/mods/sodium/mixin/features/options/overlays/InGameHudMixin.java b/src/main/java/me/jellysquid/mods/sodium/mixin/features/options/overlays/InGameHudMixin.java similarity index 100% rename from src/mixin/java/me/jellysquid/mods/sodium/mixin/features/options/overlays/InGameHudMixin.java rename to src/main/java/me/jellysquid/mods/sodium/mixin/features/options/overlays/InGameHudMixin.java diff --git a/src/mixin/java/me/jellysquid/mods/sodium/mixin/features/options/overlays/VanillaGuiOverlayMixin.java b/src/main/java/me/jellysquid/mods/sodium/mixin/features/options/overlays/VanillaGuiOverlayMixin.java similarity index 100% rename from src/mixin/java/me/jellysquid/mods/sodium/mixin/features/options/overlays/VanillaGuiOverlayMixin.java rename to src/main/java/me/jellysquid/mods/sodium/mixin/features/options/overlays/VanillaGuiOverlayMixin.java diff --git a/src/mixin/java/me/jellysquid/mods/sodium/mixin/features/options/render_layers/LeavesBlockMixin.java b/src/main/java/me/jellysquid/mods/sodium/mixin/features/options/render_layers/LeavesBlockMixin.java similarity index 100% rename from src/mixin/java/me/jellysquid/mods/sodium/mixin/features/options/render_layers/LeavesBlockMixin.java rename to src/main/java/me/jellysquid/mods/sodium/mixin/features/options/render_layers/LeavesBlockMixin.java diff --git a/src/mixin/java/me/jellysquid/mods/sodium/mixin/features/options/render_layers/RenderLayersMixin.java b/src/main/java/me/jellysquid/mods/sodium/mixin/features/options/render_layers/RenderLayersMixin.java similarity index 100% rename from src/mixin/java/me/jellysquid/mods/sodium/mixin/features/options/render_layers/RenderLayersMixin.java rename to src/main/java/me/jellysquid/mods/sodium/mixin/features/options/render_layers/RenderLayersMixin.java diff --git a/src/mixin/java/me/jellysquid/mods/sodium/mixin/features/options/weather/WorldRendererMixin.java b/src/main/java/me/jellysquid/mods/sodium/mixin/features/options/weather/WorldRendererMixin.java similarity index 100% rename from src/mixin/java/me/jellysquid/mods/sodium/mixin/features/options/weather/WorldRendererMixin.java rename to src/main/java/me/jellysquid/mods/sodium/mixin/features/options/weather/WorldRendererMixin.java diff --git a/src/mixin/java/me/jellysquid/mods/sodium/mixin/features/render/entity/cull/EntityRendererMixin.java b/src/main/java/me/jellysquid/mods/sodium/mixin/features/render/entity/cull/EntityRendererMixin.java similarity index 100% rename from src/mixin/java/me/jellysquid/mods/sodium/mixin/features/render/entity/cull/EntityRendererMixin.java rename to src/main/java/me/jellysquid/mods/sodium/mixin/features/render/entity/cull/EntityRendererMixin.java diff --git a/src/mixin/java/me/jellysquid/mods/sodium/mixin/features/render/entity/fast_render/CuboidMixin.java b/src/main/java/me/jellysquid/mods/sodium/mixin/features/render/entity/fast_render/CuboidMixin.java similarity index 100% rename from src/mixin/java/me/jellysquid/mods/sodium/mixin/features/render/entity/fast_render/CuboidMixin.java rename to src/main/java/me/jellysquid/mods/sodium/mixin/features/render/entity/fast_render/CuboidMixin.java diff --git a/src/mixin/java/me/jellysquid/mods/sodium/mixin/features/render/entity/fast_render/ModelPartMixin.java b/src/main/java/me/jellysquid/mods/sodium/mixin/features/render/entity/fast_render/ModelPartMixin.java similarity index 100% rename from src/mixin/java/me/jellysquid/mods/sodium/mixin/features/render/entity/fast_render/ModelPartMixin.java rename to src/main/java/me/jellysquid/mods/sodium/mixin/features/render/entity/fast_render/ModelPartMixin.java diff --git a/src/mixin/java/me/jellysquid/mods/sodium/mixin/features/render/entity/remove_streams/HierarchicalModelMixin.java b/src/main/java/me/jellysquid/mods/sodium/mixin/features/render/entity/remove_streams/HierarchicalModelMixin.java similarity index 100% rename from src/mixin/java/me/jellysquid/mods/sodium/mixin/features/render/entity/remove_streams/HierarchicalModelMixin.java rename to src/main/java/me/jellysquid/mods/sodium/mixin/features/render/entity/remove_streams/HierarchicalModelMixin.java diff --git a/src/mixin/java/me/jellysquid/mods/sodium/mixin/features/render/entity/remove_streams/ModelPartMixin.java b/src/main/java/me/jellysquid/mods/sodium/mixin/features/render/entity/remove_streams/ModelPartMixin.java similarity index 100% rename from src/mixin/java/me/jellysquid/mods/sodium/mixin/features/render/entity/remove_streams/ModelPartMixin.java rename to src/main/java/me/jellysquid/mods/sodium/mixin/features/render/entity/remove_streams/ModelPartMixin.java diff --git a/src/mixin/java/me/jellysquid/mods/sodium/mixin/features/render/entity/shadows/EntityRenderDispatcherMixin.java b/src/main/java/me/jellysquid/mods/sodium/mixin/features/render/entity/shadows/EntityRenderDispatcherMixin.java similarity index 100% rename from src/mixin/java/me/jellysquid/mods/sodium/mixin/features/render/entity/shadows/EntityRenderDispatcherMixin.java rename to src/main/java/me/jellysquid/mods/sodium/mixin/features/render/entity/shadows/EntityRenderDispatcherMixin.java diff --git a/src/mixin/java/me/jellysquid/mods/sodium/mixin/features/render/gui/debug/DebugScreenOverlayAccessor.java b/src/main/java/me/jellysquid/mods/sodium/mixin/features/render/gui/debug/DebugScreenOverlayAccessor.java similarity index 100% rename from src/mixin/java/me/jellysquid/mods/sodium/mixin/features/render/gui/debug/DebugScreenOverlayAccessor.java rename to src/main/java/me/jellysquid/mods/sodium/mixin/features/render/gui/debug/DebugScreenOverlayAccessor.java diff --git a/src/mixin/java/me/jellysquid/mods/sodium/mixin/features/render/gui/debug/ForgeGuiMixin.java b/src/main/java/me/jellysquid/mods/sodium/mixin/features/render/gui/debug/ForgeGuiMixin.java similarity index 100% rename from src/mixin/java/me/jellysquid/mods/sodium/mixin/features/render/gui/debug/ForgeGuiMixin.java rename to src/main/java/me/jellysquid/mods/sodium/mixin/features/render/gui/debug/ForgeGuiMixin.java diff --git a/src/mixin/java/me/jellysquid/mods/sodium/mixin/features/render/gui/font/FontSetMixin.java b/src/main/java/me/jellysquid/mods/sodium/mixin/features/render/gui/font/FontSetMixin.java similarity index 100% rename from src/mixin/java/me/jellysquid/mods/sodium/mixin/features/render/gui/font/FontSetMixin.java rename to src/main/java/me/jellysquid/mods/sodium/mixin/features/render/gui/font/FontSetMixin.java diff --git a/src/mixin/java/me/jellysquid/mods/sodium/mixin/features/render/gui/font/GlyphRendererMixin.java b/src/main/java/me/jellysquid/mods/sodium/mixin/features/render/gui/font/GlyphRendererMixin.java similarity index 100% rename from src/mixin/java/me/jellysquid/mods/sodium/mixin/features/render/gui/font/GlyphRendererMixin.java rename to src/main/java/me/jellysquid/mods/sodium/mixin/features/render/gui/font/GlyphRendererMixin.java diff --git a/src/mixin/java/me/jellysquid/mods/sodium/mixin/features/render/gui/outlines/WorldRendererMixin.java b/src/main/java/me/jellysquid/mods/sodium/mixin/features/render/gui/outlines/WorldRendererMixin.java similarity index 100% rename from src/mixin/java/me/jellysquid/mods/sodium/mixin/features/render/gui/outlines/WorldRendererMixin.java rename to src/main/java/me/jellysquid/mods/sodium/mixin/features/render/gui/outlines/WorldRendererMixin.java diff --git a/src/mixin/java/me/jellysquid/mods/sodium/mixin/features/render/immediate/DirectionMixin.java b/src/main/java/me/jellysquid/mods/sodium/mixin/features/render/immediate/DirectionMixin.java similarity index 100% rename from src/mixin/java/me/jellysquid/mods/sodium/mixin/features/render/immediate/DirectionMixin.java rename to src/main/java/me/jellysquid/mods/sodium/mixin/features/render/immediate/DirectionMixin.java diff --git a/src/mixin/java/me/jellysquid/mods/sodium/mixin/features/render/immediate/buffer_builder/BufferBuilderMixin.java b/src/main/java/me/jellysquid/mods/sodium/mixin/features/render/immediate/buffer_builder/BufferBuilderMixin.java similarity index 100% rename from src/mixin/java/me/jellysquid/mods/sodium/mixin/features/render/immediate/buffer_builder/BufferBuilderMixin.java rename to src/main/java/me/jellysquid/mods/sodium/mixin/features/render/immediate/buffer_builder/BufferBuilderMixin.java diff --git a/src/mixin/java/me/jellysquid/mods/sodium/mixin/features/render/immediate/buffer_builder/VertexBufferMixin.java b/src/main/java/me/jellysquid/mods/sodium/mixin/features/render/immediate/buffer_builder/VertexBufferMixin.java similarity index 100% rename from src/mixin/java/me/jellysquid/mods/sodium/mixin/features/render/immediate/buffer_builder/VertexBufferMixin.java rename to src/main/java/me/jellysquid/mods/sodium/mixin/features/render/immediate/buffer_builder/VertexBufferMixin.java diff --git a/src/mixin/java/me/jellysquid/mods/sodium/mixin/features/render/immediate/buffer_builder/VertexFormatMixin.java b/src/main/java/me/jellysquid/mods/sodium/mixin/features/render/immediate/buffer_builder/VertexFormatMixin.java similarity index 100% rename from src/mixin/java/me/jellysquid/mods/sodium/mixin/features/render/immediate/buffer_builder/VertexFormatMixin.java rename to src/main/java/me/jellysquid/mods/sodium/mixin/features/render/immediate/buffer_builder/VertexFormatMixin.java diff --git a/src/mixin/java/me/jellysquid/mods/sodium/mixin/features/render/immediate/buffer_builder/fast_delegate/BufferSourceMixin.java b/src/main/java/me/jellysquid/mods/sodium/mixin/features/render/immediate/buffer_builder/fast_delegate/BufferSourceMixin.java similarity index 100% rename from src/mixin/java/me/jellysquid/mods/sodium/mixin/features/render/immediate/buffer_builder/fast_delegate/BufferSourceMixin.java rename to src/main/java/me/jellysquid/mods/sodium/mixin/features/render/immediate/buffer_builder/fast_delegate/BufferSourceMixin.java diff --git a/src/mixin/java/me/jellysquid/mods/sodium/mixin/features/render/immediate/buffer_builder/intrinsics/BufferBuilderMixin.java b/src/main/java/me/jellysquid/mods/sodium/mixin/features/render/immediate/buffer_builder/intrinsics/BufferBuilderMixin.java similarity index 100% rename from src/mixin/java/me/jellysquid/mods/sodium/mixin/features/render/immediate/buffer_builder/intrinsics/BufferBuilderMixin.java rename to src/main/java/me/jellysquid/mods/sodium/mixin/features/render/immediate/buffer_builder/intrinsics/BufferBuilderMixin.java diff --git a/src/mixin/java/me/jellysquid/mods/sodium/mixin/features/render/immediate/buffer_builder/sorting/BufferBuilderMixin.java b/src/main/java/me/jellysquid/mods/sodium/mixin/features/render/immediate/buffer_builder/sorting/BufferBuilderMixin.java similarity index 100% rename from src/mixin/java/me/jellysquid/mods/sodium/mixin/features/render/immediate/buffer_builder/sorting/BufferBuilderMixin.java rename to src/main/java/me/jellysquid/mods/sodium/mixin/features/render/immediate/buffer_builder/sorting/BufferBuilderMixin.java diff --git a/src/mixin/java/me/jellysquid/mods/sodium/mixin/features/render/immediate/buffer_builder/sorting/VertexSorterMixin.java b/src/main/java/me/jellysquid/mods/sodium/mixin/features/render/immediate/buffer_builder/sorting/VertexSorterMixin.java similarity index 100% rename from src/mixin/java/me/jellysquid/mods/sodium/mixin/features/render/immediate/buffer_builder/sorting/VertexSorterMixin.java rename to src/main/java/me/jellysquid/mods/sodium/mixin/features/render/immediate/buffer_builder/sorting/VertexSorterMixin.java diff --git a/src/mixin/java/me/jellysquid/mods/sodium/mixin/features/render/immediate/matrix_stack/VertexConsumerMixin.java b/src/main/java/me/jellysquid/mods/sodium/mixin/features/render/immediate/matrix_stack/VertexConsumerMixin.java similarity index 100% rename from src/mixin/java/me/jellysquid/mods/sodium/mixin/features/render/immediate/matrix_stack/VertexConsumerMixin.java rename to src/main/java/me/jellysquid/mods/sodium/mixin/features/render/immediate/matrix_stack/VertexConsumerMixin.java diff --git a/src/mixin/java/me/jellysquid/mods/sodium/mixin/features/render/model/ChunkRenderTypeSetMixin.java b/src/main/java/me/jellysquid/mods/sodium/mixin/features/render/model/ChunkRenderTypeSetMixin.java similarity index 100% rename from src/mixin/java/me/jellysquid/mods/sodium/mixin/features/render/model/ChunkRenderTypeSetMixin.java rename to src/main/java/me/jellysquid/mods/sodium/mixin/features/render/model/ChunkRenderTypeSetMixin.java diff --git a/src/mixin/java/me/jellysquid/mods/sodium/mixin/features/render/model/RenderLayersMixin.java b/src/main/java/me/jellysquid/mods/sodium/mixin/features/render/model/RenderLayersMixin.java similarity index 100% rename from src/mixin/java/me/jellysquid/mods/sodium/mixin/features/render/model/RenderLayersMixin.java rename to src/main/java/me/jellysquid/mods/sodium/mixin/features/render/model/RenderLayersMixin.java diff --git a/src/mixin/java/me/jellysquid/mods/sodium/mixin/features/render/model/block/BlockModelRendererMixin.java b/src/main/java/me/jellysquid/mods/sodium/mixin/features/render/model/block/BlockModelRendererMixin.java similarity index 100% rename from src/mixin/java/me/jellysquid/mods/sodium/mixin/features/render/model/block/BlockModelRendererMixin.java rename to src/main/java/me/jellysquid/mods/sodium/mixin/features/render/model/block/BlockModelRendererMixin.java diff --git a/src/mixin/java/me/jellysquid/mods/sodium/mixin/features/render/model/item/ItemRendererMixin.java b/src/main/java/me/jellysquid/mods/sodium/mixin/features/render/model/item/ItemRendererMixin.java similarity index 100% rename from src/mixin/java/me/jellysquid/mods/sodium/mixin/features/render/model/item/ItemRendererMixin.java rename to src/main/java/me/jellysquid/mods/sodium/mixin/features/render/model/item/ItemRendererMixin.java diff --git a/src/mixin/java/me/jellysquid/mods/sodium/mixin/features/render/particle/BillboardParticleMixin.java b/src/main/java/me/jellysquid/mods/sodium/mixin/features/render/particle/BillboardParticleMixin.java similarity index 100% rename from src/mixin/java/me/jellysquid/mods/sodium/mixin/features/render/particle/BillboardParticleMixin.java rename to src/main/java/me/jellysquid/mods/sodium/mixin/features/render/particle/BillboardParticleMixin.java diff --git a/src/mixin/java/me/jellysquid/mods/sodium/mixin/features/render/world/ClientLevelMixin.java b/src/main/java/me/jellysquid/mods/sodium/mixin/features/render/world/ClientLevelMixin.java similarity index 100% rename from src/mixin/java/me/jellysquid/mods/sodium/mixin/features/render/world/ClientLevelMixin.java rename to src/main/java/me/jellysquid/mods/sodium/mixin/features/render/world/ClientLevelMixin.java diff --git a/src/mixin/java/me/jellysquid/mods/sodium/mixin/features/render/world/clouds/WorldRendererMixin.java b/src/main/java/me/jellysquid/mods/sodium/mixin/features/render/world/clouds/WorldRendererMixin.java similarity index 100% rename from src/mixin/java/me/jellysquid/mods/sodium/mixin/features/render/world/clouds/WorldRendererMixin.java rename to src/main/java/me/jellysquid/mods/sodium/mixin/features/render/world/clouds/WorldRendererMixin.java diff --git a/src/mixin/java/me/jellysquid/mods/sodium/mixin/features/render/world/sky/BackgroundRendererMixin.java b/src/main/java/me/jellysquid/mods/sodium/mixin/features/render/world/sky/BackgroundRendererMixin.java similarity index 100% rename from src/mixin/java/me/jellysquid/mods/sodium/mixin/features/render/world/sky/BackgroundRendererMixin.java rename to src/main/java/me/jellysquid/mods/sodium/mixin/features/render/world/sky/BackgroundRendererMixin.java diff --git a/src/mixin/java/me/jellysquid/mods/sodium/mixin/features/render/world/sky/ClientWorldMixin.java b/src/main/java/me/jellysquid/mods/sodium/mixin/features/render/world/sky/ClientWorldMixin.java similarity index 100% rename from src/mixin/java/me/jellysquid/mods/sodium/mixin/features/render/world/sky/ClientWorldMixin.java rename to src/main/java/me/jellysquid/mods/sodium/mixin/features/render/world/sky/ClientWorldMixin.java diff --git a/src/mixin/java/me/jellysquid/mods/sodium/mixin/features/render/world/sky/WorldRendererMixin.java b/src/main/java/me/jellysquid/mods/sodium/mixin/features/render/world/sky/WorldRendererMixin.java similarity index 100% rename from src/mixin/java/me/jellysquid/mods/sodium/mixin/features/render/world/sky/WorldRendererMixin.java rename to src/main/java/me/jellysquid/mods/sodium/mixin/features/render/world/sky/WorldRendererMixin.java diff --git a/src/mixin/java/me/jellysquid/mods/sodium/mixin/features/shader/uniform/ShaderProgramMixin.java b/src/main/java/me/jellysquid/mods/sodium/mixin/features/shader/uniform/ShaderProgramMixin.java similarity index 100% rename from src/mixin/java/me/jellysquid/mods/sodium/mixin/features/shader/uniform/ShaderProgramMixin.java rename to src/main/java/me/jellysquid/mods/sodium/mixin/features/shader/uniform/ShaderProgramMixin.java diff --git a/src/mixin/java/me/jellysquid/mods/sodium/mixin/features/textures/NativeImageAccessor.java b/src/main/java/me/jellysquid/mods/sodium/mixin/features/textures/NativeImageAccessor.java similarity index 100% rename from src/mixin/java/me/jellysquid/mods/sodium/mixin/features/textures/NativeImageAccessor.java rename to src/main/java/me/jellysquid/mods/sodium/mixin/features/textures/NativeImageAccessor.java diff --git a/src/mixin/java/me/jellysquid/mods/sodium/mixin/features/textures/SpriteContentsInvoker.java b/src/main/java/me/jellysquid/mods/sodium/mixin/features/textures/SpriteContentsInvoker.java similarity index 100% rename from src/mixin/java/me/jellysquid/mods/sodium/mixin/features/textures/SpriteContentsInvoker.java rename to src/main/java/me/jellysquid/mods/sodium/mixin/features/textures/SpriteContentsInvoker.java diff --git a/src/mixin/java/me/jellysquid/mods/sodium/mixin/features/textures/animations/tracking/BlockModelRendererMixin.java b/src/main/java/me/jellysquid/mods/sodium/mixin/features/textures/animations/tracking/BlockModelRendererMixin.java similarity index 100% rename from src/mixin/java/me/jellysquid/mods/sodium/mixin/features/textures/animations/tracking/BlockModelRendererMixin.java rename to src/main/java/me/jellysquid/mods/sodium/mixin/features/textures/animations/tracking/BlockModelRendererMixin.java diff --git a/src/mixin/java/me/jellysquid/mods/sodium/mixin/features/textures/animations/tracking/DrawContextMixin.java b/src/main/java/me/jellysquid/mods/sodium/mixin/features/textures/animations/tracking/DrawContextMixin.java similarity index 100% rename from src/mixin/java/me/jellysquid/mods/sodium/mixin/features/textures/animations/tracking/DrawContextMixin.java rename to src/main/java/me/jellysquid/mods/sodium/mixin/features/textures/animations/tracking/DrawContextMixin.java diff --git a/src/mixin/java/me/jellysquid/mods/sodium/mixin/features/textures/animations/tracking/SpriteAtlasTextureMixin.java b/src/main/java/me/jellysquid/mods/sodium/mixin/features/textures/animations/tracking/SpriteAtlasTextureMixin.java similarity index 100% rename from src/mixin/java/me/jellysquid/mods/sodium/mixin/features/textures/animations/tracking/SpriteAtlasTextureMixin.java rename to src/main/java/me/jellysquid/mods/sodium/mixin/features/textures/animations/tracking/SpriteAtlasTextureMixin.java diff --git a/src/mixin/java/me/jellysquid/mods/sodium/mixin/features/textures/animations/tracking/SpriteBillboardParticleMixin.java b/src/main/java/me/jellysquid/mods/sodium/mixin/features/textures/animations/tracking/SpriteBillboardParticleMixin.java similarity index 100% rename from src/mixin/java/me/jellysquid/mods/sodium/mixin/features/textures/animations/tracking/SpriteBillboardParticleMixin.java rename to src/main/java/me/jellysquid/mods/sodium/mixin/features/textures/animations/tracking/SpriteBillboardParticleMixin.java diff --git a/src/mixin/java/me/jellysquid/mods/sodium/mixin/features/textures/animations/tracking/SpriteContentsAnimationAccessor.java b/src/main/java/me/jellysquid/mods/sodium/mixin/features/textures/animations/tracking/SpriteContentsAnimationAccessor.java similarity index 100% rename from src/mixin/java/me/jellysquid/mods/sodium/mixin/features/textures/animations/tracking/SpriteContentsAnimationAccessor.java rename to src/main/java/me/jellysquid/mods/sodium/mixin/features/textures/animations/tracking/SpriteContentsAnimationAccessor.java diff --git a/src/mixin/java/me/jellysquid/mods/sodium/mixin/features/textures/animations/tracking/SpriteContentsAnimationFrameAccessor.java b/src/main/java/me/jellysquid/mods/sodium/mixin/features/textures/animations/tracking/SpriteContentsAnimationFrameAccessor.java similarity index 100% rename from src/mixin/java/me/jellysquid/mods/sodium/mixin/features/textures/animations/tracking/SpriteContentsAnimationFrameAccessor.java rename to src/main/java/me/jellysquid/mods/sodium/mixin/features/textures/animations/tracking/SpriteContentsAnimationFrameAccessor.java diff --git a/src/mixin/java/me/jellysquid/mods/sodium/mixin/features/textures/animations/tracking/SpriteContentsAnimatorImplMixin.java b/src/main/java/me/jellysquid/mods/sodium/mixin/features/textures/animations/tracking/SpriteContentsAnimatorImplMixin.java similarity index 100% rename from src/mixin/java/me/jellysquid/mods/sodium/mixin/features/textures/animations/tracking/SpriteContentsAnimatorImplMixin.java rename to src/main/java/me/jellysquid/mods/sodium/mixin/features/textures/animations/tracking/SpriteContentsAnimatorImplMixin.java diff --git a/src/mixin/java/me/jellysquid/mods/sodium/mixin/features/textures/animations/tracking/SpriteContentsMixin.java b/src/main/java/me/jellysquid/mods/sodium/mixin/features/textures/animations/tracking/SpriteContentsMixin.java similarity index 100% rename from src/mixin/java/me/jellysquid/mods/sodium/mixin/features/textures/animations/tracking/SpriteContentsMixin.java rename to src/main/java/me/jellysquid/mods/sodium/mixin/features/textures/animations/tracking/SpriteContentsMixin.java diff --git a/src/mixin/java/me/jellysquid/mods/sodium/mixin/features/textures/animations/tracking/SpriteMixin.java b/src/main/java/me/jellysquid/mods/sodium/mixin/features/textures/animations/tracking/SpriteMixin.java similarity index 100% rename from src/mixin/java/me/jellysquid/mods/sodium/mixin/features/textures/animations/tracking/SpriteMixin.java rename to src/main/java/me/jellysquid/mods/sodium/mixin/features/textures/animations/tracking/SpriteMixin.java diff --git a/src/mixin/java/me/jellysquid/mods/sodium/mixin/features/textures/animations/upload/SpriteContentsAccessor.java b/src/main/java/me/jellysquid/mods/sodium/mixin/features/textures/animations/upload/SpriteContentsAccessor.java similarity index 100% rename from src/mixin/java/me/jellysquid/mods/sodium/mixin/features/textures/animations/upload/SpriteContentsAccessor.java rename to src/main/java/me/jellysquid/mods/sodium/mixin/features/textures/animations/upload/SpriteContentsAccessor.java diff --git a/src/mixin/java/me/jellysquid/mods/sodium/mixin/features/textures/animations/upload/SpriteContentsAnimationAccessor.java b/src/main/java/me/jellysquid/mods/sodium/mixin/features/textures/animations/upload/SpriteContentsAnimationAccessor.java similarity index 100% rename from src/mixin/java/me/jellysquid/mods/sodium/mixin/features/textures/animations/upload/SpriteContentsAnimationAccessor.java rename to src/main/java/me/jellysquid/mods/sodium/mixin/features/textures/animations/upload/SpriteContentsAnimationAccessor.java diff --git a/src/mixin/java/me/jellysquid/mods/sodium/mixin/features/textures/animations/upload/SpriteContentsAnimationFrameAccessor.java b/src/main/java/me/jellysquid/mods/sodium/mixin/features/textures/animations/upload/SpriteContentsAnimationFrameAccessor.java similarity index 100% rename from src/mixin/java/me/jellysquid/mods/sodium/mixin/features/textures/animations/upload/SpriteContentsAnimationFrameAccessor.java rename to src/main/java/me/jellysquid/mods/sodium/mixin/features/textures/animations/upload/SpriteContentsAnimationFrameAccessor.java diff --git a/src/mixin/java/me/jellysquid/mods/sodium/mixin/features/textures/animations/upload/SpriteContentsAnimatorImplAccessor.java b/src/main/java/me/jellysquid/mods/sodium/mixin/features/textures/animations/upload/SpriteContentsAnimatorImplAccessor.java similarity index 100% rename from src/mixin/java/me/jellysquid/mods/sodium/mixin/features/textures/animations/upload/SpriteContentsAnimatorImplAccessor.java rename to src/main/java/me/jellysquid/mods/sodium/mixin/features/textures/animations/upload/SpriteContentsAnimatorImplAccessor.java diff --git a/src/mixin/java/me/jellysquid/mods/sodium/mixin/features/textures/animations/upload/SpriteContentsInterpolationMixin.java b/src/main/java/me/jellysquid/mods/sodium/mixin/features/textures/animations/upload/SpriteContentsInterpolationMixin.java similarity index 100% rename from src/mixin/java/me/jellysquid/mods/sodium/mixin/features/textures/animations/upload/SpriteContentsInterpolationMixin.java rename to src/main/java/me/jellysquid/mods/sodium/mixin/features/textures/animations/upload/SpriteContentsInterpolationMixin.java diff --git a/src/mixin/java/me/jellysquid/mods/sodium/mixin/features/textures/mipmaps/MipmapHelperMixin.java b/src/main/java/me/jellysquid/mods/sodium/mixin/features/textures/mipmaps/MipmapHelperMixin.java similarity index 100% rename from src/mixin/java/me/jellysquid/mods/sodium/mixin/features/textures/mipmaps/MipmapHelperMixin.java rename to src/main/java/me/jellysquid/mods/sodium/mixin/features/textures/mipmaps/MipmapHelperMixin.java diff --git a/src/mixin/java/me/jellysquid/mods/sodium/mixin/features/textures/mipmaps/SpriteContentsMixin.java b/src/main/java/me/jellysquid/mods/sodium/mixin/features/textures/mipmaps/SpriteContentsMixin.java similarity index 100% rename from src/mixin/java/me/jellysquid/mods/sodium/mixin/features/textures/mipmaps/SpriteContentsMixin.java rename to src/main/java/me/jellysquid/mods/sodium/mixin/features/textures/mipmaps/SpriteContentsMixin.java diff --git a/src/mixin/java/me/jellysquid/mods/sodium/mixin/features/world/biome/BiomeMixin.java b/src/main/java/me/jellysquid/mods/sodium/mixin/features/world/biome/BiomeMixin.java similarity index 100% rename from src/mixin/java/me/jellysquid/mods/sodium/mixin/features/world/biome/BiomeMixin.java rename to src/main/java/me/jellysquid/mods/sodium/mixin/features/world/biome/BiomeMixin.java diff --git a/src/mixin/java/me/jellysquid/mods/sodium/mixin/modcompat/fabric_renderer_indigo/ItemRenderContextMixin.java b/src/main/java/me/jellysquid/mods/sodium/mixin/modcompat/fabric_renderer_indigo/ItemRenderContextMixin.java similarity index 100% rename from src/mixin/java/me/jellysquid/mods/sodium/mixin/modcompat/fabric_renderer_indigo/ItemRenderContextMixin.java rename to src/main/java/me/jellysquid/mods/sodium/mixin/modcompat/fabric_renderer_indigo/ItemRenderContextMixin.java diff --git a/src/mixin/java/me/jellysquid/mods/sodium/mixin/workarounds/context_creation/WindowMixin.java b/src/main/java/me/jellysquid/mods/sodium/mixin/workarounds/context_creation/WindowMixin.java similarity index 100% rename from src/mixin/java/me/jellysquid/mods/sodium/mixin/workarounds/context_creation/WindowMixin.java rename to src/main/java/me/jellysquid/mods/sodium/mixin/workarounds/context_creation/WindowMixin.java diff --git a/src/mixin/java/me/jellysquid/mods/sodium/mixin/workarounds/event_loop/RenderSystemMixin.java b/src/main/java/me/jellysquid/mods/sodium/mixin/workarounds/event_loop/RenderSystemMixin.java similarity index 100% rename from src/mixin/java/me/jellysquid/mods/sodium/mixin/workarounds/event_loop/RenderSystemMixin.java rename to src/main/java/me/jellysquid/mods/sodium/mixin/workarounds/event_loop/RenderSystemMixin.java diff --git a/src/main/java/org/embeddedt/embeddium/impl/mixinterface/MinecraftAccessor.java b/src/main/java/org/embeddedt/embeddium/impl/mixinterface/MinecraftAccessor.java deleted file mode 100644 index b0bc80fb8..000000000 --- a/src/main/java/org/embeddedt/embeddium/impl/mixinterface/MinecraftAccessor.java +++ /dev/null @@ -1,5 +0,0 @@ -package org.embeddedt.embeddium.impl.mixinterface; - -public interface MinecraftAccessor { - Thread embeddium$getGameThread(); -} diff --git a/src/main/java/org/embeddedt/embeddium/impl/mixinterface/NativeImageAccessor.java b/src/main/java/org/embeddedt/embeddium/impl/mixinterface/NativeImageAccessor.java deleted file mode 100644 index df58a8f6d..000000000 --- a/src/main/java/org/embeddedt/embeddium/impl/mixinterface/NativeImageAccessor.java +++ /dev/null @@ -1,5 +0,0 @@ -package org.embeddedt.embeddium.impl.mixinterface; - -public interface NativeImageAccessor { - long embeddium$getPixels(); -} diff --git a/src/main/java/org/embeddedt/embeddium/impl/render/chunk/compile/GlobalChunkBuildContext.java b/src/main/java/org/embeddedt/embeddium/impl/render/chunk/compile/GlobalChunkBuildContext.java index 98d5dfc6b..2e70894d8 100644 --- a/src/main/java/org/embeddedt/embeddium/impl/render/chunk/compile/GlobalChunkBuildContext.java +++ b/src/main/java/org/embeddedt/embeddium/impl/render/chunk/compile/GlobalChunkBuildContext.java @@ -1,8 +1,8 @@ package org.embeddedt.embeddium.impl.render.chunk.compile; import me.jellysquid.mods.sodium.client.render.chunk.compile.ChunkBuildContext; +import me.jellysquid.mods.sodium.mixin.core.render.MinecraftAccessor; import net.minecraft.client.Minecraft; -import org.embeddedt.embeddium.impl.mixinterface.MinecraftAccessor; import org.jetbrains.annotations.Nullable; public final class GlobalChunkBuildContext { diff --git a/src/main/java/org/embeddedt/embeddium/taint/scanning/TaintDetector.java b/src/main/java/org/embeddedt/embeddium/taint/scanning/TaintDetector.java index 6f0d79d09..35d9d2a22 100644 --- a/src/main/java/org/embeddedt/embeddium/taint/scanning/TaintDetector.java +++ b/src/main/java/org/embeddedt/embeddium/taint/scanning/TaintDetector.java @@ -5,6 +5,7 @@ import com.google.common.collect.ArrayListMultimap; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Multimap; +import me.jellysquid.mods.sodium.mixin.MixinClassValidator; import net.minecraftforge.fml.loading.FMLLoader; import net.minecraftforge.fml.loading.moddiscovery.ModFile; import net.minecraftforge.fml.loading.moddiscovery.ModFileInfo; diff --git a/src/mixin/resources/embeddium.mixins.json b/src/main/resources/embeddium.mixins.json similarity index 100% rename from src/mixin/resources/embeddium.mixins.json rename to src/main/resources/embeddium.mixins.json diff --git a/src/mixin/java/me/jellysquid/mods/sodium/mixin/features/textures/NativeImageMixin.java b/src/mixin/java/me/jellysquid/mods/sodium/mixin/features/textures/NativeImageMixin.java deleted file mode 100644 index 6e7f85b09..000000000 --- a/src/mixin/java/me/jellysquid/mods/sodium/mixin/features/textures/NativeImageMixin.java +++ /dev/null @@ -1,17 +0,0 @@ -package me.jellysquid.mods.sodium.mixin.features.textures; - -import com.mojang.blaze3d.platform.NativeImage; -import org.embeddedt.embeddium.impl.mixinterface.NativeImageAccessor; -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.Shadow; - -@Mixin(NativeImage.class) -public class NativeImageMixin implements NativeImageAccessor { - @Shadow - private long pixels; - - @Override - public long embeddium$getPixels() { - return this.pixels; - } -}