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

Fixed and balanced hardness of blocks and put in harvest levels.

Browse Source
This commit is contained in:
Robert Sosnitzka
2016-05-02 17:24:08 +02:00
parent 3752640edd
commit e6ae3f74f6
26 changed files with 48 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/blocks/BlockAardiumOre.java
View File

@@ -6,6 +6,6 @@ import net.minecraft.block.material.Material;
public class BlockAardiumOre extends BasicBlockOre {
public BlockAardiumOre() {
super("aardium_ore", Material.ROCK, 3.0f, 5.0f);
super("aardium_ore", Material.ROCK, 53.0f, 53.0f, 3 );
}
}

2
src/main/java/blocks/BlockAdamantiteOre.java
View File

@@ -6,6 +6,6 @@ import net.minecraft.block.material.Material;
public class BlockAdamantiteOre extends BasicBlockOre {
public BlockAdamantiteOre() {
super("adamantite_ore", Material.ROCK, 3.0f, 5.0f);
super("adamantite_ore", Material.ROCK, 55.0f, 55.0f,4);
}
}

2
src/main/java/blocks/BlockArcaniteOre.java
View File

@@ -6,6 +6,6 @@ import net.minecraft.block.material.Material;
public class BlockArcaniteOre extends BasicBlockOre {
public BlockArcaniteOre() {
super("arcanite_ore", Material.ROCK, 3.0f, 5.0f);
super("arcanite_ore", Material.ROCK, 23.0f, 25.0f,2);
}
}

2
src/main/java/blocks/BlockAxiidianOre.java
View File

@@ -6,6 +6,6 @@ import net.minecraft.block.material.Material;
public class BlockAxiidianOre extends BasicBlockOre {
public BlockAxiidianOre() {
super("axiidian_ore", Material.ROCK, 3.0f, 5.0f);
super("axiidian_ore", Material.ROCK, 13.0f, 13.0f,3);
}
}

2
src/main/java/blocks/BlockBasalt.java
View File

@@ -6,6 +6,6 @@ import net.minecraft.block.material.Material;
public class BlockBasalt extends BasicBlockOre {
public BlockBasalt() {
super("basalt", Material.ROCK, 12.0f, 2.0f);
super("basalt", Material.ROCK, 35.0f, 35.0f,3);
}
}

2
src/main/java/blocks/BlockBismuthOre.java
View File

@@ -6,6 +6,6 @@ import net.minecraft.block.material.Material;
public class BlockBismuthOre extends BasicBlockOre {
public BlockBismuthOre() {
super("bismuth_ore", Material.ROCK, 3.0f, 5.0f);
super("bismuth_ore", Material.ROCK, 8.0f, 8.0f,1);
}
}

2
src/main/java/blocks/BlockEterniteOre.java
View File

@@ -6,6 +6,6 @@ import net.minecraft.block.material.Material;
public class BlockEterniteOre extends BasicBlockOre {
public BlockEterniteOre() {
super("eternite_ore", Material.ROCK, 3.0f, 5.0f);
super("eternite_ore", Material.ROCK, 24.0f, 25.0f,3);
}
}

2
src/main/java/blocks/BlockIgnititeOre.java
View File

@@ -6,6 +6,6 @@ import net.minecraft.block.material.Material;
public class BlockIgnititeOre extends BasicBlockOre {
public BlockIgnititeOre() {
super("ignitite_ore", Material.ROCK, 3.0f, 5.0f);
super("ignitite_ore", Material.ROCK, 23.0f, 25.0f,3);
}
}

2
src/main/java/blocks/BlockKarmesineOre.java
View File

@@ -6,6 +6,6 @@ import net.minecraft.block.material.Material;
public class BlockKarmesineOre extends BasicBlockOre {
public BlockKarmesineOre() {
super("karmesine_ore", Material.ROCK, 3.0f, 5.0f);
super("karmesine_ore", Material.ROCK, 13.0f, 15.0f,1);
}
}

2
src/main/java/blocks/BlockLigniteOre.java
View File

@@ -6,6 +6,6 @@ import net.minecraft.block.material.Material;
public class BlockLigniteOre extends BasicBlockOre {
public BlockLigniteOre() {
super("lignite_ore", Material.ROCK, 3.0f, 5.0f);
super("lignite_ore", Material.ROCK, 4.0f, 5.0f,1);
}
}

2
src/main/java/blocks/BlockMeteoriteOre.java
View File

