diff options
Diffstat (limited to 'src')
18 files changed, 165 insertions, 133 deletions
diff --git a/src/main/java/com/sosnitzka/taiga/MaterialTraits.java b/src/main/java/com/sosnitzka/taiga/MaterialTraits.java index f0e8b4b..38583b3 100644 --- a/src/main/java/com/sosnitzka/taiga/MaterialTraits.java +++ b/src/main/java/com/sosnitzka/taiga/MaterialTraits.java @@ -46,6 +46,7 @@ public class MaterialTraits { public static final AbstractTrait randomize = new TraitRandomize(); public static final AbstractTrait reviving = new TraitReviving(); public static final AbstractTrait melting = new TraitMelting(); + public static final AbstractTrait traditional = new TraitTraditional(); public static Material arcanite = new Material("arcanite", TextFormatting.LIGHT_PURPLE).addTrait(arcane, HeadMaterialStats.TYPE).addTrait(blind, HandleMaterialStats.TYPE); @@ -62,15 +63,16 @@ public class MaterialTraits { public static Material vibranium = new Material("vibranium", TextFormatting.GRAY).addTrait(resonance); public static Material ignitite = new Material("ignitite", TextFormatting.RED).addTrait(melting, 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 eternite = new Material("eternite", TextFormatting.AQUA).addTrait(writable2); //.addTrait(traditional) public static Material mythril = new Material("mythril", TextFormatting.GRAY).addTrait(holy, HeadMaterialStats.TYPE).addTrait(hellish, HandleMaterialStats.TYPE); - public static Material imperomite = new Material("imperomite", TextFormatting.DARK_RED).addTrait(cascade, HeadMaterialStats.TYPE).addTrait(fragile); - public static Material fractoryte = new Material("fractoryte", TextFormatting.DARK_RED).addTrait(fracture, HeadMaterialStats.TYPE).addTrait(fragile); + public static Material imperomite = new Material("imperomite", TextFormatting.DARK_RED).addTrait(cascade); + public static Material fractoryte = new Material("fractoryte", TextFormatting.DARK_RED).addTrait(fracture); public static Material noctunyx = new Material("noctunyx", TextFormatting.LIGHT_PURPLE).addTrait(hollow, HeadMaterialStats.TYPE).addTrait(reviving, HandleMaterialStats.TYPE); public static Material nitronite = new Material("nitronite", TextFormatting.YELLOW).addTrait(uncertain); public static Material cryptogen = new Material("cryptogen", TextFormatting.DARK_GREEN).addTrait(randomize); - public static Material seismodium = new Material("seismodium", TextFormatting.WHITE).addTrait(heroic); + public static Material seismodium = new Material("seismodium", TextFormatting.WHITE).addTrait(heroic).addTrait(fragile); + ; public static Material aegisalt = new Material("aegisalt", TextFormatting.AQUA).addTrait(analysing); public static Material ultranite = new Material("ultranite", TextFormatting.AQUA).addTrait(pulverizing); public static Material bysmuid = new Material("bysmuid", TextFormatting.AQUA).addTrait(organizing, HandleMaterialStats.TYPE).addTrait(melting, HeadMaterialStats.TYPE); diff --git a/src/main/java/com/sosnitzka/taiga/traits/TraitAnalysing.java b/src/main/java/com/sosnitzka/taiga/traits/TraitAnalysing.java index 9ff620a..ecd20f1 100644 --- a/src/main/java/com/sosnitzka/taiga/traits/TraitAnalysing.java +++ b/src/main/java/com/sosnitzka/taiga/traits/TraitAnalysing.java @@ -34,7 +34,7 @@ public class TraitAnalysing extends AbstractTrait { @SubscribeEvent public void onBlockBreak(BlockEvent.BreakEvent event) { EntityPlayer player = event.getPlayer(); - if (player != null && TinkerUtil.hasTrait(TagUtil.getTagSafe(player.getHeldItemMainhand()), this.identifier)) { + if (!event.getWorld().isRemote && player != null && TinkerUtil.hasTrait(TagUtil.getTagSafe(player.getHeldItemMainhand()), this.identifier)) { event.setExpToDrop(this.getUpdateXP(event.getExpToDrop())); } diff --git a/src/main/java/com/sosnitzka/taiga/traits/TraitCascade.java b/src/main/java/com/sosnitzka/taiga/traits/TraitCascade.java index 9dd9d8c..cddd68b 100644 --- a/src/main/java/com/sosnitzka/taiga/traits/TraitCascade.java +++ b/src/main/java/com/sosnitzka/taiga/traits/TraitCascade.java @@ -23,7 +23,7 @@ public class TraitCascade extends AbstractTrait { sx = x = pos.getX(); sy = y = pos.getY(); sz = z = pos.getZ(); - for (int i = random.nextInt((int) Math.max(ToolHelper.getCurrentDurability(tool) * 1.5f, 100)); i > 0; i--) { + for (int i = random.nextInt((int) Math.max(ToolHelper.getCurrentDurability(tool) * 1.5f, 100) + 10); i > 0; i--) { int r = random.nextInt(3); int d = random.nextBoolean() ? 1 : -1; if (r == 0) x += d; diff --git a/src/main/java/com/sosnitzka/taiga/traits/TraitCurvature.java b/src/main/java/com/sosnitzka/taiga/traits/TraitCurvature.java index c8aa8c5..3e0ecc5 100644 --- a/src/main/java/com/sosnitzka/taiga/traits/TraitCurvature.java +++ b/src/main/java/com/sosnitzka/taiga/traits/TraitCurvature.java @@ -23,6 +23,8 @@ import slimeknights.tconstruct.library.utils.TinkerUtil; public class TraitCurvature extends AbstractTrait { + private static BlockPos pos = new BlockPos(0, 0, 0); + public TraitCurvature() { super("curvature", TextFormatting.BLACK); MinecraftForge.EVENT_BUS.register(this); @@ -30,39 +32,39 @@ public class TraitCurvature extends AbstractTrait { @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); + if (player.worldObj.isRemote) { + return; + } + if (random.nextFloat() <= 0.01 && world.provider.getDimension() != -1) { + teleport(player, world, 5); player.playSound(SoundEvents.ENTITY_ENDERMEN_TELEPORT, 1.0F, 1.0F); } } + @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); - target.playSound(SoundEvents.ENTITY_ENDERMEN_TELEPORT, 1.0F, 1.0F); - } else { - target.playSound(SoundEvents.ENTITY_ENDERMEN_TELEPORT, 1.0F, 1.0F); - teleport(target, w); - } + if (random.nextFloat() <= 0.3) { + target.playSound(SoundEvents.ENTITY_ENDERMEN_TELEPORT, 1.0F, 1.0F); + changepos(player, target); } } + @SubscribeEvent public void onMobDrops(LivingDropsEvent event) { World w = event.getEntity().getEntityWorld(); - if (event.getSource().getEntity() instanceof EntityPlayer) { + if (!w.isRemote && 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)) { + if (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) { + private void teleport(EntityLivingBase e, World w, int max) { int x = e.getPosition().getX() + random.nextInt(250) - 125; int y = e.getPosition().getY(); int z = e.getPosition().getZ() + random.nextInt(250) - 125; @@ -76,4 +78,11 @@ public class TraitCurvature extends AbstractTrait { e.setPosition(x, y, z); } + private void changepos(EntityLivingBase player, EntityLivingBase target) { + BlockPos pp = new BlockPos(player.getPosition()); + BlockPos tp = new BlockPos(target.getPosition()); + player.setPosition(tp.getX(), tp.getY(), tp.getZ()); + target.setPosition(pp.getX(), pp.getY(), pp.getZ()); + } + } diff --git a/src/main/java/com/sosnitzka/taiga/traits/TraitDiffuse.java b/src/main/java/com/sosnitzka/taiga/traits/TraitDiffuse.java index 5f76087..25ffa3b 100644 --- a/src/main/java/com/sosnitzka/taiga/traits/TraitDiffuse.java +++ b/src/main/java/com/sosnitzka/taiga/traits/TraitDiffuse.java @@ -24,7 +24,7 @@ public class TraitDiffuse extends AbstractTrait { @SubscribeEvent public void onXpDrop(LivingExperienceDropEvent event) { EntityPlayer player = event.getAttackingPlayer(); - if (player != null && TinkerUtil.hasTrait(TagUtil.getTagSafe(player.getHeldItemMainhand()), this.identifier)) { + if (!event.getEntity().getEntityWorld().isRemote && player != null && TinkerUtil.hasTrait(TagUtil.getTagSafe(player.getHeldItemMainhand()), this.identifier)) { event.setDroppedExperience(0); } @@ -33,7 +33,7 @@ public class TraitDiffuse extends AbstractTrait { @SubscribeEvent public void onBlockBreak(BlockEvent.BreakEvent event) { EntityPlayer player = event.getPlayer(); - if (player != null && TinkerUtil.hasTrait(TagUtil.getTagSafe(player.getHeldItemMainhand()), this.identifier)) { + if (!player.getEntityWorld().isRemote && player != null && TinkerUtil.hasTrait(TagUtil.getTagSafe(player.getHeldItemMainhand()), this.identifier)) { event.setExpToDrop(this.getUpdateXP(event.getExpToDrop())); } @@ -42,9 +42,9 @@ public class TraitDiffuse extends AbstractTrait { @SubscribeEvent public void onMobDrops(LivingDropsEvent event) { World w = event.getEntity().getEntityWorld(); - if (event.getSource().getEntity() instanceof EntityPlayer) { + if (!w.isRemote && 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)) { + if (event.getEntity() instanceof EntityMob && TinkerUtil.hasTrait(TagUtil.getTagSafe(player.getHeldItemMainhand()), identifier)) { event.getDrops().clear(); } } diff --git a/src/main/java/com/sosnitzka/taiga/traits/TraitDissolving.java b/src/main/java/com/sosnitzka/taiga/traits/TraitDissolving.java index 41f684c..e6c9c8e 100644 --- a/src/main/java/com/sosnitzka/taiga/traits/TraitDissolving.java +++ b/src/main/java/com/sosnitzka/taiga/traits/TraitDissolving.java @@ -20,13 +20,15 @@ public class TraitDissolving extends AbstractTrait { // high chance to remove XP, low chance to double,triple or quatruple dropped Experience @SubscribeEvent public void onXpDrop(LivingExperienceDropEvent event) { - EntityPlayer player = event.getAttackingPlayer(); - float r = random.nextFloat(); - if (r <= 0.75 && player != null && TinkerUtil.hasTrait(TagUtil.getTagSafe(player.getHeldItemMainhand()), this.identifier)) { - event.setDroppedExperience(0); - } - if (r > 0.95 && player != null && TinkerUtil.hasTrait(TagUtil.getTagSafe(player.getHeldItemMainhand()), this.identifier)) { - event.setDroppedExperience(event.getDroppedExperience() * (random.nextInt(3) + 2)); + if (!event.getEntity().getEntityWorld().isRemote) { + EntityPlayer player = event.getAttackingPlayer(); + float r = random.nextFloat(); + if (r <= 0.75 && player != null && TinkerUtil.hasTrait(TagUtil.getTagSafe(player.getHeldItemMainhand()), this.identifier)) { + event.setDroppedExperience(0); + } + if (r > 0.95 && player != null && TinkerUtil.hasTrait(TagUtil.getTagSafe(player.getHeldItemMainhand()), this.identifier)) { + event.setDroppedExperience(event.getDroppedExperience() * (random.nextInt(3) + 2)); + } } } } diff --git a/src/main/java/com/sosnitzka/taiga/traits/TraitGarishly.java b/src/main/java/com/sosnitzka/taiga/traits/TraitGarishly.java index 45beff7..e074bd4 100644 --- a/src/main/java/com/sosnitzka/taiga/traits/TraitGarishly.java +++ b/src/main/java/com/sosnitzka/taiga/traits/TraitGarishly.java @@ -30,9 +30,9 @@ public class TraitGarishly extends AbstractTrait { @SubscribeEvent public void onMobDrops(LivingDropsEvent event) { World w = event.getEntity().getEntityWorld(); - if (event.getSource().getEntity() instanceof EntityPlayer) { + if (!w.isRemote && 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)) { + if (event.getEntity() instanceof EntityMob && TinkerUtil.hasTrait(TagUtil.getTagSafe(player.getHeldItemMainhand()), identifier)) { int r = random.nextInt(5); ItemStack i = null; diff --git a/src/main/java/com/sosnitzka/taiga/traits/TraitHollow.java b/src/main/java/com/sosnitzka/taiga/traits/TraitHollow.java index 960afa0..08dfc52 100644 --- a/src/main/java/com/sosnitzka/taiga/traits/TraitHollow.java +++ b/src/main/java/com/sosnitzka/taiga/traits/TraitHollow.java @@ -38,9 +38,9 @@ public class TraitHollow extends AbstractTrait { @SubscribeEvent public void onMobDrops(LivingDropsEvent event) { World w = event.getEntity().getEntityWorld(); - if (event.getSource().getEntity() instanceof EntityPlayer) { + if (!w.isRemote && event.getSource().getEntity() instanceof EntityPlayer) { EntityPlayer player = (EntityPlayer) event.getSource().getEntity(); - if (!w.isRemote && random.nextFloat() <= 0.9 && event.getEntity() instanceof EntityMob && TinkerUtil.hasTrait(TagUtil.getTagSafe(player.getHeldItemMainhand()), identifier)) { + if (random.nextFloat() <= 0.9 && event.getEntity() instanceof EntityMob && TinkerUtil.hasTrait(TagUtil.getTagSafe(player.getHeldItemMainhand()), identifier)) { event.getDrops().clear(); } } diff --git a/src/main/java/com/sosnitzka/taiga/traits/TraitInstable.java b/src/main/java/com/sosnitzka/taiga/traits/TraitInstable.java index d188c86..6df01db 100644 --- a/src/main/java/com/sosnitzka/taiga/traits/TraitInstable.java +++ b/src/main/java/com/sosnitzka/taiga/traits/TraitInstable.java @@ -56,14 +56,15 @@ public class TraitInstable extends AbstractTrait { @SubscribeEvent public void onMobDrops(LivingDropsEvent event) { World w = event.getEntity().getEntityWorld(); - if (event.getSource().getEntity() instanceof EntityPlayer) { + if (!w.isRemote && 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)) { + if (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); } diff --git a/src/main/java/com/sosnitzka/taiga/traits/TraitNatureBound.java b/src/main/java/com/sosnitzka/taiga/traits/TraitNatureBound.java index 8f406f3..f3f6732 100644 --- a/src/main/java/com/sosnitzka/taiga/traits/TraitNatureBound.java +++ b/src/main/java/com/sosnitzka/taiga/traits/TraitNatureBound.java @@ -13,12 +13,14 @@ import net.minecraftforge.common.MinecraftForge; 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; import slimeknights.tconstruct.library.utils.ToolHelper; public class TraitNatureBound extends AbstractTrait { public static DamageSource splinter = new DamageSource("splinter").setDamageBypassesArmor(); - private static int chance = 10; + private static int chance = 20; public TraitNatureBound() { super("naturebound", TextFormatting.GREEN); @@ -34,8 +36,8 @@ public class TraitNatureBound extends AbstractTrait { @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); + if (!world.isRemote && entity instanceof EntityLivingBase && random.nextInt(30 * chance) == 0) { + ToolHelper.healTool(tool, random.nextInt(9) + 1, (EntityLivingBase) entity); } } @@ -43,7 +45,7 @@ public class TraitNatureBound extends AbstractTrait { @SubscribeEvent public void onBlockBreak(BlockEvent.BreakEvent e) { Block b = e.getWorld().getBlockState(e.getPos()).getBlock(); - if (random.nextFloat() <= .07 && (b == Blocks.DIRT || b == Blocks.GRASS || b == Blocks.LOG || b == Blocks.LOG2 || b == Blocks.STONE)) { + if (!e.getWorld().isRemote && TinkerUtil.hasTrait(TagUtil.getTagSafe(e.getPlayer().getHeldItemMainhand()), identifier) && random.nextFloat() <= .07 && (b == Blocks.DIRT || b == Blocks.GRASS || b == Blocks.LOG || b == Blocks.LOG2 || b == Blocks.STONE)) { e.setCanceled(true); e.getPlayer().playSound(SoundEvents.ENTITY_ENDERMEN_TELEPORT, 1.0F, 1.0F); } diff --git a/src/main/java/com/sosnitzka/taiga/traits/TraitOrganizing.java b/src/main/java/com/sosnitzka/taiga/traits/TraitOrganizing.java index f03d4c6..f3a279b 100644 --- a/src/main/java/com/sosnitzka/taiga/traits/TraitOrganizing.java +++ b/src/main/java/com/sosnitzka/taiga/traits/TraitOrganizing.java @@ -13,7 +13,7 @@ import slimeknights.tconstruct.library.utils.ToolHelper; public class TraitOrganizing extends AbstractTrait { - private static final float chance = 0.1f; + private static final float chance = 0.02f; public TraitOrganizing() { super("organizing", TextFormatting.GREEN); diff --git a/src/main/java/com/sosnitzka/taiga/traits/TraitSofty.java b/src/main/java/com/sosnitzka/taiga/traits/TraitSofty.java index 4771e72..65b15ad 100644 --- a/src/main/java/com/sosnitzka/taiga/traits/TraitSofty.java +++ b/src/main/java/com/sosnitzka/taiga/traits/TraitSofty.java @@ -21,7 +21,7 @@ public class TraitSofty extends AbstractTrait { @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) { + if (!world.isRemote && state.getMaterial().equals(Material.GROUND) && random.nextFloat() < chance) { ToolHelper.healTool(tool, random.nextInt(10), player); } } diff --git a/src/main/java/com/sosnitzka/taiga/traits/TraitTraditional.java b/src/main/java/com/sosnitzka/taiga/traits/TraitTraditional.java new file mode 100644 index 0000000..7f088a4 --- /dev/null +++ b/src/main/java/com/sosnitzka/taiga/traits/TraitTraditional.java @@ -0,0 +1,16 @@ +package com.sosnitzka.taiga.traits; + +import net.minecraft.util.text.TextFormatting; +import net.minecraftforge.common.MinecraftForge; +import slimeknights.tconstruct.library.traits.AbstractTrait; + + +public class TraitTraditional extends AbstractTrait { + + public TraitTraditional() { + super("traditional", TextFormatting.GREEN); + MinecraftForge.EVENT_BUS.register(this); + } + + +} diff --git a/src/main/java/com/sosnitzka/taiga/traits/TraitUncertain.java b/src/main/java/com/sosnitzka/taiga/traits/TraitUncertain.java index 8bd8f7b..ef8bf57 100644 --- a/src/main/java/com/sosnitzka/taiga/traits/TraitUncertain.java +++ b/src/main/java/com/sosnitzka/taiga/traits/TraitUncertain.java @@ -46,9 +46,9 @@ public class TraitUncertain extends AbstractTrait { @SubscribeEvent public void onMobDrops(LivingDropsEvent event) { World w = event.getEntity().getEntityWorld(); - if (event.getSource().getEntity() instanceof EntityPlayer) { + if (!w.isRemote && 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)) { + if (event.getEntity() instanceof EntityMob && TinkerUtil.hasTrait(TagUtil.getTagSafe(player.getHeldItemMainhand()), identifier)) { ItemStack i = new ItemStack(Items.COAL, random.nextInt(4)); if (random.nextBoolean()) { int r = random.nextInt(4); diff --git a/src/main/java/com/sosnitzka/taiga/util/FuelHandler.java b/src/main/java/com/sosnitzka/taiga/util/FuelHandler.java index 25eb7ed..3b8a78e 100644 --- a/src/main/java/com/sosnitzka/taiga/util/FuelHandler.java +++ b/src/main/java/com/sosnitzka/taiga/util/FuelHandler.java @@ -11,13 +11,13 @@ public class FuelHandler implements IFuelHandler { @Override public int getBurnTime(ItemStack fuel) { if (fuel.getItem().equals(lignite)) { - return 200 * 8; + return 200 * 6; } if (fuel.getItem().equals(lignite2)) { - return 200 * 6; + return 200 * 4; } if (fuel.getItem().equals(lignite3)) { - return 200 * 10; + return 200 * 8; } if (fuel.getItem().equals(fuel_brick)) { return 200 * 16; diff --git a/src/main/java/com/sosnitzka/taiga/world/ZWorldGen.java b/src/main/java/com/sosnitzka/taiga/world/ZWorldGen.java index 87d1b77..bc90411 100644 --- a/src/main/java/com/sosnitzka/taiga/world/ZWorldGen.java +++ b/src/main/java/com/sosnitzka/taiga/world/ZWorldGen.java @@ -14,36 +14,36 @@ import static com.sosnitzka.taiga.Blocks.*; public class ZWorldGen implements IWorldGenerator { private void nether(Random random, int x, int z, World world) { - Generator.generateNetherOre(adamantiteOre.getDefaultState(), random, x, z, world, 25, 1, 32, 2, 5); - Generator.generateNetherOre(tiberiumOre.getDefaultState(), random, x, z, world, 60, 1, 128, 2, 7); - Generator.generateNetherOre(palladiumOre.getDefaultState(), random, x, z, world, 21, 32, 64, 2, 5); - Generator.generateOre(prometheumOre.getDefaultState(), random, x, z, world, 21, 48, 64, 2, 4); + Generator.generateNetherOre(adamantiteOre.getDefaultState(), random, x, z, world, 30, 1, 32, 2, 8); + Generator.generateNetherOre(tiberiumOre.getDefaultState(), random, x, z, world, 20, 1, 128, 7, 15); + Generator.generateNetherOre(palladiumOre.getDefaultState(), random, x, z, world, 30, 32, 64, 2, 7); + Generator.generateNetherOre(prometheumOre.getDefaultState(), random, x, z, world, 30, 32, 64, 2, 6); } private void world(Random random, int x, int z, World world) { - Generator.generateOre(slagironOre.getDefaultState(), random, x, z, world, 40, 8, 96, 5, 16); - Generator.generateOre(slaggoldOre.getDefaultState(), random, x, z, world, 20, 8, 48, 5, 9); - Generator.generateOre(ligniteOre.getDefaultState(), random, x, z, world, 40, 8, 96, 5, 15); - Generator.generateOre(Blocks.IRON_ORE.getDefaultState(), random, x, z, world, 40, 8, 96, 2, 14); + Generator.generateOre(slagironOre.getDefaultState(), random, x, z, world, 45, 8, 96, 5, 12); + Generator.generateOre(slaggoldOre.getDefaultState(), random, x, z, world, 30, 8, 48, 4, 8); + Generator.generateOre(ligniteOre.getDefaultState(), random, x, z, world, 30, 8, 96, 5, 12); + Generator.generateOre(Blocks.IRON_ORE.getDefaultState(), random, x, z, world, 40, 8, 96, 2, 8); Generator.generateOre(basalt.getDefaultState(), Blocks.LAVA.getDefaultState(), random, x, z, world, 100, 8, 24, 2, 5); Generator.generateOre(rottenGround.getDefaultState(), Blocks.DIRT.getDefaultState(), random, x, z, world, 25, 50, 70, 2, 15); - Generator.generateOre(vibraniumOre.getDefaultState(), random, x, z, world, 18, 48, 64, 2, 4); - Generator.generateOre(karmesineOre.getDefaultState(), random, x, z, world, 30, 16, 48, 2, 5); - Generator.generateOre(bismuthOre.getDefaultState(), random, x, z, world, 50, 50, 130, 2, 4); - Generator.generateOre(mythrilOre.getDefaultState(), random, x, z, world, 18, 16, 32, 2, 4); - Generator.generateOre(meteoriteOre.getDefaultState(), random, x, z, world, 12, 0, 32, 2, 10); - Generator.generateOre(mindoriteOre.getDefaultState(), Blocks.STONE.getDefaultState(), BlockStone.VARIANT, BlockStone.EnumType.DIORITE, random, x, z, world, 200, 16, 96, 2, 4); - Generator.generateOre(arcaniteOre.getDefaultState(), Blocks.STONE.getDefaultState(), BlockStone.VARIANT, BlockStone.EnumType.GRANITE, random, x, z, world, 200, 16, 96, 2, 4); - Generator.generateOre(eterniteOre.getDefaultState(), Blocks.STONE.getDefaultState(), BlockStone.VARIANT, BlockStone.EnumType.ANDESITE, random, x, z, world, 200, 16, 96, 2, 4); + Generator.generateOre(vibraniumOre.getDefaultState(), random, x, z, world, 30, 48, 64, 2, 8); + Generator.generateOre(karmesineOre.getDefaultState(), random, x, z, world, 35, 16, 48, 2, 7); + Generator.generateOre(bismuthOre.getDefaultState(), random, x, z, world, 60, 50, 130, 2, 4); + Generator.generateOre(mythrilOre.getDefaultState(), random, x, z, world, 33, 16, 32, 2, 8); + Generator.generateOre(meteoriteOre.getDefaultState(), random, x, z, world, 10, 0, 32, 2, 25); + Generator.generateOre(mindoriteOre.getDefaultState(), Blocks.STONE.getDefaultState(), BlockStone.VARIANT, BlockStone.EnumType.DIORITE, random, x, z, world, 150, 16, 96, 2, 8); + Generator.generateOre(arcaniteOre.getDefaultState(), Blocks.STONE.getDefaultState(), BlockStone.VARIANT, BlockStone.EnumType.GRANITE, random, x, z, world, 150, 16, 96, 2, 8); + Generator.generateOre(eterniteOre.getDefaultState(), Blocks.STONE.getDefaultState(), BlockStone.VARIANT, BlockStone.EnumType.ANDESITE, random, x, z, world, 150, 16, 96, 2, 8); } private void end(Random random, int x, int z, World world) { - Generator.generateEndOre(rubiumOre.getDefaultState(), random, x, z, world, 16, 10, 35, 2, 6); - Generator.generateEndOre(ignititeOre.getDefaultState(), random, x, z, world, 16, 20, 45, 2, 6); - Generator.generateEndOre(violiumOre.getDefaultState(), random, x, z, world, 16, 30, 55, 2, 6); - Generator.generateEndOre(titaniteOre.getDefaultState(), random, x, z, world, 16, 40, 65, 2, 6); + Generator.generateEndOre(rubiumOre.getDefaultState(), random, x, z, world, 18, 10, 35, 2, 8); + Generator.generateEndOre(ignititeOre.getDefaultState(), random, x, z, world, 18, 20, 45, 2, 8); + Generator.generateEndOre(violiumOre.getDefaultState(), random, x, z, world, 18, 30, 55, 2, 8); + Generator.generateEndOre(titaniteOre.getDefaultState(), random, x, z, world, 18, 40, 65, 2, 8); } diff --git a/src/main/resources/assets/taiga/lang/de_DE.lang b/src/main/resources/assets/taiga/lang/de_DE.lang index 5b8064f..0481b52 100644 --- a/src/main/resources/assets/taiga/lang/de_DE.lang +++ b/src/main/resources/assets/taiga/lang/de_DE.lang @@ -167,60 +167,60 @@ fluid.tconstruct.nitro_fluid.name=Flüssiges Nitro 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.analysing.name=Analysierend +modifier.analysing.desc=§oIch kenne dich!§r\ERFAHRRRUNG! +modifier.arcane.name=Arkan +modifier.arcane.desc=§oEs ist dunkel, zeit für den Bergbau!§r\Die Nacht repariert! +modifier.organizing.name=Organisch +modifier.organizing.desc=§oIch Mensch, du Baum!§r\Kann zu Holz werden. 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.blind.desc=§oEs ist zu dunkel!§r\Es wird immer Dunkler. +modifier.bright.name=Hell +modifier.bright.desc=§oHell ist es draußen!§r\Kraftvoll sind wir! +modifier.cascade.name=Kaskade +modifier.cascade.desc=§oHier vibriert was!§r\Erdbeben! 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.curvature.desc=§oEs zerrt an mir!§r\Teleport! +modifier.dark.name=Dunkel +modifier.dark.desc=§oDüsternis.§r\Die Nacht macht mich stark. +modifier.diffuse.name=Diffus +modifier.diffuse.desc=§oErfahrung!!!!?§r\Viel oder wenig Erfahrung! +modifier.dissolving.name=Auflösend +modifier.dissolving.desc=§oScheiss auf Erfahrung.§r\Erfahrung wechselt. +modifier.fracture.name=Fraktur +modifier.fracture.desc=§oImmer tiefer graben!§r\Hier wird gebohrt! +modifier.fragile.name=Fragil +modifier.fragile.desc=§oErdbeben, was gehtn!?§r\Schwächt Blöcke. +modifier.garishly.name=Feurig +modifier.garishly.desc=§oIt's so hot.§r\Feuer Feuer! Feueritems! +modifier.glimmer.name=Glühend +modifier.glimmer.desc=§oDunkelheit, ich lach dich aus!§r\Nachtsicht! +modifier.haunted.name=BSE +modifier.haunted.desc=§oKrank!'§r\RINDERWAHN! +modifier.heroic.name=Heldenhaft +modifier.heroic.desc=§oBis zum Tod.§r\Am Ende wirst du stark! +modifier.hollow.name=Hohl +modifier.hollow.desc=§oBraindead!§r\Gehirnmatsche +modifier.instable.name=Instabil +modifier.instable.desc=§oWTF?§r\Es ist so instabil und brennt auf der Haut. +modifier.naturebound.name=Naturverbunden +modifier.naturebound.desc=§oDu bist eins mit der Natur!§r\Repariert und so. +modifier.pulverizing.name=Pulverisierend +modifier.pulverizing.desc=§oHulk... Draufhauen!§r\Mach alles kurz und klein. +modifier.randomize.name=Zufall +modifier.randomize.desc=§oWer bist du??§r\Zufall bei Mobs und Metallen. +modifier.resonance.name=Resonanz +modifier.resonance.desc=§oVibranium!!! Baaaam!§r\Nimm das. +modifier.slaughtering.name=Schlachten +modifier.slaughtering.desc=§oOm nom nom!§r\Wer braucht schon Erfahrung wenn man Fleisch hat? +modifier.softy.name=Soft +modifier.softy.desc=§oIch hab ein Glas vol Dreck!§r\Dreck heilt. +modifier.uncertain.name=Unsicher +modifier.uncertain.desc=§oHier stimmt was nicht.§r\Immerhin ist es nicht instabil...oder? modifier.reviving.name=Wiederbelebend -modifier.reviving.desc=§o§r\ +modifier.reviving.desc=§oTöte es doch endlich!§r\Zombies!? modifier.melting.name=Schmelzend -modifier.melting.desc=§o§r\ +modifier.melting.desc=§oUnendlich heiß!§r\Burrrrrrn! item.glimmercoal.name=Glimmerkohle diff --git a/src/main/resources/assets/taiga/lang/en_US.lang b/src/main/resources/assets/taiga/lang/en_US.lang index d288062..31d1f63 100644 --- a/src/main/resources/assets/taiga/lang/en_US.lang +++ b/src/main/resources/assets/taiga/lang/en_US.lang @@ -172,7 +172,7 @@ modifier.analysing.desc=§oI know what you are!§r\nKill them, get all their kno 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.organizing.desc=§oNow you are tree!§r\Possibly creates wood. 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 @@ -192,35 +192,35 @@ modifier.fracture.desc=§oYou gonna dig deep!§r\Do you have a drill or somethin 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.garishly.desc=§oIt's so hot.§r\Thei actually drop fiery stuff. modifier.glimmer.name=Glimmer -modifier.glimmer.desc=§o§r\ +modifier.glimmer.desc=§oDarkness? Not for me!§r\Sometimes you get night vision. modifier.haunted.name=Haunted -modifier.haunted.desc=§o§r\ +modifier.haunted.desc=§oHit 'em to get 'em crazy!'§r\Fucking mad cow desease. modifier.heroic.name=Heroic -modifier.heroic.desc=§o§r\ +modifier.heroic.desc=§oUntil you'll die.§r\At the end, you grow stronger. modifier.hollow.name=Hollow -modifier.hollow.desc=§o§r\ +modifier.hollow.desc=§oBraindead!§r\Brain smash! modifier.instable.name=Instable -modifier.instable.desc=§o§r\ +modifier.instable.desc=§oWhat the fuck?§r\Seriously, this is instable! modifier.naturebound.name=Naturebound -modifier.naturebound.desc=§o§r\ +modifier.naturebound.desc=§oYou are one with your surrounding!§r\Repairs in name of the nature. modifier.pulverizing.name=Pulverizing -modifier.pulverizing.desc=§o§r\ +modifier.pulverizing.desc=§oHulk... Smash!§r\Destroy the stuff you mine. modifier.randomize.name=Randomize -modifier.randomize.desc=§o§r\ +modifier.randomize.desc=§oWho are you?§r\Randomizes entities and vanilla metal-ores. modifier.resonance.name=Resonance -modifier.resonance.desc=§o§r\ +modifier.resonance.desc=§oVibranium!!! Baaaam!§r\Take that smash! modifier.slaughtering.name=Slaughtering -modifier.slaughtering.desc=§o§r\ +modifier.slaughtering.desc=§oYum yum!§r\Who needs EXP if you can have meat? modifier.softy.name=Softy -modifier.softy.desc=§o§r\ +modifier.softy.desc=§oI love dirt!§r\Dirt heals! modifier.uncertain.name=Uncertain -modifier.uncertain.desc=§o§r\ +modifier.uncertain.desc=§oSome kind of risky to use.§r\At least it's not instable...or? modifier.reviving.name=Reviving -modifier.reviving.desc=§o§r\ +modifier.reviving.desc=§oPlease kill it already!§r\Zombies!? modifier.melting.name=Melting -modifier.melting.desc=§o§r\ +modifier.melting.desc=§oSo fucking hot!§r\Burrrrrrn! item.glimmercoal.name=Glimmercoal |