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

Display DataExchange Dialog

Browse source
This commit is contained in:
Frank Bauer 2021-07-31 14:04:14 +02:00
parent 7bfe0b01cd
commit 70cfdf0dd8
6 changed files with 46 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -8,6 +8,7 @@ import ru.bclib.api.TagAPI;
import ru.bclib.api.WorldDataAPI; import ru.bclib.api.WorldDataAPI;
import ru.bclib.api.dataexchange.DataExchangeAPI; import ru.bclib.api.dataexchange.DataExchangeAPI;
import ru.bclib.api.dataexchange.handler.HelloClient; import ru.bclib.api.dataexchange.handler.HelloClient;
import ru.bclib.api.dataexchange.handler.HelloServer;
import ru.bclib.config.Configs; import ru.bclib.config.Configs;
import ru.bclib.recipes.CraftingRecipes; import ru.bclib.recipes.CraftingRecipes;
import ru.bclib.registry.BaseBlockEntities; import ru.bclib.registry.BaseBlockEntities;
@ -30,6 +31,7 @@ public class BCLib implements ModInitializer {
Configs.save(); Configs.save();
DataExchangeAPI.registerDescriptor(HelloClient.DESCRIPTOR); DataExchangeAPI.registerDescriptor(HelloClient.DESCRIPTOR);
DataExchangeAPI.registerDescriptor(HelloServer.DESCRIPTOR);
} }
public static boolean isDevEnvironment() { public static boolean isDevEnvironment() {

1
src/main/java/ru/bclib/api/dataexchange/handler/HelloClient.java
View file

@ -91,7 +91,6 @@ public class HelloClient extends DataHandler {
@Environment(EnvType.CLIENT) @Environment(EnvType.CLIENT)
protected void showBCLibError(Minecraft client){ protected void showBCLibError(Minecraft client){
client.pauseGame(false);
BCLib.LOGGER.error("BCLib differs on client and server."); BCLib.LOGGER.error("BCLib differs on client and server.");
client.setScreen(new WarnBCLibVersionMismatch((download) -> { client.setScreen(new WarnBCLibVersionMismatch((download) -> {
Minecraft.getInstance().setScreen((Screen)null); Minecraft.getInstance().setScreen((Screen)null);

20
src/main/java/ru/bclib/mixin/client/ClientboundLoginPacketMixin.java Normal file
View file

@ -0,0 +1,20 @@
package ru.bclib.mixin.client;
import net.minecraft.client.Minecraft;
import net.minecraft.network.protocol.game.ClientGamePacketListener;
import net.minecraft.network.protocol.game.ClientboundLoginPacket;
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 ru.bclib.api.dataexchange.DataExchangeAPI;
@Mixin(ClientboundLoginPacket.class)
public abstract class ClientboundLoginPacketMixin {
@Inject(method = "handle", cancellable = true, at=@At("HEAD"))
public void bclib_handle(ClientGamePacketListener clientGamePacketListener, CallbackInfo ci){
//cLevel.setBCLibDidSendHello();
// DataExchangeAPI.sendOnEnter();
// ci.cancel();
}
}

18
src/main/java/ru/bclib/mixin/client/GameMixin.java Normal file
View file

@ -0,0 +1,18 @@
package ru.bclib.mixin.client;
import net.minecraft.client.Game;
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 ru.bclib.api.dataexchange.DataExchangeAPI;
import ru.bclib.api.dataexchange.handler.HelloServer;
@Mixin(Game.class)
public class GameMixin {
@Inject(method="onStartGameSession", at=@At("TAIL"))
public void bcliv_onStart(CallbackInfo ci){
DataExchangeAPI.send(new HelloServer());
}
}

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

@ -3,7 +3,9 @@ package ru.bclib.mixin.client;
import net.minecraft.client.Minecraft; import net.minecraft.client.Minecraft;
import net.minecraft.client.color.block.BlockColors; import net.minecraft.client.color.block.BlockColors;
import net.minecraft.client.color.item.ItemColors; import net.minecraft.client.color.item.ItemColors;
import net.minecraft.client.gui.screens.Screen;
import net.minecraft.client.main.GameConfig; import net.minecraft.client.main.GameConfig;
import net.minecraft.client.multiplayer.ClientLevel;
import net.minecraft.core.Registry; import net.minecraft.core.Registry;
import net.minecraft.core.RegistryAccess.RegistryHolder; import net.minecraft.core.RegistryAccess.RegistryHolder;
import net.minecraft.world.level.LevelSettings; import net.minecraft.world.level.LevelSettings;
@ -16,6 +18,7 @@ import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.Inject;
import org.spongepowered.asm.mixin.injection.ModifyArg; import org.spongepowered.asm.mixin.injection.ModifyArg;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
import ru.bclib.api.dataexchange.DataExchangeAPI;
import ru.bclib.api.datafixer.DataFixerAPI; import ru.bclib.api.datafixer.DataFixerAPI;
import ru.bclib.interfaces.CustomColorProvider; import ru.bclib.interfaces.CustomColorProvider;
@ -51,6 +54,8 @@ public abstract class MinecraftMixin {
if (levelID.startsWith(BCLIB_RECURSION)) { if (levelID.startsWith(BCLIB_RECURSION)) {
levelID = levelID.substring(BCLIB_RECURSION.length()); levelID = levelID.substring(BCLIB_RECURSION.length());
recursiveCall = true; recursiveCall = true;
} else {
DataExchangeAPI.prepareServerside();
} }
final String recursiveLevelID = BCLIB_RECURSION + levelID; final String recursiveLevelID = BCLIB_RECURSION + levelID;

1
src/main/resources/bclib.mixins.client.json
View file

@ -6,6 +6,7 @@
"client": [ "client": [
"EnchantingTableBlockMixin", "EnchantingTableBlockMixin",
"BackgroundRendererMixin", "BackgroundRendererMixin",
"GameMixin",
"TextureAtlasMixin", "TextureAtlasMixin",
"ModelBakeryMixin", "ModelBakeryMixin",
"MinecraftMixin" "MinecraftMixin"