From 18d012789ca1d82266c4886e5bd6e695b073717c Mon Sep 17 00:00:00 2001 From: TheDoctorSoda Date: Sun, 25 Oct 2015 13:47:45 -0700 Subject: [PATCH] Entity Localisation and a couple derpfixes --- .../projectile/EntitySplashLightningBottle.java | 1 - .../java/steamcraft/common/init/InitEntities.java | 14 ++++---------- .../resources/assets/steamcraft/lang/en_GB.lang | 1 + 3 files changed, 5 insertions(+), 11 deletions(-) diff --git a/src/main/java/steamcraft/common/entities/projectile/EntitySplashLightningBottle.java b/src/main/java/steamcraft/common/entities/projectile/EntitySplashLightningBottle.java index ab54f866..40fb1fcf 100644 --- a/src/main/java/steamcraft/common/entities/projectile/EntitySplashLightningBottle.java +++ b/src/main/java/steamcraft/common/entities/projectile/EntitySplashLightningBottle.java @@ -65,7 +65,6 @@ public class EntitySplashLightningBottle extends BaseThrowableEntity { } } } - this.worldObj.playAuxSFX(2002, (int) Math.round(this.posX), (int) Math.round(this.posY), (int) Math.round(this.posZ), 0); this.setDead(); } diff --git a/src/main/java/steamcraft/common/init/InitEntities.java b/src/main/java/steamcraft/common/init/InitEntities.java index 6e4140ef..560f70d9 100755 --- a/src/main/java/steamcraft/common/init/InitEntities.java +++ b/src/main/java/steamcraft/common/init/InitEntities.java @@ -12,12 +12,9 @@ */ package steamcraft.common.init; -import net.minecraft.entity.EnumCreatureType; - import cpw.mods.fml.common.registry.EntityRegistry; - +import net.minecraft.entity.EnumCreatureType; import net.minecraftforge.common.BiomeDictionary; - import steamcraft.common.Steamcraft; import steamcraft.common.entities.EntityFallingBoulder; import steamcraft.common.entities.EntityTimeBomb; @@ -42,10 +39,8 @@ import steamcraft.common.entities.projectile.EntitySplashLightningBottle; * @author Surseance * */ -public class InitEntities -{ - public static void init() - { +public class InitEntities { + public static void init() { int entID = 0; // Mobs @@ -61,8 +56,7 @@ public class InitEntities EntityRegistry.registerModEntity(EntityShroomSkeleton.class, "ShroomSkeleton", entID++, Steamcraft.instance, 64, 1, true); EntityRegistry.registerModEntity(EntityAbandonedGolem.class, "AbandonedGolem", entID++, Steamcraft.instance, 64, 1, true); EntityRegistry.registerModEntity(EntityWhale.class, "Whale", entID++, Steamcraft.instance, 64, 1, true); - EntityRegistry.addSpawn(EntityWhale.class, 1, 1, 1, EnumCreatureType.waterCreature, - BiomeDictionary.getBiomesForType(BiomeDictionary.Type.OCEAN)); + EntityRegistry.addSpawn(EntityWhale.class, 1, 1, 1, EnumCreatureType.waterCreature, BiomeDictionary.getBiomesForType(BiomeDictionary.Type.OCEAN)); // Non-Living // Projectile EntityRegistry.registerModEntity(EntityBullet.class, "Bullet", entID++, Steamcraft.instance, 40, 1, true); diff --git a/src/main/resources/assets/steamcraft/lang/en_GB.lang b/src/main/resources/assets/steamcraft/lang/en_GB.lang index 99ce5453..c8c4ffc2 100755 --- a/src/main/resources/assets/steamcraft/lang/en_GB.lang +++ b/src/main/resources/assets/steamcraft/lang/en_GB.lang @@ -12,3 +12,4 @@ item.itemNugget.0.name=Aluminium Nugget item.itemClockworkRocket.2.desc=Armour-Piercing Shell item.itemSteamcraftcluster.0.name=Native Aluminium Cluster +