-
-
Notifications
You must be signed in to change notification settings - Fork 80
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #614 from misode/mcdoc
- Loading branch information
Showing
86 changed files
with
5,953 additions
and
4,276 deletions.
There are no files selected for viewing
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 |
|---|---|---|
| @@ -0,0 +1,44 @@ | ||
| diff --git a/node_modules/@spyglassmc/mcdoc/lib/runtime/checker/index.js b/node_modules/@spyglassmc/mcdoc/lib/runtime/checker/index.js | ||
| index 2d51735..70ac4a0 100644 | ||
| --- a/node_modules/@spyglassmc/mcdoc/lib/runtime/checker/index.js | ||
| +++ b/node_modules/@spyglassmc/mcdoc/lib/runtime/checker/index.js | ||
| @@ -545,9 +545,9 @@ function simplifyReference(typeDef, context) { | ||
| context.ctx.logger.warn(`Tried to access unknown reference ${typeDef.path}`); | ||
| return { typeDef: { kind: 'union', members: [] } }; | ||
| } | ||
| - if (data.simplifiedTypeDef) { | ||
| - return { typeDef: data.simplifiedTypeDef }; | ||
| - } | ||
| + // if (data.simplifiedTypeDef) { | ||
| + // return { typeDef: data.simplifiedTypeDef }; | ||
| + // } | ||
| const simplifiedResult = simplify(data.typeDef, context); | ||
| if (typeDef.attributes?.length) { | ||
| simplifiedResult.typeDef = { | ||
| @@ -555,16 +555,16 @@ function simplifyReference(typeDef, context) { | ||
| attributes: [...typeDef.attributes, ...simplifiedResult.typeDef.attributes ?? []], | ||
| }; | ||
| } | ||
| - if (!simplifiedResult.dynamicData) { | ||
| - symbol.amend({ | ||
| - data: { | ||
| - data: { | ||
| - ...data, | ||
| - simplifiedTypeDef: simplifiedResult.typeDef, | ||
| - }, | ||
| - }, | ||
| - }); | ||
| - } | ||
| + // if (!simplifiedResult.dynamicData) { | ||
| + // symbol.amend({ | ||
| + // data: { | ||
| + // data: { | ||
| + // ...data, | ||
| + // simplifiedTypeDef: simplifiedResult.typeDef, | ||
| + // }, | ||
| + // }, | ||
| + // }); | ||
| + // } | ||
| return simplifiedResult; | ||
| } | ||
| function simplifyDispatcher(typeDef, context) { |
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,116 @@ | ||
| use ::java::server::util::direction::Direction | ||
| use ::java::server::util::block_state::BlockState | ||
| use ::java::data::worldgen::biome::Precipitation | ||
| use ::java::data::worldgen::processor_list::BlockMatch | ||
| use ::java::data::worldgen::processor_list::BlockStateMatch | ||
| use ::java::data::worldgen::processor_list::RandomBlockMatch | ||
| use ::java::data::worldgen::processor_list::RandomBlockStateMatch | ||
| use ::java::data::worldgen::processor_list::TagMatch | ||
|
|
||
| dispatch minecraft:resource[immersive_weathering:block_growth] to struct BlockGrowth { | ||
| area_condition: AreaCondition, | ||
| position_predicates?: [PositionTest], | ||
| growth_chance: float @ 0..1, | ||
| growth_for_face: [GrowthFace], | ||
| owners: [#[id="block"] string], | ||
| replacing_target: RuleTest, | ||
| target_self?: boolean, | ||
| destroy_target?: boolean, | ||
| } | ||
|
|
||
| struct GrowthFace { | ||
| direction?: Direction, | ||
| weight?: int, | ||
| growth: [struct { | ||
| weight: int, | ||
| data: BlockPair, | ||
| }], | ||
| } | ||
|
|
||
| struct BlockPair { | ||
| block: BlockState, | ||
| above_block?: BlockState, | ||
| } | ||
|
|
||
| struct AreaCondition { | ||
| type: ("generate_if_not_too_many" | "neighbor_based_generation"), | ||
| ...immersive_weathering:area_condition[[type]], | ||
| } | ||
|
|
||
| dispatch immersive_weathering:area_condition[generate_if_not_too_many] to struct GenerateIfNotTooMany { | ||
| radiusX: int, | ||
| radiusY: int, | ||
| radiusZ: int, | ||
| requiredAmount: int, | ||
| yOffset?: int, | ||
| must_have?: RuleTest, | ||
| must_not_have?: RuleTest, | ||
| includes?: (#[id(registry="block",tags="allowed")] string | [#[id="block"] string]), | ||
| } | ||
|
|
||
| dispatch immersive_weathering:area_condition[neighbor_based_generation] to struct NeighborBasedGeneration { | ||
| must_have: RuleTest, | ||
| must_not_have?: RuleTest, | ||
| required_amount?: int, | ||
| directions: [Direction], | ||
| } | ||
|
|
||
| struct PositionTest { | ||
| type: ("biome_match" | "day_test" | "nand" | "precipitation_test" | "temperature_range"), | ||
| ...immersive_weathering:position_test[[type]], | ||
| } | ||
|
|
||
| dispatch immersive_weathering:position_test[biome_match] to struct BiomeMatch { | ||
| biomes: (#[id(registry="worldgen/biome",tags="allowed")] string | [#[id="worldgen/biome"] string]), | ||
| } | ||
|
|
||
| dispatch immersive_weathering:position_test[day_test] to struct DayTest { | ||
| day: boolean, | ||
| } | ||
|
|
||
| dispatch immersive_weathering:position_test[nand] to struct Nand { | ||
| predicates: [PositionTest], | ||
| } | ||
|
|
||
| dispatch immersive_weathering:position_test[precipitation_test] to struct PrecipitationTest { | ||
| precipitation: Precipitation, | ||
| } | ||
|
|
||
| dispatch immersive_weathering:position_test[temperature_range] to struct TemperatureRange { | ||
| min: float, | ||
| max: float, | ||
| use_local_pos?: boolean, | ||
| } | ||
|
|
||
| struct RuleTest { | ||
| predicate_type: #[id] RuleTestType, | ||
| ...immersive_weathering:rule_test[[predicate_type]], | ||
| } | ||
|
|
||
| enum(string) RuleTestType { | ||
| #[starred] BlockSetMatch = "immersive_weathering:block_set_match", | ||
| #[starred] FluidMatch = "immersive_weathering:fluid_match", | ||
| #[starred] TreeLog = "immersive_weathering:tree_log", | ||
| BlockMatch = "block_match", | ||
| BlockStateMatch = "blockstate_match", | ||
| RandomBlockMatch = "random_block_match", | ||
| RandomBlockStateMatch = "random_blockstate_match", | ||
| TagMatch = "tag_match", | ||
| } | ||
|
|
||
| dispatch immersive_weathering:rule_test[block_match] to BlockMatch | ||
| dispatch immersive_weathering:rule_test[blockstate_match] to BlockStateMatch | ||
| dispatch immersive_weathering:rule_test[random_block_match] to RandomBlockMatch | ||
| dispatch immersive_weathering:rule_test[random_blockstate_match] to RandomBlockStateMatch | ||
| dispatch immersive_weathering:rule_test[tag_match] to TagMatch | ||
|
|
||
| dispatch immersive_weathering:rule_test[immersive_weathering:block_set_match] to struct BlockSetMatch { | ||
| blocks: (#[id(registry="block",tags="allowed")] string | [#[id="block"] string]), | ||
| probability?: float @ 0..1, | ||
| } | ||
|
|
||
| dispatch immersive_weathering:rule_test[immersive_weathering:fluid_match] to struct FluidMatch { | ||
| fluids: #[id="fluid"] string, | ||
| } | ||
|
|
||
| dispatch immersive_weathering:rule_test[immersive_weathering:tree_log] to struct {} |
Oops, something went wrong.