-
Notifications
You must be signed in to change notification settings - Fork 38
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Original changes to worldgen to move to a JSON loading schema for everything.
- Loading branch information
1 parent
3b7d26a
commit bdd285e
Showing
9 changed files
with
6,278 additions
and
18 deletions.
There are no files selected for viewing
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 |
|---|---|---|
| @@ -0,0 +1,47 @@ | ||
| { | ||
| "version": "0.2.0", | ||
| "configurations": [ | ||
| { | ||
| "type": "java", | ||
| "name": "runClient", | ||
| "request": "launch", | ||
| "mainClass": "cpw.mods.bootstraplauncher.BootstrapLauncher", | ||
| "projectName": "Atum2", | ||
| "cwd": "${workspaceFolder}\\run", | ||
| "vmArgs": "-DlegacyClassPath.file\u003dC:\\Users\\Shado\\Documents\\GitHub\\Atum2\\build\\classpath\\runClient_minecraftClasspath.txt -Dmixin.env.remapRefMap\u003dtrue -Dmixin.env.refMapRemappingFile\u003dC:\\Users\\Shado\\Documents\\GitHub\\Atum2\\build/createSrgToMcp/output.srg -DignoreList\u003dbootstraplauncher,securejarhandler,asm-commons,asm-util,asm-analysis,asm-tree,asm,JarJarFileSystems,client-extra,fmlcore,javafmllanguage,lowcodelanguage,mclanguage,forge- -DmergeModules\u003djna-5.10.0.jar,jna-platform-5.10.0.jar -Dforge.enableGameTest\u003dtrue -Djava.net.preferIPv6Addresses\u003dsystem -p C:\\Users\\Shado\\.gradle\\caches\\modules-2\\files-2.1\\cpw.mods\\bootstraplauncher\\1.1.2\\c546e00443d8432cda6baa1c860346980742628\\bootstraplauncher-1.1.2.jar;C:\\Users\\Shado\\.gradle\\caches\\modules-2\\files-2.1\\cpw.mods\\securejarhandler\\2.1.6\\66c15fc1f522b586476e9e4cccd0cbe192554e8a\\securejarhandler-2.1.6.jar;C:\\Users\\Shado\\.gradle\\caches\\modules-2\\files-2.1\\org.ow2.asm\\asm-commons\\9.3\\1f2a432d1212f5c352ae607d7b61dcae20c20af5\\asm-commons-9.3.jar;C:\\Users\\Shado\\.gradle\\caches\\modules-2\\files-2.1\\org.ow2.asm\\asm-util\\9.3\\9595bc05510d0bd4b610188b77333fe4851a1975\\asm-util-9.3.jar;C:\\Users\\Shado\\.gradle\\caches\\modules-2\\files-2.1\\org.ow2.asm\\asm-analysis\\9.3\\4b071f211b37c38e0e9f5998550197c8593f6ad8\\asm-analysis-9.3.jar;C:\\Users\\Shado\\.gradle\\caches\\modules-2\\files-2.1\\org.ow2.asm\\asm-tree\\9.3\\78d2ecd61318b5a58cd04fb237636c0e86b77d97\\asm-tree-9.3.jar;C:\\Users\\Shado\\.gradle\\caches\\modules-2\\files-2.1\\org.ow2.asm\\asm\\9.3\\8e6300ef51c1d801a7ed62d07cd221aca3a90640\\asm-9.3.jar;C:\\Users\\Shado\\.gradle\\caches\\modules-2\\files-2.1\\net.minecraftforge\\JarJarFileSystems\\0.3.19\\2464eb7d6b9ddb9db36a82cf8a95193e5c6fe020\\JarJarFileSystems-0.3.19.jar --add-modules ALL-MODULE-PATH --add-opens java.base/java.util.jar\u003dcpw.mods.securejarhandler --add-opens java.base/java.lang.invoke\u003dcpw.mods.securejarhandler --add-exports java.base/sun.security.util\u003dcpw.mods.securejarhandler --add-exports jdk.naming.dns/com.sun.jndi.dns\u003djava.naming -XX:HeapDumpPath\u003dMojangTricksIntelDriversForPerformance_javaw.exe_minecraft.exe.heapdump \"-Dos.name\u003dWindows 10\" -Dos.version\u003d10.0", | ||
| "args": "--launchTarget forgeclientuserdev --version MOD_DEV --assetIndex 3 --assetsDir C:\\Users\\Shado\\.gradle\\caches\\forge_gradle\\assets --gameDir . --fml.forgeVersion 45.0.46 --fml.mcVersion 1.19.4 --fml.forgeGroup net.minecraftforge --fml.mcpVersion 20230314.122934", | ||
| "env": { | ||
| "MOD_CLASSES": "", | ||
| "MCP_MAPPINGS": "official_1.19.4" | ||
| } | ||
| }, | ||
| { | ||
| "type": "java", | ||
| "name": "runData", | ||
| "request": "launch", | ||
| "mainClass": "cpw.mods.bootstraplauncher.BootstrapLauncher", | ||
| "projectName": "Atum2", | ||
| "cwd": "${workspaceFolder}\\run", | ||
| "vmArgs": "-DlegacyClassPath.file\u003dC:\\Users\\Shado\\Documents\\GitHub\\Atum2\\build\\classpath\\runData_minecraftClasspath.txt -DignoreList\u003dbootstraplauncher,securejarhandler,asm-commons,asm-util,asm-analysis,asm-tree,asm,JarJarFileSystems,client-extra,fmlcore,javafmllanguage,lowcodelanguage,mclanguage,forge- -DmergeModules\u003djna-5.10.0.jar,jna-platform-5.10.0.jar -Djava.net.preferIPv6Addresses\u003dsystem -p C:\\Users\\Shado\\.gradle\\caches\\modules-2\\files-2.1\\cpw.mods\\bootstraplauncher\\1.1.2\\c546e00443d8432cda6baa1c860346980742628\\bootstraplauncher-1.1.2.jar;C:\\Users\\Shado\\.gradle\\caches\\modules-2\\files-2.1\\cpw.mods\\securejarhandler\\2.1.6\\66c15fc1f522b586476e9e4cccd0cbe192554e8a\\securejarhandler-2.1.6.jar;C:\\Users\\Shado\\.gradle\\caches\\modules-2\\files-2.1\\org.ow2.asm\\asm-commons\\9.3\\1f2a432d1212f5c352ae607d7b61dcae20c20af5\\asm-commons-9.3.jar;C:\\Users\\Shado\\.gradle\\caches\\modules-2\\files-2.1\\org.ow2.asm\\asm-util\\9.3\\9595bc05510d0bd4b610188b77333fe4851a1975\\asm-util-9.3.jar;C:\\Users\\Shado\\.gradle\\caches\\modules-2\\files-2.1\\org.ow2.asm\\asm-analysis\\9.3\\4b071f211b37c38e0e9f5998550197c8593f6ad8\\asm-analysis-9.3.jar;C:\\Users\\Shado\\.gradle\\caches\\modules-2\\files-2.1\\org.ow2.asm\\asm-tree\\9.3\\78d2ecd61318b5a58cd04fb237636c0e86b77d97\\asm-tree-9.3.jar;C:\\Users\\Shado\\.gradle\\caches\\modules-2\\files-2.1\\org.ow2.asm\\asm\\9.3\\8e6300ef51c1d801a7ed62d07cd221aca3a90640\\asm-9.3.jar;C:\\Users\\Shado\\.gradle\\caches\\modules-2\\files-2.1\\net.minecraftforge\\JarJarFileSystems\\0.3.19\\2464eb7d6b9ddb9db36a82cf8a95193e5c6fe020\\JarJarFileSystems-0.3.19.jar --add-modules ALL-MODULE-PATH --add-opens java.base/java.util.jar\u003dcpw.mods.securejarhandler --add-opens java.base/java.lang.invoke\u003dcpw.mods.securejarhandler --add-exports java.base/sun.security.util\u003dcpw.mods.securejarhandler --add-exports jdk.naming.dns/com.sun.jndi.dns\u003djava.naming", | ||
| "args": "--launchTarget forgedatauserdev --assetIndex 3 --assetsDir C:\\Users\\Shado\\.gradle\\caches\\forge_gradle\\assets --gameDir . --fml.forgeVersion 45.0.46 --fml.mcVersion 1.19.4 --fml.forgeGroup net.minecraftforge --fml.mcpVersion 20230314.122934 --mod atum --all --output C:\\Users\\Shado\\Documents\\GitHub\\Atum2\\src\\generated\\resources --existing C:\\Users\\Shado\\Documents\\GitHub\\Atum2\\src\\main\\resources", | ||
| "env": { | ||
| "MOD_CLASSES": "", | ||
| "MCP_MAPPINGS": "official_1.19.4" | ||
| } | ||
| }, | ||
| { | ||
| "type": "java", | ||
| "name": "runServer", | ||
| "request": "launch", | ||
| "mainClass": "cpw.mods.bootstraplauncher.BootstrapLauncher", | ||
| "projectName": "Atum2", | ||
| "cwd": "${workspaceFolder}\\run", | ||
| "vmArgs": "-DlegacyClassPath.file\u003dC:\\Users\\Shado\\Documents\\GitHub\\Atum2\\build\\classpath\\runServer_minecraftClasspath.txt -Dmixin.env.remapRefMap\u003dtrue -Dmixin.env.refMapRemappingFile\u003dC:\\Users\\Shado\\Documents\\GitHub\\Atum2\\build/createSrgToMcp/output.srg -DignoreList\u003dbootstraplauncher,securejarhandler,asm-commons,asm-util,asm-analysis,asm-tree,asm,JarJarFileSystems,client-extra,fmlcore,javafmllanguage,lowcodelanguage,mclanguage,forge- -DmergeModules\u003djna-5.10.0.jar,jna-platform-5.10.0.jar -Dforge.enableGameTest\u003dtrue -Djava.net.preferIPv6Addresses\u003dsystem -p C:\\Users\\Shado\\.gradle\\caches\\modules-2\\files-2.1\\cpw.mods\\bootstraplauncher\\1.1.2\\c546e00443d8432cda6baa1c860346980742628\\bootstraplauncher-1.1.2.jar;C:\\Users\\Shado\\.gradle\\caches\\modules-2\\files-2.1\\cpw.mods\\securejarhandler\\2.1.6\\66c15fc1f522b586476e9e4cccd0cbe192554e8a\\securejarhandler-2.1.6.jar;C:\\Users\\Shado\\.gradle\\caches\\modules-2\\files-2.1\\org.ow2.asm\\asm-commons\\9.3\\1f2a432d1212f5c352ae607d7b61dcae20c20af5\\asm-commons-9.3.jar;C:\\Users\\Shado\\.gradle\\caches\\modules-2\\files-2.1\\org.ow2.asm\\asm-util\\9.3\\9595bc05510d0bd4b610188b77333fe4851a1975\\asm-util-9.3.jar;C:\\Users\\Shado\\.gradle\\caches\\modules-2\\files-2.1\\org.ow2.asm\\asm-analysis\\9.3\\4b071f211b37c38e0e9f5998550197c8593f6ad8\\asm-analysis-9.3.jar;C:\\Users\\Shado\\.gradle\\caches\\modules-2\\files-2.1\\org.ow2.asm\\asm-tree\\9.3\\78d2ecd61318b5a58cd04fb237636c0e86b77d97\\asm-tree-9.3.jar;C:\\Users\\Shado\\.gradle\\caches\\modules-2\\files-2.1\\org.ow2.asm\\asm\\9.3\\8e6300ef51c1d801a7ed62d07cd221aca3a90640\\asm-9.3.jar;C:\\Users\\Shado\\.gradle\\caches\\modules-2\\files-2.1\\net.minecraftforge\\JarJarFileSystems\\0.3.19\\2464eb7d6b9ddb9db36a82cf8a95193e5c6fe020\\JarJarFileSystems-0.3.19.jar --add-modules ALL-MODULE-PATH --add-opens java.base/java.util.jar\u003dcpw.mods.securejarhandler --add-opens java.base/java.lang.invoke\u003dcpw.mods.securejarhandler --add-exports java.base/sun.security.util\u003dcpw.mods.securejarhandler --add-exports jdk.naming.dns/com.sun.jndi.dns\u003djava.naming", | ||
| "args": "--launchTarget forgeserveruserdev --gameDir . --fml.forgeVersion 45.0.46 --fml.mcVersion 1.19.4 --fml.forgeGroup net.minecraftforge --fml.mcpVersion 20230314.122934", | ||
| "env": { | ||
| "MOD_CLASSES": "", | ||
| "MCP_MAPPINGS": "official_1.19.4" | ||
| } | ||
| } | ||
| ] | ||
| } |
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 |
|---|---|---|
| @@ -0,0 +1,25 @@ | ||
| { | ||
| "type": "atum:atum", | ||
| "generator": { | ||
| "biome_source": { | ||
| "biomes": [ | ||
| { | ||
| "parameters": { | ||
| "erosion": 0.5, | ||
| "depth": 0.0, | ||
| "weirdness": 0.0, | ||
| "offset": 0.0, | ||
| "temperature": 0.0, | ||
| "humidity": 0.0, | ||
| "continentalness": 0.0 | ||
| }, | ||
| "biome": "atum:strange_sands" | ||
| } | ||
| ], | ||
| "type": "minecraft:multi_noise" | ||
| }, | ||
| "seed": 0, | ||
| "settings": "minecraft:overworld", | ||
| "type": "minecraft:noise" | ||
| } | ||
| } |
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,25 @@ | ||
| { | ||
| "ambient_light": 0.0, | ||
| "bed_works": true, | ||
| "coordinate_scale": 1.0, | ||
| "effects": "minecraft:overworld", | ||
| "has_ceiling": false, | ||
| "has_raids": false, | ||
| "has_skylight": true, | ||
| "height": 384, | ||
| "infiniburn": "#atum:infiniburn", | ||
| "logical_height": 384, | ||
| "min_y": -64, | ||
| "monster_spawn_block_light_limit": 0, | ||
| "monster_spawn_light_level": { | ||
| "type": "minecraft:uniform", | ||
| "value": { | ||
| "max_inclusive": 7, | ||
| "min_inclusive": 0 | ||
| } | ||
| }, | ||
| "natural": true, | ||
| "piglin_safe": false, | ||
| "respawn_anchor_works": false, | ||
| "ultrawarm": false | ||
| } |
180 changes: 180 additions & 0 deletions
180
src/main/resources/data/atum/worldgen/biome/strange_sands.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,180 @@ | ||
| { | ||
| "carvers": { | ||
| "air": [ | ||
| "minecraft:cave", | ||
| "minecraft:cave_extra_underground", | ||
| "minecraft:canyon" | ||
| ] | ||
| }, | ||
| "downfall": 0.0, | ||
| "effects": { | ||
| "fog_color": 12638463, | ||
| "mood_sound": { | ||
| "block_search_extent": 8, | ||
| "offset": 2.0, | ||
| "sound": "minecraft:ambient.cave", | ||
| "tick_delay": 6000 | ||
| }, | ||
| "sky_color": 7254527, | ||
| "water_color": 4159204, | ||
| "water_fog_color": 329011 | ||
| }, | ||
| "features": [ | ||
| [], | ||
| [ | ||
| "minecraft:lake_lava_underground", | ||
| "minecraft:lake_lava_surface" | ||
| ], | ||
| [ | ||
| "minecraft:amethyst_geode" | ||
| ], | ||
| [ | ||
| "minecraft:fossil_upper", | ||
| "minecraft:fossil_lower", | ||
| "minecraft:monster_room", | ||
| "minecraft:monster_room_deep" | ||
| ], | ||
| [ | ||
| "minecraft:desert_well" | ||
| ], | ||
| [], | ||
| [ | ||
| "minecraft:ore_dirt", | ||
| "minecraft:ore_gravel", | ||
| "minecraft:ore_granite_upper", | ||
| "minecraft:ore_granite_lower", | ||
| "minecraft:ore_diorite_upper", | ||
| "minecraft:ore_diorite_lower", | ||
| "minecraft:ore_andesite_upper", | ||
| "minecraft:ore_andesite_lower", | ||
| "minecraft:ore_tuff", | ||
| "minecraft:ore_coal_upper", | ||
| "minecraft:ore_coal_lower", | ||
| "minecraft:ore_iron_upper", | ||
| "minecraft:ore_iron_middle", | ||
| "minecraft:ore_iron_small", | ||
| "minecraft:ore_gold", | ||
| "minecraft:ore_gold_lower", | ||
| "minecraft:ore_redstone", | ||
| "minecraft:ore_redstone_lower", | ||
| "minecraft:ore_diamond", | ||
| "minecraft:ore_diamond_large", | ||
| "minecraft:ore_diamond_buried", | ||
| "minecraft:ore_lapis", | ||
| "minecraft:ore_lapis_buried", | ||
| "minecraft:ore_copper", | ||
| "minecraft:underwater_magma", | ||
| "minecraft:disk_sand", | ||
| "minecraft:disk_clay", | ||
| "minecraft:disk_gravel" | ||
| ], | ||
| [], | ||
| [ | ||
| "minecraft:spring_water", | ||
| "minecraft:spring_lava" | ||
| ], | ||
| [ | ||
| "minecraft:glow_lichen", | ||
| "minecraft:flower_default", | ||
| "minecraft:patch_grass_badlands", | ||
| "minecraft:patch_dead_bush_2", | ||
| "minecraft:brown_mushroom_normal", | ||
| "minecraft:red_mushroom_normal", | ||
| "minecraft:patch_sugar_cane_desert", | ||
| "minecraft:patch_pumpkin", | ||
| "minecraft:patch_cactus_desert" | ||
| ], | ||
| [ | ||
| "minecraft:freeze_top_layer" | ||
| ] | ||
| ], | ||
| "has_precipitation": false, | ||
| "spawn_costs": {}, | ||
| "spawners": { | ||
| "ambient": [ | ||
| { | ||
| "type": "minecraft:bat", | ||
| "maxCount": 8, | ||
| "minCount": 8, | ||
| "weight": 10 | ||
| } | ||
| ], | ||
| "axolotls": [], | ||
| "creature": [ | ||
| { | ||
| "type": "minecraft:rabbit", | ||
| "maxCount": 3, | ||
| "minCount": 2, | ||
| "weight": 4 | ||
| } | ||
| ], | ||
| "misc": [], | ||
| "monster": [ | ||
| { | ||
| "type": "minecraft:spider", | ||
| "maxCount": 4, | ||
| "minCount": 4, | ||
| "weight": 100 | ||
| }, | ||
| { | ||
| "type": "minecraft:zombie", | ||
| "maxCount": 4, | ||
| "minCount": 4, | ||
| "weight": 19 | ||
| }, | ||
| { | ||
| "type": "minecraft:zombie_villager", | ||
| "maxCount": 1, | ||
| "minCount": 1, | ||
| "weight": 1 | ||
| }, | ||
| { | ||
| "type": "minecraft:skeleton", | ||
| "maxCount": 4, | ||
| "minCount": 4, | ||
| "weight": 100 | ||
| }, | ||
| { | ||
| "type": "minecraft:creeper", | ||
| "maxCount": 4, | ||
| "minCount": 4, | ||
| "weight": 100 | ||
| }, | ||
| { | ||
| "type": "minecraft:slime", | ||
| "maxCount": 4, | ||
| "minCount": 4, | ||
| "weight": 100 | ||
| }, | ||
| { | ||
| "type": "minecraft:enderman", | ||
| "maxCount": 4, | ||
| "minCount": 1, | ||
| "weight": 10 | ||
| }, | ||
| { | ||
| "type": "minecraft:witch", | ||
| "maxCount": 1, | ||
| "minCount": 1, | ||
| "weight": 5 | ||
| }, | ||
| { | ||
| "type": "minecraft:husk", | ||
| "maxCount": 4, | ||
| "minCount": 4, | ||
| "weight": 80 | ||
| } | ||
| ], | ||
| "underground_water_creature": [ | ||
| { | ||
| "type": "minecraft:glow_squid", | ||
| "maxCount": 6, | ||
| "minCount": 4, | ||
| "weight": 10 | ||
| } | ||
| ], | ||
| "water_ambient": [], | ||
| "water_creature": [] | ||
| }, | ||
| "temperature": 2.0 | ||
| } |
Oops, something went wrong.