Skip to content

Update to 1.20 #10

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Evtema3 wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Update to 1.20 #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4427956
Update to 1.20
Evtema3 Aug 28, 2023
d1d935d
Merge pull request #1 from ShockMicro/main
Evtema3 Jan 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 7 additions & 6 deletions assets/minecraft/shaders/core/rendertype_entity_translucent_cull.fsh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ uniform float FogStart;
uniform float FogEnd;
uniform vec4 FogColor;

in int isGUI;
in int isHand;
flat in int isGUI;
flat in int isHand;
in float zpos;
in float vertexDistance;
in vec4 vertexColor;
Expand All @@ -33,12 +33,13 @@ void main() {
if (color.a < 0.1) discard; // Snipped due to size.

// updated to 1.19.4 thanks to the der discohund
// updated to 1.20 thanks to HalbFettKaese + Evtema3

// Switch used parts of the texture depending on where the model is displayed
if (isGUI == 0 && roughly_equal(alpha, 253.0, 0.01)) discard;
// Switch used parts of the texture depending on where the model is displayed (using alpha255 by default)
if (isGUI == 0 && roughly_equal(alpha255, 253.0, 0.01)) discard;
if (isGUI == 1) {
if (zpos > 125.0 && roughly_equal(alpha, 254.0, 0.01)) discard; // Handled as inventory slot
else if (zpos <= 125.0 && roughly_equal(alpha, 253.0, 0.01)) discard; // Handled as on the player doll
if (zpos > 100.0 && roughly_equal(alpha255, 254.0, 0.01)) discard; // Handled as inventory slot
else if (zpos <= 100.0 && roughly_equal(alpha255, 253.0, 0.01)) discard; // Handled as on the player doll
}

fragColor = linear_fog(color, vertexDistance, FogStart, FogEnd, FogColor);
Expand Down
3 changes: 2 additions & 1 deletion assets/minecraft/shaders/core/rendertype_entity_translucent_cull.vsh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,11 @@ out vec2 texCoord2;
out vec4 normal;

// updated to 1.19.4 thanks to the der discohund
// updated to 1.20 thanks to HalbFettKaese + Evtema3

// gui item model detection from Onnowhere
bool isgui(mat4 ProjMat) {
return ProjMat[3][2] == -2.0;
return abs(ProjMat[3][3]) > 0.01;
}
// first person hand item model detection from esben
bool ishand(float FogStart) {
Expand Down
2 changes: 1 addition & 1 deletion pack.mcmeta
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"pack": {
"pack_format": 8,
"pack_format": 15,
"description": "Adds a way to have different items in the hand and the GUI."
}
}