Move OnlinePlayer to own packages and deprecate at old locations (#194)

This commit is contained in:
McLive
2019-02-23 23:35:37 +01:00
committed by Daniel Ennis
parent cadeacaf93
commit f4a5d6f705
9 changed files with 207 additions and 99 deletions
@@ -24,7 +24,7 @@
package co.aikar.commands;
import co.aikar.commands.contexts.CommandResultSupplier;
import co.aikar.commands.contexts.OnlinePlayer;
import co.aikar.commands.contexts.sponge.OnlinePlayer;
import org.jetbrains.annotations.Nullable;
import org.spongepowered.api.Sponge;
import org.spongepowered.api.command.CommandSource;
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2016-2017 Daniel Ennis (Aikar) - MIT License
* Copyright (c) 2016-2019 Daniel Ennis (Aikar) - MIT License
*
* Permission is hereby granted, free of charge, to any person obtaining
* a copy of this software and associated documentation files (the
@@ -25,36 +25,12 @@ package co.aikar.commands.contexts;
import org.spongepowered.api.entity.living.player.Player;
import java.util.Objects;
public class OnlinePlayer {
public final Player player;
/**
* @deprecated Use {@link co.aikar.commands.contexts.sponge.OnlinePlayer instead}
*/
@Deprecated
public class OnlinePlayer extends co.aikar.commands.contexts.sponge.OnlinePlayer {
public OnlinePlayer(Player player) {
this.player = player;
}
public Player getPlayer() {
return this.player;
}
@Override
public boolean equals(Object o) {
if (this == o) return true;
if (o == null || getClass() != o.getClass()) return false;
OnlinePlayer that = (OnlinePlayer) o;
return Objects.equals(player, that.player);
}
@Override
public int hashCode() {
return Objects.hash(player);
}
@Override
public String toString() {
return "OnlinePlayer{" +
"player=" + player +
'}';
super(player);
}
}
@@ -0,0 +1,60 @@
/*
* Copyright (c) 2016-2017 Daniel Ennis (Aikar) - MIT License
*
* Permission is hereby granted, free of charge, to any person obtaining
* a copy of this software and associated documentation files (the
* "Software"), to deal in the Software without restriction, including
* without limitation the rights to use, copy, modify, merge, publish,
* distribute, sublicense, and/or sell copies of the Software, and to
* permit persons to whom the Software is furnished to do so, subject to
* the following conditions:
*
* The above copyright notice and this permission notice shall be
* included in all copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
* NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
* LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
* OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
* WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
package co.aikar.commands.contexts.sponge;
import org.spongepowered.api.entity.living.player.Player;
import java.util.Objects;
public class OnlinePlayer {
public final Player player;
public OnlinePlayer(Player player) {
this.player = player;
}
public Player getPlayer() {
return this.player;
}
@Override
public boolean equals(Object o) {
if (this == o) return true;
if (o == null || getClass() != o.getClass()) return false;
OnlinePlayer that = (OnlinePlayer) o;
return Objects.equals(player, that.player);
}
@Override
public int hashCode() {
return Objects.hash(player);
}
@Override
public String toString() {
return "OnlinePlayer{" +
"player=" + player +
'}';
}
}