Refactors for 1.18.2 part 2 (#141)

* Fix a few minor things in the README.

* Break project into client, common, worldgen submodules.

* Convert to data generation.

* Update panorama config for Vistas.

* Rename Quartz Canyon biome to Quartz Cavern

* Non-TB-specific updates from the TerraBlender conversion.

* Fix up quiltflower-loom and remove the Cotton repo.

* Add CinderscapesBiomeAPIGeneration and move generation there.
Also cleaned up some generation-related code.

* Refactor surface builders based on Terrestria's.

* Add some more panoramas for Cinderscapes.

* Fix Luminous Grove generating nylium on the roof of the Nether.

* Discourage shroomlight bushes from growing on umbral fungi.
(It still happens occasionally, because of group placement probably.)

* Improvements to Umbral Vine generation.
Prevent Umbral Vines from going long enough to reach a far chunk.
Allow Umbral Vines to grow diagonally (by using EightWayDirection).

Author: gniftygnome

.github/workflows/check_build.yml

@@ -30,8 +30,10 @@ jobs:
       - name: Make Gradle wrapper executable
         if: ${{ runner.os != 'Windows' }}
         run: chmod +x ./gradlew
+      - name: Data Gen
+        run: ./gradlew runDatagen --stacktrace
       - name: Build
-        run: ./gradlew build --stacktrace --parallel
+        run: ./gradlew build --stacktrace -x runDatagen
       - name: Capture build artifacts
         if: ${{ runner.os == 'Linux' && matrix.java == '17' }} # Only upload artifacts built from LTS java on one OS
         uses: actions/upload-artifact@v2

.github/workflows/release.yml

@@ -44,8 +44,10 @@ jobs:
       - name: Make Gradle wrapper executable
         if: ${{ runner.os != 'Windows' }}
         run: chmod +x ./gradlew
+      - name: Data Gen
+        run: ./gradlew runDatagen --stacktrace -PcurrentTag="v${{ github.event.inputs.version }}"
       - name: Build
-        run: ./gradlew generateChangelog build publish curseforge github modrinth --stacktrace --parallel -PlastTag="v${{ github.event.inputs.previousVersion }}" -PcurrentTag="v${{ github.event.inputs.version }}"
+        run: ./gradlew generateChangelog build publish curseforge github modrinth --stacktrace -x runDatagen -PlastTag="v${{ github.event.inputs.previousVersion }}" -PcurrentTag="v${{ github.event.inputs.version }}"
         env:
           MAVEN_URL: ${{ secrets.MAVEN_URL }}
           MAVEN_USERNAME: ${{ secrets.MAVEN_USERNAME }}

.gitignore

@@ -22,6 +22,7 @@ bin/
 
 # fabric
 
+common/src/main/generated/
 run/
 
 .DS_Store

README.md

@@ -1,13 +1,14 @@
 plugins {
+    id 'java'
+    id 'maven-publish'
+    id 'idea'
+    id 'eclipse'
     id 'fabric-loom' version '0.12-SNAPSHOT'
+    id 'io.github.juuxel.loom-quiltflower' version '1.7.3'
 }
 
 apply from: 'https://raw.githubusercontent.com/TerraformersMC/GradleScripts/2.5/ferry.gradle'
 
-loom {
-    accessWidenerPath = file("src/main/resources/cinderscapes.accesswidener")
-}
-
 repositories {
     maven {
         name = 'TerraformersMC'
@@ -17,16 +18,115 @@ repositories {
 }
 
 dependencies {
-    minecraft("com.mojang:minecraft:${project.minecraft_version}")
-    mappings("net.fabricmc:yarn:${project.yarn_mappings}:v2")
+    minecraft "com.mojang:minecraft:$project.minecraft_version"
+    mappings "net.fabricmc:yarn:$project.yarn_mappings:v2"
+
+    modImplementation "net.fabricmc:fabric-loader:${project.loader_version}"
+    modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}"
+
+    modImplementation "com.terraformersmc:modmenu:${project.modmenu_version}"
+
+    includeMod "terraform-api", "com.terraformersmc.terraform-api:terraform-biome-remapper-api-v1:${project.terraform_biome_remapper_api_version}"
+    includeMod "terraform-api", "com.terraformersmc.terraform-api:terraform-shapes-api-v1:${project.terraform_shapes_api_version}"
+    includeMod "terraform-api", "com.terraformersmc.terraform-api:terraform-wood-api-v1:${project.terraform_wood_api_version}"
+
+    includeMod "cloth-config", "me.shedaniel.cloth:cloth-config-fabric:${project.clothconfig_version}"
+
+    afterEvaluate {
+        subprojects.each {
+            testmodImplementation sourceSets.main.output
+            implementation project(path: "${it.name}", configuration: "namedElements")
+            include project("${it.name}:")
+        }
+    }
+}
 
-    mod("fabric-loader", "net.fabricmc:fabric-loader:${project.loader_version}")
-    mod("fabric-api", "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}")
+allprojects {
+    apply plugin: 'java'
+    apply plugin: 'idea'
+    apply plugin: 'eclipse'
+    apply plugin: 'maven-publish'
+    apply plugin: 'fabric-loom'
+    // apply plugin: 'io.github.juuxel.loom-quiltflower-mini'
 
-	includeMod("terraform-api","com.terraformersmc.terraform-api:terraform-shapes-api-v1:${project.terraform_shapes_api_version}")
-	includeMod("terraform-api","com.terraformersmc.terraform-api:terraform-wood-api-v1:${project.terraform_wood_api_version}")
+    sourceCompatibility = JavaVersion.VERSION_17
+    targetCompatibility = JavaVersion.VERSION_17
+
+    group = project.maven_group
+
+    sourceSets {
+        testmod {
+            compileClasspath += main.compileClasspath
+            runtimeClasspath += main.runtimeClasspath
+        }
+    }
+
+    // quiltflower {
+    // 	addToRuntimeClasspath.set(true)
+    // }
+
+    configurations {
+        dev {
+            canBeResolved = false
+            canBeConsumed = true
+        }
+    }
+
+    jar {
+        classifier = "dev"
+    }
+
+    afterEvaluate {
+        processResources {
+            inputs.property "version", project.version
+
+            filesMatching("fabric.mod.json") {
+                expand "version": project.version
+            }
+        }
+    }
+
+    //task sourcesJar(type: Jar, dependsOn: classes) {
+    //	classifier = "sources"
+    //	from sourceSets.main.allSource
+    //}
+
+    tasks.withType(JavaCompile) {
+        it.options.encoding = "UTF-8"
+        it.options.release = 17
+    }
+
+    repositories {
+        maven {
+            name = 'TerraformersMC'
+            url = 'https://maven.terraformersmc.com/'
+        }
+
+        // Cloth Config
+        maven {
+            url = "https://maven.shedaniel.me"
+        }
+    }
+}
+
+subprojects {
+    dependencies {
+        minecraft "com.mojang:minecraft:${project.minecraft_version}"
+        mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2"
+
+        modImplementation "net.fabricmc:fabric-loader:${project.loader_version}"
+        modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}"
+
+        modImplementation "com.terraformersmc:modmenu:${project.modmenu_version}"
+
+        modImplementation "com.terraformersmc.terraform-api:terraform-biome-remapper-api-v1:${project.terraform_biome_remapper_api_version}"
+        modImplementation "com.terraformersmc.terraform-api:terraform-shapes-api-v1:${project.terraform_shapes_api_version}"
+        modImplementation "com.terraformersmc.terraform-api:terraform-wood-api-v1:${project.terraform_wood_api_version}"
+
+        modImplementation "me.shedaniel.cloth:cloth-config-fabric:${project.clothconfig_version}"
+    }
 
-    mod("mod-menu", "com.terraformersmc:modmenu:${project.modmenu_version}")
+    version = rootProject.version
 
-    includeMod("cloth-config","me.shedaniel.cloth:cloth-config-fabric:${project.clothconfig_version}")
+    runClient.enabled = false
 }

build.gradle

@@ -0,0 +1,8 @@
+archivesBaseName = "cinderscapes-client"
+
+loom {
+}
+
+dependencies {
+    implementation project(path: ':common')
+}

client/build.gradle

@@ -1,4 +1,4 @@
-package com.terraformersmc.cinderscapes.client;
+package com.terraformersmc.cinderscapes;
 
 import com.terraformersmc.cinderscapes.init.CinderscapesBlocks;
 import com.terraformersmc.terraform.sign.SpriteIdentifierRegistry;
@@ -22,6 +22,7 @@ public class CinderscapesClient implements ClientModInitializer {
     @Override
     public void onInitializeClient() {
         // TODO: Find a more elegant way to add blocks to their render layers
+        //       Probably, port over Vaerian's work from 1.17
 
         BlockRenderLayerMap.INSTANCE.putBlocks(RenderLayer.getTranslucent(),
                 CinderscapesBlocks.UMBRAL_WART_BLOCK,