diff --git a/build.properties b/build.properties index 7317c1ef..384d5137 100644 --- a/build.properties +++ b/build.properties @@ -1,5 +1,5 @@ # -#Wed Nov 19 19:11:08 EST 2014 +#Thu Nov 20 10:50:27 EST 2014 mod_name=BloodMagic forge_version=10.13.2.1232 ccc_version=1.0.4.29 @@ -8,5 +8,5 @@ nei_version=1.0.3.64 package_group=com.wayoftime.bloodmagic mod_version=1.2.1-Beta minetweaker_version=Dev-1.7.10-3.0.9B -build_number=4 mc_version=1.7.10 +build_number=5 diff --git a/src/main/java/WayofTime/alchemicalWizardry/AlchemicalWizardry.java b/src/main/java/WayofTime/alchemicalWizardry/AlchemicalWizardry.java index 715e8fa6..2802a1ec 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/AlchemicalWizardry.java +++ b/src/main/java/WayofTime/alchemicalWizardry/AlchemicalWizardry.java @@ -919,6 +919,7 @@ public class AlchemicalWizardry GameRegistry.addRecipe(new ShapedBloodOrbRecipe(new ItemStack(ModItems.itemHarvestSigil), "mgm", "gsg", "mom", 's', etherealSlateStack, 'o', archmageBloodOrbStack, 'g', new ItemStack(Items.golden_hoe), 'm', new ItemStack(Blocks.dirt))); AltarRecipeRegistry.registerAltarRecipe(etherealSlateStack, demonSlateStack, 5, 30000, 40, 100, false); GameRegistry.addRecipe(new ShapedBloodOrbRecipe(new ItemStack(ModBlocks.bloodRune, 1, 5), "bsb", "grg", "bob", 's', etherealSlateStack, 'o', archmageBloodOrbStack, 'r', speedRuneStack, 'b', emptyBucketStack, 'g', goldIngotStack)); + GameRegistry.addRecipe(new ShapedBloodOrbRecipe(new ItemStack(ModItems.itemCompressionSigil), "pop", "csc", "obo", 'b', masterBloodOrbStack, 'p', new ItemStack(Blocks.piston), 'c', new ItemStack(Blocks.crafting_table), 's', demonSlateStack, 'o', obsidianStack)); AlchemyRecipeRegistry.registerRecipe(crackedRunicPlateStackCrafted, 10, new ItemStack[]{imbuedSlateStack, imbuedSlateStack, concentratedCatalystStack}, 4); AlchemyRecipeRegistry.registerRecipe(runicPlateStack, 30, new ItemStack[]{crackedRunicPlateStack, terraeStack}, 5); @@ -1071,7 +1072,8 @@ public class AlchemicalWizardry AlchemicalWizardry.logger.info("Loaded Harvestcraft Handlers!"); } - if(Loader.isModLoaded("MineTweaker3")) { + if(Loader.isModLoaded("MineTweaker3")) + { MineTweakerIntegration.register(); AlchemicalWizardry.logger.info("Loaded MineTweaker 3 Integration"); } diff --git a/src/main/java/WayofTime/alchemicalWizardry/BloodMagicConfiguration.java b/src/main/java/WayofTime/alchemicalWizardry/BloodMagicConfiguration.java index 887e2119..a11eba3a 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/BloodMagicConfiguration.java +++ b/src/main/java/WayofTime/alchemicalWizardry/BloodMagicConfiguration.java @@ -1,21 +1,22 @@ package WayofTime.alchemicalWizardry; -import WayofTime.alchemicalWizardry.api.rituals.Rituals; -import WayofTime.alchemicalWizardry.client.renderer.ColourThreshold; -import WayofTime.alchemicalWizardry.client.renderer.RenderHelper; -import WayofTime.alchemicalWizardry.common.summoning.meteor.MeteorParadigm; -import cpw.mods.fml.common.FMLCommonHandler; -import cpw.mods.fml.relauncher.Side; -import net.minecraft.entity.EntityList; -import net.minecraft.entity.EntityLivingBase; -import net.minecraftforge.common.config.Configuration; - import java.io.File; import java.lang.reflect.Modifier; import java.util.ArrayList; import java.util.List; import java.util.Map.Entry; +import net.minecraft.entity.EntityList; +import net.minecraft.entity.EntityLivingBase; +import net.minecraftforge.common.config.Configuration; +import WayofTime.alchemicalWizardry.api.rituals.Rituals; +import WayofTime.alchemicalWizardry.client.renderer.ColourThreshold; +import WayofTime.alchemicalWizardry.client.renderer.RenderHelper; +import WayofTime.alchemicalWizardry.common.items.BoundArmour; +import WayofTime.alchemicalWizardry.common.summoning.meteor.MeteorParadigm; +import cpw.mods.fml.common.FMLCommonHandler; +import cpw.mods.fml.relauncher.Side; + /** * Created with IntelliJ IDEA. * User: Pokefenn @@ -131,6 +132,8 @@ public class BloodMagicConfiguration AlchemicalWizardry.ritualDisabledSpawnWard = config.get("Ritual Blacklist", "Ward of Sacrosanctity", false).getBoolean(false); AlchemicalWizardry.ritualDisabledVeilOfEvil = config.get("Ritual Blacklist", "Veil of Evil", false).getBoolean(false); AlchemicalWizardry.ritualDisabledFullStomach = config.get("Ritual Blacklist", "Requiem of the Satiated Stomach", false).getBoolean(false); + + BoundArmour.tryComplexRendering = config.get("WimpySettings", "UseFancyBoundArmour", true).getBoolean(true); Side side = FMLCommonHandler.instance().getSide(); if (side == Side.CLIENT) diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/compress/AdvancedCompressionHandler.java b/src/main/java/WayofTime/alchemicalWizardry/common/compress/AdvancedCompressionHandler.java index 6a407234..72888fda 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/compress/AdvancedCompressionHandler.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/compress/AdvancedCompressionHandler.java @@ -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) diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/compress/BaseCompressionHandler.java b/src/main/java/WayofTime/alchemicalWizardry/common/compress/BaseCompressionHandler.java index e4ba0be9..a788e156 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/compress/BaseCompressionHandler.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/compress/BaseCompressionHandler.java @@ -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; diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/items/BoundArmour.java b/src/main/java/WayofTime/alchemicalWizardry/common/items/BoundArmour.java index 7ccb07bb..35c82fa3 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/items/BoundArmour.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/items/BoundArmour.java @@ -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) {