diff --git a/build.properties b/build.properties index 5ffe9e87..8f56cee3 100644 --- a/build.properties +++ b/build.properties @@ -1,5 +1,5 @@ # -#Mon May 25 15:25:05 EDT 2015 +#Tue May 26 22:02:07 EDT 2015 mod_name=BloodMagic forge_version=10.13.3.1374-1.7.10 ccc_version=1.0.4.29 @@ -9,5 +9,5 @@ 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 +build_number=16 mc_version=1.7.10 -build_number=15 diff --git a/src/main/java/WayofTime/alchemicalWizardry/AlchemicalWizardry.java b/src/main/java/WayofTime/alchemicalWizardry/AlchemicalWizardry.java index 8d8a5ee2..cd753743 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/AlchemicalWizardry.java +++ b/src/main/java/WayofTime/alchemicalWizardry/AlchemicalWizardry.java @@ -118,7 +118,6 @@ import WayofTime.alchemicalWizardry.common.items.ItemRitualDiviner; import WayofTime.alchemicalWizardry.common.items.armour.OmegaArmour; import WayofTime.alchemicalWizardry.common.items.forestry.ItemBloodFrame; import WayofTime.alchemicalWizardry.common.items.sigil.holding.HoldingPacketHandler; -import WayofTime.alchemicalWizardry.common.items.sigil.holding.ScrollHelper; import WayofTime.alchemicalWizardry.common.items.thaumcraft.ItemSanguineArmour; import WayofTime.alchemicalWizardry.common.omega.OmegaParadigmEarth; import WayofTime.alchemicalWizardry.common.omega.OmegaParadigmFire; @@ -857,7 +856,6 @@ public class AlchemicalWizardry blacklistAccelerators(); MinecraftForge.EVENT_BUS.register(new ModLivingDropsEvent()); - MinecraftForge.EVENT_BUS.register(new ScrollHelper()); proxy.InitRendering(); NetworkRegistry.INSTANCE.registerGuiHandler(this, new GuiHandler()); diff --git a/src/main/java/WayofTime/alchemicalWizardry/client/ClientProxy.java b/src/main/java/WayofTime/alchemicalWizardry/client/ClientProxy.java index f1c4245a..c0d488d2 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/client/ClientProxy.java +++ b/src/main/java/WayofTime/alchemicalWizardry/client/ClientProxy.java @@ -36,6 +36,7 @@ import WayofTime.alchemicalWizardry.common.entity.projectile.EnergyBlastProjecti import WayofTime.alchemicalWizardry.common.entity.projectile.EntityEnergyBazookaMainProjectile; import WayofTime.alchemicalWizardry.common.entity.projectile.EntityMeteor; import WayofTime.alchemicalWizardry.common.entity.projectile.EntityParticleBeam; +import WayofTime.alchemicalWizardry.common.items.sigil.holding.ScrollHelper; import WayofTime.alchemicalWizardry.common.renderer.block.RenderAlchemicCalcinator; import WayofTime.alchemicalWizardry.common.renderer.block.RenderConduit; import WayofTime.alchemicalWizardry.common.renderer.block.RenderCrystalBelljar; @@ -192,5 +193,6 @@ public class ClientProxy extends CommonProxy FMLCommonHandler.instance().bus().register(ob); MinecraftForge.EVENT_BUS.register(ob); KeyBindings.init(); + MinecraftForge.EVENT_BUS.register(new ScrollHelper()); } }