Compare commits

..

No commits in common. "2.1.1" and "v2.1.0" have entirely different histories.

125 changed files with 22 additions and 330 deletions

Binary file not shown.

View file

@ -1,6 +1,13 @@
# EnderNon's Dark Wynncraft Pack # EnderNon's Stone Tablet Pack
A resource pack that makes the game's GUIs dark themed. This pack is my own work with some inspiration from brilliantknight's Stone Tablet pack. A resource pack that makes the game's GUIs dark themed. This pack is my own work with some inspiration from brilliantknight's Stone Tablet pack.
# Current issues
- ~~Some menus don't have a dark theme yet (WIP)~~ (only like a few menus left)
# Where do I download this? # Where do I download this?
Go to the Releases tab. https://git.frfrnocap.men/wynnpacks/wynn-darkmode/releases Go to the Releases tab. https://git.frfrnocap.men/wynnpacks/wynn-darkmode/releases
DO NOT DOWNLOAD THE SOURCE CODE! I CANNOT PREVENT THAT FROM SHOWING UP!

View file

@ -1,84 +0,0 @@
#version 150
in vec4 vertexColor;
flat in vec2 flatCorner;
in vec2 Pos1;
in vec2 Pos2;
in vec4 Coords;
in vec2 position;
uniform vec4 ColorModulator;
out vec4 fragColor;
vec4 colors[4] = vec4[](
vec4(0),
vec4(20, 17, 25, 255) / 255,
vec4(73, 40, 121, 255) / 255,
vec4(42, 31, 61, 255) / 255
);
int bitmap[64] = int[](
0, 0, 1, 1, 1, 1, 1, 1,
0, 1, 3, 3, 3, 3, 3, 3,
1, 3, 3, 2, 2, 2, 2, 2,
1, 3, 2, 2, 3, 3, 3, 3,
1, 3, 2, 3, 3, 3, 3, 3,
1, 3, 2, 3, 3, 3, 3, 3,
1, 3, 2, 3, 3, 3, 3, 3,
1, 3, 2, 3, 3, 3, 3, 3
);
void main() {
vec4 color = vertexColor;
if (color.a == 0.0) {
discard;
}
fragColor = color * ColorModulator;
if (flatCorner != vec2(-1))
{
//Actual Pos
vec2 APos1 = Pos1;
vec2 APos2 = Pos2;
APos1 = round(APos1 / (flatCorner.x == 0 ? 1 - Coords.z : 1 - Coords.w)); //Right-up corner
APos2 = round(APos2 / (flatCorner.x == 0 ? Coords.w : Coords.z)); //Left-down corner
ivec2 res = ivec2(abs(APos1 - APos2)) - 1; //Resolution of frame
ivec2 stp = ivec2(min(APos1, APos2)); //Left-Up corner
ivec2 pos = ivec2(floor(position)) - stp; //Position in frame
vec4 col = vec4(42, 31, 61, 255) / 255.0;
col.rgb -= max(1 - length((pos - res / 2.0) / res) * 2, 0) / 10;
ivec2 corner = min(pos, res - pos);
if (corner.x < 8 && corner.y < 8)
{
int bit = bitmap[corner.y * 8 + corner.x];
if (bit == 0)
discard;
if (bit != 4)
col = colors[bit];
}
else if (corner.x == 0) // left and right side: Outer
col = colors[1];
else if (corner.x == 2) // left and right side: Middle
col = colors[3];
else if (corner.x == 3) // left and right side: Inner ish
col = colors[2];
else if (corner.y == 0) // top and bottom side: Outer
col = colors[1];
else if (corner.y == 2) // top and bottom side: Middle
col = colors[3];
else if (corner.y == 3) // top and bottom side: Inner ish
col = colors[2];
fragColor = col;
}
}

View file

