Merge remote-tracking branch 'origin/1.21.1' into 1.21.1

aurilisdev · Feb 20, 2025 · 7b606cd · 7b606cd
2 parents 8451a30 + 8fc71e5
commit 7b606cd
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 63 deletions.
diff --git a/src/main/java/electrodynamics/client/ClientEvents.java b/src/main/java/electrodynamics/client/ClientEvents.java
@@ -18,7 +18,6 @@
 import electrodynamics.client.render.event.levelstage.HandlerMarkerLines;
 import electrodynamics.client.render.event.levelstage.HandlerQuarryArm;
 import electrodynamics.client.render.event.levelstage.HandlerSeismicScanner;
-import electrodynamics.common.packet.types.server.PacketPlayerInformation;
 import net.minecraft.client.Minecraft;
 import net.minecraft.world.entity.player.Player;
 import net.neoforged.api.distmarker.Dist;
@@ -28,8 +27,6 @@
 import net.neoforged.neoforge.client.event.InputEvent.Key;
 import net.neoforged.neoforge.client.event.RenderGuiEvent;
 import net.neoforged.neoforge.client.event.RenderLevelStageEvent;
-import net.neoforged.neoforge.event.tick.PlayerTickEvent;
-import net.neoforged.neoforge.network.PacketDistributor;
 
 @EventBusSubscriber(modid = References.ID, bus = EventBusSubscriber.Bus.GAME, value = { Dist.CLIENT })
 public class ClientEvents {
@@ -82,11 +79,5 @@ public static void handleKeyPress(Key event) {
 		KEY_PRESS_HANDLERS.forEach(handler -> handler.handler(event, Minecraft.getInstance()));
 	}
 
-	@SubscribeEvent
-	public static void tick(PlayerTickEvent.Pre event) {
-		if (event.getEntity().level().isClientSide() && event.getEntity().level().getLevelData().getDayTime() % 50 == 10) {
-			PacketDistributor.sendToServer(new PacketPlayerInformation());
-		}
-	}
 
 }
diff --git a/src/main/java/electrodynamics/common/packet/NetworkHandler.java b/src/main/java/electrodynamics/common/packet/NetworkHandler.java
@@ -16,7 +16,6 @@
 import electrodynamics.common.packet.types.client.PacketUpdateSpecificPropertyClient;
 import electrodynamics.common.packet.types.server.PacketJetpackFlightServer;
 import electrodynamics.common.packet.types.server.PacketModeSwitchServer;
-import electrodynamics.common.packet.types.server.PacketPlayerInformation;
 import electrodynamics.common.packet.types.server.PacketPowerSetting;
 import electrodynamics.common.packet.types.server.PacketSeismicScanner;
 import electrodynamics.common.packet.types.server.PacketSendUpdatePropertiesServer;
@@ -57,7 +56,6 @@ public static void registerPackets(final RegisterPayloadHandlersEvent event) {
 
         registry.playToServer(PacketJetpackFlightServer.TYPE, PacketJetpackFlightServer.CODEC, PacketJetpackFlightServer::handle);
         registry.playToServer(PacketModeSwitchServer.TYPE, PacketModeSwitchServer.CODEC, PacketModeSwitchServer::handle);
-        registry.playToServer(PacketPlayerInformation.TYPE, PacketPlayerInformation.CODEC, PacketPlayerInformation::handle);
         registry.playToServer(PacketPowerSetting.TYPE, PacketPowerSetting.CODEC, PacketPowerSetting::handle);
         registry.playToServer(PacketSendUpdatePropertiesServer.TYPE, PacketSendUpdatePropertiesServer.CODEC, PacketSendUpdatePropertiesServer::handle);
         registry.playToServer(PacketServerUpdateTile.TYPE, PacketServerUpdateTile.CODEC, PacketServerUpdateTile::handle);

diff --git a/src/main/java/electrodynamics/common/packet/types/server/PacketPlayerInformation.java b/src/main/java/electrodynamics/common/packet/types/server/PacketPlayerInformation.java