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

Merge pull request #3 from Pokefenn/master

Browse source 
Massive rework of configs, items and blocks.
This commit is contained in:
WayofTime 2014-01-17 13:47:14 -08:00
parent 8f4b0bdc47 7e30b02d69
commit f925cdb4eb
267 changed files with 3638 additions and 4494 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

54
BM_src/WayofTime/alchemicalWizardry/client/ClientProxy.java
View file

@ -1,61 +1,25 @@
package WayofTime.alchemicalWizardry.client;
import net.minecraft.world.World;
import net.minecraftforge.client.MinecraftForgeClient;
import WayofTime.alchemicalWizardry.common.AlchemicalWizardry;
import WayofTime.alchemicalWizardry.common.CommonProxy;
import WayofTime.alchemicalWizardry.common.EntityAirElemental;
import WayofTime.alchemicalWizardry.common.entity.mob.EntityBileDemon;
import WayofTime.alchemicalWizardry.common.entity.mob.EntityBoulderFist;
import WayofTime.alchemicalWizardry.common.entity.mob.EntityEarthElemental;
import WayofTime.alchemicalWizardry.common.entity.mob.EntityFallenAngel;
import WayofTime.alchemicalWizardry.common.entity.mob.EntityFireElemental;
import WayofTime.alchemicalWizardry.common.entity.mob.EntityHolyElemental;
import WayofTime.alchemicalWizardry.common.entity.mob.EntityIceDemon;
import WayofTime.alchemicalWizardry.common.entity.mob.EntityLowerGuardian;
import WayofTime.alchemicalWizardry.common.entity.mob.EntityShade;
import WayofTime.alchemicalWizardry.common.entity.mob.EntityShadeElemental;
import WayofTime.alchemicalWizardry.common.entity.mob.EntitySmallEarthGolem;
import WayofTime.alchemicalWizardry.common.entity.mob.EntityWaterElemental;
import WayofTime.alchemicalWizardry.common.entity.mob.EntityWingedFireDemon;
import WayofTime.alchemicalWizardry.common.ModBlocks;
import WayofTime.alchemicalWizardry.common.entity.mob.*;
import WayofTime.alchemicalWizardry.common.entity.projectile.EnergyBlastProjectile;
import WayofTime.alchemicalWizardry.common.entity.projectile.EntityEnergyBazookaMainProjectile;
import WayofTime.alchemicalWizardry.common.entity.projectile.EntityMeteor;
import WayofTime.alchemicalWizardry.common.renderer.block.RenderConduit;
import WayofTime.alchemicalWizardry.common.renderer.block.RenderPedestal;
import WayofTime.alchemicalWizardry.common.renderer.block.RenderPlinth;
import WayofTime.alchemicalWizardry.common.renderer.block.RenderWritingTable;
import WayofTime.alchemicalWizardry.common.renderer.block.TEAltarRenderer;
import WayofTime.alchemicalWizardry.common.renderer.block.*;
import WayofTime.alchemicalWizardry.common.renderer.block.itemRender.TEAltarItemRenderer;
import WayofTime.alchemicalWizardry.common.renderer.mob.RenderBileDemon;
import WayofTime.alchemicalWizardry.common.renderer.mob.RenderBoulderFist;
import WayofTime.alchemicalWizardry.common.renderer.mob.RenderElemental;
import WayofTime.alchemicalWizardry.common.renderer.mob.RenderFallenAngel;
import WayofTime.alchemicalWizardry.common.renderer.mob.RenderIceDemon;
import WayofTime.alchemicalWizardry.common.renderer.mob.RenderLowerGuardian;
import WayofTime.alchemicalWizardry.common.renderer.mob.RenderShade;
import WayofTime.alchemicalWizardry.common.renderer.mob.RenderSmallEarthGolem;
import WayofTime.alchemicalWizardry.common.renderer.mob.RenderWingedFireDemon;
import WayofTime.alchemicalWizardry.common.renderer.model.ModelBileDemon;
import WayofTime.alchemicalWizardry.common.renderer.model.ModelBoulderFist;
import WayofTime.alchemicalWizardry.common.renderer.model.ModelElemental;
import WayofTime.alchemicalWizardry.common.renderer.model.ModelFallenAngel;
import WayofTime.alchemicalWizardry.common.renderer.model.ModelIceDemon;
import WayofTime.alchemicalWizardry.common.renderer.model.ModelLowerGuardian;
import WayofTime.alchemicalWizardry.common.renderer.model.ModelShade;
import WayofTime.alchemicalWizardry.common.renderer.model.ModelSmallEarthGolem;
import WayofTime.alchemicalWizardry.common.renderer.model.ModelWingedFireDemon;
import WayofTime.alchemicalWizardry.common.renderer.mob.*;
import WayofTime.alchemicalWizardry.common.renderer.model.*;
import WayofTime.alchemicalWizardry.common.renderer.projectile.RenderEnergyBazookaMainProjectile;
import WayofTime.alchemicalWizardry.common.renderer.projectile.RenderEnergyBlastProjectile;
import WayofTime.alchemicalWizardry.common.renderer.projectile.RenderMeteor;
import WayofTime.alchemicalWizardry.common.tileEntity.TEAltar;
import WayofTime.alchemicalWizardry.common.tileEntity.TEConduit;
import WayofTime.alchemicalWizardry.common.tileEntity.TEPedestal;
import WayofTime.alchemicalWizardry.common.tileEntity.TEPlinth;
import WayofTime.alchemicalWizardry.common.tileEntity.TEWritingTable;
import WayofTime.alchemicalWizardry.common.tileEntity.*;
import cpw.mods.fml.client.FMLClientHandler;
import cpw.mods.fml.client.registry.ClientRegistry;
import cpw.mods.fml.client.registry.RenderingRegistry;
import net.minecraft.world.World;
import net.minecraftforge.client.MinecraftForgeClient;
public class ClientProxy extends CommonProxy
{
@ -115,7 +79,7 @@ public class ClientProxy extends CommonProxy
public void InitRendering()
{
ClientRegistry.bindTileEntitySpecialRenderer(TEAltar.class, new TEAltarRenderer());
MinecraftForgeClient.registerItemRenderer(AlchemicalWizardry.blockAltar.blockID, new TEAltarItemRenderer());
MinecraftForgeClient.registerItemRenderer(ModBlocks.blockAltar.blockID, new TEAltarItemRenderer());
//MinecraftForgeClient.registerItemRenderer(AlchemicalWizardry.blockWritingTable.blockID, new TEWritingTableItemRenderer());
}
}

1082
BM_src/WayofTime/alchemicalWizardry/common/AlchemicalWizardry.java
View file

File diff suppressed because it is too large Load diff

21
BM_src/WayofTime/alchemicalWizardry/common/AlchemicalWizardryEventHooks.java
View file

