virt/Sit
1
0
Fork 0
forked from virt-mirrors/Sit
Code Pull requests Activity

Revert "updated packet system"

Browse source 
This reverts commit 2e02d67c8e.
This commit is contained in:
Oth3r 2024-04-29 12:28:30 -05:00
commit df46547cbf
3 changed files with 22 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

26
src/main/java/one/oth3r/sit/Sit.java
View file

@ -7,13 +7,17 @@ import net.fabricmc.api.ModInitializer;
import net.fabricmc.fabric.api.networking.v1.PayloadTypeRegistry;
import net.fabricmc.fabric.api.networking.v1.ServerPlayNetworking;
import net.minecraft.network.RegistryByteBuf;
import net.minecraft.network.codec.PacketCodec;
import net.minecraft.network.codec.PacketCodecs;
import net.minecraft.network.packet.CustomPayload;
import net.minecraft.server.MinecraftServer;
import net.minecraft.server.command.CommandManager;
import net.minecraft.server.network.ServerPlayerEntity;
import net.minecraft.text.MutableText;
import net.minecraft.text.Text;
import net.minecraft.util.Identifier;
import one.oth3r.sit.file.Config;
import one.oth3r.sit.packet.CustomPayloads;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@ -37,15 +41,23 @@ public class Sit implements ModInitializer {
Config.load();
Events.register();
//PACKETS
PayloadTypeRegistry.playC2S().register(CustomPayloads.SettingsPayload.ID, CustomPayloads.SettingsPayload.CODEC);
ServerPlayNetworking.registerGlobalReceiver(CustomPayloads.SettingsPayload.ID,((payload, context) -> server.execute(() -> {
PayloadTypeRegistry.playC2S().register(SettingsPayload.ID, SettingsPayload.CODEC);
ServerPlayNetworking.registerGlobalReceiver(SettingsPayload.ID,((payload, context) -> {
server.execute(() -> {
Type hashMapToken = new TypeToken<HashMap<String, Object>>() {}.getType();
Gson gson = new GsonBuilder().disableHtmlEscaping().create();
playerSettings.put(context.player(),gson.fromJson(payload.value(),hashMapToken));
})));
playerSettings.put(context.player(),gson.fromJson(payload.value,hashMapToken));
});
}));
}
public record SettingsPayload(String value) implements CustomPayload {
public static final CustomPayload.Id<SettingsPayload> ID = new CustomPayload.Id<>(new Identifier(MOD_ID,"settings_v1.1"));
public static final PacketCodec<RegistryByteBuf, SettingsPayload> CODEC = PacketCodecs.STRING.xmap(SettingsPayload::new, SettingsPayload::value).cast();
@Override
public Id<SettingsPayload> getId() {
return ID;
}
}
public static MutableText lang(String key, Object... args) {
if (isClient) return Text.translatable(key, args);
else return LangReader.of(key, args).getTxT();

4
src/main/java/one/oth3r/sit/SitClient.java
View file

@ -6,7 +6,6 @@ import net.fabricmc.api.ClientModInitializer;
import net.fabricmc.fabric.api.client.networking.v1.ClientPlayConnectionEvents;
import net.fabricmc.fabric.api.client.networking.v1.ClientPlayNetworking;
import net.minecraft.network.packet.CustomPayload;
import one.oth3r.sit.packet.CustomPayloads;
public class SitClient implements ClientModInitializer {
public static boolean inGame = false;
@ -21,9 +20,8 @@ public class SitClient implements ClientModInitializer {
// reset inGame
ClientPlayConnectionEvents.DISCONNECT.register((handler, client) -> inGame = false);
}
public static CustomPayload sendPackets() {
Gson gson = new GsonBuilder().disableHtmlEscaping().create();
return new CustomPayloads.SettingsPayload(gson.toJson(Utl.HandSettings.getHandSettings()));
return new Sit.SettingsPayload(gson.toJson(Utl.getHandSettings()));
}
}

27
src/main/java/one/oth3r/sit/packet/CustomPayloads.java
View file

@ -1,27 +0,0 @@
package one.oth3r.sit.packet;
import net.minecraft.network.RegistryByteBuf;
import net.minecraft.network.codec.PacketCodec;
import net.minecraft.network.codec.PacketCodecs;
import net.minecraft.network.packet.CustomPayload;
import net.minecraft.util.Identifier;
import one.oth3r.sit.Sit;
public class CustomPayloads {
public record SettingsPayload(String value) implements CustomPayload {
public static final Id<SettingsPayload> ID = new Id<>(new Identifier(Sit.MOD_ID,"settings_v1.1"));
public static final PacketCodec<RegistryByteBuf, SettingsPayload> CODEC = PacketCodecs.STRING.xmap(SettingsPayload::new, SettingsPayload::value).cast();
@Override
public Id<SettingsPayload> getId() {
return ID;
}
@Override
public String value() {
return value;
}
}
}