Merge pull request #305 from RePixelatedMC/bugfixes-and-additions

Bug Fixes and Additions
2026-01-06 15:41:43 +00:00 · 2023-04-12 18:00:49 -04:00
parent b8e29e9177 c94bceb5d1
commit dce698aac5
25 changed files with 95 additions and 36 deletions
--- a/biomes/carving/CaveBiomes/Deepdark.json
+++ b/biomes/carving/CaveBiomes/Deepdark.json
@@ -1,14 +0,0 @@
-{
-    "name": "DeepDark",
-    "layers": [{
-        "style": {"style": "STATIC"},
-        "maxHeight": 2,
-        "minHeight": 2,
-        "palette": [
-            {
-                "block": "minecraft:deepslate",
-                "weight": 3
-            }
-        ]
-    }]
-}
--- a/biomes/carving/deepdark/standard-deepdark.json
+++ b/biomes/carving/deepdark/standard-deepdark.json
--- a/biomes/carving/CaveBiomes/Rocky.json
+++ b/biomes/carving/CaveBiomes/Rocky.json
--- a/biomes/frozen/plains.json
+++ b/biomes/frozen/plains.json
@@ -22,7 +22,7 @@
        },
         {
            "structure": "pillager-outpost",
-            "rarity": 800
+            "rarity": 1500
        },
        {
            "structure": "igloo",
--- a/biomes/frozen/redwood-forest-extended.json
+++ b/biomes/frozen/redwood-forest-extended.json
@@ -103,7 +103,7 @@
        },
        {
            "chance": 0.4,
-            "density": 2,
+            "density": 1,
            "edit": [
                {
                    "find": [{"block": "minecraft:birch_leaves"}],
--- a/biomes/frozen/redwood-forest.json
+++ b/biomes/frozen/redwood-forest.json
@@ -104,7 +104,7 @@
        },
        {
            "chance": 0.4,
-            "density": 2,
+            "density": 1,
            "edit": [
                {
                    "find": [{"block": "minecraft:birch_leaves"}],
--- a/biomes/hot/small-valley.json
+++ b/biomes/hot/small-valley.json
--- a/biomes/temperate/plains.json
+++ b/biomes/temperate/plains.json
@@ -17,6 +17,10 @@
        {
            "structure": "village-plains",
            "rarity": 1200
+        },
+        {
+            "structure": "ruins/ruin3",
+            "rarity": 1200
        }
    ],
    "biomeStyle": {"style": "SIMPLEX"},
--- a/biomes/temperate/roughplains.json
+++ b/biomes/temperate/roughplains.json
@@ -75,7 +75,36 @@
                }
            }]

-    }],
+    },
+    {
+        "place": [
+            "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"
+            ],
+        "slopeCondition":{
+            "maximumSlope": 2
+        },
+        "carvingSupport": "SURFACE_ONLY",
+        "chance": 0.0025,
+        "mode": "MIN_HEIGHT",
+        "rotation": {
+                "yAxis": {
+                    "min": 0,
+                    "max": 0,
+                    "interval": 90,
+                    "enabled": true
+                },
+                "enabled": true
+        }}],
+
    "decorators": [
        {
            "chance": 0.2,
--- a/biomes/temperate/tinybirch.json
+++ b/biomes/temperate/tinybirch.json
@@ -29,6 +29,10 @@

            ],
        "carvingSupport": "SURFACE_ONLY",
+        "translate":{
+            "y": 1
+
+        },

        "chance": 1,
        "mode": "CENTER_STILT",
--- a/caves/Deepdark/big-deepdarkcave.json
+++ b/caves/Deepdark/big-deepdarkcave.json
@@ -4,11 +4,11 @@
        "max": 400,
        "min": 15
    },
-    "customBiome": "carving/Deepdark/StandardDeepdark",
+    "customBiome": "carving/deepdark/standard-deepdark",
    "fork": {
        "caves": [{
            "breakSurface": false,
-            "cave": "Deepdark/Small_DeepdarkCave",
+            "cave": "deepdark/small-deepdarkcave",
            "rarity": 10
        }]
    },
--- a/caves/deepdark/small-deepdarkcave.json
+++ b/caves/deepdark/small-deepdarkcave.json
@@ -4,7 +4,7 @@
        "max": 400,
        "min": 15
    },
