tale
/
ProjectAres
mirror of https://github.com/OvercastNetwork/ProjectAres.git
1
0
Fork 0
Code Issues Releases Wiki Activity

update to 1.12.2

This commit is contained in:
cswhite2000 2017-09-25 00:33:29 -07:00 committed by Ashcon Partovi
parent d2ed7457b7
commit 341a55ef37
20 changed files with 28 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
API/api/pom.xml
View File

@ -5,7 +5,7 @@
<groupId>tc.oc</groupId>
<artifactId>api-parent</artifactId>
<relativePath>../pom.xml</relativePath>
<version>1.12.1-SNAPSHOT</version>
<version>1.12.2-SNAPSHOT</version>
</parent>
<artifactId>api</artifactId>

2
API/bukkit/pom.xml
View File

@ -5,7 +5,7 @@
<groupId>tc.oc</groupId>
<artifactId>api-parent</artifactId>
<relativePath>../pom.xml</relativePath>
<version>1.12.1-SNAPSHOT</version>
<version>1.12.2-SNAPSHOT</version>
</parent>
<artifactId>api-bukkit</artifactId>

2
API/bungee/pom.xml
View File

@ -5,7 +5,7 @@
<groupId>tc.oc</groupId>
<artifactId>api-parent</artifactId>
<relativePath>../pom.xml</relativePath>
<version>1.12.1-SNAPSHOT</version>
<version>1.12.2-SNAPSHOT</version>
</parent>
<artifactId>api-bungee</artifactId>

2
API/minecraft/pom.xml
View File

@ -5,7 +5,7 @@
<groupId>tc.oc</groupId>
<artifactId>api-parent</artifactId>
<relativePath>../pom.xml</relativePath>
<version>1.12.1-SNAPSHOT</version>
<version>1.12.2-SNAPSHOT</version>
</parent>
<artifactId>api-minecraft</artifactId>

2
API/ocn/pom.xml
View File

@ -5,7 +5,7 @@
<groupId>tc.oc</groupId>
<artifactId>api-parent</artifactId>
<relativePath>../pom.xml</relativePath>
<version>1.12.1-SNAPSHOT</version>
<version>1.12.2-SNAPSHOT</version>
</parent>
<artifactId>api-ocn</artifactId>

2
API/pom.xml
View File

@ -5,7 +5,7 @@
<groupId>tc.oc</groupId>
<artifactId>ProjectAres</artifactId>
<relativePath>../pom.xml</relativePath>
<version>1.12.1-SNAPSHOT</version>
<version>1.12.2-SNAPSHOT</version>
</parent>
<artifactId>api-parent</artifactId>

2
Commons/bukkit/pom.xml
View File

@ -8,7 +8,7 @@
<artifactId>commons</artifactId>
<groupId>tc.oc</groupId>
<relativePath>../pom.xml</relativePath>
<version>1.12.1-SNAPSHOT</version>
<version>1.12.2-SNAPSHOT</version>
</parent>
<artifactId>commons-bukkit</artifactId>

4
Commons/bukkit/src/main/java/tc/oc/commons/bukkit/commands/ServerCommands.java
View File

