+ Added Mekanism support, now it's Osmium and Circuits are useless for Gregtech progression.

$ Fixed HF potion entity not rendering.
^ Version Bump.

8 files changed, 107 insertions, 17 deletions

diff --git a/build.gradle b/build.gradle
index d4a1f6c0df..9b6f629e0a 100644
--- a/build.gradle
+++ b/build.gradle
@@ -40,7 +40,7 @@ sourceCompatibility = 1.7
 targetCompatibility = 1.7
 
 archivesBaseName = "GT-PlusPlus"
-version = "1.6.55-release"
+version = "1.6.70-release"
 minecraft.version = "1.7.10-10.13.4.1448-1.7.10"
 
 
diff --git a/src/Java/gtPlusPlus/core/entity/InternalEntityRegistry.java b/src/Java/gtPlusPlus/core/entity/InternalEntityRegistry.java
index 954b886abe..5eb6e91812 100644
--- a/src/Java/gtPlusPlus/core/entity/InternalEntityRegistry.java
+++ b/src/Java/gtPlusPlus/core/entity/InternalEntityRegistry.java
@@ -4,6 +4,7 @@ import cpw.mods.fml.common.registry.EntityRegistry;
 import gtPlusPlus.GTplusplus;
 import gtPlusPlus.core.entity.monster.EntitySickBlaze;
 import gtPlusPlus.core.entity.monster.EntityStaballoyConstruct;
+import gtPlusPlus.core.entity.projectile.EntityHydrofluoricAcidPotion;
 import gtPlusPlus.core.entity.projectile.EntitySulfuricAcidPotion;
 import gtPlusPlus.core.entity.projectile.EntityToxinballSmall;
 import gtPlusPlus.core.util.Utils;
