Refactoring resource locations to reference CommonProxy.DOMAIN.

Adding the Mysterious Magnet.
This commit is contained in:
MysteriousAges committed 2013-09-17 19:40:26 -07:00
1 parent 58c56623af
commit 608656be73
26 files changed
+302 -86

No files matched your search

@@ -313,12 +313,13 @@ public class CraftingManager
'x', Config.nuggets.getStackForType(NuggetType.APATITE)
}));
output = Config.miscResources.getStackForType(ResourceType.DIMENSIONAL_SINGULARITY, 2);
output = Config.miscResources.getStackForType(ResourceType.DIMENSIONAL_SINGULARITY);
GameRegistry.addRecipe(output, new Object[] {
" E ", "pOp", " E ",
"EOE", "QDQ", "EOE",
'E', Item.eyeOfEnder,
'p', Item.enderPearl,
'W', Block.obsidian
'Q', Block.blockNetherQuartz,
'O', Block.obsidian,
'D', Block.blockDiamond
});
output = Config.voidCapsule.getCapsuleForLiquid(FluidType.EMPTY);
@@ -330,6 +331,26 @@ public class CraftingManager
'T', Item.goldNugget
});
output = new ItemStack(Config.magnet);
GameRegistry.addRecipe(output, new Object[] {
" i ", "cSc", " B ",
'i', Item.ingotIron,
'c', Item.compass,
'B', Block.blockDiamond,
'S', Config.miscResources.getStackForType(ResourceType.DIMENSIONAL_SINGULARITY)
});
for (int level = 1; level <= 8; level++)
{
output = new ItemStack(Config.magnet, 1, level * 2);
GameRegistry.addRecipe(new ShapedOreRecipe(output, new Object[] {
" m ", "mSm", " B ",
'm', "mb.magnet.level" + (level - 1),
'B', Item.diamond,
'S', Config.miscResources.getStackForType(ResourceType.DIMENSIONAL_SINGULARITY)
}));
}
if (ThaumcraftHelper.isActive())
{
@@ -38,4 +38,14 @@ public class LocalizationManager
}
return result;
}
public static String getLocalizedString(String key, Object ...objects)
{
String result = LanguageRegistry.instance().getStringLocalization(key);
if (result.isEmpty())
{
result = LanguageRegistry.instance().getStringLocalization(key, "en_US");
}
return String.format(result, objects);
}
}
@@ -302,10 +302,13 @@ public class ThaumcraftHelper
new ItemStack(Item.pocketSundial), new AspectList().add(Aspect.ORDER, 10).add(Aspect.VOID, 10).add(Aspect.TRAP, 4));
singularity = ThaumcraftApi.addCrucibleRecipe("MB_DimensionalSingularity", Config.miscResources.getStackForType(ResourceType.DIMENSIONAL_SINGULARITY, 3),
new ItemStack(Block.dragonEgg), new AspectList().add(Aspect.ELDRITCH, 10).add(Aspect.EXCHANGE, 10));
new ItemStack(Block.blockDiamond), new AspectList().add(Aspect.ELDRITCH, 10).add(Aspect.EXCHANGE, 20));
essenceOblivion = ThaumcraftApi.addCrucibleRecipe("MB_EssenceOblivion", Config.miscResources.getStackForType(ResourceType.ESSENCE_SCORNFUL_OBLIVION),
Config.miscResources.getStackForType(ResourceType.DIMENSIONAL_SINGULARITY), new AspectList().add(Aspect.DARKNESS, 5).add(Aspect.ELDRITCH, 5).add(Aspect.HUNGER, 15).add(Aspect.VOID, 10));
essenceOblivion = ThaumcraftApi.addShapelessArcaneCraftingRecipe("MB_EssenceOblivion", Config.miscResources.getStackForType(ResourceType.ESSENCE_SCORNFUL_OBLIVION),
new AspectList().add(Aspect.ENTROPY, 25).add(Aspect.AIR, 40).add(Aspect.ORDER, 15), new Object[] {
Config.miscResources.getStackForType(ResourceType.DIMENSIONAL_SINGULARITY),
Block.dragonEgg,
});
}
private static Object frameMagic;
@@ -455,7 +458,7 @@ public class ThaumcraftHelper
ResearchItem essenceOblivionR = new ResearchItem("MB_EssenceOblivion", category, new AspectList().add(Aspect.VOID, 2).add(Aspect.HUNGER, 1),
-3, 3, 5,
Config.miscResources.getStackForType(ResourceType.ESSENCE_SCORNFUL_OBLIVION))
.setPages(getResearchPage("MB_EssenceOblivion.1"), new ResearchPage((RecipeCrucible)essenceOblivion), new ResearchPage(recipe) )
.setPages(getResearchPage("MB_EssenceOblivion.1"), new ResearchPage((IArcaneRecipe)essenceOblivion), new ResearchPage(recipe) )
.setParents("MB_DimensionalSingularity")
.setConcealed()
.registerResearchItem();