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

Fix #370, #367

Browse source
This commit is contained in:
Arcaratus 2015-07-06 18:50:15 -04:00
parent e5b795fddc
commit 3328c4db74
6 changed files with 11 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/main/java/WayofTime/alchemicalWizardry/AlchemicalWizardry.java
View file

@ -11,7 +11,8 @@ import java.util.List;
import java.util.zip.ZipEntry;
import java.util.zip.ZipInputStream;
import WayofTime.alchemicalWizardry.common.thread.CommandDownloadGAPI;
import WayofTime.alchemicalWizardry.common.thread.CommandDown
loadGAPI;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.init.Blocks;
import net.minecraft.init.Items;

2
src/main/java/WayofTime/alchemicalWizardry/api/altarRecipeRegistry/AltarRecipe.java
View file

@ -1,5 +1,6 @@
package WayofTime.alchemicalWizardry.api.altarRecipeRegistry;
import java.util.ArrayList;
import java.util.Set;
import net.minecraft.item.ItemStack;
@ -16,6 +17,7 @@ public class AltarRecipe
public ItemStack requiredItem;
public ItemStack result;
public boolean useTag;
public ArrayList<Object> input = new ArrayList<Object>();
public AltarRecipe(ItemStack result, ItemStack requiredItem, int minTier, int liquidRequired, int consumptionRate, int drainRate, boolean canBeFilled)
{

4
src/main/java/WayofTime/alchemicalWizardry/api/items/ShapelessBloodOrbRecipe.java
View file

@ -41,13 +41,13 @@ public class ShapelessBloodOrbRecipe implements IRecipe
{
if (in instanceof IBloodOrb)
{ //If the item is an instanceof IBloodOrb then save the level of the orb
input.add((Integer) (((IBloodOrb) in).getOrbLevel()));
input.add(((IBloodOrb) in).getOrbLevel());
}
else if (in instanceof ItemStack)
{
if (((ItemStack)in).getItem() instanceof IBloodOrb)
{
input.add((Integer) (((IBloodOrb) ((ItemStack)in).getItem()).getOrbLevel()));
input.add(((IBloodOrb) ((ItemStack)in).getItem()).getOrbLevel());
}
else input.add(((ItemStack) in).copy());
} else if (in instanceof Item)

2
src/main/java/WayofTime/alchemicalWizardry/client/nei/NEIAltarRecipeHandler.java
View file

@ -27,10 +27,12 @@ import codechicken.nei.recipe.TemplateRecipeHandler;
public class NEIAltarRecipeHandler extends TemplateRecipeHandler {
public class CachedAltarRecipe extends CachedRecipe {
PositionedStack input;
// PositionedStack inputItems;
PositionedStack output;
int tier, lp_amount, consumption, drain;
public CachedAltarRecipe(AltarRecipe recipe) {
// inputItems = new PositionedStack(recipe.input, 38, 2, false);
input = new PositionedStack(recipe.requiredItem, 38, 2, false);
output = new PositionedStack(recipe.result, 132, 32, false);
tier = recipe.minTier;

6
src/main/java/WayofTime/alchemicalWizardry/common/AlchemicalWizardryEventHooks.java
View file

@ -116,8 +116,6 @@ public class AlchemicalWizardryEventHooks
float prevHp = APISpellHelper.getCurrentAdditionalHP((EntityPlayer)event.entityLiving);
if(prevHp > 0)
{
double originalDamage = event.ammount;
float recalculatedAmount = ArmorProperties.ApplyArmor(player, player.inventory.armorInventory, event.source, event.ammount);
if (recalculatedAmount <= 0) return;
recalculatedAmount = SpellHelper.applyPotionDamageCalculations(player, event.source, recalculatedAmount); //Recalculated damage
@ -336,7 +334,7 @@ public class AlchemicalWizardryEventHooks
String respawnRitual = "AW028SpawnWard";
Integer dimension = new Integer(event.world.provider.dimensionId);
int dimension = event.world.provider.dimensionId;
if (respawnMap.containsKey(dimension))
{
List<CoordAndRange> list = respawnMap.get(dimension);
@ -524,7 +522,7 @@ public class AlchemicalWizardryEventHooks
NewPacketHandler.INSTANCE.sendTo(NewPacketHandler.getLPPacket(SoulNetworkHandler.getCurrentEssence(ownerName), SoulNetworkHandler.getMaximumForOrbTier(SoulNetworkHandler.getCurrentMaxOrb(ownerName))), (EntityPlayerMP)entityLiving);
}
}
ObfuscationReflectionHelper.setPrivateValue(PlayerCapabilities.class, ((EntityPlayer) event.entityLiving).capabilities, 0.1F, "walkSpeed", "g", "field_75097_g");
// ObfuscationReflectionHelper.setPrivateValue(PlayerCapabilities.class, ((EntityPlayer) event.entityLiving).capabilities, 0.1F, "walkSpeed", "g", "field_75097_g");
}
if (entityLiving instanceof EntityPlayer && entityLiving.worldObj.isRemote)

2
src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/holding/SigilOfHolding.java
View file

@ -301,7 +301,7 @@ public class SigilOfHolding extends EnergyItems
return;
}
for (int i = 0; i < invSize; i++)
for (int i = 0; i <= invSize; i++)
{
if (inv[i] == null)
{