Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: FabricMC/fabric
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 0.95.0+1.20.4
Choose a base ref
...
head repository: FabricMC/fabric
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 0.95.1+1.20.4
Choose a head ref
  • 2 commits
  • 4 files changed
  • 2 contributors

Commits on Jan 22, 2024

  1. send c:register packet for play phase instead of config (#3544)

    @deirn
    deirn authored Jan 22, 2024
    Copy the full SHA
    2e5ac54 View commit details

  2. Bump version

    @modmuss50
    modmuss50 committed Jan 22, 2024
    Copy the full SHA
    bb7686d View commit details
3 changes: 2 additions & 1 deletion ...etworking-api-v1/src/main/java/net/fabricmc/fabric/impl/networking/CommonPacketsImpl.java
View file
Original file line number Diff line number Diff line change
@@ -25,6 +25,7 @@

import net.fabricmc.fabric.api.networking.v1.ServerConfigurationConnectionEvents;
import net.fabricmc.fabric.api.networking.v1.ServerConfigurationNetworking;
import net.fabricmc.fabric.api.networking.v1.ServerPlayNetworking;
import net.fabricmc.fabric.impl.networking.server.ServerConfigurationNetworkAddon;
import net.fabricmc.fabric.impl.networking.server.ServerNetworkingImpl;

@@ -95,7 +96,7 @@ private record CommonRegisterConfigurationTask(ServerConfigurationNetworkAddon a

@Override
public void sendPacket(Consumer<Packet<?>> sender) {
addon.sendPacket(addon.createRegisterPayload());
addon.sendPacket(new CommonRegisterPayload(addon.getNegotiatedVersion(), CommonRegisterPayload.PLAY_PHASE, ServerPlayNetworking.getGlobalReceivers()));
}

@Override
6 changes: 6 additions & 0 deletions ...1/src/testmod/java/net/fabricmc/fabric/test/networking/play/NetworkingPlayPacketTest.java
View file
Original file line number Diff line number Diff line change
@@ -26,6 +26,7 @@
import com.mojang.brigadier.Command;
import com.mojang.brigadier.CommandDispatcher;
import com.mojang.brigadier.arguments.StringArgumentType;
import org.apache.commons.lang3.Validate;

import net.minecraft.network.PacketByteBuf;
import net.minecraft.network.listener.ClientPlayPacketListener;
@@ -43,6 +44,7 @@
import net.fabricmc.fabric.api.networking.v1.FabricPacket;
import net.fabricmc.fabric.api.networking.v1.PacketByteBufs;
import net.fabricmc.fabric.api.networking.v1.PacketType;
import net.fabricmc.fabric.api.networking.v1.ServerPlayConnectionEvents;
import net.fabricmc.fabric.api.networking.v1.ServerPlayNetworking;
import net.fabricmc.fabric.test.networking.NetworkingTestmods;

@@ -133,6 +135,10 @@ public void onInitialize() {
}
}
});

ServerPlayConnectionEvents.JOIN.register((handler, sender, server) -> {
Validate.isTrue(ServerPlayNetworking.canSend(handler, OverlayPacket.PACKET_TYPE));
});
}

public record OverlayPacket(Text message) implements FabricPacket {
3 changes: 1 addition & 2 deletions .../java/net/fabricmc/fabric/test/networking/client/play/NetworkingPlayPacketClientTest.java
View file
Original file line number Diff line number Diff line change
@@ -25,7 +25,6 @@
import net.fabricmc.api.ClientModInitializer;
import net.fabricmc.fabric.api.client.command.v2.ClientCommandManager;
import net.fabricmc.fabric.api.client.command.v2.ClientCommandRegistrationCallback;
import net.fabricmc.fabric.api.client.networking.v1.ClientPlayConnectionEvents;
import net.fabricmc.fabric.api.client.networking.v1.ClientPlayNetworking;
import net.fabricmc.fabric.api.networking.v1.PacketByteBufs;
import net.fabricmc.fabric.api.networking.v1.PacketSender;
@@ -37,7 +36,7 @@ public final class NetworkingPlayPacketClientTest implements ClientModInitialize

@Override
public void onInitializeClient() {
ClientPlayConnectionEvents.INIT.register((handler, client) -> ClientPlayNetworking.registerReceiver(NetworkingPlayPacketTest.OverlayPacket.PACKET_TYPE, this));
ClientPlayNetworking.registerGlobalReceiver(NetworkingPlayPacketTest.OverlayPacket.PACKET_TYPE, this);

ClientCommandRegistrationCallback.EVENT.register((dispatcher, dedicated) -> dispatcher.register(
ClientCommandManager.literal("clientnetworktestcommand")
14 changes: 7 additions & 7 deletions gradle.properties
View file
Original file line number Diff line number Diff line change
@@ -2,7 +2,7 @@ org.gradle.jvmargs=-Xmx2560M
org.gradle.parallel=true
fabric.loom.multiProjectOptimisation=true

version=0.95.0
version=0.95.1
minecraft_version=1.20.4
yarn_version=+build.1
loader_version=0.15.1
@@ -21,11 +21,11 @@ fabric-blockrenderlayer-v1-version=1.1.46
fabric-command-api-v1-version=1.2.41
fabric-command-api-v2-version=2.2.20
fabric-commands-v0-version=0.2.58
fabric-containers-v0-version=0.1.85
fabric-containers-v0-version=0.1.86
fabric-content-registries-v0-version=5.0.10
fabric-crash-report-info-v1-version=0.2.23
fabric-data-attachment-api-v1-version=1.0.0
fabric-data-generation-api-v1-version=13.1.21
fabric-data-generation-api-v1-version=13.1.22
fabric-dimensions-v1-version=2.1.61
fabric-entity-events-v1-version=1.6.0
fabric-events-interaction-v0-version=0.7.1
@@ -42,11 +42,11 @@ fabric-message-api-v1-version=6.0.5
fabric-mining-level-api-v1-version=2.1.60
fabric-model-loading-api-v1-version=1.0.8
fabric-models-v0-version=0.4.7
fabric-networking-api-v1-version=3.1.6
fabric-networking-api-v1-version=3.1.7
fabric-object-builder-api-v1-version=13.0.9
fabric-particles-v1-version=1.1.7
fabric-recipe-api-v1-version=2.0.19
fabric-registry-sync-v0-version=4.0.17
fabric-recipe-api-v1-version=2.0.20
fabric-registry-sync-v0-version=4.0.18
fabric-renderer-api-v1-version=3.2.4
fabric-renderer-indigo-version=1.5.4
fabric-renderer-registries-v1-version=3.2.52
@@ -57,7 +57,7 @@ fabric-rendering-v1-version=3.1.0
fabric-resource-conditions-api-v1-version=2.3.14
fabric-resource-loader-v0-version=0.11.16
fabric-screen-api-v1-version=2.0.17
fabric-screen-handler-api-v1-version=1.3.54
fabric-screen-handler-api-v1-version=1.3.55
fabric-sound-api-v1-version=1.0.17
fabric-transfer-api-v1-version=4.0.8
fabric-transitive-access-wideners-v1-version=5.0.14