Update to EaglercraftX 1.8 u48 (Desktop)

EaglercraftX_1.8_CREDITS.txt

@@ -239,6 +239,58 @@
  
  %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
  
+ Project Name: Alfheim
+ Project Author: Red Studio
+ Project URL: https://github.com/Red-Studio-Ragnarok/Alfheim
+ 
+ Used For: Optimized lighting engine
+ 
+ * MIT License
+ *
+ * Copyright (c) 2023 Red Studio
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ 
+ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+ 
+ Project Name: OptiFine (1.8.9_HD_U_M6)
+ Project Author: sp614x
+ Project URL: https://optifine.net/
+ 
+ Used For: A few, limited portions we "borrowed" without the author's permission
+ 
+ Note: Eaglercraft is not OptiFine, we only use the code for connected textures
+       and maintaining compatibility with certain resource pack features
+ 
+ * The mod OptiFine is Copyright © 2011-2021 by sp614x and the intellectual
+ * property of the author.
+ * It may be not be reproduced under any circumstances except for personal,
+ * private use as long as it remains in its unaltered, unedited form.
+ * It may not be placed on any web site or otherwise distributed publicly
+ * without advance written permission.
+ * Use of this mod on any other website or as a part of any public display
+ * is strictly prohibited and a violation of copyright.
+ 
+ (sorry sp614x)
+ 
+ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+ 
  Project Name: Google Guava
  Project Author: Google
  Project URL: https://github.com/google/guava
@@ -921,3 +973,7 @@
  * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  
  %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+ Make sure you also update the copy of this file in "sources/resources/assets/eagler/CREDITS.txt"
+ 
+ The content of both files should match, but not include this notice in the resources one

EaglercraftX_1.8_Desktop_Runtime/resources/EPKVersionIdentifier.txt

@@ -1 +1 @@
-u47
+u48

EaglercraftX_1.8_Desktop_Runtime/resources/assets/eagler/CREDITS.txt

@@ -239,6 +239,58 @@
  
  %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
  
+ Project Name: Alfheim
+ Project Author: Red Studio
+ Project URL: https://github.com/Red-Studio-Ragnarok/Alfheim
+ 
+ Used For: Optimized lighting engine
+ 
+ * MIT License
+ *
+ * Copyright (c) 2023 Red Studio
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ 
+ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+ 
+ Project Name: OptiFine (1.8.9_HD_U_M6)
+ Project Author: sp614x
+ Project URL: https://optifine.net/
+ 
+ Used For: A few, limited portions we "borrowed" without the author's permission
+ 
+ Note: Eaglercraft is not OptiFine, we only use the code for connected textures
+       and maintaining compatibility with certain resource pack features
+ 
+ * The mod OptiFine is Copyright © 2011-2021 by sp614x and the intellectual
+ * property of the author.
+ * It may be not be reproduced under any circumstances except for personal,
+ * private use as long as it remains in its unaltered, unedited form.
+ * It may not be placed on any web site or otherwise distributed publicly
+ * without advance written permission.
+ * Use of this mod on any other website or as a part of any public display
+ * is strictly prohibited and a violation of copyright.
+ 
+ (sorry sp614x)
+ 
+ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+ 
  Project Name: Google Guava
  Project Author: Google
  Project URL: https://github.com/google/guava

EaglercraftX_1.8_Desktop_Runtime/resources/assets/eagler/glsl/deferred/deferred_combine.fsh

@@ -141,8 +141,9 @@ void main() {
 			reflectDir.xz += vec2(0.5, reflectDir.y > 0.0 ? 0.25 : 0.75);
 			envMapSample4f = textureLod(u_environmentMap, reflectDir.xz, 0.0);
 		}
