Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

refactor(CraftingManager): change packet fields to private and optimize packet caching #407

Merged
merged 3 commits into from
Feb 21, 2025
Merged

refactor(CraftingManager): change packet fields to private and optimize packet caching #407

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
19eb0a2
refactor(CraftingManager): change packet fields to private and optimi…
lt-name Feb 20, 2025
dc9d84b
Merge branch 'master' into feat/improve-crafting
lt-name Feb 21, 2025
34b6463
Merge branch 'master' into feat/improve-crafting
lt-name Feb 21, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
77 changes: 5 additions & 72 deletions src/main/java/cn/nukkit/Server.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@
import cn.nukkit.network.Network;
import cn.nukkit.network.RakNetInterface;
import cn.nukkit.network.SourceInterface;
import cn.nukkit.network.protocol.BatchPacket;
import cn.nukkit.network.protocol.DataPacket;
import cn.nukkit.network.protocol.PlayerListPacket;
import cn.nukkit.network.protocol.ProtocolInfo;
Expand Down Expand Up @@ -1333,78 +1334,10 @@ public void sendFullPlayerListData(Player player) {
}

public void sendRecipeList(Player player) {
if (player.protocol >= ProtocolInfo.v1_21_60) {
player.dataPacket(CraftingManager.packet776);
} else if (player.protocol >= ProtocolInfo.v1_21_50_26) {
player.dataPacket(CraftingManager.packet766);
} else if (player.protocol >= ProtocolInfo.v1_21_40) {
player.dataPacket(CraftingManager.packet748);
} else if (player.protocol >= ProtocolInfo.v1_21_30) {
player.dataPacket(CraftingManager.packet729);
} else if (player.protocol >= ProtocolInfo.v1_21_20) {
player.dataPacket(CraftingManager.packet712);
} else if (player.protocol >= ProtocolInfo.v1_21_0) {
player.dataPacket(CraftingManager.packet685);
} else if (player.protocol >= ProtocolInfo.v1_20_80) {
player.dataPacket(CraftingManager.packet671);
} else if (player.protocol >= ProtocolInfo.v1_20_70) {
player.dataPacket(CraftingManager.packet662);
} else if (player.protocol >= ProtocolInfo.v1_20_60) {
player.dataPacket(CraftingManager.packet649);
} else if (player.protocol >= ProtocolInfo.v1_20_50) {
player.dataPacket(CraftingManager.packet630);
} else if (player.protocol >= ProtocolInfo.v1_20_40) {
player.dataPacket(CraftingManager.packet622);
} else if (player.protocol >= ProtocolInfo.v1_20_30_24) {
player.dataPacket(CraftingManager.packet618);
} else if (player.protocol >= ProtocolInfo.v1_20_10_21) {
player.dataPacket(CraftingManager.packet594);
} else if (player.protocol >= ProtocolInfo.v1_20_0_23) {
player.dataPacket(CraftingManager.packet589);
} else if (player.protocol >= ProtocolInfo.v1_19_80) {
player.dataPacket(CraftingManager.packet582);
} else if (player.protocol >= ProtocolInfo.v1_19_70_24) {
player.dataPacket(CraftingManager.packet575);
} else if (player.protocol >= ProtocolInfo.v1_19_60) {
player.dataPacket(CraftingManager.packet567);
} else if (player.protocol >= ProtocolInfo.v1_19_50_20) {
player.dataPacket(CraftingManager.packet560);
} else if (player.protocol >= ProtocolInfo.v1_19_30_23) {
player.dataPacket(CraftingManager.packet554);
} else if (player.protocol >= ProtocolInfo.v1_19_20) {
player.dataPacket(CraftingManager.packet544);
} else if (player.protocol >= ProtocolInfo.v1_19_0_29) {
player.dataPacket(CraftingManager.packet527);
} else if (player.protocol >= ProtocolInfo.v1_18_30) {
player.dataPacket(CraftingManager.packet503);
} else if (player.protocol >= ProtocolInfo.v1_18_10_26) {
player.dataPacket(CraftingManager.packet486);
} else if (player.protocol >= ProtocolInfo.v1_17_40) {
player.dataPacket(CraftingManager.packet471);
} else if (player.protocol >= ProtocolInfo.v1_17_30) {
player.dataPacket(CraftingManager.packet465);
} else if (player.protocol >= ProtocolInfo.v1_17_10) {
player.dataPacket(CraftingManager.packet448);
} else if (player.protocol >= ProtocolInfo.v1_17_0) {
player.dataPacket(CraftingManager.packet440);
} else if (player.protocol >= ProtocolInfo.v1_16_220) {
player.dataPacket(CraftingManager.packet431);
} else if (player.protocol >= ProtocolInfo.v1_16_100) {
player.dataPacket(CraftingManager.packet419);
} else if (player.protocol >= ProtocolInfo.v1_16_0) {
player.dataPacket(CraftingManager.packet407);
} else if (player.protocol >= ProtocolInfo.v1_13_0) {
player.dataPacket(CraftingManager.packet388);
} else if (player.protocol == ProtocolInfo.v1_12_0) {
player.dataPacket(CraftingManager.packet361);
} else if (player.protocol == ProtocolInfo.v1_11_0) {
player.dataPacket(CraftingManager.packet354);
} else if (player.protocol == ProtocolInfo.v1_10_0) {
player.dataPacket(CraftingManager.packet340);
} else if (player.protocol == ProtocolInfo.v1_9_0 || player.protocol == ProtocolInfo.v1_8_0 || player.protocol == ProtocolInfo.v1_7_0) { // these should work just fine
player.dataPacket(CraftingManager.packet313);
}
// Don't send recipes if they wouldn't work anyways
BatchPacket cachedPacket = this.craftingManager.getCachedPacket(player.protocol);
if (cachedPacket != null) { // Don't send recipes if they wouldn't work anyways
player.dataPacket(cachedPacket);
}
}

private void checkTickUpdates(int currentTick) {
Expand Down
Loading