From c02f8a9e5fa36ef8bf599766431440841399354c Mon Sep 17 00:00:00 2001 From: WayofTime Date: Mon, 25 May 2015 15:21:59 -0400 Subject: [PATCH] Updated Guide-API --- build.properties | 2 +- .../AlchemicalWizardry.java | 6 +++++- .../alchemicalWizardry/ModItems.java | 20 ++++++++----------- .../entity/mob/MailOrderEntityItem.java | 3 ++- 4 files changed, 16 insertions(+), 15 deletions(-) diff --git a/build.properties b/build.properties index 86c807c4..4c9ff04f 100644 --- a/build.properties +++ b/build.properties @@ -5,7 +5,7 @@ forge_version=10.13.3.1374-1.7.10 ccc_version=1.0.4.29 nei_version=1.0.3.64 //=Dependency Information -guideapi_version=1.0-14 +guideapi_version=1.0.0-16 package_group=com.wayoftime.bloodmagic mod_version=1.3.2aBeta minetweaker_version=Dev-1.7.10-3.0.9B diff --git a/src/main/java/WayofTime/alchemicalWizardry/AlchemicalWizardry.java b/src/main/java/WayofTime/alchemicalWizardry/AlchemicalWizardry.java index 79e2c6f3..8d8a5ee2 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/AlchemicalWizardry.java +++ b/src/main/java/WayofTime/alchemicalWizardry/AlchemicalWizardry.java @@ -113,6 +113,7 @@ import WayofTime.alchemicalWizardry.common.harvest.CactusReedHarvestHandler; import WayofTime.alchemicalWizardry.common.harvest.GourdHarvestHandler; import WayofTime.alchemicalWizardry.common.harvest.PamHarvestCompatRegistry; import WayofTime.alchemicalWizardry.common.items.ItemIncense; +import WayofTime.alchemicalWizardry.common.items.ItemMailOrderCatalogue; import WayofTime.alchemicalWizardry.common.items.ItemRitualDiviner; import WayofTime.alchemicalWizardry.common.items.armour.OmegaArmour; import WayofTime.alchemicalWizardry.common.items.forestry.ItemBloodFrame; @@ -760,7 +761,6 @@ public class AlchemicalWizardry GameRegistry.addRecipe(new ShapedBloodOrbRecipe(new ItemStack(ModItems.itemBloodLightSigil), "btb", "sss", "bob", 'o', magicianBloodOrbStack, 'b', glowstoneBlockStack, 't', new ItemStack(Blocks.torch), 's', imbuedSlateStack)); GameRegistry.addRecipe(new ItemStack(ModItems.itemKeyOfDiablo), " gw", "gdg", "wg ", 'w', weakBloodShardStack, 'g', goldIngotStack, 'd', diamondStack); GameRegistry.addRecipe(new ItemStack(ModItems.itemBloodPack), "gbg","flf","gsg",'s', blankSlateStack,'g', glassStack,'f',new ItemStack(Items.flint,1,craftingConstant),'b', emptyBucketStack, 'l', new ItemStack(Items.leather_chestplate)); - GameRegistry.addShapelessRecipe(new ItemStack(ModItems.itemMailCatalogue), new ItemStack(Items.book), new ItemStack(Items.dye, 1, 0), new ItemStack(Items.feather), glassStack, glassStack); customPotionDrowning = (new PotionDrowning(customPotionDrowningID, true, 0)).setIconIndex(0, 0).setPotionName("Drowning"); customPotionBoost = (new PotionBoost(customPotionBoostID, false, 0)).setIconIndex(0, 0).setPotionName("Boost"); customPotionProjProt = (new PotionProjectileProtect(customPotionProjProtID, false, 0)).setIconIndex(0, 0).setPotionName("Whirlwind"); @@ -1226,6 +1226,10 @@ public class AlchemicalWizardry long finalTime = System.nanoTime(); AlchemicalWizardry.logger.info("Recipe Holder initialized: took " + (finalTime - initialTime)/1000000f + "ms."); + ModItems.itemMailCatalogue = new ItemMailOrderCatalogue().setUnlocalizedName("itemMailCatalogue"); + GameRegistry.registerItem(ModItems.itemMailCatalogue, "itemMailCatalogue"); + GameRegistry.addShapelessRecipe(new ItemStack(ModItems.itemMailCatalogue), new ItemStack(Items.book), new ItemStack(Items.dye, 1, 0), new ItemStack(Items.feather), new ItemStack(Blocks.glass, 1, OreDictionary.WILDCARD_VALUE), new ItemStack(Blocks.glass, 1, OreDictionary.WILDCARD_VALUE)); + registerBMBook(); } diff --git a/src/main/java/WayofTime/alchemicalWizardry/ModItems.java b/src/main/java/WayofTime/alchemicalWizardry/ModItems.java index ae476e3f..93c19a62 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/ModItems.java +++ b/src/main/java/WayofTime/alchemicalWizardry/ModItems.java @@ -37,7 +37,6 @@ import WayofTime.alchemicalWizardry.common.items.ItemComplexSpellCrystal; import WayofTime.alchemicalWizardry.common.items.ItemComponents; import WayofTime.alchemicalWizardry.common.items.ItemDiabloKey; import WayofTime.alchemicalWizardry.common.items.ItemIncense; -import WayofTime.alchemicalWizardry.common.items.ItemMailOrderCatalogue; import WayofTime.alchemicalWizardry.common.items.ItemRitualDiviner; import WayofTime.alchemicalWizardry.common.items.LavaCrystal; import WayofTime.alchemicalWizardry.common.items.LifeBucket; @@ -73,26 +72,26 @@ import WayofTime.alchemicalWizardry.common.items.potion.WeakFillingAgent; import WayofTime.alchemicalWizardry.common.items.routing.InputRoutingFocus; import WayofTime.alchemicalWizardry.common.items.routing.OutputRoutingFocus; import WayofTime.alchemicalWizardry.common.items.sigil.SigilAir; -import WayofTime.alchemicalWizardry.common.items.sigil.SigilDivination; import WayofTime.alchemicalWizardry.common.items.sigil.SigilBloodLight; +import WayofTime.alchemicalWizardry.common.items.sigil.SigilDivination; import WayofTime.alchemicalWizardry.common.items.sigil.SigilFluid; import WayofTime.alchemicalWizardry.common.items.sigil.SigilHarvest; -import WayofTime.alchemicalWizardry.common.items.sigil.SigilPackRat; -import WayofTime.alchemicalWizardry.common.items.sigil.SigilSeer; -import WayofTime.alchemicalWizardry.common.items.sigil.SigilOfEnderSeverance; -import WayofTime.alchemicalWizardry.common.items.sigil.SigilOfSupression; -import WayofTime.alchemicalWizardry.common.items.sigil.SigilOfTheAssassin; import WayofTime.alchemicalWizardry.common.items.sigil.SigilLava; import WayofTime.alchemicalWizardry.common.items.sigil.SigilOfElementalAffinity; +import WayofTime.alchemicalWizardry.common.items.sigil.SigilOfEnderSeverance; import WayofTime.alchemicalWizardry.common.items.sigil.SigilOfGrowth; import WayofTime.alchemicalWizardry.common.items.sigil.SigilOfHaste; -import WayofTime.alchemicalWizardry.common.items.sigil.holding.SigilOfHolding; import WayofTime.alchemicalWizardry.common.items.sigil.SigilOfMagnetism; +import WayofTime.alchemicalWizardry.common.items.sigil.SigilOfSupression; +import WayofTime.alchemicalWizardry.common.items.sigil.SigilOfTheAssassin; import WayofTime.alchemicalWizardry.common.items.sigil.SigilOfTheBridge; import WayofTime.alchemicalWizardry.common.items.sigil.SigilOfTheFastMiner; import WayofTime.alchemicalWizardry.common.items.sigil.SigilOfWind; +import WayofTime.alchemicalWizardry.common.items.sigil.SigilPackRat; +import WayofTime.alchemicalWizardry.common.items.sigil.SigilSeer; import WayofTime.alchemicalWizardry.common.items.sigil.SigilVoid; import WayofTime.alchemicalWizardry.common.items.sigil.SigilWater; +import WayofTime.alchemicalWizardry.common.items.sigil.holding.SigilOfHolding; import cpw.mods.fml.common.registry.GameRegistry; /** @@ -371,9 +370,7 @@ public class ModItems inputRoutingFocus = new InputRoutingFocus().setUnlocalizedName("inputRoutingFocus"); outputRoutingFocus = new OutputRoutingFocus().setUnlocalizedName("outputRoutingFocus"); - - itemMailCatalogue = new ItemMailOrderCatalogue().setUnlocalizedName("itemMailCatalogue"); - + itemIncense = new ItemIncense().setUnlocalizedName("bloodMagicIncenseItem"); } @@ -509,7 +506,6 @@ public class ModItems GameRegistry.registerItem(ModItems.inputRoutingFocus, "inputRoutingFocus"); GameRegistry.registerItem(ModItems.outputRoutingFocus, "outputRoutingFocus"); - GameRegistry.registerItem(ModItems.itemMailCatalogue, "itemMailCatalogue"); GameRegistry.registerItem(ModItems.itemIncense, "bloodMagicIncenseItem"); } } diff --git a/src/main/java/WayofTime/alchemicalWizardry/common/entity/mob/MailOrderEntityItem.java b/src/main/java/WayofTime/alchemicalWizardry/common/entity/mob/MailOrderEntityItem.java index 6a12f1fb..bf7f5263 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/common/entity/mob/MailOrderEntityItem.java +++ b/src/main/java/WayofTime/alchemicalWizardry/common/entity/mob/MailOrderEntityItem.java @@ -50,12 +50,13 @@ public class MailOrderEntityItem extends EntityItem if(!worldObj.isRemote && this.ticksExisted > 100 && !this.isDead) { + worldObj.addWeatherEffect(new EntityLightningBolt(worldObj, this.posX, this.posY, this.posZ)); + if(AlchemicalWizardry.isPneumaticCraftLoaded) { this.deliverItemViaDrone(this.posX, this.posY, this.posZ); }else { - worldObj.addWeatherEffect(new EntityLightningBolt(worldObj, this.posX, this.posY, this.posZ)); EntityItem entity = new BookEntityItem(worldObj, this.posX, this.posY, this.posZ, GuideRegistry.getItemStackForBook(BloodMagicGuide.bloodMagicGuide)); entity.lifespan = 6000; entity.delayBeforeCanPickup = 20;