arg/scriptcraft
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

untabified.

Browse source
This commit is contained in:
walterhiggins 2013-01-05 01:25:23 +00:00
parent 52272da33b
commit 49b24fa2cd
3 changed files with 106 additions and 105 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

147
bukkit/ScriptCraft/src/net/walterhiggins/scriptcraft/ScriptCraftBukkit.java
View file

@ -11,78 +11,79 @@ import org.bukkit.plugin.java.JavaPlugin;
public class ScriptCraftBukkit implements IScriptCraft public class ScriptCraftBukkit implements IScriptCraft
{ {
/* (non-Javadoc) /* (non-Javadoc)
* @see net.walterhiggins.scriptcraft.IScriptCraft#putSign(java.lang.String[], int, int, int, int, int) * @see net.walterhiggins.scriptcraft.IScriptCraft#putSign(java.lang.String[], int, int, int, int, int)
*/ */
@Override @Override
public void putSign(String[] texts, int x, int y, int z, int blockId, int meta) { public void putSign(String[] texts, int x, int y, int z, int blockId, int meta) {
// TODO Auto-generated method stub // TODO Auto-generated method stub
putBlock(x,y,z,blockId,meta); putBlock(x,y,z,blockId,meta);
Block block = this.getBlockObjectAt(x, y, z); Block block = this.getBlockObjectAt(x, y, z);
if (block instanceof Sign){ if (block instanceof Sign){
Sign sign = (Sign)block; Sign sign = (Sign)block;
for (int i = 0; i < texts.length;i++){ for (int i = 0; i < texts.length;i++){
sign.setLine(i%4, texts[i]); sign.setLine(i%4, texts[i]);
} }
sign.update(true); sign.update(true);
} }
} }
private void _putBlock(World world,int x, int y, int z, int blockId, int meta){ /* (non-Javadoc)
Block block = world.getBlockAt(x, y, z); * @see net.walterhiggins.scriptcraft.IScriptCraft#putBlock(int, int, int, int, int)
block.setTypeId(blockId); */
block.setData((byte)meta); @Override
public void putBlock(int x, int y, int z, int blockId, int meta) {
} World world = this.getInvokerWorld();
/* (non-Javadoc) this._putBlock(world, x, y, z, blockId, meta);
* @see net.walterhiggins.scriptcraft.IScriptCraft#putBlock(int, int, int, int, int) }
*/ private final World getInvokerWorld(){
@Override if (this.invoker instanceof Player){
public void putBlock(int x, int y, int z, int blockId, int meta) { Player player = (Player)this.invoker;
World world = this.getInvokerWorld(); return player.getLocation().getWorld();
this._putBlock(world, x, y, z, blockId, meta); }
} if (this.invoker instanceof BlockCommandSender){
private final World getInvokerWorld(){ BlockCommandSender bcs = (BlockCommandSender)this.invoker;
if (this.invoker instanceof Player){ return bcs.getBlock().getLocation().getWorld();
Player player = (Player)this.invoker; }
return player.getLocation().getWorld(); return null;
} }
if (this.invoker instanceof BlockCommandSender){ /* (non-Javadoc)
BlockCommandSender bcs = (BlockCommandSender)this.invoker; * @see net.walterhiggins.scriptcraft.IScriptCraft#getBlock(int, int, int)
return bcs.getBlock().getLocation().getWorld(); */
} @Override
return null; public String getBlock(int x, int y, int z) {
} Block block = this.getBlockObjectAt(x, y, z);
private final Block getBlockObjectAt(int x,int y, int z){ if (block !=null)
World world = getInvokerWorld(); return "" + block.getTypeId() + ":" + block.getData();
if (world != null) return null;
return world.getBlockAt(x, y, z); }
return null; /* (non-Javadoc)
} * @see net.walterhiggins.scriptcraft.IScriptCraft#notifyAdministrators(java.lang.String)
/* (non-Javadoc) */
* @see net.walterhiggins.scriptcraft.IScriptCraft#getBlock(int, int, int) @Override
*/ public void notifyAdministrators(String message) {
@Override
public String getBlock(int x, int y, int z) { Set<OfflinePlayer> ops = this.plugin.getServer().getOperators();
Block block = this.getBlockObjectAt(x, y, z); for (OfflinePlayer op : ops){
if (block !=null) if (op.isOnline()){
return "" + block.getTypeId() + ":" + block.getData(); op.getPlayer().chat(message);
return null; }
} }
/* (non-Javadoc) this.plugin.getLogger().info(message);
* @see net.walterhiggins.scriptcraft.IScriptCraft#notifyAdministrators(java.lang.String) }
*/
@Override private void _putBlock(World world,int x, int y, int z, int blockId, int meta){
public void notifyAdministrators(String message) { Block block = world.getBlockAt(x, y, z);
block.setTypeId(blockId);
Set<OfflinePlayer> ops = this.plugin.getServer().getOperators(); block.setData((byte)meta);
for (OfflinePlayer op : ops){
if (op.isOnline()){ }
op.getPlayer().chat(message); private final Block getBlockObjectAt(int x,int y, int z){
} World world = getInvokerWorld();
} if (world != null)
this.plugin.getLogger().info(message); return world.getBlockAt(x, y, z);
} return null;
protected JavaPlugin plugin = null; }
protected JavaPlugin plugin = null;
public CommandSender invoker = null; public CommandSender invoker = null;
public void setInvoker(Object invoker) public void setInvoker(Object invoker)
@ -90,7 +91,7 @@ public class ScriptCraftBukkit implements IScriptCraft
this.invoker = (CommandSender)invoker; this.invoker = (CommandSender)invoker;
} }
public ScriptCraftBukkit(JavaPlugin plugin){ public ScriptCraftBukkit(JavaPlugin plugin){
this.plugin = plugin; this.plugin = plugin;
} }
public double[] getPlayerPos() public double[] getPlayerPos()
{ {

18
bukkit/ScriptCraft/src/net/walterhiggins/scriptcraft/ScriptCraftEvaluator.java
View file

@ -13,11 +13,11 @@ public class ScriptCraftEvaluator
public static class MCScope extends ImporterTopLevel{ public static class MCScope extends ImporterTopLevel{
/** /**
* *
*/ */
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
public MCScope(Context ctx){ public MCScope(Context ctx){
super(ctx); super(ctx);
} }
} }
@ -253,18 +253,18 @@ public class ScriptCraftEvaluator
return ScriptCraftEvaluator.sc.getBlock(x,y,z); return ScriptCraftEvaluator.sc.getBlock(x,y,z);
} }
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
public static void putSign(Context cx, Scriptable thisObj,Object[] args, Function funObj){ public static void putSign(Context cx, Scriptable thisObj,Object[] args, Function funObj){
List<String> jsArray = (List<String>)args[0]; List<String> jsArray = (List<String>)args[0];
String[] texts = new String[4]; String[] texts = new String[4];
int i = 0; int i = 0;
for (String s : jsArray){ for (String s : jsArray){
texts[i++] = s; texts[i++] = s;
} }
/* /*
for (int i = 0; i < jsArray.size() && i <= 3;i++){ for (int i = 0; i < jsArray.size() && i <= 3;i++){
texts[i] = (String)jsArray.get(i); texts[i] = (String)jsArray.get(i);
} }
*/ */
int x = new Double(args[1].toString()).intValue(); int x = new Double(args[1].toString()).intValue();
int y = new Double(args[2].toString()).intValue(); int y = new Double(args[2].toString()).intValue();

46
bukkit/ScriptCraft/src/net/walterhiggins/scriptcraft/ScriptCraftPlugin.java
View file

@ -7,41 +7,41 @@ import org.mozilla.javascript.*;
public class ScriptCraftPlugin extends JavaPlugin public class ScriptCraftPlugin extends JavaPlugin
{ {
// right now all ops share the same JS context/scope // right now all ops share the same JS context/scope
// need to look at possibly having context/scope per operator // need to look at possibly having context/scope per operator
//protected Map<CommandSender,ScriptCraftEvaluator> playerContexts = new HashMap<CommandSender,ScriptCraftEvaluator>(); //protected Map<CommandSender,ScriptCraftEvaluator> playerContexts = new HashMap<CommandSender,ScriptCraftEvaluator>();
protected ScriptCraftEvaluator evaluator = null; protected ScriptCraftEvaluator evaluator = null;
@Override @Override
public void onEnable(){ public void onEnable(){
getLogger().info("ScriptCraft enabled."); getLogger().info("ScriptCraft enabled.");
if (this.evaluator == null){ if (this.evaluator == null){
this.evaluator = new ScriptCraftEvaluator(new ScriptCraftBukkit(this)); this.evaluator = new ScriptCraftEvaluator(new ScriptCraftBukkit(this));
this.evaluator.getScope().defineProperty("plugin", this, ScriptableObject.READONLY); this.evaluator.getScope().defineProperty("plugin", this, ScriptableObject.READONLY);
// //
// Auto-load Javascript plugins from the js-plugins directory // Auto-load Javascript plugins from the js-plugins directory
// in the current working directory // in the current working directory
// //
String userDir = System.getProperty("user.dir"); String userDir = System.getProperty("user.dir");
File jsPlugins = new File(userDir + System.getProperty("file.separator") + "js-plugins"); File jsPlugins = new File(userDir + System.getProperty("file.separator") + "js-plugins");
if (jsPlugins.exists()){ if (jsPlugins.exists()){
File[] files = jsPlugins.listFiles(); File[] files = jsPlugins.listFiles();
for (File f: files){ for (File f: files){
this.evaluator.eval("load(\"" + f.getAbsolutePath() + "\")", null); this.evaluator.eval("load(\"" + f.getAbsolutePath() + "\")", null);
} }
} }
} }
} }
public boolean onCommand(CommandSender sender, Command cmd, String label, String[] args) public boolean onCommand(CommandSender sender, Command cmd, String label, String[] args)
{ {
if(cmd.getName().equalsIgnoreCase("js")) if(cmd.getName().equalsIgnoreCase("js"))
{ {
this.evaluator.getScope().defineProperty("self", sender, ScriptableObject.DONTENUM); this.evaluator.getScope().defineProperty("self", sender, ScriptableObject.DONTENUM);
String javascriptCode = ""; String javascriptCode = "";
for (int i = 0;i < args.length; i++){ for (int i = 0;i < args.length; i++){
javascriptCode = javascriptCode + args[i] + " "; javascriptCode = javascriptCode + args[i] + " ";
} }
this.evaluator.eval(javascriptCode, sender); this.evaluator.eval(javascriptCode, sender);
return true; return true;