Skip to content

Commit 6b76ed8

Browse files
committed
Fixed compatible with java 8
1 parent 3fd4035 commit 6b76ed8

File tree

11 files changed

+21
-25
lines changed

11 files changed

+21
-25
lines changed

.github/maven/api/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
<parent>
2424
<artifactId>minigamesbox</artifactId>
2525
<groupId>plugily.projects</groupId>
26-
<version>1.3.3-java8</version>
26+
<version>1.3.3.1-java8</version>
2727
</parent>
2828
<modelVersion>4.0.0</modelVersion>
2929

.github/maven/classic/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
<parent>
2424
<artifactId>minigamesbox</artifactId>
2525
<groupId>plugily.projects</groupId>
26-
<version>1.3.3-java8</version>
26+
<version>1.3.3.1-java8</version>
2727
</parent>
2828
<modelVersion>4.0.0</modelVersion>
2929

.github/maven/database/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
<parent>
2424
<artifactId>minigamesbox</artifactId>
2525
<groupId>plugily.projects</groupId>
26-
<version>1.3.3-java8</version>
26+
<version>1.3.3.1-java8</version>
2727
</parent>
2828
<modelVersion>4.0.0</modelVersion>
2929

.github/maven/inventory/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
<parent>
2424
<artifactId>minigamesbox</artifactId>
2525
<groupId>plugily.projects</groupId>
26-
<version>1.3.3-java8</version>
26+
<version>1.3.3.1-java8</version>
2727
</parent>
2828
<modelVersion>4.0.0</modelVersion>
2929

.github/maven/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424

2525
<groupId>plugily.projects</groupId>
2626
<artifactId>minigamesbox</artifactId>
27-
<version>1.3.3-java8</version>
27+
<version>1.3.3.1-java8</version>
2828
<packaging>pom</packaging>
2929

3030
<modules>

.github/maven/utils/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
<parent>
2424
<artifactId>minigamesbox</artifactId>
2525
<groupId>plugily.projects</groupId>
26-
<version>1.3.3-java8</version>
26+
<version>1.3.3.1-java8</version>
2727
</parent>
2828
<modelVersion>4.0.0</modelVersion>
2929

