Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,14 @@
import net.minecraft.client.Minecraft;
import net.minecraft.core.entity.player.Player;
import net.minecraft.core.net.packet.Packet;
import net.minecraft.core.net.packet.PacketCustomPayload;
import net.minecraft.server.MinecraftServer;
import net.minecraft.server.entity.player.PlayerServer;
import org.jetbrains.annotations.NotNull;
import turniplabs.halplibe.helper.EnvironmentHelper;

import java.lang.reflect.InvocationTargetException;
import java.nio.ByteBuffer;
import java.util.*;
import java.util.function.BiConsumer;
import java.util.function.Function;
Expand Down Expand Up @@ -125,9 +127,12 @@ private static void sendToPlayerServer(Player player, NetworkMessage message)
}

@Environment(EnvType.SERVER)
public static void sendToPlayerMessagesConfiguration(Player player)
{
((PlayerServer)player).playerNetServerHandler.sendPacket(encode(new MessageIdsNetworkMessage(packetIds)));
public static void sendToPlayerMessagesConfiguration(Player player) {
((PlayerServer) player).playerNetServerHandler.sendPacket(
encode(
new MessageIdsNetworkMessage(packetIds)
).toPacketCustomPayload()
);
}

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
import net.minecraft.client.Minecraft;
import net.minecraft.core.net.handler.PacketHandler;
import net.minecraft.core.net.packet.Packet;
import net.minecraft.core.net.packet.PacketCustomPayload;
import org.jetbrains.annotations.NotNull;
import turniplabs.halplibe.helper.EnvironmentHelper;
import turniplabs.halplibe.mixin.accessors.PacketHandlerServerAccessor;
Expand All @@ -30,6 +31,16 @@ public UniversalPacket() {
this.readIndex = 0;
}

public UniversalPacket(PacketCustomPayload packetCustomPayload) {
this.buffer = packetCustomPayload.data;
this.writeIndex = packetCustomPayload.data.length - 1;
this.readIndex = 0;
}

public PacketCustomPayload toPacketCustomPayload() {
return new PacketCustomPayload("HALPLIBE", buffer);
}

@Deprecated
public void read(DataInputStream dis) throws IOException {
final int length = dis.readInt();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,13 @@

import net.fabricmc.loader.api.FabricLoader;
import net.minecraft.client.net.handler.PacketHandlerClient;
import net.minecraft.core.net.packet.PacketCustomPayload;
import net.minecraft.core.net.packet.PacketLogin;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Inject;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
import turniplabs.halplibe.helper.network.UniversalPacket;
import turniplabs.halplibe.util.RecipeEntrypoint;

@Mixin(value = PacketHandlerClient.class,remap = false)
Expand All @@ -15,4 +17,11 @@ public class PacketHandlerClientMixin {
public void handleLogin(PacketLogin packet1login, CallbackInfo ci) {
FabricLoader.getInstance().getEntrypoints("recipesReady", RecipeEntrypoint.class).forEach(RecipeEntrypoint::initNamespaces);
}

@Inject(method = "handleCustomPayload", at = @At(value = "TAIL"))
public void handleCustomPayload(PacketCustomPayload customPayloadPacket, CallbackInfo ci) {
if ("HALPLIBE".equals(customPayloadPacket.channel)) {
new UniversalPacket(customPayloadPacket).handlePacket((PacketHandlerClient) ((Object) this));
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
package turniplabs.halplibe.mixin;

import net.minecraft.core.net.packet.PacketCustomPayload;
import net.minecraft.server.net.handler.PacketHandlerServer;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Inject;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
import turniplabs.halplibe.helper.network.UniversalPacket;

@Mixin(value = PacketHandlerServer.class,remap = false)
public class PacketHandlerServerMixin {
@Inject(method = "handleCustomPayload", at = @At(value = "TAIL"))
public void handleCustomPayload(PacketCustomPayload customPayloadPacket, CallbackInfo ci) {
if ("HALPLIBE".equals(customPayloadPacket.channel)) {
new UniversalPacket(customPayloadPacket).handlePacket((PacketHandlerServer) ((Object) this));
}
}
}
13 changes: 7 additions & 6 deletions src/main/resources/halplibe.mixins.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,24 +9,25 @@
"accessors.BlockAccessor",
"accessors.BlocksAccessor",
"accessors.LanguageAccessor",
"accessors.PacketHandlerServerAccessor",
"accessors.WeightedRandomBagAccessor",
"accessors.WeightedRandomBagEntryAccessor",
"accessors.PacketHandlerServerAccessor"
"accessors.WeightedRandomBagEntryAccessor"
],
"client": [
"MinecraftMixin",
"PacketHandlerClientMixin",
"accessors.EntityFireflyFXAccessor",
"accessors.EntityFXAccessor",
"models.BlockColorDispatcherMixin",
"models.BlockModelDispatcherMixin",
"models.EntityRenderDispatcherMixin",
"models.ItemModelDispatcherMixin",
"models.TileEntityRendererDispatcherMixin",
"accessors.EntityFireflyFXAccessor",
"accessors.EntityFXAccessor"
"models.TileEntityRendererDispatcherMixin"
],
"server": [
"MinecraftServerMixin",
"PacketHandlerLoginMixin"
"PacketHandlerLoginMixin",
"PacketHandlerServerMixin"
],
"injectors": {
"defaultRequire": 1
Expand Down