From 3328c4db745e6278fbe16839c0280b69256385d8 Mon Sep 17 00:00:00 2001 From: Arcaratus Date: Mon, 6 Jul 2015 18:50:15 -0400 Subject: [PATCH] Fix #370, #367 --- .../WayofTime/alchemicalWizardry/AlchemicalWizardry.java | 3 ++- .../api/altarRecipeRegistry/AltarRecipe.java | 2 ++ .../api/items/ShapelessBloodOrbRecipe.java | 4 ++-- .../client/nei/NEIAltarRecipeHandler.java | 2 ++ .../common/AlchemicalWizardryEventHooks.java | 6 ++---- .../common/items/sigil/holding/SigilOfHolding.java | 2 +- 6 files changed, 11 insertions(+), 8 deletions(-) diff --git a/src/main/java/WayofTime/alchemicalWizardry/AlchemicalWizardry.java b/src/main/java/WayofTime/alchemicalWizardry/AlchemicalWizardry.java index 80af036a..b2b3e2e0 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/AlchemicalWizardry.java +++ b/src/main/java/WayofTime/alchemicalWizardry/AlchemicalWizardry.java @@ -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; diff --git a/src/main/java/WayofTime/alchemicalWizardry/api/altarRecipeRegistry/AltarRecipe.java b/src/main/java/WayofTime/alchemicalWizardry/api/altarRecipeRegistry/AltarRecipe.java index 50212fa9..7e6af770 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/api/altarRecipeRegistry/AltarRecipe.java +++ b/src/main/java/WayofTime/alchemicalWizardry/api/altarRecipeRegistry/AltarRecipe.java @@ -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 input = new ArrayList(); public AltarRecipe(ItemStack result, ItemStack requiredItem, int minTier, int liquidRequired, int consumptionRate, int drainRate, boolean canBeFilled) { diff --git a/src/main/java/WayofTime/alchemicalWizardry/api/items/ShapelessBloodOrbRecipe.java b/src/main/java/WayofTime/alchemicalWizardry/api/items/ShapelessBloodOrbRecipe.java index 86bbb56f..80662b3b 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/api/items/ShapelessBloodOrbRecipe.java +++ b/src/main/java/WayofTime/alchemicalWizardry/api/items/ShapelessBloodOrbRecipe.java @@ -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) diff --git a/src/main/java/WayofTime/alchemicalWizardry/client/nei/NEIAltarRecipeHandler.java b/src/main/java/WayofTime/alchemicalWizardry/client/nei/NEIAltarRecipeHandler.java index 7029d5f4..79f216dd 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/client/nei/NEIAltarRecipeHandler.java +++ b/src/main/java/WayofTime/alchemicalWizardry/client/nei/NEIAltarRecipeHandler.java @@ -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; diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/AlchemicalWizardryEventHooks.java b/src/main/java/WayofTime/alchemicalWizardry/common/AlchemicalWizardryEventHooks.java index 2899815d..ac2957d7 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/AlchemicalWizardryEventHooks.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/AlchemicalWizardryEventHooks.java @@ -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 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) diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/holding/SigilOfHolding.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/holding/SigilOfHolding.java index c30b4cfb..7740a287 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/holding/SigilOfHolding.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/sigil/holding/SigilOfHolding.java @@ -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) {