diff --git a/src/main/java/blocks/BlockAardiumOre.java b/src/main/java/blocks/BlockAardiumOre.java new file mode 100644 index 0000000..e9b9925 --- /dev/null +++ b/src/main/java/blocks/BlockAardiumOre.java @@ -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); + } +} diff --git a/src/main/java/blocks/BlockAdamantiteOre.java b/src/main/java/blocks/BlockAdamantiteOre.java index 75931e9..2d015b3 100644 --- a/src/main/java/blocks/BlockAdamantiteOre.java +++ b/src/main/java/blocks/BlockAdamantiteOre.java @@ -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); diff --git a/src/main/java/blocks/BlockArcaniteOre.java b/src/main/java/blocks/BlockArcaniteOre.java index 014f563..46de274 100644 --- a/src/main/java/blocks/BlockArcaniteOre.java +++ b/src/main/java/blocks/BlockArcaniteOre.java @@ -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); diff --git a/src/main/java/blocks/BlockAxiidianOre.java b/src/main/java/blocks/BlockAxiidianOre.java new file mode 100644 index 0000000..73f81bd --- /dev/null +++ b/src/main/java/blocks/BlockAxiidianOre.java @@ -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); + } +} diff --git a/src/main/java/blocks/BlockBasalt.java b/src/main/java/blocks/BlockBasalt.java index 73ae463..b0eb5ae 100644 --- a/src/main/java/blocks/BlockBasalt.java +++ b/src/main/java/blocks/BlockBasalt.java @@ -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); diff --git a/src/main/java/blocks/BlockBismuthOre.java b/src/main/java/blocks/BlockBismuthOre.java index b58cecf..a3386b6 100644 --- a/src/main/java/blocks/BlockBismuthOre.java +++ b/src/main/java/blocks/BlockBismuthOre.java @@ -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); diff --git a/src/main/java/blocks/BlockEterniteOre.java b/src/main/java/blocks/BlockEterniteOre.java index 8854b91..91132a0 100644 --- a/src/main/java/blocks/BlockEterniteOre.java +++ b/src/main/java/blocks/BlockEterniteOre.java @@ -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); diff --git a/src/main/java/blocks/BlockIgnititeOre.java b/src/main/java/blocks/BlockIgnititeOre.java new file mode 100644 index 0000000..845b784 --- /dev/null +++ b/src/main/java/blocks/BlockIgnititeOre.java @@ -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); + } +} diff --git a/src/main/java/blocks/BlockKarmesineOre.java b/src/main/java/blocks/BlockKarmesineOre.java index 9c4f5f0..1c16a5c 100644 --- a/src/main/java/blocks/BlockKarmesineOre.java +++ b/src/main/java/blocks/BlockKarmesineOre.java @@ -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); diff --git a/src/main/java/blocks/BlockLigniteOre.java b/src/main/java/blocks/BlockLigniteOre.java index 5064b5f..d2507bf 100644 --- a/src/main/java/blocks/BlockLigniteOre.java +++ b/src/main/java/blocks/BlockLigniteOre.java @@ -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); diff --git a/src/main/java/blocks/BlockMeteoriteOre.java b/src/main/java/blocks/BlockMeteoriteOre.java index a074316..3604e3d 100644 --- a/src/main/java/blocks/BlockMeteoriteOre.java +++ b/src/main/java/blocks/BlockMeteoriteOre.java @@ -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); diff --git a/src/main/java/blocks/BlockMindoriteOre.java b/src/main/java/blocks/BlockMindoriteOre.java index 07b04ff..32f6c1c 100644 --- a/src/main/java/blocks/BlockMindoriteOre.java +++ b/src/main/java/blocks/BlockMindoriteOre.java @@ -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); diff --git a/src/main/java/blocks/BlockMythrilOre.java b/src/main/java/blocks/BlockMythrilOre.java index 4a19c57..0bf2b23 100644 --- a/src/main/java/blocks/BlockMythrilOre.java +++ b/src/main/java/blocks/BlockMythrilOre.java @@ -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); diff --git a/src/main/java/blocks/BlockPalladiumOre.java b/src/main/java/blocks/BlockPalladiumOre.java index 7e6d146..5dc5b15 100644 --- a/src/main/java/blocks/BlockPalladiumOre.java +++ b/src/main/java/blocks/BlockPalladiumOre.java @@ -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); diff --git a/src/main/java/blocks/BlockPrometheumOre.java b/src/main/java/blocks/BlockPrometheumOre.java index 7093806..f3fee45 100644 --- a/src/main/java/blocks/BlockPrometheumOre.java +++ b/src/main/java/blocks/BlockPrometheumOre.java @@ -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); } } diff --git a/src/main/java/blocks/BlockRottenGround.java b/src/main/java/blocks/BlockRottenGround.java index a751a86..fc4e60c 100644 --- a/src/main/java/blocks/BlockRottenGround.java +++ b/src/main/java/blocks/BlockRottenGround.java @@ -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); diff --git a/src/main/java/blocks/BlockSlaggoldOre.java b/src/main/java/blocks/BlockSlaggoldOre.java new file mode 100644 index 0000000..67cc801 --- /dev/null +++ b/src/main/java/blocks/BlockSlaggoldOre.java @@ -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); + } +} diff --git a/src/main/java/blocks/BlockSlagironOre.java b/src/main/java/blocks/BlockSlagironOre.java index 61860c5..d1c283b 100644 --- a/src/main/java/blocks/BlockSlagironOre.java +++ b/src/main/java/blocks/BlockSlagironOre.java @@ -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); diff --git a/src/main/java/blocks/BlockTiberiumOre.java b/src/main/java/blocks/BlockTiberiumOre.java index 5efbd55..3d19565 100644 --- a/src/main/java/blocks/BlockTiberiumOre.java +++ b/src/main/java/blocks/BlockTiberiumOre.java @@ -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); } } diff --git a/src/main/java/blocks/BlockVibraniumre.java b/src/main/java/blocks/BlockVibraniumre.java index 2e9ab54..203e4b2 100644 --- a/src/main/java/blocks/BlockVibraniumre.java +++ b/src/main/java/blocks/BlockVibraniumre.java @@ -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); diff --git a/src/main/java/blocks/BlockYrdeanOre.java b/src/main/java/blocks/BlockYrdeanOre.java new file mode 100644 index 0000000..ef676d0 --- /dev/null +++ b/src/main/java/blocks/BlockYrdeanOre.java @@ -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); + } +} diff --git a/src/main/java/blocks/category/BasicBlockOre.java b/src/main/java/blocks/category/BasicBlockOre.java index 3e4810e..fa5cca1 100644 --- a/src/main/java/blocks/category/BasicBlockOre.java +++ b/src/main/java/blocks/category/BasicBlockOre.java @@ -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); diff --git a/src/main/java/blocks/category/BasicBlockOreGlow.java b/src/main/java/blocks/category/BasicBlockOreGlow.java new file mode 100644 index 0000000..a3ca81d --- /dev/null +++ b/src/main/java/blocks/category/BasicBlockOreGlow.java @@ -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); + } +} diff --git a/src/main/java/main/ZCompression.java b/src/main/java/main/ZCompression.java index 0eea668..db9f88e 100644 --- a/src/main/java/main/ZCompression.java +++ b/src/main/java/main/ZCompression.java @@ -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())); } diff --git a/src/main/java/main/util/Generator.java b/src/main/java/main/util/Generator.java index 563e679..aa6fc00 100644 --- a/src/main/java/main/util/Generator.java +++ b/src/main/java/main/util/Generator.java @@ -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); diff --git a/src/main/java/main/world/ZWorldGen.java b/src/main/java/main/world/ZWorldGen.java index 22b7d79..5ed4689 100644 --- a/src/main/java/main/world/ZWorldGen.java +++ b/src/main/java/main/world/ZWorldGen.java @@ -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); } diff --git a/src/main/java/proxy/ClientProxy.java b/src/main/java/proxy/ClientProxy.java index 09099bd..3f64d77 100644 --- a/src/main/java/proxy/ClientProxy.java +++ b/src/main/java/proxy/ClientProxy.java @@ -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) { diff --git a/src/main/resources/assets/zcompression/blockstates/aardium_ore.json b/src/main/resources/assets/zcompression/blockstates/aardium_ore.json new file mode 100644 index 0000000..f690c3d --- /dev/null +++ b/src/main/resources/assets/zcompression/blockstates/aardium_ore.json @@ -0,0 +1,5 @@ +{ + "variants": { + "normal": { "model": "zcompression:aardium_ore" } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/zcompression/blockstates/axiidian_ore.json b/src/main/resources/assets/zcompression/blockstates/axiidian_ore.json new file mode 100644 index 0000000..a64bee9 --- /dev/null +++ b/src/main/resources/assets/zcompression/blockstates/axiidian_ore.json @@ -0,0 +1,5 @@ +{ + "variants": { + "normal": { "model": "zcompression:axiidian_ore" } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/zcompression/blockstates/ignitite_ore.json b/src/main/resources/assets/zcompression/blockstates/ignitite_ore.json new file mode 100644 index 0000000..aaa1f08 --- /dev/null +++ b/src/main/resources/assets/zcompression/blockstates/ignitite_ore.json @@ -0,0 +1,5 @@ +{ + "variants": { + "normal": { "model": "zcompression:ignitite_ore" } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/zcompression/blockstates/karmesine_ore.json b/src/main/resources/assets/zcompression/blockstates/karmesine_ore.json index 548dbdb..0c524c7 100644 --- a/src/main/resources/assets/zcompression/blockstates/karmesine_ore.json +++ b/src/main/resources/assets/zcompression/blockstates/karmesine_ore.json @@ -1,5 +1,5 @@ { "variants": { - "normal": { "model": "zcompression:karmesite_ore" } + "normal": { "model": "zcompression:karmesine_ore" } } } \ No newline at end of file diff --git a/src/main/resources/assets/zcompression/blockstates/slaggold_ore.json b/src/main/resources/assets/zcompression/blockstates/slaggold_ore.json new file mode 100644 index 0000000..ad53974 --- /dev/null +++ b/src/main/resources/assets/zcompression/blockstates/slaggold_ore.json @@ -0,0 +1,5 @@ +{ + "variants": { + "normal": { "model": "zcompression:slaggold_ore" } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/zcompression/blockstates/yrdean_ore.json b/src/main/resources/assets/zcompression/blockstates/yrdean_ore.json new file mode 100644 index 0000000..b51e4d5 --- /dev/null +++ b/src/main/resources/assets/zcompression/blockstates/yrdean_ore.json @@ -0,0 +1,5 @@ +{ + "variants": { + "normal": { "model": "zcompression:yrdean_ore" } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/zcompression/lang/de_DE.lang b/src/main/resources/assets/zcompression/lang/de_DE.lang index 354be92..6b1d736 100644 --- a/src/main/resources/assets/zcompression/lang/de_DE.lang +++ b/src/main/resources/assets/zcompression/lang/de_DE.lang @@ -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 diff --git a/src/main/resources/assets/zcompression/lang/en_US.lang b/src/main/resources/assets/zcompression/lang/en_US.lang index cbf40a3..3ed16e9 100644 --- a/src/main/resources/assets/zcompression/lang/en_US.lang +++ b/src/main/resources/assets/zcompression/lang/en_US.lang @@ -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 \ No newline at end of file +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 \ No newline at end of file diff --git a/src/main/resources/assets/zcompression/models/block/aardium_ore.json b/src/main/resources/assets/zcompression/models/block/aardium_ore.json new file mode 100644 index 0000000..02751a3 --- /dev/null +++ b/src/main/resources/assets/zcompression/models/block/aardium_ore.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "zcompression:blocks/aardium_ore" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/zcompression/models/block/axiidian_ore.json b/src/main/resources/assets/zcompression/models/block/axiidian_ore.json new file mode 100644 index 0000000..791ea7d --- /dev/null +++ b/src/main/resources/assets/zcompression/models/block/axiidian_ore.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "zcompression:blocks/axiidian_ore" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/zcompression/models/block/ignitite_ore.json b/src/main/resources/assets/zcompression/models/block/ignitite_ore.json new file mode 100644 index 0000000..7aeae76 --- /dev/null +++ b/src/main/resources/assets/zcompression/models/block/ignitite_ore.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "zcompression:blocks/ignitite_ore" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/zcompression/models/block/slaggold_ore.json b/src/main/resources/assets/zcompression/models/block/slaggold_ore.json new file mode 100644 index 0000000..d0ad960 --- /dev/null +++ b/src/main/resources/assets/zcompression/models/block/slaggold_ore.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "zcompression:blocks/slaggold_ore" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/zcompression/models/block/yrdean_ore.json b/src/main/resources/assets/zcompression/models/block/yrdean_ore.json new file mode 100644 index 0000000..f56f793 --- /dev/null +++ b/src/main/resources/assets/zcompression/models/block/yrdean_ore.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "zcompression:blocks/yrdean_ore" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/zcompression/models/item/aardium_ore.json b/src/main/resources/assets/zcompression/models/item/aardium_ore.json new file mode 100644 index 0000000..85071c3 --- /dev/null +++ b/src/main/resources/assets/zcompression/models/item/aardium_ore.json @@ -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 ] + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/zcompression/models/item/axiidian_ore.json b/src/main/resources/assets/zcompression/models/item/axiidian_ore.json new file mode 100644 index 0000000..ad1df08 --- /dev/null +++ b/src/main/resources/assets/zcompression/models/item/axiidian_ore.json @@ -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 ] + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/zcompression/models/item/ignitite_ore.json b/src/main/resources/assets/zcompression/models/item/ignitite_ore.json new file mode 100644 index 0000000..e165f48 --- /dev/null +++ b/src/main/resources/assets/zcompression/models/item/ignitite_ore.json @@ -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 ] + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/zcompression/models/item/slaggold_ore.json b/src/main/resources/assets/zcompression/models/item/slaggold_ore.json new file mode 100644 index 0000000..7fdfe68 --- /dev/null +++ b/src/main/resources/assets/zcompression/models/item/slaggold_ore.json @@ -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 ] + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/zcompression/models/item/yrdean_ore.json b/src/main/resources/assets/zcompression/models/item/yrdean_ore.json new file mode 100644 index 0000000..24d64eb --- /dev/null +++ b/src/main/resources/assets/zcompression/models/item/yrdean_ore.json @@ -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 ] + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/zcompression/textures/blocks/aardium_ore.png b/src/main/resources/assets/zcompression/textures/blocks/aardium_ore.png new file mode 100644 index 0000000..a84a712 Binary files /dev/null and b/src/main/resources/assets/zcompression/textures/blocks/aardium_ore.png differ diff --git a/src/main/resources/assets/zcompression/textures/blocks/axiidian_ore.png b/src/main/resources/assets/zcompression/textures/blocks/axiidian_ore.png new file mode 100644 index 0000000..cb0b06d Binary files /dev/null and b/src/main/resources/assets/zcompression/textures/blocks/axiidian_ore.png differ diff --git a/src/main/resources/assets/zcompression/textures/blocks/ignitite_ore.png b/src/main/resources/assets/zcompression/textures/blocks/ignitite_ore.png new file mode 100644 index 0000000..52340ce Binary files /dev/null and b/src/main/resources/assets/zcompression/textures/blocks/ignitite_ore.png differ diff --git a/src/main/resources/assets/zcompression/textures/blocks/slaggold_ore.png b/src/main/resources/assets/zcompression/textures/blocks/slaggold_ore.png new file mode 100644 index 0000000..eb64dd7 Binary files /dev/null and b/src/main/resources/assets/zcompression/textures/blocks/slaggold_ore.png differ diff --git a/src/main/resources/assets/zcompression/textures/blocks/yrdean_ore.png b/src/main/resources/assets/zcompression/textures/blocks/yrdean_ore.png new file mode 100644 index 0000000..2a422ed Binary files /dev/null and b/src/main/resources/assets/zcompression/textures/blocks/yrdean_ore.png differ