From 780bd7e8fbc119c553f67e423c87dcc56ba95ccc Mon Sep 17 00:00:00 2001 From: Robert Sosnitzka Date: Wed, 11 May 2016 00:51:05 +0200 Subject: [PATCH] Removed a lot of classes of items and blocks to save space and made it more clear to see everything --- build.gradle | 2 +- src/main/java/blocks/BlockAardiumOre.java | 12 --- src/main/java/blocks/BlockAdamantiteOre.java | 11 --- src/main/java/blocks/BlockArcaniteOre.java | 11 --- src/main/java/blocks/BlockAxiidianOre.java | 11 --- src/main/java/blocks/BlockBasalt.java | 11 --- src/main/java/blocks/BlockBismuthOre.java | 11 --- src/main/java/blocks/BlockEterniteOre.java | 11 --- src/main/java/blocks/BlockIgnititeOre.java | 12 --- src/main/java/blocks/BlockKarmesineOre.java | 11 --- src/main/java/blocks/BlockMeteoriteOre.java | 11 --- src/main/java/blocks/BlockMindoriteOre.java | 11 --- src/main/java/blocks/BlockMythrilOre.java | 11 --- src/main/java/blocks/BlockPalladiumOre.java | 11 --- src/main/java/blocks/BlockPrometheumOre.java | 11 --- src/main/java/blocks/BlockRottenGround.java | 13 --- src/main/java/blocks/BlockSlaggoldOre.java | 11 --- src/main/java/blocks/BlockSlagironOre.java | 11 --- src/main/java/blocks/BlockTiberiumOre.java | 4 +- src/main/java/blocks/BlockVibraniumOre.java | 11 --- src/main/java/blocks/BlockYrdeanOre.java | 11 --- .../blocks/category/BasicBlockGround.java | 2 + src/main/java/items/ItemAardiumIngot.java | 8 -- src/main/java/items/ItemAdamantiteIngot.java | 8 -- src/main/java/items/ItemArcaniteIngot.java | 8 -- src/main/java/items/ItemAxiidianIngot.java | 8 -- src/main/java/items/ItemBismuthIngot.java | 8 -- src/main/java/items/ItemEterniteIngot.java | 8 -- src/main/java/items/ItemFuelBrick.java | 9 -- src/main/java/items/ItemIgnititeIngot.java | 8 -- src/main/java/items/ItemKarmesineIngot.java | 8 -- src/main/java/items/ItemMeteoriteIngot.java | 8 -- src/main/java/items/ItemMindoriteIngot.java | 8 -- src/main/java/items/ItemMythrilIngot.java | 8 -- src/main/java/items/ItemPalladiumIngot.java | 8 -- src/main/java/items/ItemPrometheumIngot.java | 8 -- src/main/java/items/ItemTiberiumIngot.java | 8 -- src/main/java/items/ItemVibraniumIngot.java | 8 -- src/main/java/items/ItemYrdeanIngot.java | 8 -- src/main/java/main/ZCompression.java | 97 +++++++++++-------- src/main/java/main/util/FuelHandler.java | 2 +- src/main/java/main/util/recipes/Smelting.java | 4 +- src/main/java/proxy/ClientProxy.java | 3 + .../models/item/tiberium_shard_instable.json | 6 ++ .../models/item/tiberium_shard_stable.json | 6 ++ 45 files changed, 79 insertions(+), 397 deletions(-) delete mode 100644 src/main/java/blocks/BlockAardiumOre.java delete mode 100644 src/main/java/blocks/BlockAdamantiteOre.java delete mode 100644 src/main/java/blocks/BlockArcaniteOre.java delete mode 100644 src/main/java/blocks/BlockAxiidianOre.java delete mode 100644 src/main/java/blocks/BlockBasalt.java delete mode 100644 src/main/java/blocks/BlockBismuthOre.java delete mode 100644 src/main/java/blocks/BlockEterniteOre.java delete mode 100644 src/main/java/blocks/BlockIgnititeOre.java delete mode 100644 src/main/java/blocks/BlockKarmesineOre.java delete mode 100644 src/main/java/blocks/BlockMeteoriteOre.java delete mode 100644 src/main/java/blocks/BlockMindoriteOre.java delete mode 100644 src/main/java/blocks/BlockMythrilOre.java delete mode 100644 src/main/java/blocks/BlockPalladiumOre.java delete mode 100644 src/main/java/blocks/BlockPrometheumOre.java delete mode 100644 src/main/java/blocks/BlockRottenGround.java delete mode 100644 src/main/java/blocks/BlockSlaggoldOre.java delete mode 100644 src/main/java/blocks/BlockSlagironOre.java delete mode 100644 src/main/java/blocks/BlockVibraniumOre.java delete mode 100644 src/main/java/blocks/BlockYrdeanOre.java delete mode 100644 src/main/java/items/ItemAardiumIngot.java delete mode 100644 src/main/java/items/ItemAdamantiteIngot.java delete mode 100644 src/main/java/items/ItemArcaniteIngot.java delete mode 100644 src/main/java/items/ItemAxiidianIngot.java delete mode 100644 src/main/java/items/ItemBismuthIngot.java delete mode 100644 src/main/java/items/ItemEterniteIngot.java delete mode 100644 src/main/java/items/ItemFuelBrick.java delete mode 100644 src/main/java/items/ItemIgnititeIngot.java delete mode 100644 src/main/java/items/ItemKarmesineIngot.java delete mode 100644 src/main/java/items/ItemMeteoriteIngot.java delete mode 100644 src/main/java/items/ItemMindoriteIngot.java delete mode 100644 src/main/java/items/ItemMythrilIngot.java delete mode 100644 src/main/java/items/ItemPalladiumIngot.java delete mode 100644 src/main/java/items/ItemPrometheumIngot.java delete mode 100644 src/main/java/items/ItemTiberiumIngot.java delete mode 100644 src/main/java/items/ItemVibraniumIngot.java delete mode 100644 src/main/java/items/ItemYrdeanIngot.java create mode 100644 src/main/resources/assets/zcompression/models/item/tiberium_shard_instable.json create mode 100644 src/main/resources/assets/zcompression/models/item/tiberium_shard_stable.json diff --git a/build.gradle b/build.gradle index 0e2f5b2..4cb7ac2 100644 --- a/build.gradle +++ b/build.gradle @@ -50,7 +50,7 @@ dependencies { deobfCompile "codechicken:CodeChickenLib:1.9-2.0.1.21:deobf" deobfCompile "codechicken:CodeChickenCore:1.9-2.0.1.53:deobf" //deobfCompile "codechicken:NotEnoughItems:1.9-${nei_version}:dev" - + deobfCompile "slimeknights.mantle:Mantle:1.9-0.10.0.jenkins132:deobf" deobfCompile "mezz.jei:jei_1.9:3.3.3.197" // compile "tconstruct:TConstruct:1.9-2.2.2.jenkins159:deobf" } 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); } } diff --git a/src/main/java/items/ItemAardiumIngot.java b/src/main/java/items/ItemAardiumIngot.java deleted file mode 100644 index 7031806..0000000 --- a/src/main/java/items/ItemAardiumIngot.java +++ /dev/null @@ -1,8 +0,0 @@ -package items; - -public class ItemAardiumIngot extends BasicItem { - - public ItemAardiumIngot() { - super("aardium_ingot"); - } -} diff --git a/src/main/java/items/ItemAdamantiteIngot.java b/src/main/java/items/ItemAdamantiteIngot.java deleted file mode 100644 index 4004318..0000000 --- a/src/main/java/items/ItemAdamantiteIngot.java +++ /dev/null @@ -1,8 +0,0 @@ -package items; - -public class ItemAdamantiteIngot extends BasicItem { - - public ItemAdamantiteIngot() { - super("adamantite_ingot"); - } -} diff --git a/src/main/java/items/ItemArcaniteIngot.java b/src/main/java/items/ItemArcaniteIngot.java deleted file mode 100644 index 924f335..0000000 --- a/src/main/java/items/ItemArcaniteIngot.java +++ /dev/null @@ -1,8 +0,0 @@ -package items; - -public class ItemArcaniteIngot extends BasicItem { - - public ItemArcaniteIngot() { - super("arcanite_ingot"); - } -} diff --git a/src/main/java/items/ItemAxiidianIngot.java b/src/main/java/items/ItemAxiidianIngot.java deleted file mode 100644 index 20af19f..0000000 --- a/src/main/java/items/ItemAxiidianIngot.java +++ /dev/null @@ -1,8 +0,0 @@ -package items; - -public class ItemAxiidianIngot extends BasicItem { - - public ItemAxiidianIngot() { - super("axiidian_ingot"); - } -} diff --git a/src/main/java/items/ItemBismuthIngot.java b/src/main/java/items/ItemBismuthIngot.java deleted file mode 100644 index 36ee0b7..0000000 --- a/src/main/java/items/ItemBismuthIngot.java +++ /dev/null @@ -1,8 +0,0 @@ -package items; - -public class ItemBismuthIngot extends BasicItem { - - public ItemBismuthIngot() { - super("bismuth_ingot"); - } -} diff --git a/src/main/java/items/ItemEterniteIngot.java b/src/main/java/items/ItemEterniteIngot.java deleted file mode 100644 index be67eed..0000000 --- a/src/main/java/items/ItemEterniteIngot.java +++ /dev/null @@ -1,8 +0,0 @@ -package items; - -public class ItemEterniteIngot extends BasicItem { - - public ItemEterniteIngot() { - super("eternite_ingot"); - } -} diff --git a/src/main/java/items/ItemFuelBrick.java b/src/main/java/items/ItemFuelBrick.java deleted file mode 100644 index a5d2c20..0000000 --- a/src/main/java/items/ItemFuelBrick.java +++ /dev/null @@ -1,9 +0,0 @@ -package items; - -public class ItemFuelBrick extends BasicItem { - - public ItemFuelBrick() { - super("fuel_brick"); - } - -} diff --git a/src/main/java/items/ItemIgnititeIngot.java b/src/main/java/items/ItemIgnititeIngot.java deleted file mode 100644 index c06baf0..0000000 --- a/src/main/java/items/ItemIgnititeIngot.java +++ /dev/null @@ -1,8 +0,0 @@ -package items; - -public class ItemIgnititeIngot extends BasicItem { - - public ItemIgnititeIngot() { - super("ignitite_ingot"); - } -} diff --git a/src/main/java/items/ItemKarmesineIngot.java b/src/main/java/items/ItemKarmesineIngot.java deleted file mode 100644 index 56ae5da..0000000 --- a/src/main/java/items/ItemKarmesineIngot.java +++ /dev/null @@ -1,8 +0,0 @@ -package items; - -public class ItemKarmesineIngot extends BasicItem { - - public ItemKarmesineIngot() { - super("karmesine_ingot"); - } -} diff --git a/src/main/java/items/ItemMeteoriteIngot.java b/src/main/java/items/ItemMeteoriteIngot.java deleted file mode 100644 index 91e6507..0000000 --- a/src/main/java/items/ItemMeteoriteIngot.java +++ /dev/null @@ -1,8 +0,0 @@ -package items; - -public class ItemMeteoriteIngot extends BasicItem { - - public ItemMeteoriteIngot() { - super("meteorite_ingot"); - } -} diff --git a/src/main/java/items/ItemMindoriteIngot.java b/src/main/java/items/ItemMindoriteIngot.java deleted file mode 100644 index 57f0a01..0000000 --- a/src/main/java/items/ItemMindoriteIngot.java +++ /dev/null @@ -1,8 +0,0 @@ -package items; - -public class ItemMindoriteIngot extends BasicItem { - - public ItemMindoriteIngot() { - super("mindorite_ingot"); - } -} diff --git a/src/main/java/items/ItemMythrilIngot.java b/src/main/java/items/ItemMythrilIngot.java deleted file mode 100644 index 3441294..0000000 --- a/src/main/java/items/ItemMythrilIngot.java +++ /dev/null @@ -1,8 +0,0 @@ -package items; - -public class ItemMythrilIngot extends BasicItem { - - public ItemMythrilIngot() { - super("mythril_ingot"); - } -} diff --git a/src/main/java/items/ItemPalladiumIngot.java b/src/main/java/items/ItemPalladiumIngot.java deleted file mode 100644 index d795dbc..0000000 --- a/src/main/java/items/ItemPalladiumIngot.java +++ /dev/null @@ -1,8 +0,0 @@ -package items; - -public class ItemPalladiumIngot extends BasicItem { - - public ItemPalladiumIngot() { - super("palladium_ingot"); - } -} diff --git a/src/main/java/items/ItemPrometheumIngot.java b/src/main/java/items/ItemPrometheumIngot.java deleted file mode 100644 index a41d546..0000000 --- a/src/main/java/items/ItemPrometheumIngot.java +++ /dev/null @@ -1,8 +0,0 @@ -package items; - -public class ItemPrometheumIngot extends BasicItem { - - public ItemPrometheumIngot() { - super("prometheum_ingot"); - } -} diff --git a/src/main/java/items/ItemTiberiumIngot.java b/src/main/java/items/ItemTiberiumIngot.java deleted file mode 100644 index d5f5348..0000000 --- a/src/main/java/items/ItemTiberiumIngot.java +++ /dev/null @@ -1,8 +0,0 @@ -package items; - -public class ItemTiberiumIngot extends BasicItem { - - public ItemTiberiumIngot() { - super("tiberium_ingot"); - } -} diff --git a/src/main/java/items/ItemVibraniumIngot.java b/src/main/java/items/ItemVibraniumIngot.java deleted file mode 100644 index ef1128f..0000000 --- a/src/main/java/items/ItemVibraniumIngot.java +++ /dev/null @@ -1,8 +0,0 @@ -package items; - -public class ItemVibraniumIngot extends BasicItem { - - public ItemVibraniumIngot() { - super("vibranium_ingot"); - } -} diff --git a/src/main/java/items/ItemYrdeanIngot.java b/src/main/java/items/ItemYrdeanIngot.java deleted file mode 100644 index 221c36a..0000000 --- a/src/main/java/items/ItemYrdeanIngot.java +++ /dev/null @@ -1,8 +0,0 @@ -package items; - -public class ItemYrdeanIngot extends BasicItem { - - public ItemYrdeanIngot() { - super("yrdean_ingot"); - } -} diff --git a/src/main/java/main/ZCompression.java b/src/main/java/main/ZCompression.java index fe0b152..47ff615 100644 --- a/src/main/java/main/ZCompression.java +++ b/src/main/java/main/ZCompression.java @@ -1,6 +1,9 @@ package main; import blocks.*; +import blocks.category.BasicBlockGround; +import blocks.category.BasicBlockOre; +import blocks.category.BasicBlockOreGlow; import fluids.BasicFluid; import items.*; import main.util.FuelHandler; @@ -8,6 +11,8 @@ import main.util.recipes.Crafting; import main.util.recipes.Smelting; import main.world.ZWorldGen; import net.minecraft.block.Block; +import net.minecraft.block.material.Material; +import net.minecraft.item.Item; import net.minecraft.item.ItemBlock; import net.minecraft.nbt.NBTTagCompound; import net.minecraftforge.fluids.Fluid; @@ -28,52 +33,60 @@ public class ZCompression { static final String MODID = "zcompression"; static final String VERSION = "@VERSION@"; - // Items + + // ITEMS public static ItemSlagironIngot slagironIngot = new ItemSlagironIngot(); public static ItemLignite lignite = new ItemLignite(); public static ItemIronNugget iron_nugget = new ItemIronNugget(); public static ItemSlaggoldIngot slaggoldIngot = new ItemSlaggoldIngot(); - public static ItemFuelBrick fuel_brick = new ItemFuelBrick(); + public static Item fuel_brick = new BasicItem("fuel_brick"); + + public static Item aardiumIngot = new BasicItem("aardium_ingot"); + public static Item adamantiteIngot = new BasicItem("adamantite_ingot"); + public static Item arcaniteIngot = new BasicItem("arcanite_ingot"); + public static Item axiidianIngot = new BasicItem("axiidian_ingot"); + public static Item bismuthIngot = new BasicItem("bismuth_ingot"); + public static Item eterniteIngot = new BasicItem("eternite_ingot"); + public static Item ignititeIngot = new BasicItem("ignitite_ingot"); + public static Item karmesineIngot = new BasicItem("karmesine_ingot"); + public static Item meteoriteIngot = new BasicItem("meteorite_ingot"); + public static Item mindoriteIngot = new BasicItem("mindorite_ingot"); + public static Item mythrilIngot = new BasicItem("mythril_ingot"); + public static Item palladiumIngot = new BasicItem("palladium_ingot"); + public static Item prometheumIngot = new BasicItem("prometheum_ingot"); + public static Item tiberiumIngot = new BasicItem("tiberium_ingot"); + public static Item vibraniumIngot = new BasicItem("vibranium_ingot"); + public static Item yrdeanIngot = new BasicItem("yrdean_ingot"); + + public static Item tiberiumShardInstable = new BasicItem("tiberium_shard_instable"); + public static Item tiberiumShardStable = new BasicItem("tiberium_shard_stable"); + + // 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(); + + + 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 BasicBlockOreGlow("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 static ItemAardiumIngot aardiumIngot = new ItemAardiumIngot(); - public static ItemAdamantiteIngot adamantiteIngot = new ItemAdamantiteIngot(); - public static ItemArcaniteIngot arcaniteIngot = new ItemArcaniteIngot(); - public static ItemAxiidianIngot axiidianIngot = new ItemAxiidianIngot(); - public static ItemBismuthIngot bismuthIngot = new ItemBismuthIngot(); - public static ItemEterniteIngot eterniteIngot = new ItemEterniteIngot(); - public static ItemIgnititeIngot ignititeIngot = new ItemIgnititeIngot(); - public static ItemKarmesineIngot karmesineIngot = new ItemKarmesineIngot(); - public static ItemMeteoriteIngot meteoriteIngot = new ItemMeteoriteIngot(); - public static ItemMindoriteIngot mindoriteIngot = new ItemMindoriteIngot(); - public static ItemMythrilIngot mythrilIngot = new ItemMythrilIngot(); - public static ItemPalladiumIngot palladiumIngot = new ItemPalladiumIngot(); - public static ItemPrometheumIngot prometheumIngot = new ItemPrometheumIngot(); - public static ItemTiberiumIngot tiberiumIngot = new ItemTiberiumIngot(); - public static ItemVibraniumIngot vibraniumIngot = new ItemVibraniumIngot(); - public static ItemYrdeanIngot yrdeanIngot = new ItemYrdeanIngot(); - //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(); - public static BlockMindoriteOre mindoriteOre = new BlockMindoriteOre(); - public static BlockMythrilOre mythrilOre = new BlockMythrilOre(); - public static BlockPalladiumOre palladiumOre = new BlockPalladiumOre(); - 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 BlockVibraniumOre vibraniumOre = new BlockVibraniumOre(); - public static BlockYrdeanOre yrdeanOre = new BlockYrdeanOre(); @SidedProxy(clientSide = "proxy.ClientProxy", serverSide = "proxy.ServerProxy") @@ -88,9 +101,9 @@ public class ZCompression { public void preInit(FMLPreInitializationEvent e) { //Items - BasicItem tiberiumShardInstable = new BasicItem("tiberiumShardInstable"); - GameRegistry.register(tiberiumShardInstable); + GameRegistry.register(tiberiumShardInstable); + GameRegistry.register(tiberiumShardStable); GameRegistry.register(slagironIngot); GameRegistry.register(fuel_brick); diff --git a/src/main/java/main/util/FuelHandler.java b/src/main/java/main/util/FuelHandler.java index d83c222..47d059c 100644 --- a/src/main/java/main/util/FuelHandler.java +++ b/src/main/java/main/util/FuelHandler.java @@ -13,7 +13,7 @@ public class FuelHandler implements IFuelHandler { return 200 * 2; } if (fuel.getItem().equals(ZCompression.fuel_brick)) { - return RandomUtils.nextInt(1, 64) * 200; + return RandomUtils.nextInt(1, RandomUtils.nextInt(1, RandomUtils.nextInt(1, 64))) * 200; } return 0; } diff --git a/src/main/java/main/util/recipes/Smelting.java b/src/main/java/main/util/recipes/Smelting.java index 1ca2864..6e43510 100644 --- a/src/main/java/main/util/recipes/Smelting.java +++ b/src/main/java/main/util/recipes/Smelting.java @@ -16,6 +16,8 @@ public class Smelting { GameRegistry.addSmelting(ZCompression.slagironOre, new ItemStack(ZCompression.slagironIngot),1.0F); GameRegistry.addSmelting(new ItemStack(ZCompression.slagironIngot, 3),new ItemStack(ZCompression.iron_nugget), 0); GameRegistry.addSmelting(new ItemStack(ZCompression.slaggoldIngot, 3),new ItemStack(Items.GOLD_NUGGET), 0); + GameRegistry.addSmelting(new ItemStack(ZCompression.tiberiumShardInstable), new ItemStack(ZCompression.tiberiumShardStable), 0.2F); + GameRegistry.addSmelting(ZCompression.aardiumOre, new ItemStack(ZCompression.aardiumIngot), RandomUtils.nextFloat(0F, 2F)); GameRegistry.addSmelting(ZCompression.arcaniteOre, new ItemStack(ZCompression.arcaniteIngot), RandomUtils.nextFloat(0F, 2F)); @@ -30,7 +32,7 @@ public class Smelting { GameRegistry.addSmelting(ZCompression.mythrilOre, new ItemStack(ZCompression.mythrilIngot), RandomUtils.nextFloat(0F, 2F)); GameRegistry.addSmelting(ZCompression.palladiumOre, new ItemStack(ZCompression.palladiumIngot), RandomUtils.nextFloat(0F, 2F)); GameRegistry.addSmelting(ZCompression.prometheumOre, new ItemStack(ZCompression.prometheumIngot), RandomUtils.nextFloat(0F, 2F)); - GameRegistry.addSmelting(ZCompression.tiberiumOre, new ItemStack(ZCompression.tiberiumIngot), RandomUtils.nextFloat(0F, 2F)); + GameRegistry.addSmelting(ZCompression.tiberiumOre, new ItemStack(ZCompression.tiberiumShardStable, 2), RandomUtils.nextFloat(0F, 2F)); GameRegistry.addSmelting(ZCompression.vibraniumOre, new ItemStack(ZCompression.vibraniumIngot), RandomUtils.nextFloat(0F, 2F)); GameRegistry.addSmelting(ZCompression.yrdeanOre, new ItemStack(ZCompression.yrdeanIngot), RandomUtils.nextFloat(0F, 2F)); diff --git a/src/main/java/proxy/ClientProxy.java b/src/main/java/proxy/ClientProxy.java index f9804bc..cdabc60 100644 --- a/src/main/java/proxy/ClientProxy.java +++ b/src/main/java/proxy/ClientProxy.java @@ -24,6 +24,9 @@ public class ClientProxy extends ServerProxy { registerItemModel(ZCompression.lignite); registerItemModel(ZCompression.iron_nugget); registerItemModel(ZCompression.fuel_brick); + registerItemModel(ZCompression.tiberiumShardInstable); + registerItemModel(ZCompression.tiberiumShardStable); + registerItemModel(ZCompression.aardiumIngot); registerItemModel(ZCompression.adamantiteIngot); diff --git a/src/main/resources/assets/zcompression/models/item/tiberium_shard_instable.json b/src/main/resources/assets/zcompression/models/item/tiberium_shard_instable.json new file mode 100644 index 0000000..6555dcd --- /dev/null +++ b/src/main/resources/assets/zcompression/models/item/tiberium_shard_instable.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "zcompression:items/tiberium_shard_instable" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/zcompression/models/item/tiberium_shard_stable.json b/src/main/resources/assets/zcompression/models/item/tiberium_shard_stable.json new file mode 100644 index 0000000..9d07068 --- /dev/null +++ b/src/main/resources/assets/zcompression/models/item/tiberium_shard_stable.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "zcompression:items/tiberium_shard_stable" + } +} \ No newline at end of file