Skip to content

Commit

Permalink
Changes from 24w35a
Browse files Browse the repository at this point in the history
- trial_spawner resource
- sheep entity sub predicate
  • Loading branch information
misode committed Sep 4, 2024
1 parent 5b9c97f commit 94db5d3
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 6 deletions.
14 changes: 11 additions & 3 deletions java/data/advancement/predicate.mcdoc
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ use ::java::server::util::attribute::AttributeSlot
use ::java::server::util::firework::FireworkShape
use ::java::server::util::text::Text
use ::java::server::util::Filterable
use ::java::server::util::color::ColorString
use ::java::server::world::item::DataComponentPredicate
use ::java::server::world::item::CustomData
use super::super::util::MinMaxBounds
Expand Down Expand Up @@ -254,13 +255,15 @@ enum(string) SpecificType {
Frog = "frog",
Lightning = "lightning",
Player = "player",
Slime = "slime",
#[since="1.20.5"]
Wolf = "wolf",
#[since="1.20.5"]
Painting = "painting",
#[since="1.20.5"]
Raider = "raider",
#[since="1.21.2"]
Sheep = "sheep",
Slime = "slime",
#[since="1.20.5"]
Wolf = "wolf",
}

dispatch minecraft:entity_sub_predicate[axolotl] to struct AxolotlPredicate {
Expand Down Expand Up @@ -330,6 +333,11 @@ dispatch minecraft:entity_sub_predicate[raider] to struct RaiderPredicate {
is_captain?: boolean,
}

dispatch minecraft:entity_sub_predicate[sheep] to struct SheepPredicate {
sheared?: boolean,
color?: ColorString,
}

struct DistancePredicate {
x?: MinMaxBounds<float>,
y?: MinMaxBounds<float>,
Expand Down
2 changes: 0 additions & 2 deletions java/data/structure.mcdoc
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
use ::java::server::world::entity::AnyEntity
use ::java::server::util::block_state::BlockState

// TODO: https://quiltmc.org/en/mc-patchnotes/#1.21:~:text=custom_name%22%3A%27%22Wait%20what%3F%22%27%7D%7D%7D-,Structures,-Added%20dimension_padding%20field

struct StructureNBT {
/// [Data version](https://minecraft.fandom.com/wiki/Data_version).
DataVersion: int @ 0..,
Expand Down
2 changes: 1 addition & 1 deletion java/server/world/block/spawner.mcdoc
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ dispatch minecraft:block[spawner] to minecraft:block_entity[spawner]

dispatch minecraft:block[trial_spawner] to minecraft:block_entity[trial_spawner]

struct TrialSpawnerConfig {
dispatch minecraft:resource[trial_spawner] to struct TrialSpawnerConfig {
/// Maximum distance from the spawner that en entity can spawn
spawn_range?: int @ 1..128,
/// Total amount of entities that are spawned during one activation, when 1 player is nearby
Expand Down

0 comments on commit 94db5d3

Please sign in to comment.