Merge branch 'dev' of https://github.com/RedstonerServer/redstoner-utils into dev
This commit is contained in:
@@ -34,10 +34,10 @@ def matches_thread(password, user):
|
|||||||
|
|
||||||
|
|
||||||
@simplecommand("cgpass",
|
@simplecommand("cgpass",
|
||||||
usage = "<password> <new password>",
|
usage = "<password> <new password>",
|
||||||
description = "Changes your password",
|
description = "Changes your password",
|
||||||
senderLimit = 0,
|
senderLimit = 0,
|
||||||
helpNoargs = True)
|
helpNoargs = True)
|
||||||
def change_pass_command(sender, command, label, args):
|
def change_pass_command(sender, command, label, args):
|
||||||
if sender.getName() in logging_in:
|
if sender.getName() in logging_in:
|
||||||
return "&cYou are not logged in"
|
return "&cYou are not logged in"
|
||||||
|
|||||||
4
main.py
4
main.py
@@ -38,8 +38,8 @@ shared["load_modules"] = [
|
|||||||
"adminchat",
|
"adminchat",
|
||||||
# Adds /badge, allows to give players achievements
|
# Adds /badge, allows to give players achievements
|
||||||
"badges",
|
"badges",
|
||||||
# Adds a few block placement corrections/mods
|
# Adds a few block placement corrections/mods
|
||||||
"blockplacemods",
|
"blockplacemods",
|
||||||
# Adds /calc, toggles automatic solving of Math expressions in chat
|
# Adds /calc, toggles automatic solving of Math expressions in chat
|
||||||
"calc",
|
"calc",
|
||||||
# Plugin to locate laggy chunks. /lc <n> lists chunks with more than n entities
|
# Plugin to locate laggy chunks. /lc <n> lists chunks with more than n entities
|
||||||
|
|||||||
20
player.py
20
player.py
@@ -4,24 +4,24 @@ players = []
|
|||||||
|
|
||||||
class py_player:
|
class py_player:
|
||||||
|
|
||||||
def __init__(player):
|
def __init__(player):
|
||||||
self.player = player
|
self.player = player
|
||||||
|
|
||||||
#Properties TODO
|
#Properties TODO
|
||||||
#Example:
|
#Example:
|
||||||
self.logging_in = False
|
self.logging_in = False
|
||||||
|
|
||||||
def get_py_player(player):
|
def get_py_player(player):
|
||||||
py_player = players[players.index(player)]
|
py_player = players[players.index(player)]
|
||||||
return py_player
|
return py_player
|
||||||
|
|
||||||
|
|
||||||
@hook.event("player.PlayerJoinEvent","highest")
|
@hook.event("player.PlayerJoinEvent","highest")
|
||||||
def on_join(event):
|
def on_join(event):
|
||||||
player = py_player(event.getPlayer())
|
player = py_player(event.getPlayer())
|
||||||
players.append(player)
|
players.append(player)
|
||||||
|
|
||||||
|
|
||||||
@hook.event("player.PlayerQuitEvent","highest")
|
@hook.event("player.PlayerQuitEvent","highest")
|
||||||
def on_leave(event):
|
def on_leave(event):
|
||||||
players.remove(get_py_player(event.getPlayer()))
|
players.remove(get_py_player(event.getPlayer()))
|
||||||
|
|||||||
41
setup.sh
41
setup.sh
@@ -3,6 +3,15 @@
|
|||||||
# exit on failure
|
# exit on failure
|
||||||
set -e
|
set -e
|
||||||
|
|
||||||
|
for cmd in curl java unzip git pip; do
|
||||||
|
if ! which -s "$cmd"; then
|
||||||
|
tput setf 4 >&2
|
||||||
|
echo "Error: please install '$cmd' to proceed" >&2
|
||||||
|
tput sgr0 >&2
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
|
||||||
echo -e "> This will only set up Spigot and all the plugins, configuration files are still up to you to manage"
|
echo -e "> This will only set up Spigot and all the plugins, configuration files are still up to you to manage"
|
||||||
echo -e "> Press enter to coninue"
|
echo -e "> Press enter to coninue"
|
||||||
read
|
read
|
||||||
@@ -33,19 +42,19 @@ curl --progress-bar -Lo "essentials.jar" "https://github.com/RedstonerServer/Ess
|
|||||||
echo ">> Downloading essentialschat.jar ..."
|
echo ">> Downloading essentialschat.jar ..."
|
||||||
curl --progress-bar -Lo "essentialschat.jar" "https://hub.spigotmc.org/jenkins/job/Spigot-Essentials/lastSuccessfulBuild/artifact/EssentialsChat/target/EssentialsChat-2.x-SNAPSHOT.jar"
|
curl --progress-bar -Lo "essentialschat.jar" "https://hub.spigotmc.org/jenkins/job/Spigot-Essentials/lastSuccessfulBuild/artifact/EssentialsChat/target/EssentialsChat-2.x-SNAPSHOT.jar"
|
||||||
echo ">> Downloading imageonmap.jar ..."
|
echo ">> Downloading imageonmap.jar ..."
|
||||||
curl --progress-bar -Lo "imageonmap.jar" "https://dev.bukkit.org/media/files/772/680/imageonmap.jar"
|
curl --progress-bar -Lo "imageonmap.jar." "https://dev.bukkit.org/media/files/772/680/imageonmap.jar"
|
||||||
echo ">> Downloading logblock.jar ..."
|
echo ">> Downloading logblock.jar ..."
|
||||||
curl --progress-bar -Lo "logblock.jar" "https://dev.bukkit.org/media/files/757/963/LogBlock.jar"
|
curl --progress-bar -Lo "logblock.jar." "https://dev.bukkit.org/media/files/757/963/LogBlock.jar"
|
||||||
echo ">> Downloading logblockquestioner.zip ..."
|
echo ">> Downloading logblockquestioner.zip ..."
|
||||||
curl --progress-bar -Lo "logblockquestioner.zip" "https://cloud.github.com/downloads/DiddiZ/LogBlockQuestioner/LogBlockQuestioner%20v0.03.zip"
|
curl --progress-bar -Lo "logblockquestioner.zip" "https://cloud.github.com/downloads/DiddiZ/LogBlockQuestioner/LogBlockQuestioner%20v0.03.zip"
|
||||||
echo ">> Downloading multiverse-core.jar ..."
|
echo ">> Downloading multiverse-core.jar ..."
|
||||||
curl --progress-bar -Lo "multiverse-core.jar" "https://dev.bukkit.org/media/files/588/781/Multiverse-Core-2.4.jar"
|
curl --progress-bar -Lo "multiverse-core.jar" "https://dev.bukkit.org/media/files/588/781/Multiverse-Core-2.4.jar"
|
||||||
echo ">> Downloading multiverse-portals.jar ..."
|
echo ">> Downloading multiverse-portals.jar ..."
|
||||||
curl --progress-bar -Lo "multiverse-portals.jar" "https://dev.bukkit.org/media/files/588/790/Multiverse-Portals-2.4.jar"
|
curl --progress-bar -Lo "multiverse-portals.jar." "https://dev.bukkit.org/media/files/588/790/Multiverse-Portals-2.4.jar"
|
||||||
echo ">> Downloading multiverse-netherportals.jar ..."
|
echo ">> Downloading multiverse-netherportals.jar ..."
|
||||||
curl --progress-bar -Lo "multiverse-netherportals.jar" "https://dev.bukkit.org/media/files/589/64/Multiverse-NetherPortals-2.4.jar"
|
curl --progress-bar -Lo "multiverse-netherportals.jar." "https://dev.bukkit.org/media/files/589/64/Multiverse-NetherPortals-2.4.jar"
|
||||||
echo ">> Downloading multiverse-inventories.jar ..."
|
echo ">> Downloading multiverse-inventories.jar ..."
|
||||||
curl --progress-bar -Lo "multiverse-inventories.jar" "https://dev.bukkit.org/media/files/663/303/Multiverse-Inventories-2.5.jar"
|
curl --progress-bar -Lo "multiverse-inventories.jar." "https://dev.bukkit.org/media/files/663/303/Multiverse-Inventories-2.5.jar"
|
||||||
echo ">> Downloading permissionsex.jar ..."
|
echo ">> Downloading permissionsex.jar ..."
|
||||||
curl --progress-bar -Lo "permissionsex.jar" "https://dev.bukkit.org/media/files/882/992/PermissionsEx-1.23.3.jar"
|
curl --progress-bar -Lo "permissionsex.jar" "https://dev.bukkit.org/media/files/882/992/PermissionsEx-1.23.3.jar"
|
||||||
echo ">> Downloading plotme.jar ..."
|
echo ">> Downloading plotme.jar ..."
|
||||||
@@ -53,15 +62,15 @@ curl --progress-bar -Lo "plotme.jar" "http://ci.worldcretornica.com/job/PlotMe-C
|
|||||||
echo ">> Downloading plotme-defaultgenerator.jar ..."
|
echo ">> Downloading plotme-defaultgenerator.jar ..."
|
||||||
curl --progress-bar -Lo "plotme-defaultgenerator.jar" "http://ci.worldcretornica.com/job/PlotMe-DefaultGenerator/83/artifact/target/PlotMe-DefaultGenerator.jar"
|
curl --progress-bar -Lo "plotme-defaultgenerator.jar" "http://ci.worldcretornica.com/job/PlotMe-DefaultGenerator/83/artifact/target/PlotMe-DefaultGenerator.jar"
|
||||||
echo ">> Downloading serversigns.jar ..."
|
echo ">> Downloading serversigns.jar ..."
|
||||||
curl --progress-bar -Lo "serversigns.jar" "https://dev.bukkit.org/media/files/876/381/ServerSigns.jar"
|
curl --progress-bar -Lo "serversigns.jar." "https://dev.bukkit.org/media/files/876/381/ServerSigns.jar"
|
||||||
echo ">> Downloading redstoneclockdetector.jar ..."
|
echo ">> Downloading redstoneclockdetector.jar ..."
|
||||||
curl --progress-bar -Lo "redstoneclockdetector.jar" "https://dev.bukkit.org/media/files/577/253/RedstoneClockDetector.jar"
|
curl --progress-bar -Lo "redstoneclockdetector.jar." "https://dev.bukkit.org/media/files/577/253/RedstoneClockDetector.jar"
|
||||||
echo ">> Downloading vault.jar ..."
|
echo ">> Downloading vault.jar ..."
|
||||||
curl --progress-bar -Lo "vault.jar" "https://dev.bukkit.org/media/files/837/976/Vault.jar"
|
curl --progress-bar -Lo "vault.jar" "https://dev.bukkit.org/media/files/837/976/Vault.jar"
|
||||||
echo ">> Downloading worldborder.jar ..."
|
echo ">> Downloading worldborder.jar ..."
|
||||||
curl --progress-bar -Lo "worldborder.jar" "https://dev.bukkit.org/media/files/883/629/WorldBorder.jar"
|
curl --progress-bar -Lo "worldborder.jar." "https://dev.bukkit.org/media/files/883/629/WorldBorder.jar"
|
||||||
echo ">> Downloading worldguard.jar ..."
|
echo ">> Downloading worldguard.jar ..."
|
||||||
curl --progress-bar -Lo "worldguard.jar" "https://github.com/RedstonerServer/WorldGuard/releases/download/6.0.0-redstoner/worldguard-6.0.0-REDSTONER.jar"
|
curl --progress-bar -Lo "worldguard.jar." "https://github.com/RedstonerServer/WorldGuard/releases/download/6.0.0-redstoner/worldguard-6.0.0-REDSTONER.jar"
|
||||||
echo ">> Downloading worldedit.jar ..."
|
echo ">> Downloading worldedit.jar ..."
|
||||||
curl --progress-bar -Lo "worldedit.jar" "https://dev.bukkit.org/media/files/880/435/worldedit-bukkit-6.1.jar"
|
curl --progress-bar -Lo "worldedit.jar" "https://dev.bukkit.org/media/files/880/435/worldedit-bukkit-6.1.jar"
|
||||||
echo ">> Downloading pythonpluginloader.jar ..."
|
echo ">> Downloading pythonpluginloader.jar ..."
|
||||||
@@ -70,13 +79,23 @@ curl --progress-bar -Lo "pythonpluginloader.jar" "https://bamboo.gserv.me/browse
|
|||||||
echo -e "\n> Unpacking LogBlockQuestioner"
|
echo -e "\n> Unpacking LogBlockQuestioner"
|
||||||
unzip -q "logblockquestioner.zip" "LogBlockQuestioner.jar"
|
unzip -q "logblockquestioner.zip" "LogBlockQuestioner.jar"
|
||||||
rm "logblockquestioner.zip"
|
rm "logblockquestioner.zip"
|
||||||
mv -v "LogBlockQuestioner.jar" "logblockquestioner.jar"
|
mv -v "LogBlockQuestioner.jar" "logblockquestioner.jar."
|
||||||
|
|
||||||
echo -e "\n> Pulling redstoner-utils ..."
|
echo -e "\n> Pulling redstoner-utils ..."
|
||||||
git clone -q "git@github.com:RedstonerServer/redstoner-utils.git" "redstoner-utils.py.dir" > /dev/null
|
git clone -q "git@github.com:RedstonerServer/redstoner-utils.git" "redstoner-utils.py.dir" > /dev/null
|
||||||
|
|
||||||
|
echo -e "\n> Installing dependencies"
|
||||||
|
pip install passlib
|
||||||
|
|
||||||
echo -e "\n> All plugins downloaded"
|
echo -e "\n> All plugins downloaded"
|
||||||
cd ".."
|
|
||||||
|
cd "redstoner-utils.py.dir"
|
||||||
|
echo -e "\n> Duplicating sample files"
|
||||||
|
for file in ls ./*.example; do
|
||||||
|
cp -v "$file" "$(echo "$file" | rev | cut -d "." -f 2- | rev)"
|
||||||
|
done
|
||||||
|
|
||||||
|
cd "../.."
|
||||||
|
|
||||||
mkdir -v "lib"
|
mkdir -v "lib"
|
||||||
cd "lib"
|
cd "lib"
|
||||||
|
|||||||
Reference in New Issue
Block a user