Reformat code

This commit is contained in:
Ethanell 2020-09-07 23:40:57 +02:00
parent 53f1508a01
commit 20b545b93d
108 changed files with 10123 additions and 9809 deletions

View file

@ -1,4 +1,4 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>fr.leomelki</groupId>

View file

@ -2,30 +2,29 @@
* PacketWrapper - ProtocolLib wrappers for Minecraft packets
* Copyright (C) dmulloy2 <http://dmulloy2.net>
* Copyright (C) Kristian S. Strangeland
*
* <p>
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* <p>
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* <p>
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package fr.leomelki.com.comphenix.packetwrapper;
import java.lang.reflect.InvocationTargetException;
import org.bukkit.entity.Player;
import com.comphenix.protocol.PacketType;
import com.comphenix.protocol.ProtocolLibrary;
import com.comphenix.protocol.events.PacketContainer;
import com.google.common.base.Objects;
import org.bukkit.entity.Player;
import java.lang.reflect.InvocationTargetException;
public abstract class AbstractPacket {
// The packet we will be modifying
@ -64,7 +63,7 @@ public abstract class AbstractPacket {
* @throws RuntimeException If the packet cannot be sent.
*/
public void sendPacket(Player receiver) {
if(receiver == null)
if (receiver == null)
return;
try {
ProtocolLibrary.getProtocolManager().sendServerPacket(receiver,

View file

@ -2,17 +2,17 @@
* PacketWrapper - ProtocolLib wrappers for Minecraft packets
* Copyright (C) dmulloy2 <http://dmulloy2.net>
* Copyright (C) Kristian S. Strangeland
*
* <p>
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* <p>
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* <p>
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/

View file

@ -2,30 +2,30 @@
* PacketWrapper - ProtocolLib wrappers for Minecraft packets
* Copyright (C) dmulloy2 <http://dmulloy2.net>
* Copyright (C) Kristian S. Strangeland
*
* <p>
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* <p>
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* <p>
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package fr.leomelki.com.comphenix.packetwrapper;
import java.util.Arrays;
import com.comphenix.protocol.PacketType;
import com.comphenix.protocol.events.PacketContainer;
import com.comphenix.protocol.wrappers.EnumWrappers;
import com.comphenix.protocol.wrappers.EnumWrappers.ChatType;
import com.comphenix.protocol.wrappers.WrappedChatComponent;
import java.util.Arrays;
public class WrapperPlayServerChat extends AbstractPacket {
public static final PacketType TYPE = PacketType.Play.Server.CHAT;
@ -95,8 +95,7 @@ public class WrapperPlayServerChat extends AbstractPacket {
public void setPosition(byte value) {
handle.getBytes().writeSafely(0, value);
if (EnumWrappers.getChatTypeClass() != null)
{
if (EnumWrappers.getChatTypeClass() != null) {
Arrays.stream(ChatType.values()).filter(t -> t.getId() == value).findAny()
.ifPresent(t -> handle.getChatTypes().writeSafely(0, t));
}

View file

@ -2,17 +2,17 @@
* PacketWrapper - ProtocolLib wrappers for Minecraft packets
* Copyright (C) dmulloy2 <http://dmulloy2.net>
* Copyright (C) Kristian S. Strangeland
*
* <p>
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* <p>
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* <p>
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/

View file

@ -2,28 +2,27 @@
* PacketWrapper - ProtocolLib wrappers for Minecraft packets
* Copyright (C) dmulloy2 <http://dmulloy2.net>
* Copyright (C) Kristian S. Strangeland
*
* <p>
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* <p>
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* <p>
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package fr.leomelki.com.comphenix.packetwrapper;
import org.bukkit.World;
import org.bukkit.entity.Entity;
import com.comphenix.protocol.PacketType;
import com.comphenix.protocol.events.PacketContainer;
import com.comphenix.protocol.events.PacketEvent;
import org.bukkit.World;
import org.bukkit.entity.Entity;
public class WrapperPlayServerEntity extends AbstractPacket {
public static final PacketType TYPE = PacketType.Play.Server.ENTITY;

View file

@ -2,17 +2,17 @@
* PacketWrapper - ProtocolLib wrappers for Minecraft packets
* Copyright (C) dmulloy2 <http://dmulloy2.net>
* Copyright (C) Kristian S. Strangeland
*
* <p>
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* <p>
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* <p>
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/

View file

@ -2,30 +2,29 @@
* PacketWrapper - ProtocolLib wrappers for Minecraft packets
* Copyright (C) dmulloy2 <http://dmulloy2.net>
* Copyright (C) Kristian S. Strangeland
*
* <p>
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* <p>
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* <p>
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package fr.leomelki.com.comphenix.packetwrapper;
import org.bukkit.World;
import org.bukkit.entity.Entity;
import org.bukkit.inventory.ItemStack;
import com.comphenix.protocol.PacketType;
import com.comphenix.protocol.events.PacketContainer;
import com.comphenix.protocol.events.PacketEvent;
import com.comphenix.protocol.wrappers.EnumWrappers.ItemSlot;
import org.bukkit.World;
import org.bukkit.entity.Entity;
import org.bukkit.inventory.ItemStack;
public class WrapperPlayServerEntityEquipment extends AbstractPacket {
public static final PacketType TYPE =

View file

@ -2,28 +2,27 @@
* PacketWrapper - ProtocolLib wrappers for Minecraft packets
* Copyright (C) dmulloy2 <http://dmulloy2.net>
* Copyright (C) Kristian S. Strangeland
*
* <p>
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* <p>
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* <p>
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package fr.leomelki.com.comphenix.packetwrapper;
import org.bukkit.World;
import org.bukkit.entity.Entity;
import com.comphenix.protocol.PacketType;
import com.comphenix.protocol.events.PacketContainer;
import com.comphenix.protocol.events.PacketEvent;
import org.bukkit.World;
import org.bukkit.entity.Entity;
public class WrapperPlayServerEntityLook extends AbstractPacket {
public static final PacketType TYPE = PacketType.Play.Server.ENTITY_LOOK;

View file

@ -2,31 +2,30 @@
* PacketWrapper - ProtocolLib wrappers for Minecraft packets
* Copyright (C) dmulloy2 <http://dmulloy2.net>
* Copyright (C) Kristian S. Strangeland
*
* <p>
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* <p>
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* <p>
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package fr.leomelki.com.comphenix.packetwrapper;
import java.util.List;
import org.bukkit.World;
import org.bukkit.entity.Entity;
import com.comphenix.protocol.PacketType;
import com.comphenix.protocol.events.PacketContainer;
import com.comphenix.protocol.events.PacketEvent;
import com.comphenix.protocol.wrappers.WrappedWatchableObject;
import org.bukkit.World;
import org.bukkit.entity.Entity;
import java.util.List;
public class WrapperPlayServerEntityMetadata extends AbstractPacket {
public static final PacketType TYPE =

View file

@ -2,28 +2,27 @@
* PacketWrapper - ProtocolLib wrappers for Minecraft packets
* Copyright (C) dmulloy2 <http://dmulloy2.net>
* Copyright (C) Kristian S. Strangeland
*
* <p>
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* <p>
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* <p>
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package fr.leomelki.com.comphenix.packetwrapper;
import org.bukkit.World;
import org.bukkit.entity.Entity;
import com.comphenix.protocol.PacketType;
import com.comphenix.protocol.events.PacketContainer;
import com.comphenix.protocol.events.PacketEvent;
import org.bukkit.World;
import org.bukkit.entity.Entity;
public class WrapperPlayServerEntityTeleport extends AbstractPacket {
public static final PacketType TYPE =

View file

@ -2,17 +2,17 @@
* PacketWrapper - ProtocolLib wrappers for Minecraft packets
* Copyright (C) dmulloy2 <http://dmulloy2.net>
* Copyright (C) Kristian S. Strangeland
*
* <p>
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* <p>
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* <p>
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/

View file

@ -2,17 +2,17 @@
* PacketWrapper - ProtocolLib wrappers for Minecraft packets
* Copyright (C) dmulloy2 <http://dmulloy2.net>
* Copyright (C) Kristian S. Strangeland
*
* <p>
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* <p>
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* <p>
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/

View file

@ -2,32 +2,31 @@
* PacketWrapper - ProtocolLib wrappers for Minecraft packets
* Copyright (C) dmulloy2 <http://dmulloy2.net>
* Copyright (C) Kristian S. Strangeland
*
* <p>
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* <p>
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* <p>
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package fr.leomelki.com.comphenix.packetwrapper;
import java.util.UUID;
import org.bukkit.World;
import org.bukkit.entity.Entity;
import org.bukkit.util.Vector;
import com.comphenix.protocol.PacketType;
import com.comphenix.protocol.events.PacketContainer;
import com.comphenix.protocol.events.PacketEvent;
import com.comphenix.protocol.wrappers.WrappedDataWatcher;
import org.bukkit.World;
import org.bukkit.entity.Entity;
import org.bukkit.util.Vector;
import java.util.UUID;
public class WrapperPlayServerNamedEntitySpawn extends AbstractPacket {
public static final PacketType TYPE =

View file

@ -2,27 +2,26 @@
* PacketWrapper - ProtocolLib wrappers for Minecraft packets
* Copyright (C) dmulloy2 <http://dmulloy2.net>
* Copyright (C) Kristian S. Strangeland
*
* <p>
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* <p>
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* <p>
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package fr.leomelki.com.comphenix.packetwrapper;
import org.bukkit.Sound;
import com.comphenix.protocol.PacketType;
import com.comphenix.protocol.events.PacketContainer;
import com.comphenix.protocol.wrappers.EnumWrappers.SoundCategory;
import org.bukkit.Sound;
public class WrapperPlayServerNamedSoundEffect extends AbstractPacket {
public static final PacketType TYPE =

View file

@ -2,29 +2,29 @@
* PacketWrapper - ProtocolLib wrappers for Minecraft packets
* Copyright (C) dmulloy2 <http://dmulloy2.net>
* Copyright (C) Kristian S. Strangeland
*
* <p>
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* <p>
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* <p>
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package fr.leomelki.com.comphenix.packetwrapper;
import java.util.List;
import com.comphenix.protocol.PacketType;
import com.comphenix.protocol.events.PacketContainer;
import com.comphenix.protocol.wrappers.EnumWrappers.PlayerInfoAction;
import com.comphenix.protocol.wrappers.PlayerInfoData;
import java.util.List;
public class WrapperPlayServerPlayerInfo extends AbstractPacket {
public static final PacketType TYPE = PacketType.Play.Server.PLAYER_INFO;

View file

@ -2,32 +2,35 @@
* PacketWrapper - ProtocolLib wrappers for Minecraft packets
* Copyright (C) dmulloy2 <http://dmulloy2.net>
* Copyright (C) Kristian S. Strangeland
*
* <p>
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* <p>
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* <p>
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package fr.leomelki.com.comphenix.packetwrapper;
import java.util.Set;
import com.comphenix.protocol.PacketType;
import com.comphenix.protocol.events.PacketContainer;
import com.comphenix.protocol.reflect.StructureModifier;
import com.comphenix.protocol.utility.MinecraftReflection;
import com.comphenix.protocol.wrappers.EnumWrappers;
import java.util.Set;
public class WrapperPlayServerPosition extends AbstractPacket {
public static final PacketType TYPE = PacketType.Play.Server.POSITION;
private static final Class<?> FLAGS_CLASS = MinecraftReflection
.getMinecraftClass("EnumPlayerTeleportFlags",
"PacketPlayOutPosition$EnumPlayerTeleportFlags");
public WrapperPlayServerPosition() {
super(new PacketContainer(TYPE), TYPE);
@ -138,14 +141,6 @@ public class WrapperPlayServerPosition extends AbstractPacket {
handle.getFloat().write(1, value);
}
private static final Class<?> FLAGS_CLASS = MinecraftReflection
.getMinecraftClass("EnumPlayerTeleportFlags",
"PacketPlayOutPosition$EnumPlayerTeleportFlags");
public enum PlayerTeleportFlag {
X, Y, Z, Y_ROT, X_ROT
}
private StructureModifier<Set<PlayerTeleportFlag>> getFlagsModifier() {
return handle.getSets(
EnumWrappers.getGenericConverter(FLAGS_CLASS, PlayerTeleportFlag.class));
@ -158,4 +153,8 @@ public class WrapperPlayServerPosition extends AbstractPacket {
public void setFlags(Set<PlayerTeleportFlag> value) {
getFlagsModifier().write(0, value);
}
public enum PlayerTeleportFlag {
X, Y, Z, Y_ROT, X_ROT
}
}

View file

@ -2,28 +2,27 @@
* PacketWrapper - ProtocolLib wrappers for Minecraft packets
* Copyright (C) dmulloy2 <http://dmulloy2.net>
* Copyright (C) Kristian S. Strangeland
*
* <p>
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* <p>
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* <p>
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package fr.leomelki.com.comphenix.packetwrapper;
import org.bukkit.WorldType;
import com.comphenix.protocol.PacketType;
import com.comphenix.protocol.events.PacketContainer;
import com.comphenix.protocol.wrappers.EnumWrappers.Difficulty;
import com.comphenix.protocol.wrappers.EnumWrappers.NativeGameMode;
import org.bukkit.WorldType;
public class WrapperPlayServerRespawn extends AbstractPacket {
public static final PacketType TYPE = PacketType.Play.Server.RESPAWN;

View file

@ -2,17 +2,17 @@
* PacketWrapper - ProtocolLib wrappers for Minecraft packets
* Copyright (C) dmulloy2 <http://dmulloy2.net>
* Copyright (C) Kristian S. Strangeland
*
* <p>
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* <p>
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* <p>
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/

View file

@ -2,17 +2,17 @@
* PacketWrapper - ProtocolLib wrappers for Minecraft packets
* Copyright (C) dmulloy2 <http://dmulloy2.net>
* Copyright (C) Kristian S. Strangeland
*
* <p>
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* <p>
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* <p>
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
@ -36,23 +36,6 @@ public class WrapperPlayServerScoreboardObjective extends AbstractPacket {
super(packet, TYPE);
}
/**
* Enum containing all known packet modes.
*
* @author dmulloy2
*/
public static class Mode extends IntEnum {
public static final int ADD_OBJECTIVE = 0;
public static final int REMOVE_OBJECTIVE = 1;
public static final int UPDATE_VALUE = 2;
private static final Mode INSTANCE = new Mode();
public static Mode getInstance() {
return INSTANCE;
}
}
/**
* Retrieve Objective name.
* <p>
@ -138,4 +121,21 @@ public class WrapperPlayServerScoreboardObjective extends AbstractPacket {
public enum HealthDisplay {
INTEGER, HEARTS
}
/**
* Enum containing all known packet modes.
*
* @author dmulloy2
*/
public static class Mode extends IntEnum {
public static final int ADD_OBJECTIVE = 0;
public static final int REMOVE_OBJECTIVE = 1;
public static final int UPDATE_VALUE = 2;
private static final Mode INSTANCE = new Mode();
public static Mode getInstance() {
return INSTANCE;
}
}
}

View file

@ -2,17 +2,17 @@
* PacketWrapper - ProtocolLib wrappers for Minecraft packets
* Copyright (C) dmulloy2 <http://dmulloy2.net>
* Copyright (C) Kristian S. Strangeland
*
* <p>
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* <p>
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* <p>
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/

View file

@ -2,33 +2,32 @@
* PacketWrapper - ProtocolLib wrappers for Minecraft packets
* Copyright (C) dmulloy2 <http://dmulloy2.net>
* Copyright (C) Kristian S. Strangeland
*
* <p>
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* <p>
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* <p>
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package fr.leomelki.com.comphenix.packetwrapper;
import java.util.Collection;
import java.util.List;
import com.comphenix.protocol.PacketType;
import com.comphenix.protocol.events.PacketContainer;
import com.comphenix.protocol.reflect.IntEnum;
import com.comphenix.protocol.utility.MinecraftReflection;
import com.comphenix.protocol.wrappers.WrappedChatComponent;
import org.bukkit.ChatColor;
import java.util.Collection;
import java.util.List;
public class WrapperPlayServerScoreboardTeam extends AbstractPacket {
public static final PacketType TYPE =
PacketType.Play.Server.SCOREBOARD_TEAM;
@ -42,25 +41,6 @@ public class WrapperPlayServerScoreboardTeam extends AbstractPacket {
super(packet, TYPE);
}
/**
* Enum containing all known modes.
*
* @author dmulloy2
*/
public static class Mode extends IntEnum {
public static final int TEAM_CREATED = 0;
public static final int TEAM_REMOVED = 1;
public static final int TEAM_UPDATED = 2;
public static final int PLAYERS_ADDED = 3;
public static final int PLAYERS_REMOVED = 4;
private static final Mode INSTANCE = new Mode();
public static Mode getInstance() {
return INSTANCE;
}
}
/**
* Retrieve Team Name.
* <p>
@ -276,4 +256,23 @@ public class WrapperPlayServerScoreboardTeam extends AbstractPacket {
public void setPackOptionData(int value) {
handle.getIntegers().write(1, value);
}
/**
* Enum containing all known modes.
*
* @author dmulloy2
*/
public static class Mode extends IntEnum {
public static final int TEAM_CREATED = 0;
public static final int TEAM_REMOVED = 1;
public static final int TEAM_UPDATED = 2;
public static final int PLAYERS_ADDED = 3;
public static final int PLAYERS_REMOVED = 4;
private static final Mode INSTANCE = new Mode();
public static Mode getInstance() {
return INSTANCE;
}
}
}

View file

@ -2,86 +2,38 @@
* PacketWrapper - ProtocolLib wrappers for Minecraft packets
* Copyright (C) dmulloy2 <http://dmulloy2.net>
* Copyright (C) Kristian S. Strangeland
*
* <p>
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* <p>
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* <p>
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package fr.leomelki.com.comphenix.packetwrapper;
import java.util.UUID;
import org.bukkit.World;
import org.bukkit.entity.Entity;
import com.comphenix.protocol.PacketType;
import com.comphenix.protocol.ProtocolLibrary;
import com.comphenix.protocol.events.PacketContainer;
import com.comphenix.protocol.events.PacketEvent;
import com.comphenix.protocol.injector.PacketConstructor;
import com.comphenix.protocol.reflect.IntEnum;
import org.bukkit.World;
import org.bukkit.entity.Entity;
import java.util.UUID;
public class WrapperPlayServerSpawnEntity extends AbstractPacket {
public static final PacketType TYPE = PacketType.Play.Server.SPAWN_ENTITY;
private static PacketConstructor entityConstructor;
/**
* Represents the different object types.
*
* @author Kristian
*/
public static class ObjectTypes extends IntEnum {
public static final int BOAT = 1;
public static final int ITEM_STACK = 2;
public static final int AREA_EFFECT_CLOUD = 3;
public static final int MINECART = 10;
public static final int ACTIVATED_TNT = 50;
public static final int ENDER_CRYSTAL = 51;
public static final int TIPPED_ARROW_PROJECTILE = 60;
public static final int SNOWBALL_PROJECTILE = 61;
public static final int EGG_PROJECTILE = 62;
public static final int GHAST_FIREBALL = 63;
public static final int BLAZE_FIREBALL = 64;
public static final int THROWN_ENDERPEARL = 65;
public static final int WITHER_SKULL_PROJECTILE = 66;
public static final int SHULKER_BULLET = 67;
public static final int FALLING_BLOCK = 70;
public static final int ITEM_FRAME = 71;
public static final int EYE_OF_ENDER = 72;
public static final int THROWN_POTION = 73;
public static final int THROWN_EXP_BOTTLE = 75;
public static final int FIREWORK_ROCKET = 76;
public static final int LEASH_KNOT = 77;
public static final int ARMORSTAND = 78;
public static final int FISHING_FLOAT = 90;
public static final int SPECTRAL_ARROW = 91;
public static final int DRAGON_FIREBALL = 93;
/**
* The singleton instance. Can also be retrieved from the parent class.
*/
private static final ObjectTypes INSTANCE = new ObjectTypes();
/**
* Retrieve an instance of the object types enum.
*
* @return Object type enum.
*/
public static ObjectTypes getInstance() {
return INSTANCE;
}
}
public WrapperPlayServerSpawnEntity() {
super(new PacketContainer(TYPE), TYPE);
handle.getModifier().writeDefaults();
@ -115,6 +67,15 @@ public class WrapperPlayServerSpawnEntity extends AbstractPacket {
return handle.getIntegers().read(0);
}
/**
* Set entity ID of the Object.
*
* @param value - new value.
*/
public void setEntityID(int value) {
handle.getIntegers().write(0, value);
}
/**
* Retrieve the entity that will be spawned.
*
@ -135,15 +96,6 @@ public class WrapperPlayServerSpawnEntity extends AbstractPacket {
return getEntity(event.getPlayer().getWorld());
}
/**
* Set entity ID of the Object.
*
* @param value - new value.
*/
public void setEntityID(int value) {
handle.getIntegers().write(0, value);
}
public UUID getUniqueId() {
return handle.getUUIDs().read(0);
}
@ -375,4 +327,51 @@ public class WrapperPlayServerSpawnEntity extends AbstractPacket {
public void setObjectData(int value) {
handle.getIntegers().write(7, value);
}
/**
* Represents the different object types.
*
* @author Kristian
*/
public static class ObjectTypes extends IntEnum {
public static final int BOAT = 1;
public static final int ITEM_STACK = 2;
public static final int AREA_EFFECT_CLOUD = 3;
public static final int MINECART = 10;
public static final int ACTIVATED_TNT = 50;
public static final int ENDER_CRYSTAL = 51;
public static final int TIPPED_ARROW_PROJECTILE = 60;
public static final int SNOWBALL_PROJECTILE = 61;
public static final int EGG_PROJECTILE = 62;
public static final int GHAST_FIREBALL = 63;
public static final int BLAZE_FIREBALL = 64;
public static final int THROWN_ENDERPEARL = 65;
public static final int WITHER_SKULL_PROJECTILE = 66;
public static final int SHULKER_BULLET = 67;
public static final int FALLING_BLOCK = 70;
public static final int ITEM_FRAME = 71;
public static final int EYE_OF_ENDER = 72;
public static final int THROWN_POTION = 73;
public static final int THROWN_EXP_BOTTLE = 75;
public static final int FIREWORK_ROCKET = 76;
public static final int LEASH_KNOT = 77;
public static final int ARMORSTAND = 78;
public static final int FISHING_FLOAT = 90;
public static final int SPECTRAL_ARROW = 91;
public static final int DRAGON_FIREBALL = 93;
/**
* The singleton instance. Can also be retrieved from the parent class.
*/
private static final ObjectTypes INSTANCE = new ObjectTypes();
/**
* Retrieve an instance of the object types enum.
*
* @return Object type enum.
*/
public static ObjectTypes getInstance() {
return INSTANCE;
}
}
}

View file

@ -2,33 +2,32 @@
* PacketWrapper - ProtocolLib wrappers for Minecraft packets
* Copyright (C) dmulloy2 <http://dmulloy2.net>
* Copyright (C) Kristian S. Strangeland
*
* <p>
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* <p>
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* <p>
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package fr.leomelki.com.comphenix.packetwrapper;
import java.util.UUID;
import org.bukkit.World;
import org.bukkit.entity.Entity;
import org.bukkit.entity.EntityType;
import com.comphenix.protocol.PacketType;
import com.comphenix.protocol.ProtocolLibrary;
import com.comphenix.protocol.events.PacketContainer;
import com.comphenix.protocol.events.PacketEvent;
import com.comphenix.protocol.injector.PacketConstructor;
import org.bukkit.World;
import org.bukkit.entity.Entity;
import org.bukkit.entity.EntityType;
import java.util.UUID;
public class WrapperPlayServerSpawnEntityLiving extends AbstractPacket {
public static final PacketType TYPE =
@ -67,6 +66,15 @@ public class WrapperPlayServerSpawnEntityLiving extends AbstractPacket {
return handle.getIntegers().read(0);
}
/**
* Set entity ID.
*
* @param value - new value.
*/
public void setEntityID(int value) {
handle.getIntegers().write(0, value);
}
/**
* Retrieve the entity that will be spawned.
*
@ -95,15 +103,6 @@ public class WrapperPlayServerSpawnEntityLiving extends AbstractPacket {
handle.getUUIDs().write(0, value);
}
/**
* Set entity ID.
*
* @param value - new value.
*/
public void setEntityID(int value) {
handle.getIntegers().write(0, value);
}
/**
* Retrieve the type of mob.
*

View file

@ -2,17 +2,17 @@
* This file is part of PacketWrapper.
* Copyright (C) 2012-2015 Kristian S. Strangeland
* Copyright (C) 2015 dmulloy2
*
* <p>
* PacketWrapper is free software: you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* <p>
* PacketWrapper is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* <p>
* You should have received a copy of the GNU Lesser General Public License
* along with PacketWrapper. If not, see <http://www.gnu.org/licenses/>.
*/

View file

@ -2,17 +2,17 @@
* PacketWrapper - ProtocolLib wrappers for Minecraft packets
* Copyright (C) dmulloy2 <http://dmulloy2.net>
* Copyright (C) Kristian S. Strangeland
*
* <p>
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* <p>
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* <p>
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/

View file

@ -2,17 +2,17 @@
* PacketWrapper - ProtocolLib wrappers for Minecraft packets
* Copyright (C) dmulloy2 <http://dmulloy2.net>
* Copyright (C) Kristian S. Strangeland
*
* <p>
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* <p>
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* <p>
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/

View file

@ -2,17 +2,17 @@
* PacketWrapper - ProtocolLib wrappers for Minecraft packets
* Copyright (C) dmulloy2 <http://dmulloy2.net>
* Copyright (C) Kristian S. Strangeland
*
* <p>
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* <p>
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* <p>
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/

View file

@ -1,18 +1,26 @@
package fr.leomelki.loupgarou;
import java.io.File;
import java.lang.reflect.Constructor;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
import org.bukkit.Bukkit;
import org.bukkit.ChatColor;
import org.bukkit.Location;
import org.bukkit.Material;
import org.bukkit.Sound;
import com.comphenix.protocol.PacketType;
import com.comphenix.protocol.ProtocolLibrary;
import com.comphenix.protocol.ProtocolManager;
import com.comphenix.protocol.events.ListenerPriority;
import com.comphenix.protocol.events.PacketAdapter;
import com.comphenix.protocol.events.PacketEvent;
import com.comphenix.protocol.wrappers.EnumWrappers.ItemSlot;
import com.comphenix.protocol.wrappers.PlayerInfoData;
import com.comphenix.protocol.wrappers.WrappedChatComponent;
import fr.leomelki.com.comphenix.packetwrapper.*;
import fr.leomelki.loupgarou.classes.LGGame;
import fr.leomelki.loupgarou.classes.LGPlayer;
import fr.leomelki.loupgarou.classes.LGWinType;
import fr.leomelki.loupgarou.events.LGSkinLoadEvent;
import fr.leomelki.loupgarou.events.LGUpdatePrefixEvent;
import fr.leomelki.loupgarou.listeners.*;
import fr.leomelki.loupgarou.roles.*;
import lombok.Getter;
import lombok.Setter;
import org.bukkit.*;
import org.bukkit.command.Command;
import org.bukkit.command.CommandSender;
import org.bukkit.configuration.file.FileConfiguration;
@ -25,81 +33,36 @@ import org.json.simple.JSONObject;
import org.json.simple.parser.JSONParser;
import org.json.simple.parser.ParseException;
import com.comphenix.protocol.PacketType;
import com.comphenix.protocol.ProtocolLibrary;
import com.comphenix.protocol.ProtocolManager;
import com.comphenix.protocol.events.ListenerPriority;
import com.comphenix.protocol.events.PacketAdapter;
import com.comphenix.protocol.events.PacketEvent;
import com.comphenix.protocol.wrappers.EnumWrappers.ItemSlot;
import com.comphenix.protocol.wrappers.PlayerInfoData;
import com.comphenix.protocol.wrappers.WrappedChatComponent;
import java.io.File;
import java.lang.reflect.Constructor;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
import fr.leomelki.com.comphenix.packetwrapper.WrapperPlayServerEntityEquipment;
import fr.leomelki.com.comphenix.packetwrapper.WrapperPlayServerNamedSoundEffect;
import fr.leomelki.com.comphenix.packetwrapper.WrapperPlayServerPlayerInfo;
import fr.leomelki.com.comphenix.packetwrapper.WrapperPlayServerScoreboardTeam;
import fr.leomelki.com.comphenix.packetwrapper.WrapperPlayServerUpdateHealth;
import fr.leomelki.com.comphenix.packetwrapper.WrapperPlayServerUpdateTime;
import fr.leomelki.loupgarou.classes.LGGame;
import fr.leomelki.loupgarou.classes.LGPlayer;
import fr.leomelki.loupgarou.classes.LGWinType;
import fr.leomelki.loupgarou.events.LGSkinLoadEvent;
import fr.leomelki.loupgarou.events.LGUpdatePrefixEvent;
import fr.leomelki.loupgarou.listeners.CancelListener;
import fr.leomelki.loupgarou.listeners.ChatListener;
import fr.leomelki.loupgarou.listeners.JoinListener;
import fr.leomelki.loupgarou.listeners.LoupGarouListener;
import fr.leomelki.loupgarou.listeners.VoteListener;
import fr.leomelki.loupgarou.roles.RAnge;
import fr.leomelki.loupgarou.roles.RAssassin;
import fr.leomelki.loupgarou.roles.RBouffon;
import fr.leomelki.loupgarou.roles.RChaperonRouge;
import fr.leomelki.loupgarou.roles.RChasseur;
import fr.leomelki.loupgarou.roles.RChasseurDeVampire;
import fr.leomelki.loupgarou.roles.RChienLoup;
import fr.leomelki.loupgarou.roles.RCorbeau;
import fr.leomelki.loupgarou.roles.RCupidon;
import fr.leomelki.loupgarou.roles.RDetective;
import fr.leomelki.loupgarou.roles.RDictateur;
import fr.leomelki.loupgarou.roles.REnfantSauvage;
import fr.leomelki.loupgarou.roles.RFaucheur;
import fr.leomelki.loupgarou.roles.RGarde;
import fr.leomelki.loupgarou.roles.RGrandMechantLoup;
import fr.leomelki.loupgarou.roles.RLoupGarou;
import fr.leomelki.loupgarou.roles.RLoupGarouBlanc;
import fr.leomelki.loupgarou.roles.RLoupGarouNoir;
import fr.leomelki.loupgarou.roles.RMedium;
import fr.leomelki.loupgarou.roles.RMontreurDOurs;
import fr.leomelki.loupgarou.roles.RPetiteFille;
import fr.leomelki.loupgarou.roles.RPirate;
import fr.leomelki.loupgarou.roles.RPretre;
import fr.leomelki.loupgarou.roles.RPyromane;
import fr.leomelki.loupgarou.roles.RSorciere;
import fr.leomelki.loupgarou.roles.RSurvivant;
import fr.leomelki.loupgarou.roles.RVampire;
import fr.leomelki.loupgarou.roles.RVillageois;
import fr.leomelki.loupgarou.roles.RVoyante;
import fr.leomelki.loupgarou.roles.Role;
import lombok.Getter;
import lombok.Setter;
public class MainLg extends JavaPlugin{
public class MainLg extends JavaPlugin {
@Getter
private static final String prefix = ""/*"§7[§9Loup-Garou§7] "*/;
private static MainLg instance;
@Getter private final HashMap<String, Constructor<? extends Role>> roles = new HashMap<>();
@Getter private static final String prefix = ""/*"§7[§9Loup-Garou§7] "*/;
@Getter
private final HashMap<String, Constructor<? extends Role>> roles = new HashMap<>();
@Getter
@Setter
private LGGame currentGame;//Because for now, only one game will be playable on one server (flemme)
@Getter @Setter private LGGame currentGame;//Because for now, only one game will be playable on one server (flemme)
public static MainLg getInstance() {
return instance;
}
@Override
public void onEnable() {
instance = this;
loadRoles();
if(!new File(getDataFolder(), "config.yml").exists()) {//Créer la config
if (!new File(getDataFolder(), "config.yml").exists()) {//Créer la config
FileConfiguration config = getConfig();
config.set("spawns", new ArrayList<List<Double>>());
for(String role : roles.keySet())//Nombre de participant pour chaque rôle
config.set("role."+role, 1);
for (String role : roles.keySet())//Nombre de participant pour chaque rôle
config.set("role." + role, 1);
saveConfig();
}
loadConfig();
@ -109,7 +72,7 @@ public class MainLg extends JavaPlugin{
Bukkit.getPluginManager().registerEvents(new ChatListener(this), this);
Bukkit.getPluginManager().registerEvents(new LoupGarouListener(), this);
for(Player player : Bukkit.getOnlinePlayers())
for (Player player : Bukkit.getOnlinePlayers())
Bukkit.getPluginManager().callEvent(new PlayerJoinEvent(player, "is connected"));
ProtocolManager protocolManager = ProtocolLibrary.getProtocolManager();
@ -118,7 +81,7 @@ public class MainLg extends JavaPlugin{
public void onPacketSending(PacketEvent event) {
WrapperPlayServerUpdateTime time = new WrapperPlayServerUpdateTime(event.getPacket());
LGPlayer lgp = LGPlayer.thePlayer(instance, event.getPlayer());
if(lgp.getGame() != null && lgp.getGame().getTime() != time.getTimeOfDay())
if (lgp.getGame() != null && lgp.getGame().getTime() != time.getTimeOfDay())
event.setCancelled(true);
}
}
@ -128,7 +91,7 @@ public class MainLg extends JavaPlugin{
@Override
public void onPacketSending(PacketEvent event) {
WrapperPlayServerNamedSoundEffect sound = new WrapperPlayServerNamedSoundEffect(event.getPacket());
if(sound.getSoundEffect() == Sound.ENTITY_PLAYER_ATTACK_NODAMAGE)
if (sound.getSoundEffect() == Sound.ENTITY_PLAYER_ATTACK_NODAMAGE)
event.setCancelled(true);
}
}
@ -139,19 +102,19 @@ public class MainLg extends JavaPlugin{
LGPlayer player = LGPlayer.thePlayer(instance, event.getPlayer());
WrapperPlayServerPlayerInfo info = new WrapperPlayServerPlayerInfo(event.getPacket());
ArrayList<PlayerInfoData> datas = new ArrayList<>();
for(PlayerInfoData data : info.getData()) {
for (PlayerInfoData data : info.getData()) {
LGPlayer lgp = LGPlayer.thePlayer(instance, Bukkit.getPlayer(data.getProfile().getUUID()));
if(player.getGame() != null && player.getGame() == lgp.getGame()) {
if (player.getGame() != null && player.getGame() == lgp.getGame()) {
LGUpdatePrefixEvent evt2 = new LGUpdatePrefixEvent(player.getGame(), lgp, player, "");
WrappedChatComponent displayName = data.getDisplayName();
Bukkit.getPluginManager().callEvent(evt2);
if(evt2.getPrefix().length() > 0) {
if (evt2.getPrefix().length() > 0) {
try {
if(displayName != null) {
if (displayName != null) {
JSONObject obj = (JSONObject) new JSONParser().parse(displayName.getJson());
displayName = WrappedChatComponent.fromText(evt2.getPrefix()+obj.get("text"));
displayName = WrappedChatComponent.fromText(evt2.getPrefix() + obj.get("text"));
} else
displayName = WrappedChatComponent.fromText(evt2.getPrefix()+data.getProfile().getName());
displayName = WrappedChatComponent.fromText(evt2.getPrefix() + data.getProfile().getName());
} catch (ParseException e) {
e.printStackTrace();
}
@ -159,7 +122,7 @@ public class MainLg extends JavaPlugin{
LGSkinLoadEvent evt = new LGSkinLoadEvent(lgp.getGame(), lgp, player, data.getProfile());
Bukkit.getPluginManager().callEvent(evt);
datas.add(new PlayerInfoData(evt.getProfile(), data.getLatency(), data.getGameMode(), displayName));
}else
} else
datas.add(data);
}
info.setData(datas);
@ -169,7 +132,7 @@ public class MainLg extends JavaPlugin{
@Override
public void onPacketSending(PacketEvent event) {
LGPlayer player = LGPlayer.thePlayer(instance, event.getPlayer());
if(player.getGame() != null && player.getGame().isStarted()) {
if (player.getGame() != null && player.getGame().isStarted()) {
WrapperPlayServerUpdateHealth health = new WrapperPlayServerUpdateHealth(event.getPacket());
health.setFood(6);
}
@ -182,12 +145,12 @@ public class MainLg extends JavaPlugin{
WrapperPlayServerScoreboardTeam team = new WrapperPlayServerScoreboardTeam(event.getPacket());
team.setColor(ChatColor.WHITE);
Player other = Bukkit.getPlayer(team.getName());
if(other == null)return;
if (other == null) return;
LGPlayer lgp = LGPlayer.thePlayer(instance, other);
if(player.getGame() != null && player.getGame() == lgp.getGame()) {
if (player.getGame() != null && player.getGame() == lgp.getGame()) {
LGUpdatePrefixEvent evt2 = new LGUpdatePrefixEvent(player.getGame(), lgp, player, "");
Bukkit.getPluginManager().callEvent(evt2);
if(evt2.getPrefix().length() > 0)
if (evt2.getPrefix().length() > 0)
team.setPrefix(WrappedChatComponent.fromText(evt2.getPrefix()));
else
team.setPrefix(WrappedChatComponent.fromText("§f"));
@ -198,9 +161,9 @@ public class MainLg extends JavaPlugin{
@Override
public void onPacketSending(PacketEvent event) {
LGPlayer player = LGPlayer.thePlayer(instance, event.getPlayer());
if(player.getGame() != null) {
if (player.getGame() != null) {
WrapperPlayServerEntityEquipment equip = new WrapperPlayServerEntityEquipment(event.getPacket());
if(equip.getSlot() == ItemSlot.OFFHAND && equip.getEntityID() != player.getPlayer().getEntityId())
if (equip.getSlot() == ItemSlot.OFFHAND && equip.getEntityID() != player.getPlayer().getEntityId())
equip.setItem(new ItemStack(Material.AIR));
}
}
@ -211,56 +174,56 @@ public class MainLg extends JavaPlugin{
@SuppressWarnings("unchecked")
@Override
public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
if(label.equalsIgnoreCase("ww")) {
if(!sender.hasPermission("loupgarou.admin")) {
sender.sendMessage(prefix+"§4Erreur: Vous n'avez pas la permission...");
if (label.equalsIgnoreCase("ww")) {
if (!sender.hasPermission("loupgarou.admin")) {
sender.sendMessage(prefix + "§4Erreur: Vous n'avez pas la permission...");
return true;
}
if(args.length >= 1) {
if(args[0].equalsIgnoreCase("addspawn")) {
Player player = (Player)sender;
if (args.length >= 1) {
if (args[0].equalsIgnoreCase("addspawn")) {
Player player = (Player) sender;
Location loc = player.getLocation();
List<Object> list = (List<Object>) getConfig().getList("spawns");
list.add(Arrays.asList((double)loc.getBlockX(), loc.getY(), (double)loc.getBlockZ(), (double)loc.getYaw(), (double)loc.getPitch()));
list.add(Arrays.asList((double) loc.getBlockX(), loc.getY(), (double) loc.getBlockZ(), (double) loc.getYaw(), (double) loc.getPitch()));
saveConfig();
loadConfig();
sender.sendMessage(prefix+"§aLa position a bien été ajoutée !");
sender.sendMessage(prefix + "§aLa position a bien été ajoutée !");
return true;
}else if(args[0].equalsIgnoreCase("end")) {
if(args.length != 2) {
} else if (args[0].equalsIgnoreCase("end")) {
if (args.length != 2) {
sender.sendMessage("§4Utilisation : §c/lg end <pseudo>");
return true;
}
Player selected = Bukkit.getPlayer(args[1]);
if(selected == null) {
sender.sendMessage("§4Erreur : §cLe joueur §4"+args[1]+"§c n'est pas connecté.");
if (selected == null) {
sender.sendMessage("§4Erreur : §cLe joueur §4" + args[1] + "§c n'est pas connecté.");
return true;
}
LGGame game = LGPlayer.thePlayer(instance, selected).getGame();
if(game == null) {
sender.sendMessage("§4Erreur : §cLe joueur §4"+selected.getName()+"§c n'est pas dans une partie.");
if (game == null) {
sender.sendMessage("§4Erreur : §cLe joueur §4" + selected.getName() + "§c n'est pas dans une partie.");
return true;
}
game.cancelWait();
game.endGame(LGWinType.EQUAL);
game.broadcastMessage("§cLa partie a été arrêtée de force !");
return true;
}else if(args[0].equalsIgnoreCase("start")) {
if(args.length < 2) {
} else if (args[0].equalsIgnoreCase("start")) {
if (args.length < 2) {
sender.sendMessage("§4Utilisation : §c/lg start <pseudo>");
return true;
}
Player player = Bukkit.getPlayer(args[1]);
if(player == null) {
sender.sendMessage("§4Erreur : §cLe joueur §4"+args[1]+"§c n'existe pas !");
if (player == null) {
sender.sendMessage("§4Erreur : §cLe joueur §4" + args[1] + "§c n'existe pas !");
return true;
}
LGPlayer lgp = LGPlayer.thePlayer(instance, player);
if(lgp.getGame() == null) {
sender.sendMessage("§4Erreur : §cLe joueur §4"+lgp.getName()+"§c n'est pas dans une partie.");
if (lgp.getGame() == null) {
sender.sendMessage("§4Erreur : §cLe joueur §4" + lgp.getName() + "§c n'est pas dans une partie.");
return true;
}
if(MainLg.getInstance().getConfig().getList("spawns").size() < lgp.getGame().getMaxPlayers()) {
if (MainLg.getInstance().getConfig().getList("spawns").size() < lgp.getGame().getMaxPlayers()) {
sender.sendMessage("§4Erreur : §cIl n'y a pas assez de points de spawn !");
sender.sendMessage("§8§oPour les définir, merci de faire §7/lg addSpawn");
return true;
@ -268,143 +231,147 @@ public class MainLg extends JavaPlugin{
sender.sendMessage("§aVous avez bien démarré une nouvelle partie !");
lgp.getGame().updateStart();
return true;
}else if(args[0].equalsIgnoreCase("reloadconfig")) {
} else if (args[0].equalsIgnoreCase("reloadconfig")) {
sender.sendMessage("§aVous avez bien reload la config !");
sender.sendMessage("§7§oSi vous avez changé les rôles, écriver §8§o/lg joinall§7§o !");
loadConfig();
return true;
}else if(args[0].equalsIgnoreCase("joinall")) {
for(Player p : Bukkit.getOnlinePlayers())
} else if (args[0].equalsIgnoreCase("joinall")) {
for (Player p : Bukkit.getOnlinePlayers())
Bukkit.getPluginManager().callEvent(new PlayerQuitEvent(p, "joinall"));
for(Player p : Bukkit.getOnlinePlayers())
for (Player p : Bukkit.getOnlinePlayers())
Bukkit.getPluginManager().callEvent(new PlayerJoinEvent(p, "joinall"));
return true;
}else if(args[0].equalsIgnoreCase("reloadPacks")) {
for(Player p : Bukkit.getOnlinePlayers())
} else if (args[0].equalsIgnoreCase("reloadPacks")) {
for (Player p : Bukkit.getOnlinePlayers())
Bukkit.getPluginManager().callEvent(new PlayerQuitEvent(p, "reloadPacks"));
for(Player p : Bukkit.getOnlinePlayers())
for (Player p : Bukkit.getOnlinePlayers())
Bukkit.getPluginManager().callEvent(new PlayerJoinEvent(p, "reloadPacks"));
return true;
}else if(args[0].equalsIgnoreCase("nextNight")) {
} else if (args[0].equalsIgnoreCase("nextNight")) {
sender.sendMessage("§aVous êtes passé à la prochaine nuit");
if(getCurrentGame() != null) {
if (getCurrentGame() != null) {
getCurrentGame().broadcastMessage("§2§lLe passage à la prochaine nuit a été forcé !");
for(LGPlayer lgp : getCurrentGame().getInGame())
for (LGPlayer lgp : getCurrentGame().getInGame())
lgp.stopChoosing();
getCurrentGame().cancelWait();
getCurrentGame().nextNight();
}
return true;
}else if(args[0].equalsIgnoreCase("nextDay")) {
} else if (args[0].equalsIgnoreCase("nextDay")) {
sender.sendMessage("§aVous êtes passé à la prochaine journée");
if(getCurrentGame() != null) {
if (getCurrentGame() != null) {
getCurrentGame().broadcastMessage("§2§lLe passage à la prochaine journée a été forcé !");
getCurrentGame().cancelWait();
for(LGPlayer lgp : getCurrentGame().getInGame())
for (LGPlayer lgp : getCurrentGame().getInGame())
lgp.stopChoosing();
getCurrentGame().endNight();
}
return true;
}else if(args[0].equalsIgnoreCase("roles")) {
if(args.length == 1 || args[1].equalsIgnoreCase("list")) {
sender.sendMessage(prefix+"§6Voici la liste des rôles:");
} else if (args[0].equalsIgnoreCase("roles")) {
if (args.length == 1 || args[1].equalsIgnoreCase("list")) {
sender.sendMessage(prefix + "§6Voici la liste des rôles:");
int index = 0;
for(String role : getRoles().keySet())
sender.sendMessage(prefix+" §e- "+index+++" - §6"+role+" §e> "+MainLg.getInstance().getConfig().getInt("role."+role));
sender.sendMessage("\n"+prefix+" §7Écrivez §8§o/lg roles set <role_id/role_name> <nombre>§7 pour définir le nombre de joueurs qui devrons avoir ce rôle.");
for (String role : getRoles().keySet())
sender.sendMessage(prefix + " §e- " + index++ + " - §6" + role + " §e> " + MainLg.getInstance().getConfig().getInt("role." + role));
sender.sendMessage("\n" + prefix + " §7Écrivez §8§o/lg roles set <role_id/role_name> <nombre>§7 pour définir le nombre de joueurs qui devrons avoir ce rôle.");
} else {
if(args[1].equalsIgnoreCase("set") && args.length == 4) {
if (args[1].equalsIgnoreCase("set") && args.length == 4) {
String role = null;
if(args[2].length() <= 2)
if (args[2].length() <= 2)
try {
int i = Integer.parseInt(args[2]);
Object[] array = getRoles().keySet().toArray();
if(array.length <= i) {
sender.sendMessage(prefix+"§4Erreur: §cCe rôle n'existe pas.");
if (array.length <= i) {
sender.sendMessage(prefix + "§4Erreur: §cCe rôle n'existe pas.");
return true;
}else
role = (String)array[i];
}catch(Exception err) {sender.sendMessage(prefix+"§4Erreur: §cCeci n'est pas un nombre");}
} else
role = (String) array[i];
} catch (Exception err) {
sender.sendMessage(prefix + "§4Erreur: §cCeci n'est pas un nombre");
}
else
role = args[2];
if(role != null) {
if (role != null) {
String real_role = null;
for(String real : getRoles().keySet())
if(real.equalsIgnoreCase(role)) {
for (String real : getRoles().keySet())
if (real.equalsIgnoreCase(role)) {
real_role = real;
break;
}
if(real_role != null) {
if (real_role != null) {
try {
MainLg.getInstance().getConfig().set("role."+real_role, Integer.valueOf(args[3]));
sender.sendMessage(prefix+"§6Il y aura §e"+args[3]+" §6"+real_role);
MainLg.getInstance().getConfig().set("role." + real_role, Integer.valueOf(args[3]));
sender.sendMessage(prefix + "§6Il y aura §e" + args[3] + " §6" + real_role);
saveConfig();
loadConfig();
sender.sendMessage("§7§oSi vous avez fini de changer les rôles, écriver §8§o/lg joinall§7§o !");
}catch(Exception err) {
sender.sendMessage(prefix+"§4Erreur: §c"+args[3]+" n'est pas un nombre");
} catch (Exception err) {
sender.sendMessage(prefix + "§4Erreur: §c" + args[3] + " n'est pas un nombre");
}
return true;
}
}
sender.sendMessage(prefix+"§4Erreur: §cLe rôle que vous avez entré est incorrect");
sender.sendMessage(prefix + "§4Erreur: §cLe rôle que vous avez entré est incorrect");
} else {
sender.sendMessage(prefix+"§4Erreur: §cCommande incorrecte.");
sender.sendMessage(prefix+"§4Essayez §c/lg roles set <role_id/role_name> <nombre>§4 ou §c/lg roles list");
sender.sendMessage(prefix + "§4Erreur: §cCommande incorrecte.");
sender.sendMessage(prefix + "§4Essayez §c/lg roles set <role_id/role_name> <nombre>§4 ou §c/lg roles list");
}
}
return true;
}
}
sender.sendMessage(prefix+"§4Erreur: §cCommande incorrecte.");
sender.sendMessage(prefix+"§4Essayez /lg §caddSpawn/end/start/nextNight/nextDay/reloadConfig/roles/reloadPacks/joinAll");
sender.sendMessage(prefix + "§4Erreur: §cCommande incorrecte.");
sender.sendMessage(prefix + "§4Essayez /lg §caddSpawn/end/start/nextNight/nextDay/reloadConfig/roles/reloadPacks/joinAll");
return true;
}
return false;
}
@Override
public List<String> onTabComplete(CommandSender sender, Command command, String alias, String[] args) {
if(!sender.hasPermission("loupgarou.admin"))
if (!sender.hasPermission("loupgarou.admin"))
return new ArrayList<>(0);
if(args.length > 1) {
if(args[0].equalsIgnoreCase("roles"))
if(args.length == 2)
if (args.length > 1) {
if (args[0].equalsIgnoreCase("roles"))
if (args.length == 2)
return getStartingList(args[1], "list", "set");
else if(args.length == 3 && args[1].equalsIgnoreCase("set"))
else if (args.length == 3 && args[1].equalsIgnoreCase("set"))
return getStartingList(args[2], getRoles().keySet().toArray(new String[getRoles().size()]));
else if(args.length == 4)
else if (args.length == 4)
return Arrays.asList("0", "1", "2", "3", "4", "5", "6", "7", "8", "9");
}else if(args.length == 1)
} else if (args.length == 1)
return getStartingList(args[0], "addSpawn", "end", "start", "nextNight", "nextDay", "reloadConfig", "roles", "joinAll", "reloadPacks");
return new ArrayList<>(0);
}
private List<String> getStartingList(String startsWith, String... list){
private List<String> getStartingList(String startsWith, String... list) {
startsWith = startsWith.toLowerCase();
ArrayList<String> returnlist = new ArrayList<>();
if(startsWith.length() == 0)
if (startsWith.length() == 0)
return Arrays.asList(list);
for(String s : list)
if(s.toLowerCase().startsWith(startsWith))
for (String s : list)
if (s.toLowerCase().startsWith(startsWith))
returnlist.add(s);
return returnlist;
}
public void loadConfig() {
int players = 0;
for(String role : roles.keySet())
players += getConfig().getInt("role."+role);
for (String role : roles.keySet())
players += getConfig().getInt("role." + role);
currentGame = new LGGame(this, players);
}
@Override
public void onDisable() {
ProtocolLibrary.getProtocolManager().removePacketListeners(this);
}
public static MainLg getInstance() {
return instance;
}
private void loadRoles() {
try {
roles.put("LoupGarou", RLoupGarou.class.getConstructor(LGGame.class));

View file

@ -6,8 +6,11 @@ import lombok.RequiredArgsConstructor;
@RequiredArgsConstructor
public class IndexedRole {
@Getter private final Role role;
@Getter private int number = 1;
@Getter
private final Role role;
@Getter
private int number = 1;
public void increase() {
number++;
}

File diff suppressed because one or more lines are too long

View file

@ -1,7 +1,6 @@
package fr.leomelki.loupgarou.classes;
import com.comphenix.protocol.wrappers.WrappedSignedProperty;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
@ -10,5 +9,6 @@ public enum LGCustomSkin {
VILLAGER(new WrappedSignedProperty("textures", "eyJ0aW1lc3RhbXAiOjE1NzcwNTE5MDIyNDgsInByb2ZpbGVJZCI6Ijc4YWQzMjI2YmJkYTQwMGZiNTExMjAzMDY4MGNjN2I0IiwicHJvZmlsZU5hbWUiOiJTaHl0b29zIiwidGV4dHVyZXMiOnsiU0tJTiI6eyJ1cmwiOiJodHRwOi8vdGV4dHVyZXMubWluZWNyYWZ0Lm5ldC90ZXh0dXJlLzYxZmE3Y2UyYmQxMmJmMzBjOTcxZjUwZjJiMGIyYTZkZWUyOWU4MWM5MmJkZmFhZjFkMDJlNjM5YzJiZjMzNWEiLCJtZXRhZGF0YSI6eyJtb2RlbCI6InNsaW0ifX19fQ==", "Qk3Gh9IbVwqIvzv0t3vNrGhzW1ejvKls/7n1vqC7UozJYFotECsBla3DFrxrLvTVsCMAQ3cXGq9QjfFF1U/q0NYvWNXVPbrIxX6LH2t2SI9F1+WLQ7LGYwwABzMGDClJXkuUr0yEOPtCwoTgvinVkCZmNRrN0VDAwd+ie3LCnuBjo3iabjA4dxXLE59mnvCGKo5pGdqThn/KikUldvYGBjpQa+X5F+jQhj7TucZ8t0VJ2t05TkKHS+bcIcmCD+UorGG1N5uiNkQe89BMXZKQEebydtnH5RT8efqHfYT5aZY/6IJKTMqIeclcWy2f6LIfRb97AeifOPPHTfjl2Q6wjvOdnvGuNa+Xk6biNM7cLz1KQzdMM0CvkiZZ9XtFul5+PXEobx2IjIEcrStZX0fl/NZid+kf+2RXbPKx4Z+07q5PbeCzr1UD3DMWlrEMQQppIB26uhPLS9mh3IvM9bhx+vIbByr1Z5p3aT4J2mbhwwmf/LUpNUyMn6oHt19zX6cEcSbncGBLgEHOrUXgxdK/Sm4lJKA1Mr3M0o8CSt7ldLc6mA4oBPMK/OV/c0rwb1W2GWOUyw99dNT/jFSFXyyjCHW0+5FkAW+H+8Y0dZ3U4UWaAmX4JNfdxiih97eTBKEvIC8V48hiFS/UV9A9LBVPNkca/4lanh/jNZ7VRQ+/vU8=")),
MAYOR(new WrappedSignedProperty("textures", "eyJ0aW1lc3RhbXAiOjE1NzcwNTE4NjcxMDcsInByb2ZpbGVJZCI6Ijc4YWQzMjI2YmJkYTQwMGZiNTExMjAzMDY4MGNjN2I0IiwicHJvZmlsZU5hbWUiOiJTaHl0b29zIiwidGV4dHVyZXMiOnsiU0tJTiI6eyJ1cmwiOiJodHRwOi8vdGV4dHVyZXMubWluZWNyYWZ0Lm5ldC90ZXh0dXJlLzUzYTk5NjljMjU0YWRkYmZkNjdmNDJlZmMxODNkZDg5ZWE3ZTliOGE4NDY2YWNkOWZhMWZmMTYzMTQ0MTczMDMifX19", "fq/bN78Y70k2clbfg6sLRuj4mhvDTz58fKI3/0XvzJH/bQF5Mf+jcFwpXJN+ZiupMaHFHI1bBQ20lrzlGvtrCoYu9+Bx4otin0NQVxc3pOEewikzYub64niMPq8irGJrS2pB1B2Uym5F+/wX8TXOkySyAo1r3lzh6qmfe1bpNG7gcc9+ulYdAbnyhxTko3d8poBsjLnadpo0/rBNMkNIua9ryIE3WHW+DOxLwpLpd3TAB15RnA3/qvyBlqQBny1M24ccjmzxjiUbzF66EtTC+BRs3eS8or/vxvdmi70e295gMoERZJ5pFukxe9LB0IEg9cLHwuEl7OC8FcuLUQFnm1EVPjfSlSF36Sd+iVwjFE/x1zINKYsDHwF/TM+yAWOv+PwgGxgQj1C97VaWEkrHXDMEzgxi8DAcPbDBwcyBZXRgOJTHRSH2ATvGDqeT7iQbPrP+y0YNFUDXyBrKYgscgA7bMtBgWvW75SdvcIhqQEVe/jMivMWDuvwhQF4lUGonHc0B5wi1216fqTypEcOeaa5ab+siNssFXpEsaFP9l+1o6uYjNbBpptEAsIlKbnjDaVSkCTvsW7ICaPAZcZCavpyST5MYTv6C7n/bwl3nfzzI7U1LYvYi/gMEHKWfNwLs4T+4VQ3xZD0DpkEQgDrax+Wt182K6OvrAcOcCAfWySo=\",\"name")),
WEREWOLF(new WrappedSignedProperty("textures", "eyJ0aW1lc3RhbXAiOjE1NzcwNTE3NTU1NDgsInByb2ZpbGVJZCI6Ijc4YWQzMjI2YmJkYTQwMGZiNTExMjAzMDY4MGNjN2I0IiwicHJvZmlsZU5hbWUiOiJTaHl0b29zIiwidGV4dHVyZXMiOnsiU0tJTiI6eyJ1cmwiOiJodHRwOi8vdGV4dHVyZXMubWluZWNyYWZ0Lm5ldC90ZXh0dXJlL2U1NGE2MmRhNGMzZTI5YjdiZWM4ZTI0YzhiNTAyZGZjNWNmMTNmYjc0NjFhN2I5YWY2NGY2Yjc1ZGFhNmE2MDUifX19", "k0cT/rDkBW3QMqSavKc0Nbu39ft3i0TLLhxLht7LKKuA+Q+amCmzw/NZjZRtJc/R87uyl2B+JHLTWTOcbDQX2bE7fIzEvYFhvbb2dasxeYA03wBwZ+OuJlhhxWSSX2NoAI6gEGcWQ3k4xcf+xhtD+5eddjL5k+Dv/kVW6qCWprfPSmd4+KQ0aVwyBkbheyTBSaamtpPj24UYM1EL9POF/PrbmiipfSthp7DkwL4PprW+0Z3pzFMgY46Ay2VJYxa+Q6q3IlYqSXMkjJccf3msyOTGe3JSiQc1Du/djffvLIoyjybolNb5rQ/OrnYIEtnqCuXstJJd3J+a6F8w4DkS2ZMVY4lvidb4coVeFmm9Nk/afqqyG99TDmvZNFWFSeaaxGSWeZPkneAEFuFQXn76sl1xdtXkgXmP8H0yvs9SwA9UnGoldIay6D1HzAOGo3n3stV6188K0ucey1KsH6nNlZfT2hnqvI1lfKD67oQNFfl4kDLRwArfZJUmcQOJh9/fk6/bJvgYuElEkGy++0FkuKKkRJHPIW5+kPZguNo96cAAGxhSH3IIscLoxDdn53iSnngpKttWfG6ccI/XMGTWp4wCq6IC2IBZcmKEqK+fN5dVbR4tn79pXlQ2Yyk7kvXaZjdVHrKC1Buw1gjjC1EvmiJjTRZVHPYlCTkfy+hdqzE="));
@Getter private final WrappedSignedProperty property;
@Getter
private final WrappedSignedProperty property;
}

File diff suppressed because it is too large Load diff

View file

@ -1,22 +1,11 @@
package fr.leomelki.loupgarou.classes;
import java.util.*;
import org.bukkit.GameMode;
import org.bukkit.Location;
import org.bukkit.craftbukkit.v1_15_R1.entity.CraftPlayer;
import org.bukkit.entity.Player;
import org.bukkit.potion.PotionEffect;
import org.bukkit.potion.PotionEffectType;
import org.bukkit.scheduler.BukkitRunnable;
import com.comphenix.protocol.wrappers.EnumWrappers.NativeGameMode;
import com.comphenix.protocol.wrappers.EnumWrappers.PlayerInfoAction;
import com.comphenix.protocol.wrappers.EnumWrappers.TitleAction;
import com.comphenix.protocol.wrappers.PlayerInfoData;
import com.comphenix.protocol.wrappers.WrappedChatComponent;
import com.comphenix.protocol.wrappers.WrappedGameProfile;
import fr.leomelki.com.comphenix.packetwrapper.WrapperPlayServerChat;
import fr.leomelki.com.comphenix.packetwrapper.WrapperPlayServerPlayerInfo;
import fr.leomelki.com.comphenix.packetwrapper.WrapperPlayServerScoreboardTeam;
@ -37,67 +26,101 @@ import net.minecraft.server.v1_15_R1.DimensionManager;
import net.minecraft.server.v1_15_R1.EnumGamemode;
import net.minecraft.server.v1_15_R1.PacketPlayOutRespawn;
import net.minecraft.server.v1_15_R1.WorldType;
import org.bukkit.GameMode;
import org.bukkit.Location;
import org.bukkit.craftbukkit.v1_15_R1.entity.CraftPlayer;
import org.bukkit.entity.Player;
import org.bukkit.potion.PotionEffect;
import org.bukkit.potion.PotionEffectType;
import org.bukkit.scheduler.BukkitRunnable;
import java.util.*;
public class LGPlayer {
private static final HashMap<Player, LGPlayer> cachedPlayers = new HashMap<>();
private final MainLg plugin;
public static LGPlayer thePlayer(MainLg plugin, Player player) {
LGPlayer lgp = cachedPlayers.get(player);
if(lgp == null) {
lgp = new LGPlayer(plugin, player);
cachedPlayers.put(player, lgp);
}
return lgp;
}
public static LGPlayer removePlayer(Player player) {
return cachedPlayers.remove(player);//.remove();
}
@Getter @Setter private int place;
@Getter private Player player;
@Getter @Setter private boolean dead;
@Setter @Getter private Role role;
@Getter
private final VariableCache cache = new VariableCache();
public boolean canSelectDead;
@Getter
boolean muted;
long lastChoose;
@Getter
@Setter
private int place;
@Getter
private Player player;
@Getter
@Setter
private boolean dead;
@Setter
@Getter
private Role role;
private LGChooseCallback chooseCallback;
private List<LGPlayer> blacklistedChoice = new ArrayList<>(0);
@Getter private final VariableCache cache = new VariableCache();
@Getter @Setter private LGGame game;
@Getter @Setter private String latestObjective;
@Getter private CustomScoreboard scoreboard;
@Getter
@Setter
private LGGame game;
@Getter
@Setter
private String latestObjective;
@Getter
private CustomScoreboard scoreboard;
private String name;
@Getter
private LGChat chat;
public LGPlayer(MainLg mainLg, Player player) {
this.plugin = mainLg;
this.player = player;
}
public LGPlayer(MainLg mainLg, String name) {
this.plugin = mainLg;
this.name = name;
}
public static LGPlayer thePlayer(MainLg plugin, Player player) {
LGPlayer lgp = cachedPlayers.get(player);
if (lgp == null) {
lgp = new LGPlayer(plugin, player);
cachedPlayers.put(player, lgp);
}
return lgp;
}
public static LGPlayer removePlayer(Player player) {
return cachedPlayers.remove(player);//.remove();
}
public void setScoreboard(CustomScoreboard scoreboard) {
if(player != null) {
if(this.scoreboard != null)
if (player != null) {
if (this.scoreboard != null)
this.scoreboard.hide();
this.scoreboard = scoreboard;
if(scoreboard != null)
if (scoreboard != null)
scoreboard.show();
}
}
public void sendActionBarMessage(String msg) {
if(this.player != null) {
if (this.player != null) {
WrapperPlayServerChat chat = new WrapperPlayServerChat();
chat.setPosition((byte)2);
chat.setPosition((byte) 2);
chat.setMessage(WrappedChatComponent.fromText(msg));
chat.sendPacket(getPlayer());
}
}
public void sendMessage(String msg) {
if(this.player != null)
getPlayer().sendMessage(MainLg.getPrefix()+msg);
if (this.player != null)
getPlayer().sendMessage(MainLg.getPrefix() + msg);
}
public void sendTitle(String title, String subTitle, int stay) {
if(this.player != null) {
if (this.player != null) {
WrapperPlayServerTitle titlePacket = new WrapperPlayServerTitle();
titlePacket.setAction(TitleAction.TIMES);
titlePacket.setFadeIn(10);
@ -116,21 +139,21 @@ public class LGPlayer {
titlePacket.sendPacket(player);
}
}
public void remove() {
this.player = null;
}
private String name;
public String getName() {
return player != null ? getPlayer().getName() : name;
}
public boolean join(LGGame game) {
if(getPlayer().getGameMode() == GameMode.SPECTATOR) {
if (getPlayer().getGameMode() == GameMode.SPECTATOR) {
sendMessage("§cÉtant en mode spectateur, vous ne rejoignez pas la partie !");
return false;
}
if(game.tryToJoin(this)) {
if (game.tryToJoin(this)) {
//To update the skin
updateOwnSkin();
getPlayer().setWalkSpeed(0.2f);
@ -139,27 +162,25 @@ public class LGPlayer {
}
return false;
}
public void choose(LGChooseCallback callback, LGPlayer... blacklisted) {
this.blacklistedChoice = blacklisted == null ? new ArrayList<>(0) : Arrays.asList(blacklisted);
this.chooseCallback = callback;
//sendMessage("§7§oTIP: Regardez un joueur et tapez le afin de le sélectionner.");
}
public void stopChoosing() {
this.blacklistedChoice = null;
this.chooseCallback = null;
}
public interface LGChooseCallback{
void callback(LGPlayer choosen);
}
public void showView() {
if(getGame() != null && player != null)
for(LGPlayer lgp : getGame().getAlive())
if(!lgp.isDead()) {
if(lgp != this && lgp.getPlayer() != null)
if (getGame() != null && player != null)
for (LGPlayer lgp : getGame().getAlive())
if (!lgp.isDead()) {
if (lgp != this && lgp.getPlayer() != null)
getPlayer().showPlayer(plugin, lgp.getPlayer());
else{
else {
WrapperPlayServerScoreboardTeam team = new WrapperPlayServerScoreboardTeam();
team.setMode(2);
team.setName(lgp.getName());
@ -182,9 +203,9 @@ public class LGPlayer {
//TODO Update prefix for only one guy
public void updatePrefix() {
if(getGame() != null && !isDead() && player != null) {
if (getGame() != null && !isDead() && player != null) {
List<String> meList = Collections.singletonList(getName());
for(LGPlayer lgp : getGame().getInGame()) {
for (LGPlayer lgp : getGame().getInGame()) {
WrapperPlayServerPlayerInfo info = new WrapperPlayServerPlayerInfo();
ArrayList<PlayerInfoData> infos = new ArrayList<>();
info.setAction(PlayerInfoAction.ADD_PLAYER);
@ -201,14 +222,15 @@ public class LGPlayer {
}
}
}
public void hideView() {
if(getGame() != null && player != null) {
if (getGame() != null && player != null) {
WrapperPlayServerPlayerInfo info = new WrapperPlayServerPlayerInfo();
ArrayList<PlayerInfoData> infos = new ArrayList<>();
info.setAction(PlayerInfoAction.ADD_PLAYER);
for(LGPlayer lgp : getGame().getAlive())
if(lgp != this && lgp.getPlayer() != null) {
if(!lgp.isDead())
for (LGPlayer lgp : getGame().getAlive())
if (lgp != this && lgp.getPlayer() != null) {
if (!lgp.isDead())
infos.add(new PlayerInfoData(new WrappedGameProfile(lgp.getPlayer().getUniqueId(), lgp.getName()), 0, NativeGameMode.ADVENTURE, WrappedChatComponent.fromText(lgp.getName())));
getPlayer().hidePlayer(plugin, lgp.getPlayer());
}
@ -221,24 +243,25 @@ public class LGPlayer {
}
public void updateSkin() {
if(getGame() != null && player != null) {
for(LGPlayer lgp : getGame().getInGame()) {
if(lgp == this) {
if (getGame() != null && player != null) {
for (LGPlayer lgp : getGame().getInGame()) {
if (lgp == this) {
WrapperPlayServerPlayerInfo info = new WrapperPlayServerPlayerInfo();
ArrayList<PlayerInfoData> infos = new ArrayList<>();
info.setAction(PlayerInfoAction.ADD_PLAYER);
infos.add(new PlayerInfoData(new WrappedGameProfile(getPlayer().getUniqueId(), getName()), 0, NativeGameMode.ADVENTURE, WrappedChatComponent.fromText(getName())));
info.setData(infos);
info.sendPacket(getPlayer());
}else if(!isDead() && lgp.getPlayer() != null){
} else if (!isDead() && lgp.getPlayer() != null) {
lgp.getPlayer().hidePlayer(plugin, getPlayer());
lgp.getPlayer().showPlayer(plugin, getPlayer());
}
}
}
}
public void updateOwnSkin() {
if(player != null) {
if (player != null) {
//On change son skin avec un packet de PlayerInfo (dans le tab)
WrapperPlayServerPlayerInfo infos = new WrapperPlayServerPlayerInfo();
infos.setAction(PlayerInfoAction.ADD_PLAYER);
@ -247,7 +270,7 @@ public class LGPlayer {
infos.sendPacket(getPlayer());
//Pour qu'il voit son skin changer (sa main et en f5), on lui dit qu'il respawn (alors qu'il n'est pas mort mais ça marche quand même mdr)
PacketPlayOutRespawn respawn = new PacketPlayOutRespawn(DimensionManager.OVERWORLD, 0, WorldType.NORMAL, EnumGamemode.ADVENTURE);
((CraftPlayer)getPlayer()).getHandle().playerConnection.sendPacket(respawn);
((CraftPlayer) getPlayer()).getHandle().playerConnection.sendPacket(respawn);
//Enfin, on le téléporte à sa potion actuelle car sinon il se verra dans le vide
getPlayer().teleport(getPlayer().getLocation());
float speed = getPlayer().getWalkSpeed();
@ -263,18 +286,18 @@ public class LGPlayer {
//Et c'est bon, le joueur se voit avec un nouveau skin avec quasiment aucun problème visible à l'écran :D
}
}
public boolean canSelectDead;
public LGPlayer getPlayerOnCursor(List<LGPlayer> list) {
Location loc = getPlayer().getLocation();
if(loc.getPitch() > 60)
if(blacklistedChoice.contains(this))
if (loc.getPitch() > 60)
if (blacklistedChoice.contains(this))
return null;
else
return this;
for(int i = 0;i<50;i++) {
for (int i = 0; i < 50; i++) {
loc.add(loc.getDirection());
for(LGPlayer player : list) {
if(player != this && !blacklistedChoice.contains(player) && (!player.isDead() || canSelectDead) && VariousUtils.distanceSquaredXZ(loc, player.getPlayer().getLocation()) < 0.35 && Math.abs(loc.getY()-player.getPlayer().getLocation().getY()) < 2) {
for (LGPlayer player : list) {
if (player != this && !blacklistedChoice.contains(player) && (!player.isDead() || canSelectDead) && VariousUtils.distanceSquaredXZ(loc, player.getPlayer().getLocation()) < 0.35 && Math.abs(loc.getY() - player.getPlayer().getLocation().getY()) < 2) {
return player;
}
}
@ -285,6 +308,7 @@ public class LGPlayer {
public RoleType getRoleType() {
return this.getCache().getBoolean("vampire") ? RoleType.VAMPIRE : this.getCache().getBoolean("infected") ? RoleType.LOUP_GAROU : getRole().getType(this);
}
public RoleWinType getRoleWinType() {
return this.getCache().getBoolean("vampire") ? RoleWinType.VAMPIRE : this.getCache().getBoolean("infected") ? RoleWinType.LOUP_GAROU : getRole().getWinType(this);
}
@ -293,44 +317,42 @@ public class LGPlayer {
return !this.getCache().getBoolean("vampire");
}
@Getter
boolean muted;
public void die() {
setMuted();
}
private void setMuted() {
if(player != null)
for(LGPlayer lgp : getGame().getInGame())
if(lgp != this && lgp.getPlayer() != null)
if (player != null)
for (LGPlayer lgp : getGame().getInGame())
if (lgp != this && lgp.getPlayer() != null)
lgp.getPlayer().hidePlayer(plugin, getPlayer());
muted = true;
}
public void resetMuted() {
muted = false;
}
@Getter private LGChat chat;
public void joinChat(LGChat chat, LGChatCallback callback) {
joinChat(chat, callback, false);
}
public void joinChat(LGChat chat) {
joinChat(chat, null, false);
}
public void joinChat(LGChat chat, boolean muted) {
joinChat(chat, null, muted);
}
public void joinChat(LGChat chat, LGChatCallback callback, boolean muted) {
if(this.chat != null && !muted)
if (this.chat != null && !muted)
this.chat.leave(this);
if(!muted)
if (!muted)
this.chat = chat;
if(chat != null && player != null)
if (chat != null && player != null)
chat.join(this, callback == null ? chat.getDefaultCallback() : callback);
}
@ -340,26 +362,26 @@ public class LGPlayer {
}
public void onChat(String message) {
if(chat != null) {
if (chat != null) {
chat.sendMessage(this, message);
}
}
public void playAudio(LGSound sound, double volume) {
if(player != null)
getPlayer().playSound(getPlayer().getLocation(), sound.getSound(), (float)volume, 1);
if (player != null)
getPlayer().playSound(getPlayer().getLocation(), sound.getSound(), (float) volume, 1);
}
public void stopAudio(LGSound sound) {
if(player != null)
if (player != null)
getPlayer().stopSound(sound.getSound());
}
long lastChoose;
public void chooseAction() {
long now = System.currentTimeMillis();
if(lastChoose+200 < now) {
if(chooseCallback != null)
if (lastChoose + 200 < now) {
if (chooseCallback != null)
chooseCallback.callback(getPlayerOnCursor(getGame().getInGame()));
lastChoose = now;
}
@ -367,6 +389,10 @@ public class LGPlayer {
@Override
public String toString() {
return super.toString()+" ("+getName()+")";
return super.toString() + " (" + getName() + ")";
}
public interface LGChooseCallback {
void callback(LGPlayer choosen);
}
}

View file

@ -1,8 +1,7 @@
package fr.leomelki.loupgarou.classes;
import org.bukkit.Sound;
import lombok.Getter;
import org.bukkit.Sound;
public enum LGSound {
KILL(Sound.ENTITY_BLAZE_DEATH),
@ -13,7 +12,8 @@ public enum LGSound {
@Getter
final Sound sound;
LGSound(Sound sound){
LGSound(Sound sound) {
this.sound = sound;
}
}

View file

@ -1,9 +1,17 @@
package fr.leomelki.loupgarou.classes;
import java.lang.reflect.Field;
import java.util.*;
import java.util.Map.Entry;
import com.comphenix.protocol.wrappers.EnumWrappers.ItemSlot;
import com.comphenix.protocol.wrappers.WrappedDataWatcher;
import com.comphenix.protocol.wrappers.WrappedDataWatcher.WrappedDataWatcherObject;
import com.comphenix.protocol.wrappers.WrappedWatchableObject;
import fr.leomelki.com.comphenix.packetwrapper.*;
import fr.leomelki.loupgarou.MainLg;
import fr.leomelki.loupgarou.classes.LGGame.TextGenerator;
import fr.leomelki.loupgarou.classes.LGPlayer.LGChooseCallback;
import fr.leomelki.loupgarou.events.LGVoteLeaderChange;
import fr.leomelki.loupgarou.utils.VariousUtils;
import lombok.Getter;
import net.minecraft.server.v1_15_R1.*;
import org.bukkit.Bukkit;
import org.bukkit.Location;
import org.bukkit.Material;
@ -13,83 +21,16 @@ import org.bukkit.entity.EntityType;
import org.bukkit.inventory.ItemStack;
import org.bukkit.scheduler.BukkitRunnable;
import com.comphenix.protocol.wrappers.EnumWrappers.ItemSlot;
import com.comphenix.protocol.wrappers.WrappedDataWatcher;
import com.comphenix.protocol.wrappers.WrappedDataWatcher.WrappedDataWatcherObject;
import com.comphenix.protocol.wrappers.WrappedWatchableObject;
import fr.leomelki.com.comphenix.packetwrapper.WrapperPlayServerEntityDestroy;
import fr.leomelki.com.comphenix.packetwrapper.WrapperPlayServerEntityEquipment;
import fr.leomelki.com.comphenix.packetwrapper.WrapperPlayServerEntityLook;
import fr.leomelki.com.comphenix.packetwrapper.WrapperPlayServerEntityMetadata;
import fr.leomelki.com.comphenix.packetwrapper.WrapperPlayServerSpawnEntityLiving;
import fr.leomelki.loupgarou.MainLg;
import fr.leomelki.loupgarou.classes.LGGame.TextGenerator;
import fr.leomelki.loupgarou.classes.LGPlayer.LGChooseCallback;
import fr.leomelki.loupgarou.events.LGVoteLeaderChange;
import fr.leomelki.loupgarou.utils.VariousUtils;
import lombok.Getter;
import net.minecraft.server.v1_15_R1.DataWatcher;
import net.minecraft.server.v1_15_R1.DataWatcherObject;
import net.minecraft.server.v1_15_R1.Entity;
import net.minecraft.server.v1_15_R1.EntityArmorStand;
import net.minecraft.server.v1_15_R1.IChatBaseComponent;
import net.minecraft.server.v1_15_R1.PacketPlayOutEntityMetadata;
import java.lang.reflect.Field;
import java.util.*;
import java.util.Map.Entry;
public class LGVote {
@Getter LGPlayer choosen;
private int timeout;
private final int initialTimeout;
private final int littleTimeout;
private Runnable callback;
private final LGGame game;
@Getter private List<LGPlayer> participants, viewers;
private final TextGenerator generator;
@Getter private final HashMap<LGPlayer, List<LGPlayer>> votes = new HashMap<>();
private int votesSize = 0;
private LGPlayer mayor;
private ArrayList<LGPlayer> latestTop = new ArrayList<>(), blacklisted = new ArrayList<>();
private final boolean randomIfEqual;
@Getter private boolean mayorVote;
private boolean ended;
public LGVote(int timeout, int littleTimeout, LGGame game, boolean positiveVote, boolean randomIfEqual, TextGenerator generator) {
this.littleTimeout = littleTimeout;
this.initialTimeout = timeout;
this.timeout = timeout;
this.game = game;
this.generator = generator;
this.randomIfEqual = randomIfEqual;
}
public void start(List<LGPlayer> participants, List<LGPlayer> viewers, Runnable callback) {
this.callback = callback;
this.participants = participants;
this.viewers = viewers;
game.wait(timeout, this::end, generator);
for(LGPlayer player : participants)
player.choose(getChooseCallback(player));
}
public void start(List<LGPlayer> participants, List<LGPlayer> viewers, Runnable callback, ArrayList<LGPlayer> blacklisted) {
this.callback = callback;
this.participants = participants;
this.viewers = viewers;
game.wait(timeout, this::end, generator);
for(LGPlayer player : participants)
player.choose(getChooseCallback(player));
this.blacklisted = blacklisted;
}
public void start(List<LGPlayer> participants, List<LGPlayer> viewers, Runnable callback, LGPlayer mayor) {
this.callback = callback;
this.participants = participants;
this.viewers = viewers;
this.mayor = mayor;
game.wait(timeout, this::end, generator);
for(LGPlayer player : participants)
player.choose(getChooseCallback(player));
}
private static final EntityArmorStand eas = new EntityArmorStand(((CraftWorld) Bukkit.getWorlds().get(0)).getHandle(), 0, 0, 0);
private static DataWatcherObject<Optional<IChatBaseComponent>> az;
private static DataWatcherObject<Boolean> aA;
private static DataWatcherObject<Byte> T;
private static final EntityArmorStand eas = new EntityArmorStand(((CraftWorld)Bukkit.getWorlds().get(0)).getHandle(), 0, 0, 0);
static {
try {
Field f = Entity.class.getDeclaredField("az");
@ -101,61 +42,125 @@ public class LGVote {
f = Entity.class.getDeclaredField("T");
f.setAccessible(true);
T = (DataWatcherObject<Byte>) f.get(null);
}catch(Exception err) {
} catch (Exception err) {
err.printStackTrace();
}
}
final WrappedDataWatcherObject invisible = new WrappedDataWatcherObject(0, WrappedDataWatcher.Registry.get(Byte.class));
final WrappedDataWatcherObject noGravity = new WrappedDataWatcherObject(5, WrappedDataWatcher.Registry.get(Boolean.class));
private final int initialTimeout;
private final int littleTimeout;
private final LGGame game;
private final TextGenerator generator;
@Getter
private final HashMap<LGPlayer, List<LGPlayer>> votes = new HashMap<>();
private final boolean randomIfEqual;
@Getter
LGPlayer choosen;
WrappedDataWatcherObject customNameVisible = new WrappedDataWatcherObject(3, WrappedDataWatcher.Registry.get(Boolean.class));
WrappedDataWatcherObject customName = new WrappedDataWatcherObject(2, WrappedDataWatcher.Registry.get(IChatBaseComponent.class));
WrappedDataWatcherObject item = new WrappedDataWatcherObject(7, WrappedDataWatcher.Registry.get(net.minecraft.server.v1_15_R1.ItemStack.class));
private int timeout;
private Runnable callback;
@Getter
private List<LGPlayer> participants, viewers;
private int votesSize = 0;
private LGPlayer mayor;
private ArrayList<LGPlayer> latestTop = new ArrayList<>(), blacklisted = new ArrayList<>();
@Getter
private boolean mayorVote;
private boolean ended;
public LGVote(int timeout, int littleTimeout, LGGame game, boolean positiveVote, boolean randomIfEqual, TextGenerator generator) {
this.littleTimeout = littleTimeout;
this.initialTimeout = timeout;
this.timeout = timeout;
this.game = game;
this.generator = generator;
this.randomIfEqual = randomIfEqual;
}
public void start(List<LGPlayer> participants, List<LGPlayer> viewers, Runnable callback) {
this.callback = callback;
this.participants = participants;
this.viewers = viewers;
game.wait(timeout, this::end, generator);
for (LGPlayer player : participants)
player.choose(getChooseCallback(player));
}
public void start(List<LGPlayer> participants, List<LGPlayer> viewers, Runnable callback, ArrayList<LGPlayer> blacklisted) {
this.callback = callback;
this.participants = participants;
this.viewers = viewers;
game.wait(timeout, this::end, generator);
for (LGPlayer player : participants)
player.choose(getChooseCallback(player));
this.blacklisted = blacklisted;
}
public void start(List<LGPlayer> participants, List<LGPlayer> viewers, Runnable callback, LGPlayer mayor) {
this.callback = callback;
this.participants = participants;
this.viewers = viewers;
this.mayor = mayor;
game.wait(timeout, this::end, generator);
for (LGPlayer player : participants)
player.choose(getChooseCallback(player));
}
private void end() {
ended = true;
for(LGPlayer lgp : viewers)
for (LGPlayer lgp : viewers)
showVoting(lgp, null);
for(LGPlayer lgp : votes.keySet())
for (LGPlayer lgp : votes.keySet())
updateVotes(lgp, true);
int max = 0;
boolean equal = false;
for(Entry<LGPlayer, List<LGPlayer>> entry : votes.entrySet())
if(entry.getValue().size() > max) {
for (Entry<LGPlayer, List<LGPlayer>> entry : votes.entrySet())
if (entry.getValue().size() > max) {
equal = false;
max = entry.getValue().size();
choosen = entry.getKey();
}else if(entry.getValue().size() == max)
} else if (entry.getValue().size() == max)
equal = true;
for(LGPlayer player : participants) {
for (LGPlayer player : participants) {
player.getCache().remove("vote");
player.stopChoosing();
}
if(equal)
if (equal)
choosen = null;
if(equal && mayor == null && randomIfEqual) {
if (equal && mayor == null && randomIfEqual) {
ArrayList<LGPlayer> choosable = new ArrayList<>();
for(Entry<LGPlayer, List<LGPlayer>> entry : votes.entrySet())
if(entry.getValue().size() == max)
for (Entry<LGPlayer, List<LGPlayer>> entry : votes.entrySet())
if (entry.getValue().size() == max)
choosable.add(entry.getKey());
choosen = choosable.get(game.getRandom().nextInt(choosable.size()));
}
if(equal && mayor != null && max != 0) {
for(LGPlayer player : viewers)
if (equal && mayor != null && max != 0) {
for (LGPlayer player : viewers)
player.sendMessage("§9Égalité, le §5§lCapitaine§9 va départager les votes.");
mayor.sendMessage("§6Tu dois choisir qui va mourir.");
ArrayList<LGPlayer> choosable = new ArrayList<>();
for(Entry<LGPlayer, List<LGPlayer>> entry : votes.entrySet())
if(entry.getValue().size() == max)
for (Entry<LGPlayer, List<LGPlayer>> entry : votes.entrySet())
if (entry.getValue().size() == max)
choosable.add(entry.getKey());
for(int i = 0;i<choosable.size();i++) {
for (int i = 0; i < choosable.size(); i++) {
LGPlayer lgp = choosable.get(i);
showArrow(mayor, lgp, -mayor.getPlayer().getEntityId()-i);
showArrow(mayor, lgp, -mayor.getPlayer().getEntityId() - i);
}
StringJoiner sj = new StringJoiner(", ");
for(int i = 0;i<choosable.size()-1;i++)
for (int i = 0; i < choosable.size() - 1; i++)
sj.add(choosable.get(0).getName());
//mayor.sendTitle("§6C'est à vous de délibérer", "Faut-il tuer "+sj+" ou "+choosable.get(choosable.size()-1).getName()+" ?", 100);
ArrayList<LGPlayer> blackListed = new ArrayList<>();
for(LGPlayer player : participants)
if(!choosable.contains(player))
for (LGPlayer player : participants)
if (!choosable.contains(player))
blackListed.add(player);
else {
VariousUtils.setWarning(player.getPlayer(), true);
@ -163,34 +168,34 @@ public class LGVote {
//player.sendTitle("§4§lDéfendez vous !", "§cVous êtes l'un des principaux suspects", 100);
}
mayorVote = true;
game.wait(30, ()->{
for(LGPlayer player : participants)
if(choosable.contains(player))
game.wait(30, () -> {
for (LGPlayer player : participants)
if (choosable.contains(player))
VariousUtils.setWarning(player.getPlayer(), false);
for(int i = 0;i<choosable.size();i++) {
for (int i = 0; i < choosable.size(); i++) {
LGPlayer lgp = choosable.get(i);
showArrow(mayor, null, -mayor.getPlayer().getEntityId()-i);
showArrow(mayor, null, -mayor.getPlayer().getEntityId() - i);
}
//Choix au hasard d'un joueur si personne n'a été désigné
choosen = choosable.get(game.getRandom().nextInt(choosable.size()));
callback.run();
}, (player, secondsLeft)->{
}, (player, secondsLeft) -> {
timeout = secondsLeft;
return mayor == player ? "§6Il te reste §e"+secondsLeft+" seconde"+(secondsLeft > 1 ? "s" : "")+"§6 pour délibérer" : "§6Le §5§lCapitaine§6 délibère (§e"+secondsLeft+" s§6)";
return mayor == player ? "§6Il te reste §e" + secondsLeft + " seconde" + (secondsLeft > 1 ? "s" : "") + "§6 pour délibérer" : "§6Le §5§lCapitaine§6 délibère (§e" + secondsLeft + " s§6)";
});
mayor.choose(choosen -> {
if(choosen != null) {
if(blackListed.contains(choosen))
if (choosen != null) {
if (blackListed.contains(choosen))
mayor.sendMessage("§4§oCe joueur n'est pas concerné par le choix.");
else {
for(LGPlayer player : participants)
if(choosable.contains(player))
for (LGPlayer player : participants)
if (choosable.contains(player))
VariousUtils.setWarning(player.getPlayer(), false);
for(int i = 0;i<choosable.size();i++) {
for (int i = 0; i < choosable.size(); i++) {
LGPlayer lgp = choosable.get(i);
showArrow(mayor, null, -mayor.getPlayer().getEntityId()-i);
showArrow(mayor, null, -mayor.getPlayer().getEntityId() - i);
}
game.cancelWait();
LGVote.this.choosen = choosen;
@ -204,38 +209,40 @@ public class LGVote {
}
}
public LGChooseCallback getChooseCallback(LGPlayer who) {
return choosen -> {
if(choosen != null)
if (choosen != null)
vote(who, choosen);
};
}
public void vote(LGPlayer voter, LGPlayer voted) {
if(blacklisted.contains(voted)) {
voter.sendMessage("§cVous ne pouvez pas votre pour §7§l"+voted.getName()+"§c.");
if (blacklisted.contains(voted)) {
voter.sendMessage("§cVous ne pouvez pas votre pour §7§l" + voted.getName() + "§c.");
return;
}
if(voted == voter.getCache().get("vote"))
if (voted == voter.getCache().get("vote"))
voted = null;
if(voted != null && voter.getPlayer() != null)
if (voted != null && voter.getPlayer() != null)
votesSize++;
if(voter.getCache().has("vote"))
if (voter.getCache().has("vote"))
votesSize--;
if(votesSize == participants.size() && game.getWaitTicks() > littleTimeout*20) {
if (votesSize == participants.size() && game.getWaitTicks() > littleTimeout * 20) {
votesSize = 999;
game.wait(littleTimeout, initialTimeout, this::end, generator);
}
String italic = game.isDay() ? "" : "§o";
boolean changeVote = false;
if(voter.getCache().has("vote")) {//On enlève l'ancien vote
if (voter.getCache().has("vote")) {//On enlève l'ancien vote
LGPlayer devoted = voter.getCache().get("vote");
if(votes.containsKey(devoted)) {
if (votes.containsKey(devoted)) {
List<LGPlayer> voters = votes.get(devoted);
if(voters != null) {
if (voters != null) {
voters.remove(voter);
if(voters.size() == 0)
if (voters.size() == 0)
votes.remove(devoted);
}
}
@ -244,9 +251,9 @@ public class LGVote {
changeVote = true;
}
if(voted != null) {//Si il vient de voter, on ajoute le nouveau vote
if (voted != null) {//Si il vient de voter, on ajoute le nouveau vote
//voter.sendTitle("", "§7Tu as voté pour §7§l"+voted.getName(), 40);
if(votes.containsKey(voted))
if (votes.containsKey(voted))
votes.get(voted).add(voter);
else
votes.put(voted, new ArrayList<>(Collections.singletonList(voter)));
@ -254,56 +261,57 @@ public class LGVote {
updateVotes(voted);
}
if(voter.getPlayer() != null) {
if (voter.getPlayer() != null) {
showVoting(voter, voted);
String message;
if(voted != null) {
if(changeVote) {
message = "§7§l"+voter.getName()+"§6 a changé son vote pour §7§l"+voted.getName()+"§6.";
voter.sendMessage("§6Tu as changé de vote pour §7§l"+voted.getName()+"§6.");
if (voted != null) {
if (changeVote) {
message = "§7§l" + voter.getName() + "§6 a changé son vote pour §7§l" + voted.getName() + "§6.";
voter.sendMessage("§6Tu as changé de vote pour §7§l" + voted.getName() + "§6.");
} else {
message = "§7§l"+voter.getName()+"§6 a voté pour §7§l"+voted.getName()+"§6.";
voter.sendMessage("§6Tu as voté pour §7§l"+voted.getName()+"§6.");
message = "§7§l" + voter.getName() + "§6 a voté pour §7§l" + voted.getName() + "§6.";
voter.sendMessage("§6Tu as voté pour §7§l" + voted.getName() + "§6.");
}
} else {
message = "§7§l"+voter.getName()+"§6 a annulé son vote.";
message = "§7§l" + voter.getName() + "§6 a annulé son vote.";
voter.sendMessage("§6Tu as annulé ton vote.");
}
for(LGPlayer player : viewers)
if(player != voter)
for (LGPlayer player : viewers)
if (player != voter)
player.sendMessage(message);
}
}
public List<LGPlayer> getVotes(LGPlayer voted){
public List<LGPlayer> getVotes(LGPlayer voted) {
return votes.containsKey(voted) ? votes.get(voted) : new ArrayList<>(0);
}
private void updateVotes(LGPlayer voted) {
updateVotes(voted, false);
}
private void updateVotes(LGPlayer voted, boolean kill) {
int entityId = Integer.MIN_VALUE+voted.getPlayer().getEntityId();
int entityId = Integer.MIN_VALUE + voted.getPlayer().getEntityId();
WrapperPlayServerEntityDestroy destroy = new WrapperPlayServerEntityDestroy();
destroy.setEntityIds(new int[] {entityId});
for(LGPlayer lgp : viewers)
destroy.setEntityIds(new int[]{entityId});
for (LGPlayer lgp : viewers)
destroy.sendPacket(lgp.getPlayer());
if(!kill) {
if (!kill) {
int max = 0;
for(Entry<LGPlayer, List<LGPlayer>> entry : votes.entrySet())
if(entry.getValue().size() > max)
for (Entry<LGPlayer, List<LGPlayer>> entry : votes.entrySet())
if (entry.getValue().size() > max)
max = entry.getValue().size();
ArrayList<LGPlayer> last = latestTop;
latestTop = new ArrayList<>();
for(Entry<LGPlayer, List<LGPlayer>> entry : votes.entrySet())
if(entry.getValue().size() == max)
for (Entry<LGPlayer, List<LGPlayer>> entry : votes.entrySet())
if (entry.getValue().size() == max)
latestTop.add(entry.getKey());
Bukkit.getPluginManager().callEvent(new LGVoteLeaderChange(game, this, last, latestTop));
}
if(votes.containsKey(voted) && !kill) {
if (votes.containsKey(voted) && !kill) {
Location loc = voted.getPlayer().getLocation();
WrapperPlayServerSpawnEntityLiving spawn = new WrapperPlayServerSpawnEntityLiving();
@ -311,12 +319,12 @@ public class LGVote {
spawn.setType(EntityType.DROPPED_ITEM);
//spawn.setMetadata(new WrappedDataWatcher(Arrays.asList(new WrappedWatchableObject(0, (byte)0x20), new WrappedWatchableObject(5, true))));
spawn.setX(loc.getX());
spawn.setY(loc.getY()+0.3);
spawn.setY(loc.getY() + 0.3);
spawn.setZ(loc.getZ());
int votesNbr = votes.get(voted).size();
final int numberOfParticipants = participants.size();
final double votePercentage = ((double)votesNbr / numberOfParticipants) * 100;
final double votePercentage = ((double) votesNbr / numberOfParticipants) * 100;
final String votePercentageFormated = String.format("%.0f%%", votePercentage);
final String voteContent = "§6§l" + votesNbr + " / " + numberOfParticipants + "§e vote" + (votesNbr > 1 ? "s" : "") + " (§6§l" + votePercentageFormated + "§e)";
@ -325,14 +333,14 @@ public class LGVote {
meta.setMetadata(Arrays.asList(new WrappedWatchableObject(invisible, (byte)0x20), new WrappedWatchableObject(noGravity, true), new WrappedWatchableObject(customNameVisible, true), new WrappedWatchableObject(customName, IChatBaseComponent.ChatSerializer.b("§6§l"+votesNbr+"§e vote"+(votesNbr > 1 ? "s" : "")))));
*/
DataWatcher datawatcher = new DataWatcher(eas);
datawatcher.register(T, (byte)0x20);
datawatcher.register(T, (byte) 0x20);
datawatcher.register(az, Optional.ofNullable(IChatBaseComponent.ChatSerializer.a("{\"text\":\"" + voteContent + "\"}")));
datawatcher.register(aA, true);
PacketPlayOutEntityMetadata meta = new PacketPlayOutEntityMetadata(entityId, datawatcher, true);
for(LGPlayer lgp : viewers) {
for (LGPlayer lgp : viewers) {
spawn.sendPacket(lgp.getPlayer());
((CraftPlayer)lgp.getPlayer()).getHandle().playerConnection.sendPacket(meta);
((CraftPlayer) lgp.getPlayer()).getHandle().playerConnection.sendPacket(meta);
}
@ -368,37 +376,33 @@ public class LGVote {
// spawn.sendPacket(lgp.getPlayer());
}
}
final WrappedDataWatcherObject invisible = new WrappedDataWatcherObject(0, WrappedDataWatcher.Registry.get(Byte.class));
final WrappedDataWatcherObject noGravity = new WrappedDataWatcherObject(5, WrappedDataWatcher.Registry.get(Boolean.class));
WrappedDataWatcherObject customNameVisible = new WrappedDataWatcherObject(3, WrappedDataWatcher.Registry.get(Boolean.class));
WrappedDataWatcherObject customName = new WrappedDataWatcherObject(2, WrappedDataWatcher.Registry.get(IChatBaseComponent.class));
WrappedDataWatcherObject item = new WrappedDataWatcherObject(7, WrappedDataWatcher.Registry.get(net.minecraft.server.v1_15_R1.ItemStack.class));
private void showVoting(LGPlayer to, LGPlayer ofWho) {
int entityId = -to.getPlayer().getEntityId();
WrapperPlayServerEntityDestroy destroy = new WrapperPlayServerEntityDestroy();
destroy.setEntityIds(new int[] {entityId});
destroy.setEntityIds(new int[]{entityId});
destroy.sendPacket(to.getPlayer());
if(ofWho != null) {
if (ofWho != null) {
WrapperPlayServerSpawnEntityLiving spawn = new WrapperPlayServerSpawnEntityLiving();
spawn.setEntityID(entityId);
spawn.setType(EntityType.DROPPED_ITEM);
//spawn.setMetadata(new WrappedDataWatcher(Arrays.asList(new WrappedWatchableObject(0, (byte)0x20), new WrappedWatchableObject(5, true))));
Location loc = ofWho.getPlayer().getLocation();
spawn.setX(loc.getX());
spawn.setY(loc.getY()+1.3);
spawn.setY(loc.getY() + 1.3);
spawn.setZ(loc.getZ());
spawn.setHeadPitch(0);
Location toLoc = to.getPlayer().getLocation();
double diffX = loc.getX()-toLoc.getX(),
diffZ = loc.getZ()-toLoc.getZ();
float yaw = 180-((float) Math.toDegrees(Math.atan2(diffX, diffZ)));
double diffX = loc.getX() - toLoc.getX(),
diffZ = loc.getZ() - toLoc.getZ();
float yaw = 180 - ((float) Math.toDegrees(Math.atan2(diffX, diffZ)));
spawn.setYaw(yaw);
spawn.sendPacket(to.getPlayer());
WrapperPlayServerEntityMetadata meta = new WrapperPlayServerEntityMetadata();
meta.setEntityID(entityId);
meta.setMetadata(Arrays.asList(new WrappedWatchableObject(invisible, (byte)0x20), new WrappedWatchableObject(noGravity, true)));
meta.setMetadata(Arrays.asList(new WrappedWatchableObject(invisible, (byte) 0x20), new WrappedWatchableObject(noGravity, true)));
meta.sendPacket(to.getPlayer());
WrapperPlayServerEntityLook look = new WrapperPlayServerEntityLook();
@ -424,29 +428,29 @@ public class LGVote {
private void showArrow(LGPlayer to, LGPlayer ofWho, int entityId) {
WrapperPlayServerEntityDestroy destroy = new WrapperPlayServerEntityDestroy();
destroy.setEntityIds(new int[] {entityId});
destroy.setEntityIds(new int[]{entityId});
destroy.sendPacket(to.getPlayer());
if(ofWho != null) {
if (ofWho != null) {
WrapperPlayServerSpawnEntityLiving spawn = new WrapperPlayServerSpawnEntityLiving();
spawn.setEntityID(entityId);
spawn.setType(EntityType.DROPPED_ITEM);
//spawn.setMetadata(new WrappedDataWatcher());
Location loc = ofWho.getPlayer().getLocation();
spawn.setX(loc.getX());
spawn.setY(loc.getY()+1.3);
spawn.setY(loc.getY() + 1.3);
spawn.setZ(loc.getZ());
spawn.setHeadPitch(0);
Location toLoc = to.getPlayer().getLocation();
double diffX = loc.getX()-toLoc.getX(),
diffZ = loc.getZ()-toLoc.getZ();
float yaw = 180-((float) Math.toDegrees(Math.atan2(diffX, diffZ)));
double diffX = loc.getX() - toLoc.getX(),
diffZ = loc.getZ() - toLoc.getZ();
float yaw = 180 - ((float) Math.toDegrees(Math.atan2(diffX, diffZ)));
spawn.setYaw(yaw);
spawn.sendPacket(to.getPlayer());
WrapperPlayServerEntityMetadata meta = new WrapperPlayServerEntityMetadata();
meta.setEntityID(entityId);
meta.setMetadata(Arrays.asList(new WrappedWatchableObject(invisible, (byte)0x20), new WrappedWatchableObject(noGravity, true)));
meta.setMetadata(Arrays.asList(new WrappedWatchableObject(invisible, (byte) 0x20), new WrappedWatchableObject(noGravity, true)));
meta.sendPacket(to.getPlayer());
WrapperPlayServerEntityLook look = new WrapperPlayServerEntityLook();
@ -469,9 +473,10 @@ public class LGVote {
}.runTaskLater(MainLg.getInstance(), 2);
}
}
public void remove(LGPlayer killed) {
participants.remove(killed);
if(!ended) {
if (!ended) {
votes.remove(killed);
latestTop.remove(killed);
}

View file

@ -17,5 +17,6 @@ public enum LGWinType {
VAMPIRE("§6§l§oLa partie a été gagnée par les §5§lVampires§6§l§o !"),
NONE("§4Erreur: §cpersonne n'a gagné la partie.");
@Getter private final String message;
@Getter
private final String message;
}

View file

@ -1,35 +1,41 @@
package fr.leomelki.loupgarou.classes.chat;
import java.util.HashMap;
import java.util.Map.Entry;
import fr.leomelki.loupgarou.classes.LGPlayer;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
import java.util.HashMap;
import java.util.Map.Entry;
@RequiredArgsConstructor
public class LGChat {
@Getter private final HashMap<LGPlayer, LGChatCallback> viewers = new HashMap<>();
@Getter private final LGChatCallback defaultCallback;
public interface LGChatCallback{
String receive(LGPlayer sender, String message);
default String send(LGPlayer sender, String message) {return null;}
}
@Getter
private final HashMap<LGPlayer, LGChatCallback> viewers = new HashMap<>();
@Getter
private final LGChatCallback defaultCallback;
public void sendMessage(LGPlayer sender, String message) {
String sendMessage = getViewers().get(sender).send(sender, message);
for(Entry<LGPlayer, LGChatCallback> entry : viewers.entrySet())
for (Entry<LGPlayer, LGChatCallback> entry : viewers.entrySet())
entry.getKey().sendMessage(sendMessage != null ? sendMessage : entry.getValue().receive(sender, message));
}
public void join(LGPlayer player, LGChatCallback callback) {
if(getViewers().containsKey(player))
if (getViewers().containsKey(player))
getViewers().replace(player, callback);
else
getViewers().put(player, callback);
}
public void leave(LGPlayer player) {
getViewers().remove(player);
}
public interface LGChatCallback {
String receive(LGPlayer sender, String message);
default String send(LGPlayer sender, String message) {
return null;
}
}
}

View file

@ -2,16 +2,18 @@ package fr.leomelki.loupgarou.classes.chat;
import fr.leomelki.loupgarou.classes.LGPlayer;
public class LGNoChat extends LGChat{
public class LGNoChat extends LGChat {
public LGNoChat() {
super(null);
}
public void sendMessage(LGPlayer sender, String message) {}
public void sendMessage(LGPlayer sender, String message) {
}
public void join(LGPlayer player, LGChatCallback callback) {
}
public void leave(LGPlayer player) {
}

View file

@ -1,14 +1,16 @@
package fr.leomelki.loupgarou.events;
import java.util.List;
import fr.leomelki.loupgarou.classes.LGGame;
import fr.leomelki.loupgarou.classes.LGPlayer;
import lombok.Getter;
import java.util.List;
public class LGCustomItemChangeEvent extends LGEvent {
@Getter private final LGPlayer player;
@Getter private final List<String> constraints;
@Getter
private final LGPlayer player;
@Getter
private final List<String> constraints;
public LGCustomItemChangeEvent(LGGame game, LGPlayer player, List<String> constraints) {
super(game);

View file

@ -2,7 +2,7 @@ package fr.leomelki.loupgarou.events;
import fr.leomelki.loupgarou.classes.LGGame;
public class LGDayEndEvent extends LGEvent{
public class LGDayEndEvent extends LGEvent {
public LGDayEndEvent(LGGame game) {
super(game);
}

View file

@ -1,15 +1,16 @@
package fr.leomelki.loupgarou.events;
import org.bukkit.event.Cancellable;
import fr.leomelki.loupgarou.classes.LGGame;
import lombok.Getter;
import lombok.Setter;
import org.bukkit.event.Cancellable;
public class LGDayStartEvent extends LGEvent implements Cancellable {
@Getter
@Setter
private boolean cancelled;
public class LGDayStartEvent extends LGEvent implements Cancellable{
public LGDayStartEvent(LGGame game) {
super(game);
}
@Getter @Setter private boolean cancelled;
}

View file

@ -5,11 +5,13 @@ import fr.leomelki.loupgarou.classes.LGWinType;
import lombok.Getter;
import lombok.Setter;
public class LGEndCheckEvent extends LGEvent{
public class LGEndCheckEvent extends LGEvent {
@Getter
@Setter
private LGWinType winType;
public LGEndCheckEvent(LGGame game, LGWinType winType) {
super(game);
this.winType = winType;
}
@Getter @Setter private LGWinType winType;
}

View file

@ -1,22 +1,23 @@
package fr.leomelki.loupgarou.events;
import org.bukkit.event.Event;
import org.bukkit.event.HandlerList;
import fr.leomelki.loupgarou.classes.LGGame;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
import org.bukkit.event.Event;
import org.bukkit.event.HandlerList;
@RequiredArgsConstructor
public class LGEvent extends Event{
@Getter final LGGame game;
public class LGEvent extends Event {
private static final HandlerList handlers = new HandlerList();
@Getter
final LGGame game;
public static HandlerList getHandlerList() {
return handlers;
}
@Override
public HandlerList getHandlers() {
return handlers;
}
public static HandlerList getHandlerList() {
return handlers;
}
}

View file

@ -1,19 +1,23 @@
package fr.leomelki.loupgarou.events;
import java.util.List;
import org.bukkit.event.Cancellable;
import fr.leomelki.loupgarou.classes.LGGame;
import fr.leomelki.loupgarou.classes.LGPlayer;
import fr.leomelki.loupgarou.classes.LGWinType;
import lombok.Getter;
import lombok.Setter;
import org.bukkit.event.Cancellable;
import java.util.List;
public class LGGameEndEvent extends LGEvent implements Cancellable {
@Getter
private final LGWinType winType;
@Getter
private final List<LGPlayer> winners;
@Getter
@Setter
private boolean cancelled;
public class LGGameEndEvent extends LGEvent implements Cancellable{
@Getter @Setter private boolean cancelled;
@Getter private final LGWinType winType;
@Getter private final List<LGPlayer> winners;
public LGGameEndEvent(LGGame game, LGWinType winType, List<LGPlayer> winners) {
super(game);
this.winType = winType;

View file

@ -4,12 +4,12 @@ import fr.leomelki.loupgarou.classes.LGGame;
import fr.leomelki.loupgarou.classes.LGPlayer;
import lombok.Getter;
public class LGGameJoinEvent extends LGEvent{
public class LGGameJoinEvent extends LGEvent {
@Getter
final LGPlayer player;
public LGGameJoinEvent(LGGame game, LGPlayer player) {
super(game);
this.player = player;
}
@Getter
final LGPlayer player;
}

View file

@ -1,15 +1,16 @@
package fr.leomelki.loupgarou.events;
import org.bukkit.event.Cancellable;
import fr.leomelki.loupgarou.classes.LGGame;
import lombok.Getter;
import lombok.Setter;
import org.bukkit.event.Cancellable;
public class LGMayorVoteEvent extends LGEvent implements Cancellable {
@Getter
@Setter
private boolean cancelled;
public class LGMayorVoteEvent extends LGEvent implements Cancellable{
public LGMayorVoteEvent(LGGame game) {
super(game);
}
@Getter @Setter private boolean cancelled;
}

View file

@ -1,15 +1,16 @@
package fr.leomelki.loupgarou.events;
import org.bukkit.event.Cancellable;
import fr.leomelki.loupgarou.classes.LGGame;
import lombok.Getter;
import lombok.Setter;
import org.bukkit.event.Cancellable;
public class LGNightEndEvent extends LGEvent implements Cancellable {
@Getter
@Setter
private boolean cancelled;
public class LGNightEndEvent extends LGEvent implements Cancellable{
public LGNightEndEvent(LGGame game) {
super(game);
}
@Getter @Setter private boolean cancelled;
}

View file

@ -1,23 +1,25 @@
package fr.leomelki.loupgarou.events;
import org.bukkit.event.Cancellable;
import fr.leomelki.loupgarou.classes.LGGame;
import fr.leomelki.loupgarou.classes.LGPlayer;
import fr.leomelki.loupgarou.events.LGPlayerKilledEvent.Reason;
import lombok.Getter;
import lombok.Setter;
import org.bukkit.event.Cancellable;
public class LGNightPlayerPreKilledEvent extends LGEvent implements Cancellable{
public class LGNightPlayerPreKilledEvent extends LGEvent implements Cancellable {
@Getter
private final LGPlayer killed;
@Getter
@Setter
boolean cancelled;
@Getter
@Setter
private Reason reason;
public LGNightPlayerPreKilledEvent(LGGame game, LGPlayer killed, Reason reason) {
super(game);
this.killed = killed;
this.reason = reason;
}
@Getter @Setter boolean cancelled;
@Getter private final LGPlayer killed;
@Getter @Setter private Reason reason;
}

View file

@ -1,17 +1,18 @@
package fr.leomelki.loupgarou.events;
import org.bukkit.event.Cancellable;
import fr.leomelki.loupgarou.classes.LGGame;
import lombok.Getter;
import lombok.Setter;
import org.bukkit.event.Cancellable;
public class LGNightStart extends LGEvent implements Cancellable{
public class LGNightStart extends LGEvent implements Cancellable {
@Getter
@Setter
boolean cancelled;
public LGNightStart(LGGame game) {
super(game);
}
@Getter @Setter boolean cancelled;
}

View file

@ -6,6 +6,12 @@ import fr.leomelki.loupgarou.events.LGPlayerKilledEvent.Reason;
import lombok.Getter;
public class LGPlayerGotKilledEvent extends LGEvent {
@Getter
private final boolean endGame;
@Getter
private final LGPlayer killed;
@Getter
private final Reason reason;
public LGPlayerGotKilledEvent(LGGame game, LGPlayer killed, Reason reason, boolean endGame) {
super(game);
this.killed = killed;
@ -13,8 +19,4 @@ public class LGPlayerGotKilledEvent extends LGEvent {
this.endGame = endGame;
}
@Getter private final boolean endGame;
@Getter private final LGPlayer killed;
@Getter private final Reason reason;
}

View file

@ -1,27 +1,30 @@
package fr.leomelki.loupgarou.events;
import org.bukkit.event.Cancellable;
import fr.leomelki.loupgarou.classes.LGGame;
import fr.leomelki.loupgarou.classes.LGPlayer;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
import lombok.Setter;
import org.bukkit.event.Cancellable;
public class LGPlayerKilledEvent extends LGEvent implements Cancellable{
public class LGPlayerKilledEvent extends LGEvent implements Cancellable {
@Getter
@Setter
boolean cancelled;
@Getter
@Setter
private LGPlayer killed;
@Getter
@Setter
private Reason reason;
public LGPlayerKilledEvent(LGGame game, LGPlayer killed, Reason reason) {
super(game);
this.killed = killed;
this.reason = reason;
}
@Getter @Setter boolean cancelled;
@Getter @Setter private LGPlayer killed;
@Getter @Setter private Reason reason;
@RequiredArgsConstructor
public enum Reason{
public enum Reason {
LOUP_GAROU("§7§l%s§4 est mort pendant la nuit"),
GM_LOUP_GAROU("§7§l%s§4 est mort pendant la nuit"),
LOUP_BLANC(LOUP_GAROU.getMessage()),
@ -41,7 +44,8 @@ public class LGPlayerKilledEvent extends LGEvent implements Cancellable{
DONT_DIE("§7§l%s§4 est mort pour rien");
@Getter private final String message;
@Getter
private final String message;
}
}

View file

@ -1,15 +1,16 @@
package fr.leomelki.loupgarou.events;
import org.bukkit.event.Cancellable;
import fr.leomelki.loupgarou.classes.LGGame;
import lombok.Getter;
import lombok.Setter;
import org.bukkit.event.Cancellable;
public class LGPreDayStartEvent extends LGEvent implements Cancellable {
@Getter
@Setter
private boolean cancelled;
public class LGPreDayStartEvent extends LGEvent implements Cancellable{
public LGPreDayStartEvent(LGGame game) {
super(game);
}
@Getter @Setter private boolean cancelled;
}

View file

@ -1,18 +1,20 @@
package fr.leomelki.loupgarou.events;
import org.bukkit.event.Cancellable;
import fr.leomelki.loupgarou.classes.LGGame;
import fr.leomelki.loupgarou.classes.LGPlayer;
import lombok.Getter;
import lombok.Setter;
import org.bukkit.event.Cancellable;
public class LGPyromaneGasoilEvent extends LGEvent implements Cancellable{
public class LGPyromaneGasoilEvent extends LGEvent implements Cancellable {
@Getter
@Setter
private boolean cancelled;
@Getter
@Setter
private LGPlayer player;
public LGPyromaneGasoilEvent(LGGame game, LGPlayer player) {
super(game);
this.player = player;
}
@Getter @Setter private boolean cancelled;
@Getter @Setter private LGPlayer player;
}

View file

@ -4,12 +4,13 @@ import fr.leomelki.loupgarou.classes.LGGame;
import fr.leomelki.loupgarou.roles.Role;
import lombok.Getter;
public class LGRoleTurnEndEvent extends LGEvent{
public class LGRoleTurnEndEvent extends LGEvent {
@Getter
private final Role newRole, previousRole;
public LGRoleTurnEndEvent(LGGame game, Role newRole, Role previousRole) {
super(game);
this.newRole = newRole;
this.previousRole = previousRole;
}
@Getter private final Role newRole, previousRole;
}

View file

@ -1,7 +1,6 @@
package fr.leomelki.loupgarou.events;
import com.comphenix.protocol.wrappers.WrappedGameProfile;
import fr.leomelki.loupgarou.classes.LGGame;
import fr.leomelki.loupgarou.classes.LGPlayer;
import lombok.Getter;
@ -9,8 +8,12 @@ import lombok.Setter;
public class LGSkinLoadEvent extends LGEvent {
@Getter private final LGPlayer player, to;
@Getter @Setter private WrappedGameProfile profile;
@Getter
private final LGPlayer player, to;
@Getter
@Setter
private WrappedGameProfile profile;
public LGSkinLoadEvent(LGGame game, LGPlayer player, LGPlayer to, WrappedGameProfile profile) {
super(game);
this.player = player;

View file

@ -6,8 +6,12 @@ import lombok.Getter;
import lombok.Setter;
public class LGUpdatePrefixEvent extends LGEvent {
@Getter @Setter private String prefix;
@Getter private final LGPlayer player, to;
@Getter
private final LGPlayer player, to;
@Getter
@Setter
private String prefix;
public LGUpdatePrefixEvent(LGGame game, LGPlayer player, LGPlayer to, String prefix) {
super(game);
this.player = player;

View file

@ -5,12 +5,15 @@ import fr.leomelki.loupgarou.classes.LGPlayer;
import lombok.Getter;
import lombok.Setter;
public class LGVampiredEvent extends LGEvent{
public class LGVampiredEvent extends LGEvent {
@Getter
@Setter
private boolean immuned, protect;
@Getter
@Setter
private LGPlayer player;
public LGVampiredEvent(LGGame game, LGPlayer player) {
super(game);
this.player = player;
}
@Getter @Setter private boolean immuned, protect;
@Getter @Setter private LGPlayer player;
}

View file

@ -1,15 +1,16 @@
package fr.leomelki.loupgarou.events;
import org.bukkit.event.Cancellable;
import fr.leomelki.loupgarou.classes.LGGame;
import lombok.Getter;
import lombok.Setter;
import org.bukkit.event.Cancellable;
public class LGVoteEvent extends LGEvent implements Cancellable {
@Getter
@Setter
private boolean cancelled;
public class LGVoteEvent extends LGEvent implements Cancellable{
public LGVoteEvent(LGGame game) {
super(game);
}
@Getter @Setter private boolean cancelled;
}

View file

@ -1,20 +1,13 @@
package fr.leomelki.loupgarou.events;
import java.util.ArrayList;
import fr.leomelki.loupgarou.classes.LGGame;
import fr.leomelki.loupgarou.classes.LGPlayer;
import fr.leomelki.loupgarou.classes.LGVote;
import lombok.Getter;
public class LGVoteLeaderChange extends LGEvent{
import java.util.ArrayList;
public LGVoteLeaderChange(LGGame game, LGVote vote, ArrayList<LGPlayer> latest, ArrayList<LGPlayer> now) {
super(game);
this.latest = latest;
this.now = now;
this.vote = vote;
}
public class LGVoteLeaderChange extends LGEvent {
@Getter
final ArrayList<LGPlayer> latest;
@ -22,5 +15,11 @@ public class LGVoteLeaderChange extends LGEvent{
final ArrayList<LGPlayer> now;
@Getter
final LGVote vote;
public LGVoteLeaderChange(LGGame game, LGVote vote, ArrayList<LGPlayer> latest, ArrayList<LGPlayer> now) {
super(game);
this.latest = latest;
this.now = now;
this.vote = vote;
}
}

View file

@ -1,6 +1,7 @@
package fr.leomelki.loupgarou.listeners;
import fr.leomelki.loupgarou.MainLg;
import fr.leomelki.loupgarou.classes.LGPlayer;
import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler;
import org.bukkit.event.Listener;
@ -15,42 +16,47 @@ import org.bukkit.event.player.PlayerRespawnEvent;
import org.bukkit.event.player.PlayerSwapHandItemsEvent;
import org.bukkit.event.weather.WeatherChangeEvent;
import fr.leomelki.loupgarou.classes.LGPlayer;
public class CancelListener implements Listener{
public class CancelListener implements Listener {
private final MainLg plugin;
public CancelListener (MainLg mainLg) {
public CancelListener(MainLg mainLg) {
this.plugin = mainLg;
}
@EventHandler
public void onPluie(WeatherChangeEvent e) {
e.setCancelled(true);
}
@EventHandler
public void onMove(PlayerMoveEvent e) {
LGPlayer lgp = LGPlayer.thePlayer(plugin, e.getPlayer());
if(lgp.getGame() != null && lgp.getGame().isStarted() && e.getFrom().distanceSquared(e.getTo()) > 0.001)
if (lgp.getGame() != null && lgp.getGame().isStarted() && e.getFrom().distanceSquared(e.getTo()) > 0.001)
e.setTo(e.getFrom());
}
@EventHandler
public void onDamage(EntityDamageEvent e) {
e.setCancelled(true);
}
@EventHandler
public void onFood(FoodLevelChangeEvent e) {
e.setFoodLevel(6);
}
@EventHandler
public void onRespawn(PlayerRespawnEvent e) {
e.setRespawnLocation(e.getPlayer().getLocation());
}
@EventHandler
public void onRespawn(PlayerDeathEvent e) {
e.setDeathMessage("");
e.setKeepInventory(true);
}
/* @EventHandler
/* @EventHandler
public void onAchievement(PlayerAchievementAwardedEvent e) {
e.setCancelled(true);
}*/
@ -58,18 +64,21 @@ public class CancelListener implements Listener{
public void onEntitySpawn(EntitySpawnEvent e) {
e.setCancelled(true);
}
@EventHandler
public void onDrop(PlayerDropItemEvent e) {
e.setCancelled(true);
}
@EventHandler
public void onClickInventory(InventoryClickEvent e) {
if(LGPlayer.thePlayer(plugin, (Player)e.getWhoClicked()).getGame() != null)
if (LGPlayer.thePlayer(plugin, (Player) e.getWhoClicked()).getGame() != null)
e.setCancelled(true);
}
@EventHandler
public void onClickInventory(PlayerSwapHandItemsEvent e) {
if(LGPlayer.thePlayer(plugin, e.getPlayer()).getGame() != null)
if (LGPlayer.thePlayer(plugin, e.getPlayer()).getGame() != null)
e.setCancelled(true);
}
}

View file

@ -1,14 +1,13 @@
package fr.leomelki.loupgarou.listeners;
import fr.leomelki.loupgarou.MainLg;
import fr.leomelki.loupgarou.classes.LGPlayer;
import org.bukkit.event.EventHandler;
import org.bukkit.event.EventPriority;
import org.bukkit.event.Listener;
import org.bukkit.event.player.AsyncPlayerChatEvent;
import fr.leomelki.loupgarou.classes.LGPlayer;
public class ChatListener implements Listener{
public class ChatListener implements Listener {
private final MainLg plugin;
@ -18,7 +17,7 @@ public class ChatListener implements Listener{
@EventHandler(priority = EventPriority.HIGHEST)
public void onChat(AsyncPlayerChatEvent e) {
if(!e.isCancelled()) {
if (!e.isCancelled()) {
LGPlayer player = LGPlayer.thePlayer(plugin, e.getPlayer());
player.onChat(e.getMessage());
e.setCancelled(true);

View file

@ -1,7 +1,10 @@
package fr.leomelki.loupgarou.listeners;
import java.util.Collections;
import com.comphenix.protocol.wrappers.WrappedChatComponent;
import fr.leomelki.com.comphenix.packetwrapper.WrapperPlayServerScoreboardTeam;
import fr.leomelki.loupgarou.MainLg;
import fr.leomelki.loupgarou.classes.LGPlayer;
import fr.leomelki.loupgarou.events.LGPlayerKilledEvent.Reason;
import org.bukkit.Bukkit;
import org.bukkit.GameMode;
import org.bukkit.entity.Player;
@ -13,14 +16,9 @@ import org.bukkit.event.player.PlayerResourcePackStatusEvent;
import org.bukkit.event.player.PlayerResourcePackStatusEvent.Status;
import org.bukkit.potion.PotionEffectType;
import com.comphenix.protocol.wrappers.WrappedChatComponent;
import java.util.Collections;
import fr.leomelki.com.comphenix.packetwrapper.WrapperPlayServerScoreboardTeam;
import fr.leomelki.loupgarou.MainLg;
import fr.leomelki.loupgarou.classes.LGPlayer;
import fr.leomelki.loupgarou.events.LGPlayerKilledEvent.Reason;
public class JoinListener implements Listener{
public class JoinListener implements Listener {
private final MainLg plugin;
public JoinListener(MainLg mainLg) {
@ -58,13 +56,14 @@ public class JoinListener implements Listener{
lgp.showView();
lgp.join(MainLg.getInstance().getCurrentGame());
}
if(noSpec)
if (noSpec)
p.setGameMode(GameMode.ADVENTURE);
e.setJoinMessage("");
p.removePotionEffect(PotionEffectType.JUMP);
p.removePotionEffect(PotionEffectType.INVISIBILITY);
p.setWalkSpeed(0.2f);
}
@EventHandler
public void onResoucePack(PlayerResourcePackStatusEvent e) {
if (e.getStatus() == Status.SUCCESSFULLY_LOADED) {
@ -72,16 +71,17 @@ public class JoinListener implements Listener{
LGPlayer lgp = LGPlayer.thePlayer(plugin, p);
lgp.showView();
lgp.join(MainLg.getInstance().getCurrentGame());
} else if(e.getStatus() == Status.DECLINED || e.getStatus() == Status.FAILED_DOWNLOAD)
e.getPlayer().kickPlayer(MainLg.getPrefix()+"§cIl vous faut le resourcepack pour jouer ! ("+e.getStatus()+")");
} else if (e.getStatus() == Status.DECLINED || e.getStatus() == Status.FAILED_DOWNLOAD)
e.getPlayer().kickPlayer(MainLg.getPrefix() + "§cIl vous faut le resourcepack pour jouer ! (" + e.getStatus() + ")");
}
@EventHandler
public void onLeave(PlayerQuitEvent e) {
Player p = e.getPlayer();
LGPlayer lgp = LGPlayer.thePlayer(plugin, p);
if(lgp.getGame() != null) {
if (lgp.getGame() != null) {
lgp.leaveChat();
if(lgp.getRole() != null && !lgp.isDead())
if (lgp.getRole() != null && !lgp.isDead())
lgp.getGame().kill(lgp, Reason.DISCONNECTED, true);
lgp.getGame().getInGame().remove(lgp);
lgp.getGame().checkLeave();

View file

@ -1,13 +1,11 @@
package fr.leomelki.loupgarou.listeners;
import org.bukkit.event.EventHandler;
import org.bukkit.event.Listener;
import com.comphenix.protocol.wrappers.EnumWrappers.ScoreboardAction;
import fr.leomelki.com.comphenix.packetwrapper.WrapperPlayServerScoreboardScore;
import fr.leomelki.com.comphenix.packetwrapper.WrapperPlayServerScoreboardTeam;
import fr.leomelki.loupgarou.events.LGGameJoinEvent;
import org.bukkit.event.EventHandler;
import org.bukkit.event.Listener;
public class LoupGarouListener implements Listener {
@EventHandler

View file

@ -1,25 +1,26 @@
package fr.leomelki.loupgarou.listeners;
import fr.leomelki.loupgarou.MainLg;
import fr.leomelki.loupgarou.classes.LGPlayer;
import org.bukkit.event.EventHandler;
import org.bukkit.event.Listener;
import org.bukkit.event.block.BlockBreakEvent;
import org.bukkit.event.player.PlayerAnimationEvent;
import org.bukkit.event.player.PlayerAnimationType;
import fr.leomelki.loupgarou.classes.LGPlayer;
public class VoteListener implements Listener{
public class VoteListener implements Listener {
private final MainLg plugin;
public VoteListener(MainLg mainLg) {
this.plugin = mainLg;
}
@EventHandler
public void onClick(PlayerAnimationEvent e) {
if(e.getAnimationType() == PlayerAnimationType.ARM_SWING)
if (e.getAnimationType() == PlayerAnimationType.ARM_SWING)
LGPlayer.thePlayer(plugin, e.getPlayer()).chooseAction();
}
@EventHandler
public void onBreak(BlockBreakEvent e) {
e.setCancelled(true);

View file

@ -1,85 +1,94 @@
package fr.leomelki.loupgarou.roles;
import java.util.ArrayList;
import org.bukkit.event.EventHandler;
import fr.leomelki.loupgarou.classes.LGGame;
import fr.leomelki.loupgarou.classes.LGPlayer;
import fr.leomelki.loupgarou.classes.LGWinType;
import fr.leomelki.loupgarou.events.LGDayEndEvent;
import fr.leomelki.loupgarou.events.LGEndCheckEvent;
import fr.leomelki.loupgarou.events.LGGameEndEvent;
import fr.leomelki.loupgarou.events.LGPlayerGotKilledEvent;
import fr.leomelki.loupgarou.events.LGVoteEvent;
import fr.leomelki.loupgarou.events.*;
import fr.leomelki.loupgarou.events.LGPlayerKilledEvent.Reason;
import org.bukkit.event.EventHandler;
import java.util.ArrayList;
public class RAnge extends Role {
final ArrayList<LGPlayer> winners = new ArrayList<>();
boolean vote;
int night = 1;
public class RAnge extends Role{
public RAnge(LGGame game) {
super(game);
}
@Override
public RoleType getType() {
return RoleType.NEUTRAL;
}
@Override
public RoleWinType getWinType() {
return RoleWinType.VILLAGE;
}
@Override
public String getName() {
return "§d§lAnge";
}
@Override
public String getFriendlyName() {
return "de l'"+getName();
return "de l'" + getName();
}
@Override
public String getShortDescription() {
return "Tu gagnes si tu remplis ton objectif";
}
@Override
public String getDescription() {
return "Tu es §d§lNeutre§f et tu gagnes si tu remplis ton objectif. Ton objectif est d'être éliminé par le village lors du premier vote de jour. Si tu réussis, tu gagnes la partie. Sinon, tu deviens un §a§lVillageois§f.";
}
@Override
public String getTask() {
return "";
}
@Override
public String getBroadcastedTask() {
return "";
}
@Override
public int getTimeout() {
return -1;
}
@EventHandler
public void onVoteStart(LGVoteEvent e) {
if(e.getGame() == getGame()) {
if (e.getGame() == getGame()) {
night = getGame().getNight();
vote = true;
for(LGPlayer lgp : getPlayers())
if(!lgp.isDead() && lgp.isRoleActive())
for (LGPlayer lgp : getPlayers())
if (!lgp.isDead() && lgp.isRoleActive())
lgp.sendMessage("§9§oFais en sorte que les autres votent contre toi !");
}
}
boolean vote;
@EventHandler
public void onDayEnd(LGDayEndEvent e) {
if(e.getGame() == getGame()) {
if(getPlayers().size() > 0 && getGame().getNight() == night+1 && vote) {
if (e.getGame() == getGame()) {
if (getPlayers().size() > 0 && getGame().getNight() == night + 1 && vote) {
Role villageois = null;
for(Role role : getGame().getRoles()) {
if(role instanceof RVillageois)
for (Role role : getGame().getRoles()) {
if (role instanceof RVillageois)
villageois = role;
}
if(villageois == null)
if (villageois == null)
getGame().getRoles().add(villageois = new RVillageois(getGame()));
for(LGPlayer lgp : getPlayers()) {
if(lgp.isRoleActive())
for (LGPlayer lgp : getPlayers()) {
if (lgp.isRoleActive())
lgp.sendMessage("§4§oTu as échoué, tu deviens §a§l§oVillageois§4§o...");
lgp.setRole(villageois);
villageois.join(lgp);
@ -91,26 +100,25 @@ public class RAnge extends Role{
vote = false;
}
}
final ArrayList<LGPlayer> winners = new ArrayList<>();
int night = 1;
@EventHandler
public void onDeath(LGPlayerGotKilledEvent e) {
if(e.getGame() == getGame())
if(e.getReason() == Reason.VOTE && e.getKilled().getRole() == this && getGame().getNight() == night && e.getKilled().isRoleActive())
if (e.getGame() == getGame())
if (e.getReason() == Reason.VOTE && e.getKilled().getRole() == this && getGame().getNight() == night && e.getKilled().isRoleActive())
winners.add(e.getKilled());
}
@EventHandler
public void onWinCheck(LGEndCheckEvent e) {
if(e.getGame() == getGame())
if(winners.size() > 0)
if (e.getGame() == getGame())
if (winners.size() > 0)
e.setWinType(winners.size() == 1 && winners.get(0).getCache().has("inlove") ? LGWinType.COUPLE : LGWinType.ANGE);
}
@EventHandler
public void onWin(LGGameEndEvent e) {
if(e.getGame() == getGame())
if(e.getWinType() == LGWinType.ANGE)
if (e.getGame() == getGame())
if (e.getWinType() == LGWinType.ANGE)
e.getWinners().addAll(winners);
}
}

View file

@ -1,56 +1,58 @@
package fr.leomelki.loupgarou.roles;
import org.bukkit.event.EventHandler;
import org.bukkit.event.EventPriority;
import fr.leomelki.loupgarou.classes.LGGame;
import fr.leomelki.loupgarou.classes.LGPlayer;
import fr.leomelki.loupgarou.classes.LGWinType;
import fr.leomelki.loupgarou.events.LGEndCheckEvent;
import fr.leomelki.loupgarou.events.LGGameEndEvent;
import fr.leomelki.loupgarou.events.LGNightEndEvent;
import fr.leomelki.loupgarou.events.LGNightPlayerPreKilledEvent;
import fr.leomelki.loupgarou.events.*;
import fr.leomelki.loupgarou.events.LGPlayerKilledEvent.Reason;
import fr.leomelki.loupgarou.events.LGPyromaneGasoilEvent;
import fr.leomelki.loupgarou.events.LGRoleTurnEndEvent;
import fr.leomelki.loupgarou.events.LGVampiredEvent;
import org.bukkit.event.EventHandler;
import org.bukkit.event.EventPriority;
public class RAssassin extends Role{
public class RAssassin extends Role {
public RAssassin(LGGame game) {
super(game);
}
@Override
public RoleType getType() {
return RoleType.NEUTRAL;
}
@Override
public RoleWinType getWinType() {
return RoleWinType.SEUL;
}
@Override
public String getName() {
return "§1§lAssassin";
}
@Override
public String getFriendlyName() {
return "de l'"+getName();
return "de l'" + getName();
}
@Override
public String getShortDescription() {
return "Tu gagnes §7§lSEUL";
}
@Override
public String getDescription() {
return "Tu gagnes §7§lSEUL§f. Chaque nuit, tu peux choisir un joueur à éliminer. Tu es immunisé contre l'attaque des §c§lLoups§f.";
}
@Override
public String getTask() {
return "Choisis un joueur à éliminer.";
}
@Override
public String getBroadcastedTask() {
return "L'"+getName()+"§9 ne controle plus ses pulsions...";
return "L'" + getName() + "§9 ne controle plus ses pulsions...";
}
@Override
public int getTimeout() {
return 15;
@ -61,10 +63,10 @@ public class RAssassin extends Role{
player.showView();
player.choose(choosen -> {
if(choosen != null && choosen != player) {
if (choosen != null && choosen != player) {
getGame().kill(choosen, Reason.ASSASSIN);
player.sendActionBarMessage("§e§l"+choosen.getName()+"§6 va mourir");
player.sendMessage("§6Tu as choisi de tuer §7§l"+choosen.getName()+"§6.");
player.sendActionBarMessage("§e§l" + choosen.getName() + "§6 va mourir");
player.sendMessage("§6Tu as choisi de tuer §7§l" + choosen.getName() + "§6.");
player.stopChoosing();
player.hideView();
callback.run();
@ -74,7 +76,7 @@ public class RAssassin extends Role{
@EventHandler
public void onKill(LGNightPlayerPreKilledEvent e) {
if(e.getKilled().getRole() == this && e.getReason() == Reason.LOUP_GAROU || e.getReason() == Reason.GM_LOUP_GAROU && e.getKilled().isRoleActive()) {//Les assassins ne peuvent pas mourir la nuit !
if (e.getKilled().getRole() == this && e.getReason() == Reason.LOUP_GAROU || e.getReason() == Reason.GM_LOUP_GAROU && e.getKilled().isRoleActive()) {//Les assassins ne peuvent pas mourir la nuit !
e.setReason(Reason.DONT_DIE);
e.getKilled().getCache().set("assassin_protected", true);
}
@ -82,18 +84,18 @@ public class RAssassin extends Role{
@EventHandler
public void onTour(LGRoleTurnEndEvent e) {
if(e.getGame() == getGame()) {
if(e.getPreviousRole() instanceof RLoupGarou) {
for(LGPlayer lgp : getGame().getAlive())
if(lgp.getCache().getBoolean("assassin_protected")) {
for(LGPlayer l : getGame().getInGame())
if(l.getRoleType() == RoleType.LOUP_GAROU)
if (e.getGame() == getGame()) {
if (e.getPreviousRole() instanceof RLoupGarou) {
for (LGPlayer lgp : getGame().getAlive())
if (lgp.getCache().getBoolean("assassin_protected")) {
for (LGPlayer l : getGame().getInGame())
if (l.getRoleType() == RoleType.LOUP_GAROU)
l.sendMessage("§cVotre cible est immunisée.");
}
}else if(e.getPreviousRole() instanceof RGrandMechantLoup) {
for(LGPlayer lgp : getGame().getAlive())
if(lgp.getCache().getBoolean("assassin_protected")) {
for(LGPlayer l : e.getPreviousRole().getPlayers())
} else if (e.getPreviousRole() instanceof RGrandMechantLoup) {
for (LGPlayer lgp : getGame().getAlive())
if (lgp.getCache().getBoolean("assassin_protected")) {
for (LGPlayer l : e.getPreviousRole().getPlayers())
l.sendMessage("§cVotre cible est immunisée.");
}
}
@ -102,31 +104,32 @@ public class RAssassin extends Role{
@EventHandler
public void onPyroGasoil(LGPyromaneGasoilEvent e) {
if(e.getPlayer().getRole() == this && e.getPlayer().isRoleActive())
if (e.getPlayer().getRole() == this && e.getPlayer().isRoleActive())
e.setCancelled(true);
}
@EventHandler
public void onVampired(LGVampiredEvent e) {
if(e.getPlayer().getRole() == this && e.getPlayer().isRoleActive())
if (e.getPlayer().getRole() == this && e.getPlayer().isRoleActive())
e.setImmuned(true);
}
@EventHandler
public void onDayStart(LGNightEndEvent e) {
if(e.getGame() == getGame()) {
for(LGPlayer lgp : getGame().getAlive())
if(lgp.getCache().getBoolean("assassin_protected"))
if (e.getGame() == getGame()) {
for (LGPlayer lgp : getGame().getAlive())
if (lgp.getCache().getBoolean("assassin_protected"))
lgp.getCache().remove("assassin_protected");
}
}
@EventHandler
public void onEndgameCheck(LGEndCheckEvent e) {
if(e.getGame() == getGame() && e.getWinType() == LGWinType.SOLO) {
if(getPlayers().size() > 0) {
if(getPlayers().size() > 1)
for(LGPlayer lgp : getPlayers())
if(!lgp.isRoleActive())
if (e.getGame() == getGame() && e.getWinType() == LGWinType.SOLO) {
if (getPlayers().size() > 0) {
if (getPlayers().size() > 1)
for (LGPlayer lgp : getPlayers())
if (!lgp.isRoleActive())
return;
e.setWinType(LGWinType.ASSASSIN);
}
@ -135,7 +138,7 @@ public class RAssassin extends Role{
@EventHandler(priority = EventPriority.HIGHEST)
public void onEndGame(LGGameEndEvent e) {
if(e.getWinType() == LGWinType.ASSASSIN) {
if (e.getWinType() == LGWinType.ASSASSIN) {
e.getWinners().clear();
e.getWinners().addAll(getPlayers());
}

View file

@ -1,55 +1,65 @@
package fr.leomelki.loupgarou.roles;
import java.util.ArrayList;
import java.util.List;
import java.util.StringJoiner;
import org.bukkit.event.EventHandler;
import org.bukkit.scheduler.BukkitRunnable;
import fr.leomelki.loupgarou.MainLg;
import fr.leomelki.loupgarou.classes.LGGame;
import fr.leomelki.loupgarou.classes.LGPlayer;
import fr.leomelki.loupgarou.events.LGGameEndEvent;
import fr.leomelki.loupgarou.events.LGPlayerKilledEvent;
import fr.leomelki.loupgarou.events.LGPlayerKilledEvent.Reason;
import org.bukkit.event.EventHandler;
import org.bukkit.scheduler.BukkitRunnable;
import java.util.ArrayList;
import java.util.List;
import java.util.StringJoiner;
public class RBouffon extends Role {
final ArrayList<LGPlayer> needToPlay = new ArrayList<>();
public class RBouffon extends Role{
public RBouffon(LGGame game) {
super(game);
}
@Override
public RoleType getType() {
return RoleType.NEUTRAL;
}
@Override
public RoleWinType getWinType() {
return RoleWinType.NONE;
}
@Override
public String getName() {
return "§d§lBouffon";
}
@Override
public String getFriendlyName() {
return "du "+getName();
return "du " + getName();
}
@Override
public String getShortDescription() {
return "Tu gagnes si tu remplis ton objectif";
}
@Override
public String getDescription() {
return "Tu es §d§lNeutre§f et tu gagnes si tu remplis ton objectif. Ton objectif est d'être éliminé par le village lors de nimporte quel vote de jour. Si tu réussis, tu gagnes la partie, mais celle-ci continue. Tu pourras tuer l'une des personnes qui t'ont condamné.";
}
@Override
public String getTask() {
return "Choisis quelquun à hanter parmi ceux qui ont voté pour ta mort.";
}
@Override
public String getBroadcastedTask() {
return "L'esprit vengeur du "+getName()+"§9 rôde sur le village...";
return "L'esprit vengeur du " + getName() + "§9 rôde sur le village...";
}
@Override
public int getTimeout() {
return 15;
@ -62,24 +72,26 @@ public class RBouffon extends Role{
@Override
public void run() {
getGame().cancelWait();
if(players.size() == 0) {
if (players.size() == 0) {
onTurnFinish(callback);
return;
}
LGPlayer player = players.remove(0);
getGame().wait(getTimeout(), ()->{RBouffon.this.onNightTurnTimeout(player);this.run();}, (currentPlayer, secondsLeft)-> currentPlayer == player ? "§9§lC'est à ton tour !" : "§6C'est au tour "+getFriendlyName()+" §6(§e"+secondsLeft+" s§6)");
player.sendMessage("§6"+getTask());
getGame().wait(getTimeout(), () -> {
RBouffon.this.onNightTurnTimeout(player);
this.run();
}, (currentPlayer, secondsLeft) -> currentPlayer == player ? "§9§lC'est à ton tour !" : "§6C'est au tour " + getFriendlyName() + " §6(§e" + secondsLeft + " s§6)");
player.sendMessage("§6" + getTask());
// player.sendTitle("§6C'est à vous de jouer", "§a"+getTask(), 100);
onNightTurn(player, this);
}
}.run();
}
public boolean hasPlayersLeft() {
return needToPlay.size() > 0;
}
@Override
protected void onNightTurn(LGPlayer player, Runnable callback) {
needToPlay.remove(player);
@ -87,25 +99,25 @@ public class RBouffon extends Role{
player.getCache().set("bouffon_win", true);
List<LGPlayer> choosable = getGame().getVote().getVotes(player);
StringJoiner sj = new StringJoiner("§6§o, §6§o§l");
for(LGPlayer lgp : choosable)
if(lgp.getPlayer() != null && lgp != player)
for (LGPlayer lgp : choosable)
if (lgp.getPlayer() != null && lgp != player)
sj.add(lgp.getName());
String toPut = sj.toString();
if(toPut.length() == 0)
if (toPut.length() == 0)
player.sendMessage("§6§o§lPersonne§6§o n'a voté pour toi.");
else
player.sendMessage("§6§o§l"+toPut+"§6§o "+(toPut.contains(",") ? "ont" : "a")+" voté pour toi.");
player.sendMessage("§6§o§l" + toPut + "§6§o " + (toPut.contains(",") ? "ont" : "a") + " voté pour toi.");
player.choose((choosen)->{
if(choosen != null) {
if(!choosable.contains(choosen))
player.sendMessage("§7§l"+choosen.getName()+"§4 n'a pas voté pour vous.");
else if(choosen.isDead())
player.sendMessage("§7§l"+choosen.getName()+"§4 est mort.");//fix
player.choose((choosen) -> {
if (choosen != null) {
if (!choosable.contains(choosen))
player.sendMessage("§7§l" + choosen.getName() + "§4 n'a pas voté pour vous.");
else if (choosen.isDead())
player.sendMessage("§7§l" + choosen.getName() + "§4 est mort.");//fix
else {
player.stopChoosing();
player.sendMessage("§6Ton fantôme va hanter l'esprit de §7§l"+choosen.getName()+"§6.");
player.sendMessage("§6Ton fantôme va hanter l'esprit de §7§l" + choosen.getName() + "§6.");
getGame().kill(choosen, Reason.BOUFFON);
player.hideView();
callback.run();
@ -119,28 +131,26 @@ public class RBouffon extends Role{
player.stopChoosing();
}
final ArrayList<LGPlayer> needToPlay = new ArrayList<>();
@EventHandler
public void onPlayerKill(LGPlayerKilledEvent e) {
if(e.getKilled().getRole() == this && e.getReason() == Reason.VOTE && e.getKilled().isRoleActive()) {
if (e.getKilled().getRole() == this && e.getReason() == Reason.VOTE && e.getKilled().isRoleActive()) {
needToPlay.add(e.getKilled());
getGame().broadcastMessage("§9§oQuelle erreur, le "+getName()+"§9§o aura droit à sa vengeance...");
getGame().broadcastMessage("§9§oQuelle erreur, le " + getName() + "§9§o aura droit à sa vengeance...");
e.getKilled().sendMessage("§6Tu as rempli ta mission, l'heure de la vengeance a sonné.");
}
}
@EventHandler
public void onWin(LGGameEndEvent e) {
if(e.getGame() == getGame())
for(LGPlayer lgp : getGame().getInGame())
if(lgp.getRole() == this && lgp.getCache().getBoolean("bouffon_win")) {
if (e.getGame() == getGame())
for (LGPlayer lgp : getGame().getInGame())
if (lgp.getRole() == this && lgp.getCache().getBoolean("bouffon_win")) {
e.getWinners().add(lgp);
new BukkitRunnable() {
@Override
public void run() {
getGame().broadcastMessage("§6§oLe "+getName()+"§6§o a rempli son objectif.");
getGame().broadcastMessage("§6§oLe " + getName() + "§6§o a rempli son objectif.");
}
}.runTaskAsynchronously(MainLg.getInstance());
}

View file

@ -1,51 +1,59 @@
package fr.leomelki.loupgarou.roles;
import org.bukkit.event.EventHandler;
import org.bukkit.event.EventPriority;
import fr.leomelki.loupgarou.classes.LGGame;
import fr.leomelki.loupgarou.classes.LGPlayer;
import fr.leomelki.loupgarou.events.LGNightEndEvent;
import fr.leomelki.loupgarou.events.LGNightPlayerPreKilledEvent;
import fr.leomelki.loupgarou.events.LGPlayerKilledEvent.Reason;
import fr.leomelki.loupgarou.events.LGRoleTurnEndEvent;
import org.bukkit.event.EventHandler;
import org.bukkit.event.EventPriority;
public class RChaperonRouge extends Role{
public class RChaperonRouge extends Role {
public RChaperonRouge(LGGame game) {
super(game);
}
@Override
public RoleType getType() {
return RoleType.VILLAGER;
}
@Override
public RoleWinType getWinType() {
return RoleWinType.VILLAGE;
}
@Override
public String getName() {
return "§a§lChaperon Rouge";
}
@Override
public String getFriendlyName() {
return "du "+getName();
return "du " + getName();
}
@Override
public String getShortDescription() {
return "Tu gagnes avec le §a§lVillage";
}
@Override
public String getDescription() {
return "Tu gagnes avec le §a§lVillage§f. Tant que le §a§lChasseur§f est en vie, tu ne peux pas te faire tuer par les §c§lLoups§f pendant la nuit.";
}
@Override
public String getTask() {
return "";
}
@Override
public String getBroadcastedTask() {
return "";
}
@Override
public int getTimeout() {
return -1;
@ -53,40 +61,42 @@ public class RChaperonRouge extends Role{
@EventHandler(priority = EventPriority.LOWEST)
public void onKill(LGNightPlayerPreKilledEvent e) {
if(e.getKilled().getRole() == this && e.getReason() == Reason.LOUP_GAROU || e.getReason() == Reason.GM_LOUP_GAROU && e.getKilled().isRoleActive()) {
for(Role role : getGame().getRoles())
if(role instanceof RChasseur)
if(role.getPlayers().size() > 0){
if (e.getKilled().getRole() == this && e.getReason() == Reason.LOUP_GAROU || e.getReason() == Reason.GM_LOUP_GAROU && e.getKilled().isRoleActive()) {
for (Role role : getGame().getRoles())
if (role instanceof RChasseur)
if (role.getPlayers().size() > 0) {
e.getKilled().getCache().set("chaperon_kill", true);
e.setReason(Reason.DONT_DIE);
break;
}
}
}
@EventHandler
public void onTour(LGRoleTurnEndEvent e) {
if(e.getGame() == getGame()) {
if(e.getPreviousRole() instanceof RLoupGarou) {
for(LGPlayer lgp : getGame().getAlive())
if(lgp.getCache().getBoolean("chaperon_kill") && lgp.isRoleActive()) {
for(LGPlayer l : getGame().getInGame())
if(l.getRoleType() == RoleType.LOUP_GAROU)
if (e.getGame() == getGame()) {
if (e.getPreviousRole() instanceof RLoupGarou) {
for (LGPlayer lgp : getGame().getAlive())
if (lgp.getCache().getBoolean("chaperon_kill") && lgp.isRoleActive()) {
for (LGPlayer l : getGame().getInGame())
if (l.getRoleType() == RoleType.LOUP_GAROU)
l.sendMessage("§cVotre cible est immunisée.");
}
}else if(e.getPreviousRole() instanceof RGrandMechantLoup) {
for(LGPlayer lgp : getGame().getAlive())
if(lgp.getCache().getBoolean("chaperon_kill") && lgp.isRoleActive()) {
for(LGPlayer l : e.getPreviousRole().getPlayers())
} else if (e.getPreviousRole() instanceof RGrandMechantLoup) {
for (LGPlayer lgp : getGame().getAlive())
if (lgp.getCache().getBoolean("chaperon_kill") && lgp.isRoleActive()) {
for (LGPlayer l : e.getPreviousRole().getPlayers())
l.sendMessage("§cVotre cible est immunisée.");
}
}
}
}
@EventHandler(priority = EventPriority.HIGHEST)
public void onDayStart(LGNightEndEvent e) {
if(e.getGame() == getGame()) {
for(LGPlayer lgp : getPlayers())
if(lgp.getCache().getBoolean("chaperon_kill")) {
if (e.getGame() == getGame()) {
for (LGPlayer lgp : getPlayers())
if (lgp.getCache().getBoolean("chaperon_kill")) {
lgp.getCache().remove("chaperon_kill");
lgp.sendMessage("§9§oTu as été attaqué cette nuit.");
}

View file

@ -1,10 +1,5 @@
package fr.leomelki.loupgarou.roles;
import java.util.ArrayList;
import org.bukkit.Bukkit;
import org.bukkit.event.EventHandler;
import fr.leomelki.loupgarou.classes.LGGame;
import fr.leomelki.loupgarou.classes.LGPlayer;
import fr.leomelki.loupgarou.events.LGDayStartEvent;
@ -12,43 +7,58 @@ import fr.leomelki.loupgarou.events.LGGameEndEvent;
import fr.leomelki.loupgarou.events.LGNightStart;
import fr.leomelki.loupgarou.events.LGPlayerKilledEvent;
import fr.leomelki.loupgarou.events.LGPlayerKilledEvent.Reason;
import org.bukkit.Bukkit;
import org.bukkit.event.EventHandler;
import java.util.ArrayList;
public class RChasseur extends Role {
final ArrayList<LGPlayer> needToPlay = new ArrayList<>();
public class RChasseur extends Role{
public RChasseur(LGGame game) {
super(game);
}
@Override
public RoleType getType() {
return RoleType.VILLAGER;
}
@Override
public RoleWinType getWinType() {
return RoleWinType.VILLAGE;
}
@Override
public String getName() {
return "§a§lChasseur";
}
@Override
public String getFriendlyName() {
return "du "+getName();
return "du " + getName();
}
@Override
public String getShortDescription() {
return "Tu gagnes avec le §a§lVillage";
}
@Override
public String getDescription() {
return "Tu gagnes avec le §a§lVillage§f. À ta mort, tu dois éliminer un joueur en utilisant ta dernière balle.";
}
@Override
public String getTask() {
return "Tu dois choisir qui va mourir avec toi.";
}
@Override
public String getBroadcastedTask() {
return "Le "+getName()+"§9 choisit qui il va emporter avec lui.";
return "Le " + getName() + "§9 choisit qui il va emporter avec lui.";
}
@Override
public int getTimeout() {
return 15;
@ -56,23 +66,23 @@ public class RChasseur extends Role{
@Override
protected void onNightTurn(LGPlayer player, Runnable callback) {
getGame().wait(getTimeout(), ()->{
getGame().wait(getTimeout(), () -> {
this.onNightTurnTimeout(player);
callback.run();
}, (currentPlayer, secondsLeft)-> currentPlayer == player ? "§9§lC'est à ton tour !" : "§6Le Chasseur choisit sa cible (§e"+secondsLeft+" s§6)");
getGame().broadcastMessage("§9"+getBroadcastedTask());
player.sendMessage("§6"+getTask());
}, (currentPlayer, secondsLeft) -> currentPlayer == player ? "§9§lC'est à ton tour !" : "§6Le Chasseur choisit sa cible (§e" + secondsLeft + " s§6)");
getGame().broadcastMessage("§9" + getBroadcastedTask());
player.sendMessage("§6" + getTask());
//player.sendTitle("§6C'est à vous de jouer", "§a"+getTask(), 60);
player.choose((choosen)->{
if(choosen != null) {
player.choose((choosen) -> {
if (choosen != null) {
player.stopChoosing();
getGame().cancelWait();
LGPlayerKilledEvent killEvent = new LGPlayerKilledEvent(getGame(), choosen, Reason.CHASSEUR);
Bukkit.getPluginManager().callEvent(killEvent);
if(killEvent.isCancelled())
if (killEvent.isCancelled())
return;
if(getGame().kill(killEvent.getKilled(), killEvent.getReason(), true))
if (getGame().kill(killEvent.getKilled(), killEvent.getReason(), true))
return;
callback.run();
}
@ -85,24 +95,23 @@ public class RChasseur extends Role{
player.stopChoosing();
}
final ArrayList<LGPlayer> needToPlay = new ArrayList<>();
@EventHandler
public void onPlayerKill(LGPlayerKilledEvent e) {
if(e.getKilled().getRole() == this && e.getReason() != Reason.DISCONNECTED && e.getKilled().isRoleActive())
if (e.getKilled().getRole() == this && e.getReason() != Reason.DISCONNECTED && e.getKilled().isRoleActive())
needToPlay.add(e.getKilled());
}
@EventHandler
public void onDayStart(LGDayStartEvent e) {
if(e.getGame() != getGame())return;
if (e.getGame() != getGame()) return;
if(needToPlay.size() > 0)
if (needToPlay.size() > 0)
e.setCancelled(true);
if(!e.isCancelled())return;
if (!e.isCancelled()) return;
new Runnable() {
public void run() {
if(needToPlay.size() == 0) {
if (needToPlay.size() == 0) {
e.getGame().startDay();
return;
}
@ -114,15 +123,15 @@ public class RChasseur extends Role{
@EventHandler
public void onEndGame(LGGameEndEvent e) {
if(e.getGame() != getGame())return;
if (e.getGame() != getGame()) return;
if(needToPlay.size() > 0)
if (needToPlay.size() > 0)
e.setCancelled(true);
if(!e.isCancelled())return;
if (!e.isCancelled()) return;
new Runnable() {
public void run() {
if(needToPlay.size() == 0) {
if (needToPlay.size() == 0) {
e.getGame().checkEndGame(true);
return;
}
@ -155,12 +164,12 @@ public class RChasseur extends Role{
@EventHandler
public void onNight(LGNightStart e) {
if(e.getGame() == getGame() && !e.isCancelled()) {
if(needToPlay.size() > 0) {
if (e.getGame() == getGame() && !e.isCancelled()) {
if (needToPlay.size() > 0) {
e.setCancelled(true);
new Runnable() {
public void run() {
if(needToPlay.size() == 0) {
if (needToPlay.size() == 0) {
e.getGame().nextNight();
return;
}

View file

@ -4,50 +4,60 @@ import fr.leomelki.loupgarou.classes.LGGame;
import fr.leomelki.loupgarou.classes.LGPlayer;
import fr.leomelki.loupgarou.events.LGPlayerKilledEvent.Reason;
public class RChasseurDeVampire extends Role{
public class RChasseurDeVampire extends Role {
public RChasseurDeVampire(LGGame game) {
super(game);
}
@Override
public RoleType getType() {
return RoleType.VILLAGER;
}
@Override
public RoleWinType getWinType() {
return RoleWinType.VILLAGE;
}
@Override
public String getName() {
return "§a§lChasseur de Vampires";
}
@Override
public String getFriendlyName() {
return "du "+getName();
return "du " + getName();
}
@Override
public String getShortDescription() {
return "Tu gagnes avec le §a§lVillage";
}
@Override
public String getDescription() {
return "Tu gagnes avec le §a§lVillage§f. Chaque nuit, tu peux traquer un joueur pour découvrir s'il s'agit d'un Vampire. Si c'est le cas, tu le tueras dans son sommeil. Si les §5§lVampires§f te prennent pour cible, tu seras immunisé contre leur attaque, et tu tueras le plus jeune d'entre eux.";
}
@Override
public String getTask() {
return "Choisis un joueur à pister.";
}
@Override
public String getBroadcastedTask() {
return "Le "+getName()+"§9 traque ses proies...";
return "Le " + getName() + "§9 traque ses proies...";
}
@Override
public int getTimeout() {
return 15;
}
@Override
public boolean hasPlayersLeft() {
for(LGPlayer lgp : getGame().getAlive())
if(lgp.getRoleType() == RoleType.VAMPIRE)
for (LGPlayer lgp : getGame().getAlive())
if (lgp.getRoleType() == RoleType.VAMPIRE)
return super.hasPlayersLeft();
return false;
}
@ -57,15 +67,15 @@ public class RChasseurDeVampire extends Role{
player.showView();
player.choose(choosen -> {
if(choosen != null && choosen != player) {
if (choosen != null && choosen != player) {
// player.sendMessage("§6Tu as choisi de rendre visite à §7§l"+choosen.getName()+"§6.");
if(choosen.getCache().getBoolean("vampire") || choosen.getRole() instanceof RVampire) {
if (choosen.getCache().getBoolean("vampire") || choosen.getRole() instanceof RVampire) {
getGame().kill(choosen, Reason.CHASSEUR_DE_VAMPIRE);
player.sendMessage("§7§l"+choosen.getName()+"§6 est un §5§lVampire§6, à l'attaque.");
player.sendActionBarMessage("§e§l"+choosen.getName()+"§6 va mourir");
player.sendMessage("§7§l" + choosen.getName() + "§6 est un §5§lVampire§6, à l'attaque.");
player.sendActionBarMessage("§e§l" + choosen.getName() + "§6 va mourir");
} else {
player.sendMessage("§7§l"+choosen.getName()+"§6 n'est pas un §5§lVampire§6...");
player.sendActionBarMessage("§e§l"+choosen.getName()+"§6 n'est pas un §5§lVampire");
player.sendMessage("§7§l" + choosen.getName() + "§6 n'est pas un §5§lVampire§6...");
player.sendActionBarMessage("§e§l" + choosen.getName() + "§6 n'est pas un §5§lVampire");
}
player.stopChoosing();

View file

@ -1,8 +1,8 @@
package fr.leomelki.loupgarou.roles;
import java.util.Arrays;
import java.util.Collections;
import fr.leomelki.loupgarou.MainLg;
import fr.leomelki.loupgarou.classes.LGGame;
import fr.leomelki.loupgarou.classes.LGPlayer;
import org.bukkit.Bukkit;
import org.bukkit.Material;
import org.bukkit.craftbukkit.v1_15_R1.inventory.CraftInventoryCustom;
@ -15,12 +15,12 @@ import org.bukkit.inventory.ItemStack;
import org.bukkit.inventory.meta.ItemMeta;
import org.bukkit.scheduler.BukkitRunnable;
import fr.leomelki.loupgarou.MainLg;
import fr.leomelki.loupgarou.classes.LGGame;
import fr.leomelki.loupgarou.classes.LGPlayer;
import java.util.Arrays;
import java.util.Collections;
public class RChienLoup extends Role{
public class RChienLoup extends Role {
static final ItemStack[] items = new ItemStack[9];
static {
items[3] = new ItemStack(Material.GOLDEN_APPLE);
ItemMeta meta = items[3].getItemMeta();
@ -35,6 +35,10 @@ public class RChienLoup extends Role{
items[5].setItemMeta(meta);
}
Runnable callback;
boolean already;
boolean inMenu;
public RChienLoup(LGGame game) {
super(game);
}
@ -46,7 +50,7 @@ public class RChienLoup extends Role{
@Override
public String getFriendlyName() {
return "du "+getName();
return "du " + getName();
}
@Override
@ -66,12 +70,14 @@ public class RChienLoup extends Role{
@Override
public String getBroadcastedTask() {
return "Le "+getName()+"§9 pourrait trouver de nouveaux amis...";
return "Le " + getName() + "§9 pourrait trouver de nouveaux amis...";
}
@Override
public RoleType getType() {
return RoleType.VILLAGER;
}
@Override
public RoleWinType getWinType() {
return RoleWinType.VILLAGE;
@ -87,9 +93,6 @@ public class RChienLoup extends Role{
return super.hasPlayersLeft() && !already;
}
Runnable callback;
boolean already;
public void openInventory(Player player) {
inMenu = true;
Inventory inventory = Bukkit.createInventory(null, 9, "§7Choisis ton camp.");
@ -97,6 +100,7 @@ public class RChienLoup extends Role{
player.closeInventory();
player.openInventory(inventory);
}
@Override
protected void onNightTurn(LGPlayer player, Runnable callback) {
already = true;
@ -104,6 +108,7 @@ public class RChienLoup extends Role{
this.callback = callback;
openInventory(player.getPlayer());
}
@Override
protected void onNightTurnTimeout(LGPlayer player) {
closeInventory(player.getPlayer());
@ -113,28 +118,27 @@ public class RChienLoup extends Role{
player.sendMessage("§6Tu rejoins le §a§lVillage.");
}
boolean inMenu;
private void closeInventory(Player p) {
inMenu = false;
p.closeInventory();
}
@EventHandler
public void onInventoryClick(InventoryClickEvent e) {
ItemStack item = e.getCurrentItem();
Player player = (Player)e.getWhoClicked();
Player player = (Player) e.getWhoClicked();
LGPlayer lgp = LGPlayer.thePlayer(getGame().getPlugin(), player);
if(lgp.getRole() != this || item == null || item.getItemMeta() == null)return;
if (lgp.getRole() != this || item == null || item.getItemMeta() == null) return;
if(item.getItemMeta().getDisplayName().equals(items[3].getItemMeta().getDisplayName())) {
if (item.getItemMeta().getDisplayName().equals(items[3].getItemMeta().getDisplayName())) {
e.setCancelled(true);
closeInventory(player);
lgp.sendActionBarMessage("§6Tu resteras fidèle au §a§lVillage§6.");
lgp.sendMessage("§6Tu resteras fidèle au §a§lVillage§6.");
lgp.hideView();
callback.run();
}else if(item.getItemMeta().getDisplayName().equals(items[5].getItemMeta().getDisplayName())) {
} else if (item.getItemMeta().getDisplayName().equals(items[5].getItemMeta().getDisplayName())) {
e.setCancelled(true);
closeInventory(player);
@ -143,11 +147,11 @@ public class RChienLoup extends Role{
//On le fait aussi rejoindre le camp des loups pour le tour pendant la nuit.
RChienLoupLG lgChienLoup = null;
for(Role role : getGame().getRoles())
if(role instanceof RChienLoupLG)
lgChienLoup = (RChienLoupLG)role;
for (Role role : getGame().getRoles())
if (role instanceof RChienLoupLG)
lgChienLoup = (RChienLoupLG) role;
if(lgChienLoup == null)
if (lgChienLoup == null)
getGame().getRoles().add(lgChienLoup = new RChienLoupLG(getGame()));
lgChienLoup.join(lgp, false);
@ -160,9 +164,9 @@ public class RChienLoup extends Role{
@EventHandler
public void onQuitInventory(InventoryCloseEvent e) {
if(e.getInventory() instanceof CraftInventoryCustom) {
LGPlayer player = LGPlayer.thePlayer(getGame().getPlugin(), (Player)e.getPlayer());
if(player.getRole() == this && inMenu) {
if (e.getInventory() instanceof CraftInventoryCustom) {
LGPlayer player = LGPlayer.thePlayer(getGame().getPlugin(), (Player) e.getPlayer());
if (player.getRole() == this && inMenu) {
new BukkitRunnable() {
@Override

View file

@ -1,26 +1,26 @@
package fr.leomelki.loupgarou.roles;
import org.bukkit.potion.PotionEffectType;
import fr.leomelki.loupgarou.classes.LGCustomItems;
import fr.leomelki.loupgarou.classes.LGGame;
import fr.leomelki.loupgarou.classes.LGPlayer;
import org.bukkit.potion.PotionEffectType;
public class RChienLoupLG extends Role{
public class RChienLoupLG extends Role {
public RChienLoupLG(LGGame game) {
super(game);
}
@Override
public String getName() {
for(LGPlayer lgp : getPlayers())
if(lgp.getPlayer() != null && lgp.getPlayer().hasPotionEffect(PotionEffectType.INVISIBILITY))
for (LGPlayer lgp : getPlayers())
if (lgp.getPlayer() != null && lgp.getPlayer().hasPotionEffect(PotionEffectType.INVISIBILITY))
return "§c§lChien-Loup";
return (getPlayers().size() > 0 ? "§a" : "§c")+"§lChien-Loup";
return (getPlayers().size() > 0 ? "§a" : "§c") + "§lChien-Loup";
}
@Override
public String getFriendlyName() {
return "du "+getName();
return "du " + getName();
}
@Override
@ -40,12 +40,14 @@ public class RChienLoupLG extends Role{
@Override
public String getBroadcastedTask() {
return "Le "+getName()+"§9 pourrait trouver de nouveaux amis...";
return "Le " + getName() + "§9 pourrait trouver de nouveaux amis...";
}
@Override
public RoleType getType() {
return RoleType.LOUP_GAROU;
}
@Override
public RoleWinType getWinType() {
return RoleWinType.LOUP_GAROU;
@ -61,12 +63,12 @@ public class RChienLoupLG extends Role{
super.join(player, sendMessage);
player.setRole(this);
LGCustomItems.updateItem(player);
for(Role role : getGame().getRoles())
if(role instanceof RLoupGarou) {
for (Role role : getGame().getRoles())
if (role instanceof RLoupGarou) {
role.join(player, false);
for(LGPlayer lgp : role.getPlayers())
if(lgp != player)
lgp.sendMessage("§7§l"+player.getName()+"§6 a rejoint les §c§lLoups-Garous§6.");
for (LGPlayer lgp : role.getPlayers())
if (lgp != player)
lgp.sendMessage("§7§l" + player.getName() + "§6 a rejoint les §c§lLoups-Garous§6.");
}
}
}

View file

@ -1,50 +1,58 @@
package fr.leomelki.loupgarou.roles;
import org.bukkit.event.EventHandler;
import org.bukkit.scheduler.BukkitRunnable;
import fr.leomelki.loupgarou.MainLg;
import fr.leomelki.loupgarou.classes.LGGame;
import fr.leomelki.loupgarou.classes.LGPlayer;
import fr.leomelki.loupgarou.events.LGDayEndEvent;
import fr.leomelki.loupgarou.events.LGVoteEvent;
import org.bukkit.event.EventHandler;
import org.bukkit.scheduler.BukkitRunnable;
public class RCorbeau extends Role{
public class RCorbeau extends Role {
public RCorbeau(LGGame game) {
super(game);
}
@Override
public RoleType getType() {
return RoleType.VILLAGER;
}
@Override
public RoleWinType getWinType() {
return RoleWinType.VILLAGE;
}
@Override
public String getName() {
return "§a§lCorbeau";
}
@Override
public String getFriendlyName() {
return "du "+getName();
return "du " + getName();
}
@Override
public String getShortDescription() {
return "Tu gagnes avec le §a§lVillage";
}
@Override
public String getDescription() {
return "Tu gagnes avec le §a§lVillage§f. Chaque nuit, tu peux désigner un joueur qui se retrouvera le lendemain avec deux voix contre lui au vote.";
}
@Override
public String getTask() {
return "Tu peux choisir un joueur qui aura deux votes contre lui.";
}
@Override
public String getBroadcastedTask() {
return "Le "+getName()+"§9 s'apprête à diffamer quelqu'un...";
return "Le " + getName() + "§9 s'apprête à diffamer quelqu'un...";
}
@Override
public int getTimeout() {
return 15;
@ -55,13 +63,13 @@ public class RCorbeau extends Role{
player.showView();
player.choose(choosen -> {
if(choosen != null && choosen != player) {
if (choosen != null && choosen != player) {
//player.sendTitle("§6Vous avez regardé un rôle", "§e§l"+choosen.getName()+"§6§l est §e§l"+choosen.getRole().getName(), 5*20);
choosen.getCache().set("corbeau_selected", true);
player.sendActionBarMessage("§e§l"+choosen.getName()+"§6 aura deux votes contre lui");
player.sendMessage("§6Tu nuis à la réputation de §7§l"+choosen.getName()+"§6.");
player.sendActionBarMessage("§e§l" + choosen.getName() + "§6 aura deux votes contre lui");
player.sendMessage("§6Tu nuis à la réputation de §7§l" + choosen.getName() + "§6.");
player.stopChoosing();
player.hideView();
callback.run();
@ -71,16 +79,16 @@ public class RCorbeau extends Role{
@EventHandler
public void onNightStart(LGDayEndEvent e) {
if(e.getGame() == getGame())
for(LGPlayer lgp : getGame().getAlive())
if (e.getGame() == getGame())
for (LGPlayer lgp : getGame().getAlive())
lgp.getCache().remove("corbeau_selected");
}
@EventHandler
public void onVoteStart(LGVoteEvent e) {
if(e.getGame() == getGame())
for(LGPlayer lgp : getGame().getAlive())
if(lgp.getCache().getBoolean("corbeau_selected")) {
if (e.getGame() == getGame())
for (LGPlayer lgp : getGame().getAlive())
if (lgp.getCache().getBoolean("corbeau_selected")) {
lgp.getCache().remove("corbeau_selected");
new BukkitRunnable() {
@ -89,7 +97,7 @@ public class RCorbeau extends Role{
MainLg plugin = getGame().getPlugin();
getGame().getVote().vote(new LGPlayer(plugin, "§a§lLe corbeau"), lgp);
getGame().getVote().vote(new LGPlayer(plugin, "§a§lLe corbeau"), lgp);//fix
getGame().broadcastMessage("§7§l"+ lgp.getName()+"§6 a reçu la visite du "+getName()+"§6.");
getGame().broadcastMessage("§7§l" + lgp.getName() + "§6 a reçu la visite du " + getName() + "§6.");
}
}.runTask(MainLg.getInstance());

View file

@ -1,8 +1,16 @@
package fr.leomelki.loupgarou.roles;
import java.util.ArrayList;
import java.util.Arrays;
import com.comphenix.protocol.wrappers.EnumWrappers.ItemSlot;
import com.comphenix.protocol.wrappers.WrappedDataWatcher;
import com.comphenix.protocol.wrappers.WrappedDataWatcher.WrappedDataWatcherObject;
import com.comphenix.protocol.wrappers.WrappedWatchableObject;
import fr.leomelki.com.comphenix.packetwrapper.*;
import fr.leomelki.loupgarou.MainLg;
import fr.leomelki.loupgarou.classes.LGGame;
import fr.leomelki.loupgarou.classes.LGPlayer;
import fr.leomelki.loupgarou.classes.LGWinType;
import fr.leomelki.loupgarou.events.*;
import fr.leomelki.loupgarou.events.LGPlayerKilledEvent.Reason;
import org.bukkit.Bukkit;
import org.bukkit.Location;
import org.bukkit.Material;
@ -13,68 +21,62 @@ import org.bukkit.event.player.AsyncPlayerChatEvent;
import org.bukkit.inventory.ItemStack;
import org.bukkit.scheduler.BukkitRunnable;
import com.comphenix.protocol.wrappers.EnumWrappers.ItemSlot;
import com.comphenix.protocol.wrappers.WrappedDataWatcher;
import com.comphenix.protocol.wrappers.WrappedDataWatcher.WrappedDataWatcherObject;
import com.comphenix.protocol.wrappers.WrappedWatchableObject;
import java.util.ArrayList;
import java.util.Arrays;
import fr.leomelki.com.comphenix.packetwrapper.WrapperPlayServerEntityDestroy;
import fr.leomelki.com.comphenix.packetwrapper.WrapperPlayServerEntityEquipment;
import fr.leomelki.com.comphenix.packetwrapper.WrapperPlayServerEntityLook;
import fr.leomelki.com.comphenix.packetwrapper.WrapperPlayServerEntityMetadata;
import fr.leomelki.com.comphenix.packetwrapper.WrapperPlayServerSpawnEntityLiving;
import fr.leomelki.loupgarou.MainLg;
import fr.leomelki.loupgarou.classes.LGGame;
import fr.leomelki.loupgarou.classes.LGPlayer;
import fr.leomelki.loupgarou.classes.LGWinType;
import fr.leomelki.loupgarou.events.LGEndCheckEvent;
import fr.leomelki.loupgarou.events.LGGameEndEvent;
import fr.leomelki.loupgarou.events.LGPlayerGotKilledEvent;
import fr.leomelki.loupgarou.events.LGPlayerKilledEvent;
import fr.leomelki.loupgarou.events.LGPlayerKilledEvent.Reason;
import fr.leomelki.loupgarou.events.LGUpdatePrefixEvent;
public class RCupidon extends Role {
final WrappedDataWatcherObject invisible = new WrappedDataWatcherObject(0, WrappedDataWatcher.Registry.get(Byte.class));
final WrappedDataWatcherObject noGravity = new WrappedDataWatcherObject(5, WrappedDataWatcher.Registry.get(Boolean.class));
public class RCupidon extends Role{
public RCupidon(LGGame game) {
super(game);
}
@Override
public RoleType getType() {
return RoleType.VILLAGER;
}
@Override
public RoleWinType getWinType() {
return RoleWinType.VILLAGE;
}
@Override
public String getName() {
return "§a§lCupidon";
}
@Override
public String getFriendlyName() {
return "de "+getName();
return "de " + getName();
}
@Override
public String getShortDescription() {
return "Tu gagnes avec le §a§lVillage";
}
@Override
public String getDescription() {
return "Tu gagnes avec le §a§lVillage§f. Dès le début de la partie, tu dois former un couple de deux joueurs. Leur objectif sera de survivre ensemble, car si l'un d'eux meurt, l'autre se suicidera.";
}
@Override
public String getTask() {
return "Choisis deux joueurs à mettre en couple.";
}
@Override
public String getBroadcastedTask() {
return getName()+"§9 choisit deux âmes à unir.";
return getName() + "§9 choisit deux âmes à unir.";
}
@Override
public int getTimeout() {
return 15;
}
@Override
public boolean hasPlayersLeft() {
return getGame().getNight() == 1;
@ -85,23 +87,23 @@ public class RCupidon extends Role{
player.showView();
player.choose(choosen -> {
if(choosen != null) {
if(player.getCache().has("cupidon_first")) {
if (choosen != null) {
if (player.getCache().has("cupidon_first")) {
LGPlayer first = player.getCache().remove("cupidon_first");
if(first == choosen) {
int entityId = Integer.MAX_VALUE-choosen.getPlayer().getEntityId();
if (first == choosen) {
int entityId = Integer.MAX_VALUE - choosen.getPlayer().getEntityId();
WrapperPlayServerEntityDestroy destroy = new WrapperPlayServerEntityDestroy();
destroy.setEntityIds(new int[] {entityId});
destroy.setEntityIds(new int[]{entityId});
destroy.sendPacket(player.getPlayer());
} else {
// sendHead(player, choosen);
int entityId = Integer.MAX_VALUE-first.getPlayer().getEntityId();
int entityId = Integer.MAX_VALUE - first.getPlayer().getEntityId();
WrapperPlayServerEntityDestroy destroy = new WrapperPlayServerEntityDestroy();
destroy.setEntityIds(new int[] {entityId});
destroy.setEntityIds(new int[]{entityId});
destroy.sendPacket(player.getPlayer());
setInLove(first, choosen);
player.sendMessage("§7§l"+first.getName()+"§9 et §7§l"+choosen.getName()+"§9 sont désormais follement amoureux.");
player.sendMessage("§7§l" + first.getName() + "§9 et §7§l" + choosen.getName() + "§9 sont désormais follement amoureux.");
player.stopChoosing();
player.hideView();
callback.run();
@ -113,13 +115,14 @@ public class RCupidon extends Role{
}
});
}
protected void setInLove(LGPlayer player1, LGPlayer player2) {
player1.getCache().set("inlove", player2);
player1.sendMessage("§9Tu tombes amoureux de §7§l"+player2.getName()+"§9, il est "+player2.getRole().getName());
player1.sendMessage("§9Tu tombes amoureux de §7§l" + player2.getName() + "§9, il est " + player2.getRole().getName());
player1.sendMessage("§9§oTu peux lui parler en mettant un §e!§9 devant ton message.");
player2.getCache().set("inlove", player1);
player2.sendMessage("§9Tu tombes amoureux de §7§l"+player1.getName()+"§9, il est "+player1.getRole().getName());
player2.sendMessage("§9Tu tombes amoureux de §7§l" + player1.getName() + "§9, il est " + player1.getRole().getName());
player2.sendMessage("§9§oTu peux lui parler en mettant un §e!§9 devant ton message.");
/* sendHead(player1, player2);
@ -130,23 +133,21 @@ public class RCupidon extends Role{
player2.updatePrefix();
}
final WrappedDataWatcherObject invisible = new WrappedDataWatcherObject(0, WrappedDataWatcher.Registry.get(Byte.class));
final WrappedDataWatcherObject noGravity = new WrappedDataWatcherObject(5, WrappedDataWatcher.Registry.get(Boolean.class));
protected void sendHead(LGPlayer to, LGPlayer ofWho) {
int entityId = Integer.MAX_VALUE-ofWho.getPlayer().getEntityId();
int entityId = Integer.MAX_VALUE - ofWho.getPlayer().getEntityId();
WrapperPlayServerSpawnEntityLiving spawn = new WrapperPlayServerSpawnEntityLiving();
spawn.setEntityID(entityId);
spawn.setType(EntityType.DROPPED_ITEM);
//spawn.setMetadata(new WrappedDataWatcher(Arrays.asList(new WrappedWatchableObject(invisible, (byte)0x20), new WrappedWatchableObject(noGravity, true))));
Location loc = ofWho.getPlayer().getLocation();
spawn.setX(loc.getX());
spawn.setY(loc.getY()+1.9);
spawn.setY(loc.getY() + 1.9);
spawn.setZ(loc.getZ());
spawn.setHeadPitch(0);
Location toLoc = to.getPlayer().getLocation();
double diffX = loc.getX()-toLoc.getX(),
diffZ = loc.getZ()-toLoc.getZ();
float yaw = 180-((float) Math.toDegrees(Math.atan2(diffX, diffZ)));
double diffX = loc.getX() - toLoc.getX(),
diffZ = loc.getZ() - toLoc.getZ();
float yaw = 180 - ((float) Math.toDegrees(Math.atan2(diffX, diffZ)));
spawn.setYaw(yaw);
spawn.sendPacket(to.getPlayer());
@ -159,11 +160,10 @@ public class RCupidon extends Role{
WrapperPlayServerEntityMetadata meta = new WrapperPlayServerEntityMetadata();
meta.setEntityID(entityId);
meta.setMetadata(Arrays.asList(new WrappedWatchableObject(invisible, (byte)0x20), new WrappedWatchableObject(noGravity, true)));
meta.setMetadata(Arrays.asList(new WrappedWatchableObject(invisible, (byte) 0x20), new WrappedWatchableObject(noGravity, true)));
meta.sendPacket(to.getPlayer());
new BukkitRunnable() {
@Override
@ -190,39 +190,39 @@ public class RCupidon extends Role{
@EventHandler
public void onPlayerKill(LGPlayerGotKilledEvent e) {
if(e.getGame() == getGame() && e.getKilled().getCache().has("inlove") && !e.getKilled().getCache().<LGPlayer>get("inlove").isDead()) {
if (e.getGame() == getGame() && e.getKilled().getCache().has("inlove") && !e.getKilled().getCache().<LGPlayer>get("inlove").isDead()) {
LGPlayer killed = e.getKilled().getCache().get("inlove");
LGPlayerKilledEvent event = new LGPlayerKilledEvent(getGame(), killed, Reason.LOVE);
Bukkit.getPluginManager().callEvent(event);
if(!event.isCancelled())
if (!event.isCancelled())
getGame().kill(event.getKilled(), event.getReason(), false);
}
}
@EventHandler(priority = EventPriority.HIGH)
public void onGameEnd(LGGameEndEvent e) {
if(e.getGame() == getGame()) {
if (e.getGame() == getGame()) {
WrapperPlayServerEntityDestroy destroy = new WrapperPlayServerEntityDestroy();
ArrayList<Integer> ids = new ArrayList<>();
for(LGPlayer lgp : getGame().getInGame())
ids.add(Integer.MAX_VALUE-lgp.getPlayer().getEntityId());
for (LGPlayer lgp : getGame().getInGame())
ids.add(Integer.MAX_VALUE - lgp.getPlayer().getEntityId());
int[] intList = new int[ids.size()];
for(int i = 0;i<ids.size();i++)
for (int i = 0; i < ids.size(); i++)
intList[i] = ids.get(i);
destroy.setEntityIds(intList);
for(LGPlayer lgp : getGame().getInGame())
for (LGPlayer lgp : getGame().getInGame())
destroy.sendPacket(lgp.getPlayer());
for(LGPlayer lgp : getGame().getInGame())
if(lgp.getCache().has("inlove")) {
if(e.getWinType() == LGWinType.COUPLE) {
if(!e.getWinners().contains(lgp))
for (LGPlayer lgp : getGame().getInGame())
if (lgp.getCache().has("inlove")) {
if (e.getWinType() == LGWinType.COUPLE) {
if (!e.getWinners().contains(lgp))
e.getWinners().add(lgp);
} else {
LGPlayer player2 = lgp.getCache().get("inlove");
boolean winEnCouple = (lgp.getRoleType() == RoleType.LOUP_GAROU) != (player2.getRoleType() == RoleType.LOUP_GAROU) || lgp.getRoleWinType() == RoleWinType.SEUL || player2.getRoleWinType() == RoleWinType.SEUL;
if(winEnCouple) {
System.out.println(lgp.getName()+" ne peut pas gagner car il était en couple !");
if (winEnCouple) {
System.out.println(lgp.getName() + " ne peut pas gagner car il était en couple !");
e.getWinners().remove(lgp);
}
}
@ -232,16 +232,16 @@ public class RCupidon extends Role{
@EventHandler
public void onEndCheck(LGEndCheckEvent e) {
if(e.getGame() == getGame()) {
if (e.getGame() == getGame()) {
ArrayList<LGPlayer> winners = new ArrayList<>();
for(LGPlayer lgp : getGame().getAlive())
if(lgp.getRoleWinType() != RoleWinType.NONE)
for (LGPlayer lgp : getGame().getAlive())
if (lgp.getRoleWinType() != RoleWinType.NONE)
winners.add(lgp);
if(winners.size() == 2) {
if (winners.size() == 2) {
LGPlayer player1 = winners.get(0),
player2 = winners.get(1);
boolean winEnCouple = (player1.getRoleType() == RoleType.LOUP_GAROU) != (player2.getRoleType() == RoleType.LOUP_GAROU) || player1.getRoleWinType() == RoleWinType.SEUL || player2.getRoleWinType() == RoleWinType.SEUL;
if(player1.getCache().get("inlove") == player2 && /*player1.isABadGuy() != player2.isABadGuy()*/ (player1.getRoleType() == RoleType.LOUP_GAROU) != (player2.getRoleType() == RoleType.LOUP_GAROU))
if (player1.getCache().get("inlove") == player2 && /*player1.isABadGuy() != player2.isABadGuy()*/ (player1.getRoleType() == RoleType.LOUP_GAROU) != (player2.getRoleType() == RoleType.LOUP_GAROU))
e.setWinType(LGWinType.COUPLE);
}
}
@ -250,22 +250,23 @@ public class RCupidon extends Role{
@EventHandler(priority = EventPriority.LOWEST)
public void onChat(AsyncPlayerChatEvent e) {
LGPlayer player = LGPlayer.thePlayer(getGame().getPlugin(), e.getPlayer());
if(player.getGame() == getGame()) {
if(e.getMessage().startsWith("!")) {
if(player.getCache().has("inlove")){
player.sendMessage("§d\u2764 "+player.getName()+" §6» §f"+e.getMessage().substring(1));
player.getCache().<LGPlayer>get("inlove").sendMessage("§d\u2764 "+player.getName()+" §6» §f"+e.getMessage().substring(1));
}else
if (player.getGame() == getGame()) {
if (e.getMessage().startsWith("!")) {
if (player.getCache().has("inlove")) {
player.sendMessage("§d\u2764 " + player.getName() + " §6» §f" + e.getMessage().substring(1));
player.getCache().<LGPlayer>get("inlove").sendMessage("§d\u2764 " + player.getName() + " §6» §f" + e.getMessage().substring(1));
} else
player.sendMessage("§4Erreur : §cVous n'êtes pas en couple !");
e.setCancelled(true);
}
}
}
@EventHandler(priority = EventPriority.HIGH)
public void onUpdatePrefix (LGUpdatePrefixEvent e) {
if(e.getGame() == getGame())
if(e.getTo().getCache().get("inlove") == e.getPlayer() || ((e.getTo() == e.getPlayer() || e.getTo().getRole() == this) && e.getPlayer().getCache().has("inlove")))
e.setPrefix("§d\u2764 §f"+e.getPrefix());
public void onUpdatePrefix(LGUpdatePrefixEvent e) {
if (e.getGame() == getGame())
if (e.getTo().getCache().get("inlove") == e.getPlayer() || ((e.getTo() == e.getPlayer() || e.getTo().getRole() == this) && e.getPlayer().getCache().has("inlove")))
e.setPrefix("§d\u2764 §f" + e.getPrefix());
}
/* @EventHandler

View file

@ -3,66 +3,75 @@ package fr.leomelki.loupgarou.roles;
import fr.leomelki.loupgarou.classes.LGGame;
import fr.leomelki.loupgarou.classes.LGPlayer;
public class RDetective extends Role{
public class RDetective extends Role {
public RDetective(LGGame game) {
super(game);
}
@Override
public RoleType getType() {
return RoleType.VILLAGER;
}
@Override
public RoleWinType getWinType() {
return RoleWinType.VILLAGE;
}
@Override
public String getName() {
return "§a§lDétective";
}
@Override
public String getFriendlyName() {
return "du "+getName();
return "du " + getName();
}
@Override
public String getShortDescription() {
return "Tu gagnes avec le §a§lVillage";
}
@Override
public String getDescription() {
return "Tu gagnes avec le §a§lVillage§f. Chaque nuit, tu mènes l'enquête sur deux joueurs pour découvrir s'ils font partie du même camp.";
}
@Override
public String getTask() {
return "Choisis deux joueurs à étudier.";
}
@Override
public String getBroadcastedTask() {
return "Le "+getName()+"§9 est sur une enquête...";
return "Le " + getName() + "§9 est sur une enquête...";
}
@Override
public int getTimeout() {
return 15;
}
@Override
protected void onNightTurn(LGPlayer player, Runnable callback) {
player.showView();
player.choose(choosen -> {
if(choosen != null) {
if(choosen == player) {
if (choosen != null) {
if (choosen == player) {
player.sendMessage("§cVous ne pouvez pas vous sélectionner !");
return;
}
if(player.getCache().has("detective_first")) {
if (player.getCache().has("detective_first")) {
LGPlayer first = player.getCache().remove("detective_first");
if(first == choosen) {
player.sendMessage("§cVous ne pouvez pas comparer §7§l"+first.getName()+"§c avec lui même !");
if (first == choosen) {
player.sendMessage("§cVous ne pouvez pas comparer §7§l" + first.getName() + "§c avec lui même !");
} else {
if((first.getRoleType() == RoleType.NEUTRAL || choosen.getRoleType() == RoleType.NEUTRAL) ? first.getRole().getClass() == choosen.getRole().getClass() : first.getRoleType() == choosen.getRoleType())
player.sendMessage("§7§l"+first.getName()+"§6 et §7§l"+choosen.getName()+"§6 sont §adu même camp.");
if ((first.getRoleType() == RoleType.NEUTRAL || choosen.getRoleType() == RoleType.NEUTRAL) ? first.getRole().getClass() == choosen.getRole().getClass() : first.getRoleType() == choosen.getRoleType())
player.sendMessage("§7§l" + first.getName() + "§6 et §7§l" + choosen.getName() + "§6 sont §adu même camp.");
else
player.sendMessage("§7§l"+first.getName()+"§6 et §7§l"+choosen.getName()+"§6 ne sont §cpas du même camp.");
player.sendMessage("§7§l" + first.getName() + "§6 et §7§l" + choosen.getName() + "§6 ne sont §cpas du même camp.");
player.stopChoosing();
player.hideView();
@ -70,7 +79,7 @@ public class RDetective extends Role{
}
} else {
player.getCache().set("detective_first", choosen);
player.sendMessage("§9Choisis un joueur avec qui tu souhaites comparer le rôle de §7§l"+choosen.getName());
player.sendMessage("§9Choisis un joueur avec qui tu souhaites comparer le rôle de §7§l" + choosen.getName());
}
}
});

View file

@ -1,10 +1,14 @@
package fr.leomelki.loupgarou.roles;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.Iterator;
import fr.leomelki.com.comphenix.packetwrapper.WrapperPlayServerHeldItemSlot;
import fr.leomelki.loupgarou.MainLg;
import fr.leomelki.loupgarou.classes.LGGame;
import fr.leomelki.loupgarou.classes.LGPlayer;
import fr.leomelki.loupgarou.events.LGDayEndEvent;
import fr.leomelki.loupgarou.events.LGMayorVoteEvent;
import fr.leomelki.loupgarou.events.LGPlayerKilledEvent;
import fr.leomelki.loupgarou.events.LGPlayerKilledEvent.Reason;
import fr.leomelki.loupgarou.events.LGVoteEvent;
import org.bukkit.Bukkit;
import org.bukkit.Material;
import org.bukkit.craftbukkit.v1_15_R1.inventory.CraftInventoryCustom;
@ -19,19 +23,15 @@ import org.bukkit.inventory.ItemStack;
import org.bukkit.inventory.meta.ItemMeta;
import org.bukkit.scheduler.BukkitRunnable;
import fr.leomelki.com.comphenix.packetwrapper.WrapperPlayServerHeldItemSlot;
import fr.leomelki.loupgarou.MainLg;
import fr.leomelki.loupgarou.classes.LGGame;
import fr.leomelki.loupgarou.classes.LGPlayer;
import fr.leomelki.loupgarou.events.LGDayEndEvent;
import fr.leomelki.loupgarou.events.LGMayorVoteEvent;
import fr.leomelki.loupgarou.events.LGPlayerKilledEvent;
import fr.leomelki.loupgarou.events.LGPlayerKilledEvent.Reason;
import fr.leomelki.loupgarou.events.LGVoteEvent;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.Iterator;
public class RDictateur extends Role{
public class RDictateur extends Role {
static private final ItemStack[] items = new ItemStack[9];
static private final Inventory inventory;
static {
items[3] = new ItemStack(Material.IRON_NUGGET);
ItemMeta meta = items[3].getItemMeta();
@ -51,40 +51,52 @@ public class RDictateur extends Role{
inventory = Bukkit.createInventory(null, 9, "§7Veux-tu faire un coup d'état ?");
inventory.setContents(items.clone());
}
Runnable callback, run;
boolean inMenu = false;
public RDictateur(LGGame game) {
super(game);
}
@Override
public RoleType getType() {
return RoleType.VILLAGER;
}
@Override
public RoleWinType getWinType() {
return RoleWinType.VILLAGE;
}
@Override
public String getName() {
return "§a§lDictateur";
}
@Override
public String getFriendlyName() {
return "du "+getName();
return "du " + getName();
}
@Override
public String getShortDescription() {
return "Tu gagnes avec le §a§lVillage";
}
@Override
public String getDescription() {
return "Tu gagnes avec le §a§lVillage§f. Une fois dans la partie, tu peux choisir d'effectuer un §e§o§lcoup d'état§f, tu choisiras alors seul qui mourra au jour suivant. Si tu fais le bon choix, tu deviendras §5§lCapitaine§f mais si tu tues un §a§lVillageois§f, tu te suicideras la nuit qui suit.";
}
@Override
public String getTask() {
return "Veux-tu réaliser un coup d'état ?";
}
@Override
public String getBroadcastedTask() {
return "Le "+getName()+"§9 décide s'il veut se dévoiler.";
return "Le " + getName() + "§9 décide s'il veut se dévoiler.";
}
@Override
@ -97,13 +109,14 @@ public class RDictateur extends Role{
player.closeInventory();
player.openInventory(inventory);
}
Runnable callback, run;
@Override
protected void onNightTurn(LGPlayer player, Runnable callback) {
player.showView();
this.callback = callback;
openInventory(player.getPlayer());
}
@Override
protected void onNightTurnTimeout(LGPlayer player) {
player.hideView();
@ -113,28 +126,27 @@ public class RDictateur extends Role{
player.sendMessage("§7§oVous aurez de nouveau le choix lors de la prochaine nuit.");*/
}
boolean inMenu = false;
private void closeInventory(Player p) {
inMenu = false;
p.closeInventory();
}
@EventHandler
public void onInventoryClick(InventoryClickEvent e) {
ItemStack item = e.getCurrentItem();
Player player = (Player)e.getWhoClicked();
Player player = (Player) e.getWhoClicked();
LGPlayer lgp = LGPlayer.thePlayer(getGame().getPlugin(), player);
if(lgp.getRole() != this || item == null || item.getItemMeta() == null)return;
if (lgp.getRole() != this || item == null || item.getItemMeta() == null) return;
if(item.getItemMeta().getDisplayName().equals(items[3].getItemMeta().getDisplayName())) {
if (item.getItemMeta().getDisplayName().equals(items[3].getItemMeta().getDisplayName())) {
e.setCancelled(true);
closeInventory(player);
/*lgp.sendMessage("§cVous ne faites pas votre coup d'état.");
lgp.sendMessage("§7§oVous aurez de nouveau le choix lors de la prochaine nuit.");*/
lgp.hideView();
callback.run();
}else if(item.getItemMeta().getDisplayName().equals(items[5].getItemMeta().getDisplayName())) {
} else if (item.getItemMeta().getDisplayName().equals(items[5].getItemMeta().getDisplayName())) {
e.setCancelled(true);
closeInventory(player);
lgp.sendActionBarMessage("§9§lTu effectueras un coup d'état");
@ -150,21 +162,21 @@ public class RDictateur extends Role{
public void onClick(PlayerInteractEvent e) {
Player p = e.getPlayer();
LGPlayer player = LGPlayer.thePlayer(getGame().getPlugin(), p);
if(e.getItem() != null && e.getItem().getType() == Material.IRON_NUGGET && player.getRole() == this) {
if (e.getItem() != null && e.getItem().getType() == Material.IRON_NUGGET && player.getRole() == this) {
getGame().cancelWait();
player.stopChoosing();
p.getInventory().setItem(8, null);
p.updateInventory();
getGame().broadcastMessage("§7§l"+player.getName()+"§9 n'a tué personne.");
getGame().broadcastMessage("§7§l" + player.getName() + "§9 n'a tué personne.");
run.run();
}
}
@EventHandler
public void onQuitInventory(InventoryCloseEvent e) {
if(e.getInventory() instanceof CraftInventoryCustom) {
LGPlayer player = LGPlayer.thePlayer(getGame().getPlugin(), (Player)e.getPlayer());
if(player.getRole() == this && inMenu) {
if (e.getInventory() instanceof CraftInventoryCustom) {
LGPlayer player = LGPlayer.thePlayer(getGame().getPlugin(), (Player) e.getPlayer());
if (player.getRole() == this && inMenu) {
new BukkitRunnable() {
@Override
@ -178,33 +190,34 @@ public class RDictateur extends Role{
@EventHandler
public void onMayorVote(LGMayorVoteEvent e) {
if(e.getGame() == getGame())
if (e.getGame() == getGame())
onTurn(e);
}
@EventHandler
public void onVote(LGVoteEvent e) {
if(e.getGame() == getGame())
if (e.getGame() == getGame())
onTurn(e);
}
public void onTurn(Cancellable e) {
for(LGPlayer lgp : getPlayers())
if(lgp.getCache().getBoolean("just_coup_d_etat") && lgp.isRoleActive())
for (LGPlayer lgp : getPlayers())
if (lgp.getCache().getBoolean("just_coup_d_etat") && lgp.isRoleActive())
e.setCancelled(true);
if(!e.isCancelled())
if (!e.isCancelled())
return;
Iterator<LGPlayer> ite = ((ArrayList<LGPlayer>)getPlayers().clone()).iterator();
Iterator<LGPlayer> ite = ((ArrayList<LGPlayer>) getPlayers().clone()).iterator();
new Runnable() {
public void run() {
run = this;
if(ite.hasNext()) {
if (ite.hasNext()) {
LGPlayer lgp = ite.next();
if(lgp.getCache().getBoolean("just_coup_d_etat")) {
if (lgp.getCache().getBoolean("just_coup_d_etat")) {
getPlayers().remove(lgp);
lgp.getCache().remove("just_coup_d_etat");
getGame().broadcastMessage("§7§l"+lgp.getName()+" §9réalise un coup d'état.");
getGame().broadcastMessage("§7§l" + lgp.getName() + " §9réalise un coup d'état.");
//lgp.sendTitle("§6Vous faites votre coup d'état", "§aChoisissez qui tuer", 60);
//On le met sur le slot 0 pour éviter un missclick sur la croix
@ -213,15 +226,15 @@ public class RDictateur extends Role{
hold.sendPacket(lgp.getPlayer());
lgp.sendMessage("§6Choisis un joueur à exécuter.");
getGame().wait(60, ()->{
getGame().wait(60, () -> {
lgp.stopChoosing();
getGame().broadcastMessage("§7§l"+lgp.getName()+"§9 n'a tué personne.");
getGame().broadcastMessage("§7§l" + lgp.getName() + "§9 n'a tué personne.");
lgp.getPlayer().getInventory().setItem(8, null);
lgp.getPlayer().updateInventory();
this.run();
}, (player, secondsLeft)-> lgp == player ? "§9§lC'est à ton tour !" : "§6Le Dictateur choisit sa victime (§e"+secondsLeft+" s§6)");
lgp.choose((choosen)->{
if(choosen != null) {
}, (player, secondsLeft) -> lgp == player ? "§9§lC'est à ton tour !" : "§6Le Dictateur choisit sa victime (§e" + secondsLeft + " s§6)");
lgp.choose((choosen) -> {
if (choosen != null) {
getGame().cancelWait();
lgp.stopChoosing();
lgp.getPlayer().getInventory().setItem(8, null);
@ -232,30 +245,31 @@ public class RDictateur extends Role{
lgp.getPlayer().getInventory().setItem(8, items[3]);
lgp.getPlayer().updateInventory();
}
}else
} else
getGame().nextNight();
}
}.run();
}
protected void kill(LGPlayer choosen, LGPlayer dicta, Runnable callback) {
RoleType roleType = choosen.getRoleType();
LGPlayerKilledEvent killEvent = new LGPlayerKilledEvent(getGame(), choosen, Reason.DICTATOR);
Bukkit.getPluginManager().callEvent(killEvent);
if(killEvent.isCancelled())return;
if(getGame().kill(killEvent.getKilled(), killEvent.getReason(), true))
if (killEvent.isCancelled()) return;
if (getGame().kill(killEvent.getKilled(), killEvent.getReason(), true))
return;
if(roleType != RoleType.VILLAGER) {
getGame().broadcastMessage("§7§l"+dicta.getName()+" §9devient le §5§lCapitaine§9 du village.");
if (roleType != RoleType.VILLAGER) {
getGame().broadcastMessage("§7§l" + dicta.getName() + " §9devient le §5§lCapitaine§9 du village.");
getGame().setMayor(dicta);
} else {
getGame().kill(dicta, Reason.DICTATOR_SUICIDE);
for(LGPlayer lgp : getGame().getInGame()) {
if(lgp == dicta)
for (LGPlayer lgp : getGame().getInGame()) {
if (lgp == dicta)
lgp.sendMessage("§9§oÇa ne s'est pas passé comme prévu...");
else
lgp.sendMessage("§9Le "+getName()+"§9 s'est trompé, il mourra la nuit suivante.");
lgp.sendMessage("§9Le " + getName() + "§9 s'est trompé, il mourra la nuit suivante.");
}
}
callback.run();
@ -263,9 +277,9 @@ public class RDictateur extends Role{
@EventHandler
public void onNight(LGDayEndEvent e) {
if(e.getGame() == getGame()) {
if (e.getGame() == getGame()) {
LGPlayer lgp = getGame().getDeaths().get(Reason.DICTATOR_SUICIDE);
if(lgp != null)
if (lgp != null)
lgp.sendMessage("§8§oDes pensées sombres hantent ton esprit...");
}
}

View file

@ -1,15 +1,16 @@
package fr.leomelki.loupgarou.roles;
import java.util.Random;
import org.bukkit.event.EventHandler;
import org.bukkit.event.EventPriority;
import fr.leomelki.loupgarou.classes.LGGame;
import fr.leomelki.loupgarou.classes.LGPlayer;
import fr.leomelki.loupgarou.events.LGPlayerKilledEvent;
import org.bukkit.event.EventHandler;
import org.bukkit.event.EventPriority;
import java.util.Random;
public class REnfantSauvage extends Role {
private static final Random random = new Random();
public class REnfantSauvage extends Role{
public REnfantSauvage(LGGame game) {
super(game);
}
@ -21,7 +22,7 @@ public class REnfantSauvage extends Role{
@Override
public String getFriendlyName() {
return "de l'"+getName();
return "de l'" + getName();
}
@Override
@ -41,12 +42,14 @@ public class REnfantSauvage extends Role{
@Override
public String getBroadcastedTask() {
return "L'"+getName()+"§9 cherche ses marques...";
return "L'" + getName() + "§9 cherche ses marques...";
}
@Override
public RoleType getType() {
return RoleType.VILLAGER;
}
@Override
public RoleWinType getWinType() {
return RoleWinType.VILLAGE;
@ -62,10 +65,10 @@ public class REnfantSauvage extends Role{
player.showView();
player.sendMessage("§6Choisissez votre modèle.");
player.choose(choosen -> {
if(choosen != null) {
if (choosen != null) {
player.stopChoosing();
player.sendMessage("§6Si §7§l"+choosen.getName()+"§6 meurt, tu deviendras §c§lLoup-Garou§6.");
player.sendActionBarMessage("§7§l"+choosen.getName()+"§6 est ton modèle");
player.sendMessage("§6Si §7§l" + choosen.getName() + "§6 meurt, tu deviendras §c§lLoup-Garou§6.");
player.sendActionBarMessage("§7§l" + choosen.getName() + "§6 est ton modèle");
player.getCache().set("enfant_svg", choosen);
choosen.getCache().set("enfant_svg_d", player);
getPlayers().remove(player);//Pour éviter qu'il puisse avoir plusieurs modèles
@ -74,16 +77,16 @@ public class REnfantSauvage extends Role{
}
}, player);
}
private static final Random random = new Random();
@Override
protected void onNightTurnTimeout(LGPlayer player) {
player.stopChoosing();
player.hideView();
LGPlayer choosen = null;
while(choosen == null || choosen == player)
while (choosen == null || choosen == player)
choosen = getGame().getAlive().get(random.nextInt(getGame().getAlive().size()));
player.sendMessage("§6Si §7§l"+choosen.getName()+"§6 meurt, tu deviendras §c§lLoup-Garou§6.");
player.sendActionBarMessage("§7§l"+choosen.getName()+"§6 est ton modèle");
player.sendMessage("§6Si §7§l" + choosen.getName() + "§6 meurt, tu deviendras §c§lLoup-Garou§6.");
player.sendActionBarMessage("§7§l" + choosen.getName() + "§6 est ton modèle");
player.getCache().set("enfant_svg", choosen);
choosen.getCache().set("enfant_svg_d", player);
getPlayers().remove(player);
@ -91,17 +94,17 @@ public class REnfantSauvage extends Role{
@EventHandler(priority = EventPriority.HIGHEST)
public void onPlayerKilled(LGPlayerKilledEvent e) {
if(e.getGame() == getGame())
if(e.getKilled().getCache().has("enfant_svg_d")) {
if (e.getGame() == getGame())
if (e.getKilled().getCache().has("enfant_svg_d")) {
LGPlayer enfant = e.getKilled().getCache().remove("enfant_svg_d");
if(!enfant.isDead() && enfant.getCache().remove("enfant_svg") == e.getKilled() && enfant.isRoleActive()) {
enfant.sendMessage("§7§l"+e.getKilled().getName()+"§6 est mort, tu deviens un §c§lLoup-Garou§6.");
if (!enfant.isDead() && enfant.getCache().remove("enfant_svg") == e.getKilled() && enfant.isRoleActive()) {
enfant.sendMessage("§7§l" + e.getKilled().getName() + "§6 est mort, tu deviens un §c§lLoup-Garou§6.");
REnfantSauvageLG lgEnfantSvg = null;
for(Role role : getGame().getRoles())
if(role instanceof REnfantSauvageLG)
lgEnfantSvg = (REnfantSauvageLG)role;
for (Role role : getGame().getRoles())
if (role instanceof REnfantSauvageLG)
lgEnfantSvg = (REnfantSauvageLG) role;
if(lgEnfantSvg == null)
if (lgEnfantSvg == null)
getGame().getRoles().add(lgEnfantSvg = new REnfantSauvageLG(getGame()));
lgEnfantSvg.join(enfant, false);

View file

@ -1,28 +1,28 @@
package fr.leomelki.loupgarou.roles;
import org.bukkit.potion.PotionEffectType;
import fr.leomelki.loupgarou.classes.LGCustomItems;
import fr.leomelki.loupgarou.classes.LGGame;
import fr.leomelki.loupgarou.classes.LGPlayer;
import org.bukkit.potion.PotionEffectType;
import java.util.Comparator;
public class REnfantSauvageLG extends Role{
public class REnfantSauvageLG extends Role {
public REnfantSauvageLG(LGGame game) {
super(game);
}
@Override
public String getName() {
for(LGPlayer lgp : getPlayers())
if(lgp.getPlayer() != null && lgp.getPlayer().hasPotionEffect(PotionEffectType.INVISIBILITY))
for (LGPlayer lgp : getPlayers())
if (lgp.getPlayer() != null && lgp.getPlayer().hasPotionEffect(PotionEffectType.INVISIBILITY))
return "§c§lEnfant-Sauvage";
return (getPlayers().size() > 0 ? "§a" : "§c")+"§lEnfant-Sauvage";
return (getPlayers().size() > 0 ? "§a" : "§c") + "§lEnfant-Sauvage";
}
@Override
public String getFriendlyName() {
return "de l'"+getName();
return "de l'" + getName();
}
@Override
@ -42,12 +42,14 @@ public class REnfantSauvageLG extends Role{
@Override
public String getBroadcastedTask() {
return "L'"+getName()+"§9 cherche ses marques...";
return "L'" + getName() + "§9 cherche ses marques...";
}
@Override
public RoleType getType() {
return RoleType.LOUP_GAROU;
}
@Override
public RoleWinType getWinType() {
return RoleWinType.LOUP_GAROU;
@ -64,19 +66,19 @@ public class REnfantSauvageLG extends Role{
player.setRole(this);
LGCustomItems.updateItem(player);
RLoupGarou lgRole = null;
for(Role role : getGame().getRoles())
if(role instanceof RLoupGarou)
lgRole = (RLoupGarou)role;
for (Role role : getGame().getRoles())
if (role instanceof RLoupGarou)
lgRole = (RLoupGarou) role;
if(lgRole == null) {
if (lgRole == null) {
getGame().getRoles().add(lgRole = new RLoupGarou(getGame()));
getGame().getRoles().sort(Comparator.comparingInt(Role::getTurnOrder));
}
lgRole.join(player, false);
for(LGPlayer lgp : lgRole.getPlayers())
if(lgp != player)
lgp.sendMessage("§7§l"+player.getName()+"§6 a rejoint les §c§lLoups-Garous§6.");
for (LGPlayer lgp : lgRole.getPlayers())
if (lgp != player)
lgp.sendMessage("§7§l" + player.getName() + "§6 a rejoint les §c§lLoups-Garous§6.");
}
}

View file

@ -1,66 +1,74 @@
package fr.leomelki.loupgarou.roles;
import java.util.List;
import java.util.Random;
import org.bukkit.Bukkit;
import org.bukkit.event.EventHandler;
import org.bukkit.event.EventPriority;
import fr.leomelki.loupgarou.MainLg;
import fr.leomelki.loupgarou.classes.LGGame;
import fr.leomelki.loupgarou.classes.LGPlayer;
import fr.leomelki.loupgarou.events.LGPlayerKilledEvent;
import fr.leomelki.loupgarou.events.LGPlayerKilledEvent.Reason;
import org.bukkit.Bukkit;
import org.bukkit.event.EventHandler;
import org.bukkit.event.EventPriority;
import java.util.List;
import java.util.Random;
public class RFaucheur extends Role {
private static final Random random = new Random();
public class RFaucheur extends Role{
public RFaucheur(LGGame game) {
super(game);
}
@Override
public RoleType getType() {
return RoleType.VILLAGER;
}
@Override
public RoleWinType getWinType() {
return RoleWinType.VILLAGE;
}
@Override
public String getName() {
return "§a§lFaucheur";
}
@Override
public String getFriendlyName() {
return "du "+getName();
return "du " + getName();
}
@Override
public String getShortDescription() {
return "Tu gagnes avec le §a§lVillage";
}
@Override
public String getDescription() {
return "Tu gagnes avec le §a§lVillage§f. Si les §c§lLoups-Garous§f te tuent pendant la nuit, tu emporteras lun dentre eux dans ta mort, mais si tu meurs lors du vote du §a§lvillage§f, ce sont tes deux voisins qui en paieront le prix.";
}
@Override
public String getTask() {
return "";
}
@Override
public String getBroadcastedTask() {
return "";
}
@Override
public int getTimeout() {
return -1;
}
private static final Random random = new Random();
@EventHandler(priority = EventPriority.LOWEST)
public void onKill(LGPlayerKilledEvent e) {
if (e.getKilled().getRole() == this && e.getKilled().isRoleActive()) {
LGPlayer killed = e.getKilled();
if(killed.getCache().getBoolean("faucheur_did"))//A déjà fait son coup de faucheur !
if (killed.getCache().getBoolean("faucheur_did"))//A déjà fait son coup de faucheur !
return;
killed.getCache().set("faucheur_did", true);
if (e.getReason() == Reason.LOUP_GAROU || e.getReason() == Reason.GM_LOUP_GAROU) {//car le switch buggait (wtf)
@ -86,7 +94,7 @@ public class RFaucheur extends Role{
int killedPlace = killed.getPlace();
LGPlayer droite = null, gauche = null;
for (int i = killedPlace + 1;; i++) {
for (int i = killedPlace + 1; ; i++) {
if (i == size)
i = 0;
LGPlayer lgp = getGame().getPlacements().get(i);
@ -97,7 +105,7 @@ public class RFaucheur extends Role{
if (lgp == killed)// Fait un tour complet
break;
}
for (int i = killedPlace - 1;; i--) {
for (int i = killedPlace - 1; ; i--) {
if (i == -1)
i = size - 1;
LGPlayer lgp = getGame().getPlacements().get(i);

View file

@ -1,52 +1,61 @@
package fr.leomelki.loupgarou.roles;
import java.util.Arrays;
import java.util.List;
import org.bukkit.event.EventHandler;
import fr.leomelki.loupgarou.classes.LGGame;
import fr.leomelki.loupgarou.classes.LGPlayer;
import fr.leomelki.loupgarou.events.LGNightPlayerPreKilledEvent;
import fr.leomelki.loupgarou.events.LGPlayerKilledEvent.Reason;
import fr.leomelki.loupgarou.events.LGPreDayStartEvent;
import fr.leomelki.loupgarou.events.LGVampiredEvent;
import org.bukkit.event.EventHandler;
import java.util.Arrays;
import java.util.List;
public class RGarde extends Role {
private static final List<Reason> reasonsProtected = Arrays.asList(Reason.LOUP_GAROU, Reason.LOUP_BLANC, Reason.GM_LOUP_GAROU, Reason.ASSASSIN);
public class RGarde extends Role{
public RGarde(LGGame game) {
super(game);
}
@Override
public RoleType getType() {
return RoleType.VILLAGER;
}
@Override
public RoleWinType getWinType() {
return RoleWinType.VILLAGE;
}
@Override
public String getName() {
return "§a§lGarde";
}
@Override
public String getFriendlyName() {
return "du "+getName();
return "du " + getName();
}
@Override
public String getShortDescription() {
return "Tu gagnes avec le §a§lVillage";
}
@Override
public String getDescription() {
return "Tu gagnes avec le §a§lVillage§f. Chaque nuit, tu peux te protéger toi ou quelqu'un d'autre des attaques §c§lhostiles§f. Tu ne peux pas protéger deux fois daffilé la même personne.";
}
@Override
public String getTask() {
return "Choisis un joueur à protéger.";
}
@Override
public String getBroadcastedTask() {
return "Le "+getName()+"§9 choisit un joueur à protéger.";
return "Le " + getName() + "§9 choisit un joueur à protéger.";
}
@Override
@ -59,20 +68,20 @@ public class RGarde extends Role{
player.showView();
player.choose(choosen -> {
if(choosen != null) {
if (choosen != null) {
LGPlayer lastProtected = player.getCache().get("garde_lastProtected");
if(choosen == lastProtected) {
if(lastProtected == player)
if (choosen == lastProtected) {
if (lastProtected == player)
player.sendMessage("§4§oTu t'es déjà protégé la nuit dernière.");
else
player.sendMessage("§4§oTu as déjà protégé §7§l§o"+lastProtected.getName()+"§4§o la nuit dernière.");
player.sendMessage("§4§oTu as déjà protégé §7§l§o" + lastProtected.getName() + "§4§o la nuit dernière.");
} else {
if(choosen == player) {
if (choosen == player) {
player.sendMessage("§6Tu décides de te protéger toi-même cette nuit.");
player.sendActionBarMessage("§9Tu seras protégé.");
} else {
player.sendMessage("§6Tu vas protéger §7§l"+choosen.getName()+"§6 cette nuit.");
player.sendActionBarMessage("§7§l"+choosen.getName()+"§9 sera protégé.");
player.sendMessage("§6Tu vas protéger §7§l" + choosen.getName() + "§6 cette nuit.");
player.sendActionBarMessage("§7§l" + choosen.getName() + "§9 sera protégé.");
}
choosen.getCache().set("garde_protected", true);
player.getCache().set("garde_lastProtected", choosen);
@ -83,6 +92,7 @@ public class RGarde extends Role{
}
});
}
@Override
protected void onNightTurnTimeout(LGPlayer player) {
player.getCache().remove("garde_lastProtected");
@ -92,24 +102,24 @@ public class RGarde extends Role{
//player.sendMessage("§cVous n'avez protégé personne cette nuit.");
}
private static final List<Reason> reasonsProtected = Arrays.asList(Reason.LOUP_GAROU, Reason.LOUP_BLANC, Reason.GM_LOUP_GAROU, Reason.ASSASSIN);
@EventHandler
public void onPlayerKill(LGNightPlayerPreKilledEvent e) {
if(e.getGame() == getGame() && reasonsProtected.contains(e.getReason()) && e.getKilled().getCache().getBoolean("garde_protected")) {
if (e.getGame() == getGame() && reasonsProtected.contains(e.getReason()) && e.getKilled().getCache().getBoolean("garde_protected")) {
e.getKilled().getCache().remove("garde_protected");
e.setReason(Reason.DONT_DIE);
}
}
@EventHandler
public void onVampired(LGVampiredEvent e) {
if(e.getGame() == getGame() && e.getPlayer().getCache().getBoolean("garde_protected"))
if (e.getGame() == getGame() && e.getPlayer().getCache().getBoolean("garde_protected"))
e.setProtect(true);
}
@EventHandler
public void onDayStart(LGPreDayStartEvent e) {
if(e.getGame() == getGame())
for(LGPlayer lgp : getGame().getInGame())
if (e.getGame() == getGame())
for (LGPlayer lgp : getGame().getInGame())
lgp.getCache().remove("garde_protected");
}
}

View file

@ -1,13 +1,15 @@
package fr.leomelki.loupgarou.roles;
import org.bukkit.event.EventHandler;
import fr.leomelki.loupgarou.classes.LGGame;
import fr.leomelki.loupgarou.classes.LGPlayer;
import fr.leomelki.loupgarou.events.LGPlayerKilledEvent;
import fr.leomelki.loupgarou.events.LGPlayerKilledEvent.Reason;
import org.bukkit.event.EventHandler;
public class RGrandMechantLoup extends Role{
public class RGrandMechantLoup extends Role {
boolean lgDied;
Runnable callback;
public RGrandMechantLoup(LGGame game) {
super(game);
@ -20,7 +22,7 @@ public class RGrandMechantLoup extends Role{
@Override
public String getFriendlyName() {
return "du "+getName();
return "du " + getName();
}
@Override
@ -42,10 +44,12 @@ public class RGrandMechantLoup extends Role{
public String getBroadcastedTask() {
return "Le §c§lGrand Méchant Loup§9 n'en a pas terminé...";
}
@Override
public RoleType getType() {
return RoleType.LOUP_GAROU;
}
@Override
public RoleWinType getWinType() {
return RoleWinType.LOUP_GAROU;
@ -60,17 +64,16 @@ public class RGrandMechantLoup extends Role{
public boolean hasPlayersLeft() {
return super.hasPlayersLeft() && !lgDied;
}
boolean lgDied;
Runnable callback;
@Override
protected void onNightTurn(LGPlayer player, Runnable callback) {
this.callback = callback;
player.showView();
player.choose(choosen -> {
if(choosen != null && choosen != player) {
player.sendActionBarMessage("§e§l"+choosen.getName()+"§6 va mourir cette nuit");
player.sendMessage("§6Tu as choisi de manger §7§l"+choosen.getName()+"§6.");
if (choosen != null && choosen != player) {
player.sendActionBarMessage("§e§l" + choosen.getName() + "§6 va mourir cette nuit");
player.sendMessage("§6Tu as choisi de manger §7§l" + choosen.getName() + "§6.");
getGame().kill(choosen, getGame().getDeaths().containsKey(Reason.LOUP_GAROU) ? Reason.GM_LOUP_GAROU : Reason.LOUP_GAROU);
player.stopChoosing();
player.hideView();
@ -81,13 +84,12 @@ public class RGrandMechantLoup extends Role{
@EventHandler
public void onPlayerDie(LGPlayerKilledEvent e) {//Quand un Loup-Garou meurt, les grands méchants loups ne peuvent plus jouer.
if(e.getGame() == getGame())
if(e.getKilled().getRoleType() == RoleType.LOUP_GAROU)
if (e.getGame() == getGame())
if (e.getKilled().getRoleType() == RoleType.LOUP_GAROU)
lgDied = true;
}
@Override
protected void onNightTurnTimeout(LGPlayer player) {
player.stopChoosing();
@ -98,8 +100,8 @@ public class RGrandMechantLoup extends Role{
@Override
public void join(LGPlayer player, boolean sendMessage) {
super.join(player, sendMessage);
for(Role role : getGame().getRoles())
if(role instanceof RLoupGarou)
for (Role role : getGame().getRoles())
if (role instanceof RLoupGarou)
role.join(player, false);
}

View file

@ -1,28 +1,24 @@
package fr.leomelki.loupgarou.roles;
import fr.leomelki.com.comphenix.packetwrapper.WrapperPlayServerScoreboardTeam;
import fr.leomelki.loupgarou.classes.*;
import fr.leomelki.loupgarou.classes.chat.LGChat;
import fr.leomelki.loupgarou.events.*;
import fr.leomelki.loupgarou.events.LGPlayerKilledEvent.Reason;
import lombok.Getter;
import org.bukkit.event.EventHandler;
import org.bukkit.event.EventPriority;
import java.util.ArrayList;
import java.util.List;
import java.util.Map.Entry;
import org.bukkit.event.EventHandler;
import org.bukkit.event.EventPriority;
public class RLoupGarou extends Role {
import fr.leomelki.com.comphenix.packetwrapper.WrapperPlayServerScoreboardTeam;
import fr.leomelki.loupgarou.classes.LGCustomSkin;
import fr.leomelki.loupgarou.classes.LGGame;
import fr.leomelki.loupgarou.classes.LGPlayer;
import fr.leomelki.loupgarou.classes.LGVote;
import fr.leomelki.loupgarou.classes.LGWinType;
import fr.leomelki.loupgarou.classes.chat.LGChat;
import fr.leomelki.loupgarou.events.LGDayEndEvent;
import fr.leomelki.loupgarou.events.LGGameEndEvent;
import fr.leomelki.loupgarou.events.LGNightEndEvent;
import fr.leomelki.loupgarou.events.LGPlayerKilledEvent.Reason;
import fr.leomelki.loupgarou.events.LGSkinLoadEvent;
import fr.leomelki.loupgarou.events.LGUpdatePrefixEvent;
import lombok.Getter;
public class RLoupGarou extends Role{
@Getter
private final LGChat chat = new LGChat((sender, message) -> "§c" + sender.getName() + " §6» §f" + message);
boolean showSkins = false;
LGVote vote;
public RLoupGarou(LGGame game) {
super(game);
@ -57,10 +53,12 @@ public class RLoupGarou extends Role{
public String getBroadcastedTask() {
return "Les §c§lLoups-Garous§9 choisissent leur cible.";
}
@Override
public RoleType getType() {
return RoleType.LOUP_GAROU;
}
@Override
public RoleWinType getWinType() {
return RoleWinType.LOUP_GAROU;
@ -71,121 +69,120 @@ public class RLoupGarou extends Role{
return 30;
}
@Getter private final LGChat chat = new LGChat((sender, message) -> "§c"+sender.getName()+" §6» §f"+message);
boolean showSkins = false;
LGVote vote;
@Override
public void join(LGPlayer player, boolean sendMessage) {
super.join(player, sendMessage);
//On peut créer des cheats grâce à ça (qui permettent de savoir qui est lg/inf)
for(LGPlayer p : getPlayers())
for (LGPlayer p : getPlayers())
p.updatePrefix();
}
public void onNightTurn(Runnable callback) {
vote = new LGVote(getTimeout(), getTimeout()/3, getGame(), false, false, (player, secondsLeft)-> !getPlayers().contains(player) ? "§6C'est au tour "+getFriendlyName()+" §6(§e"+secondsLeft+" s§6)" : player.getCache().has("vote") ? "§l§9Vous votez contre §c§l"+player.getCache().<LGPlayer>get("vote").getName() : "§6Il vous reste §e"+secondsLeft+" seconde"+(secondsLeft > 1 ? "s" : "")+"§6 pour voter");
for(LGPlayer lgp : getGame().getAlive())
if(lgp.getRoleType() == RoleType.LOUP_GAROU)
vote = new LGVote(getTimeout(), getTimeout() / 3, getGame(), false, false, (player, secondsLeft) -> !getPlayers().contains(player) ? "§6C'est au tour " + getFriendlyName() + " §6(§e" + secondsLeft + " s§6)" : player.getCache().has("vote") ? "§l§9Vous votez contre §c§l" + player.getCache().<LGPlayer>get("vote").getName() : "§6Il vous reste §e" + secondsLeft + " seconde" + (secondsLeft > 1 ? "s" : "") + "§6 pour voter");
for (LGPlayer lgp : getGame().getAlive())
if (lgp.getRoleType() == RoleType.LOUP_GAROU)
lgp.showView();
for(LGPlayer player : getPlayers()) {
player.sendMessage("§6"+getTask());
for (LGPlayer player : getPlayers()) {
player.sendMessage("§6" + getTask());
// player.sendTitle("§6C'est à vous de jouer", "§a"+getTask(), 100);
player.joinChat(chat);
}
vote.start(getPlayers(), getPlayers(), ()->{
vote.start(getPlayers(), getPlayers(), () -> {
onNightTurnEnd();
callback.run();
});
}
private void onNightTurnEnd() {
for(LGPlayer lgp : getGame().getAlive())
if(lgp.getRoleType() == RoleType.LOUP_GAROU)
for (LGPlayer lgp : getGame().getAlive())
if (lgp.getRoleType() == RoleType.LOUP_GAROU)
lgp.hideView();
for(LGPlayer player : getPlayers()) {
for (LGPlayer player : getPlayers()) {
player.leaveChat();
}
LGPlayer choosen = vote.getChoosen();
if(choosen == null) {
if(vote.getVotes().size() > 0) {
if (choosen == null) {
if (vote.getVotes().size() > 0) {
int max = 0;
boolean equal = false;
for(Entry<LGPlayer, List<LGPlayer>> entry : vote.getVotes().entrySet())
if(entry.getValue().size() > max) {
for (Entry<LGPlayer, List<LGPlayer>> entry : vote.getVotes().entrySet())
if (entry.getValue().size() > max) {
equal = false;
max = entry.getValue().size();
choosen = entry.getKey();
}else if(entry.getValue().size() == max)
} else if (entry.getValue().size() == max)
equal = true;
if(equal) {
if (equal) {
choosen = null;
ArrayList<LGPlayer> choosable = new ArrayList<>();
for(Entry<LGPlayer, List<LGPlayer>> entry : vote.getVotes().entrySet())
if(entry.getValue().size() == max && entry.getKey().getRoleType() != RoleType.LOUP_GAROU)
for (Entry<LGPlayer, List<LGPlayer>> entry : vote.getVotes().entrySet())
if (entry.getValue().size() == max && entry.getKey().getRoleType() != RoleType.LOUP_GAROU)
choosable.add(entry.getKey());
if(choosable.size() > 0)
if (choosable.size() > 0)
choosen = choosable.get(getGame().getRandom().nextInt(choosable.size()));
}
}
}
if(choosen != null) {
if (choosen != null) {
getGame().kill(choosen, Reason.LOUP_GAROU);
for(LGPlayer player : getPlayers())
player.sendMessage("§6Les §c§lLoups§6 ont décidé de tuer §7§l"+choosen.getName()+"§6.");
}else
for(LGPlayer player : getPlayers())
for (LGPlayer player : getPlayers())
player.sendMessage("§6Les §c§lLoups§6 ont décidé de tuer §7§l" + choosen.getName() + "§6.");
} else
for (LGPlayer player : getPlayers())
player.sendMessage("§6Personne n'a été désigné pour mourir.");
}
@EventHandler
public void onGameJoin(LGGameEndEvent e) {
if(e.getGame() == getGame()) {
if (e.getGame() == getGame()) {
WrapperPlayServerScoreboardTeam teamDelete = new WrapperPlayServerScoreboardTeam();
teamDelete.setMode(1);
teamDelete.setName("loup_garou_list");
for(LGPlayer lgp : getGame().getInGame())
for (LGPlayer lgp : getGame().getInGame())
teamDelete.sendPacket(lgp.getPlayer());
}
}
@EventHandler(priority = EventPriority.HIGHEST)
public void onSkinChange(LGSkinLoadEvent e) {
if(e.getGame() == getGame())
if(getPlayers().contains(e.getPlayer()) && getPlayers().contains(e.getTo()) && showSkins) {
if (e.getGame() == getGame())
if (getPlayers().contains(e.getPlayer()) && getPlayers().contains(e.getTo()) && showSkins) {
e.getProfile().getProperties().removeAll("textures");
e.getProfile().getProperties().put("textures", LGCustomSkin.WEREWOLF.getProperty());
}
}
@EventHandler
public void onGameEnd(LGGameEndEvent e) {
if(e.getGame() == getGame() && e.getWinType() == LGWinType.LOUPGAROU)
for(LGPlayer lgp : getGame().getInGame())
if(lgp.getRoleWinType() == RoleWinType.LOUP_GAROU)//Changed to wintype
if (e.getGame() == getGame() && e.getWinType() == LGWinType.LOUPGAROU)
for (LGPlayer lgp : getGame().getInGame())
if (lgp.getRoleWinType() == RoleWinType.LOUP_GAROU)//Changed to wintype
e.getWinners().add(lgp);
}
@EventHandler(priority = EventPriority.LOWEST)
public void onUpdatePrefix (LGUpdatePrefixEvent e) {
if(e.getGame() == getGame())
if(getPlayers().contains(e.getTo()) && getPlayers().contains(e.getPlayer()))
e.setPrefix(e.getPrefix()+"§c");
public void onUpdatePrefix(LGUpdatePrefixEvent e) {
if (e.getGame() == getGame())
if (getPlayers().contains(e.getTo()) && getPlayers().contains(e.getPlayer()))
e.setPrefix(e.getPrefix() + "§c");
}
@EventHandler
public void onDay(LGNightEndEvent e) {
if(e.getGame() == getGame()) {
if (e.getGame() == getGame()) {
showSkins = false;
for(LGPlayer player : getPlayers())
for (LGPlayer player : getPlayers())
player.updateOwnSkin();
}
}
@EventHandler
public void onNight(LGDayEndEvent e) {
if(e.getGame() == getGame()) {
if (e.getGame() == getGame()) {
showSkins = true;
for(LGPlayer player : getPlayers())
for (LGPlayer player : getPlayers())
player.updateOwnSkin();
}
}

View file

@ -1,7 +1,11 @@
package fr.leomelki.loupgarou.roles;
import java.util.Collections;
import fr.leomelki.loupgarou.classes.LGGame;
import fr.leomelki.loupgarou.classes.LGPlayer;
import fr.leomelki.loupgarou.classes.LGWinType;
import fr.leomelki.loupgarou.events.LGEndCheckEvent;
import fr.leomelki.loupgarou.events.LGGameEndEvent;
import fr.leomelki.loupgarou.events.LGPlayerKilledEvent.Reason;
import org.bukkit.Material;
import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler;
@ -10,15 +14,11 @@ import org.bukkit.event.player.PlayerInteractEvent;
import org.bukkit.inventory.ItemStack;
import org.bukkit.inventory.meta.ItemMeta;
import fr.leomelki.loupgarou.classes.LGGame;
import fr.leomelki.loupgarou.classes.LGPlayer;
import fr.leomelki.loupgarou.classes.LGWinType;
import fr.leomelki.loupgarou.events.LGEndCheckEvent;
import fr.leomelki.loupgarou.events.LGGameEndEvent;
import fr.leomelki.loupgarou.events.LGPlayerKilledEvent.Reason;
import java.util.Collections;
public class RLoupGarouBlanc extends Role{
public class RLoupGarouBlanc extends Role {
private static final ItemStack skip;
static {
skip = new ItemStack(Material.IRON_NUGGET);
ItemMeta meta = skip.getItemMeta();
@ -27,6 +27,9 @@ public class RLoupGarouBlanc extends Role{
skip.setItemMeta(meta);
}
Runnable callback;
RLoupGarou lg;
public RLoupGarouBlanc(LGGame game) {
super(game);
}
@ -38,7 +41,7 @@ public class RLoupGarouBlanc extends Role{
@Override
public String getFriendlyName() {
return "du "+getName();
return "du " + getName();
}
@Override
@ -58,12 +61,14 @@ public class RLoupGarouBlanc extends Role{
@Override
public String getBroadcastedTask() {
return "Le "+getName()+"§9 pourrait faire un ravage cette nuit...";
return "Le " + getName() + "§9 pourrait faire un ravage cette nuit...";
}
@Override
public RoleType getType() {
return RoleType.LOUP_GAROU;
}
@Override
public RoleWinType getWinType() {
return RoleWinType.SEUL;
@ -76,16 +81,16 @@ public class RLoupGarouBlanc extends Role{
@Override
public boolean hasPlayersLeft() {
return super.hasPlayersLeft() && getGame().getNight()%2 == 0;
return super.hasPlayersLeft() && getGame().getNight() % 2 == 0;
}
Runnable callback;
@Override
protected void onNightTurn(LGPlayer player, Runnable callback) {
this.callback = callback;
RLoupGarou lg_ = null;
for(Role role : getGame().getRoles())
if(role instanceof RLoupGarou) {
lg_ = (RLoupGarou)role;
for (Role role : getGame().getRoles())
if (role instanceof RLoupGarou) {
lg_ = (RLoupGarou) role;
break;
}
@ -93,13 +98,13 @@ public class RLoupGarouBlanc extends Role{
player.showView();
player.getPlayer().getInventory().setItem(8, skip);
player.choose(choosen -> {
if(choosen != null && choosen != player) {
if(!lg.getPlayers().contains(choosen)) {
player.sendMessage("§7§l"+choosen.getName()+"§4 n'est pas un Loup-Garou.");
if (choosen != null && choosen != player) {
if (!lg.getPlayers().contains(choosen)) {
player.sendMessage("§7§l" + choosen.getName() + "§4 n'est pas un Loup-Garou.");
return;
}
player.sendActionBarMessage("§e§l"+choosen.getName()+"§6 va mourir cette nuit");
player.sendMessage("§6Tu as choisi de dévorer §7§l"+choosen.getName()+"§6.");
player.sendActionBarMessage("§e§l" + choosen.getName() + "§6 va mourir cette nuit");
player.sendMessage("§6Tu as choisi de dévorer §7§l" + choosen.getName() + "§6.");
player.getPlayer().getInventory().setItem(8, null);
player.getPlayer().updateInventory();
getGame().kill(choosen, Reason.LOUP_BLANC);
@ -109,11 +114,12 @@ public class RLoupGarouBlanc extends Role{
}
});
}
@EventHandler
public void onClick(PlayerInteractEvent e) {
Player p = e.getPlayer();
LGPlayer player = LGPlayer.thePlayer(getGame().getPlugin(), p);
if(e.getItem() != null && e.getItem().getType() == Material.IRON_NUGGET && player.getRole() == this) {
if (e.getItem() != null && e.getItem().getType() == Material.IRON_NUGGET && player.getRole() == this) {
player.stopChoosing();
p.getInventory().setItem(8, null);
p.updateInventory();
@ -122,6 +128,7 @@ public class RLoupGarouBlanc extends Role{
callback.run();
}
}
@Override
protected void onNightTurnTimeout(LGPlayer player) {
player.stopChoosing();
@ -131,22 +138,21 @@ public class RLoupGarouBlanc extends Role{
player.sendMessage("§6Tu n'as tué personne.");
}
RLoupGarou lg;
@Override
public void join(LGPlayer player, boolean sendMessage) {
super.join(player, sendMessage);
for(Role role : getGame().getRoles())
if(role instanceof RLoupGarou)
for (Role role : getGame().getRoles())
if (role instanceof RLoupGarou)
(lg = (RLoupGarou) role).join(player, false);
}
@EventHandler
public void onEndgameCheck(LGEndCheckEvent e) {
if(e.getGame() == getGame() && e.getWinType() == LGWinType.SOLO) {
if(getPlayers().size() > 0) {
if(lg.getPlayers().size() > getPlayers().size())
if (e.getGame() == getGame() && e.getWinType() == LGWinType.SOLO) {
if (getPlayers().size() > 0) {
if (lg.getPlayers().size() > getPlayers().size())
e.setWinType(LGWinType.NONE);
else if(lg.getPlayers().size() == getPlayers().size())
else if (lg.getPlayers().size() == getPlayers().size())
e.setWinType(LGWinType.LOUPGAROUBLANC);
}
}
@ -154,7 +160,7 @@ public class RLoupGarouBlanc extends Role{
@EventHandler(priority = EventPriority.HIGHEST)
public void onEndGame(LGGameEndEvent e) {
if(e.getWinType() == LGWinType.LOUPGAROUBLANC) {
if (e.getWinType() == LGWinType.LOUPGAROUBLANC) {
e.getWinners().clear();
e.getWinners().addAll(getPlayers());
}

View file

@ -1,8 +1,14 @@
package fr.leomelki.loupgarou.roles;
import java.util.Arrays;
import java.util.Collections;
import fr.leomelki.loupgarou.MainLg;
import fr.leomelki.loupgarou.classes.LGCustomItems;
import fr.leomelki.loupgarou.classes.LGCustomItems.LGCustomItemsConstraints;
import fr.leomelki.loupgarou.classes.LGGame;
import fr.leomelki.loupgarou.classes.LGPlayer;
import fr.leomelki.loupgarou.classes.LGVote;
import fr.leomelki.loupgarou.events.LGCustomItemChangeEvent;
import fr.leomelki.loupgarou.events.LGNightEndEvent;
import fr.leomelki.loupgarou.events.LGPlayerKilledEvent.Reason;
import org.bukkit.Bukkit;
import org.bukkit.Material;
import org.bukkit.craftbukkit.v1_15_R1.inventory.CraftInventoryCustom;
@ -16,19 +22,13 @@ import org.bukkit.inventory.ItemStack;
import org.bukkit.inventory.meta.ItemMeta;
import org.bukkit.scheduler.BukkitRunnable;
import fr.leomelki.loupgarou.MainLg;
import fr.leomelki.loupgarou.classes.LGCustomItems;
import fr.leomelki.loupgarou.classes.LGCustomItems.LGCustomItemsConstraints;
import fr.leomelki.loupgarou.classes.LGGame;
import fr.leomelki.loupgarou.classes.LGPlayer;
import fr.leomelki.loupgarou.classes.LGVote;
import fr.leomelki.loupgarou.events.LGCustomItemChangeEvent;
import fr.leomelki.loupgarou.events.LGNightEndEvent;
import fr.leomelki.loupgarou.events.LGPlayerKilledEvent.Reason;
import java.util.Arrays;
import java.util.Collections;
public class RLoupGarouNoir extends Role{
public class RLoupGarouNoir extends Role {
static final ItemStack[] items = new ItemStack[9];
static final ItemStack[] skip = new ItemStack[9];
static {
items[3] = new ItemStack(Material.IRON_NUGGET);
ItemMeta meta = items[3].getItemMeta();
@ -45,6 +45,11 @@ public class RLoupGarouNoir extends Role{
skip[4] = items[3];
}
LGVote vote;
Runnable callback;
LGPlayer toInfect;
boolean inMenu = false;
public RLoupGarouNoir(LGGame game) {
super(game);
}
@ -56,7 +61,7 @@ public class RLoupGarouNoir extends Role{
@Override
public String getFriendlyName() {
return "du "+getName();
return "du " + getName();
}
@Override
@ -76,12 +81,14 @@ public class RLoupGarouNoir extends Role{
@Override
public String getBroadcastedTask() {
return "Le "+getName()+"§9 décide s'il veut infecter sa cible.";
return "Le " + getName() + "§9 décide s'il veut infecter sa cible.";
}
@Override
public RoleType getType() {
return RoleType.LOUP_GAROU;
}
@Override
public RoleWinType getWinType() {
return RoleWinType.LOUP_GAROU;
@ -97,26 +104,24 @@ public class RLoupGarouNoir extends Role{
return super.hasPlayersLeft() && getGame().getDeaths().containsKey(Reason.LOUP_GAROU);
}
LGVote vote;
Runnable callback;
LGPlayer toInfect;
public void openInventory(Player player) {
inMenu = true;
Inventory inventory = Bukkit.createInventory(null, 9, "§7Infecter "+toInfect.getName()+" ?");
Inventory inventory = Bukkit.createInventory(null, 9, "§7Infecter " + toInfect.getName() + " ?");
inventory.setContents(toInfect == null ? skip.clone() : items.clone());
player.closeInventory();
player.openInventory(inventory);
}
@Override
protected void onNightTurn(LGPlayer player, Runnable callback) {
toInfect = getGame().getDeaths().get(Reason.LOUP_GAROU);
if(toInfect.getRoleType() == RoleType.LOUP_GAROU)
if (toInfect.getRoleType() == RoleType.LOUP_GAROU)
toInfect = null;
player.showView();
this.callback = callback;
openInventory(player.getPlayer());
}
@Override
protected void onNightTurnTimeout(LGPlayer player) {
player.getPlayer().getInventory().setItem(8, null);
@ -128,27 +133,26 @@ public class RLoupGarouNoir extends Role{
player.sendMessage("§6Tu n'as rien fait cette nuit.");
}
boolean inMenu = false;
private void closeInventory(Player p) {
inMenu = false;
p.closeInventory();
}
@EventHandler
public void onInventoryClick(InventoryClickEvent e) {
ItemStack item = e.getCurrentItem();
Player player = (Player)e.getWhoClicked();
Player player = (Player) e.getWhoClicked();
LGPlayer lgp = LGPlayer.thePlayer(getGame().getPlugin(), player);
if(lgp.getRole() != this || item == null || item.getItemMeta() == null)return;
if (lgp.getRole() != this || item == null || item.getItemMeta() == null) return;
if(item.getItemMeta().getDisplayName().equals(items[3].getItemMeta().getDisplayName())) {
if (item.getItemMeta().getDisplayName().equals(items[3].getItemMeta().getDisplayName())) {
e.setCancelled(true);
closeInventory(player);
lgp.sendMessage("§6Tu n'as rien fait cette nuit.");
lgp.hideView();
callback.run();
}else if(item.getItemMeta().getDisplayName().equals(items[5].getItemMeta().getDisplayName()) && toInfect != null) {
} else if (item.getItemMeta().getDisplayName().equals(items[5].getItemMeta().getDisplayName()) && toInfect != null) {
e.setCancelled(true);
closeInventory(player);
player.updateInventory();
@ -158,37 +162,38 @@ public class RLoupGarouNoir extends Role{
toInfect.getCache().set("infected", true);
getPlayers().remove(lgp);
toInfect.getCache().set("just_infected", true);
lgp.sendActionBarMessage("§9§lVous infectez §9"+toInfect.getName());
lgp.sendMessage("§6Tu as infecté §7§l"+toInfect.getName()+"§6.");
lgp.sendActionBarMessage("§9§lVous infectez §9" + toInfect.getName());
lgp.sendMessage("§6Tu as infecté §7§l" + toInfect.getName() + "§6.");
lgp.stopChoosing();
getGame().getDeaths().remove(Reason.LOUP_GAROU, toInfect);
lgp.hideView();
callback.run();
}
}
@EventHandler(priority = EventPriority.HIGHEST)
public void onDayStart(LGNightEndEvent e) {
if(e.getGame() == getGame())
for(LGPlayer player : getGame().getAlive()) {
if(player.getCache().getBoolean("just_infected")) {
if (e.getGame() == getGame())
for (LGPlayer player : getGame().getAlive()) {
if (player.getCache().getBoolean("just_infected")) {
player.getCache().remove("just_infected");
player.sendMessage("§6Tu as été infecté pendant la nuit.");
player.sendMessage("§6§oTu gagnes désormais avec les §c§l§oLoups-Garous§6§o.");
for(Role role : getGame().getRoles())
if(role instanceof RLoupGarou)
if(!player.isDead()) {//Si il n'a pas été tué je ne sais comment
for (Role role : getGame().getRoles())
if (role instanceof RLoupGarou)
if (!player.isDead()) {//Si il n'a pas été tué je ne sais comment
role.join(player, false);
player.getPlayer().getInventory().setItemInOffHand(new ItemStack(LGCustomItems.getItem(player)));
}
for(LGPlayer lgp : getGame().getInGame()) {
if(lgp.getRoleType() == RoleType.LOUP_GAROU)
lgp.sendMessage("§7§l"+player.getName()+"§6 s'est fait infecter pendant la nuit.");
for (LGPlayer lgp : getGame().getInGame()) {
if (lgp.getRoleType() == RoleType.LOUP_GAROU)
lgp.sendMessage("§7§l" + player.getName() + "§6 s'est fait infecter pendant la nuit.");
else
lgp.sendMessage("§6Un joueur a été §c§linfecté§6 pendant la nuit.");
}
if(getGame().checkEndGame())
if (getGame().checkEndGame())
e.setCancelled(true);
}
}
@ -197,16 +202,16 @@ public class RLoupGarouNoir extends Role{
@Override
public void join(LGPlayer player, boolean sendMessage) {
super.join(player, sendMessage);
for(Role role : getGame().getRoles())
if(role instanceof RLoupGarou)
for (Role role : getGame().getRoles())
if (role instanceof RLoupGarou)
role.join(player, false);
}
@EventHandler
public void onQuitInventory(InventoryCloseEvent e) {
if(e.getInventory() instanceof CraftInventoryCustom) {
LGPlayer player = LGPlayer.thePlayer(getGame().getPlugin(), (Player)e.getPlayer());
if(player.getRole() == this && inMenu) {
if (e.getInventory() instanceof CraftInventoryCustom) {
LGPlayer player = LGPlayer.thePlayer(getGame().getPlugin(), (Player) e.getPlayer());
if (player.getRole() == this && inMenu) {
new BukkitRunnable() {
@Override
@ -220,8 +225,8 @@ public class RLoupGarouNoir extends Role{
@EventHandler
public void onCustomItemChange(LGCustomItemChangeEvent e) {
if(e.getGame() == getGame())
if(e.getPlayer().getCache().getBoolean("infected"))
if (e.getGame() == getGame())
if (e.getPlayer().getCache().getBoolean("infected"))
e.getConstraints().add(LGCustomItemsConstraints.INFECTED.getName());
}

View file

@ -1,50 +1,58 @@
package fr.leomelki.loupgarou.roles;
import org.bukkit.event.EventHandler;
import fr.leomelki.loupgarou.classes.LGGame;
import fr.leomelki.loupgarou.classes.LGPlayer;
import fr.leomelki.loupgarou.classes.chat.LGChat;
import fr.leomelki.loupgarou.events.LGDayEndEvent;
import fr.leomelki.loupgarou.events.LGPreDayStartEvent;
import fr.leomelki.loupgarou.events.LGRoleTurnEndEvent;
import org.bukkit.event.EventHandler;
public class RMedium extends Role{
public class RMedium extends Role {
public RMedium(LGGame game) {
super(game);
}
@Override
public RoleType getType() {
return RoleType.VILLAGER;
}
@Override
public RoleWinType getWinType() {
return RoleWinType.VILLAGE;
}
@Override
public String getName() {
return "§a§lMédium";
}
@Override
public String getFriendlyName() {
return "du "+getName();
return "du " + getName();
}
@Override
public String getShortDescription() {
return "Tu gagnes avec le §a§lVillage";
}
@Override
public String getDescription() {
return "Tu gagnes avec le §a§lVillage§f. Chaque nuit, tu peux communiquer avec les morts pour tenter de récupérer des informations cruciales.";
}
@Override
public String getTask() {
return "";
}
@Override
public String getBroadcastedTask() {
return "";
}
@Override
public int getTimeout() {
return -1;
@ -52,8 +60,8 @@ public class RMedium extends Role{
@EventHandler
public void onNight(LGDayEndEvent e) {
if(e.getGame() == getGame())
for(LGPlayer lgp : getPlayers()) {
if (e.getGame() == getGame())
for (LGPlayer lgp : getPlayers()) {
lgp.sendMessage("§8§oTu entres en contact avec le monde des morts...");
joinChat(lgp);
}
@ -65,22 +73,23 @@ public class RMedium extends Role{
@Override
public String receive(LGPlayer sender, String message) {
return "§7"+sender.getName()+"§6 » §f"+message;
return "§7" + sender.getName() + "§6 » §f" + message;
}
@Override
public String send(LGPlayer sender, String message) {
return getName()+"§6 » §f"+message;
return getName() + "§6 » §f" + message;
}
});
}
@EventHandler
public void onRoleTurn(LGRoleTurnEndEvent e) {
if(e.getGame() == getGame())
if(e.getPreviousRole() instanceof RLoupGarou)
for(LGPlayer lgp : getPlayers())
if(lgp.getChat() != getGame().getSpectatorChat() && lgp.isRoleActive()) {
if (e.getGame() == getGame())
if (e.getPreviousRole() instanceof RLoupGarou)
for (LGPlayer lgp : getPlayers())
if (lgp.getChat() != getGame().getSpectatorChat() && lgp.isRoleActive()) {
lgp.sendMessage("§6§oTu peux de nouveau parler aux morts...");
joinChat(lgp);
}
@ -88,9 +97,9 @@ public class RMedium extends Role{
@EventHandler
public void onDay(LGPreDayStartEvent e) {
if(e.getGame() == getGame())
for(LGPlayer lgp : getPlayers())
if(lgp.isRoleActive())
if (e.getGame() == getGame())
for (LGPlayer lgp : getPlayers())
if (lgp.isRoleActive())
lgp.leaveChat();
}
}

View file

@ -1,97 +1,105 @@
package fr.leomelki.loupgarou.roles;
import java.util.List;
import java.util.Random;
import org.bukkit.event.EventHandler;
import org.bukkit.event.EventPriority;
import fr.leomelki.loupgarou.MainLg;
import fr.leomelki.loupgarou.classes.LGGame;
import fr.leomelki.loupgarou.classes.LGPlayer;
import fr.leomelki.loupgarou.events.LGDayStartEvent;
import org.bukkit.event.EventHandler;
import org.bukkit.event.EventPriority;
import java.util.List;
import java.util.Random;
public class RMontreurDOurs extends Role {
private static final Random random = new Random();
private int lastNight = -1;
public class RMontreurDOurs extends Role{
public RMontreurDOurs(LGGame game) {
super(game);
}
@Override
public RoleType getType() {
return RoleType.VILLAGER;
}
@Override
public RoleWinType getWinType() {
return RoleWinType.VILLAGE;
}
@Override
public String getName() {
return "§a§lMontreur d'Ours";
}
@Override
public String getFriendlyName() {
return "du "+getName();
return "du " + getName();
}
@Override
public String getShortDescription() {
return "Tu gagnes avec le §a§lVillage";
}
@Override
public String getDescription() {
return "Tu gagnes avec le §a§lVillage§f. Chaque matin, ton Ours va renifler tes voisins et grognera si l'un d'eux est hostile aux Villageois.";
}
@Override
public String getTask() {
return "";
}
@Override
public String getBroadcastedTask() {
return "";
}
@Override
public int getTimeout() {
return -1;
}
private static final Random random = new Random();
private int lastNight = -1;
@EventHandler(priority = EventPriority.LOWEST)
public void onDay(LGDayStartEvent e) {
if (e.getGame() == getGame() && getPlayers().size() > 0) {
if(lastNight == getGame().getNight())
if (lastNight == getGame().getNight())
return;
lastNight = getGame().getNight();
List<?> original = MainLg.getInstance().getConfig().getList("spawns");
for(LGPlayer target : getPlayers()) {
if(!target.isRoleActive())
for (LGPlayer target : getPlayers()) {
if (!target.isRoleActive())
continue;
int size = original.size();
int killedPlace = target.getPlace();
for (int i = killedPlace + 1;; i++) {
for (int i = killedPlace + 1; ; i++) {
if (i == size)
i = 0;
LGPlayer lgp = getGame().getPlacements().get(i);
if (lgp != null && !lgp.isDead()) {
if(lgp.getRoleWinType() == RoleWinType.VILLAGE || lgp.getRoleWinType() == RoleWinType.NONE)
if (lgp.getRoleWinType() == RoleWinType.VILLAGE || lgp.getRoleWinType() == RoleWinType.NONE)
break;
else{
getGame().broadcastMessage("§6La bête du "+getName()+"§6 grogne...");
else {
getGame().broadcastMessage("§6La bête du " + getName() + "§6 grogne...");
return;
}
}
if (lgp == target)// Fait un tour complet
break;
}
for (int i = killedPlace - 1;; i--) {
for (int i = killedPlace - 1; ; i--) {
if (i == -1)
i = size - 1;
LGPlayer lgp = getGame().getPlacements().get(i);
if (lgp != null && !lgp.isDead()) {
if(lgp.getRoleWinType() == RoleWinType.VILLAGE || lgp.getRoleWinType() == RoleWinType.NONE)
if (lgp.getRoleWinType() == RoleWinType.VILLAGE || lgp.getRoleWinType() == RoleWinType.NONE)
break;
else{
getGame().broadcastMessage("§6La bête du "+getName()+"§6 grogne...");
else {
getGame().broadcastMessage("§6La bête du " + getName() + "§6 grogne...");
return;
}
}

View file

@ -1,72 +1,80 @@
package fr.leomelki.loupgarou.roles;
import java.util.Arrays;
import java.util.List;
import org.bukkit.event.EventHandler;
import fr.leomelki.loupgarou.classes.LGGame;
import fr.leomelki.loupgarou.classes.LGPlayer;
import fr.leomelki.loupgarou.events.LGRoleTurnEndEvent;
import org.bukkit.event.EventHandler;
import java.util.Arrays;
import java.util.List;
public class RPetiteFille extends Role {
final List<String> customNames = Arrays.asList("Loup Glouton", "Loup Méchant", "Loup Burlesque", "Loup Peureux", "Loup Malingre", "Loup Gentil", "Loup Tueur", "Loup Énervé", "Loup Docteur");
public class RPetiteFille extends Role{
public RPetiteFille(LGGame game) {
super(game);
}
@Override
public RoleType getType() {
return RoleType.VILLAGER;
}
@Override
public RoleWinType getWinType() {
return RoleWinType.VILLAGE;
}
@Override
public String getName() {
return "§a§lPetite Fille";
}
@Override
public String getFriendlyName() {
return "de la "+getName();
return "de la " + getName();
}
@Override
public String getShortDescription() {
return "Tu gagnes avec le §a§lVillage";
}
@Override
public String getDescription() {
return "Tu gagnes avec le §a§lVillage§f. Chaque nuit, tu peux espionner les §c§lLoups§f.";
}
@Override
public String getTask() {
return "";
}
@Override
public String getBroadcastedTask() {
return "";
}
@Override
public int getTimeout() {
return -1;
}
final List<String> customNames = Arrays.asList("Loup Glouton", "Loup Méchant", "Loup Burlesque", "Loup Peureux", "Loup Malingre", "Loup Gentil", "Loup Tueur", "Loup Énervé", "Loup Docteur");
@EventHandler
public void onChangeRole(LGRoleTurnEndEvent e) {
if(e.getGame() == getGame()) {
if(e.getNewRole() instanceof RLoupGarou)
for(Role role : getGame().getRoles())
if(role instanceof RLoupGarou) {
RLoupGarou lgRole = (RLoupGarou)role;
for(LGPlayer player : getPlayers())
if(!player.getCache().getBoolean("infected") && player.isRoleActive())
player.joinChat(lgRole.getChat(), (sender, message)-> "§c"+customNames.get(lgRole.getPlayers().indexOf(sender))+" §6» §f"+message, true);
if (e.getGame() == getGame()) {
if (e.getNewRole() instanceof RLoupGarou)
for (Role role : getGame().getRoles())
if (role instanceof RLoupGarou) {
RLoupGarou lgRole = (RLoupGarou) role;
for (LGPlayer player : getPlayers())
if (!player.getCache().getBoolean("infected") && player.isRoleActive())
player.joinChat(lgRole.getChat(), (sender, message) -> "§c" + customNames.get(lgRole.getPlayers().indexOf(sender)) + " §6» §f" + message, true);
break;
}
if(e.getPreviousRole() instanceof RLoupGarou)
for(LGPlayer player : getPlayers())
if(!player.getCache().getBoolean("infected") && player.isRoleActive())
if (e.getPreviousRole() instanceof RLoupGarou)
for (LGPlayer player : getPlayers())
if (!player.getCache().getBoolean("infected") && player.isRoleActive())
player.leaveChat();
}
}

View file

@ -1,8 +1,11 @@
package fr.leomelki.loupgarou.roles;
import java.util.Arrays;
import java.util.Collections;
import fr.leomelki.com.comphenix.packetwrapper.WrapperPlayServerHeldItemSlot;
import fr.leomelki.loupgarou.MainLg;
import fr.leomelki.loupgarou.classes.LGGame;
import fr.leomelki.loupgarou.classes.LGPlayer;
import fr.leomelki.loupgarou.events.LGPlayerKilledEvent;
import fr.leomelki.loupgarou.events.LGPlayerKilledEvent.Reason;
import org.bukkit.Bukkit;
import org.bukkit.Material;
import org.bukkit.craftbukkit.v1_15_R1.inventory.CraftInventoryCustom;
@ -17,15 +20,12 @@ import org.bukkit.inventory.ItemStack;
import org.bukkit.inventory.meta.ItemMeta;
import org.bukkit.scheduler.BukkitRunnable;
import fr.leomelki.com.comphenix.packetwrapper.WrapperPlayServerHeldItemSlot;
import fr.leomelki.loupgarou.MainLg;
import fr.leomelki.loupgarou.classes.LGGame;
import fr.leomelki.loupgarou.classes.LGPlayer;
import fr.leomelki.loupgarou.events.LGPlayerKilledEvent;
import fr.leomelki.loupgarou.events.LGPlayerKilledEvent.Reason;
import java.util.Arrays;
import java.util.Collections;
public class RPirate extends Role{
public class RPirate extends Role {
static final ItemStack[] items = new ItemStack[9];
static {
items[3] = new ItemStack(Material.IRON_NUGGET);
ItemMeta meta = items[3].getItemMeta();
@ -41,6 +41,9 @@ public class RPirate extends Role{
items[5].setItemMeta(meta);
}
Runnable callback;
boolean inMenu = false;
public RPirate(LGGame game) {
super(game);
}
@ -52,7 +55,7 @@ public class RPirate extends Role{
@Override
public String getFriendlyName() {
return "du "+getName();
return "du " + getName();
}
@Override
@ -72,12 +75,14 @@ public class RPirate extends Role{
@Override
public String getBroadcastedTask() {
return "Le "+getName()+"§9 aiguise son crochet...";
return "Le " + getName() + "§9 aiguise son crochet...";
}
@Override
public RoleType getType() {
return RoleType.VILLAGER;
}
@Override
public RoleWinType getWinType() {
return RoleWinType.VILLAGE;
@ -88,8 +93,6 @@ public class RPirate extends Role{
return 15;
}
Runnable callback;
public void openInventory(Player player) {
inMenu = true;
Inventory inventory = Bukkit.createInventory(null, 9, "§7Veux-tu prendre un otage ?");
@ -97,12 +100,14 @@ public class RPirate extends Role{
player.closeInventory();
player.openInventory(inventory);
}
@Override
protected void onNightTurn(LGPlayer player, Runnable callback) {
player.showView();
this.callback = callback;
openInventory(player.getPlayer());
}
@Override
protected void onNightTurnTimeout(LGPlayer player) {
player.getPlayer().getInventory().setItem(8, null);
@ -114,27 +119,26 @@ public class RPirate extends Role{
player.sendMessage("§6Tu n'as rien fait cette nuit.");
}
boolean inMenu = false;
private void closeInventory(Player p) {
inMenu = false;
p.closeInventory();
}
@EventHandler
public void onInventoryClick(InventoryClickEvent e) {
ItemStack item = e.getCurrentItem();
Player player = (Player)e.getWhoClicked();
Player player = (Player) e.getWhoClicked();
LGPlayer lgp = LGPlayer.thePlayer(getGame().getPlugin(), player);
if(lgp.getRole() != this || item == null || item.getItemMeta() == null)return;
if (lgp.getRole() != this || item == null || item.getItemMeta() == null) return;
if(item.getItemMeta().getDisplayName().equals(items[3].getItemMeta().getDisplayName())) {
if (item.getItemMeta().getDisplayName().equals(items[3].getItemMeta().getDisplayName())) {
e.setCancelled(true);
closeInventory(player);
lgp.sendMessage("§6Tu n'as rien fait cette nuit.");
lgp.hideView();
callback.run();
}else if(item.getItemMeta().getDisplayName().equals(items[5].getItemMeta().getDisplayName())) {
} else if (item.getItemMeta().getDisplayName().equals(items[5].getItemMeta().getDisplayName())) {
e.setCancelled(true);
closeInventory(player);
player.getInventory().setItem(8, items[3]);
@ -145,29 +149,30 @@ public class RPirate extends Role{
held.sendPacket(player);
lgp.sendMessage("§6Choisissez votre otage.");
lgp.choose(choosen -> {
if(choosen != null) {
if (choosen != null) {
player.getInventory().setItem(8, null);
player.updateInventory();
lgp.stopChoosing();
lgp.sendMessage("§6Tu as pris §7§l"+choosen.getName()+"§6 en otage.");
lgp.sendActionBarMessage("§7§l"+choosen.getName()+"§6 est ton otage");
lgp.sendMessage("§6Tu as pris §7§l" + choosen.getName() + "§6 en otage.");
lgp.sendActionBarMessage("§7§l" + choosen.getName() + "§6 est ton otage");
lgp.getCache().set("pirate_otage", choosen);
choosen.getCache().set("pirate_otage_d", lgp);
getPlayers().remove(lgp);//Pour éviter qu'il puisse prendre plusieurs otages
choosen.sendMessage("§7§l"+lgp.getName()+"§6 t'a pris en otage, il est "+getName()+"§6.");
choosen.sendMessage("§7§l" + lgp.getName() + "§6 t'a pris en otage, il est " + getName() + "§6.");
lgp.hideView();
callback.run();
}
}, lgp);
}
}
@EventHandler(priority = EventPriority.LOWEST)
public void onPlayerKilled(LGPlayerKilledEvent e) {
if(e.getGame() == getGame() && e.getReason() == Reason.VOTE)
if(e.getKilled().getCache().has("pirate_otage") && e.getKilled().isRoleActive()) {
if (e.getGame() == getGame() && e.getReason() == Reason.VOTE)
if (e.getKilled().getCache().has("pirate_otage") && e.getKilled().isRoleActive()) {
LGPlayer otage = e.getKilled().getCache().remove("pirate_otage");
if(!otage.isDead() && otage.getCache().get("pirate_otage_d") == e.getKilled()) {
getGame().broadcastMessage("§7§l"+e.getKilled().getName()+"§6 est "+getName()+"§6, c'est son otage qui va mourir.");
if (!otage.isDead() && otage.getCache().get("pirate_otage_d") == e.getKilled()) {
getGame().broadcastMessage("§7§l" + e.getKilled().getName() + "§6 est " + getName() + "§6, c'est son otage qui va mourir.");
e.setKilled(otage);
e.setReason(Reason.PIRATE);
}
@ -178,8 +183,8 @@ public class RPirate extends Role{
public void onClick(PlayerInteractEvent e) {
Player player = e.getPlayer();
LGPlayer lgp = LGPlayer.thePlayer(getGame().getPlugin(), player);
if(lgp.getRole() == this) {
if(e.getItem() != null && e.getItem().hasItemMeta() && e.getItem().getItemMeta().getDisplayName().equals(items[3].getItemMeta().getDisplayName())) {
if (lgp.getRole() == this) {
if (e.getItem() != null && e.getItem().hasItemMeta() && e.getItem().getItemMeta().getDisplayName().equals(items[3].getItemMeta().getDisplayName())) {
e.setCancelled(true);
player.getInventory().setItem(8, null);
player.updateInventory();
@ -190,11 +195,12 @@ public class RPirate extends Role{
}
}
}
@EventHandler
public void onQuitInventory(InventoryCloseEvent e) {
if(e.getInventory() instanceof CraftInventoryCustom) {
LGPlayer player = LGPlayer.thePlayer(getGame().getPlugin(), (Player)e.getPlayer());
if(player.getRole() == this && inMenu) {
if (e.getInventory() instanceof CraftInventoryCustom) {
LGPlayer player = LGPlayer.thePlayer(getGame().getPlugin(), (Player) e.getPlayer());
if (player.getRole() == this && inMenu) {
new BukkitRunnable() {
@Override

View file

@ -1,9 +1,16 @@
package fr.leomelki.loupgarou.roles;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import com.comphenix.protocol.wrappers.WrappedDataWatcher;
import com.comphenix.protocol.wrappers.WrappedDataWatcher.WrappedDataWatcherObject;
import com.comphenix.protocol.wrappers.WrappedWatchableObject;
import fr.leomelki.com.comphenix.packetwrapper.WrapperPlayServerEntityMetadata;
import fr.leomelki.com.comphenix.packetwrapper.WrapperPlayServerHeldItemSlot;
import fr.leomelki.loupgarou.MainLg;
import fr.leomelki.loupgarou.classes.LGCustomItems;
import fr.leomelki.loupgarou.classes.LGGame;
import fr.leomelki.loupgarou.classes.LGPlayer;
import fr.leomelki.loupgarou.events.LGPreDayStartEvent;
import fr.leomelki.loupgarou.utils.VariousUtils;
import org.bukkit.Bukkit;
import org.bukkit.Material;
import org.bukkit.craftbukkit.v1_15_R1.inventory.CraftInventoryCustom;
@ -19,21 +26,13 @@ import org.bukkit.inventory.meta.ItemMeta;
import org.bukkit.potion.PotionEffectType;
import org.bukkit.scheduler.BukkitRunnable;
import com.comphenix.protocol.wrappers.WrappedDataWatcher;
import com.comphenix.protocol.wrappers.WrappedDataWatcher.WrappedDataWatcherObject;
import com.comphenix.protocol.wrappers.WrappedWatchableObject;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import fr.leomelki.com.comphenix.packetwrapper.WrapperPlayServerEntityMetadata;
import fr.leomelki.com.comphenix.packetwrapper.WrapperPlayServerHeldItemSlot;
import fr.leomelki.loupgarou.MainLg;
import fr.leomelki.loupgarou.classes.LGCustomItems;
import fr.leomelki.loupgarou.classes.LGGame;
import fr.leomelki.loupgarou.classes.LGPlayer;
import fr.leomelki.loupgarou.events.LGPreDayStartEvent;
import fr.leomelki.loupgarou.utils.VariousUtils;
public class RPretre extends Role{
public class RPretre extends Role {
static final ItemStack[] items = new ItemStack[9];
static {
items[3] = new ItemStack(Material.IRON_NUGGET);
ItemMeta meta = items[3].getItemMeta();
@ -49,6 +48,11 @@ public class RPretre extends Role{
items[5].setItemMeta(meta);
}
final WrappedDataWatcherObject invisible = new WrappedDataWatcherObject(0, WrappedDataWatcher.Registry.get(Byte.class));
final ArrayList<LGPlayer> ressucited = new ArrayList<>();
Runnable callback;
boolean inMenu = false;
public RPretre(LGGame game) {
super(game);
}
@ -60,7 +64,7 @@ public class RPretre extends Role{
@Override
public String getFriendlyName() {
return "du "+getName();
return "du " + getName();
}
@Override
@ -80,12 +84,14 @@ public class RPretre extends Role{
@Override
public String getBroadcastedTask() {
return "Le "+getName()+"§9 récite ses ouvrages...";
return "Le " + getName() + "§9 récite ses ouvrages...";
}
@Override
public RoleType getType() {
return RoleType.VILLAGER;
}
@Override
public RoleWinType getWinType() {
return RoleWinType.VILLAGE;
@ -95,17 +101,16 @@ public class RPretre extends Role{
public int getTimeout() {
return 30;
}
@Override
public boolean hasPlayersLeft() {
for(LGPlayer pretre : getPlayers())
for(LGPlayer lgp : getGame().getInGame())
if(lgp.isDead() && (lgp.getRoleType() == RoleType.VILLAGER || lgp.getRoleType() == pretre.getRoleType()))
for (LGPlayer pretre : getPlayers())
for (LGPlayer lgp : getGame().getInGame())
if (lgp.isDead() && (lgp.getRoleType() == RoleType.VILLAGER || lgp.getRoleType() == pretre.getRoleType()))
return super.hasPlayersLeft();
return false;
}
Runnable callback;
public void openInventory(Player player) {
inMenu = true;
Inventory inventory = Bukkit.createInventory(null, 9, "§7Veux-tu réssusciter quelqu'un ?");
@ -113,24 +118,25 @@ public class RPretre extends Role{
player.closeInventory();
player.openInventory(inventory);
}
final WrappedDataWatcherObject invisible = new WrappedDataWatcherObject(0, WrappedDataWatcher.Registry.get(Byte.class));
@Override
protected void onNightTurn(LGPlayer player, Runnable callback) {
player.showView();
for(LGPlayer lgp : getGame().getInGame())
if(lgp.isDead() && (lgp.getRoleType() == RoleType.VILLAGER || lgp.getRoleType() == player.getRoleType())){
if(lgp.getPlayer() != null) {
for (LGPlayer lgp : getGame().getInGame())
if (lgp.isDead() && (lgp.getRoleType() == RoleType.VILLAGER || lgp.getRoleType() == player.getRoleType())) {
if (lgp.getPlayer() != null) {
player.getPlayer().showPlayer(getGame().getPlugin(), lgp.getPlayer());
WrapperPlayServerEntityMetadata meta = new WrapperPlayServerEntityMetadata();
meta.setEntityID(lgp.getPlayer().getEntityId());
meta.setMetadata(Collections.singletonList(new WrappedWatchableObject(invisible, (byte) 0)));
meta.sendPacket(player.getPlayer());
}
}else
} else
player.getPlayer().hidePlayer(getGame().getPlugin(), lgp.getPlayer());
this.callback = callback;
openInventory(player.getPlayer());
}
@Override
protected void onNightTurnTimeout(LGPlayer player) {
player.getPlayer().getInventory().setItem(8, null);
@ -144,36 +150,34 @@ public class RPretre extends Role{
}
private void hidePlayers(LGPlayer player) {
if(player.getPlayer() != null) {
for(LGPlayer lgp : getGame().getInGame())
if(lgp.getPlayer() != null && lgp != player)
if (player.getPlayer() != null) {
for (LGPlayer lgp : getGame().getInGame())
if (lgp.getPlayer() != null && lgp != player)
player.getPlayer().hidePlayer(getGame().getPlugin(), lgp.getPlayer());
}
}
boolean inMenu = false;
final ArrayList<LGPlayer> ressucited = new ArrayList<>();
private void closeInventory(Player p) {
inMenu = false;
p.closeInventory();
}
@EventHandler
public void onInventoryClick(InventoryClickEvent e) {
ItemStack item = e.getCurrentItem();
Player player = (Player)e.getWhoClicked();
Player player = (Player) e.getWhoClicked();
LGPlayer lgp = LGPlayer.thePlayer(getGame().getPlugin(), player);
if(lgp.getRole() != this || item == null || item.getItemMeta() == null)return;
if (lgp.getRole() != this || item == null || item.getItemMeta() == null) return;
if(item.getItemMeta().getDisplayName().equals(items[3].getItemMeta().getDisplayName())) {
if (item.getItemMeta().getDisplayName().equals(items[3].getItemMeta().getDisplayName())) {
e.setCancelled(true);
closeInventory(player);
lgp.sendMessage("§6Tu n'as rien fait cette nuit.");
hidePlayers(lgp);
lgp.hideView();
callback.run();
}else if(item.getItemMeta().getDisplayName().equals(items[5].getItemMeta().getDisplayName())) {
} else if (item.getItemMeta().getDisplayName().equals(items[5].getItemMeta().getDisplayName())) {
e.setCancelled(true);
closeInventory(player);
player.getInventory().setItem(8, items[3]);
@ -185,20 +189,20 @@ public class RPretre extends Role{
lgp.sendMessage("§6Choisissez qui réssusciter.");
lgp.canSelectDead = true;
lgp.choose(choosen -> {
if(choosen != null) {
if(!choosen.isDead())
lgp.sendMessage("§7§l"+choosen.getName()+"§c n'est pas mort.");
else if(lgp.getRoleType() == RoleType.LOUP_GAROU && choosen.getRoleType() == RoleType.NEUTRAL) {
lgp.sendMessage("§7§l"+choosen.getName()+"§c ne faisait ni partie du §a§lVillage§6 ni des §c§lLoups§6.");
}else if(lgp.getRoleType() != RoleType.LOUP_GAROU && choosen.getRoleType() != RoleType.VILLAGER) {
lgp.sendMessage("§7§l"+choosen.getName()+"§c ne faisait pas partie du §a§lVillage§6.");
if (choosen != null) {
if (!choosen.isDead())
lgp.sendMessage("§7§l" + choosen.getName() + "§c n'est pas mort.");
else if (lgp.getRoleType() == RoleType.LOUP_GAROU && choosen.getRoleType() == RoleType.NEUTRAL) {
lgp.sendMessage("§7§l" + choosen.getName() + "§c ne faisait ni partie du §a§lVillage§6 ni des §c§lLoups§6.");
} else if (lgp.getRoleType() != RoleType.LOUP_GAROU && choosen.getRoleType() != RoleType.VILLAGER) {
lgp.sendMessage("§7§l" + choosen.getName() + "§c ne faisait pas partie du §a§lVillage§6.");
} else {
player.getInventory().setItem(8, null);
player.updateInventory();
lgp.stopChoosing();
lgp.canSelectDead = false;
lgp.sendMessage("§6Tu as ramené §7§l"+choosen.getName()+"§6 à la vie.");
lgp.sendActionBarMessage("§7§l"+choosen.getName()+"§6 sera réssuscité");
lgp.sendMessage("§6Tu as ramené §7§l" + choosen.getName() + "§6 à la vie.");
lgp.sendActionBarMessage("§7§l" + choosen.getName() + "§6 sera réssuscité");
ressucited.add(choosen);
@ -212,12 +216,13 @@ public class RPretre extends Role{
}, lgp);
}
}
@EventHandler
public void onClick(PlayerInteractEvent e) {
Player player = e.getPlayer();
LGPlayer lgp = LGPlayer.thePlayer(getGame().getPlugin(), player);
if(lgp.getRole() == this) {
if(e.getItem() != null && e.getItem().hasItemMeta() && e.getItem().getItemMeta().getDisplayName().equals(items[3].getItemMeta().getDisplayName())) {
if (lgp.getRole() == this) {
if (e.getItem() != null && e.getItem().hasItemMeta() && e.getItem().getItemMeta().getDisplayName().equals(items[3].getItemMeta().getDisplayName())) {
e.setCancelled(true);
player.getInventory().setItem(8, null);
player.updateInventory();
@ -232,18 +237,18 @@ public class RPretre extends Role{
@EventHandler(priority = EventPriority.HIGHEST)
public void onDayStart(LGPreDayStartEvent e) {
if(e.getGame() == getGame())
if(ressucited.size() > 0) {
for(LGPlayer lgp : ressucited) {
if(lgp.getPlayer() == null || !lgp.isDead())
if (e.getGame() == getGame())
if (ressucited.size() > 0) {
for (LGPlayer lgp : ressucited) {
if (lgp.getPlayer() == null || !lgp.isDead())
continue;
lgp.setDead(false);
lgp.getCache().reset();
RVillageois villagers = null;
for(Role role : getGame().getRoles())
if(role instanceof RVillageois)
villagers = (RVillageois)role;
if(villagers == null)
for (Role role : getGame().getRoles())
if (role instanceof RVillageois)
villagers = (RVillageois) role;
if (villagers == null)
getGame().getRoles().add(villagers = new RVillageois(getGame()));
villagers.join(lgp, false);//Le joueur réssuscité rejoint les villageois.
lgp.setRole(villagers);
@ -257,21 +262,22 @@ public class RPretre extends Role{
getGame().updateRoleScoreboard();
getGame().broadcastMessage("§7§l"+lgp.getName()+"§6 a été ressuscité cette nuit.");
getGame().broadcastMessage("§7§l" + lgp.getName() + "§6 a été ressuscité cette nuit.");
for(LGPlayer player : getGame().getInGame())
if(player.getPlayer() != null && player != lgp) {
for (LGPlayer player : getGame().getInGame())
if (player.getPlayer() != null && player != lgp) {
player.getPlayer().showPlayer(getGame().getPlugin(), lgp.getPlayer());
}
}
ressucited.clear();
}
}
@EventHandler
public void onQuitInventory(InventoryCloseEvent e) {
if(e.getInventory() instanceof CraftInventoryCustom) {
LGPlayer player = LGPlayer.thePlayer(getGame().getPlugin(), (Player)e.getPlayer());
if(player.getRole() == this && inMenu) {
if (e.getInventory() instanceof CraftInventoryCustom) {
LGPlayer player = LGPlayer.thePlayer(getGame().getPlugin(), (Player) e.getPlayer());
if (player.getRole() == this && inMenu) {
new BukkitRunnable() {
@Override

View file

@ -3,42 +3,51 @@ package fr.leomelki.loupgarou.roles;
import fr.leomelki.loupgarou.classes.LGGame;
import fr.leomelki.loupgarou.classes.LGPlayer;
public class RPronostiqueur extends Role{
public class RPronostiqueur extends Role {
public RPronostiqueur(LGGame game) {
super(game);
}
@Override
public RoleType getType() {
return RoleType.VILLAGER;
}
@Override
public RoleWinType getWinType() {
return RoleWinType.VILLAGE;
}
@Override
public String getName() {
return "§a§lPronostiqueur";
}
@Override
public String getFriendlyName() {
return "du "+getName();
return "du " + getName();
}
@Override
public String getShortDescription() {
return "Tu gagnes avec le §a§lVillage";
}
@Override
public String getDescription() {
return "Tu gagnes avec le §a§lVillage§f. Chaque nuit, tu peux espionner un joueur et découvrir s'il est gentil ou non. Cependant, dans certaines parties, vos pronostiques ne sont pas exacts...";
}
@Override
public String getTask() {
return "Choisis un joueur sur lequel pronostiquer.";
}
@Override
public String getBroadcastedTask() {
return "Le "+getName()+"§9 s'apprête à pronostiquer...";
return "Le " + getName() + "§9 s'apprête à pronostiquer...";
}
@Override
public int getTimeout() {
return 15;
@ -49,17 +58,18 @@ public class RPronostiqueur extends Role{
player.showView();
player.choose(choosen -> {
if(choosen != null && choosen != player) {
if (choosen != null && choosen != player) {
//player.sendTitle("§6Vous avez regardé un rôle", "§e§l"+choosen.getName()+"§6§l est §e§l"+choosen.getRole().getName(), 5*20);
String gentilMechant = choosen.getRoleWinType() == RoleWinType.VILLAGE || choosen.getRoleWinType() == RoleWinType.NONE ? "§a§lgentil" : "§c§lméchant";
player.sendActionBarMessage("§e§l"+choosen.getName()+"§6 est "+gentilMechant);
player.sendMessage("§6Votre instinct vous dit que §7§l"+choosen.getName()+"§6 est "+gentilMechant+"§6.");
player.sendActionBarMessage("§e§l" + choosen.getName() + "§6 est " + gentilMechant);
player.sendMessage("§6Votre instinct vous dit que §7§l" + choosen.getName() + "§6 est " + gentilMechant + "§6.");
player.stopChoosing();
player.hideView();
callback.run();
}
});
}
@Override
protected void onNightTurnTimeout(LGPlayer player) {
player.stopChoosing();

View file

@ -1,10 +1,15 @@
package fr.leomelki.loupgarou.roles;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
import fr.leomelki.com.comphenix.packetwrapper.WrapperPlayServerHeldItemSlot;
import fr.leomelki.loupgarou.MainLg;
import fr.leomelki.loupgarou.classes.LGGame;
import fr.leomelki.loupgarou.classes.LGPlayer;
import fr.leomelki.loupgarou.classes.LGWinType;
import fr.leomelki.loupgarou.events.LGEndCheckEvent;
import fr.leomelki.loupgarou.events.LGGameEndEvent;
import fr.leomelki.loupgarou.events.LGPlayerKilledEvent;
import fr.leomelki.loupgarou.events.LGPlayerKilledEvent.Reason;
import fr.leomelki.loupgarou.events.LGPyromaneGasoilEvent;
import org.bukkit.Bukkit;
import org.bukkit.Material;
import org.bukkit.craftbukkit.v1_15_R1.inventory.CraftInventoryCustom;
@ -19,21 +24,16 @@ import org.bukkit.inventory.ItemStack;
import org.bukkit.inventory.meta.ItemMeta;
import org.bukkit.scheduler.BukkitRunnable;
import fr.leomelki.com.comphenix.packetwrapper.WrapperPlayServerHeldItemSlot;
import fr.leomelki.loupgarou.MainLg;
import fr.leomelki.loupgarou.classes.LGGame;
import fr.leomelki.loupgarou.classes.LGPlayer;
import fr.leomelki.loupgarou.classes.LGWinType;
import fr.leomelki.loupgarou.events.LGEndCheckEvent;
import fr.leomelki.loupgarou.events.LGGameEndEvent;
import fr.leomelki.loupgarou.events.LGPlayerKilledEvent;
import fr.leomelki.loupgarou.events.LGPyromaneGasoilEvent;
import fr.leomelki.loupgarou.events.LGPlayerKilledEvent.Reason;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
public class RPyromane extends Role{
public class RPyromane extends Role {
static final ItemStack[] items = new ItemStack[9];
static final ItemStack cancel;
static final ItemStack nothing;
static {
cancel = new ItemStack(Material.IRON_NUGGET);
ItemMeta meta = cancel.getItemMeta();
@ -59,6 +59,10 @@ public class RPyromane extends Role{
items[5].setItemMeta(meta);
}
Runnable callback;
boolean inMenu = false;
LGPlayer first;
public RPyromane(LGGame game) {
super(game);
}
@ -70,7 +74,7 @@ public class RPyromane extends Role{
@Override
public String getFriendlyName() {
return "du "+getName();
return "du " + getName();
}
@Override
@ -90,12 +94,14 @@ public class RPyromane extends Role{
@Override
public String getBroadcastedTask() {
return "Le "+getName()+"§9 joue avec une allumette...";
return "Le " + getName() + "§9 joue avec une allumette...";
}
@Override
public RoleType getType() {
return RoleType.NEUTRAL;
}
@Override
public RoleWinType getWinType() {
return RoleWinType.SEUL;
@ -106,21 +112,20 @@ public class RPyromane extends Role{
return 30;
}
Runnable callback;
public void openInventory(Player player) {
inMenu = true;
Inventory inventory = Bukkit.createInventory(null, 9, "§7Que veux-tu faire ?");
ItemStack[] content = items.clone();
LGPlayer lgp = LGPlayer.thePlayer(getGame().getPlugin(), player);
if(!lgp.getCache().has("pyromane_essence"))
if (!lgp.getCache().has("pyromane_essence"))
lgp.getCache().set("pyromane_essence", new ArrayList<>());
if(lgp.getCache().<List<LGPlayer>>get("pyromane_essence").size() == 0)
if (lgp.getCache().<List<LGPlayer>>get("pyromane_essence").size() == 0)
content[3] = nothing;
inventory.setContents(content);
player.closeInventory();
player.openInventory(inventory);
}
@Override
protected void onNightTurn(LGPlayer player, Runnable callback) {
first = null;
@ -128,14 +133,15 @@ public class RPyromane extends Role{
this.callback = callback;
openInventory(player.getPlayer());
}
@Override
protected void onNightTurnTimeout(LGPlayer player) {
if(first != null) {
if (first != null) {
List<LGPlayer> liste = player.getCache().get("pyromane_essence");
LGPyromaneGasoilEvent event = new LGPyromaneGasoilEvent(getGame(), first);
Bukkit.getPluginManager().callEvent(event);
if(event.isCancelled())
player.sendMessage("§7§l"+event.getPlayer().getName()+"§c est immunisé.");
if (event.isCancelled())
player.sendMessage("§7§l" + event.getPlayer().getName() + "§c est immunisé.");
else {
event.getPlayer().sendMessage("§6Tu es recouvert de gasoil...");
liste.add(event.getPlayer());
@ -149,44 +155,42 @@ public class RPyromane extends Role{
player.sendMessage("§6Tu n'as rien fait cette nuit.");
}
boolean inMenu = false;
LGPlayer first;
private void closeInventory(Player p) {
inMenu = false;
p.closeInventory();
}
@EventHandler
public void onInventoryClick(InventoryClickEvent e) {
ItemStack item = e.getCurrentItem();
Player player = (Player)e.getWhoClicked();
Player player = (Player) e.getWhoClicked();
LGPlayer lgp = LGPlayer.thePlayer(getGame().getPlugin(), player);
if(lgp.getRole() != this || item == null || item.getItemMeta() == null)return;
if(item.getItemMeta().getDisplayName().equals(nothing.getItemMeta().getDisplayName())) {
if (lgp.getRole() != this || item == null || item.getItemMeta() == null) return;
if (item.getItemMeta().getDisplayName().equals(nothing.getItemMeta().getDisplayName())) {
lgp.stopChoosing();
closeInventory(player);
lgp.hideView();
lgp.sendMessage("§6Tu n'as rien fait cette nuit.");
callback.run();
}else if(item.getItemMeta().getDisplayName().equals(items[3].getItemMeta().getDisplayName())) {
} else if (item.getItemMeta().getDisplayName().equals(items[3].getItemMeta().getDisplayName())) {
e.setCancelled(true);
closeInventory(player);
if(lgp.getCache().<List<LGPlayer>>get("pyromane_essence").size() != 0) {
if (lgp.getCache().<List<LGPlayer>>get("pyromane_essence").size() != 0) {
List<LGPlayer> liste = lgp.getCache().get("pyromane_essence");
for(LGPlayer scndPlayer : liste) {
if(!scndPlayer.isDead() && scndPlayer.getPlayer() != null) {
for (LGPlayer scndPlayer : liste) {
if (!scndPlayer.isDead() && scndPlayer.getPlayer() != null) {
getGame().kill(scndPlayer, Reason.PYROMANE);
}
}
liste.clear();
lgp.sendMessage("§6§lTu as décidé de brûler tes victimes ce soir.");
lgp.sendActionBarMessage("§6Tes victimes brûleront ce soir.");
}else
} else
lgp.sendMessage("§6§lPersonne n'a pris feu.");
lgp.hideView();
callback.run();
}else if(item.getItemMeta().getDisplayName().equals(items[5].getItemMeta().getDisplayName())) {
} else if (item.getItemMeta().getDisplayName().equals(items[5].getItemMeta().getDisplayName())) {
e.setCancelled(true);
closeInventory(player);
player.getInventory().setItem(8, cancel);
@ -197,40 +201,40 @@ public class RPyromane extends Role{
held.sendPacket(player);
lgp.sendMessage("§6Choisis deux joueurs à recouvrir de gasoil.");
lgp.choose(choosen -> {
if(choosen != null) {
if(choosen == first) {
lgp.sendMessage("§cTu as déjà versé du gasoil sur §7§l"+choosen.getName()+"§6.");
if (choosen != null) {
if (choosen == first) {
lgp.sendMessage("§cTu as déjà versé du gasoil sur §7§l" + choosen.getName() + "§6.");
return;
}
List<LGPlayer> liste = lgp.getCache().get("pyromane_essence");
if(liste.contains(choosen)) {
lgp.sendMessage("§7§l"+choosen.getName()+"§c est déjà recouvert de gasoil.");
if (liste.contains(choosen)) {
lgp.sendMessage("§7§l" + choosen.getName() + "§c est déjà recouvert de gasoil.");
return;
}
if(first == choosen) {
lgp.sendMessage("§cVous avez déjà sélectionné §7§l"+choosen.getName()+"§c.");
if (first == choosen) {
lgp.sendMessage("§cVous avez déjà sélectionné §7§l" + choosen.getName() + "§c.");
return;
}
player.getInventory().setItem(8, null);
player.updateInventory();
lgp.sendMessage("§6Tu as versé du gasoil sur §7§l"+choosen.getName()+"§6.");
lgp.sendActionBarMessage("§6§7§l"+choosen.getName()+"§6 est recouvert de gasoil");
if(first != null || getGame().getAlive().size() == 2) {
lgp.sendMessage("§6Tu as versé du gasoil sur §7§l" + choosen.getName() + "§6.");
lgp.sendActionBarMessage("§6§7§l" + choosen.getName() + "§6 est recouvert de gasoil");
if (first != null || getGame().getAlive().size() == 2) {
lgp.hideView();
lgp.stopChoosing();
LGPyromaneGasoilEvent event = new LGPyromaneGasoilEvent(getGame(), choosen);
Bukkit.getPluginManager().callEvent(event);
if(event.isCancelled())
lgp.sendMessage("§7§l"+event.getPlayer().getName()+"§c est immunisée.");
if (event.isCancelled())
lgp.sendMessage("§7§l" + event.getPlayer().getName() + "§c est immunisée.");
else {
event.getPlayer().sendMessage("§6Tu es recouvert de gasoil...");
liste.add(event.getPlayer());
}
if(first != null) {
if (first != null) {
event = new LGPyromaneGasoilEvent(getGame(), first);
Bukkit.getPluginManager().callEvent(event);
if(event.isCancelled())
lgp.sendMessage("§7§l"+event.getPlayer().getName()+"§c est immunisée.");
if (event.isCancelled())
lgp.sendMessage("§7§l" + event.getPlayer().getName() + "§c est immunisée.");
else {
event.getPlayer().sendMessage("§6Tu es recouvert de gasoil...");
liste.add(event.getPlayer());
@ -245,12 +249,13 @@ public class RPyromane extends Role{
}, lgp);
}
}
@EventHandler
public void onClick(PlayerInteractEvent e) {
Player player = e.getPlayer();
LGPlayer lgp = LGPlayer.thePlayer(getGame().getPlugin(), player);
if(lgp.getRole() == this) {
if(e.getItem() != null && e.getItem().hasItemMeta() && e.getItem().getItemMeta().getDisplayName().equals(cancel.getItemMeta().getDisplayName())) {
if (lgp.getRole() == this) {
if (e.getItem() != null && e.getItem().hasItemMeta() && e.getItem().getItemMeta().getDisplayName().equals(cancel.getItemMeta().getDisplayName())) {
e.setCancelled(true);
player.getInventory().setItem(8, null);
player.updateInventory();
@ -259,21 +264,23 @@ public class RPyromane extends Role{
}
}
}
@EventHandler
public void onKilled(LGPlayerKilledEvent e) {
if(e.getGame() == getGame())
for(LGPlayer lgp : getPlayers())
if(lgp.getCache().has("pyromane_essence")) {
if (e.getGame() == getGame())
for (LGPlayer lgp : getPlayers())
if (lgp.getCache().has("pyromane_essence")) {
List<LGPlayer> liste = lgp.getCache().get("pyromane_essence");
//Au cas le mec soit rez
liste.remove(e.getKilled());
}
}
@EventHandler
public void onQuitInventory(InventoryCloseEvent e) {
if(e.getInventory() instanceof CraftInventoryCustom) {
LGPlayer player = LGPlayer.thePlayer(getGame().getPlugin(), (Player)e.getPlayer());
if(player.getRole() == this && inMenu) {
if (e.getInventory() instanceof CraftInventoryCustom) {
LGPlayer player = LGPlayer.thePlayer(getGame().getPlugin(), (Player) e.getPlayer());
if (player.getRole() == this && inMenu) {
new BukkitRunnable() {
@Override
@ -289,14 +296,15 @@ public class RPyromane extends Role{
@EventHandler
public void onEndgameCheck(LGEndCheckEvent e) {
if(e.getGame() == getGame() && e.getWinType() == LGWinType.SOLO) {
if(getPlayers().size() > 0)
if (e.getGame() == getGame() && e.getWinType() == LGWinType.SOLO) {
if (getPlayers().size() > 0)
e.setWinType(LGWinType.PYROMANE);
}
}
@EventHandler(priority = EventPriority.HIGHEST)
public void onEndGame(LGGameEndEvent e) {
if(e.getWinType() == LGWinType.PYROMANE) {
if (e.getWinType() == LGWinType.PYROMANE) {
e.getWinners().clear();
e.getWinners().addAll(getPlayers());
}

View file

@ -1,7 +1,10 @@
package fr.leomelki.loupgarou.roles;
import java.util.Collections;
import fr.leomelki.com.comphenix.packetwrapper.WrapperPlayServerHeldItemSlot;
import fr.leomelki.loupgarou.MainLg;
import fr.leomelki.loupgarou.classes.LGGame;
import fr.leomelki.loupgarou.classes.LGPlayer;
import fr.leomelki.loupgarou.events.LGPlayerKilledEvent.Reason;
import org.bukkit.Bukkit;
import org.bukkit.Material;
import org.bukkit.craftbukkit.v1_15_R1.inventory.CraftInventoryCustom;
@ -16,15 +19,12 @@ import org.bukkit.inventory.ItemStack;
import org.bukkit.inventory.meta.ItemMeta;
import org.bukkit.scheduler.BukkitRunnable;
import fr.leomelki.com.comphenix.packetwrapper.WrapperPlayServerHeldItemSlot;
import fr.leomelki.loupgarou.MainLg;
import fr.leomelki.loupgarou.classes.LGGame;
import fr.leomelki.loupgarou.classes.LGPlayer;
import fr.leomelki.loupgarou.events.LGPlayerKilledEvent.Reason;
import java.util.Collections;
public class RSorciere extends Role{
public class RSorciere extends Role {
private static final ItemStack[] items = new ItemStack[4];
private static final ItemStack cancel;
static {
items[0] = new ItemStack(Material.PURPLE_DYE, 1);
ItemMeta meta = items[0].getItemMeta();
@ -46,60 +46,70 @@ public class RSorciere extends Role{
cancel.setItemMeta(meta);
}
boolean inMenu = false;
private LGPlayer sauver;
private Runnable callback;
public RSorciere(LGGame game) {
super(game);
}
@Override
public RoleType getType() {
return RoleType.VILLAGER;
}
@Override
public RoleWinType getWinType() {
return RoleWinType.VILLAGE;
}
@Override
public String getName() {
return "§a§lSorcière";
}
@Override
public String getFriendlyName() {
return "de la "+getName();
return "de la " + getName();
}
@Override
public String getShortDescription() {
return "Tu gagnes avec le §a§lVillage";
}
@Override
public String getDescription() {
return "Tu gagnes avec le §a§lVillage§f. Tu disposes de deux potions : une §e§o§lpotion de vie§f pour sauver la victime des §c§lLoups§f, et une §e§o§lpotion de mort§f pour assassiner quelqu'un.";
}
@Override
public String getTask() {
return "Que veux-tu faire cette nuit ?";
}
@Override
public String getBroadcastedTask() {
return "La "+getName()+"§9 est en train de concocter un nouvel élixir.";
return "La " + getName() + "§9 est en train de concocter un nouvel élixir.";
}
@Override
public int getTimeout() {
return 30;
}
private LGPlayer sauver;
private Runnable callback;
@Override
protected void onNightTurn(LGPlayer player, Runnable callback) {
player.showView();
this.callback = callback;
sauver = getGame().getDeaths().get(Reason.LOUP_GAROU);
if(sauver == null)
if (sauver == null)
sauver = getGame().getDeaths().get(Reason.DONT_DIE);
openInventory(player);
}
@Override
protected void onNightTurnTimeout(LGPlayer player) {
player.getPlayer().getInventory().setItem(8, null);
@ -110,31 +120,32 @@ public class RSorciere extends Role{
//player.sendTitle("§cVous n'avez utilisé aucune potion", "§4Vous avez mis trop de temps à vous décider...", 80);
//player.sendMessage("§6Tu n'as rien fait cette nuit.");
}
private void openInventory(LGPlayer player) {
inMenu = true;
Inventory inventory = Bukkit.createInventory(null, InventoryType.BREWING, sauver == null ? "§7Personne n'a été ciblé" : "§7§l"+sauver.getName()+" §7est ciblé");
Inventory inventory = Bukkit.createInventory(null, InventoryType.BREWING, sauver == null ? "§7Personne n'a été ciblé" : "§7§l" + sauver.getName() + " §7est ciblé");
inventory.setContents(items.clone());//clone au cas Bukkit prenne directement la liste pour éviter de la modifier avec setItem (jsp)
if(sauver == null || player.getCache().getBoolean("witch_used_life"))
if (sauver == null || player.getCache().getBoolean("witch_used_life"))
inventory.setItem(0, null);
if(sauver != null) {
if (sauver != null) {
ItemStack head = new ItemStack(Material.ARROW);
ItemMeta meta = head.getItemMeta();
meta.setDisplayName("§7§l"+sauver.getName()+"§c est ciblé");
meta.setDisplayName("§7§l" + sauver.getName() + "§c est ciblé");
head.setItemMeta(meta);
inventory.setItem(4, head);
}
if(player.getCache().getBoolean("witch_used_death"))
if (player.getCache().getBoolean("witch_used_death"))
inventory.setItem(2, null);
player.getPlayer().closeInventory();
player.getPlayer().openInventory(inventory);
}
boolean inMenu = false;
private void closeInventory(Player p) {
inMenu = false;
p.closeInventory();
}
@EventHandler
public void onInventoryClick(InventoryClickEvent e) {
ItemStack item = e.getCurrentItem();
@ -178,7 +189,7 @@ public class RSorciere extends Role{
public void onClick(PlayerInteractEvent e) {
Player p = e.getPlayer();
LGPlayer player = LGPlayer.thePlayer(getGame().getPlugin(), p);
if(e.getItem() != null && e.getItem().getType() == Material.IRON_NUGGET && player.getRole() == this) {
if (e.getItem() != null && e.getItem().getType() == Material.IRON_NUGGET && player.getRole() == this) {
player.stopChoosing();
p.getInventory().setItem(8, null);
p.updateInventory();
@ -186,11 +197,12 @@ public class RSorciere extends Role{
openInventory(player);
}
}
@EventHandler
public void onQuitInventory(InventoryCloseEvent e) {
if(e.getInventory() instanceof CraftInventoryCustom) {
LGPlayer player = LGPlayer.thePlayer(getGame().getPlugin(), (Player)e.getPlayer());
if(player.getRole() == this && inMenu) {
if (e.getInventory() instanceof CraftInventoryCustom) {
LGPlayer player = LGPlayer.thePlayer(getGame().getPlugin(), (Player) e.getPlayer());
if (player.getRole() == this && inMenu) {
new BukkitRunnable() {
@Override
@ -207,16 +219,17 @@ public class RSorciere extends Role{
player.getPlayer().updateInventory();
player.getCache().set("witch_used_death", true);
getGame().kill(choosen, Reason.SORCIERE);
player.sendMessage("§6Tu as décidé d'assassiner §7§l"+choosen.getName()+"§6.");
player.sendActionBarMessage("§7§l"+choosen.getName()+"§9 a été tué.");
player.sendMessage("§6Tu as décidé d'assassiner §7§l" + choosen.getName() + "§6.");
player.sendActionBarMessage("§7§l" + choosen.getName() + "§9 a été tué.");
player.hideView();
callback.run();
}
private void saveLife(LGPlayer player) {
player.getCache().set("witch_used_life", true);
getGame().getDeaths().remove(Reason.LOUP_GAROU, sauver);
player.sendMessage("§6Tu as décidé de sauver §7§l"+sauver.getName()+"§6.");
player.sendActionBarMessage("§7§l"+sauver.getName()+"§9 a été sauvé.");
player.sendMessage("§6Tu as décidé de sauver §7§l" + sauver.getName() + "§6.");
player.sendActionBarMessage("§7§l" + sauver.getName() + "§9 a été sauvé.");
player.hideView();
callback.run();
}

View file

@ -1,8 +1,15 @@
package fr.leomelki.loupgarou.roles;
import java.util.Arrays;
import java.util.Collections;
import fr.leomelki.loupgarou.MainLg;
import fr.leomelki.loupgarou.classes.LGGame;
import fr.leomelki.loupgarou.classes.LGPlayer;
import fr.leomelki.loupgarou.classes.LGWinType;
import fr.leomelki.loupgarou.events.LGGameEndEvent;
import fr.leomelki.loupgarou.events.LGNightPlayerPreKilledEvent;
import fr.leomelki.loupgarou.events.LGPlayerKilledEvent.Reason;
import fr.leomelki.loupgarou.events.LGPreDayStartEvent;
import fr.leomelki.loupgarou.events.LGVampiredEvent;
import fr.leomelki.loupgarou.utils.VariableCache;
import org.bukkit.Bukkit;
import org.bukkit.Material;
import org.bukkit.craftbukkit.v1_15_R1.inventory.CraftInventoryCustom;
@ -15,64 +22,68 @@ import org.bukkit.inventory.ItemStack;
import org.bukkit.inventory.meta.ItemMeta;
import org.bukkit.scheduler.BukkitRunnable;
import fr.leomelki.loupgarou.MainLg;
import fr.leomelki.loupgarou.classes.LGGame;
import fr.leomelki.loupgarou.classes.LGPlayer;
import fr.leomelki.loupgarou.classes.LGWinType;
import fr.leomelki.loupgarou.events.LGGameEndEvent;
import fr.leomelki.loupgarou.events.LGNightPlayerPreKilledEvent;
import fr.leomelki.loupgarou.events.LGPlayerKilledEvent.Reason;
import fr.leomelki.loupgarou.events.LGPreDayStartEvent;
import fr.leomelki.loupgarou.events.LGVampiredEvent;
import fr.leomelki.loupgarou.utils.VariableCache;
import java.util.Arrays;
import java.util.Collections;
public class RSurvivant extends Role {
boolean inMenu;
Runnable callback;
public class RSurvivant extends Role{
public RSurvivant(LGGame game) {
super(game);
}
@Override
public RoleType getType() {
return RoleType.NEUTRAL;
}
@Override
public RoleWinType getWinType() {
return RoleWinType.NONE;
}
@Override
public String getName() {
return "§d§lSurvivant";
}
@Override
public String getFriendlyName() {
return "du "+getName();
return "du " + getName();
}
@Override
public String getShortDescription() {
return "Tu gagnes si tu remplis ton objectif";
}
@Override
public String getDescription() {
return "Tu es §d§lNeutre§f et tu gagnes si tu remplis ton objectif. Ton objectif est de survivre. Tu disposes de §l2§f protections. Chaque nuit, tu peux utiliser une protection pour ne pas être tué par les §c§lLoups§f. Tu peux gagner aussi bien avec les §a§lVillageois§f qu'avec les §c§lLoups§f, tu dois juste rester en vie jusqu'à la fin de la partie.";
}
@Override
public String getTask() {
return "Veux-tu utiliser une protection cette nuit ?";
}
@Override
public String getBroadcastedTask() {
return "Le "+getName()+"§9 décide s'il veut se protéger.";
return "Le " + getName() + "§9 décide s'il veut se protéger.";
}
@Override
public int getTimeout() {
return 15;
}
boolean inMenu;
public void openInventory(Player player) {
inMenu = true;
Inventory inventory = Bukkit.createInventory(null, 9, "§7Veux-tu te protéger ?");
ItemStack[] items = new ItemStack[9];
VariableCache cache = LGPlayer.thePlayer(getGame().getPlugin(), player).getCache();
if(cache.<Integer>get("survivant_left") > 0) {
if (cache.<Integer>get("survivant_left") > 0) {
items[3] = new ItemStack(Material.IRON_NUGGET);
ItemMeta meta = items[3].getItemMeta();
meta.setDisplayName("§7§lNe rien faire");
@ -80,7 +91,7 @@ public class RSurvivant extends Role{
items[3].setItemMeta(meta);
items[5] = new ItemStack(Material.GOLD_NUGGET);
meta = items[5].getItemMeta();
meta.setDisplayName("§2§lSe protéger (§6§l"+cache.<Integer>get("survivant_left")+"§2§l restant)");
meta.setDisplayName("§2§lSe protéger (§6§l" + cache.<Integer>get("survivant_left") + "§2§l restant)");
meta.setLore(Arrays.asList(
"§8Tu ne pourras pas être tué par",
"§8 les §c§lLoups§8 cette nuit."));
@ -96,19 +107,20 @@ public class RSurvivant extends Role{
inventory.setContents(items);
player.openInventory(inventory);
}
@Override
public void join(LGPlayer player) {
super.join(player);
player.getCache().set("survivant_left", 2);
}
Runnable callback;
@Override
protected void onNightTurn(LGPlayer player, Runnable callback) {
player.showView();
this.callback = callback;
openInventory(player.getPlayer());
}
@Override
protected void onNightTurnTimeout(LGPlayer player) {
player.hideView();
@ -120,26 +132,27 @@ public class RSurvivant extends Role{
inMenu = false;
p.closeInventory();
}
@EventHandler
public void onInventoryClick(InventoryClickEvent e) {
ItemStack item = e.getCurrentItem();
Player player = (Player)e.getWhoClicked();
Player player = (Player) e.getWhoClicked();
LGPlayer lgp = LGPlayer.thePlayer(getGame().getPlugin(), player);
if(lgp.getRole() != this || item == null || item.getItemMeta() == null)return;
if (lgp.getRole() != this || item == null || item.getItemMeta() == null) return;
if(item.getType() == Material.IRON_NUGGET) {
if (item.getType() == Material.IRON_NUGGET) {
e.setCancelled(true);
lgp.sendMessage("§4§oTu es sans défense...");
closeInventory(player);
lgp.hideView();
callback.run();
}else if(item.getType() == Material.GOLD_NUGGET) {
} else if (item.getType() == Material.GOLD_NUGGET) {
e.setCancelled(true);
closeInventory(player);
lgp.sendActionBarMessage("§9§lTu as décidé de te protéger.");
lgp.sendMessage("§6Tu as décidé de te protéger.");
lgp.getCache().set("survivant_left", lgp.getCache().<Integer>get("survivant_left")-1);
lgp.getCache().set("survivant_left", lgp.getCache().<Integer>get("survivant_left") - 1);
lgp.getCache().set("survivant_protected", true);
lgp.hideView();
callback.run();
@ -148,28 +161,30 @@ public class RSurvivant extends Role{
@EventHandler
public void onPlayerKill(LGNightPlayerPreKilledEvent e) {
if(e.getGame() == getGame() && (e.getReason() == Reason.LOUP_GAROU || e.getReason() == Reason.LOUP_BLANC || e.getReason() == Reason.GM_LOUP_GAROU || e.getReason() == Reason.ASSASSIN) && e.getKilled().getCache().getBoolean("survivant_protected") && e.getKilled().isRoleActive()) {
if (e.getGame() == getGame() && (e.getReason() == Reason.LOUP_GAROU || e.getReason() == Reason.LOUP_BLANC || e.getReason() == Reason.GM_LOUP_GAROU || e.getReason() == Reason.ASSASSIN) && e.getKilled().getCache().getBoolean("survivant_protected") && e.getKilled().isRoleActive()) {
e.setReason(Reason.DONT_DIE);
}
}
@EventHandler
public void onVampired(LGVampiredEvent e) {
if(e.getGame() == getGame() && e.getPlayer().getCache().getBoolean("survivant_protected"))
if (e.getGame() == getGame() && e.getPlayer().getCache().getBoolean("survivant_protected"))
e.setProtect(true);
}
@EventHandler
public void onDayStart(LGPreDayStartEvent e) {
if(e.getGame() == getGame())
for(LGPlayer lgp : getGame().getInGame())
if(lgp.isRoleActive())
if (e.getGame() == getGame())
for (LGPlayer lgp : getGame().getInGame())
if (lgp.isRoleActive())
lgp.getCache().remove("survivant_protected");
}
@EventHandler
public void onQuitInventory(InventoryCloseEvent e) {
if(e.getInventory() instanceof CraftInventoryCustom) {
LGPlayer player = LGPlayer.thePlayer(getGame().getPlugin(), (Player)e.getPlayer());
if(player.getRole() == this && inMenu) {
if (e.getInventory() instanceof CraftInventoryCustom) {
LGPlayer player = LGPlayer.thePlayer(getGame().getPlugin(), (Player) e.getPlayer());
if (player.getRole() == this && inMenu) {
new BukkitRunnable() {
@Override
@ -182,19 +197,16 @@ public class RSurvivant extends Role{
}
@EventHandler
public void onWin(LGGameEndEvent e) {
if(e.getGame() == getGame() && getPlayers().size() > 0 && e.getWinType() != LGWinType.ANGE) {
for(LGPlayer lgp : getPlayers())
if (e.getGame() == getGame() && getPlayers().size() > 0 && e.getWinType() != LGWinType.ANGE) {
for (LGPlayer lgp : getPlayers())
e.getWinners().add(lgp);
new BukkitRunnable() {
@Override
public void run() {
getGame().broadcastMessage("§6§oLe "+getName()+"§6§o a rempli son objectif.");
getGame().broadcastMessage("§6§oLe " + getName() + "§6§o a rempli son objectif.");
}
}.runTaskAsynchronously(MainLg.getInstance());
}

View file

@ -1,29 +1,25 @@
package fr.leomelki.loupgarou.roles;
import fr.leomelki.loupgarou.classes.*;
import fr.leomelki.loupgarou.classes.LGCustomItems.LGCustomItemsConstraints;
import fr.leomelki.loupgarou.classes.chat.LGChat;
import fr.leomelki.loupgarou.events.*;
import fr.leomelki.loupgarou.events.LGPlayerKilledEvent.Reason;
import lombok.Getter;
import org.bukkit.Bukkit;
import org.bukkit.event.EventHandler;
import org.bukkit.event.EventPriority;
import java.util.ArrayList;
import java.util.List;
import java.util.Map.Entry;
import org.bukkit.Bukkit;
import org.bukkit.event.EventHandler;
import org.bukkit.event.EventPriority;
public class RVampire extends Role {
import fr.leomelki.loupgarou.classes.LGCustomItems;
import fr.leomelki.loupgarou.classes.LGGame;
import fr.leomelki.loupgarou.classes.LGPlayer;
import fr.leomelki.loupgarou.classes.LGVote;
import fr.leomelki.loupgarou.classes.LGWinType;
import fr.leomelki.loupgarou.classes.LGCustomItems.LGCustomItemsConstraints;
import fr.leomelki.loupgarou.classes.chat.LGChat;
import fr.leomelki.loupgarou.events.LGCustomItemChangeEvent;
import fr.leomelki.loupgarou.events.LGGameEndEvent;
import fr.leomelki.loupgarou.events.LGNightEndEvent;
import fr.leomelki.loupgarou.events.LGPlayerKilledEvent.Reason;
import fr.leomelki.loupgarou.events.LGUpdatePrefixEvent;
import fr.leomelki.loupgarou.events.LGVampiredEvent;
import lombok.Getter;
public class RVampire extends Role{
@Getter
private final LGChat chat = new LGChat((sender, message) -> "§5" + sender.getName() + " §6» §f" + message);
int nextCanInfect = 0;
LGVote vote;
public RVampire(LGGame game) {
super(game);
@ -58,10 +54,12 @@ public class RVampire extends Role{
public String getBroadcastedTask() {
return "Les §5§lVampires§9 choisissent leur cible.";
}
@Override
public RoleType getType() {
return RoleType.VAMPIRE;
}
@Override
public RoleWinType getWinType() {
return RoleWinType.VAMPIRE;
@ -71,122 +69,122 @@ public class RVampire extends Role{
public int getTimeout() {
return 30;
}
@Override
public boolean hasPlayersLeft() {
return nextCanInfect < getGame().getNight() && super.hasPlayersLeft();
}
@Getter private final LGChat chat = new LGChat((sender, message) -> "§5"+sender.getName()+" §6» §f"+message);
int nextCanInfect = 0;
LGVote vote;
@Override
public void join(LGPlayer player, boolean sendMessage) {
super.join(player, sendMessage);
for(LGPlayer p : getPlayers())
for (LGPlayer p : getPlayers())
p.updatePrefix();
}
public void onNightTurn(Runnable callback) {
vote = new LGVote(getTimeout(), getTimeout()/3, getGame(), false, false, (player, secondsLeft)-> !getPlayers().contains(player) ? "§6C'est au tour "+getFriendlyName()+" §6(§e"+secondsLeft+" s§6)" : player.getCache().has("vote") ? "§l§9Vous votez pour §c§l"+player.getCache().<LGPlayer>get("vote").getName() : "§6Il vous reste §e"+secondsLeft+" seconde"+(secondsLeft > 1 ? "s" : "")+"§6 pour voter");
for(LGPlayer lgp : getGame().getAlive())
if(lgp.getRoleType() == RoleType.VAMPIRE)
vote = new LGVote(getTimeout(), getTimeout() / 3, getGame(), false, false, (player, secondsLeft) -> !getPlayers().contains(player) ? "§6C'est au tour " + getFriendlyName() + " §6(§e" + secondsLeft + " s§6)" : player.getCache().has("vote") ? "§l§9Vous votez pour §c§l" + player.getCache().<LGPlayer>get("vote").getName() : "§6Il vous reste §e" + secondsLeft + " seconde" + (secondsLeft > 1 ? "s" : "") + "§6 pour voter");
for (LGPlayer lgp : getGame().getAlive())
if (lgp.getRoleType() == RoleType.VAMPIRE)
lgp.showView();
for(LGPlayer player : getPlayers()) {
player.sendMessage("§6"+getTask());
for (LGPlayer player : getPlayers()) {
player.sendMessage("§6" + getTask());
// player.sendTitle("§6C'est à vous de jouer", "§a"+getTask(), 100);
player.joinChat(chat);
}
vote.start(getPlayers(), getPlayers(), ()->{
vote.start(getPlayers(), getPlayers(), () -> {
onNightTurnEnd();
callback.run();
}, getPlayers());
}
private void onNightTurnEnd() {
for(LGPlayer lgp : getGame().getAlive())
if(lgp.getRoleType() == RoleType.VAMPIRE)
for (LGPlayer lgp : getGame().getAlive())
if (lgp.getRoleType() == RoleType.VAMPIRE)
lgp.hideView();
for(LGPlayer player : getPlayers())
for (LGPlayer player : getPlayers())
player.leaveChat();
LGPlayer choosen = vote.getChoosen();
if(choosen == null) {
if(vote.getVotes().size() > 0) {
if (choosen == null) {
if (vote.getVotes().size() > 0) {
int max = 0;
boolean equal = false;
for(Entry<LGPlayer, List<LGPlayer>> entry : vote.getVotes().entrySet())
if(entry.getValue().size() > max) {
for (Entry<LGPlayer, List<LGPlayer>> entry : vote.getVotes().entrySet())
if (entry.getValue().size() > max) {
equal = false;
max = entry.getValue().size();
choosen = entry.getKey();
}else if(entry.getValue().size() == max)
} else if (entry.getValue().size() == max)
equal = true;
if(equal) {
if (equal) {
choosen = null;
ArrayList<LGPlayer> choosable = new ArrayList<>();
for(Entry<LGPlayer, List<LGPlayer>> entry : vote.getVotes().entrySet())
if(entry.getValue().size() == max && entry.getKey().getRoleType() != RoleType.VAMPIRE)
for (Entry<LGPlayer, List<LGPlayer>> entry : vote.getVotes().entrySet())
if (entry.getValue().size() == max && entry.getKey().getRoleType() != RoleType.VAMPIRE)
choosable.add(entry.getKey());
if(choosable.size() > 0)
if (choosable.size() > 0)
choosen = choosable.get(getGame().getRandom().nextInt(choosable.size()));
}
}
}
if(choosen != null) {
if(choosen.getRoleType() == RoleType.LOUP_GAROU || choosen.getRoleType() == RoleType.VAMPIRE) {
for(LGPlayer player : getPlayers())
if (choosen != null) {
if (choosen.getRoleType() == RoleType.LOUP_GAROU || choosen.getRoleType() == RoleType.VAMPIRE) {
for (LGPlayer player : getPlayers())
player.sendMessage("§cVotre cible est immunisée.");
return;
}else if(choosen.getRole() instanceof RChasseurDeVampire) {
for(LGPlayer player : getPlayers())
} else if (choosen.getRole() instanceof RChasseurDeVampire) {
for (LGPlayer player : getPlayers())
player.sendMessage("§cVotre cible est immunisée.");
getGame().kill(getPlayers().get(getPlayers().size()-1), Reason.CHASSEUR_DE_VAMPIRE);
getGame().kill(getPlayers().get(getPlayers().size() - 1), Reason.CHASSEUR_DE_VAMPIRE);
return;
}
LGVampiredEvent event = new LGVampiredEvent(getGame(), choosen);
Bukkit.getPluginManager().callEvent(event);
if(event.isImmuned()) {
for(LGPlayer player : getPlayers())
if (event.isImmuned()) {
for (LGPlayer player : getPlayers())
player.sendMessage("§cVotre cible est immunisée.");
return;
}else if(event.isProtect()) {
for(LGPlayer player : getPlayers())
} else if (event.isProtect()) {
for (LGPlayer player : getPlayers())
player.sendMessage("§cVotre cible est protégée.");
return;
}
for(LGPlayer player : getPlayers())
player.sendMessage("§7§l"+choosen.getName()+" s'est transformé en §5§lVampire§6.");
for (LGPlayer player : getPlayers())
player.sendMessage("§7§l" + choosen.getName() + " s'est transformé en §5§lVampire§6.");
choosen.sendMessage("§6Tu as été infecté par les §5§lVampires §6pendant la nuit. Tu as perdu tes pouvoirs.");
choosen.sendMessage("§6§oTu gagnes désormais avec les §5§l§oVampires§6§o.");
choosen.getCache().set("vampire", true);
choosen.getCache().set("just_vampire", true);
nextCanInfect = getGame().getNight()+1;
nextCanInfect = getGame().getNight() + 1;
join(choosen, false);
LGCustomItems.updateItem(choosen);
}else
for(LGPlayer player : getPlayers())
} else
for (LGPlayer player : getPlayers())
player.sendMessage("§6Personne n'a été infecté.");
}
@EventHandler(priority = EventPriority.HIGHEST)
public void onDayStart(LGNightEndEvent e) {
if(e.getGame() == getGame())
for(LGPlayer player : getGame().getAlive()) {
if(player.getCache().getBoolean("just_vampire")) {
if (e.getGame() == getGame())
for (LGPlayer player : getGame().getAlive()) {
if (player.getCache().getBoolean("just_vampire")) {
player.getCache().remove("just_vampire");
for(LGPlayer lgp : getGame().getInGame()) {
if(lgp.getRoleType() == RoleType.VAMPIRE)
lgp.sendMessage("§7§l"+player.getName()+"§6 s'est transformé en §5§lVampire§6...");
for (LGPlayer lgp : getGame().getInGame()) {
if (lgp.getRoleType() == RoleType.VAMPIRE)
lgp.sendMessage("§7§l" + player.getName() + "§6 s'est transformé en §5§lVampire§6...");
else
lgp.sendMessage("§6Quelqu'un s'est transformé en §5§lVampire§6...");
}
if(getGame().checkEndGame())
if (getGame().checkEndGame())
e.setCancelled(true);
}
}
}
/* @EventHandler(priority = EventPriority.HIGHEST)
/* @EventHandler(priority = EventPriority.HIGHEST)
public void onSkinChange(LGSkinLoadEvent e) {
if(e.getGame() == getGame())
if(getPlayers().contains(e.getPlayer()) && getPlayers().contains(e.getTo()) && showSkins) {
@ -196,23 +194,23 @@ public class RVampire extends Role{
}*/
@EventHandler
public void onGameEnd(LGGameEndEvent e) {
if(e.getGame() == getGame() && e.getWinType() == LGWinType.VAMPIRE)
for(LGPlayer lgp : getGame().getInGame())
if(lgp.getRoleWinType() == RoleWinType.VAMPIRE)//Changed to wintype
if (e.getGame() == getGame() && e.getWinType() == LGWinType.VAMPIRE)
for (LGPlayer lgp : getGame().getInGame())
if (lgp.getRoleWinType() == RoleWinType.VAMPIRE)//Changed to wintype
e.getWinners().add(lgp);
}
@EventHandler(priority = EventPriority.LOWEST)
public void onUpdatePrefix (LGUpdatePrefixEvent e) {
if(e.getGame() == getGame())
if(getPlayers().contains(e.getTo()) && getPlayers().contains(e.getPlayer()))
e.setPrefix(e.getPrefix()+"§5");
public void onUpdatePrefix(LGUpdatePrefixEvent e) {
if (e.getGame() == getGame())
if (getPlayers().contains(e.getTo()) && getPlayers().contains(e.getPlayer()))
e.setPrefix(e.getPrefix() + "§5");
}
@EventHandler
public void onCustomItemChange(LGCustomItemChangeEvent e) {
if(e.getGame() == getGame())
if(e.getPlayer().getCache().getBoolean("vampire"))
if (e.getGame() == getGame())
if (e.getPlayer().getCache().getBoolean("vampire"))
e.getConstraints().add(LGCustomItemsConstraints.VAMPIRE_INFECTE.getName());
}

View file

@ -2,42 +2,51 @@ package fr.leomelki.loupgarou.roles;
import fr.leomelki.loupgarou.classes.LGGame;
public class RVillageois extends Role{
public class RVillageois extends Role {
public RVillageois(LGGame game) {
super(game);
}
@Override
public RoleType getType() {
return RoleType.VILLAGER;
}
@Override
public RoleWinType getWinType() {
return RoleWinType.VILLAGE;
}
@Override
public String getName() {
return "§a§lVillageois";
}
@Override
public String getFriendlyName() {
return "des "+getName();
return "des " + getName();
}
@Override
public String getShortDescription() {
return "Tu gagnes avec le §a§lVillage";
}
@Override
public String getDescription() {
return "Tu gagnes avec le §a§lVillage§f. Tu ne disposes d'aucun pouvoir particulier, uniquement ta perspicacité et ta force de persuasion.";
}
@Override
public String getTask() {
return "";
}
@Override
public String getBroadcastedTask() {
return "";
}
@Override
public int getTimeout() {
return -1;

View file

@ -3,26 +3,31 @@ package fr.leomelki.loupgarou.roles;
import fr.leomelki.loupgarou.classes.LGGame;
import fr.leomelki.loupgarou.classes.LGPlayer;
public class RVoyante extends Role{
public class RVoyante extends Role {
public RVoyante(LGGame game) {
super(game);
}
@Override
public RoleType getType() {
return RoleType.VILLAGER;
}
@Override
public RoleWinType getWinType() {
return RoleWinType.VILLAGE;
}
@Override
public String getName() {
return "§a§lVoyante";
}
@Override
public String getFriendlyName() {
return "de la "+getName();
return "de la " + getName();
}
@Override
public String getShortDescription() {
return "Tu gagnes avec le §a§lVillage";
@ -32,14 +37,17 @@ public class RVoyante extends Role{
public String getDescription() {
return "Tu gagnes avec le §a§lVillage§f. Chaque nuit, tu peux espionner un joueur et découvrir sa véritable identité...";
}
@Override
public String getTask() {
return "Choisis un joueur dont tu veux connnaître l'identité.";
}
@Override
public String getBroadcastedTask() {
return "La "+getName()+"§9 s'apprête à sonder un joueur...";
return "La " + getName() + "§9 s'apprête à sonder un joueur...";
}
@Override
public int getTimeout() {
return 15;
@ -50,16 +58,17 @@ public class RVoyante extends Role{
player.showView();
player.choose(choosen -> {
if(choosen != null && choosen != player) {
if (choosen != null && choosen != player) {
//player.sendTitle("§6Vous avez regardé un rôle", "§e§l"+choosen.getName()+"§6§l est §e§l"+choosen.getRole().getName(), 5*20);
player.sendActionBarMessage("§e§l"+choosen.getName()+"§6 est §e§l"+choosen.getRole().getName());
player.sendMessage("§6Tu découvres que §7§l"+choosen.getName()+"§6 est "+choosen.getRole().getName()+"§6.");
player.sendActionBarMessage("§e§l" + choosen.getName() + "§6 est §e§l" + choosen.getRole().getName());
player.sendMessage("§6Tu découvres que §7§l" + choosen.getName() + "§6 est " + choosen.getRole().getName() + "§6.");
player.stopChoosing();
player.hideView();
callback.run();
}
});
}
@Override
protected void onNightTurnTimeout(LGPlayer player) {
player.stopChoosing();

View file

@ -1,49 +1,66 @@
package fr.leomelki.loupgarou.roles;
import java.util.ArrayList;
import java.util.concurrent.ThreadLocalRandom;
import org.bukkit.Bukkit;
import org.bukkit.configuration.file.FileConfiguration;
import org.bukkit.event.Listener;
import org.bukkit.scheduler.BukkitRunnable;
import fr.leomelki.loupgarou.MainLg;
import fr.leomelki.loupgarou.classes.LGCustomItems;
import fr.leomelki.loupgarou.classes.LGGame;
import fr.leomelki.loupgarou.classes.LGPlayer;
import lombok.Getter;
import lombok.Setter;
import org.bukkit.Bukkit;
import org.bukkit.configuration.file.FileConfiguration;
import org.bukkit.event.Listener;
import org.bukkit.scheduler.BukkitRunnable;
public abstract class Role implements Listener{
@Getter @Setter private int waitedPlayers;
@Getter private final ArrayList<LGPlayer> players = new ArrayList<>();
@Getter private final LGGame game;
import java.util.ArrayList;
import java.util.concurrent.ThreadLocalRandom;
public abstract class Role implements Listener {
@Getter
private final ArrayList<LGPlayer> players = new ArrayList<>();
@Getter
private final LGGame game;
@Getter
@Setter
private int waitedPlayers;
public Role(LGGame game) {
this.game = game;
Bukkit.getPluginManager().registerEvents(this, MainLg.getInstance());
FileConfiguration config = MainLg.getInstance().getConfig();
String roleConfigName = "role."+getClass().getSimpleName().substring(1);
if(config.contains(roleConfigName))
String roleConfigName = "role." + getClass().getSimpleName().substring(1);
if (config.contains(roleConfigName))
waitedPlayers = config.getInt(roleConfigName);
}
public abstract String getName();
public abstract String getFriendlyName();
public abstract String getShortDescription();
public abstract String getDescription();
public abstract String getTask();
public abstract String getBroadcastedTask();
public RoleType getType(LGPlayer lgp) {
return getType();
}
public RoleWinType getWinType(LGPlayer lgp) {
return getWinType();
}
public RoleType getType() {return null;}
public RoleWinType getWinType() {return null;}
public RoleType getType() {
return null;
}
public RoleWinType getWinType() {
return null;
}
/**
* @return Timeout in second for this role
*/
@ -56,26 +73,27 @@ public abstract class Role implements Listener{
@Override
public void run() {
getGame().cancelWait();
if(players.size() == 0) {
if (players.size() == 0) {
onTurnFinish(callback);
return;
}
LGPlayer player = players.remove(0);
if(player.isRoleActive()) {
getGame().wait(getTimeout(), ()->{
if (player.isRoleActive()) {
getGame().wait(getTimeout(), () -> {
try {
Role.this.onNightTurnTimeout(player);
}catch(Exception err) {
} catch (Exception err) {
System.out.println("Error when timeout role");
err.printStackTrace();
}
this.run();
}, (currentPlayer, secondsLeft)-> currentPlayer == player ? "§9§lC'est à ton tour !" : "§6C'est au tour "+getFriendlyName()+" §6(§e"+secondsLeft+" s§6)");
player.sendMessage("§6"+getTask());
}, (currentPlayer, secondsLeft) -> currentPlayer == player ? "§9§lC'est à ton tour !" : "§6C'est au tour " + getFriendlyName() + " §6(§e" + secondsLeft + " s§6)");
player.sendMessage("§6" + getTask());
// player.sendTitle("§6C'est à vous de jouer", "§a"+getTask(), 100);
onNightTurn(player, this);
} else {
getGame().wait(getTimeout(), ()->{}, (currentPlayer, secondsLeft)-> currentPlayer == player ? "§c§lTu ne peux pas jouer" : "§6C'est au tour "+getFriendlyName()+" §6(§e"+secondsLeft+" s§6)");
getGame().wait(getTimeout(), () -> {
}, (currentPlayer, secondsLeft) -> currentPlayer == player ? "§c§lTu ne peux pas jouer" : "§6C'est au tour " + getFriendlyName() + " §6(§e" + secondsLeft + " s§6)");
Runnable run = this;
new BukkitRunnable() {
@ -83,40 +101,49 @@ public abstract class Role implements Listener{
public void run() {
run.run();
}
}.runTaskLater(MainLg.getInstance(), 20*(ThreadLocalRandom.current().nextInt(getTimeout()/3*2-4)+4));
}.runTaskLater(MainLg.getInstance(), 20 * (ThreadLocalRandom.current().nextInt(getTimeout() / 3 * 2 - 4) + 4));
}
}
}.run();
}
public void join(LGPlayer player, boolean sendMessage) {
System.out.println(player.getName()+" est "+getName());
System.out.println(player.getName() + " est " + getName());
players.add(player);
if(player.getRole() == null)
if (player.getRole() == null)
player.setRole(this);
waitedPlayers--;
if(sendMessage) {
player.sendTitle("§6Tu es "+getName(), "§e"+getShortDescription(), 200);
player.sendMessage("§6Tu es "+getName()+"§6.");
player.sendMessage("§6Description : §f"+getDescription());
if (sendMessage) {
player.sendTitle("§6Tu es " + getName(), "§e" + getShortDescription(), 200);
player.sendMessage("§6Tu es " + getName() + "§6.");
player.sendMessage("§6Description : §f" + getDescription());
}
}
public void join(LGPlayer player) {
join(player, !getGame().isStarted());
LGCustomItems.updateItem(player);
}
public boolean hasPlayersLeft() {
return getPlayers().size() > 0;
}
protected void onNightTurnTimeout(LGPlayer player) {}
protected void onNightTurn(LGPlayer player, Runnable callback) {}
protected void onNightTurnTimeout(LGPlayer player) {
}
protected void onNightTurn(LGPlayer player, Runnable callback) {
}
protected void onTurnFinish(Runnable callback) {
callback.run();
}
public int getTurnOrder() {
try {
RoleSort role = RoleSort.valueOf(getClass().getSimpleName().substring(1));
return role == null ? -1 : role.ordinal();
}catch(Throwable e) {
} catch (Throwable e) {
return -1;
}
}//En combientième ce rôle doit être appellé

View file

@ -1,10 +1,6 @@
package fr.leomelki.loupgarou.scoreboard;
import java.util.Arrays;
import java.util.List;
import com.comphenix.protocol.wrappers.WrappedChatComponent;
import fr.leomelki.com.comphenix.packetwrapper.WrapperPlayServerScoreboardDisplayObjective;
import fr.leomelki.com.comphenix.packetwrapper.WrapperPlayServerScoreboardObjective;
import fr.leomelki.loupgarou.classes.LGPlayer;
@ -12,18 +8,25 @@ import fr.leomelki.loupgarou.utils.RandomString;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
import java.util.Arrays;
import java.util.List;
@RequiredArgsConstructor
public class CustomScoreboard {
@Getter private final String name = RandomString.generate(16);
@Getter private final String displayName;
@Getter
private final String name = RandomString.generate(16);
@Getter
private final String displayName;
private final List<CustomScoreboardEntry> entries = Arrays.asList(new CustomScoreboardEntry(15, this), new CustomScoreboardEntry(14, this), new CustomScoreboardEntry(13, this),
new CustomScoreboardEntry(12, this), new CustomScoreboardEntry(11, this), new CustomScoreboardEntry(10, this),
new CustomScoreboardEntry(9, this), new CustomScoreboardEntry(8, this), new CustomScoreboardEntry(7, this),
new CustomScoreboardEntry(6, this), new CustomScoreboardEntry(5, this), new CustomScoreboardEntry(4, this),
new CustomScoreboardEntry(3, this), new CustomScoreboardEntry(2, this), new CustomScoreboardEntry(1, this),
new CustomScoreboardEntry(0, this));
@Getter private final LGPlayer player;
@Getter private boolean shown;
@Getter
private final LGPlayer player;
@Getter
private boolean shown;
public CustomScoreboardEntry getLine(int index) {
return entries.get(index);
@ -41,7 +44,7 @@ public class CustomScoreboard {
display.sendPacket(player.getPlayer());
shown = true;
for(CustomScoreboardEntry entry : entries)
for (CustomScoreboardEntry entry : entries)
entry.show();
}
@ -51,7 +54,7 @@ public class CustomScoreboard {
remove.setName(name);
remove.sendPacket(player.getPlayer());
for(CustomScoreboardEntry entry : entries)
for (CustomScoreboardEntry entry : entries)
entry.hide();
shown = false;

View file

@ -1,39 +1,39 @@
package fr.leomelki.loupgarou.scoreboard;
import java.util.Collections;
import com.comphenix.protocol.wrappers.EnumWrappers.ScoreboardAction;
import com.comphenix.protocol.wrappers.WrappedChatComponent;
import fr.leomelki.com.comphenix.packetwrapper.WrapperPlayServerScoreboardScore;
import fr.leomelki.com.comphenix.packetwrapper.WrapperPlayServerScoreboardTeam;
import fr.leomelki.loupgarou.utils.VariousUtils;
import lombok.Getter;
import lombok.Setter;
import java.util.Collections;
public class CustomScoreboardEntry {
private static final WrappedChatComponent nullComponent = WrappedChatComponent.fromText("");
//setter car flemme de modifier le systeme pour le rendre plus logique
@Getter @Setter private int score;
private final String name;
private final CustomScoreboard scoreboard;
//setter car flemme de modifier le systeme pour le rendre plus logique
@Getter
@Setter
private int score;
private WrappedChatComponent prefix, suffix;
public CustomScoreboardEntry(int score, CustomScoreboard scoreboard) {
this.score = score;
this.scoreboard = scoreboard;
this.name = "§"+VariousUtils.toHex(score);
this.name = "§" + VariousUtils.toHex(score);
}
public void show() {
if(prefix != null) {
if (prefix != null) {
WrapperPlayServerScoreboardTeam team = new WrapperPlayServerScoreboardTeam();
team.setPlayers(Collections.singletonList(name));
team.setName(name);
team.setMode(0);
team.setPrefix(prefix);
if(suffix != null)
if (suffix != null)
team.setSuffix(suffix);
team.sendPacket(scoreboard.getPlayer().getPlayer());
@ -48,32 +48,31 @@ public class CustomScoreboardEntry {
public void setDisplayName(String displayName) {
boolean spawn = prefix == null;
if(displayName.length() > 16) {
if (displayName.length() > 16) {
char colorCode = 'f';
int limit = displayName.charAt(14) == '§' && displayName.charAt(13) != '§' ? 14 : displayName.charAt(15) == '§' ? 15 : 16;
String prefixStr = displayName.substring(0, limit);
prefix = WrappedChatComponent.fromText(prefixStr);
if(limit == 16) {
if (limit == 16) {
boolean storeColorCode = false;
for(char c : prefixStr.toCharArray())
if(storeColorCode) {
for (char c : prefixStr.toCharArray())
if (storeColorCode) {
storeColorCode = false;
colorCode = c;
}else
if(c == '§')
} else if (c == '§')
storeColorCode = true;
suffix = WrappedChatComponent.fromText("§"+colorCode+displayName.substring(limit));
}else
suffix = WrappedChatComponent.fromText("§" + colorCode + displayName.substring(limit));
} else
suffix = WrappedChatComponent.fromText(displayName.substring(limit));
} else {
prefix = WrappedChatComponent.fromText(displayName);
suffix = nullComponent;
}
if(scoreboard.isShown()) {
if(spawn)
if (scoreboard.isShown()) {
if (spawn)
show();
else {
WrapperPlayServerScoreboardTeam team = new WrapperPlayServerScoreboardTeam();
@ -81,18 +80,20 @@ public class CustomScoreboardEntry {
team.setName(name);
team.setMode(2);
team.setPrefix(prefix);
if(suffix != null)
if (suffix != null)
team.setSuffix(suffix);
team.sendPacket(scoreboard.getPlayer().getPlayer());
}
}
}
public void delete() {
hide();
prefix = null;
}
public void hide() {
if(prefix != null && scoreboard.isShown()) {
if (prefix != null && scoreboard.isShown()) {
WrapperPlayServerScoreboardScore score = new WrapperPlayServerScoreboardScore();
score.setObjectiveName(scoreboard.getName());
score.setScoreboardAction(ScoreboardAction.REMOVE);

Some files were not shown because too many files have changed in this diff Show more