Merge PR #178: Tinker and Blade - Warconstruct (Zerokyuuni/master)

Signed-off-by: Sunstrike <[email protected]>
This commit is contained in:
Sunstrike committed 2013-09-12 14:39:22 +01:00
commit 1ee95bbdef
47 files changed
+1467 -2

No files matched your search

@@ -0,0 +1,55 @@
package mods.battlegear2.api;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.entity.projectile.EntityArrow;
import net.minecraft.item.ItemStack;
import net.minecraft.world.World;
@Deprecated
public interface IArrowContainer{
/**
*
* @param stack 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
*/
public boolean hasArrowFor(ItemStack stack, ItemStack bow, EntityPlayer player);
/**
* The arrow spawned when bow is used with this non empty container equipped
* @param stack 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 stack, 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 stack 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 stack, 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 vanilla arrows
* @param stack
* @return True to receive {@link #addArrows(ItemStack, int)}
*/
public boolean isCraftableWithArrows(ItemStack stack);
/**
* Crafts the item with vanilla arrows
* @param stack
* @param arrows Number of vanilla arrows on the crafting bench
* @return Number of vanilla arrows that couldn't fit in
*/
public int addArrows(ItemStack stack, int arrows);
}
@@ -0,0 +1,99 @@
package mods.battlegear2.api;
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);
}
@@ -0,0 +1,14 @@
package mods.battlegear2.api;
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);
}
@@ -0,0 +1,70 @@
package mods.battlegear2.api;
import cpw.mods.fml.relauncher.Side;
import net.minecraft.item.ItemStack;
import net.minecraftforge.event.entity.player.PlayerInteractEvent;
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);
}
+31
View File
@@ -0,0 +1,31 @@
package mods.battlegear2.api;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
//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);
}
@@ -0,0 +1,12 @@
package mods.battlegear2.api;
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);
}
@@ -0,0 +1,11 @@
package mods.battlegear2.api;
import mods.battlegear2.heraldry.HeraldyPattern;
public interface IHeraldyArmour extends IHeraldyItem{
public String getBaseArmourPath(int armourSlot);
public String getPatternArmourPath(HeraldyPattern pattern, int armourSlot);
}
@@ -0,0 +1,77 @@
package mods.battlegear2.api;
import net.minecraft.item.ItemStack;
import net.minecraft.util.Icon;
@Deprecated
public interface IHeraldyItem {
public enum HeraldyRenderPassess{
/**
* The first render pass. This will use the items base icon coloured the primary colour
*/
PrimaryColourBase,
/**
* The second render pass. This will use the selected pattern overlayed on top of the base icon with the apropriate colour
*/
SecondaryColourPattern,
/**
* The third render pass. The sigil(s) will be rendered on top of the pattern in the apropriate positions
*/
Sigil,
/**
* Fourth render pass. The items trim icon will be rendered in the secondady colour
*/
SecondaryColourTrim,
/**
* Fifth Render pass, the Items post render icon will be rendered in the default colour
*/
PostRenderIcon
}
/**
* Returns the "base" icon. This icon will be coloured the primary colour
*/
public Icon getBaseIcon(ItemStack stack);
/**
* Returns the trim icon, This will be coloured the secondary colour
*/
public Icon getTrimIcon(ItemStack stack);
/**
* Returns the post render icon, this Icon will render after all other rendering passess in it's default colour
*/
public Icon getPostRenderIcon(ItemStack stack);
/**
* Returns true if the given itemstack has heraldy attached
*/
public boolean hasHeraldry(ItemStack stack);
/**
* Returns the current heraldy code, this will only be called on ItemStacks that have been found to have heraldrybackup using the hasHeraldryMethod
*/
public byte[] getHeraldryCode(ItemStack stack);
/**
* Saves the given heraldy code in the given stack. It is recommended to use the stacks NBT Tag compound for this
*/
public void setHeraldryCode(ItemStack stack, byte[] code);
/**
* Removes the heraldy code from the item
*/
public void removeHeraldry(ItemStack item);
/**
* Returns true if the default renderer should perform the given render pass
*/
public boolean shouldDoPass(HeraldyRenderPassess pass);
/**
* Returns true if the default renderer should be used.
* If the method returns true, the default renderer will be attached.
* If this method returns false it is the modders responsibility to attach an appropriate renderer
*/
public boolean useDefaultRenderer();
}
@@ -0,0 +1,15 @@
package mods.battlegear2.api;
import net.minecraft.entity.EntityLiving;
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);
}
@@ -0,0 +1,13 @@
package mods.battlegear2.api;
import net.minecraft.entity.EntityLivingBase;
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);
}
@@ -0,0 +1,23 @@
package mods.battlegear2.api;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.potion.PotionEffect;
import java.util.Map;
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<PotionEffect,Float> getEffectsOnHit(EntityLivingBase entityHit, EntityLivingBase entityHitting);
}
+54
View File
@@ -0,0 +1,54 @@
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);
}
@@ -0,0 +1,16 @@
package mods.battlegear2.api;
import net.minecraft.entity.EntityLiving;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.item.ItemStack;
import net.minecraft.potion.PotionEffect;
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);
}
@@ -0,0 +1,21 @@
package mods.battlegear2.api;
import net.minecraft.entity.Entity;
import net.minecraftforge.event.entity.player.EntityInteractEvent;
import net.minecraftforge.event.entity.player.PlayerEvent;
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;
}
}
@@ -0,0 +1,32 @@
package mods.battlegear2.api;
import net.minecraft.entity.Entity;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraftforge.event.Event.Result;
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);
}
}
@@ -0,0 +1,29 @@
package mods.battlegear2.api;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import net.minecraftforge.event.entity.player.ArrowLooseEvent;
import net.minecraftforge.event.entity.player.PlayerEvent;
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;
}
}
@@ -0,0 +1,42 @@
package mods.battlegear2.api;
import net.minecraft.entity.projectile.EntityArrow;
import net.minecraft.item.ItemStack;
import java.util.Comparator;
import java.util.Map;
import java.util.TreeMap;
public class QuiverArrowRegistry {
private static Map<ItemStack, Class<? extends EntityArrow>> map = new TreeMap<ItemStack, Class<? extends EntityArrow>>(new StackComparator());
public static void addArrowToRegistry(int itemId, int itemMetadata, Class<? extends EntityArrow> entityArrow){
ItemStack stack = new ItemStack(itemId, 1, itemMetadata);
map.put(stack, entityArrow);
}
public static Class<? extends EntityArrow> getArrowClass(ItemStack stack){
return map.get(stack);
}
static class StackComparator implements Comparator<ItemStack> {
@Override
public int compare(ItemStack stack, ItemStack stack2) {
if(stack == stack2){
return 0;
}else{
int idDiff = stack.itemID - stack2.itemID;
if(idDiff != 0){
return idDiff;
}else
return stack.getItemDamage() - stack2.getItemDamage();
}
}
}
}
@@ -0,0 +1,138 @@
package mods.battlegear2.api.heraldry;
import mods.battlegear2.utils.BattlegearUtils;
import java.io.*;
import java.util.Arrays;
public class HeraldryData {
public static final int RED = 1;
public static final int GREEN = 2;
public static final int BLUE = 3;
private byte pattern;
private short crest;
private byte crestPosition;
private int[] colours = new int[5];
private byte helm;
private byte banner;
private byte[] byteArray = null;
public HeraldryData(int pattern, int pattern_col_1, int pattern_col_2, int pattern_col_3, int crest, int crest_col_1, int crest_col_2, int crest_position, int helm, int banner) {
this.pattern = (byte) pattern;
this.crest = (short) crest;
colours = new int[]{pattern_col_1, pattern_col_2, pattern_col_3, crest_col_1, crest_col_2};
this.crestPosition = (byte) crest_position;
this.helm = (byte) helm;
this.banner = (byte) banner;
}
public HeraldryData(byte pattern, int pattern_col_1, int pattern_col_2, int pattern_col_3){
this(pattern, pattern_col_1, pattern_col_2, pattern_col_3, 0, 0, 0,0, 0, 0);
}
public HeraldryData(byte[] data){
DataInputStream input = null;
try{
input = new DataInputStream(new ByteArrayInputStream(data));
pattern = input.readByte();;
crest = input.readShort();
crestPosition = input.readByte();
colours= new int[5];
for(int i = 0; i < colours.length; i++){
colours[i] = input.readInt();
}
helm = input.readByte();
banner = input.readByte();
byteArray = Arrays.copyOf(data, data.length);
}catch (Exception e){
e.printStackTrace();
}finally {
BattlegearUtils.closeStream(input);
}
}
public static HeraldryData getDefault() {
return new HeraldryData(10, 0xFF000000, 0xFFFFFFFF, 0xFFFFFF00, 0, 0xFF000000, 0xFF000000, 0, 0, 0);
}
public byte[] getByteArray(){
if(byteArray != null){
return byteArray;
}
DataOutputStream output = null;
ByteArrayOutputStream bos = null;
try{
bos = new ByteArrayOutputStream();
output = new DataOutputStream(bos);
output.writeByte(pattern);
output.writeShort(crest);
output.writeByte(crestPosition);
for(int i = 0; i < 5; i++){
output.writeInt(colours[i]);
}
output.writeByte(helm);
output.writeByte(banner);
return bos.toByteArray();
} catch (Exception e){
e.printStackTrace();
} finally {
BattlegearUtils.closeStream(output);
}
return null;
}
public int getColourChanel(int colour, int chanelNo){
switch (chanelNo){
case RED:
return (colours[colour] >> 16) & 0xFF;
case GREEN:
return (colours[colour] >> 8) & 0xFF;
case BLUE:
return (colours[colour] >> 0) & 0xFF;
default:
return (colours[colour] >> 16) & 0xFF;
}
}
public byte getPattern() {
return pattern;
}
public int getColour(int i) {
return colours[i];
}
@Override
public String toString() {
return byteArrayToHex(getByteArray());
}
public static String byteArrayToHex(byte[] a) {
StringBuilder sb = new StringBuilder();
for(byte b: a)
sb.append(String.format("%02x", b&0xff));
return sb.toString();
}
public short getCrest() {
return crest;
}
}
@@ -0,0 +1,59 @@
package mods.battlegear2.api.heraldry;
import net.minecraft.item.ItemStack;
import net.minecraft.util.Icon;
public interface IHeraldryItem {
public enum HeraldyRenderPassess{
Pattern,
SecondaryColourTrim,
PostRenderIcon
}
/**
* Returns the "base" icon. This icon will be coloured the primary colour
*/
public Icon getBaseIcon(ItemStack stack);
/**
* Returns the trim icon, This will be coloured the secondary colour
*/
public Icon getTrimIcon(ItemStack stack);
/**
* Returns the post render icon, this Icon will render after all other rendering passess in it's default colour
*/
public Icon getPostRenderIcon(ItemStack stack);
/**
* Returns true if the given itemstack has heraldy attached
*/
public boolean hasHeraldry(ItemStack stack);
/**
* Returns the current heraldy code, this will only be called on ItemStacks that have been found to have heraldry using the hasHeraldryMethod
*/
public byte[] getHeraldry(ItemStack stack);
/**
* Saves the given heraldry code in the given stack. It is recommended to save the Byte array representation of the crest in the NBT
*/
public void setHeraldry(ItemStack stack, byte[] data);
/**
* Removes the heraldry code from the item
*/
public void removeHeraldry(ItemStack item);
/**
* Returns true if the default renderer should perform the given render pass
*/
public boolean shouldDoPass(HeraldyRenderPassess pass);
/**
* Returns true if the default renderer should be used.
* If the method returns true, the default renderer will be attached.
* If this method returns false it is the modders responsibility to attach an appropriate renderer
*/
public boolean useDefaultRenderer();
}
@@ -0,0 +1,55 @@
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;
@Deprecated
public interface IArrowContainer{
/**
*
* @param stack 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
*/
public boolean hasArrowFor(ItemStack stack, ItemStack bow, EntityPlayer player);
/**
* The arrow spawned when bow is used with this non empty container equipped
* @param stack 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 stack, 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 stack 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 stack, 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 vanilla arrows
* @param stack
* @return True to receive {@link #addArrows(ItemStack, int)}
*/
public boolean isCraftableWithArrows(ItemStack stack);
/**
* Crafts the item with vanilla arrows
* @param stack
* @param arrows Number of vanilla arrows on the crafting bench
* @return Number of vanilla arrows that couldn't fit in
*/
public int addArrows(ItemStack stack, int arrows);
}
@@ -0,0 +1,99 @@
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);
}
@@ -0,0 +1,30 @@
package mods.battlegear2.api.quiver;
import mods.battlegear2.api.PlayerEventChild;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import net.minecraftforge.event.entity.player.ArrowLooseEvent;
import net.minecraftforge.event.entity.player.PlayerEvent;
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;
}
}
@@ -0,0 +1,42 @@
package mods.battlegear2.api.quiver;
import net.minecraft.entity.projectile.EntityArrow;
import net.minecraft.item.ItemStack;
import java.util.Comparator;
import java.util.Map;
import java.util.TreeMap;
public class QuiverArrowRegistry {
private static Map<ItemStack, Class<? extends EntityArrow>> map = new TreeMap<ItemStack, Class<? extends EntityArrow>>(new StackComparator());
public static void addArrowToRegistry(int itemId, int itemMetadata, Class<? extends EntityArrow> entityArrow){
ItemStack stack = new ItemStack(itemId, 1, itemMetadata);
map.put(stack, entityArrow);
}
public static Class<? extends EntityArrow> getArrowClass(ItemStack stack){
return map.get(stack);
}
static class StackComparator implements Comparator<ItemStack> {
@Override
public int compare(ItemStack stack, ItemStack stack2) {
if(stack == stack2){
return 0;
}else{
int idDiff = stack.itemID - stack2.itemID;
if(idDiff != 0){
return idDiff;
}else
return stack.getItemDamage() - stack2.getItemDamage();
}
}
}
}
@@ -0,0 +1,14 @@
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);
}
@@ -0,0 +1,70 @@
package mods.battlegear2.api.weapons;
import cpw.mods.fml.relauncher.Side;
import net.minecraft.item.ItemStack;
import net.minecraftforge.event.entity.player.PlayerInteractEvent;
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);
}
@@ -0,0 +1,12 @@
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);
}
@@ -0,0 +1,15 @@
package mods.battlegear2.api.weapons;
import net.minecraft.entity.EntityLiving;
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);
}
@@ -0,0 +1,13 @@
package mods.battlegear2.api.weapons;
import net.minecraft.entity.EntityLivingBase;
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);
}
@@ -0,0 +1,23 @@
package mods.battlegear2.api.weapons;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.potion.PotionEffect;
import java.util.Map;
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<PotionEffect,Float> getEffectsOnHit(EntityLivingBase entityHit, EntityLivingBase entityHitting);
}
@@ -0,0 +1,16 @@
package mods.battlegear2.api.weapons;
import net.minecraft.entity.EntityLiving;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.item.ItemStack;
import net.minecraft.potion.PotionEffect;
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);
}
@@ -0,0 +1,22 @@
package mods.battlegear2.api.weapons;
import mods.battlegear2.api.PlayerEventChild;
import net.minecraft.entity.Entity;
import net.minecraftforge.event.entity.player.EntityInteractEvent;
import net.minecraftforge.event.entity.player.PlayerEvent;
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;
}
}
+5
View File
@@ -225,4 +225,9 @@ public class Arrow extends ToolCore
}
}
}
@Override
public boolean isOffhandHandDualWeapon() {
return false;
}
}
+15
View File
@@ -300,4 +300,19 @@ public class Battleaxe extends HarvestTool
world.playAuxSFX(2001, x, y, z, woodID + (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;
}
}
+14
View File
@@ -226,4 +226,18 @@ 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;
}
}
+21
View File
@@ -3,6 +3,7 @@ package tconstruct.items.tools;
import tconstruct.common.TContent;
import tconstruct.library.tools.AbilityHelper;
import tconstruct.library.tools.Weapon;
import tconstruct.util.PHConstruct;
import net.minecraft.entity.Entity;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.Item;
@@ -161,4 +162,24 @@ public class Cleaver extends Weapon
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;
}
}
+20
View File
@@ -293,4 +293,24 @@ public class Excavator extends HarvestTool
}
return super.getStrVsBlock(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;
}
}
+20
View File
@@ -399,4 +399,24 @@ public class Hammer extends HarvestTool
{
return new String[] { "weapon", "harvest", "melee", "bludgeoning" };
}
@Override
public boolean willAllowOffhandWeapon() {
return false;
}
@Override
public boolean willAllowShield() {
return false;
}
@Override
public boolean isOffhandHandDualWeapon() {
return false;
}
@Override
public boolean sheatheOnBack() {
return true;
}
}
+5
View File
@@ -104,4 +104,9 @@ public class Hatchet extends HarvestTool
{
return "axe";
}
@Override
public boolean isOffhandHandDualWeapon() {
return false;
}
}
+20
View File
@@ -400,4 +400,24 @@ 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;
}
}
+20
View File
@@ -140,4 +140,24 @@ 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;
}
}
+5
View File
@@ -68,4 +68,9 @@ public class Pickaxe extends HarvestTool
{
return "pickaxe";
}
@Override
public boolean isOffhandHandDualWeapon() {
return false;
}
}
+19
View File
@@ -218,4 +218,23 @@ 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;
}
}
+20
View File
@@ -191,4 +191,24 @@ 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;
}
}
+5
View File
@@ -89,6 +89,11 @@ public class Shovel extends HarvestTool
{
return "shovel";
}
@Override
public boolean isOffhandHandDualWeapon() {
return false;
}
/*@Override
public Icon getIcon (ItemStack stack, int renderPass)
+48 -2
View File
@@ -13,6 +13,8 @@ import tconstruct.library.ActiveToolMod;
import tconstruct.library.TConstructRegistry;
import tconstruct.library.crafting.ToolBuilder;
import mods.battlegear2.api.weapons.IBattlegearWeapon;
import mods.battlegear2.api.weapons.OffhandAttackEvent;
import net.minecraft.block.Block;
import net.minecraft.client.renderer.texture.IconRegister;
import net.minecraft.creativetab.CreativeTabs;
@@ -26,6 +28,7 @@ import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.util.Icon;
import net.minecraft.world.World;
import net.minecraftforge.event.entity.player.PlayerInteractEvent;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
@@ -55,7 +58,7 @@ import cpw.mods.fml.relauncher.SideOnly;
* @see ToolMod
*/
public abstract class ToolCore extends Item implements ICustomElectricItem, IBoxable
public abstract class ToolCore extends Item implements ICustomElectricItem, IBoxable, IBattlegearWeapon
{
protected Random random = new Random();
protected int damageVsEntity;
@@ -615,7 +618,7 @@ public abstract class ToolCore extends Item implements ICustomElectricItem, IBox
public boolean onLeftClickEntity (ItemStack stack, EntityPlayer player, Entity entity)
{
AbilityHelper.onLeftClickEntity(stack, player, entity, this, 0);
return true;
return false;
}
@Override
@@ -937,4 +940,47 @@ public abstract class ToolCore extends Item implements ICustomElectricItem, IBox
return tags.getCompoundTag("InfiTool").getInteger("Damage");
}
@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) {
}
}
+2
View File
@@ -125,4 +125,6 @@ public abstract class Weapon extends ToolCore
public static Material[] web = new Material[] { Material.web };
public static Material[] none = new Material[0];
}
+6
View File
@@ -361,6 +361,9 @@ public class PHConstruct
cfgDimBlackList = config.get("DimBlackList", "SlimeIslandDimBlacklist",new int[]{}).getIntList();
slimeIslGenDim0Only = config.get("DimBlackList","GenerateSlimeIslandInDim0Only" , false).getBoolean(false);
//Addon stuff
isCleaverTwoHanded = config.get("Battlegear", "Can Cleavers have shields", true).getBoolean(true);
/* Save the configuration file */
config.save();
@@ -681,4 +684,7 @@ public class PHConstruct
//dimensionblacklist
public static boolean slimeIslGenDim0Only;
public static int[] cfgDimBlackList;
//Addon stuff
public static boolean isCleaverTwoHanded;
}