Skip to content
Merged

26.1 #155

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
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ concurrency:
cancel-in-progress: true

env:
RUNTIME_VERSION: 21
RUNTIME_VERSION: 25

jobs:
build:
Expand Down
10 changes: 2 additions & 8 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -87,17 +87,11 @@ subprojects {

dependencies {
"minecraft"(libs.minecraft)
"mappings"(loom.layered {
officialMojangMappings {
nameSyntheticMembers = false
}
parchment(variantOf(libs.parchment) { artifactType("zip") })
})
"vineflowerDecompilerClasspath"(libs.vineflower)
}

configurations.named("modLocalRuntime") {
shouldResolveConsistentlyWith(configurations.getByName("modImplementation"))
configurations.named("localRuntime") {
shouldResolveConsistentlyWith(configurations.getByName("implementation"))
}
}

Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
cfProjectId=402098

# Project configuration
targetJavaVersion=21
targetJavaVersion=25
enabledPlatforms=fabric,neoforge

# Gradle
Expand Down
2 changes: 1 addition & 1 deletion gradle/gradle-daemon-jvm.properties
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
#This file is generated by updateDaemonJvm
toolchainVersion=21
toolchainVersion=25
29 changes: 16 additions & 13 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,45 +3,48 @@ format = { version = "1.1" }

[versions]
indra = "3.1.3"
minecraft = "1.21.11"
fabricLoader = "0.18.3"
fabricApi = "0.140.0+1.21.11"
modmenu = "16.0.0-rc.1"
viafabricplus = "3.3.0"
vineflower = "1.10.1"
cuiProtocol = "4.0.2"
minecraft = "26.1.1"
fabricLoader = "0.18.6"
fabricApi = "0.145.4+26.1.1"
modmenu = "18.0.0-alpha.8"
viafabricplus = "4.5.1"
vineflower = "1.11.2"
cuiProtocol = "4.0.3"

[libraries]
minecraft = { module = "com.mojang:minecraft", version.ref = "minecraft" }
parchment = { module = "org.parchmentmc.data:parchment-1.21.10", version = "2025.10.12" }
fabric-loader = { module = "net.fabricmc:fabric-loader", version.ref = "fabricLoader" }
fabric-api = { module = "net.fabricmc.fabric-api:fabric-api", version.ref = "fabricApi" }
fabric-api-bom = { module = "net.fabricmc.fabric-api:fabric-api-bom", version.ref = "fabricApi" }
fabric-api-networking = { module = "net.fabricmc.fabric-api:fabric-networking-api-v1" }
modmenu = { module = "com.terraformersmc:modmenu", version.ref = "modmenu" }
neoforge = { module = "net.neoforged:neoforge", version = "21.10.9-beta"}
viafabricplus-api = { module = "de.florianmichael:ViaFabricPlus", version.ref = "viafabricplus" }
viafabricplus-api = { module = "com.viaversion:viafabricplus", version.ref = "viafabricplus" }
viaversion = { module = "com.viaversion:viaversion-common", version = "5.0.5" }
vineflower = { module = "org.vineflower:vineflower", version.ref = "vineflower" }
worldedit = { module = "com.sk89q.worldedit:worldedit-fabric-mc1.21", version = "7.3.14" }

[plugins]
architecturyPlugin = { id = "architectury-plugin", version = "3.4.160" }
architecturyPlugin = { id = "architectury-plugin", version = "3.5.163" }
curseForgeGradle = { id = "net.darkhax.curseforgegradle", version = "1.1.26" }
indra-git = { id = "net.kyori.indra.git", version.ref = "indra" }
indra-spotlessLicenser = { id = "net.kyori.indra.licenser.spotless", version.ref = "indra" }
jvmConflictResolution = { id = "org.gradlex.jvm-dependency-conflict-resolution", version = "2.1.2" }
loom = { id = "dev.architectury.loom", version = "1.13.463" }
loom = { id = "dev.architectury.loom-no-remap", version = "1.14.471" }
minotaur = { id = "com.modrinth.minotaur", version = "2.8.7" }
publishGithubRelease = { id = "ca.stellardrift.publish-github-release", version = "0.1.0" }
shadow = { id = "com.gradleup.shadow", version = "8.3.5" }
spotless = { id = "com.diffplug.spotless", version = "6.25.0" }
versions = { id = "com.github.ben-manes.versions", version = "0.51.0" }

[libraries.cuiProtocol-common]
module = "org.enginehub.worldeditcui-protocol:worldeditcui-protocol-common-mc26.1"
version.ref = "cuiProtocol"

[libraries.cuiProtocol-fabric]
module = "org.enginehub.worldeditcui-protocol:worldeditcui-protocol-fabric-mc1.21.11"
module = "org.enginehub.worldeditcui-protocol:worldeditcui-protocol-fabric-mc26.1"
version.ref = "cuiProtocol"

[libraries.cuiProtocol-neoforge]
module = "org.enginehub.worldeditcui-protocol:worldeditcui-protocol-neoforge-mc1.21.11"
module = "org.enginehub.worldeditcui-protocol:worldeditcui-protocol-neoforge-mc26.1"
version.ref = "cuiProtocol"
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.1-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
9 changes: 3 additions & 6 deletions gradlew

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 1 addition & 2 deletions gradlew.bat

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

25 changes: 15 additions & 10 deletions worldeditcui-fabric/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -37,14 +37,19 @@ loom {

val fabricApi by configurations.creating
dependencies {
"include"(libs.cuiProtocol.fabric)
"modImplementation"(libs.cuiProtocol.fabric)
modImplementation(libs.fabric.loader)
modImplementation(libs.modmenu)
modCompileOnly(libs.viafabricplus.api) {
"include"(libs.cuiProtocol.fabric) {
attributes {
attribute(Bundling.BUNDLING_ATTRIBUTE, objects.named(Bundling::class, Bundling.SHADOWED))
}
}
"implementation"(libs.cuiProtocol.common)
"implementation"(libs.cuiProtocol.fabric)
implementation(libs.fabric.loader)
implementation(libs.modmenu)
compileOnly(libs.viafabricplus.api) {
isTransitive = false
}
modCompileOnly(libs.viaversion)
compileOnly(libs.viaversion)

// [1] declare fabric-api dependency...
fabricApi(libs.fabric.api)
Expand Down Expand Up @@ -91,7 +96,7 @@ dependencies {

fabricApiDependencies.values.forEach {
"include"(it)
"modImplementation"(it)
"implementation"(it)
}

// for development
Expand Down Expand Up @@ -227,7 +232,7 @@ tasks {

apiToken = cfApiToken.get()

with(upload(cfProjectId.get(), remapJar)) {
with(upload(cfProjectId.get(), jar)) {
displayName = project.version
releaseType = Constants.RELEASE_TYPE_RELEASE
changelog = changelogContents.getOrElse("")
Expand Down Expand Up @@ -255,7 +260,7 @@ modrinth {
token = modrinthToken
projectId = "worldedit-cui"
syncBodyFrom = providers.provider { file("README.md").readText(Charsets.UTF_8) }
uploadFile.set(tasks.remapJar)
uploadFile.set(tasks.jar)
gameVersions.add(libs.versions.minecraft.get())
changelog = changelogContents
dependencies {
Expand All @@ -277,5 +282,5 @@ githubRelease {
repository = "EngineHub/WorldEditCUI"
releaseName = "WorldEditCUI v$version"
releaseBody = changelogContents
artifacts.from(tasks.remapJar)
artifacts.from(tasks.jar)
}
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,7 @@ public void write(

private boolean debugMode = false;
private boolean promiscuous = false;
private boolean compatibilityRenderer = false;
private boolean clearAllOnKey = false;

private Colour cuboidGridColor = ConfiguredColour.CUBOIDGRID.getDefault();
Expand Down Expand Up @@ -135,6 +136,10 @@ public void setPromiscuous(boolean promiscuous) {
this.promiscuous = promiscuous;
}

public boolean isExperimentalRenderer() {
return this.compatibilityRenderer;
}

public boolean isClearAllOnKey() {
return this.clearAllOnKey;
}
Expand Down Expand Up @@ -167,6 +172,7 @@ public static CUIConfiguration create() {

configArray.put("debugMode", config.debugMode);
configArray.put("promiscuous", config.promiscuous);
configArray.put("compatibilityRenderer", config.compatibilityRenderer);
configArray.put("clearAllOnKey", config.clearAllOnKey);

configArray.put("cuboidGridColor", config.cuboidGridColor);
Expand Down Expand Up @@ -202,6 +208,7 @@ public Map<String, Object> getConfigArray() {
public void configChanged() {
debugMode = (Boolean) configArray.get("debugMode");
promiscuous = (Boolean) configArray.get("promiscuous");
compatibilityRenderer = (Boolean) configArray.get("compatibilityRenderer");
clearAllOnKey = (Boolean) configArray.get("clearAllOnKey");

cuboidGridColor = (Colour) configArray.get("cuboidGridColor");
Expand All @@ -223,7 +230,7 @@ public void configChanged() {

public Object getDefaultValue(String text) {
return switch (text) {
case "debugMode", "promiscuous", "clearAllOnKey" -> false;
case "debugMode", "promiscuous", "compatibilityRenderer", "clearAllOnKey" -> false;
case "cuboidGridColor" -> ConfiguredColour.CUBOIDGRID.getDefault();
case "cuboidEdgeColor" -> ConfiguredColour.CUBOIDBOX.getDefault();
case "cuboidFirstPointColor" -> ConfiguredColour.CUBOIDPOINT1.getDefault();
Expand Down Expand Up @@ -265,6 +272,7 @@ public Object getDefaultValue(String text) {
return switch (text) {
case "debugMode" -> "worldeditcui.options.debugMode";
case "promiscuous" -> "worldeditcui.options.compat.spammy";
case "compatibilityRenderer" -> "worldeditcui.options.compat.renderer";
case "clearAllOnKey" -> "worldeditcui.options.extra.clearall";
case "cuboidGridColor" -> "worldeditcui.color.cuboidgrid";
case "cuboidEdgeColor" -> "worldeditcui.color.cuboidedge";
Expand Down
Loading
Loading