Backport to 1.21.1

Patbox · Patbox · commit 10c67d032e24 · 2025-03-13T21:16:25.000+01:00
diff --git a/gradle.properties b/gradle.properties
@@ -2,27 +2,27 @@
 org.gradle.jvmargs=-Xmx2G
 
 # Fabric Properties
-minecraft_version=1.21.4
-yarn_mappings=1.21.4+build.1
+minecraft_version=1.21.1
+yarn_mappings=1.21.1+build.1
 loader_version=0.16.9
 
 # Dependencies
-fabric_version=0.118.5+1.21.4
-polymer_version=0.11.8+1.21.4
-server_translations_version=2.4.0+1.21.2-rc1
+fabric_version=0.115.1+1.21.1
+polymer_version=0.9.18+1.21.1
+server_translations_version=2.3.1+1.21-pre2
 packet_tweaker_version=0.6.0-pre.1+1.21.2-pre3
-fantasy_version=0.6.5+1.21.2
+fantasy_version=0.6.4+1.21
 more_codecs_version=0.3.5+1.21.2
-stimuli_version=0.5.0+1.21.3
-map_templates_version=0.2.1+1.21.3
+stimuli_version=0.4.12+1.21
+map_templates_version=0.2.0+1.21
 substrate_version=0.2.2+1.20.1
-sgui_version=1.8.2+1.21.4
+sgui_version=1.6.1+1.21.1
 sidebar_api_version=0.5.1+1.21.1
-placeholder_api_version=2.5.2+1.21.3
-map_canvas_api_version=0.5.0+1.21.3
-player_data_api_version=0.7.0+1.21.3
-predicate_api_version=0.6.0+1.21.2
-permission_api_version=0.3.3
+placeholder_api_version=2.4.2+1.21
+map_canvas_api_version=0.4.2+1.21.1
+player_data_api_version=0.6.0+1.21
+predicate_api_version=0.5.2+1.21
+permission_api_version=0.3.1
 
 # Mod Properties
 mod_version=0.6
diff --git a/src/main/java/xyz/nucleoid/plasmid/api/game/common/team/TeamManager.java b/src/main/java/xyz/nucleoid/plasmid/api/game/common/team/TeamManager.java
@@ -14,6 +14,7 @@
 import net.minecraft.server.network.ServerPlayerEntity;
 import net.minecraft.text.Style;
 import net.minecraft.text.Text;
+import net.minecraft.util.ActionResult;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import xyz.nucleoid.plasmid.api.game.player.MutablePlayerSet;
@@ -330,17 +331,17 @@ private void onRemovePlayer(ServerPlayerEntity player) {
         }
     }
 
