Skip to content

Fix Accessories mod items not being stored in graves (1.21.9/1.21.10) #215

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
nnmrts wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix Accessories mod items not being stored in graves (1.21.9/1.21.10) #215

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
2 changes: 1 addition & 1 deletion build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ dependencies {

modCompileOnly "dev.emi:trinkets:3.10.0"
modCompileOnly "maven.modrinth:inventorio:1.10.3+1.20.2"
modCompileOnly "io.wispforest:accessories-fabric:1.0.0-beta.11+1.21"
modCompileOnly "io.wispforest:accessories-fabric:1.4.0-beta+1.21.10"

modCompileOnly "maven.modrinth:goml-reserved:1.13.1+1.21"
modCompileOnly 'com.jamieswhiteshirt:rtree-3i-lite:0.3.0'
Expand Down
23 changes: 10 additions & 13 deletions src/main/java/eu/pb4/graves/compat/AccessoriesCompat.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,23 +2,21 @@

import eu.pb4.graves.GravesApi;
import eu.pb4.graves.grave.GraveInventoryMask;
import io.wispforest.accessories.api.*;
import io.wispforest.accessories.api.AccessoriesCapability;
import io.wispforest.accessories.api.core.AccessoryRegistry;
import io.wispforest.accessories.api.events.DropRule;
import io.wispforest.accessories.api.events.OnDropCallback;
import io.wispforest.accessories.api.slot.SlotReference;
import io.wispforest.accessories.impl.ExpandedSimpleContainer;
import io.wispforest.accessories.impl.core.ExpandedContainer;
import net.minecraft.component.EnchantmentEffectComponentTypes;
import net.minecraft.enchantment.EnchantmentHelper;
import net.minecraft.entity.damage.DamageSource;
import net.minecraft.inventory.StackReference;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NbtCompound;
import net.minecraft.nbt.NbtElement;
import net.minecraft.server.network.ServerPlayerEntity;
import net.minecraft.util.Identifier;
import org.jetbrains.annotations.Nullable;

import java.util.Objects;

public record AccessoriesCompat() implements GraveInventoryMask {
private static final String TYPE_TAG = "Type";
private static final String SLOT_TAG = "Slot";
Expand All @@ -35,26 +33,25 @@ public void addToGrave(ServerPlayerEntity player, ItemConsumer consumer) {
}

cap.getContainers().forEach((s, accessoriesContainer) -> {
var defRule = accessoriesContainer.slotType() != null ? Objects.requireNonNull(accessoriesContainer.slotType()).dropRule() : DropRule.DEFAULT;
addToGrave(player, consumer, s, accessoriesContainer.getAccessories(), "", defRule);
addToGrave(player, consumer, s, accessoriesContainer.getCosmeticAccessories(), "cosmetic", defRule);
addToGrave(player, consumer, s, accessoriesContainer.getAccessories(), "", DropRule.DEFAULT);
addToGrave(player, consumer, s, accessoriesContainer.getCosmeticAccessories(), "cosmetic", DropRule.DEFAULT);
});
}

private void addToGrave(ServerPlayerEntity player, ItemConsumer consumer, String slotName, ExpandedSimpleContainer accessories, String type, DropRule defaultDropRule) {
private void addToGrave(ServerPlayerEntity player, ItemConsumer consumer, String slotName, ExpandedContainer accessories, String type, DropRule defaultDropRule) {
var dmg = player.getRecentDamageSource();
if (dmg == null) {
dmg = player.getDamageSources().generic();
}
for (var i = 0; i < accessories.size(); i++) {
var stack = accessories.getStack(i);
if (stack.isEmpty() || !GravesApi.canAddItem(player, stack)) {
return;
continue;
}

var ref = SlotReference.of(player, slotName, i);

var dropRule = AccessoriesAPI.getOrDefaultAccessory(stack).getDropRule(stack, ref, dmg);
var dropRule = AccessoryRegistry.getAccessoryOrDefault(stack).getDropRule(stack, ref, dmg);

dropRule = OnDropCallback.EVENT.invoker().onDrop(dropRule, stack, ref, dmg);

Expand Down Expand Up @@ -118,7 +115,7 @@ public boolean moveToPlayerClosest(ServerPlayerEntity player, ItemStack stack, i
}

@Nullable
private ExpandedSimpleContainer getInventory(ServerPlayerEntity player, String type, String slotId) {
private ExpandedContainer getInventory(ServerPlayerEntity player, String type, String slotId) {
var cap = AccessoriesCapability.get(player);
if (cap == null) {
return null;
Expand Down