Skip to content

Commit bb15de9

Browse files
beanbag44beanbag44
committed
separate ElytraFly functionality into separate classes with abstraction for scalability
1 parent 0f56c8f commit bb15de9

90 files changed

Lines changed: 771 additions & 542 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎src/main/java/com/lambda/mixin/entity/ClientPlayerEntityMixin.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
import com.lambda.event.EventFlow;
2121
import com.lambda.event.events.*;
2222
import com.lambda.interaction.managers.rotating.RotationManager;
23-
import com.lambda.module.modules.movement.ElytraFly;
23+
import com.lambda.module.modules.movement.elytrafly.ElytraFly;
2424
import com.lambda.module.modules.movement.NoJumpCooldown;
2525
import com.lambda.module.modules.player.PortalGui;
2626
import com.lambda.module.modules.render.ViewModel;

‎src/main/java/com/lambda/mixin/entity/EntityMixin.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
import com.lambda.event.events.EntityEvent;
2222
import com.lambda.event.events.PlayerEvent;
2323
import com.lambda.interaction.managers.rotating.RotationManager;
24-
import com.lambda.module.modules.movement.ElytraFly;
24+
import com.lambda.module.modules.movement.elytrafly.ElytraFly;
2525
import com.lambda.module.modules.render.NoRender;
2626
import com.lambda.util.math.Vec2d;
2727
import com.llamalad7.mixinextras.injector.ModifyExpressionValue;
@@ -193,6 +193,6 @@ private float modifyGetYaw(float original) {
193193
@Inject(method = "getVelocity", at = @At("HEAD"), cancellable = true)
194194
private void injectGetVelocity(CallbackInfoReturnable<Vec3d> cir) {
195195
if (ElytraFly.INSTANCE.isDisabled() || ElytraFly.getMode() != ElytraFly.FlyMode.Bounce) return;
196-
cir.setReturnValue(ElytraFly.getModifiedBounceVelocity(velocity));
196+
cir.setReturnValue(ElytraFly.getBounceMode().getModifiedBounceVelocity(velocity));
197197
}
198198
}

‎src/main/java/com/lambda/mixin/entity/FireworkRocketEntityMixin.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
package com.lambda.mixin.entity;
1919

20-
import com.lambda.module.modules.movement.ElytraFly;
20+
import com.lambda.module.modules.movement.elytrafly.ElytraFly;
2121
import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
2222
import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
2323
import net.minecraft.entity.LivingEntity;

‎src/main/java/com/lambda/mixin/entity/LivingEntityMixin.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
import com.lambda.event.EventFlow;
2222
import com.lambda.event.events.MovementEvent;
2323
import com.lambda.interaction.managers.rotating.RotationManager;
24-
import com.lambda.module.modules.movement.ElytraFly;
24+
import com.lambda.module.modules.movement.elytrafly.ElytraFly;
2525
import com.lambda.module.modules.movement.Velocity;
2626
import com.lambda.module.modules.render.ViewModel;
2727
import com.llamalad7.mixinextras.expression.Definition;
@@ -177,6 +177,6 @@ private void wrapPushAwayFrom(Entity entity, Operation<Void> original) {
177177
private boolean injectIsGliding(boolean original) {
178178
if (lambda$instance != Lambda.getMc().player) return original;
179179

180-
return ElytraFly.INSTANCE.isEnabled() ? ElytraFly.isGliding() : original;
180+
return ElytraFly.INSTANCE.isEnabled() ? ElytraFly.getBounceMode().isGliding() : original;
181181
}
182182
}

‎src/main/kotlin/com/lambda/config/automation/AutomationConfig.kt‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -21,17 +21,16 @@ import com.lambda.config.Config
2121
import com.lambda.config.ConfigCategory
2222
import com.lambda.config.Tab
2323
import com.lambda.config.categories.AutomationCategory
24-
import com.lambda.config.settings.blocks.BreakSettings
25-
import com.lambda.config.settings.blocks.BuildSettings
26-
import com.lambda.config.settings.blocks.EatSettings
27-
import com.lambda.config.settings.blocks.HotbarSettings
28-
import com.lambda.config.settings.blocks.InteractSettings
29-
import com.lambda.config.settings.blocks.InventorySettings
30-
import com.lambda.config.settings.blocks.RotationSettings
24+
import com.lambda.config.blocks.BreakSettings
25+
import com.lambda.config.blocks.BuildSettings
26+
import com.lambda.config.blocks.EatSettings
27+
import com.lambda.config.blocks.HotbarSettings
28+
import com.lambda.config.blocks.InteractSettings
29+
import com.lambda.config.blocks.InventorySettings
30+
import com.lambda.config.blocks.RotationSettings
3131
import com.lambda.context.Automated
3232
import com.lambda.module.Module
3333

