Jotunn/TAIGA-Obsidiorite-Heroic-Fixes
1
0
Fork 0
forked from TAIGA/TAIGA
Code Issues Pull Requests Releases Wiki Activity

Adjusted tiberium ore, removed vanilla smelting recipes, adjusted three traits (one left), description for materials added

Browse Source
This commit is contained in:
Robert Sosnitzka
2016-07-20 01:41:39 +02:00
parent 74e3baa05c
commit db49a2c74e
7 changed files with 84 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/sosnitzka/taiga/blocks/BlockTiberium.java
View File

@@ -34,7 +34,7 @@ public class BlockTiberium extends BasicBlock {
@Override
public int quantityDropped(IBlockState state, int fortune, Random random) {
return MathHelper.getRandomIntegerInRange(random, 1, MathHelper.getRandomIntegerInRange(random, 1, 5 + fortune));
return MathHelper.getRandomIntegerInRange(random, 1, MathHelper.getRandomIntegerInRange(random, 2, 4 + fortune));
}
@Override

13
src/main/java/com/sosnitzka/taiga/recipes/Smelting.java
View File

@@ -12,11 +12,14 @@ import static com.sosnitzka.taiga.Items.*;
public class Smelting {
public static void register() {
GameRegistry.addSmelting(slagironOre, new ItemStack(slagironIngot), 1.0F);
GameRegistry.addSmelting(new ItemStack(slagironIngot), new ItemStack(iron_nugget), 0);
GameRegistry.addSmelting(new ItemStack(slaggoldIngot), new ItemStack(Items.GOLD_NUGGET), 0);
GameRegistry.addSmelting(new ItemStack(tiberiumShardInstable), new ItemStack(tiberiumShardStable), 0.2F);
GameRegistry.addSmelting(slaggoldOre, new ItemStack(slaggoldIngot), 1.0F);
GameRegistry.addSmelting(slagironIngot, new ItemStack(iron_nugget), 0);
GameRegistry.addSmelting(slaggoldIngot, new ItemStack(Items.GOLD_NUGGET), 0);
GameRegistry.addSmelting(tiberiumShardInstable, new ItemStack(tiberiumShardStable), 0.2F);
GameRegistry.addSmelting(tiberiumOre, new ItemStack(tiberiumShardStable, 3), RandomUtils.nextFloat(0F, 2F));
GameRegistry.addSmelting(titaniteOre, new ItemStack(titaniteIngot), RandomUtils.nextFloat(0F, 2F));
// Removed until TiC put its own ores back in.
/* GameRegistry.addSmelting(titaniteOre, new ItemStack(titaniteIngot), RandomUtils.nextFloat(0F, 2F));
GameRegistry.addSmelting(arcaniteOre, new ItemStack(arcaniteIngot), RandomUtils.nextFloat(0F, 2F));
GameRegistry.addSmelting(adamantiteOre, new ItemStack(adamantiteIngot), RandomUtils.nextFloat(0F, 2F));
GameRegistry.addSmelting(violiumOre, new ItemStack(violiumIngot), RandomUtils.nextFloat(0F, 2F));
@@ -29,9 +32,9 @@ public class Smelting {
GameRegistry.addSmelting(mythrilOre, new ItemStack(mythrilIngot), RandomUtils.nextFloat(0F, 2F));
GameRegistry.addSmelting(palladiumOre, new ItemStack(palladiumIngot), RandomUtils.nextFloat(0F, 2F));
GameRegistry.addSmelting(prometheumOre, new ItemStack(prometheumIngot), RandomUtils.nextFloat(0F, 2F));
GameRegistry.addSmelting(tiberiumOre, new ItemStack(tiberiumShardStable, 2), RandomUtils.nextFloat(0F, 2F));
GameRegistry.addSmelting(vibraniumOre, new ItemStack(vibraniumIngot), RandomUtils.nextFloat(0F, 2F));
GameRegistry.addSmelting(rubiumOre, new ItemStack(rubiumIngot), RandomUtils.nextFloat(0F, 2F));
*/
}
}

12
src/main/java/com/sosnitzka/taiga/traits/TraitBlind.java
View File

@@ -20,8 +20,10 @@ public class TraitBlind extends AbstractTrait {
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.1 && isNight(time))) {
player.addPotionEffect(new PotionEffect(MobEffects.BLINDNESS, random.nextInt(400) + 200));
player.addPotionEffect(new PotionEffect(MobEffects.WEAKNESS, random.nextInt(400) + 200));
if (random.nextBoolean())
player.addPotionEffect(new PotionEffect(MobEffects.BLINDNESS, random.nextInt(200) + 100));
else
player.addPotionEffect(new PotionEffect(MobEffects.WEAKNESS, random.nextInt(200) + 100));
}
}
@@ -29,8 +31,10 @@ public class TraitBlind extends AbstractTrait {
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.1 && isNight(time))) {
player.addPotionEffect(new PotionEffect(MobEffects.BLINDNESS, random.nextInt(400) + 200));
player.addPotionEffect(new PotionEffect(MobEffects.WEAKNESS, random.nextInt(400) + 200));
if (random.nextBoolean())
player.addPotionEffect(new PotionEffect(MobEffects.BLINDNESS, random.nextInt(400) + 200));
else
player.addPotionEffect(new PotionEffect(MobEffects.WEAKNESS, random.nextInt(400) + 200));
}
}

