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/api/GregTech_API.java | 38 +- src/main/java/gregtech/api/enums/Materials.java | 3 + src/main/java/gregtech/api/enums/ParticleFX.java | 53 ++ .../java/gregtech/api/enums/SoundResource.java | 361 +++++++++ .../api/graphs/consumers/NodeEnergyReceiver.java | 3 +- .../java/gregtech/api/items/GT_Spray_Bug_Item.java | 10 +- .../gregtech/api/items/GT_Spray_Foam_Item.java | 18 +- .../gregtech/api/items/GT_Spray_Hardener_Item.java | 14 +- .../api/items/GT_Spray_Hydration_Item.java | 12 +- .../java/gregtech/api/items/GT_Spray_Ice_Item.java | 12 +- .../api/metatileentity/BaseMetaPipeEntity.java | 62 +- .../api/metatileentity/BaseMetaTileEntity.java | 363 ++++----- .../api/metatileentity/MetaTileEntity.java | 10 +- .../examples/GT_MetaTileEntity_E_Furnace.java | 4 +- .../implementations/GT_MetaPipeEntity_Fluid.java | 84 +-- .../GT_MetaTileEntity_BasicMachine.java | 3 +- .../GT_MetaTileEntity_BasicMachine_Bronze.java | 52 +- .../GT_MetaTileEntity_BasicMachine_GT_Recipe.java | 247 ++++-- .../GT_MetaTileEntity_Hatch_Muffler.java | 3 +- .../GT_MetaTileEntity_MultiBlockBase.java | 10 +- .../gregtech/api/threads/GT_Runnable_Sound.java | 19 +- src/main/java/gregtech/api/util/GT_FoodStat.java | 3 +- .../java/gregtech/api/util/GT_PlayedSound.java | 15 +- src/main/java/gregtech/api/util/GT_Utility.java | 86 ++- .../api/util/WorldSpawnedEventBuilder.java | 31 +- src/main/java/gregtech/common/GT_Client.java | 7 +- src/main/java/gregtech/common/GT_Proxy.java | 8 +- .../common/blocks/GT_Block_Reinforced.java | 7 +- .../gregtech/common/entities/GT_Entity_Arrow.java | 5 +- .../items/behaviors/Behaviour_Cover_Tool.java | 9 +- .../common/items/behaviors/Behaviour_Crowbar.java | 6 +- .../common/items/behaviors/Behaviour_Lighter.java | 6 +- .../behaviors/Behaviour_Plunger_Essentia.java | 6 +- .../items/behaviors/Behaviour_Plunger_Fluid.java | 24 +- .../items/behaviors/Behaviour_Plunger_Item.java | 18 +- .../items/behaviors/Behaviour_Prospecting.java | 134 ++-- .../common/items/behaviors/Behaviour_Scanner.java | 12 +- .../items/behaviors/Behaviour_Screwdriver.java | 6 +- .../items/behaviors/Behaviour_SoftHammer.java | 16 +- .../items/behaviors/Behaviour_Spray_Color.java | 18 +- .../common/items/behaviors/Behaviour_Wrench.java | 28 +- .../boilers/GT_MetaTileEntity_Boiler.java | 45 +- .../boilers/GT_MetaTileEntity_Boiler_Bronze.java | 84 ++- .../boilers/GT_MetaTileEntity_Boiler_Solar.java | 6 +- .../GT_MetaTileEntity_DieselGenerator.java | 37 + .../GT_MetaTileEntity_MagicalEnergyAbsorber.java | 155 ++-- .../machines/basic/GT_MetaTileEntity_Scanner.java | 113 ++- ...GT_MetaTileEntity_LongDistancePipelineBase.java | 82 +- .../multi/GT_MetaTileEntity_AssemblyLine.java | 11 +- .../multi/GT_MetaTileEntity_Charcoal_Pit.java | 3 +- .../GT_MetaTileEntity_ImplosionCompressor.java | 59 +- .../GT_MetaTileEntity_PrimitiveBlastFurnace.java | 54 +- .../GT_MetaTileEntity_AlloySmelter_Bronze.java | 52 +- .../GT_MetaTileEntity_AlloySmelter_Steel.java | 52 +- .../steam/GT_MetaTileEntity_Compressor_Bronze.java | 52 +- .../steam/GT_MetaTileEntity_Compressor_Steel.java | 52 +- .../steam/GT_MetaTileEntity_Extractor_Bronze.java | 52 +- .../steam/GT_MetaTileEntity_Extractor_Steel.java | 52 +- .../GT_MetaTileEntity_ForgeHammer_Bronze.java | 121 ++- .../steam/GT_MetaTileEntity_ForgeHammer_Steel.java | 121 ++- .../steam/GT_MetaTileEntity_Furnace_Bronze.java | 54 +- .../steam/GT_MetaTileEntity_Furnace_Steel.java | 52 +- .../steam/GT_MetaTileEntity_Macerator_Bronze.java | 80 +- .../steam/GT_MetaTileEntity_Macerator_Steel.java | 70 +- .../storage/GT_MetaTileEntity_Locker.java | 4 +- 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 +- .../gregtech/loaders/load/GT_SonictronLoader.java | 93 +-- .../preload/GT_Loader_MetaTileEntities.java | 830 ++++++++++----------- 89 files changed, 2610 insertions(+), 1819 deletions(-) create mode 100644 src/main/java/gregtech/api/enums/ParticleFX.java create mode 100644 src/main/java/gregtech/api/enums/SoundResource.java (limited to 'src/main/java/gregtech') diff --git a/src/main/java/gregtech/api/GregTech_API.java b/src/main/java/gregtech/api/GregTech_API.java index cb56c52c67..0a99ea776c 100644 --- a/src/main/java/gregtech/api/GregTech_API.java +++ b/src/main/java/gregtech/api/GregTech_API.java @@ -7,6 +7,7 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import gregtech.GT_Mod; import gregtech.api.enums.Materials; +import gregtech.api.enums.SoundResource; import gregtech.api.enums.Textures; import gregtech.api.interfaces.IDamagableItem; import gregtech.api.interfaces.ITexture; @@ -169,8 +170,10 @@ public class GregTech_API { public static final Map sBookList = new ConcurrentHashMap<>(); /** * The List of all Sounds used in GT, indices are in the static Block at the bottom + * @deprecated Use {@link SoundResource} */ - public static final Map sSoundList = new ConcurrentHashMap<>(); + @Deprecated + public static final Map sSoundList = SoundResource.asSoundList(); /** * The List of Tools, which can be used. Accepts regular damageable Items and Electric Items */ @@ -375,39 +378,6 @@ public class GregTech_API { //sDimensionalList.add(56); //sDimensionalList.add(55); - - sSoundList.put(0, "random.break"); - sSoundList.put(1, "random.anvil_use"); - sSoundList.put(2, "random.anvil_break"); - sSoundList.put(3, "random.click"); - sSoundList.put(4, "random.fizz"); - sSoundList.put(5, "random.explode"); - sSoundList.put(6, "fire.ignite"); - - sSoundList.put(100, aTextIC2Lower + ":" + "tools.Wrench"); - sSoundList.put(101, aTextIC2Lower + ":" + "tools.RubberTrampoline"); - sSoundList.put(102, aTextIC2Lower + ":" + "tools.Painter"); - sSoundList.put(103, aTextIC2Lower + ":" + "tools.BatteryUse"); - sSoundList.put(104, aTextIC2Lower + ":" + "tools.chainsaw.ChainsawUseOne"); - sSoundList.put(105, aTextIC2Lower + ":" + "tools.chainsaw.ChainsawUseTwo"); - sSoundList.put(106, aTextIC2Lower + ":" + "tools.drill.DrillSoft"); - sSoundList.put(107, aTextIC2Lower + ":" + "tools.drill.DrillHard"); - sSoundList.put(108, aTextIC2Lower + ":" + "tools.ODScanner"); - sSoundList.put(109, aTextIC2Lower + ":" + "tools.InsulationCutters"); - - sSoundList.put(200, aTextIC2Lower + ":" + "machines.ExtractorOp"); - sSoundList.put(201, aTextIC2Lower + ":" + "machines.MaceratorOp"); - sSoundList.put(202, aTextIC2Lower + ":" + "machines.InductionLoop"); - sSoundList.put(203, aTextIC2Lower + ":" + "machines.CompressorOp"); - sSoundList.put(204, aTextIC2Lower + ":" + "machines.RecyclerOp"); - sSoundList.put(205, aTextIC2Lower + ":" + "machines.MinerOp"); - sSoundList.put(206, aTextIC2Lower + ":" + "machines.PumpOp"); - sSoundList.put(207, aTextIC2Lower + ":" + "machines.ElectroFurnaceLoop"); - sSoundList.put(208, aTextIC2Lower + ":" + "machines.InductionLoop"); - sSoundList.put(209, aTextIC2Lower + ":" + "machines.MachineOverload"); - sSoundList.put(210, aTextIC2Lower + ":" + "machines.InterruptOne"); - sSoundList.put(211, aTextIC2Lower + ":" + "machines.KaChing"); - sSoundList.put(212, aTextIC2Lower + ":" + "machines.MagnetizerLoop"); } /** diff --git a/src/main/java/gregtech/api/enums/Materials.java b/src/main/java/gregtech/api/enums/Materials.java index fde3e77d4a..f5197ef502 100644 --- a/src/main/java/gregtech/api/enums/Materials.java +++ b/src/main/java/gregtech/api/enums/Materials.java @@ -952,6 +952,9 @@ public class Materials implements IColorModulationContainer, ISubTagContainer { */ //Superconductor re-routed for mod compability. Circuits are re-routed into SuperconductorUHV aswell, internal name is now Superconductor while translated name is SuperconductorUHV + /** + * @deprecated Use {@link #SuperconductorUHV} instead + */ @Deprecated public static Materials Superconductor = new Materials(SuperconductorUHV, true);// new Materials( -1, TextureSet.SET_NONE , 1.0F, 0, 0, 0 , 255, 255, 255, 0, "Superconductor" , "Superconductor" , 0, 0, -1, 0, false, false, 1, 1, 1, Dyes.dyeLightGray , Arrays.asList(new TC_AspectStack(TC_Aspects.ELECTRUM, 9))); @Deprecated diff --git a/src/main/java/gregtech/api/enums/ParticleFX.java b/src/main/java/gregtech/api/enums/ParticleFX.java new file mode 100644 index 0000000000..a20c7a16e3 --- /dev/null +++ b/src/main/java/gregtech/api/enums/ParticleFX.java @@ -0,0 +1,53 @@ +package gregtech.api.enums; + +/** + * Enumerate known EntityFX particles + */ +public enum ParticleFX { + HUGE_EXPLOSION("hugeexplosion"), + LARGE_EXPLODE("largeexplode"), + FIREWORKS_SPARK("fireworksSpark"), + BUBBLE("bubble"), + SUSPENDED("suspended"), + DEPTH_SUSPEND("depthsuspend"), + TOWN_AURA("townaura"), + CRIT("crit"), + MAGIC_CRIT("magicCrit"), + SMOKE("smoke"), + MOB_SPELL("mobSpell"), + MOB_SPELL_AMBIENT("mobSpellAmbient"), + SPELL("spell"), + INSTANT_SPELL("instantSpell"), + WITCH_MAGIC("witchMagic"), + NOTE("note"), + PORTAL("portal"), + ENCHANTMENT_TABLE("enchantmenttable"), + EXPLODE("explode"), + FLAME("flame"), + LAVA("lava"), + FOOTSTEP("footstep"), + SPLASH("splash"), + WAKE("wake"), + LARGE_SMOKE("largesmoke"), + CLOUD("cloud"), + RED_DUST("reddust"), + SNOWBALL_POOF("snowballpoof"), + DRIP_WATER("dripWater"), + DRIP_LAVA("dripLava"), + SNOW_SHOVEL("snowshovel"), + SLIME("slime"), + HEART("heart"), + ANGRY_VILLAGER("angryVillager"), + HAPPY_VILLAGER("happyVillager"); + + private final String identifier; + + ParticleFX(String name) { + this.identifier = name; + } + + public String toString() { + return this.identifier; + } +} + diff --git a/src/main/java/gregtech/api/enums/SoundResource.java b/src/main/java/gregtech/api/enums/SoundResource.java new file mode 100644 index 0000000000..2994f03d2a --- /dev/null +++ b/src/main/java/gregtech/api/enums/SoundResource.java @@ -0,0 +1,361 @@ +package gregtech.api.enums; + +import com.google.common.collect.Maps; +import net.minecraft.util.ResourceLocation; + +import java.util.EnumSet; +import java.util.Locale; +import java.util.Map; +import java.util.concurrent.ConcurrentHashMap; + +import static gregtech.api.enums.GT_Values.MOD_ID_IC2; + +/** + * Enumerate known sounds with id and resource-location + * + *

Note that the id serve no specific purpose, if for legacy compatibility of + * a plausible yet unimplemented network packet weight optimization.

+ */ +public enum SoundResource { + + RANDOM_BREAK(0, "random.break"), + RANDOM_ANVIL_USE(1, "random.anvil_use"), + RANDOM_ANVIL_BREAK(2, "random.anvil_break"), + RANDOM_CLICK(3, "random.click"), + RANDOM_FIZZ(4, "random.fizz"), + RANDOM_EXPLODE(5, "random.explode"), + FIRE_IGNITE(6, "fire.ignite"), + + IC2_TOOLS_WRENCH(100, MOD_ID_IC2, "tools.Wrench"), + IC2_TOOLS_RUBBER_TRAMPOLINE(101, MOD_ID_IC2, "tools.RubberTrampoline"), + IC2_TOOLS_PAINTER(102, MOD_ID_IC2, "tools.Painter"), + IC2_TOOLS_BATTERY_USE(103, MOD_ID_IC2, "tools.BatteryUse"), + IC2_TOOLS_CHAINSAW_CHAINSAW_USE_ONE(104, MOD_ID_IC2, "tools.chainsaw.ChainsawUseOne"), + IC2_TOOLS_CHAINSAW_CHAINSAW_USE_TWO(105, MOD_ID_IC2, "tools.chainsaw.ChainsawUseTwo"), + IC2_TOOLS_DRILL_DRILL_SOFT(106, MOD_ID_IC2, "tools.drill.DrillSoft"), + IC2_TOOLS_DRILL_DRILL_HARD(107, MOD_ID_IC2, "tools.drill.DrillHard"), + IC2_TOOLS_OD_SCANNER(108, MOD_ID_IC2, "tools.ODScanner"), + IC2_TOOLS_INSULATION_CUTTERS(109, MOD_ID_IC2, "tools.InsulationCutters"), + + IC2_MACHINES_EXTRACTOR_OP(200, MOD_ID_IC2, "machines.ExtractorOp"), + IC2_MACHINES_MACERATOR_OP(201, MOD_ID_IC2, "machines.MaceratorOp"), + IC2_MACHINES_INDUCTION_LOOP(202, MOD_ID_IC2, "machines.InductionLoop"), + IC2_MACHINES_COMPRESSOR_OP(203, MOD_ID_IC2, "machines.CompressorOp"), + IC2_MACHINES_RECYCLER_OP(204, MOD_ID_IC2, "machines.RecyclerOp"), + IC2_MACHINES_MINER_OP(205, MOD_ID_IC2, "machines.MinerOp"), + IC2_MACHINES_PUMP_OP(206, MOD_ID_IC2, "machines.PumpOp"), + IC2_MACHINES_ELECTROFURNACE_LOOP(207, MOD_ID_IC2, "machines.ElectroFurnaceLoop"), + @Deprecated + DEPRECATED_DUPE_OF_IC2_MACHINES_INDUCTION_LOOP(208, MOD_ID_IC2, "machines.InductionLoop"), + IC2_MACHINES_MACHINE_OVERLOAD(209, MOD_ID_IC2, "machines.MachineOverload"), + IC2_MACHINES_INTERRUPT_ONE(210, MOD_ID_IC2, "machines.InterruptOne"), + IC2_MACHINES_KA_CHING(211, MOD_ID_IC2, "machines.KaChing"), + IC2_MACHINES_MAGNETIZER_LOOP(212, MOD_ID_IC2, "machines.MagnetizerLoop"), + + /* + * Other Minecraft Sounds that were missing + */ + AMBIENT_CAVE_CAVE(-1, "ambient.cave.cave"), + AMBIENT_WEATHER_RAIN(-1, "ambient.weather.rain"), + AMBIENT_WEATHER_THUNDER(-1, "ambient.weather.thunder"), + DAMAGE_FALLBIG(-1, "damage.fallbig"), + DAMAGE_FALLSMALL(-1, "damage.fallsmall"), + DAMAGE_HIT(-1, "damage.hit"), + DAMAGE_HURTFLESH(-1, "damage.hurtflesh"), + DIG_CLOTH(-1, "dig.cloth"), + DIG_GRASS(-1, "dig.grass"), + DIG_GRAVEL(-1, "dig.gravel"), + DIG_SAND(-1, "dig.sand"), + DIG_SNOW(-1, "dig.snow"), + DIG_STONE(-1, "dig.stone"), + DIG_WOOD(-1, "dig.wood"), + FIRE_FIRE(-1, "fire.fire"), + FIREWORKS_BLAST(-1, "fireworks.blast"), + FIREWORKS_BLAST_FAR(-1, "fireworks.blast_far"), + FIREWORKS_LARGEBLAST(-1, "fireworks.largeBlast"), + FIREWORKS_LARGEBLAST_FAR(-1, "fireworks.largeBlast_far"), + FIREWORKS_LAUNCH(-1, "fireworks.launch"), + FIREWORKS_TWINKLE(-1, "fireworks.twinkle"), + FIREWORKS_TWINKLE_FAR(-1, "fireworks.twinkle_far"), + GAME_NEUTRAL_SWIM(-1, "game.neutral.swim"), + GAME_TNT_PRIMED(-1, "game.tnt.primed"), + LIQUID_LAVA(-1, "liquid.lava"), + LIQUID_LAVAPOP(-1, "liquid.lavapop"), + LIQUID_SPLASH(-1, "liquid.splash"), + LIQUID_SWIM(-1, "liquid.swim"), + LIQUID_WATER(-1, "liquid.water"), + MINECART_BASE(-1, "minecart.base"), + MINECART_INSIDE(-1, "minecart.inside"), + MOB_BAT_DEATH(-1, "mob.bat.death"), + MOB_BAT_HURT(-1, "mob.bat.hurt"), + MOB_BAT_IDLE(-1, "mob.bat.idle"), + MOB_BAT_LOOP(-1, "mob.bat.loop"), + MOB_BAT_TAKEOFF(-1, "mob.bat.takeoff"), + MOB_BLAZE_BREATHE(-1, "mob.blaze.breathe"), + MOB_BLAZE_DEATH(-1, "mob.blaze.death"), + MOB_BLAZE_HIT(-1, "mob.blaze.hit"), + MOB_CAT_HISS(-1, "mob.cat.hiss"), + MOB_CAT_HITT(-1, "mob.cat.hitt"), + MOB_CAT_MEOW(-1, "mob.cat.meow"), + MOB_CAT_PURR(-1, "mob.cat.purr"), + MOB_CAT_PURREOW(-1, "mob.cat.purreow"), + MOB_CHICKEN(-1, "mob.chicken"), + MOB_CHICKEN_HURT(-1, "mob.chicken.hurt"), + MOB_CHICKEN_PLOP(-1, "mob.chicken.plop"), + MOB_CHICKEN_SAY(-1, "mob.chicken.say"), + MOB_CHICKEN_STEP(-1, "mob.chicken.step"), + MOB_COW(-1, "mob.cow"), + MOB_COW_HURT(-1, "mob.cow.hurt"), + MOB_COW_SAY(-1, "mob.cow.say"), + MOB_COW_STEP(-1, "mob.cow.step"), + MOB_CREEPER(-1, "mob.creeper"), + MOB_CREEPER_DEATH(-1, "mob.creeper.death"), + MOB_CREEPER_SAY(-1, "mob.creeper.say"), + MOB_ENDERDRAGON_END(-1, "mob.enderdragon.end"), + MOB_ENDERDRAGON_GROWL(-1, "mob.enderdragon.growl"), + MOB_ENDERDRAGON_HIT(-1, "mob.enderdragon.hit"), + MOB_ENDERDRAGON_WINGS(-1, "mob.enderdragon.wings"), + MOB_ENDERMEN_DEATH(-1, "mob.endermen.death"), + MOB_ENDERMEN_HIT(-1, "mob.endermen.hit"), + MOB_ENDERMEN_IDLE(-1, "mob.endermen.idle"), + MOB_ENDERMEN_PORTAL(-1, "mob.endermen.portal"), + MOB_ENDERMEN_SCREAM(-1, "mob.endermen.scream"), + MOB_ENDERMEN_STARE(-1, "mob.endermen.stare"), + MOB_GHAST_AFFECTIONATE_SCREAM(-1, "mob.ghast.affectionate_scream"), + MOB_GHAST_CHARGE(-1, "mob.ghast.charge"), + MOB_GHAST_DEATH(-1, "mob.ghast.death"), + MOB_GHAST_FIREBALL(-1, "mob.ghast.fireball"), + MOB_GHAST_MOAN(-1, "mob.ghast.moan"), + MOB_GHAST_SCREAM(-1, "mob.ghast.scream"), + MOB_HORSE_ANGRY(-1, "mob.horse.angry"), + MOB_HORSE_ARMOR(-1, "mob.horse.armor"), + MOB_HORSE_BREATHE(-1, "mob.horse.breathe"), + MOB_HORSE_DEATH(-1, "mob.horse.death"), + MOB_HORSE_DONKEY_ANGRY(-1, "mob.horse.donkey.angry"), + MOB_HORSE_DONKEY_DEATH(-1, "mob.horse.donkey.death"), + MOB_HORSE_DONKEY_HIT(-1, "mob.horse.donkey.hit"), + MOB_HORSE_DONKEY_IDLE(-1, "mob.horse.donkey.idle"), + MOB_HORSE_GALLOP(-1, "mob.horse.gallop"), + MOB_HORSE_HIT(-1, "mob.horse.hit"), + MOB_HORSE_IDLE(-1, "mob.horse.idle"), + MOB_HORSE_JUMP(-1, "mob.horse.jump"), + MOB_HORSE_LAND(-1, "mob.horse.land"), + MOB_HORSE_LEATHER(-1, "mob.horse.leather"), + MOB_HORSE_SKELETON_DEATH(-1, "mob.horse.skeleton.death"), + MOB_HORSE_SKELETON_HIT(-1, "mob.horse.skeleton.hit"), + MOB_HORSE_SKELETON_IDLE(-1, "mob.horse.skeleton.idle"), + MOB_HORSE_SOFT(-1, "mob.horse.soft"), + MOB_HORSE_WOOD(-1, "mob.horse.wood"), + MOB_HORSE_ZOMBIE_DEATH(-1, "mob.horse.zombie.death"), + MOB_HORSE_ZOMBIE_HIT(-1, "mob.horse.zombie.hit"), + MOB_HORSE_ZOMBIE_IDLE(-1, "mob.horse.zombie.idle"), + MOB_IRONGOLEM_DEATH(-1, "mob.irongolem.death"), + MOB_IRONGOLEM_HIT(-1, "mob.irongolem.hit"), + MOB_IRONGOLEM_THROW(-1, "mob.irongolem.throw"), + MOB_IRONGOLEM_WALK(-1, "mob.irongolem.walk"), + MOB_MAGMACUBE_BIG(-1, "mob.magmacube.big"), + MOB_MAGMACUBE_JUMP(-1, "mob.magmacube.jump"), + MOB_MAGMACUBE_SMALL(-1, "mob.magmacube.small"), + MOB_PIG(-1, "mob.pig"), + MOB_PIG_DEATH(-1, "mob.pig.death"), + MOB_PIG_SAY(-1, "mob.pig.say"), + MOB_PIG_STEP(-1, "mob.pig.step"), + MOB_SHEEP(-1, "mob.sheep"), + MOB_SHEEP_SAY(-1, "mob.sheep.say"), + MOB_SHEEP_SHEAR(-1, "mob.sheep.shear"), + MOB_SHEEP_STEP(-1, "mob.sheep.step"), + MOB_SILVERFISH_HIT(-1, "mob.silverfish.hit"), + MOB_SILVERFISH_KILL(-1, "mob.silverfish.kill"), + MOB_SILVERFISH_SAY(-1, "mob.silverfish.say"), + MOB_SILVERFISH_STEP(-1, "mob.silverfish.step"), + MOB_SKELETON(-1, "mob.skeleton"), + MOB_SKELETON_DEATH(-1, "mob.skeleton.death"), + MOB_SKELETON_HURT(-1, "mob.skeleton.hurt"), + MOB_SKELETON_SAY(-1, "mob.skeleton.say"), + MOB_SKELETON_STEP(-1, "mob.skeleton.step"), + MOB_SLIME(-1, "mob.slime"), + MOB_SLIME_ATTACK(-1, "mob.slime.attack"), + MOB_SLIME_BIG(-1, "mob.slime.big"), + MOB_SLIME_SMALL(-1, "mob.slime.small"), + MOB_SPIDER(-1, "mob.spider"), + MOB_SPIDER_DEATH(-1, "mob.spider.death"), + MOB_SPIDER_SAY(-1, "mob.spider.say"), + MOB_SPIDER_STEP(-1, "mob.spider.step"), + MOB_VILLAGER_DEATH(-1, "mob.villager.death"), + MOB_VILLAGER_HAGGLE(-1, "mob.villager.haggle"), + MOB_VILLAGER_HIT(-1, "mob.villager.hit"), + MOB_VILLAGER_IDLE(-1, "mob.villager.idle"), + MOB_VILLAGER_NO(-1, "mob.villager.no"), + MOB_VILLAGER_YES(-1, "mob.villager.yes"), + MOB_WITHER_DEATH(-1, "mob.wither.death"), + MOB_WITHER_HURT(-1, "mob.wither.hurt"), + MOB_WITHER_IDLE(-1, "mob.wither.idle"), + MOB_WITHER_SHOOT(-1, "mob.wither.shoot"), + MOB_WITHER_SPAWN(-1, "mob.wither.spawn"), + MOB_WOLF_BARK(-1, "mob.wolf.bark"), + MOB_WOLF_DEATH(-1, "mob.wolf.death"), + MOB_WOLF_GROWL(-1, "mob.wolf.growl"), + MOB_WOLF_HOWL(-1, "mob.wolf.howl"), + MOB_WOLF_HURT(-1, "mob.wolf.hurt"), + MOB_WOLF_PANTING(-1, "mob.wolf.panting"), + MOB_WOLF_SHAKE(-1, "mob.wolf.shake"), + MOB_WOLF_STEP(-1, "mob.wolf.step"), + MOB_WOLF_WHINE(-1, "mob.wolf.whine"), + MOB_ZOMBIE(-1, "mob.zombie"), + MOB_ZOMBIE_DEATH(-1, "mob.zombie.death"), + MOB_ZOMBIE_HURT(-1, "mob.zombie.hurt"), + MOB_ZOMBIE_INFECT(-1, "mob.zombie.infect"), + MOB_ZOMBIE_METAL(-1, "mob.zombie.metal"), + MOB_ZOMBIE_REMEDY(-1, "mob.zombie.remedy"), + MOB_ZOMBIE_SAY(-1, "mob.zombie.say"), + MOB_ZOMBIE_STEP(-1, "mob.zombie.step"), + MOB_ZOMBIE_UNFECT(-1, "mob.zombie.unfect"), + MOB_ZOMBIE_WOOD(-1, "mob.zombie.wood"), + MOB_ZOMBIE_WOODBREAK(-1, "mob.zombie.woodbreak"), + MOB_ZOMBIEPIG_ZPIG(-1, "mob.zombiepig.zpig"), + MOB_ZOMBIEPIG_ZPIGANGRY(-1, "mob.zombiepig.zpigangry"), + MOB_ZOMBIEPIG_ZPIGDEATH(-1, "mob.zombiepig.zpigdeath"), + MOB_ZOMBIEPIG_ZPIGHURT(-1, "mob.zombiepig.zpighurt"), + MUSIC_GAME_CALM(-1, "music.game.calm"), + MUSIC_GAME_CREATIVE_CREATIVE(-1, "music.game.creative.creative"), + MUSIC_GAME_END_BOSS(-1, "music.game.end.boss"), + MUSIC_GAME_END_CREDITS(-1, "music.game.end.credits"), + MUSIC_GAME_END_END(-1, "music.game.end.end"), + MUSIC_GAME_HAL(-1, "music.game.hal"), + MUSIC_GAME_NETHER_NETHER(-1, "music.game.nether.nether"), + MUSIC_GAME_NUANCE(-1, "music.game.nuance"), + MUSIC_GAME_PIANO(-1, "music.game.piano"), + MUSIC_MENU_MENU(-1, "music.menu.menu"), + NOTE_BASS(-1, "note.bass"), + NOTE_BASSATTACK(-1, "note.bassattack"), + NOTE_BD(-1, "note.bd"), + NOTE_HARP(-1, "note.harp"), + NOTE_HAT(-1, "note.hat"), + NOTE_PLING(-1, "note.pling"), + NOTE_SNARE(-1, "note.snare"), + PORTAL_PORTAL(-1, "portal.portal"), + PORTAL_TRAVEL(-1, "portal.travel"), + PORTAL_TRIGGER(-1, "portal.trigger"), + RANDOM_ANVIL_LAND(-1, "random.anvil_land"), + RANDOM_BOW(-1, "random.bow"), + RANDOM_BOWHIT(-1, "random.bowhit"), + RANDOM_BREATH(-1, "random.breath"), + RANDOM_BURP(-1, "random.burp"), + RANDOM_CHESTCLOSED(-1, "random.chestclosed"), + RANDOM_CHESTOPEN(-1, "random.chestopen"), + RANDOM_CLASSIC_HURT(-1, "random.classic_hurt"), + RANDOM_DOOR_CLOSE(-1, "random.door_close"), + RANDOM_DOOR_OPEN(-1, "random.door_open"), + RANDOM_DRINK(-1, "random.drink"), + RANDOM_DRR(-1, "random.drr"), + RANDOM_EAT(-1, "random.eat"), + RANDOM_FUSE(-1, "random.fuse"), + RANDOM_GLASS(-1, "random.glass"), + RANDOM_HURT(-1, "random.hurt"), + RANDOM_LEVELUP(-1, "random.levelup"), + RANDOM_ORB(-1, "random.orb"), + RANDOM_POP(-1, "random.pop"), + RANDOM_SPLASH(-1, "random.splash"), + RANDOM_SUCCESSFUL_HIT(-1, "random.successful_hit"), + RANDOM_WOOD_CLICK(-1, "random.wood_click"), + RECORDS_11(-1, "records.11"), + RECORDS_13(-1, "records.13"), + RECORDS_BLOCKS(-1, "records.blocks"), + RECORDS_CAT(-1, "records.cat"), + RECORDS_CHIRP(-1, "records.chirp"), + RECORDS_FAR(-1, "records.far"), + RECORDS_MALL(-1, "records.mall"), + RECORDS_MELLOHI(-1, "records.mellohi"), + RECORDS_STAL(-1, "records.stal"), + RECORDS_STRAD(-1, "records.strad"), + RECORDS_WAIT(-1, "records.wait"), + RECORDS_WARD(-1, "records.ward"), + STEP_CLOTH(-1, "step.cloth"), + STEP_GRASS(-1, "step.grass"), + STEP_GRAVEL(-1, "step.gravel"), + STEP_LADDER(-1, "step.ladder"), + STEP_SAND(-1, "step.sand"), + STEP_SNOW(-1, "step.snow"), + STEP_STONE(-1, "step.stone"), + STEP_WOOD(-1, "step.wood"), + TILE_PISTON_IN(-1, "tile.piston.in"), + TILE_PISTON_OUT(-1, "tile.piston.out"), + + NONE(-1, ""); + + /** + * Internal mapping by {@code int} id + */ + private static final Map ID_SOUND_MAP = new ConcurrentHashMap<>(); + /** + * Internal mapping by {@code String} ResourceLocation + */ + private static final Map RESOURCE_STR_SOUND_MAP = new ConcurrentHashMap<>(); + + static { + EnumSet.allOf(SoundResource.class).forEach(sound -> { + if (sound.id > 0) ID_SOUND_MAP.put(sound.id, sound); + }); + EnumSet.allOf(SoundResource.class).forEach(sound -> + RESOURCE_STR_SOUND_MAP.put(sound.resourceLocation.toString(), sound)); + } + + /** + * This Sound's identifier + */ + public final int id; + + /** + * The {@link ResourceLocation} of this {@link SoundResource} + */ + public final ResourceLocation resourceLocation; + + SoundResource(final int id, final ResourceLocation resourceLocation) { + this.id = id; + this.resourceLocation = resourceLocation; + } + + SoundResource(final int id, final String resourcePath) { + this(id, new ResourceLocation(resourcePath)); + } + + SoundResource(final int id, final String resourceDomain, final String resourcePath) { + this(id, new ResourceLocation(resourceDomain.toLowerCase(Locale.ENGLISH), resourcePath)); + } + + /** + * @param id The Sounds identifier + * @return The {@link SoundResource} + */ + public static SoundResource get(int id) { + return ID_SOUND_MAP.get(id); + } + + /** + * @param resourceStr The {@link ResourceLocation}'s String of the {@link SoundResource} + * @return The {@link SoundResource} + */ + public static SoundResource get(String resourceStr) { + return RESOURCE_STR_SOUND_MAP.get(resourceStr); + } + + /** + * Provides a backward-compatible Sounds {@code Map} sound list + * + * @return The map for the deprecated {@link gregtech.api.GregTech_API#sSoundList} + * @deprecated This method is planned for removal. + *

Use this {@link SoundResource} enum instead.

+ */ + @Deprecated + public static Map asSoundList() { + return Maps.transformValues(ID_SOUND_MAP, SoundResource::toString); + } + + /** + * @inheritDoc + */ + @Override + public String toString() { + return this.resourceLocation.toString(); + } +} diff --git a/src/main/java/gregtech/api/graphs/consumers/NodeEnergyReceiver.java b/src/main/java/gregtech/api/graphs/consumers/NodeEnergyReceiver.java index 1b5e00773b..bd9e75945b 100644 --- a/src/main/java/gregtech/api/graphs/consumers/NodeEnergyReceiver.java +++ b/src/main/java/gregtech/api/graphs/consumers/NodeEnergyReceiver.java @@ -3,6 +3,7 @@ package gregtech.api.graphs.consumers; import cofh.api.energy.IEnergyReceiver; import gregtech.GT_Mod; import gregtech.api.GregTech_API; +import gregtech.api.enums.SoundResource; import gregtech.api.util.GT_Utility; import gregtech.api.util.WorldSpawnedEventBuilder; import gregtech.common.GT_Pollution; @@ -69,7 +70,7 @@ public class NodeEnergyReceiver extends ConsumerNode { aExplosionPower < V[15] ? 19.0F : 20.0F; int tX = mTileEntity.xCoord, tY = mTileEntity.yCoord, tZ = mTileEntity.zCoord; World tWorld = mTileEntity.getWorldObj(); - GT_Utility.sendSoundToPlayers(tWorld, GregTech_API.sSoundList.get(209), 1.0F, -1, tX, tY, tZ); + GT_Utility.sendSoundToPlayers(tWorld, SoundResource.IC2_MACHINES_MACHINE_OVERLOAD, 1.0F, -1, tX, tY, tZ); tWorld.setBlock(tX, tY, tZ, Blocks.air); if (GregTech_API.sMachineExplosions) if (GT_Mod.gregtechproxy.mPollution) diff --git a/src/main/java/gregtech/api/items/GT_Spray_Bug_Item.java b/src/main/java/gregtech/api/items/GT_Spray_Bug_Item.java index 75d4dc3e80..5b697748da 100644 --- a/src/main/java/gregtech/api/items/GT_Spray_Bug_Item.java +++ b/src/main/java/gregtech/api/items/GT_Spray_Bug_Item.java @@ -1,6 +1,6 @@ package gregtech.api.items; -import gregtech.api.GregTech_API; +import gregtech.api.enums.SoundResource; import gregtech.api.util.GT_ModHandler; import gregtech.api.util.GT_Utility; import net.minecraft.block.Block; @@ -20,9 +20,9 @@ public class GT_Spray_Bug_Item extends GT_Tool_Item { addToEffectiveList("EntityTFTowerBroodling"); addToEffectiveList("EntityTFFireBeetle"); addToEffectiveList("EntityTFSlimeBeetle"); - setCraftingSound(GregTech_API.sSoundList.get(102)); - setBreakingSound(GregTech_API.sSoundList.get(102)); - setEntityHitSound(GregTech_API.sSoundList.get(102)); + setCraftingSound(Sounds.IC2_TOOLS_PAINTER); + setBreakingSound(Sounds.IC2_TOOLS_PAINTER); + setEntityHitSound(Sounds.IC2_TOOLS_PAINTER); setUsageAmounts(8, 4, 1);*/ } @@ -56,7 +56,7 @@ public class GT_Spray_Bug_Item extends GT_Tool_Item { int tCropBefore = ((ic2.api.crops.ICropTile) aTileEntity).getWeedExStorage(); if (tCropBefore <= 100 && GT_ModHandler.damageOrDechargeItem(aStack, 1, 1000, aPlayer)) { ((ic2.api.crops.ICropTile) aTileEntity).setWeedExStorage(tCropBefore + 100); - GT_Utility.sendSoundToPlayers(aWorld, GregTech_API.sSoundList.get(102), 1.0F, -1, aX, aY, aZ); + GT_Utility.sendSoundToPlayers(aWorld, SoundResource.IC2_TOOLS_PAINTER, 1.0F, -1, aX, aY, aZ); return true; } } diff --git a/src/main/java/gregtech/api/items/GT_Spray_Foam_Item.java b/src/main/java/gregtech/api/items/GT_Spray_Foam_Item.java index 76339b9886..58bfafdffb 100644 --- a/src/main/java/gregtech/api/items/GT_Spray_Foam_Item.java +++ b/src/main/java/gregtech/api/items/GT_Spray_Foam_Item.java @@ -1,6 +1,6 @@ package gregtech.api.items; -import gregtech.api.GregTech_API; +import gregtech.api.enums.SoundResource; import gregtech.api.metatileentity.BaseMetaPipeEntity; import gregtech.api.util.GT_Log; import gregtech.api.util.GT_ModHandler; @@ -19,9 +19,9 @@ import static gregtech.api.enums.GT_Values.D1; public class GT_Spray_Foam_Item extends GT_Tool_Item { public GT_Spray_Foam_Item(String aUnlocalized, String aEnglish, int aMaxDamage, int aEntityDamage) { super(aUnlocalized, aEnglish, "Precision Spray", aMaxDamage, aEntityDamage, true);/* - setCraftingSound(GregTech_API.sSoundList.get(102)); - setBreakingSound(GregTech_API.sSoundList.get(102)); - setEntityHitSound(GregTech_API.sSoundList.get(102)); + setCraftingSound(Sounds.IC2_TOOLS_PAINTER); + setBreakingSound(Sounds.IC2_TOOLS_PAINTER); + setEntityHitSound(Sounds.IC2_TOOLS_PAINTER); setUsageAmounts(25, 3, 1);*/ } @@ -72,7 +72,7 @@ public class GT_Spray_Foam_Item extends GT_Tool_Item { if (GT_Utility.getClassName(aTileEntity).startsWith("TileEntityCable")) { if (GT_Utility.getPublicField(aTileEntity, "foamed").getByte(aTileEntity) == 0) { if (GT_ModHandler.damageOrDechargeItem(aStack, 1, 1000, aPlayer)) { - GT_Utility.sendSoundToPlayers(aWorld, GregTech_API.sSoundList.get(102), 1.0F, -1, aX, aY, aZ); + GT_Utility.sendSoundToPlayers(aWorld, SoundResource.IC2_TOOLS_PAINTER, 1.0F, -1, aX, aY, aZ); GT_Utility.callPublicMethod(aTileEntity, "changeFoam", (byte) 1); return true; } @@ -85,7 +85,7 @@ public class GT_Spray_Foam_Item extends GT_Tool_Item { if (aTileEntity instanceof BaseMetaPipeEntity && (((BaseMetaPipeEntity) aTileEntity).mConnections & -64) == 0) { if (GT_ModHandler.damageOrDechargeItem(aStack, 1, 1000, aPlayer)) { - GT_Utility.sendSoundToPlayers(aWorld, GregTech_API.sSoundList.get(102), 1.0F, -1, aX, aY, aZ); + GT_Utility.sendSoundToPlayers(aWorld, SoundResource.IC2_TOOLS_PAINTER, 1.0F, -1, aX, aY, aZ); ((BaseMetaPipeEntity) aTileEntity).mConnections |= 64; } return true; @@ -122,7 +122,7 @@ public class GT_Spray_Foam_Item extends GT_Tool_Item { switch (0) { case 0: if (GT_Utility.isBlockAir(aWorld, aX, aY, aZ) && GT_ModHandler.damageOrDechargeItem(aStack, 1, 1000, aPlayer)) { - GT_Utility.sendSoundToPlayers(aWorld, GregTech_API.sSoundList.get(102), 1.0F, -1, aX, aY, aZ); + GT_Utility.sendSoundToPlayers(aWorld, SoundResource.IC2_TOOLS_PAINTER, 1.0F, -1, aX, aY, aZ); aWorld.setBlock(aX, aY, aZ, GT_Utility.getBlockFromStack(tStack), tStack.getItemDamage(), 3); return true; } @@ -130,7 +130,7 @@ public class GT_Spray_Foam_Item extends GT_Tool_Item { case 1: for (byte i = 0; i < 4; i++) { if (GT_Utility.isBlockAir(aWorld, aX, aY, aZ) && GT_ModHandler.damageOrDechargeItem(aStack, 1, 1000, aPlayer)) { - GT_Utility.sendSoundToPlayers(aWorld, GregTech_API.sSoundList.get(102), 1.0F, -1, aX, aY, aZ); + GT_Utility.sendSoundToPlayers(aWorld, SoundResource.IC2_TOOLS_PAINTER, 1.0F, -1, aX, aY, aZ); aWorld.setBlock(aX, aY, aZ, GT_Utility.getBlockFromStack(tStack), tStack.getItemDamage(), 3); } else { if (i == 0) return false; @@ -155,7 +155,7 @@ public class GT_Spray_Foam_Item extends GT_Tool_Item { for (byte j = 0; j < 3; j++) { if (GT_Utility.isBlockAir(aWorld, aX + (tXFactor ? i : 0), aY + (!tXFactor && tYFactor ? i : 0) + (!tZFactor && tYFactor ? j : 0), aZ + (tZFactor ? j : 0))) { if (GT_ModHandler.damageOrDechargeItem(aStack, 1, 1000, aPlayer)) { - GT_Utility.sendSoundToPlayers(aWorld, GregTech_API.sSoundList.get(102), 1.0F, -1, aX, aY, aZ); + GT_Utility.sendSoundToPlayers(aWorld, SoundResource.IC2_TOOLS_PAINTER, 1.0F, -1, aX, aY, aZ); aWorld.setBlock(aX + (tXFactor ? i : 0), aY + (!tXFactor && tYFactor ? i : 0) + (!tZFactor && tYFactor ? j : 0), aZ + (tZFactor ? j : 0), GT_Utility.getBlockFromStack(tStack), tStack.getItemDamage(), 3); temp = true; } else { diff --git a/src/main/java/gregtech/api/items/GT_Spray_Hardener_Item.java b/src/main/java/gregtech/api/items/GT_Spray_Hardener_Item.java index ae2bb27d77..4c8d64b5ee 100644 --- a/src/main/java/gregtech/api/items/GT_Spray_Hardener_Item.java +++ b/src/main/java/gregtech/api/items/GT_Spray_Hardener_Item.java @@ -1,6 +1,6 @@ package gregtech.api.items; -import gregtech.api.GregTech_API; +import gregtech.api.enums.SoundResource; import gregtech.api.metatileentity.BaseMetaPipeEntity; import gregtech.api.util.GT_Log; import gregtech.api.util.GT_ModHandler; @@ -17,9 +17,9 @@ import static gregtech.api.enums.GT_Values.D1; public class GT_Spray_Hardener_Item extends GT_Tool_Item { public GT_Spray_Hardener_Item(String aUnlocalized, String aEnglish, int aMaxDamage, int aEntityDamage) { super(aUnlocalized, aEnglish, "Construction Foam Hardener", aMaxDamage, aEntityDamage, true);/* - setCraftingSound(GregTech_API.sSoundList.get(102)); - setBreakingSound(GregTech_API.sSoundList.get(102)); - setEntityHitSound(GregTech_API.sSoundList.get(102)); + setCraftingSound(Sounds.IC2_TOOLS_PAINTER); + setBreakingSound(Sounds.IC2_TOOLS_PAINTER); + setEntityHitSound(Sounds.IC2_TOOLS_PAINTER); setUsageAmounts(16, 3, 1);*/ } @@ -38,7 +38,7 @@ public class GT_Spray_Hardener_Item extends GT_Tool_Item { if (GT_Utility.getClassName(aTileEntity).startsWith("TileEntityCable")) { if (GT_Utility.getPublicField(aTileEntity, "foamed").getByte(aTileEntity) == 1) { if (GT_ModHandler.damageOrDechargeItem(aStack, 1, 1000, aPlayer)) { - GT_Utility.sendSoundToPlayers(aWorld, GregTech_API.sSoundList.get(102), 1.0F, -1, aX, aY, aZ); + GT_Utility.sendSoundToPlayers(aWorld, SoundResource.IC2_TOOLS_PAINTER, 1.0F, -1, aX, aY, aZ); GT_Utility.callPublicMethod(aTileEntity, "changeFoam", (byte) 2); return true; } @@ -52,7 +52,7 @@ public class GT_Spray_Hardener_Item extends GT_Tool_Item { ItemStack tStack1 = GT_ModHandler.getIC2Item("constructionFoam", 1), tStack2 = GT_ModHandler.getIC2Item("constructionFoamWall", 1); if (tStack1 != null && tStack1.isItemEqual(new ItemStack(aBlock)) && tStack2 != null && tStack2.getItem() instanceof ItemBlock) { if (GT_ModHandler.damageOrDechargeItem(aStack, 1, 1000, aPlayer)) { - GT_Utility.sendSoundToPlayers(aWorld, GregTech_API.sSoundList.get(102), 1.0F, -1, aX, aY, aZ); + GT_Utility.sendSoundToPlayers(aWorld, SoundResource.IC2_TOOLS_PAINTER, 1.0F, -1, aX, aY, aZ); aWorld.setBlock(aX, aY, aZ, GT_Utility.getBlockFromStack(tStack2), 7, 3); } return true; @@ -60,7 +60,7 @@ public class GT_Spray_Hardener_Item extends GT_Tool_Item { if (aTileEntity instanceof BaseMetaPipeEntity && (((BaseMetaPipeEntity) aTileEntity).mConnections & -64) == 64) { if (GT_ModHandler.damageOrDechargeItem(aStack, 1, 1000, aPlayer)) { - GT_Utility.sendSoundToPlayers(aWorld, GregTech_API.sSoundList.get(102), 1.0F, -1, aX, aY, aZ); + GT_Utility.sendSoundToPlayers(aWorld, SoundResource.IC2_TOOLS_PAINTER, 1.0F, -1, aX, aY, aZ); ((BaseMetaPipeEntity) aTileEntity).mConnections = (byte) ((((BaseMetaPipeEntity) aTileEntity).mConnections & ~64) | -128); } return true; diff --git a/src/main/java/gregtech/api/items/GT_Spray_Hydration_Item.java b/src/main/java/gregtech/api/items/GT_Spray_Hydration_Item.java index 2f6132261b..13ecdea3fa 100644 --- a/src/main/java/gregtech/api/items/GT_Spray_Hydration_Item.java +++ b/src/main/java/gregtech/api/items/GT_Spray_Hydration_Item.java @@ -1,6 +1,6 @@ package gregtech.api.items; -import gregtech.api.GregTech_API; +import gregtech.api.enums.SoundResource; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.util.GT_ModHandler; import gregtech.api.util.GT_Utility; @@ -13,9 +13,9 @@ import net.minecraft.world.World; public class GT_Spray_Hydration_Item extends GT_Tool_Item { public GT_Spray_Hydration_Item(String aUnlocalized, String aEnglish, int aMaxDamage, int aEntityDamage) { super(aUnlocalized, aEnglish, "To hydrate Crops and similar", aMaxDamage, aEntityDamage, true);/* - setCraftingSound(GregTech_API.sSoundList.get(102)); - setBreakingSound(GregTech_API.sSoundList.get(102)); - setEntityHitSound(GregTech_API.sSoundList.get(102)); + setCraftingSound(Sounds.IC2_TOOLS_PAINTER); + setBreakingSound(Sounds.IC2_TOOLS_PAINTER); + setEntityHitSound(Sounds.IC2_TOOLS_PAINTER); setUsageAmounts(20, 3, 1);*/ } @@ -35,7 +35,7 @@ public class GT_Spray_Hydration_Item extends GT_Tool_Item { int tCropBefore = ((ic2.api.crops.ICropTile) aTileEntity).getHydrationStorage(); if (tCropBefore <= 100 && GT_ModHandler.damageOrDechargeItem(aStack, 1, 1000, aPlayer)) { ((ic2.api.crops.ICropTile) aTileEntity).setHydrationStorage(tCropBefore + 100); - GT_Utility.sendSoundToPlayers(aWorld, GregTech_API.sSoundList.get(102), 1.0F, -1, aX, aY, aZ); + GT_Utility.sendSoundToPlayers(aWorld, SoundResource.IC2_TOOLS_PAINTER, 1.0F, -1, aX, aY, aZ); } return true; } @@ -44,7 +44,7 @@ public class GT_Spray_Hydration_Item extends GT_Tool_Item { if (aTileEntity instanceof IGregTechTileEntity) { if (((IGregTechTileEntity) aTileEntity).getColorization() >= 0 && GT_ModHandler.damageOrDechargeItem(aStack, 1, 1000, aPlayer)) { ((IGregTechTileEntity) aTileEntity).setColorization((byte) -1); - GT_Utility.sendSoundToPlayers(aWorld, GregTech_API.sSoundList.get(102), 1.0F, -1, aX, aY, aZ); + GT_Utility.sendSoundToPlayers(aWorld, SoundResource.IC2_TOOLS_PAINTER, 1.0F, -1, aX, aY, aZ); } } diff --git a/src/main/java/gregtech/api/items/GT_Spray_Ice_Item.java b/src/main/java/gregtech/api/items/GT_Spray_Ice_Item.java index 400f183cbb..ddd9062d73 100644 --- a/src/main/java/gregtech/api/items/GT_Spray_Ice_Item.java +++ b/src/main/java/gregtech/api/items/GT_Spray_Ice_Item.java @@ -1,8 +1,8 @@ package gregtech.api.items; -import gregtech.api.GregTech_API; import gregtech.api.enums.Materials; import gregtech.api.enums.OrePrefixes; +import gregtech.api.enums.SoundResource; import gregtech.api.util.GT_ModHandler; import gregtech.api.util.GT_Utility; import net.minecraft.block.Block; @@ -26,9 +26,9 @@ public class GT_Spray_Ice_Item extends GT_Tool_Item { addToEffectiveList("EntityTFFireBeetle"); addToEffectiveList("EntityTFMazeSlime"); addToEffectiveList("EntityTFSlimeBeetle"); - setCraftingSound(GregTech_API.sSoundList.get(102)); - setBreakingSound(GregTech_API.sSoundList.get(102)); - setEntityHitSound(GregTech_API.sSoundList.get(102)); + setCraftingSound(Sounds.IC2_TOOLS_PAINTER); + setBreakingSound(Sounds.IC2_TOOLS_PAINTER); + setEntityHitSound(Sounds.IC2_TOOLS_PAINTER); setUsageAmounts(4, 16, 1);*/ for (Object tName : Arrays.asList(OrePrefixes.bucket.get(Materials.Water), OrePrefixes.cell.get(Materials.Water), OrePrefixes.capsule.get(Materials.Water))) { @@ -61,7 +61,7 @@ public class GT_Spray_Ice_Item extends GT_Tool_Item { if (aBlock == Blocks.water || aBlock == Blocks.flowing_water) { if (aMeta == 0 && GT_ModHandler.damageOrDechargeItem(aStack, 1, 1000, aPlayer)) { - GT_Utility.sendSoundToPlayers(aWorld, GregTech_API.sSoundList.get(102), 1.0F, -1, aX, aY, aZ); + GT_Utility.sendSoundToPlayers(aWorld, SoundResource.IC2_TOOLS_PAINTER, 1.0F, -1, aX, aY, aZ); aWorld.setBlock(aX, aY, aZ, Blocks.ice, 0, 3); return true; } @@ -70,7 +70,7 @@ public class GT_Spray_Ice_Item extends GT_Tool_Item { if (aBlock == Blocks.lava || aBlock == Blocks.flowing_lava) { if (aMeta == 0 && GT_ModHandler.damageOrDechargeItem(aStack, 1, 1000, aPlayer)) { - GT_Utility.sendSoundToPlayers(aWorld, GregTech_API.sSoundList.get(102), 1.0F, -1, aX, aY, aZ); + GT_Utility.sendSoundToPlayers(aWorld, SoundResource.IC2_TOOLS_PAINTER, 1.0F, -1, aX, aY, aZ); aWorld.setBlock(aX, aY, aZ, Blocks.obsidian, 0, 3); return true; } diff --git a/src/main/java/gregtech/api/metatileentity/BaseMetaPipeEntity.java b/src/main/java/gregtech/api/metatileentity/BaseMetaPipeEntity.java index 0d8f64030e..524e377010 100644 --- a/src/main/java/gregtech/api/metatileentity/BaseMetaPipeEntity.java +++ b/src/main/java/gregtech/api/metatileentity/BaseMetaPipeEntity.java @@ -1,19 +1,9 @@ package gregtech.api.metatileentity; -import static gregtech.GT_Mod.GT_FML_LOGGER; -import static gregtech.api.enums.GT_Values.NW; -import static gregtech.api.metatileentity.BaseMetaTileEntity.COVER_DATA_NBT_KEYS; - -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; -import java.util.UUID; - -import gregtech.GT_Mod; import gregtech.api.GregTech_API; import gregtech.api.enums.GT_Values; +import gregtech.api.enums.SoundResource; import gregtech.api.enums.Textures; -import gregtech.api.enums.Textures.BlockIcons; import gregtech.api.graphs.Lock; import gregtech.api.graphs.Node; import gregtech.api.graphs.paths.NodePath; @@ -25,31 +15,30 @@ import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.interfaces.tileentity.IPipeRenderedTileEntity; import gregtech.api.net.GT_Packet_TileEntity; import gregtech.api.objects.GT_ItemStack; -import gregtech.api.util.*; -import gregtech.common.GT_Client; -import gregtech.common.covers.GT_Cover_Fluidfilter; +import gregtech.api.util.GT_Log; +import gregtech.api.util.GT_ModHandler; +import gregtech.api.util.GT_OreDictUnificator; +import gregtech.api.util.GT_Utility; import net.minecraft.block.Block; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.network.Packet; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.EnumChatFormatting; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; -import net.minecraftforge.fluids.*; +import net.minecraftforge.fluids.Fluid; +import net.minecraftforge.fluids.FluidStack; +import net.minecraftforge.fluids.FluidTankInfo; +import net.minecraftforge.fluids.IFluidHandler; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; -import java.util.UUID; +import java.util.*; import static gregtech.GT_Mod.GT_FML_LOGGER; import static gregtech.api.enums.GT_Values.NW; -import static gregtech.api.metatileentity.BaseMetaTileEntity.COVER_DATA_NBT_KEYS; /** * NEVER INCLUDE THIS FILE IN YOUR MOD!!! @@ -59,9 +48,8 @@ import static gregtech.api.metatileentity.BaseMetaTileEntity.COVER_DATA_NBT_KEYS public class BaseMetaPipeEntity extends CommonMetaTileEntity implements IGregTechTileEntity, IPipeRenderedTileEntity, IDebugableTileEntity { public byte mConnections = IConnectable.NO_CONNECTION; protected MetaPipeEntity mMetaTileEntity; - private int[] mTimeStatistics = new int[GregTech_API.TICKS_FOR_LAG_AVERAGING]; + private final int[] mTimeStatistics = new int[GregTech_API.TICKS_FOR_LAG_AVERAGING]; private boolean mWorkUpdate = false, mWorks = true; - private final boolean mCheckConnections = false; private byte mColor = 0, oColor = 0, oStrongRedstone = 0, oRedstoneData = 63, oTextureData = 0, oUpdateData = 0, mLagWarningCount = 0; private int oX = 0, oY = 0, oZ = 0, mTimeStatisticsIndex = 0; protected Node node; @@ -376,12 +364,16 @@ public class BaseMetaPipeEntity extends CommonMetaTileEntity implements IGregTec if (mLagWarningCount > 0) { tList.add("Caused " + (mLagWarningCount >= 10 ? "more than 10" : mLagWarningCount) + " Lag Spike Warnings (anything taking longer than " + GregTech_API.MILLISECOND_THRESHOLD_UNTIL_LAG_WARNING + "ms) on the Server."); } - tList.add("Is" + (mMetaTileEntity.isAccessAllowed(aPlayer) ? " " : EnumChatFormatting.RED+" not "+EnumChatFormatting.RESET) + "accessible for you"); + if (mMetaTileEntity != null) { + tList.add("Is" + (mMetaTileEntity.isAccessAllowed(aPlayer) ? " " : EnumChatFormatting.RED+" not "+EnumChatFormatting.RESET) + "accessible for you"); + } } if(joinedIc2Enet) tList.add("Joined IC2 ENet"); - return mMetaTileEntity.getSpecialDebugInfo(this, aPlayer, aLogLevel, tList); + return mMetaTileEntity != null ? + mMetaTileEntity.getSpecialDebugInfo(this, aPlayer, aLogLevel, tList) : + new ArrayList<>(); } @Override @@ -713,7 +705,7 @@ public class BaseMetaPipeEntity extends CommonMetaTileEntity implements IGregTec tNBT.setIntArray("mCoverSides", mCoverSides); if (hasValidMetaTileEntity()) mMetaTileEntity.setItemNBT(tNBT); if (!tNBT.hasNoTags()) rStack.setTagCompound(tNBT); - return new ArrayList(Arrays.asList(rStack)); + return new ArrayList<>(Collections.singletonList(rStack)); } @Override @@ -741,7 +733,7 @@ public class BaseMetaPipeEntity extends CommonMetaTileEntity implements IGregTec if (mMetaTileEntity.onWrenchRightClick(aSide, tSide, aPlayer, aX, aY, aZ)) { mMetaTileEntity.markDirty(); GT_ModHandler.damageOrDechargeItem(tCurrentItem, 1, 1000, aPlayer); - GT_Utility.sendSoundToPlayers(worldObj, GregTech_API.sSoundList.get(100), 1.0F, -1, xCoord, yCoord, zCoord); + GT_Utility.sendSoundToPlayers(worldObj, SoundResource.IC2_TOOLS_WRENCH, 1.0F, -1, xCoord, yCoord, zCoord); } return true; } @@ -751,14 +743,14 @@ public class BaseMetaPipeEntity extends CommonMetaTileEntity implements IGregTec setCoverDataAtSide(tSide, getCoverBehaviorAtSideNew(tSide).onCoverScrewdriverClick(tSide, getCoverIDAtSide(tSide), getComplexCoverDataAtSide(tSide), this, aPlayer, 0.5F, 0.5F, 0.5F)); mMetaTileEntity.onScrewdriverRightClick(tSide, aPlayer, aX, aY, aZ); mMetaTileEntity.markDirty(); - GT_Utility.sendSoundToPlayers(worldObj, GregTech_API.sSoundList.get(100), 1.0F, -1, xCoord, yCoord, zCoord); + GT_Utility.sendSoundToPlayers(worldObj, SoundResource.IC2_TOOLS_WRENCH, 1.0F, -1, xCoord, yCoord, zCoord); } } else { if (GT_ModHandler.damageOrDechargeItem(tCurrentItem, 1, 1000, aPlayer)) { setCoverDataAtSide(aSide, getCoverBehaviorAtSideNew(aSide).onCoverScrewdriverClick(aSide, getCoverIDAtSide(aSide), getComplexCoverDataAtSide(aSide), this, aPlayer, aX, aY, aZ)); mMetaTileEntity.onScrewdriverRightClick(aSide, aPlayer, aX, aY, aZ); mMetaTileEntity.markDirty(); - GT_Utility.sendSoundToPlayers(worldObj, GregTech_API.sSoundList.get(100), 1.0F, -1, xCoord, yCoord, zCoord); + GT_Utility.sendSoundToPlayers(worldObj, SoundResource.IC2_TOOLS_WRENCH, 1.0F, -1, xCoord, yCoord, zCoord); } } return true; @@ -777,7 +769,7 @@ public class BaseMetaPipeEntity extends CommonMetaTileEntity implements IGregTec else enableWorking(); mMetaTileEntity.markDirty(); GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("090","Machine Processing: ") + (isAllowedToWork() ? GT_Utility.trans("088","Enabled") : GT_Utility.trans("087","Disabled"))); - GT_Utility.sendSoundToPlayers(worldObj, GregTech_API.sSoundList.get(101), 1.0F, -1, xCoord, yCoord, zCoord); + GT_Utility.sendSoundToPlayers(worldObj, SoundResource.IC2_TOOLS_RUBBER_TRAMPOLINE, 1.0F, -1, xCoord, yCoord, zCoord); } return true; } @@ -786,7 +778,7 @@ public class BaseMetaPipeEntity extends CommonMetaTileEntity implements IGregTec if (mMetaTileEntity.onWireCutterRightClick(aSide, tSide, aPlayer, aX, aY, aZ)) { mMetaTileEntity.markDirty(); //logic handled internally - GT_Utility.sendSoundToPlayers(worldObj, GregTech_API.sSoundList.get(100), 1.0F, -1, xCoord, yCoord, zCoord); + GT_Utility.sendSoundToPlayers(worldObj, SoundResource.IC2_TOOLS_WRENCH, 1.0F, -1, xCoord, yCoord, zCoord); } doEnetUpdate(); return true; @@ -796,12 +788,12 @@ public class BaseMetaPipeEntity extends CommonMetaTileEntity implements IGregTec if (mMetaTileEntity.onSolderingToolRightClick(aSide, tSide, aPlayer, aX, aY, aZ)) { mMetaTileEntity.markDirty(); //logic handled internally - GT_Utility.sendSoundToPlayers(worldObj, GregTech_API.sSoundList.get(103), 1.0F, -1, xCoord, yCoord, zCoord); + GT_Utility.sendSoundToPlayers(worldObj, SoundResource.IC2_TOOLS_BATTERY_USE, 1.0F, -1, xCoord, yCoord, zCoord); } else if (GT_ModHandler.useSolderingIron(tCurrentItem, aPlayer)) { mMetaTileEntity.markDirty(); mStrongRedstone ^= (1 << tSide); GT_Utility.sendChatToPlayer(aPlayer, GT_Utility.trans("091","Redstone Output at Side ") + tSide + GT_Utility.trans("092"," set to: ") + ((mStrongRedstone & (1 << tSide)) != 0 ? GT_Utility.trans("093","Strong") : GT_Utility.trans("094","Weak"))); - GT_Utility.sendSoundToPlayers(worldObj, GregTech_API.sSoundList.get(103), 3.0F, -1, xCoord, yCoord, zCoord); + GT_Utility.sendSoundToPlayers(worldObj, SoundResource.IC2_TOOLS_BATTERY_USE, 3.0F, -1, xCoord, yCoord, zCoord); issueBlockUpdate(); } doEnetUpdate(); @@ -819,14 +811,14 @@ public class BaseMetaPipeEntity extends CommonMetaTileEntity implements IGregTec setCoverItemAtSide(coverSide, tCurrentItem); mMetaTileEntity.markDirty(); if (!aPlayer.capabilities.isCreativeMode) tCurrentItem.stackSize--; - GT_Utility.sendSoundToPlayers(worldObj, GregTech_API.sSoundList.get(100), 1.0F, -1, xCoord, yCoord, zCoord); + GT_Utility.sendSoundToPlayers(worldObj, SoundResource.IC2_TOOLS_WRENCH, 1.0F, -1, xCoord, yCoord, zCoord); } return true; } } else { if (GT_Utility.isStackInList(tCurrentItem, GregTech_API.sCrowbarList)) { if (GT_ModHandler.damageOrDechargeItem(tCurrentItem, 1, 1000, aPlayer)) { - GT_Utility.sendSoundToPlayers(worldObj, GregTech_API.sSoundList.get(0), 1.0F, -1, xCoord, yCoord, zCoord); + GT_Utility.sendSoundToPlayers(worldObj, SoundResource.RANDOM_BREAK, 1.0F, -1, xCoord, yCoord, zCoord); dropCover(coverSide, aSide, false); mMetaTileEntity.markDirty(); } diff --git a/src/main/java/gregtech/api/metatileentity/BaseMetaTileEntity.java b/src/main/java/gregtech/api/metatileentity/BaseMetaTileEntity.java index 5fc2e1cc9f..0af728ef27 100644 --- a/src/main/java/gregtech/api/metatileentity/BaseMetaTileEntity.java +++ b/src/main/java/gregtech/api/metatileentity/BaseMetaTileEntity.java @@ -20,6 +20,7 @@ import gregtech.GT_Mod; import gregtech.api.GregTech_API; import gregtech.api.enums.GT_Values; import gregtech.api.enums.ItemList; +import gregtech.api.enums.SoundResource; import gregtech.api.enums.Textures; import gregtech.api.graphs.GenerateNodeMap; import gregtech.api.graphs.GenerateNodeMapPower; @@ -62,11 +63,7 @@ import net.minecraftforge.fluids.FluidTankInfo; import javax.annotation.Nullable; import java.lang.reflect.Field; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collections; -import java.util.List; -import java.util.UUID; +import java.util.*; import static gregtech.GT_Mod.GT_FML_LOGGER; import static gregtech.api.enums.GT_Values.NW; @@ -82,32 +79,30 @@ import static gregtech.api.objects.XSTR.XSTR_INSTANCE; @Optional.Interface(iface = "appeng.api.networking.security.IActionHost", modid = "appliedenergistics2", striprefs = true), @Optional.Interface(iface = "appeng.me.helpers.IGridProxyable", modid = "appliedenergistics2", striprefs = true)}) public class BaseMetaTileEntity extends CommonMetaTileEntity implements IGregTechTileEntity, IActionHost, IGridProxyable, IAlignmentProvider, IConstructableProvider, IDebugableTileEntity, IGregtechWailaProvider { + private static final Field ENTITY_ITEM_HEALTH_FIELD = ReflectionHelper.findField(EntityItem.class, "health", "field_70291_e"); + private final boolean[] mActiveEUInputs = new boolean[]{false, false, false, false, false, false}; + private final boolean[] mActiveEUOutputs = new boolean[]{false, false, false, false, false, false}; + private final int[] mTimeStatistics = new int[GregTech_API.TICKS_FOR_LAG_AVERAGING]; + public long mLastSoundTick = 0; + public boolean mWasShutdown = false; protected MetaTileEntity mMetaTileEntity; protected long mStoredEnergy = 0, mStoredSteam = 0; protected int mAverageEUInputIndex = 0, mAverageEUOutputIndex = 0; protected boolean mReleaseEnergy = false; protected long[] mAverageEUInput = new long[]{0, 0, 0, 0, 0}, mAverageEUOutput = new long[]{0, 0, 0, 0, 0}; - private final boolean[] mActiveEUInputs = new boolean[]{false, false, false, false, false, false}; - private final boolean[] mActiveEUOutputs = new boolean[]{false, false, false, false, false, false}; - private final int[] mTimeStatistics = new int[GregTech_API.TICKS_FOR_LAG_AVERAGING]; private boolean mHasEnoughEnergy = true, mRunningThroughTick = false, mInputDisabled = false, mOutputDisabled = false, mMuffler = false, mLockUpgrade = false; private boolean mActive = false, mWorkUpdate = false, mSteamConverter = false, mWorks = true; private boolean oRedstone = false; - private byte mColor = 0, oColor = 0, oStrongRedstone = 0, oRedstoneData = 63, oTextureData = 0, oUpdateData = 0, oTexturePage=0; + private byte mColor = 0, oColor = 0, oStrongRedstone = 0, oRedstoneData = 63, oTextureData = 0, oUpdateData = 0, oTexturePage = 0; private byte oLightValueClient = -1, oLightValue = -1, mLightValue = 0, mOtherUpgrades = 0, mFacing = 0, oFacing = 0, mWorkData = 0; private int mDisplayErrorCode = 0, oX = 0, oY = 0, oZ = 0, mTimeStatisticsIndex = 0, mLagWarningCount = 0; private long oOutput = 0, mAcceptedAmperes = Long.MAX_VALUE; - public long mLastSoundTick = 0; private long mLastCheckTick = 0; private String mOwnerName = ""; private UUID mOwnerUuid = GT_Utility.defaultUuid; private NBTTagCompound mRecipeStuff = new NBTTagCompound(); private int cableUpdateDelay = 30; - public boolean mWasShutdown = false; - - private static final Field ENTITY_ITEM_HEALTH_FIELD = ReflectionHelper.findField(EntityItem.class, "health", "field_70291_e"); - public BaseMetaTileEntity() { } @@ -170,7 +165,7 @@ public class BaseMetaTileEntity extends CommonMetaTileEntity implements IGregTec mOwnerName = aNBT.getString("mOwnerName"); try { mOwnerUuid = UUID.fromString(aNBT.getString("mOwnerUuid")); - } catch (IllegalArgumentException e){ + } catch (IllegalArgumentException e) { mOwnerUuid = null; } mLockUpgrade = aNBT.getBoolean("mLockUpgrade"); @@ -284,7 +279,7 @@ public class BaseMetaTileEntity extends CommonMetaTileEntity implements IGregTec } } if (aSideServer && mTickTimer > 10) { - if(!doCoverThings()) { + if (!doCoverThings()) { mRunningThroughTick = false; return; } @@ -381,7 +376,8 @@ public class BaseMetaTileEntity extends CommonMetaTileEntity implements IGregTec if (getRandomNumber(10) == 0) { try { GT_Mod.achievements.issueAchievement(this.getWorldObj().getPlayerEntityByName(mOwnerName), "badweather"); - } catch (Exception ignored) {} + } catch (Exception ignored) { + } GT_Log.exp.println("Machine at: " + this.getXCoord() + " | " + this.getYCoord() + " | " + this.getZCoord() + " DIMID: " + this.worldObj.provider.dimensionId + " explosion due to rain!"); doEnergyExplosion(); } else { @@ -396,7 +392,8 @@ public class BaseMetaTileEntity extends CommonMetaTileEntity implements IGregTec if (GregTech_API.sMachineThunderExplosions && worldObj.isThundering() && getRandomNumber(3) == 0) { try { GT_Mod.achievements.issueAchievement(this.getWorldObj().getPlayerEntityByName(mOwnerName), "badweather"); - } catch (Exception ignored) {} + } catch (Exception ignored) { + } GT_Log.exp.println("Machine at: " + this.getXCoord() + " | " + this.getYCoord() + " | " + this.getZCoord() + " DIMID: " + this.worldObj.provider.dimensionId + " explosion due to Thunderstorm!"); doEnergyExplosion(); } @@ -509,7 +506,7 @@ public class BaseMetaTileEntity extends CommonMetaTileEntity implements IGregTec tTime = System.nanoTime() - tTime; if (mTimeStatistics.length > 0) mTimeStatistics[mTimeStatisticsIndex = (mTimeStatisticsIndex + 1) % mTimeStatistics.length] = (int) tTime; - if (tTime > 0 && tTime > (GregTech_API.MILLISECOND_THRESHOLD_UNTIL_LAG_WARNING* 1000000L) && mTickTimer > 1000 && getMetaTileEntity().doTickProfilingMessageDuringThisTick() && mLagWarningCount++ < 10) + if (tTime > 0 && tTime > (GregTech_API.MILLISECOND_THRESHOLD_UNTIL_LAG_WARNING * 1000000L) && mTickTimer > 1000 && getMetaTileEntity().doTickProfilingMessageDuringThisTick() && mLagWarningCount++ < 10) GT_FML_LOGGER.warn("WARNING: Possible Lag Source at [" + xCoord + ", " + yCoord + ", " + zCoord + "] in Dimension " + worldObj.provider.dimensionId + " with " + tTime + "ns caused by an instance of " + getMetaTileEntity().getClass()); } @@ -518,7 +515,7 @@ public class BaseMetaTileEntity extends CommonMetaTileEntity implements IGregTec @Override public void getWailaBody(ItemStack itemStack, List currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) { - if(hasValidMetaTileEntity() && getMetaTileEntity() != null) { + if (hasValidMetaTileEntity() && getMetaTileEntity() != null) { getMetaTileEntity().getWailaBody(itemStack, currenttip, accessor, config); } super.getWailaBody(itemStack, currenttip, accessor, config); @@ -527,7 +524,7 @@ public class BaseMetaTileEntity extends CommonMetaTileEntity implements IGregTec @Override public void getWailaNBTData(EntityPlayerMP player, TileEntity tile, NBTTagCompound tag, World world, int x, int y, int z) { super.getWailaNBTData(player, tile, tag, world, x, y, z); - if(hasValidMetaTileEntity() && getMetaTileEntity() != null) { + if (hasValidMeta