diff --git a/changelog.md b/changelog.md index cf39ba9..dc5b42b 100644 --- a/changelog.md +++ b/changelog.md @@ -1,10 +1,16 @@ ------------------------------------------------------ -Version 1.19.0 +Version 2.0.0 ------------------------------------------------------ Updated to MC 1.21 **Changes** -- The previously deprecated `nanoTime` parameter in `PostWorldRenderCallback` and `PostWorldRenderCallbackV2` has been removed +- The root package has been changed from `ladysnake.satin` to `org.ladysnake.satin` + - global search-replace of `ladysnake.satin` -> `org.ladysnake.satin` should do the trick for the migration in your projects + +**Removals** +- Removed the `nanoTime` parameter in `PostWorldRenderCallback` and `PostWorldRenderCallbackV2` (deprecated since 1.17.0) +- Removed the `ShaderEffectManager#manageProgram` methods (deprecated since 1.6.0) +- Removed deprecated `GlMatrices` methods (deprecated since 1.1.0) ------------------------------------------------------ Version 1.18.0 diff --git a/gradle.properties b/gradle.properties index 84b64e8..0780326 100644 --- a/gradle.properties +++ b/gradle.properties @@ -10,7 +10,7 @@ loader_version=0.15.11 fabric_version=0.99.5+1.21 # Mod Properties -mod_version = 1.19.0 +mod_version = 2.0.0 owners = Ladysnake maven_group = org.ladysnake archives_base_name = satin diff --git a/src/main/java/ladysnake/satin/Satin.java b/src/main/java/org/ladysnake/satin/Satin.java similarity index 90% rename from src/main/java/ladysnake/satin/Satin.java rename to src/main/java/org/ladysnake/satin/Satin.java index b62d663..37ffb5f 100644 --- a/src/main/java/ladysnake/satin/Satin.java +++ b/src/main/java/org/ladysnake/satin/Satin.java @@ -15,16 +15,16 @@ * You should have received a copy of the GNU Lesser General Public License * along with this program; If not, see . */ -package ladysnake.satin; +package org.ladysnake.satin; -import ladysnake.satin.api.event.ResolutionChangeCallback; -import ladysnake.satin.api.event.WorldRendererReloadCallback; -import ladysnake.satin.impl.ReloadableShaderEffectManager; import net.fabricmc.api.ClientModInitializer; import net.fabricmc.loader.api.FabricLoader; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.apiguardian.api.API; +import org.ladysnake.satin.api.event.ResolutionChangeCallback; +import org.ladysnake.satin.api.event.WorldRendererReloadCallback; +import org.ladysnake.satin.impl.ReloadableShaderEffectManager; import static org.apiguardian.api.API.Status.STABLE; diff --git a/src/main/java/ladysnake/satin/api/event/EntitiesPostRenderCallback.java b/src/main/java/org/ladysnake/satin/api/event/EntitiesPostRenderCallback.java similarity index 97% rename from src/main/java/ladysnake/satin/api/event/EntitiesPostRenderCallback.java rename to src/main/java/org/ladysnake/satin/api/event/EntitiesPostRenderCallback.java index 88c51d2..3ae4d6d 100644 --- a/src/main/java/ladysnake/satin/api/event/EntitiesPostRenderCallback.java +++ b/src/main/java/org/ladysnake/satin/api/event/EntitiesPostRenderCallback.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU Lesser General Public License * along with this program; If not, see . */ -package ladysnake.satin.api.event; +package org.ladysnake.satin.api.event; import net.fabricmc.fabric.api.event.Event; import net.fabricmc.fabric.api.event.EventFactory; diff --git a/src/main/java/ladysnake/satin/api/event/EntitiesPreRenderCallback.java b/src/main/java/org/ladysnake/satin/api/event/EntitiesPreRenderCallback.java similarity index 97% rename from src/main/java/ladysnake/satin/api/event/EntitiesPreRenderCallback.java rename to src/main/java/org/ladysnake/satin/api/event/EntitiesPreRenderCallback.java index 8b64753..34afa8e 100644 --- a/src/main/java/ladysnake/satin/api/event/EntitiesPreRenderCallback.java +++ b/src/main/java/org/ladysnake/satin/api/event/EntitiesPreRenderCallback.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU Lesser General Public License * along with this program; If not, see . */ -package ladysnake.satin.api.event; +package org.ladysnake.satin.api.event; import net.fabricmc.fabric.api.event.Event; import net.fabricmc.fabric.api.event.EventFactory; diff --git a/src/main/java/ladysnake/satin/api/event/PickEntityShaderCallback.java b/src/main/java/org/ladysnake/satin/api/event/PickEntityShaderCallback.java similarity index 98% rename from src/main/java/ladysnake/satin/api/event/PickEntityShaderCallback.java rename to src/main/java/org/ladysnake/satin/api/event/PickEntityShaderCallback.java index 693f063..8604a03 100644 --- a/src/main/java/ladysnake/satin/api/event/PickEntityShaderCallback.java +++ b/src/main/java/org/ladysnake/satin/api/event/PickEntityShaderCallback.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU Lesser General Public License * along with this program; If not, see . */ -package ladysnake.satin.api.event; +package org.ladysnake.satin.api.event; import net.fabricmc.fabric.api.event.Event; import net.fabricmc.fabric.api.event.EventFactory; diff --git a/src/main/java/ladysnake/satin/api/event/PostWorldRenderCallback.java b/src/main/java/org/ladysnake/satin/api/event/PostWorldRenderCallback.java similarity index 98% rename from src/main/java/ladysnake/satin/api/event/PostWorldRenderCallback.java rename to src/main/java/org/ladysnake/satin/api/event/PostWorldRenderCallback.java index 1087d01..1334504 100644 --- a/src/main/java/ladysnake/satin/api/event/PostWorldRenderCallback.java +++ b/src/main/java/org/ladysnake/satin/api/event/PostWorldRenderCallback.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU Lesser General Public License * along with this program; If not, see . */ -package ladysnake.satin.api.event; +package org.ladysnake.satin.api.event; import net.fabricmc.fabric.api.event.Event; import net.fabricmc.fabric.api.event.EventFactory; diff --git a/src/main/java/ladysnake/satin/api/event/PostWorldRenderCallbackV2.java b/src/main/java/org/ladysnake/satin/api/event/PostWorldRenderCallbackV2.java similarity index 98% rename from src/main/java/ladysnake/satin/api/event/PostWorldRenderCallbackV2.java rename to src/main/java/org/ladysnake/satin/api/event/PostWorldRenderCallbackV2.java index 611b9ea..1d6f442 100644 --- a/src/main/java/ladysnake/satin/api/event/PostWorldRenderCallbackV2.java +++ b/src/main/java/org/ladysnake/satin/api/event/PostWorldRenderCallbackV2.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU Lesser General Public License * along with this program; If not, see . */ -package ladysnake.satin.api.event; +package org.ladysnake.satin.api.event; import net.fabricmc.fabric.api.event.Event; import net.fabricmc.fabric.api.event.EventFactory; diff --git a/src/main/java/ladysnake/satin/api/event/PostWorldRenderCallbackV3.java b/src/main/java/org/ladysnake/satin/api/event/PostWorldRenderCallbackV3.java similarity index 98% rename from src/main/java/ladysnake/satin/api/event/PostWorldRenderCallbackV3.java rename to src/main/java/org/ladysnake/satin/api/event/PostWorldRenderCallbackV3.java index f43dd27..504ca16 100644 --- a/src/main/java/ladysnake/satin/api/event/PostWorldRenderCallbackV3.java +++ b/src/main/java/org/ladysnake/satin/api/event/PostWorldRenderCallbackV3.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU Lesser General Public License * along with this program; If not, see . */ -package ladysnake.satin.api.event; +package org.ladysnake.satin.api.event; import net.fabricmc.fabric.api.event.Event; import net.fabricmc.fabric.api.event.EventFactory; diff --git a/src/main/java/ladysnake/satin/api/event/ResolutionChangeCallback.java b/src/main/java/org/ladysnake/satin/api/event/ResolutionChangeCallback.java similarity index 97% rename from src/main/java/ladysnake/satin/api/event/ResolutionChangeCallback.java rename to src/main/java/org/ladysnake/satin/api/event/ResolutionChangeCallback.java index 004a644..0add7f6 100644 --- a/src/main/java/ladysnake/satin/api/event/ResolutionChangeCallback.java +++ b/src/main/java/org/ladysnake/satin/api/event/ResolutionChangeCallback.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU Lesser General Public License * along with this program; If not, see . */ -package ladysnake.satin.api.event; +package org.ladysnake.satin.api.event; import net.fabricmc.fabric.api.event.Event; import net.fabricmc.fabric.api.event.EventFactory; diff --git a/src/main/java/ladysnake/satin/api/event/ShaderEffectRenderCallback.java b/src/main/java/org/ladysnake/satin/api/event/ShaderEffectRenderCallback.java similarity index 97% rename from src/main/java/ladysnake/satin/api/event/ShaderEffectRenderCallback.java rename to src/main/java/org/ladysnake/satin/api/event/ShaderEffectRenderCallback.java index 1b0c2d5..279ff15 100644 --- a/src/main/java/ladysnake/satin/api/event/ShaderEffectRenderCallback.java +++ b/src/main/java/org/ladysnake/satin/api/event/ShaderEffectRenderCallback.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU Lesser General Public License * along with this program; If not, see . */ -package ladysnake.satin.api.event; +package org.ladysnake.satin.api.event; import net.fabricmc.fabric.api.event.Event; import net.fabricmc.fabric.api.event.EventFactory; diff --git a/src/main/java/ladysnake/satin/api/event/WorldRendererReloadCallback.java b/src/main/java/org/ladysnake/satin/api/event/WorldRendererReloadCallback.java similarity index 97% rename from src/main/java/ladysnake/satin/api/event/WorldRendererReloadCallback.java rename to src/main/java/org/ladysnake/satin/api/event/WorldRendererReloadCallback.java index ebdd046..0108d23 100644 --- a/src/main/java/ladysnake/satin/api/event/WorldRendererReloadCallback.java +++ b/src/main/java/org/ladysnake/satin/api/event/WorldRendererReloadCallback.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU Lesser General Public License * along with this program; If not, see . */ -package ladysnake.satin.api.event; +package org.ladysnake.satin.api.event; import net.fabricmc.fabric.api.event.Event; import net.fabricmc.fabric.api.event.EventFactory; diff --git a/src/main/java/ladysnake/satin/api/event/package-info.java b/src/main/java/org/ladysnake/satin/api/event/package-info.java similarity index 95% rename from src/main/java/ladysnake/satin/api/event/package-info.java rename to src/main/java/org/ladysnake/satin/api/event/package-info.java index 19cc393..d91b74a 100644 --- a/src/main/java/ladysnake/satin/api/event/package-info.java +++ b/src/main/java/org/ladysnake/satin/api/event/package-info.java @@ -19,6 +19,6 @@ * Callback definitions for Satin events */ @ParametersAreNonnullByDefault -package ladysnake.satin.api.event; +package org.ladysnake.satin.api.event; import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/ladysnake/satin/api/experimental/ReadableDepthFramebuffer.java b/src/main/java/org/ladysnake/satin/api/experimental/ReadableDepthFramebuffer.java similarity index 96% rename from src/main/java/ladysnake/satin/api/experimental/ReadableDepthFramebuffer.java rename to src/main/java/org/ladysnake/satin/api/experimental/ReadableDepthFramebuffer.java index 8b282f1..75e8c0b 100644 --- a/src/main/java/ladysnake/satin/api/experimental/ReadableDepthFramebuffer.java +++ b/src/main/java/org/ladysnake/satin/api/experimental/ReadableDepthFramebuffer.java @@ -15,14 +15,14 @@ * You should have received a copy of the GNU Lesser General Public License * along with this program; If not, see . */ -package ladysnake.satin.api.experimental; +package org.ladysnake.satin.api.experimental; -import ladysnake.satin.api.event.PostWorldRenderCallback; import net.minecraft.client.MinecraftClient; import net.minecraft.client.gl.Framebuffer; import net.minecraft.client.option.GraphicsMode; import net.minecraft.client.render.WorldRenderer; import org.apiguardian.api.API; +import org.ladysnake.satin.api.event.PostWorldRenderCallback; import static org.apiguardian.api.API.Status.EXPERIMENTAL; diff --git a/src/main/java/ladysnake/satin/api/managed/ManagedCoreShader.java b/src/main/java/org/ladysnake/satin/api/managed/ManagedCoreShader.java similarity index 90% rename from src/main/java/ladysnake/satin/api/managed/ManagedCoreShader.java rename to src/main/java/org/ladysnake/satin/api/managed/ManagedCoreShader.java index e8eb953..0368b73 100644 --- a/src/main/java/ladysnake/satin/api/managed/ManagedCoreShader.java +++ b/src/main/java/org/ladysnake/satin/api/managed/ManagedCoreShader.java @@ -15,15 +15,16 @@ * You should have received a copy of the GNU Lesser General Public License * along with this program; If not, see . */ -package ladysnake.satin.api.managed; +package org.ladysnake.satin.api.managed; -import ladysnake.satin.api.managed.uniform.UniformFinder; import net.minecraft.client.gl.ShaderProgram; import net.minecraft.client.render.RenderLayer; import net.minecraft.client.render.RenderPhase; import net.minecraft.client.render.VertexFormat; import net.minecraft.util.Identifier; import org.apiguardian.api.API; +import org.ladysnake.satin.api.managed.uniform.UniformFinder; +import org.ladysnake.satin.api.util.RenderLayerHelper; import java.util.function.Consumer; @@ -53,7 +54,7 @@ public interface ManagedCoreShader extends UniformFinder { * * @param baseLayer the layer to copy * @return a render layer using this shader program - * @see ladysnake.satin.api.util.RenderLayerHelper#copy(RenderLayer, String, Consumer) + * @see RenderLayerHelper#copy(RenderLayer, String, Consumer) */ RenderLayer getRenderLayer(RenderLayer baseLayer); } diff --git a/src/main/java/ladysnake/satin/api/managed/ManagedFramebuffer.java b/src/main/java/org/ladysnake/satin/api/managed/ManagedFramebuffer.java similarity index 93% rename from src/main/java/ladysnake/satin/api/managed/ManagedFramebuffer.java rename to src/main/java/org/ladysnake/satin/api/managed/ManagedFramebuffer.java index 0dc283f..1ceb967 100644 --- a/src/main/java/ladysnake/satin/api/managed/ManagedFramebuffer.java +++ b/src/main/java/org/ladysnake/satin/api/managed/ManagedFramebuffer.java @@ -15,13 +15,14 @@ * You should have received a copy of the GNU Lesser General Public License * along with this program; If not, see . */ -package ladysnake.satin.api.managed; +package org.ladysnake.satin.api.managed; import net.minecraft.client.gl.Framebuffer; import net.minecraft.client.render.RenderLayer; import net.minecraft.client.render.RenderPhase; import net.minecraft.client.util.Window; import org.apiguardian.api.API; +import org.ladysnake.satin.api.util.RenderLayerHelper; import javax.annotation.Nullable; import java.util.function.Consumer; @@ -68,7 +69,7 @@ public interface ManagedFramebuffer { * * @param baseLayer the layer to copy * @return a render layer using this framebuffer - * @see ladysnake.satin.api.util.RenderLayerHelper#copy(RenderLayer, String, Consumer) + * @see RenderLayerHelper#copy(RenderLayer, String, Consumer) */ RenderLayer getRenderLayer(RenderLayer baseLayer); } diff --git a/src/main/java/ladysnake/satin/api/managed/ManagedShaderEffect.java b/src/main/java/org/ladysnake/satin/api/managed/ManagedShaderEffect.java similarity index 93% rename from src/main/java/ladysnake/satin/api/managed/ManagedShaderEffect.java rename to src/main/java/org/ladysnake/satin/api/managed/ManagedShaderEffect.java index 16f31c5..b6beab5 100644 --- a/src/main/java/ladysnake/satin/api/managed/ManagedShaderEffect.java +++ b/src/main/java/org/ladysnake/satin/api/managed/ManagedShaderEffect.java @@ -15,20 +15,8 @@ * You should have received a copy of the GNU Lesser General Public License * along with this program; If not, see . */ -package ladysnake.satin.api.managed; +package org.ladysnake.satin.api.managed; -import ladysnake.satin.api.managed.uniform.SamplerUniform; -import ladysnake.satin.api.managed.uniform.SamplerUniformV2; -import ladysnake.satin.api.managed.uniform.Uniform1f; -import ladysnake.satin.api.managed.uniform.Uniform1i; -import ladysnake.satin.api.managed.uniform.Uniform2f; -import ladysnake.satin.api.managed.uniform.Uniform2i; -import ladysnake.satin.api.managed.uniform.Uniform3f; -import ladysnake.satin.api.managed.uniform.Uniform3i; -import ladysnake.satin.api.managed.uniform.Uniform4f; -import ladysnake.satin.api.managed.uniform.Uniform4i; -import ladysnake.satin.api.managed.uniform.UniformFinder; -import ladysnake.satin.api.managed.uniform.UniformMat4; import net.minecraft.client.MinecraftClient; import net.minecraft.client.gl.Framebuffer; import net.minecraft.client.gl.PostEffectProcessor; @@ -36,6 +24,18 @@ import net.minecraft.util.Identifier; import org.apiguardian.api.API; import org.joml.Matrix4f; +import org.ladysnake.satin.api.managed.uniform.SamplerUniform; +import org.ladysnake.satin.api.managed.uniform.SamplerUniformV2; +import org.ladysnake.satin.api.managed.uniform.Uniform1f; +import org.ladysnake.satin.api.managed.uniform.Uniform1i; +import org.ladysnake.satin.api.managed.uniform.Uniform2f; +import org.ladysnake.satin.api.managed.uniform.Uniform2i; +import org.ladysnake.satin.api.managed.uniform.Uniform3f; +import org.ladysnake.satin.api.managed.uniform.Uniform3i; +import org.ladysnake.satin.api.managed.uniform.Uniform4f; +import org.ladysnake.satin.api.managed.uniform.Uniform4i; +import org.ladysnake.satin.api.managed.uniform.UniformFinder; +import org.ladysnake.satin.api.managed.uniform.UniformMat4; import javax.annotation.Nullable; import java.io.IOException; diff --git a/src/main/java/ladysnake/satin/api/managed/ShaderEffectManager.java b/src/main/java/org/ladysnake/satin/api/managed/ShaderEffectManager.java similarity index 83% rename from src/main/java/ladysnake/satin/api/managed/ShaderEffectManager.java rename to src/main/java/org/ladysnake/satin/api/managed/ShaderEffectManager.java index d763b1f..613872e 100644 --- a/src/main/java/ladysnake/satin/api/managed/ShaderEffectManager.java +++ b/src/main/java/org/ladysnake/satin/api/managed/ShaderEffectManager.java @@ -15,15 +15,14 @@ * You should have received a copy of the GNU Lesser General Public License * along with this program; If not, see . */ -package ladysnake.satin.api.managed; +package org.ladysnake.satin.api.managed; -import ladysnake.satin.impl.ReloadableShaderEffectManager; import net.minecraft.client.gl.PostEffectProcessor; import net.minecraft.client.render.VertexFormat; import net.minecraft.client.render.VertexFormats; import net.minecraft.util.Identifier; import org.apiguardian.api.API; -import org.jetbrains.annotations.ApiStatus; +import org.ladysnake.satin.impl.ReloadableShaderEffectManager; import java.util.function.Consumer; @@ -58,26 +57,6 @@ static ShaderEffectManager getInstance() { @API(status = STABLE, since = "1.0.0") ManagedShaderEffect manage(Identifier location, Consumer initCallback); - /** - * @deprecated use {@link #manageCoreShader(Identifier)}. - * Shader files must go in {@code shaders/core} instead of {@code shaders/program} - */ - @Deprecated(since = "1.6.0", forRemoval = true) - @ApiStatus.ScheduledForRemoval - default ManagedCoreShader manageProgram(Identifier location) { - return manageCoreShader(location); - } - - /** - * @deprecated use {@link #manageCoreShader(Identifier, VertexFormat, Consumer)}. - * Shader files must go in {@code shaders/core} instead of {@code shaders/program} - */ - @Deprecated(since = "1.6.0", forRemoval = true) - @ApiStatus.ScheduledForRemoval - default ManagedCoreShader manageProgram(Identifier location, Consumer initCallback) { - return manageCoreShader(location, VertexFormats.POSITION_COLOR_TEXTURE_OVERLAY_LIGHT_NORMAL, initCallback); - } - /** * Manages a core {@link net.minecraft.client.gl.ShaderProgram} loaded from a json definition file * diff --git a/src/main/java/ladysnake/satin/api/managed/package-info.java b/src/main/java/org/ladysnake/satin/api/managed/package-info.java similarity index 95% rename from src/main/java/ladysnake/satin/api/managed/package-info.java rename to src/main/java/org/ladysnake/satin/api/managed/package-info.java index 5b6fd22..3b4b6c2 100644 --- a/src/main/java/ladysnake/satin/api/managed/package-info.java +++ b/src/main/java/org/ladysnake/satin/api/managed/package-info.java @@ -19,6 +19,6 @@ * Classes describing managed shader effects facilities */ @ParametersAreNonnullByDefault -package ladysnake.satin.api.managed; +package org.ladysnake.satin.api.managed; import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/ladysnake/satin/api/managed/uniform/SamplerUniform.java b/src/main/java/org/ladysnake/satin/api/managed/uniform/SamplerUniform.java similarity index 97% rename from src/main/java/ladysnake/satin/api/managed/uniform/SamplerUniform.java rename to src/main/java/org/ladysnake/satin/api/managed/uniform/SamplerUniform.java index 0bdd3b3..fce8426 100644 --- a/src/main/java/ladysnake/satin/api/managed/uniform/SamplerUniform.java +++ b/src/main/java/org/ladysnake/satin/api/managed/uniform/SamplerUniform.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU Lesser General Public License * along with this program; If not, see . */ -package ladysnake.satin.api.managed.uniform; +package org.ladysnake.satin.api.managed.uniform; import net.minecraft.client.gl.Framebuffer; import net.minecraft.client.texture.AbstractTexture; diff --git a/src/main/java/ladysnake/satin/api/managed/uniform/SamplerUniformV2.java b/src/main/java/org/ladysnake/satin/api/managed/uniform/SamplerUniformV2.java similarity index 85% rename from src/main/java/ladysnake/satin/api/managed/uniform/SamplerUniformV2.java rename to src/main/java/org/ladysnake/satin/api/managed/uniform/SamplerUniformV2.java index 82419c3..9c5bd50 100644 --- a/src/main/java/ladysnake/satin/api/managed/uniform/SamplerUniformV2.java +++ b/src/main/java/org/ladysnake/satin/api/managed/uniform/SamplerUniformV2.java @@ -15,9 +15,10 @@ * You should have received a copy of the GNU Lesser General Public License * along with this program; If not, see . */ -package ladysnake.satin.api.managed.uniform; +package org.ladysnake.satin.api.managed.uniform; import org.apiguardian.api.API; +import org.ladysnake.satin.api.managed.ManagedShaderEffect; import java.util.function.IntSupplier; @@ -28,7 +29,7 @@ public interface SamplerUniformV2 extends SamplerUniform { /** * Sets the value of a sampler uniform declared in json * - *

