Flatten vial/flask

This commit is contained in:
Vincent Lee committed 2017-12-11 12:20:15 -06:00
1 parent cf3ab8d337
commit 68583d03d3
19 files changed
+45 -68

No files matched your search

@@ -28,7 +28,7 @@ public class BreweryRecipeWrapper implements IRecipeWrapper {
@SuppressWarnings("unchecked")
public BreweryRecipeWrapper(RecipeBrew recipeBrew) {
ImmutableList.Builder<List<ItemStack>> builder = ImmutableList.builder();
builder.add(ImmutableList.of(new ItemStack(ModItems.vial, 1, 0), new ItemStack(ModItems.vial, 1, 1)));
builder.add(ImmutableList.of(new ItemStack(ModItems.vial), new ItemStack(ModItems.flask)));
for(Object o : recipeBrew.getInputs()) {
if(o instanceof ItemStack) {
builder.add(ImmutableList.of((ItemStack) o));
@@ -39,7 +39,7 @@ public class BreweryRecipeWrapper implements IRecipeWrapper {
}
input = builder.build();
output = ImmutableList.of(recipeBrew.getOutput(new ItemStack(ModItems.vial)).copy(), recipeBrew.getOutput(new ItemStack(ModItems.vial, 1, 1)).copy());
output = ImmutableList.of(recipeBrew.getOutput(new ItemStack(ModItems.vial)).copy(), recipeBrew.getOutput(new ItemStack(ModItems.flask)).copy());
}
@Override
@@ -160,6 +160,7 @@ public final class BotaniaCreativeTab extends CreativeTabs {
addBlock(ModBlocks.terraPlate);
addBlock(ModBlocks.brewery);
addItem(ModItems.vial);
addItem(ModItems.flask);
addItem(ModItems.brewVial);
addItem(ModItems.brewFlask);
addBlock(ModBlocks.incensePlate);
@@ -561,8 +561,8 @@ public final class ModCraftingRecipes {
recipeCraftCrate = path("opencrate_1");
recipesPatterns = allOfGroup("craftpattern");
recipeBrewery = ModBlocks.brewery.getRegistryName();
recipeVial = path("vial_0");
recipeFlask = path("vial_1");
recipeVial = ModItems.vial.getRegistryName();
recipeFlask = ModItems.flask.getRegistryName();
recipeIncenseStick = ModItems.incenseStick.getRegistryName();
recipeIncensePlate = ModBlocks.incensePlate.getRegistryName();
recipeHourglass = ModBlocks.hourglass.getRegistryName();
@@ -21,7 +21,14 @@ 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].toLowerCase(Locale.ROOT);
return LibMisc.MOD_ID + ":" + LibItemNames.MANA_RESOURCE_NAMES[i % LibItemNames.MANA_RESOURCE_NAMES.length].toLowerCase(Locale.ROOT);
}
});
LOOKUP.put("botania:vial", i -> {
if (i == 1) {
return LibMisc.MOD_ID + ":" + LibItemNames.FLASK;
} else {
return LibMisc.MOD_ID + ":" + LibItemNames.VIAL;
}
});
}
@@ -205,7 +205,8 @@ public final class ModItems {
public static final Item diviningRod = new ItemDiviningRod();
public static final Item gravityRod = new ItemGravityRod();
public static final Item manaInkwell = new ItemManaInkwell();
public static final Item vial = new ItemVial();
public static final Item vial = new ItemVial(LibItemNames.VIAL);
public static final Item flask = new ItemVial(LibItemNames.FLASK);
public static final Item brewVial = new ItemBrewVial();
public static final Item brewFlask = new ItemBrewFlask();
public static final Item bloodPendant = new ItemBloodPendant();
@@ -384,6 +385,7 @@ public final class ModItems {
r.register(gravityRod);
r.register(manaInkwell);
r.register(vial);
r.register(flask);
r.register(brewVial);
r.register(brewFlask);
r.register(bloodPendant);
@@ -490,8 +492,8 @@ public final class ModItems {
OreDictionary.registerOre(LibOreDict.MANAWEAVE_CLOTH, new ItemStack(manaweaveCloth));
OreDictionary.registerOre(LibOreDict.MANA_POWDER, new ItemStack(manaPowder));
OreDictionary.registerOre(LibOreDict.VIAL, new ItemStack(vial, 1, 0));
OreDictionary.registerOre(LibOreDict.FLASK, new ItemStack(vial, 1, 1));
OreDictionary.registerOre(LibOreDict.VIAL, new ItemStack(vial));
OreDictionary.registerOre(LibOreDict.FLASK, new ItemStack(flask));
BotaniaAPI.blackListItemFromLoonium(lexicon);
BotaniaAPI.blackListItemFromLoonium(overgrowthSeed);
@@ -17,7 +17,7 @@ import vazkii.botania.common.lib.LibItemNames;
public class ItemBrewFlask extends ItemBrewBase {
public ItemBrewFlask() {
super(LibItemNames.BREW_FLASK, 6, 24, new ItemStack(ModItems.vial, 1, 1));
super(LibItemNames.BREW_FLASK, 6, 24, new ItemStack(ModItems.flask));
}
}
@@ -10,63 +10,31 @@
*/
package vazkii.botania.common.item.brew;
import net.minecraft.client.renderer.block.model.ModelResourceLocation;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.item.ItemStack;
import net.minecraft.util.NonNullList;
import net.minecraftforge.client.model.ModelLoader;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
import vazkii.botania.api.brew.Brew;
import vazkii.botania.api.brew.IBrewContainer;
import vazkii.botania.common.item.ItemMod;
import vazkii.botania.common.item.ModItems;
import vazkii.botania.common.lib.LibItemNames;
import javax.annotation.Nonnull;
public class ItemVial extends ItemMod implements IBrewContainer {
public ItemVial() {
this(LibItemNames.VIAL);
}
public ItemVial(String name) {
super(name);
setHasSubtypes(true);
}
@Override
public void getSubItems(CreativeTabs tab, NonNullList<ItemStack> list) {
if(isInCreativeTab(tab)) {
for(int i = 0; i < 2; i++)
list.add(new ItemStack(this, 1, i));
}
}
@Nonnull
@Override
public String getUnlocalizedName(ItemStack par1ItemStack) {
return super.getUnlocalizedName(par1ItemStack) + par1ItemStack.getItemDamage();
}
@Override
public ItemStack getItemForBrew(Brew brew, ItemStack stack) {
ItemStack brewStack = new ItemStack(stack.getItemDamage() == 1 ? ModItems.brewFlask : ModItems.brewVial);
ItemStack brewStack = new ItemStack(this == ModItems.flask ? ModItems.brewFlask : ModItems.brewVial);
ItemBrewBase.setBrew(brewStack, brew);
return brewStack;
}
@Override
public int getManaCost(Brew brew, ItemStack stack) {
return brew.getManaCost() * (stack.getItemDamage() + 1);
if (this == ModItems.flask) {
return brew.getManaCost() * 2;
} else {
return brew.getManaCost();
}
}
@SideOnly(Side.CLIENT)
@Override
public void registerModels() {
ModelLoader.setCustomModelResourceLocation(this, 0, new ModelResourceLocation("botania:vial", "inventory"));
ModelLoader.setCustomModelResourceLocation(this, 1, new ModelResourceLocation("botania:flask", "inventory"));
}
}
@@ -61,7 +61,7 @@ public class PageBrew extends PageRecipe implements ITwoNamedPage {
ItemStack book = PlayerHelper.getFirstHeldItemClass(Minecraft.getMinecraft().player, ILexicon.class);
if(book != null && ((ILexicon) book.getItem()).isKnowledgeUnlocked(book, BotaniaAPI.elvenKnowledge)) {
renderItemAtLinePos(gui, 20, 2, y + 12, recipe.getOutput(new ItemStack(ModItems.vial)));
renderItemAtLinePos(gui, 20, 3, y + 12, recipe.getOutput(new ItemStack(ModItems.vial, 1, 1)));
renderItemAtLinePos(gui, 20, 3, y + 12, recipe.getOutput(new ItemStack(ModItems.flask)));
} else renderItemAtLinePos(gui, 0, -1, y + 12, recipe.getOutput(new ItemStack(ModItems.vial)));
int i = 0;