From 1209f95bc278f81de4143a619696048c655313e8 Mon Sep 17 00:00:00 2001 From: Blood-Asp Date: Sat, 16 May 2015 02:51:56 +0200 Subject: update 5.08.13 Turbine items and achievements --- .../gregtech/common/tools/GT_Tool_Chainsaw_LV.java | 11 +++++++++- .../gregtech/common/tools/GT_Tool_Drill_HV.java | 7 ++++++ .../gregtech/common/tools/GT_Tool_Drill_LV.java | 1 + .../gregtech/common/tools/GT_Tool_HardHammer.java | 10 ++++++++- .../gregtech/common/tools/GT_Tool_JackHammer.java | 7 ++++++ .../gregtech/common/tools/GT_Tool_Pickaxe.java | 1 + .../gregtech/common/tools/GT_Tool_Turbine.java | 25 ++++++++++++++++++++++ .../common/tools/GT_Tool_Turbine_Huge.java | 7 ++++++ .../common/tools/GT_Tool_Turbine_Large.java | 7 ++++++ .../common/tools/GT_Tool_Turbine_Normal.java | 7 ++++++ .../common/tools/GT_Tool_Turbine_Small.java | 7 ++++++ .../common/tools/GT_Tool_UniversalSpade.java | 6 +++++- 12 files changed, 93 insertions(+), 3 deletions(-) create mode 100644 main/java/gregtech/common/tools/GT_Tool_Turbine.java create mode 100644 main/java/gregtech/common/tools/GT_Tool_Turbine_Huge.java create mode 100644 main/java/gregtech/common/tools/GT_Tool_Turbine_Large.java create mode 100644 main/java/gregtech/common/tools/GT_Tool_Turbine_Normal.java create mode 100644 main/java/gregtech/common/tools/GT_Tool_Turbine_Small.java (limited to 'main/java/gregtech/common/tools') diff --git a/main/java/gregtech/common/tools/GT_Tool_Chainsaw_LV.java b/main/java/gregtech/common/tools/GT_Tool_Chainsaw_LV.java index 391177bd66..66bed7d5bf 100644 --- a/main/java/gregtech/common/tools/GT_Tool_Chainsaw_LV.java +++ b/main/java/gregtech/common/tools/GT_Tool_Chainsaw_LV.java @@ -1,6 +1,7 @@ /* 1: */ package gregtech.common.tools; /* 2: */ -/* 3: */ import gregtech.api.GregTech_API; +/* 3: */ import gregtech.GT_Mod; +import gregtech.api.GregTech_API; /* 4: */ import gregtech.api.enums.Materials; import gregtech.api.enums.Textures; /* 5: */ import gregtech.api.enums.Textures.ItemIcons; @@ -10,6 +11,7 @@ import gregtech.api.enums.Textures; /* 8: */ import java.util.Map; /* 9: */ import net.minecraft.entity.EntityLivingBase; +import net.minecraft.entity.player.EntityPlayer; /* 10: */ import net.minecraft.item.ItemStack; /* 11: */ import net.minecraft.util.ChatComponentText; /* 12: */ import net.minecraft.util.EnumChatFormatting; @@ -87,6 +89,13 @@ import gregtech.api.enums.Textures; /* 84: */ { /* 85:82 */ return true; /* 86: */ } + + public void onToolCrafted(ItemStack aStack, EntityPlayer aPlayer) +/* 117: */ { +/* 118:117 */ super.onToolCrafted(aStack, aPlayer); + GT_Mod.achievements.issueAchievement(aPlayer, "brrrr"); +/* 121: */ } + /* 87: */ /* 88: */ public IIconContainer getIcon(boolean aIsToolHead, ItemStack aStack) /* 89: */ { diff --git a/main/java/gregtech/common/tools/GT_Tool_Drill_HV.java b/main/java/gregtech/common/tools/GT_Tool_Drill_HV.java index a71722a17d..bdf696c0c8 100644 --- a/main/java/gregtech/common/tools/GT_Tool_Drill_HV.java +++ b/main/java/gregtech/common/tools/GT_Tool_Drill_HV.java @@ -5,6 +5,7 @@ import gregtech.api.enums.Textures; /* 4: */ import gregtech.api.enums.Textures.ItemIcons; /* 5: */ import gregtech.api.interfaces.IIconContainer; /* 6: */ import gregtech.common.GT_Proxy; +import net.minecraft.entity.player.EntityPlayer; /* 7: */ import net.minecraft.item.ItemStack; /* 8: */ /* 9: */ public class GT_Tool_Drill_HV @@ -49,6 +50,12 @@ import gregtech.api.enums.Textures; /* 48: */ { /* 49:48 */ return 4.0F; /* 50: */ } + + public void onToolCrafted(ItemStack aStack, EntityPlayer aPlayer) +/* 117: */ { +/* 118:117 */ super.onToolCrafted(aStack, aPlayer); + GT_Mod.achievements.issueAchievement(aPlayer, "highpowerdrill"); +/* 121: */ } /* 51: */ /* 52: */ public IIconContainer getIcon(boolean aIsToolHead, ItemStack aStack) /* 53: */ { diff --git a/main/java/gregtech/common/tools/GT_Tool_Drill_LV.java b/main/java/gregtech/common/tools/GT_Tool_Drill_LV.java index 941b3c037b..625f20593c 100644 --- a/main/java/gregtech/common/tools/GT_Tool_Drill_LV.java +++ b/main/java/gregtech/common/tools/GT_Tool_Drill_LV.java @@ -122,6 +122,7 @@ import gregtech.api.enums.Textures; /* 119:118 */ super.onToolCrafted(aStack, aPlayer); /* 120:119 */ aPlayer.triggerAchievement(AchievementList.buildPickaxe); /* 121:120 */ aPlayer.triggerAchievement(AchievementList.buildBetterPickaxe); + GT_Mod.achievements.issueAchievement(aPlayer, "driltime"); /* 122: */ } /* 123: */ /* 124: */ public IChatComponent getDeathMessage(EntityLivingBase aPlayer, EntityLivingBase aEntity) diff --git a/main/java/gregtech/common/tools/GT_Tool_HardHammer.java b/main/java/gregtech/common/tools/GT_Tool_HardHammer.java index 67cb45ff24..eeb323f8be 100644 --- a/main/java/gregtech/common/tools/GT_Tool_HardHammer.java +++ b/main/java/gregtech/common/tools/GT_Tool_HardHammer.java @@ -1,6 +1,7 @@ /* 1: */ package gregtech.common.tools; /* 2: */ -/* 3: */ import gregtech.api.GregTech_API; +/* 3: */ import gregtech.GT_Mod; +import gregtech.api.GregTech_API; /* 4: */ import gregtech.api.enums.Materials; /* 5: */ import gregtech.api.interfaces.IIconContainer; /* 6: */ import gregtech.api.items.GT_MetaGenerated_Tool; @@ -20,6 +21,7 @@ /* 18: */ import net.minecraft.entity.monster.EntityIronGolem; /* 19: */ import net.minecraft.entity.player.EntityPlayer; /* 20: */ import net.minecraft.item.ItemStack; +import net.minecraft.stats.AchievementList; /* 21: */ import net.minecraft.util.ChatComponentText; /* 22: */ import net.minecraft.util.EnumChatFormatting; /* 23: */ import net.minecraft.util.IChatComponent; @@ -179,6 +181,12 @@ import net.minecraftforge.event.world.BlockEvent; /* 176: */ { /* 177:173 */ return new ChatComponentText(EnumChatFormatting.RED + aEntity.getCommandSenderName() + EnumChatFormatting.WHITE + " was squashed by " + EnumChatFormatting.GREEN + aPlayer.getCommandSenderName() + EnumChatFormatting.WHITE); /* 178: */ } + + public void onToolCrafted(ItemStack aStack, EntityPlayer aPlayer) +/* 117: */ { +/* 118:117 */ super.onToolCrafted(aStack, aPlayer); + GT_Mod.achievements.issueAchievement(aPlayer, "tools"); +/* 121: */ } /* 179: */ } diff --git a/main/java/gregtech/common/tools/GT_Tool_JackHammer.java b/main/java/gregtech/common/tools/GT_Tool_JackHammer.java index 17f8c6be64..cb50cfbd8d 100644 --- a/main/java/gregtech/common/tools/GT_Tool_JackHammer.java +++ b/main/java/gregtech/common/tools/GT_Tool_JackHammer.java @@ -101,6 +101,13 @@ import net.minecraftforge.event.world.BlockEvent; /* 97: */ } /* 98: 91 */ return rConversions; /* 99: */ } + + public void onToolCrafted(ItemStack aStack, EntityPlayer aPlayer) +/* 117: */ { +/* 118:117 */ super.onToolCrafted(aStack, aPlayer); + GT_Mod.achievements.issueAchievement(aPlayer, "hammertime"); +/* 121: */ } + /* 100: */ /* 101: */ public IIconContainer getIcon(boolean aIsToolHead, ItemStack aStack) /* 102: */ { diff --git a/main/java/gregtech/common/tools/GT_Tool_Pickaxe.java b/main/java/gregtech/common/tools/GT_Tool_Pickaxe.java index e4bca9b7af..d535fd4a48 100644 --- a/main/java/gregtech/common/tools/GT_Tool_Pickaxe.java +++ b/main/java/gregtech/common/tools/GT_Tool_Pickaxe.java @@ -118,6 +118,7 @@ /* 118:117 */ super.onToolCrafted(aStack, aPlayer); /* 119:118 */ aPlayer.triggerAchievement(AchievementList.buildPickaxe); /* 120:119 */ aPlayer.triggerAchievement(AchievementList.buildBetterPickaxe); + GT_Mod.achievements.issueAchievement(aPlayer, "flintpick"); /* 121: */ } /* 122: */ /* 123: */ public IChatComponent getDeathMessage(EntityLivingBase aPlayer, EntityLivingBase aEntity) diff --git a/main/java/gregtech/common/tools/GT_Tool_Turbine.java b/main/java/gregtech/common/tools/GT_Tool_Turbine.java new file mode 100644 index 0000000000..bf79012661 --- /dev/null +++ b/main/java/gregtech/common/tools/GT_Tool_Turbine.java @@ -0,0 +1,25 @@ +package gregtech.common.tools; + +import gregtech.api.enums.Textures; +import gregtech.api.interfaces.IIconContainer; +import gregtech.api.items.GT_MetaGenerated_Tool; +import net.minecraft.block.Block; +import net.minecraft.entity.EntityLivingBase; +import net.minecraft.item.ItemStack; +import net.minecraft.util.ChatComponentText; +import net.minecraft.util.EnumChatFormatting; +import net.minecraft.util.IChatComponent; + +public abstract class GT_Tool_Turbine extends GT_Tool{ + public abstract float getBaseDamage(); + @Override public boolean isMinableBlock(Block aBlock, byte aMetaData) {return false;} + @Override public IIconContainer getIcon(boolean aIsToolHead, ItemStack aStack) {return aIsToolHead ? Textures.ItemIcons.TURBINE : null;} + @Override public short[] getRGBa(boolean aIsToolHead, ItemStack aStack) {return aIsToolHead ? GT_MetaGenerated_Tool.getPrimaryMaterial(aStack).mRGBa : null;} + public IChatComponent getDeathMessage(EntityLivingBase aPlayer, EntityLivingBase aEntity) + { + return new ChatComponentText(EnumChatFormatting.GREEN + aPlayer.getCommandSenderName() + EnumChatFormatting.WHITE + " put " + EnumChatFormatting.RED + + aEntity.getCommandSenderName()+"s" + EnumChatFormatting.WHITE + " head into a turbine"); + } + public abstract float getSpeedMultiplier(); + public abstract float getMaxDurabilityMultiplier(); +} diff --git a/main/java/gregtech/common/tools/GT_Tool_Turbine_Huge.java b/main/java/gregtech/common/tools/GT_Tool_Turbine_Huge.java new file mode 100644 index 0000000000..0bf3b783a5 --- /dev/null +++ b/main/java/gregtech/common/tools/GT_Tool_Turbine_Huge.java @@ -0,0 +1,7 @@ +package gregtech.common.tools; + +public class GT_Tool_Turbine_Huge extends GT_Tool_Turbine { + @Override public float getSpeedMultiplier() {return 4.0F;} + @Override public float getMaxDurabilityMultiplier() {return 4.0F;} + @Override public float getBaseDamage() {return 3.0F;} +} diff --git a/main/java/gregtech/common/tools/GT_Tool_Turbine_Large.java b/main/java/gregtech/common/tools/GT_Tool_Turbine_Large.java new file mode 100644 index 0000000000..57947aea7a --- /dev/null +++ b/main/java/gregtech/common/tools/GT_Tool_Turbine_Large.java @@ -0,0 +1,7 @@ +package gregtech.common.tools; + +public class GT_Tool_Turbine_Large extends GT_Tool_Turbine { + @Override public float getSpeedMultiplier() {return 3.0F;} + @Override public float getMaxDurabilityMultiplier() {return 3.0F;} + @Override public float getBaseDamage() {return 5.0F;} +} diff --git a/main/java/gregtech/common/tools/GT_Tool_Turbine_Normal.java b/main/java/gregtech/common/tools/GT_Tool_Turbine_Normal.java new file mode 100644 index 0000000000..8327a74332 --- /dev/null +++ b/main/java/gregtech/common/tools/GT_Tool_Turbine_Normal.java @@ -0,0 +1,7 @@ +package gregtech.common.tools; + +public class GT_Tool_Turbine_Normal extends GT_Tool_Turbine { + @Override public float getSpeedMultiplier() {return 2.0F;} + @Override public float getMaxDurabilityMultiplier() {return 2.0F;} + @Override public float getBaseDamage() {return 2.5F;} +} diff --git a/main/java/gregtech/common/tools/GT_Tool_Turbine_Small.java b/main/java/gregtech/common/tools/GT_Tool_Turbine_Small.java new file mode 100644 index 0000000000..fb93a2b290 --- /dev/null +++ b/main/java/gregtech/common/tools/GT_Tool_Turbine_Small.java @@ -0,0 +1,7 @@ +package gregtech.common.tools; + +public class GT_Tool_Turbine_Small extends GT_Tool_Turbine { + @Override public float getSpeedMultiplier() {return 1.0F;} + @Override public float getMaxDurabilityMultiplier() {return 1.0F;} + @Override public float getBaseDamage() {return 0.0F;} +} diff --git a/main/java/gregtech/common/tools/GT_Tool_UniversalSpade.java b/main/java/gregtech/common/tools/GT_Tool_UniversalSpade.java index 78c4fecb4c..431654124d 100644 --- a/main/java/gregtech/common/tools/GT_Tool_UniversalSpade.java +++ b/main/java/gregtech/common/tools/GT_Tool_UniversalSpade.java @@ -1,11 +1,14 @@ /* 1: */ package gregtech.common.tools; /* 2: */ -/* 3: */ import gregtech.api.GregTech_API; +/* 3: */ import gregtech.GT_Mod; +import gregtech.api.GregTech_API; /* 4: */ import gregtech.api.enums.Materials; /* 5: */ import gregtech.api.interfaces.IIconContainer; /* 6: */ import gregtech.api.items.GT_MetaGenerated_Tool; /* 7: */ import gregtech.common.items.behaviors.Behaviour_Crowbar; + /* 8: */ import java.util.Map; + /* 9: */ import net.minecraft.block.Block; /* 10: */ import net.minecraft.block.material.Material; /* 11: */ import net.minecraft.entity.EntityLivingBase; @@ -124,6 +127,7 @@ /* 124: */ { /* 125:122 */ super.onToolCrafted(aStack, aPlayer); /* 126:123 */ aPlayer.triggerAchievement(AchievementList.buildSword); + GT_Mod.achievements.issueAchievement(aPlayer, "unitool"); /* 127: */ } /* 128: */ /* 129: */ public IChatComponent getDeathMessage(EntityLivingBase aPlayer, EntityLivingBase aEntity) -- cgit