Skip to content

Update velocity to 3.5.0-SNAPSHOT #759

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Draycia merged 1 commit into from
Mar 3, 2026
Merged

Update velocity to 3.5.0-SNAPSHOT #759

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ event = "1.0.0"
registry = "1.0.0-SNAPSHOT"
kyoriMoonshine = "2.0.4"
guice = "7.0.0"
velocityApi = "3.4.0-SNAPSHOT"
velocityApi = "3.5.0-SNAPSHOT"
minecraft = "1.21.11"
fabricLoader = "0.18.3"
fabricApi = "0.139.5+1.21.11"
Expand Down
2 changes: 1 addition & 1 deletion velocity/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ dependencies {
runtimeDownload(libs.mysql)

compileOnly("javax.inject:javax.inject:1")
implementation(libs.assistedInject)
}

velocityPluginJson {
Expand Down Expand Up @@ -55,7 +56,6 @@ tasks {
relocateCloud()
standardRuntimeRelocations()
relocateDependency("io.leangen.geantyref")
relocateGuice()
}
val prod = register<Zip>("productionJar") {
destinationDirectory.set(layout.buildDirectory.dir("libs"))
Expand Down
4 changes: 2 additions & 2 deletions velocity/src/main/java/net/draycia/carbon/velocity/CarbonVelocityBootstrap.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
package net.draycia.carbon.velocity;

import com.google.inject.Guice;
import com.google.inject.Inject;
import com.google.inject.Injector;
import com.velocitypowered.api.event.Subscribe;
import com.velocitypowered.api.event.proxy.ProxyInitializeEvent;
Expand All @@ -28,7 +29,6 @@
import com.velocitypowered.api.plugin.annotation.DataDirectory;
import com.velocitypowered.api.proxy.ProxyServer;
import java.nio.file.Path;
import javax.inject.Inject;
import net.draycia.carbon.common.config.ConfigManager;
import net.draycia.carbon.common.config.MessagingSettings;
import net.draycia.carbon.common.util.CarbonDependencies;
Expand All @@ -47,7 +47,7 @@ public final class CarbonVelocityBootstrap {
private final Metrics.Factory metricsFactory;
private final Inner inner;

@Inject // use javax.inject, so it doesn't get relocated - we use Guice 7 and Velocity uses Guice 6.
@Inject
public CarbonVelocityBootstrap(
final ProxyServer proxyServer,
final PluginContainer pluginContainer,
Expand Down