Drop 'Fix unicode characters in configuration files' patch

This commit is contained in:
kashike 2018-11-11 00:40:41 -08:00
parent c4351109e8
commit 12e53fcf76
36 changed files with 36 additions and 93 deletions

View File

@ -1,57 +0,0 @@
From 4944839d0056cf874ee7906bdc2e04451a7d0939 Mon Sep 17 00:00:00 2001
From: kamcio96 <k.nadworski@icloud.com>
Date: Sat, 21 May 2016 17:17:36 -0600
Subject: [PATCH] Fix unicode characters in configuration files
diff --git a/config/src/main/java/net/md_5/bungee/config/YamlConfiguration.java b/config/src/main/java/net/md_5/bungee/config/YamlConfiguration.java
index db8aa4be..9258d7dd 100644
--- a/config/src/main/java/net/md_5/bungee/config/YamlConfiguration.java
+++ b/config/src/main/java/net/md_5/bungee/config/YamlConfiguration.java
@@ -1,16 +1,25 @@
package net.md_5.bungee.config;
+import java.io.BufferedReader;
+import java.io.BufferedWriter;
import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
import java.io.FileReader;
import java.io.FileWriter;
import java.io.IOException;
import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.OutputStreamWriter;
import java.io.Reader;
import java.io.Writer;
import java.util.LinkedHashMap;
import java.util.Map;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
+
+import com.google.common.base.Charsets;
+
import org.yaml.snakeyaml.DumperOptions;
import org.yaml.snakeyaml.Yaml;
import org.yaml.snakeyaml.constructor.Constructor;
@@ -51,7 +60,7 @@ public class YamlConfiguration extends ConfigurationProvider
@Override
public void save(Configuration config, File file) throws IOException
{
- try ( FileWriter writer = new FileWriter( file ) )
+ try (Writer writer = new BufferedWriter(new OutputStreamWriter(new FileOutputStream(file), Charsets.UTF_8)))
{
save( config, writer );
}
@@ -72,7 +81,7 @@ public class YamlConfiguration extends ConfigurationProvider
@Override
public Configuration load(File file, Configuration defaults) throws IOException
{
- try ( FileReader reader = new FileReader( file ) )
+ try (Reader reader = new BufferedReader(new InputStreamReader(new FileInputStream(file), Charsets.UTF_8)))
{
return load( reader, defaults );
}
--
2.19.1

View File

@ -1,4 +1,4 @@
From b5478f00dae047628ec4875a6f06b59a9074365d Mon Sep 17 00:00:00 2001
From 42d1be8b5c8bafde6901734fe2c9f28f8f1dbb3f Mon Sep 17 00:00:00 2001
From: Techcable <Techcable@outlook.com>
Date: Mon, 14 Mar 2016 15:40:44 -0700
Subject: [PATCH] Optimize uuid conversions

View File

@ -1,4 +1,4 @@
From ce1779441154b3ee785a35b2e2e594eea34ebe9f Mon Sep 17 00:00:00 2001
From 7c47855a7b68728aae3816f8426f23855278b085 Mon Sep 17 00:00:00 2001
From: Daniel Naylor <git@drnaylor.co.uk>
Date: Tue, 25 Oct 2016 12:23:07 -0400
Subject: [PATCH] Add support for FML with IP Forwarding enabled

View File

@ -1,4 +1,4 @@
From fde78fb9ec9aab582987660d5bd520110e10304d Mon Sep 17 00:00:00 2001
From 48463923389da7dd2e299e068aae1418655671c4 Mon Sep 17 00:00:00 2001
From: Tux <write@imaginarycode.com>
Date: Thu, 19 May 2016 17:36:31 -0600
Subject: [PATCH] Better unit tests for Chat API

View File

@ -1,4 +1,4 @@
From 9a42e4967bbf370697c7ab0b91879f4af53f2dc8 Mon Sep 17 00:00:00 2001
From 3435da1bca9417548cfcdd346aa120695a1791d4 Mon Sep 17 00:00:00 2001
From: Techcable <Techcable@outlook.com>
Date: Thu, 28 Jan 2016 15:13:29 -0700
Subject: [PATCH] Allow removing servers or changing addresses on reload

View File

@ -1,4 +1,4 @@
From 23959a2a008f6f3bf3aed289016debdecfd293be Mon Sep 17 00:00:00 2001
From bb2127c0b92d7b97160e81045a7dc3ed80cd3814 Mon Sep 17 00:00:00 2001
From: Harry <me@harry5573.uk>
Date: Sun, 24 Jan 2016 15:13:29 -0700
Subject: [PATCH] Enable TCP_NODELAY.

View File

@ -1,4 +1,4 @@
From 4eea1f91caa8823bfa82c670435f9dfd272b7550 Mon Sep 17 00:00:00 2001
From 891a76c65e65308ea316dfbdfcc3af776e53eb46 Mon Sep 17 00:00:00 2001
From: Tux <write@imaginarycode.com>
Date: Tue, 19 Jan 2016 15:13:29 -0700
Subject: [PATCH] Micro-optimizations

View File

@ -1,4 +1,4 @@
From dea6ce57a1fd39a97f8538f1077a41fea125e3ce Mon Sep 17 00:00:00 2001
From 4618e2fd664ab682d3357032f7b19054f088d939 Mon Sep 17 00:00:00 2001
From: Techcable <Techcable@techcable.net>
Date: Thu, 19 May 2016 17:09:22 -0600
Subject: [PATCH] Allow invalid packet ids for forge servers

View File

@ -1,11 +1,11 @@
From 133e8a1b38fffff23496691d3e64ce59db8b7bbc Mon Sep 17 00:00:00 2001
From 469d9ee9dec07060a1feba3bb5390a93600df3f1 Mon Sep 17 00:00:00 2001
From: Tux <write@imaginarycode.com>
Date: Fri, 12 Feb 2016 23:55:53 -0500
Subject: [PATCH] Resolve sendData() deadlocks
diff --git a/proxy/src/main/java/net/md_5/bungee/BungeeServerInfo.java b/proxy/src/main/java/net/md_5/bungee/BungeeServerInfo.java
index 89c8f48f..9756c09c 100644
index c0703afa..875ad538 100644
--- a/proxy/src/main/java/net/md_5/bungee/BungeeServerInfo.java
+++ b/proxy/src/main/java/net/md_5/bungee/BungeeServerInfo.java
@@ -101,19 +101,22 @@ public class BungeeServerInfo implements ServerInfo

View File

@ -1,4 +1,4 @@
From fbc6e7f7ab5881b789dd729657c84e5f2f902e8f Mon Sep 17 00:00:00 2001
From 3d651f8b60c3a97b2c157d4a02a3083823273759 Mon Sep 17 00:00:00 2001
From: Johannes Donath <johannesd@torchmind.com>
Date: Sat, 4 Jul 2015 06:31:33 +0200
Subject: [PATCH] Add basic support for configurable tab-complete throttling

View File

@ -1,4 +1,4 @@
From 231014c38e148cc8f7b525da9fcff7e1bcfc0dbe Mon Sep 17 00:00:00 2001
From dfb9e02e82be2ced28adc5807a9a175383232f1b Mon Sep 17 00:00:00 2001
From: Janmm14 <computerjanimaus@yahoo.de>
Date: Sat, 12 Dec 2015 23:43:30 +0100
Subject: [PATCH] Optional server list ping logging.

View File

@ -1,4 +1,4 @@
From e860abea488203b54693c9bf1e458ca567884b30 Mon Sep 17 00:00:00 2001
From eafa223c8a5c9f909276681bb61749b671c61f94 Mon Sep 17 00:00:00 2001
From: Techcable <Techcable@outlook.com>
Date: Sun, 7 Feb 2016 00:01:19 -0700
Subject: [PATCH] Add a property to accept invalid ping packets

View File

@ -1,4 +1,4 @@
From 1adff2bcbf3ec2a30cbe03cb0220029b43d1f9df Mon Sep 17 00:00:00 2001
From 1fbaa495ef6ed9601f2d9479b2d2b228d3474274 Mon Sep 17 00:00:00 2001
From: kamcio96 <k.nadworski@icloud.com>
Date: Mon, 14 Mar 2016 16:07:20 -0700
Subject: [PATCH] Use a worker and a boss event loop group.

View File

@ -1,4 +1,4 @@
From 7fe4a7256f09d59aedc03966dc2057098680c6e4 Mon Sep 17 00:00:00 2001
From c41d68728fd137c1af79835b0782bf358ef2eed1 Mon Sep 17 00:00:00 2001
From: Techcable <Techcable@techcable.net>
Date: Fri, 18 Mar 2016 10:53:24 -0700
Subject: [PATCH] Better Decompression Sanity

View File

@ -1,4 +1,4 @@
From 4a2392598c81d86ff9bb7b5e568cf240ad95935e Mon Sep 17 00:00:00 2001
From dc2d74ec7be07d543d87e35c8ac9cbae4b3d3a1d Mon Sep 17 00:00:00 2001
From: Tux <write@imaginarycode.com>
Date: Tue, 25 Oct 2016 12:34:41 -0400
Subject: [PATCH] Validate that chat messages are non-blank

View File

@ -1,4 +1,4 @@
From c2e3eb2835f65d9e8e80c1b6949d27660d6bc7e7 Mon Sep 17 00:00:00 2001
From c58af26b87c012573c2596456e5a22c3a982e677 Mon Sep 17 00:00:00 2001
From: Techcable <Techcable@techcable.net>
Date: Mon, 25 Apr 2016 23:46:00 -0700
Subject: [PATCH] Reduce the overhead of lots and lots of teams with the same

View File

@ -1,4 +1,4 @@
From 8334a03d4f60df604ea20808354c9c74fa3f5075 Mon Sep 17 00:00:00 2001
From 5ce31a20ed3f1f60ebcd9fa2a6afe25eff20bf07 Mon Sep 17 00:00:00 2001
From: Troy Frew <fuzzy_bot@arenaga.me>
Date: Wed, 29 Jun 2016 04:29:25 +0200
Subject: [PATCH] Add dynamic server addition/removal api.

View File

@ -1,4 +1,4 @@
From 141f6b978b357db3b6415352353329227960e068 Mon Sep 17 00:00:00 2001
From d247e4fb8709c256da496d3d26a50e612d79b769 Mon Sep 17 00:00:00 2001
From: Techcable <Techcable@techcable.net>
Date: Mon, 6 Jun 2016 13:36:10 -0600
Subject: [PATCH] Don't send KICK packets while in HANDSHAKE state

View File

@ -1,4 +1,4 @@
From 93618bd99aeee183cd0c81987a06c2f4196fc2b5 Mon Sep 17 00:00:00 2001
From 3532666f8929d17b67603472cd109768a5142d26 Mon Sep 17 00:00:00 2001
From: Nathan Poirier <nathan@poirier.io>
Date: Tue, 28 Jun 2016 23:00:49 -0500
Subject: [PATCH] Improve ServerKickEvent

View File

@ -1,4 +1,4 @@
From 083b58bf741464f3b964a497b30d91b3503b901b Mon Sep 17 00:00:00 2001
From 5ed880564fe4c92ae4d90fa41ae1bc3a5c18285e Mon Sep 17 00:00:00 2001
From: Troy Frew <fuzzy_bot@arenaga.me>
Date: Wed, 29 Jun 2016 13:56:57 -0500
Subject: [PATCH] Configurable server version in ping response

View File

@ -1,4 +1,4 @@
From c6d0eb39009c26b22c0902675d9e139df9ab16f9 Mon Sep 17 00:00:00 2001
From 42ae04c40ab75963abdae8eb5f970aa109c30ae7 Mon Sep 17 00:00:00 2001
From: Ichbinjoe <joe@ibj.io>
Date: Sat, 16 Jul 2016 20:44:01 -0400
Subject: [PATCH] Add timeout variant to connect methods

View File

@ -1,4 +1,4 @@
From 6b184479446746c1cfc61a45e16f44445829aa3b Mon Sep 17 00:00:00 2001
From 887434ef58f84e7de93fe0791d98228e442c92ab Mon Sep 17 00:00:00 2001
From: minecrafter <unknown@unknown>
Date: Sun, 3 Jul 2016 04:03:21 -0400
Subject: [PATCH] Proxy query event

View File

@ -1,4 +1,4 @@
From 78181ca9907f9eb85163a1ab4f851aad37c37f49 Mon Sep 17 00:00:00 2001
From 869e9709c7620421752a819171b4509a4efc999e Mon Sep 17 00:00:00 2001
From: Techcable <Techcable@techcable.net>
Date: Thu, 4 Aug 2016 19:30:49 -0700
Subject: [PATCH] Dump the raw hex of a packet on a decoding error

View File

@ -1,4 +1,4 @@
From d2390a542d1ff7a0767a288a7c1de649b5f583df Mon Sep 17 00:00:00 2001
From 006ffd6b76838f63748d69ca8d8eeb270ed81ef0 Mon Sep 17 00:00:00 2001
From: Aaron Hill <aa1ronham@gmail.com>
Date: Thu, 15 Sep 2016 22:38:37 +0200
Subject: [PATCH] Fix potion race condition on Forge 1.8.9

View File

@ -1,4 +1,4 @@
From 23897094cb77e7bfe9c4e826a49e3ff2ae5e20dd Mon Sep 17 00:00:00 2001
From 415429349c08dff2df7d415d2adc3d34e6585f0d Mon Sep 17 00:00:00 2001
From: Tux <write@imaginarycode.com>
Date: Wed, 21 Dec 2016 03:13:03 -0500
Subject: [PATCH] Optionally use async Netty DNS resolver

View File

@ -1,4 +1,4 @@
From 2db35b7076d87528c16a52c811e65085b84ab0bd Mon Sep 17 00:00:00 2001
From 83f19e8b0400e2ae1d6a29837c89a3404d5567f9 Mon Sep 17 00:00:00 2001
From: Jamie Mansfield <dev@jamierocks.uk>
Date: Sat, 10 Jun 2017 20:56:02 +0100
Subject: [PATCH] Improve outdated build message

View File

@ -1,4 +1,4 @@
From bf3a6eb156feec9de89fae7c4bce7e530a8e6d59 Mon Sep 17 00:00:00 2001
From 6989508c9780a3ac06168830cdf00e3fb92655d0 Mon Sep 17 00:00:00 2001
From: Daniel Naylor <git@drnaylor.co.uk>
Date: Mon, 17 Jul 2017 20:24:17 +0100
Subject: [PATCH] Fix some forge plugin message packets not being forwarded

View File

@ -1,4 +1,4 @@
From 378fbb34c6b7b1aaf2513cfcb35b52fcd279c1ac Mon Sep 17 00:00:00 2001
From d4c54e88e156584193009438c9d1817e3ff25e74 Mon Sep 17 00:00:00 2001
From: Minecrell <minecrell@minecrell.net>
Date: Fri, 22 Sep 2017 12:46:47 +0200
Subject: [PATCH] Use Log4j2 for logging and TerminalConsoleAppender for

View File

@ -1,4 +1,4 @@
From 5b7ba01b6406965dd3f531427160384cd0bdcd83 Mon Sep 17 00:00:00 2001
From dd4a2d58e7fed567f62254f3ab6ed95dbf7a6159 Mon Sep 17 00:00:00 2001
From: Minecrell <minecrell@minecrell.net>
Date: Fri, 22 Sep 2017 13:07:31 +0200
Subject: [PATCH] Handle plugin prefixes using Log4J

View File

@ -1,4 +1,4 @@
From d62c8e7272eb98ab66bf7dc759b1ff3e0a7fe824 Mon Sep 17 00:00:00 2001
From 69003951e257d6df87d6baec5650bc65bdac6b62 Mon Sep 17 00:00:00 2001
From: Minecrell <minecrell@minecrell.net>
Date: Fri, 22 Sep 2017 13:15:09 +0200
Subject: [PATCH] Allow plugins to use SLF4J for logging

View File

@ -1,4 +1,4 @@
From 3fb13aaf95b4ba17bb87cd054b54fa0b151e712b Mon Sep 17 00:00:00 2001
From 3f21e3db1dd0b0697a6562193be8bab9e9f0a78e Mon Sep 17 00:00:00 2001
From: Minecrell <minecrell@minecrell.net>
Date: Sun, 24 Sep 2017 12:06:49 +0200
Subject: [PATCH] Add Log4j configuration that replicates the old BungeeCord

View File

@ -1,4 +1,4 @@
From b13b48f5d49cde1a9a2a414ee7afa16ccfaf19d5 Mon Sep 17 00:00:00 2001
From cabb1c06ae1d9543407e4b1d25d6ff8e71cd054e Mon Sep 17 00:00:00 2001
From: Minecrell <minecrell@minecrell.net>
Date: Tue, 26 Sep 2017 18:59:37 +0200
Subject: [PATCH] Add console command completion

View File

@ -1,4 +1,4 @@
From 6109fd66b8240d689787b5e0dccddb001af5f5a2 Mon Sep 17 00:00:00 2001
From f0f01d45b42a04eb0e1340d5b14f27a27ad20645 Mon Sep 17 00:00:00 2001
From: phenomax <phenomax@revayd.net>
Date: Thu, 10 Aug 2017 18:41:17 +0200
Subject: [PATCH] Providing access to the player's LoginResult on LoginEvent

View File

@ -1,4 +1,4 @@
From 30331abf6b9c9b7b77ad2ed9fa35c46712504de2 Mon Sep 17 00:00:00 2001
From fe89cc5debe4d6d68257860a452ddb905cb503ee Mon Sep 17 00:00:00 2001
From: Gabriele C <sgdc3.mail@gmail.com>
Date: Thu, 8 Feb 2018 19:10:52 +0100
Subject: [PATCH] Optionally log InitialHandler connections

View File

@ -1,4 +1,4 @@
From 6e0df61d18f3c78c6565a70dd15ec73030676ef1 Mon Sep 17 00:00:00 2001
From cd9503f197d3824dea398b9f045cb9aa3d05f378 Mon Sep 17 00:00:00 2001
From: Jamie Mansfield <dev@jamierocks.uk>
Date: Mon, 28 May 2018 21:43:55 +0100
Subject: [PATCH] Forge is a first class citizen

View File

@ -1,4 +1,4 @@
From b4606412285ed0352ffc1d482a571b0d5f1acbe9 Mon Sep 17 00:00:00 2001
From 3cfe0e4cd7612acdd852103fc878b098fa95eeea Mon Sep 17 00:00:00 2001
From: Shane Freeder <theboyetronic@gmail.com>
Date: Fri, 12 Oct 2018 14:28:52 +0100
Subject: [PATCH] Add Configuration to allow empty packets