mirror of
https://github.com/GTNewHorizons/Angelica.git
synced 2026-11-22 13:19:44 +00:00
Compare commits
4
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
208373deaa | ||
|
|
f22a3f612b | ||
|
|
9ff1015d19 | ||
|
|
0023fe3da2 |
No files matched your search
@@ -525,7 +525,7 @@ public enum Mixins {
|
||||
&& !MCPatcherForgeConfig.ConnectedTextures.enabled
|
||||
&& MCPatcherForgeConfig.CustomColors.enabled)
|
||||
.addTargetedMod(TargetedMod.VANILLA)
|
||||
.addMixinClasses("mcpatcherforge.cc_ctm.MixinRenderBlocksNoCTM")
|
||||
.addMixinClasses("mcpatcherforge.ctm_cc.MixinRenderBlocksNoCTM")
|
||||
),
|
||||
MCPATCHER_FORGE_CTM_NO_CC(new Builder("MCP:F Connected Textures, no Custom Colours")
|
||||
.setSide(Side.CLIENT).setPhase(Phase.EARLY)
|
||||
|
||||
@@ -537,7 +537,7 @@ public class Iris {
|
||||
if (level != null) {
|
||||
if (level.provider == null) return DimensionId.OVERWORLD;
|
||||
|
||||
if ((level.provider.isHellWorld || level.provider.hasNoSky) || level.provider.dimensionId == -1) {
|
||||
if (level.provider.isHellWorld || level.provider.dimensionId == -1) {
|
||||
return DimensionId.NETHER;
|
||||
} else if (level.provider.dimensionId == 1) {
|
||||
return DimensionId.END;
|
||||
|
||||
@@ -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);
|
||||
|
||||
@@ -91,6 +91,17 @@ public class ShaderPackOptionList extends IrisGuiSlot {
|
||||
final BaseEntry entry = this.entries.get(index);
|
||||
return entry.mouseClicked(mouseX, mouseY, mouseButton);
|
||||
}
|
||||
@Override
|
||||
public boolean mouseReleased( int mouseX, int mouseY, int button) {
|
||||
final int relativeY = mouseY - this.top - this.headerPadding + (int) this.amountScrolled - 4;
|
||||
final int index = relativeY / this.slotHeight;
|
||||
|
||||
if (index < 0 || index >= this.entries.size())
|
||||
return false;
|
||||
|
||||
final BaseEntry entry = this.entries.get(index);
|
||||
return entry.mouseReleased(mouseX, mouseY, button);
|
||||
}
|
||||
|
||||
@Override
|
||||
protected boolean isSelected(int idx) {
|
||||
|
||||
@@ -12,6 +12,7 @@ public abstract class BaseEntry {
|
||||
}
|
||||
|
||||
public abstract boolean mouseClicked(int mouseX, int mouseY, int button);
|
||||
public abstract boolean mouseReleased(int mouseX, int mouseY, int button);
|
||||
|
||||
|
||||
public abstract void drawEntry(ShaderPackScreen screen, int index, int x, int y, int slotWidth, int slotHeight, Tessellator tessellator, int mouseX, int mouseY, boolean isMouseOver);
|
||||
|
||||
@@ -108,6 +108,11 @@ public class HeaderEntry extends BaseEntry {
|
||||
return backButtonResult || utilButtonResult;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean mouseReleased(int mouseX, int mouseY, int button) {
|
||||
return false;
|
||||
}
|
||||
|
||||
private boolean backButtonClicked(IrisElementRow.TextButtonElement button) {
|
||||
this.navigation.back();
|
||||
GuiUtil.playButtonClickSound();
|
||||
|
||||
@@ -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