-		if(envMapSample4f.a > 0.0) {
+		envMapSample4f.a += min(lightmapCoords2f.g * 2.0, 1.0) * (1.0 - envMapSample4f.a);
-			specular = eaglercraftIBL_Specular(diffuseColor3f.rgb, envMapSample4f.rgb, viewDir3f, normalVector3f, materialData4f.rgb);
+		if(envMapSample4f.a == 1.0) {
+			specular = eaglercraftIBL_Specular(diffuseColor3f.rgb, envMapSample4f.rgb * envMapSample4f.a, viewDir3f, normalVector3f, materialData4f.rgb);
 			specular *= 1.0 - sqrt(posDst) * 0.2;
 		}
 		break;

EaglercraftX_1.8_Desktop_Runtime/resources/assets/eagler/glsl/deferred/forward_core.fsh

@@ -21,7 +21,7 @@ precision highp sampler2DShadow;
 in vec4 v_position4f;
 
 #ifdef COMPILE_FOG_LIGHT_SHAFTS
-in vec2 v_positionClip2f;
+in vec3 v_positionClip3f;
 #endif
 
 #ifdef COMPILE_TEXTURE_ATTRIB
@@ -351,7 +351,7 @@ void main() {
 	f += materialData3f.r < 0.5 ? 1.0 : 0.0;
 	while(f == 0.0) {
 		float dst2 = dot(worldPosition4f.xyz, worldPosition4f.xyz);
-		if(dst2 > 16.0) {
+		if(dst2 > 25.0) {
 			break;
 		}
 		vec3 reflectDir = reflect(worldDirection4f.xyz, normalVector3f);
@@ -369,8 +369,9 @@ void main() {
 			reflectDir.xz += vec2(0.5, reflectDir.y > 0.0 ? 0.25 : 0.75);
 			envMapSample4f = textureLod(u_environmentMap, reflectDir.xz, 0.0);
 		}
-		if(envMapSample4f.a > 0.0) {
+		envMapSample4f.a += min(lightmapCoords2f.g * 2.0, 1.0) * (1.0 - envMapSample4f.a);
-			lightColor3f += eaglercraftIBL_Specular(diffuseColor4f.rgb, envMapSample4f.rgb, worldDirection4f.xyz, normalVector3f, materialData3f, metalN, metalK) * (1.0 - sqrt(dst2) * 0.25);
+		if(envMapSample4f.a == 1.0) {
+			lightColor3f += eaglercraftIBL_Specular(diffuseColor4f.rgb, envMapSample4f.rgb * envMapSample4f.a, worldDirection4f.xyz, normalVector3f, materialData3f, metalN, metalK) * (1.0 - sqrt(dst2) * 0.2);
 		}
 		break;
 	}
@@ -453,7 +454,7 @@ void main() {
 		fogBlend4f.rgb *= textureLod(u_irradianceMap, atmosSamplePos.xz, 0.0).rgb;
 
 #ifdef COMPILE_FOG_LIGHT_SHAFTS
-		fogBlend4f.rgb *= pow(textureLod(u_lightShaftsTexture, v_positionClip2f * 0.5 + 0.5, 0.0).r * 0.9 + 0.1, 2.25);
+		fogBlend4f.rgb *= pow(textureLod(u_lightShaftsTexture, (v_positionClip3f.xy / v_positionClip3f.z) * 0.5 + 0.5, 0.0).r * 0.9 + 0.1, 2.25);
 		fogBlend4f.a = fogBlend4f.a * 0.85 + 0.2;
 #endif
 		break;

EaglercraftX_1.8_Desktop_Runtime/resources/assets/eagler/glsl/deferred/forward_core.vsh

@@ -21,7 +21,7 @@ in vec3 a_position3f;
 out vec4 v_position4f;
 
 #ifdef COMPILE_FOG_LIGHT_SHAFTS
-out vec2 v_positionClip2f;
+out vec3 v_positionClip3f;
 #endif
 
 #ifdef COMPILE_TEXTURE_ATTRIB
@@ -98,6 +98,6 @@ void main() {
 #endif
 
 #ifdef COMPILE_FOG_LIGHT_SHAFTS
-	v_positionClip2f = gl_Position.xy / gl_Position.w;
+	v_positionClip3f = gl_Position.xyw;
 #endif
 }

EaglercraftX_1.8_Desktop_Runtime/resources/assets/eagler/glsl/deferred/forward_glass_highlights.fsh

@@ -238,7 +238,7 @@ void main() {
 
 	for(;;) {
 		float dst2 = dot(worldPosition4f.xyz, worldPosition4f.xyz);
-		if(dst2 > 16.0) {
+		if(dst2 > 25.0) {
 			break;
 		}
 		vec3 reflectDir = reflect(worldDirection4f.xyz, normalVector3f);
@@ -256,8 +256,9 @@ void main() {
 			reflectDir.xz += vec2(0.5, reflectDir.y > 0.0 ? 0.25 : 0.75);
 			envMapSample4f = textureLod(u_environmentMap, reflectDir.xz, 0.0);
 		}
-		if(envMapSample4f.a > 0.0) {
+		envMapSample4f.a += min(lightmapCoords2f.g * 2.0, 1.0) * (1.0 - envMapSample4f.a);
-			lightColor3f += eaglercraftIBL_Specular_Glass(envMapSample4f.rgb, worldDirection4f.xyz, normalVector3f) * (1.0 - sqrt(dst2) * 0.25);
+		if(envMapSample4f.a == 1.0) {
+			lightColor3f += eaglercraftIBL_Specular_Glass(envMapSample4f.rgb * envMapSample4f.a, worldDirection4f.xyz, normalVector3f) * (1.0 - sqrt(dst2) * 0.2);
 		}
 		break;
 	}

EaglercraftX_1.8_Desktop_Runtime/resources/assets/eagler/glsl/deferred/realistic_water_render.fsh

@@ -19,7 +19,7 @@
 precision highp sampler2DShadow;
 
 in vec4 v_position4f;
-in vec2 v_positionClip2f;
+in vec3 v_positionClip3f;
 
 #ifdef COMPILE_TEXTURE_ATTRIB
 in vec2 v_texture2f;
@@ -434,7 +434,7 @@ void main() {
 		fogBlend4f.rgb *= textureLod(u_irradianceMap, atmosSamplePos.xz, 0.0).rgb + u_fogColorAddSun4f.rgb;
 
 #ifdef COMPILE_FOG_LIGHT_SHAFTS
-		fogBlend4f.rgb *= pow(textureLod(u_lightShaftsTexture, v_positionClip2f * 0.5 + 0.5, 0.0).r * 0.9 + 0.1, 2.25);
+		fogBlend4f.rgb *= pow(textureLod(u_lightShaftsTexture, (v_positionClip3f.xy / v_positionClip3f.z) * 0.5 + 0.5, 0.0).r * 0.9 + 0.1, 2.25);
 		fogBlend4f.a = fogBlend4f.a * 0.85 + 0.2;
 #endif
 		break;

EaglercraftX_1.8_Desktop_Runtime/resources/assets/eagler/glsl/deferred/realistic_water_render.vsh

@@ -21,7 +21,7 @@ in vec3 a_position3f;
 out vec4 v_position4f;
 
 #ifdef COMPILE_FOG_LIGHT_SHAFTS
-out vec2 v_positionClip2f;
+out vec3 v_positionClip3f;
 #endif
 
 #ifdef COMPILE_TEXTURE_ATTRIB
@@ -77,6 +77,6 @@ void main() {
 	gl_Position = u_projectionMat4f * v_position4f;
 
 #ifdef COMPILE_FOG_LIGHT_SHAFTS
-	v_positionClip2f = gl_Position.xy / gl_Position.w;
+	v_positionClip3f = gl_Position.xyw;
 #endif
 }

EaglercraftX_1.8_Desktop_Runtime/resources/assets/eagler/glsl/deferred/shader_pack_info.json

@@ -1,7 +1,7 @@
 {
 	"name": "§eHigh Performance PBR",
 	"desc": "Pack made from scratch specifically for this client, designed to give what I call the best balance between quality and performance possible in a browser but obviously that's just my opinion",
-	"vers": "1.3.0",
+	"vers": "1.3.1",
 	"author": "lax1dude",
 	"api_vers": 1,
 	"features": [

EaglercraftX_1.8_Desktop_Runtime/resources/assets/eagler/glsl/texture_mix.fsh

@@ -1,7 +1,7 @@
 #line 2
 
 /*
- * Copyright (c) 2022-2024 lax1dude. All Rights Reserved.
+ * Copyright (c) 2022-2025 lax1dude. All Rights Reserved.
  * 
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
@@ -16,7 +16,7 @@
  * 
  */
 
-EAGLER_IN(vec2, v_position2f)
+EAGLER_IN(vec2, v_texCoords2f)
 
 EAGLER_FRAG_OUT()
 
@@ -24,10 +24,8 @@ uniform sampler2D u_inputTexture;
 uniform float u_textureLod1f;
 uniform vec4 u_blendFactor4f;
 uniform vec4 u_blendBias4f;
-uniform mat3 u_matrixTransform;
 
 void main() {
-	vec3 coords = u_matrixTransform * vec3(v_position2f, 1.0);
+	vec4 color4f = EAGLER_TEXTURE_2D_LOD(u_inputTexture, v_texCoords2f, u_textureLod1f);
-	vec4 color4f = EAGLER_TEXTURE_2D_LOD(u_inputTexture, coords.xy, u_textureLod1f);
 	EAGLER_FRAG_COLOR = color4f * u_blendFactor4f + u_blendBias4f;
 }

EaglercraftX_1.8_Desktop_Runtime/resources/assets/minecraft/blockstates/black_stained_glass_pane.json

@@ -3,18 +3,18 @@
         "east=false,north=false,south=false,west=false": { "model": "black_pane_nsew" },
         "east=false,north=true,south=false,west=false": { "model": "black_pane_n" },
         "east=true,north=false,south=false,west=false": { "model": "black_pane_n", "y": 90 },
-        "east=false,north=false,south=true,west=false": { "model": "black_pane_s" },
+        "east=false,north=false,south=true,west=false": { "model": "black_pane_n", "y": 180 },
-        "east=false,north=false,south=false,west=true": { "model": "black_pane_s", "y": 90 },
+        "east=false,north=false,south=false,west=true": { "model": "black_pane_n", "y": 270 },
         "east=true,north=true,south=false,west=false": { "model": "black_pane_ne" },
-        "east=true,north=false,south=true,west=false": { "model": "black_pane_se" },
+        "east=true,north=false,south=true,west=false": { "model": "black_pane_ne", "y": 90 },
-        "east=false,north=false,south=true,west=true": { "model": "black_pane_sw" },
+        "east=false,north=false,south=true,west=true": { "model": "black_pane_ne", "y": 180 },
-        "east=false,north=true,south=false,west=true": { "model": "black_pane_nw" },
+        "east=false,north=true,south=false,west=true": { "model": "black_pane_ne", "y": 270 },
         "east=false,north=true,south=true,west=false": { "model": "black_pane_ns" },
         "east=true,north=false,south=false,west=true": { "model": "black_pane_ns", "y": 90 },
         "east=true,north=true,south=true,west=false": { "model": "black_pane_nse" },
-        "east=true,north=false,south=true,west=true": { "model": "black_pane_sew" },
+        "east=true,north=false,south=true,west=true": { "model": "black_pane_nse", "y": 90 },
-        "east=false,north=true,south=true,west=true": { "model": "black_pane_nsw" },
+        "east=false,north=true,south=true,west=true": { "model": "black_pane_nse", "y": 180 },
-        "east=true,north=true,south=false,west=true": { "model": "black_pane_new" },
+        "east=true,north=true,south=false,west=true": { "model": "black_pane_nse", "y": 270 },
         "east=true,north=true,south=true,west=true": { "model": "black_pane_nsew" }
     }
 }

EaglercraftX_1.8_Desktop_Runtime/resources/assets/minecraft/blockstates/blue_stained_glass_pane.json

@@ -3,18 +3,18 @@
         "east=false,north=false,south=false,west=false": { "model": "blue_pane_nsew" },
         "east=false,north=true,south=false,west=false": { "model": "blue_pane_n" },
         "east=true,north=false,south=false,west=false": { "model": "blue_pane_n", "y": 90 },
-        "east=false,north=false,south=true,west=false": { "model": "blue_pane_s" },
+        "east=false,north=false,south=true,west=false": { "model": "blue_pane_n", "y": 180 },
-        "east=false,north=false,south=false,west=true": { "model": "blue_pane_s", "y": 90 },
+        "east=false,north=false,south=false,west=true": { "model": "blue_pane_n", "y": 270 },
         "east=true,north=true,south=false,west=false": { "model": "blue_pane_ne" },
-        "east=true,north=false,south=true,west=false": { "model": "blue_pane_se" },
+        "east=true,north=false,south=true,west=false": { "model": "blue_pane_ne", "y": 90 },
-        "east=false,north=false,south=true,west=true": { "model": "blue_pane_sw" },
+        "east=false,north=false,south=true,west=true": { "model": "blue_pane_ne", "y": 180 },
-        "east=false,north=true,south=false,west=true": { "model": "blue_pane_nw" },
+        "east=false,north=true,south=false,west=true": { "model": "blue_pane_ne", "y": 270 },
         "east=false,north=true,south=true,west=false": { "model": "blue_pane_ns" },
         "east=true,north=false,south=false,west=true": { "model": "blue_pane_ns", "y": 90 },
         "east=true,north=true,south=true,west=false": { "model": "blue_pane_nse" },
-        "east=true,north=false,south=true,west=true": { "model": "blue_pane_sew" },
+        "east=true,north=false,south=true,west=true": { "model": "blue_pane_nse", "y": 90 },
-        "east=false,north=true,south=true,west=true": { "model": "blue_pane_nsw" },
+        "east=false,north=true,south=true,west=true": { "model": "blue_pane_nse", "y": 180 },
-        "east=true,north=true,south=false,west=true": { "model": "blue_pane_new" },
+        "east=true,north=true,south=false,west=true": { "model": "blue_pane_nse", "y": 270 },
         "east=true,north=true,south=true,west=true": { "model": "blue_pane_nsew" }
     }
 }

EaglercraftX_1.8_Desktop_Runtime/resources/assets/minecraft/blockstates/brown_stained_glass_pane.json

@@ -3,18 +3,18 @@
         "east=false,north=false,south=false,west=false": { "model": "brown_pane_nsew" },
         "east=false,north=true,south=false,west=false": { "model": "brown_pane_n" },
         "east=true,north=false,south=false,west=false": { "model": "brown_pane_n", "y": 90 },
-        "east=false,north=false,south=true,west=false": { "model": "brown_pane_s" },
+        "east=false,north=false,south=true,west=false": { "model": "brown_pane_n", "y": 180 },
-        "east=false,north=false,south=false,west=true": { "model": "brown_pane_s", "y": 90 },
+        "east=false,north=false,south=false,west=true": { "model": "brown_pane_n", "y": 270 },
         "east=true,north=true,south=false,west=false": { "model": "brown_pane_ne" },
-        "east=true,north=false,south=true,west=false": { "model": "brown_pane_se" },
+        "east=true,north=false,south=true,west=false": { "model": "brown_pane_ne", "y": 90 },
-        "east=false,north=false,south=true,west=true": { "model": "brown_pane_sw" },
+        "east=false,north=false,south=true,west=true": { "model": "brown_pane_ne", "y": 180 },
-        "east=false,north=true,south=false,west=true": { "model": "brown_pane_nw" },
+        "east=false,north=true,south=false,west=true": { "model": "brown_pane_ne", "y": 270 },
         "east=false,north=true,south=true,west=false": { "model": "brown_pane_ns" },
         "east=true,north=false,south=false,west=true": { "model": "brown_pane_ns", "y": 90 },
         "east=true,north=true,south=true,west=false": { "model": "brown_pane_nse" },
-        "east=true,north=false,south=true,west=true": { "model": "brown_pane_sew" },
+        "east=true,north=false,south=true,west=true": { "model": "brown_pane_nse", "y": 90 },
-        "east=false,north=true,south=true,west=true": { "model": "brown_pane_nsw" },
+        "east=false,north=true,south=true,west=true": { "model": "brown_pane_nse", "y": 180 },
-        "east=true,north=true,south=false,west=true": { "model": "brown_pane_new" },
+        "east=true,north=true,south=false,west=true": { "model": "brown_pane_nse", "y": 270 },
         "east=true,north=true,south=true,west=true": { "model": "brown_pane_nsew" }
     }
 }

EaglercraftX_1.8_Desktop_Runtime/resources/assets/minecraft/blockstates/cyan_stained_glass_pane.json

@@ -3,18 +3,18 @@
         "east=false,north=false,south=false,west=false": { "model": "cyan_pane_nsew" },
         "east=false,north=true,south=false,west=false": { "model": "cyan_pane_n" },
         "east=true,north=false,south=false,west=false": { "model": "cyan_pane_n", "y": 90 },
-        "east=false,north=false,south=true,west=false": { "model": "cyan_pane_s" },
+        "east=false,north=false,south=true,west=false": { "model": "cyan_pane_n", "y": 180 },
-        "east=false,north=false,south=false,west=true": { "model": "cyan_pane_s", "y": 90 },
+        "east=false,north=false,south=false,west=true": { "model": "cyan_pane_n", "y": 270 },
         "east=true,north=true,south=false,west=false": { "model": "cyan_pane_ne" },
-        "east=true,north=false,south=true,west=false": { "model": "cyan_pane_se" },
+        "east=true,north=false,south=true,west=false": { "model": "cyan_pane_ne", "y": 90 },
-        "east=false,north=false,south=true,west=true": { "model": "cyan_pane_sw" },
+        "east=false,north=false,south=true,west=true": { "model": "cyan_pane_ne", "y": 180 },
-        "east=false,north=true,south=false,west=true": { "model": "cyan_pane_nw" },
+        "east=false,north=true,south=false,west=true": { "model": "cyan_pane_ne", "y": 270 },
         "east=false,north=true,south=true,west=false": { "model": "cyan_pane_ns" },
         "east=true,north=false,south=false,west=true": { "model": "cyan_pane_ns", "y": 90 },
         "east=true,north=true,south=true,west=false": { "model": "cyan_pane_nse" },
-        "east=true,north=false,south=true,west=true": { "model": "cyan_pane_sew" },
+        "east=true,north=false,south=true,west=true": { "model": "cyan_pane_nse", "y": 90 },
-        "east=false,north=true,south=true,west=true": { "model": "cyan_pane_nsw" },
+        "east=false,north=true,south=true,west=true": { "model": "cyan_pane_nse", "y": 180 },
-        "east=true,north=true,south=false,west=true": { "model": "cyan_pane_new" },
+        "east=true,north=true,south=false,west=true": { "model": "cyan_pane_nse", "y": 270 },
         "east=true,north=true,south=true,west=true": { "model": "cyan_pane_nsew" }
     }
 }

EaglercraftX_1.8_Desktop_Runtime/resources/assets/minecraft/blockstates/gray_stained_glass_pane.json

@@ -3,18 +3,18 @@
         "east=false,north=false,south=false,west=false": { "model": "gray_pane_nsew" },
         "east=false,north=true,south=false,west=false": { "model": "gray_pane_n" },
         "east=true,north=false,south=false,west=false": { "model": "gray_pane_n", "y": 90 },
-        "east=false,north=false,south=true,west=false": { "model": "gray_pane_s" },
+        "east=false,north=false,south=true,west=false": { "model": "gray_pane_n", "y": 180 },
-        "east=false,north=false,south=false,west=true": { "model": "gray_pane_s", "y": 90 },
+        "east=false,north=false,south=false,west=true": { "model": "gray_pane_n", "y": 270 },
         "east=true,north=true,south=false,west=false": { "model": "gray_pane_ne" },
-        "east=true,north=false,south=true,west=false": { "model": "gray_pane_se" },
+        "east=true,north=false,south=true,west=false": { "model": "gray_pane_ne", "y": 90 },
-        "east=false,north=false,south=true,west=true": { "model": "gray_pane_sw" },
+        "east=false,north=false,south=true,west=true": { "model": "gray_pane_ne", "y": 180 },
-        "east=false,north=true,south=false,west=true": { "model": "gray_pane_nw" },
+        "east=false,north=true,south=false,west=true": { "model": "gray_pane_ne", "y": 270 },
         "east=false,north=true,south=true,west=false": { "model": "gray_pane_ns" },
         "east=true,north=false,south=false,west=true": { "model": "gray_pane_ns", "y": 90 },
         "east=true,north=true,south=true,west=false": { "model": "gray_pane_nse" },
-        "east=true,north=false,south=true,west=true": { "model": "gray_pane_sew" },
+        "east=true,north=false,south=true,west=true": { "model": "gray_pane_nse", "y": 90 },
-        "east=false,north=true,south=true,west=true": { "model": "gray_pane_nsw" },
+        "east=false,north=true,south=true,west=true": { "model": "gray_pane_nse", "y": 180 },
-        "east=true,north=true,south=false,west=true": { "model": "gray_pane_new" },
+        "east=true,north=true,south=false,west=true": { "model": "gray_pane_nse", "y": 270 },
         "east=true,north=true,south=true,west=true": { "model": "gray_pane_nsew" }
     }
 }

EaglercraftX_1.8_Desktop_Runtime/resources/assets/minecraft/blockstates/green_stained_glass_pane.json

@@ -3,18 +3,18 @@
         "east=false,north=false,south=false,west=false": { "model": "green_pane_nsew" },
         "east=false,north=true,south=false,west=false": { "model": "green_pane_n" },
         "east=true,north=false,south=false,west=false": { "model": "green_pane_n", "y": 90 },
-        "east=false,north=false,south=true,west=false": { "model": "green_pane_s" },
+        "east=false,north=false,south=true,west=false": { "model": "green_pane_n", "y": 180 },
-        "east=false,north=false,south=false,west=true": { "model": "green_pane_s", "y": 90 },
+        "east=false,north=false,south=false,west=true": { "model": "green_pane_n", "y": 270 },
         "east=true,north=true,south=false,west=false": { "model": "green_pane_ne" },
-        "east=true,north=false,south=true,west=false": { "model": "green_pane_se" },
+        "east=true,north=false,south=true,west=false": { "model": "green_pane_ne", "y": 90 },
-        "east=false,north=false,south=true,west=true": { "model": "green_pane_sw" },
+        "east=false,north=false,south=true,west=true": { "model": "green_pane_ne", "y": 180 },
-        "east=false,north=true,south=false,west=true": { "model": "green_pane_nw" },
+        "east=false,north=true,south=false,west=true": { "model": "green_pane_ne", "y": 270 },
         "east=false,north=true,south=true,west=false": { "model": "green_pane_ns" },
         "east=true,north=false,south=false,west=true": { "model": "green_pane_ns", "y": 90 },
         "east=true,north=true,south=true,west=false": { "model": "green_pane_nse" },
-        "east=true,north=false,south=true,west=true": { "model": "green_pane_sew" },
+        "east=true,north=false,south=true,west=true": { "model": "green_pane_nse", "y": 90 },
-        "east=false,north=true,south=true,west=true": { "model": "green_pane_nsw" },
+        "east=false,north=true,south=true,west=true": { "model": "green_pane_nse", "y": 180 },
-        "east=true,north=true,south=false,west=true": { "model": "green_pane_new" },
+        "east=true,north=true,south=false,west=true": { "model": "green_pane_nse", "y": 270 },
         "east=true,north=true,south=true,west=true": { "model": "green_pane_nsew" }
     }
 }

