aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gtPlusPlus/plugin/fishing
diff options
context:
space:
mode:
Diffstat (limited to 'src/main/java/gtPlusPlus/plugin/fishing')
-rw-r--r--src/main/java/gtPlusPlus/plugin/fishing/item/BaseFish.java13
-rw-r--r--src/main/java/gtPlusPlus/plugin/fishing/misc/BaseFishTypes.java19
2 files changed, 18 insertions, 14 deletions
diff --git a/src/main/java/gtPlusPlus/plugin/fishing/item/BaseFish.java b/src/main/java/gtPlusPlus/plugin/fishing/item/BaseFish.java
index 7a43e66730..e0af27a504 100644
--- a/src/main/java/gtPlusPlus/plugin/fishing/item/BaseFish.java
+++ b/src/main/java/gtPlusPlus/plugin/fishing/item/BaseFish.java
@@ -1,9 +1,7 @@
package gtPlusPlus.plugin.fishing.item;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
-import gtPlusPlus.plugin.fishing.misc.BaseFishTypes;
import java.util.List;
+
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.entity.player.EntityPlayer;
@@ -16,7 +14,12 @@ import net.minecraft.potion.PotionHelper;
import net.minecraft.util.IIcon;
import net.minecraft.world.World;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import gtPlusPlus.plugin.fishing.misc.BaseFishTypes;
+
public class BaseFish extends ItemFood {
+
private final boolean isCooked;
public BaseFish(boolean cooked) {
@@ -98,7 +101,9 @@ public class BaseFish extends ItemFood {
*/
public String getUnlocalizedName(ItemStack p_77667_1_) {
BaseFishTypes fishtype = BaseFishTypes.getFishTypeFromStackDamage(p_77667_1_);
- return this.getUnlocalizedName() + "." + fishtype.getFishName() + "."
+ return this.getUnlocalizedName() + "."
+ + fishtype.getFishName()
+ + "."
+ (this.isCooked && fishtype.isCooked() ? "cooked" : "raw");
}
}
diff --git a/src/main/java/gtPlusPlus/plugin/fishing/misc/BaseFishTypes.java b/src/main/java/gtPlusPlus/plugin/fishing/misc/BaseFishTypes.java
index 70046828b4..04e57e639b 100644
--- a/src/main/java/gtPlusPlus/plugin/fishing/misc/BaseFishTypes.java
+++ b/src/main/java/gtPlusPlus/plugin/fishing/misc/BaseFishTypes.java
@@ -1,15 +1,19 @@
package gtPlusPlus.plugin.fishing.misc;
-import com.google.common.collect.Maps;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
-import gtPlusPlus.plugin.fishing.item.BaseFish;
import java.util.Map;
+
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.item.ItemStack;
import net.minecraft.util.IIcon;
+import com.google.common.collect.Maps;
+
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import gtPlusPlus.plugin.fishing.item.BaseFish;
+
public enum BaseFishTypes {
+
COD(0, "cod", 2, 0.1F, 5, 0.6F),
SALMON(1, "salmon", 2, 0.1F, 6, 0.8F),
CLOWNFISH(2, "clownfish", 1, 0.1F),
@@ -31,12 +35,7 @@ public enum BaseFishTypes {
private final float field_150990_m;
private boolean isCooked = false;
- private BaseFishTypes(
- int p_i45336_3_,
- String p_i45336_4_,
- int p_i45336_5_,
- float p_i45336_6_,
- int p_i45336_7_,
+ private BaseFishTypes(int p_i45336_3_, String p_i45336_4_, int p_i45336_5_, float p_i45336_6_, int p_i45336_7_,
float p_i45336_8_) {
this.mID = p_i45336_3_;
this.mFishName = p_i45336_4_;