diff --git a/src/main/java/astro/tjm/TheJourneyMatters.java b/src/main/java/astro/tjm/TheJourneyMatters.java index 3bd0268..ea1bd68 100644 --- a/src/main/java/astro/tjm/TheJourneyMatters.java +++ b/src/main/java/astro/tjm/TheJourneyMatters.java @@ -8,11 +8,18 @@ import net.minecraft.resources.Identifier; import net.minecraft.server.level.ServerLevel; import net.minecraft.server.level.ServerPlayer; +import net.minecraft.world.entity.EquipmentSlot; +import net.minecraft.world.entity.player.Inventory; +import net.minecraft.world.item.Item; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.item.Items; import net.minecraft.world.level.Level; import net.minecraft.world.entity.Mob; import net.minecraft.world.entity.animal.wolf.Wolf; import net.minecraft.world.level.block.Blocks; +import java.util.List; + /** * Main entrypoint. Registers the listeners that award the code-driven Journey advancements. */ @@ -45,6 +52,32 @@ public void onInitialize() { award(owner, world, "first_of_its_kind", "wolf_killed"); }); + + + ServerTickEvents.END_LEVEL_TICK.register(server -> { + List players = server.players(); + for (ServerPlayer player : players) { + Inventory inventory = player.getInventory(); + for (int slot = 0; slot < inventory.getContainerSize(); slot++) { + ItemStack stack = inventory.getItem(slot); + if (stack.getItem() == Items.ELYTRA) { + ItemStack extractedStack = inventory.removeItem(slot, stack.getCount()); + player.drop(extractedStack, false, null); + } + } + } + }); + + ServerTickEvents.END_LEVEL_TICK.register(server -> { + List players = server.players(); + for (ServerPlayer player : players) { + ItemStack chest = player.getItemBySlot(EquipmentSlot.CHEST); + if (chest.getItem().equals(Items.ELYTRA)) { + player.setItemSlot(EquipmentSlot.CHEST, ItemStack.EMPTY); + player.drop(new ItemStack(Items.ELYTRA), false, null); + } + } + }); } private static void award(ServerPlayer player, ServerLevel world, String advancementPath, String criterion) { diff --git a/src/main/java/astro/tjm/mixin/TJMMixin.java b/src/main/java/astro/tjm/mixin/BlockItemMixin.java similarity index 95% rename from src/main/java/astro/tjm/mixin/TJMMixin.java rename to src/main/java/astro/tjm/mixin/BlockItemMixin.java index 5491ce7..4b9d118 100644 --- a/src/main/java/astro/tjm/mixin/TJMMixin.java +++ b/src/main/java/astro/tjm/mixin/BlockItemMixin.java @@ -22,10 +22,7 @@ @Mixin(BlockItem.class) -/** - * Cancels block placement in the Nether above the configured height or for disallowed blocks. - */ -public class TJMMixin { +public class BlockItemMixin { @Inject(at = @At("HEAD"), method = "place", cancellable = true) private void tjm$preventIceInNether( BlockPlaceContext placeContext, diff --git a/src/main/resources/overworldinfrastructure.mixins.json b/src/main/resources/overworldinfrastructure.mixins.json index 7fbace0..80f73d5 100644 --- a/src/main/resources/overworldinfrastructure.mixins.json +++ b/src/main/resources/overworldinfrastructure.mixins.json @@ -3,7 +3,7 @@ "package": "astro.tjm.mixin", "compatibilityLevel": "JAVA_25", "mixins": [ - "TJMMixin" + "BlockItemMixin" ], "injectors": { "defaultRequire": 1