diff --git a/gradle/scripts/dependencies.gradle b/gradle/scripts/dependencies.gradle index b15208ddf..a68a2c5ed 100644 --- a/gradle/scripts/dependencies.gradle +++ b/gradle/scripts/dependencies.gradle @@ -83,9 +83,7 @@ configurations { dependencies { // deobfCompile "gregtechce:gregtech:1.12.2:1.15.1.735" // installable runtime dependencies - //deobfCompile "curse.maven:gregtechceu-557242:3949406" - - compileOnly(files("etc/gregtech-1.12.2-2.4.4-beta.jar")) + deobfCompile "curse.maven:gregtechceu-557242:3949406" compileOnly "curse.maven:chisel-235279:2915375" diff --git a/src/main/java/appeng/services/CompassService.java b/src/main/java/appeng/services/CompassService.java index 103a25873..2f4f91bb5 100644 --- a/src/main/java/appeng/services/CompassService.java +++ b/src/main/java/appeng/services/CompassService.java @@ -138,18 +138,12 @@ public final class CompassService { public void kill() { this.executor.shutdown(); - try { - this.executor.awaitTermination(6, TimeUnit.MINUTES); - this.jobSize = 0; - - for (final CompassReader cr : this.worldSet.values()) { - cr.close(); - } - - this.worldSet.clear(); - } catch (final InterruptedException e) { - // wrap this up.. + this.jobSize = 0; + for (final CompassReader cr : this.worldSet.values()) { + cr.close(); } + + this.worldSet.clear(); } private CompassReader getReader(final World w) {