Skip to content

Commit a816470

Browse files
AvanatikerAvanatiker
committed
Big reformat
1 parent 30d9d06 commit a816470

File tree

107 files changed

+869
-671
lines changed

Some content is hidden

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

107 files changed

+869
-671
lines changed

‎build.gradle.kts‎

Lines changed: 24 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -16,30 +16,27 @@
1616
*/
1717

1818
import org.apache.tools.ant.taskdefs.condition.Os
19-
import org.gradle.internal.jvm.*
20-
import org.gradle.kotlin.dsl.dependencies
21-
import org.gradle.kotlin.dsl.provideDelegate
22-
import org.gradle.kotlin.dsl.register
19+
import org.gradle.internal.jvm.Jvm
2320
import java.util.*
2421

25-
val modId : String by project
26-
val mavenGroup : String by project
27-
val modVersion : String by project
28-
val minecraftVersion : String by project
29-
val yarnMappings : String by project
30-
val fabricLoaderVersion : String by project
31-
val fabricApiVersion : String by project
32-
val kotlinFabricVersion : String by project
33-
val pngEncoderVersion : String by project
34-
val discordIPCVersion : String by project
35-
val classGraphVersion : String by project
36-
val kotlinVersion : String by project
37-
val ktorVersion : String by project
38-
val mockitoKotlin : String by project
39-
val mockitoInline : String by project
40-
val mockkVersion : String by project
41-
val spairVersion : String by project
42-
val lwjglVersion : String by project
22+
val modId: String by project
23+
val mavenGroup: String by project
24+
val modVersion: String by project
25+
val minecraftVersion: String by project
26+
val yarnMappings: String by project
27+
val fabricLoaderVersion: String by project
28+
val fabricApiVersion: String by project
29+
val kotlinFabricVersion: String by project
30+
val pngEncoderVersion: String by project
31+
val discordIPCVersion: String by project
32+
val classGraphVersion: String by project
33+
val kotlinVersion: String by project
34+
val ktorVersion: String by project
35+
val mockitoKotlin: String by project
36+
val mockitoInline: String by project
37+
val mockkVersion: String by project
38+
val spairVersion: String by project
39+
val lwjglVersion: String by project
4340

4441

4542
val libs = file("libs")
@@ -169,7 +166,11 @@ dependencies {
169166

170167
// Ktor
171168
includeLib("io.ktor:ktor-client-core:$ktorVersion")
172-
shadowLib("io.ktor:ktor-client-cio:$ktorVersion") { exclude(group = "org.jetbrains.kotlin"); exclude(group = "org.jetbrains.kotlinx"); exclude(group = "org.slf4j") }
169+
shadowLib("io.ktor:ktor-client-cio:$ktorVersion") {
170+
exclude(group = "org.jetbrains.kotlin")
171+
exclude(group = "org.jetbrains.kotlinx")
172+
exclude(group = "org.slf4j")
173+
}
173174
includeLib("io.ktor:ktor-client-content-negotiation:$ktorVersion")
174175
includeLib("io.ktor:ktor-serialization-gson:$ktorVersion")
175176

‎src/main/java/com/lambda/mixin/CrashReportMixin.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ String injectString(ReportType type, List<String> extraInfo, Operation<String> o
7373
});
7474
}
7575

76-
list.add("\n"+"-".repeat(43)+"\n");
76+
list.add("\n" + "-".repeat(43) + "\n");
7777

7878
return original.call(type, list);
7979
}

‎src/main/java/com/lambda/mixin/MinecraftClientMixin.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,9 @@
3535
import net.minecraft.client.network.ClientPlayerInteractionManager;
3636
import net.minecraft.client.render.WorldRenderer;
3737
import net.minecraft.client.sound.SoundManager;
38-
import net.minecraft.util.thread.ThreadExecutor;
3938
import net.minecraft.util.Hand;
4039
import net.minecraft.util.hit.HitResult;
40+
import net.minecraft.util.thread.ThreadExecutor;
4141
import org.jetbrains.annotations.Nullable;
4242
import org.spongepowered.asm.mixin.Mixin;
4343
import org.spongepowered.asm.mixin.Shadow;

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

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -52,21 +52,15 @@
5252