MiniGamesBox Classic/src/main/java/plugily/projects/minigamesbox/classic/utils/migrator/MigratorUtils.java

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
import java.io.File;
2424
import java.io.FileWriter;
2525
import java.io.IOException;
26-
import java.nio.charset.StandardCharsets;
2726
import java.nio.file.Files;
2827
import java.util.List;
2928
import java.util.stream.Collectors;
@@ -48,9 +47,9 @@ public class MigratorUtils {
4847
*/
4948
public static void removeLineFromFile(File file, String lineToRemove) {
5049
try {
51-
List<String> lines = Files.readAllLines(file.toPath(), StandardCharsets.UTF_8);
50+
List<String> lines = Files.readAllLines(file.toPath());
5251
List<String> updatedLines = lines.stream().filter(s -> !s.contains(lineToRemove)).collect(Collectors.toList());
53-
Files.write(file.toPath(), updatedLines, StandardCharsets.UTF_8);
52+
Files.write(file.toPath(), updatedLines);
5453
} catch(IOException e) {
5554
e.printStackTrace();
5655
Bukkit.getLogger().warning("[MinigamesBox] Something went horribly wrong with migration! Please contact Plugily Projects!");
@@ -67,11 +66,11 @@ public static void removeLineFromFile(File file, String lineToRemove) {
6766
public static void insertAfterLine(File file, String search, String text) {
6867
try {
6968
int i = 1;
70-
List<String> lines = Files.readAllLines(file.toPath(), StandardCharsets.UTF_8);
69+
List<String> lines = Files.readAllLines(file.toPath());
7170
for(String line : lines) {
7271
if(line.contains(search)) {
7372
lines.add(i, text);
74-
Files.write(file.toPath(), lines, StandardCharsets.UTF_8);
73+
Files.write(file.toPath(), lines);
7574
break;
7675
}
7776
i++;

MiniGamesBox Classic/src/main/java/plugily/projects/minigamesbox/classic/utils/services/exception/ReporterService.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
import java.io.IOException;
2525
import java.io.OutputStream;
2626
import java.net.URL;
27-
import java.nio.charset.StandardCharsets;
2827
import java.util.logging.Level;
2928

3029
/**
@@ -57,7 +56,7 @@ public void reportException() {
5756
conn.setDoOutput(true);
5857

5958
OutputStream os = conn.getOutputStream();
60-
os.write(("pass=servicereporter&type=" + pluginName + "&pluginversion=" + pluginVersion + "&serverversion=" + serverVersion + "&error=" + error).getBytes(StandardCharsets.UTF_8));
59+
os.write(("pass=servicereporter&type=" + pluginName + "&pluginversion=" + pluginVersion + "&serverversion=" + serverVersion + "&error=" + error).getBytes("UTF-8"));
6160
os.flush();
6261
os.close();
6362

MiniGamesBox Classic/src/main/java/plugily/projects/minigamesbox/classic/utils/services/locale/LocaleService.java

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
import javax.net.ssl.HttpsURLConnection;
2828
import java.io.*;
2929
import java.net.URL;
30-
import java.nio.charset.StandardCharsets;
30+
3131
import java.nio.file.Files;
3232
import java.util.Arrays;
3333
import java.util.Scanner;
@@ -50,7 +50,7 @@ public LocaleService(PluginMain plugin) {
5050
return;
5151
}
5252
this.plugin = plugin;
53-
try(Scanner scanner = new Scanner(requestLocaleFetch(null), StandardCharsets.UTF_8).useDelimiter("\\A")) {
53+
try(Scanner scanner = new Scanner(requestLocaleFetch(null), "UTF-8").useDelimiter("\\A")) {
5454
String data = scanner.hasNext() ? scanner.next() : "";
5555
File file = new File(plugin.getDataFolder().getPath() + "/locales/locale_data.yml");
5656
if(!file.exists()) {
@@ -100,9 +100,9 @@ private InputStream requestLocaleFetch(ILocale locale) {
100100

101101
OutputStream os = conn.getOutputStream();
102102
if(locale == null) {
103-
os.write(("pass=localeservice&type=" + plugin.getName()).getBytes(StandardCharsets.UTF_8));
103+
os.write(("pass=localeservice&type=" + plugin.getName()).getBytes("UTF-8"));
104104
} else {
105-
os.write(("pass=localeservice&type=" + plugin.getName() + "&locale=" + locale.getPrefix()).getBytes(StandardCharsets.UTF_8));
105+
os.write(("pass=localeservice&type=" + plugin.getName() + "&locale=" + locale.getPrefix()).getBytes("UTF-8"));
106106
}
107107
os.flush();
108108
os.close();
@@ -138,9 +138,9 @@ public DownloadStatus demandLocaleDownload(ILocale locale) {
138138
}
139139

140140
private DownloadStatus writeFile(ILocale locale) {
141-
try(Scanner scanner = new Scanner(requestLocaleFetch(locale), StandardCharsets.UTF_8).useDelimiter("\\A")) {
141+
try(Scanner scanner = new Scanner(requestLocaleFetch(locale), "UTF-8").useDelimiter("\\A")) {
142142
String data = scanner.hasNext() ? scanner.next() : "";
143-
try(OutputStreamWriter writer = new OutputStreamWriter(new FileOutputStream(plugin.getDataFolder().getPath() + "/locales/" + locale.getPrefix() + ".yml"), StandardCharsets.UTF_8)) {
143+
try(OutputStreamWriter writer = new OutputStreamWriter(new FileOutputStream(plugin.getDataFolder().getPath() + "/locales/" + locale.getPrefix() + ".yml"), "UTF-8")) {
144144
writer.write(data);
145145
}
146146
return DownloadStatus.SUCCESS;
@@ -165,8 +165,8 @@ public boolean isValidVersion() {
165165
}
166166

167167
private boolean isExact(ILocale locale, File file) {
168-
try(Scanner scanner = new Scanner(requestLocaleFetch(locale), StandardCharsets.UTF_8).useDelimiter("\\A");
169-
Scanner localScanner = new Scanner(file, StandardCharsets.UTF_8).useDelimiter("\\A")) {
168+
try(Scanner scanner = new Scanner(requestLocaleFetch(locale), "UTF-8").useDelimiter("\\A");
169+
Scanner localScanner = new Scanner(file, "UTF-8").useDelimiter("\\A")) {
170170
String onlineData = scanner.hasNext() ? scanner.next() : "";
171171
String localData = localScanner.hasNext() ? localScanner.next() : "";
172172

MiniGamesBox Classic/src/main/java/plugily/projects/minigamesbox/classic/utils/services/metrics/Metrics.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626
import java.io.InputStreamReader;
2727
import java.lang.reflect.Method;
2828
import java.net.URL;
29-
import java.nio.charset.StandardCharsets;
3029
import java.util.Arrays;
3130
import java.util.Collection;
3231
import java.util.HashSet;
@@ -372,7 +371,7 @@ private static byte[] compress(final String str) throws IOException {
372371
}
373372
ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
374373
try (GZIPOutputStream gzip = new GZIPOutputStream(outputStream)) {
375-
gzip.write(str.getBytes(StandardCharsets.UTF_8));
374+
gzip.write(str.getBytes("UTF-8"));
376375
}
377376
return outputStream.toByteArray();
378377
}

0 commit comments

Comments
 (0)