event

gnembon · Oct 17, 2023 · b1cc482 · b1cc482
1 parent 19ca5a2
commit b1cc482
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 0 deletions.
diff --git a/src/main/java/carpet/mixins/ServerPlayer_scarpetEventMixin.java b/src/main/java/carpet/mixins/ServerPlayer_scarpetEventMixin.java
@@ -2,14 +2,17 @@
 
 import carpet.fakes.EntityInterface;
 import carpet.fakes.ServerPlayerInterface;
+import carpet.script.CarpetEventServer;
 import carpet.script.EntityEventsGroup;
+
 import com.mojang.authlib.GameProfile;
 import net.minecraft.core.BlockPos;
 import net.minecraft.resources.ResourceKey;
 import net.minecraft.server.level.ServerLevel;
 import net.minecraft.server.level.ServerPlayer;
 import net.minecraft.stats.Stat;
 import net.minecraft.world.InteractionHand;
+import net.minecraft.world.MenuProvider;
 import net.minecraft.world.damagesource.DamageSource;
 import net.minecraft.world.entity.Entity;
 import net.minecraft.world.entity.player.Player;
@@ -45,6 +48,14 @@ public ServerPlayer_scarpetEventMixin(Level level, BlockPos blockPos, float f, G
 
     @Shadow public boolean wonGame;
 
+    @Inject(method = "openMenu", at = @At("RETURN"))
+    private void grabStat(MenuProvider menuProvider, CallbackInfoReturnable<java.util.OptionalInt> cir)
+    {
+        if (cir.getReturnValue().isPresent()) {
+            CarpetEventServer.Event.PLAYER_OPEN_SCREEN.onPlayerEvent((ServerPlayer)(Object)this);
+        };
+    }
+
     @Redirect(method = "completeUsingItem", at = @At(
             value = "INVOKE",
             target = "Lnet/minecraft/world/entity/player/Player;completeUsingItem()V"

diff --git a/src/main/java/carpet/script/CarpetEventServer.java b/src/main/java/carpet/script/CarpetEventServer.java
@@ -853,6 +853,17 @@ public void onSlotSwitch(ServerPlayer player, int from, int to)
                         ), player::createCommandSourceStack);
             }
         };
+        public static final Event PLAYER_OPEN_SCREEN = new Event("player_open_screen", 1, false)
+        {
+            @Override
+            public boolean onPlayerEvent(ServerPlayer player)
+            {
+                return handler.call(() ->
+                        Arrays.asList(
+                                new EntityValue(player)
+                        ), player::createCommandSourceStack);
+            }
+        };
         public static final Event PLAYER_SWAPS_HANDS = new Event("player_swaps_hands", 1, false)
         {
             @Override