shinare
/
CinderLoE
2
0
Fork 0
Code

Merge remote-tracking branch 'origin/main'

Browse Source 
# Conflicts:
#	src/main/java/com/zivilon/cinder_loe/recipes.java
frozen
KeyLime17 1 year ago
parent 40bb4b58d7 bf0e4bed4e
commit 0e73a661f6
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File

10
src/main/java/com/zivilon/cinder_loe/recipes.java
Unescape Escape View File

@ -32,7 +32,7 @@ public class recipes {
registerArnorRecipes(); registerArnorRecipes();
registerAngmarRecipes(); registerAngmarRecipes();
ForgingRecipes.register_recipes(); ForgingRecipes.register_recipes();
//registerBrewingRecipes(); registerBrewingRecipes();
} }
public static void registerGeneralRecipes() { public static void registerGeneralRecipes() {
@ -148,7 +148,7 @@ public class recipes {
OreDictionary.registerOre("meat", LOTRMod.zebraCooked); 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.fruitsalad), Items.bowl, "fruit1", "fruit2", "fruit3"));
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.pasta, 4), LOTRMod.rollingPin, 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.halva), Items.sugar, CinderLoE.dough, CinderLoE.spice, LOTRMod.almond));
GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(CinderLoE.chocolatebar, 2), LOTRMod.mugChocolate)); GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(CinderLoE.chocolatebar, 2), LOTRMod.mugChocolate));
@ -324,7 +324,7 @@ public class recipes {
LOTRRecipes.rangerRecipes.add(new ShapedOreRecipe(new ItemStack(CinderLoE.maceArnor), " XX", " XX", "Y ", LOTRRecipes.rangerRecipes.add(new ShapedOreRecipe(new ItemStack(CinderLoE.maceArnor), " XX", " XX", "Y ",
Character.valueOf('X'), Items.iron_ingot, Character.valueOf('Y'), "stickWood")); Character.valueOf('X'), Items.iron_ingot, Character.valueOf('Y'), "stickWood"));
} }
//public static void registerBrewingRecipes() { public static void registerBrewingRecipes() {
// MixinLOTRBrewingRecipes.addRecipe(new ItemStack(CinderLoE.mugDemonicHealthPotion, 2), new Object[] { CinderLoE.demonbloodVial, new ItemStack(LOTRMod.tallGrass, 1, 4), new ItemStack(LOTRMod.tallGrass, 1, 4), new ItemStack(LOTRMod.tallGrass, 1, 4), CinderLoE.chocolatebar, CinderLoE.chocolatebar }); // MixinLOTRBrewingRecipes.addRecipe(new ItemStack(CinderLoE.mugDemonicHealthPotion, 2), new Object[] { CinderLoE.demonbloodVial, new ItemStack(LOTRMod.tallGrass, 1, 4), new ItemStack(LOTRMod.tallGrass, 1, 4), new ItemStack(LOTRMod.tallGrass, 1, 4), CinderLoE.chocolatebar, CinderLoE.chocolatebar });
//} }
} }

Write Preview
Loading…
Cancel
Save