Upstream/ViaBackwards
1
0
Fork 0
mirror of https://github.com/ViaVersion/ViaBackwards.git synced 2024-12-20 16:37:48 +01:00
Code Issues Packages Projects Releases Wiki Activity

Move bee entity mapping to onMappingDataLoaded method

Browse Source
This commit is contained in:
Nassim Jahnke 2024-06-26 10:55:59 +02:00
parent 7ccb5634ff
commit 2cb3fd186b
No known key found for this signature in database
GPG Key ID: EF6771C01F6EF02F
1 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
common/src/main/java/com/viaversion/viabackwards/protocol/v1_15to1_14_4/rewriter/EntityPacketRewriter1_15.java
View File

@ -21,7 +21,6 @@ import com.viaversion.viabackwards.api.rewriters.EntityRewriter;
import com.viaversion.viabackwards.protocol.v1_15to1_14_4.Protocol1_15To1_14_4; import com.viaversion.viabackwards.protocol.v1_15to1_14_4.Protocol1_15To1_14_4;
import com.viaversion.viabackwards.protocol.v1_15to1_14_4.storage.ImmediateRespawnStorage; import com.viaversion.viabackwards.protocol.v1_15to1_14_4.storage.ImmediateRespawnStorage;
import com.viaversion.viaversion.api.minecraft.entities.EntityType; import com.viaversion.viaversion.api.minecraft.entities.EntityType;
import com.viaversion.viaversion.api.minecraft.entities.EntityTypes1_14;
import com.viaversion.viaversion.api.minecraft.entities.EntityTypes1_15; import com.viaversion.viaversion.api.minecraft.entities.EntityTypes1_15;
import com.viaversion.viaversion.api.minecraft.entitydata.EntityData; import com.viaversion.viaversion.api.minecraft.entitydata.EntityData;
import com.viaversion.viaversion.api.protocol.packet.PacketWrapper; import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
@ -200,11 +199,6 @@ public class EntityPacketRewriter1_15 extends EntityRewriter<ClientboundPackets1
filter().type(EntityTypes1_15.BEE).cancel(15); filter().type(EntityTypes1_15.BEE).cancel(15);
filter().type(EntityTypes1_15.BEE).cancel(16); filter().type(EntityTypes1_15.BEE).cancel(16);
mapEntityTypeWithData(EntityTypes1_15.BEE, EntityTypes1_15.PUFFERFISH).jsonName().spawnMetadata(storage -> {
storage.add(new EntityData(14, Types1_14.ENTITY_DATA_TYPES.booleanType, false));
storage.add(new EntityData(15, Types1_14.ENTITY_DATA_TYPES.varIntType, 2));
});
filter().type(EntityTypes1_15.ENDERMAN).cancel(16); filter().type(EntityTypes1_15.ENDERMAN).cancel(16);
filter().type(EntityTypes1_15.TRIDENT).cancel(10); filter().type(EntityTypes1_15.TRIDENT).cancel(10);
@ -216,13 +210,17 @@ public class EntityPacketRewriter1_15 extends EntityRewriter<ClientboundPackets1
} }
@Override @Override
public EntityType typeFromId(int typeId) { public void onMappingDataLoaded() {
return EntityTypes1_15.getTypeFromId(typeId); mapTypes();
mapEntityTypeWithData(EntityTypes1_15.BEE, EntityTypes1_15.PUFFERFISH).jsonName().spawnMetadata(storage -> {
storage.add(new EntityData(14, Types1_14.ENTITY_DATA_TYPES.booleanType, false));
storage.add(new EntityData(15, Types1_14.ENTITY_DATA_TYPES.varIntType, 2));
});
} }
@Override @Override
public int newEntityId(final int newId) { public EntityType typeFromId(int typeId) {
if (newId == 4) return EntityTypes1_14.PUFFERFISH.getId(); // Flying pufferfish! return EntityTypes1_15.getTypeFromId(typeId);
return newId >= 5 ? newId - 1 : newId;
} }
} }