Skip to content

Commit 7e3c1bb

Browse files
beanbag44beanbag44
committed
rename handlers from ***Manager to ***Handler
1 parent be88e05 commit 7e3c1bb

79 files changed

Lines changed: 210 additions & 225 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/MinecraftClientMixin.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
package com.lambda.mixin;
1919

20-
import com.lambda.core.TimerManager;
20+
import com.lambda.core.TimerHandler;
2121
import com.lambda.event.EventFlow;
2222
import com.lambda.event.events.*;
2323
import com.lambda.gui.DearImGui;
@@ -191,10 +191,10 @@ void injectItemPick(Operation<Void> original) {
191191

192192
@WrapMethod(method = "getTargetMillisPerTick")
193193
float getTargetMillisPerTick(float millis, Operation<Float> original) {
194-
var length = TimerManager.INSTANCE.getLength();
194+
var length = TimerHandler.INSTANCE.getLength();
195195

196-
if (length == TimerManager.DEFAULT_LENGTH) return original.call(millis);
197-
else return (float) TimerManager.INSTANCE.getLength();
196+
if (length == TimerHandler.DEFAULT_LENGTH) return original.call(millis);
197+
else return (float) TimerHandler.INSTANCE.getLength();
198198
}
199199

200200
@Inject(method = "updateWindowTitle", at = @At("HEAD"), cancellable = true)

‎src/main/java/com/lambda/mixin/baritone/BaritonePlayerContextMixin.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
import baritone.Baritone;
2121
import baritone.api.utils.Rotation;
2222
import baritone.utils.player.BaritonePlayerContext;
23-
import com.lambda.interaction.BaritoneManager;
23+
import com.lambda.interaction.BaritoneHandler;
2424
import com.lambda.interaction.managers.rotating.RotationManager;
2525
import com.llamalad7.mixinextras.injector.ModifyReturnValue;
2626
import org.spongepowered.asm.mixin.Final;
@@ -37,7 +37,7 @@ public class BaritonePlayerContextMixin {
3737
// Let baritone know the actual rotation
3838
@ModifyReturnValue(method = "playerRotations", at = @At("RETURN"), remap = false)
3939
Rotation syncRotationWithBaritone(Rotation original) {
40-
if (baritone != BaritoneManager.getPrimary())
40+
if (baritone != BaritoneHandler.getPrimary())
4141
return original;
4242

4343
float yaw = (float) RotationManager.getActiveRotation().getYaw();

‎src/main/java/com/lambda/mixin/baritone/LookBehaviourMixin.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
import baritone.api.event.events.RotationMoveEvent;
2222
import baritone.api.utils.Rotation;
2323
import baritone.behavior.LookBehavior;
24-
import com.lambda.interaction.BaritoneManager;
24+
import com.lambda.interaction.BaritoneHandler;
2525
import com.lambda.interaction.managers.rotating.RotationManager;
2626
import org.spongepowered.asm.mixin.Mixin;
2727
import org.spongepowered.asm.mixin.Unique;
@@ -37,22 +37,22 @@ public class LookBehaviourMixin {
3737
// Redirect baritone's rotations into our rotation engine
3838
@Inject(method = "updateTarget", at = @At("HEAD"), cancellable = true)
3939
void onTargetUpdate(Rotation rotation, boolean blockInteract, CallbackInfo ci) {
40-
if (instance.baritone != BaritoneManager.getPrimary()) return;
40+
if (instance.baritone != BaritoneHandler.getPrimary()) return;
4141

4242
RotationManager.handleBaritoneRotation(rotation.getYaw(), rotation.getPitch());
4343
ci.cancel();
4444
}
4545

4646
@Inject(method = "onPlayerUpdate", at = @At("HEAD"), cancellable = true)
4747
void onUpdate(PlayerUpdateEvent event, CallbackInfo ci) {
48-
if (instance.baritone != BaritoneManager.getPrimary()) return;
48+
if (instance.baritone != BaritoneHandler.getPrimary()) return;
4949

5050
ci.cancel();
5151
}
5252

5353
@Inject(method = "onPlayerRotationMove", at = @At("HEAD"), cancellable = true)
5454
void onMovementUpdate(RotationMoveEvent event, CallbackInfo ci) {
55-
if (instance.baritone != BaritoneManager.getPrimary()) return;
55+
if (instance.baritone != BaritoneHandler.getPrimary()) return;
5656

5757
ci.cancel();
5858
}

‎src/main/java/com/lambda/mixin/render/BlockEntityRenderManagerMixin.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
package com.lambda.mixin.render;
1919

20-
import com.lambda.graphics.outline.OutlineManager;
20+
import com.lambda.graphics.outline.OutlineHandler;
2121
import com.lambda.graphics.outline.OutlineCapturingQueue;
2222
import com.lambda.graphics.outline.VertexCapture;
2323
import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
@@ -42,7 +42,7 @@ private <S extends BlockEntityRenderState> void wrapRenderQueue(BlockEntityRende
4242
Operation<Void> original) {
4343
BlockPos pos = renderState.pos;
4444

45-
if (pos != null && OutlineManager.shouldCapture(pos)) {
45+
if (pos != null && OutlineHandler.shouldCapture(pos)) {
4646
VertexCapture.INSTANCE.beginCapture(pos);
4747

4848
boolean outlineOnly = !Vec3d.ofCenter(pos).isInRange(cameraState.pos, renderer.getRenderDistance());

‎src/main/java/com/lambda/mixin/render/BlockEntityRendererMixin.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
package com.lambda.mixin.render;
1919

20-
import com.lambda.graphics.outline.OutlineManager;
20+
import com.lambda.graphics.outline.OutlineHandler;
2121
import net.minecraft.block.entity.BlockEntity;
2222
import net.minecraft.client.render.block.entity.BlockEntityRenderer;
2323
import net.minecraft.util.math.Vec3d;
@@ -31,7 +31,7 @@ public interface BlockEntityRendererMixin<T extends BlockEntity> {
3131

3232
@Inject(method = "isInRenderDistance", at = @At("HEAD"), cancellable = true)
3333
default void forceOutlineRenderDistance(T blockEntity, Vec3d pos, CallbackInfoReturnable<Boolean> cir) {
34-
if (OutlineManager.INSTANCE.shouldCapture(blockEntity.getPos())) {
34+
if (OutlineHandler.INSTANCE.shouldCapture(blockEntity.getPos())) {
3535
cir.setReturnValue(true);
3636
}
3737
}

‎src/main/java/com/lambda/mixin/render/CapeFeatureRendererMixin.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919

2020
import com.lambda.Lambda;
2121
import com.lambda.module.modules.client.Capes;
22-
import com.lambda.network.CapeManager;
22+
import com.lambda.network.CapeHandler;
2323
import com.llamalad7.mixinextras.injector.ModifyExpressionValue;
2424
import net.minecraft.client.render.command.OrderedRenderCommandQueue;
2525
import net.minecraft.client.render.entity.feature.CapeFeatureRenderer;
@@ -43,8 +43,8 @@ Identifier renderCape(Identifier original, MatrixStack matrixStack, OrderedRende
4343
if (entry == null) return original;
4444

4545
var profile = entry.getProfile();
46-
if (!Capes.INSTANCE.isEnabled() || !CapeManager.INSTANCE.getCache().containsKey(profile.id())) return original;
46+
if (!Capes.INSTANCE.isEnabled() || !CapeHandler.INSTANCE.getCache().containsKey(profile.id())) return original;
4747

48-
return Identifier.of("lambda", CapeManager.INSTANCE.getCache().get(profile.id()));
48+
return Identifier.of("lambda", CapeHandler.INSTANCE.getCache().get(profile.id()));
4949
}
5050
}

‎src/main/java/com/lambda/mixin/render/ChatInputSuggestorMixin.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
package com.lambda.mixin.render;
1919

20-
import com.lambda.command.CommandManager;
20+
import com.lambda.command.CommandHandler;
2121
import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
2222
import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
2323
import com.mojang.brigadier.CommandDispatcher;
@@ -40,12 +40,12 @@ public abstract class ChatInputSuggestorMixin {
4040

4141
@ModifyVariable(method = "refresh", at = @At(value = "STORE"), index = 3)
4242
private boolean refreshModify(boolean showCompletions) {
43-
return CommandManager.INSTANCE.isCommand(textField.getText());
43+
return CommandHandler.INSTANCE.isCommand(textField.getText());
4444
}
4545

4646
@SuppressWarnings("unchecked")
4747
@WrapOperation(method = "refresh", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/network/ClientPlayNetworkHandler;getCommandDispatcher()Lcom/mojang/brigadier/CommandDispatcher;"))
4848
private CommandDispatcher<CommandSource> wrapRefresh(ClientPlayNetworkHandler instance, Operation<CommandDispatcher<CommandSource>> original) {
49-
return (CommandDispatcher<CommandSource>) CommandManager.INSTANCE.currentDispatcher(textField.getText());
49+
return (CommandDispatcher<CommandSource>) CommandHandler.INSTANCE.currentDispatcher(textField.getText());
5050
}
5151
}

‎src/main/java/com/lambda/mixin/render/ChatScreenMixin.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
package com.lambda.mixin.render;
1919

20-
import com.lambda.command.CommandManager;
20+
import com.lambda.command.CommandHandler;
2121
import net.minecraft.client.gui.screen.ChatScreen;
2222
import org.spongepowered.asm.mixin.Mixin;
2323
import org.spongepowered.asm.mixin.injection.At;
@@ -28,8 +28,8 @@
2828
public abstract class ChatScreenMixin {
2929
@Inject(method = "sendMessage", at = @At("HEAD"), cancellable = true)
3030
void sendMessageInject(String chatText, boolean addToHistory, CallbackInfo ci) {
31-
if (!CommandManager.INSTANCE.isLambdaCommand(chatText)) return;
32-
CommandManager.INSTANCE.executeCommand(chatText);
31+
if (!CommandHandler.INSTANCE.isLambdaCommand(chatText)) return;
32+
CommandHandler.INSTANCE.executeCommand(chatText);
3333
ci.cancel();
3434
}
3535
}

‎src/main/java/com/lambda/mixin/render/ElytraFeatureRendererMixin.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
import com.lambda.Lambda;
2121
import com.lambda.module.modules.client.Capes;
2222
import com.lambda.module.modules.render.NoRender;
23-
import com.lambda.network.CapeManager;
23+
import com.lambda.network.CapeHandler;
2424
import com.llamalad7.mixinextras.injector.ModifyReturnValue;
2525
import com.llamalad7.mixinextras.injector.wrapmethod.WrapMethod;
2626
import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
@@ -50,10 +50,10 @@ private static Identifier injectElytra(Identifier original, BipedEntityRenderSta
5050

5151
var profile = entry.getProfile();
5252

53-
if (!Capes.INSTANCE.isEnabled() || !CapeManager.INSTANCE.getCache().containsKey(profile.id()))
53+
if (!Capes.INSTANCE.isEnabled() || !CapeHandler.INSTANCE.getCache().containsKey(profile.id()))
5454
return original;
5555

56-
return Identifier.of("lambda", CapeManager.INSTANCE.getCache().get(profile.id()));
56+
return Identifier.of("lambda", CapeHandler.INSTANCE.getCache().get(profile.id()));
5757
}
5858

5959
@WrapMethod(method = "render(Lnet/minecraft/client/util/math/MatrixStack;Lnet/minecraft/client/render/command/OrderedRenderCommandQueue;ILnet/minecraft/client/render/entity/state/BipedEntityRenderState;FF)V")

‎src/main/java/com/lambda/mixin/render/EntityRenderManagerMixin.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
package com.lambda.mixin.render;
1919

2020
import com.lambda.graphics.outline.IEntityRenderState;
21-
import com.lambda.graphics.outline.OutlineManager;
21+
import com.lambda.graphics.outline.OutlineHandler;
2222
import com.lambda.graphics.outline.OutlineCapturingQueue;
2323
import com.lambda.graphics.outline.VertexCapture;
2424
import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
@@ -51,7 +51,7 @@ private <S extends EntityRenderState> void wrapRenderQueue(EntityRenderer<?, S>
5151
entityId = lambdaState.lambda$getEntityId();
5252
}
5353

54-
if (entityId != -1 && OutlineManager.shouldCapture(entityId)) {
54+
if (entityId != -1 && OutlineHandler.shouldCapture(entityId)) {
5555
VertexCapture.INSTANCE.beginCapture(entityId);
5656

5757
OrderedRenderCommandQueueImpl wrappedQueue = new OutlineCapturingQueue((OrderedRenderCommandQueueImpl) queue, entityId);

0 commit comments

Comments
 (0)