Move TeamMember from Living to Entity

SpongePowered · Oct 12, 2023 · d0210fc · d0210fc
1 parent 29b92a5
commit d0210fc
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 7 deletions.
diff --git a/SpongeAPI b/SpongeAPI
diff --git a/...ixins/java/org/spongepowered/common/mixin/api/minecraft/world/entity/EntityMixin_API.java b/...ixins/java/org/spongepowered/common/mixin/api/minecraft/world/entity/EntityMixin_API.java
@@ -395,4 +395,9 @@ public HoverEvent<HoverEvent.ShowEntity> asHoverEvent(final UnaryOperator<HoverE
 
         return values;
     }
+
+    @Override
+    public net.kyori.adventure.text.Component teamRepresentation() {
+        return net.kyori.adventure.text.Component.text(this.shadow$getUUID().toString());
+    }
 }
diff --git a/...java/org/spongepowered/common/mixin/api/minecraft/world/entity/LivingEntityMixin_API.java b/...java/org/spongepowered/common/mixin/api/minecraft/world/entity/LivingEntityMixin_API.java
@@ -27,7 +27,6 @@
 import static java.util.Objects.requireNonNull;
 
 import com.google.common.base.Preconditions;
-import net.kyori.adventure.text.Component;
 import net.minecraft.world.effect.MobEffectInstance;
 import net.minecraft.world.entity.LivingEntity;
 import net.minecraft.world.entity.ai.attributes.AttributeInstance;
@@ -56,11 +55,6 @@ public abstract class LivingEntityMixin_API extends EntityMixin_API implements L
     @Shadow public abstract boolean addEffect(MobEffectInstance p_195064_1_);
     // @formatter:on
 
-    @Override
-    public Component teamRepresentation() {
-        return Component.text(this.shadow$getUUID().toString());
-    }
-
     @Override
     public Optional<Attribute> attribute(final AttributeType type) {
         Preconditions.checkNotNull(type, "AttributeType cannot be null");
+2 −1		src/main/java/org/spongepowered/api/entity/Entity.java
+2 −4		src/main/java/org/spongepowered/api/entity/living/Living.java