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

Update to Minecraft 1.16.1

Browse Source 
By: md_5 <git@md-5.net>
This commit is contained in:
CraftBukkit/Spigot
2020-06-25 10:00:00 +10:00
parent 3862d2811e
commit 50503fd516
424 changed files with 5960 additions and 5636 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
paper-server/src/main/java/org/bukkit/craftbukkit/util/Commodore.java
View File

@@ -128,7 +128,7 @@ public class Commodore
ClassReader cr = new ClassReader( b );
ClassWriter cw = new ClassWriter( cr, 0 );
cr.accept( new ClassVisitor( Opcodes.ASM7, cw )
cr.accept( new ClassVisitor( Opcodes.ASM8, cw )
{
@Override
public MethodVisitor visitMethod(int access, String name, String desc, String signature, String[] exceptions)
@@ -160,6 +160,9 @@ public class Commodore
case "WALL_SIGN":
name = "OAK_WALL_SIGN";
break;
case "ZOMBIE_PIGMAN_SPAWN_EGG":
name = "ZOMBIFIED_PIGLIN_SPAWN_EGG";
break;
}
}
@@ -216,6 +219,26 @@ public class Commodore
}
}
if ( owner.equals( "org/bukkit/block/Biome" ) )
{
switch ( name )
{
case "NETHER":
super.visitFieldInsn( opcode, owner, "NETHER_WASTES", desc );
return;
}
}
if ( owner.equals( "org/bukkit/entity/EntityType" ) )
{
switch ( name )
{
case "PIG_ZOMBIE":
super.visitFieldInsn( opcode, owner, "ZOMBIFIED_PIGLIN", desc );
return;
}
}
super.visitFieldInsn( opcode, owner, name, desc );
}

75
paper-server/src/main/java/org/bukkit/craftbukkit/util/CraftChatMessage.java
View File