-    private EventResult onDamagePlayer(ServerPlayerEntity player, DamageSource source, float amount) {
+    private ActionResult onDamagePlayer(ServerPlayerEntity player, DamageSource source, float amount) {
         if (source.getAttacker() instanceof ServerPlayerEntity attacker) {
             var playerTeam = this.teamFor(player);
             var attackerTeam = this.teamFor(attacker);
 
             if (playerTeam != null && playerTeam == attackerTeam && !this.getTeamConfig(playerTeam).friendlyFire()) {
-                return EventResult.DENY;
+                return EventResult.DENY.asActionResult();
             }
         }
 
-        return EventResult.PASS;
+        return EventResult.PASS.asActionResult();
     }
 
     private Text onFormatDisplayName(ServerPlayerEntity player, Text name, Text vanilla) {
diff --git a/src/main/java/xyz/nucleoid/plasmid/api/game/rule/GameRuleType.java b/src/main/java/xyz/nucleoid/plasmid/api/game/rule/GameRuleType.java
@@ -4,7 +4,7 @@
 import net.minecraft.block.TntBlock;
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.registry.tag.DamageTypeTags;
-import xyz.nucleoid.stimuli.event.DroppedItemsResult;
+//import xyz.nucleoid.stimuli.event.DroppedItemsResult;
 import xyz.nucleoid.stimuli.event.EventRegistrar;
 import xyz.nucleoid.stimuli.event.EventResult;
 import xyz.nucleoid.stimuli.event.StimulusEvent;
@@ -28,70 +28,70 @@
 import xyz.nucleoid.stimuli.event.world.NetherPortalOpenEvent;
 
 import java.util.Comparator;
+import java.util.List;
 
 public final class GameRuleType {
     public static final Comparator<GameRuleType> COMPARATOR = Comparator.comparing(type -> type.priority);
 
     public static final GameRuleType BREAK_BLOCKS = GameRuleType.create()
-            .enforces(BlockBreakEvent.EVENT, result -> (player, world, pos) -> result);
+            .enforces(BlockBreakEvent.EVENT, result -> (player, world, pos) -> result.asActionResult());
 
     public static final GameRuleType PLACE_BLOCKS = GameRuleType.create()
-            .enforces(BlockPlaceEvent.BEFORE, result -> (player, world, pos, state, ctx) -> result);
+            .enforces(BlockPlaceEvent.BEFORE, result -> (player, world, pos, state, ctx) -> result.asActionResult());
 
     public static final GameRuleType PORTALS = GameRuleType.create()
-            .enforces(NetherPortalOpenEvent.EVENT, result -> (world, pos) -> result);
+            .enforces(NetherPortalOpenEvent.EVENT, result -> (world, pos) -> result.asActionResult());
 
     public static final GameRuleType CRAFTING = GameRuleType.create()
-            .enforces(ItemCraftEvent.EVENT, result -> (player, recipe) -> result);
+            .enforces(ItemCraftEvent.EVENT, result -> (player, recipe) -> result.asActionResult());
 
     public static final GameRuleType PVP = GameRuleType.create()
             .enforces(PlayerDamageEvent.EVENT, result -> (player, source, amount) -> {
                 if (source.getSource() instanceof PlayerEntity) {
-                    return result;
+                    return result.asActionResult();
                 } else {
-                    return EventResult.PASS;
+                    return EventResult.PASS.asActionResult();
                 }
             });
 
     public static final GameRuleType HUNGER = GameRuleType.create()
-            .enforces(PlayerConsumeHungerEvent.EVENT, result -> (player, foodLevel, saturation, exhaustion) -> result);
+            .enforces(PlayerConsumeHungerEvent.EVENT, result -> (player, foodLevel, saturation, exhaustion) -> result.asActionResult());
 
     public static final GameRuleType SATURATED_REGENERATION = GameRuleType.create();
 
     public static final GameRuleType FALL_DAMAGE = GameRuleType.create()
             .enforces(PlayerDamageEvent.EVENT, result -> (player, source, amount) -> {
                 if (source.isIn(DamageTypeTags.IS_FALL)) {
-                    return result;
+                    return result.asActionResult();
                 } else {
-                    return EventResult.PASS;
+                    return EventResult.PASS.asActionResult();
                 }
             });
 
     public static final GameRuleType USE_BLOCKS = GameRuleType.create()
             .enforces(BlockUseEvent.EVENT, result -> (player, hand, hitResult) -> result.asActionResult());
     public static final GameRuleType USE_ITEMS = GameRuleType.create()
-            .enforces(ItemUseEvent.EVENT, result -> (player, hand) -> result.asActionResult());
+            .enforces(ItemUseEvent.EVENT, result -> (player, hand) -> result.asTypedActionResult(player.getStackInHand(hand)));
     public static final GameRuleType USE_ENTITIES = GameRuleType.create()
-            .enforces(EntityUseEvent.EVENT, result -> (player, entity, hand, hitResult) -> result);
+            .enforces(EntityUseEvent.EVENT, result -> (player, entity, hand, hitResult) -> result.asActionResult());
 
     public static final GameRuleType INTERACTION = GameRuleType.allOf(USE_BLOCKS, USE_ITEMS, USE_ENTITIES);
 
     public static final GameRuleType BLOCK_DROPS = GameRuleType.create()
         .enforces(BlockDropItemsEvent.EVENT, result -> (entity, world, pos, state, drops) -> {
             return switch (result) {
-                case PASS -> DroppedItemsResult.pass(drops);
-                case ALLOW -> DroppedItemsResult.allow(drops);
-                case DENY -> DroppedItemsResult.deny();
+                case PASS, ALLOW -> result.asTypedActionResult(drops);
+                case DENY -> result.asTypedActionResult(List.of());
             };
         });
 
     public static final GameRuleType THROW_ITEMS = GameRuleType.create()
-            .enforces(ItemThrowEvent.EVENT, result -> (player, slot, stack) -> result);
+            .enforces(ItemThrowEvent.EVENT, result -> (player, slot, stack) -> result.asActionResult());
     public static final GameRuleType PICKUP_ITEMS = GameRuleType.create()
-            .enforces(ItemPickupEvent.EVENT, result -> (player, slot, stack) -> result);
+            .enforces(ItemPickupEvent.EVENT, result -> (player, slot, stack) -> result.asActionResult());
 
     public static final GameRuleType DISPENSER_ACTIVATE = GameRuleType.create()
-            .enforces(DispenserActivateEvent.EVENT, result -> (world, pos, dispenser, slot, stack) -> result);
+            .enforces(DispenserActivateEvent.EVENT, result -> (world, pos, dispenser, slot, stack) -> result.asActionResult());
 
     public static final GameRuleType UNSTABLE_TNT = GameRuleType.create()
             .enforces(BlockPlaceEvent.AFTER, result -> (player, world, pos, state) -> {
@@ -102,13 +102,13 @@ public final class GameRuleType {
             });
 
     public static final GameRuleType FIRE_TICK = GameRuleType.create()
-            .enforces(FireTickEvent.EVENT, result -> (world, pos) -> result);
+            .enforces(FireTickEvent.EVENT, result -> (world, pos) -> result.asActionResult());
     public static final GameRuleType FLUID_FLOW = GameRuleType.create()
-            .enforces(FluidFlowEvent.EVENT, result -> (world, fluidPos, fluidBlock, flowDirection, flowTo, flowToBlock) -> result);
+            .enforces(FluidFlowEvent.EVENT, result -> (world, fluidPos, fluidBlock, flowDirection, flowTo, flowToBlock) -> result.asActionResult());
     public static final GameRuleType ICE_MELT = GameRuleType.create()
-            .enforces(IceMeltEvent.EVENT, result -> (world, pos) -> result);
+            .enforces(IceMeltEvent.EVENT, result -> (world, pos) -> result.asActionResult());
     public static final GameRuleType CORAL_DEATH = GameRuleType.create()
-            .enforces(CoralDeathEvent.EVENT, result -> (world, pos, from, to) -> result);
+            .enforces(CoralDeathEvent.EVENT, result -> (world, pos, from, to) -> result.asActionResult());
 
     public static final GameRuleType DISMOUNT_VEHICLE = GameRuleType.create();
     public static final GameRuleType STOP_SPECTATING_ENTITY = GameRuleType.create();
@@ -117,7 +117,7 @@ public final class GameRuleType {
     public static final GameRuleType SPREAD_CONTAINER_LOOT = GameRuleType.create();
     public static final GameRuleType MODIFY_INVENTORY = GameRuleType.create();
     public static final GameRuleType MODIFY_ARMOR = GameRuleType.create();
-    public static final GameRuleType SWAP_OFFHAND = GameRuleType.create().enforces(PlayerSwapWithOffhandEvent.EVENT, result -> (player) -> result);
+    public static final GameRuleType SWAP_OFFHAND = GameRuleType.create().enforces(PlayerSwapWithOffhandEvent.EVENT, result -> (player) -> result.asActionResult());
 
     private GameRuleEnforcer enforcer;
     private Priority priority = Priority.NORMAL;
diff --git a/src/main/java/xyz/nucleoid/plasmid/api/util/ItemStackBuilder.java b/src/main/java/xyz/nucleoid/plasmid/api/util/ItemStackBuilder.java
@@ -60,7 +60,7 @@ public ItemStackBuilder addEnchantment(World world, RegistryKey<Enchantment> enc
     }
 
     public ItemStackBuilder addEnchantment(RegistryWrapper.WrapperLookup lookup, RegistryKey<Enchantment> enchantment, int level) {
-        return this.addEnchantment(lookup.getOrThrow(RegistryKeys.ENCHANTMENT).getOrThrow(enchantment), level);
+        return this.addEnchantment(lookup.getWrapperOrThrow(RegistryKeys.ENCHANTMENT).getOrThrow(enchantment), level);
     }
 
     public ItemStackBuilder addEnchantment(RegistryEntry<Enchantment> enchantment, int level) {
diff --git a/src/main/java/xyz/nucleoid/plasmid/api/util/WoodType.java b/src/main/java/xyz/nucleoid/plasmid/api/util/WoodType.java
@@ -18,7 +18,6 @@ public enum WoodType {
     DARK_OAK(Type.REGULAR, Blocks.DARK_OAK_SAPLING, Blocks.DARK_OAK_LEAVES, Blocks.DARK_OAK_LOG, Blocks.DARK_OAK_WOOD, Blocks.STRIPPED_DARK_OAK_LOG, Blocks.STRIPPED_DARK_OAK_WOOD, Blocks.DARK_OAK_PLANKS, Blocks.DARK_OAK_SLAB, Blocks.DARK_OAK_STAIRS, Blocks.DARK_OAK_FENCE, Blocks.DARK_OAK_FENCE_GATE, Blocks.DARK_OAK_DOOR, Blocks.DARK_OAK_SIGN, Blocks.DARK_OAK_WALL_SIGN, Blocks.DARK_OAK_HANGING_SIGN, Blocks.DARK_OAK_WALL_HANGING_SIGN, Blocks.DARK_OAK_BUTTON, Blocks.DARK_OAK_PRESSURE_PLATE, Items.DARK_OAK_BOAT, Items.DARK_OAK_CHEST_BOAT),
     CHERRY(Type.REGULAR, Blocks.CHERRY_SAPLING, Blocks.CHERRY_LEAVES, Blocks.CHERRY_LOG, Blocks.CHERRY_WOOD, Blocks.STRIPPED_CHERRY_LOG, Blocks.STRIPPED_CHERRY_WOOD, Blocks.CHERRY_PLANKS, Blocks.CHERRY_SLAB, Blocks.CHERRY_STAIRS, Blocks.CHERRY_FENCE, Blocks.CHERRY_FENCE_GATE, Blocks.CHERRY_DOOR, Blocks.CHERRY_SIGN, Blocks.CHERRY_WALL_SIGN, Blocks.CHERRY_HANGING_SIGN, Blocks.CHERRY_WALL_HANGING_SIGN, Blocks.CHERRY_BUTTON, Blocks.CHERRY_PRESSURE_PLATE, Items.CHERRY_BOAT, Items.CHERRY_CHEST_BOAT),
     MANGROVE(Type.REGULAR, Blocks.MANGROVE_PROPAGULE, Blocks.MANGROVE_LEAVES, Blocks.MANGROVE_LOG, Blocks.MANGROVE_WOOD, Blocks.STRIPPED_MANGROVE_LOG, Blocks.STRIPPED_MANGROVE_WOOD, Blocks.MANGROVE_PLANKS, Blocks.MANGROVE_SLAB, Blocks.MANGROVE_STAIRS, Blocks.MANGROVE_FENCE, Blocks.MANGROVE_FENCE_GATE, Blocks.MANGROVE_DOOR, Blocks.MANGROVE_SIGN,  Blocks.MANGROVE_WALL_SIGN, Blocks.MANGROVE_HANGING_SIGN, Blocks.MANGROVE_WALL_HANGING_SIGN, Blocks.MANGROVE_BUTTON, Blocks.MANGROVE_PRESSURE_PLATE, Items.MANGROVE_BOAT, Items.MANGROVE_CHEST_BOAT),
-    PALE_OAK(Type.REGULAR, Blocks.PALE_OAK_SAPLING, Blocks.PALE_OAK_LEAVES, Blocks.PALE_OAK_LOG, Blocks.PALE_OAK_WOOD, Blocks.STRIPPED_PALE_OAK_LOG, Blocks.STRIPPED_PALE_OAK_WOOD, Blocks.PALE_OAK_PLANKS, Blocks.PALE_OAK_SLAB, Blocks.PALE_OAK_STAIRS, Blocks.PALE_OAK_FENCE, Blocks.PALE_OAK_FENCE_GATE, Blocks.PALE_OAK_DOOR, Blocks.PALE_OAK_SIGN,  Blocks.PALE_OAK_WALL_SIGN, Blocks.PALE_OAK_HANGING_SIGN, Blocks.PALE_OAK_WALL_HANGING_SIGN, Blocks.PALE_OAK_BUTTON, Blocks.PALE_OAK_PRESSURE_PLATE, Items.PALE_OAK_BOAT, Items.PALE_OAK_CHEST_BOAT),
     // Put here non-full wood-like types (aka with fallback blocks/items/etc.)
     CRIMSON(Type.NETHER, Blocks.CRIMSON_FUNGUS, Blocks.NETHER_WART_BLOCK, Blocks.CRIMSON_STEM, Blocks.CRIMSON_HYPHAE, Blocks.STRIPPED_CRIMSON_STEM, Blocks.STRIPPED_CRIMSON_HYPHAE, Blocks.CRIMSON_PLANKS, Blocks.CRIMSON_SLAB, Blocks.CRIMSON_STAIRS, Blocks.CRIMSON_FENCE, Blocks.CRIMSON_FENCE_GATE, Blocks.CRIMSON_DOOR, Blocks.CRIMSON_SIGN,  Blocks.CRIMSON_WALL_SIGN, Blocks.CRIMSON_HANGING_SIGN, Blocks.CRIMSON_WALL_HANGING_SIGN, Blocks.CRIMSON_BUTTON, Blocks.CRIMSON_PRESSURE_PLATE, Items.MANGROVE_BOAT, Items.MANGROVE_CHEST_BOAT),
     WARPED(Type.NETHER, Blocks.WARPED_FUNGUS, Blocks.WARPED_WART_BLOCK, Blocks.WARPED_STEM, Blocks.WARPED_HYPHAE, Blocks.STRIPPED_WARPED_STEM, Blocks.STRIPPED_WARPED_HYPHAE, Blocks.WARPED_PLANKS, Blocks.WARPED_SLAB, Blocks.WARPED_STAIRS, Blocks.WARPED_FENCE, Blocks.WARPED_FENCE_GATE, Blocks.WARPED_DOOR, Blocks.WARPED_SIGN,  Blocks.WARPED_WALL_SIGN, Blocks.WARPED_HANGING_SIGN, Blocks.WARPED_WALL_HANGING_SIGN, Blocks.WARPED_BUTTON, Blocks.WARPED_PRESSURE_PLATE, Items.BIRCH_BOAT, Items.BIRCH_CHEST_BOAT),
diff --git a/src/main/java/xyz/nucleoid/plasmid/impl/Plasmid.java b/src/main/java/xyz/nucleoid/plasmid/impl/Plasmid.java
@@ -63,7 +63,7 @@ public void onInitialize() {
 
         GameType.register(Identifier.of(Plasmid.ID, "random"), RandomGameConfig.CODEC, RandomGame::open);
         GameType.register(Identifier.of(Plasmid.ID, "invalid"), MapCodec.unit(""), (context) -> {
-            var id = context.server().getRegistryManager().getOrThrow(GameConfigs.REGISTRY_KEY).getId(context.game());
+            var id = context.server().getRegistryManager().get(GameConfigs.REGISTRY_KEY).getId(context.game());
             throw new GameOpenException(Text.translatable("text.plasmid.map.open.invalid_game", id != null ? id.toString() : context.game()));
         });
 
@@ -97,7 +97,7 @@ private void registerCallbacks() {
                             && hand == Hand.MAIN_HAND
             ) {
                 if (portalInterface.interactWithPortal(serverPlayer)) {
-                    return ActionResult.SUCCESS_SERVER;
+                    return ActionResult.SUCCESS;
                 }
             }
 
diff --git a/src/main/java/xyz/nucleoid/plasmid/impl/game/common/ui/element/LeaveGameWaitingLobbyUiElement.java b/src/main/java/xyz/nucleoid/plasmid/impl/game/common/ui/element/LeaveGameWaitingLobbyUiElement.java
@@ -20,7 +20,7 @@ public LeaveGameWaitingLobbyUiElement(GameSpace gameSpace, ServerPlayerEntity pl
     @Override
     public GuiElementInterface createMainElement() {
         return new GuiElementBuilder(Items.RED_BED)
-                .setItemName(Text.translatable("text.plasmid.game.waiting_lobby.leave_game"))
+                .setName(Text.translatable("text.plasmid.game.waiting_lobby.leave_game"))
                 .setCallback((index, type, action, gui) -> {
                     if (WaitingLobbyUiElement.isClick(type, gui)) {
                         this.gameSpace.getPlayers().kick(this.player);
diff --git a/src/main/java/xyz/nucleoid/plasmid/impl/game/common/ui/element/TeamSelectionWaitingLobbyUiElement.java b/src/main/java/xyz/nucleoid/plasmid/impl/game/common/ui/element/TeamSelectionWaitingLobbyUiElement.java
@@ -31,7 +31,7 @@ public TeamSelectionWaitingLobbyUiElement(GameTeamList teams, Predicate<GameTeam
     @Override
     public GuiElementInterface createMainElement() {
         return new GuiElementBuilder(Items.PAPER)
-                .setItemName(Text.translatable("text.plasmid.team_selection.teams"))
+                .setName(Text.translatable("text.plasmid.team_selection.teams"))
                 .build();
     }
 
@@ -47,7 +47,7 @@ public SequencedCollection<GuiElementInterface> createExtendedElements() {
                     .formatted(Formatting.BOLD, config.chatFormatting());
 
             var element = new GuiElementBuilder(ColoredBlocks.wool(config.blockDyeColor()).asItem())
-                    .setItemName(name)
+                    .setName(name)
                     .setCallback((index, type, action, gui) -> {
                         if (WaitingLobbyUiElement.isClick(type, gui)) {
                             this.selectCallback.accept(key);
diff --git a/src/main/java/xyz/nucleoid/plasmid/impl/player/isolation/IsolatingPlayerTeleporter.java b/src/main/java/xyz/nucleoid/plasmid/impl/player/isolation/IsolatingPlayerTeleporter.java
@@ -103,8 +103,7 @@ private void teleport(ServerPlayerEntity player, Function<ServerPlayerEntity, Se
             world.getDimensionEntry(), world.getRegistryKey(),
             BiomeAccess.hashSeed(world.getSeed()),
             player.interactionManager.getGameMode(), player.interactionManager.getPreviousGameMode(),
-            world.isDebugWorld(), world.isFlat(), player.getLastDeathPos(), player.getPortalCooldown(),
-            world.getSeaLevel()
+            world.isDebugWorld(), world.isFlat(), player.getLastDeathPos(), player.getPortalCooldown()
         );
 
         var networkHandler = player.networkHandler;
diff --git a/src/main/java/xyz/nucleoid/plasmid/mixin/game/rule/EquippableComponentMixin.java b/src/main/java/xyz/nucleoid/plasmid/mixin/game/rule/EquippableComponentMixin.java
@@ -1,6 +1,6 @@
 package xyz.nucleoid.plasmid.mixin.game.rule;
 
-import net.minecraft.component.type.EquippableComponent;
+//import net.minecraft.component.type.EquippableComponent;
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.item.ItemStack;
 import net.minecraft.server.network.ServerPlayerEntity;
@@ -13,7 +13,7 @@
 import xyz.nucleoid.plasmid.api.game.rule.GameRuleType;
 import xyz.nucleoid.stimuli.event.EventResult;
 
-@Mixin(EquippableComponent.class)
+/*@Mixin(EquippableComponent.class)
 public class EquippableComponentMixin {
     @Inject(method = "equip", at = @At("HEAD"), cancellable = true)
     private void equip(ItemStack stack, PlayerEntity user, CallbackInfoReturnable<ActionResult> ci) {
@@ -26,4 +26,4 @@ private void equip(ItemStack stack, PlayerEntity user, CallbackInfoReturnable<Ac
             ci.setReturnValue(ActionResult.FAIL);
         }
     }
-}
+}*/
diff --git a/src/main/java/xyz/nucleoid/plasmid/mixin/game/rule/PlayerEntityMixin.java b/src/main/java/xyz/nucleoid/plasmid/mixin/game/rule/PlayerEntityMixin.java
@@ -24,11 +24,11 @@ protected PlayerEntityMixin(EntityType<? extends LivingEntity> entityType, World
     }
 
     @Inject(method = "damage", at = @At(value = "RETURN", ordinal = 3), cancellable = true)
-    private void damage(ServerWorld world, DamageSource source, float amount, CallbackInfoReturnable<Boolean> cir) {
+    private void damage(DamageSource source, float amount, CallbackInfoReturnable<Boolean> cir) {
         if (source.isIn(DamageTypeTags.IS_PROJECTILE)) {
             var gameSpace = GameSpaceManagerImpl.get().byPlayer((PlayerEntity) (Object) this);
             if (gameSpace != null && gameSpace.getBehavior().testRule(GameRuleType.PLAYER_PROJECTILE_KNOCKBACK) == EventResult.ALLOW) {
-                cir.setReturnValue(super.damage(world, source, amount));
+                cir.setReturnValue(super.damage(source, amount));
             }
         }
     }
diff --git a/src/main/java/xyz/nucleoid/plasmid/mixin/game/rule/ServerPlayNetworkHandlerMixin.java b/src/main/java/xyz/nucleoid/plasmid/mixin/game/rule/ServerPlayNetworkHandlerMixin.java
@@ -3,7 +3,6 @@
 import net.minecraft.network.ClientConnection;
 import net.minecraft.network.packet.c2s.play.ClickSlotC2SPacket;
 import net.minecraft.network.packet.s2c.play.ScreenHandlerSlotUpdateS2CPacket;
-import net.minecraft.network.packet.s2c.play.SetCursorItemS2CPacket;
 import net.minecraft.screen.PlayerScreenHandler;
 import net.minecraft.server.MinecraftServer;
 import net.minecraft.server.network.ConnectedClientData;
@@ -53,7 +52,7 @@ private void onClickSlot(ClickSlotC2SPacket packet, CallbackInfo ci) {
                 var stack = screenHandler.getSlot(packet.getSlot()).getStack();
 
                 this.sendPacket(new ScreenHandlerSlotUpdateS2CPacket(packet.getSyncId(), screenHandler.nextRevision(), packet.getSlot(), stack));
-                this.sendPacket(new SetCursorItemS2CPacket(screenHandler.getCursorStack()));
+                this.sendPacket(new ScreenHandlerSlotUpdateS2CPacket(packet.getSyncId(), screenHandler.nextRevision(), -1, screenHandler.getCursorStack()));
 
                 ci.cancel();
             }
diff --git a/src/main/java/xyz/nucleoid/stimuli/event/EventResult.java b/src/main/java/xyz/nucleoid/stimuli/event/EventResult.java
diff --git a/src/testmod/java/xyz/nucleoid/plasmid/test/JankGame.java b/src/testmod/java/xyz/nucleoid/plasmid/test/JankGame.java
diff --git a/src/testmod/java/xyz/nucleoid/plasmid/test/PersistentGame.java b/src/testmod/java/xyz/nucleoid/plasmid/test/PersistentGame.java
diff --git a/src/testmod/java/xyz/nucleoid/plasmid/test/TestBlock.java b/src/testmod/java/xyz/nucleoid/plasmid/test/TestBlock.java
diff --git a/src/testmod/java/xyz/nucleoid/plasmid/test/TestGame.java b/src/testmod/java/xyz/nucleoid/plasmid/test/TestGame.java
diff --git a/src/testmod/java/xyz/nucleoid/plasmid/test/TestInitializer.java b/src/testmod/java/xyz/nucleoid/plasmid/test/TestInitializer.java

Original file line number	Diff line number	Diff line change
`@@ -14,6 +14,7 @@`
`14`	`14`	`import net.minecraft.server.network.ServerPlayerEntity;`
`15`	`15`	`import net.minecraft.text.Style;`
`16`	`16`	`import net.minecraft.text.Text;`
	`17`	`+import net.minecraft.util.ActionResult;`
`17`	`18`	`import org.jetbrains.annotations.NotNull;`
`18`	`19`	`import org.jetbrains.annotations.Nullable;`
`19`	`20`	`import xyz.nucleoid.plasmid.api.game.player.MutablePlayerSet;`
`@@ -330,17 +331,17 @@ private void onRemovePlayer(ServerPlayerEntity player) {`
`330`	`331`	`}`
`331`	`332`	`}`
`332`	`333`
`333`		`- private EventResult onDamagePlayer(ServerPlayerEntity player, DamageSource source, float amount) {`
	`334`	`+ private ActionResult onDamagePlayer(ServerPlayerEntity player, DamageSource source, float amount) {`
`334`	`335`	`if (source.getAttacker() instanceof ServerPlayerEntity attacker) {`
`335`	`336`	`var playerTeam = this.teamFor(player);`
`336`	`337`	`var attackerTeam = this.teamFor(attacker);`
`337`	`338`
`338`	`339`	`if (playerTeam != null && playerTeam == attackerTeam && !this.getTeamConfig(playerTeam).friendlyFire()) {`
`339`		`- return EventResult.DENY;`
	`340`	`+ return EventResult.DENY.asActionResult();`
`340`	`341`	`}`
`341`	`342`	`}`
`342`	`343`
`343`		`- return EventResult.PASS;`
	`344`	`+ return EventResult.PASS.asActionResult();`
`344`	`345`	`}`
`345`	`346`
`346`	`347`	`private Text onFormatDisplayName(ServerPlayerEntity player, Text name, Text vanilla) {`
Original file line number	Diff line number	Diff line change
`@@ -60,7 +60,7 @@ public ItemStackBuilder addEnchantment(World world, RegistryKey<Enchantment> enc`
`60`	`60`	`}`
`61`	`61`
`62`	`62`	`public ItemStackBuilder addEnchantment(RegistryWrapper.WrapperLookup lookup, RegistryKey<Enchantment> enchantment, int level) {`
`63`		`- return this.addEnchantment(lookup.getOrThrow(RegistryKeys.ENCHANTMENT).getOrThrow(enchantment), level);`
	`63`	`+ return this.addEnchantment(lookup.getWrapperOrThrow(RegistryKeys.ENCHANTMENT).getOrThrow(enchantment), level);`
`64`	`64`	`}`
`65`	`65`
`66`	`66`	`public ItemStackBuilder addEnchantment(RegistryEntry<Enchantment> enchantment, int level) {`
Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,7 @@ public void onInitialize() {`
`63`	`63`
`64`	`64`	`GameType.register(Identifier.of(Plasmid.ID, "random"), RandomGameConfig.CODEC, RandomGame::open);`
`65`	`65`	`GameType.register(Identifier.of(Plasmid.ID, "invalid"), MapCodec.unit(""), (context) -> {`
`66`		`- var id = context.server().getRegistryManager().getOrThrow(GameConfigs.REGISTRY_KEY).getId(context.game());`
	`66`	`+ var id = context.server().getRegistryManager().get(GameConfigs.REGISTRY_KEY).getId(context.game());`
`67`	`67`	`throw new GameOpenException(Text.translatable("text.plasmid.map.open.invalid_game", id != null ? id.toString() : context.game()));`
`68`	`68`	`});`
`69`	`69`
`@@ -97,7 +97,7 @@ private void registerCallbacks() {`
`97`	`97`	`&& hand == Hand.MAIN_HAND`
`98`	`98`	`) {`
`99`	`99`	`if (portalInterface.interactWithPortal(serverPlayer)) {`
`100`		`- return ActionResult.SUCCESS_SERVER;`
	`100`	`+ return ActionResult.SUCCESS;`
`101`	`101`	`}`
`102`	`102`	`}`
`103`	`103`