shinare
/
CinderLoE
2
0
Fork 0
Code

Merge remote-tracking branch 'origin/main'

Browse Source 
# Conflicts:
#	src/main/java/com/zivilon/cinder_loe/CinderLoE.java
frozen
Cleric_red 1 year ago
parent bad721e87b be285425e0
commit ba39944137
9 changed files with 384 additions and 419 deletions
Show Stats Download Patch File Download Diff File

22
src/main/java/com/zivilon/cinder_loe/CinderBrewingRecipes.java
Unescape Escape View File

@ -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();
}
}
}

696
src/main/java/com/zivilon/cinder_loe/CinderLoE.java
View File

File diff suppressed because it is too large Load Diff

3
src/main/java/com/zivilon/cinder_loe/Materials.java
Unescape Escape View File

@ -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);
}

3
src/main/java/com/zivilon/cinder_loe/coremod/LOTRMaterialTransformer.java
Unescape Escape View File

@ -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

2
src/main/java/com/zivilon/cinder_loe/mixins/overrides/MixinLOTRHiredNPCInfo.java
Unescape Escape View File

@ -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);
}

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

@ -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));
}
}

2
src/main/java/com/zivilon/cinder_loe/util/DurableItemCrafter.java
Unescape Escape View File

@ -13,5 +13,7 @@ public class DurableItemCrafter {
static {
customItems.add(LOTRMod.rollingPin);
customItems.add(LOTRMod.chisel);
customItems.add(CinderLoE.cleaver);
}
}

1
src/main/resources/assets/cinder_loe/lang/en_US.lang
Unescape Escape View File

@ -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

BIN
src/main/resources/assets/cinder_loe/sounds/boss/victory.ogg
View File

Binary file not shown.
Write Preview
Loading…
Cancel
Save