Skip to content

Commit f564efd

Browse files
committed
Add the stack to the resource order and add the fingerprint to common item stacks
1 parent e86f5bd commit f564efd

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

src/main/java/de/srendi/advancedperipherals/common/addons/minecolonies/MineColonies.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
import com.minecolonies.coremod.research.BuildingResearchRequirement;
1919
import com.mojang.brigadier.exceptions.CommandSyntaxException;
2020
import de.srendi.advancedperipherals.common.util.LuaConverter;
21-
import de.srendi.advancedperipherals.common.util.inventory.ItemUtil;
2221
import io.netty.buffer.Unpooled;
2322
import net.minecraft.core.BlockPos;
2423
import net.minecraft.network.FriendlyByteBuf;
@@ -28,6 +27,7 @@
2827
import net.minecraft.world.entity.Entity;
2928
import net.minecraft.world.entity.ai.attributes.Attributes;
3029
import net.minecraft.world.entity.player.Player;
30+
import net.minecraft.world.item.ItemStack;
3131
import net.minecraftforge.common.capabilities.ForgeCapabilities;
3232
import net.minecraftforge.common.util.LazyOptional;
3333
import net.minecraftforge.items.IItemHandler;
@@ -336,8 +336,9 @@ public static Object builderResourcesToObject(IColony colony, BlockPos pos) {
336336
List<Object> result = new ArrayList<>();
337337
for (BuildingBuilderResource resource : resources) {
338338
Map<String, Object> map = new HashMap<>();
339+
ItemStack stack = resource.getItemStack().copy();
339340

340-
map.put("item", ItemUtil.getRegistryKey(resource.getItemStack()).toString());
341+
map.put("item", LuaConverter.stackToObject(stack));
341342
map.put("displayName", resource.getName());
342343
map.put("available", resource.getAvailable());
343344
map.put("delivering", resource.getAmountInDelivery());

src/main/java/de/srendi/advancedperipherals/common/util/LuaConverter.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,7 @@ public static Map<String, Object> stackToObject(@NotNull ItemStack stack) {
7474
map.put("displayName", stack.getDisplayName().getString());
7575
map.put("maxStackSize", stack.getMaxStackSize());
7676
map.put("nbt", NBTUtil.toLua(nbt));
77+
map.put("fingerprint", ItemUtil.getFingerprint(stack));
7778
return map;
7879
}
7980

0 commit comments

Comments
 (0)