Skip to content

Commit

Permalink
Right, pushing exists
Browse files Browse the repository at this point in the history
  • Loading branch information
enjarai committed Jun 5, 2024
1 parent 8b30fd5 commit 6addd88
Show file tree
Hide file tree
Showing 8 changed files with 100 additions and 20 deletions.
33 changes: 22 additions & 11 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ plugins {
id 'fabric-loom' version '1.6-SNAPSHOT'
id 'maven-publish'
id "me.modmuss50.mod-publish-plugin" version "0.4.4"
id 'me.fallenbreath.yamlang' version '1.3.1'
}

sourceCompatibility = JavaVersion.VERSION_21
Expand Down Expand Up @@ -33,23 +34,28 @@ repositories {

dependencies {
// To change the versions see the gradle.properties file
minecraft "com.mojang:minecraft:${project.minecraft_version}"
mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2"
modImplementation "net.fabricmc:fabric-loader:${project.loader_version}"
minecraft "com.mojang:minecraft:${property("deps.minecraft")}"
mappings "net.fabricmc:yarn:${property("deps.yarn")}:v2"
modImplementation "net.fabricmc:fabric-loader:${property("deps.fabric-loader")}"

// Fabric API. This is technically optional, but you probably want it anyway.
modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}"
modImplementation "net.fabricmc.fabric-api:fabric-api:${property("deps.fabric-api")}"

modImplementation("nl.enjarai:cicada-lib:${project.cicada_version}") {
modImplementation("nl.enjarai:cicada-lib:${property("deps.cicada")}") {
exclude group: "net.fabricmc.fabric-api"
}

// Mod Menu integration.
modImplementation "com.terraformersmc:modmenu:${modmenu_version}"
modImplementation "com.terraformersmc:modmenu:${property("deps.modmenu")}"

// Cardinal Components for shrimple™ server syncing.
modImplementation(include("org.ladysnake.cardinal-components-api:cardinal-components-base:${project.cardinal_components_version}"))
modImplementation(include("org.ladysnake.cardinal-components-api:cardinal-components-entity:${project.cardinal_components_version}"))
if (stonecutter.compare("6.0.0", property("deps.cardinal-components-api")) <= 0) {
modImplementation(include("org.ladysnake.cardinal-components-api:cardinal-components-base:${property("deps.cardinal-components-api")}"))
modImplementation(include("org.ladysnake.cardinal-components-api:cardinal-components-entity:${property("deps.cardinal-components-api")}"))
} else {
modImplementation(include("dev.onyxstudios.cardinal-components-api:cardinal-components-base:${property("deps.cardinal-components-api")}"))
modImplementation(include("dev.onyxstudios.cardinal-components-api:cardinal-components-entity:${property("deps.cardinal-components-api")}"))
}

// Make it easier to test skin compat.
// modImplementation 'com.ptsmods:devlogin:2.1'
Expand All @@ -63,7 +69,7 @@ processResources {
}
}

version = "$version+$minecraft_version"
version = "$version+${property("deps.minecraft")}"

tasks.withType(JavaCompile).configureEach {
// Minecraft 1.18 (1.18-pre2) upwards uses Java 17.
Expand All @@ -83,6 +89,11 @@ jar {
}
}

yamlang {
targetSourceSets = [sourceSets.main]
inputDir = "assets/showmeyourskin/lang"
}

// configure the maven publication
publishing {
publications {
Expand All @@ -101,12 +112,12 @@ publishing {
}

loom {
accessWidenerPath = file("src/main/resources/showmeyourskin.accesswidener")
accessWidenerPath = file("../../src/main/resources/showmeyourskin.accesswidener")
}

publishMods {
file = remapJar.archiveFile
displayName = "${property('mod_version')} for ${property('minecraft_version')}"
displayName = "${property('mod_version')} for ${property('deps.minecraft')}"
version = project.version
changelog = getRootProject().file("CHANGELOG.md").text
type = STABLE
Expand Down
18 changes: 9 additions & 9 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -3,26 +3,26 @@ org.gradle.jvmargs=-Xmx1G

# Fabric Properties
# check these on https://fabricmc.net/develop
minecraft_version=1.20.5
yarn_mappings=1.20.5+build.1
loader_version=0.15.10
deps.minecraft=[VERSIONED]
deps.yarn=[VERSIONED]
deps.fabric-loader=0.15.10

# Mod Properties
mod_version = 1.10.2
maven_group = nl.enjarai
archives_base_name = show-me-your-skin

publish_target_min=1.20.5
publish_target_max=1.20.6
publish_target_min=[VERSIONED]
publish_target_max=[VERSIONED]
mod_modrinth=bD7YqcA3
mod_curseforge=622010
mod_github=enjarai/show-me-your-skin
git_branch=master

# Dependencies
fabric_version=0.97.8+1.20.5
deps.fabric-api=[VERSIONED]
# https://modrinth.com/mod/modmenu/versions
modmenu_version=10.0.0-beta.1
cicada_version=0.7.1+1.20.5-and-above
deps.modmenu=[VERSIONED]
deps.cicada=[VERSIONED]
# https://github.com/OnyxStudios/Cardinal-Components-API/releases
cardinal_components_version=6.0.0-rc1
deps.cardinal-components-api=[VERSIONED]
19 changes: 19 additions & 0 deletions settings.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,26 @@ pluginManagement {
name = 'Fabric'
url = 'https://maven.fabricmc.net/'
}
maven {
url = "https://maven.kikugie.dev/releases"
}
maven {
url = "https://maven.kikugie.dev/snapshots"
}
mavenCentral()
gradlePluginPortal()
}
}

plugins {
id "dev.kikugie.stonecutter" version "0.4.0-alpha.9"
}

stonecutter {
shared {
versions "1.20.1", "1.20.2", "1.20.4", "1.20.6"
vcsVersion = "1.20.6"
}

create rootProject
}
2 changes: 2 additions & 0 deletions stonecutter.gradle
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
plugins.apply "dev.kikugie.stonecutter"
stonecutter.active "1.20.6" /* [SC] DO NOT EDIT */
12 changes: 12 additions & 0 deletions versions/1.20.1/gradle.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
deps.minecraft=1.20.1
deps.yarn=1.20.1+build.10

publish_target_min=1.20
publish_target_max=1.20.1

deps.fabric-api=0.92.2+1.20.1
# https://modrinth.com/mod/modmenu/versions
deps.modmenu=7.2.2
deps.cicada=0.7.2+1.20.1
# https://github.com/OnyxStudios/Cardinal-Components-API/releases
deps.cardinal-components-api=5.2.2
12 changes: 12 additions & 0 deletions versions/1.20.2/gradle.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
deps.minecraft=1.20.2
deps.yarn=1.20.2+build.4

publish_target_min=1.20.2
publish_target_max=1.20.2

deps.fabric-api=0.91.6+1.20.2
# https://modrinth.com/mod/modmenu/versions
deps.modmenu=8.0.1
deps.cicada=0.7.2+1.20.2-1.20.4
# https://github.com/OnyxStudios/Cardinal-Components-API/releases
deps.cardinal-components-api=5.3.0
12 changes: 12 additions & 0 deletions versions/1.20.4/gradle.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
deps.minecraft=1.20.4
deps.yarn=1.20.4+build.3

publish_target_min=1.20.3
publish_target_max=1.20.4

deps.fabric-api=0.97.1+1.20.4
# https://modrinth.com/mod/modmenu/versions
deps.modmenu=9.2.0-beta.2
deps.cicada=0.7.2+1.20.2-1.20.4
# https://github.com/OnyxStudios/Cardinal-Components-API/releases
deps.cardinal-components-api=5.4.0
12 changes: 12 additions & 0 deletions versions/1.20.6/gradle.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
deps.minecraft=1.20.6
deps.yarn=1.20.6+build.3

publish_target_min=1.20.5
publish_target_max=1.20.6

deps.fabric-api=0.99.4+1.20.6
# https://modrinth.com/mod/modmenu/versions
deps.modmenu=10.0.0-beta.1
deps.cicada=0.7.2+1.20.5-and-above
# https://github.com/OnyxStudios/Cardinal-Components-API/releases
deps.cardinal-components-api=6.0.0

0 comments on commit 6addd88

Please sign in to comment.