- Changed language file entries & some recipes

This commit is contained in:
HellFirePvP committed 2015-11-09 14:09:27 +01:00
1 parent b5ccf6fe6a
commit 2632b3efb7
4 files changed
+23 -40

No files matched your search

@@ -224,7 +224,7 @@ public class RegisteredRecipes {
ItemStack result = new ItemStack(RegisteredItems.itemFamiliar);
familiar.setAspect(result, aspect);
recipes[i] = ThaumcraftApi.addInfusionCraftingRecipe(Gadomancy.MODID.toUpperCase() + ".FAMILIAR", result, 4, new AspectList().add(aspect, 46).add(Aspect.AURA, 34).add(Aspect.MAGIC, 51), new ItemStack(ConfigItems.itemResource, 1, 1), new ItemStack[] { wispyEssence, new ItemStack(ConfigItems.itemResource, 1, 15), new ItemStack(ConfigBlocks.blockCrystal, 1, 6) , wispyEssence, new ItemStack(ConfigItems.itemResource, 1, 14), new ItemStack(ConfigBlocks.blockCrystal, 1, 6), wispyEssence, new ItemStack(ConfigItems.itemResource, 1, 15), new ItemStack(ConfigBlocks.blockCrystal, 1, 6), wispyEssence, new ItemStack(ConfigItems.itemResource, 1, 14), new ItemStack(ConfigBlocks.blockCrystal, 1, 6) });
recipes[i] = ThaumcraftApi.addInfusionCraftingRecipe(Gadomancy.MODID.toUpperCase() + ".FAMILIAR", result, 4, new AspectList().add(aspect, 46).add(Aspect.AURA, 34).add(Aspect.MAGIC, 51), new ItemStack(ConfigItems.itemAmuletRunic, 1, 0), new ItemStack[] { wispyEssence, new ItemStack(ConfigItems.itemResource, 1, 15), new ItemStack(ConfigBlocks.blockCrystal, 1, 6) , wispyEssence, new ItemStack(ConfigItems.itemResource, 1, 14), new ItemStack(ConfigItems.itemResource, 1, 1), wispyEssence, new ItemStack(ConfigItems.itemResource, 1, 15), new ItemStack(ConfigBlocks.blockCrystal, 1, 6), wispyEssence, new ItemStack(ConfigItems.itemResource, 1, 14), new ItemStack(ConfigItems.itemResource, 1, 1) });
}
return recipes;
}
@@ -156,7 +156,7 @@ public class RegisteredResearches {
3, -2, 2, familiarResearchStack)
.setSpecial().setConcealed()
.setParents(nitorResearch.key)
.setPages(new ResearchPage("gadomancy.research_page.FAMILIAR.1"), new ResearchPage(RegisteredRecipes.recipesFamilar)).registerResearchItem();
.setPages(new ResearchPage("gadomancy.research_page.FAMILIAR.1"), new ResearchPage(RegisteredRecipes.recipesFamilar), new ResearchPage("gadomancy.research_page.FAMILIAR.3")).registerResearchItem();
ResearchItem researchTallow = PseudoResearchItem.create("TALLOW", 7, -3).registerResearchItem();
@@ -49,7 +49,6 @@ public class TCMazeHandler {
public static final FakeWorldTCGeneration GEN = new FakeWorldTCGeneration();
private static List<Integer> scheduledWorldUnloads = new ArrayList<Integer>();
private static List<TCMazeSession> flaggedSessions = new ArrayList<TCMazeSession>();
private static Map<EntityPlayer, TCMazeSession> runningSessions = new HashMap<EntityPlayer, TCMazeSession>();
@@ -189,23 +188,7 @@ public class TCMazeHandler {
}
}
private static void addToWorldUnloadQueue(int dimId) {
if(!scheduledWorldUnloads.contains(dimId)) {
scheduledWorldUnloads.add(dimId);
}
}
public static void scheduleTick() {
for(Integer i : scheduledWorldUnloads) {
WorldServer ws = DimensionManager.getWorld(i);
if (ws != null) {
MinecraftForge.EVENT_BUS.post(new WorldEvent.Unload(ws));
ws.flush();
DimensionManager.setWorld(i, null);
}
}
scheduledWorldUnloads.clear();
Iterator<TCMazeSession> it = flaggedSessions.iterator();
while(it.hasNext()) {
TCMazeSession s = it.next();