From 076a6d6f8756e49ccad8d2d18c6f4f03bcfd0f05 Mon Sep 17 00:00:00 2001
From: Giovanni Harting <539@idlegandalf.com>
Date: Sun, 9 Jul 2017 17:55:25 +0200
Subject: [PATCH] fixed #149, some more cleanup

---
 src/main/java/com/sosnitzka/taiga/Blocks.java                | 1 -
 src/main/java/com/sosnitzka/taiga/traits/TraitBerserk.java   | 1 -
 src/main/java/com/sosnitzka/taiga/traits/TraitDecay.java     | 1 -
 .../taiga/{generic => traits}/TraitProgressiveStats.java     | 2 +-
 .../java/com/sosnitzka/taiga/traits/TraitSlaughtering.java   | 5 ++---
 .../java/com/sosnitzka/taiga/traits/TraitSuperHeavy.java     | 1 -
 6 files changed, 3 insertions(+), 8 deletions(-)
 rename src/main/java/com/sosnitzka/taiga/{generic => traits}/TraitProgressiveStats.java (99%)

diff --git a/src/main/java/com/sosnitzka/taiga/Blocks.java b/src/main/java/com/sosnitzka/taiga/Blocks.java
index 62eee38..55c27b8 100644
--- a/src/main/java/com/sosnitzka/taiga/Blocks.java
+++ b/src/main/java/com/sosnitzka/taiga/Blocks.java
@@ -70,7 +70,6 @@ public class Blocks {
     public static Block invaliteBlock = new BasicBlock("invalite_block", Material.ROCK, 20.0f, 35.0f, VIBRANIUM, PREFIX_BLOCK);
 
 
-
     /**
      * Registers all materials' ingots and nuggets <br>
      * Detailed summary: <br>
diff --git a/src/main/java/com/sosnitzka/taiga/traits/TraitBerserk.java b/src/main/java/com/sosnitzka/taiga/traits/TraitBerserk.java
index 96b13be..ec0232d 100644
--- a/src/main/java/com/sosnitzka/taiga/traits/TraitBerserk.java
+++ b/src/main/java/com/sosnitzka/taiga/traits/TraitBerserk.java
@@ -1,6 +1,5 @@
 package com.sosnitzka.taiga.traits;
 
-import com.sosnitzka.taiga.generic.TraitProgressiveStats;
 import com.sosnitzka.taiga.util.Utils;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.EntityLivingBase;
diff --git a/src/main/java/com/sosnitzka/taiga/traits/TraitDecay.java b/src/main/java/com/sosnitzka/taiga/traits/TraitDecay.java
index 7a8f4bc..2d1364c 100644
--- a/src/main/java/com/sosnitzka/taiga/traits/TraitDecay.java
+++ b/src/main/java/com/sosnitzka/taiga/traits/TraitDecay.java
@@ -1,7 +1,6 @@
 package com.sosnitzka.taiga.traits;
 
 import com.google.common.collect.ImmutableList;
-import com.sosnitzka.taiga.generic.TraitProgressiveStats;
 import net.minecraft.entity.Entity;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
diff --git a/src/main/java/com/sosnitzka/taiga/generic/TraitProgressiveStats.java b/src/main/java/com/sosnitzka/taiga/traits/TraitProgressiveStats.java
similarity index 99%
rename from src/main/java/com/sosnitzka/taiga/generic/TraitProgressiveStats.java
rename to src/main/java/com/sosnitzka/taiga/traits/TraitProgressiveStats.java
index 3f535cd..d9af33d 100644
--- a/src/main/java/com/sosnitzka/taiga/generic/TraitProgressiveStats.java
+++ b/src/main/java/com/sosnitzka/taiga/traits/TraitProgressiveStats.java
@@ -1,4 +1,4 @@
-package com.sosnitzka.taiga.generic;
+package com.sosnitzka.taiga.traits;
 
 import net.minecraft.entity.Entity;
 import net.minecraft.nbt.NBTTagCompound;
diff --git a/src/main/java/com/sosnitzka/taiga/traits/TraitSlaughtering.java b/src/main/java/com/sosnitzka/taiga/traits/TraitSlaughtering.java
index 4a9f371..2baf143 100644
--- a/src/main/java/com/sosnitzka/taiga/traits/TraitSlaughtering.java
+++ b/src/main/java/com/sosnitzka/taiga/traits/TraitSlaughtering.java
@@ -3,7 +3,6 @@ package com.sosnitzka.taiga.traits;
 import net.minecraft.entity.EntityLiving;
 import net.minecraft.entity.item.EntityItem;
 import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.NonNullList;
 import net.minecraft.util.text.TextFormatting;
@@ -32,8 +31,8 @@ public class TraitSlaughtering extends AbstractTrait {
         if (event.getSource().getTrueSource() instanceof EntityPlayer) {
             EntityPlayer player = (EntityPlayer) event.getSource().getTrueSource();
             if (!w.isRemote && event.getEntity() instanceof EntityLiving && !(event.getEntity() instanceof EntityPlayer) && TinkerUtil.hasTrait(TagUtil.getTagSafe(player.getHeldItemMainhand()), identifier)) {
-                Item i = event.getDrops().get(random.nextInt(event.getDrops().size())).getItem().getItem();
-                event.getDrops().add(new EntityItem(event.getEntity().getEntityWorld(), event.getEntity().posX, event.getEntity().posY, event.getEntity().posZ, new ItemStack(i, random.nextInt(4) + 1)));
+                ItemStack i = event.getDrops().get(random.nextInt(event.getDrops().size())).getItem();
+                event.getDrops().add(new EntityItem(w, event.getEntity().posX, event.getEntity().posY, event.getEntity().posZ, new ItemStack(i.getItem(), random.nextInt(4) + 1, i.getMetadata(), i.getTagCompound())));
             }
         }
     }
diff --git a/src/main/java/com/sosnitzka/taiga/traits/TraitSuperHeavy.java b/src/main/java/com/sosnitzka/taiga/traits/TraitSuperHeavy.java
index c2f2656..5334048 100644
--- a/src/main/java/com/sosnitzka/taiga/traits/TraitSuperHeavy.java
+++ b/src/main/java/com/sosnitzka/taiga/traits/TraitSuperHeavy.java
@@ -1,6 +1,5 @@
 package com.sosnitzka.taiga.traits;
 
-import com.sosnitzka.taiga.generic.TraitProgressiveStats;
 import com.sosnitzka.taiga.util.Utils;
 import net.minecraft.block.state.IBlockState;
 import net.minecraft.entity.Entity;