@ -1,12 +1,8 @@
package WayofTime.alchemicalWizardry.common;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
import WayofTime.alchemicalWizardry.common.entity.projectile.EnergyBlastProjectile;
import cpw.mods.fml.common.ObfuscationReflectionHelper;
import cpw.mods.fml.relauncher.ReflectionHelper;
import net.minecraft.entity.Entity;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.IProjectile;
@ -19,8 +15,8 @@ import net.minecraftforge.event.ForgeSubscribe;
import net.minecraftforge.event.entity.living.LivingAttackEvent;
import net.minecraftforge.event.entity.living.LivingEvent.LivingJumpEvent;
import net.minecraftforge.event.entity.living.LivingEvent.LivingUpdateEvent;
import cpw.mods.fml.common.ObfuscationReflectionHelper;
import cpw.mods.fml.relauncher.ReflectionHelper;
import java.util.*;
public class AlchemicalWizardryEventHooks
{
@ -149,13 +145,11 @@ public class AlchemicalWizardryEventHooks
{
if (((EntityArrow) projectile).shootingEntity == null)
{
}
else if (!(((EntityArrow)projectile).shootingEntity == null) && ((EntityArrow)projectile).shootingEntity.equals(entity))
} else if (!(((EntityArrow) projectile).shootingEntity == null) && ((EntityArrow) projectile).shootingEntity.equals(entity))
{
break;
}
}
else if (projectile instanceof EnergyBlastProjectile)
} else if (projectile instanceof EnergyBlastProjectile)
{
if (!(((EnergyBlastProjectile) projectile).shootingEntity == null) && ((EnergyBlastProjectile) projectile).shootingEntity.equals(entity))
{
@ -190,8 +184,7 @@ public class AlchemicalWizardryEventHooks
entityPlayer.capabilities.allowFlying = true;
//entityPlayer.sendPlayerAbilities();
}
}
else
} else
{
if (event.entityLiving instanceof EntityPlayer)
{

9
BM_src/WayofTime/alchemicalWizardry/common/AlchemicalWizardryFuelHandler.java
View file

@ -1,13 +1,13 @@
package WayofTime.alchemicalWizardry.common;
import WayofTime.alchemicalWizardry.common.items.LavaCrystal;
import cpw.mods.fml.common.IFuelHandler;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.potion.Potion;
import net.minecraft.potion.PotionEffect;
import net.minecraft.server.MinecraftServer;
import WayofTime.alchemicalWizardry.common.items.LavaCrystal;
import cpw.mods.fml.common.IFuelHandler;
public class AlchemicalWizardryFuelHandler implements IFuelHandler
{
@ -17,7 +17,7 @@ public class AlchemicalWizardryFuelHandler implements IFuelHandler
ItemStack itemStack = fuel;
int var1 = fuel.itemID;
if (var1 == AlchemicalWizardry.lavaCrystal.itemID)
if (var1 == ModItems.lavaCrystal.itemID)
{
/*ItemStack newItem = new ItemStack(AlchemicalWizardry.lavaCrystal);
newItem.getItem().setDamage(newItem, 50);
@ -28,8 +28,7 @@ public class AlchemicalWizardryFuelHandler implements IFuelHandler
if (item.hasEnoughEssence(fuel))
{
return 200;
}
else
} else
{
NBTTagCompound tag = itemStack.stackTagCompound;

12
BM_src/WayofTime/alchemicalWizardry/common/AlchemicalWizardryTickHandler.java
View file

@ -1,15 +1,13 @@
package WayofTime.alchemicalWizardry.common;
import java.util.EnumSet;
import net.minecraft.client.Minecraft;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.entity.player.PlayerCapabilities;
import net.minecraft.item.ItemStack;
import net.minecraft.server.MinecraftServer;
import cpw.mods.fml.common.ITickHandler;
import cpw.mods.fml.common.ObfuscationReflectionHelper;
import cpw.mods.fml.common.TickType;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.entity.player.PlayerCapabilities;
import net.minecraft.server.MinecraftServer;
import java.util.EnumSet;
public class AlchemicalWizardryTickHandler implements ITickHandler
{

201
BM_src/WayofTime/alchemicalWizardry/common/BloodMagicConfiguration.java Normal file
View file

@ -0,0 +1,201 @@
package WayofTime.alchemicalWizardry.common;
import WayofTime.alchemicalWizardry.common.summoning.meteor.MeteorParadigm;
import cpw.mods.fml.common.FMLLog;
import net.minecraftforge.common.Configuration;
import totemic_commons.pokefenn.lib.Reference;
import java.io.File;
import java.util.logging.Level;
/**
* Created with IntelliJ IDEA.
* User: Pokefenn
* Date: 17/01/14
* Time: 19:50
*/
public class BloodMagicConfiguration
{
public static Configuration config;
public static final String CATEGORY_GAMEPLAY = "gameplay";
public static void init(File configFile)
{
config = new Configuration(configFile);
try
{
config.load();
AlchemicalWizardry.standardBindingAgentDungeonChance = config.get("Dungeon Loot Chances", "standardBindingAgent", 30).getInt();
AlchemicalWizardry.mundanePowerCatalystDungeonChance = config.get("Dungeon Loot Chances", "mundanePowerCatalyst", 20).getInt();
AlchemicalWizardry.averagePowerCatalystDungeonChance = config.get("Dungeon Loot Chances", "averagePowerCatalyst", 10).getInt();
AlchemicalWizardry.greaterPowerCatalystDungeonChance = config.get("Dungeon Loot Chances", "greaterPowerCatalyst", 05).getInt();
AlchemicalWizardry.mundaneLengtheningCatalystDungeonChance = config.get("Dungeon Loot Chances", "mundaneLengtheningCatalyst", 20).getInt();
AlchemicalWizardry.averageLengtheningCatalystDungeonChance = config.get("Dungeon Loot Chances", "averageLengtheningCatalyst", 10).getInt();
AlchemicalWizardry.greaterLengtheningCatalystDungeonChance = config.get("Dungeon Loot Chances", "greaterLengtheningCatalyst", 05).getInt();
AlchemicalWizardry.customPotionDrowningID = config.get("Potion ID", "Drowning", 100).getInt();
AlchemicalWizardry.customPotionBoostID = config.get("Potion ID", "Boost", 101).getInt();
AlchemicalWizardry.customPotionProjProtID = config.get("Potion ID", "ProjProt", 102).getInt();
AlchemicalWizardry.customPotionInhibitID = config.get("Potion ID", "Inhibit", 103).getInt();
AlchemicalWizardry.customPotionFlightID = config.get("Potion ID", "Flight", 104).getInt();
AlchemicalWizardry.customPotionReciprocationID = config.get("Potion ID", "Reciprocation", 105).getInt();
MeteorParadigm.maxChance = config.get("meteor", "maxChance", 1000).getInt();
AlchemicalWizardry.doMeteorsDestroyBlocks = config.get("meteor", "doMeteorsDestroyBlocks", true).getBoolean(true);
AlchemicalWizardry.diamondMeteorArray = config.get("meteor", "diamondMeteor", new String[]{"oreDiamond", "100", "oreEmerald", "75", "oreCinnabar", "200", "oreAmber", "200"}).getStringList();
AlchemicalWizardry.diamondMeteorRadius = config.get("meteor", "diamondMeteorRadius", 5).getInt();
AlchemicalWizardry.stoneMeteorArray = config.get("meteor", "stoneBlockMeteor", new String[]{"oreCoal", "150", "oreApatite", "50", "oreIron", "50"}).getStringList();
AlchemicalWizardry.stoneMeteorRadius = config.get("meteor", "stoneMeteorRadius", 16).getInt();
AlchemicalWizardry.ironBlockMeteorArray = config.get("meteor", "ironBlockMeteor", new String[]{"oreIron", "400", "oreGold", "30", "oreCopper", "200", "oreTin", "140", "oreSilver", "70", "oreLead", "80", "oreLapis", "60", "oreRedstone", "100"}).getStringList();
AlchemicalWizardry.ironBlockMeteorRadius = config.get("meteor", "ironBlockMeteorRadius", 7).getInt();
AlchemicalWizardry.netherStarMeteorArray = config.get("meteor", "netherStarMeteor", new String[]{"oreDiamond", "150", "oreEmerald", "100", "oreQuartz", "250", "oreSunstone", "5", "oreMoonstone", "50", "oreIridium", "5", "oreCertusQuartz", "150"}).getStringList();
AlchemicalWizardry.netherStarMeteorRadius = config.get("meteor", "netherStarMeteorRadius", 3).getInt();
AlchemicalWizardry.testingBlockBlockID = config.getBlock("TestingBlock", 1400).getInt();
AlchemicalWizardry.lifeEssenceFlowingBlockID = config.getBlock("LifeEssenceFlowing", 1401).getInt();
AlchemicalWizardry.lifeEssenceStillBlockID = config.getBlock("LifeEssenceStill", 1402).getInt();
AlchemicalWizardry.blockAltarBlockID = config.getBlock("BloodAltar", 1403).getInt();
AlchemicalWizardry.bloodRuneBlockID = config.getBlock("BloodRune", 1404).getInt();
AlchemicalWizardry.speedRuneBlockID = config.getBlock("SpeedRune", 1405).getInt();
AlchemicalWizardry.efficiencyRuneBlockID = config.getBlock("EfficiencyRune", 1406).getInt();
AlchemicalWizardry.lifeEssenceFluidID = config.getBlock("LifeEssenceFluid", 1407).getInt();
AlchemicalWizardry.runeOfSacrificeBlockID = config.getBlock("RuneOfSacrifice", 1408).getInt();
AlchemicalWizardry.runeOfSelfSacrificeBlockID = config.getBlock("RuneOfSelfSacrifice", 1409).getInt();
AlchemicalWizardry.ritualStoneBlockID = config.getBlock("RitualStone", 1410).getInt();
AlchemicalWizardry.blockMasterStoneBlockID = config.getBlock("MasterStone", 1411).getInt();
AlchemicalWizardry.imperfectRitualStoneBlockID = config.getBlock("ImperfectRitualStone", 1412).getInt();
AlchemicalWizardry.emptySocketBlockID = config.getBlock("EmptySocket", 1413).getInt();
AlchemicalWizardry.bloodSocketBlockID = config.getBlock("BloodSocket", 1414).getInt();
AlchemicalWizardry.armourForgeBlockID = config.getBlock("ArmourForge", 1415).getInt();
AlchemicalWizardry.largeBloodStoneBrickBlockID = config.getBlock("LargeBloodStoneBrick", 1416).getInt();
AlchemicalWizardry.bloodStoneBrickBlockID = config.getBlock("BloodStoneBrick", 1417).getInt();
AlchemicalWizardry.blockWritingTableBlockID = config.getBlock("BlockWritingTable", 1418).getInt();
AlchemicalWizardry.blockHomHeartBlockID = config.getBlock("BlockHomHeart", 1419).getInt();
AlchemicalWizardry.blockPedestalBlockID = config.getBlock("BlockPedestal", 1420).getInt();
AlchemicalWizardry.blockPlinthBlockID = config.getBlock("BlockPlinth", 1421).getInt();
AlchemicalWizardry.blockTeleposerBlockID = config.getBlock("BlockTeleposer", 1422).getInt();
AlchemicalWizardry.spectralBlockBlockID = config.getBlock("SpectralBlock", 1423).getInt();
AlchemicalWizardry.blockBloodLightBlockID = config.getBlock("BloodLight", 1424).getInt();
//blockConduitBlockID = config.getBlock("BlockConduit", 1424).getInt();
//Items
AlchemicalWizardry.weakBloodOrbItemID = config.getItem("WeakBloodOrb", 17000).getInt();
AlchemicalWizardry.energyBlasterItemID = config.getItem("EnergyBlaster", 17001).getInt();
AlchemicalWizardry.energySwordItemID = config.getItem("EnergySword", 17002).getInt();
AlchemicalWizardry.lavaCrystalItemID = config.getItem("LavaCrystal", 17003).getInt();
AlchemicalWizardry.waterSigilItemID = config.getItem("WaterSigil", 17004).getInt();
AlchemicalWizardry.lavaSigilItemID = config.getItem("LavaSigil", 17005).getInt();
AlchemicalWizardry.voidSigilItemID = config.getItem("VoidSigil", 17006).getInt();
AlchemicalWizardry.blankSlateItemID = config.getItem("BlankSlate", 17007).getInt();
AlchemicalWizardry.reinforcedSlateItemID = config.getItem("ReinforcedSlate", 17008).getInt();
AlchemicalWizardry.sacrificialDaggerItemID = config.getItem("SacrificialDagger", 17009).getInt();
AlchemicalWizardry.bucketLifeItemID = config.getItem("BucketLife", 17010).getInt();
AlchemicalWizardry.apprenticeBloodOrbItemID = config.getItem("ApprenticeBloodOrb", 17011).getInt();
AlchemicalWizardry.daggerOfSacrificeItemID = config.getItem("DaggerOfSacrifice", 17012).getInt();
AlchemicalWizardry.airSigilItemID = config.getItem("AirSigil", 17013).getInt();
AlchemicalWizardry.sigilOfTheFastMinerItemID = config.getItem("SigilOfTheFastMiner", 17014).getInt();
// elementalInkWaterItemID = config.getItem("ElementalInkWater", 17015).getInt();
// elementalInkFireItemID = config.getItem("ElementalInkFire", 17016).getInt();
// elementalInkEarthItemID = config.getItem("ElementalInkEarth", 17017).getInt();
// elementalInkAirItemID = config.getItem("ElementalInkAir", 17018).getInt();
AlchemicalWizardry.duskScribeToolItemID = config.getItem("DuskScribeTool", 17015).getInt();
AlchemicalWizardry.demonPlacerItemID = config.getItem("DemonPlacer", 17016).getInt();
AlchemicalWizardry.itemBloodRuneBlockItemID = config.getItem("ItemBloodRuneBlock", 17017).getInt();
AlchemicalWizardry.armourInhibitorItemID = config.getItem("ArmourInhibitor", 17018).getInt();
AlchemicalWizardry.divinationSigilItemID = config.getItem("DivinationSigin", 17019).getInt();
AlchemicalWizardry.waterScribeToolItemID = config.getItem("WaterScribeTool", 17020).getInt();
AlchemicalWizardry.fireScribeToolItemID = config.getItem("FireScribeTool", 17021).getInt();
AlchemicalWizardry.earthScribeToolItemID = config.getItem("EarthScribeTool", 17022).getInt();
AlchemicalWizardry.airScribeToolItemID = config.getItem("AirScribeTool", 17023).getInt();
AlchemicalWizardry.weakActivationCrystalItemID = config.getItem("WeakActivationCrystal", 17024).getInt();
AlchemicalWizardry.magicianBloodOrbItemID = config.getItem("MagicianBloodOrb", 17025).getInt();
AlchemicalWizardry.sigilOfElementalAffinityItemID = config.getItem("SigilOfElementalAffinity", 17026).getInt();
AlchemicalWizardry.sigilOfHasteItemID = config.getItem("SigilOfHaste", 17027).getInt();
AlchemicalWizardry.sigilOfHoldingItemID = config.getItem("SigilOfHolding", 17028).getInt();
AlchemicalWizardry.boundPickaxeItemID = config.getItem("BoundPickaxe", 17029).getInt();
AlchemicalWizardry.boundAxeItemID = config.getItem("BoundAxe", 17030).getInt();
AlchemicalWizardry.boundShovelItemID = config.getItem("BoundShovel", 17031).getInt();
AlchemicalWizardry.boundHelmetItemID = config.getItem("BoundHelmet", 17032).getInt();
AlchemicalWizardry.boundPlateItemID = config.getItem("BoundPlate", 17033).getInt();
AlchemicalWizardry.boundLeggingsItemID = config.getItem("BoundLeggings", 17034).getInt();
AlchemicalWizardry.boundBootsItemID = config.getItem("BoundBoots", 17035).getInt();
AlchemicalWizardry.weakBloodShardItemID = config.getItem("WeakBloodShard", 17036).getInt();
AlchemicalWizardry.growthSigilItemID = config.getItem("SigilOfGrowth", 17037).getInt();
AlchemicalWizardry.masterBloodOrbItemID = config.getItem("MasterBloodOrb", 17038).getInt();
AlchemicalWizardry.blankSpellItemID = config.getItem("BlankSpell", 17039).getInt();
AlchemicalWizardry.alchemyFlaskItemID = config.getItem("AlchemyFlask", 17040).getInt();
AlchemicalWizardry.standardBindingAgentItemID = config.getItem("StandardBindingAgent", 17041).getInt();
AlchemicalWizardry.mundanePowerCatalystItemID = config.getItem("MundanePowerCatalyst", 17042).getInt();
AlchemicalWizardry.averagePowerCatalystItemID = config.getItem("AveragePowerCatalyst", 17043).getInt();
AlchemicalWizardry.greaterPowerCatalystItemID = config.getItem("GreaterPowerCatalyst", 17044).getInt();
AlchemicalWizardry.mundaneLengtheningCatalystItemID = config.getItem("MundaneLengtheningCatalyst", 17045).getInt();
AlchemicalWizardry.averageLengtheningCatalystItemID = config.getItem("AverageLengtheningCatalyst", 17046).getInt();
AlchemicalWizardry.greaterLengtheningCatalystItemID = config.getItem("GreaterLengtheningCatalyst", 17047).getInt();
AlchemicalWizardry.demonBloodShardItemID = config.getItem("DemonBloodShard", 17048).getInt();
AlchemicalWizardry.archmageBloodOrbItemID = config.getItem("ArchmageBloodOrb", 17049).getInt();
AlchemicalWizardry.sigilOfWindItemID = config.getItem("SigilOfWind", 17050).getInt();
AlchemicalWizardry.telepositionFocusItemID = config.getItem("TelepositionFocusItemID", 17051).getInt();
AlchemicalWizardry.enhancedTelepositionFocusItemID = config.getItem("EnhancedTelepositionFocus", 17052).getInt();
AlchemicalWizardry.reinforcedTelepositionFocusItemID = config.getItem("ReinforcedTelepositionFocus", 17053).getInt();
AlchemicalWizardry.demonicTelepositionFocusItemID = config.getItem("DemonicTelepositionFocus", 17054).getInt();
AlchemicalWizardry.imbuedSlateItemID = config.getItem("ImbuedSlate", 17055).getInt();
AlchemicalWizardry.demonicSlateItemID = config.getItem("DemonicSlate", 17056).getInt();
AlchemicalWizardry.sigilOfTheBridgeItemID = config.getItem("SigilOfTheBridge", 17057).getInt();
AlchemicalWizardry.creativeFillerItemID = config.getItem("CreativeFiller", 17058).getInt();
AlchemicalWizardry.itemRitualDivinerItemID = config.getItem("ItemRitualDiviner", 17059).getInt();
AlchemicalWizardry.itemKeyOfDiabloItemID = config.getItem("ItemKeyOfDiablo", 17081).getInt();
AlchemicalWizardry.energyBazookaItemID = config.getItem("EnergyBazooka", 17082).getInt();
AlchemicalWizardry.itemBloodLightSigilItemID = config.getItem("BloodLightSigil", 17083).getInt();
AlchemicalWizardry.simpleCatalystItemID = config.getItem("SimpleCatalyst", 17060).getInt();
AlchemicalWizardry.incendiumItemID = config.getItem("Incendium", 17061).getInt();
AlchemicalWizardry.magicalesItemID = config.getItem("Magicales", 17062).getInt();
AlchemicalWizardry.sanctusItemID = config.getItem("Sanctus", 17063).getInt();
AlchemicalWizardry.aetherItemID = config.getItem("Aether", 17064).getInt();
AlchemicalWizardry.crepitousItemID = config.getItem("Crepitous", 17065).getInt();
AlchemicalWizardry.crystallosItemID = config.getItem("Crystallos", 17066).getInt();
AlchemicalWizardry.terraeItemID = config.getItem("Terrae", 17067).getInt();
AlchemicalWizardry.aquasalusItemID = config.getItem("Aquasalus", 17068).getInt();
AlchemicalWizardry.tennebraeItemID = config.getItem("Tennebrae", 17069).getInt();
AlchemicalWizardry.weakBindingAgentItemID = config.getItem("WeakBindingAgent", 17070).getInt();
AlchemicalWizardry.weakFillingAgentItemID = config.getItem("WeakFillingAgent", 17072).getInt();
AlchemicalWizardry.standardFillingAgentItemID = config.getItem("StandardFillingAgent", 17073).getInt();
AlchemicalWizardry.enhancedFillingAgentItemID = config.getItem("EnhancedFillingAgent", 17074).getInt();
AlchemicalWizardry.sanguineHelmetItemID = config.getItem("SanguineHelmet", 17075).getInt();
AlchemicalWizardry.focusBloodBlastItemID = config.getItem("FocusBloodBlast", 17076).getInt();
AlchemicalWizardry.focusGravityWellItemID = config.getItem("FocusGravityWell", 17077).getInt();
AlchemicalWizardry.sigilOfMagnetismItemID = config.getItem("SigilOfMagnetism", 17080).getInt();
} catch (Exception e)
{
FMLLog.log(Level.SEVERE, e, Reference.MOD_NAME + " has had a problem loading its configuration, go ask on the forums :p");
} finally
{
config.save();
}
}
public static void set(String categoryName, String propertyName, String newValue)
{
config.load();
if (config.getCategoryNames().contains(categoryName))
{
if (config.getCategory(categoryName).containsKey(propertyName))
{
config.getCategory(categoryName).get(propertyName).set(newValue);
}
}
config.save();
}
}

20
BM_src/WayofTime/alchemicalWizardry/common/CommonProxy.java
View file

@ -1,24 +1,11 @@
package WayofTime.alchemicalWizardry.common;
import WayofTime.alchemicalWizardry.common.entity.projectile.EnergyBlastProjectile;
import WayofTime.alchemicalWizardry.common.entity.projectile.EntityBloodLightProjectile;
import WayofTime.alchemicalWizardry.common.entity.projectile.EntityEnergyBazookaMainProjectile;
import WayofTime.alchemicalWizardry.common.entity.projectile.EntityEnergyBazookaSecondaryProjectile;
import WayofTime.alchemicalWizardry.common.entity.projectile.EntityMeteor;
import WayofTime.alchemicalWizardry.common.entity.projectile.ExplosionProjectile;
import WayofTime.alchemicalWizardry.common.entity.projectile.FireProjectile;
import WayofTime.alchemicalWizardry.common.entity.projectile.HolyProjectile;
import WayofTime.alchemicalWizardry.common.entity.projectile.IceProjectile;
import WayofTime.alchemicalWizardry.common.entity.projectile.LightningBoltProjectile;
import WayofTime.alchemicalWizardry.common.entity.projectile.MudProjectile;
import WayofTime.alchemicalWizardry.common.entity.projectile.TeleportProjectile;
import WayofTime.alchemicalWizardry.common.entity.projectile.WaterProjectile;
import WayofTime.alchemicalWizardry.common.entity.projectile.WindGustProjectile;
import WayofTime.alchemicalWizardry.common.entity.projectile.*;
import WayofTime.alchemicalWizardry.common.tileEntity.TEAltar;
import WayofTime.alchemicalWizardry.common.tileEntity.TEMasterStone;
import net.minecraft.world.World;
import cpw.mods.fml.common.registry.EntityRegistry;
import cpw.mods.fml.common.registry.GameRegistry;
import net.minecraft.world.World;
public class CommonProxy
{
@ -30,9 +17,11 @@ public class CommonProxy
{
// Nothing here as the server doesn't render graphics!
}
public void registerEntities()
{
}
public World getClientWorld()
{
return null;
@ -78,6 +67,7 @@ public class CommonProxy
public void registerTickHandlers()
{
}
public void InitRendering()
{
// TODO Auto-generated method stub

3
BM_src/WayofTime/alchemicalWizardry/common/EntityAITargetAggro.java
View file

@ -1,10 +1,7 @@
package WayofTime.alchemicalWizardry.common;
import WayofTime.alchemicalWizardry.common.entity.mob.EntityDemon;
import net.minecraft.entity.EntityCreature;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.ai.EntityAINearestAttackableTarget;
import net.minecraft.entity.passive.EntityTameable;
public class EntityAITargetAggro extends EntityAINearestAttackableTarget
{

19
BM_src/WayofTime/alchemicalWizardry/common/EntityAirElemental.java
View file

@ -3,27 +3,11 @@ package WayofTime.alchemicalWizardry.common;
import WayofTime.alchemicalWizardry.common.entity.mob.EntityElemental;
import cpw.mods.fml.common.network.PacketDispatcher;
import cpw.mods.fml.common.network.Player;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.block.Block;
import net.minecraft.entity.Entity;
import net.minecraft.entity.EntityFlying;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.SharedMonsterAttributes;
import net.minecraft.entity.monster.EntityGhast;
import net.minecraft.entity.monster.IMob;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.entity.projectile.EntityLargeFireball;
import net.minecraft.entity.projectile.EntitySmallFireball;
import net.minecraft.item.Item;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.potion.PotionEffect;
import net.minecraft.stats.AchievementList;
import net.minecraft.util.AxisAlignedBB;
import net.minecraft.util.ChunkCoordinates;
import net.minecraft.util.DamageSource;
import net.minecraft.util.MathHelper;
import net.minecraft.util.Vec3;
import net.minecraft.world.World;
public class EntityAirElemental extends EntityElemental implements IMob
@ -39,8 +23,7 @@ public class EntityAirElemental extends EntityElemental implements IMob
{
PacketDispatcher.sendPacketToPlayer(PacketHandler.getPlayerVelocitySettingPacket(target.motionX, target.motionY + 3, target.motionZ), (Player) target);
((EntityLivingBase) target).addPotionEffect(new PotionEffect(AlchemicalWizardry.customPotionInhibit.id, 150, 0));
}
else if (target instanceof EntityLivingBase)
} else if (target instanceof EntityLivingBase)
{
((EntityLivingBase) target).motionY += 3.0D;
((EntityLivingBase) target).addPotionEffect(new PotionEffect(AlchemicalWizardry.customPotionInhibit.id, 150, 0));

1
BM_src/WayofTime/alchemicalWizardry/common/ICatalyst.java
View file

@ -3,5 +3,6 @@ package WayofTime.alchemicalWizardry.common;
public interface ICatalyst
{
public abstract int getCatalystLevel();
public abstract boolean isConcentration();
}

5
BM_src/WayofTime/alchemicalWizardry/common/LifeBucketHandler.java
View file

@ -27,12 +27,11 @@ public class LifeBucketHandler
{
int blockID = world.getBlockId(pos.blockX, pos.blockY, pos.blockZ);
if ((blockID == AlchemicalWizardry.blockLifeEssence.blockID) && world.getBlockMetadata(pos.blockX, pos.blockY, pos.blockZ) == 0)
if ((blockID == ModBlocks.blockLifeEssence.blockID) && world.getBlockMetadata(pos.blockX, pos.blockY, pos.blockZ) == 0)
{
world.setBlock(pos.blockX, pos.blockY, pos.blockZ, 0);
return new ItemStack(AlchemicalWizardry.bucketLife);
}
else
} else
{
return null;
}

1
BM_src/WayofTime/alchemicalWizardry/common/LifeEssenceNetwork.java
View file

@ -5,6 +5,7 @@ import net.minecraft.nbt.NBTTagCompound;
public class LifeEssenceNetwork extends net.minecraft.world.WorldSavedData
{
public int currentEssence;
public LifeEssenceNetwork(String par1Str)
{
super(par1Str);

75
BM_src/WayofTime/alchemicalWizardry/common/ModBlocks.java Normal file
View file

@ -0,0 +1,75 @@
package WayofTime.alchemicalWizardry.common;
import WayofTime.alchemicalWizardry.TestingBlock;
import WayofTime.alchemicalWizardry.common.block.*;
import net.minecraft.block.Block;
import net.minecraft.block.material.Material;
import net.minecraft.creativetab.CreativeTabs;
/**
* Created with IntelliJ IDEA.
* User: Pokefenn
* Date: 17/01/14
* Time: 19:48
*/
public class ModBlocks
{
public static Block testingBlock;
public static Block bloodStoneBrick;
public static Block largeBloodStoneBrick;
// public static Block lifeEssenceStill;
// public static Block lifeEssenceFlowing;
public static BlockAltar blockAltar;
public static BloodRune bloodRune;
public static SpeedRune speedRune;
public static EfficiencyRune efficiencyRune;
public static RuneOfSacrifice runeOfSacrifice;
public static RuneOfSelfSacrifice runeOfSelfSacrifice;
public static Block blockMasterStone;
public static Block ritualStone;
public static Block imperfectRitualStone;
public static Block bloodSocket;
public static Block emptySocket;
public static Block armourForge;
public static Block blockWritingTable;
public static Block blockHomHeart;
public static Block blockPedestal;
public static Block blockPlinth;
public static Block blockLifeEssence;
public static Block blockTeleposer;
public static Block spectralBlock;
public static Block blockConduit;
public static Block blockBloodLight;
public static void init()
{
testingBlock = new TestingBlock(AlchemicalWizardry.testingBlockBlockID, Material.ground).setHardness(2.0F).setStepSound(Block.soundStoneFootstep).setCreativeTab(CreativeTabs.tabBlock).setLightValue(1.0F);
//lifeEssenceStill = new LifeEssenceStill(lifeEssenceStillBlockID);
//lifeEssenceFlowing = new LifeEssenceFlowing(lifeEssenceFlowingBlockID);
blockAltar = new BlockAltar(AlchemicalWizardry.blockAltarBlockID);
bloodRune = new BloodRune(AlchemicalWizardry.bloodRuneBlockID);
speedRune = new SpeedRune(AlchemicalWizardry.speedRuneBlockID);
efficiencyRune = new EfficiencyRune(AlchemicalWizardry.efficiencyRuneBlockID);
runeOfSacrifice = new RuneOfSacrifice(AlchemicalWizardry.runeOfSacrificeBlockID);
runeOfSelfSacrifice = new RuneOfSelfSacrifice(AlchemicalWizardry.runeOfSelfSacrificeBlockID);
AlchemicalWizardry.lifeEssenceFluid = new LifeEssence("Life Essence");
blockTeleposer = new BlockTeleposer(AlchemicalWizardry.blockTeleposerBlockID);
spectralBlock = new SpectralBlock(AlchemicalWizardry.spectralBlockBlockID);
ritualStone = new RitualStone(AlchemicalWizardry.ritualStoneBlockID);
blockMasterStone = new BlockMasterStone(AlchemicalWizardry.blockMasterStoneBlockID);
imperfectRitualStone = new ImperfectRitualStone(AlchemicalWizardry.imperfectRitualStoneBlockID);
bloodSocket = new BlockSocket(AlchemicalWizardry.bloodSocketBlockID);
armourForge = new ArmourForge(AlchemicalWizardry.armourForgeBlockID);
emptySocket = new EmptySocket(AlchemicalWizardry.emptySocketBlockID);
largeBloodStoneBrick = new LargeBloodStoneBrick(AlchemicalWizardry.largeBloodStoneBrickBlockID);
bloodStoneBrick = new BloodStoneBrick(AlchemicalWizardry.bloodStoneBrickBlockID);
blockWritingTable = new BlockWritingTable(AlchemicalWizardry.blockWritingTableBlockID);
blockHomHeart = new BlockHomHeart(AlchemicalWizardry.blockHomHeartBlockID);
blockPedestal = new BlockPedestal(AlchemicalWizardry.blockPedestalBlockID);
blockPlinth = new BlockPlinth(AlchemicalWizardry.blockPlinthBlockID);
blockBloodLight = new BlockBloodLightSource(AlchemicalWizardry.blockBloodLightBlockID);
}
}

188
BM_src/WayofTime/alchemicalWizardry/common/ModItems.java Normal file
View file

@ -0,0 +1,188 @@
package WayofTime.alchemicalWizardry.common;
import WayofTime.alchemicalWizardry.common.items.*;
import WayofTime.alchemicalWizardry.common.items.potion.*;
import WayofTime.alchemicalWizardry.common.items.sigil.*;
import net.minecraft.item.Item;
/**
* Created with IntelliJ IDEA.
* User: Pokefenn
* Date: 17/01/14
* Time: 19:48
*/
public class ModItems
{
public static Item orbOfTesting;
public static Item weakBloodOrb;
public static Item apprenticeBloodOrb;
public static Item magicianBloodOrb;
public static Item energyBlaster;
public static Item energySword;
public static Item lavaCrystal;
public static Item waterSigil;
public static Item lavaSigil;
public static Item voidSigil;
//public static Item glassShard = new GlassShard(17009).setUnlocalizedName("glassShard");
//public static Item bloodiedShard = new BloodiedShard(17010).setUnlocalizedName("bloodiedShard");
public static Item blankSlate;
public static Item reinforcedSlate;
public static Item sacrificialDagger;
public static Item daggerOfSacrifice;
public static Item airSigil;
public static Item sigilOfTheFastMiner;
public static Item sigilOfElementalAffinity;
public static Item sigilOfHaste;
public static Item sigilOfHolding;
public static Item divinationSigil;
// public static Item elementalInkWater;
// public static Item elementalInkFire;
// public static Item elementalInkEarth;
// public static Item elementalInkAir;
public static Item waterScribeTool;
public static Item fireScribeTool;
public static Item earthScribeTool;
public static Item airScribeTool;
public static Item activationCrystal;
public static Item boundPickaxe;
public static Item boundAxe;
public static Item boundShovel;
public static Item boundHelmet;
public static Item boundPlate;
public static Item boundLeggings;
public static Item boundBoots;
public static Item weakBloodShard;
public static Item growthSigil;
//public static Item fireSpell;
public static Item blankSpell;
public static Item masterBloodOrb;
public static Item alchemyFlask;
public static Item standardBindingAgent;
public static Item mundanePowerCatalyst;
public static Item averagePowerCatalyst;
public static Item greaterPowerCatalyst;
public static Item mundaneLengtheningCatalyst;
public static Item averageLengtheningCatalyst;
public static Item greaterLengtheningCatalyst;
public static Item incendium;
public static Item magicales;
public static Item sanctus;
public static Item aether;
public static Item simpleCatalyst;
public static Item crepitous;
public static Item crystallos;
public static Item terrae;
public static Item aquasalus;
public static Item tennebrae;
public static Item demonBloodShard;
public static Item archmageBloodOrb;
public static Item sigilOfWind;
public static Item telepositionFocus;
public static Item enhancedTelepositionFocus;
public static Item reinforcedTelepositionFocus;
public static Item demonicTelepositionFocus;
public static Item imbuedSlate;
public static Item demonicSlate;
public static Item duskScribeTool;
public static Item sigilOfTheBridge;
public static Item armourInhibitor;
public static Item creativeFiller;
public static Item demonPlacer;
public static Item itemBloodRuneBlock;
public static Item weakFillingAgent;
public static Item standardFillingAgent;
public static Item enhancedFillingAgent;
public static Item weakBindingAgent;
public static Item itemRitualDiviner;
public static Item sanguineHelmet;
public static Item focusBloodBlast;
public static Item focusGravityWell;
public static Item sigilOfMagnetism;
public static Item itemKeyOfDiablo;
public static Item energyBazooka;
public static Item itemBloodLightSigil;
public static void init()
{
weakBloodOrb = new EnergyBattery(AlchemicalWizardry.weakBloodOrbItemID, 5000).setUnlocalizedName("weakBloodOrb");
apprenticeBloodOrb = new ApprenticeBloodOrb(AlchemicalWizardry.apprenticeBloodOrbItemID, 25000).setUnlocalizedName("apprenticeBloodOrb");
magicianBloodOrb = new MagicianBloodOrb(AlchemicalWizardry.magicianBloodOrbItemID, 150000).setUnlocalizedName("magicianBloodOrb");
masterBloodOrb = new MasterBloodOrb(AlchemicalWizardry.masterBloodOrbItemID, 1000000).setUnlocalizedName("masterBloodOrb");
archmageBloodOrb = new ArchmageBloodOrb(AlchemicalWizardry.archmageBloodOrbItemID, 10000000).setUnlocalizedName("archmageBloodOrb");
energyBlaster = new EnergyBlast(AlchemicalWizardry.energyBlasterItemID).setUnlocalizedName("energyBlast");
energySword = new EnergySword(AlchemicalWizardry.energySwordItemID).setUnlocalizedName("energySword");
lavaCrystal = new LavaCrystal(AlchemicalWizardry.lavaCrystalItemID).setUnlocalizedName("lavaCrystal");
waterSigil = new WaterSigil(AlchemicalWizardry.waterSigilItemID).setUnlocalizedName("waterSigil");
lavaSigil = new LavaSigil(AlchemicalWizardry.lavaSigilItemID).setUnlocalizedName("lavaSigil");
voidSigil = new VoidSigil(AlchemicalWizardry.voidSigilItemID).setUnlocalizedName("voidSigil");
blankSlate = new AWBaseItems(AlchemicalWizardry.blankSlateItemID).setUnlocalizedName("blankSlate");
reinforcedSlate = new AWBaseItems(AlchemicalWizardry.reinforcedSlateItemID).setUnlocalizedName("reinforcedSlate");
sacrificialDagger = new SacrificialDagger(AlchemicalWizardry.sacrificialDaggerItemID).setUnlocalizedName("sacrificialDagger");
daggerOfSacrifice = new DaggerOfSacrifice(AlchemicalWizardry.daggerOfSacrificeItemID).setUnlocalizedName("daggerOfSacrifice");
airSigil = new AirSigil(AlchemicalWizardry.airSigilItemID).setUnlocalizedName("airSigil");
sigilOfTheFastMiner = new SigilOfTheFastMiner(AlchemicalWizardry.sigilOfTheFastMinerItemID).setUnlocalizedName("sigilOfTheFastMiner");
sigilOfElementalAffinity = new SigilOfElementalAffinity(AlchemicalWizardry.sigilOfElementalAffinityItemID).setUnlocalizedName("sigilOfElementalAffinity");
sigilOfHaste = new SigilOfHaste(AlchemicalWizardry.sigilOfHasteItemID).setUnlocalizedName("sigilOfHaste");
sigilOfHolding = new SigilOfHolding(AlchemicalWizardry.sigilOfHoldingItemID).setUnlocalizedName("sigilOfHolding");
divinationSigil = new DivinationSigil(AlchemicalWizardry.divinationSigilItemID).setUnlocalizedName("divinationSigil");
waterScribeTool = new WaterScribeTool(AlchemicalWizardry.waterScribeToolItemID).setUnlocalizedName("waterScribeTool");
fireScribeTool = new FireScribeTool(AlchemicalWizardry.fireScribeToolItemID).setUnlocalizedName("fireScribeTool");
earthScribeTool = new EarthScribeTool(AlchemicalWizardry.earthScribeToolItemID).setUnlocalizedName("earthScribeTool");
airScribeTool = new AirScribeTool(AlchemicalWizardry.airScribeToolItemID).setUnlocalizedName("airScribeTool");
activationCrystal = new ActivationCrystal(AlchemicalWizardry.weakActivationCrystalItemID);
boundPickaxe = new BoundPickaxe(AlchemicalWizardry.boundPickaxeItemID).setUnlocalizedName("boundPickaxe");
boundAxe = new BoundAxe(AlchemicalWizardry.boundAxeItemID).setUnlocalizedName("boundAxe");
boundShovel = new BoundShovel(AlchemicalWizardry.boundShovelItemID).setUnlocalizedName("boundShovel");
boundHelmet = new BoundArmour(AlchemicalWizardry.boundHelmetItemID, 0).setUnlocalizedName("boundHelmet");
boundPlate = new BoundArmour(AlchemicalWizardry.boundPlateItemID, 1).setUnlocalizedName("boundPlate");
boundLeggings = new BoundArmour(AlchemicalWizardry.boundLeggingsItemID, 2).setUnlocalizedName("boundLeggings");
boundBoots = new BoundArmour(AlchemicalWizardry.boundBootsItemID, 3).setUnlocalizedName("boundBoots");
weakBloodShard = new BloodShard(AlchemicalWizardry.weakBloodShardItemID).setUnlocalizedName("weakBloodShard");
growthSigil = new SigilOfGrowth(AlchemicalWizardry.growthSigilItemID).setUnlocalizedName("growthSigil");
blankSpell = new BlankSpell(AlchemicalWizardry.blankSpellItemID).setUnlocalizedName("blankSpell");
alchemyFlask = new AlchemyFlask(AlchemicalWizardry.alchemyFlaskItemID).setUnlocalizedName("alchemyFlask");
standardBindingAgent = new StandardBindingAgent(AlchemicalWizardry.standardBindingAgentItemID).setUnlocalizedName("standardBindingAgent");
mundanePowerCatalyst = new MundanePowerCatalyst(AlchemicalWizardry.mundanePowerCatalystItemID).setUnlocalizedName("mundanePowerCatalyst");
averagePowerCatalyst = new AveragePowerCatalyst(AlchemicalWizardry.averagePowerCatalystItemID).setUnlocalizedName("averagePowerCatalyst");
greaterPowerCatalyst = new GreaterPowerCatalyst(AlchemicalWizardry.greaterPowerCatalystItemID).setUnlocalizedName("greaterPowerCatalyst");
mundaneLengtheningCatalyst = new MundaneLengtheningCatalyst(AlchemicalWizardry.mundaneLengtheningCatalystItemID).setUnlocalizedName("mundaneLengtheningCatalyst");
averageLengtheningCatalyst = new AverageLengtheningCatalyst(AlchemicalWizardry.averageLengtheningCatalystItemID).setUnlocalizedName("averageLengtheningCatalyst");
greaterLengtheningCatalyst = new GreaterLengtheningCatalyst(AlchemicalWizardry.greaterLengtheningCatalystItemID).setUnlocalizedName("greaterLengtheningCatalyst");
incendium = new AlchemyReagent(AlchemicalWizardry.incendiumItemID).setUnlocalizedName("incendium");
magicales = new AlchemyReagent(AlchemicalWizardry.magicalesItemID).setUnlocalizedName("magicales");
sanctus = new AlchemyReagent(AlchemicalWizardry.sanctusItemID).setUnlocalizedName("sanctus");
aether = new AlchemyReagent(AlchemicalWizardry.aetherItemID).setUnlocalizedName("aether");
simpleCatalyst = new AlchemyReagent(AlchemicalWizardry.simpleCatalystItemID).setUnlocalizedName("simpleCatalyst");
crepitous = new AlchemyReagent(AlchemicalWizardry.crepitousItemID).setUnlocalizedName("crepitous");
crystallos = new AlchemyReagent(AlchemicalWizardry.crystallosItemID).setUnlocalizedName("crystallos");
terrae = new AlchemyReagent(AlchemicalWizardry.terraeItemID).setUnlocalizedName("terrae");
aquasalus = new AlchemyReagent(AlchemicalWizardry.aquasalusItemID).setUnlocalizedName("aquasalus");
tennebrae = new AlchemyReagent(AlchemicalWizardry.tennebraeItemID).setUnlocalizedName("tennebrae");
demonBloodShard = new BloodShard(AlchemicalWizardry.demonBloodShardItemID).setUnlocalizedName("demonBloodShard");
sigilOfWind = new SigilOfWind(AlchemicalWizardry.sigilOfWindItemID).setUnlocalizedName("sigilOfWind");
telepositionFocus = new TelepositionFocus(AlchemicalWizardry.telepositionFocusItemID, 1).setUnlocalizedName("telepositionFocus");
enhancedTelepositionFocus = new EnhancedTelepositionFocus(AlchemicalWizardry.enhancedTelepositionFocusItemID).setUnlocalizedName("enhancedTelepositionFocus");
reinforcedTelepositionFocus = new ReinforcedTelepositionFocus(AlchemicalWizardry.reinforcedTelepositionFocusItemID).setUnlocalizedName("reinforcedTelepositionFocus");
demonicTelepositionFocus = new DemonicTelepositionFocus(AlchemicalWizardry.demonicTelepositionFocusItemID).setUnlocalizedName("demonicTelepositionFocus");
imbuedSlate = new AWBaseItems(AlchemicalWizardry.imbuedSlateItemID).setUnlocalizedName("imbuedSlate");
demonicSlate = new AWBaseItems(AlchemicalWizardry.demonicSlateItemID).setUnlocalizedName("demonicSlate");
duskScribeTool = new DuskScribeTool(AlchemicalWizardry.duskScribeToolItemID).setUnlocalizedName("duskScribeTool");
sigilOfTheBridge = new SigilOfTheBridge(AlchemicalWizardry.sigilOfTheBridgeItemID).setUnlocalizedName("sigilOfTheBridge");
armourInhibitor = new ArmourInhibitor(AlchemicalWizardry.armourInhibitorItemID).setUnlocalizedName("armourInhibitor");
creativeFiller = new CheatyItem(AlchemicalWizardry.creativeFillerItemID).setUnlocalizedName("cheatyItem");
demonPlacer = new DemonPlacer(AlchemicalWizardry.demonPlacerItemID).setUnlocalizedName("demonPlacer");
weakFillingAgent = new WeakFillingAgent(AlchemicalWizardry.weakFillingAgentItemID).setUnlocalizedName("weakFillingAgent");
standardFillingAgent = new StandardFillingAgent(AlchemicalWizardry.standardFillingAgentItemID).setUnlocalizedName("standardFillingAgent");
enhancedFillingAgent = new EnhancedFillingAgent(AlchemicalWizardry.enhancedFillingAgentItemID).setUnlocalizedName("enhancedFillingAgent");
weakBindingAgent = new WeakBindingAgent(AlchemicalWizardry.weakBindingAgentItemID).setUnlocalizedName("weakBindingAgent");
itemRitualDiviner = new ItemRitualDiviner(AlchemicalWizardry.itemRitualDivinerItemID).setUnlocalizedName("ritualDiviner");
sigilOfMagnetism = new SigilOfMagnetism(AlchemicalWizardry.sigilOfMagnetismItemID).setUnlocalizedName("sigilOfMagnetism");
itemKeyOfDiablo = new ItemDiabloKey(AlchemicalWizardry.itemKeyOfDiabloItemID).setUnlocalizedName("itemDiabloKey");
energyBazooka = new EnergyBazooka(AlchemicalWizardry.energyBazookaItemID).setUnlocalizedName("energyBazooka");
itemBloodLightSigil = new ItemBloodLightSigil(AlchemicalWizardry.itemBloodLightSigilItemID).setUnlocalizedName("bloodLightSigil");
}
}

2
BM_src/WayofTime/alchemicalWizardry/common/ModLivingDropsEvent.java
View file

@ -26,7 +26,7 @@ public class ModLivingDropsEvent
if (effect.getAmplifier() >= 2)
if (rand < 0.50d)
{
event.entityLiving.dropItem(AlchemicalWizardry.weakBloodShard.itemID, 1);
event.entityLiving.dropItem(ModItems.weakBloodShard.itemID, 1);
}
}
}

155
BM_src/WayofTime/alchemicalWizardry/common/PacketHandler.java
View file

@ -1,28 +1,12 @@
package WayofTime.alchemicalWizardry.common;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
import java.util.Random;
import WayofTime.alchemicalWizardry.common.bloodAltarUpgrade.UpgradedAltars;
import WayofTime.alchemicalWizardry.common.tileEntity.TEAltar;
import WayofTime.alchemicalWizardry.common.tileEntity.TEOrientable;
import WayofTime.alchemicalWizardry.common.tileEntity.TEPedestal;
import WayofTime.alchemicalWizardry.common.tileEntity.TEPlinth;
import WayofTime.alchemicalWizardry.common.tileEntity.TESocket;
import WayofTime.alchemicalWizardry.common.tileEntity.TETeleposer;
import WayofTime.alchemicalWizardry.common.tileEntity.TEWritingTable;
import WayofTime.alchemicalWizardry.common.tileEntity.*;
import com.google.common.io.ByteArrayDataInput;
import com.google.common.io.ByteStreams;
import net.minecraft.block.Block;
import net.minecraft.client.Minecraft;
import cpw.mods.fml.common.network.IPacketHandler;
import cpw.mods.fml.common.network.Player;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.network.INetworkManager;
import net.minecraft.network.packet.Packet;
import net.minecraft.network.packet.Packet250CustomPayload;
@ -32,11 +16,10 @@ import net.minecraft.util.ChatMessageComponent;
import net.minecraft.util.DamageSource;
import net.minecraft.world.World;
import net.minecraftforge.common.ForgeDirection;
import net.minecraftforge.fluids.Fluid;
import net.minecraftforge.fluids.FluidStack;
import cpw.mods.fml.common.network.IPacketHandler;
import cpw.mods.fml.common.network.PacketDispatcher;
import cpw.mods.fml.common.network.Player;
import java.io.*;
import java.util.Random;
public class PacketHandler implements IPacketHandler
{
@ -80,15 +63,13 @@ public class PacketHandler implements IPacketHandler
FluidStack flInput = new FluidStack(fluidIDInput, fluidAmountInput);
tileEntityAltar.handlePacketData(items, flMain, flOutput, flInput, capacity);
}
}
else if (packet.channel.equals("FallReset"))
} else if (packet.channel.equals("FallReset"))
{
if (player instanceof EntityPlayer)
{
((EntityPlayer) player).fallDistance = 0;
}
}
else if (packet.channel.equals("particle"))
} else if (packet.channel.equals("particle"))
{
ByteArrayInputStream bin = new ByteArrayInputStream(packet.data);
DataInputStream din = new DataInputStream(bin);
@ -129,13 +110,11 @@ public class PacketHandler implements IPacketHandler
world.spawnParticle("reddust", x + Math.random() - Math.random(), y + Math.random() - Math.random(), z + Math.random() - Math.random(), f1, f2, f3);
}
}
}
catch (IOException e)
} catch (IOException e)
{
e.printStackTrace();
}
}
else if (packet.channel.equals("CustomParticle"))
} else if (packet.channel.equals("CustomParticle"))
{
ByteArrayInputStream bin = new ByteArrayInputStream(packet.data);
DataInputStream din = new DataInputStream(bin);
@ -159,13 +138,11 @@ public class PacketHandler implements IPacketHandler
double yVel = din.readDouble();
double zVel = din.readDouble();
world.spawnParticle(str, x, y, z, xVel, yVel, zVel);
}
catch (IOException e)
} catch (IOException e)
{
e.printStackTrace();
}
}
else if (packet.channel.equals("SetLifeEssence")) //Sets the data for the character
} else if (packet.channel.equals("SetLifeEssence")) //Sets the data for the character
{
ByteArrayInputStream bin = new ByteArrayInputStream(packet.data);
DataInputStream din = new DataInputStream(bin);
@ -215,8 +192,7 @@ public class PacketHandler implements IPacketHandler
}
}
}
}
else
} else
{
int removedEssence = -addedEssence;
@ -224,8 +200,7 @@ public class PacketHandler implements IPacketHandler
{
data.currentEssence -= removedEssence;
data.markDirty();
}
else
} else
{
if (removedEssence >= 100)
{
@ -241,8 +216,7 @@ public class PacketHandler implements IPacketHandler
return;
}
}
}
else
} else
{
if (user.worldObj.rand.nextInt(100) <= removedEssence)
{
@ -262,13 +236,11 @@ public class PacketHandler implements IPacketHandler
//PacketDispatcher.sendPacketToPlayer(PacketHandler.getPacket(ownerName), (Player)user);
// data.currentEssence = addedEssence;
// data.markDirty();
}
catch (IOException e)
} catch (IOException e)
{
e.printStackTrace();
}
}
else if (packet.channel.equals("InfiniteLPPath"))
} else if (packet.channel.equals("InfiniteLPPath"))
{
ByteArrayInputStream bin = new ByteArrayInputStream(packet.data);
DataInputStream din = new DataInputStream(bin);
@ -298,8 +270,7 @@ public class PacketHandler implements IPacketHandler
{
data.currentEssence += 1000000;
data.markDirty();
}
else
} else
{
data.currentEssence = 0;
data.markDirty();
@ -308,13 +279,11 @@ public class PacketHandler implements IPacketHandler
//PacketDispatcher.sendPacketToPlayer(PacketHandler.getPacket(ownerName), (Player)user);
// data.currentEssence = addedEssence;
// data.markDirty();
}
catch (IOException e)
} catch (IOException e)
{
e.printStackTrace();
}
}
else if (packet.channel.equals("GetLifeEssence"))
} else if (packet.channel.equals("GetLifeEssence"))
{
ByteArrayInputStream bin = new ByteArrayInputStream(packet.data);
DataInputStream din = new DataInputStream(bin);
@ -346,13 +315,11 @@ public class PacketHandler implements IPacketHandler
chatmessagecomponent.addText("Current Essence: " + data.currentEssence + "LP");
owner.sendChatToPlayer(chatmessagecomponent);
}
}
catch (IOException e)
} catch (IOException e)
{
e.printStackTrace();
}
}
else if (packet.channel.equals("GetAltarEssence"))
} else if (packet.channel.equals("GetAltarEssence"))
{
ByteArrayInputStream bin = new ByteArrayInputStream(packet.data);
DataInputStream din = new DataInputStream(bin);
@ -378,13 +345,11 @@ public class PacketHandler implements IPacketHandler
owner.sendChatToPlayer(chatmessagecomponent);
}
}
}
catch (IOException e)
} catch (IOException e)
{
e.printStackTrace();
}
}
else if (packet.channel.equals("TESocket"))
} else if (packet.channel.equals("TESocket"))
{
ByteArrayDataInput dat = ByteStreams.newDataInput(packet.data);
int x = dat.readInt();
@ -411,8 +376,7 @@ public class PacketHandler implements IPacketHandler
TESocket tileEntityAltar = (TESocket) tileEntity;
tileEntityAltar.handlePacketData(items);
}
}
else if (packet.channel.equals("TEWritingTable"))
} else if (packet.channel.equals("TEWritingTable"))
{
ByteArrayDataInput dat = ByteStreams.newDataInput(packet.data);
int x = dat.readInt();
@ -439,8 +403,7 @@ public class PacketHandler implements IPacketHandler
TEWritingTable tileEntityAltar = (TEWritingTable) tileEntity;
tileEntityAltar.handlePacketData(items);
}
}
else if (packet.channel.equals("TEOrientor"))
} else if (packet.channel.equals("TEOrientor"))
{
ByteArrayDataInput dat = ByteStreams.newDataInput(packet.data);
int x = dat.readInt();
@ -455,8 +418,7 @@ public class PacketHandler implements IPacketHandler
tileEntityOrientable.setInputDirection(ForgeDirection.getOrientation(dat.readInt()));
tileEntityOrientable.setOutputDirection(ForgeDirection.getOrientation(dat.readInt()));
}
}
else if (packet.channel.equals("TEPedestal"))
} else if (packet.channel.equals("TEPedestal"))
{
ByteArrayDataInput dat = ByteStreams.newDataInput(packet.data);
int x = dat.readInt();
@ -483,8 +445,7 @@ public class PacketHandler implements IPacketHandler
TEPedestal tileEntityAltar = (TEPedestal) tileEntity;
tileEntityAltar.handlePacketData(items);
}
}
else if (packet.channel.equals("TEPlinth"))
} else if (packet.channel.equals("TEPlinth"))
{
ByteArrayDataInput dat = ByteStreams.newDataInput(packet.data);
int x = dat.readInt();
@ -511,8 +472,7 @@ public class PacketHandler implements IPacketHandler
TEPlinth tileEntityAltar = (TEPlinth) tileEntity;
tileEntityAltar.handlePacketData(items);
}
}
else if (packet.channel.equals("TETeleposer"))
} else if (packet.channel.equals("TETeleposer"))
{
ByteArrayDataInput dat = ByteStreams.newDataInput(packet.data);
int x = dat.readInt();
@ -539,16 +499,14 @@ public class PacketHandler implements IPacketHandler
TETeleposer tileEntityAltar = (TETeleposer) tileEntity;
tileEntityAltar.handlePacketData(items);
}
}
else if (packet.channel.equals("SetPlayerVel"))
} else if (packet.channel.equals("SetPlayerVel"))
{
ByteArrayDataInput dat = ByteStreams.newDataInput(packet.data);
double xVel = dat.readDouble();
double yVel = dat.readDouble();
double zVel = dat.readDouble();
((EntityPlayer) player).setVelocity(xVel, yVel, zVel);
}
else if (packet.channel.equals("SetPlayerPos"))
} else if (packet.channel.equals("SetPlayerPos"))
{
ByteArrayDataInput dat = ByteStreams.newDataInput(packet.data);
double xVel = dat.readDouble();
@ -586,8 +544,7 @@ public class PacketHandler implements IPacketHandler
{
dos.writeInt(AlchemicalWizardry.lifeEssenceFluid.getBlockID());
dos.writeInt(0);
}
else
} else
{
dos.writeInt(flMain.fluidID);
dos.writeInt(flMain.amount);
@ -599,8 +556,7 @@ public class PacketHandler implements IPacketHandler
{
dos.writeInt(AlchemicalWizardry.lifeEssenceFluid.getBlockID());
dos.writeInt(0);
}
else
} else
{
dos.writeInt(flOut.fluidID);
dos.writeInt(flOut.amount);
@ -612,16 +568,14 @@ public class PacketHandler implements IPacketHandler
{
dos.writeInt(AlchemicalWizardry.lifeEssenceFluid.getBlockID());
dos.writeInt(0);
}
else
} else
{
dos.writeInt(flIn.fluidID);
dos.writeInt(flIn.amount);
}
dos.writeInt(tileEntity.capacity);
}
catch (IOException e)
} catch (IOException e)
{
e.printStackTrace();
}
@ -655,8 +609,7 @@ public class PacketHandler implements IPacketHandler
dos.writeInt(items[i]);
}
}
}
catch (IOException e)
} catch (IOException e)
{
e.printStackTrace();
}
@ -681,8 +634,7 @@ public class PacketHandler implements IPacketHandler
dos.writeChars(ownerName);
dos.writeInt(addedEssence);
dos.writeInt(maxEssence); //Used for Blood Orbs, but does nothing for other items
}
catch (IOException e)
} catch (IOException e)
{
e.printStackTrace();
}
@ -704,8 +656,7 @@ public class PacketHandler implements IPacketHandler
{
dos.writeInt(ownerName.length());
dos.writeChars(ownerName);
}
catch (IOException e)
} catch (IOException e)
{
e.printStackTrace();
}
@ -728,8 +679,7 @@ public class PacketHandler implements IPacketHandler
dos.writeInt(x);
dos.writeInt(y);
dos.writeInt(z);
}
catch (IOException e)
} catch (IOException e)
{
e.printStackTrace();
}
@ -764,8 +714,7 @@ public class PacketHandler implements IPacketHandler
dos.writeInt(items[i]);
}
}
}
catch (IOException e)
} catch (IOException e)
{
e.printStackTrace();
}
@ -800,8 +749,7 @@ public class PacketHandler implements IPacketHandler
dos.writeInt(items[i]);
}
}
}
catch (IOException e)
} catch (IOException e)
{
e.printStackTrace();
}
@ -836,8 +784,7 @@ public class PacketHandler implements IPacketHandler
dos.writeInt(items[i]);
}
}
}
catch (IOException e)
} catch (IOException e)
{
e.printStackTrace();
}
@ -872,8 +819,7 @@ public class PacketHandler implements IPacketHandler
dos.writeInt(items[i]);
}
}
}
catch (IOException e)
} catch (IOException e)
{
e.printStackTrace();
}
@ -901,8 +847,7 @@ public class PacketHandler implements IPacketHandler
dos.writeDouble(xVel);
dos.writeDouble(yVel);
dos.writeDouble(zVel);
}
catch (IOException e)
} catch (IOException e)
{
e.printStackTrace();
}
@ -925,8 +870,7 @@ public class PacketHandler implements IPacketHandler
dos.writeDouble(xVel);
dos.writeDouble(yVel);
dos.writeDouble(zVel);
}
catch (IOException e)
} catch (IOException e)
{
e.printStackTrace();
}
@ -949,8 +893,7 @@ public class PacketHandler implements IPacketHandler
dos.writeDouble(xVel);
dos.writeDouble(yVel);
dos.writeDouble(zVel);
}
catch (IOException e)
} catch (IOException e)
{
e.printStackTrace();
}
@ -973,8 +916,7 @@ public class PacketHandler implements IPacketHandler
dos.writeInt(ownerName.length());
dos.writeChars(ownerName);
dos.writeBoolean(isFill);
}
catch (IOException e)
} catch (IOException e)
{
e.printStackTrace();
}
@ -999,8 +941,7 @@ public class PacketHandler implements IPacketHandler
dos.writeInt(tileEntity.zCoord);
dos.writeInt(tileEntity.getIntForForgeDirection(tileEntity.getInputDirection()));
dos.writeInt(tileEntity.getIntForForgeDirection(tileEntity.getOutputDirection()));
}
catch (IOException e)
} catch (IOException e)
{
e.printStackTrace();
}

