Skip to content

Commit

Permalink
[NeoForge] 1.20.5
Browse files Browse the repository at this point in the history
Removes Forge.
  • Loading branch information
octylFractal committed Apr 24, 2024
1 parent 6d60741 commit 2de7489
Show file tree
Hide file tree
Showing 57 changed files with 654 additions and 840 deletions.
9 changes: 3 additions & 6 deletions COMPILING.md
Original file line number Diff line number Diff line change
@@ -1,18 +1,15 @@
Compiling
=========

You can compile WorldEdit as long as you have some version of Java greater than or equal to 16 installed. Gradle will download JDK 16 specifically if needed,
You can compile WorldEdit as long as you have some version of Java greater than or equal to 21 installed. Gradle will download JDK 21 specifically if needed,
but it needs some version of Java to bootstrap from.

Note that if you have JRE 16 installed, Gradle will currently attempt to use that to compile, which will not work. It is easiest to uninstall JRE 16 and
replace it with JDK 16.

The build process uses Gradle, which you do *not* need to download. WorldEdit is a multi-module project with four modules:

* `worldedit-core` contains the WorldEdit API
* `worldedit-bukkit` is the Bukkit plugin
* `worldedit-sponge` is the Sponge plugin
* `worldedit-forge` is the Forge mod
* `worldedit-neoforge` is the NeoForge mod
* `worldedit-fabric` is the Fabric mod

## To compile...
Expand All @@ -34,7 +31,7 @@ You will find:
* The core WorldEdit API in **worldedit-core/build/libs**
* WorldEdit for Bukkit in **worldedit-bukkit/build/libs**
* WorldEdit for Sponge in **worldedit-sponge/build/libs**
* WorldEdit for Forge in **worldedit-forge/build/libs**
* WorldEdit for NeoForge in **worldedit-neoforge/build/libs**
* WorldEdit for Fabric in **worldedit-fabric/build/libs**

If you want to use WorldEdit, use the `-dist` version.
Expand Down
13 changes: 7 additions & 6 deletions buildSrc/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,14 @@ repositories {
name = "PaperMC"
url = uri("https://repo.papermc.io/repository/maven-public/")
content {
includeGroupByRegex("io\\.papermc\\..*")
includeGroupAndSubgroups("io.papermc")
}
}
maven {
name = "Forge Maven"
url = uri("https://maven.minecraftforge.net/")
name = "NeoForged Maven"
url = uri("https://maven.neoforged.net/releases")
content {
includeGroupByRegex("net\\.minecraftforge(|\\..*)$")
includeGroupAndSubgroups("net.neoforged")
}
}
mavenCentral()
Expand Down Expand Up @@ -52,12 +52,13 @@ dependencies {
implementation("org.jfrog.buildinfo:build-info-extractor-gradle:5.2.0")
implementation("org.spongepowered:spongegradle-plugin-development:2.2.0")
implementation("org.spongepowered:vanillagradle:0.2.1-20231105.223944-69")
implementation("net.minecraftforge.gradle:ForgeGradle:6.0.21")
val neoGradleVersion = "7.0.107"
implementation("net.neoforged.gradle:userdev:$neoGradleVersion")
implementation("net.neoforged.gradle:mixin:$neoGradleVersion")
implementation("net.fabricmc:fabric-loom:$loomVersion")
implementation("net.fabricmc:sponge-mixin:$mixinVersion")
implementation("org.enginehub.gradle:gradle-codecov-plugin:0.2.0")
implementation("io.papermc.paperweight.userdev:io.papermc.paperweight.userdev.gradle.plugin:1.5.13")
implementation("org.spongepowered:mixingradle:0.7.38")
constraints {
val asmVersion = "[9.7,)"
implementation("org.ow2.asm:asm:$asmVersion") {
Expand Down
10 changes: 10 additions & 0 deletions buildSrc/src/main/kotlin/CommonConfig.kt
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import org.gradle.kotlin.dsl.configure
import org.gradle.kotlin.dsl.dependencies
import org.gradle.kotlin.dsl.repositories
import org.gradle.kotlin.dsl.the
import org.gradle.plugins.ide.idea.model.IdeaModel

fun Project.applyCommonConfiguration() {
group = rootProject.group
Expand Down Expand Up @@ -68,4 +69,13 @@ fun Project.applyCommonConfiguration() {
include("**/*.java")
include("**/*.kt")
}

plugins.withId("idea") {
configure<IdeaModel> {
module {
isDownloadSources = true
isDownloadJavadoc = true
}
}
}
}
2 changes: 1 addition & 1 deletion buildSrc/src/main/kotlin/PlatformConfig.kt
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ fun Project.applyPlatformAndCoreConfiguration(javaRelease: Int = 21) {
applyCommonJavaConfiguration(
sourcesJar = name in setOf("worldedit-core", "worldedit-bukkit", "worldedit-fabric"),
javaRelease = javaRelease,
banSlf4j = name !in setOf("worldedit-fabric", "worldedit-forge", "worldedit-sponge"),
banSlf4j = name !in setOf("worldedit-fabric", "worldedit-neoforge", "worldedit-sponge"),
)

ext["internalVersion"] = "$version+${rootProject.ext["gitCommitHash"]}"
Expand Down
2 changes: 1 addition & 1 deletion buildSrc/src/main/kotlin/Versions.kt
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ object Versions {
const val FAST_UTIL = "8.5.12"
const val GUAVA = "32.1.3-jre"
const val GSON = "2.10.1"
const val LOG4J = "2.19.0"
const val LOG4J = "2.22.1"
const val LIN_BUS = "0.1.0-SNAPSHOT"
}

Expand Down
2 changes: 1 addition & 1 deletion settings.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ listOf("1.19.4", "1.20", "1.20.2", "1.20.4").forEach {
include("worldedit-bukkit:adapters:adapter-$it")
}

listOf("bukkit", "core", "fabric", "forge", "cli").forEach {
listOf("bukkit", "core", "fabric", "neoforge", "cli").forEach {
include("worldedit-libs:$it")
include("worldedit-$it")
}
Expand Down
11 changes: 6 additions & 5 deletions verification/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ tasks.check {
// Generic setup for all tasks
// Pull the version before our current version.
val baseVersion = "(,${rootProject.version.toString().substringBefore("-SNAPSHOT")}["
for (projectFragment in listOf("bukkit", "cli", "core", "fabric", "forge")) {
for (projectFragment in listOf("bukkit", "cli", "core", "fabric", "neoforge")) {
val capitalizedFragment =
projectFragment.replaceFirstChar { if (it.isLowerCase()) it.titlecase(Locale.ROOT) else it.toString() }
val proj = project(":worldedit-$projectFragment")
Expand Down Expand Up @@ -134,7 +134,8 @@ tasks.named<JapicmpTask>("checkFabricApiCompatibility") {
// Need to check against the reobf JAR
newClasspath.setFrom(project(":worldedit-fabric").tasks.named("remapJar"))
}
tasks.named<JapicmpTask>("checkForgeApiCompatibility") {
// Need to check against the reobf JAR
newClasspath.builtBy(project(":worldedit-forge").tasks.named("reobfJar"))
}
//tasks.named<JapicmpTask>("checkForgeApiCompatibility") {
// // Need to check against the reobf JAR
// newClasspath.builtBy(project(":worldedit-neoforge").tasks.named("reobfJar"))
//}
""
191 changes: 0 additions & 191 deletions worldedit-forge/build.gradle.kts

This file was deleted.

This file was deleted.

0 comments on commit 2de7489

Please sign in to comment.