diff options
Diffstat (limited to 'src/main')
3 files changed, 25 insertions, 2 deletions
diff --git a/src/main/java/gregtech/loaders/preload/GT_Loader_ItemData.java b/src/main/java/gregtech/loaders/preload/GT_Loader_ItemData.java index 321ecca70f..a4d1644b6b 100644 --- a/src/main/java/gregtech/loaders/preload/GT_Loader_ItemData.java +++ b/src/main/java/gregtech/loaders/preload/GT_Loader_ItemData.java @@ -3,6 +3,7 @@ package gregtech.loaders.preload; import static gregtech.api.enums.Mods.AppliedEnergistics2; import static gregtech.api.enums.Mods.Forestry; import static gregtech.api.enums.Mods.NewHorizonsCoreMod; +import static gregtech.api.enums.Mods.PamsHarvestCraft; import static gregtech.api.enums.Mods.Railcraft; import static gregtech.api.enums.Mods.Thaumcraft; import static gregtech.api.enums.Mods.TwilightForest; @@ -360,8 +361,13 @@ public class GT_Loader_ItemData implements Runnable { GT_OreDictUnificator.addItemData( GT_ModHandler.getModItem(Thaumcraft.ID, "ItemNuggetFish", 1L, 32767), new ItemData(Materials.MeatCooked, 403200L)); + for (ItemStack tItem : new ItemStack[] { GT_ModHandler.getModItem(TwilightForest.ID, "item.meefRaw", 1L, 0), - GT_ModHandler.getModItem(TwilightForest.ID, "item.venisonRaw", 1L, 0), new ItemStack(Items.porkchop), + GT_ModHandler.getModItem(TwilightForest.ID, "item.venisonRaw", 1L, 0), + GT_ModHandler.getModItem(PamsHarvestCraft.ID, "muttonrawItem", 1L, 0), + GT_ModHandler.getModItem(PamsHarvestCraft.ID, "turkeyrawItem", 1L, 0), + GT_ModHandler.getModItem(PamsHarvestCraft.ID, "rabbitrawItem", 1L, 0), + GT_ModHandler.getModItem(PamsHarvestCraft.ID, "venisonrawItem", 1L, 0), new ItemStack(Items.porkchop), new ItemStack(Items.beef), new ItemStack(Items.chicken), new ItemStack(Items.fish) }) { if (tItem != null) { GT_OreDictUnificator.addItemData( @@ -371,6 +377,10 @@ public class GT_Loader_ItemData implements Runnable { } for (ItemStack tItem : new ItemStack[] { GT_ModHandler.getModItem(TwilightForest.ID, "item.meefSteak", 1L, 0), GT_ModHandler.getModItem(TwilightForest.ID, "item.venisonCooked", 1L, 0), + GT_ModHandler.getModItem(PamsHarvestCraft.ID, "muttoncookedItem", 1L, 0), + GT_ModHandler.getModItem(PamsHarvestCraft.ID, "turkeycookedItem", 1L, 0), + GT_ModHandler.getModItem(PamsHarvestCraft.ID, "rabbitcookedItem", 1L, 0), + GT_ModHandler.getModItem(PamsHarvestCraft.ID, "venisoncookedItem", 1L, 0), new ItemStack(Items.cooked_porkchop), new ItemStack(Items.cooked_beef), new ItemStack(Items.cooked_chicken), new ItemStack(Items.cooked_fished) }) { if (tItem != null) { diff --git a/src/main/java/gtPlusPlus/core/item/food/BaseItemMetaFood.java b/src/main/java/gtPlusPlus/core/item/food/BaseItemMetaFood.java index a307eb48ac..07bf082903 100644 --- a/src/main/java/gtPlusPlus/core/item/food/BaseItemMetaFood.java +++ b/src/main/java/gtPlusPlus/core/item/food/BaseItemMetaFood.java @@ -20,6 +20,10 @@ import net.minecraft.util.IIcon; import net.minecraft.world.World; import cpw.mods.fml.common.registry.GameRegistry; +import gregtech.api.enums.Materials; +import gregtech.api.objects.ItemData; +import gregtech.api.objects.MaterialStack; +import gregtech.api.util.GT_OreDictUnificator; import gtPlusPlus.api.objects.data.AutoMap; import gtPlusPlus.core.creative.AddToCreativeTab; import gtPlusPlus.core.item.ModItems; @@ -194,6 +198,15 @@ public class BaseItemMetaFood extends ItemFood { mSpecialBehaviourMap.put(aMetaID, aSpecialBehaviour); } mOreDictNames.put(aMetaID, aOreDictNames); + if (aOreDictNames.contains("listAllmeatraw")) { + GT_OreDictUnificator.addItemData( + new ItemStack(ModItems.itemMetaFood, 1, aMetaID), + new ItemData(Materials.MeatRaw, 3628800L, new MaterialStack(Materials.Bone, 403200L))); + } else if (aOreDictNames.contains("listAllmeatcooked")) { + GT_OreDictUnificator.addItemData( + new ItemStack(ModItems.itemMetaFood, 1, aMetaID), + new ItemData(Materials.MeatCooked, 3628800L, new MaterialStack(Materials.Bone, 403200L))); + } } public static void registerFoodsToOreDict() { @@ -217,7 +230,6 @@ public class BaseItemMetaFood extends ItemFood { this.setUnlocalizedName("BasicMetaFood"); this.setCreativeTab(AddToCreativeTab.tabMisc); GameRegistry.registerItem(this, this.getUnlocalizedName()); - BaseItemMetaFood.registerMetaFoods(); } private static int getMetaKey(ItemStack aStack) { diff --git a/src/main/java/gtPlusPlus/core/item/init/ItemsFoods.java b/src/main/java/gtPlusPlus/core/item/init/ItemsFoods.java index acddd58a7b..68549f80bf 100644 --- a/src/main/java/gtPlusPlus/core/item/init/ItemsFoods.java +++ b/src/main/java/gtPlusPlus/core/item/init/ItemsFoods.java @@ -22,6 +22,7 @@ public class ItemsFoods { private static void run() { ModItems.itemMetaFood = new BaseItemMetaFood(); + BaseItemMetaFood.registerMetaFoods(); BaseItemMetaFood.registerFoodsToOreDict(); addCookingRecipes(); addFoodDropsToMobs(); |