Gea/TAIGA
1
0
Fork 0
forked from TAIGA/TAIGA
Code Issues Pull Requests Releases Wiki Activity

Last traits added. Renamed most Items, Blocks & Traits.

Browse Source
This commit is contained in:
Robert Sosnitzka
2016-07-15 23:25:32 +02:00
parent a41dffd0c5
commit 6e82e03ce5
16 changed files with 892 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -7,40 +7,40 @@ import slimeknights.tconstruct.library.materials.HeadMaterialStats;
import slimeknights.tconstruct.library.materials.Material;
import static com.sosnitzka.ztic_addon.ZTiC.*;
import static slimeknights.tconstruct.tools.TinkerMaterials.enderference;
import static slimeknights.tconstruct.tools.TinkerMaterials.*;
public class Materials {
public static Material arcanite = new Material("arcanite", TextFormatting.LIGHT_PURPLE).addTrait(arcane, HeadMaterialStats.TYPE).addTrait(blind);
public static Material tiberium = new Material("tiberium", TextFormatting.GREEN).addTrait(instable);
public static Material prometheum = new Material("prometheum", TextFormatting.DARK_PURPLE).addTrait(haunted, HeadMaterialStats.TYPE).addTrait(blind);
public static Material rubium = new Material("rubium", TextFormatting.RED).addTrait(enderference, HeadMaterialStats.TYPE).addTrait(blind);
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);
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 violium = new Material("violium", TextFormatting.DARK_GREEN).addTrait(stonebound, HandleMaterialStats.TYPE).addTrait(poisonous, HeadMaterialStats.TYPE);
public static Material bismuth = new Material("bismuth", TextFormatting.GREEN).addTrait(splintering, HeadMaterialStats.TYPE).addTrait(splinters, HandleMaterialStats.TYPE);
public static Material karmesine = new Material("karmesine", TextFormatting.DARK_RED).addTrait(aridiculous, HandleMaterialStats.TYPE).addTrait(superheat, HeadMaterialStats.TYPE);
public static Material mindorite = new Material("mindorite", TextFormatting.AQUA).addTrait(cheap);
public static Material titanite = new Material("titanite", TextFormatting.GRAY).addTrait(shocking, HandleMaterialStats.TYPE).addTrait(sharp, HeadMaterialStats.TYPE);
public static Material meteorite = new Material("meteorite", TextFormatting.GRAY).addTrait(established, HandleMaterialStats.TYPE).addTrait(momentum, HeadMaterialStats.TYPE);
public static Material adamantite = new Material("adamantite", TextFormatting.GRAY).addTrait(coldblooded, HeadMaterialStats.TYPE).addTrait(magnetic, HandleMaterialStats.TYPE);
public static Material vibranium = new Material("vibranium", TextFormatting.GRAY).addTrait(resonance);
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.GRAY).addTrait(pulverizing, HeadMaterialStats.TYPE).addTrait(bentonite, HandleMaterialStats.TYPE);
public static Material ignitite = new Material("ignitite", TextFormatting.RED).addTrait(hellish, HandleMaterialStats.TYPE).addTrait(flammable, HeadMaterialStats.TYPE);
public static Material palladium = new Material("palladium", TextFormatting.DARK_GRAY).addTrait(dark);
public static Material eternite = new Material("eternite", TextFormatting.AQUA).addTrait(writable2);
public static Material mythril = new Material("mythril", TextFormatting.GRAY).addTrait(bentonite);
public static Material astrium = new Material("astrium", TextFormatting.LIGHT_PURPLE);
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 astrium = new Material("astrium", TextFormatting.BLACK).addTrait(curvature);
public static Material nitronite = new Material("nitronite", TextFormatting.DARK_AQUA).addTrait(uncertain);
public static Material proxideum = new Material("proxideum", TextFormatting.LIGHT_PURPLE).addTrait(softy, HandleMaterialStats.TYPE).addTrait(lightweight);
public static Material noctunyx = new Material("noctunyx", TextFormatting.LIGHT_PURPLE).addTrait(hollow);
public static Material imperomite = new Material("imperomite", TextFormatting.DARK_GREEN).addTrait(heroic);
public static Material cryptogen = new Material("cryptogen", TextFormatting.DARK_GREEN);
public static Material fractoryte = new Material("fractoryte", TextFormatting.DARK_RED).addTrait(frature, HeadMaterialStats.TYPE).addTrait(fragile);
public static Material cryptogen = new Material("cryptogen", TextFormatting.DARK_GREEN).addTrait(randomize);
public static Material fractoryte = new Material("fractoryte", TextFormatting.DARK_RED).addTrait(fracture, HeadMaterialStats.TYPE).addTrait(fragile);
public static Material seismodium = new Material("seismodium", TextFormatting.DARK_GREEN).addTrait(cascade, HeadMaterialStats.TYPE).addTrait(fragile);
public static Material terramite = new Material("terramite", TextFormatting.GRAY);
public static Material terramite = new Material("terramite", TextFormatting.GRAY).addTrait(naturebound).addTrait(fragile);
public static Material lumixyl = new Material("lumixyl", TextFormatting.YELLOW).addTrait(glimmer);
public static Material solarium = new Material("solarium", TextFormatting.RED).addTrait(garishly);
public static Material dyonite = new Material("dyonite", TextFormatting.GRAY).addTrait(slaughtering, HeadMaterialStats.TYPE).addTrait(dissolving);
public static Material ultranite = new Material("ultranite", TextFormatting.AQUA);
public static Material nucleum = new Material("nucleum", TextFormatting.AQUA);
public static Material aegisalt = new Material("aegisalt", TextFormatting.AQUA);
public static Material bysmuid = new Material("bysmuid", TextFormatting.AQUA);
public static Material dyonite = new Material("dyonite", TextFormatting.GRAY).addTrait(slaughtering, HeadMaterialStats.TYPE).addTrait(dissolving, HandleMaterialStats.TYPE);
public static Material ultranite = new Material("ultranite", TextFormatting.AQUA).addTrait(pulverizing);
public static Material nucleum = new Material("nucleum", TextFormatting.AQUA).addTrait(diffuse).addTrait(bright, HeadMaterialStats.TYPE);
public static Material aegisalt = new Material("aegisalt", TextFormatting.AQUA).addTrait(analysing);
public static Material bysmuid = new Material("bysmuid", TextFormatting.AQUA).addTrait(dense, HandleMaterialStats.TYPE).addTrait(sharp, HeadMaterialStats.TYPE);
}

