Skip to content

Commit 204a936

Browse files
committed
Merge remote-tracking branch 'origin/master'
2 parents a769992 + e1b54c4 commit 204a936

File tree

68 files changed

+3698
-1077
lines changed

Some content is hidden

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

68 files changed

+3698
-1077
lines changed

.github/workflows/nightly_build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,4 +97,4 @@ jobs:
9797
if: steps.branch-name.outputs.is_default == 'true'
9898
run: |
9999
COMMITMESSAGE=`git log --pretty=format:'- \`%h\` %s' -5 --reverse` &&
100-
(curl "$WEBHOOK" -sS -H "Content-Type:application/json" -X POST -d "{\"content\":null,\"embeds\":[{\"title\":\"Build $BUILD\",\"description\":\"**Branch:** ${{steps.branch-name.outputs.current_branch}}\\n**Changes:**\\n$COMMITMESSAGE\",\"url\":\"https://github.com/$GITHUB_REPOSITORY/actions/runs/$GITHUB_RUN_ID\",\"color\":1487872,\"fields\":[{\"name\":\"Artifacts:\",\"value\":\"- [lambda-$BUILD.zip](https://nightly.link/$GITHUB_REPOSITORY/workflows/nightly_build.yml/$BRANCH_NAME/lambda-$BUILD.zip)\"}],\"footer\":{\"text\":\"$GITHUB_REPOSITORY\"},\"thumbnail\":{\"url\":\"https://github.com/lambda-client/lambda/master/src/main/resources/assets/minecraft/lambda/lambda_map.png\"}}],\"username\":\"Github Actions\",\"avatar_url\":\"https://www.2b2t.com.au/assets/github.jpeg\"}")
100+
(curl "$WEBHOOK" -sS -H "Content-Type:application/json" -X POST -d "{\"content\":null,\"embeds\":[{\"title\":\"Build $BUILD\",\"description\":\"**Branch:** ${{ steps.branch-name.outputs.current_branch }}\\n**Changes:**\\n$COMMITMESSAGE\",\"url\":\"https://github.com/$GITHUB_REPOSITORY/actions/runs/$GITHUB_RUN_ID\",\"color\":1487872,\"fields\":[{\"name\":\"Artifacts:\",\"value\":\"- [lambda-$BUILD.zip](https://nightly.link/$GITHUB_REPOSITORY/workflows/nightly_build.yml/${{ steps.branch-name.outputs.current_branch }}/lambda-$BUILD.zip)\"}],\"footer\":{\"text\":\"$GITHUB_REPOSITORY\"},\"thumbnail\":{\"url\":\"https://github.com/lambda-client/lambda/master/src/main/resources/assets/minecraft/lambda/lambda_map.png\"}}],\"username\":\"Github Actions\",\"avatar_url\":\"https://www.2b2t.com.au/assets/github.jpeg\"}")

