minecraft-mods/login_protection
Private
Public Access
1
0
Fork 0
Code Issues Projects Releases 16 Wiki Activity

Fixed initial errors from port.

Browse Source
This commit is contained in:
Micle
2022-10-31 20:26:15 +00:00
parent dfaae41b9b
commit ea305c07b5
6 changed files with 14 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/dev/micle/loginprotection/events/client/OnClientInputEventHandler.java
View File

@ -60,12 +60,12 @@ public class OnClientInputEventHandler {
}
@SubscribeEvent
public void KeyInputEvent(InputEvent.KeyInputEvent event) {
public void KeyInputEvent(InputEvent.Key event) {
handle(event.getAction(), event.getKey());
}
@SubscribeEvent
public void MouseInputEvent(InputEvent.MouseInputEvent event) {
public void MouseInputEvent(InputEvent.MouseButton event) {
handle(event.getAction(), event.getButton());
}

8
src/main/java/dev/micle/loginprotection/events/common/OnLivingSetAttackTargetEventHandler.java
View File

@ -5,13 +5,13 @@ import dev.micle.loginprotection.data.ProtectedPlayerManager;
import dev.micle.loginprotection.setup.Config;
import net.minecraft.world.entity.Mob;
import net.minecraft.world.entity.player.Player;
import net.minecraftforge.event.entity.living.LivingSetAttackTargetEvent;
import net.minecraftforge.event.entity.living.LivingChangeTargetEvent;
import net.minecraftforge.eventbus.api.SubscribeEvent;
public class OnLivingSetAttackTargetEventHandler {
@SubscribeEvent
public void LivingSetAttackTargetEvent(LivingSetAttackTargetEvent event) {
if (!(event.getTarget() instanceof Player target)) {
public void LivingSetAttackTargetEvent(LivingChangeTargetEvent event) {
if (!(event.getNewTarget() instanceof Player target)) {
return;
}
@ -25,7 +25,7 @@ public class OnLivingSetAttackTargetEventHandler {
(player.getState().equals(ProtectedPlayer.State.AFK) && Config.Server.AFK_MOBS_IGNORE_PLAYER.get()) ||
(player.getState().equals(ProtectedPlayer.State.LOGIN_GRACE) && Config.Server.LOGIN_GRACE_MOBS_IGNORE_PLAYER.get()) ||
(player.getState().equals(ProtectedPlayer.State.AFK_GRACE) && Config.Server.AFK_GRACE_MOBS_IGNORE_PLAYER.get())) {
((Mob) event.getEntityLiving()).setTarget(null);
((Mob) event.getEntity()).setTarget(null);
}
}

7
src/main/java/dev/micle/loginprotection/events/common/OnPlayerJoinEventHandler.java
View File

@ -1,17 +1,12 @@
package dev.micle.loginprotection.events.common;
import dev.micle.loginprotection.data.ProtectedPlayerManager;
import net.minecraft.world.entity.player.Player;
import net.minecraftforge.event.entity.player.PlayerEvent;
import net.minecraftforge.eventbus.api.SubscribeEvent;
public class OnPlayerJoinEventHandler {
@SubscribeEvent
public void EntityJoinWorldEvent(PlayerEvent.PlayerLoggedInEvent event) {
if (!(event.getEntity() instanceof Player player)) {
return;
}
ProtectedPlayerManager.addPlayer(player.getUUID());
ProtectedPlayerManager.addPlayer(event.getEntity().getUUID());
}
}

7
src/main/java/dev/micle/loginprotection/events/common/OnPlayerLeaveEventHandler.java
View File

@ -1,17 +1,12 @@
package dev.micle.loginprotection.events.common;
import dev.micle.loginprotection.data.ProtectedPlayerManager;
import net.minecraft.world.entity.player.Player;
import net.minecraftforge.event.entity.player.PlayerEvent;
import net.minecraftforge.eventbus.api.SubscribeEvent;
public class OnPlayerLeaveEventHandler {
@SubscribeEvent
public void PlayerLeaveEvent(PlayerEvent.PlayerLoggedOutEvent event) {
if (!(event.getEntity() instanceof Player player)) {
return;
}
ProtectedPlayerManager.removePlayer(player.getUUID());
ProtectedPlayerManager.removePlayer(event.getEntity().getUUID());
}
}

4
src/main/java/dev/micle/loginprotection/mixin/GuiRenderTickMixin.java
View File

@ -8,13 +8,13 @@ import net.minecraft.client.Minecraft;
import net.minecraft.client.gui.Font;
import net.minecraftforge.api.distmarker.Dist;
import net.minecraftforge.api.distmarker.OnlyIn;
import net.minecraftforge.client.gui.ForgeIngameGui;
import net.minecraftforge.client.gui.overlay.ForgeGui;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Inject;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
@Mixin(ForgeIngameGui.class)
@Mixin(ForgeGui.class)
@OnlyIn(Dist.CLIENT)
public class GuiRenderTickMixin {
@Inject(method = "render", at = @At(value = "HEAD"))

8
src/main/java/dev/micle/loginprotection/network/NetworkManager.java
View File

@ -24,22 +24,22 @@ public class NetworkManager {
channel.messageBuilder(InputPacket.class, id++)
.encoder(InputPacket::encode)
.decoder(InputPacket::decode)
.consumer(InputPacket::handle)
.consumerNetworkThread(InputPacket::handle)
.add();
channel.messageBuilder(PlayerStatePacket.class, id++)
.encoder(PlayerStatePacket::encode)
.decoder(PlayerStatePacket::decode)
.consumer(PlayerStatePacket::handle)
.consumerNetworkThread(PlayerStatePacket::handle)
.add();
channel.messageBuilder(RequestLastInputTickPacket.class, id++)
.encoder(RequestLastInputTickPacket::encode)
.decoder(RequestLastInputTickPacket::decode)
.consumer(RequestLastInputTickPacket::handle)
.consumerNetworkThread(RequestLastInputTickPacket::handle)
.add();
channel.messageBuilder(LastInputTickPacket.class, id++)
.encoder(LastInputTickPacket::encode)
.decoder(LastInputTickPacket::decode)
.consumer(LastInputTickPacket::handle)
.consumerNetworkThread(LastInputTickPacket::handle)
.add();
}