From 8aea7985be6555bc58f3604388a1ea2cd01e9fc8 Mon Sep 17 00:00:00 2001 From: Quinn Date: Wed, 2 Mar 2022 02:03:52 +0000 Subject: [PATCH 1/7] Removed references to it being unreleased --- docs/changelogs/1.2.1/full.md | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/docs/changelogs/1.2.1/full.md b/docs/changelogs/1.2.1/full.md index a9b2f108ec..4013771217 100644 --- a/docs/changelogs/1.2.1/full.md +++ b/docs/changelogs/1.2.1/full.md @@ -1,6 +1,4 @@ -# Iris 1.2.1 Preliminary Changelog - -This update isn't actually released yet, we're just writing this now to keep track of our progress. +# Iris 1.2.1 Changelog - Switched to the Brachyura build system, substantially speeding up the build process & allowing us to much more easily tweak and debug our build scripts (ThatTrollzer, coderbot, IMS) - Brachyura is still in development and is incomplete, but Iris is an early adopter. We hope that it will continue to stabilize and become appropriate for use by all Minecraft mods in due time. From e45b46827e7b4c9d8d00697a31b19ccda6c309ce Mon Sep 17 00:00:00 2001 From: coderbot Date: Tue, 1 Mar 2022 23:38:15 -0800 Subject: [PATCH 2/7] 1.2.1 fixed an issue with KUDA's block breaking https://github.com/IrisShaders/Iris/issues/865 --- docs/changelogs/1.2.1/full.md | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/changelogs/1.2.1/full.md b/docs/changelogs/1.2.1/full.md index 4013771217..a10ca8749d 100644 --- a/docs/changelogs/1.2.1/full.md +++ b/docs/changelogs/1.2.1/full.md @@ -33,6 +33,7 @@ - Fixes entity shadows on SEUS PTGI. - Added support for the extended vertex format on entities, block entities, and similar (IMS) - Fixes rendering issues with Advanced Materials on BSL, AstraLex, and similar packs + - Fixes block breaking animation with KUDA shaders - Fixes many miscellaneous issues on other older packs ## Translations From b83ee02a82faf0e67368ee002c5ea76aff5d2065 Mon Sep 17 00:00:00 2001 From: coderbot Date: Tue, 1 Mar 2022 23:48:14 -0800 Subject: [PATCH 3/7] supportedshaders: SEUS does not work on intel / mesa --- docs/supportedshaders.md | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/docs/supportedshaders.md b/docs/supportedshaders.md index 567827d474..199cfd8870 100644 --- a/docs/supportedshaders.md +++ b/docs/supportedshaders.md @@ -12,12 +12,11 @@ * [Continuum 2.0.4](https://continuum.graphics/downloads) -* [SEUS V11](https://www.sonicether.com/seus/) - -* [SEUS Renewed](https://www.sonicether.com/seus/) - -* [SEUS PTGI E12 / HRR 2.1](https://www.sonicether.com/seus) - * SEUS PTGI HRR 3 is not currently supported. +* SEUS (NVIDIA or AMD GPU required, does not work on Mesa drivers or Intel Windows drivers) + * [SEUS V11](https://www.sonicether.com/seus/) + * [SEUS Renewed](https://www.sonicether.com/seus/) + * [SEUS PTGI E12 / HRR 2.1](https://www.sonicether.com/seus) + * SEUS PTGI HRR 3 is not currently supported. * [Sildur's Enhanced Default](https://sildurs-shaders.github.io/) From 62fde56d0a298126eed606fd057945cdecb2a9d3 Mon Sep 17 00:00:00 2001 From: IMS212 Date: Fri, 4 Mar 2022 06:30:19 -0800 Subject: [PATCH 4/7] Add Complementary isEyeInCave, 1.2.2-pre --- .../iris/uniforms/CommonUniforms.java | 2 +- .../uniforms/HardcodedCustomUniforms.java | 31 +++++++++++++++++++ src/main/resources/fabric.mod.json | 2 +- 3 files changed, 33 insertions(+), 2 deletions(-) diff --git a/src/main/java/net/coderbot/iris/uniforms/CommonUniforms.java b/src/main/java/net/coderbot/iris/uniforms/CommonUniforms.java index a761db80c0..2cfbae7567 100644 --- a/src/main/java/net/coderbot/iris/uniforms/CommonUniforms.java +++ b/src/main/java/net/coderbot/iris/uniforms/CommonUniforms.java @@ -216,7 +216,7 @@ private static float getNightVision() { return 0.0F; } - private static int isEyeInWater() { + static int isEyeInWater() { // Note: With certain utility / cheat mods, this method will return air even when the player is submerged when // the "No Overlay" feature is enabled. // diff --git a/src/main/java/net/coderbot/iris/uniforms/HardcodedCustomUniforms.java b/src/main/java/net/coderbot/iris/uniforms/HardcodedCustomUniforms.java index d616e96c31..3ccea43921 100644 --- a/src/main/java/net/coderbot/iris/uniforms/HardcodedCustomUniforms.java +++ b/src/main/java/net/coderbot/iris/uniforms/HardcodedCustomUniforms.java @@ -1,5 +1,6 @@ package net.coderbot.iris.uniforms; +import net.coderbot.iris.Iris; import net.coderbot.iris.gl.uniform.FloatSupplier; import net.coderbot.iris.gl.uniform.UniformHolder; import net.coderbot.iris.gl.uniform.UniformUpdateFrequency; @@ -7,17 +8,24 @@ import net.coderbot.iris.uniforms.transforms.SmoothedFloat; import net.coderbot.iris.vendored.joml.Math; import net.minecraft.client.Minecraft; +import net.minecraft.core.BlockPos; import net.minecraft.world.level.Level; +import net.minecraft.world.level.LightLayer; import net.minecraft.world.level.biome.Biome; +import net.minecraft.world.phys.Vec3; // These expressions are copied directly from BSL and Complementary. // TODO: Remove once custom uniforms are actually supported, this is just a temporary thing to get BSL & Complementary // mostly working under Iris. public class HardcodedCustomUniforms { + private static final Minecraft client = Minecraft.getInstance(); + public static void addHardcodedCustomUniforms(UniformHolder holder, FrameUpdateNotifier updateNotifier) { CameraUniforms.CameraPositionTracker tracker = new CameraUniforms.CameraPositionTracker(updateNotifier); + SmoothedFloat eyeInCave = new SmoothedFloat(6, 12, HardcodedCustomUniforms::getEyeInCave, updateNotifier); + holder.uniform1f(UniformUpdateFrequency.PER_FRAME, "timeAngle", HardcodedCustomUniforms::getTimeAngle); holder.uniform1f(UniformUpdateFrequency.PER_FRAME, "timeBrightness", HardcodedCustomUniforms::getTimeBrightness); holder.uniform1f(UniformUpdateFrequency.PER_FRAME, "moonBrightness", HardcodedCustomUniforms::getMoonBrightness); @@ -28,10 +36,33 @@ public static void addHardcodedCustomUniforms(UniformHolder holder, FrameUpdateN holder.uniform1f(UniformUpdateFrequency.PER_FRAME, "isDry", new SmoothedFloat(20, 10, () -> getRawPrecipitation() == 0 ? 1 : 0, updateNotifier)); holder.uniform1f(UniformUpdateFrequency.PER_FRAME, "isRainy", new SmoothedFloat(20, 10, () -> getRawPrecipitation() == 1 ? 1 : 0, updateNotifier)); holder.uniform1f(UniformUpdateFrequency.PER_FRAME, "isSnowy", new SmoothedFloat(20, 10, () -> getRawPrecipitation() == 2 ? 1 : 0, updateNotifier)); + holder.uniform1f(UniformUpdateFrequency.PER_FRAME, "isEyeInCave", CommonUniforms.isEyeInWater() == 0 ? eyeInCave : () -> 0); holder.uniform1f(UniformUpdateFrequency.PER_FRAME, "velocity", () -> getVelocity(tracker)); holder.uniform1f(UniformUpdateFrequency.PER_FRAME, "starter", getStarter(tracker, updateNotifier)); } + private static float getEyeInCave() { + if (client.getCameraEntity().getEyeY() < 5.0) { + System.out.println(getEyeSkyBrightness() / 240F); + return getEyeSkyBrightness() / 240F; + } + return 0.0F; + } + + private static float getEyeSkyBrightness() { + if (client.cameraEntity == null || client.level == null) { + return 0; + } + + Vec3 feet = client.cameraEntity.position(); + Vec3 eyes = new Vec3(feet.x, client.cameraEntity.getEyeY(), feet.z); + BlockPos eyeBlockPos = new BlockPos(eyes); + + int skyLight = client.level.getBrightness(LightLayer.SKY, eyeBlockPos); + + return skyLight * 16; + } + private static float getVelocity(CameraUniforms.CameraPositionTracker tracker) { float difX = (float) (tracker.getCurrentCameraPosition().x - tracker.getPreviousCameraPosition().x); float difY = (float) (tracker.getCurrentCameraPosition().y - tracker.getPreviousCameraPosition().y); diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index f9a9f9e07b..1ead07d411 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -1,7 +1,7 @@ { "schemaVersion": 1, "id": "iris", - "version": "1.2.1-rc1-development-environment", + "version": "1.2.2-pre-development-environment", "name": "Iris", "description": "A modern shaders mod for Minecraft intended to be compatible with existing OptiFine shader packs", From c6de4e3ff54179244931404ccf6eef89f0692e25 Mon Sep 17 00:00:00 2001 From: IMS212 Date: Fri, 4 Mar 2022 06:41:06 -0800 Subject: [PATCH 5/7] Fix actual calculation --- .../net/coderbot/iris/uniforms/HardcodedCustomUniforms.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/main/java/net/coderbot/iris/uniforms/HardcodedCustomUniforms.java b/src/main/java/net/coderbot/iris/uniforms/HardcodedCustomUniforms.java index 3ccea43921..ad32eb2af5 100644 --- a/src/main/java/net/coderbot/iris/uniforms/HardcodedCustomUniforms.java +++ b/src/main/java/net/coderbot/iris/uniforms/HardcodedCustomUniforms.java @@ -43,10 +43,9 @@ public static void addHardcodedCustomUniforms(UniformHolder holder, FrameUpdateN private static float getEyeInCave() { if (client.getCameraEntity().getEyeY() < 5.0) { - System.out.println(getEyeSkyBrightness() / 240F); - return getEyeSkyBrightness() / 240F; + return 1.0f - getEyeSkyBrightness() / 240F; } - return 0.0F; + return 0.0f; } private static float getEyeSkyBrightness() { From 3aa6ee55d561bb9838e5911015027594e4e375f9 Mon Sep 17 00:00:00 2001 From: IMS212 Date: Sat, 5 Mar 2022 06:28:46 -0800 Subject: [PATCH 6/7] Use .build versioning if Github Actions is running --- buildscript/src/main/java/Buildscript.java | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/buildscript/src/main/java/Buildscript.java b/buildscript/src/main/java/Buildscript.java index a1c59ddcbd..aec47b2966 100644 --- a/buildscript/src/main/java/Buildscript.java +++ b/buildscript/src/main/java/Buildscript.java @@ -97,6 +97,14 @@ public Path[] paths(String subdir, boolean onlyHeaders) { @Override public String getVersion() { + String baseVersion = super.getVersion().replace("development-environment", ""); + + String build_id = System.getenv("GITHUB_RUN_NUMBER"); + + if (build_id != null) { + return baseVersion + "build." + build_id; + } + String commitHash = ""; boolean isDirty = false; try { @@ -108,8 +116,6 @@ public String getVersion() { e.printStackTrace(); } - String baseVersion = super.getVersion().replace("development-environment", ""); - return baseVersion + commitHash + (isDirty ? "-dirty" : ""); } From e47192b9245b027f5c9b06f24650300ab0201917 Mon Sep 17 00:00:00 2001 From: Leo <87563929+Leonerd-04@users.noreply.github.com> Date: Sat, 5 Mar 2022 20:19:51 -0800 Subject: [PATCH 7/7] Update faq.md Updated faq.md to reflect the fact that Iris supports shader configs now --- docs/faq.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/faq.md b/docs/faq.md index 7a50a3b000..019d57aa0c 100644 --- a/docs/faq.md +++ b/docs/faq.md @@ -17,7 +17,7 @@ You need java, please get it from: [Adoptium.net](https://adoptium.net/?variant= ## How can I configure my shaders? -[#663](https://github.com/IrisShaders/Iris/issues/663) +Go to Options>Video Settings>Shader Packs>Shader Pack Settings. ## Is my system supported?