Disable Metallurgy compat

This commit is contained in:
Tom Elfring committed 2017-05-28 11:51:00 +02:00
1 parent d7f8b1c0ab
commit 66e885474c
6 files changed
+68 -207

No files matched your search

@@ -152,9 +152,6 @@ import net.minecraftforge.oredict.RecipeSorter.Category;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import rebelkeithy.mods.metallurgy.api.IOreInfo;
import rebelkeithy.mods.metallurgy.api.MetallurgyAPI;
import com.mojang.authlib.GameProfile;
/**
@@ -1124,70 +1121,6 @@ public class Mekanism
OreDictionary.registerOre("itemBioFuel", new ItemStack(MekanismItems.BioFuel));
}
/**
* Integrates the mod with other mods -- registering items and blocks with the Forge Ore Dictionary
* and adding machine recipes with other items' corresponding resources.
*/
public void addIntegratedItems()
{
if(hooks.MetallurgyCoreLoaded)
{
try {
String[] setNames = {"base", "precious", "nether", "fantasy", "ender", "utility"};
for(String setName : setNames )
{
for(IOreInfo oreInfo : MetallurgyAPI.getMetalSet(setName).getOreList().values())
{
switch(oreInfo.getType())
{
case ALLOY:
{
if(oreInfo.getIngot() != null && oreInfo.getDust() != null)
{
RecipeHandler.addCrusherRecipe(MekanismUtils.size(oreInfo.getIngot(), 1), MekanismUtils.size(oreInfo.getDust(), 1));
}
break;
}
case DROP:
{
ItemStack ore = oreInfo.getOre();
ItemStack drop = oreInfo.getDrop();
if(drop != null && ore != null)
{
RecipeHandler.addEnrichmentChamberRecipe(MekanismUtils.size(ore, 1), MekanismUtils.size(drop, 12));
}
break;
}
default:
{
ItemStack ore = oreInfo.getOre();
ItemStack dust = oreInfo.getDust();
ItemStack ingot = oreInfo.getIngot();
if(ore != null && dust != null)
{
RecipeHandler.addEnrichmentChamberRecipe(MekanismUtils.size(ore, 1), MekanismUtils.size(dust, 2));
RecipeHandler.addCombinerRecipe(MekanismUtils.size(dust, 8), MekanismUtils.size(ore, 1));
}
if(ingot != null && dust != null)
{
RecipeHandler.addCrusherRecipe(MekanismUtils.size(ingot, 1), MekanismUtils.size(dust, 1));
}
break;
}
}
}
}
} catch(Exception e) {}
}
}
/**
* Adds and registers all entities and tile entities.
*/
@@ -1426,8 +1359,6 @@ public class Mekanism
MinecraftForge.EVENT_BUS.post(new BoxBlacklistEvent());
addIntegratedItems();
OreDictManager.init();
//Update the config-dependent recipes after the recipes have actually been added in the first place
@@ -41,8 +41,8 @@ public final class MekanismHooks
public boolean AE2Loaded = false;
public boolean TeslaLoaded = false;
public boolean MetallurgyCoreLoaded = false;
public boolean MetallurgyBaseLoaded = false;
// public boolean MetallurgyCoreLoaded = false;
// public boolean MetallurgyBaseLoaded = false;
public void hook()
{
@@ -54,12 +54,12 @@ public final class MekanismHooks
if(Loader.isModLoaded("appliedenergistics2")) AE2Loaded = true;
if(Loader.isModLoaded("tesla")) TeslaLoaded = true;
if(Loader.isModLoaded("Metallurgy3Core"))
{
MetallurgyCoreLoaded = true;
if(Loader.isModLoaded("Metallurgy3Base")) MetallurgyBaseLoaded = true;
}
// if(Loader.isModLoaded("Metallurgy3Core"))
// {
// MetallurgyCoreLoaded = true;
//
// if(Loader.isModLoaded("Metallurgy3Base")) MetallurgyBaseLoaded = true;
// }
if(IC2Loaded)
{
@@ -71,6 +71,11 @@ public final class MekanismHooks
{
loadCCPeripheralProviders();
}
// if(MettallurgyCoreLoaded)
// {
// loadMettallurgy();
// }
}
@Method(modid = "IC2")
@@ -178,4 +183,59 @@ public final class MekanismHooks
}
}
// public void loadMettallurgy()
// {
// try
// {
// String[] setNames = {"base", "precious", "nether", "fantasy", "ender", "utility"};
//
// for (String setName : setNames)
// {
// for (IOreInfo oreInfo : MetallurgyAPI.getMetalSet(setName).getOreList().values())
// {
// switch (oreInfo.getType())
// {
// case ALLOY:
// if (oreInfo.getIngot() != null && oreInfo.getDust() != null)
// {
// RecipeHandler.addCrusherRecipe(MekanismUtils.size(oreInfo.getIngot(), 1), MekanismUtils.size(oreInfo.getDust(), 1));
// }
//
// break;
// case DROP:
// ItemStack ore = oreInfo.getOre();
// ItemStack drop = oreInfo.getDrop();
//
// if (drop != null && ore != null)
// {
// RecipeHandler.addEnrichmentChamberRecipe(MekanismUtils.size(ore, 1), MekanismUtils.size(drop, 12));
// }
//
// break;
// default:
// ItemStack ore = oreInfo.getOre();
// ItemStack dust = oreInfo.getDust();
// ItemStack ingot = oreInfo.getIngot();
//
// if (ore != null && dust != null)
// {
// RecipeHandler.addEnrichmentChamberRecipe(MekanismUtils.size(ore, 1), MekanismUtils.size(dust, 2));
// RecipeHandler.addCombinerRecipe(MekanismUtils.size(dust, 8), MekanismUtils.size(ore, 1));
// }
//
// if (ingot != null && dust != null)
// {
// RecipeHandler.addCrusherRecipe(MekanismUtils.size(ingot, 1), MekanismUtils.size(dust, 1));
// }
//
// break;
// }
// }
// }
// }
// catch (Exception e)
// {
// }
// }
}