Share common mod properties between subprojects that use Minecraft

Pixaurora · Jul 19, 2024 · e13d16a · e13d16a
1 parent 32630da
commit e13d16a
Show file tree

Hide file tree

Showing 8 changed files with 17 additions and 10 deletions.
diff --git a/build-logic/src/main/java/net/pixaurora/kit_tunes/build_logic/ProjectProperties.java b/build-logic/src/main/java/net/pixaurora/kit_tunes/build_logic/ProjectProperties.java
@@ -12,6 +12,17 @@ public ProjectProperties(Project project) {
     }
 
     public Optional<Object> optionalProperty(Property property) {
+        Optional<Project> parent = Optional.ofNullable(this.project.getParent());
+
+        // This is a work-around for https://github.com/gradle/gradle/issues/29600
+        if (project.getName().charAt(1) == '1' && parent.isPresent()) {
+            Optional<Object> parentProperty = Optional.ofNullable(parent.get().getProperties().get(property.key()));
+
+            if (parentProperty.isPresent()) {
+                return parentProperty;
+            }
+        }
+
         return Optional.ofNullable(project.getProperties().get(property.key()));
     }
 

diff --git a/kitten-square/gradle.properties b/kitten-square/gradle.properties
@@ -0,0 +1,3 @@
+# Shared Mod Properties
+base_mod_name = kitten
+sub_mod_name = square
diff --git a/kitten-square/r1.17.0/gradle.properties b/kitten-square/r1.17.0/gradle.properties
@@ -1,6 +1,4 @@
 # Mod properties
-base_mod_name = kitten
-sub_mod_name = square
 
 minecraft_version_min = 1.17.0
 

diff --git a/kitten-square/r1.20.4/gradle.properties b/kitten-square/r1.20.4/gradle.properties
@@ -1,6 +1,4 @@
 # Mod properties
-base_mod_name = kitten
-sub_mod_name = square
 
 minecraft_version_min = 1.20.4
 

diff --git a/kitten-square/r1.21.0/gradle.properties b/kitten-square/r1.21.0/gradle.properties
@@ -1,6 +1,4 @@
 # Mod properties
-base_mod_name = kitten
-sub_mod_name = square
 
 minecraft_version_min = 1.21.0
 

diff --git a/kitten-star/gradle.properties b/kitten-star/gradle.properties
@@ -0,0 +1,3 @@
+# Shared mod properties
+base_mod_name = kitten
+sub_mod_name = star
diff --git a/kitten-star/r1.17.0/gradle.properties b/kitten-star/r1.17.0/gradle.properties
@@ -1,6 +1,4 @@
 # Mod properties
-base_mod_name = kitten
-sub_mod_name = star
 
 minecraft_version_min = 1.17.0
 

diff --git a/kitten-star/r1.20.4/gradle.properties b/kitten-star/r1.20.4/gradle.properties
@@ -1,6 +1,4 @@
 # Mod properties
-base_mod_name = kitten
-sub_mod_name = star
 
 minecraft_version_min = 1.20.4