diff --git a/src/main/java/com/gtnewhorizons/angelica/dynamiclights/DynamicLights.java b/src/main/java/com/gtnewhorizons/angelica/dynamiclights/DynamicLights.java index 82e9c6cd5..3d29838c0 100644 --- a/src/main/java/com/gtnewhorizons/angelica/dynamiclights/DynamicLights.java +++ b/src/main/java/com/gtnewhorizons/angelica/dynamiclights/DynamicLights.java @@ -37,6 +37,7 @@ import java.util.function.Predicate; public class DynamicLights { private static DynamicLights instance; public static DynamicLightsMode Mode = DynamicLightsMode.OFF; + public static boolean ShaderForce = false; private static final double MAX_RADIUS = 7.75; private static final double MAX_RADIUS_SQUARED = MAX_RADIUS * MAX_RADIUS; @@ -52,7 +53,11 @@ public class DynamicLights { } public static boolean isEnabled() { - return AngelicaConfig.enableDynamicLights && Mode.isEnabled() && !IrisApi.getInstance().isShaderPackInUse(); + return AngelicaConfig.enableDynamicLights && + Mode.isEnabled() && + // if shader force is enabled then true + // if not, then true when shaders are not in use + (ShaderForce || !IrisApi.getInstance().isShaderPackInUse()); } /** @@ -65,7 +70,7 @@ public class DynamicLights { return; long now = System.currentTimeMillis(); - if (now >= this.lastUpdate + 50) { + if (now >= this.lastUpdate + Mode.getDelay()) { this.lastUpdate = now; this.lastUpdateCount = 0; diff --git a/src/main/java/com/gtnewhorizons/angelica/dynamiclights/DynamicLightsMode.java b/src/main/java/com/gtnewhorizons/angelica/dynamiclights/DynamicLightsMode.java index 4c04d7fdd..024d4a8b8 100644 --- a/src/main/java/com/gtnewhorizons/angelica/dynamiclights/DynamicLightsMode.java +++ b/src/main/java/com/gtnewhorizons/angelica/dynamiclights/DynamicLightsMode.java @@ -7,7 +7,8 @@ public enum DynamicLightsMode OFF("Off", 0), FASTEST("Fastest", 500), FAST("Fast", 250), - FANCY("Fancy", 0); + FANCY("Fancy", 50), + REALTIME("Realtime", 0); private final String name; private final int delay; diff --git a/src/main/java/com/gtnewhorizons/angelica/dynamiclights/IDynamicLightSource.java b/src/main/java/com/gtnewhorizons/angelica/dynamiclights/IDynamicLightSource.java index f513706af..9ebc841fe 100644 --- a/src/main/java/com/gtnewhorizons/angelica/dynamiclights/IDynamicLightSource.java +++ b/src/main/java/com/gtnewhorizons/angelica/dynamiclights/IDynamicLightSource.java @@ -73,13 +73,6 @@ public interface IDynamicLightSource { */ void angelica$dynamicLightTick(); - /** - * Returns whether this dynamic light source should update. - * - * @return {@code true} if this dynamic light source should update, else {@code false} - */ - boolean angelica$shouldUpdateDynamicLight(); - boolean angelica$updateDynamicLight(@NotNull SodiumWorldRenderer renderer); void angelica$scheduleTrackedChunksRebuild(@NotNull SodiumWorldRenderer renderer); diff --git a/src/main/java/jss/notfine/core/Settings.java b/src/main/java/jss/notfine/core/Settings.java index 2360ce1ad..afaf1c351 100644 --- a/src/main/java/jss/notfine/core/Settings.java +++ b/src/main/java/jss/notfine/core/Settings.java @@ -51,7 +51,13 @@ public enum Settings { DYNAMIC_LIGHTS(new NotFineOptionCycling(DynamicLightsMode.FANCY, OptionImpact.VARIES)){ @Override public void applyChanges() { - DynamicLights.Mode = (DynamicLightsMode) DYNAMIC_LIGHTS.option.getStore(); + DynamicLights.Mode = (DynamicLightsMode) this.option.getStore(); + } + }, + DYNAMIC_LIGHTS_SHADER_FORCE(new NotFineOptionTickBox(false, OptionImpact.VARIES)){ + @Override + public void applyChanges() { + DynamicLights.ShaderForce = (boolean) this.option.getStore(); } }, FOG_NEAR_DISTANCE(new NotFineOptionSliderPercentage(75, 1, 100, 1, OptionImpact.LOW)), diff --git a/src/main/java/jss/notfine/gui/NotFineGameOptionPages.java b/src/main/java/jss/notfine/gui/NotFineGameOptionPages.java index 7fab2e815..cbb4e0448 100644 --- a/src/main/java/jss/notfine/gui/NotFineGameOptionPages.java +++ b/src/main/java/jss/notfine/gui/NotFineGameOptionPages.java @@ -191,6 +191,7 @@ public class NotFineGameOptionPages { .add(Settings.DOWNFALL_DISTANCE.option) .add(Settings.MODE_VIGNETTE.option) .add(Settings.DYNAMIC_LIGHTS.option, AngelicaConfig.enableDynamicLights) + .add(Settings.DYNAMIC_LIGHTS_SHADER_FORCE.option, AngelicaConfig.enableDynamicLights) .add(Settings.MODE_SHADOWS.option) .add(Settings.VOID_FOG.option) .add(Settings.MODE_DROPPED_ITEMS.option) diff --git a/src/main/java/me/jellysquid/mods/sodium/client/gui/SodiumGameOptionPages.java b/src/main/java/me/jellysquid/mods/sodium/client/gui/SodiumGameOptionPages.java index c6fa1b3c8..ccef1b313 100644 --- a/src/main/java/me/jellysquid/mods/sodium/client/gui/SodiumGameOptionPages.java +++ b/src/main/java/me/jellysquid/mods/sodium/client/gui/SodiumGameOptionPages.java @@ -243,6 +243,7 @@ public class SodiumGameOptionPages { .add(Settings.MODE_SHADOWS.option) .add(Settings.MODE_VIGNETTE.option) .add(Settings.DYNAMIC_LIGHTS.option, AngelicaConfig.enableDynamicLights) + .add(Settings.DYNAMIC_LIGHTS_SHADER_FORCE.option, AngelicaConfig.enableDynamicLights) .build()); diff --git a/src/main/resources/assets/angelica/lang/en_US.lang b/src/main/resources/assets/angelica/lang/en_US.lang index e7a1b6e73..d42e50942 100644 --- a/src/main/resources/assets/angelica/lang/en_US.lang +++ b/src/main/resources/assets/angelica/lang/en_US.lang @@ -132,7 +132,9 @@ options.iris.shadowDistance.disabled=Your current shader pack has already set a options.iris.gui.hide=Hide GUI options.iris.gui.show=Show GUI options.dynamic_lights=Dynamic Lights -options.dynamic_lights.tooltip=Enables dynamic lights. Modes: OFF - off, FASTEST - 500ms delay, FAST - 250ms delay, FANCY - no delay. Disabled if shaders are in use. +options.dynamic_lights.tooltip=Enables dynamic lights. Modes: OFF - off, FASTEST - 500ms delay, FAST - 250ms delay, FANCY - 50ms delay, REALTIME - no delay. +options.dynamic_lights_shader_force=Dynamic Lights - Forced With Shaders +options.dynamic_lights_shader_force.tooltip=Enabled - Dynamic Lights are shown even when a shader is active, Disabled - Dynamic Lights are disabled when a shader is active. options.angelica.droppedItemLimit=Dropped Item Render Limit options.angelica.droppedItemLimit.tooltip=The maximum number of dropped items that will be rendered. Lower values can improve performance. pack.iris.select.title=Select diff --git a/src/mixin/java/com/gtnewhorizons/angelica/mixins/early/angelica/dynamiclights/MixinEntity.java b/src/mixin/java/com/gtnewhorizons/angelica/mixins/early/angelica/dynamiclights/MixinEntity.java index ad46af8b0..e77e12371 100644 --- a/src/mixin/java/com/gtnewhorizons/angelica/mixins/early/angelica/dynamiclights/MixinEntity.java +++ b/src/mixin/java/com/gtnewhorizons/angelica/mixins/early/angelica/dynamiclights/MixinEntity.java @@ -73,19 +73,6 @@ public abstract class MixinEntity implements IDynamicLightSource { this.angelica$lastLuminance = 0; } - @Override - public boolean angelica$shouldUpdateDynamicLight() { - if (DynamicLights.Mode.hasDelay()) { - long currentTime = System.currentTimeMillis(); - if (currentTime < angelica$lastUpdate + DynamicLights.Mode.getDelay()) - return false; - - angelica$lastUpdate = currentTime; - } - - return true; - } - @Inject(method = "onEntityUpdate", at = @At("TAIL")) public void angelica$onUpdate(CallbackInfo ci) { @@ -111,8 +98,6 @@ public abstract class MixinEntity implements IDynamicLightSource { @Override public boolean angelica$updateDynamicLight(@NotNull SodiumWorldRenderer renderer) { - if (!this.angelica$shouldUpdateDynamicLight()) - return false; double deltaX = this.posX - this.angelica$prevX; double deltaY = this.posY - this.angelica$prevY; double deltaZ = this.posZ - this.angelica$prevZ;