Create multi-project structure

build.gradle

@@ -1,134 +1,51 @@
 plugins {
-	id 'fabric-loom' version '0.5-SNAPSHOT'
-	id 'com.github.johnrengelman.shadow' version '6.1.0'
-	id 'maven-publish'
+    id 'fabric-loom' version '0.5-SNAPSHOT' apply false
 }
 
-sourceCompatibility = JavaVersion.VERSION_1_8
-targetCompatibility = JavaVersion.VERSION_1_8
+subprojects {
+    apply plugin: "fabric-loom"
 
-archivesBaseName = project.archives_base_name
-version = project.mod_version
-group = project.maven_group
+    sourceCompatibility = JavaVersion.VERSION_1_8
+    targetCompatibility = JavaVersion.VERSION_1_8
 
-sourceSets {
-	testMod {
-		compileClasspath += main.compileClasspath
-		runtimeClasspath += main.runtimeClasspath
-		annotationProcessorPath += main.annotationProcessorPath
-	}
-}
-
-repositories {
-	maven {
-		url "https://maven.shedaniel.me/"
-	}
-	maven {
-		url "https://maven.terraformersmc.com/"
-	}
-}
-
-dependencies {
-	// --- Main ---
-	minecraft("com.mojang:minecraft:${project.minecraft_version}")
-	mappings("net.fabricmc:yarn:${project.yarn_mappings}:v2")
-	modImplementation("net.fabricmc:fabric-loader:${project.loader_version}")
-
-	modApi("me.shedaniel.cloth:cloth-config-fabric:${project.cloth_config_version}") {
-		exclude(group: "net.fabricmc.fabric-api")
-	}
-
-	// Using modApi because api does not include dependency inside Maven pom file (see https://github.com/FabricMC/fabric-loom/issues/200)
-	modApi("org.spongepowered:configurate-hocon:${project.configurate_version}")
-	shadow("org.spongepowered:configurate-hocon:${project.configurate_version}")
+    group = rootProject.maven_group
+    archivesBaseName = "${rootProject.archives_base_name}-${project.name}"
+    version = rootProject.mod_version
 
-	compileOnly("org.projectlombok:lombok:${project.lombok_version}")
-	annotationProcessor("org.projectlombok:lombok:${project.lombok_version}")
+    processResources {
+        inputs.property "version", project.version
 
-	// --- Test ---
-	testImplementation("org.junit.jupiter:junit-jupiter:${project.junit_version}")
-	testImplementation("org.assertj:assertj-core:${project.assertj_version}")
-	testImplementation("org.mockito:mockito-inline:${project.mockito_version}")
-	testImplementation("org.mockito:mockito-junit-jupiter:${project.mockito_junit_version}")
-	testImplementation("io.github.hakky54:logcaptor:${project.logcaptor_version}")
-	testImplementation("com.google.jimfs:jimfs:${project.jimfs_version}")
+        filesMatching("fabric.mod.json") {
+            expand "version": project.version
+        }
+    }
 
-	// --- Test Mod ---
-	testModImplementation(sourceSets.main.output)
-	modImplementation("com.terraformersmc:modmenu:${project.modmenu_version}")
-}
-
-processResources {
-	inputs.property "version", project.version
-
-	filesMatching("fabric.mod.json") {
-		expand "version": project.version
-	}
-}
+    tasks.withType(JavaCompile).configureEach {
+        // ensure that the encoding is set to UTF-8, no matter what the system default is
+        // this fixes some edge cases with special characters not displaying correctly
+        // see http://yodaconditions.net/blog/fix-for-java-file-encoding-problems-with-gradle.html
+        it.options.encoding = "UTF-8"
+    }
 
-tasks.withType(JavaCompile).configureEach {
-	// ensure that the encoding is set to UTF-8, no matter what the system default is
-	// this fixes some edge cases with special characters not displaying correctly
-	// see http://yodaconditions.net/blog/fix-for-java-file-encoding-problems-with-gradle.html
-	it.options.encoding = "UTF-8"
-}
+    repositories {
+        maven {
+            url "https://maven.shedaniel.me/"
+        }
+    }
 
-java {
-	// Loom will automatically attach sourcesJar to a RemapSourcesJar task and to the "build" task
-	// if it is present.
-	withSourcesJar()
-}
+    dependencies {
+        minecraft("com.mojang:minecraft:${rootProject.minecraft_version}")
+        mappings("net.fabricmc:yarn:${rootProject.yarn_mappings}:v2")
+        modImplementation("net.fabricmc:fabric-loader:${rootProject.loader_version}")
 
-jar {
-	from "LICENSE"
-}
-
-shadowJar {
-	configurations = [project.configurations.shadow]
-	archiveClassifier = "shadow"
-}
-
-remapJar {
-	dependsOn(shadowJar)
-	input.set(shadowJar.archiveFile)
-}
-
-test {
-	useJUnitPlatform()
-}
-
-javadoc {
-	options {
-		source = "8"
-		encoding = "UTF-8"
-		charSet = "UTF-8"
-		memberLevel = JavadocMemberLevel.PROTECTED
-		// Disable the crazy super-strict doclint tool in Java 8
-		addStringOption("Xdoclint:none", "-quiet")
-	}
-	source = sourceSets.main.allJava
-	failOnError false
-}
-
-task javadocJar(type: Jar) {
-	dependsOn javadoc
-	from javadoc.destinationDir
-	archiveClassifier = "javadoc"
-}
+        modApi("me.shedaniel.cloth:cloth-config-fabric:${rootProject.cloth_config_version}") {
+            exclude(group: "net.fabricmc.fabric-api")
+        }
 
-build.dependsOn javadocJar
+        // Using modApi because api does not include dependency inside Maven pom file (see https://github.com/FabricMC/fabric-loom/issues/200)
+        modApi("org.spongepowered:configurate-hocon:${rootProject.configurate_version}")
 
-// configure the maven publication
-publishing {
-	publications {
-		mavenJava(MavenPublication) {
-			artifact(remapJar) {
-				builtBy remapJar
-			}
-			artifact(sourcesJar) {
-				builtBy remapSourcesJar
-			}
-			artifact javadocJar
-		}
-	}
+        compileOnly("org.projectlombok:lombok:${rootProject.lombok_version}")
+        annotationProcessor("org.projectlombok:lombok:${rootProject.lombok_version}")
+    }
 }

example/build.gradle

@@ -0,0 +1,10 @@
+repositories {
+    maven {
+        url "https://maven.terraformersmc.com/"
+    }
+}
+
+dependencies {
+    implementation(project(":lib"))
+    modImplementation("com.terraformersmc:modmenu:${project.modmenu_version}")
+}

src/testMod/java/me/lortseam/completeconfig/testmod/TestMod.java → example/src/main/java/me/lortseam/completeconfig/example/ExampleMod.java

@@ -1,12 +1,12 @@
-package me.lortseam.completeconfig.testmod;
+package me.lortseam.completeconfig.example;
 
 import lombok.Getter;
 import me.lortseam.completeconfig.data.Config;
 import net.fabricmc.api.ModInitializer;
 
-public class TestMod implements ModInitializer {
+public class ExampleMod implements ModInitializer {
 
-    public static final String MOD_ID = "testmod";
+    public static final String MOD_ID = "example";
     @Getter
     private static Config config;
 

src/testMod/java/me/lortseam/completeconfig/testmod/ModMenuIntegration.java → example/src/main/java/me/lortseam/completeconfig/example/ModMenuIntegration.java

@@ -1,4 +1,4 @@
-package me.lortseam.completeconfig.testmod;
+package me.lortseam.completeconfig.example;
 
 import com.terraformersmc.modmenu.api.ConfigScreenFactory;
 import com.terraformersmc.modmenu.api.ModMenuApi;
@@ -11,7 +11,7 @@ public final class ModMenuIntegration implements ModMenuApi {
 
     @Override
     public ConfigScreenFactory<?> getModConfigScreenFactory() {
-        return parent -> screenBuilder.build(parent, TestMod.getConfig());
+        return parent -> screenBuilder.build(parent, ExampleMod.getConfig());
     }
 
 }

src/testMod/java/me/lortseam/completeconfig/testmod/Settings.java → example/src/main/java/me/lortseam/completeconfig/example/Settings.java

@@ -1,4 +1,4 @@
-package me.lortseam.completeconfig.testmod;
+package me.lortseam.completeconfig.example;
 
 import me.lortseam.completeconfig.api.ConfigContainer;
 import me.lortseam.completeconfig.api.ConfigEntries;

example/src/main/resources/assets/example/lang/en_us.json

@@ -0,0 +1,23 @@
+{
+  "config.example.dataTypes": "Data types",
+  "config.example.dataTypes.bool": "Boolean",
+  "config.example.dataTypes.integer": "Integer",
+  "config.example.dataTypes.boundedInt": "Bounded Integer",
+  "config.example.dataTypes.aLong": "Long",
+  "config.example.dataTypes.boundedLong": "Bounded Long",
+  "config.example.dataTypes.aFloat": "Float",
+  "config.example.dataTypes.aDouble": "Double",
+  "config.example.dataTypes.string": "String",
+  "config.example.dataTypes.anEnum": "Enum",
+  "config.example.dataTypes.anEnum.foo": "Foo",
+  "config.example.dataTypes.anEnum.bar": "Bar",
+  "config.example.dataTypes.anEnum.baz": "Baz",
+  "config.example.dataTypes.list": "List",
+  "config.example.dataTypes.color": "Color",
+  "config.example.tooltips": "Tooltips",
+  "config.example.tooltips.defaultOneLine.tooltip": "A tooltip with a single line",
+  "config.example.tooltips.defaultMultiLine.tooltip.0": "A tooltip with multiple lines, this is the first line...",
+  "config.example.tooltips.defaultMultiLine.tooltip.1": "... and this is the second one",
+  "config.example.customTooltipLine1": "A tooltip specified with custom keys, line 1...",
+  "config.example.customTooltipLine2": "... and line 2"
+}

src/testMod/resources/fabric.mod.json → example/src/main/resources/fabric.mod.json

@@ -1,8 +1,8 @@
 {
   "schemaVersion": 1,
-  "id": "testmod",
+  "id": "example",
   "version": "${version}",
-  "name": "CompleteConfig Test Mod",
+  "name": "CompleteConfig Example Mod",
   "authors": [
     "Lortseam"
   ],
@@ -10,10 +10,10 @@
   "environment": "*",
   "entrypoints": {
     "main": [
-      "me.lortseam.completeconfig.testmod.TestMod"
+      "me.lortseam.completeconfig.example.ExampleMod"
     ],
     "modmenu": [
-      "me.lortseam.completeconfig.testmod.ModMenuIntegration"
+      "me.lortseam.completeconfig.example.ModMenuIntegration"
     ]
   },
   "depends": {

lib/build.gradle

@@ -0,0 +1,75 @@
+plugins {
+	id 'com.github.johnrengelman.shadow' version '6.1.0'
+	id 'maven-publish'
+}
+
+dependencies {
+	shadow("org.spongepowered:configurate-hocon:${rootProject.configurate_version}")
+
+	testImplementation("org.junit.jupiter:junit-jupiter:${rootProject.junit_version}")
+	testImplementation("org.assertj:assertj-core:${rootProject.assertj_version}")
+	testImplementation("org.mockito:mockito-inline:${rootProject.mockito_version}")
+	testImplementation("org.mockito:mockito-junit-jupiter:${rootProject.mockito_junit_version}")
+	testImplementation("io.github.hakky54:logcaptor:${rootProject.logcaptor_version}")
+	testImplementation("com.google.jimfs:jimfs:${rootProject.jimfs_version}")
+}
+
+java {
+	// Loom will automatically attach sourcesJar to a RemapSourcesJar task and to the "build" task
+	// if it is present.
+	withSourcesJar()
+}
+
+jar {
+	from "LICENSE"
+}
+
+shadowJar {
+	configurations = [project.configurations.shadow]
+	archiveClassifier = "shadow"
+}
+
+remapJar {
+	dependsOn(shadowJar)
+	input.set(shadowJar.archiveFile)
+}
+
+test {
+	useJUnitPlatform()
+}
+
+javadoc {
+	options {
+		source = "8"
+		encoding = "UTF-8"
+		charSet = "UTF-8"
+		memberLevel = JavadocMemberLevel.PROTECTED
+		// Disable the crazy super-strict doclint tool in Java 8
+		addStringOption("Xdoclint:none", "-quiet")
+	}
+	source = sourceSets.main.allJava
+	failOnError false
+}
+
+task javadocJar(type: Jar) {
+	dependsOn javadoc
+	from javadoc.destinationDir
+	archiveClassifier = "javadoc"
+}
+
+build.dependsOn javadocJar
+
+// configure the maven publication
+publishing {
+	publications {
+		mavenJava(MavenPublication) {
+			artifact(remapJar) {
+				builtBy remapJar
+			}
+			artifact(sourcesJar) {
+				builtBy remapSourcesJar
+			}
+			artifact javadocJar
+		}
+	}
+}

src/main/java/me/lortseam/completeconfig/data/Entry.java → lib/src/main/java/me/lortseam/completeconfig/data/Entry.java

@@ -1,6 +1,5 @@
 package me.lortseam.completeconfig.data;
 
-import com.google.common.base.Predicates;
 import com.google.common.collect.BiMap;
 import com.google.common.collect.HashBiMap;
 import com.google.common.collect.Lists;
@@ -263,7 +262,7 @@ public class Entry<T> extends EntryBase<T> implements DataPart {
         }
 
         Entry<T> build(ConfigContainer parentObject, TranslationIdentifier parentTranslation) {
-            Entry<T> entry = transformations.stream().filter(transformation -> transformation.test(this)).findFirst().orElse(Transformation.by(Predicates.alwaysTrue()).transforms(Entry::new)).transform(this, parentObject, parentTranslation);
+            Entry<T> entry = transformations.stream().filter(transformation -> transformation.test(this)).findFirst().orElse(Transformation.by(e -> true).transforms(Entry::new)).transform(this, parentObject, parentTranslation);
             for (Consumer<Entry<T>> interaction : interactions) {
                 interaction.accept(entry);
             }

src/main/java/me/lortseam/completeconfig/data/structure/ParentDataPart.java → lib/src/main/java/me/lortseam/completeconfig/data/structure/ParentDataPart.java

@@ -1,6 +1,5 @@
 package me.lortseam.completeconfig.data.structure;
 
-import com.google.common.base.Predicates;
 import org.spongepowered.configurate.CommentedConfigurationNode;
 
 import java.util.function.BiConsumer;
@@ -17,7 +16,7 @@ public interface ParentDataPart<C extends DataPart> extends DataPart {
 
     @Override
     default void fetch(CommentedConfigurationNode node) {
-        propagateToChildren(Predicates.alwaysTrue(), DataPart::fetch, node);
+        propagateToChildren(childNode -> true, DataPart::fetch, node);
     }
 
     default void propagateToChildren(Predicate<CommentedConfigurationNode> childNodeCondition, BiConsumer<C, CommentedConfigurationNode> function, CommentedConfigurationNode node) {

src/main/java/me/lortseam/completeconfig/gui/cloth/GuiRegistry.java → lib/src/main/java/me/lortseam/completeconfig/gui/cloth/GuiRegistry.java

@@ -1,6 +1,5 @@
 package me.lortseam.completeconfig.gui.cloth;
 
-import com.google.common.base.Predicates;
 import com.google.common.collect.Lists;
 import com.google.common.collect.MoreCollectors;
 import com.google.common.reflect.TypeToken;
@@ -59,7 +58,7 @@ public final class GuiRegistry {
         if (types.length == 0) {
             throw new IllegalArgumentException("Types must not be empty");
         }
-        registerProvider(provider, Predicates.alwaysTrue(), types);
+        registerProvider(provider, entry -> true, types);
     }
 
     public void registerBoundedProvider(GuiProvider<? extends BoundedEntry<?>> provider, boolean slider, Type... types) {

settings.gradle

@@ -9,4 +9,7 @@ pluginManagement {
     }
 }
 
+include("lib")
+include("example")
+
 rootProject.name = 'completeconfig'

src/testMod/resources/assets/completeconfig-testmod/lang/en_us.json

@@ -1,23 +0,0 @@
-{
-  "config.testmod.dataTypes": "Data types",
-  "config.testmod.dataTypes.bool": "Boolean",
-  "config.testmod.dataTypes.integer": "Integer",
-  "config.testmod.dataTypes.boundedInt": "Bounded Integer",
-  "config.testmod.dataTypes.aLong": "Long",
-  "config.testmod.dataTypes.boundedLong": "Bounded Long",
-  "config.testmod.dataTypes.aFloat": "Float",
-  "config.testmod.dataTypes.aDouble": "Double",
-  "config.testmod.dataTypes.string": "String",
-  "config.testmod.dataTypes.anEnum": "Enum",
-  "config.testmod.dataTypes.anEnum.foo": "Foo",
-  "config.testmod.dataTypes.anEnum.bar": "Bar",
-  "config.testmod.dataTypes.anEnum.baz": "Baz",
-  "config.testmod.dataTypes.list": "List",
-  "config.testmod.dataTypes.color": "Color",
-  "config.testmod.tooltips": "Tooltips",
-  "config.testmod.tooltips.defaultOneLine.tooltip": "A tooltip with a single line",
-  "config.testmod.tooltips.defaultMultiLine.tooltip.0": "A tooltip with multiple lines, this is the first line...",
-  "config.testmod.tooltips.defaultMultiLine.tooltip.1": "... and this is the second one",
-  "config.testmod.customTooltipLine1": "A tooltip specified with custom keys, line 1...",
-  "config.testmod.customTooltipLine2": "... and line 2"
-}