diff --git a/psd/tool_items.psd b/psd/tool_items.psd new file mode 100644 index 00000000..5566d8ab Binary files /dev/null and b/psd/tool_items.psd differ diff --git a/src/main/java/ru/betterend/registry/ItemRegistry.java b/src/main/java/ru/betterend/registry/ItemRegistry.java index 308591c1..0e39096e 100644 --- a/src/main/java/ru/betterend/registry/ItemRegistry.java +++ b/src/main/java/ru/betterend/registry/ItemRegistry.java @@ -8,44 +8,50 @@ import net.minecraft.entity.EquipmentSlot; import net.minecraft.item.ArmorItem; import net.minecraft.item.BlockItem; import net.minecraft.item.Item; -import net.minecraft.item.ItemGroup; import net.minecraft.item.Items; import net.minecraft.item.ShovelItem; import net.minecraft.item.SwordItem; import net.minecraft.item.ToolItem; import net.minecraft.util.registry.Registry; + import ru.betterend.BetterEnd; import ru.betterend.item.EndArmorMaterial; import ru.betterend.item.EndAxe; import ru.betterend.item.EndHoe; import ru.betterend.item.EndPickaxe; import ru.betterend.item.EndToolMaterial; +import ru.betterend.tab.CreativeTab; public class ItemRegistry { private static final List MOD_BLOCKS = Lists.newArrayList(); private static final List MOD_ITEMS = Lists.newArrayList(); //Materials - public final static Item ENDER_DUST = registerItem("ender_dust", new Item((new Item.Settings()).group(ItemGroup.MATERIALS))); - public final static Item TERMINITE_INGOT = registerItem("terminite_ingot", new Item((new Item.Settings()).group(ItemGroup.MATERIALS))); - public final static Item AETERNIUM_INGOT = registerItem("aeternium_ingot", new Item((new Item.Settings()).group(ItemGroup.MATERIALS))); + public final static Item ENDER_DUST = registerItem("ender_dust", new Item(new Item.Settings().group(CreativeTab.END_TAB))); + public final static Item TERMINITE_INGOT = registerItem("terminite_ingot", new Item(new Item.Settings().group(CreativeTab.END_TAB))); + public final static Item AETERNIUM_INGOT = registerItem("aeternium_ingot", new Item(new Item.Settings().group(CreativeTab.END_TAB))); //Armor - public static final Item TERMINITE_HELMET = registerItem("terminite_helmet", new ArmorItem(EndArmorMaterial.TERMINITE, EquipmentSlot.HEAD,new Item.Settings().group(ItemGroup.COMBAT))); - public static final Item TERMINITE_CHESTPLATE = registerItem("terminite_chestplate", new ArmorItem(EndArmorMaterial.TERMINITE, EquipmentSlot.CHEST, new Item.Settings().group(ItemGroup.COMBAT))); - public static final Item TERMINITE_LEGGINGS = registerItem("terminite_leggings", new ArmorItem(EndArmorMaterial.TERMINITE, EquipmentSlot.LEGS, new Item.Settings().group(ItemGroup.COMBAT))); - public static final Item TERMINITE_BOOTS = registerItem("terminite_boots", new ArmorItem(EndArmorMaterial.TERMINITE, EquipmentSlot.FEET, new Item.Settings().group(ItemGroup.COMBAT))); - public static final Item AETERNIUM_HELMET = registerItem("aeternium_helmet", new ArmorItem(EndArmorMaterial.AETERNIUM, EquipmentSlot.HEAD,new Item.Settings().group(ItemGroup.COMBAT))); - public static final Item AETERNIUM_CHESTPLATE = registerItem("aeternium_chestplate", new ArmorItem(EndArmorMaterial.AETERNIUM, EquipmentSlot.CHEST, new Item.Settings().group(ItemGroup.COMBAT))); - public static final Item AETERNIUM_LEGGINGS = registerItem("aeternium_leggings", new ArmorItem(EndArmorMaterial.AETERNIUM, EquipmentSlot.LEGS, new Item.Settings().group(ItemGroup.COMBAT))); - public static final Item AETERNIUM_BOOTS = registerItem("aeternium_boots", new ArmorItem(EndArmorMaterial.AETERNIUM, EquipmentSlot.FEET, new Item.Settings().group(ItemGroup.COMBAT))); + public static final Item TERMINITE_HELMET = registerItem("terminite_helmet", new ArmorItem(EndArmorMaterial.TERMINITE, EquipmentSlot.HEAD,new Item.Settings().group(CreativeTab.END_TAB))); + public static final Item TERMINITE_CHESTPLATE = registerItem("terminite_chestplate", new ArmorItem(EndArmorMaterial.TERMINITE, EquipmentSlot.CHEST, new Item.Settings().group(CreativeTab.END_TAB))); + public static final Item TERMINITE_LEGGINGS = registerItem("terminite_leggings", new ArmorItem(EndArmorMaterial.TERMINITE, EquipmentSlot.LEGS, new Item.Settings().group(CreativeTab.END_TAB))); + public static final Item TERMINITE_BOOTS = registerItem("terminite_boots", new ArmorItem(EndArmorMaterial.TERMINITE, EquipmentSlot.FEET, new Item.Settings().group(CreativeTab.END_TAB))); + public static final Item AETERNIUM_HELMET = registerItem("aeternium_helmet", new ArmorItem(EndArmorMaterial.AETERNIUM, EquipmentSlot.HEAD,new Item.Settings().group(CreativeTab.END_TAB))); + public static final Item AETERNIUM_CHESTPLATE = registerItem("aeternium_chestplate", new ArmorItem(EndArmorMaterial.AETERNIUM, EquipmentSlot.CHEST, new Item.Settings().group(CreativeTab.END_TAB))); + public static final Item AETERNIUM_LEGGINGS = registerItem("aeternium_leggings", new ArmorItem(EndArmorMaterial.AETERNIUM, EquipmentSlot.LEGS, new Item.Settings().group(CreativeTab.END_TAB))); + public static final Item AETERNIUM_BOOTS = registerItem("aeternium_boots", new ArmorItem(EndArmorMaterial.AETERNIUM, EquipmentSlot.FEET, new Item.Settings().group(CreativeTab.END_TAB))); //Tools - public static ToolItem TERMINITE_SHOVEL = registerTool("terminite_shovel", new ShovelItem(EndToolMaterial.TERMINITE, 1.5F, -3.0F, new Item.Settings().group(ItemGroup.TOOLS))); - public static ToolItem TERMINITE_SWORD = registerTool("terminite_sword", new SwordItem(EndToolMaterial.TERMINITE, 3, -2.4F, new Item.Settings().group(ItemGroup.COMBAT))); - public static ToolItem TERMINITE_PICKAXE = registerTool("terminite_pickaxe", new EndPickaxe(EndToolMaterial.TERMINITE, 1, -2.8F, new Item.Settings().group(ItemGroup.TOOLS))); - public static ToolItem TERMINITE_AXE = registerTool("terminite_axe", new EndAxe(EndToolMaterial.TERMINITE, 5.0F, -3.0F, new Item.Settings().group(ItemGroup.TOOLS))); - public static ToolItem TERMINITE_HOE = registerTool("terminite_hoe", new EndHoe(EndToolMaterial.TERMINITE, -3, 0.0F, new Item.Settings().group(ItemGroup.TOOLS))); + public static ToolItem TERMINITE_SHOVEL = registerTool("terminite_shovel", new ShovelItem(EndToolMaterial.TERMINITE, 1.5F, -3.0F, new Item.Settings().group(CreativeTab.END_TAB))); + public static ToolItem TERMINITE_SWORD = registerTool("terminite_sword", new SwordItem(EndToolMaterial.TERMINITE, 3, -2.4F, new Item.Settings().group(CreativeTab.END_TAB))); + public static ToolItem TERMINITE_PICKAXE = registerTool("terminite_pickaxe", new EndPickaxe(EndToolMaterial.TERMINITE, 1, -2.8F, new Item.Settings().group(CreativeTab.END_TAB))); + public static ToolItem TERMINITE_AXE = registerTool("terminite_axe", new EndAxe(EndToolMaterial.TERMINITE, 5.0F, -3.0F, new Item.Settings().group(CreativeTab.END_TAB))); + public static ToolItem TERMINITE_HOE = registerTool("terminite_hoe", new EndHoe(EndToolMaterial.TERMINITE, -3, 0.0F, new Item.Settings().group(CreativeTab.END_TAB))); + public static ToolItem AETERNIUM_SHOVEL = registerTool("aeternium_shovel", new ShovelItem(EndToolMaterial.AETERNIUM, 1.5F, -3.0F, new Item.Settings().group(CreativeTab.END_TAB))); + public static ToolItem AETERNIUM_SWORD = registerTool("aeternium_sword", new SwordItem(EndToolMaterial.AETERNIUM, 3, -2.4F, new Item.Settings().group(CreativeTab.END_TAB))); + public static ToolItem AETERNIUM_PICKAXE = registerTool("aeternium_pickaxe", new EndPickaxe(EndToolMaterial.AETERNIUM, 1, -2.8F, new Item.Settings().group(CreativeTab.END_TAB))); + public static ToolItem AETERNIUM_AXE = registerTool("aeternium_axe", new EndAxe(EndToolMaterial.AETERNIUM, 5.0F, -3.0F, new Item.Settings().group(CreativeTab.END_TAB))); + public static ToolItem AETERNIUM_HOE = registerTool("aeternium_hoe", new EndHoe(EndToolMaterial.AETERNIUM, -3, 0.0F, new Item.Settings().group(CreativeTab.END_TAB))); protected static Item registerItem(String name, Item item) { if (item != Items.AIR) { diff --git a/src/main/java/ru/betterend/tab/CreativeTab.java b/src/main/java/ru/betterend/tab/CreativeTab.java index d1504c06..88b206d8 100644 --- a/src/main/java/ru/betterend/tab/CreativeTab.java +++ b/src/main/java/ru/betterend/tab/CreativeTab.java @@ -14,7 +14,6 @@ public class CreativeTab { for (Item i : ItemRegistry.getModBlocks()) { stacks.add(new ItemStack(i)); } - for (Item i : ItemRegistry.getModItems()) { stacks.add(new ItemStack(i)); } diff --git a/src/main/resources/assets/betterend/models/item/aeternium_axe.json b/src/main/resources/assets/betterend/models/item/aeternium_axe.json new file mode 100644 index 00000000..a342fbc8 --- /dev/null +++ b/src/main/resources/assets/betterend/models/item/aeternium_axe.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "betterend:item/aeternium_axe" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/item/aeternium_hoe.json b/src/main/resources/assets/betterend/models/item/aeternium_hoe.json new file mode 100644 index 00000000..3e640fad --- /dev/null +++ b/src/main/resources/assets/betterend/models/item/aeternium_hoe.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "betterend:item/aeternium_hoe" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/item/aeternium_pickaxe.json b/src/main/resources/assets/betterend/models/item/aeternium_pickaxe.json new file mode 100644 index 00000000..b2ed173f --- /dev/null +++ b/src/main/resources/assets/betterend/models/item/aeternium_pickaxe.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "betterend:item/aeternium_pickaxe" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/item/aeternium_shovel.json b/src/main/resources/assets/betterend/models/item/aeternium_shovel.json new file mode 100644 index 00000000..858475de --- /dev/null +++ b/src/main/resources/assets/betterend/models/item/aeternium_shovel.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "betterend:item/aeternium_shovel" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/item/aeternium_sword.json b/src/main/resources/assets/betterend/models/item/aeternium_sword.json new file mode 100644 index 00000000..978f4238 --- /dev/null +++ b/src/main/resources/assets/betterend/models/item/aeternium_sword.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "betterend:item/aeternium_sword" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/item/terminite_axe.json b/src/main/resources/assets/betterend/models/item/terminite_axe.json index f9f00a57..8f305558 100644 --- a/src/main/resources/assets/betterend/models/item/terminite_axe.json +++ b/src/main/resources/assets/betterend/models/item/terminite_axe.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:item/generated", + "parent": "minecraft:item/handheld", "textures": { "layer0": "betterend:item/terminite_axe" } diff --git a/src/main/resources/assets/betterend/models/item/terminite_hoe.json b/src/main/resources/assets/betterend/models/item/terminite_hoe.json index 819b7864..5ed37b45 100644 --- a/src/main/resources/assets/betterend/models/item/terminite_hoe.json +++ b/src/main/resources/assets/betterend/models/item/terminite_hoe.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:item/generated", + "parent": "minecraft:item/handheld", "textures": { "layer0": "betterend:item/terminite_hoe" } diff --git a/src/main/resources/assets/betterend/models/item/terminite_pickaxe.json b/src/main/resources/assets/betterend/models/item/terminite_pickaxe.json index c994eb9e..4ac934c9 100644 --- a/src/main/resources/assets/betterend/models/item/terminite_pickaxe.json +++ b/src/main/resources/assets/betterend/models/item/terminite_pickaxe.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:item/generated", + "parent": "minecraft:item/handheld", "textures": { "layer0": "betterend:item/terminite_pickaxe" } diff --git a/src/main/resources/assets/betterend/models/item/terminite_shovel.json b/src/main/resources/assets/betterend/models/item/terminite_shovel.json index ebc6e16d..b784dbfb 100644 --- a/src/main/resources/assets/betterend/models/item/terminite_shovel.json +++ b/src/main/resources/assets/betterend/models/item/terminite_shovel.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:item/generated", + "parent": "minecraft:item/handheld", "textures": { "layer0": "betterend:item/terminite_shovel" } diff --git a/src/main/resources/assets/betterend/models/item/terminite_sword.json b/src/main/resources/assets/betterend/models/item/terminite_sword.json index 9e065aae..fac5e3ed 100644 --- a/src/main/resources/assets/betterend/models/item/terminite_sword.json +++ b/src/main/resources/assets/betterend/models/item/terminite_sword.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:item/generated", + "parent": "minecraft:item/handheld", "textures": { "layer0": "betterend:item/terminite_sword" } diff --git a/src/main/resources/assets/betterend/textures/item/aeternium_axe.png b/src/main/resources/assets/betterend/textures/item/aeternium_axe.png new file mode 100644 index 00000000..ce7eb4e8 Binary files /dev/null and b/src/main/resources/assets/betterend/textures/item/aeternium_axe.png differ diff --git a/src/main/resources/assets/betterend/textures/item/aeternium_hoe.png b/src/main/resources/assets/betterend/textures/item/aeternium_hoe.png new file mode 100644 index 00000000..4de7d08a Binary files /dev/null and b/src/main/resources/assets/betterend/textures/item/aeternium_hoe.png differ diff --git a/src/main/resources/assets/betterend/textures/item/aeternium_pickaxe.png b/src/main/resources/assets/betterend/textures/item/aeternium_pickaxe.png new file mode 100644 index 00000000..1139ba92 Binary files /dev/null and b/src/main/resources/assets/betterend/textures/item/aeternium_pickaxe.png differ diff --git a/src/main/resources/assets/betterend/textures/item/aeternium_shovel.png b/src/main/resources/assets/betterend/textures/item/aeternium_shovel.png new file mode 100644 index 00000000..6cef3656 Binary files /dev/null and b/src/main/resources/assets/betterend/textures/item/aeternium_shovel.png differ diff --git a/src/main/resources/assets/betterend/textures/item/aeternium_sword.png b/src/main/resources/assets/betterend/textures/item/aeternium_sword.png new file mode 100644 index 00000000..83015413 Binary files /dev/null and b/src/main/resources/assets/betterend/textures/item/aeternium_sword.png differ diff --git a/src/main/resources/assets/betterend/textures/item/terminite_axe.png b/src/main/resources/assets/betterend/textures/item/terminite_axe.png index 48935983..1ef17aaf 100644 Binary files a/src/main/resources/assets/betterend/textures/item/terminite_axe.png and b/src/main/resources/assets/betterend/textures/item/terminite_axe.png differ diff --git a/src/main/resources/assets/betterend/textures/item/terminite_hoe.png b/src/main/resources/assets/betterend/textures/item/terminite_hoe.png index 89731149..606bef88 100644 Binary files a/src/main/resources/assets/betterend/textures/item/terminite_hoe.png and b/src/main/resources/assets/betterend/textures/item/terminite_hoe.png differ diff --git a/src/main/resources/assets/betterend/textures/item/terminite_pickaxe.png b/src/main/resources/assets/betterend/textures/item/terminite_pickaxe.png index 25ab3658..9a8754f4 100644 Binary files a/src/main/resources/assets/betterend/textures/item/terminite_pickaxe.png and b/src/main/resources/assets/betterend/textures/item/terminite_pickaxe.png differ diff --git a/src/main/resources/assets/betterend/textures/item/terminite_shovel.png b/src/main/resources/assets/betterend/textures/item/terminite_shovel.png index 02ef83ed..8ca8a192 100644 Binary files a/src/main/resources/assets/betterend/textures/item/terminite_shovel.png and b/src/main/resources/assets/betterend/textures/item/terminite_shovel.png differ diff --git a/src/main/resources/assets/betterend/textures/item/terminite_sword.png b/src/main/resources/assets/betterend/textures/item/terminite_sword.png index 857c6b31..6e9b72f6 100644 Binary files a/src/main/resources/assets/betterend/textures/item/terminite_sword.png and b/src/main/resources/assets/betterend/textures/item/terminite_sword.png differ