diff options
Diffstat (limited to 'src/main/java/com')
| -rw-r--r-- | src/main/java/com/sosnitzka/ztic_addon/Materials.java | 7 | ||||
| -rw-r--r-- | src/main/java/com/sosnitzka/ztic_addon/util/traits/TraitResonance.java | 13 |
2 files changed, 10 insertions, 10 deletions
diff --git a/src/main/java/com/sosnitzka/ztic_addon/Materials.java b/src/main/java/com/sosnitzka/ztic_addon/Materials.java index 82dc1b5..cebca15 100644 --- a/src/main/java/com/sosnitzka/ztic_addon/Materials.java +++ b/src/main/java/com/sosnitzka/ztic_addon/Materials.java @@ -6,10 +6,11 @@ import slimeknights.tconstruct.library.materials.HeadMaterialStats; import slimeknights.tconstruct.library.materials.Material; import static com.sosnitzka.ztic_addon.ZTiC.instable; +import static com.sosnitzka.ztic_addon.ZTiC.resonance; public class Materials { public static Material arcanite = new Material("arcanite", TextFormatting.LIGHT_PURPLE); - public static Material tiberium = new Material("tiberium", TextFormatting.LIGHT_PURPLE); + public static Material tiberium = new Material("tiberium", TextFormatting.LIGHT_PURPLE).addTrait(instable, HeadMaterialStats.TYPE); public static Material prometheum = new Material("prometheum", TextFormatting.LIGHT_PURPLE); public static Material rubium = new Material("rubium", TextFormatting.LIGHT_PURPLE); public static Material violium = new Material("violium", TextFormatting.DARK_GREEN); @@ -19,14 +20,14 @@ public class Materials { public static Material titanite = new Material("titanite", TextFormatting.GRAY); public static Material meteorite = new Material("meteorite", TextFormatting.GRAY); public static Material adamantite = new Material("adamantite", TextFormatting.GRAY); - public static Material vibranium = new Material("vibranium", TextFormatting.GRAY); + public static Material vibranium = new Material("vibranium", TextFormatting.GRAY).addTrait(resonance, HeadMaterialStats.TYPE); public static Material ignitite = new Material("ignitite", TextFormatting.AQUA); public static Material palladium = new Material("palladium", TextFormatting.AQUA); public static Material eternite = new Material("eternite", TextFormatting.AQUA); public static Material mythril = new Material("mythril", TextFormatting.AQUA); public static Material astrium = new Material("astrium", TextFormatting.LIGHT_PURPLE); - public static Material nitronite = new Material("nitronite", TextFormatting.LIGHT_PURPLE).addTrait(instable, HeadMaterialStats.TYPE); + public static Material nitronite = new Material("nitronite", TextFormatting.LIGHT_PURPLE); public static Material proxideum = new Material("proxideum", TextFormatting.LIGHT_PURPLE); public static Material noctunyx = new Material("noctunyx", TextFormatting.LIGHT_PURPLE); public static Material imperomite = new Material("imperomite", TextFormatting.DARK_GREEN); diff --git a/src/main/java/com/sosnitzka/ztic_addon/util/traits/TraitResonance.java b/src/main/java/com/sosnitzka/ztic_addon/util/traits/TraitResonance.java index a282829..a550602 100644 --- a/src/main/java/com/sosnitzka/ztic_addon/util/traits/TraitResonance.java +++ b/src/main/java/com/sosnitzka/ztic_addon/util/traits/TraitResonance.java @@ -1,10 +1,9 @@ package com.sosnitzka.ztic_addon.util.traits; -import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.EntityLivingBase; import net.minecraft.item.ItemStack; import net.minecraft.util.text.TextComponentString; import net.minecraft.util.text.TextFormatting; -import net.minecraftforge.event.entity.living.LivingHurtEvent; import slimeknights.tconstruct.library.traits.AbstractTrait; /** @@ -18,11 +17,11 @@ public class TraitResonance extends AbstractTrait { } @Override - public void onBlock(ItemStack tool, EntityPlayer player, LivingHurtEvent event) { - player.addChatComponentMessage(new TextComponentString(event.getEntity() + " " + event.getEntityLiving())); - - // event.getEntityLiving().knockBack(event.getEntityLiving(), 20f, 20f, 20f); - // event.getSource().getEntity() + public void afterHit(ItemStack tool, EntityLivingBase player, EntityLivingBase target, float damage, boolean wasCritical, boolean wasHit) { + if (random.nextBoolean()) { + target.knockBack(target, random.nextFloat() * random.nextFloat() * 10, player.posX - target.posX, player.posZ - target.posZ); + if (random.nextBoolean()) player.addChatMessage(new TextComponentString("Boinggg!")); + } } } |