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

Update CraftBukkit to Minecraft 1.7.2

Browse Source 
By: mbax <matt@phozop.net>
This commit is contained in:
CraftBukkit/Spigot
2013-11-04 07:07:38 -06:00
parent 5961c3b788
commit 5783df9d13
63 changed files with 1137 additions and 429 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
paper-server/src/main/java/org/bukkit/craftbukkit/util/BlockStateListPopulator.java
View File

@@ -2,6 +2,9 @@ package org.bukkit.craftbukkit.util;
import java.util.ArrayList;
import java.util.List;
import net.minecraft.server.Block;
import org.bukkit.World;
import org.bukkit.block.BlockState;
@@ -18,12 +21,28 @@ public class BlockStateListPopulator {
this.list = list;
}
public void setTypeAndData(int x, int y, int z, Block block, int data, int light) {
BlockState state = world.getBlockAt(x, y, z).getState();
state.setTypeId(Block.b(block));
state.setRawData((byte) data);
list.add(state);
}
public void setTypeId(int x, int y, int z, int type) {
BlockState state = world.getBlockAt(x, y, z).getState();
state.setTypeId(type);
list.add(state);
}
public void setTypeUpdate(int x, int y, int z, Block block) {
this.setType(x, y, z, block);
}
public void setType(int x, int y, int z, Block block) {
BlockState state = world.getBlockAt(x, y, z).getState();
state.setTypeId(Block.b(block));
list.add(state);
}
public void updateList() {
for (BlockState state : list) {
state.update(true);

118
paper-server/src/main/java/org/bukkit/craftbukkit/util/CraftChatMessage.java Normal file
View File

@@ -0,0 +1,118 @@
package org.bukkit.craftbukkit.util;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import net.minecraft.server.ChatComponentText;
import net.minecraft.server.ChatModifier;
import net.minecraft.server.EnumChatFormat;
import net.minecraft.server.IChatBaseComponent;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.ImmutableMap.Builder;
public final class CraftChatMessage {
private static class FromString {
private static final Map<Character, EnumChatFormat> formatMap;
static {
Builder<Character, EnumChatFormat> builder = ImmutableMap.builder();
for (EnumChatFormat format : EnumChatFormat.values()) {
builder.put(format.getChar(), format);
}
formatMap = builder.build();
}
private final List<IChatBaseComponent> list = new ArrayList<IChatBaseComponent>();
private IChatBaseComponent currentChatComponent = new ChatComponentText("");
private ChatModifier modifier = new ChatModifier();
private StringBuilder builder = new StringBuilder();
private final IChatBaseComponent[] output;
private FromString(String message) {
if (message == null) {
output = new IChatBaseComponent[] { new ChatComponentText("") };
return;
}
EnumChatFormat format = null;
for (int i = 0; i < message.length(); i++) {
char currentChar = message.charAt(i);
if (currentChar == '\u00A7' && (i < (message.length() - 1)) && (format = formatMap.get(message.charAt(i + 1))) != null) {
if (builder.length() > 0) {
appendNewComponent();
}
if (format == EnumChatFormat.RESET) {
modifier = new ChatModifier();
} else if (format.isFormat()) {
switch (format) {
case BOLD:
modifier.setBold(Boolean.TRUE);
break;
case ITALIC:
modifier.setItalic(Boolean.TRUE);
break;
case STRIKETHROUGH:
modifier.setStrikethrough(Boolean.TRUE);
break;
case UNDERLINE:
modifier.setUnderline(Boolean.TRUE);
break;
case RANDOM:
modifier.setRandom(Boolean.TRUE);
break;
default:
throw new AssertionError("Unexpected message format");
}
} else { // Color resets formatting
modifier = new ChatModifier().setColor(format);
}
i++;
} else if (currentChar == '\n') {
if (builder.length() > 0) {
finishComponent();
}
} else {
builder.append(currentChar);
}
}
if (builder.length() > 0) {
finishComponent();
}
if (list.isEmpty()) {
list.add(new ChatComponentText(""));
}
output = list.toArray(new IChatBaseComponent[0]);
}
private void appendNewComponent() {
IChatBaseComponent addition = new ChatComponentText(builder.toString()).setChatModifier(modifier);
builder = new StringBuilder();
modifier = modifier.clone();
currentChatComponent = currentChatComponent.a(addition);
}
private void finishComponent() {
appendNewComponent();
list.add(currentChatComponent);
currentChatComponent = new ChatComponentText("");
}
private IChatBaseComponent[] getOutput() {
return output;
}
}
public static IChatBaseComponent[] fromString(String message) {
return new FromString(message).getOutput();
}
private CraftChatMessage() {
}
}

8
paper-server/src/main/java/org/bukkit/craftbukkit/util/CraftDamageSource.java
View File

@@ -9,17 +9,17 @@ public final class CraftDamageSource extends DamageSource {
// Check ignoresArmor
if (original.ignoresArmor()) {
newSource.j();
newSource.k();
}
// Check magic
if (original.q()) {
newSource.r();
if (original.s()) {
newSource.t();
}
// Check fire
if (original.c()) {
newSource.l();
newSource.n();
}
return newSource;

11
paper-server/src/main/java/org/bukkit/craftbukkit/util/CraftIconCache.java Normal file
View File

@@ -0,0 +1,11 @@
package org.bukkit.craftbukkit.util;
import org.bukkit.util.CachedServerIcon;
public class CraftIconCache implements CachedServerIcon {
public final String value;
public CraftIconCache(final String value) {
this.value = value;
}
}

70
paper-server/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java Normal file
View File

@@ -0,0 +1,70 @@
package org.bukkit.craftbukkit.util;
import net.minecraft.server.Block;
import net.minecraft.server.Blocks;
import net.minecraft.server.Item;
import org.bukkit.Material;
public final class CraftMagicNumbers {
private CraftMagicNumbers() {}
public static Block getBlock(org.bukkit.block.Block block) {
return getBlock(block.getType());
}
@Deprecated
// A bad method for bad magic.
public static Block getBlock(int id) {
return getBlock(Material.getMaterial(id));
}
@Deprecated
// A bad method for bad magic.
public static int getId(Block block) {
return Block.b(block);
}
public static Material getMaterial(Block block) {
return Material.getMaterial(Block.b(block));
}
public static Item getItem(Material material) {
// TODO: Don't use ID
Item item = Item.d(material.getId());
return item;
}
@Deprecated
// A bad method for bad magic.
public static Item getItem(int id) {
return Item.d(id);
}
@Deprecated
// A bad method for bad magic.
public static int getId(Item item) {
return Item.b(item);
}
public static Material getMaterial(Item item) {
// TODO: Don't use ID
Material material = Material.getMaterial(Item.b(item));
if (material == null) {
return Material.AIR;
}
return material;
}
public static Block getBlock(Material material) {
// TODO: Don't use ID
Block block = Block.e(material.getId());
if (block == null) {
return Blocks.AIR;
}
return block;
}
}

68
paper-server/src/main/java/org/bukkit/craftbukkit/util/Log4jConverter.java Normal file
View File

@@ -0,0 +1,68 @@
package org.bukkit.craftbukkit.util;
import java.util.EnumMap;
import java.util.HashMap;
import java.util.Map;
import java.util.logging.Handler;
import java.util.logging.Level;
import java.util.logging.LogRecord;
import java.util.logging.Logger;
public class Log4jConverter {
private static final Map<Level, org.apache.logging.log4j.Level> JULTOLOG4J = new HashMap<Level, org.apache.logging.log4j.Level>();
private static final Map<org.apache.logging.log4j.Level, Level> LOG4JTOJUL = new EnumMap<org.apache.logging.log4j.Level, Level>(org.apache.logging.log4j.Level.class);
static {
JULTOLOG4J.put(Level.ALL, org.apache.logging.log4j.Level.ALL);
JULTOLOG4J.put(Level.FINEST, org.apache.logging.log4j.Level.TRACE);
JULTOLOG4J.put(Level.FINER, org.apache.logging.log4j.Level.TRACE);
JULTOLOG4J.put(Level.FINE, org.apache.logging.log4j.Level.TRACE);
JULTOLOG4J.put(Level.INFO, org.apache.logging.log4j.Level.INFO);
JULTOLOG4J.put(Level.CONFIG, org.apache.logging.log4j.Level.INFO);
JULTOLOG4J.put(Level.WARNING, org.apache.logging.log4j.Level.WARN);
JULTOLOG4J.put(Level.SEVERE, org.apache.logging.log4j.Level.ERROR);
JULTOLOG4J.put(Level.OFF, org.apache.logging.log4j.Level.OFF);
LOG4JTOJUL.put(org.apache.logging.log4j.Level.ALL, Level.ALL);
LOG4JTOJUL.put(org.apache.logging.log4j.Level.TRACE, Level.FINE);
LOG4JTOJUL.put(org.apache.logging.log4j.Level.INFO, Level.INFO);
LOG4JTOJUL.put(org.apache.logging.log4j.Level.DEBUG, Level.INFO);
LOG4JTOJUL.put(org.apache.logging.log4j.Level.WARN, Level.WARNING);
LOG4JTOJUL.put(org.apache.logging.log4j.Level.ERROR, Level.SEVERE);
LOG4JTOJUL.put(org.apache.logging.log4j.Level.FATAL, Level.SEVERE);
LOG4JTOJUL.put(org.apache.logging.log4j.Level.OFF, Level.OFF);
}
public static org.apache.logging.log4j.Level getLog4jLevel(Level level) {
org.apache.logging.log4j.Level log4jLevel = JULTOLOG4J.get(level);
return log4jLevel == null ? org.apache.logging.log4j.Level.INFO : log4jLevel;
}
public static Level getJULLevel(org.apache.logging.log4j.Level level) {
return LOG4JTOJUL.get(level);
}
public static Logger createLogger() {
final Logger logger = Logger.getLogger("Minecraft");
// Grab a logger. It doesn't really matter which, so long as it is within net.minecraft.server.
final org.apache.logging.log4j.core.Logger log4j = (org.apache.logging.log4j.core.Logger) org.apache.logging.log4j.LogManager.getLogger("net.minecraft.server.DedicatedServer");
logger.setUseParentHandlers(false);
// Add a handler to our Bukkit Logger so that messages logged to it are sent to log4j.
Handler log4jHandler = new Handler() {
@Override
public void close() throws SecurityException {
}
@Override
public void flush() {
}
@Override
public void publish(LogRecord record) {
log4j.log(Log4jConverter.getLog4jLevel(record.getLevel()), record.getMessage());
}
};
logger.addHandler(log4jHandler);
return logger;
}
}

38
paper-server/src/main/java/org/bukkit/craftbukkit/util/TerminalConsoleHandler.java
View File

@@ -1,38 +0,0 @@
package org.bukkit.craftbukkit.util;
import java.io.IOException;
import java.util.logging.ConsoleHandler;
import java.util.logging.Level;
import java.util.logging.Logger;
import jline.console.ConsoleReader;
import org.bukkit.craftbukkit.Main;
public class TerminalConsoleHandler extends ConsoleHandler {
private final ConsoleReader reader;
public TerminalConsoleHandler(ConsoleReader reader) {
super();
this.reader = reader;
}
@Override
public synchronized void flush() {
try {
if (Main.useJline) {
reader.print(ConsoleReader.RESET_LINE + "");
reader.flush();
super.flush();
try {
reader.drawLine();
} catch (Throwable ex) {
reader.getCursorBuffer().clear();
}
reader.flush();
} else {
super.flush();
}
} catch (IOException ex) {
Logger.getLogger(TerminalConsoleHandler.class.getName()).log(Level.SEVERE, null, ex);
}
}
}

52
paper-server/src/main/java/org/bukkit/craftbukkit/util/TerminalConsoleWriterThread.java Normal file
View File

@@ -0,0 +1,52 @@
package org.bukkit.craftbukkit.util;
import java.io.IOException;
import java.io.OutputStream;
import java.util.logging.Level;
import java.util.logging.Logger;
import jline.console.ConsoleReader;
import net.minecraft.util.com.mojang.util.QueueLogAppender;
import org.bukkit.craftbukkit.Main;
public class TerminalConsoleWriterThread implements Runnable {
final private ConsoleReader reader;
final private OutputStream output;
public TerminalConsoleWriterThread(OutputStream output, ConsoleReader reader) {
this.output = output;
this.reader = reader;
}
public void run() {
String message;
// Using name from log4j config in vanilla jar
while (true) {
message = QueueLogAppender.getNextLogEvent("ServerGuiConsole");
if (message == null) {
continue;
}
try {
if (Main.useJline) {
reader.print(ConsoleReader.RESET_LINE + "");
reader.flush();
output.write(message.getBytes());
output.flush();
try {
reader.drawLine();
} catch (Throwable ex) {
reader.getCursorBuffer().clear();
}
reader.flush();
} else {
output.write(message.getBytes());
output.flush();
}
} catch (IOException ex) {
Logger.getLogger(TerminalConsoleWriterThread.class.getName()).log(Level.SEVERE, null, ex);
}
}
}
}

1
paper-server/src/main/java/org/bukkit/craftbukkit/util/WeakCollection.java
View File

@@ -8,7 +8,6 @@ import java.util.NoSuchElementException;
import org.apache.commons.lang.Validate;
public final class WeakCollection<T> implements Collection<T> {
static final Object NO_VALUE = new Object();
private final Collection<WeakReference<T>> collection;