From 8c8704df53f311cd53ffb7d68536ca9ddee54d31 Mon Sep 17 00:00:00 2001 From: KeyLime17 Date: Wed, 31 Jul 2024 18:18:45 -0400 Subject: [PATCH] Added Blocks that can have metaData --- .gradle/8.2.1/checksums/checksums.lock | Bin 17 -> 17 bytes .gradle/8.2.1/fileHashes/fileHashes.lock | 2 +- .../cinder_loe/CinderEventHandler.java | 73 ++++ .../com/zivilon/cinder_loe/CinderLoE.java | 5 +- .../cinder_loe/CinderShapelessOreRecipe.java | 44 +++ .../com/zivilon/cinder_loe/Materials.java | 6 +- .../coremod/LOTRMaterialTransformer.java | 11 +- .../zivilon/cinder_loe/items/BrokenHalo.java | 43 +-- .../mixins/MixinLOTRContainerAnvil.java | 4 + .../java/com/zivilon/cinder_loe/recipes.java | 315 +++++++++--------- .../assets/cinder_loe/lang/en_US.lang | 4 +- .../textures/blocks/cinder_block.png.mcmeta | 2 +- 12 files changed, 311 insertions(+), 198 deletions(-) create mode 100644 src/main/java/com/zivilon/cinder_loe/CinderEventHandler.java create mode 100644 src/main/java/com/zivilon/cinder_loe/CinderShapelessOreRecipe.java diff --git a/.gradle/8.2.1/checksums/checksums.lock b/.gradle/8.2.1/checksums/checksums.lock index d599caafa69d3146adb32c6b986b3a2f4099078a..9982850ebb5bbe3fc3172a2bceba5addba99db63 100644 GIT binary patch literal 17 QcmZR6zke?nF+czh08$DDlmGw# literal 17 QcmZR6zke?nF+czt08#`7jsO4v diff --git a/.gradle/8.2.1/fileHashes/fileHashes.lock b/.gradle/8.2.1/fileHashes/fileHashes.lock index f702b1d..2a4130d 100644 --- a/.gradle/8.2.1/fileHashes/fileHashes.lock +++ b/.gradle/8.2.1/fileHashes/fileHashes.lock @@ -1 +1 @@ -�[�i5�ï¿ëc \ No newline at end of file +�[�i5�ï¿ûo \ No newline at end of file diff --git a/src/main/java/com/zivilon/cinder_loe/CinderEventHandler.java b/src/main/java/com/zivilon/cinder_loe/CinderEventHandler.java new file mode 100644 index 0000000..ef588f6 --- /dev/null +++ b/src/main/java/com/zivilon/cinder_loe/CinderEventHandler.java @@ -0,0 +1,73 @@ +package com.zivilon.cinder_loe; + +import com.zivilon.cinder_loe.entity.corrupt.CorruptMan; +import com.zivilon.cinder_loe.items.BrokenHalo; +import cpw.mods.fml.common.FMLCommonHandler; +import cpw.mods.fml.common.IFuelHandler; +import cpw.mods.fml.common.eventhandler.SubscribeEvent; +import cpw.mods.fml.common.registry.GameRegistry; +import lotr.common.LOTRMod; +import net.minecraft.entity.EntityLivingBase; +import net.minecraft.entity.IEntityLivingData; +import net.minecraft.entity.player.EntityPlayerMP; +import net.minecraft.init.Items; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.potion.Potion; +import net.minecraft.potion.PotionEffect; +import net.minecraft.world.World; +import net.minecraftforge.common.MinecraftForge; +import net.minecraftforge.event.entity.living.LivingHurtEvent; + +import java.util.Random; + +public class CinderEventHandler implements IFuelHandler { + private static final Random random = new Random(); + public CinderEventHandler() { + FMLCommonHandler.instance().bus().register((Object)this); + MinecraftForge.EVENT_BUS.register((Object)this); + MinecraftForge.TERRAIN_GEN_BUS.register((Object)this); + GameRegistry.registerFuelHandler((IFuelHandler)this); + } + @SubscribeEvent + public void onLivingHurt(LivingHurtEvent event) { + EntityLivingBase entity = event.entityLiving; + EntityLivingBase attacker = event.source.getEntity() instanceof EntityLivingBase ? (EntityLivingBase)event.source.getEntity() : null; + World world = entity.worldObj; + + if (attacker != null && event.source.getSourceOfDamage() == attacker) { + ItemStack helmet = entity.getEquipmentInSlot(4); + if (helmet != null && helmet.getItem() instanceof BrokenHalo) { + + if (random.nextDouble() <= 0.25 ) { + // Summon Corrupt Civilian NPC + CorruptMan spawnedEntity = new CorruptMan(world); + spawnedEntity.copyLocationAndAnglesFrom(attacker); + + // Randomly select main weapon + ItemStack mainWeapon = getRandomWeapon(); + spawnedEntity.npcItemsInv.setIdleItem(mainWeapon); + spawnedEntity.npcItemsInv.setMeleeWeapon(mainWeapon); + spawnedEntity.setHealth(10); + spawnedEntity.addPotionEffect(new PotionEffect(Potion.regeneration.id, 9999, 0)); + + spawnedEntity.onSpawnWithEgg((IEntityLivingData) null); + world.spawnEntityInWorld(spawnedEntity); + world.playAuxSFXAtEntity(null, 1016, (int) spawnedEntity.posX, (int) spawnedEntity.posY, (int) spawnedEntity.posZ, 0); + world.playSoundAtEntity(entity, "mob.zombie.unfect", 1F, 1F); + + } + } + } + } + + private ItemStack getRandomWeapon() { + Item[] weapons = new Item[]{LOTRMod.blacksmithHammer, LOTRMod.daggerIron, LOTRMod.dunlendingTrident, LOTRMod.battleaxeBronze, CinderLoE.cleaver}; + return new ItemStack(weapons[random.nextInt(weapons.length)]); + } + + @Override + public int getBurnTime(ItemStack fuel) { + return 0; + } +} diff --git a/src/main/java/com/zivilon/cinder_loe/CinderLoE.java b/src/main/java/com/zivilon/cinder_loe/CinderLoE.java index 3907413..9eeb0e9 100644 --- a/src/main/java/com/zivilon/cinder_loe/CinderLoE.java +++ b/src/main/java/com/zivilon/cinder_loe/CinderLoE.java @@ -17,6 +17,7 @@ import com.zivilon.cinder_loe.items.*; import com.zivilon.cinder_loe.tileentity.*; import com.zivilon.cinder_loe.util.Utilities; import com.zivilon.cindercore.CinderCore; +import lotr.common.LOTREventHandler; import lotr.common.item.*; import net.minecraft.potion.Potion; import org.apache.logging.log4j.LogManager; @@ -309,6 +310,7 @@ public class CinderLoE { public static LOTRSpawnList LIMWAITH; public static LOTRSpawnList Rhudaur; + private static CinderEventHandler modEventHandler; @Mod.EventHandler public void preInit(FMLPreInitializationEvent event) { CinderLoE_Config.init(event); @@ -317,6 +319,7 @@ public class CinderLoE { ItemRegistration.registerItems(); registerBlocks(); registerEntities(); + modEventHandler = new CinderEventHandler(); } @Mod.EventHandler @@ -674,7 +677,7 @@ public class CinderLoE { spearsolidgold = (new LOTRItemSpear(EVENT)).setUnlocalizedName("lotr:spearsolidgold").setTextureName("lotr:spearsolidgold").setCreativeTab(null); spearUnnamed = (new UnnamedSpear(EVENT)).setUnlocalizedName("lotr:spearUnnamed").setTextureName("lotr:spearUnnamed").setCreativeTab(null); whip = (new Whip()).setUnlocalizedName("lotr:whip").setTextureName("lotr:whip"); - helmetbrokenhalo = (new LOTRItemArmor(EVENT, 0, "helmet")).setUnlocalizedName("lotr:helmetbrokenhalo").setTextureName("lotr:helmetbrokenhalo").setCreativeTab(null); + helmetbrokenhalo = (new BrokenHalo(EVENT, 0, "helmet")).setUnlocalizedName("lotr:helmetbrokenhalo").setTextureName("lotr:helmetbrokenhalo").setCreativeTab(null); helmetJade = (new LOTRItemArmor(MATERIAL_JADE, 0, "helmet")).setUnlocalizedName("lotr:helmetJade").setTextureName("lotr:helmetJade").setCreativeTab(null); bodyJade = (new LOTRItemArmor(MATERIAL_JADE, 1, "chestplate")).setUnlocalizedName("lotr:bodyJade").setTextureName("lotr:bodyJade").setCreativeTab(null); legsJade = (new LOTRItemArmor(MATERIAL_JADE, 2,"leggings")).setUnlocalizedName("lotr:legsJade").setTextureName("lotr:legsJade").setCreativeTab(null); diff --git a/src/main/java/com/zivilon/cinder_loe/CinderShapelessOreRecipe.java b/src/main/java/com/zivilon/cinder_loe/CinderShapelessOreRecipe.java new file mode 100644 index 0000000..74e5c66 --- /dev/null +++ b/src/main/java/com/zivilon/cinder_loe/CinderShapelessOreRecipe.java @@ -0,0 +1,44 @@ +package com.zivilon.cinder_loe; + +import lotr.common.LOTRMod; +import net.minecraft.inventory.InventoryCrafting; +import net.minecraft.item.ItemStack; +import net.minecraft.world.World; +import net.minecraftforge.oredict.ShapelessOreRecipe; + +import java.util.Random; + +public class CinderShapelessOreRecipe extends ShapelessOreRecipe { + public CinderShapelessOreRecipe(ItemStack result, Object... recipe) { + super(result, recipe); + } + + @Override + public ItemStack getCraftingResult(InventoryCrafting inv) { + ItemStack result = super.getCraftingResult(inv).copy(); + for (int i = 0; i < inv.getSizeInventory(); i++) { + ItemStack stack = inv.getStackInSlot(i); + if (stack != null && stack.getItem() == LOTRMod.rollingPin) { + stack = stack.copy(); + stack.attemptDamageItem(1, new Random()); + if (stack.getItemDamage() > stack.getMaxDamage()) { + stack.stackSize -= 1; + } + inv.setInventorySlotContents(i, stack); + } + } + return result; + } + + @Override + public boolean matches (InventoryCrafting inv, World world) { + return super.matches(inv, world); + } + + @Override + public ItemStack getRecipeOutput() { + return super.getRecipeOutput(); + } + + +} diff --git a/src/main/java/com/zivilon/cinder_loe/Materials.java b/src/main/java/com/zivilon/cinder_loe/Materials.java index 9f91d36..d63df85 100644 --- a/src/main/java/com/zivilon/cinder_loe/Materials.java +++ b/src/main/java/com/zivilon/cinder_loe/Materials.java @@ -14,9 +14,9 @@ public class Materials { public static void registerMaterials() { modifyMaterial("RED_DWARF", 700, 3.0F, 0.7F, 3, 7.0F, 10, CinderLoE.redDwarfSteel); modifyMaterial("WIZARD", 1000, 3.0F, 0.7F, 3, 7.0F, 10, null); - modifyMaterial("BONEMOLD", 350, 2.0F, 0.6F, 2, 6.0F, 10, CinderLoE.bonemold); + modifyMaterial("BONEMOLD", 674, 2.0F, 0.6F, 2, 6.0F, 10, CinderLoE.bonemold); //Original Durability = 350 | Add 162 | 2/4 modifyMaterial("LIMWAITH_WOOD", 230, 1.5F, 0.5F, 2, 5.0F, 10, Item.getItemFromBlock(LOTRMod.driedReeds)); - modifyMaterial("EVENT", 2400, 5.0F, 0.0F, 0, 9.0F, 10, null); + modifyMaterial("EVENT", 2400, 5.0F, 0.8F, 0, 9.0F, 10, LOTRMod.emerald); modifyMaterial("BREE", 350, 2.5F, 0.6F, 2, 6.0F, 10, Items.iron_ingot); modifyMaterial("RHUDAUR", 300, 2.5F, 0.6F, 2, 6.0F, 10, LOTRMod.fur); modifyMaterial("BATTLENUN", 300, 3F, 0.6F, 2, 6.0F, 10, Items.iron_ingot); @@ -24,7 +24,7 @@ public class Materials { modifyMaterial("SERPENT", 650,2.0F, 0.6F, 2, 6.0F, 10, LOTRMod.bronze); modifyMaterial("USURPER",650,2.0F, 0.6F, 2, 6.0F, 10, Items.iron_ingot); modifyMaterial("WARLORD", 650,2.0F, 0.6F, 2, 6.0F, 10, LOTRMod.bronze); - modifyMaterial("JADE",2400, 5.0F, 0.0F, 0, 9.0F, 10, null); + modifyMaterial("JADE",2400, 5.0F, 0.8F, 0, 9.0F, 10, LOTRMod.emerald); //modifyMaterial("BRONZE", 2000, 0.0F, 0.6F, 2, 7.0F, 10, LOTRMod.bronze); } diff --git a/src/main/java/com/zivilon/cinder_loe/coremod/LOTRMaterialTransformer.java b/src/main/java/com/zivilon/cinder_loe/coremod/LOTRMaterialTransformer.java index a403977..b5cdad5 100644 --- a/src/main/java/com/zivilon/cinder_loe/coremod/LOTRMaterialTransformer.java +++ b/src/main/java/com/zivilon/cinder_loe/coremod/LOTRMaterialTransformer.java @@ -27,8 +27,8 @@ public class LOTRMaterialTransformer implements IClassTransformer { // Good Humans modifyMaterial("DALE", 475, 0.6F, classNode); //Original Durability = 300 | Add 175 | 1/4 - modifyMaterial("GONDOR", 725, 0.6F, classNode); //Original Durability = 450 | Add 137 | 2/4 - modifyMaterial("DORWINION_ELF", 875, 0.6F, classNode); //Original Durability = 500 | Add 125 | 2/4 + modifyMaterial("GONDOR", 861, 0.6F, classNode); //Original Durability = 450 | Add 137 | 3/4 + modifyMaterial("DORWINION_ELF", 875, 0.6F, classNode); //Original Durability = 500 | Add 125 | 3/4 modifyMaterial("ROHAN", 300, 0.6F, classNode); //Original Durability = 300 | Add 175 | 0/4 modifyMaterial("TAUREDAIN", 300, 0.6F, classNode); //Original Durability = 300 | Add 175 | 0/4 modifyMaterial("DORWINION", 400, 0.6F, classNode); //Original Durability = 400 | Add 150 | 0/4 @@ -37,14 +37,14 @@ public class LOTRMaterialTransformer implements IClassTransformer { // Evil Humans - modifyMaterial("RHUN_GOLD", 558, 0.6F, classNode); //Original Durability = 450 | Add 137 | 1/4 + modifyMaterial("RHUN_GOLD", 450, 0.6F, classNode); //Original Durability = 450 | Add 137 | 0/4 modifyMaterial("RHUN", 400, 0.6F, classNode); //Original Durability = 400 | Add 150 | 0/4 modifyMaterial("DUNLENDING", 437, 0.6F, classNode); //Original Durability = 250 | Add 187 | 1/4 - modifyMaterial("NEAR_HARAD", 650, 0.6F, classNode); //Original Durability = 300 | Add 175 | 2/4 + modifyMaterial("NEAR_HARAD", 825, 0.6F, classNode); //Original Durability = 300 | Add 175 | 3/4 modifyMaterial("HARNEDOR", 250, 0.6F, classNode); //Original Durability = 250 | Add 187 | 0/4 modifyMaterial("CORSAIR", 300, 0.6F, classNode); //Original Durability = 300 | Add 175 | 0/4 modifyMaterial("GULF_HARAD", 350, 0.6F, classNode); //Original Durability = 350 | Add 162 | 0/4 - modifyMaterial("UMBAR", 450, 0.6F, classNode); //Original Durability = 450 | Add 137 | 0/4 + modifyMaterial("UMBAR", 724, 0.6F, classNode); //Original Durability = 450 | Add 137 | 2/4 modifyMaterial("MOREDAIN", 250, 0.6F, classNode); //Original Durability = 250 | Add 187 | 0/4 //Elves @@ -68,6 +68,7 @@ public class LOTRMaterialTransformer implements IClassTransformer { addMaterial("WARLORD",classNode); addMaterial("JADE",classNode); + // Protection Conversion // Convert your ClassNode back to byte array with ClassWriter diff --git a/src/main/java/com/zivilon/cinder_loe/items/BrokenHalo.java b/src/main/java/com/zivilon/cinder_loe/items/BrokenHalo.java index be3074d..1c59bd7 100644 --- a/src/main/java/com/zivilon/cinder_loe/items/BrokenHalo.java +++ b/src/main/java/com/zivilon/cinder_loe/items/BrokenHalo.java @@ -1,16 +1,24 @@ package com.zivilon.cinder_loe.items; +import com.zivilon.cinder_loe.CinderLoE; import com.zivilon.cinder_loe.entity.corrupt.CorruptMan; import cpw.mods.fml.common.eventhandler.SubscribeEvent; import lotr.common.item.LOTRItemArmor; import lotr.common.item.LOTRMaterial; +import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.IEntityLivingData; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.EntityPlayerMP; +import net.minecraft.init.Items; +import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.potion.Potion; import net.minecraft.potion.PotionEffect; import net.minecraft.world.World; import net.minecraftforge.event.entity.living.LivingEvent; +import net.minecraftforge.event.entity.living.LivingHurtEvent; + +import java.util.Random; public class BrokenHalo extends LOTRItemArmor { @@ -18,39 +26,4 @@ public class BrokenHalo extends LOTRItemArmor { super(material, slotType, s); } - @SubscribeEvent - public void onLivingUpdate(LivingEvent.LivingUpdateEvent event) { - if (event.entityLiving instanceof EntityPlayer) { - EntityPlayer player = (EntityPlayer) event.entityLiving; - ItemStack helmet = player.getCurrentArmor(0); // Helmet slot - - if (helmet != null && helmet.getItem() instanceof BrokenHalo) { - World world = player.worldObj; - if (!world.isRemote) { - // Summon NPC - CorruptMan corruptman = new CorruptMan(world); - corruptman.copyLocationAndAnglesFrom(player); - - // Copy armor and weapon from player to CorruptOrc - for (int i = 0; i < 4; i++) { - ItemStack armor = player.getCurrentArmor(i); - corruptman.setCurrentItemOrArmor(i + 1, armor); - } - - ItemStack mainWeapon = player.getHeldItem(); - corruptman.npcItemsInv.setIdleItem(mainWeapon); - corruptman.npcItemsInv.setMeleeWeapon(mainWeapon); - corruptman.setHealth(20); - corruptman.addPotionEffect(new PotionEffect(Potion.regeneration.id, 9999, 0)); - - // Remove player and spawn CorruptOrc - world.removeEntity(player); - corruptman.onSpawnWithEgg((IEntityLivingData) null); - world.spawnEntityInWorld(corruptman); - world.playAuxSFXAtEntity(null, 1016, (int) corruptman.posX, (int) corruptman.posY, (int) corruptman.posZ, 0); - } - } - } - } - } diff --git a/src/main/java/com/zivilon/cinder_loe/mixins/MixinLOTRContainerAnvil.java b/src/main/java/com/zivilon/cinder_loe/mixins/MixinLOTRContainerAnvil.java index 5f84c47..a4e5884 100644 --- a/src/main/java/com/zivilon/cinder_loe/mixins/MixinLOTRContainerAnvil.java +++ b/src/main/java/com/zivilon/cinder_loe/mixins/MixinLOTRContainerAnvil.java @@ -75,6 +75,10 @@ public class MixinLOTRContainerAnvil { return (materialItem.getItem() == Items.iron_ingot); if (armorMaterial == CinderLoE.MATERIAL_BONEMOLD.toArmorMaterial()) return (materialItem.getItem() == CinderLoE.bonemold); + if (armorMaterial == CinderLoE.MATERIAL_RHUDUAR.toArmorMaterial()) + return (materialItem.getItem() == Items.iron_ingot); + if (armorMaterial == CinderLoE.MATERIAL_JADE.toArmorMaterial()) + return (materialItem.getItem() == LOTRMod.emerald); } return false; diff --git a/src/main/java/com/zivilon/cinder_loe/recipes.java b/src/main/java/com/zivilon/cinder_loe/recipes.java index a8c4003..e2d36e7 100644 --- a/src/main/java/com/zivilon/cinder_loe/recipes.java +++ b/src/main/java/com/zivilon/cinder_loe/recipes.java @@ -1,20 +1,14 @@ package com.zivilon.cinder_loe; -import com.zivilon.cinder_loe.CinderLoE; -import lotr.common.item.LOTRItemFood; +import cpw.mods.fml.common.registry.GameRegistry; +import lotr.common.LOTRMod; +import lotr.common.recipe.LOTRRecipePoisonWeapon; +import lotr.common.recipe.LOTRRecipes; import net.minecraft.init.Blocks; import net.minecraft.init.Items; -import net.minecraft.item.Item; -import net.minecraft.item.ItemFood; import net.minecraft.item.ItemStack; -import net.minecraft.item.crafting.FurnaceRecipes; -import net.minecraft.item.crafting.IRecipe; -import cpw.mods.fml.common.registry.GameRegistry; import net.minecraftforge.oredict.OreDictionary; import net.minecraftforge.oredict.ShapedOreRecipe; -import lotr.common.LOTRMod; -import lotr.common.recipe.LOTRRecipes; -import lotr.common.recipe.LOTRRecipePoisonWeapon; import net.minecraftforge.oredict.ShapelessOreRecipe; public class recipes { @@ -27,26 +21,27 @@ public class recipes { registerLimwaithRecipes(); registerBreeRecipes(); registerArnorRecipes(); + registerAngmarRecipes(); } public static void registerGeneralRecipes() { - GameRegistry.addRecipe((IRecipe)new ShapedOreRecipe(new ItemStack(CinderLoE.bowAsh), new Object[] { " XS", "X S", " XS", - Character.valueOf('X'), CinderLoE.ingotAsh, Character.valueOf('S'), Items.string })); - GameRegistry.addRecipe((IRecipe)new ShapedOreRecipe(new ItemStack(CinderLoE.spearAsh), new Object[] { " X", " Y ", "Y ", - Character.valueOf('X'), CinderLoE.ingotAsh, Character.valueOf('Y'), "stickWood" })); - GameRegistry.addRecipe((IRecipe)new ShapedOreRecipe(new ItemStack(CinderLoE.swordAsh), new Object[] { " X ", " X ", " Y ", - Character.valueOf('X'), CinderLoE.ingotAsh, Character.valueOf('Y'), "stickWood" })); - GameRegistry.addRecipe((IRecipe)new ShapedOreRecipe(new ItemStack(CinderLoE.staffAsh), new Object[] { " XX", " YX", "Y ", - Character.valueOf('X'), CinderLoE.ingotAsh, Character.valueOf('Y'), "stickWood" })); - GameRegistry.addRecipe((IRecipe)new ShapedOreRecipe(new ItemStack(CinderLoE.battleaxeAsh), new Object[] { "XXX", "XYX", " Y ", - Character.valueOf('X'), CinderLoE.ingotAsh, Character.valueOf('Y'), "stickWood" })); - GameRegistry.addRecipe((IRecipe)new ShapedOreRecipe(new ItemStack(CinderLoE.pikeAsh), new Object[] { " X", " YX", "Y ", - Character.valueOf('X'), CinderLoE.ingotAsh, Character.valueOf('Y'), "stickWood" })); - GameRegistry.addRecipe((IRecipe)new ShapedOreRecipe(new ItemStack(CinderLoE.hammerAsh), new Object[] { "XYX", "XYX", " Y ", - Character.valueOf('X'), CinderLoE.ingotAsh, Character.valueOf('Y'), "stickWood" })); - GameRegistry.addRecipe((IRecipe)new ShapedOreRecipe(new ItemStack(CinderLoE.daggerAsh), new Object[] { "X ", "Y ", - Character.valueOf('X'), CinderLoE.ingotAsh, Character.valueOf('Y'), "stickWood" })); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(CinderLoE.bowAsh), " XS", "X S", " XS", + 'X', CinderLoE.ingotAsh, 'S', Items.string)); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(CinderLoE.spearAsh), " X", " Y ", "Y ", + 'X', CinderLoE.ingotAsh, 'Y', "stickWood")); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(CinderLoE.swordAsh), " X ", " X ", " Y ", + 'X', CinderLoE.ingotAsh, 'Y', "stickWood")); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(CinderLoE.staffAsh), " XX", " YX", "Y ", + 'X', CinderLoE.ingotAsh, 'Y', "stickWood")); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(CinderLoE.battleaxeAsh), "XXX", "XYX", " Y ", + 'X', CinderLoE.ingotAsh, 'Y', "stickWood")); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(CinderLoE.pikeAsh), " X", " YX", "Y ", + 'X', CinderLoE.ingotAsh, 'Y', "stickWood")); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(CinderLoE.hammerAsh), "XYX", "XYX", " Y ", + 'X', CinderLoE.ingotAsh, 'Y', "stickWood")); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(CinderLoE.daggerAsh), "X ", "Y ", + 'X', CinderLoE.ingotAsh, 'Y', "stickWood")); GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(CinderLoE.spicedHam), CinderLoE.spice, Items.cooked_porkchop)); @@ -88,87 +83,97 @@ public class recipes { OreDictionary.registerOre("meat", LOTRMod.zebraCooked); GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(CinderLoE.fruitsalad), Items.bowl, "fruit1", "fruit2", "fruit3")); - GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(CinderLoE.pasta, 4), LOTRMod.rollingPin, CinderLoE.dough, CinderLoE.dough)); + GameRegistry.addRecipe(new CinderShapelessOreRecipe(new ItemStack(CinderLoE.pasta, 4), LOTRMod.rollingPin, CinderLoE.dough, CinderLoE.dough)); GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(CinderLoE.halva), Items.sugar, CinderLoE.dough, CinderLoE.spice, LOTRMod.almond)); //takes durability from rolling pin GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(CinderLoE.chocolatebar, 2), LOTRMod.mugChocolate)); GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(CinderLoE.pelmen), Items.wheat, "meat", LOTRMod.salt)); - GameRegistry.addRecipe((IRecipe)new ShapedOreRecipe(new ItemStack(CinderLoE.cinderBlock), new Object[] { "XXX", "XYX", "XXX", - Character.valueOf('X'), Blocks.stone, Character.valueOf('Y'), LOTRMod.balrogFire })); - GameRegistry.addRecipe((IRecipe)new ShapedOreRecipe(new ItemStack(CinderLoE.reedBale), new Object[] { "XXX", "XXX", "XXX", - Character.valueOf('X'), LOTRMod.reeds})); - GameRegistry.addRecipe((IRecipe)new ShapedOreRecipe(new ItemStack(CinderLoE.leatherBundle), new Object[] { "XXX", "XXX", "XXX", - Character.valueOf('X'), Items.leather})); - GameRegistry.addRecipe((IRecipe)new ShapedOreRecipe(new ItemStack(CinderLoE.pretzel, 2), new Object[] { "XYX", " X ", - Character.valueOf('X'), CinderLoE.dough, Character.valueOf('Y'), LOTRMod.salt})); - GameRegistry.addRecipe((IRecipe)new ShapedOreRecipe(new ItemStack(CinderLoE.dough, 8), new Object[] { "XXX", "XYX", "XXX", - Character.valueOf('X'), CinderLoE.flour, Character.valueOf('Y'), Items.water_bucket})); - GameRegistry.addRecipe((IRecipe)new ShapedOreRecipe(new ItemStack(CinderLoE.fishBarrel), new Object[] { "XXX", "XXX", "XXX", - Character.valueOf('X'), Items.fish})); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(CinderLoE.cinderBlock), "XXX", "XYX", "XXX", + 'X', Blocks.stone, 'Y', LOTRMod.balrogFire)); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(CinderLoE.reedBale), "XXX", "XXX", "XXX", + 'X', LOTRMod.reeds)); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(CinderLoE.leatherBundle), "XXX", "XXX", "XXX", + 'X', Items.leather)); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(CinderLoE.pretzel, 2), "XYX", " X ", + 'X', CinderLoE.dough, 'Y', LOTRMod.salt)); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(CinderLoE.dough, 8), "XXX", "XYX", "XXX", + 'X', CinderLoE.flour, 'Y', Items.water_bucket)); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(CinderLoE.fishBarrel), "XXX", "XXX", "XXX", + 'X', Items.fish)); //GameRegistry.addRecipe((IRecipe)new ShapedOreRecipe(new ItemStack(CinderLoE.rustedsword, 8), new Object[] { "X", "y", "y", //Character.valueOf('Y'), Items.iron_ingot, Character.valueOf('X'), "stickWood"})); - GameRegistry.addRecipe((IRecipe)new ShapedOreRecipe(new ItemStack(CinderLoE.silverChain, 8), new Object[] { "X", "X", "X", - Character.valueOf('X'), LOTRMod.silver})); - GameRegistry.addRecipe((IRecipe)new ShapedOreRecipe(new ItemStack(CinderLoE.goldChain, 8), new Object[] { "X", "X", "X", - Character.valueOf('X'), Items.gold_ingot})); - GameRegistry.addRecipe((IRecipe)new ShapedOreRecipe(new ItemStack(CinderLoE.ironChain, 8), new Object[] { "X", "X", "X", - Character.valueOf('X'), Items.iron_ingot})); - GameRegistry.addRecipe((IRecipe)new ShapedOreRecipe(new ItemStack(CinderLoE.bronzeChain, 8), new Object[] { "X", "X", "X", - Character.valueOf('X'), LOTRMod.bronze})); - GameRegistry.addRecipe((IRecipe)new ShapedOreRecipe(new ItemStack(CinderLoE.cindercobble, 4, 0), new Object[] { "XX", "XX", - Character.valueOf('X'), LOTRMod.cobblebrick})); - GameRegistry.addRecipe((IRecipe)new ShapedOreRecipe(new ItemStack(CinderLoE.cutDrystone, 4), new Object[] { "XX", "XX", - Character.valueOf('X'), new ItemStack(CinderLoE.cindercobble, 1, 0)})); - GameRegistry.addRecipe((IRecipe)new ShapedOreRecipe(new ItemStack(LOTRMod.cobblebrick, 4, 0), new Object[] { "XX", "XX", - Character.valueOf('X'), CinderLoE.cutDrystone})); - GameRegistry.addRecipe((IRecipe)new ShapedOreRecipe(new ItemStack(CinderLoE.reeflessCoral, 1), new Object[] { "X", - Character.valueOf('X'), LOTRMod.coralReef})); - GameRegistry.addRecipe((IRecipe)new ShapedOreRecipe(new ItemStack(CinderLoE.plaster, 4), new Object[] { "XYX", "YXY", "XYX", - Character.valueOf('X'), Items.paper, Character.valueOf('Y'), Blocks.clay })); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(CinderLoE.silverChain, 8), "X", "X", "X", + 'X', LOTRMod.silver)); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(CinderLoE.goldChain, 8), "X", "X", "X", + 'X', Items.gold_ingot)); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(CinderLoE.ironChain, 8), "X", "X", "X", + 'X', Items.iron_ingot)); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(CinderLoE.bronzeChain, 8), "X", "X", "X", + 'X', LOTRMod.bronze)); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(CinderLoE.cindercobble, 4, 0), "XX", "XX", + 'X', LOTRMod.cobblebrick)); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(CinderLoE.cutDrystone, 4), "XX", "XX", + 'X', new ItemStack(CinderLoE.cindercobble, 1, 0))); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(LOTRMod.cobblebrick, 4, 0), "XX", "XX", + 'X', CinderLoE.cutDrystone)); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(CinderLoE.reeflessCoral, 1), "X", + 'X', LOTRMod.coralReef)); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(CinderLoE.plaster, 4), "XYX", "YXY", "XYX", + 'X', Items.paper, 'Y', Blocks.clay)); + // Mordor Cobblebrick + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(CinderLoE.cindercobble, 4, 1), "XY", "YX", + 'X', new ItemStack(LOTRMod.rock, 1, 0), 'Y', LOTRMod.mordorGravel)); + + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(LOTRMod.banner, 1, 44), " Y ", " X ", " Z ", + 'X', "stickWood", 'Y', new ItemStack(Blocks.wool, 1, 14), 'Z', "plankWood")); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(LOTRMod.banner, 1, 45), " Y ", " X ", " Z ", + 'X', "stickWood", 'Y', new ItemStack(Blocks.wool, 1, 11), 'Z', "plankWood")); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(LOTRMod.banner, 1, 46), " Y ", " X ", " Z ", + 'X', "stickWood", 'Y', new ItemStack(Blocks.wool, 1, 13), 'Z', "plankWood")); } public static void registerRedDwarvenRecipes() { - LOTRRecipes.dwarvenRecipes.add(new ShapedOreRecipe(new ItemStack(CinderLoE.helmetRedDwarf), new Object[] { "XXX", "X X", - Character.valueOf('X'), CinderLoE.redDwarfSteel })); - LOTRRecipes.dwarvenRecipes.add(new ShapedOreRecipe(new ItemStack(CinderLoE.bodyRedDwarf), new Object[] { "X X", "XXX", "XXX", - Character.valueOf('X'), CinderLoE.redDwarfSteel })); - LOTRRecipes.dwarvenRecipes.add(new ShapedOreRecipe(new ItemStack(CinderLoE.legsRedDwarf), new Object[] { "XXX", "X X", "X X", - Character.valueOf('X'), CinderLoE.redDwarfSteel })); - LOTRRecipes.dwarvenRecipes.add(new ShapedOreRecipe(new ItemStack(CinderLoE.bootsRedDwarf), new Object[] { "X X", "X X", - Character.valueOf('X'), CinderLoE.redDwarfSteel })); - LOTRRecipes.dwarvenRecipes.add(new ShapedOreRecipe(new ItemStack(CinderLoE.spearRedDwarf), new Object[] { " X", " Y ", "Y ", - Character.valueOf('X'), CinderLoE.redDwarfSteel, Character.valueOf('Y'), "stickWood" })); - LOTRRecipes.dwarvenRecipes.add(new ShapedOreRecipe(new ItemStack(CinderLoE.swordRedDwarf), new Object[] { " X ", " X ", " Y ", - Character.valueOf('X'), CinderLoE.redDwarfSteel, Character.valueOf('Y'), "stickWood" })); - LOTRRecipes.dwarvenRecipes.add(new ShapedOreRecipe(new ItemStack(CinderLoE.battleaxeRedDwarf), new Object[] { "XXX", "XYX", " Y ", - Character.valueOf('X'), CinderLoE.redDwarfSteel, Character.valueOf('Y'), "stickWood" })); - LOTRRecipes.dwarvenRecipes.add(new ShapedOreRecipe(new ItemStack(CinderLoE.pikeRedDwarf), new Object[] { " X", " YX", "Y ", - Character.valueOf('X'), CinderLoE.redDwarfSteel, Character.valueOf('Y'), "stickWood" })); - LOTRRecipes.dwarvenRecipes.add(new ShapedOreRecipe(new ItemStack(CinderLoE.hammerRedDwarf), new Object[] { "XYX", "XYX", " Y ", - Character.valueOf('X'), CinderLoE.redDwarfSteel, Character.valueOf('Y'), "stickWood" })); - LOTRRecipes.dwarvenRecipes.add(new ShapedOreRecipe(new ItemStack(CinderLoE.daggerRedDwarf), new Object[] { "X ", "Y ", - Character.valueOf('X'), CinderLoE.redDwarfSteel, Character.valueOf('Y'), "stickWood" })); - LOTRRecipes.dwarvenRecipes.add(new ShapedOreRecipe(new ItemStack(CinderLoE.crossbowRedDwarf), new Object[] { "XXY", "ZYX", "YZX", - Character.valueOf('X'), CinderLoE.redDwarfSteel, Character.valueOf('Y'), "stickWood", Character.valueOf('Z'), "string" })); - LOTRRecipes.dwarvenRecipes.add(new ShapedOreRecipe(new ItemStack(CinderLoE.boarArmorRedDwarf), new Object[] { "X ", "XYX", "XXX", - Character.valueOf('X'), CinderLoE.redDwarfSteel, Character.valueOf('Y'), "leather" })); - LOTRRecipes.dwarvenRecipes.add(new ShapedOreRecipe(new ItemStack(CinderLoE.blockRedDwarfSteel), new Object[] { "XXX", "XXX", "XXX", - Character.valueOf('X'), CinderLoE.redDwarfSteel })); - LOTRRecipes.dwarvenRecipes.add(new ShapedOreRecipe(new ItemStack(CinderLoE.redDwarfSteel), new Object[] { "X ", " ", - Character.valueOf('X'), CinderLoE.redDwarfSteel })); - LOTRRecipes.dwarvenRecipes.add(new ShapedOreRecipe(new ItemStack(CinderLoE.chandelierRedDwarf, 2), new Object[] { " X ", "ZYZ", " ", - Character.valueOf('X'), "stickWood", Character.valueOf('Y'), CinderLoE.redDwarfSteel, Character.valueOf('Z'), Blocks.torch })); - LOTRRecipes.dwarvenRecipes.add(new ShapedOreRecipe(new ItemStack(CinderLoE.barsRedDwarf, 16), new Object[] { "XXX", "XXX", " ", - Character.valueOf('X'), CinderLoE.redDwarfSteel })); - LOTRRecipes.dwarvenRecipes.add(new ShapedOreRecipe(new ItemStack(CinderLoE.dwarvenBrickRuned, 4), new Object[] { " X ", "XYX", " X ", - Character.valueOf('X'), new ItemStack(LOTRMod.brick, 1, 6), Character.valueOf('Y'), Items.gold_nugget})); - GameRegistry.addShapelessRecipe(new ItemStack(CinderLoE.redDwarfSteel, 9), new Object[] { new ItemStack(CinderLoE.blockRedDwarfSteel) }); - GameRegistry.addRecipe(new ItemStack(CinderLoE.blockRedDwarfSteel, 1), new Object[] { "XXX", "XXX", "XXX", - Character.valueOf('X'), CinderLoE.redDwarfSteel }); - LOTRRecipes.dwarvenRecipes.add(new ShapedOreRecipe(new ItemStack(LOTRMod.banner, 1, 42), new Object[] { " YR", " X ", " Z ", - Character.valueOf('X'), "stickWood", Character.valueOf('Y'), Blocks.wool, Character.valueOf('Z'), "plankWood", Character.valueOf('R'), "dyeRed"})); + LOTRRecipes.dwarvenRecipes.add(new ShapedOreRecipe(new ItemStack(CinderLoE.helmetRedDwarf), "XXX", "X X", + Character.valueOf('X'), CinderLoE.redDwarfSteel)); + LOTRRecipes.dwarvenRecipes.add(new ShapedOreRecipe(new ItemStack(CinderLoE.bodyRedDwarf), "X X", "XXX", "XXX", + Character.valueOf('X'), CinderLoE.redDwarfSteel)); + LOTRRecipes.dwarvenRecipes.add(new ShapedOreRecipe(new ItemStack(CinderLoE.legsRedDwarf), "XXX", "X X", "X X", + Character.valueOf('X'), CinderLoE.redDwarfSteel)); + LOTRRecipes.dwarvenRecipes.add(new ShapedOreRecipe(new ItemStack(CinderLoE.bootsRedDwarf), "X X", "X X", + Character.valueOf('X'), CinderLoE.redDwarfSteel)); + LOTRRecipes.dwarvenRecipes.add(new ShapedOreRecipe(new ItemStack(CinderLoE.spearRedDwarf), " X", " Y ", "Y ", + Character.valueOf('X'), CinderLoE.redDwarfSteel, Character.valueOf('Y'), "stickWood")); + LOTRRecipes.dwarvenRecipes.add(new ShapedOreRecipe(new ItemStack(CinderLoE.swordRedDwarf), " X ", " X ", " Y ", + Character.valueOf('X'), CinderLoE.redDwarfSteel, Character.valueOf('Y'), "stickWood")); + LOTRRecipes.dwarvenRecipes.add(new ShapedOreRecipe(new ItemStack(CinderLoE.battleaxeRedDwarf), "XXX", "XYX", " Y ", + Character.valueOf('X'), CinderLoE.redDwarfSteel, Character.valueOf('Y'), "stickWood")); + LOTRRecipes.dwarvenRecipes.add(new ShapedOreRecipe(new ItemStack(CinderLoE.pikeRedDwarf), " X", " YX", "Y ", + Character.valueOf('X'), CinderLoE.redDwarfSteel, Character.valueOf('Y'), "stickWood")); + LOTRRecipes.dwarvenRecipes.add(new ShapedOreRecipe(new ItemStack(CinderLoE.hammerRedDwarf), "XYX", "XYX", " Y ", + Character.valueOf('X'), CinderLoE.redDwarfSteel, Character.valueOf('Y'), "stickWood")); + LOTRRecipes.dwarvenRecipes.add(new ShapedOreRecipe(new ItemStack(CinderLoE.daggerRedDwarf), "X ", "Y ", + Character.valueOf('X'), CinderLoE.redDwarfSteel, Character.valueOf('Y'), "stickWood")); + LOTRRecipes.dwarvenRecipes.add(new ShapedOreRecipe(new ItemStack(CinderLoE.crossbowRedDwarf), "XXY", "ZYX", "YZX", + Character.valueOf('X'), CinderLoE.redDwarfSteel, Character.valueOf('Y'), "stickWood", Character.valueOf('Z'), "string")); + LOTRRecipes.dwarvenRecipes.add(new ShapedOreRecipe(new ItemStack(CinderLoE.boarArmorRedDwarf), "X ", "XYX", "XXX", + Character.valueOf('X'), CinderLoE.redDwarfSteel, Character.valueOf('Y'), "leather")); + LOTRRecipes.dwarvenRecipes.add(new ShapedOreRecipe(new ItemStack(CinderLoE.blockRedDwarfSteel), "XXX", "XXX", "XXX", + Character.valueOf('X'), CinderLoE.redDwarfSteel)); + LOTRRecipes.dwarvenRecipes.add(new ShapedOreRecipe(new ItemStack(CinderLoE.redDwarfSteel), "X ", " ", + Character.valueOf('X'), CinderLoE.redDwarfSteel)); + LOTRRecipes.dwarvenRecipes.add(new ShapedOreRecipe(new ItemStack(CinderLoE.chandelierRedDwarf, 2), " X ", "ZYZ", " ", + Character.valueOf('X'), "stickWood", Character.valueOf('Y'), CinderLoE.redDwarfSteel, Character.valueOf('Z'), Blocks.torch)); + LOTRRecipes.dwarvenRecipes.add(new ShapedOreRecipe(new ItemStack(CinderLoE.barsRedDwarf, 16), "XXX", "XXX", " ", + Character.valueOf('X'), CinderLoE.redDwarfSteel)); + LOTRRecipes.dwarvenRecipes.add(new ShapedOreRecipe(new ItemStack(CinderLoE.dwarvenBrickRuned, 4), " X ", "XYX", " X ", + Character.valueOf('X'), new ItemStack(LOTRMod.brick, 1, 6), Character.valueOf('Y'), Items.gold_nugget)); + GameRegistry.addShapelessRecipe(new ItemStack(CinderLoE.redDwarfSteel, 9), new ItemStack(CinderLoE.blockRedDwarfSteel)); + GameRegistry.addRecipe(new ItemStack(CinderLoE.blockRedDwarfSteel, 1), "XXX", "XXX", "XXX", + Character.valueOf('X'), CinderLoE.redDwarfSteel); + LOTRRecipes.dwarvenRecipes.add(new ShapedOreRecipe(new ItemStack(LOTRMod.banner, 1, 42), " YR", " X ", " Z ", + Character.valueOf('X'), "stickWood", Character.valueOf('Y'), Blocks.wool, Character.valueOf('Z'), "plankWood", Character.valueOf('R'), "dyeRed")); GameRegistry.addRecipe(new LOTRRecipePoisonWeapon(CinderLoE.daggerRedDwarf, CinderLoE.daggerRedDwarfPoisoned)); } @@ -182,66 +187,76 @@ public class recipes { OreDictionary.registerOre("bone", LOTRMod.trollBone); OreDictionary.registerOre("bone", LOTRMod.wargBone); - LOTRRecipes.moredainRecipes.add(new ShapedOreRecipe(new ItemStack(CinderLoE.helmetLimwaith), new Object[] { "XXX", "Y Y", - Character.valueOf('X'), LOTRMod.driedReeds, Character.valueOf('Y'), new ItemStack(LOTRMod.planks, 1, 15)})); - LOTRRecipes.moredainRecipes.add(new ShapedOreRecipe(new ItemStack(CinderLoE.bodyLimwaith), new Object[] { "X X", "YYY", "XXX", - Character.valueOf('X'), LOTRMod.driedReeds, Character.valueOf('Y'), new ItemStack(LOTRMod.planks, 1, 15)})); - LOTRRecipes.moredainRecipes.add(new ShapedOreRecipe(new ItemStack(CinderLoE.legsLimwaith), new Object[] { "XXX", "Y Y", "X X", - Character.valueOf('X'), LOTRMod.driedReeds, Character.valueOf('Y'), new ItemStack(LOTRMod.planks, 1, 15)})); - LOTRRecipes.moredainRecipes.add(new ShapedOreRecipe(new ItemStack(CinderLoE.bootsLimwaith), new Object[] { "Y Y", "X X", - Character.valueOf('X'), LOTRMod.driedReeds, Character.valueOf('Y'), new ItemStack(LOTRMod.planks, 1, 15)})); - LOTRRecipes.moredainRecipes.add(new ShapedOreRecipe(new ItemStack(CinderLoE.spearLimwaith), new Object[] { " X", " Y ", "Y ", - Character.valueOf('X'), "bone", Character.valueOf('Y'), "stickWood" })); - LOTRRecipes.moredainRecipes.add(new ShapedOreRecipe(new ItemStack(CinderLoE.truncheonLimwaith), new Object[] { " X ", " X ", " Y ", - Character.valueOf('X'), "bone", Character.valueOf('Y'), "stickWood" })); - LOTRRecipes.moredainRecipes.add(new ShapedOreRecipe(new ItemStack(CinderLoE.battleaxeLimwaith), new Object[] { "XXX", "XYX", " Y ", - Character.valueOf('X'), "bone", Character.valueOf('Y'), "stickWood" })); - LOTRRecipes.moredainRecipes.add(new ShapedOreRecipe(new ItemStack(CinderLoE.tridentLimwaith), new Object[] { " XX", " YX", "Y ", - Character.valueOf('X'), "bone", Character.valueOf('Y'), "stickWood" })); - LOTRRecipes.moredainRecipes.add(new ShapedOreRecipe(new ItemStack(CinderLoE.daggerLimwaith), new Object[] { "X ", "Y ", - Character.valueOf('X'), "bone", Character.valueOf('Y'), "stickWood" })); - LOTRRecipes.moredainRecipes.add(new ShapedOreRecipe(new ItemStack(CinderLoE.blowgunLimwaith), new Object[] { "YXX", " ", " ", - Character.valueOf('X'), LOTRMod.reeds, Character.valueOf('Y'), "stickWood" })); + LOTRRecipes.moredainRecipes.add(new ShapedOreRecipe(new ItemStack(CinderLoE.helmetLimwaith), "XXX", "Y Y", + Character.valueOf('X'), LOTRMod.driedReeds, Character.valueOf('Y'), new ItemStack(LOTRMod.planks, 1, 15))); + LOTRRecipes.moredainRecipes.add(new ShapedOreRecipe(new ItemStack(CinderLoE.bodyLimwaith), "X X", "YYY", "XXX", + Character.valueOf('X'), LOTRMod.driedReeds, Character.valueOf('Y'), new ItemStack(LOTRMod.planks, 1, 15))); + LOTRRecipes.moredainRecipes.add(new ShapedOreRecipe(new ItemStack(CinderLoE.legsLimwaith), "XXX", "Y Y", "X X", + Character.valueOf('X'), LOTRMod.driedReeds, Character.valueOf('Y'), new ItemStack(LOTRMod.planks, 1, 15))); + LOTRRecipes.moredainRecipes.add(new ShapedOreRecipe(new ItemStack(CinderLoE.bootsLimwaith), "Y Y", "X X", + Character.valueOf('X'), LOTRMod.driedReeds, Character.valueOf('Y'), new ItemStack(LOTRMod.planks, 1, 15))); + LOTRRecipes.moredainRecipes.add(new ShapedOreRecipe(new ItemStack(CinderLoE.spearLimwaith), " X", " Y ", "Y ", + Character.valueOf('X'), "bone", Character.valueOf('Y'), "stickWood")); + LOTRRecipes.moredainRecipes.add(new ShapedOreRecipe(new ItemStack(CinderLoE.truncheonLimwaith), " X ", " X ", " Y ", + Character.valueOf('X'), "bone", Character.valueOf('Y'), "stickWood")); + LOTRRecipes.moredainRecipes.add(new ShapedOreRecipe(new ItemStack(CinderLoE.battleaxeLimwaith), "XXX", "XYX", " Y ", + Character.valueOf('X'), "bone", Character.valueOf('Y'), "stickWood")); + LOTRRecipes.moredainRecipes.add(new ShapedOreRecipe(new ItemStack(CinderLoE.tridentLimwaith), " XX", " YX", "Y ", + Character.valueOf('X'), "bone", Character.valueOf('Y'), "stickWood")); + LOTRRecipes.moredainRecipes.add(new ShapedOreRecipe(new ItemStack(CinderLoE.daggerLimwaith), "X ", "Y ", + Character.valueOf('X'), "bone", Character.valueOf('Y'), "stickWood")); + LOTRRecipes.moredainRecipes.add(new ShapedOreRecipe(new ItemStack(CinderLoE.blowgunLimwaith), "YXX", " ", " ", + Character.valueOf('X'), LOTRMod.reeds, Character.valueOf('Y'), "stickWood")); GameRegistry.addRecipe(new LOTRRecipePoisonWeapon(CinderLoE.daggerLimwaith, CinderLoE.daggerLimwaithPoisoned)); - LOTRRecipes.moredainRecipes.add(new ShapelessOreRecipe(new ItemStack(CinderLoE.bonemold), new Object[] {"bone", new ItemStack(Items.dye, 1, 15), new ItemStack(Items.dye, 1, 15)})); - - LOTRRecipes.moredainRecipes.add(new ShapedOreRecipe(new ItemStack(CinderLoE.helmetboneLimwaith), new Object[] { "XXX", "Y Y", - Character.valueOf('X'), "bone", Character.valueOf('Y'), CinderLoE.bonemold})); - LOTRRecipes.moredainRecipes.add(new ShapedOreRecipe(new ItemStack(CinderLoE.bodyboneLimwaith), new Object[] { "X X", "YYY", "XXX", - Character.valueOf('X'), "bone", Character.valueOf('Y'), CinderLoE.bonemold})); - LOTRRecipes.moredainRecipes.add(new ShapedOreRecipe(new ItemStack(CinderLoE.legsboneLimwaith), new Object[] { "XXX", "Y Y", "X X", - Character.valueOf('X'), "bone", Character.valueOf('Y'), CinderLoE.bonemold})); - LOTRRecipes.moredainRecipes.add(new ShapedOreRecipe(new ItemStack(CinderLoE.bootsboneLimwaith), new Object[] { "Y Y", "X X", - Character.valueOf('X'), "bone", Character.valueOf('Y'), CinderLoE.bonemold})); - LOTRRecipes.moredainRecipes.add(new ShapedOreRecipe(new ItemStack(LOTRMod.banner, 1, 43), new Object[] { " YR", " X ", " Z ", - Character.valueOf('X'), "stickWood", Character.valueOf('Y'), Blocks.wool, Character.valueOf('Z'), "plankWood", Character.valueOf('R'), LOTRMod.reeds})); + LOTRRecipes.moredainRecipes.add(new ShapelessOreRecipe(new ItemStack(CinderLoE.bonemold), "bone", new ItemStack(Items.dye, 1, 15), new ItemStack(Items.dye, 1, 15))); + + LOTRRecipes.moredainRecipes.add(new ShapedOreRecipe(new ItemStack(CinderLoE.helmetboneLimwaith), "XXX", "Y Y", + Character.valueOf('X'), "bone", Character.valueOf('Y'), CinderLoE.bonemold)); + LOTRRecipes.moredainRecipes.add(new ShapedOreRecipe(new ItemStack(CinderLoE.bodyboneLimwaith), "X X", "YYY", "XXX", + Character.valueOf('X'), "bone", Character.valueOf('Y'), CinderLoE.bonemold)); + LOTRRecipes.moredainRecipes.add(new ShapedOreRecipe(new ItemStack(CinderLoE.legsboneLimwaith), "XXX", "Y Y", "X X", + Character.valueOf('X'), "bone", Character.valueOf('Y'), CinderLoE.bonemold)); + LOTRRecipes.moredainRecipes.add(new ShapedOreRecipe(new ItemStack(CinderLoE.bootsboneLimwaith), "Y Y", "X X", + Character.valueOf('X'), "bone", Character.valueOf('Y'), CinderLoE.bonemold)); + LOTRRecipes.moredainRecipes.add(new ShapedOreRecipe(new ItemStack(LOTRMod.banner, 1, 43), " YR", " X ", " Z ", + Character.valueOf('X'), "stickWood", Character.valueOf('Y'), Blocks.wool, Character.valueOf('Z'), "plankWood", Character.valueOf('R'), LOTRMod.reeds)); } public static void registerBreeRecipes() { - LOTRRecipes.breeRecipes.add(new ShapedOreRecipe(new ItemStack(CinderLoE.helmetBreeKettle), new Object[] { "XYX", - Character.valueOf('X'), Items.iron_ingot, Character.valueOf('Y'), CinderLoE.helmetBree})); - LOTRRecipes.breeRecipes.add(new ShapedOreRecipe(new ItemStack(CinderLoE.helmetBree), new Object[] { "XXX", "X X", - Character.valueOf('X'), Items.iron_ingot})); - LOTRRecipes.breeRecipes.add(new ShapedOreRecipe(new ItemStack(CinderLoE.bodyBree), new Object[] { "X X", "XXX", "XXX", - Character.valueOf('X'), Items.iron_ingot })); - LOTRRecipes.breeRecipes.add(new ShapedOreRecipe(new ItemStack(CinderLoE.legsBree), new Object[] { "XXX", "X X", "X X", - Character.valueOf('X'), Items.iron_ingot })); - LOTRRecipes.breeRecipes.add(new ShapedOreRecipe(new ItemStack(CinderLoE.bootsBree), new Object[] { "X X", "X X", - Character.valueOf('X'), Items.iron_ingot })); - LOTRRecipes.breeRecipes.add(new ShapedOreRecipe(new ItemStack(CinderLoE.swordBree), new Object[] { " X ", " X ", " Y ", - Character.valueOf('X'), Items.iron_ingot, Character.valueOf('Y'), "stickWood" })); + LOTRRecipes.breeRecipes.add(new ShapedOreRecipe(new ItemStack(CinderLoE.helmetBreeKettle), "XYX", + Character.valueOf('X'), Items.iron_ingot, Character.valueOf('Y'), CinderLoE.helmetBree)); + LOTRRecipes.breeRecipes.add(new ShapedOreRecipe(new ItemStack(CinderLoE.helmetBree), "XXX", "X X", + Character.valueOf('X'), Items.iron_ingot)); + LOTRRecipes.breeRecipes.add(new ShapedOreRecipe(new ItemStack(CinderLoE.bodyBree), "X X", "XXX", "XXX", + Character.valueOf('X'), Items.iron_ingot)); + LOTRRecipes.breeRecipes.add(new ShapedOreRecipe(new ItemStack(CinderLoE.legsBree), "XXX", "X X", "X X", + Character.valueOf('X'), Items.iron_ingot)); + LOTRRecipes.breeRecipes.add(new ShapedOreRecipe(new ItemStack(CinderLoE.bootsBree), "X X", "X X", + Character.valueOf('X'), Items.iron_ingot)); + LOTRRecipes.breeRecipes.add(new ShapedOreRecipe(new ItemStack(CinderLoE.swordBree), " X ", " X ", " Y ", + Character.valueOf('X'), Items.iron_ingot, Character.valueOf('Y'), "stickWood")); } + public static void registerAngmarRecipes() { + LOTRRecipes.angmarRecipes.add(new ShapedOreRecipe(new ItemStack(CinderLoE.helmetRhudaur), "XXX", "X X", + Character.valueOf('X'), Items.iron_ingot)); + LOTRRecipes.angmarRecipes.add(new ShapedOreRecipe(new ItemStack(CinderLoE.bodyRhudaur), "X X", "XXX", "XXX", + Character.valueOf('X'), Items.iron_ingot)); + LOTRRecipes.angmarRecipes.add(new ShapedOreRecipe(new ItemStack(CinderLoE.legsRhudaur), "XXX", "X X", "X X", + Character.valueOf('X'), Items.iron_ingot)); + LOTRRecipes.angmarRecipes.add(new ShapedOreRecipe(new ItemStack(CinderLoE.bootsRhudaur), "X X", "X X", + Character.valueOf('X'), Items.iron_ingot)); + } public static void registerArnorRecipes() { - LOTRRecipes.rangerRecipes.add(new ShapedOreRecipe(new ItemStack(CinderLoE.helmetArnorBanner), new Object[] { "YYY", "Y Y", - Character.valueOf('X'), Items.iron_ingot, Character.valueOf('Y'), Items.leather })); - LOTRRecipes.rangerRecipes.add(new ShapedOreRecipe(new ItemStack(CinderLoE.bodyArnorBanner), new Object[] { "Y Y", "XXX", "YYY", - Character.valueOf('X'), Items.iron_ingot, Character.valueOf('Y'), Items.leather })); - LOTRRecipes.rangerRecipes.add(new ShapedOreRecipe(new ItemStack(CinderLoE.legsArnorBanner), new Object[] { "YYY", "X X", "Y Y", - Character.valueOf('X'), Items.iron_ingot, Character.valueOf('Y'), Items.leather })); - LOTRRecipes.rangerRecipes.add(new ShapedOreRecipe(new ItemStack(CinderLoE.bootsArnorBanner), new Object[] { "X X", "X X", - Character.valueOf('X'), Items.iron_ingot, Character.valueOf('Y'), Items.leather })); - LOTRRecipes.rangerRecipes.add(new ShapedOreRecipe(new ItemStack(CinderLoE.maceArnor), new Object[] { " XX", " XX", "Y ", - Character.valueOf('X'), Items.iron_ingot, Character.valueOf('Y'), "stickWood" })); + LOTRRecipes.rangerRecipes.add(new ShapedOreRecipe(new ItemStack(CinderLoE.helmetArnorBanner), "YYY", "Y Y", + Character.valueOf('X'), Items.iron_ingot, Character.valueOf('Y'), Items.leather)); + LOTRRecipes.rangerRecipes.add(new ShapedOreRecipe(new ItemStack(CinderLoE.bodyArnorBanner), "Y Y", "XXX", "YYY", + Character.valueOf('X'), Items.iron_ingot, Character.valueOf('Y'), Items.leather)); + LOTRRecipes.rangerRecipes.add(new ShapedOreRecipe(new ItemStack(CinderLoE.legsArnorBanner), "YYY", "X X", "Y Y", + Character.valueOf('X'), Items.iron_ingot, Character.valueOf('Y'), Items.leather)); + LOTRRecipes.rangerRecipes.add(new ShapedOreRecipe(new ItemStack(CinderLoE.bootsArnorBanner), "X X", "X X", + Character.valueOf('X'), Items.iron_ingot, Character.valueOf('Y'), Items.leather)); + LOTRRecipes.rangerRecipes.add(new ShapedOreRecipe(new ItemStack(CinderLoE.maceArnor), " XX", " XX", "Y ", + Character.valueOf('X'), Items.iron_ingot, Character.valueOf('Y'), "stickWood")); } } diff --git a/src/main/resources/assets/cinder_loe/lang/en_US.lang b/src/main/resources/assets/cinder_loe/lang/en_US.lang index 3b3836b..fc813f3 100644 --- a/src/main/resources/assets/cinder_loe/lang/en_US.lang +++ b/src/main/resources/assets/cinder_loe/lang/en_US.lang @@ -17,8 +17,8 @@ tile.lotr:reeflessCoral.name=Cut Coral tile.lotr:cutDrystone.name=Cut Drystone tile.lotr:plaster.name=Plaster tile.lotr:voidblock.name=Void -tile.lotr:cobblebrick.0.name=Cobbled Drystone -tile.lotr:cobblebrick.1.name=Cobbled Mordor Rock +tile.lotr:cindercobble.0.name=Cobbled Drystone +tile.lotr:cindercobble.1.name=Cobbled Mordor Rock item.lotr:spearUnnamed.name=Drannach Oriour item.lotr:frostblade.name=Frostblade diff --git a/src/main/resources/assets/lotr/textures/blocks/cinder_block.png.mcmeta b/src/main/resources/assets/lotr/textures/blocks/cinder_block.png.mcmeta index a3e8d32..abe58ab 100644 --- a/src/main/resources/assets/lotr/textures/blocks/cinder_block.png.mcmeta +++ b/src/main/resources/assets/lotr/textures/blocks/cinder_block.png.mcmeta @@ -1,3 +1,3 @@ { - "animation":{"frametime":5} + "animation":{"frametime":8} } \ No newline at end of file