Skip to content

Commit 286b587

Browse files
fajzu1fajzu1
authored
Merge pull request #41 from fajzu1/sync-fixes
Synchronization fixes
2 parents 34820e1 + a22be8b commit 286b587

File tree

264 files changed

+1700
-2007
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

264 files changed

+1700
-2007
lines changed

‎bridge/dependency-reduced-pom.xml‎

Lines changed: 0 additions & 75 deletions
This file was deleted.

‎bridge/pom.xml‎

Lines changed: 29 additions & 68 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,13 @@
44
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
55
<modelVersion>4.0.0</modelVersion>
66

7-
<groupId>net.lightcode</groupId>
7+
<parent>
8+
<groupId>io.github.fajzu</groupId>
9+
<artifactId>sectors-project</artifactId>
10+
<version>1.0-SNAPSHOT</version>
11+
<relativePath>../pom.xml</relativePath>
12+
</parent>
13+
814
<artifactId>bridge</artifactId>
915
<version>1.0-SNAPSHOT</version>
1016
<packaging>jar</packaging>
@@ -16,87 +22,42 @@
1622
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
1723
</properties>
1824

19-
<build>
20-
<plugins>
21-
<plugin>
22-
<groupId>org.apache.maven.plugins</groupId>
23-
<artifactId>maven-shade-plugin</artifactId>
24-
<version>3.6.1</version>
25-
<executions>
26-
<execution>
27-
<goals>
28-
<goal>shade</goal>
29-
</goals>
30-
<phase>package</phase>
31-
</execution>
32-
</executions>
33-
<configuration>
34-
<relocations>
35-
<relocation>
36-
<pattern>io.netty</pattern>
37-
<shadedPattern>net.lightcode.libraries.io.netty</shadedPattern>
38-
</relocation>
39-
</relocations>
40-
</configuration>
41-
</plugin>
42-
<plugin>
43-
<artifactId>maven-compiler-plugin</artifactId>
44-
<configuration>
45-
<source>11</source>
46-
<target>11</target>
47-
</configuration>
48-
<groupId>org.apache.maven.plugins</groupId>
49-
<version>3.14.0</version>
50-
</plugin>
51-
</plugins>
52-
<resources>
53-
<resource>
54-
<directory>src/main/resources</directory>
55-
<filtering>true</filtering>
56-
</resource>
57-
</resources>
58-
</build>
59-
60-
<repositories>
61-
<repository>
62-
<id>papermc-repo</id>
63-
<url>https://repo.papermc.io/repository/maven-public/</url>
64-
</repository>
65-
<repository>
66-
<id>sonatype-repo</id>
67-
<url>https://oss.sonatype.org/content/repositories/releases/</url>
68-
</repository>
69-
</repositories>
70-
7125
<dependencies>
7226
<dependency>
73-
<groupId>net.lightcode</groupId>
27+
<groupId>io.github.fajzu</groupId>
7428
<artifactId>common</artifactId>
75-
<version>1.0-SNAPSHOT</version>
7629
<scope>compile</scope>
7730
</dependency>
31+
7832
<dependency>
7933
<groupId>com.velocitypowered</groupId>
8034
<artifactId>velocity-api</artifactId>
81-
<version>3.4.0-SNAPSHOT</version>
82-
<scope>provided</scope>
83-
</dependency>
84-
<dependency>
85-
<groupId>net.kyori</groupId>
86-
<artifactId>adventure-text-serializer-legacy</artifactId>
87-
<version>4.24.0</version>
8835
<scope>provided</scope>
8936
</dependency>
37+
9038
<dependency>
91-
<groupId>net.kyori</groupId>
92-
<artifactId>adventure-text-serializer-legacy-text3</artifactId>
93-
<version>4.4.1</version>
39+
<groupId>com.fasterxml.jackson.core</groupId>
40+
<artifactId>jackson-databind</artifactId>
41+
<scope>compile</scope>
9442
</dependency>
9543
<dependency>
96-
<groupId>org.testng</groupId>
97-
<artifactId>testng</artifactId>
98-
<version>RELEASE</version>
44+
<groupId>com.fasterxml.jackson.core</groupId>
45+
<artifactId>jackson-core</artifactId>
9946
<scope>compile</scope>
10047
</dependency>
10148
</dependencies>
49+
50+
<build>
51+
<finalName>openSectors-bridge</finalName>
52+
<plugins>
53+
<plugin>
54+
<groupId>org.apache.maven.plugins</groupId>
55+
<artifactId>maven-compiler-plugin</artifactId>
56+
</plugin>
57+
<plugin>
58+
<groupId>org.apache.maven.plugins</groupId>
59+
<artifactId>maven-shade-plugin</artifactId>
60+
</plugin>
61+
</plugins>
62+
</build>
10263
</project>