13
BM_src/WayofTime/alchemicalWizardry/common/alchemy/AlchemicalPotionCreationHandler.java
View file

@ -1,12 +1,13 @@
package WayofTime.alchemicalWizardry.common.alchemy;
import java.util.ArrayList;
import WayofTime.alchemicalWizardry.common.AlchemicalWizardry;
import WayofTime.alchemicalWizardry.common.ModItems;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.potion.Potion;
import java.util.ArrayList;
public class AlchemicalPotionCreationHandler
{
public static ArrayList<AlchemyPotionHandlerComponent> registeredPotionEffects = new ArrayList();
@ -21,7 +22,7 @@ public class AlchemicalPotionCreationHandler
addPotion(new ItemStack(Item.spiderEye), Potion.poison.id, 450);
addPotion(new ItemStack(Item.fermentedSpiderEye), Potion.weakness.id, 450);
addPotion(new ItemStack(Item.blazePowder), Potion.damageBoost.id, 2 * 60 * 20);
addPotion(new ItemStack(AlchemicalWizardry.aether), Potion.jump.id, 2 * 60 * 20);
addPotion(new ItemStack(ModItems.aether), Potion.jump.id, 2 * 60 * 20);
addPotion(new ItemStack(Item.clay), Potion.moveSlowdown.id, 450);
addPotion(new ItemStack(Item.redstone), Potion.digSpeed.id, 2 * 60 * 20);
addPotion(new ItemStack(Item.potion, 1, 0), AlchemicalWizardry.customPotionDrowning.id, 450);
@ -29,9 +30,9 @@ public class AlchemicalPotionCreationHandler
addPotion(new ItemStack(Item.glassBottle), Potion.invisibility.id, 2 * 60 * 20);
addPotion(new ItemStack(Item.diamond), Potion.resistance.id, 2 * 60 * 20);
addPotion(new ItemStack(Item.poisonousPotato), Potion.field_76443_y.id, 2); //saturation
addPotion(new ItemStack(AlchemicalWizardry.demonBloodShard), Potion.field_76434_w.id, 4 * 60 * 20); //health boost
addPotion(new ItemStack(AlchemicalWizardry.weakBloodShard), Potion.field_76444_x.id, 4 * 60 * 20); //Absorption
addPotion(new ItemStack(AlchemicalWizardry.terrae), AlchemicalWizardry.customPotionBoost.id, 1 * 60 * 20);
addPotion(new ItemStack(ModItems.demonBloodShard), Potion.field_76434_w.id, 4 * 60 * 20); //health boost
addPotion(new ItemStack(ModItems.weakBloodShard), Potion.field_76444_x.id, 4 * 60 * 20); //Absorption
addPotion(new ItemStack(ModItems.terrae), AlchemicalWizardry.customPotionBoost.id, 1 * 60 * 20);
addPotion(new ItemStack(Item.feather), AlchemicalWizardry.customPotionFlight.id, 1 * 60 * 20);
addPotion(new ItemStack(Item.arrow), AlchemicalWizardry.customPotionReciprocation.id, 1 * 60 * 20);
}

3
BM_src/WayofTime/alchemicalWizardry/common/alchemy/AlchemyPotionHandlerComponent.java
View file

@ -26,8 +26,7 @@ public class AlchemyPotionHandlerComponent
{
return comparedStack.itemID == itemStack.itemID && comparedStack.getItemDamage() == itemStack.getItemDamage();
}
}
else if (!(itemStack.getItem() instanceof ItemBlock))
} else if (!(itemStack.getItem() instanceof ItemBlock))
{
return comparedStack.itemID == itemStack.itemID && comparedStack.getItemDamage() == itemStack.getItemDamage();
}

9
BM_src/WayofTime/alchemicalWizardry/common/alchemy/AlchemyRecipe.java
View file

@ -42,16 +42,14 @@ public class AlchemyRecipe
if (i + 1 > this.recipe.length)
{
newRecipe[i] = null;
}
else
} else
{
newRecipe[i] = this.recipe[i];
}
}
recipe = newRecipe;
}
else
} else
{
recipe = this.recipe;
}
@ -96,8 +94,7 @@ public class AlchemyRecipe
{
quickTest = true;
}
}
else if (!(checkedItemStack.getItem() instanceof ItemBlock))
} else if (!(checkedItemStack.getItem() instanceof ItemBlock))
{
quickTest = true;
}

6
BM_src/WayofTime/alchemicalWizardry/common/alchemy/AlchemyRecipeRegistry.java
View file

