diff --git a/biomes/.util/ruined_portals.json b/biomes/.util/ruined_portals.json index a0cb24c5..12c82af4 100644 --- a/biomes/.util/ruined_portals.json +++ b/biomes/.util/ruined_portals.json @@ -13,10 +13,10 @@ "name": "standard-surface", "chance": 0.2, "place": [ - "global-clutter/BigSwordPortal-unlit-1", - "global-clutter/BigSwordPortal-lit-1", - "global-clutter/BigSwordPortal-unlit-1", - "global-clutter/BigSwordPortal-lit-1", + "clutter/swordnp2", + "clutter/swordnp1", + "clutter/swordnp2", + "clutter/swordnp1", "ruined_portal/giant_portal_1", "ruined_portal/giant_portal_2", "ruined_portal/giant_portal_3", @@ -60,8 +60,8 @@ "name": "standard-underground", "chance": 0.2, "place": [ - "global-clutter/BigSwordPortal-unlit-1", - "global-clutter/BigSwordPortal-lit-1", + "clutter/swordnp2", + "clutter/swordnp1", "ruined_portal/giant_portal_1", "ruined_portal/giant_portal_2", "ruined_portal/giant_portal_3", diff --git a/biomes/cave/cavern-coral.json b/biomes/cave/cavern-coral.json index 0411a597..24986495 100644 --- a/biomes/cave/cavern-coral.json +++ b/biomes/cave/cavern-coral.json @@ -123,7 +123,7 @@ }, "enabled": true }, - "place": ["camp/camp"], + "place": ["clutter/camp1"], "translate": { "x": 0, "y": 0, @@ -142,7 +142,7 @@ }, "enabled": true }, - "place": ["camp/barrel-bin"], + "place": ["clutter/bincluster1"], "translate": { "x": 0, "y": 0, diff --git a/biomes/cave/cavern-root.json b/biomes/cave/cavern-root.json index 35511d0d..98962172 100644 --- a/biomes/cave/cavern-root.json +++ b/biomes/cave/cavern-root.json @@ -70,7 +70,7 @@ }, "enabled": true }, - "place": ["camp/camp"], + "place": ["clutter/camp1"], "translate": { "x": 0, "y": 0, @@ -89,7 +89,7 @@ }, "enabled": true }, - "place": ["camp/barrel-bin"], + "place": ["clutter/bincluster1"], "translate": { "x": 0, "y": 0, diff --git a/biomes/cave/cracked-cavern.json b/biomes/cave/cracked-cavern.json index c971f5b8..4832f51b 100644 --- a/biomes/cave/cracked-cavern.json +++ b/biomes/cave/cracked-cavern.json @@ -41,7 +41,7 @@ }, "enabled": true }, - "place": ["camp/camp"], + "place": ["clutter/camp1"], "translate": { "x": 0, "y": 0, @@ -60,7 +60,7 @@ }, "enabled": true }, - "place": ["camp/barrel-bin"], + "place": ["clutter/bincluster1"], "translate": { "x": 0, "y": 0, diff --git a/biomes/cave/lit-cavern.json b/biomes/cave/lit-cavern.json index 34eae154..7564269e 100644 --- a/biomes/cave/lit-cavern.json +++ b/biomes/cave/lit-cavern.json @@ -43,7 +43,7 @@ }, "enabled": true }, - "place": ["camp/camp"], + "place": ["clutter/camp1"], "translate": { "x": 0, "y": 0, @@ -62,7 +62,7 @@ }, "enabled": true }, - "place": ["camp/barrel-bin"], + "place": ["clutter/bincluster1"], "translate": { "x": 0, "y": 0, diff --git a/biomes/cave/murky-cavern-gleaming.json b/biomes/cave/murky-cavern-gleaming.json index 59a2cc21..85b0eb36 100644 --- a/biomes/cave/murky-cavern-gleaming.json +++ b/biomes/cave/murky-cavern-gleaming.json @@ -181,7 +181,7 @@ }, "enabled": true }, - "place": ["camp/camp"], + "place": ["clutter/camp1"], "translate": { "x": 0, "y": 0, @@ -200,7 +200,7 @@ }, "enabled": true }, - "place": ["camp/barrel-bin"], + "place": ["clutter/bincluster1"], "translate": { "x": 0, "y": 0, diff --git a/biomes/cave/murky-cavern.json b/biomes/cave/murky-cavern.json index 59e6874d..25156fee 100644 --- a/biomes/cave/murky-cavern.json +++ b/biomes/cave/murky-cavern.json @@ -67,7 +67,7 @@ }, "enabled": true }, - "place": ["camp/camp"], + "place": ["clutter/camp1"], "translate": { "x": 0, "y": 0, @@ -86,7 +86,7 @@ }, "enabled": true }, - "place": ["camp/barrel-bin"], + "place": ["clutter/bincluster1"], "translate": { "x": 0, "y": 0, diff --git a/biomes/cave/old-cavern.json b/biomes/cave/old-cavern.json index 6d032b49..4c6e9b5f 100644 --- a/biomes/cave/old-cavern.json +++ b/biomes/cave/old-cavern.json @@ -204,7 +204,7 @@ }, "enabled": true }, - "place": ["camp/camp"], + "place": ["clutter/camp1"], "translate": { "x": 0, "y": 0, @@ -223,7 +223,7 @@ }, "enabled": true }, - "place": ["camp/barrel-bin"], + "place": ["clutter/bincluster1"], "translate": { "x": 0, "y": 0, @@ -242,7 +242,7 @@ }, "enabled": true }, - "place": ["camp/camp"] + "place": ["clutter/camp1"] } ] } diff --git a/biomes/cave/sandy-cave.json b/biomes/cave/sandy-cave.json index 86ac273a..44de57bb 100644 --- a/biomes/cave/sandy-cave.json +++ b/biomes/cave/sandy-cave.json @@ -78,11 +78,11 @@ "enabled": true }, "place": [ - "clutter/oak-clutt-1", - "clutter/oak-clutt-2", - "clutter/oak-clutt-3", - "clutter/oak-clutt-4", - "clutter/oak-clutt-5" + "clutter/oakclutt1", + "clutter/oakclutt2", + "clutter/oakclutt3", + "clutter/oakclutt4", + "clutter/oakclutt5" ], "translate": { "x": 0, @@ -101,7 +101,7 @@ }, "enabled": true }, - "place": ["grave/grave"], + "place": ["clutter/grave1"], "translate": { "x": 0, "y": 0, diff --git a/biomes/cave/sandy-red-cave.json b/biomes/cave/sandy-red-cave.json index 151bfb4d..b20ecbd6 100644 --- a/biomes/cave/sandy-red-cave.json +++ b/biomes/cave/sandy-red-cave.json @@ -34,11 +34,11 @@ "enabled": true }, "place": [ - "clutter/oak-clutt-1", - "clutter/oak-clutt-2", - "clutter/oak-clutt-3", - "clutter/oak-clutt-4", - "clutter/oak-clutt-5" + "clutter/oakclutt1", + "clutter/oakclutt2", + "clutter/oakclutt3", + "clutter/oakclutt4", + "clutter/oakclutt5" ], "translate": { "x": 0, diff --git a/biomes/cave/spiked-cavern.json b/biomes/cave/spiked-cavern.json index 5c640890..824be426 100644 --- a/biomes/cave/spiked-cavern.json +++ b/biomes/cave/spiked-cavern.json @@ -78,7 +78,7 @@ }, "enabled": true }, - "place": ["grave/grave"], + "place": ["clutter/grave1"], "translate": { "x": 0, "y": 0, diff --git a/biomes/cave/tropical-cavern.json b/biomes/cave/tropical-cavern.json index 4a410f61..68f6c682 100644 --- a/biomes/cave/tropical-cavern.json +++ b/biomes/cave/tropical-cavern.json @@ -56,7 +56,7 @@ }, "enabled": true }, - "place": ["camp/camp"], + "place": ["clutter/camp1"], "translate": { "x": 0, "y": 0, @@ -75,7 +75,7 @@ }, "enabled": true }, - "place": ["camp/barrel-bin"], + "place": ["clutter/bincluster1"], "translate": { "x": 0, "y": 0, diff --git a/biomes/cave/tundra-cavern.json b/biomes/cave/tundra-cavern.json index 735d350d..608bb683 100644 --- a/biomes/cave/tundra-cavern.json +++ b/biomes/cave/tundra-cavern.json @@ -73,7 +73,7 @@ }, "enabled": true }, - "place": ["grave/grave"], + "place": ["clutter/grave1"], "translate": { "x": 0, "y": 0, diff --git a/biomes/frozen/fzn-beach.json b/biomes/frozen/fzn-beach.json index f0184232..1773dcb4 100644 --- a/biomes/frozen/fzn-beach.json +++ b/biomes/frozen/fzn-beach.json @@ -119,17 +119,17 @@ "ice-spikes/ice-spec-3", "ice-spikes/ice-spec-4", "ice-spikes/ice-spec-5", - "ice-spikes/ic-1", - "ice-spikes/ic-2", - "ice-spikes/ic-3", - "ice-spikes/ic-4", - "ice-spikes/ic-5", - "ice-spikes/ic-6", - "ice-spikes/ic-7", - "ice-spikes/ic-8", - "ice-spikes/ic-9", - "ice-spikes/ic-10", - "ice-spikes/ic-11", + "clutter/icecluster1", + "clutter/icecluster2", + "clutter/icecluster3", + "clutter/icecluster4", + "clutter/icecluster5", + "clutter/icecluster6", + "clutter/icecluster7", + "clutter/icecluster8", + "clutter/icecluster9", + "clutter/icecluster10", + "clutter/icecluster11", "ice-spikes/sp-1", "ice-spikes/sp-2", "ice-spikes/sp-3", diff --git a/biomes/frozen/fzn-mountain-cliffs.json b/biomes/frozen/fzn-mountain-cliffs.json index eb64134f..de053568 100644 --- a/biomes/frozen/fzn-mountain-cliffs.json +++ b/biomes/frozen/fzn-mountain-cliffs.json @@ -193,17 +193,17 @@ "ice-spikes/ice-spec-3", "ice-spikes/ice-spec-4", "ice-spikes/ice-spec-5", - "ice-spikes/ic-1", - "ice-spikes/ic-2", - "ice-spikes/ic-3", - "ice-spikes/ic-4", - "ice-spikes/ic-5", - "ice-spikes/ic-6", - "ice-spikes/ic-7", - "ice-spikes/ic-8", - "ice-spikes/ic-9", - "ice-spikes/ic-10", - "ice-spikes/ic-11", + "clutter/icecluster1", + "clutter/icecluster2", + "clutter/icecluster3", + "clutter/icecluster4", + "clutter/icecluster5", + "clutter/icecluster6", + "clutter/icecluster7", + "clutter/icecluster8", + "clutter/icecluster9", + "clutter/icecluster10", + "clutter/icecluster11", "ice-spikes/sp-1", "ice-spikes/sp-2", "ice-spikes/sp-3", diff --git a/biomes/frozen/fzn-mountains.json b/biomes/frozen/fzn-mountains.json index fc70eb96..76e9e2a8 100644 --- a/biomes/frozen/fzn-mountains.json +++ b/biomes/frozen/fzn-mountains.json @@ -176,17 +176,17 @@ "ice-spikes/ice-spec-3", "ice-spikes/ice-spec-4", "ice-spikes/ice-spec-5", - "ice-spikes/ic-1", - "ice-spikes/ic-2", - "ice-spikes/ic-3", - "ice-spikes/ic-4", - "ice-spikes/ic-5", - "ice-spikes/ic-6", - "ice-spikes/ic-7", - "ice-spikes/ic-8", - "ice-spikes/ic-9", - "ice-spikes/ic-10", - "ice-spikes/ic-11", + "clutter/icecluster1", + "clutter/icecluster2", + "clutter/icecluster3", + "clutter/icecluster4", + "clutter/icecluster5", + "clutter/icecluster6", + "clutter/icecluster7", + "clutter/icecluster8", + "clutter/icecluster9", + "clutter/icecluster10", + "clutter/icecluster11", "ice-spikes/sp-1", "ice-spikes/sp-2", "ice-spikes/sp-3", diff --git a/biomes/frozen/fzn-pines.json b/biomes/frozen/fzn-pines.json index e5a012a1..d4b3ad77 100644 --- a/biomes/frozen/fzn-pines.json +++ b/biomes/frozen/fzn-pines.json @@ -93,17 +93,17 @@ } ], "place": [ - "ice-spikes/ic-1", - "ice-spikes/ic-2", - "ice-spikes/ic-3", - "ice-spikes/ic-4", - "ice-spikes/ic-5", - "ice-spikes/ic-6", - "ice-spikes/ic-7", - "ice-spikes/ic-8", - "ice-spikes/ic-9", - "ice-spikes/ic-10", - "ice-spikes/ic-11", + "clutter/icecluster1", + "clutter/icecluster2", + "clutter/icecluster3", + "clutter/icecluster4", + "clutter/icecluster5", + "clutter/icecluster6", + "clutter/icecluster7", + "clutter/icecluster8", + "clutter/icecluster9", + "clutter/icecluster10", + "clutter/icecluster11", "ice-spikes/sp-1", "ice-spikes/sp-2", "ice-spikes/sp-3", diff --git a/biomes/frozen/fzn-plains.json b/biomes/frozen/fzn-plains.json index d1af028a..a86d99bf 100644 --- a/biomes/frozen/fzn-plains.json +++ b/biomes/frozen/fzn-plains.json @@ -95,7 +95,7 @@ }, "enabled": true }, - "place": ["grave/grave"], + "place": ["clutter/grave1"], "translate": { "x": 0, "y": 0, @@ -146,17 +146,17 @@ "enabled": true }, "place": [ - "ice-spikes/ic-1", - "ice-spikes/ic-2", - "ice-spikes/ic-3", - "ice-spikes/ic-4", - "ice-spikes/ic-5", - "ice-spikes/ic-6", - "ice-spikes/ic-7", - "ice-spikes/ic-8", - "ice-spikes/ic-9", - "ice-spikes/ic-10", - "ice-spikes/ic-11", + "clutter/icecluster1", + "clutter/icecluster2", + "clutter/icecluster3", + "clutter/icecluster4", + "clutter/icecluster5", + "clutter/icecluster6", + "clutter/icecluster7", + "clutter/icecluster8", + "clutter/icecluster9", + "clutter/icecluster10", + "clutter/icecluster11", "ice-spikes/sp-1", "ice-spikes/sp-2", "ice-spikes/sp-3", @@ -218,7 +218,7 @@ }, "enabled": true }, - "place": ["camp/camp"], + "place": ["clutter/camp1"], "translate": { "x": 0, "y": 0, diff --git a/biomes/frozen/fzn-redwood-forest.json b/biomes/frozen/fzn-redwood-forest.json index 82566ab8..1ce618c2 100644 --- a/biomes/frozen/fzn-redwood-forest.json +++ b/biomes/frozen/fzn-redwood-forest.json @@ -81,17 +81,17 @@ "enabled": true }, "place": [ - "ice-spikes/ic-1", - "ice-spikes/ic-2", - "ice-spikes/ic-3", - "ice-spikes/ic-4", - "ice-spikes/ic-5", - "ice-spikes/ic-6", - "ice-spikes/ic-7", - "ice-spikes/ic-8", - "ice-spikes/ic-9", - "ice-spikes/ic-10", - "ice-spikes/ic-11", + "clutter/icecluster1", + "clutter/icecluster2", + "clutter/icecluster3", + "clutter/icecluster4", + "clutter/icecluster5", + "clutter/icecluster6", + "clutter/icecluster7", + "clutter/icecluster8", + "clutter/icecluster9", + "clutter/icecluster10", + "clutter/icecluster11", "ice-spikes/sp-1", "ice-spikes/sp-2", "ice-spikes/sp-3", diff --git a/biomes/hot/hot-desert-dunes-red.json b/biomes/hot/hot-desert-dunes-red.json index 9e9c7c41..82f84f43 100644 --- a/biomes/hot/hot-desert-dunes-red.json +++ b/biomes/hot/hot-desert-dunes-red.json @@ -48,9 +48,9 @@ "chance": 0.001, "density": 3, "place": [ - "clutter/desert-post1", - "clutter/desert-post2", - "clutter/desert-post3" + "clutter/clutter/desertpost1", + "clutter/clutter/desertpost2", + "clutter/clutter/desertpost3" ] }, { diff --git a/biomes/hot/hot-desert-dunes.json b/biomes/hot/hot-desert-dunes.json index bb1f0a33..8bbf5c13 100644 --- a/biomes/hot/hot-desert-dunes.json +++ b/biomes/hot/hot-desert-dunes.json @@ -48,9 +48,9 @@ "chance": 0.001, "density": 3, "place": [ - "clutter/desert-post1", - "clutter/desert-post2", - "clutter/desert-post3" + "clutter/clutter/desertpost1", + "clutter/clutter/desertpost2", + "clutter/clutter/desertpost3" ] }, { diff --git a/biomes/hot/msa-blue.json b/biomes/hot/msa-blue.json index e6676414..368df825 100644 --- a/biomes/hot/msa-blue.json +++ b/biomes/hot/msa-blue.json @@ -79,8 +79,8 @@ "name": "standard-surface-portals", "chance": 0.00505, "place": [ - "global-clutter/BigSwordPortal-unlit-1", - "global-clutter/BigSwordPortal-lit-1", + "clutter/swordnp2", + "clutter/swordnp1", "ruined_portal/giant_portal_1", "ruined_portal/giant_portal_2", "ruined_portal/giant_portal_3", diff --git a/biomes/hot/msa-dark.json b/biomes/hot/msa-dark.json index 670a81c1..4aa60cb5 100644 --- a/biomes/hot/msa-dark.json +++ b/biomes/hot/msa-dark.json @@ -97,8 +97,8 @@ "name": "standard-surface-portals", "chance": 0.00505, "place": [ - "global-clutter/BigSwordPortal-unlit-1", - "global-clutter/BigSwordPortal-lit-1", + "clutter/swordnp2", + "clutter/swordnp1", "ruined_portal/giant_portal_1", "ruined_portal/giant_portal_2", "ruined_portal/giant_portal_3", diff --git a/biomes/hot/msa-green.json b/biomes/hot/msa-green.json index a6d52031..bb32547c 100644 --- a/biomes/hot/msa-green.json +++ b/biomes/hot/msa-green.json @@ -79,8 +79,8 @@ "name": "standard-surface-portals", "chance": 0.00505, "place": [ - "global-clutter/BigSwordPortal-unlit-1", - "global-clutter/BigSwordPortal-lit-1", + "clutter/swordnp2", + "clutter/swordnp1", "ruined_portal/giant_portal_1", "ruined_portal/giant_portal_2", "ruined_portal/giant_portal_3", diff --git a/biomes/hot/msa-red.json b/biomes/hot/msa-red.json index 2addba46..82260047 100644 --- a/biomes/hot/msa-red.json +++ b/biomes/hot/msa-red.json @@ -85,8 +85,8 @@ "name": "standard-surface-portals", "chance": 0.00505, "place": [ - "global-clutter/BigSwordPortal-unlit-1", - "global-clutter/BigSwordPortal-lit-1", + "clutter/swordnp2", + "clutter/swordnp1", "ruined_portal/giant_portal_1", "ruined_portal/giant_portal_2", "ruined_portal/giant_portal_3", diff --git a/biomes/hot/msa-valleys.json b/biomes/hot/msa-valleys.json index 4305b681..a53915da 100644 --- a/biomes/hot/msa-valleys.json +++ b/biomes/hot/msa-valleys.json @@ -171,7 +171,7 @@ }, "enabled": true }, - "place": ["camp/camp"], + "place": ["clutter/camp1"], "translate": { "x": 0, "y": 0, @@ -190,7 +190,7 @@ }, "enabled": true }, - "place": ["camp/barrel-bin"], + "place": ["clutter/bincluster1"], "translate": { "x": 0, "y": 0, diff --git a/biomes/hot/sav-beach.json b/biomes/hot/sav-beach.json index 09182ab8..6ce791c4 100644 --- a/biomes/hot/sav-beach.json +++ b/biomes/hot/sav-beach.json @@ -80,10 +80,10 @@ "enabled": true }, "place": [ - "garbage/clutter-1", - "garbage/clutter-2", - "garbage/clutter-3", - "garbage/clutter-4" + "clutter/literalgarbage1", + "clutter/literalgarbage2", + "clutter/literalgarbage3", + "clutter/literalgarbage4" ], "translate": { "x": 0, diff --git a/biomes/hot/sav-forest.json b/biomes/hot/sav-forest.json index 921a7c86..db71531d 100644 --- a/biomes/hot/sav-forest.json +++ b/biomes/hot/sav-forest.json @@ -142,7 +142,7 @@ }, "enabled": true }, - "place": ["camp/barrel-bin"], + "place": ["clutter/bincluster1"], "translate": { "x": 0, "y": 0, @@ -161,9 +161,9 @@ "enabled": true }, "place": [ - "haybale/hay1", - "haybale/hay3", - "haybale/hay2" + "clutter/hay1", + "clutter/hay3", + "clutter/hay2" ], "translate": { "x": 0, @@ -222,9 +222,9 @@ "enabled": true }, "place": [ - "haybale/hay1", - "haybale/hay3", - "haybale/hay2" + "clutter/hay1", + "clutter/hay3", + "clutter/hay2" ], "translate": { "x": 0, @@ -244,11 +244,11 @@ "enabled": true }, "place": [ - "clutter/oak-clutt-1", - "clutter/oak-clutt-2", - "clutter/oak-clutt-3", - "clutter/oak-clutt-4", - "clutter/oak-clutt-5" + "clutter/oakclutt1", + "clutter/oakclutt2", + "clutter/oakclutt3", + "clutter/oakclutt4", + "clutter/oakclutt5" ], "translate": { "x": 0, diff --git a/biomes/hot/sav-plateau.json b/biomes/hot/sav-plateau.json index 5e6c5103..84a0f477 100644 --- a/biomes/hot/sav-plateau.json +++ b/biomes/hot/sav-plateau.json @@ -111,7 +111,7 @@ }, "enabled": true }, - "place": ["camp/camp"], + "place": ["clutter/camp1"], "translate": { "x": 0, "y": 0, @@ -130,7 +130,7 @@ }, "enabled": true }, - "place": ["camp/barrel-bin"], + "place": ["clutter/bincluster1"], "translate": { "x": 0, "y": 0, diff --git a/biomes/hot/sav-savanna.json b/biomes/hot/sav-savanna.json index 0e407124..57288e4f 100644 --- a/biomes/hot/sav-savanna.json +++ b/biomes/hot/sav-savanna.json @@ -119,7 +119,7 @@ }, "enabled": true }, - "place": ["camp/camp"], + "place": ["clutter/camp1"], "translate": { "x": 0, "y": 0, @@ -138,7 +138,7 @@ }, "enabled": true }, - "place": ["camp/barrel-bin"], + "place": ["clutter/bincluster1"], "translate": { "x": 0, "y": 0, diff --git a/biomes/mountain/mtn-beach.json b/biomes/mountain/mtn-beach.json index 94676aee..9a67bd71 100644 --- a/biomes/mountain/mtn-beach.json +++ b/biomes/mountain/mtn-beach.json @@ -36,7 +36,7 @@ }, "enabled": true }, - "place": ["camp/barrel-bin"], + "place": ["clutter/bincluster1"], "translate": { "x": 0, "y": 0, diff --git a/biomes/mountain/mtn-forest-hills.json b/biomes/mountain/mtn-forest-hills.json index 900acc9e..a3dc0f44 100644 --- a/biomes/mountain/mtn-forest-hills.json +++ b/biomes/mountain/mtn-forest-hills.json @@ -147,27 +147,27 @@ "mode": "PAINT", "chance": 0.1, "place": [ - "bush/small/1", - "bush/small/2", - "bush/small/3" + "clutter/sbush1", + "clutter/sbush2", + "clutter/sbush3" ] }, { "mode": "PAINT", "chance": 0.1, "place": [ - "bush/small/1", - "bush/small/2", - "bush/small/3" + "clutter/sbush1", + "clutter/sbush2", + "clutter/sbush3" ] }, { "mode": "PAINT", "chance": 0.1, "place": [ - "bush/small/1", - "bush/small/2", - "bush/small/3" + "clutter/sbush1", + "clutter/sbush2", + "clutter/sbush3" ] }, { diff --git a/biomes/mountain/mtn-forest.json b/biomes/mountain/mtn-forest.json index 6a54e92b..04f1ffec 100644 --- a/biomes/mountain/mtn-forest.json +++ b/biomes/mountain/mtn-forest.json @@ -146,27 +146,27 @@ "mode": "PAINT", "chance": 0.1, "place": [ - "bush/small/1", - "bush/small/2", - "bush/small/3" + "clutter/sbush1", + "clutter/sbush2", + "clutter/sbush3" ] }, { "mode": "PAINT", "chance": 0.1, "place": [ - "bush/small/1", - "bush/small/2", - "bush/small/3" + "clutter/sbush1", + "clutter/sbush2", + "clutter/sbush3" ] }, { "mode": "PAINT", "chance": 0.1, "place": [ - "bush/small/1", - "bush/small/2", - "bush/small/3" + "clutter/sbush1", + "clutter/sbush2", + "clutter/sbush3" ] }, { diff --git a/biomes/mountain/mtn-hills.json b/biomes/mountain/mtn-hills.json index d6722440..0d79f55b 100644 --- a/biomes/mountain/mtn-hills.json +++ b/biomes/mountain/mtn-hills.json @@ -150,18 +150,18 @@ "mode": "PAINT", "chance": 0.1, "place": [ - "bush/small/1", - "bush/small/2", - "bush/small/3" + "clutter/sbush1", + "clutter/sbush2", + "clutter/sbush3" ] }, { "mode": "PAINT", "chance": 0.1, "place": [ - "bush/small/1", - "bush/small/2", - "bush/small/3" + "clutter/sbush1", + "clutter/sbush2", + "clutter/sbush3" ] }, { @@ -187,9 +187,9 @@ "mode": "PAINT", "chance": 0.1, "place": [ - "bush/small/1", - "bush/small/2", - "bush/small/3" + "clutter/sbush1", + "clutter/sbush2", + "clutter/sbush3" ] }, { diff --git a/biomes/mountain/mtn-plains.json b/biomes/mountain/mtn-plains.json index c997bec1..04a0c84f 100644 --- a/biomes/mountain/mtn-plains.json +++ b/biomes/mountain/mtn-plains.json @@ -158,18 +158,18 @@ "mode": "PAINT", "chance": 0.1, "place": [ - "bush/small/1", - "bush/small/2", - "bush/small/3" + "clutter/sbush1", + "clutter/sbush2", + "clutter/sbush3" ] }, { "mode": "PAINT", "chance": 0.1, "place": [ - "bush/small/1", - "bush/small/2", - "bush/small/3" + "clutter/sbush1", + "clutter/sbush2", + "clutter/sbush3" ] }, { @@ -195,9 +195,9 @@ "mode": "PAINT", "chance": 0.1, "place": [ - "bush/small/1", - "bush/small/2", - "bush/small/3" + "clutter/sbush1", + "clutter/sbush2", + "clutter/sbush3" ] }, { diff --git a/biomes/mushroom/mus-beach.json b/biomes/mushroom/mus-beach.json index c57bd324..9791a048 100644 --- a/biomes/mushroom/mus-beach.json +++ b/biomes/mushroom/mus-beach.json @@ -36,8 +36,8 @@ "name": "standard-surface-portals", "chance": 0.00505, "place": [ - "global-clutter/BigSwordPortal-unlit-1", - "global-clutter/BigSwordPortal-lit-1", + "clutter/swordnp2", + "clutter/swordnp1", "ruined_portal/giant_portal_1", "ruined_portal/giant_portal_2", "ruined_portal/giant_portal_3", diff --git a/biomes/ocean/oce-hot-ocean.json b/biomes/ocean/oce-hot-ocean.json index 69096837..fdd8b037 100644 --- a/biomes/ocean/oce-hot-ocean.json +++ b/biomes/ocean/oce-hot-ocean.json @@ -114,7 +114,7 @@ }], "rotation": {"enabled": false}, "underwater": true, - "place": ["bombs/bomb"], + "place": ["clutter/bomb1"], "translate": { "x": 0, "y": 0, diff --git a/biomes/ocean/oce-mtn-lake.json b/biomes/ocean/oce-mtn-lake.json index a97d649b..7c279778 100644 --- a/biomes/ocean/oce-mtn-lake.json +++ b/biomes/ocean/oce-mtn-lake.json @@ -136,18 +136,18 @@ "mode": "PAINT", "chance": 0.1, "place": [ - "bush/small/1", - "bush/small/2", - "bush/small/3" + "clutter/sbush1", + "clutter/sbush2", + "clutter/sbush3" ] }, { "mode": "PAINT", "chance": 0.1, "place": [ - "bush/small/1", - "bush/small/2", - "bush/small/3" + "clutter/sbush1", + "clutter/sbush2", + "clutter/sbush3" ] }, { @@ -173,9 +173,9 @@ "mode": "PAINT", "chance": 0.1, "place": [ - "bush/small/1", - "bush/small/2", - "bush/small/3" + "clutter/sbush1", + "clutter/sbush2", + "clutter/sbush3" ] }, { diff --git a/biomes/ocean/oce-tro-coral-ocean-cliffs.json b/biomes/ocean/oce-tro-coral-ocean-cliffs.json index 767833a0..09582ce4 100644 --- a/biomes/ocean/oce-tro-coral-ocean-cliffs.json +++ b/biomes/ocean/oce-tro-coral-ocean-cliffs.json @@ -200,13 +200,13 @@ }, "underwater": true, "place": [ - "coral/stonedirtsetter-1", - "coral/stonedirtsetter-2", - "coral/stonedirtsetter-3", - "coral/stonedirtsetter-4", - "coral/stonedirtsetter-5", - "coral/stonedirtsetter-6", - "coral/stonedirtsetter-7" + "clutter/stonedirtsetter1", + "clutter/stonedirtsetter2", + "clutter/stonedirtsetter3", + "clutter/stonedirtsetter4", + "clutter/stonedirtsetter5", + "clutter/stonedirtsetter6", + "clutter/stonedirtsetter7" ], "clamp": {"minimumHeight": 0}, "translate": { @@ -238,13 +238,13 @@ }, "underwater": true, "place": [ - "coral/stonedirtsetter-1", - "coral/stonedirtsetter-2", - "coral/stonedirtsetter-3", - "coral/stonedirtsetter-4", - "coral/stonedirtsetter-5", - "coral/stonedirtsetter-6", - "coral/stonedirtsetter-7" + "clutter/stonedirtsetter1", + "clutter/stonedirtsetter2", + "clutter/stonedirtsetter3", + "clutter/stonedirtsetter4", + "clutter/stonedirtsetter5", + "clutter/stonedirtsetter6", + "clutter/stonedirtsetter7" ], "translate": { "x": 0, @@ -275,13 +275,13 @@ }, "underwater": true, "place": [ - "coral/stonedirtsetter-1", - "coral/stonedirtsetter-2", - "coral/stonedirtsetter-3", - "coral/stonedirtsetter-4", - "coral/stonedirtsetter-5", - "coral/stonedirtsetter-6", - "coral/stonedirtsetter-7" + "clutter/stonedirtsetter1", + "clutter/stonedirtsetter2", + "clutter/stonedirtsetter3", + "clutter/stonedirtsetter4", + "clutter/stonedirtsetter5", + "clutter/stonedirtsetter6", + "clutter/stonedirtsetter7" ], "translate": { "x": 0, @@ -312,13 +312,13 @@ }, "underwater": true, "place": [ - "coral/stonedirtsetter-1", - "coral/stonedirtsetter-2", - "coral/stonedirtsetter-3", - "coral/stonedirtsetter-4", - "coral/stonedirtsetter-5", - "coral/stonedirtsetter-6", - "coral/stonedirtsetter-7" + "clutter/stonedirtsetter1", + "clutter/stonedirtsetter2", + "clutter/stonedirtsetter3", + "clutter/stonedirtsetter4", + "clutter/stonedirtsetter5", + "clutter/stonedirtsetter6", + "clutter/stonedirtsetter7" ], "translate": { "x": 0, @@ -349,13 +349,13 @@ }, "underwater": true, "place": [ - "coral/stonedirtsetter-1", - "coral/stonedirtsetter-2", - "coral/stonedirtsetter-3", - "coral/stonedirtsetter-4", - "coral/stonedirtsetter-5", - "coral/stonedirtsetter-6", - "coral/stonedirtsetter-7" + "clutter/stonedirtsetter1", + "clutter/stonedirtsetter2", + "clutter/stonedirtsetter3", + "clutter/stonedirtsetter4", + "clutter/stonedirtsetter5", + "clutter/stonedirtsetter6", + "clutter/stonedirtsetter7" ], "translate": { "x": 0, @@ -386,13 +386,13 @@ }, "underwater": true, "place": [ - "coral/stonedirtsetter-1", - "coral/stonedirtsetter-2", - "coral/stonedirtsetter-3", - "coral/stonedirtsetter-4", - "coral/stonedirtsetter-5", - "coral/stonedirtsetter-6", - "coral/stonedirtsetter-7" + "clutter/stonedirtsetter1", + "clutter/stonedirtsetter2", + "clutter/stonedirtsetter3", + "clutter/stonedirtsetter4", + "clutter/stonedirtsetter5", + "clutter/stonedirtsetter6", + "clutter/stonedirtsetter7" ], "translate": { "x": 0, @@ -423,13 +423,13 @@ }, "underwater": true, "place": [ - "coral/stonedirtsetter-1", - "coral/stonedirtsetter-2", - "coral/stonedirtsetter-3", - "coral/stonedirtsetter-4", - "coral/stonedirtsetter-5", - "coral/stonedirtsetter-6", - "coral/stonedirtsetter-7" + "clutter/stonedirtsetter1", + "clutter/stonedirtsetter2", + "clutter/stonedirtsetter3", + "clutter/stonedirtsetter4", + "clutter/stonedirtsetter5", + "clutter/stonedirtsetter6", + "clutter/stonedirtsetter7" ], "translate": { "x": 0, @@ -460,13 +460,13 @@ }, "underwater": true, "place": [ - "coral/stonedirtsetter-1", - "coral/stonedirtsetter-2", - "coral/stonedirtsetter-3", - "coral/stonedirtsetter-4", - "coral/stonedirtsetter-5", - "coral/stonedirtsetter-6", - "coral/stonedirtsetter-7" + "clutter/stonedirtsetter1", + "clutter/stonedirtsetter2", + "clutter/stonedirtsetter3", + "clutter/stonedirtsetter4", + "clutter/stonedirtsetter5", + "clutter/stonedirtsetter6", + "clutter/stonedirtsetter7" ], "translate": { "x": 0, @@ -497,13 +497,13 @@ }, "underwater": true, "place": [ - "coral/stonedirtsetter-1", - "coral/stonedirtsetter-2", - "coral/stonedirtsetter-3", - "coral/stonedirtsetter-4", - "coral/stonedirtsetter-5", - "coral/stonedirtsetter-6", - "coral/stonedirtsetter-7" + "clutter/stonedirtsetter1", + "clutter/stonedirtsetter2", + "clutter/stonedirtsetter3", + "clutter/stonedirtsetter4", + "clutter/stonedirtsetter5", + "clutter/stonedirtsetter6", + "clutter/stonedirtsetter7" ], "translate": { "x": 0, @@ -534,13 +534,13 @@ }, "underwater": true, "place": [ - "coral/stonedirtsetter-1", - "coral/stonedirtsetter-2", - "coral/stonedirtsetter-3", - "coral/stonedirtsetter-4", - "coral/stonedirtsetter-5", - "coral/stonedirtsetter-6", - "coral/stonedirtsetter-7" + "clutter/stonedirtsetter1", + "clutter/stonedirtsetter2", + "clutter/stonedirtsetter3", + "clutter/stonedirtsetter4", + "clutter/stonedirtsetter5", + "clutter/stonedirtsetter6", + "clutter/stonedirtsetter7" ], "translate": { "x": 0, @@ -571,13 +571,13 @@ }, "underwater": true, "place": [ - "coral/stonedirtsetter-1", - "coral/stonedirtsetter-2", - "coral/stonedirtsetter-3", - "coral/stonedirtsetter-4", - "coral/stonedirtsetter-5", - "coral/stonedirtsetter-6", - "coral/stonedirtsetter-7" + "clutter/stonedirtsetter1", + "clutter/stonedirtsetter2", + "clutter/stonedirtsetter3", + "clutter/stonedirtsetter4", + "clutter/stonedirtsetter5", + "clutter/stonedirtsetter6", + "clutter/stonedirtsetter7" ], "translate": { "x": 0, @@ -608,13 +608,13 @@ }, "underwater": true, "place": [ - "coral/stonedirtsetter-1", - "coral/stonedirtsetter-2", - "coral/stonedirtsetter-3", - "coral/stonedirtsetter-4", - "coral/stonedirtsetter-5", - "coral/stonedirtsetter-6", - "coral/stonedirtsetter-7" + "clutter/stonedirtsetter1", + "clutter/stonedirtsetter2", + "clutter/stonedirtsetter3", + "clutter/stonedirtsetter4", + "clutter/stonedirtsetter5", + "clutter/stonedirtsetter6", + "clutter/stonedirtsetter7" ], "translate": { "x": 0, @@ -645,13 +645,13 @@ }, "underwater": true, "place": [ - "coral/stonedirtsetter-1", - "coral/stonedirtsetter-2", - "coral/stonedirtsetter-3", - "coral/stonedirtsetter-4", - "coral/stonedirtsetter-5", - "coral/stonedirtsetter-6", - "coral/stonedirtsetter-7" + "clutter/stonedirtsetter1", + "clutter/stonedirtsetter2", + "clutter/stonedirtsetter3", + "clutter/stonedirtsetter4", + "clutter/stonedirtsetter5", + "clutter/stonedirtsetter6", + "clutter/stonedirtsetter7" ], "translate": { "x": 0, @@ -682,13 +682,13 @@ }, "underwater": true, "place": [ - "coral/stonedirtsetter-1", - "coral/stonedirtsetter-2", - "coral/stonedirtsetter-3", - "coral/stonedirtsetter-4", - "coral/stonedirtsetter-5", - "coral/stonedirtsetter-6", - "coral/stonedirtsetter-7" + "clutter/stonedirtsetter1", + "clutter/stonedirtsetter2", + "clutter/stonedirtsetter3", + "clutter/stonedirtsetter4", + "clutter/stonedirtsetter5", + "clutter/stonedirtsetter6", + "clutter/stonedirtsetter7" ], "translate": { "x": 0, @@ -719,13 +719,13 @@ }, "underwater": true, "place": [ - "coral/stonedirtsetter-1", - "coral/stonedirtsetter-2", - "coral/stonedirtsetter-3", - "coral/stonedirtsetter-4", - "coral/stonedirtsetter-5", - "coral/stonedirtsetter-6", - "coral/stonedirtsetter-7" + "clutter/stonedirtsetter1", + "clutter/stonedirtsetter2", + "clutter/stonedirtsetter3", + "clutter/stonedirtsetter4", + "clutter/stonedirtsetter5", + "clutter/stonedirtsetter6", + "clutter/stonedirtsetter7" ], "translate": { "x": 0, @@ -756,13 +756,13 @@ }, "underwater": true, "place": [ - "coral/stonedirtsetter-1", - "coral/stonedirtsetter-2", - "coral/stonedirtsetter-3", - "coral/stonedirtsetter-4", - "coral/stonedirtsetter-5", - "coral/stonedirtsetter-6", - "coral/stonedirtsetter-7" + "clutter/stonedirtsetter1", + "clutter/stonedirtsetter2", + "clutter/stonedirtsetter3", + "clutter/stonedirtsetter4", + "clutter/stonedirtsetter5", + "clutter/stonedirtsetter6", + "clutter/stonedirtsetter7" ], "translate": { "x": 0, @@ -793,13 +793,13 @@ }, "underwater": true, "place": [ - "coral/stonedirtsetter-1", - "coral/stonedirtsetter-2", - "coral/stonedirtsetter-3", - "coral/stonedirtsetter-4", - "coral/stonedirtsetter-5", - "coral/stonedirtsetter-6", - "coral/stonedirtsetter-7" + "clutter/stonedirtsetter1", + "clutter/stonedirtsetter2", + "clutter/stonedirtsetter3", + "clutter/stonedirtsetter4", + "clutter/stonedirtsetter5", + "clutter/stonedirtsetter6", + "clutter/stonedirtsetter7" ], "translate": { "x": 0, @@ -830,13 +830,13 @@ }, "underwater": true, "place": [ - "coral/stonedirtsetter-1", - "coral/stonedirtsetter-2", - "coral/stonedirtsetter-3", - "coral/stonedirtsetter-4", - "coral/stonedirtsetter-5", - "coral/stonedirtsetter-6", - "coral/stonedirtsetter-7" + "clutter/stonedirtsetter1", + "clutter/stonedirtsetter2", + "clutter/stonedirtsetter3", + "clutter/stonedirtsetter4", + "clutter/stonedirtsetter5", + "clutter/stonedirtsetter6", + "clutter/stonedirtsetter7" ], "translate": { "x": 0, @@ -867,13 +867,13 @@ }, "underwater": true, "place": [ - "coral/stonedirtsetter-1", - "coral/stonedirtsetter-2", - "coral/stonedirtsetter-3", - "coral/stonedirtsetter-4", - "coral/stonedirtsetter-5", - "coral/stonedirtsetter-6", - "coral/stonedirtsetter-7" + "clutter/stonedirtsetter1", + "clutter/stonedirtsetter2", + "clutter/stonedirtsetter3", + "clutter/stonedirtsetter4", + "clutter/stonedirtsetter5", + "clutter/stonedirtsetter6", + "clutter/stonedirtsetter7" ], "translate": { "x": 0, @@ -904,13 +904,13 @@ }, "underwater": true, "place": [ - "coral/stonedirtsetter-1", - "coral/stonedirtsetter-2", - "coral/stonedirtsetter-3", - "coral/stonedirtsetter-4", - "coral/stonedirtsetter-5", - "coral/stonedirtsetter-6", - "coral/stonedirtsetter-7" + "clutter/stonedirtsetter1", + "clutter/stonedirtsetter2", + "clutter/stonedirtsetter3", + "clutter/stonedirtsetter4", + "clutter/stonedirtsetter5", + "clutter/stonedirtsetter6", + "clutter/stonedirtsetter7" ], "translate": { "x": 0, @@ -941,13 +941,13 @@ }, "underwater": true, "place": [ - "coral/stonedirtsetter-1", - "coral/stonedirtsetter-2", - "coral/stonedirtsetter-3", - "coral/stonedirtsetter-4", - "coral/stonedirtsetter-5", - "coral/stonedirtsetter-6", - "coral/stonedirtsetter-7" + "clutter/stonedirtsetter1", + "clutter/stonedirtsetter2", + "clutter/stonedirtsetter3", + "clutter/stonedirtsetter4", + "clutter/stonedirtsetter5", + "clutter/stonedirtsetter6", + "clutter/stonedirtsetter7" ], "translate": { "x": 0, @@ -978,13 +978,13 @@ }, "underwater": true, "place": [ - "coral/stonedirtsetter-1", - "coral/stonedirtsetter-2", - "coral/stonedirtsetter-3", - "coral/stonedirtsetter-4", - "coral/stonedirtsetter-5", - "coral/stonedirtsetter-6", - "coral/stonedirtsetter-7" + "clutter/stonedirtsetter1", + "clutter/stonedirtsetter2", + "clutter/stonedirtsetter3", + "clutter/stonedirtsetter4", + "clutter/stonedirtsetter5", + "clutter/stonedirtsetter6", + "clutter/stonedirtsetter7" ], "translate": { "x": 0, @@ -1015,13 +1015,13 @@ }, "underwater": true, "place": [ - "coral/stonedirtsetter-1", - "coral/stonedirtsetter-2", - "coral/stonedirtsetter-3", - "coral/stonedirtsetter-4", - "coral/stonedirtsetter-5", - "coral/stonedirtsetter-6", - "coral/stonedirtsetter-7" + "clutter/stonedirtsetter1", + "clutter/stonedirtsetter2", + "clutter/stonedirtsetter3", + "clutter/stonedirtsetter4", + "clutter/stonedirtsetter5", + "clutter/stonedirtsetter6", + "clutter/stonedirtsetter7" ], "translate": { "x": 0, @@ -1052,13 +1052,13 @@ }, "underwater": true, "place": [ - "coral/stonedirtsetter-1", - "coral/stonedirtsetter-2", - "coral/stonedirtsetter-3", - "coral/stonedirtsetter-4", - "coral/stonedirtsetter-5", - "coral/stonedirtsetter-6", - "coral/stonedirtsetter-7" + "clutter/stonedirtsetter1", + "clutter/stonedirtsetter2", + "clutter/stonedirtsetter3", + "clutter/stonedirtsetter4", + "clutter/stonedirtsetter5", + "clutter/stonedirtsetter6", + "clutter/stonedirtsetter7" ], "translate": { "x": 0, @@ -1089,13 +1089,13 @@ }, "underwater": true, "place": [ - "coral/stonedirtsetter-1", - "coral/stonedirtsetter-2", - "coral/stonedirtsetter-3", - "coral/stonedirtsetter-4", - "coral/stonedirtsetter-5", - "coral/stonedirtsetter-6", - "coral/stonedirtsetter-7" + "clutter/stonedirtsetter1", + "clutter/stonedirtsetter2", + "clutter/stonedirtsetter3", + "clutter/stonedirtsetter4", + "clutter/stonedirtsetter5", + "clutter/stonedirtsetter6", + "clutter/stonedirtsetter7" ], "translate": { "x": 0, diff --git a/biomes/ocean/oce-tro-coral-ocean.json b/biomes/ocean/oce-tro-coral-ocean.json index d9e46936..d8dc0f7a 100644 --- a/biomes/ocean/oce-tro-coral-ocean.json +++ b/biomes/ocean/oce-tro-coral-ocean.json @@ -187,13 +187,13 @@ }, "underwater": true, "place": [ - "coral/stonedirtsetter-1", - "coral/stonedirtsetter-2", - "coral/stonedirtsetter-3", - "coral/stonedirtsetter-4", - "coral/stonedirtsetter-5", - "coral/stonedirtsetter-6", - "coral/stonedirtsetter-7" + "clutter/stonedirtsetter1", + "clutter/stonedirtsetter2", + "clutter/stonedirtsetter3", + "clutter/stonedirtsetter4", + "clutter/stonedirtsetter5", + "clutter/stonedirtsetter6", + "clutter/stonedirtsetter7" ], "clamp": {"minimumHeight": 0}, "translate": { @@ -225,13 +225,13 @@ }, "underwater": true, "place": [ - "coral/stonedirtsetter-1", - "coral/stonedirtsetter-2", - "coral/stonedirtsetter-3", - "coral/stonedirtsetter-4", - "coral/stonedirtsetter-5", - "coral/stonedirtsetter-6", - "coral/stonedirtsetter-7" + "clutter/stonedirtsetter1", + "clutter/stonedirtsetter2", + "clutter/stonedirtsetter3", + "clutter/stonedirtsetter4", + "clutter/stonedirtsetter5", + "clutter/stonedirtsetter6", + "clutter/stonedirtsetter7" ], "translate": { "x": 0, @@ -262,13 +262,13 @@ }, "underwater": true, "place": [ - "coral/stonedirtsetter-1", - "coral/stonedirtsetter-2", - "coral/stonedirtsetter-3", - "coral/stonedirtsetter-4", - "coral/stonedirtsetter-5", - "coral/stonedirtsetter-6", - "coral/stonedirtsetter-7" + "clutter/stonedirtsetter1", + "clutter/stonedirtsetter2", + "clutter/stonedirtsetter3", + "clutter/stonedirtsetter4", + "clutter/stonedirtsetter5", + "clutter/stonedirtsetter6", + "clutter/stonedirtsetter7" ], "translate": { "x": 0, @@ -299,13 +299,13 @@ }, "underwater": true, "place": [ - "coral/stonedirtsetter-1", - "coral/stonedirtsetter-2", - "coral/stonedirtsetter-3", - "coral/stonedirtsetter-4", - "coral/stonedirtsetter-5", - "coral/stonedirtsetter-6", - "coral/stonedirtsetter-7" + "clutter/stonedirtsetter1", + "clutter/stonedirtsetter2", + "clutter/stonedirtsetter3", + "clutter/stonedirtsetter4", + "clutter/stonedirtsetter5", + "clutter/stonedirtsetter6", + "clutter/stonedirtsetter7" ], "translate": { "x": 0, @@ -336,13 +336,13 @@ }, "underwater": true, "place": [ - "coral/stonedirtsetter-1", - "coral/stonedirtsetter-2", - "coral/stonedirtsetter-3", - "coral/stonedirtsetter-4", - "coral/stonedirtsetter-5", - "coral/stonedirtsetter-6", - "coral/stonedirtsetter-7" + "clutter/stonedirtsetter1", + "clutter/stonedirtsetter2", + "clutter/stonedirtsetter3", + "clutter/stonedirtsetter4", + "clutter/stonedirtsetter5", + "clutter/stonedirtsetter6", + "clutter/stonedirtsetter7" ], "translate": { "x": 0, @@ -373,13 +373,13 @@ }, "underwater": true, "place": [ - "coral/stonedirtsetter-1", - "coral/stonedirtsetter-2", - "coral/stonedirtsetter-3", - "coral/stonedirtsetter-4", - "coral/stonedirtsetter-5", - "coral/stonedirtsetter-6", - "coral/stonedirtsetter-7" + "clutter/stonedirtsetter1", + "clutter/stonedirtsetter2", + "clutter/stonedirtsetter3", + "clutter/stonedirtsetter4", + "clutter/stonedirtsetter5", + "clutter/stonedirtsetter6", + "clutter/stonedirtsetter7" ], "translate": { "x": 0, @@ -410,13 +410,13 @@ }, "underwater": true, "place": [ - "coral/stonedirtsetter-1", - "coral/stonedirtsetter-2", - "coral/stonedirtsetter-3", - "coral/stonedirtsetter-4", - "coral/stonedirtsetter-5", - "coral/stonedirtsetter-6", - "coral/stonedirtsetter-7" + "clutter/stonedirtsetter1", + "clutter/stonedirtsetter2", + "clutter/stonedirtsetter3", + "clutter/stonedirtsetter4", + "clutter/stonedirtsetter5", + "clutter/stonedirtsetter6", + "clutter/stonedirtsetter7" ], "translate": { "x": 0, @@ -447,13 +447,13 @@ }, "underwater": true, "place": [ - "coral/stonedirtsetter-1", - "coral/stonedirtsetter-2", - "coral/stonedirtsetter-3", - "coral/stonedirtsetter-4", - "coral/stonedirtsetter-5", - "coral/stonedirtsetter-6", - "coral/stonedirtsetter-7" + "clutter/stonedirtsetter1", + "clutter/stonedirtsetter2", + "clutter/stonedirtsetter3", + "clutter/stonedirtsetter4", + "clutter/stonedirtsetter5", + "clutter/stonedirtsetter6", + "clutter/stonedirtsetter7" ], "translate": { "x": 0, @@ -484,13 +484,13 @@ }, "underwater": true, "place": [ - "coral/stonedirtsetter-1", - "coral/stonedirtsetter-2", - "coral/stonedirtsetter-3", - "coral/stonedirtsetter-4", - "coral/stonedirtsetter-5", - "coral/stonedirtsetter-6", - "coral/stonedirtsetter-7" + "clutter/stonedirtsetter1", + "clutter/stonedirtsetter2", + "clutter/stonedirtsetter3", + "clutter/stonedirtsetter4", + "clutter/stonedirtsetter5", + "clutter/stonedirtsetter6", + "clutter/stonedirtsetter7" ], "translate": { "x": 0, @@ -521,13 +521,13 @@ }, "underwater": true, "place": [ - "coral/stonedirtsetter-1", - "coral/stonedirtsetter-2", - "coral/stonedirtsetter-3", - "coral/stonedirtsetter-4", - "coral/stonedirtsetter-5", - "coral/stonedirtsetter-6", - "coral/stonedirtsetter-7" + "clutter/stonedirtsetter1", + "clutter/stonedirtsetter2", + "clutter/stonedirtsetter3", + "clutter/stonedirtsetter4", + "clutter/stonedirtsetter5", + "clutter/stonedirtsetter6", + "clutter/stonedirtsetter7" ], "translate": { "x": 0, @@ -558,13 +558,13 @@ }, "underwater": true, "place": [ - "coral/stonedirtsetter-1", - "coral/stonedirtsetter-2", - "coral/stonedirtsetter-3", - "coral/stonedirtsetter-4", - "coral/stonedirtsetter-5", - "coral/stonedirtsetter-6", - "coral/stonedirtsetter-7" + "clutter/stonedirtsetter1", + "clutter/stonedirtsetter2", + "clutter/stonedirtsetter3", + "clutter/stonedirtsetter4", + "clutter/stonedirtsetter5", + "clutter/stonedirtsetter6", + "clutter/stonedirtsetter7" ], "translate": { "x": 0, @@ -595,13 +595,13 @@ }, "underwater": true, "place": [ - "coral/stonedirtsetter-1", - "coral/stonedirtsetter-2", - "coral/stonedirtsetter-3", - "coral/stonedirtsetter-4", - "coral/stonedirtsetter-5", - "coral/stonedirtsetter-6", - "coral/stonedirtsetter-7" + "clutter/stonedirtsetter1", + "clutter/stonedirtsetter2", + "clutter/stonedirtsetter3", + "clutter/stonedirtsetter4", + "clutter/stonedirtsetter5", + "clutter/stonedirtsetter6", + "clutter/stonedirtsetter7" ], "translate": { "x": 0, @@ -632,13 +632,13 @@ }, "underwater": true, "place": [ - "coral/stonedirtsetter-1", - "coral/stonedirtsetter-2", - "coral/stonedirtsetter-3", - "coral/stonedirtsetter-4", - "coral/stonedirtsetter-5", - "coral/stonedirtsetter-6", - "coral/stonedirtsetter-7" + "clutter/stonedirtsetter1", + "clutter/stonedirtsetter2", + "clutter/stonedirtsetter3", + "clutter/stonedirtsetter4", + "clutter/stonedirtsetter5", + "clutter/stonedirtsetter6", + "clutter/stonedirtsetter7" ], "translate": { "x": 0, @@ -669,13 +669,13 @@ }, "underwater": true, "place": [ - "coral/stonedirtsetter-1", - "coral/stonedirtsetter-2", - "coral/stonedirtsetter-3", - "coral/stonedirtsetter-4", - "coral/stonedirtsetter-5", - "coral/stonedirtsetter-6", - "coral/stonedirtsetter-7" + "clutter/stonedirtsetter1", + "clutter/stonedirtsetter2", + "clutter/stonedirtsetter3", + "clutter/stonedirtsetter4", + "clutter/stonedirtsetter5", + "clutter/stonedirtsetter6", + "clutter/stonedirtsetter7" ], "translate": { "x": 0, @@ -706,13 +706,13 @@ }, "underwater": true, "place": [ - "coral/stonedirtsetter-1", - "coral/stonedirtsetter-2", - "coral/stonedirtsetter-3", - "coral/stonedirtsetter-4", - "coral/stonedirtsetter-5", - "coral/stonedirtsetter-6", - "coral/stonedirtsetter-7" + "clutter/stonedirtsetter1", + "clutter/stonedirtsetter2", + "clutter/stonedirtsetter3", + "clutter/stonedirtsetter4", + "clutter/stonedirtsetter5", + "clutter/stonedirtsetter6", + "clutter/stonedirtsetter7" ], "translate": { "x": 0, @@ -743,13 +743,13 @@ }, "underwater": true, "place": [ - "coral/stonedirtsetter-1", - "coral/stonedirtsetter-2", - "coral/stonedirtsetter-3", - "coral/stonedirtsetter-4", - "coral/stonedirtsetter-5", - "coral/stonedirtsetter-6", - "coral/stonedirtsetter-7" + "clutter/stonedirtsetter1", + "clutter/stonedirtsetter2", + "clutter/stonedirtsetter3", + "clutter/stonedirtsetter4", + "clutter/stonedirtsetter5", + "clutter/stonedirtsetter6", + "clutter/stonedirtsetter7" ], "translate": { "x": 0, @@ -780,13 +780,13 @@ }, "underwater": true, "place": [ - "coral/stonedirtsetter-1", - "coral/stonedirtsetter-2", - "coral/stonedirtsetter-3", - "coral/stonedirtsetter-4", - "coral/stonedirtsetter-5", - "coral/stonedirtsetter-6", - "coral/stonedirtsetter-7" + "clutter/stonedirtsetter1", + "clutter/stonedirtsetter2", + "clutter/stonedirtsetter3", + "clutter/stonedirtsetter4", + "clutter/stonedirtsetter5", + "clutter/stonedirtsetter6", + "clutter/stonedirtsetter7" ], "translate": { "x": 0, @@ -817,13 +817,13 @@ }, "underwater": true, "place": [ - "coral/stonedirtsetter-1", - "coral/stonedirtsetter-2", - "coral/stonedirtsetter-3", - "coral/stonedirtsetter-4", - "coral/stonedirtsetter-5", - "coral/stonedirtsetter-6", - "coral/stonedirtsetter-7" + "clutter/stonedirtsetter1", + "clutter/stonedirtsetter2", + "clutter/stonedirtsetter3", + "clutter/stonedirtsetter4", + "clutter/stonedirtsetter5", + "clutter/stonedirtsetter6", + "clutter/stonedirtsetter7" ], "translate": { "x": 0, @@ -854,13 +854,13 @@ }, "underwater": true, "place": [ - "coral/stonedirtsetter-1", - "coral/stonedirtsetter-2", - "coral/stonedirtsetter-3", - "coral/stonedirtsetter-4", - "coral/stonedirtsetter-5", - "coral/stonedirtsetter-6", - "coral/stonedirtsetter-7" + "clutter/stonedirtsetter1", + "clutter/stonedirtsetter2", + "clutter/stonedirtsetter3", + "clutter/stonedirtsetter4", + "clutter/stonedirtsetter5", + "clutter/stonedirtsetter6", + "clutter/stonedirtsetter7" ], "translate": { "x": 0, @@ -891,13 +891,13 @@ }, "underwater": true, "place": [ - "coral/stonedirtsetter-1", - "coral/stonedirtsetter-2", - "coral/stonedirtsetter-3", - "coral/stonedirtsetter-4", - "coral/stonedirtsetter-5", - "coral/stonedirtsetter-6", - "coral/stonedirtsetter-7" + "clutter/stonedirtsetter1", + "clutter/stonedirtsetter2", + "clutter/stonedirtsetter3", + "clutter/stonedirtsetter4", + "clutter/stonedirtsetter5", + "clutter/stonedirtsetter6", + "clutter/stonedirtsetter7" ], "translate": { "x": 0, @@ -928,13 +928,13 @@ }, "underwater": true, "place": [ - "coral/stonedirtsetter-1", - "coral/stonedirtsetter-2", - "coral/stonedirtsetter-3", - "coral/stonedirtsetter-4", - "coral/stonedirtsetter-5", - "coral/stonedirtsetter-6", - "coral/stonedirtsetter-7" + "clutter/stonedirtsetter1", + "clutter/stonedirtsetter2", + "clutter/stonedirtsetter3", + "clutter/stonedirtsetter4", + "clutter/stonedirtsetter5", + "clutter/stonedirtsetter6", + "clutter/stonedirtsetter7" ], "translate": { "x": 0, @@ -965,13 +965,13 @@ }, "underwater": true, "place": [ - "coral/stonedirtsetter-1", - "coral/stonedirtsetter-2", - "coral/stonedirtsetter-3", - "coral/stonedirtsetter-4", - "coral/stonedirtsetter-5", - "coral/stonedirtsetter-6", - "coral/stonedirtsetter-7" + "clutter/stonedirtsetter1", + "clutter/stonedirtsetter2", + "clutter/stonedirtsetter3", + "clutter/stonedirtsetter4", + "clutter/stonedirtsetter5", + "clutter/stonedirtsetter6", + "clutter/stonedirtsetter7" ], "translate": { "x": 0, @@ -1002,13 +1002,13 @@ }, "underwater": true, "place": [ - "coral/stonedirtsetter-1", - "coral/stonedirtsetter-2", - "coral/stonedirtsetter-3", - "coral/stonedirtsetter-4", - "coral/stonedirtsetter-5", - "coral/stonedirtsetter-6", - "coral/stonedirtsetter-7" + "clutter/stonedirtsetter1", + "clutter/stonedirtsetter2", + "clutter/stonedirtsetter3", + "clutter/stonedirtsetter4", + "clutter/stonedirtsetter5", + "clutter/stonedirtsetter6", + "clutter/stonedirtsetter7" ], "translate": { "x": 0, @@ -1039,13 +1039,13 @@ }, "underwater": true, "place": [ - "coral/stonedirtsetter-1", - "coral/stonedirtsetter-2", - "coral/stonedirtsetter-3", - "coral/stonedirtsetter-4", - "coral/stonedirtsetter-5", - "coral/stonedirtsetter-6", - "coral/stonedirtsetter-7" + "clutter/stonedirtsetter1", + "clutter/stonedirtsetter2", + "clutter/stonedirtsetter3", + "clutter/stonedirtsetter4", + "clutter/stonedirtsetter5", + "clutter/stonedirtsetter6", + "clutter/stonedirtsetter7" ], "translate": { "x": 0, @@ -1076,13 +1076,13 @@ }, "underwater": true, "place": [ - "coral/stonedirtsetter-1", - "coral/stonedirtsetter-2", - "coral/stonedirtsetter-3", - "coral/stonedirtsetter-4", - "coral/stonedirtsetter-5", - "coral/stonedirtsetter-6", - "coral/stonedirtsetter-7" + "clutter/stonedirtsetter1", + "clutter/stonedirtsetter2", + "clutter/stonedirtsetter3", + "clutter/stonedirtsetter4", + "clutter/stonedirtsetter5", + "clutter/stonedirtsetter6", + "clutter/stonedirtsetter7" ], "translate": { "x": 0, diff --git a/biomes/ocean/oce-tro-river-soft.json b/biomes/ocean/oce-tro-river-soft.json index 8b069f2b..7995ac95 100644 --- a/biomes/ocean/oce-tro-river-soft.json +++ b/biomes/ocean/oce-tro-river-soft.json @@ -58,18 +58,18 @@ "objects": [ { "place": [ - "coral/coral-pink-1", - "coral/coral-pink-2", - "coral/coral-pink-3", - "coral/coral-pink-4", - "coral/coral-purp-1", - "coral/coral-purp-2", - "coral/coral-purp-3", - "coral/coral-red-1", - "coral/coral-by-1", - "coral/coral-by-2", - "coral/coral-by-3", - "coral/coral-by-4" + "clutter/coralpink1", + "clutter/coralpink2", + "clutter/coralpink3", + "clutter/coralpink4", + "clutter/coralpurp1", + "clutter/coralpurp2", + "clutter/coralpurp3", + "clutter/coralred1", + "clutter/coralby1", + "clutter/coralby2", + "clutter/coralby3", + "clutter/coralby4" ], "chance": 1, "density": 2, @@ -87,13 +87,13 @@ }, { "place": [ - "coral/stonedirtsetter-1", - "coral/stonedirtsetter-2", - "coral/stonedirtsetter-3", - "coral/stonedirtsetter-4", - "coral/stonedirtsetter-5", - "coral/stonedirtsetter-6", - "coral/stonedirtsetter-7" + "clutter/stonedirtsetter1", + "clutter/stonedirtsetter2", + "clutter/stonedirtsetter3", + "clutter/stonedirtsetter4", + "clutter/stonedirtsetter5", + "clutter/stonedirtsetter6", + "clutter/stonedirtsetter7" ], "chance": 0.5, "density": 2, diff --git a/biomes/ocean/oce-warm-bottom.json b/biomes/ocean/oce-warm-bottom.json index 7cf3ab26..4028ef87 100644 --- a/biomes/ocean/oce-warm-bottom.json +++ b/biomes/ocean/oce-warm-bottom.json @@ -67,18 +67,18 @@ "objects": [ { "place": [ - "coral/coral-pink-1", - "coral/coral-pink-2", - "coral/coral-pink-3", - "coral/coral-pink-4", - "coral/coral-purp-1", - "coral/coral-purp-2", - "coral/coral-purp-3", - "coral/coral-red-1", - "coral/coral-by-1", - "coral/coral-by-2", - "coral/coral-by-3", - "coral/coral-by-4" + "clutter/coralpink1", + "clutter/coralpink2", + "clutter/coralpink3", + "clutter/coralpink4", + "clutter/coralpurp1", + "clutter/coralpurp2", + "clutter/coralpurp3", + "clutter/coralred1", + "clutter/coralby1", + "clutter/coralby2", + "clutter/coralby3", + "clutter/coralby4" ], "chance": 1, "underwater": true, @@ -95,13 +95,13 @@ }, { "place": [ - "coral/stonedirtsetter-1", - "coral/stonedirtsetter-2", - "coral/stonedirtsetter-3", - "coral/stonedirtsetter-4", - "coral/stonedirtsetter-5", - "coral/stonedirtsetter-6", - "coral/stonedirtsetter-7" + "clutter/stonedirtsetter1", + "clutter/stonedirtsetter2", + "clutter/stonedirtsetter3", + "clutter/stonedirtsetter4", + "clutter/stonedirtsetter5", + "clutter/stonedirtsetter6", + "clutter/stonedirtsetter7" ], "chance": 1, "density": 8, diff --git a/biomes/ocean/oce-warm.json b/biomes/ocean/oce-warm.json index 4b240cd8..020c25e6 100644 --- a/biomes/ocean/oce-warm.json +++ b/biomes/ocean/oce-warm.json @@ -61,18 +61,18 @@ "objects": [ { "place": [ - "coral/coral-pink-1", - "coral/coral-pink-2", - "coral/coral-pink-3", - "coral/coral-pink-4", - "coral/coral-purp-1", - "coral/coral-purp-2", - "coral/coral-purp-3", - "coral/coral-red-1", - "coral/coral-by-1", - "coral/coral-by-2", - "coral/coral-by-3", - "coral/coral-by-4" + "clutter/coralpink1", + "clutter/coralpink2", + "clutter/coralpink3", + "clutter/coralpink4", + "clutter/coralpurp1", + "clutter/coralpurp2", + "clutter/coralpurp3", + "clutter/coralred1", + "clutter/coralby1", + "clutter/coralby2", + "clutter/coralby3", + "clutter/coralby4" ], "chance": 1, "density": 2, @@ -90,13 +90,13 @@ }, { "place": [ - "coral/stonedirtsetter-1", - "coral/stonedirtsetter-2", - "coral/stonedirtsetter-3", - "coral/stonedirtsetter-4", - "coral/stonedirtsetter-5", - "coral/stonedirtsetter-6", - "coral/stonedirtsetter-7" + "clutter/stonedirtsetter1", + "clutter/stonedirtsetter2", + "clutter/stonedirtsetter3", + "clutter/stonedirtsetter4", + "clutter/stonedirtsetter5", + "clutter/stonedirtsetter6", + "clutter/stonedirtsetter7" ], "chance": 0.5, "density": 2, diff --git a/biomes/swamp/swa-denmyre.json b/biomes/swamp/swa-denmyre.json index 97e29f6a..d88c6ca4 100644 --- a/biomes/swamp/swa-denmyre.json +++ b/biomes/swamp/swa-denmyre.json @@ -104,7 +104,7 @@ }, "enabled": true }, - "place": ["camp/barrel-bin"], + "place": ["clutter/bincluster1"], "translate": { "x": 0, "y": 0, @@ -221,16 +221,16 @@ "enabled": true }, "place": [ - "denmyre/oak-denmyre-clutter-1", - "denmyre/oak-denmyre-clutter-2", - "denmyre/oak-denmyre-clutter-3", - "denmyre/oak-denmyre-clutter-4", - "denmyre/oak-denmyre-clutter-5", - "denmyre/oak-denmyre-clutter-6", - "denmyre/oak-denmyre-clutter-7", - "denmyre/oak-denmyre-clutter-8", - "denmyre/oak-denmyre-clutter-9", - "denmyre/oak-denmyre-clutter-10" + "denmyre/clutter/oakdenclutt1", + "denmyre/clutter/oakdenclutt2", + "denmyre/clutter/oakdenclutt3", + "denmyre/clutter/oakdenclutt4", + "denmyre/clutter/oakdenclutt5", + "denmyre/clutter/oakdenclutt6", + "denmyre/clutter/oakdenclutt7", + "denmyre/clutter/oakdenclutt8", + "denmyre/clutter/oakdenclutt9", + "denmyre/clutter/oakdenclutt10" ], "translate": { "x": 0, diff --git a/biomes/swamp/swa-lake.json b/biomes/swamp/swa-lake.json index 44043283..e176c6b1 100644 --- a/biomes/swamp/swa-lake.json +++ b/biomes/swamp/swa-lake.json @@ -92,9 +92,9 @@ "enabled": true }, "place": [ - "clutter/oak-clutt-1", - "clutter/oak-clutt-2", - "clutter/oak-clutt-3" + "clutter/oakclutt1", + "clutter/oakclutt2", + "clutter/oakclutt3" ], "translate": { "x": 0, diff --git a/biomes/swamp/swa-marsh.json b/biomes/swamp/swa-marsh.json index 1e322b06..0b4e0933 100644 --- a/biomes/swamp/swa-marsh.json +++ b/biomes/swamp/swa-marsh.json @@ -133,9 +133,9 @@ "enabled": true }, "place": [ - "clutter/oak-clutt-1", - "clutter/oak-clutt-2", - "clutter/oak-clutt-3" + "clutter/oakclutt1", + "clutter/oakclutt2", + "clutter/oakclutt3" ], "translate": { "x": 0, diff --git a/biomes/swamp/swa-roofed-forest.json b/biomes/swamp/swa-roofed-forest.json index 397191cd..22cd3c31 100644 --- a/biomes/swamp/swa-roofed-forest.json +++ b/biomes/swamp/swa-roofed-forest.json @@ -355,11 +355,11 @@ "enabled": true }, "place": [ - "clutter/oak-clutt-1", - "clutter/oak-clutt-2", - "clutter/oak-clutt-3", - "clutter/oak-clutt-4", - "clutter/oak-clutt-5" + "clutter/oakclutt1", + "clutter/oakclutt2", + "clutter/oakclutt3", + "clutter/oakclutt4", + "clutter/oakclutt5" ], "translate": { "x": 0, diff --git a/biomes/swamp/swa-roofed-wayward.json b/biomes/swamp/swa-roofed-wayward.json index cd927702..00dfb1a9 100644 --- a/biomes/swamp/swa-roofed-wayward.json +++ b/biomes/swamp/swa-roofed-wayward.json @@ -343,11 +343,11 @@ "enabled": true }, "place": [ - "clutter/oak-clutt-1", - "clutter/oak-clutt-2", - "clutter/oak-clutt-3", - "clutter/oak-clutt-4", - "clutter/oak-clutt-5" + "clutter/oakclutt1", + "clutter/oakclutt2", + "clutter/oakclutt3", + "clutter/oakclutt4", + "clutter/oakclutt5" ], "translate": { "x": 0, diff --git a/biomes/swamp/swa-willow-forest.json b/biomes/swamp/swa-willow-forest.json index 317ad15b..a83c0c05 100644 --- a/biomes/swamp/swa-willow-forest.json +++ b/biomes/swamp/swa-willow-forest.json @@ -261,11 +261,11 @@ "enabled": true }, "place": [ - "clutter/oak-clutt-1", - "clutter/oak-clutt-2", - "clutter/oak-clutt-3", - "clutter/oak-clutt-4", - "clutter/oak-clutt-5" + "clutter/oakclutt1", + "clutter/oakclutt2", + "clutter/oakclutt3", + "clutter/oakclutt4", + "clutter/oakclutt5" ], "translate": { "x": 0, diff --git a/biomes/temperate/tem-beach.json b/biomes/temperate/tem-beach.json index 90009253..c5544572 100644 --- a/biomes/temperate/tem-beach.json +++ b/biomes/temperate/tem-beach.json @@ -73,7 +73,7 @@ }, "enabled": true }, - "place": ["camp/barrel-bin"], + "place": ["clutter/bincluster1"], "translate": { "x": 0, "y": 0, diff --git a/biomes/temperate/tem-birch-denmyre.json b/biomes/temperate/tem-birch-denmyre.json index 7b9614c3..5152d6b5 100644 --- a/biomes/temperate/tem-birch-denmyre.json +++ b/biomes/temperate/tem-birch-denmyre.json @@ -104,7 +104,7 @@ }, "enabled": true }, - "place": ["camp/barrel-bin"], + "place": ["clutter/bincluster1"], "translate": { "x": 0, "y": 0, @@ -123,7 +123,7 @@ }, "enabled": true }, - "place": ["camp/camp"], + "place": ["clutter/camp1"], "translate": { "x": 0, "y": 0, @@ -214,16 +214,16 @@ "enabled": true }, "place": [ - "denmyre/oak-denmyre-clutter-1", - "denmyre/oak-denmyre-clutter-2", - "denmyre/oak-denmyre-clutter-3", - "denmyre/oak-denmyre-clutter-4", - "denmyre/oak-denmyre-clutter-5", - "denmyre/oak-denmyre-clutter-6", - "denmyre/oak-denmyre-clutter-7", - "denmyre/oak-denmyre-clutter-8", - "denmyre/oak-denmyre-clutter-9", - "denmyre/oak-denmyre-clutter-10" + "denmyre/clutter/oakdenclutt1", + "denmyre/clutter/oakdenclutt2", + "denmyre/clutter/oakdenclutt3", + "denmyre/clutter/oakdenclutt4", + "denmyre/clutter/oakdenclutt5", + "denmyre/clutter/oakdenclutt6", + "denmyre/clutter/oakdenclutt7", + "denmyre/clutter/oakdenclutt8", + "denmyre/clutter/oakdenclutt9", + "denmyre/clutter/oakdenclutt10" ], "translate": { "x": 0, diff --git a/biomes/temperate/tem-birch-forest.json b/biomes/temperate/tem-birch-forest.json index 6f1c8879..cc153c72 100644 --- a/biomes/temperate/tem-birch-forest.json +++ b/biomes/temperate/tem-birch-forest.json @@ -76,7 +76,7 @@ }, "enabled": true }, - "place": ["camp/barrel-bin"], + "place": ["clutter/bincluster1"], "translate": { "x": 0, "y": 0, @@ -95,7 +95,7 @@ }, "enabled": true }, - "place": ["camp/camp"], + "place": ["clutter/camp1"], "translate": { "x": 0, "y": 0, diff --git a/biomes/temperate/tem-flower-forest.json b/biomes/temperate/tem-flower-forest.json index 3a333e3e..37616338 100644 --- a/biomes/temperate/tem-flower-forest.json +++ b/biomes/temperate/tem-flower-forest.json @@ -118,7 +118,7 @@ }, "enabled": true }, - "place": ["camp/camp"], + "place": ["clutter/camp1"], "translate": { "x": 0, "y": 0, @@ -137,7 +137,7 @@ }, "enabled": true }, - "place": ["bee/hive"], + "place": ["clutter/bee/hive1"], "translate": { "x": 0, "y": 0, @@ -335,10 +335,10 @@ "enabled": true }, "place": [ - "garbage/clutter-1", - "garbage/clutter-2", - "garbage/clutter-3", - "garbage/clutter-4" + "clutter/literalgarbage1", + "clutter/literalgarbage2", + "clutter/literalgarbage3", + "clutter/literalgarbage4" ], "translate": { "x": 0, @@ -359,13 +359,13 @@ "enabled": true }, "place": [ - "clutter/stone-clutt-1", - "clutter/stone-clutt-2", - "clutter/stone-clutt-3", - "clutter/stone-clutt-4", - "clutter/stone-clutt-5", - "clutter/stone-clutt-6", - "clutter/stone-clutt-7", + "clutter/stoneclutt1", + "clutter/stoneclutt2", + "clutter/stoneclutt3", + "clutter/stoneclutt4", + "clutter/stoneclutt5", + "clutter/stoneclutt6", + "clutter/stoneclutt7", "boulder/boulder1", "boulder/boulder2", "boulder/boulder4", diff --git a/biomes/temperate/tem-highlands.json b/biomes/temperate/tem-highlands.json index 4fcb3cb9..58b5c56e 100644 --- a/biomes/temperate/tem-highlands.json +++ b/biomes/temperate/tem-highlands.json @@ -122,16 +122,16 @@ "enabled": true }, "place": [ - "clutter/oak-clutt-1", - "clutter/oak-clutt-2", - "clutter/oak-clutt-3", - "clutter/oak-clutt-4", - "clutter/oak-clutt-5", - "clutter/birch-clutt-1", - "clutter/birch-clutt-2", - "clutter/birch-clutt-3", - "clutter/birch-clutt-4", - "clutter/birch-clutt-5" + "clutter/oakclutt1", + "clutter/oakclutt2", + "clutter/oakclutt3", + "clutter/oakclutt4", + "clutter/oakclutt5", + "clutter/birchclutt1", + "clutter/birchclutt2", + "clutter/birchclutt3", + "clutter/birchclutt4", + "clutter/birchclutt5" ], "translate": { "x": 0, diff --git a/biomes/temperate/tem-longtree-forest.json b/biomes/temperate/tem-longtree-forest.json index 3a81368e..5dfba912 100644 --- a/biomes/temperate/tem-longtree-forest.json +++ b/biomes/temperate/tem-longtree-forest.json @@ -266,13 +266,13 @@ "enabled": true }, "place": [ - "clutter/stone-clutt-1", - "clutter/stone-clutt-2", - "clutter/stone-clutt-3", - "clutter/stone-clutt-4", - "clutter/stone-clutt-5", - "clutter/stone-clutt-6", - "clutter/stone-clutt-7", + "clutter/stoneclutt1", + "clutter/stoneclutt2", + "clutter/stoneclutt3", + "clutter/stoneclutt4", + "clutter/stoneclutt5", + "clutter/stoneclutt6", + "clutter/stoneclutt7", "boulder/boulder1", "boulder/boulder2", "boulder/boulder4", @@ -299,7 +299,7 @@ }, "enabled": true }, - "place": ["camp/camp"], + "place": ["clutter/camp1"], "translate": { "x": 0, "y": 0, @@ -330,8 +330,8 @@ }, { "place": [ - "bush/small/1", - "bush/small/2" + "clutter/sbush1", + "clutter/sbush2" ], "chance": 0.3, "density": 2, diff --git a/biomes/temperate/tem-oak-beach.json b/biomes/temperate/tem-oak-beach.json index 478d1586..0dc4cdde 100644 --- a/biomes/temperate/tem-oak-beach.json +++ b/biomes/temperate/tem-oak-beach.json @@ -84,10 +84,10 @@ "enabled": true }, "place": [ - "garbage/clutter-1", - "garbage/clutter-2", - "garbage/clutter-3", - "garbage/clutter-4" + "clutter/literalgarbage1", + "clutter/literalgarbage2", + "clutter/literalgarbage3", + "clutter/literalgarbage4" ], "translate": { "x": 0, diff --git a/biomes/temperate/tem-oak-denmyre.json b/biomes/temperate/tem-oak-denmyre.json index d2f3030a..d2e9b1b1 100644 --- a/biomes/temperate/tem-oak-denmyre.json +++ b/biomes/temperate/tem-oak-denmyre.json @@ -128,7 +128,7 @@ }, "enabled": true }, - "place": ["camp/camp"], + "place": ["clutter/camp1"], "translate": { "x": 0, "y": 0, @@ -219,16 +219,16 @@ "enabled": true }, "place": [ - "denmyre/oak-denmyre-clutter-1", - "denmyre/oak-denmyre-clutter-2", - "denmyre/oak-denmyre-clutter-3", - "denmyre/oak-denmyre-clutter-4", - "denmyre/oak-denmyre-clutter-5", - "denmyre/oak-denmyre-clutter-6", - "denmyre/oak-denmyre-clutter-7", - "denmyre/oak-denmyre-clutter-8", - "denmyre/oak-denmyre-clutter-9", - "denmyre/oak-denmyre-clutter-10" + "denmyre/clutter/oakdenclutt1", + "denmyre/clutter/oakdenclutt2", + "denmyre/clutter/oakdenclutt3", + "denmyre/clutter/oakdenclutt4", + "denmyre/clutter/oakdenclutt5", + "denmyre/clutter/oakdenclutt6", + "denmyre/clutter/oakdenclutt7", + "denmyre/clutter/oakdenclutt8", + "denmyre/clutter/oakdenclutt9", + "denmyre/clutter/oakdenclutt10" ], "translate": { "x": 0, diff --git a/biomes/temperate/tem-oak-forest.json b/biomes/temperate/tem-oak-forest.json index 160043d2..d205b908 100644 --- a/biomes/temperate/tem-oak-forest.json +++ b/biomes/temperate/tem-oak-forest.json @@ -103,10 +103,10 @@ "enabled": true }, "place": [ - "camp/camp", - "camp/camp4", - "camp/camp5", - "camp/camp3" + "clutter/camp1", + "clutter/camp4", + "clutter/camp5", + "clutter/camp3" ], "translate": { "x": 0, @@ -224,10 +224,10 @@ "enabled": true }, "place": [ - "garbage/clutter-1", - "garbage/clutter-2", - "garbage/clutter-3", - "garbage/clutter-4" + "clutter/literalgarbage1", + "clutter/literalgarbage2", + "clutter/literalgarbage3", + "clutter/literalgarbage4" ], "translate": { "x": 0, diff --git a/biomes/temperate/tem-oak-hills.json b/biomes/temperate/tem-oak-hills.json index 82cd0895..8121e854 100644 --- a/biomes/temperate/tem-oak-hills.json +++ b/biomes/temperate/tem-oak-hills.json @@ -211,9 +211,9 @@ }, { "place": [ - "bush/small/1", - "bush/small/2", - "bush/small/3" + "clutter/sbush1", + "clutter/sbush2", + "clutter/sbush3" ], "chance": 0.6, "rotation": { diff --git a/biomes/temperate/tem-oak.json b/biomes/temperate/tem-oak.json index 42d55543..3b19116f 100644 --- a/biomes/temperate/tem-oak.json +++ b/biomes/temperate/tem-oak.json @@ -205,9 +205,9 @@ }, { "place": [ - "bush/small/1", - "bush/small/2", - "bush/small/3" + "clutter/sbush1", + "clutter/sbush2", + "clutter/sbush3" ], "chance": 0.6, "rotation": { diff --git a/biomes/temperate/tem-plains.json b/biomes/temperate/tem-plains.json index 61ee2d44..36a34570 100644 --- a/biomes/temperate/tem-plains.json +++ b/biomes/temperate/tem-plains.json @@ -138,10 +138,10 @@ "enabled": true }, "place": [ - "camp/camp", - "camp/camp3", - "camp/camp4", - "camp/camp5" + "clutter/camp1", + "clutter/camp3", + "clutter/camp4", + "clutter/camp5" ], "translate": { "x": 0, @@ -161,7 +161,7 @@ }, "enabled": true }, - "place": ["camp/camp2"], + "place": ["clutter/camp2"], "translate": { "x": 0, "y": 0, @@ -180,7 +180,7 @@ }, "enabled": true }, - "place": ["camp/camp2"], + "place": ["clutter/camp2"], "translate": { "x": 0, "y": 0, diff --git a/biomes/temperate/tem-plateau.json b/biomes/temperate/tem-plateau.json index 028bbee0..b13afbbf 100644 --- a/biomes/temperate/tem-plateau.json +++ b/biomes/temperate/tem-plateau.json @@ -69,8 +69,8 @@ "name": "standard-surface-portals", "chance": 0.005, "place": [ - "global-clutter/BigSwordPortal-unlit-1", - "global-clutter/BigSwordPortal-lit-1", + "clutter/swordnp2", + "clutter/swordnp1", "ruined_portal/giant_portal_1", "ruined_portal/giant_portal_2", "ruined_portal/giant_portal_3", @@ -158,7 +158,7 @@ }, "enabled": true }, - "place": ["camp/camp"], + "place": ["clutter/camp1"], "translate": { "x": 0, "y": 0, @@ -276,10 +276,10 @@ "enabled": true }, "place": [ - "garbage/clutter-1", - "garbage/clutter-2", - "garbage/clutter-3", - "garbage/clutter-4" + "clutter/literalgarbage1", + "clutter/literalgarbage2", + "clutter/literalgarbage3", + "clutter/literalgarbage4" ], "translate": { "x": 0, diff --git a/biomes/temperate/tem-sakura-pink-child.json b/biomes/temperate/tem-sakura-pink-child.json index 36bbf3fa..19cb9935 100644 --- a/biomes/temperate/tem-sakura-pink-child.json +++ b/biomes/temperate/tem-sakura-pink-child.json @@ -98,10 +98,10 @@ "enabled": true }, "place": [ - "camp/camp", - "camp/camp4", - "camp/camp5", - "camp/camp3" + "clutter/camp1", + "clutter/camp4", + "clutter/camp5", + "clutter/camp3" ], "translate": { "x": 0, @@ -179,10 +179,10 @@ } ], "place": [ - "garbage/clutter-1", - "garbage/clutter-2", - "garbage/clutter-3", - "garbage/clutter-4" + "clutter/literalgarbage1", + "clutter/literalgarbage2", + "clutter/literalgarbage3", + "clutter/literalgarbage4" ], "translate": { "x": 0, diff --git a/biomes/temperate/tem-sakura-pink-forest.json b/biomes/temperate/tem-sakura-pink-forest.json index 38aa8d4e..139ffb01 100644 --- a/biomes/temperate/tem-sakura-pink-forest.json +++ b/biomes/temperate/tem-sakura-pink-forest.json @@ -112,10 +112,10 @@ "enabled": true }, "place": [ - "camp/camp", - "camp/camp4", - "camp/camp5", - "camp/camp3" + "clutter/camp1", + "clutter/camp4", + "clutter/camp5", + "clutter/camp3" ], "translate": { "x": 0, @@ -187,10 +187,10 @@ "enabled": true }, "place": [ - "garbage/clutter-1", - "garbage/clutter-2", - "garbage/clutter-3", - "garbage/clutter-4" + "clutter/literalgarbage1", + "clutter/literalgarbage2", + "clutter/literalgarbage3", + "clutter/literalgarbage4" ], "translate": { "x": 0, diff --git a/biomes/temperate/tem-stranged-plains.json b/biomes/temperate/tem-stranged-plains.json index d1538a79..1de632ba 100644 --- a/biomes/temperate/tem-stranged-plains.json +++ b/biomes/temperate/tem-stranged-plains.json @@ -78,10 +78,10 @@ "enabled": true }, "place": [ - "camp/camp", - "camp/camp3", - "camp/camp4", - "camp/camp5" + "clutter/camp1", + "clutter/camp3", + "clutter/camp4", + "clutter/camp5" ] }, { diff --git a/biomes/temperate/tem-wilds.json b/biomes/temperate/tem-wilds.json index d2c701dd..93d277db 100644 --- a/biomes/temperate/tem-wilds.json +++ b/biomes/temperate/tem-wilds.json @@ -138,8 +138,8 @@ "enabled": true }, "place": [ - "camp/camp", - "camp/barrel-bin" + "clutter/camp1", + "clutter/bincluster1" ], "translate": { "x": 0, diff --git a/biomes/tropical/tro-highlands.json b/biomes/tropical/tro-highlands.json index 4c272ad2..93efd98e 100644 --- a/biomes/tropical/tro-highlands.json +++ b/biomes/tropical/tro-highlands.json @@ -127,16 +127,16 @@ "enabled": true }, "place": [ - "clutter/oak-clutt-1", - "clutter/oak-clutt-2", - "clutter/oak-clutt-3", - "clutter/oak-clutt-4", - "clutter/oak-clutt-5", - "clutter/birch-clutt-1", - "clutter/birch-clutt-2", - "clutter/birch-clutt-3", - "clutter/birch-clutt-4", - "clutter/birch-clutt-5" + "clutter/oakclutt1", + "clutter/oakclutt2", + "clutter/oakclutt3", + "clutter/oakclutt4", + "clutter/oakclutt5", + "clutter/birchclutt1", + "clutter/birchclutt2", + "clutter/birchclutt3", + "clutter/birchclutt4", + "clutter/birchclutt5" ], "translate": { "x": 0, diff --git a/biomes/tropical/tro-jungle-denmyre.json b/biomes/tropical/tro-jungle-denmyre.json index e3f3240e..513b776c 100644 --- a/biomes/tropical/tro-jungle-denmyre.json +++ b/biomes/tropical/tro-jungle-denmyre.json @@ -181,16 +181,16 @@ "enabled": true }, "place": [ - "denmyre/oak-denmyre-clutter-1", - "denmyre/oak-denmyre-clutter-2", - "denmyre/oak-denmyre-clutter-3", - "denmyre/oak-denmyre-clutter-4", - "denmyre/oak-denmyre-clutter-5", - "denmyre/oak-denmyre-clutter-6", - "denmyre/oak-denmyre-clutter-7", - "denmyre/oak-denmyre-clutter-8", - "denmyre/oak-denmyre-clutter-9", - "denmyre/oak-denmyre-clutter-10" + "denmyre/clutter/oakdenclutt1", + "denmyre/clutter/oakdenclutt2", + "denmyre/clutter/oakdenclutt3", + "denmyre/clutter/oakdenclutt4", + "denmyre/clutter/oakdenclutt5", + "denmyre/clutter/oakdenclutt6", + "denmyre/clutter/oakdenclutt7", + "denmyre/clutter/oakdenclutt8", + "denmyre/clutter/oakdenclutt9", + "denmyre/clutter/oakdenclutt10" ], "translate": { "x": 0, diff --git a/biomes/tropical/tro-mountain-extreme.json b/biomes/tropical/tro-mountain-extreme.json index 16688bcb..f0f9e686 100644 --- a/biomes/tropical/tro-mountain-extreme.json +++ b/biomes/tropical/tro-mountain-extreme.json @@ -137,9 +137,9 @@ "objects": [ { "place": [ - "bush/small/1", - "bush/small/2", - "bush/small/3" + "clutter/sbush1", + "clutter/sbush2", + "clutter/sbush3" ], "chance": 1, "density": 5 diff --git a/biomes/tropical/tro-mountain-middle.json b/biomes/tropical/tro-mountain-middle.json index 87632bd9..26b28c52 100644 --- a/biomes/tropical/tro-mountain-middle.json +++ b/biomes/tropical/tro-mountain-middle.json @@ -111,9 +111,9 @@ { "mode": "PAINT", "place": [ - "bush/small/1", - "bush/small/2", - "bush/small/3" + "clutter/sbush1", + "clutter/sbush2", + "clutter/sbush3" ], "chance": 1, "density": 5 diff --git a/biomes/tropical/tro-mountain-plains.json b/biomes/tropical/tro-mountain-plains.json index 27866edb..aac6ee3d 100644 --- a/biomes/tropical/tro-mountain-plains.json +++ b/biomes/tropical/tro-mountain-plains.json @@ -150,9 +150,9 @@ "objects": [ { "place": [ - "bush/small/1", - "bush/small/2", - "bush/small/3" + "clutter/sbush1", + "clutter/sbush2", + "clutter/sbush3" ], "chance": 1, "density": 5 diff --git a/biomes/tropical/tro-mountain.json b/biomes/tropical/tro-mountain.json index 0928a1ca..4315f308 100644 --- a/biomes/tropical/tro-mountain.json +++ b/biomes/tropical/tro-mountain.json @@ -115,9 +115,9 @@ { "mode": "PAINT", "place": [ - "bush/small/1", - "bush/small/2", - "bush/small/3" + "clutter/sbush1", + "clutter/sbush2", + "clutter/sbush3" ], "chance": 1, "density": 5 diff --git a/biomes/tropical/tro-plains-hills.json b/biomes/tropical/tro-plains-hills.json index bcd14bc9..3313a08a 100644 --- a/biomes/tropical/tro-plains-hills.json +++ b/biomes/tropical/tro-plains-hills.json @@ -117,9 +117,9 @@ { "mode": "PAINT", "place": [ - "bush/small/1", - "bush/small/2", - "bush/small/3" + "clutter/sbush1", + "clutter/sbush2", + "clutter/sbush3" ], "chance": 1, "density": 5 diff --git a/biomes/tropical/tro-plains.json b/biomes/tropical/tro-plains.json index 037239b0..ac5e247f 100644 --- a/biomes/tropical/tro-plains.json +++ b/biomes/tropical/tro-plains.json @@ -115,9 +115,9 @@ { "mode": "PAINT", "place": [ - "bush/small/1", - "bush/small/2", - "bush/small/3" + "clutter/sbush1", + "clutter/sbush2", + "clutter/sbush3" ], "chance": 1, "density": 5 diff --git a/biomes/tropical/tro-rainforest-hills.json b/biomes/tropical/tro-rainforest-hills.json index 97890351..cf7418f0 100644 --- a/biomes/tropical/tro-rainforest-hills.json +++ b/biomes/tropical/tro-rainforest-hills.json @@ -140,7 +140,7 @@ }, "enabled": true }, - "place": ["camp/barrel-bin"], + "place": ["clutter/bincluster1"], "translate": { "x": 0, "y": 0, diff --git a/biomes/tropical/tro-rainforest-island.json b/biomes/tropical/tro-rainforest-island.json index 47b590a8..cd671743 100644 --- a/biomes/tropical/tro-rainforest-island.json +++ b/biomes/tropical/tro-rainforest-island.json @@ -130,7 +130,7 @@ }, "enabled": true }, - "place": ["camp/barrel-bin"], + "place": ["clutter/bincluster1"], "translate": { "x": 0, "y": 0, @@ -148,7 +148,7 @@ }, "enabled": true }, - "place": ["camp/camp"], + "place": ["clutter/camp1"], "translate": { "x": 0, "y": 0, diff --git a/biomes/tropical/tro-rainforest-wicked-child.json b/biomes/tropical/tro-rainforest-wicked-child.json index a74904f4..a2ec2dbc 100644 --- a/biomes/tropical/tro-rainforest-wicked-child.json +++ b/biomes/tropical/tro-rainforest-wicked-child.json @@ -139,7 +139,7 @@ }, "enabled": true }, - "place": ["camp/barrel-bin"], + "place": ["clutter/bincluster1"], "translate": { "x": 0, "y": 0, @@ -157,7 +157,7 @@ }, "enabled": true }, - "place": ["camp/camp"], + "place": ["clutter/camp1"], "translate": { "x": 0, "y": 0, diff --git a/biomes/tropical/tro-rainforest-wicked.json b/biomes/tropical/tro-rainforest-wicked.json index 285efe4e..224458f4 100644 --- a/biomes/tropical/tro-rainforest-wicked.json +++ b/biomes/tropical/tro-rainforest-wicked.json @@ -129,7 +129,7 @@ }, "enabled": true }, - "place": ["camp/barrel-bin"], + "place": ["clutter/bincluster1"], "translate": { "x": 0, "y": 0, @@ -147,7 +147,7 @@ }, "enabled": true }, - "place": ["camp/camp"], + "place": ["clutter/camp1"], "translate": { "x": 0, "y": 0, diff --git a/biomes/tropical/tro-rainforest.json b/biomes/tropical/tro-rainforest.json index 3be562f3..a60803f1 100644 --- a/biomes/tropical/tro-rainforest.json +++ b/biomes/tropical/tro-rainforest.json @@ -140,7 +140,7 @@ }, "enabled": true }, - "place": ["camp/barrel-bin"], + "place": ["clutter/bincluster1"], "translate": { "x": 0, "y": 0, @@ -158,7 +158,7 @@ }, "enabled": true }, - "place": ["camp/camp"], + "place": ["clutter/camp1"], "translate": { "x": 0, "y": 0, diff --git a/biomes/tropical/tro-wilds.json b/biomes/tropical/tro-wilds.json index e07e43d2..17bdcf0b 100644 --- a/biomes/tropical/tro-wilds.json +++ b/biomes/tropical/tro-wilds.json @@ -170,8 +170,8 @@ "enabled": true }, "place": [ - "camp/camp", - "camp/barrel-bin" + "clutter/camp1", + "clutter/bincluster1" ], "translate": { "x": 0, diff --git a/biomes/tundra/tun-beach.json b/biomes/tundra/tun-beach.json index 07429ca9..123a0a30 100644 --- a/biomes/tundra/tun-beach.json +++ b/biomes/tundra/tun-beach.json @@ -75,8 +75,8 @@ "name": "standard-surface-portals", "chance": 0.00505, "place": [ - "global-clutter/BigSwordPortal-unlit-1", - "global-clutter/BigSwordPortal-lit-1", + "clutter/swordnp2", + "clutter/swordnp1", "ruined_portal/giant_portal_1", "ruined_portal/giant_portal_2", "ruined_portal/giant_portal_3", diff --git a/biomes/tundra/tun-bonsai-forest.json b/biomes/tundra/tun-bonsai-forest.json index f19edb12..71bc8319 100644 --- a/biomes/tundra/tun-bonsai-forest.json +++ b/biomes/tundra/tun-bonsai-forest.json @@ -140,7 +140,7 @@ }, "enabled": true }, - "place": ["camp/camp"], + "place": ["clutter/camp1"], "translate": { "x": 0, "y": 0, @@ -187,13 +187,13 @@ "enabled": true }, "place": [ - "clutter/stone-clutt-1", - "clutter/stone-clutt-2", - "clutter/stone-clutt-3", - "clutter/stone-clutt-4", - "clutter/stone-clutt-5", - "clutter/stone-clutt-6", - "clutter/stone-clutt-7" + "clutter/stoneclutt1", + "clutter/stoneclutt2", + "clutter/stoneclutt3", + "clutter/stoneclutt4", + "clutter/stoneclutt5", + "clutter/stoneclutt6", + "clutter/stoneclutt7" ], "translate": { "x": 0, @@ -247,11 +247,11 @@ "enabled": true }, "place": [ - "clutter/spruce-clutt-1", - "clutter/spruce-clutt-2", - "clutter/spruce-clutt-3", - "clutter/spruce-clutt-4", - "clutter/spruce-clutt-5" + "clutter/spruceclutt1", + "clutter/spruceclutt2", + "clutter/spruceclutt3", + "clutter/spruceclutt4", + "clutter/spruceclutt5" ], "translate": { "x": 0, diff --git a/biomes/tundra/tun-lake.json b/biomes/tundra/tun-lake.json index 1f1cc72a..325304b0 100644 --- a/biomes/tundra/tun-lake.json +++ b/biomes/tundra/tun-lake.json @@ -137,7 +137,7 @@ }, "enabled": true }, - "place": ["camp/barrel-bin"], + "place": ["clutter/bincluster1"], "translate": { "x": 0, "y": 0, @@ -234,16 +234,16 @@ "enabled": true }, "place": [ - "denmyre/oak-denmyre-clutter-1", - "denmyre/oak-denmyre-clutter-2", - "denmyre/oak-denmyre-clutter-3", - "denmyre/oak-denmyre-clutter-4", - "denmyre/oak-denmyre-clutter-5", - "denmyre/oak-denmyre-clutter-6", - "denmyre/oak-denmyre-clutter-7", - "denmyre/oak-denmyre-clutter-8", - "denmyre/oak-denmyre-clutter-9", - "denmyre/oak-denmyre-clutter-10" + "denmyre/clutter/oakdenclutt1", + "denmyre/clutter/oakdenclutt2", + "denmyre/clutter/oakdenclutt3", + "denmyre/clutter/oakdenclutt4", + "denmyre/clutter/oakdenclutt5", + "denmyre/clutter/oakdenclutt6", + "denmyre/clutter/oakdenclutt7", + "denmyre/clutter/oakdenclutt8", + "denmyre/clutter/oakdenclutt9", + "denmyre/clutter/oakdenclutt10" ], "translate": { "x": 0, diff --git a/biomes/tundra/tun-redwood-cliffs.json b/biomes/tundra/tun-redwood-cliffs.json index 75074d91..d8e749b7 100644 --- a/biomes/tundra/tun-redwood-cliffs.json +++ b/biomes/tundra/tun-redwood-cliffs.json @@ -168,9 +168,9 @@ { "mode": "PAINT", "place": [ - "bush/small/1", - "bush/small/2", - "bush/small/3" + "clutter/sbush1", + "clutter/sbush2", + "clutter/sbush3" ], "chance": 0.6, "rotation": { @@ -328,11 +328,11 @@ "enabled": true }, "place": [ - "clutter/spruce-clutt-1", - "clutter/spruce-clutt-2", - "clutter/spruce-clutt-3", - "clutter/spruce-clutt-4", - "clutter/spruce-clutt-5" + "clutter/spruceclutt1", + "clutter/spruceclutt2", + "clutter/spruceclutt3", + "clutter/spruceclutt4", + "clutter/spruceclutt5" ], "translate": { "x": 0, diff --git a/biomes/tundra/tun-redwood-forest.json b/biomes/tundra/tun-redwood-forest.json index 66c6ca99..a7f5592d 100644 --- a/biomes/tundra/tun-redwood-forest.json +++ b/biomes/tundra/tun-redwood-forest.json @@ -172,9 +172,9 @@ { "mode": "PAINT", "place": [ - "bush/small/1", - "bush/small/2", - "bush/small/3" + "clutter/sbush1", + "clutter/sbush2", + "clutter/sbush3" ], "chance": 0.6, "rotation": { @@ -289,11 +289,11 @@ "enabled": true }, "place": [ - "clutter/spruce-clutt-1", - "clutter/spruce-clutt-2", - "clutter/spruce-clutt-3", - "clutter/spruce-clutt-4", - "clutter/spruce-clutt-5" + "clutter/spruceclutt1", + "clutter/spruceclutt2", + "clutter/spruceclutt3", + "clutter/spruceclutt4", + "clutter/spruceclutt5" ], "translate": { "x": 0, diff --git a/biomes/tundra/tun-sequia-redwoods.json b/biomes/tundra/tun-sequia-redwoods.json index 92d4dc5d..298aeabd 100644 --- a/biomes/tundra/tun-sequia-redwoods.json +++ b/biomes/tundra/tun-sequia-redwoods.json @@ -179,7 +179,7 @@ }, "enabled": true }, - "place": ["camp/camp"], + "place": ["clutter/camp1"], "translate": { "x": 0, "y": 0, @@ -198,7 +198,7 @@ }, "enabled": true }, - "place": ["camp/barrel-bin"], + "place": ["clutter/bincluster1"], "translate": { "x": 0, "y": 0, diff --git a/biomes/tundra/tun-spruce-denmyre.json b/biomes/tundra/tun-spruce-denmyre.json index 1605001a..64dbb4cd 100644 --- a/biomes/tundra/tun-spruce-denmyre.json +++ b/biomes/tundra/tun-spruce-denmyre.json @@ -147,7 +147,7 @@ }, "enabled": true }, - "place": ["camp/barrel-bin"], + "place": ["clutter/bincluster1"], "translate": { "x": 0, "y": 0, @@ -244,16 +244,16 @@ "enabled": true }, "place": [ - "denmyre/oak-denmyre-clutter-1", - "denmyre/oak-denmyre-clutter-2", - "denmyre/oak-denmyre-clutter-3", - "denmyre/oak-denmyre-clutter-4", - "denmyre/oak-denmyre-clutter-5", - "denmyre/oak-denmyre-clutter-6", - "denmyre/oak-denmyre-clutter-7", - "denmyre/oak-denmyre-clutter-8", - "denmyre/oak-denmyre-clutter-9", - "denmyre/oak-denmyre-clutter-10" + "denmyre/clutter/oakdenclutt1", + "denmyre/clutter/oakdenclutt2", + "denmyre/clutter/oakdenclutt3", + "denmyre/clutter/oakdenclutt4", + "denmyre/clutter/oakdenclutt5", + "denmyre/clutter/oakdenclutt6", + "denmyre/clutter/oakdenclutt7", + "denmyre/clutter/oakdenclutt8", + "denmyre/clutter/oakdenclutt9", + "denmyre/clutter/oakdenclutt10" ], "translate": { "x": 0, diff --git a/biomes/tundra/tun-taiga.json b/biomes/tundra/tun-taiga.json index 2a85fbbf..6db8f940 100644 --- a/biomes/tundra/tun-taiga.json +++ b/biomes/tundra/tun-taiga.json @@ -144,7 +144,7 @@ }, "enabled": true }, - "place": ["grave/grave"], + "place": ["clutter/grave1"], "translate": { "x": 0, "y": 0, @@ -164,8 +164,8 @@ "enabled": true }, "place": [ - "global-clutter/BigSwordPortal-unlit-1", - "global-clutter/BigSwordPortal-lit-1" + "clutter/swordnp2", + "clutter/swordnp1" ], "translate": { "x": 0, @@ -185,13 +185,13 @@ "enabled": true }, "place": [ - "clutter/stone-clutt-1", - "clutter/stone-clutt-2", - "clutter/stone-clutt-3", - "clutter/stone-clutt-4", - "clutter/stone-clutt-5", - "clutter/stone-clutt-6", - "clutter/stone-clutt-7" + "clutter/stoneclutt1", + "clutter/stoneclutt2", + "clutter/stoneclutt3", + "clutter/stoneclutt4", + "clutter/stoneclutt5", + "clutter/stoneclutt6", + "clutter/stoneclutt7" ], "translate": { "x": 0, diff --git a/biomes/tundra/tun-tundra-beach-stone.json b/biomes/tundra/tun-tundra-beach-stone.json index aaeb1512..9b4cb1c7 100644 --- a/biomes/tundra/tun-tundra-beach-stone.json +++ b/biomes/tundra/tun-tundra-beach-stone.json @@ -29,8 +29,8 @@ "name": "standard-surface-portals", "chance": 0.00505, "place": [ - "global-clutter/BigSwordPortal-unlit-1", - "global-clutter/BigSwordPortal-lit-1", + "clutter/swordnp2", + "clutter/swordnp1", "ruined_portal/giant_portal_1", "ruined_portal/giant_portal_2", "ruined_portal/giant_portal_3", diff --git a/regions/frozen.json b/regions/frozen.json index edc3990d..b1e11984 100644 --- a/regions/frozen.json +++ b/regions/frozen.json @@ -163,8 +163,8 @@ "name": "standard-surface-portals", "chance": 0.001, "place": [ - "global-clutter/BigSwordPortal-unlit-1", - "global-clutter/BigSwordPortal-lit-1", + "clutter/swordnp2", + "clutter/swordnp1", "ruined_portal/giant_portal_1", "ruined_portal/giant_portal_2", "ruined_portal/giant_portal_3", diff --git a/regions/hot.json b/regions/hot.json index 60cc5082..b9304d02 100644 --- a/regions/hot.json +++ b/regions/hot.json @@ -211,8 +211,8 @@ "name": "standard-surface-portals", "chance": 0.001, "place": [ - "global-clutter/BigSwordPortal-unlit-1", - "global-clutter/BigSwordPortal-lit-1", + "clutter/swordnp2", + "clutter/swordnp1", "ruined_portal/giant_portal_1", "ruined_portal/giant_portal_2", "ruined_portal/giant_portal_3", diff --git a/regions/temperate.json b/regions/temperate.json index eefd4ed0..b739e2a4 100644 --- a/regions/temperate.json +++ b/regions/temperate.json @@ -154,8 +154,8 @@ "name": "standard-surface-portals", "chance": 0.001, "place": [ - "global-clutter/BigSwordPortal-unlit-1", - "global-clutter/BigSwordPortal-lit-1", + "clutter/swordnp2", + "clutter/swordnp1", "ruined_portal/giant_portal_1", "ruined_portal/giant_portal_2", "ruined_portal/giant_portal_3", diff --git a/regions/tropical.json b/regions/tropical.json index f237fd69..0f361ce3 100644 --- a/regions/tropical.json +++ b/regions/tropical.json @@ -181,8 +181,8 @@ "name": "standard-surface-portals", "chance": 0.001, "place": [ - "global-clutter/BigSwordPortal-unlit-1", - "global-clutter/BigSwordPortal-lit-1", + "clutter/swordnp2", + "clutter/swordnp1", "ruined_portal/giant_portal_1", "ruined_portal/giant_portal_2", "ruined_portal/giant_portal_3",