Upstream/ViaBackwards
1
0
Fork 0
mirror of https://github.com/ViaVersion/ViaBackwards.git synced 2024-09-06 01:08:08 +02:00
Code Issues Packages Projects Releases Wiki Activity

20w11a

Browse Source
This commit is contained in:
KennyTV 2020-03-11 22:55:04 +01:00
parent af88a57983
commit 2b269a6563
4 changed files with 70 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_15_2to1_16/packets/BlockItemPackets1_16.java
View File

@ -154,19 +154,21 @@ public class BlockItemPackets1_16 extends nl.matsv.viabackwards.api.rewriters.It
switch (id) {
case 27: // soul flame -> flame
return 26;
case 63: // ash, crimson spore, warped spore -> mycelium
case 64:
case 28: // soul -> smoke
return 42;
case 64: // ash, crimson spore, warped spore -> mycelium
case 65:
case 66:
return 37;
case 66: // dripping obsidian tear -> dripping lava
case 67: // dripping obsidian tear -> dripping lava
return 9;
case 67: // falling obsidian tear
case 68: // falling obsidian tear
return 10;
case 68: // landing obsidian tear
case 69: // landing obsidian tear
return 11;
}
if (id > 27) {
id -= 1;
id -= 2;
}
return id;
}

9
core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_15_2to1_16/packets/EntityPackets1_16.java
View File

@ -73,6 +73,15 @@ public class EntityPackets1_16 extends EntityRewriter<Protocol1_15_2To1_16> {
registerMetaHandler().filter(Entity1_16Types.EntityType.PIGLIN, 16).removed(); // charging crossbow
registerMetaHandler().filter(Entity1_16Types.EntityType.PIGLIN, 17).removed();
registerMetaHandler().filter(Entity1_16Types.EntityType.ABSTRACT_ARROW, true, 8).removed();
registerMetaHandler().filter(Entity1_16Types.EntityType.ABSTRACT_ARROW, true).handle(meta -> {
if (meta.getIndex() >= 8) {
meta.getData().setId(meta.getIndex() + 1);
}
return meta.getData();
});
}
@Override

42
core/src/main/resources/assets/viabackwards/data/mapping-1.15to1.16.json
View File

@ -5320,7 +5320,35 @@
"minecraft:crimson_hyphae[axis=z]": "minecraft:acacia_wood[axis=z]",
"minecraft:stripped_crimson_hyphae[axis=x]": "minecraft:stripped_acacia_wood[axis=x]",
"minecraft:stripped_crimson_hyphae[axis=y]": "minecraft:stripped_acacia_wood[axis=y]",
"minecraft:stripped_crimson_hyphae[axis=z]": "minecraft:stripped_acacia_wood[axis=z]"
"minecraft:stripped_crimson_hyphae[axis=z]": "minecraft:stripped_acacia_wood[axis=z]",
"minecraft:nether_gold_ore": "minecraft:gold_ore",
"minecraft:twisting_vines[age=0]": "minecraft:vine[east=true,north=true,south=true,up=false,west=true]",
"minecraft:twisting_vines[age=1]": "minecraft:vine[east=true,north=true,south=true,up=false,west=true]",
"minecraft:twisting_vines[age=2]": "minecraft:vine[east=true,north=true,south=true,up=false,west=true]",
"minecraft:twisting_vines[age=3]": "minecraft:vine[east=true,north=true,south=true,up=false,west=true]",
"minecraft:twisting_vines[age=4]": "minecraft:vine[east=true,north=true,south=true,up=false,west=true]",
"minecraft:twisting_vines[age=5]": "minecraft:vine[east=true,north=true,south=true,up=false,west=true]",
"minecraft:twisting_vines[age=6]": "minecraft:vine[east=true,north=true,south=true,up=false,west=true]",
"minecraft:twisting_vines[age=7]": "minecraft:vine[east=true,north=true,south=true,up=false,west=true]",
"minecraft:twisting_vines[age=8]": "minecraft:vine[east=true,north=true,south=true,up=false,west=true]",
"minecraft:twisting_vines[age=9]": "minecraft:vine[east=true,north=true,south=true,up=false,west=true]",
"minecraft:twisting_vines[age=10]": "minecraft:vine[east=true,north=true,south=true,up=false,west=true]",
"minecraft:twisting_vines[age=11]": "minecraft:vine[east=true,north=true,south=true,up=false,west=true]",
"minecraft:twisting_vines[age=12]": "minecraft:vine[east=true,north=true,south=true,up=false,west=true]",
"minecraft:twisting_vines[age=13]": "minecraft:vine[east=true,north=true,south=true,up=false,west=true]",
"minecraft:twisting_vines[age=14]": "minecraft:vine[east=true,north=true,south=true,up=false,west=true]",
"minecraft:twisting_vines[age=15]": "minecraft:vine[east=true,north=true,south=true,up=false,west=true]",
"minecraft:twisting_vines[age=16]": "minecraft:vine[east=true,north=true,south=true,up=false,west=true]",
"minecraft:twisting_vines[age=17]": "minecraft:vine[east=true,north=true,south=true,up=false,west=true]",
"minecraft:twisting_vines[age=18]": "minecraft:vine[east=true,north=true,south=true,up=false,west=true]",
"minecraft:twisting_vines[age=19]": "minecraft:vine[east=true,north=true,south=true,up=false,west=true]",
"minecraft:twisting_vines[age=20]": "minecraft:vine[east=true,north=true,south=true,up=false,west=true]",
"minecraft:twisting_vines[age=21]": "minecraft:vine[east=true,north=true,south=true,up=false,west=true]",
"minecraft:twisting_vines[age=22]": "minecraft:vine[east=true,north=true,south=true,up=false,west=true]",
"minecraft:twisting_vines[age=23]": "minecraft:vine[east=true,north=true,south=true,up=false,west=true]",
"minecraft:twisting_vines[age=24]": "minecraft:vine[east=true,north=true,south=true,up=false,west=true]",
"minecraft:twisting_vines[age=25]": "minecraft:vine[east=true,north=true,south=true,up=false,west=true]",
"minecraft:twisting_vines_plant": "minecraft:vine[east=true,north=true,south=true,up=false,west=true]"
},
"items": {
"minecraft:crimson_nylium": {
@ -5562,6 +5590,14 @@
"minecraft:zombified_piglin_spawn_egg": {
"id": "minecraft:zombie_pigman_spawn_egg",
"name": "1.16 Zombified Piglin Spawn Egg"
},
"minecraft:nether_gold_ore": {
"id": "minecraft:gold_ore",
"name": "1.16 Nether Gold Ore"
},
"minecraft:twisting_vines": {
"id": "minecraft:vine",
"name": "1.16 Twisting Vines"
}
},
"sounds": {
@ -5685,6 +5721,8 @@
"ambient.warped_forest.additions": "",
"ambient.warped_forest.loop": "",
"ambient.warped_forest.mood": "",
"block.smithing_table.use": "block.anvil.use"
"block.smithing_table.use": "block.anvil.use",
"particle.soul_escape": "",
"block.vine.step": "block.wet_grass.step"
}
}