@ -1,11 +1,11 @@
package WayofTime.alchemicalWizardry.common.alchemy;
import WayofTime.alchemicalWizardry.common.items.EnergyBattery;
import net.minecraft.item.ItemStack;
import java.util.ArrayList;
import java.util.List;
import net.minecraft.item.ItemStack;
import WayofTime.alchemicalWizardry.common.items.EnergyBattery;
public class AlchemyRecipeRegistry
{
public static List<AlchemyRecipe> recipes = new ArrayList();

21
BM_src/WayofTime/alchemicalWizardry/common/block/ArmourForge.java
View file

@ -1,14 +1,15 @@
package WayofTime.alchemicalWizardry.common.block;
import java.util.ArrayList;
import java.util.List;
import WayofTime.alchemicalWizardry.common.AlchemicalWizardry;
import WayofTime.alchemicalWizardry.common.ArmourComponent;
import WayofTime.alchemicalWizardry.common.ArmourUpgrade;
import WayofTime.alchemicalWizardry.common.ModItems;
import WayofTime.alchemicalWizardry.common.items.BoundArmour;
import WayofTime.alchemicalWizardry.common.tileEntity.TEAltar;
import WayofTime.alchemicalWizardry.common.tileEntity.TESocket;
import cpw.mods.fml.common.network.PacketDispatcher;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.block.Block;
import net.minecraft.block.material.Material;
import net.minecraft.client.renderer.texture.IconRegister;
@ -20,9 +21,9 @@ import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.World;
import cpw.mods.fml.common.network.PacketDispatcher;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import java.util.ArrayList;
import java.util.List;
public class ArmourForge extends Block
{
@ -77,22 +78,22 @@ public class ArmourForge extends Block
{
case 0:
list = plateList;
armourPiece = new ItemStack(AlchemicalWizardry.boundPlate.itemID, 1, 0);
armourPiece = new ItemStack(ModItems.boundPlate.itemID, 1, 0);
break;
case 1:
list = leggingsList;
armourPiece = new ItemStack(AlchemicalWizardry.boundLeggings.itemID, 1, 0);
armourPiece = new ItemStack(ModItems.boundLeggings.itemID, 1, 0);
break;
case 2:
list = helmetList;
armourPiece = new ItemStack(AlchemicalWizardry.boundHelmet.itemID, 1, 0);
armourPiece = new ItemStack(ModItems.boundHelmet.itemID, 1, 0);
break;
case 3:
list = bootsList;
armourPiece = new ItemStack(AlchemicalWizardry.boundBoots.itemID, 1, 0);
armourPiece = new ItemStack(ModItems.boundBoots.itemID, 1, 0);
break;
}

32
BM_src/WayofTime/alchemicalWizardry/common/block/BlockAltar.java
View file

@ -1,7 +1,14 @@
package WayofTime.alchemicalWizardry.common.block;
import java.util.Random;
import WayofTime.alchemicalWizardry.common.AlchemicalWizardry;
import WayofTime.alchemicalWizardry.common.ModItems;
import WayofTime.alchemicalWizardry.common.PacketHandler;
import WayofTime.alchemicalWizardry.common.items.EnergyBattery;
import WayofTime.alchemicalWizardry.common.items.sigil.SigilOfHolding;
import WayofTime.alchemicalWizardry.common.tileEntity.TEAltar;
import cpw.mods.fml.common.network.PacketDispatcher;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.block.BlockContainer;
import net.minecraft.block.material.Material;
import net.minecraft.client.renderer.texture.IconRegister;
@ -14,14 +21,8 @@ import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.Icon;
import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World;
import WayofTime.alchemicalWizardry.common.AlchemicalWizardry;
import WayofTime.alchemicalWizardry.common.PacketHandler;
import WayofTime.alchemicalWizardry.common.items.EnergyBattery;
import WayofTime.alchemicalWizardry.common.items.sigil.SigilOfHolding;
import WayofTime.alchemicalWizardry.common.tileEntity.TEAltar;
import cpw.mods.fml.common.network.PacketDispatcher;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import java.util.Random;
public class BlockAltar extends BlockContainer
{
@ -33,6 +34,7 @@ public class BlockAltar extends BlockContainer
private static Icon sideIcon2;
@SideOnly(Side.CLIENT)
private static Icon bottomIcon;
public BlockAltar(int id)
{
super(id, Material.rock);
@ -90,7 +92,7 @@ public class BlockAltar extends BlockContainer
if (playerItem != null)
{
if (playerItem.getItem().itemID == AlchemicalWizardry.divinationSigil.itemID)
if (playerItem.getItem().itemID == ModItems.divinationSigil.itemID)
{
if (player.worldObj.isRemote)
{
@ -98,12 +100,11 @@ public class BlockAltar extends BlockContainer
}
return true;
}
else if (playerItem.getItem().itemID == AlchemicalWizardry.sigilOfHolding.itemID)
} else if (playerItem.getItem().itemID == ModItems.sigilOfHolding.itemID)
{
ItemStack item = ((SigilOfHolding) playerItem.getItem()).getCurrentItem(playerItem);
if (item != null && item.getItem().itemID == AlchemicalWizardry.divinationSigil.itemID)
if (item != null && item.getItem().itemID == ModItems.divinationSigil.itemID)
{
if (player.worldObj.isRemote)
{
@ -126,8 +127,7 @@ public class BlockAltar extends BlockContainer
--playerItem.stackSize;
tileEntity.setInventorySlotContents(0, newItem);
tileEntity.startCycle();
}
else if (tileEntity.getStackInSlot(0) != null && playerItem == null)
} else if (tileEntity.getStackInSlot(0) != null && playerItem == null)
{
/**stub method
* Add the item that is in the slot to the player's inventory, and

6
BM_src/WayofTime/alchemicalWizardry/common/block/BlockBloodLightSource.java
View file

@ -1,8 +1,5 @@
package WayofTime.alchemicalWizardry.common.block;
import java.util.List;
import java.util.Random;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.block.Block;
@ -13,6 +10,9 @@ import net.minecraft.util.AxisAlignedBB;
import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World;
import java.util.List;
import java.util.Random;
public class BlockBloodLightSource extends Block
{
public BlockBloodLightSource(int par1)

14
BM_src/WayofTime/alchemicalWizardry/common/block/BlockConduit.java
View file

@ -2,6 +2,8 @@ package WayofTime.alchemicalWizardry.common.block;
import WayofTime.alchemicalWizardry.common.AlchemicalWizardry;
import WayofTime.alchemicalWizardry.common.tileEntity.TEConduit;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.block.BlockContainer;
import net.minecraft.block.material.Material;
import net.minecraft.client.renderer.texture.IconRegister;
@ -10,8 +12,6 @@ import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.Icon;
import net.minecraft.world.World;
import net.minecraftforge.common.ForgeDirection;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
public class BlockConduit extends BlockContainer
{
@ -23,6 +23,7 @@ public class BlockConduit extends BlockContainer
private static Icon sideIcon2;
@SideOnly(Side.CLIENT)
private static Icon bottomIcon;
public BlockConduit(int id)
{
super(id, Material.rock);
@ -82,19 +83,16 @@ public class BlockConduit extends BlockContainer
{
((TEConduit) tile).setInputDirection(((TEConduit) tile).getOutputDirection());
((TEConduit) tile).setOutputDirection(sideClicked);
}
else if (((TEConduit)tile).getOutputDirection().equals(sideClicked))
} else if (((TEConduit) tile).getOutputDirection().equals(sideClicked))
{
((TEConduit) tile).setOutputDirection(((TEConduit) tile).getInputDirection());
((TEConduit) tile).setInputDirection(sideClicked);
}
else
} else
{
if (!player.isSneaking())
{
((TEConduit) tile).setOutputDirection(sideClicked);
}
else
} else
{
((TEConduit) tile).setOutputDirection(sideClicked.getOpposite());
}

10
BM_src/WayofTime/alchemicalWizardry/common/block/BlockHomHeart.java
View file

@ -1,5 +1,10 @@
package WayofTime.alchemicalWizardry.common.block;
import WayofTime.alchemicalWizardry.common.AlchemicalWizardry;
import WayofTime.alchemicalWizardry.common.items.BlankSpell;
import WayofTime.alchemicalWizardry.common.tileEntity.TEHomHeart;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.block.BlockContainer;
import net.minecraft.block.BlockGrass;
import net.minecraft.block.material.Material;
@ -10,11 +15,6 @@ import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.Icon;
import net.minecraft.world.World;
import WayofTime.alchemicalWizardry.common.AlchemicalWizardry;
import WayofTime.alchemicalWizardry.common.items.BlankSpell;
import WayofTime.alchemicalWizardry.common.tileEntity.TEHomHeart;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
public class BlockHomHeart extends BlockContainer
{

10
BM_src/WayofTime/alchemicalWizardry/common/block/BlockMasterStone.java
View file

@ -1,5 +1,10 @@
package WayofTime.alchemicalWizardry.common.block;
import WayofTime.alchemicalWizardry.common.AlchemicalWizardry;
import WayofTime.alchemicalWizardry.common.items.ActivationCrystal;
import WayofTime.alchemicalWizardry.common.tileEntity.TEMasterStone;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.block.BlockContainer;
import net.minecraft.block.material.Material;
import net.minecraft.client.renderer.texture.IconRegister;
@ -8,11 +13,6 @@ import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.World;
import WayofTime.alchemicalWizardry.common.AlchemicalWizardry;
import WayofTime.alchemicalWizardry.common.items.ActivationCrystal;
import WayofTime.alchemicalWizardry.common.tileEntity.TEMasterStone;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
public class BlockMasterStone extends BlockContainer
{

13
BM_src/WayofTime/alchemicalWizardry/common/block/BlockPedestal.java
View file

@ -1,13 +1,12 @@
package WayofTime.alchemicalWizardry.common.block;
import java.util.Random;
import WayofTime.alchemicalWizardry.common.AlchemicalWizardry;
import WayofTime.alchemicalWizardry.common.tileEntity.TEPedestal;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.block.BlockContainer;
import net.minecraft.block.material.Material;
import net.minecraft.client.renderer.texture.IconRegister;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.entity.item.EntityItem;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.inventory.IInventory;
@ -18,8 +17,8 @@ import net.minecraft.util.Icon;
import net.minecraft.util.MovingObjectPosition;
import net.minecraft.util.Vec3;
import net.minecraft.world.World;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import java.util.Random;
public class BlockPedestal extends BlockContainer
{
@ -31,6 +30,7 @@ public class BlockPedestal extends BlockContainer
private static Icon sideIcon2;
@SideOnly(Side.CLIENT)
private static Icon bottomIcon;
public BlockPedestal(int id)
{
super(id, Material.rock);
@ -90,8 +90,7 @@ public class BlockPedestal extends BlockContainer
newItem.stackSize = 1;
--playerItem.stackSize;
tileEntity.setInventorySlotContents(0, newItem);
}
else if (tileEntity.getStackInSlot(0) != null && playerItem == null)
} else if (tileEntity.getStackInSlot(0) != null && playerItem == null)
{
/**stub method
* Add the item that is in the slot to the player's inventory, and

13
BM_src/WayofTime/alchemicalWizardry/common/block/BlockPlinth.java
View file

@ -1,13 +1,12 @@
package WayofTime.alchemicalWizardry.common.block;
import java.util.Random;
import WayofTime.alchemicalWizardry.common.AlchemicalWizardry;
import WayofTime.alchemicalWizardry.common.tileEntity.TEPlinth;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.block.BlockContainer;
import net.minecraft.block.material.Material;
import net.minecraft.client.renderer.texture.IconRegister;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.entity.item.EntityItem;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.inventory.IInventory;
@ -18,8 +17,8 @@ import net.minecraft.util.Icon;
import net.minecraft.util.MovingObjectPosition;
import net.minecraft.util.Vec3;
import net.minecraft.world.World;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import java.util.Random;
public class BlockPlinth extends BlockContainer
{
@ -31,6 +30,7 @@ public class BlockPlinth extends BlockContainer
private static Icon sideIcon2;
@SideOnly(Side.CLIENT)
private static Icon bottomIcon;
public BlockPlinth(int id)
{
super(id, Material.rock);
@ -90,8 +90,7 @@ public class BlockPlinth extends BlockContainer
newItem.stackSize = 1;
--playerItem.stackSize;
tileEntity.setInventorySlotContents(0, newItem);
}
else if (tileEntity.getStackInSlot(0) != null && playerItem == null)
} else if (tileEntity.getStackInSlot(0) != null && playerItem == null)
{
/**stub method
* Add the item that is in the slot to the player's inventory, and

12
BM_src/WayofTime/alchemicalWizardry/common/block/BlockSocket.java
View file

@ -1,10 +1,10 @@
package WayofTime.alchemicalWizardry.common.block;
import java.util.Random;
import WayofTime.alchemicalWizardry.common.AlchemicalWizardry;
import WayofTime.alchemicalWizardry.common.ArmourUpgrade;
import WayofTime.alchemicalWizardry.common.tileEntity.TESocket;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.block.BlockContainer;
import net.minecraft.block.material.Material;
import net.minecraft.client.renderer.texture.IconRegister;
@ -16,8 +16,8 @@ import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.Icon;
import net.minecraft.world.World;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import java.util.Random;
public class BlockSocket extends BlockContainer
{
@ -29,6 +29,7 @@ public class BlockSocket extends BlockContainer
private static Icon sideIcon2;
@SideOnly(Side.CLIENT)
private static Icon bottomIcon;
public BlockSocket(int id)
{
super(id, Material.rock);
@ -91,8 +92,7 @@ public class BlockSocket extends BlockContainer
--playerItem.stackSize;
tileEntity.setInventorySlotContents(0, newItem);
}
}
else if (tileEntity.getStackInSlot(0) != null && playerItem == null)
} else if (tileEntity.getStackInSlot(0) != null && playerItem == null)
{
/**stub method
* Add the item that is in the slot to the player's inventory, and

9
BM_src/WayofTime/alchemicalWizardry/common/block/BlockTeleposer.java
View file

@ -1,10 +1,10 @@
package WayofTime.alchemicalWizardry.common.block;
import java.util.Random;
import WayofTime.alchemicalWizardry.common.AlchemicalWizardry;
import WayofTime.alchemicalWizardry.common.items.TelepositionFocus;
import WayofTime.alchemicalWizardry.common.tileEntity.TETeleposer;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.block.Block;
import net.minecraft.block.BlockContainer;
import net.minecraft.block.BlockMobSpawner;
@ -18,8 +18,8 @@ import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.Icon;
import net.minecraft.world.World;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import java.util.Random;
public class BlockTeleposer extends BlockContainer
{
@ -31,6 +31,7 @@ public class BlockTeleposer extends BlockContainer
private static Icon sideIcon2;
@SideOnly(Side.CLIENT)
private static Icon bottomIcon;
public BlockTeleposer(int id)
{
super(id, Material.rock);

9
BM_src/WayofTime/alchemicalWizardry/common/block/BlockWritingTable.java
View file

@ -1,8 +1,5 @@
package WayofTime.alchemicalWizardry.common.block;
import java.util.List;
import java.util.Random;
import WayofTime.alchemicalWizardry.common.AlchemicalWizardry;
import WayofTime.alchemicalWizardry.common.tileEntity.TEWritingTable;
import cpw.mods.fml.relauncher.Side;
@ -10,7 +7,6 @@ import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.block.BlockContainer;
import net.minecraft.block.material.Material;
import net.minecraft.client.renderer.texture.IconRegister;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.entity.Entity;
import net.minecraft.entity.item.EntityItem;
import net.minecraft.entity.player.EntityPlayer;
@ -20,10 +16,11 @@ import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.AxisAlignedBB;
import net.minecraft.util.Icon;
import net.minecraft.util.MovingObjectPosition;
import net.minecraft.util.Vec3;
import net.minecraft.world.World;
import java.util.List;
import java.util.Random;
public class BlockWritingTable extends BlockContainer
{
@SideOnly(Side.CLIENT)

14
BM_src/WayofTime/alchemicalWizardry/common/block/BloodRune.java
View file

@ -1,16 +1,17 @@
package WayofTime.alchemicalWizardry.common.block;
import java.util.List;
import WayofTime.alchemicalWizardry.common.AlchemicalWizardry;
import WayofTime.alchemicalWizardry.common.ModBlocks;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.block.Block;
import net.minecraft.block.material.Material;
import net.minecraft.client.renderer.texture.IconRegister;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.item.ItemStack;
import net.minecraft.util.Icon;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import java.util.List;
public class BloodRune extends Block
{
@ -65,14 +66,13 @@ public class BloodRune extends Block
*/
public void getSubBlocks(int par1, CreativeTabs par2CreativeTabs, List par3List)
{
if (this.blockID == AlchemicalWizardry.bloodRune.blockID)
if (this.blockID == ModBlocks.bloodRune.blockID)
{
par3List.add(new ItemStack(par1, 1, 0));
par3List.add(new ItemStack(par1, 1, 1));
par3List.add(new ItemStack(par1, 1, 2));
par3List.add(new ItemStack(par1, 1, 3));
}
else
} else
{
super.getSubBlocks(par1, par2CreativeTabs, par3List);
}

1
BM_src/WayofTime/alchemicalWizardry/common/block/BloodStoneBrick.java
View file

@ -6,7 +6,6 @@ import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.block.Block;
import net.minecraft.block.material.Material;
import net.minecraft.client.renderer.texture.IconRegister;
import net.minecraft.creativetab.CreativeTabs;
public class BloodStoneBrick extends Block
{

1
BM_src/WayofTime/alchemicalWizardry/common/block/EfficiencyRune.java
View file

@ -4,7 +4,6 @@ import WayofTime.alchemicalWizardry.common.AlchemicalWizardry;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.client.renderer.texture.IconRegister;
import net.minecraft.creativetab.CreativeTabs;
public class EfficiencyRune extends BloodRune
{

1
BM_src/WayofTime/alchemicalWizardry/common/block/EmptySocket.java
View file

@ -6,7 +6,6 @@ import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.block.Block;
import net.minecraft.block.material.Material;
import net.minecraft.client.renderer.texture.IconRegister;
import net.minecraft.creativetab.CreativeTabs;
public class EmptySocket extends Block
{

2
BM_src/WayofTime/alchemicalWizardry/common/block/IOrientable.java
View file

@ -5,8 +5,10 @@ import net.minecraftforge.common.ForgeDirection;
public interface IOrientable
{
public ForgeDirection getInputDirection();
public ForgeDirection getOutputDirection();
public void setInputDirection(ForgeDirection direction);
public void setOutputDirection(ForgeDirection direction);
}

16
BM_src/WayofTime/alchemicalWizardry/common/block/ImperfectRitualStone.java
View file

@ -6,20 +6,13 @@ import cpw.mods.fml.common.network.PacketDispatcher;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.block.Block;
import net.minecraft.block.BlockContainer;
import net.minecraft.block.material.Material;
import net.minecraft.client.renderer.texture.IconRegister;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.entity.effect.EntityLightningBolt;
import net.minecraft.entity.monster.EntityZombie;
import net.minecraft.entity.passive.EntityWolf;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.Item;
import net.minecraft.item.ItemArmor;
import net.minecraft.item.ItemStack;
import net.minecraft.potion.Potion;
import net.minecraft.potion.PotionEffect;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.World;
public class ImperfectRitualStone extends Block
@ -76,8 +69,7 @@ public class ImperfectRitualStone extends Block
world.getWorldInfo().setThunderTime(0);
world.getWorldInfo().setThundering(true);
return true;
}
else if (blockID == Block.coalBlock.blockID)
} else if (blockID == Block.coalBlock.blockID)
{
if (!player.capabilities.isCreativeMode && world.isRemote)
{
@ -107,8 +99,7 @@ public class ImperfectRitualStone extends Block
}
return true;
}
else if (blockID == Block.blockLapis.blockID)
} else if (blockID == Block.blockLapis.blockID)
{
if (!player.capabilities.isCreativeMode && world.isRemote)
{
@ -124,8 +115,7 @@ public class ImperfectRitualStone extends Block
// PacketDispatcher.sendPacketToServer(PacketHandler.getPacket(player.getEntityName(), -5000, 0));
// }
}
}
else if (blockID == Block.bedrock.blockID)
} else if (blockID == Block.bedrock.blockID)
{
if (!player.capabilities.isCreativeMode && world.isRemote)
{

1
BM_src/WayofTime/alchemicalWizardry/common/block/LargeBloodStoneBrick.java
View file

@ -6,7 +6,6 @@ import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.block.Block;
import net.minecraft.block.material.Material;
import net.minecraft.client.renderer.texture.IconRegister;
import net.minecraft.creativetab.CreativeTabs;
public class LargeBloodStoneBrick extends Block
{

4
BM_src/WayofTime/alchemicalWizardry/common/block/LifeEssenceBlock.java
View file

@ -1,14 +1,14 @@
package WayofTime.alchemicalWizardry.common.block;
import WayofTime.alchemicalWizardry.common.AlchemicalWizardry;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.block.material.Material;
import net.minecraft.client.renderer.texture.IconRegister;
import net.minecraft.util.Icon;
import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World;
import net.minecraftforge.fluids.BlockFluidClassic;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
public class LifeEssenceBlock extends BlockFluidClassic
{

4
BM_src/WayofTime/alchemicalWizardry/common/block/LifeEssenceFlowing.java
View file

@ -1,12 +1,12 @@
package WayofTime.alchemicalWizardry.common.block;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.block.BlockFlowing;
import net.minecraft.block.material.Material;
import net.minecraft.client.renderer.texture.IconRegister;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.util.Icon;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
public class LifeEssenceFlowing extends BlockFlowing
{

1
BM_src/WayofTime/alchemicalWizardry/common/block/LifeEssenceStill.java
View file

@ -5,7 +5,6 @@ import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.block.BlockStationary;
import net.minecraft.block.material.Material;
import net.minecraft.client.renderer.texture.IconRegister;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.util.Icon;
public class LifeEssenceStill extends BlockStationary

8
BM_src/WayofTime/alchemicalWizardry/common/block/RitualStone.java
View file

@ -1,5 +1,9 @@
package WayofTime.alchemicalWizardry.common.block;
import WayofTime.alchemicalWizardry.common.AlchemicalWizardry;
import WayofTime.alchemicalWizardry.common.items.ScribeTool;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.block.Block;
import net.minecraft.block.material.Material;
import net.minecraft.client.renderer.texture.IconRegister;
@ -8,10 +12,6 @@ import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.util.Icon;
import net.minecraft.world.World;
import WayofTime.alchemicalWizardry.common.AlchemicalWizardry;
import WayofTime.alchemicalWizardry.common.items.ScribeTool;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
public class RitualStone extends Block
{

1
BM_src/WayofTime/alchemicalWizardry/common/block/RuneOfSacrifice.java
View file

@ -4,7 +4,6 @@ import WayofTime.alchemicalWizardry.common.AlchemicalWizardry;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.client.renderer.texture.IconRegister;
import net.minecraft.creativetab.CreativeTabs;
public class RuneOfSacrifice extends BloodRune
{

1
BM_src/WayofTime/alchemicalWizardry/common/block/RuneOfSelfSacrifice.java
View file

@ -4,7 +4,6 @@ import WayofTime.alchemicalWizardry.common.AlchemicalWizardry;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.client.renderer.texture.IconRegister;
import net.minecraft.creativetab.CreativeTabs;
public class RuneOfSelfSacrifice extends BloodRune
{

13
BM_src/WayofTime/alchemicalWizardry/common/block/SpectralBlock.java
View file

@ -1,18 +1,16 @@
package WayofTime.alchemicalWizardry.common.block;
import java.util.Random;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.block.Block;
import net.minecraft.block.BlockLeaves;
import net.minecraft.block.material.Material;
import net.minecraft.client.renderer.texture.IconRegister;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemBlock;
import net.minecraft.item.ItemStack;
import net.minecraft.world.World;
import cpw.mods.fml.common.network.PacketDispatcher;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import java.util.Random;
public class SpectralBlock extends Block
{
@ -89,8 +87,7 @@ public class SpectralBlock extends Block
}
return true;
}
else
} else
{
return false;
}

1
BM_src/WayofTime/alchemicalWizardry/common/block/SpeedRune.java
View file

@ -4,7 +4,6 @@ import WayofTime.alchemicalWizardry.common.AlchemicalWizardry;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.client.renderer.texture.IconRegister;
import net.minecraft.creativetab.CreativeTabs;
public class SpeedRune extends BloodRune
{

31
BM_src/WayofTime/alchemicalWizardry/common/bloodAltarUpgrade/UpgradedAltars.java
View file

@ -1,13 +1,14 @@
package WayofTime.alchemicalWizardry.common.bloodAltarUpgrade;
import WayofTime.alchemicalWizardry.common.AlchemicalWizardry;
import WayofTime.alchemicalWizardry.common.ModBlocks;
import WayofTime.alchemicalWizardry.common.block.BloodRune;
import net.minecraft.block.Block;
import net.minecraft.world.World;
import java.util.ArrayList;
import java.util.List;
import net.minecraft.block.Block;
import net.minecraft.world.World;
import WayofTime.alchemicalWizardry.common.AlchemicalWizardry;
import WayofTime.alchemicalWizardry.common.block.BloodRune;
public class UpgradedAltars
{
public static List<AltarComponent> secondTierAltar = new ArrayList();
@ -47,8 +48,7 @@ public class UpgradedAltars
{
return false;
}
}
else
} else
{
int blockId = world.getBlockId(x + ac.getX(), y + ac.getY(), z + ac.getZ());
int metadata = world.getBlockMetadata(x + ac.getX(), y + ac.getY(), z + ac.getZ());
@ -73,8 +73,7 @@ public class UpgradedAltars
{
return false;
}
}
else
} else
{
int blockId = world.getBlockId(x + ac.getX(), y + ac.getY(), z + ac.getZ());
int metadata = world.getBlockMetadata(x + ac.getX(), y + ac.getY(), z + ac.getZ());
@ -99,8 +98,7 @@ public class UpgradedAltars
{
return false;
}
}
else
} else
{
int blockId = world.getBlockId(x + ac.getX(), y + ac.getY(), z + ac.getZ());
int metadata = world.getBlockMetadata(x + ac.getX(), y + ac.getY(), z + ac.getZ());
@ -125,8 +123,7 @@ public class UpgradedAltars
{
return false;
}
}
else
} else
{
int blockId = world.getBlockId(x + ac.getX(), y + ac.getY(), z + ac.getZ());
int metadata = world.getBlockMetadata(x + ac.getX(), y + ac.getY(), z + ac.getZ());
@ -257,10 +254,10 @@ public class UpgradedAltars
fourthTierAltar.add(new AltarComponent(-5, i, 5, Block.stoneBrick.blockID, 0, false, false));
}
fourthTierAltar.add(new AltarComponent(5, 2, 5, AlchemicalWizardry.largeBloodStoneBrick.blockID, 0, false, false));
fourthTierAltar.add(new AltarComponent(5, 2, -5, AlchemicalWizardry.largeBloodStoneBrick.blockID, 0, false, false));
fourthTierAltar.add(new AltarComponent(-5, 2, -5, AlchemicalWizardry.largeBloodStoneBrick.blockID, 0, false, false));
fourthTierAltar.add(new AltarComponent(-5, 2, 5, AlchemicalWizardry.largeBloodStoneBrick.blockID, 0, false, false));
fourthTierAltar.add(new AltarComponent(5, 2, 5, ModBlocks.largeBloodStoneBrick.blockID, 0, false, false));
fourthTierAltar.add(new AltarComponent(5, 2, -5, ModBlocks.largeBloodStoneBrick.blockID, 0, false, false));
fourthTierAltar.add(new AltarComponent(-5, 2, -5, ModBlocks.largeBloodStoneBrick.blockID, 0, false, false));
fourthTierAltar.add(new AltarComponent(-5, 2, 5, ModBlocks.largeBloodStoneBrick.blockID, 0, false, false));
fifthTierAltar.addAll(fourthTierAltar);
fifthTierAltar.add(new AltarComponent(-8, -3, 8, Block.beacon.blockID, 0, false, false));
fifthTierAltar.add(new AltarComponent(-8, -3, -8, Block.beacon.blockID, 0, false, false));

40
BM_src/WayofTime/alchemicalWizardry/common/entity/mob/EntityBileDemon.java
View file

@ -1,26 +1,17 @@
package WayofTime.alchemicalWizardry.common.entity.mob;
import WayofTime.alchemicalWizardry.common.AlchemicalWizardry;
import WayofTime.alchemicalWizardry.common.ModItems;
import net.minecraft.block.BlockColored;
import net.minecraft.client.model.ModelIronGolem;
import net.minecraft.entity.Entity;
import net.minecraft.entity.EntityAgeable;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.SharedMonsterAttributes;
import net.minecraft.entity.ai.EntityAIAttackOnCollide;
import net.minecraft.entity.ai.EntityAIFollowOwner;
import net.minecraft.entity.ai.EntityAIHurtByTarget;
import net.minecraft.entity.ai.EntityAILookIdle;
import net.minecraft.entity.ai.EntityAIOwnerHurtByTarget;
import net.minecraft.entity.ai.EntityAIOwnerHurtTarget;
import net.minecraft.entity.ai.EntityAISwimming;
import net.minecraft.entity.ai.EntityAIWander;
import net.minecraft.entity.ai.EntityAIWatchClosest;
import net.minecraft.entity.ai.*;
import net.minecraft.entity.monster.EntityCreeper;
import net.minecraft.entity.monster.EntityGhast;
import net.minecraft.entity.passive.EntityAnimal;
import net.minecraft.entity.passive.EntityHorse;
import net.minecraft.entity.passive.EntityTameable;
import net.minecraft.entity.passive.EntityWolf;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.entity.projectile.EntityArrow;
@ -75,8 +66,7 @@ public class EntityBileDemon extends EntityDemon
if (this.isTamed())
{
this.getEntityAttribute(SharedMonsterAttributes.maxHealth).setAttribute(this.maxTamedHealth);
}
else
} else
{
this.getEntityAttribute(SharedMonsterAttributes.maxHealth).setAttribute(this.maxUntamedHealth);
}
@ -102,8 +92,7 @@ public class EntityBileDemon extends EntityDemon
if (par1EntityLivingBase == null)
{
this.setAngry(false);
}
else if (!this.isTamed())
} else if (!this.isTamed())
{
this.setAngry(true);
}
@ -249,8 +238,7 @@ public class EntityBileDemon extends EntityDemon
if (this.isEntityInvulnerable())
{
return false;
}
else
} else
{
Entity entity = par1DamageSource.getEntity();
this.aiSit.setSitting(false);
@ -286,8 +274,7 @@ public class EntityBileDemon extends EntityDemon
if (par1)
{
this.getEntityAttribute(SharedMonsterAttributes.maxHealth).setAttribute(this.maxTamedHealth);
}
else
} else
{
this.getEntityAttribute(SharedMonsterAttributes.maxHealth).setAttribute(this.maxUntamedHealth);
}
@ -340,8 +327,7 @@ public class EntityBileDemon extends EntityDemon
this.sendSittingMessageToPlayer(par1EntityPlayer, !this.isSitting());
}
}
else if (itemstack != null && itemstack.itemID == AlchemicalWizardry.weakBloodOrb.itemID && !this.isAngry())
} else if (itemstack != null && itemstack.itemID == ModItems.weakBloodOrb.itemID && !this.isAngry())
{
if (!par1EntityPlayer.capabilities.isCreativeMode)
{
@ -365,8 +351,7 @@ public class EntityBileDemon extends EntityDemon
this.setOwner(par1EntityPlayer.getCommandSenderName());
this.playTameEffect(true);
this.worldObj.setEntityState(this, (byte) 7);
}
else
} else
{
this.playTameEffect(false);
this.worldObj.setEntityState(this, (byte) 6);
@ -407,8 +392,7 @@ public class EntityBileDemon extends EntityDemon
if (par1)
{
this.dataWatcher.updateObject(16, Byte.valueOf((byte) (b0 | 2)));
}
else
} else
{
this.dataWatcher.updateObject(16, Byte.valueOf((byte) (b0 & -3)));
}
@ -443,8 +427,7 @@ public class EntityBileDemon extends EntityDemon
if (par1)
{
this.dataWatcher.updateObject(19, Byte.valueOf((byte) 1));
}
else
} else
{
this.dataWatcher.updateObject(19, Byte.valueOf((byte) 0));
}
@ -487,8 +470,7 @@ public class EntityBileDemon extends EntityDemon
}
return par1EntityLivingBase instanceof EntityPlayer && par2EntityLivingBase instanceof EntityPlayer && !((EntityPlayer) par2EntityLivingBase).canAttackPlayer((EntityPlayer) par1EntityLivingBase) ? false : !(par1EntityLivingBase instanceof EntityHorse) || !((EntityHorse) par1EntityLivingBase).isTame();
}
else
} else
{
return false;
}

81
BM_src/WayofTime/alchemicalWizardry/common/entity/mob/EntityBoulderFist.java
View file

@ -1,64 +1,19 @@
package WayofTime.alchemicalWizardry.common.entity.mob;
import java.util.Calendar;
import java.util.UUID;
import WayofTime.alchemicalWizardry.common.AlchemicalWizardry;
import WayofTime.alchemicalWizardry.common.EntityAITargetAggro;
import WayofTime.alchemicalWizardry.common.ModItems;
import WayofTime.alchemicalWizardry.common.entity.projectile.HolyProjectile;
import cpw.mods.fml.common.network.Player;
import cpw.mods.fml.common.registry.EntityRegistry;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.block.Block;
import net.minecraft.block.BlockColored;
import net.minecraft.enchantment.Enchantment;
import net.minecraft.enchantment.EnchantmentHelper;
import net.minecraft.entity.Entity;
import net.minecraft.entity.EntityAgeable;
import net.minecraft.entity.EntityCreature;
import net.minecraft.entity.EntityList;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.EntityLivingData;
import net.minecraft.entity.EntityOwnable;
import net.minecraft.entity.EnumCreatureAttribute;
import net.minecraft.entity.IRangedAttackMob;
import net.minecraft.entity.SharedMonsterAttributes;
import net.minecraft.entity.ai.EntityAIArrowAttack;
import net.minecraft.entity.ai.EntityAIAttackOnCollide;
import net.minecraft.entity.ai.EntityAIBeg;
import net.minecraft.entity.ai.EntityAIBreakDoor;
import net.minecraft.entity.ai.EntityAIFleeSun;
import net.minecraft.entity.ai.EntityAIFollowOwner;
import net.minecraft.entity.ai.EntityAIHurtByTarget;
import net.minecraft.entity.ai.EntityAILeapAtTarget;
import net.minecraft.entity.ai.EntityAILookIdle;
import net.minecraft.entity.ai.EntityAIMate;
import net.minecraft.entity.ai.EntityAIMoveThroughVillage;
import net.minecraft.entity.ai.EntityAIMoveTowardsRestriction;
import net.minecraft.entity.ai.EntityAINearestAttackableTarget;
import net.minecraft.entity.ai.EntityAIOwnerHurtByTarget;
import net.minecraft.entity.ai.EntityAIOwnerHurtTarget;
import net.minecraft.entity.ai.EntityAIPanic;
import net.minecraft.entity.ai.EntityAIRestrictSun;
import net.minecraft.entity.ai.EntityAISwimming;
import net.minecraft.entity.ai.EntityAITargetNonTamed;
import net.minecraft.entity.ai.EntityAITempt;
import net.minecraft.entity.ai.EntityAIWander;
import net.minecraft.entity.ai.EntityAIWatchClosest;
import net.minecraft.entity.ai.attributes.Attribute;
import net.minecraft.entity.ai.attributes.AttributeInstance;
import net.minecraft.entity.ai.attributes.AttributeModifier;
import net.minecraft.entity.ai.attributes.RangedAttribute;
import net.minecraft.entity.ai.*;
import net.minecraft.entity.monster.EntityCreeper;
import net.minecraft.entity.monster.EntityGhast;
import net.minecraft.entity.monster.EntityMob;
import net.minecraft.entity.monster.EntityZombie;
import net.minecraft.entity.passive.EntityAnimal;
import net.minecraft.entity.passive.EntityHorse;
import net.minecraft.entity.passive.EntitySheep;
import net.minecraft.entity.passive.EntityTameable;
import net.minecraft.entity.passive.EntityVillager;
import net.minecraft.entity.passive.EntityWolf;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.entity.projectile.EntityArrow;
@ -67,13 +22,8 @@ import net.minecraft.item.ItemFood;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.pathfinding.PathEntity;
import net.minecraft.potion.Potion;
import net.minecraft.potion.PotionEffect;
import net.minecraft.stats.AchievementList;
import net.minecraft.util.DamageSource;
import net.minecraft.util.MathHelper;
import net.minecraft.world.World;
import net.minecraft.world.WorldProviderHell;
public class EntityBoulderFist extends EntityDemon
{
@ -125,8 +75,7 @@ public class EntityBoulderFist extends EntityDemon
if (this.isTamed())
{
this.getEntityAttribute(SharedMonsterAttributes.maxHealth).setAttribute(this.maxTamedHealth);
}
else
} else
{
this.getEntityAttribute(SharedMonsterAttributes.maxHealth).setAttribute(this.maxUntamedHealth);
}
@ -152,8 +101,7 @@ public class EntityBoulderFist extends EntityDemon
if (par1EntityLivingBase == null)
{
this.setAngry(false);
}
else if (!this.isTamed())
} else if (!this.isTamed())
{
this.setAngry(true);
}
@ -289,8 +237,7 @@ public class EntityBoulderFist extends EntityDemon
if (this.isEntityInvulnerable())
{
return false;
}
else
} else
{
Entity entity = par1DamageSource.getEntity();
this.aiSit.setSitting(false);
@ -317,8 +264,7 @@ public class EntityBoulderFist extends EntityDemon
if (par1)
{
this.getEntityAttribute(SharedMonsterAttributes.maxHealth).setAttribute(this.maxTamedHealth);
}
else
} else
{
this.getEntityAttribute(SharedMonsterAttributes.maxHealth).setAttribute(this.maxUntamedHealth);
}
@ -371,8 +317,7 @@ public class EntityBoulderFist extends EntityDemon
this.sendSittingMessageToPlayer(par1EntityPlayer, !this.isSitting());
}
}
else if (itemstack != null && itemstack.itemID == AlchemicalWizardry.weakBloodOrb.itemID && !this.isAngry() && !this.isAggro())
} else if (itemstack != null && itemstack.itemID == ModItems.weakBloodOrb.itemID && !this.isAngry() && !this.isAggro())
{
if (!par1EntityPlayer.capabilities.isCreativeMode)
{
@ -396,8 +341,7 @@ public class EntityBoulderFist extends EntityDemon
this.setOwner(par1EntityPlayer.getCommandSenderName());
this.playTameEffect(true);
this.worldObj.setEntityState(this, (byte) 7);
}
else
} else
{
this.playTameEffect(false);
this.worldObj.setEntityState(this, (byte) 6);
@ -438,8 +382,7 @@ public class EntityBoulderFist extends EntityDemon
if (par1)
{
this.dataWatcher.updateObject(16, Byte.valueOf((byte) (b0 | 2)));
}
else
} else
{
this.dataWatcher.updateObject(16, Byte.valueOf((byte) (b0 & -3)));
}
@ -474,8 +417,7 @@ public class EntityBoulderFist extends EntityDemon
if (par1)
{
this.dataWatcher.updateObject(19, Byte.valueOf((byte) 1));
}
else
} else
{
this.dataWatcher.updateObject(19, Byte.valueOf((byte) 0));
}
@ -518,8 +460,7 @@ public class EntityBoulderFist extends EntityDemon
}
return par1EntityLivingBase instanceof EntityPlayer && par2EntityLivingBase instanceof EntityPlayer && !((EntityPlayer) par2EntityLivingBase).canAttackPlayer((EntityPlayer) par1EntityLivingBase) ? false : !(par1EntityLivingBase instanceof EntityHorse) || !((EntityHorse) par1EntityLivingBase).isTame();
}
else
} else
{
return false;
}

18
BM_src/WayofTime/alchemicalWizardry/common/entity/mob/EntityDemon.java
View file

@ -1,14 +1,15 @@
package WayofTime.alchemicalWizardry.common.entity.mob;
import WayofTime.alchemicalWizardry.common.IDemon;
import WayofTime.alchemicalWizardry.common.ModItems;
import WayofTime.alchemicalWizardry.common.items.DemonPlacer;
import net.minecraft.entity.Entity;
import net.minecraft.entity.EntityAgeable;
import net.minecraft.entity.passive.EntityTameable;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import net.minecraft.util.ChatMessageComponent;
import net.minecraft.world.World;
import WayofTime.alchemicalWizardry.common.AlchemicalWizardry;
import WayofTime.alchemicalWizardry.common.IDemon;
import WayofTime.alchemicalWizardry.common.items.DemonPlacer;
public class EntityDemon extends EntityTameable implements IDemon
{
@ -48,7 +49,7 @@ public class EntityDemon extends EntityTameable implements IDemon
protected void dropFewItems(boolean par1, int par2)
{
ItemStack drop = new ItemStack(AlchemicalWizardry.demonPlacer, 1, this.getDemonID());
ItemStack drop = new ItemStack(ModItems.demonPlacer, 1, this.getDemonID());
DemonPlacer.setOwnerName(drop, this.getOwnerName());
if (this.hasCustomNameTag())
@ -78,8 +79,7 @@ public class EntityDemon extends EntityTameable implements IDemon
if (isSitting)
{
chatmessagecomponent.addText("I will stay here for now, Master.");
}
else
} else
{
chatmessagecomponent.addText("I shall follow and protect you!");
}
@ -92,4 +92,10 @@ public class EntityDemon extends EntityTameable implements IDemon
{
return this.demonID;
}
@Override
public Entity getOwner()
{
return func_130012_q();
}
}

79
BM_src/WayofTime/alchemicalWizardry/common/entity/mob/EntityElemental.java
View file