@ -1,19 +0,0 @@
{
"blend": {
"func": "add",
"srcrgb": "srcalpha",
"dstrgb": "1-srcalpha"
},
"vertex": "position_color",
"fragment": "position_color",
"attributes": [
"Color"
],
"samplers": [
],
"uniforms": [
{ "name": "ModelViewMat", "type": "matrix4x4", "count": 16, "values": [ 1.0, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 0.0, 1.0 ] },
{ "name": "ProjMat", "type": "matrix4x4", "count": 16, "values": [ 1.0, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 0.0, 1.0 ] },
{ "name": "ColorModulator", "type": "float", "count": 4, "values": [ 1.0, 1.0, 1.0, 1.0 ] }
]
}

View file

@ -1,61 +0,0 @@
#version 150
in vec3 Position;
in vec4 Color;
uniform mat4 ModelViewMat;
uniform mat4 ProjMat;
uniform vec2 ScreenSize;
out vec4 vertexColor;
out vec4 Coords;
out vec2 position;
flat out vec2 flatCorner;
out vec2 Pos1;
out vec2 Pos2;
bool isTooltip(mat4 ProjMat,vec3 Position) {
return ProjMat[2][3] == 0 && Position.z > 300 && Position.z < 500;
}
void main() {
vertexColor = Color;
gl_Position = ProjMat * ModelViewMat * vec4(Position, 1.0);
Coords = vec4(-1);
position = vec2(-1);
Pos1 = vec2(-1);
Pos2 = vec2(-1);
flatCorner = vec2(-1);
//Tooltip frame
if (Color.r != 0 && Color.g == 0 && Color.b != 0 && ProjMat[3][0] == -1)
{
int id = gl_VertexID / 4;
int vertID = (gl_VertexID) % 4;
const vec2[4] corners = vec2[4](vec2(0, 0), vec2(0, 1), vec2(1, 1), vec2(1, 0));
vec2 ScrSize = 2 / vec2(ProjMat[0][0], -ProjMat[1][1]);
vec3 Pos = Position - vec3(corners[((gl_VertexID) ) % 4] * -10 - (-10 / 2.0), 0);
Pos1 = Pos2 = vec2(0);
if (vertID == 0) Pos1 = Pos.xy;
if (vertID == 2) Pos2 = Pos.xy;
Coords.xy = ScrSize;
Coords.zw = flatCorner = corners[vertID];
position = Pos.xy;
if (id != 2)
Pos.xy = vec2(0);
gl_Position = ProjMat * ModelViewMat * vec4(Pos, 1);
}
if (isTooltip(ProjMat, Position) && (gl_Position.x > 1 || gl_Position.x < -0.99)) {
vertexColor = vec4(0);
}
}

View file

