25w33a

Author: eclipseisoffline

protocol/src/main/java/org/geysermc/mcprotocollib/protocol/codec/MinecraftCodec.java

@@ -224,8 +224,8 @@
 
 public class MinecraftCodec {
     public static final PacketCodec CODEC = PacketCodec.builder()
-            .protocolVersion((1 << 30) | 260)
-            .minecraftVersion("25w32a")
+            .protocolVersion((1 << 30) | 262)
+            .minecraftVersion("25w33a")
             .state(ProtocolState.HANDSHAKE, MinecraftPacketRegistry.builder()
                     .registerServerboundPacket(ClientIntentionPacket.class, ClientIntentionPacket::new)
             )

protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/WeightedList.java

@@ -0,0 +1,63 @@
+package org.geysermc.mcprotocollib.protocol.data.game;
+
+import io.netty.buffer.ByteBuf;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import org.checkerframework.checker.index.qual.NonNegative;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftTypes;
+
+import java.util.List;
+import java.util.function.BiConsumer;
+import java.util.function.Function;
+
+@Data
+@AllArgsConstructor
+public class WeightedList<T> {
+    private final List<Entry<T>> entries;
+
+    public WeightedList(ByteBuf in, Function<ByteBuf, T> reader) {
+        entries = MinecraftTypes.readList(in, input -> new Entry<>(input, reader));
+    }
+
+    public void write(ByteBuf out, BiConsumer<T, ByteBuf> writer) {
+        MinecraftTypes.writeList(out, entries, (output, entry) -> entry.write(out, writer));
+    }
+
+    public WeightedList<T> with(T value, @NonNegative int weight) {
+        add(value, weight);
+        return this;
+    }
+
+    public void add(T value, @NonNegative int weight) {
+        add(new Entry<>(value, weight));
+    }
+
+    public void add(Entry<T> entry) {
+        entries.add(entry);
+    }
+
+    public Entry<T> get(int index) {
+        return entries.get(index);
+    }
+
+    public boolean contains(T value) {
+        for (Entry<T> entry : entries) {
+            if (entry.value.equals(value)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    public record Entry<T>(T value, @NonNegative int weight) {
+
+        public Entry(ByteBuf in, Function<ByteBuf, T> reader) {
+            this(reader.apply(in), MinecraftTypes.readVarInt(in));
+        }
+
+        public void write(ByteBuf out, BiConsumer<T, ByteBuf> writer) {
+            writer.accept(value, out);
+            MinecraftTypes.writeVarInt(out, weight);
+        }
+    }
+}

protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/level/sound/BuiltinSound.java

@@ -394,6 +394,7 @@ public enum BuiltinSound implements Sound {
     BLOCK_COPPER_GOLEM_STATUE_STEP("block.copper_golem_statue.step"),
     BLOCK_COPPER_GOLEM_STATUE_FALL("block.copper_golem_statue.fall"),
     ENTITY_COPPER_GOLEM_SPAWN("entity.copper_golem.spawn"),
+    ENTITY_COPPER_GOLEM_SHEAR("entity.copper_golem.shear"),
     BLOCK_COPPER_GRATE_BREAK("block.copper_grate.break"),
     BLOCK_COPPER_GRATE_STEP("block.copper_grate.step"),
     BLOCK_COPPER_GRATE_PLACE("block.copper_grate.place"),
@@ -1645,6 +1646,7 @@ public enum BuiltinSound implements Sound {
     BLOCK_HANGING_SIGN_WAXED_INTERACT_FAIL("block.hanging_sign.waxed_interact_fail"),
     BLOCK_SIGN_WAXED_INTERACT_FAIL("block.sign.waxed_interact_fail"),
     BLOCK_WATER_AMBIENT("block.water.ambient"),
+    WEATHER_END_FLASH("weather.end_flash"),
     WEATHER_RAIN("weather.rain"),
     WEATHER_RAIN_ABOVE("weather.rain.above"),
     BLOCK_WET_GRASS_BREAK("block.wet_grass.break"),

protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/level/ClientboundExplodePacket.java

@@ -8,6 +8,7 @@
 import org.cloudburstmc.math.vector.Vector3d;
 import org.geysermc.mcprotocollib.protocol.codec.MinecraftPacket;
 import org.geysermc.mcprotocollib.protocol.codec.MinecraftTypes;
+import org.geysermc.mcprotocollib.protocol.data.game.WeightedList;
 import org.geysermc.mcprotocollib.protocol.data.game.level.particle.Particle;
 import org.geysermc.mcprotocollib.protocol.data.game.level.sound.BuiltinSound;
 import org.geysermc.mcprotocollib.protocol.data.game.level.sound.CustomSound;
@@ -19,22 +20,30 @@
 @AllArgsConstructor
 public class ClientboundExplodePacket implements MinecraftPacket {
     private final Vector3d center;
+    private final float radius;
+    private final int blockCount;
     private final @Nullable Vector3d playerKnockback;
     private final @NonNull Particle explosionParticle;
     private final @NonNull Sound explosionSound;
+    private final @NonNull WeightedList<BlockParticleInfo> blockParticles;
 
     public ClientboundExplodePacket(ByteBuf in) {
         this.center = Vector3d.from(in.readDouble(), in.readDouble(), in.readDouble());
+        this.radius = in.readFloat();
+        this.blockCount = in.readInt();
         this.playerKnockback = MinecraftTypes.readNullable(in, (input) -> Vector3d.from(input.readDouble(), input.readDouble(), input.readDouble()));
         this.explosionParticle = MinecraftTypes.readParticle(in);
         this.explosionSound = MinecraftTypes.readById(in, BuiltinSound::from, MinecraftTypes::readSoundEvent);
+        this.blockParticles = new WeightedList<>(in, BlockParticleInfo::new);
     }
 
     @Override
     public void serialize(ByteBuf out) {
         out.writeDouble(this.center.getX());
         out.writeDouble(this.center.getY());
         out.writeDouble(this.center.getZ());
+        out.writeFloat(radius);
+        out.writeInt(blockCount);
         MinecraftTypes.writeNullable(out, this.playerKnockback, (output, playerKnockback) -> {
             output.writeDouble(playerKnockback.getX());
             output.writeDouble(playerKnockback.getY());
@@ -47,10 +56,24 @@ public void serialize(ByteBuf out) {
         } else {
             MinecraftTypes.writeVarInt(out, ((BuiltinSound) this.explosionSound).ordinal() + 1);
         }
+        blockParticles.write(out, BlockParticleInfo::write);
     }
 
     @Override
     public boolean shouldRunOnGameThread() {
         return true;
     }
+
+    public record BlockParticleInfo(Particle particle, float scaling, float speed) {
+
+        public BlockParticleInfo(ByteBuf in) {
+            this(MinecraftTypes.readParticle(in), in.readFloat(), in.readFloat());
+        }
+
+        public void write(ByteBuf out) {
+            MinecraftTypes.writeParticle(out, particle);
+            out.writeFloat(scaling);
+            out.writeFloat(speed);
+        }
+    }
 }