Skip to content

Commit

Permalink
Update to MDG
Browse files Browse the repository at this point in the history
  • Loading branch information
UnRealDinnerbone committed Jul 18, 2024
1 parent 2c43756 commit 7c18738
Show file tree
Hide file tree
Showing 11 changed files with 213 additions and 223 deletions.
4 changes: 2 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
### 1.0.2
### 1.0.3

- Fix Crash
- Update GUI
101 changes: 4 additions & 97 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
plugins {
id("dev.nanite.mlp") version("0.1.12")
id("dev.nanite.mlp") version("0.3.0")
id("java-library")
id("maven-publish")
id("me.modmuss50.mod-publish-plugin") version "0.3.0"
id 'org.jetbrains.gradle.plugin.idea-ext' version '1.0'
}


Expand All @@ -14,93 +15,12 @@ multiLoader.root() {
splitSources.set(true)
accessWidenerFile.set(project(":common").file("src/main/resources/${mod_id}.accesswidener"))
convertAccessWidener.set(true)
group.set(project.property("maven_group"))
dataGen {
useNeo.set(project(":common").file("src/generated/resources"))
}
}

allprojects {
def isSnapshot = providers.environmentVariable("SNAPSHOT").map {it == "true"}.getOrElse(false)
version = "${mod_version}+mc${minecraft_version}${isSnapshot ? '-SNAPSHOT' : ''}"
setArchivesBaseName("${mod_name}-${project.name}".toLowerCase())
group = "com.unrealdinnerbone"


}

subprojects {


apply plugin: 'java-library'
apply plugin: 'maven-publish'
apply plugin: 'dev.nanite.mlp'


sourceSets.main.resources.srcDir project.file('src/generated/resources')

java.toolchain.languageVersion = JavaLanguageVersion.of(21)


base {
archivesName = "${project.property("mod_name")}-${project.name}".toLowerCase()
}
repositories {
maven {
name = "NeoForge"
url = "https://maven.neoforged.net/"
}
maven {
name = "Fabric"
url = "https://maven.fabricmc.net/"
}
maven {
name = "Nanite"
url = "https://maven.nanite.dev/releases"
}
maven {
name = "Nanite"
url = "https://maven.ftb.dev/snapshots"
}
maven {
url "https://maven.architectury.dev/"
}
maven {
url "https://cursemaven.com"
}
}
tasks.withType(ProcessResources).configureEach {
outputs.upToDateWhen { false }
}

test {
enabled = false
}

publishing {
repositories {
if (providers.environmentVariable("NANITE_TOKEN").isPresent()) {
maven {
def isSnapshot = providers.environmentVariable("SNAPSHOT").map {it == "true"}.getOrElse(false)
url "https://maven.nanite.dev/${isSnapshot ? 'snapshots' : 'releases'}"
credentials {
username = "nanite"
password = providers.environmentVariable("NANITE_TOKEN").get()
}
}
}
}
publications {
register("mavenJava", MavenPublication) {
groupId project.group
artifactId project.getArchivesBaseName()
}
}
}


}


publishMods {
dryRun = providers.environmentVariable("CURSE_TOKEN").getOrNull() == null
changelog = file("./CHANGELOG.md").text
Expand All @@ -127,17 +47,4 @@ publishMods {
from(curseForgeOptions, neoOptions)
}

}




//dependencies {
// implementation "net.neoforged:neoforge:${neo_version}"
// implementation("com.unrealdinnerbone:trenzalore-neo:${project.property("trenzalore_version")}+mc${project.property("minecraft_version")}")
// implementation "dev.ftb.mods:ftb-library-neoforge:${ftb_lib_version}"
// implementation "org.embeddedt:embeddium-1.20.4:0.3.9-git.e63cb32+mc1.20.4"
// implementation "curse.maven:serene-seasons-291874:5206533"
// implementation "curse.maven:glitchcore-955399:5088442"
//
//}
}
3 changes: 3 additions & 0 deletions buildSrc/build.gradle
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
plugins {
id 'groovy-gradle-plugin'
}
73 changes: 73 additions & 0 deletions buildSrc/src/main/groovy/multiloader.gradle
Original file line number Diff line number Diff line change
@@ -0,0 +1,73 @@
plugins {
id 'java-library'
id 'maven-publish'
id 'dev.nanite.mlp'
}

