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

Added several blocks, basicBlockOre renamed to basicBlock

Browse Source
This commit is contained in:
Robert Sosnitzka
2016-05-13 19:47:39 +02:00
parent 19686e6fd3
commit c8281cbdd1
6 changed files with 111 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

76
src/main/java/com/sosnitzka/ztic_addon/Blocks.java
View File

@@ -1,10 +1,10 @@
package com.sosnitzka.ztic_addon;
import com.google.common.base.Joiner;
import com.sosnitzka.ztic_addon.blocks.BlockLigniteOre;
import com.sosnitzka.ztic_addon.blocks.BlockTiberiumOre;
import com.sosnitzka.ztic_addon.blocks.BlockLignite;
import com.sosnitzka.ztic_addon.blocks.BlockTiberium;
import com.sosnitzka.ztic_addon.generic.BasicBlockGround;
import com.sosnitzka.ztic_addon.generic.BasicBlockOre;
import com.sosnitzka.ztic_addon.generic.BasicBlock;
import com.sosnitzka.ztic_addon.util.Utils;
import net.minecraft.block.Block;
import net.minecraft.block.material.Material;
@@ -14,29 +14,49 @@ import org.apache.commons.lang3.StringUtils;
import java.lang.reflect.Field;
import java.util.Arrays;
public class Blocks {
public static Block basalt = new BasicBlockOre("basalt", Material.ROCK, 45.0f, 35.0f, 3);
public static Block rottenGround = new BasicBlockGround("rotten_ground", Material.GROUND, 2.0f, 2.0f, 0);
public static Block ligniteOre = new BlockLigniteOre();
import static com.sosnitzka.ztic_addon.util.Utils.PREFIX_BLOCK;
import static com.sosnitzka.ztic_addon.util.Utils.PREFIX_ORE;
public static Block aardiumOre = new BasicBlockOre("aardium_ore", Material.ROCK, 55.0f, 400.0f, 3);
public static Block adamantiteOre = new BasicBlockOre("adamantite_ore", Material.ROCK, 80.0f, 1000.0f, 4);
public static Block arcaniteOre = new BasicBlockOre("arcanite_ore", Material.ROCK, 23.0f, 25.0f, 2);
public static Block axiidianOre = new BasicBlockOre("axiidian_ore", Material.ROCK, 13.0f, 13.0f, 3);
public static Block bismuthOre = new BasicBlockOre("bismuth_ore", Material.ROCK, 8.0f, 8.0f, 1);
public static Block eterniteOre = new BasicBlockOre("eternite_ore", Material.ROCK, 24.0f, 25.0f, 3);
public static Block ignititeOre = new BasicBlockOre("ignitite_ore", Material.ROCK, 23.0f, 25.0f, 3);
public static Block karmesineOre = new BasicBlockOre("karmesine_ore", Material.ROCK, 13.0f, 15.0f, 1);
public static Block meteoriteOre = new BasicBlockOre("meteorite_ore", Material.ROCK, 60.0f, 500.0f, 4);
public static Block mindoriteOre = new BasicBlockOre("mindorite_ore", Material.ROCK, 12.0f, 12.0f, 2);
public static Block mythrilOre = new BasicBlockOre("mythril_ore", Material.ROCK, 25.0f, 25.0f, 4);
public static Block palladiumOre = new BasicBlockOre("palladium_ore", Material.ROCK, 25.0f, 25.0f, 3);
public static Block prometheumOre = new BasicBlockOre("prometheum_ore", Material.ROCK, 35.0f, 35.0f, 4, 0.25f);
public static Block slagironOre = new BasicBlockOre("slagiron_ore", Material.ROCK, 3.0f, 5.0f, 1);
public static Block slaggoldOre = new BasicBlockOre("slaggold_ore", Material.ROCK, 3.0f, 5.0f, 1);
public static Block tiberiumOre = new BlockTiberiumOre();
public static Block vibraniumOre = new BasicBlockOre("vibranium_ore", Material.ROCK, 70.0f, 800.0f, 4);
public static Block yrdeanOre = new BasicBlockOre("yrdean_ore", Material.ROCK, 13.0f, 15.0f, 3);
public class Blocks {
public static Block basalt = new BasicBlock("basalt", Material.ROCK, 45.0f, 35.0f, 3);
public static Block rottenGround = new BasicBlockGround("rotten_ground", Material.GROUND, 2.0f, 2.0f, 0);
public static Block ligniteOre = new BlockLignite();
public static Block aardiumOre = new BasicBlock("aardium_ore", Material.ROCK, 55.0f, 400.0f, 3, PREFIX_ORE);
public static Block adamantiteOre = new BasicBlock("adamantite_ore", Material.ROCK, 80.0f, 1000.0f, 4, PREFIX_ORE);
public static Block arcaniteOre = new BasicBlock("arcanite_ore", Material.ROCK, 23.0f, 25.0f, 2, PREFIX_ORE);
public static Block axiidianOre = new BasicBlock("axiidian_ore", Material.ROCK, 13.0f, 13.0f, 3, PREFIX_ORE);
public static Block bismuthOre = new BasicBlock("bismuth_ore", Material.ROCK, 8.0f, 8.0f, 1, PREFIX_ORE);
public static Block eterniteOre = new BasicBlock("eternite_ore", Material.ROCK, 24.0f, 25.0f, 3, PREFIX_ORE);
public static Block ignititeOre = new BasicBlock("ignitite_ore", Material.ROCK, 23.0f, 25.0f, 3, PREFIX_ORE);
public static Block karmesineOre = new BasicBlock("karmesine_ore", Material.ROCK, 13.0f, 15.0f, 1, PREFIX_ORE);
public static Block meteoriteOre = new BasicBlock("meteorite_ore", Material.ROCK, 60.0f, 500.0f, 4, PREFIX_ORE);
public static Block mindoriteOre = new BasicBlock("mindorite_ore", Material.ROCK, 12.0f, 12.0f, 2, PREFIX_ORE);
public static Block mythrilOre = new BasicBlock("mythril_ore", Material.ROCK, 25.0f, 25.0f, 4, PREFIX_ORE);
public static Block palladiumOre = new BasicBlock("palladium_ore", Material.ROCK, 25.0f, 25.0f, 3, PREFIX_ORE);
public static Block prometheumOre = new BasicBlock("prometheum_ore", Material.ROCK, 35.0f, 35.0f, 4, 0.25f, PREFIX_ORE);
public static Block slagironOre = new BasicBlock("slagiron_ore", Material.ROCK, 3.0f, 5.0f, 1);
public static Block slaggoldOre = new BasicBlock("slaggold_ore", Material.ROCK, 3.0f, 5.0f, 1);
public static Block tiberiumOre = new BlockTiberium();
public static Block vibraniumOre = new BasicBlock("vibranium_ore", Material.ROCK, 70.0f, 800.0f, 4, PREFIX_ORE);
public static Block yrdeanOre = new BasicBlock("yrdean_ore", Material.ROCK, 13.0f, 15.0f, 3, PREFIX_ORE);
public static Block aardiumBlock = new BasicBlock("aardium_block", Material.ROCK, 55.0f, 400.0f, 3, PREFIX_BLOCK);
public static Block adamantiteBlock = new BasicBlock("adamantite_block", Material.ROCK, 80.0f, 1000.0f, 4, PREFIX_BLOCK);
public static Block arcaniteBlock = new BasicBlock("arcanite_block", Material.ROCK, 23.0f, 25.0f, 2, PREFIX_BLOCK);
public static Block axiidianBlock = new BasicBlock("axiidian_block", Material.ROCK, 13.0f, 13.0f, 3, PREFIX_BLOCK);
public static Block bismuthBlock = new BasicBlock("bismuth_block", Material.ROCK, 8.0f, 8.0f, 1, PREFIX_BLOCK);
public static Block eterniteBlock = new BasicBlock("eternite_block", Material.ROCK, 24.0f, 25.0f, 3, PREFIX_BLOCK);
public static Block ignititeBlock = new BasicBlock("ignitite_block", Material.ROCK, 23.0f, 25.0f, 3, PREFIX_BLOCK);
public static Block karmesineBlock = new BasicBlock("karmesine_block", Material.ROCK, 13.0f, 15.0f, 1, PREFIX_BLOCK);
public static Block meteoriteBlock = new BasicBlock("meteorite_block", Material.ROCK, 60.0f, 500.0f, 4, PREFIX_BLOCK);
public static Block mindoriteBlock = new BasicBlock("mindorite_block", Material.ROCK, 12.0f, 12.0f, 2, PREFIX_BLOCK);
public static Block mythrilBlock = new BasicBlock("mythril_block", Material.ROCK, 25.0f, 25.0f, 4, PREFIX_BLOCK);
public static Block palladiumBlock = new BasicBlock("palladium_block", Material.ROCK, 25.0f, 25.0f, 3, PREFIX_BLOCK);
public static Block prometheumBlock = new BasicBlock("prometheum_block", Material.ROCK, 35.0f, 35.0f, 4, 0.25f, PREFIX_BLOCK);
public static Block tiberiumBlock = new BasicBlock("tiberium_block", Material.ROCK, 30.0f, 30.0f, 3, 1f, PREFIX_BLOCK);
public static Block vibraniumBlock = new BasicBlock("vibranium_block", Material.ROCK, 70.0f, 800.0f, 4, PREFIX_BLOCK);
public static Block yrdeanBlock = new BasicBlock("yrdean_block", Material.ROCK, 13.0f, 15.0f, 3, PREFIX_BLOCK);
public static void register() {
@@ -48,7 +68,8 @@ public class Blocks {
Block block = (Block) field.get(targetType);
Utils.registerBlockWithItem(block);
if (block instanceof BasicBlockOre) {
if (block instanceof BasicBlock) {
if (((BasicBlock) block).isOreDict()) {
String oreDictName;
String[] nameParts = block.getUnlocalizedName().replace("tile.", "").split("_");
System.out.println();
@@ -59,9 +80,10 @@ public class Blocks {
oreDictName = nameParts[0];
}
OreDictionary.registerOre("ore" + StringUtils.capitalize(oreDictName), block);
OreDictionary.registerOre(((BasicBlock) block).getOreDictPrefix() + StringUtils.capitalize(oreDictName), block);
System.out.println(String.format("Registered OreDict: %s", "ore" + StringUtils.capitalize(oreDictName)));
}
}
} catch (IllegalAccessException e) {
e.printStackTrace();
}

2
src/main/java/com/sosnitzka/ztic_addon/Items.java
View File

@@ -61,7 +61,7 @@ public class Items {
public static Item tiberiumShardInstable = new BasicItem("tiberium_shard_instable");
public static Item tiberiumShardStable = new BasicItem("tiberium_shard_stable");
static void register() {
public static void register() {
Field[] declaredFields = Items.class.getDeclaredFields();
for (Field field : declaredFields) {
if (java.lang.reflect.Modifier.isStatic(field.getModifiers())) {

6
src/main/java/com/sosnitzka/ztic_addon/blocks/BlockLigniteOre.java → src/main/java/com/sosnitzka/ztic_addon/blocks/BlockLignite.java
View File

@@ -1,6 +1,6 @@
package com.sosnitzka.ztic_addon.blocks;
import com.sosnitzka.ztic_addon.generic.BasicBlockOre;
import com.sosnitzka.ztic_addon.generic.BasicBlock;
import net.minecraft.block.material.Material;
import net.minecraft.block.state.IBlockState;
import net.minecraft.item.Item;
@@ -13,9 +13,9 @@ import java.util.Random;
import static com.sosnitzka.ztic_addon.Items.lignite;
public class BlockLigniteOre extends BasicBlockOre {
public class BlockLignite extends BasicBlock {
public BlockLigniteOre() {
public BlockLignite() {
super("lignite_ore", Material.ROCK, 4.0f, 5.0f, 1);
}

10
src/main/java/com/sosnitzka/ztic_addon/blocks/BlockTiberiumOre.java → src/main/java/com/sosnitzka/ztic_addon/blocks/BlockTiberium.java
View File

@@ -1,7 +1,7 @@
package com.sosnitzka.ztic_addon.blocks;
import com.sosnitzka.ztic_addon.Items;
import com.sosnitzka.ztic_addon.generic.BasicBlockOre;
import com.sosnitzka.ztic_addon.generic.BasicBlock;
import net.minecraft.block.material.Material;
import net.minecraft.block.state.IBlockState;
import net.minecraft.item.Item;
@@ -12,10 +12,12 @@ import net.minecraft.world.World;
import java.util.Random;
public class BlockTiberiumOre extends BasicBlockOre {
import static com.sosnitzka.ztic_addon.util.Utils.PREFIX_ORE;
public BlockTiberiumOre() {
super("tiberium_ore", Material.ROCK, 30.0f, 30.0f, 3, 1.0F);
public class BlockTiberium extends BasicBlock {
public BlockTiberium() {
super("tiberium_ore", Material.ROCK, 30.0f, 30.0f, 3, 1.0F, PREFIX_ORE);
}
@Override

43
src/main/java/com/sosnitzka/ztic_addon/generic/BasicBlock.java Normal file
View File

@@ -0,0 +1,43 @@
package com.sosnitzka.ztic_addon.generic;
import net.minecraft.block.Block;
import net.minecraft.block.material.Material;
public class BasicBlock extends Block {
private String oreDictPrefix;
public BasicBlock(String name, Material material, float hardness, float resistance, int harvest, float lightLevel, String oreDictPrefix) {
super(material);
setUnlocalizedName(name);
setRegistryName(name);
setHardness(hardness);
setResistance(resistance);
setHarvestLevel("pickaxe", harvest);
setLightLevel(lightLevel);
this.oreDictPrefix = oreDictPrefix;
}
public BasicBlock(String name, Material material, float hardness, float resistance, int harvest) {
this(name, material, hardness, resistance, harvest, 0.0F, null);
}
public BasicBlock(String name, Material material, float hardness, float resistance, int harvest, float lightLevel) {
this(name, material, hardness, resistance, harvest, lightLevel, null);
}
public BasicBlock(String name, Material material, float hardness, float resistance, int harvest, String oreDictPrefix) {
this(name, material, hardness, resistance, harvest, 0.0F, oreDictPrefix);
}
public boolean isOreDict() {
return this.oreDictPrefix != null;
}
public String getOreDictPrefix() {
return this.oreDictPrefix;
}
}

23
src/main/java/com/sosnitzka/ztic_addon/generic/BasicBlockOre.java
View File

@@ -1,23 +0,0 @@
package com.sosnitzka.ztic_addon.generic;
import net.minecraft.block.Block;
import net.minecraft.block.material.Material;
public class BasicBlockOre extends Block {
public BasicBlockOre(String name, Material material, float hardness, float resistance, int harvest, float lightLevel) {
super(material);
setUnlocalizedName(name);
setRegistryName(name);
setHardness(hardness);
setResistance(resistance);
setHarvestLevel("pickaxe", harvest);
setLightLevel(lightLevel);
}
public BasicBlockOre(String name, Material material, float hardness, float resistance, int harvest) {
this(name, material, hardness, resistance, harvest, 0.0F);
}
}