12
src/main/java/com/sosnitzka/ztic_addon/ZTiC.java
View File

@@ -37,8 +37,12 @@ public class ZTiC {
public static final int VIBRANIUM = 7;
public static final int ADAMANTITE = 8;
public static final AbstractTrait instable = new TraitInstable();
public static final AbstractTrait naturebound = new TraitNatureBound();
public static final AbstractTrait uncertain = new TraitUncertain();
public static final AbstractTrait softy = new TraitSofty();
public static final AbstractTrait curvature = new TraitCurvature();
public static final AbstractTrait resonance = new TraitResonance();
public static final AbstractTrait frature = new TraitFracture();
public static final AbstractTrait fracture = new TraitFracture();
public static final AbstractTrait glimmer = new TraitGlimmer();
public static final AbstractTrait garishly = new TraitGarishly();
public static final AbstractTrait pulverizing = new TraitPulverizing();
@@ -46,6 +50,7 @@ public class ZTiC {
public static final AbstractTrait cascade = new TraitCascade();
public static final AbstractTrait blind = new TraitBlind();
public static final AbstractTrait dark = new TraitDark();
public static final AbstractTrait bright = new TraitBright();
public static final AbstractTrait slaughtering = new TraitSlaughtering();
public static final AbstractTrait haunted = new TraitHaunted();
public static final AbstractTrait fragile = new TraitFragile();
@@ -53,6 +58,9 @@ public class ZTiC {
public static final AbstractTrait bentonite = new TraitBentonite();
public static final AbstractTrait arcane = new TraitArcane();
public static final AbstractTrait heroic = new TraitHeroic();
public static final AbstractTrait hollow = new TraitHollow();
public static final AbstractTrait diffuse = new TraitDiffuse();
public static final AbstractTrait randomize = new TraitRandomize();
static final String MODID = "ztic_addon";
static final String VERSION = "@VERSION@";
@@ -101,7 +109,7 @@ public class ZTiC {
registerTinkerMaterial("Solarium", solarium, solariumFluid, 1020, 13.78f, 4.64f, 1.15f, 0, 150, ADAMANTITE, false, true);
registerTinkerMaterial("Fractoryte", fractoryte, fractoryteFluid, 1071, 7.65f, 7.75f, 1.15f, -250, 283, METEORITE, false, true);
registerTinkerMaterial("Aegisalt", aegisalt, aegisaltFluid, 355, 8.88f, 3.18f, 1.00f, 175, 125, TITANITE, false, true);
registerTinkerMaterial("Nocturnyx", noctunyx, noctunyxFluid, 713, 10.43f, 3.25f, 0.99f, -125, 183, METEORITE, false, true);
registerTinkerMaterial("Noctunyx", noctunyx, noctunyxFluid, 713, 10.43f, 3.25f, 0.99f, -125, 183, METEORITE, false, true);
registerTinkerMaterial("Nucleum", nucleum, nucleumFluid, 503, 11.30f, 3.22f, 1.05f, 100, 125, TITANITE, false, true);
registerTinkerMaterial("Seismodium", seismodium, seismodiumFluid, 879, 13.85f, 4.19f, 1.17f, -75, 169, VIBRANIUM, false, true);
registerTinkerMaterial("Lumixyl", lumixyl, lumixylFluid, 357, 4.64f, 5.92f, 1.05f, 15, 130, COBALT, false, true);

2
src/main/java/com/sosnitzka/ztic_addon/traits/TraitAnalysing.java
View File

@@ -54,7 +54,7 @@ public class TraitAnalysing extends AbstractTrait {
}
private int getUpdateXP(int xp) {
float exp = (float) random.nextFloat() * random.nextFloat() * random.nextFloat() * (xp + 8) * 50;
float exp = (float) random.nextFloat() * random.nextFloat() * random.nextFloat() * (xp + 18) * 50;
return Math.round(exp);
}

4
src/main/java/com/sosnitzka/ztic_addon/traits/TraitBlind.java
View File

@@ -22,7 +22,7 @@ public class TraitBlind extends AbstractTrait {
@Override
public void afterBlockBreak(ItemStack tool, World world, IBlockState state, BlockPos pos, EntityLivingBase player, boolean wasEffective) {
int time = (int) world.getWorldTime();
if (random.nextFloat() <= 0.05 || (random.nextFloat() <= 0.3 && isNight(time))) {
if (random.nextFloat() <= 0.05 || (random.nextFloat() <= 0.1 && isNight(time))) {
player.addPotionEffect(new PotionEffect(MobEffects.BLINDNESS, random.nextInt(400) + 200));
player.addPotionEffect(new PotionEffect(MobEffects.WEAKNESS, random.nextInt(400) + 200));
}
@@ -31,7 +31,7 @@ public class TraitBlind extends AbstractTrait {
@Override
public void afterHit(ItemStack tool, EntityLivingBase player, EntityLivingBase target, float damage, boolean wasCritical, boolean wasHit) {
int time = (int) player.getEntityWorld().getWorldTime();
if (random.nextFloat() <= 0.05 || (random.nextFloat() <= 0.3 && isNight(time))) {
if (random.nextFloat() <= 0.05 || (random.nextFloat() <= 0.1 && isNight(time))) {
player.addPotionEffect(new PotionEffect(MobEffects.BLINDNESS, random.nextInt(400) + 200));
player.addPotionEffect(new PotionEffect(MobEffects.WEAKNESS, random.nextInt(400) + 200));
}

34
src/main/java/com/sosnitzka/ztic_addon/traits/TraitBright.java Normal file
View File

@@ -0,0 +1,34 @@
package com.sosnitzka.ztic_addon.traits;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.item.ItemStack;
import net.minecraft.util.text.TextFormatting;
import slimeknights.tconstruct.library.traits.AbstractTrait;
/**
* Created by Robert on 03.06.2016.
*/
public class TraitBright extends AbstractTrait {
public TraitBright() {
super("bright", TextFormatting.DARK_GRAY);
}
@Override
public float damage(ItemStack tool, EntityLivingBase player, EntityLivingBase target, float damage, float newDamage, boolean isCritical) {
int time = (int) target.getEntityWorld().getWorldTime();
if (isDay(time)) {
newDamage += damage / 2f;
}
return super.damage(tool, player, target, damage, newDamage, isCritical);
}
public boolean isDay(int time) {
if (time < 12500) {
return true;
} else {
return false;
}
}
}

74
src/main/java/com/sosnitzka/ztic_addon/traits/TraitCurvature.java Normal file
View File

@@ -0,0 +1,74 @@
package com.sosnitzka.ztic_addon.traits;
import net.minecraft.block.state.IBlockState;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.item.EntityItem;
import net.minecraft.entity.monster.EntityMob;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.init.Blocks;
import net.minecraft.init.Items;
import net.minecraft.item.ItemStack;
import net.minecraft.util.math.BlockPos;
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.fml.common.eventhandler.SubscribeEvent;
import slimeknights.tconstruct.library.traits.AbstractTrait;
import slimeknights.tconstruct.library.utils.TagUtil;
import slimeknights.tconstruct.library.utils.TinkerUtil;
public class TraitCurvature extends AbstractTrait {
public TraitCurvature() {
super("curvature", TextFormatting.BLACK);
MinecraftForge.EVENT_BUS.register(this);
}
@Override
public void afterBlockBreak(ItemStack tool, World world, IBlockState state, BlockPos pos, EntityLivingBase player, boolean wasEffective) {
if (random.nextFloat() <= 0.05 && world.provider.getDimension() != -1) {
teleport(player, world);
}
}
@Override
public void afterHit(ItemStack tool, EntityLivingBase player, EntityLivingBase target, float damage, boolean wasCritical, boolean wasHit) {
World w = player.getEntityWorld();
if (random.nextFloat() <= 0.1 && w.provider.getDimension() != -1) {
if (random.nextBoolean()) {
teleport(player, w);
} else {
teleport(target, w);
}
}
}
@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)) {
ItemStack i = new ItemStack(Items.ENDER_PEARL, random.nextInt(3));
event.getDrops().add(0, new EntityItem(w, event.getEntity().posX, event.getEntity().posY, event.getEntity().posZ, i));
}
}
}
private void teleport(EntityLivingBase e, World w) {
int x = e.getPosition().getX() + random.nextInt(250) - 125;
int y = e.getPosition().getY();
int z = e.getPosition().getZ() + random.nextInt(250) - 125;
while (w.getBlockState(new BlockPos(x, y, z)).getBlock() != Blocks.AIR) {
y++;
}
while (w.getBlockState(new BlockPos(x, y - 1, z)).getBlock() == Blocks.AIR) {
y--;
}
e.setPosition(x, y, z);
}
}

70
src/main/java/com/sosnitzka/ztic_addon/traits/TraitDiffuse.java Normal file
View File

@@ -0,0 +1,70 @@
package com.sosnitzka.ztic_addon.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 TraitDiffuse extends AbstractTrait {
public TraitDiffuse() {
super("diffuse", TextFormatting.DARK_GRAY);
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(0);
}
}
@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 + random.nextInt(10));
if (random.nextBoolean())
return Math.round(exp);
else return 0;
}
@Override
public void blockHarvestDrops(ItemStack tool, BlockEvent.HarvestDropsEvent event) {
if (random.nextFloat() < 0.75) {
event.getDrops().clear();
}
}
}

2
src/main/java/com/sosnitzka/ztic_addon/traits/TraitHaunted.java
View File

@@ -29,7 +29,7 @@ public class TraitHaunted extends AbstractTrait {
target instanceof EntityBlaze || target instanceof EntityWitch || target instanceof EntityHorse) {
((EntityLiving) target).tasks.taskEntries.clear();
((EntityLiving) target).targetTasks.taskEntries.clear();
((EntityLiving) target).tasks.addTask(0, new EntityAIPermanentPanic((EntityCreature) target, target.getAIMoveSpeed() + 2.0D));
((EntityLiving) target).tasks.addTask(0, new EntityAIPermanentPanic((EntityCreature) target, target.getAIMoveSpeed() + 3.5D));
}
}

8
src/main/java/com/sosnitzka/ztic_addon/traits/TraitHeroic.java
View File

@@ -19,10 +19,10 @@ public class TraitHeroic extends AbstractTrait {
public float damage(ItemStack tool, EntityLivingBase player, EntityLivingBase target, float damage, float newDamage, boolean isCritical) {
int durability = ToolHelper.getCurrentDurability(tool);
int durabilitymax = ToolHelper.getMaxDurability(tool);
float bonus = (float) (0.01f + ((2.5f - 0.2f) / (durability - durabilitymax - 1)) * (durability - durabilitymax));
System.out.println("Dura: " + durability + " DuraMax: " + durabilitymax);
System.out.println("Modifier: " + bonus);
return super.damage(tool, player, target, damage, newDamage * bonus, isCritical);
float calc = (float) (newDamage + (newDamage / 2) / (durability * durabilitymax / (durabilitymax - durability)));
if ((float) durability < (float) (0.12 * durabilitymax)) {
return super.damage(tool, player, target, damage, calc, isCritical);
} else return super.damage(tool, player, target, damage, newDamage, isCritical);
}

54
src/main/java/com/sosnitzka/ztic_addon/traits/TraitHollow.java Normal file
View File

@@ -0,0 +1,54 @@
package com.sosnitzka.ztic_addon.traits;
import net.minecraft.entity.EntityLiving;
import net.minecraft.entity.EntityLivingBase;
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.fml.common.eventhandler.SubscribeEvent;
import slimeknights.tconstruct.library.traits.AbstractTrait;
import slimeknights.tconstruct.library.utils.TagUtil;
import slimeknights.tconstruct.library.utils.TinkerUtil;
public class TraitHollow extends AbstractTrait {
public TraitHollow() {
super("hollow", TextFormatting.DARK_GRAY);
MinecraftForge.EVENT_BUS.register(this);
}
@Override
public void onHit(ItemStack tool, EntityLivingBase player, EntityLivingBase target, float damage, boolean isCritical) {
int time = (int) player.getEntityWorld().getWorldTime();
if (random.nextFloat() <= 0.2 || (random.nextFloat() <= 0.2 && isNight(time))) {
((EntityLiving) target).setNoAI(true);
if (target.getMaxHealth() < 200) {
target.setHealth(target.getMaxHealth() * (1.8f - random.nextFloat() * 0.4f));
}
}
}
@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 && random.nextFloat() <= 0.2 && event.getEntity() instanceof EntityMob && TinkerUtil.hasTrait(TagUtil.getTagSafe(player.getHeldItemMainhand()), identifier)) {
event.getDrops().clear();
}
}
}
public boolean isNight(int time) {
if (time > 12500) {
return true;
} else {
return false;
}
}
}

