feat: ✨ Add Stack Upgrader Starter Tier crafted with copper blocks an…

…d can be crafted into tier 1 with fewer iron blocks needed

gradle.properties

@@ -3,7 +3,7 @@ org.gradle.daemon=false
 
 mod_id=sophisticatedbackpacks
 mod_group_id=sophisticatedbackpacks
-mod_version=3.20.0
+mod_version=3.20.1
 sonar_project_key=sophisticatedbackpacks:SophisticatedBackpacks
 github_package_url=https://maven.pkg.github.com/P3pp3rF1y/SophisticatedBackpacks
 
@@ -25,5 +25,5 @@ crafting_tweaks_cf_file_id=4596466
 chipped_cf_file_id=5077656
 resourcefullib_cf_file_id=5070629
 athena_cf_file_id=4764357
-sc_version=[1.20.1-0.5.116,1.21)
+sc_version=[1.20.1-0.6.0,1.21)
 parchment_version=1.19.3-2023.03.12-1.20

src/generated/resources/data/sophisticatedbackpacks/advancements/recipes/misc/stack_upgrade_starter_tier.json

@@ -0,0 +1,35 @@
+{
+  "parent": "minecraft:recipes/root",
+  "criteria": {
+    "has_the_recipe": {
+      "conditions": {
+        "recipe": "sophisticatedbackpacks:stack_upgrade_starter_tier"
+      },
+      "trigger": "minecraft:recipe_unlocked"
+    },
+    "has_upgrade_base": {
+      "conditions": {
+        "items": [
+          {
+            "items": [
+              "sophisticatedbackpacks:upgrade_base"
+            ]
+          }
+        ]
+      },
+      "trigger": "minecraft:inventory_changed"
+    }
+  },
+  "requirements": [
+    [
+      "has_upgrade_base",
+      "has_the_recipe"
+    ]
+  ],
+  "rewards": {
+    "recipes": [
+      "sophisticatedbackpacks:stack_upgrade_starter_tier"
+    ]
+  },
+  "sends_telemetry_event": true
+}

src/generated/resources/data/sophisticatedbackpacks/advancements/recipes/misc/stack_upgrade_tier_1_from_starter.json

@@ -0,0 +1,35 @@
+{
+  "parent": "minecraft:recipes/root",
+  "criteria": {
+    "has_the_recipe": {
+      "conditions": {
+        "recipe": "sophisticatedbackpacks:stack_upgrade_tier_1_from_starter"
+      },
+      "trigger": "minecraft:recipe_unlocked"
+    },
+    "has_upgrade_base": {
+      "conditions": {
+        "items": [
+          {
+            "items": [
+              "sophisticatedbackpacks:upgrade_base"
+            ]
+          }
+        ]
+      },
+      "trigger": "minecraft:inventory_changed"
+    }
+  },
+  "requirements": [
+    [
+      "has_upgrade_base",
+      "has_the_recipe"
+    ]
+  ],
+  "rewards": {
+    "recipes": [
+      "sophisticatedbackpacks:stack_upgrade_tier_1_from_starter"
+    ]
+  },
+  "sends_telemetry_event": true
+}

src/generated/resources/data/sophisticatedbackpacks/recipes/stack_upgrade_starter_tier.json

@@ -0,0 +1,25 @@
+{
+  "type": "minecraft:crafting_shaped",
+  "conditions": [
+    {
+      "type": "sophisticatedcore:item_enabled",
+      "itemRegistryName": "sophisticatedbackpacks:stack_upgrade_starter_tier"
+    }
+  ],
+  "key": {
+    "B": {
+      "item": "sophisticatedbackpacks:upgrade_base"
+    },
+    "C": {
+      "tag": "forge:storage_blocks/copper"
+    }
+  },
+  "pattern": [
+    "CCC",
+    "CBC",
+    "CCC"
+  ],
+  "result": {
+    "item": "sophisticatedbackpacks:stack_upgrade_starter_tier"
+  }
+}

src/generated/resources/data/sophisticatedbackpacks/recipes/stack_upgrade_tier_1_from_starter.json

