Sangui/GT5-Unofficial
2
1
Fork 0
Code Issues 6 Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #1001 from Exidex/patch-2

Browse source 
Fixed right click behavior.
This commit is contained in:
Archengius 2017-04-02 23:26:20 +07:00 committed by GitHub
commit 09f3b407ad
2 changed files with 35 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

47
src/main/java/gregtech/api/items/GT_MetaBase_Item.java
View file

@ -123,12 +123,14 @@ public abstract class GT_MetaBase_Item extends GT_Generic_Item implements ISpeci
use(aStack, 0, aPlayer);
isItemStackUsable(aStack);
ArrayList<IItemBehaviour<GT_MetaBase_Item>> tList = mItemBehaviors.get((short) getDamage(aStack));
if (tList != null)
for (IItemBehaviour<GT_MetaBase_Item> tBehavior : tList)
if (tList != null) {
for (IItemBehaviour<GT_MetaBase_Item> tBehavior : tList) {
if (tBehavior.onLeftClickEntity(this, aStack, aPlayer, aEntity, aPlayer.getActiveHand())) {
if (aStack.stackSize <= 0) aPlayer.setItemStackToSlot(EntityEquipmentSlot.MAINHAND, null);
return true;
}
}
}
if (aStack.stackSize <= 0) {
aPlayer.setItemStackToSlot(EntityEquipmentSlot.MAINHAND, null);
return false;
@ -143,16 +145,19 @@ public abstract class GT_MetaBase_Item extends GT_Generic_Item implements ISpeci
use(aStack, 0, aPlayer);
isItemStackUsable(aStack);
ArrayList<IItemBehaviour<GT_MetaBase_Item>> tList = mItemBehaviors.get((short) getDamage(aStack));
if (tList != null) for (IItemBehaviour<GT_MetaBase_Item> tBehavior : tList)
if (tBehavior.onItemUse(this, aStack, aPlayer, aWorld, blockPos, aSide, hitX, hitY, hitZ, hand)) {
if (aStack.stackSize <= 0) aPlayer.setHeldItem(hand, null);
return EnumActionResult.SUCCESS;
if (tList != null) {
for (IItemBehaviour<GT_MetaBase_Item> tBehavior : tList) {
if (tBehavior.onItemUse(this, aStack, aPlayer, aWorld, blockPos, aSide, hitX, hitY, hitZ, hand)) {
if (aStack.stackSize <= 0) aPlayer.setHeldItem(hand, null);
return EnumActionResult.SUCCESS;
}
}
}
if (aStack.stackSize <= 0) {
aPlayer.setHeldItem(hand, null);
return EnumActionResult.SUCCESS;
}
return EnumActionResult.SUCCESS;
return EnumActionResult.PASS;
}
@ -163,19 +168,19 @@ public abstract class GT_MetaBase_Item extends GT_Generic_Item implements ISpeci
@Override
public EnumActionResult onItemUseFirst(ItemStack aStack, EntityPlayer aPlayer, World aWorld, BlockPos pos, EnumFacing side, float hitX, float hitY, float hitZ, EnumHand hand) {
if(!aWorld.isRemote) {
use(aStack, 0, aPlayer);
ArrayList<IItemBehaviour<GT_MetaBase_Item>> tList = mItemBehaviors.get((short) getDamage(aStack));
if (tList != null) for (IItemBehaviour<GT_MetaBase_Item> tBehavior : tList)
use(aStack, 0, aPlayer);
ArrayList<IItemBehaviour<GT_MetaBase_Item>> tList = mItemBehaviors.get((short) getDamage(aStack));
if (tList != null) {
for (IItemBehaviour<GT_MetaBase_Item> tBehavior : tList) {
if (tBehavior.onItemUseFirst(this, aStack, aPlayer, aWorld, pos, side, hitX, hitY, hitZ, hand)) {
if (aStack.stackSize <= 0) aPlayer.setHeldItem(hand, null);
return EnumActionResult.PASS;
return EnumActionResult.SUCCESS;
}
if (aStack.stackSize <= 0) {
aPlayer.setHeldItem(hand, null);
return EnumActionResult.PASS;
}
return EnumActionResult.PASS;
}
if (aStack.stackSize <= 0) {
aPlayer.setHeldItem(hand, null);
return EnumActionResult.SUCCESS;
}
return EnumActionResult.PASS;
}
@ -187,8 +192,11 @@ public abstract class GT_MetaBase_Item extends GT_Generic_Item implements ISpeci
use(aStack, 0, aPlayer);
isItemStackUsable(aStack);
ArrayList<IItemBehaviour<GT_MetaBase_Item>> tList = mItemBehaviors.get((short) getDamage(aStack));
if (tList != null) for (IItemBehaviour<GT_MetaBase_Item> tBehavior : tList)
aStack = tBehavior.onItemRightClick(this, aStack, aWorld, aPlayer, hand);
if (tList != null) {
for (IItemBehaviour<GT_MetaBase_Item> tBehavior : tList) {
aStack = tBehavior.onItemRightClick(this, aStack, aWorld, aPlayer, hand);
}
}
return ActionResult.newResult(EnumActionResult.PASS, aStack);
}
@ -197,8 +205,7 @@ public abstract class GT_MetaBase_Item extends GT_Generic_Item implements ISpeci
String tKey = getUnlocalizedName(aStack) + ".tooltip", tString = GT_LanguageManager.getTranslation(tKey);
if (GT_Utility.isStringValid(tString) && !tKey.equals(tString)) aList.add(tString);
Long[]
tStats = getElectricStats(aStack);
Long[] tStats = getElectricStats(aStack);
if (tStats != null) {
if (tStats[3] > 0) {
aList.add(TextFormatting.AQUA + "Contains " + GT_Utility.formatNumbers(tStats[3]) + " EU Tier: " + (tStats[2] >= 0 ? tStats[2] : 0) + TextFormatting.GRAY);

10
src/main/java/gregtech/api/items/GT_MetaGenerated_Item.java
View file

@ -289,8 +289,14 @@ public abstract class GT_MetaGenerated_Item extends GT_MetaBase_Item {
@Override
public ActionResult<ItemStack> onItemRightClick(ItemStack aStack, World aWorld, EntityPlayer aPlayer, EnumHand hand) {
IFoodStat tStat = mFoodStats.get((short) getDamage(aStack));
if (tStat != null && aPlayer.canEat(tStat.alwaysEdible(this, aStack, aPlayer)))
return ActionResult.newResult(EnumActionResult.PASS, aStack);
if (tStat != null) {
if (aPlayer.canEat(tStat.alwaysEdible(this, aStack, aPlayer))) {
aPlayer.setActiveHand(hand);
return ActionResult.newResult(EnumActionResult.SUCCESS, aStack);
} else {
return ActionResult.newResult(EnumActionResult.FAIL, aStack);
}
}
return super.onItemRightClick(aStack, aWorld, aPlayer, hand);
}