5353
@Mixin(value = ClientPlayerEntity.class, priority = Integer.MAX_VALUE)
5454
public abstract class ClientPlayerEntityMixin extends AbstractClientPlayerEntity {
55-
56-
@Shadow
57-
public Input input;
58-
59-
@Shadow
60-
private boolean autoJumpEnabled;
55+
@Shadow public Input input;
56+
@Shadow @Final protected MinecraftClient client;
57+
@Shadow private boolean autoJumpEnabled;
6158

6259
public ClientPlayerEntityMixin(ClientWorld world, GameProfile profile) {
6360
super(world, profile);
6461
}
6562

66-
@Shadow
67-
protected abstract void autoJump(float dx, float dz);
68-
69-
@Shadow @Final protected MinecraftClient client;
63+
@Shadow protected abstract void autoJump(float dx, float dz);
7064

7165
/**
7266
* Post movement events and applies the modified player velocity

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

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@
2020
import com.lambda.Lambda;
2121
import com.lambda.event.EventFlow;
2222
import com.lambda.event.events.MovementEvent;
23-
import com.lambda.module.modules.render.ViewModel;
2423
import com.lambda.interaction.request.rotating.RotationManager;
24+
import com.lambda.module.modules.render.ViewModel;
2525
import net.minecraft.entity.LivingEntity;
2626
import net.minecraft.util.math.MathHelper;
2727
import net.minecraft.util.math.Vec3d;
@@ -34,11 +34,9 @@
3434
@Mixin(LivingEntity.class)
3535
public abstract class LivingEntityMixin extends EntityMixin {
3636

37-
@Shadow
38-
protected abstract float getJumpVelocity();
37+
@Unique private final LivingEntity lambda$instance = (LivingEntity) (Object) this;
3938

40-
@Unique
41-
private final LivingEntity lambda$instance = (LivingEntity) (Object) this;
39+
@Shadow protected abstract float getJumpVelocity();
4240

4341
/**
4442
* Overwrites the jump function to use our rotation and movements

‎src/main/java/com/lambda/mixin/items/BarrierBlockMixin.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
import net.minecraft.block.BarrierBlock;
2222
import net.minecraft.block.BlockRenderType;
2323
import net.minecraft.block.BlockState;
24-
import net.minecraft.block.Blocks;
2524
import org.spongepowered.asm.mixin.Mixin;
2625
import org.spongepowered.asm.mixin.injection.At;
2726
import org.spongepowered.asm.mixin.injection.Inject;

‎src/main/java/com/lambda/mixin/network/ClientConnectionMixin.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -89,8 +89,7 @@ private void receivingPacketPost(
8989
}
9090

9191
@Inject(method = "connect(Ljava/lang/String;ILnet/minecraft/network/state/NetworkState;Lnet/minecraft/network/state/NetworkState;Lnet/minecraft/network/listener/ClientPacketListener;Lnet/minecraft/network/packet/c2s/handshake/ConnectionIntent;)V", at = @At("HEAD"), cancellable = true)
92-
private
93-
<S extends ServerPacketListener, C extends ClientPacketListener>
92+
private <S extends ServerPacketListener, C extends ClientPacketListener>
9493
void onConnect(
9594
String address,
9695
int port,
@@ -100,7 +99,8 @@ void onConnect(
10099
ConnectionIntent intent,
101100
CallbackInfo ci
102101
) {
103-
if (EventFlow.post(new ConnectionEvent.Connect.Pre(address, port, prePlayStateListener, intent)).isCanceled()) ci.cancel();
102+
if (EventFlow.post(new ConnectionEvent.Connect.Pre(address, port, prePlayStateListener, intent)).isCanceled())
103+
ci.cancel();
104104
}
105105

106106
@Inject(method = "disconnect(Lnet/minecraft/text/Text;)V", at = @At("HEAD"))

‎src/main/java/com/lambda/mixin/network/ClientPlayNetworkHandlerMixin.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -63,11 +63,11 @@ private void onScreenHandlerSlotUpdate(ScreenHandlerSlotUpdateS2CPacket packet,
6363
/**
6464
* Sets displayedUnsecureChatWarning to {@link NoRender#getNoChatVerificationToast()}
6565
* <pre>{@code
66-
* this.secureChatEnforced = packet.enforcesSecureChat();
66+
* this.secureChatEnforced = packet.enforcesSecureChat();
6767
* if (this.serverInfo != null && !this.displayedUnsecureChatWarning && !this.isSecureChatEnforced()) {
68-
SystemToast systemToast = SystemToast.create(this.client, SystemToast.Type.UNSECURE_SERVER_WARNING, UNSECURE_SERVER_TOAST_TITLE, UNSECURE_SERVER_TOAST_TEXT);
69-
this.client.getToastManager().add(systemToast);
70-
this.displayedUnsecureChatWarning = true;
68+
* SystemToast systemToast = SystemToast.create(this.client, SystemToast.Type.UNSECURE_SERVER_WARNING, UNSECURE_SERVER_TOAST_TITLE, UNSECURE_SERVER_TOAST_TEXT);
69+
* this.client.getToastManager().add(systemToast);
70+
* this.displayedUnsecureChatWarning = true;
7171
* }
7272
* }</pre>
7373
*/

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

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -48,13 +48,10 @@
4848

4949
@Mixin(ChatInputSuggestor.class)
5050
public abstract class ChatInputSuggestorMixin {
51-
52-
@Shadow
53-
@Final
54-
TextFieldWidget textField;
55-
56-
@Shadow
57-
private @Nullable CompletableFuture<Suggestions> pendingSuggestions;
51+
@Unique private static final Pattern COLON_PATTERN = Pattern.compile("(:[a-zA-Z0-9_]+)");
52+
@Unique private static final Pattern EMOJI_PATTERN = Pattern.compile("(:)([a-zA-Z0-9_]+)(:)");
53+
@Shadow @Final TextFieldWidget textField;
54+
@Shadow private @Nullable CompletableFuture<Suggestions> pendingSuggestions;
5855

5956
@Shadow
6057
public abstract void show(boolean narrateFirstSuggestion);
@@ -115,12 +112,6 @@ private void refreshEmojiSuggestion(CallbackInfo ci) {
115112
});
116113
}
117114

