diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 0000000..7991ae3 --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/encodings.xml b/.idea/encodings.xml new file mode 100644 index 0000000..ebececf --- /dev/null +++ b/.idea/encodings.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/.idea/gradle.xml b/.idea/gradle.xml deleted file mode 100644 index 80c5a8a..0000000 --- a/.idea/gradle.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml index b2088d4..6ef8b5c 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -6,7 +6,14 @@ - + + + + \ No newline at end of file diff --git a/.idea/modules/WitchRush_test.iml b/.idea/modules/WitchRush_test.iml new file mode 100644 index 0000000..fa63d4b --- /dev/null +++ b/.idea/modules/WitchRush_test.iml @@ -0,0 +1,12 @@ + + + + + + + SPIGOT + + + + + \ No newline at end of file diff --git a/WitchRush.iml b/WitchRush.iml deleted file mode 100644 index 3279eaf..0000000 --- a/WitchRush.iml +++ /dev/null @@ -1,2 +0,0 @@ - - \ No newline at end of file diff --git a/WitchRush/WitchRush.iml b/WitchRush/WitchRush.iml new file mode 100644 index 0000000..82e1f31 --- /dev/null +++ b/WitchRush/WitchRush.iml @@ -0,0 +1,12 @@ + + + + + + + SPIGOT + + + + + \ No newline at end of file diff --git a/WitchRush/pom.xml b/WitchRush/pom.xml new file mode 100644 index 0000000..3c7f9f2 --- /dev/null +++ b/WitchRush/pom.xml @@ -0,0 +1,76 @@ + + + 4.0.0 + + net.berrygames.witchrush + WitchRush + 1.0-SNAPSHOT + jar + + WitchRush + + BerryGames' WItchRush + + UTF-8 + + www.berrygames.net + + + clean package + + + org.apache.maven.plugins + maven-compiler-plugin + 3.7.0 + + 1.8 + 1.8 + + + + org.apache.maven.plugins + maven-shade-plugin + 3.1.0 + + + package + + shade + + + true + + + + + + + + src/main/resources + true + + + + + + + spigotmc-repo + https://hub.spigotmc.org/nexus/content/groups/public/ + + + sonatype + https://oss.sonatype.org/content/groups/public/ + + + + + + org.spigotmc + spigot-api + 1.13.1-R0.1-SNAPSHOT + provided + + + diff --git a/src/main/java/net/berrygames/witchrush/WitchPlayer.java b/WitchRush/src/main/java/net/berrygames/witchrush/WitchPlayer.java similarity index 100% rename from src/main/java/net/berrygames/witchrush/WitchPlayer.java rename to WitchRush/src/main/java/net/berrygames/witchrush/WitchPlayer.java diff --git a/src/main/java/net/berrygames/witchrush/WitchRush.java b/WitchRush/src/main/java/net/berrygames/witchrush/WitchRush.java similarity index 98% rename from src/main/java/net/berrygames/witchrush/WitchRush.java rename to WitchRush/src/main/java/net/berrygames/witchrush/WitchRush.java index cf0ad8e..a6070f5 100644 --- a/src/main/java/net/berrygames/witchrush/WitchRush.java +++ b/WitchRush/src/main/java/net/berrygames/witchrush/WitchRush.java @@ -5,6 +5,7 @@ import net.berrygames.witchrush.game.GameState; import net.berrygames.witchrush.listeners.ListenersManager; import org.bukkit.Bukkit; import org.bukkit.ChatColor; +import org.bukkit.entity.Entity; import org.bukkit.entity.Player; import org.bukkit.plugin.java.JavaPlugin; diff --git a/src/main/java/net/berrygames/witchrush/commands/CommandsManager.java b/WitchRush/src/main/java/net/berrygames/witchrush/commands/CommandsManager.java similarity index 74% rename from src/main/java/net/berrygames/witchrush/commands/CommandsManager.java rename to WitchRush/src/main/java/net/berrygames/witchrush/commands/CommandsManager.java index f7076d8..557146f 100644 --- a/src/main/java/net/berrygames/witchrush/commands/CommandsManager.java +++ b/WitchRush/src/main/java/net/berrygames/witchrush/commands/CommandsManager.java @@ -2,11 +2,13 @@ package net.berrygames.witchrush.commands; import net.berrygames.witchrush.WitchRush; import net.berrygames.witchrush.commands.admins.GameCMD; +import net.berrygames.witchrush.commands.admins.TestCMD; public class CommandsManager { public void register(WitchRush main){ main.getCommand("game").setExecutor(new GameCMD()); + main.getCommand("test").setExecutor(new TestCMD()); System.out.println("Commandes register"); } diff --git a/src/main/java/net/berrygames/witchrush/commands/admins/GameCMD.java b/WitchRush/src/main/java/net/berrygames/witchrush/commands/admins/GameCMD.java similarity index 100% rename from src/main/java/net/berrygames/witchrush/commands/admins/GameCMD.java rename to WitchRush/src/main/java/net/berrygames/witchrush/commands/admins/GameCMD.java diff --git a/WitchRush/src/main/java/net/berrygames/witchrush/commands/admins/TestCMD.java b/WitchRush/src/main/java/net/berrygames/witchrush/commands/admins/TestCMD.java new file mode 100644 index 0000000..79c7033 --- /dev/null +++ b/WitchRush/src/main/java/net/berrygames/witchrush/commands/admins/TestCMD.java @@ -0,0 +1,31 @@ +package net.berrygames.witchrush.commands.admins; + +import net.berrygames.witchrush.game.SpawnPNJ; +import net.berrygames.witchrush.tools.Locations; +import org.bukkit.command.Command; +import org.bukkit.command.CommandExecutor; +import org.bukkit.command.CommandSender; + +public class TestCMD implements CommandExecutor { + @Override + public boolean onCommand(CommandSender sender, Command command, String label, String[] args) { + if(args[0].equals("shop")){ + //Spawn SHOP + new SpawnPNJ("S bleu", Locations.SHOP_BLEU.getLocation()).spawn(); + new SpawnPNJ("S rouge", Locations.SHOP_ROUGE.getLocation()).spawn(); + new SpawnPNJ("S vert", Locations.SHOP_VERT.getLocation()).spawn(); + new SpawnPNJ("S jaune", Locations.SHOP_JAUNE.getLocation()).spawn(); + + + } + if(args[0].equals("up")){ + //Spawn UPGRADE + new SpawnPNJ("U bleu", Locations.UPGRADE_BLEU.getLocation()).spawn(); + new SpawnPNJ("U rouge", Locations.UPGRADE_ROUGE.getLocation()).spawn(); + new SpawnPNJ("U vert", Locations.UPGRADE_VERT.getLocation()).spawn(); + new SpawnPNJ("U jaune", Locations.UPGRADE_JAUNE.getLocation()).spawn(); + } + + return false; + } +} diff --git a/src/main/java/net/berrygames/witchrush/game/GameState.java b/WitchRush/src/main/java/net/berrygames/witchrush/game/GameState.java similarity index 100% rename from src/main/java/net/berrygames/witchrush/game/GameState.java rename to WitchRush/src/main/java/net/berrygames/witchrush/game/GameState.java diff --git a/src/main/java/net/berrygames/witchrush/game/NoPVPTask.java b/WitchRush/src/main/java/net/berrygames/witchrush/game/NoPVPTask.java similarity index 86% rename from src/main/java/net/berrygames/witchrush/game/NoPVPTask.java rename to WitchRush/src/main/java/net/berrygames/witchrush/game/NoPVPTask.java index c6a9b70..418a479 100644 --- a/src/main/java/net/berrygames/witchrush/game/NoPVPTask.java +++ b/WitchRush/src/main/java/net/berrygames/witchrush/game/NoPVPTask.java @@ -1,6 +1,7 @@ package net.berrygames.witchrush.game; import net.berrygames.witchrush.WitchRush; +import net.berrygames.witchrush.tools.Locations; import org.bukkit.scheduler.BukkitRunnable; public class NoPVPTask extends BukkitRunnable { @@ -13,4 +14,6 @@ public class NoPVPTask extends BukkitRunnable { timer--; } + + } diff --git a/WitchRush/src/main/java/net/berrygames/witchrush/game/SpawnPNJ.java b/WitchRush/src/main/java/net/berrygames/witchrush/game/SpawnPNJ.java new file mode 100644 index 0000000..ca8cf02 --- /dev/null +++ b/WitchRush/src/main/java/net/berrygames/witchrush/game/SpawnPNJ.java @@ -0,0 +1,28 @@ +package net.berrygames.witchrush.game; + +import org.bukkit.Location; +import org.bukkit.entity.Entity; +import org.bukkit.entity.EntityType; + +public class SpawnPNJ { + + private EntityType entity; + private String name; + private Location location; + + public SpawnPNJ(String name, Location location) { + this.entity = EntityType.VILLAGER; + this.name = name; + this.location = location; + } + + public void spawn(){ + Entity witch = location.getWorld().spawnEntity(location, entity); + witch.setCustomName(name); + witch.setCustomNameVisible(true); + witch.setSilent(true); + witch.setInvulnerable(true); + } + + +} diff --git a/WitchRush/src/main/java/net/berrygames/witchrush/game/SpawnWitch.java b/WitchRush/src/main/java/net/berrygames/witchrush/game/SpawnWitch.java new file mode 100644 index 0000000..6de2c71 --- /dev/null +++ b/WitchRush/src/main/java/net/berrygames/witchrush/game/SpawnWitch.java @@ -0,0 +1,29 @@ +package net.berrygames.witchrush.game; + +import org.bukkit.Location; +import org.bukkit.entity.Entity; +import org.bukkit.entity.EntityType; + +public class SpawnWitch { + + private EntityType entity; + private String name; + private Location location; + + public SpawnWitch(String name, Location location) { + this.entity = EntityType.WITCH; + this.name = name; + this.location = location; + } + + public void spawn(){ + Entity witch = location.getWorld().spawnEntity(location, entity); + witch.setCustomName(name); + witch.setCustomNameVisible(true); + witch.setSilent(true); + witch.setInvulnerable(true); + net.m + } + + +} diff --git a/src/main/java/net/berrygames/witchrush/game/StartTask.java b/WitchRush/src/main/java/net/berrygames/witchrush/game/StartTask.java similarity index 59% rename from src/main/java/net/berrygames/witchrush/game/StartTask.java rename to WitchRush/src/main/java/net/berrygames/witchrush/game/StartTask.java index c1c84d5..af50df7 100644 --- a/src/main/java/net/berrygames/witchrush/game/StartTask.java +++ b/WitchRush/src/main/java/net/berrygames/witchrush/game/StartTask.java @@ -2,6 +2,7 @@ package net.berrygames.witchrush.game; import net.berrygames.witchrush.WitchPlayer; import net.berrygames.witchrush.WitchRush; +import net.berrygames.witchrush.tools.Locations; import org.bukkit.Bukkit; import org.bukkit.entity.Player; import org.bukkit.scheduler.BukkitRunnable; @@ -17,6 +18,21 @@ public class StartTask extends BukkitRunnable { new NoPVPTask().runTaskTimer(WitchRush.get(), 0, 20); Bukkit.broadcastMessage(WitchRush.prefix()+"§CLa partie commence ! Vous avez 3minutes pour vous preparer !"); cancel(); + + //TP Player + + //Spawn SHOP + new SpawnPNJ("S bleu", Locations.SHOP_BLEU.getLocation()).spawn(); + new SpawnPNJ("S rouge", Locations.SHOP_ROUGE.getLocation()).spawn(); + new SpawnPNJ("S vert", Locations.SHOP_VERT.getLocation()).spawn(); + new SpawnPNJ("S jaune", Locations.SHOP_JAUNE.getLocation()).spawn(); + + //Spawn UPGRADE + new SpawnPNJ("U bleu", Locations.UPGRADE_BLEU.getLocation()).spawn(); + new SpawnPNJ("U rouge", Locations.UPGRADE_ROUGE.getLocation()).spawn(); + new SpawnPNJ("U vert", Locations.UPGRADE_VERT.getLocation()).spawn(); + new SpawnPNJ("U jaune", Locations.UPGRADE_JAUNE.getLocation()).spawn(); + } if(timer == 120 || timer == 60 || timer == 30 || timer == 15 diff --git a/src/main/java/net/berrygames/witchrush/listeners/ListenersManager.java b/WitchRush/src/main/java/net/berrygames/witchrush/listeners/ListenersManager.java similarity index 100% rename from src/main/java/net/berrygames/witchrush/listeners/ListenersManager.java rename to WitchRush/src/main/java/net/berrygames/witchrush/listeners/ListenersManager.java diff --git a/src/main/java/net/berrygames/witchrush/listeners/players/PlayerJoin.java b/WitchRush/src/main/java/net/berrygames/witchrush/listeners/players/PlayerJoin.java similarity index 100% rename from src/main/java/net/berrygames/witchrush/listeners/players/PlayerJoin.java rename to WitchRush/src/main/java/net/berrygames/witchrush/listeners/players/PlayerJoin.java diff --git a/src/main/java/net/berrygames/witchrush/listeners/players/PlayerQuit.java b/WitchRush/src/main/java/net/berrygames/witchrush/listeners/players/PlayerQuit.java similarity index 100% rename from src/main/java/net/berrygames/witchrush/listeners/players/PlayerQuit.java rename to WitchRush/src/main/java/net/berrygames/witchrush/listeners/players/PlayerQuit.java diff --git a/src/main/java/net/berrygames/witchrush/team/TeamInfos.java b/WitchRush/src/main/java/net/berrygames/witchrush/team/TeamInfos.java similarity index 100% rename from src/main/java/net/berrygames/witchrush/team/TeamInfos.java rename to WitchRush/src/main/java/net/berrygames/witchrush/team/TeamInfos.java diff --git a/src/main/java/net/berrygames/witchrush/team/TeamManager.java b/WitchRush/src/main/java/net/berrygames/witchrush/team/TeamManager.java similarity index 100% rename from src/main/java/net/berrygames/witchrush/team/TeamManager.java rename to WitchRush/src/main/java/net/berrygames/witchrush/team/TeamManager.java diff --git a/src/main/java/net/berrygames/witchrush/tools/Locations.java b/WitchRush/src/main/java/net/berrygames/witchrush/tools/Locations.java similarity index 62% rename from src/main/java/net/berrygames/witchrush/tools/Locations.java rename to WitchRush/src/main/java/net/berrygames/witchrush/tools/Locations.java index 252a521..7343004 100644 --- a/src/main/java/net/berrygames/witchrush/tools/Locations.java +++ b/WitchRush/src/main/java/net/berrygames/witchrush/tools/Locations.java @@ -2,7 +2,6 @@ package net.berrygames.witchrush.tools; import org.bukkit.Bukkit; import org.bukkit.Location; -import org.bukkit.World; public enum Locations { @@ -22,16 +21,16 @@ public enum Locations { WITCH_ERT(new Location(Bukkit.getWorld("world"), 0, 0, 0)), //PNJ SHOP - SHOP_BLEU(new Location(Bukkit.getWorld("world"), 0, 0, 0)), - SHOP_ROUGE(new Location(Bukkit.getWorld("world"), 0, 0, 0)), - SHOP_JAUNE(new Location(Bukkit.getWorld("world"), 0, 0, 0)), - SHOP_VERT(new Location(Bukkit.getWorld("world"), 0, 0, 0)), + SHOP_BLEU(new Location(Bukkit.getWorld("world"), 1, 100, 0)), + SHOP_ROUGE(new Location(Bukkit.getWorld("world"), 3, 100, 0)), + SHOP_JAUNE(new Location(Bukkit.getWorld("world"), 5, 100, 0)), + SHOP_VERT(new Location(Bukkit.getWorld("world"), 7, 100, 0)), //PNJ SOLO UPGRADE - UPGRADE_BLEU(new Location(Bukkit.getWorld("world"), 0, 0, 0)), - UPGRADE_ROUGE(new Location(Bukkit.getWorld("world"), 0, 0, 0)), - UPGRADE_JAUNE(new Location(Bukkit.getWorld("world"), 0, 0, 0)), - UPGRADE_VERT(new Location(Bukkit.getWorld("world"), 0, 0, 0)), + UPGRADE_BLEU(new Location(Bukkit.getWorld("world"), 2, 100, 0)), + UPGRADE_ROUGE(new Location(Bukkit.getWorld("world"), 4, 100, 0)), + UPGRADE_JAUNE(new Location(Bukkit.getWorld("world"), 6, 100, 0)), + UPGRADE_VERT(new Location(Bukkit.getWorld("world"), 8, 100, 0)), ; @@ -40,4 +39,8 @@ public enum Locations { Locations(Location location) { this.location = location; } + + public Location getLocation() { + return location; + } } diff --git a/src/main/resources/plugin.yml b/WitchRush/src/main/resources/plugin.yml similarity index 95% rename from src/main/resources/plugin.yml rename to WitchRush/src/main/resources/plugin.yml index 6023a9a..d56e5a3 100644 --- a/src/main/resources/plugin.yml +++ b/WitchRush/src/main/resources/plugin.yml @@ -6,3 +6,4 @@ website: berrygames.net commands: game: + test: \ No newline at end of file diff --git a/build.gradle b/build.gradle deleted file mode 100644 index 09e0bb1..0000000 --- a/build.gradle +++ /dev/null @@ -1,28 +0,0 @@ -plugins { - id 'java' -} - -group 'net.berrygames.witchrush' -version '1.0-SNAPSHOT' - -sourceCompatibility = 1.8 - -compileJava.options.encoding = 'UTF-8' - -repositories { - mavenCentral() - maven { - name 'Sonatype' - url 'https://oss.sonatype.org/content/repositories/snapshots/' - } - maven { - name 'Spigot' - url 'https://hub.spigotmc.org/nexus/content/repositories/snapshots/' - } -} - -dependencies { - testCompile group: 'junit', name: 'junit', version: '4.12' - compileOnly 'org.spigotmc:spigot-api:1.12.2-R0.1-SNAPSHOT' -} - diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar deleted file mode 100644 index 1948b90..0000000 Binary files a/gradle/wrapper/gradle-wrapper.jar and /dev/null differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties deleted file mode 100644 index d2c45a4..0000000 --- a/gradle/wrapper/gradle-wrapper.properties +++ /dev/null @@ -1,5 +0,0 @@ -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 deleted file mode 100644 index cccdd3d..0000000 --- a/gradlew +++ /dev/null @@ -1,172 +0,0 @@ -#!/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 deleted file mode 100644 index f955316..0000000 --- a/gradlew.bat +++ /dev/null @@ -1,84 +0,0 @@ -@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 deleted file mode 100644 index 4233726..0000000 --- a/settings.gradle +++ /dev/null @@ -1,2 +0,0 @@ -rootProject.name = 'WitchRush' -