OpenSource/PaperMC
OpenSource/PaperMC
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-01-24 01:06:01 +01:00
Code Issues Projects Releases Packages Wiki Activity

Deprecate and stop using Java15Compat class.

Browse source 
By: md_5 <git@md-5.net>
This commit is contained in:
Bukkit/Spigot 2016-07-29 17:28:25 +10:00
parent f0bfb0fdf7
commit 3b51e3f230
4 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
paper-api/src/main/java/org/bukkit/Material.java
View file

@ -1,6 +1,7 @@
package org.bukkit;
import java.lang.reflect.Constructor;
import java.util.Arrays;
import java.util.Map;
import org.apache.commons.lang.Validate;
@ -58,8 +59,6 @@ import org.bukkit.material.Vine;
import org.bukkit.material.Wood;
import org.bukkit.material.WoodenStep;
import org.bukkit.material.Wool;
import org.bukkit.potion.Potion;
import org.bukkit.util.Java15Compat;
import com.google.common.collect.Maps;
@ -721,7 +720,7 @@ public enum Material {
if (byId.length > material.id) {
byId[material.id] = material;
} else {
byId = Java15Compat.Arrays_copyOfRange(byId, 0, material.id + 2);
byId = Arrays.copyOfRange(byId, 0, material.id + 2);
byId[material.id] = material;
}
BY_NAME.put(material.name(), material);

5
paper-api/src/main/java/org/bukkit/command/SimpleCommandMap.java
View file

@ -1,8 +1,7 @@
package org.bukkit.command;
import static org.bukkit.util.Java15Compat.Arrays_copyOfRange;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
@ -137,7 +136,7 @@ public class SimpleCommandMap implements CommandMap {
try {
// Note: we don't return the result of target.execute as thats success / failure, we return handled (true) or not handled (false)
target.execute(sender, sentCommandLabel, Arrays_copyOfRange(args, 1, args.length));
target.execute(sender, sentCommandLabel, Arrays.copyOfRange(args, 1, args.length));
} catch (CommandException ex) {
throw ex;
} catch (Throwable ex) {

3
paper-api/src/main/java/org/bukkit/util/ChatPaginator.java
View file

@ -2,6 +2,7 @@ package org.bukkit.util;
import org.bukkit.ChatColor;
import java.util.Arrays;
import java.util.LinkedList;
import java.util.List;
@ -46,7 +47,7 @@ public class ChatPaginator {
int from = (actualPageNumber - 1) * pageHeight;
int to = from + pageHeight <= lines.length ? from + pageHeight : lines.length;
String[] selectedLines = Java15Compat.Arrays_copyOfRange(lines, from, to);
String[] selectedLines = Arrays.copyOfRange(lines, from, to);
return new ChatPage(selectedLines, actualPageNumber, totalPages);
}

5
paper-api/src/main/java/org/bukkit/util/Java15Compat.java
View file

@ -2,6 +2,11 @@ package org.bukkit.util;
import java.lang.reflect.Array;
/**
* @deprecated Bukkit targets Java 1.6. This class will be removed in a
* subsequent release.
*/
@Deprecated
public class Java15Compat {
@SuppressWarnings("unchecked")
public static <T> T[] Arrays_copyOfRange(T[] original, int start, int end) {