Skip to content

Commit

Permalink
Maven changes
Browse files Browse the repository at this point in the history
  • Loading branch information
Gaz492 committed Jun 16, 2024
1 parent 6b1c2f0 commit 537b7fa
Show file tree
Hide file tree
Showing 8 changed files with 6 additions and 210 deletions.
21 changes: 3 additions & 18 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@ allprojects {
group = rootProject.maven_group

repositories {
maven { url "https://maven.neomc.dev/releases"}
maven { url "https://maven.wuffs.dev/releases"}
maven { url "https://maven.wuffs.dev/repository/Minecraft" }
maven { url "https://maven.neoforged.net/releases" }
}

tasks.withType(JavaCompile) {
Expand All @@ -59,12 +59,6 @@ publishMods {
modLoaders.add("fabric")
}

def forgeOptions = publishOptions {
file = project.provider { project(":forge").tasks.remapJar }.flatMap { it.archiveFile }
displayName = "${project.name} Forge ${mod_version}+mc${minecraft_version}"
modLoaders.add("forge")
}

def neoOptions = publishOptions {
file = project.provider { project(":neoforge").tasks.remapJar }.flatMap { it.archiveFile }
displayName = "${project.name} NeoForged ${mod_version}+mc${minecraft_version}"
Expand All @@ -90,10 +84,6 @@ publishMods {
}
}

curseforge("curseforgeForge") {
from(curseForgeOptions, forgeOptions)
}

curseforge("curseforgeNeo") {
from(curseForgeOptions, neoOptions)
}
Expand All @@ -106,19 +96,14 @@ publishMods {
}
}

modrinth("modrinthForge") {
from(modrinthOptions, forgeOptions)
}

modrinth("modrinthNeo") {
from(modrinthOptions, neoOptions)
}
}

github {
file = project.provider { project(":forge").tasks.remapJar }.flatMap { it.archiveFile }
file = project.provider { project(":neoforge").tasks.remapJar }.flatMap { it.archiveFile }
additionalFiles.from project.provider { project(":fabric").tasks.remapJar }.flatMap { it.archiveFile }
additionalFiles.from project.provider { project(":neoforge").tasks.remapJar }.flatMap { it.archiveFile }
repository = "${github_repo}"
accessToken = providers.environmentVariable("GITHUB_TOKEN")
commitish = providers.environmentVariable("GITHUB_SHA").orElse("dryRun")
Expand Down
127 changes: 0 additions & 127 deletions forge/build.gradle

This file was deleted.

1 change: 0 additions & 1 deletion forge/gradle.properties

This file was deleted.

15 changes: 0 additions & 15 deletions forge/src/main/java/dev/wuffs/squatgrow/forge/SquatGrowForge.java

This file was deleted.

35 changes: 0 additions & 35 deletions forge/src/main/resources/META-INF/mods.toml

This file was deleted.

6 changes: 0 additions & 6 deletions forge/src/main/resources/pack.mcmeta

This file was deleted.

4 changes: 1 addition & 3 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,14 @@ minecraft_version=1.21
enabled_platforms=fabric,neoforge

archives_base_name=squatgrow
mod_version=6.1.1
mod_version=21.0.0
maven_group=dev.wuffs

architectury_version=13.0.1

fabric_loader_version=0.15.11
fabric_api_version=0.100.1+1.21

#forge_version=1.20.4-49.0.38

# Neo
neo_version=21.0.8-beta
neo_gradle=[7.0.143,)
Expand Down
7 changes: 2 additions & 5 deletions settings.gradle
Original file line number Diff line number Diff line change
@@ -1,17 +1,14 @@
pluginManagement {
repositories {
maven { url "https://maven.wuffs.dev/releases" }
// maven { url "https://maven.creeperhost.net/" }
maven { url "https://maven.fabricmc.net/" }
maven { url "https://maven.architectury.dev/" }
maven { url "https://maven.wuffs.dev/repository/Minecraft" }
maven { url "https://maven.neoforged.net/releases" }
maven { url "https://maven.fabricmc.net/" }
gradlePluginPortal()
}
}

include("common")
include("fabric")
//include("forge")
include("neoforge")

rootProject.name = "squatgrow"

0 comments on commit 537b7fa

Please sign in to comment.