From f83dc880975c0d272126607f21c48f08e9e56878 Mon Sep 17 00:00:00 2001 From: zontreck Date: Sat, 16 Dec 2023 01:04:57 -0700 Subject: [PATCH] Fix client only stuff breaking server --- .../zontreck/essentials/AriasEssentials.java | 21 ++++++++++++++++--- .../essentials/gui/HeartsRenderer.java | 3 +++ 2 files changed, 21 insertions(+), 3 deletions(-) diff --git a/src/main/java/dev/zontreck/essentials/AriasEssentials.java b/src/main/java/dev/zontreck/essentials/AriasEssentials.java index ff8c7a3..e33913d 100644 --- a/src/main/java/dev/zontreck/essentials/AriasEssentials.java +++ b/src/main/java/dev/zontreck/essentials/AriasEssentials.java @@ -14,6 +14,7 @@ import dev.zontreck.essentials.gui.HeartsRenderer; import dev.zontreck.essentials.networking.S2CUpdateHearts; import dev.zontreck.libzontreck.events.RegisterPacketsEvent; import net.minecraftforge.fml.config.ModConfig; +import net.minecraftforge.fml.event.lifecycle.FMLClientSetupEvent; import org.slf4j.Logger; import com.mojang.logging.LogUtils; @@ -51,19 +52,20 @@ public class AriasEssentials { ModLoadingContext.get().registerConfig(ModConfig.Type.SERVER, AEServerConfig.SPEC, "arias-essentials-server.toml"); - ModLoadingContext.get().registerConfig(ModConfig.Type.CLIENT, AEClientConfig.SPEC, "arias-essentials-client.toml"); + + + + EssentialsDatastore.initialize(); MinecraftForge.EVENT_BUS.register(this); - MinecraftForge.EVENT_BUS.register(new HeartsRenderer()); MinecraftForge.EVENT_BUS.register(new CommandRegister()); MinecraftForge.EVENT_BUS.register(new ForgeEventsHandler()); } public void setup(FMLCommonSetupEvent ev) { - } @SubscribeEvent @@ -86,4 +88,17 @@ public class AriasEssentials { } + // You can use EventBusSubscriber to automatically register all static methods in the class annotated with @SubscribeEvent + @Mod.EventBusSubscriber(modid = AriasEssentials.MODID, bus = Mod.EventBusSubscriber.Bus.MOD) + public static class ClientModEvents { + @SubscribeEvent + public static void onClientSetup(FMLClientSetupEvent event) { + + ModLoadingContext.get().registerConfig(ModConfig.Type.CLIENT, AEClientConfig.SPEC, "arias-essentials-client.toml"); + + + MinecraftForge.EVENT_BUS.register(new HeartsRenderer()); + } + } + } diff --git a/src/main/java/dev/zontreck/essentials/gui/HeartsRenderer.java b/src/main/java/dev/zontreck/essentials/gui/HeartsRenderer.java index bf050ed..38a2dd3 100644 --- a/src/main/java/dev/zontreck/essentials/gui/HeartsRenderer.java +++ b/src/main/java/dev/zontreck/essentials/gui/HeartsRenderer.java @@ -26,6 +26,8 @@ import net.minecraft.world.entity.Entity; import net.minecraft.world.entity.ai.attributes.AttributeInstance; import net.minecraft.world.entity.ai.attributes.Attributes; import net.minecraft.world.entity.player.Player; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; import net.minecraftforge.client.event.RenderGuiOverlayEvent; import net.minecraftforge.client.gui.overlay.ForgeGui; import net.minecraftforge.client.gui.overlay.GuiOverlayManager; @@ -36,6 +38,7 @@ import net.minecraftforge.eventbus.api.SubscribeEvent; import java.util.Random; +@OnlyIn(Dist.CLIENT) public class HeartsRenderer { private static final ResourceLocation ICON_HEARTS = new ResourceLocation(AriasEssentials.MODID, "textures/gui/hearts.png");