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

20w07a

Browse Source
This commit is contained in:
KennyTV 2020-02-14 17:00:24 +01:00
parent 9550151de6
commit ace1e6c553
2 changed files with 28 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -69,6 +69,9 @@ 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.HOGLIN, Entity1_16Types.EntityType.COW).jsonName("Hoglin");
mapEntity(Entity1_16Types.EntityType.PIGLIN, Entity1_16Types.EntityType.ZOMBIE_PIGMAN).jsonName("Piglin");
registerMetaHandler().filter(Entity1_16Types.EntityType.PIGLIN, 16).removed(); // charging crossbow
} }
@Override @Override
@ -80,6 +83,8 @@ public class EntityPackets1_16 extends EntityRewriter<Protocol1_15_2To1_16> {
protected int getOldEntityId(int newId) { protected int getOldEntityId(int newId) {
if (newId == Entity1_16Types.EntityType.HOGLIN.getId()) { if (newId == Entity1_16Types.EntityType.HOGLIN.getId()) {
return Entity1_15Types.EntityType.COW.getId(); return Entity1_15Types.EntityType.COW.getId();
} else if (newId == Entity1_16Types.EntityType.PIGLIN.getId()) {
return Entity1_15Types.EntityType.ZOMBIE_PIGMAN.getId();
} }
return newId; return newId;
} }

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

@ -5438,6 +5438,10 @@
"id": "minecraft:zombie_pigman_spawn_egg", "id": "minecraft:zombie_pigman_spawn_egg",
"name": "1.16 Hoglin Spawn Egg" "name": "1.16 Hoglin Spawn Egg"
}, },
"minecraft:piglin_spawn_egg": {
"id": "minecraft:zombie_pigman_spawn_egg",
"name": "1.16 Piglin Spawn Egg"
},
"minecraft:soul_fire_lantern": { "minecraft:soul_fire_lantern": {
"id": "minecraft:lantern", "id": "minecraft:lantern",
"name": "1.16 Soul Fire Lantern" "name": "1.16 Soul Fire Lantern"
@ -5585,6 +5589,24 @@
"block.soul_soil.step": "block.sand.step", "block.soul_soil.step": "block.sand.step",
"block.soul_soil.place": "block.sand.place", "block.soul_soil.place": "block.sand.place",
"block.soul_soil.hit": "block.sand.hit", "block.soul_soil.hit": "block.sand.hit",
"block.soul_soil.fall": "block.sand.fall" "block.soul_soil.fall": "block.sand.fall",
"entity.hoglin.ambient": "entity.ravager.ambient",
"entity.hoglin.angry": "entity.zombie_pigman.angry",
"entity.hoglin.attack": "entity.ravager.attack",
"entity.hoglin.death": "entity.ravager.death",
"entity.hoglin.hurt": "entity.ravager.hurt",
"entity.hoglin.retreat": "entity.ravager.hurt",
"entity.hoglin.step": "entity.ravager.step",
"entity.piglin.admiring_item": "entity.zombie_pigman.ambient",
"entity.piglin.ambient": "entity.zombie_pigman.ambient",
"entity.piglin.angry": "entity.zombie_pigman.angry",
"entity.piglin.celebrate": "entity.pillager.celebrate",
"entity.piglin.death": "entity.zombie_pigman.death",
"entity.piglin.jealous": "entity.zombie_pigman.ambient",
"entity.piglin.hurt": "entity.zombie_pigman.hurt",
"entity.piglin.retreat": "entity.zombie_pigman.hurt",
"entity.piglin.step": "entity.zombie.step",
"entity.piglin.converted_to_zombified": "entity.husk.converted_to_zombie",
"entity.snow_golem.shear": "entity.sheep.shear"
} }
} }