@ -1,82 +0,0 @@
#version 150
in vec4 vertexColor;
flat in vec2 flatCorner;
in vec2 Pos1;
in vec2 Pos2;
in vec4 Coords;
in vec2 position;
uniform vec4 ColorModulator;
out vec4 fragColor;
vec4 colors[4] = vec4[](
vec4(0),
vec4(20, 17, 25, 255) / 255,
vec4(73, 40, 121, 255) / 255,
vec4(42, 31, 61, 255) / 255
);
int bitmap[64] = int[](
0, 0, 1, 1, 1, 1, 1, 1,
0, 1, 3, 3, 3, 3, 3, 3,
1, 3, 3, 2, 2, 2, 2, 2,
1, 3, 2, 2, 3, 3, 3, 3,
1, 3, 2, 3, 3, 3, 3, 3,
1, 3, 2, 3, 3, 3, 3, 3,
1, 3, 2, 3, 3, 3, 3, 3,
1, 3, 2, 3, 3, 3, 3, 3
);
void main() {
vec4 color = vertexColor;
if (color.a == 0.0) {
discard;
}
fragColor = color * ColorModulator;
if (flatCorner != vec2(-1))
{
//Actual Pos
vec2 APos1 = Pos1;
vec2 APos2 = Pos2;
APos1 = round(APos1 / (flatCorner.x == 0 ? 1 - Coords.z : 1 - Coords.w)); //Right-up corner
APos2 = round(APos2 / (flatCorner.x == 0 ? Coords.w : Coords.z)); //Left-down corner
ivec2 res = ivec2(abs(APos1 - APos2)) - 1; //Resolution of frame
ivec2 stp = ivec2(min(APos1, APos2)); //Left-Up corner
ivec2 pos = ivec2(floor(position)) - stp; //Position in frame
vec4 col = vec4(42, 31, 61, 255) / 255.0;
ivec2 corner = min(pos, res - pos);
if (corner.x < 8 && corner.y < 8)
{
int bit = bitmap[corner.y * 8 + corner.x];
if (bit == 0)
discard;
if (bit != 4)
col = colors[bit];
}
else if (corner.x == 0) // left and right side: Outer
col = colors[1];
else if (corner.x == 1) // left and right side: Middle
col = colors[3];
else if (corner.x == 2) // left and right side: Inner ish
col = colors[2];
else if (corner.y == 0) // top and bottom side: Outer
col = colors[1];
else if (corner.y == 1) // top and bottom side: Middle
col = colors[3];
else if (corner.y == 2) // top and bottom side: Inner ish
col = colors[2];
fragColor = col;
}
}

View file

@ -1,19 +0,0 @@
{
"blend": {
"func": "add",
"srcrgb": "srcalpha",
"dstrgb": "1-srcalpha"
},
"vertex": "rendertype_gui",
"fragment": "rendertype_gui",
"attributes": [
"Color"
],
"samplers": [
],
"uniforms": [
{ "name": "ModelViewMat", "type": "matrix4x4", "count": 16, "values": [ 1.0, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 0.0, 1.0 ] },
{ "name": "ProjMat", "type": "matrix4x4", "count": 16, "values": [ 1.0, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 0.0, 1.0 ] },
{ "name": "ColorModulator", "type": "float", "count": 4, "values": [ 1.0, 1.0, 1.0, 1.0 ] }
]
}

View file

@ -1,61 +0,0 @@
#version 150
in vec3 Position;
in vec4 Color;
uniform mat4 ModelViewMat;
uniform mat4 ProjMat;
uniform vec2 ScreenSize;
out vec4 vertexColor;
out vec4 Coords;
out vec2 position;
flat out vec2 flatCorner;
out vec2 Pos1;
out vec2 Pos2;
bool isTooltip(mat4 ProjMat,vec3 Position) {
return ProjMat[2][3] == 0 && Position.z > 300 && Position.z < 500;
}
void main() {
vertexColor = Color;
gl_Position = ProjMat * ModelViewMat * vec4(Position, 1.0);
Coords = vec4(-1);
position = vec2(-1);
Pos1 = vec2(-1);
Pos2 = vec2(-1);
flatCorner = vec2(-1);
//Tooltip frame
if (Color.r != 0 && Color.g == 0 && Color.b != 0 && ProjMat[3][0] == -1)
{
int id = gl_VertexID / 4;
int vertID = (gl_VertexID) % 4;
const vec2[4] corners = vec2[4](vec2(0, 0), vec2(0, 1), vec2(1, 1), vec2(1, 0));
vec2 ScrSize = 2 / vec2(ProjMat[0][0], -ProjMat[1][1]);
vec3 Pos = Position - vec3(corners[((gl_VertexID) ) % 4] * 10 - (10 / 2.0), 0);
Pos1 = Pos2 = vec2(0);
if (vertID == 0) Pos1 = Pos.xy;
if (vertID == 2) Pos2 = Pos.xy;
Coords.xy = ScrSize;
Coords.zw = flatCorner = corners[vertID];
position = Pos.xy;
if (id != 2)
Pos.xy = vec2(0);
gl_Position = ProjMat * ModelViewMat * vec4(Pos, 1);
}
if (isTooltip(ProjMat, Position) && (gl_Position.x > 1 || gl_Position.x < -0.99)) {
vertexColor = vec4(0);
}
}

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.5 KiB

