diff --git a/common/biomesoplenty/api/Items.java b/common/biomesoplenty/api/Items.java
index e8455b6ef..c121c74cd 100644
--- a/common/biomesoplenty/api/Items.java
+++ b/common/biomesoplenty/api/Items.java
@@ -48,5 +48,6 @@ public class Items
public static Optional extends Item> soulManipulator = Optional.absent();
public static Optional extends Item> flowerBand = Optional.absent();
- public static Optional extends Item> wadingBoots = Optional.absent();
+ public static Optional extends Item> wadingBoots = Optional.absent();
+ public static Optional extends Item> flippers = Optional.absent();
}
diff --git a/common/biomesoplenty/armor/ArmorFlippers.java b/common/biomesoplenty/armor/ArmorFlippers.java
new file mode 100644
index 000000000..4634375de
--- /dev/null
+++ b/common/biomesoplenty/armor/ArmorFlippers.java
@@ -0,0 +1,37 @@
+package biomesoplenty.armor;
+
+import net.minecraft.client.renderer.texture.IconRegister;
+import net.minecraft.entity.Entity;
+import net.minecraft.item.EnumArmorMaterial;
+import net.minecraft.item.ItemArmor;
+import net.minecraft.item.ItemStack;
+import biomesoplenty.BiomesOPlenty;
+import biomesoplenty.api.Items;
+
+public class ArmorFlippers extends ItemArmor
+{
+ public int textureID = 0;
+
+ public ArmorFlippers(int par1, EnumArmorMaterial par2EnumArmorMaterial, int par3, int par4)
+ {
+ super(par1, par2EnumArmorMaterial, par3, par4);
+ textureID = par4;
+ setMaxDamage(0);
+ setCreativeTab(BiomesOPlenty.tabBiomesOPlenty);
+ }
+
+ @Override
+ public String getArmorTexture(ItemStack stack, Entity entity, int slot, String type)
+ {
+ if (stack.itemID == Items.flippers.get().itemID)
+ return "biomesoplenty:textures/armor/flippers.png";
+
+ return null;
+ }
+
+ @Override
+ public void registerIcons(IconRegister iconRegister)
+ {
+ if (textureID == 3) { itemIcon = iconRegister.registerIcon("biomesoplenty:flippers"); }
+ }
+}
diff --git a/common/biomesoplenty/configuration/BOPConfiguration.java b/common/biomesoplenty/configuration/BOPConfiguration.java
index 86c881e21..2a593ff84 100644
--- a/common/biomesoplenty/configuration/BOPConfiguration.java
+++ b/common/biomesoplenty/configuration/BOPConfiguration.java
@@ -675,7 +675,8 @@ public class BOPConfiguration
public static int flowerBandID;
public static int wadingBootsID;
-
+ public static int flippersID;
+
//Liquid IDs
public static int springWaterStillID;
public static int liquidPoisonStillID;
@@ -973,6 +974,7 @@ public class BOPConfiguration
scytheAmethystID = config.getItem("Amethyst Scythe ID", 21087).getInt();
wadingBootsID = config.getItem("Wading Boots ID", 21088).getInt();
+ flippersID = config.getItem("Flippers ID", 21089).getInt();
//Liquid Ids
springWaterStillID = config.get("Liquid IDs", "Spring Water Still ID (ID before this must be free!)", 1971, null).getInt();
diff --git a/common/biomesoplenty/configuration/BOPItems.java b/common/biomesoplenty/configuration/BOPItems.java
index 81a17686f..fc90f6f74 100644
--- a/common/biomesoplenty/configuration/BOPItems.java
+++ b/common/biomesoplenty/configuration/BOPItems.java
@@ -11,6 +11,7 @@ import net.minecraftforge.common.MinecraftForge;
import biomesoplenty.BiomesOPlenty;
import biomesoplenty.api.Items;
import biomesoplenty.armor.ArmorAmethyst;
+import biomesoplenty.armor.ArmorFlippers;
import biomesoplenty.armor.ArmorFlowerBand;
import biomesoplenty.armor.ArmorMuddy;
import biomesoplenty.armor.ArmorWadingBoots;
@@ -47,6 +48,7 @@ public class BOPItems {
public static EnumToolMaterial EnumToolMaterialAmethyst;
public static EnumArmorMaterial EnumArmorMaterialFlowerBand;
public static EnumArmorMaterial EnumArmorMaterialWadingBoots;
+ public static EnumArmorMaterial EnumArmorMaterialFlippers;
public static int clearItem(Item var1)
{
@@ -90,6 +92,7 @@ public class BOPItems {
EnumToolMaterialAmethyst = EnumHelper.addToolMaterial("AMETHYST", 4, 2013, 15.0F, 5, 16);
EnumArmorMaterialFlowerBand = EnumHelper.addArmorMaterial("FLOWERBAND", -1, new int[]{0, 0, 0, 0}, 0);
EnumArmorMaterialWadingBoots = EnumHelper.addArmorMaterial("WADINGBOOTS", -1, new int[]{0, 0, 0, 0}, 0);
+ EnumArmorMaterialFlippers = EnumHelper.addArmorMaterial("FLIPPERS", -1, new int[]{0, 0, 0, 0}, 0);
initializeItems();
@@ -145,5 +148,6 @@ public class BOPItems {
Items.flowerBand = Optional.of((new ArmorFlowerBand(BOPConfiguration.IDs.flowerBandID, EnumArmorMaterialFlowerBand, BiomesOPlenty.proxy.addArmor("flowerBand"), 0)).setCreativeTab(BiomesOPlenty.tabBiomesOPlenty).setUnlocalizedName("bop.flowerBand"));
Items.wadingBoots = Optional.of((new ArmorWadingBoots(BOPConfiguration.IDs.wadingBootsID, EnumArmorMaterialWadingBoots, BiomesOPlenty.proxy.addArmor("wadingBoots"), 3)).setCreativeTab(BiomesOPlenty.tabBiomesOPlenty).setUnlocalizedName("bop.wadingBoots"));
+ Items.flippers = Optional.of((new ArmorFlippers(BOPConfiguration.IDs.flippersID, EnumArmorMaterialFlippers, BiomesOPlenty.proxy.addArmor("flippers"), 3)).setCreativeTab(BiomesOPlenty.tabBiomesOPlenty).setUnlocalizedName("bop.flippers"));
}
}
diff --git a/resources/assets/biomesoplenty/lang/en_US.xml b/resources/assets/biomesoplenty/lang/en_US.xml
index 7ac0ac757..bb1602e02 100644
--- a/resources/assets/biomesoplenty/lang/en_US.xml
+++ b/resources/assets/biomesoplenty/lang/en_US.xml
@@ -356,6 +356,7 @@
Exotic Flower Band
Wading Boots
+ Flippers
Amethyst Bucket
diff --git a/resources/assets/biomesoplenty/textures/armor/flippers.png b/resources/assets/biomesoplenty/textures/armor/flippers.png
new file mode 100644
index 000000000..9b349aa2f
Binary files /dev/null and b/resources/assets/biomesoplenty/textures/armor/flippers.png differ
diff --git a/resources/assets/biomesoplenty/textures/armor/wadingboots.png b/resources/assets/biomesoplenty/textures/armor/wadingboots.png
index 923c688f1..d53f710fd 100644
Binary files a/resources/assets/biomesoplenty/textures/armor/wadingboots.png and b/resources/assets/biomesoplenty/textures/armor/wadingboots.png differ
diff --git a/resources/assets/biomesoplenty/textures/items/flippers.png b/resources/assets/biomesoplenty/textures/items/flippers.png
new file mode 100644
index 000000000..6c03005db
Binary files /dev/null and b/resources/assets/biomesoplenty/textures/items/flippers.png differ