diff --git a/src/main/java/headfishindustries/civilisedideas/BlockOre1.java b/src/main/java/headfishindustries/civilisedideas/BlockOre1.java deleted file mode 100644 index 2353d1a..0000000 --- a/src/main/java/headfishindustries/civilisedideas/BlockOre1.java +++ /dev/null @@ -1,20 +0,0 @@ -package headfishindustries.civilisedideas; - -//imports -import cpw.mods.fml.common.Mod; -import cpw.mods.fml.common.Mod.EventHandler; -import cpw.mods.fml.common.Mod.Instance; -import net.minecraft.block.Block; -import net.minecraft.block.material.Material; -import net.minecraft.creativetab.CreativeTabs; - - -public class BlockOre1 extends Block{ - - public BlockOre1() { - super(Material.rock); - setBlockName(CivilisedIdeas.MODID+ "_" + "martianshiny"); - setBlockTextureName(CivilisedIdeas.MODID + ":" + "martianshiny"); - setCreativeTab(CreativeTabs.tabBlock); - } -} diff --git a/src/main/java/headfishindustries/civilisedideas/CivilisedIdeas.java b/src/main/java/headfishindustries/civilisedideas/CivilisedIdeas.java index c93bb11..bd9fb46 100644 --- a/src/main/java/headfishindustries/civilisedideas/CivilisedIdeas.java +++ b/src/main/java/headfishindustries/civilisedideas/CivilisedIdeas.java @@ -8,6 +8,13 @@ import cpw.mods.fml.common.event.FMLPreInitializationEvent; import cpw.mods.fml.common.event.FMLServerStartingEvent; import cpw.mods.fml.common.registry.GameRegistry; +import cpw.mods.fml.common.registry.LanguageRegistry; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import headfishindustries.civilisedideas.block.BlockBonerock; +import headfishindustries.civilisedideas.block.BlockRedrock; +import headfishindustries.civilisedideas.block.BlockSlindWeed; +import headfishindustries.civilisedideas.block.BlockWilliWeed; import headfishindustries.civilisedideas.commands.GetDim; import net.minecraft.block.Block; import net.minecraft.block.material.Material; @@ -25,15 +32,22 @@ public class CivilisedIdeas { @Instance(value = "ci") public static CivilisedIdeas instance; - public static Item itemGrapple; + public static Block blockRedrock = new BlockRedrock(); + public static Block blockBonerock = new BlockBonerock(); + public static Block blockWilliWeed = new BlockWilliWeed(); + public static Block blockSlindWeed = new BlockSlindWeed(); - public static Entity entityGrapple; - - public static Block BlockOre1;{ - BlockOre1 = new BlockOre1(); - GameRegistry.registerBlock(BlockOre1, "BlockOre1"); - } + //public static Item itemGrapple; + //public static Entity entityGrapple; + + public static CreativeTabs hypoTab = new CreativeTabs("Hypovolemia"){ + @Override + @SideOnly(Side.CLIENT) + public Item getTabIconItem() { + return new ItemStack(blockBonerock).getItem(); + } + }; @EventHandler public void serverStarting(FMLServerStartingEvent event){ @@ -45,9 +59,12 @@ public void serverStarting(FMLServerStartingEvent event){ @EventHandler public void preInit(FMLPreInitializationEvent event){ //Block and Item Initialization - itemGrapple = new ItemGrapple(); - + //itemGrapple = new ItemGrapple(); + GameRegistry.registerBlock(blockBonerock, "Bonerock").setCreativeTab(hypoTab); + GameRegistry.registerBlock(blockRedrock, "Redrock").setCreativeTab(hypoTab); + GameRegistry.registerBlock(blockSlindWeed, "SlindWeed").setCreativeTab(hypoTab); + GameRegistry.registerBlock(blockWilliWeed, "WilliWeed").setCreativeTab(hypoTab); } diff --git a/src/main/java/headfishindustries/civilisedideas/block/BlockBonerock.java b/src/main/java/headfishindustries/civilisedideas/block/BlockBonerock.java new file mode 100644 index 0000000..8aa1b6d --- /dev/null +++ b/src/main/java/headfishindustries/civilisedideas/block/BlockBonerock.java @@ -0,0 +1,38 @@ +package headfishindustries.civilisedideas.block; + +import java.util.ArrayList; +import java.util.Random; + +import cpw.mods.fml.common.Mod; +import cpw.mods.fml.common.Mod.Instance; +import headfishindustries.civilisedideas.CivilisedIdeas; +import net.minecraft.block.Block; +import net.minecraft.block.BlockOre; +import net.minecraft.block.material.Material; +import net.minecraft.init.Blocks; +import net.minecraft.init.Items; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.world.World; + +public class BlockBonerock extends BlockOre{ + + public BlockBonerock() { + super(); + this.setHarvestLevel("pickaxe", 1); + setBlockName("ci_rockBone"); + this.setHardness(1.75F); + this.setResistance(12.5F); + setBlockTextureName("ci:rockBone"); + } + + + @Override + public ArrayList getDrops(World world, int x, int y, int z, int meta, int fortune){ + ArrayList drop = new ArrayList(); + drop.add(new ItemStack(Items.skull, world.rand.nextInt(2) + 1 + fortune, 0)); + drop.add(new ItemStack(Items.bone, world.rand.nextInt(4) + 2 + fortune)); + return drop; + } + +} \ No newline at end of file diff --git a/src/main/java/headfishindustries/civilisedideas/block/BlockRedrock.java b/src/main/java/headfishindustries/civilisedideas/block/BlockRedrock.java new file mode 100644 index 0000000..a79cece --- /dev/null +++ b/src/main/java/headfishindustries/civilisedideas/block/BlockRedrock.java @@ -0,0 +1,21 @@ +package headfishindustries.civilisedideas.block; + +import cpw.mods.fml.common.Mod; +import cpw.mods.fml.common.Mod.Instance; +import headfishindustries.civilisedideas.CivilisedIdeas; +import net.minecraft.block.Block; +import net.minecraft.block.material.Material; + +public class BlockRedrock extends Block{ + + public BlockRedrock() { + super(Material.rock); + setBlockName("ci_rockRed"); + setBlockTextureName("ci:rockRed"); + this.setHarvestLevel("pickaxe", 1); + this.setHardness(1.5F); + this.setResistance(10.0F); + this.setStepSound(soundTypeStone); + } + +} diff --git a/src/main/java/headfishindustries/civilisedideas/block/BlockSlindWeed.java b/src/main/java/headfishindustries/civilisedideas/block/BlockSlindWeed.java new file mode 100644 index 0000000..400c0d5 --- /dev/null +++ b/src/main/java/headfishindustries/civilisedideas/block/BlockSlindWeed.java @@ -0,0 +1,46 @@ +package headfishindustries.civilisedideas.block; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import headfishindustries.civilisedideas.CivilisedIdeas; +import net.minecraft.block.Block; +import net.minecraft.block.BlockBush; +import net.minecraft.block.BlockFlower; +import net.minecraft.block.material.Material; +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.init.Blocks; +import net.minecraft.util.AxisAlignedBB; +import net.minecraft.util.IIcon; +import net.minecraft.world.World; + +public class BlockSlindWeed extends BlockBush { + + private IIcon icon; + + public BlockSlindWeed() { + super(Material.plants); + setBlockName("ci_flowerSlindWeed"); + setHardness(0.2F); + setStepSound(soundTypeGrass); + setTickRandomly(false); + setBlockBounds(0.05F, 0.0F, 0.1F, 1.0F, 0.3F, 1.0F); + setBlockTextureName("ci:SlindWeed"); + } + + @SideOnly(Side.CLIENT) + public IIcon getIcon(int par1, int par2){ + return this.icon; + } + + @SideOnly(Side.CLIENT) + public void registerBlockIcons(IIconRegister par1){ + this.icon = par1.registerIcon("ci:slindWeed"); + + } + + @Override + protected boolean canPlaceBlockOn(Block block){ + return block == CivilisedIdeas.blockRedrock || block == CivilisedIdeas.blockBonerock || block == Blocks.grass || block == Blocks.dirt || block == Blocks.farmland; + } + +} diff --git a/src/main/java/headfishindustries/civilisedideas/block/BlockWilliWeed.java b/src/main/java/headfishindustries/civilisedideas/block/BlockWilliWeed.java new file mode 100644 index 0000000..20bd0ed --- /dev/null +++ b/src/main/java/headfishindustries/civilisedideas/block/BlockWilliWeed.java @@ -0,0 +1,45 @@ +package headfishindustries.civilisedideas.block; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import headfishindustries.civilisedideas.CivilisedIdeas; +import net.minecraft.block.Block; +import net.minecraft.block.BlockBush; +import net.minecraft.block.BlockFlower; +import net.minecraft.block.material.Material; +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.init.Blocks; +import net.minecraft.util.IIcon; + +public class BlockWilliWeed extends BlockBush { + + private IIcon icon; + + public BlockWilliWeed() { + super(Material.plants); + setBlockName("ci_flowerWilliWeed"); + setHardness(0.2F); + setStepSound(soundTypeGrass); + setTickRandomly(false); + setBlockBounds(0.1F, 0.0F, 0.1F, 0.9F, 0.8F, 0.9F); + setBlockTextureName("ci:WilliWeed"); + } + + @SideOnly(Side.CLIENT) + public IIcon getIcon(int par1, int par2){ + return this.icon; + } + + @SideOnly(Side.CLIENT) + public void registerBlockIcons(IIconRegister par1){ + this.icon = par1.registerIcon("ci:williWeed"); + + } + + @Override + protected boolean canPlaceBlockOn(Block block){ + return block == CivilisedIdeas.blockRedrock || block == CivilisedIdeas.blockBonerock || block == Blocks.grass || block == Blocks.dirt || block == Blocks.farmland; + } + +} diff --git a/src/main/java/headfishindustries/civilisedideas/commands/GetDim.java b/src/main/java/headfishindustries/civilisedideas/commands/GetDim.java index be231f2..c30ff4b 100644 --- a/src/main/java/headfishindustries/civilisedideas/commands/GetDim.java +++ b/src/main/java/headfishindustries/civilisedideas/commands/GetDim.java @@ -7,6 +7,7 @@ import net.minecraft.command.ICommandSender; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.util.ChatComponentText; +import net.minecraft.util.EnumChatFormatting; public class GetDim extends CommandBase { @Override @@ -43,6 +44,6 @@ public List getCommandAliases(){ @Override public void processCommand(ICommandSender sender, String[] idontneedthis){ EntityPlayer player = getCommandSenderAsPlayer(sender); - player.addChatMessage(new ChatComponentText("You are in dimension number " + player.dimension)); + player.addChatMessage(new ChatComponentText(EnumChatFormatting.DARK_BLUE + "You are in dimension number " + player.dimension)); } } diff --git a/src/main/resources/assets/ci/lang/en_US.lang b/src/main/resources/assets/ci/lang/en_US.lang index e69de29..a9ce839 100644 --- a/src/main/resources/assets/ci/lang/en_US.lang +++ b/src/main/resources/assets/ci/lang/en_US.lang @@ -0,0 +1,5 @@ +tile.ci_rockRed.name=Red Rock +tile.ci_rockBone.name=Bone Rock +tile.ci_flowerWilliWeed.name=Williweed +tile.ci_flowerSlindWeed.name=Slindweed +itemGroup.Hypovolemia=Hypovolemia \ No newline at end of file diff --git a/src/main/resources/assets/ci/textures/blocks/Pizza_Blocks/rockBone.png b/src/main/resources/assets/ci/textures/blocks/Pizza_Blocks/rockBone.png new file mode 100644 index 0000000..efd11d4 Binary files /dev/null and b/src/main/resources/assets/ci/textures/blocks/Pizza_Blocks/rockBone.png differ diff --git a/src/main/resources/assets/ci/textures/blocks/Pizza_Blocks/rockRed.png b/src/main/resources/assets/ci/textures/blocks/Pizza_Blocks/rockRed.png new file mode 100644 index 0000000..ee6ff5a Binary files /dev/null and b/src/main/resources/assets/ci/textures/blocks/Pizza_Blocks/rockRed.png differ diff --git a/src/main/resources/assets/ci/textures/blocks/Pizza_Blocks/slindWeed.png b/src/main/resources/assets/ci/textures/blocks/Pizza_Blocks/slindWeed.png new file mode 100644 index 0000000..8caae17 Binary files /dev/null and b/src/main/resources/assets/ci/textures/blocks/Pizza_Blocks/slindWeed.png differ diff --git a/src/main/resources/assets/ci/textures/blocks/Pizza_Blocks/williWeed.png b/src/main/resources/assets/ci/textures/blocks/Pizza_Blocks/williWeed.png new file mode 100644 index 0000000..1d1adb5 Binary files /dev/null and b/src/main/resources/assets/ci/textures/blocks/Pizza_Blocks/williWeed.png differ diff --git a/src/main/resources/assets/ci/textures/blocks/SlindWeed.png b/src/main/resources/assets/ci/textures/blocks/SlindWeed.png new file mode 100644 index 0000000..8caae17 Binary files /dev/null and b/src/main/resources/assets/ci/textures/blocks/SlindWeed.png differ diff --git a/src/main/resources/assets/ci/textures/blocks/WilliWeed.png b/src/main/resources/assets/ci/textures/blocks/WilliWeed.png new file mode 100644 index 0000000..1d1adb5 Binary files /dev/null and b/src/main/resources/assets/ci/textures/blocks/WilliWeed.png differ diff --git a/src/main/resources/assets/ci/textures/blocks/borkedSlindWeed.png b/src/main/resources/assets/ci/textures/blocks/borkedSlindWeed.png new file mode 100644 index 0000000..bdbc269 Binary files /dev/null and b/src/main/resources/assets/ci/textures/blocks/borkedSlindWeed.png differ diff --git a/src/main/resources/assets/ci/textures/blocks/borkedWilliWeed.png b/src/main/resources/assets/ci/textures/blocks/borkedWilliWeed.png new file mode 100644 index 0000000..6c4fac3 Binary files /dev/null and b/src/main/resources/assets/ci/textures/blocks/borkedWilliWeed.png differ diff --git a/src/main/resources/textures/blocks/martianshiny.png b/src/main/resources/assets/ci/textures/blocks/rockBone.png similarity index 75% rename from src/main/resources/textures/blocks/martianshiny.png rename to src/main/resources/assets/ci/textures/blocks/rockBone.png index edafc38..b5cf2f5 100644 Binary files a/src/main/resources/textures/blocks/martianshiny.png and b/src/main/resources/assets/ci/textures/blocks/rockBone.png differ diff --git a/src/main/resources/assets/ci/textures/blocks/rockRed.png b/src/main/resources/assets/ci/textures/blocks/rockRed.png new file mode 100644 index 0000000..d01b073 Binary files /dev/null and b/src/main/resources/assets/ci/textures/blocks/rockRed.png differ diff --git a/src/main/resources/assets/ci/textures/blocks/slindWeed.png b/src/main/resources/assets/ci/textures/blocks/slindWeed.png new file mode 100644 index 0000000..8caae17 Binary files /dev/null and b/src/main/resources/assets/ci/textures/blocks/slindWeed.png differ diff --git a/src/main/resources/assets/ci/textures/blocks/williWeed.png b/src/main/resources/assets/ci/textures/blocks/williWeed.png new file mode 100644 index 0000000..1d1adb5 Binary files /dev/null and b/src/main/resources/assets/ci/textures/blocks/williWeed.png differ