Skip to content

Add CloudnetV4 support and maven depedency fix #600

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

Open
Phyrone wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Add CloudnetV4 support and maven depedency fix #600

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d19695a
fixed maven depedencies
Phyrone Jan 4, 2023
870566c
add CloudNet v4 support
Phyrone Jan 4, 2023
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
4 changes: 4 additions & 0 deletions bundle/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,10 @@
<pattern>org.bstats</pattern>
<shadedPattern>${project.groupId}.shaded.org.bstats</shadedPattern>
</relocation>
<relocation>
<pattern>com.google.common</pattern>
<shadedPattern>${project.groupId}.shaded.com.google.common</shadedPattern>
</relocation>
</relocations>
<transformers>
<transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/>
Expand Down
32 changes: 28 additions & 4 deletions bungee/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,16 +38,26 @@
<id>CodeMC</id>
<url>https://repo.codemc.org/repository/maven-public</url>
</repository>
<repository>
<id>jitpack.io</id>
<url>https://jitpack.io</url>
</repository>
</repositories>

<dependencies>
<dependency>
<groupId>net.md-5</groupId>
<artifactId>bungeecord-api</artifactId>
<version>1.12-SNAPSHOT</version>
<version>1.19-R0.1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>

<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>31.1-jre</version>
</dependency>

<!-- CloudNet v3-->
<dependency>
<groupId>de.dytanic.cloudnet</groupId>
Expand Down Expand Up @@ -77,17 +87,31 @@
<scope>provided</scope>
</dependency>

<!-- CloudNet V4 -->
<dependency>
<groupId>eu.cloudnetservice.cloudnet</groupId>
<artifactId>bridge</artifactId>
<version>4.0.0-RC5</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>eu.cloudnetservice.cloudnet</groupId>
<artifactId>driver</artifactId>
<version>4.0.0-RC5</version>
<scope>provided</scope>
</dependency>

<dependency>
<groupId>net.luckperms</groupId>
<artifactId>api</artifactId>
<version>5.2</version>
<version>5.4</version>
<scope>provided</scope>
</dependency>

<dependency>
<groupId>com.imaginarycode.minecraft</groupId>
<groupId>com.github.minecrafter</groupId>
<artifactId>RedisBungee</artifactId>
<version>0.3.6-SNAPSHOT</version>
<version>master-934e4543d6-1</version>
<scope>provided</scope>
</dependency>

Expand Down
16 changes: 13 additions & 3 deletions bungee/src/main/java/me/leoko/advancedban/bungee/cloud/CloudSupportHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,24 @@

import me.leoko.advancedban.bungee.cloud.support.CloudNetV2Support;
import me.leoko.advancedban.bungee.cloud.support.CloudNetV3Support;
import me.leoko.advancedban.bungee.cloud.support.CloudNetV4Support;
import net.md_5.bungee.api.ProxyServer;

public class CloudSupportHandler {

public static CloudSupport getCloudSystem(){
if (ProxyServer.getInstance().getPluginManager().getPlugin("CloudNet-Bridge") != null) {
return new CloudNetV3Support();
}
try {
if (ProxyServer.getInstance().getPluginManager().getPlugin("CloudNet-Bridge") != null) {
Class.forName("de.dytanic.cloudnet.driver.CloudNetDriver");
return new CloudNetV3Support();
}
} catch (ClassNotFoundException ignored) {}
try {
if (ProxyServer.getInstance().getPluginManager().getPlugin("CloudNet-Bridge") != null) {
Class.forName("eu.cloudnetservice.driver.CloudNetDriver");
return new CloudNetV4Support();
}
} catch (ClassNotFoundException ignored) {}
if (ProxyServer.getInstance().getPluginManager().getPlugin("CloudNetAPI") != null) {
return new CloudNetV2Support();
}
Expand Down
20 changes: 20 additions & 0 deletions bungee/src/main/java/me/leoko/advancedban/bungee/cloud/support/CloudNetV4Support.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
package me.leoko.advancedban.bungee.cloud.support;

import eu.cloudnetservice.driver.CloudNetDriver;
import eu.cloudnetservice.modules.bridge.player.PlayerManager;
import me.leoko.advancedban.bungee.cloud.CloudSupport;
import net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer;

import java.util.Objects;
import java.util.UUID;

public class CloudNetV4Support implements CloudSupport {
@Override
public void kick(UUID uniqueID, String reason) {
Objects.requireNonNull(CloudNetDriver.instance().serviceRegistry()
.firstProvider(PlayerManager.class)
.onlinePlayer(uniqueID),"player is null in CloudNetV4")
.playerExecutor()
.kick(LegacyComponentSerializer.legacySection().deserialize(reason));
}
}