32
src/main/java/com/sosnitzka/ztic_addon/traits/TraitNatureBound.java Normal file
View File

@@ -0,0 +1,32 @@
package com.sosnitzka.ztic_addon.traits;
import net.minecraft.entity.Entity;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.item.ItemStack;
import net.minecraft.util.DamageSource;
import net.minecraft.util.text.TextFormatting;
import net.minecraft.world.World;
import net.minecraftforge.common.MinecraftForge;
import slimeknights.tconstruct.library.traits.AbstractTrait;
import slimeknights.tconstruct.library.utils.ToolHelper;
public class TraitNatureBound extends AbstractTrait {
public static DamageSource splinter = new DamageSource("splinter").setDamageBypassesArmor();
private static int chance = 10;
public TraitNatureBound() {
super("naturebound", TextFormatting.GREEN);
MinecraftForge.EVENT_BUS.register(this);
}
@Override
public void onUpdate(ItemStack tool, World world, Entity entity, int itemSlot, boolean isSelected) {
// *20 because 20 ticks in a second
if (!world.isRemote && entity instanceof EntityLivingBase && random.nextInt(20 * chance) == 0) {
ToolHelper.healTool(tool, 1, (EntityLivingBase) entity);
}
}
}

175
src/main/java/com/sosnitzka/ztic_addon/traits/TraitRandomize.java Normal file
View File