bridge/src/main/java/net/lightcode/bridge/BridgeLogger.java renamed to bridge/src/main/java/io/github/fajzu/sectors/bridge/BridgeLogger.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package net.lightcode.bridge;
1+
package io.github.fajzu.sectors.bridge;
22

33
import org.slf4j.Logger;
44

bridge/src/main/java/net/lightcode/bridge/BridgePlugin.java renamed to bridge/src/main/java/io/github/fajzu/sectors/bridge/BridgePlugin.java

Lines changed: 17 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
1-
package net.lightcode.bridge;
1+
package io.github.fajzu.sectors.bridge;
22

33
import com.google.inject.Inject;
44
import com.velocitypowered.api.event.Subscribe;
55
import com.velocitypowered.api.event.proxy.ProxyInitializeEvent;
66
import com.velocitypowered.api.plugin.Plugin;
77
import com.velocitypowered.api.proxy.ProxyServer;
8-
import net.lightcode.NetworkService;
9-
import net.lightcode.bridge.listener.PlayerServerConnectListener;
10-
import net.lightcode.bridge.listener.redis.PacketPlayerConnectSectorListener;
11-
import net.lightcode.bridge.listener.redis.PacketSectorConfigurationRequestListener;
12-
import net.lightcode.configuration.impl.DatabaseConfiguration;
13-
import net.lightcode.configuration.impl.ProxyConfiguration;
14-
import net.lightcode.configuration.service.ConfigurationService;
15-
import net.lightcode.sector.Sector;
16-
import net.lightcode.sector.service.SectorService;
17-
import net.lightcode.updater.UpdaterService;
8+
import io.github.fajzu.common.network.NetworkService;
9+
import io.github.fajzu.sectors.bridge.listener.PlayerServerConnectListener;
10+
import io.github.fajzu.sectors.bridge.listener.redis.PacketPlayerConnectSectorListener;
11+
import io.github.fajzu.sectors.bridge.listener.redis.PacketSectorConfigurationRequestListener;
12+
import io.github.fajzu.common.configuration.impl.DatabaseConfiguration;
13+
import io.github.fajzu.common.configuration.impl.ProxyConfiguration;
14+
import io.github.fajzu.common.configuration.service.ConfigurationService;
15+
import io.github.fajzu.common.sector.Sector;
16+
import io.github.fajzu.common.sector.service.SectorService;
17+
import io.github.fajzu.common.updater.UpdaterService;
1818
import org.slf4j.Logger;
1919

2020
import java.util.List;
@@ -23,7 +23,7 @@
2323
@Plugin(
2424
id = "opensectors-bridge",
2525
name = "opensectors-bridge",
26-
version = "3.0",
26+
version = "3.7",
2727
authors = "fajzu"
2828
)
2929
public class BridgePlugin {
@@ -72,8 +72,7 @@ public void onProxyInitialization(ProxyInitializeEvent event) {
7272
this.sectorService.create(id, new Sector(sectorWrapper.name(), sectorWrapper.sectorType(), sectorWrapper.minX(), sectorWrapper.maxX(), sectorWrapper.minZ(), sectorWrapper.maxZ()));
7373
});
7474

75-
this.networkService = new NetworkService(databaseConfiguration.redisHost(), databaseConfiguration.redisPort(), databaseConfiguration.redisPassword());
76-
this.networkService.setPacketSender("bridge");
75+
this.networkService = new NetworkService(databaseConfiguration.redisHost(), databaseConfiguration.redisPort(), databaseConfiguration.redisPassword(), "bridge");
7776
this.logger.log("Initialized with Redis");
7877

7978
this.networkService.subscribe("bridge", new PacketSectorConfigurationRequestListener(this.sectorService, this.networkService, this.logger));
@@ -82,18 +81,18 @@ public void onProxyInitialization(ProxyInitializeEvent event) {
8281
this.server.getEventManager().register(this, new PlayerServerConnectListener(this));
8382
this.logger.log("Bridge listeners registered");
8483

85-
this.checkForUpdates();
84+
this.checkForUpdates("3.7");
8685

8786
this.logger.log("Bridge initialization complete!");
8887
}
8988

