diff --git a/core/src/main/java/net/momirealms/craftengine/core/pack/model/definition/condition/ConditionProperties.java b/core/src/main/java/net/momirealms/craftengine/core/pack/model/definition/condition/ConditionProperties.java index 74b3552a5..465d383b1 100644 --- a/core/src/main/java/net/momirealms/craftengine/core/pack/model/definition/condition/ConditionProperties.java +++ b/core/src/main/java/net/momirealms/craftengine/core/pack/model/definition/condition/ConditionProperties.java @@ -16,16 +16,16 @@ public final class ConditionProperties { public static final ConditionPropertyType BROKEN = register(BrokenConditionProperty.ID, BrokenConditionProperty.FACTORY, BrokenConditionProperty.READER); public static final ConditionPropertyType BUNDLE_HAS_SELECTED_ITEM = register(Key.of("minecraft:bundle/has_selected_item"), SimpleConditionProperty.FACTORY, SimpleConditionProperty.READER); public static final ConditionPropertyType CARRIED = register(Key.of("minecraft:carried"), SimpleConditionProperty.FACTORY, SimpleConditionProperty.READER); - public static final ConditionPropertyType CUSTOM_MODEL_DATA = register(CustomModelDataConditionProperty.ID, CustomModelDataConditionProperty.FACTORY, CustomModelDataConditionProperty.READER); + public static final ConditionPropertyType COMPONENT = register(ComponentConditionProperty.ID, ComponentConditionProperty.FACTORY, ComponentConditionProperty.READER); public static final ConditionPropertyType DAMAGED = register(DamagedConditionProperty.ID, DamagedConditionProperty.FACTORY, DamagedConditionProperty.READER); public static final ConditionPropertyType EXTENDED_VIEW = register(Key.of("minecraft:extended_view"), SimpleConditionProperty.FACTORY, SimpleConditionProperty.READER); public static final ConditionPropertyType FISHING_ROD_CAST = register(RodCastConditionProperty.ID, RodCastConditionProperty.FACTORY, RodCastConditionProperty.READER); + public static final ConditionPropertyType HAS_COMPONENT = register(HasComponentConditionProperty.ID, HasComponentConditionProperty.FACTORY, HasComponentConditionProperty.READER); + public static final ConditionPropertyType KEYBIND_DOWN = register(KeyBindDownConditionProperty.ID, KeyBindDownConditionProperty.FACTORY, KeyBindDownConditionProperty.READER); public static final ConditionPropertyType SELECTED = register(Key.of("minecraft:selected"), SimpleConditionProperty.FACTORY, SimpleConditionProperty.READER); public static final ConditionPropertyType USING_ITEM = register(UsingItemConditionProperty.ID, UsingItemConditionProperty.FACTORY, UsingItemConditionProperty.READER); public static final ConditionPropertyType VIEW_ENTITY = register(Key.of("minecraft:view_entity"), SimpleConditionProperty.FACTORY, SimpleConditionProperty.READER); - public static final ConditionPropertyType HAS_COMPONENT = register(HasComponentConditionProperty.ID, HasComponentConditionProperty.FACTORY, HasComponentConditionProperty.READER); - public static final ConditionPropertyType KEYBIND_DOWN = register(KeyBindDownConditionProperty.ID, KeyBindDownConditionProperty.FACTORY, KeyBindDownConditionProperty.READER); - public static final ConditionPropertyType COMPONENT = register(ComponentConditionProperty.ID, ComponentConditionProperty.FACTORY, ComponentConditionProperty.READER); + public static final ConditionPropertyType CUSTOM_MODEL_DATA = register(CustomModelDataConditionProperty.ID, CustomModelDataConditionProperty.FACTORY, CustomModelDataConditionProperty.READER); private ConditionProperties() {} diff --git a/core/src/main/java/net/momirealms/craftengine/core/pack/model/definition/rangedisptach/RangeDispatchProperties.java b/core/src/main/java/net/momirealms/craftengine/core/pack/model/definition/rangedisptach/RangeDispatchProperties.java index 98ddcbae9..11da1b5b9 100644 --- a/core/src/main/java/net/momirealms/craftengine/core/pack/model/definition/rangedisptach/RangeDispatchProperties.java +++ b/core/src/main/java/net/momirealms/craftengine/core/pack/model/definition/rangedisptach/RangeDispatchProperties.java @@ -17,11 +17,11 @@ public final class RangeDispatchProperties { public static final RangeDispatchPropertyType COOLDOWN = register(Key.of("minecraft:cooldown"), SimpleRangeDispatchProperty.FACTORY, SimpleRangeDispatchProperty.READER); public static final RangeDispatchPropertyType COUNT = register(Key.of("minecraft:count"), NormalizeRangeDispatchProperty.FACTORY, NormalizeRangeDispatchProperty.READER); public static final RangeDispatchPropertyType CROSSBOW_PULL = register(CrossBowPullingRangeDispatchProperty.ID, CrossBowPullingRangeDispatchProperty.FACTORY, CrossBowPullingRangeDispatchProperty.READER); - public static final RangeDispatchPropertyType CUSTOM_MODEL_DATA = register(CustomModelDataRangeDispatchProperty.ID, CustomModelDataRangeDispatchProperty.FACTORY, CustomModelDataRangeDispatchProperty.READER); public static final RangeDispatchPropertyType DAMAGE = register(DamageRangeDispatchProperty.ID, DamageRangeDispatchProperty.FACTORY, DamageRangeDispatchProperty.READER); public static final RangeDispatchPropertyType TIME = register(TimeRangeDispatchProperty.ID, TimeRangeDispatchProperty.FACTORY, TimeRangeDispatchProperty.READER); public static final RangeDispatchPropertyType USE_CYCLE = register(UseCycleRangeDispatchProperty.ID, UseCycleRangeDispatchProperty.FACTORY, UseCycleRangeDispatchProperty.READER); public static final RangeDispatchPropertyType USE_DURATION = register(UseDurationRangeDispatchProperty.ID, UseDurationRangeDispatchProperty.FACTORY, UseDurationRangeDispatchProperty.READER); + public static final RangeDispatchPropertyType CUSTOM_MODEL_DATA = register(CustomModelDataRangeDispatchProperty.ID, CustomModelDataRangeDispatchProperty.FACTORY, CustomModelDataRangeDispatchProperty.READER); private RangeDispatchProperties() {} diff --git a/core/src/main/java/net/momirealms/craftengine/core/pack/model/definition/select/SelectProperties.java b/core/src/main/java/net/momirealms/craftengine/core/pack/model/definition/select/SelectProperties.java index 56057f9e1..d1a69e592 100644 --- a/core/src/main/java/net/momirealms/craftengine/core/pack/model/definition/select/SelectProperties.java +++ b/core/src/main/java/net/momirealms/craftengine/core/pack/model/definition/select/SelectProperties.java @@ -14,14 +14,14 @@ import java.util.Map; public final class SelectProperties { public static final SelectPropertyType BLOCK_STATE = register(BlockStateSelectProperty.ID, BlockStateSelectProperty.FACTORY, BlockStateSelectProperty.READER); public static final SelectPropertyType CHARGE_TYPE = register(ChargeTypeSelectProperty.ID, ChargeTypeSelectProperty.FACTORY, ChargeTypeSelectProperty.READER); + public static final SelectPropertyType COMPONENT = register(ComponentSelectProperty.ID, ComponentSelectProperty.FACTORY, ComponentSelectProperty.READER); public static final SelectPropertyType CONTEXT_DIMENSION = register(Key.of("minecraft:context_dimension"), SimpleSelectProperty.FACTORY, SimpleSelectProperty.READER); public static final SelectPropertyType CONTEXT_ENTITY_TYPE = register(Key.of("minecraft:context_entity_type"), SimpleSelectProperty.FACTORY, SimpleSelectProperty.READER); public static final SelectPropertyType DISPLAY_CONTEXT = register(DisplayContextSelectProperty.ID, DisplayContextSelectProperty.FACTORY, DisplayContextSelectProperty.READER); + public static final SelectPropertyType LOCAL_TIME = register(LocalTimeSelectProperty.ID, LocalTimeSelectProperty.FACTORY, LocalTimeSelectProperty.READER); public static final SelectPropertyType MAIN_HAND = register(MainHandSelectProperty.ID, MainHandSelectProperty.FACTORY, MainHandSelectProperty.READER); public static final SelectPropertyType TRIM_MATERIAL = register(TrimMaterialSelectProperty.ID, TrimMaterialSelectProperty.FACTORY, TrimMaterialSelectProperty.READER); public static final SelectPropertyType CUSTOM_MODEL_DATA = register(CustomModelDataSelectProperty.ID, CustomModelDataSelectProperty.FACTORY, CustomModelDataSelectProperty.READER); - public static final SelectPropertyType LOCAL_TIME = register(LocalTimeSelectProperty.ID, LocalTimeSelectProperty.FACTORY, LocalTimeSelectProperty.READER); - public static final SelectPropertyType COMPONENT = register(ComponentSelectProperty.ID, ComponentSelectProperty.FACTORY, ComponentSelectProperty.READER); private SelectProperties() {} diff --git a/core/src/main/java/net/momirealms/craftengine/core/pack/model/definition/special/SpecialModels.java b/core/src/main/java/net/momirealms/craftengine/core/pack/model/definition/special/SpecialModels.java index be95bb97e..73aabd592 100644 --- a/core/src/main/java/net/momirealms/craftengine/core/pack/model/definition/special/SpecialModels.java +++ b/core/src/main/java/net/momirealms/craftengine/core/pack/model/definition/special/SpecialModels.java @@ -14,17 +14,17 @@ import java.util.Map; public final class SpecialModels { public static final SpecialModelType BANNER = register(BannerSpecialModel.ID, BannerSpecialModel.FACTORY, BannerSpecialModel.READER); public static final SpecialModelType BED = register(BedSpecialModel.ID, BedSpecialModel.FACTORY, BedSpecialModel.READER); - public static final SpecialModelType CONDUIT = register(Key.of("minecraft:conduit"), SimpleSpecialModel.FACTORY, SimpleSpecialModel.READER); public static final SpecialModelType CHEST = register(ChestSpecialModel.ID, ChestSpecialModel.FACTORY, ChestSpecialModel.READER); + public static final SpecialModelType CONDUIT = register(Key.of("minecraft:conduit"), SimpleSpecialModel.FACTORY, SimpleSpecialModel.READER); + public static final SpecialModelType COPPER_GOLEM_STATUE = register(CopperGolemStatueSpecialModel.ID, CopperGolemStatueSpecialModel.FACTORY, CopperGolemStatueSpecialModel.READER); public static final SpecialModelType DECORATED_POT = register(Key.of("minecraft:decorated_pot"), SimpleSpecialModel.FACTORY, SimpleSpecialModel.READER); - public static final SpecialModelType HANGING_SIGN = register(Key.of("minecraft:hanging_sign"), SignSpecialModel.FACTORY, SignSpecialModel.READER); - public static final SpecialModelType STANDING_SIGN = register(Key.of("minecraft:standing_sign"), SignSpecialModel.FACTORY, SignSpecialModel.READER); public static final SpecialModelType HEAD = register(HeadSpecialModel.ID, HeadSpecialModel.FACTORY, HeadSpecialModel.READER); + public static final SpecialModelType PLAYER_HEAD = register(PlayerHeadSpecialModel.ID, PlayerHeadSpecialModel.FACTORY, PlayerHeadSpecialModel.READER); public static final SpecialModelType SHIELD = register(Key.of("minecraft:shield"), SimpleSpecialModel.FACTORY, SimpleSpecialModel.READER); public static final SpecialModelType SHULKER_BOX = register(ShulkerBoxSpecialModel.ID, ShulkerBoxSpecialModel.FACTORY, ShulkerBoxSpecialModel.READER); + public static final SpecialModelType STANDING_SIGN = register(Key.of("minecraft:standing_sign"), SignSpecialModel.FACTORY, SignSpecialModel.READER); + public static final SpecialModelType HANGING_SIGN = register(Key.of("minecraft:hanging_sign"), SignSpecialModel.FACTORY, SignSpecialModel.READER); public static final SpecialModelType TRIDENT = register(Key.of("minecraft:trident"), SimpleSpecialModel.FACTORY, SimpleSpecialModel.READER); - public static final SpecialModelType PLAYER_HEAD = register(PlayerHeadSpecialModel.ID, PlayerHeadSpecialModel.FACTORY, PlayerHeadSpecialModel.READER); - public static final SpecialModelType COPPER_GOLEM_STATUE = register(CopperGolemStatueSpecialModel.ID, CopperGolemStatueSpecialModel.FACTORY, CopperGolemStatueSpecialModel.READER); private SpecialModels() {}