diff --git a/README.md b/README.md index 70a7f8b..e03fbf9 100644 --- a/README.md +++ b/README.md @@ -14,7 +14,7 @@ Detailed description: 0. Download [the latest spigot](http://ci.md-5.net/job/Spigot/lastStableBuild/artifact/Spigot-Server/target/spigot.jar) 0. Run it once inside redstoner, then shut it down again 0. Create a new directory (inside redstoner) called 'lib' -0. Download [jython](http://search.maven.org/remotecontent?filepath=org/python/jython-standalone/2.5.3/jython-standalone-2.5.3.jar) and save it as 'jython.jar' inside lib +0. Download [jython](http://search.maven.org/remotecontent?filepath=org/python/jython-standalone/2.7-b2/jython-standalone-2.7-b2.jar) and save it as 'jython.jar' inside lib 0. Download [mysql-connector](https://dev.mysql.com/get/Downloads/Connector-J/mysql-connector-java-5.1.30.zip), extract 'mysql-connector-java-X.X.XX-bin.jar ' and save it as 'mysql-connector.jar' inside lib 0. Download [PyPluginLoader](http://gserv.me/static/PyPluginLoader-0.3.5.jar) (we're using [this fork](https://github.com/gdude2002/Python-Plugin-Loader)) into the plugins directory diff --git a/chatgroups.py b/chatgroups.py index 18c56b1..4b79567 100644 --- a/chatgroups.py +++ b/chatgroups.py @@ -1,7 +1,7 @@ #pylint: disable=F0401 from helpers import * from java.util.UUID import fromString as juuid -import simplejson as json +import json chatgroups_filename = "plugins/redstoner-utils.py.dir/files/chatgroups.json" groups = {} diff --git a/cycle.py b/cycle.py index c35e9bc..53d372c 100644 --- a/cycle.py +++ b/cycle.py @@ -1,4 +1,4 @@ -import simplejson as json +import json from helpers import * cyclers_file = "plugins/redstoner-utils.py.dir/files/cycle.json" diff --git a/damnspam.py b/damnspam.py index ba3867e..cff15b2 100644 --- a/damnspam.py +++ b/damnspam.py @@ -1,6 +1,6 @@ #pylint: disable=F0401 from helpers import * -import simplejson as json +import json spam_filename = "plugins/redstoner-utils.py.dir/files/damnspam.json" inputs = [] diff --git a/reports.py b/reports.py index 588681a..24e0edb 100644 --- a/reports.py +++ b/reports.py @@ -1,5 +1,5 @@ from helpers import * -import simplejson as json +import json import time import thread diff --git a/saylol.py b/saylol.py index 1956bfd..0e5caff 100644 --- a/saylol.py +++ b/saylol.py @@ -1,4 +1,4 @@ -import simplejson as json +import json from time import time from helpers import * from random import randrange diff --git a/tilehelper.py b/tilehelper.py index af22d30..0018961 100644 --- a/tilehelper.py +++ b/tilehelper.py @@ -3,7 +3,7 @@ import org.bukkit.event.block.BlockPlaceEvent as BlockPlaceEvent import org.bukkit.event.block.BlockBreakEvent as BlockBreakEvent import org.bukkit.event.player.PlayerInteractEvent as PlayerInteractEvent import thread -import simplejson as json +import json from time import sleep from helpers import *