Leisuretimedock/webdisplays
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Client Safety

Browse Source
This commit is contained in:
Mysticpasta1 2023-03-02 13:55:33 -06:00
parent 1f7563cc34
commit e5ee14536a
4 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/java/net/montoyo/wd/WebDisplays.java
View File

@ -36,6 +36,7 @@ import net.minecraftforge.fml.DistExecutor;
import net.minecraftforge.fml.ModList;
import net.minecraftforge.fml.common.Mod;
import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;
import net.minecraftforge.fml.loading.FMLEnvironment;
import net.minecraftforge.network.PacketDistributor;
import net.minecraftforge.registries.DeferredRegister;
import net.minecraftforge.registries.ForgeRegistries;
@ -48,6 +49,7 @@ import net.montoyo.wd.init.TileInit;
import net.montoyo.wd.miniserv.server.Server;
import net.montoyo.wd.net.Messages;
import net.montoyo.wd.net.client.CMessageServerInfo;
import net.montoyo.wd.utilities.DistSafety;
import net.montoyo.wd.utilities.Log;
import net.montoyo.wd.utilities.Util;
@ -65,7 +67,7 @@ public class WebDisplays {
public static WebDisplays INSTANCE;
public static SharedProxy PROXY = DistExecutor.unsafeRunForDist(() -> ClientProxy::new, () -> SharedProxy::new);
public static SharedProxy PROXY = null;
public static WDCreativeTab CREATIVE_TAB;
public static final ResourceLocation ADV_PAD_BREAK = new ResourceLocation("webdisplays", "webdisplays/pad_break");
@ -113,6 +115,11 @@ public class WebDisplays {
public WebDisplays() {
INSTANCE = this;
if(FMLEnvironment.dist.isClient()) {
PROXY = DistSafety.createProxy();
} else {
PROXY = new SharedProxy();
}
AutoConfig.register(ModConfig.class, Toml4jConfigSerializer::new);
ConfigHolder<ModConfig> configHolder = AutoConfig.getConfigHolder(ModConfig.class);
ModConfig config = configHolder.getConfig();

2
src/main/java/net/montoyo/wd/client/gui/GuiServer.java
View File

@ -17,8 +17,6 @@ import net.minecraft.network.chat.Component;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.sounds.SoundSource;
import net.minecraft.util.RandomSource;
import net.minecraftforge.api.distmarker.Dist;
import net.minecraftforge.api.distmarker.OnlyIn;
import net.montoyo.wd.WebDisplays;
import net.montoyo.wd.miniserv.Constants;
import net.montoyo.wd.miniserv.client.*;

4
src/main/java/net/montoyo/wd/client/gui/WDScreen.java
View File

@ -12,13 +12,10 @@ import net.minecraft.client.Minecraft;
import net.minecraft.client.gui.screens.Screen;
import net.minecraft.core.BlockPos;
import net.minecraft.network.chat.Component;
import net.minecraft.network.chat.FormattedText;
import net.minecraft.network.chat.Style;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.util.FormattedCharSequence;
import net.minecraft.world.item.ItemStack;
import net.minecraftforge.api.distmarker.Dist;
import net.minecraftforge.api.distmarker.OnlyIn;
import net.montoyo.wd.client.gui.controls.Container;
import net.montoyo.wd.client.gui.controls.Control;
import net.montoyo.wd.client.gui.controls.Event;
@ -28,7 +25,6 @@ import net.montoyo.wd.client.gui.loading.JsonOWrapper;
import net.montoyo.wd.net.Messages;
import net.montoyo.wd.net.server.SMessageACQuery;
import net.montoyo.wd.utilities.*;
import org.lwjgl.glfw.GLFW;
import javax.annotation.Nullable;
import java.io.IOException;

9
src/main/java/net/montoyo/wd/utilities/DistSafety.java Normal file
View File

@ -0,0 +1,9 @@
package net.montoyo.wd.utilities;
import net.montoyo.wd.client.ClientProxy;
public class DistSafety {
public static ClientProxy createProxy() {
return new ClientProxy();
}
}