EaglercraftX_1.8_Desktop_Runtime/resources/assets/minecraft/blockstates/light_blue_stained_glass_pane.json

@@ -3,18 +3,18 @@
         "east=false,north=false,south=false,west=false": { "model": "light_blue_pane_nsew" },
         "east=false,north=true,south=false,west=false": { "model": "light_blue_pane_n" },
         "east=true,north=false,south=false,west=false": { "model": "light_blue_pane_n", "y": 90 },
-        "east=false,north=false,south=true,west=false": { "model": "light_blue_pane_s" },
+        "east=false,north=false,south=true,west=false": { "model": "light_blue_pane_n", "y": 180 },
-        "east=false,north=false,south=false,west=true": { "model": "light_blue_pane_s", "y": 90 },
+        "east=false,north=false,south=false,west=true": { "model": "light_blue_pane_n", "y": 270 },
         "east=true,north=true,south=false,west=false": { "model": "light_blue_pane_ne" },
-        "east=true,north=false,south=true,west=false": { "model": "light_blue_pane_se" },
+        "east=true,north=false,south=true,west=false": { "model": "light_blue_pane_ne", "y": 90 },
-        "east=false,north=false,south=true,west=true": { "model": "light_blue_pane_sw" },
+        "east=false,north=false,south=true,west=true": { "model": "light_blue_pane_ne", "y": 180 },
-        "east=false,north=true,south=false,west=true": { "model": "light_blue_pane_nw" },
+        "east=false,north=true,south=false,west=true": { "model": "light_blue_pane_ne", "y": 270 },
         "east=false,north=true,south=true,west=false": { "model": "light_blue_pane_ns" },
         "east=true,north=false,south=false,west=true": { "model": "light_blue_pane_ns", "y": 90 },
         "east=true,north=true,south=true,west=false": { "model": "light_blue_pane_nse" },
