From 03fa7b2712055793b588671523294d4980b16470 Mon Sep 17 00:00:00 2001 From: WayofTime Date: Thu, 5 May 2016 07:59:08 -0400 Subject: [PATCH] Added plant oil and associated recipes - need to compile a list for future alchemy items --- .../bloodmagic/fuel/FuelHandler.java | 20 ++++++++++++++++++ .../bloodmagic/item/ItemComponent.java | 2 ++ .../bloodmagic/proxy/CommonProxy.java | 15 +++++++------ .../bloodmagic/registry/ModItems.java | 3 ++- .../bloodmagic/registry/ModRecipes.java | 13 +++++++++--- .../blockstates/item/ItemComponent.json | 5 +++++ .../blockstates/item/ItemCuttingFluid.json | 2 +- .../assets/bloodmagic/lang/en_US.lang | 1 + .../bloodmagic/textures/items/PlantOil.png | Bin 0 -> 512 bytes 9 files changed, 50 insertions(+), 11 deletions(-) create mode 100644 src/main/java/WayofTime/bloodmagic/fuel/FuelHandler.java create mode 100644 src/main/resources/assets/bloodmagic/textures/items/PlantOil.png diff --git a/src/main/java/WayofTime/bloodmagic/fuel/FuelHandler.java b/src/main/java/WayofTime/bloodmagic/fuel/FuelHandler.java new file mode 100644 index 00000000..e56aaf6f --- /dev/null +++ b/src/main/java/WayofTime/bloodmagic/fuel/FuelHandler.java @@ -0,0 +1,20 @@ +package WayofTime.bloodmagic.fuel; + +import WayofTime.bloodmagic.item.ItemComponent; +import WayofTime.bloodmagic.registry.ModItems; +import net.minecraft.item.ItemStack; +import net.minecraftforge.fml.common.IFuelHandler; + +public class FuelHandler implements IFuelHandler +{ + @Override + public int getBurnTime(ItemStack fuel) + { + if (fuel != null && fuel.getItem() == ModItems.itemComponent && fuel.getMetadata() == ItemComponent.getStack(ItemComponent.SAND_COAL).getMetadata()) + { + return 1600; + } + + return 0; + } +} diff --git a/src/main/java/WayofTime/bloodmagic/item/ItemComponent.java b/src/main/java/WayofTime/bloodmagic/item/ItemComponent.java index f6ef1bd5..f0cbc3d8 100644 --- a/src/main/java/WayofTime/bloodmagic/item/ItemComponent.java +++ b/src/main/java/WayofTime/bloodmagic/item/ItemComponent.java @@ -45,6 +45,7 @@ public class ItemComponent extends Item implements IVariantProvider public static final String SAND_IRON = "ironSand"; public static final String SAND_GOLD = "goldSand"; public static final String SAND_COAL = "coalSand"; + public static final String PLANT_OIL = "plantOil"; public ItemComponent() { @@ -81,6 +82,7 @@ public class ItemComponent extends Item implements IVariantProvider names.add(19, SAND_IRON); names.add(20, SAND_GOLD); names.add(21, SAND_COAL); + names.add(22, PLANT_OIL); } @Override diff --git a/src/main/java/WayofTime/bloodmagic/proxy/CommonProxy.java b/src/main/java/WayofTime/bloodmagic/proxy/CommonProxy.java index 2670849a..5580e360 100644 --- a/src/main/java/WayofTime/bloodmagic/proxy/CommonProxy.java +++ b/src/main/java/WayofTime/bloodmagic/proxy/CommonProxy.java @@ -1,16 +1,18 @@ package WayofTime.bloodmagic.proxy; -import WayofTime.bloodmagic.api.ritual.CapabilityRuneType; -import WayofTime.bloodmagic.api.ritual.IRitualStone; -import WayofTime.bloodmagic.api.teleport.TeleportQueue; -import WayofTime.bloodmagic.util.handler.EventHandler; -import WayofTime.bloodmagic.util.helper.InventoryRenderHelper; -import WayofTime.bloodmagic.util.helper.InventoryRenderHelperV2; import net.minecraft.block.Block; import net.minecraft.item.Item; import net.minecraft.world.World; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.common.capabilities.CapabilityManager; +import net.minecraftforge.fml.common.registry.GameRegistry; +import WayofTime.bloodmagic.api.ritual.CapabilityRuneType; +import WayofTime.bloodmagic.api.ritual.IRitualStone; +import WayofTime.bloodmagic.api.teleport.TeleportQueue; +import WayofTime.bloodmagic.fuel.FuelHandler; +import WayofTime.bloodmagic.util.handler.EventHandler; +import WayofTime.bloodmagic.util.helper.InventoryRenderHelper; +import WayofTime.bloodmagic.util.helper.InventoryRenderHelperV2; public class CommonProxy { @@ -29,6 +31,7 @@ public class CommonProxy { MinecraftForge.EVENT_BUS.register(new EventHandler()); MinecraftForge.EVENT_BUS.register(TeleportQueue.getInstance()); + GameRegistry.registerFuelHandler(new FuelHandler()); registerRenderers(); } diff --git a/src/main/java/WayofTime/bloodmagic/registry/ModItems.java b/src/main/java/WayofTime/bloodmagic/registry/ModItems.java index c06bfd96..c68bc42f 100644 --- a/src/main/java/WayofTime/bloodmagic/registry/ModItems.java +++ b/src/main/java/WayofTime/bloodmagic/registry/ModItems.java @@ -4,6 +4,7 @@ import net.minecraft.inventory.EntityEquipmentSlot; import net.minecraft.item.Item; import net.minecraft.util.ResourceLocation; import net.minecraftforge.common.util.EnumHelper; +import net.minecraftforge.fml.common.IFuelHandler; import net.minecraftforge.fml.common.registry.GameRegistry; import WayofTime.bloodmagic.BloodMagic; import WayofTime.bloodmagic.ConfigHandler; @@ -187,7 +188,7 @@ public class ModItems ritualReader = registerItem(new ItemRitualReader(), Constants.BloodMagicItem.RITUAL_READER.getRegName()); lavaCrystal = registerItem(new ItemLavaCrystal(), Constants.BloodMagicItem.LAVA_CRYSTAL.getRegName()); - GameRegistry.registerFuelHandler(new ItemLavaCrystal()); + GameRegistry.registerFuelHandler((IFuelHandler) lavaCrystal); boundSword = registerItem(new ItemBoundSword(), Constants.BloodMagicItem.BOUND_SWORD.getRegName()); boundPickaxe = registerItem(new ItemBoundPickaxe(), Constants.BloodMagicItem.BOUND_PICKAXE.getRegName()); diff --git a/src/main/java/WayofTime/bloodmagic/registry/ModRecipes.java b/src/main/java/WayofTime/bloodmagic/registry/ModRecipes.java index 27daeb04..4a83bad4 100644 --- a/src/main/java/WayofTime/bloodmagic/registry/ModRecipes.java +++ b/src/main/java/WayofTime/bloodmagic/registry/ModRecipes.java @@ -290,9 +290,16 @@ public class ModRecipes AlchemyTableRecipeRegistry.registerRecipe(new ItemStack(Blocks.CLAY, 5), 200, 200, 1, Items.WATER_BUCKET, Blocks.HARDENED_CLAY, Blocks.HARDENED_CLAY, Blocks.HARDENED_CLAY, Blocks.HARDENED_CLAY, Blocks.HARDENED_CLAY); AlchemyTableRecipeRegistry.registerRecipe(new ItemStack(Blocks.OBSIDIAN), 50, 50, 1, Items.WATER_BUCKET, Items.LAVA_BUCKET); - AlchemyTableRecipeRegistry.registerRecipe(ItemCuttingFluid.getStack(ItemCuttingFluid.BASIC), 1000, 400, 1, "dustCoal", Items.GUNPOWDER, Items.REDSTONE, Items.SUGAR, Items.WHEAT, new ItemStack(Items.POTIONITEM)); + AlchemyTableRecipeRegistry.registerRecipe(new AlchemyTableCustomRecipe(ItemComponent.getStack(ItemComponent.SAND_COAL, 4), 100, 100, 1, new ItemStack(Items.COAL, 1, 0), new ItemStack(Items.COAL, 1, 0), Items.FLINT)); - AlchemyTableRecipeRegistry.registerRecipe(new AlchemyTableCustomRecipe(ItemComponent.getStack(ItemComponent.SAND_IRON, 2), 100, 200, 1, "oreIron", ItemCuttingFluid.getStack(ItemCuttingFluid.BASIC))); - AlchemyTableRecipeRegistry.registerRecipe(new AlchemyTableCustomRecipe(ItemComponent.getStack(ItemComponent.SAND_GOLD, 2), 100, 200, 1, "oreGold", ItemCuttingFluid.getStack(ItemCuttingFluid.BASIC))); + AlchemyTableRecipeRegistry.registerRecipe(ItemCuttingFluid.getStack(ItemCuttingFluid.BASIC), 1000, 400, 1, "dustCoal", Items.GUNPOWDER, Items.REDSTONE, Items.SUGAR, ItemComponent.getStack(ItemComponent.PLANT_OIL), new ItemStack(Items.POTIONITEM)); + + AlchemyTableRecipeRegistry.registerRecipe(new AlchemyTableCustomRecipe(ItemComponent.getStack(ItemComponent.SAND_IRON, 2), 400, 200, 1, "oreIron", ItemCuttingFluid.getStack(ItemCuttingFluid.BASIC))); + AlchemyTableRecipeRegistry.registerRecipe(new AlchemyTableCustomRecipe(ItemComponent.getStack(ItemComponent.SAND_GOLD, 2), 400, 200, 1, "oreGold", ItemCuttingFluid.getStack(ItemCuttingFluid.BASIC))); + + AlchemyTableRecipeRegistry.registerRecipe(ItemComponent.getStack(ItemComponent.PLANT_OIL), 100, 100, 1, Items.CARROT, Items.CARROT, Items.CARROT, new ItemStack(Items.DYE, 15)); + AlchemyTableRecipeRegistry.registerRecipe(ItemComponent.getStack(ItemComponent.PLANT_OIL), 100, 100, 1, Items.POTATO, Items.POTATO, new ItemStack(Items.DYE, 15)); + AlchemyTableRecipeRegistry.registerRecipe(ItemComponent.getStack(ItemComponent.PLANT_OIL), 100, 100, 1, Items.WHEAT, Items.WHEAT, new ItemStack(Items.DYE, 15)); + AlchemyTableRecipeRegistry.registerRecipe(ItemComponent.getStack(ItemComponent.PLANT_OIL), 100, 100, 1, Items.BEETROOT, Items.BEETROOT, Items.BEETROOT, new ItemStack(Items.DYE, 15)); } } diff --git a/src/main/resources/assets/bloodmagic/blockstates/item/ItemComponent.json b/src/main/resources/assets/bloodmagic/blockstates/item/ItemComponent.json index 86f945a7..3c5fc962 100644 --- a/src/main/resources/assets/bloodmagic/blockstates/item/ItemComponent.json +++ b/src/main/resources/assets/bloodmagic/blockstates/item/ItemComponent.json @@ -115,6 +115,11 @@ "textures": { "layer0": "bloodmagic:items/CoalSand" } + }, + "plantoil": { + "textures": { + "layer0": "bloodmagic:items/PlantOil" + } } } } diff --git a/src/main/resources/assets/bloodmagic/blockstates/item/ItemCuttingFluid.json b/src/main/resources/assets/bloodmagic/blockstates/item/ItemCuttingFluid.json index db08b18a..caeb0464 100644 --- a/src/main/resources/assets/bloodmagic/blockstates/item/ItemCuttingFluid.json +++ b/src/main/resources/assets/bloodmagic/blockstates/item/ItemCuttingFluid.json @@ -10,7 +10,7 @@ "textures": { "layer0": "bloodmagic:items/BasicCuttingFluid" } - } + } } } } diff --git a/src/main/resources/assets/bloodmagic/lang/en_US.lang b/src/main/resources/assets/bloodmagic/lang/en_US.lang index 3c8c1755..80105cce 100644 --- a/src/main/resources/assets/bloodmagic/lang/en_US.lang +++ b/src/main/resources/assets/bloodmagic/lang/en_US.lang @@ -90,6 +90,7 @@ item.BloodMagic.baseComponent.reagentTransposition.name=Transposition Reagent item.BloodMagic.baseComponent.ironSand.name=Iron Sand item.BloodMagic.baseComponent.goldSand.name=Gold Sand item.BloodMagic.baseComponent.coalSand.name=Coal Sand +item.BloodMagic.baseComponent.plantOil.name=Plant Oil item.BloodMagic.cuttingFluid.basicCuttingFluid.name=Basic Cutting Fluid diff --git a/src/main/resources/assets/bloodmagic/textures/items/PlantOil.png b/src/main/resources/assets/bloodmagic/textures/items/PlantOil.png new file mode 100644 index 0000000000000000000000000000000000000000..1268f95fc96a4e694884cb251b2bf41031c16bbf GIT binary patch literal 512 zcmV+b0{{JqP)G6gz+7%_6eCx zMoxc^$l+waZ2s^|JRX-yeIkZ)2GMAgWHKpZ5qP^?*{=8O$6~Qhy#dt#!!Q6)O3Cu+ zfCjK(4r@N2PmHy-j{(785T%r?p6P52WyIg*m+w8_{Zwq)lO?0+?<)3GcL?R)M4sy91cB%ZQP%LtDV{u_#ac39#(%kUz2>|zYiN*9F zZkLOe<_6llUextEmSukq(B^HTyS;7^$1`!Q)c-yJ0000