MrSphay/WorldHandler
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Improve event registration

Browse Source
This commit is contained in:
Marcel Konrad
2019-04-26 17:06:16 +02:00
parent 373f7b0ae7
commit 13841429f7
3 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/exopandora/worldhandler/config/Config.java
View File

@@ -10,6 +10,7 @@ import exopandora.worldhandler.util.UtilKeyBinding;
import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.Dist;
import net.minecraftforge.api.distmarker.OnlyIn; import net.minecraftforge.api.distmarker.OnlyIn;
import net.minecraftforge.common.ForgeConfigSpec; import net.minecraftforge.common.ForgeConfigSpec;
import net.minecraftforge.eventbus.api.SubscribeEvent;
import net.minecraftforge.fml.config.ModConfig; import net.minecraftforge.fml.config.ModConfig;
import net.minecraftforge.fml.config.ModConfig.Type; import net.minecraftforge.fml.config.ModConfig.Type;
@@ -101,6 +102,7 @@ public class Config
} }
} }
@SubscribeEvent
public static void configLoad(ModConfig.Loading event) public static void configLoad(ModConfig.Loading event)
{ {
if(event.getConfig().getType().equals(Type.CLIENT)) if(event.getConfig().getType().equals(Type.CLIENT))
@@ -111,6 +113,7 @@ public class Config
} }
} }
@SubscribeEvent
public static void configReload(ModConfig.ConfigReloading event) public static void configReload(ModConfig.ConfigReloading event)
{ {
if(event.getConfig().getType().equals(Type.CLIENT) && Config.CONFIG_DATA != null) if(event.getConfig().getType().equals(Type.CLIENT) && Config.CONFIG_DATA != null)

3
src/main/java/exopandora/worldhandler/event/ClientEventHandler.java
View File

@@ -19,10 +19,12 @@ import net.minecraftforge.api.distmarker.Dist;
import net.minecraftforge.api.distmarker.OnlyIn; import net.minecraftforge.api.distmarker.OnlyIn;
import net.minecraftforge.client.event.ClientChatEvent; import net.minecraftforge.client.event.ClientChatEvent;
import net.minecraftforge.client.event.RenderWorldLastEvent; import net.minecraftforge.client.event.RenderWorldLastEvent;
import net.minecraftforge.eventbus.api.SubscribeEvent;
@OnlyIn(Dist.CLIENT) @OnlyIn(Dist.CLIENT)
public class ClientEventHandler public class ClientEventHandler
{ {
@SubscribeEvent
public static void renderWorldLastEvent(RenderWorldLastEvent event) public static void renderWorldLastEvent(RenderWorldLastEvent event)
{ {
if(Config.getSettings().highlightBlocks() && Minecraft.getInstance().world != null) if(Config.getSettings().highlightBlocks() && Minecraft.getInstance().world != null)
@@ -88,6 +90,7 @@ public class ClientEventHandler
} }
} }
@SubscribeEvent
public static void clientChatEvent(ClientChatEvent event) public static void clientChatEvent(ClientChatEvent event)
{ {
if(!Minecraft.getInstance().isSingleplayer()) if(!Minecraft.getInstance().isSingleplayer())

9
src/main/java/exopandora/worldhandler/event/KeyHandler.java
View File

@@ -7,15 +7,16 @@ import exopandora.worldhandler.helper.BlockHelper;
import net.minecraft.client.Minecraft; import net.minecraft.client.Minecraft;
import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.Dist;
import net.minecraftforge.api.distmarker.OnlyIn; import net.minecraftforge.api.distmarker.OnlyIn;
import net.minecraftforge.fml.common.gameevent.TickEvent.ClientTickEvent; import net.minecraftforge.client.event.InputEvent.KeyInputEvent;
import net.minecraftforge.eventbus.api.SubscribeEvent;
@OnlyIn(Dist.CLIENT) @OnlyIn(Dist.CLIENT)
public class KeyHandler public class KeyHandler
{ {
//TODO FORGE switch to KeyInputEvent @SubscribeEvent
public static void keyInputEvent(ClientTickEvent event) public static void keyInputEvent(KeyInputEvent event)
{ {
if(Minecraft.getInstance().isGameFocused()) if(Minecraft.getInstance() != null && Minecraft.getInstance().currentScreen == null)
{ {
if(WorldHandler.KEY_WORLD_HANDLER.isPressed()) if(WorldHandler.KEY_WORLD_HANDLER.isPressed())
{ {