From 75911c2292b1db04e42147082b5388389957eaa0 Mon Sep 17 00:00:00 2001 From: skip999 Date: Sun, 16 Feb 2025 08:42:39 -0600 Subject: [PATCH 1/2] remove PacketPlayerInformation --- gradle.properties | 2 +- .../electrodynamics/client/ClientEvents.java | 9 ---- .../common/packet/NetworkHandler.java | 2 - .../types/server/PacketPlayerInformation.java | 52 ------------------- 4 files changed, 1 insertion(+), 64 deletions(-) delete mode 100644 src/main/java/electrodynamics/common/packet/types/server/PacketPlayerInformation.java diff --git a/gradle.properties b/gradle.properties index 195ab1a5e..d328d03a5 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,7 +4,7 @@ org.gradle.jvmargs=-Xmx3G org.gradle.daemon=false # Electrodynamics parameters -mod_version=0.10.0-2 +mod_version=0.10.0-3 mod_id=electrodynamics mod_group_id=electrodynamics mod_name=Electrodynamics diff --git a/src/main/java/electrodynamics/client/ClientEvents.java b/src/main/java/electrodynamics/client/ClientEvents.java index afe2913e5..7d481f30a 100644 --- 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()); - } - } } \ No newline at end of file diff --git a/src/main/java/electrodynamics/common/packet/NetworkHandler.java b/src/main/java/electrodynamics/common/packet/NetworkHandler.java index c2b80b0e7..ffc8b220d 100644 --- a/src/main/java/electrodynamics/common/packet/NetworkHandler.java +++ b/src/main/java/electrodynamics/common/packet/NetworkHandler.java @@ -17,7 +17,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; @@ -59,7 +58,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 deleted file mode 100644 index 5bf1318d8..000000000 --- a/src/main/java/electrodynamics/common/packet/types/server/PacketPlayerInformation.java +++ /dev/null @@ -1,52 +0,0 @@ -package electrodynamics.common.packet.types.server; - -import java.util.List; - -import electrodynamics.common.packet.NetworkHandler; -import io.netty.buffer.ByteBuf; -import net.minecraft.client.Minecraft; -import net.minecraft.network.codec.ByteBufCodecs; -import net.minecraft.network.codec.StreamCodec; -import net.minecraft.network.protocol.common.custom.CustomPacketPayload; -import net.minecraft.resources.ResourceLocation; -import net.minecraft.server.packs.repository.Pack; -import net.neoforged.fml.loading.FMLLoader; -import net.neoforged.fml.loading.moddiscovery.ModInfo; -import net.neoforged.neoforge.network.handling.IPayloadContext; - -public class PacketPlayerInformation implements CustomPacketPayload { - - public static final ResourceLocation PACKET_PLAYERINFORMATION_PACKETID = NetworkHandler.id("packetplayerinformation"); - public static final Type TYPE = new Type<>(PACKET_PLAYERINFORMATION_PACKETID); - public static final StreamCodec CODEC = StreamCodec.composite( - ByteBufCodecs.STRING_UTF8, instance -> instance.information, - PacketPlayerInformation::new - ); - - private String information; - - public PacketPlayerInformation() { - String actual = ""; - List total = FMLLoader.getLoadingModList().getMods(); - for (ModInfo info : total) { - actual += info.getModId() + ":"; - } - for (Pack pack : Minecraft.getInstance().getResourcePackRepository().getAvailablePacks()) { - actual += pack.getId() + "," + pack.getTitle().getString() + "," + pack.getDescription() + ":"; - } - information = actual; - } - - public PacketPlayerInformation(String info) { - information = info; - } - - public static void handle(PacketPlayerInformation message, IPayloadContext context) { - ServerBarrierMethods.handlePlayerInformation(context.channelHandlerContext().name(), message.information); - } - - @Override - public Type type() { - return TYPE; - } -} \ No newline at end of file From 7d5d03689b91985ee3843559915a1216e26e68fe Mon Sep 17 00:00:00 2001 From: skip999 Date: Sun, 16 Feb 2025 08:49:08 -0600 Subject: [PATCH 2/2] correct version number --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index d328d03a5..195ab1a5e 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,7 +4,7 @@ org.gradle.jvmargs=-Xmx3G org.gradle.daemon=false # Electrodynamics parameters -mod_version=0.10.0-3 +mod_version=0.10.0-2 mod_id=electrodynamics mod_group_id=electrodynamics mod_name=Electrodynamics