Skip to content

Commit 2b3d8cb

Browse files
basaighbasaigh
committed
24w38a
1 parent 2510338 commit 2b3d8cb

File tree

8 files changed

+40
-17
lines changed

8 files changed

+40
-17
lines changed

‎protocol/src/main/java/org/geysermc/mcprotocollib/protocol/ClientListener.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
import org.geysermc.mcprotocollib.protocol.packet.handshake.serverbound.ClientIntentionPacket;
2929
import org.geysermc.mcprotocollib.protocol.packet.ingame.clientbound.ClientboundStartConfigurationPacket;
3030
import org.geysermc.mcprotocollib.protocol.packet.ingame.serverbound.ServerboundConfigurationAcknowledgedPacket;
31-
import org.geysermc.mcprotocollib.protocol.packet.login.clientbound.ClientboundGameProfilePacket;
31+
import org.geysermc.mcprotocollib.protocol.packet.login.clientbound.ClientboundLoginFinishedPacket;
3232
import org.geysermc.mcprotocollib.protocol.packet.login.clientbound.ClientboundHelloPacket;
3333
import org.geysermc.mcprotocollib.protocol.packet.login.clientbound.ClientboundLoginCompressionPacket;
3434
import org.geysermc.mcprotocollib.protocol.packet.login.clientbound.ClientboundLoginDisconnectPacket;
@@ -89,7 +89,7 @@ public void packetReceived(Session session, Packet packet) {
8989

9090
session.send(new ServerboundKeyPacket(helloPacket.getPublicKey(), key, helloPacket.getChallenge()));
9191
session.enableEncryption(protocol.enableEncryption(key));
92-
} else if (packet instanceof ClientboundGameProfilePacket) {
92+
} else if (packet instanceof ClientboundLoginFinishedPacket) {
9393
session.send(new ServerboundLoginAcknowledgedPacket());
9494
} else if (packet instanceof ClientboundLoginDisconnectPacket loginDisconnectPacket) {
9595
session.disconnect(loginDisconnectPacket.getReason());

‎protocol/src/main/java/org/geysermc/mcprotocollib/protocol/ServerListener.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
import org.geysermc.mcprotocollib.protocol.packet.configuration.serverbound.ServerboundFinishConfigurationPacket;
2727
import org.geysermc.mcprotocollib.protocol.packet.handshake.serverbound.ClientIntentionPacket;
2828
import org.geysermc.mcprotocollib.protocol.packet.ingame.serverbound.ServerboundConfigurationAcknowledgedPacket;
29-
import org.geysermc.mcprotocollib.protocol.packet.login.clientbound.ClientboundGameProfilePacket;
29+
import org.geysermc.mcprotocollib.protocol.packet.login.clientbound.ClientboundLoginFinishedPacket;
3030
import org.geysermc.mcprotocollib.protocol.packet.login.clientbound.ClientboundHelloPacket;
3131
import org.geysermc.mcprotocollib.protocol.packet.login.clientbound.ClientboundLoginCompressionPacket;
3232
import org.geysermc.mcprotocollib.protocol.packet.login.clientbound.ClientboundLoginDisconnectPacket;
@@ -203,7 +203,7 @@ public void packetReceived(Session session, Packet packet) {
203203
public void packetSent(Session session, Packet packet) {
204204
if (packet instanceof ClientboundLoginCompressionPacket loginCompressionPacket) {
205205
session.setCompressionThreshold(loginCompressionPacket.getThreshold(), true);
206-
session.send(new ClientboundGameProfilePacket(session.getFlag(MinecraftConstants.PROFILE_KEY), true));
206+
session.send(new ClientboundLoginFinishedPacket(session.getFlag(MinecraftConstants.PROFILE_KEY)));
207207
}
208208
}
209209

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,7 @@
195195
import org.geysermc.mcprotocollib.protocol.packet.ingame.serverbound.player.ServerboundUseItemOnPacket;
196196
import org.geysermc.mcprotocollib.protocol.packet.ingame.serverbound.player.ServerboundUseItemPacket;
197197
import org.geysermc.mcprotocollib.protocol.packet.login.clientbound.ClientboundCustomQueryPacket;
198-
import org.geysermc.mcprotocollib.protocol.packet.login.clientbound.ClientboundGameProfilePacket;
198+
import org.geysermc.mcprotocollib.protocol.packet.login.clientbound.ClientboundLoginFinishedPacket;
199199
import org.geysermc.mcprotocollib.protocol.packet.login.clientbound.ClientboundHelloPacket;
200200
import org.geysermc.mcprotocollib.protocol.packet.login.clientbound.ClientboundLoginCompressionPacket;
201201
import org.geysermc.mcprotocollib.protocol.packet.login.clientbound.ClientboundLoginDisconnectPacket;
@@ -210,16 +210,16 @@
210210

211211
public class MinecraftCodec {
212212
public static final PacketCodec CODEC = PacketCodec.builder()
213-
.protocolVersion((1 << 30) | 209)
213+
.protocolVersion((1 << 30) | 210)
214214
.helper(MinecraftCodecHelper::new)
215-
.minecraftVersion("24w37a")
215+
.minecraftVersion("24w38a")
216216
.state(ProtocolState.HANDSHAKE, MinecraftPacketRegistry.builder()
217217
.registerServerboundPacket(ClientIntentionPacket.class, ClientIntentionPacket::new)
218218
)
219219
.state(ProtocolState.LOGIN, MinecraftPacketRegistry.builder()
220220
.registerClientboundPacket(ClientboundLoginDisconnectPacket.class, ClientboundLoginDisconnectPacket::new)
221221
.registerClientboundPacket(ClientboundHelloPacket.class, ClientboundHelloPacket::new)
222-
.registerClientboundPacket(ClientboundGameProfilePacket.class, ClientboundGameProfilePacket::new)
222+
.registerClientboundPacket(ClientboundLoginFinishedPacket.class, ClientboundLoginFinishedPacket::new)
223223
.registerClientboundPacket(ClientboundLoginCompressionPacket.class, ClientboundLoginCompressionPacket::new)
224224
.registerClientboundPacket(ClientboundCustomQueryPacket.class, ClientboundCustomQueryPacket::new)
225225
.registerClientboundPacket(ClientboundCookieRequestPacket.class, ClientboundCookieRequestPacket::new)

‎protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/recipe/RecipeType.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,7 @@ public enum RecipeType {
1313
CRAFTING_SPECIAL_TIPPEDARROW,
1414
CRAFTING_SPECIAL_BANNERDUPLICATE,
1515
CRAFTING_SPECIAL_SHIELDDECORATION,
16-
CRAFTING_SPECIAL_SHULKERBOXCOLORING,
17-
CRAFTING_SPECIAL_SUSPICIOUSSTEW,
16+
CRAFTING_TRANSMUTE,
1817
CRAFTING_SPECIAL_REPAIRITEM,
1918
SMELTING,
2019
BLASTING,

‎protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/recipe/data/TransmuteRecipeData.java‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
package org.geysermc.mcprotocollib.protocol.data.game.recipe.data;
2+
3+
import org.geysermc.mcprotocollib.protocol.data.game.Holder;
4+
import org.geysermc.mcprotocollib.protocol.data.game.recipe.CraftingBookCategory;
5+
import org.geysermc.mcprotocollib.protocol.data.game.recipe.Ingredient;
6+
7+
public record TransmuteRecipeData(String group, CraftingBookCategory category, Ingredient input, Ingredient material, int result) implements RecipeData {
8+
}

‎protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/ClientboundUpdateRecipesPacket.java‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
import org.geysermc.mcprotocollib.protocol.data.game.recipe.data.SmithingTransformRecipeData;
2222
import org.geysermc.mcprotocollib.protocol.data.game.recipe.data.SmithingTrimRecipeData;
2323
import org.geysermc.mcprotocollib.protocol.data.game.recipe.data.StoneCuttingRecipeData;
24+
import org.geysermc.mcprotocollib.protocol.data.game.recipe.data.TransmuteRecipeData;
2425

2526
@Data
2627
@With
@@ -64,6 +65,15 @@ public ClientboundUpdateRecipesPacket(ByteBuf in, MinecraftCodecHelper helper) {
6465

6566
data = new ShapedRecipeData(width, height, group, category, ingredients, result, showNotification);
6667
}
68+
case CRAFTING_TRANSMUTE -> {
69+
String group = helper.readString(in);
70+
CraftingBookCategory category = CraftingBookCategory.from(helper.readVarInt(in));
71+
Ingredient input = helper.readRecipeIngredient(in);
72+
Ingredient material = helper.readRecipeIngredient(in);
73+
int result = helper.readVarInt(in);
74+
75+
data = new TransmuteRecipeData(group, category, input, material, result);
76+
}
6777
case SMELTING, BLASTING, SMOKING, CAMPFIRE_COOKING -> {
6878
String group = helper.readString(in);
6979
CraftingBookCategory category = CraftingBookCategory.from(helper.readVarInt(in));
@@ -145,6 +155,15 @@ public void serialize(ByteBuf out, MinecraftCodecHelper helper) {
145155
helper.writeOptionalItemStack(out, data.getResult());
146156
out.writeBoolean(data.isShowNotification());
147157
}
158+
case CRAFTING_TRANSMUTE -> {
159+
TransmuteRecipeData data = (TransmuteRecipeData) recipe.getData();
160+
161+
helper.writeString(out, data.group());
162+
helper.writeVarInt(out, data.category().ordinal());
163+
helper.writeRecipeIngredient(out, data.input());
164+
helper.writeRecipeIngredient(out, data.material());
165+
helper.writeVarInt(out, data.result());
166+
}
148167
case SMELTING, BLASTING, SMOKING, CAMPFIRE_COOKING -> {
149168
CookedRecipeData data = (CookedRecipeData) recipe.getData();
150169

‎protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/login/clientbound/ClientboundGameProfilePacket.java‎ renamed to ‎protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/login/clientbound/ClientboundLoginFinishedPacket.java‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,23 +12,20 @@
1212
@Data
1313
@With
1414
@AllArgsConstructor
15-
public class ClientboundGameProfilePacket implements MinecraftPacket {
15+
public class ClientboundLoginFinishedPacket implements MinecraftPacket {
1616
private final @NonNull GameProfile profile;
17-
private final boolean strictErrorHandling;
1817

19-
public ClientboundGameProfilePacket(ByteBuf in, MinecraftCodecHelper helper) {
18+
public ClientboundLoginFinishedPacket(ByteBuf in, MinecraftCodecHelper helper) {
2019
GameProfile profile = new GameProfile(helper.readUUID(in), helper.readString(in));
2120
profile.setProperties(helper.readList(in, helper::readProperty));
2221
this.profile = profile;
23-
this.strictErrorHandling = in.readBoolean();
2422
}
2523

2624
@Override
2725
public void serialize(ByteBuf out, MinecraftCodecHelper helper) {
2826
helper.writeUUID(out, this.profile.getId());
2927
helper.writeString(out, this.profile.getName());
3028
helper.writeList(out, this.profile.getProperties(), helper::writeProperty);
31-
out.writeBoolean(this.strictErrorHandling);
3229
}
3330

3431
@Override

‎protocol/src/test/java/org/geysermc/mcprotocollib/protocol/packet/login/clientbound/ClientboundGameProfilePacketTest.java‎ renamed to ‎protocol/src/test/java/org/geysermc/mcprotocollib/protocol/packet/login/clientbound/ClientboundLoginFinishedPacketTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66

77
import java.util.UUID;
88

9-
public class ClientboundGameProfilePacketTest extends PacketTest {
9+
public class ClientboundLoginFinishedPacketTest extends PacketTest {
1010
@BeforeEach
1111
public void setup() {
12-
this.setPackets(new ClientboundGameProfilePacket(new GameProfile(UUID.randomUUID(), "Username"), true));
12+
this.setPackets(new ClientboundLoginFinishedPacket(new GameProfile(UUID.randomUUID(), "Username")));
1313
}
1414
}

0 commit comments

Comments
 (0)