Azimkin/CraftBukkit
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

SPIGOT-136, SPIGOT-267: Store pages as chat component to retain chat events unless a plugin touches them

Browse Source
This commit is contained in:
Thinkofdeath 2014-12-26 21:55:35 +00:00
parent 4cd8023852
commit 264d479fd8
2 changed files with 41 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBook.java
View File

@ -16,7 +16,9 @@ import org.bukkit.inventory.meta.BookMeta;
import com.google.common.base.Strings; import com.google.common.base.Strings;
import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap.Builder; import com.google.common.collect.ImmutableMap.Builder;
import java.util.AbstractList;
import net.minecraft.server.ChatSerializer; import net.minecraft.server.ChatSerializer;
import net.minecraft.server.IChatBaseComponent;
import net.minecraft.server.NBTTagString; import net.minecraft.server.NBTTagString;
import org.bukkit.craftbukkit.util.CraftChatMessage; import org.bukkit.craftbukkit.util.CraftChatMessage;
@ -27,12 +29,12 @@ class CraftMetaBook extends CraftMetaItem implements BookMeta {
static final ItemMetaKey BOOK_PAGES = new ItemMetaKey("pages"); static final ItemMetaKey BOOK_PAGES = new ItemMetaKey("pages");
static final ItemMetaKey RESOLVED = new ItemMetaKey("resolved"); static final ItemMetaKey RESOLVED = new ItemMetaKey("resolved");
static final ItemMetaKey GENERATION = new ItemMetaKey("generation"); static final ItemMetaKey GENERATION = new ItemMetaKey("generation");
static final int MAX_PAGE_LENGTH = 256; static final int MAX_PAGE_LENGTH = Short.MAX_VALUE; // TODO: Check me
static final int MAX_TITLE_LENGTH = 0xffff; static final int MAX_TITLE_LENGTH = 0xffff;
protected String title; protected String title;
protected String author; protected String author;
protected List<String> pages = new ArrayList<String>(); protected List<IChatBaseComponent> pages = new ArrayList<IChatBaseComponent>();
protected Integer generation; protected Integer generation;
CraftMetaBook(CraftMetaItem meta) { CraftMetaBook(CraftMetaItem meta) {
@ -73,21 +75,19 @@ class CraftMetaBook extends CraftMetaItem implements BookMeta {
if (tag.hasKey(BOOK_PAGES.NBT) && handlePages) { if (tag.hasKey(BOOK_PAGES.NBT) && handlePages) {
NBTTagList pages = tag.getList(BOOK_PAGES.NBT, 8); NBTTagList pages = tag.getList(BOOK_PAGES.NBT, 8);
String[] pageArray = new String[pages.size()];
for (int i = 0; i < pages.size(); i++) { for (int i = 0; i < pages.size(); i++) {
String page = pages.getString(i); String page = pages.getString(i);
if (resolved) { if (resolved) {
try { try {
page = CraftChatMessage.fromComponent(ChatSerializer.a(page)); this.pages.add(ChatSerializer.a(page));
continue;
} catch (Exception e) { } catch (Exception e) {
// Ignore and treat as an old book // Ignore and treat as an old book
} }
} }
pageArray[i] = page; addPage(page);
} }
addPage(pageArray);
} }
} }
@ -99,7 +99,11 @@ class CraftMetaBook extends CraftMetaItem implements BookMeta {
setTitle(SerializableMeta.getString(map, BOOK_TITLE.BUKKIT, true)); setTitle(SerializableMeta.getString(map, BOOK_TITLE.BUKKIT, true));
Iterable<?> pages = SerializableMeta.getObject(Iterable.class, map, BOOK_PAGES.BUKKIT, true); Iterable<?> pages = SerializableMeta.getObject(Iterable.class, map, BOOK_PAGES.BUKKIT, true);
CraftMetaItem.safelyAdd(pages, this.pages, MAX_PAGE_LENGTH); for (Object page : pages) {
if (page instanceof String) {
addPage((String) page);
}
}
generation = SerializableMeta.getObject(Integer.class, map, GENERATION.BUKKIT, true); generation = SerializableMeta.getObject(Integer.class, map, GENERATION.BUKKIT, true);
} }
@ -123,8 +127,8 @@ class CraftMetaBook extends CraftMetaItem implements BookMeta {
if (handlePages) { if (handlePages) {
if (hasPages()) { if (hasPages()) {
NBTTagList list = new NBTTagList(); NBTTagList list = new NBTTagList();
for (String page : pages) { for (IChatBaseComponent page : pages) {
list.add(new NBTTagString(page)); list.add(new NBTTagString(CraftChatMessage.fromComponent(page)));
} }
itemData.set(BOOK_PAGES.NBT, list); itemData.set(BOOK_PAGES.NBT, list);
} }
@ -195,7 +199,7 @@ class CraftMetaBook extends CraftMetaItem implements BookMeta {
public String getPage(final int page) { public String getPage(final int page) {
Validate.isTrue(isValidPage(page), "Invalid page number"); Validate.isTrue(isValidPage(page), "Invalid page number");
return pages.get(page - 1); return CraftChatMessage.fromComponent(pages.get(page - 1));
} }
public void setPage(final int page, final String text) { public void setPage(final int page, final String text) {
@ -203,7 +207,8 @@ class CraftMetaBook extends CraftMetaItem implements BookMeta {
throw new IllegalArgumentException("Invalid page number " + page + "/" + pages.size()); throw new IllegalArgumentException("Invalid page number " + page + "/" + pages.size());
} }
pages.set(page - 1, text == null ? "" : text.length() > MAX_PAGE_LENGTH ? text.substring(0, MAX_PAGE_LENGTH) : text); String newText = text == null ? "" : text.length() > MAX_PAGE_LENGTH ? text.substring(0, MAX_PAGE_LENGTH) : text;
pages.set(page - 1, CraftChatMessage.fromString(newText, true)[0]);
} }
public void setPages(final String... pages) { public void setPages(final String... pages) {
@ -220,7 +225,7 @@ class CraftMetaBook extends CraftMetaItem implements BookMeta {
page = page.substring(0, MAX_PAGE_LENGTH); page = page.substring(0, MAX_PAGE_LENGTH);
} }
this.pages.add(page); this.pages.add(CraftChatMessage.fromString(page, true)[0]);
} }
} }
@ -229,12 +234,26 @@ class CraftMetaBook extends CraftMetaItem implements BookMeta {
} }
public List<String> getPages() { public List<String> getPages() {
return ImmutableList.copyOf(pages); final List<IChatBaseComponent> copy = ImmutableList.copyOf(pages);
return new AbstractList<String>() {
@Override
public String get(int index) {
return CraftChatMessage.fromComponent(copy.get(index));
}
@Override
public int size() {
return copy.size();
}
};
} }
public void setPages(List<String> pages) { public void setPages(List<String> pages) {
this.pages.clear(); this.pages.clear();
CraftMetaItem.safelyAdd(pages, this.pages, MAX_PAGE_LENGTH); for (String page : pages) {
addPage(page);
}
} }
private boolean isValidPage(int page) { private boolean isValidPage(int page) {
@ -244,7 +263,7 @@ class CraftMetaBook extends CraftMetaItem implements BookMeta {
@Override @Override
public CraftMetaBook clone() { public CraftMetaBook clone() {
CraftMetaBook meta = (CraftMetaBook) super.clone(); CraftMetaBook meta = (CraftMetaBook) super.clone();
meta.pages = new ArrayList<String>(pages); meta.pages = new ArrayList<IChatBaseComponent>(pages);
return meta; return meta;
} }

13
src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBookSigned.java
View File

@ -14,6 +14,7 @@ import org.bukkit.inventory.meta.BookMeta;
import com.google.common.collect.ImmutableMap.Builder; import com.google.common.collect.ImmutableMap.Builder;
import net.minecraft.server.ChatSerializer; import net.minecraft.server.ChatSerializer;
import net.minecraft.server.IChatBaseComponent;
import net.minecraft.server.NBTTagString; import net.minecraft.server.NBTTagString;
import org.bukkit.craftbukkit.util.CraftChatMessage; import org.bukkit.craftbukkit.util.CraftChatMessage;
@ -34,21 +35,19 @@ class CraftMetaBookSigned extends CraftMetaBook implements BookMeta {
if (tag.hasKey(BOOK_PAGES.NBT)) { if (tag.hasKey(BOOK_PAGES.NBT)) {
NBTTagList pages = tag.getList(BOOK_PAGES.NBT, 8); NBTTagList pages = tag.getList(BOOK_PAGES.NBT, 8);
String[] pageArray = new String[pages.size()];
for (int i = 0; i < pages.size(); i++) { for (int i = 0; i < pages.size(); i++) {
String page = pages.getString(i); String page = pages.getString(i);
if (resolved) { if (resolved) {
try { try {
page = CraftChatMessage.fromComponent(ChatSerializer.a(page)); this.pages.add(ChatSerializer.a(page));
continue;
} catch (Exception e) { } catch (Exception e) {
// Ignore and treat as an old book // Ignore and treat as an old book
} }
} }
pageArray[i] = page; addPage(page);
} }
addPage(pageArray);
} }
} }
@ -74,9 +73,9 @@ class CraftMetaBookSigned extends CraftMetaBook implements BookMeta {
if (hasPages()) { if (hasPages()) {
NBTTagList list = new NBTTagList(); NBTTagList list = new NBTTagList();
for (String page : pages) { for (IChatBaseComponent page : pages) {
list.add(new NBTTagString( list.add(new NBTTagString(
ChatSerializer.a(CraftChatMessage.fromString(page, true)[0]) ChatSerializer.a(page)
)); ));
} }
itemData.set(BOOK_PAGES.NBT, list); itemData.set(BOOK_PAGES.NBT, list);