@@ -6,6 +6,6 @@ import net.minecraft.block.material.Material;
public class BlockMeteoriteOre extends BasicBlockOre {
public BlockMeteoriteOre() {
super("meteorite_ore", Material.ROCK, 3.0f, 5.0f);
super("meteorite_ore", Material.ROCK, 43.0f,45.0f,4);
}
}

2
src/main/java/blocks/BlockMindoriteOre.java
View File

@@ -6,6 +6,6 @@ import net.minecraft.block.material.Material;
public class BlockMindoriteOre extends BasicBlockOre {
public BlockMindoriteOre() {
super("mindorite_ore", Material.ROCK, 3.0f, 5.0f);
super("mindorite_ore", Material.ROCK, 12.0f, 12.0f,2);
}
}

2
src/main/java/blocks/BlockMythrilOre.java
View File

@@ -6,6 +6,6 @@ import net.minecraft.block.material.Material;
public class BlockMythrilOre extends BasicBlockOre {
public BlockMythrilOre() {
super("mythril_ore", Material.ROCK, 3.0f, 5.0f);
super("mythril_ore", Material.ROCK, 25.0f, 25.0f,4);
}
}

2
src/main/java/blocks/BlockPalladiumOre.java
View File

@@ -6,6 +6,6 @@ import net.minecraft.block.material.Material;
public class BlockPalladiumOre extends BasicBlockOre {
public BlockPalladiumOre() {
super("palladium_ore", Material.ROCK, 3.0f, 5.0f);
super("palladium_ore", Material.ROCK, 25.0f, 25.0f,3);
}
}

3
src/main/java/blocks/BlockPrometheumOre.java
View File

@@ -1,12 +1,11 @@
package blocks;
import blocks.category.BasicBlockOre;
import blocks.category.BasicBlockOreGlow;
import net.minecraft.block.material.Material;
public class BlockPrometheumOre extends BasicBlockOreGlow {
public BlockPrometheumOre() {
super("prometheum_ore", Material.ROCK, 3.0f, 5.0f, 0.25f);
super("prometheum_ore", Material.ROCK, 35.0f, 35.0f, 4, 0.25f);
}
}

6
src/main/java/blocks/BlockRottenGround.java
View File

@@ -1,11 +1,11 @@
package blocks;
import blocks.category.BasicBlockOre;
import blocks.category.BasicBlockGround;
import net.minecraft.block.material.Material;
public class BlockRottenGround extends BasicBlockOre {
public class BlockRottenGround extends BasicBlockGround {
public BlockRottenGround() {
super("rotten_ground", Material.GROUND, 1.0f, 1.0f);
super("rotten_ground", Material.GROUND, 2.0f, 2.0f,0);
}
}

2
src/main/java/blocks/BlockSlaggoldOre.java
View File

@@ -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);
super("slaggold_ore", Material.ROCK, 3.0f, 5.0f,1);
}
}

2
src/main/java/blocks/BlockSlagironOre.java
View File

@@ -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);
super("slagiron_ore", Material.ROCK, 3.0f, 5.0f,1);
}
}

2
src/main/java/blocks/BlockTiberiumOre.java
View File

@@ -6,6 +6,6 @@ import net.minecraft.block.material.Material;
public class BlockTiberiumOre extends BasicBlockOreGlow {
public BlockTiberiumOre() {
super("tiberium_ore", Material.ROCK, 3.0f, 5.0f, 0.66f);
super("tiberium_ore", Material.ROCK, 30.0f, 30.0f, 3,0.66f);
}
}

2
src/main/java/blocks/BlockVibraniumre.java
View File

@@ -6,6 +6,6 @@ import net.minecraft.block.material.Material;
public class BlockVibraniumre extends BasicBlockOre {
public BlockVibraniumre() {
super("vibranium_ore", Material.ROCK, 3.0f, 5.0f);
super("vibranium_ore", Material.ROCK, 43.0f, 45.0f,4);
}
}

2
src/main/java/blocks/BlockYrdeanOre.java
View File

@@ -6,6 +6,6 @@ import net.minecraft.block.material.Material;
public class BlockYrdeanOre extends BasicBlockOre {
public BlockYrdeanOre() {
super("yrdean_ore", Material.ROCK, 3.0f, 5.0f);
super("yrdean_ore", Material.ROCK, 13.0f, 15.0f,3);
}
}

