Flatten runes (a bit dirty since we don't have tags yet)

This commit is contained in:
Vincent Lee committed 2017-12-22 14:05:34 -06:00
1 parent b70bb95c1b
commit 7afd84d5f1
22 files changed
+529 -253

No files matched your search

@@ -55,7 +55,7 @@ public final class ModChallenges {
addChallenge(EnumChallengeLevel.LUNATIC, "kekimurusSetup", ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_KEKIMURUS));
addChallenge(EnumChallengeLevel.LUNATIC, "autoQuarry", new ItemStack(Items.DIAMOND_PICKAXE));
addChallenge(EnumChallengeLevel.LUNATIC, "runeCrafter", new ItemStack(ModItems.rune));
addChallenge(EnumChallengeLevel.LUNATIC, "runeCrafter", new ItemStack(ModItems.runeWater));
}
private static void addChallenge(EnumChallengeLevel level, String name, ItemStack icon) {
@@ -22,6 +22,7 @@ import vazkii.botania.client.core.handler.ClientTickHandler;
import vazkii.botania.client.core.handler.PersistentVariableHelper;
import vazkii.botania.client.gui.lexicon.button.GuiButtonBack;
import vazkii.botania.common.item.ModItems;
import vazkii.botania.common.item.material.ItemRune;
import vazkii.botania.common.lexicon.page.PageText;
import java.io.IOException;
@@ -67,7 +68,7 @@ public class GuiLexiconChallenge extends GuiLexicon implements IParented {
boolean unicode = fontRenderer.getUnicodeFlag();
fontRenderer.setUnicodeFlag(true);
fontRenderer.drawString(TextFormatting.BOLD + I18n.format(challenge.unlocalizedName), left + 38, top + 13, 0);
fontRenderer.drawString(I18n.format(challenge.level.getName()) + ((challenge.icon.getItem() == ModItems.rune) ? "+" : "") + " / " + (challenge.complete ? TextFormatting.DARK_GREEN : TextFormatting.DARK_RED) + I18n.format(challenge.complete ? "botaniamisc.completed" : "botaniamisc.notCompleted"), left + 38, top + 23, 0);
fontRenderer.drawString(I18n.format(challenge.level.getName()) + ((challenge.icon.getItem() instanceof ItemRune) ? "+" : "") + " / " + (challenge.complete ? TextFormatting.DARK_GREEN : TextFormatting.DARK_RED) + I18n.format(challenge.complete ? "botaniamisc.completed" : "botaniamisc.notCompleted"), left + 38, top + 23, 0);
int width = guiWidth - 30;
int x = left + 16;
@@ -34,6 +34,7 @@ import vazkii.botania.common.block.ModBlocks;
import vazkii.botania.common.core.handler.ModSounds;
import vazkii.botania.common.core.helper.Vector3;
import vazkii.botania.common.item.ModItems;
import vazkii.botania.common.item.material.ItemRune;
import vazkii.botania.common.network.PacketBotaniaEffect;
import vazkii.botania.common.network.PacketHandler;
@@ -243,7 +244,7 @@ public class TileRuneAltar extends TileSimpleInventory implements IManaReceiver
for(int i = 0; i < getSizeInventory(); i++) {
ItemStack stack = itemHandler.getStackInSlot(i);
if(!stack.isEmpty()) {
if(stack.getItem() == ModItems.rune && (player == null || !player.capabilities.isCreativeMode)) {
if(stack.getItem() instanceof ItemRune && (player == null || !player.capabilities.isCreativeMode)) {
EntityItem outputRune = new EntityItem(world, getPos().getX() + 0.5, getPos().getY() + 1.5, getPos().getZ() + 0.5, stack.copy());
world.spawnEntity(outputRune);
}
@@ -88,8 +88,22 @@ public final class BotaniaCreativeTab extends CreativeTabs {
addItem(ModItems.manaPowder);
addBlock(ModBlocks.storage);
addItem(ModItems.manaCookie);
addItem(ModItems.rune);
addItem(ModItems.runeWater);
addItem(ModItems.runeFire);
addItem(ModItems.runeEarth);
addItem(ModItems.runeAir);
addItem(ModItems.runeSpring);
addItem(ModItems.runeSummer);
addItem(ModItems.runeAutumn);
addItem(ModItems.runeWinter);
addItem(ModItems.runeMana);
addItem(ModItems.runeLust);
addItem(ModItems.runeGluttony);
addItem(ModItems.runeGreed);
addItem(ModItems.runeSloth);
addItem(ModItems.runeWrath);
addItem(ModItems.runeEnvy);
addItem(ModItems.runePride);
addBlock(ModBlocks.avatar);
addItem(ModItems.dirtRod);
addItem(ModItems.skyDirtRod);
@@ -48,34 +48,34 @@ public final class ModRuneRecipes {
final int costTier2 = 8000;
final int costTier3 = 12000;
recipeWaterRune = BotaniaAPI.registerRuneAltarRecipe(new ItemStack(ModItems.rune, 2, 0), costTier1, LibOreDict.MANA_POWDER, LibOreDict.MANA_STEEL, new ItemStack(Items.DYE, 1, 15), "sugarcane", new ItemStack(Items.FISHING_ROD));
recipeFireRune = BotaniaAPI.registerRuneAltarRecipe(new ItemStack(ModItems.rune, 2, 1), costTier1, LibOreDict.MANA_POWDER, LibOreDict.MANA_STEEL, "ingotBrickNether", "gunpowder", "cropNetherWart");
recipeWaterRune = BotaniaAPI.registerRuneAltarRecipe(new ItemStack(ModItems.runeWater, 2), costTier1, LibOreDict.MANA_POWDER, LibOreDict.MANA_STEEL, new ItemStack(Items.DYE, 1, 15), "sugarcane", new ItemStack(Items.FISHING_ROD));
recipeFireRune = BotaniaAPI.registerRuneAltarRecipe(new ItemStack(ModItems.runeFire, 2), costTier1, LibOreDict.MANA_POWDER, LibOreDict.MANA_STEEL, "ingotBrickNether", "gunpowder", "cropNetherWart");
recipesEarthRune = new ArrayList<>();
recipesEarthRune.add(BotaniaAPI.registerRuneAltarRecipe(new ItemStack(ModItems.rune, 2, 2), costTier1, LibOreDict.MANA_POWDER, LibOreDict.MANA_STEEL, "stone", "blockCoal", new ItemStack(Blocks.BROWN_MUSHROOM)));
recipesEarthRune.add(BotaniaAPI.registerRuneAltarRecipe(new ItemStack(ModItems.rune, 2, 2), costTier1, LibOreDict.MANA_POWDER, LibOreDict.MANA_STEEL, "stone", "blockCoal", new ItemStack(Blocks.RED_MUSHROOM)));
recipesEarthRune.add(BotaniaAPI.registerRuneAltarRecipe(new ItemStack(ModItems.runeEarth, 2), costTier1, LibOreDict.MANA_POWDER, LibOreDict.MANA_STEEL, "stone", "blockCoal", new ItemStack(Blocks.BROWN_MUSHROOM)));
recipesEarthRune.add(BotaniaAPI.registerRuneAltarRecipe(new ItemStack(ModItems.runeEarth, 2), costTier1, LibOreDict.MANA_POWDER, LibOreDict.MANA_STEEL, "stone", "blockCoal", new ItemStack(Blocks.RED_MUSHROOM)));
recipesAirRune = new ArrayList<>();
for(int i = 0; i < 16; i++)
recipesAirRune.add(BotaniaAPI.registerRuneAltarRecipe(new ItemStack(ModItems.rune, 2, 3), costTier1, LibOreDict.MANA_POWDER, LibOreDict.MANA_STEEL, new ItemStack(Blocks.CARPET, 1, i), "feather", "string"));
recipesAirRune.add(BotaniaAPI.registerRuneAltarRecipe(new ItemStack(ModItems.runeAir, 2), costTier1, LibOreDict.MANA_POWDER, LibOreDict.MANA_STEEL, new ItemStack(Blocks.CARPET, 1, i), "feather", "string"));
recipeSpringRune = BotaniaAPI.registerRuneAltarRecipe(new ItemStack(ModItems.rune, 1, 4), costTier2, LibOreDict.RUNE[0], LibOreDict.RUNE[1], "treeSapling", "treeSapling", "treeSapling", "cropWheat");
recipeSummerRune = BotaniaAPI.registerRuneAltarRecipe(new ItemStack(ModItems.rune, 1, 5), costTier2, LibOreDict.RUNE[2], LibOreDict.RUNE[3], new ItemStack(Blocks.SAND), new ItemStack(Blocks.SAND), "slimeball", new ItemStack(Items.MELON));
recipeAutumnRune = BotaniaAPI.registerRuneAltarRecipe(new ItemStack(ModItems.rune, 1, 6), costTier2, LibOreDict.RUNE[1], LibOreDict.RUNE[3], "treeLeaves", "treeLeaves", "treeLeaves", new ItemStack(Items.SPIDER_EYE));
recipeSpringRune = BotaniaAPI.registerRuneAltarRecipe(new ItemStack(ModItems.runeSpring), costTier2, LibOreDict.RUNE[0], LibOreDict.RUNE[1], "treeSapling", "treeSapling", "treeSapling", "cropWheat");
recipeSummerRune = BotaniaAPI.registerRuneAltarRecipe(new ItemStack(ModItems.runeSummer), costTier2, LibOreDict.RUNE[2], LibOreDict.RUNE[3], new ItemStack(Blocks.SAND), new ItemStack(Blocks.SAND), "slimeball", new ItemStack(Items.MELON));
recipeAutumnRune = BotaniaAPI.registerRuneAltarRecipe(new ItemStack(ModItems.runeAutumn), costTier2, LibOreDict.RUNE[1], LibOreDict.RUNE[3], "treeLeaves", "treeLeaves", "treeLeaves", new ItemStack(Items.SPIDER_EYE));
recipesWinterRune = new ArrayList<>();
for(int i = 0; i < 16; i++)
recipesWinterRune.add(BotaniaAPI.registerRuneAltarRecipe(new ItemStack(ModItems.rune, 1, 7), costTier2, LibOreDict.RUNE[0], LibOreDict.RUNE[2], new ItemStack(Blocks.SNOW), new ItemStack(Blocks.SNOW), new ItemStack(Blocks.WOOL, 1, i), new ItemStack(Items.CAKE)));
recipesWinterRune.add(BotaniaAPI.registerRuneAltarRecipe(new ItemStack(ModItems.runeWinter), costTier2, LibOreDict.RUNE[0], LibOreDict.RUNE[2], new ItemStack(Blocks.SNOW), new ItemStack(Blocks.SNOW), new ItemStack(Blocks.WOOL, 1, i), new ItemStack(Items.CAKE)));
recipeManaRune = BotaniaAPI.registerRuneAltarRecipe(new ItemStack(ModItems.rune, 1, 8), costTier2, LibOreDict.MANA_STEEL, LibOreDict.MANA_STEEL, LibOreDict.MANA_STEEL, LibOreDict.MANA_STEEL, LibOreDict.MANA_STEEL, LibOreDict.MANA_PEARL);
recipeManaRune = BotaniaAPI.registerRuneAltarRecipe(new ItemStack(ModItems.runeMana), costTier2, LibOreDict.MANA_STEEL, LibOreDict.MANA_STEEL, LibOreDict.MANA_STEEL, LibOreDict.MANA_STEEL, LibOreDict.MANA_STEEL, LibOreDict.MANA_PEARL);
recipeLustRune = BotaniaAPI.registerRuneAltarRecipe(new ItemStack(ModItems.rune, 1, 9), costTier3, LibOreDict.MANA_DIAMOND, LibOreDict.MANA_DIAMOND, LibOreDict.RUNE[5], LibOreDict.RUNE[3]);
recipeGluttonyRune = BotaniaAPI.registerRuneAltarRecipe(new ItemStack(ModItems.rune, 1, 10), costTier3, LibOreDict.MANA_DIAMOND, LibOreDict.MANA_DIAMOND, LibOreDict.RUNE[7], LibOreDict.RUNE[1]);
recipeGreedRune = BotaniaAPI.registerRuneAltarRecipe(new ItemStack(ModItems.rune, 1, 11), costTier3, LibOreDict.MANA_DIAMOND, LibOreDict.MANA_DIAMOND, LibOreDict.RUNE[4], LibOreDict.RUNE[0]);
recipeSlothRune = BotaniaAPI.registerRuneAltarRecipe(new ItemStack(ModItems.rune, 1, 12), costTier3, LibOreDict.MANA_DIAMOND, LibOreDict.MANA_DIAMOND, LibOreDict.RUNE[6], LibOreDict.RUNE[3]);
recipeWrathRune = BotaniaAPI.registerRuneAltarRecipe(new ItemStack(ModItems.rune, 1, 13), costTier3, LibOreDict.MANA_DIAMOND, LibOreDict.MANA_DIAMOND, LibOreDict.RUNE[7], LibOreDict.RUNE[2]);
recipeEnvyRune = BotaniaAPI.registerRuneAltarRecipe(new ItemStack(ModItems.rune, 1, 14), costTier3, LibOreDict.MANA_DIAMOND, LibOreDict.MANA_DIAMOND, LibOreDict.RUNE[7], LibOreDict.RUNE[0]);
recipePrideRune = BotaniaAPI.registerRuneAltarRecipe(new ItemStack(ModItems.rune, 1, 15), costTier3, LibOreDict.MANA_DIAMOND, LibOreDict.MANA_DIAMOND, LibOreDict.RUNE[5], LibOreDict.RUNE[1]);
recipeLustRune = BotaniaAPI.registerRuneAltarRecipe(new ItemStack(ModItems.runeLust), costTier3, LibOreDict.MANA_DIAMOND, LibOreDict.MANA_DIAMOND, LibOreDict.RUNE[5], LibOreDict.RUNE[3]);
recipeGluttonyRune = BotaniaAPI.registerRuneAltarRecipe(new ItemStack(ModItems.runeGluttony), costTier3, LibOreDict.MANA_DIAMOND, LibOreDict.MANA_DIAMOND, LibOreDict.RUNE[7], LibOreDict.RUNE[1]);
recipeGreedRune = BotaniaAPI.registerRuneAltarRecipe(new ItemStack(ModItems.runeGreed), costTier3, LibOreDict.MANA_DIAMOND, LibOreDict.MANA_DIAMOND, LibOreDict.RUNE[4], LibOreDict.RUNE[0]);
recipeSlothRune = BotaniaAPI.registerRuneAltarRecipe(new ItemStack(ModItems.runeSloth), costTier3, LibOreDict.MANA_DIAMOND, LibOreDict.MANA_DIAMOND, LibOreDict.RUNE[6], LibOreDict.RUNE[3]);
recipeWrathRune = BotaniaAPI.registerRuneAltarRecipe(new ItemStack(ModItems.runeWrath), costTier3, LibOreDict.MANA_DIAMOND, LibOreDict.MANA_DIAMOND, LibOreDict.RUNE[7], LibOreDict.RUNE[2]);
recipeEnvyRune = BotaniaAPI.registerRuneAltarRecipe(new ItemStack(ModItems.runeEnvy), costTier3, LibOreDict.MANA_DIAMOND, LibOreDict.MANA_DIAMOND, LibOreDict.RUNE[7], LibOreDict.RUNE[0]);
recipePrideRune = BotaniaAPI.registerRuneAltarRecipe(new ItemStack(ModItems.runePride), costTier3, LibOreDict.MANA_DIAMOND, LibOreDict.MANA_DIAMOND, LibOreDict.RUNE[5], LibOreDict.RUNE[1]);
recipeHead = new HeadRecipe(new ItemStack(Items.SKULL, 1, 3), 22500, new ItemStack(Items.SKULL), LibOreDict.PIXIE_DUST, "gemPrismarine", new ItemStack(Items.NAME_TAG), new ItemStack(Items.GOLDEN_APPLE));
BotaniaAPI.runeAltarRecipes.add(recipeHead);
@@ -102,6 +102,7 @@ public class FlattenItems implements IFixableData {
CratePattern[] vals = CratePattern.values();
return LibMisc.MOD_ID + ":" + LibItemNames.CRAFT_PATTERN + "_" + vals[(i + 1) % vals.length].name().toLowerCase(Locale.ROOT);
});
LOOKUP.put("botania:rune", i -> LibMisc.MOD_ID + ":" + LibItemNames.RUNE_NAMES[i % LibItemNames.RUNE_NAMES.length]);
}
@Override
@@ -169,7 +169,23 @@ public final class ModItems {
public static final Item lensTripwire = new ItemLens(LibItemNames.LENS_NAMES[23], new LensTripwire(), ItemLens.PROP_CONTROL);
public static final Item lensStorm = new ItemLens(LibItemNames.LENS_NAMES[24], new LensStorm(), ItemLens.PROP_NONE);
public static final Item rune = new ItemRune();
public static final Item runeWater = new ItemRune(LibItemNames.RUNE_NAMES[0]);
public static final Item runeFire = new ItemRune(LibItemNames.RUNE_NAMES[1]);
public static final Item runeEarth = new ItemRune(LibItemNames.RUNE_NAMES[2]);
public static final Item runeAir = new ItemRune(LibItemNames.RUNE_NAMES[3]);
public static final Item runeSpring = new ItemRune(LibItemNames.RUNE_NAMES[4]);
public static final Item runeSummer = new ItemRune(LibItemNames.RUNE_NAMES[5]);
public static final Item runeAutumn = new ItemRune(LibItemNames.RUNE_NAMES[6]);
public static final Item runeWinter = new ItemRune(LibItemNames.RUNE_NAMES[7]);
public static final Item runeMana = new ItemRune(LibItemNames.RUNE_NAMES[8]);
public static final Item runeLust = new ItemRune(LibItemNames.RUNE_NAMES[9]);
public static final Item runeGluttony = new ItemRune(LibItemNames.RUNE_NAMES[10]);
public static final Item runeGreed = new ItemRune(LibItemNames.RUNE_NAMES[11]);
public static final Item runeSloth = new ItemRune(LibItemNames.RUNE_NAMES[12]);
public static final Item runeWrath = new ItemRune(LibItemNames.RUNE_NAMES[13]);
public static final Item runeEnvy = new ItemRune(LibItemNames.RUNE_NAMES[14]);
public static final Item runePride = new ItemRune(LibItemNames.RUNE_NAMES[15]);
public static final Item manaTablet = new ItemManaTablet();
public static final Item manaGun = new ItemManaGun();
public static final Item manaCookie = new ItemManaCookie();
@@ -408,7 +424,22 @@ public final class ModItems {
r.register(lensMessenger);
r.register(lensTripwire);
r.register(lensStorm);
r.register(rune);
r.register(runeWater);
r.register(runeFire);
r.register(runeEarth);
r.register(runeAir);
r.register(runeSpring);
r.register(runeSummer);
r.register(runeAutumn);
r.register(runeWinter);
r.register(runeMana);
r.register(runeLust);
r.register(runeGluttony);
r.register(runeGreed);
r.register(runeSloth);
r.register(runeWrath);
r.register(runeEnvy);
r.register(runePride);
r.register(manaTablet);
r.register(manaGun);
r.register(manaCookie);
@@ -599,10 +630,22 @@ public final class ModItems {
OreDictionary.registerOre(LibOreDict.DYE_WILDCARD, new ItemStack(dyes.get(color)));
}
for(int i = 0; i < 16; i++) {
OreDictionary.registerOre(LibOreDict.RUNE[i], new ItemStack(rune, 1, i));
}
OreDictionary.registerOre(LibOreDict.RUNE[0], new ItemStack(runeWater));
OreDictionary.registerOre(LibOreDict.RUNE[1], new ItemStack(runeFire));
OreDictionary.registerOre(LibOreDict.RUNE[2], new ItemStack(runeEarth));
OreDictionary.registerOre(LibOreDict.RUNE[3], new ItemStack(runeAir));
OreDictionary.registerOre(LibOreDict.RUNE[4], new ItemStack(runeSpring));
OreDictionary.registerOre(LibOreDict.RUNE[5], new ItemStack(runeSummer));
OreDictionary.registerOre(LibOreDict.RUNE[6], new ItemStack(runeAutumn));
OreDictionary.registerOre(LibOreDict.RUNE[7], new ItemStack(runeWinter));
OreDictionary.registerOre(LibOreDict.RUNE[8], new ItemStack(runeMana));
OreDictionary.registerOre(LibOreDict.RUNE[9], new ItemStack(runeLust));
OreDictionary.registerOre(LibOreDict.RUNE[10], new ItemStack(runeGluttony));
OreDictionary.registerOre(LibOreDict.RUNE[11], new ItemStack(runeGreed));
OreDictionary.registerOre(LibOreDict.RUNE[12], new ItemStack(runeSloth));
OreDictionary.registerOre(LibOreDict.RUNE[13], new ItemStack(runeWrath));
OreDictionary.registerOre(LibOreDict.RUNE[14], new ItemStack(runeEnvy));
OreDictionary.registerOre(LibOreDict.RUNE[15], new ItemStack(runePride));
OreDictionary.registerOre(LibOreDict.QUARTZ[0], new ItemStack(darkQuartz));
OreDictionary.registerOre(LibOreDict.QUARTZ[1], new ItemStack(manaQuartz));
@@ -10,42 +10,15 @@
*/
package vazkii.botania.common.item.material;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.item.ItemStack;
import net.minecraft.util.NonNullList;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import vazkii.botania.api.item.IPetalApothecary;
import vazkii.botania.api.recipe.IFlowerComponent;
import vazkii.botania.client.core.handler.ModelHandler;
import vazkii.botania.common.item.ItemMod;
import vazkii.botania.common.lib.LibItemNames;
import javax.annotation.Nonnull;
public class ItemRune extends ItemMod implements IFlowerComponent {
public ItemRune() {
super(LibItemNames.RUNE);
setHasSubtypes(true);
}
@Override
public void getSubItems(@Nonnull CreativeTabs tab, @Nonnull NonNullList<ItemStack> stacks) {
if(isInCreativeTab(tab)) {
for(int i = 0; i < 16; i++)
stacks.add(new ItemStack(this, 1, i));
}
}
@Nonnull
@Override
public String getUnlocalizedName(ItemStack par1ItemStack) {
return getUnlocalizedNameLazy(par1ItemStack) + par1ItemStack.getItemDamage();
}
String getUnlocalizedNameLazy(ItemStack par1ItemStack) {
return super.getUnlocalizedName(par1ItemStack);
public ItemRune(String name) {
super(name);
}
@Override
@@ -58,11 +31,4 @@ public class ItemRune extends ItemMod implements IFlowerComponent {
return 0xA8A8A8;
}
@SideOnly(Side.CLIENT)
@Override
public void registerModels() {
String[] runeNames = { "water", "fire", "earth", "air", "spring", "summer", "autumn", "winter", "mana", "lust", "gluttony", "greed", "sloth", "wrath", "envy", "pride" };
ModelHandler.registerItemMetas(this, runeNames.length, i -> "rune_" + runeNames[i]);
}
}
@@ -17,7 +17,12 @@ public final class LibItemNames {
public static final String DYE = "dye";
public static final String PESTLE_AND_MORTAR = "pestleAndMortar";
public static final String TWIG_WAND = "twigWand";
public static final String RUNE = "rune";
public static final String[] RUNE_NAMES = {
"rune_water", "rune_fire", "rune_earth", "rune_air",
"rune_spring", "rune_summer", "rune_autumn", "rune_winter",
"rune_mana",
"rune_lust", "rune_gluttony", "rune_greed", "rune_sloth", "rune_wrath", "rune_envy", "rune_pride"
};
public static final String MANA_TABLET = "manaTablet";
public static final String MANA_GUN = "manaGun";
public static final String MANA_COOKIE = "manaCookie";