After

Width:  |  Height:  |  Size: 5.5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 8.8 KiB

After

Width:  |  Height:  |  Size: 8.8 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.9 KiB

After

Width:  |  Height:  |  Size: 6.9 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 7.6 KiB

After

Width:  |  Height:  |  Size: 7.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 8.1 KiB

After

Width:  |  Height:  |  Size: 8.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.8 KiB

After

Width:  |  Height:  |  Size: 6.8 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 324 B

After

Width:  |  Height:  |  Size: 4.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 79 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 5.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.5 KiB

After

Width:  |  Height:  |  Size: 6.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.9 KiB

After

Width:  |  Height:  |  Size: 6.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 930 B

After

Width:  |  Height:  |  Size: 5.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 973 B

After

Width:  |  Height:  |  Size: 5.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.2 KiB

After

Width:  |  Height:  |  Size: 5.5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 866 B

After

Width:  |  Height:  |  Size: 5.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.1 KiB

After

Width:  |  Height:  |  Size: 1.5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.3 KiB

After

Width:  |  Height:  |  Size: 1.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 14 KiB

After

Width:  |  Height:  |  Size: 19 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.5 KiB

After

Width:  |  Height:  |  Size: 5.8 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 276 B

After

Width:  |  Height:  |  Size: 4.5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 157 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 169 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 160 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 149 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.2 KiB

After

Width:  |  Height:  |  Size: 402 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1 KiB

After

Width:  |  Height:  |  Size: 407 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1 KiB

After

Width:  |  Height:  |  Size: 1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1 KiB

After

Width:  |  Height:  |  Size: 1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.2 KiB

After

Width:  |  Height:  |  Size: 400 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 406 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.3 KiB

After

Width:  |  Height:  |  Size: 366 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 972 B

After

Width:  |  Height:  |  Size: 373 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.2 KiB

After

Width:  |  Height:  |  Size: 366 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 958 B

After

Width:  |  Height:  |  Size: 374 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.2 KiB

After

Width:  |  Height:  |  Size: 1.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 995 B

After

Width:  |  Height:  |  Size: 996 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1 KiB

After

Width:  |  Height:  |  Size: 1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1 KiB

After

Width:  |  Height:  |  Size: 1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 205 B

After

Width:  |  Height:  |  Size: 210 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 287 B

After

Width:  |  Height:  |  Size: 200 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 518 B

After

Width:  |  Height:  |  Size: 278 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 301 B

After

Width:  |  Height:  |  Size: 213 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 190 B

After

Width:  |  Height:  |  Size: 202 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 496 B

After

Width:  |  Height:  |  Size: 279 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 361 B

After

Width:  |  Height:  |  Size: 213 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 197 B

After

Width:  |  Height:  |  Size: 202 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 613 B

After

Width:  |  Height:  |  Size: 295 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 198 B

After

Width:  |  Height:  |  Size: 208 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 262 B

After

Width:  |  Height:  |  Size: 200 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 526 B

After

Width:  |  Height:  |  Size: 274 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 219 B

After

Width:  |  Height:  |  Size: 222 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 322 B

After

Width:  |  Height:  |  Size: 219 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 621 B

After

Width:  |  Height:  |  Size: 328 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 207 B

After

Width:  |  Height:  |  Size: 213 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 295 B

After

Width:  |  Height:  |  Size: 200 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 587 B

After

Width:  |  Height:  |  Size: 285 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 324 B

After

Width:  |  Height:  |  Size: 211 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 196 B

After

Width:  |  Height:  |  Size: 202 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 550 B

After

Width:  |  Height:  |  Size: 285 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 326 B

After

Width:  |  Height:  |  Size: 207 B

Some files were not shown because too many files have changed in this diff Show more