Skip to content

Commit a673add

Browse files
committed
✨ 26.1 snapshot 3 changes
1 parent df6e446 commit a673add

File tree

6 files changed

+40
-1
lines changed

6 files changed

+40
-1
lines changed

java/data/gametest/test_environment.mcdoc

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,17 @@ struct IntGameRule {
3434
value: int,
3535
}
3636

37+
#[until="26.1"]
3738
dispatch minecraft:test_environment_definition[time_of_day] to struct TimeOfDayTestEnvironment {
3839
time: int @ 0..
3940
}
4041

42+
#[since="26.1"]
43+
dispatch minecraft:test_environment_definition[clock_time] to struct ClockTimeTestEnvironment {
44+
clock: #[id="world_clock"] string,
45+
time: int @ 0..,
46+
}
47+
4148
dispatch minecraft:test_environment_definition[weather] to struct WeatherTestEnvironment {
4249
weather: Weather,
4350
}

java/data/loot/condition.mcdoc

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,9 @@ dispatch minecraft:loot_condition[table_bonus] to struct TableBonus {
112112
}
113113

114114
dispatch minecraft:loot_condition[time_check] to struct TimeCheck {
115+
/// The world clock to check.
116+
#[since="26.1"]
117+
clock: #[id="world_clock"] string,
115118
/// Check the current game tick.
116119
value: (
117120
#[until="1.17"] RandomValueBounds |

java/data/recipe.mcdoc

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ dispatch minecraft:recipe_serializer[crafting_shaped] to struct CraftingShaped {
2020
result: (
2121
#[until="1.20.5"] ItemResult |
2222
#[since="1.20.5"] ItemStack |
23+
#[since="26.1"] #[id="item"] string |
2324
),
2425
/// Determines if a notification is shown when unlocking this recipe. Defaults to true.
2526
#[since="1.19.4"]
@@ -34,6 +35,7 @@ dispatch minecraft:recipe_serializer[crafting_shapeless] to struct CraftingShape
3435
result: (
3536
#[until="1.20.5"] ItemResult |
3637
#[since="1.20.5"] ItemStack |
38+
#[since="26.1"] #[id="item"] string |
3739
),
3840
}
3941

@@ -60,7 +62,9 @@ dispatch minecraft:recipe_serializer[smelting,blasting,smoking,campfire_cooking]
6062
ingredient: Ingredient,
6163
result: (
6264
#[until="1.20.5"] #[id="item"] string |
63-
#[since="1.20.5"] SingleItem |
65+
#[since="1.20.5"] #[until="26.1"] SingleItem |
66+
#[since="26.1"] ItemStack |
67+
#[since="26.1"] #[id="item"] string |
6468
),
6569
experience?: float,
6670
cookingtime?: int,
@@ -72,6 +76,7 @@ dispatch minecraft:recipe_serializer[stonecutting] to struct Stonecutting {
7276
result: (
7377
#[until="1.20.5"] #[id="item"] string |
7478
#[since="1.20.5"] ItemStack |
79+
#[since="26.1"] #[id="item"] string |
7580
),
7681
#[until="1.20.5"]
7782
count: int,
@@ -127,6 +132,7 @@ dispatch minecraft:recipe_serializer[smithing_transform] to struct SmithingTrans
127132
item: #[id="item"] string,
128133
} |
129134
#[since="1.20.5"] ItemStack |
135+
#[since="26.1"] #[id="item"] string |
130136
)
131137
}
132138

java/data/timeline.mcdoc

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,28 @@
22
dispatch minecraft:resource[timeline] to struct Timeline {
33
/// When not present, the timeline will not repeat.
44
period_ticks?: int @ 1..,
5+
/// The world clock this timeline is tied to.
6+
#[since="26.1"]
7+
clock: #[id="world_clock"] string,
8+
#[since="26.1"]
9+
time_markers?: TimeMarkerMap,
510
tracks?: EnvironmentAttributeTrackMap,
611
}
712

13+
struct TimeMarkerMap {
14+
// TODO: tie the time markers to the world clock
15+
/// Time marker ID must be unique within the world clock.
16+
[#[id] string]: (int @ 0.. | TimeMarker),
17+
}
18+
19+
struct TimeMarker {
20+
ticks: int @ 0..,
21+
/// Whether the time marker shows up in command suggestions. \
22+
/// The time marker is still available in commands even if it is not suggested. \
23+
/// Defaults to `false`.
24+
show_in_commands?: boolean,
25+
}
26+
827
struct EnvironmentAttributeTrackMap {
928
[#[id="environment_attribute"] string]: minecraft:environment_attribute[[%key]][attribute_track],
1029
}

java/data/world_clock.mcdoc

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
#[since="26.1"]
2+
dispatch minecraft:resource[world_clock] to struct {}

java/data/worldgen/dimension/mod.mcdoc

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@ type DimensionTypeRef = (
1919
dispatch minecraft:resource[dimension_type] to struct DimensionType {
2020
#[since="1.21.11"]
2121
attributes?: GlobalEnvironmentAttributeMap,
22+
#[since="26.1"]
23+
default_clock?: #[id="world_clock"] string,
2224
#[since="1.21.11"]
2325
timelines?: (#[id=(registry="timeline",tags="allowed")] string | [#[id="timeline"] string]),
2426
/// If true, water will evaporate and sponges will dry.

0 commit comments

Comments
 (0)