Again some stuff... still learning git ;)

This commit is contained in:
Robert Sosnitzka
2016-05-02 11:13:34 +02:00
parent 2533654bb9
commit 72b27f87c7
50 changed files with 280 additions and 35 deletions

View File

@@ -0,0 +1,11 @@
package blocks;
import blocks.category.BasicBlockOre;
import net.minecraft.block.material.Material;
public class BlockAardiumOre extends BasicBlockOre {
public BlockAardiumOre() {
super("aardium_ore", Material.ROCK, 3.0f, 5.0f);
}
}

View File

@@ -1,8 +1,9 @@
package blocks;
import blocks.category.BasicBlockOre;
import net.minecraft.block.material.Material;
public class BlockAdamantiteOre extends BasicBlock {
public class BlockAdamantiteOre extends BasicBlockOre {
public BlockAdamantiteOre() {
super("adamantite_ore", Material.ROCK, 3.0f, 5.0f);

View File

@@ -1,8 +1,9 @@
package blocks;
import blocks.category.BasicBlockOre;
import net.minecraft.block.material.Material;
public class BlockArcaniteOre extends BasicBlock {
public class BlockArcaniteOre extends BasicBlockOre {
public BlockArcaniteOre() {
super("arcanite_ore", Material.ROCK, 3.0f, 5.0f);

View File

@@ -0,0 +1,11 @@
package blocks;
import blocks.category.BasicBlockOre;
import net.minecraft.block.material.Material;
public class BlockAxiidianOre extends BasicBlockOre {
public BlockAxiidianOre() {
super("axiidian_ore", Material.ROCK, 3.0f, 5.0f);
}
}

View File

@@ -1,8 +1,9 @@
package blocks;
import blocks.category.BasicBlockOre;
import net.minecraft.block.material.Material;
public class BlockBasalt extends BasicBlock {
public class BlockBasalt extends BasicBlockOre {
public BlockBasalt() {
super("basalt", Material.ROCK, 12.0f, 2.0f);

View File

@@ -1,8 +1,9 @@
package blocks;
import blocks.category.BasicBlockOre;
import net.minecraft.block.material.Material;
public class BlockBismuthOre extends BasicBlock {
public class BlockBismuthOre extends BasicBlockOre {
public BlockBismuthOre() {
super("bismuth_ore", Material.ROCK, 3.0f, 5.0f);

View File

@@ -1,8 +1,9 @@
package blocks;
import blocks.category.BasicBlockOre;
import net.minecraft.block.material.Material;
public class BlockEterniteOre extends BasicBlock {
public class BlockEterniteOre extends BasicBlockOre {
public BlockEterniteOre() {
super("eternite_ore", Material.ROCK, 3.0f, 5.0f);

View File

@@ -0,0 +1,11 @@
package blocks;
import blocks.category.BasicBlockOre;
import net.minecraft.block.material.Material;
public class BlockIgnititeOre extends BasicBlockOre {
public BlockIgnititeOre() {
super("ignitite_ore", Material.ROCK, 3.0f, 5.0f);
}
}

View File

@@ -1,8 +1,9 @@
package blocks;
import blocks.category.BasicBlockOre;
import net.minecraft.block.material.Material;
public class BlockKarmesineOre extends BasicBlock {
public class BlockKarmesineOre extends BasicBlockOre {
public BlockKarmesineOre() {
super("karmesine_ore", Material.ROCK, 3.0f, 5.0f);

View File

@@ -1,8 +1,9 @@
package blocks;
import blocks.category.BasicBlockOre;
import net.minecraft.block.material.Material;
public class BlockLigniteOre extends BasicBlock {
public class BlockLigniteOre extends BasicBlockOre {
public BlockLigniteOre() {
super("lignite_ore", Material.ROCK, 3.0f, 5.0f);

View File

@@ -1,8 +1,9 @@
package blocks;
import blocks.category.BasicBlockOre;
import net.minecraft.block.material.Material;
public class BlockMeteoriteOre extends BasicBlock {
public class BlockMeteoriteOre extends BasicBlockOre {
public BlockMeteoriteOre() {
super("meteorite_ore", Material.ROCK, 3.0f, 5.0f);

View File

@@ -1,8 +1,9 @@
package blocks;
import blocks.category.BasicBlockOre;
import net.minecraft.block.material.Material;
public class BlockMindoriteOre extends BasicBlock {
public class BlockMindoriteOre extends BasicBlockOre {
public BlockMindoriteOre() {
super("mindorite_ore", Material.ROCK, 3.0f, 5.0f);

View File

@@ -1,8 +1,9 @@
package blocks;
import blocks.category.BasicBlockOre;
import net.minecraft.block.material.Material;
public class BlockMythrilOre extends BasicBlock {
public class BlockMythrilOre extends BasicBlockOre {
public BlockMythrilOre() {
super("mythril_ore", Material.ROCK, 3.0f, 5.0f);

View File

@@ -1,8 +1,9 @@
package blocks;
import blocks.category.BasicBlockOre;
import net.minecraft.block.material.Material;
public class BlockPalladiumOre extends BasicBlock {
public class BlockPalladiumOre extends BasicBlockOre {
public BlockPalladiumOre() {
super("palladium_ore", Material.ROCK, 3.0f, 5.0f);

View File

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

View File

@@ -1,8 +1,9 @@
package blocks;
import blocks.category.BasicBlockOre;
import net.minecraft.block.material.Material;
public class BlockRottenGround extends BasicBlock {
public class BlockRottenGround extends BasicBlockOre {
public BlockRottenGround() {
super("rotten_ground", Material.GROUND, 1.0f, 1.0f);

View File

@@ -0,0 +1,11 @@
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);
}
}

View File

@@ -1,8 +1,9 @@
package blocks;
import blocks.category.BasicBlockOre;
import net.minecraft.block.material.Material;
public class BlockSlagironOre extends BasicBlock {
public class BlockSlagironOre extends BasicBlockOre {
public BlockSlagironOre() {
super("slagiron_ore", Material.ROCK, 3.0f, 5.0f);

View File

@@ -1,10 +1,11 @@
package blocks;
import blocks.category.BasicBlockOreGlow;
import net.minecraft.block.material.Material;
public class BlockTiberiumOre extends BasicBlock {
public class BlockTiberiumOre extends BasicBlockOreGlow {
public BlockTiberiumOre() {
super("tiberium_ore", Material.ROCK, 3.0f, 5.0f);
super("tiberium_ore", Material.ROCK, 3.0f, 5.0f, 0.66f);
}
}

View File

@@ -1,8 +1,9 @@
package blocks;
import blocks.category.BasicBlockOre;
import net.minecraft.block.material.Material;
public class BlockVibraniumre extends BasicBlock {
public class BlockVibraniumre extends BasicBlockOre {
public BlockVibraniumre() {
super("vibranium_ore", Material.ROCK, 3.0f, 5.0f);

View File

@@ -0,0 +1,11 @@
package blocks;
import blocks.category.BasicBlockOre;
import net.minecraft.block.material.Material;
public class BlockYrdeanOre extends BasicBlockOre {
public BlockYrdeanOre() {
super("yrdean_ore", Material.ROCK, 3.0f, 5.0f);
}
}

View File

@@ -1,11 +1,11 @@
package blocks;
package blocks.category;
import net.minecraft.block.Block;
import net.minecraft.block.material.Material;
public class BasicBlock extends Block {
public class BasicBlockOre extends Block {
public BasicBlock(String name, Material material, float hardness, float resistance) {
public BasicBlockOre(String name, Material material, float hardness, float resistance) {
super(material);
setUnlocalizedName(name);
setRegistryName(name);

View File

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

View File

@@ -1,11 +1,13 @@
package main;
import blocks.BasicBlock;
import blocks.BlockAardiumOre;
import blocks.BlockAdamantiteOre;
import blocks.BlockArcaniteOre;
import blocks.BlockAxiidianOre;
import blocks.BlockBasalt;
import blocks.BlockBismuthOre;
import blocks.BlockEterniteOre;
import blocks.BlockIgnititeOre;
import blocks.BlockKarmesineOre;
import blocks.BlockLigniteOre;
import blocks.BlockMeteoriteOre;
@@ -14,9 +16,13 @@ import blocks.BlockMythrilOre;
import blocks.BlockPalladiumOre;
import blocks.BlockPrometheumOre;
import blocks.BlockRottenGround;
import blocks.BlockSlaggoldOre;
import blocks.BlockSlagironOre;
import blocks.BlockTiberiumOre;
import blocks.BlockVibraniumre;
import blocks.BlockYrdeanOre;
import blocks.category.BasicBlockOre;
import blocks.category.BasicBlockOreGlow;
import items.ItemSlagiron;
import main.world.ZWorldGen;
import net.minecraft.item.ItemBlock;
@@ -43,11 +49,14 @@ public class ZCompression {
//Blocks, esp. for tconstruct
public static BlockAardiumOre aardiumOre = new BlockAardiumOre();
public static BlockAdamantiteOre adamantiteOre = new BlockAdamantiteOre();
public static BlockArcaniteOre arcaniteOre = new BlockArcaniteOre();
public static BlockAxiidianOre axiidianOre = new BlockAxiidianOre();
public static BlockBasalt basalt = new BlockBasalt();
public static BlockBismuthOre bismuthOre = new BlockBismuthOre();
public static BlockEterniteOre eterniteOre = new BlockEterniteOre();
public static BlockIgnititeOre ignititeOre = new BlockIgnititeOre();
public static BlockKarmesineOre karmesineOre = new BlockKarmesineOre();
public static BlockLigniteOre ligniteOre = new BlockLigniteOre();
public static BlockMeteoriteOre meteoriteOre = new BlockMeteoriteOre();
@@ -57,18 +66,23 @@ public class ZCompression {
public static BlockPrometheumOre prometheumOre = new BlockPrometheumOre();
public static BlockRottenGround rottenGround = new BlockRottenGround();
public static BlockSlagironOre slagironOre = new BlockSlagironOre();
public static BlockSlaggoldOre slaggoldOre = new BlockSlaggoldOre();
public static BlockTiberiumOre tiberiumOre = new BlockTiberiumOre();
public static BlockVibraniumre vibraniumOre = new BlockVibraniumre();
public static BlockYrdeanOre yrdeanOre = new BlockYrdeanOre();
@EventHandler
public void preInit(FMLPreInitializationEvent e) {
GameRegistry.register(slagiron);
registerBlock(aardiumOre);
registerBlock(adamantiteOre);
registerBlock(arcaniteOre);
registerBlock(axiidianOre);
registerBlock(basalt);
registerBlock(bismuthOre);
registerBlock(eterniteOre);
registerBlock(ignititeOre);
registerBlock(karmesineOre);
registerBlock(ligniteOre);
registerBlock(meteoriteOre);
@@ -78,8 +92,10 @@ public class ZCompression {
registerBlock(prometheumOre);
registerBlock(rottenGround);
registerBlock(slagironOre);
registerBlock(slaggoldOre);
registerBlock(tiberiumOre);
registerBlock(vibraniumOre);
registerBlock(yrdeanOre);
}
@@ -95,7 +111,12 @@ public class ZCompression {
}
private static void registerBlock(BasicBlock block) {
private static void registerBlock(BasicBlockOre block) {
GameRegistry.register(block);
GameRegistry.register(new ItemBlock(block).setRegistryName(block.getRegistryName()));
}
private static void registerBlock(BasicBlockOreGlow block) {
GameRegistry.register(block);
GameRegistry.register(new ItemBlock(block).setRegistryName(block.getRegistryName()));
}

View File

@@ -18,6 +18,10 @@ public class Generator {
public static void generateNetherOre(IBlockState state, Random random, int x, int z, World world, int chance, int minY, int maxY, int minSize, int maxSize) {
generateOre(state, Blocks.NETHERRACK.getDefaultState(), null, null, random, x, z, world, chance, minY, maxY, minSize, maxSize);
}
public static void generateEndOre(IBlockState state, Random random, int x, int z, World world, int chance, int minY, int maxY, int minSize, int maxSize) {
generateOre(state, Blocks.END_STONE.getDefaultState(), null, null, random, x, z, world, chance, minY, maxY, minSize, maxSize);
}
public static void generateOre(IBlockState state, IBlockState replace, Random random, int chunkX, int chunkZ, World world, int chance, int minY, int maxY, int minSize, int maxSize) {
generateOre(state, replace, null, null, random, chunkX, chunkZ, world, chance, minY, maxY, minSize, maxSize);

View File

@@ -14,27 +14,38 @@ import java.util.Random;
public class ZWorldGen implements IWorldGenerator {
private void nether(Random random, int x, int z, World world) {
Generator.generateNetherOre(ZCompression.adamantiteOre.getDefaultState(), random, x, z, world, 24, 1, 32, 2, 5);
Generator.generateNetherOre(ZCompression.adamantiteOre.getDefaultState(), random, x, z, world, 25, 1, 32, 2, 5);
Generator.generateNetherOre(ZCompression.tiberiumOre.getDefaultState(), random, x, z, world, 60, 1, 128, 2, 10);
Generator.generateNetherOre(ZCompression.palladiumOre.getDefaultState(), random, x, z, world, 15, 32, 64, 3, 6);
Generator.generateNetherOre(ZCompression.palladiumOre.getDefaultState(), random, x, z, world, 21, 32, 64, 3, 6);
Generator.generateOre(ZCompression.prometheumOre.getDefaultState(), random, x, z, world, 20, 48, 64, 2, 4);
}
private void world(Random random, int x, int z, World world) {
Generator.generateOre(ZCompression.slagironOre.getDefaultState(), random, x, z, world, 40, 8, 96, 5, 16);
Generator.generateOre(ZCompression.slaggoldOre.getDefaultState(), random, x, z, world, 20, 8, 48, 5, 9);
Generator.generateOre(ZCompression.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, 10);
Generator.generateOre(ZCompression.basalt.getDefaultState(), Blocks.LAVA.getDefaultState(), random, x, z, world, 20, 8, 24, 2, 5);
Generator.generateOre(Blocks.IRON_ORE.getDefaultState(), random, x, z, world, 40, 8, 96, 2, 14);
Generator.generateOre(ZCompression.basalt.getDefaultState(), Blocks.LAVA.getDefaultState(), random, x, z, world, 100, 8, 24, 2, 5);
Generator.generateOre(ZCompression.rottenGround.getDefaultState(), Blocks.DIRT.getDefaultState(), random, x, z, world, 25, 50, 70, 2, 15);
Generator.generateOre(ZCompression.vibraniumOre.getDefaultState(), random, x, z, world, 16, 48, 64, 2, 4);
Generator.generateOre(ZCompression.mythrilOre.getDefaultState(), random, x, z, world, 16, 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(), random, x, z, world, 2450, 32, 96, 3, 6);
Generator.generateOre(ZCompression.vibraniumOre.getDefaultState(), random, x, z, world, 16, 48, 64, 2, 4);
Generator.generateOre(ZCompression.bismuthOre.getDefaultState(), random, x, z, world, 30, 16, 48, 2, 5);
Generator.generateOre(ZCompression.bismuthOre.getDefaultState(), random, x, z, world, 30, 32, 64, 2, 4);
Generator.generateOre(ZCompression.mythrilOre.getDefaultState(), random, x, z, world, 16, 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, 500, 16, 96, 2, 4);
Generator.generateOre(ZCompression.arcaniteOre.getDefaultState(), Blocks.STONE.getDefaultState(), BlockStone.VARIANT, BlockStone.EnumType.GRANITE, random, x, z, world, 500, 16, 96, 2, 4);
Generator.generateOre(ZCompression.eterniteOre.getDefaultState(), Blocks.STONE.getDefaultState(), BlockStone.VARIANT, BlockStone.EnumType.ANDESITE, random, x, z, world, 500, 16, 96, 2, 4);
}
private void end(Random random, int x, int z, World world) {
Generator.generateEndOre(ZCompression.yrdeanOre.getDefaultState(), random, x, z, world, 19, 10, 35, 2, 5);
Generator.generateEndOre(ZCompression.ignititeOre.getDefaultState(), random, x, z, world, 19, 20, 45, 2, 5);
Generator.generateEndOre(ZCompression.axiidianOre.getDefaultState(), random, x, z, world, 19, 30, 55, 2, 5);
Generator.generateEndOre(ZCompression.aardiumOre.getDefaultState(), random, x, z, world, 19, 40, 65, 2, 5);
}

View File

@@ -14,11 +14,14 @@ public class ClientProxy extends ServerProxy {
registerItemModel(ZCompression.slagiron);
// Blocks
registerBlockModel(ZCompression.aardiumOre);
registerBlockModel(ZCompression.adamantiteOre);
registerBlockModel(ZCompression.arcaniteOre);
registerBlockModel(ZCompression.axiidianOre);
registerBlockModel(ZCompression.basalt);
registerBlockModel(ZCompression.bismuthOre);
registerBlockModel(ZCompression.eterniteOre);
registerBlockModel(ZCompression.ignititeOre);
registerBlockModel(ZCompression.karmesineOre);
registerBlockModel(ZCompression.ligniteOre);
registerBlockModel(ZCompression.meteoriteOre);
@@ -28,8 +31,12 @@ public class ClientProxy extends ServerProxy {
registerBlockModel(ZCompression.prometheumOre);
registerBlockModel(ZCompression.rottenGround);
registerBlockModel(ZCompression.slagironOre);
registerBlockModel(ZCompression.slaggoldOre);
registerBlockModel(ZCompression.tiberiumOre);
registerBlockModel(ZCompression.vibraniumOre);
registerBlockModel(ZCompression.yrdeanOre);
}
private static void registerBlockModel(Block block) {

View File

@@ -0,0 +1,5 @@
{
"variants": {
"normal": { "model": "zcompression:aardium_ore" }
}
}

View File

@@ -0,0 +1,5 @@
{
"variants": {
"normal": { "model": "zcompression:axiidian_ore" }
}
}

View File

@@ -0,0 +1,5 @@
{
"variants": {
"normal": { "model": "zcompression:ignitite_ore" }
}
}

View File

@@ -1,5 +1,5 @@
{
"variants": {
"normal": { "model": "zcompression:karmesite_ore" }
"normal": { "model": "zcompression:karmesine_ore" }
}
}

View File

@@ -0,0 +1,5 @@
{
"variants": {
"normal": { "model": "zcompression:slaggold_ore" }
}
}

View File

@@ -0,0 +1,5 @@
{
"variants": {
"normal": { "model": "zcompression:yrdean_ore" }
}
}

View File

@@ -13,6 +13,10 @@ tile.palladium_ore.name=Palladiumerz
tile.prometheum_ore.name=Prometheumerz
tile.rotten_ground.name=Verrottete Erde
tile.slagiron_ore.name=Unreines Eisenerz
tile.slaggold_ore.name=Unreines Golderz
tile.tiberium_ore.name=Tiberiumerz
tile.vibranium_ore.name=Vibraniumerz
tile.yrdean_ore.name=Yrdeanerz
tile.aardium_ore.name=Aardiumerz
tile.ignitite_ore.name=Ignititerz
tile.axiidian_ore.name=Axiidianerz

View File

@@ -13,5 +13,10 @@ tile.palladium_ore.name=Palladium Ore
tile.prometheum_ore.name=Prometheum Ore
tile.rotten_ground.name=Rotten Ground
tile.slagiron_ore.name=Slagiron Ore
tile.slaggold_ore.name=Slaggold Ore
tile.tiberium_ore.name=Tiberium Ore
tile.vibranium_ore.name=Vibranium Ore
tile.vibranium_ore.name=Vibranium Ore
tile.yrdean_ore.name=Yrdean Ore
tile.aardium_ore.name=Aardium Ore
tile.ignitite_ore.name=Ignitite Ore
tile.axiidian_ore.name=Axiidian Ore

View File

@@ -0,0 +1,6 @@
{
"parent": "block/cube_all",
"textures": {
"all": "zcompression:blocks/aardium_ore"
}
}

View File

@@ -0,0 +1,6 @@
{
"parent": "block/cube_all",
"textures": {
"all": "zcompression:blocks/axiidian_ore"
}
}

View File

@@ -0,0 +1,6 @@
{
"parent": "block/cube_all",
"textures": {
"all": "zcompression:blocks/ignitite_ore"
}
}

View File

@@ -0,0 +1,6 @@
{
"parent": "block/cube_all",
"textures": {
"all": "zcompression:blocks/slaggold_ore"
}
}

View File

@@ -0,0 +1,6 @@
{
"parent": "block/cube_all",
"textures": {
"all": "zcompression:blocks/yrdean_ore"
}
}

View File

@@ -0,0 +1,10 @@
{
"parent": "zcompression:block/aardium_ore",
"display": {
"thirdperson": {
"rotation": [ 10, -45, 170 ],
"translation": [ 0, 1.5, -2.75 ],
"scale": [ 0.375, 0.375, 0.375 ]
}
}
}

View File

@@ -0,0 +1,10 @@
{
"parent": "zcompression:block/axiidian_ore",
"display": {
"thirdperson": {
"rotation": [ 10, -45, 170 ],
"translation": [ 0, 1.5, -2.75 ],
"scale": [ 0.375, 0.375, 0.375 ]
}
}
}

View File

@@ -0,0 +1,10 @@
{
"parent": "zcompression:block/ignitite_ore",
"display": {
"thirdperson": {
"rotation": [ 10, -45, 170 ],
"translation": [ 0, 1.5, -2.75 ],
"scale": [ 0.375, 0.375, 0.375 ]
}
}
}

View File

@@ -0,0 +1,10 @@
{
"parent": "zcompression:block/slaggold_ore",
"display": {
"thirdperson": {
"rotation": [ 10, -45, 170 ],
"translation": [ 0, 1.5, -2.75 ],
"scale": [ 0.375, 0.375, 0.375 ]
}
}
}

View File

@@ -0,0 +1,10 @@
{
"parent": "zcompression:block/yrdean_ore",
"display": {
"thirdperson": {
"rotation": [ 10, -45, 170 ],
"translation": [ 0, 1.5, -2.75 ],
"scale": [ 0.375, 0.375, 0.375 ]
}
}
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 16 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 16 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 16 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 16 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 16 KiB