forked from TAIGA/TAIGA
New Trait: Analysing - No mob loot, 75% less block loot, + a lot of xp!
This commit is contained in:
@@ -12,7 +12,7 @@ public class Materials {
|
||||
public static Material tiberium = new Material("tiberium", TextFormatting.LIGHT_PURPLE).addTrait(instable);
|
||||
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);
|
||||
public static Material violium = new Material("violium", TextFormatting.DARK_GREEN).addTrait(analysing);
|
||||
public static Material bismuth = new Material("bismuth", TextFormatting.DARK_GREEN);
|
||||
public static Material karmesine = new Material("karmesine", TextFormatting.DARK_GREEN);
|
||||
public static Material mindorite = new Material("mindorite", TextFormatting.DARK_GREEN);
|
||||
|
@@ -42,6 +42,7 @@ public class ZTiC {
|
||||
public static final AbstractTrait glimmer = new TraitGlimmer();
|
||||
public static final AbstractTrait garishly = new TraitGarishly();
|
||||
public static final AbstractTrait pulverizing = new TraitPulverizing();
|
||||
public static final AbstractTrait analysing = new TraitAnalysing();
|
||||
|
||||
static final String MODID = "ztic_addon";
|
||||
static final String VERSION = "@VERSION@";
|
||||
@@ -49,6 +50,7 @@ public class ZTiC {
|
||||
private static ServerProxy proxy;
|
||||
private List<MaterialIntegration> integrateList = Lists.newArrayList();
|
||||
|
||||
|
||||
@EventHandler
|
||||
public void preInit(FMLPreInitializationEvent e) {
|
||||
Items.register();
|
||||
|
@@ -0,0 +1,68 @@
|
||||
package com.sosnitzka.ztic_addon.util.traits;
|
||||
|
||||
import net.minecraft.entity.monster.EntityMob;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.util.text.TextFormatting;
|
||||
import net.minecraft.world.World;
|
||||
import net.minecraftforge.common.MinecraftForge;
|
||||
import net.minecraftforge.event.entity.living.LivingDropsEvent;
|
||||
import net.minecraftforge.event.entity.living.LivingExperienceDropEvent;
|
||||
import net.minecraftforge.event.world.BlockEvent;
|
||||
import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
|
||||
import slimeknights.tconstruct.library.traits.AbstractTrait;
|
||||
import slimeknights.tconstruct.library.utils.TagUtil;
|
||||
import slimeknights.tconstruct.library.utils.TinkerUtil;
|
||||
|
||||
/**
|
||||
* Created by Robert on 09.06.2016.
|
||||
*/
|
||||
public class TraitAnalysing extends AbstractTrait {
|
||||
|
||||
public TraitAnalysing() {
|
||||
super("analysing", TextFormatting.GREEN);
|
||||
MinecraftForge.EVENT_BUS.register(this);
|
||||
}
|
||||
|
||||
@SubscribeEvent
|
||||
public void onXpDrop(LivingExperienceDropEvent event) {
|
||||
EntityPlayer player = event.getAttackingPlayer();
|
||||
if (player != null && TinkerUtil.hasTrait(TagUtil.getTagSafe(player.getHeldItemMainhand()), this.identifier)) {
|
||||
event.setDroppedExperience(this.getUpdateXP(event.getDroppedExperience()));
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@SubscribeEvent
|
||||
public void onBlockBreak(BlockEvent.BreakEvent event) {
|
||||
EntityPlayer player = event.getPlayer();
|
||||
if (player != null && TinkerUtil.hasTrait(TagUtil.getTagSafe(player.getHeldItemMainhand()), this.identifier)) {
|
||||
event.setExpToDrop(this.getUpdateXP(event.getExpToDrop()));
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@SubscribeEvent
|
||||
public void onMobDrops(LivingDropsEvent event) {
|
||||
World w = event.getEntity().getEntityWorld();
|
||||
if (event.getSource().getEntity() instanceof EntityPlayer) {
|
||||
EntityPlayer player = (EntityPlayer) event.getSource().getEntity();
|
||||
if (!w.isRemote && event.getEntity() instanceof EntityMob && TinkerUtil.hasTrait(TagUtil.getTagSafe(player.getHeldItemMainhand()), identifier)) {
|
||||
event.getDrops().clear();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private int getUpdateXP(int xp) {
|
||||
float exp = (float) random.nextFloat() * random.nextFloat() * random.nextFloat() * (xp + 8) * 50;
|
||||
return Math.round(exp);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void blockHarvestDrops(ItemStack tool, BlockEvent.HarvestDropsEvent event) {
|
||||
if (random.nextFloat() < 0.75) {
|
||||
event.getDrops().clear();
|
||||
}
|
||||
}
|
||||
|
||||
}
|
@@ -7,6 +7,7 @@ import net.minecraft.util.math.BlockPos;
|
||||
import net.minecraft.util.math.MathHelper;
|
||||
import net.minecraft.util.text.TextFormatting;
|
||||
import net.minecraft.world.World;
|
||||
import net.minecraftforge.common.MinecraftForge;
|
||||
import slimeknights.tconstruct.library.traits.AbstractTrait;
|
||||
|
||||
/**
|
||||
@@ -17,6 +18,7 @@ public class TraitInstable extends AbstractTrait {
|
||||
|
||||
public TraitInstable() {
|
||||
super("instable", TextFormatting.DARK_RED);
|
||||
MinecraftForge.EVENT_BUS.register(this);
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -35,5 +37,15 @@ public class TraitInstable extends AbstractTrait {
|
||||
}
|
||||
}
|
||||
|
||||
/* @SubscribeEvent
|
||||
public void onInstableExplosionDamage(LivingHurtEvent e){
|
||||
if(e.getEntityLiving() instanceof EntityPlayer){
|
||||
EntityPlayer p = (EntityPlayer) e.getEntityLiving();
|
||||
p.addChatComponentMessage(new TextComponentString("E: " + e.getSource().getEntity() + " D: " + e.getSource().getDamageType() + " C: " + e.getSource().getSourceOfDamage()));
|
||||
|
||||
}
|
||||
} */
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
Reference in New Issue
Block a user