diff --git a/biomes/.util/ruined_portals.json b/biomes/.util/ruined_portals.json index 12c82af4..25f6a1e5 100644 --- a/biomes/.util/ruined_portals.json +++ b/biomes/.util/ruined_portals.json @@ -17,19 +17,19 @@ "clutter/swordnp1", "clutter/swordnp2", "clutter/swordnp1", - "ruined_portal/giant_portal_1", - "ruined_portal/giant_portal_2", - "ruined_portal/giant_portal_3", - "ruined_portal/portal_1", - "ruined_portal/portal_2", - "ruined_portal/portal_3", - "ruined_portal/portal_4", - "ruined_portal/portal_5", - "ruined_portal/portal_6", - "ruined_portal/portal_7", - "ruined_portal/portal_8", - "ruined_portal/portal_9", - "ruined_portal/portal_10" + "structures/giantportal1", + "structures/giantportal2", + "structures/giantportal3", + "structures/portal1", + "structures/portal2", + "structures/portal3", + "structures/portal4", + "structures/portal5", + "structures/portal6", + "structures/portal7", + "structures/portal8", + "structures/portal9", + "structures/portal10" ], "edit": [ { @@ -62,19 +62,19 @@ "place": [ "clutter/swordnp2", "clutter/swordnp1", - "ruined_portal/giant_portal_1", - "ruined_portal/giant_portal_2", - "ruined_portal/giant_portal_3", - "ruined_portal/portal_1", - "ruined_portal/portal_2", - "ruined_portal/portal_3", - "ruined_portal/portal_4", - "ruined_portal/portal_5", - "ruined_portal/portal_6", - "ruined_portal/portal_7", - "ruined_portal/portal_8", - "ruined_portal/portal_9", - "ruined_portal/portal_10" + "structures/giantportal1", + "structures/giantportal2", + "structures/giantportal3", + "structures/portal1", + "structures/portal2", + "structures/portal3", + "structures/portal4", + "structures/portal5", + "structures/portal6", + "structures/portal7", + "structures/portal8", + "structures/portal9", + "structures/portal10" ], "edit": [ { diff --git a/biomes/hot/msa-blue.json b/biomes/hot/msa-blue.json index 368df825..a5e69fe0 100644 --- a/biomes/hot/msa-blue.json +++ b/biomes/hot/msa-blue.json @@ -81,19 +81,19 @@ "place": [ "clutter/swordnp2", "clutter/swordnp1", - "ruined_portal/giant_portal_1", - "ruined_portal/giant_portal_2", - "ruined_portal/giant_portal_3", - "ruined_portal/portal_1", - "ruined_portal/portal_2", - "ruined_portal/portal_3", - "ruined_portal/portal_4", - "ruined_portal/portal_5", - "ruined_portal/portal_6", - "ruined_portal/portal_7", - "ruined_portal/portal_8", - "ruined_portal/portal_9", - "ruined_portal/portal_10" + "structures/giantportal1", + "structures/giantportal2", + "structures/giantportal3", + "structures/portal1", + "structures/portal2", + "structures/portal3", + "structures/portal4", + "structures/portal5", + "structures/portal6", + "structures/portal7", + "structures/portal8", + "structures/portal9", + "structures/portal10" ], "edit": [ { diff --git a/biomes/hot/msa-dark.json b/biomes/hot/msa-dark.json index 4aa60cb5..48b1080b 100644 --- a/biomes/hot/msa-dark.json +++ b/biomes/hot/msa-dark.json @@ -99,19 +99,19 @@ "place": [ "clutter/swordnp2", "clutter/swordnp1", - "ruined_portal/giant_portal_1", - "ruined_portal/giant_portal_2", - "ruined_portal/giant_portal_3", - "ruined_portal/portal_1", - "ruined_portal/portal_2", - "ruined_portal/portal_3", - "ruined_portal/portal_4", - "ruined_portal/portal_5", - "ruined_portal/portal_6", - "ruined_portal/portal_7", - "ruined_portal/portal_8", - "ruined_portal/portal_9", - "ruined_portal/portal_10" + "structures/giantportal1", + "structures/giantportal2", + "structures/giantportal3", + "structures/portal1", + "structures/portal2", + "structures/portal3", + "structures/portal4", + "structures/portal5", + "structures/portal6", + "structures/portal7", + "structures/portal8", + "structures/portal9", + "structures/portal10" ], "edit": [ { diff --git a/biomes/hot/msa-green.json b/biomes/hot/msa-green.json index bb32547c..bccca056 100644 --- a/biomes/hot/msa-green.json +++ b/biomes/hot/msa-green.json @@ -81,19 +81,19 @@ "place": [ "clutter/swordnp2", "clutter/swordnp1", - "ruined_portal/giant_portal_1", - "ruined_portal/giant_portal_2", - "ruined_portal/giant_portal_3", - "ruined_portal/portal_1", - "ruined_portal/portal_2", - "ruined_portal/portal_3", - "ruined_portal/portal_4", - "ruined_portal/portal_5", - "ruined_portal/portal_6", - "ruined_portal/portal_7", - "ruined_portal/portal_8", - "ruined_portal/portal_9", - "ruined_portal/portal_10" + "structures/giantportal1", + "structures/giantportal2", + "structures/giantportal3", + "structures/portal1", + "structures/portal2", + "structures/portal3", + "structures/portal4", + "structures/portal5", + "structures/portal6", + "structures/portal7", + "structures/portal8", + "structures/portal9", + "structures/portal10" ], "edit": [ { diff --git a/biomes/hot/msa-red.json b/biomes/hot/msa-red.json index 82260047..a0dfe8f0 100644 --- a/biomes/hot/msa-red.json +++ b/biomes/hot/msa-red.json @@ -87,19 +87,19 @@ "place": [ "clutter/swordnp2", "clutter/swordnp1", - "ruined_portal/giant_portal_1", - "ruined_portal/giant_portal_2", - "ruined_portal/giant_portal_3", - "ruined_portal/portal_1", - "ruined_portal/portal_2", - "ruined_portal/portal_3", - "ruined_portal/portal_4", - "ruined_portal/portal_5", - "ruined_portal/portal_6", - "ruined_portal/portal_7", - "ruined_portal/portal_8", - "ruined_portal/portal_9", - "ruined_portal/portal_10" + "structures/giantportal1", + "structures/giantportal2", + "structures/giantportal3", + "structures/portal1", + "structures/portal2", + "structures/portal3", + "structures/portal4", + "structures/portal5", + "structures/portal6", + "structures/portal7", + "structures/portal8", + "structures/portal9", + "structures/portal10" ], "edit": [ { diff --git a/biomes/mountain/mtn-hills.json b/biomes/mountain/mtn-hills.json index ab8e0c51..7a0c0e84 100644 --- a/biomes/mountain/mtn-hills.json +++ b/biomes/mountain/mtn-hills.json @@ -176,7 +176,7 @@ }, "enabled": true }, - "place": ["ruins/ruin1"], + "place": ["structures/ruin1"], "translate": { "x": 0, "y": 0, diff --git a/biomes/mountain/mtn-plains.json b/biomes/mountain/mtn-plains.json index 16352157..490b8fa9 100644 --- a/biomes/mountain/mtn-plains.json +++ b/biomes/mountain/mtn-plains.json @@ -184,7 +184,7 @@ }, "enabled": true }, - "place": ["ruins/ruin1"], + "place": ["structures/ruin1"], "translate": { "x": 0, "y": 0, diff --git a/biomes/mushroom/mus-beach.json b/biomes/mushroom/mus-beach.json index 9791a048..796ab409 100644 --- a/biomes/mushroom/mus-beach.json +++ b/biomes/mushroom/mus-beach.json @@ -38,19 +38,19 @@ "place": [ "clutter/swordnp2", "clutter/swordnp1", - "ruined_portal/giant_portal_1", - "ruined_portal/giant_portal_2", - "ruined_portal/giant_portal_3", - "ruined_portal/portal_1", - "ruined_portal/portal_2", - "ruined_portal/portal_3", - "ruined_portal/portal_4", - "ruined_portal/portal_5", - "ruined_portal/portal_6", - "ruined_portal/portal_7", - "ruined_portal/portal_8", - "ruined_portal/portal_9", - "ruined_portal/portal_10" + "structures/giantportal1", + "structures/giantportal2", + "structures/giantportal3", + "structures/portal1", + "structures/portal2", + "structures/portal3", + "structures/portal4", + "structures/portal5", + "structures/portal6", + "structures/portal7", + "structures/portal8", + "structures/portal9", + "structures/portal10" ], "edit": [ { diff --git a/biomes/ocean/oce-mtn-lake.json b/biomes/ocean/oce-mtn-lake.json index 4a0959d1..e9b40b09 100644 --- a/biomes/ocean/oce-mtn-lake.json +++ b/biomes/ocean/oce-mtn-lake.json @@ -162,7 +162,7 @@ }, "enabled": true }, - "place": ["ruins/ruin1"], + "place": ["structures/ruin1"], "translate": { "x": 0, "y": 0, diff --git a/biomes/temperate/tem-plains.json b/biomes/temperate/tem-plains.json index ca43dbdb..bad43de0 100644 --- a/biomes/temperate/tem-plains.json +++ b/biomes/temperate/tem-plains.json @@ -235,7 +235,7 @@ }, "enabled": true }, - "place": ["ruins/ruin1"], + "place": ["structures/ruin1"], "translate": { "x": 0, "y": 0, diff --git a/biomes/temperate/tem-plateau.json b/biomes/temperate/tem-plateau.json index d7abb0fb..2a4403c4 100644 --- a/biomes/temperate/tem-plateau.json +++ b/biomes/temperate/tem-plateau.json @@ -71,19 +71,19 @@ "place": [ "clutter/swordnp2", "clutter/swordnp1", - "ruined_portal/giant_portal_1", - "ruined_portal/giant_portal_2", - "ruined_portal/giant_portal_3", - "ruined_portal/portal_1", - "ruined_portal/portal_2", - "ruined_portal/portal_3", - "ruined_portal/portal_4", - "ruined_portal/portal_5", - "ruined_portal/portal_6", - "ruined_portal/portal_7", - "ruined_portal/portal_8", - "ruined_portal/portal_9", - "ruined_portal/portal_10" + "structures/giantportal1", + "structures/giantportal2", + "structures/giantportal3", + "structures/portal1", + "structures/portal2", + "structures/portal3", + "structures/portal4", + "structures/portal5", + "structures/portal6", + "structures/portal7", + "structures/portal8", + "structures/portal9", + "structures/portal10" ], "edit": [ { diff --git a/biomes/tundra/tun-beach.json b/biomes/tundra/tun-beach.json index 123a0a30..f81b64e3 100644 --- a/biomes/tundra/tun-beach.json +++ b/biomes/tundra/tun-beach.json @@ -77,19 +77,19 @@ "place": [ "clutter/swordnp2", "clutter/swordnp1", - "ruined_portal/giant_portal_1", - "ruined_portal/giant_portal_2", - "ruined_portal/giant_portal_3", - "ruined_portal/portal_1", - "ruined_portal/portal_2", - "ruined_portal/portal_3", - "ruined_portal/portal_4", - "ruined_portal/portal_5", - "ruined_portal/portal_6", - "ruined_portal/portal_7", - "ruined_portal/portal_8", - "ruined_portal/portal_9", - "ruined_portal/portal_10" + "structures/giantportal1", + "structures/giantportal2", + "structures/giantportal3", + "structures/portal1", + "structures/portal2", + "structures/portal3", + "structures/portal4", + "structures/portal5", + "structures/portal6", + "structures/portal7", + "structures/portal8", + "structures/portal9", + "structures/portal10" ], "edit": [ { diff --git a/biomes/tundra/tun-tundra-beach-stone.json b/biomes/tundra/tun-tundra-beach-stone.json index 9b4cb1c7..d32606a7 100644 --- a/biomes/tundra/tun-tundra-beach-stone.json +++ b/biomes/tundra/tun-tundra-beach-stone.json @@ -31,19 +31,19 @@ "place": [ "clutter/swordnp2", "clutter/swordnp1", - "ruined_portal/giant_portal_1", - "ruined_portal/giant_portal_2", - "ruined_portal/giant_portal_3", - "ruined_portal/portal_1", - "ruined_portal/portal_2", - "ruined_portal/portal_3", - "ruined_portal/portal_4", - "ruined_portal/portal_5", - "ruined_portal/portal_6", - "ruined_portal/portal_7", - "ruined_portal/portal_8", - "ruined_portal/portal_9", - "ruined_portal/portal_10" + "structures/giantportal1", + "structures/giantportal2", + "structures/giantportal3", + "structures/portal1", + "structures/portal2", + "structures/portal3", + "structures/portal4", + "structures/portal5", + "structures/portal6", + "structures/portal7", + "structures/portal8", + "structures/portal9", + "structures/portal10" ], "edit": [ { diff --git a/jigsaw-pieces/ruined_portal/portal_1.json b/jigsaw-pieces/ruined_portal/portal_1.json index 7bffae70..da4b5c0c 100644 --- a/jigsaw-pieces/ruined_portal/portal_1.json +++ b/jigsaw-pieces/ruined_portal/portal_1.json @@ -70,5 +70,5 @@ "exponent": 1 } }, - "object": "jigsaw/ruined_portal/portal_1" + "object": "jigsaw/structures/portal1" } diff --git a/jigsaw-pieces/ruined_portal/portal_2.json b/jigsaw-pieces/ruined_portal/portal_2.json index e8c1497e..699cf224 100644 --- a/jigsaw-pieces/ruined_portal/portal_2.json +++ b/jigsaw-pieces/ruined_portal/portal_2.json @@ -70,5 +70,5 @@ "exponent": 1 } }, - "object": "jigsaw/ruined_portal/portal_2" + "object": "jigsaw/structures/portal2" } diff --git a/jigsaw-pieces/ruined_portal/portal_3.json b/jigsaw-pieces/ruined_portal/portal_3.json index 8c3b1575..8375277b 100644 --- a/jigsaw-pieces/ruined_portal/portal_3.json +++ b/jigsaw-pieces/ruined_portal/portal_3.json @@ -70,5 +70,5 @@ "exponent": 1 } }, - "object": "jigsaw/ruined_portal/portal_3" + "object": "jigsaw/structures/portal3" } diff --git a/jigsaw-pieces/ruined_portal/portal_4.json b/jigsaw-pieces/ruined_portal/portal_4.json index a794b6ac..39d4427a 100644 --- a/jigsaw-pieces/ruined_portal/portal_4.json +++ b/jigsaw-pieces/ruined_portal/portal_4.json @@ -70,5 +70,5 @@ "exponent": 1 } }, - "object": "jigsaw/ruined_portal/portal_4" + "object": "jigsaw/structures/portal4" } diff --git a/jigsaw-pieces/ruined_portal/portal_5.json b/jigsaw-pieces/ruined_portal/portal_5.json index 5f8d5861..452bbdac 100644 --- a/jigsaw-pieces/ruined_portal/portal_5.json +++ b/jigsaw-pieces/ruined_portal/portal_5.json @@ -70,5 +70,5 @@ "exponent": 1 } }, - "object": "jigsaw/ruined_portal/portal_5" + "object": "jigsaw/structures/portal5" } diff --git a/jigsaw-pools/ruined_portal.json b/jigsaw-pools/ruined_portal.json index 714a0f8b..9cadc25d 100644 --- a/jigsaw-pools/ruined_portal.json +++ b/jigsaw-pools/ruined_portal.json @@ -1,15 +1,15 @@ {"pieces": [ - "ruined_portal/giant_portal_1", - "ruined_portal/giant_portal_2", - "ruined_portal/giant_portal_3", - "ruined_portal/portal_1", - "ruined_portal/portal_10", - "ruined_portal/portal_2", - "ruined_portal/portal_3", - "ruined_portal/portal_4", - "ruined_portal/portal_5", - "ruined_portal/portal_6", - "ruined_portal/portal_7", - "ruined_portal/portal_8", - "ruined_portal/portal_9" + "structures/giantportal1", + "structures/giantportal2", + "structures/giantportal3", + "structures/portal1", + "structures/portal10", + "structures/portal2", + "structures/portal3", + "structures/portal4", + "structures/portal5", + "structures/portal6", + "structures/portal7", + "structures/portal8", + "structures/portal9" ]} diff --git a/objects/jigsaw/ruined_portal/giant_portal_1.iob b/objects/structures/giantportal1.iob similarity index 100% rename from objects/jigsaw/ruined_portal/giant_portal_1.iob rename to objects/structures/giantportal1.iob diff --git a/objects/jigsaw/ruined_portal/giant_portal_2.iob b/objects/structures/giantportal2.iob similarity index 100% rename from objects/jigsaw/ruined_portal/giant_portal_2.iob rename to objects/structures/giantportal2.iob diff --git a/objects/jigsaw/ruined_portal/giant_portal_3.iob b/objects/structures/giantportal3.iob similarity index 100% rename from objects/jigsaw/ruined_portal/giant_portal_3.iob rename to objects/structures/giantportal3.iob diff --git a/objects/jigsaw/ruined_portal/portal_1.iob b/objects/structures/portal1.iob similarity index 100% rename from objects/jigsaw/ruined_portal/portal_1.iob rename to objects/structures/portal1.iob diff --git a/objects/jigsaw/ruined_portal/portal_10.iob b/objects/structures/portal10.iob similarity index 100% rename from objects/jigsaw/ruined_portal/portal_10.iob rename to objects/structures/portal10.iob diff --git a/objects/jigsaw/ruined_portal/portal_2.iob b/objects/structures/portal2.iob similarity index 100% rename from objects/jigsaw/ruined_portal/portal_2.iob rename to objects/structures/portal2.iob diff --git a/objects/jigsaw/ruined_portal/portal_3.iob b/objects/structures/portal3.iob similarity index 100% rename from objects/jigsaw/ruined_portal/portal_3.iob rename to objects/structures/portal3.iob diff --git a/objects/jigsaw/ruined_portal/portal_4.iob b/objects/structures/portal4.iob similarity index 100% rename from objects/jigsaw/ruined_portal/portal_4.iob rename to objects/structures/portal4.iob diff --git a/objects/jigsaw/ruined_portal/portal_5.iob b/objects/structures/portal5.iob similarity index 100% rename from objects/jigsaw/ruined_portal/portal_5.iob rename to objects/structures/portal5.iob diff --git a/objects/jigsaw/ruined_portal/portal_6.iob b/objects/structures/portal6.iob similarity index 100% rename from objects/jigsaw/ruined_portal/portal_6.iob rename to objects/structures/portal6.iob diff --git a/objects/jigsaw/ruined_portal/portal_7.iob b/objects/structures/portal7.iob similarity index 100% rename from objects/jigsaw/ruined_portal/portal_7.iob rename to objects/structures/portal7.iob diff --git a/objects/jigsaw/ruined_portal/portal_8.iob b/objects/structures/portal8.iob similarity index 100% rename from objects/jigsaw/ruined_portal/portal_8.iob rename to objects/structures/portal8.iob diff --git a/objects/jigsaw/ruined_portal/portal_9.iob b/objects/structures/portal9.iob similarity index 100% rename from objects/jigsaw/ruined_portal/portal_9.iob rename to objects/structures/portal9.iob diff --git a/objects/structures/ruin1.iob b/objects/structures/ruin1.iob new file mode 100644 index 00000000..c0aaee68 Binary files /dev/null and b/objects/structures/ruin1.iob differ diff --git a/regions/frozen.json b/regions/frozen.json index bc10a6e8..2cd027b8 100644 --- a/regions/frozen.json +++ b/regions/frozen.json @@ -165,19 +165,19 @@ "place": [ "clutter/swordnp2", "clutter/swordnp1", - "ruined_portal/giant_portal_1", - "ruined_portal/giant_portal_2", - "ruined_portal/giant_portal_3", - "ruined_portal/portal_1", - "ruined_portal/portal_2", - "ruined_portal/portal_3", - "ruined_portal/portal_4", - "ruined_portal/portal_5", - "ruined_portal/portal_6", - "ruined_portal/portal_7", - "ruined_portal/portal_8", - "ruined_portal/portal_9", - "ruined_portal/portal_10" + "structures/giantportal1", + "structures/giantportal2", + "structures/giantportal3", + "structures/portal1", + "structures/portal2", + "structures/portal3", + "structures/portal4", + "structures/portal5", + "structures/portal6", + "structures/portal7", + "structures/portal8", + "structures/portal9", + "structures/portal10" ], "edit": [ { diff --git a/regions/hot.json b/regions/hot.json index d7b2aafc..4460958d 100644 --- a/regions/hot.json +++ b/regions/hot.json @@ -213,19 +213,19 @@ "place": [ "clutter/swordnp2", "clutter/swordnp1", - "ruined_portal/giant_portal_1", - "ruined_portal/giant_portal_2", - "ruined_portal/giant_portal_3", - "ruined_portal/portal_1", - "ruined_portal/portal_2", - "ruined_portal/portal_3", - "ruined_portal/portal_4", - "ruined_portal/portal_5", - "ruined_portal/portal_6", - "ruined_portal/portal_7", - "ruined_portal/portal_8", - "ruined_portal/portal_9", - "ruined_portal/portal_10" + "structures/giantportal1", + "structures/giantportal2", + "structures/giantportal3", + "structures/portal1", + "structures/portal2", + "structures/portal3", + "structures/portal4", + "structures/portal5", + "structures/portal6", + "structures/portal7", + "structures/portal8", + "structures/portal9", + "structures/portal10" ], "edit": [ { diff --git a/regions/temperate.json b/regions/temperate.json index c12cfc0e..fe504422 100644 --- a/regions/temperate.json +++ b/regions/temperate.json @@ -156,19 +156,19 @@ "place": [ "clutter/swordnp2", "clutter/swordnp1", - "ruined_portal/giant_portal_1", - "ruined_portal/giant_portal_2", - "ruined_portal/giant_portal_3", - "ruined_portal/portal_1", - "ruined_portal/portal_2", - "ruined_portal/portal_3", - "ruined_portal/portal_4", - "ruined_portal/portal_5", - "ruined_portal/portal_6", - "ruined_portal/portal_7", - "ruined_portal/portal_8", - "ruined_portal/portal_9", - "ruined_portal/portal_10" + "structures/giantportal1", + "structures/giantportal2", + "structures/giantportal3", + "structures/portal1", + "structures/portal2", + "structures/portal3", + "structures/portal4", + "structures/portal5", + "structures/portal6", + "structures/portal7", + "structures/portal8", + "structures/portal9", + "structures/portal10" ], "edit": [ { diff --git a/regions/tropical.json b/regions/tropical.json index 736a1bfd..ebd0d8ca 100644 --- a/regions/tropical.json +++ b/regions/tropical.json @@ -183,19 +183,19 @@ "place": [ "clutter/swordnp2", "clutter/swordnp1", - "ruined_portal/giant_portal_1", - "ruined_portal/giant_portal_2", - "ruined_portal/giant_portal_3", - "ruined_portal/portal_1", - "ruined_portal/portal_2", - "ruined_portal/portal_3", - "ruined_portal/portal_4", - "ruined_portal/portal_5", - "ruined_portal/portal_6", - "ruined_portal/portal_7", - "ruined_portal/portal_8", - "ruined_portal/portal_9", - "ruined_portal/portal_10" + "structures/giantportal1", + "structures/giantportal2", + "structures/giantportal3", + "structures/portal1", + "structures/portal2", + "structures/portal3", + "structures/portal4", + "structures/portal5", + "structures/portal6", + "structures/portal7", + "structures/portal8", + "structures/portal9", + "structures/portal10" ], "edit": [ {