From 719d326f7e5eab0607fb2038387055dc998f1804 Mon Sep 17 00:00:00 2001 From: Robert Sosnitzka Date: Thu, 19 Jan 2017 22:13:20 +0100 Subject: [PATCH] Fixed something --- src/main/java/com/sosnitzka/taiga/MaterialTraits.java | 4 ++-- .../java/com/sosnitzka/taiga/traits/TraitAnalysing.java | 4 ++-- .../taiga/traits/{TraitBeserk.java => TraitBerserk.java} | 6 +++--- src/main/java/com/sosnitzka/taiga/traits/TraitDiffuse.java | 6 +++++- 4 files changed, 12 insertions(+), 8 deletions(-) rename src/main/java/com/sosnitzka/taiga/traits/{TraitBeserk.java => TraitBerserk.java} (95%) diff --git a/src/main/java/com/sosnitzka/taiga/MaterialTraits.java b/src/main/java/com/sosnitzka/taiga/MaterialTraits.java index ee9ad58..47b2bea 100644 --- a/src/main/java/com/sosnitzka/taiga/MaterialTraits.java +++ b/src/main/java/com/sosnitzka/taiga/MaterialTraits.java @@ -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); diff --git a/src/main/java/com/sosnitzka/taiga/traits/TraitAnalysing.java b/src/main/java/com/sosnitzka/taiga/traits/TraitAnalysing.java index 91acf66..b0f1228 100644 --- a/src/main/java/com/sosnitzka/taiga/traits/TraitAnalysing.java +++ b/src/main/java/com/sosnitzka/taiga/traits/TraitAnalysing.java @@ -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())); } diff --git a/src/main/java/com/sosnitzka/taiga/traits/TraitBeserk.java b/src/main/java/com/sosnitzka/taiga/traits/TraitBerserk.java similarity index 95% rename from src/main/java/com/sosnitzka/taiga/traits/TraitBeserk.java rename to src/main/java/com/sosnitzka/taiga/traits/TraitBerserk.java index 20525b6..f43df72 100644 --- a/src/main/java/com/sosnitzka/taiga/traits/TraitBeserk.java +++ b/src/main/java/com/sosnitzka/taiga/traits/TraitBerserk.java @@ -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); } diff --git a/src/main/java/com/sosnitzka/taiga/traits/TraitDiffuse.java b/src/main/java/com/sosnitzka/taiga/traits/TraitDiffuse.java index 25fddc6..d4602a5 100644 --- a/src/main/java/com/sosnitzka/taiga/traits/TraitDiffuse.java +++ b/src/main/java/com/sosnitzka/taiga/traits/TraitDiffuse.java @@ -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;