Skip to content

Commit df165b2

Browse files
committed
Merge branch '1.21.5' into feature/manager-loggers
2 parents b16b248 + 10618d6 commit df165b2

File tree

4 files changed

+18
-7
lines changed

4 files changed

+18
-7
lines changed

build.gradle.kts

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,6 @@ repositories {
7171
mavenLocal() // Allow the use of local repositories
7272
maven("https://maven.2b2t.vc/releases") // Baritone
7373
maven("https://jitpack.io") // KDiscordIPC
74-
maven("https://raw.githubusercontent.com/kotlin-graphics/mary/master")
7574
mavenCentral()
7675

7776
// Allow the use of local libraries
@@ -111,7 +110,7 @@ loom {
111110
property("mixin.debug.export", "true")
112111

113112
vmArgs("-XX:+HeapDumpOnOutOfMemoryError", "-XX:+CreateCoredumpOnCrash", "-XX:+UseOSErrorReporting")
114-
programArgs("--username", "Steve", "--uuid", "8667ba71b85a4004af54457a9734eed7", "--accessToken", "<TOKEN>")
113+
programArgs("--username", "Steve", "--uuid", "8667ba71b85a4004af54457a9734eed7", "--accessToken", "****")
115114
}
116115
}
117116
}
@@ -255,3 +254,15 @@ java {
255254
sourceCompatibility = JavaVersion.VERSION_21
256255
targetCompatibility = JavaVersion.VERSION_21
257256
}
257+
258+
publishing {
259+
publications {
260+
create<MavenPublication>("maven") {
261+
groupId = mavenGroup
262+
artifactId = modId
263+
version = "$modVersion+$minecraftVersion"
264+
265+
from(components["java"])
266+
}
267+
}
268+
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@ private void adjustSwing(AbstractClientPlayerEntity instance, Hand hand) {
170170

171171
@Inject(method = "updateHealth", at = @At("HEAD"))
172172
public void damage(float health, CallbackInfo ci) {
173-
EventFlow.post(new PlayerEvent.Damage(health));
173+
EventFlow.post(new PlayerEvent.Health(health));
174174
}
175175

176176
/**

src/main/kotlin/com/lambda/event/events/PlayerEvent.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,11 +52,11 @@ sealed class PlayerEvent {
5252
) : ICancellable by Cancellable()
5353

5454
/**
55-
* Represents a damage event for the player.
55+
* Represents a health update for the player.
5656
*
57-
* @property amount The amount of damage dealt.
57+
* @property amount The new player health.
5858
*/
59-
data class Damage(val amount: Float) : Event
59+
data class Health(val amount: Float) : Event
6060

6161
sealed class Interact {
6262
/**

src/main/kotlin/com/lambda/module/modules/combat/AutoDisconnect.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ object AutoDisconnect : Module(
9393
}
9494
}
9595

96-
listen<PlayerEvent.Damage> { event ->
96+
listen<PlayerEvent.Health> { event ->
9797
if (!onDamage) return@listen
9898

9999
val damageHandlers = listOf(

0 commit comments

Comments
 (0)