@ -13,6 +13,7 @@ import com.sk89q.minecraft.util.commands.Command;
import com.sk89q.minecraft.util.commands.CommandContext;
import com.sk89q.minecraft.util.commands.CommandException;
import com.sk89q.minecraft.util.commands.CommandPermissions;
import com.sk89q.minecraft.util.commands.CommandPermissionsException;
import net.md_5.bungee.api.ChatColor;
import net.md_5.bungee.api.chat.BaseComponent;
import net.md_5.bungee.api.chat.TranslatableComponent;
@ -79,11 +80,12 @@ public class ServerCommands implements Commands {
aliases = { "servers", "srvs" },
desc = "Show a listing of all servers on the network",
usage = "[page]",
flags = "a",
min = 0,
max = 1
)
public void servers(final CommandContext args, final CommandSender sender) throws CommandException {
final List<Server> servers = new ArrayList<>(serverStore.subset(teleporter::isVisible));
final List<Server> servers = new ArrayList<>(serverStore.subset(args.hasFlag('a') && sender.hasPermission("ocn.see-all-servers") ? teleporter::isConnectable : teleporter::isVisible));
Collections.sort(servers, FULLNESS);
new Paginator<Server>() {

2
Commons/bungee/pom.xml
View File

@ -8,7 +8,7 @@
<artifactId>commons</artifactId>
<groupId>tc.oc</groupId>
<relativePath>../pom.xml</relativePath>
<version>1.12.1-SNAPSHOT</version>
<version>1.12.2-SNAPSHOT</version>
</parent>
<artifactId>commons-bungee</artifactId>

2
Commons/core/pom.xml
View File

@ -8,7 +8,7 @@
<artifactId>commons</artifactId>
<groupId>tc.oc</groupId>
<relativePath>../pom.xml</relativePath>
<version>1.12.1-SNAPSHOT</version>
<version>1.12.2-SNAPSHOT</version>
</parent>
<artifactId>commons-core</artifactId>

2
Commons/pom.xml
View File

@ -8,7 +8,7 @@
<groupId>tc.oc</groupId>
<artifactId>ProjectAres</artifactId>
<relativePath>../pom.xml</relativePath>
<version>1.12.1-SNAPSHOT</version>
<version>1.12.2-SNAPSHOT</version>
</parent>
<artifactId>commons</artifactId>

2
Lobby/pom.xml
View File

@ -5,7 +5,7 @@
<groupId>tc.oc</groupId>
<artifactId>ProjectAres</artifactId>
<relativePath>../pom.xml</relativePath>
<version>1.12.1-SNAPSHOT</version>
<version>1.12.2-SNAPSHOT</version>
</parent>
<artifactId>Lobby</artifactId>

2
PGM/pom.xml
View File

@ -5,7 +5,7 @@
<groupId>tc.oc</groupId>
<artifactId>ProjectAres</artifactId>
<relativePath>../pom.xml</relativePath>
<version>1.12.1-SNAPSHOT</version>
<version>1.12.2-SNAPSHOT</version>
</parent>
<!-- Parent Project Information -->

2
Tourney/pom.xml
View File

@ -5,7 +5,7 @@
<groupId>tc.oc</groupId>
<artifactId>ProjectAres</artifactId>
<relativePath>../pom.xml</relativePath>
<version>1.12.1-SNAPSHOT</version>
<version>1.12.2-SNAPSHOT</version>
</parent>
<groupId>net.anxuiz</groupId>

6
Util/bukkit/pom.xml
View File

@ -8,7 +8,7 @@
<artifactId>util</artifactId>
<groupId>tc.oc</groupId>
<relativePath>../pom.xml</relativePath>
<version>1.12.1-SNAPSHOT</version>
<version>1.12.2-SNAPSHOT</version>
</parent>
<artifactId>util-bukkit</artifactId>
@ -34,14 +34,14 @@
<dependency>
<groupId>tc.oc</groupId>
<artifactId>sportbukkit-api</artifactId>
<version>1.12.1-R0.1-SNAPSHOT</version>
<version>1.12.2-R0.1-SNAPSHOT</version>
</dependency>
<dependency>
<!-- This dependency is NOT transitive, no clue why -->
<groupId>tc.oc</groupId>
<artifactId>sportbukkit</artifactId>
<version>1.12.1-R0.1-SNAPSHOT</version>
<version>1.12.2-R0.1-SNAPSHOT</version>
</dependency>
<!-- Bukkit plugins/libraries -->

2
Util/bungee/pom.xml
View File

@ -8,7 +8,7 @@
<artifactId>util</artifactId>
<groupId>tc.oc</groupId>
<relativePath>../pom.xml</relativePath>
<version>1.12.1-SNAPSHOT</version>
<version>1.12.2-SNAPSHOT</version>
</parent>
<artifactId>util-bungee</artifactId>

2
Util/core/pom.xml
View File

@ -8,7 +8,7 @@
<artifactId>util</artifactId>
<groupId>tc.oc</groupId>
<relativePath>../pom.xml</relativePath>
<version>1.12.1-SNAPSHOT</version>
<version>1.12.2-SNAPSHOT</version>
</parent>
<artifactId>util-core</artifactId>

3
Util/core/src/main/java/tc/oc/minecraft/protocol/MinecraftVersion.java
View File

@ -24,7 +24,8 @@ public enum MinecraftVersion {
MINECRAFT_1_11(315, 1, 11, 0),
MINECRAFT_1_11_1(316, 1, 11, 1),
MINECRAFT_1_12(335, 1, 12, 0),
MINECRAFT_1_12_1(338, 1, 12, 1);
MINECRAFT_1_12_1(338, 1, 12, 1),
MINECRAFT_1_12_2(340, 1, 12, 2);
private final int protocol;
private final int major;

2
Util/pom.xml
View File

@ -8,7 +8,7 @@
<groupId>tc.oc</groupId>
<artifactId>ProjectAres</artifactId>
<relativePath>../pom.xml</relativePath>
<version>1.12.1-SNAPSHOT</version>
<version>1.12.2-SNAPSHOT</version>
<!-- Don't use $global.version because we want to be able to use this in other projects -->
</parent>

8
pom.xml
View File

@ -2,13 +2,13 @@
<modelVersion>4.0.0</modelVersion>
<properties>
<global.version>1.12.1-SNAPSHOT</global.version>
<global.version>1.12.2-SNAPSHOT</global.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
<groupId>tc.oc</groupId>
<artifactId>ProjectAres</artifactId>
<version>1.12.1-SNAPSHOT</version>
<version>1.12.2-SNAPSHOT</version>
<packaging>pom</packaging>
<scm>
@ -200,12 +200,12 @@
<dependency>
<groupId>tc.oc</groupId>
<artifactId>sportbukkit-api</artifactId>
<version>1.12.1-R0.1-SNAPSHOT</version>
<version>1.12.2-R0.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>tc.oc</groupId>
<artifactId>sportbukkit</artifactId>
<version>1.12.1-R0.1-SNAPSHOT</version>
<version>1.12.2-R0.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.sk89q</groupId>