From bbc2227a14c6a3c357575e523d766e43cb380532 Mon Sep 17 00:00:00 2001 From: mt1006 Date: Wed, 19 Jun 2024 16:16:11 +0200 Subject: [PATCH] Version 1.3.7 --- CHANGELOG.txt | 5 +++++ build.gradle | 7 +------ gradle.properties | 8 ++++---- src/main/java/com/mt1006/mocap/MocapMod.java | 9 ++++----- .../com/mt1006/mocap/mixin/LivingEntityMethodMixin.java | 3 ++- .../java/com/mt1006/mocap/mocap/actions/ChangeItem.java | 1 - .../com/mt1006/mocap/mocap/actions/RightClickBlock.java | 1 - .../com/mt1006/mocap/mocap/actions/SetEffectColor.java | 1 - .../java/com/mt1006/mocap/mocap/actions/VehicleData.java | 6 ++++-- .../mocap/mocap/playing/CustomClientSkinManager.java | 2 +- .../java/com/mt1006/mocap/mocap/playing/PlayedScene.java | 4 +--- .../java/com/mt1006/mocap/network/MocapPacketC2S.java | 3 +-- .../java/com/mt1006/mocap/network/MocapPacketS2C.java | 6 +----- src/main/java/com/mt1006/mocap/network/MocapPackets.java | 2 -- src/main/java/com/mt1006/mocap/utils/FakePlayer.java | 5 ++--- src/main/resources/fabric.mod.json | 2 +- 16 files changed, 27 insertions(+), 38 deletions(-) diff --git a/CHANGELOG.txt b/CHANGELOG.txt index 8a5edb4..c5ee3ed 100755 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -1,3 +1,8 @@ +===Version 1.3.7=== +-Fixed fake players not being removed from the client level after being outside of render distance during the entirety of playback. +-Name "Mocap" is now used instead of "MocapMod" in "/mocap info" and "/mocap help" command output. +-Version information is no longer sent to logs during startup. + ===Version 1.3.6=== -Fixed Forge 1.20.6 version not working. diff --git a/build.gradle b/build.gradle index d798f6e..6b4c952 100644 --- a/build.gradle +++ b/build.gradle @@ -22,7 +22,7 @@ dependencies mappings loom.layered() { officialMojangMappings() - parchment("org.parchmentmc.data:parchment-${project.minecraft_version}:${project.mappings_version}@zip") + parchment("org.parchmentmc.data:parchment-${project.mappings_version}@zip") } modImplementation "net.fabricmc:fabric-loader:${project.loader_version}" @@ -43,9 +43,4 @@ java sourceCompatibility = JavaVersion.VERSION_21 targetCompatibility = JavaVersion.VERSION_21 -} - -jar -{ - from("LICENSE") } \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index fc2d06a..2521fc0 100644 --- a/gradle.properties +++ b/gradle.properties @@ -5,14 +5,14 @@ org.gradle.parallel=true # Fabric Properties # https://fabricmc.net/develop # https://parchmentmc.org/docs/getting-started - minecraft_version=1.20.6 + minecraft_version=1.21 loader_version=0.15.11 - mappings_version=2024.05.01 + mappings_version=1.20.6:2024.06.16 # Mod Properties - mod_version=1.3.5 + mod_version=1.3.7 maven_group=com.mt1006.mocap archives_base_name=Mocap # Dependencies - fabric_version=0.99.0+1.20.6 + fabric_version=0.100.3+1.21 diff --git a/src/main/java/com/mt1006/mocap/MocapMod.java b/src/main/java/com/mt1006/mocap/MocapMod.java index ba14776..b9f55fd 100644 --- a/src/main/java/com/mt1006/mocap/MocapMod.java +++ b/src/main/java/com/mt1006/mocap/MocapMod.java @@ -20,8 +20,8 @@ public class MocapMod implements ModInitializer { public static final String MOD_ID = "mocap"; - public static final String VERSION = "1.3.5"; - public static final String FOR_VERSION = "1.20.6"; + public static final String VERSION = "1.3.7"; + public static final String FOR_VERSION = "1.21"; public static final String FOR_LOADER = "Fabric"; public static final Logger LOGGER = LogManager.getLogger(); public static final boolean isDedicatedServer = FabricLoader.getInstance().getEnvironmentType() == EnvType.SERVER; @@ -38,7 +38,6 @@ public class MocapMod implements ModInitializer ServerLivingEntityEvents.ALLOW_DAMAGE.register(EntityEvent::onEntityHurt); RegisterCommand.registerCommands(); - MocapMod.LOGGER.info("{} - Author: mt1006", getFullName()); Fields.init(); MocapPackets.register(); Action.init(); @@ -46,11 +45,11 @@ public class MocapMod implements ModInitializer public static String getName() { - return "MocapMod v" + VERSION; + return "Mocap v" + VERSION; } public static String getFullName() { - return "MocapMod v" + VERSION + " for Minecraft " + FOR_VERSION + " [" + FOR_LOADER + "]"; + return "Mocap v" + VERSION + " for Minecraft " + FOR_VERSION + " [" + FOR_LOADER + "]"; } } diff --git a/src/main/java/com/mt1006/mocap/mixin/LivingEntityMethodMixin.java b/src/main/java/com/mt1006/mocap/mixin/LivingEntityMethodMixin.java index 11381ca..c0c4b99 100644 --- a/src/main/java/com/mt1006/mocap/mixin/LivingEntityMethodMixin.java +++ b/src/main/java/com/mt1006/mocap/mixin/LivingEntityMethodMixin.java @@ -2,6 +2,7 @@ import com.mt1006.mocap.events.EntityEvent; import com.mt1006.mocap.events.PlayerConnectionEvent; +import net.minecraft.server.level.ServerLevel; import net.minecraft.world.damagesource.DamageSource; import net.minecraft.world.entity.Entity; import net.minecraft.world.entity.LivingEntity; @@ -29,7 +30,7 @@ private void atDoPush(Entity entity, CallbackInfo callbackInfo) // Fabric-only - based on Forge LivingDropsEvent injection @Inject(method = "dropAllDeathLoot", at = @At("HEAD"), cancellable = true) - private void atDropAllDeathLoot(DamageSource damageSource, CallbackInfo callbackInfo) + private void atDropAllDeathLoot(ServerLevel serverLevel, DamageSource damageSource, CallbackInfo callbackInfo) { if (EntityEvent.onEntityDrop((LivingEntity)(Object)this)) { callbackInfo.cancel(); } } diff --git a/src/main/java/com/mt1006/mocap/mocap/actions/ChangeItem.java b/src/main/java/com/mt1006/mocap/mocap/actions/ChangeItem.java index cc75032..e5c0e63 100644 --- a/src/main/java/com/mt1006/mocap/mocap/actions/ChangeItem.java +++ b/src/main/java/com/mt1006/mocap/mocap/actions/ChangeItem.java @@ -1,7 +1,6 @@ package com.mt1006.mocap.mocap.actions; import com.mojang.brigadier.exceptions.CommandSyntaxException; -import com.mt1006.mocap.MocapMod; import com.mt1006.mocap.mixin.fields.LivingEntityMixin; import com.mt1006.mocap.mocap.files.RecordingFiles; import com.mt1006.mocap.mocap.playing.PlayingContext; diff --git a/src/main/java/com/mt1006/mocap/mocap/actions/RightClickBlock.java b/src/main/java/com/mt1006/mocap/mocap/actions/RightClickBlock.java index 2452087..66404fa 100644 --- a/src/main/java/com/mt1006/mocap/mocap/actions/RightClickBlock.java +++ b/src/main/java/com/mt1006/mocap/mocap/actions/RightClickBlock.java @@ -5,7 +5,6 @@ import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.core.Vec3i; -import net.minecraft.world.InteractionHand; import net.minecraft.world.entity.Entity; import net.minecraft.world.entity.player.Player; import net.minecraft.world.level.block.BedBlock; diff --git a/src/main/java/com/mt1006/mocap/mocap/actions/SetEffectColor.java b/src/main/java/com/mt1006/mocap/mocap/actions/SetEffectColor.java index 40ee672..a7d6591 100644 --- a/src/main/java/com/mt1006/mocap/mocap/actions/SetEffectColor.java +++ b/src/main/java/com/mt1006/mocap/mocap/actions/SetEffectColor.java @@ -5,7 +5,6 @@ import com.mt1006.mocap.utils.EntityData; import net.minecraft.core.particles.ColorParticleOption; import net.minecraft.core.particles.ParticleOptions; -import net.minecraft.core.particles.ParticleType; import net.minecraft.core.particles.ParticleTypes; import net.minecraft.util.FastColor; import net.minecraft.world.entity.Entity; diff --git a/src/main/java/com/mt1006/mocap/mocap/actions/VehicleData.java b/src/main/java/com/mt1006/mocap/mocap/actions/VehicleData.java index cfdb42d..8f93d43 100644 --- a/src/main/java/com/mt1006/mocap/mocap/actions/VehicleData.java +++ b/src/main/java/com/mt1006/mocap/mocap/actions/VehicleData.java @@ -1,6 +1,9 @@ package com.mt1006.mocap.mocap.actions; -import com.mt1006.mocap.mixin.fields.*; +import com.mt1006.mocap.mixin.fields.AbstractHorseMixin; +import com.mt1006.mocap.mixin.fields.BoatMixin; +import com.mt1006.mocap.mixin.fields.HorseMixin; +import com.mt1006.mocap.mixin.fields.PigMixin; import com.mt1006.mocap.mocap.files.RecordingFiles; import com.mt1006.mocap.mocap.playing.PlayingContext; import com.mt1006.mocap.utils.EntityData; @@ -15,7 +18,6 @@ import net.minecraft.world.entity.player.Player; import net.minecraft.world.entity.vehicle.AbstractMinecart; import net.minecraft.world.entity.vehicle.Boat; -import net.minecraft.world.item.DyeColor; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.Items; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/com/mt1006/mocap/mocap/playing/CustomClientSkinManager.java b/src/main/java/com/mt1006/mocap/mocap/playing/CustomClientSkinManager.java index 1856fb7..29f70c9 100644 --- a/src/main/java/com/mt1006/mocap/mocap/playing/CustomClientSkinManager.java +++ b/src/main/java/com/mt1006/mocap/mocap/playing/CustomClientSkinManager.java @@ -124,6 +124,6 @@ public static boolean isSlimSkin(ResourceLocation res) private static ResourceLocation resFromName(String name) { - return new ResourceLocation(MocapMod.MOD_ID, SKIN_RES_PREFIX + name); + return ResourceLocation.fromNamespaceAndPath(MocapMod.MOD_ID, SKIN_RES_PREFIX + name); } } diff --git a/src/main/java/com/mt1006/mocap/mocap/playing/PlayedScene.java b/src/main/java/com/mt1006/mocap/mocap/playing/PlayedScene.java index d94d8a1..587f3b0 100644 --- a/src/main/java/com/mt1006/mocap/mocap/playing/PlayedScene.java +++ b/src/main/java/com/mt1006/mocap/mocap/playing/PlayedScene.java @@ -15,7 +15,6 @@ import com.mt1006.mocap.utils.ProfileUtils; import net.minecraft.core.Vec3i; import net.minecraft.core.registries.BuiltInRegistries; -import net.minecraft.network.protocol.game.ClientboundAddEntityPacket; import net.minecraft.network.protocol.game.ClientboundPlayerInfoUpdatePacket; import net.minecraft.resources.ResourceLocation; import net.minecraft.server.level.ServerLevel; @@ -162,7 +161,6 @@ private boolean startPlayingRecording(CommandInfo commandInfo, DataManager data) recording.preExecute(fakePlayer, blockOffset); packetTargets.broadcastAll(new ClientboundPlayerInfoUpdatePacket(ClientboundPlayerInfoUpdatePacket.Action.ADD_PLAYER, fakePlayer)); - packetTargets.broadcastAll(new ClientboundAddEntityPacket(fakePlayer)); level.addNewPlayer(fakePlayer); @@ -179,7 +177,7 @@ private boolean startPlayingRecording(CommandInfo commandInfo, DataManager data) } else { - ResourceLocation entityRes = new ResourceLocation(playerAsEntityID); + ResourceLocation entityRes = ResourceLocation.parse(playerAsEntityID); EntityType entityType = BuiltInRegistries.ENTITY_TYPE.get(entityRes); entity = BuiltInRegistries.ENTITY_TYPE.containsKey(entityRes) ? entityType.create(level) : null; diff --git a/src/main/java/com/mt1006/mocap/network/MocapPacketC2S.java b/src/main/java/com/mt1006/mocap/network/MocapPacketC2S.java index 6b307ed..254ae19 100644 --- a/src/main/java/com/mt1006/mocap/network/MocapPacketC2S.java +++ b/src/main/java/com/mt1006/mocap/network/MocapPacketC2S.java @@ -5,7 +5,6 @@ import com.mt1006.mocap.events.PlayerConnectionEvent; import com.mt1006.mocap.mocap.playing.CustomSkinManager; import net.fabricmc.fabric.api.client.networking.v1.ClientPlayNetworking; -import net.fabricmc.fabric.api.networking.v1.PacketByteBufs; import net.fabricmc.fabric.api.networking.v1.PacketSender; import net.minecraft.network.FriendlyByteBuf; import net.minecraft.network.codec.StreamCodec; @@ -18,7 +17,7 @@ public class MocapPacketC2S implements CustomPacketPayload { - public static final Type TYPE = new Type<>(new ResourceLocation(MocapMod.MOD_ID, "fabric_c2s")); + public static final Type TYPE = new Type<>(ResourceLocation.fromNamespaceAndPath(MocapMod.MOD_ID, "fabric_c2s")); public static final StreamCodec CODEC = StreamCodec.of((b, p) -> p.encode(b), MocapPacketC2S::new); public static final int ACCEPT_SERVER = 0; diff --git a/src/main/java/com/mt1006/mocap/network/MocapPacketS2C.java b/src/main/java/com/mt1006/mocap/network/MocapPacketS2C.java index eafa2df..f877291 100644 --- a/src/main/java/com/mt1006/mocap/network/MocapPacketS2C.java +++ b/src/main/java/com/mt1006/mocap/network/MocapPacketS2C.java @@ -5,12 +5,8 @@ import com.mt1006.mocap.command.InputArgument; import com.mt1006.mocap.events.PlayerConnectionEvent; import com.mt1006.mocap.mocap.playing.CustomClientSkinManager; -import io.netty.buffer.ByteBuf; -import net.fabricmc.fabric.api.networking.v1.PacketByteBufs; import net.fabricmc.fabric.api.networking.v1.PacketSender; import net.fabricmc.fabric.api.networking.v1.ServerPlayNetworking; -import net.minecraft.client.Minecraft; -import net.minecraft.client.multiplayer.ClientPacketListener; import net.minecraft.network.FriendlyByteBuf; import net.minecraft.network.codec.StreamCodec; import net.minecraft.network.protocol.common.custom.CustomPacketPayload; @@ -24,7 +20,7 @@ public class MocapPacketS2C implements CustomPacketPayload { - public static final Type TYPE = new Type<>(new ResourceLocation(MocapMod.MOD_ID, "fabric_s2c")); + public static final Type TYPE = new Type<>(ResourceLocation.fromNamespaceAndPath(MocapMod.MOD_ID, "fabric_s2c")); public static final StreamCodec CODEC = StreamCodec.of((b, p) -> p.encode(b), MocapPacketS2C::new); public static final int ON_LOGIN = 0; diff --git a/src/main/java/com/mt1006/mocap/network/MocapPackets.java b/src/main/java/com/mt1006/mocap/network/MocapPackets.java index 6a2cbcd..5913b06 100644 --- a/src/main/java/com/mt1006/mocap/network/MocapPackets.java +++ b/src/main/java/com/mt1006/mocap/network/MocapPackets.java @@ -4,8 +4,6 @@ import net.fabricmc.fabric.api.client.networking.v1.ClientPlayNetworking; import net.fabricmc.fabric.api.networking.v1.PayloadTypeRegistry; import net.fabricmc.fabric.api.networking.v1.ServerPlayNetworking; -import net.fabricmc.fabric.mixin.networking.PacketCodecDispatcherMixin; -import net.minecraft.resources.ResourceLocation; public class MocapPackets { diff --git a/src/main/java/com/mt1006/mocap/utils/FakePlayer.java b/src/main/java/com/mt1006/mocap/utils/FakePlayer.java index fb01eac..e05001a 100644 --- a/src/main/java/com/mt1006/mocap/utils/FakePlayer.java +++ b/src/main/java/com/mt1006/mocap/utils/FakePlayer.java @@ -2,7 +2,6 @@ import com.mojang.authlib.GameProfile; import net.minecraft.network.Connection; -import net.minecraft.network.PacketListener; import net.minecraft.network.PacketSendListener; import net.minecraft.network.chat.ChatType; import net.minecraft.network.chat.Component; @@ -20,6 +19,7 @@ import net.minecraft.world.damagesource.DamageSource; import net.minecraft.world.entity.Entity; import net.minecraft.world.entity.RelativeMovement; +import net.minecraft.world.level.portal.DimensionTransition; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -37,7 +37,7 @@ public FakePlayer(ServerLevel level, GameProfile profile) setInvulnerable(true); } - @Override public Entity changeDimension(@NotNull ServerLevel p_20118_) { return null; } + @Override public Entity changeDimension(@NotNull DimensionTransition dimensionTransition) { return null; } @Override public void displayClientMessage(@NotNull Component chatComponent, boolean actionBar) { } @Override public void awardStat(@NotNull Stat stat, int amount) { } @@ -83,7 +83,6 @@ public FakePlayerNetHandler(MinecraftServer server, ServerPlayer player, GamePro @Override public void handleUseItem(ServerboundUseItemPacket packet) { } @Override public void handleTeleportToEntityPacket(ServerboundTeleportToEntityPacket packet) { } @Override public void handlePaddleBoat(ServerboundPaddleBoatPacket packet) { } - @Override public void onDisconnect(Component message) { } @Override public void send(Packet packet) { } @Override public void send(Packet packet, @Nullable PacketSendListener sendListener) { } @Override public void handleSetCarriedItem(ServerboundSetCarriedItemPacket packet) { } diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index 5d7156f..562856d 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -25,7 +25,7 @@ "depends": { - "minecraft": "~1.20.5", + "minecraft": "~1.21", "fabricloader": ">=0.15.0", "fabric-api": "*", "java": ">=21"