diff --git a/.github/workflows/gradle_build.yml b/.github/workflows/gradle_build.yml index 9a2c5a4..5ffab4d 100644 --- a/.github/workflows/gradle_build.yml +++ b/.github/workflows/gradle_build.yml @@ -16,7 +16,7 @@ jobs: uses: actions/setup-java@v1 with: java-version: 1.8 - + - name: Change wrapper permissions run: chmod +x ./gradlew diff --git a/build.gradle b/build.gradle index bcdd480..5dfe2a0 100644 --- a/build.gradle +++ b/build.gradle @@ -3,14 +3,15 @@ group project.modGroup buildscript { repositories { - maven { url = 'https://files.minecraftforge.net/maven' } - maven { url = 'https://repo.spongepowered.org/repository/maven-public/' } + maven { url = 'https://maven.minecraftforge.net/' } + maven { url = 'https://repo.spongepowered.org/maven/' } } dependencies { - classpath 'net.minecraftforge.gradle:ForgeGradle:5.+' + classpath 'net.minecraftforge.gradle:ForgeGradle:4.+' classpath 'org.spongepowered:mixingradle:0.7-SNAPSHOT' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion" + classpath 'com.github.jengelman.gradle.plugins:shadow:6.1.0' } } @@ -18,6 +19,7 @@ apply plugin: 'idea' apply plugin: 'kotlin' apply plugin: 'net.minecraftforge.gradle' apply plugin: 'org.spongepowered.mixin' +apply plugin: 'com.github.johnrengelman.shadow' compileJava { sourceCompatibility = targetCompatibility = '1.8' @@ -70,7 +72,7 @@ dependencies { // Online maven dependency coming soon implementation files("lib/lambda-3.2-api.jar") - implementation('org.spongepowered:mixin:0.8.3') { + implementation('org.spongepowered:mixin:0.8.5') { exclude module: 'commons-io' exclude module: 'gson' exclude module: 'guava' @@ -79,7 +81,7 @@ dependencies { } // Hacky way to get mixin work - annotationProcessor('org.spongepowered:mixin:0.8.3:processor') { + annotationProcessor('org.spongepowered:mixin:0.8.5:processor') { exclude module: 'gson' } @@ -144,4 +146,23 @@ test { useJUnitPlatform() } -jar.finalizedBy('reobfJar') \ No newline at end of file +jar.finalizedBy('reobfJar') + +shadowJar { + archiveClassifier.set('') + configurations = [] + relocate 'kotlin', 'com.lambda.shadow.kotlin' + relocate 'kotlinx', 'com.lambda.shadow.kotlinx' + finalizedBy 'reobfShadowJar' +} + +reobf { + shadowJar {} + jar { + enabled = false + } +} + +artifacts { + shadowJar +} \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index 24eac9a..15e68a6 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,12 +2,12 @@ org.gradle.jvmargs=-Xmx3G org.gradle.parallel=true modGroup=dev.toxicaven -modVersion=2.1 +modVersion=2.2 minecraftVersion=1.12.2 forgeVersion=14.23.5.2860 mappingsChannel=stable mappingsVersion=39-1.12 -kotlinVersion=1.6.10 -kotlinxCoroutinesVersion=1.6.0 \ No newline at end of file +kotlinVersion=1.7.10 +kotlinxCoroutinesVersion=1.6.4 \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 41dfb87..3ab0b72 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.9.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/src/main/kotlin/dev/toxicaven/modules/AutoShulkerDupe.kt b/src/main/kotlin/dev/toxicaven/modules/AutoShulkerDupe.kt index 8d0acef..740aa72 100644 --- a/src/main/kotlin/dev/toxicaven/modules/AutoShulkerDupe.kt +++ b/src/main/kotlin/dev/toxicaven/modules/AutoShulkerDupe.kt @@ -94,7 +94,7 @@ internal object AutoShulkerDupe: PluginModule( // Drop the shulker playerController.windowClick(0, slotShulk + 36, 0, ClickType.THROW, player) if (player.isSneaking) player.connection.sendPacket(CPacketEntityAction(player, CPacketEntityAction.Action.STOP_SNEAKING)) - // Right Click the wb + // Right-Click the wb wbPos?.let { playerController.processRightClickBlock(player, world, it, EnumFacing.UP, Vec3d(it), EnumHand.MAIN_HAND) } @@ -140,7 +140,7 @@ internal object AutoShulkerDupe: PluginModule( } i++ } - // In case of error and it has not found a shulker + // In case of error, and it has not found a shulker if (tickPutItem++ > maxStackWait) { stage = 0 player.closeScreen()