diff --git a/README.md b/README.md index f1da753..bb6b1ba 100644 --- a/README.md +++ b/README.md @@ -450,7 +450,7 @@ repositories { } dependencies { - modImplementation("me.senseiwells:server-replay:1.1.3+1.21.1") + modImplementation("me.senseiwells:server-replay:1.1.4+1.21.1") } ``` diff --git a/build.gradle.kts b/build.gradle.kts index 742480e..d49696b 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -27,7 +27,7 @@ repositories { } -val modVersion = "1.1.3" +val modVersion = "1.1.4" val releaseVersion = "${modVersion}+mc${libs.versions.minecraft.get()}" version = releaseVersion group = "me.senseiwells" diff --git a/libs.versions.toml b/libs.versions.toml index 5fe7f9c..751ac2c 100644 --- a/libs.versions.toml +++ b/libs.versions.toml @@ -13,7 +13,7 @@ permissions = "0.3.1" carpet = "1.4.147" voicechat = "fabric-1.21.1-2.5.20" voicechat-api = "2.5.0" -vmp = "0.2.0+beta.7.162+1.21" +vmp = "0.2.0+beta.7.168+1.21.1" c2me = "0.3.0+alpha.0.206+1.21.1" servux = "1.21-0.3.8-sakura.1" syncmatica = "1.21-sakura.6" diff --git a/src/main/java/me/senseiwells/replay/mixin/compat/c2me/TheChunkSystemMixin.java b/src/main/java/me/senseiwells/replay/mixin/compat/c2me/TheChunkSystemMixin.java index 8a62aee..289943d 100644 --- a/src/main/java/me/senseiwells/replay/mixin/compat/c2me/TheChunkSystemMixin.java +++ b/src/main/java/me/senseiwells/replay/mixin/compat/c2me/TheChunkSystemMixin.java @@ -31,46 +31,6 @@ protected TheChunkSystemMixin(ThreadFactory threadFactory) { super(threadFactory); } -// @ModifyExpressionValue( -// method = "vanillaIf$setLevel", -// at = @At( -// value = "INVOKE", -// target = "Lcom/ishland/c2me/rewrites/chunksystem/common/TheChunkSystem;addTicket(Ljava/lang/Object;Lcom/ishland/flowsched/scheduler/ItemTicket$TicketType;Ljava/lang/Object;Lcom/ishland/flowsched/scheduler/ItemStatus;Ljava/lang/Runnable;)Lcom/ishland/flowsched/scheduler/ItemHolder;" -// ) -// ) -// private ItemHolder onLoadChunk( -// ItemHolder original, -// @Local(ordinal = 0) NewChunkStatus oldStatus -// ) { -// if (oldStatus == this.getUnloadedStatus()) { -// ChunkHolder holder = original.getUserData().get(); -// ServerLevel level = ((ChunkMapAccessor) this.tacs).getLevel(); -// for (ChunkRecorder recorder : ChunkRecorders.containing(level.dimension(), original.getKey())) { -// ((ChunkRecordable) holder).addRecorder(recorder); -// } -// } -// return original; -// } -// -// @Inject( -// method = "vanillaIf$setLevel", -// at = @At( -// value = "INVOKE", -// target = "Lit/unimi/dsi/fastutil/longs/Long2IntMap;remove(J)I" -// ) -// ) -// private void onUnloadChunk( -// long pos, -// int level, -// CallbackInfoReturnable cir, -// @Local ChunkPos key -// ) { -// if (this.managedTickets.containsKey(pos)) { -// ItemHolder item = this.getHolder(key); -// ((ChunkRecordable) item.getUserData().get()).removeAllRecorders(); -// } -// } - @Inject( method = "onItemUpgrade", at = @At("HEAD") diff --git a/src/main/java/me/senseiwells/replay/mixin/compat/vmp/NearbyEntityTrackingMixin.java b/src/main/java/me/senseiwells/replay/mixin/compat/vmp/NearbyEntityTrackingMixin.java index 9cdcac4..d825ba8 100644 --- a/src/main/java/me/senseiwells/replay/mixin/compat/vmp/NearbyEntityTrackingMixin.java +++ b/src/main/java/me/senseiwells/replay/mixin/compat/vmp/NearbyEntityTrackingMixin.java @@ -10,7 +10,6 @@ import net.minecraft.server.level.ServerPlayer; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; -import org.spongepowered.asm.mixin.injection.Coerce; import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; @@ -19,17 +18,14 @@ public class NearbyEntityTrackingMixin { @Inject( method = "tick", at = @At( - value = "INVOKE_ASSIGN", + value = "INVOKE", target = "Lcom/ishland/vmp/common/playerwatching/ServerPlayerEntityExtension;vmpTracking$updatePosition()V" - ), - remap = false + ) ) - @SuppressWarnings("resource") private void onPlayerTrackingTick( - @Coerce Object ticketManager, CallbackInfo ci, - @Local(name = "player") ServerPlayer player, - @Local(name = "isPlayerPositionUpdated") boolean positionUpdated + @Local ServerPlayer player, + @Local boolean positionUpdated ) { if (positionUpdated) { ServerLevel level = player.serverLevel();