118-
@Unique
119-
private static final Pattern COLON_PATTERN = Pattern.compile("(:[a-zA-Z0-9_]+)");
120-
121-
@Unique
122-
private static final Pattern EMOJI_PATTERN = Pattern.compile("(:)([a-zA-Z0-9_]+)(:)");
123-
124115
@Unique
125116
private int neoLambda$getLastColon(String input) {
126117
if (Strings.isNullOrEmpty(input)) return -1;

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

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -17,18 +17,8 @@
1717

1818
package com.lambda.mixin.render;
1919

20-
import com.lambda.module.modules.render.MapPreview;
21-
import net.minecraft.client.gui.tooltip.BundleTooltipComponent;
22-
import net.minecraft.client.gui.tooltip.ProfilesTooltipComponent;
2320
import net.minecraft.client.gui.tooltip.TooltipComponent;
24-
import net.minecraft.item.tooltip.BundleTooltipData;
25-
import net.minecraft.item.tooltip.TooltipData;
2621
import org.spongepowered.asm.mixin.Mixin;
27-
import org.spongepowered.asm.mixin.injection.At;
28-
import org.spongepowered.asm.mixin.injection.Inject;
29-
import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
30-
31-
import java.util.Objects;
3222

3323
@Mixin(TooltipComponent.class)
3424
public interface TooltipComponentMixin {

0 commit comments

Comments
 (0)