Skip to content

Commit

Permalink
* Bumped to Minecraft 1.20.2
Browse files Browse the repository at this point in the history
  • Loading branch information
FlorentTomi committed Dec 25, 2023
1 parent caec126 commit 97ab009
Show file tree
Hide file tree
Showing 78 changed files with 199 additions and 493 deletions.
23 changes: 2 additions & 21 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,28 +1,9 @@
## [v1.3.0+1.20.1]
## [v1.4.0+1.20.2]

---

### [`Armor Statues Datapack`](https://www.curseforge.com/minecraft/customization/armor-statues-datapack) support

---

- Added preset support
- Added wands support
- Added undo/redo/repeat support

### API

---

- Multiplatform support via [`Architectury`](https://modrinth.com/mod/architectury-api) (only Fabric supported right now)
- Replace `GitHub Actions` by [`Minotaur`](https://github.com/modrinth/minotaur) for deployment to [`Modrinth`](https://modrinth.com)

### Changed

---

- New mod icon
- (GUI) Switched to a "Toolbar + toolbox" design for a cleaner design
- (GUI) Added a *Pose Preset* screen
- (Singleplayer) GUI doesn't pause the game
- (Singleplayer) Action triggers can now be used without closing te GUI
- Added display name legacy support
118 changes: 79 additions & 39 deletions build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,59 +1,99 @@
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile

plugins {
java
`kotlin-dsl`
id("architectury-plugin") version "3.4-SNAPSHOT"
id("dev.architectury.loom") version "1.2-SNAPSHOT" apply false
kotlin("jvm") version "1.8.10" apply false
alias(libs.plugins.fabric.loom)
alias(libs.plugins.kotlin.jvm)
alias(libs.plugins.modrinth.minotaur)
alias(libs.plugins.curseGradle)
}

architectury {
minecraft = rootProject.property("minecraftVersion").toString()
}

subprojects {
apply(plugin = "dev.architectury.loom")
version = libs.versions.armorStatuesCompanion.get()

dependencies {
"minecraft"(rootProject.project.libs.minecraft)
"mappings"("net.fabricmc:yarn:1.20.1+build.10")
}
repositories {
maven { setUrl("https://maven.wispforest.io") }
}

allprojects {
apply(plugin = "java")
apply(plugin = "architectury-plugin")
apply(plugin = "maven-publish")
apply(plugin = "org.jetbrains.kotlin.jvm")
dependencies {
"minecraft"(libs.minecraft)
"mappings"(libs.yarn.mappings) {
artifact {
classifier = "v2"
}
}

base.archivesName.set("${rootProject.property("archivesBaseName")}")
version = "${rootProject.property("modVersion")}+${rootProject.property("minecraftVersion")}"
group = rootProject.property("mavenGroup").toString()
modImplementation(libs.fabric.loader)
modImplementation(libs.fabric.api)
modImplementation(libs.fabric.kotlin)

repositories {
}
modImplementation(libs.owo.lib)
include(libs.owo.sentinel)
}

dependencies {
"compileClasspath"(rootProject.project.libs.kotlin.gradlePlugin)
}
tasks.withType<ProcessResources>() {
inputs.property("version", project.version)

tasks.withType<JavaCompile> {
options.encoding = "UTF-8"
options.release.set(17)
filesMatching("fabric.mod.json") {
expand("version" to project.version)
}
}

java {
withSourcesJar()
}
tasks.withType<JavaCompile>().configureEach {
options.release = 17
}

val compileKotlin: KotlinCompile by tasks
compileKotlin.kotlinOptions {
tasks.withType<KotlinCompile>().all {
kotlinOptions {
jvmTarget = "17"
}
}

val compileTestKotlin: KotlinCompile by tasks
compileTestKotlin.kotlinOptions {
jvmTarget = "17"
java {
withSourcesJar()

sourceCompatibility = JavaVersion.VERSION_17
targetCompatibility = JavaVersion.VERSION_17
}

val modrinthToken: String? = System.getenv("MODRINTH_TOKEN")
if (modrinthToken != null) {
modrinth {
token.set(System.getenv("MODRINTH_TOKEN"))
projectId.set("UE4M9RbW")
versionNumber.set(libs.versions.armorStatuesCompanion)
versionType.set("release")
uploadFile.set(tasks.remapJar)
gameVersions.addAll(libs.versions.minecraft.get())
loaders.add("fabric")
changelog.set(rootProject.file("CHANGELOG.md").readText())
syncBodyFrom.set(rootProject.file("DESCRIPTION.md").readText())
debugMode.set(true)
dependencies {
required.project("fabric-api")
required.project("fabric-language-kotlin")
required.project("owo-lib")
}
}
}

val curseForgeToken: String? = System.getenv("CURSEFORGE_TOKEN")
if (curseForgeToken != null) {
curseforge {
apiKey = System.getenv("CURSEFORGE_TOKEN")
project {
id = "904018"
changelog = rootProject.file("CHANGELOG.md")
releaseType = "release"
addGameVersion(libs.versions.minecraft.get())
mainArtifact(tasks.remapJar.get())
relations {
requiredDependency("fabric-api")
requiredDependency("fabric-language-kotlin")
requiredDependency("owo-lib")
}

options {
debug = true
}
}
}
}
30 changes: 0 additions & 30 deletions common/build.gradle.kts

This file was deleted.

This file was deleted.

43 changes: 0 additions & 43 deletions common/src/main/kotlin/net/asch/asc/KeyMappings.kt

This file was deleted.

59 changes: 0 additions & 59 deletions common/src/main/kotlin/net/asch/asc/ModClient.kt

This file was deleted.

3 changes: 0 additions & 3 deletions common/src/main/resources/architectury.common.json

This file was deleted.

This file was deleted.

1 change: 0 additions & 1 deletion common/src/main/resources/asc.accesswidener

This file was deleted.

Loading

0 comments on commit 97ab009

Please sign in to comment.