diff --git a/src/main/java/biomesoplenty/api/item/BOPItemHelper.java b/src/main/java/biomesoplenty/api/item/BOPItemHelper.java index c7fc0369c..bb3334595 100644 --- a/src/main/java/biomesoplenty/api/item/BOPItemHelper.java +++ b/src/main/java/biomesoplenty/api/item/BOPItemHelper.java @@ -14,6 +14,8 @@ import net.minecraft.item.ItemArmor.ArmorMaterial; public class BOPItemHelper { public static ArmorMaterial wading_boots_material; + public static ArmorMaterial mud_armor_material; + public static ArmorMaterial amethyst_armor_material; public static ToolMaterial mud_tool_material; public static ToolMaterial amethyst_tool_material; } \ No newline at end of file diff --git a/src/main/java/biomesoplenty/api/item/BOPItems.java b/src/main/java/biomesoplenty/api/item/BOPItems.java index 5880efc55..cfaff2974 100644 --- a/src/main/java/biomesoplenty/api/item/BOPItems.java +++ b/src/main/java/biomesoplenty/api/item/BOPItems.java @@ -46,6 +46,14 @@ public class BOPItems public static Item wood_slab_1; public static Item wading_boots; + public static Item mud_helmet; + public static Item mud_chestplate; + public static Item mud_leggings; + public static Item mud_boots; + public static Item amethyst_helmet; + public static Item amethyst_chestplate; + public static Item amethyst_leggings; + public static Item amethyst_boots; public static Item mud_axe; public static Item mud_hoe; diff --git a/src/main/java/biomesoplenty/common/init/ModItems.java b/src/main/java/biomesoplenty/common/init/ModItems.java index 48bd58965..7c601b5e7 100644 --- a/src/main/java/biomesoplenty/common/init/ModItems.java +++ b/src/main/java/biomesoplenty/common/init/ModItems.java @@ -19,6 +19,7 @@ import net.minecraft.client.resources.model.ModelBakery; import net.minecraft.client.resources.model.ModelResourceLocation; import net.minecraft.init.Blocks; import net.minecraft.item.Item; +import net.minecraft.item.ItemArmor; import net.minecraft.item.ItemAxe; import net.minecraft.item.ItemFood; import net.minecraft.item.ItemHoe; @@ -62,11 +63,34 @@ public class ModItems // armor - // TODO: do we really want durability of -1? does that mean it lasts forever? + // addArmorMaterial arguments: + // (String name, String textureName, int durability, int[] reductionAmounts, int enchantability) + // Vanilla armor material values for comparison: + // LEATHER("leather", 5, new int[]{1, 3, 2, 1}, 15), + // CHAIN("chainmail", 15, new int[]{2, 5, 4, 1}, 12), + // IRON("iron", 15, new int[]{2, 6, 5, 2}, 9), + // GOLD("gold", 7, new int[]{2, 5, 3, 1}, 25), + // DIAMOND("diamond", 33, new int[]{3, 8, 6, 3}, 10); + + // TODO: do we really want durability of -1 for wading boots? does that mean it lasts forever? wading_boots_material = EnumHelper.addArmorMaterial("WADING_BOOTS", "biomesoplenty:wading_boots", -1, new int[]{0,0,0,0}, 0); + mud_armor_material = EnumHelper.addArmorMaterial("MUD", "biomesoplenty:mud_armor", 2, new int[]{1,1,1,1}, 5); + mud_armor_material.customCraftingMaterial = mudball; + amethyst_armor_material = EnumHelper.addArmorMaterial("AMETHYST", "biomesoplenty:amethyst_armor", 40, new int[]{6,12,10,6}, 20); + + wading_boots = registerItem(new ItemWadingBoots(wading_boots_material, 0), "wading_boots"); + mud_helmet = registerItem(new ItemArmor(mud_armor_material, 0, 0), "mud_helmet"); + mud_chestplate = registerItem(new ItemArmor(mud_armor_material, 0, 1), "mud_chestplate"); + mud_leggings = registerItem(new ItemArmor(mud_armor_material, 0, 2), "mud_leggings"); + mud_boots = registerItem(new ItemArmor(mud_armor_material, 0, 3), "mud_boots"); + amethyst_helmet = registerItem(new ItemArmor(amethyst_armor_material, 0, 0), "amethyst_helmet"); + amethyst_chestplate = registerItem(new ItemArmor(amethyst_armor_material, 0, 1), "amethyst_chestplate"); + amethyst_leggings = registerItem(new ItemArmor(amethyst_armor_material, 0, 2), "amethyst_leggings"); + amethyst_boots = registerItem(new ItemArmor(amethyst_armor_material, 0, 3), "amethyst_boots"); + // tools // addToolMaterial arguments: diff --git a/src/main/resources/assets/biomesoplenty/models/item/amethyst_boots.json b/src/main/resources/assets/biomesoplenty/models/item/amethyst_boots.json new file mode 100644 index 000000000..65e09cdb3 --- /dev/null +++ b/src/main/resources/assets/biomesoplenty/models/item/amethyst_boots.json @@ -0,0 +1,18 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "biomesoplenty:items/amethyst_boots" + }, + "display": { + "thirdperson": { + "rotation": [ -90, 0, 0 ], + "translation": [ 0, 1, -3 ], + "scale": [ 0.55, 0.55, 0.55 ] + }, + "firstperson": { + "rotation": [ 0, -135, 25 ], + "translation": [ 0, 4, 2 ], + "scale": [ 1.7, 1.7, 1.7 ] + } + } +} diff --git a/src/main/resources/assets/biomesoplenty/models/item/amethyst_chestplate.json b/src/main/resources/assets/biomesoplenty/models/item/amethyst_chestplate.json new file mode 100644 index 000000000..ff557ceb1 --- /dev/null +++ b/src/main/resources/assets/biomesoplenty/models/item/amethyst_chestplate.json @@ -0,0 +1,18 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "biomesoplenty:items/amethyst_chestplate" + }, + "display": { + "thirdperson": { + "rotation": [ -90, 0, 0 ], + "translation": [ 0, 1, -3 ], + "scale": [ 0.55, 0.55, 0.55 ] + }, + "firstperson": { + "rotation": [ 0, -135, 25 ], + "translation": [ 0, 4, 2 ], + "scale": [ 1.7, 1.7, 1.7 ] + } + } +} diff --git a/src/main/resources/assets/biomesoplenty/models/item/amethyst_helmet.json b/src/main/resources/assets/biomesoplenty/models/item/amethyst_helmet.json new file mode 100644 index 000000000..99e0b8c5f --- /dev/null +++ b/src/main/resources/assets/biomesoplenty/models/item/amethyst_helmet.json @@ -0,0 +1,18 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "biomesoplenty:items/amethyst_helmet" + }, + "display": { + "thirdperson": { + "rotation": [ -90, 0, 0 ], + "translation": [ 0, 1, -3 ], + "scale": [ 0.55, 0.55, 0.55 ] + }, + "firstperson": { + "rotation": [ 0, -135, 25 ], + "translation": [ 0, 4, 2 ], + "scale": [ 1.7, 1.7, 1.7 ] + } + } +} diff --git a/src/main/resources/assets/biomesoplenty/models/item/amethyst_leggings.json b/src/main/resources/assets/biomesoplenty/models/item/amethyst_leggings.json new file mode 100644 index 000000000..e82d81e18 --- /dev/null +++ b/src/main/resources/assets/biomesoplenty/models/item/amethyst_leggings.json @@ -0,0 +1,18 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "biomesoplenty:items/amethyst_leggings" + }, + "display": { + "thirdperson": { + "rotation": [ -90, 0, 0 ], + "translation": [ 0, 1, -3 ], + "scale": [ 0.55, 0.55, 0.55 ] + }, + "firstperson": { + "rotation": [ 0, -135, 25 ], + "translation": [ 0, 4, 2 ], + "scale": [ 1.7, 1.7, 1.7 ] + } + } +} diff --git a/src/main/resources/assets/biomesoplenty/models/item/mud_boots.json b/src/main/resources/assets/biomesoplenty/models/item/mud_boots.json new file mode 100644 index 000000000..aa018ab72 --- /dev/null +++ b/src/main/resources/assets/biomesoplenty/models/item/mud_boots.json @@ -0,0 +1,18 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "biomesoplenty:items/mud_boots" + }, + "display": { + "thirdperson": { + "rotation": [ -90, 0, 0 ], + "translation": [ 0, 1, -3 ], + "scale": [ 0.55, 0.55, 0.55 ] + }, + "firstperson": { + "rotation": [ 0, -135, 25 ], + "translation": [ 0, 4, 2 ], + "scale": [ 1.7, 1.7, 1.7 ] + } + } +} diff --git a/src/main/resources/assets/biomesoplenty/models/item/mud_chestplate.json b/src/main/resources/assets/biomesoplenty/models/item/mud_chestplate.json new file mode 100644 index 000000000..157dfe315 --- /dev/null +++ b/src/main/resources/assets/biomesoplenty/models/item/mud_chestplate.json @@ -0,0 +1,18 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "biomesoplenty:items/mud_chestplate" + }, + "display": { + "thirdperson": { + "rotation": [ -90, 0, 0 ], + "translation": [ 0, 1, -3 ], + "scale": [ 0.55, 0.55, 0.55 ] + }, + "firstperson": { + "rotation": [ 0, -135, 25 ], + "translation": [ 0, 4, 2 ], + "scale": [ 1.7, 1.7, 1.7 ] + } + } +} diff --git a/src/main/resources/assets/biomesoplenty/models/item/mud_helmet.json b/src/main/resources/assets/biomesoplenty/models/item/mud_helmet.json new file mode 100644 index 000000000..99f9ab3e6 --- /dev/null +++ b/src/main/resources/assets/biomesoplenty/models/item/mud_helmet.json @@ -0,0 +1,18 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "biomesoplenty:items/mud_helmet" + }, + "display": { + "thirdperson": { + "rotation": [ -90, 0, 0 ], + "translation": [ 0, 1, -3 ], + "scale": [ 0.55, 0.55, 0.55 ] + }, + "firstperson": { + "rotation": [ 0, -135, 25 ], + "translation": [ 0, 4, 2 ], + "scale": [ 1.7, 1.7, 1.7 ] + } + } +} diff --git a/src/main/resources/assets/biomesoplenty/models/item/mud_leggings.json b/src/main/resources/assets/biomesoplenty/models/item/mud_leggings.json new file mode 100644 index 000000000..0e9795dbb --- /dev/null +++ b/src/main/resources/assets/biomesoplenty/models/item/mud_leggings.json @@ -0,0 +1,18 @@ +{ + "parent": "builtin/generated", + "textures": { + "layer0": "biomesoplenty:items/mud_leggings" + }, + "display": { + "thirdperson": { + "rotation": [ -90, 0, 0 ], + "translation": [ 0, 1, -3 ], + "scale": [ 0.55, 0.55, 0.55 ] + }, + "firstperson": { + "rotation": [ 0, -135, 25 ], + "translation": [ 0, 4, 2 ], + "scale": [ 1.7, 1.7, 1.7 ] + } + } +} diff --git a/src/main/resources/assets/biomesoplenty/textures/items/amethyst_boots.png b/src/main/resources/assets/biomesoplenty/textures/items/amethyst_boots.png new file mode 100644 index 000000000..2bdff4add Binary files /dev/null and b/src/main/resources/assets/biomesoplenty/textures/items/amethyst_boots.png differ diff --git a/src/main/resources/assets/biomesoplenty/textures/items/amethyst_chestplate.png b/src/main/resources/assets/biomesoplenty/textures/items/amethyst_chestplate.png new file mode 100644 index 000000000..8e4e1cbe3 Binary files /dev/null and b/src/main/resources/assets/biomesoplenty/textures/items/amethyst_chestplate.png differ diff --git a/src/main/resources/assets/biomesoplenty/textures/items/amethyst_helmet.png b/src/main/resources/assets/biomesoplenty/textures/items/amethyst_helmet.png new file mode 100644 index 000000000..500a74aca Binary files /dev/null and b/src/main/resources/assets/biomesoplenty/textures/items/amethyst_helmet.png differ diff --git a/src/main/resources/assets/biomesoplenty/textures/items/amethyst_leggings.png b/src/main/resources/assets/biomesoplenty/textures/items/amethyst_leggings.png new file mode 100644 index 000000000..d95337a58 Binary files /dev/null and b/src/main/resources/assets/biomesoplenty/textures/items/amethyst_leggings.png differ diff --git a/src/main/resources/assets/biomesoplenty/textures/items/mud_boots.png b/src/main/resources/assets/biomesoplenty/textures/items/mud_boots.png new file mode 100644 index 000000000..168a40333 Binary files /dev/null and b/src/main/resources/assets/biomesoplenty/textures/items/mud_boots.png differ diff --git a/src/main/resources/assets/biomesoplenty/textures/items/mud_chestplate.png b/src/main/resources/assets/biomesoplenty/textures/items/mud_chestplate.png new file mode 100644 index 000000000..144564179 Binary files /dev/null and b/src/main/resources/assets/biomesoplenty/textures/items/mud_chestplate.png differ diff --git a/src/main/resources/assets/biomesoplenty/textures/items/mud_helmet.png b/src/main/resources/assets/biomesoplenty/textures/items/mud_helmet.png new file mode 100644 index 000000000..b2ed0bd61 Binary files /dev/null and b/src/main/resources/assets/biomesoplenty/textures/items/mud_helmet.png differ diff --git a/src/main/resources/assets/biomesoplenty/textures/items/mud_leggings.png b/src/main/resources/assets/biomesoplenty/textures/items/mud_leggings.png new file mode 100644 index 000000000..3e999bd74 Binary files /dev/null and b/src/main/resources/assets/biomesoplenty/textures/items/mud_leggings.png differ diff --git a/src/main/resources/assets/biomesoplenty/textures/models/armor/amethyst_armor_layer_1.png b/src/main/resources/assets/biomesoplenty/textures/models/armor/amethyst_armor_layer_1.png new file mode 100644 index 000000000..5a242b3aa Binary files /dev/null and b/src/main/resources/assets/biomesoplenty/textures/models/armor/amethyst_armor_layer_1.png differ diff --git a/src/main/resources/assets/biomesoplenty/textures/models/armor/amethyst_armor_layer_2.png b/src/main/resources/assets/biomesoplenty/textures/models/armor/amethyst_armor_layer_2.png new file mode 100644 index 000000000..094f988c3 Binary files /dev/null and b/src/main/resources/assets/biomesoplenty/textures/models/armor/amethyst_armor_layer_2.png differ diff --git a/src/main/resources/assets/biomesoplenty/textures/models/armor/mud_armor_layer_1.png b/src/main/resources/assets/biomesoplenty/textures/models/armor/mud_armor_layer_1.png new file mode 100644 index 000000000..416910f82 Binary files /dev/null and b/src/main/resources/assets/biomesoplenty/textures/models/armor/mud_armor_layer_1.png differ diff --git a/src/main/resources/assets/biomesoplenty/textures/models/armor/mud_armor_layer_2.png b/src/main/resources/assets/biomesoplenty/textures/models/armor/mud_armor_layer_2.png new file mode 100644 index 000000000..92b9f39fb Binary files /dev/null and b/src/main/resources/assets/biomesoplenty/textures/models/armor/mud_armor_layer_2.png differ