mirror of
https://github.com/plexusorg/Plex-FAWE.git
synced 2024-12-23 09:47:38 +00:00
send poly regions to wecui, take 2
This commit is contained in:
parent
7c18327fdc
commit
a2e23fedf7
@ -585,17 +585,7 @@ public class LocalSession {
|
||||
new SelectionShapeEvent(selector.getTypeId()));
|
||||
|
||||
if (selector instanceof CUIPointBasedRegion) {
|
||||
Vector[] points = ((CUIPointBasedRegion) selector).getCUIPoints();
|
||||
int size = selector.getArea();
|
||||
|
||||
int i = 0;
|
||||
for (Vector pt : points) {
|
||||
if (pt != null) {
|
||||
player.dispatchCUIEvent(
|
||||
new SelectionPointEvent(i, pt, size));
|
||||
}
|
||||
++i;
|
||||
}
|
||||
((CUIPointBasedRegion) selector).describeCUI(player);
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -19,8 +19,9 @@
|
||||
|
||||
package com.sk89q.worldedit.cui;
|
||||
|
||||
import com.sk89q.worldedit.LocalPlayer;
|
||||
import com.sk89q.worldedit.Vector;
|
||||
|
||||
public interface CUIPointBasedRegion {
|
||||
public Vector[] getCUIPoints();
|
||||
public void describeCUI(LocalPlayer player);
|
||||
}
|
||||
|
@ -0,0 +1,45 @@
|
||||
// $Id$
|
||||
/*
|
||||
* WorldEdit
|
||||
* Copyright (C) 2010, 2011 sk89q <http://www.sk89q.com>
|
||||
*
|
||||
* This program is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation, either version 3 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
package com.sk89q.worldedit.cui;
|
||||
|
||||
import com.sk89q.worldedit.Vector;
|
||||
|
||||
public class SelectionMinMaxEvent implements CUIEvent {
|
||||
|
||||
protected int min;
|
||||
protected int max;
|
||||
|
||||
public SelectionMinMaxEvent(int min, int max) {
|
||||
this.min = min;
|
||||
this.max = max;
|
||||
}
|
||||
|
||||
public String getTypeId() {
|
||||
return "mm";
|
||||
}
|
||||
|
||||
public String[] getParameters() {
|
||||
return new String[] {
|
||||
String.valueOf(min),
|
||||
String.valueOf(max),
|
||||
};
|
||||
}
|
||||
|
||||
}
|
@ -0,0 +1,59 @@
|
||||
// $Id$
|
||||
/*
|
||||
* WorldEdit
|
||||
* Copyright (C) 2010, 2011 sk89q <http://www.sk89q.com>
|
||||
*
|
||||
* This program is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation, either version 3 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
package com.sk89q.worldedit.cui;
|
||||
|
||||
import com.sk89q.worldedit.Vector;
|
||||
import com.sk89q.worldedit.Vector2D;
|
||||
|
||||
public class SelectionPoint2DEvent implements CUIEvent {
|
||||
|
||||
protected int id;
|
||||
protected int blockx;
|
||||
protected int blockz;
|
||||
protected int area;
|
||||
|
||||
public SelectionPoint2DEvent(int id, Vector2D pos, int area) {
|
||||
this.id = id;
|
||||
this.blockx = pos.getBlockX();
|
||||
this.blockz = pos.getBlockZ();
|
||||
this.area = area;
|
||||
}
|
||||
|
||||
public SelectionPoint2DEvent(int id, Vector pos, int area) {
|
||||
this.id = id;
|
||||
this.blockx = pos.getBlockX();
|
||||
this.blockz = pos.getBlockZ();
|
||||
this.area = area;
|
||||
}
|
||||
|
||||
public String getTypeId() {
|
||||
return "p2";
|
||||
}
|
||||
|
||||
public String[] getParameters() {
|
||||
return new String[] {
|
||||
String.valueOf(id),
|
||||
String.valueOf(blockx),
|
||||
String.valueOf(blockz),
|
||||
String.valueOf(area)
|
||||
};
|
||||
}
|
||||
|
||||
}
|
@ -150,8 +150,13 @@ public class CuboidRegionSelector implements RegionSelector, CUIPointBasedRegion
|
||||
return "cuboid";
|
||||
}
|
||||
|
||||
public Vector[] getCUIPoints() {
|
||||
return new Vector[] { pos1, pos2 };
|
||||
public void describeCUI(LocalPlayer player) {
|
||||
if (pos1 != null)
|
||||
player.dispatchCUIEvent(
|
||||
new SelectionPointEvent(0, pos1, getArea()));
|
||||
if (pos2 != null)
|
||||
player.dispatchCUIEvent(
|
||||
new SelectionPointEvent(1, pos2, getArea()));
|
||||
}
|
||||
|
||||
public int getArea() {
|
||||
|
@ -27,13 +27,18 @@ import com.sk89q.worldedit.IncompleteRegionException;
|
||||
import com.sk89q.worldedit.LocalPlayer;
|
||||
import com.sk89q.worldedit.LocalSession;
|
||||
import com.sk89q.worldedit.Vector;
|
||||
import com.sk89q.worldedit.cui.CUIPointBasedRegion;
|
||||
import com.sk89q.worldedit.cui.SelectionMinMaxEvent;
|
||||
import com.sk89q.worldedit.cui.SelectionPoint2DEvent;
|
||||
import com.sk89q.worldedit.cui.SelectionPointEvent;
|
||||
import com.sk89q.worldedit.cui.SelectionShapeEvent;
|
||||
|
||||
/**
|
||||
* Selector for polygonal regions.
|
||||
*
|
||||
* @author sk89q
|
||||
*/
|
||||
public class Polygonal2DRegionSelector implements RegionSelector {
|
||||
public class Polygonal2DRegionSelector implements RegionSelector, CUIPointBasedRegion {
|
||||
protected BlockVector pos1;
|
||||
protected Polygonal2DRegion region = new Polygonal2DRegion();
|
||||
|
||||
@ -70,14 +75,23 @@ public class Polygonal2DRegionSelector implements RegionSelector {
|
||||
public void explainPrimarySelection(LocalPlayer player,
|
||||
LocalSession session, Vector pos) {
|
||||
player.print("Starting a new polygon at " + pos + ".");
|
||||
session.dispatchCUIEvent(player, new SelectionShapeEvent(getTypeId()));
|
||||
session.dispatchCUIEvent(player, new SelectionPoint2DEvent(0, pos, getArea()));
|
||||
session.dispatchCUIEvent(player, new SelectionMinMaxEvent(region.minY, region.maxY));
|
||||
}
|
||||
|
||||
public void explainSecondarySelection(LocalPlayer player,
|
||||
LocalSession session, Vector pos) {
|
||||
player.print("Added point #" + region.size() + " at " + pos + ".");
|
||||
session.dispatchCUIEvent(player,
|
||||
new SelectionPoint2DEvent(region.size() - 1, pos, getArea()));
|
||||
session.dispatchCUIEvent(player,
|
||||
new SelectionMinMaxEvent(region.minY, region.maxY));
|
||||
}
|
||||
|
||||
public void explainRegionAdjust(LocalPlayer player, LocalSession session) {
|
||||
session.dispatchCUIEvent(player,
|
||||
new SelectionMinMaxEvent(region.minY, region.maxY));
|
||||
}
|
||||
|
||||
public BlockVector getPrimaryPosition() throws IncompleteRegionException {
|
||||
@ -136,4 +150,14 @@ public class Polygonal2DRegionSelector implements RegionSelector {
|
||||
return region.getPoints().size();
|
||||
}
|
||||
|
||||
public void describeCUI(LocalPlayer player) {
|
||||
List<BlockVector2D> points = region.getPoints();
|
||||
for (int id = 0; id < points.size(); id++) {
|
||||
player.dispatchCUIEvent(
|
||||
new SelectionPoint2DEvent(id, points.get(id), getArea()));
|
||||
}
|
||||
player.dispatchCUIEvent(
|
||||
new SelectionMinMaxEvent(region.minY, region.maxY));
|
||||
}
|
||||
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user