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

20w15a

Browse Source
This commit is contained in:
KennyTV 2020-04-08 16:15:53 +02:00
parent 3c9c61056d
commit 721808d71d
5 changed files with 2991 additions and 1637 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
common/src/main/java/us/myles/ViaVersion/api/data/MappingDataLoader.java
View File

@ -154,7 +154,10 @@ public class MappingDataLoader {
Integer index = findIndex(newIdentifiers, value.getAsString());
if (index == null) {
if (diffIdentifiers != null) {
index = findIndex(newIdentifiers, diffIdentifiers.get(value.getAsString()).getAsString());
JsonElement diffElement = diffIdentifiers.get(value.getAsString());
if (diffElement != null) {
index = findIndex(newIdentifiers, diffElement.getAsString());
}
}
if (index == null) {
if (warnOnMissing && !Via.getConfig().isSuppressConversionWarnings() || Via.getManager().isDebug()) {

2
common/src/main/java/us/myles/ViaVersion/api/protocol/ProtocolVersion.java
View File

@ -80,7 +80,7 @@ public class ProtocolVersion {
register(v1_15 = new ProtocolVersion(573, "1.15"));
register(v1_15_1 = new ProtocolVersion(575, "1.15.1"));
register(v1_15_2 = new ProtocolVersion(578, "1.15.2"));
register(v1_16 = new ProtocolVersion(710, "1.16"));
register(v1_16 = new ProtocolVersion(711, "1.16"));
register(unknown = new ProtocolVersion(-1, "UNKNOWN"));
}

2
common/src/main/java/us/myles/ViaVersion/protocols/protocol1_16to1_15_2/Protocol1_16To1_15_2.java
View File

@ -135,8 +135,10 @@ public class Protocol1_16To1_15_2 extends Protocol {
tagRewriter.addTag(TagType.BLOCK, "minecraft:beacon_base_blocks", 133, 134, 148, 265);
tagRewriter.addTag(TagType.BLOCK, "minecraft:climbable", 160, 241, 658);
tagRewriter.addTag(TagType.BLOCK, "minecraft:fire", 142);
tagRewriter.addTag(TagType.BLOCK, "minecraft:campfires", 679);
tagRewriter.addTag(TagType.ITEM, "minecraft:beacon_payment_items", 529, 530, 531, 760);
// The client crashes if we don't send all tags it may use
tagRewriter.addEmptyTag(TagType.BLOCK, "minecraft:guarded_by_piglins");
tagRewriter.addEmptyTag(TagType.BLOCK, "minecraft:soul_speed_blocks");
tagRewriter.addEmptyTag(TagType.BLOCK, "minecraft:soul_fire_base_blocks");
tagRewriter.addEmptyTag(TagType.BLOCK, "minecraft:non_flammable_wood");

4616
common/src/main/resources/assets/viaversion/data/mapping-1.16.json
View File

File diff suppressed because it is too large Load Diff

3
common/src/main/resources/assets/viaversion/data/mappingdiff-1.15to1.16.json
View File

@ -6,7 +6,8 @@
"entity.zombie_pigman.ambient": "entity.zombified_piglin.ambient",
"entity.zombie_pigman.angry": "entity.zombified_piglin.angry",
"entity.zombie_pigman.death": "entity.zombified_piglin.death",
"entity.zombie_pigman.hurt": "entity.zombified_piglin.hurt"
"entity.zombie_pigman.hurt": "entity.zombified_piglin.hurt",
"music.nether": "music.nether.nether_wastes"
},
"blockstates": {
"5641": "minecraft:cobblestone_wall[east=tall,north=tall,south=tall,up=true,waterlogged=true,west=tall]",