Skip to content

Commit 9de71f6

Browse files
committed
Update Lambda API 3.2 -> 3.3.0
1 parent 559e3c4 commit 9de71f6

File tree

12 files changed

+31
-23
lines changed

12 files changed

+31
-23
lines changed

build.gradle

Lines changed: 16 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,32 @@
1-
version project.modVersion
2-
group project.modGroup
3-
41
buildscript {
52
repositories {
3+
mavenCentral()
64
maven { url = 'https://maven.minecraftforge.net/' }
75
maven { url = 'https://repo.spongepowered.org/maven/' }
86
}
9-
107
dependencies {
11-
classpath 'net.minecraftforge.gradle:ForgeGradle:4.+'
12-
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
8+
classpath 'net.minecraftforge.gradle:ForgeGradle:5.+'
9+
classpath 'org.spongepowered:mixingradle:0.7-SNAPSHOT'
1310
classpath 'com.github.jengelman.gradle.plugins:shadow:6.1.0'
1411
}
1512
}
1613

17-
apply plugin: 'idea'
18-
apply plugin: 'kotlin'
14+
plugins {
15+
id 'org.jetbrains.kotlin.jvm' version "$kotlinVersion"
16+
}
17+
1918
apply plugin: 'net.minecraftforge.gradle'
2019
apply plugin: 'com.github.johnrengelman.shadow'
2120

21+
version project.modVersion
22+
group project.modGroup
23+
2224
compileJava {
2325
sourceCompatibility = targetCompatibility = '1.8'
2426
options.encoding = 'UTF-8'
27+
// Disables Gradle build caching for this task
28+
// If build caching is enabled this can cause the refmap to not be built and included
29+
outputs.upToDateWhen { false }
2530
}
2631

2732
compileKotlin.kotlinOptions {
@@ -68,9 +73,9 @@ dependencies {
6873
minecraft "net.minecraftforge:forge:$minecraftVersion-$forgeVersion"
6974

7075
// Online maven dependency coming soon
71-
implementation files("lib/lambda-3.2-api.jar")
76+
implementation files("lib/lambda-3.3.0-api.jar")
7277

73-
implementation('org.spongepowered:mixin:0.8.3') {
78+
implementation('org.spongepowered:mixin:0.8.5') {
7479
exclude module: 'commons-io'
7580
exclude module: 'gson'
7681
exclude module: 'guava'
@@ -79,7 +84,7 @@ dependencies {
7984
}
8085

8186
// Hacky way to get mixin work
82-
annotationProcessor('org.spongepowered:mixin:0.8.3:processor') {
87+
annotationProcessor('org.spongepowered:mixin:0.8.5:processor') {
8388
exclude module: 'gson'
8489
}
8590

gradle.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@ org.gradle.jvmargs=-Xmx3G
22
org.gradle.parallel=true
33

44
modGroup=com.lambda
5-
modVersion=10.3
5+
modVersion=10.3.1
66

77
minecraftVersion=1.12.2
88
forgeVersion=14.23.5.2860
99
mappingsChannel=stable
1010
mappingsVersion=39-1.12
1111

12-
kotlinVersion=1.7.10
12+
kotlinVersion=1.8.10
1313
kotlinxCoroutinesVersion=1.6.4
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-6.9.1-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists

lib/lambda-3.2-api.jar

-3.52 MB
Binary file not shown.
Binary file not shown.

lib/lambda-3.3.0-api.jar

3.94 MB
Binary file not shown.

src/main/kotlin/trombone/IO.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import HighwayTools.proxyCommand
1414
import HighwayTools.rubberbandTimeout
1515
import HighwayTools.usingProxy
1616
import com.lambda.client.event.SafeClientEvent
17-
import com.lambda.client.module.modules.combat.AutoLog
17+
import com.lambda.client.module.modules.combat.AutoDisconnect
1818
import com.lambda.client.module.modules.misc.AntiAFK
1919
import com.lambda.client.module.modules.misc.AutoObsidian
2020
import com.lambda.client.module.modules.movement.AntiHunger
@@ -104,7 +104,7 @@ object IO {
104104
MessageSendHelper.sendRawChatMessage(" §c[!] You should activate AutoEat to not die on starvation.")
105105
}
106106

107-
if (AutoLog.isDisabled) {
107+
if (AutoDisconnect.isDisabled) {
108108
MessageSendHelper.sendRawChatMessage(" §c[!] You should activate AutoLog to prevent most deaths when afk.")
109109
}
110110

src/main/kotlin/trombone/handler/Container.kt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ import net.minecraft.item.ItemShulkerBox
3232
import net.minecraft.item.ItemStack
3333
import net.minecraft.util.EnumFacing
3434
import net.minecraft.util.NonNullList
35+
import net.minecraft.util.math.AxisAlignedBB
3536
import net.minecraft.util.math.BlockPos
3637
import net.minecraft.util.text.TextFormatting
3738
import trombone.blueprint.BlueprintGenerator.isInsideBlueprintBuild
@@ -140,7 +141,7 @@ object Container {
140141
.filter { pos ->
141142
!isInsideBlueprintBuild(pos)
142143
&& pos != currentBlockPos
143-
&& world.isPlaceable(pos)
144+
&& world.isPlaceable(pos, AxisAlignedBB(pos))
144145
&& !world.getBlockState(pos.down()).isReplaceable
145146
&& world.isAirBlock(pos.up())
146147
&& getVisibleSides(pos.down()).contains(EnumFacing.UP)
@@ -199,7 +200,7 @@ object Container {
199200
.filter { pos ->
200201
world.isAirBlock(pos.up())
201202
&& world.isAirBlock(pos)
202-
&& !world.isPlaceable(pos.down())
203+
&& !world.isPlaceable(pos.down(), AxisAlignedBB(pos))
203204
}
204205
.sortedWith(
205206
compareBy<BlockPos> {

src/main/kotlin/trombone/handler/Inventory.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ object Inventory {
4747
if (lastHitVec == Vec3d.ZERO) return
4848
val rotation = getRotationTo(lastHitVec)
4949

50-
module.sendPlayerPacket {
50+
sendPlayerPacket {
5151
rotate(rotation)
5252
}
5353
}

src/main/kotlin/trombone/handler/Packet.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ object Packet {
2525
if (!isInsideBlueprint(pos)) return
2626

2727
val prev = world.getBlockState(pos).block
28-
val new = packet.getBlockState().block
28+
val new = packet.blockState.block
2929

3030
if (prev != new) {
3131
val task = if (pos == containerTask.blockPos) {

0 commit comments

Comments
 (0)