13
core/src/main/resources/assets/viabackwards/data/translation-mappings.json
View File

@ -1,12 +1,17 @@
{
"1.16": {
"block.minecraft.nether_gold_ore": "Nether Gold Ore",
"block.minecraft.soul_fire_torch": "Soul Fire Torch",
"block.minecraft.soul_fire_wall_torch": "Soul Fire Wall Torch",
"block.minecraft.warped_wart_block": "Warped Wart Block",
"block.minecraft.warped_stem": "Warped Stem",
"block.minecraft.stripped_warped_stem": "Stripped Warped Stem",
"block.minecraft.warped_hyphae": "Warped Hyphae",
"block.minecraft.stripped_warped_hyphae": "Stripped Warped Hyphae",
"block.minecraft.crimson_stem": "Crimson Stem",
"block.minecraft.stripped_crimson_stem": "Stripped Crimson Stem",
"block.minecraft.crimson_hyphae": "Crimson Hyphae",
"block.minecraft.stripped_crimson_hyphae": "Stripped Crimson Hyphae",
"block.minecraft.warped_nylium": "Warped Nylium",
"block.minecraft.crimson_nylium": "Crimson Nylium",
"block.minecraft.warped_fungus": "Warped Fungus",
@ -17,6 +22,8 @@
"block.minecraft.shroomlight": "Shroomlight",
"block.minecraft.weeping_vines": "Weeping Vines",
"block.minecraft.weeping_vines_plant": "Weeping Vines",
"block.minecraft.twisting_vines": "Twisting Vines",
"block.minecraft.twisting_vines_plant": "Twisting Vines",
"block.minecraft.soul_soil": "Soul Soil",
"block.minecraft.basalt": "Basalt",
"block.minecraft.warped_planks": "Warped Planks",
@ -65,13 +72,18 @@
"item.minecraft.netherite_hoe": "Netherite Hoe",
"item.minecraft.netherite_shovel": "Netherite Shovel",
"item.minecraft.netherite_sword": "Netherite Sword",
"container.upgrade": "Upgrade",
"entity.minecraft.hoglin": "Hoglin",
"entity.minecraft.piglin": "Piglin",
"entity.minecraft.zombified_piglin": "Zombified Piglin",
"death.fell.accident.weeping_vines": "%1$s fell off some weeping vines",
"death.fell.accident.twisting_vines": "%1$s fell off some twisting vines",
"death.fell.accident.scaffolding": "%1$s fell off a scaffolding",
"death.fell.accident.other_climbable": "%1$s fell while climbing",
"death.attack.magic.player": "%1$s was killed by magic whilst trying to escape %2$s",
"enchantment.minecraft.soul_speed": "Soul Speed",
"stat.minecraft.target_hit": "Targets Hit",
"stat.minecraft.interact_with_smithing_table": "Interactions with Smithing Table",
"subtitles.block.composter.empty": "Composter emptied",
"subtitles.block.composter.fill": "Composter filled",
"subtitles.block.composter.ready": "Composter composts",
@ -97,6 +109,7 @@
"subtitles.entity.zombified_piglin.death": "Zombified Piglin dies",
"subtitles.entity.zombified_piglin.hurt": "Zombified Piglin hurts",
"subtitles.item.armor.equip_netherite": "Netherite armor clanks",
"subtitles.particle.soul_escape": "Soul escapes",
"advancements.adventure.bullseye.title": "Bullseye",
"advancements.adventure.bullseye.description": "Hit the bullseye of a Target block with an arrow",
"commands.locatebiome.success": "The nearest %s is at %s (%s blocks away)",