34-
3534
open class AutomationConfig(
3635
name: String,
3736
configCategory: ConfigCategory = AutomationCategory

‎src/main/kotlin/com/lambda/config/automation/IMutableAutomationConfig.kt‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,13 @@ package com.lambda.config.automation
2020
import com.lambda.config.EntryCore
2121
import com.lambda.config.EntryLayer
2222
import com.lambda.config.entries.Setting
23-
import com.lambda.config.settings.blocks.BreakConfig
24-
import com.lambda.config.settings.blocks.BuildConfig
25-
import com.lambda.config.settings.blocks.EatConfig
26-
import com.lambda.config.settings.blocks.HotbarConfig
27-
import com.lambda.config.settings.blocks.InteractConfig
28-
import com.lambda.config.settings.blocks.InventoryConfig
29-
import com.lambda.config.settings.blocks.RotationConfig
23+
import com.lambda.config.blocks.BreakConfig
24+
import com.lambda.config.blocks.BuildConfig
25+
import com.lambda.config.blocks.EatConfig
26+
import com.lambda.config.blocks.HotbarConfig
27+
import com.lambda.config.blocks.InteractConfig
28+
import com.lambda.config.blocks.InventoryConfig
29+
import com.lambda.config.blocks.RotationConfig
3030
import com.lambda.context.Automated
3131

3232
interface IMutableAutomationConfig : Automated {

src/main/kotlin/com/lambda/config/settings/blocks/ActionConfig.kt renamed to src/main/kotlin/com/lambda/config/blocks/ActionConfig.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
* along with this program. If not, see <http://www.gnu.org/licenses/>.
1616
*/
1717

18-
package com.lambda.config.settings.blocks
18+
package com.lambda.config.blocks
1919

2020
import com.lambda.event.events.TickEvent
2121
import com.lambda.util.Describable

src/main/kotlin/com/lambda/config/settings/blocks/BreakConfig.kt renamed to src/main/kotlin/com/lambda/config/blocks/BreakConfig.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
* along with this program. If not, see <http://www.gnu.org/licenses/>.
1616
*/
1717

18-
package com.lambda.config.settings.blocks
18+
package com.lambda.config.blocks
1919

2020
import com.lambda.util.Describable
2121
import com.lambda.util.NamedEnum

src/main/kotlin/com/lambda/config/settings/blocks/BreakSettings.kt renamed to src/main/kotlin/com/lambda/config/blocks/BreakSettings.kt

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,17 +15,17 @@
1515
* along with this program. If not, see <http://www.gnu.org/licenses/>.
1616
*/
1717

18-
package com.lambda.config.settings.blocks
18+
package com.lambda.config.blocks
1919

2020
import com.lambda.config.Config
2121
import com.lambda.config.ConfigBlock
2222
import com.lambda.config.ConfigEditor.hide
2323
import com.lambda.config.Group
24-
import com.lambda.config.settings.blocks.BreakConfig.AnimationMode
25-
import com.lambda.config.settings.blocks.BreakConfig.BreakConfirmationMode
26-
import com.lambda.config.settings.blocks.BreakConfig.BreakMode
27-
import com.lambda.config.settings.blocks.BreakConfig.SwingMode
28-
import com.lambda.config.settings.blocks.BreakConfig.WhitelistMode
24+
import com.lambda.config.blocks.BreakConfig.AnimationMode
25+
import com.lambda.config.blocks.BreakConfig.BreakConfirmationMode
26+
import com.lambda.config.blocks.BreakConfig.BreakMode
27+
import com.lambda.config.blocks.BreakConfig.SwingMode
28+
import com.lambda.config.blocks.BreakConfig.WhitelistMode
2929
import com.lambda.config.withEdits
3030
import com.lambda.event.events.TickEvent
3131
import com.lambda.event.events.TickEvent.Companion.ALL_STAGES

src/main/kotlin/com/lambda/config/settings/blocks/BuildConfig.kt renamed to src/main/kotlin/com/lambda/config/blocks/BuildConfig.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
* along with this program. If not, see <http://www.gnu.org/licenses/>.
1616
*/
1717

18-
package com.lambda.config.settings.blocks
18+
package com.lambda.config.blocks
1919

2020
import com.lambda.interaction.managers.rotating.Rotation.Companion.dist
2121
import com.lambda.interaction.managers.rotating.RotationManager

0 commit comments

Comments
 (0)