-        "east=true,north=false,south=true,west=true": { "model": "light_blue_pane_sew" },
+        "east=true,north=false,south=true,west=true": { "model": "light_blue_pane_nse", "y": 90 },
-        "east=false,north=true,south=true,west=true": { "model": "light_blue_pane_nsw" },
+        "east=false,north=true,south=true,west=true": { "model": "light_blue_pane_nse", "y": 180 },
-        "east=true,north=true,south=false,west=true": { "model": "light_blue_pane_new" },
+        "east=true,north=true,south=false,west=true": { "model": "light_blue_pane_nse", "y": 270 },
         "east=true,north=true,south=true,west=true": { "model": "light_blue_pane_nsew" }
     }
 }

EaglercraftX_1.8_Desktop_Runtime/resources/assets/minecraft/blockstates/lime_stained_glass_pane.json

@@ -3,18 +3,18 @@
         "east=false,north=false,south=false,west=false": { "model": "lime_pane_nsew" },
         "east=false,north=true,south=false,west=false": { "model": "lime_pane_n" },
         "east=true,north=false,south=false,west=false": { "model": "lime_pane_n", "y": 90 },
-        "east=false,north=false,south=true,west=false": { "model": "lime_pane_s" },
+        "east=false,north=false,south=true,west=false": { "model": "lime_pane_n", "y": 180 },
-        "east=false,north=false,south=false,west=true": { "model": "lime_pane_s", "y": 90 },
+        "east=false,north=false,south=false,west=true": { "model": "lime_pane_n", "y": 270 },
         "east=true,north=true,south=false,west=false": { "model": "lime_pane_ne" },
