diff --git a/src/api/java/mods/battlegear2/api/IDyable.java b/src/api/java/mods/battlegear2/api/IDyable.java deleted file mode 100644 index 811e215f..00000000 --- a/src/api/java/mods/battlegear2/api/IDyable.java +++ /dev/null @@ -1,28 +0,0 @@ -package mods.battlegear2.api; - -import net.minecraft.item.ItemStack; - -//This is a tempory fix until we get the heradry system up and running -public interface IDyable -{ - - /** - * Return whether the specified armor ItemStack has a color. - */ - public boolean hasColor (ItemStack par1ItemStack); - - /** - * Return the color for the specified armor ItemStack. - */ - public int getColor (ItemStack par1ItemStack); - - public void setColor (ItemStack dyable, int rgb); - - /** - * Remove the color from the specified armor ItemStack. - */ - public void removeColor (ItemStack par1ItemStack); - - public int getDefaultColor (ItemStack par1ItemStack); - -} diff --git a/src/api/java/mods/battlegear2/api/IShield.java b/src/api/java/mods/battlegear2/api/IShield.java deleted file mode 100644 index 4531c669..00000000 --- a/src/api/java/mods/battlegear2/api/IShield.java +++ /dev/null @@ -1,53 +0,0 @@ -package mods.battlegear2.api; - -import net.minecraft.item.ItemStack; -import net.minecraft.util.DamageSource; - -public interface IShield -{ - - /** - * Gets the decay rate for the stamina bar when the shield is in use. - * The value should be between 0 and 1. The duration of maximum blocking can be calculated - * by 1/decayRate/20. - * - * @param shield The {@link #ItemStack} representing the shield - * @return a value between 0 & 1 representing the decay rate per tick - */ - public float getDecayRate (ItemStack shield); - - /** - * Returns true if the current shield can and should block the given damage source - * - * @param shield The {@link #ItemStack} representing the shield - * @param source The {@link #DamageSource} representing the current damage - * @return true if the shield can block the given damage type - */ - public boolean canBlock (ItemStack shield, DamageSource source); - - /** - * Gets the extra decay rate to the stamina bar when the shield is damaged - * - * @param shield The {@link #ItemStack} representing the shield - * @param amount The amount of damage the shield has absorbed - * @return a value between 0 & 1 representing the decay rate - */ - public float getDamageDecayRate (ItemStack shield, float amount); - - /** - * Returns the block angle in degrees that the shield can block. - * This angle is taken as 0 degrees being directly in front of the player. The shield - * will block between -blockAngle to blockangle - * @param shield The {@link #ItemStack} representing the shield - * @return The maximum angle the shield should be able to block at - */ - public float getBlockAngle (ItemStack shield); - - /** - * Returns the time a shield bash should take to be preformed. A shield bash will disallow actions - * for the number of ticks given and will knockback an oponent at time/2 - * - * @return The amount of ticks the shield bash animation will play - */ - public int getBashTimer (ItemStack shield); -} diff --git a/src/api/java/mods/battlegear2/api/PlayerEventChild.java b/src/api/java/mods/battlegear2/api/PlayerEventChild.java deleted file mode 100644 index d40638d4..00000000 --- a/src/api/java/mods/battlegear2/api/PlayerEventChild.java +++ /dev/null @@ -1,34 +0,0 @@ -package mods.battlegear2.api; - -import net.minecraftforge.event.entity.player.PlayerEvent; - -public class PlayerEventChild extends PlayerEvent -{ - - public PlayerEvent parent; - - public PlayerEventChild(PlayerEvent parent) - { - super(parent.entityPlayer); - this.parent = parent; - } - - public void setCancelParentEvent (boolean cancel) - { - parent.setCanceled(cancel); - } - - @Override - public void setCanceled (boolean cancel) - { - super.setCanceled(cancel); - parent.setCanceled(cancel); - } - - @Override - public void setResult (Result value) - { - super.setResult(value); - parent.setResult(value); - } -} diff --git a/src/api/java/mods/battlegear2/api/quiver/IArrowContainer2.java b/src/api/java/mods/battlegear2/api/quiver/IArrowContainer2.java deleted file mode 100644 index 45ba1bff..00000000 --- a/src/api/java/mods/battlegear2/api/quiver/IArrowContainer2.java +++ /dev/null @@ -1,100 +0,0 @@ -package mods.battlegear2.api.quiver; - -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.entity.projectile.EntityArrow; -import net.minecraft.item.ItemStack; -import net.minecraft.world.World; - -public interface IArrowContainer2 -{ - - /** - * Returns the maximum amout of slots in the arrow container - * @param container {@link #ItemStack} representing this item - * @return the amount of slots - */ - public int getSlotCount (ItemStack container); - - /** - * Returns the currently selected slot in the arrow container - * @param container {@link #ItemStack} representing this item - * @return the currently selected slot - */ - public int getSelectedSlot (ItemStack container); - - /** - * Sets the currently selected slot to the given value - * @param container {@link #ItemStack} representing this item - * @param newSlot the new slot index - */ - public void setSelectedSlot (ItemStack container, int newSlot); - - /** - * Returns the itemStack in the currently selected slot - * @param container The {@link #ItemStack} representing this item - * @param slot the slot index - * @return The {@link #ItemStack} in the given slot. - */ - public ItemStack getStackInSlot (ItemStack container, int slot); - - /** - * Sets places the given item stack in the give slot - * @param container {@link #ItemStack} representing this item - * @param slot the slot index - * @param container {@link #ItemStack} representing the new stack - */ - public void setStackInSlot (ItemStack container, int slot, ItemStack stack); - - /** - * - * @param container The {@link #ItemStack} representing this item - * @param bow The bow trying to use this container - * @param player The {@link #EntityPlayer} using the bow - * @return true if the item contains at least one arrow in the selected slot - */ - public boolean hasArrowFor (ItemStack container, ItemStack bow, EntityPlayer player, int slot); - - /** - * The arrow spawned when bow is used with this non empty container equipped - * @param container The {@link #ItemStack} representing this item - * @param charge Amount of charge in the bow, ranging from 0.2F to 2.0F - * @param player The {@link #EntityPlayer} using the bow - * @param world - * @return the arrow entity to spawn when bow is used - */ - public EntityArrow getArrowType (ItemStack container, World world, EntityPlayer player, float charge); - - /** - * Action to take after an arrow has been fired - * Usually equal to removing an arrow from the container - * @param player The {@link #EntityPlayer} using the bow - * @param world - * @param container The {@link #ItemStack} representing this item - * @param bow The bow which fired - * @param arrow the arrow fired - */ - public void onArrowFired (World world, EntityPlayer player, ItemStack container, ItemStack bow, EntityArrow arrow); - - /** - * Called before the arrow is fired from this container - * @param arrowEvent Used to decide bow damage, bow sound and arrow enchantment - */ - public void onPreArrowFired (QuiverArrowEvent arrowEvent); - - /** - * Called when the container is put on a crafting bench with other items - * @param container The {@link #ItemStack} representing this item - * @param arrowStack The {@link #ItemStack} representing other items - * @return True to receive {@link #addArrows(ItemStack, ItemStack)} - */ - public boolean isCraftableWithArrows (ItemStack contaner, ItemStack arrowStack); - - /** - * Crafts the item with the items from {@link #isCraftableWithArrows(ItemStack, ItemStack)} - * @param container The {@link #ItemStack} representing this item - * @param arrows Another valid item on the crafting bench - * @return Number of arrows that couldn't fit in - */ - public ItemStack addArrows (ItemStack container, ItemStack newStack); - -} diff --git a/src/api/java/mods/battlegear2/api/quiver/QuiverArrowEvent.java b/src/api/java/mods/battlegear2/api/quiver/QuiverArrowEvent.java deleted file mode 100644 index 45586821..00000000 --- a/src/api/java/mods/battlegear2/api/quiver/QuiverArrowEvent.java +++ /dev/null @@ -1,30 +0,0 @@ -package mods.battlegear2.api.quiver; - -import mods.battlegear2.api.PlayerEventChild; -import net.minecraft.item.ItemStack; -import net.minecraftforge.event.entity.player.ArrowLooseEvent; - -public class QuiverArrowEvent extends PlayerEventChild -{ - - public int bowDamage = 1; - public float bowSoundVolume = 1.0F; - public boolean addEnchantments = true; - public ArrowLooseEvent event; - - public QuiverArrowEvent(ArrowLooseEvent parent) - { - super(parent); - this.event = parent; - } - - public ItemStack getBow () - { - return event.bow; - } - - public int getCharge () - { - return event.charge; - } -} diff --git a/src/api/java/mods/battlegear2/api/quiver/QuiverArrowRegistry.java b/src/api/java/mods/battlegear2/api/quiver/QuiverArrowRegistry.java deleted file mode 100644 index 0ae463a6..00000000 --- a/src/api/java/mods/battlegear2/api/quiver/QuiverArrowRegistry.java +++ /dev/null @@ -1,52 +0,0 @@ -package mods.battlegear2.api.quiver; - -import java.util.Comparator; -import java.util.Map; -import java.util.TreeMap; - -import net.minecraft.entity.projectile.EntityArrow; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; - -public class QuiverArrowRegistry -{ - - private static Map> map = new TreeMap>(new StackComparator()); - - public static void addArrowToRegistry (Item i, int itemMetadata, Class entityArrow) - { - ItemStack stack = new ItemStack(i, 1, itemMetadata); - map.put(stack, entityArrow); - } - - public static Class getArrowClass (ItemStack stack) - { - return map.get(stack); - } - - static class StackComparator implements Comparator - { - @Override - public int compare (ItemStack stack, ItemStack stack2) - { - - if (stack == stack2) - { - return 0; - } - else - { - - int idDiff = 0;//COMMENTED TO SHUT UP IDE= stack.itemID - stack2.itemID; - if (idDiff != 0) - { - return idDiff; - } - else - return stack.getItemDamage() - stack2.getItemDamage(); - } - - } - } - -} diff --git a/src/api/java/mods/battlegear2/api/weapons/IBackStabbable.java b/src/api/java/mods/battlegear2/api/weapons/IBackStabbable.java deleted file mode 100644 index cee2ef4f..00000000 --- a/src/api/java/mods/battlegear2/api/weapons/IBackStabbable.java +++ /dev/null @@ -1,15 +0,0 @@ -package mods.battlegear2.api.weapons; - -import net.minecraft.entity.EntityLivingBase; - -public interface IBackStabbable -{ - - /** - * Action to perform on back stabbing - * @param entityHit - * @param entityHitting - * @return true if it adds an hitting action - */ - public boolean onBackStab (EntityLivingBase entityHit, EntityLivingBase entityHitting); -} diff --git a/src/api/java/mods/battlegear2/api/weapons/IBattlegearWeapon.java b/src/api/java/mods/battlegear2/api/weapons/IBattlegearWeapon.java deleted file mode 100644 index 768927b0..00000000 --- a/src/api/java/mods/battlegear2/api/weapons/IBattlegearWeapon.java +++ /dev/null @@ -1,71 +0,0 @@ -package mods.battlegear2.api.weapons; - -import net.minecraft.item.ItemStack; -import net.minecraftforge.event.entity.player.PlayerInteractEvent; -import cpw.mods.fml.relauncher.Side; - -public interface IBattlegearWeapon -{ - - /** - * Returns true if the weapon will allow other weapons to be placed in the partner offhand slot - */ - public boolean willAllowOffhandWeapon (); - - /** - * Will allow shield - */ - public boolean willAllowShield (); - - /** - * Returns true if the weapon be dual wielded in the offhand slot - */ - public boolean isOffhandHandDualWeapon (); - - /** - * Returns true if the weapon should always be sheathed on the back, false if it should be sheathed on the hip - */ - public boolean sheatheOnBack (); - - /** - * Perform any function when the item is held in the offhand and the user right clicks an entity. - * This is generally used to attack an entity with the offhand item. If this is the case the event should - * be canceled to prevent any default right clicking events (Eg Villager Trading) - * - * @param event the OffhandAttackEvent that was generated - * @param mainhandItem the ItemStack currently being held in the right hand - * @param offhandItem the ItemStack currently being held in the left hand - * @return true if the off hand swing animation should be performed - */ - public boolean offhandAttackEntity (OffhandAttackEvent event, ItemStack mainhandItem, ItemStack offhandItem); - - /** - * Perform any function when the item is held in the offhand and the user right clicks "Air". - * - * @param event the PlayerInteractEvent that was generated - * @param mainhandItem the ItemStack currently being held in the right hand - * @param offhandItem the ItemStack currently being held in the left hand - * @return true if the off hand swing animation should be performed - */ - public boolean offhandClickAir (PlayerInteractEvent event, ItemStack mainhandItem, ItemStack offhandItem); - - /** - * Perform any function when the item is held in the offhand and the user right clicks a block. - * Note that this will happen prior to the activation of any activation functions of blocks - * - * @param event the PlayerInteractEvent that was generated - * @param mainhandItem the ItemStack currently being held in the right hand - * @param offhandItem the ItemStack currently being held in the left hand - */ - public boolean offhandClickBlock (PlayerInteractEvent event, ItemStack mainhandItem, ItemStack offhandItem); - - /** - * Perform any passive effects on each game tick when the item is held in the offhand - * - * @param effectiveSide the effective side the method was called from - * @param mainhandItem the ItemStack currently being held in the right hand - * @param offhandItem the ItemStack currently being held in the left hand - */ - public void performPassiveEffects (Side effectiveSide, ItemStack mainhandItem, ItemStack offhandItem); - -} \ No newline at end of file diff --git a/src/api/java/mods/battlegear2/api/weapons/IExtendedReachWeapon.java b/src/api/java/mods/battlegear2/api/weapons/IExtendedReachWeapon.java deleted file mode 100644 index 41f29774..00000000 --- a/src/api/java/mods/battlegear2/api/weapons/IExtendedReachWeapon.java +++ /dev/null @@ -1,13 +0,0 @@ -package mods.battlegear2.api.weapons; - -import net.minecraft.item.ItemStack; - -public interface IExtendedReachWeapon -{ - /** - * The distance the weapon will hit (note this will ONLY work for main hand weapons) - * @param stack - * @return - */ - public float getReachModifierInBlocks (ItemStack stack); -} diff --git a/src/api/java/mods/battlegear2/api/weapons/IHitTimeModifier.java b/src/api/java/mods/battlegear2/api/weapons/IHitTimeModifier.java deleted file mode 100644 index 3f75afd1..00000000 --- a/src/api/java/mods/battlegear2/api/weapons/IHitTimeModifier.java +++ /dev/null @@ -1,15 +0,0 @@ -package mods.battlegear2.api.weapons; - -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.item.ItemStack; - -public interface IHitTimeModifier -{ - /** - * - * @param entityHit - * @return The amount to modify the hit shield - */ - public int getHitTime (ItemStack stack, EntityLivingBase entityHit); - -} diff --git a/src/api/java/mods/battlegear2/api/weapons/IPenetrateWeapon.java b/src/api/java/mods/battlegear2/api/weapons/IPenetrateWeapon.java deleted file mode 100644 index 9eab299b..00000000 --- a/src/api/java/mods/battlegear2/api/weapons/IPenetrateWeapon.java +++ /dev/null @@ -1,13 +0,0 @@ -package mods.battlegear2.api.weapons; - -import net.minecraft.item.ItemStack; - -public interface IPenetrateWeapon -{ - /** - * The amount of damage bypassing armor - * @param stack The {@link net.minecraft.item.ItemStack} representative of the item dealing the hit. - * @return the amount of damage that bypasses armour - */ - public int getPenetratingPower (ItemStack stack); -} diff --git a/src/api/java/mods/battlegear2/api/weapons/IPotionEffect.java b/src/api/java/mods/battlegear2/api/weapons/IPotionEffect.java deleted file mode 100644 index 75749996..00000000 --- a/src/api/java/mods/battlegear2/api/weapons/IPotionEffect.java +++ /dev/null @@ -1,22 +0,0 @@ -package mods.battlegear2.api.weapons; - -import java.util.Map; - -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.potion.PotionEffect; - -public interface IPotionEffect -{ - - /** - * Returns a map containing the potion effects to apply to an entity hit by the weapon. Each effect - * has a float value associated with the chance of applying the effect. Note that the "dice roll" only - * occurs once so any value under this roll will be applied. - * - * @param entityHit The entity the effect will be applied to. - * @param entityHitting - * @return A Map of {@link PotionEffect} with chance value ranging from 0 to 1, to be dealt to the entityHit - */ - public Map getEffectsOnHit (EntityLivingBase entityHit, EntityLivingBase entityHitting); - -} diff --git a/src/api/java/mods/battlegear2/api/weapons/ISpecialEffect.java b/src/api/java/mods/battlegear2/api/weapons/ISpecialEffect.java deleted file mode 100644 index 886d59a5..00000000 --- a/src/api/java/mods/battlegear2/api/weapons/ISpecialEffect.java +++ /dev/null @@ -1,14 +0,0 @@ -package mods.battlegear2.api.weapons; - -import net.minecraft.entity.EntityLivingBase; - -public interface ISpecialEffect -{ - /** - * - * @param entityHit The entity the effect will be applied to. - * @param entityHitting - * @return true if it adds an hitting action - */ - public boolean performEffects (EntityLivingBase entityHit, EntityLivingBase entityHitting); -} diff --git a/src/api/java/mods/battlegear2/api/weapons/OffhandAttackEvent.java b/src/api/java/mods/battlegear2/api/weapons/OffhandAttackEvent.java deleted file mode 100644 index 3d164f5c..00000000 --- a/src/api/java/mods/battlegear2/api/weapons/OffhandAttackEvent.java +++ /dev/null @@ -1,24 +0,0 @@ -package mods.battlegear2.api.weapons; - -import mods.battlegear2.api.PlayerEventChild; -import net.minecraft.entity.Entity; -import net.minecraftforge.event.entity.player.EntityInteractEvent; - -public class OffhandAttackEvent extends PlayerEventChild -{ - - public boolean swingOffhand = true; - public boolean shouldAttack = true; - public EntityInteractEvent event; - - public OffhandAttackEvent(EntityInteractEvent parent) - { - super(parent); - this.event = parent; - } - - public Entity getTarget () - { - return event.target; - } -} \ No newline at end of file diff --git a/src/main/java/tconstruct/items/tools/Arrow.java b/src/main/java/tconstruct/items/tools/Arrow.java index 66f795a4..8267587e 100644 --- a/src/main/java/tconstruct/items/tools/Arrow.java +++ b/src/main/java/tconstruct/items/tools/Arrow.java @@ -236,9 +236,4 @@ public class Arrow extends ToolCore } } - @Override - public boolean isOffhandHandDualWeapon () - { - return false; - } } diff --git a/src/main/java/tconstruct/items/tools/Battleaxe.java b/src/main/java/tconstruct/items/tools/Battleaxe.java index 998c9354..e4e4aca6 100644 --- a/src/main/java/tconstruct/items/tools/Battleaxe.java +++ b/src/main/java/tconstruct/items/tools/Battleaxe.java @@ -299,22 +299,4 @@ public class Battleaxe extends HarvestTool world.playAuxSFX(2001, x, y, z, Block.getIdFromBlock(wood) + (meta << 12)); return super.onBlockStartBreak(stack, x, y, z, player); } - - @Override - public boolean willAllowOffhandWeapon () - { - return false; - } - - @Override - public boolean willAllowShield () - { - return false; - } - - @Override - public boolean isOffhandHandDualWeapon () - { - return false; - } } diff --git a/src/main/java/tconstruct/items/tools/Chisel.java b/src/main/java/tconstruct/items/tools/Chisel.java index 50aae49f..8b7e9a04 100644 --- a/src/main/java/tconstruct/items/tools/Chisel.java +++ b/src/main/java/tconstruct/items/tools/Chisel.java @@ -228,21 +228,4 @@ public class Chisel extends ToolCore return new String[] { "utility" }; } - @Override - public boolean willAllowOffhandWeapon () - { - return false; - } - - @Override - public boolean willAllowShield () - { - return false; - } - - @Override - public boolean isOffhandHandDualWeapon () - { - return false; - } } diff --git a/src/main/java/tconstruct/items/tools/Cleaver.java b/src/main/java/tconstruct/items/tools/Cleaver.java index 2b851310..96915ed6 100644 --- a/src/main/java/tconstruct/items/tools/Cleaver.java +++ b/src/main/java/tconstruct/items/tools/Cleaver.java @@ -159,28 +159,4 @@ public class Cleaver extends Weapon * @Override public boolean onEntitySwing (EntityLiving entity, ItemStack * stack) { entity.swingProgressInt /= 2; return false; } */ - - @Override - public boolean willAllowOffhandWeapon () - { - return false; - } - - @Override - public boolean willAllowShield () - { - return PHConstruct.isCleaverTwoHanded; - } - - @Override - public boolean isOffhandHandDualWeapon () - { - return false; - } - - @Override - public boolean sheatheOnBack () - { - return true; - } } diff --git a/src/main/java/tconstruct/items/tools/Excavator.java b/src/main/java/tconstruct/items/tools/Excavator.java index 3f7e78a4..59fcbbbb 100644 --- a/src/main/java/tconstruct/items/tools/Excavator.java +++ b/src/main/java/tconstruct/items/tools/Excavator.java @@ -294,27 +294,4 @@ public class Excavator extends HarvestTool return super.getDigSpeed(stack, block, meta); } - @Override - public boolean willAllowOffhandWeapon () - { - return false; - } - - @Override - public boolean willAllowShield () - { - return false; - } - - @Override - public boolean isOffhandHandDualWeapon () - { - return false; - } - - @Override - public boolean sheatheOnBack () - { - return true; - } } diff --git a/src/main/java/tconstruct/items/tools/Hammer.java b/src/main/java/tconstruct/items/tools/Hammer.java index aa13944a..0aa72590 100644 --- a/src/main/java/tconstruct/items/tools/Hammer.java +++ b/src/main/java/tconstruct/items/tools/Hammer.java @@ -422,21 +422,4 @@ public class Hammer extends HarvestTool return new String[] { "weapon", "harvest", "melee", "bludgeoning" }; } - @Override - public boolean willAllowOffhandWeapon () - { - return false; - } - - @Override - public boolean isOffhandHandDualWeapon () - { - return false; - } - - @Override - public boolean sheatheOnBack () - { - return true; - } } diff --git a/src/main/java/tconstruct/items/tools/Hatchet.java b/src/main/java/tconstruct/items/tools/Hatchet.java index b8187506..d466593c 100644 --- a/src/main/java/tconstruct/items/tools/Hatchet.java +++ b/src/main/java/tconstruct/items/tools/Hatchet.java @@ -107,10 +107,4 @@ public class Hatchet extends HarvestTool { return "axe"; } - - @Override - public boolean isOffhandHandDualWeapon () - { - return PHConstruct.isHatchetWeapon; - } } diff --git a/src/main/java/tconstruct/items/tools/LumberAxe.java b/src/main/java/tconstruct/items/tools/LumberAxe.java index b5c49047..137bd177 100644 --- a/src/main/java/tconstruct/items/tools/LumberAxe.java +++ b/src/main/java/tconstruct/items/tools/LumberAxe.java @@ -401,28 +401,4 @@ public class LumberAxe extends HarvestTool { return 1; } - - @Override - public boolean willAllowOffhandWeapon () - { - return false; - } - - @Override - public boolean willAllowShield () - { - return false; - } - - @Override - public boolean isOffhandHandDualWeapon () - { - return false; - } - - @Override - public boolean sheatheOnBack () - { - return true; - } } diff --git a/src/main/java/tconstruct/items/tools/Mattock.java b/src/main/java/tconstruct/items/tools/Mattock.java index 4b103b60..bb006016 100644 --- a/src/main/java/tconstruct/items/tools/Mattock.java +++ b/src/main/java/tconstruct/items/tools/Mattock.java @@ -153,27 +153,4 @@ public class Mattock extends DualHarvestTool return true; } - @Override - public boolean willAllowOffhandWeapon () - { - return false; - } - - @Override - public boolean willAllowShield () - { - return false; - } - - @Override - public boolean isOffhandHandDualWeapon () - { - return false; - } - - @Override - public boolean sheatheOnBack () - { - return true; - } } \ No newline at end of file diff --git a/src/main/java/tconstruct/items/tools/Pickaxe.java b/src/main/java/tconstruct/items/tools/Pickaxe.java index bfc3aade..0afe7425 100644 --- a/src/main/java/tconstruct/items/tools/Pickaxe.java +++ b/src/main/java/tconstruct/items/tools/Pickaxe.java @@ -69,9 +69,4 @@ public class Pickaxe extends HarvestTool return "pickaxe"; } - @Override - public boolean isOffhandHandDualWeapon () - { - return false; - } } diff --git a/src/main/java/tconstruct/items/tools/Scythe.java b/src/main/java/tconstruct/items/tools/Scythe.java index 026ebae5..426ab017 100644 --- a/src/main/java/tconstruct/items/tools/Scythe.java +++ b/src/main/java/tconstruct/items/tools/Scythe.java @@ -220,27 +220,4 @@ public class Scythe extends Weapon return true; } - @Override - public boolean willAllowOffhandWeapon () - { - return false; - } - - @Override - public boolean willAllowShield () - { - return false; - } - - @Override - public boolean isOffhandHandDualWeapon () - { - return false; - } - - @Override - public boolean sheatheOnBack () - { - return true; - } } diff --git a/src/main/java/tconstruct/items/tools/Shortbow.java b/src/main/java/tconstruct/items/tools/Shortbow.java index 5ad781b1..88675446 100644 --- a/src/main/java/tconstruct/items/tools/Shortbow.java +++ b/src/main/java/tconstruct/items/tools/Shortbow.java @@ -190,28 +190,4 @@ public class Shortbow extends BowBase } // return TConstructRegistry.getMaterial(type).ability(); } - - @Override - public boolean willAllowOffhandWeapon () - { - return false; - } - - @Override - public boolean willAllowShield () - { - return false; - } - - @Override - public boolean isOffhandHandDualWeapon () - { - return false; - } - - @Override - public boolean sheatheOnBack () - { - return true; - } } diff --git a/src/main/java/tconstruct/items/tools/Shovel.java b/src/main/java/tconstruct/items/tools/Shovel.java index 65601b75..75e7f8ad 100644 --- a/src/main/java/tconstruct/items/tools/Shovel.java +++ b/src/main/java/tconstruct/items/tools/Shovel.java @@ -90,12 +90,6 @@ public class Shovel extends HarvestTool return "shovel"; } - @Override - public boolean isOffhandHandDualWeapon () - { - return false; - } - /* * @Override public Icon getIcon (ItemStack stack, int renderPass) { * NBTTagCompound tags = stack.getTagCompound().getCompoundTag("InfiTool"); diff --git a/src/main/java/tconstruct/library/tools/ToolCore.java b/src/main/java/tconstruct/library/tools/ToolCore.java index 6788a188..5e8eb519 100644 --- a/src/main/java/tconstruct/library/tools/ToolCore.java +++ b/src/main/java/tconstruct/library/tools/ToolCore.java @@ -7,8 +7,6 @@ import java.util.List; import java.util.Map; import java.util.Random; -import mods.battlegear2.api.weapons.IBattlegearWeapon; -import mods.battlegear2.api.weapons.OffhandAttackEvent; import net.minecraft.block.Block; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; @@ -54,7 +52,7 @@ import cpw.mods.fml.relauncher.SideOnly; * @see ToolMod */ -public abstract class ToolCore extends Item implements IEnergyContainerItem, IBattlegearWeapon +public abstract class ToolCore extends Item implements IEnergyContainerItem { // TE power constants -- TODO grab these from the items added protected int capacity = 400000; @@ -856,55 +854,6 @@ public abstract class ToolCore extends Item implements IEnergyContainerItem, IBa return tags.getCompoundTag("InfiTool").getInteger("Damage"); } - /* Battlegear support, IBattlegearWeapon */ - - @Override - public boolean willAllowOffhandWeapon () - { - return true; - } - - @Override - public boolean willAllowShield () - { - return true; - } - - @Override - public boolean isOffhandHandDualWeapon () - { - return true; - } - - @Override - public boolean sheatheOnBack () - { - return false; - } - - @Override - public boolean offhandAttackEntity (OffhandAttackEvent event, ItemStack mainhandItem, ItemStack offhandItem) - { - return true; - } - - @Override - public boolean offhandClickAir (PlayerInteractEvent event, ItemStack mainhandItem, ItemStack offhandItem) - { - return true; - } - - @Override - public boolean offhandClickBlock (PlayerInteractEvent event, ItemStack mainhandItem, ItemStack offhandItem) - { - return true; - } - - @Override - public void performPassiveEffects (Side effectiveSide, ItemStack mainhandItem, ItemStack offhandItem) - { - } - // TE support section -- from COFH core API reference section public void setMaxTransfer (int maxTransfer) {