@@ -17,6 +18,7 @@ public class InternalEntityRegistry {
 		//EntityRegistry.registerModEntity(EntityMiningChargePrimed.class, "MiningCharge", 3, Main.modInstance, 64, 20, true);
         EntityRegistry.registerModEntity(EntityPrimedMiningExplosive.class, "MiningCharge", mEntityID++, GTplusplus.instance, 64, 20, true);
         EntityRegistry.registerModEntity(EntitySulfuricAcidPotion.class, "throwablePotionSulfuric", mEntityID++, GTplusplus.instance, 64, 20, true);
+        EntityRegistry.registerModEntity(EntityHydrofluoricAcidPotion.class, "throwablePotionHydrofluoric", mEntityID++, GTplusplus.instance, 64, 20, true);
         EntityRegistry.registerModEntity(EntityToxinballSmall.class, "toxinBall", mEntityID++, GTplusplus.instance, 64, 20, true);
         EntityRegistry.registerModEntity(EntityStaballoyConstruct.class, "constructStaballoy", mEntityID++, GTplusplus.instance, 64, 20, true);
         EntityRegistry.registerModEntity(EntitySickBlaze.class, "sickBlaze", mEntityID++, GTplusplus.instance, 64, 20, true);
diff --git a/src/Java/gtPlusPlus/core/item/ModItems.java b/src/Java/gtPlusPlus/core/item/ModItems.java
index 43334a450c..4e6a461d41 100644
--- a/src/Java/gtPlusPlus/core/item/ModItems.java
+++ b/src/Java/gtPlusPlus/core/item/ModItems.java
@@ -299,7 +299,7 @@ public final class ModItems {
 		itemGemShards = new ItemGemShards("itemGemShards", "Gem Shards", AddToCreativeTab.tabMisc, 32, 0, "They glitter in the light", EnumRarity.rare, EnumChatFormatting.GRAY, false, Utils.rgbtoHexValue(182, 114, 18)).setTextureName(CORE.MODID + ":itemHeliumBlob");
 		itemHalfCompleteCasings = new ItemHalfCompleteCasings("itemHalfCompleteCasings", "Half Complete Casing", AddToCreativeTab.tabMisc, 32, 0, "This isn't quite finished yet.", EnumRarity.common, EnumChatFormatting.GRAY, false, Utils.rgbtoHexValue(255, 255, 255)).setTextureName("gregtech" + ":" + "gt.metaitem.01/" + "761");
 		itemSulfuricPotion = new ItemSulfuricAcidPotion("itemSulfuricPotion", "Thowable Vial of Sulfuric Acid", "Burn your foes alive!").setTextureName(CORE.MODID + ":itemSulfuricAcidPotion");
-		itemHydrofluoricPotion = new ItemHydrofluoricAcidPotion("itemHydrofluoricPotion", "Thowable Vial of Hydrofluoric Acid", "They won't see this coming, nor anything after!").setTextureName(CORE.MODID + ":itemSulfuricAcidPotion");
+		itemHydrofluoricPotion = new ItemHydrofluoricAcidPotion("itemHydrofluoricPotion", "Thowable Vial of Hydrofluoric Acid", "They won't see this coming, nor anything after!").setTextureName(CORE.MODID + ":itemPotion");
 		//Start meta Item Generation
 		ItemsFoods.load();
 
diff --git a/src/Java/gtPlusPlus/core/lib/CORE.java b/src/Java/gtPlusPlus/core/lib/CORE.java
index 99573d808c..b2e752f7e4 100644
--- a/src/Java/gtPlusPlus/core/lib/CORE.java
+++ b/src/Java/gtPlusPlus/core/lib/CORE.java
@@ -34,7 +34,7 @@ public class CORE {
 
 	public static final String name = "GT++";
 	public static final String MODID = "miscutils";
-	public static final String VERSION = "1.6.55-release";
+	public static final String VERSION = "1.6.70-release";
 	public static String MASTER_VERSION = NetworkUtils.getContentFromURL("https://raw.githubusercontent.com/draknyte1/GTplusplus/master/Recommended.txt").toLowerCase();
 	public static String USER_COUNTRY = GeoUtils.determineUsersCountry();
 	public static boolean isModUpToDate = Utils.isModUpToDate();
diff --git a/src/Java/gtPlusPlus/core/lib/LoadedMods.java b/src/Java/gtPlusPlus/core/lib/LoadedMods.java
index e75ccce204..d97b41641d 100644
--- a/src/Java/gtPlusPlus/core/lib/LoadedMods.java
+++ b/src/Java/gtPlusPlus/core/lib/LoadedMods.java
@@ -44,6 +44,7 @@ public class LoadedMods {
 	public static boolean BiomesOPlenty = false;
 	public static boolean PamsHarvestcraft = false;
 	public static boolean GalacticraftCore = false;
+	public static boolean Mekanism = false;
 
 
 
@@ -158,6 +159,11 @@ public class LoadedMods {
 			Utils.LOG_INFO("Components enabled for: Railcraft");
 			totalMods++;
 		}
+		if (Loader.isModLoaded("Mekanism") == true){
+			Mekanism  = true;
+			Utils.LOG_INFO("Components enabled for: Mekanism - This feature is not configurable and balances Mekanism to suit GT.");
+			totalMods++;
+		}
 		if (Loader.isModLoaded("Growthcraft") == true){
 			Utils.LOG_INFO("Growthcraft Version: "+getModVersion("Growthcraft"));
 			if (getModVersion("Growthcraft").equals("1.7.10-2.3.1")){
diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java b/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java
index 24c1bd4855..427eb19c9a 100644
--- a/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java
+++ b/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java
@@ -219,8 +219,13 @@ public class RECIPES_GREGTECH {
 	}
 
 	private static void fluidcannerRecipes() {
+		//Sulfuric Acid
 		GT_Values.RA.addFluidCannerRecipe(ItemUtils.getSimpleStack(Items.glass_bottle), ItemUtils.getSimpleStack(ModItems.itemSulfuricPotion), FluidUtils.getFluidStack("sulfuricacid", 250), null);
 		GT_Values.RA.addFluidCannerRecipe(ItemUtils.getSimpleStack(ModItems.itemSulfuricPotion), ItemUtils.getSimpleStack(Items.glass_bottle), null, FluidUtils.getFluidStack("sulfuricacid", 250));		
+		
+		//Hydrofluoric Acid
+		GT_Values.RA.addFluidCannerRecipe(ItemUtils.getSimpleStack(Items.glass_bottle), ItemUtils.getSimpleStack(ModItems.itemHydrofluoricPotion), FluidUtils.getFluidStack("hydrofluoricacid", 250), null);
+		GT_Values.RA.addFluidCannerRecipe(ItemUtils.getSimpleStack(ModItems.itemHydrofluoricPotion), ItemUtils.getSimpleStack(Items.glass_bottle), null, FluidUtils.getFluidStack("hydrofluoricacid", 250));
 	}
 
 	private static void cokeOvenRecipes(){
diff --git a/src/Java/gtPlusPlus/preloader/Preloader_GT_OreDict.java b/src/Java/gtPlusPlus/preloader/Preloader_GT_OreDict.java
index 5b9fac6b7b..9b3b7092da 100644
--- a/src/Java/gtPlusPlus/preloader/Preloader_GT_OreDict.java
+++ b/src/Java/gtPlusPlus/preloader/Preloader_GT_OreDict.java
@@ -4,18 +4,18 @@ import org.apache.logging.log4j.Level;
 
 import cpw.mods.fml.relauncher.FMLRelaunchLog;
 import gregtech.common.items.GT_MetaGenerated_Item_01;
-import gtPlusPlus.core.util.Utils;
+import gtPlusPlus.core.lib.LoadedMods;
 import gtPlusPlus.core.util.item.ItemUtils;
 import net.minecraft.item.ItemStack;
 
 public class Preloader_GT_OreDict {
 
-	public static boolean shouldPreventRegistration(String string, ItemStack circuit) {
-		if (CORE_Preloader.enableOldGTcircuits){
-			try {
-				if (circuit != null && ItemUtils.getModId(circuit).toLowerCase().equals("gregtech")){
-					int damageValue = circuit.getItemDamage() - 32000;
-					if (circuit.getItem() instanceof GT_MetaGenerated_Item_01) { // 700-720
+	public static boolean shouldPreventRegistration(String string, ItemStack bannedItem) {
+		try {
+			if (CORE_Preloader.enableOldGTcircuits){
+				if (bannedItem != null && ItemUtils.getModId(bannedItem).toLowerCase().equals("gregtech")){
+					int damageValue = bannedItem.getItemDamage() - 32000;
+					if (bannedItem.getItem() instanceof GT_MetaGenerated_Item_01) { // 700-720
 						if (damageValue >= 700 && damageValue <= 720) {
 							return true;
 						}
@@ -24,7 +24,7 @@ public class Preloader_GT_OreDict {
 						try {
 							if (Class.forName("gregtech.common.items.GT_MetaGenerated_Item_03") != null) { // 6/11/12/14/16/20/30-57/69-73/79-96
 								Class<?> MetaItem03 = Class.forName("gregtech.common.items.GT_MetaGenerated_Item_03");
-								if (isInstanceOf(MetaItem03, circuit.getItem())) {
+								if (isInstanceOf(MetaItem03, bannedItem.getItem())) {
 									if (damageValue == 6 || damageValue == 7 || damageValue == 11 || damageValue == 12 || damageValue == 14
 											|| damageValue == 16 || damageValue == 20 || damageValue == 21 || damageValue == 22) {
 										return true;
@@ -45,13 +45,90 @@ public class Preloader_GT_OreDict {
 						}
 					}
 				}
-			} catch (Throwable e) {
-				FMLRelaunchLog.log("[GT++ ASM] OreDictTransformer", Level.INFO, "A mod tried to register an invalid item with the OreDictonary.");
-				if (circuit != null){
-					FMLRelaunchLog.log("[GT++ ASM] OreDictTransformer", Level.INFO, "Please report this issue to the authors of "+ItemUtils.getModId(circuit));
+			}
+			
+			//Mekanism Support - Let's not make Mek Osmium useful in GT anymore.
+			if (bannedItem != null && (ItemUtils.getModId(bannedItem).toLowerCase().equals("mekanism") || LoadedMods.Mekanism)){
+				//Circuits
+				if (Class.forName("mekanism.common.item.ItemControlCircuit") != null) {
+					Class<?> MekCircuit = Class.forName("mekanism.common.item.ItemControlCircuit");
+					if (isInstanceOf(MekCircuit, bannedItem.getItem())) {
+						for (int r=0;r<4;r++){
+							if (bannedItem.getItemDamage() == r){
+								FMLRelaunchLog.log("[GT++ ASM] OreDictTransformer", Level.INFO, "Removing "+bannedItem.getDisplayName()+" from the OreDictionary to balance Mekanism.");
+								return true;
+							}
+						}
+					}
+				}
+				//Ingots
+				if (Class.forName("mekanism.common.item.ItemIngot") != null) {
+					Class<?> MekIngot = Class.forName("mekanism.common.item.ItemIngot");
+					if (isInstanceOf(MekIngot, bannedItem.getItem())) {
+						if (bannedItem.getItemDamage() == 1){
+							FMLRelaunchLog.log("[GT++ ASM] OreDictTransformer", Level.INFO, "Removing "+bannedItem.getDisplayName()+" from the OreDictionary to balance Mekanism.");
+							return true;
+						}
+					}
 				}
-				FMLRelaunchLog.log("[GT++ ASM] OreDictTransformer", Level.INFO, e.getMessage());
+				//Dirty Dust
+				if (Class.forName("mekanism.common.item.ItemDirtyDust") != null) {
+					Class<?> MekIngot = Class.forName("mekanism.common.item.ItemDirtyDust");
+					if (isInstanceOf(MekIngot, bannedItem.getItem())) {
+						if (bannedItem.getItemDamage() == 2){
+							FMLRelaunchLog.log("[GT++ ASM] OreDictTransformer", Level.INFO, "Removing "+bannedItem.getDisplayName()+" from the OreDictionary to balance Mekanism.");
+							return true;
+						}
+					}
+				}
+				//Dust
+				if (Class.forName("mekanism.common.item.ItemDust") != null) {
+					Class<?> MekIngot = Class.forName("mekanism.common.item.ItemDust");
+					if (isInstanceOf(MekIngot, bannedItem.getItem())) {
+						if (bannedItem.getItemDamage() == 2){
+							FMLRelaunchLog.log("[GT++ ASM] OreDictTransformer", Level.INFO, "Removing "+bannedItem.getDisplayName()+" from the OreDictionary to balance Mekanism.");
+							return true;
+						}
+					}
+				}		
+				//Crystal
+				if (Class.forName("mekanism.common.item.ItemCrystal") != null) {
+					Class<?> MekIngot = Class.forName("mekanism.common.item.ItemCrystal");
+					if (isInstanceOf(MekIngot, bannedItem.getItem())) {
+						if (bannedItem.getItemDamage() == 2){
+							FMLRelaunchLog.log("[GT++ ASM] OreDictTransformer", Level.INFO, "Removing "+bannedItem.getDisplayName()+" from the OreDictionary to balance Mekanism.");
+							return true;
+						}
+					}
+				}	
+				//Clump
+				if (Class.forName("mekanism.common.item.ItemClump") != null) {
+					Class<?> MekIngot = Class.forName("mekanism.common.item.ItemClump");
+					if (isInstanceOf(MekIngot, bannedItem.getItem())) {
+						if (bannedItem.getItemDamage() == 2){
+							FMLRelaunchLog.log("[GT++ ASM] OreDictTransformer", Level.INFO, "Removing "+bannedItem.getDisplayName()+" from the OreDictionary to balance Mekanism.");
+							return true;
+						}
+					}
+				}	
+				//Ores
+				if (Class.forName("mekanism.common.item.ItemBlockOre") != null) {
+					Class<?> MekOre = Class.forName("mekanism.common.item.ItemBlockOre");
+					if (isInstanceOf(MekOre, bannedItem.getItem()) || bannedItem == ItemUtils.simpleMetaStack("Mekanism:OreBlock", 0, 1)) {
+						if (bannedItem.getItemDamage() == 0){
+							FMLRelaunchLog.log("[GT++ ASM] OreDictTransformer", Level.INFO, "Removing "+bannedItem.getDisplayName()+" from the OreDictionary to balance Mekanism.");
+							return true;
+						}
+					}
+				}
+			}
+
+		} catch (Throwable e) {
+			FMLRelaunchLog.log("[GT++ ASM] OreDictTransformer", Level.INFO, "A mod tried to register an invalid item with the OreDictonary.");
+			if (bannedItem != null){
+				FMLRelaunchLog.log("[GT++ ASM] OreDictTransformer", Level.INFO, "Please report this issue to the authors of "+ItemUtils.getModId(bannedItem));
 			}
+			FMLRelaunchLog.log("[GT++ ASM] OreDictTransformer", Level.INFO, e.getMessage());
 		}
 		return false;
 	}
diff --git a/src/resources/mcmod.info b/src/resources/mcmod.info
index b5740f2f2f..04d58d5491 100644
--- a/src/resources/mcmod.info
+++ b/src/resources/mcmod.info
@@ -5,7 +5,7 @@
   "description": "Adds a few various Multiblocks, Machines, etc to Gregtech and a plethora of other mods (Nearly 30!)",
   "credits": "",
   "logoFile": "",
-  "version": "1.6.55-release",
+  "version": "1.6.70-release",
   "mcversion": "1.7.10",
   "url": "https://github.com/draknyte1/GTplusplus/wiki",
   "updateUrl": "https://github.com/draknyte1/GTplusplus/releases/latest",