I wrote a letter and I'm proud. *pouts*

This commit is contained in:
Vasco Lavos committed 2014-06-18 00:00:44 +01:00
1 parent 229cddec55
commit 983847188e
6 files changed
+44 -9

No files matched your search

@@ -22,6 +22,7 @@ import net.minecraft.item.crafting.IRecipe;
import net.minecraft.util.IIcon;
import net.minecraft.world.World;
import vazkii.botania.api.lexicon.LexiconPage;
import vazkii.botania.api.recipe.RecipeElvenTrade;
import vazkii.botania.api.recipe.RecipeManaInfusion;
import vazkii.botania.api.recipe.RecipePetals;
import vazkii.botania.api.recipe.RecipeRuneAltar;
@@ -77,6 +78,16 @@ public class DummyMethodHandler implements IInternalMethodHandler {
public LexiconPage manaInfusionRecipePage(String key, RecipeManaInfusion recipe) {
return dummyPage(key);
}
@Override
public LexiconPage elvenTradePage(String key, List<RecipeElvenTrade> recipes) {
return dummyPage(key);
}
@Override
public LexiconPage elvenTradesPage(String key, RecipeElvenTrade recipe) {
return dummyPage(key);
}
private LexiconPage dummyPage(String key) {
return new DummyPage(key);
@@ -21,6 +21,7 @@ import net.minecraft.item.crafting.IRecipe;
import net.minecraft.util.IIcon;
import net.minecraft.world.World;
import vazkii.botania.api.lexicon.LexiconPage;
import vazkii.botania.api.recipe.RecipeElvenTrade;
import vazkii.botania.api.recipe.RecipeManaInfusion;
import vazkii.botania.api.recipe.RecipePetals;
import vazkii.botania.api.recipe.RecipeRuneAltar;
@@ -56,6 +57,10 @@ public interface IInternalMethodHandler {
public LexiconPage manaInfusionRecipePage(String key, RecipeManaInfusion recipe);
public LexiconPage elvenTradePage(String key, List<RecipeElvenTrade> recipes);
public LexiconPage elvenTradesPage(String key, RecipeElvenTrade recipe);
public IManaNetwork getManaNetworkInstance();
public ItemStack getSubTileAsStack(String subTile);
@@ -27,7 +27,7 @@ public class RecipeElvenTrade {
public boolean matches(List<ItemStack> stacks, boolean remove) {
List<Object> inputsMissing = new ArrayList(inputs);
List<Integer> indexesToRemove = new ArrayList();
List<ItemStack> stacksToRemove = new ArrayList();
int i = 0;
for(ItemStack stack : stacks) {
@@ -51,8 +51,8 @@ public class RecipeElvenTrade {
cstack.setItemDamage(stack.getItemDamage());
if(stack.isItemEqual(cstack)) {
if(!indexesToRemove.contains(i))
indexesToRemove.add(i);
if(!stacksToRemove.contains(stack))
stacksToRemove.add(stack);
oredictIndex = j;
found = true;
break;
@@ -75,7 +75,7 @@ public class RecipeElvenTrade {
}
if(remove)
for(int r : indexesToRemove)
for(ItemStack r : stacksToRemove)
stacks.remove(r);
return inputsMissing.isEmpty();
@@ -24,6 +24,7 @@ import net.minecraft.world.World;
import vazkii.botania.api.internal.IInternalMethodHandler;
import vazkii.botania.api.internal.IManaNetwork;
import vazkii.botania.api.lexicon.LexiconPage;
import vazkii.botania.api.recipe.RecipeElvenTrade;
import vazkii.botania.api.recipe.RecipeManaInfusion;
import vazkii.botania.api.recipe.RecipePetals;
import vazkii.botania.api.recipe.RecipeRuneAltar;
@@ -32,6 +33,7 @@ import vazkii.botania.common.Botania;
import vazkii.botania.common.block.BlockSpecialFlower;
import vazkii.botania.common.item.block.ItemBlockSpecialFlower;
import vazkii.botania.common.lexicon.page.PageCraftingRecipe;
import vazkii.botania.common.lexicon.page.PageElvenRecipe;
import vazkii.botania.common.lexicon.page.PageImage;
import vazkii.botania.common.lexicon.page.PageManaInfusionRecipe;
import vazkii.botania.common.lexicon.page.PagePetalRecipe;
@@ -97,7 +99,16 @@ public class InternalMethodHandler implements IInternalMethodHandler {
return new PageManaInfusionRecipe(key, recipe);
}
@Override
public LexiconPage elvenTradePage(String key, List<RecipeElvenTrade> recipes) {
return new PageElvenRecipe(key, recipes);
}
@Override
public LexiconPage elvenTradesPage(String key, RecipeElvenTrade recipe) {
return new PageElvenRecipe(key, recipe);
}
@Override
public ItemStack getSubTileAsStack(String subTile) {
return ItemBlockSpecialFlower.ofType(subTile);
@@ -461,10 +461,10 @@ public final class LexiconData {
new PageImage("8", LibResources.ENTRY_PORTAL4), new PageText("9"), new PageText("10"), new PageText("11"));
elvenMessage = new ALexiconEntry(LibLexicon.ALF_MESSAGE, categoryAlfhomancy);
elvenMessage.setPriority().setLexiconPages(new PageImage("0", LibResources.ENTRY_ELVEN_GARDE), new PageText("1"));
elvenMessage.setPriority().setLexiconPages(new PageImage("0", LibResources.ENTRY_ELVEN_GARDE), new PageText("1"), new PageText("2"), new PageText("3"), new PageText("4"), new PageText("5"), new PageText("6"));
elvenResources = new ALexiconEntry(LibLexicon.ALF_RESOURCES, categoryAlfhomancy);
elvenResources.setPriority().setLexiconPages(new PageText("0"), new PageElvenRecipe("1", ModElvenTradeRecipes.elementiumRecipe));
elvenResources.setPriority().setLexiconPages(new PageText("0"), new PageElvenRecipe("1", ModElvenTradeRecipes.dreamwoodRecipe), new PageElvenRecipe("2", ModElvenTradeRecipes.elementiumRecipe), new PageElvenRecipe("3", ModElvenTradeRecipes.pixieDustRecipe), new PageElvenRecipe("3", ModElvenTradeRecipes.dragonstoneRecipe));
// MISCLENAEOUS ENTRIES
unstableBlocks = new BLexiconEntry(LibLexicon.MISC_UNSTABLE_BLOCKS, categoryMisc);
+11 -3
View File
@@ -1073,12 +1073,20 @@ botania.page.aIntro11=The amount of information about &1Alfheim&0 stored in this
botania.entry.elfMessage=A Message from Elven Garde
botania.page.elfMessage0=
# ^ This is blank on purpose
botania.page.elfMessage1=WIP
botania.page.elfMessage1=&oGreetings. We noticed that our portal was opened via a link from another world. That's rather shocking news indeed. We thank you very much for providing us with a repository of the knowledge from your world, as to keep us up to date to what happened since we left it, it's been a while since then, indeed.
botania.page.elfMessage2=&oAfter some discussion with the high council of Elven Garde, we have decided to coppoerate with you. You see, reading through your "Lexica Botania" has shown us a good amount of resources from your world that we would be extremely keen as to get our hands on, as these are non-existant in our lands.
botania.page.elfMessage3=&oThe link you have managed to extablish is rather weak, no living beings will be able to go through, as you already know. However, there's a positive side to this, the link strikes the farbic of time of both our worlds in a way where it doesn't keep them in sync, that's the reason why you received your book back so quickly.
botania.page.elfMessage4=&oWhen it comes to Mana and other magical energies, we are plenty stocked on them, so worry not about the portal closing on our end. Let's put this in prospect, in order for the advance of both our civilizations, we vow to accept a given set of resources from your world we lack in ours in trade for resources you lack in yours.
botania.page.elfMessage5=&oWe have taken the liberty of asigning our best scribes to put together a great set of knowledge from our world we're willing to share, you can find it in your lexicon just as you'd find knowledge from yours. We hope you find it enlightening and that it encourages you to invest in our materials.
botania.page.elfMessage6=&oLast but not least, do take in note that if you decide to send something we have not vouched to trade for, we will assume it as a gift and keep it for ourselves, just as a forewarning. We look forward to exchanging resources with you.<br>Best Regards, the High Council of Elven Garde.
# -- THE RESOURCES OF ALFHEIM
botania.entry.elfResources=The Resources of Alfheim
botania.page.elfResources0=WIP
botania.page.elfResources1=Trading for &1Elementium&0
botania.page.elfResources0=&4Alfheim&0 contains a very varied amount of exquisite resources. Sadly though, most of them are extremely scarce and hard to come by due to competition between the various clans. The elves are interested in trading some materials, such as &1Dreamwood&0, &1Elementium&0, &1Pixie Dust&0 or &1Dragonstone&0, resources native to their lands.
botania.page.elfResources1=Trading for &1Dreamwood&0
botania.page.elfResources2=Trading for &1Elementium&0
botania.page.elfResources3=Trading for &1Pixie Dust&0
botania.page.elfResources4=Trading for &1Dragonstone&0
# - MISCLANEOUS
# -- UNSTABLE CUBE