diff --git a/build.gradle b/build.gradle index 5837bb6..02c8066 100644 --- a/build.gradle +++ b/build.gradle @@ -22,7 +22,7 @@ repositories { } } -version = "0.2" +version = "0.2a" group = "com.sosnitzka.zcompression" // http://maven.apache.org/guides/mini/guide-naming-conventions.html archivesBaseName = "zcompression" diff --git a/src/main/java/blocks/BlockLigniteOre.java b/src/main/java/blocks/BlockLigniteOre.java index 205ed1f..3782c20 100644 --- a/src/main/java/blocks/BlockLigniteOre.java +++ b/src/main/java/blocks/BlockLigniteOre.java @@ -1,7 +1,16 @@ package blocks; import blocks.category.BasicBlockOre; +import main.ZCompression; import net.minecraft.block.material.Material; +import net.minecraft.block.state.IBlockState; +import net.minecraft.item.Item; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.MathHelper; +import net.minecraft.world.IBlockAccess; +import net.minecraft.world.World; + +import java.util.Random; public class BlockLigniteOre extends BasicBlockOre { @@ -9,5 +18,23 @@ public class BlockLigniteOre extends BasicBlockOre { super("lignite_ore", Material.ROCK, 4.0f, 5.0f,1); } + @Override + public int getExpDrop(IBlockState state, IBlockAccess world, BlockPos pos, int fortune) { + Random rand = world instanceof World ? ((World) world).rand : new Random(); + int r = RANDOM.nextInt(11); + if(r > 7) { + return MathHelper.getRandomIntegerInRange(rand, 0, 10) + fortune; + } + else return 0; + } + @Override + public int quantityDropped(IBlockState state, int fortune, Random random) { + return MathHelper.getRandomIntegerInRange(random, 1, 3 + fortune); + } + + @Override + public Item getItemDropped(IBlockState state, Random rand, int fortune) { + return ZCompression.lignite; + } } diff --git a/src/main/java/blocks/BlockRottenGround.java b/src/main/java/blocks/BlockRottenGround.java index f8ad605..4b1a57a 100644 --- a/src/main/java/blocks/BlockRottenGround.java +++ b/src/main/java/blocks/BlockRottenGround.java @@ -1,11 +1,13 @@ 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/main/ZCompression.java b/src/main/java/main/ZCompression.java index 1292240..3b3990f 100644 --- a/src/main/java/main/ZCompression.java +++ b/src/main/java/main/ZCompression.java @@ -5,6 +5,8 @@ import blocks.category.BasicBlockOreGlow; import items.ItemLignite; import items.ItemSlagironIngot; import main.util.LigniteFuelHandler; +import main.util.recipes.Crafting; +import main.util.recipes.Smelting; import main.world.ZWorldGen; import net.minecraft.block.Block; import net.minecraft.item.ItemBlock; @@ -97,6 +99,9 @@ public class ZCompression { proxy.registerClientStuff(); GameRegistry.registerWorldGenerator(new ZWorldGen(), 100); GameRegistry.registerFuelHandler(new LigniteFuelHandler()); + new Smelting(); + new Crafting(); + } @EventHandler diff --git a/src/main/java/main/util/recipes/Crafting.java b/src/main/java/main/util/recipes/Crafting.java new file mode 100644 index 0000000..5348a13 --- /dev/null +++ b/src/main/java/main/util/recipes/Crafting.java @@ -0,0 +1,5 @@ +package main.util.recipes; + + +public class Crafting { +} diff --git a/src/main/java/main/util/recipes/Smelting.java b/src/main/java/main/util/recipes/Smelting.java new file mode 100644 index 0000000..1edc948 --- /dev/null +++ b/src/main/java/main/util/recipes/Smelting.java @@ -0,0 +1,18 @@ +package main.util.recipes; + + +import main.ZCompression; +import net.minecraft.init.Items; +import net.minecraft.item.ItemStack; +import net.minecraftforge.fml.common.registry.GameRegistry; + +public class Smelting { + public Smelting(){ + register(); + } + + private void register(){ + GameRegistry.addSmelting(ZCompression.slagironOre, new ItemStack(ZCompression.slagironIngot,2),1.0F); + GameRegistry.addSmelting(ZCompression.slagironIngot, new ItemStack(Items.GOLD_NUGGET),1.0F); + } +}