diff --git a/src/client/java/su/divan2000/veila/client/render/PostProcessingManager.java b/src/client/java/su/divan2000/veila/client/render/PostProcessingManager.java index 42b5e63..e507418 100644 --- a/src/client/java/su/divan2000/veila/client/render/PostProcessingManager.java +++ b/src/client/java/su/divan2000/veila/client/render/PostProcessingManager.java @@ -13,10 +13,10 @@ import su.divan2000.veila.client.gl.FullscreenQuad; import su.divan2000.veila.client.gl.GLProgram; import su.divan2000.veila.client.gl.GLShader; import su.divan2000.veila.client.gl.ResourceUtil; -import su.divan2000.veila.client.render.fog.FogLightVolume; -import su.divan2000.veila.client.render.fog.FogSimulationManager; -import su.divan2000.veila.client.render.fog.FogSystem; -import su.divan2000.veila.client.render.fog.FogWorldVolume; +import su.divan2000.veila.client.simulation.FogLightVolume; +import su.divan2000.veila.client.simulation.FogSimulationManager; +import su.divan2000.veila.client.simulation.FogSystem; +import su.divan2000.veila.client.simulation.FogWorldVolume; import java.nio.FloatBuffer; diff --git a/src/client/java/su/divan2000/veila/client/render/fog/FogBiomeParams.java b/src/client/java/su/divan2000/veila/client/simulation/FogBiomeParams.java similarity index 99% rename from src/client/java/su/divan2000/veila/client/render/fog/FogBiomeParams.java rename to src/client/java/su/divan2000/veila/client/simulation/FogBiomeParams.java index 64d21ab..f28822d 100644 --- a/src/client/java/su/divan2000/veila/client/render/fog/FogBiomeParams.java +++ b/src/client/java/su/divan2000/veila/client/simulation/FogBiomeParams.java @@ -1,4 +1,4 @@ -package su.divan2000.veila.client.render.fog; +package su.divan2000.veila.client.simulation; import net.minecraft.registry.entry.RegistryEntry; import net.minecraft.world.biome.Biome; diff --git a/src/client/java/su/divan2000/veila/client/render/fog/FogBiomeStreamer.java b/src/client/java/su/divan2000/veila/client/simulation/FogBiomeStreamer.java similarity index 99% rename from src/client/java/su/divan2000/veila/client/render/fog/FogBiomeStreamer.java rename to src/client/java/su/divan2000/veila/client/simulation/FogBiomeStreamer.java index 7f2a3f1..dbf775c 100644 --- a/src/client/java/su/divan2000/veila/client/render/fog/FogBiomeStreamer.java +++ b/src/client/java/su/divan2000/veila/client/simulation/FogBiomeStreamer.java @@ -1,4 +1,4 @@ -package su.divan2000.veila.client.render.fog; +package su.divan2000.veila.client.simulation; import net.minecraft.client.MinecraftClient; import net.minecraft.registry.entry.RegistryEntry; diff --git a/src/client/java/su/divan2000/veila/client/render/fog/FogBiomeTexture.java b/src/client/java/su/divan2000/veila/client/simulation/FogBiomeTexture.java similarity index 99% rename from src/client/java/su/divan2000/veila/client/render/fog/FogBiomeTexture.java rename to src/client/java/su/divan2000/veila/client/simulation/FogBiomeTexture.java index 7bed560..04226c5 100644 --- a/src/client/java/su/divan2000/veila/client/render/fog/FogBiomeTexture.java +++ b/src/client/java/su/divan2000/veila/client/simulation/FogBiomeTexture.java @@ -1,4 +1,4 @@ -package su.divan2000.veila.client.render.fog; +package su.divan2000.veila.client.simulation; import org.lwjgl.BufferUtils; import org.lwjgl.opengl.*; diff --git a/src/client/java/su/divan2000/veila/client/render/fog/FogBlockProperties.java b/src/client/java/su/divan2000/veila/client/simulation/FogBlockProperties.java similarity index 96% rename from src/client/java/su/divan2000/veila/client/render/fog/FogBlockProperties.java rename to src/client/java/su/divan2000/veila/client/simulation/FogBlockProperties.java index 0b5f023..1e42d70 100644 --- a/src/client/java/su/divan2000/veila/client/render/fog/FogBlockProperties.java +++ b/src/client/java/su/divan2000/veila/client/simulation/FogBlockProperties.java @@ -1,4 +1,4 @@ -package su.divan2000.veila.client.render.fog; +package su.divan2000.veila.client.simulation; public record FogBlockProperties( boolean solid, diff --git a/src/client/java/su/divan2000/veila/client/render/fog/FogBlockRegistry.java b/src/client/java/su/divan2000/veila/client/simulation/FogBlockRegistry.java similarity index 98% rename from src/client/java/su/divan2000/veila/client/render/fog/FogBlockRegistry.java rename to src/client/java/su/divan2000/veila/client/simulation/FogBlockRegistry.java index e9a2dd0..dba0392 100644 --- a/src/client/java/su/divan2000/veila/client/render/fog/FogBlockRegistry.java +++ b/src/client/java/su/divan2000/veila/client/simulation/FogBlockRegistry.java @@ -1,4 +1,4 @@ -package su.divan2000.veila.client.render.fog; +package su.divan2000.veila.client.simulation; import net.minecraft.block.Block; import net.minecraft.block.BlockState; diff --git a/src/client/java/su/divan2000/veila/client/render/fog/FogChunkProvider.java b/src/client/java/su/divan2000/veila/client/simulation/FogChunkProvider.java similarity index 98% rename from src/client/java/su/divan2000/veila/client/render/fog/FogChunkProvider.java rename to src/client/java/su/divan2000/veila/client/simulation/FogChunkProvider.java index 529f148..58942cd 100644 --- a/src/client/java/su/divan2000/veila/client/render/fog/FogChunkProvider.java +++ b/src/client/java/su/divan2000/veila/client/simulation/FogChunkProvider.java @@ -1,4 +1,4 @@ -package su.divan2000.veila.client.render.fog; +package su.divan2000.veila.client.simulation; import net.minecraft.block.BlockState; import net.minecraft.block.Blocks; diff --git a/src/client/java/su/divan2000/veila/client/render/fog/FogChunkStreamer.java b/src/client/java/su/divan2000/veila/client/simulation/FogChunkStreamer.java similarity index 99% rename from src/client/java/su/divan2000/veila/client/render/fog/FogChunkStreamer.java rename to src/client/java/su/divan2000/veila/client/simulation/FogChunkStreamer.java index 8272357..36ec7d0 100644 --- a/src/client/java/su/divan2000/veila/client/render/fog/FogChunkStreamer.java +++ b/src/client/java/su/divan2000/veila/client/simulation/FogChunkStreamer.java @@ -1,4 +1,4 @@ -package su.divan2000.veila.client.render.fog; +package su.divan2000.veila.client.simulation; import net.minecraft.block.BlockState; diff --git a/src/client/java/su/divan2000/veila/client/render/fog/FogDensityTextures.java b/src/client/java/su/divan2000/veila/client/simulation/FogDensityTextures.java similarity index 98% rename from src/client/java/su/divan2000/veila/client/render/fog/FogDensityTextures.java rename to src/client/java/su/divan2000/veila/client/simulation/FogDensityTextures.java index 742a944..0675ba8 100644 --- a/src/client/java/su/divan2000/veila/client/render/fog/FogDensityTextures.java +++ b/src/client/java/su/divan2000/veila/client/simulation/FogDensityTextures.java @@ -1,6 +1,5 @@ -package su.divan2000.veila.client.render.fog; +package su.divan2000.veila.client.simulation; -import org.lwjgl.BufferUtils; import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL12; import org.lwjgl.opengl.GL15; @@ -8,7 +7,6 @@ import org.lwjgl.opengl.GL30; import org.lwjgl.opengl.GL31; import java.nio.ByteBuffer; -import java.nio.FloatBuffer; public final class FogDensityTextures { diff --git a/src/client/java/su/divan2000/veila/client/render/fog/FogEnvironmentContext.java b/src/client/java/su/divan2000/veila/client/simulation/FogEnvironmentContext.java similarity index 99% rename from src/client/java/su/divan2000/veila/client/render/fog/FogEnvironmentContext.java rename to src/client/java/su/divan2000/veila/client/simulation/FogEnvironmentContext.java index 339848a..b8fc2ca 100644 --- a/src/client/java/su/divan2000/veila/client/render/fog/FogEnvironmentContext.java +++ b/src/client/java/su/divan2000/veila/client/simulation/FogEnvironmentContext.java @@ -1,4 +1,4 @@ -package su.divan2000.veila.client.render.fog; +package su.divan2000.veila.client.simulation; import net.minecraft.client.MinecraftClient; import net.minecraft.util.Identifier; diff --git a/src/client/java/su/divan2000/veila/client/render/fog/FogLightProvider.java b/src/client/java/su/divan2000/veila/client/simulation/FogLightProvider.java similarity index 98% rename from src/client/java/su/divan2000/veila/client/render/fog/FogLightProvider.java rename to src/client/java/su/divan2000/veila/client/simulation/FogLightProvider.java index 9e3dcbc..0c27df4 100644 --- a/src/client/java/su/divan2000/veila/client/render/fog/FogLightProvider.java +++ b/src/client/java/su/divan2000/veila/client/simulation/FogLightProvider.java @@ -1,4 +1,4 @@ -package su.divan2000.veila.client.render.fog; +package su.divan2000.veila.client.simulation; import net.minecraft.client.MinecraftClient; import net.minecraft.util.math.ChunkSectionPos; diff --git a/src/client/java/su/divan2000/veila/client/render/fog/FogLightStreamer.java b/src/client/java/su/divan2000/veila/client/simulation/FogLightStreamer.java similarity index 99% rename from src/client/java/su/divan2000/veila/client/render/fog/FogLightStreamer.java rename to src/client/java/su/divan2000/veila/client/simulation/FogLightStreamer.java index bacb0fb..8d8de4b 100644 --- a/src/client/java/su/divan2000/veila/client/render/fog/FogLightStreamer.java +++ b/src/client/java/su/divan2000/veila/client/simulation/FogLightStreamer.java @@ -1,4 +1,4 @@ -package su.divan2000.veila.client.render.fog; +package su.divan2000.veila.client.simulation; import java.util.concurrent.atomic.AtomicLongArray; diff --git a/src/client/java/su/divan2000/veila/client/render/fog/FogLightVolume.java b/src/client/java/su/divan2000/veila/client/simulation/FogLightVolume.java similarity index 99% rename from src/client/java/su/divan2000/veila/client/render/fog/FogLightVolume.java rename to src/client/java/su/divan2000/veila/client/simulation/FogLightVolume.java index 4e1f0d8..2fd34b7 100644 --- a/src/client/java/su/divan2000/veila/client/render/fog/FogLightVolume.java +++ b/src/client/java/su/divan2000/veila/client/simulation/FogLightVolume.java @@ -1,4 +1,4 @@ -package su.divan2000.veila.client.render.fog; +package su.divan2000.veila.client.simulation; import org.lwjgl.BufferUtils; import org.lwjgl.opengl.GL11; diff --git a/src/client/java/su/divan2000/veila/client/render/fog/FogSimulationManager.java b/src/client/java/su/divan2000/veila/client/simulation/FogSimulationManager.java similarity index 99% rename from src/client/java/su/divan2000/veila/client/render/fog/FogSimulationManager.java rename to src/client/java/su/divan2000/veila/client/simulation/FogSimulationManager.java index 8f20aba..3c428c9 100644 --- a/src/client/java/su/divan2000/veila/client/render/fog/FogSimulationManager.java +++ b/src/client/java/su/divan2000/veila/client/simulation/FogSimulationManager.java @@ -1,4 +1,4 @@ -package su.divan2000.veila.client.render.fog; +package su.divan2000.veila.client.simulation; import java.util.ArrayDeque; import java.util.Locale; diff --git a/src/client/java/su/divan2000/veila/client/render/fog/FogSimulationShader.java b/src/client/java/su/divan2000/veila/client/simulation/FogSimulationShader.java similarity index 99% rename from src/client/java/su/divan2000/veila/client/render/fog/FogSimulationShader.java rename to src/client/java/su/divan2000/veila/client/simulation/FogSimulationShader.java index 97747aa..7ed0389 100644 --- a/src/client/java/su/divan2000/veila/client/render/fog/FogSimulationShader.java +++ b/src/client/java/su/divan2000/veila/client/simulation/FogSimulationShader.java @@ -1,4 +1,4 @@ -package su.divan2000.veila.client.render.fog; +package su.divan2000.veila.client.simulation; import su.divan2000.veila.client.gl.FullscreenQuad; import su.divan2000.veila.client.gl.GLProgram; diff --git a/src/client/java/su/divan2000/veila/client/render/fog/FogSystem.java b/src/client/java/su/divan2000/veila/client/simulation/FogSystem.java similarity index 98% rename from src/client/java/su/divan2000/veila/client/render/fog/FogSystem.java rename to src/client/java/su/divan2000/veila/client/simulation/FogSystem.java index 00b2b14..836c02f 100644 --- a/src/client/java/su/divan2000/veila/client/render/fog/FogSystem.java +++ b/src/client/java/su/divan2000/veila/client/simulation/FogSystem.java @@ -1,4 +1,4 @@ -package su.divan2000.veila.client.render.fog; +package su.divan2000.veila.client.simulation; import net.minecraft.client.MinecraftClient; diff --git a/src/client/java/su/divan2000/veila/client/render/fog/FogWorldVolume.java b/src/client/java/su/divan2000/veila/client/simulation/FogWorldVolume.java similarity index 99% rename from src/client/java/su/divan2000/veila/client/render/fog/FogWorldVolume.java rename to src/client/java/su/divan2000/veila/client/simulation/FogWorldVolume.java index 25b051e..d882a56 100644 --- a/src/client/java/su/divan2000/veila/client/render/fog/FogWorldVolume.java +++ b/src/client/java/su/divan2000/veila/client/simulation/FogWorldVolume.java @@ -1,4 +1,4 @@ -package su.divan2000.veila.client.render.fog; +package su.divan2000.veila.client.simulation; import org.lwjgl.BufferUtils; import org.lwjgl.opengl.GL11; diff --git a/src/client/java/su/divan2000/veila/client/render/fog/SimpleNoiseSampler.java b/src/client/java/su/divan2000/veila/client/simulation/SimpleNoiseSampler.java similarity index 97% rename from src/client/java/su/divan2000/veila/client/render/fog/SimpleNoiseSampler.java rename to src/client/java/su/divan2000/veila/client/simulation/SimpleNoiseSampler.java index c050674..373d464 100644 --- a/src/client/java/su/divan2000/veila/client/render/fog/SimpleNoiseSampler.java +++ b/src/client/java/su/divan2000/veila/client/simulation/SimpleNoiseSampler.java @@ -1,4 +1,4 @@ -package su.divan2000.veila.client.render.fog; +package su.divan2000.veila.client.simulation; /** * Простой Perlin noise без зависимостей от Minecraft API. diff --git a/src/client/java/su/divan2000/veila/mixin/client/GameRendererMixin.java b/src/client/java/su/divan2000/veila/mixin/client/GameRendererMixin.java index e58c201..37ca04e 100644 --- a/src/client/java/su/divan2000/veila/mixin/client/GameRendererMixin.java +++ b/src/client/java/su/divan2000/veila/mixin/client/GameRendererMixin.java @@ -8,7 +8,7 @@ import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; import su.divan2000.veila.client.render.PostProcessingManager; -import su.divan2000.veila.client.render.fog.FogSystem; +import su.divan2000.veila.client.simulation.FogSystem; @Mixin(GameRenderer.class) public class GameRendererMixin { diff --git a/src/client/java/su/divan2000/veila/mixin/client/LightStorageMixin.java b/src/client/java/su/divan2000/veila/mixin/client/LightStorageMixin.java index b38f664..512bff8 100644 --- a/src/client/java/su/divan2000/veila/mixin/client/LightStorageMixin.java +++ b/src/client/java/su/divan2000/veila/mixin/client/LightStorageMixin.java @@ -3,7 +3,6 @@ package su.divan2000.veila.mixin.client; import net.minecraft.util.math.ChunkSectionPos; import net.minecraft.world.LightType; import net.minecraft.world.chunk.ChunkNibbleArray; -import net.minecraft.world.chunk.light.ChunkLightProvider; import net.minecraft.world.chunk.light.LightStorage; import org.jetbrains.annotations.Nullable; import org.spongepowered.asm.mixin.Mixin; @@ -11,7 +10,7 @@ import org.spongepowered.asm.mixin.Shadow; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; -import su.divan2000.veila.client.render.fog.FogLightStreamer; +import su.divan2000.veila.client.simulation.FogLightStreamer; @Mixin(LightStorage.class) public class LightStorageMixin { diff --git a/src/client/java/su/divan2000/veila/mixin/client/MinecraftClientMixin.java b/src/client/java/su/divan2000/veila/mixin/client/MinecraftClientMixin.java index bafddf3..81a70d1 100644 --- a/src/client/java/su/divan2000/veila/mixin/client/MinecraftClientMixin.java +++ b/src/client/java/su/divan2000/veila/mixin/client/MinecraftClientMixin.java @@ -5,7 +5,7 @@ import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; -import su.divan2000.veila.client.render.fog.FogSystem; +import su.divan2000.veila.client.simulation.FogSystem; @Mixin(MinecraftClient.class) public class MinecraftClientMixin { diff --git a/src/client/java/su/divan2000/veila/mixin/client/WorldChunkMixin.java b/src/client/java/su/divan2000/veila/mixin/client/WorldChunkMixin.java index 5130978..f584026 100644 --- a/src/client/java/su/divan2000/veila/mixin/client/WorldChunkMixin.java +++ b/src/client/java/su/divan2000/veila/mixin/client/WorldChunkMixin.java @@ -7,7 +7,7 @@ import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; -import su.divan2000.veila.client.render.fog.FogChunkStreamer; +import su.divan2000.veila.client.simulation.FogChunkStreamer; @Mixin(WorldChunk.class) public class WorldChunkMixin {