Skip to content

Commit 2977f9d

Browse files
loperdloperd
committed
Update to 3.0.1 version
- Add one more various publish data to all subscribed spigot servers without specify destination DeltaRedisApi#publish(). - Add suffix for bungee and spigot plugin.
1 parent 8bab145 commit 2977f9d

18 files changed

Lines changed: 68 additions & 94 deletions

‎pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
<groupId>com.gmail.tracebachi</groupId>
88
<artifactId>DeltaRedis</artifactId>
9-
<version>3.0.0</version>
9+
<version>3.0.1</version>
1010

1111
<name>DeltaRedis</name>
1212

@@ -90,7 +90,7 @@
9090
<plugin>
9191
<groupId>org.apache.maven.plugins</groupId>
9292
<artifactId>maven-shade-plugin</artifactId>
93-
<version>3.1.0</version>
93+
<version>3.2.3</version>
9494
<executions>
9595
<execution>
9696
<phase>package</phase>

‎src/main/java/com/gmail/tracebachi/DeltaRedis/Bungee/Commands/DebugCategoryCommand.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
*/
1717
package com.gmail.tracebachi.DeltaRedis.Bungee.Commands;
1818

19-
import com.gmail.tracebachi.DeltaRedis.Bungee.DeltaRedis;
19+
import com.gmail.tracebachi.DeltaRedis.Bungee.DeltaRedisBungee;
2020
import com.gmail.tracebachi.DeltaRedis.Bungee.Events.DebugCategoryChangeEvent;
2121
import com.gmail.tracebachi.DeltaRedis.Bungee.Events.DeltaRedisMessageEvent;
2222
import com.gmail.tracebachi.DeltaRedis.Shared.DeltaRedisChannels;
@@ -37,11 +37,11 @@
3737
* Created by Trace Bachi (tracebachi@gmail.com, BigBossZee) on 12/10/16.
3838
*/
3939
public class DebugCategoryCommand extends Command implements Listener, Registerable, Shutdownable {
40-
private DeltaRedis plugin;
40+
private DeltaRedisBungee plugin;
4141

42-
public DebugCategoryCommand(DeltaRedis deltaRedis) {
42+
public DebugCategoryCommand(DeltaRedisBungee plugin) {
4343
super("setdebugbungee");
44-
this.plugin = deltaRedis;
44+
this.plugin = plugin;
4545
}
4646

4747
@Override

‎src/main/java/com/gmail/tracebachi/DeltaRedis/Bungee/Commands/RunCmdCommand.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
*/
1717
package com.gmail.tracebachi.DeltaRedis.Bungee.Commands;
1818

19-
import com.gmail.tracebachi.DeltaRedis.Bungee.DeltaRedis;
19+
import com.gmail.tracebachi.DeltaRedis.Bungee.DeltaRedisBungee;
2020
import com.gmail.tracebachi.DeltaRedis.Bungee.DeltaRedisApi;
2121
import com.gmail.tracebachi.DeltaRedis.Bungee.Events.DeltaRedisMessageEvent;
2222
import com.gmail.tracebachi.DeltaRedis.Shared.DeltaRedisChannels;
@@ -43,11 +43,11 @@
4343
* Created by Trace Bachi (tracebachi@gmail.com, BigBossZee) on 4/28/16.
4444
*/
4545
public class RunCmdCommand extends Command implements Listener, Registerable, Shutdownable {
46-
private DeltaRedis plugin;
46+
private DeltaRedisBungee plugin;
4747

48-
public RunCmdCommand(DeltaRedis deltaRedis) {
48+
public RunCmdCommand(DeltaRedisBungee plugin) {
4949
super("runcmdbungee", null, "rcbungee");
50-
this.plugin = deltaRedis;
50+
this.plugin = plugin;
5151
}
5252

5353
@Override
@@ -140,7 +140,7 @@ public void onDeltaRedisMessage(DeltaRedisMessageEvent event) {
140140
}
141141

142142
private String joinArgsForCommand(String[] args) {
143-
return String.join(" ", (CharSequence[]) Arrays.copyOfRange(args, 1, args.length));
143+
return String.join(" ", Arrays.copyOfRange(args, 1, args.length));
144144
}
145145

146146
private boolean doesSetContain(Set<String> set, String source) {

‎src/main/java/com/gmail/tracebachi/DeltaRedis/Bungee/DeltaRedisApi.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ public class DeltaRedisApi {
3636
private static DeltaRedisApi instance;
3737

3838
private DeltaRedisCommandSender deltaSender;
39-
private DeltaRedis plugin;
39+
private DeltaRedisBungee plugin;
4040

4141
/**
4242
* @return Singleton instance of DeltaRedisApi
@@ -231,15 +231,15 @@ public void sendServerAnnouncement(String destServer, String announcement, Strin
231231
/**
232232
* Private constructor
233233
*/
234-
private DeltaRedisApi(DeltaRedisCommandSender deltaSender, DeltaRedis plugin) {
234+
private DeltaRedisApi(DeltaRedisCommandSender deltaSender, DeltaRedisBungee plugin) {
235235
this.deltaSender = deltaSender;
236236
this.plugin = plugin;
237237
}
238238

239239
/**
240240
* Sets up the api instance
241241
*/
242-
static void setup(DeltaRedisCommandSender deltaSender, DeltaRedis plugin) {
242+
static void setup(DeltaRedisCommandSender deltaSender, DeltaRedisBungee plugin) {
243243
if (instance != null) {
244244
shutdown();
245245
}

src/main/java/com/gmail/tracebachi/DeltaRedis/Bungee/DeltaRedis.java renamed to src/main/java/com/gmail/tracebachi/DeltaRedis/Bungee/DeltaRedisBungee.java

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151
/**
5252
* Created by Trace Bachi (tracebachi@gmail.com) on 10/18/15.
5353
*/
54-
public class DeltaRedis extends Plugin implements DeltaRedisInterface {
54+
public class DeltaRedisBungee extends Plugin implements DeltaRedisInterface {
5555
private boolean debugEnabled;
5656
private String bungeeName;
5757
private DeltaRedisCommandSender commandSender;
@@ -70,7 +70,7 @@ public void onEnable() {
7070
info("-----------------------------------------------------------------");
7171
info("[IMPORTANT] Please verify that all Spigot servers are configured");
7272
info("[IMPORTANT] with their correct cased name. For example: ");
73-
info("[IMPORTANT] \'World\' is not the same as \'world\'");
73+
info("[IMPORTANT] 'World' is not the same as 'world'");
7474
for (Map.Entry<String, ServerInfo> entry : getProxy().getServers().entrySet()) {
7575
info("[IMPORTANT] Case-sensitive server name: " + entry.getValue().getName());
7676
}
@@ -237,7 +237,7 @@ private void readConfig(Configuration configuration) {
237237
if (value != null) {
238238
String translatedFormat = ChatColor
239239
.translateAlternateColorCodes('&', value);
240-
ChatMessageHelper.instance().updateFormat("DeltaRedis." + key, translatedFormat);
240+
ChatMessageHelper.instance().updateFormat("DeltaRedisBungee." + key, translatedFormat);
241241
}
242242
}
243243
}
@@ -258,14 +258,13 @@ private String getRedisUri(Configuration config) {
258258
}
259259

260260
private void setupRedis(Configuration configuration) {
261-
resources = new DefaultClientResources
262-
.Builder()
261+
resources = DefaultClientResources.builder()
263262
.ioThreadPoolSize(3)
264263
.computationThreadPoolSize(3)
265264
.build();
266265

267266
client = RedisClient.create(resources, RedisURI.create(getRedisUri(configuration)));
268-
client.setOptions(new ClientOptions.Builder().autoReconnect(true).build());
267+
client.setOptions(ClientOptions.builder().autoReconnect(true).build());
269268

270269
pubSubConn = client.connectPubSub();
271270
commandConn = client.connect();

‎src/main/java/com/gmail/tracebachi/DeltaRedis/Bungee/Listeners/ProxiedPlayerListener.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
*/
1717
package com.gmail.tracebachi.DeltaRedis.Bungee.Listeners;
1818

19-
import com.gmail.tracebachi.DeltaRedis.Bungee.DeltaRedis;
19+
import com.gmail.tracebachi.DeltaRedis.Bungee.DeltaRedisBungee;
2020
import com.gmail.tracebachi.DeltaRedis.Shared.Interfaces.Registerable;
2121
import com.gmail.tracebachi.DeltaRedis.Shared.Interfaces.Shutdownable;
2222
import com.gmail.tracebachi.DeltaRedis.Shared.Redis.DeltaRedisCommandSender;
@@ -36,9 +36,9 @@
3636
public class ProxiedPlayerListener implements Listener, Registerable, Shutdownable {
3737
private final HashSet<String> onlinePlayers = new HashSet<>(64);
3838
private DeltaRedisCommandSender commandSender;
39-
private DeltaRedis plugin;
39+
private DeltaRedisBungee plugin;
4040

41-
public ProxiedPlayerListener(DeltaRedisCommandSender commandSender, DeltaRedis plugin) {
41+
public ProxiedPlayerListener(DeltaRedisCommandSender commandSender, DeltaRedisBungee plugin) {
4242
this.commandSender = commandSender;
4343
this.plugin = plugin;
4444
}

‎src/main/java/com/gmail/tracebachi/DeltaRedis/Shared/Redis/DeltaRedisCommandSender.java‎

Lines changed: 7 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -148,44 +148,32 @@ public Set<CachedPlayer> getCachedPlayers() {
148148
* @param messageParts String message parts to send
149149
* @return The number of servers that received the message
150150
*/
151+
// TODO: remove this method, use only (List<String> messageParts)
151152
public synchronized long publish(String dest, String channel, String... messageParts) {
152153
return publish(dest, channel, Arrays.asList(messageParts));
153154
}
154155

155156
/**
156157
* Publishes a string message using Redis PubSub
157-
* <p>See {@link Servers} for special destination values.</p>
158158
*
159-
* @param dest Server name that message should go to
160159
* @param channel Custom channel name for the message
161160
* @param messageParts String message parts to send
162161
* @return The number of servers that received the message
163162
*/
164-
public synchronized long publish(@NonNull String dest, @NonNull String channel, @NonNull List<String> messageParts) {
165-
plugin.debug("DeltaRedisCommandSender.publish()");
166-
167-
List<String> updatedList = new ArrayList<>(messageParts.size() + 2);
168-
updatedList.add(serverName);
169-
updatedList.add(channel);
170-
171-
// Add the rest of the message parts
172-
// Why: {dest, channel, {escaped parts}} vs. {dest, channel, part1, part2, ...}
173-
updatedList.addAll(messageParts);
174-
175-
String escaped = EscapeAndDelimiterUtil.DELTA_SEPARATED.escapeAndDelimit(updatedList);
176-
177-
plugin.debug("Sending message: " + escaped);
178-
return connection.sync().publish(bungeeName + ':' + dest, escaped);
163+
public synchronized long publish(@NonNull String channel, @NonNull List<String> messageParts) {
164+
return publish(Servers.SPIGOT, channel, messageParts);
179165
}
180166

181167
/**
182168
* Publishes a string message using Redis PubSub
169+
* <p>See {@link Servers} for special destination values.</p>
183170
*
171+
* @param dest Server name that message should go to
184172
* @param channel Custom channel name for the message
185173
* @param messageParts String message parts to send
186174
* @return The number of servers that received the message
187175
*/
188-
public synchronized long publish(@NonNull String channel, @NonNull List<String> messageParts) {
176+
public synchronized long publish(@NonNull String dest, @NonNull String channel, @NonNull List<String> messageParts) {
189177
plugin.debug("DeltaRedisCommandSender.publish()");
190178

191179
List<String> updatedList = new ArrayList<>(messageParts.size() + 2);
@@ -199,7 +187,7 @@ public synchronized long publish(@NonNull String channel, @NonNull List<String>
199187
String escaped = EscapeAndDelimiterUtil.DELTA_SEPARATED.escapeAndDelimit(updatedList);
200188

201189
plugin.debug("Sending message: " + escaped);
202-
return connection.sync().publish(bungeeName + ":*", escaped);
190+
return connection.sync().publish(bungeeName + ':' + dest, escaped);
203191
}
204192

205193
/**

‎src/main/java/com/gmail/tracebachi/DeltaRedis/Spigot/Commands/DebugCategoryCommand.java‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,10 @@
2020
import com.gmail.tracebachi.DeltaRedis.Shared.Interfaces.Registerable;
2121
import com.gmail.tracebachi.DeltaRedis.Shared.Interfaces.Shutdownable;
2222
import com.gmail.tracebachi.DeltaRedis.Shared.Servers;
23-
import com.gmail.tracebachi.DeltaRedis.Spigot.DeltaRedis;
23+
import com.gmail.tracebachi.DeltaRedis.Spigot.DeltaRedisSpigot;
2424
import com.gmail.tracebachi.DeltaRedis.Spigot.DeltaRedisApi;
2525
import com.gmail.tracebachi.DeltaRedis.Spigot.Events.DebugCategoryChangeEvent;
26+
import lombok.NonNull;
2627
import org.bukkit.command.Command;
2728
import org.bukkit.command.CommandExecutor;
2829
import org.bukkit.command.CommandSender;
@@ -38,9 +39,9 @@
3839
* Created by Trace Bachi (tracebachi@gmail.com, BigBossZee) on 11/28/15.
3940
*/
4041
public class DebugCategoryCommand implements CommandExecutor, Listener, Registerable, Shutdownable {
41-
private DeltaRedis plugin;
42+
private DeltaRedisSpigot plugin;
4243

43-
public DebugCategoryCommand(DeltaRedis plugin) {
44+
public DebugCategoryCommand(DeltaRedisSpigot plugin) {
4445
this.plugin = plugin;
4546
}
4647

‎src/main/java/com/gmail/tracebachi/DeltaRedis/Spigot/Commands/IsOnlineCommand.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818

1919
import com.gmail.tracebachi.DeltaRedis.Shared.Interfaces.Registerable;
2020
import com.gmail.tracebachi.DeltaRedis.Shared.Interfaces.Shutdownable;
21-
import com.gmail.tracebachi.DeltaRedis.Spigot.DeltaRedis;
21+
import com.gmail.tracebachi.DeltaRedis.Spigot.DeltaRedisSpigot;
2222
import com.gmail.tracebachi.DeltaRedis.Spigot.DeltaRedisApi;
2323
import org.bukkit.Bukkit;
2424
import org.bukkit.command.Command;
@@ -32,9 +32,9 @@
3232
* Created by Trace Bachi (tracebachi@gmail.com, BigBossZee) on 11/28/15.
3333
*/
3434
public class IsOnlineCommand implements CommandExecutor, Registerable, Shutdownable {
35-
private DeltaRedis plugin;
35+
private DeltaRedisSpigot plugin;
3636

37-
public IsOnlineCommand(DeltaRedis plugin) {
37+
public IsOnlineCommand(DeltaRedisSpigot plugin) {
3838
this.plugin = plugin;
3939
}
4040

‎src/main/java/com/gmail/tracebachi/DeltaRedis/Spigot/Commands/RunCmdCommand.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
import com.gmail.tracebachi.DeltaRedis.Shared.Interfaces.Registerable;
2121
import com.gmail.tracebachi.DeltaRedis.Shared.Interfaces.Shutdownable;
2222
import com.gmail.tracebachi.DeltaRedis.Shared.Servers;
23-
import com.gmail.tracebachi.DeltaRedis.Spigot.DeltaRedis;
23+
import com.gmail.tracebachi.DeltaRedis.Spigot.DeltaRedisSpigot;
2424
import com.gmail.tracebachi.DeltaRedis.Spigot.DeltaRedisApi;
2525
import com.gmail.tracebachi.DeltaRedis.Spigot.Events.DeltaRedisMessageEvent;
2626
import org.bukkit.Bukkit;
@@ -42,9 +42,9 @@
4242
* Created by Trace Bachi (tracebachi@gmail.com, BigBossZee) on 11/28/15.
4343
*/
4444
public class RunCmdCommand implements CommandExecutor, Listener, Registerable, Shutdownable {
45-
private DeltaRedis plugin;
45+
private DeltaRedisSpigot plugin;
4646

47-
public RunCmdCommand(DeltaRedis plugin) {
47+
public RunCmdCommand(DeltaRedisSpigot plugin) {
4848
this.plugin = plugin;
4949
}
5050

0 commit comments

Comments
 (0)