diff --git a/src/main/java/de/jottyfan/minecraft/item/QuicklyItems.java b/src/main/java/de/jottyfan/minecraft/item/QuicklyItems.java index 54ca743..7708dbb 100644 --- a/src/main/java/de/jottyfan/minecraft/item/QuicklyItems.java +++ b/src/main/java/de/jottyfan/minecraft/item/QuicklyItems.java @@ -31,8 +31,12 @@ public class QuicklyItems { public static final Item CANOLASEED = registerItem("canolaseed", properties -> new Plant(properties, "blockcanolaplant")); public static final Item CANOLABOTTLE = registerItem("canolabottle"); public static final Item CANOLABOTTLESTACK = registerItem("canolabottlestack"); - public static final Item ROTTENFLESHSTRIPES = registerItem("rotten_flesh_stripes"); + public static final Item OXIDIZEDCOPPERPOWDER = registerItem("oxidizedcopperpowder"); + public static final Item COPPERSTRING = registerItem("copperstring"); + public static final Item COPPERPOWDER = registerItem("copperpowder"); + public static final Item COPPERSTUB = registerItem("copperstub"); + public static final Item COPPERSTICK = registerItem("copperstick"); public static final Item ARMOR_TURQUOISE_BOOTS = registerItem("turquoise_boots", ArmorType.BOOTS); public static final Item ARMOR_TURQUOISE_HELMET = registerItem("turquoise_helmet", ArmorType.HELMET); @@ -75,6 +79,11 @@ public class QuicklyItems { item.accept(CANOLABOTTLESTACK); item.accept(RAWTURQUOISE); item.accept(TURQUOISEINGOT); + item.accept(COPPERPOWDER); + item.accept(OXIDIZEDCOPPERPOWDER); + item.accept(COPPERSTRING); + item.accept(COPPERSTICK); + item.accept(COPPERSTUB); item.accept(ARMOR_TURQUOISE_HELMET); item.accept(ARMOR_TURQUOISE_CHESTPLATE); diff --git a/src/main/resources/assets/quickly/items/copperpowder.json b/src/main/resources/assets/quickly/items/copperpowder.json new file mode 100644 index 0000000..3956ad8 --- /dev/null +++ b/src/main/resources/assets/quickly/items/copperpowder.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "quickly:item/copperpowder" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/quickly/items/copperstick.json b/src/main/resources/assets/quickly/items/copperstick.json new file mode 100644 index 0000000..64ed84a --- /dev/null +++ b/src/main/resources/assets/quickly/items/copperstick.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "quickly:item/copperstick" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/quickly/items/copperstring.json b/src/main/resources/assets/quickly/items/copperstring.json new file mode 100644 index 0000000..e1ac737 --- /dev/null +++ b/src/main/resources/assets/quickly/items/copperstring.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "quickly:item/copperstring" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/quickly/items/copperstub.json b/src/main/resources/assets/quickly/items/copperstub.json new file mode 100644 index 0000000..ed52b28 --- /dev/null +++ b/src/main/resources/assets/quickly/items/copperstub.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "quickly:item/copperstub" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/quickly/items/oxidizedcopperpowder.json b/src/main/resources/assets/quickly/items/oxidizedcopperpowder.json new file mode 100644 index 0000000..2e1bd4f --- /dev/null +++ b/src/main/resources/assets/quickly/items/oxidizedcopperpowder.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "quickly:item/oxidizedcopperpowder" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/quickly/lang/de_de.json b/src/main/resources/assets/quickly/lang/de_de.json index 67c47a4..5d65c7b 100644 --- a/src/main/resources/assets/quickly/lang/de_de.json +++ b/src/main/resources/assets/quickly/lang/de_de.json @@ -6,11 +6,16 @@ "item.quickly.canolabottle": "Rapsöl", "item.quickly.canolabottlestack": "Rapsölsammlung", "item.quickly.canolaseed": "Rapssaat", + "item.quickly.copperpowder": "Kupferpulver", + "item.quickly.copperstick": "Kupferstock", + "item.quickly.copperstring": "Kupferband", + "item.quickly.copperstub": "Kupferstummel", "item.quickly.cotton": "Baumwolle", "item.quickly.cottonseed": "Baumwollsaat", "item.quickly.kelpbundle": "Seegrassbündel", "item.quickly.oredeepslateturquoise": "Türkistiefenerz", "item.quickly.oreturquoise": "Türkiserz", + "item.quickly.oxidizedcopperpowder": "oxidiertes Kupferpulver", "item.quickly.rawturquoise": "rohes Türkis", "item.quickly.rotten_flesh_stripes": "geschnittenes Gammelfleisch", "item.quickly.stub": "Stummel", diff --git a/src/main/resources/assets/quickly/lang/en_us.json b/src/main/resources/assets/quickly/lang/en_us.json index 1aa92d0..86057ce 100644 --- a/src/main/resources/assets/quickly/lang/en_us.json +++ b/src/main/resources/assets/quickly/lang/en_us.json @@ -6,11 +6,16 @@ "item.quickly.canolabottle": "canola oil", "item.quickly.canolabottlestack": "canola oil collection", "item.quickly.canolaseed": "canola seed", + "item.quickly.copperpowder": "copper powder", + "item.quickly.copperstick": "copper stick", + "item.quickly.copperstring": "copper string", + "item.quickly.copperstub": "copper stub", "item.quickly.cotton": "cotton", "item.quickly.cottonseed": "cotton seed", "item.quickly.kelpbundle": "kelp bundle", "item.quickly.oredeepslateturquoise": "turquoise deepslate ore", "item.quickly.oreturquoise": "turquoise ore", + "item.quickly.oxidizedcopperpowder": "oxidized copper powder", "item.quickly.rawturquoise": "raw turquoise", "item.quickly.rotten_flesh_stripes": "rotton flesh stripes", "item.quickly.stub": "stub", diff --git a/src/main/resources/assets/quickly/models/item/copperpowder.json b/src/main/resources/assets/quickly/models/item/copperpowder.json new file mode 100644 index 0000000..395b435 --- /dev/null +++ b/src/main/resources/assets/quickly/models/item/copperpowder.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "quickly:item/copperpowder" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/quickly/models/item/copperstick.json b/src/main/resources/assets/quickly/models/item/copperstick.json new file mode 100644 index 0000000..6b03dc8 --- /dev/null +++ b/src/main/resources/assets/quickly/models/item/copperstick.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "quickly:item/copperstick" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/quickly/models/item/copperstring.json b/src/main/resources/assets/quickly/models/item/copperstring.json new file mode 100644 index 0000000..742dd05 --- /dev/null +++ b/src/main/resources/assets/quickly/models/item/copperstring.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "quickly:item/copperstring" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/quickly/models/item/copperstub.json b/src/main/resources/assets/quickly/models/item/copperstub.json new file mode 100644 index 0000000..2e2867c --- /dev/null +++ b/src/main/resources/assets/quickly/models/item/copperstub.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "quickly:item/copperstub" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/quickly/models/item/oxidizedcopperpowder.json b/src/main/resources/assets/quickly/models/item/oxidizedcopperpowder.json new file mode 100644 index 0000000..ed68719 --- /dev/null +++ b/src/main/resources/assets/quickly/models/item/oxidizedcopperpowder.json @@ -0,0 +1,6 @@ +{ + "parent": "item/coal", + "textures": { + "layer0": "quickly:item/oxidizedcopperpowder" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/quickly/textures/item/copperpowder.png b/src/main/resources/assets/quickly/textures/item/copperpowder.png new file mode 100644 index 0000000..583d032 Binary files /dev/null and b/src/main/resources/assets/quickly/textures/item/copperpowder.png differ diff --git a/src/main/resources/assets/quickly/textures/item/copperstick.png b/src/main/resources/assets/quickly/textures/item/copperstick.png new file mode 100644 index 0000000..3804165 Binary files /dev/null and b/src/main/resources/assets/quickly/textures/item/copperstick.png differ diff --git a/src/main/resources/assets/quickly/textures/item/copperstring.png b/src/main/resources/assets/quickly/textures/item/copperstring.png new file mode 100644 index 0000000..f18fdec Binary files /dev/null and b/src/main/resources/assets/quickly/textures/item/copperstring.png differ diff --git a/src/main/resources/assets/quickly/textures/item/copperstub.png b/src/main/resources/assets/quickly/textures/item/copperstub.png new file mode 100644 index 0000000..eaa5a5c Binary files /dev/null and b/src/main/resources/assets/quickly/textures/item/copperstub.png differ diff --git a/src/main/resources/assets/quickly/textures/item/oxidizedcopperpowder.png b/src/main/resources/assets/quickly/textures/item/oxidizedcopperpowder.png new file mode 100644 index 0000000..2a3b472 Binary files /dev/null and b/src/main/resources/assets/quickly/textures/item/oxidizedcopperpowder.png differ diff --git a/src/main/resources/data/quickly/recipe/blasting_copperstick.json b/src/main/resources/data/quickly/recipe/blasting_copperstick.json new file mode 100644 index 0000000..4d7a2fd --- /dev/null +++ b/src/main/resources/data/quickly/recipe/blasting_copperstick.json @@ -0,0 +1,9 @@ +{ + "type": "minecraft:blasting", + "ingredient": "quickly:copperstring", + "result": { + "id":"quickly:copperstick" + }, + "experience": 0.0, + "cookingtime": 200 +} \ No newline at end of file diff --git a/src/main/resources/data/quickly/recipe/blasting_oxidized_copper_powder.json b/src/main/resources/data/quickly/recipe/blasting_oxidized_copper_powder.json new file mode 100644 index 0000000..f884231 --- /dev/null +++ b/src/main/resources/data/quickly/recipe/blasting_oxidized_copper_powder.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:blasting", + "ingredient": "quickly:copperpowder", + "result": { + "id": "quickly:oxidizedcopperpowder"}, + "experience": 0.0, + "cookingtime": 400 +} \ No newline at end of file diff --git a/src/main/resources/data/quickly/recipe/shaped_copperstring.json b/src/main/resources/data/quickly/recipe/shaped_copperstring.json new file mode 100644 index 0000000..6aa8801 --- /dev/null +++ b/src/main/resources/data/quickly/recipe/shaped_copperstring.json @@ -0,0 +1,15 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "c", + "c", + "c" + ], + "key": { + "c": "quickly:copperpowder" + }, + "result": { + "id": "quickly:copperstring", + "count": 1 + } +} \ No newline at end of file diff --git a/src/main/resources/data/quickly/recipe/shapeless_copperstub.json b/src/main/resources/data/quickly/recipe/shapeless_copperstub.json new file mode 100644 index 0000000..2c366a5 --- /dev/null +++ b/src/main/resources/data/quickly/recipe/shapeless_copperstub.json @@ -0,0 +1,10 @@ +{ + "type": "minecraft:crafting_shapeless", + "ingredients": [ + "quickly:copperstick" + ], + "result": { + "id": "quickly:copperstub", + "count": 2 + } +} \ No newline at end of file diff --git a/src/main/resources/data/quickly/recipe/stonecutting_copperpowder_from_ingot.json b/src/main/resources/data/quickly/recipe/stonecutting_copperpowder_from_ingot.json new file mode 100644 index 0000000..bbd5f03 --- /dev/null +++ b/src/main/resources/data/quickly/recipe/stonecutting_copperpowder_from_ingot.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "ingredient": "minecraft:copper_ingot", + "result": { + "id": "quickly:copperpowder" + }, + "count": 1 +} diff --git a/src/main/resources/data/quickly/recipe/stonecutting_copperpowder_from_oxidized_copper.json b/src/main/resources/data/quickly/recipe/stonecutting_copperpowder_from_oxidized_copper.json new file mode 100644 index 0000000..194ef66 --- /dev/null +++ b/src/main/resources/data/quickly/recipe/stonecutting_copperpowder_from_oxidized_copper.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "ingredient": "minecraft:oxidized_copper", + "result": { + "id": "quickly:oxidizedcopperpowder" + }, + "count": 1 +} diff --git a/src/main/resources/data/quickly/recipe/stonecutting_copperpowder_from_oxidized_cut_copper.json b/src/main/resources/data/quickly/recipe/stonecutting_copperpowder_from_oxidized_cut_copper.json new file mode 100644 index 0000000..114ce5f --- /dev/null +++ b/src/main/resources/data/quickly/recipe/stonecutting_copperpowder_from_oxidized_cut_copper.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "ingredient": "minecraft:oxidized_cut_copper", + "result": { + "id": "quickly:oxidizedcopperpowder" + }, + "count": 2 +} diff --git a/src/main/resources/data/quickly/recipe/stonecutting_copperpowder_from_oxidized_cut_copper_slaps.json b/src/main/resources/data/quickly/recipe/stonecutting_copperpowder_from_oxidized_cut_copper_slaps.json new file mode 100644 index 0000000..422cb36 --- /dev/null +++ b/src/main/resources/data/quickly/recipe/stonecutting_copperpowder_from_oxidized_cut_copper_slaps.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "ingredient": "minecraft:oxidized_cut_copper_slab", + "result": { + "id": "quickly:oxidizedcopperpowder" + }, + "count": 1 +} diff --git a/src/main/resources/data/quickly/recipe/stonecutting_copperpowder_from_oxidized_cut_copper_stairs.json b/src/main/resources/data/quickly/recipe/stonecutting_copperpowder_from_oxidized_cut_copper_stairs.json new file mode 100644 index 0000000..80a0e23 --- /dev/null +++ b/src/main/resources/data/quickly/recipe/stonecutting_copperpowder_from_oxidized_cut_copper_stairs.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "ingredient": "minecraft:oxidized_cut_copper_stairs", + "result": { + "id": "quickly:oxidizedcopperpowder" + }, + "count": 1 +}