Skip to content

Commit d8767e0

Browse files
committed
Reformat mixins
1 parent 9134e2d commit d8767e0

File tree

7 files changed

+9
-15
lines changed

7 files changed

+9
-15
lines changed

common/src/main/java/com/lambda/mixin/entity/ClientPlayInteractionManagerMixin.java

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

2020
import com.lambda.event.EventFlow;
2121
import com.lambda.event.events.PlayerEvent;
22-
import net.minecraft.client.MinecraftClient;
2322
import net.minecraft.client.network.ClientPlayerEntity;
2423
import net.minecraft.client.network.ClientPlayerInteractionManager;
2524
import net.minecraft.entity.Entity;
@@ -31,7 +30,6 @@
3130
import net.minecraft.util.hit.EntityHitResult;
3231
import net.minecraft.util.math.BlockPos;
3332
import net.minecraft.util.math.Direction;
34-
import org.spongepowered.asm.mixin.Final;
3533
import org.spongepowered.asm.mixin.Mixin;
3634
import org.spongepowered.asm.mixin.Shadow;
3735
import org.spongepowered.asm.mixin.injection.At;

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,8 @@
1919

2020
import com.lambda.Lambda;
2121
import com.lambda.event.EventFlow;
22-
import com.lambda.event.events.EntityEvent;
23-
import com.lambda.event.events.PlayerEvent;
2422
import com.lambda.event.events.MovementEvent;
23+
import com.lambda.event.events.PlayerEvent;
2524
import com.lambda.event.events.TickEvent;
2625
import com.lambda.interaction.PlayerPacketManager;
2726
import com.lambda.interaction.RotationManager;

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
import com.lambda.event.EventFlow;
2222
import com.lambda.event.events.EntityEvent;
2323
import com.lambda.event.events.PlayerEvent;
24-
import com.lambda.event.events.WorldEvent;
2524
import com.lambda.interaction.RotationManager;
2625
import com.lambda.util.math.Vec2d;
2726
import net.minecraft.entity.Entity;

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,10 @@ void onJump(CallbackInfo ci) {
6363

6464
@Inject(method = "travel", at = @At("HEAD"), cancellable = true)
6565
void onTravelPre(Vec3d movementInput, CallbackInfo ci) {
66-
if (EventFlow.post(new MovementEvent.Entity.Pre((LivingEntity) (Object) this, movementInput)).isCanceled()) ci.cancel();
66+
LivingEntity entity = (LivingEntity) (Object) this;
67+
if (EventFlow.post(new MovementEvent.Entity.Pre(entity, movementInput)).isCanceled()) {
68+
ci.cancel();
69+
}
6770
}
6871

6972
@Inject(method = "travel", at = @At("TAIL"))

common/src/main/java/com/lambda/mixin/input/MouseMixin.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,6 @@
2121
import com.lambda.event.events.MouseEvent;
2222
import com.lambda.util.math.Vec2d;
2323
import net.minecraft.client.Mouse;
24-
import com.lambda.util.Mouse.Button;
25-
import com.lambda.util.Mouse.Action;
2624
import org.spongepowered.asm.mixin.Mixin;
2725
import org.spongepowered.asm.mixin.Shadow;
2826
import org.spongepowered.asm.mixin.injection.At;

common/src/main/java/com/lambda/mixin/render/SplashOverlayMixin.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -56,13 +56,13 @@ private void onInit(CallbackInfo ci) {
5656

5757
@Mixin(SplashOverlay.LogoTexture.class)
5858
static class LogoTextureMixin extends ResourceTexture {
59+
public LogoTextureMixin(Identifier location) {
60+
super(location);
61+
}
62+
5963
@Redirect(method = "loadTextureData", at = @At(value = "INVOKE", target = "Lnet/minecraft/resource/DefaultResourcePack;open(Lnet/minecraft/resource/ResourceType;Lnet/minecraft/util/Identifier;)Lnet/minecraft/resource/InputSupplier;"))
6064
InputSupplier<InputStream> loadTextureData(DefaultResourcePack instance, ResourceType type, Identifier id) {
6165
return () -> new LambdaResource("textures/lambda_banner.png").getStream();
6266
}
63-
64-
public LogoTextureMixin(Identifier location) {
65-
super(location);
66-
}
6767
}
6868
}

common/src/main/java/com/lambda/mixin/world/ClientWorldMixin.java

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

2020
import com.lambda.event.EventFlow;
2121
import com.lambda.event.events.EntityEvent;
22-
import com.lambda.event.events.WorldEvent;
2322
import com.lambda.module.modules.render.WorldColors;
2423
import com.lambda.util.math.ColorKt;
25-
import net.minecraft.block.BlockState;
2624
import net.minecraft.client.world.ClientWorld;
2725
import net.minecraft.entity.Entity;
28-
import net.minecraft.util.math.BlockPos;
2926
import net.minecraft.util.math.Vec3d;
3027
import org.spongepowered.asm.mixin.Mixin;
3128
import org.spongepowered.asm.mixin.injection.At;

0 commit comments

Comments
 (0)