Jotunn/TAIGA-Obsidiorite-Heroic-Fixes
1
0
Fork 0
forked from TAIGA/TAIGA
Code Issues Pull Requests Releases Wiki Activity

fixed #149, some more cleanup

Browse Source
This commit is contained in:
Giovanni Harting
2017-07-09 17:55:25 +02:00
parent b063257977
commit 076a6d6f87
6 changed files with 3 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/java/com/sosnitzka/taiga/Blocks.java
View File

@@ -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>

1
src/main/java/com/sosnitzka/taiga/traits/TraitBerserk.java
View File

@@ -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;

1
src/main/java/com/sosnitzka/taiga/traits/TraitDecay.java
View File

@@ -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;

2
src/main/java/com/sosnitzka/taiga/generic/TraitProgressiveStats.java → src/main/java/com/sosnitzka/taiga/traits/TraitProgressiveStats.java
View File

@@ -1,4 +1,4 @@
package com.sosnitzka.taiga.generic;
package com.sosnitzka.taiga.traits;
import net.minecraft.entity.Entity;
import net.minecraft.nbt.NBTTagCompound;

5
src/main/java/com/sosnitzka/taiga/traits/TraitSlaughtering.java
View File

@@ -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())));
}
}
}

1
src/main/java/com/sosnitzka/taiga/traits/TraitSuperHeavy.java
View File

@@ -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;