aboutsummaryrefslogtreecommitdiff
path: root/src/main
diff options
context:
space:
mode:
authorchochem <40274384+chochem@users.noreply.github.com>2023-08-16 12:29:35 +0100
committerGitHub <noreply@github.com>2023-08-16 13:29:35 +0200
commite4317e5891eb640859ddde3e082060662fdf3c3f (patch)
tree1ab132ed484fc98bfc27daf6d10f88f47715802d /src/main
parent92b24a0d9444a865c93ae86455057036914ad874 (diff)
downloadGT5-Unofficial-e4317e5891eb640859ddde3e082060662fdf3c3f.tar.gz
GT5-Unofficial-e4317e5891eb640859ddde3e082060662fdf3c3f.tar.bz2
GT5-Unofficial-e4317e5891eb640859ddde3e082060662fdf3c3f.zip
add ability to remove item data and use it for clay (#2229)
Diffstat (limited to 'src/main')
-rw-r--r--src/main/java/gregtech/api/util/GT_OreDictUnificator.java7
-rw-r--r--src/main/java/gregtech/loaders/preload/GT_Loader_ItemData.java1
2 files changed, 8 insertions, 0 deletions
diff --git a/src/main/java/gregtech/api/util/GT_OreDictUnificator.java b/src/main/java/gregtech/api/util/GT_OreDictUnificator.java
index 3a6f43b83d..21f5b66c9a 100644
--- a/src/main/java/gregtech/api/util/GT_OreDictUnificator.java
+++ b/src/main/java/gregtech/api/util/GT_OreDictUnificator.java
@@ -358,6 +358,13 @@ public class GT_OreDictUnificator {
}
}
+ public static void removeItemData(ItemStack aStack) {
+ if (GT_Utility.isStackInvalid(aStack)) {
+ return;
+ }
+ sItemStack2DataMap.remove(new GT_ItemStack2(aStack));
+ }
+
public static void addAssociation(OrePrefixes aPrefix, Materials aMaterial, ItemStack aStack,
boolean aBlackListed) {
if (aPrefix == null || aMaterial == null || GT_Utility.isStackInvalid(aStack)) return;
diff --git a/src/main/java/gregtech/loaders/preload/GT_Loader_ItemData.java b/src/main/java/gregtech/loaders/preload/GT_Loader_ItemData.java
index 28c8af288b..22964d5fd6 100644
--- a/src/main/java/gregtech/loaders/preload/GT_Loader_ItemData.java
+++ b/src/main/java/gregtech/loaders/preload/GT_Loader_ItemData.java
@@ -102,6 +102,7 @@ public class GT_Loader_ItemData implements Runnable {
.addItemData(new ItemStack(Blocks.packed_ice, 1, 32767), new ItemData(Materials.Ice, 7257600L));
GT_OreDictUnificator
.addItemData(new ItemStack(Items.clay_ball, 1, 32767), new ItemData(Materials.Clay, 1814400L));
+ GT_OreDictUnificator.removeItemData(new ItemStack(Blocks.clay, 1, 0));
GT_OreDictUnificator.addItemData(new ItemStack(Blocks.clay, 1, 32767), new ItemData(Materials.Clay, 7257600L));
GT_OreDictUnificator
.addItemData(new ItemStack(Blocks.hardened_clay, 1, 32767), new ItemData(Materials.Clay, 3628800L));