BookSerpent/TAIGA_TWO_WIP
0
0
Fork 0
forked from TAIGA/TAIGA
Code Issues Pull Requests Releases Wiki Activity

Fixed something

Browse Source
This commit is contained in:
Robert Sosnitzka
2017-01-19 22:13:20 +01:00
parent 8fbef49b10
commit 719d326f7e
4 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/sosnitzka/taiga/MaterialTraits.java
View File

@@ -55,7 +55,7 @@ public class MaterialTraits {
public static final AbstractTrait superheavy = new TraitSuperHeavy();
public static final AbstractTrait dev = new TraitDevelopement();
public static final AbstractTrait carousel = new TraitCarousel();
public static final AbstractTrait beserk = new TraitBeserk();
public static final AbstractTrait berserk = new TraitBerserk();
public static final AbstractTrait leveled1 = new TraitLeveled(1);
public static final AbstractTrait leveled2 = new TraitLeveled(2);
public static final AbstractTrait leveled3 = new TraitLeveled(3);
@@ -91,7 +91,7 @@ public class MaterialTraits {
public static Material imperomite = new Material("imperomite", TextFormatting.DARK_RED).addTrait(hollow);
public static Material solarium = new Material("solarium", TextFormatting.YELLOW).addTrait(superheavy).addTrait(crushing);
public static Material nihilite = new Material("nihilite", TextFormatting.DARK_GRAY).addTrait(souleater);
public static Material adamant = new Material("adamant", TextFormatting.GOLD).addTrait(beserk).addTrait(leveled1, MaterialTypes.EXTRA).addTrait(leveled2, MaterialTypes.HANDLE).addTrait(leveled3, MaterialTypes.HEAD); //.addTrait(dev);
public static Material adamant = new Material("adamant", TextFormatting.GOLD).addTrait(berserk);
public static Material dyonite = new Material("dyonite", TextFormatting.GREEN).addTrait(tantrum);
public static Material nucleum = new Material("nucleum", TextFormatting.YELLOW).addTrait(decay).addTrait(mutate);
public static Material lumix = new Material("lumix", TextFormatting.YELLOW).addTrait(bright, MaterialTypes.HANDLE).addTrait(glimmer, MaterialTypes.HEAD);

4
src/main/java/com/sosnitzka/taiga/traits/TraitAnalysing.java
View File

@@ -25,7 +25,7 @@ public class TraitAnalysing extends AbstractTrait {
@SubscribeEvent
public void onXpDrop(LivingExperienceDropEvent event) {
EntityPlayer player = event.getAttackingPlayer();
if (player != null && TinkerUtil.hasTrait(TagUtil.getTagSafe(player.getHeldItemMainhand()), this.identifier) && event.getDroppedExperience() >= 0) {
if (player != null && TinkerUtil.hasTrait(TagUtil.getTagSafe(player.getHeldItemMainhand()), this.identifier) && event.getDroppedExperience() > 0) {
event.setDroppedExperience(this.getUpdateXP(event.getDroppedExperience()));
}
@@ -34,7 +34,7 @@ public class TraitAnalysing extends AbstractTrait {
@SubscribeEvent
public void onBlockBreak(BlockEvent.BreakEvent event) {
EntityPlayer player = event.getPlayer();
if (!event.getWorld().isRemote && player != null && TinkerUtil.hasTrait(TagUtil.getTagSafe(player.getHeldItemMainhand()), this.identifier) && event.getExpToDrop() >= 0) {
if (!event.getWorld().isRemote && player != null && TinkerUtil.hasTrait(TagUtil.getTagSafe(player.getHeldItemMainhand()), this.identifier) && event.getExpToDrop() > 0) {
event.setExpToDrop(this.getUpdateXP(event.getExpToDrop()));
}

6
src/main/java/com/sosnitzka/taiga/traits/TraitBeserk.java → src/main/java/com/sosnitzka/taiga/traits/TraitBerserk.java
View File

@@ -17,12 +17,12 @@ import slimeknights.tconstruct.library.utils.TinkerUtil;
import slimeknights.tconstruct.library.utils.ToolHelper;
public class TraitBeserk extends TraitProgressiveStats {
public class TraitBerserk extends TraitProgressiveStats {
protected static int TICK_PER_STAT = 8;
public TraitBeserk() {
super(TraitBeserk.class.getSimpleName().toLowerCase().substring(5), TextFormatting.RED);
public TraitBerserk() {
super(TraitBerserk.class.getSimpleName().toLowerCase().substring(5), TextFormatting.RED);
MinecraftForge.EVENT_BUS.register(this);
}

6
src/main/java/com/sosnitzka/taiga/traits/TraitDiffuse.java
View File

@@ -15,6 +15,10 @@ import slimeknights.tconstruct.library.utils.TinkerUtil;
public class TraitDiffuse extends AbstractTrait {
/**
*
*/
public TraitDiffuse() {
super("diffuse", TextFormatting.DARK_GRAY);
MinecraftForge.EVENT_BUS.register(this);
@@ -40,7 +44,7 @@ public class TraitDiffuse extends AbstractTrait {
}
private float getUpdateXP(int xp) {
float exp = random.nextFloat() * random.nextFloat() * random.nextFloat() * (xp + random.nextFloat() * xp);
float exp = random.nextFloat() * random.nextFloat() * random.nextFloat() * (1 + random.nextFloat() * xp);
if (random.nextFloat() <= 0.25)
return exp;
else return 0;