easy upgrade to 1.13.2

bobcao3 · Jul 30, 2019 · 1ede8fe · 1ede8fe
1 parent b82176a
commit 1ede8fe
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 0 deletions.
diff --git a/shaders/block.properties b/shaders/block.properties
@@ -0,0 +1,9 @@
+block.8=minecraft:water
+block.79=minecraft:ice
+block.95=minecraft:stained_glass
+#if MC_VERSION >= 11300
+block.31=minecraft:grass minecraft:sea_grass minecraft:fern minecraft:dead_bush minecraft:sea_pickle minecraft:large_fern minecraft:rose_bush minecraft:poppy minecraft:dandelion minecraft:peony minecraft:blue_orchid minecraft:allium minecraft:azure_bluet minecraft:red_tulip minecraft:orange_tulip minecraft:white_tulip minecraft:pink_tulip minecraft:tulip minecraft:oxeye_daisy minecraft:lilac
+#else
+block.31=minecraft:tall_grass minecraft:fern minecraft:dead_bush minecraft:sea_pickle minecraft:large_fern minecraft:rose_bush minecraft:poppy minecraft:dandelion minecraft:peony minecraft:blue_orchid minecraft:allium minecraft:azure_bluet minecraft:red_tulip minecraft:orange_tulip minecraft:white_tulip minecraft:pink_tulip minecraft:tulip minecraft:oxeye_daisy minecraft:lilac minecraft:double_tall_grass
+#endif
+block.18=minecraft:oak_leaves minecraft:spruce_leaves minecraft:birch_leaves minecraft:jungle_leaves minecraft:acacia_leaves minecraft:dark_oak_leaves
diff --git a/shaders/gbuffers_water.vsh b/shaders/gbuffers_water.vsh
@@ -49,7 +49,11 @@ uniform bool isEyeInWater;
 VSH {
 	iswater = 0.95f;
 	vec4 pos = gl_Vertex;
+#if MC_VERSION >= 11300
+	if (mc_Entity.y == 0.0) {
+#else
 	if (mc_Entity.x == 8.0 || mc_Entity.x == 9.0) {
+#endif
 		iswater = 0.79f;
 		pos.y += float(isEyeInWater) * 0.3 - 0.2;
 	}