From 3afef18de616dee536bbfc4befcb8928afa4bf70 Mon Sep 17 00:00:00 2001 From: FlorianMichael <60033407+FlorianMichael@users.noreply.github.com> Date: Thu, 19 Oct 2023 12:09:18 +0200 Subject: [PATCH] Updated Via API usage --- build.gradle | 4 ++-- .../packets/EntityPackets3D_Shareware.java | 3 +-- .../Protocol1_16to20w14infinite.java | 4 ++-- .../MetadataRewriter1_16to20w14infinite.java | 20 +++++++++---------- .../packets/EntityPackets20w14infinite.java | 12 +++++------ 5 files changed, 21 insertions(+), 22 deletions(-) diff --git a/build.gradle b/build.gradle index f2615c5..adddbdd 100644 --- a/build.gradle +++ b/build.gradle @@ -22,8 +22,8 @@ repositories { } dependencies { - compileOnly "com.viaversion:viaversion:4.9.0-23w40a-SNAPSHOT" - compileOnly("com.viaversion:viabackwards-common:4.9.0-23w40a-SNAPSHOT") { + compileOnly "com.viaversion:viaversion:4.9.0-23w42a-SNAPSHOT" + compileOnly("com.viaversion:viabackwards-common:4.9.0-23w42a-SNAPSHOT") { exclude group: "com.viaversion", module: "viaversion" } compileOnly "org.yaml:snakeyaml:2.2" diff --git a/src/main/java/net/raphimc/viaaprilfools/protocols/protocol1_14to3D_Shareware/packets/EntityPackets3D_Shareware.java b/src/main/java/net/raphimc/viaaprilfools/protocols/protocol1_14to3D_Shareware/packets/EntityPackets3D_Shareware.java index 9fc69eb..fcf007f 100644 --- a/src/main/java/net/raphimc/viaaprilfools/protocols/protocol1_14to3D_Shareware/packets/EntityPackets3D_Shareware.java +++ b/src/main/java/net/raphimc/viaaprilfools/protocols/protocol1_14to3D_Shareware/packets/EntityPackets3D_Shareware.java @@ -18,7 +18,6 @@ package net.raphimc.viaaprilfools.protocols.protocol1_14to3D_Shareware.packets; import com.viaversion.viaversion.api.minecraft.metadata.Metadata; -import com.viaversion.viaversion.api.minecraft.metadata.types.MetaType1_14; import com.viaversion.viaversion.api.protocol.remapper.PacketHandlers; import com.viaversion.viaversion.api.type.Type; import com.viaversion.viaversion.api.type.types.version.Types1_14; @@ -81,7 +80,7 @@ public class EntityPackets3D_Shareware { public void handleMetadata(final List metadataList) { for (Metadata metadata : metadataList) { - if (metadata.metaType() == MetaType1_14.Slot) { + if (metadata.metaType() == Types1_14.META_TYPES.itemType) { metadata.setValue(this.protocol.getItemRewriter().handleItemToClient(metadata.value())); } } diff --git a/src/main/java/net/raphimc/viaaprilfools/protocols/protocol1_16to20w14infinite/Protocol1_16to20w14infinite.java b/src/main/java/net/raphimc/viaaprilfools/protocols/protocol1_16to20w14infinite/Protocol1_16to20w14infinite.java index 351db82..05674f8 100644 --- a/src/main/java/net/raphimc/viaaprilfools/protocols/protocol1_16to20w14infinite/Protocol1_16to20w14infinite.java +++ b/src/main/java/net/raphimc/viaaprilfools/protocols/protocol1_16to20w14infinite/Protocol1_16to20w14infinite.java @@ -23,7 +23,7 @@ import com.viaversion.viabackwards.api.rewriters.SoundRewriter; import com.viaversion.viaversion.api.Via; import com.viaversion.viaversion.api.connection.UserConnection; import com.viaversion.viaversion.api.minecraft.RegistryType; -import com.viaversion.viaversion.api.minecraft.entities.Entity1_16Types; +import com.viaversion.viaversion.api.minecraft.entities.EntityTypes1_16; import com.viaversion.viaversion.api.protocol.remapper.PacketHandlers; import com.viaversion.viaversion.api.type.Type; import com.viaversion.viaversion.data.entity.EntityTrackerBase; @@ -171,7 +171,7 @@ public class Protocol1_16to20w14infinite extends BackwardsProtocol metadatas, UserConnection connection) { - if (metadata.metaType() == MetaType1_14.Slot) { + if (metadata.metaType() == Types1_14.META_TYPES.itemType) { metadata.setValue(this.protocol.getItemRewriter().handleItemToClient(metadata.value())); - } else if (metadata.metaType() == MetaType1_14.BlockID) { + } else if (metadata.metaType() == Types1_14.META_TYPES.blockStateType) { int data = (int) metadata.getValue(); metadata.setValue(protocol.getMappingData().getNewBlockStateId(data)); - } else if (metadata.metaType() == MetaType1_14.PARTICLE) { + } else if (metadata.metaType() == Types1_14.META_TYPES.particleType) { rewriteParticle((Particle) metadata.getValue()); } if (type == null) return; - if (type.isOrHasParent(Entity1_16Types.MINECART_ABSTRACT) + if (type.isOrHasParent(EntityTypes1_16.MINECART_ABSTRACT) && metadata.id() == 10) { // Convert to new block id int data = (int) metadata.getValue(); metadata.setValue(protocol.getMappingData().getNewBlockStateId(data)); } - if (type.isOrHasParent(Entity1_16Types.ABSTRACT_ARROW)) { + if (type.isOrHasParent(EntityTypes1_16.ABSTRACT_ARROW)) { if (metadata.id() == 8) { metadatas.remove(metadata); } else if (metadata.id() > 8) { diff --git a/src/main/java/net/raphimc/viaaprilfools/protocols/protocol1_16to20w14infinite/packets/EntityPackets20w14infinite.java b/src/main/java/net/raphimc/viaaprilfools/protocols/protocol1_16to20w14infinite/packets/EntityPackets20w14infinite.java index d479a80..4c2c851 100644 --- a/src/main/java/net/raphimc/viaaprilfools/protocols/protocol1_16to20w14infinite/packets/EntityPackets20w14infinite.java +++ b/src/main/java/net/raphimc/viaaprilfools/protocols/protocol1_16to20w14infinite/packets/EntityPackets20w14infinite.java @@ -18,7 +18,7 @@ package net.raphimc.viaaprilfools.protocols.protocol1_16to20w14infinite.packets; import com.viaversion.viaversion.api.Via; -import com.viaversion.viaversion.api.minecraft.entities.Entity1_16Types; +import com.viaversion.viaversion.api.minecraft.entities.EntityTypes1_16; import com.viaversion.viaversion.api.protocol.remapper.PacketHandler; import com.viaversion.viaversion.api.protocol.remapper.PacketHandlers; import com.viaversion.viaversion.api.type.Type; @@ -61,19 +61,19 @@ public class EntityPackets20w14infinite { public static void register(Protocol1_16to20w14infinite protocol) { MetadataRewriter1_16to20w14infinite metadataRewriter = protocol.get(MetadataRewriter1_16to20w14infinite.class); - metadataRewriter.registerTrackerWithData(ClientboundPackets20w14infinite.SPAWN_ENTITY, Entity1_16Types.FALLING_BLOCK); + metadataRewriter.registerTrackerWithData(ClientboundPackets20w14infinite.SPAWN_ENTITY, EntityTypes1_16.FALLING_BLOCK); metadataRewriter.registerTracker(ClientboundPackets20w14infinite.SPAWN_MOB); - metadataRewriter.registerTracker(ClientboundPackets20w14infinite.SPAWN_PLAYER, Entity1_16Types.PLAYER); + metadataRewriter.registerTracker(ClientboundPackets20w14infinite.SPAWN_PLAYER, EntityTypes1_16.PLAYER); metadataRewriter.registerMetadataRewriter(ClientboundPackets20w14infinite.ENTITY_METADATA, Types1_14.METADATA_LIST); metadataRewriter.registerRemoveEntities(ClientboundPackets20w14infinite.DESTROY_ENTITIES); // Spawn lightning -> Spawn entity protocol.registerClientbound(ClientboundPackets20w14infinite.SPAWN_GLOBAL_ENTITY, ClientboundPackets1_16.SPAWN_ENTITY, wrapper -> { final int entityId = wrapper.passthrough(Type.VAR_INT); // entity id - wrapper.user().getEntityTracker(Protocol1_16to20w14infinite.class).addEntity(entityId, Entity1_16Types.LIGHTNING_BOLT); + wrapper.user().getEntityTracker(Protocol1_16to20w14infinite.class).addEntity(entityId, EntityTypes1_16.LIGHTNING_BOLT); wrapper.write(Type.UUID, UUID.randomUUID()); // uuid - wrapper.write(Type.VAR_INT, Entity1_16Types.LIGHTNING_BOLT.getId()); // entity type + wrapper.write(Type.VAR_INT, EntityTypes1_16.LIGHTNING_BOLT.getId()); // entity type wrapper.read(Type.BYTE); // remove type @@ -117,7 +117,7 @@ public class EntityPackets20w14infinite { map(Type.LONG); // Seed map(Type.UNSIGNED_BYTE); // Max players handler(wrapper -> { - wrapper.user().getEntityTracker(Protocol1_16to20w14infinite.class).addEntity(wrapper.get(Type.INT, 0), Entity1_16Types.PLAYER); + wrapper.user().getEntityTracker(Protocol1_16to20w14infinite.class).addEntity(wrapper.get(Type.INT, 0), EntityTypes1_16.PLAYER); final String type = wrapper.read(Type.STRING);// level type wrapper.passthrough(Type.VAR_INT); // View distance