mirror of
https://github.com/GTNewHorizons/TinkersConstruct.git
synced 2026-11-20 20:22:36 +00:00
Merge pull request #12 from Kortako/1.7.10
Tinkers bows in Battlegear slots
This commit is contained in:
8 files changed
+697
-6
No files matched your search
@@ -0,0 +1,451 @@
|
||||
package mods.battlegear2.api.core;
|
||||
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.entity.player.InventoryPlayer;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.nbt.NBTTagCompound;
|
||||
import net.minecraft.nbt.NBTTagList;
|
||||
import net.minecraftforge.common.MinecraftForge;
|
||||
|
||||
/**
|
||||
* User: nerd-boy
|
||||
* Date: 15/07/13
|
||||
* Time: 3:08 PM
|
||||
* Replacement for the player inventory
|
||||
*/
|
||||
public class InventoryPlayerBattle extends InventoryPlayer {
|
||||
//Mark the inventory content as dirty to be send to the client
|
||||
public boolean hasChanged = true;
|
||||
//The offsets used
|
||||
public static int ARMOR_OFFSET = 100;
|
||||
public static int OFFSET = 150;
|
||||
public static int WEAPON_SETS = 3;
|
||||
|
||||
public static int EXTRA_ITEMS = WEAPON_SETS * 2;
|
||||
public static int EXTRA_INV_SIZE = EXTRA_ITEMS + 6 + 6;
|
||||
//The "battle" extra slots
|
||||
public ItemStack[] extraItems;
|
||||
|
||||
public InventoryPlayerBattle(EntityPlayer entityPlayer) {
|
||||
super(entityPlayer);
|
||||
extraItems = new ItemStack[EXTRA_INV_SIZE];
|
||||
}
|
||||
|
||||
/**
|
||||
* @return true if the current item value is offset in the battle slot range
|
||||
*/
|
||||
public boolean isBattlemode() {
|
||||
return this.currentItem >= OFFSET && this.currentItem < OFFSET + EXTRA_ITEMS;
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns a new slot index according to the type
|
||||
* @param type determines which inventory array to expand
|
||||
* @return the new slot index, or Integer.MIN_VALUE if it is not possible to expand further
|
||||
*/
|
||||
public int requestNewSlot(InventorySlotType type){
|
||||
ItemStack[] temp;
|
||||
switch(type){
|
||||
case MAIN:
|
||||
if(mainInventory.length+1<ARMOR_OFFSET) {
|
||||
temp = new ItemStack[mainInventory.length + 1];
|
||||
System.arraycopy(mainInventory, 0, temp, 0, mainInventory.length);
|
||||
mainInventory = temp;
|
||||
return mainInventory.length - 1;//Between 36 and 99
|
||||
}
|
||||
break;
|
||||
case ARMOR:
|
||||
if(ARMOR_OFFSET+armorInventory.length+1<OFFSET) {
|
||||
temp = new ItemStack[armorInventory.length + 1];
|
||||
System.arraycopy(armorInventory, 0, temp, 0, armorInventory.length);
|
||||
armorInventory = temp;
|
||||
return ARMOR_OFFSET + armorInventory.length - 1;//Between 104 and 149
|
||||
}
|
||||
break;
|
||||
case BATTLE:
|
||||
temp = new ItemStack[extraItems.length+1];
|
||||
System.arraycopy(extraItems, 0, temp, 0, extraItems.length);
|
||||
extraItems = temp;
|
||||
return OFFSET + extraItems.length - 1;
|
||||
}
|
||||
return Integer.MIN_VALUE;//Impossible because of byte cast in inventory NBT
|
||||
}
|
||||
|
||||
/**
|
||||
* Patch used for "set current slot" vanilla packets
|
||||
* @param id the value to test for currentItem setting
|
||||
* @return true if it is possible for currentItem to be set with this value
|
||||
*/
|
||||
public static boolean isValidSwitch(int id) {
|
||||
return (id >= 0 && id < getHotbarSize()) || (id >= OFFSET && id < OFFSET + EXTRA_ITEMS);
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns a slot index in main inventory containing a specific itemID
|
||||
*/
|
||||
private int getInventorySlotContainItem(Item par1) {
|
||||
for (int j = 0; j < this.extraItems.length; ++j) {
|
||||
if (this.extraItems[j] != null && this.extraItems[j].getItem() == par1) {
|
||||
return j;
|
||||
}
|
||||
}
|
||||
return -1;
|
||||
}
|
||||
|
||||
@SideOnly(Side.CLIENT)
|
||||
private int getInventorySlotContainItemAndDamage(Item par1, int par2) {
|
||||
for (int k = 0; k < this.extraItems.length; ++k) {
|
||||
if (this.extraItems[k] != null && this.extraItems[k].getItem() == par1 && this.extraItems[k].getItemDamage() == par2) {
|
||||
return k;
|
||||
}
|
||||
}
|
||||
return -1;
|
||||
}
|
||||
|
||||
/**
|
||||
* Allows the item switching in "battlemode", delegates to parent method if in normal mode
|
||||
* @return the currently selected {@link ItemStack}
|
||||
*/
|
||||
@Override
|
||||
public ItemStack getCurrentItem() {
|
||||
return isBattlemode() ? extraItems[currentItem - OFFSET] : super.getCurrentItem();
|
||||
}
|
||||
|
||||
/**
|
||||
* Changes currentItem and currentItemStack based on a given target
|
||||
* @param targetItem the newly selected item
|
||||
* @param targetDamage the newly selected item damage
|
||||
* @param compareWithDamage if item damage should matter when searching for the target in the inventory
|
||||
* @param forceInEmptySlots if the newly selected item should be forced in empty slots if it couldn't be found as-is
|
||||
*/
|
||||
@Override
|
||||
@SideOnly(Side.CLIENT)
|
||||
public void func_146030_a(Item targetItem, int targetDamage, boolean compareWithDamage, boolean forceInEmptySlots) {
|
||||
if (!isBattlemode())
|
||||
super.func_146030_a(targetItem, targetDamage, compareWithDamage, forceInEmptySlots);
|
||||
}
|
||||
|
||||
/**
|
||||
* Scroll the currentItem possible values
|
||||
* @param direction if >0: in the natural order, if <0: in the opposite order
|
||||
*/
|
||||
@Override
|
||||
@SideOnly(Side.CLIENT)
|
||||
public void changeCurrentItem(int direction) {
|
||||
if (isBattlemode()) {
|
||||
|
||||
if (direction > 0){
|
||||
direction = 1;
|
||||
}else if (direction != 0){
|
||||
direction = -1;
|
||||
}
|
||||
|
||||
//noinspection StatementWithEmptyBody
|
||||
for (currentItem -= direction; currentItem < OFFSET; currentItem += WEAPON_SETS) {
|
||||
}
|
||||
|
||||
while (currentItem >= OFFSET + WEAPON_SETS) {
|
||||
currentItem -= WEAPON_SETS;
|
||||
}
|
||||
|
||||
} else {
|
||||
super.changeCurrentItem(direction);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Clears all slots that contain the target item with given damage
|
||||
* @param targetId if null, not specific
|
||||
* @param targetDamage if <0, not specific
|
||||
* @return the total number of items cleared
|
||||
*/
|
||||
@Override
|
||||
public int clearInventory(Item targetId, int targetDamage) {
|
||||
int stacks = 0;
|
||||
|
||||
for (int i = 0; i < extraItems.length; i++) {
|
||||
if (extraItems[i] != null &&
|
||||
(targetId == null || extraItems[i].getItem() == targetId) &&
|
||||
(targetDamage <= -1 || extraItems[i].getItemDamage() == targetDamage)) {
|
||||
|
||||
stacks += extraItems[i].stackSize;
|
||||
extraItems[i] = null;
|
||||
}
|
||||
}
|
||||
hasChanged = stacks > 0;
|
||||
return super.clearInventory(targetId, targetDamage) + stacks;
|
||||
}
|
||||
|
||||
/**
|
||||
* Called by EntityPlayer#onLivingUpdate(), to animate the item being picked up and tick it
|
||||
*/
|
||||
@Override
|
||||
public void decrementAnimations() {
|
||||
super.decrementAnimations();
|
||||
for (int i = 0; i < this.extraItems.length; ++i) {
|
||||
if (this.extraItems[i] != null) {
|
||||
this.extraItems[i].updateAnimation(this.player.worldObj, this.player, i + OFFSET, this.currentItem == i + OFFSET);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Removed one item of specified itemID from inventory (if it is in a stack, the stack size will reduce with 1)
|
||||
*/
|
||||
@Override
|
||||
public boolean consumeInventoryItem(Item par1) {
|
||||
int j = this.getInventorySlotContainItem(par1);
|
||||
|
||||
if (j < 0) {
|
||||
return super.consumeInventoryItem(par1);
|
||||
} else {
|
||||
hasChanged = true;
|
||||
if (--this.extraItems[j].stackSize <= 0) {
|
||||
this.extraItems[j] = null;
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Get if a specified item id is inside the inventory.
|
||||
* @param par1 the item to search for
|
||||
*/
|
||||
@Override
|
||||
public boolean hasItem(Item par1) {
|
||||
if (super.hasItem(par1)) {
|
||||
return true;
|
||||
} else {
|
||||
int j = this.getInventorySlotContainItem(par1);
|
||||
return j >= 0;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Removes from an inventory slot up to a specified number of items and returns them in a new stack.
|
||||
* @param slot to remove from
|
||||
* @param amount to remove in the item stack
|
||||
* @return the removed items in a item stack, if any
|
||||
*/
|
||||
@Override
|
||||
public ItemStack decrStackSize(int slot, int amount) {
|
||||
if (slot >= OFFSET) {
|
||||
ItemStack targetStack = extraItems[slot - OFFSET];
|
||||
|
||||
if (targetStack != null) {
|
||||
hasChanged = true;
|
||||
if (targetStack.stackSize <= amount) {
|
||||
extraItems[slot - OFFSET] = null;
|
||||
return targetStack;
|
||||
} else {
|
||||
targetStack = extraItems[slot - OFFSET].splitStack(amount);
|
||||
if (extraItems[slot - OFFSET].stackSize == 0) {
|
||||
extraItems[slot - OFFSET] = null;
|
||||
}
|
||||
return targetStack;
|
||||
}
|
||||
}
|
||||
|
||||
return null;
|
||||
|
||||
} else {
|
||||
return super.decrStackSize(slot, amount);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Get the stack in given slot, when closing the container
|
||||
* @param slot to get the content from
|
||||
* @return the stack that is stored in given slot
|
||||
*/
|
||||
@Override
|
||||
public ItemStack getStackInSlotOnClosing(int slot) {
|
||||
if (slot >= OFFSET) {
|
||||
return extraItems[slot - OFFSET];
|
||||
} else {
|
||||
return super.getStackInSlotOnClosing(slot);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Sets the given item stack to the specified slot in the inventory
|
||||
* @param slot whose content will change
|
||||
* @param itemStack to put in the slot
|
||||
*/
|
||||
@Override
|
||||
public void setInventorySlotContents(int slot, ItemStack itemStack) {
|
||||
setInventorySlotContents(slot, itemStack, true);
|
||||
}
|
||||
|
||||
/**
|
||||
* Sets the given item stack to the specified slot in the inventory, mark as dirty according to the boolean argument
|
||||
* @param slot whose content will change
|
||||
* @param itemStack to put in the slot
|
||||
* @param changed if the inventory packet should be sent next tick
|
||||
*/
|
||||
public void setInventorySlotContents(int slot, ItemStack itemStack, boolean changed) {
|
||||
if (slot >= OFFSET) {
|
||||
hasChanged = changed;
|
||||
extraItems[slot - OFFSET] = itemStack;
|
||||
} else {
|
||||
super.setInventorySlotContents(slot, itemStack);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* UNUSED
|
||||
* Get the current item "action value" against a block
|
||||
* @param block that the player is acting against
|
||||
* @return some action value of the current item against given block
|
||||
*/
|
||||
@Override
|
||||
public float func_146023_a(Block block) {
|
||||
if (isBattlemode()) {
|
||||
ItemStack currentItemStack = getCurrentItem();
|
||||
return currentItemStack != null ? currentItemStack.func_150997_a(block) : 1.0F;
|
||||
|
||||
} else {
|
||||
return super.func_146023_a(block);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Writes the inventory out as a list of compound tags. This is where the slot indices are used (+100 for armor, +150
|
||||
* for battle slots).
|
||||
*/
|
||||
@Override
|
||||
public NBTTagList writeToNBT(NBTTagList par1nbtTagList) {
|
||||
NBTTagList nbtList = super.writeToNBT(par1nbtTagList);
|
||||
NBTTagCompound nbttagcompound;
|
||||
|
||||
for (int i = 0; i < extraItems.length; ++i) {
|
||||
if (extraItems[i] != null) {
|
||||
nbttagcompound = new NBTTagCompound();
|
||||
//This will be -ve, but meh still works
|
||||
nbttagcompound.setByte("Slot", (byte) (i + OFFSET));
|
||||
this.extraItems[i].writeToNBT(nbttagcompound);
|
||||
nbtList.appendTag(nbttagcompound);
|
||||
}
|
||||
}
|
||||
return nbtList;
|
||||
}
|
||||
|
||||
/**
|
||||
* Reads from the given tag list, resize each arrays to maximum required and fills the slots in the inventory with the correct items.
|
||||
*/
|
||||
@Override
|
||||
public void readFromNBT(NBTTagList nbtTagList) {
|
||||
int highestMain = mainInventory.length, highestArmor = armorInventory.length, highestExtra = extraItems.length;
|
||||
for (int i = 0; i < nbtTagList.tagCount(); ++i) {
|
||||
NBTTagCompound nbttagcompound = nbtTagList.getCompoundTagAt(i);
|
||||
int j = nbttagcompound.getByte("Slot") & 255;
|
||||
if (j >= 0 && j < ARMOR_OFFSET) {
|
||||
if(j >= highestMain)
|
||||
highestMain = j + 1;
|
||||
}
|
||||
else if (j >= ARMOR_OFFSET && j < OFFSET) {
|
||||
if(j - ARMOR_OFFSET >= highestArmor)
|
||||
highestArmor = j + 1 - ARMOR_OFFSET;
|
||||
}
|
||||
else if (j >= OFFSET && j < 255) {
|
||||
if(j - OFFSET >= highestExtra)
|
||||
highestExtra = j + 1 - OFFSET;
|
||||
}
|
||||
}
|
||||
this.mainInventory = new ItemStack[highestMain];
|
||||
this.armorInventory = new ItemStack[highestArmor];
|
||||
this.extraItems = new ItemStack[highestExtra];
|
||||
for (int i = 0; i < nbtTagList.tagCount(); ++i) {
|
||||
NBTTagCompound nbttagcompound = nbtTagList.getCompoundTagAt(i);
|
||||
int j = nbttagcompound.getByte("Slot") & 255;
|
||||
ItemStack itemstack = ItemStack.loadItemStackFromNBT(nbttagcompound);
|
||||
|
||||
if (itemstack != null) {
|
||||
if (j >= 0 && j < this.mainInventory.length) {
|
||||
this.mainInventory[j] = itemstack;
|
||||
}
|
||||
else if (j >= ARMOR_OFFSET && j - ARMOR_OFFSET < this.armorInventory.length) {
|
||||
this.armorInventory[j - ARMOR_OFFSET] = itemstack;
|
||||
}
|
||||
else if (j >= OFFSET && j - OFFSET < this.extraItems.length) {
|
||||
this.extraItems[j - OFFSET] = itemstack;
|
||||
}
|
||||
else{
|
||||
MinecraftForge.EVENT_BUS.post(new UnhandledInventoryItemEvent(player, j, itemstack));
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
*
|
||||
* @param slot to get the content from
|
||||
* @return the content of the given slot
|
||||
*/
|
||||
@Override
|
||||
public ItemStack getStackInSlot(int slot) {
|
||||
if (slot >= OFFSET) {
|
||||
return extraItems[slot - OFFSET];
|
||||
} else {
|
||||
return super.getStackInSlot(slot);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
*
|
||||
* @return the usual number of slots for vanilla inventory (not hardcoded)
|
||||
*/
|
||||
@Override
|
||||
public int getSizeInventory() {
|
||||
return this.mainInventory.length + this.armorInventory.length;
|
||||
}
|
||||
|
||||
/**
|
||||
* Drop all slots content, and clear them
|
||||
*/
|
||||
@Override
|
||||
public void dropAllItems() {
|
||||
hasChanged = true;
|
||||
super.dropAllItems();
|
||||
for (int i = 0; i < this.extraItems.length; ++i) {
|
||||
if (this.extraItems[i] != null) {
|
||||
this.player.func_146097_a(this.extraItems[i], true, false);
|
||||
this.extraItems[i] = null;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Copy the slots content from another instance, usually for changing dimensions
|
||||
* @param par1InventoryPlayer the instance to copy from
|
||||
*/
|
||||
@Override
|
||||
public void copyInventory(InventoryPlayer par1InventoryPlayer) {
|
||||
this.mainInventory = new ItemStack[par1InventoryPlayer.mainInventory.length];
|
||||
this.armorInventory = new ItemStack[par1InventoryPlayer.armorInventory.length];
|
||||
super.copyInventory(par1InventoryPlayer);
|
||||
if (par1InventoryPlayer instanceof InventoryPlayerBattle) {
|
||||
this.extraItems = new ItemStack[((InventoryPlayerBattle) par1InventoryPlayer).extraItems.length];
|
||||
for (int i = 0; i < extraItems.length; i++) {
|
||||
this.extraItems[i] = ItemStack.copyItemStack(par1InventoryPlayer.getStackInSlot(i + OFFSET));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Get the offset item (for the left hand)
|
||||
* @return the item held in left hand, if any
|
||||
*/
|
||||
public ItemStack getCurrentOffhandWeapon(){
|
||||
if(isBattlemode()){
|
||||
return getStackInSlot(currentItem+WEAPON_SETS);
|
||||
}else{
|
||||
return null;
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,19 @@
|
||||
package mods.battlegear2.api.core;
|
||||
|
||||
/**
|
||||
* Created by GotoLink on 24/04/2014.
|
||||
*/
|
||||
public enum InventorySlotType {
|
||||
/**
|
||||
* The main inventory space (slots 0 to 99)
|
||||
*/
|
||||
MAIN,
|
||||
/**
|
||||
* The armor inventory space (slots 100 to 149)
|
||||
*/
|
||||
ARMOR,
|
||||
/**
|
||||
* The inventory space added by battlegear (slots 150 and above)
|
||||
*/
|
||||
BATTLE
|
||||
}
|
||||
@@ -0,0 +1,26 @@
|
||||
package mods.battlegear2.api.core;
|
||||
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraftforge.event.entity.player.PlayerEvent;
|
||||
|
||||
/**
|
||||
* Created by GotoLink on 01/05/2014.
|
||||
* Event posted on {@link MinecraftForge.EVENT_BUS} from the player inventory {@link InventoryPlayerBattle#readFromNBT(NBTTagList)}
|
||||
* if the slot number is outside the expected boundaries
|
||||
*/
|
||||
public class UnhandledInventoryItemEvent extends PlayerEvent {
|
||||
/**
|
||||
* The slot number read from NBT, that is outside the arrays limits
|
||||
*/
|
||||
public final int inventorySlot;
|
||||
/**
|
||||
* The item read from the NBT, not null
|
||||
*/
|
||||
public final ItemStack item;
|
||||
public UnhandledInventoryItemEvent(EntityPlayer player, int slot, ItemStack itemStack) {
|
||||
super(player);
|
||||
inventorySlot = slot;
|
||||
item = itemStack;
|
||||
}
|
||||
}
|
||||
@@ -1,5 +1,6 @@
|
||||
package tconstruct.library.weaponry;
|
||||
|
||||
import cpw.mods.fml.common.Optional;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
import net.minecraft.util.StatCollector;
|
||||
@@ -11,10 +12,17 @@ import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.nbt.NBTTagCompound;
|
||||
import tconstruct.library.tools.ToolCore;
|
||||
import tconstruct.tools.TinkerTools;
|
||||
import mods.battlegear2.api.PlayerEventChild;
|
||||
import mods.battlegear2.api.weapons.IBattlegearWeapon;
|
||||
import net.minecraftforge.event.entity.player.PlayerInteractEvent;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
public abstract class AmmoItem extends ToolCore implements IAmmo {
|
||||
@Optional.InterfaceList({
|
||||
@Optional.Interface(modid = "battlegear2", iface = "mods.battlegear2.api.weapons.IBattlegearWeapon")
|
||||
})
|
||||
public abstract class AmmoItem extends ToolCore implements IBattlegearWeapon, IAmmo {
|
||||
public AmmoItem(int baseDamage, String name) {
|
||||
super(baseDamage);
|
||||
this.setCreativeTab(TConstructRegistry.weaponryTab);
|
||||
@@ -154,4 +162,51 @@ public abstract class AmmoItem extends ToolCore implements IAmmo {
|
||||
// ammo doesn't hurt on smacking stuff with it
|
||||
return false;
|
||||
}
|
||||
|
||||
@Override
|
||||
@Optional.Method(modid = "battlegear2")
|
||||
public boolean sheatheOnBack(ItemStack item)
|
||||
{
|
||||
return true;
|
||||
}
|
||||
|
||||
@Override
|
||||
@Optional.Method(modid = "battlegear2")
|
||||
public boolean isOffhandHandDual(ItemStack off) {
|
||||
return true;
|
||||
}
|
||||
|
||||
@Override
|
||||
@Optional.Method(modid = "battlegear2")
|
||||
public boolean offhandAttackEntity(PlayerEventChild.OffhandAttackEvent event, ItemStack mainhandItem, ItemStack offhandItem) {
|
||||
return false;
|
||||
}
|
||||
|
||||
@Override
|
||||
@Optional.Method(modid = "battlegear2")
|
||||
public boolean offhandClickAir(PlayerInteractEvent event, ItemStack mainhandItem, ItemStack offhandItem) {
|
||||
event.setCanceled(false);
|
||||
return false;
|
||||
}
|
||||
|
||||
@Override
|
||||
@Optional.Method(modid = "battlegear2")
|
||||
public boolean offhandClickBlock(PlayerInteractEvent event, ItemStack mainhandItem, ItemStack offhandItem) {
|
||||
return false;
|
||||
}
|
||||
|
||||
@Override
|
||||
@Optional.Method(modid = "battlegear2")
|
||||
public void performPassiveEffects(Side effectiveSide, ItemStack mainhandItem, ItemStack offhandItem) {
|
||||
// unused
|
||||
}
|
||||
|
||||
@Override
|
||||
@Optional.Method(modid = "battlegear2")
|
||||
public boolean allowOffhand(ItemStack mainhand, ItemStack offhand) {
|
||||
if(offhand == null)
|
||||
return true;
|
||||
return (mainhand != null && mainhand.getItem() != TinkerTools.cleaver && mainhand.getItem() != TinkerTools.battleaxe)
|
||||
&& (offhand.getItem() != TinkerTools.cleaver && offhand.getItem() != TinkerTools.battleaxe);
|
||||
}
|
||||
}
|
||||
@@ -1,5 +1,6 @@
|
||||
package tconstruct.library.weaponry;
|
||||
|
||||
import cpw.mods.fml.common.Optional;
|
||||
import tconstruct.weaponry.client.CrosshairType;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
@@ -8,12 +9,18 @@ import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.item.EnumAction;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.world.World;
|
||||
|
||||
import tconstruct.tools.TinkerTools;
|
||||
import mods.battlegear2.api.PlayerEventChild;
|
||||
import mods.battlegear2.api.weapons.IBattlegearWeapon;
|
||||
import net.minecraftforge.event.entity.player.PlayerInteractEvent;
|
||||
@Optional.InterfaceList({
|
||||
@Optional.Interface(modid = "battlegear2", iface = "mods.battlegear2.api.weapons.IBattlegearWeapon")
|
||||
})
|
||||
/**
|
||||
* Throwing weapons that utilize the ammo system on themselves.
|
||||
* Throwing knifes etc.
|
||||
*/
|
||||
public abstract class AmmoWeapon extends AmmoItem implements IAccuracy, IWindup {
|
||||
public abstract class AmmoWeapon extends AmmoItem implements IBattlegearWeapon, IAccuracy, IWindup {
|
||||
public AmmoWeapon(int baseDamage, String name) {
|
||||
super(baseDamage, name);
|
||||
}
|
||||
@@ -134,4 +141,53 @@ public abstract class AmmoWeapon extends AmmoItem implements IAccuracy, IWindup
|
||||
public float getZoom(ItemStack itemStack) {
|
||||
return 1.0f;
|
||||
}
|
||||
|
||||
/*---- Battlegear Support START ----*/
|
||||
|
||||
@Override
|
||||
@Optional.Method(modid = "battlegear2")
|
||||
public boolean sheatheOnBack(ItemStack item)
|
||||
{
|
||||
return true;
|
||||
}
|
||||
|
||||
@Override
|
||||
@Optional.Method(modid = "battlegear2")
|
||||
public boolean isOffhandHandDual(ItemStack off) {
|
||||
return true;
|
||||
}
|
||||
|
||||
@Override
|
||||
@Optional.Method(modid = "battlegear2")
|
||||
public boolean offhandAttackEntity(PlayerEventChild.OffhandAttackEvent event, ItemStack mainhandItem, ItemStack offhandItem) {
|
||||
return true;
|
||||
}
|
||||
|
||||
@Override
|
||||
@Optional.Method(modid = "battlegear2")
|
||||
public boolean offhandClickAir(PlayerInteractEvent event, ItemStack mainhandItem, ItemStack offhandItem) {
|
||||
onItemRightClick(offhandItem, event.entity.worldObj, event.entityPlayer);
|
||||
return true;
|
||||
}
|
||||
|
||||
@Override
|
||||
@Optional.Method(modid = "battlegear2")
|
||||
public boolean offhandClickBlock(PlayerInteractEvent event, ItemStack mainhandItem, ItemStack offhandItem) {
|
||||
return true;
|
||||
}
|
||||
|
||||
@Override
|
||||
@Optional.Method(modid = "battlegear2")
|
||||
public void performPassiveEffects(Side effectiveSide, ItemStack mainhandItem, ItemStack offhandItem) {
|
||||
// unused
|
||||
}
|
||||
|
||||
@Override
|
||||
@Optional.Method(modid = "battlegear2")
|
||||
public boolean allowOffhand(ItemStack mainhand, ItemStack offhand) {
|
||||
if(offhand == null)
|
||||
return true;
|
||||
return (mainhand != null && mainhand.getItem() != TinkerTools.cleaver && mainhand.getItem() != TinkerTools.battleaxe)
|
||||
&& (offhand.getItem() != TinkerTools.cleaver && offhand.getItem() != TinkerTools.battleaxe);
|
||||
}
|
||||
}
|
||||
@@ -15,6 +15,8 @@ import net.minecraft.init.Items;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.world.World;
|
||||
import tconstruct.library.crafting.ToolBuilder;
|
||||
import cpw.mods.fml.common.Loader;
|
||||
import mods.battlegear2.api.core.InventoryPlayerBattle;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
@@ -57,6 +59,14 @@ public abstract class BowBaseAmmo extends ProjectileWeapon {
|
||||
public ItemStack searchForAmmo(EntityPlayer player, ItemStack weapon)
|
||||
{
|
||||
// arrow priority: hotbar > inventory, tinker arrows > regular arrows
|
||||
if(Loader.isModLoaded("battlegear2")){
|
||||
ItemStack offhand = ((InventoryPlayerBattle) player.inventory).getCurrentOffhandWeapon();
|
||||
if(offhand != null && (checkTinkerArrow(offhand) || checkVanillaArrow(offhand)))
|
||||
{
|
||||
return offhand;
|
||||
}
|
||||
}
|
||||
|
||||
ItemStack[] inventory = player.inventory.mainInventory;
|
||||
|
||||
// check hotbar for tinker arrows
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
package tconstruct.library.weaponry;
|
||||
|
||||
import cpw.mods.fml.common.Optional;
|
||||
import net.minecraft.init.Items;
|
||||
import net.minecraft.util.StatCollector;
|
||||
import tconstruct.client.TProxyClient;
|
||||
@@ -23,17 +24,24 @@ import net.minecraftforge.event.entity.player.ArrowLooseEvent;
|
||||
import tconstruct.library.tools.AbilityHelper;
|
||||
import tconstruct.library.tools.ToolCore;
|
||||
import tconstruct.library.util.TextureHelper;
|
||||
import tconstruct.tools.TinkerTools;
|
||||
import tconstruct.weaponry.entity.ArrowEntity;
|
||||
import mods.battlegear2.api.PlayerEventChild;
|
||||
import mods.battlegear2.api.weapons.IBattlegearWeapon;
|
||||
import net.minecraftforge.event.entity.player.PlayerInteractEvent;
|
||||
|
||||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
@Optional.InterfaceList({
|
||||
@Optional.Interface(modid = "battlegear2", iface = "mods.battlegear2.api.weapons.IBattlegearWeapon")
|
||||
})
|
||||
/**
|
||||
* Weapons that utilize ammo that uses the ammo system to shoot projectiles.
|
||||
* Bows,...
|
||||
*/
|
||||
public abstract class ProjectileWeapon extends ToolCore implements IAccuracy, IWindup {
|
||||
public abstract class ProjectileWeapon extends ToolCore implements IBattlegearWeapon, IAccuracy, IWindup {
|
||||
public ProjectileWeapon(int baseDamage, String name) {
|
||||
super(baseDamage);
|
||||
|
||||
@@ -474,4 +482,54 @@ public abstract class ProjectileWeapon extends ToolCore implements IAccuracy, IW
|
||||
list.add(currentAmmo.getDisplayName());
|
||||
list.add(StatCollector.translateToLocal("attribute.name.ammo.maxAttackDamage") + ": " + TProxyClient.df.format(damage));
|
||||
}
|
||||
|
||||
/*---- Battlegear Support START ----*/
|
||||
|
||||
@Override
|
||||
@Optional.Method(modid = "battlegear2")
|
||||
public boolean sheatheOnBack(ItemStack item)
|
||||
{
|
||||
return true;
|
||||
}
|
||||
|
||||
@Override
|
||||
@Optional.Method(modid = "battlegear2")
|
||||
public boolean isOffhandHandDual(ItemStack off) {
|
||||
return true;
|
||||
}
|
||||
|
||||
@Override
|
||||
@Optional.Method(modid = "battlegear2")
|
||||
public boolean offhandAttackEntity(PlayerEventChild.OffhandAttackEvent event, ItemStack mainhandItem, ItemStack offhandItem) {
|
||||
return false;
|
||||
}
|
||||
|
||||
@Override
|
||||
@Optional.Method(modid = "battlegear2")
|
||||
public boolean offhandClickAir(PlayerInteractEvent event, ItemStack mainhandItem, ItemStack offhandItem) {
|
||||
return false;
|
||||
}
|
||||
|
||||
@Override
|
||||
@Optional.Method(modid = "battlegear2")
|
||||
public boolean offhandClickBlock(PlayerInteractEvent event, ItemStack mainhandItem, ItemStack offhandItem) {
|
||||
return false;
|
||||
}
|
||||
|
||||
@Override
|
||||
@Optional.Method(modid = "battlegear2")
|
||||
public void performPassiveEffects(Side effectiveSide, ItemStack mainhandItem, ItemStack offhandItem) {
|
||||
// unused
|
||||
}
|
||||
|
||||
@Override
|
||||
@Optional.Method(modid = "battlegear2")
|
||||
public boolean allowOffhand(ItemStack mainhand, ItemStack offhand) {
|
||||
if(offhand == null)
|
||||
return true;
|
||||
return (mainhand != null && mainhand.getItem() != TinkerTools.cleaver && mainhand.getItem() != TinkerTools.battleaxe)
|
||||
&& (offhand.getItem() != TinkerTools.cleaver && offhand.getItem() != TinkerTools.battleaxe);
|
||||
}
|
||||
|
||||
/*---- Battlegear Support END ----*/
|
||||
}
|
||||
@@ -23,6 +23,8 @@ import net.minecraft.world.World;
|
||||
import tconstruct.library.crafting.ToolBuilder;
|
||||
import tconstruct.library.tools.AbilityHelper;
|
||||
import tconstruct.tools.TinkerTools;
|
||||
import cpw.mods.fml.common.Loader;
|
||||
import mods.battlegear2.api.core.InventoryPlayerBattle;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
@@ -166,8 +168,14 @@ public class Crossbow extends ProjectileWeapon {
|
||||
// remove loaded item
|
||||
if(ammo.getItem() instanceof IAmmo)
|
||||
((IAmmo) ammo.getItem()).consumeAmmo(1, ammo);
|
||||
else
|
||||
player.inventory.consumeInventoryItem(ammo.getItem());
|
||||
else {
|
||||
if(Loader.isModLoaded("battlegear2")) {
|
||||
((InventoryPlayerBattle)player.inventory).consumeInventoryItem(ammo.getItem());
|
||||
}
|
||||
else {
|
||||
player.inventory.consumeInventoryItem(ammo.getItem());
|
||||
}
|
||||
}
|
||||
|
||||
playReloadSound(world, player, weapon, ammo);
|
||||
|
||||
@@ -248,6 +256,14 @@ public class Crossbow extends ProjectileWeapon {
|
||||
@Override
|
||||
public ItemStack searchForAmmo(EntityPlayer player, ItemStack weapon) {
|
||||
// arrow priority: hotbar > inventory, tinker arrows > regular arrows
|
||||
if(Loader.isModLoaded("battlegear2")){
|
||||
ItemStack offhand = ((InventoryPlayerBattle) player.inventory).getCurrentOffhandWeapon();
|
||||
if(offhand != null && (offhand.getItem() instanceof BoltAmmo) && ((IAmmo) offhand.getItem()).getAmmoCount(offhand) > 0)
|
||||
{
|
||||
return offhand;
|
||||
}
|
||||
}
|
||||
|
||||
ItemStack[] inventory = player.inventory.mainInventory;
|
||||
|
||||
// check hotbar for tinker arrows
|
||||
|
||||
Reference in new issue
Block a user