mirror/WorldEdit
2
0
Fork 0
mirror of https://github.com/EngineHub/WorldEdit.git synced 2024-12-21 04:49:51 +08:00
Code Issues Packages Projects Releases Wiki Activity

Implement EditSessionFactory

Browse Source
This commit is contained in:
Ammar Askar 2012-10-18 15:34:09 +05:00
parent ae75061492
commit 04c00034cf
7 changed files with 85 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/main/java/com/sk89q/worldedit/EditSessionFactory.java Normal file
View File

@ -0,0 +1,28 @@
package com.sk89q.worldedit;
import com.sk89q.worldedit.bags.BlockBag;
public class EditSessionFactory {
/**
* Construct an edit session with a maximum number of blocks.
*
* @param world
* @param maxBlocks
*/
public EditSession getEditSession(LocalWorld world, int maxBlocks) {
return new EditSession(world, maxBlocks);
}
/**
* Construct an edit session with a maximum number of blocks and a block bag.
*
* @param world
* @param maxBlocks
* @param blockBag
*/
public EditSession getEditSession(LocalWorld world, int maxBlocks, BlockBag blockBag) {
return new EditSession(world, maxBlocks, blockBag);
}
}

12
src/main/java/com/sk89q/worldedit/LocalSession.java
View File

@ -142,8 +142,8 @@ public EditSession undo(BlockBag newBlockBag) {
--historyPointer;
if (historyPointer >= 0) {
EditSession editSession = history.get(historyPointer);
EditSession newEditSession =
new EditSession(editSession.getWorld(), -1, newBlockBag);
EditSession newEditSession = WorldEdit.getInstance().getEditSessionFactory()
.getEditSession(editSession.getWorld(), -1, newBlockBag);
newEditSession.enableQueue();
newEditSession.setFastMode(fastMode);
editSession.undo(newEditSession);
@ -163,8 +163,8 @@ public EditSession undo(BlockBag newBlockBag) {
public EditSession redo(BlockBag newBlockBag) {
if (historyPointer < history.size()) {
EditSession editSession = history.get(historyPointer);
EditSession newEditSession =
new EditSession(editSession.getWorld(), -1, newBlockBag);
EditSession newEditSession = WorldEdit.getInstance().getEditSessionFactory()
.getEditSession(editSession.getWorld(), -1, newBlockBag);
newEditSession.enableQueue();
newEditSession.setFastMode(fastMode);
editSession.redo(newEditSession);
@ -698,8 +698,8 @@ public EditSession createEditSession(LocalPlayer player) {
BlockBag blockBag = getBlockBag(player);
// Create an edit session
EditSession editSession =
new EditSession(player.isPlayer() ? player.getWorld() : null,
EditSession editSession = WorldEdit.getInstance().getEditSessionFactory()
.getEditSession(player.isPlayer() ? player.getWorld() : null,
getBlockChangeLimit(), blockBag);
editSession.setFastMode(fastMode);
if (mask != null) {

42
src/main/java/com/sk89q/worldedit/WorldEdit.java
View File

@ -112,6 +112,11 @@ public class WorldEdit {
*/
public static final Logger logger = Logger.getLogger("Minecraft.WorldEdit");
/**
* Holds the current instance of this class, for static access
*/
private static WorldEdit instance;
/**
* Holds WorldEdit's version.
*/
@ -131,6 +136,11 @@ public class WorldEdit {
* List of commands.
*/
private final CommandsManager<LocalPlayer> commands;
/**
* Holds the factory responsible for the creation of edit sessions
*/
private EditSessionFactory editSessionFactory = new EditSessionFactory();
/**
* Stores a list of WorldEdit sessions, keyed by players' names. Sessions
@ -155,6 +165,7 @@ public class WorldEdit {
* @param config
*/
public WorldEdit(ServerInterface server, final LocalConfiguration config) {
instance = this;
this.server = server;
this.config = config;
@ -253,6 +264,15 @@ private void reg(Class<?> clazz) {
server.onCommandRegistration(commands.registerAndReturn(clazz), commands);
}
/**
* Gets the current instance of this class
*
* @return
*/
public static WorldEdit getInstance() {
return instance;
}
/**
* Gets the LocalSession for a player name if it exists
*
@ -1529,6 +1549,28 @@ public ServerInterface getServer() {
return server;
}
/**
* Get the edit session factory
*
* @return
*/
public EditSessionFactory getEditSessionFactory() {
return this.editSessionFactory;
}
/**
* Set the edit session factory
*
* @param factory
*/
public void setEditSessionFactory(EditSessionFactory factory) {
if (factory == null) {
throw new IllegalArgumentException("New EditSessionFactory may not be null");
}
logger.info("Accepted EditSessionFactory of type " + factory.getClass().getName() + " from " + factory.getClass().getPackage().getName());
this.editSessionFactory = factory;
}
/**
* Get the version.
*

4
src/main/java/com/sk89q/worldedit/bukkit/WorldEditPlugin.java
View File

@ -220,8 +220,8 @@ public EditSession createEditSession(Player player) {
LocalSession session = controller.getSession(wePlayer);
BlockBag blockBag = session.getBlockBag(wePlayer);
EditSession editSession =
new EditSession(wePlayer.getWorld(), session.getBlockChangeLimit(), blockBag);
EditSession editSession = controller.getEditSessionFactory()
.getEditSession(wePlayer.getWorld(), session.getBlockChangeLimit(), blockBag);
editSession.enableQueue();
return editSession;

4
src/main/java/com/sk89q/worldedit/scripting/CraftScriptContext.java
View File

@ -60,8 +60,8 @@ public CraftScriptContext(WorldEdit controller,
* @return
*/
public EditSession remember() {
EditSession editSession =
new EditSession(player.getWorld(),
EditSession editSession = controller.getEditSessionFactory()
.getEditSession(player.getWorld(),
session.getBlockChangeLimit(), session.getBlockBag(player));
editSession.enableQueue();
editSessions.add(editSession);

5
src/main/java/com/sk89q/worldedit/tools/BlockReplacer.java
View File

@ -46,7 +46,7 @@ public boolean actPrimary(ServerInterface server, LocalConfiguration config,
BlockBag bag = session.getBlockBag(player);
LocalWorld world = clicked.getWorld();
EditSession editSession = new EditSession(world, -1, bag);
EditSession editSession = WorldEdit.getInstance().getEditSessionFactory().getEditSession(world, -1, bag);
try {
editSession.setBlock(clicked, targetBlock);
@ -66,7 +66,8 @@ public boolean actSecondary(ServerInterface server,
LocalSession session, WorldVector clicked) {
LocalWorld world = clicked.getWorld();
targetBlock = (new EditSession(world, -1)).getBlock(clicked);
EditSession editSession = WorldEdit.getInstance().getEditSessionFactory().getEditSession(world, -1);
targetBlock = (editSession).getBlock(clicked);
BlockType type = BlockType.fromID(targetBlock.getType());
if (type != null) {

3
src/main/java/com/sk89q/worldedit/tools/QueryTool.java
View File

@ -37,7 +37,8 @@ public boolean actPrimary(ServerInterface server, LocalConfiguration config,
LocalPlayer player, LocalSession session, WorldVector clicked) {
LocalWorld world = clicked.getWorld();
BaseBlock block = (new EditSession(world, 0)).rawGetBlock(clicked);
EditSession editSession = WorldEdit.getInstance().getEditSessionFactory().getEditSession(world, 0);
BaseBlock block = (editSession).rawGetBlock(clicked);
BlockType type = BlockType.fromID(block.getType());
player.print("\u00A79@" + clicked + ": " + "\u00A7e"