@@ -0,0 +1,175 @@
package com.sosnitzka.ztic_addon.traits;
import net.minecraft.entity.Entity;
import net.minecraft.entity.EntityLiving;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.item.EntityTNTPrimed;
import net.minecraft.entity.monster.*;
import net.minecraft.entity.passive.*;
import net.minecraft.init.Blocks;
import net.minecraft.item.Item;
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.player.PlayerEvent;
import net.minecraftforge.event.world.BlockEvent;
import slimeknights.tconstruct.library.traits.AbstractTrait;
import slimeknights.tconstruct.library.utils.ToolHelper;
import slimeknights.tconstruct.world.entity.EntityBlueSlime;
import static com.sosnitzka.ztic_addon.Blocks.*;
import static slimeknights.tconstruct.shared.TinkerCommons.oreArdite;
import static slimeknights.tconstruct.shared.TinkerCommons.oreCobalt;
/**
* Created by Robert on 03.06.2016.
*/
public class TraitRandomize extends AbstractTrait {
public TraitRandomize() {
super("randomize", TextFormatting.DARK_RED);
MinecraftForge.EVENT_BUS.register(this);
}
@Override
public void miningSpeed(ItemStack tool, PlayerEvent.BreakSpeed event) {
if (ToolHelper.isToolEffective2(tool, event.getState())) {
event.setNewSpeed((float) (event.getNewSpeed() + random.nextFloat() * 2));
}
}
@Override
public void onHit(ItemStack tool, EntityLivingBase player, EntityLivingBase target, float damage, boolean isCritical) {
if (random.nextFloat() <= .15 && target instanceof EntityLiving) {
World w = player.getEntityWorld();
Entity e = new EntityCow(w);
if (!w.isRemote) {
int i = random.nextInt(22);
switch (i) {
case 0:
e = new EntityCow(w);
break;
case 1:
e = new EntityPig(w);
break;
case 2:
e = new EntityHorse(w);
break;
case 3:
e = new EntityChicken(w);
break;
case 4:
e = new EntityVillager(w);
break;
case 5:
e = new EntityEnderman(w);
break;
case 6:
e = new EntityPolarBear(w);
break;
case 7:
e = new EntityIronGolem(w);
break;
case 8:
e = new EntitySilverfish(w);
break;
case 9:
e = new EntityCaveSpider(w);
break;
case 10:
e = new EntityWolf(w);
break;
case 11:
e = new EntityWitch(w);
break;
case 12:
e = new EntityTNTPrimed(w);
break;
case 13:
e = new EntityGhast(w);
break;
case 14:
e = new EntitySpider(w);
break;
case 15:
e = new EntitySkeleton(w);
break;
case 16:
e = new EntityMagmaCube(w);
break;
case 17:
e = new EntitySlime(w);
break;
case 18:
e = new EntityBlueSlime(w);
break;
case 19:
e = new EntityBat(w);
break;
case 20:
e = new EntityPigZombie(w);
break;
case 21:
e = new EntityBlaze(w);
break;
}
e.setPosition(target.getPosition().getX(), target.getPosition().getY() + 0.1f, target.getPosition().getZ());
e.setCustomNameTag("Missingno");
((EntityLiving) e).setHealth(((EntityLiving) e).getHealth() * (random.nextInt(5) + 1));
w.spawnEntityInWorld(e);
target.setDead();
}
}
}
@Override
public void blockHarvestDrops(ItemStack tool, BlockEvent.HarvestDropsEvent event) {
float r = random.nextFloat();
if (r > 0.95f) event.getDrops().clear();
if (event.getDrops() != null) {
if (r < 0.4f && event.getDrops().get(0).getItem() == Item.getItemFromBlock(Blocks.IRON_ORE)) {
ItemStack change = new ItemStack(Item.getItemFromBlock(Blocks.IRON_ORE));
int i = random.nextInt(11);
switch (i) {
case 0:
change = new ItemStack(Item.getItemFromBlock(Blocks.GOLD_ORE));
break;
case 1:
change = new ItemStack(Item.getItemFromBlock(Blocks.REDSTONE_ORE));
break;
case 2:
change = new ItemStack(Item.getItemFromBlock(Blocks.LAPIS_ORE));
break;
case 3:
change = new ItemStack(Item.getItemFromBlock(Blocks.DIAMOND_ORE));
break;
case 4:
change = new ItemStack(Item.getItemFromBlock(Blocks.QUARTZ_ORE));
break;
case 5:
change = new ItemStack(oreCobalt.getItem());
break;
case 6:
change = new ItemStack(oreArdite.getItem());
break;
case 7:
change = new ItemStack(titaniteOre);
break;
case 8:
change = new ItemStack(bismuthOre);
break;
case 9:
change = new ItemStack(tiberiumOre);
break;
case 10:
change = new ItemStack(eterniteOre);
break;
}
event.getDrops().set(0, change);
}
}
}
}

