mirror of
https://github.com/GTNewHorizons/Angelica.git
synced 2026-11-20 04:19:40 +00:00
Fix shadow render distance reset to 32 (#856)
This commit is contained in:
1 parent
0023fe3da2
commit
9ff1015d19
3 files changed
+14
-13
No files matched your search
@@ -1,6 +1,7 @@
|
||||
package net.coderbot.iris.config;
|
||||
|
||||
import net.coderbot.iris.Iris;
|
||||
import net.coderbot.iris.gui.option.IrisVideoSettings;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.io.InputStream;
|
||||
@@ -122,13 +123,13 @@ public class IrisConfig {
|
||||
enableShaders = !"false".equals(properties.getProperty("enableShaders"));
|
||||
disableUpdateMessage = "true".equals(properties.getProperty("disableUpdateMessage"));
|
||||
// TODO: GUI
|
||||
// try {
|
||||
// IrisVideoSettings.shadowDistance = Integer.parseInt(properties.getProperty("maxShadowRenderDistance", "32"));
|
||||
// } catch (NumberFormatException e) {
|
||||
// Iris.logger.error("Shadow distance setting reset; value is invalid.");
|
||||
// IrisVideoSettings.shadowDistance = 32;
|
||||
// save();
|
||||
// }
|
||||
try {
|
||||
IrisVideoSettings.shadowDistance = Integer.parseInt(properties.getProperty("maxShadowRenderDistance", "32"));
|
||||
} catch (NumberFormatException e) {
|
||||
Iris.logger.error("Shadow distance setting reset; value is invalid.");
|
||||
IrisVideoSettings.shadowDistance = 32;
|
||||
save();
|
||||
}
|
||||
|
||||
if (shaderPackName != null) {
|
||||
if (shaderPackName.equals("(internal)") || shaderPackName.isEmpty()) {
|
||||
@@ -147,8 +148,7 @@ public class IrisConfig {
|
||||
properties.setProperty("shaderPack", getShaderPackName().orElse(""));
|
||||
properties.setProperty("enableShaders", enableShaders ? "true" : "false");
|
||||
properties.setProperty("disableUpdateMessage", disableUpdateMessage ? "true" : "false");
|
||||
// properties.setProperty("maxShadowRenderDistance", String.valueOf(IrisVideoSettings.shadowDistance));
|
||||
properties.setProperty("maxShadowRenderDistance", String.valueOf(32));
|
||||
properties.setProperty("maxShadowRenderDistance", String.valueOf(IrisVideoSettings.shadowDistance));
|
||||
// NB: This uses ISO-8859-1 with unicode escapes as the encoding
|
||||
try (OutputStream os = Files.newOutputStream(propertiesPath)) {
|
||||
properties.store(os, COMMENT);
|
||||
|
||||
@@ -11,8 +11,8 @@ public class IrisVideoSettings {
|
||||
public static int shadowDistance = 32;
|
||||
|
||||
// TODO: Tell the user to check in the shader options once that's supported.
|
||||
private static final String DISABLED_TOOLTIP = I18n.format("options.iris.shadowDistance.disabled");
|
||||
private static final String ENABLED_TOOLTIP = I18n.format("options.iris.shadowDistance.enabled");
|
||||
// private static final String DISABLED_TOOLTIP = I18n.format("options.iris.shadowDistance.disabled");
|
||||
// private static final String ENABLED_TOOLTIP = I18n.format("options.iris.shadowDistance.enabled");
|
||||
|
||||
public static int getOverriddenShadowDistance(int base) {
|
||||
return Iris.getPipelineManager().getPipeline()
|
||||
|
||||
@@ -14,6 +14,7 @@ import java.util.List;
|
||||
import java.util.Objects;
|
||||
import me.jellysquid.mods.sodium.client.render.SodiumWorldRenderer;
|
||||
import net.coderbot.iris.Iris;
|
||||
import net.coderbot.iris.gui.option.IrisVideoSettings;
|
||||
import net.coderbot.iris.shaderpack.OptionalBoolean;
|
||||
import net.coderbot.iris.shaderpack.PackDirectives;
|
||||
import net.coderbot.iris.shaderpack.PackShadowDirectives;
|
||||
@@ -284,8 +285,8 @@ public class ShadowRenderer {
|
||||
|
||||
if (renderMultiplier < 0) {
|
||||
// TODO: GUI
|
||||
// distance = IrisVideoSettings.shadowDistance * 16;
|
||||
distance = 32 * 16;
|
||||
distance = IrisVideoSettings.shadowDistance * 16; // can be zero :(
|
||||
//distance = 32 * 16;
|
||||
setter = "(set by user)";
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user