Skip to content

Commit 124ebae

Browse files
committed
Fixed the ConnectionIntent class and hastebin support
1 parent 25d7054 commit 124ebae

File tree

3 files changed

+20
-41
lines changed

3 files changed

+20
-41
lines changed

Main Plugin/src/main/java/com/jaimemartz/playerbalancer/connection/ConnectionIntent.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ public List<ServerInfo> getExclusions() {
3333
return exclusions;
3434
}
3535

36-
public boolean execute() {
36+
public void execute() {
3737
MessageUtils.send(player, plugin.getSettings().getMessagesProps().getConnectingMessage(),
3838
(str) -> str.replace("{section}", section.getName())
3939
.replace("{alias}", safeNull(section.getProps().getAlias()))
@@ -68,8 +68,6 @@ public boolean execute() {
6868
MessageUtils.send(player, plugin.getSettings().getMessagesProps().getFailureMessage());
6969
}
7070
}
71-
72-
return false;
7371
}
7472

7573
private ServerInfo fetchServer(ProxiedPlayer player, ServerSection section, ProviderType provider, List<ServerInfo> servers) {

Main Plugin/src/main/java/com/jaimemartz/playerbalancer/helper/PasteHelper.java

Lines changed: 4 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33
import com.google.common.io.CharStreams;
44
import com.jaimemartz.playerbalancer.PlayerBalancer;
5-
import com.jaimemartz.playerbalancer.utils.GuestPaste;
65
import com.jaimemartz.playerbalancer.utils.GuestPaste.PasteException;
6+
import com.jaimemartz.playerbalancer.utils.HastebinPaste;
77
import net.md_5.bungee.api.ChatColor;
88
import net.md_5.bungee.api.CommandSender;
99
import net.md_5.bungee.api.chat.ClickEvent;
@@ -34,18 +34,7 @@ public URL paste(PlayerBalancer plugin) throws Exception {
3434
try (FileInputStream stream = new FileInputStream(file)) {
3535
try (InputStreamReader reader = new InputStreamReader(stream, "UTF-8")) {
3636
String content = CharStreams.toString(reader);
37-
GuestPaste paste = new GuestPaste("e3ff18d8fb001a3ece08ae0d7d4a87bd", content);
38-
39-
paste.setName("{name} ({version} on {bungee_version})"
40-
.replace("{name}", plugin.getDescription().getName())
41-
.replace("{version}", plugin.getDescription().getVersion())
42-
.replace("{bungee_version}", plugin.getProxy().getVersion())
43-
);
44-
45-
paste.setExpiration(GuestPaste.Expiration.ONE_MONTH);
46-
paste.setExposure(GuestPaste.Exposure.UNLISTED);
47-
paste.setFormat("properties");
48-
37+
HastebinPaste paste = new HastebinPaste("https://file.properties/paste/", content);
4938
return paste.paste();
5039
}
5140
}
@@ -70,17 +59,7 @@ public URL paste(PlayerBalancer plugin) throws Exception {
7059
try (InputStreamReader reader = new InputStreamReader(stream, "UTF-8")) {
7160
String content = CharStreams.toString(reader);
7261
content = content.replaceAll("[0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}", "?.?.?.?");
73-
GuestPaste paste = new GuestPaste("e3ff18d8fb001a3ece08ae0d7d4a87bd", content);
74-
75-
paste.setName("{name} ({version})"
76-
.replace("{name}", plugin.getProxy().getName())
77-
.replace("{version}", plugin.getProxy().getVersion())
78-
);
79-
80-
paste.setExpiration(GuestPaste.Expiration.ONE_MONTH);
81-
paste.setExposure(GuestPaste.Exposure.UNLISTED);
82-
paste.setFormat("yaml");
83-
62+
HastebinPaste paste = new HastebinPaste("https://file.properties/paste/", content);
8463
return paste.paste();
8564
}
8665
}
@@ -100,20 +79,10 @@ public URL paste(PlayerBalancer plugin) throws Exception {
10079
}, false) {
10180
@Override
10281
public URL paste(PlayerBalancer plugin) throws Exception {
103-
GuestPaste paste = new GuestPaste("e3ff18d8fb001a3ece08ae0d7d4a87bd",
82+
HastebinPaste paste = new HastebinPaste("https://file.properties/paste/",
10483
plugin.getLogsBuilder().toString()
10584
);
10685

107-
paste.setName("{name} ({version} on {bungee_version})"
108-
.replace("{name}", plugin.getDescription().getName())
109-
.replace("{version}", plugin.getDescription().getVersion())
110-
.replace("{bungee_version}", plugin.getProxy().getVersion())
111-
);
112-
113-
paste.setExpiration(GuestPaste.Expiration.ONE_MONTH);
114-
paste.setExposure(GuestPaste.Exposure.UNLISTED);
115-
paste.setFormat("text");
116-
11786
return paste.paste();
11887
}
11988
};

Main Plugin/src/test/java/HastebinPasteTest.java

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,23 @@
33

44
public class HastebinPasteTest {
55
@Test
6-
public void test() throws Exception {
6+
public void test() {
77
HastebinPaste paste = new HastebinPaste("https://file.properties/paste/",
8-
"Lorem ipsum dolor sit amet, consectetur adipiscing elit. Sed iaculis, sapien et vehicula tristique, diam libero bibendum nunc, et rutrum nisl nulla quis diam. Cras ipsum enim, molestie eget bibendum nec, porta quis ex. Nunc ac sem lorem. Duis eget vestibulum libero. Phasellus vitae venenatis arcu, ac volutpat sem. Nunc porttitor lacus nulla, vitae dictum justo porta at. Aliquam erat volutpat. Vestibulum aliquet eget diam eget commodo. Integer facilisis ipsum sit amet sem pharetra ultrices. Nulla diam orci, posuere malesuada ante non, elementum vehicula libero."
8+
"Lorem ipsum dolor sit amet, consectetur adipiscing elit. Sed " +
9+
"iaculis, sapien et vehicula tristique, diam libero bibendum " +
10+
"nunc, et rutrum nisl nulla quis diam. Cras ipsum enim, molestie" +
11+
" eget bibendum nec, porta quis ex. Nunc ac sem lorem. Duis eget" +
12+
" vestibulum libero. Phasellus vitae venenatis arcu, ac volutpat " +
13+
"sem. Nunc porttitor lacus nulla, vitae dictum justo porta at. " +
14+
"Aliquam erat volutpat. Vestibulum aliquet eget diam eget commodo." +
15+
" Integer facilisis ipsum sit amet sem pharetra ultrices. Nulla diam" +
16+
" orci, posuere malesuada ante non, elementum vehicula libero."
917
);
1018

11-
System.out.println(paste.paste());
19+
try {
20+
System.out.println(paste.paste());
21+
} catch (Exception e) {
22+
e.printStackTrace();
23+
}
1224
}
1325
}

0 commit comments

Comments
 (0)