Skip to content

Commit

Permalink
Merge branch '1.6.2-without-0.4.11' into 1.20-new
Browse files Browse the repository at this point in the history
# Conflicts:
#	src/main/resources/fabric.mod.json
  • Loading branch information
IMS212 committed Aug 5, 2023
2 parents 4ed48f3 + 20ec7bf commit 9cd5bda
Show file tree
Hide file tree
Showing 3 changed files with 31 additions and 1 deletion.
25 changes: 25 additions & 0 deletions docs/changelogs/1.6.5/full.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
# Iris 1.6.5 Changelog

- Fixed NEC/Sodium screen bypass not working
- Moved the "Color Space" toggle to Quality options.
- Added `entity_flame` special ID.
- Fixed a crash with core profile shaders.
- Fix mismatched push/pop when in spectator on some packs.
- Added a fake vertex shader subsystem, to fix *extremely* old packs without vertex shaders.
- Fixed fake entity shadows on some packs.
- Fixed lightning bolts not taking on the correct entityId.
- Enabled smooth triangle (not quad) shading.
- Added `dimension.properties`.
- Added `is_on_ground`.
- Added support for armor trim detection.

### dimension.properties

When `dimension.properties` is added to the shader pack root, behavior relating to dimensions change.
Iris will no longer resolve any dimensions for you, and you are expected to resolve you own.

The syntax for dimension.properties is as follows:

`dimension.folderName = dimensionNamespace:dimensionPath`

*You can use `*` as a value to fallback all dimensions to.*
5 changes: 5 additions & 0 deletions src/main/java/net/coderbot/iris/uniforms/CommonUniforms.java
Original file line number Diff line number Diff line change
Expand Up @@ -135,6 +135,7 @@ public static void generalCommonUniforms(UniformHolder uniforms, FrameUpdateNoti
.uniform1b(PER_FRAME, "is_hurt", CommonUniforms::isHurt)
.uniform1b(PER_FRAME, "is_invisible", CommonUniforms::isInvisible)
.uniform1b(PER_FRAME, "is_burning", CommonUniforms::isBurning)
.uniform1b(PER_FRAME, "is_on_ground", CommonUniforms::isOnGround)
// TODO: Do we need to clamp this to avoid fullbright breaking shaders? Or should shaders be able to detect
// that the player is trying to turn on fullbright?
.uniform1f(PER_FRAME, "screenBrightness", () -> client.options.gamma().get())
Expand All @@ -155,6 +156,10 @@ public static void generalCommonUniforms(UniformHolder uniforms, FrameUpdateNoti
.uniform3d(PER_FRAME, "skyColor", CommonUniforms::getSkyColor);
}

private static boolean isOnGround() {
return client.player != null && client.player.isOnGround();
}

private static boolean isHurt() {
if (client.player != null) {
return client.player.hurtTime > 0; // Do not use isHurt, that's not what we want!
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/fabric.mod.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"schemaVersion": 1,
"id": "iris",
"version": "1.6.5-beta.1-development-environment",
"version": "1.6.5-development-environment",

"name": "Iris",
"description": "A modern shaders mod for Minecraft intended to be compatible with existing OptiFine shader packs",
Expand Down

0 comments on commit 9cd5bda

Please sign in to comment.