🐛 Exclude builtin models when referencing

SpyglassMC · Nov 22, 2024 · aff26f7 · aff26f7
1 parent 63c9b80
commit aff26f7
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 7 deletions.
diff --git a/java/assets/block_state_definition.mcdoc b/java/assets/block_state_definition.mcdoc
@@ -1,3 +1,5 @@
+use ::java::assets::model::ModelRef
+
 type BlockStateDefinition = (
 	struct BlockStateDefinitionVariant {
 		variants: struct BlockStateDefinitionVariantMap {
@@ -23,7 +25,7 @@ type ModelVariant = (
 )
 
 struct ModelVariantBase {
-	model: #[id="model"] string,
+	model: ModelRef,
 	x?: (0 | 90 | 180 | 270),
 	y?: (0 | 90 | 180 | 270),
 	/// If set to `true`, the textures are not rotated with the block.

diff --git a/java/assets/item_definition.mcdoc b/java/assets/item_definition.mcdoc
@@ -1,3 +1,4 @@
+use ::java::assets::model::ModelRef
 use ::java::server::util::color::RGB
 use ::java::server::util::color::ColorString
 use ::java::server::util::direction::Direction
@@ -41,7 +42,7 @@ dispatch minecraft:item_model[condition] to struct Condition {
 }
 
 dispatch minecraft:item_model[model] to struct Model {
-	model: #[id="model"] string,
+	model: ModelRef,
 	tints?: [ModelTint],
 }
 
@@ -78,7 +79,7 @@ dispatch minecraft:item_model[special] to struct Special {
 		...minecraft:special_item_model[[type]],
 	},
 	/// Base model, providing transformations, particle texture and GUI light.
-	base: #[id="model"] string,
+	base: ModelRef,
 }
 
 

diff --git a/java/assets/model.mcdoc b/java/assets/model.mcdoc
@@ -1,5 +1,7 @@
 use ::java::server::util::direction::Direction
 
+type ModelRef = #[id(registry="model",exclude=["builtin/generated","builtin/entity"])] string
+
 dispatch minecraft:resource[model] to struct Model {
 	parent?: #[id="model"] string,
 	ambientocclusion?: boolean,
@@ -21,7 +23,7 @@ dispatch minecraft:resource[model] to struct Model {
 		predicate: struct ModelOverridePredicates {
 			[Predicates]: float,
 		},
-		model: #[id="model"] string,
+		model: ModelRef,
 	}],
 }
 

diff --git a/java/server/util/particle.mcdoc b/java/server/util/particle.mcdoc
@@ -6,7 +6,7 @@ use ::java::server::world::item::SingleItem
 
 struct Particle {
 	type: #[id="particle_type"] string,
-	...(minecraft:particle[[type]]),
+	...minecraft:particle[[type]],
 }
 
 type ParticleSettings<S> = (

diff --git a/java/server/world/entity/area_effect_cloud.mcdoc b/java/server/world/entity/area_effect_cloud.mcdoc
@@ -35,7 +35,7 @@ dispatch minecraft:entity[area_effect_cloud] to struct AreaEffectCloud {
 	/// Particle the area effect cloud displays.
 	Particle?: (
 		#[until="1.20.5"] string |
-		#[since="1.20.5"] Particle
+		#[since="1.20.5"] Particle |
 	),
 	/// Default potion effect.
 	#[until="1.20.5"]

diff --git a/java/server/world/item/mod.mcdoc b/java/server/world/item/mod.mcdoc
@@ -171,7 +171,7 @@ dispatch minecraft:data_component[equippable] to struct Equippable {
 	/// The equipment model to use when equipped.
 	/// Falls back to rendering as the item itself when in the head slot (or no rendering if not applicable).
 	#[until="1.21.4"]
-	model?: #[id="model"] string,
+	model?: #[id="equipment"] string,
 	#[since="1.21.4"]
 	asset_id?: #[id="equipment"] string,
 	/// The overlay texture that should render in first person when equipped.