Merge pull request #177 from StrangeOne101/master

Stronghold + Entity Patches
2026-01-06 15:41:36 +00:00 · 2021-08-04 06:50:30 -07:00
parent 22976f3226 25cb201f50
commit 99170c4638
26 changed files with 42 additions and 40 deletions
--- a/biomes/ocean/deep.json
+++ b/biomes/ocean/deep.json
@@ -86,11 +86,11 @@
        },
        {
            "place": [
-                "structures/genericw",
-                "structures/genericc",
-                "structures/genericr",
-                "structures/genericu",
-                "structures/genericc"
+                "structures/shipgenericw",
+                "structures/shipgenericc",
+                "structures/shipgenericr",
+                "structures/shipgenericu",
+                "structures/shipgenericc"
            ],
            "chance": 0.001,
            "onwater": true,
--- a/biomes/ocean/warm-bottom.json
+++ b/biomes/ocean/warm-bottom.json
@@ -194,11 +194,11 @@
        },
        {
            "place": [
-                "structures/genericw",
-                "structures/genericc",
-                "structures/genericr",
-                "structures/genericu",
-                "structures/genericc"
+                "structures/shipgenericw",
+                "structures/shipgenericc",
+                "structures/shipgenericr",
+                "structures/shipgenericu",
+                "structures/shipgenericc"
            ],
            "chance": 0.005,
            "onwater": true,
--- a/biomes/ocean/warm.json
+++ b/biomes/ocean/warm.json
@@ -160,11 +160,11 @@
        },
        {
            "place": [
-                "structures/genericw",
-                "structures/genericc",
-                "structures/genericr",
-                "structures/genericu",
-                "structures/genericc"
+                "structures/shipgenericw",
+                "structures/shipgenericc",
+                "structures/shipgenericr",
+                "structures/shipgenericu",
+                "structures/shipgenericc"
            ],
            "chance": 0.005,
            "onwater": true,
--- a/biomes/tropical/sea/river-soft.json
+++ b/biomes/tropical/sea/river-soft.json
@@ -157,11 +157,11 @@
        },
        {
            "place": [
-                "structures/genericw",
-                "structures/genericc",
-                "structures/genericr",
-                "structures/genericu",
-                "structures/genericc"
+                "structures/shipgenericw",
+                "structures/shipgenericc",
+                "structures/shipgenericr",
+                "structures/shipgenericu",
+                "structures/shipgenericc"
            ],
            "chance": 0.003,
            "onwater": true,
--- a/biomes/tropical/sea/river-steep.json
+++ b/biomes/tropical/sea/river-steep.json
@@ -117,11 +117,11 @@
        },
        {
            "place": [
-                "structures/genericw",
-                "structures/genericc",
-                "structures/genericr",
-                "structures/genericu",
-                "structures/genericc"
+                "structures/shipgenericw",
+                "structures/shipgenericc",
+                "structures/shipgenericr",
+                "structures/shipgenericu",
+                "structures/shipgenericc"
            ],
            "chance": 0.005,
            "onwater": true,
--- a/entities/standard/passive/chicken.json
+++ b/entities/standard/passive/chicken.json
@@ -1 +1 @@
-{"type": "CHICKEN"}
+{"type": "CHICKEN", "surface": "ANIMAL"}
--- a/entities/standard/passive/cow.json
+++ b/entities/standard/passive/cow.json
@@ -1 +1 @@
-{"type": "COW"}
+{"type": "COW", "surface": "ANIMAL"}
--- a/entities/standard/passive/dolphin.json
+++ b/entities/standard/passive/dolphin.json
@@ -1,3 +1,4 @@
 {
-    "type": "DOLPHIN"
+    "type": "DOLPHIN",
+    "surface": "WATER"
 }
--- a/entities/standard/passive/donkey.json
+++ b/entities/standard/passive/donkey.json
@@ -1 +1 @@
-{"type": "DONKEY"}
+{"type": "DONKEY", "surface": "ANIMAL"}
--- a/entities/standard/passive/horse.json
+++ b/entities/standard/passive/horse.json
@@ -1 +1 @@
-{"type": "HORSE"}
+{"type": "HORSE", "surface": "ANIMAL"}
--- a/entities/standard/passive/mule.json
+++ b/entities/standard/passive/mule.json
@@ -1 +1 @@
-{"type": "MULE"}
+{"type": "MULE", "surface": "ANIMAL"}
--- a/entities/standard/passive/ocelot.json
+++ b/entities/standard/passive/ocelot.json
@@ -1 +1 @@
-{"type": "OCELOT"}
+{"type": "OCELOT", "surface": "ANIMAL"}
--- a/entities/standard/passive/pig.json
+++ b/entities/standard/passive/pig.json
@@ -1 +1 @@
-{"type": "PIG"}
+{"type": "PIG", "surface": "ANIMAL"}
--- a/entities/standard/passive/sheep.json
+++ b/entities/standard/passive/sheep.json
@@ -1 +1 @@
-{"type": "SHEEP"}
+{"type": "SHEEP", "surface": "ANIMAL"}
--- a/entities/standard/passive/turtle.json
+++ b/entities/standard/passive/turtle.json
@@ -1 +1 @@
-{"type": "TURTLE"}
+{"type": "TURTLE", "surface": "OVERWORLD"}
--- a/entities/standard/passive/wolf.json
+++ b/entities/standard/passive/wolf.json
@@ -1 +1 @@
-{"type": "WOLF"}
+{"type": "WOLF", "surface": "ANIMAL"}
--- a/entities/unique/glowsquid.json
+++ b/entities/unique/glowsquid.json
@@ -1,4 +1,5 @@
 {
    "type": "GLOW_SQUID",
-    "glowing": true
+    "glowing": true,
+    "surface": "WATER"
 }
--- a/jigsaw-pieces/stronghold/portal/main.json
+++ b/jigsaw-pieces/stronghold/portal/main.json
@@ -8,7 +8,7 @@
        "pools": ["stronghold/portalroom"],
        "position": {
            "x": 0,
-            "y": -55,
+            "y": -48,
            "z": 5
        },
        "direction": "NORTH_NEGATIVE_Z"
--- a/jigsaw-pieces/stronghold/portal/top.json
+++ b/jigsaw-pieces/stronghold/portal/top.json
@@ -121,7 +121,7 @@
            "pools": ["stronghold/from-portal"],
            "position": {
                "x": 0,
-                "y": -6,
+                "y": -11,
                "z": 5
            },
            "direction": "SOUTH_POSITIVE_Z"
--- a/jigsaw-structures/stronghold.json
+++ b/jigsaw-structures/stronghold.json
@@ -3,7 +3,7 @@
    "pieces": ["stronghold/portal/main"],
    "terminate": true,
    "feature": {
-        "blockRadius": 5,
+        "blockRadius": 25,
        "entitySpawners": [
            "silverfish"
        ]
--- a/objects/structures/shipgenericc.iob
+++ b/objects/structures/shipgenericc.iob
--- a/objects/structures/shipgenericg.iob
+++ b/objects/structures/shipgenericg.iob
--- a/objects/structures/shipgenericplain.iob
+++ b/objects/structures/shipgenericplain.iob
--- a/objects/structures/shipgenericr.iob
+++ b/objects/structures/shipgenericr.iob
--- a/objects/structures/shipgenericu.iob
+++ b/objects/structures/shipgenericu.iob
--- a/objects/structures/shipgenericw.iob
+++ b/objects/structures/shipgenericw.iob