@@ -5,15 +5,18 @@ import com.google.common.collect.ImmutableMap.Builder;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.Optional;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import net.minecraft.server.ChatClickable;
import net.minecraft.server.ChatClickable.EnumClickAction;
import net.minecraft.server.ChatComponentText;
import net.minecraft.server.ChatHexColor;
import net.minecraft.server.ChatMessage;
import net.minecraft.server.ChatModifier;
import net.minecraft.server.EnumChatFormat;
import net.minecraft.server.IChatBaseComponent;
import net.minecraft.server.IChatMutableComponent;
import org.bukkit.ChatColor;
public final class CraftChatMessage {
@@ -38,15 +41,16 @@ public final class CraftChatMessage {
}
private static final class StringMessage {
private static final Pattern INCREMENTAL_PATTERN = Pattern.compile("(" + String.valueOf(org.bukkit.ChatColor.COLOR_CHAR) + "[0-9a-fk-or])|((?:(?:https?):\\/\\/)?(?:[-\\w_\\.]{2,}\\.[a-z]{2,4}.*?(?=[\\.\\?!,;:]?(?:[" + String.valueOf(org.bukkit.ChatColor.COLOR_CHAR) + " \\n]|$))))|(\\n)", Pattern.CASE_INSENSITIVE);
private static final Pattern INCREMENTAL_PATTERN = Pattern.compile("(" + String.valueOf(org.bukkit.ChatColor.COLOR_CHAR) + "[0-9a-fk-orx])|((?:(?:https?):\\/\\/)?(?:[-\\w_\\.]{2,}\\.[a-z]{2,4}.*?(?=[\\.\\?!,;:]?(?:[" + String.valueOf(org.bukkit.ChatColor.COLOR_CHAR) + " \\n]|$))))|(\\n)", Pattern.CASE_INSENSITIVE);
// Separate pattern with no group 3, new lines are part of previous string
private static final Pattern INCREMENTAL_PATTERN_KEEP_NEWLINES = Pattern.compile("(" + String.valueOf(org.bukkit.ChatColor.COLOR_CHAR) + "[0-9a-fk-or])|((?:(?:https?):\\/\\/)?(?:[-\\w_\\.]{2,}\\.[a-z]{2,4}.*?(?=[\\.\\?!,;:]?(?:[" + String.valueOf(org.bukkit.ChatColor.COLOR_CHAR) + " ]|$))))", Pattern.CASE_INSENSITIVE);
private static final Pattern INCREMENTAL_PATTERN_KEEP_NEWLINES = Pattern.compile("(" + String.valueOf(org.bukkit.ChatColor.COLOR_CHAR) + "[0-9a-fk-orx])|((?:(?:https?):\\/\\/)?(?:[-\\w_\\.]{2,}\\.[a-z]{2,4}.*?(?=[\\.\\?!,;:]?(?:[" + String.valueOf(org.bukkit.ChatColor.COLOR_CHAR) + " ]|$))))", Pattern.CASE_INSENSITIVE);
private final List<IChatBaseComponent> list = new ArrayList<IChatBaseComponent>();
private IChatBaseComponent currentChatComponent = new ChatComponentText("");
private ChatModifier modifier = new ChatModifier();
private IChatMutableComponent currentChatComponent = new ChatComponentText("");
private ChatModifier modifier = ChatModifier.b;
private final IChatBaseComponent[] output;
private int currentIndex;
private StringBuilder hex;
private final String message;
private StringMessage(String message, boolean keepNewlines) {
@@ -72,29 +76,40 @@ public final class CraftChatMessage {
}
switch (groupId) {
case 1:
EnumChatFormat format = formatMap.get(match.toLowerCase(java.util.Locale.ENGLISH).charAt(1));
if (format.isFormat() && format != EnumChatFormat.RESET) {
char c = match.toLowerCase(java.util.Locale.ENGLISH).charAt(1);
EnumChatFormat format = formatMap.get(c);
if (c == 'x') {
hex = new StringBuilder("#");
} else if (hex != null) {
hex.append(c);
if (hex.length() == 7) {
modifier = modifier.setColor(ChatHexColor.a(hex.toString()));
hex = null;
}
} else if (format.isFormat() && format != EnumChatFormat.RESET) {
switch (format) {
case BOLD:
modifier.setBold(Boolean.TRUE);
modifier = modifier.setBold(Boolean.TRUE);
break;
case ITALIC:
modifier.setItalic(Boolean.TRUE);
modifier = modifier.setItalic(Boolean.TRUE);
break;
case STRIKETHROUGH:
modifier.setStrikethrough(Boolean.TRUE);
modifier = modifier.setStrikethrough(Boolean.TRUE);
break;
case UNDERLINE:
modifier.setUnderline(Boolean.TRUE);
modifier = modifier.setUnderline(Boolean.TRUE);
break;
case OBFUSCATED:
modifier.setRandom(Boolean.TRUE);
modifier = modifier.setRandom(Boolean.TRUE);
break;
default:
throw new AssertionError("Unexpected message format");
}
} else { // Color resets formatting
modifier = new ChatModifier().setColor(format);
modifier = ChatModifier.b.setColor(format);
}
needsAdd = true;
break;
@@ -102,9 +117,9 @@ public final class CraftChatMessage {
if (!(match.startsWith("http://") || match.startsWith("https://"))) {
match = "http://" + match;
}
modifier.setChatClickable(new ChatClickable(EnumClickAction.OPEN_URL, match));
modifier = modifier.setChatClickable(new ChatClickable(EnumClickAction.OPEN_URL, match));
appendNewComponent(matcher.end(groupId));
modifier.setChatClickable((ChatClickable) null);
modifier = modifier.setChatClickable((ChatClickable) null);
break;
case 3:
if (needsAdd) {
@@ -126,10 +141,6 @@ public final class CraftChatMessage {
private void appendNewComponent(int index) {
IChatBaseComponent addition = new ChatComponentText(message.substring(currentIndex, index)).setChatModifier(modifier);
currentIndex = index;
modifier = modifier.clone();
if (modifier.getColor() == EnumChatFormat.RESET) {
modifier.setColor(null);
}
if (currentChatComponent == null) {
currentChatComponent = new ChatComponentText("");
list.add(currentChatComponent);
@@ -177,13 +188,18 @@ public final class CraftChatMessage {
boolean hadFormat = false;
for (IChatBaseComponent c : component) {
ChatModifier modi = c.getChatModifier();
EnumChatFormat color = modi.getColor();
ChatHexColor color = modi.getColor();
if (!c.getText().isEmpty() || color != null) {
if (color != null) {
out.append(color);
if (color != EnumChatFormat.RESET) {
hadFormat = true;
if (color.format != null) {
out.append(color.format);
} else {
out.append(ChatColor.COLOR_CHAR).append("x");
for (char magic : color.b().substring(1).toCharArray()) {
out.append(ChatColor.COLOR_CHAR).append(magic);
}
}
hadFormat = true;
} else if (hadFormat) {
out.append(ChatColor.RESET);
hadFormat = false;
@@ -191,20 +207,28 @@ public final class CraftChatMessage {
}
if (modi.isBold()) {
out.append(EnumChatFormat.BOLD);
hadFormat = true;
}
if (modi.isItalic()) {
out.append(EnumChatFormat.ITALIC);
hadFormat = true;
}
if (modi.isUnderlined()) {
out.append(EnumChatFormat.UNDERLINE);
hadFormat = true;
}
if (modi.isStrikethrough()) {
out.append(EnumChatFormat.STRIKETHROUGH);
hadFormat = true;
}
if (modi.isRandom()) {
out.append(EnumChatFormat.OBFUSCATED);
hadFormat = true;
}
out.append(c.getText());
c.b((x) -> {
out.append(x);
return Optional.empty();
});
}
return out.toString();
}
@@ -221,7 +245,7 @@ public final class CraftChatMessage {
if (matcher.reset(msg).find()) {
matcher.reset();
ChatModifier modifier = text.getChatModifier() != null ? text.getChatModifier() : new ChatModifier();
ChatModifier modifier = text.getChatModifier();
List<IChatBaseComponent> extras = new ArrayList<IChatBaseComponent>();
List<IChatBaseComponent> extrasOld = new ArrayList<IChatBaseComponent>(text.getSiblings());
component = text = new ChatComponentText("");
@@ -239,8 +263,7 @@ public final class CraftChatMessage {
extras.add(prev);
ChatComponentText link = new ChatComponentText(matcher.group());
ChatModifier linkModi = modifier.clone();
linkModi.setChatClickable(new ChatClickable(EnumClickAction.OPEN_URL, match));
ChatModifier linkModi = modifier.setChatClickable(new ChatClickable(EnumClickAction.OPEN_URL, match));
link.setChatModifier(linkModi);
extras.add(link);

6
paper-server/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
View File

@@ -5,7 +5,7 @@ import com.google.common.base.Preconditions;
import com.google.common.collect.Maps;
import com.google.common.io.Files;
import com.mojang.brigadier.exceptions.CommandSyntaxException;
import com.mojang.datafixers.Dynamic;
import com.mojang.serialization.Dynamic;
import java.io.File;
import java.io.IOException;
import java.util.Arrays;
@@ -197,7 +197,7 @@ public final class CraftMagicNumbers implements UnsafeValues {
* @return string
*/
public String getMappingsVersion() {
return "5684afcc1835d966e1b6eb0ed3f72edb";
return "25afc67716a170ea965092c1067ff439";
}
@Override
@@ -256,7 +256,7 @@ public final class CraftMagicNumbers implements UnsafeValues {
return file.delete();
}
private static final List<String> SUPPORTED_API = Arrays.asList("1.13", "1.14", "1.15");
private static final List<String> SUPPORTED_API = Arrays.asList("1.13", "1.14", "1.15", "1.16");
@Override
public void checkSupported(PluginDescriptionFile pdf) throws InvalidPluginException {

20
paper-server/src/main/java/org/bukkit/craftbukkit/util/DummyGeneratorAccess.java
View File

@@ -10,6 +10,7 @@ import net.minecraft.server.Block;
import net.minecraft.server.BlockPosition;
import net.minecraft.server.ChunkStatus;
import net.minecraft.server.DifficultyDamageScaler;
import net.minecraft.server.DimensionManager;
import net.minecraft.server.Entity;
import net.minecraft.server.EntityHuman;
import net.minecraft.server.Fluid;
@@ -28,7 +29,6 @@ import net.minecraft.server.TileEntity;
import net.minecraft.server.World;
import net.minecraft.server.WorldBorder;
import net.minecraft.server.WorldData;
import net.minecraft.server.WorldProvider;
public class DummyGeneratorAccess implements GeneratorAccess {
@@ -37,11 +37,6 @@ public class DummyGeneratorAccess implements GeneratorAccess {
protected DummyGeneratorAccess() {
}
@Override
public long getSeed() {
throw new UnsupportedOperationException("Not supported yet.");
}
@Override
public TickList<Block> getBlockTickList() {
throw new UnsupportedOperationException("Not supported yet.");
@@ -77,11 +72,6 @@ public class DummyGeneratorAccess implements GeneratorAccess {
throw new UnsupportedOperationException("Not supported yet.");
}
@Override
public void update(BlockPosition bp, Block block) {
throw new UnsupportedOperationException("Not supported yet.");
}
@Override
public void playSound(EntityHuman eh, BlockPosition bp, SoundEffect se, SoundCategory sc, float f, float f1) {
throw new UnsupportedOperationException("Not supported yet.");
@@ -138,7 +128,7 @@ public class DummyGeneratorAccess implements GeneratorAccess {
}
@Override
public boolean p_() {
public boolean s_() {
throw new UnsupportedOperationException("Not supported yet.");
}
@@ -148,7 +138,7 @@ public class DummyGeneratorAccess implements GeneratorAccess {
}
@Override
public WorldProvider getWorldProvider() {
public DimensionManager getDimensionManager() {
throw new UnsupportedOperationException("Not supported yet.");
}
@@ -183,7 +173,7 @@ public class DummyGeneratorAccess implements GeneratorAccess {
}
@Override
public boolean setTypeAndData(BlockPosition blockposition, IBlockData iblockdata, int i) {
public boolean a(BlockPosition blockposition, IBlockData iblockdata, int i, int j) {
return false;
}
@@ -193,7 +183,7 @@ public class DummyGeneratorAccess implements GeneratorAccess {
}
@Override
public boolean a(BlockPosition blockposition, boolean flag, Entity entity) {
public boolean a(BlockPosition blockposition, boolean flag, Entity entity, int i) {
throw new UnsupportedOperationException("Not supported yet.");
}
}

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

@@ -0,0 +1,58 @@
package org.bukkit.craftbukkit.util;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.File;
import java.io.FileInputStream;
import java.io.FileOutputStream;
import java.io.IOException;
import java.util.UUID;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
public final class WorldUUID {
private static final Logger LOGGER = LogManager.getLogger();
private WorldUUID() {
}
public static UUID getUUID(File baseDir) {
File file1 = new File(baseDir, "uid.dat");
if (file1.exists()) {
DataInputStream dis = null;
try {
dis = new DataInputStream(new FileInputStream(file1));
return new UUID(dis.readLong(), dis.readLong());
} catch (IOException ex) {
LOGGER.warn("Failed to read " + file1 + ", generating new random UUID", ex);
} finally {
if (dis != null) {
try {
dis.close();
} catch (IOException ex) {
// NOOP
}
}
}
}
UUID uuid = UUID.randomUUID();
DataOutputStream dos = null;
try {
dos = new DataOutputStream(new FileOutputStream(file1));
dos.writeLong(uuid.getMostSignificantBits());
dos.writeLong(uuid.getLeastSignificantBits());
} catch (IOException ex) {
LOGGER.warn("Failed to write " + file1, ex);
} finally {
if (dos != null) {
try {
dos.close();
} catch (IOException ex) {
// NOOP
}
}
}
return uuid;
}
}