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

Added config to disable Bound Armour's custom model. Boo!

Browse source
This commit is contained in:
WayofTime 2014-11-20 11:42:43 -05:00
parent 5224b808c3
commit 2f1e79aa5d
6 changed files with 24 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/main/java/WayofTime/alchemicalWizardry/common/compress/AdvancedCompressionHandler.java
View file

@ -11,12 +11,7 @@ import WayofTime.alchemicalWizardry.api.compress.CompressionRegistry;
import WayofTime.alchemicalWizardry.common.spell.complex.effect.SpellHelper;
public class AdvancedCompressionHandler extends CompressionHandler
{
public AdvancedCompressionHandler()
{
super();
}
{
@Override
public ItemStack compressInventory(ItemStack[] inv, World world)
{
@ -81,15 +76,16 @@ public class AdvancedCompressionHandler extends CompressionHandler
if(kept <= 0 && needed > 0)
{
int remainingFromStack = Math.max(stackSize - used - needed, 0);
needed -= (stackSize - used - remainingFromStack);
if(doDrain)
{
invStack.stackSize = remainingFromStack;
invStack.stackSize = remainingFromStack + used;
if(invStack.stackSize <= 0)
{
inv[i] = null;
}
}
needed -= (stackSize - used - remainingFromStack);
}
if(needed <= 0)

2
src/main/java/WayofTime/alchemicalWizardry/common/compress/BaseCompressionHandler.java
View file

@ -83,7 +83,7 @@ public class BaseCompressionHandler extends CompressionHandler
int remainingFromStack = Math.max(stackSize - used - needed, 0);
if(doDrain)
{
invStack.stackSize = remainingFromStack;
invStack.stackSize = remainingFromStack + used;
if(invStack.stackSize <= 0)
{
inv[i] = null;

2
src/main/java/WayofTime/alchemicalWizardry/common/items/BoundArmour.java
View file

@ -42,7 +42,7 @@ public class BoundArmour extends ItemArmor implements IAlchemyGoggles, ISpecialA
private static IIcon leggingsIcon;
private static IIcon bootsIcon;
private static final boolean tryComplexRendering = true;
public static boolean tryComplexRendering = true;
public BoundArmour(int armorType)
{