diff --git a/jigsaw-pieces/pillager-outpost/overgrown/cage.json b/jigsaw-pieces/pillager-outpost/overgrown/cage.json index 43d3af8e..d9c0bcfa 100644 --- a/jigsaw-pieces/pillager-outpost/overgrown/cage.json +++ b/jigsaw-pieces/pillager-outpost/overgrown/cage.json @@ -3,10 +3,8 @@ "connectors": [ { "name": "minecraft:feature", - "targetName": "minecraft:feature", - "rotateConnector": false, + "targetName": "", "innerConnector": false, - "pools": ["pillager-outpost/features-overgrown"], "keepEntity": false, "entityCount": 1, "position": { @@ -18,10 +16,8 @@ }, { "name": "minecraft:feature", - "targetName": "minecraft:feature", - "rotateConnector": false, + "targetName": "", "innerConnector": false, - "pools": ["pillager-outpost/features-overgrown"], "keepEntity": false, "entityCount": 1, "position": { @@ -33,10 +29,8 @@ }, { "name": "minecraft:feature", - "targetName": "minecraft:feature", - "rotateConnector": false, + "targetName": "", "innerConnector": false, - "pools": ["pillager-outpost/features-overgrown"], "keepEntity": false, "entityCount": 1, "position": { @@ -48,10 +42,8 @@ }, { "name": "minecraft:feature", - "targetName": "minecraft:feature", - "rotateConnector": false, + "targetName": "", "innerConnector": false, - "pools": ["pillager-outpost/features-overgrown"], "keepEntity": false, "entityCount": 1, "position": { @@ -63,10 +55,8 @@ }, { "name": "minecraft:feature", - "targetName": "minecraft:feature", - "rotateConnector": false, + "targetName": "", "innerConnector": false, - "pools": ["pillager-outpost/features-overgrown"], "keepEntity": false, "entityCount": 1, "position": { @@ -78,10 +68,8 @@ }, { "name": "minecraft:feature", - "targetName": "minecraft:feature", - "rotateConnector": false, + "targetName": "", "innerConnector": false, - "pools": ["pillager-outpost/features-overgrown"], "keepEntity": false, "entityCount": 1, "position": { @@ -93,10 +81,8 @@ }, { "name": "minecraft:feature", - "targetName": "minecraft:feature", - "rotateConnector": false, + "targetName": "", "innerConnector": false, - "pools": ["pillager-outpost/features-overgrown"], "keepEntity": false, "entityCount": 1, "position": { @@ -108,10 +94,8 @@ }, { "name": "minecraft:feature", - "targetName": "minecraft:feature", - "rotateConnector": false, + "targetName": "", "innerConnector": false, - "pools": ["pillager-outpost/features-overgrown"], "keepEntity": false, "entityCount": 1, "position": { @@ -121,67 +105,5 @@ }, "direction": "EAST_POSITIVE_X" } - ], - "placementOptions": { - "markers": [{ - "emptyAbove": true, - "maximumMarkers": 1, - "mark": [{"block": "minecraft:birch_planks"}], - "marker": "pillager-cage" - }], - "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 - } - }, - "clamp": { - "minimumHeight": 0, - "maximumHeight": 255 - }, - "snow": 0, - "chance": 1, - "density": 1, - "overStilt": 0, - "boreExtendMaxY": 0, - "boreExtendMinY": 0, - "underwater": false, - "carvingSupport": "SURFACE_ONLY", - "smartBore": false, - "waterloggable": false, - "onwater": false, - "meld": false, - "bottom": false, - "bore": true, - "warp": { - "style": "FLAT", - "zoom": 1, - "multiplier": 1, - "maxFractureAccuracy": false, - "exponent": 1 - }, - "translateCenter": false, - "mode": "FAST_MAX_HEIGHT", - "translate": { - "x": 0, - "y": 1, - "yRandom": 0, - "z": 0 - } - } + ] } diff --git a/jigsaw-pieces/pillager-outpost/overgrown/pumpkins1.json b/jigsaw-pieces/pillager-outpost/overgrown/pumpkins1.json index fbe74151..820fb7e7 100644 --- a/jigsaw-pieces/pillager-outpost/overgrown/pumpkins1.json +++ b/jigsaw-pieces/pillager-outpost/overgrown/pumpkins1.json @@ -3,10 +3,9 @@ "connectors": [ { "name": "minecraft:feature", - "targetName": "minecraft:feature", + "targetName": "", "rotateConnector": false, "innerConnector": false, - "pools": ["pillager-outpost/features-overgrown"], "keepEntity": false, "entityCount": 1, "position": { @@ -18,10 +17,9 @@ }, { "name": "minecraft:feature", - "targetName": "minecraft:feature", + "targetName": "", "rotateConnector": false, "innerConnector": false, - "pools": ["pillager-outpost/features-overgrown"], "keepEntity": false, "entityCount": 1, "position": { @@ -33,10 +31,9 @@ }, { "name": "minecraft:feature", - "targetName": "minecraft:feature", + "targetName": "", "rotateConnector": false, "innerConnector": false, - "pools": ["pillager-outpost/features-overgrown"], "keepEntity": false, "entityCount": 1, "position": { @@ -48,10 +45,9 @@ }, { "name": "minecraft:feature", - "targetName": "minecraft:feature", + "targetName": "", "rotateConnector": false, "innerConnector": false, - "pools": ["pillager-outpost/features-overgrown"], "keepEntity": false, "entityCount": 1, "position": { diff --git a/jigsaw-pieces/pillager-outpost/overgrown/pumpkins2.json b/jigsaw-pieces/pillager-outpost/overgrown/pumpkins2.json index 2f9efdae..e80bedfd 100644 --- a/jigsaw-pieces/pillager-outpost/overgrown/pumpkins2.json +++ b/jigsaw-pieces/pillager-outpost/overgrown/pumpkins2.json @@ -1,11 +1,10 @@ { "connectors": [ { - "targetName": "minecraft:feature", + "targetName": "", "innerConnector": false, "rotateConnector": false, "name": "minecraft:feature", - "pools": ["pillager-outpost/features-overgrown"], "position": { "x": -3, "y": 0, @@ -14,11 +13,10 @@ "direction": "NORTH_NEGATIVE_Z" }, { - "targetName": "minecraft:feature", + "targetName": "", "innerConnector": false, "rotateConnector": false, "name": "minecraft:feature", - "pools": ["pillager-outpost/features-overgrown"], "position": { "x": -3, "y": 0, @@ -27,11 +25,10 @@ "direction": "SOUTH_POSITIVE_Z" }, { - "targetName": "minecraft:feature", + "targetName": "", "innerConnector": false, "rotateConnector": false, "name": "minecraft:feature", - "pools": ["pillager-outpost/features-overgrown"], "position": { "x": 2, "y": 0, @@ -40,11 +37,10 @@ "direction": "NORTH_NEGATIVE_Z" }, { - "targetName": "minecraft:feature", + "targetName": "", "innerConnector": false, "rotateConnector": false, "name": "minecraft:feature", - "pools": ["pillager-outpost/features-overgrown"], "position": { "x": 2, "y": 0, diff --git a/jigsaw-pieces/pillager-outpost/overgrown/tent.json b/jigsaw-pieces/pillager-outpost/overgrown/tent.json index 50515259..58485916 100644 --- a/jigsaw-pieces/pillager-outpost/overgrown/tent.json +++ b/jigsaw-pieces/pillager-outpost/overgrown/tent.json @@ -3,10 +3,9 @@ "connectors": [ { "name": "minecraft:feature", - "targetName": "minecraft:feature", + "targetName": "", "rotateConnector": false, "innerConnector": false, - "pools": ["pillager-outpost/features-overgrown"], "keepEntity": false, "entityCount": 1, "position": { @@ -18,10 +17,9 @@ }, { "name": "minecraft:feature", - "targetName": "minecraft:feature", + "targetName": "", "rotateConnector": false, "innerConnector": false, - "pools": ["pillager-outpost/features-overgrown"], "keepEntity": false, "entityCount": 1, "position": { @@ -33,10 +31,9 @@ }, { "name": "minecraft:feature", - "targetName": "minecraft:feature", + "targetName": "", "rotateConnector": false, "innerConnector": false, - "pools": ["pillager-outpost/features-overgrown"], "keepEntity": false, "entityCount": 1, "position": { @@ -48,10 +45,9 @@ }, { "name": "minecraft:feature", - "targetName": "minecraft:feature", + "targetName": "", "rotateConnector": false, "innerConnector": false, - "pools": ["pillager-outpost/features-overgrown"], "keepEntity": false, "entityCount": 1, "position": { diff --git a/jigsaw-pieces/pillager-outpost/regular/feature_cage1.json b/jigsaw-pieces/pillager-outpost/regular/feature_cage1.json index ce988bec..18472b98 100644 --- a/jigsaw-pieces/pillager-outpost/regular/feature_cage1.json +++ b/jigsaw-pieces/pillager-outpost/regular/feature_cage1.json @@ -3,10 +3,8 @@ "connectors": [ { "name": "minecraft:feature", - "targetName": "minecraft:feature", - "rotateConnector": false, + "targetName": "", "innerConnector": false, - "pools": ["pillager-outpost/features"], "keepEntity": false, "entityCount": 1, "position": { @@ -18,10 +16,8 @@ }, { "name": "minecraft:feature", - "targetName": "minecraft:feature", - "rotateConnector": false, + "targetName": "", "innerConnector": false, - "pools": ["pillager-outpost/features"], "keepEntity": false, "entityCount": 1, "position": { @@ -33,10 +29,8 @@ }, { "name": "minecraft:feature", - "targetName": "minecraft:feature", - "rotateConnector": false, + "targetName": "", "innerConnector": false, - "pools": ["pillager-outpost/features"], "keepEntity": false, "entityCount": 1, "position": { @@ -48,10 +42,8 @@ }, { "name": "minecraft:feature", - "targetName": "minecraft:feature", - "rotateConnector": false, + "targetName": "", "innerConnector": false, - "pools": ["pillager-outpost/features"], "keepEntity": false, "entityCount": 1, "position": { @@ -60,82 +52,14 @@ "z": 3 }, "direction": "SOUTH_POSITIVE_Z" - }, - { - "name": "", - "targetName": "*", - "rotateConnector": false, - "innerConnector": false, - "keepEntity": false, - "entityCount": 1, - "position": { - "x": 0, - "y": 0, - "z": 0 - }, - "direction": "UP_POSITIVE_Y" } ], "placementOptions": { "markers": [{ "emptyAbove": true, "maximumMarkers": 1, - "mark": [{"block": "minecraft:birch_planks"}], + "mark": [{"block": "minecraft:dark_oak_slab"}], "marker": "pillager-cage" - }], - "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 - } - }, - "clamp": { - "minimumHeight": 0, - "maximumHeight": 255 - }, - "snow": 0, - "chance": 1, - "density": 1, - "overStilt": 0, - "boreExtendMaxY": 0, - "boreExtendMinY": 0, - "underwater": false, - "carvingSupport": "SURFACE_ONLY", - "smartBore": false, - "waterloggable": false, - "onwater": false, - "meld": false, - "bottom": false, - "bore": true, - "warp": { - "style": "FLAT", - "zoom": 1, - "multiplier": 1, - "maxFractureAccuracy": false, - "exponent": 1 - }, - "translateCenter": false, - "mode": "FAST_MIN_HEIGHT", - "translate": { - "x": 0, - "y": 2, - "yRandom": 0, - "z": 0 - } + }] } } diff --git a/jigsaw-pieces/pillager-outpost/regular/feature_cage2.json b/jigsaw-pieces/pillager-outpost/regular/feature_cage2.json index e65ad7c4..7bc58869 100644 --- a/jigsaw-pieces/pillager-outpost/regular/feature_cage2.json +++ b/jigsaw-pieces/pillager-outpost/regular/feature_cage2.json @@ -1,12 +1,11 @@ { "connectors": [ { - "targetName": "minecraft:feature", + "targetName": "", "innerConnector": false, "entityCount": 1, "rotateConnector": false, "name": "minecraft:feature", - "pools": ["pillager-outpost/features"], "position": { "x": -2, "y": 0, @@ -15,12 +14,11 @@ "direction": "SOUTH_POSITIVE_Z" }, { - "targetName": "minecraft:feature", + "targetName": "", "innerConnector": false, "entityCount": 1, "rotateConnector": false, "name": "minecraft:feature", - "pools": ["pillager-outpost/features"], "position": { "x": -2, "y": 0, @@ -29,12 +27,11 @@ "direction": "SOUTH_POSITIVE_Z" }, { - "targetName": "minecraft:feature", + "targetName": "", "innerConnector": false, "entityCount": 1, "rotateConnector": false, "name": "minecraft:feature", - "pools": ["pillager-outpost/features"], "position": { "x": 3, "y": 0, @@ -54,26 +51,13 @@ "z": 0 }, "direction": "UP_POSITIVE_Y" - }, - { - "targetName": "*", - "innerConnector": false, - "entityCount": 1, - "rotateConnector": false, - "name": "", - "position": { - "x": 0, - "y": 0, - "z": 0 - }, - "direction": "UP_POSITIVE_Y" } ], "placementOptions": { "markers": [{ "emptyAbove": true, "maximumMarkers": 1, - "mark": [{"block": "minecraft:birch_planks"}], + "mark": [{"block": "minecraft:dark_oak_slab"}], "marker": "pillager-cage" }], "overStilt": 0, diff --git a/jigsaw-pieces/pillager-outpost/regular/feature_logs.json b/jigsaw-pieces/pillager-outpost/regular/feature_logs.json index d60611af..ba86621b 100644 --- a/jigsaw-pieces/pillager-outpost/regular/feature_logs.json +++ b/jigsaw-pieces/pillager-outpost/regular/feature_logs.json @@ -1,11 +1,10 @@ { "connectors": [ { - "targetName": "minecraft:feature", + "targetName": "", "innerConnector": false, "rotateConnector": false, "name": "minecraft:feature", - "pools": ["pillager-outpost/features"], "position": { "x": -3, "y": 0, @@ -14,11 +13,10 @@ "direction": "SOUTH_POSITIVE_Z" }, { - "targetName": "minecraft:feature", + "targetName": "", "innerConnector": false, "rotateConnector": false, "name": "minecraft:feature", - "pools": ["pillager-outpost/features"], "position": { "x": -3, "y": 0, @@ -27,11 +25,10 @@ "direction": "SOUTH_POSITIVE_Z" }, { - "targetName": "minecraft:feature", + "targetName": "", "innerConnector": false, "rotateConnector": false, "name": "minecraft:feature", - "pools": ["pillager-outpost/features"], "position": { "x": 2, "y": 0, @@ -40,11 +37,10 @@ "direction": "SOUTH_POSITIVE_Z" }, { - "targetName": "minecraft:feature", + "targetName": "", "innerConnector": false, "rotateConnector": false, "name": "minecraft:feature", - "pools": ["pillager-outpost/features"], "position": { "x": 2, "y": 0, diff --git a/jigsaw-pieces/pillager-outpost/regular/feature_targets.json b/jigsaw-pieces/pillager-outpost/regular/feature_targets.json index f24739a4..01791f18 100644 --- a/jigsaw-pieces/pillager-outpost/regular/feature_targets.json +++ b/jigsaw-pieces/pillager-outpost/regular/feature_targets.json @@ -1,11 +1,12 @@ { + "object": "jigsaw/pillager-outpost/regular/feature_targets", "connectors": [ { - "targetName": "minecraft:feature", - "innerConnector": false, - "rotateConnector": false, "name": "minecraft:feature", - "pools": ["pillager-outpost/features"], + "targetName": "", + "innerConnector": false, + "keepEntity": false, + "entityCount": 1, "position": { "x": -1, "y": 0, @@ -14,11 +15,11 @@ "direction": "SOUTH_POSITIVE_Z" }, { - "targetName": "minecraft:feature", - "innerConnector": false, - "rotateConnector": false, "name": "minecraft:feature", - "pools": ["pillager-outpost/features"], + "targetName": "", + "innerConnector": false, + "keepEntity": false, + "entityCount": 1, "position": { "x": -1, "y": 0, @@ -27,24 +28,11 @@ "direction": "SOUTH_POSITIVE_Z" }, { - "targetName": "minecraft:feature", - "innerConnector": false, - "rotateConnector": false, "name": "minecraft:feature", - "pools": ["pillager-outpost/features"], - "position": { - "x": 0, - "y": 0, - "z": 0 - }, - "direction": "SOUTH_POSITIVE_Z" - }, - { - "targetName": "minecraft:feature", + "targetName": "", "innerConnector": false, - "rotateConnector": false, - "name": "minecraft:feature", - "pools": ["pillager-outpost/features"], + "keepEntity": false, + "entityCount": 1, "position": { "x": 1, "y": 0, @@ -53,11 +41,11 @@ "direction": "SOUTH_POSITIVE_Z" }, { - "targetName": "minecraft:feature", - "innerConnector": false, - "rotateConnector": false, "name": "minecraft:feature", - "pools": ["pillager-outpost/features"], + "targetName": "", + "innerConnector": false, + "keepEntity": false, + "entityCount": 1, "position": { "x": 1, "y": 0, @@ -65,68 +53,5 @@ }, "direction": "SOUTH_POSITIVE_Z" } - ], - "placementOptions": { - "markers": [{ - "emptyAbove": true, - "maximumMarkers": 1, - "mark": [{"block": "minecraft:birch_planks"}], - "marker": "pillager-cage" - }], - "overStilt": 0, - "chance": 1, - "meld": false, - "density": 1, - "bottom": false, - "translateCenter": false, - "rotation": { - "yAxis": { - "min": 0, - "max": 0, - "interval": 90, - "enabled": true - }, - "xAxis": { - "min": 0, - "max": 0, - "interval": 0, - "enabled": false - }, - "zAxis": { - "min": 0, - "max": 0, - "interval": 0, - "enabled": false - }, - "enabled": true - }, - "boreExtendMinY": 0, - "smartBore": false, - "waterloggable": false, - "bore": false, - "translate": { - "yRandom": 0, - "x": 0, - "y": 1, - "z": 0 - }, - "mode": "FAST_MAX_HEIGHT", - "carvingSupport": "SURFACE_ONLY", - "snow": 0, - "underwater": false, - "boreExtendMaxY": 0, - "onwater": false, - "clamp": { - "minimumHeight": 0, - "maximumHeight": 255 - }, - "warp": { - "multiplier": 1, - "style": "FLAT", - "zoom": 1, - "maxFractureAccuracy": false, - "exponent": 1 - } - }, - "object": "jigsaw/pillager-outpost/regular/feature_targets" + ] } diff --git a/jigsaw-pieces/pillager-outpost/regular/feature_tent1.json b/jigsaw-pieces/pillager-outpost/regular/feature_tent1.json index 34e075b0..8aa00cf9 100644 --- a/jigsaw-pieces/pillager-outpost/regular/feature_tent1.json +++ b/jigsaw-pieces/pillager-outpost/regular/feature_tent1.json @@ -1,11 +1,10 @@ { "connectors": [ { - "targetName": "minecraft:feature", + "targetName": "", "innerConnector": false, "rotateConnector": false, "name": "minecraft:feature", - "pools": ["pillager-outpost/features"], "position": { "x": -3, "y": -2, @@ -14,11 +13,10 @@ "direction": "SOUTH_POSITIVE_Z" }, { - "targetName": "minecraft:feature", + "targetName": "", "innerConnector": false, "rotateConnector": false, "name": "minecraft:feature", - "pools": ["pillager-outpost/features"], "position": { "x": -3, "y": -2, @@ -27,11 +25,10 @@ "direction": "SOUTH_POSITIVE_Z" }, { - "targetName": "minecraft:feature", + "targetName": "", "innerConnector": false, "rotateConnector": false, "name": "minecraft:feature", - "pools": ["pillager-outpost/features"], "position": { "x": 2, "y": -2, @@ -40,11 +37,10 @@ "direction": "SOUTH_POSITIVE_Z" }, { - "targetName": "minecraft:feature", + "targetName": "", "innerConnector": false, "rotateConnector": false, "name": "minecraft:feature", - "pools": ["pillager-outpost/features"], "position": { "x": 2, "y": -2, @@ -54,12 +50,6 @@ } ], "placementOptions": { - "markers": [{ - "emptyAbove": true, - "maximumMarkers": 1, - "mark": [{"block": "minecraft:birch_planks"}], - "marker": "pillager-cage" - }], "overStilt": 0, "chance": 1, "meld": false, diff --git a/jigsaw-pieces/pillager-outpost/regular/feature_tent2.json b/jigsaw-pieces/pillager-outpost/regular/feature_tent2.json index 55d41824..08f95619 100644 --- a/jigsaw-pieces/pillager-outpost/regular/feature_tent2.json +++ b/jigsaw-pieces/pillager-outpost/regular/feature_tent2.json @@ -1,11 +1,10 @@ { "connectors": [ { - "targetName": "minecraft:feature", + "targetName": "", "innerConnector": false, "rotateConnector": false, "name": "minecraft:feature", - "pools": ["pillager-outpost/features"], "position": { "x": -3, "y": -1, @@ -14,11 +13,10 @@ "direction": "SOUTH_POSITIVE_Z" }, { - "targetName": "minecraft:feature", + "targetName": "", "innerConnector": false, "rotateConnector": false, "name": "minecraft:feature", - "pools": ["pillager-outpost/features"], "position": { "x": -3, "y": -1, @@ -27,11 +25,10 @@ "direction": "SOUTH_POSITIVE_Z" }, { - "targetName": "minecraft:feature", + "targetName": "", "innerConnector": false, "rotateConnector": false, "name": "minecraft:feature", - "pools": ["pillager-outpost/features"], "position": { "x": 2, "y": -1, @@ -40,11 +37,10 @@ "direction": "SOUTH_POSITIVE_Z" }, { - "targetName": "minecraft:feature", + "targetName": "", "innerConnector": false, "rotateConnector": false, "name": "minecraft:feature", - "pools": ["pillager-outpost/features"], "position": { "x": 2, "y": -1, @@ -54,12 +50,6 @@ } ], "placementOptions": { - "markers": [{ - "emptyAbove": true, - "maximumMarkers": 1, - "mark": [{"block": "minecraft:birch_planks"}], - "marker": "pillager-cage" - }], "overStilt": 0, "chance": 1, "meld": false, diff --git a/jigsaw-pieces/pillager-outpost/watchtower.json b/jigsaw-pieces/pillager-outpost/watchtower.json index 5075f391..7af42106 100644 --- a/jigsaw-pieces/pillager-outpost/watchtower.json +++ b/jigsaw-pieces/pillager-outpost/watchtower.json @@ -19,7 +19,7 @@ "name": "", "targetName": "*", "innerConnector": false, - "pools": [], + "pools": ["pillager-outpost/features"], "keepEntity": false, "entityCount": 1, "position": { @@ -57,34 +57,6 @@ }, "direction": "EAST_POSITIVE_X" }, - { - "name": "", - "targetName": "*", - "innerConnector": false, - "pools": ["pillager-outpost/features"], - "keepEntity": false, - "entityCount": 1, - "position": { - "x": 3, - "y": -9, - "z": 7 - }, - "direction": "SOUTH_POSITIVE_Z" - }, - { - "name": "", - "targetName": "*", - "innerConnector": false, - "pools": ["pillager-outpost/features"], - "keepEntity": false, - "entityCount": 1, - "position": { - "x": -3, - "y": -9, - "z": 7 - }, - "direction": "SOUTH_POSITIVE_Z" - }, { "name": "", "targetName": "*", @@ -113,5 +85,13 @@ }, "direction": "WEST_NEGATIVE_X" } - ] + ], + "placementOptions": { + "markers": [{ + "emptyAbove": true, + "maximumMarkers": 4, + "mark": [{"block": "minecraft:birch_planks"}], + "marker": "pillager" + }] + } } diff --git a/jigsaw-pieces/pillager-outpost/watchtower_overgrown.json b/jigsaw-pieces/pillager-outpost/watchtower_overgrown.json index ab66323d..5e338e80 100644 --- a/jigsaw-pieces/pillager-outpost/watchtower_overgrown.json +++ b/jigsaw-pieces/pillager-outpost/watchtower_overgrown.json @@ -1,13 +1,13 @@ { + "object": "jigsaw/pillager-outpost/watchtower_overgrown", "connectors": [ { + "name": "", "targetName": "*", "innerConnector": false, - "entityCount": 1, - "spawnEntity:": "", - "rotateConnector": false, - "name": "", "pools": ["pillager-outpost/features-overgrown"], + "keepEntity": false, + "entityCount": 1, "position": { "x": -3, "y": -10, @@ -16,12 +16,12 @@ "direction": "NORTH_NEGATIVE_Z" }, { + "name": "", "targetName": "*", "innerConnector": true, + "pools": ["pillager-outpost/features-overgrown"], + "keepEntity": false, "entityCount": 1, - "spawnEntity:": "", - "rotateConnector": false, - "name": "", "position": { "x": 3, "y": -10, @@ -30,13 +30,12 @@ "direction": "NORTH_NEGATIVE_Z" }, { + "name": "", "targetName": "*", "innerConnector": false, - "entityCount": 1, - "spawnEntity:": "", - "rotateConnector": false, - "name": "", "pools": ["pillager-outpost/features-overgrown"], + "keepEntity": false, + "entityCount": 1, "position": { "x": 7, "y": -10, @@ -45,13 +44,12 @@ "direction": "EAST_POSITIVE_X" }, { + "name": "", "targetName": "*", "innerConnector": false, - "entityCount": 1, - "spawnEntity:": "", - "rotateConnector": false, - "name": "", "pools": ["pillager-outpost/features-overgrown"], + "keepEntity": false, + "entityCount": 1, "position": { "x": 7, "y": -10, @@ -60,43 +58,12 @@ "direction": "EAST_POSITIVE_X" }, { + "name": "", "targetName": "*", "innerConnector": false, - "entityCount": 1, - "spawnEntity:": "", - "rotateConnector": false, - "name": "", "pools": ["pillager-outpost/features-overgrown"], - "position": { - "x": 3, - "y": -10, - "z": 7 - }, - "direction": "SOUTH_POSITIVE_Z" - }, - { - "targetName": "*", - "innerConnector": false, + "keepEntity": false, "entityCount": 1, - "spawnEntity:": "", - "rotateConnector": false, - "name": "", - "pools": ["pillager-outpost/features-overgrown"], - "position": { - "x": -3, - "y": -10, - "z": 7 - }, - "direction": "SOUTH_POSITIVE_Z" - }, - { - "targetName": "*", - "innerConnector": false, - "entityCount": 1, - "spawnEntity:": "", - "rotateConnector": false, - "name": "", - "pools": ["pillager-outpost/features-overgrown"], "position": { "x": -7, "y": -10, @@ -105,13 +72,12 @@ "direction": "WEST_NEGATIVE_X" }, { + "name": "", "targetName": "*", "innerConnector": false, - "entityCount": 1, - "spawnEntity:": "", - "rotateConnector": false, - "name": "", "pools": ["pillager-outpost/features-overgrown"], + "keepEntity": false, + "entityCount": 1, "position": { "x": -7, "y": -10, @@ -119,141 +85,5 @@ }, "direction": "WEST_NEGATIVE_X" } - ], - "placementOptions": { - "loot": ["structures/pillager-outpost"], - "markers": [{ - "emptyAbove": true, - "maximumMarkers": 3, - "mark": [{"block": "minecraft:birch_planks"}], - "marker": "pillager" - }], - "overStilt": 0, - "chance": 1, - "meld": false, - "density": 1, - "boreExtendMinY": 0, - "edit": [ - { - "find": [{"block": "minecraft:oak_planks"}], - "replace": {"palette": [ - { - "block": "minecraft:birch_planks", - "weight": 5 - }, - { - "block": "minecraft:void_air", - "weight": 2 - } - ]}, - "chance": 1 - }, - { - "find": [{"block": "minecraft:oak_slab"}], - "replace": {"palette": [ - { - "block": "minecraft:birch_slab", - "weight": 5 - }, - { - "block": "minecraft:void_air", - "weight": 2 - } - ]}, - "chance": 1 - }, - { - "find": [{"block": "minecraft:spruce_planks"}], - "replace": {"palette": [ - { - "block": "minecraft:dark_oak_planks", - "weight": 5 - }, - { - "block": "minecraft:void_air", - "weight": 2 - } - ]}, - "chance": 1 - }, - { - "find": [{"block": "minecraft:spruce_slab"}], - "replace": {"palette": [ - { - "block": "minecraft:dark_oak_slab", - "weight": 5 - }, - { - "block": "minecraft:void_air", - "weight": 2 - } - ]}, - "chance": 1 - }, - { - "find": [{"block": "minecraft:cobblestone"}], - "replace": {"palette": [ - { - "block": "minecraft:cobblestone", - "weight": 5 - }, - { - "block": "minecraft:mossy_cobblestone", - "weight": 2 - } - ]}, - "chance": 1 - } - ], - "bottom": false, - "translateCenter": false, - "rotation": { - "yAxis": { - "min": 0, - "max": 0, - "interval": 90, - "enabled": true - }, - "xAxis": { - "min": 0, - "max": 0, - "interval": 0, - "enabled": false - }, - "zAxis": { - "min": 0, - "max": 0, - "interval": 0, - "enabled": false - }, - "enabled": true - }, - "boreExtendMaxY": 0, - "smartBore": false, - "waterloggable": false, - "bore": false, - "translate": { - "yRandom": 0, - "x": 0, - "y": -1, - "z": 0 - }, - "mode": "FAST_MIN_HEIGHT", - "carvingSupport": "SURFACE_ONLY", - "snow": 0, - "underwater": false, - "onwater": false, - "clamp": { - "minimumHeight": 0, - "maximumHeight": 255 - }, - "warp": { - "multiplier": 1, - "style": "FLAT", - "zoom": 1, - "maxFractureAccuracy": false, - "exponent": 1 - } - }, - "object": "jigsaw/pillager-outpost/watchtower_overgrown" + ] } diff --git a/jigsaw-pools/pillager-outpost/watchtower.json b/jigsaw-pools/pillager-outpost/watchtower.json deleted file mode 100644 index 902e9f70..00000000 --- a/jigsaw-pools/pillager-outpost/watchtower.json +++ /dev/null @@ -1,6 +0,0 @@ -{"pieces": [ - "pillager-outpost/watchtower", - "pillager-outpost/watchtower", - "pillager-outpost/watchtower", - "pillager-outpost/watchtower_overgrown" -]} diff --git a/jigsaw-structures/pillager-outpost.json b/jigsaw-structures/pillager-outpost.json index cc578a33..77103153 100644 --- a/jigsaw-structures/pillager-outpost.json +++ b/jigsaw-structures/pillager-outpost.json @@ -1,16 +1,10 @@ { "maxDepth": 2, "pieces": [ + "pillager-outpost/watchtower", + "pillager-outpost/watchtower", "pillager-outpost/watchtower", "pillager-outpost/watchtower", "pillager-outpost/watchtower_overgrown" - ], - "terminate": true, - "feature": { - "blockRadius": 10, - "entitySpawners": [ - "structure/pillager", - "structure/pillager-respawn" - ] - } + ] } diff --git a/spawners/structure/pillager-cage-respawn.json b/spawners/structure/pillager-cage-respawn.json index 6a88bd3a..2e8f3cef 100644 --- a/spawners/structure/pillager-cage-respawn.json +++ b/spawners/structure/pillager-cage-respawn.json @@ -13,13 +13,13 @@ "spawns": [ { "entity": "standard/passive/allay", - "maxSpawns": 5, - "minSpawns": 3, + "maxSpawns": 2, + "minSpawns": 1, "rarity": 4 }, { "entity": "standard/neutral/irongolem", - "maxSpawns": 3, + "maxSpawns": 1, "minSpawns": 1, "rarity": 4 } diff --git a/spawners/structure/pillager.json b/spawners/structure/pillager.json index a7919460..23d6fc33 100644 --- a/spawners/structure/pillager.json +++ b/spawners/structure/pillager.json @@ -6,8 +6,8 @@ "maxEntitiesPerChunk": 2, "initialSpawns": [{ "entity": "standard/hostile/pillager", - "rarity": 2, - "maxSpawns": 2, - "minSpawns": 1 + "rarity": 1, + "maxSpawns": 6, + "minSpawns": 3 }] }