aboutsummaryrefslogtreecommitdiff
path: root/src/Java/gtPlusPlus/xmod/gregtech/api/items
diff options
context:
space:
mode:
authorDraknyte1 <Draknyte1@hotmail.com>2017-12-20 23:39:49 +1000
committerDraknyte1 <Draknyte1@hotmail.com>2017-12-20 23:39:49 +1000
commit5715a32d2901922503fd850f3a68503fb77467c3 (patch)
tree7e12520fbc23844e99493d55af4410a785538e35 /src/Java/gtPlusPlus/xmod/gregtech/api/items
parent2a4795f65d98ff60a177d7d6a5552fd687d9f6e8 (diff)
downloadGT5-Unofficial-5715a32d2901922503fd850f3a68503fb77467c3.tar.gz
GT5-Unofficial-5715a32d2901922503fd850f3a68503fb77467c3.tar.bz2
GT5-Unofficial-5715a32d2901922503fd850f3a68503fb77467c3.zip
- Disabled some logging.
% Minor Project Clean-up, added missing Override annotations to 100+ methods & removed pointless casts. % Moved Logging to it's own class. $ Fixed Multi-block handling of Pollution. $ Fixed the GT 5.09 material enabler system. (From My Side, it's still borked on GTs). + Added a Dynamic Proxy invocation for IMaterialHandler. + Added an AutoMap data type, which is a Auto-incremental ID'd Hashmap wrapper.
Diffstat (limited to 'src/Java/gtPlusPlus/xmod/gregtech/api/items')
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/api/items/Gregtech_MetaTool.java5
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/api/items/tools/GT_MetaGenTool.java5
2 files changed, 8 insertions, 2 deletions
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/items/Gregtech_MetaTool.java b/src/Java/gtPlusPlus/xmod/gregtech/api/items/Gregtech_MetaTool.java
index 89deeb931d..3d3dcee94c 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/api/items/Gregtech_MetaTool.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/api/items/Gregtech_MetaTool.java
@@ -1,7 +1,5 @@
package gtPlusPlus.xmod.gregtech.api.items;
-import static gregtech.api.enums.GT_Values.MOD_ID_RC;
-
import java.util.*;
import java.util.Map.Entry;
@@ -147,6 +145,7 @@ public abstract class Gregtech_MetaTool extends GT_MetaGenerated_Tool implements
}
+ @SuppressWarnings("unchecked")
public void addAdditionalToolTips(final List aList, final ItemStack aStack) {
final long tMaxDamage = getToolMaxDamage(aStack);
final Materials tMaterial = getPrimaryMaterial(aStack);
@@ -171,6 +170,8 @@ public abstract class Gregtech_MetaTool extends GT_MetaGenerated_Tool implements
}
}
+ @Override
+ @SuppressWarnings("unchecked")
public void addAdditionalToolTips(final List aList, final ItemStack aStack, final EntityPlayer aPlayer) {
final long tMaxDamage = getToolMaxDamage(aStack);
final Materials tMaterial = getPrimaryMaterial(aStack);
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/items/tools/GT_MetaGenTool.java b/src/Java/gtPlusPlus/xmod/gregtech/api/items/tools/GT_MetaGenTool.java
index a980a299d5..cf167888f3 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/api/items/tools/GT_MetaGenTool.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/api/items/tools/GT_MetaGenTool.java
@@ -339,6 +339,7 @@ public abstract class GT_MetaGenTool extends GT_MetaGenerated_Tool {
}
}
+ @Override
public boolean canWrench(final EntityPlayer player, final int x, final int y, final int z) {
System.out.println("canWrench");
if(player==null) {
@@ -354,6 +355,7 @@ public abstract class GT_MetaGenTool extends GT_MetaGenerated_Tool {
return (tStats != null) && tStats.isWrench();
}
+ @Override
public void wrenchUsed(final EntityPlayer player, final int x, final int y, final int z) {
if(player==null) {
return;
@@ -367,14 +369,17 @@ public abstract class GT_MetaGenTool extends GT_MetaGenerated_Tool {
}
}
+ @Override
public boolean canUse(final ItemStack stack, final EntityPlayer player, final int x, final int y, final int z){
return this.canWrench(player, x, y, z);
}
+ @Override
public void used(final ItemStack stack, final EntityPlayer player, final int x, final int y, final int z){
this.wrenchUsed(player, x, y, z);
}
+ @Override
public boolean shouldHideFacades(final ItemStack stack, final EntityPlayer player) {
if(player==null) {
return false;