diff --git a/1.7.2/main/java/WayofTime/alchemicalWizardry/AlchemicalWizardry.java b/1.7.2/main/java/WayofTime/alchemicalWizardry/AlchemicalWizardry.java index d773cb1a..044e06d1 100644 --- a/1.7.2/main/java/WayofTime/alchemicalWizardry/AlchemicalWizardry.java +++ b/1.7.2/main/java/WayofTime/alchemicalWizardry/AlchemicalWizardry.java @@ -743,6 +743,7 @@ public class AlchemicalWizardry ItemStack costCoreStack = new ItemStack(ModItems.baseItems,1,23); ItemStack potencyCoreStack = new ItemStack(ModItems.baseItems,1,24); ItemStack obsidianBraceStack = new ItemStack(ModItems.baseItems,1,25); + ItemStack toolCoreStack = new ItemStack(ModItems.baseItems,1,26); ItemStack magicalesCraftedCableStack = new ItemStack(ModItems.baseItems,5,2); ItemStack crackedRunicPlateStackCrafted = new ItemStack(ModItems.baseItems,2,15); @@ -758,6 +759,7 @@ public class AlchemicalWizardry GameRegistry.addRecipe(new ShapedBloodOrbRecipe(projectileCoreStack, "mbm","aca","mom",'c', emptyCoreStack,'b',weakBloodShardStack,'m', magicalesStack,'o', magicianBloodOrbStack,'a',new ItemStack(Items.arrow))); GameRegistry.addRecipe(new ShapedBloodOrbRecipe(selfCoreStack,"sbs","ncn","sos",'c', emptyCoreStack, 's',sanctusStack,'b', weakBloodShardStack,'o', magicianBloodOrbStack,'n',glowstoneDustStack)); GameRegistry.addRecipe(new ShapedBloodOrbRecipe(meleeCoreStack,"sbs","ncn","sos",'c', emptyCoreStack, 's',incendiumStack,'b', weakBloodShardStack,'o', magicianBloodOrbStack,'n',new ItemStack(Items.fire_charge))); + GameRegistry.addRecipe(new ShapedBloodOrbRecipe(meleeCoreStack,"sbs","ncn","sos",'c', emptyCoreStack, 's',incendiumStack,'b', weakBloodShardStack,'o', magicianBloodOrbStack,'n',new ItemStack(Blocks.obsidian))); GameRegistry.addRecipe(paradigmBackPlateStack,"isi","rgr","isi",'i',ironIngotStack,'r',stoneStack,'g',goldIngotStack,'s',reinforcedSlateStack); GameRegistry.addRecipe(outputCableStack, " si","s c"," si",'s',stoneStack,'i',ironIngotStack,'c',simpleCatalystStack); @@ -787,6 +789,7 @@ public class AlchemicalWizardry GameRegistry.addRecipe(new ItemStack(ModBlocks.blockSpellParadigm,1,0),"gb ","pcw","gb ",'p',paradigmBackPlateStack,'c', projectileCoreStack,'g',goldIngotStack,'b',stoneBraceStack,'w',outputCableStack); GameRegistry.addRecipe(new ItemStack(ModBlocks.blockSpellParadigm,1,1),"gb ","pcw","gb ",'p',paradigmBackPlateStack,'c', selfCoreStack,'g',goldIngotStack,'b',stoneBraceStack,'w',outputCableStack); GameRegistry.addRecipe(new ItemStack(ModBlocks.blockSpellParadigm,1,2),"gb ","pcw","gb ",'p',paradigmBackPlateStack,'c', meleeCoreStack,'g',goldIngotStack,'b',stoneBraceStack,'w',outputCableStack); + GameRegistry.addRecipe(new ItemStack(ModBlocks.blockSpellParadigm,1,3),"gb ","pcw","gb ",'p',paradigmBackPlateStack,'c', meleeCoreStack,'g',goldIngotStack,'b',stoneBraceStack,'w',outputCableStack); GameRegistry.addRecipe(new ItemStack(ModBlocks.blockSpellEffect,1,0),"bgb","ico","bgb",'c',flameCoreStack,'b',stoneBraceStack,'g',goldIngotStack,'i',inputCableStack,'o',outputCableStack); GameRegistry.addRecipe(new ItemStack(ModBlocks.blockSpellEffect,1,1),"bgb","ico","bgb",'c',iceCoreStack,'b',stoneBraceStack,'g',goldIngotStack,'i',inputCableStack,'o',outputCableStack); diff --git a/1.7.2/main/java/WayofTime/alchemicalWizardry/common/demonVillage/BlockSet.java b/1.7.2/main/java/WayofTime/alchemicalWizardry/common/demonVillage/BlockSet.java index 008ef748..25398812 100644 --- a/1.7.2/main/java/WayofTime/alchemicalWizardry/common/demonVillage/BlockSet.java +++ b/1.7.2/main/java/WayofTime/alchemicalWizardry/common/demonVillage/BlockSet.java @@ -14,9 +14,9 @@ import cpw.mods.fml.common.registry.GameRegistry.UniqueIdentifier; public class BlockSet { - private String blockid; - private int[] metadata; - private List positions; + protected String blockid; + protected int[] metadata; + protected List positions; public BlockSet() { diff --git a/1.7.2/main/java/WayofTime/alchemicalWizardry/common/demonVillage/TileBlockSet.java b/1.7.2/main/java/WayofTime/alchemicalWizardry/common/demonVillage/TileBlockSet.java new file mode 100644 index 00000000..2209f58c --- /dev/null +++ b/1.7.2/main/java/WayofTime/alchemicalWizardry/common/demonVillage/TileBlockSet.java @@ -0,0 +1,8 @@ +package WayofTime.alchemicalWizardry.common.demonVillage; + +import net.minecraft.nbt.NBTTagCompound; + +public class TileBlockSet extends BlockSet +{ + public NBTTagCompound tag; +} diff --git a/1.7.2/main/java/WayofTime/alchemicalWizardry/common/items/ItemComponents.java b/1.7.2/main/java/WayofTime/alchemicalWizardry/common/items/ItemComponents.java index 9f9d949f..9f8189f4 100644 --- a/1.7.2/main/java/WayofTime/alchemicalWizardry/common/items/ItemComponents.java +++ b/1.7.2/main/java/WayofTime/alchemicalWizardry/common/items/ItemComponents.java @@ -21,7 +21,7 @@ import cpw.mods.fml.relauncher.SideOnly; public class ItemComponents extends Item { - private static final String[] ITEM_NAMES = new String[]{"QuartzRod", "EmptyCore", "MagicalesCable", "WoodBrace", "StoneBrace", "ProjectileCore", "SelfCore","MeleeCore","ParadigmBackPlate","OutputCable","FlameCore","IcyCore","GustCore","EarthenCore","InputCable","CrackedRunicPlate","RunicPlate","ScribedRunicPlate","DefaultCore","OffensiveCore","DefensiveCore","EnvironmentalCore","PowerCore","CostCore","PotencyCore","ObsidianBrace"}; + private static final String[] ITEM_NAMES = new String[]{"QuartzRod", "EmptyCore", "MagicalesCable", "WoodBrace", "StoneBrace", "ProjectileCore", "SelfCore","MeleeCore","ParadigmBackPlate","OutputCable","FlameCore","IcyCore","GustCore","EarthenCore","InputCable","CrackedRunicPlate","RunicPlate","ScribedRunicPlate","DefaultCore","OffensiveCore","DefensiveCore","EnvironmentalCore","PowerCore","CostCore","PotencyCore","ObsidianBrace","ToolCore"}; @SideOnly(Side.CLIENT) private IIcon[] icons; diff --git a/1.7.2/main/java/WayofTime/alchemicalWizardry/common/rituals/RitualEffectItemSuction.java b/1.7.2/main/java/WayofTime/alchemicalWizardry/common/rituals/RitualEffectItemSuction.java index 24915f1c..7c712ec7 100644 --- a/1.7.2/main/java/WayofTime/alchemicalWizardry/common/rituals/RitualEffectItemSuction.java +++ b/1.7.2/main/java/WayofTime/alchemicalWizardry/common/rituals/RitualEffectItemSuction.java @@ -14,7 +14,6 @@ import net.minecraft.potion.PotionEffect; import net.minecraft.server.MinecraftServer; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; -import WayofTime.alchemicalWizardry.ModBlocks; import WayofTime.alchemicalWizardry.api.rituals.IMasterRitualStone; import WayofTime.alchemicalWizardry.api.rituals.RitualComponent; import WayofTime.alchemicalWizardry.api.rituals.RitualEffect; @@ -58,7 +57,11 @@ public class RitualEffectItemSuction extends RitualEffect return; } - if (currentEssence < this.getCostPerRefresh()*100) + Block block = world.getBlock(x, y-1, z); + int range = this.getRange(block); + int refCost = this.getCostMod(block); + + if (currentEssence < this.getCostPerRefresh()*100*refCost) { EntityPlayer entityOwner = MinecraftServer.getServer().getConfigurationManager().getPlayerForUsername(owner); @@ -132,7 +135,7 @@ public class RitualEffectItemSuction extends RitualEffect if(count>0) { - data.currentEssence = currentEssence - this.getCostPerRefresh()*Math.min(count, 100); + data.currentEssence = currentEssence - this.getCostPerRefresh()*Math.min(count, 100)*refCost; data.markDirty(); return; } @@ -144,6 +147,48 @@ public class RitualEffectItemSuction extends RitualEffect { return 5; } + + public int getRange(Block block) + { + if(block == null) + { + return 10; + } + if(block == Blocks.iron_block) + { + return 15; + } + if(block == Blocks.gold_block) + { + return 25; + } + if(block == Blocks.diamond_block) + { + return 40; + } + return 10; + } + + public int getCostMod(Block block) + { + if(block == null) + { + return 1; + } + if(block == Blocks.iron_block) + { + return 2; + } + if(block == Blocks.gold_block) + { + return 3; + } + if(block == Blocks.diamond_block) + { + return 4; + } + return 1; + } @Override public List getRitualComponentList() diff --git a/1.7.2/main/java/WayofTime/alchemicalWizardry/common/spell/complex/SpellParadigmTool.java b/1.7.2/main/java/WayofTime/alchemicalWizardry/common/spell/complex/SpellParadigmTool.java index a9390285..16b1498f 100644 --- a/1.7.2/main/java/WayofTime/alchemicalWizardry/common/spell/complex/SpellParadigmTool.java +++ b/1.7.2/main/java/WayofTime/alchemicalWizardry/common/spell/complex/SpellParadigmTool.java @@ -48,6 +48,7 @@ public class SpellParadigmTool extends SpellParadigm private HashMap digSpeed; private HashMap maxDamageHash; private HashMap critChanceHash; + private HashMap durationHash; //ticks private HashMap toolInfoString; @@ -66,6 +67,8 @@ public class SpellParadigmTool extends SpellParadigm this.breakBlockEffectList = new LinkedList(); this.itemManipulatorEffectList = new LinkedList(); this.digAreaEffectList = new LinkedList(); + this.specialDamageEffectList = new LinkedList(); + this.durationHash = new HashMap(); this.toolInfoString = new HashMap(); this.critChanceHash = new HashMap(); @@ -73,12 +76,12 @@ public class SpellParadigmTool extends SpellParadigm this.maxDamage = 5; this.harvestLevel = new HashMap(); - this.harvestLevel.put("pickaxe", 2); + this.harvestLevel.put("pickaxe", -1); this.harvestLevel.put("shovel", -1); this.harvestLevel.put("axe", -1); this.digSpeed = new HashMap(); - this.digSpeed.put("pickaxe", 6.0f); + this.digSpeed.put("pickaxe", 1.0f); this.digSpeed.put("shovel", 1.0f); this.digSpeed.put("axe", 1.0f); @@ -88,7 +91,9 @@ public class SpellParadigmTool extends SpellParadigm this.fortuneLevel = 0; this.silkTouch = false; - this.duration = 2400; + this.duration = 0; + + this.durationHash.put("default", 2400); //this.addRightClickEffect(new RightClickTunnel(0,0,0)); @@ -178,6 +183,11 @@ public class SpellParadigmTool extends SpellParadigm itemTool.setToolListString(toolStack, toolStringList); + for(Integer integ : this.durationHash.values()) + { + this.duration += integ; + } + itemTool.setDuration(toolStack, world, this.duration); itemTool.loadParadigmIntoStack(toolStack, this.bufferedEffectList); @@ -453,6 +463,11 @@ public class SpellParadigmTool extends SpellParadigm this.critChanceHash.put(key, chance); } + public void addDuration(String key, int dur) + { + this.durationHash.put(key, dur); + } + public float getCritChance() { float chance = 0.0f; diff --git a/1.7.2/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/SpellEffectFire.java b/1.7.2/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/SpellEffectFire.java index 48595b37..a4027390 100644 --- a/1.7.2/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/SpellEffectFire.java +++ b/1.7.2/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/SpellEffectFire.java @@ -17,6 +17,7 @@ import WayofTime.alchemicalWizardry.common.spell.complex.effect.impactEffects.fi import WayofTime.alchemicalWizardry.common.spell.complex.effect.impactEffects.fire.SelfEnvironmentalFire; import WayofTime.alchemicalWizardry.common.spell.complex.effect.impactEffects.fire.SelfOffensiveFire; import WayofTime.alchemicalWizardry.common.spell.complex.effect.impactEffects.fire.ToolDefaultFire; +import WayofTime.alchemicalWizardry.common.spell.complex.effect.impactEffects.fire.ToolEnvironmentalFire; import WayofTime.alchemicalWizardry.common.spell.complex.effect.impactEffects.fire.ToolOffensiveFire; public class SpellEffectFire extends SpellEffect @@ -181,15 +182,21 @@ public class SpellEffectFire extends SpellEffect } @Override - public void defensiveModificationTool(SpellParadigmTool parad) { - // TODO Auto-generated method stub + public void defensiveModificationTool(SpellParadigmTool parad) + { + parad.addCritChance("defFire", this.potencyEnhancement); + parad.addDuration("defFire", 1200 * this.powerEnhancement); + + parad.addToolString("defFire", "Unbreaking" + " " + SpellHelper.getNumeralForInt(this.powerEnhancement + 1)); } @Override - public void environmentalModificationTool(SpellParadigmTool parad) { - // TODO Auto-generated method stub + public void environmentalModificationTool(SpellParadigmTool parad) + { + parad.addBlockBreakEffect(new ToolEnvironmentalFire(this.powerEnhancement,this.potencyEnhancement,this.costEnhancement)); + parad.addToolString("envFire", "Magma Plume" + " " + SpellHelper.getNumeralForInt(this.powerEnhancement + 1)); } @Override @@ -201,18 +208,18 @@ public class SpellEffectFire extends SpellEffect @Override protected int getCostForOffenseTool() { - return (int)(0); //TODO + return (int)(1000 * (1 + this.powerEnhancement*0.3f) * (1 + this.potencyEnhancement*0.2f) * Math.pow(0.85, costEnhancement)); } @Override - protected int getCostForDefenseTool() { - // TODO Auto-generated method stub - return 0; + protected int getCostForDefenseTool() + { + return (int)(500 * (1 + this.powerEnhancement*0.5f) * (1 + this.potencyEnhancement) * Math.pow(0.85, costEnhancement)); } @Override - protected int getCostForEnvironmentTool() { - // TODO Auto-generated method stub + protected int getCostForEnvironmentTool() + { return 0; } } diff --git a/1.7.2/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/impactEffects/fire/ToolEnvironmentalFire.java b/1.7.2/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/impactEffects/fire/ToolEnvironmentalFire.java new file mode 100644 index 00000000..cfa1aa8b --- /dev/null +++ b/1.7.2/main/java/WayofTime/alchemicalWizardry/common/spell/complex/effect/impactEffects/fire/ToolEnvironmentalFire.java @@ -0,0 +1,47 @@ +package WayofTime.alchemicalWizardry.common.spell.complex.effect.impactEffects.fire; + +import java.util.Random; + +import net.minecraft.block.Block; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.init.Blocks; +import net.minecraft.item.ItemStack; +import net.minecraft.world.World; +import net.minecraftforge.common.util.ForgeDirection; +import WayofTime.alchemicalWizardry.common.spell.complex.effect.impactEffects.tool.OnBreakBlockEffect; + +public class ToolEnvironmentalFire extends OnBreakBlockEffect +{ + public ToolEnvironmentalFire(int power, int potency, int cost) + { + super(power, potency, cost); + } + + @Override + public int onBlockBroken(ItemStack container, World world, EntityPlayer player, Block block, int meta, int x, int y, int z, ForgeDirection sideBroken) + { + int amount = 0; + int cost = (int)(250 * (1 - 0.1f*powerUpgrades) * Math.pow(0.85, costUpgrades)); + int radius = this.powerUpgrades; + float chance = 0.35f + 0.15f*this.potencyUpgrades; + + for(int i=-radius; i<=radius; i++) + { + for(int j=-radius; j<=radius; j++) + { + for(int k=-radius; k<=radius; k++) + { + Block blockAffected = world.getBlock(x + i -sideBroken.offsetX, y + j, z + k - sideBroken.offsetZ); + + if((new Random().nextFloat() <= chance) && (blockAffected == Blocks.gravel || blockAffected == Blocks.stone || blockAffected == Blocks.cobblestone)) + { + world.setBlock(x + i -sideBroken.offsetX, y + j, z + k - sideBroken.offsetZ, Blocks.lava); + amount += cost; + } + } + } + } + + return amount; + } +} diff --git a/1.7.2/main/java/WayofTime/alchemicalWizardry/common/tileEntity/TEDemonPortal.java b/1.7.2/main/java/WayofTime/alchemicalWizardry/common/tileEntity/TEDemonPortal.java index 4f67ce35..b9273060 100644 --- a/1.7.2/main/java/WayofTime/alchemicalWizardry/common/tileEntity/TEDemonPortal.java +++ b/1.7.2/main/java/WayofTime/alchemicalWizardry/common/tileEntity/TEDemonPortal.java @@ -47,6 +47,11 @@ public class TEDemonPortal extends TileEntity private boolean isInitialized; + public int houseCooldown; + public int roadCooldown; + public int tier; //Tier of the demon portal - Should select buildings 2 below to this + public int totalPoints; + public TEDemonPortal() { super(); @@ -71,6 +76,9 @@ public class TEDemonPortal extends TileEntity isInitialized = false; this.setGridSpace(0, 0, new GridSpace(GridSpace.MAIN_PORTAL, yCoord)); + + this.houseCooldown = 0; + this.roadCooldown = 0; } public void initialize() @@ -87,6 +95,9 @@ public class TEDemonPortal extends TileEntity if(Math.abs(xIndex) == 1 || Math.abs(zIndex) == 1) { this.setGridSpace(xIndex, zIndex, new GridSpace(GridSpace.ROAD,yCoord)); + }else if(xIndex == 0 && zIndex == 0) + { + this.setGridSpace(0, 0, new GridSpace(GridSpace.MAIN_PORTAL, yCoord)); }else { this.setGridSpace(xIndex, zIndex, new GridSpace()); @@ -94,6 +105,9 @@ public class TEDemonPortal extends TileEntity } } + this.houseCooldown = 1000; + this.roadCooldown = 100; + isInitialized = true; } @@ -105,6 +119,8 @@ public class TEDemonPortal extends TileEntity this.negZRadius = par1NBTTagCompound.getInteger("negZRadius"); this.posXRadius = par1NBTTagCompound.getInteger("posXRadius"); this.posZRadius = par1NBTTagCompound.getInteger("posZRadius"); + this.houseCooldown = par1NBTTagCompound.getInteger("houseCooldown"); + this.roadCooldown = par1NBTTagCompound.getInteger("roadCooldown"); area = new GridSpace[negXRadius + posXRadius + 1][negZRadius + posZRadius + 1]; @@ -134,6 +150,8 @@ public class TEDemonPortal extends TileEntity par1NBTTagCompound.setInteger("negZRadius", negZRadius); par1NBTTagCompound.setInteger("posXRadius", posXRadius); par1NBTTagCompound.setInteger("posZRadius", posZRadius); + par1NBTTagCompound.setInteger("houseCooldown", houseCooldown); + par1NBTTagCompound.setInteger("roadCooldown", roadCooldown); NBTTagList gridList = new NBTTagList(); @@ -163,7 +181,7 @@ public class TEDemonPortal extends TileEntity par1NBTTagCompound.setBoolean("init", isInitialized); } - public void createRandomRoad() + public int createRandomRoad() //Return the number of road spaces { int next = rand.nextInt(4); ForgeDirection dir; @@ -200,7 +218,7 @@ public class TEDemonPortal extends TileEntity if(directions.size() <= 0) { - return; + return 0; } int maxDistance = 5; @@ -223,12 +241,14 @@ public class TEDemonPortal extends TileEntity if(dominantDirection == null) { - return; + return 0; } System.out.println("I got here!"); System.out.println("Distance: " + distance + " Direction: " + dominantDirection.toString() + " yLevel: " + yLevel); this.createGriddedRoad(x, yLevel, z, dominantDirection, distance+1, true); + + return distance; } public List findValidExtentionDirection(int x, int z) @@ -732,6 +752,9 @@ public class TEDemonPortal extends TileEntity if(ForgeDirection.getOrientation(side) == ForgeDirection.UP) { this.createRandomBuilding(DemonBuilding.BUILDING_HOUSE, 0); + }else if(ForgeDirection.getOrientation(side) == ForgeDirection.DOWN) + { + this.createRandomBuilding(DemonBuilding.BUILDING_PORTAL, 0); }else { this.createRandomRoad(); @@ -766,7 +789,7 @@ public class TEDemonPortal extends TileEntity for(int i=2; i<6; i++) { ForgeDirection testDir = ForgeDirection.getOrientation(i); - if(this.getGridSpace(x + testDir.offsetX, z + testDir.offsetZ).isEmpty()) + //if(this.getGridSpace(x + testDir.offsetX, z + testDir.offsetZ).isEmpty()) { directions.add(testDir); } @@ -783,6 +806,10 @@ public class TEDemonPortal extends TileEntity { for(DemonBuilding build : TEDemonPortal.buildingList) { + if(build.buildingType != DemonBuilding.BUILDING_PORTAL) + { + continue; + } if(schemMap.containsKey(nextDir)) { schemMap.get(nextDir).add(build); @@ -813,6 +840,7 @@ public class TEDemonPortal extends TileEntity if(block == ModBlocks.blockDemonPortal) { BlockTeleposer.swapBlocks(worldObj, worldObj, xCoord, i, zCoord, xCoord, yLevel + yOffset, zCoord); + break; } } diff --git a/1.7.2/main/java/WayofTime/alchemicalWizardry/common/tileEntity/TESchematicSaver.java b/1.7.2/main/java/WayofTime/alchemicalWizardry/common/tileEntity/TESchematicSaver.java index 8558b667..8accb62e 100644 --- a/1.7.2/main/java/WayofTime/alchemicalWizardry/common/tileEntity/TESchematicSaver.java +++ b/1.7.2/main/java/WayofTime/alchemicalWizardry/common/tileEntity/TESchematicSaver.java @@ -16,7 +16,7 @@ import com.google.gson.GsonBuilder; public class TESchematicSaver extends TileEntity { - public Block targetBlock = ModBlocks.largeBloodStoneBrick; + public Block targetBlock = ModBlocks.blockBuildingSchematicSaver; public void rightClickBlock(EntityPlayer player, int side) { diff --git a/1.7.2/main/resources/assets/alchemicalwizardry/lang/en_US.lang b/1.7.2/main/resources/assets/alchemicalwizardry/lang/en_US.lang index feb12464..a550139b 100644 --- a/1.7.2/main/resources/assets/alchemicalwizardry/lang/en_US.lang +++ b/1.7.2/main/resources/assets/alchemicalwizardry/lang/en_US.lang @@ -25,6 +25,7 @@ tile.blockConduit.name=Spell Conduit tile.blockSpellParadigm.projectile.name=Particle Generator tile.blockSpellParadigm.self.name=Self Augmentator tile.blockSpellParadigm.melee.name=Melee Aggregator +tile.blockSpellParadigm.tool.name=Tool Forger tile.blockSpellEnhancement.power1.name=Unstable Spell Empowerer tile.blockSpellEnhancement.power2.name=Standard Spell Empowerer tile.blockSpellEnhancement.power3.name=Reinforced Spell Empowerer @@ -138,6 +139,7 @@ item.bloodMagicBaseItem.StoneBrace.name=Stone Brace item.bloodMagicBaseItem.ProjectileCore.name=Projectile Core item.bloodMagicBaseItem.SelfCore.name=Self Core item.bloodMagicBaseItem.MeleeCore.name=Melee Core +item.bloodMagicBaseItem.ToolCore.name=Tool Core item.bloodMagicBaseItem.ParadigmBackPlate.name=Paradigm Plate item.bloodMagicBaseItem.OutputCable.name=Output Spell Cable item.bloodMagicBaseItem.InputCable.name=Input Spell Cable @@ -168,7 +170,7 @@ item.bloodMagicAlchemyItem.Potentia.name=Potentia item.sanguineHelmet.name=Sanguine Helmet item.itemSeerSigil.name=Sigil of Sight item.itemFluidSigil.name= - +item.multiTool.name=Dynamic Mace #Creative Tab itemGroup.tabBloodMagic=Blood Magic diff --git a/1.7.2/main/resources/assets/alchemicalwizardry/schematics/building/buildings.zip b/1.7.2/main/resources/assets/alchemicalwizardry/schematics/building/buildings.zip index 795c7595..88db9bbc 100644 Binary files a/1.7.2/main/resources/assets/alchemicalwizardry/schematics/building/buildings.zip and b/1.7.2/main/resources/assets/alchemicalwizardry/schematics/building/buildings.zip differ diff --git a/1.7.2/main/resources/assets/alchemicalwizardry/textures/items/AlchemyFlask.png b/1.7.2/main/resources/assets/alchemicalwizardry/textures/items/AlchemyFlask.png deleted file mode 100644 index 690ed4bf..00000000 Binary files a/1.7.2/main/resources/assets/alchemicalwizardry/textures/items/AlchemyFlask.png and /dev/null differ diff --git a/1.7.2/main/resources/assets/alchemicalwizardry/textures/items/ElementalInkAir.png b/1.7.2/main/resources/assets/alchemicalwizardry/textures/items/ElementalInkAir.png deleted file mode 100644 index e7d3e1ff..00000000 Binary files a/1.7.2/main/resources/assets/alchemicalwizardry/textures/items/ElementalInkAir.png and /dev/null differ diff --git a/1.7.2/main/resources/assets/alchemicalwizardry/textures/items/ElementalInkEarth.png b/1.7.2/main/resources/assets/alchemicalwizardry/textures/items/ElementalInkEarth.png deleted file mode 100644 index ee69a93f..00000000 Binary files a/1.7.2/main/resources/assets/alchemicalwizardry/textures/items/ElementalInkEarth.png and /dev/null differ diff --git a/1.7.2/main/resources/assets/alchemicalwizardry/textures/items/ElementalInkFire.png b/1.7.2/main/resources/assets/alchemicalwizardry/textures/items/ElementalInkFire.png deleted file mode 100644 index 6f69f5ba..00000000 Binary files a/1.7.2/main/resources/assets/alchemicalwizardry/textures/items/ElementalInkFire.png and /dev/null differ diff --git a/1.7.2/main/resources/assets/alchemicalwizardry/textures/items/ElementalInkWater.png b/1.7.2/main/resources/assets/alchemicalwizardry/textures/items/ElementalInkWater.png deleted file mode 100644 index 35f17a0a..00000000 Binary files a/1.7.2/main/resources/assets/alchemicalwizardry/textures/items/ElementalInkWater.png and /dev/null differ diff --git a/1.7.2/main/resources/assets/alchemicalwizardry/textures/items/baseItemToolCore.png b/1.7.2/main/resources/assets/alchemicalwizardry/textures/items/baseItemToolCore.png new file mode 100644 index 00000000..f6dd600b Binary files /dev/null and b/1.7.2/main/resources/assets/alchemicalwizardry/textures/items/baseItemToolCore.png differ diff --git a/1.7.2/main/resources/assets/alchemicalwizardry/textures/models/SpellParadigmTool.png b/1.7.2/main/resources/assets/alchemicalwizardry/textures/models/SpellParadigmTool.png index 19b5ad22..4296e387 100644 Binary files a/1.7.2/main/resources/assets/alchemicalwizardry/textures/models/SpellParadigmTool.png and b/1.7.2/main/resources/assets/alchemicalwizardry/textures/models/SpellParadigmTool.png differ diff --git a/1.7.2/main/resources/assets/alchemicalwizardry/textures/models/baseItemToolCore.png b/1.7.2/main/resources/assets/alchemicalwizardry/textures/models/baseItemToolCore.png new file mode 100644 index 00000000..3c171d98 Binary files /dev/null and b/1.7.2/main/resources/assets/alchemicalwizardry/textures/models/baseItemToolCore.png differ