Increase cohesion for ElytraFix

Author: Avanatiker

src/main/java/com/lambda/EntityLivingBaseFireworkHelper.java

@@ -1,6 +1,6 @@
 package com.lambda.mixin.entity;
 
-import com.lambda.EntityLivingBaseFireworkHelper;
+import com.lambda.client.module.modules.misc.ElytraFix;
 import com.lambda.client.module.modules.movement.ElytraFlight;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.EntityLivingBase;
@@ -31,7 +31,7 @@ public MixinEntityLivingBase(World worldIn) {
         at = @At(value = "INVOKE_ASSIGN", target = "Lnet/minecraft/entity/EntityLivingBase;getLookVec()Lnet/minecraft/util/math/Vec3d;", ordinal = 0)
     )
     private Vec3d vec3d(Vec3d original) {
-        if (EntityLivingBaseFireworkHelper.shouldWork(EntityLivingBase.class.cast(this))) {
+        if (ElytraFix.INSTANCE.shouldWork(EntityLivingBase.class.cast(this))) {
             float negPacketPitch = -ElytraFlight.INSTANCE.getPacketPitch();
             float f0 = MathHelper.cos((float) (-this.rotationYaw * 0.017453292f - Math.PI));
             float f1 = MathHelper.sin((float) (-this.rotationYaw * 0.017453292f - Math.PI));
@@ -49,7 +49,7 @@ private Vec3d vec3d(Vec3d original) {
         ordinal = 3
     )
     private float f(float original) {
-        if (EntityLivingBaseFireworkHelper.shouldWork(EntityLivingBase.class.cast(this))) {
+        if (ElytraFix.INSTANCE.shouldWork(EntityLivingBase.class.cast(this))) {
             return ElytraFlight.INSTANCE.getPacketPitch() * 0.017453292f;
         }
         return original;
@@ -76,7 +76,7 @@ private void getVec(
         at = @At(value = "FIELD", opcode = Opcodes.GETFIELD, target = "Lnet/minecraft/entity/EntityLivingBase;motionX:D", ordinal = 7)
     )
     public double motionX(EntityLivingBase it) {
-        if (EntityLivingBaseFireworkHelper.shouldModify(EntityLivingBase.class.cast(this))) {
+        if (ElytraFix.INSTANCE.shouldModify(EntityLivingBase.class.cast(this))) {
             it.motionX += modifiedVec.x * 0.1 + (modifiedVec.x * 1.5 - this.motionX) * 0.5;
         }
         return it.motionX;
@@ -87,7 +87,7 @@ public double motionX(EntityLivingBase it) {
         at = @At(value = "FIELD", opcode = Opcodes.GETFIELD, target = "Lnet/minecraft/entity/EntityLivingBase;motionY:D", ordinal = 7)
     )
     public double motionY(EntityLivingBase it) {
-        if (EntityLivingBaseFireworkHelper.shouldModify(EntityLivingBase.class.cast(this))) {
+        if (ElytraFix.INSTANCE.shouldModify(EntityLivingBase.class.cast(this))) {
             it.motionY += modifiedVec.y * 0.1 + (modifiedVec.y * 1.5 - this.motionY) * 0.5;
         }
         return it.motionY;
@@ -98,7 +98,7 @@ public double motionY(EntityLivingBase it) {
         at = @At(value = "FIELD", opcode = Opcodes.GETFIELD, target = "Lnet/minecraft/entity/EntityLivingBase;motionZ:D", ordinal = 7)
     )
     public double motionZ(EntityLivingBase it) {
-        if (EntityLivingBaseFireworkHelper.shouldModify(EntityLivingBase.class.cast(this))) {
+        if (ElytraFix.INSTANCE.shouldModify(EntityLivingBase.class.cast(this))) {
             it.motionZ += modifiedVec.z * 0.1 + (modifiedVec.z * 1.5 - this.motionZ) * 0.5;
         }
         return it.motionZ;

src/main/java/com/lambda/mixin/entity/MixinEntityLivingBase.java

@@ -12,7 +12,6 @@
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
-// TODO: Find a working fix of this for optifine
 @Mixin(ViewFrustum.class)
 public abstract class MixinViewFrustum {
     @Shadow public RenderChunk[] renderChunks;

src/main/java/com/lambda/mixin/render/MixinViewFrustum.java

@@ -4,7 +4,11 @@ import com.lambda.client.event.events.PacketEvent
 import com.lambda.client.mixin.extension.boostedEntity
 import com.lambda.client.module.Category
 import com.lambda.client.module.Module
+import com.lambda.client.module.modules.movement.ElytraFlight
 import com.lambda.client.util.threads.safeListener
+import com.lambda.mixin.accessor.AccessorEntityFireworkRocket
+import net.minecraft.client.entity.EntityPlayerSP
+import net.minecraft.entity.EntityLivingBase
 import net.minecraft.entity.item.EntityFireworkRocket
 import net.minecraft.network.play.server.SPacketPlayerPosLook
 
@@ -22,4 +26,15 @@ object ElytraFix : Module(
             }
         }
     }
+
+    fun shouldWork(entity: EntityLivingBase) = EntityPlayerSP::class.java.isAssignableFrom(entity.javaClass)
+        && ElytraFlight.isEnabled
+        && ElytraFlight.mode.value == ElytraFlight.ElytraFlightMode.VANILLA
+
+    fun shouldModify(entity: EntityLivingBase) = shouldWork(entity)
+        && entity.world.loadedEntityList
+        .filterIsInstance<AccessorEntityFireworkRocket>()
+        .any {
+            it.boostedEntity.equals(entity)
+        }
 }