Upstream/ViaVersion
1
0
Fork 0
mirror of https://github.com/ViaVersion/ViaVersion.git synced 2024-11-22 10:05:12 +01:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into dev

Browse Source 
# Conflicts:
#	bukkit/src/main/java/us/myles/ViaVersion/bukkit/platform/BukkitViaConfig.java
#	bungee/src/main/java/us/myles/ViaVersion/bungee/platform/BungeeViaConfig.java
#	common/src/main/java/us/myles/ViaVersion/api/ViaVersionConfig.java
#	common/src/main/resources/assets/viaversion/config.yml
#	sponge/src/main/java/us/myles/ViaVersion/sponge/platform/SpongeViaConfig.java
#	velocity/src/main/java/us/myles/ViaVersion/velocity/platform/VelocityViaConfig.java
This commit is contained in:
KennyTV 2019-10-02 16:21:37 +02:00
commit a9c49d948a
22 changed files with 353 additions and 135 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
bukkit/src/main/java/us/myles/ViaVersion/bukkit/listeners/multiversion/PlayerSneakListener.java
View File

@ -31,18 +31,24 @@ public class PlayerSneakListener extends ViaBukkitListener {
private boolean is1_14Fix; private boolean is1_14Fix;
private boolean useCache; private boolean useCache;
public PlayerSneakListener(ViaVersionPlugin plugin, boolean is1_9Fix, boolean is1_14Fix) { public PlayerSneakListener(ViaVersionPlugin plugin, boolean is1_9Fix, boolean is1_14Fix) throws ReflectiveOperationException {
super(plugin, null); super(plugin, null);
this.is1_9Fix = is1_9Fix; this.is1_9Fix = is1_9Fix;
this.is1_14Fix = is1_14Fix; this.is1_14Fix = is1_14Fix;
final String packageName = plugin.getServer().getClass().getPackage().getName();
getHandle = Class.forName(packageName + ".entity.CraftPlayer").getMethod("getHandle");
final Class<?> entityPlayerClass = Class.forName(packageName
.replace("org.bukkit.craftbukkit", "net.minecraft.server") + ".EntityPlayer");
try { try {
getHandle = Class.forName(plugin.getServer().getClass().getPackage().getName() + ".entity.CraftPlayer").getMethod("getHandle"); setSize = entityPlayerClass.getMethod("setSize", Float.TYPE, Float.TYPE);
setSize = Class.forName(plugin.getServer().getClass().getPackage().getName() } catch (NoSuchMethodException e) {
.replace("org.bukkit.craftbukkit", "net.minecraft.server") + ".EntityPlayer").getMethod("setSize", Float.TYPE, Float.TYPE); // Don't catch this one
} catch (ClassNotFoundException | NoSuchMethodException e) { setSize = entityPlayerClass.getMethod("a", Float.TYPE, Float.TYPE);
e.printStackTrace();
} }
// From 1.9 upwards the server hitbox is set in every entity tick, so we have to reset it everytime // From 1.9 upwards the server hitbox is set in every entity tick, so we have to reset it everytime
if (ProtocolRegistry.SERVER_PROTOCOL >= ProtocolVersion.v1_9.getId()) { if (ProtocolRegistry.SERVER_PROTOCOL >= ProtocolVersion.v1_9.getId()) {
sneaking = new WeakHashMap<>(); sneaking = new WeakHashMap<>();

10
bukkit/src/main/java/us/myles/ViaVersion/bukkit/platform/BukkitViaConfig.java
View File

@ -270,6 +270,16 @@ public class BukkitViaConfig extends Config implements ViaVersionConfig {
return getBoolean("change-1_14-hitbox", false); return getBoolean("change-1_14-hitbox", false);
} }
@Override
public boolean isNonFullBlockLightFix() {
return getBoolean("fix-non-full-blocklight", true);
}
@Override
public boolean is1_14HealthNaNFix() {
return getBoolean("fix-1_14-health-nan", true);
}
@Override @Override
public boolean is1_15InstantRespawn() { public boolean is1_15InstantRespawn() {
return getBoolean("use-1_15-instant-respawn", false); return getBoolean("use-1_15-instant-respawn", false);

7
bukkit/src/main/java/us/myles/ViaVersion/bukkit/platform/BukkitViaLoader.java
View File

@ -82,7 +82,12 @@ public class BukkitViaLoader implements ViaPlatformLoader {
if (ProtocolRegistry.SERVER_PROTOCOL < ProtocolVersion.v1_14.getId()) { if (ProtocolRegistry.SERVER_PROTOCOL < ProtocolVersion.v1_14.getId()) {
boolean use1_9Fix = plugin.getConf().is1_9HitboxFix() && ProtocolRegistry.SERVER_PROTOCOL < ProtocolVersion.v1_9.getId(); boolean use1_9Fix = plugin.getConf().is1_9HitboxFix() && ProtocolRegistry.SERVER_PROTOCOL < ProtocolVersion.v1_9.getId();
if (use1_9Fix || plugin.getConf().is1_14HitboxFix()) { if (use1_9Fix || plugin.getConf().is1_14HitboxFix()) {
storeListener(new PlayerSneakListener(plugin, use1_9Fix, plugin.getConf().is1_14HitboxFix())).register(); try {
storeListener(new PlayerSneakListener(plugin, use1_9Fix, plugin.getConf().is1_14HitboxFix())).register();
} catch (ReflectiveOperationException e) {
Via.getPlatform().getLogger().warning("Could not load hitbox fix - please report this on our GitHub");
e.printStackTrace();
}
} }
} }

4
bungee/src/main/java/us/myles/ViaVersion/bungee/handlers/BungeeServerHandler.java
View File

@ -66,6 +66,10 @@ public class BungeeServerHandler implements Listener {
// Set the handshake version every time someone connects to any server // Set the handshake version every time someone connects to any server
@EventHandler @EventHandler
public void onServerConnect(ServerConnectEvent e) { public void onServerConnect(ServerConnectEvent e) {
if (e.isCancelled()) {
return;
}
UserConnection user = Via.getManager().getConnection(e.getPlayer().getUniqueId()); UserConnection user = Via.getManager().getConnection(e.getPlayer().getUniqueId());
if (user == null) return; if (user == null) return;
if (!user.has(BungeeStorage.class)) { if (!user.has(BungeeStorage.class)) {

10
bungee/src/main/java/us/myles/ViaVersion/bungee/platform/BungeeViaConfig.java
View File

@ -323,6 +323,16 @@ public class BungeeViaConfig extends Config implements ViaVersionConfig {
return false; return false;
} }
@Override
public boolean isNonFullBlockLightFix() {
return getBoolean("fix-non-full-blocklight", true);
}
@Override
public boolean is1_14HealthNaNFix() {
return getBoolean("fix-1_14-health-nan", true);
}
@Override @Override
public boolean is1_15InstantRespawn() { public boolean is1_15InstantRespawn() {
return getBoolean("use-1_15-instant-respawn", false); return getBoolean("use-1_15-instant-respawn", false);

9
common/src/main/java/us/myles/ViaVersion/api/ViaVersionConfig.java
View File

@ -338,6 +338,15 @@ public interface ViaVersionConfig {
*/ */
boolean is1_14HitboxFix(); boolean is1_14HitboxFix();
/**
* Fixes non full blocks having 0 light for 1.14+ clients on sub 1.14 servers.
*
* @return True if enabled
*/
boolean isNonFullBlockLightFix();
boolean is1_14HealthNaNFix();
/** /**
* Should 1.15 clients respawn instantly / without showing the death screen * Should 1.15 clients respawn instantly / without showing the death screen
* *

10
common/src/main/java/us/myles/ViaVersion/api/minecraft/chunks/ChunkSection.java
View File

@ -175,10 +175,18 @@ public class ChunkSection {
return blockLight == null ? null : blockLight.getHandle(); return blockLight == null ? null : blockLight.getHandle();
} }
public NibbleArray getBlockLightNibbleArray() {
return blockLight;
}
public byte[] getSkyLight() { public byte[] getSkyLight() {
return skyLight == null ? null : skyLight.getHandle(); return skyLight == null ? null : skyLight.getHandle();
} }
public NibbleArray getSkyLightNibbleArray() {
return skyLight;
}
public void readBlockLight(ByteBuf input) { public void readBlockLight(ByteBuf input) {
if (this.blockLight == null) { if (this.blockLight == null) {
this.blockLight = new NibbleArray(LIGHT_LENGTH * 2); this.blockLight = new NibbleArray(LIGHT_LENGTH * 2);
@ -193,7 +201,7 @@ public class ChunkSection {
input.readBytes(this.skyLight.getHandle()); input.readBytes(this.skyLight.getHandle());
} }
private static int index(int x, int y, int z) { public static int index(int x, int y, int z) {
return y << 8 | z << 4 | x; return y << 8 | z << 4 | x;
} }

4
common/src/main/java/us/myles/ViaVersion/api/minecraft/chunks/NibbleArray.java
View File

@ -30,7 +30,7 @@ public class NibbleArray {
* @return The value at the given XYZ * @return The value at the given XYZ
*/ */
public byte get(int x, int y, int z) { public byte get(int x, int y, int z) {
return get(y << 8 | z << 4 | x); return get(ChunkSection.index(x, y, z));
} }
/** /**
@ -57,7 +57,7 @@ public class NibbleArray {
* @param value Desired Value * @param value Desired Value
*/ */
public void set(int x, int y, int z, int value) { public void set(int x, int y, int z, int value) {
set(y << 8 | z << 4 | x, value); set(ChunkSection.index(x, y, z), value);
} }
/** /**

47
common/src/main/java/us/myles/ViaVersion/protocols/protocol1_11to1_10/Protocol1_11To1_10.java
View File

@ -378,34 +378,33 @@ public class Protocol1_11To1_10 extends Protocol {
}); });
} }
private int getNewSoundId(int id) { //TODO Make it better, suggestions are welcome. It's ugly and hardcoded now. private int getNewSoundId(int id) {
if (id == 196) // Experience orb sound got removed if (id == 196) // Experience orb sound got removed
return -1; return -1;
int newId = id; if (id >= 85) // Shulker boxes
if (id >= 85) // Hello shulker boxes id += 2;
newId += 2; if (id >= 176) // Guardian flop
if (id >= 174) // Hello Guardian flop id += 1;
newId += 1; if (id >= 197) // evocation things
if (id >= 194) // Hello evocation things id += 8;
newId += 8;
if (id >= 196) // Rip the Experience orb touch sound :'( if (id >= 196) // Rip the Experience orb touch sound :'(
newId -= 1; id -= 1;
if (id >= 269) // Hello Liama's if (id >= 279) // Liama's
newId += 9; id += 9;
if (id >= 277) // Hello Mule chest if (id >= 296) // Mule chest
newId += 1; id += 1;
if (id >= 370) // Hello Vex if (id >= 390) // Vex
newId += 4; id += 4;
if (id >= 376) // Hello vindication if (id >= 400) // vindication
newId += 3; id += 3;
if (id >= 423) // Equip Elytra if (id >= 450) // Elytra
newId += 1; id += 1;
if (id >= 427) // Hello empty bottle if (id >= 455) // Empty bottle
newId += 1; id += 1;
if (id >= 441) // Hello item totem use if (id >= 470) // Totem use
newId += 1; id += 1;
return newId; return id;
} }

12
common/src/main/java/us/myles/ViaVersion/protocols/protocol1_13to1_12_2/packets/InventoryPackets.java
View File

@ -513,8 +513,12 @@ public class InventoryPackets {
return "wdl:request"; return "wdl:request";
case "bungeecord:main": case "bungeecord:main":
return null; return null;
case "FML|MP":
return "fml:mp";
case "FML|HS":
return "fml:hs";
default: default:
return old.matches("([0-9a-z_.-]*:)?[0-9a-z_/.-]*") // Identifier regex return old.matches("([0-9a-z_.-]+):([0-9a-z_/.-]+)") // Identifier regex
? old : null; ? old : null;
} }
} }
@ -719,7 +723,7 @@ public class InventoryPackets {
} }
public static String getOldPluginChannelId(String newId) { public static String getOldPluginChannelId(String newId) {
if (!newId.matches("([0-9a-z_.-]*:)?[0-9a-z_/.-]*")) { if (!newId.matches("([0-9a-z_.-]+):([0-9a-z_/.-]+)")) {
return null; // Not valid return null; // Not valid
} }
int separatorIndex = newId.indexOf(':'); int separatorIndex = newId.indexOf(':');
@ -750,6 +754,10 @@ public class InventoryPackets {
return "WDL|CONTROL"; return "WDL|CONTROL";
case "wdl:request": case "wdl:request":
return "WDL|REQUEST"; return "WDL|REQUEST";
case "fml:hs":
return "FML|HS";
case "fml:mp":
return "FML:MP";
default: default:
return newId.length() > 20 ? newId.substring(0, 20) : newId; return newId.length() > 20 ? newId.substring(0, 20) : newId;
} }

16
common/src/main/java/us/myles/ViaVersion/protocols/protocol1_14_1to1_14/Protocol1_14_1To1_14.java
View File

@ -7,13 +7,13 @@ import us.myles.ViaVersion.protocols.protocol1_14_1to1_14.storage.EntityTracker;
public class Protocol1_14_1To1_14 extends Protocol { public class Protocol1_14_1To1_14 extends Protocol {
@Override @Override
protected void registerPackets() { protected void registerPackets() {
EntityPackets.register(this); EntityPackets.register(this);
} }
@Override @Override
public void init(UserConnection userConnection) { public void init(UserConnection userConnection) {
userConnection.put(new EntityTracker(userConnection)); userConnection.put(new EntityTracker(userConnection));
} }
} }

160
common/src/main/java/us/myles/ViaVersion/protocols/protocol1_14_1to1_14/packets/EntityPackets.java
View File

@ -14,88 +14,104 @@ import us.myles.ViaVersion.protocols.protocol1_14_1to1_14.storage.EntityTracker;
public class EntityPackets { public class EntityPackets {
public static void register(Protocol protocol) { public static void register(Protocol protocol) {
// Spawn Mob // Spawn Mob
protocol.registerOutgoing(State.PLAY, 0x03, 0x03, new PacketRemapper() { protocol.registerOutgoing(State.PLAY, 0x03, 0x03, new PacketRemapper() {
@Override @Override
public void registerMap() { public void registerMap() {
map(Type.VAR_INT); // 0 - Entity ID map(Type.VAR_INT); // 0 - Entity ID
map(Type.UUID); // 1 - Entity UUID map(Type.UUID); // 1 - Entity UUID
map(Type.VAR_INT); // 2 - Entity Type map(Type.VAR_INT); // 2 - Entity Type
map(Type.DOUBLE); // 3 - X map(Type.DOUBLE); // 3 - X
map(Type.DOUBLE); // 4 - Y map(Type.DOUBLE); // 4 - Y
map(Type.DOUBLE); // 5 - Z map(Type.DOUBLE); // 5 - Z
map(Type.BYTE); // 6 - Yaw map(Type.BYTE); // 6 - Yaw
map(Type.BYTE); // 7 - Pitch map(Type.BYTE); // 7 - Pitch
map(Type.BYTE); // 8 - Head Pitch map(Type.BYTE); // 8 - Head Pitch
map(Type.SHORT); // 9 - Velocity X map(Type.SHORT); // 9 - Velocity X
map(Type.SHORT); // 10 - Velocity Y map(Type.SHORT); // 10 - Velocity Y
map(Type.SHORT); // 11 - Velocity Z map(Type.SHORT); // 11 - Velocity Z
map(Types1_14.METADATA_LIST); // 12 - Metadata map(Types1_14.METADATA_LIST); // 12 - Metadata
handler(new PacketHandler() { handler(new PacketHandler() {
@Override @Override
public void handle(PacketWrapper wrapper) throws Exception { public void handle(PacketWrapper wrapper) throws Exception {
int entityId = wrapper.get(Type.VAR_INT, 0); int entityId = wrapper.get(Type.VAR_INT, 0);
int type = wrapper.get(Type.VAR_INT, 1); int type = wrapper.get(Type.VAR_INT, 1);
Entity1_14Types.EntityType entType = Entity1_14Types.getTypeFromId(type); Entity1_14Types.EntityType entType = Entity1_14Types.getTypeFromId(type);
// Register Type ID // Register Type ID
wrapper.user().get(EntityTracker.class).addEntity(entityId, entType); wrapper.user().get(EntityTracker.class).addEntity(entityId, entType);
MetadataRewriter.handleMetadata(entityId, entType, wrapper.get(Types1_14.METADATA_LIST, 0), wrapper.user()); MetadataRewriter.handleMetadata(entityId, entType, wrapper.get(Types1_14.METADATA_LIST, 0), wrapper.user());
} }
}); });
} }
}); });
// Spawn Player // Spawn Player
protocol.registerOutgoing(State.PLAY, 0x05, 0x05, new PacketRemapper() { protocol.registerOutgoing(State.PLAY, 0x05, 0x05, new PacketRemapper() {
@Override @Override
public void registerMap() { public void registerMap() {
map(Type.VAR_INT); // 0 - Entity ID map(Type.VAR_INT); // 0 - Entity ID
map(Type.UUID); // 1 - Player UUID map(Type.UUID); // 1 - Player UUID
map(Type.DOUBLE); // 2 - X map(Type.DOUBLE); // 2 - X
map(Type.DOUBLE); // 3 - Y map(Type.DOUBLE); // 3 - Y
map(Type.DOUBLE); // 4 - Z map(Type.DOUBLE); // 4 - Z
map(Type.BYTE); // 5 - Yaw map(Type.BYTE); // 5 - Yaw
map(Type.BYTE); // 6 - Pitch map(Type.BYTE); // 6 - Pitch
map(Types1_14.METADATA_LIST); // 7 - Metadata map(Types1_14.METADATA_LIST); // 7 - Metadata
handler(new PacketHandler() { handler(new PacketHandler() {
@Override @Override
public void handle(PacketWrapper wrapper) throws Exception { public void handle(PacketWrapper wrapper) throws Exception {
int entityId = wrapper.get(Type.VAR_INT, 0); int entityId = wrapper.get(Type.VAR_INT, 0);
Entity1_14Types.EntityType entType = Entity1_14Types.EntityType.PLAYER; Entity1_14Types.EntityType entType = Entity1_14Types.EntityType.PLAYER;
// Register Type ID // Register Type ID
wrapper.user().get(EntityTracker.class).addEntity(entityId, entType); wrapper.user().get(EntityTracker.class).addEntity(entityId, entType);
MetadataRewriter.handleMetadata(entityId, entType, wrapper.get(Types1_14.METADATA_LIST, 0), wrapper.user()); MetadataRewriter.handleMetadata(entityId, entType, wrapper.get(Types1_14.METADATA_LIST, 0), wrapper.user());
} }
}); });
} }
}); });
// Entity Metadata // Destroy entities
protocol.registerOutgoing(State.PLAY, 0x43, 0x43, new PacketRemapper() { protocol.registerOutgoing(State.PLAY, 0x37, 0x37, new PacketRemapper() {
@Override @Override
public void registerMap() { public void registerMap() {
map(Type.VAR_INT); // 0 - Entity ID map(Type.VAR_INT_ARRAY); // 0 - Entity ids
map(Types1_14.METADATA_LIST); // 1 - Metadata list handler(new PacketHandler() {
@Override
public void handle(PacketWrapper wrapper) throws Exception {
for (int entity : wrapper.get(Type.VAR_INT_ARRAY, 0)) {
wrapper.user().get(EntityTracker.class).removeEntity(entity);
}
}
});
}
});
handler(new PacketHandler() { // Entity Metadata
@Override protocol.registerOutgoing(State.PLAY, 0x43, 0x43, new PacketRemapper() {
public void handle(PacketWrapper wrapper) throws Exception { @Override
int entityId = wrapper.get(Type.VAR_INT, 0); public void registerMap() {
map(Type.VAR_INT); // 0 - Entity ID
map(Types1_14.METADATA_LIST); // 1 - Metadata list
Optional<Entity1_14Types.EntityType> type = wrapper.user().get(EntityTracker.class).get(entityId); handler(new PacketHandler() {
MetadataRewriter.handleMetadata(entityId, type.orNull(), wrapper.get(Types1_14.METADATA_LIST, 0), wrapper.user()); @Override
} public void handle(PacketWrapper wrapper) throws Exception {
}); int entityId = wrapper.get(Type.VAR_INT, 0);
}
}); Optional<Entity1_14Types.EntityType> type = wrapper.user().get(EntityTracker.class).get(entityId);
} MetadataRewriter.handleMetadata(entityId, type.orNull(), wrapper.get(Types1_14.METADATA_LIST, 0), wrapper.user());
}
});
}
});
}
} }

6
common/src/main/java/us/myles/ViaVersion/protocols/protocol1_14to1_13_2/MetadataRewriter.java
View File

@ -39,6 +39,12 @@ public class MetadataRewriter {
if (metadata.getId() > 5) { if (metadata.getId() > 5) {
metadata.setId(metadata.getId() + 1); metadata.setId(metadata.getId() + 1);
} }
if (metadata.getId() == 8 && type.isOrHasParent(Entity1_14Types.EntityType.LIVINGENTITY)) {
final float v = ((Number) metadata.getValue()).floatValue();
if (Float.isNaN(v) && Via.getConfig().is1_14HealthNaNFix()) {
metadata.setValue(1F);
}
}
//Metadata 12 added to living_entity //Metadata 12 added to living_entity
if (metadata.getId() > 11 && type.isOrHasParent(Entity1_14Types.EntityType.LIVINGENTITY)) { if (metadata.getId() > 11 && type.isOrHasParent(Entity1_14Types.EntityType.LIVINGENTITY)) {

1
common/src/main/java/us/myles/ViaVersion/protocols/protocol1_14to1_13_2/Protocol1_14To1_13_2.java
View File

@ -323,6 +323,5 @@ public class Protocol1_14To1_13_2 extends Protocol {
userConnection.put(new EntityTracker(userConnection)); userConnection.put(new EntityTracker(userConnection));
if (!userConnection.has(ClientWorld.class)) if (!userConnection.has(ClientWorld.class))
userConnection.put(new ClientWorld(userConnection)); userConnection.put(new ClientWorld(userConnection));
} }
} }

20
common/src/main/java/us/myles/ViaVersion/protocols/protocol1_14to1_13_2/data/MappingData.java
View File

@ -11,11 +11,7 @@ import us.myles.ViaVersion.util.GsonUtil;
import java.io.IOException; import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
import java.io.InputStreamReader; import java.io.InputStreamReader;
import java.util.Arrays; import java.util.*;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Map;
import java.util.Set;
public class MappingData { public class MappingData {
public static BiMap<Integer, Integer> oldToNewItems = HashBiMap.create(); public static BiMap<Integer, Integer> oldToNewItems = HashBiMap.create();
@ -23,6 +19,7 @@ public class MappingData {
public static BlockMappings blockMappings; public static BlockMappings blockMappings;
public static SoundMappings soundMappings; public static SoundMappings soundMappings;
public static Set<Integer> motionBlocking; public static Set<Integer> motionBlocking;
public static Set<Integer> nonFullBlocks;
public static void init() { public static void init() {
JsonObject mapping1_13_2 = loadData("mapping-1.13.2.json"); JsonObject mapping1_13_2 = loadData("mapping-1.13.2.json");
@ -57,6 +54,19 @@ public class MappingData {
MappingData.motionBlocking.add(id); MappingData.motionBlocking.add(id);
} }
} }
if (Via.getConfig().isNonFullBlockLightFix()) {
nonFullBlocks = new HashSet<>();
for (Map.Entry<String, JsonElement> blockstates : mapping1_13_2.getAsJsonObject("blockstates").entrySet()) {
final String state = blockstates.getValue().getAsString();
if (state.contains("_slab") || state.contains("_stairs") || state.contains("_wall["))
nonFullBlocks.add(blockStateMappings.getNewBlock(Integer.parseInt(blockstates.getKey())));
}
nonFullBlocks.add(blockStateMappings.getNewBlock(8163)); // grass path
for (int i = 3060; i <= 3067; i++) { // farmland
nonFullBlocks.add(blockStateMappings.getNewBlock(i));
}
}
} }
public static JsonObject loadData(String name) { public static JsonObject loadData(String name) {

110
common/src/main/java/us/myles/ViaVersion/protocols/protocol1_14to1_13_2/packets/WorldPackets.java
View File

@ -2,12 +2,15 @@ package us.myles.ViaVersion.protocols.protocol1_14to1_13_2.packets;
import com.github.steveice10.opennbt.tag.builtin.CompoundTag; import com.github.steveice10.opennbt.tag.builtin.CompoundTag;
import com.github.steveice10.opennbt.tag.builtin.LongArrayTag; import com.github.steveice10.opennbt.tag.builtin.LongArrayTag;
import com.google.common.primitives.Bytes;
import us.myles.ViaVersion.api.PacketWrapper; import us.myles.ViaVersion.api.PacketWrapper;
import us.myles.ViaVersion.api.Via;
import us.myles.ViaVersion.api.data.UserConnection;
import us.myles.ViaVersion.api.entities.Entity1_14Types; import us.myles.ViaVersion.api.entities.Entity1_14Types;
import us.myles.ViaVersion.api.minecraft.BlockChangeRecord; import us.myles.ViaVersion.api.minecraft.BlockChangeRecord;
import us.myles.ViaVersion.api.minecraft.BlockFace;
import us.myles.ViaVersion.api.minecraft.chunks.Chunk; import us.myles.ViaVersion.api.minecraft.chunks.Chunk;
import us.myles.ViaVersion.api.minecraft.chunks.ChunkSection; import us.myles.ViaVersion.api.minecraft.chunks.ChunkSection;
import us.myles.ViaVersion.api.minecraft.chunks.NibbleArray;
import us.myles.ViaVersion.api.protocol.Protocol; import us.myles.ViaVersion.api.protocol.Protocol;
import us.myles.ViaVersion.api.remapper.PacketHandler; import us.myles.ViaVersion.api.remapper.PacketHandler;
import us.myles.ViaVersion.api.remapper.PacketRemapper; import us.myles.ViaVersion.api.remapper.PacketRemapper;
@ -29,7 +32,7 @@ public class WorldPackets {
private static final int VOID_AIR = MappingData.blockStateMappings.getNewBlock(8591); private static final int VOID_AIR = MappingData.blockStateMappings.getNewBlock(8591);
private static final int CAVE_AIR = MappingData.blockStateMappings.getNewBlock(8592); private static final int CAVE_AIR = MappingData.blockStateMappings.getNewBlock(8592);
public static final int SERVERSIDE_VIEW_DISTANCE = 64; public static final int SERVERSIDE_VIEW_DISTANCE = 64;
private static final byte[] FULL_LIGHT = new byte[2048]; private static final Byte[] FULL_LIGHT = new Byte[2048];
static { static {
Arrays.fill(FULL_LIGHT, (byte) 0xff); Arrays.fill(FULL_LIGHT, (byte) 0xff);
@ -164,6 +167,7 @@ public class WorldPackets {
for (int s = 0; s < 16; s++) { for (int s = 0; s < 16; s++) {
ChunkSection section = chunk.getSections()[s]; ChunkSection section = chunk.getSections()[s];
if (section == null) continue; if (section == null) continue;
boolean hasBlock = false; boolean hasBlock = false;
for (int i = 0; i < section.getPaletteSize(); i++) { for (int i = 0; i < section.getPaletteSize(); i++) {
int old = section.getPaletteEntry(i); int old = section.getPaletteEntry(i);
@ -177,6 +181,7 @@ public class WorldPackets {
section.setNonAirBlocksCount(0); section.setNonAirBlocksCount(0);
continue; continue;
} }
int nonAirBlockCount = 0; int nonAirBlockCount = 0;
for (int x = 0; x < 16; x++) { for (int x = 0; x < 16; x++) {
for (int y = 0; y < 16; y++) { for (int y = 0; y < 16; y++) {
@ -189,9 +194,15 @@ public class WorldPackets {
if (MappingData.motionBlocking.contains(id)) { if (MappingData.motionBlocking.contains(id)) {
motionBlocking[x + z * 16] = y + s * 16 + 2; // Should be +1 (top of the block) but +2 works :tm: motionBlocking[x + z * 16] = y + s * 16 + 2; // Should be +1 (top of the block) but +2 works :tm:
} }
// Manually update light for non full blocks (block light must not be sent)
if (Via.getConfig().isNonFullBlockLightFix() && MappingData.nonFullBlocks.contains(id)) {
setNonFullLight(chunk, section, s, x, y, z);
}
} }
} }
} }
section.setNonAirBlocksCount(nonAirBlockCount); section.setNonAirBlocksCount(nonAirBlockCount);
} }
@ -223,22 +234,22 @@ public class WorldPackets {
// not sending skylight/setting empty skylight causes client lag due to some weird calculations // not sending skylight/setting empty skylight causes client lag due to some weird calculations
// only do this on the initial chunk send (not when chunk.isGroundUp() is false) // only do this on the initial chunk send (not when chunk.isGroundUp() is false)
if (chunk.isGroundUp()) if (chunk.isGroundUp())
lightPacket.write(Type.BYTE_ARRAY, Bytes.asList(FULL_LIGHT).toArray(new Byte[0])); // chunk below 0 lightPacket.write(Type.BYTE_ARRAY, FULL_LIGHT); // chunk below 0
for (ChunkSection section : chunk.getSections()) { for (ChunkSection section : chunk.getSections()) {
if (section == null || !section.hasSkyLight()) { if (section == null || !section.hasSkyLight()) {
if (chunk.isGroundUp()) { if (chunk.isGroundUp()) {
lightPacket.write(Type.BYTE_ARRAY, Bytes.asList(FULL_LIGHT).toArray(new Byte[0])); lightPacket.write(Type.BYTE_ARRAY, FULL_LIGHT);
} }
continue; continue;
} }
lightPacket.write(Type.BYTE_ARRAY, Bytes.asList(section.getSkyLight()).toArray(new Byte[0])); lightPacket.write(Type.BYTE_ARRAY, fromPrimitiveArray(section.getSkyLight()));
} }
if (chunk.isGroundUp()) if (chunk.isGroundUp())
lightPacket.write(Type.BYTE_ARRAY, Bytes.asList(FULL_LIGHT).toArray(new Byte[0])); // chunk above 255 lightPacket.write(Type.BYTE_ARRAY, FULL_LIGHT); // chunk above 255
for (ChunkSection section : chunk.getSections()) { for (ChunkSection section : chunk.getSections()) {
if (section == null) continue; if (section == null) continue;
lightPacket.write(Type.BYTE_ARRAY, Bytes.asList(section.getBlockLight()).toArray(new Byte[0])); lightPacket.write(Type.BYTE_ARRAY, fromPrimitiveArray(section.getBlockLight()));
} }
EntityTracker entityTracker = wrapper.user().get(EntityTracker.class); EntityTracker entityTracker = wrapper.user().get(EntityTracker.class);
@ -257,6 +268,14 @@ public class WorldPackets {
lightPacket.send(Protocol1_14To1_13_2.class, true, true); lightPacket.send(Protocol1_14To1_13_2.class, true, true);
} }
private Byte[] fromPrimitiveArray(byte[] bytes) {
Byte[] newArray = new Byte[bytes.length];
for (int i = 0; i < bytes.length; i++) {
newArray[i] = bytes[i];
}
return newArray;
}
}); });
} }
}); });
@ -437,4 +456,81 @@ public class WorldPackets {
return data; return data;
} }
private static void setNonFullLight(Chunk chunk, ChunkSection section, int ySection, int x, int y, int z) {
int skyLight = 0;
int blockLight = 0;
for (BlockFace blockFace : BlockFace.values()) {
NibbleArray skyLightArray = section.getSkyLightNibbleArray();
NibbleArray blockLightArray = section.getBlockLightNibbleArray();
int neighbourX = x + blockFace.getModX();
int neighbourY = y + blockFace.getModY();
int neighbourZ = z + blockFace.getModZ();
if (blockFace.getModX() != 0) {
// Another chunk, nothing we can do without an unnecessary amount of caching
if (neighbourX == 16 || neighbourX == -1) continue;
} else if (blockFace.getModY() != 0) {
if (neighbourY == 16 || neighbourY == -1) {
if (neighbourY == 16) {
ySection += 1;
neighbourY = 0;
} else {
ySection -= 1;
neighbourY = 15;
}
if (ySection == 16 || ySection == -1) continue;
ChunkSection newSection = chunk.getSections()[ySection];
if (newSection == null) continue;
skyLightArray = newSection.getSkyLightNibbleArray();
blockLightArray = newSection.getBlockLightNibbleArray();
}
} else if (blockFace.getModZ() != 0) {
// Another chunk, nothing we can do without an unnecessary amount of caching
if (neighbourZ == 16 || neighbourZ == -1) continue;
}
if (blockLightArray != null && blockLight != 15) {
int neighbourBlockLight = blockLightArray.get(neighbourX, neighbourY, neighbourZ);
if (neighbourBlockLight == 15) {
blockLight = 14;
} else if (neighbourBlockLight > blockLight) {
blockLight = neighbourBlockLight - 1; // lower light level by one
}
}
if (skyLightArray != null && skyLight != 15) {
int neighbourSkyLight = skyLightArray.get(neighbourX, neighbourY, neighbourZ);
if (neighbourSkyLight == 15) {
if (blockFace.getModY() == 1) {
// Keep 15 if block is exposed to sky
skyLight = 15;
continue;
}
skyLight = 14;
} else if (neighbourSkyLight > skyLight) {
skyLight = neighbourSkyLight - 1; // lower light level by one
}
}
}
if (skyLight != 0) {
if (!section.hasSkyLight()) {
byte[] newSkyLight = new byte[2028];
section.setSkyLight(newSkyLight);
}
section.getSkyLightNibbleArray().set(x, y, z, skyLight);
}
if (blockLight != 0) {
section.getBlockLightNibbleArray().set(x, y, z, blockLight);
}
}
private static long getChunkIndex(int x, int z) {
return ((x & 0x3FFFFFFL) << 38) | (z & 0x3FFFFFFL);
}
} }

10
common/src/main/java/us/myles/ViaVersion/protocols/protocol1_9to1_8/packets/EntityPackets.java
View File

@ -140,7 +140,15 @@ public class EntityPackets {
// 1 - Slot ID // 1 - Slot ID
map(Type.SHORT, new ValueTransformer<Short, Integer>(Type.VAR_INT) { map(Type.SHORT, new ValueTransformer<Short, Integer>(Type.VAR_INT) {
@Override @Override
public Integer transform(PacketWrapper wrapper, Short slot) { public Integer transform(PacketWrapper wrapper, Short slot) throws Exception {
int entityId = wrapper.get(Type.VAR_INT, 0);
int receiverId = wrapper.user().get(EntityTracker.class).getEntityID();
// Normally, 0 = hand and 1-4 = armor
// ... but if the sent id is equal to the receiver's id, 0-3 will instead mark the armor slots
// (In 1.9+, every client treats the received the same: 0=hand, 1=offhand, 2-5=armor)
if (entityId == receiverId) {
return slot.intValue() + 2;
}
return slot > 0 ? slot.intValue() + 1 : slot.intValue(); return slot > 0 ? slot.intValue() + 1 : slot.intValue();
} }
}); });

4
common/src/main/java/us/myles/ViaVersion/protocols/protocol1_9to1_8/sounds/SoundEffect.java
View File

@ -15,7 +15,7 @@ public enum SoundEffect {
DIG_GRAVEL("dig.gravel", "block.gravel.place", SoundCategory.BLOCK), DIG_GRAVEL("dig.gravel", "block.gravel.place", SoundCategory.BLOCK),
RANDOM_BOWHIT("random.bowhit", "block.tripwire.detach", SoundCategory.NEUTRAL), RANDOM_BOWHIT("random.bowhit", "block.tripwire.detach", SoundCategory.NEUTRAL),
DIG_GLASS("dig.glass", "block.glass.break", SoundCategory.BLOCK), DIG_GLASS("dig.glass", "block.glass.break", SoundCategory.BLOCK),
MOB_ZOMBIE_SAY("mob.zombie.say", "entity.zombie_villager.ambient", SoundCategory.HOSTILE), MOB_ZOMBIE_SAY("mob.zombie.say", "entity.zombie.ambient", SoundCategory.HOSTILE),
MOB_PIG_DEATH("mob.pig.death", "entity.pig.death", SoundCategory.NEUTRAL), MOB_PIG_DEATH("mob.pig.death", "entity.pig.death", SoundCategory.NEUTRAL),
MOB_HORSE_DONKEY_HIT("mob.horse.donkey.hit", "entity.donkey.hurt", SoundCategory.NEUTRAL), MOB_HORSE_DONKEY_HIT("mob.horse.donkey.hit", "entity.donkey.hurt", SoundCategory.NEUTRAL),
GAME_NEUTRAL_SWIM("game.neutral.swim", "entity.player.swim", SoundCategory.NEUTRAL), GAME_NEUTRAL_SWIM("game.neutral.swim", "entity.player.swim", SoundCategory.NEUTRAL),
@ -207,7 +207,7 @@ public enum SoundEffect {
MOB_MAGMACUBE_SMALL("mob.magmacube.small", "entity.small_magmacube.squish", SoundCategory.HOSTILE), MOB_MAGMACUBE_SMALL("mob.magmacube.small", "entity.small_magmacube.squish", SoundCategory.HOSTILE),
FIRE_IGNITE("fire.ignite", "item.flintandsteel.use", SoundCategory.BLOCK, true), FIRE_IGNITE("fire.ignite", "item.flintandsteel.use", SoundCategory.BLOCK, true),
MOB_ENDERDRAGON_HIT("mob.enderdragon.hit", "entity.enderdragon.hurt", SoundCategory.HOSTILE), MOB_ENDERDRAGON_HIT("mob.enderdragon.hit", "entity.enderdragon.hurt", SoundCategory.HOSTILE),
MOB_ZOMBIE_HURT("mob.zombie.hurt", "entity.zombie_villager.hurt", SoundCategory.HOSTILE), MOB_ZOMBIE_HURT("mob.zombie.hurt", "entity.zombie.hurt", SoundCategory.HOSTILE),
RANDOM_EXPLODE("random.explode", "block.end_gateway.spawn", SoundCategory.BLOCK), RANDOM_EXPLODE("random.explode", "block.end_gateway.spawn", SoundCategory.BLOCK),
MOB_SLIME_ATTACK("mob.slime.attack", "entity.slime.attack", SoundCategory.HOSTILE), MOB_SLIME_ATTACK("mob.slime.attack", "entity.slime.attack", SoundCategory.HOSTILE),
MOB_MAGMACUBE_JUMP("mob.magmacube.jump", "entity.magmacube.jump", SoundCategory.HOSTILE), MOB_MAGMACUBE_JUMP("mob.magmacube.jump", "entity.magmacube.jump", SoundCategory.HOSTILE),

4
common/src/main/resources/assets/viaversion/config.yml
View File

@ -126,6 +126,10 @@ change-1_9-hitbox: false
# WARNING: This gives 1.14+ players the ability to sneak under blocks, that players under that version cannot (sneaking in places that are only 1.5 blocks high)! # WARNING: This gives 1.14+ players the ability to sneak under blocks, that players under that version cannot (sneaking in places that are only 1.5 blocks high)!
# Another thing to remember is that those players might be missed by projectiles and other hits directed at the very top of their head whilst sneaking. # Another thing to remember is that those players might be missed by projectiles and other hits directed at the very top of their head whilst sneaking.
change-1_14-hitbox: false change-1_14-hitbox: false
# Fixes 1.14+ clients on sub 1.14 servers having a light value of 0 for non full blocks.
fix-non-full-blocklight: true
# Fixes walk animation not shown when health is set to Float.NaN
fix-1_14-health-nan: true
# Should 1.15+ clients respawn instantly / without showing a death screen? # Should 1.15+ clients respawn instantly / without showing a death screen?
use-1_15-instant-respawn: false use-1_15-instant-respawn: false
# #

6
common/src/main/resources/assets/viaversion/data/mapping-lang-1.12-1.13.json
View File

@ -1242,8 +1242,8 @@
"entity.Villager.librarian": "entity.minecraft.villager.librarian", "entity.Villager.librarian": "entity.minecraft.villager.librarian",
"entity.Villager.cleric": "entity.minecraft.villager.cleric", "entity.Villager.cleric": "entity.minecraft.villager.cleric",
"entity.Villager.armor": "entity.minecraft.villager.armorer", "entity.Villager.armor": "entity.minecraft.villager.armorer",
"entity.Villager.weapon": "entity.minecraft.villager.weapon_smith", "entity.Villager.weapon": "entity.minecraft.villager.weaponsmith",
"entity.Villager.tool": "entity.minecraft.villager.tool_smith", "entity.Villager.tool": "entity.minecraft.villager.toolsmith",
"entity.Villager.butcher": "entity.minecraft.villager.butcher", "entity.Villager.butcher": "entity.minecraft.villager.butcher",
"entity.Villager.leather": "entity.minecraft.villager.leatherworker", "entity.Villager.leather": "entity.minecraft.villager.leatherworker",
"entity.Villager.nitwit": "entity.minecraft.villager.nitwit", "entity.Villager.nitwit": "entity.minecraft.villager.nitwit",
@ -2745,4 +2745,4 @@
"advancements.story.smelt_iron.description": null, "advancements.story.smelt_iron.description": null,
"advancements.story.upgrade_tools.title": null, "advancements.story.upgrade_tools.title": null,
"advancements.story.upgrade_tools.description": null "advancements.story.upgrade_tools.description": null
} }

10
sponge/src/main/java/us/myles/ViaVersion/sponge/platform/SpongeViaConfig.java
View File

@ -276,6 +276,16 @@ public class SpongeViaConfig extends Config implements ViaVersionConfig {
return false; return false;
} }
@Override
public boolean isNonFullBlockLightFix() {
return getBoolean("fix-non-full-blocklight", true);
}
@Override
public boolean is1_14HealthNaNFix() {
return getBoolean("fix-1_14-health-nan", true);
}
@Override @Override
public boolean is1_15InstantRespawn() { public boolean is1_15InstantRespawn() {
return getBoolean("use-1_15-instant-respawn", false); return getBoolean("use-1_15-instant-respawn", false);

10
velocity/src/main/java/us/myles/ViaVersion/velocity/platform/VelocityViaConfig.java
View File

@ -329,6 +329,16 @@ public class VelocityViaConfig extends Config implements ViaVersionConfig {
return false; return false;
} }
@Override
public boolean isNonFullBlockLightFix() {
return getBoolean("fix-non-full-blocklight", true);
}
@Override
public boolean is1_14HealthNaNFix() {
return getBoolean("fix-1_14-health-nan", true);
}
@Override @Override
public boolean is1_15InstantRespawn() { public boolean is1_15InstantRespawn() {
return getBoolean("use-1_15-instant-respawn", false); return getBoolean("use-1_15-instant-respawn", false);