-        "east=true,north=false,south=true,west=false": { "model": "lime_pane_se" },
+        "east=true,north=false,south=true,west=false": { "model": "lime_pane_ne", "y": 90 },
-        "east=false,north=false,south=true,west=true": { "model": "lime_pane_sw" },
+        "east=false,north=false,south=true,west=true": { "model": "lime_pane_ne", "y": 180 },
-        "east=false,north=true,south=false,west=true": { "model": "lime_pane_nw" },
+        "east=false,north=true,south=false,west=true": { "model": "lime_pane_ne", "y": 270 },
         "east=false,north=true,south=true,west=false": { "model": "lime_pane_ns" },
         "east=true,north=false,south=false,west=true": { "model": "lime_pane_ns", "y": 90 },
         "east=true,north=true,south=true,west=false": { "model": "lime_pane_nse" },
-        "east=true,north=false,south=true,west=true": { "model": "lime_pane_sew" },
+        "east=true,north=false,south=true,west=true": { "model": "lime_pane_nse", "y": 90 },
-        "east=false,north=true,south=true,west=true": { "model": "lime_pane_nsw" },
+        "east=false,north=true,south=true,west=true": { "model": "lime_pane_nse", "y": 180 },
-        "east=true,north=true,south=false,west=true": { "model": "lime_pane_new" },
+        "east=true,north=true,south=false,west=true": { "model": "lime_pane_nse", "y": 270 },
         "east=true,north=true,south=true,west=true": { "model": "lime_pane_nsew" }
     }
 }

EaglercraftX_1.8_Desktop_Runtime/resources/assets/minecraft/blockstates/magenta_stained_glass_pane.json

@@ -3,18 +3,18 @@
         "east=false,north=false,south=false,west=false": { "model": "magenta_pane_nsew" },
         "east=false,north=true,south=false,west=false": { "model": "magenta_pane_n" },
         "east=true,north=false,south=false,west=false": { "model": "magenta_pane_n", "y": 90 },
-        "east=false,north=false,south=true,west=false": { "model": "magenta_pane_s" },
+        "east=false,north=false,south=true,west=false": { "model": "magenta_pane_n", "y": 180 },
-        "east=false,north=false,south=false,west=true": { "model": "magenta_pane_s", "y": 90 },
+        "east=false,north=false,south=false,west=true": { "model": "magenta_pane_n", "y": 270 },
         "east=true,north=true,south=false,west=false": { "model": "magenta_pane_ne" },
