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

changes to run on non dedicated servers as well

Browse source
This commit is contained in:
Frank Bauer 2021-07-29 10:01:02 +02:00
parent 7632c4e498
commit 2260d547dc
11 changed files with 99 additions and 72 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -6,6 +6,8 @@ import net.fabricmc.loader.api.FabricLoader;
import net.minecraft.resources.ResourceLocation;
import ru.bclib.api.TagAPI;
import ru.bclib.api.WorldDataAPI;
import ru.bclib.api.dataexchange.DataExchangeAPI;
import ru.bclib.api.dataexchange.TestHandler;
import ru.bclib.config.Configs;
import ru.bclib.recipes.CraftingRecipes;
import ru.bclib.registry.BaseBlockEntities;
@ -26,6 +28,7 @@ public class BCLib implements ModInitializer {
CraftingRecipes.init();
WorldDataAPI.registerModCache(MOD_ID);
Configs.save();
DataExchangeAPI.registerDescriptor(TestHandler.DESCRIPTOR);
}
public static boolean isDevEnvironment() {

7
src/main/java/ru/bclib/api/dataexchange/Connector.java
View file

@ -1,19 +1,16 @@
package ru.bclib.api.dataexchange;
import java.util.HashSet;
import java.util.Set;
abstract class Connector {
protected final DataExchangeAPI api;
protected final Set<DataHandlerDescriptor> descriptors;
Connector(DataExchangeAPI api) {
this.api = api;
descriptors = new HashSet<>();
}
public abstract boolean onClient();
public void addDescriptor(DataHandlerDescriptor desc){
this.descriptors.add(desc);
protected Set<DataHandlerDescriptor> getDescriptors(){
return api.descriptors;
}
}

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

@ -28,25 +28,32 @@ class ConnectorClientside extends Connector {
BCLib.LOGGER.warning("Client changed!");
}
this.client = client;
for(DataHandlerDescriptor desc : descriptors){
ClientPlayNetworking.registerReceiver(desc.identifier, (_client, _handler, _buf, _responseSender)->{
for(DataHandlerDescriptor desc : getDescriptors()){
ClientPlayNetworking.registerReceiver(desc.IDENTIFIER, (_client, _handler, _buf, _responseSender)->{
receiveFromServer(desc, _client, _handler, _buf, _responseSender);
});
}
}
void onPlayReady(ClientPacketListener handler, PacketSender sender, Minecraft client){
for(DataHandlerDescriptor desc : getDescriptors()){
if (desc.sendOnJoin){
DataHandler h = desc.JOIN_INSTANCE.get();
if (!h.getOriginatesOnServer()) {
h.sendToServer(client);
}
}
}
}
void onPlayDisconnect(ClientPacketListener handler, Minecraft client){
for(DataHandlerDescriptor desc : descriptors) {
ClientPlayNetworking.unregisterReceiver(desc.identifier);
for(DataHandlerDescriptor desc : getDescriptors()) {
ClientPlayNetworking.unregisterReceiver(desc.IDENTIFIER);
}
}
void receiveFromServer(DataHandlerDescriptor desc, Minecraft client, ClientPacketListener handler, FriendlyByteBuf buf, PacketSender responseSender){
DataHandler h = desc.instancer.get();
DataHandler h = desc.INSTANCE.get();
h.receiveFromServer(client, handler, buf, responseSender);
}

21
src/main/java/ru/bclib/api/dataexchange/ConnectorServerside.java
View file

@ -1,7 +1,5 @@
package ru.bclib.api.dataexchange;
import net.fabricmc.api.EnvType;
import net.fabricmc.api.Environment;
import net.fabricmc.fabric.api.networking.v1.PacketSender;
import net.fabricmc.fabric.api.networking.v1.ServerPlayNetworking;
import net.minecraft.network.FriendlyByteBuf;
@ -10,7 +8,6 @@ import net.minecraft.server.level.ServerPlayer;
import net.minecraft.server.network.ServerGamePacketListenerImpl;
import ru.bclib.BCLib;
@Environment(EnvType.SERVER)
class ConnectorServerside extends Connector {
private MinecraftServer server;
ConnectorServerside(DataExchangeAPI api) {
@ -28,30 +25,32 @@ class ConnectorServerside extends Connector {
BCLib.LOGGER.warning("Server changed!");
}
this.server = server;
for(DataHandlerDescriptor desc : descriptors){
ServerPlayNetworking.registerReceiver(handler, desc.identifier, (_server, _player, _handler, _buf, _responseSender) -> {
for(DataHandlerDescriptor desc : getDescriptors()){
ServerPlayNetworking.registerReceiver(handler, desc.IDENTIFIER, (_server, _player, _handler, _buf, _responseSender) -> {
receiveFromClient(desc, _server, _player, _handler, _buf, _responseSender);
});
}
}
void onPlayReady(ServerGamePacketListenerImpl handler, PacketSender sender, MinecraftServer server){
for(DataHandlerDescriptor desc : descriptors){
for(DataHandlerDescriptor desc : getDescriptors()){
if (desc.sendOnJoin){
DataHandler h = desc.instancer.get();
h.sendToClient(server, handler.player);
DataHandler h = desc.JOIN_INSTANCE.get();
if (h.getOriginatesOnServer()) {
h.sendToClient(server, handler.player);
}
}
}
}
void onPlayDisconnect(ServerGamePacketListenerImpl handler, MinecraftServer server){
for(DataHandlerDescriptor desc : descriptors){
ServerPlayNetworking.unregisterReceiver(handler, desc.identifier);
for(DataHandlerDescriptor desc : getDescriptors()){
ServerPlayNetworking.unregisterReceiver(handler, desc.IDENTIFIER);
}
}
void receiveFromClient(DataHandlerDescriptor desc, MinecraftServer server, ServerPlayer player, ServerGamePacketListenerImpl handler, FriendlyByteBuf buf, PacketSender responseSender){
DataHandler h = desc.instancer.get();
DataHandler h = desc.INSTANCE.get();
h.receiveFromClient(server, player, handler, buf, responseSender);
}

78
src/main/java/ru/bclib/api/dataexchange/DataExchangeAPI.java
View file

@ -5,57 +5,62 @@ import net.fabricmc.api.Environment;
import net.fabricmc.fabric.api.client.networking.v1.ClientPlayConnectionEvents;
import net.fabricmc.fabric.api.networking.v1.ServerPlayConnectionEvents;
import java.util.HashSet;
import java.util.Set;
public class DataExchangeAPI {
private static DataExchangeAPI instance;
private final ConnectorServerside server;
private final ConnectorClientside client;
private ConnectorServerside server;
private ConnectorClientside client;
protected final Set<DataHandlerDescriptor> descriptors;
private DataExchangeAPI(){
descriptors = new HashSet<>();
}
public static DataExchangeAPI getInstance(){
return instance;
}
private static DataExchangeAPI getOrCreateInstance(boolean isClient){
if (instance==null){
instance = new DataExchangeAPI(isClient);
instance = new DataExchangeAPI();
}
return instance;
}
private DataExchangeAPI(boolean isClient){
if (isClient){
client = new ConnectorClientside(this);
server = null;
ClientPlayConnectionEvents.INIT.register(client::onPlayInit);
ClientPlayConnectionEvents.JOIN.register(client::onPlayReady);
ClientPlayConnectionEvents.DISCONNECT.register(client::onPlayDisconnect);
} else {
client = null;
server = new ConnectorServerside(this);
ServerPlayConnectionEvents.INIT.register(server::onPlayInit);
ServerPlayConnectionEvents.JOIN.register(server::onPlayReady);
ServerPlayConnectionEvents.DISCONNECT.register(server::onPlayDisconnect);
}
@Environment(EnvType.CLIENT)
private void initClientside(){
if (client!=null) return;
client = new ConnectorClientside(this);
ClientPlayConnectionEvents.INIT.register(client::onPlayInit);
ClientPlayConnectionEvents.JOIN.register(client::onPlayReady);
ClientPlayConnectionEvents.DISCONNECT.register(client::onPlayDisconnect);
}
private void initServerSide(){
if (server!=null) return;
server = new ConnectorServerside(this);
ServerPlayConnectionEvents.INIT.register(server::onPlayInit);
ServerPlayConnectionEvents.JOIN.register(server::onPlayReady);
ServerPlayConnectionEvents.DISCONNECT.register(server::onPlayDisconnect);
}
public static void registerDescriptor(DataHandlerDescriptor desc){
DataExchangeAPI api = DataExchangeAPI.getInstance();
api.descriptors.add(desc);
}
@Environment(EnvType.CLIENT)
public static void registerClientsideHandler(DataHandlerDescriptor desc){
DataExchangeAPI api = DataExchangeAPI.getOrCreateInstance(true);
if (api.client == null){
throw new RuntimeException("[Internal Error] DataExchangeAPI was already created as a Server");
}
api.client.addDescriptor(desc);
public static void prepareClientside(){
DataExchangeAPI api = DataExchangeAPI.getInstance();
api.initClientside();
}
@Environment(EnvType.SERVER)
public static void registerServersideHandler(DataHandlerDescriptor desc){
DataExchangeAPI api = DataExchangeAPI.getOrCreateInstance(false);
if (api.server == null){
throw new RuntimeException("[Internal Error] DataExchangeAPI was already created as a Client");
}
api.server.addDescriptor(desc);
public static void prepareServerside(){
DataExchangeAPI api = DataExchangeAPI.getInstance();
api.initServerSide();
}
public static void send(DataHandler h){
@ -66,4 +71,5 @@ public class DataExchangeAPI {
}
}
}

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

@ -40,7 +40,6 @@ public abstract class DataHandler {
client.execute(() -> runOnClient(client));
}
@Environment(EnvType.SERVER)
void receiveFromClient(MinecraftServer server, ServerPlayer player, ServerGamePacketListenerImpl handler, FriendlyByteBuf buf, PacketSender responseSender){
deserializeFromIncomingData(buf, responseSender, true);
server.execute(() -> runOnServer(server));
@ -54,7 +53,6 @@ public abstract class DataHandler {
}
@Environment(EnvType.SERVER)
protected void runOnServer(MinecraftServer server){
}
@ -63,7 +61,6 @@ public abstract class DataHandler {
}
@Environment(EnvType.SERVER)
void sendToClient(MinecraftServer server){
FriendlyByteBuf buf = PacketByteBufs.create();
serializeData(buf);
@ -73,7 +70,6 @@ public abstract class DataHandler {
}
}
@Environment(EnvType.SERVER)
void sendToClient(MinecraftServer server, ServerPlayer player){
FriendlyByteBuf buf = PacketByteBufs.create();
serializeData(buf);

17
src/main/java/ru/bclib/api/dataexchange/DataHandlerDescriptor.java
View file

@ -6,15 +6,22 @@ import java.util.function.Supplier;
public class DataHandlerDescriptor {
public DataHandlerDescriptor(ResourceLocation identifier, Supplier<DataHandler> instancer){
this(identifier, instancer, false);
this(identifier, instancer, instancer, false);
}
public DataHandlerDescriptor(ResourceLocation identifier, Supplier<DataHandler> instancer, boolean sendOnJoin){
this.instancer = instancer;
this.identifier = identifier;
this(identifier, instancer, instancer, sendOnJoin);
}
public DataHandlerDescriptor(ResourceLocation identifier, Supplier<DataHandler> receiv_instancer, Supplier<DataHandler> join_instancer, boolean sendOnJoin){
this.INSTANCE = receiv_instancer;
this.JOIN_INSTANCE = join_instancer;
this.IDENTIFIER = identifier;
this.sendOnJoin = sendOnJoin;
}
public final boolean sendOnJoin;
public final ResourceLocation identifier;
public final Supplier<DataHandler> instancer;
public final ResourceLocation IDENTIFIER;
public final Supplier<DataHandler> INSTANCE;
public final Supplier<DataHandler> JOIN_INSTANCE;
}

2
src/main/java/ru/bclib/api/dataexchange/TestHandler.java
View file

@ -14,7 +14,7 @@ public class TestHandler extends DataHandler{
public static DataHandlerDescriptor DESCRIPTOR = new DataHandlerDescriptor(new ResourceLocation(BCLib.MOD_ID, "__test"), TestHandler::new, true);
public TestHandler() {
super(DESCRIPTOR.identifier, true);
super(DESCRIPTOR.IDENTIFIER, true);
}
@Override

3
src/main/java/ru/bclib/client/BCLibClient.java
View file

@ -4,7 +4,6 @@ import net.fabricmc.api.ClientModInitializer;
import ru.bclib.api.ModIntegrationAPI;
import ru.bclib.api.PostInitAPI;
import ru.bclib.api.dataexchange.DataExchangeAPI;
import ru.bclib.api.dataexchange.TestHandler;
import ru.bclib.registry.BaseBlockEntityRenders;
public class BCLibClient implements ClientModInitializer {
@ -12,7 +11,7 @@ public class BCLibClient implements ClientModInitializer {
public void onInitializeClient() {
ModIntegrationAPI.registerAll();
BaseBlockEntityRenders.register();
DataExchangeAPI.registerClientsideHandler(TestHandler.DESCRIPTOR);
DataExchangeAPI.prepareClientside();
PostInitAPI.postInit(true);
}

15
src/main/java/ru/bclib/mixin/common/MinecraftServerMixin.java
View file

@ -1,12 +1,20 @@
package ru.bclib.mixin.common;
import com.mojang.authlib.GameProfileRepository;
import com.mojang.authlib.minecraft.MinecraftSessionService;
import com.mojang.datafixers.DataFixer;
import net.fabricmc.loader.api.FabricLoader;
import net.minecraft.core.RegistryAccess.RegistryHolder;
import net.minecraft.resources.ResourceKey;
import net.minecraft.server.MinecraftServer;
import net.minecraft.server.ServerResources;
import net.minecraft.server.level.ServerLevel;
import net.minecraft.server.level.progress.ChunkProgressListenerFactory;
import net.minecraft.server.packs.repository.PackRepository;
import net.minecraft.server.players.GameProfileCache;
import net.minecraft.world.level.Level;
import net.minecraft.world.level.storage.LevelStorageSource;
import net.minecraft.world.level.storage.LevelStorageSource.LevelStorageAccess;
import net.minecraft.world.level.storage.WorldData;
import org.spongepowered.asm.mixin.Final;
import org.spongepowered.asm.mixin.Mixin;
@ -16,8 +24,10 @@ import org.spongepowered.asm.mixin.injection.Inject;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
import ru.bclib.api.BiomeAPI;
import ru.bclib.api.dataexchange.DataExchangeAPI;
import ru.bclib.recipes.BCLRecipeManager;
import java.net.Proxy;
import java.util.Collection;
import java.util.Map;
import java.util.concurrent.CompletableFuture;
@ -34,7 +44,10 @@ public class MinecraftServerMixin {
@Final
@Shadow
protected WorldData worldData;
@Inject(method = "<init>*", at = @At("TAIL"))
private void bclib_onServerInit(Thread thread, RegistryHolder registryHolder, LevelStorageAccess levelStorageAccess, WorldData worldData, PackRepository packRepository, Proxy proxy, DataFixer dataFixer, ServerResources serverResources, MinecraftSessionService minecraftSessionService, GameProfileRepository gameProfileRepository, GameProfileCache gameProfileCache, ChunkProgressListenerFactory chunkProgressListenerFactory, CallbackInfo ci){
DataExchangeAPI.prepareServerside();
}
@Inject(method="convertFromRegionFormatIfNeeded", at = @At("HEAD"))
private static void bclib_applyPatches(LevelStorageSource.LevelStorageAccess session, CallbackInfo ci){

2
src/main/java/ru/bclib/server/BCLibServer.java
View file

@ -9,7 +9,7 @@ public class BCLibServer implements DedicatedServerModInitializer {
@Override
public void onInitializeServer() {
ModIntegrationAPI.registerAll();
DataExchangeAPI.registerServersideHandler(TestHandler.DESCRIPTOR);
DataExchangeAPI.prepareServerside();
PostInitAPI.postInit(false);
}