14
src/main/java/com/sosnitzka/taiga/traits/TraitCascade.java
View File

@@ -1,5 +1,7 @@
package com.sosnitzka.taiga.traits;
import com.sosnitzka.taiga.util.TickTask;
import com.sosnitzka.taiga.util.TickTaskHandler;
import net.minecraft.block.state.IBlockState;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.item.ItemStack;
@@ -19,14 +21,17 @@ public class TraitCascade extends AbstractTrait {
public void afterBlockBreak(ItemStack tool, World world, IBlockState state, BlockPos pos, EntityLivingBase player, boolean wasEffective) {
float f = random.nextFloat();
float b = 0.99F * calcBonus(tool);
if (!world.isRemote && tool.canHarvestBlock(state) && f <= b) {
double x, y, z, sx, sy, sz;
sx = x = pos.getX();
sy = y = pos.getY();
sz = z = pos.getZ();
for (int i = random.nextInt(ToolHelper.getCurrentDurability(tool)); i > 0; i--) {
for (int i = random.nextInt((int) (ToolHelper.getCurrentDurability(tool) * 1.5f)); i > 0; i--) {
TickTaskHandler.getInstance().addTask(new TickTask(20, new Runnable() {
@Override
public void run() {
}
}));
int r = random.nextInt(3);
int d = random.nextBoolean() ? 1 : -1;
if (r == 0) x += d;
@@ -44,8 +49,11 @@ public class TraitCascade extends AbstractTrait {
y = sy;
z = sz;
}
}
}
}
private float calcBonus(ItemStack tool) {

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

@@ -33,7 +33,7 @@ public class TraitFragile extends AbstractTrait {
sx = x = pos.getX();
sy = y = pos.getY();
sz = z = pos.getZ();
for (int i = random.nextInt(50) + 50; i > 0; i--) {
for (int i = random.nextInt(10) + 9; i > 0; i--) {
int r = random.nextInt(3);
int d = random.nextBoolean() ? 1 : -1;
if (r == 0) x += d;

28
src/main/resources/assets/taiga/lang/de_DE.lang
View File

@@ -168,32 +168,60 @@ fluid.tconstruct.anthracite_fluid.name=Flüssiges Anthracit
fluid.tconstruct.spectrum_fluid.name=Spektrumfluid
modifier.analysing.name=Analysing
modifier.analysing.desc=§oI know what you are!§r\nKill them, get all their knowledge, ignore loot.
modifier.arcane.name=Arcane
modifier.arcane.desc=§oIt's dark outside, let's go mining!§r\Nighttime is good for tool health.
modifier.organizing.name=Organisieren
modifier.organizing.desc=§o§r\
modifier.blind.name=Blind
modifier.blind.desc=§o§r\
modifier.bright.name=Bright
modifier.bright.desc=§o§r\
modifier.cascade.name=Cascade
modifier.cascade.desc=§o§r\
modifier.curvature.name=Curvature
modifier.curvature.desc=§o§r\
modifier.dark.name=Dark
modifier.dark.desc=§o§r\
modifier.diffuse.name=Diffuse
modifier.diffuse.desc=§o§r\
modifier.dissolving.name=Dissolving
modifier.dissolving.desc=§o§r\
modifier.fracture.name=Fracture
modifier.fracture.desc=§o§r\
modifier.fragile.name=Fragile
modifier.fragile.desc=§o§r\
modifier.garishly.name=Garishly
modifier.garishly.desc=§o§r\
modifier.glimmer.name=Glimmer
modifier.glimmer.desc=§o§r\
modifier.haunted.name=Haunted
modifier.haunted.desc=§o§r\
modifier.heroic.name=Heroic
modifier.heroic.desc=§o§r\
modifier.hollow.name=Hollow
modifier.hollow.desc=§o§r\
modifier.instable.name=Instable
modifier.instable.desc=§o§r\
modifier.naturebound.name=Naturebound
modifier.naturebound.desc=§o§r\
modifier.pulverizing.name=Pulverizing
modifier.pulverizing.desc=§o§r\
modifier.randomize.name=Randomize
modifier.randomize.desc=§o§r\
modifier.resonance.name=Resonance
modifier.resonance.desc=§o§r\
modifier.slaughtering.name=Slaughtering
modifier.slaughtering.desc=§o§r\
modifier.softy.name=Softy
modifier.softy.desc=§o§r\
modifier.uncertain.name=Uncertain
modifier.uncertain.desc=§o§r\
modifier.reviving.name=Wiederbelebend
modifier.reviving.desc=§o§r\
modifier.melting.name=Schmelzend
modifier.melting.desc=§o§r\
item.glimmercoal.name=Glimmerkohle
item.glimmer_pearl.name=Glimmerperle

27
src/main/resources/assets/taiga/lang/en_US.lang
View File

@@ -168,32 +168,59 @@ item.proxideum_ingot.name=Proxideum Ingot
item.astrium_ingot.name=Astrium Ingot
modifier.analysing.name=Analysing
modifier.analysing.desc=§oI know what you are!§r\nKill them, get all their knowledge, ignore loot.
modifier.arcane.name=Arcane
modifier.arcane.desc=§oIt's dark outside, let's go mining!§r\Nighttime is good for tool health.
modifier.organizing.name=Organizing
modifier.organizing.desc=§o§r\
modifier.blind.name=Blind
modifier.blind.desc=§oIt's a dark night, I can't even see!§r\Darkness brings weakness or more darkness.
modifier.bright.name=Bright
modifier.bright.desc=§oIt's a bright day, I feel strong!§r\Daytime let you glow.
modifier.cascade.name=Cascade
modifier.cascade.desc=§oThis tool is vibrating!§r\Breaks blocks like an earthquake.
modifier.curvature.name=Curvature
modifier.curvature.desc=§oIt pulls me back and forth!§r\Sometimes it teleports you or your surroundings.
modifier.dark.name=Dark
modifier.dark.desc=§oIt's dark outside, let's fight!§r\Nighttime makes you stronger.
modifier.diffuse.name=Diffuse
modifier.diffuse.desc=§oSo much EXP... or nothing?§r\Regular blocks drop exp, but loot is probably gone.
modifier.dissolving.name=Dissolving
modifier.dissolving.desc=§oI dont care about missing Experience.§r\Switching amount of experience.
modifier.fracture.name=Fracture
modifier.fracture.desc=§oYou gonna dig deep!§r\Do you have a drill or something?
modifier.fragile.name=Fragile
modifier.fragile.desc=§oKind of earthquake.§r\Blocks are getting weak and your tool drops health.
modifier.garishly.name=Garishly
modifier.garishly.desc=§oIt's so hot§r\
modifier.glimmer.name=Glimmer
modifier.glimmer.desc=§o§r\
modifier.haunted.name=Haunted
modifier.haunted.desc=§o§r\
modifier.heroic.name=Heroic
modifier.heroic.desc=§o§r\
modifier.hollow.name=Hollow
modifier.hollow.desc=§o§r\
modifier.instable.name=Instable
modifier.instable.desc=§o§r\
modifier.naturebound.name=Naturebound
modifier.naturebound.desc=§o§r\
modifier.pulverizing.name=Pulverizing
modifier.pulverizing.desc=§o§r\
modifier.randomize.name=Randomize
modifier.randomize.desc=§o§r\
modifier.resonance.name=Resonance
modifier.resonance.desc=§o§r\
modifier.slaughtering.name=Slaughtering
modifier.slaughtering.desc=§o§r\
modifier.softy.name=Softy
modifier.softy.desc=§o§r\
modifier.uncertain.name=Uncertain
modifier.uncertain.desc=§o§r\
modifier.reviving.name=Reviving
modifier.reviving.desc=§o§r\
modifier.melting.name=Melting
modifier.melting.desc=§o§r\
item.glimmercoal.name=Glimmercoal