From 023886c3c5d24077c9941b4bf200d45eebcca871 Mon Sep 17 00:00:00 2001 From: KeyLime17 Date: Tue, 30 Apr 2024 20:21:25 -0400 Subject: [PATCH] cabbage and onion crop textures dont register, planting an onion or cabbage causes crash --- .gradle/8.2.1/fileHashes/fileHashes.lock | Bin 17 -> 17 bytes .idea/modules.xml | 8 ++++ .../modules/CinderLoE-Git.ideVirtualMain.iml | 3 ++ .../com/zivilon/cinder_loe/CinderLoE.java | 39 +++++++++------- .../cinder_loe/blocks/cabbageCrop.java | 13 +++--- .../zivilon/cinder_loe/blocks/onionCrop.java | 14 +++--- .../cinder_loe/items/CinderItemFood.java | 44 ++++++++++++++++++ .../assets/cinder_loe/lang/en_US.lang | 3 ++ .../assets/lotr/textures/blocks/cabbage_0.png | Bin 0 -> 195 bytes .../assets/lotr/textures/blocks/cabbage_1.png | Bin 0 -> 221 bytes .../assets/lotr/textures/blocks/cabbage_2.png | Bin 0 -> 271 bytes .../assets/lotr/textures/blocks/cabbage_3.png | Bin 0 -> 457 bytes .../assets/lotr/textures/blocks/onion_0.png | Bin 0 -> 195 bytes .../assets/lotr/textures/blocks/onion_1.png | Bin 0 -> 221 bytes .../assets/lotr/textures/blocks/onion_2.png | Bin 0 -> 271 bytes .../assets/lotr/textures/blocks/onion_3.png | Bin 0 -> 457 bytes .../assets/lotr/textures/items/cabbage.png | Bin 0 -> 4711 bytes .../assets/lotr/textures/items/lightStew.png | Bin 0 -> 4465 bytes .../assets/lotr/textures/items/onion.png | Bin 0 -> 4503 bytes .../assets/lotr/textures/items/spice.png | Bin 0 -> 4446 bytes .../assets/lotr/textures/items/spicedHam.png | Bin 0 -> 4703 bytes 21 files changed, 96 insertions(+), 28 deletions(-) create mode 100644 .idea/modules.xml create mode 100644 src/main/java/com/zivilon/cinder_loe/items/CinderItemFood.java create mode 100644 src/main/resources/assets/lotr/textures/blocks/cabbage_0.png create mode 100644 src/main/resources/assets/lotr/textures/blocks/cabbage_1.png create mode 100644 src/main/resources/assets/lotr/textures/blocks/cabbage_2.png create mode 100644 src/main/resources/assets/lotr/textures/blocks/cabbage_3.png create mode 100644 src/main/resources/assets/lotr/textures/blocks/onion_0.png create mode 100644 src/main/resources/assets/lotr/textures/blocks/onion_1.png create mode 100644 src/main/resources/assets/lotr/textures/blocks/onion_2.png create mode 100644 src/main/resources/assets/lotr/textures/blocks/onion_3.png create mode 100644 src/main/resources/assets/lotr/textures/items/cabbage.png create mode 100644 src/main/resources/assets/lotr/textures/items/lightStew.png create mode 100644 src/main/resources/assets/lotr/textures/items/onion.png create mode 100644 src/main/resources/assets/lotr/textures/items/spice.png create mode 100644 src/main/resources/assets/lotr/textures/items/spicedHam.png diff --git a/.gradle/8.2.1/fileHashes/fileHashes.lock b/.gradle/8.2.1/fileHashes/fileHashes.lock index 9616707729ec51cbe6f62b3f300d274566bf196c..94245ca08a747755ed8a4dc08ee550ec6e8156ec 100644 GIT binary patch literal 17 VcmZRc9z7+~bjR9%3}Eo%8UQ&^23Y_A literal 17 TcmZRc9z7+~bjR9%3{U_7Hi`s` 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 0000000000000000000000000000000000000000..7d3485fe7b80ef1141ff8797ef2aa556f539c8d0 GIT binary patch literal 195 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1qucL5ULAh?3y^w370~qEv>0#LT=By}Z;C1rt33 zJf(cLNIsx@Fc)I$ztaD0e0sviYHP-+D literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..d015c291b44f09d4b6d1343abcd730a44b47b1d7 GIT binary patch literal 221 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1qucL5ULAh?3y^w370~qEv>0#LT=By}Z;C1rt33 zJn=Mcl}q!|*9&09{L{hu71Vs)7HFvAQ9 zHV1Q-BVqYh4;e_zc1<{|Fj;hw>4QlMh63_;%O*&8@F^WS0Cc^8(aVc@Iu<~a89ZJ6 KT-G@yGywpN??U+i literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..8ba1d8e2e2b597726337986bd53e123527ab3a0a GIT binary patch literal 271 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1qucL5ULAh?3y^w370~qEv>0#LT=By}Z;C1rt33 zJJ^rZnqP)DB8CW%dI zDb0ZmPFvWzSkA0}(dC$=ur)xBN2bZe?^J zG%heMF)~90YwQ330Y*tgK~y+TrI0^M!%!5(^F3@ylUCfi*bd^KrW()|p&)g#lc1fX zptY2`h?G)9#KF=*5X8wZ;O6e`F1YzEjyX5nM^a-UI2`VM=ic*sFR=jpONnM0C7NlJ zXr__1^x6n&+;m2pzr4R>0MR-NwJ$crbH-cZ=O;C(*>*WxaBh6qy)`Vpcp~w}UJRrV ziao>h4S)lN3r~JcA(!&7y%6H4rKr|3E;n2*e}Wg0|e_1d!4CFLrEY4;IpGQvY!jc94^ZO z#gGORF!u#^e;wJ=6$8+4=C~wP!}K*nnTD!$n%FyU!97`(TdVC|G&`+e1dHMB?EnW? zM>5xp2~Qs<`1=0D`^OvDcl&4N%zkzr=3xB*gWr*mtaEhE00000NkvXXu0mjf(dNG= literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..7d3485fe7b80ef1141ff8797ef2aa556f539c8d0 GIT binary patch literal 195 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1qucL5ULAh?3y^w370~qEv>0#LT=By}Z;C1rt33 zJf(cLNIsx@Fc)I$ztaD0e0sviYHP-+D literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..d015c291b44f09d4b6d1343abcd730a44b47b1d7 GIT binary patch literal 221 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1qucL5ULAh?3y^w370~qEv>0#LT=By}Z;C1rt33 zJn=Mcl}q!|*9&09{L{hu71Vs)7HFvAQ9 zHV1Q-BVqYh4;e_zc1<{|Fj;hw>4QlMh63_;%O*&8@F^WS0Cc^8(aVc@Iu<~a89ZJ6 KT-G@yGywpN??U+i literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..8ba1d8e2e2b597726337986bd53e123527ab3a0a GIT binary patch literal 271 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1qucL5ULAh?3y^w370~qEv>0#LT=By}Z;C1rt33 zJJ^rZnqP)DB8CW%dI zDb0ZmPFvWzSkA0}(dC$=ur)xBN2bZe?^J zG%heMF)~90YwQ330Y*tgK~y+TrI0^M!%!5(^F3@ylUCfi*bd^KrW()|p&)g#lc1fX zptY2`h?G)9#KF=*5X8wZ;O6e`F1YzEjyX5nM^a-UI2`VM=ic*sFR=jpONnM0C7NlJ zXr__1^x6n&+;m2pzr4R>0MR-NwJ$crbH-cZ=O;C(*>*WxaBh6qy)`Vpcp~w}UJRrV ziao>h4S)lN3r~JcA(!&7y%6H4rKr|3E;n2*e}Wg0|e_1d!4CFLrEY4;IpGQvY!jc94^ZO z#gGORF!u#^e;wJ=6$8+4=C~wP!}K*nnTD!$n%FyU!97`(TdVC|G&`+e1dHMB?EnW? zM>5xp2~Qs<`1=0D`^OvDcl&4N%zkzr=3xB*gWr*mtaEhE00000NkvXXu0mjf(dNG= literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..19ab7fe798c321513b1b8d2deb526c09f9209a93 GIT binary patch literal 4711 zcmeHKc~BEs8V{ntz=(LP#|%PG#9>rA>0E>k#2`t4s6m9FpgX0V?oMbR2T4N$mItgj z9O?+H*LX2VspFy}1GAih*5HW_g6qnz7Aj87j>qCSTFP!z_H{Uf+Ns*IYUe*X)yMnZ z@B6*)`@QeI$}5PCiJIv7fhUW_ny89a#DTXDb9=afr~k8l47|=}YZB==%m$e)CLNVV zLUfjygh)H3W3lXiH^i>?cKyiX)yrwpaUKn3-`dpD?y?J9&s&v-z;s`~S;c=@(;n3@ zk@%sNEIs~hZq81TcfB#{`JMu z=SUEp8(`WLf*x9X|gw`remB;kOtG`TeFJ017rjmE|^n6k`-S<^urKB$8 z(Zjp*J#zh_@4aIRIdMJxB@sn4CvA5;?d`tbI~x)%SSnh-Jp4vVe zZ4TUsL0_M!sE@HuOAq=eCqQxW*x{|7DIV947i-x{2X97y{y&$MEctlltgXIY$0G6w z$Jze7wptw~=?R#i4R0?Z*Kc)w^J&?QQ`ZvEZGkNWFIR$L; z>&B+W+Q!9LGH@`$q$N3agBg?^ixnobn=w3< zq#-S-r;Jkelg1V{L=jTE-gbu1(|Sx8985pob%X{R#z?1i3Cn1#?u;uMjC6rd$# zC)2c9!sXg*HjYieF?8j8eyiqMgl!$Fgv|~*rSj% zrF$#ZsMweuXF4MT0q(=RqtHXSJHY^@R!bBnJc9{OrI50j@g;-_rwEDjlSlAE5HUf* z1fdOqg*pKWV|)^a`C6e?$0ty}fRB!#QW>o@X2eN`3XpRsz=P>fo|uQ}U`!W+!a^}2 zfHAE|03&=PAUSIM4BuH3`{3w!1N^7Y}7kD7{MirVpUQ$pECe;T4K{MS_d4!8la4X z$!2{E)=&mAp2iqGK^j64A`l5tgoh$X@LSLd(qaX*$guJdj$ojNnHUL32S|%Cl?n)) z9v~Zu+(Kfs$)Yit(xhxA1c>n*?pA{ZMPM|hz-SVXB7C6)5lRGzh9{JWPzi#{oYmPr!MI04r{ z7oLn6^(5Fo1`Bq`PW?(T1dDk*tq@0Glpup)Auc3fj6lRND#nCjEl(>#G5%<^Jl`IsNF(?MWCKT~i>XJMgO;0iNtA-+#r%FZt;ro&-ZMuhSy?Qvsm$%d`eOe~ zV05QdYNh*6S`J4w^v+*lGvyb1d(D-zS)wRa+=_U0$c3#!nU#EPIEnzoQJZr34a`-mhEi3AJ zGa)?q5cW-V(uHDUQ02DvjXkM?La`QF<2YYBBk5!y(OY5clyx7`_$1ZUwEf}AoS29M zqVb?s}?kbKYQbIyu7L^p?tORP$u$l+tHbUMH;1RnZ`$T z;w0#odY4_vOv`a=w&N%fzZ?q(IIT;=%wz?(F z+d0HImZ{Y|A-Gb5WNzO)Z|>sSA1kdh^mUG|ny9ZXJpN%<>#4Z2jZIh1e#S3fcBTuR z@_lsH6c2Ogo|@j>_`O3Lnq_qdJ6G4XxLpN>;Y}v0bZRwgKKS+kH*Q2+n{ literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..c4a02d2107aceffe573fa79e5f0a7ffade5b13fe GIT binary patch literal 4465 zcmeHKdr(x@8D9zk%1ekTVk&sqpjhJFy?giW>xTC(3#%+5qFHOLd-pz;i~C~t!Y)KZ zpurJEMQGHfq@s348xupCTCg|>@hwS=LDXog1pY`zk=QYgbTHkXyUTNunGQ3}f83q> zIN#%UzVCOw@64Y1!h+n$uouGw0zsrMPg4Zm(fl1644#W0dkOIBsVX*bMT8r2IPDB; zp&_o)K|{2MWds7xZEImxRA6H0>9HN@0YMwL?7nkSSN-|d3t}xd{@T3#tWgW?y7_po zZCgW2hoxx4`>g{PVE2-r?0#Jvlujlgmk%FZm3UlJ)qJ#Q=)3DNvB|?%uAI*sS$*qf z_RypK;v>Tg*5_W>gOn1QFT>-4|8cSQHr2ViZJr_V^`__coqTw3OW(uz9Pgo)ki;78 z;ro$|@del4YSRi|+ny|b_jl>J{dLdo^l7RB`(^8cKdWs2L?8&LW7X)y1yvzd#|Z|Yl-lTup|9do%b{+wv-xetp!42@l};n3QU=9On!b?Pq$2bXokE_!Bo z5ARSuxId5*TDutfEUI9KsA$mJl)W=<-tMt~jocj?iHES4^JQCCXZDwBQxfKXbZYH2 zZ`k4s$abA3iMe0@ttt4#(1V18uDf-W`^HXXJ<(K|JnYTQ)(=cLMhZYYm9Be#X`dcv-zfNf{ zTlaGLjjrTs0{YD1u_j4#>DZBmu+q@JclVlvIb)Iq-t7-pHLYCw>cWOa z;m5M;sIeaJfV-U`@WG_#Oqo}A(pwt>|Ff~RzwNzm$llU-1b58?D;|s<*BeKgzt!f3 z#|H%7={{ec+x+y6-gx7vZhyq(eW$Uy>;O;35&M+@b$jN$xBE7{w)p70%x!=BWmiB{ zR875*{-E=8XM1OR_0_+OjRh>(=^WAQ@7@8bu7U;CWzgs2q}?haD7%Rkd8`glb^<|a zhQ~pWn`sU*(Pq|`Cj6%Jj1Xd}G~ufcIhk zmF5V@W3|{^xF=2M!^OcjFBS_Sp9!})O=!>;LTbB{hAMo}18z^+OgM|fbH>m?q-kD;Mmq?2`U ztlb9jn1sn*&ZP;3Ko3pCXLacHlkhgzI17Lev4?PoB_c#@wTh>ExVW4O05TrX4|=$Y zL6eG$XqUa*NzyqLw2gadIs`>d`a8;<7GF9PDW)y76_~oftdbd1=IZo?lO8+;X4dNP zc>%I#SaK{gMb?bic#SWe>45AD&K=CgkVGDLcthxbIW0 zL?x(7s(?w1MqrFIp|DE959O3xg(8$nsbHo->1-~Ju#q$m1;9ltz>$+u38^xvU_`+X zFeal=Sc#fwm_{*D#tl6HJ(-7$_<^Mw?IyQ4;>FCedAXhI126 zI?D`r1YCgv^>GC)8(*ql%#6leLi6hYC<7e9Q64pX!Z`~z}>qtdD5+u#Hy2sW+E)d<4*-_Kq+9Regjb>yvg2?XKu`8z=Hc1s)( zhHyH4PRKul5}rqcOE76AI7|oWG+D*UUeXws-un4LZ}p)JZ*|cVNl#p|eT%uVvC#Lqx<=@7OELP{W_9FP4UCB2zMB+KS9$SG&8rjVF38N5{ln?f&Q%XeJsvo*c-!UVpIX zV@mS(lZMF9KM&GIa2edg(i?*2*xH~k``pz?WTxWHnwpxgt{vaBEI76L>4F^Twt!2& zmaHanV=`P{C-3Mhd+`l8zl~j_6$pY>o64HppP+!EDB7T7^m;)G_znd(e|@p0nSbeW L3N$COjkW&;oEA(K literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..d031bf364e42a8be51a1849801bbb83490fb26f0 GIT binary patch literal 4503 zcmeHKdsGzX6<>-&%)$V>v+NG+LV^Z! zmINfNff!B=F(&q$*wm_N%s~rPVtge;IfPP-wuE4MT4RC_OhQ?8`^|y~ZO-Z8oaR41 z&g{&0zk7e*y}$3?d-xi1veSbDmIX*8l3;y?E*HEPh>yP?_>CO(P~i1pOy8`KBd)0HQi@4XPZ z{AZU!&kst*7bYuKo=w~yy6a-l@-?4sFt7A{PbBgE>o(6DFJBoYk@&c{l$0EOO3H&^ zKnQKMuV^zqN?dVfYhPw+?2f7h3qQ^YKP}sI`n|mO{Fi2Kd27?WmUSoh=~F%%9*#M- zbj96*gXA&w^{1utj+n!zQ9EZw!*5hm+if#x?;bVvr6}>GoD!5Q7~f6$Mc56hIhSP`YOVN z=d1aO{I!*TIk9Ft1s(qVZ;of%msC8lvMx$@{=ojGfKvaycV96|Q{C9(o|nE|-@GpR zsj#LMfd`UZjQc~+kfYs1k;74s8WVeVvb9aV_Y3#+A31n~?k;^pGFUv6d4246hN6*{ zJ89{G;Xb}sy3SOlxBT#YcX-j5zBTCM*E$JTvX3)iKmUnON_*lLd-}FK8~M)s#QHxz zeZnUsq^?2A9`5MuXzys>-gDIL_F28tHll0oY6MwV#ewW9Fl3Q5Z{HjKtWD(xy4R8wNfuG3BE-!B89vvLYY=tV90?|cpD25GD3#JsZOp6m&OM`aW=+8 z=IYWWA;3&4EfEAOi69P#L*|gncv~@oX*3!H#St8bfd*`^wg{9Hw%AvR5EB?W)=t|v ztHALVNW`R!e5Ih3O2Inxz(2FqV3>lp*e6*4d>~HBieNGnF`JR;7Iq=E3V=*H^rIH` zJW!-aE^Fs2Z8V!&#ae__(;*mo%HCROEBA)O&0XIY41fYSl-$I~VVY2DV1khYD5FUU zt8mOjt1z6R939r3~`K-+ja#2LZP?=omH5U(t1mOT`DKS$4 zfL9KpAyaHDCGfU9o-fx*MF>c=oLV-3f?_Cv(oq5nKvA3^QG%4Cd6PKpOdi!QW_sf&Va0O*lmU+5X_QHk$zTz&V?2m94*4%W;=BseS`4t8 zkb%|(Iw3OE3Mcszo6b)-CePs~+yOw(Z89r<=jfWFYgP=*N_j53=IELg1G7?|%dY<$ zT>%d-Q>+F22jl=(rOSnF%fL0u&$upKCkYh)e!ir09*{g{&Dd<0NCFp&kB?+eTPP6D z6ZD4EdH;MQVzETkUl9B#xJ<|DbxC>ZZn`M68T##3PeRiL-NEQzWu5V$7ZMV1`2w@# z59Z$BG!GxXz5B?~FITL}YH}4k{#>>D^}1_4h+j2~`F*hMOHYrb)_4iK7r!dWciT3` zbmXy?fAyS0x}cZ~XK&uTyw)#*%C8UayCKI>FoyfS+5PUQ=ggnh2QA8cE(jT^H4ZJh zf6mJEFJ7W`7E1c=4&B~TU$$m1{XtL)I*{QLQS$8P+eFi$KY!W+AAP1~yz#&#%2-rXbY8K`^`!f+eFH(Qdruh0 z#zyCF@Ix&DO3(I@Yi0HAC+}nEU3a(j`aRXLuP(mGhc#q>F>?Eq=Wl;^d0KXBik4j^ vR_m3INTQ1>3b*+#4F*JpumyUP!61nR-~Qkc$7dT`#FsubTX!hAXve<+;FV`W literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..bb453a575c53d78374fddcfc8d6c8163808466fd GIT binary patch literal 4446 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 G&Hpb0!_AWb literal 0 HcmV?d00001