From c528bdb1134a42419c1a2e2e87b452af77fbb1b0 Mon Sep 17 00:00:00 2001 From: Alexander Medvedev Date: Wed, 16 Apr 2025 10:15:39 +0200 Subject: [PATCH] update to 1.21.5 --- build.gradle | 2 +- gradle.properties | 12 ++-- .../mixin/ClientConnectionMixin.java | 14 ++--- src/main/kotlin/com/pumpkinmc/Packeto.kt | 1 - src/main/kotlin/com/pumpkinmc/Screen.kt | 9 --- src/main/resources/fabric.mod.json | 62 +++++++++---------- src/main/resources/packeto.mixins.json | 18 +++--- 7 files changed, 54 insertions(+), 64 deletions(-) diff --git a/build.gradle b/build.gradle index d2b4fe3..5ed49ec 100644 --- a/build.gradle +++ b/build.gradle @@ -1,7 +1,7 @@ plugins { id 'fabric-loom' version '1.10-SNAPSHOT' id 'maven-publish' - id "org.jetbrains.kotlin.jvm" version "2.1.10" + id "org.jetbrains.kotlin.jvm" version "2.1.20" } version = project.mod_version diff --git a/gradle.properties b/gradle.properties index e25adda..d023fb6 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,15 +4,15 @@ org.gradle.parallel=true # Fabric Properties # check these on https://fabricmc.net/develop -minecraft_version=1.21.4 -yarn_mappings=1.21.4+build.8 -loader_version=0.16.10 -fabric_kotlin_version=1.13.1+kotlin.2.1.10 +minecraft_version=1.21.5 +yarn_mappings=1.21.5+build.1 +loader_version=0.16.13 +fabric_kotlin_version=1.13.2+kotlin.2.1.20 # Mod Properties -mod_version=1.0.0 +mod_version=1.0.1 maven_group=com.pumpkinmc archives_base_name=packeto # Dependencies -fabric_version=0.118.0+1.21.4 \ No newline at end of file +fabric_version=0.120.0+1.21.5 \ No newline at end of file diff --git a/src/main/java/com/pumpkinmc/mixin/ClientConnectionMixin.java b/src/main/java/com/pumpkinmc/mixin/ClientConnectionMixin.java index f84ccd7..af741ac 100644 --- a/src/main/java/com/pumpkinmc/mixin/ClientConnectionMixin.java +++ b/src/main/java/com/pumpkinmc/mixin/ClientConnectionMixin.java @@ -17,15 +17,15 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; @Mixin(ClientConnection.class) public class ClientConnectionMixin { - @Inject(at = @At("HEAD"), method = "send(Lnet/minecraft/network/packet/Packet;Lnet/minecraft/network/PacketCallbacks;Z)V") - private void send(Packet packet, @Nullable PacketCallbacks callbacks, boolean flush, CallbackInfo ci) { - if (packet instanceof ClientTickEndC2SPacket || packet instanceof PlayerMoveC2SPacket || packet instanceof EntitySetHeadYawS2CPacket - || packet instanceof EntityS2CPacket) return; - Screen.INSTANCE.getSent_packets().add(packet); - } - @Inject(at = @At("HEAD"), method = "handlePacket") private static void handlePacket(Packet packet, PacketListener listener, CallbackInfo ci) { Screen.INSTANCE.getReceived_packets().add(packet); } + + @Inject(at = @At("HEAD"), method = "send(Lnet/minecraft/network/packet/Packet;Lnet/minecraft/network/PacketCallbacks;Z)V") + private void send(Packet packet, @Nullable PacketCallbacks callbacks, boolean flush, CallbackInfo ci) { + if (packet instanceof ClientTickEndC2SPacket || packet instanceof PlayerMoveC2SPacket || packet instanceof EntitySetHeadYawS2CPacket + || packet instanceof EntityS2CPacket) return; + Screen.INSTANCE.getSent_packets().add(packet); + } } diff --git a/src/main/kotlin/com/pumpkinmc/Packeto.kt b/src/main/kotlin/com/pumpkinmc/Packeto.kt index a2e6c5d..51714e1 100644 --- a/src/main/kotlin/com/pumpkinmc/Packeto.kt +++ b/src/main/kotlin/com/pumpkinmc/Packeto.kt @@ -3,7 +3,6 @@ package com.pumpkinmc import net.fabricmc.api.ModInitializer import net.fabricmc.fabric.api.client.rendering.v1.HudLayerRegistrationCallback import net.fabricmc.fabric.api.client.rendering.v1.IdentifiedLayer -import net.minecraft.network.packet.Packet import net.minecraft.util.Identifier import org.slf4j.LoggerFactory diff --git a/src/main/kotlin/com/pumpkinmc/Screen.kt b/src/main/kotlin/com/pumpkinmc/Screen.kt index bf55073..7a8de98 100644 --- a/src/main/kotlin/com/pumpkinmc/Screen.kt +++ b/src/main/kotlin/com/pumpkinmc/Screen.kt @@ -1,21 +1,12 @@ package com.pumpkinmc -import io.netty.buffer.ByteBuf import net.minecraft.client.MinecraftClient import net.minecraft.client.gui.DrawContext import net.minecraft.client.gui.LayeredDrawer import net.minecraft.client.render.RenderTickCounter -import net.minecraft.network.NetworkPhase -import net.minecraft.network.NetworkState -import net.minecraft.network.listener.PacketListener import net.minecraft.network.packet.Packet -import net.minecraft.network.state.* import net.minecraft.util.Colors -import java.util.Collections import java.util.concurrent.CopyOnWriteArrayList -import java.util.function.Function -import java.util.stream.Collectors -import java.util.stream.Stream object Screen : LayeredDrawer.Layer { var sent_packets: MutableList> = CopyOnWriteArrayList(); diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index ef55536..0b0e4e6 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -1,33 +1,33 @@ { - "schemaVersion": 1, - "id": "packeto", - "version": "${version}", - "name": "Packeto", - "description": "See Incoming and Outgoing Packets", - "authors": [ - "Alexander Medvedev" - ], - "license": "MIT", - "environment": "*", - "entrypoints": { - "main": [ - { - "value": "com.pumpkinmc.Packeto", - "adapter": "kotlin" - } - ] - }, - "mixins": [ - "packeto.mixins.json" - ], - "depends": { - "fabricloader": ">=0.16.10", - "minecraft": "~1.21.4", - "java": ">=21", - "fabric-api": "*", - "fabric-language-kotlin": "*" - }, - "suggests": { - "another-mod": "*" - } + "schemaVersion": 1, + "id": "packeto", + "version": "${version}", + "name": "Packeto", + "description": "See Incoming and Outgoing Packets", + "authors": [ + "Alexander Medvedev" + ], + "license": "MIT", + "environment": "*", + "entrypoints": { + "main": [ + { + "value": "com.pumpkinmc.Packeto", + "adapter": "kotlin" + } + ] + }, + "mixins": [ + "packeto.mixins.json" + ], + "depends": { + "fabricloader": ">=0.16.10", + "minecraft": "~1.21.4", + "java": ">=21", + "fabric-api": "*", + "fabric-language-kotlin": "*" + }, + "suggests": { + "another-mod": "*" + } } \ No newline at end of file diff --git a/src/main/resources/packeto.mixins.json b/src/main/resources/packeto.mixins.json index 482dc2b..3657d2e 100644 --- a/src/main/resources/packeto.mixins.json +++ b/src/main/resources/packeto.mixins.json @@ -1,11 +1,11 @@ { - "required": true, - "package": "com.pumpkinmc.mixin", - "compatibilityLevel": "JAVA_21", - "mixins": [ - "ClientConnectionMixin" - ], - "injectors": { - "defaultRequire": 1 - } + "required": true, + "package": "com.pumpkinmc.mixin", + "compatibilityLevel": "JAVA_21", + "mixins": [ + "ClientConnectionMixin" + ], + "injectors": { + "defaultRequire": 1 + } } \ No newline at end of file