java.toolchain.languageVersion = JavaLanguageVersion.of(21)

def isASnapshot = providers.environmentVariable("SNAPSHOT").map {it == "true"}.getOrElse(false)
version = "${mod_version}+mc${minecraft_version}${isASnapshot ? '-SNAPSHOT' : ''}"
setArchivesBaseName("${mod_name}-${project.name}".toLowerCase())
group = "${maven_group}"

idea {
module {
downloadSources = true
downloadJavadoc = true
}
}

base {
archivesName = "${project.property("mod_name")}-${project.name}".toLowerCase()
}

repositories {
maven {
name = "NeoForge"
url = "https://maven.neoforged.net/"
}
maven {
name = "Nanite"
url = "https://maven.nanite.dev/releases"
}
maven {
name = "Nanite"
url = "https://maven.ftb.dev/snapshots"
}
maven {
url "https://maven.architectury.dev/"
}
maven {
url "https://cursemaven.com"
}
}

tasks.withType(ProcessResources).configureEach {
outputs.upToDateWhen { false }
}

test {
enabled = false
}

publishing {
repositories {
if (providers.environmentVariable("NANITE_TOKEN").isPresent()) {
maven {
def isSnapshot = providers.environmentVariable("SNAPSHOT").map {it == "true"}.getOrElse(false)
url "https://maven.nanite.dev/${isSnapshot ? 'snapshots' : 'releases'}"
credentials {
username = "nanite"
password = providers.environmentVariable("NANITE_TOKEN").get()
}
}
}
}
publications {
register("mavenJava", MavenPublication) {
groupId project.group
artifactId project.getArchivesBaseName()
}
}
}
7 changes: 7 additions & 0 deletions common/build.gradle
Original file line number Diff line number Diff line change
@@ -1,7 +1,14 @@
plugins {
id 'multiloader'
}

multiLoader.common()

publishing.publications.mavenJava.from components.java

sourceSets.main.resources { srcDir 'src/generated/resources' }


dependencies {
implementation("com.unrealdinnerbone:trenzalore-common:${project.property("trenzalore_version")}+mc${project.property("minecraft_version")}")
}
10 changes: 4 additions & 6 deletions gradle.properties
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@


# Project
mod_version=1.0.2
mod_version=1.0.3
maven_group=com.unrealdinnerbone
curse_id=1048090
mod_name=WeatherGate
Expand All @@ -15,14 +13,14 @@ minecraft_version=1.21
# Forge
#forge_version=49.0.13

neo_version=21.0.30-beta
neo_version=21.0.103-beta

fabric_version=0.100.1+1.21
fabric_loader_version=0.15.11

# Other
trenzalore_version=6.0.0
ftb_lib_version=2100.1.0-SNAPSHOT
trenzalore_version=6.0.2
ftb_lib_version=2100.1.2-SNAPSHOT
# Gradle
org.gradle.jvmargs=-Xmx3G
org.gradle.daemon=false
10 changes: 8 additions & 2 deletions neo/build.gradle
Original file line number Diff line number Diff line change
@@ -1,7 +1,15 @@
plugins {
id 'multiloader'
}

multiLoader.neo() {
neoVersion.set("${neo_version}")
}

publishing.publications.mavenJava.from components.java

sourceSets.main.resources { srcDir project(":common").file('src/generated/resources') }


dependencies {
implementation("com.unrealdinnerbone:trenzalore-neo:${project.property("trenzalore_version")}+mc${project.property("minecraft_version")}")
Expand All @@ -10,5 +18,3 @@ dependencies {
implementation "curse.maven:glitchcore-955399:5483773"
}

publishing.publications.mavenJava.from components.java

This file was deleted.

Loading

0 comments on commit 7c18738

Please sign in to comment.