@ -1,27 +1,16 @@
package WayofTime.alchemicalWizardry.common.entity.mob;
import java.util.List;
import WayofTime.alchemicalWizardry.common.AlchemicalWizardry;
import WayofTime.alchemicalWizardry.common.ModItems;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.block.Block;
import net.minecraft.block.BlockColored;
import net.minecraft.entity.Entity;
import net.minecraft.entity.EntityAgeable;
import net.minecraft.entity.EntityList;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.SharedMonsterAttributes;
import net.minecraft.entity.ai.EntityAIAttackOnCollide;
import net.minecraft.entity.ai.EntityAIFollowOwner;
import net.minecraft.entity.ai.EntityAIHurtByTarget;
import net.minecraft.entity.ai.EntityAILookIdle;
import net.minecraft.entity.ai.EntityAIOwnerHurtByTarget;
import net.minecraft.entity.ai.EntityAIOwnerHurtTarget;
import net.minecraft.entity.ai.EntityAISwimming;
import net.minecraft.entity.ai.EntityAIWander;
import net.minecraft.entity.ai.EntityAIWatchClosest;
import net.minecraft.entity.item.EntityItem;
import net.minecraft.entity.monster.EntityCreeper;
import net.minecraft.entity.monster.EntityGhast;
import net.minecraft.entity.passive.EntityAnimal;
@ -29,20 +18,16 @@ import net.minecraft.entity.passive.EntityHorse;
import net.minecraft.entity.passive.EntityWolf;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.entity.projectile.EntityArrow;
import net.minecraft.entity.projectile.EntityLargeFireball;
import net.minecraft.item.Item;
import net.minecraft.item.ItemArmor;
import net.minecraft.item.ItemFood;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.pathfinding.PathEntity;
import net.minecraft.potion.PotionEffect;
import net.minecraft.util.AxisAlignedBB;
import net.minecraft.util.DamageSource;
import net.minecraft.util.MathHelper;
import net.minecraft.util.Vec3;
import net.minecraft.world.World;
import java.util.List;
public class EntityElemental extends EntityDemon
{
//private EntityAIArrowAttack aiArrowAttack = new EntityAIArrowAttack(this, 1.0D, 40, 40, 15.0F);
@ -73,33 +58,40 @@ public class EntityElemental extends EntityDemon
public double waypointZ;
private Entity targetedEntity;
/** Cooldown time between target loss and new target aquirement. */
/**
* Cooldown time between target loss and new target aquirement.
*/
private int aggroCooldown;
public int prevAttackCounter;
public int attackCounter;
/** The explosion radius of spawned fireballs. */
/**
* The explosion radius of spawned fireballs.
*/
//private int explosionStrength = 1;
//
// private int heightOffsetUpdateTime;
// private float heightOffset = 0.5F;
// private int field_70846_g;
protected void dropFewItems(boolean par1, int par2)
{
if (worldObj.rand.nextFloat() < (1 - Math.pow(0.6f, par2 + 1)))
{
this.entityDropItem(new ItemStack(AlchemicalWizardry.demonBloodShard, 1, 0), 0.0f);
this.entityDropItem(new ItemStack(ModItems.demonBloodShard, 1, 0), 0.0f);
}
}
protected void fall(float par1) {}
protected void fall(float par1)
{
}
/**
* Takes in the distance the entity has fallen this tick and whether its on the ground to update the fall distance
* and deal fall damage if landing on the ground. Args: distanceFallenThisTick, onGround
*/
protected void updateFallState(double par1, boolean par3) {}
protected void updateFallState(double par1, boolean par3)
{
}
/**
* Moves the entity based on the specified heading. Args: strafe, forward
@ -113,16 +105,14 @@ public class EntityElemental extends EntityDemon
this.motionX *= 0.800000011920929D;
this.motionY *= 0.800000011920929D;
this.motionZ *= 0.800000011920929D;
}
else if (this.handleLavaMovement())
} else if (this.handleLavaMovement())
{
this.moveFlying(par1, par2, 0.02F);
this.moveEntity(this.motionX, this.motionY, this.motionZ);
this.motionX *= 0.5D;
this.motionY *= 0.5D;
this.motionZ *= 0.5D;
}
else
} else
{
float f2 = 0.91F;
@ -218,8 +208,7 @@ public class EntityElemental extends EntityDemon
this.motionX += d0 / d3 * 0.1D;
this.motionY += d1 / d3 * 0.1D;
this.motionZ += d2 / d3 * 0.1D;
}
else
} else
{
this.waypointX = this.posX + (double) ((this.rand.nextFloat() * 2.0F - 1.0F) * 16.0F);
this.waypointY = this.posY + (double) ((this.rand.nextFloat() * 2.0F - 1.0F) * 16.0F);
@ -261,8 +250,7 @@ public class EntityElemental extends EntityDemon
this.motionX += d5 / d3 * 0.1D;
this.motionY += d6 / d3 * 0.1D;
this.motionZ += d7 / d3 * 0.1D;
}
else
} else
{
this.waypointX = this.posX + (double) ((this.rand.nextFloat() * 2.0F - 1.0F) * 16.0F);
this.waypointY = this.posY + (double) ((this.rand.nextFloat() * 2.0F - 1.0F) * 16.0F);
@ -290,13 +278,11 @@ public class EntityElemental extends EntityDemon
this.attackCounter = -40;
}
}
}
else if (this.attackCounter > 0)
} else if (this.attackCounter > 0)
{
--this.attackCounter;
}
}
else
} else
{
this.renderYawOffset = this.rotationYaw = -((float) Math.atan2(this.motionX, this.motionZ)) * 180.0F / (float) Math.PI;
@ -386,8 +372,7 @@ public class EntityElemental extends EntityDemon
if (this.isTamed())
{
this.getEntityAttribute(SharedMonsterAttributes.maxHealth).setAttribute(this.maxTamedHealth);
}
else
} else
{
this.getEntityAttribute(SharedMonsterAttributes.maxHealth).setAttribute(this.maxUntamedHealth);
}
@ -413,8 +398,7 @@ public class EntityElemental extends EntityDemon
if (par1EntityLivingBase == null)
{
this.setAngry(false);
}
else if (!this.isTamed())
} else if (!this.isTamed())
{
this.setAngry(true);
}
@ -525,8 +509,7 @@ public class EntityElemental extends EntityDemon
if (this.isEntityInvulnerable())
{
return false;
}
else
} else
{
Entity entity = par1DamageSource.getEntity();
this.aiSit.setSitting(false);
@ -553,8 +536,7 @@ public class EntityElemental extends EntityDemon
if (par1)
{
this.getEntityAttribute(SharedMonsterAttributes.maxHealth).setAttribute(this.maxTamedHealth);
}
else
} else
{
this.getEntityAttribute(SharedMonsterAttributes.maxHealth).setAttribute(this.maxUntamedHealth);
}
@ -592,8 +574,7 @@ public class EntityElemental extends EntityDemon
if (par1)
{
this.dataWatcher.updateObject(16, Byte.valueOf((byte) (b0 | 2)));
}
else
} else
{
this.dataWatcher.updateObject(16, Byte.valueOf((byte) (b0 & -3)));
}
@ -628,8 +609,7 @@ public class EntityElemental extends EntityDemon
if (par1)
{
this.dataWatcher.updateObject(19, Byte.valueOf((byte) 1));
}
else
} else
{
this.dataWatcher.updateObject(19, Byte.valueOf((byte) 0));
}
@ -674,8 +654,7 @@ public class EntityElemental extends EntityDemon
return par1EntityLivingBase instanceof EntityPlayer && par2EntityLivingBase instanceof EntityPlayer && !((EntityPlayer) par2EntityLivingBase).canAttackPlayer((EntityPlayer) par1EntityLivingBase) ? false : !(par1EntityLivingBase instanceof EntityHorse) || !((EntityHorse) par1EntityLivingBase).isTame();
//return par1EntityLivingBase instanceof EntityPlayer && par2EntityLivingBase instanceof EntityPlayer && !((EntityPlayer)par2EntityLivingBase).func_96122_a((EntityPlayer)par1EntityLivingBase) ? false : !(par1EntityLivingBase instanceof EntityHorse) || !((EntityHorse)par1EntityLivingBase).func_110248_bS();
}
else
} else
{
return false;
}

85
BM_src/WayofTime/alchemicalWizardry/common/entity/mob/EntityFallenAngel.java
View file

@ -1,64 +1,17 @@
package WayofTime.alchemicalWizardry.common.entity.mob;
import java.util.Calendar;
import java.util.UUID;
import WayofTime.alchemicalWizardry.common.AlchemicalWizardry;
import WayofTime.alchemicalWizardry.common.EntityAITargetAggro;
import WayofTime.alchemicalWizardry.common.ModItems;
import WayofTime.alchemicalWizardry.common.entity.projectile.HolyProjectile;
import cpw.mods.fml.common.network.Player;
import cpw.mods.fml.common.registry.EntityRegistry;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.block.Block;
import net.minecraft.block.BlockColored;
import net.minecraft.enchantment.Enchantment;
import net.minecraft.enchantment.EnchantmentHelper;
import net.minecraft.entity.Entity;
import net.minecraft.entity.EntityAgeable;
import net.minecraft.entity.EntityCreature;
import net.minecraft.entity.EntityList;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.EntityLivingData;
import net.minecraft.entity.EntityOwnable;
import net.minecraft.entity.EnumCreatureAttribute;
import net.minecraft.entity.IRangedAttackMob;
import net.minecraft.entity.SharedMonsterAttributes;
import net.minecraft.entity.ai.EntityAIArrowAttack;
import net.minecraft.entity.ai.EntityAIAttackOnCollide;
import net.minecraft.entity.ai.EntityAIBeg;
import net.minecraft.entity.ai.EntityAIBreakDoor;
import net.minecraft.entity.ai.EntityAIFleeSun;
import net.minecraft.entity.ai.EntityAIFollowOwner;
import net.minecraft.entity.ai.EntityAIHurtByTarget;
import net.minecraft.entity.ai.EntityAILeapAtTarget;
import net.minecraft.entity.ai.EntityAILookIdle;
import net.minecraft.entity.ai.EntityAIMate;
import net.minecraft.entity.ai.EntityAIMoveThroughVillage;
import net.minecraft.entity.ai.EntityAIMoveTowardsRestriction;
import net.minecraft.entity.ai.EntityAINearestAttackableTarget;
import net.minecraft.entity.ai.EntityAIOwnerHurtByTarget;
import net.minecraft.entity.ai.EntityAIOwnerHurtTarget;
import net.minecraft.entity.ai.EntityAIPanic;
import net.minecraft.entity.ai.EntityAIRestrictSun;
import net.minecraft.entity.ai.EntityAISwimming;
import net.minecraft.entity.ai.EntityAITargetNonTamed;
import net.minecraft.entity.ai.EntityAITempt;
import net.minecraft.entity.ai.EntityAIWander;
import net.minecraft.entity.ai.EntityAIWatchClosest;
import net.minecraft.entity.ai.attributes.Attribute;
import net.minecraft.entity.ai.attributes.AttributeInstance;
import net.minecraft.entity.ai.attributes.AttributeModifier;
import net.minecraft.entity.ai.attributes.RangedAttribute;
import net.minecraft.entity.*;
import net.minecraft.entity.ai.*;
import net.minecraft.entity.monster.EntityCreeper;
import net.minecraft.entity.monster.EntityGhast;
import net.minecraft.entity.monster.EntityMob;
import net.minecraft.entity.monster.EntityZombie;
import net.minecraft.entity.passive.EntityAnimal;
import net.minecraft.entity.passive.EntityHorse;
import net.minecraft.entity.passive.EntitySheep;
import net.minecraft.entity.passive.EntityTameable;
import net.minecraft.entity.passive.EntityVillager;
import net.minecraft.entity.passive.EntityWolf;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.entity.projectile.EntityArrow;
@ -67,13 +20,8 @@ import net.minecraft.item.ItemFood;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.pathfinding.PathEntity;
import net.minecraft.potion.Potion;
import net.minecraft.potion.PotionEffect;
import net.minecraft.stats.AchievementList;
import net.minecraft.util.DamageSource;
import net.minecraft.util.MathHelper;
import net.minecraft.world.World;
import net.minecraft.world.WorldProviderHell;
public class EntityFallenAngel extends EntityDemon implements IRangedAttackMob, Player
{
@ -125,8 +73,7 @@ public class EntityFallenAngel extends EntityDemon implements IRangedAttackMob,
if (this.isTamed())
{
this.getEntityAttribute(SharedMonsterAttributes.maxHealth).setAttribute(this.maxTamedHealth);
}
else
} else
{
this.getEntityAttribute(SharedMonsterAttributes.maxHealth).setAttribute(this.maxUntamedHealth);
}
@ -152,8 +99,7 @@ public class EntityFallenAngel extends EntityDemon implements IRangedAttackMob,
if (par1EntityLivingBase == null)
{
this.setAngry(false);
}
else if (!this.isTamed())
} else if (!this.isTamed())
{
this.setAngry(true);
}
@ -289,8 +235,7 @@ public class EntityFallenAngel extends EntityDemon implements IRangedAttackMob,
if (this.isEntityInvulnerable())
{
return false;
}
else
} else
{
Entity entity = par1DamageSource.getEntity();
this.aiSit.setSitting(false);
@ -317,8 +262,7 @@ public class EntityFallenAngel extends EntityDemon implements IRangedAttackMob,
if (par1)
{
this.getEntityAttribute(SharedMonsterAttributes.maxHealth).setAttribute(this.maxTamedHealth);
}
else
} else
{
this.getEntityAttribute(SharedMonsterAttributes.maxHealth).setAttribute(this.maxUntamedHealth);
}
@ -371,8 +315,7 @@ public class EntityFallenAngel extends EntityDemon implements IRangedAttackMob,
this.sendSittingMessageToPlayer(par1EntityPlayer, !this.isSitting());
}
}
else if (itemstack != null && itemstack.itemID == AlchemicalWizardry.weakBloodOrb.itemID && !this.isAngry() && !this.isAggro())
} else if (itemstack != null && itemstack.itemID == ModItems.weakBloodOrb.itemID && !this.isAngry() && !this.isAggro())
{
if (!par1EntityPlayer.capabilities.isCreativeMode)
{
@ -396,8 +339,7 @@ public class EntityFallenAngel extends EntityDemon implements IRangedAttackMob,
this.setOwner(par1EntityPlayer.getCommandSenderName());
this.playTameEffect(true);
this.worldObj.setEntityState(this, (byte) 7);
}
else
} else
{
this.playTameEffect(false);
this.worldObj.setEntityState(this, (byte) 6);
@ -438,8 +380,7 @@ public class EntityFallenAngel extends EntityDemon implements IRangedAttackMob,
if (par1)
{
this.dataWatcher.updateObject(16, Byte.valueOf((byte) (b0 | 2)));
}
else
} else
{
this.dataWatcher.updateObject(16, Byte.valueOf((byte) (b0 & -3)));
}
@ -474,8 +415,7 @@ public class EntityFallenAngel extends EntityDemon implements IRangedAttackMob,
if (par1)
{
this.dataWatcher.updateObject(19, Byte.valueOf((byte) 1));
}
else
} else
{
this.dataWatcher.updateObject(19, Byte.valueOf((byte) 0));
}
@ -518,8 +458,7 @@ public class EntityFallenAngel extends EntityDemon implements IRangedAttackMob,
}
return par1EntityLivingBase instanceof EntityPlayer && par2EntityLivingBase instanceof EntityPlayer && !((EntityPlayer) par2EntityLivingBase).canAttackPlayer((EntityPlayer) par1EntityLivingBase) ? false : !(par1EntityLivingBase instanceof EntityHorse) || !((EntityHorse) par1EntityLivingBase).isTame();
}
else
} else
{
return false;
}

3
BM_src/WayofTime/alchemicalWizardry/common/entity/mob/EntityFireElemental.java
View file

@ -4,11 +4,8 @@ import WayofTime.alchemicalWizardry.common.AlchemicalWizardry;
import net.minecraft.entity.Entity;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.monster.IMob;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.potion.PotionEffect;
import net.minecraft.world.World;
import cpw.mods.fml.common.network.PacketDispatcher;
import cpw.mods.fml.common.network.Player;
public class EntityFireElemental extends EntityElemental implements IMob
{

3
BM_src/WayofTime/alchemicalWizardry/common/entity/mob/EntityHolyElemental.java
View file

@ -4,13 +4,10 @@ import WayofTime.alchemicalWizardry.common.AlchemicalWizardry;
import net.minecraft.entity.Entity;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.monster.IMob;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.potion.Potion;
import net.minecraft.potion.PotionEffect;
import net.minecraft.util.DamageSource;
import net.minecraft.world.World;
import cpw.mods.fml.common.network.PacketDispatcher;
import cpw.mods.fml.common.network.Player;
public class EntityHolyElemental extends EntityElemental implements IMob
{

45
BM_src/WayofTime/alchemicalWizardry/common/entity/mob/EntityIceDemon.java
View file

@ -2,24 +2,12 @@ package WayofTime.alchemicalWizardry.common.entity.mob;
import WayofTime.alchemicalWizardry.common.AlchemicalWizardry;
import WayofTime.alchemicalWizardry.common.EntityAITargetAggro;
import WayofTime.alchemicalWizardry.common.ModItems;
import WayofTime.alchemicalWizardry.common.entity.projectile.IceProjectile;
import net.minecraft.block.Block;
import net.minecraft.block.BlockColored;
import net.minecraft.entity.Entity;
import net.minecraft.entity.EntityAgeable;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.IRangedAttackMob;
import net.minecraft.entity.SharedMonsterAttributes;
import net.minecraft.entity.ai.EntityAIArrowAttack;
import net.minecraft.entity.ai.EntityAIAttackOnCollide;
import net.minecraft.entity.ai.EntityAIFollowOwner;
import net.minecraft.entity.ai.EntityAIHurtByTarget;
import net.minecraft.entity.ai.EntityAILookIdle;
import net.minecraft.entity.ai.EntityAIOwnerHurtByTarget;
import net.minecraft.entity.ai.EntityAIOwnerHurtTarget;
import net.minecraft.entity.ai.EntityAISwimming;
import net.minecraft.entity.ai.EntityAIWander;
import net.minecraft.entity.ai.EntityAIWatchClosest;
import net.minecraft.entity.*;
import net.minecraft.entity.ai.*;
import net.minecraft.entity.monster.EntityCreeper;
import net.minecraft.entity.monster.EntityGhast;
import net.minecraft.entity.passive.EntityAnimal;
@ -85,8 +73,7 @@ public class EntityIceDemon extends EntityDemon implements IRangedAttackMob
if (this.isTamed())
{
this.getEntityAttribute(SharedMonsterAttributes.maxHealth).setAttribute(this.maxTamedHealth);
}
else
} else
{
this.getEntityAttribute(SharedMonsterAttributes.maxHealth).setAttribute(this.maxUntamedHealth);
}
@ -112,8 +99,7 @@ public class EntityIceDemon extends EntityDemon implements IRangedAttackMob
if (par1EntityLivingBase == null)
{
this.setAngry(false);
}
else if (!this.isTamed())
} else if (!this.isTamed())
{
this.setAngry(true);
}
@ -268,8 +254,7 @@ public class EntityIceDemon extends EntityDemon implements IRangedAttackMob
if (this.isEntityInvulnerable())
{
return false;
}
else
} else
{
Entity entity = par1DamageSource.getEntity();
this.aiSit.setSitting(false);
@ -296,8 +281,7 @@ public class EntityIceDemon extends EntityDemon implements IRangedAttackMob
if (par1)
{
this.getEntityAttribute(SharedMonsterAttributes.maxHealth).setAttribute(this.maxTamedHealth);
}
else
} else
{
this.getEntityAttribute(SharedMonsterAttributes.maxHealth).setAttribute(this.maxUntamedHealth);
}
@ -350,8 +334,7 @@ public class EntityIceDemon extends EntityDemon implements IRangedAttackMob
this.sendSittingMessageToPlayer(par1EntityPlayer, !this.isSitting());
}
}
else if (itemstack != null && itemstack.itemID == AlchemicalWizardry.weakBloodOrb.itemID && !this.isAngry() && !this.isAggro())
} else if (itemstack != null && itemstack.itemID == ModItems.weakBloodOrb.itemID && !this.isAngry() && !this.isAggro())
{
if (!par1EntityPlayer.capabilities.isCreativeMode)
{
@ -375,8 +358,7 @@ public class EntityIceDemon extends EntityDemon implements IRangedAttackMob
this.setOwner(par1EntityPlayer.getCommandSenderName());
this.playTameEffect(true);
this.worldObj.setEntityState(this, (byte) 7);
}
else
} else
{
this.playTameEffect(false);
this.worldObj.setEntityState(this, (byte) 6);
@ -417,8 +399,7 @@ public class EntityIceDemon extends EntityDemon implements IRangedAttackMob
if (par1)
{
this.dataWatcher.updateObject(16, Byte.valueOf((byte) (b0 | 2)));
}
else
} else
{
this.dataWatcher.updateObject(16, Byte.valueOf((byte) (b0 & -3)));
}
@ -453,8 +434,7 @@ public class EntityIceDemon extends EntityDemon implements IRangedAttackMob
if (par1)
{
this.dataWatcher.updateObject(19, Byte.valueOf((byte) 1));
}
else
} else
{
this.dataWatcher.updateObject(19, Byte.valueOf((byte) 0));
}
@ -497,8 +477,7 @@ public class EntityIceDemon extends EntityDemon implements IRangedAttackMob
}
return par1EntityLivingBase instanceof EntityPlayer && par2EntityLivingBase instanceof EntityPlayer && !((EntityPlayer) par2EntityLivingBase).canAttackPlayer((EntityPlayer) par1EntityLivingBase) ? false : !(par1EntityLivingBase instanceof EntityHorse) || !((EntityHorse) par1EntityLivingBase).isTame();
}
else
} else
{
return false;
}

45
BM_src/WayofTime/alchemicalWizardry/common/entity/mob/EntityLowerGuardian.java
View file

@ -2,30 +2,17 @@ package WayofTime.alchemicalWizardry.common.entity.mob;
import WayofTime.alchemicalWizardry.common.AlchemicalWizardry;
import WayofTime.alchemicalWizardry.common.EntityAITargetAggro;
import WayofTime.alchemicalWizardry.common.ModItems;
import net.minecraft.block.BlockColored;
import net.minecraft.client.model.ModelIronGolem;
import net.minecraft.entity.Entity;
import net.minecraft.entity.EntityAgeable;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.IRangedAttackMob;
import net.minecraft.entity.SharedMonsterAttributes;
import net.minecraft.entity.ai.EntityAIArrowAttack;
import net.minecraft.entity.ai.EntityAIAttackOnCollide;
import net.minecraft.entity.ai.EntityAIFollowOwner;
import net.minecraft.entity.ai.EntityAIHurtByTarget;
import net.minecraft.entity.ai.EntityAILookIdle;
import net.minecraft.entity.ai.EntityAIOwnerHurtByTarget;
import net.minecraft.entity.ai.EntityAIOwnerHurtTarget;
import net.minecraft.entity.ai.EntityAISwimming;
import net.minecraft.entity.ai.EntityAITargetNonTamed;
import net.minecraft.entity.ai.EntityAIWander;
import net.minecraft.entity.ai.EntityAIWatchClosest;
import net.minecraft.entity.ai.*;
import net.minecraft.entity.monster.EntityCreeper;
import net.minecraft.entity.monster.EntityGhast;
import net.minecraft.entity.passive.EntityAnimal;
import net.minecraft.entity.passive.EntityHorse;
import net.minecraft.entity.passive.EntitySheep;
import net.minecraft.entity.passive.EntityTameable;
import net.minecraft.entity.passive.EntityWolf;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.entity.projectile.EntityArrow;
@ -36,7 +23,6 @@ import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.pathfinding.PathEntity;
import net.minecraft.util.DamageSource;
import net.minecraft.world.World;
import cpw.mods.fml.common.network.Player;
public class EntityLowerGuardian extends EntityDemon
{
@ -84,8 +70,7 @@ public class EntityLowerGuardian extends EntityDemon
if (this.isTamed())
{
this.getEntityAttribute(SharedMonsterAttributes.maxHealth).setAttribute(this.maxTamedHealth);
}
else
} else
{
this.getEntityAttribute(SharedMonsterAttributes.maxHealth).setAttribute(this.maxUntamedHealth);
}
@ -111,8 +96,7 @@ public class EntityLowerGuardian extends EntityDemon
if (par1EntityLivingBase == null)
{
this.setAngry(false);
}
else if (!this.isTamed())
} else if (!this.isTamed())
{
this.setAngry(true);
}
@ -260,8 +244,7 @@ public class EntityLowerGuardian extends EntityDemon
if (this.isEntityInvulnerable())
{
return false;
}
else
} else
{
Entity entity = par1DamageSource.getEntity();
this.aiSit.setSitting(false);
@ -297,8 +280,7 @@ public class EntityLowerGuardian extends EntityDemon
if (par1)
{
this.getEntityAttribute(SharedMonsterAttributes.maxHealth).setAttribute(this.maxTamedHealth);
}
else
} else
{
this.getEntityAttribute(SharedMonsterAttributes.maxHealth).setAttribute(this.maxUntamedHealth);
}
@ -351,8 +333,7 @@ public class EntityLowerGuardian extends EntityDemon
this.sendSittingMessageToPlayer(par1EntityPlayer, !this.isSitting());
}
}
else if (itemstack != null && itemstack.itemID == AlchemicalWizardry.weakBloodOrb.itemID && !this.isAngry() && !this.isAggro())
} else if (itemstack != null && itemstack.itemID == ModItems.weakBloodOrb.itemID && !this.isAngry() && !this.isAggro())
{
if (!par1EntityPlayer.capabilities.isCreativeMode)
{
@ -376,8 +357,7 @@ public class EntityLowerGuardian extends EntityDemon
this.setOwner(par1EntityPlayer.getCommandSenderName());
this.playTameEffect(true);
this.worldObj.setEntityState(this, (byte) 7);
}
else
} else
{
this.playTameEffect(false);
this.worldObj.setEntityState(this, (byte) 6);
@ -418,8 +398,7 @@ public class EntityLowerGuardian extends EntityDemon
if (par1)
{
this.dataWatcher.updateObject(16, Byte.valueOf((byte) (b0 | 2)));
}
else
} else
{
this.dataWatcher.updateObject(16, Byte.valueOf((byte) (b0 & -3)));
}
@ -454,8 +433,7 @@ public class EntityLowerGuardian extends EntityDemon
if (par1)
{
this.dataWatcher.updateObject(19, Byte.valueOf((byte) 1));
}
else
} else
{
this.dataWatcher.updateObject(19, Byte.valueOf((byte) 0));
}
@ -498,8 +476,7 @@ public class EntityLowerGuardian extends EntityDemon
}
return par1EntityLivingBase instanceof EntityPlayer && par2EntityLivingBase instanceof EntityPlayer && !((EntityPlayer) par2EntityLivingBase).canAttackPlayer((EntityPlayer) par1EntityLivingBase) ? false : !(par1EntityLivingBase instanceof EntityHorse) || !((EntityHorse) par1EntityLivingBase).isTame();
}
else
} else
{
return false;
}

39
BM_src/WayofTime/alchemicalWizardry/common/entity/mob/EntityShade.java
View file

@ -2,22 +2,14 @@ package WayofTime.alchemicalWizardry.common.entity.mob;
import WayofTime.alchemicalWizardry.common.AlchemicalWizardry;
import WayofTime.alchemicalWizardry.common.EntityAITargetAggro;
import WayofTime.alchemicalWizardry.common.ModItems;
import WayofTime.alchemicalWizardry.common.entity.projectile.HolyProjectile;
import net.minecraft.block.BlockColored;
import net.minecraft.entity.Entity;
import net.minecraft.entity.EntityAgeable;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.SharedMonsterAttributes;
import net.minecraft.entity.ai.EntityAIAttackOnCollide;
import net.minecraft.entity.ai.EntityAIFollowOwner;
import net.minecraft.entity.ai.EntityAIHurtByTarget;
import net.minecraft.entity.ai.EntityAILeapAtTarget;
import net.minecraft.entity.ai.EntityAILookIdle;
import net.minecraft.entity.ai.EntityAIOwnerHurtByTarget;
import net.minecraft.entity.ai.EntityAIOwnerHurtTarget;
import net.minecraft.entity.ai.EntityAISwimming;
import net.minecraft.entity.ai.EntityAIWander;
import net.minecraft.entity.ai.EntityAIWatchClosest;
import net.minecraft.entity.ai.*;
import net.minecraft.entity.monster.EntityCreeper;
import net.minecraft.entity.monster.EntityGhast;
import net.minecraft.entity.passive.EntityAnimal;
@ -83,8 +75,7 @@ public class EntityShade extends EntityDemon
if (this.isTamed())
{
this.getEntityAttribute(SharedMonsterAttributes.maxHealth).setAttribute(this.maxTamedHealth);
}
else
} else
{
this.getEntityAttribute(SharedMonsterAttributes.maxHealth).setAttribute(this.maxUntamedHealth);
}
@ -110,8 +101,7 @@ public class EntityShade extends EntityDemon
if (par1EntityLivingBase == null)
{
this.setAngry(false);
}
else if (!this.isTamed())
} else if (!this.isTamed())
{
this.setAngry(true);
}
@ -247,8 +237,7 @@ public class EntityShade extends EntityDemon
if (this.isEntityInvulnerable())
{
return false;
}
else
} else
{
Entity entity = par1DamageSource.getEntity();
this.aiSit.setSitting(false);
@ -275,8 +264,7 @@ public class EntityShade extends EntityDemon
if (par1)
{
this.getEntityAttribute(SharedMonsterAttributes.maxHealth).setAttribute(this.maxTamedHealth);
}
else
} else
{
this.getEntityAttribute(SharedMonsterAttributes.maxHealth).setAttribute(this.maxUntamedHealth);
}
@ -329,8 +317,7 @@ public class EntityShade extends EntityDemon
this.sendSittingMessageToPlayer(par1EntityPlayer, !this.isSitting());
}
}
else if (itemstack != null && itemstack.itemID == AlchemicalWizardry.weakBloodOrb.itemID && !this.isAngry() && !this.isAggro())
} else if (itemstack != null && itemstack.itemID == ModItems.weakBloodOrb.itemID && !this.isAngry() && !this.isAggro())
{
if (!par1EntityPlayer.capabilities.isCreativeMode)
{
@ -354,8 +341,7 @@ public class EntityShade extends EntityDemon
this.setOwner(par1EntityPlayer.getCommandSenderName());
this.playTameEffect(true);
this.worldObj.setEntityState(this, (byte) 7);
}
else
} else
{
this.playTameEffect(false);
this.worldObj.setEntityState(this, (byte) 6);
@ -396,8 +382,7 @@ public class EntityShade extends EntityDemon
if (par1)
{
this.dataWatcher.updateObject(16, Byte.valueOf((byte) (b0 | 2)));
}
else
} else
{
this.dataWatcher.updateObject(16, Byte.valueOf((byte) (b0 & -3)));
}
@ -432,8 +417,7 @@ public class EntityShade extends EntityDemon
if (par1)
{
this.dataWatcher.updateObject(19, Byte.valueOf((byte) 1));
}
else
} else
{
this.dataWatcher.updateObject(19, Byte.valueOf((byte) 0));
}
@ -476,8 +460,7 @@ public class EntityShade extends EntityDemon
}
return par1EntityLivingBase instanceof EntityPlayer && par2EntityLivingBase instanceof EntityPlayer && !((EntityPlayer) par2EntityLivingBase).canAttackPlayer((EntityPlayer) par1EntityLivingBase) ? false : !(par1EntityLivingBase instanceof EntityHorse) || !((EntityHorse) par1EntityLivingBase).isTame();
}
else
} else
{
return false;
}

48
BM_src/WayofTime/alchemicalWizardry/common/entity/mob/EntitySmallEarthGolem.java
View file

@ -2,28 +2,16 @@ package WayofTime.alchemicalWizardry.common.entity.mob;
import WayofTime.alchemicalWizardry.common.AlchemicalWizardry;
import WayofTime.alchemicalWizardry.common.EntityAITargetAggro;
import WayofTime.alchemicalWizardry.common.ModItems;
import WayofTime.alchemicalWizardry.common.entity.projectile.MudProjectile;
import cpw.mods.fml.common.network.Player;
import net.minecraft.block.BlockColored;
import net.minecraft.entity.Entity;
import net.minecraft.entity.EntityAgeable;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.IRangedAttackMob;
import net.minecraft.entity.SharedMonsterAttributes;
import net.minecraft.entity.ai.EntityAIArrowAttack;
import net.minecraft.entity.ai.EntityAIAttackOnCollide;
import net.minecraft.entity.ai.EntityAIFollowOwner;
import net.minecraft.entity.ai.EntityAIHurtByTarget;
import net.minecraft.entity.ai.EntityAILookIdle;
import net.minecraft.entity.ai.EntityAIOwnerHurtByTarget;
import net.minecraft.entity.ai.EntityAIOwnerHurtTarget;
import net.minecraft.entity.ai.EntityAISwimming;
import net.minecraft.entity.ai.EntityAIWander;
import net.minecraft.entity.ai.EntityAIWatchClosest;
import net.minecraft.entity.*;
import net.minecraft.entity.ai.*;
import net.minecraft.entity.monster.EntityCreeper;
import net.minecraft.entity.monster.EntityGhast;
import net.minecraft.entity.passive.EntityAnimal;
import net.minecraft.entity.passive.EntityHorse;
import net.minecraft.entity.passive.EntityTameable;
import net.minecraft.entity.passive.EntityWolf;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.entity.projectile.EntityArrow;
@ -34,7 +22,6 @@ import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.pathfinding.PathEntity;
import net.minecraft.util.DamageSource;
import net.minecraft.world.World;
import cpw.mods.fml.common.network.Player;
public class EntitySmallEarthGolem extends EntityDemon implements IRangedAttackMob, Player
{
@ -86,8 +73,7 @@ public class EntitySmallEarthGolem extends EntityDemon implements IRangedAttackM
if (this.isTamed())
{
this.getEntityAttribute(SharedMonsterAttributes.maxHealth).setAttribute(this.maxTamedHealth);
}
else
} else
{
this.getEntityAttribute(SharedMonsterAttributes.maxHealth).setAttribute(this.maxUntamedHealth);
}
@ -113,8 +99,7 @@ public class EntitySmallEarthGolem extends EntityDemon implements IRangedAttackM
if (par1EntityLivingBase == null)
{
this.setAngry(false);
}
else if (!this.isTamed())
} else if (!this.isTamed())
{
this.setAngry(true);
}
@ -249,8 +234,7 @@ public class EntitySmallEarthGolem extends EntityDemon implements IRangedAttackM
if (this.isEntityInvulnerable())
{
return false;
}
else
} else
{
Entity entity = par1DamageSource.getEntity();
this.aiSit.setSitting(false);
@ -277,8 +261,7 @@ public class EntitySmallEarthGolem extends EntityDemon implements IRangedAttackM
if (par1)
{
this.getEntityAttribute(SharedMonsterAttributes.maxHealth).setAttribute(this.maxTamedHealth);
}
else
} else
{
this.getEntityAttribute(SharedMonsterAttributes.maxHealth).setAttribute(this.maxUntamedHealth);
}
@ -331,8 +314,7 @@ public class EntitySmallEarthGolem extends EntityDemon implements IRangedAttackM
this.sendSittingMessageToPlayer(par1EntityPlayer, !this.isSitting());
}
}
else if (itemstack != null && itemstack.itemID == AlchemicalWizardry.weakBloodOrb.itemID && !this.isAngry() && !this.isAggro())
} else if (itemstack != null && itemstack.itemID == ModItems.weakBloodOrb.itemID && !this.isAngry() && !this.isAggro())
{
if (!par1EntityPlayer.capabilities.isCreativeMode)
{
@ -356,8 +338,7 @@ public class EntitySmallEarthGolem extends EntityDemon implements IRangedAttackM
this.setOwner(par1EntityPlayer.getCommandSenderName());
this.playTameEffect(true);
this.worldObj.setEntityState(this, (byte) 7);
}
else
} else
{
this.playTameEffect(false);
this.worldObj.setEntityState(this, (byte) 6);
@ -398,8 +379,7 @@ public class EntitySmallEarthGolem extends EntityDemon implements IRangedAttackM
if (par1)
{
this.dataWatcher.updateObject(16, Byte.valueOf((byte) (b0 | 2)));
}
else
} else
{
this.dataWatcher.updateObject(16, Byte.valueOf((byte) (b0 & -3)));
}
@ -434,8 +414,7 @@ public class EntitySmallEarthGolem extends EntityDemon implements IRangedAttackM
if (par1)
{
this.dataWatcher.updateObject(19, Byte.valueOf((byte) 1));
}
else
} else
{
this.dataWatcher.updateObject(19, Byte.valueOf((byte) 0));
}
@ -478,8 +457,7 @@ public class EntitySmallEarthGolem extends EntityDemon implements IRangedAttackM
}
return par1EntityLivingBase instanceof EntityPlayer && par2EntityLivingBase instanceof EntityPlayer && !((EntityPlayer) par2EntityLivingBase).canAttackPlayer((EntityPlayer) par1EntityLivingBase) ? false : !(par1EntityLivingBase instanceof EntityHorse) || !((EntityHorse) par1EntityLivingBase).isTame();
}
else
} else
{
return false;
}

50
BM_src/WayofTime/alchemicalWizardry/common/entity/mob/EntityWingedFireDemon.java
View file

@ -2,29 +2,16 @@ package WayofTime.alchemicalWizardry.common.entity.mob;
import WayofTime.alchemicalWizardry.common.AlchemicalWizardry;
import WayofTime.alchemicalWizardry.common.EntityAITargetAggro;
import WayofTime.alchemicalWizardry.common.ModItems;
import WayofTime.alchemicalWizardry.common.entity.projectile.FireProjectile;
import cpw.mods.fml.common.network.Player;
import net.minecraft.block.BlockColored;
import net.minecraft.entity.Entity;
import net.minecraft.entity.EntityAgeable;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.IRangedAttackMob;
import net.minecraft.entity.SharedMonsterAttributes;
import net.minecraft.entity.ai.EntityAIArrowAttack;
import net.minecraft.entity.ai.EntityAIAttackOnCollide;
import net.minecraft.entity.ai.EntityAIFollowOwner;
import net.minecraft.entity.ai.EntityAIHurtByTarget;
import net.minecraft.entity.ai.EntityAILookIdle;
import net.minecraft.entity.ai.EntityAIOwnerHurtByTarget;
import net.minecraft.entity.ai.EntityAIOwnerHurtTarget;
import net.minecraft.entity.ai.EntityAISwimming;
import net.minecraft.entity.ai.EntityAIWander;
import net.minecraft.entity.ai.EntityAIWatchClosest;
import net.minecraft.entity.monster.EntityBlaze;
import net.minecraft.entity.*;
import net.minecraft.entity.ai.*;
import net.minecraft.entity.monster.EntityCreeper;
import net.minecraft.entity.monster.EntityGhast;
import net.minecraft.entity.passive.EntityAnimal;
import net.minecraft.entity.passive.EntityHorse;
import net.minecraft.entity.passive.EntityTameable;
import net.minecraft.entity.passive.EntityWolf;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.entity.projectile.EntityArrow;
@ -35,7 +22,6 @@ import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.pathfinding.PathEntity;
import net.minecraft.util.DamageSource;
import net.minecraft.world.World;
import cpw.mods.fml.common.network.Player;
public class EntityWingedFireDemon extends EntityDemon implements IRangedAttackMob, Player
{
@ -87,8 +73,7 @@ public class EntityWingedFireDemon extends EntityDemon implements IRangedAttackM
if (this.isTamed())
{
this.getEntityAttribute(SharedMonsterAttributes.maxHealth).setAttribute(this.maxTamedHealth);
}
else
} else
{
this.getEntityAttribute(SharedMonsterAttributes.maxHealth).setAttribute(this.maxUntamedHealth);
}
@ -114,8 +99,7 @@ public class EntityWingedFireDemon extends EntityDemon implements IRangedAttackM
if (par1EntityLivingBase == null)
{
this.setAngry(false);
}
else if (!this.isTamed())
} else if (!this.isTamed())
{
this.setAngry(true);
}
@ -194,6 +178,7 @@ public class EntityWingedFireDemon extends EntityDemon implements IRangedAttackM
{
return "mob.blaze.death";
}
/**
* Returns the volume for the sounds this mob makes.
*/
@ -249,8 +234,7 @@ public class EntityWingedFireDemon extends EntityDemon implements IRangedAttackM
if (this.isEntityInvulnerable())
{
return false;
}
else
} else
{
Entity entity = par1DamageSource.getEntity();
this.aiSit.setSitting(false);
@ -277,8 +261,7 @@ public class EntityWingedFireDemon extends EntityDemon implements IRangedAttackM
if (par1)
{
this.getEntityAttribute(SharedMonsterAttributes.maxHealth).setAttribute(this.maxTamedHealth);
}
else
} else
{
this.getEntityAttribute(SharedMonsterAttributes.maxHealth).setAttribute(this.maxUntamedHealth);
}
@ -331,8 +314,7 @@ public class EntityWingedFireDemon extends EntityDemon implements IRangedAttackM
this.sendSittingMessageToPlayer(par1EntityPlayer, !this.isSitting());
}
}
else if (itemstack != null && itemstack.itemID == AlchemicalWizardry.weakBloodOrb.itemID && !this.isAngry() && !this.isAggro())
} else if (itemstack != null && itemstack.itemID == ModItems.weakBloodOrb.itemID && !this.isAngry() && !this.isAggro())
{
if (!par1EntityPlayer.capabilities.isCreativeMode)
{
@ -356,8 +338,7 @@ public class EntityWingedFireDemon extends EntityDemon implements IRangedAttackM
this.setOwner(par1EntityPlayer.getCommandSenderName());
this.playTameEffect(true);
this.worldObj.setEntityState(this, (byte) 7);
}
else
} else
{
this.playTameEffect(false);
this.worldObj.setEntityState(this, (byte) 6);
@ -398,8 +379,7 @@ public class EntityWingedFireDemon extends EntityDemon implements IRangedAttackM
if (par1)
{
this.dataWatcher.updateObject(16, Byte.valueOf((byte) (b0 | 2)));
}
else
} else
{
this.dataWatcher.updateObject(16, Byte.valueOf((byte) (b0 & -3)));
}
@ -434,8 +414,7 @@ public class EntityWingedFireDemon extends EntityDemon implements IRangedAttackM
if (par1)
{
this.dataWatcher.updateObject(19, Byte.valueOf((byte) 1));
}
else
} else
{
this.dataWatcher.updateObject(19, Byte.valueOf((byte) 0));
}
@ -478,8 +457,7 @@ public class EntityWingedFireDemon extends EntityDemon implements IRangedAttackM
}
return par1EntityLivingBase instanceof EntityPlayer && par2EntityLivingBase instanceof EntityPlayer && !((EntityPlayer) par2EntityLivingBase).canAttackPlayer((EntityPlayer) par1EntityLivingBase) ? false : !(par1EntityLivingBase instanceof EntityHorse) || !((EntityHorse) par1EntityLivingBase).isTame();
}
else
} else
{
return false;
}

