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

Fixed some names and wrote more clear descriptions. Fixed 2 Traits with possible NPE

Browse Source
This commit is contained in:
Robert Sosnitzka
2016-12-23 01:21:30 +01:00
parent 1c34ded555
commit 613850e2b5
5 changed files with 79 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/com/sosnitzka/taiga/TAIGA.java
View File

@@ -90,7 +90,7 @@ public class TAIGA {
integrateMaterial("Duranite", duranite, duraniteFluid, 1550, 3.2f, 3.2f, 1.16f, 100, 100, DURANITE, 0.3f, 1.4f, 2);
integrateMaterial("Valyrium", valyrium, valyriumFluid, 1111, 5.37f, 4.8f, 1.30f, 100, 100, VALYRIUM, 1.1f, 1.2f, 4);
integrateMaterial("Vibranium", vibranium, vibraniumFluid, 1235, 7.62f, 8.1f, 1.3f, 100, 100, VIBRANIUM, 1.1f, 1.8f, 4);
integrateMaterial("Karmesine", karmesine, terraxFluid, 444, 4.77f, 2.9f, 0.8f, 100, 50, COBALT, shitty, true, true);
integrateMaterial("Terrax", terrax, terraxFluid, 444, 4.77f, 2.9f, 0.8f, 100, 50, COBALT, shitty, true, true);
integrateMaterial("Palladium", palladium, palladiumFluid, 797, 4.35f, 6.8f, 1.3f, 130, -50, DURANITE, .5f, .2f, 3);
integrateMaterial("Uru", uru, uruFluid, 877, 2f, 7.2f, 1.5f, -50, 175, VALYRIUM, 1.3f, 0.8f, 6);
integrateMaterial("Eezo", eezo, eezoFluid, 50, 23f, 3.5f, .1f, 10, 10, COBALT, shitty, true, false);
@@ -121,6 +121,9 @@ public class TAIGA {
integrateOre("Osram", osramFluid);
integrateOre("Abyssum", abyssumFluid);
integrateOre("Iox", ioxFluid);
integrateOre("Karmesine", karmesineFluid);
integrateOre("Ovium", oviumFluid);
integrateOre("Jauxum", jauxumFluid);
}

2
src/main/java/com/sosnitzka/taiga/traits/TraitSoulEater.java
View File

@@ -19,7 +19,7 @@ import slimeknights.tconstruct.library.utils.TinkerUtil;
public class TraitSoulEater extends AbstractTrait {
private static float divisor = 20000f;
private static float divisor = 25000f;
public TraitSoulEater() {
super(TraitSoulEater.class.getSimpleName().toLowerCase().substring(5), TextFormatting.RED);

1
src/main/java/com/sosnitzka/taiga/traits/TraitWhirl.java
View File

@@ -35,7 +35,6 @@ public class TraitWhirl extends AbstractTrait {
if (entity instanceof FakePlayer || entity.worldObj.isRemote) {
return;
}
if (entity.ticksExisted % TICK_PER_STAT > 0) {
return;
}