This commit is contained in:
Nassim Jahnke 2022-03-31 19:00:43 +02:00
parent c6f25bf33f
commit bd71833f18
No known key found for this signature in database
GPG Key ID: 6BE3B555EBC5982B
4 changed files with 33 additions and 11 deletions

View File

@ -5,7 +5,7 @@ plugins {
allprojects { allprojects {
group = "com.viaversion" group = "com.viaversion"
version = "4.3.0-22w12a-SNAPSHOT" version = "4.3.0-22w13a-SNAPSHOT"
description = "Allow older clients to join newer server versions." description = "Allow older clients to join newer server versions."
} }

View File

@ -24,11 +24,9 @@ import com.viaversion.viaversion.api.minecraft.entities.Entity1_17Types;
import com.viaversion.viaversion.api.minecraft.entities.Entity1_19Types; import com.viaversion.viaversion.api.minecraft.entities.Entity1_19Types;
import com.viaversion.viaversion.api.minecraft.entities.EntityType; import com.viaversion.viaversion.api.minecraft.entities.EntityType;
import com.viaversion.viaversion.api.minecraft.metadata.MetaType; import com.viaversion.viaversion.api.minecraft.metadata.MetaType;
import com.viaversion.viaversion.api.minecraft.metadata.Metadata;
import com.viaversion.viaversion.api.protocol.remapper.PacketRemapper; import com.viaversion.viaversion.api.protocol.remapper.PacketRemapper;
import com.viaversion.viaversion.api.type.Type; import com.viaversion.viaversion.api.type.Type;
import com.viaversion.viaversion.api.type.types.Particle; import com.viaversion.viaversion.api.type.types.Particle;
import com.viaversion.viaversion.api.type.types.version.Types1_14;
import com.viaversion.viaversion.api.type.types.version.Types1_18; import com.viaversion.viaversion.api.type.types.version.Types1_18;
import com.viaversion.viaversion.api.type.types.version.Types1_19; import com.viaversion.viaversion.api.type.types.version.Types1_19;
import com.viaversion.viaversion.libs.opennbt.tag.builtin.CompoundTag; import com.viaversion.viaversion.libs.opennbt.tag.builtin.CompoundTag;
@ -163,6 +161,8 @@ public final class EntityPackets1_19 extends EntityRewriter<Protocol1_18_2To1_19
filter().type(Entity1_19Types.WARDEN).cancel(16); // Anger filter().type(Entity1_19Types.WARDEN).cancel(16); // Anger
mapEntityTypeWithData(Entity1_19Types.WARDEN, Entity1_19Types.IRON_GOLEM).jsonName(); mapEntityTypeWithData(Entity1_19Types.WARDEN, Entity1_19Types.IRON_GOLEM).jsonName();
mapEntityTypeWithData(Entity1_19Types.ALLAY, Entity1_19Types.VEX).jsonName();
} }
@Override @Override

View File

