From 3141218f3ce581bb94de07a46e3ce1e68161fac4 Mon Sep 17 00:00:00 2001 From: Daniel Mills Date: Sat, 10 Jul 2021 20:33:52 -0400 Subject: [PATCH] Revert "Incorrect use of IDecorationPart causing chunk holes, crashes, deadlocks" This reverts commit 590b0f2037fc0aa48376654293e29bd6fe5ea31e. --- biomes/ocean/oce-deep.json | 4 ++-- biomes/ocean/oce-tem-ocean-deep.json | 8 ++++---- biomes/ocean/oce-tem-ocean.json | 8 ++++---- biomes/ocean/oce-tem-river.json | 8 ++++---- biomes/ocean/oce-warm-bottom.json | 4 ++-- biomes/ocean/oce-warm.json | 4 ++-- 6 files changed, 18 insertions(+), 18 deletions(-) diff --git a/biomes/ocean/oce-deep.json b/biomes/ocean/oce-deep.json index da19ba39..80ced7ef 100644 --- a/biomes/ocean/oce-deep.json +++ b/biomes/ocean/oce-deep.json @@ -42,7 +42,7 @@ "palette": [{"block": "kelp_plant"}], "stackMin": 2, "stackMax": 12, - "partOf": "SEA_SURFACE" + "partOf": "SEA_FLOOR" }, { "chance": 0.2, @@ -58,7 +58,7 @@ "block": "tall_seagrass", "data": {"half": "upper"} }], - "partOf": "SEA_SURFACE" + "partOf": "SEA_FLOOR" } ], "objects": [ diff --git a/biomes/ocean/oce-tem-ocean-deep.json b/biomes/ocean/oce-tem-ocean-deep.json index c5ec0344..546e786a 100644 --- a/biomes/ocean/oce-tem-ocean-deep.json +++ b/biomes/ocean/oce-tem-ocean-deep.json @@ -49,7 +49,7 @@ {"block": "magma_block"} ], "style": {"style": "STATIC"}, - "partOf": "SEA_SURFACE" + "partOf": "SEA_FLOOR" }, { "chance": 0.07, @@ -57,7 +57,7 @@ "zoom": 5, "palette": [{"block": "seagrass"}], "style": {"style": "STATIC"}, - "partOf": "SEA_SURFACE" + "partOf": "SEA_FLOOR" }, { "chance": 0.013, @@ -69,7 +69,7 @@ "style": {"style": "STATIC"}, "heightVariance": {"style": "IRIS"}, "stackMin": 2, - "partOf": "SEA_SURFACE" + "partOf": "SEA_FLOOR" }, { "chance": 0.001, @@ -83,7 +83,7 @@ "block": "sea_pickle" }], "style": {"style": "STATIC"}, - "partOf": "SEA_SURFACE" + "partOf": "SEA_FLOOR" } ], "objects": [ diff --git a/biomes/ocean/oce-tem-ocean.json b/biomes/ocean/oce-tem-ocean.json index 1e83ac32..8f513995 100644 --- a/biomes/ocean/oce-tem-ocean.json +++ b/biomes/ocean/oce-tem-ocean.json @@ -50,7 +50,7 @@ {"block": "magma_block"} ], "style": {"style": "STATIC"}, - "partOf": "SEA_SURFACE" + "partOf": "SEA_FLOOR" }, { "chance": 0.07, @@ -58,7 +58,7 @@ "zoom": 5, "palette": [{"block": "seagrass"}], "style": {"style": "STATIC"}, - "partOf": "SEA_SURFACE" + "partOf": "SEA_FLOOR" }, { "chance": 0.013, @@ -70,7 +70,7 @@ "style": {"style": "STATIC"}, "heightVariance": {"style": "IRIS"}, "stackMin": 2, - "partOf": "SEA_SURFACE" + "partOf": "SEA_FLOOR" }, { "chance": 0.001, @@ -84,7 +84,7 @@ "block": "sea_pickle" }], "style": {"style": "STATIC"}, - "partOf": "SEA_SURFACE" + "partOf": "SEA_FLOOR" } ], "objects": [ diff --git a/biomes/ocean/oce-tem-river.json b/biomes/ocean/oce-tem-river.json index 4efc2588..cd4f468a 100644 --- a/biomes/ocean/oce-tem-river.json +++ b/biomes/ocean/oce-tem-river.json @@ -54,7 +54,7 @@ {"block": "magma_block"} ], "style": {"style": "STATIC"}, - "partOf": "SEA_SURFACE" + "partOf": "SEA_FLOOR" }, { "chance": 0.07, @@ -62,7 +62,7 @@ "zoom": 5, "palette": [{"block": "seagrass"}], "style": {"style": "STATIC"}, - "partOf": "SEA_SURFACE" + "partOf": "SEA_FLOOR" }, { "chance": 0.013, @@ -74,7 +74,7 @@ "style": {"style": "STATIC"}, "heightVariance": {"style": "IRIS"}, "stackMin": 2, - "partOf": "SEA_SURFACE" + "partOf": "SEA_FLOOR" }, { "chance": 0.001, @@ -88,7 +88,7 @@ "block": "sea_pickle" }], "style": {"style": "STATIC"}, - "partOf": "SEA_SURFACE" + "partOf": "SEA_FLOOR" } ], "objects": [{ diff --git a/biomes/ocean/oce-warm-bottom.json b/biomes/ocean/oce-warm-bottom.json index 17717a0d..6b378c63 100644 --- a/biomes/ocean/oce-warm-bottom.json +++ b/biomes/ocean/oce-warm-bottom.json @@ -44,7 +44,7 @@ "palette": [{"block": "kelp_plant"}], "stackMin": 2, "stackMax": 6, - "partOf": "SEA_SURFACE" + "partOf": "SEA_FLOOR" }, { "chance": 0.2, @@ -60,7 +60,7 @@ "block": "tall_seagrass", "data": {"half": "upper"} }], - "partOf": "SEA_SURFACE" + "partOf": "SEA_FLOOR" } ], "objects": [ diff --git a/biomes/ocean/oce-warm.json b/biomes/ocean/oce-warm.json index 11dcf507..495924d5 100644 --- a/biomes/ocean/oce-warm.json +++ b/biomes/ocean/oce-warm.json @@ -38,7 +38,7 @@ "palette": [{"block": "kelp_plant"}], "stackMin": 2, "stackMax": 6, - "partOf": "SEA_SURFACE" + "partOf": "SEA_FLOOR" }, { "chance": 0.05, @@ -54,7 +54,7 @@ "block": "tall_seagrass", "data": {"half": "upper"} }], - "partOf": "SEA_SURFACE" + "partOf": "SEA_FLOOR" } ], "objects": [