diff --git a/biome-completion.txt b/biome-completion.txt index b507e58a..1281e3a5 100644 --- a/biome-completion.txt +++ b/biome-completion.txt @@ -17,54 +17,3 @@ - - - - - "birch-podnerosa/large-1", - "birch-podnerosa/large-2", - "birch-podnerosa/large-3", - "birch-podnerosa/large-4", - "birch-podnerosa/large-5", - "birch-podnerosa/large-6", - "birch-podnerosa/large-7", - "birch-podnerosa/large-8", - "birch-podnerosa/large-9", - "birch-podnerosa/large-10", - "birch-podnerosa/large-11", - "birch-podnerosa/large-12", - "birch-podnerosa/large-13", - "birch-podnerosa/large-14", - "birch-podnerosa/large-15", - "birch-podnerosa/large-16", - "birch-podnerosa/large-17", - "birch-podnerosa/large-18", - "birch-podnerosa/large-19", - "birch-podnerosa/large-20", - "birch-podnerosa/med-1", - "birch-podnerosa/med-2", - "birch-podnerosa/med-3", - "birch-podnerosa/med-4", - "birch-podnerosa/med-5", - "birch-podnerosa/med-6", - "birch-podnerosa/med-7", - "birch-podnerosa/med-8", - "birch-podnerosa/med-9", - "birch-podnerosa/med-10", - "birch-podnerosa/med-11", - "birch-podnerosa/med-12", - "birch-podnerosa/med-13", - "birch-podnerosa/med-14", - "birch-podnerosa/med-15", - "birch-podnerosa/smol-1", - "birch-podnerosa/smol-2", - "birch-podnerosa/smol-3", - "birch-podnerosa/smol-4", - "birch-podnerosa/smol-5", - "birch-podnerosa/smol-6", - "birch-podnerosa/smol-7", - "birch-podnerosa/smol-8", - "birch-podnerosa/smol-9", - "birch-podnerosa/smol-10", - "birch-podnerosa/smol-11", - "birch-podnerosa/smol-12", - "birch-podnerosa/smol-13", - "birch-podnerosa/smol-14", - "birch-podnerosa/smol-15" \ No newline at end of file diff --git a/core.structures/objects/other/ICEMush1.ish b/core.structures/objects/other/ICEMush1.ish new file mode 100644 index 00000000..ec01a7fe Binary files /dev/null and b/core.structures/objects/other/ICEMush1.ish differ diff --git a/core.structures/objects/other/ICEMush2.ish b/core.structures/objects/other/ICEMush2.ish new file mode 100644 index 00000000..3a9f6308 Binary files /dev/null and b/core.structures/objects/other/ICEMush2.ish differ diff --git a/core.structures/objects/other/ICEMush3.ish b/core.structures/objects/other/ICEMush3.ish new file mode 100644 index 00000000..b4f98302 Binary files /dev/null and b/core.structures/objects/other/ICEMush3.ish differ diff --git a/core.structures/objects/other/ICEMush4.ish b/core.structures/objects/other/ICEMush4.ish new file mode 100644 index 00000000..4f8e0c34 Binary files /dev/null and b/core.structures/objects/other/ICEMush4.ish differ diff --git a/core.structures/objects/other/ICEMush5.ish b/core.structures/objects/other/ICEMush5.ish new file mode 100644 index 00000000..a24d25e1 Binary files /dev/null and b/core.structures/objects/other/ICEMush5.ish differ diff --git a/core.structures/objects/other/ICEMush6.ish b/core.structures/objects/other/ICEMush6.ish new file mode 100644 index 00000000..9c79f868 Binary files /dev/null and b/core.structures/objects/other/ICEMush6.ish differ diff --git a/core.structures/objects/other/ICEMush7.ish b/core.structures/objects/other/ICEMush7.ish new file mode 100644 index 00000000..5422bebc Binary files /dev/null and b/core.structures/objects/other/ICEMush7.ish differ diff --git a/core.structures/objects/other/ICEMush8.ish b/core.structures/objects/other/ICEMush8.ish new file mode 100644 index 00000000..3d9f239a Binary files /dev/null and b/core.structures/objects/other/ICEMush8.ish differ diff --git a/core.structures/objects/other/ICEMush9.ish b/core.structures/objects/other/ICEMush9.ish new file mode 100644 index 00000000..d7fc07d1 Binary files /dev/null and b/core.structures/objects/other/ICEMush9.ish differ diff --git a/core.structures/objects/other/IceSpire1.ish b/core.structures/objects/other/IceSpire1.ish new file mode 100644 index 00000000..da62a698 Binary files /dev/null and b/core.structures/objects/other/IceSpire1.ish differ diff --git a/core.structures/objects/other/IceSpire2.ish b/core.structures/objects/other/IceSpire2.ish new file mode 100644 index 00000000..2edc76be Binary files /dev/null and b/core.structures/objects/other/IceSpire2.ish differ diff --git a/core.structures/objects/other/IceSpire3.ish b/core.structures/objects/other/IceSpire3.ish new file mode 100644 index 00000000..441b65ff Binary files /dev/null and b/core.structures/objects/other/IceSpire3.ish differ diff --git a/core.structures/objects/other/IceSpire4.ish b/core.structures/objects/other/IceSpire4.ish new file mode 100644 index 00000000..655a4f2e Binary files /dev/null and b/core.structures/objects/other/IceSpire4.ish differ diff --git a/core.structures/objects/other/IceSpire5.ish b/core.structures/objects/other/IceSpire5.ish new file mode 100644 index 00000000..6679c2b6 Binary files /dev/null and b/core.structures/objects/other/IceSpire5.ish differ diff --git a/core.structures/objects/other/IceSpire6.ish b/core.structures/objects/other/IceSpire6.ish new file mode 100644 index 00000000..2ac3cfc4 Binary files /dev/null and b/core.structures/objects/other/IceSpire6.ish differ diff --git a/core.structures/objects/ice/ic-1.iob b/dev.brian/objects/ice-spikes/ic-1.iob similarity index 100% rename from core.structures/objects/ice/ic-1.iob rename to dev.brian/objects/ice-spikes/ic-1.iob diff --git a/core.structures/objects/ice/ic-10.iob b/dev.brian/objects/ice-spikes/ic-10.iob similarity index 100% rename from core.structures/objects/ice/ic-10.iob rename to dev.brian/objects/ice-spikes/ic-10.iob diff --git a/core.structures/objects/ice/ic-11.iob b/dev.brian/objects/ice-spikes/ic-11.iob similarity index 100% rename from core.structures/objects/ice/ic-11.iob rename to dev.brian/objects/ice-spikes/ic-11.iob diff --git a/core.structures/objects/ice/ic-2.iob b/dev.brian/objects/ice-spikes/ic-2.iob similarity index 100% rename from core.structures/objects/ice/ic-2.iob rename to dev.brian/objects/ice-spikes/ic-2.iob diff --git a/core.structures/objects/ice/ic-3.iob b/dev.brian/objects/ice-spikes/ic-3.iob similarity index 100% rename from core.structures/objects/ice/ic-3.iob rename to dev.brian/objects/ice-spikes/ic-3.iob diff --git a/core.structures/objects/ice/ic-4.iob b/dev.brian/objects/ice-spikes/ic-4.iob similarity index 100% rename from core.structures/objects/ice/ic-4.iob rename to dev.brian/objects/ice-spikes/ic-4.iob diff --git a/core.structures/objects/ice/ic-5.iob b/dev.brian/objects/ice-spikes/ic-5.iob similarity index 100% rename from core.structures/objects/ice/ic-5.iob rename to dev.brian/objects/ice-spikes/ic-5.iob diff --git a/core.structures/objects/ice/ic-6.iob b/dev.brian/objects/ice-spikes/ic-6.iob similarity index 100% rename from core.structures/objects/ice/ic-6.iob rename to dev.brian/objects/ice-spikes/ic-6.iob diff --git a/core.structures/objects/ice/ic-7.iob b/dev.brian/objects/ice-spikes/ic-7.iob similarity index 100% rename from core.structures/objects/ice/ic-7.iob rename to dev.brian/objects/ice-spikes/ic-7.iob diff --git a/core.structures/objects/ice/ic-8.iob b/dev.brian/objects/ice-spikes/ic-8.iob similarity index 100% rename from core.structures/objects/ice/ic-8.iob rename to dev.brian/objects/ice-spikes/ic-8.iob diff --git a/core.structures/objects/ice/ic-9.iob b/dev.brian/objects/ice-spikes/ic-9.iob similarity index 100% rename from core.structures/objects/ice/ic-9.iob rename to dev.brian/objects/ice-spikes/ic-9.iob diff --git a/core.structures/objects/ice/sp-1.iob b/dev.brian/objects/ice-spikes/sp-1.iob similarity index 100% rename from core.structures/objects/ice/sp-1.iob rename to dev.brian/objects/ice-spikes/sp-1.iob diff --git a/core.structures/objects/ice/sp-2.iob b/dev.brian/objects/ice-spikes/sp-2.iob similarity index 100% rename from core.structures/objects/ice/sp-2.iob rename to dev.brian/objects/ice-spikes/sp-2.iob diff --git a/core.structures/objects/ice/sp-3.iob b/dev.brian/objects/ice-spikes/sp-3.iob similarity index 100% rename from core.structures/objects/ice/sp-3.iob rename to dev.brian/objects/ice-spikes/sp-3.iob diff --git a/core.structures/objects/ice/sp-4.iob b/dev.brian/objects/ice-spikes/sp-4.iob similarity index 100% rename from core.structures/objects/ice/sp-4.iob rename to dev.brian/objects/ice-spikes/sp-4.iob diff --git a/core.structures/objects/ice/sp-5.iob b/dev.brian/objects/ice-spikes/sp-5.iob similarity index 100% rename from core.structures/objects/ice/sp-5.iob rename to dev.brian/objects/ice-spikes/sp-5.iob diff --git a/core.structures/objects/ice/tp-1.iob b/dev.brian/objects/ice-spikes/tp-1.iob similarity index 100% rename from core.structures/objects/ice/tp-1.iob rename to dev.brian/objects/ice-spikes/tp-1.iob diff --git a/core.structures/objects/ice/tp-2.iob b/dev.brian/objects/ice-spikes/tp-2.iob similarity index 100% rename from core.structures/objects/ice/tp-2.iob rename to dev.brian/objects/ice-spikes/tp-2.iob diff --git a/core.structures/objects/ice/tp-3.iob b/dev.brian/objects/ice-spikes/tp-3.iob similarity index 100% rename from core.structures/objects/ice/tp-3.iob rename to dev.brian/objects/ice-spikes/tp-3.iob diff --git a/core.structures/objects/ice/tp-4.iob b/dev.brian/objects/ice-spikes/tp-4.iob similarity index 100% rename from core.structures/objects/ice/tp-4.iob rename to dev.brian/objects/ice-spikes/tp-4.iob diff --git a/iris.overworld.frozen/biomes/frozen-beach.json b/iris.overworld.frozen/biomes/frozen-beach.json index cf147cec..0f9ff463 100644 --- a/iris.overworld.frozen/biomes/frozen-beach.json +++ b/iris.overworld.frozen/biomes/frozen-beach.json @@ -23,6 +23,49 @@ ] } ], + "objects": [ + { + "chance": 0.01, + "density": 3, + "rotation": { + "yAxis": { + "min": 0, + "max": 0, + "interval": 90, + "enabled": true + }, + "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", + "ice-spikes/sp-1", + "ice-spikes/sp-2", + "ice-spikes/sp-3", + "ice-spikes/sp-4", + "ice-spikes/sp-5", + "ice-spikes/tp-1", + "ice-spikes/tp-2", + "ice-spikes/tp-3", + "ice-spikes/tp-4" + + ], + "translate": { + "x": 0, + "y": 0, + "z": 0 + } + } + ], "decorators":[ { "zoom": 0.3, diff --git a/iris.overworld.frozen/biomes/frozen-mountains.json b/iris.overworld.frozen/biomes/frozen-mountains.json index 4caa1887..55ed2af1 100644 --- a/iris.overworld.frozen/biomes/frozen-mountains.json +++ b/iris.overworld.frozen/biomes/frozen-mountains.json @@ -48,6 +48,49 @@ "frozen-mountains", "frozen-mountains" ], + "objects": [ + { + "chance": 0.05, + "density": 3, + "rotation": { + "yAxis": { + "min": 0, + "max": 0, + "interval": 90, + "enabled": true + }, + "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", + "ice-spikes/sp-1", + "ice-spikes/sp-2", + "ice-spikes/sp-3", + "ice-spikes/sp-4", + "ice-spikes/sp-5", + "ice-spikes/tp-1", + "ice-spikes/tp-2", + "ice-spikes/tp-3", + "ice-spikes/tp-4" + + ], + "translate": { + "x": 0, + "y": 0, + "z": 0 + } + } + ], "generators":[ { "generator": "plain", diff --git a/iris.overworld.frozen/biomes/frozen-ocean.json b/iris.overworld.frozen/biomes/frozen-ocean.json index c97e16e2..0b0503e6 100644 --- a/iris.overworld.frozen/biomes/frozen-ocean.json +++ b/iris.overworld.frozen/biomes/frozen-ocean.json @@ -44,6 +44,38 @@ ] } ], + "objects": [ + { + "chance": 0.05, + "density": 3, + "rotation": { + "yAxis": { + "min": 0, + "max": 0, + "interval": 90, + "enabled": true + }, + "enabled": true + }, + "place": [ + "ice-spikes/sp-1", + "ice-spikes/sp-2", + "ice-spikes/sp-3", + "ice-spikes/sp-4", + "ice-spikes/sp-5", + "ice-spikes/tp-1", + "ice-spikes/tp-2", + "ice-spikes/tp-3", + "ice-spikes/tp-4" + + ], + "translate": { + "x": 0, + "y": 0, + "z": 0 + } + } + ], "generators":[ { "generator": "plain", diff --git a/iris.overworld.frozen/biomes/frozen-plains-hills.json b/iris.overworld.frozen/biomes/frozen-plains-hills.json index 66ee170f..fff511bd 100644 --- a/iris.overworld.frozen/biomes/frozen-plains-hills.json +++ b/iris.overworld.frozen/biomes/frozen-plains-hills.json @@ -42,6 +42,49 @@ ] } ], + "objects": [ + { + "chance": 0.05, + "density": 3, + "rotation": { + "yAxis": { + "min": 0, + "max": 0, + "interval": 90, + "enabled": true + }, + "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", + "ice-spikes/sp-1", + "ice-spikes/sp-2", + "ice-spikes/sp-3", + "ice-spikes/sp-4", + "ice-spikes/sp-5", + "ice-spikes/tp-1", + "ice-spikes/tp-2", + "ice-spikes/tp-3", + "ice-spikes/tp-4" + + ], + "translate": { + "x": 0, + "y": 0, + "z": 0 + } + } + ], "generators":[ { "generator": "plain", diff --git a/iris.overworld.frozen/biomes/frozen-plains.json b/iris.overworld.frozen/biomes/frozen-plains.json index 4e2b6a5f..00b30c25 100644 --- a/iris.overworld.frozen/biomes/frozen-plains.json +++ b/iris.overworld.frozen/biomes/frozen-plains.json @@ -42,6 +42,49 @@ ] } ], + "objects": [ + { + "chance": 0.05, + "density": 3, + "rotation": { + "yAxis": { + "min": 0, + "max": 0, + "interval": 90, + "enabled": true + }, + "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", + "ice-spikes/sp-1", + "ice-spikes/sp-2", + "ice-spikes/sp-3", + "ice-spikes/sp-4", + "ice-spikes/sp-5", + "ice-spikes/tp-1", + "ice-spikes/tp-2", + "ice-spikes/tp-3", + "ice-spikes/tp-4" + + ], + "translate": { + "x": 0, + "y": 0, + "z": 0 + } + } + ], "children": [ "frozen-plains-hills" ], diff --git a/iris.overworld.temperate/biomes/temperate-birch-forest.json b/iris.overworld.temperate/biomes/temperate-birch-forest.json index 2dc012f6..fb5856b7 100644 --- a/iris.overworld.temperate/biomes/temperate-birch-forest.json +++ b/iris.overworld.temperate/biomes/temperate-birch-forest.json @@ -67,13 +67,56 @@ "enabled": false }, "place": [ - "birch/birch1", - "birch/birch2", - "birch/birch3", - "birch/birch4", - "birch/birch5", - "birch/birch7", - "birch/birch8" + "birch-ponderosa/large-1", + "birch-ponderosa/large-2", + "birch-ponderosa/large-3", + "birch-ponderosa/large-4", + "birch-ponderosa/large-5", + "birch-ponderosa/large-6", + "birch-ponderosa/large-7", + "birch-ponderosa/large-8", + "birch-ponderosa/large-9", + "birch-ponderosa/large-10", + "birch-ponderosa/large-11", + "birch-ponderosa/large-12", + "birch-ponderosa/large-13", + "birch-ponderosa/large-14", + "birch-ponderosa/large-15", + "birch-ponderosa/large-16", + "birch-ponderosa/large-17", + "birch-ponderosa/large-18", + "birch-ponderosa/large-19", + "birch-ponderosa/large-20", + "birch-ponderosa/med-1", + "birch-ponderosa/med-2", + "birch-ponderosa/med-3", + "birch-ponderosa/med-4", + "birch-ponderosa/med-5", + "birch-ponderosa/med-6", + "birch-ponderosa/med-7", + "birch-ponderosa/med-8", + "birch-ponderosa/med-9", + "birch-ponderosa/med-10", + "birch-ponderosa/med-11", + "birch-ponderosa/med-12", + "birch-ponderosa/med-13", + "birch-ponderosa/med-14", + "birch-ponderosa/med-15", + "birch-ponderosa/smol-1", + "birch-ponderosa/smol-2", + "birch-ponderosa/smol-3", + "birch-ponderosa/smol-4", + "birch-ponderosa/smol-5", + "birch-ponderosa/smol-6", + "birch-ponderosa/smol-7", + "birch-ponderosa/smol-8", + "birch-ponderosa/smol-9", + "birch-ponderosa/smol-10", + "birch-ponderosa/smol-11", + "birch-ponderosa/smol-12", + "birch-ponderosa/smol-13", + "birch-ponderosa/smol-14", + "birch-ponderosa/smol-15" ], "translate": { "x": 0,