Flatten Quartz

This commit is contained in:
Vincent Lee committed 2017-12-15 20:45:19 -06:00
1 parent a96d2ce1ec
commit 1d997c7f3b
33 files changed
+154 -166

No files matched your search

@@ -351,7 +351,14 @@ public final class BotaniaCreativeTab extends CreativeTabs {
addBlock(ModFluffBlocks.shimmerrockStairs);
addBlock(ModFluffBlocks.shimmerrockSlab);
addItem(ModItems.quartz);
addItem(ModItems.darkQuartz);
addItem(ModItems.manaQuartz);
addItem(ModItems.blazeQuartz);
addItem(ModItems.lavenderQuartz);
addItem(ModItems.redQuartz);
addItem(ModItems.elfQuartz);
addItem(ModItems.sunnyQuartz);
addBlock(ModFluffBlocks.darkQuartz);
addBlock(ModFluffBlocks.darkQuartzSlab);
addBlock(ModFluffBlocks.darkQuartzStairs);
@@ -726,11 +726,11 @@ public final class ModCraftingRecipes {
recipeLivingwoodDecor3 = path("livingwood_3");
recipeLivingwoodDecor4 = path("livingwood_4");
recipeLivingwoodDecor5 = path("livingwood_5");
recipeDarkQuartz = path("quartz_0");
recipeBlazeQuartz = path("quartz_2");
recipeLavenderQuartz = path("quartz_3");
recipeRedQuartz = path("quartz_4");
recipeSunnyQuartz = path("quartz_6");
recipeDarkQuartz = ModItems.darkQuartz.getRegistryName();
recipeBlazeQuartz = ModItems.blazeQuartz.getRegistryName();
recipeLavenderQuartz = ModItems.lavenderQuartz.getRegistryName();
recipeRedQuartz = ModItems.redQuartz.getRegistryName();
recipeSunnyQuartz = ModItems.sunnyQuartz.getRegistryName();
recipesShinyFlowers = allOfGroup(ModBlocks.shinyFlower.getRegistryName());
recipesMiniIsland = allOfGroup(ModBlocks.floatingFlower.getRegistryName());
recipeAzulejo = path("custombrick_4");
@@ -33,7 +33,7 @@ public class ModElvenTradeRecipes {
dragonstoneRecipes.add(BotaniaAPI.registerElvenTradeRecipe(new ItemStack(ModItems.dragonstone), LibOreDict.MANA_DIAMOND));
dragonstoneRecipes.add(BotaniaAPI.registerElvenTradeRecipe(new ItemStack(ModBlocks.storage, 1, 4), new ItemStack(ModBlocks.storage, 1, 3)));
elvenQuartzRecipe = BotaniaAPI.registerElvenTradeRecipe(new ItemStack(ModItems.quartz, 1, 5), new ItemStack(Items.QUARTZ));
elvenQuartzRecipe = BotaniaAPI.registerElvenTradeRecipe(new ItemStack(ModItems.elfQuartz), new ItemStack(Items.QUARTZ));
alfglassRecipe = BotaniaAPI.registerElvenTradeRecipe(new ItemStack(ModBlocks.elfGlass), new ItemStack(ModBlocks.manaGlass));
BotaniaAPI.registerElvenTradeRecipe(new ItemStack(Items.IRON_INGOT), new ItemStack(Items.IRON_INGOT));
@@ -18,7 +18,6 @@ import vazkii.botania.api.BotaniaAPI;
import vazkii.botania.api.recipe.RecipeManaInfusion;
import vazkii.botania.common.Botania;
import vazkii.botania.common.block.ModFluffBlocks;
import vazkii.botania.common.core.handler.ConfigHandler;
import vazkii.botania.common.item.ModItems;
import java.util.ArrayList;
@@ -74,12 +73,12 @@ public final class ModManaAlchemyRecipes {
glowstoneDustRecipe = BotaniaAPI.registerManaAlchemyRecipe(new ItemStack(Items.GLOWSTONE_DUST, 4), new ItemStack(Blocks.GLOWSTONE), 25);
quartzRecipes = new ArrayList<>();
quartzRecipes.add(BotaniaAPI.registerManaAlchemyRecipe(new ItemStack(Items.QUARTZ, 4), new ItemStack(Blocks.QUARTZ_BLOCK, 1, Short.MAX_VALUE), 25));
quartzRecipes.add(BotaniaAPI.registerManaAlchemyRecipe(new ItemStack(ModItems.quartz, 4, 0), new ItemStack(ModFluffBlocks.darkQuartz, 1, Short.MAX_VALUE), 25));
quartzRecipes.add(BotaniaAPI.registerManaAlchemyRecipe(new ItemStack(ModItems.quartz, 4, 1), new ItemStack(ModFluffBlocks.manaQuartz, 1, Short.MAX_VALUE), 25));
quartzRecipes.add(BotaniaAPI.registerManaAlchemyRecipe(new ItemStack(ModItems.quartz, 4, 2), new ItemStack(ModFluffBlocks.blazeQuartz, 1, Short.MAX_VALUE), 25));
quartzRecipes.add(BotaniaAPI.registerManaAlchemyRecipe(new ItemStack(ModItems.quartz, 4, 3), new ItemStack(ModFluffBlocks.lavenderQuartz, 1, Short.MAX_VALUE), 25));
quartzRecipes.add(BotaniaAPI.registerManaAlchemyRecipe(new ItemStack(ModItems.quartz, 4, 4), new ItemStack(ModFluffBlocks.redQuartz, 1, Short.MAX_VALUE), 25));
quartzRecipes.add(BotaniaAPI.registerManaAlchemyRecipe(new ItemStack(ModItems.quartz, 4, 5), new ItemStack(ModFluffBlocks.elfQuartz, 1, Short.MAX_VALUE), 25));
quartzRecipes.add(BotaniaAPI.registerManaAlchemyRecipe(new ItemStack(ModItems.darkQuartz, 4), new ItemStack(ModFluffBlocks.darkQuartz, 1, Short.MAX_VALUE), 25));
quartzRecipes.add(BotaniaAPI.registerManaAlchemyRecipe(new ItemStack(ModItems.manaQuartz, 4), new ItemStack(ModFluffBlocks.manaQuartz, 1, Short.MAX_VALUE), 25));
quartzRecipes.add(BotaniaAPI.registerManaAlchemyRecipe(new ItemStack(ModItems.blazeQuartz, 4), new ItemStack(ModFluffBlocks.blazeQuartz, 1, Short.MAX_VALUE), 25));
quartzRecipes.add(BotaniaAPI.registerManaAlchemyRecipe(new ItemStack(ModItems.lavenderQuartz, 4), new ItemStack(ModFluffBlocks.lavenderQuartz, 1, Short.MAX_VALUE), 25));
quartzRecipes.add(BotaniaAPI.registerManaAlchemyRecipe(new ItemStack(ModItems.redQuartz, 4), new ItemStack(ModFluffBlocks.redQuartz, 1, Short.MAX_VALUE), 25));
quartzRecipes.add(BotaniaAPI.registerManaAlchemyRecipe(new ItemStack(ModItems.elfQuartz, 4), new ItemStack(ModFluffBlocks.elfQuartz, 1, Short.MAX_VALUE), 25));
chiseledBrickRecipe = BotaniaAPI.registerManaAlchemyRecipe(new ItemStack(Blocks.STONEBRICK, 1, 3), new ItemStack(Blocks.STONEBRICK), 150);
iceRecipe = BotaniaAPI.registerManaAlchemyRecipe(new ItemStack(Blocks.ICE), new ItemStack(Blocks.SNOW), 2250);
@@ -71,7 +71,7 @@ public final class ModManaInfusionRecipes {
mycelSeedsRecipes.add(BotaniaAPI.registerManaInfusionRecipe(new ItemStack(ModItems.grassSeeds, 1, 2), new ItemStack(Blocks.RED_MUSHROOM), 6500));
mycelSeedsRecipes.add(BotaniaAPI.registerManaInfusionRecipe(new ItemStack(ModItems.grassSeeds, 1, 2), new ItemStack(Blocks.BROWN_MUSHROOM), 6500));
manaQuartzRecipe = BotaniaAPI.registerManaInfusionRecipe(new ItemStack(ModItems.quartz, 1, 1), new ItemStack(Items.QUARTZ), 250);
manaQuartzRecipe = BotaniaAPI.registerManaInfusionRecipe(new ItemStack(ModItems.manaQuartz), new ItemStack(Items.QUARTZ), 250);
tinyPotatoRecipe = BotaniaAPI.registerManaInfusionRecipe(new ItemStack(ModBlocks.tinyPotato), new ItemStack(Items.POTATO), 1337);
if(Botania.thaumcraftLoaded) {
@@ -7,7 +7,6 @@ import vazkii.botania.common.lib.LibMisc;
import javax.annotation.Nonnull;
import java.util.HashMap;
import java.util.Locale;
import java.util.Map;
import java.util.function.IntFunction;
@@ -21,7 +20,7 @@ public class FlattenItems implements IFixableData {
// support ancient prismarine from 1.7
return "minecraft:prismarine_shard";
} else {
return LibMisc.MOD_ID + ":" + LibItemNames.MANA_RESOURCE_NAMES[i % LibItemNames.MANA_RESOURCE_NAMES.length].toLowerCase(Locale.ROOT);
return LibMisc.MOD_ID + ":" + LibItemNames.MANA_RESOURCE_NAMES[i % LibItemNames.MANA_RESOURCE_NAMES.length];
}
});
LOOKUP.put("botania:vial", i -> {
@@ -31,6 +30,7 @@ public class FlattenItems implements IFixableData {
return LibMisc.MOD_ID + ":" + LibItemNames.VIAL;
}
});
LOOKUP.put("botania:quartz", i -> LibMisc.MOD_ID + ":" + LibItemNames.QUARTZ_NAMES[i % LibItemNames.QUARTZ_NAMES.length]);
}
@Override
@@ -0,0 +1,25 @@
/**
* This class was created by <Vazkii>. It's distributed as
* part of the Botania Mod. Get the Source Code in github:
* https://github.com/Vazkii/Botania
*
* Botania is Open Source and distributed under the
* Botania License: http://botaniamod.net/license.php
*
* File Created @ [Jun 11, 2014, 2:16:47 AM (GMT)]
*/
package vazkii.botania.common.item;
import net.minecraft.item.ItemStack;
import vazkii.botania.api.recipe.IElvenItem;
public class ItemElven extends ItemMod implements IElvenItem {
public ItemElven(String name) {
super(name);
}
@Override
public boolean isElvenItem(ItemStack stack) {
return true;
}
}
@@ -24,7 +24,7 @@ import vazkii.botania.common.lib.LibMisc;
import javax.annotation.Nonnull;
public abstract class ItemMod extends Item implements IModelRegister {
public class ItemMod extends Item implements IModelRegister {
public ItemMod(String name) {
setCreativeTab(BotaniaCreativeTab.INSTANCE);
@@ -68,7 +68,6 @@ import vazkii.botania.common.item.material.ItemDye;
import vazkii.botania.common.item.material.ItemManaResource;
import vazkii.botania.common.item.material.ItemPestleAndMortar;
import vazkii.botania.common.item.material.ItemPetal;
import vazkii.botania.common.item.material.ItemQuartz;
import vazkii.botania.common.item.material.ItemRune;
import vazkii.botania.common.item.record.ItemRecordGaia1;
import vazkii.botania.common.item.record.ItemRecordGaia2;
@@ -170,7 +169,13 @@ public final class ModItems {
public static final Item divaCharm = new ItemDivaCharm();
public static final Item flightTiara = new ItemFlightTiara();
public static final Item enderDagger = new ItemEnderDagger();
public static final Item quartz = new ItemQuartz();
public static final Item darkQuartz = new ItemMod(LibItemNames.QUARTZ_NAMES[0]);
public static final Item manaQuartz = new ItemMod(LibItemNames.QUARTZ_NAMES[1]);
public static final Item blazeQuartz = new ItemMod(LibItemNames.QUARTZ_NAMES[2]);
public static final Item lavenderQuartz = new ItemMod(LibItemNames.QUARTZ_NAMES[3]);
public static final Item redQuartz = new ItemMod(LibItemNames.QUARTZ_NAMES[4]);
public static final Item elfQuartz = new ItemElven(LibItemNames.QUARTZ_NAMES[5]);
public static final Item sunnyQuartz = new ItemMod(LibItemNames.QUARTZ_NAMES[6]);
public static final Item waterRod = new ItemWaterRod();
public static final Item elementiumHelm = new ItemElementiumHelm();
public static final Item elementiumHelmRevealing = new ItemElementiumHelmRevealing();
@@ -349,7 +354,13 @@ public final class ModItems {
r.register(divaCharm);
r.register(flightTiara);
r.register(enderDagger);
r.register(quartz);
r.register(darkQuartz);
r.register(manaQuartz);
r.register(blazeQuartz);
r.register(lavenderQuartz);
r.register(redQuartz);
r.register(elfQuartz);
r.register(sunnyQuartz);
r.register(waterRod);
r.register(elementiumHelm);
r.register(elementiumHelmRevealing);
@@ -464,8 +475,14 @@ public final class ModItems {
OreDictionary.registerOre(LibOreDict.RUNE[i], new ItemStack(rune, 1, i));
}
OreDictionary.registerOre(LibOreDict.DYE_WILDCARD, new ItemStack(dye, 1, OreDictionary.WILDCARD_VALUE));
for(int i = 0; i < 7; i++)
OreDictionary.registerOre(LibOreDict.QUARTZ[i], new ItemStack(quartz, 1, i));
OreDictionary.registerOre(LibOreDict.QUARTZ[0], new ItemStack(darkQuartz));
OreDictionary.registerOre(LibOreDict.QUARTZ[1], new ItemStack(manaQuartz));
OreDictionary.registerOre(LibOreDict.QUARTZ[2], new ItemStack(blazeQuartz));
OreDictionary.registerOre(LibOreDict.QUARTZ[3], new ItemStack(lavenderQuartz));
OreDictionary.registerOre(LibOreDict.QUARTZ[4], new ItemStack(redQuartz));
OreDictionary.registerOre(LibOreDict.QUARTZ[5], new ItemStack(elfQuartz));
OreDictionary.registerOre(LibOreDict.QUARTZ[6], new ItemStack(sunnyQuartz));
OreDictionary.registerOre(LibOreDict.PESTLE_AND_MORTAR, pestleAndMortar);
OreDictionary.registerOre(LibOreDict.MANA_STEEL, new ItemStack(manaSteel));
@@ -1,63 +0,0 @@
/**
* This class was created by <Vazkii>. It's distributed as
* part of the Botania Mod. Get the Source Code in github:
* https://github.com/Vazkii/Botania
*
* Botania is Open Source and distributed under the
* Botania License: http://botaniamod.net/license.php
*
* File Created @ [Jun 11, 2014, 2:16:47 AM (GMT)]
*/
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.recipe.IElvenItem;
import vazkii.botania.client.core.handler.ModelHandler;
import vazkii.botania.common.core.handler.ConfigHandler;
import vazkii.botania.common.item.ItemMod;
import vazkii.botania.common.lib.LibItemNames;
import javax.annotation.Nonnull;
public class ItemQuartz extends ItemMod implements IElvenItem {
private static final int SUBTYPES = 7;
public ItemQuartz() {
super(LibItemNames.QUARTZ);
setHasSubtypes(true);
}
@Override
public void getSubItems(@Nonnull CreativeTabs tab, @Nonnull NonNullList<ItemStack> list) {
if(isInCreativeTab(tab)) {
for(int i = 0; i < SUBTYPES; i++)
list.add(new ItemStack(this, 1, i));
}
}
@Nonnull
@Override
public String getUnlocalizedName(ItemStack par1ItemStack) {
return getUnlocalizedNameLazy(par1ItemStack) + par1ItemStack.getItemDamage();
}
private String getUnlocalizedNameLazy(ItemStack par1ItemStack) {
return super.getUnlocalizedName(par1ItemStack);
}
@Override
public boolean isElvenItem(ItemStack stack) {
return stack.getItemDamage() == 5;
}
@SideOnly(Side.CLIENT)
@Override
public void registerModels() {
ModelHandler.registerItemAppendMeta(this, 7, LibItemNames.QUARTZ);
}
}
@@ -60,7 +60,15 @@ public final class LibItemNames {
public static final String DIVA_CHARM = "divaCharm";
public static final String FLIGHT_TIARA = "flightTiara";
public static final String ENDER_DAGGER = "enderDagger";
public static final String QUARTZ = "quartz";
public static final String[] QUARTZ_NAMES = {
"quartz_dark",
"quartz_mana",
"quartz_blaze",
"quartz_lavender",
"quartz_red",
"quartz_elven",
"quartz_sunny"
};
public static final String WATER_ROD = "waterRod";
public static final String ELEMENTIUM_HELM = "elementiumHelm";
public static final String ELEMENTIUM_CHEST = "elementiumChest";