16
src/main/java/blocks/category/BasicBlockGround.java Normal file
View File

@@ -0,0 +1,16 @@
package blocks.category;
import net.minecraft.block.Block;
import net.minecraft.block.material.Material;
public class BasicBlockGround extends Block {
public BasicBlockGround(String name, Material material, float hardness, float resistance, int harvest) {
super(material);
setUnlocalizedName(name);
setRegistryName(name);
setHardness(hardness);
setResistance(resistance);
setHarvestLevel("shovel",harvest);
}
}

3
src/main/java/blocks/category/BasicBlockOre.java
View File

@@ -5,11 +5,12 @@ import net.minecraft.block.material.Material;
public class BasicBlockOre extends Block {
public BasicBlockOre(String name, Material material, float hardness, float resistance) {
public BasicBlockOre(String name, Material material, float hardness, float resistance, int harvest) {
super(material);
setUnlocalizedName(name);
setRegistryName(name);
setHardness(hardness);
setResistance(resistance);
setHarvestLevel("pickaxe",harvest);
}
}

3
src/main/java/blocks/category/BasicBlockOreGlow.java
View File

@@ -5,12 +5,13 @@ import net.minecraft.block.material.Material;
public class BasicBlockOreGlow extends Block {
public BasicBlockOreGlow(String name, Material material, float hardness, float resistance, float glow) {
public BasicBlockOreGlow(String name, Material material, float hardness, float resistance, int harvest, float glow) {
super(material);
setUnlocalizedName(name);
setRegistryName(name);
setHardness(hardness);
setResistance(resistance);
setHarvestLevel("pickaxe", harvest);
setLightLevel(glow);
}
}

3
src/main/java/main/util/StateMatcher.java
View File

@@ -64,7 +64,8 @@ public class StateMatcher implements Predicate<IBlockState> {
IBlockState bState = world.getBlockState(blockPos);
if (bState.getBlock() == this.state.getBlock() && bState.getValue(property) == value) {
System.out.println(String.format("Found block with desired state! (%s), try #%s, y=%s", blockPos, i, Y));
// Check if a replacable block is near origin block - show pos in console
// System.out.println(String.format("Found block with desired state! (%s), Block: %s, try #%s, y=%s", i, Y));
return true;
}
}

6
src/main/java/main/world/ZWorldGen.java
View File

@@ -34,9 +34,9 @@ public class ZWorldGen implements IWorldGenerator {
Generator.generateOre(ZCompression.bismuthOre.getDefaultState(), random, x, z, world, 30, 32, 64, 2, 4);
Generator.generateOre(ZCompression.mythrilOre.getDefaultState(), random, x, z, world, 18, 16, 32, 2, 4);
Generator.generateOre(ZCompression.meteoriteOre.getDefaultState(), random, x, z, world, 25, 0, 32, 3, 6);
Generator.generateOre(ZCompression.mindoriteOre.getDefaultState(), Blocks.STONE.getDefaultState(), BlockStone.VARIANT, BlockStone.EnumType.DIORITE, random, x, z, world, 150, 16, 96, 2, 4);
Generator.generateOre(ZCompression.arcaniteOre.getDefaultState(), Blocks.STONE.getDefaultState(), BlockStone.VARIANT, BlockStone.EnumType.GRANITE, random, x, z, world, 150, 16, 96, 2, 4);
Generator.generateOre(ZCompression.eterniteOre.getDefaultState(), Blocks.STONE.getDefaultState(), BlockStone.VARIANT, BlockStone.EnumType.ANDESITE, random, x, z, world, 150, 16, 96, 2, 4);
Generator.generateOre(ZCompression.mindoriteOre.getDefaultState(), Blocks.STONE.getDefaultState(), BlockStone.VARIANT, BlockStone.EnumType.DIORITE, random, x, z, world, 200, 16, 96, 2, 4);
Generator.generateOre(ZCompression.arcaniteOre.getDefaultState(), Blocks.STONE.getDefaultState(), BlockStone.VARIANT, BlockStone.EnumType.GRANITE, random, x, z, world, 200, 16, 96, 2, 4);
Generator.generateOre(ZCompression.eterniteOre.getDefaultState(), Blocks.STONE.getDefaultState(), BlockStone.VARIANT, BlockStone.EnumType.ANDESITE, random, x, z, world, 200, 16, 96, 2, 4);
}
private void end(Random random, int x, int z, World world) {