36
src/main/java/com/sosnitzka/ztic_addon/traits/TraitSofty.java Normal file
View File

@@ -0,0 +1,36 @@
package com.sosnitzka.ztic_addon.traits;
import net.minecraft.block.material.Material;
import net.minecraft.block.state.IBlockState;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.item.ItemStack;
import net.minecraft.util.math.BlockPos;
import net.minecraft.util.text.TextFormatting;
import net.minecraft.world.World;
import net.minecraftforge.common.MinecraftForge;
import slimeknights.tconstruct.library.traits.AbstractTrait;
import slimeknights.tconstruct.library.utils.ToolHelper;
/**
* Created by Robert on 14.05.2016.
*/
public class TraitSofty extends AbstractTrait {
private static final float chance = 0.2f;
public TraitSofty() {
super("softy", TextFormatting.AQUA);
MinecraftForge.EVENT_BUS.register(this);
}
@Override
public void afterBlockBreak(ItemStack tool, World world, IBlockState state, BlockPos pos, EntityLivingBase player, boolean wasEffective) {
if (!world.isRemote && state.getMaterial() != Material.ROCK && state.getMaterial() != Material.GROUND && random.nextFloat() < chance) {
ToolHelper.healTool(tool, random.nextInt(10), player);
}
}
}

58
src/main/java/com/sosnitzka/ztic_addon/traits/TraitUncertain.java Normal file
View File

