move to pkpcpbp, let's see if this does the gh

FallingColors · Apr 24, 2023 · 58cda69 · 58cda69
1 parent 213f590
commit 58cda69
Show file tree

Hide file tree

Showing 5 changed files with 100 additions and 213 deletions.
diff --git a/Common/build.gradle b/Common/build.gradle
@@ -1,8 +1,11 @@
 plugins {
     id 'org.spongepowered.gradle.vanilla' version '0.2.1-SNAPSHOT'
+    id "at.petra-k.PKSubprojPlugin"
 }
 
-archivesBaseName = getArtifactID("common")
+pkSubproj {
+    platform "common"
+}
 
 minecraft {
     version(minecraftVersion)
@@ -12,11 +15,6 @@ minecraft {
 repositories {
     mavenCentral()
 
-    // If you have mod jar dependencies in ./libs, you can declare them as a repository like so:
-    // flatDir {
-    //     dir 'libs'
-    // }
-
     maven { url 'https://maven.blamejared.com' }
 
     maven {
@@ -56,5 +54,3 @@ processResources {
         expand buildProps
     }
 }
-
-setupJar(this)
diff --git a/Fabric/build.gradle b/Fabric/build.gradle
@@ -1,8 +1,15 @@
 plugins {
     id 'fabric-loom' // version "1.0-SNAPSHOT"
+    id "at.petra-k.PKSubprojPlugin"
 }
 
-archivesBaseName = getArtifactID("fabric")
+pkSubproj {
+    platform "fabric"
+    curseforgeJar remapJar.archiveFile
+    curseforgeDependencies[]
+    modrinthJar remapJar.archiveFile
+    modrinthDependencies[]
+}
 
 loom {
     mixin.defaultRefmapName = "hexcasting.mixins.refmap.json"
@@ -34,30 +41,24 @@ loom {
 
 repositories {
     mavenCentral()
+
+    // paucal and patchi
+    maven { url = 'https://maven.blamejared.com' }
+    // modmenu and clothconfig
     maven { url "https://maven.shedaniel.me/" }
-    maven {
-        url 'https://ladysnake.jfrog.io/artifactory/mods'
-    }
-    maven {
-        name "entity reach"
-        url "https://maven.jamieswhiteshirt.com/libs-release/"
-    }
+    maven { url 'https://ladysnake.jfrog.io/artifactory/mods' }
+    // Entity reach
+    maven { url "https://maven.jamieswhiteshirt.com/libs-release/" }
     maven { url "https://mvn.devos.one/snapshots/" }
-    maven {
-        name = "TerraformersMC"
-        url = "https://maven.terraformersmc.com/releases/"
-    }
+    maven { url = "https://maven.terraformersmc.com/releases/" }
     exclusiveContent {
         forRepository {
-            maven {
-                name = "Modrinth"
-                url = "https://api.modrinth.com/maven"
-            }
-        }
-        filter {
-            includeGroup "maven.modrinth"
+            maven { url = "https://api.modrinth.com/maven" }
         }
+        filter { includeGroup "maven.modrinth" }
     }
+    // pehkui
+    maven { url = "https://jitpack.io" }
 }
 
 dependencies {
@@ -136,5 +137,3 @@ processResources {
         expand "version": project.version
     }
 }
-
-setupJar(this)
diff --git a/Forge/build.gradle b/Forge/build.gradle
@@ -13,16 +13,77 @@ buildscript {
     }
 }
 
+plugins {
+    id "java"
+    id "maven-publish"
+
+    id "at.petra-k.PKSubprojPlugin"
+}
+
 apply plugin: 'net.minecraftforge.gradle'
 apply plugin: 'org.spongepowered.mixin'
 
-archivesBaseName = getArtifactID("forge")
-
 // Adds KFF as dependency and Kotlin libs to the runtime classpath
 // If you already know how to add the Kotlin plugin to Gradle, this is the only line you need for KFF
 apply from: "https://raw.githubusercontent.com/thedarkcolour/KotlinForForge/site/thedarkcolour/kotlinforforge/gradle/kff-" +
         "${kotlinForForgeVersion}.gradle"
 
+pkSubproj {
+    platform "forge"
+    curseforgeJar jar.archiveFile
+    curseforgeDependencies[]
+    modrinthJar jar.archiveFile
+    modrinthDependencies[]
+}
+
+repositories {
+    mavenCentral()
+
+    maven {
+        // location of the maven that hosts JEI files
+        name = "Progwml6 maven"
+        url = "https://dvs1.progwml6.com/files/maven/"
+    }
+    maven {
+        // location of a maven mirror for JEI files, as a fallback
+        name = "ModMaven"
+        url = "https://modmaven.dev"
+    }
+    // caelus elytra
+    maven { url = "https://maven.theillusivec4.top" }
+    // pehkui
+    maven { url = "https://jitpack.io" }
+}
+
+dependencies {
+    minecraft "net.minecraftforge:forge:${minecraftVersion}-${forgeVersion}"
+    compileOnly project(":Common")
+
+    annotationProcessor 'org.spongepowered:mixin:0.8.5:processor'
+
+    compileOnly fg.deobf("at.petra-k.paucal:paucal-forge-$minecraftVersion:$paucalVersion")
+    runtimeOnly fg.deobf("at.petra-k.paucal:paucal-forge-$minecraftVersion:$paucalVersion")
+    compileOnly fg.deobf("vazkii.patchouli:Patchouli:$minecraftVersion-$patchouliVersion")
+    runtimeOnly fg.deobf("vazkii.patchouli:Patchouli:$minecraftVersion-$patchouliVersion")
+
+    // aughh
+    testCompileOnly fg.deobf("at.petra-k.paucal:paucal-forge-$minecraftVersion:$paucalVersion")
+    testCompileOnly fg.deobf("vazkii.patchouli:Patchouli:$minecraftVersion-$patchouliVersion")
+
+    implementation fg.deobf("top.theillusivec4.caelus:caelus-forge:$caelusVersion")
+
+    // Optional interop
+
+    compileOnly fg.deobf("mezz.jei:jei-$minecraftVersion-common-api:$jeiVersion")
+    compileOnly fg.deobf("mezz.jei:jei-$minecraftVersion-forge-api:$jeiVersion")
+    runtimeOnly fg.deobf("mezz.jei:jei-$minecraftVersion-forge:$jeiVersion")
+
+    compileOnly fg.deobf("top.theillusivec4.curios:curios-forge:$minecraftVersion-$curiosVersion:api")
+    runtimeOnly fg.deobf("top.theillusivec4.curios:curios-forge:$minecraftVersion-$curiosVersion")
+
+    api fg.deobf("com.github.Virtuoel:Pehkui:${pehkuiVersion}-${minecraftVersion}-forge")
+}
+
 minecraft {
     mappings channel: 'official', version: minecraftVersion
     accessTransformer = file('src/main/resources/META-INF/accesstransformer.cfg')
@@ -100,61 +161,6 @@ minecraft {
     }
 }
 
-repositories {
-    mavenCentral()
-    // Put repositories for dependencies here
-    // ForgeGradle automatically adds the Forge maven and Maven Central for you
-
-    // If you have mod jar dependencies in ./libs, you can declare them as a repository like so:
-    // flatDir {
-    //     dir 'libs'
-    // }
-
-    maven {
-        // location of the maven that hosts JEI files
-        name = "Progwml6 maven"
-        url = "https://dvs1.progwml6.com/files/maven/"
-    }
-    maven {
-        // location of a maven mirror for JEI files, as a fallback
-        name = "ModMaven"
-        url = "https://modmaven.dev"
-    }
-    // caelus elytra
-    maven { url = "https://maven.theillusivec4.top" }
-}
-
-dependencies {
-    // Specify the version of Minecraft to use. If this is any group other than 'net.minecraft', it is assumed
-    // that the dep is a ForgeGradle 'patcher' dependency, and its patches will be applied.
-    // The userdev artifact is a special name and will get all sorts of transformations applied to it.
-    minecraft "net.minecraftforge:forge:${minecraftVersion}-${forgeVersion}"
-    compileOnly project(":Common")
-
-    annotationProcessor 'org.spongepowered:mixin:0.8.5:processor'
-
-    compileOnly fg.deobf("at.petra-k.paucal:paucal-forge-$minecraftVersion:$paucalVersion")
-    runtimeOnly fg.deobf("at.petra-k.paucal:paucal-forge-$minecraftVersion:$paucalVersion")
-    compileOnly fg.deobf("vazkii.patchouli:Patchouli:$minecraftVersion-$patchouliVersion")
-    runtimeOnly fg.deobf("vazkii.patchouli:Patchouli:$minecraftVersion-$patchouliVersion")
-
-    // aughh
-    testCompileOnly fg.deobf("at.petra-k.paucal:paucal-forge-$minecraftVersion:$paucalVersion")
-    testCompileOnly fg.deobf("vazkii.patchouli:Patchouli:$minecraftVersion-$patchouliVersion")
-
-    implementation fg.deobf("top.theillusivec4.caelus:caelus-forge:$caelusVersion")
-
-    // Optional interop
-
-    compileOnly fg.deobf("mezz.jei:jei-$minecraftVersion-common-api:$jeiVersion")
-    compileOnly fg.deobf("mezz.jei:jei-$minecraftVersion-forge-api:$jeiVersion")
-    runtimeOnly fg.deobf("mezz.jei:jei-$minecraftVersion-forge:$jeiVersion")
-
-    compileOnly fg.deobf("top.theillusivec4.curios:curios-forge:$minecraftVersion-$curiosVersion:api")
-    runtimeOnly fg.deobf("top.theillusivec4.curios:curios-forge:$minecraftVersion-$curiosVersion")
-
-    api fg.deobf("com.github.Virtuoel:Pehkui:${pehkuiVersion}-${minecraftVersion}-forge")
-}
 
 mixin {
     add sourceSets.main, "hexcasting.mixins.refmap.json"
@@ -214,5 +220,4 @@ processResources {
     }
 }
 
-jar.finalizedBy('reobfJar')
-setupJar(this)
+jar.finalizedBy('reobfJar')