diff --git a/.gradle/8.2.1/fileHashes/fileHashes.lock b/.gradle/8.2.1/fileHashes/fileHashes.lock
index 9616707..94245ca 100644
Binary files a/.gradle/8.2.1/fileHashes/fileHashes.lock and b/.gradle/8.2.1/fileHashes/fileHashes.lock differ
diff --git a/.idea/modules.xml b/.idea/modules.xml
new file mode 100644
index 0000000..017325a
--- /dev/null
+++ b/.idea/modules.xml
@@ -0,0 +1,8 @@
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/modules/CinderLoE-Git.ideVirtualMain.iml b/.idea/modules/CinderLoE-Git.ideVirtualMain.iml
index 00adf97..3ccf82a 100644
--- a/.idea/modules/CinderLoE-Git.ideVirtualMain.iml
+++ b/.idea/modules/CinderLoE-Git.ideVirtualMain.iml
@@ -10,4 +10,7 @@
+
+
+
\ No newline at end of file
diff --git a/src/main/java/com/zivilon/cinder_loe/CinderLoE.java b/src/main/java/com/zivilon/cinder_loe/CinderLoE.java
index de3d459..0c2f8cc 100644
--- a/src/main/java/com/zivilon/cinder_loe/CinderLoE.java
+++ b/src/main/java/com/zivilon/cinder_loe/CinderLoE.java
@@ -12,6 +12,8 @@ import com.zivilon.cinder_loe.util.Utilities;
import com.zivilon.cinder_loe.ItemRegistration;
import com.zivilon.cindercore.CinderCore;
import lotr.common.item.*;
+import net.minecraft.item.ItemSeedFood;
+import net.minecraft.potion.Potion;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.objectweb.asm.ClassReader;
@@ -123,8 +125,8 @@ public class CinderLoE {
public static Item onion;
public static Item cabbage;
public static Item pelmen;
- public static Item spice;
- public static Item spicedHam;
+ // public static Item spice;
+ // public static Item spicedHam;
public static Item lightStew;
// Misc
@@ -403,10 +405,12 @@ public class CinderLoE {
GameRegistry.registerBlock(cobbleDrystone, "cobbleDrystone");
//Food Crops
- onionCrop = (new onionCrop());
+ onionCrop = new onionCrop().setBlockName("onion");
GameRegistry.registerBlock(onionCrop, "onionCrop");
- cabbageCrop = (new cabbageCrop());
+ cabbageCrop = new cabbageCrop().setBlockName("cabbage");
GameRegistry.registerBlock(cabbageCrop, "cabbageCrop");
+
+
}
public void registerItems() {
@@ -419,12 +423,14 @@ public class CinderLoE {
e.printStackTrace();
}
// Food
- onion = new ItemSeedFood(3, 0.3f, onionCrop, Blocks.farmland).setCreativeTab((CreativeTabs)LOTRCreativeTabs.tabFood).setUnlocalizedName("lotr:onion");
- cabbage = new ItemSeedFood(3, 0.3f, cabbageCrop, Blocks.farmland).setCreativeTab((CreativeTabs)LOTRCreativeTabs.tabFood).setUnlocalizedName("lotr:cabbage");
- spice = new LOTRItemFood(1, 0.0f, true).setDamageAmount(2).addPotionEffect(Potion.moveSpeed.id, 3).setUnlocalizedName("lotr:spice");
- spicedHam = new LOTRItemFood(9, 0.6f, true).setDamageAmount(2).addPotionEffect(Potion.moveSpeed.id, 60).setUnlocalizedName("lotr:spicedHam");
- pelmen = new LOTRItemFood(6, 1.0f, true).setUnlocalizedName("lotr:pelmen");
- lightStew = new LOTRItemStew(6, 0.7f, true).addPotionEffect(Potion.damageBoost.id, 120).setUnlocalizedName("lotr:lightStew");
+ onion = new ItemSeedFood(3, 0.3f, CinderLoE.onionCrop, Blocks.farmland).setUnlocalizedName("lotr:onion").setTextureName("lotr:onion");
+ cabbage = new ItemSeedFood(3, 0.3f, CinderLoE.cabbageCrop, Blocks.farmland).setUnlocalizedName("lotr:cabbage").setTextureName("lotr:cabbage");;
+ // spice = new CinderItemFood(1, 0.0f, false).setdamageAmount(2).setPotionEffect(Potion.moveSpeed.id, 10,0,100).setUnlocalizedName("lotr:spice");
+ // spicedHam = new CinderItemFood(9, 0.6f, true).setdamageAmount(2).setPotionEffect(Potion.moveSpeed.id, 60, 0, 100).setUnlocalizedName("lotr:spicedHam");
+ pelmen = new LOTRItemFood(6, 1.0f, true).setUnlocalizedName("lotr:pelmen").setTextureName("lotr:pelmen");
+ // onion = new LOTRItemFood(6, 1.0f, false).setUnlocalizedName("lotr:onion").setTextureName("lotr:onion");
+ // cabbage = new LOTRItemFood(6, 1.0f, false).setUnlocalizedName("lotr:cabbage").setTextureName("lotr:cabbage");
+ lightStew = new LOTRItemStew(6, 0.7f, false).setPotionEffect(Potion.damageBoost.id, 60, 0, 100).setUnlocalizedName("lotr:lightStew").setTextureName("lotr:lightStew");
// Red Dwarf Spawns
redDwarfWarriorSpawnEgg = new CinderLoESpawnEgg(RedDwarfWarrior.class).setTextureName("lotr:spawn_egg");
redDwarfArbalestSpawnEgg = new CinderLoESpawnEgg(RedDwarfArbalest.class).setTextureName("lotr:spawn_egg");
@@ -483,9 +489,10 @@ public class CinderLoE {
ItemRegistration.registerItem(onion, "onion", 89);
ItemRegistration.registerItem(cabbage, "cabbage", 90);
ItemRegistration.registerItem(pelmen, "pelmen", 91);
- ItemRegistration.registerItem(spice, "spice", 92);
- ItemRegistration.registerItem(spicedHam, "spicedHam", 93);
- ItemRegistration.registerItem(lightStew, "lightStew", 94);
+ ItemRegistration.registerItem(lightStew, "lightStew", 92);
+ // ItemRegistration.registerItem(spice, "spice", 93);
+ // ItemRegistration.registerItem(spicedHam, "spicedHam", 94);
+
// ==Red Dwarf Eggs==
ItemRegistration.registerItem(redDwarfWarriorSpawnEgg, "redDwarfWarriorSpawnEgg", 0);
ItemRegistration.registerItem(redDwarfArbalestSpawnEgg, "redDwarfArbalestSpawnEgg", 1);
@@ -565,7 +572,7 @@ public class CinderLoE {
daggerAsh = (new LOTRItemDagger(MATERIAL_ASH)).addWeaponDamage(6.75F).setUnlocalizedName("lotr:daggerAsh").setTextureName("lotr:daggerAsh");
hammerAsh = (new LOTRItemHammer(MATERIAL_ASH)).addWeaponDamage(5.5F).setUnlocalizedName("lotr:hammerAsh").setTextureName("lotr:hammerAsh");
battleaxeAsh = (new LOTRItemBattleaxe(MATERIAL_ASH)).addWeaponDamage(5.5F).setUnlocalizedName("lotr:battleaxeAsh").setTextureName("lotr:battleaxeAsh");
- bowAsh = (new LOTRItemBow(MATERIAL_ASH)).setDrawTime(16).setUnlocalizedName("lotr:bowAsh").setTextureName("lotr:bowAsh");
+ bowAsh = (new LOTRItemBow(MATERIAL_ASH, 1.5)).setDrawTime(16).setUnlocalizedName("lotr:bowAsh").setTextureName("lotr:bowAsh");
pikeAsh = (new LOTRItemPike(MATERIAL_ASH)).addWeaponDamage(5.0F).setUnlocalizedName("lotr:pikeAsh").setTextureName("lotr:pikeAsh");
spearAsh = (new LOTRItemSpear(MATERIAL_ASH)).addWeaponDamage(5.0F).setUnlocalizedName("lotr:spearAsh").setTextureName("lotr:spearAsh");
@@ -899,8 +906,8 @@ public class CinderLoE {
// == Food Items ==
CinderCore.registerItemFallback(Item.getIdFromItem(onion), Item.getIdFromItem(LOTRMod.turnip), "cinder_loe", "1.2.1");
CinderCore.registerItemFallback(Item.getIdFromItem(cabbage), Item.getIdFromItem(LOTRMod.lettuce), "cinder_loe", "1.2.1");
- CinderCore.registerItemFallback(Item.getIdFromItem(spice), Item.getIdFromItem(LOTRMod.charcoaldust), "cinder_loe", "1.2.1");
- CinderCore.registerItemFallback(Item.getIdFromItem(spicedHam), Item.getIdFromItem(LOTRMod.gammon), "cinder_loe", "1.2.1");
+ // CinderCore.registerItemFallback(Item.getIdFromItem(spice), Item.getIdFromItem(LOTRMod.dye), "cinder_loe", "1.2.1");
+ // CinderCore.registerItemFallback(Item.getIdFromItem(spicedHam), Item.getIdFromItem(LOTRMod.gammon), "cinder_loe", "1.2.1");
CinderCore.registerItemFallback(Item.getIdFromItem(pelmen), Item.getIdFromItem(LOTRMod.cram), "cinder_loe", "1.2.1");
CinderCore.registerItemFallback(Item.getIdFromItem(lightStew), Item.getIdFromItem(LOTRMod.leekSoup), "cinder_loe", "1.2.1");
diff --git a/src/main/java/com/zivilon/cinder_loe/blocks/cabbageCrop.java b/src/main/java/com/zivilon/cinder_loe/blocks/cabbageCrop.java
index ae90c5b..cd25957 100644
--- a/src/main/java/com/zivilon/cinder_loe/blocks/cabbageCrop.java
+++ b/src/main/java/com/zivilon/cinder_loe/blocks/cabbageCrop.java
@@ -1,5 +1,6 @@
package com.zivilon.cinder_loe.blocks;
+import com.zivilon.cinder_loe.CinderLoE;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import lotr.common.LOTRMod;
@@ -13,7 +14,7 @@ import net.minecraftforge.common.EnumPlantType;
public class cabbageCrop
extends BlockCrops {
@SideOnly(value=Side.CLIENT)
- private IIcon[] leekIcons;
+ private IIcon[] cabbageIcons;
@SideOnly(value=Side.CLIENT)
public IIcon getIcon(int i, int j) {
@@ -21,16 +22,16 @@ public class cabbageCrop
if (j == 6) {
j = 5;
}
- return this.leekIcons[j >> 1];
+ return this.cabbageIcons[j >> 1];
}
- return this.leekIcons[3];
+ return this.cabbageIcons[3];
}
@SideOnly(value=Side.CLIENT)
public void registerBlockIcons(IIconRegister iconregister) {
- this.leekIcons = new IIcon[4];
- for (int i = 0; i < this.leekIcons.length; ++i) {
- this.leekIcons[i] = iconregister.registerIcon(this.getTextureName() + "_" + i);
+ this.cabbageIcons = new IIcon[4];
+ for (int i = 0; i < this.cabbageIcons.length; ++i) {
+ this.cabbageIcons[i] = iconregister.registerIcon(this.getTextureName() + "_" + i);
}
}
diff --git a/src/main/java/com/zivilon/cinder_loe/blocks/onionCrop.java b/src/main/java/com/zivilon/cinder_loe/blocks/onionCrop.java
index 21c39f1..5e8753b 100644
--- a/src/main/java/com/zivilon/cinder_loe/blocks/onionCrop.java
+++ b/src/main/java/com/zivilon/cinder_loe/blocks/onionCrop.java
@@ -1,5 +1,6 @@
package com.zivilon.cinder_loe.blocks;
+import com.zivilon.cinder_loe.CinderLoE;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import lotr.common.LOTRMod;
@@ -13,7 +14,7 @@ import net.minecraftforge.common.EnumPlantType;
public class onionCrop
extends BlockCrops {
@SideOnly(value=Side.CLIENT)
- private IIcon[] leekIcons;
+ private IIcon[] onionIcons;
@SideOnly(value=Side.CLIENT)
public IIcon getIcon(int i, int j) {
@@ -21,19 +22,20 @@ public class onionCrop
if (j == 6) {
j = 5;
}
- return this.leekIcons[j >> 1];
+ return this.onionIcons[j >> 1];
}
- return this.leekIcons[3];
+ return this.onionIcons[3];
}
@SideOnly(value=Side.CLIENT)
public void registerBlockIcons(IIconRegister iconregister) {
- this.leekIcons = new IIcon[4];
- for (int i = 0; i < this.leekIcons.length; ++i) {
- this.leekIcons[i] = iconregister.registerIcon(this.getTextureName() + "_" + i);
+ this.onionIcons = new IIcon[4];
+ for (int i = 0; i < this.onionIcons.length; ++i) {
+ this.onionIcons[i] = iconregister.registerIcon(this.getTextureName() + "_" + i);
}
}
+
public Item func_149866_i() {
return CinderLoE.onion;
}
diff --git a/src/main/java/com/zivilon/cinder_loe/items/CinderItemFood.java b/src/main/java/com/zivilon/cinder_loe/items/CinderItemFood.java
new file mode 100644
index 0000000..6049f58
--- /dev/null
+++ b/src/main/java/com/zivilon/cinder_loe/items/CinderItemFood.java
@@ -0,0 +1,44 @@
+package com.zivilon.cinder_loe.items;
+
+import com.zivilon.cinder_loe.CinderLoE;
+import lotr.common.LOTRAchievement;
+import lotr.common.LOTRCreativeTabs;
+import lotr.common.LOTRLevelData;
+import lotr.common.LOTRMod;
+import lotr.common.item.LOTRItemFood;
+import lotr.common.item.LOTRItemSword;
+import lotr.common.item.LOTRMaterial;
+import lotr.common.item.LOTRWeaponStats;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.init.Items;
+import net.minecraft.item.EnumAction;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemFood;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.DamageSource;
+import net.minecraft.world.World;
+
+public class CinderItemFood extends ItemFood {
+
+ public CinderItemFood(int healAmount, float saturation, boolean canWolfEat) {
+ super(healAmount, saturation, canWolfEat);
+ this.setCreativeTab(LOTRCreativeTabs.tabFood);
+ }
+ private int damageAmount;
+
+ public CinderItemFood setdamageAmount(int i) {
+ this.damageAmount = i;
+ return this;
+ }
+
+ public ItemStack onEaten(ItemStack itemstack, World world, EntityPlayer entityplayer) {
+ if (this.damageAmount > 0) {
+ entityplayer.attackEntityFrom(DamageSource.magic, (float)this.damageAmount);
+ }
+
+ return super.onEaten(itemstack, world, entityplayer);
+ }
+
+}
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 db2a2bc..36d362c 100644
--- a/src/main/resources/assets/cinder_loe/lang/en_US.lang
+++ b/src/main/resources/assets/cinder_loe/lang/en_US.lang
@@ -40,6 +40,8 @@ item.lotr:pallandoStaff.name=Staff of Pallando the Blue
item.lotr:alatarStaff.name=Staff of Alatar the Blue
item.lotr:sarumanStaff.name=Staff of Saruman of Many Colors
+item.lotr:welfRelic.name=Horn of the Greenwood Stag
+
item.lotr:bonemold.name=Bonemold
item.lotr:helmetLimwaith.name=Limwaith Helmet
item.lotr:bodyLimwaith.name=Limwaith Chestplate
@@ -110,6 +112,7 @@ item.spawn_egg_limwaithshaman.name=Spawn Limwaith Shaman
item.spawn_egg_limwaithfishmonger.name=Spawn Limwaith Fishmonger
item.spawn_egg_limwaithbonewarrior.name=Spawn Limwaith Warrior
+entity.cinder_loe.RedDwarfSmith.name=Red Dwarf Smith
entity.cinder_loe.RedDwarfWarrior.name=Red Dwarf Warrior
entity.cinder_loe.RedDwarfArbalest.name=Red Dwarf Arbalest
entity.cinder_loe.RedDwarfBannerBearer.name=Red Dwarf Banner Bearer
diff --git a/src/main/resources/assets/lotr/textures/blocks/cabbage_0.png b/src/main/resources/assets/lotr/textures/blocks/cabbage_0.png
new file mode 100644
index 0000000..7d3485f
Binary files /dev/null and b/src/main/resources/assets/lotr/textures/blocks/cabbage_0.png differ
diff --git a/src/main/resources/assets/lotr/textures/blocks/cabbage_1.png b/src/main/resources/assets/lotr/textures/blocks/cabbage_1.png
new file mode 100644
index 0000000..d015c29
Binary files /dev/null and b/src/main/resources/assets/lotr/textures/blocks/cabbage_1.png differ
diff --git a/src/main/resources/assets/lotr/textures/blocks/cabbage_2.png b/src/main/resources/assets/lotr/textures/blocks/cabbage_2.png
new file mode 100644
index 0000000..8ba1d8e
Binary files /dev/null and b/src/main/resources/assets/lotr/textures/blocks/cabbage_2.png differ
diff --git a/src/main/resources/assets/lotr/textures/blocks/cabbage_3.png b/src/main/resources/assets/lotr/textures/blocks/cabbage_3.png
new file mode 100644
index 0000000..9d4b0fc
Binary files /dev/null and b/src/main/resources/assets/lotr/textures/blocks/cabbage_3.png differ
diff --git a/src/main/resources/assets/lotr/textures/blocks/onion_0.png b/src/main/resources/assets/lotr/textures/blocks/onion_0.png
new file mode 100644
index 0000000..7d3485f
Binary files /dev/null and b/src/main/resources/assets/lotr/textures/blocks/onion_0.png differ
diff --git a/src/main/resources/assets/lotr/textures/blocks/onion_1.png b/src/main/resources/assets/lotr/textures/blocks/onion_1.png
new file mode 100644
index 0000000..d015c29
Binary files /dev/null and b/src/main/resources/assets/lotr/textures/blocks/onion_1.png differ
diff --git a/src/main/resources/assets/lotr/textures/blocks/onion_2.png b/src/main/resources/assets/lotr/textures/blocks/onion_2.png
new file mode 100644
index 0000000..8ba1d8e
Binary files /dev/null and b/src/main/resources/assets/lotr/textures/blocks/onion_2.png differ
diff --git a/src/main/resources/assets/lotr/textures/blocks/onion_3.png b/src/main/resources/assets/lotr/textures/blocks/onion_3.png
new file mode 100644
index 0000000..9d4b0fc
Binary files /dev/null and b/src/main/resources/assets/lotr/textures/blocks/onion_3.png differ
diff --git a/src/main/resources/assets/lotr/textures/items/cabbage.png b/src/main/resources/assets/lotr/textures/items/cabbage.png
new file mode 100644
index 0000000..19ab7fe
Binary files /dev/null and b/src/main/resources/assets/lotr/textures/items/cabbage.png differ
diff --git a/src/main/resources/assets/lotr/textures/items/lightStew.png b/src/main/resources/assets/lotr/textures/items/lightStew.png
new file mode 100644
index 0000000..c4a02d2
Binary files /dev/null and b/src/main/resources/assets/lotr/textures/items/lightStew.png differ
diff --git a/src/main/resources/assets/lotr/textures/items/onion.png b/src/main/resources/assets/lotr/textures/items/onion.png
new file mode 100644
index 0000000..d031bf3
Binary files /dev/null and b/src/main/resources/assets/lotr/textures/items/onion.png differ
diff --git a/src/main/resources/assets/lotr/textures/items/spice.png b/src/main/resources/assets/lotr/textures/items/spice.png
new file mode 100644
index 0000000..bb453a5
Binary files /dev/null and b/src/main/resources/assets/lotr/textures/items/spice.png differ
diff --git a/src/main/resources/assets/lotr/textures/items/spicedHam.png b/src/main/resources/assets/lotr/textures/items/spicedHam.png
new file mode 100644
index 0000000..f927114
Binary files /dev/null and b/src/main/resources/assets/lotr/textures/items/spicedHam.png differ