diff --git a/.idea/gradle.xml b/.idea/gradle.xml new file mode 100644 index 0000000..80c5a8a --- /dev/null +++ b/.idea/gradle.xml @@ -0,0 +1,17 @@ + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 0000000..b2088d4 --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/modules/WitchRush_main.iml b/.idea/modules/WitchRush_main.iml new file mode 100644 index 0000000..fa63d4b --- /dev/null +++ b/.idea/modules/WitchRush_main.iml @@ -0,0 +1,12 @@ + + + + + + + SPIGOT + + + + + \ No newline at end of file diff --git a/.idea/uiDesigner.xml b/.idea/uiDesigner.xml new file mode 100644 index 0000000..e96534f --- /dev/null +++ b/.idea/uiDesigner.xml @@ -0,0 +1,124 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..94a25f7 --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/WitchRush.iml b/WitchRush.iml new file mode 100644 index 0000000..3279eaf --- /dev/null +++ b/WitchRush.iml @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/build.gradle b/build.gradle new file mode 100644 index 0000000..98c0621 --- /dev/null +++ b/build.gradle @@ -0,0 +1,17 @@ +plugins { + id 'java' +} + +group 'net.berrygames.witchrush' +version '1.0-SNAPSHOT' + +sourceCompatibility = 1.8 + +repositories { + mavenCentral() +} + +dependencies { + testCompile group: 'junit', name: 'junit', version: '4.12' +} + diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000..1948b90 Binary files /dev/null and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..d2c45a4 --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,5 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-4.8-bin.zip +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew new file mode 100644 index 0000000..cccdd3d --- /dev/null +++ b/gradlew @@ -0,0 +1,172 @@ +#!/usr/bin/env sh + +############################################################################## +## +## Gradle start up script for UN*X +## +############################################################################## + +# Attempt to set APP_HOME +# Resolve links: $0 may be a link +PRG="$0" +# Need this for relative symlinks. +while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG=`dirname "$PRG"`"/$link" + fi +done +SAVED="`pwd`" +cd "`dirname \"$PRG\"`/" >/dev/null +APP_HOME="`pwd -P`" +cd "$SAVED" >/dev/null + +APP_NAME="Gradle" +APP_BASE_NAME=`basename "$0"` + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS="" + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD="maximum" + +warn () { + echo "$*" +} + +die () { + echo + echo "$*" + echo + exit 1 +} + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "`uname`" in + CYGWIN* ) + cygwin=true + ;; + Darwin* ) + darwin=true + ;; + MINGW* ) + msys=true + ;; + NONSTOP* ) + nonstop=true + ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + else + JAVACMD="$JAVA_HOME/bin/java" + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD="java" + which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." +fi + +# Increase the maximum file descriptors if we can. +if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then + MAX_FD_LIMIT=`ulimit -H -n` + if [ $? -eq 0 ] ; then + if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then + MAX_FD="$MAX_FD_LIMIT" + fi + ulimit -n $MAX_FD + if [ $? -ne 0 ] ; then + warn "Could not set maximum file descriptor limit: $MAX_FD" + fi + else + warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" + fi +fi + +# For Darwin, add options to specify how the application appears in the dock +if $darwin; then + GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" +fi + +# For Cygwin, switch paths to Windows format before running java +if $cygwin ; then + APP_HOME=`cygpath --path --mixed "$APP_HOME"` + CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` + JAVACMD=`cygpath --unix "$JAVACMD"` + + # We build the pattern for arguments to be converted via cygpath + ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` + SEP="" + for dir in $ROOTDIRSRAW ; do + ROOTDIRS="$ROOTDIRS$SEP$dir" + SEP="|" + done + OURCYGPATTERN="(^($ROOTDIRS))" + # Add a user-defined pattern to the cygpath arguments + if [ "$GRADLE_CYGPATTERN" != "" ] ; then + OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" + fi + # Now convert the arguments - kludge to limit ourselves to /bin/sh + i=0 + for arg in "$@" ; do + CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` + CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option + + if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition + eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` + else + eval `echo args$i`="\"$arg\"" + fi + i=$((i+1)) + done + case $i in + (0) set -- ;; + (1) set -- "$args0" ;; + (2) set -- "$args0" "$args1" ;; + (3) set -- "$args0" "$args1" "$args2" ;; + (4) set -- "$args0" "$args1" "$args2" "$args3" ;; + (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; + (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; + (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; + (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; + (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; + esac +fi + +# Escape application args +save () { + for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done + echo " " +} +APP_ARGS=$(save "$@") + +# Collect all arguments for the java command, following the shell quoting and substitution rules +eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" + +# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong +if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then + cd "$(dirname "$0")" +fi + +exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat new file mode 100644 index 0000000..f955316 --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,84 @@ +@if "%DEBUG%" == "" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS= + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if "%ERRORLEVEL%" == "0" goto init + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto init + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:init +@rem Get command-line arguments, handling Windows variants + +if not "%OS%" == "Windows_NT" goto win9xME_args + +:win9xME_args +@rem Slurp the command line arguments. +set CMD_LINE_ARGS= +set _SKIP=2 + +:win9xME_args_slurp +if "x%~1" == "x" goto execute + +set CMD_LINE_ARGS=%* + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="0" goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/settings.gradle b/settings.gradle new file mode 100644 index 0000000..4233726 --- /dev/null +++ b/settings.gradle @@ -0,0 +1,2 @@ +rootProject.name = 'WitchRush' + diff --git a/src/main/java/net/berrygames/witchrush/WitchPlayer.java b/src/main/java/net/berrygames/witchrush/WitchPlayer.java new file mode 100644 index 0000000..6cf4e87 --- /dev/null +++ b/src/main/java/net/berrygames/witchrush/WitchPlayer.java @@ -0,0 +1,95 @@ +package net.berrygames.witchrush; + +import org.bukkit.Color; +import org.bukkit.Material; +import org.bukkit.entity.Player; +import org.bukkit.inventory.ItemStack; +import org.bukkit.inventory.meta.ItemMeta; +import org.bukkit.inventory.meta.LeatherArmorMeta; + +import java.util.HashMap; +import java.util.Map; + +public class WitchPlayer { + + private static Map witchMap; + + private Player player; + private boolean spectator; + private int kills, death; + + public WitchPlayer(Player player) { + this.player = player; + this.spectator = false; + this.kills = 0; + this.death = 0; + } + + public void teleportPlayer(){ + + } + + public void giveStuff(){ + + } + + public void sendLobby(){ + + } + + public void sendGameScoreboard(){ + + } + + public void applySpectator() { + + } + + public static WitchPlayer get(final Player player) { + if (WitchPlayer.witchMap.get(player) == null) { + WitchPlayer.witchMap.put(player, new WitchPlayer(player)); + } + return WitchPlayer.witchMap.get(player); + } + + public boolean isSpectator() { + return spectator; + } + + public void setSpectator(boolean spectator) { + this.spectator = spectator; + } + + public int getKills() { + return kills; + } + + public void setKills(int kills) { + this.kills = kills; + } + + public int getDeath() { + return death; + } + + public void setDeath(int death) { + this.death = death; + } + + private ItemStack getHelmetColor(final Material material, final Color color) { + final ItemStack itemStack = new ItemStack(material); + final LeatherArmorMeta leatherArmorMeta = (LeatherArmorMeta)itemStack.getItemMeta(); + leatherArmorMeta.setColor(color); + itemStack.setItemMeta((ItemMeta)leatherArmorMeta); + return itemStack; + } + + public static Map getwitchMap() { + return WitchPlayer.witchMap; + } + + static { + WitchPlayer.witchMap = new HashMap<>(); + } + +} diff --git a/src/main/java/net/berrygames/witchrush/WitchRush.java b/src/main/java/net/berrygames/witchrush/WitchRush.java new file mode 100644 index 0000000..62381ea --- /dev/null +++ b/src/main/java/net/berrygames/witchrush/WitchRush.java @@ -0,0 +1,57 @@ +package net.berrygames.witchrush; + +import net.berrygames.witchrush.commands.CommandsManager; +import net.berrygames.witchrush.game.GameState; +import net.berrygames.witchrush.listeners.ListenersManager; +import org.bukkit.entity.Player; +import org.bukkit.plugin.java.JavaPlugin; + +import java.util.ArrayList; +import java.util.List; + +public class WitchRush extends JavaPlugin { + + private static WitchRush instance; + + private GameState gameState; + + @Override + public void onEnable() { + gameState = GameState.WAITING; + + new CommandsManager().register(this); + new ListenersManager().register(this); + + System.out.println("*-*-*-*-*-*-*-*"); + System.out.println("WitchRush"); + System.out.println("by BunS"); + System.out.println("Active"); + System.out.println("*-*-*-*-*-*-*-*"); + super.onEnable(); + } + + @Override + public void onDisable() { + System.out.println("*-*-*-*-*-*-*-*"); + System.out.println("WitchRush"); + System.out.println("by BunS"); + System.out.println("Desactive"); + System.out.println("*-*-*-*-*-*-*-*"); + super.onDisable(); + } + + public void setState(GameState state){ + this.gameState = state; + } + public GameState getState(){ + return this.gameState; + } + + public static WitchRush get() { + return WitchRush.instance; + } + + public static String prefix(){ + return "&5&lWitchRush &8&l| &d"; + } +} diff --git a/src/main/java/net/berrygames/witchrush/commands/CommandsManager.java b/src/main/java/net/berrygames/witchrush/commands/CommandsManager.java new file mode 100644 index 0000000..820c104 --- /dev/null +++ b/src/main/java/net/berrygames/witchrush/commands/CommandsManager.java @@ -0,0 +1,12 @@ +package net.berrygames.witchrush.commands; + +import net.berrygames.witchrush.WitchRush; + +public class CommandsManager { + + public void register(WitchRush main){ + + + System.out.println("Commandes register"); + } +} diff --git a/src/main/java/net/berrygames/witchrush/game/GameState.java b/src/main/java/net/berrygames/witchrush/game/GameState.java new file mode 100644 index 0000000..d72f568 --- /dev/null +++ b/src/main/java/net/berrygames/witchrush/game/GameState.java @@ -0,0 +1,12 @@ +package net.berrygames.witchrush.game; + +public enum GameState { + + WAITING, + STARTING, + NOPVP, + PVP, + DEATH_MATCH, + FINISHING, + ; +} diff --git a/src/main/java/net/berrygames/witchrush/listeners/ListenersManager.java b/src/main/java/net/berrygames/witchrush/listeners/ListenersManager.java new file mode 100644 index 0000000..6341d94 --- /dev/null +++ b/src/main/java/net/berrygames/witchrush/listeners/ListenersManager.java @@ -0,0 +1,20 @@ +package net.berrygames.witchrush.listeners; + +import net.berrygames.witchrush.WitchRush; +import net.berrygames.witchrush.listeners.players.PlayerJoin; +import org.bukkit.Bukkit; +import org.bukkit.plugin.PluginManager; + +public class ListenersManager { + + public void register(WitchRush main){ + PluginManager pm = Bukkit.getPluginManager(); + + // --- PLAYERS ---// + pm.registerEvents(new PlayerJoin(), main); + + // --- WORLD ---// + + System.out.println("Events register"); + } +} diff --git a/src/main/java/net/berrygames/witchrush/listeners/players/PlayerJoin.java b/src/main/java/net/berrygames/witchrush/listeners/players/PlayerJoin.java new file mode 100644 index 0000000..15918d3 --- /dev/null +++ b/src/main/java/net/berrygames/witchrush/listeners/players/PlayerJoin.java @@ -0,0 +1,33 @@ +package net.berrygames.witchrush.listeners.players; + +import net.berrygames.witchrush.WitchPlayer; +import net.berrygames.witchrush.WitchRush; +import net.berrygames.witchrush.game.GameState; +import org.bukkit.GameMode; +import org.bukkit.entity.Player; +import org.bukkit.event.EventHandler; +import org.bukkit.event.Listener; +import org.bukkit.event.player.PlayerJoinEvent; + +public class PlayerJoin implements Listener { + + @EventHandler + public void join(PlayerJoinEvent e){ + Player player = e.getPlayer(); + WitchPlayer witchPlayer = new WitchPlayer(player); + + if(WitchRush.get().getState().equals(GameState.WAITING) || + WitchRush.get().getState().equals(GameState.STARTING)){ + e.setJoinMessage( + WitchRush.prefix()+player.getName() + +" a rejoint la partie §7(§d" + +WitchPlayer.getwitchMap().size() + +"§8/§d16§7)"); + player.setGameMode(GameMode.ADVENTURE); + player.setHealth(20); + player.setFoodLevel(20); + witchPlayer.teleportPlayer(); + witchPlayer.sendGameScoreboard(); + } + } +} diff --git a/src/main/java/net/berrygames/witchrush/team/TeamInfos.java b/src/main/java/net/berrygames/witchrush/team/TeamInfos.java new file mode 100644 index 0000000..fbc8b8d --- /dev/null +++ b/src/main/java/net/berrygames/witchrush/team/TeamInfos.java @@ -0,0 +1,4 @@ +package net.berrygames.witchrush.team; + +public enum TeamInfos { +} diff --git a/src/main/java/net/berrygames/witchrush/team/TeamManager.java b/src/main/java/net/berrygames/witchrush/team/TeamManager.java new file mode 100644 index 0000000..74c6a0f --- /dev/null +++ b/src/main/java/net/berrygames/witchrush/team/TeamManager.java @@ -0,0 +1,7 @@ +package net.berrygames.witchrush.team; + +public class TeamManager { + + + +}