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

20w09a

Browse Source
This commit is contained in:
KennyTV 2020-02-26 19:29:41 +01:00
parent ace1e6c553
commit 1d1c3fdc06
3 changed files with 83 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
core/src/main/java/nl/matsv/viabackwards/api/data/VBItemMappings.java
View File

@ -28,7 +28,15 @@ public class VBItemMappings {
continue;
}
int id = Integer.parseInt(MappingDataLoader.findValue(oldMapping, entry.getKey()).getKey());
Map.Entry<String, JsonElement> oldEntry = MappingDataLoader.findValue(oldMapping, entry.getKey());
if (oldEntry == null) {
if (!Via.getConfig().isSuppressConversionWarnings() || Via.getManager().isDebug()) {
ViaBackwards.getPlatform().getLogger().warning("No old entry for " + mappedIdName + " :( ");
}
continue;
}
int id = Integer.parseInt(oldEntry.getKey());
int mappedId = Integer.parseInt(value.getKey());
String name = object.getAsJsonPrimitive("name").getAsString();
itemMapping.put(id, new MappedItem(mappedId, name));

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

@ -69,9 +69,10 @@ public class EntityPackets1_16 extends EntityRewriter<Protocol1_15_2To1_16> {
});
mapEntity(Entity1_16Types.EntityType.HOGLIN, Entity1_16Types.EntityType.COW).jsonName("Hoglin");
mapEntity(Entity1_16Types.EntityType.PIGLIN, Entity1_16Types.EntityType.ZOMBIE_PIGMAN).jsonName("Piglin");
mapEntity(Entity1_16Types.EntityType.PIGLIN, Entity1_16Types.EntityType.ZOMBIFIED_PIGLIN).jsonName("Piglin");
registerMetaHandler().filter(Entity1_16Types.EntityType.PIGLIN, 16).removed(); // charging crossbow
registerMetaHandler().filter(Entity1_16Types.EntityType.PIGLIN, 17).removed();
}
@Override

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

