aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/api/util/GT_ModHandler.java
diff options
context:
space:
mode:
authormiozune <miozune@gmail.com>2023-08-11 20:25:06 +0900
committerGitHub <noreply@github.com>2023-08-11 13:25:06 +0200
commit9c545453e99ea85eab20dde6db42d335080776fd (patch)
treec30f81ea6ed7698d7b7ad3b12b4edc538b82ba98 /src/main/java/gregtech/api/util/GT_ModHandler.java
parent362a9471ac3f97cda8cdbce26384edb0589fac48 (diff)
downloadGT5-Unofficial-9c545453e99ea85eab20dde6db42d335080776fd.tar.gz
GT5-Unofficial-9c545453e99ea85eab20dde6db42d335080776fd.tar.bz2
GT5-Unofficial-9c545453e99ea85eab20dde6db42d335080776fd.zip
Blacklist AE2FC drop and packet, and Chisel stones from Recycler (#2222)
* Fix recycler blacklist being sensitive to NBT * Blacklist AE2FC drop and packet, and Chisel stones * fix class loader issue
Diffstat (limited to 'src/main/java/gregtech/api/util/GT_ModHandler.java')
-rw-r--r--src/main/java/gregtech/api/util/GT_ModHandler.java9
1 files changed, 4 insertions, 5 deletions
diff --git a/src/main/java/gregtech/api/util/GT_ModHandler.java b/src/main/java/gregtech/api/util/GT_ModHandler.java
index f0801cb0fb..68f1bd9b97 100644
--- a/src/main/java/gregtech/api/util/GT_ModHandler.java
+++ b/src/main/java/gregtech/api/util/GT_ModHandler.java
@@ -2059,24 +2059,23 @@ public class GT_ModHandler {
recyclerWhitelist = new HashSet<>();
for (IRecipeInput input : ic2.api.recipe.Recipes.recyclerWhitelist) {
for (ItemStack stack : input.getInputs()) {
- recyclerWhitelist.add(GT_Utility.ItemId.create(stack));
+ recyclerWhitelist.add(GT_Utility.ItemId.create(stack.getItem(), stack.getItemDamage(), null));
}
}
recyclerBlacklist = new HashSet<>();
for (IRecipeInput input : ic2.api.recipe.Recipes.recyclerBlacklist) {
for (ItemStack stack : input.getInputs()) {
- recyclerBlacklist.add(GT_Utility.ItemId.create(stack));
+ recyclerBlacklist.add(GT_Utility.ItemId.create(stack.getItem(), stack.getItemDamage(), null));
}
}
}
private static boolean searchRecyclerCache(ItemStack stack, Set<GT_Utility.ItemId> set) {
- if (set.contains(GT_Utility.ItemId.createNoCopy(stack))) {
+ if (set.contains(GT_Utility.ItemId.createNoCopy(stack.getItem(), stack.getItemDamage(), null))) {
return true;
}
// ic2.api.recipe.RecipeInputItemStack#matches expects item with wildcard meta to accept arbitrary meta
- return set.contains(
- GT_Utility.ItemId.createNoCopy(stack.getItem(), OreDictionary.WILDCARD_VALUE, stack.getTagCompound()));
+ return set.contains(GT_Utility.ItemId.createNoCopy(stack.getItem(), OreDictionary.WILDCARD_VALUE, null));
}
/**