diff --git a/src/main/java/com/uncreativebunch/magicmod/item/ModItemGroups.java b/src/main/java/com/uncreativebunch/magicmod/item/ModItemGroups.java index 91d1885..25b4dd3 100644 --- a/src/main/java/com/uncreativebunch/magicmod/item/ModItemGroups.java +++ b/src/main/java/com/uncreativebunch/magicmod/item/ModItemGroups.java @@ -31,7 +31,7 @@ public class ModItemGroups { */ public static final ItemGroup MAGIC_GROUP = FabricItemGroup.builder() .icon(() -> new ItemStack(ModItems.TESTING_POWDER)) // The item to show as the group's icon. Can be anything. - .displayName(Text.translatable("magic-mod.magic_group")) // Gets the name from the translation file in the mod resources. + .displayName(Text.translatable("magic_mod.magic_group")) // Gets the name from the translation file in the mod resources. .build(); @@ -47,7 +47,19 @@ public class ModItemGroups { Registry.register(Registries.ITEM_GROUP, MAGIC_GROUP_KEY, MAGIC_GROUP); ItemGroupEvents.modifyEntriesEvent(MAGIC_GROUP_KEY) .register(itemGroup -> { + itemGroup.add(ModItems.ACACIA_STICK); + itemGroup.add(ModItems.BAMBOO_STICK); + itemGroup.add(ModItems.BIRCH_STICK); + itemGroup.add(ModItems.CHERRY_STICK); + itemGroup.add(ModItems.CRIMSON_STICK); + itemGroup.add(ModItems.DARK_OAK_STICK); + itemGroup.add(ModItems.JUNGLE_STICK); + itemGroup.add(ModItems.MANGROVE_STICK); + itemGroup.add(ModItems.OAK_STICK); + itemGroup.add(ModItems.PALE_OAK_STICK); + itemGroup.add(ModItems.SPRUCE_STICK); itemGroup.add(ModItems.TESTING_POWDER); + itemGroup.add(ModItems.WARPED_STICK); }); MagicMod.LOGGER.info("Item group initialization complete"); diff --git a/src/main/java/com/uncreativebunch/magicmod/item/ModItems.java b/src/main/java/com/uncreativebunch/magicmod/item/ModItems.java index 441843a..5093a96 100644 --- a/src/main/java/com/uncreativebunch/magicmod/item/ModItems.java +++ b/src/main/java/com/uncreativebunch/magicmod/item/ModItems.java @@ -22,6 +22,78 @@ public class ModItems { .food(ModFoodComponents.TESTING_POWDER_COMPONENT, ModConsumableComponents.TESTING_POWDER_NIGHTVIS) ); + public static final Item ACACIA_STICK = register( + "acacia_stick", + Item::new, + new Item.Settings() + ); + + public static final Item BAMBOO_STICK = register( + "bamboo_stick", + Item::new, + new Item.Settings() + ); + + public static final Item BIRCH_STICK = register( + "birch_stick", + Item::new, + new Item.Settings() + ); + + public static final Item CHERRY_STICK = register( + "cherry_stick", + Item::new, + new Item.Settings() + ); + + public static final Item CRIMSON_STICK = register( + "crimson_stick", + Item::new, + new Item.Settings() + ); + + public static final Item DARK_OAK_STICK = register( + "dark_oak_stick", + Item::new, + new Item.Settings() + ); + + public static final Item JUNGLE_STICK = register( + "jungle_stick", + Item::new, + new Item.Settings() + ); + + public static final Item MANGROVE_STICK = register( + "mangrove_stick", + Item::new, + new Item.Settings() + ); + + public static final Item OAK_STICK = register( + "oak_stick", + Item::new, + new Item.Settings() + ); + + public static final Item PALE_OAK_STICK = register( + "pale_oak_stick", + Item::new, + new Item.Settings() + ); + + public static final Item SPRUCE_STICK = register( + "spruce_stick", + Item::new, + new Item.Settings() + ); + + public static final Item WARPED_STICK = register( + "warped_stick", + Item::new, + new Item.Settings() + ); + public static Item register(String name, @NotNull Function factory, Item.Settings settings) { // Create the item's registry key (get it from the ITEM registry) diff --git a/src/main/resources/assets/magic_mod/items/acacia_stick.json b/src/main/resources/assets/magic_mod/items/acacia_stick.json new file mode 100644 index 0000000..555555a --- /dev/null +++ b/src/main/resources/assets/magic_mod/items/acacia_stick.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "magic_mod:item/acacia_stick" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/magic_mod/items/bamboo_stick.json b/src/main/resources/assets/magic_mod/items/bamboo_stick.json new file mode 100644 index 0000000..1202989 --- /dev/null +++ b/src/main/resources/assets/magic_mod/items/bamboo_stick.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "magic_mod:item/bamboo_stick" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/magic_mod/items/birch_stick.json b/src/main/resources/assets/magic_mod/items/birch_stick.json new file mode 100644 index 0000000..bae7f18 --- /dev/null +++ b/src/main/resources/assets/magic_mod/items/birch_stick.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "magic_mod:item/birch_stick" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/magic_mod/items/cherry_stick.json b/src/main/resources/assets/magic_mod/items/cherry_stick.json new file mode 100644 index 0000000..8ff9d38 --- /dev/null +++ b/src/main/resources/assets/magic_mod/items/cherry_stick.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "magic_mod:item/cherry_stick" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/magic_mod/items/crimson_stick.json b/src/main/resources/assets/magic_mod/items/crimson_stick.json new file mode 100644 index 0000000..3abd2b5 --- /dev/null +++ b/src/main/resources/assets/magic_mod/items/crimson_stick.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "magic_mod:item/crimson_stick" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/magic_mod/items/dark_oak_stick.json b/src/main/resources/assets/magic_mod/items/dark_oak_stick.json new file mode 100644 index 0000000..8239031 --- /dev/null +++ b/src/main/resources/assets/magic_mod/items/dark_oak_stick.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "magic_mod:item/dark_oak_stick" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/magic_mod/items/jungle_stick.json b/src/main/resources/assets/magic_mod/items/jungle_stick.json new file mode 100644 index 0000000..cd47ec6 --- /dev/null +++ b/src/main/resources/assets/magic_mod/items/jungle_stick.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "magic_mod:item/jungle_stick" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/magic_mod/items/mangrove_stick.json b/src/main/resources/assets/magic_mod/items/mangrove_stick.json new file mode 100644 index 0000000..cca375d --- /dev/null +++ b/src/main/resources/assets/magic_mod/items/mangrove_stick.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "magic_mod:item/mangrove_stick" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/magic_mod/items/oak_stick.json b/src/main/resources/assets/magic_mod/items/oak_stick.json new file mode 100644 index 0000000..483b038 --- /dev/null +++ b/src/main/resources/assets/magic_mod/items/oak_stick.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "magic_mod:item/oak_stick" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/magic_mod/items/pale_oak_stick.json b/src/main/resources/assets/magic_mod/items/pale_oak_stick.json new file mode 100644 index 0000000..b42fca8 --- /dev/null +++ b/src/main/resources/assets/magic_mod/items/pale_oak_stick.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "magic_mod:item/pale_oak_stick" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/magic_mod/items/spruce_stick.json b/src/main/resources/assets/magic_mod/items/spruce_stick.json new file mode 100644 index 0000000..9293844 --- /dev/null +++ b/src/main/resources/assets/magic_mod/items/spruce_stick.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "magic_mod:item/spruce_stick" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/magic_mod/items/warped_stick.json b/src/main/resources/assets/magic_mod/items/warped_stick.json new file mode 100644 index 0000000..951696a --- /dev/null +++ b/src/main/resources/assets/magic_mod/items/warped_stick.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "magic_mod:item/warped_stick" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/magic_mod/lang/en_us.json b/src/main/resources/assets/magic_mod/lang/en_us.json index bd9c592..72023fd 100644 --- a/src/main/resources/assets/magic_mod/lang/en_us.json +++ b/src/main/resources/assets/magic_mod/lang/en_us.json @@ -1,4 +1,16 @@ { "item.magic_mod.testing_powder": "Testing Powder (edible)", + "item.magic_mod.acacia_stick": "Acacia Stick", + "item.magic_mod.bamboo_stick": "Bamboo Stick", + "item.magic_mod.birch_stick": "Birch Stick", + "item.magic_mod.cherry_stick": "Cherry Stick", + "item.magic_mod.crimson_stick": "Crimson Stick", + "item.magic_mod.dark_oak_stick": "Dark Oak Stick", + "item.magic_mod.jungle_stick": "Jungle Stick", + "item.magic_mod.mangrove_stick": "Mangrove Stick", + "item.magic_mod.oak_stick": "Oak Stick", + "item.magic_mod.pale_oak_stick": "Pale Oak Stick", + "item.magic_mod.spruce_stick": "Spruce Stick", + "item.magic_mod.warped_stick": "Warped Stick", "magic_mod.magic_group": "Testing Mod Items" } \ No newline at end of file diff --git a/src/main/resources/assets/magic_mod/models/item/acacia_stick.json b/src/main/resources/assets/magic_mod/models/item/acacia_stick.json new file mode 100644 index 0000000..9fc941f --- /dev/null +++ b/src/main/resources/assets/magic_mod/models/item/acacia_stick.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "magic_mod:item/acacia_stick" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/magic_mod/models/item/bamboo_stick.json b/src/main/resources/assets/magic_mod/models/item/bamboo_stick.json new file mode 100644 index 0000000..956f5d8 --- /dev/null +++ b/src/main/resources/assets/magic_mod/models/item/bamboo_stick.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "magic_mod:item/bamboo_stick" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/magic_mod/models/item/birch_stick.json b/src/main/resources/assets/magic_mod/models/item/birch_stick.json new file mode 100644 index 0000000..954927d --- /dev/null +++ b/src/main/resources/assets/magic_mod/models/item/birch_stick.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "magic_mod:item/birch_stick" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/magic_mod/models/item/cherry_stick.json b/src/main/resources/assets/magic_mod/models/item/cherry_stick.json new file mode 100644 index 0000000..2a2d2f0 --- /dev/null +++ b/src/main/resources/assets/magic_mod/models/item/cherry_stick.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "magic_mod:item/cherry_stick" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/magic_mod/models/item/crimson_stick.json b/src/main/resources/assets/magic_mod/models/item/crimson_stick.json new file mode 100644 index 0000000..cb49414 --- /dev/null +++ b/src/main/resources/assets/magic_mod/models/item/crimson_stick.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "magic_mod:item/crimson_stick" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/magic_mod/models/item/dark_oak_stick.json b/src/main/resources/assets/magic_mod/models/item/dark_oak_stick.json new file mode 100644 index 0000000..5fab822 --- /dev/null +++ b/src/main/resources/assets/magic_mod/models/item/dark_oak_stick.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "magic_mod:item/dark_oak_stick" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/magic_mod/models/item/jungle_stick.json b/src/main/resources/assets/magic_mod/models/item/jungle_stick.json new file mode 100644 index 0000000..5223d64 --- /dev/null +++ b/src/main/resources/assets/magic_mod/models/item/jungle_stick.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "magic_mod:item/jungle_stick" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/magic_mod/models/item/mangrove_stick.json b/src/main/resources/assets/magic_mod/models/item/mangrove_stick.json new file mode 100644 index 0000000..ed07017 --- /dev/null +++ b/src/main/resources/assets/magic_mod/models/item/mangrove_stick.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "magic_mod:item/mangrove_stick" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/magic_mod/models/item/oak_stick.json b/src/main/resources/assets/magic_mod/models/item/oak_stick.json new file mode 100644 index 0000000..ffd3d67 --- /dev/null +++ b/src/main/resources/assets/magic_mod/models/item/oak_stick.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "magic_mod:item/oak_stick" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/magic_mod/models/item/pale_oak_stick.json b/src/main/resources/assets/magic_mod/models/item/pale_oak_stick.json new file mode 100644 index 0000000..42b672f --- /dev/null +++ b/src/main/resources/assets/magic_mod/models/item/pale_oak_stick.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "magic_mod:item/pale_oak_stick" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/magic_mod/models/item/spruce_stick.json b/src/main/resources/assets/magic_mod/models/item/spruce_stick.json new file mode 100644 index 0000000..ffdc46f --- /dev/null +++ b/src/main/resources/assets/magic_mod/models/item/spruce_stick.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "magic_mod:item/spruce_stick" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/magic_mod/models/item/warped_stick.json b/src/main/resources/assets/magic_mod/models/item/warped_stick.json new file mode 100644 index 0000000..5d5911e --- /dev/null +++ b/src/main/resources/assets/magic_mod/models/item/warped_stick.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "magic_mod:item/warped_stick" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/magic_mod/textures/item/acacia_stick.png b/src/main/resources/assets/magic_mod/textures/item/acacia_stick.png new file mode 100644 index 0000000..f38e640 Binary files /dev/null and b/src/main/resources/assets/magic_mod/textures/item/acacia_stick.png differ diff --git a/src/main/resources/assets/magic_mod/textures/item/bamboo_stick.png b/src/main/resources/assets/magic_mod/textures/item/bamboo_stick.png new file mode 100644 index 0000000..0eb9636 Binary files /dev/null and b/src/main/resources/assets/magic_mod/textures/item/bamboo_stick.png differ diff --git a/src/main/resources/assets/magic_mod/textures/item/birch_stick.png b/src/main/resources/assets/magic_mod/textures/item/birch_stick.png new file mode 100644 index 0000000..9d8f946 Binary files /dev/null and b/src/main/resources/assets/magic_mod/textures/item/birch_stick.png differ diff --git a/src/main/resources/assets/magic_mod/textures/item/cherry_stick.png b/src/main/resources/assets/magic_mod/textures/item/cherry_stick.png new file mode 100644 index 0000000..b5532bc Binary files /dev/null and b/src/main/resources/assets/magic_mod/textures/item/cherry_stick.png differ diff --git a/src/main/resources/assets/magic_mod/textures/item/crimson_stick.png b/src/main/resources/assets/magic_mod/textures/item/crimson_stick.png new file mode 100644 index 0000000..28fe778 Binary files /dev/null and b/src/main/resources/assets/magic_mod/textures/item/crimson_stick.png differ diff --git a/src/main/resources/assets/magic_mod/textures/item/dark_oak_stick.png b/src/main/resources/assets/magic_mod/textures/item/dark_oak_stick.png new file mode 100644 index 0000000..bc372f5 Binary files /dev/null and b/src/main/resources/assets/magic_mod/textures/item/dark_oak_stick.png differ diff --git a/src/main/resources/assets/magic_mod/textures/item/jungle_stick.png b/src/main/resources/assets/magic_mod/textures/item/jungle_stick.png new file mode 100644 index 0000000..2af648d Binary files /dev/null and b/src/main/resources/assets/magic_mod/textures/item/jungle_stick.png differ diff --git a/src/main/resources/assets/magic_mod/textures/item/mangrove_stick.png b/src/main/resources/assets/magic_mod/textures/item/mangrove_stick.png new file mode 100644 index 0000000..283c509 Binary files /dev/null and b/src/main/resources/assets/magic_mod/textures/item/mangrove_stick.png differ diff --git a/src/main/resources/assets/magic_mod/textures/item/oak_stick.png b/src/main/resources/assets/magic_mod/textures/item/oak_stick.png new file mode 100644 index 0000000..5840abd Binary files /dev/null and b/src/main/resources/assets/magic_mod/textures/item/oak_stick.png differ diff --git a/src/main/resources/assets/magic_mod/textures/item/pale_oak_stick.png b/src/main/resources/assets/magic_mod/textures/item/pale_oak_stick.png new file mode 100644 index 0000000..1310788 Binary files /dev/null and b/src/main/resources/assets/magic_mod/textures/item/pale_oak_stick.png differ diff --git a/src/main/resources/assets/magic_mod/textures/item/spruce_stick.png b/src/main/resources/assets/magic_mod/textures/item/spruce_stick.png new file mode 100644 index 0000000..5d0b4bd Binary files /dev/null and b/src/main/resources/assets/magic_mod/textures/item/spruce_stick.png differ diff --git a/src/main/resources/assets/magic_mod/textures/item/warped_stick.png b/src/main/resources/assets/magic_mod/textures/item/warped_stick.png new file mode 100644 index 0000000..ab2aa89 Binary files /dev/null and b/src/main/resources/assets/magic_mod/textures/item/warped_stick.png differ diff --git a/src/main/resources/data/magic-mod/recipe/testing_powder.json b/src/main/resources/data/magic_mod/recipe/testing_powder.json similarity index 86% rename from src/main/resources/data/magic-mod/recipe/testing_powder.json rename to src/main/resources/data/magic_mod/recipe/testing_powder.json index 4f3e59c..b82d4c6 100644 --- a/src/main/resources/data/magic-mod/recipe/testing_powder.json +++ b/src/main/resources/data/magic_mod/recipe/testing_powder.json @@ -6,7 +6,7 @@ "/ " ], "key": { - "/": "minecraft:stick" + "/": "#magic_mod:sticks" }, "result": { "id": "magic_mod:testing_powder", diff --git a/src/main/resources/data/magic_mod/tags/item/sticks.json b/src/main/resources/data/magic_mod/tags/item/sticks.json new file mode 100644 index 0000000..d1afe53 --- /dev/null +++ b/src/main/resources/data/magic_mod/tags/item/sticks.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "magic_mod:acacia_stick" + ] +} \ No newline at end of file