diff --git a/src/main/java/com/zivilon/cinder_loe/CinderBrewingRecipes.java b/src/main/java/com/zivilon/cinder_loe/CinderBrewingRecipes.java new file mode 100644 index 0000000..435ea47 --- /dev/null +++ b/src/main/java/com/zivilon/cinder_loe/CinderBrewingRecipes.java @@ -0,0 +1,22 @@ +package com.zivilon.cinder_loe; + +import net.minecraft.item.ItemStack; + +import java.lang.reflect.Method; + +public class CinderBrewingRecipes { + public static void addCustomBrewingRecipe(ItemStack result, Object... ingredients) { + try { + Class brewingRecipesClass = Class.forName("lotr.common.recipe.LOTRBrewingRecipes"); + Method addBrewingRecipeMethod = brewingRecipesClass.getDeclaredMethod("addBrewingRecipe", ItemStack.class, Object[].class); + + addBrewingRecipeMethod.setAccessible(true); + + addBrewingRecipeMethod.invoke(null, result, ingredients); + + + } catch (Exception e) { + e.printStackTrace(); + } + } +} diff --git a/src/main/java/com/zivilon/cinder_loe/CinderLoE.java b/src/main/java/com/zivilon/cinder_loe/CinderLoE.java index acb56ce..1a6fded 100644 --- a/src/main/java/com/zivilon/cinder_loe/CinderLoE.java +++ b/src/main/java/com/zivilon/cinder_loe/CinderLoE.java @@ -82,7 +82,7 @@ import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.world.WorldEvent; import static lotr.common.LOTRMod.horseArmorIron; -import static lotr.common.item.LOTRMaterial.GONDOR; +import static lotr.common.item.LOTRMaterial.*; import net.minecraft.command.ICommandSender; import net.minecraft.command.CommandBase; @@ -112,9 +112,6 @@ public class CinderLoE { public static LOTRMaterial MATERIAL_RHUDAUR; public static LOTRMaterial MATERIAL_BATTLENUN; public static LOTRMaterial MATERIAL_ASH; - public static LOTRMaterial MATERIAL_SERPENT; - public static LOTRMaterial MATERIAL_USURPER; - public static LOTRMaterial MATERIAL_WARLORD; public static LOTRMaterial MATERIAL_JADE; // Blocks @@ -620,7 +617,7 @@ public class CinderLoE { //Relics ItemRegistration.register(welfRelic, "welfRelic", 6704); - linkLOTRWeapon(welfRelic, "welfRelic"); + //linkLOTRWeapon(welfRelic, "welfRelic"); // Misc cinderFurItem = (new CinderFurItem()).setUnlocalizedName("cinder_fur_item").setTextureName("lotr:cinder_fur_item_0"); @@ -644,6 +641,7 @@ public class CinderLoE { ItemRegistration.register(frostblade, "frostblade", 6200); ItemRegistration.register(forgingKit,"forgingKit",6001); + ItemRegistration.register(whip, "whip", 6110); ItemRegistration.register(daggervoid, "daggerVoid", 6201); ItemRegistration.register(spearsolidgold, "spearsolidgold", 6202); @@ -654,18 +652,18 @@ public class CinderLoE { ItemRegistration.register(legsJade, "legsJade", 6207); ItemRegistration.register(bootsJade, "bootsJade", 6208); linkLOTRWeapon(frostblade, "frostblade"); - linkLOTRWeapon(daggervoid, "daggerVoid"); + //linkLOTRWeapon(daggervoid, "daggerVoid"); linkLOTRWeapon(spearsolidgold, "spearsolidgold"); linkLOTRWeapon(spearUnnamed, "spearUnnamed"); linkLOTRWeapon(whip, "whip"); // Common Tools/Weapons - cleaver = (new LOTRItemDagger(GONDOR)).setUnlocalizedName("lotr:cleaver").setTextureName("lotr:cleaver"); + cleaver = (new LOTRItemDagger(Item.ToolMaterial.IRON)).setUnlocalizedName("lotr:cleaver").setTextureName("lotr:cleaver"); warDart = (new WarDart()).setUnlocalizedName("war_dart").setTextureName("lotr:war_dart"); warDartHeads = (new WarDartHeads()).setUnlocalizedName("war_dart_heads").setTextureName("lotr:war_dart_heads_0"); ItemRegistration.register(cleaver,"cleaver",6109); - linkLOTRWeapon(cleaver, "cleaver"); + // linkLOTRWeapon(cleaver, "cleaver"); ItemRegistration.register(warDart,"warDart",6111); ItemRegistration.register(warDartHeads,"warDartHeads",6500); @@ -817,8 +815,8 @@ public class CinderLoE { bootsBree = (new LOTRItemArmor(MATERIAL_BREE, 3)).setUnlocalizedName("lotr:bootsBree").setTextureName("lotr:bootsBree"); swordBree = (new LOTRItemSword(MATERIAL_BREE)).setUnlocalizedName("lotr:swordBree").setTextureName("lotr:swordBree"); - ItemRegistration.register(helmetBree, "helmetBree", 6440); - ItemRegistration.register(helmetBreeKettle, "breekettle", 6441); + ItemRegistration.register(helmetBreeKettle, "breekettle", 6440); + ItemRegistration.register(helmetBree, "helmetBree", 6441); ItemRegistration.register(bodyBree, "bodyBree", 6442); ItemRegistration.register(legsBree, "legsBree", 6443); ItemRegistration.register(bootsBree, "bootsBree", 6444); @@ -829,48 +827,35 @@ public class CinderLoE { linkLOTRWeapon(swordBree, "swordBree"); //Elite Armors - MATERIAL_SERPENT = getLOTRMaterialByName("SERPENT"); - if (MATERIAL_SERPENT != null) { - helmetserpent = (new LOTRItemArmor(MATERIAL_SERPENT, 0)).setUnlocalizedName("lotr:helmetserpent").setTextureName("lotr:helmetserpent").setCreativeTab(null); - bodyserpent = (new LOTRItemArmor(MATERIAL_SERPENT, 1, "chestplate")).setUnlocalizedName("lotr:bodyserpent").setTextureName("lotr:bodyserpent").setCreativeTab(null); - legsserpent = (new LOTRItemArmor(MATERIAL_SERPENT, 2)).setUnlocalizedName("lotr:legsserpent").setTextureName("lotr:legsserpent").setCreativeTab(null); - bootsserpent = (new LOTRItemArmor(MATERIAL_SERPENT, 3)).setUnlocalizedName("lotr:bootsserpent").setTextureName("lotr:bootsserpent").setCreativeTab(null); - - ItemRegistration.register(helmetserpent, "helmetserpent", 6800); - ItemRegistration.register(bodyserpent, "bodyserpent", 6801); - ItemRegistration.register(legsserpent, "legsserpent", 6802); - ItemRegistration.register(bootsserpent, "bootsserpent", 6803); - } else { - System.err.println("Failed to find SERPENT material for armor initialization."); - } - MATERIAL_USURPER = getLOTRMaterialByName("USURPER"); - if (MATERIAL_USURPER != null) { - helmetUsurper = (new LOTRItemArmor(MATERIAL_USURPER, 0, "helmet")).setUnlocalizedName("lotr:helmetUsurper").setTextureName("lotr:helmetUsurper").setCreativeTab(null); - bodyUsurper = (new LOTRItemArmor(MATERIAL_USURPER, 1)).setUnlocalizedName("lotr:bodyUsurper").setTextureName("lotr:bodyUsurper").setCreativeTab(null); - legsUsurper = (new LOTRItemArmor(MATERIAL_USURPER, 2)).setUnlocalizedName("lotr:legsUsurper").setTextureName("lotr:legsUsurper").setCreativeTab(null); - bootsUsurper = (new LOTRItemArmor(MATERIAL_USURPER, 3)).setUnlocalizedName("lotr:bootsUsurper").setTextureName("lotr:bootsUsurper").setCreativeTab(null); - - ItemRegistration.register(helmetUsurper, "helmetUsurper", 6804); - ItemRegistration.register(bodyUsurper, "bodyUsurper", 6805); - ItemRegistration.register(legsUsurper, "legsUsurper", 6806); - ItemRegistration.register(bootsUsurper, "bootsUsurper", 6807); - } else { - System.err.println("Failed to find USURPER material for armor initialization."); - } - MATERIAL_WARLORD = getLOTRMaterialByName("WARLORD"); - if (MATERIAL_WARLORD != null) { - helmetWarlord = (new LOTRItemArmor(MATERIAL_WARLORD, 0, "helmet")).setUnlocalizedName("lotr:helmetWarlord").setTextureName("lotr:helmetWarlord").setCreativeTab(null); - bodyWarlord = (new LOTRItemArmor(MATERIAL_WARLORD, 1)).setUnlocalizedName("lotr:bodyWarlord").setTextureName("lotr:bodyWarlord").setCreativeTab(null); - legsWarlord = (new LOTRItemArmor(MATERIAL_WARLORD, 2)).setUnlocalizedName("lotr:legsWarlord").setTextureName("lotr:legsWarlord").setCreativeTab(null); - bootsWarlord = (new LOTRItemArmor(MATERIAL_WARLORD, 3)).setUnlocalizedName("lotr:bootsWarlord").setTextureName("lotr:bootsWarlord").setCreativeTab(null); - - ItemRegistration.register(helmetWarlord, "helmetWarlord", 6808); - ItemRegistration.register(bodyWarlord, "bodyWarlord", 6809); - ItemRegistration.register(legsWarlord, "legsWarlord", 6810); - ItemRegistration.register(bootsWarlord, "bootsWarlord", 6811); - } else { - System.err.println("Failed to find WARLORD material for armor initialization."); - } + helmetserpent = (new LOTRItemArmor(NEAR_HARAD, 0)).setUnlocalizedName("lotr:helmetserpent").setTextureName("lotr:helmetserpent").setCreativeTab(null); + bodyserpent = (new LOTRItemArmor(NEAR_HARAD, 1, "chestplate")).setUnlocalizedName("lotr:bodyserpent").setTextureName("lotr:bodyserpent").setCreativeTab(null); + legsserpent = (new LOTRItemArmor(NEAR_HARAD, 2)).setUnlocalizedName("lotr:legsserpent").setTextureName("lotr:legsserpent").setCreativeTab(null); + bootsserpent = (new LOTRItemArmor(NEAR_HARAD, 3)).setUnlocalizedName("lotr:bootsserpent").setTextureName("lotr:bootsserpent").setCreativeTab(null); + + ItemRegistration.register(helmetserpent, "helmetserpent", 6800); + ItemRegistration.register(bodyserpent, "bodyserpent", 6801); + ItemRegistration.register(legsserpent, "legsserpent", 6802); + ItemRegistration.register(bootsserpent, "bootsserpent", 6803); + + helmetUsurper = (new LOTRItemArmor(UMBAR, 0, "helmet")).setUnlocalizedName("lotr:helmetUsurper").setTextureName("lotr:helmetUsurper").setCreativeTab(null); + bodyUsurper = (new LOTRItemArmor(UMBAR, 1)).setUnlocalizedName("lotr:bodyUsurper").setTextureName("lotr:bodyUsurper").setCreativeTab(null); + legsUsurper = (new LOTRItemArmor(UMBAR, 2)).setUnlocalizedName("lotr:legsUsurper").setTextureName("lotr:legsUsurper").setCreativeTab(null); + bootsUsurper = (new LOTRItemArmor(UMBAR, 3)).setUnlocalizedName("lotr:bootsUsurper").setTextureName("lotr:bootsUsurper").setCreativeTab(null); + + ItemRegistration.register(helmetUsurper, "helmetUsurper", 6804); + ItemRegistration.register(bodyUsurper, "bodyUsurper", 6805); + ItemRegistration.register(legsUsurper, "legsUsurper", 6806); + ItemRegistration.register(bootsUsurper, "bootsUsurper", 6807); + + helmetWarlord = (new LOTRItemArmor(MOREDAIN, 0, "helmet")).setUnlocalizedName("lotr:helmetWarlord").setTextureName("lotr:helmetWarlord").setCreativeTab(null); + bodyWarlord = (new LOTRItemArmor(MOREDAIN, 1)).setUnlocalizedName("lotr:bodyWarlord").setTextureName("lotr:bodyWarlord").setCreativeTab(null); + legsWarlord = (new LOTRItemArmor(MOREDAIN, 2)).setUnlocalizedName("lotr:legsWarlord").setTextureName("lotr:legsWarlord").setCreativeTab(null); + bootsWarlord = (new LOTRItemArmor(MOREDAIN, 3)).setUnlocalizedName("lotr:bootsWarlord").setTextureName("lotr:bootsWarlord").setCreativeTab(null); + + ItemRegistration.register(helmetWarlord, "helmetWarlord", 6808); + ItemRegistration.register(bodyWarlord, "bodyWarlord", 6809); + ItemRegistration.register(legsWarlord, "legsWarlord", 6810); + ItemRegistration.register(bootsWarlord, "bootsWarlord", 6811); //Rhudaur MATERIAL_RHUDAUR = getLOTRMaterialByName("RHUDAUR"); diff --git a/src/main/java/com/zivilon/cinder_loe/Materials.java b/src/main/java/com/zivilon/cinder_loe/Materials.java index 1c6d44f..6d134f3 100644 --- a/src/main/java/com/zivilon/cinder_loe/Materials.java +++ b/src/main/java/com/zivilon/cinder_loe/Materials.java @@ -21,9 +21,6 @@ public class Materials { 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); modifyMaterial("ASH", 2000, 0.0F, 0.6F, 2, 7.0F, 10, CinderLoE.ingotAsh); - 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.8F, 0, 9.0F, 10, LOTRMod.emerald); } 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 95f4a23..29e21ea 100644 --- a/src/main/java/com/zivilon/cinder_loe/coremod/LOTRMaterialTransformer.java +++ b/src/main/java/com/zivilon/cinder_loe/coremod/LOTRMaterialTransformer.java @@ -63,9 +63,6 @@ public class LOTRMaterialTransformer implements IClassTransformer { addMaterial("BATTLENUN", classNode); addMaterial("ASH", classNode); addMaterial("RHUDAUR", classNode); - addMaterial("SERPENT", classNode); - addMaterial("USURPER", classNode); - addMaterial("WARLORD",classNode); addMaterial("JADE",classNode); // Protection Conversion diff --git a/src/main/java/com/zivilon/cinder_loe/mixins/overrides/MixinLOTRHiredNPCInfo.java b/src/main/java/com/zivilon/cinder_loe/mixins/overrides/MixinLOTRHiredNPCInfo.java index cf9c4db..0935a31 100644 --- a/src/main/java/com/zivilon/cinder_loe/mixins/overrides/MixinLOTRHiredNPCInfo.java +++ b/src/main/java/com/zivilon/cinder_loe/mixins/overrides/MixinLOTRHiredNPCInfo.java @@ -99,7 +99,7 @@ public class MixinLOTRHiredNPCInfo { } public void increaseMovementGain(EntityLivingBase gainingEntity) { - float movementBoost = 0.005f; + float movementBoost = 0.0025f; IAttributeInstance attribute = gainingEntity.getEntityAttribute(SharedMonsterAttributes.movementSpeed); attribute.setBaseValue(attribute.getBaseValue() + (double)movementBoost); } diff --git a/src/main/java/com/zivilon/cinder_loe/recipes.java b/src/main/java/com/zivilon/cinder_loe/recipes.java index fa5d3c8..196a5e2 100644 --- a/src/main/java/com/zivilon/cinder_loe/recipes.java +++ b/src/main/java/com/zivilon/cinder_loe/recipes.java @@ -2,6 +2,8 @@ package com.zivilon.cinder_loe; import cpw.mods.fml.common.registry.GameRegistry; import lotr.common.LOTRMod; +import lotr.common.recipe.LOTRBrewingRecipes; +import lotr.common.recipe.LOTRMillstoneRecipes; import lotr.common.recipe.LOTRRecipePoisonWeapon; import lotr.common.recipe.LOTRRecipes; import com.zivilon.cinder_loe.CinderLoE; @@ -9,6 +11,7 @@ import com.zivilon.cinder_loe.mixins.MixinLOTRBrewingRecipes; import lotr.common.item.LOTRItemFood; import net.minecraft.init.Blocks; +import net.minecraft.item.Item; import net.minecraft.item.crafting.IRecipe; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; @@ -18,6 +21,8 @@ import net.minecraftforge.oredict.ShapelessOreRecipe; import net.minecraftforge.oredict.RecipeSorter; import net.minecraftforge.oredict.RecipeSorter.Category; +import static lotr.common.recipe.LOTRBrewingRecipes.BARREL_CAPACITY; + public class recipes { @@ -31,6 +36,7 @@ public class recipes { registerArnorRecipes(); registerAngmarRecipes(); registerBrewingRecipes(); + registerMillstoneRecipes(); } public static void registerGeneralRecipes() { @@ -142,7 +148,7 @@ 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 ShapelessOreRecipe(new ItemStack(CinderLoE.pasta, 4), new ItemStack(LOTRMod.rollingPin, 1, OreDictionary.WILDCARD_VALUE), CinderLoE.dough, CinderLoE.dough)); GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(CinderLoE.halva), Items.sugar, CinderLoE.dough, CinderLoE.spice, LOTRMod.almond)); GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(CinderLoE.chocolatebar, 2), LOTRMod.mugChocolate)); @@ -181,7 +187,7 @@ public class recipes { 'X', LOTRMod.coralReef)); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(CinderLoE.plaster, 4), "XYX", "YXY", "XYX", 'X', Items.paper, 'Y', Blocks.clay)); - // Mordor Cobblebrick + // Cinder Stony Blocks GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(CinderLoE.cindercobble, 4, 1), "XY", "YX", 'X', new ItemStack(LOTRMod.rock, 1, 0), 'Y', LOTRMod.mordorGravel)); @@ -192,6 +198,53 @@ public class recipes { GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(LOTRMod.banner, 1, 46), " Y ", " X ", " Z ", 'X', "stickWood", 'Y', new ItemStack(Blocks.wool, 1, 13), 'Z', "plankWood")); + // Furs and then carpets + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(CinderLoE.cinderfur, 2, 0), "XX", "XX", + 'X', new ItemStack(LOTRMod.fur, 1))); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(CinderLoE.furCarpet, 3, 0), "XX", + 'X', new ItemStack(CinderLoE.cinderfur, 1, 0))); + + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(CinderLoE.cinderfur, 2, 1), "XX", "XX", + 'X', new ItemStack(CinderLoE.cinderFurItem, 1, 0))); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(CinderLoE.furCarpet, 3, 1), "XX", + 'X', new ItemStack(CinderLoE.cinderfur, 1, 1))); + + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(CinderLoE.cinderfur, 2, 2), "XX", "XX", + 'X', new ItemStack(CinderLoE.cinderFurItem, 1, 1))); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(CinderLoE.furCarpet, 3, 2), "XX", + 'X', new ItemStack(CinderLoE.cinderfur, 1, 2))); + + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(CinderLoE.cinderfur, 2, 3), "XX", "XX", + 'X', new ItemStack(CinderLoE.cinderFurItem, 1, 2))); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(CinderLoE.furCarpet, 3, 3), "XX", + 'X', new ItemStack(CinderLoE.cinderfur, 1, 3))); + + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(CinderLoE.cinderfur, 2, 4), "XX", "XX", + 'X', new ItemStack(CinderLoE.cinderFurItem, 1, 3))); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(CinderLoE.furCarpet, 3, 4), "XX", + 'X', new ItemStack(CinderLoE.cinderfur, 1, 4))); + + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(CinderLoE.cinderfur, 2, 5), "XX", "XX", + 'X', new ItemStack(CinderLoE.cinderFurItem, 1, 4))); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(CinderLoE.furCarpet, 3, 5), "XX", + 'X', new ItemStack(CinderLoE.cinderfur, 1, 5))); + + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(CinderLoE.cinderfur, 2, 6), "XX", "XX", + 'X', new ItemStack(CinderLoE.cinderFurItem, 1, 5))); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(CinderLoE.furCarpet, 3, 6), "XX", + 'X', new ItemStack(CinderLoE.cinderfur, 1, 6))); + + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(CinderLoE.cinderfur, 2, 7), "XX", "XX", + 'X', new ItemStack(LOTRMod.lionFur, 1))); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(CinderLoE.furCarpet, 3, 7), "XX", + 'X', new ItemStack(CinderLoE.cinderfur, 1, 7))); + + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(CinderLoE.cinderfur, 2, 8), "XX", "XX", + 'X', new ItemStack(CinderLoE.cinderFurItem, 1, 6))); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(CinderLoE.furCarpet, 3, 8), "XX", + 'X', new ItemStack(CinderLoE.cinderfur, 1, 8))); + + } public static void registerRedDwarvenRecipes() { LOTRRecipes.dwarvenRecipes.add(new ShapedOreRecipe(new ItemStack(CinderLoE.helmetRedDwarf), "XXX", "X X", @@ -319,5 +372,22 @@ public class recipes { Character.valueOf('X'), Items.iron_ingot, Character.valueOf('Y'), "stickWood")); } public static void registerBrewingRecipes() { + System.out.println("[CinderLoE] Registering Brewing recipes... We like to drink! jk I hate alcohol"); + + CinderBrewingRecipes.addCustomBrewingRecipe(new ItemStack(LOTRMod.mugTauredainCocoa, BARREL_CAPACITY), + new ItemStack(Items.dye, 1, 3), + new ItemStack(Items.dye, 1, 3), + new ItemStack(Items.dye, 1, 3), + new ItemStack(LOTRMod.doubleFlower, 1, 2), + new ItemStack(LOTRMod.doubleFlower, 1, 3), + new ItemStack(LOTRMod.mugMilk)); } + + public static void registerMillstoneRecipes() { + System.out.println("[CinderLoE] Registering Millstone recipes..."); + + LOTRMillstoneRecipes.addRecipe(Items.wheat, new ItemStack(CinderLoE.flour)); + LOTRMillstoneRecipes.addRecipe(LOTRMod.corn, new ItemStack(CinderLoE.flour)); + } + } diff --git a/src/main/java/com/zivilon/cinder_loe/util/DurableItemCrafter.java b/src/main/java/com/zivilon/cinder_loe/util/DurableItemCrafter.java index 6e950f8..e91aedb 100644 --- a/src/main/java/com/zivilon/cinder_loe/util/DurableItemCrafter.java +++ b/src/main/java/com/zivilon/cinder_loe/util/DurableItemCrafter.java @@ -13,5 +13,7 @@ public class DurableItemCrafter { static { customItems.add(LOTRMod.rollingPin); + customItems.add(LOTRMod.chisel); + customItems.add(CinderLoE.cleaver); } } 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 debbe50..546d135 100644 --- a/src/main/resources/assets/cinder_loe/lang/en_US.lang +++ b/src/main/resources/assets/cinder_loe/lang/en_US.lang @@ -326,6 +326,7 @@ entity.cinder_loe.EsgarothSoldier.name=Esgarothi Soldier entity.cinder_loe.RhudaurSoldier.name=Rhudaur Soldier entity.cinder_loe.TauredainTrueBlood.name=Taurethrim True-Blood entity.cinder_loe.Sirrandrai.name=Rider of Sirrandrai +entity.cinder_loe.NorthernOrc.name=Northern Orc lotr.enchant.protectWeak1=Dented lotr.enchant.protectWeak2=Defective diff --git a/src/main/resources/assets/cinder_loe/sounds/boss/victory.ogg b/src/main/resources/assets/cinder_loe/sounds/boss/victory.ogg index 6abc3f2..0201b86 100644 Binary files a/src/main/resources/assets/cinder_loe/sounds/boss/victory.ogg and b/src/main/resources/assets/cinder_loe/sounds/boss/victory.ogg differ