build.gradle

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -186,6 +186,10 @@ shadowJar {
186186
'kotlin/**/*.kotlin_metadata',
187187
'kotlin/**/*.kotlin_builtins',
188188
'META-INF/*.version'
189+
minimize {
190+
exclude(dependency('cabaletta:baritone-api:.*'))
191+
exclude(dependency('org.spongepowered:mixin:.*'))
192+
}
189193
configurations = [project.configurations.jarLibs, project.configurations.onlyJarLibs]
190194
relocate 'kotlin', 'com.lambda.shadow.kotlin'
191195
relocate 'kotlinx', 'com.lambda.shadow.kotlinx'

gradle.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,5 @@ forgeVersion=14.23.5.2860
1010
mappingsChannel=stable
1111
mappingsVersion=39-1.12
1212

13-
kotlinVersion=1.8.21
14-
kotlinxCoroutinesVersion=1.7.1
13+
kotlinVersion=1.9.0
14+
kotlinxCoroutinesVersion=1.7.2

src/main/java/com/lambda/mixin/accessor/AccessorEntity.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,14 @@
33
import net.minecraft.entity.Entity;
44
import org.spongepowered.asm.mixin.Mixin;
55
import org.spongepowered.asm.mixin.gen.Accessor;
6+
import org.spongepowered.asm.mixin.gen.Invoker;
67

78
@Mixin(Entity.class)
89
public interface AccessorEntity {
910

1011
@Accessor("isInWeb")
1112
boolean getIsInWeb();
1213

14+
@Invoker("setFlag")
15+
void invokeSetFlag(int flag, boolean set);
1316
}
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
package com.lambda.mixin.accessor.network;
2+
3+
import net.minecraft.network.play.client.CPacketClientSettings;
4+
import org.spongepowered.asm.mixin.Mixin;
5+
import org.spongepowered.asm.mixin.gen.Accessor;
6+
7+
@Mixin(value = CPacketClientSettings.class)
8+
public interface AccessorCPacketClientSettings {
9+
@Accessor(value = "view")
10+
int getView();
11+
12+
}
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
package com.lambda.mixin.accessor.network;
2+
3+
import net.minecraft.network.play.client.CPacketConfirmTransaction;
4+
import org.spongepowered.asm.mixin.Mixin;
5+
import org.spongepowered.asm.mixin.gen.Accessor;
6+
7+
@Mixin(value = CPacketConfirmTransaction.class)
8+
public interface AccessorCPacketConfirmTransaction {
9+
@Accessor(value = "accepted")
10+
boolean getAccepted();
11+
}
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
package com.lambda.mixin.accessor.network;
2+
3+
import net.minecraft.network.play.client.CPacketPlayerAbilities;
4+
import org.spongepowered.asm.mixin.Mixin;
5+
import org.spongepowered.asm.mixin.gen.Accessor;
6+
7+
@Mixin(value = CPacketPlayerAbilities.class)
8+
public interface AccessorCPacketPlayerAbilities {
9+
@Accessor(value = "flySpeed")
10+
float getFlySpeed();
11+
@Accessor(value = "walkSpeed")
12+
float getWalkSpeed();
13+
}
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
package com.lambda.mixin.accessor.network;
2+
3+
import net.minecraft.network.play.client.CPacketResourcePackStatus;
4+
import org.spongepowered.asm.mixin.Mixin;
5+
import org.spongepowered.asm.mixin.gen.Accessor;
6+
7+
@Mixin(value = CPacketResourcePackStatus.class)
8+
public interface AccessorCPacketResourcePackStatus {
9+
@Accessor(value = "action")
10+
CPacketResourcePackStatus.Action getAction();
11+
}
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
package com.lambda.mixin.accessor.network;
2+
3+
import net.minecraft.network.play.client.CPacketSpectate;
4+
import org.spongepowered.asm.mixin.Mixin;
5+
import org.spongepowered.asm.mixin.gen.Accessor;
6+
7+
import java.util.UUID;
8+
9+
@Mixin(value = CPacketSpectate.class)
10+
public interface AccessorCPacketSpectate {
11+
@Accessor(value = "id")
12+
UUID getId();
13+
}
Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
package com.lambda.mixin.accessor.network;
2+
3+
import net.minecraft.network.play.client.CPacketVehicleMove;
4+
import org.spongepowered.asm.mixin.Mixin;
5+
import org.spongepowered.asm.mixin.gen.Accessor;
6+
7+
@Mixin(value = CPacketVehicleMove.class)
8+
public interface AccessorCPacketVehicleMove {
9+
@Accessor(value = "x")
10+
void setX(double x);
11+
12+
@Accessor(value = "y")
13+
void setY(double y);
14+
15+
@Accessor(value = "z")
16+
void setZ(double z);
17+
18+
@Accessor(value = "yaw")
19+
void setYaw(float yaw);
20+
21+
@Accessor(value = "pitch")
22+
void setPitch(float pitch);
23+
}

0 commit comments

Comments
 (0)