-        "east=true,north=false,south=true,west=false": { "model": "magenta_pane_se" },
+        "east=true,north=false,south=true,west=false": { "model": "magenta_pane_ne", "y": 90 },
-        "east=false,north=false,south=true,west=true": { "model": "magenta_pane_sw" },
+        "east=false,north=false,south=true,west=true": { "model": "magenta_pane_ne", "y": 180 },
-        "east=false,north=true,south=false,west=true": { "model": "magenta_pane_nw" },
+        "east=false,north=true,south=false,west=true": { "model": "magenta_pane_ne", "y": 270 },
         "east=false,north=true,south=true,west=false": { "model": "magenta_pane_ns" },
         "east=true,north=false,south=false,west=true": { "model": "magenta_pane_ns", "y": 90 },
         "east=true,north=true,south=true,west=false": { "model": "magenta_pane_nse" },
-        "east=true,north=false,south=true,west=true": { "model": "magenta_pane_sew" },
+        "east=true,north=false,south=true,west=true": { "model": "magenta_pane_nse", "y": 90 },
-        "east=false,north=true,south=true,west=true": { "model": "magenta_pane_nsw" },
+        "east=false,north=true,south=true,west=true": { "model": "magenta_pane_nse", "y": 180 },
-        "east=true,north=true,south=false,west=true": { "model": "magenta_pane_new" },
+        "east=true,north=true,south=false,west=true": { "model": "magenta_pane_nse", "y": 270 },
         "east=true,north=true,south=true,west=true": { "model": "magenta_pane_nsew" }
     }
 }

EaglercraftX_1.8_Desktop_Runtime/resources/assets/minecraft/blockstates/orange_stained_glass_pane.json

@@ -3,18 +3,18 @@
         "east=false,north=false,south=false,west=false": { "model": "orange_pane_nsew" },
         "east=false,north=true,south=false,west=false": { "model": "orange_pane_n" },
         "east=true,north=false,south=false,west=false": { "model": "orange_pane_n", "y": 90 },
-        "east=false,north=false,south=true,west=false": { "model": "orange_pane_s" },
+        "east=false,north=false,south=true,west=false": { "model": "orange_pane_n", "y": 180 },
-        "east=false,north=false,south=false,west=true": { "model": "orange_pane_s", "y": 90 },
+        "east=false,north=false,south=false,west=true": { "model": "orange_pane_n", "y": 270 },
         "east=true,north=true,south=false,west=false": { "model": "orange_pane_ne" },
-        "east=true,north=false,south=true,west=false": { "model": "orange_pane_se" },
+        "east=true,north=false,south=true,west=false": { "model": "orange_pane_ne", "y": 90 },
-        "east=false,north=false,south=true,west=true": { "model": "orange_pane_sw" },
+        "east=false,north=false,south=true,west=true": { "model": "orange_pane_ne", "y": 180 },
-        "east=false,north=true,south=false,west=true": { "model": "orange_pane_nw" },
+        "east=false,north=true,south=false,west=true": { "model": "orange_pane_ne", "y": 270 },
         "east=false,north=true,south=true,west=false": { "model": "orange_pane_ns" },
         "east=true,north=false,south=false,west=true": { "model": "orange_pane_ns", "y": 90 },
         "east=true,north=true,south=true,west=false": { "model": "orange_pane_nse" },
-        "east=true,north=false,south=true,west=true": { "model": "orange_pane_sew" },
+        "east=true,north=false,south=true,west=true": { "model": "orange_pane_nse", "y": 90 },
-        "east=false,north=true,south=true,west=true": { "model": "orange_pane_nsw" },
+        "east=false,north=true,south=true,west=true": { "model": "orange_pane_nse", "y": 180 },
-        "east=true,north=true,south=false,west=true": { "model": "orange_pane_new" },
+        "east=true,north=true,south=false,west=true": { "model": "orange_pane_nse", "y": 270 },
         "east=true,north=true,south=true,west=true": { "model": "orange_pane_nsew" }
     }
 }

EaglercraftX_1.8_Desktop_Runtime/resources/assets/minecraft/blockstates/pink_stained_glass_pane.json

@@ -3,18 +3,18 @@
         "east=false,north=false,south=false,west=false": { "model": "pink_pane_nsew" },
         "east=false,north=true,south=false,west=false": { "model": "pink_pane_n" },
         "east=true,north=false,south=false,west=false": { "model": "pink_pane_n", "y": 90 },
-        "east=false,north=false,south=true,west=false": { "model": "pink_pane_s" },
+        "east=false,north=false,south=true,west=false": { "model": "pink_pane_n", "y": 180 },
-        "east=false,north=false,south=false,west=true": { "model": "pink_pane_s", "y": 90 },
+        "east=false,north=false,south=false,west=true": { "model": "pink_pane_n", "y": 270 },
         "east=true,north=true,south=false,west=false": { "model": "pink_pane_ne" },
-        "east=true,north=false,south=true,west=false": { "model": "pink_pane_se" },
+        "east=true,north=false,south=true,west=false": { "model": "pink_pane_ne", "y": 90 },
-        "east=false,north=false,south=true,west=true": { "model": "pink_pane_sw" },
+        "east=false,north=false,south=true,west=true": { "model": "pink_pane_ne", "y": 180 },
-        "east=false,north=true,south=false,west=true": { "model": "pink_pane_nw" },
+        "east=false,north=true,south=false,west=true": { "model": "pink_pane_ne", "y": 270 },
         "east=false,north=true,south=true,west=false": { "model": "pink_pane_ns" },
         "east=true,north=false,south=false,west=true": { "model": "pink_pane_ns", "y": 90 },
         "east=true,north=true,south=true,west=false": { "model": "pink_pane_nse" },
-        "east=true,north=false,south=true,west=true": { "model": "pink_pane_sew" },
+        "east=true,north=false,south=true,west=true": { "model": "pink_pane_nse", "y": 90 },
-        "east=false,north=true,south=true,west=true": { "model": "pink_pane_nsw" },
+        "east=false,north=true,south=true,west=true": { "model": "pink_pane_nse", "y": 180 },
-        "east=true,north=true,south=false,west=true": { "model": "pink_pane_new" },
+        "east=true,north=true,south=false,west=true": { "model": "pink_pane_nse", "y": 270 },
         "east=true,north=true,south=true,west=true": { "model": "pink_pane_nsew" }
     }
 }

EaglercraftX_1.8_Desktop_Runtime/resources/assets/minecraft/blockstates/purple_stained_glass_pane.json