@ -3,10 +3,14 @@
"minecraft:sculk": "minecraft:black_concrete_powder", "minecraft:sculk": "minecraft:black_concrete_powder",
"minecraft:sculk_vein": "minecraft:glow_lichen[", "minecraft:sculk_vein": "minecraft:glow_lichen[",
"minecraft:sculk_catalyst": "minecraft:end_stone", "minecraft:sculk_catalyst": "minecraft:end_stone",
"minecraft:sculk_shrieker[shrieking=true,waterlogged=true]": "minecraft:end_portal_frame[eye=true,facing=north]", "minecraft:sculk_shrieker[can_summon=true,shrieking=true,waterlogged=true]": "minecraft:end_portal_frame[eye=true,facing=north]",
"minecraft:sculk_shrieker[shrieking=true,waterlogged=false]": "minecraft:end_portal_frame[eye=true,facing=north]", "minecraft:sculk_shrieker[can_summon=true,shrieking=true,waterlogged=false]": "minecraft:end_portal_frame[eye=true,facing=north]",
"minecraft:sculk_shrieker[shrieking=false,waterlogged=true]": "minecraft:end_portal_frame[eye=false,facing=north]", "minecraft:sculk_shrieker[can_summon=true,shrieking=false,waterlogged=true]": "minecraft:end_portal_frame[eye=false,facing=north]",
"minecraft:sculk_shrieker[shrieking=false,waterlogged=false]": "minecraft:end_portal_frame[eye=false,facing=north]", "minecraft:sculk_shrieker[can_summon=true,shrieking=false,waterlogged=false]": "minecraft:end_portal_frame[eye=false,facing=north]",
"minecraft:sculk_shrieker[can_summon=false,shrieking=true,waterlogged=true]": "minecraft:end_portal_frame[eye=true,facing=north]",
"minecraft:sculk_shrieker[can_summon=false,shrieking=true,waterlogged=false]": "minecraft:end_portal_frame[eye=true,facing=north]",
"minecraft:sculk_shrieker[can_summon=false,shrieking=false,waterlogged=true]": "minecraft:end_portal_frame[eye=false,facing=north]",
"minecraft:sculk_shrieker[can_summon=false,shrieking=false,waterlogged=false]": "minecraft:end_portal_frame[eye=false,facing=north]",
"minecraft:reinforced_deepslate": "minecraft:obsidian", "minecraft:reinforced_deepslate": "minecraft:obsidian",
"minecraft:mangrove_planks": "minecraft:acacia_planks", "minecraft:mangrove_planks": "minecraft:acacia_planks",
"minecraft:stripped_mangrove_log": "minecraft:stripped_acacia_log[", "minecraft:stripped_mangrove_log": "minecraft:stripped_acacia_log[",
@ -386,7 +390,15 @@
"entity.tadpole.flop": "", "entity.tadpole.flop": "",
"entity.tadpole.grow_up": "", "entity.tadpole.grow_up": "",
"entity.tadpole.hurt": "", "entity.tadpole.hurt": "",
"entity.tadpole.step": "" "entity.tadpole.step": "",
"entity.allay.ambient_with_item": "",
"entity.allay.ambient_without_item": "",
"entity.allay.death": "",
"entity.allay.flap": "",
"entity.allay.hurt": "",
"entity.allay.item_given": "",
"entity.allay.item_taken": "",
"entity.parrot.imitate.warden": ""
}, },
"items": { "items": {
"minecraft:warden_spawn_egg": { "minecraft:warden_spawn_egg": {
@ -564,13 +576,22 @@
"minecraft:birch_chest_boat": { "minecraft:birch_chest_boat": {
"id": "minecraft:birch_boat", "id": "minecraft:birch_boat",
"name": "1.19 Birch Chest Boat" "name": "1.19 Birch Chest Boat"
},
"minecraft:allay_spawn_egg": {
"id": "minecraft:zombie_spawn_egg",
"name": "1.19 Allay Spawn Egg"
},
"minecraft:reinforced_deepslate": {
"id": "minecraft:obsidian",
"name": "1.19 Reinforced Deepslate"
} }
}, },
"particles": { "particles": {
"sculk_soul": "soul", "sculk_soul": "soul",
"sculk_charge": "", "sculk_charge": "",
"sculk_charge_pop": "bubble_pop", "sculk_charge_pop": "bubble_pop",
"shriek": "" "shriek": "",
"allay_dust": "wax_off"
}, },
"blockentities": { "blockentities": {
"sculk_catalyst": "", "sculk_catalyst": "",
@ -582,6 +603,7 @@
"entitynames": { "entitynames": {
"warden": "Warden", "warden": "Warden",
"frog": "Frog", "frog": "Frog",
"tadpole": "Tadpole" "tadpole": "Tadpole",
"allay": "Allay"
} }
} }

View File

@ -3,7 +3,7 @@ metadata.format.version = "1.1"
[versions] [versions]
# ViaVersion # ViaVersion
viaver = "4.3.0-22w12a-SNAPSHOT" viaver = "4.3.0-22w13a-SNAPSHOT"
# Common provided # Common provided
netty = "4.0.20.Final" netty = "4.0.20.Final"