From a942e0b844381959c5be9bb4b722fb878a070216 Mon Sep 17 00:00:00 2001
From: dfsek <dfsek@protonmail.com>
Date: Wed, 28 Oct 2020 01:10:48 -0700
Subject: [PATCH] Fix Gradle setup to properly shade stuff

---
 .idea/jarRepositories.xml                     |  5 +++
 build.gradle.kts                              | 37 +++++++++++++++----
 .../terra/generation/TerraChunkGenerator.java |  5 +--
 3 files changed, 36 insertions(+), 11 deletions(-)

diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml
index 74fb345df..f689e9701 100644
--- a/.idea/jarRepositories.xml
+++ b/.idea/jarRepositories.xml
@@ -76,5 +76,10 @@
       <option name="name" value="CodeMC" />
       <option name="url" value="https://repo.codemc.org/repository/maven-public" />
     </remote-repository>
+    <remote-repository>
+      <option name="id" value="MavenLocal" />
+      <option name="name" value="MavenLocal" />
+      <option name="url" value="file:$MAVEN_REPOSITORY$/" />
+    </remote-repository>
   </component>
 </project>
\ No newline at end of file
diff --git a/build.gradle.kts b/build.gradle.kts
index b14c858e9..9ca76105c 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -1,12 +1,15 @@
 import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
 import java.io.ByteArrayOutputStream
 
+buildDir = file("target")
+
 plugins {
     java
-    id("com.github.johnrengelman.shadow").version("6.0.0")
+    id("com.github.johnrengelman.shadow").version("6.1.0")
 }
 
 repositories {
+    mavenLocal() // For parsii
     flatDir {
         dirs("lib")
     }
@@ -24,26 +27,29 @@ repositories {
     }
 }
 
+base {
+    libsDirName = "prod"
+}
+
 java {
+
     sourceCompatibility = JavaVersion.VERSION_1_8
     targetCompatibility = JavaVersion.VERSION_1_8
 }
 
-group = "com.solostudios.omnivoxscraper"
-//version = "0.0.1-alpha.3"
 val versionObj = Version("0", "0", "1", "dev.1")
 version = versionObj
 
 dependencies {
     implementation("org.jetbrains:annotations:20.1.0") // more recent.
     implementation("commons-io:commons-io:2.4")
-    compile(name = "Gaea-1.12.2", group = "")
+    implementation(name = "Gaea-1.12.2", group = "")
     implementation("org.apache.commons:commons-imaging:1.0-alpha2")
     implementation("com.sk89q.worldedit:worldedit-bukkit:7.2.0-SNAPSHOT")
-    compile("org.bstats:bstats-bukkit:1.7")
+    implementation("org.bstats:bstats-bukkit:1.7")
     implementation("com.googlecode.json-simple:json-simple:1.1")
     implementation(name = "parsii-1.2", group = "")
-    compile("io.papermc:paperlib:1.0.5")
+    implementation("io.papermc:paperlib:1.0.5")
     
     // JUnit.
     testImplementation("org.junit.jupiter:junit-jupiter-api:5.7.0")
@@ -52,19 +58,34 @@ dependencies {
 
 tasks.test {
     useJUnitPlatform()
-    
+
     maxHeapSize = "1G"
     ignoreFailures = false
     failFast = true
     maxParallelForks = 12
 }
 
-tasks.withType<ShadowJar> {
+tasks.named<ShadowJar>("shadowJar") {
     archiveClassifier.set("")
     archiveBaseName.set("Terra")
     setVersion(project.version)
+    dependencies {
+        include(dependency("commons-io:commons-io"))
+        include(dependency("org.apache.commons:commons-imaging"))
+        include(dependency("org.bstats:bstats-bukkit"))
+        include(dependency(":parsii-1.2"))
+        include(dependency("io.papermc:paperlib"))
+    }
+    relocate("org.apache.commons", "com.dfsek.terra.lib.commons")
+    relocate("org.bstats.bukkit", "com.dfsek.terra.lib.bstats")
+    relocate("parsii", "com.dfsek.terra.lib.parsii")
+    relocate("io.papermc.lib", "com.dfsek.terra.lib.paperlib")
 }
 
+tasks.build {
+    dependsOn(tasks.test)
+    dependsOn("shadowJar")
+}
 
 
 /**
diff --git a/src/main/java/com/dfsek/terra/generation/TerraChunkGenerator.java b/src/main/java/com/dfsek/terra/generation/TerraChunkGenerator.java
index 803fc335e..9b54cc276 100644
--- a/src/main/java/com/dfsek/terra/generation/TerraChunkGenerator.java
+++ b/src/main/java/com/dfsek/terra/generation/TerraChunkGenerator.java
@@ -86,7 +86,7 @@ public class TerraChunkGenerator extends GaeaChunkGenerator {
                     if(super.getInterpolatedNoise(x, y, z) > 0) {
                         BlockData data = b.getGenerator().getPalette(y).get(paletteLevel, cx, cz);
                         chunk.setBlock(x, y, z, data);
-                        if(paletteLevel == 0 && c.getSlabs() != null && y < 255) {
+                        if(paletteLevel == 0 && slab != null && y < 255) {
                             prepareBlockPart(data, chunk.getBlockData(x, y + 1, z), chunk, new Vector(x, y + 1, z), slab.getSlabs(), slab.getStairs(), slab.getSlabThreshold());
                         }
                         paletteLevel++;
@@ -101,8 +101,7 @@ public class TerraChunkGenerator extends GaeaChunkGenerator {
     }
 
     private void prepareBlockPart(BlockData down, BlockData orig, ChunkData chunk, Vector block, Map<Material, Palette<BlockData>> slabs, Map<Material, Palette<BlockData>> stairs, double thresh) {
-        double _11 = getInterpolatedNoise(block.getBlockX(), block.getBlockY() - 0.4, block.getBlockZ());
-        if(_11 > thresh) {
+        if(getInterpolatedNoise(block.getBlockX(), block.getBlockY() - 0.4, block.getBlockZ()) > thresh) {
             if(stairs != null) {
                 Palette<BlockData> stairPalette = stairs.get(down.getMaterial());
                 if(stairPalette != null) {