From ac46edf184c84d6f97be929d233608cece8717d1 Mon Sep 17 00:00:00 2001 From: DD_Dominik Date: Sat, 4 Oct 2025 20:22:23 +0200 Subject: [PATCH] Added new saws: Copper, Aluminum, Tin, Silver, Nickel, Bronze, Netherite, Platinum, Lead, Electrum, Invar (add for "cb_microblock:tools/saw" tags) Changed Silicon recipe to use the tag --- .../data/projectred_core/recipe/silicon.json | 2 +- .../mrtjp/projectred/core/init/CoreTags.java | 8 ++ .../projectred_exploration/lang/en_us.json | 11 ++ .../cb_microblock/tags/item/tools/saw.json | 13 +- .../recipe/aluminum_saw.json | 32 +++++ .../recipe/bronze_saw.json | 32 +++++ .../recipe/copper_saw.json | 23 ++++ .../recipe/electrum_saw.json | 32 +++++ .../recipe/invar_saw.json | 32 +++++ .../recipe/lead_saw.json | 32 +++++ .../recipe/netherite_saw.json | 23 ++++ .../recipe/nickel_saw.json | 32 +++++ .../recipe/platinum_saw.json | 32 +++++ .../recipe/silver_saw.json | 23 ++++ .../recipe/tin_saw.json | 23 ++++ .../data/ExplorationItemModelProvider.java | 11 ++ .../data/ExplorationItemTagsProvider.java | 11 ++ .../data/ExplorationLanguageProvider.java | 11 ++ .../data/ExplorationRecipeProvider.java | 11 ++ .../init/ExplorationCreativeModeTabs.java | 11 ++ .../exploration/init/ExplorationItems.java | 123 ++++++++++++++++++ .../textures/item/aluminum_saw.png | Bin 0 -> 474 bytes .../textures/item/bronze_saw.png | Bin 0 -> 504 bytes .../textures/item/copper_saw.png | Bin 0 -> 478 bytes .../textures/item/electrum_saw.png | Bin 0 -> 461 bytes .../textures/item/invar_saw.png | Bin 0 -> 485 bytes .../textures/item/lead_saw.png | Bin 0 -> 474 bytes .../textures/item/netherite_saw.png | Bin 0 -> 532 bytes .../textures/item/nickel_saw.png | Bin 0 -> 475 bytes .../textures/item/platinum_saw.png | Bin 0 -> 486 bytes .../textures/item/silver_saw.png | Bin 0 -> 519 bytes .../textures/item/tin_saw.png | Bin 0 -> 474 bytes 32 files changed, 526 insertions(+), 2 deletions(-) create mode 100644 exploration/src/main/generated/data/projectred_exploration/recipe/aluminum_saw.json create mode 100644 exploration/src/main/generated/data/projectred_exploration/recipe/bronze_saw.json create mode 100644 exploration/src/main/generated/data/projectred_exploration/recipe/copper_saw.json create mode 100644 exploration/src/main/generated/data/projectred_exploration/recipe/electrum_saw.json create mode 100644 exploration/src/main/generated/data/projectred_exploration/recipe/invar_saw.json create mode 100644 exploration/src/main/generated/data/projectred_exploration/recipe/lead_saw.json create mode 100644 exploration/src/main/generated/data/projectred_exploration/recipe/netherite_saw.json create mode 100644 exploration/src/main/generated/data/projectred_exploration/recipe/nickel_saw.json create mode 100644 exploration/src/main/generated/data/projectred_exploration/recipe/platinum_saw.json create mode 100644 exploration/src/main/generated/data/projectred_exploration/recipe/silver_saw.json create mode 100644 exploration/src/main/generated/data/projectred_exploration/recipe/tin_saw.json create mode 100644 exploration/src/main/resources/assets/projectred_exploration/textures/item/aluminum_saw.png create mode 100644 exploration/src/main/resources/assets/projectred_exploration/textures/item/bronze_saw.png create mode 100644 exploration/src/main/resources/assets/projectred_exploration/textures/item/copper_saw.png create mode 100644 exploration/src/main/resources/assets/projectred_exploration/textures/item/electrum_saw.png create mode 100644 exploration/src/main/resources/assets/projectred_exploration/textures/item/invar_saw.png create mode 100644 exploration/src/main/resources/assets/projectred_exploration/textures/item/lead_saw.png create mode 100644 exploration/src/main/resources/assets/projectred_exploration/textures/item/netherite_saw.png create mode 100644 exploration/src/main/resources/assets/projectred_exploration/textures/item/nickel_saw.png create mode 100644 exploration/src/main/resources/assets/projectred_exploration/textures/item/platinum_saw.png create mode 100644 exploration/src/main/resources/assets/projectred_exploration/textures/item/silver_saw.png create mode 100644 exploration/src/main/resources/assets/projectred_exploration/textures/item/tin_saw.png diff --git a/core/src/main/generated/data/projectred_core/recipe/silicon.json b/core/src/main/generated/data/projectred_core/recipe/silicon.json index 1e4575311..508e2f833 100644 --- a/core/src/main/generated/data/projectred_core/recipe/silicon.json +++ b/core/src/main/generated/data/projectred_core/recipe/silicon.json @@ -6,7 +6,7 @@ "item": "projectred_core:boule" }, "S": { - "item": "cb_microblock:diamond_saw" + "tag": "cb_microblock:tools/saw" } }, "pattern": [ diff --git a/core/src/main/java/mrtjp/projectred/core/init/CoreTags.java b/core/src/main/java/mrtjp/projectred/core/init/CoreTags.java index c975d4569..4fc0be3bb 100644 --- a/core/src/main/java/mrtjp/projectred/core/init/CoreTags.java +++ b/core/src/main/java/mrtjp/projectred/core/init/CoreTags.java @@ -14,6 +14,14 @@ public class CoreTags { /* Item Tags */ public static final TagKey TIN_INGOT_TAG = tag("ingots/tin"); public static final TagKey SILVER_INGOT_TAG = tag("ingots/silver"); + public static final TagKey NICKEL_INGOT_TAG = tag("ingots/nickel"); + public static final TagKey ALUMINUM_INGOT_TAG = tag("ingots/aluminum"); + public static final TagKey BRONZE_INGOT_TAG = tag("ingots/bronze"); + public static final TagKey COPPER_INGOT_TAG = tag("c:/ingots/copper"); + public static final TagKey PLATINUM_INGOT_TAG = tag("c:/ingots/platinum"); + public static final TagKey LEAD_INGOT_TAG = tag("c:/ingots/lead"); + public static final TagKey INVAR_INGOT_TAG = tag("c:/ingots/invar"); + public static final TagKey ELECTRUM_INGOT_TAG = tag("c:/ingots/electrum"); public static final TagKey RED_ALLOY_INGOT_TAG = tag("ingots/red_alloy"); public static final TagKey ELECTROTINE_ALLOY_INGOT_TAG = tag("ingots/electrotine_alloy"); diff --git a/exploration/src/main/generated/assets/projectred_exploration/lang/en_us.json b/exploration/src/main/generated/assets/projectred_exploration/lang/en_us.json index d48117461..b372d8cab 100644 --- a/exploration/src/main/generated/assets/projectred_exploration/lang/en_us.json +++ b/exploration/src/main/generated/assets/projectred_exploration/lang/en_us.json @@ -33,21 +33,29 @@ "block.projectred_exploration.silver_ore": "Silver Ore", "block.projectred_exploration.tin_block": "Tin Block", "block.projectred_exploration.tin_ore": "Tin Ore", + "item.projectred_exploration.aluminum_saw": "Aluminum Saw", "item.projectred_exploration.athame": "Athame", "item.projectred_exploration.black_backpack": "Black Backpack", "item.projectred_exploration.blue_backpack": "Blue Backpack", + "item.projectred_exploration.bronze_saw": "Bronze Saw", "item.projectred_exploration.brown_backpack": "Brown Backpack", + "item.projectred_exploration.copper_saw": "Copper Saw", "item.projectred_exploration.cyan_backpack": "Cyan Backpack", "item.projectred_exploration.diamond_sickle": "Diamond Sickle", + "item.projectred_exploration.electrum_saw": "Invar Saw", "item.projectred_exploration.gold_saw": "Gold Saw", "item.projectred_exploration.gold_sickle": "Gold Sickle", "item.projectred_exploration.gray_backpack": "Gray Backpack", "item.projectred_exploration.green_backpack": "Green Backpack", + "item.projectred_exploration.invar_saw": "Electrum Saw", "item.projectred_exploration.iron_sickle": "Iron Sickle", + "item.projectred_exploration.lead_saw": "Lead Saw", "item.projectred_exploration.light_blue_backpack": "Light Blue Backpack", "item.projectred_exploration.light_gray_backpack": "Light Gray Backpack", "item.projectred_exploration.lime_backpack": "Lime Backpack", "item.projectred_exploration.magenta_backpack": "Magenta Backpack", + "item.projectred_exploration.netherite_saw": "Netherite Saw", + "item.projectred_exploration.nickel_saw": "Nickel Saw", "item.projectred_exploration.orange_backpack": "Orange Backpack", "item.projectred_exploration.peridot_axe": "Peridot Axe", "item.projectred_exploration.peridot_boots": "Peridot Boots", @@ -61,6 +69,7 @@ "item.projectred_exploration.peridot_sickle": "Peridot Sickle", "item.projectred_exploration.peridot_sword": "Peridot Sword", "item.projectred_exploration.pink_backpack": "Pink Backpack", + "item.projectred_exploration.platinum_saw": "Platinum Saw", "item.projectred_exploration.purple_backpack": "Purple Backpack", "item.projectred_exploration.raw_silver": "Raw Silver", "item.projectred_exploration.raw_tin": "Raw Tin", @@ -88,8 +97,10 @@ "item.projectred_exploration.sapphire_sickle": "Sapphire Sickle", "item.projectred_exploration.sapphire_sword": "Sapphire Sword", "item.projectred_exploration.silver_ingot": "Silver Ingot", + "item.projectred_exploration.silver_saw": "Silver Saw", "item.projectred_exploration.stone_sickle": "Stone Sickle", "item.projectred_exploration.tin_ingot": "Tin Ingot", + "item.projectred_exploration.tin_saw": "Tin Saw", "item.projectred_exploration.white_backpack": "White Backpack", "item.projectred_exploration.wood_sickle": "Wood Sickle", "item.projectred_exploration.wool_gin": "Wool Gin", diff --git a/exploration/src/main/generated/data/cb_microblock/tags/item/tools/saw.json b/exploration/src/main/generated/data/cb_microblock/tags/item/tools/saw.json index 5cc07b707..a44939177 100644 --- a/exploration/src/main/generated/data/cb_microblock/tags/item/tools/saw.json +++ b/exploration/src/main/generated/data/cb_microblock/tags/item/tools/saw.json @@ -3,6 +3,17 @@ "projectred_exploration:gold_saw", "projectred_exploration:ruby_saw", "projectred_exploration:sapphire_saw", - "projectred_exploration:peridot_saw" + "projectred_exploration:peridot_saw", + "projectred_exploration:copper_saw", + "projectred_exploration:tin_saw", + "projectred_exploration:silver_saw", + "projectred_exploration:nickel_saw", + "projectred_exploration:aluminum_saw", + "projectred_exploration:bronze_saw", + "projectred_exploration:netherite_saw", + "projectred_exploration:platinum_saw", + "projectred_exploration:lead_saw", + "projectred_exploration:invar_saw", + "projectred_exploration:electrum_saw" ] } \ No newline at end of file diff --git a/exploration/src/main/generated/data/projectred_exploration/recipe/aluminum_saw.json b/exploration/src/main/generated/data/projectred_exploration/recipe/aluminum_saw.json new file mode 100644 index 000000000..bffa21270 --- /dev/null +++ b/exploration/src/main/generated/data/projectred_exploration/recipe/aluminum_saw.json @@ -0,0 +1,32 @@ +{ + "neoforge:conditions": [ + { + "type": "neoforge:not", + "value": { + "type": "neoforge:tag_empty", + "tag": "c:ingots/aluminum" + } + } + ], + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "M": { + "tag": "c:ingots/aluminum" + }, + "R": { + "item": "cb_microblock:stone_rod" + }, + "S": { + "tag": "c:rods/wooden" + } + }, + "pattern": [ + "SRR", + "SMM" + ], + "result": { + "count": 1, + "id": "projectred_exploration:aluminum_saw" + } +} \ No newline at end of file diff --git a/exploration/src/main/generated/data/projectred_exploration/recipe/bronze_saw.json b/exploration/src/main/generated/data/projectred_exploration/recipe/bronze_saw.json new file mode 100644 index 000000000..41d051d87 --- /dev/null +++ b/exploration/src/main/generated/data/projectred_exploration/recipe/bronze_saw.json @@ -0,0 +1,32 @@ +{ + "neoforge:conditions": [ + { + "type": "neoforge:not", + "value": { + "type": "neoforge:tag_empty", + "tag": "c:ingots/bronze" + } + } + ], + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "M": { + "tag": "c:ingots/bronze" + }, + "R": { + "item": "cb_microblock:stone_rod" + }, + "S": { + "tag": "c:rods/wooden" + } + }, + "pattern": [ + "SRR", + "SMM" + ], + "result": { + "count": 1, + "id": "projectred_exploration:bronze_saw" + } +} \ No newline at end of file diff --git a/exploration/src/main/generated/data/projectred_exploration/recipe/copper_saw.json b/exploration/src/main/generated/data/projectred_exploration/recipe/copper_saw.json new file mode 100644 index 000000000..ea69328cd --- /dev/null +++ b/exploration/src/main/generated/data/projectred_exploration/recipe/copper_saw.json @@ -0,0 +1,23 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "M": { + "tag": "c:ingots/copper" + }, + "R": { + "item": "cb_microblock:stone_rod" + }, + "S": { + "tag": "c:rods/wooden" + } + }, + "pattern": [ + "SRR", + "SMM" + ], + "result": { + "count": 1, + "id": "projectred_exploration:copper_saw" + } +} \ No newline at end of file diff --git a/exploration/src/main/generated/data/projectred_exploration/recipe/electrum_saw.json b/exploration/src/main/generated/data/projectred_exploration/recipe/electrum_saw.json new file mode 100644 index 000000000..f8d7796f8 --- /dev/null +++ b/exploration/src/main/generated/data/projectred_exploration/recipe/electrum_saw.json @@ -0,0 +1,32 @@ +{ + "neoforge:conditions": [ + { + "type": "neoforge:not", + "value": { + "type": "neoforge:tag_empty", + "tag": "c:ingots/electrum" + } + } + ], + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "M": { + "tag": "c:ingots/electrum" + }, + "R": { + "item": "cb_microblock:stone_rod" + }, + "S": { + "tag": "c:rods/wooden" + } + }, + "pattern": [ + "SRR", + "SMM" + ], + "result": { + "count": 1, + "id": "projectred_exploration:electrum_saw" + } +} \ No newline at end of file diff --git a/exploration/src/main/generated/data/projectred_exploration/recipe/invar_saw.json b/exploration/src/main/generated/data/projectred_exploration/recipe/invar_saw.json new file mode 100644 index 000000000..0bf9e22aa --- /dev/null +++ b/exploration/src/main/generated/data/projectred_exploration/recipe/invar_saw.json @@ -0,0 +1,32 @@ +{ + "neoforge:conditions": [ + { + "type": "neoforge:not", + "value": { + "type": "neoforge:tag_empty", + "tag": "c:ingots/invar" + } + } + ], + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "M": { + "tag": "c:ingots/invar" + }, + "R": { + "item": "cb_microblock:stone_rod" + }, + "S": { + "tag": "c:rods/wooden" + } + }, + "pattern": [ + "SRR", + "SMM" + ], + "result": { + "count": 1, + "id": "projectred_exploration:invar_saw" + } +} \ No newline at end of file diff --git a/exploration/src/main/generated/data/projectred_exploration/recipe/lead_saw.json b/exploration/src/main/generated/data/projectred_exploration/recipe/lead_saw.json new file mode 100644 index 000000000..283410657 --- /dev/null +++ b/exploration/src/main/generated/data/projectred_exploration/recipe/lead_saw.json @@ -0,0 +1,32 @@ +{ + "neoforge:conditions": [ + { + "type": "neoforge:not", + "value": { + "type": "neoforge:tag_empty", + "tag": "c:ingots/lead" + } + } + ], + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "M": { + "tag": "c:ingots/lead" + }, + "R": { + "item": "cb_microblock:stone_rod" + }, + "S": { + "tag": "c:rods/wooden" + } + }, + "pattern": [ + "SRR", + "SMM" + ], + "result": { + "count": 1, + "id": "projectred_exploration:lead_saw" + } +} \ No newline at end of file diff --git a/exploration/src/main/generated/data/projectred_exploration/recipe/netherite_saw.json b/exploration/src/main/generated/data/projectred_exploration/recipe/netherite_saw.json new file mode 100644 index 000000000..192851135 --- /dev/null +++ b/exploration/src/main/generated/data/projectred_exploration/recipe/netherite_saw.json @@ -0,0 +1,23 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "M": { + "tag": "c:ingots/netherite" + }, + "R": { + "item": "cb_microblock:stone_rod" + }, + "S": { + "tag": "c:rods/wooden" + } + }, + "pattern": [ + "SRR", + "SMM" + ], + "result": { + "count": 1, + "id": "projectred_exploration:netherite_saw" + } +} \ No newline at end of file diff --git a/exploration/src/main/generated/data/projectred_exploration/recipe/nickel_saw.json b/exploration/src/main/generated/data/projectred_exploration/recipe/nickel_saw.json new file mode 100644 index 000000000..16926ad6b --- /dev/null +++ b/exploration/src/main/generated/data/projectred_exploration/recipe/nickel_saw.json @@ -0,0 +1,32 @@ +{ + "neoforge:conditions": [ + { + "type": "neoforge:not", + "value": { + "type": "neoforge:tag_empty", + "tag": "c:ingots/nickel" + } + } + ], + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "M": { + "tag": "c:ingots/nickel" + }, + "R": { + "item": "cb_microblock:stone_rod" + }, + "S": { + "tag": "c:rods/wooden" + } + }, + "pattern": [ + "SRR", + "SMM" + ], + "result": { + "count": 1, + "id": "projectred_exploration:nickel_saw" + } +} \ No newline at end of file diff --git a/exploration/src/main/generated/data/projectred_exploration/recipe/platinum_saw.json b/exploration/src/main/generated/data/projectred_exploration/recipe/platinum_saw.json new file mode 100644 index 000000000..53d91186c --- /dev/null +++ b/exploration/src/main/generated/data/projectred_exploration/recipe/platinum_saw.json @@ -0,0 +1,32 @@ +{ + "neoforge:conditions": [ + { + "type": "neoforge:not", + "value": { + "type": "neoforge:tag_empty", + "tag": "c:ingots/platinum" + } + } + ], + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "M": { + "tag": "c:ingots/platinum" + }, + "R": { + "item": "cb_microblock:stone_rod" + }, + "S": { + "tag": "c:rods/wooden" + } + }, + "pattern": [ + "SRR", + "SMM" + ], + "result": { + "count": 1, + "id": "projectred_exploration:platinum_saw" + } +} \ No newline at end of file diff --git a/exploration/src/main/generated/data/projectred_exploration/recipe/silver_saw.json b/exploration/src/main/generated/data/projectred_exploration/recipe/silver_saw.json new file mode 100644 index 000000000..8eb0d04dd --- /dev/null +++ b/exploration/src/main/generated/data/projectred_exploration/recipe/silver_saw.json @@ -0,0 +1,23 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "M": { + "tag": "c:ingots/silver" + }, + "R": { + "item": "cb_microblock:stone_rod" + }, + "S": { + "tag": "c:rods/wooden" + } + }, + "pattern": [ + "SRR", + "SMM" + ], + "result": { + "count": 1, + "id": "projectred_exploration:silver_saw" + } +} \ No newline at end of file diff --git a/exploration/src/main/generated/data/projectred_exploration/recipe/tin_saw.json b/exploration/src/main/generated/data/projectred_exploration/recipe/tin_saw.json new file mode 100644 index 000000000..e0b164bd9 --- /dev/null +++ b/exploration/src/main/generated/data/projectred_exploration/recipe/tin_saw.json @@ -0,0 +1,23 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "M": { + "tag": "c:ingots/tin" + }, + "R": { + "item": "cb_microblock:stone_rod" + }, + "S": { + "tag": "c:rods/wooden" + } + }, + "pattern": [ + "SRR", + "SMM" + ], + "result": { + "count": 1, + "id": "projectred_exploration:tin_saw" + } +} \ No newline at end of file diff --git a/exploration/src/main/java/mrtjp/projectred/exploration/data/ExplorationItemModelProvider.java b/exploration/src/main/java/mrtjp/projectred/exploration/data/ExplorationItemModelProvider.java index de4ab697f..7010b3a55 100644 --- a/exploration/src/main/java/mrtjp/projectred/exploration/data/ExplorationItemModelProvider.java +++ b/exploration/src/main/java/mrtjp/projectred/exploration/data/ExplorationItemModelProvider.java @@ -94,6 +94,17 @@ protected void registerModels() { handheld(SAPPHIRE_SWORD); handheld(PERIDOT_SWORD); + handheld(COPPER_SAW); + handheld(TIN_SAW); + handheld(SILVER_SAW); + handheld(NICKEL_SAW); + handheld(ALUMINUM_SAW); + handheld(BRONZE_SAW); + handheld(NETHERITE_SAW); + handheld(PLATINUM_SAW); + handheld(LEAD_SAW); + handheld(INVAR_SAW); + handheld(ELECTRUM_SAW); handheld(GOLD_SAW); handheld(RUBY_SAW); handheld(SAPPHIRE_SAW); diff --git a/exploration/src/main/java/mrtjp/projectred/exploration/data/ExplorationItemTagsProvider.java b/exploration/src/main/java/mrtjp/projectred/exploration/data/ExplorationItemTagsProvider.java index 5a1a5c47f..e0c7a76a9 100644 --- a/exploration/src/main/java/mrtjp/projectred/exploration/data/ExplorationItemTagsProvider.java +++ b/exploration/src/main/java/mrtjp/projectred/exploration/data/ExplorationItemTagsProvider.java @@ -122,6 +122,17 @@ protected void addTags(HolderLookup.Provider pProvider) { tag(BLACK_BACKPACK_TAG).add(BLACK_BACKPACK.get()); tag(CBMicroblockTags.Items.TOOL_SAW) + .add(COPPER_SAW.get()) + .add(TIN_SAW.get()) + .add(SILVER_SAW.get()) + .add(NICKEL_SAW.get()) + .add(ALUMINUM_SAW.get()) + .add(BRONZE_SAW.get()) + .add(NETHERITE_SAW.get()) + .add(PLATINUM_SAW.get()) + .add(LEAD_SAW.get()) + .add(INVAR_SAW.get()) + .add(ELECTRUM_SAW.get()) .add(GOLD_SAW.get()) .add(RUBY_SAW.get()) .add(SAPPHIRE_SAW.get()) diff --git a/exploration/src/main/java/mrtjp/projectred/exploration/data/ExplorationLanguageProvider.java b/exploration/src/main/java/mrtjp/projectred/exploration/data/ExplorationLanguageProvider.java index 0646b9b52..6a85dacb8 100644 --- a/exploration/src/main/java/mrtjp/projectred/exploration/data/ExplorationLanguageProvider.java +++ b/exploration/src/main/java/mrtjp/projectred/exploration/data/ExplorationLanguageProvider.java @@ -113,6 +113,17 @@ protected void addTranslations() { add(PERIDOT_BOOTS.get(), "Peridot Boots"); // Saws + add(COPPER_SAW.get(), "Copper Saw"); + add(TIN_SAW.get(), "Tin Saw"); + add(SILVER_SAW.get(), "Silver Saw"); + add(NICKEL_SAW.get(), "Nickel Saw"); + add(ALUMINUM_SAW.get(), "Aluminum Saw"); + add(BRONZE_SAW.get(), "Bronze Saw"); + add(NETHERITE_SAW.get(), "Netherite Saw"); + add(PLATINUM_SAW.get(), "Platinum Saw"); + add(LEAD_SAW.get(), "Lead Saw"); + add(INVAR_SAW.get(), "Invar Saw"); + add(ELECTRUM_SAW.get(), "Electrum Saw"); add(GOLD_SAW.get(), "Gold Saw"); add(RUBY_SAW.get(), "Ruby Saw"); add(SAPPHIRE_SAW.get(), "Sapphire Saw"); diff --git a/exploration/src/main/java/mrtjp/projectred/exploration/data/ExplorationRecipeProvider.java b/exploration/src/main/java/mrtjp/projectred/exploration/data/ExplorationRecipeProvider.java index 4111ba173..29db3073b 100644 --- a/exploration/src/main/java/mrtjp/projectred/exploration/data/ExplorationRecipeProvider.java +++ b/exploration/src/main/java/mrtjp/projectred/exploration/data/ExplorationRecipeProvider.java @@ -124,6 +124,17 @@ protected void registerRecipes() { swordRecipe(SAPPHIRE_SWORD.get(), SAPPHIRE_GEM_TAG); swordRecipe(PERIDOT_SWORD.get(), PERIDOT_GEM_TAG); + sawRecipe(COPPER_SAW.get(), Tags.Items.INGOTS_COPPER); + sawRecipe(TIN_SAW.get(), TIN_INGOT_TAG); + sawRecipe(SILVER_SAW.get(), SILVER_INGOT_TAG); + sawRecipe(NICKEL_SAW.get(), NICKEL_INGOT_TAG); + sawRecipe(ALUMINUM_SAW.get(), ALUMINUM_INGOT_TAG); + sawRecipe(BRONZE_SAW.get(), BRONZE_INGOT_TAG); + sawRecipe(NETHERITE_SAW.get(), Tags.Items.INGOTS_NETHERITE); + sawRecipe(PLATINUM_SAW.get(), PLATINUM_INGOT_TAG); + sawRecipe(LEAD_SAW.get(), LEAD_INGOT_TAG); + sawRecipe(INVAR_SAW.get(), INVAR_INGOT_TAG); + sawRecipe(ELECTRUM_SAW.get(), ELECTRUM_INGOT_TAG); sawRecipe(GOLD_SAW.get(), Tags.Items.INGOTS_GOLD); sawRecipe(RUBY_SAW.get(), RUBY_GEM_TAG); sawRecipe(SAPPHIRE_SAW.get(), SAPPHIRE_GEM_TAG); diff --git a/exploration/src/main/java/mrtjp/projectred/exploration/init/ExplorationCreativeModeTabs.java b/exploration/src/main/java/mrtjp/projectred/exploration/init/ExplorationCreativeModeTabs.java index 0e9985a78..23822e67c 100644 --- a/exploration/src/main/java/mrtjp/projectred/exploration/init/ExplorationCreativeModeTabs.java +++ b/exploration/src/main/java/mrtjp/projectred/exploration/init/ExplorationCreativeModeTabs.java @@ -98,6 +98,17 @@ public static void register() { output.accept(SAPPHIRE_SWORD.get()); output.accept(PERIDOT_SWORD.get()); + output.accept(COPPER_SAW.get()); + output.accept(TIN_SAW.get()); + output.accept(SILVER_SAW.get()); + output.accept(NICKEL_SAW.get()); + output.accept(ALUMINUM_SAW.get()); + output.accept(BRONZE_SAW.get()); + output.accept(NETHERITE_SAW.get()); + output.accept(PLATINUM_SAW.get()); + output.accept(LEAD_SAW.get()); + output.accept(INVAR_SAW.get()); + output.accept(ELECTRUM_SAW.get()); output.accept(GOLD_SAW.get()); output.accept(RUBY_SAW.get()); output.accept(SAPPHIRE_SAW.get()); diff --git a/exploration/src/main/java/mrtjp/projectred/exploration/init/ExplorationItems.java b/exploration/src/main/java/mrtjp/projectred/exploration/init/ExplorationItems.java index 012946d66..b92e56c64 100644 --- a/exploration/src/main/java/mrtjp/projectred/exploration/init/ExplorationItems.java +++ b/exploration/src/main/java/mrtjp/projectred/exploration/init/ExplorationItems.java @@ -64,6 +64,17 @@ public class ExplorationItems { public static final String ID_SAPPHIRE_BOOTS = "sapphire_boots"; public static final String ID_PERIDOT_BOOTS = "peridot_boots"; + public static final String ID_COPPER_SAW = "copper_saw"; + public static final String ID_TIN_SAW = "tin_saw"; + public static final String ID_SILVER_SAW = "silver_saw"; + public static final String ID_NICKEL_SAW = "nickel_saw"; + public static final String ID_ALUMINUM_SAW = "aluminum_saw"; + public static final String ID_BRONZE_SAW = "bronze_saw"; + public static final String ID_NETHERITE_SAW = "netherite_saw"; + public static final String ID_PLATINUM_SAW = "platinum_saw"; + public static final String ID_LEAD_SAW = "lead_saw"; + public static final String ID_ELECTRUM_SAW = "electrum_saw"; + public static final String ID_INVAR_SAW = "invar_saw"; public static final String ID_GOLD_SAW = "gold_saw"; public static final String ID_RUBY_SAW = "ruby_saw"; public static final String ID_SAPPHIRE_SAW = "sapphire_saw"; @@ -125,6 +136,17 @@ public class ExplorationItems { public static Supplier SAPPHIRE_SWORD; public static Supplier PERIDOT_SWORD; + public static Supplier COPPER_SAW; + public static Supplier TIN_SAW; + public static Supplier SILVER_SAW; + public static Supplier NICKEL_SAW; + public static Supplier ALUMINUM_SAW; + public static Supplier BRONZE_SAW; + public static Supplier NETHERITE_SAW; + public static Supplier PLATINUM_SAW; + public static Supplier LEAD_SAW; + public static Supplier INVAR_SAW; + public static Supplier ELECTRUM_SAW; public static Supplier GOLD_SAW; public static Supplier RUBY_SAW; public static Supplier SAPPHIRE_SAW; @@ -183,6 +205,96 @@ public class ExplorationItems { () -> Ingredient.of(SILVER_INGOT_TAG) ); + public static final SimpleTier COPPER_ITEM_TIER = new SimpleTier( + BlockTags.INCORRECT_FOR_IRON_TOOL, + 180, + 8.00F, + 3.00F, + 10, + () -> Ingredient.of(COPPER_INGOT_TAG) + ); + + public static final SimpleTier TIN_ITEM_TIER = new SimpleTier( + BlockTags.INCORRECT_FOR_IRON_TOOL, + 200, + 8.00F, + 3.00F, + 10, + () -> Ingredient.of(TIN_INGOT_TAG) + ); + + public static final SimpleTier SILVER_ITEM_TIER = new SimpleTier( + BlockTags.INCORRECT_FOR_IRON_TOOL, + 200, + 8.00F, + 3.00F, + 10, + () -> Ingredient.of(SILVER_INGOT_TAG) + ); + + public static final SimpleTier NICKEL_ITEM_TIER = new SimpleTier( + BlockTags.INCORRECT_FOR_IRON_TOOL, + 300, + 8.00F, + 3.00F, + 10, + () -> Ingredient.of(NICKEL_INGOT_TAG) + ); + + public static final SimpleTier ALUMINUM_ITEM_TIER = new SimpleTier( + BlockTags.INCORRECT_FOR_IRON_TOOL, + 225, + 8.00F, + 3.00F, + 10, + () -> Ingredient.of(ALUMINUM_INGOT_TAG) + ); + + public static final SimpleTier BRONZE_ITEM_TIER = new SimpleTier( + BlockTags.INCORRECT_FOR_IRON_TOOL, + 500, + 8.00F, + 3.00F, + 10, + () -> Ingredient.of(BRONZE_INGOT_TAG) + ); + + public static final SimpleTier PLATINUM_ITEM_TIER = new SimpleTier( + BlockTags.INCORRECT_FOR_IRON_TOOL, + 1700, + 8.00F, + 3.00F, + 10, + () -> Ingredient.of(PLATINUM_INGOT_TAG) + ); + + public static final SimpleTier LEAD_ITEM_TIER = new SimpleTier( + BlockTags.INCORRECT_FOR_IRON_TOOL, + 150, + 8.00F, + 3.00F, + 10, + () -> Ingredient.of(LEAD_INGOT_TAG) + ); + + public static final SimpleTier INVAR_ITEM_TIER = new SimpleTier( + BlockTags.INCORRECT_FOR_IRON_TOOL, + 450, + 8.00F, + 3.00F, + 10, + () -> Ingredient.of(INVAR_INGOT_TAG) + ); + + public static final SimpleTier ELECTRUM_ITEM_TIER = new SimpleTier( + BlockTags.INCORRECT_FOR_IRON_TOOL, + 100, + 8.00F, + 3.00F, + 10, + () -> Ingredient.of(ELECTRUM_INGOT_TAG) + ); + public static final SimpleTier RUBY_ITEM_TIER = new SimpleTier( BlockTags.INCORRECT_FOR_IRON_TOOL, 512, @@ -243,6 +355,17 @@ public static void register() { SAPPHIRE_SWORD = ITEMS.register(ID_SAPPHIRE_SWORD, () -> createSwordItem(SAPPHIRE_ITEM_TIER, 3, -2.4F)); PERIDOT_SWORD = ITEMS.register(ID_PERIDOT_SWORD, () -> createSwordItem(PERIDOT_ITEM_TIER, 3, -2.4F)); + COPPER_SAW = ITEMS.register(ID_COPPER_SAW, () -> createSawItem(COPPER_ITEM_TIER)); + TIN_SAW = ITEMS.register(ID_TIN_SAW, () -> createSawItem(TIN_ITEM_TIER)); + SILVER_SAW = ITEMS.register(ID_SILVER_SAW, () -> createSawItem(SILVER_ITEM_TIER)); + NICKEL_SAW = ITEMS.register(ID_NICKEL_SAW, () -> createSawItem(NICKEL_ITEM_TIER)); + ALUMINUM_SAW = ITEMS.register(ID_ALUMINUM_SAW, () -> createSawItem(ALUMINUM_ITEM_TIER)); + BRONZE_SAW = ITEMS.register(ID_BRONZE_SAW, () -> createSawItem(BRONZE_ITEM_TIER)); + NETHERITE_SAW = ITEMS.register(ID_NETHERITE_SAW, () -> createSawItem(Tiers.NETHERITE)); + PLATINUM_SAW = ITEMS.register(ID_PLATINUM_SAW, () -> createSawItem(PLATINUM_ITEM_TIER)); + LEAD_SAW = ITEMS.register(ID_LEAD_SAW, () -> createSawItem(LEAD_ITEM_TIER)); + INVAR_SAW = ITEMS.register(ID_ELECTRUM_SAW, () -> createSawItem(ELECTRUM_ITEM_TIER)); + ELECTRUM_SAW = ITEMS.register(ID_INVAR_SAW, () -> createSawItem(INVAR_ITEM_TIER)); GOLD_SAW = ITEMS.register(ID_GOLD_SAW, () -> createSawItem(Tiers.GOLD)); RUBY_SAW = ITEMS.register(ID_RUBY_SAW, () -> createSawItem(RUBY_ITEM_TIER)); SAPPHIRE_SAW = ITEMS.register(ID_SAPPHIRE_SAW, () -> createSawItem(SAPPHIRE_ITEM_TIER)); diff --git a/exploration/src/main/resources/assets/projectred_exploration/textures/item/aluminum_saw.png b/exploration/src/main/resources/assets/projectred_exploration/textures/item/aluminum_saw.png new file mode 100644 index 0000000000000000000000000000000000000000..9af2617ddaea4ca581e99afab45ee231bd3d1858 GIT binary patch literal 474 zcmV<00VV#4P)5lD}(OQ545NuUl%TaBUnON)fEBF2NrOR7%!YA^041 zmUejmfY2#Jq_a+S3_dbu%Hk4QB9SgNLu$eXtY{Vw=5z`@ivj5RIM@^jZjKqnr0wm258&1)Gdqi z!2rMqNvG2*ooFKe^KILfTBXAIU_eAE0LHG%&+BVWIvrA}6prICnM|~9w+n#&*_s2^ zfyCo+oc=MV{X1=GgsEzkiq^Jm-et3lU3Y1mf??qFkBLP#_^|U*0s%pgvFq~f;)3r- z2kdQca`xkaz3t68WYxxf?Q}#$*!7Fg#cXr`aS!`Cjo-=58yK;#fm!~ QeE5kS-PX8>~a8f!ig)!I;mZ7!7}fWsO)rSRW6vC*89xd&B4O z`SSU^-k&dTB_h|aeAliJtQN6t8%@)iLT>4G7fcNs^8DExS1?EuZV-(|$>;L`>bJe@EU&D~2>|#f zBpeQ7Sr+ATS*6oy0QA{Me*x!#1Ofr9wIx>94%C@1oK`c)#`Xb6)gScwJJ{K)I1pEi z^Qles`qc~kgX45`d5H`JoaK>-mv`?E8HsoqzteN#EFul-@x7pIyce%=T`DmKU6^nlr%IP`BfL uZa{6$wcIF$R=U~SDFB5J-$ml)* literal 0 HcmV?d00001 diff --git a/exploration/src/main/resources/assets/projectred_exploration/textures/item/copper_saw.png b/exploration/src/main/resources/assets/projectred_exploration/textures/item/copper_saw.png new file mode 100644 index 0000000000000000000000000000000000000000..648f6f600950a151987826f255f0440fa1d2a4c1 GIT binary patch literal 478 zcmV<40U`d0P)5lCeu0aTLctC+*OtUCJGGIAfEbjma$%FN;IFG!Rk> zcesl<*rECtl;Y}OG6ffdtAjWyn59rS2o7CJEAi5_YETTgM3Iu=IfPv8ou~G}8-DNi z-sk(}_kM^7{{(=$hDR#F>tJOkPRV>T85#j+V zxs()3Wt^2ov>_t^F$^Qri6YXgS8^$t{2#E8wF-d#@xx!heISWM0=Kr#R_#;?IJgV4QE%f8oHIQ5h~Fod9wY$pLjZ61_4qT^ zwvU*}>wNxt)`NuoxYajf(*3d}^Aj=2XEk~ME-J}rL;#Y}h%C*$lw>p_55m?nyYpSC zlYH~;_u literal 0 HcmV?d00001 diff --git a/exploration/src/main/resources/assets/projectred_exploration/textures/item/electrum_saw.png b/exploration/src/main/resources/assets/projectred_exploration/textures/item/electrum_saw.png new file mode 100644 index 0000000000000000000000000000000000000000..7d6178892af98d04cfdb20dfef6b577329062132 GIT binary patch literal 461 zcmV;;0W$uHP)5lCetyVHn1L7c`VbU{^U@7h!Z4N+4pctttfPR@9tC zQ;xMXHUv%4-qK&t;?fX;v_v#$+#v;06hzR3?*=csx!vn-%XJz}VZ_kFyV825pMPBATXkg*-TCe!x;%m*L?- z%%F|qIH;=H5farr4wlloY;WcXhk9v2YPA}ws$yAITZjwDuNbnunWy<&#h6X{Akk>F zqZ38sbDm!@B$r#G`CJ8{a#6y$d#7G+P=1^u5{Y2jHjPF@DHI9-Xj|)FfWJV(;V^dT zh~v_|;&bpDan7&&PtCoY$F;1xY7I zKb1TExQ*p$xjNmG#niZ@=0+s9po^&o1i;h-va@Q4sRzX8!0Y6@GN1rVhWe@AzR=ad z_iiZzq~=Ck^*;kz?|jScQs`DQ69WQJzG-%j@xS!}haoUYd5lD|tEVHn3hR|K(V5t6$`;TowoG$mOiMAry9#Dl^e zn5|ju;AWvqS0#b=Zzwp0430WvaS8?(-5l=H5)Hwo8A^x}m&c)8G(S$#FFeEhyzl$@ zJ`c}>h%g+sZOgd4h>%L9`XM5`U`Uo_NivzlaU2=G1Bmp_2F@dZ>99(rQo%5cXCW=` zY!t9&ZOEMZis`V5=Xq$F76?fgLlvx98djIJvCk_xJF; z8hRu$0!btift4sC|ME^QD_?d$<9Ri%noU|aH?&(V{&qX`+Fj!DIIio`>2#EGxeS2u zb>|T<3B)u_+-i}d>ThMB1z(2;C8hBF8>YF$n}vmec5b=Htrl6FpJ8+LwTuM>L4MWi z%>20^y&U4?yiIyJ^au&sIQ!$4oSs)Dy}2%#65lCer7Q51&1S+>zEE9#gHI84k;VUmd$35l(3Hn1>x ziM6nDTZ6TQzJQ3>?Gx-4X{-X0CP6e78Kbg8Br1!BMXZj6WL7hos0U7Q&%NjSfA}vV zLVw$~EraGFLN=TAT15CjUlj@k$z(DVi$&?b1Nib#eR1{y&RQ;&N(D{RhC;5Ksvi)G znlkozoU@jT<2b0Q8VE^geGXz#Q%a?E)X6YCi0itjs)}vf10f#3N~Wb$TIaCdz%&dW zB$Y}9I#EQP=2kK-KUP;ctTzB~PEWbM>2Q1Zmzmf!mSxdwHtBY|O1WGHKwDe+4|og2 zG)?>&ew#-rn!vbnXz+iz{$nG;27UqkJd~o`uVqh QRsaA107*qoM6N<$g7I3+;s5{u literal 0 HcmV?d00001 diff --git a/exploration/src/main/resources/assets/projectred_exploration/textures/item/netherite_saw.png b/exploration/src/main/resources/assets/projectred_exploration/textures/item/netherite_saw.png new file mode 100644 index 0000000000000000000000000000000000000000..521be65d0ce71036fa0cec152d34975fe8ac4985 GIT binary patch literal 532 zcmV+v0_**WP)5lFe%qQ4qj?D;CkJ{UAvL*=~_Vy6r}7H>i+P?Wr;K z(3SS?A$SqI6)Zg~9z66f=v7+CsaPQ(Jp~#eEbV1W6U5bEZ73=sL{HB{-KYDZ;K0Dl zyqVw3d-D__1YxmlTa?RX#rN;skS3qc-IR8%R^v>#xL7QTTrP)g+fgzw^5bp5j{ur` z`&6q{R8^Ib+EFS3X*W+nXa78~CQXq{C28*M1CYsNe279wvTA4oYtj_6a|Hl=NUPN% zkw}ow=VPxU0mi5%X6FhVI1buXBLc~0v-If;qEBCl02F@<#;7Ld7neA294@Cu@D5!7 z+Q)75>(?+%lSZRKr_)g?l?njr>Z9L)I0%4u=t_vL>oj&>@@n^3iA)d&`TFgPjCXtA zNndI+mOjt>qn?CB*64oll&#GT#;2wj92jD7U`Q6vOb@f;oG>#z%-!25Atxx6N&$#v zS*$&MCgvBHc=LK&cHVJLaJ{Z#X#L_rL1lgWV{`(5dcDr$l_$#9=0>11zy8CO^ab91 z>YXMFAp*L52VUF{#tp4sK2+gWQapb+E@UhWh*Li=QXIF1f62tyMFHS?-M_E#f8{4w W;Pk4`&vBCg00005l08c!Q51%sS+LM3Q5oF`vl(L0&5~G1h?bkyjVw$` zV%WiS_;f5hRUOAOv9>#bUByHUz_pMj1rJ;#f#Vok_BK;1u`Vd!F}& z_aY*=+b|4iHWv{RiG;Z&yg?v7brfF>%x03Zw!T51zk>#(TCJk0Du!V+g*brh^0ch2Z&0yL z>FM!#AhB4ir4vQud7fRKmbv*=D%L5ri$B=*9rfEsZg1+8Eg>3>VwxtlZ7aE44ghU4 z`vQ0mBpeQ77JhM9_@{Ur{10MT6|T)Q^gt(8?cRZSV%*t1Q1`JzV&3=K0fI_4}V z$NM?{eMNG-pC6Nh&&sWS+{#i)PEL*_GxJ@hCI)2jXHX(Rp8!OHKG|CMDv_X1JPzDW zUMm9%Kq$~f`Qo0o4qkUd8DMH+z)^oUpz+SL+$@E5^-b>@P)5lDkVIQ51*25iH#JfMMbT#)xED6EaN zctO7R$2dPeqUC;%p{UCKuSbTW>N}*`#!bx3%jMmp42(|6aGzgN;{gc;d;$;(_+)LS zM?wLgxEwg0ly?RcfbRA$T;2ZVLkHzi>1zxqhX4Qo07*qoM6N<$f}h>YVE_OC literal 0 HcmV?d00001 diff --git a/exploration/src/main/resources/assets/projectred_exploration/textures/item/silver_saw.png b/exploration/src/main/resources/assets/projectred_exploration/textures/item/silver_saw.png new file mode 100644 index 0000000000000000000000000000000000000000..7bf54c096619ce92748dbb818e0f9a977238c372 GIT binary patch literal 519 zcmV+i0{H!jP)5(!XmHVHm*i?};KB2QAko=#g^VU?eHhght0YHmO2h z{{V4FRn#t}9g0JLK*6CM)Y>t0>y)XaLl&n%(nXL$hr0$OQKLu;A&ArCAa`x<&Qc$E zhxg@uKhOKT&#Q?D{!mIuxm?!#>-TSKbS{p0^G2h=Isc}7J};R}2BlO`2BN=r`{n__ z%1u(M)i4a>ROE-V8w92nm*sjiij|whaU67A|0j|%d^ea{T$Z)j8LU_o7iqWK=(NX0M54#UpgI} z$~MVl65F=vcDq`&S_Qy(_2L*f3u0Loc72OV{kzxVzDIoX{Fydi+Qhhal@ZhIE9XY` zE_Qv3;n*c|cZMVs2t!6plY_lIT9vnqj}GwR<4?v%2aXXD2^}xry_asUC&h&&naB>x z(+6=$#3KTbh)3l0lbe!=N8~&}u~-beZaSUT=1ZI6W-jft05kwIcA4haUxeOZ?jEc@ z>|b{?159KGz3iu!aB{f&0*6ojgR{h~;VS~L|GDS2@xOqu_yg0_0@x|L#+m>C002ov JPDHLkV1oM|?C}5q literal 0 HcmV?d00001 diff --git a/exploration/src/main/resources/assets/projectred_exploration/textures/item/tin_saw.png b/exploration/src/main/resources/assets/projectred_exploration/textures/item/tin_saw.png new file mode 100644 index 0000000000000000000000000000000000000000..4dffabe420970486e223680564df1e10d25ea3e7 GIT binary patch literal 474 zcmV<00VV#4P)5l08cUQ4mGX+G%Xmbq!`&krXB*A`+rq2zDA!HjUUz zOkr;de}M7h2l#=l3WC_!1VJnU!A2`BHV8sgRzxs}SdE1wCc7Jn7p8bK@142B8$<+W zn5HRSc@ZHVkJm#)=)j>=DkZU4jC49J&KkhL*HzQm1(-^XQY;qHb^TAsOZmzT*xJZR zI6Q_qm!MoOqpE64NK|(?*xJZRCYz(DPh)Vx^71K05A$7psPF^zE9Jc)o z;DSV>(UwjWk)QnDPG060may$-Y`X%$+pEpv;{zwBmqa2FEX$%=tty2=0RVk<`4`X* zBp3{0l@2*8*-Fz0H7#aVl%s=fG|i8u1)9d0N{(Wc4jJ-yGBc@(C%_A$X#s9;Z#X~R zCpq5B#q}%6@!nrZtBu>;UX%CtH`!cYk?Dzk$<7)QGJFCMGJKL>8j+CU6PE+0lg7?~ z0x<0F;{NHAKOHnituw&%M1Q?|+ko0V*W<=LXh-3pZUMM^_^5y5zW`qP1^{;=mJ-U4 QV*mgE07*qoM6N<$f_#a`0RR91 literal 0 HcmV?d00001