35
BM_src/WayofTime/alchemicalWizardry/common/entity/projectile/EnergyBlastProjectile.java
View file

@ -1,8 +1,7 @@
package WayofTime.alchemicalWizardry.common.entity.projectile;
import java.util.Iterator;
import java.util.List;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.block.Block;
import net.minecraft.entity.Entity;
import net.minecraft.entity.EntityLivingBase;
@ -11,17 +10,11 @@ import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.potion.Potion;
import net.minecraft.potion.PotionEffect;
import net.minecraft.util.AxisAlignedBB;
import net.minecraft.util.DamageSource;
import net.minecraft.util.EnumMovingObjectType;
import net.minecraft.util.MathHelper;
import net.minecraft.util.MovingObjectPosition;
import net.minecraft.util.Vec3;
import net.minecraft.util.*;
import net.minecraft.world.World;
import cpw.mods.fml.common.network.PacketDispatcher;
import cpw.mods.fml.common.network.Player;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import java.util.Iterator;
import java.util.List;
//Shamelessly ripped off from x3n0ph0b3
public class EnergyBlastProjectile extends Entity implements IProjectile
@ -32,7 +25,9 @@ public class EnergyBlastProjectile extends Entity implements IProjectile
protected int inTile = 0;
protected int inData = 0;
protected boolean inGround = false;
/** The owner of this arrow. */
/**
* The owner of this arrow.
*/
public EntityLivingBase shootingEntity;
protected int ticksInAir = 0;
protected int maxTicksInAir = 600;
@ -253,8 +248,7 @@ public class EnergyBlastProjectile extends Entity implements IProjectile
// this.groundImpact();
// this.setDead();
}
}
else
} else
{
++ticksInAir;
@ -415,8 +409,7 @@ public class EnergyBlastProjectile extends Entity implements IProjectile
if (par1)
{
dataWatcher.updateObject(16, Byte.valueOf((byte) (var2 | 1)));
}
else
} else
{
dataWatcher.updateObject(16, Byte.valueOf((byte) (var2 & -2)));
}
@ -442,8 +435,7 @@ public class EnergyBlastProjectile extends Entity implements IProjectile
}
this.onImpact(mop.entityHit);
}
else if (mop.typeOfHit == EnumMovingObjectType.TILE)
} else if (mop.typeOfHit == EnumMovingObjectType.TILE)
{
worldObj.createExplosion(shootingEntity, this.posX, this.posY, this.posZ, (float) (0.1), true);
this.setDead();
@ -456,8 +448,7 @@ public class EnergyBlastProjectile extends Entity implements IProjectile
{
shootingEntity.attackEntityFrom(DamageSource.causeMobDamage(shootingEntity), 1);
this.setDead();
}
else
} else
{
//doDamage(8 + d6(), mop);
if (mop instanceof EntityLivingBase)

23
BM_src/WayofTime/alchemicalWizardry/common/entity/projectile/EntityBloodLightProjectile.java
View file

@ -1,6 +1,6 @@
package WayofTime.alchemicalWizardry.common.entity.projectile;
import WayofTime.alchemicalWizardry.common.AlchemicalWizardry;
import WayofTime.alchemicalWizardry.common.ModBlocks;
import net.minecraft.block.Block;
import net.minecraft.entity.Entity;
import net.minecraft.entity.EntityLivingBase;
@ -55,8 +55,7 @@ public class EntityBloodLightProjectile extends EnergyBlastProjectile
}
this.onImpact(mop.entityHit);
}
else if (mop.typeOfHit == EnumMovingObjectType.TILE)
} else if (mop.typeOfHit == EnumMovingObjectType.TILE)
{
int sideHit = mop.sideHit;
int blockX = mop.blockX;
@ -65,32 +64,32 @@ public class EntityBloodLightProjectile extends EnergyBlastProjectile
if (sideHit == 0 && this.worldObj.isAirBlock(blockX, blockY - 1, blockZ))
{
this.worldObj.setBlock(blockX, blockY - 1, blockZ, AlchemicalWizardry.blockBloodLight.blockID);
this.worldObj.setBlock(blockX, blockY - 1, blockZ, ModBlocks.blockBloodLight.blockID);
}
if (sideHit == 1 && this.worldObj.isAirBlock(blockX, blockY + 1, blockZ))
{
this.worldObj.setBlock(blockX, blockY + 1, blockZ, AlchemicalWizardry.blockBloodLight.blockID);
this.worldObj.setBlock(blockX, blockY + 1, blockZ, ModBlocks.blockBloodLight.blockID);
}
if (sideHit == 2 && this.worldObj.isAirBlock(blockX, blockY, blockZ - 1))
{
this.worldObj.setBlock(blockX, blockY, blockZ - 1 , AlchemicalWizardry.blockBloodLight.blockID);
this.worldObj.setBlock(blockX, blockY, blockZ - 1, ModBlocks.blockBloodLight.blockID);
}
if (sideHit == 3 && this.worldObj.isAirBlock(blockX, blockY, blockZ + 1))
{
this.worldObj.setBlock(blockX, blockY, blockZ + 1 , AlchemicalWizardry.blockBloodLight.blockID);
this.worldObj.setBlock(blockX, blockY, blockZ + 1, ModBlocks.blockBloodLight.blockID);
}
if (sideHit == 4 && this.worldObj.isAirBlock(blockX - 1, blockY, blockZ))
{
this.worldObj.setBlock(blockX - 1, blockY, blockZ, AlchemicalWizardry.blockBloodLight.blockID);
this.worldObj.setBlock(blockX - 1, blockY, blockZ, ModBlocks.blockBloodLight.blockID);
}
if (sideHit == 5 && this.worldObj.isAirBlock(blockX + 1, blockY, blockZ))
{
this.worldObj.setBlock(blockX + 1, blockY, blockZ, AlchemicalWizardry.blockBloodLight.blockID);
this.worldObj.setBlock(blockX + 1, blockY, blockZ, ModBlocks.blockBloodLight.blockID);
}
//worldObj.createExplosion(this, this.posX, this.posY, this.posZ, (float)(0.1), true);
@ -106,8 +105,7 @@ public class EntityBloodLightProjectile extends EnergyBlastProjectile
{
shootingEntity.attackEntityFrom(DamageSource.causeMobDamage(shootingEntity), 1);
this.setDead();
}
else
} else
{
//doDamage(8 + d6(), mop);
if (mop instanceof EntityLivingBase)
@ -119,8 +117,7 @@ public class EntityBloodLightProjectile extends EnergyBlastProjectile
if (((EntityLivingBase) mop).isPotionActive(Potion.fireResistance) || ((EntityLivingBase) mop).isImmuneToFire())
{
((EntityLivingBase) mop).attackEntityFrom(DamageSource.causeMobDamage(shootingEntity), 1);
}
else
} else
{
doDamage(projectileDamage, mop);
((EntityLivingBase) mop).hurtResistantTime = 0;

11
BM_src/WayofTime/alchemicalWizardry/common/entity/projectile/EntityEnergyBazookaMainProjectile.java
View file

@ -1,14 +1,9 @@
package WayofTime.alchemicalWizardry.common.entity.projectile;
import net.minecraft.block.Block;
import net.minecraft.entity.Entity;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.potion.Potion;
import net.minecraft.potion.PotionEffect;
import net.minecraft.util.DamageSource;
import net.minecraft.util.EnumMovingObjectType;
import net.minecraft.util.MathHelper;
import net.minecraft.util.MovingObjectPosition;
import net.minecraft.world.World;
@ -56,8 +51,7 @@ public class EntityEnergyBazookaMainProjectile extends EnergyBlastProjectile
}
this.onImpact(mop.entityHit);
}
else if (mop.typeOfHit == EnumMovingObjectType.TILE)
} else if (mop.typeOfHit == EnumMovingObjectType.TILE)
{
worldObj.createExplosion(this.shootingEntity, this.posX, this.posY, this.posZ, (float) (5.0f), false);
this.spawnSecondaryProjectiles();
@ -73,8 +67,7 @@ public class EntityEnergyBazookaMainProjectile extends EnergyBlastProjectile
{
shootingEntity.attackEntityFrom(DamageSource.causeMobDamage(shootingEntity), 1);
this.setDead();
}
else
} else
{
//doDamage(8 + d6(), mop);
if (mop instanceof EntityLivingBase)

32
BM_src/WayofTime/alchemicalWizardry/common/entity/projectile/EntityEnergyBazookaSecondaryProjectile.java
View file

@ -1,22 +1,18 @@
package WayofTime.alchemicalWizardry.common.entity.projectile;
import java.util.Iterator;
import java.util.List;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.block.Block;
import net.minecraft.entity.Entity;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.IProjectile;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.util.AxisAlignedBB;
import net.minecraft.util.DamageSource;
import net.minecraft.util.EnumMovingObjectType;
import net.minecraft.util.MathHelper;
import net.minecraft.util.MovingObjectPosition;
import net.minecraft.util.Vec3;
import net.minecraft.util.*;
import net.minecraft.world.World;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import java.util.Iterator;
import java.util.List;
public class EntityEnergyBazookaSecondaryProjectile extends EnergyBlastProjectile implements IProjectile
{
@ -26,7 +22,9 @@ public class EntityEnergyBazookaSecondaryProjectile extends EnergyBlastProjectil
private int inTile = 0;
private int inData = 0;
private boolean inGround = false;
/** The owner of this arrow. */
/**
* The owner of this arrow.
*/
public EntityLivingBase shootingEntity;
private int ticksInAir = 0;
private int ricochetCounter = 0;
@ -198,8 +196,7 @@ public class EntityEnergyBazookaSecondaryProjectile extends EnergyBlastProjectil
// this.groundImpact();
// this.setDead();
}
}
else
} else
{
++ticksInAir;
@ -356,8 +353,7 @@ public class EntityEnergyBazookaSecondaryProjectile extends EnergyBlastProjectil
if (par1)
{
dataWatcher.updateObject(16, Byte.valueOf((byte) (var2 | 1)));
}
else
} else
{
dataWatcher.updateObject(16, Byte.valueOf((byte) (var2 & -2)));
}
@ -383,8 +379,7 @@ public class EntityEnergyBazookaSecondaryProjectile extends EnergyBlastProjectil
}
this.onImpact(mop.entityHit);
}
else if (mop.typeOfHit == EnumMovingObjectType.TILE)
} else if (mop.typeOfHit == EnumMovingObjectType.TILE)
{
this.groundImpact(mop.sideHit);
worldObj.createExplosion(shootingEntity, posX, posY, posZ, 2, false);
@ -397,8 +392,7 @@ public class EntityEnergyBazookaSecondaryProjectile extends EnergyBlastProjectil
{
shootingEntity.attackEntityFrom(DamageSource.causeMobDamage(shootingEntity), 1);
this.setDead();
}
else
} else
{
doDamage(this.damage + d6(), mop);
worldObj.createExplosion(shootingEntity, posX, posY, posZ, 2, false);

12
BM_src/WayofTime/alchemicalWizardry/common/entity/projectile/EntityMeteor.java
View file

@ -1,15 +1,9 @@
package WayofTime.alchemicalWizardry.common.entity.projectile;
import WayofTime.alchemicalWizardry.common.summoning.meteor.MeteorRegistry;
import net.minecraft.block.Block;
import net.minecraft.entity.Entity;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.potion.Potion;
import net.minecraft.potion.PotionEffect;
import net.minecraft.util.DamageSource;
import net.minecraft.util.EnumMovingObjectType;
import net.minecraft.util.MathHelper;
import net.minecraft.util.MovingObjectPosition;
import net.minecraft.world.World;
@ -46,8 +40,7 @@ public class EntityMeteor extends EnergyBlastProjectile
if (mop.typeOfHit == EnumMovingObjectType.ENTITY && mop.entityHit != null)
{
this.onImpact(mop.entityHit);
}
else if (mop.typeOfHit == EnumMovingObjectType.TILE)
} else if (mop.typeOfHit == EnumMovingObjectType.TILE)
{
MeteorRegistry.createMeteorImpact(worldObj, mop.blockX, mop.blockY, mop.blockZ, this.meteorID);
}
@ -62,8 +55,7 @@ public class EntityMeteor extends EnergyBlastProjectile
{
shootingEntity.attackEntityFrom(DamageSource.causeMobDamage(shootingEntity), 1);
this.setDead();
}
else
} else
{
MeteorRegistry.createMeteorImpact(worldObj, (int) this.posX, (int) this.posY, (int) this.posZ, meteorID);
}

12
BM_src/WayofTime/alchemicalWizardry/common/entity/projectile/ExplosionProjectile.java
View file

@ -2,10 +2,7 @@ package WayofTime.alchemicalWizardry.common.entity.projectile;
import net.minecraft.entity.Entity;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.potion.Potion;
import net.minecraft.potion.PotionEffect;
import net.minecraft.util.DamageSource;
import net.minecraft.util.EnumMovingObjectType;
import net.minecraft.util.MovingObjectPosition;
@ -55,8 +52,7 @@ public class ExplosionProjectile extends EnergyBlastProjectile
worldObj.createExplosion(this, this.posX, this.posY, this.posZ, (float) (2), causesEnvDamage);
//this.onImpact(mop.entityHit);
}
else if (mop.typeOfHit == EnumMovingObjectType.TILE)
} else if (mop.typeOfHit == EnumMovingObjectType.TILE)
{
// for(int i=-1;i<=1;i++)
// {
@ -84,8 +80,7 @@ public class ExplosionProjectile extends EnergyBlastProjectile
{
shootingEntity.attackEntityFrom(DamageSource.causeMobDamage(shootingEntity), 1);
this.setDead();
}
else
} else
{
//doDamage(8 + d6(), mop);
if (mop instanceof EntityLivingBase)
@ -96,8 +91,7 @@ public class ExplosionProjectile extends EnergyBlastProjectile
if (((EntityLivingBase) mop).isImmuneToFire())
{
doDamage((int) (projectileDamage), mop);
}
else
} else
{
doDamage(projectileDamage, mop);
}

12
BM_src/WayofTime/alchemicalWizardry/common/entity/projectile/FireProjectile.java
View file

@ -3,12 +3,9 @@ package WayofTime.alchemicalWizardry.common.entity.projectile;
import net.minecraft.block.Block;
import net.minecraft.entity.Entity;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.potion.Potion;
import net.minecraft.potion.PotionEffect;
import net.minecraft.util.DamageSource;
import net.minecraft.util.EnumMovingObjectType;
import net.minecraft.util.MathHelper;
import net.minecraft.util.MovingObjectPosition;
import net.minecraft.world.World;
@ -56,8 +53,7 @@ public class FireProjectile extends EnergyBlastProjectile
}
this.onImpact(mop.entityHit);
}
else if (mop.typeOfHit == EnumMovingObjectType.TILE)
} else if (mop.typeOfHit == EnumMovingObjectType.TILE)
{
for (int i = -1; i <= 1; i++)
{
@ -86,8 +82,7 @@ public class FireProjectile extends EnergyBlastProjectile
{
shootingEntity.attackEntityFrom(DamageSource.causeMobDamage(shootingEntity), 1);
this.setDead();
}
else
} else
{
//doDamage(8 + d6(), mop);
if (mop instanceof EntityLivingBase)
@ -99,8 +94,7 @@ public class FireProjectile extends EnergyBlastProjectile
if (((EntityLivingBase) mop).isPotionActive(Potion.fireResistance) || ((EntityLivingBase) mop).isImmuneToFire())
{
((EntityLivingBase) mop).attackEntityFrom(DamageSource.causeMobDamage(shootingEntity), 1);
}
else
} else
{
doDamage(projectileDamage, mop);
((EntityLivingBase) mop).hurtResistantTime = 0;

10
BM_src/WayofTime/alchemicalWizardry/common/entity/projectile/HolyProjectile.java
View file

@ -4,7 +4,6 @@ import WayofTime.alchemicalWizardry.common.PacketHandler;
import cpw.mods.fml.common.network.PacketDispatcher;
import net.minecraft.entity.Entity;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.util.DamageSource;
import net.minecraft.util.EnumMovingObjectType;
import net.minecraft.util.MovingObjectPosition;
@ -54,8 +53,7 @@ public class HolyProjectile extends EnergyBlastProjectile
}
this.onImpact(mop.entityHit);
}
else if (mop.typeOfHit == EnumMovingObjectType.TILE)
} else if (mop.typeOfHit == EnumMovingObjectType.TILE)
{
// for(int i=-1;i<=1;i++)
// {
@ -82,8 +80,7 @@ public class HolyProjectile extends EnergyBlastProjectile
{
shootingEntity.attackEntityFrom(DamageSource.causeMobDamage(shootingEntity), 1);
this.setDead();
}
else
} else
{
//doDamage(8 + d6(), mop);
if (mop instanceof EntityLivingBase)
@ -94,8 +91,7 @@ public class HolyProjectile extends EnergyBlastProjectile
if (((EntityLivingBase) mop).isEntityUndead())
{
doDamage((int) (projectileDamage * 2), mop);
}
else
} else
{
doDamage(projectileDamage, mop);
}

12
BM_src/WayofTime/alchemicalWizardry/common/entity/projectile/IceProjectile.java
View file

