lauchmelder/BloodMagic
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

this doesn't compile yet, but have something to peek at

Browse source
This commit is contained in:
Nicholas Ignoffo 2017-08-14 20:53:42 -07:00
parent 973f1019a5
commit 5fcdd978d7
329 changed files with 3247 additions and 2953 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/main/java/WayofTime/bloodmagic/recipe/alchemyTable/AlchemyTableDyeableRecipe.java
View file

@ -91,7 +91,7 @@ public class AlchemyTableDyeableRecipe extends AlchemyTableRecipe
outputStack.setTagCompound(new NBTTagCompound());
}
outputStack.getTagCompound().setString(Constants.NBT.COLOR, String.valueOf(dyeColor.getMapColor().colorValue));
outputStack.getTagCompound().setString(Constants.NBT.COLOR, String.valueOf(dyeColor.getColorValue()));
return outputStack;
}

6
src/main/java/WayofTime/bloodmagic/recipe/alchemyTable/AlchemyTablePotionAugmentRecipe.java
View file

@ -7,7 +7,7 @@ import net.minecraft.potion.Potion;
import net.minecraft.potion.PotionEffect;
import net.minecraft.potion.PotionUtils;
import WayofTime.bloodmagic.potion.BMPotionUtils;
import WayofTime.bloodmagic.registry.ModItems;
import WayofTime.bloodmagic.registry.RegistrarBloodMagicItems;
public class AlchemyTablePotionAugmentRecipe extends AlchemyTablePotionRecipe
{
@ -60,7 +60,7 @@ public class AlchemyTablePotionAugmentRecipe extends AlchemyTablePotionRecipe
{
if (inputStack == null)
{
ItemStack outputStack = new ItemStack(ModItems.POTION_FLASK);
ItemStack outputStack = new ItemStack(RegistrarBloodMagicItems.POTION_FLASK);
List<PotionEffect> effectList = new ArrayList<PotionEffect>();
int potionLength = wantedPotion.isInstant() ? 1 : BMPotionUtils.getAugmentedLength(baseEffect.getDuration(), lengthAugment, powerAugment - baseEffect.getAmplifier());
@ -95,7 +95,7 @@ public class AlchemyTablePotionAugmentRecipe extends AlchemyTablePotionRecipe
public static ItemStack getAugmentedPotionFlask(PotionEffect baseEffect)
{
ItemStack outputStack = new ItemStack(ModItems.POTION_FLASK);
ItemStack outputStack = new ItemStack(RegistrarBloodMagicItems.POTION_FLASK);
List<PotionEffect> effectList = new ArrayList<PotionEffect>();
effectList.add(baseEffect);

10
src/main/java/WayofTime/bloodmagic/recipe/alchemyTable/AlchemyTablePotionRecipe.java
View file

@ -9,11 +9,11 @@ import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;
import net.minecraftforge.oredict.OreDictionary;
import WayofTime.bloodmagic.api.recipe.AlchemyTableRecipe;
import WayofTime.bloodmagic.registry.ModItems;
import WayofTime.bloodmagic.registry.RegistrarBloodMagicItems;
public class AlchemyTablePotionRecipe extends AlchemyTableRecipe
{
public static final ItemStack basePotionFlaskStack = new ItemStack(ModItems.POTION_FLASK, 1, OreDictionary.WILDCARD_VALUE);
public static final ItemStack basePotionFlaskStack = new ItemStack(RegistrarBloodMagicItems.POTION_FLASK, 1, OreDictionary.WILDCARD_VALUE);
protected PotionEffect baseEffect;
public static final int temporaryMaximumEffectsOnThePotionFlaskYesThisIsALongFieldItIsJustSoIRemember = 3;
@ -50,7 +50,7 @@ public class AlchemyTablePotionRecipe extends AlchemyTableRecipe
if (slot != null)
{
boolean match = slot.getItem() == ModItems.POTION_FLASK;
boolean match = slot.getItem() == RegistrarBloodMagicItems.POTION_FLASK;
if (match)
{
@ -91,7 +91,7 @@ public class AlchemyTablePotionRecipe extends AlchemyTableRecipe
}
if (match) {
if (next instanceof ItemStack && ((ItemStack) next).getItem() == ModItems.POTION_FLASK) {
if (next instanceof ItemStack && ((ItemStack) next).getItem() == RegistrarBloodMagicItems.POTION_FLASK) {
if (!isPotionFlaskValidInput(slot)) {
break;
}
@ -135,7 +135,7 @@ public class AlchemyTablePotionRecipe extends AlchemyTableRecipe
{
if (inputStack.isEmpty())
{
ItemStack outputStack = new ItemStack(ModItems.POTION_FLASK);
ItemStack outputStack = new ItemStack(RegistrarBloodMagicItems.POTION_FLASK);
List<PotionEffect> effectList = new ArrayList<PotionEffect>();
effectList.add(baseEffect);