summaryrefslogtreecommitdiff
path: root/src/main/java/blocks
diff options
context:
space:
mode:
Diffstat (limited to 'src/main/java/blocks')
-rw-r--r--src/main/java/blocks/BlockAardiumOre.java12
-rw-r--r--src/main/java/blocks/BlockAdamantiteOre.java11
-rw-r--r--src/main/java/blocks/BlockArcaniteOre.java11
-rw-r--r--src/main/java/blocks/BlockAxiidianOre.java11
-rw-r--r--src/main/java/blocks/BlockBasalt.java11
-rw-r--r--src/main/java/blocks/BlockBismuthOre.java11
-rw-r--r--src/main/java/blocks/BlockEterniteOre.java11
-rw-r--r--src/main/java/blocks/BlockIgnititeOre.java12
-rw-r--r--src/main/java/blocks/BlockKarmesineOre.java11
-rw-r--r--src/main/java/blocks/BlockMeteoriteOre.java11
-rw-r--r--src/main/java/blocks/BlockMindoriteOre.java11
-rw-r--r--src/main/java/blocks/BlockMythrilOre.java11
-rw-r--r--src/main/java/blocks/BlockPalladiumOre.java11
-rw-r--r--src/main/java/blocks/BlockPrometheumOre.java11
-rw-r--r--src/main/java/blocks/BlockRottenGround.java13
-rw-r--r--src/main/java/blocks/BlockSlaggoldOre.java11
-rw-r--r--src/main/java/blocks/BlockSlagironOre.java11
-rw-r--r--src/main/java/blocks/BlockTiberiumOre.java4
-rw-r--r--src/main/java/blocks/BlockVibraniumOre.java11
-rw-r--r--src/main/java/blocks/BlockYrdeanOre.java11
-rw-r--r--src/main/java/blocks/category/BasicBlockGround.java2
21 files changed, 4 insertions, 215 deletions
diff --git a/src/main/java/blocks/BlockAardiumOre.java b/src/main/java/blocks/BlockAardiumOre.java
deleted file mode 100644
index 85a0bf6..0000000
--- a/src/main/java/blocks/BlockAardiumOre.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package blocks;
-
-import blocks.category.BasicBlockOre;
-import net.minecraft.block.material.Material;
-
-public class BlockAardiumOre extends BasicBlockOre {
-
- public BlockAardiumOre() {
- 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
deleted file mode 100644
index 730dd73..0000000
--- a/src/main/java/blocks/BlockAdamantiteOre.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package blocks;
-
-import blocks.category.BasicBlockOre;
-import net.minecraft.block.material.Material;
-
-public class BlockAdamantiteOre extends BasicBlockOre {
-
- public BlockAdamantiteOre() {
- 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
deleted file mode 100644
index e073886..0000000
--- a/src/main/java/blocks/BlockArcaniteOre.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package blocks;
-
-import blocks.category.BasicBlockOre;
-import net.minecraft.block.material.Material;
-
-public class BlockArcaniteOre extends BasicBlockOre {
-
- public BlockArcaniteOre() {
- 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
deleted file mode 100644
index d7ef4d8..0000000
--- a/src/main/java/blocks/BlockAxiidianOre.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package blocks;
-
-import blocks.category.BasicBlockOre;
-import net.minecraft.block.material.Material;
-
-public class BlockAxiidianOre extends BasicBlockOre {
-
- public BlockAxiidianOre() {
- 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
deleted file mode 100644
index 1c22f22..0000000
--- a/src/main/java/blocks/BlockBasalt.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package blocks;
-
-import blocks.category.BasicBlockOre;
-import net.minecraft.block.material.Material;
-
-public class BlockBasalt extends BasicBlockOre {
-
- public BlockBasalt() {
- 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
deleted file mode 100644
index 8cdeb2e..0000000
--- a/src/main/java/blocks/BlockBismuthOre.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package blocks;
-
-import blocks.category.BasicBlockOre;
-import net.minecraft.block.material.Material;
-
-public class BlockBismuthOre extends BasicBlockOre {
-
- public BlockBismuthOre() {
- 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
deleted file mode 100644
index 3c75a50..0000000
--- a/src/main/java/blocks/BlockEterniteOre.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package blocks;
-
-import blocks.category.BasicBlockOre;
-import net.minecraft.block.material.Material;
-
-public class BlockEterniteOre extends BasicBlockOre {
-
- public BlockEterniteOre() {
- 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
deleted file mode 100644
index 91bb96a..0000000
--- a/src/main/java/blocks/BlockIgnititeOre.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package blocks;
-
-import blocks.category.BasicBlockOre;
-import net.minecraft.block.material.Material;
-
-public class BlockIgnititeOre extends BasicBlockOre {
-
- public BlockIgnititeOre() {
- 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
deleted file mode 100644
index 536172b..0000000
--- a/src/main/java/blocks/BlockKarmesineOre.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package blocks;
-
-import blocks.category.BasicBlockOre;
-import net.minecraft.block.material.Material;
-
-public class BlockKarmesineOre extends BasicBlockOre {
-
- public BlockKarmesineOre() {
- super("karmesine_ore", Material.ROCK, 13.0f, 15.0f, 1);
- }
-}
diff --git a/src/main/java/blocks/BlockMeteoriteOre.java b/src/main/java/blocks/BlockMeteoriteOre.java
deleted file mode 100644
index cab7308..0000000
--- a/src/main/java/blocks/BlockMeteoriteOre.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package blocks;
-
-import blocks.category.BasicBlockOre;
-import net.minecraft.block.material.Material;
-
-public class BlockMeteoriteOre extends BasicBlockOre {
-
- public BlockMeteoriteOre() {
- 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
deleted file mode 100644
index a7aa6df..0000000
--- a/src/main/java/blocks/BlockMindoriteOre.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package blocks;
-
-import blocks.category.BasicBlockOre;
-import net.minecraft.block.material.Material;
-
-public class BlockMindoriteOre extends BasicBlockOre {
-
- public BlockMindoriteOre() {
- 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
deleted file mode 100644
index 810d868..0000000
--- a/src/main/java/blocks/BlockMythrilOre.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package blocks;
-
-import blocks.category.BasicBlockOre;
-import net.minecraft.block.material.Material;
-
-public class BlockMythrilOre extends BasicBlockOre {
-
- public BlockMythrilOre() {
- 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
deleted file mode 100644
index 73d4619..0000000
--- a/src/main/java/blocks/BlockPalladiumOre.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package blocks;
-
-import blocks.category.BasicBlockOre;
-import net.minecraft.block.material.Material;
-
-public class BlockPalladiumOre extends BasicBlockOre {
-
- public BlockPalladiumOre() {
- super("palladium_ore", Material.ROCK, 25.0f, 25.0f, 3);
- }
-}
diff --git a/src/main/java/blocks/BlockPrometheumOre.java b/src/main/java/blocks/BlockPrometheumOre.java
deleted file mode 100644
index b767eb8..0000000
--- a/src/main/java/blocks/BlockPrometheumOre.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package blocks;
-
-import blocks.category.BasicBlockOreGlow;
-import net.minecraft.block.material.Material;
-
-public class BlockPrometheumOre extends BasicBlockOreGlow {
-
- public BlockPrometheumOre() {
- super("prometheum_ore", Material.ROCK, 35.0f, 35.0f, 4, 0.25f);
- }
-}
diff --git a/src/main/java/blocks/BlockRottenGround.java b/src/main/java/blocks/BlockRottenGround.java
deleted file mode 100644
index d590204..0000000
--- a/src/main/java/blocks/BlockRottenGround.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package blocks;
-
-import blocks.category.BasicBlockGround;
-import net.minecraft.block.SoundType;
-import net.minecraft.block.material.Material;
-
-public class BlockRottenGround extends BasicBlockGround {
-
- public BlockRottenGround() {
- 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
deleted file mode 100644
index 559a135..0000000
--- a/src/main/java/blocks/BlockSlaggoldOre.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package blocks;
-
-import blocks.category.BasicBlockOre;
-import net.minecraft.block.material.Material;
-
-public class BlockSlaggoldOre extends BasicBlockOre {
-
- public BlockSlaggoldOre() {
- 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
deleted file mode 100644
index f4bc78c..0000000
--- a/src/main/java/blocks/BlockSlagironOre.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package blocks;
-
-import blocks.category.BasicBlockOre;
-import net.minecraft.block.material.Material;
-
-public class BlockSlagironOre extends BasicBlockOre {
-
- public BlockSlagironOre() {
- 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 811b920..40a4ec0 100644
--- a/src/main/java/blocks/BlockTiberiumOre.java
+++ b/src/main/java/blocks/BlockTiberiumOre.java
@@ -15,7 +15,7 @@ import java.util.Random;
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.8f);
}
@Override
@@ -34,6 +34,6 @@ public class BlockTiberiumOre extends BasicBlockOreGlow {
@Override
public Item getItemDropped(IBlockState state, Random rand, int fortune) {
- return ZCompression;
+ return ZCompression.tiberiumShardInstable;
}
}
diff --git a/src/main/java/blocks/BlockVibraniumOre.java b/src/main/java/blocks/BlockVibraniumOre.java
deleted file mode 100644
index 5ac0307..0000000
--- a/src/main/java/blocks/BlockVibraniumOre.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package blocks;
-
-import blocks.category.BasicBlockOre;
-import net.minecraft.block.material.Material;
-
-public class BlockVibraniumOre extends BasicBlockOre {
-
- public BlockVibraniumOre() {
- 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
deleted file mode 100644
index 9435abf..0000000
--- a/src/main/java/blocks/BlockYrdeanOre.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package blocks;
-
-import blocks.category.BasicBlockOre;
-import net.minecraft.block.material.Material;
-
-public class BlockYrdeanOre extends BasicBlockOre {
-
- public BlockYrdeanOre() {
- 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 6326276..5ce7fcc 100644
--- a/src/main/java/blocks/category/BasicBlockGround.java
+++ b/src/main/java/blocks/category/BasicBlockGround.java
@@ -1,6 +1,7 @@
package blocks.category;
import net.minecraft.block.Block;
+import net.minecraft.block.SoundType;
import net.minecraft.block.material.Material;
public class BasicBlockGround extends Block {
@@ -12,5 +13,6 @@ public class BasicBlockGround extends Block {
setHardness(hardness);
setResistance(resistance);
setHarvestLevel("shovel", harvest);
+ setSoundType(SoundType.GROUND);
}
}