From 5e890396eacb555f6be8d0c0e7d80b8463601110 Mon Sep 17 00:00:00 2001 From: DBotThePony Date: Sun, 28 Aug 2022 20:29:57 +0700 Subject: [PATCH] move capability key --- .../dbotthepony/mc/otm/capability/MatteryPlayerCapability.kt | 5 ++++- src/main/kotlin/ru/dbotthepony/mc/otm/registry/MNames.kt | 4 ---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/capability/MatteryPlayerCapability.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/capability/MatteryPlayerCapability.kt index 579411c94..7c1a8d621 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/capability/MatteryPlayerCapability.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/capability/MatteryPlayerCapability.kt @@ -674,12 +674,15 @@ class MatteryPlayerCapability(val ply: Player) : ICapabilityProvider, IMatteryEn event.entity.getCapability(MatteryCapability.MATTERY_PLAYER).ifPresentK { it.onHurt(event) } } + const val CAPABILITY_KEY = "otm_player" + val CAPABILITY_LOCATION = ResourceLocation(OverdriveThatMatters.MOD_ID, CAPABILITY_KEY) + @SubscribeEvent fun onAttachCapabilityEvent(event: AttachCapabilitiesEvent) { val ent = event.`object` if (ent is Player) { - event.addCapability(MNames.ANDROID_CAPABILITY_RS, MatteryPlayerCapability(ent)) + event.addCapability(CAPABILITY_LOCATION, MatteryPlayerCapability(ent)) } } diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MNames.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MNames.kt index 489464e2b..47a8bd7f8 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MNames.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MNames.kt @@ -53,10 +53,6 @@ object MNames { const val VENT = "vent" const val VENT_ALTERNATIVE = "vent_alternative" - // capabilities - const val ANDROID_CAPABILITY = "android_capability" - val ANDROID_CAPABILITY_RS = ResourceLocation(OverdriveThatMatters.MOD_ID, ANDROID_CAPABILITY) - // items const val GRAVITATIONAL_DISRUPTOR = "gravitational_disruptor" const val MATTER_DUST = "matter_dust"