SteamWar/FastAsyncWorldEdit
9
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add cuiVersion to LocalSession and set it via incoming CUI event

Browse Source 
Refactor region selectors to handle legacy versions a bit better.
Because chat doesn't allow the section sign to be sent, I have to send non-color codes. Meh.
closes #158
This commit is contained in:
Yetanotherx
2011-12-31 23:16:39 -05:00
committed by zml2008
parent 616f9a2360
commit 3b87953da0
12 changed files with 220 additions and 129 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -34,7 +34,7 @@ import com.sk89q.worldedit.tools.SinglePickaxe;
import com.sk89q.worldedit.tools.BlockTool;
import com.sk89q.worldedit.tools.Tool;
import com.sk89q.worldedit.bags.BlockBag;
import com.sk89q.worldedit.cui.CUIPointBasedRegion;
import com.sk89q.worldedit.cui.CUIRegion;
import com.sk89q.worldedit.cui.CUIEvent;
import com.sk89q.worldedit.cui.SelectionShapeEvent;
import com.sk89q.worldedit.masks.Mask;
@@ -71,6 +71,7 @@ public class LocalSession {
private String lastScript;
private boolean beenToldVersion = false;
private boolean hasCUISupport = false;
private int cuiVersion = -1;
private boolean fastMode = false;
private Mask mask;
private TimeZone timezone = TimeZone.getDefault();
@@ -570,14 +571,34 @@ public class LocalSession {
return;
}
final String legacyTypeId = selector.getLegacyTypeId();
if (legacyTypeId != null) {
player.dispatchCUIEvent(new SelectionShapeEvent(legacyTypeId));
}
player.dispatchCUIEvent(new SelectionShapeEvent(selector.getTypeId()));
if (selector instanceof CUIRegion) {
CUIRegion tempSel = (CUIRegion) selector;
if (tempSel.getProtocolVersion() > cuiVersion) {
player.dispatchCUIEvent(new SelectionShapeEvent(tempSel.getLegacyTypeID()));
tempSel.describeLegacyCUI(this, player);
} else {
player.dispatchCUIEvent(new SelectionShapeEvent(tempSel.getTypeID()));
tempSel.describeCUI(this, player);
}
}
}
public void describeCUI(LocalPlayer player) {
if (!hasCUISupport) {
return;
}
if (selector instanceof CUIRegion) {
CUIRegion tempSel = (CUIRegion) selector;
if (tempSel.getProtocolVersion() > cuiVersion) {
tempSel.describeLegacyCUI(this, player);
} else {
tempSel.describeCUI(this, player);
}
if (selector instanceof CUIPointBasedRegion) {
((CUIPointBasedRegion) selector).describeCUI(player);
}
}
@@ -599,6 +620,24 @@ public class LocalSession {
hasCUISupport = true;
}
/**
* Gets the client's CUI protocol version
*
* @return
*/
public int getCUIVersion() {
return cuiVersion;
}
/**
* Sets the client's CUI protocol version
*
* @param CUIVersion
*/
public void setCUIVersion(int CUIVersion) {
this.cuiVersion = CUIVersion;
}
/**
* Detect date from a user's input.
*