@ -3,10 +3,8 @@ package WayofTime.alchemicalWizardry.common.entity.projectile;
import WayofTime.alchemicalWizardry.common.PacketHandler;
import WayofTime.alchemicalWizardry.common.entity.mob.EntityIceDemon;
import cpw.mods.fml.common.network.PacketDispatcher;
import net.minecraft.block.Block;
import net.minecraft.entity.Entity;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.potion.Potion;
import net.minecraft.potion.PotionEffect;
import net.minecraft.util.DamageSource;
@ -35,6 +33,7 @@ public class IceProjectile extends EnergyBlastProjectile
{
super(par1World, par2EntityPlayer, damage, maxTicksInAir, posX, posY, posZ, rotationYaw, rotationPitch);
}
public IceProjectile(World worldObj, EntityIceDemon entityIceDemon, EntityLivingBase par1EntityLivingBase, float f, float g, int i, int j)
{
super(worldObj, entityIceDemon, par1EntityLivingBase, f, g, i, j);
@ -57,8 +56,7 @@ public class IceProjectile extends EnergyBlastProjectile
}
this.onImpact(mop.entityHit);
}
else if (mop.typeOfHit == EnumMovingObjectType.TILE)
} else if (mop.typeOfHit == EnumMovingObjectType.TILE)
{
// for(int i=-1;i<=1;i++)
// {
@ -86,8 +84,7 @@ public class IceProjectile extends EnergyBlastProjectile
{
shootingEntity.attackEntityFrom(DamageSource.causeMobDamage(shootingEntity), 1);
this.setDead();
}
else
} else
{
//doDamage(8 + d6(), mop);
if (mop instanceof EntityLivingBase)
@ -99,8 +96,7 @@ public class IceProjectile extends EnergyBlastProjectile
{
doDamage((int) (projectileDamage * 2), mop);
((EntityLivingBase) mop).addPotionEffect(new PotionEffect(Potion.moveSlowdown.id, 200, 2));
}
else
} else
{
doDamage(projectileDamage, mop);
((EntityLivingBase) mop).addPotionEffect(new PotionEffect(Potion.moveSlowdown.id, 100, 1));

13
BM_src/WayofTime/alchemicalWizardry/common/entity/projectile/LightningBoltProjectile.java
View file

@ -1,17 +1,15 @@
package WayofTime.alchemicalWizardry.common.entity.projectile;
import WayofTime.alchemicalWizardry.common.PacketHandler;
import cpw.mods.fml.common.network.PacketDispatcher;
import net.minecraft.entity.Entity;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.effect.EntityLightningBolt;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.potion.PotionEffect;
import net.minecraft.util.DamageSource;
import net.minecraft.util.EnumMovingObjectType;
import net.minecraft.util.MovingObjectPosition;
import net.minecraft.world.World;
import cpw.mods.fml.common.network.PacketDispatcher;
public class LightningBoltProjectile extends EnergyBlastProjectile
{
@ -56,8 +54,7 @@ public class LightningBoltProjectile extends EnergyBlastProjectile
}
this.onImpact(mop.entityHit);
}
else if (mop.typeOfHit == EnumMovingObjectType.TILE)
} else if (mop.typeOfHit == EnumMovingObjectType.TILE)
{
if (causeLightning)
{
@ -75,8 +72,7 @@ public class LightningBoltProjectile extends EnergyBlastProjectile
{
//shootingEntity.attackEntityFrom(DamageSource.causePlayerDamage(shootingEntity), 1);
this.setDead();
}
else
} else
{
//doDamage(8 + d6(), mop);
if (mop instanceof EntityLivingBase)
@ -94,8 +90,7 @@ public class LightningBoltProjectile extends EnergyBlastProjectile
if (causeLightning)
{
this.worldObj.addWeatherEffect(new EntityLightningBolt(this.worldObj, ((EntityLivingBase) mop).posX, ((EntityLivingBase) mop).posY, ((EntityLivingBase) mop).posZ));
}
else
} else
{
doDamage(projectileDamage, mop);
}

12
BM_src/WayofTime/alchemicalWizardry/common/entity/projectile/MudProjectile.java
View file

@ -1,9 +1,9 @@
package WayofTime.alchemicalWizardry.common.entity.projectile;
import WayofTime.alchemicalWizardry.common.PacketHandler;
import cpw.mods.fml.common.network.PacketDispatcher;
import net.minecraft.entity.Entity;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.potion.Potion;
import net.minecraft.potion.PotionEffect;
@ -11,7 +11,6 @@ import net.minecraft.util.DamageSource;
import net.minecraft.util.EnumMovingObjectType;
import net.minecraft.util.MovingObjectPosition;
import net.minecraft.world.World;
import cpw.mods.fml.common.network.PacketDispatcher;
public class MudProjectile extends EnergyBlastProjectile
{
@ -62,8 +61,7 @@ public class MudProjectile extends EnergyBlastProjectile
}
this.onImpact(mop.entityHit);
}
else if (mop.typeOfHit == EnumMovingObjectType.TILE)
} else if (mop.typeOfHit == EnumMovingObjectType.TILE)
{
}
@ -77,8 +75,7 @@ public class MudProjectile extends EnergyBlastProjectile
{
//shootingEntity.attackEntityFrom(DamageSource.causePlayerDamage(shootingEntity), 1);
this.setDead();
}
else
} else
{
//doDamage(8 + d6(), mop);
if (mop instanceof EntityLivingBase)
@ -96,8 +93,7 @@ public class MudProjectile extends EnergyBlastProjectile
if (doesBlindness)
{
((EntityLivingBase) mop).addPotionEffect(new PotionEffect(Potion.blindness.id, 100, 0));
}
else
} else
{
((EntityLivingBase) mop).addPotionEffect(new PotionEffect(Potion.moveSlowdown.id, 100, 2));
}

15
BM_src/WayofTime/alchemicalWizardry/common/entity/projectile/TeleportProjectile.java
View file

@ -2,21 +2,17 @@ package WayofTime.alchemicalWizardry.common.entity.projectile;
import WayofTime.alchemicalWizardry.common.PacketHandler;
import WayofTime.alchemicalWizardry.common.spell.simple.SpellTeleport;
import cpw.mods.fml.common.network.PacketDispatcher;
import net.minecraft.entity.Entity;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.entity.player.EntityPlayerMP;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.potion.Potion;
import net.minecraft.potion.PotionEffect;
import net.minecraft.util.DamageSource;
import net.minecraft.util.EnumMovingObjectType;
import net.minecraft.util.MovingObjectPosition;
import net.minecraft.world.World;
import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.event.entity.living.EnderTeleportEvent;
import cpw.mods.fml.common.network.PacketDispatcher;
import cpw.mods.fml.common.network.Player;
public class TeleportProjectile extends EnergyBlastProjectile
{
@ -73,8 +69,7 @@ public class TeleportProjectile extends EnergyBlastProjectile
}
this.onImpact(mop.entityHit);
}
else if (mop.typeOfHit == EnumMovingObjectType.TILE)
} else if (mop.typeOfHit == EnumMovingObjectType.TILE)
{
if (isEntityTeleport)
{
@ -112,8 +107,7 @@ public class TeleportProjectile extends EnergyBlastProjectile
{
//shootingEntity.attackEntityFrom(DamageSource.causePlayerDamage(shootingEntity), 1);
this.setDead();
}
else
} else
{
//doDamage(8 + d6(), mop);
if (mop instanceof EntityLivingBase)
@ -151,8 +145,7 @@ public class TeleportProjectile extends EnergyBlastProjectile
}
}
}
}
else
} else
{
// int x = (int)this.posX + mop.worldObj.rand.nextInt(100) - mop.worldObj.rand.nextInt(100);
// int y = (int)this.posY + mop.worldObj.rand.nextInt(10) - mop.worldObj.rand.nextInt(10);

13
BM_src/WayofTime/alchemicalWizardry/common/entity/projectile/WaterProjectile.java
View file

@ -2,16 +2,14 @@ package WayofTime.alchemicalWizardry.common.entity.projectile;
import WayofTime.alchemicalWizardry.common.AlchemicalWizardry;
import WayofTime.alchemicalWizardry.common.PacketHandler;
import cpw.mods.fml.common.network.PacketDispatcher;
import net.minecraft.entity.Entity;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.effect.EntityLightningBolt;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.potion.PotionEffect;
import net.minecraft.util.DamageSource;
import net.minecraft.util.EnumMovingObjectType;
import net.minecraft.util.MovingObjectPosition;
import net.minecraft.world.World;
import cpw.mods.fml.common.network.PacketDispatcher;
public class WaterProjectile extends EnergyBlastProjectile
{
@ -52,8 +50,7 @@ public class WaterProjectile extends EnergyBlastProjectile
}
this.onImpact(mop.entityHit);
}
else if (mop.typeOfHit == EnumMovingObjectType.TILE)
} else if (mop.typeOfHit == EnumMovingObjectType.TILE)
{
}
@ -67,8 +64,7 @@ public class WaterProjectile extends EnergyBlastProjectile
{
//shootingEntity.attackEntityFrom(DamageSource.causePlayerDamage(shootingEntity), 1);
this.setDead();
}
else
} else
{
//doDamage(8 + d6(), mop);
if (mop instanceof EntityLivingBase)
@ -87,8 +83,7 @@ public class WaterProjectile extends EnergyBlastProjectile
{
doDamage(projectileDamage * 2, mop);
((EntityLivingBase) mop).addPotionEffect(new PotionEffect(AlchemicalWizardry.customPotionDrowning.id, 80, 1));
}
else
} else
{
doDamage(projectileDamage, mop);
((EntityLivingBase) mop).addPotionEffect(new PotionEffect(AlchemicalWizardry.customPotionDrowning.id, 80, 0));

9
BM_src/WayofTime/alchemicalWizardry/common/entity/projectile/WindGustProjectile.java
View file

@ -1,14 +1,13 @@
package WayofTime.alchemicalWizardry.common.entity.projectile;
import WayofTime.alchemicalWizardry.common.PacketHandler;
import cpw.mods.fml.common.network.PacketDispatcher;
import net.minecraft.entity.Entity;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.util.DamageSource;
import net.minecraft.util.EnumMovingObjectType;
import net.minecraft.util.MovingObjectPosition;
import net.minecraft.world.World;
import cpw.mods.fml.common.network.PacketDispatcher;
public class WindGustProjectile extends EnergyBlastProjectile
{
@ -49,8 +48,7 @@ public class WindGustProjectile extends EnergyBlastProjectile
}
this.onImpact(mop.entityHit);
}
else if (mop.typeOfHit == EnumMovingObjectType.TILE)
} else if (mop.typeOfHit == EnumMovingObjectType.TILE)
{
// for(int i=-1;i<=1;i++)
// {
@ -77,8 +75,7 @@ public class WindGustProjectile extends EnergyBlastProjectile
{
//shootingEntity.attackEntityFrom(DamageSource.causePlayerDamage(shootingEntity), 1);
this.setDead();
}
else
} else
{
//doDamage(8 + d6(), mop);
if (mop instanceof EntityLivingBase)

18
BM_src/WayofTime/alchemicalWizardry/common/items/AWBaseItems.java
View file

@ -1,12 +1,13 @@
package WayofTime.alchemicalWizardry.common.items;
import java.util.List;
import WayofTime.alchemicalWizardry.common.AlchemicalWizardry;
import WayofTime.alchemicalWizardry.common.ModItems;
import net.minecraft.client.renderer.texture.IconRegister;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import WayofTime.alchemicalWizardry.common.AlchemicalWizardry;
import java.util.List;
public class AWBaseItems extends Item
{
@ -19,19 +20,16 @@ public class AWBaseItems extends Item
public void registerIcons(IconRegister iconRegister)
{
if (this.itemID == AlchemicalWizardry.blankSlate.itemID)
if (this.itemID == ModItems.blankSlate.itemID)
{
this.itemIcon = iconRegister.registerIcon("AlchemicalWizardry:BlankSlate");
}
else if (this.itemID == AlchemicalWizardry.reinforcedSlate.itemID)
} else if (this.itemID == ModItems.reinforcedSlate.itemID)
{
this.itemIcon = iconRegister.registerIcon("AlchemicalWizardry:ReinforcedSlate");
}
else if (this.itemID == AlchemicalWizardry.imbuedSlate.itemID)
} else if (this.itemID == ModItems.imbuedSlate.itemID)
{
this.itemIcon = iconRegister.registerIcon("AlchemicalWizardry:InfusedSlate");
}
else if (this.itemID == AlchemicalWizardry.demonicSlate.itemID)
} else if (this.itemID == ModItems.demonicSlate.itemID)
{
this.itemIcon = iconRegister.registerIcon("AlchemicalWizardry:DemonSlate");
}

15
BM_src/WayofTime/alchemicalWizardry/common/items/ActivationCrystal.java
View file

@ -1,7 +1,9 @@
package WayofTime.alchemicalWizardry.common.items;
import java.util.List;
import WayofTime.alchemicalWizardry.common.AlchemicalWizardry;
import WayofTime.alchemicalWizardry.common.alchemy.AlchemyRecipeRegistry;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.client.renderer.texture.IconRegister;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.entity.player.EntityPlayer;
@ -10,13 +12,9 @@ import net.minecraft.util.EnumChatFormatting;
import net.minecraft.util.Icon;
import net.minecraft.util.MathHelper;
import net.minecraft.world.World;
import org.lwjgl.input.Keyboard;
import WayofTime.alchemicalWizardry.common.AlchemicalWizardry;
import WayofTime.alchemicalWizardry.common.alchemy.AlchemyRecipeRegistry;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import java.util.List;
public class ActivationCrystal extends EnergyItems
{
@ -77,8 +75,7 @@ public class ActivationCrystal extends EnergyItems
}
}
}
}
else
} else
{
par3List.add("-Press " + EnumChatFormatting.BLUE + "shift" + EnumChatFormatting.GRAY + " for Recipe-");
}

4
BM_src/WayofTime/alchemicalWizardry/common/items/AirInk.java
View file

@ -1,10 +1,10 @@
package WayofTime.alchemicalWizardry.common.items;
import net.minecraft.client.renderer.texture.IconRegister;
import net.minecraft.item.Item;
import WayofTime.alchemicalWizardry.common.AlchemicalWizardry;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.client.renderer.texture.IconRegister;
import net.minecraft.item.Item;
public class AirInk extends Item
{

2
BM_src/WayofTime/alchemicalWizardry/common/items/ArchmageBloodOrb.java
View file

@ -1,8 +1,8 @@
package WayofTime.alchemicalWizardry.common.items;
import net.minecraft.client.renderer.texture.IconRegister;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.client.renderer.texture.IconRegister;
public class ArchmageBloodOrb extends EnergyBattery
{

22
BM_src/WayofTime/alchemicalWizardry/common/items/ArmourInhibitor.java
View file

@ -1,7 +1,8 @@
package WayofTime.alchemicalWizardry.common.items;
import java.util.List;
import WayofTime.alchemicalWizardry.common.AlchemicalWizardry;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.client.renderer.texture.IconRegister;
import net.minecraft.entity.Entity;
import net.minecraft.entity.player.EntityPlayer;
@ -10,9 +11,8 @@ import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.potion.PotionEffect;
import net.minecraft.util.Icon;
import net.minecraft.world.World;
import WayofTime.alchemicalWizardry.common.AlchemicalWizardry;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import java.util.List;
public class ArmourInhibitor extends EnergyItems
{
@ -40,8 +40,7 @@ public class ArmourInhibitor extends EnergyItems
if (par1ItemStack.stackTagCompound.getBoolean("isActive"))
{
par3List.add("Activated");
}
else
} else
{
par3List.add("Deactivated");
}
@ -72,8 +71,7 @@ public class ArmourInhibitor extends EnergyItems
if (tag.getBoolean("isActive"))
{
return this.activeIcon;
}
else
} else
{
return this.passiveIcon;
}
@ -86,8 +84,7 @@ public class ArmourInhibitor extends EnergyItems
if (par1 == 1)
{
return this.activeIcon;
}
else
} else
{
return this.passiveIcon;
}
@ -137,8 +134,7 @@ public class ArmourInhibitor extends EnergyItems
{
//EnergyItems.syphonBatteries(par1ItemStack, par3EntityPlayer, getEnergyUsed());
}
}
else
} else
{
par1ItemStack.setItemDamage(par1ItemStack.getMaxDamage());
}

24
BM_src/WayofTime/alchemicalWizardry/common/items/BlankSpell.java
View file

@ -1,7 +1,9 @@
package WayofTime.alchemicalWizardry.common.items;
import java.util.List;
import WayofTime.alchemicalWizardry.common.AlchemicalWizardry;
import WayofTime.alchemicalWizardry.common.tileEntity.TEHomHeart;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.client.renderer.texture.IconRegister;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
@ -9,10 +11,8 @@ import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.World;
import net.minecraftforge.common.DimensionManager;
import WayofTime.alchemicalWizardry.common.AlchemicalWizardry;
import WayofTime.alchemicalWizardry.common.tileEntity.TEHomHeart;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import java.util.List;
public class BlankSpell extends EnergyItems
{
@ -76,23 +76,19 @@ public class BlankSpell extends EnergyItems
if (homHeart.canCastSpell(par1ItemStack, par2World, par3EntityPlayer))
{
EnergyItems.syphonBatteries(par1ItemStack, par3EntityPlayer, homHeart.castSpell(par1ItemStack, par2World, par3EntityPlayer));
}
else
} else
{
return par1ItemStack;
}
}
else
} else
{
return par1ItemStack;
}
}
else
} else
{
return par1ItemStack;
}
}
else
} else
{
return par1ItemStack;
}

18
BM_src/WayofTime/alchemicalWizardry/common/items/BloodShard.java
View file

