Skip to content
Closed
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
8 changes: 4 additions & 4 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ jobs:
uses: actions/setup-java@v4
with:
distribution: 'graalvm'
java-version: '21'
java-version: '25'
cache: 'gradle'
- name: Grant permissions to src-theme
run: sudo chmod -R 777 src-theme
Expand Down Expand Up @@ -123,7 +123,7 @@ jobs:
-F "lb_version=$LB_VERSION" \
-F "mc_version=$MINECRAFT_VERSION" \
-F "subsystem=fabric" \
-F "jre_version=21" \
-F "jre_version=25" \
-F "fabric_loader_version=$LOADER_VERSION" \
-F "fabric_api_version=$FABRICAPI_VERSION" \
-F "kotlin_version=$KOTLIN_VERSION" \
Expand All @@ -139,11 +139,11 @@ jobs:
uses: actions/checkout@v4
with:
submodules: recursive
- name: Setting up JDK 21
- name: Setting up JDK 25
uses: actions/setup-java@v4
with:
distribution: 'graalvm'
java-version: '21'
java-version: '25'
cache: 'gradle'
- name: Grant permissions to src-theme
run: sudo chmod -R 777 src-theme
Expand Down
39 changes: 12 additions & 27 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -39,13 +39,11 @@ base {
}

/** Includes non-mod dependency recursively in the JAR file */
val includeDependency: Configuration by configurations.creating
val includeDependency: Configuration by configurations.creating(Configuration::excludeProvidedLibs)

/** Includes native-only dependency in the JAR file */
val includeNative: Configuration by configurations.creating

includeDependency.excludeProvidedLibs()