This method is only supported for {@link ladysnake.satin.api.managed.ManagedShaderEffect} + *

This method is only supported for {@link ManagedShaderEffect} * * @param textureSupplier a supplier for opengl texture names */ diff --git a/src/main/java/ladysnake/satin/api/managed/uniform/Uniform1f.java b/src/main/java/org/ladysnake/satin/api/managed/uniform/Uniform1f.java similarity index 95% rename from src/main/java/ladysnake/satin/api/managed/uniform/Uniform1f.java rename to src/main/java/org/ladysnake/satin/api/managed/uniform/Uniform1f.java index d26809d..ad077f7 100644 --- a/src/main/java/ladysnake/satin/api/managed/uniform/Uniform1f.java +++ b/src/main/java/org/ladysnake/satin/api/managed/uniform/Uniform1f.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU Lesser General Public License * along with this program; If not, see . */ -package ladysnake.satin.api.managed.uniform; +package org.ladysnake.satin.api.managed.uniform; import org.apiguardian.api.API; diff --git a/src/main/java/ladysnake/satin/api/managed/uniform/Uniform1i.java b/src/main/java/org/ladysnake/satin/api/managed/uniform/Uniform1i.java similarity index 95% rename from src/main/java/ladysnake/satin/api/managed/uniform/Uniform1i.java rename to src/main/java/org/ladysnake/satin/api/managed/uniform/Uniform1i.java index d412dde..baebc84 100644 --- a/src/main/java/ladysnake/satin/api/managed/uniform/Uniform1i.java +++ b/src/main/java/org/ladysnake/satin/api/managed/uniform/Uniform1i.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU Lesser General Public License * along with this program; If not, see . */ -package ladysnake.satin.api.managed.uniform; +package org.ladysnake.satin.api.managed.uniform; import org.apiguardian.api.API; diff --git a/src/main/java/ladysnake/satin/api/managed/uniform/Uniform2f.java b/src/main/java/org/ladysnake/satin/api/managed/uniform/Uniform2f.java similarity index 96% rename from src/main/java/ladysnake/satin/api/managed/uniform/Uniform2f.java rename to src/main/java/org/ladysnake/satin/api/managed/uniform/Uniform2f.java index 41f7516..d0aca46 100644 --- a/src/main/java/ladysnake/satin/api/managed/uniform/Uniform2f.java +++ b/src/main/java/org/ladysnake/satin/api/managed/uniform/Uniform2f.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU Lesser General Public License * along with this program; If not, see . */ -package ladysnake.satin.api.managed.uniform; +package org.ladysnake.satin.api.managed.uniform; import org.apiguardian.api.API; import org.joml.Vector2f; diff --git a/src/main/java/ladysnake/satin/api/managed/uniform/Uniform2i.java b/src/main/java/org/ladysnake/satin/api/managed/uniform/Uniform2i.java similarity index 95% rename from src/main/java/ladysnake/satin/api/managed/uniform/Uniform2i.java rename to src/main/java/org/ladysnake/satin/api/managed/uniform/Uniform2i.java index 7dcbc04..e166e94 100644 --- a/src/main/java/ladysnake/satin/api/managed/uniform/Uniform2i.java +++ b/src/main/java/org/ladysnake/satin/api/managed/uniform/Uniform2i.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU Lesser General Public License * along with this program; If not, see . */ -package ladysnake.satin.api.managed.uniform; +package org.ladysnake.satin.api.managed.uniform; import org.apiguardian.api.API; diff --git a/src/main/java/ladysnake/satin/api/managed/uniform/Uniform3f.java b/src/main/java/org/ladysnake/satin/api/managed/uniform/Uniform3f.java similarity index 96% rename from src/main/java/ladysnake/satin/api/managed/uniform/Uniform3f.java rename to src/main/java/org/ladysnake/satin/api/managed/uniform/Uniform3f.java index 181cd2e..54e43b5 100644 --- a/src/main/java/ladysnake/satin/api/managed/uniform/Uniform3f.java +++ b/src/main/java/org/ladysnake/satin/api/managed/uniform/Uniform3f.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU Lesser General Public License * along with this program; If not, see . */ -package ladysnake.satin.api.managed.uniform; +package org.ladysnake.satin.api.managed.uniform; import org.apiguardian.api.API; import org.joml.Vector3f; diff --git a/src/main/java/ladysnake/satin/api/managed/uniform/Uniform3i.java b/src/main/java/org/ladysnake/satin/api/managed/uniform/Uniform3i.java similarity index 95% rename from src/main/java/ladysnake/satin/api/managed/uniform/Uniform3i.java rename to src/main/java/org/ladysnake/satin/api/managed/uniform/Uniform3i.java index ecd1407..c47d309 100644 --- a/src/main/java/ladysnake/satin/api/managed/uniform/Uniform3i.java +++ b/src/main/java/org/ladysnake/satin/api/managed/uniform/Uniform3i.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU Lesser General Public License * along with this program; If not, see . */ -package ladysnake.satin.api.managed.uniform; +package org.ladysnake.satin.api.managed.uniform; import org.apiguardian.api.API; diff --git a/src/main/java/ladysnake/satin/api/managed/uniform/Uniform4f.java b/src/main/java/org/ladysnake/satin/api/managed/uniform/Uniform4f.java similarity index 96% rename from src/main/java/ladysnake/satin/api/managed/uniform/Uniform4f.java rename to src/main/java/org/ladysnake/satin/api/managed/uniform/Uniform4f.java index dd240fa..d839e63 100644 --- a/src/main/java/ladysnake/satin/api/managed/uniform/Uniform4f.java +++ b/src/main/java/org/ladysnake/satin/api/managed/uniform/Uniform4f.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU Lesser General Public License * along with this program; If not, see . */ -package ladysnake.satin.api.managed.uniform; +package org.ladysnake.satin.api.managed.uniform; import org.apiguardian.api.API; import org.joml.Vector4f; diff --git a/src/main/java/ladysnake/satin/api/managed/uniform/Uniform4i.java b/src/main/java/org/ladysnake/satin/api/managed/uniform/Uniform4i.java similarity index 95% rename from src/main/java/ladysnake/satin/api/managed/uniform/Uniform4i.java rename to src/main/java/org/ladysnake/satin/api/managed/uniform/Uniform4i.java index 7718b4c..a4397e7 100644 --- a/src/main/java/ladysnake/satin/api/managed/uniform/Uniform4i.java +++ b/src/main/java/org/ladysnake/satin/api/managed/uniform/Uniform4i.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU Lesser General Public License * along with this program; If not, see . */ -package ladysnake.satin.api.managed.uniform; +package org.ladysnake.satin.api.managed.uniform; import org.apiguardian.api.API; diff --git a/src/main/java/ladysnake/satin/api/managed/uniform/UniformFinder.java b/src/main/java/org/ladysnake/satin/api/managed/uniform/UniformFinder.java similarity index 98% rename from src/main/java/ladysnake/satin/api/managed/uniform/UniformFinder.java rename to src/main/java/org/ladysnake/satin/api/managed/uniform/UniformFinder.java index 6e634d6..e2cc25b 100644 --- a/src/main/java/ladysnake/satin/api/managed/uniform/UniformFinder.java +++ b/src/main/java/org/ladysnake/satin/api/managed/uniform/UniformFinder.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU Lesser General Public License * along with this program; If not, see . */ -package ladysnake.satin.api.managed.uniform; +package org.ladysnake.satin.api.managed.uniform; import org.apiguardian.api.API; diff --git a/src/main/java/ladysnake/satin/api/managed/uniform/UniformMat4.java b/src/main/java/org/ladysnake/satin/api/managed/uniform/UniformMat4.java similarity index 97% rename from src/main/java/ladysnake/satin/api/managed/uniform/UniformMat4.java rename to src/main/java/org/ladysnake/satin/api/managed/uniform/UniformMat4.java index b3d1c50..215cad6 100644 --- a/src/main/java/ladysnake/satin/api/managed/uniform/UniformMat4.java +++ b/src/main/java/org/ladysnake/satin/api/managed/uniform/UniformMat4.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU Lesser General Public License * along with this program; If not, see . */ -package ladysnake.satin.api.managed.uniform; +package org.ladysnake.satin.api.managed.uniform; import org.apiguardian.api.API; import org.joml.Matrix4f; diff --git a/src/main/java/ladysnake/satin/api/util/GlMatrices.java b/src/main/java/org/ladysnake/satin/api/util/GlMatrices.java similarity index 89% rename from src/main/java/ladysnake/satin/api/util/GlMatrices.java rename to src/main/java/org/ladysnake/satin/api/util/GlMatrices.java index 486a23f..7e71822 100644 --- a/src/main/java/ladysnake/satin/api/util/GlMatrices.java +++ b/src/main/java/org/ladysnake/satin/api/util/GlMatrices.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU Lesser General Public License * along with this program; If not, see . */ -package ladysnake.satin.api.util; +package org.ladysnake.satin.api.util; import com.mojang.blaze3d.systems.RenderSystem; import org.apiguardian.api.API; @@ -28,7 +28,7 @@ import java.nio.FloatBuffer; import java.util.Arrays; -import static org.apiguardian.api.API.Status.*; +import static org.apiguardian.api.API.Status.MAINTAINED; /** * This class consists of static methods that operate on matrices. @@ -46,10 +46,7 @@ public final class GlMatrices { */ @API(status = MAINTAINED) public static FloatBuffer getTmpBuffer() { - // we need to upcast the buffer, as later Java versions overload the return value - Buffer buffer = GlMatrices.buffer; - buffer.clear(); - return GlMatrices.buffer; + return GlMatrices.buffer.clear(); } /** @@ -111,7 +108,7 @@ public static FloatBuffer getModelViewMatrixInverse(FloatBuffer outMat) { * @return projectionMatrix */ @Nonnull - @API(status = EXPERIMENTAL) + @API(status = MAINTAINED) public static Matrix4f getInverseTransformMatrix(Matrix4f outMat) { Matrix4f projection = RenderSystem.getProjectionMatrix(); Matrix4f modelView = RenderSystem.getModelViewMatrix(); @@ -122,42 +119,6 @@ public static Matrix4f getInverseTransformMatrix(Matrix4f outMat) { return outMat; } - /** - * @deprecated use getProjectionMatrix(getTmpBuffer()) for the same result - */ - @Deprecated - @API(status = DEPRECATED) - public static FloatBuffer getProjectionMatrix() { - return getProjectionMatrix(getTmpBuffer()); - } - - /** - * @deprecated use getProjectionMatrixInverse(getTmpBuffer()) for the same result - */ - @Deprecated - @API(status = DEPRECATED) - public static FloatBuffer getProjectionMatrixInverse() { - return getProjectionMatrixInverse(getTmpBuffer()); - } - - /** - * @deprecated use getModelViewMatrix(getTmpBuffer()) for the same result - */ - @Deprecated - @API(status = DEPRECATED) - public static FloatBuffer getModelViewMatrix() { - return getModelViewMatrix(getTmpBuffer()); - } - - /** - * @deprecated use getModelViewMatrixInverse(getTmpBuffer()) for the same result - */ - @Deprecated - @API(status = DEPRECATED) - public static FloatBuffer getModelViewMatrixInverse() { - return getModelViewMatrixInverse(getTmpBuffer()); - } - /** * Inverts a 4x4 matrix stored in a float array *

diff --git a/src/main/java/ladysnake/satin/api/util/RenderLayerHelper.java b/src/main/java/org/ladysnake/satin/api/util/RenderLayerHelper.java similarity index 94% rename from src/main/java/ladysnake/satin/api/util/RenderLayerHelper.java rename to src/main/java/org/ladysnake/satin/api/util/RenderLayerHelper.java index b6d5df8..f1941af 100644 --- a/src/main/java/ladysnake/satin/api/util/RenderLayerHelper.java +++ b/src/main/java/org/ladysnake/satin/api/util/RenderLayerHelper.java @@ -15,15 +15,15 @@ * You should have received a copy of the GNU Lesser General Public License * along with this program; If not, see . */ -package ladysnake.satin.api.util; +package org.ladysnake.satin.api.util; -import ladysnake.satin.impl.BlockRenderLayerRegistry; -import ladysnake.satin.impl.RenderLayerDuplicator; -import ladysnake.satin.mixin.client.render.RenderPhaseAccessor; import net.minecraft.client.MinecraftClient; import net.minecraft.client.render.RenderLayer; import net.minecraft.client.render.RenderPhase; import org.apiguardian.api.API; +import org.ladysnake.satin.impl.BlockRenderLayerRegistry; +import org.ladysnake.satin.impl.RenderLayerDuplicator; +import org.ladysnake.satin.mixin.client.render.RenderPhaseAccessor; import java.util.function.Consumer; diff --git a/src/main/java/ladysnake/satin/api/util/ShaderLinkException.java b/src/main/java/org/ladysnake/satin/api/util/ShaderLinkException.java similarity index 96% rename from src/main/java/ladysnake/satin/api/util/ShaderLinkException.java rename to src/main/java/org/ladysnake/satin/api/util/ShaderLinkException.java index 6e99787..d316889 100644 --- a/src/main/java/ladysnake/satin/api/util/ShaderLinkException.java +++ b/src/main/java/org/ladysnake/satin/api/util/ShaderLinkException.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU Lesser General Public License * along with this program; If not, see . */ -package ladysnake.satin.api.util; +package org.ladysnake.satin.api.util; /** * A {@code ShaderLinkException} is thrown by {@link ShaderLoader} diff --git a/src/main/java/ladysnake/satin/api/util/ShaderLoader.java b/src/main/java/org/ladysnake/satin/api/util/ShaderLoader.java similarity index 95% rename from src/main/java/ladysnake/satin/api/util/ShaderLoader.java rename to src/main/java/org/ladysnake/satin/api/util/ShaderLoader.java index 9c38e08..28358fa 100644 --- a/src/main/java/ladysnake/satin/api/util/ShaderLoader.java +++ b/src/main/java/org/ladysnake/satin/api/util/ShaderLoader.java @@ -15,12 +15,12 @@ * You should have received a copy of the GNU Lesser General Public License * along with this program; If not, see . */ -package ladysnake.satin.api.util; +package org.ladysnake.satin.api.util; -import ladysnake.satin.impl.ValidatingShaderLoader; import net.minecraft.resource.ResourceManager; import net.minecraft.util.Identifier; import org.apiguardian.api.API; +import org.ladysnake.satin.impl.ValidatingShaderLoader; import javax.annotation.Nullable; import java.io.IOException; diff --git a/src/main/java/ladysnake/satin/api/util/ShaderPrograms.java b/src/main/java/org/ladysnake/satin/api/util/ShaderPrograms.java similarity index 99% rename from src/main/java/ladysnake/satin/api/util/ShaderPrograms.java rename to src/main/java/org/ladysnake/satin/api/util/ShaderPrograms.java index a25f717..9b07590 100644 --- a/src/main/java/ladysnake/satin/api/util/ShaderPrograms.java +++ b/src/main/java/org/ladysnake/satin/api/util/ShaderPrograms.java @@ -15,19 +15,19 @@ * You should have received a copy of the GNU Lesser General Public License * along with this program; If not, see . */ -package ladysnake.satin.api.util; +package org.ladysnake.satin.api.util; import com.mojang.blaze3d.systems.RenderSystem; import it.unimi.dsi.fastutil.ints.Int2ObjectMap; import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap; import it.unimi.dsi.fastutil.objects.Object2IntMap; import it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap; -import ladysnake.satin.Satin; import net.minecraft.client.MinecraftClient; import net.minecraft.client.gl.GlProgramManager; import net.minecraft.client.gl.GlUniform; import net.minecraft.util.Identifier; import org.apiguardian.api.API; +import org.ladysnake.satin.Satin; import org.lwjgl.opengl.GL20; import java.nio.ByteBuffer; diff --git a/src/main/java/ladysnake/satin/api/util/package-info.java b/src/main/java/org/ladysnake/satin/api/util/package-info.java similarity index 95% rename from src/main/java/ladysnake/satin/api/util/package-info.java rename to src/main/java/org/ladysnake/satin/api/util/package-info.java index 97a7a65..5d89c4a 100644 --- a/src/main/java/ladysnake/satin/api/util/package-info.java +++ b/src/main/java/org/ladysnake/satin/api/util/package-info.java @@ -19,6 +19,6 @@ * Utility classes to deal with shaders */ @ParametersAreNonnullByDefault -package ladysnake.satin.api.util; +package org.ladysnake.satin.api.util; import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file diff --git a/src/main/java/ladysnake/satin/impl/BlockRenderLayerRegistry.java b/src/main/java/org/ladysnake/satin/impl/BlockRenderLayerRegistry.java similarity index 97% rename from src/main/java/ladysnake/satin/impl/BlockRenderLayerRegistry.java rename to src/main/java/org/ladysnake/satin/impl/BlockRenderLayerRegistry.java index 3b67ccc..4d9fafa 100644 --- a/src/main/java/ladysnake/satin/impl/BlockRenderLayerRegistry.java +++ b/src/main/java/org/ladysnake/satin/impl/BlockRenderLayerRegistry.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU Lesser General Public License * along with this program; If not, see . */ -package ladysnake.satin.impl; +package org.ladysnake.satin.impl; import it.unimi.dsi.fastutil.objects.ObjectArraySet; import net.minecraft.client.render.RenderLayer; diff --git a/src/main/java/ladysnake/satin/impl/CustomFormatFramebuffers.java b/src/main/java/org/ladysnake/satin/impl/CustomFormatFramebuffers.java similarity index 99% rename from src/main/java/ladysnake/satin/impl/CustomFormatFramebuffers.java rename to src/main/java/org/ladysnake/satin/impl/CustomFormatFramebuffers.java index 2e753a6..430f07c 100644 --- a/src/main/java/ladysnake/satin/impl/CustomFormatFramebuffers.java +++ b/src/main/java/org/ladysnake/satin/impl/CustomFormatFramebuffers.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU Lesser General Public License * along with this program; If not, see . */ -package ladysnake.satin.impl; +package org.ladysnake.satin.impl; import net.minecraft.client.gl.Framebuffer; import net.minecraft.client.gl.SimpleFramebuffer; diff --git a/src/main/java/ladysnake/satin/impl/FramebufferWrapper.java b/src/main/java/org/ladysnake/satin/impl/FramebufferWrapper.java similarity index 96% rename from src/main/java/ladysnake/satin/impl/FramebufferWrapper.java rename to src/main/java/org/ladysnake/satin/impl/FramebufferWrapper.java index 163740f..9f91d63 100644 --- a/src/main/java/ladysnake/satin/impl/FramebufferWrapper.java +++ b/src/main/java/org/ladysnake/satin/impl/FramebufferWrapper.java @@ -15,15 +15,15 @@ * You should have received a copy of the GNU Lesser General Public License * along with this program; If not, see . */ -package ladysnake.satin.impl; +package org.ladysnake.satin.impl; -import ladysnake.satin.Satin; -import ladysnake.satin.api.managed.ManagedFramebuffer; import net.minecraft.client.MinecraftClient; import net.minecraft.client.gl.Framebuffer; import net.minecraft.client.gl.PostEffectProcessor; import net.minecraft.client.render.RenderLayer; import net.minecraft.client.util.Window; +import org.ladysnake.satin.Satin; +import org.ladysnake.satin.api.managed.ManagedFramebuffer; import javax.annotation.Nullable; diff --git a/src/main/java/ladysnake/satin/impl/ManagedSamplerUniformBase.java b/src/main/java/org/ladysnake/satin/impl/ManagedSamplerUniformBase.java similarity index 97% rename from src/main/java/ladysnake/satin/impl/ManagedSamplerUniformBase.java rename to src/main/java/org/ladysnake/satin/impl/ManagedSamplerUniformBase.java index 0984ec4..f2d0e5a 100644 --- a/src/main/java/ladysnake/satin/impl/ManagedSamplerUniformBase.java +++ b/src/main/java/org/ladysnake/satin/impl/ManagedSamplerUniformBase.java @@ -15,15 +15,15 @@ * You should have received a copy of the GNU Lesser General Public License * along with this program; If not, see . */ -package ladysnake.satin.impl; +package org.ladysnake.satin.impl; import it.unimi.dsi.fastutil.ints.IntArrayList; import it.unimi.dsi.fastutil.ints.IntList; -import ladysnake.satin.api.managed.uniform.SamplerUniform; import net.minecraft.client.gl.GlUniform; import net.minecraft.client.gl.JsonEffectShaderProgram; import net.minecraft.client.gl.PostEffectPass; import net.minecraft.client.gl.ShaderProgram; +import org.ladysnake.satin.api.managed.uniform.SamplerUniform; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/ladysnake/satin/impl/ManagedSamplerUniformV1.java b/src/main/java/org/ladysnake/satin/impl/ManagedSamplerUniformV1.java similarity index 98% rename from src/main/java/ladysnake/satin/impl/ManagedSamplerUniformV1.java rename to src/main/java/org/ladysnake/satin/impl/ManagedSamplerUniformV1.java index 50362eb..7b5c67d 100644 --- a/src/main/java/ladysnake/satin/impl/ManagedSamplerUniformV1.java +++ b/src/main/java/org/ladysnake/satin/impl/ManagedSamplerUniformV1.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU Lesser General Public License * along with this program; If not, see . */ -package ladysnake.satin.impl; +package org.ladysnake.satin.impl; import net.minecraft.client.gl.Framebuffer; import net.minecraft.client.gl.ShaderProgram; diff --git a/src/main/java/ladysnake/satin/impl/ManagedSamplerUniformV2.java b/src/main/java/org/ladysnake/satin/impl/ManagedSamplerUniformV2.java similarity index 94% rename from src/main/java/ladysnake/satin/impl/ManagedSamplerUniformV2.java rename to src/main/java/org/ladysnake/satin/impl/ManagedSamplerUniformV2.java index 90a4c53..4bec8dd 100644 --- a/src/main/java/ladysnake/satin/impl/ManagedSamplerUniformV2.java +++ b/src/main/java/org/ladysnake/satin/impl/ManagedSamplerUniformV2.java @@ -15,12 +15,12 @@ * You should have received a copy of the GNU Lesser General Public License * along with this program; If not, see . */ -package ladysnake.satin.impl; +package org.ladysnake.satin.impl; -import ladysnake.satin.api.managed.uniform.SamplerUniformV2; import net.minecraft.client.gl.Framebuffer; import net.minecraft.client.gl.JsonEffectShaderProgram; import net.minecraft.client.texture.AbstractTexture; +import org.ladysnake.satin.api.managed.uniform.SamplerUniformV2; import java.util.function.IntSupplier; diff --git a/src/main/java/ladysnake/satin/impl/ManagedUniform.java b/src/main/java/org/ladysnake/satin/impl/ManagedUniform.java similarity index 93% rename from src/main/java/ladysnake/satin/impl/ManagedUniform.java rename to src/main/java/org/ladysnake/satin/impl/ManagedUniform.java index 797f3ff..865fbb5 100644 --- a/src/main/java/ladysnake/satin/impl/ManagedUniform.java +++ b/src/main/java/org/ladysnake/satin/impl/ManagedUniform.java @@ -15,17 +15,8 @@ * You should have received a copy of the GNU Lesser General Public License * along with this program; If not, see . */ -package ladysnake.satin.impl; +package org.ladysnake.satin.impl; -import ladysnake.satin.api.managed.uniform.Uniform1f; -import ladysnake.satin.api.managed.uniform.Uniform1i; -import ladysnake.satin.api.managed.uniform.Uniform2f; -import ladysnake.satin.api.managed.uniform.Uniform2i; -import ladysnake.satin.api.managed.uniform.Uniform3f; -import ladysnake.satin.api.managed.uniform.Uniform3i; -import ladysnake.satin.api.managed.uniform.Uniform4f; -import ladysnake.satin.api.managed.uniform.Uniform4i; -import ladysnake.satin.api.managed.uniform.UniformMat4; import net.minecraft.client.gl.GlUniform; import net.minecraft.client.gl.PostEffectPass; import net.minecraft.client.gl.ShaderProgram; @@ -33,6 +24,15 @@ import org.joml.Vector2f; import org.joml.Vector3f; import org.joml.Vector4f; +import org.ladysnake.satin.api.managed.uniform.Uniform1f; +import org.ladysnake.satin.api.managed.uniform.Uniform1i; +import org.ladysnake.satin.api.managed.uniform.Uniform2f; +import org.ladysnake.satin.api.managed.uniform.Uniform2i; +import org.ladysnake.satin.api.managed.uniform.Uniform3f; +import org.ladysnake.satin.api.managed.uniform.Uniform3i; +import org.ladysnake.satin.api.managed.uniform.Uniform4f; +import org.ladysnake.satin.api.managed.uniform.Uniform4i; +import org.ladysnake.satin.api.managed.uniform.UniformMat4; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/ladysnake/satin/impl/ManagedUniformBase.java b/src/main/java/org/ladysnake/satin/impl/ManagedUniformBase.java similarity index 97% rename from src/main/java/ladysnake/satin/impl/ManagedUniformBase.java rename to src/main/java/org/ladysnake/satin/impl/ManagedUniformBase.java index ad89051..7ffb1b2 100644 --- a/src/main/java/ladysnake/satin/impl/ManagedUniformBase.java +++ b/src/main/java/org/ladysnake/satin/impl/ManagedUniformBase.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU Lesser General Public License * along with this program; If not, see . */ -package ladysnake.satin.impl; +package org.ladysnake.satin.impl; import net.minecraft.client.gl.PostEffectPass; import net.minecraft.client.gl.ShaderProgram; diff --git a/src/main/java/ladysnake/satin/impl/ReloadableShaderEffectManager.java b/src/main/java/org/ladysnake/satin/impl/ReloadableShaderEffectManager.java similarity index 91% rename from src/main/java/ladysnake/satin/impl/ReloadableShaderEffectManager.java rename to src/main/java/org/ladysnake/satin/impl/ReloadableShaderEffectManager.java index b6749cc..e40d5b6 100644 --- a/src/main/java/ladysnake/satin/impl/ReloadableShaderEffectManager.java +++ b/src/main/java/org/ladysnake/satin/impl/ReloadableShaderEffectManager.java @@ -15,15 +15,9 @@ * You should have received a copy of the GNU Lesser General Public License * along with this program; If not, see . */ -package ladysnake.satin.impl; +package org.ladysnake.satin.impl; import it.unimi.dsi.fastutil.objects.ReferenceOpenHashSet; -import ladysnake.satin.Satin; -import ladysnake.satin.api.event.ResolutionChangeCallback; -import ladysnake.satin.api.event.WorldRendererReloadCallback; -import ladysnake.satin.api.managed.ManagedCoreShader; -import ladysnake.satin.api.managed.ManagedShaderEffect; -import ladysnake.satin.api.managed.ShaderEffectManager; import net.minecraft.client.MinecraftClient; import net.minecraft.client.render.VertexFormat; import net.minecraft.client.render.VertexFormats; @@ -31,6 +25,12 @@ import net.minecraft.client.util.Window; import net.minecraft.resource.ResourceFactory; import net.minecraft.util.Identifier; +import org.ladysnake.satin.Satin; +import org.ladysnake.satin.api.event.ResolutionChangeCallback; +import org.ladysnake.satin.api.event.WorldRendererReloadCallback; +import org.ladysnake.satin.api.managed.ManagedCoreShader; +import org.ladysnake.satin.api.managed.ManagedShaderEffect; +import org.ladysnake.satin.api.managed.ShaderEffectManager; import java.util.Set; import java.util.function.Consumer; @@ -43,7 +43,6 @@ */ public final class ReloadableShaderEffectManager implements ShaderEffectManager, ResolutionChangeCallback, WorldRendererReloadCallback { public static final ReloadableShaderEffectManager INSTANCE = new ReloadableShaderEffectManager(); - public static final Identifier SHADER_RESOURCE_KEY = Identifier.of("dissolution:shaders"); private final Set> managedShaders = new ReferenceOpenHashSet<>(); diff --git a/src/main/java/ladysnake/satin/impl/RenderLayerDuplicator.java b/src/main/java/org/ladysnake/satin/impl/RenderLayerDuplicator.java similarity index 98% rename from src/main/java/ladysnake/satin/impl/RenderLayerDuplicator.java rename to src/main/java/org/ladysnake/satin/impl/RenderLayerDuplicator.java index 5ccef38..389c182 100644 --- a/src/main/java/ladysnake/satin/impl/RenderLayerDuplicator.java +++ b/src/main/java/org/ladysnake/satin/impl/RenderLayerDuplicator.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU Lesser General Public License * along with this program; If not, see . */ -package ladysnake.satin.impl; +package org.ladysnake.satin.impl; import net.minecraft.client.render.RenderLayer; import net.minecraft.client.render.VertexFormat; diff --git a/src/main/java/ladysnake/satin/impl/RenderLayerSupplier.java b/src/main/java/org/ladysnake/satin/impl/RenderLayerSupplier.java similarity index 97% rename from src/main/java/ladysnake/satin/impl/RenderLayerSupplier.java rename to src/main/java/org/ladysnake/satin/impl/RenderLayerSupplier.java index 2bf15c1..2e78629 100644 --- a/src/main/java/ladysnake/satin/impl/RenderLayerSupplier.java +++ b/src/main/java/org/ladysnake/satin/impl/RenderLayerSupplier.java @@ -15,14 +15,14 @@ * You should have received a copy of the GNU Lesser General Public License * along with this program; If not, see . */ -package ladysnake.satin.impl; +package org.ladysnake.satin.impl; -import ladysnake.satin.mixin.client.render.RenderPhaseAccessor; import net.minecraft.client.gl.ShaderProgram; import net.minecraft.client.render.RenderLayer; import net.minecraft.client.render.RenderPhase; import net.minecraft.client.render.VertexFormat; import org.jetbrains.annotations.Nullable; +import org.ladysnake.satin.mixin.client.render.RenderPhaseAccessor; import java.util.HashMap; import java.util.Map; diff --git a/src/main/java/ladysnake/satin/impl/ResettableManagedCoreShader.java b/src/main/java/org/ladysnake/satin/impl/ResettableManagedCoreShader.java similarity index 94% rename from src/main/java/ladysnake/satin/impl/ResettableManagedCoreShader.java rename to src/main/java/org/ladysnake/satin/impl/ResettableManagedCoreShader.java index 222780e..eb10392 100644 --- a/src/main/java/ladysnake/satin/impl/ResettableManagedCoreShader.java +++ b/src/main/java/org/ladysnake/satin/impl/ResettableManagedCoreShader.java @@ -15,12 +15,9 @@ * You should have received a copy of the GNU Lesser General Public License * along with this program; If not, see . */ -package ladysnake.satin.impl; +package org.ladysnake.satin.impl; import com.google.common.base.Preconditions; -import ladysnake.satin.Satin; -import ladysnake.satin.api.managed.ManagedCoreShader; -import ladysnake.satin.api.managed.uniform.SamplerUniform; import net.fabricmc.fabric.impl.client.rendering.FabricShaderProgram; import net.minecraft.client.MinecraftClient; import net.minecraft.client.gl.ShaderProgram; @@ -28,6 +25,9 @@ import net.minecraft.client.render.VertexFormat; import net.minecraft.resource.ResourceFactory; import net.minecraft.util.Identifier; +import org.ladysnake.satin.Satin; +import org.ladysnake.satin.api.managed.ManagedCoreShader; +import org.ladysnake.satin.api.managed.uniform.SamplerUniform; import java.io.IOException; import java.util.HashMap; diff --git a/src/main/java/ladysnake/satin/impl/ResettableManagedShaderBase.java b/src/main/java/org/ladysnake/satin/impl/ResettableManagedShaderBase.java similarity index 90% rename from src/main/java/ladysnake/satin/impl/ResettableManagedShaderBase.java rename to src/main/java/org/ladysnake/satin/impl/ResettableManagedShaderBase.java index bd83308..47508ad 100644 --- a/src/main/java/ladysnake/satin/impl/ResettableManagedShaderBase.java +++ b/src/main/java/org/ladysnake/satin/impl/ResettableManagedShaderBase.java @@ -15,23 +15,23 @@ * You should have received a copy of the GNU Lesser General Public License * along with this program; If not, see . */ -package ladysnake.satin.impl; - -import ladysnake.satin.Satin; -import ladysnake.satin.api.managed.uniform.Uniform1f; -import ladysnake.satin.api.managed.uniform.Uniform1i; -import ladysnake.satin.api.managed.uniform.Uniform2f; -import ladysnake.satin.api.managed.uniform.Uniform2i; -import ladysnake.satin.api.managed.uniform.Uniform3f; -import ladysnake.satin.api.managed.uniform.Uniform3i; -import ladysnake.satin.api.managed.uniform.Uniform4f; -import ladysnake.satin.api.managed.uniform.Uniform4i; -import ladysnake.satin.api.managed.uniform.UniformFinder; -import ladysnake.satin.api.managed.uniform.UniformMat4; +package org.ladysnake.satin.impl; + import net.minecraft.client.MinecraftClient; import net.minecraft.resource.ResourceFactory; import net.minecraft.util.Identifier; import org.apiguardian.api.API; +import org.ladysnake.satin.Satin; +import org.ladysnake.satin.api.managed.uniform.Uniform1f; +import org.ladysnake.satin.api.managed.uniform.Uniform1i; +import org.ladysnake.satin.api.managed.uniform.Uniform2f; +import org.ladysnake.satin.api.managed.uniform.Uniform2i; +import org.ladysnake.satin.api.managed.uniform.Uniform3f; +import org.ladysnake.satin.api.managed.uniform.Uniform3i; +import org.ladysnake.satin.api.managed.uniform.Uniform4f; +import org.ladysnake.satin.api.managed.uniform.Uniform4i; +import org.ladysnake.satin.api.managed.uniform.UniformFinder; +import org.ladysnake.satin.api.managed.uniform.UniformMat4; import javax.annotation.CheckForNull; import java.io.IOException; diff --git a/src/main/java/ladysnake/satin/impl/ResettableManagedShaderEffect.java b/src/main/java/org/ladysnake/satin/impl/ResettableManagedShaderEffect.java similarity index 95% rename from src/main/java/ladysnake/satin/impl/ResettableManagedShaderEffect.java rename to src/main/java/org/ladysnake/satin/impl/ResettableManagedShaderEffect.java index 1af1a1d..5c85544 100644 --- a/src/main/java/ladysnake/satin/impl/ResettableManagedShaderEffect.java +++ b/src/main/java/org/ladysnake/satin/impl/ResettableManagedShaderEffect.java @@ -15,17 +15,10 @@ * You should have received a copy of the GNU Lesser General Public License * along with this program; If not, see . */ -package ladysnake.satin.impl; +package org.ladysnake.satin.impl; import com.google.common.base.Preconditions; import com.mojang.blaze3d.systems.RenderSystem; -import ladysnake.satin.Satin; -import ladysnake.satin.api.managed.ManagedFramebuffer; -import ladysnake.satin.api.managed.ManagedShaderEffect; -import ladysnake.satin.api.managed.ShaderEffectManager; -import ladysnake.satin.api.managed.uniform.SamplerUniformV2; -import ladysnake.satin.api.util.ShaderPrograms; -import ladysnake.satin.mixin.client.AccessiblePassesShaderEffect; import net.minecraft.client.MinecraftClient; import net.minecraft.client.gl.Framebuffer; import net.minecraft.client.gl.JsonEffectShaderProgram; @@ -35,6 +28,13 @@ import net.minecraft.util.Identifier; import org.apiguardian.api.API; import org.joml.Matrix4f; +import org.ladysnake.satin.Satin; +import org.ladysnake.satin.api.managed.ManagedFramebuffer; +import org.ladysnake.satin.api.managed.ManagedShaderEffect; +import org.ladysnake.satin.api.managed.ShaderEffectManager; +import org.ladysnake.satin.api.managed.uniform.SamplerUniformV2; +import org.ladysnake.satin.api.util.ShaderPrograms; +import org.ladysnake.satin.mixin.client.AccessiblePassesShaderEffect; import javax.annotation.Nullable; import java.io.IOException; diff --git a/src/main/java/ladysnake/satin/impl/SamplerAccess.java b/src/main/java/org/ladysnake/satin/impl/SamplerAccess.java similarity index 96% rename from src/main/java/ladysnake/satin/impl/SamplerAccess.java rename to src/main/java/org/ladysnake/satin/impl/SamplerAccess.java index 11471a5..20bb153 100644 --- a/src/main/java/ladysnake/satin/impl/SamplerAccess.java +++ b/src/main/java/org/ladysnake/satin/impl/SamplerAccess.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU Lesser General Public License * along with this program; If not, see . */ -package ladysnake.satin.impl; +package org.ladysnake.satin.impl; import java.util.List; diff --git a/src/main/java/ladysnake/satin/impl/ValidatingShaderLoader.java b/src/main/java/org/ladysnake/satin/impl/ValidatingShaderLoader.java similarity index 96% rename from src/main/java/ladysnake/satin/impl/ValidatingShaderLoader.java rename to src/main/java/org/ladysnake/satin/impl/ValidatingShaderLoader.java index 86676c3..351c0c5 100644 --- a/src/main/java/ladysnake/satin/impl/ValidatingShaderLoader.java +++ b/src/main/java/org/ladysnake/satin/impl/ValidatingShaderLoader.java @@ -15,14 +15,14 @@ * You should have received a copy of the GNU Lesser General Public License * along with this program; If not, see . */ -package ladysnake.satin.impl; +package org.ladysnake.satin.impl; import com.mojang.blaze3d.platform.GlStateManager; -import ladysnake.satin.Satin; -import ladysnake.satin.api.util.ShaderLinkException; -import ladysnake.satin.api.util.ShaderLoader; import net.minecraft.resource.ResourceManager; import net.minecraft.util.Identifier; +import org.ladysnake.satin.Satin; +import org.ladysnake.satin.api.util.ShaderLinkException; +import org.ladysnake.satin.api.util.ShaderLoader; import org.lwjgl.opengl.ARBShaderObjects; import org.lwjgl.opengl.GL30; diff --git a/src/main/java/ladysnake/satin/impl/package-info.java b/src/main/java/org/ladysnake/satin/impl/package-info.java similarity index 96% rename from src/main/java/ladysnake/satin/impl/package-info.java rename to src/main/java/org/ladysnake/satin/impl/package-info.java index 172d1da..15e6ecd 100644 --- a/src/main/java/ladysnake/satin/impl/package-info.java +++ b/src/main/java/org/ladysnake/satin/impl/package-info.java @@ -20,7 +20,7 @@ */ @ApiStatus.Internal @ParametersAreNonnullByDefault -package ladysnake.satin.impl; +package org.ladysnake.satin.impl; import org.jetbrains.annotations.ApiStatus; diff --git a/src/main/java/ladysnake/satin/mixin/SatinMixinPlugin.java b/src/main/java/org/ladysnake/satin/mixin/SatinMixinPlugin.java similarity index 98% rename from src/main/java/ladysnake/satin/mixin/SatinMixinPlugin.java rename to src/main/java/org/ladysnake/satin/mixin/SatinMixinPlugin.java index c01911e..d5184a0 100644 --- a/src/main/java/ladysnake/satin/mixin/SatinMixinPlugin.java +++ b/src/main/java/org/ladysnake/satin/mixin/SatinMixinPlugin.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU Lesser General Public License * along with this program; If not, see . */ -package ladysnake.satin.mixin; +package org.ladysnake.satin.mixin; import net.fabricmc.loader.api.FabricLoader; import org.apache.logging.log4j.LogManager; diff --git a/src/main/java/ladysnake/satin/mixin/client/AccessiblePassesShaderEffect.java b/src/main/java/org/ladysnake/satin/mixin/client/AccessiblePassesShaderEffect.java similarity index 96% rename from src/main/java/ladysnake/satin/mixin/client/AccessiblePassesShaderEffect.java rename to src/main/java/org/ladysnake/satin/mixin/client/AccessiblePassesShaderEffect.java index 74cbb55..7783cee 100644 --- a/src/main/java/ladysnake/satin/mixin/client/AccessiblePassesShaderEffect.java +++ b/src/main/java/org/ladysnake/satin/mixin/client/AccessiblePassesShaderEffect.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU Lesser General Public License * along with this program; If not, see . */ -package ladysnake.satin.mixin.client; +package org.ladysnake.satin.mixin.client; import net.minecraft.client.gl.PostEffectPass; import net.minecraft.client.gl.PostEffectProcessor; diff --git a/src/main/java/ladysnake/satin/mixin/client/blockrenderlayer/RenderLayerMixin.java b/src/main/java/org/ladysnake/satin/mixin/client/blockrenderlayer/RenderLayerMixin.java similarity index 93% rename from src/main/java/ladysnake/satin/mixin/client/blockrenderlayer/RenderLayerMixin.java rename to src/main/java/org/ladysnake/satin/mixin/client/blockrenderlayer/RenderLayerMixin.java index aa85dfa..a9c95ab 100644 --- a/src/main/java/ladysnake/satin/mixin/client/blockrenderlayer/RenderLayerMixin.java +++ b/src/main/java/org/ladysnake/satin/mixin/client/blockrenderlayer/RenderLayerMixin.java @@ -15,12 +15,12 @@ * You should have received a copy of the GNU Lesser General Public License * along with this program; If not, see . */ -package ladysnake.satin.mixin.client.blockrenderlayer; +package org.ladysnake.satin.mixin.client.blockrenderlayer; import com.google.common.collect.ImmutableList; -import ladysnake.satin.impl.BlockRenderLayerRegistry; import net.minecraft.client.render.RenderLayer; import net.minecraft.client.render.RenderPhase; +import org.ladysnake.satin.impl.BlockRenderLayerRegistry; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; diff --git a/src/main/java/ladysnake/satin/mixin/client/blockrenderlayer/WorldRendererMixin.java b/src/main/java/org/ladysnake/satin/mixin/client/blockrenderlayer/WorldRendererMixin.java similarity index 96% rename from src/main/java/ladysnake/satin/mixin/client/blockrenderlayer/WorldRendererMixin.java rename to src/main/java/org/ladysnake/satin/mixin/client/blockrenderlayer/WorldRendererMixin.java index f71d65f..a655b0e 100644 --- a/src/main/java/ladysnake/satin/mixin/client/blockrenderlayer/WorldRendererMixin.java +++ b/src/main/java/org/ladysnake/satin/mixin/client/blockrenderlayer/WorldRendererMixin.java @@ -15,9 +15,8 @@ * You should have received a copy of the GNU Lesser General Public License * along with this program; If not, see . */ -package ladysnake.satin.mixin.client.blockrenderlayer; +package org.ladysnake.satin.mixin.client.blockrenderlayer; -import ladysnake.satin.impl.BlockRenderLayerRegistry; import net.minecraft.client.render.Camera; import net.minecraft.client.render.GameRenderer; import net.minecraft.client.render.LightmapTextureManager; @@ -25,6 +24,7 @@ import net.minecraft.client.render.RenderTickCounter; import net.minecraft.client.render.WorldRenderer; import org.joml.Matrix4f; +import org.ladysnake.satin.impl.BlockRenderLayerRegistry; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Shadow; import org.spongepowered.asm.mixin.injection.At; diff --git a/src/main/java/ladysnake/satin/mixin/client/event/GameRendererMixin.java b/src/main/java/org/ladysnake/satin/mixin/client/event/GameRendererMixin.java similarity index 92% rename from src/main/java/ladysnake/satin/mixin/client/event/GameRendererMixin.java rename to src/main/java/org/ladysnake/satin/mixin/client/event/GameRendererMixin.java index 5905b7d..0313850 100644 --- a/src/main/java/ladysnake/satin/mixin/client/event/GameRendererMixin.java +++ b/src/main/java/org/ladysnake/satin/mixin/client/event/GameRendererMixin.java @@ -15,17 +15,17 @@ * You should have received a copy of the GNU Lesser General Public License * along with this program; If not, see . */ -package ladysnake.satin.mixin.client.event; +package org.ladysnake.satin.mixin.client.event; -import ladysnake.satin.api.event.PickEntityShaderCallback; -import ladysnake.satin.api.event.ShaderEffectRenderCallback; -import ladysnake.satin.impl.ReloadableShaderEffectManager; import net.minecraft.client.gl.PostEffectProcessor; import net.minecraft.client.render.GameRenderer; import net.minecraft.client.render.RenderTickCounter; import net.minecraft.entity.Entity; import net.minecraft.resource.ResourceFactory; import net.minecraft.util.Identifier; +import org.ladysnake.satin.api.event.PickEntityShaderCallback; +import org.ladysnake.satin.api.event.ShaderEffectRenderCallback; +import org.ladysnake.satin.impl.ReloadableShaderEffectManager; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Shadow; import org.spongepowered.asm.mixin.injection.At; diff --git a/src/main/java/ladysnake/satin/mixin/client/event/MinecraftClientMixin.java b/src/main/java/org/ladysnake/satin/mixin/client/event/MinecraftClientMixin.java similarity index 93% rename from src/main/java/ladysnake/satin/mixin/client/event/MinecraftClientMixin.java rename to src/main/java/org/ladysnake/satin/mixin/client/event/MinecraftClientMixin.java index f1e2104..3b375d7 100644 --- a/src/main/java/ladysnake/satin/mixin/client/event/MinecraftClientMixin.java +++ b/src/main/java/org/ladysnake/satin/mixin/client/event/MinecraftClientMixin.java @@ -15,11 +15,11 @@ * You should have received a copy of the GNU Lesser General Public License * along with this program; If not, see . */ -package ladysnake.satin.mixin.client.event; +package org.ladysnake.satin.mixin.client.event; -import ladysnake.satin.api.event.ResolutionChangeCallback; import net.minecraft.client.MinecraftClient; import net.minecraft.client.util.Window; +import org.ladysnake.satin.api.event.ResolutionChangeCallback; import org.spongepowered.asm.mixin.Final; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Shadow; diff --git a/src/main/java/ladysnake/satin/mixin/client/event/WorldRendererMixin.java b/src/main/java/org/ladysnake/satin/mixin/client/event/WorldRendererMixin.java similarity index 92% rename from src/main/java/ladysnake/satin/mixin/client/event/WorldRendererMixin.java rename to src/main/java/org/ladysnake/satin/mixin/client/event/WorldRendererMixin.java index 3c4584f..ce52037 100644 --- a/src/main/java/ladysnake/satin/mixin/client/event/WorldRendererMixin.java +++ b/src/main/java/org/ladysnake/satin/mixin/client/event/WorldRendererMixin.java @@ -15,13 +15,9 @@ * You should have received a copy of the GNU Lesser General Public License * along with this program; If not, see . */ -package ladysnake.satin.mixin.client.event; +package org.ladysnake.satin.mixin.client.event; import com.llamalad7.mixinextras.sugar.Local; -import ladysnake.satin.api.event.EntitiesPostRenderCallback; -import ladysnake.satin.api.event.EntitiesPreRenderCallback; -import ladysnake.satin.api.event.PostWorldRenderCallbackV3; -import ladysnake.satin.api.experimental.ReadableDepthFramebuffer; import net.minecraft.client.MinecraftClient; import net.minecraft.client.render.Camera; import net.minecraft.client.render.Frustum; @@ -31,6 +27,10 @@ import net.minecraft.client.render.WorldRenderer; import net.minecraft.client.util.math.MatrixStack; import org.joml.Matrix4f; +import org.ladysnake.satin.api.event.EntitiesPostRenderCallback; +import org.ladysnake.satin.api.event.EntitiesPreRenderCallback; +import org.ladysnake.satin.api.event.PostWorldRenderCallbackV3; +import org.ladysnake.satin.api.experimental.ReadableDepthFramebuffer; import org.objectweb.asm.Opcodes; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Unique; diff --git a/src/main/java/ladysnake/satin/mixin/client/gl/CoreShaderMixin.java b/src/main/java/org/ladysnake/satin/mixin/client/gl/CoreShaderMixin.java similarity index 94% rename from src/main/java/ladysnake/satin/mixin/client/gl/CoreShaderMixin.java rename to src/main/java/org/ladysnake/satin/mixin/client/gl/CoreShaderMixin.java index e3ecb50..981bc16 100644 --- a/src/main/java/ladysnake/satin/mixin/client/gl/CoreShaderMixin.java +++ b/src/main/java/org/ladysnake/satin/mixin/client/gl/CoreShaderMixin.java @@ -15,10 +15,10 @@ * You should have received a copy of the GNU Lesser General Public License * along with this program; If not, see . */ -package ladysnake.satin.mixin.client.gl; +package org.ladysnake.satin.mixin.client.gl; -import ladysnake.satin.impl.SamplerAccess; import net.minecraft.client.gl.ShaderProgram; +import org.ladysnake.satin.impl.SamplerAccess; import org.spongepowered.asm.mixin.Final; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Shadow; diff --git a/src/main/java/ladysnake/satin/mixin/client/gl/CustomFormatFramebufferMixin.java b/src/main/java/org/ladysnake/satin/mixin/client/gl/CustomFormatFramebufferMixin.java similarity index 95% rename from src/main/java/ladysnake/satin/mixin/client/gl/CustomFormatFramebufferMixin.java rename to src/main/java/org/ladysnake/satin/mixin/client/gl/CustomFormatFramebufferMixin.java index 66adcb2..e828b56 100644 --- a/src/main/java/ladysnake/satin/mixin/client/gl/CustomFormatFramebufferMixin.java +++ b/src/main/java/org/ladysnake/satin/mixin/client/gl/CustomFormatFramebufferMixin.java @@ -15,12 +15,12 @@ * You should have received a copy of the GNU Lesser General Public License * along with this program; If not, see . */ -package ladysnake.satin.mixin.client.gl; +package org.ladysnake.satin.mixin.client.gl; import com.mojang.blaze3d.platform.GlConst; -import ladysnake.satin.impl.CustomFormatFramebuffers; import net.minecraft.client.gl.Framebuffer; import org.jetbrains.annotations.Nullable; +import org.ladysnake.satin.impl.CustomFormatFramebuffers; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Unique; import org.spongepowered.asm.mixin.injection.At; diff --git a/src/main/java/ladysnake/satin/mixin/client/gl/CustomFormatPostEffectProcessorMixin.java b/src/main/java/org/ladysnake/satin/mixin/client/gl/CustomFormatPostEffectProcessorMixin.java similarity index 96% rename from src/main/java/ladysnake/satin/mixin/client/gl/CustomFormatPostEffectProcessorMixin.java rename to src/main/java/org/ladysnake/satin/mixin/client/gl/CustomFormatPostEffectProcessorMixin.java index 4f672e9..d3298c4 100644 --- a/src/main/java/ladysnake/satin/mixin/client/gl/CustomFormatPostEffectProcessorMixin.java +++ b/src/main/java/org/ladysnake/satin/mixin/client/gl/CustomFormatPostEffectProcessorMixin.java @@ -15,15 +15,15 @@ * You should have received a copy of the GNU Lesser General Public License * along with this program; If not, see . */ -package ladysnake.satin.mixin.client.gl; +package org.ladysnake.satin.mixin.client.gl; import com.google.gson.JsonElement; import com.google.gson.JsonObject; -import ladysnake.satin.impl.CustomFormatFramebuffers; import net.minecraft.client.gl.PostEffectProcessor; import net.minecraft.client.texture.TextureManager; import net.minecraft.util.Identifier; import net.minecraft.util.JsonHelper; +import org.ladysnake.satin.impl.CustomFormatFramebuffers; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; diff --git a/src/main/java/ladysnake/satin/mixin/client/gl/DepthGlFramebufferMixin.java b/src/main/java/org/ladysnake/satin/mixin/client/gl/DepthGlFramebufferMixin.java similarity index 97% rename from src/main/java/ladysnake/satin/mixin/client/gl/DepthGlFramebufferMixin.java rename to src/main/java/org/ladysnake/satin/mixin/client/gl/DepthGlFramebufferMixin.java index 237d09b..d9fb68d 100644 --- a/src/main/java/ladysnake/satin/mixin/client/gl/DepthGlFramebufferMixin.java +++ b/src/main/java/org/ladysnake/satin/mixin/client/gl/DepthGlFramebufferMixin.java @@ -15,13 +15,13 @@ * You should have received a copy of the GNU Lesser General Public License * along with this program; If not, see . */ -package ladysnake.satin.mixin.client.gl; +package org.ladysnake.satin.mixin.client.gl; import com.mojang.blaze3d.platform.GlStateManager; import com.mojang.blaze3d.platform.TextureUtil; import com.mojang.blaze3d.systems.RenderSystem; -import ladysnake.satin.api.experimental.ReadableDepthFramebuffer; import net.minecraft.client.gl.Framebuffer; +import org.ladysnake.satin.api.experimental.ReadableDepthFramebuffer; import org.lwjgl.opengl.GL11; import org.objectweb.asm.Opcodes; import org.spongepowered.asm.mixin.Final; diff --git a/src/main/java/ladysnake/satin/mixin/client/gl/GlUniformMixin.java b/src/main/java/org/ladysnake/satin/mixin/client/gl/GlUniformMixin.java similarity index 96% rename from src/main/java/ladysnake/satin/mixin/client/gl/GlUniformMixin.java rename to src/main/java/org/ladysnake/satin/mixin/client/gl/GlUniformMixin.java index d5e9fd3..4bbc018 100644 --- a/src/main/java/ladysnake/satin/mixin/client/gl/GlUniformMixin.java +++ b/src/main/java/org/ladysnake/satin/mixin/client/gl/GlUniformMixin.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU Lesser General Public License * along with this program; If not, see . */ -package ladysnake.satin.mixin.client.gl; +package org.ladysnake.satin.mixin.client.gl; import net.minecraft.client.gl.GlUniform; import org.objectweb.asm.Opcodes; diff --git a/src/main/java/ladysnake/satin/mixin/client/gl/JsonEffectGlShaderMixin.java b/src/main/java/org/ladysnake/satin/mixin/client/gl/JsonEffectGlShaderMixin.java similarity index 97% rename from src/main/java/ladysnake/satin/mixin/client/gl/JsonEffectGlShaderMixin.java rename to src/main/java/org/ladysnake/satin/mixin/client/gl/JsonEffectGlShaderMixin.java index 42263fc..da28baf 100644 --- a/src/main/java/ladysnake/satin/mixin/client/gl/JsonEffectGlShaderMixin.java +++ b/src/main/java/org/ladysnake/satin/mixin/client/gl/JsonEffectGlShaderMixin.java @@ -15,15 +15,15 @@ * You should have received a copy of the GNU Lesser General Public License * along with this program; If not, see . */ -package ladysnake.satin.mixin.client.gl; +package org.ladysnake.satin.mixin.client.gl; import com.llamalad7.mixinextras.injector.wrapoperation.Operation; import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation; -import ladysnake.satin.impl.SamplerAccess; import net.minecraft.client.gl.JsonEffectShaderProgram; import net.minecraft.client.gl.ShaderStage; import net.minecraft.resource.ResourceFactory; import net.minecraft.util.Identifier; +import org.ladysnake.satin.impl.SamplerAccess; import org.spongepowered.asm.mixin.Final; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Shadow; diff --git a/src/main/java/ladysnake/satin/mixin/client/gl/package-info.java b/src/main/java/org/ladysnake/satin/mixin/client/gl/package-info.java similarity index 95% rename from src/main/java/ladysnake/satin/mixin/client/gl/package-info.java rename to src/main/java/org/ladysnake/satin/mixin/client/gl/package-info.java index e9e8beb..816225d 100644 --- a/src/main/java/ladysnake/satin/mixin/client/gl/package-info.java +++ b/src/main/java/org/ladysnake/satin/mixin/client/gl/package-info.java @@ -20,7 +20,7 @@ */ @ApiStatus.Internal @ParametersAreNonnullByDefault -package ladysnake.satin.mixin.client.gl; +package org.ladysnake.satin.mixin.client.gl; import org.jetbrains.annotations.ApiStatus; diff --git a/src/main/java/ladysnake/satin/mixin/client/render/RenderLayerAccessor.java b/src/main/java/org/ladysnake/satin/mixin/client/render/RenderLayerAccessor.java similarity index 96% rename from src/main/java/ladysnake/satin/mixin/client/render/RenderLayerAccessor.java rename to src/main/java/org/ladysnake/satin/mixin/client/render/RenderLayerAccessor.java index 3e30ac9..dfa1c77 100644 --- a/src/main/java/ladysnake/satin/mixin/client/render/RenderLayerAccessor.java +++ b/src/main/java/org/ladysnake/satin/mixin/client/render/RenderLayerAccessor.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU Lesser General Public License * along with this program; If not, see . */ -package ladysnake.satin.mixin.client.render; +package org.ladysnake.satin.mixin.client.render; import net.minecraft.client.render.RenderLayer; import net.minecraft.client.render.VertexFormat; diff --git a/src/main/java/ladysnake/satin/mixin/client/render/RenderLayerMixin.java b/src/main/java/org/ladysnake/satin/mixin/client/render/RenderLayerMixin.java similarity index 97% rename from src/main/java/ladysnake/satin/mixin/client/render/RenderLayerMixin.java rename to src/main/java/org/ladysnake/satin/mixin/client/render/RenderLayerMixin.java index aa6bddb..722a724 100644 --- a/src/main/java/ladysnake/satin/mixin/client/render/RenderLayerMixin.java +++ b/src/main/java/org/ladysnake/satin/mixin/client/render/RenderLayerMixin.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU Lesser General Public License * along with this program; If not, see . */ -package ladysnake.satin.mixin.client.render; +package org.ladysnake.satin.mixin.client.render; import net.minecraft.client.render.RenderLayer; import net.minecraft.client.render.RenderPhase; diff --git a/src/main/java/ladysnake/satin/mixin/client/render/RenderLayerMultiPhaseMixin.java b/src/main/java/org/ladysnake/satin/mixin/client/render/RenderLayerMultiPhaseMixin.java similarity index 96% rename from src/main/java/ladysnake/satin/mixin/client/render/RenderLayerMultiPhaseMixin.java rename to src/main/java/org/ladysnake/satin/mixin/client/render/RenderLayerMultiPhaseMixin.java index 5aa214f..0180b65 100644 --- a/src/main/java/ladysnake/satin/mixin/client/render/RenderLayerMultiPhaseMixin.java +++ b/src/main/java/org/ladysnake/satin/mixin/client/render/RenderLayerMultiPhaseMixin.java @@ -15,12 +15,12 @@ * You should have received a copy of the GNU Lesser General Public License * along with this program; If not, see . */ -package ladysnake.satin.mixin.client.render; +package org.ladysnake.satin.mixin.client.render; -import ladysnake.satin.impl.RenderLayerDuplicator; import net.minecraft.client.render.RenderLayer; import net.minecraft.client.render.VertexFormat; import org.jetbrains.annotations.Nullable; +import org.ladysnake.satin.impl.RenderLayerDuplicator; import org.spongepowered.asm.mixin.Final; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Shadow; diff --git a/src/main/java/ladysnake/satin/mixin/client/render/RenderPhaseAccessor.java b/src/main/java/org/ladysnake/satin/mixin/client/render/RenderPhaseAccessor.java similarity index 95% rename from src/main/java/ladysnake/satin/mixin/client/render/RenderPhaseAccessor.java rename to src/main/java/org/ladysnake/satin/mixin/client/render/RenderPhaseAccessor.java index 029c480..9be2f00 100644 --- a/src/main/java/ladysnake/satin/mixin/client/render/RenderPhaseAccessor.java +++ b/src/main/java/org/ladysnake/satin/mixin/client/render/RenderPhaseAccessor.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU Lesser General Public License * along with this program; If not, see . */ -package ladysnake.satin.mixin.client.render; +package org.ladysnake.satin.mixin.client.render; import net.minecraft.client.render.RenderPhase; import org.spongepowered.asm.mixin.Mixin; diff --git a/src/main/java/ladysnake/satin/mixin/client/render/WorldRendererMixin.java b/src/main/java/org/ladysnake/satin/mixin/client/render/WorldRendererMixin.java similarity index 91% rename from src/main/java/ladysnake/satin/mixin/client/render/WorldRendererMixin.java rename to src/main/java/org/ladysnake/satin/mixin/client/render/WorldRendererMixin.java index a90be52..32e7084 100644 --- a/src/main/java/ladysnake/satin/mixin/client/render/WorldRendererMixin.java +++ b/src/main/java/org/ladysnake/satin/mixin/client/render/WorldRendererMixin.java @@ -15,10 +15,10 @@ * You should have received a copy of the GNU Lesser General Public License * along with this program; If not, see . */ -package ladysnake.satin.mixin.client.render; +package org.ladysnake.satin.mixin.client.render; -import ladysnake.satin.api.event.WorldRendererReloadCallback; import net.minecraft.client.render.WorldRenderer; +import org.ladysnake.satin.api.event.WorldRendererReloadCallback; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; diff --git a/src/main/java/ladysnake/satin/mixin/client/render/package-info.java b/src/main/java/org/ladysnake/satin/mixin/client/render/package-info.java similarity index 94% rename from src/main/java/ladysnake/satin/mixin/client/render/package-info.java rename to src/main/java/org/ladysnake/satin/mixin/client/render/package-info.java index 4d7b1f4..c7ae4a1 100644 --- a/src/main/java/ladysnake/satin/mixin/client/render/package-info.java +++ b/src/main/java/org/ladysnake/satin/mixin/client/render/package-info.java @@ -20,7 +20,7 @@ */ @ApiStatus.Internal @ParametersAreNonnullByDefault -package ladysnake.satin.mixin.client.render; +package org.ladysnake.satin.mixin.client.render; import org.jetbrains.annotations.ApiStatus; diff --git a/src/main/java/ladysnake/satin/package-info.java b/src/main/java/org/ladysnake/satin/package-info.java similarity index 96% rename from src/main/java/ladysnake/satin/package-info.java rename to src/main/java/org/ladysnake/satin/package-info.java index 4cbfcae..66779bf 100644 --- a/src/main/java/ladysnake/satin/package-info.java +++ b/src/main/java/org/ladysnake/satin/package-info.java @@ -19,6 +19,6 @@ * Root package for the library */ @ParametersAreNonnullByDefault -package ladysnake.satin; +package org.ladysnake.satin; import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index e1434d2..f2ea11c 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -19,7 +19,7 @@ "environment": "client", "entrypoints": { "client": [ - "ladysnake.satin.Satin" + "org.ladysnake.satin.Satin" ] }, "mixins": [ diff --git a/src/main/resources/mixins.satin.client.json b/src/main/resources/mixins.satin.client.json index 1a6d5ff..6f6d2f8 100644 --- a/src/main/resources/mixins.satin.client.json +++ b/src/main/resources/mixins.satin.client.json @@ -2,30 +2,30 @@ "required": true, "compatibilityLevel": "JAVA_16", "package": "ladysnake.satin.mixin.client", - "plugin": "ladysnake.satin.mixin.SatinMixinPlugin", + "plugin": "org.ladysnake.satin.mixin.SatinMixinPlugin", "mixins": [ - "AccessiblePassesShaderEffect", - "blockrenderlayer.RenderLayerMixin", - "blockrenderlayer.WorldRendererMixin", - "event.GameRendererMixin", - "event.MinecraftClientMixin", - "event.WorldRendererMixin", - "gl.CoreShaderMixin", - "gl.CustomFormatFramebufferMixin", - "gl.CustomFormatPostEffectProcessorMixin", - "gl.DepthGlFramebufferMixin", - "gl.GlUniformMixin", - "gl.JsonEffectGlShaderMixin", - "render.RenderLayerAccessor", - "render.RenderLayerMixin", - "render.RenderLayerMixin$MultiPhaseParametersAccessor", - "render.RenderLayerMultiPhaseMixin", - "render.RenderPhaseAccessor" + "org.ladysnake.satin.mixin.client.AccessiblePassesShaderEffect", + "org.ladysnake.satin.mixin.client.blockrenderlayer.RenderLayerMixin", + "org.ladysnake.satin.mixin.client.blockrenderlayer.WorldRendererMixin", + "org.ladysnake.satin.mixin.client.event.GameRendererMixin", + "org.ladysnake.satin.mixin.client.event.MinecraftClientMixin", + "org.ladysnake.satin.mixin.client.event.WorldRendererMixin", + "org.ladysnake.satin.mixin.client.gl.CoreShaderMixin", + "org.ladysnake.satin.mixin.client.gl.CustomFormatFramebufferMixin", + "org.ladysnake.satin.mixin.client.gl.CustomFormatPostEffectProcessorMixin", + "org.ladysnake.satin.mixin.client.gl.DepthGlFramebufferMixin", + "org.ladysnake.satin.mixin.client.gl.GlUniformMixin", + "org.ladysnake.satin.mixin.client.gl.JsonEffectGlShaderMixin", + "org.ladysnake.satin.mixin.client.render.RenderLayerAccessor", + "org.ladysnake.satin.mixin.client.render.RenderLayerMixin", + "org.ladysnake.satin.mixin.client.render.RenderLayerMultiPhaseMixin", + "org.ladysnake.satin.mixin.client.render.RenderPhaseAccessor", + "render.RenderLayerMixin$MultiPhaseParametersAccessor" ], "injectors": { "defaultRequire": 1 }, "client": [ - "render.WorldRendererMixin" + "org.ladysnake.satin.mixin.client.render.WorldRendererMixin" ] } diff --git a/src/test/java/ladysnake/satin/api/util/GlMatricesTest.java b/src/test/java/ladysnake/satin/api/util/GlMatricesTest.java index 6cddd37..ddf06c3 100644 --- a/src/test/java/ladysnake/satin/api/util/GlMatricesTest.java +++ b/src/test/java/ladysnake/satin/api/util/GlMatricesTest.java @@ -18,6 +18,7 @@ package ladysnake.satin.api.util; import org.junit.jupiter.api.Test; +import org.ladysnake.satin.api.util.GlMatrices; import java.nio.BufferUnderflowException; import java.nio.FloatBuffer; diff --git a/src/testmod/java/ladysnake/satinbasictest/SatinBasicTest.java b/src/testmod/java/org/ladysnake/satinbasictest/SatinBasicTest.java similarity index 85% rename from src/testmod/java/ladysnake/satinbasictest/SatinBasicTest.java rename to src/testmod/java/org/ladysnake/satinbasictest/SatinBasicTest.java index 38bece8..e26540b 100644 --- a/src/testmod/java/ladysnake/satinbasictest/SatinBasicTest.java +++ b/src/testmod/java/org/ladysnake/satinbasictest/SatinBasicTest.java @@ -15,17 +15,17 @@ * You should have received a copy of the GNU Lesser General Public License * along with this program; If not, see . */ -package ladysnake.satinbasictest; +package org.ladysnake.satinbasictest; -import ladysnake.satin.api.event.ShaderEffectRenderCallback; -import ladysnake.satin.api.managed.ManagedShaderEffect; -import ladysnake.satin.api.managed.ShaderEffectManager; -import ladysnake.satin.api.managed.uniform.Uniform4f; -import ladysnake.satintestcore.item.SatinTestItems; import net.fabricmc.api.ClientModInitializer; import net.minecraft.util.Identifier; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import org.ladysnake.satin.api.event.ShaderEffectRenderCallback; +import org.ladysnake.satin.api.managed.ManagedShaderEffect; +import org.ladysnake.satin.api.managed.ShaderEffectManager; +import org.ladysnake.satin.api.managed.uniform.Uniform4f; +import org.ladysnake.satintestcore.item.SatinTestItems; public final class SatinBasicTest implements ClientModInitializer { public static final String MOD_ID = "satinbasictest"; diff --git a/src/testmod/java/ladysnake/satincustomformattest/SatinCustomFormatTest.java b/src/testmod/java/org/ladysnake/satincustomformattest/SatinCustomFormatTest.java similarity index 85% rename from src/testmod/java/ladysnake/satincustomformattest/SatinCustomFormatTest.java rename to src/testmod/java/org/ladysnake/satincustomformattest/SatinCustomFormatTest.java index 1df2018..8969823 100644 --- a/src/testmod/java/ladysnake/satincustomformattest/SatinCustomFormatTest.java +++ b/src/testmod/java/org/ladysnake/satincustomformattest/SatinCustomFormatTest.java @@ -15,15 +15,15 @@ * You should have received a copy of the GNU Lesser General Public License * along with this program; If not, see . */ -package ladysnake.satincustomformattest; +package org.ladysnake.satincustomformattest; -import ladysnake.satin.api.event.ShaderEffectRenderCallback; -import ladysnake.satin.api.managed.ManagedShaderEffect; -import ladysnake.satin.api.managed.ShaderEffectManager; -import ladysnake.satin.api.managed.uniform.Uniform4f; -import ladysnake.satintestcore.item.SatinTestItems; import net.fabricmc.api.ClientModInitializer; import net.minecraft.util.Identifier; +import org.ladysnake.satin.api.event.ShaderEffectRenderCallback; +import org.ladysnake.satin.api.managed.ManagedShaderEffect; +import org.ladysnake.satin.api.managed.ShaderEffectManager; +import org.ladysnake.satin.api.managed.uniform.Uniform4f; +import org.ladysnake.satintestcore.item.SatinTestItems; public final class SatinCustomFormatTest implements ClientModInitializer { public static final String MOD_ID = "satincustomformattest"; diff --git a/src/testmod/java/ladysnake/satindepthtest/DepthFx.java b/src/testmod/java/org/ladysnake/satindepthtest/DepthFx.java similarity index 87% rename from src/testmod/java/ladysnake/satindepthtest/DepthFx.java rename to src/testmod/java/org/ladysnake/satindepthtest/DepthFx.java index afbb0d8..4b42a48 100644 --- a/src/testmod/java/ladysnake/satindepthtest/DepthFx.java +++ b/src/testmod/java/org/ladysnake/satindepthtest/DepthFx.java @@ -15,17 +15,8 @@ * You should have received a copy of the GNU Lesser General Public License * along with this program; If not, see . */ -package ladysnake.satindepthtest; +package org.ladysnake.satindepthtest; -import ladysnake.satin.api.event.PostWorldRenderCallbackV2; -import ladysnake.satin.api.event.ShaderEffectRenderCallback; -import ladysnake.satin.api.experimental.ReadableDepthFramebuffer; -import ladysnake.satin.api.managed.ManagedShaderEffect; -import ladysnake.satin.api.managed.ShaderEffectManager; -import ladysnake.satin.api.managed.uniform.Uniform1f; -import ladysnake.satin.api.managed.uniform.Uniform3f; -import ladysnake.satin.api.managed.uniform.UniformMat4; -import ladysnake.satin.api.util.GlMatrices; import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientTickEvents; import net.minecraft.client.MinecraftClient; import net.minecraft.client.render.Camera; @@ -38,6 +29,15 @@ import net.minecraft.world.World; import org.jetbrains.annotations.Nullable; import org.joml.Matrix4f; +import org.ladysnake.satin.api.event.PostWorldRenderCallbackV2; +import org.ladysnake.satin.api.event.ShaderEffectRenderCallback; +import org.ladysnake.satin.api.experimental.ReadableDepthFramebuffer; +import org.ladysnake.satin.api.managed.ManagedShaderEffect; +import org.ladysnake.satin.api.managed.ShaderEffectManager; +import org.ladysnake.satin.api.managed.uniform.Uniform1f; +import org.ladysnake.satin.api.managed.uniform.Uniform3f; +import org.ladysnake.satin.api.managed.uniform.UniformMat4; +import org.ladysnake.satin.api.util.GlMatrices; public class DepthFx implements PostWorldRenderCallbackV2, ShaderEffectRenderCallback, ClientTickEvents.EndTick { public static final Identifier FANCY_NIGHT_SHADER_ID = Identifier.of(SatinDepthTest.MOD_ID, "shaders/post/rainbow_ping.json"); diff --git a/src/testmod/java/ladysnake/satindepthtest/SatinDepthTest.java b/src/testmod/java/org/ladysnake/satindepthtest/SatinDepthTest.java similarity index 86% rename from src/testmod/java/ladysnake/satindepthtest/SatinDepthTest.java rename to src/testmod/java/org/ladysnake/satindepthtest/SatinDepthTest.java index 4b734cb..d536107 100644 --- a/src/testmod/java/ladysnake/satindepthtest/SatinDepthTest.java +++ b/src/testmod/java/org/ladysnake/satindepthtest/SatinDepthTest.java @@ -15,13 +15,13 @@ * You should have received a copy of the GNU Lesser General Public License * along with this program; If not, see . */ -package ladysnake.satindepthtest; +package org.ladysnake.satindepthtest; -import ladysnake.satin.api.event.PostWorldRenderCallbackV2; -import ladysnake.satin.api.event.ShaderEffectRenderCallback; -import ladysnake.satintestcore.item.SatinTestItems; import net.fabricmc.api.ClientModInitializer; import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientTickEvents; +import org.ladysnake.satin.api.event.PostWorldRenderCallbackV2; +import org.ladysnake.satin.api.event.ShaderEffectRenderCallback; +import org.ladysnake.satintestcore.item.SatinTestItems; public class SatinDepthTest implements ClientModInitializer { public static final String MOD_ID = "satindepthtest"; diff --git a/src/testmod/java/ladysnake/satindepthtest/package-info.java b/src/testmod/java/org/ladysnake/satindepthtest/package-info.java similarity index 95% rename from src/testmod/java/ladysnake/satindepthtest/package-info.java rename to src/testmod/java/org/ladysnake/satindepthtest/package-info.java index e59210e..056ed72 100644 --- a/src/testmod/java/ladysnake/satindepthtest/package-info.java +++ b/src/testmod/java/org/ladysnake/satindepthtest/package-info.java @@ -16,6 +16,6 @@ * along with this program; If not, see . */ @ParametersAreNonnullByDefault -package ladysnake.satindepthtest; +package org.ladysnake.satindepthtest; import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file diff --git a/src/testmod/java/ladysnake/satinrenderlayer/IllusionGolemEntityRenderer.java b/src/testmod/java/org/ladysnake/satinrenderlayer/IllusionGolemEntityRenderer.java similarity index 97% rename from src/testmod/java/ladysnake/satinrenderlayer/IllusionGolemEntityRenderer.java rename to src/testmod/java/org/ladysnake/satinrenderlayer/IllusionGolemEntityRenderer.java index f1d7d7a..d498edb 100644 --- a/src/testmod/java/ladysnake/satinrenderlayer/IllusionGolemEntityRenderer.java +++ b/src/testmod/java/org/ladysnake/satinrenderlayer/IllusionGolemEntityRenderer.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU Lesser General Public License * along with this program; If not, see . */ -package ladysnake.satinrenderlayer; +package org.ladysnake.satinrenderlayer; import net.minecraft.client.render.RenderLayer; import net.minecraft.client.render.entity.EntityRendererFactory; diff --git a/src/testmod/java/ladysnake/satinrenderlayer/RainbowWitherEntityRenderer.java b/src/testmod/java/org/ladysnake/satinrenderlayer/RainbowWitherEntityRenderer.java similarity index 98% rename from src/testmod/java/ladysnake/satinrenderlayer/RainbowWitherEntityRenderer.java rename to src/testmod/java/org/ladysnake/satinrenderlayer/RainbowWitherEntityRenderer.java index f3ba0a8..7bbb5cf 100644 --- a/src/testmod/java/ladysnake/satinrenderlayer/RainbowWitherEntityRenderer.java +++ b/src/testmod/java/org/ladysnake/satinrenderlayer/RainbowWitherEntityRenderer.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU Lesser General Public License * along with this program; If not, see . */ -package ladysnake.satinrenderlayer; +package org.ladysnake.satinrenderlayer; import net.minecraft.client.render.RenderLayer; import net.minecraft.client.render.VertexConsumerProvider; diff --git a/src/testmod/java/ladysnake/satinrenderlayer/SatinRenderLayerTest.java b/src/testmod/java/org/ladysnake/satinrenderlayer/SatinRenderLayerTest.java similarity index 90% rename from src/testmod/java/ladysnake/satinrenderlayer/SatinRenderLayerTest.java rename to src/testmod/java/org/ladysnake/satinrenderlayer/SatinRenderLayerTest.java index bdd0c25..2e421e2 100644 --- a/src/testmod/java/ladysnake/satinrenderlayer/SatinRenderLayerTest.java +++ b/src/testmod/java/org/ladysnake/satinrenderlayer/SatinRenderLayerTest.java @@ -15,19 +15,10 @@ * You should have received a copy of the GNU Lesser General Public License * along with this program; If not, see . */ -package ladysnake.satinrenderlayer; +package org.ladysnake.satinrenderlayer; import com.mojang.blaze3d.platform.GlStateManager; import com.mojang.blaze3d.systems.RenderSystem; -import ladysnake.satin.api.event.EntitiesPreRenderCallback; -import ladysnake.satin.api.event.ShaderEffectRenderCallback; -import ladysnake.satin.api.managed.ManagedCoreShader; -import ladysnake.satin.api.managed.ManagedFramebuffer; -import ladysnake.satin.api.managed.ManagedShaderEffect; -import ladysnake.satin.api.managed.ShaderEffectManager; -import ladysnake.satin.api.managed.uniform.Uniform1f; -import ladysnake.satin.api.util.RenderLayerHelper; -import ladysnake.satintestcore.block.SatinTestBlocks; import net.fabricmc.fabric.api.blockrenderlayer.v1.BlockRenderLayerMap; import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientTickEvents; import net.fabricmc.fabric.api.client.rendering.v1.EntityRendererRegistry; @@ -43,6 +34,15 @@ import net.minecraft.util.Identifier; import net.minecraft.world.World; import org.jetbrains.annotations.NotNull; +import org.ladysnake.satin.api.event.EntitiesPreRenderCallback; +import org.ladysnake.satin.api.event.ShaderEffectRenderCallback; +import org.ladysnake.satin.api.managed.ManagedCoreShader; +import org.ladysnake.satin.api.managed.ManagedFramebuffer; +import org.ladysnake.satin.api.managed.ManagedShaderEffect; +import org.ladysnake.satin.api.managed.ShaderEffectManager; +import org.ladysnake.satin.api.managed.uniform.Uniform1f; +import org.ladysnake.satin.api.util.RenderLayerHelper; +import org.ladysnake.satintestcore.block.SatinTestBlocks; public final class SatinRenderLayerTest { diff --git a/src/testmod/java/ladysnake/satintestcore/SatinTestCore.java b/src/testmod/java/org/ladysnake/satintestcore/SatinTestCore.java similarity index 86% rename from src/testmod/java/ladysnake/satintestcore/SatinTestCore.java rename to src/testmod/java/org/ladysnake/satintestcore/SatinTestCore.java index 57da8e8..96710d0 100644 --- a/src/testmod/java/ladysnake/satintestcore/SatinTestCore.java +++ b/src/testmod/java/org/ladysnake/satintestcore/SatinTestCore.java @@ -15,11 +15,11 @@ * You should have received a copy of the GNU Lesser General Public License * along with this program; If not, see . */ -package ladysnake.satintestcore; +package org.ladysnake.satintestcore; -import ladysnake.satintestcore.block.SatinTestBlocks; -import ladysnake.satintestcore.item.SatinTestItems; import net.fabricmc.api.ModInitializer; +import org.ladysnake.satintestcore.block.SatinTestBlocks; +import org.ladysnake.satintestcore.item.SatinTestItems; public class SatinTestCore implements ModInitializer { public static final String MOD_ID = "satintestcore"; diff --git a/src/testmod/java/ladysnake/satintestcore/block/SatinTestBlocks.java b/src/testmod/java/org/ladysnake/satintestcore/block/SatinTestBlocks.java similarity index 92% rename from src/testmod/java/ladysnake/satintestcore/block/SatinTestBlocks.java rename to src/testmod/java/org/ladysnake/satintestcore/block/SatinTestBlocks.java index 2d80a37..b507a8f 100644 --- a/src/testmod/java/ladysnake/satintestcore/block/SatinTestBlocks.java +++ b/src/testmod/java/org/ladysnake/satintestcore/block/SatinTestBlocks.java @@ -15,14 +15,14 @@ * You should have received a copy of the GNU Lesser General Public License * along with this program; If not, see . */ -package ladysnake.satintestcore.block; +package org.ladysnake.satintestcore.block; -import ladysnake.satintestcore.SatinTestCore; import net.minecraft.block.Block; import net.minecraft.block.Blocks; import net.minecraft.registry.Registries; import net.minecraft.registry.Registry; import net.minecraft.util.Identifier; +import org.ladysnake.satintestcore.SatinTestCore; public class SatinTestBlocks { public static final Block DEBUG_BLOCK = new Block(Block.Settings.copy(Blocks.AMETHYST_BLOCK)); diff --git a/src/testmod/java/ladysnake/satintestcore/item/DebugCallback.java b/src/testmod/java/org/ladysnake/satintestcore/item/DebugCallback.java similarity index 95% rename from src/testmod/java/ladysnake/satintestcore/item/DebugCallback.java rename to src/testmod/java/org/ladysnake/satintestcore/item/DebugCallback.java index e892ec2..83f0701 100644 --- a/src/testmod/java/ladysnake/satintestcore/item/DebugCallback.java +++ b/src/testmod/java/org/ladysnake/satintestcore/item/DebugCallback.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU Lesser General Public License * along with this program; If not, see . */ -package ladysnake.satintestcore.item; +package org.ladysnake.satintestcore.item; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.util.Hand; diff --git a/src/testmod/java/ladysnake/satintestcore/item/DebugItem.java b/src/testmod/java/org/ladysnake/satintestcore/item/DebugItem.java similarity index 98% rename from src/testmod/java/ladysnake/satintestcore/item/DebugItem.java rename to src/testmod/java/org/ladysnake/satintestcore/item/DebugItem.java index 6c2370f..cecc69a 100644 --- a/src/testmod/java/ladysnake/satintestcore/item/DebugItem.java +++ b/src/testmod/java/org/ladysnake/satintestcore/item/DebugItem.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU Lesser General Public License * along with this program; If not, see . */ -package ladysnake.satintestcore.item; +package org.ladysnake.satintestcore.item; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.Item; diff --git a/src/testmod/java/ladysnake/satintestcore/item/DebugMode.java b/src/testmod/java/org/ladysnake/satintestcore/item/DebugMode.java similarity index 94% rename from src/testmod/java/ladysnake/satintestcore/item/DebugMode.java rename to src/testmod/java/org/ladysnake/satintestcore/item/DebugMode.java index ceacb22..b4ec606 100644 --- a/src/testmod/java/ladysnake/satintestcore/item/DebugMode.java +++ b/src/testmod/java/org/ladysnake/satintestcore/item/DebugMode.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU Lesser General Public License * along with this program; If not, see . */ -package ladysnake.satintestcore.item; +package org.ladysnake.satintestcore.item; public record DebugMode(String name, DebugCallback callback) { } diff --git a/src/testmod/java/ladysnake/satintestcore/item/SatinTestItems.java b/src/testmod/java/org/ladysnake/satintestcore/item/SatinTestItems.java similarity index 90% rename from src/testmod/java/ladysnake/satintestcore/item/SatinTestItems.java rename to src/testmod/java/org/ladysnake/satintestcore/item/SatinTestItems.java index 3cf3b4a..6e145bc 100644 --- a/src/testmod/java/ladysnake/satintestcore/item/SatinTestItems.java +++ b/src/testmod/java/org/ladysnake/satintestcore/item/SatinTestItems.java @@ -15,15 +15,15 @@ * You should have received a copy of the GNU Lesser General Public License * along with this program; If not, see . */ -package ladysnake.satintestcore.item; +package org.ladysnake.satintestcore.item; -import ladysnake.satintestcore.SatinTestCore; -import ladysnake.satintestcore.block.SatinTestBlocks; import net.minecraft.item.BlockItem; import net.minecraft.item.Item; import net.minecraft.registry.Registries; import net.minecraft.registry.Registry; import net.minecraft.util.Identifier; +import org.ladysnake.satintestcore.SatinTestCore; +import org.ladysnake.satintestcore.block.SatinTestBlocks; public class SatinTestItems { public static final DebugItem DEBUG_ITEM = new DebugItem(new Item.Settings()); diff --git a/src/testmod/resources/fabric.mod.json b/src/testmod/resources/fabric.mod.json index 5608c7d..3acfd5e 100644 --- a/src/testmod/resources/fabric.mod.json +++ b/src/testmod/resources/fabric.mod.json @@ -12,13 +12,13 @@ "environment": "client", "entrypoints": { "main": [ - "ladysnake.satintestcore.SatinTestCore" + "org.ladysnake.satintestcore.SatinTestCore" ], "client": [ - "ladysnake.satinrenderlayer.SatinRenderLayerTest::onInitializeClient", - "ladysnake.satindepthtest.SatinDepthTest", - "ladysnake.satinbasictest.SatinBasicTest", - "ladysnake.satincustomformattest.SatinCustomFormatTest" + "org.ladysnake.satinrenderlayer.SatinRenderLayerTest::onInitializeClient", + "org.ladysnake.satindepthtest.SatinDepthTest", + "org.ladysnake.satinbasictest.SatinBasicTest", + "org.ladysnake.satincustomformattest.SatinCustomFormatTest" ] }, "depends": {