@@ -0,0 +1,58 @@
package com.sosnitzka.ztic_addon.traits;
import net.minecraft.block.state.IBlockState;
import net.minecraft.entity.Entity;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.item.EntityItem;
import net.minecraft.entity.monster.EntityMob;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.init.Items;
import net.minecraft.item.ItemStack;
import net.minecraft.util.math.BlockPos;
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.fml.common.eventhandler.SubscribeEvent;
import slimeknights.tconstruct.library.traits.AbstractTrait;
import slimeknights.tconstruct.library.utils.TagUtil;
import slimeknights.tconstruct.library.utils.TinkerUtil;
import slimeknights.tconstruct.library.utils.ToolHelper;
public class TraitUncertain extends AbstractTrait {
public TraitUncertain() {
super("uncertain", TextFormatting.RED);
MinecraftForge.EVENT_BUS.register(this);
}
@Override
public void afterBlockBreak(ItemStack tool, World world, IBlockState state, BlockPos pos, EntityLivingBase player, boolean wasEffective) {
if (random.nextFloat() <= 0.05) {
if (!world.isRemote) {
if (random.nextFloat() > 0.15f) {
explode(world, player, pos.getX(), pos.getY(), pos.getZ());
} else explode(world, null, pos.getX(), pos.getY(), pos.getZ());
}
ToolHelper.damageTool(tool, 5 + random.nextInt(10), null);
}
}
@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)) {
ItemStack i = new ItemStack(Items.GUNPOWDER, random.nextInt(4));
event.getDrops().add(0, new EntityItem(w, event.getEntity().posX, event.getEntity().posY, event.getEntity().posZ, i));
}
}
}
private void explode(World w, Entity e, double x, double y, double z) {
w.newExplosion(e, x, y, z, 1.2f + random.nextFloat() * 35, random.nextBoolean(), true);
}
}

158
src/main/resources/assets/ztic_addon/lang/de_DE.lang
View File

