MinecraftMods/Arias-Essentials
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity

Fix client only stuff breaking server

Browse source
This commit is contained in:
zontreck 2023-12-16 01:04:57 -07:00
parent e4f6017d2b
commit f83dc88097
2 changed files with 21 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

21
src/main/java/dev/zontreck/essentials/AriasEssentials.java
View file

@ -14,6 +14,7 @@ import dev.zontreck.essentials.gui.HeartsRenderer;
import dev.zontreck.essentials.networking.S2CUpdateHearts; import dev.zontreck.essentials.networking.S2CUpdateHearts;
import dev.zontreck.libzontreck.events.RegisterPacketsEvent; import dev.zontreck.libzontreck.events.RegisterPacketsEvent;
import net.minecraftforge.fml.config.ModConfig; import net.minecraftforge.fml.config.ModConfig;
import net.minecraftforge.fml.event.lifecycle.FMLClientSetupEvent;
import org.slf4j.Logger; import org.slf4j.Logger;
import com.mojang.logging.LogUtils; 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.SERVER, AEServerConfig.SPEC, "arias-essentials-server.toml");
ModLoadingContext.get().registerConfig(ModConfig.Type.CLIENT, AEClientConfig.SPEC, "arias-essentials-client.toml");
EssentialsDatastore.initialize(); EssentialsDatastore.initialize();
MinecraftForge.EVENT_BUS.register(this); MinecraftForge.EVENT_BUS.register(this);
MinecraftForge.EVENT_BUS.register(new HeartsRenderer());
MinecraftForge.EVENT_BUS.register(new CommandRegister()); MinecraftForge.EVENT_BUS.register(new CommandRegister());
MinecraftForge.EVENT_BUS.register(new ForgeEventsHandler()); MinecraftForge.EVENT_BUS.register(new ForgeEventsHandler());
} }
public void setup(FMLCommonSetupEvent ev) public void setup(FMLCommonSetupEvent ev)
{ {
} }
@SubscribeEvent @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());
}
}
} }

3
src/main/java/dev/zontreck/essentials/gui/HeartsRenderer.java
View file

@ -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.AttributeInstance;
import net.minecraft.world.entity.ai.attributes.Attributes; import net.minecraft.world.entity.ai.attributes.Attributes;
import net.minecraft.world.entity.player.Player; 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.event.RenderGuiOverlayEvent;
import net.minecraftforge.client.gui.overlay.ForgeGui; import net.minecraftforge.client.gui.overlay.ForgeGui;
import net.minecraftforge.client.gui.overlay.GuiOverlayManager; import net.minecraftforge.client.gui.overlay.GuiOverlayManager;
@ -36,6 +38,7 @@ import net.minecraftforge.eventbus.api.SubscribeEvent;
import java.util.Random; import java.util.Random;
@OnlyIn(Dist.CLIENT)
public class HeartsRenderer { public class HeartsRenderer {
private static final ResourceLocation ICON_HEARTS = new ResourceLocation(AriasEssentials.MODID, private static final ResourceLocation ICON_HEARTS = new ResourceLocation(AriasEssentials.MODID,
"textures/gui/hearts.png"); "textures/gui/hearts.png");