1.18-pre1

This commit is contained in:
Misode
2021-11-13 03:56:34 +01:00
parent 2d43f2f8c6
commit d7a6523604
5 changed files with 261 additions and 32 deletions

46
package-lock.json generated
View File

@@ -9,12 +9,12 @@
"version": "1.0.0",
"license": "MIT",
"dependencies": {
"@mcschema/core": "^0.12.17",
"@mcschema/core": "^0.12.19",
"@mcschema/java-1.15": "^0.2.2",
"@mcschema/java-1.16": "^0.6.5",
"@mcschema/java-1.17": "^0.2.24",
"@mcschema/java-1.18": "^0.2.2",
"@mcschema/locales": "^0.1.38",
"@mcschema/java-1.18": "^0.2.6",
"@mcschema/locales": "^0.1.39",
"buffer": "^6.0.3",
"comment-json": "^4.1.1",
"deepslate": "^0.9.0-beta.6",
@@ -325,9 +325,9 @@
}
},
"node_modules/@mcschema/core": {
"version": "0.12.17",
"resolved": "https://registry.npmjs.org/@mcschema/core/-/core-0.12.17.tgz",
"integrity": "sha512-viG+TsWcZ6aSsXNQ5Ipwk91Yb1m4zSA1sVAsDaFTX9/C3dflk9PKHKUaMP+SV89AxHVqLC9YlR3jde3y7azE3A=="
"version": "0.12.19",
"resolved": "https://registry.npmjs.org/@mcschema/core/-/core-0.12.19.tgz",
"integrity": "sha512-5DmuIxlzHro1m5pGXnu1uaSpZJ4CPBzBPtMafYjxgVqTmGjuhYr01MNHF8M2VoP7IloUaP8FMoBS+VJNpSiBPw=="
},
"node_modules/@mcschema/java-1.15": {
"version": "0.2.2",
@@ -354,17 +354,17 @@
}
},
"node_modules/@mcschema/java-1.18": {
"version": "0.2.2",
"resolved": "https://registry.npmjs.org/@mcschema/java-1.18/-/java-1.18-0.2.2.tgz",
"integrity": "sha512-UjHOHGlEaNw9Bk7PNRGppL9yVIuD1bIlUzei+taucqoMNu7t30g/86e98UJrY+mDj6pTnZemlXeHleIk39hm9g==",
"version": "0.2.6",
"resolved": "https://registry.npmjs.org/@mcschema/java-1.18/-/java-1.18-0.2.6.tgz",
"integrity": "sha512-3l/Fk8ynl/rKN0uZP2QwpvpMwK0CNmX/M7+wah1InPB5RhUDinLnpGGff2YB49PeszF25squZKRVS9wTfx3oVQ==",
"dependencies": {
"@mcschema/core": "^0.12.16"
"@mcschema/core": "^0.12.19"
}
},
"node_modules/@mcschema/locales": {
"version": "0.1.38",
"resolved": "https://registry.npmjs.org/@mcschema/locales/-/locales-0.1.38.tgz",
"integrity": "sha512-HwH3yURCT6+D4oRH6WYAw38DfjLelpAVkOfsOzXSszvd+hyjVt4lDtUNMggGDaUMoZGw0HQ2oXqDLEDtEERwiQ=="
"version": "0.1.39",
"resolved": "https://registry.npmjs.org/@mcschema/locales/-/locales-0.1.39.tgz",
"integrity": "sha512-7TIXH2ubSzw+UdJlUU2XpakHcvQZAI7NL3jVu7R3p735rAz7KX+T1RTtgEYglP16C6ppnf1bp2dc1qvarMBCsg=="
},
"node_modules/@nodelib/fs.scandir": {
"version": "2.1.5",
@@ -3090,9 +3090,9 @@
}
},
"@mcschema/core": {
"version": "0.12.17",
"resolved": "https://registry.npmjs.org/@mcschema/core/-/core-0.12.17.tgz",
"integrity": "sha512-viG+TsWcZ6aSsXNQ5Ipwk91Yb1m4zSA1sVAsDaFTX9/C3dflk9PKHKUaMP+SV89AxHVqLC9YlR3jde3y7azE3A=="
"version": "0.12.19",
"resolved": "https://registry.npmjs.org/@mcschema/core/-/core-0.12.19.tgz",
"integrity": "sha512-5DmuIxlzHro1m5pGXnu1uaSpZJ4CPBzBPtMafYjxgVqTmGjuhYr01MNHF8M2VoP7IloUaP8FMoBS+VJNpSiBPw=="
},
"@mcschema/java-1.15": {
"version": "0.2.2",
@@ -3119,17 +3119,17 @@
}
},
"@mcschema/java-1.18": {
"version": "0.2.2",
"resolved": "https://registry.npmjs.org/@mcschema/java-1.18/-/java-1.18-0.2.2.tgz",
"integrity": "sha512-UjHOHGlEaNw9Bk7PNRGppL9yVIuD1bIlUzei+taucqoMNu7t30g/86e98UJrY+mDj6pTnZemlXeHleIk39hm9g==",
"version": "0.2.6",
"resolved": "https://registry.npmjs.org/@mcschema/java-1.18/-/java-1.18-0.2.6.tgz",
"integrity": "sha512-3l/Fk8ynl/rKN0uZP2QwpvpMwK0CNmX/M7+wah1InPB5RhUDinLnpGGff2YB49PeszF25squZKRVS9wTfx3oVQ==",
"requires": {
"@mcschema/core": "^0.12.16"
"@mcschema/core": "^0.12.19"
}
},
"@mcschema/locales": {
"version": "0.1.38",
"resolved": "https://registry.npmjs.org/@mcschema/locales/-/locales-0.1.38.tgz",
"integrity": "sha512-HwH3yURCT6+D4oRH6WYAw38DfjLelpAVkOfsOzXSszvd+hyjVt4lDtUNMggGDaUMoZGw0HQ2oXqDLEDtEERwiQ=="
"version": "0.1.39",
"resolved": "https://registry.npmjs.org/@mcschema/locales/-/locales-0.1.39.tgz",
"integrity": "sha512-7TIXH2ubSzw+UdJlUU2XpakHcvQZAI7NL3jVu7R3p735rAz7KX+T1RTtgEYglP16C6ppnf1bp2dc1qvarMBCsg=="
},
"@nodelib/fs.scandir": {
"version": "2.1.5",

View File

@@ -15,12 +15,12 @@
"author": "Misode",
"license": "MIT",
"dependencies": {
"@mcschema/core": "^0.12.17",
"@mcschema/core": "^0.12.19",
"@mcschema/java-1.15": "^0.2.2",
"@mcschema/java-1.16": "^0.6.5",
"@mcschema/java-1.17": "^0.2.24",
"@mcschema/java-1.18": "^0.2.2",
"@mcschema/locales": "^0.1.38",
"@mcschema/java-1.18": "^0.2.6",
"@mcschema/locales": "^0.1.39",
"buffer": "^6.0.3",
"comment-json": "^4.1.1",
"deepslate": "^0.9.0-beta.6",

View File

@@ -160,6 +160,7 @@ async function fetchDynamicRegistries(version: Version, target: CollectionRegist
}
if (checkVersion(version.id, '1.18')) {
target.register('worldgen/noise', Noises)
target.register('worldgen/placed_feature', PlacedFeatures)
}
}
@@ -299,18 +300,24 @@ const Noises = [
'minecraft:aquifer_fluid_level_floodedness',
'minecraft:aquifer_fluid_level_spread',
'minecraft:aquifer_lava',
'minecraft:badlands_pillar',
'minecraft:badlands_pillar_roof',
'minecraft:badlands_surface',
'minecraft:calcite',
'minecraft:cave_cheese',
'minecraft:cave_entrance',
'minecraft:cave_layer',
'minecraft:clay_bands_offset',
'minecraft:continentalness',
'minecraft:continentalness_large',
'minecraft:erosion',
'minecraft:erosion_large',
'minecraft:gravel',
'minecraft:gravel_layer',
'minecraft:ice',
'minecraft:iceberg_and_badlands_pillar',
'minecraft:iceberg_and_badlands_pillar_roof',
'minecraft:iceberg_pillar',
'minecraft:iceberg_pillar_roof',
'minecraft:iceberg_surface',
'minecraft:jagged',
'minecraft:nether_state_selector',
'minecraft:nether_wart',
@@ -329,8 +336,7 @@ const Noises = [
'minecraft:pillar',
'minecraft:pillar_rareness',
'minecraft:pillar_thickness',
'minecraft:powder_snow_surface',
'minecraft:powder_snow_under',
'minecraft:powder_snow',
'minecraft:ridge',
'minecraft:soul_sand_layer',
'minecraft:spaghetti_2d',
@@ -344,7 +350,219 @@ const Noises = [
'minecraft:spaghetti_roughness',
'minecraft:spaghetti_roughness_modulator',
'minecraft:surface',
'minecraft:surface_secondary',
'minecraft:surface_swamp',
'minecraft:temperature',
'minecraft:temperature_large',
'minecraft:vegetation',
'minecraft:vegetation_large',
]
const PlacedFeatures = [
'minecraft:acacia_checked',
'minecraft:amethyst_geode',
'minecraft:bamboo',
'minecraft:bamboo_light',
'minecraft:bamboo_vegetation',
'minecraft:basalt_blobs',
'minecraft:basalt_pillar',
'minecraft:birch_bees_0002',
'minecraft:birch_bees_002',
'minecraft:birch_checked',
'minecraft:birch_tall',
'minecraft:blackstone_blobs',
'minecraft:blue_ice',
'minecraft:brown_mushroom_nether',
'minecraft:brown_mushroom_normal',
'minecraft:brown_mushroom_old_growth',
'minecraft:brown_mushroom_swamp',
'minecraft:brown_mushroom_taiga',
'minecraft:cave_vines',
'minecraft:chorus_plant',
'minecraft:classic_vines_cave_feature',
'minecraft:crimson_forest_vegetation',
'minecraft:crimson_fungi',
'minecraft:dark_forest_vegetation',
'minecraft:dark_oak_checked',
'minecraft:delta',
'minecraft:desert_well',
'minecraft:disk_clay',
'minecraft:disk_gravel',
'minecraft:disk_sand',
'minecraft:dripstone_cluster',
'minecraft:end_gateway_return',
'minecraft:end_island_decorated',
'minecraft:end_spike',
'minecraft:fancy_oak_bees',
'minecraft:fancy_oak_bees_0002',
'minecraft:fancy_oak_bees_002',
'minecraft:fancy_oak_checked',
'minecraft:flower_default',
'minecraft:flower_flower_forest',
'minecraft:flower_forest_flowers',
'minecraft:flower_meadow',
'minecraft:flower_plain',
'minecraft:flower_swamp',
'minecraft:flower_warm',
'minecraft:forest_flowers',
'minecraft:forest_rock',
'minecraft:fossil_lower',
'minecraft:fossil_upper',
'minecraft:freeze_top_layer',
'minecraft:glow_lichen',
'minecraft:glowstone',
'minecraft:glowstone_extra',
'minecraft:grass_bonemeal',
'minecraft:ice_patch',
'minecraft:ice_spike',
'minecraft:iceberg_blue',
'minecraft:iceberg_packed',
'minecraft:jungle_bush',
'minecraft:jungle_tree',
'minecraft:kelp_cold',
'minecraft:kelp_warm',
'minecraft:lake_lava_surface',
'minecraft:lake_lava_underground',
'minecraft:large_basalt_columns',
'minecraft:large_dripstone',
'minecraft:lush_caves_ceiling_vegetation',
'minecraft:lush_caves_clay',
'minecraft:lush_caves_vegetation',
'minecraft:mega_jungle_tree_checked',
'minecraft:mega_pine_checked',
'minecraft:mega_spruce_checked',
'minecraft:monster_room',
'minecraft:monster_room_deep',
'minecraft:mushroom_island_vegetation',
'minecraft:nether_sprouts',
'minecraft:oak_bees_0002',
'minecraft:oak_bees_002',
'minecraft:oak_checked',
'minecraft:ore_ancient_debris_large',
'minecraft:ore_andesite_lower',
'minecraft:ore_andesite_upper',
'minecraft:ore_blackstone',
'minecraft:ore_clay',
'minecraft:ore_coal_lower',
'minecraft:ore_coal_upper',
'minecraft:ore_copper',
'minecraft:ore_copper_large',
'minecraft:ore_debris_small',
'minecraft:ore_diamond',
'minecraft:ore_diamond_buried',
'minecraft:ore_diamond_large',
'minecraft:ore_diorite_lower',
'minecraft:ore_diorite_upper',
'minecraft:ore_dirt',
'minecraft:ore_emerald',
'minecraft:ore_gold',
'minecraft:ore_gold_deltas',
'minecraft:ore_gold_extra',
'minecraft:ore_gold_lower',
'minecraft:ore_gold_nether',
'minecraft:ore_granite_lower',
'minecraft:ore_granite_upper',
'minecraft:ore_gravel',
'minecraft:ore_gravel_nether',
'minecraft:ore_infested',
'minecraft:ore_iron_middle',
'minecraft:ore_iron_small',
'minecraft:ore_iron_upper',
'minecraft:ore_lapis',
'minecraft:ore_lapis_buried',
'minecraft:ore_magma',
'minecraft:ore_quartz_deltas',
'minecraft:ore_quartz_nether',
'minecraft:ore_redstone',
'minecraft:ore_redstone_lower',
'minecraft:ore_soul_sand',
'minecraft:ore_tuff',
'minecraft:patch_berry_common',
'minecraft:patch_berry_rare',
'minecraft:patch_cactus_decorated',
'minecraft:patch_cactus_desert',
'minecraft:patch_crimson_roots',
'minecraft:patch_dead_bush',
'minecraft:patch_dead_bush_2',
'minecraft:patch_dead_bush_badlands',
'minecraft:patch_fire',
'minecraft:patch_grass_badlands',
'minecraft:patch_grass_forest',
'minecraft:patch_grass_jungle',
'minecraft:patch_grass_normal',
'minecraft:patch_grass_plain',
'minecraft:patch_grass_savanna',
'minecraft:patch_grass_taiga',
'minecraft:patch_grass_taiga_2',
'minecraft:patch_large_fern',
'minecraft:patch_melon',
'minecraft:patch_pumpkin',
'minecraft:patch_soul_fire',
'minecraft:patch_sugar_cane',
'minecraft:patch_sugar_cane_badlands',
'minecraft:patch_sugar_cane_desert',
'minecraft:patch_sugar_cane_swamp',
'minecraft:patch_sunflower',
'minecraft:patch_tall_grass',
'minecraft:patch_tall_grass_2',
'minecraft:patch_waterlily',
'minecraft:pine_checked',
'minecraft:pine_on_snow',
'minecraft:pointed_dripstone',
'minecraft:red_mushroom_nether',
'minecraft:red_mushroom_normal',
'minecraft:red_mushroom_old_growth',
'minecraft:red_mushroom_swamp',
'minecraft:red_mushroom_taiga',
'minecraft:rooted_azalea_tree',
'minecraft:sea_pickle',
'minecraft:seagrass_cold',
'minecraft:seagrass_deep',
'minecraft:seagrass_deep_cold',
'minecraft:seagrass_deep_warm',
'minecraft:seagrass_normal',
'minecraft:seagrass_river',
'minecraft:seagrass_simple',
'minecraft:seagrass_swamp',
'minecraft:seagrass_warm',
'minecraft:small_basalt_columns',
'minecraft:spore_blossom',
'minecraft:spring_closed',
'minecraft:spring_closed_double',
'minecraft:spring_delta',
'minecraft:spring_lava',
'minecraft:spring_lava_frozen',
'minecraft:spring_open',
'minecraft:spring_water',
'minecraft:spruce_checked',
'minecraft:spruce_on_snow',
'minecraft:super_birch_bees',
'minecraft:super_birch_bees_0002',
'minecraft:trees_badlands',
'minecraft:trees_birch',
'minecraft:trees_birch_and_oak',
'minecraft:trees_flower_forest',
'minecraft:trees_grove',
'minecraft:trees_jungle',
'minecraft:trees_meadow',
'minecraft:trees_old_growth_pine_taiga',
'minecraft:trees_old_growth_spruce_taiga',
'minecraft:trees_plains',
'minecraft:trees_savanna',
'minecraft:trees_snowy',
'minecraft:trees_sparse_jungle',
'minecraft:trees_swamp',
'minecraft:trees_taiga',
'minecraft:trees_water',
'minecraft:trees_windswept_forest',
'minecraft:trees_windswept_hills',
'minecraft:trees_windswept_savanna',
'minecraft:twisting_vines',
'minecraft:underwater_magma',
'minecraft:vines',
'minecraft:void_start_platform',
'minecraft:warm_ocean_vegetation',
'minecraft:warped_forest_vegetation',
'minecraft:warped_fungi',
'minecraft:weeping_vines',
]

View File

@@ -161,6 +161,13 @@
"schema": "configured_feature",
"minVersion": "1.16"
},
{
"id": "worldgen/placed_feature",
"url": "worldgen/placed-feature",
"category": "worldgen",
"schema": "placed_feature",
"minVersion": "1.18"
},
{
"id": "worldgen/noise",
"url": "worldgen/noise",
@@ -273,7 +280,7 @@
{ "id": "worldgen/configured_feature", "minVersion": "1.16" , "dynamic": true },
{ "id": "worldgen/configured_structure_feature", "minVersion": "1.16" , "dynamic": true },
{ "id": "worldgen/configured_surface_builder", "minVersion": "1.16" , "dynamic": true },
{ "id": "worldgen/decorator", "minVersion": "1.16" },
{ "id": "worldgen/decorator", "minVersion": "1.16", "maxVersion": "1.17" },
{ "id": "worldgen/feature", "minVersion": "1.16" },
{ "id": "worldgen/feature_size_type", "minVersion": "1.16" },
{ "id": "worldgen/foliage_placer_type", "minVersion": "1.16" },
@@ -281,6 +288,8 @@
{ "id": "worldgen/material_rule", "minVersion": "1.18" },
{ "id": "worldgen/noise", "minVersion": "1.18" , "dynamic": true },
{ "id": "worldgen/noise_settings", "minVersion": "1.16" , "dynamic": true },
{ "id": "worldgen/placed_feature", "minVersion": "1.18" , "dynamic": true },
{ "id": "worldgen/placement_modifier_type", "minVersion": "1.18" },
{ "id": "worldgen/processor_list", "minVersion": "1.16" , "dynamic": true },
{ "id": "worldgen/structure_feature", "minVersion": "1.16" },
{ "id": "worldgen/structure_pool_element", "minVersion": "1.16" },
@@ -290,6 +299,7 @@
{ "id": "worldgen/tree_decorator_type", "minVersion": "1.16" },
{ "id": "worldgen/trunk_placer_type", "minVersion": "1.16" },
{ "id": "biome", "maxVersion": "1.15" },
{ "id": "worldgen/biome", "minVersion": "1.16", "path": "processed/reports/biomes" }
{ "id": "worldgen/biome", "minVersion": "1.16", "maxVersion": "1.17", "path": "processed/reports/biomes" },
{ "id": "worldgen/biome", "minVersion": "1.18", "path": "processed/reports/worldgen/minecraft/worldgen/biome" }
]
}

View File

@@ -109,6 +109,7 @@
"worldgen/biome": "Biome",
"worldgen/configured_carver": "Carver",
"worldgen/configured_feature": "Feature",
"worldgen/placed_feature": "Placed Feature",
"worldgen/noise": "Noise",
"worldgen/noise_settings": "Noise Settings",
"worldgen/processor_list": "Processor List",