Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion buildSrc/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ plugins {
}

repositories {
mavenLocal()
maven("https://maven.fabricmc.net/")
maven("https://maven.architectury.dev/")
maven("https://maven.neoforged.net/releases/")
Expand All @@ -13,7 +14,7 @@ repositories {

dependencies {
implementation("architectury-plugin:architectury-plugin.gradle.plugin:3.4-SNAPSHOT")
implementation("dev.architectury:architectury-loom:1.11-SNAPSHOT")
implementation("dev.architectury:architectury-loom:1.14-SNAPSHOT")
implementation("com.gradleup.shadow:shadow-gradle-plugin:9.2.2")

// Required to get Version Catalogs to show in buildSrc
Expand Down
1 change: 1 addition & 0 deletions buildSrc/settings.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
pluginManagement {
repositories {
mavenLocal()
maven("https://maven.fabricmc.net/")
maven("https://maven.architectury.dev/")
maven("https://maven.neoforged.net/releases/")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -174,10 +174,10 @@ class PublishCallback {
*/
abstract class CopyDataFile : DefaultTask() {
@get:InputFiles
abstract val inputFiles: ListProperty<RegularFile?>
abstract val inputFiles: ListProperty<RegularFile>

@get:OutputFiles
abstract val outputFiles: ListProperty<RegularFile?>
abstract val outputFiles: ListProperty<RegularFile>

@TaskAction
@Throws(IOException::class)
Expand Down
274 changes: 0 additions & 274 deletions buildSrc/src/main/kotlin/io/wispforest/helpers/Utils.kt

This file was deleted.

18 changes: 5 additions & 13 deletions buildSrc/src/main/kotlin/multiloader-base.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import io.wispforest.helpers.RunConfigurationUtils.createExtraRunConfigs
import io.wispforest.helpers.UtilsJava

plugins {
id("dev.architectury.loom")
id("dev.architectury.loom-no-remap")
id("maven-publish")
id("base")
id("java")
Expand Down Expand Up @@ -81,6 +81,8 @@ loom {
}

repositories {
mavenLocal() // Local maven for custom owo-lib build

// Platform Mavens
maven("https://maven.parchmentmc.org")
maven("https://maven.fabricmc.net/")
Expand Down Expand Up @@ -121,16 +123,6 @@ repositories {
dependencies {
minecraft("com.mojang:minecraft:${libs.versions.minecraft.asProvider().get()}")

if (name == "common-mojmap") {
mappings(loom.officialMojangMappings())
} else {
mappings (
loom.layered {
this.officialMojangMappings()
this.parchment("org.parchmentmc.data:parchment-${libs.versions.minecraft.asProvider().get()}:${libs.versions.parchment.get()}@zip")
}
)
}

if (projectPlatform != "common" && enabledTestmodPlatforms.contains(projectPlatform)) {
"testmodImplementation"(sourceSets.main.get().output)
Expand All @@ -139,7 +131,7 @@ dependencies {
// General Libs
var owolibDependency = if (projectPlatform == "neoforge") libs.owolib.neo else libs.owolib.fabric

modImplementation(owolibDependency) {
implementation(owolibDependency) {
if (projectPlatform == "common") exclude("net.fabricmc.fabric-api")
}
annotationProcessor(owolibDependency) {
Expand All @@ -153,7 +145,7 @@ dependencies {
//--

// Item Viewer Libs
project.setupItemViewerDependencies(modCompileOnly = this::modCompileOnly, modLocalRuntime = this::modLocalRuntime)
project.setupItemViewerDependencies(modCompileOnly = this::compileOnly, modLocalRuntime = this::runtimeOnly)
}

tasks.processResources {
Expand Down
2 changes: 0 additions & 2 deletions buildSrc/src/main/kotlin/multiloader-mojmap.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,6 @@ fun setupTask(targetTask: AbstractRemapJarTask, taskName: String, archiveClassif
targetTask.sourceNamespace = "named"
targetTask.targetNamespace = "named"

//targetTask.remapperIsolation = true

targetTask.mustRunAfter(
mutableListOf(
tasks.namedOrNull("generateMetadataFileForMavenCommonPublication"),
Expand Down
Loading