@@ -3,18 +3,18 @@
         "east=false,north=false,south=false,west=false": { "model": "purple_pane_nsew" },
         "east=false,north=true,south=false,west=false": { "model": "purple_pane_n" },
         "east=true,north=false,south=false,west=false": { "model": "purple_pane_n", "y": 90 },
-        "east=false,north=false,south=true,west=false": { "model": "purple_pane_s" },
+        "east=false,north=false,south=true,west=false": { "model": "purple_pane_n", "y": 180 },
-        "east=false,north=false,south=false,west=true": { "model": "purple_pane_s", "y": 90 },
+        "east=false,north=false,south=false,west=true": { "model": "purple_pane_n", "y": 270 },
         "east=true,north=true,south=false,west=false": { "model": "purple_pane_ne" },
-        "east=true,north=false,south=true,west=false": { "model": "purple_pane_se" },
+        "east=true,north=false,south=true,west=false": { "model": "purple_pane_ne", "y": 90 },
-        "east=false,north=false,south=true,west=true": { "model": "purple_pane_sw" },
+        "east=false,north=false,south=true,west=true": { "model": "purple_pane_ne", "y": 180 },
-        "east=false,north=true,south=false,west=true": { "model": "purple_pane_nw" },
+        "east=false,north=true,south=false,west=true": { "model": "purple_pane_ne", "y": 270 },
         "east=false,north=true,south=true,west=false": { "model": "purple_pane_ns" },
         "east=true,north=false,south=false,west=true": { "model": "purple_pane_ns", "y": 90 },
         "east=true,north=true,south=true,west=false": { "model": "purple_pane_nse" },
-        "east=true,north=false,south=true,west=true": { "model": "purple_pane_sew" },
+        "east=true,north=false,south=true,west=true": { "model": "purple_pane_nse", "y": 90 },
-        "east=false,north=true,south=true,west=true": { "model": "purple_pane_nsw" },
+        "east=false,north=true,south=true,west=true": { "model": "purple_pane_nse", "y": 180 },
-        "east=true,north=true,south=false,west=true": { "model": "purple_pane_new" },
+        "east=true,north=true,south=false,west=true": { "model": "purple_pane_nse", "y": 270 },
         "east=true,north=true,south=true,west=true": { "model": "purple_pane_nsew" }
     }
 }

EaglercraftX_1.8_Desktop_Runtime/resources/assets/minecraft/blockstates/red_stained_glass_pane.json

@@ -3,18 +3,18 @@
         "east=false,north=false,south=false,west=false": { "model": "red_pane_nsew" },
         "east=false,north=true,south=false,west=false": { "model": "red_pane_n" },
         "east=true,north=false,south=false,west=false": { "model": "red_pane_n", "y": 90 },
-        "east=false,north=false,south=true,west=false": { "model": "red_pane_s" },
+        "east=false,north=false,south=true,west=false": { "model": "red_pane_n", "y": 180 },
-        "east=false,north=false,south=false,west=true": { "model": "red_pane_s", "y": 90 },
+        "east=false,north=false,south=false,west=true": { "model": "red_pane_n", "y": 270 },
         "east=true,north=true,south=false,west=false": { "model": "red_pane_ne" },
-        "east=true,north=false,south=true,west=false": { "model": "red_pane_se" },
+        "east=true,north=false,south=true,west=false": { "model": "red_pane_ne", "y": 90 },
-        "east=false,north=false,south=true,west=true": { "model": "red_pane_sw" },
+        "east=false,north=false,south=true,west=true": { "model": "red_pane_ne", "y": 180 },
-        "east=false,north=true,south=false,west=true": { "model": "red_pane_nw" },
+        "east=false,north=true,south=false,west=true": { "model": "red_pane_ne", "y": 270 },
         "east=false,north=true,south=true,west=false": { "model": "red_pane_ns" },
         "east=true,north=false,south=false,west=true": { "model": "red_pane_ns", "y": 90 },
         "east=true,north=true,south=true,west=false": { "model": "red_pane_nse" },
-        "east=true,north=false,south=true,west=true": { "model": "red_pane_sew" },
+        "east=true,north=false,south=true,west=true": { "model": "red_pane_nse", "y": 90 },
-        "east=false,north=true,south=true,west=true": { "model": "red_pane_nsw" },
+        "east=false,north=true,south=true,west=true": { "model": "red_pane_nse", "y": 180 },
-        "east=true,north=true,south=false,west=true": { "model": "red_pane_new" },
+        "east=true,north=true,south=false,west=true": { "model": "red_pane_nse", "y": 270 },
         "east=true,north=true,south=true,west=true": { "model": "red_pane_nsew" }
     }
 }

EaglercraftX_1.8_Desktop_Runtime/resources/assets/minecraft/blockstates/silver_stained_glass_pane.json

@@ -3,18 +3,18 @@
         "east=false,north=false,south=false,west=false": { "model": "silver_pane_nsew" },
         "east=false,north=true,south=false,west=false": { "model": "silver_pane_n" },
         "east=true,north=false,south=false,west=false": { "model": "silver_pane_n", "y": 90 },
-        "east=false,north=false,south=true,west=false": { "model": "silver_pane_s" },
+        "east=false,north=false,south=true,west=false": { "model": "silver_pane_n", "y": 180 },
-        "east=false,north=false,south=false,west=true": { "model": "silver_pane_s", "y": 90 },
+        "east=false,north=false,south=false,west=true": { "model": "silver_pane_n", "y": 270 },
         "east=true,north=true,south=false,west=false": { "model": "silver_pane_ne" },
-        "east=true,north=false,south=true,west=false": { "model": "silver_pane_se" },
+        "east=true,north=false,south=true,west=false": { "model": "silver_pane_ne", "y": 90 },
-        "east=false,north=false,south=true,west=true": { "model": "silver_pane_sw" },
+        "east=false,north=false,south=true,west=true": { "model": "silver_pane_ne", "y": 180 },
-        "east=false,north=true,south=false,west=true": { "model": "silver_pane_nw" },
+        "east=false,north=true,south=false,west=true": { "model": "silver_pane_ne", "y": 270 },
         "east=false,north=true,south=true,west=false": { "model": "silver_pane_ns" },
         "east=true,north=false,south=false,west=true": { "model": "silver_pane_ns", "y": 90 },
         "east=true,north=true,south=true,west=false": { "model": "silver_pane_nse" },
-        "east=true,north=false,south=true,west=true": { "model": "silver_pane_sew" },
+        "east=true,north=false,south=true,west=true": { "model": "silver_pane_nse", "y": 90 },
-        "east=false,north=true,south=true,west=true": { "model": "silver_pane_nsw" },
+        "east=false,north=true,south=true,west=true": { "model": "silver_pane_nse", "y": 180 },
-        "east=true,north=true,south=false,west=true": { "model": "silver_pane_new" },
+        "east=true,north=true,south=false,west=true": { "model": "silver_pane_nse", "y": 270 },
         "east=true,north=true,south=true,west=true": { "model": "silver_pane_nsew" }
     }
 }

