diff --git a/src/main/java/minestrapteam/minestrappolation/Minestrappolation.java b/src/main/java/minestrapteam/minestrappolation/Minestrappolation.java index 6cdfeac4..6206aeba 100644 --- a/src/main/java/minestrapteam/minestrappolation/Minestrappolation.java +++ b/src/main/java/minestrapteam/minestrappolation/Minestrappolation.java @@ -45,6 +45,7 @@ public class Minestrappolation extends BaseMod public static MelterRecipeLoader melter = new MelterRecipeLoader("melter"); + public static OreBase stone = new OreBase("stone").setIconName(MAssetManager.getStonecutterTexture("stone")).register(OreBase.TYPE_OVERWORLD, 0); public static OreBase deepStone = new OreBase("deepstone").setIconName(MAssetManager.getStonecutterTexture("deepstone")).register(OreBase.TYPE_OVERWORLD, 5); public static OreBase redrock = new OreBase("redrock").setIconName(MAssetManager.getStonecutterTexture("redrock")).register(OreBase.TYPE_OVERWORLD, 6); public static OreBase deepRedrock = new OreBase("deepredrock").setIconName(MAssetManager.getStonecutterTexture("deepredrock")).register(OreBase.TYPE_OVERWORLD, 7); diff --git a/src/main/java/minestrapteam/minestrappolation/block/BlockPlutoniumOre.java b/src/main/java/minestrapteam/minestrappolation/block/BlockPlutoniumOre.java index 67744c7f..fa19132f 100644 --- a/src/main/java/minestrapteam/minestrappolation/block/BlockPlutoniumOre.java +++ b/src/main/java/minestrapteam/minestrappolation/block/BlockPlutoniumOre.java @@ -17,11 +17,11 @@ import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; -public class BlockPlutoniumOre extends BlockRadiation +public class BlockPlutoniumOre extends BlockRadiationOre { - public BlockPlutoniumOre(Material material) + public BlockPlutoniumOre() { - super(material); + } @Override diff --git a/src/main/java/minestrapteam/minestrappolation/block/BlockRadiationOre.java b/src/main/java/minestrapteam/minestrappolation/block/BlockRadiationOre.java new file mode 100644 index 00000000..f912b93f --- /dev/null +++ b/src/main/java/minestrapteam/minestrappolation/block/BlockRadiationOre.java @@ -0,0 +1,49 @@ +package minestrapteam.minestrappolation.block; + +import java.util.List; +import java.util.Random; + +import clashsoft.cslib.minecraft.block.ore.BlockOre2; +import clashsoft.cslib.minecraft.block.ore.OreBase; + +import net.minecraft.block.Block; +import net.minecraft.block.material.Material; +import net.minecraft.entity.EntityLivingBase; +import net.minecraft.util.AxisAlignedBB; +import net.minecraft.world.World; + +public abstract class BlockRadiationOre extends BlockOre2 +{ + protected BlockRadiationOre() + { + super(OreBase.TYPE_OVERWORLD); + } + + @Override + public void onBlockAdded(World random, int x, int y, int z) + { + random.scheduleBlockUpdate(x, y, z, this, 1); + } + + @Override + public void updateTick(World world, int x, int y, int z, Random random) + { + if (!world.isRemote) + { + world.scheduleBlockUpdate(x, y, z, this, 1); + + float range = this.getRange(); + AxisAlignedBB axisalignedbb = this.getCollisionBoundingBoxFromPool(world, x, y, z).expand(range, range, range); + List list = world.getEntitiesWithinAABB(EntityLivingBase.class, axisalignedbb); + + for (EntityLivingBase living : list) + { + this.addPotionEffect(living); + } + } + } + + public abstract void addPotionEffect(EntityLivingBase living); + + public abstract float getRange(); +} diff --git a/src/main/java/minestrapteam/minestrappolation/block/BlockUraniumOre.java b/src/main/java/minestrapteam/minestrappolation/block/BlockUraniumOre.java index 1bbae0f7..c8b980a6 100644 --- a/src/main/java/minestrapteam/minestrappolation/block/BlockUraniumOre.java +++ b/src/main/java/minestrapteam/minestrappolation/block/BlockUraniumOre.java @@ -2,6 +2,8 @@ import java.util.Random; +import clashsoft.cslib.minecraft.block.ore.OreBase; + import minestrapteam.minestrappolation.Minestrappolation; import minestrapteam.minestrappolation.lib.MItems; import minestrapteam.minestrappolation.util.MUtil; @@ -16,11 +18,11 @@ import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; -public class BlockUraniumOre extends BlockRadiation +public class BlockUraniumOre extends BlockRadiationOre { - public BlockUraniumOre(Material material) + public BlockUraniumOre() { - super(material); + } @Override diff --git a/src/main/java/minestrapteam/minestrappolation/block/MBlockOre.java b/src/main/java/minestrapteam/minestrappolation/block/MBlockOre.java index 26e4abf5..38b7e725 100644 --- a/src/main/java/minestrapteam/minestrappolation/block/MBlockOre.java +++ b/src/main/java/minestrapteam/minestrappolation/block/MBlockOre.java @@ -2,6 +2,9 @@ import java.util.Random; +import clashsoft.cslib.minecraft.block.ore.BlockOre2; +import clashsoft.cslib.minecraft.block.ore.OreBase; + import minestrapteam.minestrappolation.lib.MBlocks; import minestrapteam.minestrappolation.lib.MItems; @@ -11,11 +14,11 @@ import net.minecraft.world.IBlockAccess; // FIXME extends BlockOre2 -public class MBlockOre extends Block +public class MBlockOre extends BlockOre2 { public MBlockOre() { - super(Material.rock); + super(OreBase.TYPE_OVERWORLD); } @Override @@ -43,6 +46,12 @@ else if (this == MBlocks.radiantQuartzOre) return Item.getItemFromBlock(this); } + @Override + public int damageDropped(int metadata) + { + return metadata; + } + @Override protected boolean canSilkHarvest() { diff --git a/src/main/java/minestrapteam/minestrappolation/crafting/stonecutter/StonecuttingManager.java b/src/main/java/minestrapteam/minestrappolation/crafting/stonecutter/StonecuttingManager.java index d4e257a1..d1624976 100644 --- a/src/main/java/minestrapteam/minestrappolation/crafting/stonecutter/StonecuttingManager.java +++ b/src/main/java/minestrapteam/minestrappolation/crafting/stonecutter/StonecuttingManager.java @@ -256,6 +256,28 @@ private StonecuttingManager() this.addRecipe(new ItemStack(MBlocks.stoneSteelStairsCracked, 9, 0), new ItemStack(MItems.plateSteelItem, 1, 0), stoneCrackedStairs); this.addRecipe(new ItemStack(MBlocks.stoneMeuroditeStairsCracked, 9, 0), new ItemStack(MItems.plateMeuroditeItem, 1, 0), stoneCrackedStairs); + // Deepstone Decor + this.addRecipe(new ItemStack(MItems.brickDeepstone, 4, 0), null, new Object[] { "S", 'S', new ItemStack(MBlocks.deepstone, 1, 0) }); + this.addRecipe(new ItemStack(MBlocks.deepstone, 1, 1), null, new Object[] { "BB", "BB", 'B', MItems.brickDeepstone }); + this.addRecipe(new ItemStack(MBlocks.deepstone, 2, 2), null, new Object[] { "BBB", "BBB", "BBB", 'B', MItems.brickDeepstone }); + this.addRecipe(new ItemStack(MBlocks.deepstone, 4, 3), null, new Object[] { "RR", "RR", 'R', new ItemStack(MBlocks.deepstone, 1, 5) }); + this.addRecipe(new ItemStack(MBlocks.deepstone, 3, 4), null, new Object[] { "BBB", "BBB", "DDD", 'B', MItems.brickDeepstone, 'D', new ItemStack(Blocks.dirt, 1, 0) }); + this.addRecipe(new ItemStack(MBlocks.deepstone, 9, 5), null, new Object[] { "SSS", "SSS", "SSS", 'S', new ItemStack(MBlocks.deepstone, 1, 0) }); + this.addRecipe(new ItemStack(MBlocks.deepstone, 1, 6), null, new Object[] { "S", "S", 'S', new ItemStack(MBlocks.deepstone2, 1, 12) }); + this.addRecipe(new ItemStack(MBlocks.deepstone, 9, 8), new ItemStack(MItems.mossLump, 1, 0), new Object[] { "SSS", "SSS", "SSS", 'S', new ItemStack(MBlocks.deepstone, 1, 7) }); + this.addRecipe(new ItemStack(MBlocks.deepstone, 9, 10), new ItemStack(MItems.mossLump, 1, 0), new Object[] { "SSS", "SSS", "SSS", 'S', new ItemStack(MBlocks.deepstone, 1, 1) }); + this.addRecipe(new ItemStack(MBlocks.deepstone, 8, 14), null, new Object[] { "CCC", "CGC", "CCC", 'C', new ItemStack(MBlocks.deepstone, 1, 6), 'G', Blocks.glowstone }); + this.addRecipe(new ItemStack(MBlocks.deepstone, 8, 15), null, new Object[] { "CCC", "CSC", "CCC", 'C', new ItemStack(MBlocks.deepstone, 1, 6), 'S', MBlocks.sunstoneBlock }); + this.addRecipe(new ItemStack(MBlocks.deepstone2, 2, 0), null, new Object[] { "R", "R", 'R', new ItemStack(MBlocks.deepstone, 1, 5) }); + this.addRecipe(new ItemStack(MBlocks.deepstone2, 6, 3), null, new Object[] { "SSS", 'S', new ItemStack(MBlocks.deepstone, 1, 0) }); + this.addRecipe(new ItemStack(MBlocks.deepstone2, 6, 6), null, new Object[] { "SSS", 'S', new ItemStack(MBlocks.deepstone, 1, 1) }); + this.addRecipe(new ItemStack(MBlocks.deepstone2, 6, 9), null, new Object[] { "TTT", 'T', new ItemStack(MBlocks.deepstone, 1, 3) }); + this.addRecipe(new ItemStack(MBlocks.deepstone2, 6, 12), null, new Object[] { "RRR", 'R', new ItemStack(MBlocks.deepstone, 1, 5) }); + this.addRecipe(new ItemStack(MBlocks.deepstoneStairsRaw, 4, 0), null, new Object[] { "M ", "MM ", "MMM", 'M', new ItemStack(MBlocks.deepstone, 1, 0) }); + this.addRecipe(new ItemStack(MBlocks.deepstoneStairsBricks, 4, 0), null, new Object[] { "M ", "MM ", "MMM", 'M', new ItemStack(MBlocks.deepstone, 1, 1) }); + this.addRecipe(new ItemStack(MBlocks.deepstoneStairsTiles, 4, 0), null, new Object[] { "M ", "MM ", "MMM", 'M', new ItemStack(MBlocks.deepstone, 1, 3) }); + this.addRecipe(new ItemStack(MBlocks.deepstoneStairsCracked, 4, 0), null, new Object[] { "M ", "MM ", "MMM", 'M', new ItemStack(MBlocks.deepstone, 1, 7) }); + // Redrock Decor this.addRecipe(new ItemStack(MItems.brickRedrock, 4, 0), null, new Object[] { "S", 'S', new ItemStack(MBlocks.redrock, 1, 0) }); this.addRecipe(new ItemStack(MBlocks.redrock, 1, 1), null, new Object[] { "BB", "BB", 'B', MItems.brickRedrock }); @@ -264,8 +286,8 @@ private StonecuttingManager() this.addRecipe(new ItemStack(MBlocks.redrock, 3, 4), null, new Object[] { "BBB", "BBB", "DDD", 'B', MItems.brickRedrock, 'D', new ItemStack(Blocks.dirt, 1, 0) }); this.addRecipe(new ItemStack(MBlocks.redrock, 9, 5), null, new Object[] { "SSS", "SSS", "SSS", 'S', new ItemStack(MBlocks.redrock, 1, 0) }); this.addRecipe(new ItemStack(MBlocks.redrock, 1, 6), null, new Object[] { "S", "S", 'S', new ItemStack(MBlocks.redrock2, 1, 12) }); - this.addRecipe(new ItemStack(MBlocks.redrock, 1, 8), new ItemStack(MItems.mossLump, 1, 0), new Object[] { "SSS", "SSS", "SSS", 'S', new ItemStack(MBlocks.redrock, 1, 7) }); - this.addRecipe(new ItemStack(MBlocks.redrock, 1, 10), new ItemStack(MItems.mossLump, 1, 0), new Object[] { "SSS", "SSS", "SSS", 'S', new ItemStack(MBlocks.redrock, 1, 1) }); + this.addRecipe(new ItemStack(MBlocks.redrock, 9, 8), new ItemStack(MItems.mossLump, 1, 0), new Object[] { "SSS", "SSS", "SSS", 'S', new ItemStack(MBlocks.redrock, 1, 7) }); + this.addRecipe(new ItemStack(MBlocks.redrock, 9, 10), new ItemStack(MItems.mossLump, 1, 0), new Object[] { "SSS", "SSS", "SSS", 'S', new ItemStack(MBlocks.redrock, 1, 1) }); this.addRecipe(new ItemStack(MBlocks.redrock, 8, 14), null, new Object[] { "CCC", "CGC", "CCC", 'C', new ItemStack(MBlocks.redrock, 1, 6), 'G', Blocks.glowstone }); this.addRecipe(new ItemStack(MBlocks.redrock, 8, 15), null, new Object[] { "CCC", "CSC", "CCC", 'C', new ItemStack(MBlocks.redrock, 1, 6), 'S', MBlocks.sunstoneBlock }); this.addRecipe(new ItemStack(MBlocks.redrock2, 2, 0), null, new Object[] { "R", "R", 'R', new ItemStack(MBlocks.redrock, 1, 5) }); @@ -276,6 +298,7 @@ private StonecuttingManager() this.addRecipe(new ItemStack(MBlocks.redrockStairsRaw, 4, 0), null, new Object[] { "M ", "MM ", "MMM", 'M', new ItemStack(MBlocks.redrock, 1, 0) }); this.addRecipe(new ItemStack(MBlocks.redrockStairsBricks, 4, 0), null, new Object[] { "M ", "MM ", "MMM", 'M', new ItemStack(MBlocks.redrock, 1, 1) }); this.addRecipe(new ItemStack(MBlocks.redrockStairsTiles, 4, 0), null, new Object[] { "M ", "MM ", "MMM", 'M', new ItemStack(MBlocks.redrock, 1, 3) }); + this.addRecipe(new ItemStack(MBlocks.redrockStairsCracked, 4, 0), null, new Object[] { "M ", "MM ", "MMM", 'M', new ItemStack(MBlocks.redrock, 1, 7) }); // Deep Redrock Decor this.addRecipe(new ItemStack(MItems.brickDeepRedrock, 4, 0), null, new Object[] { "S", 'S', new ItemStack(MBlocks.deepRedrock, 1, 0) }); @@ -285,8 +308,8 @@ private StonecuttingManager() this.addRecipe(new ItemStack(MBlocks.deepRedrock, 3, 4), null, new Object[] { "BBB", "BBB", "DDD", 'B', MItems.brickDeepRedrock, 'D', new ItemStack(Blocks.dirt, 1, 0) }); this.addRecipe(new ItemStack(MBlocks.deepRedrock, 9, 5), null, new Object[] { "SSS", "SSS", "SSS", 'S', new ItemStack(MBlocks.deepRedrock, 1, 0) }); this.addRecipe(new ItemStack(MBlocks.deepRedrock, 1, 6), null, new Object[] { "S", "S", 'S', new ItemStack(MBlocks.deepRedrock2, 1, 12) }); - this.addRecipe(new ItemStack(MBlocks.deepRedrock, 1, 8), new ItemStack(MItems.mossLump, 1, 0), new Object[] { "SSS", "SSS", "SSS", 'S', new ItemStack(MBlocks.deepRedrock, 1, 7) }); - this.addRecipe(new ItemStack(MBlocks.deepRedrock, 1, 10), new ItemStack(MItems.mossLump, 1, 0), new Object[] { "SSS", "SSS", "SSS", 'S', new ItemStack(MBlocks.deepRedrock, 1, 1) }); + this.addRecipe(new ItemStack(MBlocks.deepRedrock, 9, 8), new ItemStack(MItems.mossLump, 1, 0), new Object[] { "SSS", "SSS", "SSS", 'S', new ItemStack(MBlocks.deepRedrock, 1, 7) }); + this.addRecipe(new ItemStack(MBlocks.deepRedrock, 9, 10), new ItemStack(MItems.mossLump, 1, 0), new Object[] { "SSS", "SSS", "SSS", 'S', new ItemStack(MBlocks.deepRedrock, 1, 1) }); this.addRecipe(new ItemStack(MBlocks.deepRedrock, 8, 14), null, new Object[] { "CCC", "CGC", "CCC", 'C', new ItemStack(MBlocks.deepRedrock, 1, 6), 'G', Blocks.glowstone }); this.addRecipe(new ItemStack(MBlocks.deepRedrock, 8, 15), null, new Object[] { "CCC", "CSC", "CCC", 'C', new ItemStack(MBlocks.deepRedrock, 1, 6), 'S', MBlocks.sunstoneBlock }); this.addRecipe(new ItemStack(MBlocks.deepRedrock2, 2, 0), null, new Object[] { "R", "R", 'R', new ItemStack(MBlocks.deepRedrock, 1, 5) }); @@ -297,6 +320,7 @@ private StonecuttingManager() this.addRecipe(new ItemStack(MBlocks.deepRedrockStairsRaw, 4, 0), null, new Object[] { "M ", "MM ", "MMM", 'M', new ItemStack(MBlocks.deepRedrock, 1, 0) }); this.addRecipe(new ItemStack(MBlocks.deepRedrockStairsBricks, 4, 0), null, new Object[] { "M ", "MM ", "MMM", 'M', new ItemStack(MBlocks.deepRedrock, 1, 1) }); this.addRecipe(new ItemStack(MBlocks.deepRedrockStairsTiles, 4, 0), null, new Object[] { "M ", "MM ", "MMM", 'M', new ItemStack(MBlocks.deepRedrock, 1, 3) }); + this.addRecipe(new ItemStack(MBlocks.deepRedrockStairsCracked, 4, 0), null, new Object[] { "M ", "MM ", "MMM", 'M', new ItemStack(MBlocks.deepRedrock, 1, 7) }); // Coldstone Decor this.addRecipe(new ItemStack(MItems.brickColdstone, 4, 0), null, new Object[] { "S", 'S', new ItemStack(MBlocks.coldstone, 1, 0) }); @@ -306,8 +330,8 @@ private StonecuttingManager() this.addRecipe(new ItemStack(MBlocks.coldstone, 3, 4), null, new Object[] { "BBB", "BBB", "DDD", 'B', MItems.brickColdstone, 'D', new ItemStack(Blocks.dirt, 1, 0) }); this.addRecipe(new ItemStack(MBlocks.coldstone, 9, 5), null, new Object[] { "SSS", "SSS", "SSS", 'S', new ItemStack(MBlocks.coldstone, 1, 0) }); this.addRecipe(new ItemStack(MBlocks.coldstone, 1, 6), null, new Object[] { "S", "S", 'S', new ItemStack(MBlocks.coldstone2, 1, 12) }); - this.addRecipe(new ItemStack(MBlocks.coldstone, 1, 8), new ItemStack(MItems.mossLump, 1, 0), new Object[] { "SSS", "SSS", "SSS", 'S', new ItemStack(MBlocks.coldstone, 1, 7) }); - this.addRecipe(new ItemStack(MBlocks.coldstone, 1, 10), new ItemStack(MItems.mossLump, 1, 0), new Object[] { "SSS", "SSS", "SSS", 'S', new ItemStack(MBlocks.coldstone, 1, 1) }); + this.addRecipe(new ItemStack(MBlocks.coldstone, 9, 8), new ItemStack(MItems.mossLump, 1, 0), new Object[] { "SSS", "SSS", "SSS", 'S', new ItemStack(MBlocks.coldstone, 1, 7) }); + this.addRecipe(new ItemStack(MBlocks.coldstone, 9, 10), new ItemStack(MItems.mossLump, 1, 0), new Object[] { "SSS", "SSS", "SSS", 'S', new ItemStack(MBlocks.coldstone, 1, 1) }); this.addRecipe(new ItemStack(MBlocks.coldstone, 8, 14), null, new Object[] { "CCC", "CGC", "CCC", 'C', new ItemStack(MBlocks.coldstone, 1, 6), 'G', Blocks.glowstone }); this.addRecipe(new ItemStack(MBlocks.coldstone, 8, 15), null, new Object[] { "CCC", "CSC", "CCC", 'C', new ItemStack(MBlocks.coldstone, 1, 6), 'S', MBlocks.sunstoneBlock }); this.addRecipe(new ItemStack(MBlocks.coldstone2, 2, 0), null, new Object[] { "R", "R", 'R', new ItemStack(MBlocks.coldstone, 1, 5) }); @@ -318,6 +342,7 @@ private StonecuttingManager() this.addRecipe(new ItemStack(MBlocks.coldstoneStairsRaw, 4, 0), null, new Object[] { "M ", "MM ", "MMM", 'M', new ItemStack(MBlocks.coldstone, 1, 0) }); this.addRecipe(new ItemStack(MBlocks.coldstoneStairsBricks, 4, 0), null, new Object[] { "M ", "MM ", "MMM", 'M', new ItemStack(MBlocks.coldstone, 1, 1) }); this.addRecipe(new ItemStack(MBlocks.coldstoneStairsTiles, 4, 0), null, new Object[] { "M ", "MM ", "MMM", 'M', new ItemStack(MBlocks.coldstone, 1, 3) }); + this.addRecipe(new ItemStack(MBlocks.coldstoneStairsCracked, 4, 0), null, new Object[] { "M ", "MM ", "MMM", 'M', new ItemStack(MBlocks.coldstone, 1, 7) }); // Deep Coldstone Decor this.addRecipe(new ItemStack(MItems.brickDeepColdstone, 4, 0), null, new Object[] { "S", 'S', new ItemStack(MBlocks.deepColdstone, 1, 0) }); @@ -327,8 +352,8 @@ private StonecuttingManager() this.addRecipe(new ItemStack(MBlocks.deepColdstone, 3, 4), null, new Object[] { "BBB", "BBB", "DDD", 'B', MItems.brickDeepColdstone, 'D', new ItemStack(Blocks.dirt, 1, 0) }); this.addRecipe(new ItemStack(MBlocks.deepColdstone, 9, 5), null, new Object[] { "SSS", "SSS", "SSS", 'S', new ItemStack(MBlocks.deepColdstone, 1, 0) }); this.addRecipe(new ItemStack(MBlocks.deepColdstone, 1, 6), null, new Object[] { "S", "S", 'S', new ItemStack(MBlocks.deepColdstone2, 1, 12) }); - this.addRecipe(new ItemStack(MBlocks.deepColdstone, 1, 8), new ItemStack(MItems.mossLump, 1, 0), new Object[] { "SSS", "SSS", "SSS", 'S', new ItemStack(MBlocks.deepColdstone, 1, 7) }); - this.addRecipe(new ItemStack(MBlocks.deepColdstone, 1, 10), new ItemStack(MItems.mossLump, 1, 0), new Object[] { "SSS", "SSS", "SSS", 'S', new ItemStack(MBlocks.deepColdstone, 1, 1) }); + this.addRecipe(new ItemStack(MBlocks.deepColdstone, 9, 8), new ItemStack(MItems.mossLump, 1, 0), new Object[] { "SSS", "SSS", "SSS", 'S', new ItemStack(MBlocks.deepColdstone, 1, 7) }); + this.addRecipe(new ItemStack(MBlocks.deepColdstone, 9, 10), new ItemStack(MItems.mossLump, 1, 0), new Object[] { "SSS", "SSS", "SSS", 'S', new ItemStack(MBlocks.deepColdstone, 1, 1) }); this.addRecipe(new ItemStack(MBlocks.deepColdstone, 8, 14), null, new Object[] { "CCC", "CGC", "CCC", 'C', new ItemStack(MBlocks.deepColdstone, 1, 6), 'G', Blocks.glowstone }); this.addRecipe(new ItemStack(MBlocks.deepColdstone, 8, 15), null, new Object[] { "CCC", "CSC", "CCC", 'C', new ItemStack(MBlocks.deepColdstone, 1, 6), 'S', MBlocks.sunstoneBlock }); this.addRecipe(new ItemStack(MBlocks.deepColdstone2, 2, 0), null, new Object[] { "R", "R", 'R', new ItemStack(MBlocks.deepColdstone, 1, 5) }); @@ -339,6 +364,7 @@ private StonecuttingManager() this.addRecipe(new ItemStack(MBlocks.deepColdstoneStairsRaw, 4, 0), null, new Object[] { "M ", "MM ", "MMM", 'M', new ItemStack(MBlocks.deepColdstone, 1, 0) }); this.addRecipe(new ItemStack(MBlocks.deepColdstoneStairsBricks, 4, 0), null, new Object[] { "M ", "MM ", "MMM", 'M', new ItemStack(MBlocks.deepColdstone, 1, 1) }); this.addRecipe(new ItemStack(MBlocks.deepColdstoneStairsTiles, 4, 0), null, new Object[] { "M ", "MM ", "MMM", 'M', new ItemStack(MBlocks.deepColdstone, 1, 3) }); + this.addRecipe(new ItemStack(MBlocks.deepColdstoneStairsCracked, 4, 0), null, new Object[] { "M ", "MM ", "MMM", 'M', new ItemStack(MBlocks.deepColdstone, 1, 7) }); // Icestone Decor this.addRecipe(new ItemStack(MItems.brickIcestone, 4, 0), null, new Object[] { "S", 'S', new ItemStack(MBlocks.icestone, 1, 0) }); @@ -348,8 +374,8 @@ private StonecuttingManager() this.addRecipe(new ItemStack(MBlocks.icestone, 3, 4), null, new Object[] { "BBB", "BBB", "DDD", 'B', MItems.brickIcestone, 'D', new ItemStack(Blocks.snow, 1, 0) }); this.addRecipe(new ItemStack(MBlocks.icestone, 9, 5), null, new Object[] { "SSS", "SSS", "SSS", 'S', new ItemStack(MBlocks.icestone, 1, 0) }); this.addRecipe(new ItemStack(MBlocks.icestone, 1, 6), null, new Object[] { "S", "S", 'S', new ItemStack(MBlocks.icestone2, 1, 12) }); - this.addRecipe(new ItemStack(MBlocks.icestone, 1, 8), new ItemStack(Items.water_bucket, 1, 0), new Object[] { "SSS", "SSS", "SSS", 'S', new ItemStack(MBlocks.icestone, 1, 7) }); - this.addRecipe(new ItemStack(MBlocks.icestone, 1, 10), new ItemStack(Items.water_bucket, 1, 0), new Object[] { "SSS", "SSS", "SSS", 'S', new ItemStack(MBlocks.icestone, 1, 1) }); + this.addRecipe(new ItemStack(MBlocks.icestone, 9, 8), new ItemStack(Items.water_bucket, 1, 0), new Object[] { "SSS", "SSS", "SSS", 'S', new ItemStack(MBlocks.icestone, 1, 7) }); + this.addRecipe(new ItemStack(MBlocks.icestone, 9, 10), new ItemStack(Items.water_bucket, 1, 0), new Object[] { "SSS", "SSS", "SSS", 'S', new ItemStack(MBlocks.icestone, 1, 1) }); this.addRecipe(new ItemStack(MBlocks.icestone, 8, 14), null, new Object[] { "CCC", "CGC", "CCC", 'C', new ItemStack(MBlocks.icestone, 1, 6), 'G', Blocks.glowstone }); this.addRecipe(new ItemStack(MBlocks.icestone, 8, 15), null, new Object[] { "CCC", "CSC", "CCC", 'C', new ItemStack(MBlocks.icestone, 1, 6), 'S', MBlocks.sunstoneBlock }); this.addRecipe(new ItemStack(MBlocks.icestone2, 2, 0), null, new Object[] { "R", "R", 'R', new ItemStack(MBlocks.icestone, 1, 5) }); @@ -360,6 +386,7 @@ private StonecuttingManager() this.addRecipe(new ItemStack(MBlocks.icestoneStairsRaw, 4, 0), null, new Object[] { "M ", "MM ", "MMM", 'M', new ItemStack(MBlocks.icestone, 1, 0) }); this.addRecipe(new ItemStack(MBlocks.icestoneStairsBricks, 4, 0), null, new Object[] { "M ", "MM ", "MMM", 'M', new ItemStack(MBlocks.icestone, 1, 1) }); this.addRecipe(new ItemStack(MBlocks.icestoneStairsTiles, 4, 0), null, new Object[] { "M ", "MM ", "MMM", 'M', new ItemStack(MBlocks.icestone, 1, 3) }); + this.addRecipe(new ItemStack(MBlocks.icestoneStairsCracked, 4, 0), null, new Object[] { "M ", "MM ", "MMM", 'M', new ItemStack(MBlocks.icestone, 1, 7) }); // Glacierrock Decor this.addRecipe(new ItemStack(MItems.brickGlacierrock, 4, 0), null, new Object[] { "S", 'S', new ItemStack(MBlocks.glacierrock, 1, 0) }); @@ -369,8 +396,8 @@ private StonecuttingManager() this.addRecipe(new ItemStack(MBlocks.glacierrock, 3, 4), null, new Object[] { "BBB", "BBB", "DDD", 'B', MItems.brickGlacierrock, 'D', new ItemStack(Blocks.snow, 1, 0) }); this.addRecipe(new ItemStack(MBlocks.glacierrock, 9, 5), null, new Object[] { "SSS", "SSS", "SSS", 'S', new ItemStack(MBlocks.glacierrock, 1, 0) }); this.addRecipe(new ItemStack(MBlocks.glacierrock, 1, 6), null, new Object[] { "S", "S", 'S', new ItemStack(MBlocks.glacierrock2, 1, 12) }); - this.addRecipe(new ItemStack(MBlocks.glacierrock, 1, 8), new ItemStack(Items.water_bucket, 1, 0), new Object[] { "SSS", "SSS", "SSS", 'S', new ItemStack(MBlocks.glacierrock, 1, 7) }); - this.addRecipe(new ItemStack(MBlocks.glacierrock, 1, 10), new ItemStack(Items.water_bucket, 1, 0), new Object[] { "SSS", "SSS", "SSS", 'S', new ItemStack(MBlocks.glacierrock, 1, 1) }); + this.addRecipe(new ItemStack(MBlocks.glacierrock, 9, 8), new ItemStack(Items.water_bucket, 1, 0), new Object[] { "SSS", "SSS", "SSS", 'S', new ItemStack(MBlocks.glacierrock, 1, 7) }); + this.addRecipe(new ItemStack(MBlocks.glacierrock, 9, 10), new ItemStack(Items.water_bucket, 1, 0), new Object[] { "SSS", "SSS", "SSS", 'S', new ItemStack(MBlocks.glacierrock, 1, 1) }); this.addRecipe(new ItemStack(MBlocks.glacierrock, 8, 14), null, new Object[] { "CCC", "CGC", "CCC", 'C', new ItemStack(MBlocks.glacierrock, 1, 6), 'G', Blocks.glowstone }); this.addRecipe(new ItemStack(MBlocks.glacierrock, 8, 15), null, new Object[] { "CCC", "CSC", "CCC", 'C', new ItemStack(MBlocks.glacierrock, 1, 6), 'S', MBlocks.sunstoneBlock }); this.addRecipe(new ItemStack(MBlocks.glacierrock2, 2, 0), null, new Object[] { "R", "R", 'R', new ItemStack(MBlocks.glacierrock, 1, 5) }); @@ -381,6 +408,7 @@ private StonecuttingManager() this.addRecipe(new ItemStack(MBlocks.glacierrockStairsRaw, 4, 0), null, new Object[] { "M ", "MM ", "MMM", 'M', new ItemStack(MBlocks.glacierrock, 1, 0) }); this.addRecipe(new ItemStack(MBlocks.glacierrockStairsBricks, 4, 0), null, new Object[] { "M ", "MM ", "MMM", 'M', new ItemStack(MBlocks.glacierrock, 1, 1) }); this.addRecipe(new ItemStack(MBlocks.glacierrockStairsTiles, 4, 0), null, new Object[] { "M ", "MM ", "MMM", 'M', new ItemStack(MBlocks.glacierrock, 1, 3) }); + this.addRecipe(new ItemStack(MBlocks.glacierrockStairsCracked, 4, 0), null, new Object[] { "M ", "MM ", "MMM", 'M', new ItemStack(MBlocks.glacierrock, 1, 7) }); // Oceanstone Decor this.addRecipe(new ItemStack(MItems.brickOceanstone, 4, 0), null, new Object[] { "S", 'S', new ItemStack(MBlocks.oceanstone, 1, 0) }); @@ -390,8 +418,8 @@ private StonecuttingManager() this.addRecipe(new ItemStack(MBlocks.oceanstone, 3, 4), null, new Object[] { "BBB", "BBB", "DDD", 'B', MItems.brickOceanstone, 'D', new ItemStack(Blocks.sand, 1, 0) }); this.addRecipe(new ItemStack(MBlocks.oceanstone, 9, 5), null, new Object[] { "SSS", "SSS", "SSS", 'S', new ItemStack(MBlocks.oceanstone, 1, 0) }); this.addRecipe(new ItemStack(MBlocks.oceanstone, 1, 6), null, new Object[] { "S", "S", 'S', new ItemStack(MBlocks.oceanstone2, 1, 12) }); - this.addRecipe(new ItemStack(MBlocks.oceanstone, 1, 8), new ItemStack(MItems.mossLump, 1, 0), new Object[] { "SSS", "SSS", "SSS", 'S', new ItemStack(MBlocks.oceanstone, 1, 7) }); - this.addRecipe(new ItemStack(MBlocks.oceanstone, 1, 10), new ItemStack(MItems.mossLump, 1, 0), new Object[] { "SSS", "SSS", "SSS", 'S', new ItemStack(MBlocks.oceanstone, 1, 1) }); + this.addRecipe(new ItemStack(MBlocks.oceanstone, 9, 8), new ItemStack(MItems.mossLump, 1, 0), new Object[] { "SSS", "SSS", "SSS", 'S', new ItemStack(MBlocks.oceanstone, 1, 7) }); + this.addRecipe(new ItemStack(MBlocks.oceanstone, 9, 10), new ItemStack(MItems.mossLump, 1, 0), new Object[] { "SSS", "SSS", "SSS", 'S', new ItemStack(MBlocks.oceanstone, 1, 1) }); this.addRecipe(new ItemStack(MBlocks.oceanstone, 8, 14), null, new Object[] { "CCC", "CGC", "CCC", 'C', new ItemStack(MBlocks.oceanstone, 1, 6), 'G', Blocks.glowstone }); this.addRecipe(new ItemStack(MBlocks.oceanstone, 8, 15), null, new Object[] { "CCC", "CSC", "CCC", 'C', new ItemStack(MBlocks.oceanstone, 1, 6), 'S', MBlocks.sunstoneBlock }); this.addRecipe(new ItemStack(MBlocks.oceanstone2, 2, 0), null, new Object[] { "R", "R", 'R', new ItemStack(MBlocks.oceanstone, 1, 5) }); @@ -402,17 +430,18 @@ private StonecuttingManager() this.addRecipe(new ItemStack(MBlocks.oceanstoneStairsRaw, 4, 0), null, new Object[] { "M ", "MM ", "MMM", 'M', new ItemStack(MBlocks.oceanstone, 1, 0) }); this.addRecipe(new ItemStack(MBlocks.oceanstoneStairsBricks, 4, 0), null, new Object[] { "M ", "MM ", "MMM", 'M', new ItemStack(MBlocks.oceanstone, 1, 1) }); this.addRecipe(new ItemStack(MBlocks.oceanstoneStairsTiles, 4, 0), null, new Object[] { "M ", "MM ", "MMM", 'M', new ItemStack(MBlocks.oceanstone, 1, 3) }); + this.addRecipe(new ItemStack(MBlocks.oceanstoneStairsCracked, 4, 0), null, new Object[] { "M ", "MM ", "MMM", 'M', new ItemStack(MBlocks.oceanstone, 1, 7) }); - // Oceanstone Decor - this.addRecipe(new ItemStack(MItems.brickOceanstone, 4, 0), null, new Object[] { "S", 'S', new ItemStack(MBlocks.pressurizedOceanstone, 1, 0) }); + // Pressurized Oceanstone Decor + this.addRecipe(new ItemStack(MItems.brickPressurizedOceanstone, 4, 0), null, new Object[] { "S", 'S', new ItemStack(MBlocks.pressurizedOceanstone, 1, 0) }); this.addRecipe(new ItemStack(MBlocks.pressurizedOceanstone, 1, 1), null, new Object[] { "BB", "BB", 'B', MItems.brickPressurizedOceanstone }); this.addRecipe(new ItemStack(MBlocks.pressurizedOceanstone, 2, 2), null, new Object[] { "BBB", "BBB", "BBB", 'B', MItems.brickPressurizedOceanstone }); this.addRecipe(new ItemStack(MBlocks.pressurizedOceanstone, 4, 3), null, new Object[] { "RR", "RR", 'R', new ItemStack(MBlocks.pressurizedOceanstone, 1, 5) }); this.addRecipe(new ItemStack(MBlocks.pressurizedOceanstone, 3, 4), null, new Object[] { "BBB", "BBB", "DDD", 'B', MItems.brickPressurizedOceanstone, 'D', new ItemStack(Blocks.sand, 1, 0) }); this.addRecipe(new ItemStack(MBlocks.pressurizedOceanstone, 9, 5), null, new Object[] { "SSS", "SSS", "SSS", 'S', new ItemStack(MBlocks.pressurizedOceanstone, 1, 0) }); this.addRecipe(new ItemStack(MBlocks.pressurizedOceanstone, 1, 6), null, new Object[] { "S", "S", 'S', new ItemStack(MBlocks.pressurizedOceanstone2, 1, 12) }); - this.addRecipe(new ItemStack(MBlocks.pressurizedOceanstone, 1, 8), new ItemStack(MItems.mossLump, 1, 0), new Object[] { "SSS", "SSS", "SSS", 'S', new ItemStack(MBlocks.pressurizedOceanstone, 1, 7) }); - this.addRecipe(new ItemStack(MBlocks.pressurizedOceanstone, 1, 10), new ItemStack(MItems.mossLump, 1, 0), new Object[] { "SSS", "SSS", "SSS", 'S', new ItemStack(MBlocks.pressurizedOceanstone, 1, 1) }); + this.addRecipe(new ItemStack(MBlocks.pressurizedOceanstone, 9, 8), new ItemStack(MItems.mossLump, 1, 0), new Object[] { "SSS", "SSS", "SSS", 'S', new ItemStack(MBlocks.pressurizedOceanstone, 1, 7) }); + this.addRecipe(new ItemStack(MBlocks.pressurizedOceanstone, 9, 10), new ItemStack(MItems.mossLump, 1, 0), new Object[] { "SSS", "SSS", "SSS", 'S', new ItemStack(MBlocks.pressurizedOceanstone, 1, 1) }); this.addRecipe(new ItemStack(MBlocks.pressurizedOceanstone, 8, 14), null, new Object[] { "CCC", "CGC", "CCC", 'C', new ItemStack(MBlocks.pressurizedOceanstone, 1, 6), 'G', Blocks.glowstone }); this.addRecipe(new ItemStack(MBlocks.pressurizedOceanstone, 8, 15), null, new Object[] { "CCC", "CSC", "CCC", 'C', new ItemStack(MBlocks.pressurizedOceanstone, 1, 6), 'S', MBlocks.sunstoneBlock }); this.addRecipe(new ItemStack(MBlocks.pressurizedOceanstone2, 2, 0), null, new Object[] { "R", "R", 'R', new ItemStack(MBlocks.pressurizedOceanstone, 1, 5) }); @@ -423,6 +452,7 @@ private StonecuttingManager() this.addRecipe(new ItemStack(MBlocks.pressurizedOceanstoneStairsRaw, 4, 0), null, new Object[] { "M ", "MM ", "MMM", 'M', new ItemStack(MBlocks.pressurizedOceanstone, 1, 0) }); this.addRecipe(new ItemStack(MBlocks.pressurizedOceanstoneStairsBricks, 4, 0), null, new Object[] { "M ", "MM ", "MMM", 'M', new ItemStack(MBlocks.pressurizedOceanstone, 1, 1) }); this.addRecipe(new ItemStack(MBlocks.pressurizedOceanstoneStairsTiles, 4, 0), null, new Object[] { "M ", "MM ", "MMM", 'M', new ItemStack(MBlocks.pressurizedOceanstone, 1, 3) }); + this.addRecipe(new ItemStack(MBlocks.pressurizedOceanstoneStairsCracked, 4, 0), null, new Object[] { "M ", "MM ", "MMM", 'M', new ItemStack(MBlocks.pressurizedOceanstone, 1, 7) }); // Sandstone Decor this.addRecipe(new ItemStack(MItems.brickSandstone, 4, 0), null, new Object[] { "S", 'S', new ItemStack(Blocks.sandstone, 1, 0) }); diff --git a/src/main/java/minestrapteam/minestrappolation/lib/MBlocks.java b/src/main/java/minestrapteam/minestrappolation/lib/MBlocks.java index 50c878ab..facfbf80 100644 --- a/src/main/java/minestrapteam/minestrappolation/lib/MBlocks.java +++ b/src/main/java/minestrapteam/minestrappolation/lib/MBlocks.java @@ -56,54 +56,63 @@ public class MBlocks public static Block deepstoneStairsRaw; public static Block deepstoneStairsBricks; public static Block deepstoneStairsTiles; + public static Block deepstoneStairsCracked; public static Block deepstone2; public static MBlockCustom redrock; public static Block redrockStairsRaw; public static Block redrockStairsBricks; public static Block redrockStairsTiles; + public static Block redrockStairsCracked; public static Block redrock2; public static MBlockCustom deepRedrock; public static Block deepRedrockStairsRaw; public static Block deepRedrockStairsBricks; public static Block deepRedrockStairsTiles; + public static Block deepRedrockStairsCracked; public static Block deepRedrock2; public static MBlockCustom coldstone; public static Block coldstoneStairsRaw; public static Block coldstoneStairsBricks; public static Block coldstoneStairsTiles; + public static Block coldstoneStairsCracked; public static Block coldstone2; public static MBlockCustom deepColdstone; public static Block deepColdstoneStairsRaw; public static Block deepColdstoneStairsBricks; public static Block deepColdstoneStairsTiles; + public static Block deepColdstoneStairsCracked; public static Block deepColdstone2; public static MBlockCustom icestone; public static Block icestoneStairsRaw; public static Block icestoneStairsBricks; public static Block icestoneStairsTiles; + public static Block icestoneStairsCracked; public static Block icestone2; public static MBlockCustom glacierrock; public static Block glacierrockStairsRaw; public static Block glacierrockStairsBricks; public static Block glacierrockStairsTiles; + public static Block glacierrockStairsCracked; public static Block glacierrock2; public static MBlockCustom oceanstone; public static Block oceanstoneStairsRaw; public static Block oceanstoneStairsBricks; public static Block oceanstoneStairsTiles; + public static Block oceanstoneStairsCracked; public static Block oceanstone2; public static MBlockCustom pressurizedOceanstone; public static Block pressurizedOceanstoneStairsRaw; public static Block pressurizedOceanstoneStairsBricks; public static Block pressurizedOceanstoneStairsTiles; + public static Block pressurizedOceanstoneStairsCracked; public static Block pressurizedOceanstone2; public static MBlockCustom graniteSlate; @@ -401,8 +410,8 @@ public static void init() copperOre = new MBlockOre().setHardness(3F).setResistance(5F).setStepSound(Block.soundTypeStone).setCreativeTab(Minestrappolation.tabBuildingBlocks).setBlockTextureName(MAssetManager.getMineralTexture("copper_ore")); tinOre = new MBlockOre().setHardness(3F).setResistance(4F).setStepSound(Block.soundTypeStone).setCreativeTab(Minestrappolation.tabBuildingBlocks).setBlockTextureName(MAssetManager.getMineralTexture("tin_ore")); titaniumOre = new MBlockOre().setHardness(6F).setResistance(6000000.0F).setStepSound(Block.soundTypeStone).setCreativeTab(Minestrappolation.tabBuildingBlocks).setBlockTextureName(MAssetManager.getMineralTexture("titanium_ore")); - uraniumOre = new BlockUraniumOre(Material.rock).setHardness(3F).setResistance(5F).setStepSound(Block.soundTypeStone).setCreativeTab(Minestrappolation.tabBuildingBlocks).setBlockTextureName(MAssetManager.getMineralTexture("uranium_ore")); - plutoniumOre = new BlockPlutoniumOre(Material.rock).setHardness(3F).setResistance(5F).setStepSound(Block.soundTypeStone).setCreativeTab(Minestrappolation.tabBuildingBlocks).setBlockTextureName(MAssetManager.getMineralTexture("plutonium_ore")); + uraniumOre = new BlockUraniumOre().setHardness(3F).setResistance(5F).setStepSound(Block.soundTypeStone).setCreativeTab(Minestrappolation.tabBuildingBlocks).setBlockTextureName(MAssetManager.getMineralTexture("uranium_ore")); + plutoniumOre = new BlockPlutoniumOre().setHardness(3F).setResistance(5F).setStepSound(Block.soundTypeStone).setCreativeTab(Minestrappolation.tabBuildingBlocks).setBlockTextureName(MAssetManager.getMineralTexture("plutonium_ore")); meuroditeOre = new MBlockOre().setHardness(3F).setResistance(5F).setStepSound(Block.soundTypeStone).setCreativeTab(Minestrappolation.tabBuildingBlocks).setBlockTextureName(MAssetManager.getMineralTexture("meurodite_ore")); sunstoneOre = new BlockSunstoneOre().setHardness(3F).setResistance(5F).setStepSound(Block.soundTypeStone).setCreativeTab(Minestrappolation.tabBuildingBlocks).setBlockTextureName(MAssetManager.getMineralTexture("sunstone_ore")); toriteOre = new MBlockOre().setHardness(3F).setResistance(5F).setStepSound(Block.soundTypeStone).setCreativeTab(Minestrappolation.tabBuildingBlocks).setBlockTextureName(MAssetManager.getMineralTexture("torite_ore")); @@ -680,46 +689,55 @@ private static void addStoneBlocks() deepstoneStairsRaw = MBlockHelper.createStoneStair(deepstone, 0, tab); deepstoneStairsBricks = MBlockHelper.createStoneStair(deepstone, 1, tab); deepstoneStairsTiles = MBlockHelper.createStoneStair(deepstone, 3, tab); + deepstoneStairsCracked = MBlockHelper.createStoneStair(deepstone, 7, tab); redrock = MBlockHelper.createStoneBlock(types_redrock, "redrock", 1.1F, 8.0F, 0, tab).setIsStone().setRoadWalkSpeed(1.25F); redrock2 = MBlockHelper.createStoneBlock2(types_redrock_2, "redrock", 1.1F, 8.0F, 0, tab); redrockStairsRaw = MBlockHelper.createStoneStair(redrock, 0, tab); redrockStairsBricks = MBlockHelper.createStoneStair(redrock, 1, tab); redrockStairsTiles = MBlockHelper.createStoneStair(redrock, 3, tab); + redrockStairsCracked = MBlockHelper.createStoneStair(redrock, 7, tab); deepRedrock = MBlockHelper.createStoneBlock(types_redrock, "deepredrock", 2.2F, 11.0F, 2, tab).setIsStone().setRoadWalkSpeed(1.25F); deepRedrock2 = MBlockHelper.createStoneBlock2(types_redrock_2, "deepredrock", 2.2F, 11.0F, 2, tab); deepRedrockStairsRaw = MBlockHelper.createStoneStair(deepRedrock, 0, tab); deepRedrockStairsBricks = MBlockHelper.createStoneStair(deepRedrock, 1, tab); deepRedrockStairsTiles = MBlockHelper.createStoneStair(deepRedrock, 3, tab); + deepRedrockStairsCracked = MBlockHelper.createStoneStair(deepRedrock, 7, tab); coldstone = MBlockHelper.createStoneBlock(types_redrock, "coldstone", 1.5F, 10.0F, 0, tab).setIsStone().setRoadWalkSpeed(1.25F); coldstone2 = MBlockHelper.createStoneBlock2(types_redrock_2, "coldstone", 1.5F, 10.0F, 0, tab); coldstoneStairsRaw = MBlockHelper.createStoneStair(coldstone, 0, tab); coldstoneStairsBricks = MBlockHelper.createStoneStair(coldstone, 1, tab); coldstoneStairsTiles = MBlockHelper.createStoneStair(coldstone, 3, tab); + coldstoneStairsCracked = MBlockHelper.createStoneStair(coldstone, 7, tab); deepColdstone = MBlockHelper.createStoneBlock(types_redrock, "deepcoldstone", 3F, 13.0F, 2, tab).setIsStone().setRoadWalkSpeed(1.25F); deepColdstone2 = MBlockHelper.createStoneBlock2(types_redrock_2, "deepcoldstone", 3F, 13.0F, 2, tab); deepColdstoneStairsRaw = MBlockHelper.createStoneStair(deepColdstone, 0, tab); deepColdstoneStairsBricks = MBlockHelper.createStoneStair(deepColdstone, 1, tab); deepColdstoneStairsTiles = MBlockHelper.createStoneStair(deepColdstone, 3, tab); + deepColdstoneStairsCracked = MBlockHelper.createStoneStair(deepColdstone, 7, tab); icestone = MBlockHelper.createStoneBlock(types_icestone, "icestone", 1.7F, 10.0F, 0, tab).setIsStone().setRoadWalkSpeed(1.25F); icestone2 = MBlockHelper.createStoneBlock2(types_icestone_2, "icestone", 1.7F, 10.0F, 0, tab); icestoneStairsRaw = MBlockHelper.createStoneStair(icestone, 0, tab); icestoneStairsBricks = MBlockHelper.createStoneStair(icestone, 1, tab); icestoneStairsTiles = MBlockHelper.createStoneStair(icestone, 3, tab); + icestoneStairsCracked = MBlockHelper.createStoneStair(icestone, 7, tab); glacierrock = MBlockHelper.createStoneBlock(types_icestone, "glacierrock", 3.4F, 13.0F, 2, tab).setIsStone().setRoadWalkSpeed(1.25F); glacierrock2 = MBlockHelper.createStoneBlock2(types_icestone_2, "glacierrock", 3.4F, 13.0F, 2, tab); glacierrockStairsRaw = MBlockHelper.createStoneStair(glacierrock, 0, tab); glacierrockStairsBricks = MBlockHelper.createStoneStair(glacierrock, 1, tab); glacierrockStairsTiles = MBlockHelper.createStoneStair(glacierrock, 3, tab); + glacierrockStairsCracked = MBlockHelper.createStoneStair(glacierrock, 7, tab); oceanstone = MBlockHelper.createStoneBlock(types_redrock, "oceanstone", 1.3F, 12.0F, 0, tab).setIsStone().setRoadWalkSpeed(1.25F); oceanstone2 = MBlockHelper.createStoneBlock2(types_redrock_2, "oceanstone", 1.3F, 12.0F, 0, tab); oceanstoneStairsRaw = MBlockHelper.createStoneStair(oceanstone, 0, tab); oceanstoneStairsBricks = MBlockHelper.createStoneStair(oceanstone, 1, tab); oceanstoneStairsTiles = MBlockHelper.createStoneStair(oceanstone, 3, tab); + oceanstoneStairsCracked = MBlockHelper.createStoneStair(oceanstone, 7, tab); pressurizedOceanstone = MBlockHelper.createStoneBlock(types_redrock, "pressurizedoceanstone", 2.6F, 15.0F, 2, tab).setIsStone().setRoadWalkSpeed(1.25F); pressurizedOceanstone2 = MBlockHelper.createStoneBlock2(types_redrock_2, "pressurizedoceanstone", 2.6F, 15.0F, 2, tab); pressurizedOceanstoneStairsRaw = MBlockHelper.createStoneStair(pressurizedOceanstone, 0, tab); pressurizedOceanstoneStairsBricks = MBlockHelper.createStoneStair(pressurizedOceanstone, 1, tab); pressurizedOceanstoneStairsTiles = MBlockHelper.createStoneStair(pressurizedOceanstone, 3, tab); + pressurizedOceanstoneStairsCracked = MBlockHelper.createStoneStair(pressurizedOceanstone, 7, tab); graniteSlate = MBlockHelper.createStoneBlock(types_granite, "granite", 2F, 15.0F, 0, tab).setRoadWalkSpeed(1.33F); graniteSlate2 = MBlockHelper.createStoneBlock2("granite", 2F, 15.0F, 0, tab); diff --git a/src/main/java/minestrapteam/minestrappolation/world/MOreGenerator.java b/src/main/java/minestrapteam/minestrappolation/world/MOreGenerator.java index 2936a95d..309fcf3f 100644 --- a/src/main/java/minestrapteam/minestrappolation/world/MOreGenerator.java +++ b/src/main/java/minestrapteam/minestrappolation/world/MOreGenerator.java @@ -8,6 +8,7 @@ import minestrapteam.minestrappolation.world.gen.WorldGenDesertQuartz; import minestrapteam.minestrappolation.world.gen.WorldGenRedSandstone; import minestrapteam.minestrappolation.world.gen.WorldGenRedWoodTreeSmall; +import minestrapteam.minestrappolation.world.gen.WorldGenStructureStone; import net.minecraft.block.Block; import net.minecraft.init.Blocks; @@ -41,6 +42,7 @@ public class MOreGenerator implements IWorldGenerator public static WorldGenMinable sandstoneGen = new WorldGenMinable(MBlocks.sandstone, 6, 7, Blocks.sandstone); public static WorldGenMinable sandstoneGen2 = new WorldGenMinable(MBlocks.sandstone, 7, 7, Blocks.sandstone); public static WorldGenRedSandstone redSandstoneGen = new WorldGenRedSandstone(); + public static WorldGenStructureStone stoneStructureGen = new WorldGenStructureStone(); public static WorldGenDesertQuartz desertQuartzGen = new WorldGenDesertQuartz(); public static WorldGenMinable blaziumGen = new WorldGenMinable(MBlocks.blaziumOre, 8, Blocks.netherrack); public static WorldGenMinable soulOreGen = new WorldGenMinable(MBlocks.soulOre, 15, Blocks.soul_sand); @@ -172,7 +174,7 @@ public void generateSurface(World world, Random rand, int chunkX, int chunkZ) } // Sunstone Ore - for (int i = 0; i < 10; i++) + for (int i = 0; i < 15; i++) { x1 = chunkX + rand.nextInt(16); y1 = rand.nextInt(256); @@ -204,6 +206,14 @@ public void generateSurface(World world, Random rand, int chunkX, int chunkZ) } } + //Structure Gen + + x1 = chunkX + rand.nextInt(16); + y1 = rand.nextInt(256); + z1 = chunkZ + rand.nextInt(16); + stoneStructureGen.generate(world, rand, x1, y1, z1); + + // Red Sandstone if (biome instanceof BiomeGenMesa) { diff --git a/src/main/java/minestrapteam/minestrappolation/world/gen/WorldGenStructureStone.java b/src/main/java/minestrapteam/minestrappolation/world/gen/WorldGenStructureStone.java new file mode 100644 index 00000000..19d6ac68 --- /dev/null +++ b/src/main/java/minestrapteam/minestrappolation/world/gen/WorldGenStructureStone.java @@ -0,0 +1,145 @@ +package minestrapteam.minestrappolation.world.gen; + +import java.util.Random; + +import minestrapteam.minestrappolation.lib.MBlocks; + +import net.minecraft.init.Blocks; +import net.minecraft.item.ItemStack; +import net.minecraft.world.World; +import net.minecraft.world.biome.BiomeGenBase; +import net.minecraft.world.biome.WorldChunkManager; +import net.minecraft.world.biome.BiomeGenBase.TempCategory; +import net.minecraft.world.chunk.Chunk; +import net.minecraft.world.gen.feature.WorldGenerator; + +public class WorldGenStructureStone extends WorldGenerator +{ + @Override + public boolean generate(World world, Random rand, int chunkX, int y, int chunkZ) + { + Chunk chunk = world.getChunkFromBlockCoords(chunkX, chunkZ); + WorldChunkManager chunkManager = world.getWorldChunkManager(); + for (int x0 = 0; x0 < 16; x0++) + { + int x2 = chunkX + x0; + for (int z0 = 0; z0 < 16; z0++) + { + int z2 = chunkZ + z0; + for (int y2 = 0; y2 < 256; y2++) + { + BiomeGenBase biome = chunk.getBiomeGenForWorldCoords(x0, z0, chunkManager); + if(biome.temperature < 0.2F) + { + if (world.getBlock(x2, y2, z2) == Blocks.cobblestone && world.getBlockMetadata(x2, y2, z2) == 0) + { + world.setBlock(x2, y2, z2, MBlocks.icestone, 7, 2); + } + if (world.getBlock(x2, y2, z2) == Blocks.mossy_cobblestone && world.getBlockMetadata(x2, y2, z2) == 0) + { + world.setBlock(x2, y2, z2, MBlocks.icestone, 8, 2); + } + if (world.getBlock(x2, y2, z2) == Blocks.stonebrick && world.getBlockMetadata(x2, y2, z2) == 0) + { + world.setBlock(x2, y2, z2, MBlocks.icestone, 1, 2); + } + if (world.getBlock(x2, y2, z2) == Blocks.stonebrick && world.getBlockMetadata(x2, y2, z2) == 1) + { + world.setBlock(x2, y2, z2, MBlocks.icestone, 10, 2); + } + if (world.getBlock(x2, y2, z2) == Blocks.stonebrick && world.getBlockMetadata(x2, y2, z2) == 2) + { + world.setBlock(x2, y2, z2, MBlocks.icestone, 9, 2); + } + if (world.getBlock(x2, y2, z2) == Blocks.stonebrick && world.getBlockMetadata(x2, y2, z2) == 3) + { + world.setBlock(x2, y2, z2, MBlocks.icestone, 6, 2); + } + } + else if(biome.temperature < 0.4F) + { + if (world.getBlock(x2, y2, z2) == Blocks.cobblestone && world.getBlockMetadata(x2, y2, z2) == 0) + { + world.setBlock(x2, y2, z2, MBlocks.coldstone, 7, 2); + } + if (world.getBlock(x2, y2, z2) == Blocks.mossy_cobblestone && world.getBlockMetadata(x2, y2, z2) == 0) + { + world.setBlock(x2, y2, z2, MBlocks.coldstone, 8, 2); + } + if (world.getBlock(x2, y2, z2) == Blocks.stonebrick && world.getBlockMetadata(x2, y2, z2) == 0) + { + world.setBlock(x2, y2, z2, MBlocks.coldstone, 1, 2); + } + if (world.getBlock(x2, y2, z2) == Blocks.stonebrick && world.getBlockMetadata(x2, y2, z2) == 1) + { + world.setBlock(x2, y2, z2, MBlocks.coldstone, 10, 2); + } + if (world.getBlock(x2, y2, z2) == Blocks.stonebrick && world.getBlockMetadata(x2, y2, z2) == 2) + { + world.setBlock(x2, y2, z2, MBlocks.coldstone, 9, 2); + } + if (world.getBlock(x2, y2, z2) == Blocks.stonebrick && world.getBlockMetadata(x2, y2, z2) == 3) + { + world.setBlock(x2, y2, z2, MBlocks.coldstone, 6, 2); + } + } + else if(biome.getTempCategory() == TempCategory.OCEAN) + { + if (world.getBlock(x2, y2, z2) == Blocks.cobblestone && world.getBlockMetadata(x2, y2, z2) == 0) + { + world.setBlock(x2, y2, z2, MBlocks.oceanstone, 7, 2); + } + if (world.getBlock(x2, y2, z2) == Blocks.mossy_cobblestone && world.getBlockMetadata(x2, y2, z2) == 0) + { + world.setBlock(x2, y2, z2, MBlocks.oceanstone, 8, 2); + } + if (world.getBlock(x2, y2, z2) == Blocks.stonebrick && world.getBlockMetadata(x2, y2, z2) == 0) + { + world.setBlock(x2, y2, z2, MBlocks.oceanstone, 1, 2); + } + if (world.getBlock(x2, y2, z2) == Blocks.stonebrick && world.getBlockMetadata(x2, y2, z2) == 1) + { + world.setBlock(x2, y2, z2, MBlocks.oceanstone, 10, 2); + } + if (world.getBlock(x2, y2, z2) == Blocks.stonebrick && world.getBlockMetadata(x2, y2, z2) == 2) + { + world.setBlock(x2, y2, z2, MBlocks.oceanstone, 9, 2); + } + if (world.getBlock(x2, y2, z2) == Blocks.stonebrick && world.getBlockMetadata(x2, y2, z2) == 3) + { + world.setBlock(x2, y2, z2, MBlocks.oceanstone, 6, 2); + } + } + else if(biome.temperature >= 1.0F) + { + if (world.getBlock(x2, y2, z2) == Blocks.cobblestone && world.getBlockMetadata(x2, y2, z2) == 0) + { + world.setBlock(x2, y2, z2, MBlocks.redrock, 7, 2); + } + if (world.getBlock(x2, y2, z2) == Blocks.mossy_cobblestone && world.getBlockMetadata(x2, y2, z2) == 0) + { + world.setBlock(x2, y2, z2, MBlocks.redrock, 8, 2); + } + if (world.getBlock(x2, y2, z2) == Blocks.stonebrick && world.getBlockMetadata(x2, y2, z2) == 0) + { + world.setBlock(x2, y2, z2, MBlocks.redrock, 1, 2); + } + if (world.getBlock(x2, y2, z2) == Blocks.stonebrick && world.getBlockMetadata(x2, y2, z2) == 1) + { + world.setBlock(x2, y2, z2, MBlocks.redrock, 10, 2); + } + if (world.getBlock(x2, y2, z2) == Blocks.stonebrick && world.getBlockMetadata(x2, y2, z2) == 2) + { + world.setBlock(x2, y2, z2, MBlocks.redrock, 9, 2); + } + if (world.getBlock(x2, y2, z2) == Blocks.stonebrick && world.getBlockMetadata(x2, y2, z2) == 3) + { + world.setBlock(x2, y2, z2, MBlocks.redrock, 6, 2); + } + } + } + } + } + return true; + } +} \ No newline at end of file diff --git a/src/main/resources/assets/minestrappolation/textures/blocks/minerals/copper_ore.png b/src/main/resources/assets/minestrappolation/textures/blocks/minerals/copper_ore.png index 9bb727ec..9cecef33 100644 Binary files a/src/main/resources/assets/minestrappolation/textures/blocks/minerals/copper_ore.png and b/src/main/resources/assets/minestrappolation/textures/blocks/minerals/copper_ore.png differ diff --git a/src/main/resources/assets/minestrappolation/textures/blocks/minerals/meurodite_ore.png b/src/main/resources/assets/minestrappolation/textures/blocks/minerals/meurodite_ore.png index 8f731e3e..29774848 100644 Binary files a/src/main/resources/assets/minestrappolation/textures/blocks/minerals/meurodite_ore.png and b/src/main/resources/assets/minestrappolation/textures/blocks/minerals/meurodite_ore.png differ diff --git a/src/main/resources/assets/minestrappolation/textures/blocks/minerals/plutonium_ore.png b/src/main/resources/assets/minestrappolation/textures/blocks/minerals/plutonium_ore.png index 8d1a5ae9..b8200471 100644 Binary files a/src/main/resources/assets/minestrappolation/textures/blocks/minerals/plutonium_ore.png and b/src/main/resources/assets/minestrappolation/textures/blocks/minerals/plutonium_ore.png differ diff --git a/src/main/resources/assets/minestrappolation/textures/blocks/minerals/radiant_quartz_ore.png b/src/main/resources/assets/minestrappolation/textures/blocks/minerals/radiant_quartz_ore.png index bb0dbf86..19a8cc36 100644 Binary files a/src/main/resources/assets/minestrappolation/textures/blocks/minerals/radiant_quartz_ore.png and b/src/main/resources/assets/minestrappolation/textures/blocks/minerals/radiant_quartz_ore.png differ diff --git a/src/main/resources/assets/minestrappolation/textures/blocks/minerals/silver_ore.png b/src/main/resources/assets/minestrappolation/textures/blocks/minerals/silver_ore.png index 09c2bcd5..751a7e66 100644 Binary files a/src/main/resources/assets/minestrappolation/textures/blocks/minerals/silver_ore.png and b/src/main/resources/assets/minestrappolation/textures/blocks/minerals/silver_ore.png differ diff --git a/src/main/resources/assets/minestrappolation/textures/blocks/minerals/sunstone_ore.png b/src/main/resources/assets/minestrappolation/textures/blocks/minerals/sunstone_ore.png index 82ffad8d..db5c16b0 100644 Binary files a/src/main/resources/assets/minestrappolation/textures/blocks/minerals/sunstone_ore.png and b/src/main/resources/assets/minestrappolation/textures/blocks/minerals/sunstone_ore.png differ diff --git a/src/main/resources/assets/minestrappolation/textures/blocks/minerals/tin_ore.png b/src/main/resources/assets/minestrappolation/textures/blocks/minerals/tin_ore.png index b5edc4c3..4967a3c1 100644 Binary files a/src/main/resources/assets/minestrappolation/textures/blocks/minerals/tin_ore.png and b/src/main/resources/assets/minestrappolation/textures/blocks/minerals/tin_ore.png differ diff --git a/src/main/resources/assets/minestrappolation/textures/blocks/minerals/titanium_ore.png b/src/main/resources/assets/minestrappolation/textures/blocks/minerals/titanium_ore.png index e5fd7c57..02ec3ce4 100644 Binary files a/src/main/resources/assets/minestrappolation/textures/blocks/minerals/titanium_ore.png and b/src/main/resources/assets/minestrappolation/textures/blocks/minerals/titanium_ore.png differ diff --git a/src/main/resources/assets/minestrappolation/textures/blocks/minerals/torite_ore.png b/src/main/resources/assets/minestrappolation/textures/blocks/minerals/torite_ore.png index 95f60cb1..04403427 100644 Binary files a/src/main/resources/assets/minestrappolation/textures/blocks/minerals/torite_ore.png and b/src/main/resources/assets/minestrappolation/textures/blocks/minerals/torite_ore.png differ diff --git a/src/main/resources/assets/minestrappolation/textures/blocks/minerals/uranium_ore.png b/src/main/resources/assets/minestrappolation/textures/blocks/minerals/uranium_ore.png index e781d480..6ad394a5 100644 Binary files a/src/main/resources/assets/minestrappolation/textures/blocks/minerals/uranium_ore.png and b/src/main/resources/assets/minestrappolation/textures/blocks/minerals/uranium_ore.png differ diff --git a/src/main/resources/assets/minestrappolation/textures/blocks/stoneCutter/stone.png b/src/main/resources/assets/minestrappolation/textures/blocks/stoneCutter/stone.png new file mode 100644 index 00000000..b1e041a8 Binary files /dev/null and b/src/main/resources/assets/minestrappolation/textures/blocks/stoneCutter/stone.png differ