@ -1,14 +1,15 @@
package WayofTime.alchemicalWizardry.common.items;
import WayofTime.alchemicalWizardry.common.AlchemicalWizardry;
import WayofTime.alchemicalWizardry.common.ArmourUpgrade;
import WayofTime.alchemicalWizardry.common.ModItems;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.client.renderer.texture.IconRegister;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.world.World;
import WayofTime.alchemicalWizardry.common.AlchemicalWizardry;
import WayofTime.alchemicalWizardry.common.ArmourUpgrade;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
public class BloodShard extends Item implements ArmourUpgrade
{
@ -24,13 +25,13 @@ public class BloodShard extends Item implements ArmourUpgrade
@SideOnly(Side.CLIENT)
public void registerIcons(IconRegister iconRegister)
{
if (this.itemID == AlchemicalWizardry.weakBloodShard.itemID)
if (this.itemID == ModItems.weakBloodShard.itemID)
{
this.itemIcon = iconRegister.registerIcon("AlchemicalWizardry:WeakBloodShard");
return;
}
if (this.itemID == AlchemicalWizardry.demonBloodShard.itemID)
if (this.itemID == ModItems.demonBloodShard.itemID)
{
this.itemIcon = iconRegister.registerIcon("AlchemicalWizardry:DemonBloodShard");
return;
@ -39,11 +40,10 @@ public class BloodShard extends Item implements ArmourUpgrade
public int getBloodShardLevel()
{
if (this.itemID == AlchemicalWizardry.weakBloodShard.itemID)
if (this.itemID == ModItems.weakBloodShard.itemID)
{
return 1;
}
else if (this.itemID == AlchemicalWizardry.demonBloodShard.itemID)
} else if (this.itemID == ModItems.demonBloodShard.itemID)
{
return 2;
}

13
BM_src/WayofTime/alchemicalWizardry/common/items/BloodboundSword.java
View file

@ -1,7 +1,8 @@
package WayofTime.alchemicalWizardry.common.items;
import java.util.List;
import WayofTime.alchemicalWizardry.common.AlchemicalWizardry;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.block.Block;
import net.minecraft.block.material.Material;
import net.minecraft.client.renderer.texture.IconRegister;
@ -9,9 +10,8 @@ import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import WayofTime.alchemicalWizardry.common.AlchemicalWizardry;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import java.util.List;
public class BloodboundSword extends EnergyItems
{
@ -81,8 +81,7 @@ public class BloodboundSword extends EnergyItems
if (par2Block.blockID == Block.web.blockID)
{
return 15.0F;
}
else
} else
{
Material material = par2Block.blockMaterial;
return material != Material.plants && material != Material.vine && material != Material.coral && material != Material.leaves && material != Material.pumpkin ? 1.0F : 1.5F;

64
BM_src/WayofTime/alchemicalWizardry/common/items/BoundArmour.java
View file

@ -1,7 +1,11 @@
package WayofTime.alchemicalWizardry.common.items;
import java.util.List;
import WayofTime.alchemicalWizardry.common.AlchemicalWizardry;
import WayofTime.alchemicalWizardry.common.ArmourUpgrade;
import WayofTime.alchemicalWizardry.common.IBindable;
import WayofTime.alchemicalWizardry.common.ModItems;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.client.renderer.texture.IconRegister;
import net.minecraft.entity.Entity;
import net.minecraft.entity.EntityLivingBase;
@ -18,11 +22,8 @@ import net.minecraft.world.World;
import net.minecraftforge.common.ISpecialArmor;
import thaumcraft.api.IGoggles;
import thaumcraft.api.nodes.IRevealer;
import WayofTime.alchemicalWizardry.common.AlchemicalWizardry;
import WayofTime.alchemicalWizardry.common.ArmourUpgrade;
import WayofTime.alchemicalWizardry.common.IBindable;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import java.util.List;
public class BoundArmour extends ItemArmor implements ISpecialArmor, IRevealer, IGoggles, IBindable
{
@ -54,22 +55,22 @@ public class BoundArmour extends ItemArmor implements ISpecialArmor, IRevealer,
public Icon getIconFromDamage(int par1)
{
if (this.itemID == AlchemicalWizardry.boundHelmet.itemID)
if (this.itemID == ModItems.boundHelmet.itemID)
{
return this.helmetIcon;
}
if (this.itemID == AlchemicalWizardry.boundPlate.itemID)
if (this.itemID == ModItems.boundPlate.itemID)
{
return this.plateIcon;
}
if (this.itemID == AlchemicalWizardry.boundLeggings.itemID)
if (this.itemID == ModItems.boundLeggings.itemID)
{
return this.leggingsIcon;
}
if (this.itemID == AlchemicalWizardry.boundBoots.itemID)
if (this.itemID == ModItems.boundBoots.itemID)
{
return this.bootsIcon;
}
@ -82,6 +83,7 @@ public class BoundArmour extends ItemArmor implements ISpecialArmor, IRevealer,
{
return false;
}
@Override
public ArmorProperties getProperties(EntityLivingBase player, ItemStack armor, DamageSource source, double damage, int slot)
{
@ -95,8 +97,7 @@ public class BoundArmour extends ItemArmor implements ISpecialArmor, IRevealer,
if (isImmuneToVoid(armor))
{
return new ArmorProperties(-1, 3, 100000);
}
else
} else
{
return new ArmorProperties(-1, 0, 0);
}
@ -112,7 +113,7 @@ public class BoundArmour extends ItemArmor implements ISpecialArmor, IRevealer,
return new ArmorProperties(-1, 0, 0);
}
if (helmet.itemID == AlchemicalWizardry.boundHelmet.itemID || plate.itemID == AlchemicalWizardry.boundPlate.itemID || leggings.itemID == AlchemicalWizardry.boundLeggings.itemID || boots.itemID == AlchemicalWizardry.boundBoots.itemID)
if (helmet.itemID == ModItems.boundHelmet.itemID || plate.itemID == ModItems.boundPlate.itemID || leggings.itemID == ModItems.boundLeggings.itemID || boots.itemID == ModItems.boundBoots.itemID)
{
if (source.isUnblockable())
{
@ -128,22 +129,22 @@ public class BoundArmour extends ItemArmor implements ISpecialArmor, IRevealer,
@Override
public int getArmorDisplay(EntityPlayer player, ItemStack armor, int slot)
{
if (armor.itemID == AlchemicalWizardry.boundHelmet.itemID)
if (armor.itemID == ModItems.boundHelmet.itemID)
{
return 3;
}
if (armor.itemID == AlchemicalWizardry.boundPlate.itemID)
if (armor.itemID == ModItems.boundPlate.itemID)
{
return 8;
}
if (armor.itemID == AlchemicalWizardry.boundLeggings.itemID)
if (armor.itemID == ModItems.boundLeggings.itemID)
{
return 6;
}
if (armor.itemID == AlchemicalWizardry.boundBoots.itemID)
if (armor.itemID == ModItems.boundBoots.itemID)
{
return 3;
}
@ -206,28 +207,27 @@ public class BoundArmour extends ItemArmor implements ISpecialArmor, IRevealer,
{
if (((EntityLivingBase) entity).isPotionActive(Potion.invisibility.id))
{
if (itemID == AlchemicalWizardry.boundHelmet.itemID || itemID == AlchemicalWizardry.boundPlate.itemID || itemID == AlchemicalWizardry.boundBoots.itemID)
if (itemID == ModItems.boundHelmet.itemID || itemID == ModItems.boundPlate.itemID || itemID == ModItems.boundBoots.itemID)
{
return "alchemicalwizardry:models/armor/boundArmour_invisible_layer_1.png";
}
if (itemID == AlchemicalWizardry.boundLeggings.itemID)
if (itemID == ModItems.boundLeggings.itemID)
{
return "alchemicalwizardry:models/armor/boundArmour_invisible_layer_2.png";
}
}
}
if (itemID == AlchemicalWizardry.boundHelmet.itemID || itemID == AlchemicalWizardry.boundPlate.itemID || itemID == AlchemicalWizardry.boundBoots.itemID)
if (itemID == ModItems.boundHelmet.itemID || itemID == ModItems.boundPlate.itemID || itemID == ModItems.boundBoots.itemID)
{
return "alchemicalwizardry:models/armor/boundArmour_layer_1.png";
}
if (itemID == AlchemicalWizardry.boundLeggings.itemID)
if (itemID == ModItems.boundLeggings.itemID)
{
return "alchemicalwizardry:models/armor/boundArmour_layer_2.png";
}
else
} else
{
return null;
}
@ -348,12 +348,12 @@ public class BoundArmour extends ItemArmor implements ISpecialArmor, IRevealer,
if (itemStack != null)
{
if (itemStack.itemID == AlchemicalWizardry.weakBloodShard.itemID)
if (itemStack.itemID == ModItems.weakBloodShard.itemID)
{
max = Math.max(max, 1);
}
if (itemStack.itemID == AlchemicalWizardry.demonBloodShard.itemID)
if (itemStack.itemID == ModItems.demonBloodShard.itemID)
{
max = Math.max(max, 2);
}
@ -481,7 +481,7 @@ public class BoundArmour extends ItemArmor implements ISpecialArmor, IRevealer,
continue;
}
if (item.itemID == AlchemicalWizardry.voidSigil.itemID)
if (item.itemID == ModItems.voidSigil.itemID)
{
return true;
}
@ -556,27 +556,27 @@ public class BoundArmour extends ItemArmor implements ISpecialArmor, IRevealer,
continue;
}
if (item.itemID == AlchemicalWizardry.weakBloodOrb.itemID)
if (item.itemID == ModItems.weakBloodOrb.itemID)
{
return 0.75f;
}
if (item.itemID == AlchemicalWizardry.apprenticeBloodOrb.itemID)
if (item.itemID == ModItems.apprenticeBloodOrb.itemID)
{
return 0.50f;
}
if (item.itemID == AlchemicalWizardry.magicianBloodOrb.itemID)
if (item.itemID == ModItems.magicianBloodOrb.itemID)
{
return 0.25f;
}
if (item.itemID == AlchemicalWizardry.masterBloodOrb.itemID)
if (item.itemID == ModItems.masterBloodOrb.itemID)
{
return 0.0f;
}
if (item.itemID == AlchemicalWizardry.archmageBloodOrb.itemID)
if (item.itemID == ModItems.archmageBloodOrb.itemID)
{
return 0.0f;
}

35
BM_src/WayofTime/alchemicalWizardry/common/items/BoundAxe.java
View file

@ -1,8 +1,9 @@
package WayofTime.alchemicalWizardry.common.items;
import java.util.ArrayList;
import java.util.List;
import WayofTime.alchemicalWizardry.common.AlchemicalWizardry;
import WayofTime.alchemicalWizardry.common.IBindable;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.block.Block;
import net.minecraft.block.BlockLeavesBase;
import net.minecraft.client.renderer.texture.IconRegister;
@ -18,19 +19,22 @@ import net.minecraft.nbt.NBTTagList;
import net.minecraft.util.Icon;
import net.minecraft.world.World;
import net.minecraftforge.common.ForgeHooks;
import WayofTime.alchemicalWizardry.common.AlchemicalWizardry;
import WayofTime.alchemicalWizardry.common.IBindable;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import java.util.ArrayList;
import java.util.List;
public class BoundAxe extends ItemAxe implements IBindable
{
/** Array of blocks the tool has extra effect against. */
/**
* Array of blocks the tool has extra effect against.
*/
public static final Block[] blocksEffectiveAgainst = new Block[]{Block.planks, Block.bookShelf, Block.wood, Block.chest, Block.stoneDoubleSlab, Block.stoneSingleSlab, Block.pumpkin, Block.pumpkinLantern};
public float efficiencyOnProperMaterial = 12.0F;
/** Damage versus entities. */
/**
* Damage versus entities.
*/
public float damageVsEntity;
private static Icon activeIcon;
@ -69,8 +73,7 @@ public class BoundAxe extends ItemAxe implements IBindable
if (par1ItemStack.stackTagCompound.getBoolean("isActive"))
{
par3List.add("Activated");
}
else
} else
{
par3List.add("Deactivated");
}
@ -104,8 +107,7 @@ public class BoundAxe extends ItemAxe implements IBindable
if (tag.getBoolean("isActive"))
{
return this.activeIcon;
}
else
} else
{
return this.passiveIcon;
}
@ -188,8 +190,7 @@ public class BoundAxe extends ItemAxe implements IBindable
{
par2World.spawnEntityInWorld(new EntityItem(par2World, posX, posY + par3EntityPlayer.getEyeHeight(), posZ, droppedItem));
}
}
else
} else
{
ArrayList<ItemStack> itemDropList = block.getBlockDropped(par2World, posX + i, posY + j, posZ + k, meta, fortuneLvl);
@ -338,7 +339,9 @@ public class BoundAxe extends ItemAxe implements IBindable
// return true;
// }
/** FORGE: Overridden to allow custom tool effectiveness */
/**
* FORGE: Overridden to allow custom tool effectiveness
*/
@Override
public float getStrVsBlock(ItemStack stack, Block block, int meta)
{

35
BM_src/WayofTime/alchemicalWizardry/common/items/BoundPickaxe.java
View file

@ -1,8 +1,9 @@
package WayofTime.alchemicalWizardry.common.items;
import java.util.ArrayList;
import java.util.List;
import WayofTime.alchemicalWizardry.common.AlchemicalWizardry;
import WayofTime.alchemicalWizardry.common.IBindable;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.block.Block;
import net.minecraft.block.material.Material;
import net.minecraft.client.renderer.texture.IconRegister;
@ -18,19 +19,22 @@ import net.minecraft.nbt.NBTTagList;
import net.minecraft.util.Icon;
import net.minecraft.world.World;
import net.minecraftforge.common.ForgeHooks;
import WayofTime.alchemicalWizardry.common.AlchemicalWizardry;
import WayofTime.alchemicalWizardry.common.IBindable;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import java.util.ArrayList;
import java.util.List;
public class BoundPickaxe extends ItemPickaxe implements IBindable
{
/** Array of blocks the tool has extra effect against. */
/**
* Array of blocks the tool has extra effect against.
*/
public static final Block[] blocksEffectiveAgainst = new Block[]{Block.cobblestone, Block.stoneDoubleSlab, Block.stoneSingleSlab, Block.stone, Block.sandStone, Block.cobblestoneMossy, Block.oreIron, Block.blockIron, Block.oreCoal, Block.blockGold, Block.oreGold, Block.oreDiamond, Block.blockDiamond, Block.ice, Block.netherrack, Block.oreLapis, Block.blockLapis, Block.oreRedstone, Block.oreRedstoneGlowing, Block.rail, Block.railDetector, Block.railPowered, Block.railActivator};
public float efficiencyOnProperMaterial = 12.0F;
/** Damage versus entities. */
/**
* Damage versus entities.
*/
public float damageVsEntity;
private static Icon activeIcon;
@ -70,8 +74,7 @@ public class BoundPickaxe extends ItemPickaxe implements IBindable
if (par1ItemStack.stackTagCompound.getBoolean("isActive"))
{
par3List.add("Activated");
}
else
} else
{
par3List.add("Deactivated");
}
@ -105,8 +108,7 @@ public class BoundPickaxe extends ItemPickaxe implements IBindable
if (tag.getBoolean("isActive"))
{
return this.activeIcon;
}
else
} else
{
return this.passiveIcon;
}
@ -189,8 +191,7 @@ public class BoundPickaxe extends ItemPickaxe implements IBindable
{
par2World.spawnEntityInWorld(new EntityItem(par2World, posX, posY + par3EntityPlayer.getEyeHeight(), posZ, droppedItem));
}
}
else
} else
{
ArrayList<ItemStack> itemDropList = block.getBlockDropped(par2World, posX + i, posY + j, posZ + k, meta, fortuneLvl);
@ -347,7 +348,9 @@ public class BoundPickaxe extends ItemPickaxe implements IBindable
// return false;
// }
/** FORGE: Overridden to allow custom tool effectiveness */
/**
* FORGE: Overridden to allow custom tool effectiveness
*/
@Override
public float getStrVsBlock(ItemStack stack, Block block, int meta)
{

38
BM_src/WayofTime/alchemicalWizardry/common/items/BoundShovel.java
View file

@ -1,8 +1,10 @@
package WayofTime.alchemicalWizardry.common.items;
import java.util.ArrayList;
import java.util.List;
import WayofTime.alchemicalWizardry.common.AlchemicalWizardry;
import WayofTime.alchemicalWizardry.common.IBindable;
import com.google.common.collect.Multimap;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.block.Block;
import net.minecraft.client.renderer.texture.IconRegister;
import net.minecraft.enchantment.Enchantment;
@ -19,22 +21,22 @@ import net.minecraft.nbt.NBTTagList;
import net.minecraft.util.Icon;
import net.minecraft.world.World;
import net.minecraftforge.common.ForgeHooks;
import WayofTime.alchemicalWizardry.common.AlchemicalWizardry;
import WayofTime.alchemicalWizardry.common.IBindable;
import com.google.common.collect.Multimap;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import java.util.ArrayList;
import java.util.List;
public class BoundShovel extends ItemSpade implements IBindable
{
/** Array of blocks the tool has extra effect against. */
/**
* Array of blocks the tool has extra effect against.
*/
public static final Block[] blocksEffectiveAgainst = new Block[]{Block.grass, Block.dirt, Block.sand, Block.gravel, Block.snow, Block.blockSnow, Block.blockClay, Block.tilledField, Block.slowSand, Block.mycelium};
public float efficiencyOnProperMaterial = 12.0F;
/** Damage versus entities. */
/**
* Damage versus entities.
*/
public float damageVsEntity;
private static Icon activeIcon;
@ -73,8 +75,7 @@ public class BoundShovel extends ItemSpade implements IBindable
if (par1ItemStack.stackTagCompound.getBoolean("isActive"))
{
par3List.add("Activated");
}
else
} else
{
par3List.add("Deactivated");
}
@ -108,8 +109,7 @@ public class BoundShovel extends ItemSpade implements IBindable
if (tag.getBoolean("isActive"))
{
return this.activeIcon;
}
else
} else
{
return this.passiveIcon;
}
@ -192,8 +192,7 @@ public class BoundShovel extends ItemSpade implements IBindable
{
par2World.spawnEntityInWorld(new EntityItem(par2World, posX, posY + par3EntityPlayer.getEyeHeight(), posZ, droppedItem));
}
}
else
} else
{
ArrayList<ItemStack> itemDropList = block.getBlockDropped(par2World, posX + i, posY + j, posZ + k, meta, fortuneLvl);
@ -340,7 +339,6 @@ public class BoundShovel extends ItemSpade implements IBindable
// {
// return false;
// }
@Override
public Multimap getItemAttributeModifiers()
{
@ -349,7 +347,9 @@ public class BoundShovel extends ItemSpade implements IBindable
return multimap;
}
/** FORGE: Overridden to allow custom tool effectiveness */
/**
* FORGE: Overridden to allow custom tool effectiveness
*/
@Override
public float getStrVsBlock(ItemStack stack, Block block, int meta)
{

24
BM_src/WayofTime/alchemicalWizardry/common/items/CheatyItem.java
View file

@ -1,7 +1,13 @@
package WayofTime.alchemicalWizardry.common.items;
import java.util.List;
import WayofTime.alchemicalWizardry.common.AlchemicalWizardry;
import WayofTime.alchemicalWizardry.common.IBindable;
import WayofTime.alchemicalWizardry.common.LifeEssenceNetwork;
import WayofTime.alchemicalWizardry.common.PacketHandler;
import WayofTime.alchemicalWizardry.common.tileEntity.TEAltar;
import cpw.mods.fml.common.network.PacketDispatcher;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.client.renderer.texture.IconRegister;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.Item;
@ -11,14 +17,8 @@ import net.minecraft.server.MinecraftServer;
import net.minecraft.util.DamageSource;
import net.minecraft.world.World;
import net.minecraftforge.common.FakePlayer;
import WayofTime.alchemicalWizardry.common.AlchemicalWizardry;
import WayofTime.alchemicalWizardry.common.IBindable;
import WayofTime.alchemicalWizardry.common.LifeEssenceNetwork;
import WayofTime.alchemicalWizardry.common.PacketHandler;
import WayofTime.alchemicalWizardry.common.tileEntity.TEAltar;
import cpw.mods.fml.common.network.PacketDispatcher;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import java.util.List;
public class CheatyItem extends Item implements IBindable
{
@ -65,6 +65,7 @@ public class CheatyItem extends Item implements IBindable
//par3List.add("LP: " + par2EntityPlayer.getEntityData().getInteger("currentEssence"));
}
public ItemStack onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer)
{
EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer);
@ -99,8 +100,7 @@ public class CheatyItem extends Item implements IBindable
if (par3EntityPlayer.isSneaking())
{
PacketDispatcher.sendPacketToServer(PacketHandler.getCreativeCheatPacket(itemTag.getString("ownerName"), false));
}
else
} else
{
PacketDispatcher.sendPacketToServer(PacketHandler.getCreativeCheatPacket(itemTag.getString("ownerName"), true));
}

20
BM_src/WayofTime/alchemicalWizardry/common/items/DaggerOfSacrifice.java
View file

@ -1,7 +1,11 @@
package WayofTime.alchemicalWizardry.common.items;
import java.util.List;
import WayofTime.alchemicalWizardry.common.AlchemicalWizardry;
import WayofTime.alchemicalWizardry.common.tileEntity.TEAltar;
import com.google.common.collect.Multimap;
import cpw.mods.fml.common.network.PacketDispatcher;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.block.Block;
import net.minecraft.block.material.Material;
import net.minecraft.client.renderer.texture.IconRegister;
@ -21,18 +25,13 @@ import net.minecraft.item.ItemStack;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.DamageSource;
import net.minecraft.world.World;
import WayofTime.alchemicalWizardry.common.AlchemicalWizardry;
import WayofTime.alchemicalWizardry.common.tileEntity.TEAltar;
import com.google.common.collect.Multimap;
import cpw.mods.fml.common.network.PacketDispatcher;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import java.util.List;
public class DaggerOfSacrifice extends EnergyItems
{
private float weaponDamage;
public DaggerOfSacrifice(int id)
{
super(id);
@ -183,8 +182,7 @@ public class DaggerOfSacrifice extends EnergyItems
if (par2Block.blockID == Block.web.blockID)
{
return 15.0F;
}
else
} else
{
Material material = par2Block.blockMaterial;
return material != Material.plants && material != Material.vine && material != Material.coral && material != Material.leaves && material != Material.pumpkin ? 1.0F : 1.5F;

43
BM_src/WayofTime/alchemicalWizardry/common/items/DemonPlacer.java
View file

@ -1,30 +1,22 @@
package WayofTime.alchemicalWizardry.common.items;
import java.util.List;
import net.minecraft.block.Block;
import net.minecraft.block.material.Material;
import net.minecraft.client.renderer.texture.IconRegister;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.entity.Entity;
import net.minecraft.entity.EntityEggInfo;
import net.minecraft.entity.EntityList;
import net.minecraft.entity.EntityLiving;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.util.EnumMovingObjectType;
import net.minecraft.util.Facing;
import net.minecraft.util.Icon;
import net.minecraft.util.MathHelper;
import net.minecraft.util.MovingObjectPosition;
import net.minecraft.world.World;
import WayofTime.alchemicalWizardry.common.entity.mob.EntityDemon;
import WayofTime.alchemicalWizardry.common.summoning.SummoningRegistry;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.block.Block;
import net.minecraft.block.material.Material;
import net.minecraft.client.renderer.texture.IconRegister;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.entity.*;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.util.*;
import net.minecraft.world.World;
import java.util.List;
public class DemonPlacer extends Item
{
@ -69,8 +61,7 @@ public class DemonPlacer extends Item
if (par3World.isRemote)
{
return true;
}
else
} else
{
int i1 = par3World.getBlockId(par4, par5, par6);
par4 += Facing.offsetsXForSide[par7];
@ -110,16 +101,14 @@ public class DemonPlacer extends Item
if (par2World.isRemote)
{
return par1ItemStack;
}
else
} else
{
MovingObjectPosition movingobjectposition = this.getMovingObjectPositionFromPlayer(par2World, par3EntityPlayer, true);
if (movingobjectposition == null)
{
return par1ItemStack;
}
else
} else
{
if (movingobjectposition.typeOfHit == EnumMovingObjectType.TILE)
{

8
BM_src/WayofTime/alchemicalWizardry/common/items/DemonicTelepositionFocus.java
View file

@ -1,13 +1,13 @@
package WayofTime.alchemicalWizardry.common.items;
import java.util.List;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.client.renderer.texture.IconRegister;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import java.util.List;
public class DemonicTelepositionFocus extends TelepositionFocus
{

2
BM_src/WayofTime/alchemicalWizardry/common/items/DuskScribeTool.java
View file

@ -1,8 +1,8 @@
package WayofTime.alchemicalWizardry.common.items;
import net.minecraft.client.renderer.texture.IconRegister;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.client.renderer.texture.IconRegister;
public class DuskScribeTool extends ScribeTool
{

4
BM_src/WayofTime/alchemicalWizardry/common/items/EarthInk.java
View file

@ -1,10 +1,10 @@
package WayofTime.alchemicalWizardry.common.items;
import net.minecraft.client.renderer.texture.IconRegister;
import net.minecraft.item.Item;
import WayofTime.alchemicalWizardry.common.AlchemicalWizardry;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.client.renderer.texture.IconRegister;
import net.minecraft.item.Item;
public class EarthInk extends Item
{

19
BM_src/WayofTime/alchemicalWizardry/common/items/EnergyBattery.java
View file

@ -1,7 +1,10 @@
package WayofTime.alchemicalWizardry.common.items;
import java.util.List;
import WayofTime.alchemicalWizardry.common.*;
import WayofTime.alchemicalWizardry.common.tileEntity.TEAltar;
import cpw.mods.fml.common.network.PacketDispatcher;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.client.renderer.texture.IconRegister;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.entity.player.EntityPlayerMP;
@ -12,15 +15,8 @@ import net.minecraft.server.MinecraftServer;
import net.minecraft.util.DamageSource;
import net.minecraft.world.World;
import net.minecraftforge.common.FakePlayer;
import WayofTime.alchemicalWizardry.common.AlchemicalWizardry;
import WayofTime.alchemicalWizardry.common.ArmourUpgrade;
import WayofTime.alchemicalWizardry.common.IBindable;
import WayofTime.alchemicalWizardry.common.LifeEssenceNetwork;
import WayofTime.alchemicalWizardry.common.PacketHandler;
import WayofTime.alchemicalWizardry.common.tileEntity.TEAltar;
import cpw.mods.fml.common.network.PacketDispatcher;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import java.util.List;
public class EnergyBattery extends Item implements ArmourUpgrade, IBindable
{
@ -65,6 +61,7 @@ public class EnergyBattery extends Item implements ArmourUpgrade, IBindable
//par3List.add("LP: " + par2EntityPlayer.getEntityData().getInteger("currentEssence"));
}
public ItemStack onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer)
{
EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer);

19
BM_src/WayofTime/alchemicalWizardry/common/items/EnergyBazooka.java
View file

@ -1,7 +1,9 @@
package WayofTime.alchemicalWizardry.common.items;
import java.util.List;
import WayofTime.alchemicalWizardry.common.AlchemicalWizardry;
import WayofTime.alchemicalWizardry.common.entity.projectile.EntityEnergyBazookaMainProjectile;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.client.renderer.texture.IconRegister;
import net.minecraft.entity.Entity;
import net.minecraft.entity.player.EntityPlayer;
@ -10,10 +12,8 @@ import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.util.Icon;
import net.minecraft.util.Vec3;
import net.minecraft.world.World;
import WayofTime.alchemicalWizardry.common.AlchemicalWizardry;
import WayofTime.alchemicalWizardry.common.entity.projectile.EntityEnergyBazookaMainProjectile;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import java.util.List;
public class EnergyBazooka extends EnergyItems
{
@ -22,6 +22,7 @@ public class EnergyBazooka extends EnergyItems
private static int damage;
//private static int delay;
private static final int maxDelay = 150;
public EnergyBazooka(int id)
{
super(id);
@ -56,8 +57,7 @@ public class EnergyBazooka extends EnergyItems
if (tag.getBoolean("isActive"))
{
return this.activeIcon;
}
else
} else
{
return this.passiveIcon;
}
@ -157,8 +157,7 @@ public class EnergyBazooka extends EnergyItems
if (par1ItemStack.stackTagCompound.getBoolean("isActive"))
{
par3List.add("Activated");
}
else
} else
{
par3List.add("Deactivated");
}

19
BM_src/WayofTime/alchemicalWizardry/common/items/EnergyBlast.java
View file

@ -1,7 +1,9 @@
package WayofTime.alchemicalWizardry.common.items;
import java.util.List;
import WayofTime.alchemicalWizardry.common.AlchemicalWizardry;
import WayofTime.alchemicalWizardry.common.entity.projectile.EnergyBlastProjectile;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.client.renderer.texture.IconRegister;
import net.minecraft.entity.Entity;
import net.minecraft.entity.player.EntityPlayer;
@ -9,10 +11,8 @@ import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.util.Icon;
import net.minecraft.world.World;
import WayofTime.alchemicalWizardry.common.AlchemicalWizardry;
import WayofTime.alchemicalWizardry.common.entity.projectile.EnergyBlastProjectile;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import java.util.List;
public class EnergyBlast extends EnergyItems
{
@ -21,6 +21,7 @@ public class EnergyBlast extends EnergyItems
private static int damage;
//private static int delay;
private static final int maxDelay = 15;
public EnergyBlast(int id)
{
super(id);
@ -56,8 +57,7 @@ public class EnergyBlast extends EnergyItems
if (tag.getBoolean("isActive"))
{
return this.activeIcon;
}
else
} else
{
return this.passiveIcon;
}
@ -152,8 +152,7 @@ public class EnergyBlast extends EnergyItems
if (par1ItemStack.stackTagCompound.getBoolean("isActive"))
{
par3List.add("Activated");
}
else
} else
{
par3List.add("Deactivated");
}

21
BM_src/WayofTime/alchemicalWizardry/common/items/EnergyItems.java
View file

@ -1,5 +1,11 @@
package WayofTime.alchemicalWizardry.common.items;
import WayofTime.alchemicalWizardry.common.AlchemicalWizardry;
import WayofTime.alchemicalWizardry.common.IBindable;
import WayofTime.alchemicalWizardry.common.LifeEssenceNetwork;
import WayofTime.alchemicalWizardry.common.PacketHandler;
import WayofTime.alchemicalWizardry.common.tileEntity.TEAltar;
import cpw.mods.fml.common.network.PacketDispatcher;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
@ -7,12 +13,6 @@ import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.server.MinecraftServer;
import net.minecraft.util.DamageSource;
import net.minecraft.world.World;
import WayofTime.alchemicalWizardry.common.AlchemicalWizardry;
import WayofTime.alchemicalWizardry.common.IBindable;
import WayofTime.alchemicalWizardry.common.LifeEssenceNetwork;
import WayofTime.alchemicalWizardry.common.PacketHandler;
import WayofTime.alchemicalWizardry.common.tileEntity.TEAltar;
import cpw.mods.fml.common.network.PacketDispatcher;
public class EnergyItems extends Item implements IBindable
{
@ -100,8 +100,7 @@ public class EnergyItems extends Item implements IBindable
PacketDispatcher.sendPacketToServer(PacketHandler.getPacket(itemTag.getString("ownerName"), -damageToBeDone, 0));
return true;
}
else
} else
{
return true;
}
@ -112,8 +111,7 @@ public class EnergyItems extends Item implements IBindable
if (!player.worldObj.isRemote)
{
return syphonAndDamageWhileInContainer(ist, player, damageToBeDone);
}
else
} else
{
World world = player.worldObj;
@ -224,8 +222,7 @@ public class EnergyItems extends Item implements IBindable
user.onDeath(DamageSource.generic);
}
}
}
else if (energySyphoned >= 100)
} else if (energySyphoned >= 100)
{
if (!user.capabilities.isCreativeMode)
{

19
BM_src/WayofTime/alchemicalWizardry/common/items/EnergySword.java
View file

@ -1,7 +1,8 @@
package WayofTime.alchemicalWizardry.common.items;
import java.util.List;
import WayofTime.alchemicalWizardry.common.AlchemicalWizardry;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.block.Block;
import net.minecraft.block.material.Material;
import net.minecraft.client.renderer.texture.IconRegister;
@ -15,9 +16,8 @@ import net.minecraft.potion.Potion;
import net.minecraft.potion.PotionEffect;
import net.minecraft.util.Icon;
import net.minecraft.world.World;
import WayofTime.alchemicalWizardry.common.AlchemicalWizardry;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import java.util.List;
public class EnergySword extends ItemSword
{
@ -73,8 +73,7 @@ public class EnergySword extends ItemSword
if (tag.getBoolean("isActive"))
{
return this.activeIcon;
}
else
} else
{
return this.passiveIcon;
}
@ -206,8 +205,7 @@ public class EnergySword extends ItemSword
if (par1ItemStack.stackTagCompound.getBoolean("isActive"))
{
par3List.add("Activated");
}
else
} else
{
par3List.add("Deactivated");
}
@ -225,8 +223,7 @@ public class EnergySword extends ItemSword
if (par2Block.blockID == Block.web.blockID)
{
return 15.0F;
}
else
} else
{
Material material = par2Block.blockMaterial;
return material != Material.plants && material != Material.vine && material != Material.coral && material != Material.leaves && material != Material.pumpkin ? 1.0F : 1.5F;

4
BM_src/WayofTime/alchemicalWizardry/common/items/FireInk.java
View file

@ -1,10 +1,10 @@
package WayofTime.alchemicalWizardry.common.items;
import net.minecraft.client.renderer.texture.IconRegister;
import net.minecraft.item.Item;
import WayofTime.alchemicalWizardry.common.AlchemicalWizardry;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.client.renderer.texture.IconRegister;
import net.minecraft.item.Item;
public class FireInk extends Item
{

22
BM_src/WayofTime/alchemicalWizardry/common/items/ItemDiabloKey.java
View file

@ -1,7 +1,12 @@
package WayofTime.alchemicalWizardry.common.items;
import java.util.List;
import WayofTime.alchemicalWizardry.common.AlchemicalWizardry;
import WayofTime.alchemicalWizardry.common.IBindable;
import WayofTime.alchemicalWizardry.common.ModItems;
import WayofTime.alchemicalWizardry.common.tileEntity.TEAltar;
import cpw.mods.fml.common.network.PacketDispatcher;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.client.renderer.texture.IconRegister;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.entity.player.EntityPlayer;
@ -12,12 +17,8 @@ import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.util.DamageSource;
import net.minecraft.world.World;
import net.minecraftforge.common.FakePlayer;
import WayofTime.alchemicalWizardry.common.AlchemicalWizardry;
import WayofTime.alchemicalWizardry.common.IBindable;
import WayofTime.alchemicalWizardry.common.tileEntity.TEAltar;
import cpw.mods.fml.common.network.PacketDispatcher;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import java.util.List;
public class ItemDiabloKey extends EnergyItems
{
@ -52,6 +53,7 @@ public class ItemDiabloKey extends EnergyItems
//par3List.add("LP: " + par2EntityPlayer.getEntityData().getInteger("currentEssence"));
}
public ItemStack onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer)
{
EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer);
@ -118,8 +120,8 @@ public class ItemDiabloKey extends EnergyItems
@SideOnly(Side.CLIENT)
public void getSubItems(int id, CreativeTabs creativeTab, List list)
{
list.add(new ItemStack(AlchemicalWizardry.itemKeyOfDiablo));
ItemStack boundKey = new ItemStack(AlchemicalWizardry.itemKeyOfDiablo);
list.add(new ItemStack(ModItems.itemKeyOfDiablo));
ItemStack boundKey = new ItemStack(ModItems.itemKeyOfDiablo);
EnergyItems.checkAndSetItemOwner(boundKey, "Server-wide Soul Network");
list.add(boundKey);
}

43
BM_src/WayofTime/alchemicalWizardry/common/items/ItemRitualDiviner.java
View file

@ -1,7 +1,13 @@
package WayofTime.alchemicalWizardry.common.items;
import java.util.List;
import WayofTime.alchemicalWizardry.common.AlchemicalWizardry;
import WayofTime.alchemicalWizardry.common.ModBlocks;
import WayofTime.alchemicalWizardry.common.ModItems;
import WayofTime.alchemicalWizardry.common.rituals.RitualComponent;
import WayofTime.alchemicalWizardry.common.rituals.Rituals;
import WayofTime.alchemicalWizardry.common.tileEntity.TEMasterStone;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.client.renderer.texture.IconRegister;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.entity.player.EntityPlayer;
@ -11,12 +17,8 @@ import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.ChatMessageComponent;
import net.minecraft.util.EnumChatFormatting;
import net.minecraft.world.World;
import WayofTime.alchemicalWizardry.common.AlchemicalWizardry;
import WayofTime.alchemicalWizardry.common.rituals.RitualComponent;
import WayofTime.alchemicalWizardry.common.rituals.Rituals;
import WayofTime.alchemicalWizardry.common.tileEntity.TEMasterStone;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import java.util.List;
public class ItemRitualDiviner extends EnergyItems
{
@ -46,8 +48,7 @@ public class ItemRitualDiviner extends EnergyItems
if (this.getMaxRuneDisplacement(par1ItemStack) == 1)
{
par3List.add("Can place Dusk runes");
}
else
} else
{
par3List.add("Can not place Dusk runes");
}
@ -114,8 +115,7 @@ public class ItemRitualDiviner extends EnergyItems
int ritualID = this.getCurrentRitual(par1ItemStack);
return "Ritual: " + Rituals.getNameOfRitual(ritualID);
//par3List.add("Current owner: " + par1ItemStack.stackTagCompound.getString("ownerName"));
}
else
} else
{
return super.getItemStackDisplayName(par1ItemStack);
}
@ -141,7 +141,7 @@ public class ItemRitualDiviner extends EnergyItems
continue;
}
if (new ItemStack(AlchemicalWizardry.ritualStone).isItemEqual(playerInventory[i]))
if (new ItemStack(ModBlocks.ritualStone).isItemEqual(playerInventory[i]))
{
playerInvRitualStoneLocation = i;
break;
@ -165,7 +165,7 @@ public class ItemRitualDiviner extends EnergyItems
par2EntityPlayer.inventory.decrStackSize(playerInvRitualStoneLocation, 1);
}
par3World.setBlock(par4 + rc.getX(), par5 + rc.getY(), par6 + rc.getZ(), AlchemicalWizardry.ritualStone.blockID, rc.getStoneType(), 3);
par3World.setBlock(par4 + rc.getX(), par5 + rc.getY(), par6 + rc.getZ(), ModBlocks.ritualStone.blockID, rc.getStoneType(), 3);
if (par3World.isRemote)
{
@ -176,12 +176,11 @@ public class ItemRitualDiviner extends EnergyItems
return true;
}
}
else
} else
{
int blockID = par3World.getBlockId(par4 + rc.getX(), par5 + rc.getY(), par6 + rc.getZ());
if (blockID == AlchemicalWizardry.ritualStone.blockID)
if (blockID == ModBlocks.ritualStone.blockID)
{
int metadata = par3World.getBlockMetadata(par4 + rc.getX(), par5 + rc.getY(), par6 + rc.getZ());
@ -197,8 +196,7 @@ public class ItemRitualDiviner extends EnergyItems
EnergyItems.syphonBatteries(par1ItemStack, par2EntityPlayer, getEnergyUsed());
return true;
}
}
else
} else
{
par3World.playAuxSFX(0000, par4, par5 + 1, par6, 0);
return true;
@ -231,8 +229,7 @@ public class ItemRitualDiviner extends EnergyItems
if (currentRitualID + 1 >= maxRitualID)
{
this.setCurrentRitual(par1ItemStack, 0);
}
else
} else
{
this.setCurrentRitual(par1ItemStack, currentRitualID + 1);
}
@ -293,8 +290,8 @@ public class ItemRitualDiviner extends EnergyItems
@SideOnly(Side.CLIENT)
public void getSubItems(int id, CreativeTabs creativeTab, List list)
{
list.add(new ItemStack(AlchemicalWizardry.itemRitualDiviner));
ItemStack duskRitualDivinerStack = new ItemStack(AlchemicalWizardry.itemRitualDiviner);
list.add(new ItemStack(ModItems.itemRitualDiviner));
ItemStack duskRitualDivinerStack = new ItemStack(ModItems.itemRitualDiviner);
((ItemRitualDiviner) duskRitualDivinerStack.getItem()).setMaxRuneDisplacement(duskRitualDivinerStack, 1);
list.add(duskRitualDivinerStack);
}

15
BM_src/WayofTime/alchemicalWizardry/common/items/ItemSanguineArmour.java
View file

@ -1,7 +1,10 @@
package WayofTime.alchemicalWizardry.common.items;
import java.util.List;
import WayofTime.alchemicalWizardry.common.AlchemicalWizardry;
import WayofTime.alchemicalWizardry.common.ArmourUpgrade;
import WayofTime.alchemicalWizardry.common.ModItems;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.client.renderer.texture.IconRegister;
import net.minecraft.entity.Entity;
import net.minecraft.entity.EntityLivingBase;
@ -13,10 +16,8 @@ import net.minecraft.world.World;
import thaumcraft.api.IGoggles;
import thaumcraft.api.IVisDiscounter;
import thaumcraft.api.nodes.IRevealer;
import WayofTime.alchemicalWizardry.common.AlchemicalWizardry;
import WayofTime.alchemicalWizardry.common.ArmourUpgrade;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import java.util.List;
public class ItemSanguineArmour extends ItemArmor implements IRevealer, ArmourUpgrade, IGoggles, IVisDiscounter
{
@ -41,7 +42,7 @@ public class ItemSanguineArmour extends ItemArmor implements IRevealer, ArmourUp
{
//if(AlchemicalWizardry.isThaumcraftLoaded)
{
if (itemID == AlchemicalWizardry.sanguineHelmet.itemID)
if (itemID == ModItems.sanguineHelmet.itemID)
{
return "alchemicalwizardry:models/armor/sanguineArmour_layer_1.png";
}

Some files were not shown because too many files have changed in this diff Show more