diff --git a/gradle.properties b/gradle.properties index 53f1e68..53c93d4 100644 --- a/gradle.properties +++ b/gradle.properties @@ -8,7 +8,7 @@ org.gradle.jvmargs=-Xmx1G loader_version=0.8.8+build.202 # Mod Properties - mod_version = 1.16.1.9 + mod_version = 1.16.1.10 maven_group = de.jottyfan.minecraft archives_base_name = quickiefabric 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 6b3db1a..1d706f9 100644 --- a/src/main/java/de/jottyfan/minecraft/quickiefabric/init/RegistryManager.java +++ b/src/main/java/de/jottyfan/minecraft/quickiefabric/init/RegistryManager.java @@ -58,7 +58,8 @@ public class RegistryManager { stacks.add(new ItemStack(QuickieItems.SPEEDPOWDER)); stacks.add(new ItemStack(QuickieItems.LEVELUP)); stacks.add(new ItemStack(QuickieItems.PENCIL)); - stacks.add(new ItemStack(QuickieItems.BACKPACK)); + stacks.add(new ItemStack(QuickieItems.BACKPACK_BROWN)); + stacks.add(new ItemStack(QuickieItems.BACKPACK_WHITE)); stacks.add(new ItemStack(QuickieTools.SPEEDPOWDERAXE)); stacks.add(new ItemStack(QuickieTools.SPEEDPOWDERPICKAXE)); stacks.add(new ItemStack(QuickieTools.SPEEDPOWDERSHOVEL)); @@ -109,7 +110,8 @@ public class RegistryManager { registerItem(QuickieItems.PENCIL, "pencil"); registerItem(QuickieItems.SALPETER, "salpeter"); registerItem(QuickieItems.SULPHOR, "sulphor"); - registerItem(QuickieItems.BACKPACK, "backpack"); + registerItem(QuickieItems.BACKPACK_BROWN, "backpack_brown"); + registerItem(QuickieItems.BACKPACK_WHITE, "backpack_white"); } public static final void registerTools() { diff --git a/src/main/java/de/jottyfan/minecraft/quickiefabric/items/QuickieItems.java b/src/main/java/de/jottyfan/minecraft/quickiefabric/items/QuickieItems.java index a2b52f3..55ac2ab 100644 --- a/src/main/java/de/jottyfan/minecraft/quickiefabric/items/QuickieItems.java +++ b/src/main/java/de/jottyfan/minecraft/quickiefabric/items/QuickieItems.java @@ -11,5 +11,6 @@ public class QuickieItems { public static final ItemPencil PENCIL = new ItemPencil(); public static final ItemSalpeter SALPETER = new ItemSalpeter(); public static final ItemSulphor SULPHOR = new ItemSulphor(); - public static final ItemBackpack BACKPACK = new ItemBackpack(); + public static final ItemBackpack BACKPACK_BROWN = new ItemBackpack(); + public static final ItemBackpack BACKPACK_WHITE = new ItemBackpack(); } diff --git a/src/main/resources/assets/quickiefabric/lang/de_de.json b/src/main/resources/assets/quickiefabric/lang/de_de.json index a4935e1..647b280 100644 --- a/src/main/resources/assets/quickiefabric/lang/de_de.json +++ b/src/main/resources/assets/quickiefabric/lang/de_de.json @@ -11,7 +11,8 @@ "item.quickiefabric.construction2": "fertiger Bauplan", "item.quickiefabric.pencil": "Bleistift", "item.quickiefabric.levelup": "Aufwerter", - "item.quickiefabric.backpack": "Rucksack", + "item.quickiefabric.backpack_brown": "brauner Rucksack", + "item.quickiefabric.backpack_white": "weißer Rucksack", "block.quickiefabric.orenethersulphor": "Nether-Schwefel", "block.quickiefabric.oresalpeter": "Salpetererz", "block.quickiefabric.oresandsalpeter": "Salpetergestein", diff --git a/src/main/resources/assets/quickiefabric/lang/en_us.json b/src/main/resources/assets/quickiefabric/lang/en_us.json index c4e7e1b..e8b3d53 100644 --- a/src/main/resources/assets/quickiefabric/lang/en_us.json +++ b/src/main/resources/assets/quickiefabric/lang/en_us.json @@ -11,7 +11,8 @@ "item.quickiefabric.construction2": "finished building plan", "item.quickiefabric.pencil": "pencil", "item.quickiefabric.levelup": "level up", - "item.quickiefabric.backpack": "backpack", + "item.quickiefabric.backpack_brown": "brown backpack", + "item.quickiefabric.backpack_white": "white backpack", "block.quickiefabric.orenethersulphor": "nether sulfur", "block.quickiefabric.oresalpeter": "salpeter ore", "block.quickiefabric.oresandsalpeter": "salpeter stone", diff --git a/src/main/resources/assets/quickiefabric/models/item/backpack.json b/src/main/resources/assets/quickiefabric/models/item/backpack_brown.json similarity index 100% rename from src/main/resources/assets/quickiefabric/models/item/backpack.json rename to src/main/resources/assets/quickiefabric/models/item/backpack_brown.json diff --git a/src/main/resources/assets/quickiefabric/models/item/backpack_white.json b/src/main/resources/assets/quickiefabric/models/item/backpack_white.json new file mode 100644 index 0000000..e21bd91 --- /dev/null +++ b/src/main/resources/assets/quickiefabric/models/item/backpack_white.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "quickiefabric:item/backpack_white" + } +} \ No newline at end of file diff --git a/src/main/resources/data/quickiefabric/recipes/backpack_brown.json b/src/main/resources/data/quickiefabric/recipes/backpack_brown.json new file mode 100644 index 0000000..747638f --- /dev/null +++ b/src/main/resources/data/quickiefabric/recipes/backpack_brown.json @@ -0,0 +1,22 @@ +{ + "type": "crafting_shaped", + "pattern": [ + "wlw", + "lsl", + "wlw" + ], + "key": { + "s": { + "item": "minecraft:string" + }, + "l": { + "item": "minecraft:leather" + }, + "w": { + "item": "minecraft:brown_wool" + } + }, + "result": { + "item": "quickiefabric:backpack_brown" + } +} \ No newline at end of file diff --git a/src/main/resources/data/quickiefabric/recipes/backpack.json b/src/main/resources/data/quickiefabric/recipes/backpack_white.json similarity index 86% rename from src/main/resources/data/quickiefabric/recipes/backpack.json rename to src/main/resources/data/quickiefabric/recipes/backpack_white.json index e81551e..d5bd96b 100644 --- a/src/main/resources/data/quickiefabric/recipes/backpack.json +++ b/src/main/resources/data/quickiefabric/recipes/backpack_white.json @@ -17,6 +17,6 @@ } }, "result": { - "item": "quickiefabric:backpack" + "item": "quickiefabric:backpack_white" } } \ No newline at end of file