Mirrors/ViaVersion
3
0
Fork 1
Mirror von https://github.com/ViaVersion/ViaVersion.git synchronisiert 2024-12-27 08:30:09 +01:00
Code Issues Releases Aktivität

Handle (id+(data<<12)) encoded particle blocks; finish particle rewriting (:

Quellcode durchsuchen
Dieser Commit ist enthalten in:
Matsv 2018-04-05 19:01:37 +02:00
Ursprung 45105d8c6a
Commit 07fa0f3e55
1 geänderte Dateien mit 9 neuen und 3 gelöschten Zeilen
Statistiken anzeigen Patch-Datei herunterladen Vergleichs-Datei herunterladen Alle Dateien ausklappen Alle Dateien einklappen

12
common/src/main/java/us/myles/ViaVersion/protocols/protocolsnapshotto1_12_2/data/ParticleRewriter.java
Datei anzeigen

@ -60,6 +60,7 @@ public class ParticleRewriter {
add(27, iconcrackHandler()); // (36->27) iconcrack_(id)_(data) -> minecraft:item add(27, iconcrackHandler()); // (36->27) iconcrack_(id)_(data) -> minecraft:item
// Item Slot The item that will be used. // Item Slot The item that will be used.
add(3, blockHandler()); // (37->3) blockcrack_(id+(data<<12)) -> minecraft:block add(3, blockHandler()); // (37->3) blockcrack_(id+(data<<12)) -> minecraft:block
// BlockState VarInt The ID of the block state.
add(3, blockWithoutMetaHandler()); // (38->3) blockdust_(id) -> minecraft:block add(3, blockWithoutMetaHandler()); // (38->3) blockdust_(id) -> minecraft:block
// BlockState VarInt The ID of the block state. // BlockState VarInt The ID of the block state.
add(36); // (39->36) droplet -> minecraft:rain add(36); // (39->36) droplet -> minecraft:rain
@ -135,17 +136,22 @@ public class ParticleRewriter {
// Transform to new Item // Transform to new Item
InventoryPackets.toClient(item); InventoryPackets.toClient(item);
particle.getArguments().add(new Particle.ParticleData(Type.FLAT_ITEM, item)); particle.getArguments().add(new Particle.ParticleData(Type.FLAT_ITEM, item)); // Item Slot The item that will be used.
return particle; return particle;
} }
}; };
} }
// TODO HANDLE // Handle (id+(data<<12)) encoded blocks
private static ParticleDataHandler blockHandler() { private static ParticleDataHandler blockHandler() {
return new ParticleDataHandler() { return new ParticleDataHandler() {
@Override @Override
public Particle handler(Particle particle, Integer[] data) { public Particle handler(Particle particle, Integer[] data) {
int value = data[0];
int combined = (((value & 4095) << 4) | (value >> 12 & 15));
int newId = WorldPackets.toNewId(combined);
particle.getArguments().add(new Particle.ParticleData(Type.VAR_INT, newId)); // BlockState VarInt The ID of the block state.
return particle; return particle;
} }
}; };
@ -158,7 +164,7 @@ public class ParticleRewriter {
public Particle handler(Particle particle, Integer[] data) { public Particle handler(Particle particle, Integer[] data) {
int blockId = data[0].shortValue() << 4; int blockId = data[0].shortValue() << 4;
int newBlockId = WorldPackets.toNewId(blockId); int newBlockId = WorldPackets.toNewId(blockId);
particle.getArguments().add(new Particle.ParticleData(Type.VAR_INT, newBlockId)); particle.getArguments().add(new Particle.ParticleData(Type.VAR_INT, newBlockId)); // BlockState VarInt The ID of the block state.
return particle; return particle;
} }
}; };