Fix IJ removing unusaged imports in last commit

This commit is contained in:
William Blake Galbreath
2020-01-22 20:46:58 -06:00
parent 68f0dc02fe
commit e28b3d270f

View File

@@ -1,4 +1,4 @@
From 31e6c2d60a8fe1ea407efa510060c6923d5cbb89 Mon Sep 17 00:00:00 2001
From 4770ccccb1e91a7f8a541ed20b2685901413920f Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
Date: Wed, 22 Jan 2020 20:13:40 -0600
Subject: [PATCH] UPnP Port Forwarding Service
@@ -7,10 +7,10 @@ Subject: [PATCH] UPnP Port Forwarding Service
src/main/java/com/dosse/upnp/Gateway.java | 204 ++++++++++++++++++
.../java/com/dosse/upnp/GatewayFinder.java | 131 +++++++++++
src/main/java/com/dosse/upnp/UPnP.java | 154 +++++++++++++
.../net/minecraft/server/DedicatedServer.java | 35 ++-
.../net/minecraft/server/DedicatedServer.java | 24 +++
.../net/minecraft/server/MinecraftServer.java | 11 +
.../java/net/pl3x/purpur/PurpurConfig.java | 5 +
6 files changed, 530 insertions(+), 10 deletions(-)
6 files changed, 529 insertions(+)
create mode 100644 src/main/java/com/dosse/upnp/Gateway.java
create mode 100644 src/main/java/com/dosse/upnp/GatewayFinder.java
create mode 100644 src/main/java/com/dosse/upnp/UPnP.java
@@ -523,51 +523,10 @@ index 000000000..f61c949bf
+
+}
diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java
index 8b5f4cab0..f5e0f87db 100644
index 8b5f4cab0..05d26d350 100644
--- a/src/main/java/net/minecraft/server/DedicatedServer.java
+++ b/src/main/java/net/minecraft/server/DedicatedServer.java
@@ -1,27 +1,20 @@
package net.minecraft.server;
import com.google.common.base.Strings;
-import com.google.common.collect.Lists;
import com.google.gson.JsonObject;
import com.mojang.authlib.GameProfile;
import com.mojang.authlib.GameProfileRepository;
import com.mojang.authlib.minecraft.MinecraftSessionService;
import com.mojang.authlib.yggdrasil.YggdrasilAuthenticationService;
import com.mojang.datafixers.DataFixer;
-import java.io.BufferedReader;
+
import java.io.File;
import java.io.IOException;
-import java.io.InputStreamReader;
import java.net.InetAddress;
import java.net.Proxy;
-import java.nio.charset.StandardCharsets;
-import java.util.Collections;
-import java.util.List;
import java.util.Locale;
import java.util.Optional;
import java.util.Random;
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.ExecutionException;
import java.util.function.BooleanSupplier;
import java.util.regex.Pattern;
import javax.annotation.Nullable;
@@ -29,11 +22,9 @@ import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
// CraftBukkit start
-import java.io.PrintStream;
import org.apache.logging.log4j.Level;
import org.bukkit.command.CommandSender;
-import org.bukkit.craftbukkit.LoggerOutputStream;
import co.aikar.timings.MinecraftTimings; // Paper
import org.bukkit.event.server.ServerCommandEvent;
import org.bukkit.craftbukkit.util.Waitable;
@@ -231,6 +222,30 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
@@ -231,6 +231,30 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
return false;
}