configurations {
include.configure {
extendsFrom(includeNative)
Expand Down Expand Up @@ -109,9 +107,9 @@ loom {
dependencies {
// Minecraft
minecraft(libs.minecraft)
loom.noIntermediateMappings()
mappings(loom.layered {
officialMojangMappings()
parchment("org.parchmentmc.data:parchment-${libs.versions.minecraft.get()}:2025.12.20@zip")
parchment("org.parchmentmc.data:parchment-1.21.11:BLEEDING-20251220.145140-1@zip")
})

// Fabric
Expand All @@ -123,18 +121,18 @@ dependencies {
modApi(libs.modmenu)

// Recommended mods (on IDE)
modApi(libs.sodium)
modApi(libs.lithium)
modRuntimeOnly(libs.immediatelyFast)
modRuntimeOnly(libs.iris)
// modApi(libs.sodium)
// modApi(libs.lithium)
// modRuntimeOnly(libs.immediatelyFast)
// modRuntimeOnly(libs.iris)

// ViaFabricPlus
modApi(libs.vfp.api)
modRuntimeOnly(libs.vfp)
// runtimeOnly(libs.vfp)

// Exploit Preventer
modApi(libs.exploitPreventer.api)
modRuntimeOnly(libs.exploitPreventer)
// runtimeOnly(libs.exploitPreventer)

// Minecraft Authlib
includeDependency(libs.mcAuthlib)
Expand All @@ -148,7 +146,6 @@ dependencies {
includeDependency(libs.discordIpc)

// ScriptAPI
includeDependency("net.fabricmc:tiny-mappings-parser:0.3.0+build.17")
includeDependency(libs.polyglot)
includeDependency(libs.polyglot.js)
includeDependency(libs.polyglot.tools)
Expand Down Expand Up @@ -179,14 +176,10 @@ dependencies {
// testImplementation(libs.fabric.loader.junit)
testRuntimeOnly("org.junit.platform:junit-platform-launcher")

afterEvaluate {
includeDependency.incoming.resolutionResult.allDependencies.forEach {
val apiDependency = dependencies.api(it.requested.toString()) {
isTransitive = false
}
includeDependency.dependencies.forEach { dep ->
include(dep)

dependencies.include(apiDependency)
}
dependencies.api(dep.toString())
}
}

Expand Down Expand Up @@ -376,14 +369,10 @@ tasks.jar {
val archivesBaseName = providers.gradleProperty("archives_base_name")
val modVersion = providers.gradleProperty("mod_version")
val mavenGroup = providers.gradleProperty("maven_group")
val mappingFiles = provider {
rootProject.configurations.mappings.get().map(::zipTree)
}

inputs.property("archives_base_name", archivesBaseName)
inputs.property("mod_version", modVersion)
inputs.property("maven_group", mavenGroup)
inputs.files(mappingFiles).withPropertyName("mappingFiles")

manifest {
attributes["Main-Class"] = "net.ccbluex.liquidbounce.LiquidInstruction"
Expand All @@ -398,10 +387,6 @@ tasks.jar {
"${it}_${archivesBaseName.get()}"
}
}

from(files(mappingFiles.get())) {
include("mappings/mappings.tiny")
}
}

tasks.register<Copy>("copyZipInclude") {
Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ org.gradle.caching=true
org.gradle.configureondemand=true
#org.gradle.configuration-cache=true
# ZGC from JDK 21
org.gradle.jvmargs=-Xms1024m -Xmx4096m -XX:+UseZGC -XX:+ZGenerational
org.gradle.jvmargs=-Xms1024m -Xmx4096m -XX:+UseZGC -XX:+ZGenerational --add-modules java.base --add-modules jdk.zipfs --add-opens java.base/java.nio.file=ALL-UNNAMED

org.jetbrains.dokka.experimental.gradle.pluginMode=V2EnabledWithHelpers

Expand Down
21 changes: 11 additions & 10 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
[versions]
# Minecraft 1.21.1 upwards uses Java 21
# 26.1 upwards uses Java 25
jdk = "21"
jdk = "25"

# Fabric Properties
# Check these on https://fabricmc.net/versions.html
# https://mods.upcraft.dev/dev/versions
minecraft = "1.21.11"
minecraft = "26.1-snapshot-1"
fabric-loom = "1.14-SNAPSHOT"
fabric-loader = "0.18.3"
fabric-loader = "0.18.4"
fabric-loaderMin = "0.16.14"
fabric-api = "0.140.0+1.21.11"
fabric-api = "0.140.2+26.1"

# mcef
mcef = "3.1.6-1.21.11"
mcef = "0.0.0-26.1"
# mc-authlib
mc_authlib = "1.6.0"
# Polyglot
Expand All @@ -30,7 +30,7 @@ ahocorasick = "0.6.3"
fastutil4k = "0.2.2"

# Recommended mods
modmenu = "17.0.0-beta.1"
modmenu = "18.0.0-alpha.2"
exploit_preventer_api = "0.0.1"
exploit_preventer_mod = "0.1.7"
sodium = "mc1.21.11-0.8.1-fabric"
Expand All @@ -42,11 +42,11 @@ iris = "1.10.3+1.21.11-fabric"

# Kotlin
# https://kotlinlang.org/releases.html
kotlin = "2.2.10"
kotlin = "2.3.0"
# https://central.sonatype.com/artifact/org.jetbrains.kotlinx/kotlinx-coroutines-test/overview
kotlinx-coroutines = "1.10.2"
# https://maven.fabricmc.net/net/fabricmc/fabric-language-kotlin/
fabric-kotlin = "1.13.5+kotlin.2.2.10"
fabric-kotlin = "1.13.8+kotlin.2.3.0"

# Netty, should be sync with game version
# https://mvnrepository.com/artifact/io.netty/netty-all
Expand All @@ -70,7 +70,8 @@ netty-handler-proxy = { group = "io.netty", name = "netty-handler-proxy", versio
okhttp = { group = "com.squareup.okhttp3", name = "okhttp", version.ref = "okhttp" }
okhttp-coroutines = { group = "com.squareup.okhttp3", name = "okhttp-coroutines", version.ref = "okhttp" }
mcAuthlib = { group = "net.ccbluex", name = "mc-authlib", version.ref = "mc_authlib" }
mcef = { group = "com.github.CCBlueX", name = "mcef", version.ref = "mcef" }
# TODO(version/26.1): switch back to CCBlueX mcef
mcef = { group = "com.github.6x68", name = "mcef", version.ref = "mcef" }
httpServer = { group = "net.ccbluex", name = "netty-httpserver", version.ref = "httpServer" }
discordIpc = { group = "com.github.CCBlueX", name = "DiscordIPC", version.ref = "discordIpc" }
semver4j = { group = "com.vdurmont", name = "semver4j", version.ref = "semver4j" }
Expand Down Expand Up @@ -99,7 +100,7 @@ immediatelyFast = { group = "maven.modrinth", name = "ImmediatelyFast", version.
iris = { group = "maven.modrinth", name = "iris", version.ref = "iris" }

[plugins]
fabric-loom = { id = "fabric-loom", version.ref = "fabric-loom" }
fabric-loom = { id = "net.fabricmc.fabric-loom-remap", version.ref = "fabric-loom" }
kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }
gradleGitProperties = { id = "com.gorylenko.gradle-git-properties", version.ref = "gradleGitProperties" }
detekt = { id = "io.gitlab.arturbosch.detekt", version.ref = "detekt" }
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
import net.minecraft.world.item.ItemStack;
import net.minecraft.world.inventory.AbstractContainerMenu;
import net.minecraft.world.inventory.Slot;
import net.minecraft.world.inventory.ClickType;
import net.minecraft.world.inventory.ContainerInput;
import net.minecraft.util.Util;
import org.jetbrains.annotations.Nullable;
import org.lwjgl.glfw.GLFW;
Expand Down Expand Up @@ -62,7 +62,7 @@ public abstract class MixinAbstractContainerScreen<T extends AbstractContainerMe
private ItemStack lastQuickMoved;

@Shadow
protected abstract void slotClicked(Slot slot, int id, int button, ClickType actionType);
protected abstract void slotClicked(Slot slot, int id, int button, ContainerInput actionType);

@Shadow
private boolean skipNextRelease;
Expand All @@ -76,8 +76,8 @@ public abstract class MixinAbstractContainerScreen<T extends AbstractContainerMe
@Shadow
protected int topPos;

@Inject(method = "slotClicked(Lnet/minecraft/world/inventory/Slot;IILnet/minecraft/world/inventory/ClickType;)V", at = @At("HEAD"), cancellable = true)
private void cancelMouseClick(Slot slot, int slotId, int button, ClickType actionType, CallbackInfo ci) {
@Inject(method = "slotClicked(Lnet/minecraft/world/inventory/Slot;IILnet/minecraft/world/inventory/ContainerInput;)V", at = @At("HEAD"), cancellable = true)
private void cancelMouseClick(Slot slot, int slotId, int button, ContainerInput actionType, CallbackInfo ci) {
var inventoryMove = ModuleInventoryMove.INSTANCE;
if ((AbstractContainerScreen<?>) (Object) this instanceof InventoryScreen && inventoryMove.getRunning() && inventoryMove.getDoNotAllowClicking()) {
ci.cancel();
Expand Down
Loading
Loading