Skip to content

Commit 9159cf6

Browse files
committed
Release 2.0.0 Touch-Up (ooglyboogly)
- Added the missing getPickedResult for Horned Sheep
1 parent 8a4ab3d commit 9159cf6

File tree

12 files changed

+23
-3
lines changed

12 files changed

+23
-3
lines changed

src/main/java/darkbum/saltymod/entity/EntityHornedSheep.java

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22

33
import java.util.Random;
44

5+
import cpw.mods.fml.relauncher.Side;
6+
import cpw.mods.fml.relauncher.SideOnly;
57
import darkbum.saltymod.init.ModBlocks;
68
import darkbum.saltymod.init.ModItems;
79
import net.minecraft.entity.EntityAgeable;
@@ -11,10 +13,14 @@
1113
import net.minecraft.entity.ai.EntityAITempt;
1214
import net.minecraft.entity.passive.EntitySheep;
1315
import net.minecraft.init.Blocks;
16+
import net.minecraft.init.Items;
1417
import net.minecraft.item.Item;
1518
import net.minecraft.item.ItemStack;
19+
import net.minecraft.util.MovingObjectPosition;
1620
import net.minecraft.world.World;
1721

22+
import static darkbum.saltymod.init.ModEntities.*;
23+
1824
/**
1925
* Entity class for the horned sheep entity.
2026
* The horned sheep is a sheep copy with horns.
@@ -146,4 +152,11 @@ protected void dropFewItems(boolean wasRecentlyHit, int lootingLevel) {
146152
}
147153
}
148154
}
155+
156+
@Override
157+
@SideOnly(Side.CLIENT)
158+
public ItemStack getPickedResult(MovingObjectPosition target) {
159+
int id = getUniqueEntityId() - 1;
160+
return new ItemStack(Items.spawn_egg, 1, id);
161+
}
149162
}

src/main/java/darkbum/saltymod/event/PlayerUseItemEventHandler.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import cpw.mods.fml.common.eventhandler.SubscribeEvent;
44
import darkbum.saltymod.init.ModAchievementList;
55
import darkbum.saltymod.init.ModItems;
6-
import darkbum.saltymod.item.ItemSaltFood;
6+
import darkbum.saltymod.util.ItemSaltFood;
77
import darkbum.saltymod.potion.ModPotion;
88
import net.minecraft.entity.player.EntityPlayer;
99
import net.minecraftforge.event.entity.player.PlayerUseItemEvent;

src/main/java/darkbum/saltymod/init/ModItems.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package darkbum.saltymod.init;
22

33
import darkbum.saltymod.potion.ModPotion;
4+
import darkbum.saltymod.util.ItemSaltFood;
45
import net.minecraft.creativetab.CreativeTabs;
56
import net.minecraft.item.*;
67
import net.minecraft.potion.Potion;

src/main/java/darkbum/saltymod/item/ItemBerriesGold.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
import cpw.mods.fml.relauncher.Side;
44
import cpw.mods.fml.relauncher.SideOnly;
5+
import darkbum.saltymod.util.ItemSaltFood;
56
import net.minecraft.creativetab.CreativeTabs;
67

78
import net.minecraft.item.EnumRarity;

src/main/java/darkbum/saltymod/item/ItemChocolateBar.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package darkbum.saltymod.item;
22

3+
import darkbum.saltymod.util.ItemSaltFood;
34
import net.minecraft.creativetab.CreativeTabs;
45
import net.minecraft.entity.player.EntityPlayer;
56
import net.minecraft.item.ItemStack;

src/main/java/darkbum/saltymod/item/ItemChorusCookie.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package darkbum.saltymod.item;
22

3+
import darkbum.saltymod.util.ItemSaltFood;
34
import net.minecraft.block.Block;
45
import net.minecraft.creativetab.CreativeTabs;
56
import net.minecraft.entity.EntityLivingBase;

src/main/java/darkbum/saltymod/item/ItemDeveloperFoods.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package darkbum.saltymod.item;
22

3+
import darkbum.saltymod.util.ItemSaltFood;
34
import net.minecraft.creativetab.CreativeTabs;
45
import net.minecraft.entity.player.EntityPlayer;
56
import net.minecraft.item.ItemStack;

src/main/java/darkbum/saltymod/item/ItemMuffin.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package darkbum.saltymod.item;
22

3+
import darkbum.saltymod.util.ItemSaltFood;
34
import net.minecraft.creativetab.CreativeTabs;
45
import net.minecraft.entity.player.EntityPlayer;
56
import net.minecraft.item.ItemStack;

src/main/java/darkbum/saltymod/item/ItemSaltwort.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package darkbum.saltymod.item;
22

33
import darkbum.saltymod.block.BlockSaltworts;
4+
import darkbum.saltymod.util.ItemSaltFood;
45
import net.minecraft.creativetab.CreativeTabs;
56
import net.minecraft.entity.player.EntityPlayer;
67
import net.minecraft.item.Item;

src/main/java/darkbum/saltymod/item/ItemTunnelerConcoction.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package darkbum.saltymod.item;
22

3+
import darkbum.saltymod.util.ItemSaltFood;
34
import net.minecraft.creativetab.CreativeTabs;
45
import net.minecraft.entity.player.EntityPlayer;
56
import net.minecraft.item.ItemStack;

0 commit comments

Comments
 (0)