diff options
| author | Giovanni Harting <539@idlegandalf.com> | 2016-05-03 18:28:49 +0200 |
|---|---|---|
| committer | Giovanni Harting <539@idlegandalf.com> | 2016-05-03 18:28:49 +0200 |
| commit | 086faefd234fa06894c07eb6d60291e229df5888 (patch) | |
| tree | 4c7275ec5cd78de7be3c03be7bb927b6111eff44 /src/main/java/blocks | |
| parent | 5ef97bbcf16bedbf04c9092e3d58d897ed5e4a82 (diff) | |
general code cleanup
Diffstat (limited to 'src/main/java/blocks')
21 files changed, 25 insertions, 26 deletions
diff --git a/src/main/java/blocks/BlockAardiumOre.java b/src/main/java/blocks/BlockAardiumOre.java index 13c1b0e..9dcfe20 100644 --- a/src/main/java/blocks/BlockAardiumOre.java +++ b/src/main/java/blocks/BlockAardiumOre.java @@ -6,6 +6,6 @@ import net.minecraft.block.material.Material; public class BlockAardiumOre extends BasicBlockOre { public BlockAardiumOre() { - super("aardium_ore", Material.ROCK, 55.0f, 400.0f, 3 ); + super("aardium_ore", Material.ROCK, 55.0f, 400.0f, 3); } } diff --git a/src/main/java/blocks/BlockAdamantiteOre.java b/src/main/java/blocks/BlockAdamantiteOre.java index 17cdc6e..730dd73 100644 --- a/src/main/java/blocks/BlockAdamantiteOre.java +++ b/src/main/java/blocks/BlockAdamantiteOre.java @@ -6,6 +6,6 @@ import net.minecraft.block.material.Material; public class BlockAdamantiteOre extends BasicBlockOre { public BlockAdamantiteOre() { - super("adamantite_ore", Material.ROCK, 80.0f, 1000.0f,4); + super("adamantite_ore", Material.ROCK, 80.0f, 1000.0f, 4); } } diff --git a/src/main/java/blocks/BlockArcaniteOre.java b/src/main/java/blocks/BlockArcaniteOre.java index bcf2f87..e073886 100644 --- a/src/main/java/blocks/BlockArcaniteOre.java +++ b/src/main/java/blocks/BlockArcaniteOre.java @@ -6,6 +6,6 @@ import net.minecraft.block.material.Material; public class BlockArcaniteOre extends BasicBlockOre { public BlockArcaniteOre() { - super("arcanite_ore", Material.ROCK, 23.0f, 25.0f,2); + super("arcanite_ore", Material.ROCK, 23.0f, 25.0f, 2); } } diff --git a/src/main/java/blocks/BlockAxiidianOre.java b/src/main/java/blocks/BlockAxiidianOre.java index 912f9bf..d7ef4d8 100644 --- a/src/main/java/blocks/BlockAxiidianOre.java +++ b/src/main/java/blocks/BlockAxiidianOre.java @@ -6,6 +6,6 @@ import net.minecraft.block.material.Material; public class BlockAxiidianOre extends BasicBlockOre { public BlockAxiidianOre() { - super("axiidian_ore", Material.ROCK, 13.0f, 13.0f,3); + super("axiidian_ore", Material.ROCK, 13.0f, 13.0f, 3); } } diff --git a/src/main/java/blocks/BlockBasalt.java b/src/main/java/blocks/BlockBasalt.java index cc85c93..1c22f22 100644 --- a/src/main/java/blocks/BlockBasalt.java +++ b/src/main/java/blocks/BlockBasalt.java @@ -6,6 +6,6 @@ import net.minecraft.block.material.Material; public class BlockBasalt extends BasicBlockOre { public BlockBasalt() { - super("basalt", Material.ROCK, 35.0f, 35.0f,3); + super("basalt", Material.ROCK, 35.0f, 35.0f, 3); } } diff --git a/src/main/java/blocks/BlockBismuthOre.java b/src/main/java/blocks/BlockBismuthOre.java index bc720f7..8cdeb2e 100644 --- a/src/main/java/blocks/BlockBismuthOre.java +++ b/src/main/java/blocks/BlockBismuthOre.java @@ -6,6 +6,6 @@ import net.minecraft.block.material.Material; public class BlockBismuthOre extends BasicBlockOre { public BlockBismuthOre() { - super("bismuth_ore", Material.ROCK, 8.0f, 8.0f,1); + super("bismuth_ore", Material.ROCK, 8.0f, 8.0f, 1); } } diff --git a/src/main/java/blocks/BlockEterniteOre.java b/src/main/java/blocks/BlockEterniteOre.java index e56e95c..3c75a50 100644 --- a/src/main/java/blocks/BlockEterniteOre.java +++ b/src/main/java/blocks/BlockEterniteOre.java @@ -6,6 +6,6 @@ import net.minecraft.block.material.Material; public class BlockEterniteOre extends BasicBlockOre { public BlockEterniteOre() { - super("eternite_ore", Material.ROCK, 24.0f, 25.0f,3); + super("eternite_ore", Material.ROCK, 24.0f, 25.0f, 3); } } diff --git a/src/main/java/blocks/BlockIgnititeOre.java b/src/main/java/blocks/BlockIgnititeOre.java index b57224e..91bb96a 100644 --- a/src/main/java/blocks/BlockIgnititeOre.java +++ b/src/main/java/blocks/BlockIgnititeOre.java @@ -6,7 +6,7 @@ import net.minecraft.block.material.Material; public class BlockIgnititeOre extends BasicBlockOre { public BlockIgnititeOre() { - super("ignitite_ore", Material.ROCK, 23.0f, 25.0f,3); + super("ignitite_ore", Material.ROCK, 23.0f, 25.0f, 3); } } diff --git a/src/main/java/blocks/BlockKarmesineOre.java b/src/main/java/blocks/BlockKarmesineOre.java index d8b7a59..536172b 100644 --- a/src/main/java/blocks/BlockKarmesineOre.java +++ b/src/main/java/blocks/BlockKarmesineOre.java @@ -6,6 +6,6 @@ import net.minecraft.block.material.Material; public class BlockKarmesineOre extends BasicBlockOre { public BlockKarmesineOre() { - super("karmesine_ore", Material.ROCK, 13.0f, 15.0f,1); + super("karmesine_ore", Material.ROCK, 13.0f, 15.0f, 1); } } diff --git a/src/main/java/blocks/BlockLigniteOre.java b/src/main/java/blocks/BlockLigniteOre.java index 3782c20..c3f4ff6 100644 --- a/src/main/java/blocks/BlockLigniteOre.java +++ b/src/main/java/blocks/BlockLigniteOre.java @@ -15,22 +15,21 @@ import java.util.Random; public class BlockLigniteOre extends BasicBlockOre { public BlockLigniteOre() { - super("lignite_ore", Material.ROCK, 4.0f, 5.0f,1); + super("lignite_ore", Material.ROCK, 4.0f, 5.0f, 1); } @Override public int getExpDrop(IBlockState state, IBlockAccess world, BlockPos pos, int fortune) { - Random rand = world instanceof World ? ((World) world).rand : new Random(); + Random rand = world instanceof World ? ((World) world).rand : new Random(); int r = RANDOM.nextInt(11); - if(r > 7) { + if (r > 7) { return MathHelper.getRandomIntegerInRange(rand, 0, 10) + fortune; - } - else return 0; + } else return 0; } @Override public int quantityDropped(IBlockState state, int fortune, Random random) { - return MathHelper.getRandomIntegerInRange(random, 1, 3 + fortune); + return MathHelper.getRandomIntegerInRange(random, 1, 3 + fortune); } @Override diff --git a/src/main/java/blocks/BlockMeteoriteOre.java b/src/main/java/blocks/BlockMeteoriteOre.java index b5fa01a..cab7308 100644 --- a/src/main/java/blocks/BlockMeteoriteOre.java +++ b/src/main/java/blocks/BlockMeteoriteOre.java @@ -6,6 +6,6 @@ import net.minecraft.block.material.Material; public class BlockMeteoriteOre extends BasicBlockOre { public BlockMeteoriteOre() { - super("meteorite_ore", Material.ROCK, 60.0f,500.0f,4); + super("meteorite_ore", Material.ROCK, 60.0f, 500.0f, 4); } } diff --git a/src/main/java/blocks/BlockMindoriteOre.java b/src/main/java/blocks/BlockMindoriteOre.java index 63c5f35..a7aa6df 100644 --- a/src/main/java/blocks/BlockMindoriteOre.java +++ b/src/main/java/blocks/BlockMindoriteOre.java @@ -6,6 +6,6 @@ import net.minecraft.block.material.Material; public class BlockMindoriteOre extends BasicBlockOre { public BlockMindoriteOre() { - super("mindorite_ore", Material.ROCK, 12.0f, 12.0f,2); + super("mindorite_ore", Material.ROCK, 12.0f, 12.0f, 2); } } diff --git a/src/main/java/blocks/BlockMythrilOre.java b/src/main/java/blocks/BlockMythrilOre.java index 6db186f..810d868 100644 --- a/src/main/java/blocks/BlockMythrilOre.java +++ b/src/main/java/blocks/BlockMythrilOre.java @@ -6,6 +6,6 @@ import net.minecraft.block.material.Material; public class BlockMythrilOre extends BasicBlockOre { public BlockMythrilOre() { - super("mythril_ore", Material.ROCK, 25.0f, 25.0f,4); + super("mythril_ore", Material.ROCK, 25.0f, 25.0f, 4); } } diff --git a/src/main/java/blocks/BlockPalladiumOre.java b/src/main/java/blocks/BlockPalladiumOre.java index 5dc2d94..73d4619 100644 --- a/src/main/java/blocks/BlockPalladiumOre.java +++ b/src/main/java/blocks/BlockPalladiumOre.java @@ -6,6 +6,6 @@ import net.minecraft.block.material.Material; public class BlockPalladiumOre extends BasicBlockOre { public BlockPalladiumOre() { - super("palladium_ore", Material.ROCK, 25.0f, 25.0f,3); + super("palladium_ore", Material.ROCK, 25.0f, 25.0f, 3); } } diff --git a/src/main/java/blocks/BlockRottenGround.java b/src/main/java/blocks/BlockRottenGround.java index 4b1a57a..d590204 100644 --- a/src/main/java/blocks/BlockRottenGround.java +++ b/src/main/java/blocks/BlockRottenGround.java @@ -7,7 +7,7 @@ import net.minecraft.block.material.Material; public class BlockRottenGround extends BasicBlockGround { public BlockRottenGround() { - super("rotten_ground", Material.GROUND, 2.0f, 2.0f,0); + super("rotten_ground", Material.GROUND, 2.0f, 2.0f, 0); this.setSoundType(SoundType.GROUND); } } diff --git a/src/main/java/blocks/BlockSlaggoldOre.java b/src/main/java/blocks/BlockSlaggoldOre.java index bcf7b17..559a135 100644 --- a/src/main/java/blocks/BlockSlaggoldOre.java +++ b/src/main/java/blocks/BlockSlaggoldOre.java @@ -6,6 +6,6 @@ import net.minecraft.block.material.Material; public class BlockSlaggoldOre extends BasicBlockOre { public BlockSlaggoldOre() { - super("slaggold_ore", Material.ROCK, 3.0f, 5.0f,1); + super("slaggold_ore", Material.ROCK, 3.0f, 5.0f, 1); } } diff --git a/src/main/java/blocks/BlockSlagironOre.java b/src/main/java/blocks/BlockSlagironOre.java index fcf60a8..f4bc78c 100644 --- a/src/main/java/blocks/BlockSlagironOre.java +++ b/src/main/java/blocks/BlockSlagironOre.java @@ -6,6 +6,6 @@ import net.minecraft.block.material.Material; public class BlockSlagironOre extends BasicBlockOre { public BlockSlagironOre() { - super("slagiron_ore", Material.ROCK, 3.0f, 5.0f,1); + super("slagiron_ore", Material.ROCK, 3.0f, 5.0f, 1); } } diff --git a/src/main/java/blocks/BlockTiberiumOre.java b/src/main/java/blocks/BlockTiberiumOre.java index c493742..076b519 100644 --- a/src/main/java/blocks/BlockTiberiumOre.java +++ b/src/main/java/blocks/BlockTiberiumOre.java @@ -6,6 +6,6 @@ import net.minecraft.block.material.Material; public class BlockTiberiumOre extends BasicBlockOreGlow { public BlockTiberiumOre() { - super("tiberium_ore", Material.ROCK, 30.0f, 30.0f, 3,0.66f); + super("tiberium_ore", Material.ROCK, 30.0f, 30.0f, 3, 0.66f); } } diff --git a/src/main/java/blocks/BlockVibraniumOre.java b/src/main/java/blocks/BlockVibraniumOre.java index c535480..5ac0307 100644 --- a/src/main/java/blocks/BlockVibraniumOre.java +++ b/src/main/java/blocks/BlockVibraniumOre.java @@ -6,6 +6,6 @@ import net.minecraft.block.material.Material; public class BlockVibraniumOre extends BasicBlockOre { public BlockVibraniumOre() { - super("vibranium_ore", Material.ROCK, 70.0f, 800.0f,4); + super("vibranium_ore", Material.ROCK, 70.0f, 800.0f, 4); } }
\ No newline at end of file diff --git a/src/main/java/blocks/BlockYrdeanOre.java b/src/main/java/blocks/BlockYrdeanOre.java index e403e4b..9435abf 100644 --- a/src/main/java/blocks/BlockYrdeanOre.java +++ b/src/main/java/blocks/BlockYrdeanOre.java @@ -6,6 +6,6 @@ import net.minecraft.block.material.Material; public class BlockYrdeanOre extends BasicBlockOre { public BlockYrdeanOre() { - super("yrdean_ore", Material.ROCK, 13.0f, 15.0f,3); + super("yrdean_ore", Material.ROCK, 13.0f, 15.0f, 3); } } diff --git a/src/main/java/blocks/category/BasicBlockGround.java b/src/main/java/blocks/category/BasicBlockGround.java index 516abbe..6326276 100644 --- a/src/main/java/blocks/category/BasicBlockGround.java +++ b/src/main/java/blocks/category/BasicBlockGround.java @@ -11,6 +11,6 @@ public class BasicBlockGround extends Block { setRegistryName(name); setHardness(hardness); setResistance(resistance); - setHarvestLevel("shovel",harvest); + setHarvestLevel("shovel", harvest); } } |