@@ -42,3 +42,161 @@ item.ignitite_ingot.name=Ignititbarren
item.violium_ingot.name=Violiumbarren
item.fuel_brick.name=Brennstoffziegel
item.iron_nugget.name=Eisennugget
material.titanite.name=Titanit
material.meteorite.name=Meteorit
material.vibranium.name=Vibranium
material.adamantite.name=Adamantit
material.prometheum.name=Prometheum
material.rubium.name=Rubium
material.tiberium.name=Tiberium
material.arcanite.name=Arcanit
material.eternite.name=Eternit
material.mythril.name=Mythril
material.palladium.name=Palladium
material.ignitite.name=Ignitit
material.violium.name=Violium
material.bismuth.name=Bismuth
material.mindorite.name=Mindorit
material.karmesine.name=Karmesin
material.imperomite.name=Imperomit
material.fractoryte.name=Fractoryt
material.noctunyx.name=Noctunyx
material.nitronite.name=Nitronit
material.cryptogen.name=Cryptogen
material.seismodium.name=Seismodium
material.aegisalt.name=Aegisalt
material.ultranite.name=Ultranit
material.bysmuid.name=Bysmuid
material.nucleum.name=Nucleum
material.terramite.name=Terramit
material.solarium.name=Solarium
material.lumixyl.name=Lumixyl
material.dyonite.name=Dyonit
material.proxideum.name=Proxideum
material.astrium.name=Astrium
fluid.titanite.name=Titanit
fluid.meteorite.name=Meteorit
fluid.vibranium.name=Vibranium
fluid.adamantite.name=Adamantit
fluid.prometheum.name=Prometheum
fluid.rubium.name=Rubium
fluid.tiberium.name=Tiberium
fluid.arcanite.name=Arcanit
fluid.eternite.name=Eternit
fluid.mythril.name=Mythril
fluid.palladium.name=Palladium
fluid.ignitite.name=Ignitit
fluid.violium.name=Violium
fluid.bismuth.name=Bismuth
fluid.mindorite.name=Mindorit
fluid.karmesine.name=Karmesin
fluid.imperomite.name=Imperomit
fluid.fractoryte.name=Fractoryt
fluid.noctunyx.name=Noctunyx
fluid.nitronite.name=Nitronit
fluid.cryptogen.name=Cryptogen
fluid.seismodium.name=Seismodium
fluid.aegisalt.name=Aegisalt
fluid.ultranite.name=Ultranit
fluid.bysmuid.name=Bysmuid
fluid.nucleum.name=Nucleum
fluid.terramite.name=Terramit
fluid.solarium.name=Solarium
fluid.lumixyl.name=Lumixyl
fluid.dyonite.name=Dyonit
fluid.proxideum.name=Proxideum
fluid.astrium.name=Astrium
tile.titanite_block.name=Titanit
tile.meteorite_block.name=Meteorit
tile.vibranium_block.name=Vibranium
tile.adamantite_block.name=Adamantit
tile.prometheum_block.name=Prometheum
tile.rubium_block.name=Rubium
tile.tiberium_block.name=Tiberium
tile.arcanite_block.name=Arcanit
tile.eternite_block.name=Eternit
tile.mythril_block.name=Mythril
tile.palladium_block.name=Palladium
tile.ignitite_block.name=Ignitit
tile.violium_block.name=Violium
tile.bismuth_block.name=Bismuth
tile.mindorite_block.name=Mindorit
tile.karmesine_block.name=Karmesin
tile.imperomite_block.name=Imperomit
tile.fractoryte_block.name=Fractoryt
tile.noctunyx_block.name=Noctunyx
tile.nitronite_block.name=Nitronit
tile.cryptogen_block.name=Cryptogen
tile.seismodium_block.name=Seismodium
tile.aegisalt_block.name=Aegisalt
tile.ultranite_block.name=Ultranit
tile.bysmuid_block.name=Bysmuid
tile.nucleum_block.name=Nucleum
tile.terramite_block.name=Terramit
tile.solarium_block.name=Solarium
tile.lumixyl_block.name=Lumixyl
tile.dyonite_block.name=Dyonit
tile.proxideum_block.name=Proxideum
tile.astrium_block.name=Astrium
item.titanite_ingot.name=Titanit
item.meteorite_ingot.name=Meteorit
item.vibranium_ingot.name=Vibranium
item.adamantite_ingot.name=Adamantit
item.prometheum_ingot.name=Prometheum
item.rubium_ingot.name=Rubium
item.tiberium_ingot.name=Tiberium
item.arcanite_ingot.name=Arcanit
item.eternite_ingot.name=Eternit
item.mythril_ingot.name=Mythril
item.palladium_ingot.name=Palladium
item.ignitite_ingot.name=Ignitit
item.violium_ingot.name=Violium
item.bismuth_ingot.name=Bismuth
item.mindorite_ingot.name=Mindorit
item.karmesine_ingot.name=Karmesin
item.imperomite_ingot.name=Imperomit
item.fractoryte_ingot.name=Fractoryt
item.noctunyx_ingot.name=Noctunyx
item.nitronite_ingot.name=Nitronit
item.cryptogen_ingot.name=Cryptogen
item.seismodium_ingot.name=Seismodium
item.aegisalt_ingot.name=Aegisalt
item.ultranite_ingot.name=Ultranit
item.bysmuid_ingot.name=Bysmuid
item.nucleum_ingot.name=Nucleum
item.terramite_ingot.name=Terramit
item.solarium_ingot.name=Solarium
item.lumixyl_ingot.name=Lumixyl
item.dyonite_ingot.name=Dyonit
item.proxideum_ingot.name=Proxideum
item.astrium_ingot.name=Astrium
modifier.analysing.name=Analysing
modifier.arcane.name=Arcane
modifier.bentonite.name=Bentonite
modifier.blind.name=Blind
modifier.bright.name=Bright
modifier.cascade.name=Cascade
modifier.curvature.name=Curvature
modifier.dark.name=Dark
modifier.diffuse.name=Diffuse
modifier.dissolving.name=Dissolving
modifier.fracture.name=Fracture
modifier.fragile.name=Fragile
modifier.garishly.name=Garishly
modifier.glimmer.name=Glimmer
modifier.haunted.name=Haunted
modifier.heroic.name=Heroic
modifier.hollow.name=Hollow
modifier.instable.name=Instable
modifier.naturebound.name=Naturebound
modifier.pulverizing.name=Pulverizing
modifier.randomize.name=Randomize
modifier.resonance.name=Resonance
modifier.slaughtering.name=Slaughtering
modifier.softy.name=Softy
modifier.uncertain.name=Uncertain

158
src/main/resources/assets/ztic_addon/lang/en_US.lang
View File

