Skip to content

Commit 3ad1b79

Browse files
committed
147v1
1 parent d8d3e25 commit 3ad1b79

File tree

8 files changed

+15
-20
lines changed

8 files changed

+15
-20
lines changed

MBLMMEntityMode_MobMilk.class

-3 Bytes
Binary file not shown.

README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,5 +78,6 @@ limitations under the License.
7878

7979
## History
8080

81+
- 147v1: Minecraft1.4.7に対応
8182
- 151v2: ミルクボウルとミルクシチューを追加しました
8283
- 151v1: 初版

mod/ymt/milk/ItemMilkStew.class

-81 Bytes
Binary file not shown.

mod/ymt/milk/ItemMilkStew.java

Lines changed: 12 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -20,30 +20,37 @@
2020
import net.minecraft.src.CreativeTabs;
2121
import net.minecraft.src.EntityPlayer;
2222
import net.minecraft.src.EnumAction;
23-
import net.minecraft.src.Icon;
24-
import net.minecraft.src.IconRegister;
2523
import net.minecraft.src.Item;
2624
import net.minecraft.src.ItemFood;
2725
import net.minecraft.src.ItemStack;
26+
import net.minecraft.src.ModLoader;
2827
import net.minecraft.src.Potion;
2928
import net.minecraft.src.World;
3029

3130
public class ItemMilkStew extends ItemFood {
32-
private Icon[] textures = null;
31+
private int[] textures = null;
3332

3433
public ItemMilkStew(int id) {
3534
super(id, 0, 0, false);
3635
setMaxDamage(20);
3736
setHasSubtypes(true);
3837
setMaxStackSize(1);
3938
setPotionEffect(Potion.regeneration.id, 5, 0, 1.0F);
39+
textures = new int[2];
40+
textures[0] = ModLoader.addOverride("/gui/items.png", "/mod/ymt/milk/milkbowl.png");
41+
textures[1] = ModLoader.addOverride("/gui/items.png", "/mod/ymt/milk/milkstew.png");
4042
}
4143

4244
@Override
43-
public Icon getIconFromDamage(int metadata) {
45+
public int getIconFromDamage(int metadata) {
4446
return textures[metadata == 0 ? 0 : 1];
4547
}
4648

49+
@Override
50+
public String getItemNameIS(ItemStack stack) {
51+
return super.getItemName() + "/" + stack.getItemDamage();
52+
}
53+
4754
@Override
4855
public EnumAction getItemUseAction(ItemStack item) {
4956
if (item.getItemDamage() == 0)
@@ -59,12 +66,7 @@ public void getSubItems(int itemId, CreativeTabs tabs, List list) {
5966
}
6067

6168
@Override
62-
public String getUnlocalizedName(ItemStack item) {
63-
return super.getUnlocalizedName() + "." + item.getItemDamage();
64-
}
65-
66-
@Override
67-
public ItemStack onEaten(ItemStack item, World world, EntityPlayer player) {
69+
public ItemStack onFoodEaten(ItemStack item, World world, EntityPlayer player) {
6870
if (Utils.isServerSide(world)) {
6971
// クリア
7072
player.clearActivePotions();
@@ -73,17 +75,9 @@ public ItemStack onEaten(ItemStack item, World world, EntityPlayer player) {
7375
int foodAmount = item.getMaxDamage() - item.getItemDamage();
7476
player.getFoodStats().addStats(foodAmount, 0.6f);
7577
world.playSoundAtEntity(player, "random.burp", 0.5F, world.rand.nextFloat() * 0.1F + 0.9F);
76-
onFoodEaten(item, world, player);
7778
}
7879
}
7980
item.stackSize--;
8081
return new ItemStack(Item.bowlEmpty);
8182
}
82-
83-
@Override
84-
public void updateIcons(IconRegister par1IconRegister) {
85-
this.textures = new Icon[]{
86-
par1IconRegister.registerIcon("mod.ymt.milkbowl"), par1IconRegister.registerIcon("mod.ymt.milkstew"),
87-
};
88-
}
8983
}

mod_MobMilk.class

0 Bytes
Binary file not shown.

mod_MobMilk.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,15 +33,15 @@ public String getPriorities() {
3333

3434
@Override
3535
public String getVersion() {
36-
return "151v2";
36+
return "147v1";
3737
}
3838

3939
@Override
4040
public void load() {
4141
// ミルクシチュー追加
4242
if (0 < milkStewItemId) {
4343
milkStew = new ItemMilkStew(milkStewItemId);
44-
milkStew.setUnlocalizedName("milkStew");
44+
milkStew.setItemName("milkStew");
4545
Utils.addName(milkStew, "milk bowl", "ミルクボウル");
4646
Utils.addName(new ItemStack(milkStew, 0, 0), "milk bowl", "ミルクボウル");
4747
for (int i = 1; i < milkStew.getMaxDamage(); i++) {

0 commit comments

Comments
 (0)