diff --git a/src/main/java/taintedmagic/common/TaintedMagic.java b/src/main/java/taintedmagic/common/TaintedMagic.java index c029c4a..9fc3145 100644 --- a/src/main/java/taintedmagic/common/TaintedMagic.java +++ b/src/main/java/taintedmagic/common/TaintedMagic.java @@ -26,10 +26,10 @@ public class TaintedMagic public static CommonProxy proxy; // Tainted Magic creative tab - public static CreativeTabs tabTaintedMagic = new TMCreativeTab(); + public static CreativeTabs tabTM = new TMCreativeTab(); // TM log - public static final Logger log = LogManager.getLogger("TAINTEDMAGIC"); + public static final Logger log = LogManager.getLogger("TAINTED MAGIC"); // Creation EnumRarity public static EnumRarity rarityCreation = EnumHelper.addRarity("CREATION", EnumChatFormatting.GOLD, "Creation"); @@ -47,7 +47,6 @@ public class TaintedMagic public static void init (FMLInitializationEvent event) { log.info("...Initializing Tainted Magic!"); - proxy.init(event); } @@ -56,9 +55,7 @@ public class TaintedMagic public static void postInit (FMLPostInitializationEvent event) { log.info("...Post-initializing Tainted Magic!"); - proxy.postInit(event); - log.info("...Loading complete, enjoy!"); } } diff --git a/src/main/java/taintedmagic/common/blocks/BlockNightshadeBush.java b/src/main/java/taintedmagic/common/blocks/BlockNightshadeBush.java index f76e818..95a1279 100644 --- a/src/main/java/taintedmagic/common/blocks/BlockNightshadeBush.java +++ b/src/main/java/taintedmagic/common/blocks/BlockNightshadeBush.java @@ -23,7 +23,7 @@ public class BlockNightshadeBush extends BlockBush super(Material.plants); this.setBlockName("BlockNightshadeBush"); this.setBlockTextureName("taintedmagic:BlockNightshadeBush"); - this.setCreativeTab(TaintedMagic.tabTaintedMagic); + this.setCreativeTab(TaintedMagic.tabTM); this.setStepSound(soundTypeGrass); } diff --git a/src/main/java/taintedmagic/common/blocks/BlockShadowOre.java b/src/main/java/taintedmagic/common/blocks/BlockShadowOre.java index 6af72d0..db5a247 100644 --- a/src/main/java/taintedmagic/common/blocks/BlockShadowOre.java +++ b/src/main/java/taintedmagic/common/blocks/BlockShadowOre.java @@ -9,7 +9,7 @@ public class BlockShadowOre extends Block public BlockShadowOre () { super(Material.rock); - this.setCreativeTab(TaintedMagic.tabTaintedMagic); + this.setCreativeTab(TaintedMagic.tabTM); this.setBlockTextureName("taintedmagic:BlockShadowOre"); this.setBlockName("BlockShadowOre"); this.setHardness(5.0F); diff --git a/src/main/java/taintedmagic/common/blocks/BlockWarpwoodLeaves.java b/src/main/java/taintedmagic/common/blocks/BlockWarpwoodLeaves.java index 1e3764c..247ac03 100644 --- a/src/main/java/taintedmagic/common/blocks/BlockWarpwoodLeaves.java +++ b/src/main/java/taintedmagic/common/blocks/BlockWarpwoodLeaves.java @@ -30,7 +30,7 @@ public class BlockWarpwoodLeaves extends Block implements IShearable public BlockWarpwoodLeaves () { super(Material.leaves); - this.setCreativeTab(TaintedMagic.tabTaintedMagic); + this.setCreativeTab(TaintedMagic.tabTM); this.setLightOpacity(0); this.setHardness(0.1F); this.setStepSound(soundTypeGrass); diff --git a/src/main/java/taintedmagic/common/blocks/BlockWarpwoodLog.java b/src/main/java/taintedmagic/common/blocks/BlockWarpwoodLog.java index 312dad8..d99cb69 100644 --- a/src/main/java/taintedmagic/common/blocks/BlockWarpwoodLog.java +++ b/src/main/java/taintedmagic/common/blocks/BlockWarpwoodLog.java @@ -25,7 +25,7 @@ public class BlockWarpwoodLog extends BlockRotatedPillar public BlockWarpwoodLog () { super(Material.wood); - this.setCreativeTab(TaintedMagic.tabTaintedMagic); + this.setCreativeTab(TaintedMagic.tabTM); this.setHardness(2.5F); this.setStepSound(soundTypeWood); this.setBlockName("BlockWarpwoodLog"); diff --git a/src/main/java/taintedmagic/common/blocks/BlockWarpwoodPlanks.java b/src/main/java/taintedmagic/common/blocks/BlockWarpwoodPlanks.java index 413d473..4b1eb00 100644 --- a/src/main/java/taintedmagic/common/blocks/BlockWarpwoodPlanks.java +++ b/src/main/java/taintedmagic/common/blocks/BlockWarpwoodPlanks.java @@ -9,7 +9,7 @@ public class BlockWarpwoodPlanks extends Block public BlockWarpwoodPlanks () { super(Material.wood); - this.setCreativeTab(TaintedMagic.tabTaintedMagic); + this.setCreativeTab(TaintedMagic.tabTM); this.setBlockName("BlockWarpwoodPlanks"); this.setBlockTextureName("taintedmagic:BlockWarpwoodPlanks"); this.setHardness(0.8F); diff --git a/src/main/java/taintedmagic/common/blocks/BlockWarpwoodSapling.java b/src/main/java/taintedmagic/common/blocks/BlockWarpwoodSapling.java index 496bfda..169ece8 100644 --- a/src/main/java/taintedmagic/common/blocks/BlockWarpwoodSapling.java +++ b/src/main/java/taintedmagic/common/blocks/BlockWarpwoodSapling.java @@ -20,7 +20,7 @@ public class BlockWarpwoodSapling extends BlockSapling public BlockWarpwoodSapling () { super(); - this.setCreativeTab(TaintedMagic.tabTaintedMagic); + this.setCreativeTab(TaintedMagic.tabTM); this.setBlockName("BlockWarpwoodSapling"); this.setStepSound(soundTypeGrass); } diff --git a/src/main/java/taintedmagic/common/items/ItemCrimsonBlood.java b/src/main/java/taintedmagic/common/items/ItemCrimsonBlood.java index dde7c0a..532cc27 100644 --- a/src/main/java/taintedmagic/common/items/ItemCrimsonBlood.java +++ b/src/main/java/taintedmagic/common/items/ItemCrimsonBlood.java @@ -12,7 +12,7 @@ public class ItemCrimsonBlood extends Item { public ItemCrimsonBlood () { - this.setCreativeTab(TaintedMagic.tabTaintedMagic); + this.setCreativeTab(TaintedMagic.tabTM); this.setTextureName("taintedmagic:ItemCrimsonBlood"); this.setUnlocalizedName("ItemCrimsonBlood"); this.setContainerItem(ConfigItems.itemEssence); diff --git a/src/main/java/taintedmagic/common/items/ItemFlyteCharm.java b/src/main/java/taintedmagic/common/items/ItemFlyteCharm.java index fd0dbcc..4236ca0 100644 --- a/src/main/java/taintedmagic/common/items/ItemFlyteCharm.java +++ b/src/main/java/taintedmagic/common/items/ItemFlyteCharm.java @@ -33,7 +33,7 @@ public class ItemFlyteCharm extends Item implements IWarpingGear, IRenderInvento public ItemFlyteCharm () { - this.setCreativeTab(TaintedMagic.tabTaintedMagic); + this.setCreativeTab(TaintedMagic.tabTM); this.setUnlocalizedName("ItemFlyteCharm"); this.setMaxStackSize(1); this.setTextureName("taintedmagic:ItemFlyteCharm"); @@ -76,8 +76,8 @@ public class ItemFlyteCharm extends Item implements IWarpingGear, IRenderInvento // Glide if (player.isSneaking() && !player.onGround && player.fallDistance > 0.5F) { - player.motionY = -0.1D; double speed = 0.1D; + player.motionY = -speed; double x = Math.cos(Math.toRadians(player.rotationYawHead + 90)) * speed; double z = Math.sin(Math.toRadians(player.rotationYawHead + 90)) * speed; player.motionX += x; diff --git a/src/main/java/taintedmagic/common/items/ItemGatekey.java b/src/main/java/taintedmagic/common/items/ItemGatekey.java index 1d950fd..3ee9b92 100644 --- a/src/main/java/taintedmagic/common/items/ItemGatekey.java +++ b/src/main/java/taintedmagic/common/items/ItemGatekey.java @@ -41,7 +41,7 @@ public class ItemGateKey extends Item implements IWarpingGear public ItemGateKey () { - this.setCreativeTab(TaintedMagic.tabTaintedMagic); + this.setCreativeTab(TaintedMagic.tabTM); this.setUnlocalizedName("ItemGateKey"); this.setMaxStackSize(1); } diff --git a/src/main/java/taintedmagic/common/items/ItemMagicFunguar.java b/src/main/java/taintedmagic/common/items/ItemMagicFunguar.java index 81d9876..583a477 100644 --- a/src/main/java/taintedmagic/common/items/ItemMagicFunguar.java +++ b/src/main/java/taintedmagic/common/items/ItemMagicFunguar.java @@ -26,7 +26,7 @@ public class ItemMagicFunguar extends ItemFood public ItemMagicFunguar (int healAmount, float saturation, boolean b) { super(healAmount, saturation, b); - this.setCreativeTab(TaintedMagic.tabTaintedMagic); + this.setCreativeTab(TaintedMagic.tabTM); this.setTextureName("taintedmagic:ItemMagicFunguar"); this.setAlwaysEdible(); this.setUnlocalizedName("ItemMagicFunguar"); diff --git a/src/main/java/taintedmagic/common/items/ItemMaterial.java b/src/main/java/taintedmagic/common/items/ItemMaterial.java index f46e338..eda1764 100644 --- a/src/main/java/taintedmagic/common/items/ItemMaterial.java +++ b/src/main/java/taintedmagic/common/items/ItemMaterial.java @@ -32,11 +32,12 @@ public class ItemMaterial extends Item * 10 Primordial Mote * 11 Fragment of Creation */ + IIcon[] icons = new IIcon[SUBTYPES]; public ItemMaterial () { - this.setCreativeTab(TaintedMagic.tabTaintedMagic); + this.setCreativeTab(TaintedMagic.tabTM); this.setUnlocalizedName("ItemMaterial"); this.setHasSubtypes(true); } diff --git a/src/main/java/taintedmagic/common/items/ItemNightshadeBerries.java b/src/main/java/taintedmagic/common/items/ItemNightshadeBerries.java index 9d63465..9a854e4 100644 --- a/src/main/java/taintedmagic/common/items/ItemNightshadeBerries.java +++ b/src/main/java/taintedmagic/common/items/ItemNightshadeBerries.java @@ -15,7 +15,7 @@ public class ItemNightshadeBerries extends ItemFood public ItemNightshadeBerries (int healAmount, float saturation, boolean b) { super(healAmount, saturation, b); - this.setCreativeTab(TaintedMagic.tabTaintedMagic); + this.setCreativeTab(TaintedMagic.tabTM); this.setUnlocalizedName("ItemNightshadeBerries"); this.setTextureName("taintedmagic:ItemNightshadeBerries"); this.setAlwaysEdible(); diff --git a/src/main/java/taintedmagic/common/items/ItemSalis.java b/src/main/java/taintedmagic/common/items/ItemSalis.java index 7c2e43d..3d4dc1e 100644 --- a/src/main/java/taintedmagic/common/items/ItemSalis.java +++ b/src/main/java/taintedmagic/common/items/ItemSalis.java @@ -21,7 +21,7 @@ public class ItemSalis extends Item public ItemSalis () { - this.setCreativeTab(TaintedMagic.tabTaintedMagic); + this.setCreativeTab(TaintedMagic.tabTM); this.hasSubtypes = true; this.setUnlocalizedName("ItemSalis"); } diff --git a/src/main/java/taintedmagic/common/items/ItemVoidBlood.java b/src/main/java/taintedmagic/common/items/ItemVoidBlood.java index c8dd121..40bfffb 100644 --- a/src/main/java/taintedmagic/common/items/ItemVoidBlood.java +++ b/src/main/java/taintedmagic/common/items/ItemVoidBlood.java @@ -16,7 +16,7 @@ public class ItemVoidBlood extends Item { public ItemVoidBlood () { - this.setCreativeTab(TaintedMagic.tabTaintedMagic); + this.setCreativeTab(TaintedMagic.tabTM); this.setTextureName("taintedmagic:ItemVoidBlood"); this.setUnlocalizedName("ItemVoidBlood"); this.setContainerItem(ConfigItems.itemEssence); diff --git a/src/main/java/taintedmagic/common/items/ItemWarpFertilizer.java b/src/main/java/taintedmagic/common/items/ItemWarpFertilizer.java index 9e1dd4c..916949c 100644 --- a/src/main/java/taintedmagic/common/items/ItemWarpFertilizer.java +++ b/src/main/java/taintedmagic/common/items/ItemWarpFertilizer.java @@ -18,7 +18,7 @@ public class ItemWarpFertilizer extends Item { public ItemWarpFertilizer () { - this.setCreativeTab(TaintedMagic.tabTaintedMagic); + this.setCreativeTab(TaintedMagic.tabTM); this.setUnlocalizedName("ItemWarpFertilizer"); this.setTextureName("taintedmagic:ItemWarpFertilizer"); diff --git a/src/main/java/taintedmagic/common/items/equipment/ItemLumosRing.java b/src/main/java/taintedmagic/common/items/equipment/ItemLumosRing.java index a47e12e..e2172e1 100644 --- a/src/main/java/taintedmagic/common/items/equipment/ItemLumosRing.java +++ b/src/main/java/taintedmagic/common/items/equipment/ItemLumosRing.java @@ -14,7 +14,7 @@ public class ItemLumosRing extends Item implements IBauble { public ItemLumosRing () { - this.setCreativeTab(TaintedMagic.tabTaintedMagic); + this.setCreativeTab(TaintedMagic.tabTM); this.setTextureName("taintedmagic:ItemLumosRing"); this.setMaxDamage(-1); this.setMaxStackSize(1); diff --git a/src/main/java/taintedmagic/common/items/equipment/ItemShadowFortressArmor.java b/src/main/java/taintedmagic/common/items/equipment/ItemShadowFortressArmor.java index 0d1c888..3b3e86e 100644 --- a/src/main/java/taintedmagic/common/items/equipment/ItemShadowFortressArmor.java +++ b/src/main/java/taintedmagic/common/items/equipment/ItemShadowFortressArmor.java @@ -26,7 +26,7 @@ public class ItemShadowFortressArmor extends ItemFortressArmor implements IWarpi public ItemShadowFortressArmor (ArmorMaterial material, int j, int k) { super(material, j, k); - this.setCreativeTab(TaintedMagic.tabTaintedMagic); + this.setCreativeTab(TaintedMagic.tabTM); } @SideOnly (Side.CLIENT) diff --git a/src/main/java/taintedmagic/common/items/equipment/ItemVoidFortressArmor.java b/src/main/java/taintedmagic/common/items/equipment/ItemVoidFortressArmor.java index c18b9d2..b5b745d 100644 --- a/src/main/java/taintedmagic/common/items/equipment/ItemVoidFortressArmor.java +++ b/src/main/java/taintedmagic/common/items/equipment/ItemVoidFortressArmor.java @@ -24,7 +24,7 @@ public class ItemVoidFortressArmor extends ItemFortressArmor implements IWarping public ItemVoidFortressArmor (ArmorMaterial material, int j, int k) { super(material, j, k); - this.setCreativeTab(TaintedMagic.tabTaintedMagic); + this.setCreativeTab(TaintedMagic.tabTM); } @SideOnly (Side.CLIENT) diff --git a/src/main/java/taintedmagic/common/items/equipment/ItemVoidmetalGoggles.java b/src/main/java/taintedmagic/common/items/equipment/ItemVoidmetalGoggles.java index e4bced1..122ef1b 100644 --- a/src/main/java/taintedmagic/common/items/equipment/ItemVoidmetalGoggles.java +++ b/src/main/java/taintedmagic/common/items/equipment/ItemVoidmetalGoggles.java @@ -19,7 +19,7 @@ public class ItemVoidmetalGoggles extends ItemGoggles implements IWarpingGear public ItemVoidmetalGoggles (ArmorMaterial material, int j, int k) { super(material, j, k); - this.setCreativeTab(TaintedMagic.tabTaintedMagic); + this.setCreativeTab(TaintedMagic.tabTM); this.setUnlocalizedName("ItemVoidmetalGoggles"); } diff --git a/src/main/java/taintedmagic/common/items/equipment/ItemVoidwalkerBoots.java b/src/main/java/taintedmagic/common/items/equipment/ItemVoidwalkerBoots.java index de7c573..5715b7d 100644 --- a/src/main/java/taintedmagic/common/items/equipment/ItemVoidwalkerBoots.java +++ b/src/main/java/taintedmagic/common/items/equipment/ItemVoidwalkerBoots.java @@ -37,7 +37,7 @@ public class ItemVoidwalkerBoots extends ItemArmor public ItemVoidwalkerBoots (ArmorMaterial material, int j, int k) { super(material, j, k); - this.setCreativeTab(TaintedMagic.tabTaintedMagic); + this.setCreativeTab(TaintedMagic.tabTM); this.setUnlocalizedName("ItemVoidwalkerBoots"); this.setTextureName("taintedmagic:ItemVoidwalkerBoots"); @@ -148,7 +148,7 @@ public class ItemVoidwalkerBoots extends ItemArmor float mul = 0.2F; ItemStack sash = PlayerHandler.getPlayerBaubles(player).getStackInSlot(3); if (sash != null && sash.getItem() instanceof ItemVoidwalkerSash && ItemVoidwalkerSash.isSpeedEnabled(sash)) - mul += 0.2F; + mul *= 2.0F; player.moveFlying(0.0F, 1.0F, player.capabilities.isFlying ? (mul - 0.075F) : mul); player.jumpMovementFactor = 0.00002F; diff --git a/src/main/java/taintedmagic/common/items/equipment/ItemVoidwalkerSash.java b/src/main/java/taintedmagic/common/items/equipment/ItemVoidwalkerSash.java index b13eae3..d83e97a 100644 --- a/src/main/java/taintedmagic/common/items/equipment/ItemVoidwalkerSash.java +++ b/src/main/java/taintedmagic/common/items/equipment/ItemVoidwalkerSash.java @@ -26,7 +26,7 @@ public class ItemVoidwalkerSash extends ItemRunic implements IRunicArmor, IWarpi public ItemVoidwalkerSash () { super(20); - this.setCreativeTab(TaintedMagic.tabTaintedMagic); + this.setCreativeTab(TaintedMagic.tabTM); this.setTextureName("taintedmagic:ItemVoidwalkerSash"); this.setMaxDamage(-1); this.setMaxStackSize(1); diff --git a/src/main/java/taintedmagic/common/items/equipment/ItemWarpedGoggles.java b/src/main/java/taintedmagic/common/items/equipment/ItemWarpedGoggles.java index af1b9fd..d98e98e 100644 --- a/src/main/java/taintedmagic/common/items/equipment/ItemWarpedGoggles.java +++ b/src/main/java/taintedmagic/common/items/equipment/ItemWarpedGoggles.java @@ -17,7 +17,7 @@ public class ItemWarpedGoggles extends ItemGoggles implements IWarpingGear public ItemWarpedGoggles (ArmorMaterial material, int j, int k) { super(material, j, k); - this.setCreativeTab(TaintedMagic.tabTaintedMagic); + this.setCreativeTab(TaintedMagic.tabTM); this.setUnlocalizedName("ItemWarpedGoggles"); } diff --git a/src/main/java/taintedmagic/common/items/tools/ItemHollowDagger.java b/src/main/java/taintedmagic/common/items/tools/ItemHollowDagger.java index 8902bf6..824c79e 100644 --- a/src/main/java/taintedmagic/common/items/tools/ItemHollowDagger.java +++ b/src/main/java/taintedmagic/common/items/tools/ItemHollowDagger.java @@ -11,7 +11,7 @@ public class ItemHollowDagger extends ItemSword implements IRepairable public ItemHollowDagger (ToolMaterial material) { super(material); - this.setCreativeTab(TaintedMagic.tabTaintedMagic); + this.setCreativeTab(TaintedMagic.tabTM); this.setUnlocalizedName("ItemHollowDagger"); this.setMaxStackSize(1); this.setTextureName("taintedmagic:ItemHollowDagger"); diff --git a/src/main/java/taintedmagic/common/items/tools/ItemKatana.java b/src/main/java/taintedmagic/common/items/tools/ItemKatana.java index c23827b..4dbcd64 100644 --- a/src/main/java/taintedmagic/common/items/tools/ItemKatana.java +++ b/src/main/java/taintedmagic/common/items/tools/ItemKatana.java @@ -65,7 +65,7 @@ public class ItemKatana extends Item implements IWarpingGear, IRepairable, IRend public ItemKatana () { - this.setCreativeTab(TaintedMagic.tabTaintedMagic); + this.setCreativeTab(TaintedMagic.tabTM); this.setUnlocalizedName("ItemKatana"); this.setHasSubtypes(true); this.setMaxStackSize(1); diff --git a/src/main/java/taintedmagic/common/items/tools/ItemPrimordialEdge.java b/src/main/java/taintedmagic/common/items/tools/ItemPrimordialEdge.java index df420c7..ee2665b 100644 --- a/src/main/java/taintedmagic/common/items/tools/ItemPrimordialEdge.java +++ b/src/main/java/taintedmagic/common/items/tools/ItemPrimordialEdge.java @@ -29,7 +29,7 @@ public class ItemPrimordialEdge extends ItemSword implements IWarpingGear, IRepa super(material); this.setTextureName("taintedmagic:ItemPrimordialEdge"); this.setUnlocalizedName("ItemPrimordialEdge"); - this.setCreativeTab(TaintedMagic.tabTaintedMagic); + this.setCreativeTab(TaintedMagic.tabTM); } public EnumAction getItemUseAction (ItemStack stack) @@ -73,23 +73,20 @@ public class ItemPrimordialEdge extends ItemSword implements IWarpingGear, IRepa // Based off of hungry node Iterator i$; - List ents = player.worldObj.getEntitiesWithinAABB(Entity.class, AxisAlignedBB + List ents = player.worldObj.getEntitiesWithinAABB(Entity.class, AxisAlignedBB .getBoundingBox(player.posX, player.posY, player.posZ, player.posX + 1, player.posY + 1, player.posZ + 1) .expand(15.0D, 15.0D, 15.0D)); player.worldObj.playSoundAtEntity(player, "thaumcraft:brain", 0.05F, 0.5F); - if (ents != null && ents.size() > 0) for (i$ = ents.iterator(); i$.hasNext();) + if (ents != null && ents.size() > 0) for (Entity entity : ents) { - Object next = i$.next(); - Entity entity = (Entity) next; - if (entity != player) { if (entity.isEntityAlive() && !entity.isEntityInvulnerable()) { double dist = TaintedMagicHelper.getDistanceTo(player, entity.posX, entity.posY, entity.posZ); - if (dist < 2.0D) entity.attackEntityFrom(DamageSource.magic, 5.0F); + if (dist < 2.0D) entity.attackEntityFrom(DamageSource.magic, 3.0F); } double x = (player.posX + 0.5D - entity.posX) / 20.0D; diff --git a/src/main/java/taintedmagic/common/items/tools/ItemShadowmetalAxe.java b/src/main/java/taintedmagic/common/items/tools/ItemShadowmetalAxe.java index b7e0fa0..716d7a7 100644 --- a/src/main/java/taintedmagic/common/items/tools/ItemShadowmetalAxe.java +++ b/src/main/java/taintedmagic/common/items/tools/ItemShadowmetalAxe.java @@ -12,7 +12,7 @@ public class ItemShadowmetalAxe extends ItemAxe implements IRepairable public ItemShadowmetalAxe (ToolMaterial material) { super(material); - this.setCreativeTab(TaintedMagic.tabTaintedMagic); + this.setCreativeTab(TaintedMagic.tabTM); this.setTextureName("taintedmagic:ItemShadowmetalAxe"); this.setUnlocalizedName("ItemShadowmetalAxe"); } diff --git a/src/main/java/taintedmagic/common/items/tools/ItemShadowmetalHoe.java b/src/main/java/taintedmagic/common/items/tools/ItemShadowmetalHoe.java index 3ed77b9..b114a22 100644 --- a/src/main/java/taintedmagic/common/items/tools/ItemShadowmetalHoe.java +++ b/src/main/java/taintedmagic/common/items/tools/ItemShadowmetalHoe.java @@ -20,7 +20,7 @@ public class ItemShadowmetalHoe extends ItemHoe implements IRepairable public ItemShadowmetalHoe (ToolMaterial material) { super(material); - this.setCreativeTab(TaintedMagic.tabTaintedMagic); + this.setCreativeTab(TaintedMagic.tabTM); this.setTextureName("taintedmagic:ItemShadowmetalHoe"); this.setUnlocalizedName("ItemShadowmetalHoe"); diff --git a/src/main/java/taintedmagic/common/items/tools/ItemShadowmetalPick.java b/src/main/java/taintedmagic/common/items/tools/ItemShadowmetalPick.java index 5276da8..6ea0bb0 100644 --- a/src/main/java/taintedmagic/common/items/tools/ItemShadowmetalPick.java +++ b/src/main/java/taintedmagic/common/items/tools/ItemShadowmetalPick.java @@ -12,7 +12,7 @@ public class ItemShadowmetalPick extends ItemPickaxe implements IRepairable public ItemShadowmetalPick (ToolMaterial material) { super(material); - this.setCreativeTab(TaintedMagic.tabTaintedMagic); + this.setCreativeTab(TaintedMagic.tabTM); this.setTextureName("taintedmagic:ItemShadowmetalPick"); this.setUnlocalizedName("ItemShadowmetalPick"); } diff --git a/src/main/java/taintedmagic/common/items/tools/ItemShadowmetalSpade.java b/src/main/java/taintedmagic/common/items/tools/ItemShadowmetalSpade.java index dc3f7ba..ab51dce 100644 --- a/src/main/java/taintedmagic/common/items/tools/ItemShadowmetalSpade.java +++ b/src/main/java/taintedmagic/common/items/tools/ItemShadowmetalSpade.java @@ -12,7 +12,7 @@ public class ItemShadowmetalSpade extends ItemSpade implements IRepairable public ItemShadowmetalSpade (ToolMaterial material) { super(material); - this.setCreativeTab(TaintedMagic.tabTaintedMagic); + this.setCreativeTab(TaintedMagic.tabTM); this.setTextureName("taintedmagic:ItemShadowmetalSpade"); this.setUnlocalizedName("ItemShadowmetalSpade"); } diff --git a/src/main/java/taintedmagic/common/items/tools/ItemShadowmetalSword.java b/src/main/java/taintedmagic/common/items/tools/ItemShadowmetalSword.java index d1906fb..56307d2 100644 --- a/src/main/java/taintedmagic/common/items/tools/ItemShadowmetalSword.java +++ b/src/main/java/taintedmagic/common/items/tools/ItemShadowmetalSword.java @@ -9,10 +9,10 @@ import thaumcraft.api.IRepairable; public class ItemShadowmetalSword extends ItemSword implements IRepairable { - public ItemShadowmetalSword (ToolMaterial m) + public ItemShadowmetalSword (ToolMaterial material) { - super(m); - this.setCreativeTab(TaintedMagic.tabTaintedMagic); + super(material); + this.setCreativeTab(TaintedMagic.tabTM); this.setTextureName("taintedmagic:ItemShadowmetalSword"); this.setUnlocalizedName("ItemShadowmetalSword"); } diff --git a/src/main/java/taintedmagic/common/items/tools/ItemThaumicDisassembler.java b/src/main/java/taintedmagic/common/items/tools/ItemThaumicDisassembler.java index c44d2fc..5f6b2f9 100644 --- a/src/main/java/taintedmagic/common/items/tools/ItemThaumicDisassembler.java +++ b/src/main/java/taintedmagic/common/items/tools/ItemThaumicDisassembler.java @@ -27,7 +27,7 @@ public class ItemThaumicDisassembler extends Item public ItemThaumicDisassembler () { - this.setCreativeTab(TaintedMagic.tabTaintedMagic); + this.setCreativeTab(TaintedMagic.tabTM); this.setMaxDamage(500); this.setMaxStackSize(1); this.setUnlocalizedName("ItemThaumicDisassembler"); diff --git a/src/main/java/taintedmagic/common/items/wand/ItemWandCap.java b/src/main/java/taintedmagic/common/items/wand/ItemWandCap.java index c6c7420..7ade7be 100644 --- a/src/main/java/taintedmagic/common/items/wand/ItemWandCap.java +++ b/src/main/java/taintedmagic/common/items/wand/ItemWandCap.java @@ -19,7 +19,7 @@ public class ItemWandCap extends Item public ItemWandCap () { - this.setCreativeTab(TaintedMagic.tabTaintedMagic); + this.setCreativeTab(TaintedMagic.tabTM); this.setUnlocalizedName("ItemWandCap"); this.setHasSubtypes(true); } diff --git a/src/main/java/taintedmagic/common/items/wand/ItemWandRod.java b/src/main/java/taintedmagic/common/items/wand/ItemWandRod.java index c36dcc4..ab0870b 100644 --- a/src/main/java/taintedmagic/common/items/wand/ItemWandRod.java +++ b/src/main/java/taintedmagic/common/items/wand/ItemWandRod.java @@ -19,7 +19,7 @@ public class ItemWandRod extends Item public ItemWandRod () { - this.setCreativeTab(TaintedMagic.tabTaintedMagic); + this.setCreativeTab(TaintedMagic.tabTM); this.setUnlocalizedName("ItemWandRod"); this.setHasSubtypes(true); } diff --git a/src/main/java/taintedmagic/common/items/wand/foci/ItemFocusDarkMatter.java b/src/main/java/taintedmagic/common/items/wand/foci/ItemFocusDarkMatter.java index eef4d9a..0b118a2 100644 --- a/src/main/java/taintedmagic/common/items/wand/foci/ItemFocusDarkMatter.java +++ b/src/main/java/taintedmagic/common/items/wand/foci/ItemFocusDarkMatter.java @@ -34,7 +34,7 @@ public class ItemFocusDarkMatter extends ItemFocusBasic public ItemFocusDarkMatter () { - this.setCreativeTab(TaintedMagic.tabTaintedMagic); + this.setCreativeTab(TaintedMagic.tabTM); this.setUnlocalizedName("ItemFocusDarkMatter"); } diff --git a/src/main/java/taintedmagic/common/items/wand/foci/ItemFocusLumos.java b/src/main/java/taintedmagic/common/items/wand/foci/ItemFocusLumos.java index 9748b18..abff460 100644 --- a/src/main/java/taintedmagic/common/items/wand/foci/ItemFocusLumos.java +++ b/src/main/java/taintedmagic/common/items/wand/foci/ItemFocusLumos.java @@ -23,7 +23,7 @@ public class ItemFocusLumos extends ItemFocusBasic public ItemFocusLumos () { - this.setCreativeTab(TaintedMagic.tabTaintedMagic); + this.setCreativeTab(TaintedMagic.tabTM); this.setUnlocalizedName("ItemFocusLumos"); } diff --git a/src/main/java/taintedmagic/common/items/wand/foci/ItemFocusMageMace.java b/src/main/java/taintedmagic/common/items/wand/foci/ItemFocusMageMace.java index 09c542f..eceff3d 100644 --- a/src/main/java/taintedmagic/common/items/wand/foci/ItemFocusMageMace.java +++ b/src/main/java/taintedmagic/common/items/wand/foci/ItemFocusMageMace.java @@ -28,7 +28,7 @@ public class ItemFocusMageMace extends ItemFocusBasic public ItemFocusMageMace () { - this.setCreativeTab(TaintedMagic.tabTaintedMagic); + this.setCreativeTab(TaintedMagic.tabTM); this.setUnlocalizedName("ItemFocusMageMace"); } diff --git a/src/main/java/taintedmagic/common/items/wand/foci/ItemFocusShockwave.java b/src/main/java/taintedmagic/common/items/wand/foci/ItemFocusShockwave.java index 7d3e05b..d7c733b 100644 --- a/src/main/java/taintedmagic/common/items/wand/foci/ItemFocusShockwave.java +++ b/src/main/java/taintedmagic/common/items/wand/foci/ItemFocusShockwave.java @@ -36,7 +36,7 @@ public class ItemFocusShockwave extends ItemFocusBasic public ItemFocusShockwave () { - this.setCreativeTab(TaintedMagic.tabTaintedMagic); + this.setCreativeTab(TaintedMagic.tabTM); this.setUnlocalizedName("ItemFocusShockwave"); } @@ -108,10 +108,8 @@ public class ItemFocusShockwave extends ItemFocusBasic player.posY + 1, player.posZ + 1) .expand(15.0D + enlarge, 15.0D + enlarge, 15.0D + enlarge)); - if (ents != null && ents.size() > 0) for (int i = 0; i < ents.size(); i++) + if (ents != null && ents.size() > 0) for (EntityLivingBase entity : ents) { - EntityLivingBase entity = ents.get(i); - if (entity != player && entity.isEntityAlive() && !entity.isEntityInvulnerable()) { double dist = TaintedMagicHelper.getDistanceTo(player, entity.posX, entity.posY, entity.posZ); @@ -139,7 +137,7 @@ public class ItemFocusShockwave extends ItemFocusBasic bolt.setType(2); bolt.setWidth(0.125F); bolt.finalizeBolt(); - + for (int a = 0; a < 5; a++) { Random random = player.worldObj.rand; diff --git a/src/main/java/taintedmagic/common/items/wand/foci/ItemFocusTaintSwarm.java b/src/main/java/taintedmagic/common/items/wand/foci/ItemFocusTaintSwarm.java index 5cfced3..1b93136 100644 --- a/src/main/java/taintedmagic/common/items/wand/foci/ItemFocusTaintSwarm.java +++ b/src/main/java/taintedmagic/common/items/wand/foci/ItemFocusTaintSwarm.java @@ -33,7 +33,7 @@ public class ItemFocusTaintSwarm extends ItemFocusBasic public ItemFocusTaintSwarm () { - this.setCreativeTab(TaintedMagic.tabTaintedMagic); + this.setCreativeTab(TaintedMagic.tabTM); this.setUnlocalizedName("ItemFocusTaintSwarm"); } diff --git a/src/main/java/taintedmagic/common/items/wand/foci/ItemFocusVisShard.java b/src/main/java/taintedmagic/common/items/wand/foci/ItemFocusVisShard.java index 317588c..39df404 100644 --- a/src/main/java/taintedmagic/common/items/wand/foci/ItemFocusVisShard.java +++ b/src/main/java/taintedmagic/common/items/wand/foci/ItemFocusVisShard.java @@ -30,7 +30,7 @@ public class ItemFocusVisShard extends ItemFocusBasic public ItemFocusVisShard () { - this.setCreativeTab(TaintedMagic.tabTaintedMagic); + this.setCreativeTab(TaintedMagic.tabTM); this.setUnlocalizedName("ItemFocusVisShard"); }