@@ -0,0 +1,25 @@
+{
+  "type": "minecraft:crafting_shaped",
+  "conditions": [
+    {
+      "type": "sophisticatedcore:item_enabled",
+      "itemRegistryName": "sophisticatedbackpacks:stack_upgrade_tier_1"
+    }
+  ],
+  "key": {
+    "I": {
+      "tag": "forge:storage_blocks/iron"
+    },
+    "S": {
+      "item": "sophisticatedbackpacks:stack_upgrade_starter_tier"
+    }
+  },
+  "pattern": [
+    " I ",
+    "ISI",
+    " I "
+  ],
+  "result": {
+    "item": "sophisticatedbackpacks:stack_upgrade_tier_1"
+  }
+}

src/main/java/net/p3pp3rf1y/sophisticatedbackpacks/data/SBPRecipeProvider.java

@@ -3,11 +3,7 @@
 import net.minecraft.advancements.critereon.InventoryChangeTrigger;
 import net.minecraft.advancements.critereon.ItemPredicate;
 import net.minecraft.data.PackOutput;
-import net.minecraft.data.recipes.FinishedRecipe;
-import net.minecraft.data.recipes.RecipeCategory;
-import net.minecraft.data.recipes.RecipeProvider;
-import net.minecraft.data.recipes.SmithingTransformRecipeBuilder;
-import net.minecraft.data.recipes.SpecialRecipeBuilder;
+import net.minecraft.data.recipes.*;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.tags.ItemTags;
 import net.minecraft.world.item.Items;
