MinecraftMods/BCLib
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

First (untested) version of File-Chunker

Browse source
This commit is contained in:
Frank 2021-08-22 15:00:29 +02:00
parent 5e4f4d5b43
commit 63830a27d6
5 changed files with 194 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/main/java/ru/bclib/BCLib.java
View file

@ -17,6 +17,7 @@ import ru.bclib.recipes.CraftingRecipes;
import ru.bclib.registry.BaseBlockEntities;
import ru.bclib.registry.BaseRegistry;
import ru.bclib.util.Logger;
import ru.bclib.util.ModUtil;
import ru.bclib.world.generator.BCLibEndBiomeSource;
import ru.bclib.world.generator.BCLibNetherBiomeSource;
import ru.bclib.world.generator.GeneratorOptions;
@ -30,6 +31,7 @@ public class BCLib implements ModInitializer {
@Override
public void onInitialize() {
ModUtil.convertModVersion("1.3.0-pre1-1.17.1");
BaseRegistry.register();
GeneratorOptions.init();
BaseBlockEntities.register();

19
src/main/java/ru/bclib/api/dataexchange/DataHandler.java
View file

@ -15,6 +15,9 @@ import net.minecraft.server.MinecraftServer;
import net.minecraft.server.level.ServerPlayer;
import net.minecraft.server.network.ServerGamePacketListenerImpl;
import ru.bclib.BCLib;
import ru.bclib.api.dataexchange.handler.autosync.Chunker.FileChunkSender;
import java.util.List;
public abstract class DataHandler extends BaseDataHandler {
public abstract static class WithoutPayload extends DataHandler {
@ -68,8 +71,13 @@ public abstract class DataHandler extends BaseDataHandler {
FriendlyByteBuf buf = PacketByteBufs.create();
serializeData(buf, false);
for (ServerPlayer player : PlayerLookup.all(server)) {
ServerPlayNetworking.send(player, getIdentifier(), buf);
if (buf.readableBytes()>1024*1024) {
final FileChunkSender sender = new FileChunkSender(buf);
sender.sendChunks(PlayerLookup.all(server));
} else {
for (ServerPlayer player : PlayerLookup.all(server)) {
ServerPlayNetworking.send(player, getIdentifier(), buf);
}
}
}
}
@ -79,7 +87,12 @@ public abstract class DataHandler extends BaseDataHandler {
if (prepareData(false)) {
FriendlyByteBuf buf = PacketByteBufs.create();
serializeData(buf, false);
ServerPlayNetworking.send(player, getIdentifier(), buf);
if (buf.readableBytes()>1024*1024) {
final FileChunkSender sender = new FileChunkSender(buf);
sender.sendChunks(List.of(player));
} else {
ServerPlayNetworking.send(player, getIdentifier(), buf);
}
}
}

175
src/main/java/ru/bclib/api/dataexchange/handler/autosync/Chunker.java Normal file
View file

@ -0,0 +1,175 @@
package ru.bclib.api.dataexchange.handler.autosync;
import net.fabricmc.fabric.api.networking.v1.PacketByteBufs;
import net.fabricmc.fabric.api.networking.v1.PacketSender;
import net.fabricmc.fabric.api.networking.v1.ServerPlayNetworking;
import net.minecraft.client.Minecraft;
import net.minecraft.network.FriendlyByteBuf;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.server.level.ServerPlayer;
import org.jetbrains.annotations.NotNull;
import ru.bclib.BCLib;
import ru.bclib.api.dataexchange.DataHandler;
import ru.bclib.api.dataexchange.DataHandlerDescriptor;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
import java.util.Objects;
import java.util.UUID;
public class Chunker extends DataHandler.FromServer {
public static class FileChunkReceiver {
@NotNull
public final UUID uuid;
public final int chunkCount;
@NotNull
private final FriendlyByteBuf networkedBuf;
private static List<FileChunkReceiver> active = new ArrayList<>(1);
private static FileChunkReceiver newReceiver(@NotNull UUID uuid, int chunkCount){
final FileChunkReceiver r = new FileChunkReceiver(uuid, chunkCount);
active.add(r);
return r;
}
private static FileChunkReceiver getOrCreate(@NotNull UUID uuid, int chunkCount){
return active.stream().filter(r -> r.uuid.equals(uuid)).findFirst().orElse(newReceiver(uuid, chunkCount));
}
public static FileChunkReceiver get(@NotNull UUID uuid){
return active.stream().filter(r -> r.uuid.equals(uuid)).findFirst().orElse(null);
}
private FileChunkReceiver(@NotNull UUID uuid, int chunkCount){
this.uuid = uuid;
this.chunkCount = chunkCount;
networkedBuf = PacketByteBufs.create();
}
@Override
public boolean equals(Object o) {
if (this == o) return true;
if (!(o instanceof FileChunkReceiver)) return false;
FileChunkReceiver that = (FileChunkReceiver) o;
return uuid.equals(that.uuid);
}
@Override
public int hashCode() {
return Objects.hash(uuid);
}
public boolean testFinished(){
return false;
}
public void processReceived(FriendlyByteBuf buf, int serialNo, int size){
}
}
public static class FileChunkSender {
private final FriendlyByteBuf networkedBuf;
public final UUID uuid;
public final int chunkCount;
public final int size;
public FileChunkSender(FriendlyByteBuf buf){
networkedBuf = buf;
size = buf.readableBytes();
chunkCount = (int)Math.ceil((double)size / MAX_PAYLOAD_SIZE);
uuid = UUID.randomUUID();
}
public void sendChunks(Collection<ServerPlayer> players){
BCLib.LOGGER.info("Sending Request in " + chunkCount + " File-Chunks");
for (int i=0; i<chunkCount; i++){
Chunker c = new Chunker(i, uuid, networkedBuf, chunkCount);
FriendlyByteBuf buf = PacketByteBufs.create();
c.serializeDataOnServer(buf);
for (ServerPlayer player : players){
ServerPlayNetworking.send(player, DESCRIPTOR.IDENTIFIER, buf);
}
}
}
}
private static final int HEADER_SIZE = 1 + 16 + 4 + 4; //header = version + UUID + serialNo + size
public static final int MAX_PACKET_SIZE = 1024*1024;
private static final int MAX_PAYLOAD_SIZE = MAX_PACKET_SIZE - HEADER_SIZE;
public static DataHandlerDescriptor DESCRIPTOR = new DataHandlerDescriptor(new ResourceLocation(BCLib.MOD_ID, "chunker"), Chunker::new, false, false);
private int serialNo;
private UUID uuid;
private int chunkCount;
private FriendlyByteBuf networkedBuf;
protected Chunker(int serialNo, UUID uuid, FriendlyByteBuf networkedBuf, int chunkCount) {
super(DESCRIPTOR.IDENTIFIER);
this.serialNo = serialNo;
this.uuid = uuid;
this.networkedBuf = networkedBuf;
this.chunkCount = chunkCount;
}
protected Chunker(){
super(DESCRIPTOR.IDENTIFIER);
}
@Override
protected void serializeDataOnServer(FriendlyByteBuf buf) {
buf.writeByte(0);
buf.writeLong(uuid.getMostSignificantBits());
buf.writeLong(uuid.getLeastSignificantBits());
buf.writeInt(serialNo);
if (serialNo == -1){
//this is our header
buf.writeInt(chunkCount);
writeString(buf, SendFiles.DESCRIPTOR.IDENTIFIER.getNamespace());
writeString(buf, SendFiles.DESCRIPTOR.IDENTIFIER.getPath());
} else {
final int size = Math.min(MAX_PAYLOAD_SIZE, networkedBuf.readableBytes());
buf.writeInt(size);
networkedBuf.readBytes(buf, size);
}
}
private FileChunkReceiver receiver;
@Override
protected void deserializeIncomingDataOnClient(FriendlyByteBuf buf, PacketSender responseSender) {
final int version = buf.readByte();
uuid = new UUID(buf.readLong(), buf.readLong());
serialNo = buf.readInt();
if (serialNo == -1){
chunkCount = buf.readInt();
final String namespace = readString(buf);
final String path = readString(buf);
BCLib.LOGGER.info("Receiving " + chunkCount + " + File-Chunks for " + namespace +"."+path);
receiver = FileChunkReceiver.getOrCreate(uuid, chunkCount);
} else {
receiver = FileChunkReceiver.get(uuid);
if (receiver!=null) {
final int size = buf.readInt();
receiver.processReceived(buf, serialNo, size);
} else {
BCLib.LOGGER.error("Unknown File-Chunk Transfer for " + uuid);
}
}
}
@Override
protected void runOnClientGameThread(Minecraft client) {
if (receiver!=null){
receiver.testFinished();
}
}
}

2
src/main/java/ru/bclib/api/dataexchange/handler/autosync/HelloServer.java
View file

@ -65,7 +65,6 @@ public class HelloServer extends DataHandler.FromClient {
super(DESCRIPTOR.IDENTIFIER);
}
@Environment(EnvType.CLIENT)
@Override
protected boolean prepareDataOnClient() {
@ -73,6 +72,7 @@ public class HelloServer extends DataHandler.FromClient {
BCLib.LOGGER.info("Auto-Sync was disabled on the client.");
return false;
}
return true;
}

6
src/main/java/ru/bclib/mixin/client/MinecraftMixin.java
View file

@ -56,16 +56,10 @@ public abstract class MinecraftMixin {
@Final
private LevelStorageSource levelSource;
@Shadow
public abstract void loadLevel(String string);
private final String BCLIB_RECURSION = "$@BCLIB:";
@Inject(method = "loadLevel", cancellable = true, at = @At("HEAD"))
private void bclib_callFixerOnLoad(String levelID, CallbackInfo ci) {
DataExchangeAPI.prepareServerside();
if (DataFixerAPI.fixData(this.levelSource, levelID, true, (appliedFixes) -> {
this.doLoadLevel(levelID, RegistryAccess.builtin(), Minecraft::loadDataPacks, Minecraft::loadWorldData, false, Minecraft.ExperimentalDialogType.BACKUP);
})) {