Add a config to the total world time patch (#701)

* Add a config to the total world time patch

Shaders will still desync from time of day, but only when the (default off) setting is enabled.

* Namespace the configs
This commit is contained in:
ah-OOG-ah authored and GitHub committed 2024-10-30 12:47:10 -07:00
1 parent 3ab965ded7
commit b56e803622
4 files changed
+29 -16

No files matched your search

@@ -1,7 +1,15 @@
package net.coderbot.iris.gl.program;
import com.google.common.collect.ImmutableList;
import com.gtnewhorizons.angelica.config.AngelicaConfig;
import com.gtnewhorizons.angelica.glsm.RenderSystem;
import java.nio.IntBuffer;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.OptionalInt;
import net.coderbot.iris.Iris;
import net.coderbot.iris.gl.state.ValueUpdateNotifier;
import net.coderbot.iris.gl.uniform.DynamicLocationalUniformHolder;
@@ -11,20 +19,13 @@ import net.coderbot.iris.gl.uniform.UniformType;
import net.coderbot.iris.gl.uniform.UniformUpdateFrequency;
import net.coderbot.iris.uniforms.SystemTimeUniforms;
import net.minecraft.client.Minecraft;
import net.minecraft.client.multiplayer.WorldClient;
import org.lwjgl.BufferUtils;
import org.lwjgl.opengl.ARBShaderImageLoadStore;
import org.lwjgl.opengl.GL11;
import org.lwjgl.opengl.GL20;
import org.lwjgl.opengl.GL30;
import java.nio.IntBuffer;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.OptionalInt;
public class ProgramUniforms {
private static ProgramUniforms active;
private final ImmutableList<Uniform> perTick;
@@ -52,8 +53,11 @@ public class ProgramUniforms {
}
private static long getCurrentTick() {
if (Minecraft.getMinecraft().theWorld != null) {
return Minecraft.getMinecraft().theWorld.getTotalWorldTime();
final WorldClient world = Minecraft.getMinecraft().theWorld;
if (world != null) {
return AngelicaConfig.useTotalWorldTime
? world.getWorldTime()
: world.getTotalWorldTime();
} else {
return 0L;
}
@@ -1,10 +1,12 @@
package net.coderbot.iris.uniforms;
import com.gtnewhorizons.angelica.config.AngelicaConfig;
import com.gtnewhorizons.angelica.rendering.RenderingState;
import net.coderbot.iris.gl.uniform.UniformHolder;
import net.coderbot.iris.gl.uniform.UniformUpdateFrequency;
import net.coderbot.iris.uniforms.transforms.SmoothedFloat;
import net.minecraft.client.Minecraft;
import net.minecraft.client.multiplayer.WorldClient;
import net.minecraft.entity.player.EntityPlayer;
import org.joml.Math;
import org.joml.Vector3d;
@@ -157,7 +159,8 @@ public class HardcodedCustomUniforms {
}
private static int getWorldDayTime() {
return (int) (Minecraft.getMinecraft().theWorld.getTotalWorldTime() % 24000L);
final WorldClient world = Minecraft.getMinecraft().theWorld;
return (int) ((AngelicaConfig.useTotalWorldTime ? world.getWorldTime() : world.getTotalWorldTime()) % 24000L);
// Level level = Minecraft.getMinecraft().theWorld;
// long timeOfDay = level.getDayTime();
// long dayTime = ((DimensionTypeAccessor) level.dimensionType()).getFixedTime().orElse(timeOfDay % 24000L);
@@ -1,13 +1,13 @@
package net.coderbot.iris.uniforms;
import static net.coderbot.iris.gl.uniform.UniformUpdateFrequency.PER_TICK;
import com.gtnewhorizons.angelica.config.AngelicaConfig;
import java.util.Objects;
import net.coderbot.iris.gl.uniform.UniformHolder;
import net.minecraft.client.Minecraft;
import net.minecraft.client.multiplayer.WorldClient;
import java.util.Objects;
import static net.coderbot.iris.gl.uniform.UniformUpdateFrequency.PER_TICK;
public final class WorldTimeUniforms {
private WorldTimeUniforms() {
}
@@ -25,7 +25,8 @@ public final class WorldTimeUniforms {
}
static int getWorldDayTime() {
return (int) (getWorld().getTotalWorldTime() % 24000L);
final WorldClient world = getWorld();
return (int) ((AngelicaConfig.useTotalWorldTime ? world.getWorldTime() : world.getTotalWorldTime()) % 24000L);
// long dayTime = ((DimensionTypeAccessor) getWorld().dimensionType()).getFixedTime().orElse(timeOfDay % 24000L);
}