Now using pastebin4j

Author: jamezrin

README.md

@@ -16,7 +16,7 @@
 - [ ] Make the feature `marker-descs` work per section
 - [ ] Unify the code that loads server into a section (duplicated at SectionManager and ServerSection) 
 - [ ] Unify some of the code used in the FallbackCommand and SectionCommand
-- [ ] Use https://github.com/kennedyoliveira/pastebin4j instead of jpaste
+- [x] Use https://github.com/kennedyoliveira/pastebin4j instead of jpaste
 - [ ] (!) Make the section initialization work in stages instead of being hardcoded
 - [ ] (!) Ditch the faucet dependency and use [ConfigMe](https://github.com/AuthMe/ConfigMe) and [DependencyInjector](https://github.com/ljacqu/DependencyInjector) instead
 - [ ] Use a separate file for configuring the sections, must be done alongside the previous item

pom.xml

@@ -4,9 +4,9 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
-    <groupId>me.jaimemartz</groupId>
-    <artifactId>lobbybalancer</artifactId>
-    <version>2.0.9.9</version>
+    <groupId>com.jaimemartz</groupId>
+    <artifactId>playerbalancer</artifactId>
+    <version>2.1</version>
     <name>LobbyBalancer</name>
 
     <properties>
@@ -32,7 +32,7 @@
         </repository>
         <repository>
             <id>bstats-repo</id>
-            <url>https://repo.bstats.org/content/groups/public/</url>
+            <url>http://repo.bstats.org/content/repositories/releases/</url>
         </repository>
     </repositories>
     <build>
@@ -96,6 +96,18 @@
             <version>1.0.1</version>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>ch.jalu</groupId>
+            <artifactId>configme</artifactId>
+            <version>0.4</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.github.kennedyoliveira</groupId>
+            <artifactId>pastebin4j</artifactId>
+            <version>1.2.0</version>
+            <scope>compile</scope>
+        </dependency>
         <dependency>
             <groupId>me.jaimemartz</groupId>
             <artifactId>faucet-bungee</artifactId>

src/main/java/me/jaimemartz/lobbybalancer/LobbyBalancer.java

@@ -16,7 +16,8 @@
 import net.md_5.bungee.api.plugin.Listener;
 import net.md_5.bungee.api.plugin.Plugin;
 import net.md_5.bungee.config.Configuration;
-import org.bstats.Metrics;
+import org.bstats.bungeecord.Metrics;
+import org.bstats.bungeecord.Metrics.SingleLineChart;
 import org.inventivetalent.update.bungee.BungeeUpdater;
 
 import java.io.IOException;
@@ -48,7 +49,7 @@ public void onEnable() {
 
         //Metrics (https://bstats.org/)
         Metrics metrics = new Metrics(this);
-        metrics.addCustomChart(new Metrics.SingleLineChart("configured_sections", () -> sectionManager.getSections().size()));
+        metrics.addCustomChart(new SingleLineChart("configured_sections", () -> sectionManager.getSections().size()));
     }
 
     private void enable() {
@@ -60,7 +61,7 @@ private void enable() {
         String text = ConfigEntries.CONFIG_VERSION.get();
         int configVersion = DigitUtils.getDigits(text, 8);
         if (configVersion < LAST_VER_CONFIG_UPDATE) {
-            failed = true;
+            this.failed = true;
             throw new IllegalStateException("Your config is outdated, please reset it and configure it again");
         }
 

src/main/java/me/jaimemartz/lobbybalancer/commands/MainCommand.java

@@ -7,12 +7,25 @@
 import net.md_5.bungee.api.CommandSender;
 import net.md_5.bungee.api.plugin.Command;
 
+import javax.net.ssl.HttpsURLConnection;
+import java.io.BufferedReader;
+import java.io.DataOutputStream;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.net.MalformedURLException;
+import java.net.URL;
+
 public class MainCommand extends Command {
     private final LobbyBalancer plugin;
+    private final URL hastebin;
 
     public MainCommand(LobbyBalancer plugin) {
         super("balancer");
         this.plugin = plugin;
+
+        try {
+            this.hastebin = new URL("https://hastebin.com/documents");
+        } catch (MalformedURLException ignored) {}
     }
 
     @Override

src/main/java/me/jaimemartz/lobbybalancer/manager/PasteHelper.java

@@ -1,15 +1,12 @@
 package me.jaimemartz.lobbybalancer.manager;
 
+import com.github.kennedyoliveira.pastebin4j.*;
 import com.google.common.io.CharStreams;
 import me.jaimemartz.lobbybalancer.LobbyBalancer;
 import net.md_5.bungee.api.ChatColor;
 import net.md_5.bungee.api.CommandSender;
 import net.md_5.bungee.api.chat.ComponentBuilder;
 import net.md_5.bungee.api.scheduler.ScheduledTask;
-import org.jpaste.exceptions.PasteException;
-import org.jpaste.pastebin.PasteExpireDate;
-import org.jpaste.pastebin.PastebinLink;
-import org.jpaste.pastebin.PastebinPaste;
 
 import java.io.File;
 import java.io.FileInputStream;
@@ -25,21 +22,25 @@ public String paste(LobbyBalancer plugin) throws Exception {
                 return "File does not exist";
             }
 
-            PastebinPaste paste = new PastebinPaste();
-            paste.setPasteTitle("{name} ({version} on {bungee_version}) Configuration"
+            GuestPaste paste = new GuestPaste();
+            paste.setTitle("{name} ({version} on {bungee_version}) Configuration"
                     .replace("{name}", plugin.getDescription().getName())
                     .replace("{version}", plugin.getDescription().getVersion())
                     .replace("{bungee_version}", plugin.getProxy().getVersion())
             );
-            paste.setDeveloperKey(DEVELOPER_KEY);
-            paste.setPasteExpireDate(PasteExpireDate.ONE_MONTH);
-            paste.setVisibility(PastebinPaste.VISIBILITY_UNLISTED);
-            paste.setPasteFormat("yaml");
+
+            paste.setExpiration(PasteExpiration.ONE_MONTH);
+            paste.setVisibility(PasteVisibility.UNLISTED);
+            paste.setHighLight(PasteHighLight.YAML);
+
             try (FileInputStream stream = new FileInputStream(file)) {
-                paste.setContents(CharStreams.toString(new InputStreamReader(stream, "UTF-8")));
+                try (InputStreamReader reader = new InputStreamReader(stream, "UTF-8")) {
+                    String content = CharStreams.toString(reader);
+                    paste.setContent(content);
+                }
             }
-            PastebinLink link = paste.paste();
-            return link.getLink().toString();
+
+            return paste.paste(credentials);
         }
     },
     BUNGEE {
@@ -50,47 +51,47 @@ public String paste(LobbyBalancer plugin) throws Exception {
                 return "File does not exist";
             }
 
-            PastebinPaste paste = new PastebinPaste();
-            paste.setPasteTitle("{name} ({version}) Configuration"
+            GuestPaste paste = new GuestPaste();
+            paste.setTitle("{name} ({version}) Configuration"
                     .replace("{name}", plugin.getProxy().getName())
                     .replace("{version}", plugin.getProxy().getVersion())
             );
-            paste.setDeveloperKey(DEVELOPER_KEY);
-            paste.setPasteExpireDate(PasteExpireDate.ONE_MONTH);
-            paste.setVisibility(PastebinPaste.VISIBILITY_UNLISTED);
-            paste.setPasteFormat("yaml");
+
+            paste.setExpiration(PasteExpiration.ONE_MONTH);
+            paste.setVisibility(PasteVisibility.UNLISTED);
+            paste.setHighLight(PasteHighLight.YAML);
+
             try (FileInputStream stream = new FileInputStream(file)) {
-                paste.setContents(CharStreams.toString(new InputStreamReader(stream, "UTF-8")));
+                try (InputStreamReader reader = new InputStreamReader(stream, "UTF-8")) {
+                    String content = CharStreams.toString(reader);
+                    content = content.replaceAll("[0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}", "X.X.X.X");
+                    paste.setContent(content);
+                }
             }
-            PastebinLink link = paste.paste();
-            return link.getLink().toString();
+
+            return paste.paste(credentials);
         }
     };
 
-    public static final String DEVELOPER_KEY = "e3ff18d8fb001a3ece08ae0d7d4a87bd";
     private String link;
     private ScheduledTask task = null;
 
     public void send(LobbyBalancer plugin, CommandSender sender, String message) {
         try {
-            sender.sendMessage(new ComponentBuilder(message.replace("{link}", link == null ? link = paste(plugin) : link)
-            ).color(ChatColor.GREEN).create());
+            sender.sendMessage(new ComponentBuilder(message.replace("{link}", link == null ? link = paste(plugin) : link)).color(ChatColor.GREEN).create());
+
             if (task != null) {
                 plugin.getProxy().getScheduler().cancel(task);
             }
+
             task = plugin.getProxy().getScheduler().schedule(plugin, () -> link = null, 5, TimeUnit.MINUTES);
-        } catch (PasteException e) {
-            if (e.getMessage().equals("Failed to generate paste: Post limit, maximum pastes per 24h reached")) {
-                sender.sendMessage(new ComponentBuilder("The file could not be pasted, your ip has reached the 10 pastes per day limit").color(ChatColor.RED).create());
-            } else {
-                sender.sendMessage(new ComponentBuilder("An unexpected error occurred while pasting the file").color(ChatColor.RED).create());
-            }
-            e.printStackTrace();
         } catch (Exception e) {
             sender.sendMessage(new ComponentBuilder("An internal error occurred while attempting to perform this command").color(ChatColor.RED).create());
             e.printStackTrace();
         }
     }
 
     public abstract String paste(LobbyBalancer plugin) throws Exception;
+
+    private static final AccountCredentials credentials = new AccountCredentials("e3ff18d8fb001a3ece08ae0d7d4a87bd");
 }