diff --git a/src/main/java/de/jottyfan/minecraft/quickiefabric/init/RegistryManager.java b/src/main/java/de/jottyfan/minecraft/quickiefabric/init/RegistryManager.java index 7c0b317..8cef2bc 100644 --- a/src/main/java/de/jottyfan/minecraft/quickiefabric/init/RegistryManager.java +++ b/src/main/java/de/jottyfan/minecraft/quickiefabric/init/RegistryManager.java @@ -1,8 +1,11 @@ package de.jottyfan.minecraft.quickiefabric.init; +import de.jottyfan.minecraft.quickiefabric.items.ItemLevelup; +import de.jottyfan.minecraft.quickiefabric.items.ItemPencil; +import de.jottyfan.minecraft.quickiefabric.items.ItemSalpeter; import de.jottyfan.minecraft.quickiefabric.items.ItemSpeedpowder; +import de.jottyfan.minecraft.quickiefabric.items.ItemSulphor; import net.fabricmc.fabric.api.client.itemgroup.FabricItemGroupBuilder; -import net.minecraft.item.Item; import net.minecraft.item.ItemGroup; import net.minecraft.item.ItemStack; import net.minecraft.util.Identifier; @@ -15,15 +18,29 @@ import net.minecraft.util.registry.Registry; */ public class RegistryManager { - public static final ItemSpeedpowder ITEM_SPEEDPOWDER = new ItemSpeedpowder(new Item.Settings().group(RegistryManager.QUICKIEFABRIC_GROUP)); + private static final String QUICKIEFABRIC = "quickiefabric"; + + public static final ItemSpeedpowder ITEM_SPEEDPOWDER = new ItemSpeedpowder(); + public static final ItemLevelup ITEM_LEVELUP = new ItemLevelup(); + public static final ItemPencil ITEM_PENCIL = new ItemPencil(); + public static final ItemSalpeter ITEM_SALPETER = new ItemSalpeter(); + public static final ItemSulphor ITEM_SULPHOR = new ItemSulphor(); - public static final ItemGroup QUICKIEFABRIC_GROUP = FabricItemGroupBuilder.create(new Identifier("quickiefabric", "all")).icon(() -> new ItemStack(ITEM_SPEEDPOWDER)).appendItems(stacks -> { + public static final ItemGroup QUICKIEFABRIC_GROUP = FabricItemGroupBuilder.create(new Identifier(QUICKIEFABRIC, "all")).icon(() -> new ItemStack(ITEM_SPEEDPOWDER)).appendItems(stacks -> { + stacks.add(new ItemStack(ITEM_SALPETER)); + stacks.add(new ItemStack(ITEM_SULPHOR)); stacks.add(new ItemStack(ITEM_SPEEDPOWDER)); + stacks.add(new ItemStack(ITEM_LEVELUP)); + stacks.add(new ItemStack(ITEM_PENCIL)); }).build(); public static final void registerItems() { - Registry.register(Registry.ITEM, new Identifier("quickiefabric", "speedpowder"), ITEM_SPEEDPOWDER); + Registry.register(Registry.ITEM, new Identifier(QUICKIEFABRIC, "speedpowder"), ITEM_SPEEDPOWDER); + Registry.register(Registry.ITEM, new Identifier(QUICKIEFABRIC, "levelup"), ITEM_LEVELUP); + Registry.register(Registry.ITEM, new Identifier(QUICKIEFABRIC, "pencil"), ITEM_PENCIL); + Registry.register(Registry.ITEM, new Identifier(QUICKIEFABRIC, "salpeter"), ITEM_SALPETER); + Registry.register(Registry.ITEM, new Identifier(QUICKIEFABRIC, "sulphor"), ITEM_SULPHOR); } } diff --git a/src/main/java/de/jottyfan/minecraft/quickiefabric/items/ItemLevelup.java b/src/main/java/de/jottyfan/minecraft/quickiefabric/items/ItemLevelup.java new file mode 100644 index 0000000..27ae601 --- /dev/null +++ b/src/main/java/de/jottyfan/minecraft/quickiefabric/items/ItemLevelup.java @@ -0,0 +1,15 @@ +package de.jottyfan.minecraft.quickiefabric.items; + +import de.jottyfan.minecraft.quickiefabric.init.RegistryManager; +import net.minecraft.item.Item; + +/** + * + * @author jotty + * + */ +public class ItemLevelup extends Item { + public ItemLevelup() { + super(new Item.Settings().group(RegistryManager.QUICKIEFABRIC_GROUP).maxCount(99)); + } +} diff --git a/src/main/java/de/jottyfan/minecraft/quickiefabric/items/ItemPencil.java b/src/main/java/de/jottyfan/minecraft/quickiefabric/items/ItemPencil.java new file mode 100644 index 0000000..63f6133 --- /dev/null +++ b/src/main/java/de/jottyfan/minecraft/quickiefabric/items/ItemPencil.java @@ -0,0 +1,16 @@ +package de.jottyfan.minecraft.quickiefabric.items; + +import de.jottyfan.minecraft.quickiefabric.init.RegistryManager; +import net.minecraft.item.Item; + +/** + * + * @author jotty + * + */ +public class ItemPencil extends Item { + + public ItemPencil() { + super(new Item.Settings().group(RegistryManager.QUICKIEFABRIC_GROUP)); + } +} diff --git a/src/main/java/de/jottyfan/minecraft/quickiefabric/items/ItemSalpeter.java b/src/main/java/de/jottyfan/minecraft/quickiefabric/items/ItemSalpeter.java new file mode 100644 index 0000000..412bccf --- /dev/null +++ b/src/main/java/de/jottyfan/minecraft/quickiefabric/items/ItemSalpeter.java @@ -0,0 +1,16 @@ +package de.jottyfan.minecraft.quickiefabric.items; + +import de.jottyfan.minecraft.quickiefabric.init.RegistryManager; +import net.minecraft.item.Item; + +/** + * + * @author jotty + * + */ +public class ItemSalpeter extends Item { + + public ItemSalpeter() { + super(new Item.Settings().group(RegistryManager.QUICKIEFABRIC_GROUP)); + } +} diff --git a/src/main/java/de/jottyfan/minecraft/quickiefabric/items/ItemSpeedpowder.java b/src/main/java/de/jottyfan/minecraft/quickiefabric/items/ItemSpeedpowder.java index 705055b..a80bd6c 100644 --- a/src/main/java/de/jottyfan/minecraft/quickiefabric/items/ItemSpeedpowder.java +++ b/src/main/java/de/jottyfan/minecraft/quickiefabric/items/ItemSpeedpowder.java @@ -1,5 +1,6 @@ package de.jottyfan.minecraft.quickiefabric.items; +import de.jottyfan.minecraft.quickiefabric.init.RegistryManager; import net.minecraft.item.Item; /** @@ -8,7 +9,7 @@ import net.minecraft.item.Item; * */ public class ItemSpeedpowder extends Item { - public ItemSpeedpowder(Settings settings) { - super(settings); + public ItemSpeedpowder() { + super(new Item.Settings().group(RegistryManager.QUICKIEFABRIC_GROUP)); } } diff --git a/src/main/java/de/jottyfan/minecraft/quickiefabric/items/ItemSulphor.java b/src/main/java/de/jottyfan/minecraft/quickiefabric/items/ItemSulphor.java new file mode 100644 index 0000000..2c0c761 --- /dev/null +++ b/src/main/java/de/jottyfan/minecraft/quickiefabric/items/ItemSulphor.java @@ -0,0 +1,16 @@ +package de.jottyfan.minecraft.quickiefabric.items; + +import de.jottyfan.minecraft.quickiefabric.init.RegistryManager; +import net.minecraft.item.Item; + +/** + * + * @author jotty + * + */ +public class ItemSulphor extends Item { + + public ItemSulphor() { + super(new Item.Settings().group(RegistryManager.QUICKIEFABRIC_GROUP)); + } +} diff --git a/src/main/resources/assets/quickiefabric/models/item/levelup.json b/src/main/resources/assets/quickiefabric/models/item/levelup.json new file mode 100644 index 0000000..2219408 --- /dev/null +++ b/src/main/resources/assets/quickiefabric/models/item/levelup.json @@ -0,0 +1,6 @@ +{ + "parent": "item/paper", + "textures": { + "layer0": "quickiefabric:item/levelup" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/quickiefabric/models/item/pencil.json b/src/main/resources/assets/quickiefabric/models/item/pencil.json new file mode 100644 index 0000000..a7bba00 --- /dev/null +++ b/src/main/resources/assets/quickiefabric/models/item/pencil.json @@ -0,0 +1,6 @@ +{ + "parent": "item/stick", + "textures": { + "layer0": "quickiefabric:item/pencil" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/quickiefabric/models/item/salpeter.json b/src/main/resources/assets/quickiefabric/models/item/salpeter.json new file mode 100644 index 0000000..1fe0fea --- /dev/null +++ b/src/main/resources/assets/quickiefabric/models/item/salpeter.json @@ -0,0 +1,6 @@ +{ + "parent": "item/coal", + "textures": { + "layer0": "quickiefabric:item/salpeter" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/quickiefabric/models/item/sulphor.json b/src/main/resources/assets/quickiefabric/models/item/sulphor.json new file mode 100644 index 0000000..d9815eb --- /dev/null +++ b/src/main/resources/assets/quickiefabric/models/item/sulphor.json @@ -0,0 +1,6 @@ +{ + "parent": "item/coal", + "textures": { + "layer0": "quickiefabric:item/sulphor" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/quickiefabric/textures/item/levelup.png b/src/main/resources/assets/quickiefabric/textures/item/levelup.png new file mode 100644 index 0000000..0e4cf1a Binary files /dev/null and b/src/main/resources/assets/quickiefabric/textures/item/levelup.png differ diff --git a/src/main/resources/assets/quickiefabric/textures/item/pencil.png b/src/main/resources/assets/quickiefabric/textures/item/pencil.png new file mode 100644 index 0000000..b571d04 Binary files /dev/null and b/src/main/resources/assets/quickiefabric/textures/item/pencil.png differ diff --git a/src/main/resources/assets/quickiefabric/textures/item/salpeter.png b/src/main/resources/assets/quickiefabric/textures/item/salpeter.png new file mode 100644 index 0000000..b1d3597 Binary files /dev/null and b/src/main/resources/assets/quickiefabric/textures/item/salpeter.png differ diff --git a/src/main/resources/assets/quickiefabric/textures/item/sulphor.png b/src/main/resources/assets/quickiefabric/textures/item/sulphor.png new file mode 100644 index 0000000..db3ee45 Binary files /dev/null and b/src/main/resources/assets/quickiefabric/textures/item/sulphor.png differ diff --git a/src/main/resources/data/quickiefabric/recipes/gunpowder.json b/src/main/resources/data/quickiefabric/recipes/gunpowder.json new file mode 100644 index 0000000..2b9650f --- /dev/null +++ b/src/main/resources/data/quickiefabric/recipes/gunpowder.json @@ -0,0 +1,18 @@ +{ + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "minecraft:coal" + }, + { + "item": "quickiefabric:sulphor" + }, + { + "item": "quickiefabric:salpeter" + } + ], + "result": { + "item": "minecraft:gunpowder", + "count": 1 + } +} \ No newline at end of file diff --git a/src/main/resources/data/quickiefabric/recipes/levelup.json b/src/main/resources/data/quickiefabric/recipes/levelup.json new file mode 100644 index 0000000..e923270 --- /dev/null +++ b/src/main/resources/data/quickiefabric/recipes/levelup.json @@ -0,0 +1,15 @@ +{ + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "minecraft:paper" + }, + { + "item": "quickiefabric:speedpowder" + } + ], + "result": { + "item": "quickiefabric:levelup", + "count": 1 + } +} \ No newline at end of file diff --git a/src/main/resources/data/quickiefabric/recipes/pencil.json b/src/main/resources/data/quickiefabric/recipes/pencil.json new file mode 100644 index 0000000..1402729 --- /dev/null +++ b/src/main/resources/data/quickiefabric/recipes/pencil.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "| ", + " c" + ], + "key": { + "c": { + "item": "minecraft:coal" + }, + "|": { + "item": "minecraft:stick" + } + }, + "result": { + "item": "quickiefabric:pencil", + "count": 4 + } +} \ No newline at end of file diff --git a/src/main/resources/data/quickiefabric/recipes/pencil2.json b/src/main/resources/data/quickiefabric/recipes/pencil2.json new file mode 100644 index 0000000..dd086e8 --- /dev/null +++ b/src/main/resources/data/quickiefabric/recipes/pencil2.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "| ", + " c" + ], + "key": { + "c": { + "item": "minecraft:charcoal" + }, + "|": { + "item": "minecraft:stick" + } + }, + "result": { + "item": "quickiefabric:pencil", + "count": 4 + } +}