- Adds Classic Interior

- Potentially fixes publishing issues
WhoCraft · Jul 18, 2024 · 17c5dac · 17c5dac
1 parent 262d228
commit 17c5dac
Show file tree

Hide file tree

Showing 4 changed files with 60 additions and 53 deletions.
diff --git a/common/src/main/java/whocraft/tardis_refined/common/tardis/TardisDesktops.java b/common/src/main/java/whocraft/tardis_refined/common/tardis/TardisDesktops.java
@@ -76,6 +76,7 @@ public static Map<ResourceLocation,DesktopTheme> registerDefaultDesktops() {
         addDefaultDesktop(new DesktopTheme("victorian","desktop/victorian"));
         addDefaultDesktop(new DesktopTheme("violet_eye", "desktop/violet_eye"));
         addDefaultDesktop(new DesktopTheme("watchface", "desktop/watchface"));
+        addDefaultDesktop(new DesktopTheme("classic", "desktop/classic"));
 
         return DEFAULT_DESKTOPS;
     }

diff --git a/common/src/main/resources/data/tardis_refined/structures/desktop/classic.nbt b/common/src/main/resources/data/tardis_refined/structures/desktop/classic.nbt
diff --git a/fabric/build.gradle b/fabric/build.gradle
@@ -12,40 +12,44 @@ loom {
     accessWidenerPath = project(":common").loom.accessWidenerPath
 }
 //
-unifiedPublishing {
-    project {
-        displayName = "[Fabric] - Tardis Refined - v$project.version"
-        releaseType = "release"
-        changelog = new File("${rootProject.projectDir}/changelog.md").text
-        gameVersions = ["$rootProject.minecraft_version"]
-        mainPublication tasks.remapJar
-        gameLoaders = ["fabric"]
-        relations {
-            depends {
-                curseforge = "fabric-api"
-                modrinth = "fabric-api"
-            }
-            optional {
-                curseforge = "immersive-portals-mod"
-                modrinth = "immersiveportals"
+
+
+if (System.getenv("curseforge") != null && System.getenv("modrinth") != null) {
+    unifiedPublishing {
+        project {
+            displayName = "[Fabric] - Tardis Refined - v$project.version"
+            releaseType = "release"
+            changelog = new File("${rootProject.projectDir}/changelog.md").text
+            gameVersions = ["$rootProject.minecraft_version"]
+            mainPublication tasks.remapJar
+            gameLoaders = ["fabric"]
+            relations {
+                depends {
+                    curseforge = "fabric-api"
+                    modrinth = "fabric-api"
+                }
+                optional {
+                    curseforge = "immersive-portals-mod"
+                    modrinth = "immersiveportals"
+                }
             }
-        }
 
-        var CURSE_API_KEY = project.findProperty("curseforge") ?: System.getenv("curseforge") ?: ""
-        if (CURSE_API_KEY != "") {
-            curseforge {
-                token = CURSE_API_KEY
-                id = "782697"
-                gameVersions.addAll "Java 17", "$rootProject.minecraft_version"
+            var CURSE_API_KEY = project.findProperty("curseforge") ?: System.getenv("curseforge") ?: ""
+            if (CURSE_API_KEY != "") {
+                curseforge {
+                    token = CURSE_API_KEY
+                    id = "782697"
+                    gameVersions.addAll "Java 17", "$rootProject.minecraft_version"
+                }
             }
-        }
 
-        var MODRINTH_TOKEN = project.findProperty("modrinth") ?: System.getenv("modrinth") ?: ""
-        if (MODRINTH_TOKEN != "") {
-            modrinth {
-                token = MODRINTH_TOKEN
-                id = "nqVt6aES"
-                version = "$project.version+$project.name"
+            var MODRINTH_TOKEN = project.findProperty("modrinth") ?: System.getenv("modrinth") ?: ""
+            if (MODRINTH_TOKEN != "") {
+                modrinth {
+                    token = MODRINTH_TOKEN
+                    id = "nqVt6aES"
+                    version = "$project.version+$project.name"
+                }
             }
         }
     }

diff --git a/forge/build.gradle b/forge/build.gradle
@@ -15,33 +15,35 @@ sourceSets {
     }
 }
 
-unifiedPublishing {
-    project {
-        displayName = "[NeoForge] - Tardis Refined - v$project.version"
-        releaseType = "release"
-        changelog = new File("${rootProject.projectDir}/changelog.md").text
-        gameVersions = ["$rootProject.minecraft_version"]
-        mainPublication tasks.remapJar
-        gameLoaders = ["neoforge"]
-        relations {
+if (System.getenv("curseforge") != null && System.getenv("modrinth") != null) {
+    unifiedPublishing {
+        project {
+            displayName = "[NeoForge] - Tardis Refined - v$project.version"
+            releaseType = "release"
+            changelog = new File("${rootProject.projectDir}/changelog.md").text
+            gameVersions = ["$rootProject.minecraft_version"]
+            mainPublication tasks.remapJar
+            gameLoaders = ["neoforge"]
+            relations {
 
-        }
+            }
 
-        var CURSE_API_KEY = project.findProperty("curseforge") ?: System.getenv("curseforge") ?: ""
-        if (CURSE_API_KEY != "") {
-            curseforge {
-                token = CURSE_API_KEY
-                id = "782697"
-                gameVersions.addAll "Java 17", "$rootProject.minecraft_version"
+            var CURSE_API_KEY = project.findProperty("curseforge") ?: System.getenv("curseforge") ?: ""
+            if (CURSE_API_KEY != "") {
+                curseforge {
+                    token = CURSE_API_KEY
+                    id = "782697"
+                    gameVersions.addAll "Java 17", "$rootProject.minecraft_version"
+                }
             }
-        }
 
-        var MODRINTH_TOKEN = project.findProperty("modrinth") ?: System.getenv("modrinth") ?: ""
-        if (MODRINTH_TOKEN != "") {
-            modrinth {
-                token = MODRINTH_TOKEN
-                id = "nqVt6aES"
-                version = "$project.version+$project.name"
+            var MODRINTH_TOKEN = project.findProperty("modrinth") ?: System.getenv("modrinth") ?: ""
+            if (MODRINTH_TOKEN != "") {
+                modrinth {
+                    token = MODRINTH_TOKEN
+                    id = "nqVt6aES"
+                    version = "$project.version+$project.name"
+                }
             }
         }
     }