diff --git a/.gradle/4.5/fileContent/fileContent.lock b/.gradle/4.5/fileContent/fileContent.lock index 99ab6e9..f2fab51 100644 Binary files a/.gradle/4.5/fileContent/fileContent.lock and b/.gradle/4.5/fileContent/fileContent.lock differ diff --git a/.gradle/4.5/fileHashes/fileHashes.bin b/.gradle/4.5/fileHashes/fileHashes.bin index e6b3651..3591c00 100644 Binary files a/.gradle/4.5/fileHashes/fileHashes.bin and b/.gradle/4.5/fileHashes/fileHashes.bin differ diff --git a/.gradle/4.5/fileHashes/fileHashes.lock b/.gradle/4.5/fileHashes/fileHashes.lock index 0129a7a..6d0b083 100644 Binary files a/.gradle/4.5/fileHashes/fileHashes.lock and b/.gradle/4.5/fileHashes/fileHashes.lock differ diff --git a/.gradle/4.5/taskHistory/taskHistory.bin b/.gradle/4.5/taskHistory/taskHistory.bin index ca36642..ca27401 100644 Binary files a/.gradle/4.5/taskHistory/taskHistory.bin and b/.gradle/4.5/taskHistory/taskHistory.bin differ diff --git a/.gradle/4.5/taskHistory/taskHistory.lock b/.gradle/4.5/taskHistory/taskHistory.lock index c2d0daf..44187f6 100644 Binary files a/.gradle/4.5/taskHistory/taskHistory.lock and b/.gradle/4.5/taskHistory/taskHistory.lock differ diff --git a/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/.gradle/buildOutputCleanup/buildOutputCleanup.lock index 09aa901..138002b 100644 Binary files a/.gradle/buildOutputCleanup/buildOutputCleanup.lock and b/.gradle/buildOutputCleanup/buildOutputCleanup.lock differ diff --git a/src/main/java/xyz/ibatv/iba_backblocks/IBA_BackBlocks.java b/src/main/java/xyz/ibatv/iba_backblocks/IBA_BackBlocks.java index d3de861..9468e5a 100644 --- a/src/main/java/xyz/ibatv/iba_backblocks/IBA_BackBlocks.java +++ b/src/main/java/xyz/ibatv/iba_backblocks/IBA_BackBlocks.java @@ -1,24 +1,18 @@ package xyz.ibatv.iba_backblocks; +import cpw.mods.fml.common.eventhandler.SubscribeEvent; import net.minecraft.block.Block; -import net.minecraft.block.BlockFence; -import net.minecraft.block.material.Material; -import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.init.Blocks; -import net.minecraft.init.Items; +import net.minecraft.entity.passive.EntitySheep; import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import xyz.ibatv.iba_backblocks.Register.RegisterBlocks; -import xyz.ibatv.iba_backblocks.items.ItemCopperIngot; -import xyz.ibatv.iba_backblocks.items.ItemRawCopper; +import net.minecraftforge.event.entity.living.LivingDropsEvent; +import xyz.ibatv.iba_backblocks.Register.Register; import cpw.mods.fml.common.Mod; import cpw.mods.fml.common.Mod.EventHandler; -import cpw.mods.fml.common.Mod.Metadata; -import cpw.mods.fml.common.ModMetadata; import cpw.mods.fml.common.event.FMLInitializationEvent; import cpw.mods.fml.common.event.FMLPostInitializationEvent; import cpw.mods.fml.common.event.FMLPreInitializationEvent; import cpw.mods.fml.common.registry.GameRegistry; +import xyz.ibatv.iba_backblocks.items.Minecraft1_8_Items; @Mod(modid = IBA_BackBlocks.MODID, name = "IBA Back-Blocks", version = IBA_BackBlocks.VERSION) public class IBA_BackBlocks { @@ -31,11 +25,14 @@ public class IBA_BackBlocks { public void preInit(FMLPreInitializationEvent event) { //item / block init and registering //config handling - RegisterBlocks.mc18Ore(); - RegisterBlocks.mc18logs(); - RegisterBlocks.fences(); - RegisterBlocks.newSandStone(); - RegisterBlocks.initSlimeBlock(); + Register.mc18Ore(); + Register.mc18logs(); + Register.fences(); + Register.newSandStone(); + Register.initSlimeBlock(); + Register.initMutton(); + Register.initRabbit(); + Minecraft1_8_Items.items(); } @@ -50,15 +47,41 @@ public class IBA_BackBlocks { //GameRegistry.addRecipe(new ItemStack(TestMod.blockCopperBlock), new Object[] {"CCC","CCC","CCC", 'C', TestMod.itemCopperIngot}); //Copper Block //GameRegistry.addRecipe(new ItemStack(TestMod.blockRawCopper), new Object[] {"CCC","CCC","CCC", 'C', TestMod.itemRawCopper}); //Raw Copper Block } - + @EventHandler public void postInit(FMLPostInitializationEvent event) { } + + @SubscribeEvent + public void onLivingDrops(LivingDropsEvent event) + { + if (event.entityLiving instanceof EntitySheep + && Register.mutton_cooked != null + && Register.mutton_raw != null) + { + // 50/50 drop 1-2 + // TODO. more with looting + + int drops = 1 + event.entity.worldObj.rand.nextInt(2);// this gets num in range [0,1] + + if (event.entityLiving.isBurning()) + event.entityLiving.dropItem(Register.mutton_cooked, drops); + else + event.entityLiving.dropItem(Register.mutton_raw, drops); + } + } + public static void registerBlockHelper(Block s, String name) { s.setBlockName(name).setBlockTextureName("iba_backblocks:" + name); GameRegistry.registerBlock(s, name); } + + public static void registerItemHelper(Item s, String name) + { + s.setUnlocalizedName(name).setTextureName("iba_backblocks:" + name); + GameRegistry.registerItem(s, name); + } } diff --git a/src/main/java/xyz/ibatv/iba_backblocks/Register/RegisterBlocks.java b/src/main/java/xyz/ibatv/iba_backblocks/Register/Register.java similarity index 88% rename from src/main/java/xyz/ibatv/iba_backblocks/Register/RegisterBlocks.java rename to src/main/java/xyz/ibatv/iba_backblocks/Register/Register.java index 218784e..3bec8ec 100644 --- a/src/main/java/xyz/ibatv/iba_backblocks/Register/RegisterBlocks.java +++ b/src/main/java/xyz/ibatv/iba_backblocks/Register/Register.java @@ -5,6 +5,7 @@ import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.init.Items; +import net.minecraft.item.ItemFood; import net.minecraft.item.ItemStack; import xyz.ibatv.iba_backblocks.*; import xyz.ibatv.iba_backblocks.blocks.mc18.BlockRedSandstone; @@ -15,7 +16,7 @@ import xyz.ibatv.iba_backblocks.blocks.mc18.logs.*; import xyz.ibatv.iba_backblocks.init.InitBlocks; -public class RegisterBlocks { +public class Register { public static void mc18Ore() { @@ -118,4 +119,36 @@ public class RegisterBlocks { GameRegistry.addShapelessRecipe(new ItemStack(Items.slime_ball, 9), slime); } + public static ItemFood mutton_raw; + public static ItemFood mutton_cooked; + + public static void initMutton() + { + mutton_raw = new ItemFood(2, false); + + IBA_BackBlocks.registerItemHelper(mutton_raw, "mutton_raw") ; + + mutton_cooked = new ItemFood(6, false); + + IBA_BackBlocks.registerItemHelper(mutton_cooked, "mutton_cooked") ; + + GameRegistry.addSmelting(mutton_raw, new ItemStack(mutton_cooked, 1), 0); + } + + + public static ItemFood rabbit_raw; + public static ItemFood rabbit_cooked; + public static void initRabbit() + { + rabbit_raw = new ItemFood(2, false); + + IBA_BackBlocks.registerItemHelper(rabbit_raw, "rabbit_raw") ; + + rabbit_cooked = new ItemFood(6, false); + + IBA_BackBlocks.registerItemHelper(rabbit_cooked, "rabbit_cooked") ; + + GameRegistry.addSmelting(rabbit_raw, new ItemStack(rabbit_cooked, 1), 0); + } + } \ No newline at end of file diff --git a/src/main/java/xyz/ibatv/iba_backblocks/items/ItemPrismarineCrystals.java b/src/main/java/xyz/ibatv/iba_backblocks/items/ItemPrismarineCrystals.java new file mode 100644 index 0000000..8116607 --- /dev/null +++ b/src/main/java/xyz/ibatv/iba_backblocks/items/ItemPrismarineCrystals.java @@ -0,0 +1,7 @@ +package xyz.ibatv.iba_backblocks.items; + +import net.minecraft.item.Item; + +public class ItemPrismarineCrystals extends Item { + +} diff --git a/src/main/java/xyz/ibatv/iba_backblocks/items/ItemPrismarineShard.java b/src/main/java/xyz/ibatv/iba_backblocks/items/ItemPrismarineShard.java new file mode 100644 index 0000000..3b9148a --- /dev/null +++ b/src/main/java/xyz/ibatv/iba_backblocks/items/ItemPrismarineShard.java @@ -0,0 +1,7 @@ +package xyz.ibatv.iba_backblocks.items; + +import net.minecraft.item.Item; + +public class ItemPrismarineShard extends Item { + +} diff --git a/src/main/java/xyz/ibatv/iba_backblocks/items/Minecraft1_8_Items.java b/src/main/java/xyz/ibatv/iba_backblocks/items/Minecraft1_8_Items.java index b11f07a..731d113 100644 --- a/src/main/java/xyz/ibatv/iba_backblocks/items/Minecraft1_8_Items.java +++ b/src/main/java/xyz/ibatv/iba_backblocks/items/Minecraft1_8_Items.java @@ -2,16 +2,30 @@ package xyz.ibatv.iba_backblocks.items; import cpw.mods.fml.common.registry.GameRegistry; import net.minecraft.item.Item; +import xyz.ibatv.iba_backblocks.IBA_BackBlocks; public class Minecraft1_8_Items { public static Item itemCopperIngot; public static Item itemRawCopper; - + + + static Item itemPrismarineCrystals; + static Item itemPrismarineShard; + public static void items() { - - itemCopperIngot = new ItemCopperIngot().setUnlocalizedName("copper_ingot").setTextureName("testmod:copper_ingot"); - itemRawCopper = new ItemRawCopper().setUnlocalizedName("raw_copper").setTextureName("testmod:raw_copper"); + + + itemPrismarineCrystals = new ItemPrismarineCrystals().setUnlocalizedName("prismarine_crystals").setTextureName("iba_backblocks:prismarine_crystals"); + IBA_BackBlocks.registerItemHelper(itemPrismarineCrystals, "prismarine_crystals"); + + itemPrismarineShard = new ItemPrismarineShard().setUnlocalizedName("prismarine_shard").setTextureName("iba_backblocks:prismarine_shard"); + IBA_BackBlocks.registerItemHelper(itemPrismarineShard, "prismarine_shard"); + + + + itemCopperIngot = new ItemCopperIngot().setUnlocalizedName("copper_ingot").setTextureName("iba_backblocks:copper_ingot"); + itemRawCopper = new ItemRawCopper().setUnlocalizedName("raw_copper").setTextureName("iba_backblocks:raw_copper"); GameRegistry.registerItem(itemCopperIngot, itemCopperIngot.getUnlocalizedName().substring(5)); GameRegistry.registerItem(itemRawCopper, itemRawCopper.getUnlocalizedName().substring(5)); diff --git a/src/main/resources/assets/iba_backblocks/lang/en_US.lang b/src/main/resources/assets/iba_backblocks/lang/en_US.lang index 23369ce..ee99e43 100644 --- a/src/main/resources/assets/iba_backblocks/lang/en_US.lang +++ b/src/main/resources/assets/iba_backblocks/lang/en_US.lang @@ -77,4 +77,16 @@ tile.log2.cherry.name=Cherry Log //NewNew logs 2 tile.log3.bamboo.name=Block of Bamboo -tile.log3.pale_oak.name=Pale Oak \ No newline at end of file +tile.log3.pale_oak.name=Pale Oak + + + + + + +//Items + +item.rabbit_raw.name=Raw Rabbit +item.rabbit_cooked.name=Cooked Rabbit +item.mutton_raw.name=Raw Mutton +item.mutton_cooked.name=Cooked Mutton \ No newline at end of file