Skip to content

Fix item order by removing compass before giving items to player #211

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

Open
IxPrumxI wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix item order by removing compass before giving items to player #211

Show file tree
Hide file tree
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
14 changes: 14 additions & 0 deletions src/main/java/eu/pb4/graves/grave/Grave.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,15 @@
import eu.pb4.graves.mixin.PlayerLikeEntityAccessor;
import eu.pb4.graves.other.*;
import eu.pb4.graves.registry.GraveBlockEntity;
import eu.pb4.graves.registry.GraveCompassComponent;
import eu.pb4.graves.registry.GravesRegistry;
import eu.pb4.graves.ui.GraveGui;
import me.lucko.fabric.api.permissions.v0.Permissions;
import net.minecraft.component.type.ProfileComponent;
import net.minecraft.entity.player.PlayerEntity;
import net.minecraft.inventory.Inventory;
import net.minecraft.item.ItemStack;
import net.minecraft.item.Items;
import net.minecraft.nbt.*;
import net.minecraft.registry.RegistryKeys;
import net.minecraft.registry.RegistryWrapper;
Expand Down Expand Up @@ -604,6 +606,15 @@ public void quickEquip(ServerPlayerEntity player) {
return;
}

GraveCompassComponent compassData = null;
int compassCount = 0;
for (ItemStack itemStack : player.getInventory()) {
if (itemStack.get(GraveCompassComponent.TYPE) instanceof GraveCompassComponent component && component.graveId() == this.id) {
compassCount = itemStack.getCount();
compassData = component;
itemStack.setCount(0);
}
}
for (var item : this.items) {
if (!item.isEmpty() && item.inventoryMask() != null) {
item.inventoryMask().moveToPlayerExactly(player, item.stack(), item.slot(), item.optionalData());
Expand All @@ -620,6 +631,9 @@ public void quickEquip(ServerPlayerEntity player) {
this.xp = 0;
this.tryBreak(player.getEntityWorld().getServer(), player);
this.updateSelf(player.getEntityWorld().getServer());
if (compassData != null && compassData.convertToVanilla()) {
player.giveItemStack(new ItemStack(Items.COMPASS, compassCount));
}
GraveManager.INSTANCE.markDirty();
}
} catch (Exception e) {
Expand Down
1 change: 1 addition & 0 deletions src/main/java/eu/pb4/graves/registry/GraveCompassItem.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@ public Item getPolymerItem(ItemStack itemStack, PacketContext context) {
return null;
}

// The compass is also removed in Grave#quickEquip to preserve the grave items correct slots in the player inventory as he died.
@Override
public void inventoryTick(ItemStack stack, ServerWorld world, Entity entity, @Nullable EquipmentSlot slot) {
if (entity instanceof ServerPlayerEntity player && !stack.isEmpty()) {
Expand Down