From 74464417fd78c389b9d84173a7f9aeb4443ae0b6 Mon Sep 17 00:00:00 2001 From: Léa Gris Date: Sat, 23 Jul 2022 13:21:54 +0200 Subject: add(api/enums): particle and sound effect enumerations (#1154) * add(api/enums): particle and sound effect enumerations - Adds new GregTech API enumerations: - `ParticleFX`: Enumerates known EntityFX particles. - `SoundResource`: Enumerates known sounds with, id and ResourceLocation. - Refactors code to use the new enumerations instead of string literals. - Uses `ParticleFX` and `onRandomDisplayTick` to improve or implement new particle effects for these machines: - BBF: Adds random flames in front of the firebox. - Steam machines: Changes pressure-exhaust particles to white vapour, rather than dark smoke. - Magic Energy Absorber: Adds random effect, of absorbed magical purple particles, by the EnderDragon Egg siphon. - Forge Hammer: Adds sparse random sparks, ejected from the main face. --- src/main/java/gregtech/common/tools/GT_Tool.java | 8 ++++---- .../java/gregtech/common/tools/GT_Tool_Axe.java | 7 +------ .../gregtech/common/tools/GT_Tool_BuzzSaw.java | 13 ++++-------- .../gregtech/common/tools/GT_Tool_Chainsaw_LV.java | 24 +++++++++------------- .../gregtech/common/tools/GT_Tool_Crowbar.java | 13 ++++-------- .../gregtech/common/tools/GT_Tool_Drill_LV.java | 14 ++++++------- .../java/gregtech/common/tools/GT_Tool_File.java | 6 ------ .../gregtech/common/tools/GT_Tool_HardHammer.java | 14 +++++++------ .../java/gregtech/common/tools/GT_Tool_Hoe.java | 6 ------ .../java/gregtech/common/tools/GT_Tool_Mortar.java | 6 ------ .../gregtech/common/tools/GT_Tool_Pickaxe.java | 6 ------ .../gregtech/common/tools/GT_Tool_Plunger.java | 13 ++++-------- .../java/gregtech/common/tools/GT_Tool_Saw.java | 6 ------ .../java/gregtech/common/tools/GT_Tool_Scoop.java | 6 ------ .../gregtech/common/tools/GT_Tool_Screwdriver.java | 9 ++------ .../java/gregtech/common/tools/GT_Tool_Shovel.java | 6 ------ .../gregtech/common/tools/GT_Tool_SoftHammer.java | 13 ++++-------- .../common/tools/GT_Tool_Soldering_Iron.java | 9 ++------ .../java/gregtech/common/tools/GT_Tool_Sword.java | 6 ------ .../common/tools/GT_Tool_UniversalSpade.java | 8 +------- .../gregtech/common/tools/GT_Tool_WireCutter.java | 11 +++------- .../java/gregtech/common/tools/GT_Tool_Wrench.java | 13 ++++-------- 22 files changed, 58 insertions(+), 159 deletions(-) (limited to 'src/main/java/gregtech/common/tools') diff --git a/src/main/java/gregtech/common/tools/GT_Tool.java b/src/main/java/gregtech/common/tools/GT_Tool.java index 198ee4fb5a..3fa80a9f0a 100644 --- a/src/main/java/gregtech/common/tools/GT_Tool.java +++ b/src/main/java/gregtech/common/tools/GT_Tool.java @@ -1,7 +1,7 @@ package gregtech.common.tools; -import gregtech.api.GregTech_API; import gregtech.api.damagesources.GT_DamageSources; +import gregtech.api.enums.SoundResource; import gregtech.api.interfaces.IToolStats; import gregtech.api.items.GT_MetaGenerated_Tool; import net.minecraft.block.Block; @@ -77,7 +77,7 @@ public abstract class GT_Tool implements IToolStats { @Override public String getBreakingSound() { - return (String) GregTech_API.sSoundList.get(Integer.valueOf(0)); + return SoundResource.RANDOM_BREAK.toString(); } @Override @@ -99,12 +99,12 @@ public abstract class GT_Tool implements IToolStats { public boolean isGrafter() { return false; } - + @Override public boolean isChainsaw(){ return false; } - + @Override public boolean isWrench() { return false; diff --git a/src/main/java/gregtech/common/tools/GT_Tool_Axe.java b/src/main/java/gregtech/common/tools/GT_Tool_Axe.java index 15240341c5..302ea9867f 100644 --- a/src/main/java/gregtech/common/tools/GT_Tool_Axe.java +++ b/src/main/java/gregtech/common/tools/GT_Tool_Axe.java @@ -69,11 +69,6 @@ public class GT_Tool_Axe extends GT_Tool { return null; } - @Override - public String getBreakingSound() { - return (String) GregTech_API.sSoundList.get(0); - } - @Override public String getMiningSound() { return null; @@ -114,7 +109,7 @@ public class GT_Tool_Axe extends GT_Tool { } return rAmount; } - + @Override public float getMiningSpeed(Block aBlock, byte aMetaData, float aDefault, EntityPlayer aPlayer, World aWorld, int aX, int aY, int aZ) { diff --git a/src/main/java/gregtech/common/tools/GT_Tool_BuzzSaw.java b/src/main/java/gregtech/common/tools/GT_Tool_BuzzSaw.java index f0a3169c7a..cbdb1871cc 100644 --- a/src/main/java/gregtech/common/tools/GT_Tool_BuzzSaw.java +++ b/src/main/java/gregtech/common/tools/GT_Tool_BuzzSaw.java @@ -1,6 +1,6 @@ package gregtech.common.tools; -import gregtech.api.GregTech_API; +import gregtech.api.enums.SoundResource; import gregtech.api.enums.Textures; import gregtech.api.interfaces.IIconContainer; import gregtech.api.items.GT_MetaGenerated_Tool; @@ -34,22 +34,17 @@ public class GT_Tool_BuzzSaw extends GT_Tool_Saw { @Override public String getCraftingSound() { - return (String) GregTech_API.sSoundList.get(104); + return SoundResource.IC2_TOOLS_CHAINSAW_CHAINSAW_USE_ONE.toString(); } @Override public String getEntityHitSound() { - return (String) GregTech_API.sSoundList.get(105); - } - - @Override - public String getBreakingSound() { - return (String) GregTech_API.sSoundList.get(0); + return SoundResource.IC2_TOOLS_CHAINSAW_CHAINSAW_USE_TWO.toString(); } @Override public String getMiningSound() { - return (String) GregTech_API.sSoundList.get(104); + return SoundResource.IC2_TOOLS_CHAINSAW_CHAINSAW_USE_ONE.toString(); } @Override diff --git a/src/main/java/gregtech/common/tools/GT_Tool_Chainsaw_LV.java b/src/main/java/gregtech/common/tools/GT_Tool_Chainsaw_LV.java index f746f7e43f..b796fb6fce 100644 --- a/src/main/java/gregtech/common/tools/GT_Tool_Chainsaw_LV.java +++ b/src/main/java/gregtech/common/tools/GT_Tool_Chainsaw_LV.java @@ -3,6 +3,7 @@ package gregtech.common.tools; import gregtech.GT_Mod; import gregtech.api.GregTech_API; import gregtech.api.enums.OrePrefixes; +import gregtech.api.enums.SoundResource; import gregtech.api.enums.Textures; import gregtech.api.interfaces.IIconContainer; import gregtech.api.items.GT_MetaGenerated_Tool; @@ -65,22 +66,17 @@ public class GT_Tool_Chainsaw_LV extends GT_Tool_Saw { @Override public String getCraftingSound() { - return (String) GregTech_API.sSoundList.get(104); + return SoundResource.IC2_TOOLS_CHAINSAW_CHAINSAW_USE_ONE.toString(); } @Override public String getEntityHitSound() { - return (String) GregTech_API.sSoundList.get(105); - } - - @Override - public String getBreakingSound() { - return (String) GregTech_API.sSoundList.get(0); + return SoundResource.IC2_TOOLS_CHAINSAW_CHAINSAW_USE_TWO.toString(); } @Override public String getMiningSound() { - return (String) GregTech_API.sSoundList.get(104); + return SoundResource.IC2_TOOLS_CHAINSAW_CHAINSAW_USE_ONE.toString(); } @Override @@ -92,7 +88,7 @@ public class GT_Tool_Chainsaw_LV extends GT_Tool_Saw { public boolean isChainsaw(){ return true; } - + @Override public boolean isWeapon() { return true; @@ -102,8 +98,8 @@ public class GT_Tool_Chainsaw_LV extends GT_Tool_Saw { public void onToolCrafted(ItemStack aStack, EntityPlayer aPlayer) { super.onToolCrafted(aStack, aPlayer); try { - GT_Mod.instance.achievements.issueAchievement(aPlayer, "brrrr"); - GT_Mod.instance.achievements.issueAchievement(aPlayer, "buildChainsaw"); + GT_Mod.achievements.issueAchievement(aPlayer, "brrrr"); + GT_Mod.achievements.issueAchievement(aPlayer, "buildChainsaw"); } catch (Exception ignored) { } } @@ -115,10 +111,10 @@ public class GT_Tool_Chainsaw_LV extends GT_Tool_Saw { if (((IShearable) aBlock).isShearable(aStack, aPlayer.worldObj, aX, aY, aZ)) { ArrayList tDrops = ((IShearable) aBlock).onSheared(aStack, aPlayer.worldObj, aX, aY, aZ, aFortune); aDrops.clear(); - + } aPlayer.worldObj.setBlock(aX, aY, aZ, Blocks.air, 0, 0); - } else + } else if (((aBlock.getMaterial() == Material.ice) || (aBlock.getMaterial() == Material.packedIce)) && (aDrops.isEmpty())) { aDrops.add(new ItemStack(aBlock, 1, aMetaData)); aPlayer.worldObj.setBlockToAir(aX, aY, aZ); @@ -136,7 +132,7 @@ public class GT_Tool_Chainsaw_LV extends GT_Tool_Saw { } return rAmount; } - + @Override public float getMiningSpeed(Block aBlock, byte aMetaData, float aDefault, EntityPlayer aPlayer, World aWorld, int aX, int aY, int aZ) { diff --git a/src/main/java/gregtech/common/tools/GT_Tool_Crowbar.java b/src/main/java/gregtech/common/tools/GT_Tool_Crowbar.java index 43890b0c93..a0c3e9a059 100644 --- a/src/main/java/gregtech/common/tools/GT_Tool_Crowbar.java +++ b/src/main/java/gregtech/common/tools/GT_Tool_Crowbar.java @@ -1,6 +1,6 @@ package gregtech.common.tools; -import gregtech.api.GregTech_API; +import gregtech.api.enums.SoundResource; import gregtech.api.enums.Textures; import gregtech.api.interfaces.IIconContainer; import gregtech.api.interfaces.IToolStats; @@ -60,22 +60,17 @@ public class GT_Tool_Crowbar extends GT_Tool { @Override public String getCraftingSound() { - return (String) GregTech_API.sSoundList.get(0); + return SoundResource.RANDOM_BREAK.toString(); } @Override public String getEntityHitSound() { - return (String) GregTech_API.sSoundList.get(0); - } - - @Override - public String getBreakingSound() { - return (String) GregTech_API.sSoundList.get(0); + return SoundResource.RANDOM_BREAK.toString(); } @Override public String getMiningSound() { - return (String) GregTech_API.sSoundList.get(0); + return SoundResource.RANDOM_BREAK.toString(); } @Override diff --git a/src/main/java/gregtech/common/tools/GT_Tool_Drill_LV.java b/src/main/java/gregtech/common/tools/GT_Tool_Drill_LV.java index 790679a2e1..cea56791a0 100644 --- a/src/main/java/gregtech/common/tools/GT_Tool_Drill_LV.java +++ b/src/main/java/gregtech/common/tools/GT_Tool_Drill_LV.java @@ -1,7 +1,7 @@ package gregtech.common.tools; import gregtech.GT_Mod; -import gregtech.api.GregTech_API; +import gregtech.api.enums.SoundResource; import gregtech.api.enums.Textures; import gregtech.api.interfaces.IIconContainer; import gregtech.api.items.GT_MetaGenerated_Tool; @@ -59,22 +59,22 @@ public class GT_Tool_Drill_LV extends GT_Tool { @Override public String getCraftingSound() { - return (String) GregTech_API.sSoundList.get(106); + return SoundResource.IC2_TOOLS_DRILL_DRILL_SOFT.toString(); } @Override public String getEntityHitSound() { - return (String) GregTech_API.sSoundList.get(106); + return SoundResource.IC2_TOOLS_DRILL_DRILL_SOFT.toString(); } @Override public String getBreakingSound() { - return (String) GregTech_API.sSoundList.get(106); + return SoundResource.IC2_TOOLS_DRILL_DRILL_SOFT.toString(); } @Override public String getMiningSound() { - return (String) GregTech_API.sSoundList.get(106); + return SoundResource.IC2_TOOLS_DRILL_DRILL_SOFT.toString(); } @Override @@ -129,8 +129,8 @@ public class GT_Tool_Drill_LV extends GT_Tool { aPlayer.triggerAchievement(AchievementList.buildPickaxe); aPlayer.triggerAchievement(AchievementList.buildBetterPickaxe); try { - GT_Mod.instance.achievements.issueAchievement(aPlayer, "driltime"); - GT_Mod.instance.achievements.issueAchievement(aPlayer, "buildDrill"); + GT_Mod.achievements.issueAchievement(aPlayer, "driltime"); + GT_Mod.achievements.issueAchievement(aPlayer, "buildDrill"); } catch (Exception ignored) { } } diff --git a/src/main/java/gregtech/common/tools/GT_Tool_File.java b/src/main/java/gregtech/common/tools/GT_Tool_File.java index 9fee85a131..e09f1cd784 100644 --- a/src/main/java/gregtech/common/tools/GT_Tool_File.java +++ b/src/main/java/gregtech/common/tools/GT_Tool_File.java @@ -1,6 +1,5 @@ package gregtech.common.tools; -import gregtech.api.GregTech_API; import gregtech.api.enums.Textures; import gregtech.api.interfaces.IIconContainer; import gregtech.api.items.GT_MetaGenerated_Tool; @@ -64,11 +63,6 @@ public class GT_Tool_File return null; } - @Override - public String getBreakingSound() { - return (String) GregTech_API.sSoundList.get(0); - } - @Override public String getMiningSound() { return null; diff --git a/src/main/java/gregtech/common/tools/GT_Tool_HardHammer.java b/src/main/java/gregtech/common/tools/GT_Tool_HardHammer.java index 956871c560..130766759e 100644 --- a/src/main/java/gregtech/common/tools/GT_Tool_HardHammer.java +++ b/src/main/java/gregtech/common/tools/GT_Tool_HardHammer.java @@ -1,7 +1,7 @@ package gregtech.common.tools; import gregtech.GT_Mod; -import gregtech.api.GregTech_API; +import gregtech.api.enums.SoundResource; import gregtech.api.interfaces.IIconContainer; import gregtech.api.items.GT_MetaGenerated_Tool; import gregtech.api.util.GT_Recipe; @@ -23,6 +23,8 @@ import net.minecraftforge.event.world.BlockEvent; import java.util.Arrays; import java.util.List; +import static gregtech.GT_Mod.MAX_IC2; + public class GT_Tool_HardHammer extends GT_Tool { public static final List mEffectiveList = Arrays.asList(EntityIronGolem.class.getName(), "EntityTowerGuardian"); @@ -80,7 +82,7 @@ public class GT_Tool_HardHammer extends GT_Tool { @Override public String getCraftingSound() { - return (String) GregTech_API.sSoundList.get(1); + return SoundResource.RANDOM_ANVIL_USE.toString(); } @Override @@ -90,7 +92,7 @@ public class GT_Tool_HardHammer extends GT_Tool { @Override public String getBreakingSound() { - return (String) GregTech_API.sSoundList.get(2); + return SoundResource.RANDOM_ANVIL_BREAK.toString(); } @Override @@ -127,10 +129,10 @@ public class GT_Tool_HardHammer extends GT_Tool { @Override public int convertBlockDrops(List aDrops, ItemStack aStack, EntityPlayer aPlayer, Block aBlock, int aX, int aY, int aZ, byte aMetaData, int aFortune, boolean aSilkTouch, BlockEvent.HarvestDropsEvent aEvent) { int rConversions = 0; - GT_Recipe tRecipe = GT_Recipe.GT_Recipe_Map.sHammerRecipes.findRecipe(null, true, 2147483647L, null, new ItemStack(aBlock, 1, aMetaData)); + GT_Recipe tRecipe = GT_Recipe.GT_Recipe_Map.sHammerRecipes.findRecipe(null, true, MAX_IC2, null, new ItemStack(aBlock, 1, aMetaData)); if ((tRecipe == null) || (aBlock.hasTileEntity(aMetaData))) { for (ItemStack tDrop : aDrops) { - tRecipe = GT_Recipe.GT_Recipe_Map.sHammerRecipes.findRecipe(null, true, 2147483647L, null, GT_Utility.copyAmount(1L, new Object[]{tDrop})); + tRecipe = GT_Recipe.GT_Recipe_Map.sHammerRecipes.findRecipe(null, true, MAX_IC2, null, GT_Utility.copyAmount(1L, tDrop)); if (tRecipe != null) { ItemStack tHammeringOutput = tRecipe.getOutput(0); if (tHammeringOutput != null) { @@ -178,7 +180,7 @@ public class GT_Tool_HardHammer extends GT_Tool { public void onToolCrafted(ItemStack aStack, EntityPlayer aPlayer) { super.onToolCrafted(aStack, aPlayer); try { - GT_Mod.instance.achievements.issueAchievement(aPlayer, "tools"); + GT_Mod.achievements.issueAchievement(aPlayer, "tools"); } catch (Exception ignored) { } } diff --git a/src/main/java/gregtech/common/tools/GT_Tool_Hoe.java b/src/main/java/gregtech/common/tools/GT_Tool_Hoe.java index a1159fde5c..67cfade9c8 100644 --- a/src/main/java/gregtech/common/tools/GT_Tool_Hoe.java +++ b/src/main/java/gregtech/common/tools/GT_Tool_Hoe.java @@ -1,6 +1,5 @@ package gregtech.common.tools; -import gregtech.api.GregTech_API; import gregtech.api.interfaces.IIconContainer; import gregtech.api.items.GT_MetaGenerated_Tool; import gregtech.api.util.GT_ToolHarvestHelper; @@ -66,11 +65,6 @@ public class GT_Tool_Hoe extends GT_Tool { return null; } - @Override - public String getBreakingSound() { - return (String) GregTech_API.sSoundList.get(0); - } - @Override public String getMiningSound() { return null; diff --git a/src/main/java/gregtech/common/tools/GT_Tool_Mortar.java b/src/main/java/gregtech/common/tools/GT_Tool_Mortar.java index 772da53b7f..4244a00638 100644 --- a/src/main/java/gregtech/common/tools/GT_Tool_Mortar.java +++ b/src/main/java/gregtech/common/tools/GT_Tool_Mortar.java @@ -1,6 +1,5 @@ package gregtech.common.tools; -import gregtech.api.GregTech_API; import gregtech.api.enums.Dyes; import gregtech.api.enums.Textures; import gregtech.api.interfaces.IIconContainer; @@ -63,11 +62,6 @@ public class GT_Tool_Mortar extends GT_Tool { return null; } - @Override - public String getBreakingSound() { - return (String) GregTech_API.sSoundList.get(0); - } - @Override public String getMiningSound() { return null; diff --git a/src/main/java/gregtech/common/tools/GT_Tool_Pickaxe.java b/src/main/java/gregtech/common/tools/GT_Tool_Pickaxe.java index 59d819a31d..aebd965428 100644 --- a/src/main/java/gregtech/common/tools/GT_Tool_Pickaxe.java +++ b/src/main/java/gregtech/common/tools/GT_Tool_Pickaxe.java @@ -1,7 +1,6 @@ package gregtech.common.tools; import gregtech.GT_Mod; -import gregtech.api.GregTech_API; import gregtech.api.interfaces.IIconContainer; import gregtech.api.items.GT_MetaGenerated_Tool; import gregtech.api.util.GT_ToolHarvestHelper; @@ -66,11 +65,6 @@ public class GT_Tool_Pickaxe extends GT_Tool { return null; } - @Override - public String getBreakingSound() { - return (String) GregTech_API.sSoundList.get(0); - } - @Override public String getMiningSound() { return null; diff --git a/src/main/java/gregtech/common/tools/GT_Tool_Plunger.java b/src/main/java/gregtech/common/tools/GT_Tool_Plunger.java index 07ec21a2e2..5c99702baa 100644 --- a/src/main/java/gregtech/common/tools/GT_Tool_Plunger.java +++ b/src/main/java/gregtech/common/tools/GT_Tool_Plunger.java @@ -1,6 +1,6 @@ package gregtech.common.tools; -import gregtech.api.GregTech_API; +import gregtech.api.enums.SoundResource; import gregtech.api.enums.Textures; import gregtech.api.interfaces.IIconContainer; import gregtech.api.interfaces.IItemBehaviour; @@ -29,22 +29,17 @@ public class GT_Tool_Plunger extends GT_Tool { @Override public String getCraftingSound() { - return (String) GregTech_API.sSoundList.get(101); + return SoundResource.IC2_TOOLS_RUBBER_TRAMPOLINE.toString(); } @Override public String getEntityHitSound() { - return (String) GregTech_API.sSoundList.get(101); - } - - @Override - public String getBreakingSound() { - return (String) GregTech_API.sSoundList.get(0); + return SoundResource.IC2_TOOLS_RUBBER_TRAMPOLINE.toString(); } @Override public String getMiningSound() { - return (String) GregTech_API.sSoundList.get(101); + return SoundResource.IC2_TOOLS_RUBBER_TRAMPOLINE.toString(); } @Override diff --git a/src/main/java/gregtech/common/tools/GT_Tool_Saw.java b/src/main/java/gregtech/common/tools/GT_Tool_Saw.java index 61086db1f3..f2ec7dc4e1 100644 --- a/src/main/java/gregtech/common/tools/GT_Tool_Saw.java +++ b/src/main/java/gregtech/common/tools/GT_Tool_Saw.java @@ -1,6 +1,5 @@ package gregtech.common.tools; -import gregtech.api.GregTech_API; import gregtech.api.enums.Textures; import gregtech.api.interfaces.IIconContainer; import gregtech.api.items.GT_MetaGenerated_Tool; @@ -71,11 +70,6 @@ public class GT_Tool_Saw extends GT_Tool { return null; } - @Override - public String getBreakingSound() { - return (String) GregTech_API.sSoundList.get(0); - } - @Override public String getMiningSound() { return null; diff --git a/src/main/java/gregtech/common/tools/GT_Tool_Scoop.java b/src/main/java/gregtech/common/tools/GT_Tool_Scoop.java index 22c84a9632..674a30548f 100644 --- a/src/main/java/gregtech/common/tools/GT_Tool_Scoop.java +++ b/src/main/java/gregtech/common/tools/GT_Tool_Scoop.java @@ -1,7 +1,6 @@ package gregtech.common.tools; import cpw.mods.fml.common.Loader; -import gregtech.api.GregTech_API; import gregtech.api.enums.GT_Values; import gregtech.api.enums.Textures; import gregtech.api.interfaces.IIconContainer; @@ -70,11 +69,6 @@ public class GT_Tool_Scoop extends GT_Tool { return null; } - @Override - public String getBreakingSound() { - return (String) GregTech_API.sSoundList.get(0); - } - @Override public String getMiningSound() { return null; diff --git a/src/main/java/gregtech/common/tools/GT_Tool_Screwdriver.java b/src/main/java/gregtech/common/tools/GT_Tool_Screwdriver.java index 71a074d379..a15c6429cd 100644 --- a/src/main/java/gregtech/common/tools/GT_Tool_Screwdriver.java +++ b/src/main/java/gregtech/common/tools/GT_Tool_Screwdriver.java @@ -1,6 +1,6 @@ package gregtech.common.tools; -import gregtech.api.GregTech_API; +import gregtech.api.enums.SoundResource; import gregtech.api.enums.Textures; import gregtech.api.interfaces.IIconContainer; import gregtech.api.items.GT_MetaGenerated_Tool; @@ -73,7 +73,7 @@ public class GT_Tool_Screwdriver extends GT_Tool { @Override public String getCraftingSound() { - return (String) GregTech_API.sSoundList.get(100); + return SoundResource.IC2_TOOLS_WRENCH.toString(); } @Override @@ -81,11 +81,6 @@ public class GT_Tool_Screwdriver extends GT_Tool { return null; } - @Override - public String getBreakingSound() { - return (String) GregTech_API.sSoundList.get(0); - } - @Override public String getMiningSound() { return null; diff --git a/src/main/java/gregtech/common/tools/GT_Tool_Shovel.java b/src/main/java/gregtech/common/tools/GT_Tool_Shovel.java index 0560e0cba9..8b29b6adf2 100644 --- a/src/main/java/gregtech/common/tools/GT_Tool_Shovel.java +++ b/src/main/java/gregtech/common/tools/GT_Tool_Shovel.java @@ -1,6 +1,5 @@ package gregtech.common.tools; -import gregtech.api.GregTech_API; import gregtech.api.interfaces.IIconContainer; import gregtech.api.items.GT_MetaGenerated_Tool; import gregtech.api.util.GT_ToolHarvestHelper; @@ -63,11 +62,6 @@ public class GT_Tool_Shovel extends GT_Tool { return null; } - @Override - public String getBreakingSound() { - return (String) GregTech_API.sSoundList.get(0); - } - @Override public String getMiningSound() { return null; diff --git a/src/main/java/gregtech/common/tools/GT_Tool_SoftHammer.java b/src/main/java/gregtech/common/tools/GT_Tool_SoftHammer.java index 204ec4c104..87255cfeb8 100644 --- a/src/main/java/gregtech/common/tools/GT_Tool_SoftHammer.java +++ b/src/main/java/gregtech/common/tools/GT_Tool_SoftHammer.java @@ -1,6 +1,6 @@ package gregtech.common.tools; -import gregtech.api.GregTech_API; +import gregtech.api.enums.SoundResource; import gregtech.api.interfaces.IIconContainer; import gregtech.api.items.GT_MetaGenerated_Tool; import gregtech.api.util.GT_ToolHarvestHelper; @@ -61,22 +61,17 @@ public class GT_Tool_SoftHammer extends GT_Tool { @Override public String getCraftingSound() { - return (String) GregTech_API.sSoundList.get(101); + return SoundResource.IC2_TOOLS_RUBBER_TRAMPOLINE.toString(); } @Override public String getEntityHitSound() { - return (String) GregTech_API.sSoundList.get(101); - } - - @Override - public String getBreakingSound() { - return (String) GregTech_API.sSoundList.get(0); + return SoundResource.IC2_TOOLS_RUBBER_TRAMPOLINE.toString(); } @Override public String getMiningSound() { - return (String) GregTech_API.sSoundList.get(101); + return SoundResource.IC2_TOOLS_RUBBER_TRAMPOLINE.toString(); } @Override diff --git a/src/main/java/gregtech/common/tools/GT_Tool_Soldering_Iron.java b/src/main/java/gregtech/common/tools/GT_Tool_Soldering_Iron.java index 73145922e4..a5f2bb1e01 100644 --- a/src/main/java/gregtech/common/tools/GT_Tool_Soldering_Iron.java +++ b/src/main/java/gregtech/common/tools/GT_Tool_Soldering_Iron.java @@ -1,6 +1,6 @@ package gregtech.common.tools; -import gregtech.api.GregTech_API; +import gregtech.api.enums.SoundResource; import gregtech.api.enums.Textures; import gregtech.api.interfaces.IIconContainer; import gregtech.api.items.GT_MetaGenerated_Tool; @@ -73,7 +73,7 @@ public class GT_Tool_Soldering_Iron extends GT_Tool { @Override public String getCraftingSound() { - return (String) GregTech_API.sSoundList.get(100); + return SoundResource.IC2_TOOLS_WRENCH.toString(); } @Override @@ -81,11 +81,6 @@ public class GT_Tool_Soldering_Iron extends GT_Tool { return null; } - @Override - public String getBreakingSound() { - return (String) GregTech_API.sSoundList.get(0); - } - @Override public String getMiningSound() { return null; diff --git a/src/main/java/gregtech/common/tools/GT_Tool_Sword.java b/src/main/java/gregtech/common/tools/GT_Tool_Sword.java index 458775997a..4f1d60a37a 100644 --- a/src/main/java/gregtech/common/tools/GT_Tool_Sword.java +++ b/src/main/java/gregtech/common/tools/GT_Tool_Sword.java @@ -1,6 +1,5 @@ package gregtech.common.tools; -import gregtech.api.GregTech_API; import gregtech.api.enums.Textures; import gregtech.api.interfaces.IIconContainer; import gregtech.api.items.GT_MetaGenerated_Tool; @@ -62,11 +61,6 @@ public class GT_Tool_Sword extends GT_Tool { return null; } - @Override - public String getBreakingSound() { - return (String) GregTech_API.sSoundList.get(0); - } - @Override public String getMiningSound() { return null; diff --git a/src/main/java/gregtech/common/tools/GT_Tool_UniversalSpade.java b/src/main/java/gregtech/common/tools/GT_Tool_UniversalSpade.java index d53d3600a1..d494af7e76 100644 --- a/src/main/java/gregtech/common/tools/GT_Tool_UniversalSpade.java +++ b/src/main/java/gregtech/common/tools/GT_Tool_UniversalSpade.java @@ -1,7 +1,6 @@ package gregtech.common.tools; import gregtech.GT_Mod; -import gregtech.api.GregTech_API; import gregtech.api.interfaces.IIconContainer; import gregtech.api.items.GT_MetaGenerated_Tool; import gregtech.api.util.GT_ToolHarvestHelper; @@ -67,11 +66,6 @@ public class GT_Tool_UniversalSpade extends GT_Tool { return null; } - @Override - public String getBreakingSound() { - return (String) GregTech_API.sSoundList.get(0); - } - @Override public String getMiningSound() { return null; @@ -142,7 +136,7 @@ public class GT_Tool_UniversalSpade extends GT_Tool { super.onToolCrafted(aStack, aPlayer); aPlayer.triggerAchievement(AchievementList.buildSword); try { - GT_Mod.instance.achievements.issueAchievement(aPlayer, "unitool"); + GT_Mod.achievements.issueAchievement(aPlayer, "unitool"); } catch (Exception ignored) { } } diff --git a/src/main/java/gregtech/common/tools/GT_Tool_WireCutter.java b/src/main/java/gregtech/common/tools/GT_Tool_WireCutter.java index 8caf720956..b9282b4224 100644 --- a/src/main/java/gregtech/common/tools/GT_Tool_WireCutter.java +++ b/src/main/java/gregtech/common/tools/GT_Tool_WireCutter.java @@ -1,6 +1,6 @@ package gregtech.common.tools; -import gregtech.api.GregTech_API; +import gregtech.api.enums.SoundResource; import gregtech.api.enums.Textures; import gregtech.api.interfaces.IIconContainer; import gregtech.api.items.GT_MetaGenerated_Tool; @@ -55,7 +55,7 @@ public class GT_Tool_WireCutter extends GT_Tool { @Override public String getCraftingSound() { - return (String) GregTech_API.sSoundList.get(109); + return SoundResource.IC2_TOOLS_INSULATION_CUTTERS.toString(); } @Override @@ -63,14 +63,9 @@ public class GT_Tool_WireCutter extends GT_Tool { return null; } - @Override - public String getBreakingSound() { - return (String) GregTech_API.sSoundList.get(0); - } - @Override public String getMiningSound() { - return (String) GregTech_API.sSoundList.get(109); + return SoundResource.IC2_TOOLS_INSULATION_CUTTERS.toString(); } @Override diff --git a/src/main/java/gregtech/common/tools/GT_Tool_Wrench.java b/src/main/java/gregtech/common/tools/GT_Tool_Wrench.java index 0b50eb52e9..95ebc36bb2 100644 --- a/src/main/java/gregtech/common/tools/GT_Tool_Wrench.java +++ b/src/main/java/gregtech/common/tools/GT_Tool_Wrench.java @@ -1,6 +1,6 @@ package gregtech.common.tools; -import gregtech.api.GregTech_API; +import gregtech.api.enums.SoundResource; import gregtech.api.enums.Textures; import gregtech.api.interfaces.IIconContainer; import gregtech.api.items.GT_MetaGenerated_Tool; @@ -78,7 +78,7 @@ public class GT_Tool_Wrench extends GT_Tool { @Override public String getCraftingSound() { - return (String) GregTech_API.sSoundList.get(100); + return SoundResource.IC2_TOOLS_WRENCH.toString(); } @Override @@ -86,14 +86,9 @@ public class GT_Tool_Wrench extends GT_Tool { return null; } - @Override - public String getBreakingSound() { - return (String) GregTech_API.sSoundList.get(0); - } - @Override public String getMiningSound() { - return (String) GregTech_API.sSoundList.get(100); + return SoundResource.IC2_TOOLS_WRENCH.toString(); } @Override @@ -110,7 +105,7 @@ public class GT_Tool_Wrench extends GT_Tool { public boolean isWrench() { return true; } - + @Override public boolean isMinableBlock(Block aBlock, byte aMetaData) { return GT_ToolHarvestHelper.isAppropriateTool(aBlock, aMetaData, "wrench") -- cgit