$ Hopefully fixed issue where BoP limestone is valid for Fluorite.

$ Fixed the ABS not using the correct texture on the top layer input hatch.
% More internal work on LFTR rewrite.

1 files changed, 8 insertions, 3 deletions

diff --git a/src/Java/gtPlusPlus/core/handler/events/BlockEventHandler.java b/src/Java/gtPlusPlus/core/handler/events/BlockEventHandler.java
index f3b40a7214..aac26418b0 100644
--- a/src/Java/gtPlusPlus/core/handler/events/BlockEventHandler.java
+++ b/src/Java/gtPlusPlus/core/handler/events/BlockEventHandler.java
@@ -15,6 +15,7 @@ import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.core.item.ModItems;
 import gtPlusPlus.core.lib.LoadedMods;
 import gtPlusPlus.core.util.math.MathUtils;
+import gtPlusPlus.core.util.minecraft.ItemUtils;
 import net.minecraftforge.event.entity.living.LivingDropsEvent;
 import net.minecraftforge.event.entity.player.PlayerInteractEvent;
 import net.minecraftforge.event.world.BlockEvent;
@@ -114,13 +115,17 @@ public class BlockEventHandler {
 					ArrayList<Block> mBlockTypes = new ArrayList<Block>();
 					if (!oreLimestone.isEmpty()){
 						for (int i=0;i<oreLimestone.size();i++){
-							mBlockTypes.add(Block.getBlockFromItem(oreLimestone.get(i).getItem()));
+							if (!ItemUtils.getModId(oreLimestone.get(i)).toLowerCase().contains("biomesoplenty")) {
+								mBlockTypes.add(Block.getBlockFromItem(oreLimestone.get(i).getItem()));
+							}
 						}
 					}
 					if (!blockLimestone.isEmpty()){
 						for (int i=0;i<blockLimestone.size();i++){
-							if (!mBlockTypes.contains(Block.getBlockFromItem(blockLimestone.get(i).getItem()))){
-								mBlockTypes.add(Block.getBlockFromItem(blockLimestone.get(i).getItem()));
+							if (!ItemUtils.getModId(oreLimestone.get(i)).toLowerCase().contains("biomesoplenty")) {
+								if (!mBlockTypes.contains(Block.getBlockFromItem(blockLimestone.get(i).getItem()))){
+									mBlockTypes.add(Block.getBlockFromItem(blockLimestone.get(i).getItem()));
+								}
 							}
 						}
 					}