From 5b5311ab6cda52d33d60c23effad8a1f811e2f0f Mon Sep 17 00:00:00 2001 From: Jakub <53441451+kuba6000@users.noreply.github.com> Date: Wed, 4 Sep 2024 21:45:17 +0200 Subject: Remove hard dep on mobs-info (#3053) Co-authored-by: Martin Robertz --- src/main/java/kubatech/loaders/TCLoader.java | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'src/main/java/kubatech/loaders') diff --git a/src/main/java/kubatech/loaders/TCLoader.java b/src/main/java/kubatech/loaders/TCLoader.java index 500dab7f3e..75113eccb8 100644 --- a/src/main/java/kubatech/loaders/TCLoader.java +++ b/src/main/java/kubatech/loaders/TCLoader.java @@ -32,9 +32,8 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.world.World; -import com.kuba6000.mobsinfo.api.utils.ItemID; - import cpw.mods.fml.common.registry.GameRegistry; +import gregtech.api.util.GTUtility.ItemId; import kubatech.api.enums.ItemList; import kubatech.loaders.item.items.ItemTeaUltimate; import thaumcraft.api.ThaumcraftApi; @@ -84,8 +83,8 @@ public class TCLoader { ItemList.MilkTea.get(1), ItemList.OolongTea.get(1), ItemList.PeppermintTea.get(1), ItemList.PuerhTea.get(1), ItemList.WhiteTea.get(1), ItemList.YellowTea.get(1) }; - final HashSet componentsHashed = Arrays.stream(components) - .map(stack -> ItemID.createNoCopy(stack, true, false, true)) + final HashSet componentsHashed = Arrays.stream(components) + .map(ItemId::createWithoutNBT) .collect(Collectors.toCollection(HashSet::new)); // noinspection unchecked @@ -109,8 +108,8 @@ public class TCLoader { if (!ThaumcraftApiHelper.isResearchComplete(player.getCommandSenderName(), this.research)) return false; if (componentsHashed.size() > input.size()) return false; - HashSet hashedInputs = input.stream() - .map(stack -> ItemID.createNoCopy(stack, true, false, true)) + HashSet hashedInputs = input.stream() + .map(ItemId::createWithoutNBT) .collect(Collectors.toCollection(HashSet::new)); return hashedInputs.containsAll(componentsHashed); } -- cgit