-    "customBiome": "carving/Deepdark/StandardDeepdark",
+    "customBiome": "carving/deepdark/standard-deepdark",
    "fork": {
        "caves": [{
            "breakSurface": false,
--- a/dimensions/overworld.json
+++ b/dimensions/overworld.json
@@ -1,7 +1,8 @@
 {
-    "version": 3000,
+    "version": 30010,
    "name": "Overworld",
    "environment": "NORMAL",
+    "dimensionAngleDeg": 12,
    "fluidHeight": 75,
    "continentZoom": 1,
    "continentalStyle": {
@@ -41,7 +42,7 @@
            }
        }
    },
-    "regionZoom": 18.15,
+    "regionZoom": 28.15,
    "regions": [
        "frozen",
        "hot",
@@ -84,7 +85,7 @@
        },
        {
            "breakSurface": false,
-            "cave": "Deepdark/Big_DeepdarkCave",
+            "cave": "deepdark/big_deepdarkcave",
            "rarity": 187,
            "caveStartHeight": {
                "max": 60,
--- a/jigsaw-pieces/ruins/ruin3.json
+++ b/jigsaw-pieces/ruins/ruin3.json
@@ -0,0 +1,30 @@
+{
+    "object": "jigsaw/ruins/ruin3",
+    "placementOptions":{
+        "carvingSupport": "SURFACE_ONLY",
+        "smartBore": true,
+        "mode": "PAINT",
+        "rotation": {
+            "enabled": true,
+            "xAxis": {
+                "enabled": false,
+                "min": 0,
+                "max": 0,
+                "interval": 0
+            },
+            "yAxis": {
+                "enabled": true,
+                "min": 0,
+                "max": 0,
+                "interval": 90
+            },
+            "zAxis": {
+                "enabled": false,
+                "min": 0,
+                "max": 0,
+                "interval": 0
+            }
+        }
+    }
+
+    }
--- a/jigsaw-structures/ruins/ruin3.json
+++ b/jigsaw-structures/ruins/ruin3.json
@@ -0,0 +1,4 @@
+{
+    "maxDepth": 1,
+    "pieces": ["ruins/ruin3"]
+}
--- a/markers/guardian.json
+++ b/markers/guardian.json
@@ -1,4 +1,4 @@
 {
    "removeOnChange": true,
-    "spawners": ["structure/Guardianv2"]
+    "spawners": ["structure/guardianv2"]
 }
--- a/objects/jigsaw/ruins/ruin3.iob
+++ b/objects/jigsaw/ruins/ruin3.iob
--- a/regions/frozen.json
+++ b/regions/frozen.json
@@ -13,7 +13,7 @@
        "frozen/vander"
    ],
    "caveBiomes": [
-        "carving/CaveBiomes/Rocky"
+        "carving/rocky-cavebiome"
    ],
    "jigsawStructures": [{
        "structure": "ruined-portal",
@@ -77,6 +77,7 @@
        }
    ],
    "shoreBiomes": ["frozen/shore/beach"],
+    "seaBiomeZoom": 1,
    "seaBiomes": [
        "frozen/sea/ocean",
        "frozen/sea/frozen-river-ice"
--- a/regions/hot.json
+++ b/regions/hot.json
@@ -2,7 +2,7 @@
    "name": "Hot",
    "color": "#D1CD44",
    "rarity": 4,
-    "seaBiomeZoom": 1.5,
+    "seaBiomeZoom": 3.5,
    "landBiomes": [
        "hot/desert-dunes",
        "hot/small-valley",
@@ -19,7 +19,7 @@
        "mesa/mesa"
    ],
    "caveBiomes": [
-        "carving/CaveBiomes/Rocky"
+        "carving/rocky-cavebiome"
    ],
    "jigsawStructures": [
        {
--- a/regions/mushroom.json
+++ b/regions/mushroom.json
@@ -10,7 +10,7 @@
        "mushroom/warped-forest"
    ],
    "caveBiomes": [
-        "carving/CaveBiomes/Rocky"
+        "carving/rocky-cavebiome"
    ],
    "objects": [{
        "heightmap": {
--- a/regions/swamp.json
+++ b/regions/swamp.json
@@ -55,7 +55,7 @@
        }
    }],
    "caveBiomes": [
-        "carving/CaveBiomes/Rocky"
+        "carving/rocky-cavebiome"
    ],
    "shoreBiomes": ["swamp/shore/beach"],
    "seaBiomes": [
--- a/regions/temperate.json
+++ b/regions/temperate.json
@@ -29,7 +29,7 @@

    ],
    "caveBiomes": [
-        "carving/CaveBiomes/Rocky"
+        "carving/rocky-cavebiome"
    ],
    "jigsawStructures": [{
        "structure": "ruined-portal",
@@ -94,7 +94,7 @@
        "temperate/shore/beach",
        "temperate/shore/oak-beach"
    ],
-    "seaBiomeZoom": 3,
+    "seaBiomeZoom": 6,
    "seaBiomes": [
        "ocean/deep"
    ],
--- a/regions/tropical.json
+++ b/regions/tropical.json
@@ -16,7 +16,7 @@
        "tropical/plains-hills"
    ],
    "caveBiomes": [
-        "carving/CaveBiomes/Rocky"
+        "carving/rocky-cavebiome"
    ],

    "jigsawStructures": [{
@@ -82,7 +82,7 @@
        "tropical/beach",
        "tropical/beach-bamboo"
    ],
-    "seaBiomeZoom": 2,
+    "seaBiomeZoom": 4,
    "seaBiomes": [
        "tropical/submerged-volcanic",
        "tropical/sea/ocean"
--- a/regions/tundra.json
+++ b/regions/tundra.json
@@ -24,7 +24,7 @@
        "tundra/tinyspruce"
    ],
    "caveBiomes": [
-        "carving/CaveBiomes/Rocky"
+        "carving/rocky-cavebiome"
    ],
    "jigsawStructures": [{
        "structure": "ruined-portal",
@@ -87,7 +87,7 @@
        "tundra/shore/beach",
        "tundra/shore/beach-stone"
    ],
-    "seaBiomeZoom": 2,
+    "seaBiomeZoom": 4,
    "seaBiomes": ["mountain/sea/river"],
    "entitySpawners": [
        "tundra/passive",
--- a/spawners/structure/guardianv2.jsog
+++ b/spawners/structure/guardianv2.jsog