parent
e5b795fddc
commit
3328c4db74
|
@ -11,7 +11,8 @@ import java.util.List;
|
||||||
import java.util.zip.ZipEntry;
|
import java.util.zip.ZipEntry;
|
||||||
import java.util.zip.ZipInputStream;
|
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.creativetab.CreativeTabs;
|
||||||
import net.minecraft.init.Blocks;
|
import net.minecraft.init.Blocks;
|
||||||
import net.minecraft.init.Items;
|
import net.minecraft.init.Items;
|
||||||
|
|
|
@ -1,5 +1,6 @@
|
||||||
package WayofTime.alchemicalWizardry.api.altarRecipeRegistry;
|
package WayofTime.alchemicalWizardry.api.altarRecipeRegistry;
|
||||||
|
|
||||||
|
import java.util.ArrayList;
|
||||||
import java.util.Set;
|
import java.util.Set;
|
||||||
|
|
||||||
import net.minecraft.item.ItemStack;
|
import net.minecraft.item.ItemStack;
|
||||||
|
@ -16,6 +17,7 @@ public class AltarRecipe
|
||||||
public ItemStack requiredItem;
|
public ItemStack requiredItem;
|
||||||
public ItemStack result;
|
public ItemStack result;
|
||||||
public boolean useTag;
|
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)
|
public AltarRecipe(ItemStack result, ItemStack requiredItem, int minTier, int liquidRequired, int consumptionRate, int drainRate, boolean canBeFilled)
|
||||||
{
|
{
|
||||||
|
|
|
@ -41,13 +41,13 @@ public class ShapelessBloodOrbRecipe implements IRecipe
|
||||||
{
|
{
|
||||||
if (in instanceof IBloodOrb)
|
if (in instanceof IBloodOrb)
|
||||||
{ //If the item is an instanceof IBloodOrb then save the level of the orb
|
{ //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)
|
else if (in instanceof ItemStack)
|
||||||
{
|
{
|
||||||
if (((ItemStack)in).getItem() instanceof IBloodOrb)
|
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 input.add(((ItemStack) in).copy());
|
||||||
} else if (in instanceof Item)
|
} else if (in instanceof Item)
|
||||||
|
|
|
@ -27,10 +27,12 @@ import codechicken.nei.recipe.TemplateRecipeHandler;
|
||||||
public class NEIAltarRecipeHandler extends TemplateRecipeHandler {
|
public class NEIAltarRecipeHandler extends TemplateRecipeHandler {
|
||||||
public class CachedAltarRecipe extends CachedRecipe {
|
public class CachedAltarRecipe extends CachedRecipe {
|
||||||
PositionedStack input;
|
PositionedStack input;
|
||||||
|
// PositionedStack inputItems;
|
||||||
PositionedStack output;
|
PositionedStack output;
|
||||||
int tier, lp_amount, consumption, drain;
|
int tier, lp_amount, consumption, drain;
|
||||||
|
|
||||||
public CachedAltarRecipe(AltarRecipe recipe) {
|
public CachedAltarRecipe(AltarRecipe recipe) {
|
||||||
|
// inputItems = new PositionedStack(recipe.input, 38, 2, false);
|
||||||
input = new PositionedStack(recipe.requiredItem, 38, 2, false);
|
input = new PositionedStack(recipe.requiredItem, 38, 2, false);
|
||||||
output = new PositionedStack(recipe.result, 132, 32, false);
|
output = new PositionedStack(recipe.result, 132, 32, false);
|
||||||
tier = recipe.minTier;
|
tier = recipe.minTier;
|
||||||
|
|
|
@ -116,8 +116,6 @@ public class AlchemicalWizardryEventHooks
|
||||||
float prevHp = APISpellHelper.getCurrentAdditionalHP((EntityPlayer)event.entityLiving);
|
float prevHp = APISpellHelper.getCurrentAdditionalHP((EntityPlayer)event.entityLiving);
|
||||||
if(prevHp > 0)
|
if(prevHp > 0)
|
||||||
{
|
{
|
||||||
double originalDamage = event.ammount;
|
|
||||||
|
|
||||||
float recalculatedAmount = ArmorProperties.ApplyArmor(player, player.inventory.armorInventory, event.source, event.ammount);
|
float recalculatedAmount = ArmorProperties.ApplyArmor(player, player.inventory.armorInventory, event.source, event.ammount);
|
||||||
if (recalculatedAmount <= 0) return;
|
if (recalculatedAmount <= 0) return;
|
||||||
recalculatedAmount = SpellHelper.applyPotionDamageCalculations(player, event.source, recalculatedAmount); //Recalculated damage
|
recalculatedAmount = SpellHelper.applyPotionDamageCalculations(player, event.source, recalculatedAmount); //Recalculated damage
|
||||||
|
@ -336,7 +334,7 @@ public class AlchemicalWizardryEventHooks
|
||||||
|
|
||||||
String respawnRitual = "AW028SpawnWard";
|
String respawnRitual = "AW028SpawnWard";
|
||||||
|
|
||||||
Integer dimension = new Integer(event.world.provider.dimensionId);
|
int dimension = event.world.provider.dimensionId;
|
||||||
if (respawnMap.containsKey(dimension))
|
if (respawnMap.containsKey(dimension))
|
||||||
{
|
{
|
||||||
List<CoordAndRange> list = respawnMap.get(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);
|
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)
|
if (entityLiving instanceof EntityPlayer && entityLiving.worldObj.isRemote)
|
||||||
|
|
|
@ -301,7 +301,7 @@ public class SigilOfHolding extends EnergyItems
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
for (int i = 0; i < invSize; i++)
|
for (int i = 0; i <= invSize; i++)
|
||||||
{
|
{
|
||||||
if (inv[i] == null)
|
if (inv[i] == null)
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in a new issue