diff --git a/.github/ISSUE_TEMPLATE/bug.yml b/.github/ISSUE_TEMPLATE/bug.yml index b65220a3..c4aaa88f 100644 --- a/.github/ISSUE_TEMPLATE/bug.yml +++ b/.github/ISSUE_TEMPLATE/bug.yml @@ -33,7 +33,7 @@ body: attributes: label: Object Id description: What object are you talking about? (Use `/iris object dust`, and right click on the structure thats misbehaving) and send a screenshot link (imgur or related) - placeholder: Ships/Generic-1@5976587650987... + placeholder: objects/structures/generic1@5976587650987... - type: input id: mcversion attributes: diff --git a/biomes/frozen/fzn-redwood-forest.json b/biomes/frozen/fzn-redwood-forest.json index 9155c445..644e92b4 100644 --- a/biomes/frozen/fzn-redwood-forest.json +++ b/biomes/frozen/fzn-redwood-forest.json @@ -136,16 +136,16 @@ "enabled": true }, "place": [ - "true-redwood/true-redwood-1", - "true-redwood/true-redwood-2", - "true-redwood/true-redwood-3", - "true-redwood/true-redwood-4", - "true-redwood/true-redwood-5", - "true-redwood/true-redwood-6", - "true-redwood/true-redwood-7", - "true-redwood/true-redwood-8", - "true-redwood/true-redwood-9", - "true-redwood/true-redwood-10" + "trees/mixed/tredwood1", + "trees/mixed/tredwood2", + "trees/mixed/tredwood3", + "trees/mixed/tredwood4", + "trees/mixed/tredwood5", + "trees/mixed/tredwood6", + "trees/mixed/tredwood7", + "trees/mixed/tredwood8", + "trees/mixed/tredwood9", + "trees/mixed/tredwood10" ], "translate": { "x": 0, diff --git a/biomes/mountain/mtn-hills.json b/biomes/mountain/mtn-hills.json index 0d79f55b..54c50b22 100644 --- a/biomes/mountain/mtn-hills.json +++ b/biomes/mountain/mtn-hills.json @@ -195,11 +195,11 @@ { "mode": "PAINT", "place": [ - "mrock/mrock-1", - "mrock/mrock-2", - "mrock/mrock-3", - "mrock/mrock-4", - "mrock/mrock-5" + "objects/structures/mlandstone1", + "objects/structures/mlandstone2", + "objects/structures/mlandstone3", + "objects/structures/mlandstone4", + "objects/structures/mlandstone5" ], "chance": 0.04, "rotation": { diff --git a/biomes/mountain/mtn-plain-hills.json b/biomes/mountain/mtn-plain-hills.json index 6d7e7265..11e6f3b5 100644 --- a/biomes/mountain/mtn-plain-hills.json +++ b/biomes/mountain/mtn-plain-hills.json @@ -114,11 +114,11 @@ }, { "place": [ - "landform/stone/1", - "landform/stone/2", - "landform/stone/3", - "landform/stone/4", - "landform/stone/5" + "objects/structures/landstone1", + "objects/structures/landstone2", + "objects/structures/landstone3", + "objects/structures/landstone4", + "objects/structures/landstone5" ], "chance": 0.02, "mode": "MIN_HEIGHT", diff --git a/biomes/mountain/mtn-plains.json b/biomes/mountain/mtn-plains.json index 04a0c84f..7ac058cb 100644 --- a/biomes/mountain/mtn-plains.json +++ b/biomes/mountain/mtn-plains.json @@ -203,11 +203,11 @@ { "mode": "PAINT", "place": [ - "mrock/mrock-1", - "mrock/mrock-2", - "mrock/mrock-3", - "mrock/mrock-4", - "mrock/mrock-5" + "objects/structures/mlandstone1", + "objects/structures/mlandstone2", + "objects/structures/mlandstone3", + "objects/structures/mlandstone4", + "objects/structures/mlandstone5" ], "chance": 0.04, "rotation": { diff --git a/biomes/ocean/oce-beach.json b/biomes/ocean/oce-beach.json index 075f3140..d0253237 100644 --- a/biomes/ocean/oce-beach.json +++ b/biomes/ocean/oce-beach.json @@ -69,11 +69,11 @@ ], "objects": [{ "place": [ - "landform/stone/1", - "landform/stone/2", - "landform/stone/3", - "landform/stone/4", - "landform/stone/5" + "objects/structures/landstone1", + "objects/structures/landstone2", + "objects/structures/landstone3", + "objects/structures/landstone4", + "objects/structures/landstone5" ], "chance": 0.02, "mode": "MIN_HEIGHT", diff --git a/biomes/ocean/oce-deep.json b/biomes/ocean/oce-deep.json index 4f50e66e..be49f15e 100644 --- a/biomes/ocean/oce-deep.json +++ b/biomes/ocean/oce-deep.json @@ -79,18 +79,18 @@ } }, "place": [ - "ships/gall-1", - "ships/gall-2", - "ships/gall-3" + "objects/structures/gall1", + "objects/structures/gall2", + "objects/structures/gall3" ] }, { "place": [ - "ships/generic-w", - "ships/generic-c", - "ships/generic-r", - "ships/generic-u", - "ships/generic-c" + "objects/structures/genericw", + "objects/structures/genericc", + "objects/structures/genericr", + "objects/structures/genericu", + "objects/structures/genericc" ], "chance": 0.001, "onwater": true, @@ -112,26 +112,26 @@ } }, "place": [ - "shipwreck/with-mast", - "shipwreck/with-mast-degraded", - "shipwreck/rightsideup-full", - "shipwreck/rightsideup-full-degraded", - "shipwreck/rightsideup-fronthalf", - "shipwreck/rightsideup-fronthalf-degraded", - "shipwreck/rightsideup-backhalf", - "shipwreck/rightsideup-backhalf-degraded", - "shipwreck/sideways-full", - "shipwreck/sideways-full-degraded", - "shipwreck/sideways-fronthalf", - "shipwreck/sideways-fronthalf-degraded", - "shipwreck/sideways-backhalf", - "shipwreck/sideways-backhalf-degraded", - "shipwreck/upsidedown-full", - "shipwreck/upsidedown-full-degraded", - "shipwreck/upsidedown-fronthalf", - "shipwreck/upsidedown-fronthalf-degraded", - "shipwreck/upsidedown-backhalf", - "shipwreck/upsidedown-backhalf-degraded" + "shipwreck/shipwithmast", + "shipwreck/shipwithmastdegraded", + "shipwreck/shiprightsideupfull", + "shipwreck/shiprightsideupfulldegraded", + "shipwreck/shiprightsideupfronthalf", + "shipwreck/shiprightsideupfronthalfdegraded", + "shipwreck/shiprightsideupbackhalf", + "shipwreck/shiprightsideupbackhalfdegraded", + "shipwreck/shipsidewaysfull", + "shipwreck/shipsidewaysfulldegraded", + "shipwreck/shipsidewaysfronthalf", + "shipwreck/shipsidewaysfronthalfdegraded", + "shipwreck/shipsidewaysbackhalf", + "shipwreck/shipsidewaysbackhalfdegraded", + "shipwreck/shipupsidedownfull", + "shipwreck/shipupsidedownfulldegraded", + "shipwreck/shipupsidedownfronthalf", + "shipwreck/shipupsidedownfronthalfdegraded", + "shipwreck/shipupsidedownbackhalf", + "shipwreck/shipupsidedownbackhalfdegraded" ] } ] diff --git a/biomes/ocean/oce-hot-ocean-cliffs.json b/biomes/ocean/oce-hot-ocean-cliffs.json index 3f04ce82..23411177 100644 --- a/biomes/ocean/oce-hot-ocean-cliffs.json +++ b/biomes/ocean/oce-hot-ocean-cliffs.json @@ -116,9 +116,9 @@ }, "underwater": true, "place": [ - "ships/swreck-1", - "ships/usd-ship-1", - "ships/usd-ship-2" + "objects/structures/swreck1", + "objects/structures/usdship1", + "objects/structures/usdship2" ], "edit": [{ "find": [{"block": "oak_stairs"}], diff --git a/biomes/ocean/oce-hot-ocean.json b/biomes/ocean/oce-hot-ocean.json index fdd8b037..e68b5f9f 100644 --- a/biomes/ocean/oce-hot-ocean.json +++ b/biomes/ocean/oce-hot-ocean.json @@ -135,9 +135,9 @@ }, "underwater": true, "place": [ - "ships/swreck-1", - "ships/usd-ship-1", - "ships/usd-ship-2" + "objects/structures/swreck1", + "objects/structures/usdship1", + "objects/structures/usdship2" ], "edit": [{ "find": [{"block": "oak_stairs"}], diff --git a/biomes/ocean/oce-mtn-lake.json b/biomes/ocean/oce-mtn-lake.json index 7c279778..58d12b92 100644 --- a/biomes/ocean/oce-mtn-lake.json +++ b/biomes/ocean/oce-mtn-lake.json @@ -181,11 +181,11 @@ { "mode": "PAINT", "place": [ - "mrock/mrock-1", - "mrock/mrock-2", - "mrock/mrock-3", - "mrock/mrock-4", - "mrock/mrock-5" + "objects/structures/mlandstone1", + "objects/structures/mlandstone2", + "objects/structures/mlandstone3", + "objects/structures/mlandstone4", + "objects/structures/mlandstone5" ], "chance": 0.04, "rotation": { diff --git a/biomes/ocean/oce-mus-ocean.json b/biomes/ocean/oce-mus-ocean.json index 6f16b73d..4dd4ebf1 100644 --- a/biomes/ocean/oce-mus-ocean.json +++ b/biomes/ocean/oce-mus-ocean.json @@ -115,9 +115,9 @@ }, "underwater": true, "place": [ - "ships/swreck-1", - "ships/usd-ship-1", - "ships/usd-ship-2" + "objects/structures/swreck1", + "objects/structures/usdship1", + "objects/structures/usdship2" ], "edit": [{ "find": [{"block": "oak_stairs"}], diff --git a/biomes/ocean/oce-ocean.json b/biomes/ocean/oce-ocean.json index c2fb2f28..3d77bc32 100644 --- a/biomes/ocean/oce-ocean.json +++ b/biomes/ocean/oce-ocean.json @@ -78,11 +78,11 @@ "objects": [ { "place": [ - "landform/stone/1", - "landform/stone/2", - "landform/stone/3", - "landform/stone/4", - "landform/stone/5" + "objects/structures/landstone1", + "objects/structures/landstone2", + "objects/structures/landstone3", + "objects/structures/landstone4", + "objects/structures/landstone5" ], "chance": 1, "mode": "FAST_MIN_HEIGHT", @@ -116,26 +116,26 @@ }, { "place": [ - "shipwreck/with-mast-degraded", - "shipwreck/with-mast", - "shipwreck/upsidedown-full-degraded", - "shipwreck/upsidedown-full", - "shipwreck/upsidedown-fronthalf-degraded", - "shipwreck/upsidedown-fronthalf", - "shipwreck/upsidedown-backhalf-degraded", - "shipwreck/upsidedown-backhalf", - "shipwreck/sideways-full-degraded", - "shipwreck/sideways-full", - "shipwreck/sideways-fronthalf-degraded", - "shipwreck/sideways-fronthalf", - "shipwreck/sideways-backhalf-degraded", - "shipwreck/sideways-backhalf", - "shipwreck/rightsideup-full-degraded", - "shipwreck/rightsideup-full", - "shipwreck/rightsideup-fronthalf-degraded", - "shipwreck/rightsideup-fronthalf", - "shipwreck/rightsideup-backhalf-degraded", - "shipwreck/rightsideup-backhalf" + "shipwreck/shipwithmastdegraded", + "shipwreck/shipwithmast", + "shipwreck/shipupsidedownfulldegraded", + "shipwreck/shipupsidedownfull", + "shipwreck/shipupsidedownfronthalfdegraded", + "shipwreck/shipupsidedownfronthalf", + "shipwreck/shipupsidedownbackhalfdegraded", + "shipwreck/shipupsidedownbackhalf", + "shipwreck/shipsidewaysfulldegraded", + "shipwreck/shipsidewaysfull", + "shipwreck/shipsidewaysfronthalfdegraded", + "shipwreck/shipsidewaysfronthalf", + "shipwreck/shipsidewaysbackhalfdegraded", + "shipwreck/shipsidewaysbackhalf", + "shipwreck/shiprightsideupfulldegraded", + "shipwreck/shiprightsideupfull", + "shipwreck/shiprightsideupfronthalfdegraded", + "shipwreck/shiprightsideupfronthalf", + "shipwreck/shiprightsideupbackhalfdegraded", + "shipwreck/shiprightsideupbackhalf" ], "chance": 0.008, "underwater": true, @@ -143,9 +143,9 @@ }, { "place": [ - "ocean-ruins/ruin1", - "ocean-ruins/ruin2", - "ocean-ruins/ruin3" + "objects/structures/oruins1", + "objects/structures/oruins2", + "objects/structures/oruins3" ], "chance": 0.008, "mode": "VACUUM", diff --git a/biomes/ocean/oce-swa-ocean-tree.json b/biomes/ocean/oce-swa-ocean-tree.json index 8a77cc66..8753995c 100644 --- a/biomes/ocean/oce-swa-ocean-tree.json +++ b/biomes/ocean/oce-swa-ocean-tree.json @@ -127,9 +127,9 @@ }, "underwater": true, "place": [ - "ships/swreck-1", - "ships/usd-ship-1", - "ships/usd-ship-2" + "objects/structures/swreck1", + "objects/structures/usdship1", + "objects/structures/usdship2" ], "edit": [{ "find": [{"block": "oak_stairs"}], diff --git a/biomes/ocean/oce-swa-ocean.json b/biomes/ocean/oce-swa-ocean.json index fc50417b..ed482153 100644 --- a/biomes/ocean/oce-swa-ocean.json +++ b/biomes/ocean/oce-swa-ocean.json @@ -123,9 +123,9 @@ }, "underwater": true, "place": [ - "ships/swreck-1", - "ships/usd-ship-1", - "ships/usd-ship-2" + "objects/structures/swreck1", + "objects/structures/usdship1", + "objects/structures/usdship2" ], "edit": [{ "find": [{"block": "oak_stairs"}], diff --git a/biomes/ocean/oce-tem-ocean-deep.json b/biomes/ocean/oce-tem-ocean-deep.json index d762af89..283f5ba3 100644 --- a/biomes/ocean/oce-tem-ocean-deep.json +++ b/biomes/ocean/oce-tem-ocean-deep.json @@ -103,9 +103,9 @@ "underwater": true, "bottom": true, "place": [ - "ships/swreck-1", - "ships/usd-ship-1", - "ships/usd-ship-2" + "objects/structures/swreck1", + "objects/structures/usdship1", + "objects/structures/usdship2" ], "edit": [{ "find": [{"block": "oak_stairs"}], @@ -132,9 +132,9 @@ "underwater": true, "bottom": true, "place": [ - "ships/gall-1", - "ships/gall-2", - "ships/gall-3" + "objects/structures/gall1", + "objects/structures/gall2", + "objects/structures/gall3" ] }, { diff --git a/biomes/ocean/oce-tem-ocean.json b/biomes/ocean/oce-tem-ocean.json index 2fb99f0f..e8e437d9 100644 --- a/biomes/ocean/oce-tem-ocean.json +++ b/biomes/ocean/oce-tem-ocean.json @@ -102,9 +102,9 @@ }, "underwater": true, "place": [ - "ships/swreck-1", - "ships/usd-ship-1", - "ships/usd-ship-2" + "objects/structures/swreck1", + "objects/structures/usdship1", + "objects/structures/usdship2" ], "edit": [{ "find": [{"block": "oak_stairs"}], diff --git a/biomes/ocean/oce-tro-ocean.json b/biomes/ocean/oce-tro-ocean.json index ee6647b7..64d0b2d5 100644 --- a/biomes/ocean/oce-tro-ocean.json +++ b/biomes/ocean/oce-tro-ocean.json @@ -214,9 +214,9 @@ }, "underwater": true, "place": [ - "ships/swreck-1", - "ships/usd-ship-1", - "ships/usd-ship-2" + "objects/structures/swreck1", + "objects/structures/usdship1", + "objects/structures/usdship2" ], "edit": [{ "find": [{"block": "oak_stairs"}], diff --git a/biomes/ocean/oce-tro-river-soft.json b/biomes/ocean/oce-tro-river-soft.json index 7995ac95..d3afe7ff 100644 --- a/biomes/ocean/oce-tro-river-soft.json +++ b/biomes/ocean/oce-tro-river-soft.json @@ -128,11 +128,11 @@ }, { "place": [ - "landform/stone/1", - "landform/stone/2", - "landform/stone/3", - "landform/stone/4", - "landform/stone/5" + "objects/structures/landstone1", + "objects/structures/landstone2", + "objects/structures/landstone3", + "objects/structures/landstone4", + "objects/structures/landstone5" ], "chance": 1, "mode": "FAST_MIN_HEIGHT", @@ -157,11 +157,11 @@ }, { "place": [ - "ships/generic-w", - "ships/generic-c", - "ships/generic-r", - "ships/generic-u", - "ships/generic-c" + "objects/structures/genericw", + "objects/structures/genericc", + "objects/structures/genericr", + "objects/structures/genericu", + "objects/structures/genericc" ], "chance": 0.003, "onwater": true, diff --git a/biomes/ocean/oce-tro-river-steep.json b/biomes/ocean/oce-tro-river-steep.json index 925cd754..0152f05a 100644 --- a/biomes/ocean/oce-tro-river-steep.json +++ b/biomes/ocean/oce-tro-river-steep.json @@ -63,11 +63,11 @@ "objects": [ { "place": [ - "landform/stone/1", - "landform/stone/2", - "landform/stone/3", - "landform/stone/4", - "landform/stone/5" + "objects/structures/landstone1", + "objects/structures/landstone2", + "objects/structures/landstone3", + "objects/structures/landstone4", + "objects/structures/landstone5" ], "chance": 1, "mode": "FAST_MIN_HEIGHT", @@ -117,11 +117,11 @@ }, { "place": [ - "ships/generic-w", - "ships/generic-c", - "ships/generic-r", - "ships/generic-u", - "ships/generic-c" + "objects/structures/genericw", + "objects/structures/genericc", + "objects/structures/genericr", + "objects/structures/genericu", + "objects/structures/genericc" ], "chance": 0.005, "onwater": true, diff --git a/biomes/ocean/oce-tun-river-rocky.json b/biomes/ocean/oce-tun-river-rocky.json index 17ed9bb9..61472d93 100644 --- a/biomes/ocean/oce-tun-river-rocky.json +++ b/biomes/ocean/oce-tun-river-rocky.json @@ -105,9 +105,9 @@ }, "underwater": true, "place": [ - "ships/swreck-1", - "ships/usd-ship-1", - "ships/usd-ship-2" + "objects/structures/swreck1", + "objects/structures/usdship1", + "objects/structures/usdship2" ], "edit": [{ "find": [{"block": "oak_stairs"}], diff --git a/biomes/ocean/oce-tun-river.json b/biomes/ocean/oce-tun-river.json index fe2a8425..44b53907 100644 --- a/biomes/ocean/oce-tun-river.json +++ b/biomes/ocean/oce-tun-river.json @@ -98,9 +98,9 @@ }, "underwater": true, "place": [ - "ships/swreck-1", - "ships/usd-ship-1", - "ships/usd-ship-2" + "objects/structures/swreck1", + "objects/structures/usdship1", + "objects/structures/usdship2" ], "translate": { "x": 0, diff --git a/biomes/ocean/oce-warm-bottom.json b/biomes/ocean/oce-warm-bottom.json index 4028ef87..b440dfdb 100644 --- a/biomes/ocean/oce-warm-bottom.json +++ b/biomes/ocean/oce-warm-bottom.json @@ -136,11 +136,11 @@ }, { "place": [ - "landform/stone/1", - "landform/stone/2", - "landform/stone/3", - "landform/stone/4", - "landform/stone/5" + "objects/structures/landstone1", + "objects/structures/landstone2", + "objects/structures/landstone3", + "objects/structures/landstone4", + "objects/structures/landstone5" ], "chance": 1, "mode": "FAST_MIN_HEIGHT", @@ -194,11 +194,11 @@ }, { "place": [ - "ships/generic-w", - "ships/generic-c", - "ships/generic-r", - "ships/generic-u", - "ships/generic-c" + "objects/structures/genericw", + "objects/structures/genericc", + "objects/structures/genericr", + "objects/structures/genericu", + "objects/structures/genericc" ], "chance": 0.005, "onwater": true, diff --git a/biomes/ocean/oce-warm.json b/biomes/ocean/oce-warm.json index 020c25e6..12166777 100644 --- a/biomes/ocean/oce-warm.json +++ b/biomes/ocean/oce-warm.json @@ -131,11 +131,11 @@ }, { "place": [ - "landform/stone/1", - "landform/stone/2", - "landform/stone/3", - "landform/stone/4", - "landform/stone/5" + "objects/structures/landstone1", + "objects/structures/landstone2", + "objects/structures/landstone3", + "objects/structures/landstone4", + "objects/structures/landstone5" ], "chance": 1, "mode": "FAST_MIN_HEIGHT", @@ -160,11 +160,11 @@ }, { "place": [ - "ships/generic-w", - "ships/generic-c", - "ships/generic-r", - "ships/generic-u", - "ships/generic-c" + "objects/structures/genericw", + "objects/structures/genericc", + "objects/structures/genericr", + "objects/structures/genericu", + "objects/structures/genericc" ], "chance": 0.005, "onwater": true, diff --git a/biomes/temperate/tem-plain-hills.json b/biomes/temperate/tem-plain-hills.json index 9f26ce61..17cac63d 100644 --- a/biomes/temperate/tem-plain-hills.json +++ b/biomes/temperate/tem-plain-hills.json @@ -121,11 +121,11 @@ }, { "place": [ - "landform/stone/1", - "landform/stone/2", - "landform/stone/3", - "landform/stone/4", - "landform/stone/5" + "objects/structures/landstone1", + "objects/structures/landstone2", + "objects/structures/landstone3", + "objects/structures/landstone4", + "objects/structures/landstone5" ], "chance": 0.02, "mode": "MIN_HEIGHT", diff --git a/biomes/temperate/tem-plains.json b/biomes/temperate/tem-plains.json index 5d17670d..9165ddc3 100644 --- a/biomes/temperate/tem-plains.json +++ b/biomes/temperate/tem-plains.json @@ -187,28 +187,6 @@ "z": 0 } }, - { - "chance": 0.002, - "edit": [{ - "find": [{"block": "glass"}], - "replace": {"palette": [{"block": "void_air"}]} - }], - "rotation": { - "yAxis": { - "min": 0, - "max": 0, - "interval": 90, - "enabled": true - }, - "enabled": true - }, - "place": ["caves/cave2"], - "translate": { - "x": 0, - "y": -57, - "z": 0 - } - }, { "chance": 0.01, "rotation": { @@ -392,11 +370,11 @@ }, { "place": [ - "landform/stone/1", - "landform/stone/2", - "landform/stone/3", - "landform/stone/4", - "landform/stone/5" + "objects/structures/landstone1", + "objects/structures/landstone2", + "objects/structures/landstone3", + "objects/structures/landstone4", + "objects/structures/landstone5" ], "chance": 0.02, "mode": "MIN_HEIGHT", diff --git a/biomes/temperate/tem-stranged-plains.json b/biomes/temperate/tem-stranged-plains.json index bb6ad538..6831e9e6 100644 --- a/biomes/temperate/tem-stranged-plains.json +++ b/biomes/temperate/tem-stranged-plains.json @@ -181,11 +181,11 @@ }, { "place": [ - "landform/stone/1", - "landform/stone/2", - "landform/stone/3", - "landform/stone/4", - "landform/stone/5" + "objects/structures/landstone1", + "objects/structures/landstone2", + "objects/structures/landstone3", + "objects/structures/landstone4", + "objects/structures/landstone5" ], "chance": 0.02, "mode": "MIN_HEIGHT", diff --git a/biomes/tropical/tro-volcanic-plains.json b/biomes/tropical/tro-volcanic-plains.json index 7062586a..4efb5ff7 100644 --- a/biomes/tropical/tro-volcanic-plains.json +++ b/biomes/tropical/tro-volcanic-plains.json @@ -79,9 +79,9 @@ "childShrinkFactor": 1, "objects": [{ "place": [ - "landform/spikes/1", - "landform/spikes/2", - "landform/spikes/3" + "objects/structures/landspike1", + "objects/structures/landspike2", + "objects/structures/landspike3" ], "chance": 1, "density": 2, diff --git a/biomes/tundra/tun-bonsai-forest.json b/biomes/tundra/tun-bonsai-forest.json index 7bd6cbac..669ccaf0 100644 --- a/biomes/tundra/tun-bonsai-forest.json +++ b/biomes/tundra/tun-bonsai-forest.json @@ -220,14 +220,14 @@ "enabled": true }, "place": [ - "true-redwood/true-redwood-small-1", - "true-redwood/true-redwood-small-2", - "true-redwood/true-redwood-small-3", - "true-redwood/true-redwood-small-1", - "true-redwood/true-redwood-small-2", - "true-redwood/true-redwood-small-3", - "true-redwood/true-redwood-small-4", - "true-redwood/true-redwood-small-5" + "trees/mixed/tredwoodsmol1", + "trees/mixed/tredwoodsmol2", + "trees/mixed/tredwoodsmol3", + "trees/mixed/tredwoodsmol1", + "trees/mixed/tredwoodsmol2", + "trees/mixed/tredwoodsmol3", + "trees/mixed/tredwoodsmol4", + "trees/mixed/tredwoodsmol5" ], "translate": { "x": 0, @@ -271,10 +271,10 @@ "enabled": true }, "place": [ - "true-redwood/true-redwood-7-b", - "true-redwood/true-redwood-8-b", - "true-redwood/true-redwood-9-b", - "true-redwood/true-redwood-10-b" + "trees/mixed/tredwoodbee1", + "trees/mixed/tredwoodbee2", + "trees/mixed/tredwoodbee3", + "trees/mixed/tredwoodbee4" ], "translate": { "x": 0, diff --git a/biomes/tundra/tun-redwood-cliffs.json b/biomes/tundra/tun-redwood-cliffs.json index 6d73f5b9..3a5e0103 100644 --- a/biomes/tundra/tun-redwood-cliffs.json +++ b/biomes/tundra/tun-redwood-cliffs.json @@ -195,16 +195,16 @@ "enabled": true }, "place": [ - "true-redwood/true-redwood-1", - "true-redwood/true-redwood-2", - "true-redwood/true-redwood-3", - "true-redwood/true-redwood-4", - "true-redwood/true-redwood-5", - "true-redwood/true-redwood-6", - "true-redwood/true-redwood-7", - "true-redwood/true-redwood-8", - "true-redwood/true-redwood-9", - "true-redwood/true-redwood-10" + "trees/mixed/tredwood1", + "trees/mixed/tredwood2", + "trees/mixed/tredwood3", + "trees/mixed/tredwood4", + "trees/mixed/tredwood5", + "trees/mixed/tredwood6", + "trees/mixed/tredwood7", + "trees/mixed/tredwood8", + "trees/mixed/tredwood9", + "trees/mixed/tredwood10" ], "translate": { "x": 0, @@ -301,14 +301,14 @@ "enabled": true }, "place": [ - "true-redwood/true-redwood-small-1", - "true-redwood/true-redwood-small-2", - "true-redwood/true-redwood-small-3", - "true-redwood/true-redwood-small-1", - "true-redwood/true-redwood-small-2", - "true-redwood/true-redwood-small-3", - "true-redwood/true-redwood-small-4", - "true-redwood/true-redwood-small-5" + "trees/mixed/tredwoodsmol1", + "trees/mixed/tredwoodsmol2", + "trees/mixed/tredwoodsmol3", + "trees/mixed/tredwoodsmol1", + "trees/mixed/tredwoodsmol2", + "trees/mixed/tredwoodsmol3", + "trees/mixed/tredwoodsmol4", + "trees/mixed/tredwoodsmol5" ], "translate": { "x": 0, @@ -373,10 +373,10 @@ "enabled": true }, "place": [ - "true-redwood/true-redwood-7-b", - "true-redwood/true-redwood-8-b", - "true-redwood/true-redwood-9-b", - "true-redwood/true-redwood-10-b" + "trees/mixed/tredwoodbee1", + "trees/mixed/tredwoodbee2", + "trees/mixed/tredwoodbee3", + "trees/mixed/tredwoodbee4" ], "translate": { "x": 0, diff --git a/biomes/tundra/tun-redwood-forest.json b/biomes/tundra/tun-redwood-forest.json index bc5d433b..5d6380ca 100644 --- a/biomes/tundra/tun-redwood-forest.json +++ b/biomes/tundra/tun-redwood-forest.json @@ -199,16 +199,16 @@ "enabled": true }, "place": [ - "true-redwood/true-redwood-1", - "true-redwood/true-redwood-2", - "true-redwood/true-redwood-3", - "true-redwood/true-redwood-4", - "true-redwood/true-redwood-5", - "true-redwood/true-redwood-6", - "true-redwood/true-redwood-7", - "true-redwood/true-redwood-8", - "true-redwood/true-redwood-9", - "true-redwood/true-redwood-10" + "trees/mixed/tredwood1", + "trees/mixed/tredwood2", + "trees/mixed/tredwood3", + "trees/mixed/tredwood4", + "trees/mixed/tredwood5", + "trees/mixed/tredwood6", + "trees/mixed/tredwood7", + "trees/mixed/tredwood8", + "trees/mixed/tredwood9", + "trees/mixed/tredwood10" ], "translate": { "x": 0, @@ -262,14 +262,14 @@ "enabled": true }, "place": [ - "true-redwood/true-redwood-small-1", - "true-redwood/true-redwood-small-2", - "true-redwood/true-redwood-small-3", - "true-redwood/true-redwood-small-1", - "true-redwood/true-redwood-small-2", - "true-redwood/true-redwood-small-3", - "true-redwood/true-redwood-small-4", - "true-redwood/true-redwood-small-5" + "trees/mixed/tredwoodsmol1", + "trees/mixed/tredwoodsmol2", + "trees/mixed/tredwoodsmol3", + "trees/mixed/tredwoodsmol1", + "trees/mixed/tredwoodsmol2", + "trees/mixed/tredwoodsmol3", + "trees/mixed/tredwoodsmol4", + "trees/mixed/tredwoodsmol5" ], "translate": { "x": 0, @@ -334,10 +334,10 @@ "enabled": true }, "place": [ - "true-redwood/true-redwood-7-b", - "true-redwood/true-redwood-8-b", - "true-redwood/true-redwood-9-b", - "true-redwood/true-redwood-10-b" + "trees/mixed/tredwoodbee1", + "trees/mixed/tredwoodbee2", + "trees/mixed/tredwoodbee3", + "trees/mixed/tredwoodbee4" ], "translate": { "x": 0, diff --git a/biomes/tundra/tun-taiga.json b/biomes/tundra/tun-taiga.json index 546bc018..ad0771ad 100644 --- a/biomes/tundra/tun-taiga.json +++ b/biomes/tundra/tun-taiga.json @@ -218,11 +218,11 @@ "enabled": true }, "place": [ - "true-redwood/true-redwood-small-1", - "true-redwood/true-redwood-small-1", - "true-redwood/true-redwood-small-1", - "true-redwood/true-redwood-small-2", - "true-redwood/true-redwood-small-3" + "trees/mixed/tredwoodsmol1", + "trees/mixed/tredwoodsmol1", + "trees/mixed/tredwoodsmol1", + "trees/mixed/tredwoodsmol2", + "trees/mixed/tredwoodsmol3" ], "translate": { "x": 0, diff --git a/regions/frozen.json b/regions/frozen.json index b1e11984..69b6e113 100644 --- a/regions/frozen.json +++ b/regions/frozen.json @@ -132,12 +132,12 @@ "bottom": true, "density": 1, "place": [ - "amethyst/ame1", - "amethyst/ame2", - "amethyst/ame3", - "amethyst/ame4", - "amethyst/ame5", - "amethyst/ame6" + "objects/structures/amethyst1", + "objects/structures/amethyst2", + "objects/structures/amethyst3", + "objects/structures/amethyst4", + "objects/structures/amethyst5", + "objects/structures/amethyst6" ], "edit": [{ "find": [{"block": "glass"}], diff --git a/regions/hot.json b/regions/hot.json index b9304d02..b36656f1 100644 --- a/regions/hot.json +++ b/regions/hot.json @@ -180,12 +180,12 @@ "bottom": true, "density": 1, "place": [ - "amethyst/ame1", - "amethyst/ame2", - "amethyst/ame3", - "amethyst/ame4", - "amethyst/ame5", - "amethyst/ame6" + "objects/structures/amethyst1", + "objects/structures/amethyst2", + "objects/structures/amethyst3", + "objects/structures/amethyst4", + "objects/structures/amethyst5", + "objects/structures/amethyst6" ], "edit": [{ "find": [{"block": "glass"}], diff --git a/regions/mushroom.json b/regions/mushroom.json index ab9740ef..68cdd249 100644 --- a/regions/mushroom.json +++ b/regions/mushroom.json @@ -72,12 +72,12 @@ "bottom": true, "density": 1, "place": [ - "amethyst/ame1", - "amethyst/ame2", - "amethyst/ame3", - "amethyst/ame4", - "amethyst/ame5", - "amethyst/ame6" + "objects/structures/amethyst1", + "objects/structures/amethyst2", + "objects/structures/amethyst3", + "objects/structures/amethyst4", + "objects/structures/amethyst5", + "objects/structures/amethyst6" ], "edit": [{ "find": [{"block": "glass"}], diff --git a/regions/swamp.json b/regions/swamp.json index fbdb2640..df737093 100644 --- a/regions/swamp.json +++ b/regions/swamp.json @@ -98,12 +98,12 @@ "bottom": true, "density": 1, "place": [ - "amethyst/ame1", - "amethyst/ame2", - "amethyst/ame3", - "amethyst/ame4", - "amethyst/ame5", - "amethyst/ame6" + "objects/structures/amethyst1", + "objects/structures/amethyst2", + "objects/structures/amethyst3", + "objects/structures/amethyst4", + "objects/structures/amethyst5", + "objects/structures/amethyst6" ], "edit": [{ "find": [{"block": "glass"}], diff --git a/regions/temperate.json b/regions/temperate.json index b739e2a4..eb5f917e 100644 --- a/regions/temperate.json +++ b/regions/temperate.json @@ -123,12 +123,12 @@ "bottom": true, "density": 1, "place": [ - "amethyst/ame1", - "amethyst/ame2", - "amethyst/ame3", - "amethyst/ame4", - "amethyst/ame5", - "amethyst/ame6" + "objects/structures/amethyst1", + "objects/structures/amethyst2", + "objects/structures/amethyst3", + "objects/structures/amethyst4", + "objects/structures/amethyst5", + "objects/structures/amethyst6" ], "edit": [{ "find": [{"block": "glass"}], diff --git a/regions/tropical.json b/regions/tropical.json index 0f361ce3..d1d011a7 100644 --- a/regions/tropical.json +++ b/regions/tropical.json @@ -150,12 +150,12 @@ "bottom": true, "density": 1, "place": [ - "amethyst/ame1", - "amethyst/ame2", - "amethyst/ame3", - "amethyst/ame4", - "amethyst/ame5", - "amethyst/ame6" + "objects/structures/amethyst1", + "objects/structures/amethyst2", + "objects/structures/amethyst3", + "objects/structures/amethyst4", + "objects/structures/amethyst5", + "objects/structures/amethyst6" ], "edit": [{ "find": [{"block": "glass"}], diff --git a/regions/tundra.json b/regions/tundra.json index 8ce4c837..0395e797 100644 --- a/regions/tundra.json +++ b/regions/tundra.json @@ -117,12 +117,12 @@ "bottom": true, "density": 1, "place": [ - "amethyst/ame1", - "amethyst/ame2", - "amethyst/ame3", - "amethyst/ame4", - "amethyst/ame5", - "amethyst/ame6" + "objects/structures/amethyst1", + "objects/structures/amethyst2", + "objects/structures/amethyst3", + "objects/structures/amethyst4", + "objects/structures/amethyst5", + "objects/structures/amethyst6" ], "edit": [{ "find": [{"block": "glass"}],