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

GT Wrench now implements Buildcrafts Wrench IToolWrench

Browse source
This commit is contained in:
Blood-Asp 2015-10-25 23:56:58 +01:00
parent 1e425e6622
commit 8d8594dabd
4 changed files with 35 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/main/java/gregtech/api/interfaces/IToolStats.java
View file

@ -98,10 +98,15 @@ public interface IToolStats {
public boolean isCrowbar();
/**
* @return If this Tool can be used as an RC Crowbar.
* @return If this Tool can be used as an FR Grafter.
*/
public boolean isGrafter();
/**
* @return If this Tool can be used as an BC Wrench.
*/
public boolean isWrench();
/**
* @return If this Tool can be used as Weapon i.e. if that is the main purpose.
*/

23
src/main/java/gregtech/api/items/GT_MetaGenerated_Tool.java
View file

@ -1,5 +1,6 @@
package gregtech.api.items;
import buildcraft.api.tools.IToolWrench;
import cpw.mods.fml.common.Optional;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
@ -51,8 +52,8 @@ import static gregtech.api.enums.GT_Values.MOD_ID_RC;
* This is an example on how you can create a Tool ItemStack, in this case a Bismuth Wrench:
* GT_MetaGenerated_Tool.sInstances.get("gt.metatool.01").getToolWithStats(16, 1, Materials.Bismuth, Materials.Bismuth, null);
*/
@Optional.InterfaceList(value = {@Optional.Interface(iface = "forestry.api.arboriculture.IToolGrafter", modid = MOD_ID_FR), @Optional.Interface(iface = "mods.railcraft.api.core.items.IToolCrowbar", modid = MOD_ID_RC)})
public abstract class GT_MetaGenerated_Tool extends GT_MetaBase_Item implements IDamagableItem, IToolGrafter, IToolCrowbar {
@Optional.InterfaceList(value = {@Optional.Interface(iface = "forestry.api.arboriculture.IToolGrafter", modid = MOD_ID_FR), @Optional.Interface(iface = "mods.railcraft.api.core.items.IToolCrowbar", modid = MOD_ID_RC), @Optional.Interface(iface = "buildcraft.api.tools.IToolWrench", modid = "BuildCraft")})
public abstract class GT_MetaGenerated_Tool extends GT_MetaBase_Item implements IDamagableItem, IToolGrafter, IToolCrowbar, IToolWrench {
/**
* All instances of this Item Class are listed here.
* This gets used to register the Renderer to all Items of this Type, if useStandardMetaItemRenderer() returns true.
@ -456,6 +457,24 @@ public abstract class GT_MetaGenerated_Tool extends GT_MetaBase_Item implements
IToolStats tStats = getToolStats(aStack);
if (tStats != null) doDamage(aStack, tStats.getToolDamagePerEntityAttack());
}
@Override
public boolean canWrench(EntityPlayer player, int x, int y, int z) {
System.out.println("canWrench");
if(player==null)return false;
if(player.getCurrentEquippedItem()==null)return false;
if (!isItemStackUsable(player.getCurrentEquippedItem())) return false;
IToolStats tStats = getToolStats(player.getCurrentEquippedItem());
return tStats != null && tStats.isCrowbar();
}
@Override
public void wrenchUsed(EntityPlayer player, int x, int y, int z) {
if(player==null)return;
if(player.getCurrentEquippedItem()==null)return;
IToolStats tStats = getToolStats(player.getCurrentEquippedItem());
if (tStats != null) doDamage(player.getCurrentEquippedItem(), tStats.getToolDamagePerEntityAttack());
}
@Override
public boolean canLink(EntityPlayer aPlayer, ItemStack aStack, EntityMinecart cart) {

4
src/main/java/gregtech/common/tools/GT_Tool.java
View file

@ -84,6 +84,10 @@ public abstract class GT_Tool
public boolean isGrafter() {
return false;
}
public boolean isWrench() {
return false;
}
public boolean isWeapon() {
return false;

4
src/main/java/gregtech/common/tools/GT_Tool_Wrench.java
View file

@ -90,6 +90,10 @@ public class GT_Tool_Wrench
return false;
}
public boolean isWrench() {
return true;
}
public boolean isMinableBlock(Block aBlock, byte aMetaData) {
String tTool = aBlock.getHarvestTool(aMetaData);
return ((tTool != null) && (tTool.equals("wrench"))) || (aBlock.getMaterial() == Material.piston) || (aBlock == Blocks.hopper) || (aBlock == Blocks.dispenser) || (aBlock == Blocks.dropper);