@@ -371,6 +367,15 @@ protected void buildRecipes(Consumer<FinishedRecipe> consumer) {
 				.unlockedBy(HAS_UPGRADE_BASE, has(ModItems.UPGRADE_BASE.get()))
 				.save(consumer);
 
+		ShapeBasedRecipeBuilder.shaped(ModItems.STACK_UPGRADE_STARTER_TIER.get())
+				.pattern("CCC")
+				.pattern("CBC")
+				.pattern("CCC")
+				.define('B', ModItems.UPGRADE_BASE.get())
+				.define('C', Tags.Items.STORAGE_BLOCKS_COPPER)
+				.unlockedBy(HAS_UPGRADE_BASE, has(ModItems.UPGRADE_BASE.get()))
+				.save(consumer);
+
 		ShapeBasedRecipeBuilder.shaped(ModItems.STACK_UPGRADE_TIER_1.get())
 				.pattern("III")
 				.pattern("IBI")
@@ -380,6 +385,15 @@ protected void buildRecipes(Consumer<FinishedRecipe> consumer) {
 				.unlockedBy(HAS_UPGRADE_BASE, has(ModItems.UPGRADE_BASE.get()))
 				.save(consumer);
 
+		ShapeBasedRecipeBuilder.shaped(ModItems.STACK_UPGRADE_TIER_1.get())
+				.pattern(" I ")
+				.pattern("ISI")
+				.pattern(" I ")
+				.define('S', ModItems.STACK_UPGRADE_STARTER_TIER.get())
+				.define('I', Tags.Items.STORAGE_BLOCKS_IRON)
+				.unlockedBy(HAS_UPGRADE_BASE, has(ModItems.UPGRADE_BASE.get()))
+				.save(consumer, new ResourceLocation(SophisticatedBackpacks.getRegistryName("stack_upgrade_tier_1_from_starter")));
+
 		ShapeBasedRecipeBuilder.shaped(ModItems.STACK_UPGRADE_TIER_2.get())
 				.pattern("GGG")
 				.pattern("GSG")

src/main/java/net/p3pp3rf1y/sophisticatedbackpacks/init/ModItems.java

@@ -21,11 +21,7 @@
 import net.minecraft.world.item.Item;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.item.context.DirectionalPlaceContext;
-import net.minecraft.world.item.crafting.BlastingRecipe;
-import net.minecraft.world.item.crafting.RecipeSerializer;
-import net.minecraft.world.item.crafting.SimpleCraftingRecipeSerializer;
-import net.minecraft.world.item.crafting.SmeltingRecipe;
-import net.minecraft.world.item.crafting.SmokingRecipe;
+import net.minecraft.world.item.crafting.*;
 import net.minecraft.world.level.Level;
 import net.minecraft.world.level.block.DispenserBlock;
 import net.minecraft.world.level.block.state.BlockState;
@@ -63,8 +59,8 @@
 import net.p3pp3rf1y.sophisticatedbackpacks.data.SBLootModifierProvider;
 import net.p3pp3rf1y.sophisticatedbackpacks.upgrades.anvil.AnvilUpgradeContainer;
 import net.p3pp3rf1y.sophisticatedbackpacks.upgrades.anvil.AnvilUpgradeItem;
-import net.p3pp3rf1y.sophisticatedbackpacks.upgrades.anvil.AnvilUpgradeWrapper;
 import net.p3pp3rf1y.sophisticatedbackpacks.upgrades.anvil.AnvilUpgradeTab;
+import net.p3pp3rf1y.sophisticatedbackpacks.upgrades.anvil.AnvilUpgradeWrapper;
 import net.p3pp3rf1y.sophisticatedbackpacks.upgrades.deposit.DepositUpgradeContainer;
 import net.p3pp3rf1y.sophisticatedbackpacks.upgrades.deposit.DepositUpgradeItem;
 import net.p3pp3rf1y.sophisticatedbackpacks.upgrades.deposit.DepositUpgradeTab;
@@ -223,6 +219,8 @@ private ModItems() {
 			() -> new AutoBlastingUpgradeItem(Config.SERVER.autoBlastingUpgrade, Config.SERVER.maxUpgradesPerStorage));
 	public static final RegistryObject<CraftingUpgradeItem> CRAFTING_UPGRADE = ITEMS.register("crafting_upgrade", () -> new CraftingUpgradeItem(Config.SERVER.maxUpgradesPerStorage));
 	public static final RegistryObject<StonecutterUpgradeItem> STONECUTTER_UPGRADE = ITEMS.register("stonecutter_upgrade", () -> new StonecutterUpgradeItem(Config.SERVER.maxUpgradesPerStorage));
+	public static final RegistryObject<StackUpgradeItem> STACK_UPGRADE_STARTER_TIER = ITEMS.register("stack_upgrade_starter_tier", () ->
+			new StackUpgradeItem(1.5D, Config.SERVER.maxUpgradesPerStorage));
 	public static final RegistryObject<StackUpgradeItem> STACK_UPGRADE_TIER_1 = ITEMS.register("stack_upgrade_tier_1", () ->
 			new StackUpgradeItem(2, Config.SERVER.maxUpgradesPerStorage));
 	public static final RegistryObject<StackUpgradeItem> STACK_UPGRADE_TIER_2 = ITEMS.register("stack_upgrade_tier_2", () ->

src/main/resources/assets/sophisticatedbackpacks/lang/en_us.json

@@ -71,6 +71,8 @@
     "item.sophisticatedbackpacks.stonecutter_upgrade.tooltip": "Stonecutter in an upgrade tab",
     "item.sophisticatedbackpacks.jukebox_upgrade": "Jukebox Upgrade",
     "item.sophisticatedbackpacks.jukebox_upgrade.tooltip": "Portable Jukebox",
+    "item.sophisticatedbackpacks.stack_upgrade_starter_tier": "Stack Upgrade Starter Tier",
+    "item.sophisticatedbackpacks.stack_upgrade_starter_tier.tooltip": "Multiplies the number of stacks that can fit in a slot by 1.5",
     "item.sophisticatedbackpacks.stack_upgrade_tier_1": "Stack Upgrade Tier 1",
     "item.sophisticatedbackpacks.stack_upgrade_tier_1.tooltip": "Multiplies the number of stacks that can fit in a slot by 2",
     "item.sophisticatedbackpacks.stack_upgrade_tier_2": "Stack Upgrade Tier 2",

src/main/resources/assets/sophisticatedbackpacks/models/item/stack_upgrade_starter_tier.json

@@ -0,0 +1,6 @@
+{
+    "parent": "item/generated",
+    "textures": {
+        "layer0": "sophisticatedbackpacks:item/stack_upgrade_starter_tier"
+    }
+}