-
-
Notifications
You must be signed in to change notification settings - Fork 4
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Better Mod/Datapack Compatibility (#24)
* Add Structure Tags for Map Display - hide technical structures from Jacobsjo's map * Fix Swamp Huts in the Void - the hut would generate (blocks included) at the bottom of the world if the negative-most corner wasn't a swamp * All Structure Bounding Boxes - all structure bounding boxes are now present - geode placed features will delete all blocks placed before the `underground_decoration` step (i.e. structures) - vanilla structures that use `structure` files are replaced with files containing air only to reduce lag - some vanilla structures still bugged and generate at the bottom (likely due to heightmap checks like the swamp hut) - ocean ruin - ruined portal - desert pyramid - jungle pyramid - shipwreck * More Parity Fixes Ruined portals and shipwrecks get properly deleted - beached shipwrecks only properly generate if the overworld fluid is water Stronghold bounding boxes generate - for default `skyvoid_worldgen`, the portal generates at the same location as the portal room (tho not with the same number of eyes for some reason) Exit end portals generate at the proper height - convert end fix to use configured features instead of post-gen function Removed unused purge stuff - swamp huts don't need extra logic - fortress post-gen removal no longer needed Generate initially with jigsaws - Deletion of jigsaws all but guarantees no custom structures are touched (some may have used barriers in their structures) * run build * remove unused structures from tag these no longer exist * Increase purge range for nether and end Both dimensions have a height of 256, not 128. In vanilla both dimensions only have terrain up to 128, but other structure packs (and end cities in vanilla) can generate above that level * make starter chest loot table driven allows overwriting the starter chest contents without changing the structure file * make `end_fix` only in `the_end` biome other end biomes don't need the fix since it's hardcoded to 0 0 * Terrain Compatibility Add script to download specific datapacks and modify conflicting worldgen files Terralith, Nullscape, and Amplified Nether have working compatibility patches * bump versions - worldgen increase major - islands increase minor - bundles increase major (since worldgen major change) * READMEs and Images - add pack.png for compat packs - add README for compat packs - add info about compat in standard skyblock
- Loading branch information
Showing
679 changed files
with
1,415 additions
and
1,142 deletions.
There are no files selected for viewing
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file renamed
BIN
+38.6 KB
...kyvoid_island_oneblock_v1_2_5-MC_1_21.zip → ...kyvoid_island_oneblock_v1_3_0-MC_1_21.zip
Binary file not shown.
Binary file renamed
BIN
+99.5 KB
...yvoid_island_only_dirt_v1_0_5-MC_1_21.zip → ...yvoid_island_only_dirt_v1_1_0-MC_1_21.zip
Binary file not shown.
Binary file renamed
BIN
+114 KB
...kyvoid_island_standard_v1_0_7-MC_1_21.zip → ...kyvoid_island_standard_v1_1_0-MC_1_21.zip
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,7 +1,7 @@ | ||
id: 'skyvoid_skyblock_dirt' | ||
name: 'SkyBlock Dirt Hardcore' | ||
author: 'BluePsychoRanger' | ||
version: 1.1.1 | ||
version: 2.0.0 | ||
|
||
pipeline: | ||
- src.plugins.bundle.skyblock_dirt |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,7 +1,7 @@ | ||
id: 'skyvoid_standard_skyblock' | ||
name: 'Standard SkyBlock' | ||
author: 'BluePsychoRanger' | ||
version: 1.1.0 | ||
version: 2.0.0 | ||
|
||
pipeline: | ||
- src.plugins.bundle.standard_skyblock |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,7 +1,7 @@ | ||
id: 'skyvoid_vanilla_oneblock' | ||
name: 'Vanilla One Block' | ||
author: 'BluePsychoRanger' | ||
version: 1.3.2 | ||
version: 2.0.0 | ||
|
||
pipeline: | ||
- src.plugins.bundle.vanilla_oneblock |
14 changes: 14 additions & 0 deletions
14
src/packs/compat/skyvoid_amplified_nether_compat/README.md
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,14 @@ | ||
Interact: [](https://discord.gg/mzWSZuGatd) | ||
[](https://github.com/BluePsychoRanger/SkyBlock_Collection) | ||
Download: [](https://smithed.net/packs/sky-void-amplified-nether) | ||
[](https://modrinth.com/datapack/sky-void-amplified-nether) | ||
Support: [](https://bmc.link/bluepsychoranger) | ||
[](https://www.bisecthosting.com/skyvoid) | ||
## SkyBlock Amplified Nether Compatibility Patch | ||
This datapack adds compatibility between [Standard SkyBlock](https://smithed.net/packs/standard-skyblock) and [Amplified Nether](https://modrinth.com/datapack/amplified-nether). | ||
|
||
This pack requires both Amplified Nether and Standard SkyBlock. Make sure the compatibility pack loads after (i.e. above) both packs. The order of the other two doesn't matter. | ||
|
||
 | ||
|
||
When these three packs are installed, the nether will be extended to 384 blocks high, but will have no blocks. In SkyBlock this doesn't have a very noticeable change, but this pack is an option for those who want to build higher. |
10 changes: 10 additions & 0 deletions
10
src/packs/compat/skyvoid_amplified_nether_compat/beet.yaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,10 @@ | ||
id: 'skyvoid_compat_amplified_nether' | ||
name: 'SkyBlock Amplified Nether' | ||
author: 'BluePsychoRanger' | ||
version: 1.2.5 | ||
|
||
pipeline: | ||
- src.plugins.worldgen.compat.amplified_nether | ||
|
||
data_pack: | ||
load: . |
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,14 @@ | ||
Interact: [](https://discord.gg/mzWSZuGatd) | ||
[](https://github.com/BluePsychoRanger/SkyBlock_Collection) | ||
Download: [](https://smithed.net/packs/sky-void-nullscape) | ||
[](https://modrinth.com/datapack/sky-void-nullscape) | ||
Support: [](https://bmc.link/bluepsychoranger) | ||
[](https://www.bisecthosting.com/skyvoid) | ||
## SkyBlock Nullscape Compatibility Patch | ||
This datapack adds compatibility between [Standard SkyBlock](https://smithed.net/packs/standard-skyblock) and [Nullscape](https://modrinth.com/datapack/nullscape). | ||
|
||
This pack requires both Nullscape and Standard SkyBlock. Make sure the compatibility pack loads after (i.e. above) both packs. The order of the other two doesn't matter. | ||
|
||
 | ||
|
||
When these three packs are installed, the end will be extended to 384 blocks high and will contain the Nullscape custom biomes, but no blocks. Similar to Standard Skyblock, the exit end portal, obsidian pillars, return gateways, and end city ships will still generate. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,10 @@ | ||
id: 'skyvoid_compat_nullscape' | ||
name: 'SkyBlock Nullscape Compat' | ||
author: 'BluePsychoRanger' | ||
version: 1.2.8 | ||
|
||
pipeline: | ||
- src.plugins.worldgen.compat.nullscape | ||
|
||
data_pack: | ||
load: . |
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,14 @@ | ||
Interact: [](https://discord.gg/mzWSZuGatd) | ||
[](https://github.com/BluePsychoRanger/SkyBlock_Collection) | ||
Download: [](https://smithed.net/packs/sky-void-terralith) | ||
[](https://modrinth.com/datapack/sky-void-terralith) | ||
Support: [](https://bmc.link/bluepsychoranger) | ||
[](https://www.bisecthosting.com/skyvoid) | ||
## SkyBlock Terralith Compatibility Patch | ||
This datapack adds compatibility between [Standard SkyBlock](https://smithed.net/packs/standard-skyblock) and [Terralith](https://modrinth.com/datapack/terralith). | ||
|
||
This pack requires both Terralith and Standard SkyBlock. Make sure the compatibility pack loads after (i.e. above) both packs. The order of the other two doesn't matter. | ||
|
||
 | ||
|
||
When these three packs are installed, the overworld will be pure void (i.e. no generated blocks) and contain the custom biomes and structure bounding boxes added by Terralith. The world will have structure bounding boxes in the exact locations as a world with only Terralith. Using this pack will also add compatibility for [Terratonic](https://modrinth.com/datapack/terratonic), but the only noticeable change in a skyblock world is a change to bounding box locations. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,10 @@ | ||
id: 'skyvoid_compat_terralith' | ||
name: 'SkyBlock Terralith Compat' | ||
author: 'BluePsychoRanger' | ||
version: 2.5.5 | ||
|
||
pipeline: | ||
- src.plugins.worldgen.compat.terralith | ||
|
||
data_pack: | ||
load: . |
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
5 changes: 5 additions & 0 deletions
5
...rter_islands/skyvoid_only_dirt/data/c/tags/worldgen/structure/hidden_from_displayers.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,5 @@ | ||
{ | ||
"values": [ | ||
"skyvoid_only_dirt:snowy_taiga_marker" | ||
] | ||
} |
2 changes: 1 addition & 1 deletion
2
...ands/skyvoid_only_dirt/data/skyvoid_only_dirt/function/versioning/resolve_load.mcfunction
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
4 changes: 2 additions & 2 deletions
4
...slands/skyvoid_only_dirt/data/skyvoid_only_dirt/function/versioning/send_error.mcfunction
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
execute if score skyvoid_worldgen load.status matches ..0 run tellraw @a [{"text":"Vanilla One Block was not generated because skyvoid_worldgen is outdated","color":"red"}] | ||
execute if score skyvoid_worldgen load.status matches 2.. run tellraw @a [{"text":"Vanilla One Block was not generated because it requires an older version of skyvoid_worldgen","color":"red"}] | ||
execute if score skyvoid_worldgen load.status matches ..1 run tellraw @a [{"text":"Vanilla One Block was not generated because skyvoid_worldgen is outdated","color":"red"}] | ||
execute if score skyvoid_worldgen load.status matches 3.. run tellraw @a [{"text":"Vanilla One Block was not generated because it requires an older version of skyvoid_worldgen","color":"red"}] | ||
|
||
execute unless entity @a[limit=1] run schedule function skyvoid_only_dirt:versioning/send_error 2t |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
...ndard_skyblock/data/skyvoid_standard_skyblock/function/versioning/resolve_load.mcfunction
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,2 +1,2 @@ | ||
execute if score skyvoid_worldgen load.status matches 1 unless score skyvoid_vanilla_oneblock load.status matches 1.. run scoreboard players set skyvoid_standard_skyblock load.status 1 | ||
execute if score skyvoid_worldgen load.status matches 2 unless score skyvoid_vanilla_oneblock load.status matches 1.. run scoreboard players set skyvoid_standard_skyblock load.status 1 | ||
execute unless score skyvoid_standard_skyblock load.status matches 1 run schedule function skyvoid_standard_skyblock:versioning/send_error 2t |
4 changes: 2 additions & 2 deletions
4
...tandard_skyblock/data/skyvoid_standard_skyblock/function/versioning/send_error.mcfunction
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
execute if score skyvoid_worldgen load.status matches ..0 run tellraw @a [{"text":"Standard SkyBlock Island was not generated because skyvoid_worldgen is outdated","color":"red"}] | ||
execute if score skyvoid_worldgen load.status matches 2.. run tellraw @a [{"text":"Standard SkyBlock Island was not generated because it requires an older version of skyvoid_worldgen","color":"red"}] | ||
execute if score skyvoid_worldgen load.status matches ..1 run tellraw @a [{"text":"Standard SkyBlock Island was not generated because skyvoid_worldgen is outdated","color":"red"}] | ||
execute if score skyvoid_worldgen load.status matches 3.. run tellraw @a [{"text":"Standard SkyBlock Island was not generated because it requires an older version of skyvoid_worldgen","color":"red"}] | ||
|
||
execute unless entity @a[limit=1] run schedule function skyvoid_standard_skyblock:versioning/send_error 2t |
22 changes: 22 additions & 0 deletions
22
...ds/skyvoid_standard_skyblock/data/skyvoid_standard_skyblock/loot_table/starter_chest.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,22 @@ | ||
{ | ||
"pools": [ | ||
{ | ||
"rolls": 1, | ||
"entries": [ | ||
{ | ||
"type": "minecraft:item", | ||
"name": "minecraft:ice" | ||
} | ||
] | ||
}, | ||
{ | ||
"rolls": 1, | ||
"entries": [ | ||
{ | ||
"type": "minecraft:item", | ||
"name": "minecraft:lava_bucket" | ||
} | ||
] | ||
} | ||
] | ||
} |
Binary file modified
BIN
-21 Bytes
(99%)
...nds/skyvoid_standard_skyblock/data/skyvoid_standard_skyblock/structure/starter_island.nbt
Binary file not shown.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
5 changes: 5 additions & 0 deletions
5
...lands/skyvoid_vanilla_oneblock/data/c/tags/worldgen/structure/hidden_from_displayers.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,5 @@ | ||
{ | ||
"values": [ | ||
"skyvoid_vanilla_oneblock:snowy_taiga_marker" | ||
] | ||
} |
2 changes: 1 addition & 1 deletion
2
...anilla_oneblock/data/skyvoid_vanilla_oneblock/function/versioning/resolve_load.mcfunction
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
4 changes: 2 additions & 2 deletions
4
..._vanilla_oneblock/data/skyvoid_vanilla_oneblock/function/versioning/send_error.mcfunction
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
execute if score skyvoid_worldgen load.status matches ..0 run tellraw @a [{"text":"Vanilla One Block was not generated because skyvoid_worldgen is outdated","color":"red"}] | ||
execute if score skyvoid_worldgen load.status matches 2.. run tellraw @a [{"text":"Vanilla One Block was not generated because it requires an older version of skyvoid_worldgen","color":"red"}] | ||
execute if score skyvoid_worldgen load.status matches ..1 run tellraw @a [{"text":"Vanilla One Block was not generated because skyvoid_worldgen is outdated","color":"red"}] | ||
execute if score skyvoid_worldgen load.status matches 3.. run tellraw @a [{"text":"Vanilla One Block was not generated because it requires an older version of skyvoid_worldgen","color":"red"}] | ||
|
||
execute unless entity @a[limit=1] run schedule function skyvoid_vanilla_oneblock:versioning/send_error 2t |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
8 changes: 0 additions & 8 deletions
8
src/packs/worldgen/base/data/skyvoid_worldgen/function/v1.0/end_fix.mcfunction
This file was deleted.
Oops, something went wrong.
6 changes: 0 additions & 6 deletions
6
src/packs/worldgen/base/data/skyvoid_worldgen/function/v1.0/initialize.mcfunction
This file was deleted.
Oops, something went wrong.
5 changes: 0 additions & 5 deletions
5
src/packs/worldgen/base/data/skyvoid_worldgen/tags/function/initialize.json
This file was deleted.
Oops, something went wrong.
30 changes: 30 additions & 0 deletions
30
src/packs/worldgen/base/data/skyvoid_worldgen/worldgen/configured_feature/end_fix.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,30 @@ | ||
{ | ||
"type": "minecraft:block_column", | ||
"config": { | ||
"direction": "down", | ||
"allowed_placement": { | ||
"type": "minecraft:true" | ||
}, | ||
"prioritize_tip": true, | ||
"layers": [ | ||
{ | ||
"height": 1, | ||
"provider": { | ||
"type": "minecraft:simple_state_provider", | ||
"state": { | ||
"Name": "minecraft:oak_leaves" | ||
} | ||
} | ||
}, | ||
{ | ||
"height": 1, | ||
"provider": { | ||
"type": "minecraft:simple_state_provider", | ||
"state": { | ||
"Name": "minecraft:end_stone" | ||
} | ||
} | ||
} | ||
] | ||
} | ||
} |
16 changes: 0 additions & 16 deletions
16
...rldgen/base/data/skyvoid_worldgen/worldgen/configured_feature/purge/end_second_layer.json
This file was deleted.
Oops, something went wrong.
19 changes: 19 additions & 0 deletions
19
src/packs/worldgen/base/data/skyvoid_worldgen/worldgen/placed_feature/end_fix.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,19 @@ | ||
{ | ||
"feature": "skyvoid_worldgen:end_fix", | ||
"placement": [ | ||
{ | ||
"type": "minecraft:fixed_placement", | ||
"positions": [ | ||
[ | ||
0, | ||
100, | ||
0 | ||
] | ||
] | ||
}, | ||
{ | ||
"type": "minecraft:heightmap", | ||
"heightmap": "WORLD_SURFACE_WG" | ||
} | ||
] | ||
} |
31 changes: 0 additions & 31 deletions
31
...s/worldgen/base/data/skyvoid_worldgen/worldgen/placed_feature/purge/end_second_layer.json
This file was deleted.
Oops, something went wrong.
Oops, something went wrong.