diff --git a/src/main/java/com/zivilon/cinder_loe/CinderDrinkRecipe.java b/src/main/java/com/zivilon/cinder_loe/CinderDrinkRecipe.java new file mode 100644 index 0000000..6fc70b4 --- /dev/null +++ b/src/main/java/com/zivilon/cinder_loe/CinderDrinkRecipe.java @@ -0,0 +1,29 @@ +package com.zivilon.cinder_loe; + +import net.minecraft.inventory.InventoryCrafting; +import net.minecraft.item.ItemStack; +import net.minecraft.item.crafting.IRecipe; +import net.minecraft.world.World; + +public class CinderDrinkRecipe +implements IRecipe { + @Override + public boolean matches(InventoryCrafting inv, World world) { + return false; + } + + @Override + public ItemStack getCraftingResult(InventoryCrafting p_77572_1_) { + return null; + } + + @Override + public int getRecipeSize() { + return 0; + } + + @Override + public ItemStack getRecipeOutput() { + return null; + } +} diff --git a/src/main/java/com/zivilon/cinder_loe/entity/SpeechBankModifier.java b/src/main/java/com/zivilon/cinder_loe/entity/SpeechBankModifier.java index 41e8133..8fc5cc5 100644 --- a/src/main/java/com/zivilon/cinder_loe/entity/SpeechBankModifier.java +++ b/src/main/java/com/zivilon/cinder_loe/entity/SpeechBankModifier.java @@ -79,6 +79,7 @@ public class SpeechBankModifier { speechBanks.put("arnorSoldier/soldier/hostile", loadSpeechLines("arnorSoldier/soldier/hostile")); speechBanks.put("corruptSpeak/all/neutral", loadSpeechLines("corruptSpeak/all/neutral")); speechBanks.put("corruptSpeak/all/hostile", loadSpeechLines("corruptSpeak/all/hostile")); + speechBanks.put("corruptSpeak/all/skeleton", loadSpeechLines("corruptSpeak/all/skeleton")); return speechBanks; } diff --git a/src/main/java/com/zivilon/cinder_loe/entity/corrupt/CorruptSkeleton.java b/src/main/java/com/zivilon/cinder_loe/entity/corrupt/CorruptSkeleton.java index e739390..94777c3 100644 --- a/src/main/java/com/zivilon/cinder_loe/entity/corrupt/CorruptSkeleton.java +++ b/src/main/java/com/zivilon/cinder_loe/entity/corrupt/CorruptSkeleton.java @@ -41,7 +41,7 @@ public class CorruptSkeleton extends CorruptMan { @Override public LOTRFaction getFaction() { - return LOTRFaction.valueOf(CinderLoE_Config.corrupt_faction); + return LOTRFaction.UTUMNO; } @Override diff --git a/src/main/java/com/zivilon/cinder_loe/entity/corrupt/CorruptSkeletonArcher.java b/src/main/java/com/zivilon/cinder_loe/entity/corrupt/CorruptSkeletonArcher.java index 024460c..58ef61e 100644 --- a/src/main/java/com/zivilon/cinder_loe/entity/corrupt/CorruptSkeletonArcher.java +++ b/src/main/java/com/zivilon/cinder_loe/entity/corrupt/CorruptSkeletonArcher.java @@ -23,7 +23,6 @@ public class CorruptSkeletonArcher extends CorruptSkeleton { public CorruptSkeletonArcher(World world) { super(world); ((EntityLiving)this).tasks.addTask(0, (EntityAIBase)new LOTREntityAIRangedAttack(this, 1.4, 30, 50, 16.0f)); - this.tasks.addTask(10, (EntityAIBase)new EntityAIAvoidEntity(this, EntityPlayerMP.class, 12.0f, 1.0, 1.5)); } @@ -58,9 +57,10 @@ public class CorruptSkeletonArcher extends CorruptSkeleton { } } + @Override public LOTRFaction getFaction() { - return LOTRFaction.valueOf(CinderLoE_Config.corrupt_faction); + return LOTRFaction.UTUMNO; } @Override diff --git a/src/main/java/com/zivilon/cinder_loe/mixins/overrides/MixinLOTREntityBear.java b/src/main/java/com/zivilon/cinder_loe/mixins/MixinLOTREntityBear.java similarity index 97% rename from src/main/java/com/zivilon/cinder_loe/mixins/overrides/MixinLOTREntityBear.java rename to src/main/java/com/zivilon/cinder_loe/mixins/MixinLOTREntityBear.java index c10b442..99d81f2 100644 --- a/src/main/java/com/zivilon/cinder_loe/mixins/overrides/MixinLOTREntityBear.java +++ b/src/main/java/com/zivilon/cinder_loe/mixins/MixinLOTREntityBear.java @@ -1,4 +1,4 @@ -package com.zivilon.cinder_loe.mixins.overrides; +package com.zivilon.cinder_loe.mixins; import com.zivilon.cinder_loe.CinderLoE; import lotr.common.LOTRMod; diff --git a/src/main/java/com/zivilon/cinder_loe/mixins/overrides/MixinLOTREntityLioness.java b/src/main/java/com/zivilon/cinder_loe/mixins/MixinLOTREntityLioness.java similarity index 96% rename from src/main/java/com/zivilon/cinder_loe/mixins/overrides/MixinLOTREntityLioness.java rename to src/main/java/com/zivilon/cinder_loe/mixins/MixinLOTREntityLioness.java index 03d3ea0..76d5261 100644 --- a/src/main/java/com/zivilon/cinder_loe/mixins/overrides/MixinLOTREntityLioness.java +++ b/src/main/java/com/zivilon/cinder_loe/mixins/MixinLOTREntityLioness.java @@ -1,4 +1,4 @@ -package com.zivilon.cinder_loe.mixins.overrides; +package com.zivilon.cinder_loe.mixins; import com.zivilon.cinder_loe.CinderLoE; import lotr.common.LOTRMod; diff --git a/src/main/java/com/zivilon/cinder_loe/mixins/overrides/MixinLOTREntityWarg.java b/src/main/java/com/zivilon/cinder_loe/mixins/MixinLOTREntityWarg.java similarity index 97% rename from src/main/java/com/zivilon/cinder_loe/mixins/overrides/MixinLOTREntityWarg.java rename to src/main/java/com/zivilon/cinder_loe/mixins/MixinLOTREntityWarg.java index ea7db5a..895c0d1 100644 --- a/src/main/java/com/zivilon/cinder_loe/mixins/overrides/MixinLOTREntityWarg.java +++ b/src/main/java/com/zivilon/cinder_loe/mixins/MixinLOTREntityWarg.java @@ -1,4 +1,4 @@ -package com.zivilon.cinder_loe.mixins.overrides; +package com.zivilon.cinder_loe.mixins; import com.zivilon.cinder_loe.CinderLoE; import lotr.common.LOTRMod; diff --git a/src/main/java/com/zivilon/cinder_loe/recipes.java b/src/main/java/com/zivilon/cinder_loe/recipes.java index 196a5e2..4437217 100644 --- a/src/main/java/com/zivilon/cinder_loe/recipes.java +++ b/src/main/java/com/zivilon/cinder_loe/recipes.java @@ -2,10 +2,7 @@ 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 lotr.common.recipe.*; import com.zivilon.cinder_loe.CinderLoE; import com.zivilon.cinder_loe.mixins.MixinLOTRBrewingRecipes; @@ -150,10 +147,10 @@ public class recipes { 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.halva), Items.sugar, CinderLoE.dough, CinderLoE.spice, LOTRMod.almond)); - + GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(CinderLoE.doner_kebab), CinderLoE.dough, "vegetable2", CinderLoE.spice, LOTRMod.kebab)); 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(new LOTRRecipesPoisonDrinks()); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(CinderLoE.cinderBlock), "XXX", "XYX", "XXX", 'X', Blocks.stone, 'Y', LOTRMod.balrogFire)); @@ -190,6 +187,10 @@ public class recipes { // 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)); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(CinderLoE.cindercobble, 4, 2), "XX", "XX", + 'X', new ItemStack(LOTRMod.silver))); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(CinderLoE.cindercobble, 4, 3), "XX", "XX", + 'X', new ItemStack(CinderLoE.cindercobble, 1, 2))); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(LOTRMod.banner, 1, 44), " Y ", " X ", " Z ", 'X', "stickWood", 'Y', new ItemStack(Blocks.wool, 1, 14), 'Z', "plankWood")); diff --git a/src/main/resources/assets/cinder_loe/speech/corruptSpeak/skeleton/hostile.txt b/src/main/resources/assets/cinder_loe/speech/corruptSpeak/skeleton/hostile.txt deleted file mode 100644 index 7e1f2d3..0000000 --- a/src/main/resources/assets/cinder_loe/speech/corruptSpeak/skeleton/hostile.txt +++ /dev/null @@ -1,6 +0,0 @@ -ᛒᛟᚹ ᛒᛖᚠᛟᚱᛖ ᚦᛖ ᛞᛖᛞ! -ᛒᛖᚷ ᚠᛟᚱ ᛗᛖᚱᚲᛁ! -ᛖᛏᛖᚱᚾᚨᛚ ᛈᚨᛁᚾ ᚢᛈᛟᚾ ᛁᛟᚢ! -ᛞᛖᚦ ᚢᛈᛟᚾ ᛁᛟᚢ! -ᛈᚨᛁᚾ, ᛊᚺᚨᛗᛖ, ᚺᛟᚱᚱᛟᚱ ᛏᛟ ᛁᛟᚢ! -ᛞᚱᛟᚹᚾ ᛁᚾ ᛒᛚᛟᛟᛞ ᛊᛚᚨᚢᛖ! \ No newline at end of file diff --git a/src/main/resources/assets/cinder_loe/speech/corruptSpeak/skeleton/neutral.txt b/src/main/resources/assets/cinder_loe/speech/corruptSpeak/skeleton/neutral.txt deleted file mode 100644 index 346a775..0000000 --- a/src/main/resources/assets/cinder_loe/speech/corruptSpeak/skeleton/neutral.txt +++ /dev/null @@ -1 +0,0 @@ -you shouldnt be able to see this \ No newline at end of file diff --git a/src/main/resources/mixins.cinder_loe.json b/src/main/resources/mixins.cinder_loe.json index d5f5975..c16a143 100644 --- a/src/main/resources/mixins.cinder_loe.json +++ b/src/main/resources/mixins.cinder_loe.json @@ -40,7 +40,7 @@ "MixinRendererLivingEntity", "MixinRenderItem", "MixinSlotCrafting", - "overrides.MixinLOTREntityWarg", + "MixinLOTREntityWarg", "overrides.MixinLOTRHiredNPCInfo", "overrides.MixinLOTRItemEntDraught", "overrides.MixinLOTRReplacedMethods",