mirror of
https://github.com/GTNewHorizons/Botania.git
synced 2026-11-21 20:52:20 +00:00
The Diluted Mana Pool is no longer part of progression.
This commit is contained in:
1 parent
575c0b8bfd
commit
6a3c929abe
6 files changed
+16
-22
No files matched your search
@@ -272,12 +272,7 @@ public final class HUDHandler {
|
||||
int x = res.getScaledWidth() / 2 - 11;
|
||||
int y = res.getScaledHeight() / 2 + 10;
|
||||
|
||||
boolean diluted = false;
|
||||
int u = tile.getCurrentMana() >= recipe.getManaToConsume() ? 0 : 22;
|
||||
if(u == 0 && tile.getBlockMetadata() == 2 && recipe.getOutput().getItem() != Item.getItemFromBlock(ModBlocks.pool)) {
|
||||
u = 44;
|
||||
diluted = true;
|
||||
}
|
||||
int v = mc.thePlayer.getCommandSenderName().equals("haighyorkie") && mc.thePlayer.isSneaking() ? 23 : 8;
|
||||
|
||||
GL11.glEnable(GL11.GL_BLEND);
|
||||
@@ -293,11 +288,6 @@ public final class HUDHandler {
|
||||
RenderItem.getInstance().renderItemOverlayIntoGUI(mc.fontRenderer, mc.renderEngine, recipe.getOutput(), x + 26, y);
|
||||
net.minecraft.client.renderer.RenderHelper.disableStandardItemLighting();
|
||||
|
||||
if(diluted) {
|
||||
String s = StatCollector.translateToLocal("botaniamisc.pay2win");
|
||||
mc.fontRenderer.drawStringWithShadow(s, res.getScaledWidth() / 2 - mc.fontRenderer.getStringWidth(s) / 2, y + 20, 0xFF8888);
|
||||
}
|
||||
|
||||
GL11.glDisable(GL11.GL_LIGHTING);
|
||||
GL11.glDisable(GL11.GL_BLEND);
|
||||
|
||||
|
||||
@@ -145,7 +145,7 @@ public class TilePool extends TileMod implements IManaPool, IDyablePool, IKeyLoc
|
||||
return false;
|
||||
|
||||
for(RecipeManaInfusion recipe : BotaniaAPI.manaInfusionRecipes) {
|
||||
if(recipe.matches(stack) && (!recipe.isAlchemy() || alchemy) && (!recipe.isConjuration() || conjuration) && (getBlockMetadata() != 2 || recipe.getOutput().getItem() == Item.getItemFromBlock(getBlockType()))) {
|
||||
if(recipe.matches(stack) && (!recipe.isAlchemy() || alchemy) && (!recipe.isConjuration() || conjuration)) {
|
||||
int mana = recipe.getManaToConsume();
|
||||
if(getCurrentMana() >= mana) {
|
||||
recieveMana(-mana);
|
||||
|
||||
@@ -52,6 +52,7 @@ public final class ModCraftingRecipes {
|
||||
public static List<IRecipe> recipesSpreader;
|
||||
public static List<IRecipe> recipesManaLens;
|
||||
public static IRecipe recipePool;
|
||||
public static IRecipe recipePoolDiluted;
|
||||
public static List<IRecipe> recipesRuneAltar;
|
||||
public static IRecipe recipeLensVelocity;
|
||||
public static IRecipe recipeLensPotency;
|
||||
@@ -389,11 +390,17 @@ public final class ModCraftingRecipes {
|
||||
recipesManaLens = BotaniaAPI.getLatestAddedRecipes(2);
|
||||
|
||||
// Mana Pool Recipe
|
||||
addOreDictRecipe(new ItemStack(ModBlocks.pool, 1, 2),
|
||||
addOreDictRecipe(new ItemStack(ModBlocks.pool),
|
||||
"R R", "RRR",
|
||||
'R', LibOreDict.LIVING_ROCK);
|
||||
recipePool = BotaniaAPI.getLatestAddedRecipe();
|
||||
|
||||
// Diluted Mana Pool Recipe
|
||||
addOreDictRecipe(new ItemStack(ModBlocks.pool, 1, 2),
|
||||
"R R", "RRR",
|
||||
'R', new ItemStack(ModFluffBlocks.livingrockSlab));
|
||||
recipePoolDiluted = BotaniaAPI.getLatestAddedRecipe();
|
||||
|
||||
// Runic Altar Recipe
|
||||
addOreDictRecipe(new ItemStack(ModBlocks.runeAltar),
|
||||
"SSS", "SPS",
|
||||
|
||||
@@ -26,8 +26,6 @@ import vazkii.botania.common.lib.LibOreDict;
|
||||
|
||||
public final class ModManaInfusionRecipes {
|
||||
|
||||
public static RecipeManaInfusion poolRecipe;
|
||||
|
||||
public static List<RecipeManaInfusion> manaPetalRecipes;
|
||||
public static List<RecipeManaInfusion> manasteelRecipes;
|
||||
public static RecipeManaInfusion manaPearlRecipe;
|
||||
@@ -46,8 +44,6 @@ public final class ModManaInfusionRecipes {
|
||||
public static RecipeManaInfusion sugarCaneRecipe;
|
||||
|
||||
public static void init() {
|
||||
poolRecipe = BotaniaAPI.registerManaInfusionRecipe(new ItemStack(ModBlocks.pool), new ItemStack(ModBlocks.pool, 1, 2), 320);
|
||||
|
||||
manaPetalRecipes = new ArrayList();
|
||||
for(int i = 0; i < 16; i++)
|
||||
manaPetalRecipes.add(BotaniaAPI.registerManaInfusionRecipe(new ItemStack(ModItems.manaPetal, 1, i), LibOreDict.PETAL[i], 200));
|
||||
|
||||
@@ -367,7 +367,7 @@ public final class LexiconData {
|
||||
spreader.setPriority().setLexiconPages(new PageText("0"), new PageImage("1", LibResources.ENTRY_SPREADER), new PageText("2"), new PageText("3"), new PageText("4"), new PageText("11"), new PageCraftingRecipe("5", ModCraftingRecipes.recipesSpreader), new PageText("10"));
|
||||
|
||||
pool = new BLexiconEntry(LibLexicon.MANA_POOL, categoryMana);
|
||||
pool.setPriority().setLexiconPages(new PageText("0"), new PageText("9"), new PageCraftingRecipe("1", ModCraftingRecipes.recipePool), new PageManaInfusionRecipe("10", ModManaInfusionRecipes.poolRecipe), new PageText("2"), new PageText("8"), new PageManaInfusionRecipe("3", ModManaInfusionRecipes.manasteelRecipes), new PageManaInfusionRecipe("4", ModManaInfusionRecipes.manaPearlRecipe), new PageManaInfusionRecipe("5", ModManaInfusionRecipes.manaDiamondRecipes), new PageManaInfusionRecipe("6", ModManaInfusionRecipes.manaPetalRecipes), new PageManaInfusionRecipe("11", ModManaInfusionRecipes.managlassRecipe), new PageManaInfusionRecipe("12", ModManaInfusionRecipes.manaStringRecipe), new PageCraftingRecipe("13", ModCraftingRecipes.recipeCobweb), new PageManaInfusionRecipe("7", ModManaInfusionRecipes.manaCookieRecipe)).setIcon(new ItemStack(ModBlocks.pool));
|
||||
pool.setPriority().setLexiconPages(new PageText("0"), new PageText("9"), new PageCraftingRecipe("1", ModCraftingRecipes.recipePool), new PageCraftingRecipe("10", ModCraftingRecipes.recipePoolDiluted), new PageText("14"), new PageText("2"), new PageText("8"), new PageManaInfusionRecipe("3", ModManaInfusionRecipes.manasteelRecipes), new PageManaInfusionRecipe("4", ModManaInfusionRecipes.manaPearlRecipe), new PageManaInfusionRecipe("5", ModManaInfusionRecipes.manaDiamondRecipes), new PageManaInfusionRecipe("6", ModManaInfusionRecipes.manaPetalRecipes), new PageManaInfusionRecipe("11", ModManaInfusionRecipes.managlassRecipe), new PageManaInfusionRecipe("12", ModManaInfusionRecipes.manaStringRecipe), new PageCraftingRecipe("13", ModCraftingRecipes.recipeCobweb), new PageManaInfusionRecipe("7", ModManaInfusionRecipes.manaCookieRecipe)).setIcon(new ItemStack(ModBlocks.pool));
|
||||
|
||||
sparks = new BLexiconEntry(LibLexicon.MANA_SPARKS, categoryMana);
|
||||
sparks.setPriority().setLexiconPages(new PageText("0"), new PageText("1"), new PageText("3"), new PageCraftingRecipe("2", ModCraftingRecipes.recipesSpark));
|
||||
|
||||
Reference in new issue
Block a user