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 000000000..9af2617dd Binary files /dev/null and b/exploration/src/main/resources/assets/projectred_exploration/textures/item/aluminum_saw.png differ diff --git a/exploration/src/main/resources/assets/projectred_exploration/textures/item/bronze_saw.png b/exploration/src/main/resources/assets/projectred_exploration/textures/item/bronze_saw.png new file mode 100644 index 000000000..3f8789b24 Binary files /dev/null and b/exploration/src/main/resources/assets/projectred_exploration/textures/item/bronze_saw.png differ 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 000000000..648f6f600 Binary files /dev/null and b/exploration/src/main/resources/assets/projectred_exploration/textures/item/copper_saw.png differ 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 000000000..7d6178892 Binary files /dev/null and b/exploration/src/main/resources/assets/projectred_exploration/textures/item/electrum_saw.png differ diff --git a/exploration/src/main/resources/assets/projectred_exploration/textures/item/invar_saw.png b/exploration/src/main/resources/assets/projectred_exploration/textures/item/invar_saw.png new file mode 100644 index 000000000..59a41ca0e Binary files /dev/null and b/exploration/src/main/resources/assets/projectred_exploration/textures/item/invar_saw.png differ diff --git a/exploration/src/main/resources/assets/projectred_exploration/textures/item/lead_saw.png b/exploration/src/main/resources/assets/projectred_exploration/textures/item/lead_saw.png new file mode 100644 index 000000000..566159c3e Binary files /dev/null and b/exploration/src/main/resources/assets/projectred_exploration/textures/item/lead_saw.png differ 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 000000000..521be65d0 Binary files /dev/null and b/exploration/src/main/resources/assets/projectred_exploration/textures/item/netherite_saw.png differ diff --git a/exploration/src/main/resources/assets/projectred_exploration/textures/item/nickel_saw.png b/exploration/src/main/resources/assets/projectred_exploration/textures/item/nickel_saw.png new file mode 100644 index 000000000..9f2d28f06 Binary files /dev/null and b/exploration/src/main/resources/assets/projectred_exploration/textures/item/nickel_saw.png differ diff --git a/exploration/src/main/resources/assets/projectred_exploration/textures/item/platinum_saw.png b/exploration/src/main/resources/assets/projectred_exploration/textures/item/platinum_saw.png new file mode 100644 index 000000000..b7f542fa5 Binary files /dev/null and b/exploration/src/main/resources/assets/projectred_exploration/textures/item/platinum_saw.png differ 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 000000000..7bf54c096 Binary files /dev/null and b/exploration/src/main/resources/assets/projectred_exploration/textures/item/silver_saw.png differ 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 000000000..4dffabe42 Binary files /dev/null and b/exploration/src/main/resources/assets/projectred_exploration/textures/item/tin_saw.png differ