diff options
Diffstat (limited to 'src/main/java/gregtech/common/items')
| -rw-r--r-- | src/main/java/gregtech/common/items/GT_MetaGenerated_Tool_01.java | 20 | ||||
| -rw-r--r-- | src/main/java/gregtech/common/items/behaviors/Behaviour_Cover_Tool.java | 10 |
2 files changed, 21 insertions, 9 deletions
diff --git a/src/main/java/gregtech/common/items/GT_MetaGenerated_Tool_01.java b/src/main/java/gregtech/common/items/GT_MetaGenerated_Tool_01.java index f7d9bbb236..14af94d70e 100644 --- a/src/main/java/gregtech/common/items/GT_MetaGenerated_Tool_01.java +++ b/src/main/java/gregtech/common/items/GT_MetaGenerated_Tool_01.java @@ -443,15 +443,17 @@ public class GT_MetaGenerated_Tool_01 extends GT_MetaGenerated_Tool { new TC_Aspects.TC_AspectStack(TC_Aspects.MACHINA, 4L), new TC_Aspects.TC_AspectStack(TC_Aspects.ORDO, 2L)), GregTech_API.sWrenchList); - addTool( - JACKHAMMER, - "JackHammer (HV)", - "Breaks Rocks into pieces", - new GT_Tool_JackHammer(), - ToolDictNames.craftingToolJackHammer, - new TC_Aspects.TC_AspectStack(TC_Aspects.MACHINA, 2L), - new TC_Aspects.TC_AspectStack(TC_Aspects.PERFODIO, 2L), - new TC_Aspects.TC_AspectStack(TC_Aspects.PERDITIO, 2L)); + GregTech_API.registerTool( + addTool( + JACKHAMMER, + "JackHammer (HV)", + "Breaks Rocks into pieces", + new GT_Tool_JackHammer(), + ToolDictNames.craftingToolJackHammer, + new TC_Aspects.TC_AspectStack(TC_Aspects.MACHINA, 2L), + new TC_Aspects.TC_AspectStack(TC_Aspects.PERFODIO, 2L), + new TC_Aspects.TC_AspectStack(TC_Aspects.PERDITIO, 2L)), + GregTech_API.sJackhammerList); addTool( BUZZSAW_LV, "Buzzsaw (LV)", diff --git a/src/main/java/gregtech/common/items/behaviors/Behaviour_Cover_Tool.java b/src/main/java/gregtech/common/items/behaviors/Behaviour_Cover_Tool.java index 5688872796..4241e07e4b 100644 --- a/src/main/java/gregtech/common/items/behaviors/Behaviour_Cover_Tool.java +++ b/src/main/java/gregtech/common/items/behaviors/Behaviour_Cover_Tool.java @@ -31,6 +31,7 @@ public class Behaviour_Cover_Tool extends Behaviour_None { private ISerializableObject mStoredData = GregTech_API.sNoBehavior.createDataObject(); private int mCoverType; + private int mTickRateAddition = 0; @Override public boolean onItemUseFirst(GT_MetaBase_Item aItem, ItemStack aStack, EntityPlayer aPlayer, World aWorld, int aX, @@ -65,6 +66,7 @@ public class Behaviour_Cover_Tool extends Behaviour_None { NBTBase tData = aNBT.getTag("mCoverData"); if (tData != null) mStoredData = tBehavior.createDataObject(tData); else mStoredData = GregTech_API.sNoBehavior.createDataObject(); + mTickRateAddition = aNBT.hasKey("mTickRateAddition") ? aNBT.getInteger("mTickRateAddition") : 0; } } @@ -72,6 +74,7 @@ public class Behaviour_Cover_Tool extends Behaviour_None { aNBT.setInteger("mCoverType", mCoverType); if (mStoredData == null) mStoredData = GregTech_API.sNoBehavior.createDataObject(); aNBT.setTag("mCoverData", mStoredData.saveDataToNBT()); + aNBT.setInteger("mTickRateAddition", mTickRateAddition); } @SuppressWarnings("rawtypes") @@ -116,6 +119,8 @@ public class Behaviour_Cover_Tool extends Behaviour_None { .allowsCopyPasteTool()) { mStoredData = tCoverable.getComplexCoverDataAtSide(tSide); mCoverType = tCoverable.getCoverIDAtSide(tSide); + mTickRateAddition = tCoverable.getCoverInfoAtSide(tSide) + .getTickRateAddition(); aList.add("Block Side: " + EnumChatFormatting.AQUA + tSide.name() + EnumChatFormatting.RESET); aList.add( @@ -126,16 +131,19 @@ public class Behaviour_Cover_Tool extends Behaviour_None { } else { mStoredData = GregTech_API.sNoBehavior.createDataObject(); mCoverType = 0; + mTickRateAddition = 0; aList.add("Copy unavailable for this cover type"); } } else { mStoredData = GregTech_API.sNoBehavior.createDataObject(); mCoverType = 0; + mTickRateAddition = 0; aList.add("No Cover Found"); } } else { mStoredData = GregTech_API.sNoBehavior.createDataObject(); mCoverType = 0; + mTickRateAddition = 0; aList.add("No Cover Found"); } } @@ -155,6 +163,8 @@ public class Behaviour_Cover_Tool extends Behaviour_None { int tCoverID = tCoverable.getCoverIDAtSide(tSide); if (tCoverID == mCoverType) { tCoverable.setCoverDataAtSide(tSide, mStoredData); + tCoverable.getCoverInfoAtSide(tSide) + .setTickRateAddition(mTickRateAddition); GT_Utility.sendChatToPlayer(aPlayer, "Cover Data Pasted."); } else { GT_Utility.sendChatToPlayer(aPlayer, "Not Matched Cover."); |