@@ -43,3 +43,161 @@ item.ignitite_ingot.name=Ignitite Ingot
item.violium_ingot.name=Violium Ingot
item.fuel_brick.name=Fuelbrick
item.iron_nugget.name=Iron Nugget
material.titanite.name=Titanite
material.meteorite.name=Meteorite
material.vibranium.name=Vibranium
material.adamantite.name=Adamantite
material.prometheum.name=Prometheum
material.rubium.name=Rubium
material.tiberium.name=Tiberium
material.arcanite.name=Arcanite
material.eternite.name=Eternite
material.mythril.name=Mythril
material.palladium.name=Palladium
material.ignitite.name=Ignitite
material.violium.name=Violium
material.bismuth.name=Bismuth
material.mindorite.name=Mindorite
material.karmesine.name=Karmesine
material.imperomite.name=Imperomite
material.fractoryte.name=Fractoryte
material.noctunyx.name=Noctunyx
material.nitronite.name=Nitronite
material.cryptogen.name=Cryptogen
material.seismodium.name=Seismodium
material.aegisalt.name=Aegisalt
material.ultranite.name=Ultranite
material.bysmuid.name=Bysmuid
material.nucleum.name=Nucleum
material.terramite.name=Terramite
material.solarium.name=Solarium
material.lumixyl.name=Lumixyl
material.dyonite.name=Dyonite
material.proxideum.name=Proxideum
material.astrium.name=Astrium
fluid.titanite.name=Titanite
fluid.meteorite.name=Meteorite
fluid.vibranium.name=Vibranium
fluid.adamantite.name=Adamantite
fluid.prometheum.name=Prometheum
fluid.rubium.name=Rubium
fluid.tiberium.name=Tiberium
fluid.arcanite.name=Arcanite
fluid.eternite.name=Eternite
fluid.mythril.name=Mythril
fluid.palladium.name=Palladium
fluid.ignitite.name=Ignitite
fluid.violium.name=Violium
fluid.bismuth.name=Bismuth
fluid.mindorite.name=Mindorite
fluid.karmesine.name=Karmesine
fluid.imperomite.name=Imperomite
fluid.fractoryte.name=Fractoryte
fluid.noctunyx.name=Noctunyx
fluid.nitronite.name=Nitronite
fluid.cryptogen.name=Cryptogen
fluid.seismodium.name=Seismodium
fluid.aegisalt.name=Aegisalt
fluid.ultranite.name=Ultranite
fluid.bysmuid.name=Bysmuid
fluid.nucleum.name=Nucleum
fluid.terramite.name=Terramite
fluid.solarium.name=Solarium
fluid.lumixyl.name=Lumixyl
fluid.dyonite.name=Dyonite
fluid.proxideum.name=Proxideum
fluid.astrium.name=Astrium
tile.titanite_block.name=Titanite
tile.meteorite_block.name=Meteorite
tile.vibranium_block.name=Vibranium
tile.adamantite_block.name=Adamantite
tile.prometheum_block.name=Prometheum
tile.rubium_block.name=Rubium
tile.tiberium_block.name=Tiberium
tile.arcanite_block.name=Arcanite
tile.eternite_block.name=Eternite
tile.mythril_block.name=Mythril
tile.palladium_block.name=Palladium
tile.ignitite_block.name=Ignitite
tile.violium_block.name=Violium
tile.bismuth_block.name=Bismuth
tile.mindorite_block.name=Mindorite
tile.karmesine_block.name=Karmesine
tile.imperomite_block.name=Imperomite
tile.fractoryte_block.name=Fractoryte
tile.noctunyx_block.name=Noctunyx
tile.nitronite_block.name=Nitronite
tile.cryptogen_block.name=Cryptogen
tile.seismodium_block.name=Seismodium
tile.aegisalt_block.name=Aegisalt
tile.ultranite_block.name=Ultranite
tile.bysmuid_block.name=Bysmuid
tile.nucleum_block.name=Nucleum
tile.terramite_block.name=Terramite
tile.solarium_block.name=Solarium
tile.lumixyl_block.name=Lumixyl
tile.dyonite_block.name=Dyonite
tile.proxideum_block.name=Proxideum
tile.astrium_block.name=Astrium
item.titanite_ingot.name=Titanite
item.meteorite_ingot.name=Meteorite
item.vibranium_ingot.name=Vibranium
item.adamantite_ingot.name=Adamantite
item.prometheum_ingot.name=Prometheum
item.rubium_ingot.name=Rubium
item.tiberium_ingot.name=Tiberium
item.arcanite_ingot.name=Arcanite
item.eternite_ingot.name=Eternite
item.mythril_ingot.name=Mythril
item.palladium_ingot.name=Palladium
item.ignitite_ingot.name=Ignitite
item.violium_ingot.name=Violium
item.bismuth_ingot.name=Bismuth
item.mindorite_ingot.name=Mindorite
item.karmesine_ingot.name=Karmesine
item.imperomite_ingot.name=Imperomite
item.fractoryte_ingot.name=Fractoryte
item.noctunyx_ingot.name=Noctunyx
item.nitronite_ingot.name=Nitronite
item.cryptogen_ingot.name=Cryptogen
item.seismodium_ingot.name=Seismodium
item.aegisalt_ingot.name=Aegisalt
item.ultranite_ingot.name=Ultranite
item.bysmuid_ingot.name=Bysmuid
item.nucleum_ingot.name=Nucleum
item.terramite_ingot.name=Terramite
item.solarium_ingot.name=Solarium
item.lumixyl_ingot.name=Lumixyl
item.dyonite_ingot.name=Dyonite
item.proxideum_ingot.name=Proxideum
item.astrium_ingot.name=Astrium
modifier.analysing.name=Analysing
modifier.arcane.name=Arcane
modifier.bentonite.name=Bentonite
modifier.blind.name=Blind
modifier.bright.name=Bright
modifier.cascade.name=Cascade
modifier.curvature.name=Curvature
modifier.dark.name=Dark
modifier.diffuse.name=Diffuse
modifier.dissolving.name=Dissolving
modifier.fracture.name=Fracture
modifier.fragile.name=Fragile
modifier.garishly.name=Garishly
modifier.glimmer.name=Glimmer
modifier.haunted.name=Haunted
modifier.heroic.name=Heroic
modifier.hollow.name=Hollow
modifier.instable.name=Instable
modifier.naturebound.name=Naturebound
modifier.pulverizing.name=Pulverizing
modifier.randomize.name=Randomize
modifier.resonance.name=Resonance
modifier.slaughtering.name=Slaughtering
modifier.softy.name=Softy
modifier.uncertain.name=Uncertain