Mass Storages ignored the Unification Blacklist

GregTech6 · Dec 23, 2023 · 70dabd9 · 70dabd9
1 parent 28d6797
commit 70dabd9
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/src/main/java/gregapi/tileentity/inventories/MultiTileEntityMassStorage.java b/src/main/java/gregapi/tileentity/inventories/MultiTileEntityMassStorage.java
@@ -631,7 +631,7 @@ public long getUnitAmount(OreDictPrefix aPrefix) {
 
 	public long getUnitAmount(ItemStack aStack) {
 		OreDictItemData mData = OM.anydata_(slot(1)), aData = OM.anydata_(aStack);
-		if (mData != null && aData != null && mData.validPrefix() && aData.validPrefix() && mData.mMaterial.mMaterial == aData.mMaterial.mMaterial && mPartialUnits < getUnitAmount(mData.mPrefix)) {
+		if (mData != null && aData != null && mData.validData() && aData.validData() && !mData.mBlackListed && !aData.mBlackListed && mData.mMaterial.mMaterial == aData.mMaterial.mMaterial && mPartialUnits < getUnitAmount(mData.mPrefix)) {
 			if (mData.mPrefix.contains(TD.Prefix.DUST_BASED)) {
 				return aData.mPrefix.contains(TD.Prefix.DUST_BASED) ? aData.mPrefix.mAmount : 0;
 			}

diff --git a/src/main/java/gregtech/loaders/c/Loader_Recipes_Vanilla.java b/src/main/java/gregtech/loaders/c/Loader_Recipes_Vanilla.java
@@ -46,6 +46,7 @@ public class Loader_Recipes_Vanilla implements Runnable {
 		CR.remove(ST.make(Blocks.glass, 1, 0), NI, ST.make(Blocks.glass, 1, 0), NI, ST.make(Blocks.glass, 1, 0));
 		CR.remove(ST.make(Items.blaze_rod, 1, 0));
 		CR.remove(ST.make(Items.bone, 1, 0));
+		CR.remove(IL.WiMo_Thick_Bone.get(1));
 
 		CR.shapeless(dust.mat(MT.White, 1), DEF, new Object[] {Items.bone});
 		CR.shaped(ST.make(Items.paper, 1, 0), DEF, "XXX", 'X', Items.reeds);
@@ -133,6 +134,7 @@ public class Loader_Recipes_Vanilla implements Runnable {
 		CR.shapeless(stickLong.mat(MT.IronMagnetic, 1), DEF, new Object[] {stickLong.dat(ANY.Fe), OD.itemRedstone, OD.itemRedstone, OD.itemRedstone, OD.itemRedstone, OD.itemRedstone, OD.itemRedstone, OD.itemRedstone, OD.itemRedstone});
 
 		CR.shaped(IL.Dye_Bonemeal.get(1), DEF, "h", "X", 'X', Items.bone);
+		CR.shaped(IL.Dye_Bonemeal.get(2), DEF, "h", "X", 'X', IL.WiMo_Thick_Bone);