From 08b458281b03fb8a0843f909a73456c834631bdc Mon Sep 17 00:00:00 2001 From: zontreck Date: Thu, 21 Dec 2023 11:11:28 -0700 Subject: [PATCH] Fix invalid side on several events --- gradle.properties | 2 +- .../zontreck/essentials/AriasEssentials.java | 17 +++-------------- .../zontreck/essentials/client/AutoWalk.java | 5 ++--- 3 files changed, 6 insertions(+), 18 deletions(-) diff --git a/gradle.properties b/gradle.properties index 9191858..7dd3903 100644 --- a/gradle.properties +++ b/gradle.properties @@ -49,7 +49,7 @@ mod_name=Aria's Essentials # The license of the mod. Review your options at https://choosealicense.com/. All Rights Reserved is the default. mod_license=GPLv3 # The mod version. See https://semver.org/ -mod_version=1.1.122123.1048 +mod_version=1.1.122123.1110 # The group ID for the mod. It is only important when publishing as an artifact to a Maven repository. # This should match the base package used for the mod sources. # See https://maven.apache.org/guides/mini/guide-naming-conventions.html diff --git a/src/main/java/dev/zontreck/essentials/AriasEssentials.java b/src/main/java/dev/zontreck/essentials/AriasEssentials.java index 7c894ae..29fb0b5 100644 --- a/src/main/java/dev/zontreck/essentials/AriasEssentials.java +++ b/src/main/java/dev/zontreck/essentials/AriasEssentials.java @@ -1,8 +1,5 @@ package dev.zontreck.essentials; -import java.io.IOException; -import java.nio.file.Files; -import java.nio.file.Path; import java.time.Instant; import java.util.HashMap; import java.util.Map; @@ -17,17 +14,12 @@ import dev.zontreck.essentials.configs.AEServerConfig; import dev.zontreck.essentials.events.TeleportEvent; import dev.zontreck.essentials.gui.HeartsRenderer; import dev.zontreck.essentials.networking.ModMessages; -import dev.zontreck.essentials.networking.S2CUpdateHearts; import dev.zontreck.essentials.rtp.RTPCachesEventHandlers; -import dev.zontreck.essentials.rtp.RandomPositionFactory; import dev.zontreck.essentials.util.BackPositionCaches; -import dev.zontreck.libzontreck.events.RegisterPacketsEvent; import dev.zontreck.libzontreck.vectors.WorldPosition; -import net.minecraft.client.Minecraft; -import net.minecraft.server.level.ServerLevel; import net.minecraft.server.level.ServerPlayer; -import net.minecraft.world.entity.player.Player; -import net.minecraftforge.client.event.InputEvent; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; import net.minecraftforge.client.event.RegisterKeyMappingsEvent; import net.minecraftforge.event.entity.living.LivingDeathEvent; import net.minecraftforge.eventbus.api.EventPriority; @@ -39,12 +31,8 @@ import com.mojang.logging.LogUtils; import dev.zontreck.essentials.commands.CommandRegister; import dev.zontreck.essentials.homes.Homes; -import dev.zontreck.essentials.homes.HomesProvider; import dev.zontreck.essentials.util.EssentialsDatastore; import dev.zontreck.essentials.util.ForgeEventsHandler; -import dev.zontreck.libzontreck.events.ProfileLoadedEvent; -import dev.zontreck.libzontreck.events.ProfileUnloadedEvent; -import dev.zontreck.libzontreck.profiles.Profile; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.server.ServerStartedEvent; import net.minecraftforge.event.server.ServerStoppingEvent; @@ -138,6 +126,7 @@ public class AriasEssentials { MinecraftForge.EVENT_BUS.register(new HeartsRenderer()); } + @OnlyIn(Dist.CLIENT) @SubscribeEvent public static void onRegisterKeyBinds(RegisterKeyMappingsEvent ev) { diff --git a/src/main/java/dev/zontreck/essentials/client/AutoWalk.java b/src/main/java/dev/zontreck/essentials/client/AutoWalk.java index 9118e2c..b8a3cca 100644 --- a/src/main/java/dev/zontreck/essentials/client/AutoWalk.java +++ b/src/main/java/dev/zontreck/essentials/client/AutoWalk.java @@ -4,16 +4,15 @@ import dev.zontreck.essentials.AriasEssentials; import dev.zontreck.essentials.Messages; import dev.zontreck.libzontreck.util.ChatHelpers; import net.minecraft.client.Minecraft; -import net.minecraft.world.entity.player.Player; -import net.minecraft.world.phys.Vec3; import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; import net.minecraftforge.client.event.InputEvent; -import net.minecraftforge.client.event.RegisterKeyMappingsEvent; import net.minecraftforge.eventbus.api.SubscribeEvent; import net.minecraftforge.fml.common.Mod; import java.time.Instant; +@OnlyIn(Dist.CLIENT) @Mod.EventBusSubscriber(modid = AriasEssentials.MODID, value = Dist.CLIENT) public class AutoWalk { private static boolean isWalking = false;