EaglercraftX_1.8_Desktop_Runtime/resources/assets/minecraft/blockstates/white_stained_glass_pane.json

@@ -3,18 +3,18 @@
         "east=false,north=false,south=false,west=false": { "model": "white_pane_nsew" },
         "east=false,north=true,south=false,west=false": { "model": "white_pane_n" },
         "east=true,north=false,south=false,west=false": { "model": "white_pane_n", "y": 90 },
-        "east=false,north=false,south=true,west=false": { "model": "white_pane_s" },
+        "east=false,north=false,south=true,west=false": { "model": "white_pane_n", "y": 180 },
-        "east=false,north=false,south=false,west=true": { "model": "white_pane_s", "y": 90 },
+        "east=false,north=false,south=false,west=true": { "model": "white_pane_n", "y": 270 },
         "east=true,north=true,south=false,west=false": { "model": "white_pane_ne" },
-        "east=true,north=false,south=true,west=false": { "model": "white_pane_se" },
+        "east=true,north=false,south=true,west=false": { "model": "white_pane_ne", "y": 90 },
-        "east=false,north=false,south=true,west=true": { "model": "white_pane_sw" },
+        "east=false,north=false,south=true,west=true": { "model": "white_pane_ne", "y": 180 },
-        "east=false,north=true,south=false,west=true": { "model": "white_pane_nw" },
+        "east=false,north=true,south=false,west=true": { "model": "white_pane_ne", "y": 270 },
         "east=false,north=true,south=true,west=false": { "model": "white_pane_ns" },
         "east=true,north=false,south=false,west=true": { "model": "white_pane_ns", "y": 90 },
         "east=true,north=true,south=true,west=false": { "model": "white_pane_nse" },
-        "east=true,north=false,south=true,west=true": { "model": "white_pane_sew" },
+        "east=true,north=false,south=true,west=true": { "model": "white_pane_nse", "y": 90 },
-        "east=false,north=true,south=true,west=true": { "model": "white_pane_nsw" },
+        "east=false,north=true,south=true,west=true": { "model": "white_pane_nse", "y": 180 },
-        "east=true,north=true,south=false,west=true": { "model": "white_pane_new" },
+        "east=true,north=true,south=false,west=true": { "model": "white_pane_nse", "y": 270 },
         "east=true,north=true,south=true,west=true": { "model": "white_pane_nsew" }
     }
 }

EaglercraftX_1.8_Desktop_Runtime/resources/assets/minecraft/blockstates/yellow_stained_glass_pane.json

@@ -3,18 +3,18 @@
         "east=false,north=false,south=false,west=false": { "model": "yellow_pane_nsew" },
         "east=false,north=true,south=false,west=false": { "model": "yellow_pane_n" },
         "east=true,north=false,south=false,west=false": { "model": "yellow_pane_n", "y": 90 },
-        "east=false,north=false,south=true,west=false": { "model": "yellow_pane_s" },
+        "east=false,north=false,south=true,west=false": { "model": "yellow_pane_n", "y": 180 },
-        "east=false,north=false,south=false,west=true": { "model": "yellow_pane_s", "y": 90 },
+        "east=false,north=false,south=false,west=true": { "model": "yellow_pane_n", "y": 270 },
         "east=true,north=true,south=false,west=false": { "model": "yellow_pane_ne" },
-        "east=true,north=false,south=true,west=false": { "model": "yellow_pane_se" },
+        "east=true,north=false,south=true,west=false": { "model": "yellow_pane_ne", "y": 90 },
-        "east=false,north=false,south=true,west=true": { "model": "yellow_pane_sw" },
+        "east=false,north=false,south=true,west=true": { "model": "yellow_pane_ne", "y": 180 },
-        "east=false,north=true,south=false,west=true": { "model": "yellow_pane_nw" },
+        "east=false,north=true,south=false,west=true": { "model": "yellow_pane_ne", "y": 270 },
         "east=false,north=true,south=true,west=false": { "model": "yellow_pane_ns" },
         "east=true,north=false,south=false,west=true": { "model": "yellow_pane_ns", "y": 90 },
         "east=true,north=true,south=true,west=false": { "model": "yellow_pane_nse" },
-        "east=true,north=false,south=true,west=true": { "model": "yellow_pane_sew" },
+        "east=true,north=false,south=true,west=true": { "model": "yellow_pane_nse", "y": 90 },
-        "east=false,north=true,south=true,west=true": { "model": "yellow_pane_nsw" },
+        "east=false,north=true,south=true,west=true": { "model": "yellow_pane_nse", "y": 180 },
-        "east=true,north=true,south=false,west=true": { "model": "yellow_pane_new" },
+        "east=true,north=true,south=false,west=true": { "model": "yellow_pane_nse", "y": 270 },
         "east=true,north=true,south=true,west=true": { "model": "yellow_pane_nsew" }
     }
 }

EaglercraftX_1.8_Desktop_Runtime/resources/assets/minecraft/lang/en_US.lang

@@ -830,6 +830,12 @@ eaglercraft.options.vsyncReEnabled.2=Using the WASM-GC version of EaglercraftX w
 eaglercraft.options.vsyncReEnabled.3=VSync enabled causes bad input lag, sorry!
 eaglercraft.options.vsyncReEnabled.continue=Continue
 
+eaglercraft.options.connectedTexturesOF=Connected Textures
+eaglercraft.options.betterGrassOF=Better Grass/Snow
+eaglercraft.options.customSkiesOF=Custom Skies
+eaglercraft.options.smartLeavesOF=Smart Leaves
+eaglercraft.options.customItemsOF=Custom Items
+
 selectServer.title=Select Server
 selectServer.empty=empty
 selectServer.select=Join Server

EaglercraftX_1.8_Desktop_Runtime/resources/assets/minecraft/mcpatcher/ctm/default/0_glass_white/glass_pane_white.properties

@@ -0,0 +1,7 @@
+# Stained glass white
+matchBlocks=160
+metadata=0
+connect=block
+method=ctm
+faces=sides
+tiles=0-11 16-27 32-43 48-58

EaglercraftX_1.8_Desktop_Runtime/resources/assets/minecraft/mcpatcher/ctm/default/0_glass_white/glass_white.properties

@@ -0,0 +1,6 @@
+# Stained glass white
+matchBlocks=95
+metadata=0
+connect=block
+method=ctm
+tiles=0-11 16-27 32-43 48-58