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