Removed voice lines and disks.

src/main/java/mod/kagic/entity/gem/EntityBismuth.java

@@ -267,22 +267,6 @@ public void whenDefective() {
 	/*********************************************************
      * Methods related to entity death.                      *
      *********************************************************/
-	public void onDeath(DamageSource cause) {
-		if (!this.world.isRemote) {
-			if (cause.getTrueSource() instanceof EntityLivingBase) {
-				ItemStack heldItem = ((EntityLivingBase)cause.getTrueSource()).getHeldItemMainhand();
-				if (heldItem.isItemEnchanted()) {
-					NBTTagList enchantments = heldItem.getEnchantmentTagList();
-					for (int i = 0; i < enchantments.tagCount(); i++) {
-						if (enchantments.getCompoundTagAt(i).getInteger("id") == Enchantment.getEnchantmentID(ModEnchantments.BREAKING_POINT)) {
-							this.dropItem(ModItems.RECORD_THE_BREAKING_POINT, 1);
-						}
-					}
-				}
-			}
-		}
-		super.onDeath(cause);
-    }
 
 	/*********************************************************
      * Methods related to entity sounds.                     *

src/main/java/mod/kagic/entity/gem/EntityBlueDiamond.java

@@ -208,7 +208,6 @@ public boolean attackEntityAsMob(Entity entityIn) {
 	 *********************************************************/
 	public void onDeath(DamageSource cause) {
 		if (!this.world.isRemote) {
-			this.dropItem(ModItems.RECORD_BLUE_DIAMOND, 1);
 			if (cause.getTrueSource() instanceof EntityPlayer) {
 				List<EntityGem> list = this.world.<EntityGem>getEntitiesWithinAABB(EntityGem.class, this.getEntityBoundingBox().grow(24.0D, 8.0D, 24.0D));
 				EntityPlayer player = (EntityPlayer) cause.getTrueSource();

src/main/java/mod/kagic/entity/gem/EntityJasper.java

@@ -610,11 +610,6 @@ public void onLivingUpdate() {
 	 * Methods related to entity death.					  *
 	 *********************************************************/
 	public void onDeath(DamageSource cause) {
-		if (!this.world.isRemote) {
-			if (cause.getTrueSource() instanceof EntityAmethyst) {
-				this.dropItem(ModItems.RECORD_DUEL_OF_THE_QUARTZ, 1);
-			}
-		}
 		switch (this.getSpecial()) {
 		case 0:
 			if (this.isPrimary()) {

src/main/java/mod/kagic/entity/gem/EntityLapisLazuli.java

@@ -498,16 +498,7 @@ public boolean isOnLadder() {
 	/*********************************************************
 	 * Methods related to death.                             *
 	 *********************************************************/
-	@Override
-	public void onDeath(DamageSource cause) {
-		if (!this.world.isRemote) {
-			if (cause.getTrueSource() instanceof EntitySkeleton) {
-				this.dropItem(ModItems.RECORD_LAPIS_FLIGHT, 1);
-			}
-		}
-		super.onDeath(cause);
-	}
-
+
 	/*********************************************************
 	 * Methods related to sounds.                            *
 	 *********************************************************/

src/main/java/mod/kagic/entity/gem/EntityPeridot.java

@@ -436,12 +436,6 @@ public boolean isFarmer() {
 	/*********************************************************
 	 * Methods related to combat.							*
 	 *********************************************************/
-	@Override
-	public void onStruckByLightning(EntityLightningBolt lightningBolt) {
-		if (!this.world.isRemote && !this.isDead) {
-			this.dropItem(ModItems.RECORD_LITTLE_PERIDOT, 1);
-		}
-	}
 	public boolean attackEntityFrom(DamageSource source, float amount) {
 		return super.attackEntityFrom(source, amount);
 	}

src/main/java/mod/kagic/entity/gem/EntityRoseQuartz.java

@@ -265,17 +265,7 @@ else if (state.getBlock() == ModBlocks.GIANT_STRAWBERRY) {
 		}
 		return super.attackEntityFrom(source, amount);
 	}
-	public void onDeath(DamageSource cause) {
-		if (!this.world.isRemote) {
-			if (cause.getTrueSource() != null) {
-				if (!this.isOwner((EntityLivingBase) cause.getTrueSource())) {
-					this.dropItem(ModItems.RECORD_ROSES_FOUNTAIN, 1);
-				}
-			}
-		}
-		super.onDeath(cause);
-	}
-
+
 	/*********************************************************
 	 * Methods related to combat.							*
 	 *********************************************************/

src/main/java/mod/kagic/entity/gem/EntityYellowDiamond.java

@@ -187,7 +187,6 @@ public boolean attackEntityAsMob(Entity entityIn) {
 	 *********************************************************/
 	public void onDeath(DamageSource cause) {
 		if (!this.world.isRemote) {
-			this.dropItem(ModItems.RECORD_YELLOW_DIAMOND, 1);
 			if (cause.getTrueSource() instanceof EntityPlayer) {
 				List<EntityGem> list = this.world.<EntityGem>getEntitiesWithinAABB(EntityGem.class, this.getEntityBoundingBox().grow(24.0D, 8.0D, 24.0D));
 				EntityPlayer player = (EntityPlayer)cause.getTrueSource();

src/main/java/mod/kagic/init/ModCreativeTabs.java

@@ -15,7 +15,6 @@ public class ModCreativeTabs extends CreativeTabs {
 	public static final CreativeTabs CREATIVE_TAB_GOOD_GEMS = new ModCreativeTabs("good_gems", 0);
 	public static final CreativeTabs CREATIVE_TAB_BAD_GEMS = new ModCreativeTabs("bad_gems", 1);
 	public static final CreativeTabs CREATIVE_TAB_OTHER = new ModCreativeTabs("other", 2);
-	public static final CreativeTabs CREATIVE_TAB_MUSIC = new ModCreativeTabs("music", 3);
 	private final int id;
 
 	public ModCreativeTabs(String label, int id) {
@@ -32,8 +31,6 @@ public ItemStack getTabIconItem() {
 			return new ItemStack(ModItems.CRACKED_YELLOW_DIAMOND_GEM);
 		case 2:
 			return new ItemStack(ModItems.GEM_STAFF);
-		case 3:
-			return new ItemStack(ModItems.RECORD_LAPIS_FLIGHT);
 		}
 		return new ItemStack(ModItems.CRACKED_YELLOW_DIAMOND_GEM);
 	}

src/main/java/mod/kagic/init/ModItems.java

@@ -32,21 +32,6 @@
 public class ModItems {
 	public static final HashMap<ItemGem, ItemGem> GEM_TABLE = new HashMap<ItemGem, ItemGem>();
 
-	public static final ModRecord RECORD_LITTLE_PERIDOT = new ModRecord("little_peridot", ModSounds.RECORD_LITTLE_PERIDOT);
-	public static final ModRecord RECORD_ROSES_FOUNTAIN = new ModRecord("roses_fountain", ModSounds.RECORD_ROSES_FOUNTAIN);
-	public static final ModRecord RECORD_LAPIS_FLIGHT = new ModRecord("lapis_flight", ModSounds.RECORD_LAPIS_FLIGHT);
-	public static final ModRecord RECORD_THE_BREAKING_POINT = new ModRecord("the_breaking_point", ModSounds.RECORD_THE_BREAKING_POINT);
-	public static final ModRecord RECORD_DUEL_OF_THE_QUARTZ = new ModRecord("duel_of_the_quartz", ModSounds.RECORD_DUEL_OF_THE_QUARTZ);
-	public static final ModRecord RECORD_YELLOW_DIAMOND = new ModRecord("yellow_diamond", ModSounds.RECORD_YELLOW_DIAMOND);
-	public static final ModRecord RECORD_BLUE_DIAMOND = new ModRecord("blue_diamond", ModSounds.RECORD_BLUE_DIAMOND);
-	public static final ModRecord RECORD_WHATS_THE_USE_OF_FEELING_BLUE = new ModRecord("whats_the_use_of_feeling_blue", ModSounds.RECORD_WHATS_THE_USE_OF_FEELING_BLUE);
-
-	public static final ModRecord RECORD_HEAVEN_BEETLE = new ModRecord("heaven_beetle", ModSounds.RECORD_HEAVEN_BEETLE);
-	public static final ModRecord RECORD_DEFECTIVE = new ModRecord("defective", ModSounds.RECORD_DEFECTIVE);
-	public static final ModRecord RECORD_GEM_SHARDS = new ModRecord("gem_shards", ModSounds.RECORD_GEM_SHARDS);
-	public static final ModRecord RECORD_HEART_OF_THE_PYRAMID = new ModRecord("pyramid", ModSounds.RECORD_HEART_OF_THE_PYRAMID);
-	public static final ModRecord RECORD_UNDERWATER_TEMPLE = new ModRecord("underwater_temple", ModSounds.RECORD_UNDERWATER_TEMPLE);
-
 	public static final ItemActiveGemShard ACTIVATED_GEM_SHARD = new ItemActiveGemShard();
 	public static final ItemActiveGemBase ACTIVATED_GEM_BASE = new ItemActiveGemBase();
 	public static final ItemInactiveGemBase INACTIVE_GEM_BASE = new ItemInactiveGemBase();
@@ -418,19 +403,6 @@ public static void registerItems(RegistryEvent.Register<Item> event) {
 		registerGem(CORRUPTED_GREEN_WATER_BEAR_GEM, CRACKED_CORRUPTED_GREEN_WATER_BEAR_GEM, event);
 		registerGem(CORRUPTED_WATERMELON_TOURMALINE_GEM, CRACKED_CORRUPTED_WATERMELON_TOURMALINE_GEM, event);
 
-		registerItem(RECORD_LITTLE_PERIDOT, event, "record");
-		registerItem(RECORD_ROSES_FOUNTAIN, event, "record");
-		registerItem(RECORD_LAPIS_FLIGHT, event, "record");
-		registerItem(RECORD_THE_BREAKING_POINT, event, "record");
-		registerItem(RECORD_DUEL_OF_THE_QUARTZ, event, "record");
-		registerItem(RECORD_YELLOW_DIAMOND, event, "record");
-		registerItem(RECORD_BLUE_DIAMOND, event, "record");
-		registerItem(RECORD_WHATS_THE_USE_OF_FEELING_BLUE, event, "record");
-		registerItem(RECORD_HEAVEN_BEETLE, event, "record");
-		registerItem(RECORD_DEFECTIVE, event, "record");
-		registerItem(RECORD_GEM_SHARDS, event, "record");
-		registerItem(RECORD_HEART_OF_THE_PYRAMID, event, "record");
-		registerItem(RECORD_UNDERWATER_TEMPLE, event, "record");
 		registerItem(ACTIVATED_GEM_SHARD, event);
 		registerItem(ACTIVATED_GEM_BASE, event);
 		registerItem(INACTIVE_GEM_BASE, event);

src/main/java/mod/kagic/skills/pack/GetHealth.java

@@ -46,7 +46,7 @@ public void init(EntityGem gem) {
 			feedback = "I'm feeling great, ";
 		} else
 		if (ratio <= 1.0) {
-			feedback = "I'm perfect, ";
+			feedback = "I'm perfective, ";
 		}
 		feedback += "I'm at " + new DecimalFormat("#.00").format(ratio * 100) + "% health.";
 		gem.feedback(feedback);