Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Mostly switch to @Inject in MixinPlayerChunkSender for compatibility #1592

Draft
wants to merge 1 commit into
base: 1.21
Choose a base branch
from
Draft

Mostly switch to @Inject in MixinPlayerChunkSender for compatibility #1592

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 19 additions & 11 deletions src/main/java/qouteall/imm_ptl/core/mixin/common/chunk_sync/MixinPlayerChunkSender.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,9 @@
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Overwrite;
import org.spongepowered.asm.mixin.Shadow;
import org.spongepowered.asm.mixin.injection.Inject;
import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
import qouteall.imm_ptl.core.chunk_loading.ImmPtlChunkTracking;

/**
Expand All @@ -23,36 +26,41 @@ public class MixinPlayerChunkSender {
* @author qouteall
* @reason see class comment
*/
@Overwrite
public void markChunkPendingToSend(LevelChunk levelChunk) {

@Inject(method = "markChunkPendingToSend(Lnet/minecraft/world/level/chunk/LevelChunk;)V",
at = @At("HEAD"), cancellable = true)
public void markChunkPendingToSend(CallbackInfo ci) {
ci.cancel();
}

/**
* @author qouteall
* @reason see class comment
*/
@Overwrite
public void dropChunk(ServerPlayer serverPlayer, ChunkPos chunkPos) {

@Inject(method = "dropChunk(Lnet/minecraft/server/level/ServerPlayer;Lnet/minecraft/world/level/ChunkPos;)V",
at = @At("HEAD"), cancellable = true)
public void dropChunk(CallbackInfo ci) {
ci.cancel();
}

/**
* @author qouteall
* @reason see class comment
*/
@Overwrite
public void sendNextChunks(ServerPlayer serverPlayer) {
@Inject(method = "sendNextChunks(Lnet/minecraft/server/level/ServerPlayer;)V",
at = @At("HEAD"), cancellable = true)
public void sendNextChunks(ServerPlayer serverPlayer, CallbackInfo ci) {
ImmPtlChunkTracking.getPlayerInfo(serverPlayer).doChunkSending(serverPlayer);
ci.cancel();
}

/**
* @author qouteall
* @reason see class comment
*/
@Overwrite
public void onChunkBatchReceivedByClient(float f) {

@Inject(method = "onChunkBatchReceivedByClient(F)V",
at = @At("HEAD"), cancellable = true)
public void onChunkBatchReceivedByClient(CallbackInfo ci) {
ci.cancel();
}

/**
Expand Down