@ -4555,7 +4555,7 @@
"minecraft:stripped_warped_stem[axis=y]": "minecraft:stripped_dark_oak_log[axis=y]",
"minecraft:stripped_warped_stem[axis=z]": "minecraft:stripped_dark_oak_log[axis=z]",
"minecraft:warped_nylium": "minecraft:mycelium[snowy=false]",
"minecraft:warped_fungi": "minecraft:brown_mushroom",
"minecraft:warped_fungus": "minecraft:brown_mushroom",
"minecraft:warped_wart_block": "minecraft:cyan_wool",
"minecraft:warped_roots": "minecraft:nether_wart[age=3]",
"minecraft:nether_sprouts": "minecraft:grass",
@ -4566,35 +4566,35 @@
"minecraft:stripped_crimson_stem[axis=y]": "minecraft:stripped_acacia_log[axis=y]",
"minecraft:stripped_crimson_stem[axis=z]": "minecraft:stripped_acacia_log[axis=z]",
"minecraft:crimson_nylium": "minecraft:mycelium[snowy=false]",
"minecraft:crimson_fungi": "minecraft:red_mushroom",
"minecraft:crimson_fungus": "minecraft:red_mushroom",
"minecraft:shroomlight": "minecraft:jack_o_lantern[facing=north]",
"minecraft:weeping_vines[age=0]": "minecraft:large_fern[half=upper]",
"minecraft:weeping_vines[age=1]": "minecraft:tall_grass[half=upper]",
"minecraft:weeping_vines[age=2]": "minecraft:tall_grass[half=upper]",
"minecraft:weeping_vines[age=3]": "minecraft:tall_grass[half=upper]",
"minecraft:weeping_vines[age=4]": "minecraft:tall_grass[half=upper]",
"minecraft:weeping_vines[age=5]": "minecraft:tall_grass[half=upper]",
"minecraft:weeping_vines[age=6]": "minecraft:tall_grass[half=upper]",
"minecraft:weeping_vines[age=7]": "minecraft:tall_grass[half=upper]",
"minecraft:weeping_vines[age=8]": "minecraft:tall_grass[half=upper]",
"minecraft:weeping_vines[age=9]": "minecraft:tall_grass[half=upper]",
"minecraft:weeping_vines[age=10]": "minecraft:tall_grass[half=upper]",
"minecraft:weeping_vines[age=11]": "minecraft:tall_grass[half=upper]",
"minecraft:weeping_vines[age=12]": "minecraft:tall_grass[half=upper]",
"minecraft:weeping_vines[age=13]": "minecraft:tall_grass[half=upper]",
"minecraft:weeping_vines[age=14]": "minecraft:tall_grass[half=upper]",
"minecraft:weeping_vines[age=15]": "minecraft:tall_grass[half=upper]",
"minecraft:weeping_vines[age=16]": "minecraft:tall_grass[half=upper]",
"minecraft:weeping_vines[age=17]": "minecraft:tall_grass[half=upper]",
"minecraft:weeping_vines[age=18]": "minecraft:tall_grass[half=upper]",
"minecraft:weeping_vines[age=19]": "minecraft:tall_grass[half=upper]",
"minecraft:weeping_vines[age=20]": "minecraft:tall_grass[half=upper]",
"minecraft:weeping_vines[age=21]": "minecraft:tall_grass[half=upper]",
"minecraft:weeping_vines[age=22]": "minecraft:tall_grass[half=upper]",
"minecraft:weeping_vines[age=23]": "minecraft:tall_grass[half=upper]",
"minecraft:weeping_vines[age=24]": "minecraft:tall_grass[half=upper]",
"minecraft:weeping_vines[age=25]": "minecraft:tall_grass[half=upper]",
"minecraft:weeping_vines_plant": "minecraft:large_fern[half=upper]",
"minecraft:weeping_vines[age=0]": "minecraft:vine[east=true,north=true,south=true,up=false,west=true]",
"minecraft:weeping_vines[age=1]": "minecraft:vine[east=true,north=true,south=true,up=false,west=true]",
"minecraft:weeping_vines[age=2]": "minecraft:vine[east=true,north=true,south=true,up=false,west=true]",
"minecraft:weeping_vines[age=3]": "minecraft:vine[east=true,north=true,south=true,up=false,west=true]",
"minecraft:weeping_vines[age=4]": "minecraft:vine[east=true,north=true,south=true,up=false,west=true]",
"minecraft:weeping_vines[age=5]": "minecraft:vine[east=true,north=true,south=true,up=false,west=true]",
"minecraft:weeping_vines[age=6]": "minecraft:vine[east=true,north=true,south=true,up=false,west=true]",
"minecraft:weeping_vines[age=7]": "minecraft:vine[east=true,north=true,south=true,up=false,west=true]",
"minecraft:weeping_vines[age=8]": "minecraft:vine[east=true,north=true,south=true,up=false,west=true]",
"minecraft:weeping_vines[age=9]": "minecraft:vine[east=true,north=true,south=true,up=false,west=true]",
"minecraft:weeping_vines[age=10]": "minecraft:vine[east=true,north=true,south=true,up=false,west=true]",
"minecraft:weeping_vines[age=11]": "minecraft:vine[east=true,north=true,south=true,up=false,west=true]",
"minecraft:weeping_vines[age=12]": "minecraft:vine[east=true,north=true,south=true,up=false,west=true]",
"minecraft:weeping_vines[age=13]": "minecraft:vine[east=true,north=true,south=true,up=false,west=true]",
"minecraft:weeping_vines[age=14]": "minecraft:vine[east=true,north=true,south=true,up=false,west=true]",
"minecraft:weeping_vines[age=15]": "minecraft:vine[east=true,north=true,south=true,up=false,west=true]",
"minecraft:weeping_vines[age=16]": "minecraft:vine[east=true,north=true,south=true,up=false,west=true]",
"minecraft:weeping_vines[age=17]": "minecraft:vine[east=true,north=true,south=true,up=false,west=true]",
"minecraft:weeping_vines[age=18]": "minecraft:vine[east=true,north=true,south=true,up=false,west=true]",
"minecraft:weeping_vines[age=19]": "minecraft:vine[east=true,north=true,south=true,up=false,west=true]",
"minecraft:weeping_vines[age=20]": "minecraft:vine[east=true,north=true,south=true,up=false,west=true]",
"minecraft:weeping_vines[age=21]": "minecraft:vine[east=true,north=true,south=true,up=false,west=true]",
"minecraft:weeping_vines[age=22]": "minecraft:vine[east=true,north=true,south=true,up=false,west=true]",
"minecraft:weeping_vines[age=23]": "minecraft:vine[east=true,north=true,south=true,up=false,west=true]",
"minecraft:weeping_vines[age=24]": "minecraft:vine[east=true,north=true,south=true,up=false,west=true]",
"minecraft:weeping_vines[age=25]": "minecraft:vine[east=true,north=true,south=true,up=false,west=true]",
"minecraft:weeping_vines_plant": "minecraft:vine[east=true,north=true,south=true,up=false,west=true]",
"minecraft:crimson_roots": "minecraft:nether_wart[age=3]",
"minecraft:crimson_planks": "minecraft:acacia_planks",
"minecraft:warped_planks": "minecraft:dark_oak_planks",
@ -5287,7 +5287,28 @@
"minecraft:warped_wall_sign[facing=east,waterlogged=true]": "minecraft:dark_oak_wall_sign[facing=east,waterlogged=true]",
"minecraft:warped_wall_sign[facing=east,waterlogged=false]": "minecraft:dark_oak_wall_sign[facing=east,waterlogged=false]",
"minecraft:netherite_block": "minecraft:obsidian",
"minecraft:ancient_debris": "minecraft:obsidian"
"minecraft:ancient_debris": "minecraft:obsidian",
"minecraft:crying_obsidian": "minecraft:obsidian",
"minecraft:target[power=0]": "minecraft:hay_block[axis=y]",
"minecraft:target[power=1]": "minecraft:hay_block[axis=y]",
"minecraft:target[power=2]": "minecraft:hay_block[axis=y]",
"minecraft:target[power=3]": "minecraft:hay_block[axis=y]",
"minecraft:target[power=4]": "minecraft:hay_block[axis=y]",
"minecraft:target[power=5]": "minecraft:hay_block[axis=y]",
"minecraft:target[power=6]": "minecraft:hay_block[axis=y]",
"minecraft:target[power=7]": "minecraft:hay_block[axis=y]",
"minecraft:target[power=8]": "minecraft:hay_block[axis=y]",
"minecraft:target[power=9]": "minecraft:hay_block[axis=y]",
"minecraft:target[power=10]": "minecraft:hay_block[axis=y]",
"minecraft:target[power=11]": "minecraft:hay_block[axis=y]",
"minecraft:target[power=12]": "minecraft:hay_block[axis=y]",
"minecraft:target[power=13]": "minecraft:hay_block[axis=y]",
"minecraft:target[power=14]": "minecraft:hay_block[axis=y]",
"minecraft:target[power=15]": "minecraft:hay_block[axis=y]",
"minecraft:potted_crimson_fungus": "minecraft:potted_red_mushroom",
"minecraft:potted_warped_fungus": "minecraft:potted_brown_mushroom",
"minecraft:potted_crimson_roots": "minecraft:potted_poppy",
"minecraft:potted_warped_roots": "minecraft:potted_blue_orchid"
},
"items": {
"minecraft:crimson_nylium": {
@ -5322,13 +5343,13 @@
"id": "minecraft:stripped_dark_oak_log",
"name": "1.16 Stripped Warped Stem"
},
"minecraft:crimson_fungi": {
"minecraft:crimson_fungus": {
"id": "minecraft:red_mushroom",
"name": "1.16 Crimson Fungi"
"name": "1.16 Crimson Fungus"
},
"minecraft:warped_fungi": {
"minecraft:warped_fungus": {
"id": "minecraft:brown_mushroom",
"name": "1.16 Warped Fungi"
"name": "1.16 Warped Fungus"
},
"minecraft:crimson_roots": {
"id": "minecraft:grass",
@ -5501,6 +5522,14 @@
"minecraft:netherite_boots": {
"id": "minecraft:chainmail_boots",
"name": "1.16 Netherite Boots"
},
"minecraft:crying_obsidian": {
"id": "minecraft:obsidian",
"name": "1.16 Obsidian"
},
"minecraft:target": {
"id": "minecraft:hay_block",
"name": "1.16 Target"
}
},
"sounds": {
@ -5545,11 +5574,11 @@
"block.nether_sprouts.place": "block.sand.place",
"block.nether_sprouts.hit": "block.sand.hit",
"block.nether_sprouts.fall": "block.sand.fall",
"block.fungi.break": "block.grass.break",
"block.fungi.step": "block.grass.step",
"block.fungi.place": "block.grass.place",
"block.fungi.hit": "block.grass.hit",
"block.fungi.fall": "block.grass.fall",
"block.fungus.break": "block.grass.break",
"block.fungus.step": "block.grass.step",
"block.fungus.place": "block.grass.place",
"block.fungus.hit": "block.grass.hit",
"block.fungus.fall": "block.grass.fall",
"block.weeping_vines.break": "block.wet_grass.break",
"block.weeping_vines.step": "block.wet_grass.step",
"block.weeping_vines.place": "block.wet_grass.place",
@ -5597,6 +5626,10 @@
"entity.hoglin.hurt": "entity.ravager.hurt",
"entity.hoglin.retreat": "entity.ravager.hurt",
"entity.hoglin.step": "entity.ravager.step",
"entity.zombified_piglin.ambient": "entity.zombie_pigman.ambient",
"entity.zombified_piglin.angry": "entity.zombie_pigman.angry",
"entity.zombified_piglin.death": "entity.zombie_pigman.death",
"entity.zombified_piglin.hurt": "entity.zombie_pigman.hurt",
"entity.piglin.admiring_item": "entity.zombie_pigman.ambient",
"entity.piglin.ambient": "entity.zombie_pigman.ambient",
"entity.piglin.angry": "entity.zombie_pigman.angry",