From 92fe98776eb6ed431a1226c256df82f0b9908da8 Mon Sep 17 00:00:00 2001
From: CocoTheOwner <sjoerdvdgoor02@gmail.com>
Date: Fri, 23 Jul 2021 20:07:26 +0200
Subject: [PATCH] rename & reorder oceans to match naming conventions

---
 biomes/ocean/{oce-deep.json => deep.json}               | 0
 biomes/ocean/{oce-ocean.json => ocean.json}             | 0
 biomes/ocean/{oce-beach.json => shore/beach.json}       | 0
 biomes/ocean/{oce-warm-bottom.json => warm-bottom.json} | 0
 biomes/ocean/{oce-warm.json => warm.json}               | 2 +-
 regions/temperate.json                                  | 2 +-
 6 files changed, 2 insertions(+), 2 deletions(-)
 rename biomes/ocean/{oce-deep.json => deep.json} (100%)
 rename biomes/ocean/{oce-ocean.json => ocean.json} (100%)
 rename biomes/ocean/{oce-beach.json => shore/beach.json} (100%)
 rename biomes/ocean/{oce-warm-bottom.json => warm-bottom.json} (100%)
 rename biomes/ocean/{oce-warm.json => warm.json} (99%)

diff --git a/biomes/ocean/oce-deep.json b/biomes/ocean/deep.json
similarity index 100%
rename from biomes/ocean/oce-deep.json
rename to biomes/ocean/deep.json
diff --git a/biomes/ocean/oce-ocean.json b/biomes/ocean/ocean.json
similarity index 100%
rename from biomes/ocean/oce-ocean.json
rename to biomes/ocean/ocean.json
diff --git a/biomes/ocean/oce-beach.json b/biomes/ocean/shore/beach.json
similarity index 100%
rename from biomes/ocean/oce-beach.json
rename to biomes/ocean/shore/beach.json
diff --git a/biomes/ocean/oce-warm-bottom.json b/biomes/ocean/warm-bottom.json
similarity index 100%
rename from biomes/ocean/oce-warm-bottom.json
rename to biomes/ocean/warm-bottom.json
diff --git a/biomes/ocean/oce-warm.json b/biomes/ocean/warm.json
similarity index 99%
rename from biomes/ocean/oce-warm.json
rename to biomes/ocean/warm.json
index 245c7120..42e49be3 100644
--- a/biomes/ocean/oce-warm.json
+++ b/biomes/ocean/warm.json
@@ -3,7 +3,7 @@
     "derivative": "WARM_OCEAN",
     "vanillaDerivative": "WARM_OCEAN",
     "color": "#2A2180",
-    "children": ["ocean/oce-warm-bottom"],
+    "children": ["ocean/warm-bottom"],
     "generators": [{
         "generator": "plain",
         "max": -10,
diff --git a/regions/temperate.json b/regions/temperate.json
index 6baeca24..833f00d8 100644
--- a/regions/temperate.json
+++ b/regions/temperate.json
@@ -19,7 +19,7 @@
     ],
     "seaBiomes": [
         "temperate/sea/river",
-        "ocean/oce-deep"
+        "ocean/deep"
     ],
     "caveBiomes": [
         "cave/old-cavern",