Mirror von
https://github.com/IntellectualSites/FastAsyncWorldEdit.git
synchronisiert 2024-12-24 18:10:08 +01:00
Renamed WorldEditController to WorldEdit.
Dieser Commit ist enthalten in:
Ursprung
fdb7c31aae
Commit
7dbb23051a
@ -49,7 +49,7 @@ import com.sk89q.worldedit.patterns.*;
|
|||||||
*
|
*
|
||||||
* @author sk89q
|
* @author sk89q
|
||||||
*/
|
*/
|
||||||
public class WorldEditController {
|
public class WorldEdit {
|
||||||
private static final Logger logger = Logger.getLogger("Minecraft.WorldEdit");
|
private static final Logger logger = Logger.getLogger("Minecraft.WorldEdit");
|
||||||
|
|
||||||
private ServerInterface server;
|
private ServerInterface server;
|
||||||
@ -77,7 +77,7 @@ public class WorldEditController {
|
|||||||
* @param server
|
* @param server
|
||||||
* @param config
|
* @param config
|
||||||
*/
|
*/
|
||||||
public WorldEditController(ServerInterface server, LocalConfiguration config) {
|
public WorldEdit(ServerInterface server, LocalConfiguration config) {
|
||||||
this.server = server;
|
this.server = server;
|
||||||
this.config = config;
|
this.config = config;
|
||||||
|
|
||||||
@ -2217,7 +2217,7 @@ public class WorldEditController {
|
|||||||
InputStream file;
|
InputStream file;
|
||||||
|
|
||||||
if (!f.exists()) {
|
if (!f.exists()) {
|
||||||
file = WorldEditController.class.getResourceAsStream(
|
file = WorldEdit.class.getResourceAsStream(
|
||||||
"craftscripts/" + filename);
|
"craftscripts/" + filename);
|
||||||
|
|
||||||
if (file == null) {
|
if (file == null) {
|
@ -45,7 +45,7 @@ public class WorldEditPlugin extends JavaPlugin {
|
|||||||
private static final Logger logger = Logger.getLogger("Minecraft.WorldEdit");
|
private static final Logger logger = Logger.getLogger("Minecraft.WorldEdit");
|
||||||
|
|
||||||
public final ServerInterface server;
|
public final ServerInterface server;
|
||||||
public final WorldEditController controller;
|
public final WorldEdit controller;
|
||||||
public final WorldEditAPI api;
|
public final WorldEditAPI api;
|
||||||
|
|
||||||
private final LocalConfiguration config;
|
private final LocalConfiguration config;
|
||||||
@ -74,7 +74,7 @@ public class WorldEditPlugin extends JavaPlugin {
|
|||||||
loadConfiguration();
|
loadConfiguration();
|
||||||
|
|
||||||
server = new BukkitServerInterface(getServer());
|
server = new BukkitServerInterface(getServer());
|
||||||
controller = new WorldEditController(server, config);
|
controller = new WorldEdit(server, config);
|
||||||
api = new WorldEditAPI(this);
|
api = new WorldEditAPI(this);
|
||||||
|
|
||||||
registerEvents();
|
registerEvents();
|
||||||
|
@ -33,7 +33,7 @@ import com.sk89q.worldedit.LocalPlayer;
|
|||||||
import com.sk89q.worldedit.LocalSession;
|
import com.sk89q.worldedit.LocalSession;
|
||||||
import com.sk89q.worldedit.ServerInterface;
|
import com.sk89q.worldedit.ServerInterface;
|
||||||
import com.sk89q.worldedit.UnknownItemException;
|
import com.sk89q.worldedit.UnknownItemException;
|
||||||
import com.sk89q.worldedit.WorldEditController;
|
import com.sk89q.worldedit.WorldEdit;
|
||||||
import com.sk89q.worldedit.blocks.BaseBlock;
|
import com.sk89q.worldedit.blocks.BaseBlock;
|
||||||
import com.sk89q.worldedit.patterns.Pattern;
|
import com.sk89q.worldedit.patterns.Pattern;
|
||||||
|
|
||||||
@ -46,7 +46,7 @@ public class CraftScriptContext extends CraftScriptEnvironment {
|
|||||||
private List<EditSession> editSessions = new ArrayList<EditSession>();
|
private List<EditSession> editSessions = new ArrayList<EditSession>();
|
||||||
private String[] args;
|
private String[] args;
|
||||||
|
|
||||||
public CraftScriptContext(WorldEditController controller,
|
public CraftScriptContext(WorldEdit controller,
|
||||||
ServerInterface server, LocalConfiguration config,
|
ServerInterface server, LocalConfiguration config,
|
||||||
LocalSession session, LocalPlayer player, String[] args) {
|
LocalSession session, LocalPlayer player, String[] args) {
|
||||||
super(controller, server, config, session, player);
|
super(controller, server, config, session, player);
|
||||||
|
@ -23,16 +23,16 @@ import com.sk89q.worldedit.LocalConfiguration;
|
|||||||
import com.sk89q.worldedit.LocalPlayer;
|
import com.sk89q.worldedit.LocalPlayer;
|
||||||
import com.sk89q.worldedit.LocalSession;
|
import com.sk89q.worldedit.LocalSession;
|
||||||
import com.sk89q.worldedit.ServerInterface;
|
import com.sk89q.worldedit.ServerInterface;
|
||||||
import com.sk89q.worldedit.WorldEditController;
|
import com.sk89q.worldedit.WorldEdit;
|
||||||
|
|
||||||
public abstract class CraftScriptEnvironment {
|
public abstract class CraftScriptEnvironment {
|
||||||
protected WorldEditController controller;
|
protected WorldEdit controller;
|
||||||
protected LocalPlayer player;
|
protected LocalPlayer player;
|
||||||
protected LocalConfiguration config;
|
protected LocalConfiguration config;
|
||||||
protected LocalSession session;
|
protected LocalSession session;
|
||||||
protected ServerInterface server;
|
protected ServerInterface server;
|
||||||
|
|
||||||
public CraftScriptEnvironment(WorldEditController controller, ServerInterface server,
|
public CraftScriptEnvironment(WorldEdit controller, ServerInterface server,
|
||||||
LocalConfiguration config, LocalSession session, LocalPlayer player) {
|
LocalConfiguration config, LocalSession session, LocalPlayer player) {
|
||||||
this.controller = controller;
|
this.controller = controller;
|
||||||
this.player = player;
|
this.player = player;
|
||||||
|
@ -21,7 +21,7 @@ package com.sk89q.worldedit.scripting;
|
|||||||
|
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
import javax.script.ScriptException;
|
import javax.script.ScriptException;
|
||||||
import com.sk89q.worldedit.WorldEditController;
|
import com.sk89q.worldedit.WorldEdit;
|
||||||
import com.sk89q.worldedit.WorldEditException;
|
import com.sk89q.worldedit.WorldEditException;
|
||||||
import sun.org.mozilla.javascript.internal.*;
|
import sun.org.mozilla.javascript.internal.*;
|
||||||
|
|
||||||
@ -43,7 +43,7 @@ public class SunRhinoCraftScriptEngine implements CraftScriptEngine {
|
|||||||
final Map<String, Object> args)
|
final Map<String, Object> args)
|
||||||
throws ScriptException, Throwable {
|
throws ScriptException, Throwable {
|
||||||
SunRhinoContextFactory factory = new SunRhinoContextFactory(timeLimit);
|
SunRhinoContextFactory factory = new SunRhinoContextFactory(timeLimit);
|
||||||
factory.initApplicationClassLoader(WorldEditController.class.getClassLoader());
|
factory.initApplicationClassLoader(WorldEdit.class.getClassLoader());
|
||||||
|
|
||||||
try {
|
try {
|
||||||
return factory.call(new ContextAction() {
|
return factory.call(new ContextAction() {
|
||||||
|
Laden…
In neuem Issue referenzieren
Einen Benutzer sperren