FabricMC/fabric
1
0
Fork 1
mirror of https://github.com/FabricMC/fabric.git synced 2025-04-21 03:10:54 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions7

Set player.currentScreenHandler before invoking ExtendedScreenHandlerFactory ()

Browse source 
* Set player.currentScreenHandler before invoking ExtendedScreenHandlerFactory

* Add comment

* Cleanup code
This commit is contained in:
modmuss 2023-05-30 12:58:26 +01:00 • committed by GitHub
parent 01925f0fc2
commit 8e779a4048
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 13 deletions

19
fabric-screen-handler-api-v1/src/main/java/net/fabricmc/fabric/mixin/screenhandler/ServerPlayerEntityMixin.java
View file

@ -16,12 +16,12 @@
package net.fabricmc.fabric.mixin.screenhandler;
import java.util.Objects;
import java.util.OptionalInt;
import com.mojang.authlib.GameProfile;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Shadow;
import org.spongepowered.asm.mixin.Unique;
import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Inject;
import org.spongepowered.asm.mixin.injection.Redirect;
@ -56,9 +56,6 @@ public abstract class ServerPlayerEntityMixin extends PlayerEntity {
@Shadow
public abstract void closeHandledScreen();
@Unique
private final ThreadLocal<ScreenHandler> fabric_openedScreenHandler = new ThreadLocal<>();
@Redirect(method = "openHandledScreen(Lnet/minecraft/screen/NamedScreenHandlerFactory;)Ljava/util/OptionalInt;", at = @At(value = "INVOKE", target = "Lnet/minecraft/server/network/ServerPlayerEntity;closeHandledScreen()V"))
private void fabric_closeHandledScreenIfAllowed(ServerPlayerEntity player, NamedScreenHandlerFactory factory) {
if (factory.shouldCloseCurrentScreen()) {
@ -72,7 +69,8 @@ public abstract class ServerPlayerEntityMixin extends PlayerEntity {
@Inject(method = "openHandledScreen(Lnet/minecraft/screen/NamedScreenHandlerFactory;)Ljava/util/OptionalInt;", at = @At(value = "INVOKE", target = "Lnet/minecraft/server/network/ServerPlayNetworkHandler;sendPacket(Lnet/minecraft/network/packet/Packet;)V"), locals = LocalCapture.CAPTURE_FAILHARD)
private void fabric_storeOpenedScreenHandler(NamedScreenHandlerFactory factory, CallbackInfoReturnable<OptionalInt> info, ScreenHandler handler) {
if (factory instanceof ExtendedScreenHandlerFactory || (factory instanceof SimpleNamedScreenHandlerFactory simpleFactory && simpleFactory.baseFactory instanceof ExtendedScreenHandlerFactory)) {
fabric_openedScreenHandler.set(handler);
// Set the screen handler, so the factory method can access it through the player.
currentScreenHandler = handler;
} else if (handler.getType() instanceof ExtendedScreenHandlerType<?>) {
Identifier id = Registries.SCREEN_HANDLER.getId(handler.getType());
throw new IllegalArgumentException("[Fabric] Extended screen handler " + id + " must be opened with an ExtendedScreenHandlerFactory!");
@ -85,11 +83,11 @@ public abstract class ServerPlayerEntityMixin extends PlayerEntity {
factory = extendedFactory;
}
if (factory instanceof ExtendedScreenHandlerFactory) {
ScreenHandler handler = fabric_openedScreenHandler.get();
if (factory instanceof ExtendedScreenHandlerFactory extendedFactory) {
ScreenHandler handler = Objects.requireNonNull(currentScreenHandler);
if (handler.getType() instanceof ExtendedScreenHandlerType<?>) {
Networking.sendOpenPacket((ServerPlayerEntity) (Object) this, (ExtendedScreenHandlerFactory) factory, handler, screenHandlerSyncId);
Networking.sendOpenPacket((ServerPlayerEntity) (Object) this, extendedFactory, handler, screenHandlerSyncId);
} else {
Identifier id = Registries.SCREEN_HANDLER.getId(handler.getType());
throw new IllegalArgumentException("[Fabric] Non-extended screen handler " + id + " must not be opened with an ExtendedScreenHandlerFactory!");
@ -99,9 +97,4 @@ public abstract class ServerPlayerEntityMixin extends PlayerEntity {
networkHandler.sendPacket(packet);
}
}
@Inject(method = "openHandledScreen(Lnet/minecraft/screen/NamedScreenHandlerFactory;)Ljava/util/OptionalInt;", at = @At("RETURN"))
private void fabric_clearStoredScreenHandler(NamedScreenHandlerFactory factory, CallbackInfoReturnable<OptionalInt> info) {
fabric_openedScreenHandler.remove();
}
}