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

Added second trait.

Browse Source
This commit is contained in:
Robert Sosnitzka
2016-06-02 16:28:33 +02:00
parent ba1ebf834c
commit 8b2840429d
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/java/com/sosnitzka/ztic_addon/Materials.java
View File

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

13
src/main/java/com/sosnitzka/ztic_addon/util/traits/TraitResonance.java
View File

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