sync event refactoring. Delombok some stuff and fix rogue classloading.

This commit is contained in:
FalsePattern committed 2022-08-18 17:45:42 +02:00
1 parent a479935017
commit aaa0fca75f
7 files changed
+97 -60

No files matched your search

@@ -0,0 +1,57 @@
package com.falsepattern.lib.internal.impl.config;
import com.falsepattern.lib.config.event.ConfigSyncRequestEvent;
import com.falsepattern.lib.internal.FalsePatternLib;
import com.falsepattern.lib.internal.impl.config.net.SyncPrompt;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
import lombok.SneakyThrows;
import lombok.val;
import net.minecraft.client.entity.EntityClientPlayerMP;
import net.minecraft.entity.player.EntityPlayerMP;
import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.event.entity.EntityJoinWorldEvent;
import cpw.mods.fml.common.FMLCommonHandler;
import cpw.mods.fml.common.eventhandler.SubscribeEvent;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
@NoArgsConstructor(access = AccessLevel.PRIVATE)
public final class ConfigSyncEventHandler {
private static ConfigSyncEventHandler instance;
public static void registerBus() {
if (instance == null) {
instance = new ConfigSyncEventHandler();
MinecraftForge.EVENT_BUS.register(instance);
FMLCommonHandler.instance().bus().register(instance);
}
}
@SneakyThrows
@SubscribeEvent
public void onJoinWorld(EntityJoinWorldEvent e) {
if (e.world.isRemote && e.entity instanceof EntityClientPlayerMP) {
ConfigurationManagerImpl.sendSyncRequest();
}
}
@SideOnly(Side.CLIENT)
@SneakyThrows
@SubscribeEvent
public void onSyncRequestClient(ConfigSyncRequestEvent.Client e) {
ConfigurationManagerImpl.sendSyncRequest();
}
@SubscribeEvent
public void onSyncRequestServer(ConfigSyncRequestEvent.Server e) {
val players = e.getPlayers();
if (players.size() == 0) {
FalsePatternLib.NETWORK.sendToAll(new SyncPrompt());
} else {
for (EntityPlayerMP player : e.getPlayers()) {
FalsePatternLib.NETWORK.sendTo(new SyncPrompt(), player);
}
}
}
}
@@ -24,11 +24,9 @@ import com.falsepattern.lib.config.Config;
import com.falsepattern.lib.config.ConfigException;
import com.falsepattern.lib.config.event.AllConfigSyncEvent;
import com.falsepattern.lib.config.event.ConfigSyncEvent;
import com.falsepattern.lib.config.event.ConfigSyncRequestEvent;
import com.falsepattern.lib.config.event.ConfigValidationFailureEvent;
import com.falsepattern.lib.internal.FalsePatternLib;
import com.falsepattern.lib.internal.config.LibraryConfig;
import com.falsepattern.lib.internal.impl.config.net.SyncPrompt;
import com.falsepattern.lib.internal.impl.config.net.SyncRequest;
import com.falsepattern.lib.text.FormattedText;
import com.falsepattern.lib.toasts.GuiToast;
@@ -39,15 +37,11 @@ import com.google.common.collect.BiMap;
import com.google.common.collect.HashBiMap;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
import lombok.SneakyThrows;
import lombok.val;
import net.minecraft.client.entity.EntityClientPlayerMP;
import net.minecraft.entity.player.EntityPlayerMP;
import net.minecraft.util.EnumChatFormatting;
import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.common.config.Configuration;
import net.minecraftforge.event.entity.EntityJoinWorldEvent;
import cpw.mods.fml.client.config.IConfigElement;
import cpw.mods.fml.client.event.ConfigChangedEvent;
import cpw.mods.fml.common.FMLCommonHandler;
@@ -265,39 +259,12 @@ public class ConfigurationManagerImpl {
MinecraftForge.EVENT_BUS.register(instance);
}
private static void sendSyncRequest() throws IOException {
static void sendSyncRequest() throws IOException {
val event = new SyncRequest();
event.transmit();
FalsePatternLib.NETWORK.sendToServer(event);
}
@SneakyThrows
@SubscribeEvent
public void onJoinWorld(EntityJoinWorldEvent e) {
if (e.world.isRemote && e.entity instanceof EntityClientPlayerMP) {
sendSyncRequest();
}
}
@SideOnly(Side.CLIENT)
@SneakyThrows
@SubscribeEvent
public void onSyncRequestClient(ConfigSyncRequestEvent.Client e) {
sendSyncRequest();
}
@SubscribeEvent
public void onSyncRequestServer(ConfigSyncRequestEvent.Server e) {
val players = e.getPlayers();
if (players.size() == 0) {
FalsePatternLib.NETWORK.sendToAll(new SyncPrompt());
} else {
for (EntityPlayerMP player : e.getPlayers()) {
FalsePatternLib.NETWORK.sendTo(new SyncPrompt(), player);
}
}
}
@SubscribeEvent
public void onConfigChanged(ConfigChangedEvent.OnConfigChangedEvent event) {
init();
@@ -24,6 +24,7 @@ import com.falsepattern.lib.config.ConfigException;
import com.falsepattern.lib.config.ConfigurationManager;
import com.falsepattern.lib.internal.FalsePatternLib;
import com.falsepattern.lib.internal.config.LibraryConfig;
import com.falsepattern.lib.internal.impl.config.ConfigSyncEventHandler;
import com.falsepattern.lib.internal.impl.config.ConfigurationManagerImpl;
import com.falsepattern.lib.internal.impl.config.net.SyncPrompt;
import com.falsepattern.lib.internal.impl.config.net.SyncPromptHandler;
@@ -86,7 +87,7 @@ public class CommonProxy {
}
public void postInit(FMLPostInitializationEvent e) {
ConfigSyncEventHandler.registerBus();
}