Skip to content

Commit

Permalink
File Changes
Browse files Browse the repository at this point in the history
  • Loading branch information
MrFishCakes committed Jul 18, 2023
1 parent 0b91a4a commit 2239842
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 16 deletions.
6 changes: 3 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ manifest.mf
run/

build-data/
Tentacles-API
Tentacles-MojangAPI
Tentacles-Server
Graphite-API
Graphite-MojangAPI
Graphite-Server
*.jar
12 changes: 6 additions & 6 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ dependencies {
}

paperweight {
serverProject.set(project(":tentacles-server"))
serverProject.set(project(":graphite-server"))

remapRepo.set(paperMavenPublicUrl)
decompileRepo.set(paperMavenPublicUrl)
Expand All @@ -76,16 +76,16 @@ paperweight {
baseName("Purpur")

apiPatchDir.set(layout.projectDirectory.dir("patches/api"))
apiOutputDir.set(layout.projectDirectory.dir("Tentacles-API"))
apiOutputDir.set(layout.projectDirectory.dir("Graphite-API"))

serverPatchDir.set(layout.projectDirectory.dir("patches/server"))
serverOutputDir.set(layout.projectDirectory.dir("Tentacles-Server"))
serverOutputDir.set(layout.projectDirectory.dir("Graphite-Server"))
}
}
}

tasks.generateDevelopmentBundle {
apiCoordinates.set("org.purpurmc.tentacles:tentacles-api")
apiCoordinates.set("dev.graphitemc.graphite:graphite-api")
mojangApiCoordinates.set("io.papermc.paper:paper-mojangapi")
libraryRepositories.set(
listOf(
Expand All @@ -100,7 +100,7 @@ allprojects {
publishing {
repositories {
maven("https://repo.purpurmc.org/snapshots") {
name = "tentacles"
name = "graphite"
credentials(PasswordCredentials::class)
}
}
Expand All @@ -125,4 +125,4 @@ tasks.register("printTentaclesVersion") {
doLast {
println(project.version)
}
}
}
4 changes: 2 additions & 2 deletions gradle.properties
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
group = org.purpurmc.tentacles
version = 1.20.1-R0.1-SNAPSHOT

purpurCommit = ab2f1c06cef7ae6ff5f6754c87951eb406d60dbf
purpurCommit = 96ebdc846176f460f9e7a439f2fd4f3f97a33422

org.gradle.caching = true
org.gradle.parallel = true
org.gradle.vfs.watch = false
org.gradle.jvmargs = -Xmx3G
org.gradle.jvmargs = -Xmx3G
10 changes: 5 additions & 5 deletions settings.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -15,21 +15,21 @@ if (!file(".git").exists()) {
val errorText = """
=====================[ ERROR ]=====================
The Tentacles project directory is not a properly cloned Git repository.
The Graphite project directory is not a properly cloned Git repository.
In order to build Tentacles from source you must clone
In order to build Graphite from source you must clone
the repository using Git, not download a code zip from GitHub.
See https://github.com/PurpurMC/Purpur/blob/HEAD/CONTRIBUTING.md
for further information on building and modifying Purpur.
for further information on building and modifying Purpur/Graphite.
===================================================
""".trimIndent()
error(errorText)
}

rootProject.name = "tentacles"
rootProject.name = "Graphite"

for (name in listOf("Tentacles-API", "Tentacles-Server")) {
for (name in listOf("Graphite-API", "Graphite-Server")) {
val projName = name.toLowerCase(Locale.ENGLISH)
include(projName)
findProject(":$projName")!!.projectDir = file(name)
Expand Down

0 comments on commit 2239842

Please sign in to comment.