Skip to content

Commit 57ec7cb

Browse files
committed
Update other stuff
1 parent f9fad7f commit 57ec7cb

5 files changed

Lines changed: 34 additions & 13 deletions

File tree

.github/workflows/gradle_build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
uses: actions/setup-java@v1
1717
with:
1818
java-version: 1.8
19-
19+
2020
- name: Change wrapper permissions
2121
run: chmod +x ./gradlew
2222

build.gradle

Lines changed: 27 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,21 +3,23 @@ group project.modGroup
33

44
buildscript {
55
repositories {
6-
maven { url = 'https://files.minecraftforge.net/maven' }
7-
maven { url = 'https://repo.spongepowered.org/repository/maven-public/' }
6+
maven { url = 'https://maven.minecraftforge.net/' }
7+
maven { url = 'https://repo.spongepowered.org/maven/' }
88
}
99

1010
dependencies {
11-
classpath 'net.minecraftforge.gradle:ForgeGradle:5.+'
11+
classpath 'net.minecraftforge.gradle:ForgeGradle:4.+'
1212
classpath 'org.spongepowered:mixingradle:0.7-SNAPSHOT'
1313
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
14+
classpath 'com.github.jengelman.gradle.plugins:shadow:6.1.0'
1415
}
1516
}
1617

1718
apply plugin: 'idea'
1819
apply plugin: 'kotlin'
1920
apply plugin: 'net.minecraftforge.gradle'
2021
apply plugin: 'org.spongepowered.mixin'
22+
apply plugin: 'com.github.johnrengelman.shadow'
2123

2224
compileJava {
2325
sourceCompatibility = targetCompatibility = '1.8'
@@ -70,7 +72,7 @@ dependencies {
7072
// Online maven dependency coming soon
7173
implementation files("lib/lambda-3.2-api.jar")
7274

73-
implementation('org.spongepowered:mixin:0.8.3') {
75+
implementation('org.spongepowered:mixin:0.8.5') {
7476
exclude module: 'commons-io'
7577
exclude module: 'gson'
7678
exclude module: 'guava'
@@ -79,7 +81,7 @@ dependencies {
7981
}
8082

8183
// Hacky way to get mixin work
82-
annotationProcessor('org.spongepowered:mixin:0.8.3:processor') {
84+
annotationProcessor('org.spongepowered:mixin:0.8.5:processor') {
8385
exclude module: 'gson'
8486
}
8587

@@ -144,4 +146,23 @@ test {
144146
useJUnitPlatform()
145147
}
146148

147-
jar.finalizedBy('reobfJar')
149+
jar.finalizedBy('reobfJar')
150+
151+
shadowJar {
152+
archiveClassifier.set('')
153+
configurations = []
154+
relocate 'kotlin', 'com.lambda.shadow.kotlin'
155+
relocate 'kotlinx', 'com.lambda.shadow.kotlinx'
156+
finalizedBy 'reobfShadowJar'
157+
}
158+
159+
reobf {
160+
shadowJar {}
161+
jar {
162+
enabled = false
163+
}
164+
}
165+
166+
artifacts {
167+
shadowJar
168+
}

gradle.properties

Lines changed: 3 additions & 3 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=dev.toxicaven
5-
modVersion=2.1
5+
modVersion=2.2
66

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

12-
kotlinVersion=1.6.10
13-
kotlinxCoroutinesVersion=1.6.0
12+
kotlinVersion=1.7.10
13+
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-7.4-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-6.9.1-bin.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists

src/main/kotlin/dev/toxicaven/modules/AutoShulkerDupe.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ internal object AutoShulkerDupe: PluginModule(
9494
// Drop the shulker
9595
playerController.windowClick(0, slotShulk + 36, 0, ClickType.THROW, player)
9696
if (player.isSneaking) player.connection.sendPacket(CPacketEntityAction(player, CPacketEntityAction.Action.STOP_SNEAKING))
97-
// Right Click the wb
97+
// Right-Click the wb
9898
wbPos?.let {
9999
playerController.processRightClickBlock(player, world, it, EnumFacing.UP, Vec3d(it), EnumHand.MAIN_HAND)
100100
}
@@ -140,7 +140,7 @@ internal object AutoShulkerDupe: PluginModule(
140140
}
141141
i++
142142
}
143-
// In case of error and it has not found a shulker
143+
// In case of error, and it has not found a shulker
144144
if (tickPutItem++ > maxStackWait) {
145145
stage = 0
146146
player.closeScreen()

0 commit comments

Comments
 (0)