[Change] Replaced custom Elytra code with fabric version

src/main/java/org/betterx/betterend/blocks/entities/BlockEntityHydrothermalVent.java

@@ -1,7 +1,6 @@
 package org.betterx.betterend.blocks.entities;
 
 import org.betterx.betterend.blocks.HydrothermalVentBlock;
-import org.betterx.betterend.interfaces.FallFlyingItem;
 import org.betterx.betterend.registry.EndBlockEntities;
 import org.betterx.betterend.registry.EndBlocks;
 import org.betterx.betterend.registry.EndParticles;
@@ -20,6 +19,8 @@ import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.phys.AABB;
 import net.minecraft.world.phys.Vec3;
 
+import net.fabricmc.fabric.api.entity.event.v1.FabricElytraItem;
+
 import java.util.List;
 
 public class BlockEntityHydrothermalVent extends BlockEntity {
@@ -92,6 +93,6 @@ public class BlockEntityHydrothermalVent extends BlockEntity {
 
     private boolean hasElytra(LivingEntity entity) {
         Item item = entity.getItemBySlot(EquipmentSlot.CHEST).getItem();
-        return item instanceof ElytraItem || item instanceof FallFlyingItem;
+        return item instanceof ElytraItem /*|| item instanceof ElytraModelProvider*/ || item instanceof FabricElytraItem;
     }
 }

src/main/java/org/betterx/betterend/client/render/ArmoredElytraLayer.java

@@ -1,6 +1,6 @@
 package org.betterx.betterend.client.render;
 
-import org.betterx.betterend.interfaces.FallFlyingItem;
+import org.betterx.betterend.interfaces.BetterEndElytra;
 import org.betterx.betterend.item.model.ArmoredElytraModel;
 import org.betterx.betterend.registry.EndEntitiesRenders;
 
@@ -42,8 +42,8 @@ public class ArmoredElytraLayer<T extends LivingEntity, M extends EntityModel<T>
             float l
     ) {
         ItemStack itemStack = livingEntity.getItemBySlot(EquipmentSlot.CHEST);
-        if (itemStack.getItem() instanceof FallFlyingItem) {
+        if (itemStack.getItem() instanceof BetterEndElytra) {
-            ResourceLocation wingsTexture = ((FallFlyingItem) itemStack.getItem()).getModelTexture();
+            ResourceLocation wingsTexture = ((BetterEndElytra) itemStack.getItem()).getModelTexture();
             if (livingEntity instanceof AbstractClientPlayer) {
                 AbstractClientPlayer abstractClientPlayer = (AbstractClientPlayer) livingEntity;
                 if (abstractClientPlayer.isElytraLoaded() && abstractClientPlayer.getElytraTextureLocation() != null) {

src/main/java/org/betterx/betterend/interfaces/BetterEndElytra.java

@@ -2,7 +2,7 @@ package org.betterx.betterend.interfaces;
 
 import net.minecraft.resources.ResourceLocation;
 
-public interface FallFlyingItem {
+public interface BetterEndElytra {
     ResourceLocation getModelTexture();
 
     double getMovementFactor();

src/main/java/org/betterx/betterend/item/ArmoredElytra.java

@@ -2,7 +2,7 @@ package org.betterx.betterend.item;
 
 import org.betterx.bclib.items.BaseArmorItem;
 import org.betterx.betterend.BetterEnd;
-import org.betterx.betterend.interfaces.FallFlyingItem;
+import org.betterx.betterend.interfaces.BetterEndElytra;
 import org.betterx.betterend.interfaces.MultiModelItem;
 import org.betterx.betterend.registry.EndItems;
 
@@ -14,9 +14,10 @@ import net.minecraft.world.item.*;
 
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
+import net.fabricmc.fabric.api.entity.event.v1.FabricElytraItem;
 import net.fabricmc.fabric.api.object.builder.v1.client.model.FabricModelPredicateProviderRegistry;
 
-public class ArmoredElytra extends BaseArmorItem implements MultiModelItem, FallFlyingItem {
+public class ArmoredElytra extends BaseArmorItem implements MultiModelItem, BetterEndElytra, FabricElytraItem {
     private final ResourceLocation wingTexture;
     private final Item repairItem;
     private final double movementFactor;
@@ -43,8 +44,8 @@ public class ArmoredElytra extends BaseArmorItem implements MultiModelItem, Fall
         this.wingTexture = BetterEnd.makeID("textures/entity/" + name + ".png");
         this.repairItem = repairItem;
         this.movementFactor = movementFactor;
-        this.defense = (int) ((double) material.getDefenseForSlot(EquipmentSlot.CHEST) / 1.75);
+        this.defense = (int) ((double) material.getDefenseForSlot(EquipmentSlot.CHEST) / 1.15);
-        this.toughness = material.getToughness() / 1.75F;
+        this.toughness = material.getToughness() / 1.15F;
         addAttributeModifier(
                 Attributes.ARMOR,
                 new AttributeModifier(

src/main/java/org/betterx/betterend/item/CrystaliteElytra.java

@@ -1,7 +1,7 @@
 package org.betterx.betterend.item;
 
 import org.betterx.betterend.BetterEnd;
-import org.betterx.betterend.interfaces.FallFlyingItem;
+import org.betterx.betterend.interfaces.BetterEndElytra;
 import org.betterx.betterend.interfaces.MultiModelItem;
 import org.betterx.betterend.registry.EndItems;
 
@@ -15,9 +15,10 @@ import net.minecraft.world.item.Rarity;
 
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
+import net.fabricmc.fabric.api.entity.event.v1.FabricElytraItem;
 import net.fabricmc.fabric.api.object.builder.v1.client.model.FabricModelPredicateProviderRegistry;
 
-public class CrystaliteElytra extends CrystaliteArmor implements MultiModelItem, FallFlyingItem {
+public class CrystaliteElytra extends CrystaliteArmor implements MultiModelItem, BetterEndElytra, FabricElytraItem {
 
     private final ResourceLocation wingTexture;
     private final double movementFactor;
@@ -28,8 +29,8 @@ public class CrystaliteElytra extends CrystaliteArmor implements MultiModelItem,
         super(EquipmentSlot.CHEST, EndItems.makeEndItemSettings().durability(durability).rarity(Rarity.EPIC));
         this.wingTexture = BetterEnd.makeID("textures/entity/elytra_crystalite.png");
         this.movementFactor = movementFactor;
-        this.defense = (int) ((double) material.getDefenseForSlot(EquipmentSlot.CHEST) / 1.75);
+        this.defense = (int) ((double) material.getDefenseForSlot(EquipmentSlot.CHEST) / 1.25);
-        this.toughness = material.getToughness() / 1.75F;
+        this.toughness = material.getToughness() / 1.25F;
         addAttributeModifier(
                 Attributes.ARMOR,
                 new AttributeModifier(

src/main/java/org/betterx/betterend/mixin/client/LocalPlayerMixin.java

@@ -1,50 +0,0 @@
-package org.betterx.betterend.mixin.client;
-
-import org.betterx.betterend.interfaces.FallFlyingItem;
-
-import com.mojang.authlib.GameProfile;
-import net.minecraft.client.multiplayer.ClientLevel;
-import net.minecraft.client.multiplayer.ClientPacketListener;
-import net.minecraft.client.player.AbstractClientPlayer;
-import net.minecraft.client.player.LocalPlayer;
-import net.minecraft.network.protocol.game.ServerboundPlayerCommandPacket;
-import net.minecraft.world.entity.EquipmentSlot;
-import net.minecraft.world.entity.player.ProfilePublicKey;
-import net.minecraft.world.item.ElytraItem;
-import net.minecraft.world.item.ItemStack;
-
-import org.spongepowered.asm.mixin.Final;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Shadow;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.At.Shift;
-import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
-
-import org.jetbrains.annotations.Nullable;
-
-@Mixin(LocalPlayer.class)
-public abstract class LocalPlayerMixin extends AbstractClientPlayer {
-    @Final
-    @Shadow
-    public ClientPacketListener connection;
-
-    public LocalPlayerMixin(
-            ClientLevel clientLevel,
-            GameProfile gameProfile,
-            @Nullable ProfilePublicKey profilePublicKey
-    ) {
-        super(clientLevel, gameProfile, profilePublicKey);
-    }
-
-    @Inject(method = "aiStep", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/player/LocalPlayer;getItemBySlot(Lnet/minecraft/world/entity/EquipmentSlot;)Lnet/minecraft/world/item/ItemStack;", shift = Shift.AFTER))
-    public void be_aiStep(CallbackInfo info) {
-        ItemStack itemStack = getItemBySlot(EquipmentSlot.CHEST);
-        if (itemStack.getItem() instanceof FallFlyingItem && ElytraItem.isFlyEnabled(itemStack) && tryToStartFallFlying()) {
-            connection.send(new ServerboundPlayerCommandPacket(
-                    LocalPlayer.class.cast(this),
-                    ServerboundPlayerCommandPacket.Action.START_FALL_FLYING
-            ));
-        }
-    }
-}

src/main/java/org/betterx/betterend/mixin/common/LivingEntityMixin.java

@@ -1,39 +1,33 @@
 package org.betterx.betterend.mixin.common;
 
 import org.betterx.betterend.BetterEnd;
-import org.betterx.betterend.interfaces.FallFlyingItem;
+import org.betterx.betterend.interfaces.BetterEndElytra;
 import org.betterx.betterend.interfaces.MobEffectApplier;
 import org.betterx.betterend.item.CrystaliteArmor;
 import org.betterx.betterend.registry.EndAttributes;
 
-import net.minecraft.sounds.SoundEvent;
-import net.minecraft.tags.EntityTypeTags;
-import net.minecraft.util.Mth;
 import net.minecraft.world.damagesource.DamageSource;
-import net.minecraft.world.effect.MobEffect;
 import net.minecraft.world.effect.MobEffectInstance;
 import net.minecraft.world.effect.MobEffects;
-import net.minecraft.world.entity.*;
+import net.minecraft.world.entity.Entity;
+import net.minecraft.world.entity.EntityType;
+import net.minecraft.world.entity.EquipmentSlot;
+import net.minecraft.world.entity.LivingEntity;
 import net.minecraft.world.entity.ai.attributes.AttributeMap;
 import net.minecraft.world.entity.ai.attributes.AttributeModifier;
 import net.minecraft.world.entity.ai.attributes.AttributeSupplier;
 import net.minecraft.world.entity.ai.attributes.Attributes;
-import net.minecraft.world.entity.animal.FlyingAnimal;
-import net.minecraft.world.item.ElytraItem;
 import net.minecraft.world.item.Item;
 import net.minecraft.world.item.ItemStack;
-import net.minecraft.world.item.enchantment.EnchantmentHelper;
-import net.minecraft.world.item.enchantment.Enchantments;
 import net.minecraft.world.level.Level;
-import net.minecraft.world.phys.AABB;
 import net.minecraft.world.phys.Vec3;
 
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.At.Shift;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.ModifyArg;
+import org.spongepowered.asm.mixin.injection.Slice;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 
@@ -46,23 +40,9 @@ public abstract class LivingEntityMixin extends Entity {
         super(entityType, level);
     }
 
-    @Shadow
-    protected int fallFlyTicks;
-
-    @Shadow
-    public abstract boolean hasEffect(MobEffect mobEffect);
-
     @Shadow
     public abstract ItemStack getItemBySlot(EquipmentSlot equipmentSlot);
 
-    @Shadow
-    public abstract void calculateEntityAnimation(LivingEntity livingEntity, boolean b);
-
-    @Shadow
-    protected abstract SoundEvent getFallDamageSound(int i);
-
-    @Shadow
-    public abstract boolean isFallFlying();
 
     @Shadow
     public abstract AttributeMap getAttributes();
@@ -114,167 +94,19 @@ public abstract class LivingEntityMixin extends Entity {
         return value;
     }
 
-    // FlyFallingLib (part of Origin) redirected the call to updateFallFlying,
+    @ModifyArg(
-    // so we inject our code before the actual call and cancel the execution if the player is still
+            method = "travel",
-    // flying. That means we have to replicate all vanilla code that happens after the call to
+            slice = @Slice(
-    // updateFallFlying. We do this in vanillaAfterUpdateFallFlying
+                    from = @At(value = "INVOKE", target = "Lnet/minecraft/world/entity/LivingEntity;isFallFlying()Z"),
-    @Inject(method = "aiStep", cancellable = true, at = @At(value = "INVOKE", target = "Lnet/minecraft/world/entity/LivingEntity;updateFallFlying()V"))
+                    to = @At(value = "INVOKE:LAST", target = "Lnet/minecraft/world/entity/LivingEntity;setSharedFlag(IZ)V")
-    private void be_updateFallFlying_originFix(CallbackInfo info) {
+            ),
-        //run be_updateFallFlying instead
+            at = @At(value = "INVOKE", target = "Lnet/minecraft/world/entity/LivingEntity;setDeltaMovement(Lnet/minecraft/world/phys/Vec3;)V")
-        if (!BetterEnd.RUNS_FALL_FLYING_LIB) return;
+    )
-
+    public Vec3 be_travel(Vec3 moveDelta) {
-        if (be_updateFallFlyingCommon()) {
-            vanillaAfterUpdateFallFlying();
-            info.cancel();
-        }
-    }
-
-    @Inject(method = "updateFallFlying", at = @At("HEAD"), cancellable = true)
-    private void be_updateFallFlying(CallbackInfo info) {
-        //run be_updateFallFlying_originFix instead?
-        if (BetterEnd.RUNS_FALL_FLYING_LIB) return;
-        if (be_updateFallFlyingCommon()) {
-            info.cancel();
-        }
-    }
-
-    private boolean be_updateFallFlyingCommon() {
         ItemStack itemStack = getItemBySlot(EquipmentSlot.CHEST);
-        if (!level.isClientSide && itemStack.getItem() instanceof FallFlyingItem) {
+        double movementFactor = ((BetterEndElytra) itemStack.getItem()).getMovementFactor();
-            boolean isFlying = getSharedFlag(7);
+        moveDelta = moveDelta.multiply(movementFactor, 1.0D, movementFactor);
-            if (isFlying && !onGround && !isPassenger() && !hasEffect(MobEffects.LEVITATION)) {
+        return moveDelta;
-                if (ElytraItem.isFlyEnabled(itemStack)) {
-                    int level = 20 + EnchantmentHelper.getItemEnchantmentLevel(Enchantments.UNBREAKING, itemStack) * 5;
-                    if ((fallFlyTicks + 1) % level == 0) {
-                        itemStack.hurtAndBreak(
-                                1,
-                                LivingEntity.class.cast(this),
-                                livingEntity -> livingEntity.broadcastBreakEvent(EquipmentSlot.CHEST)
-                        );
-                    }
-                    isFlying = true;
-                } else {
-                    isFlying = false;
-                }
-            } else {
-                isFlying = false;
-            }
-            setSharedFlag(7, isFlying);
-            return isFlying;
-        }
-        return false;
-    }
-
-    @Shadow
-    protected abstract void removeFrost();
-    @Shadow
-    protected abstract void tryAddFrost();
-    @Shadow
-    protected abstract void pushEntities();
-    @Shadow
-    protected abstract void checkAutoSpinAttack(AABB aABB, AABB aABB2);
-
-    @Shadow
-    protected int autoSpinAttackTicks;
-
-    private void vanillaAfterUpdateFallFlying() {
-        LivingEntity self = (LivingEntity) (Object) this;
-        AABB aABB = this.getBoundingBox();
-        self.travel(new Vec3(self.xxa, self.yya, self.zza));
-        this.level.getProfiler().pop();
-        this.level.getProfiler().push("freezing");
-        boolean bl2 = this.getType().is(EntityTypeTags.FREEZE_HURTS_EXTRA_TYPES);
-        int o;
-        if (!this.level.isClientSide && !self.isDeadOrDying()) {
-            o = this.getTicksFrozen();
-            if (this.isInPowderSnow && this.canFreeze()) {
-                this.setTicksFrozen(Math.min(this.getTicksRequiredToFreeze(), o + 1));
-            } else {
-                this.setTicksFrozen(Math.max(0, o - 2));
-            }
-        }
-
-        this.removeFrost();
-        this.tryAddFrost();
-        if (!this.level.isClientSide && this.tickCount % 40 == 0 && this.isFullyFrozen() && this.canFreeze()) {
-            o = bl2 ? 5 : 1;
-            this.hurt(DamageSource.FREEZE, (float) o);
-        }
-
-        this.level.getProfiler().pop();
-        this.level.getProfiler().push("push");
-        if (this.autoSpinAttackTicks > 0) {
-            --this.autoSpinAttackTicks;
-            this.checkAutoSpinAttack(aABB, this.getBoundingBox());
-        }
-
-        this.pushEntities();
-        this.level.getProfiler().pop();
-        if (!this.level.isClientSide && self.isSensitiveToWater() && this.isInWaterRainOrBubble()) {
-            this.hurt(DamageSource.DROWN, 1.0F);
-        }
-    }
-
-
-    @Inject(method = "travel", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/entity/LivingEntity;isFallFlying()Z", shift = Shift.AFTER), cancellable = true)
-    public void be_travel(Vec3 vec3, CallbackInfo info) {
-        ItemStack itemStack = getItemBySlot(EquipmentSlot.CHEST);
-        if (isFallFlying() && itemStack.getItem() instanceof FallFlyingItem) {
-            Vec3 moveDelta = getDeltaMovement();
-            if (moveDelta.y > -0.5D) {
-                fallDistance = 1.0F;
-            }
-
-            Vec3 lookAngle = getLookAngle();
-            double d = 0.08D;
-            float rotX = getXRot() * 0.017453292F;
-            double k = Math.sqrt(lookAngle.x * lookAngle.x + lookAngle.z * lookAngle.z);
-            double l = moveDelta.horizontalDistance();
-            double lookLen = lookAngle.length();
-            float n = Mth.cos(rotX);
-            n = (float) (n * n * Math.min(1.0D, lookLen / 0.4D));
-            moveDelta = getDeltaMovement().add(0.0D, d * (-1.0D + (double) n * 0.75D), 0.0D);
-            double coef;
-            if (moveDelta.y < 0.0D && k > 0.0D) {
-                coef = moveDelta.y * -0.1D * (double) n;
-                moveDelta = moveDelta.add(lookAngle.x * coef / k, coef, lookAngle.z * coef / k);
-            }
-
-            if (rotX < 0.0F && k > 0.0D) {
-                coef = l * (double) (-Mth.sin(rotX)) * 0.04D;
-                moveDelta = moveDelta.add(-lookAngle.x * coef / k, coef * 3.2D, -lookAngle.z * coef / k);
-            }
-
-            if (k > 0.0D) {
-                moveDelta = moveDelta.add(
-                        (lookAngle.x / k * l - moveDelta.x) * 0.1D,
-                        0.0D,
-                        (lookAngle.z / k * l - moveDelta.z) * 0.1D
-                );
-            }
-            moveDelta = moveDelta.multiply(0.9900000095367432D, 0.9800000190734863D, 0.9900000095367432D);
-            double movementFactor = ((FallFlyingItem) itemStack.getItem()).getMovementFactor();
-            moveDelta = moveDelta.multiply(movementFactor, 1.0D, movementFactor);
-            setDeltaMovement(moveDelta);
-            move(MoverType.SELF, moveDelta);
-            if (!level.isClientSide) {
-                if (horizontalCollision) {
-                    coef = moveDelta.horizontalDistance();
-                    double r = l - coef;
-                    float dmg = (float) (r * 10.0D - 3.0D);
-                    if (dmg > 0.0F) {
-                        playSound(getFallDamageSound((int) dmg), 1.0F, 1.0F);
-                        hurt(DamageSource.FLY_INTO_WALL, dmg);
-                    }
-                }
-                if (onGround) {
-                    setSharedFlag(7, false);
-                }
-            }
-
-            calculateEntityAnimation(LivingEntity.class.cast(this), this instanceof FlyingAnimal);
-            info.cancel();
-        }
     }
 
     private double be_getKnockback(Item tool) {

src/main/java/org/betterx/betterend/mixin/common/PlayerMixin.java

@@ -4,19 +4,14 @@ import org.betterx.bclib.blocks.BlockProperties;
 import org.betterx.bclib.blocks.BlockProperties.TripleShape;
 import org.betterx.bclib.util.BlocksHelper;
 import org.betterx.bclib.util.MHelper;
-import org.betterx.betterend.interfaces.FallFlyingItem;
 import org.betterx.betterend.registry.EndBlocks;
 
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Direction;
 import net.minecraft.server.level.ServerLevel;
-import net.minecraft.world.effect.MobEffects;
 import net.minecraft.world.entity.EntityType;
-import net.minecraft.world.entity.EquipmentSlot;
 import net.minecraft.world.entity.LivingEntity;
 import net.minecraft.world.entity.player.Player;
-import net.minecraft.world.item.ElytraItem;
-import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.level.Level;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.phys.Vec3;
@@ -52,19 +47,6 @@ public abstract class PlayerMixin extends LivingEntity {
         }
     }
 
-    @Inject(method = "tryToStartFallFlying", at = @At("HEAD"), cancellable = true)
-    public void be_tryToStartFlying(CallbackInfoReturnable<Boolean> info) {
-        if (!onGround && !isFallFlying() && !isInWater() && !hasEffect(MobEffects.LEVITATION)) {
-            ItemStack itemStack = getItemBySlot(EquipmentSlot.CHEST);
-            if (itemStack.getItem() instanceof FallFlyingItem && ElytraItem.isFlyEnabled(itemStack)) {
-                setSharedFlag(7, true);
-                info.setReturnValue(true);
-                System.out.println("Started");
-                info.cancel();
-            }
-        }
-    }
-
     private static Optional<Vec3> be_obeliskRespawnPosition(ServerLevel world, BlockPos pos, BlockState state) {
         if (state.getValue(BlockProperties.TRIPLE_SHAPE) == TripleShape.TOP) {
             pos = pos.below(2);

src/main/java/org/betterx/betterend/registry/EndItems.java

@@ -139,11 +139,11 @@ public class EndItems {
                     EndArmorMaterial.AETERNIUM,
                     Items.PHANTOM_MEMBRANE,
                     900,
-                    0.975D,
+                    0.97D,
                     true
             )
     );
-    public static final Item CRYSTALITE_ELYTRA = registerEndItem("elytra_crystalite", new CrystaliteElytra(650, 0.99D));
+    public static final Item CRYSTALITE_ELYTRA = registerEndItem("elytra_crystalite", new CrystaliteElytra(650, 1.01D));
 
     // Tools //
     public static final TieredItem AETERNIUM_SHOVEL = registerEndTool("aeternium_shovel", new BaseShovelItem(

src/main/resources/betterend.mixins.client.json

@@ -4,17 +4,16 @@
   "package": "org.betterx.betterend.mixin.client",
   "compatibilityLevel": "JAVA_16",
   "client": [
-	  "AbstractSoundInstanceAccessor",
+    "AbstractSoundInstanceAccessor",
-	  "ArmorStandRendererMixin",
+    "ArmorStandRendererMixin",
-	  "BiomeColorsMixin",
+    "BiomeColorsMixin",
-	  "CapeLayerMixin",
+    "CapeLayerMixin",
-	  "HumanoidMobRendererMixin",
+    "HumanoidMobRendererMixin",
-	  "ItemStackMixin",
+    "ItemStackMixin",
-	  "LocalPlayerMixin",
+    "MinecraftClientMixin",
-	  "MinecraftClientMixin",
+    "ModelLoaderMixin",
-	  "ModelLoaderMixin",
+    "MusicTrackerMixin",
-	  "MusicTrackerMixin",
+    "PlayerRendererMixin"
-	  "PlayerRendererMixin"
   ],
   "injectors": {
     "defaultRequire": 1