90-
private void checkForUpdates() {
91-
UpdaterService updaterService = new UpdaterService("3.6.1", java.util.logging.Logger.getAnonymousLogger());
89+
private void checkForUpdates(String currentVersion) {
90+
UpdaterService updaterService = new UpdaterService(currentVersion, java.util.logging.Logger.getAnonymousLogger());
9291

9392
updaterService.check(newestVersion -> this.logger.warning(List.of(
9493
"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~",
9594
"⚠️ A new version of OpenSectors! ⚠️",
96-
"Current version: 3.6.1",
95+
"Current version: " + currentVersion,
9796
"Available version: " + newestVersion,
9897
"",
9998
"Download at: https://github.com/fajzu1/OpenSectors",

bridge/src/main/java/net/lightcode/bridge/listener/PlayerServerConnectListener.java renamed to bridge/src/main/java/io/github/fajzu/sectors/bridge/listener/PlayerServerConnectListener.java

Lines changed: 5 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,10 @@
1-
package net.lightcode.bridge.listener;
1+
package io.github.fajzu.sectors.bridge.listener;
22

33
import com.velocitypowered.api.event.Subscribe;
4-
import com.velocitypowered.api.event.connection.PostLoginEvent;
5-
import com.velocitypowered.api.event.connection.PreLoginEvent;
64
import com.velocitypowered.api.event.player.ServerPreConnectEvent;
75
import com.velocitypowered.api.proxy.Player;
86
import net.kyori.adventure.text.Component;
9-
import net.lightcode.bridge.BridgePlugin;
10-
import net.lightcode.sector.Sector;
11-
import net.lightcode.sector.type.SectorType;
12-
13-
import java.util.UUID;
7+
import io.github.fajzu.sectors.bridge.BridgePlugin;
148

159
public class PlayerServerConnectListener {
1610

@@ -28,22 +22,13 @@ public void onServerPreConnect(ServerPreConnectEvent event) {
2822
.sync()
2923
.get(player.getUniqueId().toString());
3024

31-
Sector sector = this.plugin.sectorService().find(SectorType.SPAWN);
32-
33-
if (lastSector != null) {
34-
Sector foundSector = this.plugin.sectorService().find(lastSector);
35-
36-
if (foundSector != null) {
37-
sector = foundSector;
38-
}
39-
40-
}
25+
if (lastSector == null) return;
4126

4227
this.plugin.networkService().databaseConnection()
4328
.sync()
44-
.set(player.getUniqueId().toString(), sector.id());
29+
.set(player.getUniqueId().toString(), lastSector);
4530

46-
this.plugin.server().getServer(sector.id()).ifPresentOrElse(server -> event.setResult(ServerPreConnectEvent.ServerResult.allowed(server)),
31+
this.plugin.server().getServer(lastSector).ifPresentOrElse(server -> event.setResult(ServerPreConnectEvent.ServerResult.allowed(server)),
4732
() -> {
4833
player.disconnect(Component.text("Brak dostępnych serwerów."));
4934
event.setResult(ServerPreConnectEvent.ServerResult.denied());

bridge/src/main/java/net/lightcode/bridge/listener/redis/PacketPlayerConnectSectorListener.java renamed to bridge/src/main/java/io/github/fajzu/sectors/bridge/listener/redis/PacketPlayerConnectSectorListener.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
package net.lightcode.bridge.listener.redis;
1+
package io.github.fajzu.sectors.bridge.listener.redis;
22

33
import com.velocitypowered.api.proxy.Player;
44
import com.velocitypowered.api.proxy.server.RegisteredServer;
5-
import net.lightcode.bridge.BridgePlugin;
6-
import net.lightcode.packet.impl.PlayerConnectSectorPacket;
7-
import net.lightcode.redis.PacketListener;
5+
import io.github.fajzu.sectors.bridge.BridgePlugin;
6+
import io.github.fajzu.common.network.packet.impl.PlayerConnectSectorPacket;
7+
import io.github.fajzu.common.network.packet.PacketListener;
88

99
import java.util.Optional;
1010

bridge/src/main/java/net/lightcode/bridge/listener/redis/PacketSectorConfigurationRequestListener.java renamed to bridge/src/main/java/io/github/fajzu/sectors/bridge/listener/redis/PacketSectorConfigurationRequestListener.java

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
package net.lightcode.bridge.listener.redis;
2-
3-
import net.lightcode.NetworkService;
4-
import net.lightcode.bridge.BridgeLogger;
5-
import net.lightcode.packet.impl.SectorConfigurationRequestPacket;
6-
import net.lightcode.packet.impl.SectorConfigurationResponsePacket;
7-
import net.lightcode.redis.PacketListener;
8-
import net.lightcode.sector.Sector;
9-
import net.lightcode.sector.service.SectorService;
1+
package io.github.fajzu.sectors.bridge.listener.redis;
2+
3+
import io.github.fajzu.common.network.NetworkService;
4+
import io.github.fajzu.sectors.bridge.BridgeLogger;
5+
import io.github.fajzu.common.network.packet.impl.SectorConfigurationRequestPacket;
6+
import io.github.fajzu.common.network.packet.impl.SectorConfigurationResponsePacket;
7+
import io.github.fajzu.common.network.packet.PacketListener;
8+
import io.github.fajzu.common.sector.Sector;
9+
import io.github.fajzu.common.sector.service.SectorService;
1010

1111
public class PacketSectorConfigurationRequestListener extends PacketListener<SectorConfigurationRequestPacket> {
1212

0 commit comments

Comments
 (0)